569 files changed, 116078 insertions, 333048 deletions

diff --git a/ChangeLog b/ChangeLog
index 87d0dbee2c..3d79cd517c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3493 +1,5 @@
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #342296
-
-	* configure.in:	Remove 'mail-to-meeting' plugin,
-	the 'mail-to-task' plugin does this itself now.
-
-2009-04-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Remove a bunch of juvenile comments.  Source code should
-	   look professional, even if some developers are not.
-
-2009-03-16  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.26.0 release and version bump
-
-2009-03-08  David Planella  <david.planella@gmail.com>
-
-	* configure.in: Added Makefiles for the Catalan translations of the
-	welcome e-mail and quick reference.
-
-2009-03-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in: Post-release version bump.
-
-2009-03-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* NEWS: Evolution 2.25.92 release
-
-2009-02-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	* MAINTAINERS:
-	Add myself as a Shell maintainer, with Srini's permission.
-
-2009-02-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.25.90 release
-
-2009-01-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Disable debug macros (#define d(x) x) throughout.  (#569638)
-
-2009-01-29  Tor Lillqvist  <tml@novell.com>
-
-	Cross-compilation from Linux to Windows support by Fridrich Strba.
-
-	* configure.in: Check for <sys/wait.h>. Don't look for socklen_t
-	on Windows.
-
-	If cross-compiling, we obviously can't run the test to find out
-	the preferred formats for charset names of iconv(). We know them a
-	priori for Windows, though. For cross-compilation to other
-	platforms more change is needed.
-
-	* win32/Makefile.am: Use $(DLLTOOL) instead of hardcoding name.
-
-2009-01-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* tools/killev.c: Added another pattern to killev.
-
-2009-01-19  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.25.5 release
-
-2009-10-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Keep evolution and evolution-data-server versions in lockstep
-	from now on to avoid any more dependency screw ups.
-
-2009-01-15  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #208426
-
-	* configure.in: Added support for importing .pst files into Evolution.
-
-2009-01-12  Philip Van hoof  <philip@codeminded.be>
-
-	* e-util/e-plugin.c
-	* e-util/e-plugin.h
-	* shell/main.c: EPlugins must be loaded after Bonobo init, else variables
-	like `session` are not available for plugin's initialization functions.
-	(Fixes Bug #565681)
-
-2009-01-08  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #565376
-
-	* configure.in:
-	Bump eds requirement to 2.25.5 because of new functionality.
-
-2009-01-05  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.25.4 release
-
-2009-01-01  Andre Klapper  <a9016009@gmx.de>
-
-	* configure.in:
-	Added Czech translation of quickref.
-
-2008-12-25  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* shell/main.c:
-	Fix memory leak. (Fixes bug #565628).
-
-2008-12-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump eds_minimum_version to 2.25.4 for CAMEL_STORE_IS_MIGRATING.
-
-2008-12-16  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #564248
-
-	* configure.in: Bump libgtkhtml_minimum_version to 3.25.4
-	because of new html editor functions.
-
-2008-12-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.25.3.1 release
-
-2008-12-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump libgtkhtml_minimum_version to 3.25.3 to pick up
-	HTMLTokenizer changes (ABI break, actually).
-
-2008-12-10  Suman Manjunath  <msuman@novell.com>
-
-	* configure.in: Build the weather calendar setup plugin unless 
-	explicitly requested not to, thereby making the libgweather 
-	dependency optional. 
-
-2008-12-01  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.25.2 release changes.
-
-2008-11-28  Felix Riemann  <friemann@svn.gnome.org>
-
-	** Part of fix for bug #554464
-
-	* configure.in: Bump gtk+ minimum version to 2.14.0 which pulls in a
-	recent enough Pango version.
-
-2008-11-12  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #524377
-
-	* configure.in: Bump eds minimum version to 2.25.2 because of
-	camel's int camel_header_param_encode_filenames_in_rfc_2047.
-
-2008-11-07  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #557581
-
-	* configure.in:
-	Break up the version definitions such that we can calculate the
-	latest stable version and pass a STABLE_VERSION definition to
-	shell/main.c.
-
-2008-11-07  Sankar P  <psankar@novell.com>
-
-	* Makefile.am:
-	Ship COPYING.OPENLDAP also
-
-2008-11-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* configure.in, NEWS: Evolution 2.25.1 release and version bump
-
-2008-11-03  Sankar P  <psankar@novell.com>
-
-	License Changed from GPL to LGPL
-	Refer COPYING File for more details
-
-2008-10-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #549025
-
-	* configure.in:
-	Restrict libmono linkage to the mono plugin, so that downstream
-	packagers can isolate the mono dependency to a subpackage.
-	Add configuration summary lines indicating whether the Mono and
-	Python bindings are enabled.
-
-2008-10-17  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fix for bug #548469
-
-	* configure.in: Drop support for deprecated libnm-glib. 
-
-2008-10-14	Sankar P  <psankar@novell.com>
-
-		* calendar/gui/gnome-cal.h
-		* calendar/gui/gnome-cal.c
-		* calendar/gui/calendar-commands.h
-		* calendar/gui/calendar-commands.c
-		* calendar/conduits/memo/memo-conduit.c
-		* calendar/conduits/calendar/calendar-conduit.c
-		* calendar/conduits/todo/todo-conduit.c
-		* addressbook/conduit/address-conduit.c :
-		
-		* Remove improper FSF copyright statements; was never signed
-		over to them and was incorrectly added to this file due to a
-		mistake made by the original developer.
-
-2008-10-13  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #424818 (bugzilla.novell.com)
-
-	* configure.in:
-	* plugins/mark-calendar-offline :
-	Integrate the mark-calendar-offline plugin into the main code as we already 
-	have a similar per-calendar option which does the same thing. 
-
-2008-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #554458
-
-	* configure.in:
-	Bump glib version to 2.18.0 because of g_content_type_from_mime_type.
-
-2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* configure.in: Fix 'cs' build break due to my git-merge issues.
-
-2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* configure.in: Version bump for Evolution 2.25.1
-
-2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* COPYING.LGPL2: Add LGPL v2, v3 licensing header.
-	* COPYING.LGPL3:
-
-2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.24.0 release.
-
-2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* configure.in: Fix for build break. 
-
-2008-09-22  Luca Ferretti  <elle.uca@libero.it>
-
-	* configure.in: 
-	Add mail/default/it/Makefile to AC_OUTPUT.
-
-2008-09-17  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* configure.in:
-	Add mail/default/hu/Makefile to AC_OUTPUT.
-
-2008-09-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Add mail/default/sr@latin/Makefile to AC_OUTPUT.
-
-2008-09-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Add mail/default/sr/Makefile to AC_OUTPUT (bug #552508).
-
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* iconv-detect.c:
-
-2008-09-10  Michael Meeks  <michael.meeks@novell.com>
-
-	* server.mk: use top_builddir for config.h #551560
-
-2008-09-08  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.23.92 release.
-
-2008-09-01  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.23.91 release and version bump
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* tools/killev.c:
-
-2008-09-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Fix compiler warnings in some of the test programs.
-
-2008-08-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #546926
-
-	* configure.in:
-	Bump eds_minimum_version to 2.23.91 for camel_shutdown().
-
-2008-08-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.23.90 release and Version bump.
-
-2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #547411
-
-	* data/icons/hicolor_status_32x32_online.png:
-	* data/icons/hicolor_status_32x32_online.svg:
-	* data/icons/hicolor_status_32x32_offline.png:
-	* data/icons/hicolor_status_32x32_offline.svg:
-	New, Tangoized versions of the old "art" images.
-
-2008-08-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump eds_minimum_version to 2.23.90 for
-	E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD.
-
-2008-08-08  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #546748
-
-	* addressbook/gui/component/addressbook-view.c:
-	Change "_Properties..." to "_Properties" to match HIG and other
-	components.
-
-2008-08-08  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Additional fix for bug #467115
-
-	* addressbook/gui/contact-editor/e-contact-editor.c:
-	(e_contact_editor_init):
-	* art/Makefile.am:
-	* data/icons/Makefile.am:
-	Get rid of old contact-editor icon.
-
-2008-08-08  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #546744
-
-	* addressbook/gui/component/addressbook-view.c:
-	Use address-book-new icon instead of contacts-new.
-
-2008-08-07  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #535745
-
-	* configure.in: Require and link calendar libs with libgdata
-	and libgdata-google.
-
-2008-08-06  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #467115
-
-	* addressbook/gui/component/addressbook-view.c:
-	(addressbook_view_init):
-	* calendar/gui/GNOME_Evolution_Calendar.server.in.in:
-	* calendar/gui/memos-component.c: (create_component_view):
-	* calendar/gui/tasks-component.c: (create_component_view):
-	* data/icons/Makefile.am:
-	* mail/GNOME_Evolution_Mail.server.in.in:
-	* mail/mail-component.c: (impl_createView):
-	Ship and use tango icons for the mail, tasks and memos components.
-
-2008-08-06  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #531288
-
-	* data/icons/Makefile.am:
-	* mail/GNOME_Evolution_Mail.server.in.in:
-	Use proxy icon from tango-icon-theme and fall back to the icon
-	shipped by gnome-control-center (thanks to Josef Vybíral).
-
-2008-08-04  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.23.6 release and version bump.
-
-2008-08-04  Matthias Braun <matze@braunis.de>
-
-	** Fix for bug #544051 - Added a plugin for the WebDAV addressbook 
-	account setup. 
-
-	* configure.in:
-	* plugins/webdav-account-setup/Makefile.am:
-	* plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
-	:
-	* plugins/webdav-account-setup/webdav-contacts-source.c
-	(ensure_webdav_contacts_source_group),
-	(remove_webdav_contacts_source_group), (print_uri_noproto),
-	(set_ui_from_source), (set_source_from_ui), (on_entry_changed),
-	(on_toggle_changed), (destroy_ui_data), (plugin_webdav_contacts),
-	(e_plugin_lib_enable):
-
-2008-07-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #545558
-
-	* configure.in:
-	Mark the "hula-account-setup" plugin as experimental.
-
-2008-07-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump eds_minimum_version to 2.23.6 for CAMEL_PROVIDER_CONF_OPTIONS.
-
-2008-07-23  Johnny Jacob  <jjohnny@novell.com>
-
-	* configure.in: Version bumped to 2.23.6.
-	* NEWS: Updates for 2.23.5
-
-2008-07-22  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #544022
-
-	* configure.in: Do not redefine DBUS_VERSION define supplied
-	by dbus itself, rather rename our define to FOUND_DBUS_VERSION.
-	
-2008-07-21  Johnny Jacob  <jjohnny@novell.com>
-
-	* data/hicolor_actions_24x24_query-free-busy.png: Moved to 
-	data/icons/hicolor_actions_24x24_query-free-busy.png as per 
-	rev 35753.
-	
-2008-07-21  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am:
-	Add doltcompile and doltlibtool to DISTCLEANFILES to fix
-	distcheck breakage.
-	
-2008-07-20  Bharath Acharya  <abharath@novell.com>
-
-	** Part of fix for bug #200147
-
-	* configure.in: Added a new plugin templates, which will make it 
-	possible for users to use standard templates to reply to their messages.
-
-2008-07-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	* data/icons/hicolor_actions_24x24_query-free-busy.png:
-	Moved here from art/query-free-busy.png so we can treat it as a
-	named icon.
-
-	* data/icons/Makefile.am:
-	Add hicolor_actions_24x24_query-free-busy.png.
-
-2008-07-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump eds_minimum_version to 2.23.5 for camel_folder_sort_uids().
-
-2008-06-24  Alp Toker  <alp@nuanti.com>
-
-	Reviewed by Jeffrey Stedfast.
-
-	* configure.in:
-	* acinclude.m4:
-	Add dolt revision 5e9eef10 to the autotools build system. Speeds up
-	the build, often by a factor of two or more on supported platforms,
-	otherwise falls back to libtool.
-
-	See http://dolt.freedesktop.org for details.
-
-2008-06-18  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #423395
-
-	* configure.in: Requires newer GtkHTML, 3.23.5.
-
-2008-06-17  Johnny Jacob  <jjohnny@novell.com>
-
-	* configure.in: Bumped to 2.23.5 .
-
-	* NEWS: Evolution 2.23.4 release updates.
-
-2008-06-16  Johnny Jacob  <jjohnny@novell.com>
-
-	* plugins/Makefile.am (DIST_SUBDIRS): Add python loader to DIST.
-
-2008-06-13  Tor Lillqvist  <tml@novell.com>
-
-	* win32/libevolution-mail.def: Add more functions used by
-	libevolution-composer.la and libevolution-calendar.la.
-
-2008-06-11  Johnny Jacob  <jjohnny@novell.com>
-
-	** Partially fixes #506393
-	* configure.in : Adding python plugin loader (--enable-python).
-
-2008-06-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and
-	   GTK_DISABLE_SINGLE_INCLUDES defined.  (#536637)
-
-2008-06-06  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in: Add -Wl,--exclude-libs=libiconv.a to ICONV_LIBS on
-	Windows to avoid auto-exporting functions from the static
-	libiconv.a implementation in win_iconv from evolution's DLLs.
-
-2008-06-05  Johnny Jacob  <jjohnny@novell.com>
-
-	Committing this on behalf Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	* configure.in (EVO_SET_COMPILE_FLAGS): Add libebackend.
-
-2008-06-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.23.1.1 release and version bump.
-
-2008-06-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.23.3 release.
-
-2008-06-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump eds_minimum_version to 2.23.3 for CAMEL_MESSAGE_FORWARDED.
-
-2008-05-23  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534476
-
-	* configure.in:
-	Require shared-mime-info >= 0.22 to make sure we pick up the fix
-	for correctly identifying "winmail.dat" attachments.
-
-2008-05-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in : Evolution 2.23.2 release and version bump.
-
-2008-05-08  Tor Lillqvist  <tml@novell.com>
-
-	* evolution-zip.in: Include the whole etc/gconf/gconf.xml.defaults
-	tree. The intent is to do "make install" to a temporary empty
-	folder anyway, so there won't be any extra stuff in there. It is
-	essential to get all the empty %gconf.xml files, also from the
-	gconf.xml.defaults/apps folder.
-
-2008-05-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump eds_minimum_version to 2.23.2 for camel-iconv.h.
-
-2008-04-30  Rob Bradford  <rob@openedhand.com>
-
-	* configure.in:
-	Link with libebackend (see #530576.)
-
-2008-04-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.23.1 release and version bump.
-
-2008-04-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* MAINTAINERS: Update the Mail guards.
-
-2008-04-17  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #526739
-
-	* configure.in: Drop dependency on gnome-vfs, depend on gio instead.
-
-2008-04-11  Suman Manjunath  <msuman@novell.com>
-
-	* configure.in: Bump glib package requirement: glib-2.0 >= 2.16.0
-
-2008-04-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #526152
-
-	* tools/killev.c (main):
-	No need to continue killing the GnomeSpell Bonobo server.
-
-2008-04-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Merge the mbarnes-composer branch
-
-	* configure.in:
-	Bump libgtkhtml requirement to 3.19.1.
-	Add gtkhtml-editor dependency for addressbook, calendar and mail.
-	Remove print-message plugin; new composer implements this natively.
-
-	* tools/Makefile.am:
-	Remove CORBA rules for the old composer.
-
-	... separate issue ...
-
-	* configure.in:
-	Bump eds_minimum_version to 2.23.1 for
-	CAMEL_FOLDER_JUNKED_NOT_DELETED symbol.
-
-2008-04-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in: Version bump for 2.23.1.
-
-2008-03-25  Dan Williams  <dcbw@redhat.com>
-
-	** Fix for bug #524310
-
-	* mail/mail-session.c: don't double-free server messages
-
-2008-03-17  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #519421
-
-	* configure.in: also use <libytnef/ytnef.h> to check for TNEF support
-
-2008-03-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #512543
-
-	* configure.in: Get rid of --enable-cairo-calendar/ENABLE_CAIRO define.
-
-2008-03-10  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.22.0 release.
-
-2008-03-05  Tor Lillqvist  <tml@novell.com>
-
-	* evolution-zip.in: etc/gconf/gconf.xml.defaults/apps/evolution
-	was missing.
-
-2008-03-03  Tor Lillqvist  <tml@novell.com>
-
-	* evolution-zip.in: Misc simplification and cleanup. Add
-	share/icons/hicolor.
-
-2008-03-03  Changwoo Ryu  <cwryu@debian.org>
-
-	* configure.in: Add mail/default/ko/Makefile to AC_OUTPUT.
-
-2008-02-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.21.92 release.
-
-2008-02-25  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* configure.in: set HANDLE_LIBICAL_MEMORY to 1.
-
-2008-02-20  Jeff Cai<jeff.cai@sun.com>
-
-	** Fix for bug #516648
-
-	* configure.in:
-	Use "pkill -x" to kill processes on Solaris.
-
-2008-02-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump eds_minimum_version to 2.21.92 for camel_application_is_exiting.
-
-2008-02-18  Akhil Laddha  <lakhil@novell.com>
-
-	** Fix for bug #517129
-
-	* configure.in: Fix build break of pl translation.
-
-2008-02-13  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* configure.in: Evolution 2.21.92 version bump.
-
-2008-02-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.21.91 release.
-
-2008-02-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump eds_minimum_version to 2.21.91 for CAMEL_MESSAGE_NOTJUNK.
-
-2008-02-06  Tor Lillqvist  <tml@novell.com>
-
-	* evolution-zip.in: Correct file names that have had the
-	@BASE_VERSION@ dropped. Look for message locales first from
-	share/locale, as that is where they get stuffed when building
-	against a properly built GNU gettext.
-
-2008-01-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* configure.in: Evolution 2.21.91 version bump.
-
-2008-01-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.21.90 release.
-
-2008-01-25  Tor Lillqvist  <tml@novell.com>
-
-	* win32/libevolution-mail.def: Add two more entries for
-	bootstrapping. The mail/importers/libevolution-mail-importers
-	library depends on the libevolution-mail library which hasn't been
-	built yet when libevolution-mail-importers is built.
-
-2008-01-24  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in: Include camel in E_UTIL compile flags and libs, as
-	libeutil uses camel_utf8_utf7().
-
-2008-01-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump eds_minimum_version to 2.21.90 for new Camel functions.
-
-2008-01-21  Sankar P  <psankar@novell.com>
-
-	* configure.in:
-	Add missing directory in configure.in
-	Fixes build break
-
-2008-01-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump some additional package requirements for libsoup-2.4:
-		libbonobo-2.0 >= 2.20.3
-		glib-2.0 >= 2.15.3
-
-2008-01-15  Dan Winship  <danw@gnome.org>
-
-	* configure.in: Require libsoup-2.4. (Remove old "either 2.2 or
-	2.4" support, which only ever worked because there was an old CVS
-	version of libsoup that claimed to be 2.4 but still had the 2.2
-	API.)
-
-2008-01-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* configure.in: Version bump to 2.21.90
-
-2008-01-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS: Evolution 2.21.5 release
-
-2008-01-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #492702
-
-	* configure.in: Just disable the dbus message part of mail
-	notification if dbus isn't there. Also remove new-mail-notify plugin.
-
-2008-01-06  Michael Monreal  <michael.monreal@gmx.net>
-
-	** Fix for bug #492188
-
-	* data/icons/Makefile.am:
-
-	Use the new Tangoized icons instead of deprecated icons from 
-	gnome-icon-theme.
-
-2008-01-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	* data/evolution.desktop.in.in:
-	Submit bugs to the "BugBuddyBugs" Bugzilla component (#507311).
-
-2008-01-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump GtkHTML requirement to 3.17.5 for bug #317823.
-
-2008-01-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Add --with[out]-help option to make it possible to skip
-	building and installing user documentation.  (#504541)
-
-2007-12-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* configure.in: Version bump to 2.21.5
-
-2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: evolution 2.21.4 release.
-
-2007-12-17  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump eds_minimum_version to 2.21.4 for new Camel functions.
-
-2007-12-15  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	* plugins/mail-remote:
-	Just remove the mail-remote plugin altogether so we stop going
-	back and forth over whether the tranlatable files should be added
-	to POTFILES.in.  We can always add it back once we get it working
-	again.
-
-2007-12-13  Tobias Mueller  <tobiasmue@svn.gnome.org>
-
-	** Fixes bug 474651
-	* calendar/gui/memos-component.c:
-	* addressbook/gui/component/addressbook.c:
-	* calendar/gui/tasks-control.c:
-	* calendar/gui/tasks-component.c:
-	* widgets/misc/e-dateedit.c:
-	* calendar/gui/e-cal-model-tasks.c:
-	* widgets/misc/e-cell-percent.c:
-	* calendar/gui/e-itip-control.c:
-	* calendar/gui/comp-editor-factory.c:
-	Use format strings in gtk_message_dialog_new
-
-2007-12-10  Tobias Mueller  <tobiasmue@svn.gnome.org>
-
-	** Fixes bug 474651
-
-	* addressbook/gui/contact-editor/eab-editor.c:
-	* plugins/save-calendar/ical-format.c:
-	* plugins/save-calendar/csv-format.c:
-	* plugins/save-calendar/rdf-format.c:
-	* plugins/ipod-sync/ical-format.c:
-	* plugins/ipod-sync/ipod-sync.c:
-	* plugins/ipod-sync/evolution-ipod-sync.c:
-	* calendar/gui/dialogs/changed-comp.c:
-	* calendar/gui/dialogs/copy-source-dialog.c:
-	* calendar/gui/dialogs/delete-error.c:
-	Use format strings in gtk_message_dialog_new
-
-2007-12-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Bump libgtkhtml requirement to 3.17.3 due to bug #271551.
-
-2007-12-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: evolution 2.21.3 release.
-
-2007-11-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: evolution 2.21.2 release.
-
-2007-11-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Remove trailing whitespace from source code.
-
-2007-11-10  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #209425
-
-	* data/icons/Makefile.am:
-	* data/icons/hicolor_actions_16x16_go-today.svg:
-	* data/icons/hicolor_actions_22x22_go-today.svg:
-	Don't use gtk-home for the go-today action. Add new
-	icons to the build.
-
-2007-11-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Remove dead files from source control.  The dates below
-	   indicate when the file was removed from Makefile.am.
-	   Fixes part of bug #478704.
-
-	* tools/evolution-launch-composer.c	(Jun 2003)
-
-	* configure.in:
-	Remove plugins/mail-remote/Makefile from AC_OUTPUT.
-	Fixes a distcheck error.
-
-2007-10-31  Priit Laes  <plaes@svn.gnome.org>
-	
-	* addressbook/gui/widgets/eab-vcard-control.c: Remove debugging output.
-
-2007-10-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.21.1 release.
-
-2007-10-31  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #486351
-
-	* data/icons/Makefile.am:
-	* data/icons/hicolor_actions_32x32_view-calendar-day.svg:
-	* data/icons/hicolor_actions_32x32_view-calendar-list.svg:
-	* data/icons/hicolor_actions_32x32_view-calendar-month.svg:
-	* data/icons/hicolor_actions_32x32_view-calendar-week.svg:
-	* data/icons/hicolor_actions_32x32_view-calendar-workweek.svg:
-	* data/icons/hicolor_actions_scalable_view-calendar-day.svg:
-	* data/icons/hicolor_actions_scalable_view-calendar-list.svg:
-	* data/icons/hicolor_actions_scalable_view-calendar-month.svg:
-	* data/icons/hicolor_actions_scalable_view-calendar-week.svg:
-	* data/icons/hicolor_actions_scalable_view-calendar-workweek.svg:
-	Add view-calendar-* icons in higher resolutions for use with 
-	a11y themes like LargePrint.
-
-2007-10-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Disable the mail-remote plugin until it can be made to work
-	or at least compile again (#491386).
-
-2007-10-25  Sankar P  <psankar@novell.com>
-
-	* configure.in:
-	* plugins/external-editor:
-	Added new plugins external-editor, which will
-	make it possible to use an external editor as 
-	the mail composer.
-
-2007-10-23  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* configure.in
-	* plugins/google-account-setup: Initial commit for the 
-	Google Calendar Feature.
-
-	Committing on behalf of Ebby Wiselyn <ebbywiselyn@gmail.com>
-
-2007-10-18  Diego Escalante Urrelo  <diegoe@gnome.org>
-
-	** Fixes bug #476389
-
-	* ui/evolution-mail-message.xml: Reorder the Filter/VFolder menu
-	entries to keep consistency between this and the main menu.
-
-2007-10-12  Michael Monreal <michael.monreal@gmail.com>
-
-	** Migration of theme icons to data/icons/ (bug #479257)
-
-	* configure.in: Include new data/icons/ directory.
-
-2007-10-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Put a blank line between the configuration summary and the
-	final "now type make" message.
-
-2007-10-11  Tobias Mueller  <muelli@auftrags-killer.org>
-
-	** Fixes bug 360134
-
-	* widgets/table/e-table-header-item.c:
-	* widgets/table/e-table-field-chooser-dialog.c:
-	* widgets/table/e-table-field-chooser-item.c:
-	* widgets/table/e-table-field-chooser.c:
-	* widgets/misc/e-reflow.c:
-	Don't g_strdup strings passed to g_value_set_string since it 
-	dups the strings itself.
-	
-2007-10-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #484814
-
-	* data/evolution.desktop.in.in:
-	Modernize the Name and Comment.  Most other applications use the
-	form "AppName GenericName" for the Name and "Verb Something" for
-	the Comment.  Ours will be:
-
-	    Name: Evolution Mail and Calendar
-	    Comment: Manage your email, contacts and schedule
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* tools/killev.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	* iconv-detect.c (main): Remove an unused variable (#483301).
-
-2007-10-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in: Require libbonobo 2.16.0 or later (#483989).
-
-	This is to make sure we pick up the implementation of
-	gnome_vfs_mime_get_all_components(), which now lives in
-	libbonobo instead of gnome-vfs.
-
-2007-10-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in: Require GTK+ 2.12 (#481325).
-
-2007-10-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #469657
-
-	* tools/killev.c:
-	Use destroy functions in GHashTables to simplify memory management.
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #477045
-
-	* configure.in:
-	Bump minimum gnome-icon-theme version to 2.19.91 to ensure we
-	get the new mail icons.
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Remove the --enable-gtk-doc configure option since we don't
-	ship any Gtk-Doc content (#476926).
-
-2007-09-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.12.0 release
-
-2007-09-23  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* configure.in (libgtkhtml_minimum_version): Bump required GtkHTML
-	minimum version to 3.16.  Fixes bug #478757.
-
-2007-09-21  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Add sounds/Makefile to AC_OUTPUT.
-
-	* Makefile.am:
-	Distribute the "sounds" directory and its contents.  The iCalendar
-	importer in calendar still uses "default_alarm.wav" and configure.in
-	still defines "soundsdir". (#478704)
-
-2007-09-15  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* configure.in: Hungarian translation of quickref added: 
-			help/quickref/hu/Makefile added to AC_OUTPUT.
-
-2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Remove the --enable-file-chooser option.
-	GtkFileChooser has been around since 2004.
-
-2007-09-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Add shell/test/Makefile to AC_OUTPUT (#469992).
-
-	* Makefile.am:
-	Add --enable-test-component to DISTCHECK_CONFIGURE_FLAGS.
-
-2007-09-10  Sankar P  <psankar@novell.com>
-
-	* configure.in: include help/quickref/fr/Makefile
-	to AC_OUTPUT.
-
-2007-09-09  Luca Ferretti  <elle.uca@libero.it>
-
-	* configure.in: include help/quickref/it/Makefile
-	to AC_OUTPUT.
-
-2007-09-05  Frederic Crozat  <fcrozat@mandriva.com>
-
-	* configure.in:
-	audio-inline plugin has been ported to gstreamer 0.10
-	(bug #329629).
-
-2007-09-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.11.92 release
-
-2007-09-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #201167 by Nathan Owens
-
-	* configure.in:
-
-2007-09-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Update FSF address in header comments (#469886).
-	  Patch from Tobias Mueller.
-
-2007-08-28  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in: Add mail/default/pl/Makefile to AC_OUTPUT.
-
-2007-08-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.11.91 release
-
-2007-08-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #331174
-
-	* configure.in: Rename KRBx_LDFLAGS to KRBx_LIBS.
-
-2007-08-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #411619
-
-	* configure.in:
-	Add appropriate compiler and linker flags to e-util if GTK+
-	was built against X11.
-
-2007-08-22  Wang Xin <jedy.wang@sun.com>
-
-	** Fix for bug #468804
-
-	* plugins/mail-to-task/mail-to-task.c: Handle NUll pointer.
-
-2007-08-13 Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.11.90 release
-
-2007-08-10  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	** Fix for bug #444882
-
-	* configure.in: configure options beautification
-
-2007-08-08  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* MAINTAINERS: Updated the email/user id
-
-2007-08-04  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #455799
-
-	Remove all .cvsignore and update svn:ignore porperty in whole
-	directories.
-
-2007-07-31  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.11.6.1 release
-	
-2007-07-30  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.11.6 release
-	
-2007-07-30  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	* configure.in: Fix build break due to tnef-attachment plugin
-	check - Do not use variable in $all_plugins_experimental.
-	
-2007-07-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* configure.in: Fixed a build break due totypo error 
-	in string libexchange-storage.
-
-2007-07-28  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* configure.in: Enable configure option for support
-	exchange-operatoion.
-
-2007-07-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Collect all the required package versions in one place and
-	explicitly require GTK+ 2.10 or higher.  (#380354)
-
-	* tools/Makefile.am:
-	Rename GNOME_FULL_CFLAGS to GNOME_PLATFORM_CFLAGS.
-
-2007-07-17  Sankar P  <psankar@novell.com>
-
-	* configure.in: Included face plugin to sources.
-	Helps in attaching Face header to outgoing mails.
-
-2007-07-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.11.5 release
-
-2007-07-09  Srinivasa Ragavan <sragavan@novell.com>
-
-	** Added Attachment reminder plugin from Johhny 
-	** Added initial tnef attachment plugin Lakke
-
-	* configure.in:
-
-2007-07-03  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	* iconv-detect.c: fix iconv-detect.c, second part of bug #444882
-
-2007-07-03  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	* acinclude.m4: introducing AC_HELP_STRING to beautify configure,
-	fixes part of bug #444882
-
-2007-06-20  Laszlo (Laca) Peter  <laca@sun.com>
-
-	* configure.in: make the path to perl configurable
-	  and add addressbook/tools/csv2vcard to AC_OUTPUT.
-	  Part of the fix for bug #433732
-
-2007-06-18  Srinivasa Ragavan <sragavan@novell.com>
-
-	** Evolution 2.11.4 release
-
-	* NEWS:
-	* configure.in:
-
-2007-06-12  Bastien Nocera  <hadess@hadess.net>
-
-	* configure.in: Detect the X11/XF86keysym.h header, and
-	enable multimedia keys if available (Closes: #442631)
-
-2007-06-07  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* configure.in: Added help/quickref/pt/Makefile for Portuguese
-
-2007-06-05  Pedro Villavicencio  <pvillavi@gnome.org>
-
-	* configure.in: Add missing mail/default/sv/Makefile to configure.in
-
-2007-06-04  Irene Huang  <irene.huang@sun.com>
-
-	* configure.in: Add configuration option for Sun Kerberos.
-	fixing bug #344728
-
-2007-06-04  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Evolution 2.11.3 release
-
-	* NEWS:
-	* configure.in:
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
-
-	* configure.in:
-	* Makefile.am:
-	* server.mk:
-	* data/evolution.desktop.in.in
-
-2007-05-25  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* po/POTFILES.in:
-	Remove eggtrayicon.c
-	
-2007-05-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #424562
-
-	* e-util/e-dialog-utils.c (e_notice):
-	Remove check for obsolete GTK+ version.
-
-	* e-util/eggtrayicon.c:
-	* e-util/eggtrayicon.h:
-	Evolution requires GTK+ 2.10 now so kill this widget.
-
-	* e-util/Makefile.am:
-	Remove eggtrayicon.c and eggtrayicon.h.
-
-2007-05-14  Srinivasa Ragavan <sragavan@novell.com>
-
-	** NEWS, configure.in: Evolution 2.11.2 release
-
-2007-05-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #337616
-
-	* Makefile.am:
-	Add --disable-scrollkeeper to DISTCHECK_CONFIGURE_FLAGS.
-
-2007-05-08  Wang Xin <jedy.wang@sun.com>
-
-	** Fix for bug #380750
-
-	* configure.in: Make force-shutdown work in Solaris
-
-2007-05-08  Wang Xin <jedy.wang@sun.com>
-
-	* configure.in: Fixes 394579:incompatible awk on Solaris cause
-	evolution can not recognize the dbus whose version is newer than
-	1.0.0.
-
-2007-05-03  Srinivasa Ragavan <sragavan@novell.com>
-
-	* configure.in: Add mail-notification plugins to the standard plugins.
-
-2007-04-23  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* configure.in: Fix configure for LDFLAGS=-Wl,--as-needed. Fixes
-	bug #319504.
-
-2007-04-23  Srinivasa Ragavan <sragavan@novell.com>
-
-	** NEWS, configure.in: Evolution 2.11.1 release
-
-2007-04-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Evolution no longer depends on libgnomeprint[ui]. (#426816)
-
-2007-04-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* configure.in:
-	Make the libiconv test program return a value. (#388789)
-
-2007-04-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* evolution-plugin.pc.in: Require libxml-2.0.
-
-2007-04-03  Srinivasa Ragavan <sragavan@novell.com>
-
-	** Added bogofilter plugin part of the junk plugins.
-
-	* configure.in:
-
-2007-03-26  Harish Krishnaswamy <harish.krishnaswamy@gmail.com>
-	
-	* MAINTAINERS : Updates on the new guards.
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-	* tools/killev.c (main): Use g_get_language_names() instead of
-	gnome_i18n_get_language_list().
-
-2007-03-12  Harish Krishnaswamy <kharish@novell.com>
-
-	* NEWS, configure.in: Evolution 2.10 release updates
-
-2007-02-26  Srinivasa Ragavan <sragavan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.9.92 release updates
-
-2007-02-26 Harish Krishnaswamy <kharish@novell.com>
-
-	* configure.in : Update intltool version.
-
-2007-02-12  Srinivasa Ragavan <sragavan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.9.91 release updates
-
-2007-02-12  Srinivasa Ragavan <sragavan@novell.com>
-
-	** Fixes bug #373497 
-	* configure.in: Patch from Priit Laes for following $prefix settings
-	while installing.
-
-2007-01-22  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.9.6 release
-	updates.
-	
-2007-01-22  Sankar P  <psankar@novell.com>
-
-	* configure.in: Added support for configuring the 
-	imap-headers plugin.
-
-2006-01-08  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS, configure.in: Evolution 2.9.5 release
-	updates.
-
-2007-01-08  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	Patch submitted by Nathan Owens <pianocomp81@yahoo.com) and
-	Jerry Yu <jijun.yu@sun.com>
-	
-	* acinclude.m4: Define PILOT LINK version check macros
-	* configure.in: Check for PILOT LINK version 0.12
-	
-2007-01-07  Andre Klapper  <a9016009@gmx.de>
-
-	* configure.in: fix the build failure caused by 
-	SVN revision 33110 (swedish quickref addition).
-
-2006-12-18  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.9.4 release
-	updates.
-
-	* configure.in: Bump the required EDS version to 1.9.4
-
-2006-12-04  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS, configure.in: Evolution 2.9.3 release
-	updates.
-
-2006-11-14  Harish Krishnaswamy  <kharish@novell.com>
-
-	* data/Makefile.am: Install evolution.desktop
-	instead of evolution-<version>.desktop.
-
-2006-11-14  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Add targets help/quickref/es/Makefile
-	and mail/default/es/Makefile.
-
-2006-11-14  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Reverting the previous patch as it breaks
-	the HEAD build. Target Help/C/Makefile was removed from 
-	configure.in while Help/Makefile.am still refers to subdirectory
-	C. 
-
-2006-11-10  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* configure.in: Fixes #76336 and add Spanish quickref.
-
-2006-11-07  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS, configure.in : Evolution 2.9.2 release
-	updates.
-
-2006-11-06  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Move prefer-plain plugin to the 'standard'
-	list from 'experimental'.
-
-2006-11-02  Jules Colding  <colding@omesc.com>
-
-	* evolution-shell.pc.in (execversion): Added variable so that 
-	the Evolution version is easily deduced programmatically.
-
-2006-10-16  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Evolution 2.9.1 release
-	updates.
-
-2006-10-16  Tor Lillqvist  <tml@novell.com>
-
-	* win32/libevolution-mail.def: List the function
-	mail_win32_get_mail_thread_queued() instead of the variable
-	mail_thread_queued.  (#348212)
-
-2006-10-15  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* addressbook/gui/widgets/eab-contact-display.c,
-	addressbook/importers/evolution-ldif-importer.c 
- 	addressbook/importers/evolution-vcard-importer.c 
- 	calendar/importers/icalendar-importer.c 
- 	plugins/groupwise-features/properties.glade 
- 	plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml 
- 	plugins/save-attachments/org-gnome-save-attachments.xml 
- 	shell/shell.error.xml: Fixed some strings to improve gettext
-	compendia for translators.
-	
-
-2006-10-02  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS, configure.in: Evolution 2.8.1 release
-	updates.
-
-2006-09-04  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS, configure.in: Evolution 2.8.0 release
-	updates.
-
-2006-08-21  Srinivasa Ragavan <sragavan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.7.92 release.
-
-2006-08-19  Harish Krishnaswamy  <kharish@novell.com>
-
-	* evolution-plugin.pc.in, evolution-shell.pc.in:
-	Include rpath in libs specified. Fixes #350385.
-	(Patch submitted by Øystein Gisnås)
-	
-2006-08-07  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: Evolution 2.7.91 release 
-	updates.
-	
-2006-07-28  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	* 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 
-	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
-	other systems (e.g. NetBSD) also have it.  Fix the check that
-	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@,
-	at least the caldav plugin has a .eplug.in file that refers to
-	those. (On the other hand, it is questionable whether
-	org-gnome-evolution-caldav.eplug.in needs to specify domain and
-	localedir at all.)
-
-2006-06-14  Andre Klapper  <a9016009@gmx.de>
-
-	* data/evolution.desktop.in.in: fixing categories, bugzilla entry,
-	adding bugzilla component and bugzilla version.
-	Fixes bug #335410. Thanks to Vincent Fretin and Olav Vitters.
-
-2006-06-14  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	* 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-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.
-
-2006-04-28  Sven Herzberg  <herzi@gnome-de.org>
-
-	reviewed by: Srinivasa Ragavan
-
-	* shell/apps_evolution_shell.schemas.in.in: added boolean key for the
-	maximized state of the window
-	* 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>
-
-	* NEWS, configure.in: Release updates. Bump version.
-	***** Release 2.7.1 *****
-
-2006-04-19  Philip Van Hoof  <pvanhoof@gnome.org>
-
-	* shell/main.c: Replaced popt with GOption API
-
-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.
-
-2006-03-22  Tommi Vainikainen  <thv@iki.fi>
-
-	* configure.in (ALL_LINGUAS): Added Dzongkha (dz).
-
-2006-03-12  Vladimer Sichinava  <alinux@siena.linux.it>
-
-	* configure.in: Added "ka" Georgian
-
-2006-03-12  Benoît Dejean  <benoit@placenet.org>
-
-	* configure.in:
-	* 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,
-	* mail/default/Makefile.am:
-	added support for macedonian (mk) welcome message
-
-2006-03-03  Elijah Newren  <newren@gmail.com>
-
-	* configure.in: added mail/default/lt/Makefile
-	Fixes bug 333282. (committed by aklapper)
-
-2006-03-02  Elijah Newren  <newren@gmail.com>
-
-	* configure.in: added mail/default/fi/Makefile
-	Fixes bug 333079. (committed by aklapper)
-
-2006-02-28  Andre Klapper  <a9016009@gmx.de>
-
-	* configure.in: added "ta" to ALL_LINGUAS
-
-2006-02-28  Rajesh Ranjan  <rranjan@redhat.com>
-
-	* configure.in: Added "hi" to ALL_LINGUAS
-
-2006-02-13  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* NEWS, configure.in: Release updates, version bump.
-	***** Release 2.5.92 *****
-
-2006-02-21  Arangel Angov  <ufo@linux.net.mk>
-
-	* configure.in: Added "mk" to ALL_LINGUAS.
-	
-2006-02-13  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS, configure.in: Release updates, version bump.
-	***** Release 2.5.91 *****
-
-2006-02-13  Andre Klapper <a9016009@gmx.de>
-	* data/evolution.desktop.in.in: changed the Comment
-	value. Fixes bug 329744 also to my satisfaction. ;-)
-
-2006-02-07  Andre Klapper <a9016009@gmx.de>
-	* data/evolution.desktop.in.in: added GTK category.
-	Fixes bug 328035.
-
-2006-02-07  Andre Klapper <a9016009@gmx.de>
-	* data/evolution.desktop.in.in: added a _GenericName
-	value. Fixes bug 329744.
-
-2006-02-06  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in, data/Makefile.am,
-	data/evolution.desktop.in.in: Remove hard-coded 
-	EDS version number. Read it from 
-	evolution-data-server.pc instead.
-
-2006-01-30  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in, NEWS: Release updates, version bump.
-	***** Release 2.5.90 *****
-
-2006-01-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* tools/evolution-launch-composer.c: (do_send):
-	Use g_list_delete_link() instead of g_list_remove_link()
-	+ g_list_free_1().
-	* tools/killev.c: mark a couple vars static and remove a
-	stray semi-colon.
-
-2006-01-21  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* configure.in: Add "zh_HK" to ALL_LINGUAS.
-	
-2006-01-19  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Fix to allow longer file names 
-	on 'make dist' using automake 1.9.
-
-2006-01-17  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in, NEWS: Release updates, version bump.
-	***** Release 2.5.5 *****
-
-2006-01-17  Harish Krishnaswamy  <kharish@novell.com>
-
-	Patch submitted by Johnny Jacob <johnnyjacob@gmail.com>
-	* configure.in: Add import-ics-attachments to plugins list
-	and Makefile target.
-
-2006-01-16  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	* configure.in: Use libnotify >= 0.3.0.
-
-2006-01-16  Harish Krishnaswamy <kharish@novell.com>
-	
-	* configure.in: Add caldav to plugins_base_always
-	and Makefile target.
-
-2006-01-11  Harish Krishnaswamy <kharish@novell.com>
-	
-	* configure.in: Enlose the computed value of MOZILLA_NSS_LIB_DIR
-	with quotes as this will be used in the code as a string constant.
-
-2006-01-09  Simon Zheng  <simon.zheng@sun.com>
-
-	* configure.in: Add the macro MOZILLA_NSS_LIB_DIR to store mozilla
-	nss library path.
-
-2006-01-07  Tor Lillqvist  <tml@novell.com>
-
-	* server.mk: Add whitespace before all line continuation
-	backslashes. Fixes build on Debian-based systems. (#325574,
-	Sebastien Bacher)
-
-2006-01-04  Tor Lillqvist  <tml@novell.com>
-
-	* evolution-zip.in: Include also the glade files in the plugins
-	directory.
-
-	Include all of etc/gconf in the zipfile. (One should "make
-	install" to a temporary directory when building a distribution
-	anyway, so only evolution's GConf stuff will be included.)
-
-2006-01-02  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS, configure.in: Release updates, version bump.
-	***** Release 2.5.4 *****
-
-2005-12-22  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in: Fix minor errors in the Network Manager tests.
-
-2005-12-22  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* configure.in: Network Manager Support- Check if dbus, dbus-glib, 
-	nm_glib is present and build Network Manager Support accordingly. 
-
-	* ChangeLog: Remove spurious duplicate entries which seem to have 
-	been committed accidently.
-	
-2005-12-19  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	committing for David Trowbridge <trowbrds cs colorado edu>
-
-	* configure.in: Added the plugin for publishing calendar.
-
-2005-12-17  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in: Include libedataserver-$EDS_PACKAGE in the
-	requirement list for E_WIDGETS.
-
-	Set bindir_in_server_file, privlibexecdir_in_server_file and
-	componentdir_in_server_file. On Unix, they are the same as bindir,
-	privlibexecdir and componentdir respectively. On Win32, use paths
-	relative from lib/bonobo/servers. AC_SUBST these variables.
-
-	* server.mk: Substitute the values above new variables for the
-	corresponding @..._IN_SERVER_FILE@ strings in the .server.in.in
-	files.
-
-	* addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
-	* calendar/gui/GNOME_Evolution_Calendar.server.in.in
-	* calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
-	* mail/GNOME_Evolution_Mail.server.in.in
-	* shell/GNOME_Evolution_Shell.server.in.in
-	* shell/GNOME_Evolution_Test.server.in.in: Correspondingly, use
-	the @..._IN_SERVER_FILE@ strings.
-
-	* evolution-plugin.pc.in
-	* evolution-shell.pc.in: Use @privsolibdir@ to set privlibdir.
-
-2005-12-13  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* configure.in: added a new variable to include all
-	the plugin directories.
-	* plugins/Makefile.am: Add all the plugin directories
-	in the dist_subdirs, so that dist has all the plugin
-	directories even if some package is missing.
-
-2005-12-13  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* po/POTFILES.in: Removed the entries for 
-	e-util/e-component-listener.c and e-util/e-time-utils.c.
-
-2005-12-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS, configure.in: Release updates, version bump.
-	***** Release 2.5.3 *****
-
-2005-12-02  Tor Lillqvist  <tml@novell.com>
-
-	* evolution-zip.in: New file, a script used to build a
-	Win32 zipfile distribution of Evolution.
-
-	* Makefile.am
-	* configure.in: Distribute and expand it.
-
-2005-11-28  P S Chakravarthi <pchakravarthi@novell.com>
-
-	* configure.in: Added libnotify for use in new
-	alarm notification UI.
-
-2005-11-26  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in: Drop the IPv6 and getaddrinfo checks, unused here
-	in Evolution. (It's used in e-d-s, though.)
-
-2005-11-23  Srinivasa Ragavan <sragavan@novell.com>
-
-	* configure.in: Made hal dependency optional.
-
-2005-11-16  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* README, removed gal requirement.
-
-2005-11-14  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS, configure.in: Release updates, version bump.
-	***** Release 2.5.2 *****
-
-2005-10-27  Erdal Ronahi  <erdal.ronahi@gmail.com>
-
-	* configure.in: Added ku (Kurdish) to ALL_LINGUAS
-
-2005-10-26  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in: Don't require hal on Win32.
-
-2005-10-25  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: Distclean should remove the header,
-	not iconv-detect.c
-
-2005-10-25  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Turn development warning on.
-	Bump version to 2.5.1.
-
-2005-10-19  Harish Krishnaswamy <kharish@novell.com>
-
-	Committing for Nathan Owens <pianocomp81@yahoo.com>
-
-	* configure.in: Add views/memos/Makefile,
-	calendar/conduits/memo/Makefile to Makefile list
-
-2005-10-18  Srinivasa Ragavan <sragavan@novell.com>
-
-	* configure.in: Added iPod sync e-plugin to experimental plugins.
-
-2005-10-17  Runa Bhattacharjee <runa@bengalinux.org>
-
-	* configure.in : Added Bengali (bn) to ALL_LINGUAS.
-
-2005-10-3  Harish Krishnaswamy <kharish@novell.com>
-
-	* marshal.mk : do not add the srcdir prefix as
-	$< already returns the full path.
-	Fixes #271308.
-
-2005-09-28  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in: Drop unused SOCKET_LIBS leftover. Don't check for
-	OpenLDAP on Win32. Instead, set related variables unconditionally,
-	as LDAP support is always present (in <winldap.h> and -lwldap32).
-	(CAMEL_EXCHANGE): Add more stuff to CAMEL_EXCHANGE_CFLAGS and
-	_LIBS. These are used only in
-	plugins/exchange-operations/Makefile.am, and now it's enough to
-	use only that CAMEL_EXCHANGE_CFLAGS and _LIBS there.
-
-	* win32/dummy.la: libdir is prefix/lib, not bin.
-
-2005-09-05  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* configure.in:grep on Solaris doesn't support -q, use > /dev/null instead.
-
-2005-08-28  Harish Krishnaswamy <kharish@novell.com>
-
-	* configure.in : Turn stable release bit on. Set
-	version to 2.4.0.
-	* MAINTAINERS : Update.
-
-2005-08-24  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* configure.in : Enable building of exchange plugins by default.
-
-2005-08-23  Harish Krishnaswamy <kharish@novell.com>
-
-	* configure.in : Release 2.3.8
-
-2005-08-21  Jens Seidel  <jseidel@cvs.gnome.org>
-
-	* e-util/e-plugin.c:
-	* mail/mail-mt.c:
-	* plugins/sa-junk-plugin/em-junk-filter.c: Fixed the typo
-	"occured" (also in all effected PO files to avoid fuzzyness)
-
-2005-08-21  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* widgets/misc/e-canvas-background.c:
-	* widgets/text/e-entry.c: Resolve Bug #309074 
-
-2005-08-10  Tor Lillqvist  <tml@novell.com>
-
-	* tools/Makefile.am: Don't try to build killev on Win32.
-
-2005-08-09  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* configure.in: Added "th" (Thai) to ALL_LINGUAS.
-
-2005-08-08  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Release 2.3.7
-
-2005-08-07  Rodney Dawes  <dobey@novell.com>
-
-	* help/C/evolution.xml: Change references to the term "vfolder" to
-	use the term "Search Folder" instead
-
-2005-08-04  Sunil Mohan Adapa  <sunil@atc.tcs.co.in>
-
-	* configure.in: Added "te" to ALL_LINGUAS
-
-2005-07-29  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Bump version number
-	
-	*****Release 2.3.6.1***** includes fix for
-	#311731 - (Removing folders from an IMAP) 
-	
-
-2005-07-26  Harish Krishnaswamy  <kharish@novell.com>
-
-	* plugins/calendar-weather/Makefile.am:
-	* plugins/groupwise-features/Makefile.am:
-	* plugins/mail-account-disable/Makefile.am:
-	* plugins/mailing-list-actions/Makefile.am:
-	* plugins/print-message/Makefile.am: Fix make distcheck issues.
-
-	* configure.in: Bump version number
-	***** Release 2.3.6 *****
-
-2005-07-20  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in: Add AC_LIBTOOL_WIN32_DLL. It is apparently
-	required when using bleeding edge libtool.
-
-	Enable building with Mozilla nspr and nss on Win32. No -ldl on
-	Win32. No import library for softokn3.dll provided by the Mozilla
-	people for some reason.
-
-	Add libedataserverui, libglade and gtk+ to the dependencies of
-	CERT_UI, as the libraries in smime call functions from them.
-
-2005-07-19  Sankar P  <psankar@novell.com>
-
-	* configure.in : Removed the proxy and proxy-login plugins as they are 
-	merged into the groupwise-features plugin.
-	
-2005-07-13  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in: Add libedataserverui to the IMPORTERS dependency
-	list.
-
-2005-07-13  Harish Krishnaswamy <kharish@novell.com>
-	
-	*configure.in : bump version
-	***** Release 2.3.5.1 *****
-
-2005-07-13  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in: Don't attempt to build the sa-junk-plugin on
-	Win32, it's very Unix-specific.
-
-	* win32/libevolution-mail.def: Add more entries.
-
-2005-07-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: bump version
-	***** Release 2.3.5 *****
-
-2005-07-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* plugins/Makefile.am : Remove groupwise-features
-	plugin as it is already listed as a base plugin
-
-2005-07-12  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* configure.in: Removed the shell/importer from
-	AC_OUPUT.
-	
-2005-07-12  Vivek Jain <jvivek@novell.com>
-	
-	* configure.in : correted twice inclusion of sa-junk-plugin in
-	"plugins_base" section
-
-2005-07-12  Vivek Jain <jvivek@novell.com>
-	
-	* configure.in : added sa-junk-plugin to 
-	base plugins and AC_OUTPUT section
-
-2005-07-11  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* plugins/exchange-account-setup : Removed this directory. This
-	functionality has now been moved to exchange-operations.
-
-2005-07-11  Srinivasa Ragavan <sragavan@novell.com>
-	
-	* configure.in: Added gnome-vfs-module-2.0  to E_WIDGETS_CFLAGS 
-	for the merged attachment bar.
-
-2005-07-10  Shreyas Srinivasan <sshreyas@novell.com>
-
-	* configure.in: Add mail-account-disable, proxy, proxy-login and
-	groupwise-account-setup to the plugin list.
-	
-2005-07-02  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: bump version
-
-2005-06-27  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in: Drop local mail file lock method tests and the
-	option --enable-file-locking, these are not used in evolution. (Is
-	used in e-d-s.) Ditto for sendmail operation tests and the
-	--with-broken-spool option.
-
-	* win32/libemiscwidgets.def: Add e_selection_model_selection_row_changed.
-
-2005-06-25  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: remove need to define NULL in getaddrinfo check.
-
-2005-06-25  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: move prefer-plain and save-attachments to
-	experimental where they belong.
-
-2005-06-23  Harish Krishnaswamy <kharish@novell.com>
-	
-	* configure.in : add mono plugin to the base list only if 
-	it was enabled as a configure option.
-
-2005-06-23  Kaushal Kumar  <kakumar@novell.com>
-
-	* e-util/Makefile.am, widgets/e-timezone-dialog/Makefile.am,
-	addressbook/gui/search/Makefile.am, 
-	plugins/groupwise-features/Makefile.am: Added widgets in INCLUDES.
-
-	Updated the include paths to use misc instead of widgets/misc.
- 
-2005-06-23  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: fix the --enable-profiler not to disable otherwise
-	enabled plugins.  & added default-mailer plugin stuff.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in (EXTRA_GNOME dependencies): Use $FULL_GNOME_DEPS
-	here explicitly instead of duplicating the list. In the makefiles
-	no need to use both EXTRA_GNOME_CFLAGS and GNOME_FULL_CFLAGS,
-	EXTRA_GNOME_CFLAGS is enough. (Ditto for _LIBS.)
-
-	(privsolibdir): New autoconf variable. On Unix it is identical to
-	privlibdir, on Win32 identical to libdir.
-
-	There is no RPATH mechanism in Win32 DLLs or EXEs. The intention
-	is that Evolution's private shared libraries will be marked in the
-	Makefile.am files as privsolib_LTLIBRARIES. They will thus on
-	Windows get installed in libdir. The DLLs will actually get
-	installed in bindir, thanks to libtool magic. It will thus suffice
-	to have bindir in PATH.
-
-	This also means that we can use gnome_win32_get_prefixes() in
-	libeutil to find out the installation location on the end-user
-	machine based on the location of the DLL. gnome_win32_get_prefixes() 
-	assumes the DLL is in a "bin" subfolder of the end-user
-	installation prefix.
-
-	* win32/Makefile.am (EXTRA_DIST): Fix typo. Add libetable and
-	libetext.
-
-	* win32/libetable.def
-	* win32/libetext.def: New files.
-
-	* win32/libemiscwidgets.def: Add new entries.
-
-2005-06-17  Kaushal Kumar  <kakumar@novell.com>
-
-	* Retired GAL from Head. The relevant files have moved inside 
-	evolution. Thanks to JP Rosevear for performing the cvs surgery. The 
-	files have been moved in the following order.
-
-	evolution/e-util <- gal/gal/util
-	evolution/a11y <-  gal/gal/a11y
-	evolution/a11y/e-table <- gal/gal/a11y/e-table
-	evolution/a11y/e-text <- gal/gal/a11y/e-text
-	evolution/widgets/table <- gal/gal/e-table
-	evolution/widgets/text <- gal/gal/e-text
-	evolution/widgets/misc <- gal/gal/widgets
-	evolution/widgets/misc/pixmaps <- gal/gal/widgets/pixmaps
-	evolution/widgets/menus <- gal/gal/menus
-
-	Following is the summary of changes done to fix the build:-
-	- New files added to cvs repository,
-		- a11y/e-table/Makefile.am
-		- a11y/e-text/Makefile.am
-		- widgets/table/Makefile.am
-		- widgets/text/Makefile.am
-		- widgets/misc/pixmaps/Makefile.am
-		- iconv-detect.h
-		- iconv-detect.c
-	- Updated configure.in.
-	- Updated all the relevant Makefile.am files.
-	- Updated the include paths to replace all gal references.
-	- Updated the marshal list to suit gal files requirements. 
-
-2005-06-16 Harish Krishnaswamy <kharish@novell.com>
-	
-	* configure.in : add mono to the plugins list
-	
-	* data/evolution.desktop.in.in : 
-	Fix for	#307176 (patch from Andre Klapper)
-	correct the version of evolution-data-server.
-
-2005-06-15  Tor Lillqvist  <tml@novell.com>
-
-	* configure.in: Check for Win32. Define Automake conditional
-	OS_WIN32. Define autoconf substitutions SOEXT (.so vs. .dll) and
-	NO_UNDEFINED (empty vs. -no-undefined). Check for regexec, perhaps
-	in a separate -lregex. Include also camel-provider's CFLAGS and
-	LIBS for IMPORTERS. Expand win32/Makefile.
-
-	* Makefile.am (SUBDIRS): Add win32.
-	
-	* plugin.mk: Expand also @SOEXT@.
-
-	* server.mk: Expand also @SOEXT@ and @EXEEXT@.
-
-	* win32/README
-	* win32/Makefile.am
-	* win32/dummy.la
-	* win32/libemiscwidgets.def
-	* win32/libevolution-addressbook.def
-	* win32/libevolution-calendar.def
-	* win32/libevolution-mail.def
-	* win32/libfilter.def: New files. Build bootstrap import libraries
-	for some of Evolution's DLLs to work around circular dependencies
-	between some of the shared libraries. Circular dependecies are
-	problematic on Win32 where one can't have undefined symbols in
-	executables (or shared libraries).
-
-2005-06-14  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* configure.in : Add a configure option --enable-exchange to build
-	Exchange plugins. Also changed the Exchange plugin name to
-	exchange-operations.
-
-2005-06-12  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* plugins/exchange-operations : Added a new plugin directory for
-	renaming exchange-account-setup as exchange-operations.
-
-2005-06-10  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* configure.in : Added CAMEL_EXCHANGE CFLAGS/LIBS for exchange plugins.
-
-2005-06-07 Harish Krishnaswamy <kharish@novell.com>
-
-	* configure.in: bump version.
-
-2005-05-25  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: if --enable-mono, then enable the mono plugin.
-
-2005-05-23  Vivek Jain <jvivek@novell.com>
-	
-	* configure.in : Removed the entries of 
-	groupwise-account-setup
-	shared-folder
-	groupwise-send-options
-	groupwise-status-tacking
-	send-options
-	addressbook-groupwise
-	from AC_OUTPUT and base plugins and added
-	consolidated 'groupwise-features' plugin to base plugins and 
-	AC_OUTPUT
-
-2005-05-19  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* configure.in: Added a plugin to mark all messages
-	as read for the selected and the sub folders to base
-	plugin.
-
-2005-05-19  Vivek Jain <jvivek@novell.com>
-	
-	* configure.in : add print-message plugin to base plugins and 
-	 AC_OUTPUT
-
-2005-05-18  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in : Bump version
-
-2005-05-13  Rodney Dawes  <dobey@novell.com>
-
-	* plugins/Makefile.am (DIST_SUBDIRS): Add profiler so that it gets
-	disted properly
-
-2005-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added mail-remote stuff.  an experimental plugin.
-
-2005-05-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: check for libsoup-2.4 else fail over
-	to libsoup-2.2.
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* plugin.mk: changed .eplug rule to also convert i18n tags if it
-	ends in xml.  Also convert .error.xml into .error converting i18n
-	tags.
-
-2005-05-06	Srinivasa Ragavan <sragavan@novell.com>
-
-	* addressbook/gui/component/ldap-config.glade: Changed string 'login'
-	* mail/evolution-mail.schemas.in.in: Rephrased photo string
-	* mail/mail-config.glade: Rephrased photo string
-	* ui/evolution-mail-message.xml: Changed 'From' to 'from'
-	
-2005-05-05  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: reset upgrade revision to 0
-
-2005-05-04 Amish <lists@munshi.biz>
-	
-	* evolution-plugin.pc.in, evolution-shell.pc.in : use
-	@GAL_PACKAGE@ instead of hardcoding the version. Fixes
-	evolution-exchange build issues.
-	
-2005-04-28  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: add an --enable-profiling arg, build the profiling
-	plugin optionally as well.
-
-2005-04-26  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in : Bump version
-
-2005-04-25  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Bump libsoup requires.
-
-2005-04-20  James Henstridge  <james@jamesh.id.au>
-
-	* configure.in (EVO_SET_COMPILE_FLAGS): fix up macro so that it
-	doesn't trigger configure failures with newer versions of
-	pkg-config.  Fixes bug #300436.
-
-2005-04-11  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: bump version, requires
-
-2005-03-11  David Malcolm  <dmalcolm@redhat.com>
-
-	* configure.in: set up DBUS_VERSION for use in the new-mail-notify
-	plugin 
-
-2005-03-31  Steve Murphy  <murf@e-tools.com>
-
-        * configure.in: Added "rw" to ALL_LINGUAS.
-
-2005-03-29  Adi Attar  <aattar@cvs.gnome.org>
-
-	* configure.in: Added "xh" to ALL_LINGUAS.
-
-2005-03-27  Ahmad Riza H Nst  <ari@160c.afraid.org>
-
-	* configure.in: Added id (Indonesian) to ALL_LINGUAS line.
-
-2005-03-21  Radek Doulik  <rodo@novell.com>
-
-	* configure.in: require gtkhmtl 3.7.0 with 3.8 package/api version
-
-2005-03-21  Philip Van Hoof  <pvanhoof@gnome.org>
-
-	* configure.in: Fix for #73917
-	
-2005-03-16  Pawan Chitrakar  <pawan@nplinux.org>
-
-	* configure.in: Added ne in ALL_LINGUAS
-
-2005-03-07  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requires
-
-2005-02-28  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requires
-
-2005-02-28  JP Rosevear  <jpr@novell.com>
-  
-  	* configure.in: add startup wizard plugin
-	
-2005-02-28  JP Rosevear  <jpr@novell.com>
-  
-  	* plugins/Makefile.am: dist standard and experimental plugins
-  
-  	* configure.in: move "all" plugins to standard and experimental
-  	and default to building the standard set
- 		
-2005-02-27  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: add mail/default/de to ac_output to fix the build
-
-2005-02-23  Björn Torkelsson <torkel@acc.umu.se>
-
-	* Makefile.am (DISTCLEANFILES): remove *.pc and intltool-*
-	files generated by configure when running make distclean.
-
-2005-02-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* configure.in: Make mailer depend on libedataserverui.
-
-2005-02-22  Marco Pesenti Gritti  <marco@gnome.org>
-
-	* configure.in: Depend on gnome-vfs >= 2.4
-
-2005-02-22  Rodney Dawes  <dobey@novell.com>
-
-	* data/Makefile.am (CLEANFILES): add new variable with the generated
-	keys and desktop file listed so that they get removed with make clean
-	(EXTRA_DIST): Don't dist the generated keys file
-
-2005-02-01  Priit Laes <amd@store20.com>
-
-	* configure.in : Remove duplicate entries for addressbook-groupwise,
-	groupwise-status-tracking and default-source in plugins list. Fixes
-	make distclean.
-
-2005-02-01  JP Rosevear  <jpr@novell.com>
-
-	* MAINTAINERS: Update
-
-2005-02-01  Priit Laes <amd@store20.com>
-
-	* configure.in : Remove duplicate entry for calendar-file in
-	plugins list.
-
-2005-01-30  Harish Krishnaswamy <kharish@novell.com>
-
-	* configure.in : Correct the typo in plugins_base made in
-	the commit below - let the HEAD to get built again.
-	
-2005-01-29  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* configure.in : add addressbook-groupwise plguin to the 
-	plguin list 
-
-2005-01-26  Rodney Dawes  <dobey@novell.com>
-
-	* configure.in: Add mail/default/pt/Makefile to AC_OUTPUT
-
-2005-01-24  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version and requires
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: e-util needs libgnomeprintui now 
-
-2005-01-21  Sivaiah Nallagatla <snallagatla@novell.com>
-                                                                               
-        * configure.in : added addressbook-file plugin 
-
-2005-01-21  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* configure.in : added default-source plugin  
-
-2005-01-20  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* configure.in : added a plugin for displaying the
-	  groupwise status tracking options
-
-2005-01-13  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version to 2.1.3.2
-
-2005-01-13  Rodney Dawes  <dobey@novell.com>
-
-	* configure.in: Add new-mail-notify to the plugins_all listing
-	so that it gets disted properly
-
-2005-01-12  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: fix plugin listing, bump upgrade revision so
-	weather calendar group appears
-
-2005-01-10  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: make itip-formatter a base plugin
-
-2005-01-11  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version
-
-2005-01-11  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added new mail plugin & checks.
-
-2005-01-10  Sushma Rai  <rsushma@novell.com>
-
-	* configure.in: Added Exchange account settings plugin
-
-2005-1-10  Parthasarathi Susarla <sparthasarathi@novell.com>
-        * configure.in : added send options plugin to base plugin list
-
-2005-01-10 Vivek Jain <jvivek@novell.com>
-
-	* configure.in : Add shared-folder to plugin 
-	 and base plugin list. Add corresponding Makfile to AC_OUTPUT section.
-
-2005-01-10 Chenthill Palanisamy <pchenthill@novell.com>
-
-	* configure.in: add send-options plugin
-
-2005-01-09  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: add calendar-file plugin
-
-2005-01-08 Priit Laes <amd@store20.com>
-	
-	* configure.in : Remove duplicate entry for itip-formatter in
-	plugins list.
-
-2005-01-08 Harish Krishnaswamy <kharish@novell.com>
-
-	* configure.in : Add gnome-vfs-module-2.0 to Evo compile flags for
-	the calendar.
-
-2005-01-08  Hans Petter Jansson  <hpj@novell.com>
-
-	* configure.in: Add libedataserverui to the e-util libs and cflags.
-
-2005-01-07  Rodrigo Moya <rodrigo@novell.com>
-
-	* configure.in: removed weatherdatadir definition here.
-
-2005-01-07  David Trowbridge <David.Trowbridge@Colorado.edu>
-
-	* configure.in: added calendar-weather plugin to build.
-
-2005-01-06  JP Rosevear  <jpr@novell.com>
-
-	* data/Makefile.am: add some uninstall rules for local data
-
-2005-01-03  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: add itip-formatter to the "all" list, its not
-	ready to be in the base yet though
-
-2004-12-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* configure.in: Remove select-names from Makefile output list.
-
-2004-12-17  Not Zed  <NotZed@Ximian.com>
-
-	* devel-docs/misc/errors.txt (BUILT_SOURCES): add translation stuff.
-
-2004-12-16  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am, configure.in: added evolution-plugin.pc, pkg-config
-	file required for plugin development.
-
-2004-12-20  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requires
-
-2004-12-14  JP Rosevear  <jpr@novell.com>
-
-	Fixes #6066
-	
-	* README.translators: New information for translators
-
-	* README: Update slightly for 2.1/2.2
-
-2004-12-14  Rodney Dawes  <dobey@novell.com>
-
-	* configure.in (AC_OUTPUT): Add mail/default/zh_CN/Makefile
-
-2004-12-08  Hans Petter Jansson  <hpj@novell.com>
-
-	* plugins/shared-folder/share-folder-common.c: Include
-	<libebook/e-destination.h> from evolution-data-server.
-
-2004-12-03  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* configure.in : Add groupwise-account-setup to plguin 
-	 and base plugin list. Add corresponding Makfile to AC_OUTPUT section.
-	
-2004-12-01  Dafydd Harries  <daf@muse.19inch.net>
-
-	* configure.in: Add "cy" (Welsh) to ALL_LINGUAS.
-
-2004-11-29  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requires
-
-2004-12-02  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Make evolution mail link to camel-provider not
-	camel only.  Removed some camel stuff.
-
-2004-11-16  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (SUBDIRS): removed camel.
-
-	* configure.in: Removed camel building, fixed module includes to
-	use camel via packageconfig.
-
-2004-11-15  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added libeds to camel and mail and filter cflags.
-
-2004-11-09  Rodney Dawes  <dobey@novell.com>
-
-	* configure.in: Add AC_SUBST for plugins_base also
-
-	* plugins/Makefile.am: Add plugins_base to DIST_SUBDIRS so that we
-	dist the plug-ins we actually build by default
-
-2004-11-04  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added mailing-list-actions plugin.
-
-2004-11-04  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: modified base vs optional logic slightly and added
-	a warning if you build with --enable-plugins=no.
-
-2004-11-04  David Trowbridge <David.Trowbridge@Colorado.edu>
-
-	* configure.in: Added calendar-http module, and setup a mechanism
-	for base vs optional plugins.
-
-2004-11-03  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: fix the logic
-	
-2004-11-03  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: handle plain --enable-plugins and
-	--enable-plugins=yes by making it the equivalent of "all"		
-
-2004-11-03  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added plugin-manager plugin.
-
-2004-11-01  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: dist plugin.mk
-
-2004-10-29  Rodrigo Moya <rodrigo@novell.com>
-
-	* configure.in: added mail-to-meeting plugin.
-
-2004-10-28 Nat Friedman <nat@novell.com>
-
-	* configure.in: Re-enable bbwhatever becuase I think it works now.
-
-2004-10-27  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: revive E_WIDGETS_CFLAGS/LIBS because of needing to
-	add libedataserverui
-
-2004-10-27  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: removed bbwhatever it is until the makefiles are
-	fixed.
-
-2004-10-25  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: added audio-inline plugin, added gstreamer check
-	for it
-
-	if gstreamer is not available, remove audio-inline plugin from the
-	plugins list
-
-2004-10-22  Harish K  <kharish@novell.com>
-
-	* configure.in: Added mark-calendar-offline plugin
-
-2004-10-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added folder-unsubscribe plugin
-
-2004-10-22  Nat Friedman <nat@novell.com>
-
-	* configure.in: Added the bbdb plugin.
-
-2004-10-21  Rodrigo Moya <rodrigo@novell.com>
-
-	* configure.in: added save-calendar plugin.
-
-2004-10-21  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added copy-tool plugin.
-
-2004-10-20  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: add select-one-source to the plugin list
-
-2004-10-20  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added prefer plain plugin.
-	
-2004-10-20  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added save attachments plugin.
-
-2004-10-20  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: list plugins as a subdir
-
-	* plugins/Makefile.am: build enabled plugins
-
-	* plugin.mk: simple rule for creating .eplug files
-
-	* configure.in: add plugin foo; --enable-plugins=all turns them
-	all on, or you can --enable-plugins="<plugin dir> <plugin dir>" to
-	list specific ones
-
-2004-10-15  Sarfraaz Ahmed <asarfraaz@novell.com>
-	
-	* camel.pc.in : Change gal-2.2 to gal-2.4
-	* evolution-shell.pc.in : Similar
-
-2004-10-13  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: remove plugins from ac output
-	
-2004-10-13  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: pull in libedataserverui as appropriate
-
-2004-10-01  Jeffrey Stedfast  <fejj@novell.com>
-
-	* configure.in (localedir): Enable imap4 plugin by default. We
-	need to get people building this and testing it.
-
-2004-10-01  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: set the GETTEXT_PACKAGE to evolution-2.2
-	
-2004-10-01  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: set a GTKHTML_API_VERSION variable
-
-2004-09-13  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: change the way ipv6 stuff is done.  separate ipv6
-	setting from getaddrinfo call check, and default to on if the
-	interfaces are available.
-
-2004-09-17  William Jon McCann  <mccann@jhu.edu>
-
-	* configure.in: Fix typos in gal dependency.
-
-2004-09-16  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: use AC_DEFINE properly
-	
-2004-09-16  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump EDS and gal requirements
-
-2004-09-16  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version to 2.1.0 and set base version to 2.2;
-	define DEVELOPMENT here so we don't have to alter code to change
-	in future
-
-2004-09-13  Tomasz KÅ‚oczko <kloczek@pld.org.pl>
-
-	* data/evolution.desktop.in: added missing Encoding=UTF-8 field 
-	  (validate desktop file).
-
-2004-09-11  Akagic Amila  <bono@linux.org.ba>
-
-	* configure.in: Added 'bs' to ALL_LINGUAS.
-	
-2004-08-27  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requirements
-
-2004-08-23  Jeffrey Stedfast  <fejj@novell.com>
-
-	* configure.in: Added some comments about --enable-openssl
-	(e.g. why it is disabled)
-
-2004-08-18  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Added «nb» to ALL_LINGUAS.
-
-2004-08-13  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version. requires
-
-2004-08-13  Rodney Dawes  <dobey@novell.com>
-
-	* acinclude.m4: Revert previous EVO_LDAP_CHECK changes, aren't working
-	as well as expceted and determined in testing
-
-2004-08-13  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* configure.in:
-	Add option to specify location of kerberos 4/5 libraries and
-	headers directories.
-	Needed for 64bits support.
-
-2004-08-13  Rodney Dawes  <dobey@novell.com>
-
-	* configure.in: Add value and description fields to AC_DEFINE calls
-	for the HAVE_ET_COM_ERR_H and HAVE_COM_ERR_H checks
-
-2004-08-13  Rodney Dawes  <dobey@novell.com>
-
-	* acinclude.m4: Remove EVO_CHECK_LIB
-	Update EVO_LDAP_CHECK to support --with-openldap-{libs,includes}
-	Sync with e-d-s acinclude.m4 (Adds GTK_DOC_CHECK)
-
-2004-08-13  Rodney Dawes  <dobey@novell.com>
-
-	* configure.in: Check for et/comm-err.h and comm_err.h so that
-	we can include the correct one
-
-2004-08-12  Rodney Dawes  <dobey@novell.com>
-
-	* data/evolution.desktop.in.in: Update Name and description to
-	not include "Ximian" or "(Unstable)"
-	Remove the MimeType field since we can't open these types on the
-	command line
-
-2004-08-12  Jeffrey Stedfast  <fejj@novell.com>
-
-	* configure.in: Check for gtk+-2.4 in order to enable the use of
-	GtkFileChooser.
-
-2004-08-09  Ankit Patel <ankit@redhat.com>
-
-	* configure.in: Gujarati & Panjabi Languages added
-
-2004-08-02  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requirements
-
-2004-08-01  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: add libedataserver to E_UTIL flags
-
-2004-07-25  Gil Osher  <dolfin@rpg.org.il>
-
-	* configure.in: Added 'he' (Hebrew) to ALL_LINGUAS.
-
-2004-07-21  Ray Strode  <rstrode@redhat.com>
-
-	* evolution/data/evolution.desktop.in.in: Add MimeType line to
-	desktop file new mime sytem.
-
-2004-07-19   JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requirements
-
-2004-07-07  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add CAMEL_GROUPWISE cflags/libs.
-
-2004-07-02  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requirements
-
-2004-08-24  JP Rosevear  <jpr@novell.com>
-
-	* configure.in (plugindir): set a plugin dir so we can easily
-	install to the same place everywhere
-	
-2004-08-24  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: Check for mono support properly
-
-2004-07-05  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: add some mono checks.
-
-2004-06-24  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* configure.in: Added Walloon (wa) to ALL_LINGUAS.
-
-2004-06-20  Arafat Medini <lumina@silverpen.de>
-
-	* configure.in: Added arabic locale ar to ALL_LINGUAS.
-
-2004-06-17  Fernando Herrera  <fherrera@onirica.com>
-
-	* data/evolution.desktop.in.in: Use "Evolution" for 
-	X-GNOME-Bugzilla-Product to match b.x.c product name.
-
-2004-06-09  Dan Winship  <danw@novell.com>
-
-	* configure.in (AC_OUTPUT): Remove shell/glade/Makefile, which has
-	been merged into shell/Makefile
-
-2004-06-03  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version, requirements
-
-2004-06-02  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (EDS_REQUIRED): bump to 0.0.93.1.
-	(BASE_VERSION): change to 12 for the ESource absolute_uri stuff.
-
-2004-06-01  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: check for statvfs.
-
-2004-05-24  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add addressbook/tools/Makefile.am back to the
-	build.
-
-2004-05-19  Jeffrey Stedfast  <fejj@novell.com>
-
-	* configure.in: Setup the icon install paths (not that we actually
-	use them yet).
-
-2004-05-19  JP Rosevear  <jpr@novell.com>
-
-	* configure.in: bump version
-
-2004-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: add some stuff for statfs.
-
-	* devel-docs/misc/errors.txt: updated for xml format and i18n
-	changes.
-
-2004-04-30  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Require intltool 0.30 for the error xml files
-
-2004-04-30  Mike Castle <dalgoda@ix.netcom.com>
-
-	* data/Makefile.am (install-data-local): get the mime file from
-	src dir for srcdir != builddir
-
-2004-04-30  Not Zed  <NotZed@Ximian.com>
-
-	* tools/killev.c (main): use gnome_i18n_get_language_list so we
-	get the right one (LC_MESSAGES).
-
-2004-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (UPGRADE_REVISION): Changed to 11.
-
-2004-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (UPGRADE_REVISION): Changed to 10.
-
-2004-04-26  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require newer gtkhtml with new gtk_html_begin's
-	flags
-
-2004-04-21  Rodney Dawes  <dobey@ximian.com>
-
-	* autogen.sh: Require automake 1.6 or neweer, we already do for libsoup
-	and evolution-data-server, there is no reason not to here
-
-2004-04-21  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (EDS_REQUIRED): bump to 0.0.92.1 for new EContact
-	company phone foo.
-	(UPGRADE_REVISION): bump to 9.
-
-2004-04-21 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* configure.in : added libegroupwise dependency to CAMEL 
-	 compile flags 
-
-2004-04-19  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Require gnome-icon-theme >= 1.2.0
-
-2004-04-19  Michael Terry  <mike@mterry.name>
-
-	* data/evolution.desktop.in.in: Use the icon theme
-
-2004-04-19  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: bump version, requirements
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (UPGRADE_REVISION): bump to 8 for new contact list
-	migration, since there was a bug in the shell that caused all
-	migration to fail, but the key was still updated.
-	
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (UPGRADE_REVISION): bump to 7 for new contact list
-	migration.
-
-2004-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (UPGRADE_REVISION): add a new variable that should
-	be bumped whenever a migration change happens in any component.
-
-2004-04-07  Samúel Jón Gunnarsson  <sammi@techattack.nu>
-
-	* configure.in: Added "is" to ALL_LINGUAS
-
-2004-04-02  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: bump version, requirements
-
-2004-03-22  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml 3.1.10, it's needed for composer
-	changes
-
-2004-03-15  Hao Sheng <hao.sheng@sun.com>
-
-	* a11y/addressbook/Makefile.am: make distcheck work
-	* a11y/calendar/Makefile.am: make distcheck work
-
-2004-03-15  Hao sheng  <hao.sheng@sun.com>
-
-	* configure.in: add a11y/addressbook/Makefile	
-
-2004-03-05  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: bump version, requirements
-
-2004-03-02  Dan Winship  <danw@ximian.com>
-
-	* configure.in (DATASERVER_API_VERSION): Define this (the number
-	used in the e-d-s component repo_ids).
-
-	* tools/killev.c (main): Update the repo_ids
-
-2004-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fixed the ENABLE_SMIME conditional to work. Fixes
-	the addressbook relocation error.
-
-2004-02-25  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add "$xhave_nss = xyes" to the AM_CONDITIONAL for
-	ENABLE_SMIME.
-
-2004-02-24  JP Rosevear <jpr@ximian.com>
-
-	* marshal.mk: make sure to use the srcdir to build the list
-
-2004-02-23  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Fix a typo in the smime check, so it actually works
-
-2004-02-23  Adam Weinberger <adamw@FreeBSD.org>
-
-	* configure.in: Added "en_CA" (Canadian English) to ALL_LINGUAS.
-
-2004-02-19  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add AC_ARG_ENABLE(smime...) -- "finally", i can
-	hear the people rejoice.  Only check the --enable-smime status if
-	--enable-ssl is also "yes".  AC_DEFINE (ENABLE_SMIME) if smime is
-	enabled.
-
-2004-02-18  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Require ORBit 2.9.8 or newer
-
-2004-02-12  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (%-$(BASE_VERSION).pc): cp the unversioned file
-	rather than mv'ing it so it doesn't get regenerated at install
-	time.
-
-2004-02-11  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in (IMPORTERS_*): Added libebook-1.0.  Added back
-	mail/importers/Makefile.am.
-
-2004-02-10  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: Add addressbook/importers to AC_OUTPUT
-
-2004-02-09  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: bump version, requirements
-
-2004-02-09  Rodney Dawes  <dobey@ximian.com>
-
-	* tools/killev.c: Use the AlarmNotify_Factory for --force-shutdown
-
-	Fixes #54084
-
-2004-02-09  Rodney Dawes  <dobey@ximian.com>
-
-	* data/evolution.desktop.in.in: Updated BugzillaOtherBinaries tag
-
-2004-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Revert previous change.
-
-2004-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Update to require glib-2.0 >= 2.3.2 (needed for
-	some GValue usage).
-
-2004-01-28  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Disable the possibility of using OpenSSL until someone
-	decides it is worthy and ends up maintaining the code, though porting
-	to GNUTLS would probably be a better option, if that happens
-
-2004-01-26  David Trowbridge <trowbrds@cs.colorado.edu>
- 
- 	* configure.in: add facilities for installing a help dir
-	
-2004-01-26  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: bump requirements, version
-
-2004-01-24  Sanlig Badral  <badral@openmn.org>
-
-	* configure.in: added "mn" to ALL_LINGUAS.
-
-2004-01-22  Rodney Dawes  <dobey@ximian.com>
-
-	* data/Makefile.am: Add rule to substitute BASE_VERSION in keys
-	* data/evolution.keys.in: Removed this file from CVS
-	* data/evolution.keys.in.in: Update to use BASE_VERSION and the
-	new addressbook vcard control that replaces the MiniCard control
-
-2004-01-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Don't require $LIBBONOBOUI_REQUIRED version of
-	libbonobo
-
-2004-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added mail/default/Makefile and
-	mail/default/C/Makefile.
-
-2004-01-13  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Check for libsoup separately
-
-2004-01-12  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: bump version and requirements
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: add soup as a calendar dep
-
-2004-01-12  Meilof Veeningen  <meilof@wanadoo.nl>
-
-	* configure.in: enable NNTP support by default
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: compile flags for the test component and a
-	conditional compile
-
-2004-01-11  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: dont kill the quote
-
-2004-01-11  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: add enable option to build test component
-
-2004-01-08  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Add BONOBOUI_REQUIRED variable and depend on
-	libbonoboui >= 2.4.3, add an AC_SUBST() for EDS_REQUIRED also
-	* evolution-shell.pc.in: Require the same version of bonoboui that we
-	do in configure.in
-
-2004-01-08 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* configure.in : add camel/providers/groupwise/Makefile to
-	AC_OUTPUT section
-
-2004-01-08  Robert Sedak  <robert.sedak@sk.htnet.hr>
-
-	* configure.in: Added "hr" (Croatian) to ALL_LINGUAS.
-
-2004-01-05  JP Rosevear <jpr@ximian.com>
-
-	* tools/Makefile.am: Add e-util libs
-
-	* configure.in: try compiling with sys/types for freebsd
-
-	(Joe Marcus Clarke <marcus@freebsd.org>)	
-
-2004-01-05  Laurent Dhima  <laurenti@alblinux.net>
-
-	* configure.in: Added "sq" to ALL_LINGUAS.
-
-2004-01-01  Roozbeh Pournader  <roozbeh@sharif.edu>
-
-	* configure.in: Added "fa" (Persian) to ALL_LINGUAS.
-
-2003-12-30 Nicel KM <mnicel@novell.com>
-
-	* configure.in: removed default_user directory references from AC_OUTPUT
-
-2003-12-29  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: default_user is gone
-
-	* Makefile.am: ditto
-
-2003-12-29  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: bump version and gal, e-d-s and gtkhtml
-	requirements
-
-2003-12-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added camel/providers/groupwise to the build.
-
-2003-12-15  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (ACLOCAL_AMFLAGS): remove.
-
-2003-12-07  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: update version reliance
-
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* tools/Makefile.am: Remove hard coded disable deprecated flags
-
-2003-12-05  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml 3.1.3 (new gtk_html_flush method
-	to be used in mailer)
-
-2003-12-04  Christian Hammond  <chipx86@gnupdate.org>
-
-	* art/im*.png, art/Makefile.am: Added IM png files from Gaim.
-
-2003-12-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (EVOLUTION_DIR): Remove the Junk folder
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* data/Makefile.am: Install evolution.desktop as
-	evolution-$(BASE_VERSION).desktop
-	* data/evolution.desktop.in: Remove generated file
-	* data/evolution.desktop.in.in: Add (Unstable) to name
-	Fix comment to be more correct and have correct capitalization
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* tools/killev.c: Use BASE_VERSION for repo_ids and OAFIIDs,
-	Update gnome-spell repo_id to correct version,
-	Update gtkhtml editor OAFIID to GtkHTML 3.1
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: define privconduitdir
-
-2003-11-28  Anders Carlsson  <andersca@gnome.org>
-
-	* configure.in: Look for mozilla-nss.pc, not mozilla.pc.
-
-2003-11-26  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: make sure the mozilla .pc file exists before
-	checking for it
-
-2003-11-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* tools/killev.c (main): kill Evo 2.0's alarm daemon, not 1.4's.
-
-2003-11-19  JP Rosevear <jpr@ximian.com>
-	
-	* MAINTAINERS: Update
-
-2003-11-18  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: remove db3 check
-
-2003-11-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* tools/killev.c (main): kill the alarm notification service, not
-	the factory, which no longer exists.
-
-2003-11-17  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: make sure server.mk is disted
-
-2003-11-17  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): do the right thing for disting
-
-2003-11-17  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: use the server.mk file to get rules for building
-	versioned .server files
-
-	* */Makefile.am: use simplified rule subst
-	
-2003-11-17 JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: Install versioned package config files
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: make source selector flags/libs
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* MAINTAINERS: Update
-
-2003-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): remove libversit from the build.
-
-	* configure.in (CERT_UI): change the libraries we link.
-	(AC_OUTPUT): remove libversit/Makefile
-
-2003-11-11  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: determine the e-d-s version, version the gettext
-	files properly
-
-2003-11-07  Dan Winship  <danw@ximian.com>
-
-	* configure.in (AC_OUTPUT): Remove e-util/ename/Makefile
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: we don't have to configure the libical subdir now
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: pull in evolution-data-server stuff and remove
-	backends from output
-
-2003-10-31  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: set up vars and rules for versioning the .server
-	files
-
-	* Makefile.am's: use rules for versioning .server file, ensure
-	built files are removed before disting
-	
-2003-10-30  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: (AC_OUTPUT): remove smime/tests for now.
-
-2003-10-30  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: set enable_smime=yes wherever nss would be
-	enabled..  fixes manually specifying the nss libs and enabling the
-	smime ui.  Also, add a section for generating the correct SMIME UI
-	flags.  gross, but necessary.  it should probably be wrapped in
-	with all the other nss library crap.
-	(AC_OUTPUT): add smime/tests
-
-2003-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): use $SMIME_DIR. instead of explicitly
-	including smime.
-
-	* configure.in: add some smime foo - a status message, an
-	AM_CONDITIONAL (ENABLE_SMIME)
-
-2003-10-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: added a configure check for AI_ADDRCONFIG
-
-2003-10-24  Dan Winship  <danw@ximian.com>
-
-	* libversit/Makefile.am: Change YFLAGS to AM_YFLAGS to stop an
-	automake 1.7 warning
-
-2003-10-23  Rodney Dawes  <dobey@ximian.com>
-
-	* confiugre.in: Remove mail/importers/Makefile from AC_OUTPUT
-	yet again
-
-2003-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add smime/* dirs. to AC_OUTPUT.
-
-	* Makefile.am (SUBDIRS): add smime/.
-
-2003-10-23  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* configure.in: Check for gnome-thumbnail.h existence 
-	(really committed this time).
-	
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Set $ACLOCAL to have the $ACLOCAL_FLAGS in it, so
-	it doesn't fail to regenerate the files if you run make without a
-	manual autogen after making changes to configure.in and friends.
-	[Many thanks to Marco Pesenti Gritti for pointing out the fix to
-	me.]
-
-2003-10-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Require ORBit 2.8.0 or newer for threading
-
-2003-10-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Revert broken previous commit and actually remove
-	mail/importers/Makefile from AC_OUTPUT
-
-2003-10-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Removed mail/importers/Makefile from AC_OUTPUT
-
-2003-10-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Removed addressbook/tools/Makefile from AC_OUTPUT
-
-2003-10-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Removed pedantic pgp/mime configure flag.
-
-2003-10-22  Dan Winship  <danw@ximian.com>
-
-	* executive-summary/*: Removed; this code has not been used since
-	pre-1.0.
-
-	* importers/*: Removed; the actual importers were moved to
-	{mail,calendar}/importers long ago.
-
-	* my-evolution/*: Removed; gone in evolution 2.0.
-
-	* notes/*: Removed; never finished and no one is working on it.
-
-	* omf-install/*: Removed; part of old doc system
-
-	* tests/*: Removed; these are ancient. Camel regression tests are
-	in camel/tests now.
-
-	* configure.in (E_UTIL_{CFLAGS,LIBS}): Remove soup-2.0 since
-	e-proxy is gone.
-	(EVOLUTION_MAIL_{CFLAGS,LIBS}): Remove soup-2.0 since the mailer
-	uses CamelHTTPStream now.
-	(EVOLUTION_EXECUTIVE_SUMMARY_{CFLAGS,LIBS}): Gone
-	(AC_OUTPUT): Remove my-evolution/Makefile
-
-	* README: evolution no longer depends on soup
-
-2003-10-21  Dan Winship  <danw@ximian.com>
-
-	* configure.in (GNOME_COMPILE_WARNINGS): Turn off the annoying
-	"comparison between signed and unsigned" warning in gcc 3.3
-
-	* evolution-calendar.pc.in (Cflags): add
-	-I${privincludedir}/libical
-
-2003-10-08  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* configure.in: Check for gnome-thumbnail.h existence.
-
-2003-09-04  Dan Winship  <danw@ximian.com>
-
-	* camel.pc.in (Requires): 
-	* evolution-addressbook.pc.in (Requires): 
-	* evolution-calendar.pc.in (Requires): 
-	* evolution-shell.pc.in (Requires): Require gal-2.2
-
-2003-08-27  Bolian Yin <bolian.yin@sun.com>
-
-	* configure.in: add a11y/widgets/Makefile
-	* Makefile.am: move a11y directory before widgets directory.
-
-2003-08-21  Not Zed  <NotZed@Ximian.com>
-
-	* HACKING: Wrote one.
-
-2003-08-20  Bolian Yin <bolian.yin@sun.com>
-
-	* configure.in: Add a11y checking, and a11y Makefiles
-	* Makefile.am: add a11y subdirectory
-
-2003-08-13  Mike Kestner  <mkestner@ximian.com>
-
-	* configure.in: don't make 1.5 the default version (ie LN_S)
-	update to use gal-2.2
-
-2003-08-01  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Add option for '--enable-imapp', for 'new' imap
-	code.
-
-2003-07-26  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: use libgtkhtml-3.1 for linking.
-
-2003-07-26  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Bump version to "1.5", so that we end up being
-	parallel installable with 1.4 again, but we can still release
-	a "1.5.0" tarball when we get to that point in 6 months
-	
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Define EVO_MARSHAL_RULE, which creates glib
-	marshaller .c and .h files that don't cause gcc warnings
-
-	* marshal.mk: The Makefile fragment used by EVO_MARSHAL_RULE.
-	(Can't include newlines in an AC_SUBST, so we have to use
-	AC_SUBST_FILE)
-
-	* Makefile.am (EXTRA_DIST): add marshal.mk
-
-2003-07-20 Hasbullah Bin Pit <sebol@ikhlas.com>
-
-	*configure.in: Added 'ms' (Malay) to ALL_LINGUAS.
-
-2003-07-10  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Change version to 1.4.99 since HEAD is not the
-	stable 1.4 branch, as evolution-1-4-branch was created post-1.4.1
-	
-2003-07-01  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Check for gnome-icon-lookup.h (which could mean
-	either plain GNOME 2.2 or Sun GNOME 2.0)
-
-2003-06-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in:
-	* Makefile.am: removed libwombat from the build.
-
-	* evolution-calendar.pc.in: removed -lwombat.
-
-	* libwombat/*: removed unused directory.
-
-== Version 1.4.1 ==
-
-2003-06-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Depend on GtkHTML 3.0.6, gal 1.99.8.
-
-	* README: Update
-
-2003-06-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am: Added implicity rule to subst @BASE_VERSION@
-	in evolution.desktop.in.in to generate evolution.desktop.in.
-	(desktop_in_file): Removed.
-	(desktop_in_in_file): New.
-	(kdedesktop_file): Update substitution to use
-	$(desktop_in_in_file) instead of $(desktop_in_file).
-	(noinst_DATA): Add $(desktop_file).
-	(install-data-local): Depend on $(mime_file) and $(keys_file).
-	(EXTRA_DIST): Remove $(desktop_file), replace $(desktop_in_file)
-	with $(desktop_in_in_file).
-
-2003-06-19  Dan Winship  <danw@ximian.com>
-
-	* tools/killev.c (kill_component): clean this up a little and make
-	it deal with "evolution" vs "evolution-1.4"
-
-2003-06-19  Danilo Å egan  <dsegan@gmx.net>
-
-	* configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS.
-
-2003-06-17  Not Zed  <NotZed@Ximian.com>
-
-	* NEWS: Updated for current mail stuff.
-
-2003-06-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/Makefile.am: Remove evolution-launch-composer since it's
-	no longer needed.
+2010-03-31  The Evolution Team  <evolution-hackers@gnome.org>
 
+	* *: The ChangeLog is auto-generated when releasing.  If you
+	are seeing this, use 'git log' for a detailed list of changes.
 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
deleted file mode 100644
index 944140f011..0000000000
--- a/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,8530 +0,0 @@
-== Version 1.4.0 ==
-
-2003-06-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 1.4.0.
-	(VERSION_COMMENT): Set to an empty string.
-	(GAL_REQUIRED): Require 1.99.7.
-
-2003-05-28  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: AC_SUBST() for GAL_REQUIRED and GTKHTML_REQUIRED
-	
-2003-05-27  Not Zed  <NotZed@Ximian.com>
-
-	* camel.pc.in: make libs/cflags point to privlibdir/includedir,
-	otherwise this just doesn't work.
-
-== Version 1.3.92 ==
-
-2003-05-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version to 1.3.92.
-
-2003-05-22  Rodney Dawes  <dobey@ximian.com>
-
-	* camel.pc.in:
-	* evolution-addressbook.pc.in:
-	* evolution-calendar.pc.in:
-	* evolution-shell.pc.in: s/GAL_VERSION/GAL_REQUIRED/
-	
-2003-05-22  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
-
-	* configure.in: Added Belarusian to ALL_LINGUAS.
-
-2003-05-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version to 1.3.91.99.
-
-== Version 1.3.91 ==
-
-2003-05-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Renamed GAL_VERSION to GAL_REQUIRED; also, made it
-	not AC_SUBST() it anymore since it's only used in configure.
-	Added GTKHTML_REQUIRED and made all the libgtkhtml-3.0 checks use
-	it.
-
-2003-05-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Remove GNOME_PREFIX stuff.  Add
-	--disable-default-binary command line option, with corresponding
-	DEFAULT_BINARY Automake conditional.
-
-2003-05-19  Not Zed  <notzed@lostzed.mmc.com.au>
-
-	* NEWS: Updated for mail/ camel/ filter/ and e-util/
-
-2003-04-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 1.3.3.99.
-
-== Version 1.3.3 ==
-
-2003-04-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.3.3.
-
-2003-04-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS: Updated for mailer fixes
-
-2003-04-28  Rodney Dawes  <dobey@ximian.com>
-
-	* data/cde_app_root/: Use $(privdatadir) instead of
-	$(prefix)/share/evolution-$(BASE_VERSION) for the cde stuff
-	
-2003-04-21  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Fix KDE_APPLNK_DIR to not install to a diff prefix,
-	and disable installing the file to the KDE applnk path by default
-	
-2003-04-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.3.2.99.
-
-== Version 1.3.2 ==
-
-2003-04-08  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Fix
-
-2003-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Oops, don't use a == when comparing strings in
-	shell.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* tools/Makefile.am (privlibexec_PROGRAMS): remove
-	evolution-addressbook-export.
-
-	* tools/evolution-addressbook-export.c: nuke.
-	
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add addressbook/tools/Makefile to AC_OUTPUT.
-
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (privlibexec_SCRIPTS, privlibexec_PROGRAMS):
-	Install these in privlibexecdir, not privdatadir. Move killev from
-	SCRIPTS to PROGRAMS.
-	(killev_SOURCES, killev_LDADD): Add
-
-	* tools/killev.c: New C port of killev, since
-	"bonobo-activation-query" does not return as much information as
-	"oaf-client" did. Also has prettier output. (Still shells out to
-	killall/pkill to do the actual killing.)
-
-	* tools/killev: Gone
-
-	* tools/evolution-move-tasks: Removed since the evolution-calendar
-	code that called it is also gone now.
-
-2003-04-07  Not Zed  <NotZed@Ximian.com>
-
-	* NEWS: Updated for mail/camel/composer/filter for 1.3.2
-	
-2003-04-06  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* data/Makefile.am: Create $(DESTDIR)$(kdedeskdopdir).
-
-2003-04-04  Chris Toshok  <toshok@ximian.com>
-
-	* acinclude.m4 (EVO_LDAP_CHECK): bleah, add "" in for the "no"
-	case in with_static_ldap.
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* acinclude.m4 (EVO_LDAP_CHECK): the existence of libldap.la
-	should have no bearing on whether or not we try to statically link
-	ldap.
-
-2003-03-29  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * AUTHORS: Added myself as new Portuguese translator.
-
-2003-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Ported check for "killall" vs. "killp" back from
-	1.2.
-
-2003-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am: Fix installation of the .desktop file.
-
-2003-03-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add gal-2.0 to the list of packages to determine
-	WOMBAT_CFLAGS and WOMBAT_LIBS.
-
-2003-03-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Autogen help/Makefile.
-
-	* Makefile.am (SUBDIRS): Add help.  [#38234]
-
-2003-03-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fixed Heimdal include path.
-
-2003-03-25  Rodney Dawes  <dobey@ximian.com>
-
-	* data/evolution.desktop.in: Fix 39901 and 40233
-	
-2003-03-21  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Fix the mit krb5+krb4 check to work with --without-kr5
-
-2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Updated considerably.
-
-2003-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fixed a type-o in the krb5 checks.
-
-2003-03-19  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in (CAMEL_*, E_UTIL_*, ): Add gthread-2.0, to get any
-	thread-specific flags (like -D_REENTRANT).  Duh.  For #39886.
-	(LIBIBEX*): Removed old libibex stuff.
-
-2003-03-14  Chris Toshok  <toshok@ximian.com>
-
-	* tools/evolution-addressbook-export.c (save_cards): use
-	bonobo_main_quit, and clean this up a bit.
-
-2003-03-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added AC_C_INLINE - this should fix bug #39171.
-
-2003-03-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fix kerberos include paths.
-
-2003-03-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update version number to 1.3.1.99.
-
-== Version 1.3.1 ==
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (evolution_launch_composer_LDADD): Fix
-	dependencies
-
-2003-02-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* configure.in: Add calendar/importers/Makefile to output.
-
-2003-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* tools/.cvsignore: ignore some stuff, yo.
-	
-	* tools/Makefile.am: add in the evolution-launch-composer stuff.
-
-	* tools/evolution-launch-composer.c: port this from the 1.2 branch.
-
-2003-02-27  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: export gnome-pilot cflags
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* libversit/Makefile.am: Make this a shared library to prevent
-	linking portability problems
-
-	* tools/Makefile.am (evolution_addressbook_import_LDADD): cleanup
-
-2003-02-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (ENABLE_IPv6): AC_DEFINE() ENABLE_IPv6 if it should
-	be enabled.
-
-2003-02-07  Rodney Dawes  <dobey@ximian.com>
-
-	* data/Makefile.am: Fix installation of desktop/mime files
-	
-2003-02-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add fr to ALL_LINGUAS again.
-
-2003-02-06  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Fix KRB4_CFLAGS to work correctly
-	* data/Makefile.am: Fix desktop file installation path
-	* data/evolution.desktop.in: Use correct binary and categories, add
-	StartupNotify=1 also, for startup-notification-enabled systems
-	
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* configure.in: export priv*dir for libical's configure to use.
-
-	* evolution-addressbook.pc.in (Libs): Remove -L${libdir}.
-	(CFlags): s/includedir/privincludedir/
-
-	* evolution-calendar.pc.in: Likewise
-
-	* evolution-shell.pc.in: Likewise. Also change iconsdir to
-	imagesdir
-
-	* sounds/Makefile.am: remove soundsdir def
-
-	* tools/Makefile.am: subst in $(toolsdir) instead of $(bindir)
-
-	* tools/evolution-addressbook-clean.in:
-	s/EVOLUTION_BINDIR/EVOLUTION_TOOLSDIR/
-
-	* tools/evolution-addressbook-abuse.c (main):
-	s/PACKAGE/GETTEXT_PACKAGE/ in gettext init
-	* tools/evolution-addressbook-export.c (main): Likewise
-	* tools/evolution-addressbook-import.c (main): Likewise
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Define and AC_SUBST privlibexecdir, privdatadir,
-	privincludedir, serverdir, evolutionuidir, imagesdir, buttonsdir,
-	soundsdir, gladedir, etspecdir, and viewsdir.
-
-	* data/Makefile.am (dtappintegrate, dtappunintegrate): use
-	privdatadir
-
-2003-02-04  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Update AC_DEFINEs to use the new syntax to make
-	acconfig.h unnecessary. (Remove unneeded HAVE_KDE_APPLNK define).
-	Call GNOME_COMPILE_WARNINGS and add $WARN_CFLAGS to CFLAGS to get
-	back to the evo 1.2 behavior of defaulting to -Wall everywhere.
-	Fix up privlibdir definition to avoid undefined variables in
-	evolution-shell.pc.
-
-	* acinclude.m4: Update AC_DEFINE
-
-	* acconfig.h: Gone
-
-2003-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (EVOLUTION_MAIL): add gnome-vfs-module-2.0 to the
-	deps so we pick up the right include path.
-
-2003-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: remove the --enable-shlib-components stuff.
-
-2003-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (HAVE_KRB5): Updated to add gssapi libs, since this
-	is what we use krb5 for :-)
-
-2003-01-28  Rodney Dawes  <dobey@ximian.com>
-
-	* tools/Makefile.am (EXTRA_DIST): s/bin_SCRIPTS/tools_SCRIPTS/
-	
-2003-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/evolution-addressbook-export.c: #include bonobo-activation
-	instead of oaf.
-	(main): Initialize using gnome_program_init().
-	(save_cards): Use g_main_loop_quit() instead of gtk_exit().
-
-	* tools/evolution-addressbook-import.c: Update include list for
-	GNOME 2.
-	(main): Initialize using gnome_program_init().
-	(unref_executable): Use g_main_loop_quit() instead of gtk_exit().
-	(add_cb): Likewise.
-
-	* tools/evolution-addressbook-abuse.c: Update include list for
-	GNOME 2.
-	(main): Initialize using gnome_program_init().
-	(use_addressbook): Use g_object_unref() instead of
-	gtk_object_unref().
-	(main): Use g_timeout_add() instead of gtk_timeout_add().
-	(add_cb): Use g_main_loop_quit() instead of gtk_exit().
-
-	* configure.in (AC_SUBST): Add tools/Makefile.
-
-	* Makefile.am (SUBDIRS): Add tools/ back into the list.
-
-	* tools/Makefile.am: Install everything in
-	$(datadir)/evolution-$(BASE_VERSION)/tools.
-	(INCLUDES): Add the defines that gnome_program_init() likes and
-	also add the _DISABLE_DEPRECATED stuff.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (AC_OUTPUT): add in the conduit Makefile's.
-	
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: only do the CONDUIT_CFLAGS/LIBS stuff if pilot
-	conduits have been enabled.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: in the --enable-pilot-conduits stanza, use
-	PKG_CHECK_MODULES to get the gnome-pilot-2.0 (and therefore
-	pilot-link) cflags/libs before doing our utf-8 check.  also,
-	enable the addressbook/calendar CONDUIT_{CFLAGS/LIBS} variables.
-
-2003-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in (evolutionuidir): Define iconsdir.
-
-2003-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (FULL_GNOME_DEPS): Doh. Use the
-	MANUAL_[NSPR,NSS]_[CFLAGS,LIBS] variables where appropriate.
-
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in (idldir): Define componentdir instead of
-	COMPONENT_DIR.  Set it to $privlibdir/components instead of
-	$libdir/evolution-$(BASE_VERSION)/components.
-
-2003-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (MOZILLA_NSS): Simplify the whole process into
-	about 8 lines by using pkg-config.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am: For now, do not install the evolution.1
-	manpage.  Install all the other files with a -$(BASE_VERSION)
-	suffix.
-	(dtappintegrate): Update for the new location of cde_app_root.
-	(dtappunintegrate): Likewise.
-
-	* data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am
-	(cdeappmanagerdir): Version using $(BASE_VERSION).
-	* data/cde_app_root/dt/appconfig/types/C/Makefile.am
-	(cdetypesdir): Likewise.
-	* data/cde_app_root/dt/appconfig/icons/C/Makefile.am
-	(cdeiconsdir): Likewise.
-
-	* sounds/Makefile.am (soundsdir): Version using $(BASE_VERSION).
-
-	* configure.in: Define BASE_VERSION.  Set idldir to
-	$datadir/idl/evolution-$BASE_VERSION instead of just
-	$datadir/idl/evolution.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in (ALL_LINGUAS): Remove fr for now, since it doesn't
-	seem to work.
-	(AC_OUTPUT): Remove calendar/importers/Makefile for now.
-
-2003-01-14  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): intltool, not xml-i18n-tools
-	
-2003-01-07  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (SUBDIRS): add po
-
-	* configure.in: Move ALL_LINGUAS definition to before
-	AM_GLIB_GNU_GETTEXT, or else no linguas for you!
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* configure.in (AC_INIT): Use "Evolution", not "evolution", since
-	that becomes the value of the PACKAGE variable
-	(privlibdir): parse $VERSION by hand since.
-	EVOLUTION_MAJOR_VERSION, etc aren't defined any more (and trying
-	to pass a variable to AC_INIT won't work). This and the above
-	change fix the problem that privlibdir was being defined as
-	"${libdir}/Evolution/." instead of "${libdir}/evolution/1.3"
-	(GAL_VERSION): AC_SUBST this since it's needed in the .pc files
-	(idldir): define this here rather than in each Makefile.am that
-	needs it.
-	(AC_OUTPUT): Add .pc files
-
-	* Makefile.am (pkgconfig_DATA): Add pc files.
-	(confexec_DATA): Remove this (fooConf.sh files)
-	(SUBDIRS): Move filter earlier in the build. (I think it was
-	calendar that depends on it now?)
-	(%Conf.sh): Remove this. The .pc files are output by configure.in
-	now.
-
-	* camel.pc.in, evolution-addressbook.pc.in,
-	evolution-calendar.pc.in, evolution-shell.pc.in: Replace the
-	*Conf.sh files with these. In addition to the basic variables,
-	include camel_providerdir (in camel.pc) and idldir, IDL_INCLUDES
-	and privlibdir (in the others).
-
-2002-12-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Define COMPONENT_DIR.
-
-2002-11-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add NSPR CFLAGS and LDFLAGS to the E_UTIL build
-	flags.
-
-2002-11-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: AC_OUTPUT(my-evolution/Makefile).
-
-2002-11-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (changelogs): Add my-evolution.
-
-2002-11-20  Not Zed  <NotZed@Ximian.com>
-
-	* libibex/*: cvs removed it all.  Not much use having it around
-	anymore.
-
-2002-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Check for gconftool-2, and added
-	AM_GCONF_SOURCE_2.
-
-2002-11-18  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added back IMPORTERS_CFLAGS and
-	mail/importers/Makefile
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: we require >= 0.0.9.99 of gal.
-
-2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Set up the my-evolution flags properly, do not
-	AC_SUBST GNOME_Evolution_Mail.server.in.
-
-2002-11-13  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (SUBDIRS): re-added filter, mail, composer
-
-	* configure.in: Added EVOLUTION_MAIL settings, and mail/makefile.
-
-2002-11-11  Joe Shaw  <joe@ximian.com>
-
-	* Makefile.am (SUBDIRS): remove tools for now, it's not in
-	configure.in.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): add addressbook.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add some more addressbook paths.
-
-2002-11-08  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added composer/Makefile & gtkhtml-3.0 deps.
-
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (AC_OUTPUT): GNOME_Evolution_Summary.oaf.in = >
-	GNOME_Evolution_Summary.server.in
-
-2002-11-07  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: update e-util and calendar compile flags
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added libgnome-2.0 to camel requirements.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add some more addressbook dirs to AC_OUTPUT.
-
-2002-11-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Re-enable the filter cflags/libs stuff.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): add wombat.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add wombat and addressbook compile flags, and add
-	wombat and some addressbook dirs to AC_OUTPUT.
-
-2002-11-05  Dan Winship  <danw@ximian.com>
-
-	* configure.in: change the commented-out soup check to refer to
-	the new soup 2.0 in the libsoup module
-
-2002-11-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: use correct libgtkhtml-3.0 for calendar and added
-	generation of calendar GUI's directories.
-
-2002-11-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: enabled libwombat.
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in:
-	* Makefile.am: added libversit directory to build.
-
-2002-11-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Add shell.
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added calendar/idl/Makefile to AC_OUTPUT
-
-2002-11-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add an AM_GLIB_GNU_GETTEXT.
-
-2002-11-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in:
-	* Makefile.am: re-added calendar component (only non-UI stuff).
-
-	* data/Makefile.am: use intltools instead of xml-i18n-tools.
-
-2002-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: AC_PROG_INTLTOOL instead of
-	AM_PROG_XML_I18N_TOOLS.
-
-2002-11-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update to use Autoconf 2.53.  Remove checks for
-	scrollkeeper.  Remove intl/Makefile and macros/Makefile from
-	AC_OUTPUT list.  Set up GETTEXT_PACKAGE.  Removed
-	AM_ACLOCAL_INCLUDE(macros).  Added AM_PATH_ORBIT2.
-	(EVO_SET_COMPILE_FLAGS): Use PKG_CHECK_MODULES.
-	(IDL_INCLUDES): New, -I params to pass to $(ORBIT_IDL) when
-	compiling IDL files into stubs.
-
-	* autogen.sh: Changed to use gnome-autogen.sh.
-
-2002-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.1.90.99.
-
-== Version 1.1.90 (Release Candidate 1) ==
-
-2002-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: gal 0.21, GtkHTML 1.1.5.
-
-2002-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: Update dep for GAL to 0.21.0.
-
-2002-10-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update version number to 1.1.2.99.
-
-== Version 1.1.2 ==
-
-2002-10-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.1.2.  Update deps for GAL and GtkHTML.
-
-2002-09-27  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* Makefile.am (SUBDIRS): Add m4.
-	(ACLOCAL_AMFLAGS): New variable.
-	(EXTRA_DIST): Add config.rpath.
-	* configure.in (AC_OUTPUT): Add po/Makefile.in, m4/Makefile.
-
-2002-09-23  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: use pkg-config for gtkhtml
-
-2002-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: fix kde applnk test to not test for things if
-	disabled
-
-	* configure.in: Fix up mozilla tests and allow static linking of
-	nss/nspr (Frank Belew <frb@ximian.com>)
-	
-2002-09-23  Aaron Weber  <aaron@ximian.com>
-
-	* README: Update URLs for mailing lists, Evolution application
-	page, help information. Remove note that Evolution is beta. In
-	general, changes to the "soft" data.  Also, jeff's commit to this
-	file from 2001-11-21 seems to have been lost, so I re-removed the
-	stuff he took out. And changed libnspr to mozilla-nspr, and
-	libnss3 to mozilla-nss.
-
-	* data/evolution.1: Update with information about where the real
-	help is. Clarify example formatting.
-
-2002-09-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/cde_app_root/Makefile.am: New.
-	* data/cde_app_root/dt/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/appmanager/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/appmanager/C/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/icons/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/icons/C/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/types/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/types/C/Makefile.am: New.
-
-	* configure.in: Add a `--with-cde-path' option.  Check for
-	dtappintegrate in that path.  Define HAVE_DTAPPINTEGRATE and
-	GNOME_PREFIX.  Also, generate
-	data/cde_app_root/dt/appconfig/types/C/Ximian.dt.in and
-	shell/evolution-nognome.
-
-2002-09-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.1.1.99.
-
-2002-09-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Put po on the top.
-
-== Version 1.1.1 ==
-
-2002-09-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.1.1.  Also bump some requirements.
-
-	* README: Update according to the new requirements.
-
-2002-09-06  Larry Ewing  <lewing@ximian.com>
-
-	* NEWS: update with some gtkhtml features.
-
-2002-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Updated with the new 1.2 features (unfinished).
-
-	* NEWS-1.0: New, contains the changes up to version 1.0.8.
-
-2002-09-04  Dan Winship  <danw@ximian.com>
-
-	* acinclude.m4 (EVO_CHECK_TIMEZONE): Remove this from here.
-
-	* configure.in: Put it here. (Connector no longer needs to share
-	it). Also, check "tm_gmtoff" before "timezone", and if we have
-	"timezone", check for "altzone" too.
-
-	* acconfig.h: Add HAVE_ALTZONE
-
-2002-08-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: e-util now requires soup and gconf flags.
-
-2002-08-12  Dan Winship  <danw@ximian.com>
-
-	* tools/evolution-addressbook-import.c (main): Use default book,
-	not local one.
-
-	* tools/evolution-addressbook-export.c (main): Likewise.
-
-	* tools/evolution-addressbook-abuse.c (abuse_timeout): Likewise.
-
-2002-08-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README: Update required gal and gtkhtml dependency information.
-
-2002-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (THREADS_CFLAGS): Need to check for gal 0.19.99.18
-	for e_xml_save_file().
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Update Soup information and remove hard spaces.
-
-	* configure.in: Check for Soup 0.7 or later.  [Hm, we should make
-	sure that it's actually a 0.7.x version.]
-
-2002-07-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add checks for IPv6 support.
-
-2002-07-30  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in (EVOLUTION_MAIL): added soup to compile flags.
-
-2002-07-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch by Frank Belew <frb@ximian.com>.]
-
-	* configure.in: If no --with-kde-applnk-path is given, try to
-	detect the directory using `kde-config'.
-
-2002-07-22  Dan Winship  <danw@ximian.com>
-
-	* acinclude.m4: Move EVO_CHECK_LIB into here, and also create
-	EVO_PURIFY_SUPPORT, EVO_TIMEZONE_CHECK, and EVO_LDAP_CHECK from
-	stuff in configure.in. (This stuff is also used by Connector.)
-
-	* configure.in: Remove the stuff that was moved to acinclude.m4.
-
-	* evolution_addressbookConf.sh.in: Remove db3 and ldap references
-	since pas-backend-file and pas-backend-ldap are no longer in
-	libpas, and those flags weren't doing anything useful here before
-	anyway. (Our attempts to force static linking to those libraries
-	end up getting mangled when passed through gnome-config.)
-
-	* evolution_calendarConf.sh.in: Likewise, remove db3 references.
-
-2002-07-22  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Check if we're trying to build with the old
-	libversit module borrowed from gnome-pim instead of our own new
-	one, and refuse to build if so.
-
-	* libversit/Makefile.am: Remove libversit.la stuff since we don't
-	want it and it messes up the build slightly.
-
-2002-07-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Prepend "$(WERROR)" to all the *_CFLAGS variables
-	so you can do `make WERROR=-Werror' to turn all compiler warnings
-	into errors.
-
-2002-07-09  Peter Williams  <peterw@ximian.com>
-
-	* libversit/Makefile.am (privlib_LIBRARIES): Install libversit.a so
-	that people compiling against the addressbook can do so successfully.
-
-	* Makefile.am: create our *Conf.sh files and dist them and install
-	them.
-
-	* configure.in: Define and subst some variables that the Conf.sh
-	file need.
-	
-2002-07-10  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (privlibdir): Define a versioned library directory
-	that we can use for things that are ABI-sensitive: camel
-	providers, importers... Define camel_providerder in terms of this,
-	resulting in a new location for the providers. Camel will have to
-	be rebuilt for it to get the new -D flag.
-
-2002-07-12  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (E_UTIL_LIBS): e-util relies on bonobo-conf
-	in e-passwords.c and e-categories-master-list-wombat.c, so
-	reflect that here. And the e-port code needs THREADS_LIBS.
-
-2002-07-09  Peter Williams  <peterw@ximian.com>
-	
-	* tools/Makefile.am (INCLUDES): Add include lines to get
-	ebook headers relative to <ebook/foo.h>, not "foo.h".
-
-2002-07-09    <jpr@ximian.com>
-
-	* configure.in: re-order nss and nspr flags
-
-2002-07-03  Peter Williams  <peterw@ximian.com>
-
-	* README: Fix the URL for the DB 3.1.17 package; it's moved.
-
-2002-06-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	[As suggested by #24466.]
-
-	* data/evolution.desktop.in (Categories): Added.
-
-2002-06-27  Dan Winship  <danw@ximian.com>
-
-	* libversit/Makefile.am: Hack around a libtool/make problem that
-	was causing libversit.a to be rebuilt at "make install" time,
-	causing further relinking down the line.
-
-2002-06-18  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: check for libsoftokn3 if we couldn't link the
-	first time
-
-2002-06-14  Chris Toshok  <toshok@ximian.com>
-
-	* libversit/vobject.c (unUseStr): fix a braindead typo that caused
-	us to leak strings in certain circumstances (when the string being
-	freed was second in the list, the head of the list would get
-	lost.)
-
-2002-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Changed the required version of gal to 0.19.99.17.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Changed the required version of gal to 0.19.99.16.
-
-2002-06-02  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: require gtkhtml-1.1.1.1 aka multicite branch.
-
-2002-05-14  Dan Winship  <danw@ximian.com>
-
-	* data/evolution.1: Document "evolution default:mail"
-
-2002-05-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Add an explanation/warning about why we want Berkeley DB
-	3.1.17 and nothing else.
-
-2002-04-28  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: require gtkhtml-1.1.1.
-
-2002-04-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in (EVO_CHECK_LIB): Bumped the required version number
-	of gal to 0.19.99.15.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Don't generate libibex/Makefile anymore.
-
-	* Makefile.am: Removed libibex from SUBDIRS.
-
-	* tools/Makefile.am: Don't link with libibex.
-
-	* tests/Makefile.am: Same here.
-
-2002-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require gal 0.19.99.14.
-
-2002-04-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.19.99.13.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required gal version number to 0.19.99.12.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required gal version number to 0.19.99.11.
-
-2002-04-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add checks for gethostbyaddr_r
-
-2002-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Check for socklen_t and if it doesn't exist,
-	define it as unsigned int.
-
-2002-04-04  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Fix static linking on solaris which doesn't have a
-	static libresolv.
-
-2002-04-01  Chris Toshok  <toshok@ximian.com>
-
-	* libversit/vobject.c (newStrItem): only include if USE_STRTBL is
-	defined.
-	(deleteStrItem): same.
-	(hashStr): same.
-	(lookupStr): if USE_STRTBL is defined, use existing behavior.  if
-	not defined, just dup the string.
-	(unUseStr): if USE_STRTBL is defined, use existing behavior.  if
-	not defined, just free the string.
-
-2002-04-01  Dan Winship  <danw@ximian.com>
-
-	Darwin/OS X portability from Max Horn <max@quendi.de>
-
-	* libversit/vcc.y: Remove #include <malloc.h>.
-
-	* libversit/vobject.c: Likewise, and #include <stdlib.h>
-
-2002-03-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add argument `--enable-shlib-components'.  New
-	substitutions OAF_SHLIB_LOCATION, OAF_SHLIB_PREFIX,
-	OAF_SHLIB_SUFFIX.
-
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Check for GConf.  Add gthreads to LIBIBEX_CFLAGS
-	and LIBIBEX_LIBS.
-
-2002-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.19.99.10.
-
-2002-03-24  Peter Williams  <peterw@ximian.com>
-
-	* tools/killev: Change the OAFIID for the GtkHTML editor to
-	have :1.1 at the end.
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (evolution_addressbook_import_LDADD):
-	s/libversit.la/libversit.a/
-
-2002-03-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (EVOLUTION_ADDRESSBOOK_DEPS): add gal.
-
-2002-03-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal.
-
-2002-03-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Allow the user to enable OpenSSL over Mozilla NSS
-	using --enable-openssl or --disable-nss.
-
-2002-02-24  jacob berkman  <jacob@ximian.com>
-
-	* sounds/Makefile.am (EXTRA_DIST): add $(sounds_DATA)
-
-2002-02-22  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: add libglade the to the E_UTIL flags.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal.
-
-2002-02-12  Tõivo Leedjärv  <leedjarv@interest.ee>
-
-	* configure.in: Added et to ALL_LINGUAS.
-
-2002-02-09  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: make sure PISOCK cflags are added where
-	appropriate
-
-2002-02-08  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (SUBDIRS): added sounds.
-
-	* configure.in (AC_OUTPUT): added sounds/Makefile.
-
-	* sounds/Makefile.am: new file.
-	* sounds/default_alarm.wav: default alarm sound, currently only used
-	when vCalendar files are imported with audio alarms. We need a better
-	sound.
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal.
-
-2002-01-28  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: added bonobo to filter flags to avoid compile
-	error
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/Makefile.am: Use GNOME_FULL_LIBS and GNOME_FULL_CFLAGS.
-
-	* configure.in: Define the CAMEL_{CFLAGS,LIBS} using
-	EVO_SET_COMPILE_FLAGS.  Likewise define E_UTIL_{CFLAGS,LIBS},
-	E_NAME_{CFLAGS,LIBS}, SHELL_{CFLAGS,LIBS},
-	IMPORTERS_{CFLAGS,LIBS}, WOMBAT_{CFLAGS,LIBS} and
-	E_WIDGETS_{CFLAGS,LIBS}, LIBFILTER_{CFLAGS,LIBS}.  Remove
-	GAL_{LIBS,CFLAGS}.  Add GNOME_FULL_{CFLAGS,LIBS}.  Also, move all
-	this stuff after OpenSSL check so they benefit from all the
-	cflags/ldflags discoveries for the support libraries.
-
-2002-01-25  Ettore Perazzoli  <ettore@ximian.com>
- 
-	* configure.in: Require gal 0.19.99.1.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Define a new macro EVO_SET_COMPILE_FLAGS.  Define
-	EVOLUTION_ADDRESSBOOK_CFLAGS, EVOLUTION_ADDRESSBOOK_LIBS,
-	EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS,
-	EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS, EVOLUTION_SUMMARY_LIBS,
-	EVOLUTION_SUMMARY_CFLAGS, EVOLUTION_CALENDAR_LIBS,
-	EVOLUTION_CALENDAR_CFLAGS, EVOLUTION_CALENDAR_CONDUIT_LIBS,
-	EVOLUTION_CALENDAR_CONDUIT_CFLAGS through it.  Remove SOUP_CFLAGS
-	and SOUP_LIBS.
-
-2002-01-15  Iain Holmes  <iain@ximian.com>
-
-	* configure.in: Add a check for libsoup. Define SOUP_CFLAGS and 
-	SOUP_LIBS
-
-	* README: Update to include the SOUP dependancy.
-
-2002-01-04  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-        * configure.in: Added "eu" to ALL_LINGUAS
-
-2001-12-17  Dan Winship  <danw@ximian.com>
-
-	* configure.in (camel_providerdir): Define this here, using only
-	EVOLUTION_MAJOR_VERSION and EVOLUTION_MINOR_VERSION (and not MICRO
-	and NANO).
-
-2001-12-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: check for alloca.h.
-
-2001-12-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #16358, No man page for Evolution.]
-
-	* data/Makefile.am (man_MANS): Install the man page.
-
-	* data/evolution.1: New man page for Evolution.
-
-2001-12-10  JP Rosevear  <jpr@ximian.com>
- 
-	* configure.in: use UTF-8 as the char set when testing pilot link
- 
-2001-12-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/evolution.desktop.in (_Name): "Ximian Evolution", not
-	"Evolution".
-
-2001-12-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Up VERSION to 1.1.0.99.
-
-2001-12-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: s/PREVIEW_VERSION/VERSION_COMMENT
-
-2001-12-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add a AC_DEFINE for PREVIEW_RELEASE which is a
-	string that will be appended to the X-Mailer header.
-
-2001-11-21  Jeffrey Stedfast  <fejj@ximian.com>
- 
-	* README: Updated. Don't say that the user needs to copy their
-	mozilla database files into ~/evolution, since Evolution now
-	builds it's own default database files if they don't exist and
-	also remove instructions for building with OpenSSL.
- 
-	* acconfig.h: Remove HAVE_OPENSSL define
- 
-	* configure.in: Remove checks for OpenSSL libraries.
- 
-2001-11-20  Wang Jian  <lark@linux.net.cn>
-
-	* configure.in(ALL_LINGUAS): Re-Added zh_CN. It is checked 
-	against gettext 0.10.40 and 0.10.35 without any problem. 
-	Please contact me if anyone wants to disable it (AGAIN).
-
-2001-11-19  Abel Cheung  <maddog@linuxhall.org>
-
-	* configure.in: I will keep adding zh_TW to ALL_LINGUAS before
-	  somebody is willing to tell me why it is deleted without
-	  reason. It was checked against newest gettext (0.10.40) and
-	  older gettext (0.10.35) without any problem. A few
-	  translations are not removed from ALL_LINGUAS even though
-	  they failed in msgfmt checking.
-
-2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Updated.
-
-	* configure.in: 0.99.2.  Require gtkhtml 0.16.1 and GAL 0.18.1.
-
-2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Redone with the bug #s from Bugzilla.
-
-2001-11-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS: Calendar/tasks NEWS.
-
-2001-11-13  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: restore cflags and ldflags properly
-
-2001-11-12  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: save the ldflags properly
-
-2001-11-09  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Check to make sure pilot-link has the charset
-	conversion stuff enabled
-
-2001-11-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/killev: Chop the output from `uname -s'.  Thanks to
-	Michael Gerdts for suggesting the fix.
-
-2001-11-09  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in: Re-added zh_TW to ALL_LINGUAS. Translator keep
-	  complaining to me, and waste a month before discovering it was
-	  disabled while I know nothing about it. Please at least complain
-	  to me if it's gettext problem.
-
-2001-11-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Up to 0.99.1 for snapshot purposes.
-
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Upgrade version number to 0.99.0.  Require GtkHTML
-	0.16 and GAL 0.18.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: Small update
-
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Updated.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/evolution.desktop.in (Icon): evolution.png instead of
-	evolution-icon.png.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update version to 0.17.100.
-
-2001-10-31  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS (Conduits): update
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to MAILER_CFLAGS and MAILER_LIBS too.
-
-2001-10-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS (Mailer): Updated mailer NEWS.
-
-2001-10-30    <NotZed@Ximian.com>
-
-	* NEWS (Mailer): My mailer news.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to the BONOBO_VFS_GNOME_CFLAGS too.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS (Calendar): Calendar NEWS.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to the BONOBO_GNOME_LIBS,
-	BONOBO_GNOME_CFLAGS, BONOBO_HTML_GNOME_LIBS,
-	BONOBO_HTML_GNOME_CFLAGS.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Require GAL version 0.15.99.10.  I know you all
-	love this.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml version 0.15.99.2
-
-2001-10-29  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in (ALL_LINGUAS): added en_AU (copied en_GB).
-
-2001-10-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require gal 0.15.99.9.
-
-2001-10-30  <notzed@ximian.com>
-
-	* configure.in: Move the configure version number check down
-	a bit for gtkhtml/gal, c'ause i'm sick of fixing a manual
-	patch i have every bloody time the version changes.
-
-2001-10-29  Joe Shaw  <joe@ximian.com>
-
-	* configure.in: Require gal 0.15.99.8
-
-	* addressbook/backend/ebook/e-card-simple.c,
-	addressbook/gui/component/addressbook-storage.c,
-	addressbook/gui/widgets/e-addressbook-view.c,
-	calendar/gui/e-calendar-table.c,
-	calendar/gui/e-itip-control.c,
-	calendar/gui/e-meeting-model.c,
-	calendar/gui/itip-utils.c,
-	calendar/gui/print.c,
-	calendar/gui/alarm-notify/alarm-notify-dialog.c,
-	filter/rule-editor.c,
-	mail/mail-config.c,
-	mail/mail-folder-cache.c,
-	mail/mail-format.c,
-	mail/mail-local.c,
-	mail/mail-ops.c,
-	mail/mail-vfolder.c,
-	shell/e-local-storage.c,
-	shell/e-summary-storage.c: Change includes of
-	e-util/e-unicode-i18n.h to gal/util/e-unicode-i18n.h
-
-	* e-util/Makefile.am: Don't build e-unicode-i18n.[ch] anymore.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added my addressbook changes.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* AUTHORS: Add Larry and Radek.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml version 0.15.99.1
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added calendar/importers/Makefile
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.15.99.7.
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* data/Makefile.am: no need to use destdir
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.15.99.6.
-
-2001-10-27  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Change the help string on "--enable-nntp" to
-	mention the fact that NNTP support is incomplete and unsupported.
-	If the user doesn't pass --enable-nntp, don't mention NNTP at all
-	in the summary at the end. Also, mention which SSL library is
-	being used when SSL support is enabled, and don't mention anything
-	about S/MIME since it doesn't work.
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: GAL 0.15.99.5.
-
-2001-10-26  Kevin Breit  <mrproper@ximian.com>
-
-	* AUTHORS: Updated my email address.
-
-2001-10-26    <NotZed@Ximian.com>
-
-	* configure.in: Bump gal requirement.
-
-2001-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: and add a way to get some more spew about the
-	commands we're executing.
-
-2001-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: use eq instead of ==.
-
-2001-10-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required GAL to 0.15.99.3 so EEntry's
-	"draw_button" argument can be used in
-	addressbook/gui/component/select-names/e-select-names.c.
-
-2001-10-22  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in: bumped required GAL to 0.15.99.2.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* acconfig.h: HAVE_KDE_APPLNK.
-
-	* configure.in (EVO_CHECK_LIB): AC_DEFINE `HAVE_KDE_APPLNK' in the
-	case in which the kde applnk dir is found.  Also fix the logic
-	with the checking so it doesn't get fooled.
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-
-	* data/Makefile.am: include destdir in the path of the kde desktop
-	installation dir
-
-2001-10-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am [HAVE_KDE_APPLNK]: Install `evolution.desktop'
-	in the `KDE_APPLNK_DIR'.
-
-	* configure.in: New option `--with-kde-applnk-path'.  Define the
-	`HAVE_KDE_APPLNK' Automake conditional, and the `KDE_APPLNK_DIR'
-	value.
-
-2001-10-19  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Merge the two EXTRA_DIST
-	declarations together so they both happen.
-
-2001-10-18  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: use a new fangled perl script that queries oaf for
-	interfaces we want to kill.
-
-2001-10-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.15.99.1
-	for use in evolution-addressbook-export.
-
-	* tools/.cvsignore: Added evolution-addressbook-clean,
-	evolution-addressbook-export, evolution-addressbook-import, and
-	.libs.
-
-	* tools/Makefile.am: Added evolution-addressbook-clean,
-	evolution-addressbook-export, and evolution-addressbook-import.
-
-	* tools/evolution-addressbook-clean.in: Main script to clean up
-	the local contact database.
-
-	* tools/evolution-addressbook-export.c: Exports the local
-	addressbook to the specified file
-	(--output-file).  If no --output-file is given, writes out to a
-	unique file in the /tmp directory.  In either case, prints the
-	filename to stdout.
-
-	* tools/evolution-addressbook-import.c: Imports the specified file
-	(--input-file) to the local addressbook.
-
-2001-10-18  Wang Jian  <lark@linux.net.cn>
-
-	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
-
-2001-10-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Wrote Addressbook news.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: kill evolution-ldif-importer.
-
-2001-10-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in (AC_OUTPUT): Fix the order of the help/ subdirs.
-	These must be sorted as a preorder walk for a tree!
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.16.99.
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.16.  Require GtkHTML 0.15 or later and GAL 0.14
-	or later.  Also, make $with_nspr_includes default to
-	`/usr/include/nspr' instead of `/usr/include/mozilla' and
-	$with_nss_includes to `/usr/include/moznss' instead of
-	`/usr/include/mozilla'.
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Added info about the shell, plus some minor fixes for
-	consistency.
-
-2001-10-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated.
-
-2001-10-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS (Calendar): Calendar NEWS.
-
-2001-10-09    <NotZed@Ximian.com>
-
-	* NEWS (Mailer): Updated for beta 6.
-
-2001-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: add libart to list of libraries to use in
-	EXTRA_GNOME_CFLAGS/LIBS, which is needed for latest libart versions
-
-2001-10-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: AC_OUTPUT(default_user/local/Makefile) before
-	AC_OUTPUT()ing the other subdirs of `default_user/local'.  Fix
-	pointed out by Dmitry G. Mastrukov <dmitry@fitmark.net>.
-
-2001-10-07  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Remove movemail check, since it's not relevant any
-	more.
-
-2001-10-05  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: Bumped required version of gtkhtml to 0.14.99.1
-
-2001-10-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.13.99.1.
-
-2001-10-01  Aaron Weber <aaron@ximian.com>
-
-	* help/C/Makefile.am: removed an extraneous tab.
-	
-2001-10-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.15.99.
-
-2001-10-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.15.  Require gal 0.13 and gtkhtml 0.14.
-
-2001-10-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added more news.
-
-2001-09-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (nspr_libs): Order the linkline to be the same as
-	the order in Mozilla (it is suggested that they be in this order).
-	(nss_libs): Same.
-
-2001-09-27  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Remove references to the "compose" program, since
-	that functionality went into the shell.
-	(AC_OUTPUT): Sort and remove duplicates.
-
-	* cmdline/*: gone
-
-2001-09-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added a flag to enable pedantic PGP/MIME - this is
-	not recommended for end-users. It is mostly meant for testing
-	purposes.
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: make sure the solaris network libs get added to
-	the LDAP link line before we test for openldap.  Thanks to Frank
-	Belew for finding this.
-
-2001-09-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.12.99.0.
-
-2001-09-21  Nat Friedman  <nat@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Changed to 99.
-	(VERSION): Added ".$EVOLUTION_MICRO_VERSION" suffix.
-
-2001-09-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version to 0.14.  Depend on gal >= 0.12,
-	gtkhtml >= 0.13.
-
-2001-09-21  Michael Zucchi  <NotZed@Ximian.com>
-
-	* NEWS (Mail): Updated.
-
-2001-09-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added more NEWS items here.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Remove dead directory from AC_OUTPUT
-
-2001-09-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Updated required version of gal to 0.11.99.4.
-
-2001-09-14  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: remove unneeded conditionals
-
-2001-09-13  Yanko Kaneti  <yaneti@declera.com>
-
-	* configure.in (ALL_LINGUAS): Added bg to ALL_LINGUAS.
-
-2001-09-13  Larry Ewing  <lewing@ximian.com>
-
-	* data/evolution.mime: override the gnome-vfs.mime to match .vcf
-	as text/x-vcard.
-
-2001-09-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: temporarily disable zh_TW
-
-2001-09-10  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in: Added "zh_TW" to ALL_LINGUAS.
-
-2001-09-07  Dan Winship  <danw@ximian.com>
-
-	* configure.in: one-line OpenSSL fix from Yanko Kaneti
-	<yaneti@declera.com>
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Updated slightly.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes by Neil Conway <neilconway@home.com, as per #8090.]
-
-	* configure.in: Fix the error message if scrollkeeper is not found.
-
-	* README: A bunch of minor fixes, tweaks and cleanups.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #8089, Undocumented Scrollkeeper dependency.]
-
-	* README: Add scrollkeeper 0.1.4 to the list of dependencies.
-
-2001-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Only check for OpenSSL if we were not able to find
-	Mozilla's NSS libraries.
-
-2001-09-04  Peter Williams  <peterw@ximian.com>
-
-	* omf-install/Makefile.am (install-data-local): Don't put
-	$(srcdir) in the file path twice.
-
-2001-09-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.11.99.2.
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* configure.in: Bumped required version of GAL to 0.11.3
-	(for g_utf8_collate)
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch from Nike Gerdts <michael.gerdts@usa.alcatel.com> for
-	#6882, DB3_CFLAGS and DB3_LDFLAGS order messes up CPPFLAGS and
-	LDFLAGS.]
-
-	* configure.in: Put DB3_CFLAGS before the already-defined CPPFLAGS
-	instead of after them; likewise, put DB3_LDADD before the already
-	defined LDADD.
-
-2001-08-24  Dan Winship  <danw@ximian.com>
-
-	* configure.in: We don't need to check for both bonobo-conf 0.11
-	AND bonobo-conf 0.2.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.13.99.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump requirements to GAL 0.11, bonobo-conf 0.11,
-	GtkHTML 0.12.  Don't autogen
-	`doc/devel/executive-summary/Makefile'.  Bump version number to
-	0.13.
-
-2001-08-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS (Global): Added.
-
-2001-08-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated NEWS for addressbook.
-
-2001-08-21  Peter Williams  <peterw@ximian.com>
-
-	* NEWS (Mail): Updated some more.
-
-2001-08-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS: Updated.
-
-2001-08-20  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require gal 0.10.99.5.
-
-2001-08-19  Aaron Weber  <aaron@ximian.com>
-
-	*Makefile.am: added "help" to subdirs.
-	
-2001-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* omf-install/Makefile.am (scrollkeeper_localstate_dir) use
-	$(SCROLLKEEPER_LOCALSTATE_DIR), and not something based on
-	evolution's local state dir.  this should fix the core dumps
-	during install on freebsd and solaris.
-
-	* configure.in (GLIB_CONFIG): use $GLIB_CONFIG if it's set,
-	otherwise default to glib-config.  a cheap solution to get this
-	working on freebsd (where they have glib12-config, but not
-	glib-config.)  also, switch all `glib-config`s to `$GLIB_CONFIG`.
-	(SCROLLKEEPER_LOCALSTATE_DIR): use scrollkeeper-config to figure
-	this out, and AC_SUBST so omf-install/Makefile.am can use it.
-
-2001-08-17  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Move the libical compile order.
-
-2001-08-16  "Big Iain" Holmes  <iain@ximian.com>
-
-	* configure.in: Add widgets/e-timezone-dialog/Makefile
-
-2001-08-16  Jason Leach  <jleach@ximian.com>
-
-	* AUTHORS: I know what you did last summer!
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require gal 0.10.99.3.
-
-2001-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* README: Some info on adding --localstatedir to the configure
-	options.
-	* Makefile.am: Added omf-install to the build.
-	* configure.in: Adjust for the move of the user docs.
-	
-2001-08-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Addded missing dirs to the build. Add checks for
-	scrollkeeper and jw to get the docs building on later Red Hat's.
-	* omf-install/*: Added this for integration with scrollkeeper.
-	
-2001-08-14  Dan Winship  <danw@ximian.com>
-
-	* configure.in (LDAP_LIBS): Remove an obvious typo reported by
-	Miles
-
-2001-08-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* README: Be truthful about the versions of libs we need.
-	
-2001-08-10  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: if libldap.la is there, default to static linking
-	of openldap.  if it's not, default to dynamic.  also, provide
-	--with-static-ldap for users that want to override these defaults.
-
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: link statically with OpenLDAP.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require GAL 0.10.99.2.
-
-2001-08-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* tools/killev: Added #!/bin/sh
-
-2001-08-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Don't link to libnssckbi3 when linking to nss.
-
-2001-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update pilot information
-
-2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require gal 0.10.99.1 or greater.
-
-2001-08-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes #5594, "killev doesn't kill all evolution processes".]
-
-	* tools/killev: Added bonobo-moniker-xmldb, gnome-gtkhtml-editor
-	and gnome-spell-component.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 0.12.99.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Ooops.  We want GAL >= 0.10.0 and GtkHTML >=
-	0.11.0.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Remove `$EVOLUTION_MICRO_VERSION' from `VERSION'.
-	(EVO_CHECK_LIB): 
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 0.12.0.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Added info about the shell changes and slightly changed
-	the formatting for the addressbook ones.
-
-	* configure.in: Require GtkHTML 0.10.0 and GAL 0.9.0.
-
-2001-07-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated NEWS for addressbook.
-
-2001-07-31  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: bump required version of gtkhtml to 0.10.99.
-
-2001-07-20  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Bump to 0.11.99
-
-2001-07-17  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Fix up the "exactly version N" case of EVO_CHECK_LIB
-
-2001-07-16  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Changed to use test -h instead of -L for checking
-	/var/mail vs /var/spool/mail
-
-2001-07-13  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: more updates
-
-2001-07-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS (Mail): Merged mine and Peter's entries.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: Start new entry
-
-2001-07-11  Peter Williams  <peterw@ximian.com>
-
-	* acconfig.h: Add HAVE_BROKEN_SPOOL here.
-
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (have_nss_includes): Fix nss include check to work.
-
-2001-07-11  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added option --with-broken-spool for solaris mbox
-	spool format.
-
-2001-07-10  Marius Andreiana  <mandreiana@yahoo.com>
-
-	* configure.in: Added ro (Romanian) to ALL_LINGUAS
-
-2001-07-05  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (SYSTEM_MAIL_DIR): Make sure /var/mail
-	isn't a symbolic link such as on Red Hat 7.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Upped the required version of gal.
-
-2001-07-03  Dietmar Maurer  <dietmar@ximian.com>
-
-	* *: use bonobo-conf everywhere
-	
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in (MAILER_LIBS):
-	(MAILER_CFLAGS): added bonobo_conf.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Made evolution depend on bonobo-conf 0.2.
-
-2001-07-02  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: Check for gtkhtml 0.9.99.1. 
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Check for libGal 0.8.99.7.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (evolution_db_version): s,AC_DEFINE,AC_DEFINE_UNQUOTED
-	to make these not totally useless.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Build the composer after the addressbook,
-	as it needs some CORBA stuff from the latter.
-
-2001-06-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* tools/killev: Added evolution-alarm-notify.
-
-2001-06-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.8.99.6.
-
-2001-06-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add `camel/tests/mime-filter/Makefile' to the
-	`AC_OUTPUT()' list.
-
-2001-06-27  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (gal): Bump required gal version for new accessors
-	in ETree.
-
-2001-06-24  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add addressbook/gui/contact-list-editor, and
-	correct path of contact-editor.
-
-2001-06-21  Rodrigo Moya <rodrigo@gnome-db.org>
-
-	* libwombat/: added new directory for the libwombat library, which
-	will contain the implementation of all CORBA interfaces defined
-	in the wombat.idl file
-
-2001-06-21  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Fix the OpenLDAP check to default to "no" if you
-	don't specify anything.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* docs/C/usage-sync: Reworded a little bit for more descrip.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/usage-calendar.sgml: Documented categorizing an event.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/usage-mail.sgml: Updated Bcc: example
-
-2001-06-20  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Change --enable-ldap to --with-openldap, allow a
-	path prefix as an argument. Add some libtooly goodness to the
-	libldap check in case it depends on ssl libraries.
-
-2001-06-19  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Tweak the db3 header check to like our RH7 build
-	machine again.
-
-2001-06-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* libversit/vcc.y (LexBuf): Changed buf to an int here.
-	(lexGetQuotedPrintable): Changed cur to an int here.
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Add "--with-db3" to fill in both
-	--with-db3-includes and --with-db3-libs. Make them get cached
-	properly so you don't need to specify it every time. Simplify some
-	code.
-
-	* acconfig.h: Add #defines for the current supported db3 version
-	so that when we change it we don't have to hunt all of them down
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Check the modes on $system_mail_dir and set up
-	variables for camel/Makefile to make camel-lock-helper
-	setuid/setgid.
-
-2001-06-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: One slight db3 check correction
-
-2001-06-11  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: fix typo in -ldb3 check.
-
-2001-06-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Update db3 configure checks for RedHat. /me beats
-	a sleeping cat to death
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.8.99.2.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Added addressbook/gui/merging/Makefile.
-
-2001-06-08  Jason Leach  <jleach@ximian.com>
-
-	* my-evolution/Makefile.am (INCLUDES): builddir != srcdir fix.
-
-2001-06-08  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Byebye executive-summary, hello my-evolution
-
-	* configure.in: Remove all the executive-summary Makefiles. Add the
-	my-evolution.
-
-2001-06-08  Jon Trowbridge  <trow@ximian.com>
-
-	* AUTHORS: Vanity, thy name is trow.
-
-2001-06-05  JP Rosevear  <jpr@ximian.com>
-
-	* config.log: Bump version to 0.10.99
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* README: Included information about db3.
-
-	* acconfig.h: Added HAVE_DB_H and HAVE_DB3_DB_H.
-
-	* configure.in: Added various checks for db3 libraries and
-	includes.  Of note are the new configure options
-	--with-db3-includes=PREFIX and --with-db3-libs=PREFIX to specify
-	the location for your db3 library.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in (GTKHTML_DATADIR): Use --moddatadir to derive this.
-
-2001-05-30  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump gal dependency to 0.8.99.1
-
-2001-05-29  JP Rosevear  <jpr@ximian.com>
-
-	* README: update version requirements
-
-2001-05-23  Dan Winship  <danw@ximian.com>
-
-	* README: Remove reference to verify-evolution-install.sh since it
-	doesn't work any more.
-
-	* configure.in (EVO_CHECK_LIB): allow this to take a max version
-	too, mostly so we can bound the allowable gal versions for
-	releases, but also to require libxml < 2.0.
-	(OpenSSL): Fixicate to work on NetBSD (OpenSSL in /usr, no libdl).
-
-2001-05-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* tools/killev: s/evolution-vcard-import/evolution-vcard-importer
-	
-2001-05-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Create MAILER_CFLAGS and MAILER_LIBS so that we
-	don't have the same libs multiple times in the libtool
-	command-line.
-
-2001-05-20  Duncan Mak  <duncan@ximian.com>
-
-	* tools/killev (sysname): Add in evolution-vcard-importer as part
-	of the list of processes to kill in killev.
-
-2001-05-18  Jon Trowbridge  <trow@ximian.com>
-
-	* Makefile.am (SUBDIRS): Changed build order.  Now addressbook
-	gets built before mail.
-
-2001-05-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Create CAMEL_CFLAGS and CAMEL_LIBS so that we
-	don't have to link in all sorts of unnecessary garbage from GNOME
-	that we don't need.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: add the importers.
-
-2001-05-14  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/evolution-C.omf: added file for Scrollkeeper
-
-2001-05-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add the nspr includes to the list of includes used
-	to test for NSS headers, and don't assume -lpthread in the
-	nss/nspr libs - use PTHREAD_LIB.
-
-2001-05-09  Iain Holmes  <iain@ximian.com>
-
-	* tools/killev: Added rdf-summary killing stuff from R Burton
-	(r.burton@180sw.com)
-
-2001-05-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: OpenSSL LDFLAGS also needs to include -lcrypt
-
-2001-05-08  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Add the importers subdir.
-
-	* configure.in: Make the importers/Makefile
-
-2001-05-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped check for gal to 0.7.99.3.
-
-2001-05-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* acconfig.h: undef HAVE_SSL and HAVE_OPENSSL
-
-	* configure.in: Check for OpenSSL.
-
-2001-05-05  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* configure.in: upped required gtkhtml version to 0.9.3, even that is
-	not enough for idl changes.
-	* README: you need LIB_XML_1_BRANCH. updated all version requirements
-	from configure.in
-
-2001-04-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Don't autogen
-	`executive-summary/widgets/Makefile', as that subdir doesn't get
-	distributed anymore.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* README: We no longer depend on libunicode.
-
-	* configure.in: Remove check for libunicode. Remove unicode cflags
-	and libs from all CFLAGS and LIBS variables. Add GAL_LIBS for
-	things that need to depend on just gal (for gunicode).
-
-	* configure.in: Check for gethostbyname_r so e_gethostbyname_r
-	will DTRT.
-	
-2001-04-24  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump up the gal requirement
-
-2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Don't autogen the the Makefile for the importer
-	docs.
-
-	* Makefile.am (SUBDIRS): Build the docs last.
-
-2001-04-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (have_nspr_libs): We need to link in more than just
-	libnspr4, we also need libpthread.
-	(have_nss_libs): Don't forget to add nsprlibs to the LDFLAGS.
-
-2001-04-21  Duncan Mak  <duncan@ximian.com>
-
-	* art/Makefile.am (images_DATA): Added in composer-message.png.
-
-2001-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: `mail/importers/Makefile' must come after
-	`mail/Makefile'.
-
-2001-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Add `doc'.
-
-	* configure.in: Check for Editor.idl using `$GNOME_PATH' as well.
-
-2001-04-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Updated the required version of gal to 0.6.99.0.
-
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Check if gethostbyname_r take five params
-
-	* acconfig.h: add GETHOSTBYNAME_R_FIVE_ARGS 
-
-2001-04-10  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* AUTHORS: /me is a translator.
-	* configure.in (EVO_CHECK_LIB): fail with AC_MSG_ERROR, not echo &&
-	exit 1.
-
-2001-04-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (EVOLUTION_DIR): create the makefile in
-	camel/tests/smime
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev (sysname): add some more 16 character versions for
-	freebsd.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* AUTHORS: Brag.
-	
-2001-04-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* art/evolution-today-mini.png: converted from exec-16-summary.xpm,
-	removed the latter.
-	* art/evolution-trash.png, art/evolution-trash-mini.png: images for
-	trash folder, one converted from deleted_message.xpm, another from mc.
-	* art/Makefile.am: install.
-
-2001-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README (SSL): Remind users that they will currently have to copy
-	their cert database from their mozilla directory into ~/evolution.
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* art/Makefile.am: added missing (new) files.
-
-2001-03-30  Dan Winship  <danw@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Bump this to 10. (We
-	forgot to do this before branching *again*...)
-
-2001-03-28  Dan Winship  <danw@ximian.com>
-
-	* README: add a bit mentioning that if configure claims you don't
-	have something installed when you think you do, that it's probably
-	because you installed it in the wrong prefix, or because you need
-	a -devel package.
-
-	* configure.in: Add a new macro EVO_CHECK_LIB that checks for a
-	gnome-config-based library of a given version or later, correctly,
-	and if doesn't find it, suggests that you consult the README. Fix
-	the various library checks to use this. Meanwhile, remove a bunch
-	of old cruft and reorganize a little.
-
-	* acconfig.h: Remove cruft
-
-2001-03-28  Jon Trowbridge  <trow@ximian.com>
-
-	* AUTHORS: In a burst of egomania, added myself.
-
-2001-03-26  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: create camel/misc/Makefile
-
-2001-03-22  Dan Winship  <danw@ximian.com>
-
-	* README: Update xml-i18n-tools version
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/new-message.xpm: file->new->mail message
-	* art/folder.xpm: file->new->folder
-	* art/new_appointment.xpm: file->new->appontment
-	* art/print-preview.xpm: file->print preview
-	* art/configure_16_calendar.xpm: for the tools menu
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/splash.png: move it a bit up so the icons fit better
-
-2001-03-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped gal requirement to 0.5.99.11.
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/configure_16_folder.xpm, configure_16_mail.xpm,
-	copy_16_message.xpm, edit.xpm, encrypt.xpm,
-	evo-16-address-conduit.png, evo-16-calendar-conduit.png,
-	evo-16-todo-conduit.png, exec-16-summary.xpm, import.xpm,
-	print.xpm, reply_to_all.xpm, reply.xpm, save.xpm,
-	send-receive.xpm, work_offline.xpm, find_contact.xpm,
-	send-24-receive.png, evo-48-calendar-conduit.png,
-	evo-48-todo-conduit.png, import.png, send-48-receive.png,
-	move_message.xpm, all_contacts.xpm, forward.xpm,
-	configure_16_addressbook.xpm, Makefile.am,
-	evo-48-address-conduit.png: renamed icons to make Miguel's
-	speedups possible
-	* art/evolution-inbox.png: color coded one
-	* art/envelope.png: reverted back to the non-color coded one
-	* art/evolution-contacts-plain.png: non-color coded one for
-	the "new contact" dialogue
-	
-2001-03-21  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Require bison, not yacc (for vcc.y)
-
-2001-03-20  Miguel de Icaza  <miguel@ximian.com>
-
-	* art/Makefile.am (images_DATA): Added all the new icons to the
-	distribution.
-
-2001-03-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: More fixes for NSPR and NSS checks - use fixed it
-	to use AC_CHECK_HEADERS instead of AC_CHECK_FILES. Also made it
-	not default the nspr lib path to /usr/lib/mozilla which may not be
-	in the user's library path when checking for nspr libs.
-
-2001-03-20  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_send-receive.png: send-receive for the s/r dialog
-	* art/24_send-receive.png: send-receive to replace the
-	fetch-mail-doggie
-	* art/16_send-receive.xpm: send-receive for (future) menu
-	item
-	* art/16_import.xpm: for the file menu
-	* art/16_work_offline.xpm: for the file menu
-	* AUTHORS: so I can show off
-	* art/splash.png: making radek famous ;)
-	* art/envelope.png, evolution-calendar.png, evolution-contacts.png, 
-	evolution-tasks.png, evolution-today.png: 
-	 new concept of color coded apps:
-	    - mailer: 		#efb43e
-	    - calendar:		#bab5ab
-	    - contacts: 	#9794ab
-	    - tasks:		#6e9e6e
-	    - exec. summary:	#c4757e
-	
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fix ettore's fix ;-)
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped gal requirement to 0.5.99.8.
-
-2001-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Make sure we never define `NSPR_CFLAGS' or
-	`NSS_CFLAGS' as just "-I".
-
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS: pulled from the 0.9 release.
-
-2001-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Updated the checks for NSS and NSPR
-
-2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README: Added directions on how to build with SSL support.
-
-	* configure.in: Updated the checks for NSS and NSPR
-
-2001-03-16  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_import.png: for the import druid
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump gal requirement to 0.5.99.7
-
-2001-03-15  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* configure.in: create doc/devel/executive-summary/Makefile
-	* evolution.png: moved to art/.
-	* evolution.desktop: moved to data/.
-	* Makefile.am: reflect those moves.
-	* art/*.xpm: moved 8 files from calendar/gui here.
-	* art/Makefile.am: added moved files.
-	distribute *.xpm, install *.png and *view.xpm.
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Updated to AC_SUBST the NSPR/NSS flags.
-
-2001-03-14  Dan Winship  <danw@ximian.com>
-
-	* README: Pull up some of the clarifications from the 0.9 branch
-
-2001-03-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add -lresolv to LDAP_LIBS if it's there.
-
-2001-03-13  Iain Holmes  <iain@ximian.com>
-
-	* configure.in: Added the mail/importers dir.
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README: Rearranged some of the dependencies to try to get them
-	into a more correct order (needed for people building all of these
-	packages by hand).
-
-2001-03-12  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update
-
-2001-03-09  Dan Winship  <danw@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Hm... probably would be
-	clever to be calling this 0.9 rather than 0.8, since it's almost
-	0.10.
-
-2001-03-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* libversit/vcc.y: Changed int to char when returning a character
-	from a stream (since it needs to be able to hold EOF.)
-
-2001-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Removed --enable-assbarn-security and replaced it
-	with the real options:
-	--with-nspr-includes=PREFIX
-	--with-nspr-libs=PREFIX
-	--with-nss=PREFIX
-
-	* acconfig.h: #undef HAVE_NSS
-
-2001-03-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.5.99.6 or later.
-
-2001-03-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* shell/main: /* xgettext:no-c-format */ before the welcome
-	message.
-	* configure.in: Don't try to generate a Makefile in
-	camel/providers/vee as it's empty.
-	
-2001-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update pilot instructions
-
-2001-03-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.4.
-
-2001-03-04  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Reorganize a bit to get rid of warnings about
-	AC_TRY_COMPILE being used before AC_ISC_POSIX
-
-2001-03-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Added views/addressbook/Makefile.
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* art/Makefile.am: install conduit icons
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add logic to make sure we're building against OpenLDAP >= 2
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (SUBDIRS), configure.in: Added views stuff.
-
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Redo the Kerberos stuff again to deal with the
-	stuff currently on my machine. I think it should deal with both
-	the MIT and KTH versions of both krb4 and krb5 now.
-
-2001-03-01  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_evo-address-conduit.png: 48^2 version of the
-	addressbook pilot conduit. (for the new control center)
-	* art/16_evo-address-conduit.png: 16x16 version for current
-	gnomecc
-	* art/48_evo-todo-conduit.png: for new gnomecc
-	* art/16_evo-todo-conduit.png: for old gnomecc
-	* art/48_evo-calendar-conduit.png: for new gnomecc
-	* art/16_evo-calendar-conduit.png: for old gnomecc
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.2.
-
-2001-02-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.1.
-
-2001-02-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.0.
-
-2001-02-14  Dan Winship  <danw@ximian.com>
-
-	* various .cvsignore files: Ignore generated .oaf files
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* art/Makefile.am: install new files
-
-	* art/*view.xpm: add files from calendar/gui
-
-2001-02-11  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: rework ldap check logic so it'll work to
-	--disable-ldap if you've previously configured with --enable-ldap.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt> 
-
-	* data/evolution.keys, evolution.desktop: removed, they are generated.
-	* data/evolution.keys.in, evolution.desktop.in: new untranslated files.
-	* data/evolution.desktop: removed, it duplicates above. 
-	* Makefile.am, data/Makefile.am: reflect above changes, merge 
-	translations. 
-
-2001-02-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added hacks to check for Mozilla libs like nspr
-	and nss that we will need for SSL and S/MIME.
-
-2001-02-09  Michael Meeks  <michael@ximian.com>
-
-	* configure.in: depend on bonobo >= 0.36
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Upped the version number of gal required to 0.5.
-
-2001-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update to latest requirements
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* .cvsignore: Added xml-* files.
-
-2001-02-05  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
-
-	* configure.in (ALL_LINGUAS): Added pt_BR to ALL_LINGUAS.
-
-2001-02-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require version 0.4.99.8 of gal.
-
-2001-02-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Make sure we have gnome-libs 1.2.9 or higher.
-
-2001-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: allow --enable/disable-ldap.
-
-2001-02-01  Jason Leach  <jasonleach@usa.net>
-
-	* tools/killev: Fix this script to make it work with Solaris.
-	Patch from Louise Miller.
-
-2001-01-29  Eskil Heyn Olsen  <eskil@eazel.com>
-
-	reviewed by: JP Rosevear  <jpr@ximian.com>
-
-	* acconfig.h:
-	Added the ENABLE_NNTP define
-	
-	* configure.in:
-	Fixed the NNTP m4 section.
-
-2001-01-29  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* configure.in: added sk to ALL_LINGUAS.
-	* evolution.desktop: added Slovak messages.
-
-2001-01-27  Jason Leach  <jasonleach@usa.net>
-
-	* configure.in (AC_OUTPUT): remove
-	widgets/shortcut-bar/Makefile from here.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Upped the required version of gal in evolution.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add the missing .xpm files.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add `24_find_contacts.xpm',
-	`16_print_xpm', `16_configure_addressbook'.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add `24_all_contacts.xpm'.
-
-2001-01-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Upped the required version of gal in evolution.
-
-2001-01-22  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/splash.png: From the "Ideas from the shower" department:
-	new splash screen.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update package requirements
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	* configure.in: Changed a leftover $with_x_mailer to
-	$with_sub_version.  Made it so that if $with_sub_version isn't
-	specified, we don't try to output it, and also corrected the way
-	SUB_VERSION is defined.
-
-2001-01-18  Federico Mena Quintero  <federico@ximian.com>
-
-	* Makefile.am: Um, why was the doc directory removed from SUBDIRS?
-
-2001-01-17  Larry Ewing  <lewing@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): add the
-	doc/devel/importer/Makefile as a target.
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* acconfig.h: Add `SUB_VERSION', remove `XMAILER_VERSION'.
-
-	* configure.in: Removed `--with-x-mailer' option; replaced with a
-	more generic `--with-sub-version' option.  So, don't define
-	`X_MAILER'; instead, define `SUB_VERSION'.
-
-2001-01-16  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: add --enable-nntp switch.  default is no.
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	* configure.in, acconfig.h: Add --with-x-mailer to set the version
-	string that appears in the X-Mailer header.
-
-2001-01-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Changed the required version of gal.
-
-2001-01-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/16_copy_message.xpm, art/16_move_message.xpm: icons for the 
-	Message->Move/Copy to folder -menu entries.
-
-2001-01-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/evolution-calendar-mini.png: New version of calendar icon that
-	looks more like a calendar and not a dictionary or something :)
-
-	Btw, the icons get scaled for some reason, even though that is
-	not necessary as all of those should be 16x16 pixels. Can anyone look 
-	into this? 
-
-2001-01-15  Dietmar Maurer  <dietmar@ximian.com>
-
-	* *.c: changed the signature of the property_bag get/set
-	functions.
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: remove old config message
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* tools/evolution-move-tasks: new script to move tasks from the
-	Calendar folder to the new Tasks folder, so people won't lose tasks.
-	This can be deleted after a few releases.
-
-	* tools/Makefile.am (bin_SCRIPTS): added above.
-
-	* configure.in: added default_user/local/Tasks/Makefile to AC_OUTPUT.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* config.h.in: Removed GPG stuff.
-
-	* acconfig.h: Take out all refs to PGP and GPG stuff.
-
-	* configure.in: Take out the PGP/GPG detection stuff.
-
-2001-01-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Suggest what to do if gtk-doc is not found.
-
-2001-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Make evolution depend on the new version of gal.
-
-2001-01-12  Dan Winship  <danw@ximian.com>
-
-	* MAINTAINERS, AUTHORS, README: Ximianize. Also update the README
-	a bit and mention the OAF stable branch.
-
-2001-01-11  Dan Winship  <danw@helixcode.com>
-
-	* art/priority-high.xpm: Add a white outline around the "!" so it
-	still shows up clearly in selected rows when your theme selection
-	color is reddish. (Problem pointed out by Federico.)
-
-2001-01-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: At the end of the configure process, report
-	whether the documentation files will be built or not.
-
-2001-01-10  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/move-message.png, art/move-message.png: New versions.
-
-2001-01-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/gui/alarm-notify/Makefile.
-
-2001-01-05  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/evolution-contacts-mini.png: This looks more pretty.
-
-2001-01-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Removed camel/providers/mbox/Makefile and
-	camel/providers/mh/Makefile.
-
-2001-01-01  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require bonobo 0.31
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: If we find threads ok, then always turn on
-	ENABLE_THREADS.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS (Addressbook): Added a bit of addressbook NEWS.
-
-	* configure.in: Updated the gal check to require gal 0.4.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/mail-new.xpm, art/mail-read.xpm, art/mail-replied.xpm: Moved
-	these images each up one pixel.
-
-2000-12-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* NEWS: Update.
-
-2000-12-14  JP Rosevear  <jpr@helixcode.com>
-
-	* NEWS: Update
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/splash.png: New splash from Jimmac.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* README: Removed mention of ETable and EText in widgets
-	directory.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* README: Mention the gconf stable branch.
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the required version of gal.
-
-2000-12-07  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): renamed HTMLEditor.idl to
-	Editor.idl
-
-2000-12-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* data/evolution.keys: Added some Norwegian translations.
-	
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Increased the required version of gal.
-
-2000-12-05  JP Rosevear  <jpr@helixcode.com>
-
-	* README: minor tweak
-
-2000-12-05  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added camel/tests/stream/Makefile.am.
-
-2000-12-01  Dan Winship  <danw@helixcode.com>
-
-	* README: gnome-vfs depends on gconf, so add that.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Bumped required gal version to 0.2.99.4 for
-	e_str_make_safe.
-
-	* README: Added some necessary :'s in the pilot-link cvs stuff.
-
-2000-11-30  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* calendar/gui/main.c, executive-summary/component/main.c, mail/main.c,
-	shell/main.c, notes/main.c,
-	addressbook/gui/component/addressbook-factory.c:
-	removed #ifdef ENABLE_NLS/#endif on Miguel's request.
-
-2000-11-29  JP Rosevear  <jpr@helixcode.com>
-
-	* README: Update pilot info
-
-2000-11-29  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Bump required gal version to 0.2.99.3 for iconv
-	changes
-
-2000-11-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* COPYING-DOCS: Added a copy of the GNU Free Documentation
-	License.
-
-	* Makefile.am (EXTRA_DIST): Added COPYING-DOCS.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* acconfig.h: Add USE_FLOCK, USE_FCNTL, USE_FLOCK
-
-	* configure.in: Auto* magic for various camel locking types
-
-2000-11-28  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in (AC_OUTPUT): Added camel/tests/folder/Makefile
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* AUTHORS: Update - hopefully I assigned blame correctly :-)
-
-	* MAINTAINERS: ditto
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Correct the bonobo version error message
-
-	* README: Update
-
-2000-11-24  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added camel/tests stuff to output macro.
-
-2000-11-14  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added local provider dir to output macro.
-
-2000-11-21  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Check for libgpgme. (Support not added to mail
-	yet.)
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Removed the
-	default_user/local/Tasks/Makefile until the relevant files are on
-	CVS.
-
-2000-11-18  Miguel de Icaza  <miguel@helixcode.com>
-
-	* Added widgets/menus that contains the gal-view-menus.c code from
-	Gal that depended on Bonobo.
-
-	* configure.in: Update list of Makefiles;  
-
-	* widgets/Makefile.am: Update.
-
-2000-11-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Update the gal reqiurement version.
-
-2000-11-10  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo >= 0.29, due to the XSync
-	fix.
-
-2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal 0.2.99.1.
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Require gal 0.2.1.3
-
-2000-11-06  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): ${prefix} doesn't get defaulted
-	until the end of configure, so check if it's "NONE" and use
-	${ac_default_prefix} if so.
-
-2000-11-06  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): also look for HTMLEditor.idl in
-	${prefix}/share/gtkhtml
-
-2000-11-03  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (BONOBO_HTML_GNOME_CFLAGS): raise required version
-	number to 0.8
-	added check for HTMLEditor.idl file
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal 0.2.1.2.
-
-2000-11-02  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo-0.27+
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* addressbook/ename/.cvsignore, addressbook/gui/minicard/.cvsignore,
-	calendar/doc/.cvsignore, widgets/e-paned/.cvsignore,
-	widgets/e-table/.cvsignore, widgets/e-text/.cvsignore: added these
-	files.
-	* calendar/gui/.cvsignore, composer/.cvsignore,
-	executive-summary/.cvsignore, executive-summary/component/.cvsignore,
-	po/.cvsignore: added some files to ignore.
-
-	* addressbook/gui/component/addressbook-factory.c, mail/main.c,
-	shell/main.c, calendar/gui/main.c, notes/main.c,
-	executive-summary/component/main.c: call *textdomain() only if
-	ENABLE_NLS is defined.
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* configure.in: added lt to ALL_LINGUAS.
-	
-2000-10-30  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: fix up printing of kerberos configuration status
-
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal cvs version.
-
-2000-10-27    <jpr@helixcode.com>
-
-	* tools/killev: Kill executive summary components
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* configure.in: Added executive-summary stuff
-
-	* Makefile.am: Added the executive-summary subdirs.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* notes/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-	* configure.in: set localedir here to use in Makefiles.
-	(AM_GNOME_GETTEXT doesn't actually always set it to
-	$(datadir)/locale).
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the gal check to check for gal 0.2.1.
-
-2000-10-22  Robert Brady  <rwb197@zepler.org>
-
-	* configure.in: Added "en_GB" to ALL_LINGUAS.
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate_cb): 
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS (General, Addressbook): Updated NEWS for addressbook and
-	ETable.
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the gal check to check for gal 0.2.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): 6.
-
-	* Makefile.am (EXTRA_DIST): Remove `evolution.spec.in'.
-	(dist-hook:): Removed.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate, control_deactivate),
-	(create_view): cripple, not worth updating to new UI code.
-
-2000-10-17  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/splash.png: This looks happier than the dark piece of rusty
-	metal. And the Big Dig in Boston is ugly looking too. Finnish
-	road poles are much more cool!
-
-2000-10-15  Peter Williams  <peterw@helixcode.com>
-
-	* tools/verify-evolution-install.sh (libcamelvee): Check
-	for linkage against version 0.5 libcamelvee, not version 0.3.
-	This should track with the version of Evolution itself.
-	(rm -f $ldddfile): Remove a temporary file.
-
-2000-10-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Added "nn" to ALL_LINGUAS.
-	
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am (images_DATA): Add `splash.png'.
-
-2000-10-14  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/splash.png: umm.. it's a splash screen image.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Fix bonobo error message
-
-2000-10-11  Jesse Pavel		<jpavel@helixcode.com>
-
-	* data/evolution.keys: Added support for the text/calendar and
-	text/x-calendar MIME types.
-
-2000-10-10  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* configure.in: Added lt to ALL_LINGUAS.
-
-2000-10-10  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* calendar/gui/recur.xpm: Updated round-we-go-thingy icon..
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* art/empty.xpm: make it transparent instead of white.
-
-2000-10-06  Christophe Merlet  <christophe@merlet.net>
-
-	* *.desktop: Added french strings.
-
-2000-10-05  Dan Winship  <danw@helixcode.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Add verify-evolution-install.sh
-	to EXTRA_DIST
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Check for isblank
-
-	* config.h.in: 
-	* acconfig.h: #undef HAVE_ISBLANK
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Bump Bonobo requirement to >= 0.20
-
-2000-10-05  Iain Holmes  <iain@helixcode.com>
-
-	* executive-summary/*: Added the executive summary stuff.
-
-	* ui/evolution-executive-summary.xml: New.
-
-	* art/add-service.png: New icon.
-
-2000-10-03  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* ui/evolution-addressbook-ldap.xml,
-	* ui/evolution-addressbook.xml,
-	* ui/evolution-calendar.xml,
-	* ui/evolution-contact-editor.xml:
-	Fixed typo `_decr' -> `_descr', so some missing tooltips will appear.
-	Also fixed some typos in descr values.
-
-2000-09-29  Peter Williams  <peterw@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): Install the new evolution-subscribe.xml
-	file.
-
-2000-09-29  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-mail.xml: add a Settings/Manage Subscriptions...
-	menu item.
-
-	* ui/evolution-subscribe.xml: add a File/Close menu item.
-
-2000-09-28  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-subscribe.xml: add a FolderSearch control, and
-	change "Refresh" to "RefreshList".
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-subscribe.xml: add an Refresh List button..
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): add evolution-subscribe.xml.
-
-	* ui/evolution-subscribe.xml: new file.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* ui/evolution-mail.xml: Moved the (un)select all menu items over
-	to the Edit menu - this looks nicer.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* ui/evolution-mail.xml: Added some new menu items to the Message
-	menu like (un)select all and moved "mark as read" to the Message
-	menu.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Moved addressbook/ename to e-util/ename so
-	generate e-util/ename/Makefile and don't generate
-	addressbook/ename/Makefile
-
-2000-09-23  Tuomas Kuosmanen  <tigert@localhost>
-
-	* art/attachment.xpm
-	* art/add-attachment.png: OOPS. The attachment.xpm was not the one 
-	I thought, so I accidentally replaced the paperclip icon in the mail
-	list column, which wasnt my intention. I hope this works now. The old 
-	one is back, instead the toolbar icon to add attachment is now called
-	"add-attachment.png" as you can see also from above. Bummer. Sorry :)
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* libversit/vcc.y: Fixed some warnings.  Fixed a bug where quoted
-	printable fields were reading in semi-colons that should have been
-	field separators.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/Makefile.am: Added evolution-addressbook-ldap.xml.
-
-	* ui/evolution-addressbook-ldap.xml: New file.  (A Variation on
-	evolution-addressbook.xml)
-
-	* ui/evolution-addressbook.xml: Added View All and Stop buttons.
-
-2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* ui/evolution-calendar.xml: Removed the AboutCalendar stuff.
-
-	* ui/evolution.xml: Fix mis-spelling of "calendar".
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate): upd.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/.cvsignore: Added a cvsignore file here.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): Added evolution-contact-editor.xml.
-
-	* ui/evolution-contact-editor.xml: New file for the UI for the
-	evolution contact editor.
-
-2000-09-20  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/attachment.xpm
-	* art/send.png: new icons for "compose mail" dialog...
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: alter the krb4 check a bit to deal with configure
-	cache suckage. (If you do AC_CHECK_LIB with the same library and
-	function name but different LDFLAGS, it will still use the result
-	of the previous check. So use a different function the second
-	time.)
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* README: add gal as a dependency
-
-2000-09-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* art/score-*.xpm: stupid looking icons for use with displaying
-	scores in the message-list view. These need a makeover BADLY ;-)
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added check for gnome-app-lib.  Removed
-	directories that have been moved to gal.
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, evolution.spec.in: remove spec file. We haven't
-	been keeping it up to date, and it's only good for RH anyway, and
-	if people really want a spec file they can get it from our SRPMs.
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo 0.19
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added widgets/e-reflow/Makefile.  Replaced
-	addressbook/gui/minicard/Makefile with
-	addressbook/gui/widgets/Makefile.
-
-2000-09-13  Tuomas Kuosmanen  <tigert@localhost>
-
-	* art/pin.png: added icon for the folder tree "pin down" button
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* NEWS (Calendar): Pilot stuff
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: The notes subdir isn't actually used, so remove
-	it.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: 0.5.
-
-2000-09-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* NEWS (Mailer): Added Sent/Outbox feature descriptions
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* NEWS (Mailer): add most (but not all) 0.5 Mailer features
-
-	* configure.in: s/Sentbox/Sent/
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am (buttonsdir): Install the new button icons into
-	`$(datadir)/images/evolution/buttons'.
-
-2000-09-11  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/fetch-mail.png
-	* art/compose-message.png
-	* art/reply.png
-	* art/reply-to-all.png
-	* art/forward.png
-	* art/move-message.png
-	* art/copy-message.png: New icons for the main window toolbar
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS: Added 0.5 changes for ETable and Addressbook.
-
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* README: Add a mention of the verify-evolution-install.sh script
-	in tools/.
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	Reversed my last change as it broke configure, how do I get it so
-	that we can do folders with spaces in the name!?
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Renamed default_user/local/Sentbox to
-	default_user/local/Sent\ Mail as Ettore and Danw are picky about
-	folder names 
-
-2000-09-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added calendar/conduits/Makefile,
-	calendar/conduits/calendar/Makefile and
-	calendar/conduits/todo/Makefile to the list of makefiles to
-	output.
-
-2000-09-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Add default_user/local/Sentbox/Makefile to the
-	list of makefiles to output
-
-2000-08-31  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (kerberos): Check and see if krb_sendauth needs
-	prototyping. (#define NEED_KRB_SENDAUTH_PROTO). Also check
-	for a libkrb that doesn't need -ldes.
-
-	* acconfig.h: #undef it
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* configure.in: AC_DEFINE(USING_GNOME_PRINT_0_20)
-
-	* acconfig.h: #undef that
-
-2000-08-30  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in: Robustify the kerberos checks.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: decruft
-
-2000-08-28  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in: Added Portuguese (pt) to ALL_LINGUAS
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Require oafized bonobo
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Ahem.  If you add dependencies on libraries, make
-	sure things still build.  Fixed the libunicode foo.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c (_get_position_from_xy): Don't crash on illegal string
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c (e_text_event): Use e_utf8_from_gtk_event_key
-	to translate GDK_KEY_PRESS to insertable UTF-8 string
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* announcement-0.4.1.txt: Updated dependency list.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c: Use byte based UTF-8 syntax
-	
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* announcement-0.4.1.txt: Announcement message
-
-2000-08-19  Mathieu Lacage <mathieu@gnu.org>
-
-	Fixes compile for non-standard prefixes. Mainly in idl
-	compilation where -I`gnome-config --datadir`/idl is replaced
-	by `gnome-config --cflags idl` (ugly but it works at least)
-	and add some random _CFLAGS here and there and _LIBS for linking.
-	* addressbook/gui/component/select-names/Makefile.am
-	* composer/Makefile.am
-	* e-util/Makefile.am
-	* filter/Makefile.am
-	* mail/Makefile.am
-	* shell/Makefile.am
-	* widgets/e-text/Makefile.am
-	
-
-2000-08-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added code
-	to make handle position persist across resizes.
-
-2000-08-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fixed a warning.
-
-2000-08-20  arik devens  <arik@helixcode.com>
-
-	* widgets/e-text/Makefile.am (INCLUDES): added UNICODE_CFLAGS
-	support so that compiling in an alternate prefix works.
-
-2000-08-19  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.h: Commented out Suckfont, added EFont
-	* widgets/e-text/e-text.c: Ported to UTF-8
-
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (gnome-vfs): Check for new enough gnome-vfs
-	(needs gnome_vfs_mime_get_default_action_without_fallback)
-
-2000-08-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Generate
-	doc/devel/calendar/cal-util/Makefile.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in: Check for db1/db.h too, which is what
-	RH 7.0 uses for the old db headers. Patch from Kenny Graunke
-	<kwg@teleport.com>
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: offer --enable-pilot-conduits to add pilot
-	conduits if the user wants them.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Fix the name of the binary to look for for PGP5
-
-2000-08-12  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Check for Bonobo 0.17
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/gui/search/Makefile.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, README: Depend on gnome-vfs 0.3
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/.cvsignore, widgets/e-text/Makefile.am,
-	widgets/e-text/e-entry-test.c: Added a test for the EEntry widget.
-
-2000-08-09  Dan Winship  <danw@helixcode.com>
-
-	* data/evolution.keys: New file containing MIME keys for
-	Evolution. Currently just the addressbook minicard display.
-
-	* data/Makefile.am (mime_DATA): add evolution.keys
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Remove the warning about camel-async.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Reenable the calendar. Oops.
-
-2000-08-05  Dan Winship  <danw@helixcode.com>
-
-	* tools/verify-evolution-install.sh: Look for oafinfo files in
-	oaf's prefix, not gnome-libs's. Allow binaries to be installed
-	anywhere in $PATH.
-
-	* configure.in, README: Update the README and the text of the
-	Bonobo configure check to match reality. Remove the 0.15 vs
-	0.15-and-a-half check since we require post-0.16 now.
-
-2000-08-03  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Remove gconf check
-
-2000-08-03 Alastair McKinstry <mckinstry@computer.org>
-
-	* configure.in (ALL_LINGUAS): Add Irish translation
-
-2000-08-02  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: update for BonoboX
-
-2000-08-02  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Add camel/providers/nntp
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made clicking choose the right
-	character even if show_borders is on.
-
-2000-08-01  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: Add checks for GPG, PGP 5 and PGP 2.
-	Only record the first one found.
-
-2000-08-01  Damon Chaplin  <damon@helixcode.com>
-
-	* configure.in (AC_OUTPUT): removed calendar/doc/*
-
-2000-08-01  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added mh provider.
-
-2000-07-27  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Check for gconf_client_get_default (gconf 0.5 vs
-	newer)
-
-2000-07-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Bump version number to 0.3.
-
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-
-	* widgets/e-table/e-table-scrolled.c (right_click_proxy): Default
-	the return value to 0.
-
-2000-07-25  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: some unrelated changes: check for mkdtemp,
-	gnome_vfs_mime_get_default_action_without_fallback, and a
-	setuid/setgid movemail binary.
-
-	* acconfig.h: add MOVEMAIL_PATH
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/conduit/Makefile.
-
-2000-07-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made focus in not change your selection
-	position.
-
-2000-07-21  Szabolcs BAN <shooby@gnome.hu>
-
-	* calendar/gui/event-editor.c: Typo fix
-
-2000-07-20  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (THREADS_CFLAGS): Make threads mandatory
-	again.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-	
-	* evolution.desktop & data/evolution.desktop: Added
-		the Turkish desktop entries.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Typo fix.
-
-	* configure.in (AC_OUTPUT): Added the doc/devel Makefiles.
-	(EVOLUTION_DIR): Substitute EVOLUTION_DIR for the top_srcdir.
-	Added checks for gtk-doc.
-
-2000-07-13  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (end): Bigass warnings for camel-async branch
-	(remove them later).
-
-2000-07-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Make gnome-print-0.20 mandatory.  We will bail out
-	with CVS HEAD versions to avoid breakage.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Version 0.2.
-
-	* configure.in: Reverse the GtkHTML check.
-
-2000-07-10  Jeffrey Stedfast <fejj@helixcode.com>
-
-	* configure.in: Updated to check for required GtkHTML and
-	gnome-print
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Remove the conduits stuff for now.  They depend on
-	CVS gnome-pilot, and this is not good for the release.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* README: updates
-
-2000-07-10  Seth Alves  <alves@hungry.com>
-
-	* configure.in: added makefiles for calendar conduits
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Add a check for Bonobo 0.15 vs Bonobo post-0.15
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Don't draw quite as large a "flat_box".
-	If draw_borders is TRUE, cause the cursor to change even if not
-	editing.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Removed some border padding and set
-	the "draw_borders" argument of the contained GtkText.
-
-	* widgets/e-text/e-text.c, widget/e-text/e-text.h: Added a
-	"draw_borders" argument which, if set, makes the EText look more
-	like a GtkEntry.
-
-2000-07-09  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-contacts.png: updated so it has better contrast
-	against the background.
-
-	* art/evolution-contacts-small.png: Fits the style of the new contacts
-	icon, this is a sigle card.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text-model.c (e_text_model_real_get_text):
-	Return "" instead of NULL.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: Fixed EXTRA_DIST for make distcheck.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Set "anchor" and "fill_clip_rectangle"
-	arguments.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added
-	"fill_clip_rectangle" argument which describes whether to accept
-	clicks throughout the clipping rectangle.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Fixed some typos.
-
-2000-07-07  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-contacts.png: Changed icon (hi ettore)
-	The old handshake one was a little too firm handshake..
-	this is a rolodex icon..
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: make pthreads not required again, since they
-	aren't, and remove widgets/e-toolbar/Makefile from AC_OUTPUT since
-	that dir doesn't exist any more.
-
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in (AC_OUTPUT): remove the default_user Directories
-	dir.
-
-2000-07-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am, libical/configure.in: Fixed some make distcheck
-	errors.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (GNOME_VFS_CFLAGS): Define.
-	(GNOME_VFS_LIBS): Define.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Add
-	`addressbook/gui/component/select-names/Makefile' to the
-	`AC_OUTPUT()' list.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/Makefile.am: Added e-entry.c and e-entry.h.
-
-	* widgets/e-text/e-entry.c, widgets/e-text/e-entry.h: New files to
-	be a widget containing a text item.
-
-	* widgets/e-text/e-text.c: Fixed some spacing.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* notes/component-factory.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-29  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in:  Re-enable GNOME_PILOT_CHECK.
-	Change AC_MSG_CHECKING([For...]) to [for...]. It's the little
-	things that matter.
-
-2000-06-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: `AM_PATH_GCONF'.
-
-2000-06-27  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (ctime_r): Check for whether ctime_r takes
-	two (Linux) or three (Solaris) arguments.
-	(AC_OUTPUT): Don't create notes/Makefile twice.
-
-	* acconfig.h: Add CTIME_R_THREE_ARGS to the list.
-	
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Calculate height including if
-	clip_height is set to -1.
-	
-2000-06-26  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (THREADS_CFLAGS): Add option --enable-broken-threads
-	to turn on the threading stuff in evolution-mail. Defaults to no.
-
-	* acconfig.h: Add USE_BROKEN_THREADS to the list.
-	
-2000-06-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Use `glib-config' instead of `$GLIB_CONFIG' as the
-	latter is not actually defined anywhere.
-
-2000-06-25  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (pthread stuff): Make threads required due
-	to threaded evolution-mail. Subst in the THREADS_LIBS et
-	al.
-
-	* tests/Makefile.am: Remove USE_THREADS conditional as we
-	always use threads now.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fixed some vertical scroll bugs.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fix a bug with intial vertical scroll.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* notes/e-note.c, widgets/meeting-time-sel/e-meeting-time-sel.c,
-	widgets/shortcut-bar/e-icon-bar.c: Removed the usage of "x" and
-	"y" arguments to EText.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed the
-	"x" and "y" arguments to EText.   Added vertical scrolling.
-
-2000-06-20  Damon Chaplin  <damon@helixcode.com>
-
-	* widgets/meeting-time-sel/e-meeting-time-sel-item.c: 
-	* widgets/meeting-time-sel/e-meeting-time-sel.c: fixed a few warnings.
-
-2000-06-17  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made EText use the font from the
-	canvas's style if one isn't set.
-
-2000-06-17  Damon Chaplin  <damon@helixcode.com>
-
-	* widgets/meeting-time-sel/*: updated to use EText items rather than
-	GtkEntry widgets and added support for adding new rows.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* README: bye bye goad
-
-2000-06-14  Damon Chaplin  <damon@helixcode.com>
-
-	* README (http): added command to co ORBit.
-
-2000-06-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Added IMAP into the build
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* notes/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_notes_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* widgets/Makefile.am (SUBDIRS): build `misc' before everything
-	else.
-
-	* Makefile.am: Install `evolution.png' and `evolution.desktop'
-	where appropriate.
-
-	* evolution.png: New.  For now, it's just a copy of
-	`art/evolution-inbox.png'.
-
-	* evolution.desktop: New.
-
-2000-06-10  Zbigniew Chyla  <chyla@buy.pl>
-
-	* configure.in: Added pl (Polish) to ALL_LINGUAS
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Added new directory `shell/glade'.
-
-2000-06-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added a
-	"quantum" argument for making the panes move in jumps.
-
-2000-06-07  Anders Carlsson  <andersca@gnu.org>
-
-	* configure.in:  Create notes/Makefile
-
-	* notes/*: Add preliminary yellow sticky notes.
-
-2000-06-05	Mathieu Lacage	<mathieu@gnome.org>
-
-	* addressbook/contact-editor/Makefile.am: make it 
-	compile: add proper bonobo linking params.
-	* addressbook/gui/minicard/Makefile.am: idem.
-	* wombat/Makefile.am: add BONOBO_VFS_GNOME_CFLAGS.
-	cleanup some useless includes and libs.
-
-2000-06-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (ALL_LINGUAS): Add `it' and `de'.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Released Evolution 0.1.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* tests/test-movemail.c: Reverted removal of e_setup_base_dir.
-
-2000-06-02  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in: Added pt (Portuguese) to ALL_LINGUAS
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	* README: Update dependencies. Rewrite the GOAD vs OAF thing some
-	more to reflect OAF's new ascendency. Make the fact that you don't
-	need pilot stuff clearer. Add some new directories to the
-	directory layout section.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/misc/e-clipped-label.c: Free the finish data.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* tests/test-movemail.c (main): Don't call e_setup_base_dir.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): add doc, doc/C
-
-	* Makefile.am (SUBDIRS): add doc
-
-2000-05-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* widgets/misc/e-scroll-frame.[ch]: Imported GtkScrollFrame from
-	EOG and renamed it to EScrollFrame.
-
-	* widgets/misc/Makefile.am (libemiscwidgets_a_SOURCES): Added
-	e-scroll-frame.[ch].
-
-2000-05-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* widgets/e-paned/e-vpaned.c (e_vpaned_handle_shown): Show the
-	handle even if the requisition for the child is zero.
-	* widgets/e-paned/e-hpaned.c (e_hpaned_handle_shown): Likewise.
-
-2000-05-26  Héctor García Alvarez <hector@scouts-es.org>
-
-        * configure.in: Added Spanish language
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-vpaned.c: Fixed a
-	bug where we were resizing a non-existent window.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Made
-	the handlebar disappear if either side is empty, hidden, or
-	requests 0 size.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added widgets/e-paned/Makefile.
-
-	* tests/ui-tests/message-browser.c: Switched from GtkPaned to
-	EPaned.
-
-	* widgets/Makefile.am: Added e-paned directory.
-
-	* widgets/e-paned/, widgets/e-paned/.cvsignore,
-	widgets/e-paned/Makefile.am, widgets/e-paned/e-hpaned.c,
-	widgets/e-paned/e-hpaned.h, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c,
-	widgets/e-paned/e-vpaned.h: New widget based completely on
-	GtkPaned from 1.4.  This will be more advanced soon.
-
-2000-05-22  Jeff Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Readded camel/providers/smtp 
-
-2000-05-22  Szabolcs BAN <shooby@gnome.hu>
-
-	* configure.in: Added Hungarian language
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): add camel/providers/vee
-
-2000-05-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am: Install the mini icons.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: add --with-purify-options support, and default it
-	to what we at helix need
-
-Tue May 16 06:11:40 2000  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-calendar-mini.png art/evolution-inbox-mini.png
- 	art/evolution-tasks-mini.png art/evolution-contacts-mini.png
- 	art/evolution-notes-mini.png: new mini-icons for the tree view
-	of folders and stuff.
-
-2000-05-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/gui/dialogs/Makefile.am.
-
-2000-05-10  Matt Loper  <matt@helixcode.com>
-
-	* README: Added version and availability of required libunicode
-	library.
-
-2000-05-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Update versions needed for gnome-print, bonobo,
-	and gtkhtml.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* HACKING: We need a HACKING file.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed dist-hook section.
-
-	* configure.in: Set the version number.  Added a check for gnome
-	window icons.  Removed a bunch of unused Makefiles.
-
-	* tools/Makefile.am: Created a proper EXTRA_DIST section.
-
-	* widgets/e-text/Makefile.am: Added
-	e-text-event-processor-types.h.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: Added briefcase.png to get installed.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Remove the tooltip callback when
-	destroyed.
-
-2000-05-09  Matt Loper  <matt@helixcode.com>
-
-	* calendar/pcs/cal-backend.c (cal_backend_add_cal): Return nothing
-	for a 'void' function.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widget/e-text/e-text.c, widgets/e-text/e-text.h: Added an
-	activate signal.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	
-	* configure.in: Added new Directories section for the default_user.
-
-2000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Updated for the new `default_user' directory
-	setup.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: check for purify.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a
-	"changed" signal that gets sent whenever the text changes.
-
-2000-05-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Added `--enable-purify' flag.
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-	
-	* shell/Makefile.am: add support for building purified evolution.
-
-	* shell/.cvsignore: ignore evolution.pure
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-
-	* addressbook/backend/ebook/.cvsignore,
-	addressbook/contact-editor/.cvsignore,
-	addressbook/gui/component/.cvsignore,
-	addressbook/gui/minicard/.cvsignore,
-	addressbook/printing/.cvsignore,
-	calendar/cal-client/.cvsignore,
-	calendar/gui/.cvsignore,
-	calendar/pcs/.cvsignore,
-	filter/.cvsignore,
-	mail/.cvsignore,
-	shell/.cvsignore,
-	tests/.cvsignore,
-	widgets/e-table/.cvsignore,
-	widgets/e-text/.cvsignore,
-	widgets/meeting-time-sel/.cvsignore,
-	widgets/shortcut-bar/.cvsignore,
-	wombat/.cvsignore: ignore the .pure directory
-
-2000-05-04  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Oops. The Kerberos check was succeeding when it
-	shouldn't have (and thus breaking the pop3 build for "normal"
-	people). Fix.
-
-2000-05-03  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in (xmlversion): Fix to remove older 'libxml' prefix.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Do not output `doc/Makefile' because there is
-	nothing to generate it from.
-
-2000-05-02  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: add some minimal Kerberos checking.
-	This isn't intended to be generically useful at this point, it's
-	just there to give me a second POP auth mechanism to play with.
-
-	Also remove a bit of cruft, and reorganize configure.in a bit.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c: And here too.
-
-	* tests/test2.c (main): REmoved gmime-utils.h
-
-	* tests/Makefile.am (LDADD): Add libeutil to default link line.
-	(test_movemail_LDADD): Fixed order for libutil linking.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* tests/Makefile.am: set G_LOG_DOMAIN.
-	* tests/ui-tests/Makefile.am: same.
-	* widgets/e-text/Makefile.am: same.
-	* widgets/meeting-time-sel/Makefile.am: same.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (main): *sigh* moved back to sync api.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (search_cb): Try deleting messages ...
-	(main): Fix for provider api changes.
-
-2000-05-01  Anders Carlsson  <andersca@gnu.org>
-
-	* configure.in: Check if bonobo uses oaf, so you don't
-	need to specify --enable-oaf.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* acconfig.h: New configured #define `USING_OAF'.
-
-	* configure.in: Added `--enable-oaf' option and corresponding
-	`OAF_LIBS' and `OAF_FLAGS' variables.  Code friendly provided by
-	Maciej Stachowiak <mjs@eazel.com>.
-
-2000-04-27  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test10.c: Fix for removal of camelmimebodypart, and changes
-	to recipient stuff.
-
-	* tests/test1.c: Fix for removal of camelmimebodypart, and changes
-	to recipient stuff.
-
-2000-04-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/ename/Makefile.
-
-2000-04-27  Matt Loper  <matt@helixcode.com>
-
-	* configure.in: added tools/Makefile.
-
-	* Makefile.am: Added tools.
-
-	* tools/: New directory for tools relating to evolution.
-
-	* tools/killev: New script for killing all evolution-related
-	stuff.
-
-        * tools/Makefile.am: New file.
-	
-	* tools/.cvsignore: New file.
-
-2000-04-26  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c (main): And here too.
-
-	* tests/test2.c (main): Same here.
-
-	* tests/test1.c (main): Change for removed simpledatawrapper.
-
-2000-04-26  Matt Loper  <matt@helixcode.com>
-
-	* tests/.cvsignore: Added test13.
-
-	* default_user/.cvsignore: New file.
-
-	* widgets/e-text/e-text.c (e_text_destroy): Kill text->timer and
-	text->timeout on destroy.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* tests: Update for the camel changes.
-
-	* Makefile.am (SUBDIRS): Remove tests. They aren't terribly
-	useful/interesting any more for the most part, and they frequently
-	don't compile.
-
-2000-04-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made the tooltip show up in the correct
-	place and configuration when using the "max_lines", "anchor"
-	(untested), or "justification" arguments.
-
-From a patch by Iain Holmes <ih@csd.abdn.ac.uk>
-	
-	* widgets/e-text/e-text-event-processor-emacs-like.c,
-	widget/e-text/e-text-event-processor-types.h,
-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Changed C-w and
-	C-y to control the X clipboard.  Added double and triple click
-	events.
-
-2000-04-24  Fatih Demir	<kabalak@gmx.net>
-
-	* configure.in : Added tr to ALL_LINGUAS .
-
-2000-04-24  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c (main): Fixed for method movements.
-
-	* tests/test3.c (main): Removed from build, data-wrapper-repository removed.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test2.c (main): Changed to use construct_from_stream.
-
-	* tests/test1.c (main): Chagned to use construct_from_stream.
-
-2000-04-24  Matt Loper  <matt@helixcode.com>
-
-	* default_user/Makefile.am: new file.
-
-	* default_user/Main_Shortcuts.xml: New file; is used to fill the
-	shortcut bar's "main shortcuts" pane.
-
-	* default_user/Other_Shortcuts.xml: New file, used to fill the
-	shortcut bar's "other shortcuts" pane.
-
-	* default_user/Inbox.mbox: New file. This is the first message a
-	new user will see when they fire up Evolution. Needs work.
-
-	* Makefile.am: added default_user directory.
-	* configure.in: same.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test10.c: Removed some unecessary includes.  From
-	Ali Abdin <aliabdin@aucegypt.edu>
-	(create_sample_mime_message): Changed for date api change.
-
-	* tests/Makefile.am (noinst_PROGRAMS): Put test10 back.
-
-2000-04-22  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test1.c (main): Changed for date api change.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c: Fixed some headers.
-
-	* tests/Makefile.am (noinst_PROGRAMS): Removed test9.
-	(noinst_PROGRAMS): Removed test12, temporarirly (nntp not being
-	built).
-	Removed test10.
-
-2000-04-20  Yukihiro Nakai <nakai@gnome.gr.jp>
-
-	* configure.in: Add Japanese to ALL_LINGUAS
-
-2000-04-19  Dan Winship  <danw@helixcode.com>
-
-	* README: More detail on exactly what versions of what libraries
-	are needed.
-
-2000-04-18  Dan Winship  <danw@helixcode.com>
-
-	* tests/*: remove camel-log references
-
-2000-04-17  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (xmlpatch): Require gnome-xml 1.8.7 (or later,
-	but not 2.0). xmlParseMemory's behavior in 1.8.7 is incompatible
-	with its behavior in 1.8.6 and earlier.
-
-	* tests/test-url.c: New program to test CamelURL
-
-2000-04-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/contact-editor/e-contact-editor.c: Added
-	orginizational unit, nickname, and internet free-busy fields.
-
-	* addressbook/contact-editor/contact-editor.glade: Renamed some
-	incorrectly named fields.
-
-2000-04-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/gui/minicard/e-minicard.c: Added orginization and role
-	fields.
-
-	* addressbook/contact-editor/contact-editor.glade,
-	addressbook/contact-editor/e-contact-editor-strings.h: Renamed
-	some incorrectly named fields.
-
-	* addressbook/contact-editor/e-contact-editor.c: Added
-	orginization and role fields as well as hooking up the birth date
-	field.
-
-	* addressbook/gui/minicard/e-minicard-view.c: Added a missing include.
-
-2000-04-15  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c
-	(search_entry_activated): New function. Gets called when the quick
-	search entry is called on to perform a search.
-	(make_quick_search_widget): New function; returns a "quick search"
-	widget.
-	(control_activate): During the construction of the toolbar, a
-	"quick search" widget is included.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* tests/.cvsignore: add test12
-
-	* tests/test12.c (main): add test for nntp stuff.
-
-	* tests/Makefile.am (noinst_PROGRAMS): same.
-
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-backend-ldap.c,
-	addressbook/contact-editor/e-contact-editor.c: Added a note field.
-
-2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.h: #include
-	"addressbook/backend/ebook" to make sure we pick up the right
-	addressbook.h.  Butt ugly, but at least it makes it possible for
-	me to build Evolution.
-
-	* addressbook/gui/minicard/Makefile.am (INCLUDES): Use
-	`$(builddir)' so that we pick up the IDL-generated includes
-	correctly.
-	* addressbook/backend/pas/Makefile.am: Likewise.  Also use
-	`$(srcdir)'.
-
-	* addressbook/backend/ebook/Makefile.am: Use `$(srcdir)' so that
-	it works with builddir != srcdir.
-	* addressbook/backend/pas/Makefile.am: Likewise.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_ensure_connected): don't ldap_simple_bind_s if
-	the ldap_open failed, and fix warnings.
-	(pas_backend_ldap_build_all_cards_list): don't do search if the
-	ensure_connected failed, and fix warnings.
-	(pas_backend_ldap_search): same.
-	(poll_ldap): fix warnings.
-	(pas_backend_ldap_process_get_book_view): same.
-	(pas_backend_ldap_get_vcard): same.
-	(pas_backend_ldap_load_uri): same.
-
-	* configure.in: quiet configure in the case where it can't find
-	ldap libs.
-
-2000-04-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c (extract_info):
-	Check for 0 length fields when building the outgoing ECard.
-
-2000-04-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-book-view.c: Give correct warnings.
-
-	* addressbook/backend/ebook/e-card.c (e_card_set_arg): g_strdup
-	url and title.
-
-2000-04-13  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c
-	(fill_in_info): reflect the title attribute in the contact editor.
-	(extract_info): same.
-
-	* addressbook/backend/pas/pas-backend-ldap.c: add the title attribute.
-
-	* addressbook/gui/minicard/test-reflow.c: add a title.
-
-	* addressbook/gui/minicard/e-minicard.c (remodel): add support for
-	the title attribute.
-
-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): save out
-	the title to the vcard.
-
-	* addressbook/backend/ebook/test-card.c: add title field foo to
-	the test.
-
-	* addressbook/backend/ebook/e-card.c: reflect the title field.
-
-	* addressbook/backend/ebook/e-card.h: un-#if 0 the title field.
-
-	* addressbook/backend/pas/pas-backend-ldap.c (poll_ldap): new
-	function that polls ldap for more search responses.
-	(pas_backend_ldap_search): use the async search interface and
-	register an idle call to poll for the responses.
-	(view_destroy): make sure to g_source_remove the idle id.
-
-2000-04-12  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c (entry_compare):
-	rework this function to use a table mapping search field names to
-	vcard properties and extra information (such as whether or not the
-	property is a list.)
-	
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(construct_email_list): new function, to build the ECardList for
-	email addresses.
-	(construct_phone_list): new function, to build the ECardList for
-	phone numbers.
-	(pas_backend_ldap_search): use a table mapping ldap attributes to
-	ecard properties, and use the special list construction functions
-	if the property calls for it.  general cleanup.  added a comment
-	about not calling ber_free if there was a decoding error.
-
-
-2000-04-12  Matt Loper  <matt@helixcode.com>
-
-	* art/Makefile.am: Add tigert's contact-dlg-related images.
-
-	* addressbook/contact-editor/e-contact-editor.c (_add_images): Add
-	tigert's images.
-
-	* addressbook/contact-editor/Makefile.am: add EVOLUTION_IMAGES.
-
-2000-04-12  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/house.png, art/malehead.png, art/cellphone.png, 
-	art/briefcase.png, art/envelope.png, art/globe.png:
-	New icons for the contact manager.. more to follow once I get 
-	around to do more artist work..
-
-2000-04-12  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_build_all_cards_list): delay the setting of the
-	ldap variable until we've ensured we were connected.  Also, set
-	the search limit to LDAP_MAX_SEARCH_RESPONSES (we'll eventually
-	want a user setting here i assume.)
-	(pas_backend_ldap_search): same here, and also send back lists of
-	CARDS_PER_VIEW_NOTIFICATION length in each
-	pas_book_view_notify_add call.  also, don't call ber_free if there
-	was a decoding error, since the ldap library frees it for us.
-
-2000-04-11  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (have_pthread): Properly use AC_ARG_WITH
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* wombat/Makefile.am (wombat_LDADD): add LDAP_LIBS here.
-
-	* configure.in: check for -lldap and -llber and if both are
-	present include ldap support in the pas/wombat.
-
-	* addressbook/backend/pas/Makefile.am (libpas_la_SOURCES): include
-	pas-backend.ldap.c if ENABLE_LDAP.
-
-	* addressbook/backend/pas/pas-backend-ldap.c: get searching
-	working (converting between the sexp and ldap stuff.)
-
-	* wombat/wombat.c (setup_pas): register the ldap pas backend if
-	HAVE_LDAP is defined.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Changed AC_DEFUN to AC_DEFINE.
-
-	* acconfig.h: Added HAVE_TIMEZONE and HAVE_TM_GMTOFF.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: check for timezone as a variable (as it is in
-	linux, but not in freebsd or netbsd.)
-
-2000-04-11  Larry Ewing  <lewing@helixcode.com>
-
-	* widgets/e-table/e-cell-toggle.c (etog_draw): update for new
-	gdk-pixbuf.  Added a disabled chuck of code to do alpha blending
-	on pixmaps.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Moved some logic a bit.  Minor changes.
-
-00-04-11  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.c
-	(e_text_set_args): Recalculate bounds when width or clip_width changes.
-	(tooltip_event): Forward clicks on the tooltip onto the text item.
-	(_do_tooltip): Correct the origin co-ordinates to the items co-ords.
-	(e_text_point): Return 0 when the mouse is on the item.
-	(_do_tooltip): Make the tooltip obey the parent items
-	line_wrap and max_lines.
-
-00-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(get_e_card_prop): new function, taking code from func_contains to
-	get string properties.
-	(entry_compare): new function generic, taking strstr-like function
-	as a parameter.
-	(func_contains): rewrite function to use entry_compare.
-	(is_helper): new helper function to map strcmp to a strstr-like
-	function.
-	(func_is): new function, implementing "is" for searches.
-	(endswith_helper): new function.
-	(func_endswith) new function, implementing "endswith" for
-	searches.
-	(beginswith_helper): new function.
-	(func_beginswith): new function, implementing "beginswith" for
-	searches.
-	(compare_email): new function for searching all email addresses of
-	a contact.
-	(compare_phone): new function for searching all phone numbers of a
-	contact.
-	(compare_address): new function for searching all addresses of a
-	contact (unimplemented as yet).
-	(entry_compare): add support for searching the list items "email",
-	"phone" and "address".
-	(vcard_matches_search): free the esexp_result.
-	(entry_compare): we want comparison functions to take 2 args.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c: This was setting
-	E_REFLOW(view)->items to NULL too soon.  Fixed now.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_search): remove spew.
-	(pas_backend_file_process_create_card): move the sync to the
-	earliest possible point after the db operation.
-	(pas_backend_file_process_remove_card): same.
-	(pas_backend_file_process_modify_card): same, and call
-	pas_book_respond_modify, not pas_book_respond_remove, here.
-
-	* addressbook/gui/component/addressbook.c (card_deleted_cb): new
-	function.
-	(delete_contact_cb): wire up button to call
-	e_minicard_view_remove_selection.
-
-	* addressbook/gui/minicard/e-minicard-view.c
-	(e_minicard_view_remove_selection): fix warning, and stick "view"
-	in the name.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c,
-	addressbook/backend/ebook/e-book.c: Changed some incorrect
-	gtk_object_refs and gtk_object_unrefs into bonobo_object_refs and
-	bonobo_object_unrefs.
-
-	* addressbook/backend/pas/pas-card-cursor.c: Changed a
-	gtk_object_destroy to a gtk_object_unref.
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: Set a list pointer to
-	NULL after freeing its contents.  Added
-	e_minicard_view_remove_selection function.
-
-	* addressbook/gui/minicard/e-reflow.c: Set a list pointer to NULL
-	after freeing its contents.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c (find_contact_cb):
-	implement braindead dialog to input the query string for the view.
-
-	also, change all callbacks to get the EMinicardView instead of the
-	EBook.
-
-	* addressbook/gui/minicard/e-minicard-view.c
-	(e_minicard_view_get_arg): add missing break.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: Added a "query"
-	argument to the e-minicard-view.  Documented all the arguments to
-	the e-minicard-view.
-
-2000-04-10  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c (get_view): change
-	the empty search string ("") to the valid (contains "full_name" "").
-
-	* wombat/Makefile.am (wombat_LDADD): reorder so libeutil.la comes
-	after libpas (since it uses the sexp stuff now.)
-
-	* addressbook/backend/pas/Makefile.am (INCLUDES): add
-	-I$(top_srcdir)/addressbook/backend/ebook
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(view_destroy): free the search context and unref the sexp.
-	(string_to_dbt): save the zero byte of strings, so we don't have
-	to g_strndup everywhere.
-	(func_contains): new function, implementing the (contains) search
-	function.
-	(vcard_matches_search): generic predicate to tell whether or not a
-	vcard entry matches the current book view.
-	(pas_backend_file_search): rip some of this code out of
-	get_book_view (the portion building the list of cards) and make it
-	use the e-sexp stuff.
-	(pas_backend_file_process_create_card): use vcard_matches_search
-	to only notify if the card will appear in the view.
-	(pas_backend_file_process_remove_card): use vcard_matches_search
-	to only notify if the card will be removed from the view.
-	(pas_backend_file_process_modify_card): use vcard_matches_search
-	to notify if the modified card was added, removed, or changed in
-	the view.
-	
-2000-04-10  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (GNOME_PRINT_CFLAGS): Update to support
-	--disable-threads correctly.
-
-2000-04-10  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): use view != NULL instead
-	of checking db_error when we call pas_book_respond_get_book_view)
-
-2000-04-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: check for mkstemp
-
-2000-04-10  Damon Chaplin  <damon@helixcode.com>
-
-	* configure.in (AC_OUTPUT): removed libical stuff since it has its
-	own configure.in.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c: Fixed a bug where I was
-	sending the wrong information to some callbacks.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Added an e_card_duplicate
-	function.  Made ids get stored in vcards.  Made sure to delete the
-	url if it exists.
-
-	* addressbook/backend/pas/Makefile.am: Made pas include
-	addressbook/backend/ebook/ in the search path.
-
-	* addressbook/backend/pas/pas-backend-file.c: Fixed some bugs and
-	made the create card function store the generated id in the card
-	being saved.
-
-	* addressbook/backend/pas/pas-book-view.c: Fixed a double free
-	bug.
-
-	* addressbook/contact-editor/e-contact-editor.c: Fixed some bugs.
-	Made the contact editor actually return a valid card when
-	gtk_object_get(editor, "card", ...) is called.
-
-	* addressbook/contact-editor/e-contact-editor.h: Fixed a copy and
-	paste error.
-
-	* addressbook/gui/component/addressbook.c: Made this get the card
-	properly.
-
-	* addressbook/gui/minicard/Makefile.am: Made this include
-	contact-editor directory in the search path and link against
-	libecontacteditor so that double clicking can open a dialog.
-
-	* addressbook/gui/minicard/e-minicard.c: Fixed some small bugs.
-	Made double clicking open a contact editor dialog if this minicard
-	is contained in a minicard view.  (It needs the minicard view to
-	get the EBook to save to.
-
-	* wombat/Makefile.am: Link wombat against libebook, since
-	pas-backend-file now uses ECard.
-
-2000-04-09  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c (control_activate): Make
-	"New Contact" menuitem add a card with new_contact_cb().
-	
-	* addressbook/Makefile.am: Compile contact-editor, _then_ gui,
-	since the gui now depends on the contact editor (shouldn't the
-	contact-editor directory be moved into 'gui'?).
-
-	* addressbook/gui/component/addressbook.c (card_added_cb): New
-	function. Gets called when a card is successfully added via the
-	contact-editor.
-	(new_contact_cb): New function. Gets called when a user clicks the
-	"new contact" button on the toolbar, and creates a contact-editor
-	to edit a new contact entry.
-	(control_activate): Call gnome_app_fill_toolbar_with_data()
-	instead of gnome_app_fill_toolbar(), so that our toolbar can find
-	the right book to add a new card to.
-	(addressbook_factory): On an "activate" signal, send the book up
-	to control_activate_cb.
-
-	* addressbook/gui/component/addressbook-factory.c (init_bonobo):
-	Call glade_gnome_init(), so that our contact-editor (which
-	requires glade) doesn't barf.
-
-	* addressbook/gui/component/Makefile.am: added the contact-editor
-	to our libraries and include files.
-
-	* addressbook/contact-editor/e-contact-editor.c
-	(e_contact_editor_new): Set "card" gtk property to the passed-in
-	card property.
-
-	* addressbook/gui/component/addressbook.c (addressbook_factory):
-	Added gtk_widget_push/pop_colormap/visual, which I assume is
-	necessary for canvas use.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/Makefile.am,
-	addressbook/contact-editor/e-contact-editor.c,
-	addressbook/contact-editor/e-contact-editor.h,
-	addressbook/contact-editor/test-editor.c: Made the contact editor
-	load from an ECard.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/gui/minicard/e-minicard.c: Added support for the URL
-	field.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): Fixed a
-	small typo.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* art/Makefile.am: pixmap_DATA should have been images_DATA (after
-	pixmapdir was renamed to imagesdir)
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/.cvsignore,
-	addressbook/gui/minicard/Makefile.am,
-	addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h,
-	addressbook/gui/minicard/e-minicard.c,
-	addressbook/gui/minicard/e-minicard.h,
-	addressbook/gui/minicard/e-reflow-sorted.c,
-	addressbook/gui/minicard/e-reflow-sorted.h,
-	addressbook/gui/minicard/e-reflow.c,
-	addressbook/gui/minicard/e-reflow.h,
-	addressbook/gui/minicard/test-minicard-view.c,
-	addressbook/gui/minicard/test-reflow.c,
-	widgets/e-minicard/.cvsignore, widgets/e-minicard/Makefile.am,
-	widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h,
-	widgets/e-minicard/e-minicard-view.c,
-	widgets/e-minicard/e-minicard-view.h,
-	widgets/e-minicard/e-minicard.c, widgets/e-minicard/e-minicard.h,
-	widgets/e-minicard/e-reflow-sorted.c,
-	widgets/e-minicard/e-reflow-sorted.h,
-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/e-reflow.h,
-	widgets/e-minicard/test-minicard-label.c,
-	widgets/e-minicard/test-minicard-view.c,
-	widgets/e-minicard/test-minicard.c,
-	widgets/e-minicard/test-reflow.c: CVS move mistake.  Fixed the
-	correct changes in the correct places.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: pixmap_DATA isn't defined so don't use it as a variable.
-
-	* addressbook/gui/component/,
-	addressbook/gui/component/.cvsignore, addressbook/gui/Makefile.am,
-	addressbook/gui/component/addressbook-factory.c,
-	addressbook/gui/component/addressbook.c,
-	addressbook/gui/component/addressbook.gnorba,
-	addressbook/gui/component/addressbook.h: New directory to proivde
-	the component for contact management.  Simply uses an e-minicard-view.
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: New subclass of
-	e-reflow-sorted that takes an EBook and uses it to compute the
-	card data to display.
-
-	* addressbook/gui/minicard/e-minicard.c,
-	addressbook/gui/minicard/e-minicard.h: This now backends to a
-	ECard instead of a ETableModel.
-
-	* addressbook/gui/minicard/e-reflow.c,
-	addressbook/gui/minicard/e-reflow.h: This now has a virtualized
-	add method.
-
-	* addressbook/gui/minicard/e-reflow-sorted.c,
-	addressbook/gui/minicard/e-reflow-sorted.h: New subclass of
-	e-reflow that allows the data to be sorted on the fly.
-
-	* addressbook/gui/minicard/test-minicard-view.c: New test to test
-	the new minicard view.
-
-	* addressbook/gui/minicard/test-reflow.c: Uses the new ECard
-	backend of the e-minicard.
-
-	* addressbook/gui/minicard/.cvsignore,
-	addressbook/gui/minicard/Makefile.am: Added new test.  Fixed
-	dependencies.  Added new files.
-
-	* addressbook/gui/, addressbook/gui/Makefile.am,
-	addressbook/gui/.cvsignore: New directory for addressbook gui
-	bits.  Added subdirectories.  Created an initial .cvsignore.
-
-	* addressbook/Makefile.am (SUBDIRS): Removed demo and added gui.
-
-	* addressbook/backend/pas/pas-backend-file.c: Added code to do
-	notification on bookviews when changes in the backend are made.
-
-	* addressbook/backend/pas/pas-book-view.c,
-	addressbook/backend/pas/pas-book-view.h: Added helper functions to
-	notify the view about the addition or modification of a single
-	card.  Fixed a mistaken extra free.
-
-	* addressbook/backend/ebook/e-card-list-iterator.h: Fixed
-	incorrect parent class.
-
-	* addressbook/backend/ebook/test-client.c: Made this accept an
-	optional parameter that specifies the vcard to add.
-
-	* configure.in: Replaced widgets/e-minicard/Makefile and
-	addressbook/demo/Makefile with addressbook/gui/minicard/Makefile
-	and addressbook/gui/component/Makefile respectively.
-
-	* widgets/Makefile.am: Removed e-minicard since it's being moved
-	to addressbook/gui/minicard.
-
-	* widgets/e-text/e-text.c: Fixed the border width around tooltips
-	and made the main tooltip area yellow.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: add SYSTEM_MAIL_DIR
-
-2000-04-08  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in (ALL_LINGUAS): Added Galician (gl).
-
-2000-04-07  Jeffrey Stedfast  <fejj@stampede.org>
-	* configure.in: Modified to create camel/providers/smtp/Makefile
-
-2000-04-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made text tooltips appear in place.
-	Iain figured out that to get them to not appear, we hide the
-	tooltip when the mouse leaves the tooltip window, not the canvas
-	item (this works because the tooltip window always covers the
-	canvas item completely.)
-
-2000-04-07  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/demo/addressbook.c (control_activate_cb): New
-	function. Called when the control is (de)activated.
-	(control_activate): New function; called when the control is
-	activated, and sets up toolbar/menu times.
-	(control_deactivate): New function; removes those toolbar/menu
-	items.
-	(do_nothing_cb): Does nothing :-)
-	(addressbook_factory): Hook up to control_activate_cb().
-
-2000-04-07  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): correctly (well,
-	untested) implement.
-	(view_destroy): new function.
-
-2000-04-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:
-	Changed calls to e_cell_text_new to match new function signature.
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* art/Makefile.am (images_DATA): Renamed from pixmaps to images. 
-
-2000-04-05  Matt Loper  <matt@helixcode.com>
-
-	* README: Added wombat.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text-test.c: Got rid of some runtime errors.
-	Changed to "fixed" font so that it will work on everyone's
-	machine.  Added a white background rectangle.  Made resizing the
-	window resize the contained text item.  Changed to using affines
-	(e_canvas_item_move_absolute) instead of "x" and "y" attributes.
-	Set the text in the entries so that they match the original values
-	of the displayed text object.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard/e-minicard.c: Fixed some referencing and
-	lifetime issues.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Removed an unnecessary get_bounds call.
-
-	(From a patch by Iain Holmes <ih@csd.abdn.ac.uk>)
-
-	* widgets/e-text/e-text.c: Made tooltips look more like the
-	underlying text.  Made tooltips show up more consistently.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/Makefile.am, addressbook/demo/e-test-model.c,
-	addressbook/demo/e-test-model.h: Changed this to backend to an
-	ebook.
-
-	* addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list.c,
-	addressbook/backend/ebook/e-card-list.h,
-	addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Fixed const correctness and
-	changed a couple of functions to be external.
-	
-	* addressbook/Makefile.am: Fixed subdir ordering.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c: Fixed an incorrect
-	function.
-
-	* addressbook/backend/ebook/e-book-view.h,
-	addressbook/backend/ebook/e-book.h: Fixed some incorrect function
-	pointer declarations.
-
-	* addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list-iterator.h,
-	addressbook/backend/ebook/e-card-list.c,
-	addressbook/backend/ebook/e-card-list.h,
-	addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c: Built new iterator system
-	for getting fields with multiple entries.
-
-	* addressbook/backend/ebook/Makefile.am: Added new files
-	addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list-iterator.h,
-	addressbook/backend/ebook/e-card-list.c, and
-	addressbook/backend/ebook/e-card-list.h.
-
-2000-04-04  Yuri Syrota  <rasta@renome.rovno.ua>
-
-	* configure.in: Added uk to ALL_LINGUAS.
-
-2000-04-04  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* configure.in: Added no and sv to ALL_LINGUAS.
-
-2000-04-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.h,
-	addressbook/backend/ebook/e-card.c: A bit of clean up.
-	
-	* addressbook/backend/ebook/e-book-types.h,
-	addressbook/backend/ebook/e-book-view-listener.c,
-	addressbook/backend/ebook/e-book-view-listener.h,
-	addressbook/backend/ebook/e-book-view.c,
-	addressbook/backend/ebook/e-book-view.h,
-	addressbook/backend/pas/pas-book-view.c,
-	addressbook/backend/pas/pas-book-view.h: New files for live views.
-
-	* addressbook/backend/ebook/Makefile.am,
-	addressbook/backend/ebook/e-book-listener.c,
-	addressbook/backend/ebook/e-book-listener.h,
-	addressbook/backend/ebook/e-book.c,
-	addressbook/backend/ebook/e-book.h,
-	addressbook/backend/ebook/test-client-list.c,
-	addressbook/backend/ebook/test-client.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/backend/pas/pas-book.h,
-	addressbook/backend/idl/addressbook.idl: Added live views and
-	searching to the interface (neither is working yet.)
-
-2000-04-01  Matt Loper  <matt@helixcode.com>
-
-	* tests/.cvsignore: Added test-movemail.
-
-	* art/.cvsignore: New file.
-
-2000-03-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:
-	Added some missing gtk_object_refs.
-
-2000-03-30  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_build_all_cards_list): Get first card (with
-	R_FIRST) on first seq().
-
-2000-03-30  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-ldap.h: new-file
-	* addressbook/backend/pas/pas-backend-ldap.c: new file
-
-2000-03-30  Dan Winship  <danw@helixcode.com>
-	
-	* configure.in:
-	* Makefile.am:
-	* art/Makefile.am: install new shortcut bar pixmaps.
-
-2000-03-30  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-calendar.png art/evolution-inbox.png 
-	art/evolution-tasks.png	art/evolution-contacts.png 
-	art/evolution-notes.png evolution-today.png:
-	added some artwork for the main shortcutbar.. someone
-	could stick them in it.
-
-2000-03-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.c: Fixed management of
-	the corba-cursor object by calling CORBA_Object_duplicate on it on
-	e-card-cursor creation and calling CORBA_Object_release on
-	e-card-cursor destruction.  Also, properly free string returned
-	from Evolution_CardCursor_get_nth function.
-
-2000-03-29  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/backend/ebook/test-client.c (get_cursor_cb): Added
-	some debugging.
-
-	* addressbook/backend/ebook/e-book-listener.c: Added inline
-	documentation for exposed functions.
-	* addressbook/backend/ebook/e-card-cursor.c: same.
-	* addressbook/backend/ebook/e-card.c: same.
-
-	* Makefile.am: add calendar compilation back in.
-
-	* addressbook/backend/pas/pas-book-factory.c
-	(PAS_BOOK_FACTORY_GOAD_ID): changed to
-	"evolution:addressbook-server".
-
-	* addressbook/backend/pas/Makefile.am: no need to install a
-	.gnorba file from here, as the wombat.gnorba file in
-	evolution/wombat will do its job.
-
-	* addressbook/backend/ebook/test-client.c (ebook_create): if
-	ebook_new fails, print a warning and return.
-
-	* addressbook/backend/ebook/e-book.c (CARDSERVER_GOAD_ID): changed
-	to "evolution:addressbook-server".
-
-	* wombat/wombat.c: Changed headerfile path.
-
-	* wombat/Makefile.am: Use relative paths to libraries in the build
-	tree, rather than requiring libraries (such as libpcs) to already
-	be installed.
-
-2000-03-28  Matt Loper  <matt@helixcode.com>
-
-	* wombat/Makefile.am: new file.
-
-	* wombat/wombat.gnorba: Cleaned up.
-
-	* wombat/wombat.c (setup_pcs): filled in the rest.
-	
-	* Makefile.am: added wombat.
-
-	* wombat/wombat.gnorba: new file.
-
-	* wombat/.cvsignore: new file.
-
-	* wombat/wombat.c (setup_pcs): fill out this function some.
-
-	* configure.in: added wombat.
-
-2000-03-28  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-card-cursor.c (create_cursor): use
-	g_new0 to allocate the BonoboObjectServant.
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_build_all_cards_list): remove unnecessary
-	strdup/free.
-
-2000-03-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c: Removed an infinite
-	loop.
-
-	* addressbook/backend/ebook/test-client-list.c: New test that
-	doesn't add an extra database item.
-
-	* addressbook/backend/ebook/Makefile.am,
-	addressbook/backend/ebook/.cvsignore: Added test-client-list.
-
-2000-03-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-card-cursor.c: Fixed memory
-	allocation.
-
-	* addressbook/backend/pas/pas-backend-file.c: Fixed memory
-	allocation.  Made database stuff not do an extra entry.
-
-	* addressbook/backend/ebook/test-client.c: Add test for
-	get_all_cards functionality.  Changed database name to test.db.
-
-	* addressbook/backend/ebook/e-card-cursor.c: Changed bonobo_object
-	to gtk_object in a couple of places.
-
-2000-03-28  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_create_unique_id): create id's for entries using
-	the following format: ("pas-id-%08lX%08X", time(NULL), c++).
-	
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* tests/test-movemail.c: new test program. Can be used to copy POP
-	mail into your evolution inbox.
-
-2000-03-27  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_get_vcard): remove unneeded g_strdup;
-	(get_length): implement function.
-	(get_nth): implement function.
-	(cursor_destroy): free up the internal glist of vcards, and fix
-	warning.
-	(pas_backend_file_build_all_cards_list): new function, to build up
-	the list of cards in the db.
-	(pas_backend_file_process_get_all_cards): call
-	pas_backend_file_build_+all_cards_list, and fix warning.
-
-2000-03-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/test-card.c: Fixed some warnings.
-
-	* addressbook/backend/ebook/test-client.c: Added a section to test
-	cursors and returning an id when adding.
-
-	* addressbook/backend/ebook/e-card-pairs.h: Removed the address
-	pairs since they were added to e-card.c.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Made the set_id function take
-	a const char *.
-
-	* addressbook/backend/ebook/e-book-listener.c,
-	addressbook/backend/ebook/e-book-listener.h,
-	addressbook/backend/ebook/e-book.c,
-	addressbook/backend/ebook/e-book.h,
-	addressbook/backend/idl/addressbook.idl,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/backend/pas/pas-book.h: Added a get_all_cards function
-	and made the response to the create_card function include the card
-	id.
-
-	* addressbook/backend/ebook/Makefile.am: Added e-card-cursor.c and
-	e-card-cursor.h.
-
-	* addressbook/backend/ebook/e-card-cursor.c,
-	addressbook/backend/ebook/e-card-cursor.h: New class for proxying
-	to an Evolution_CardCursor.
-
-	* addressbook/backend/pas/Makefile.am: Added pas-card-cursor.c and
-	pas-card-cursor.h.
-
-	* addressbook/backend/pas/pas-card-cursor.c,
-	addressbook/backend/pas/pas-card-cursor.h: New bonobo class for
-	making an Evolution_CardCursor server.
-
-2000-03-27  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test9.c (main): This test is basically now invalid.
-	* tests/test11.c (main): Fix for async search api.  Probably works.
-	Removed camel-mbox-*.h headers, should be private.
-
-2000-03-27  Tuomas Kuosmanen  <tigert@gimp.org>
-	* art/attachment.xpm art/mail-new.xpm art/mail-read.xpm
-	art/mail-replied.xpm art/mark.xpm art/meeting.xpm
-	art/priority-high.xpm art/priority-low.xpm
-
-	Added some new icons for the message-list view..
-
-2000-03-26  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* configure.in: check for db_185.h (present in newer db
-	distributions.)
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_create_unique_id): new function.
-	(pas_backend_file_process_create_card): call
-	pas_backend_file_create_unique_id and pas_book_notify_add (if the
-	db->put was successful).  also, sync out db.
-	(pas_backend_file_process_remove_card): call
-	pas_book_notify_remove if the db->del was successful, and sync out
-	db.
-	(pas_backend_file_process_modify_card): call
-	pas_book_notify_change if db->put was successful, and sync out db.
-	(string_to_dbt): new function.
-	(pas_backend_file_process_create_card): use string_to_dbt
-	(pas_backend_file_process_remove_card): likewise
-	(pas_backend_file_process_modify_card): likewise
-	(pas_backend_file_get_vcard): likewise
-	(pas_backend_file_upgrade_db): new function, to upgrade a db file
-	if we change the data format.
-	(pas_backend_file_maybe_upgrade_db): check db version vs. current
-	code version, and upgrade it necessary.
-	(pas_backend_file_load_uri): call pas_backend_file_maybe_upgrade.
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/test-client.c: Load an ECard instead
-	of a VCard and then get the VCard from that ECard.  Just tests
-	ECard and the client stuff at the same time.  Also, replaces
-	carriage returns with newlines.
-
-	* addressbook/backend/ebook/e-book.c: Fixed a small parity error.
-
-2000-03-25  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/ebook/test-client.c: create a card and then
-	look it up.
-
-2000-03-26  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): add db calls to flesh out
-	the interface.  hardcoded id that needs to change, once we decide
-	how we're going to create it.
-	(pas_backend_file_process_remove_card): add db calls to flesh out
-	the interface.
-	(pas_backend_file_process_modify_card): likewise
-	(pas_backend_file_process_check_connection): likewise
-	(pas_backend_file_get_vcard): likewise
-	(pas_backend_file_load_uri): likewise
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book.c: Set the card id properly
-	when retrieving a card.
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/e-sexp.h: Formatting cleanup.
-
-2000-03-07  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/Makefile.am (libeutil_la_SOURCES): s-sexp.h -> e-sexp.h.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Added the ability to set the
-	card's id (and made getting it work correctly also.)
-
-2000-03-25  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/ebook/e-book.c (e_book_pop_op): pass GList*
-	as second parameter to g_list_remove_link, not the data pointer.
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-types.h: Removed the
-	address->description field.
-	
-	* addressbook/backend/ebook/e-card.c: Added VCard output and
-	the use of GtkArguments.
-
-	* addressbook/backend/ebook/test-card.c: Updated this to use the
-	GtkArguments.
-
-	* addressbook/backend/ebook/e-book.c: Fixed a memory leak.
-
-2000-03-25  Matt Loper  <matt@helixcode.com>
-
-	* ebook/e-book.c,
-	ebook/e-book.h,	
-	ebook/e-book.h,		
-	ebook/e-card-fields.h,
-	ebook/e-card.h,
-	ebook/e-commerce.h: old, removed. Up-to-date EBook stuff is kept
-	in addressbook/backend/ebook.
-
-2000-03-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/e-card-types.h,
-	addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/test-card.c: Added parsing and testing
-	for name, full name, birthday, telephone, email, and street
-	address properties.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/.cvsignore,
-	addressbook/backend/pas/.cvsignore,
-	addressbook/backend/idl/.cvsignore,
-	addressbook/backend/.cvsignore: Updated .cvsignore files.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/Makefile.am, configure.in: Added the
-	addressbook/backend directory.
-
-	* addressbook/backend/Makefile.am: Removed the libversit directory
-	as it's now included in the base evolution directory.
-
-	* addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/Makefile.am: Changed the place where
-	libversit is looked for.
-
-	* addressbook/backend/ebook/e-book-listener.c: Fixed some
-	indentation.
-
-	* addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/e-card-types.h: Commented out some code
-	to get this to compile.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Turned this into a GTK+
-	object.
-
-	* addressbook/backend/pas/pas.c,
-	addressbook/backend/ebook/test-client.c: Include gnome.h and
-	gnorba.h.
-
-	* addressbook/backend/idl/addressbook.idl: Include Bonobo.idl
-	instead of bonobo-unknown.idl.
-
-	* addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/contact-editor/test-editor.c,
-	addressbook/contact-editor/e-contact-editor.c,
-	addressbook/printing/e-contact-print.c,
-	addressbook/printing/test-contact-print-style-editor.c,
-	addressbook/printing/test-print.c: Killed some warnings.
-
-2000-03-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Changed gnome_canvas_item_grab_focus to
-	e_canvas_item_grab_focus.
-
-2000-03-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/addressbook-widget.c: Make background pixmap
-	get properly set to NULL.
-
-2000-03-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added the
-	ability to access the text event processor.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/addressbook-widget.c: Made the addressbook
-	component look in the users home directory for the addressbook.xml
-	file.
-
-2000-03-20  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/.cvsignore: added filter.
-
-	* addressbook/demo/.cvsignore: added test-addressbook.
-
-2000-03-17 Elliot Lee <sopwith@redhat.com>
-	* calendar/cal-client/Makefile.am,
-	calendar/cal-util/Makefile.am, calendar/gui/Makefile.am,
-	calendar/pcs/Makefile.am, mail/Makefile.am,
-	widgets/e-text/Makefile.am: Fix for srcdir != builddir.
-
-2000-03-14  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (SUBDIRS): build shell before mail, since mail
-	relies on the shell idl files being compiled.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/Makefile.am: Added files for addressbook bonobo
-	component.  Changed non bonobo version to compile as
-	test-addressbook.
-
-	* addressbook/demo/addressbook.c,
-	addressbook/demo/addressbook.gnorba,
-	addressbook/demo/addressbook.h,
-	addressbook/demo/addressbook-factory.c,
-	addressbook/demo/addressbook-widget.c,
-	addressbook/demo/addressbook-widget.h: New factory to create an
-	addressbook bonobo component.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/.cvsignore: Added e-text-test.
-
-	* addressbook/demo/e-test-model.c,
-	addressbook/demo/e-test-model.h: A model storing data in an array
-	of Address objects.
-
-	* addressbook/demo/demo.c: Changed to use
-	addressbook/demo/e-test-model.c and
-	addressbook/demo/e-test-model.h.
-
-	* addressbook/demo/Makefile.am: Added e-test-model.c and
-	e-test-model.h.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/Makefile.am: Rearranged SUBDIRS for dependencies.
-
-	* widgets/e-text/e-text-model.c, widgets/e-text-model.h: New
-	object which stores a piece of text data.  All methods are
-	virtual.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Modified this
-	to use an ETextModel for its data.
-
-	* widgets/e-text/Makefile.am: Added e-text-model.c and e-text-model.h.
-
-	* widgets/e-minicard/test-minicard-label.c: Made this work again.
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard.h: Made this use an ETableModel to
-	get its data.
-
-	* widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h: Added the ability to set
-	the text model used for the contained text widget.
-
-	* widgets/e-minicard/Makefile.am: Added e-table since e-minicard
-	is now dependent on an e-table-model for its data.
-
-	* addressbook/demo, addressbook/demo/.cvsignore,
-	addressbook/demo/Makefile.am, addressbook/demo/demo.c,
-	addressbook/demo/spec: A new program to test ETable and EMinicard
-	integration.
-
-	* configure.in: Added addressbook/demo/Makefile.
-
-	* addressbook/Makefile.am: Added the demo/ subdirectory.
-
-2000-03-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h,
-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/test-reflow.c,
-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Adapted to use
-	the new e-canvas reflow system.
-
-2000-03-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a
-	"break_characters" argument.  It lets you define a set of
-	characters which should cause optional linebreaks to occur.  Made
-	setting the "clip_height" argument to -1 mean no height clipping.
-	Moved calling the "resize" signal into an idle handler to avoid
-	reentering the canvas update loop.  Made EText recalc bounds if
-	the affine has changed.  Fixed up tooltip_count (this counts the
-	number of ENTER and LEAVE events.)
-
-	* widgets/e-text/e-text-test.c: Got rid of a few warnings.
-
-	* widgets/e-minicard/e-minicard-label.h: Reindent a few lines.
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard-label.c: Switch from using "x" and
-	"y" to set the children's position to using
-	e_canvas_item_move_absolute.
-
-2000-03-05  Matt Loper  <matt.loper@splashtech.com>
-
-	* tests/ui-tests/message-browser.c: Commenting added.
-	(on_url_data_requested): renamed from "on_url_requested", to
-	reflect that a stream of data is what's actually being asked for.
-	(hydrate_persist_stream_from_gstring): New function.
-	(camel_stream_to_gstring): New function.
-	(on_object_requested): Cleaned up.
-
-2000-03-04  bertrand  <bertrand@helixcode.com>
-
-	* tests/ui-tests/Makefile.am: add bonobo to the build 
-	process.
-
-	* tests/ui-tests/message-browser.c (main): 
-	initialize Bonobo. Use bonobo_main.
-	(get_gtk_html_contents_window): set signal handlers
-	for url requests and objects requests.
-	(on_object_requested): answer to object requests.
-
-2000-03-03  bertrand  <bertrand@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (main): initialize
-	gdkrgb. Push visual/colormap.
-	(on_url_requested): in the case where a camel url is requested, 
-	write the camel stream to gtkhtml. 
-
-	* tests/ui-tests/Makefile.am (filter_LDADD): add
-	gnomeprint in the lib list. 
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-	
-	* configure.in: Build `filter/Makefile'.  Added check for GtkHTML.
-	Set `GTKHTML_CFLAGS' and `GTKHTML_LIBS' to the appropriate values
-	for linking with GtkHTML.
-
-2000-03-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/idl/Makefile,
-	calendar/cal-client/Makefile, and calendar/pcs/Makefile to the
-	list of files to generate.
-
-2000-02-29  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.c: Don't show the tooltip if the text is being
-	editted or isn't clipped. Remove the tooltip when editting starts.
-
-	* widgets/e-text/Makefile.am: Build the test program
-
-2000-02-29  NotZed  <NotZed@HelixCode.com>
-
-	* tests/ui-tests/Makefile.am (filter_LDADD): Added test program.
-
-	* tests/ui-tests/filterdescription.xml, saveoptions.xml: Data
-	files for test program.
-
-	* tests/ui-tests/filter.c (main): Test program for filter ui.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* widgets/e-minicard/Makefile.am (INCLUDES): Fixed references to
-	eutil.
-
-	* Makefile.am (SUBDIRS): Build e-util before other stuff.
-	(SUBDIRS): Build filter after camel.
-
-2000-02-28  Chris Lahey  <clahey@umich.edu>
-
-	* widgets/e-text/e-text.c: Compilation error.
-
-2000-02-28  Chris Lahey  <clahey@umich.edu>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Updated these
-	to use the canvas ::update system properly.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* acconfig.h:
-	* configure.in: define SENDMAIL_PATH with the path to sendmail.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.c, widgets/e-text.h, e-text-event-processor.c,
-	e-text-event-processor.h, e-text-event-processor-emacs-like.c,
-	e-text-event-processor-emacs-like.h,
-	e-text-event-processor-types.h: This were moved to widgets/e-text/
-	a while ago but never removed.  They have now been removed.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed some
-	warnings from this file.  Made tooltips disappear when you're
-	finished with them.
-
-	* widgets/e-minicard/test-reflow.c,
-	widgets/e-minicard/test-minicard.c,
-	widgets/e-minicard/test-minicard-label.c: Commented out unused
-	about_callback functions.
-
-	* widgets/e-minicard/e-reflow.c: Made e-reflow pass an EFocus to
-	its e-minicard children.
-
-	* widgets/e-minicard/e-minicard.c: Made e-minicard take and return
-	an EFocus for its "has_focus" argument.  This makes shift-tab work properly.
-
-	* widgets/e-minicard/e-minicard-label.c: Made e-minicard-label take and return
-	an EFocus for its "has_focus" argument.  Made the font that
-	e-minicard-label uses only be allocated once.
-	
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): stop
-	sscanf() abuse.
-
-	* tests/Makefile.am: changed references to libibex.a to
-	libibex.la.
-
-	* libical/src/libical/.cvsignore: Added *.lo, *.la, and .libs.
-	* libical/src/libicalss/.cvsignore: same.
-
-	* tests/.cvsignore: Added test11.
-
-	* libical/Makefile.in: autogenerated file removed from cvs, and
-	added to .cvsignore.
-	* libical/src/Makefile.in: same.
-	* libical/src/libical/Makefile.in: same.
-	* libical/src/libicalss/Makefile.in: same.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): 
-	uggly hack to test part saving and
-	b64 streams.
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* tests/test10.c:
-	* tests/test11.c: update for camel changes
-
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* tests/Makefile.am: Changed dependencies on libibex.la to
-	libibex.a. In test9_LDADD, placed libcamelmbox.la before
-	libibex.la, as the former requires the latter.
-
-2000-02-20  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.[ch] (_do_tooltip): Show the text of the item,
-	in a tooltip style.
-	(e_text_event): Add a timeout on the Enter and remove it on the Leave
-	events.
-
-	* e-text-test.c: New file to test e-text items.
-	
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: added ABOUT-NLS.  
-	* ABOUT-NLS: removed.
-	
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): When a link
-	is clicked, indicate the link with a dialog.
-
-	* libical/src/test/.cvsignore: Added Makefile.
-
-	* libical/.cvsignore: Added Makefile, configure, config.status.
-
-	* libical/src/.cvsignore: New file.
-
-	* libical/Makefile: autogenerated file removed from cvs.
-	* libical/configure: same. 
-	* libical/config.status: same.
-	* libical/src/Makefile: same.
-	* libical/src/test/Makefile: same.
-
-	* widgets/e-minicard/.cvsignore: Added minicard-label-test,
-	minicard-test, and reflow-test.
-
-	* shell/.cvsignore: added files autogenerated from Evolution.idl.
-
-	* libversit/.cvsignore: Added .libs, vcc.c, vcc.lo, vobject.lo,
-	vcaltmp.lo, libversit.la
-
-	* libical/src/test/.cvsignore: New file.
-
-	* libical/src/libical/.cvsignore: New file.
-
-	* libical/src/libicalss/.cvsignore: New file.
-
-	* libical/.cvsignore: New file, with config.log in it.
-
-	* tests/ui-tests/message-browser.c: minor cleanup.
-
-	* tests/ui-tests/.cvsignore: added message-browser.
-
-2000-02-18  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (main): Use a relative path to the mbox provider
-	module.
-
-2000-02-18  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (filename_to_camel_msg): Call
-	camel_data_wrapper_set_input_stream, rather than
-	camel_data_wrapper_construct_from_stream.  For the whole message,
-	allow someone to see the header ("to", "from", etc.).  Clicking on
-	tree items to see their elements, now works also.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* configure.in: Make gnomeui the last library on the command line,
-	as its path is the one most likely to hold other old libraries
-	(libxml) and we need newer versions.
-	
-	(BONOBO_VFS_GNOME_CFLAGS): Add libical to the
-	AC_CONFIG_SUBDIRS 
-
-	(BONOBO_HTML_GNOME_CFLAGS): VFS checking needs to
-	go before we rquery them. 
-
-	Use the new method for gnome-print
-	checking instead of the old crufty gtk+ based one that nobody can
-	debug.  ever.
-	
-2000-02-16  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (tree_selection_changed): New
-	callback function, which will later change the main html window to
-	reflect the newly-selected tree item.
-	(get_gtk_html_contents_window): New function. Gets the content
-	part of a message.
-	(get_gtk_html_header_window): New function. Will get the header
-	part of a message, when applicable.
-
-	* camel/camel-formatter.c (str_tolower): Now returns a new string,
-	rather than changing it in place.
-	(initialize_camel_formatter): New function; gives a root
-	CamelDataWrapper and a stream to a CamelFormatter.
-	(camel_formatter_wrapper_to_html): New function. Translates any
-	CamelDataWrapper into html.
-	(lookup_unique_id): Allows the root object to be a
-	CamelDataWrapper, which is more general than the previously
-	required CamelMimeMessage.
-
-
-2000-02-14  NotZed  <notzed@zedzone.helixcode.com>
-
-	* configure.in (EXTRA_GNOME_CFLAGS): Add libunicode to CFLAGS/LIBS.
-
-2000-02-13  NotZed  <notzed@zedzone.helixcode.com>
-
-	* configure.in: Added check for libunicode.
-
-	* Makefile.am (SUBDIRS): Added libibex.
-
-	* tests/test11.c (main): New test, tests search api.
-
-2000-02-13  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/test-multipart-mixed.msg: New rfc822 file, which
-	crashes message-browser.
-
-	* tests/ui-tests/message-browser.c (get_gtk_html_window): Takes a
-	CamelMimeMessage as a param, rather than a filename.
-	(main): Puts our windows in an hpane rather than a vbox. Also
-	opens a file dlg box if a filename wasn't given as a first param.
-
-	* camel/camel-stream-fs.c (_init_with_name): Set stream_fs->fd to
-	-1 if we fail to load the file.
-	(camel_stream_fs_new_with_name): If stream_fs->fd is -1, return
-	NULL. These changes make it so that a CamelStreamFs won't be
-	created if you give it a bogus filename; they may be replaced once
-	exception handling is in place.
-
-	* tests/ui-tests/message-browser.c (handle_tree_item): Expand tree
-	items.
-	(mime_message_to_html): New function; translates a
-	CamelMimeMessage into two strings (one for the header, and one for
-	the body).
-	(get_gtk_html_window): New function; fills out a window with
-	html. The html is taken from a processed rfc822 file, via a
-	CamelFormatter.
-
-	* camel/camel-formatter.c: Added assertions.
-	(handle_text_html): Don't call text_to_html on something that's
-	already html.
-	(multipart_foreach): function deleted.
-
-	* tests/ui-tests/message-browser.c: Added preliminary support for
-	the viewing of messages via gtkhtml. Lots of commenting. 
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c: Fixed the
-	location the first time you see the drop down menus for changing
-	which phone, email, or snail mail address you see.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c (e_text_event): Made a click on a text
-	widget set the cursor properly.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.h: Removed some arguments from the .h that
-	will never be implemented.
-
-
-2000-02-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init): 
-	default the text/* mime types to CamelSimpleDataWrapper so
-	that Michael can use get_stream. 
-
-2000-02-10  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/camel-simple-data-wrapper-stream.h: The superclass is
-	actually a seekable stream, not just a stream.
-
-2000-02-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/Makefile.am (THREAD_RELATED_TESTS): don't 
-	build thread related tests if evolution has been
-	compiled with no thread support.
-
-	* configure.in (have_pthread): allow user to enable/disable
-	thread support at configure time
-	(EXTRA_GNOME_CFLAGS): 
-	(EXTRA_GNOME_LIBS): thread support is directly 
-	included in this variable if enabled. No more
-	EXTRA_GNOME_CFLAGS_THREADS
-	Other special support should be added in 
-	EXTRA_GNOME_LIBS and EXTRA_GNOME_CFLAGS
-	instead of redefining a new variable 
-	each time we want to add a new lib. 
-	(bonobo, ....)
-
-	* camel/camel.c (camel_init): only try to initialize threads if
-	we enabled threads support. 
-
-	* tests/ui-tests/Makefile.am (message_browser_LDADD): use
-	EXTRA_GNOME_LIBS
-
-	* configure.in (have_pthread): remove HAVE_PTHREADS
-	variable. Define ENABLE_THREADS instead.
-
-	* camel/Makefile.am: use ENABLE_THREADS not HAVE_PTHREADS
-	to test if we build thread relateed code. 
-
-	* tests/Makefile.am: use EXTRA_GNOME_LIBS, 
-	not EXTRA_GNOME_LIBS_THREADS
-
-2000-02-10  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/hash-table-utils.c (g_strcase_hash): Removed a bizarre
-	comparison construct for converting case.
-
-2000-02-09  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):
-	Uses case-insensitive compares.
-
-	* camel/gmime-content-field.c (gmime_content_field_new): Uses
-	case-insensitive compares.
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):
-	Use case-insensitive mime types.
-
-	* camel/camel-simple-data-wrapper-stream.c (read): Increment the
-	copy source address to match the data read offset.
-	(seek): Actually implement the seek.
-
-	* camel/camel-mime-part-utils.c
-	(camel_mime_part_store_stream_in_buffer): If we get a -1 read,
-	DONT update the total bytes, and try and truncate the array in
-	reverse.  Eek.
-
-	* camel/camel-mime-part.c (camel_mime_part_encoding_from_string):
-	This was DEFINETLEY not the right way to do it. strncmp!=strcmp
-	(camel_mime_part_encoding_to_string): Handle the default case.
-	: include string.h for strcmp() etc.
-
-2000-02-09  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/test-multipart-alt.msg: New test file; run
-	message-browser on it, and it will crash.
-
-2000-02-09  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/message-browser.c (handle_tree_item): 
-	show the item. 
-	(handle_tree_item): show the containers and the containees
-	(get_message_tree_ctrl): call handle_tree_item
-	on the message itself
-
-	* camel/camel-mime-message.c (camel_mime_message_init): 
-	set the mime type to "mime/message".
-	--- THIS IS NOT THE CONTENT TYPE ---
-
-	* camel/camel-mime-body-part.c (camel_mime_body_part_init): 
-	set the mime type to "body-part". 
-	--- THIS IS NOT THE CONTENT TYPE ---
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_set_mime_type): 
-	mime_type is const. 
-	(_set_input_stream): really set the input stream
-	(_set_output_stream): really set the output stream
-	various other typo fixes.
-
-	* tests/ui-tests/message-browser.c: various typo
-	fixes in the ctree construction. 
-
-	* camel/string-utils.c (string_trim): fix braindead
-	trailing trim bug.
-
-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): 
-	strip the leading and trailing quotes when constructing the 
-	content field. This should be done in a more generic 
-	RFC822 approach, but this fixes a bug that prevent
-	matt from analysing some multipart messages.
-
-	* camel/camel-data-wrapper.h: reorganize the 
-	deprecated and new methods. 
-
-	* camel/providers/mbox/camel-mbox-folder.c 
-	(_check_get_or_maybe_generate_summary_file): 
-	Use "From " as the message separating string. 
-	
-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): 
-	set the mode when creating the mbox file. 	
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	ditto
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	ditto
-
-2000-02-09  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (print_usage_and_quit): Minor
-	cleanup.
-
-2000-02-09  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/camel-simple-data-wrapper-stream.c (class_init): Actually
-	initialise the class.  It simple couldn't have worked before.
-	(camel_simple_data_wrapper_stream_construct): Commented out code
-	which crashes just to get something working, memory corruption??
-
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Add new Makefiles to Makefile list.
-
-	* widgets/e-text/Makefile.am: Build libetext.
-
-	* widgets/e-minicard/Makefile.am: Build libeminicard and test
-	programs.
-
-	* widgets/Makefile.am: Remove all e-text and e-minicard code and
-	add them to the SUBDIRS list.
-
-2000-02-08  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c: New file; shows a message in
-	tree format, where multipart's have multiple leaves.
-
-	* camel/camel-formatter.c: Changed references from
-	'multipart/alternate' to 'multipart/alternative'.
-
-	* tests/test-formatter.c (convert_to_html_and_print): Use the
-	buffer length of the stream to create strings which are then
-	printed, rather than printing the stream (which might not have a
-	trailing \0) directly.
-
-	* camel/camel-formatter.c (str_tolower): New function; makes a
-	string lowercase.
-
-	* tests/test-formatter.c (convert_to_html_and_print): Fixed call
-	to 'camel_formatter_mime_message_to_html' to contain correct
-	params.
-
-	* camel/camel-formatter.c: New member to 'CamelFormatterPrivate',
-	'attachments', will be used to let the caller know which items
-	should be treated as attachments (as opposed to objects which are
-	inline to the body).
-	(text_to_html): name changed from 'encode_entities'. Also now
-	converts newlines to <br> tags.
-	(camel_formatter_mime_message_to_html): Now takes two output
-	streams -- one for the header, and one for the body.
-	(get_bonobo_tag_for_object): New function; tries to make a tag out
-	of (1) the leaf of a mime message and (2) a bonobo object that can
-	handle its mime type, but can return NULL if it fails to find the
-	mime type.
-	(handle_vcard): New function; will write out a vcard as html.
-
-2000-02-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.h, widgets/e-text.c: Added line wrap and a max
-	number of lines (max number of lines is only obeyed if text is not
-	being edited).
-
-2000-02-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/e-contact-print.c: Removed an unneccessary
-	include of libhnj.  All uses of libhnj are commented out.
-
-2000-02-07  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (mime_part_to_html): function deleted.
-
-	* tests/test-formatter.c (print_usage_and_quit): New function,
-	which gives usage information.
-
-	* camel/camel-formatter.c: made the 'stream' a member of the
-	CamelFormatter class, so that streams don't have to be explicitly
-	sent as a param where a CamelFormatter is also sent..
-	(handle_text_plain): Use 'encode_entities' to change '<' to
-	'&gt;', etc.
-
-2000-02-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-formatter.c (find_preferred_displayable_body_part_in_multipart_alternative): 
-	(mime_part_to_html): typo fix : 
-	use find_preferred_displayable_body_part_in_multipart_alternative
-	instead of the other names. Allows camel to have no undefined symbols. 
-
-2000-02-02  Matt Loper  <matt@helixcode.com>
-
-	* tests/test-formatter.c: New file; intended to test the
-	CamelFormatter class.
-
-	* camel/camel-formatter.c: Lots of cleanup, commenting, some new
-	functions, and a really basic skeleton for getting bonobo objects
-	into the html.
-	(encode_entities): New function, stolen from Daniel Velliard.
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/e-contact-print-style-editor.h,
-	addressbook/printing/e-contact-print-style-editor.c,
-	addressbook/printing/test-contact-print-style-editor.c: Files to
-	load the contact print style editor from the glade file.  Doesn't
-	really do anything yet.
-
-	* addressbook/printing/Makefile.am: Added style editor stuff.
-
-	* addressbook/printing/e-contact-print.glade: Changed a bit.
-	Fixed an out of place widget.
-
-	* addressbook/printing/.cvsignore: Added
-	contact-print-style-editor-test.
-
-	* addressbook/printing/smallbook.ecps: Fixed up the values to
-	match the new types.
-
-	* addressbook/printing/medbook.ecps,
-	addressbook/printing/phonelist.ecps: Added two new printing
-	styles.
-
-	* addressbook/printing/e-contact-print.h: Fixed an incorrect
-	comment.
-	
-	* addressbook/printing/e-contact-print.c: Added columns and letter
-	tabs.  Tweaked spacing all over the place.  Fixed card height
-	function so that column wrapping is always done correctly.  Added
-	pulling of style information from a file.  Added line wrapping
-	within each text field.
-
-	* addressbook/printing/e-contact-print-types.h: Added a type field
-	for different types of print styles.
-
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.c (e_text_command): Handle the grab and ungrab
-	command instead of doing focus by hand.  This fixes a problem
-	related to the scroll wheel.
-	(e_text_command): Reset the blink timer in many more command
-	situations so that the cursor blinks less when you're interacting
-	with it.
-
-	* widgets/e-text-event-processor-emacs-like.c: Send the grab focus
-	command when starting a selection and the ungrab focus command
-	when ending it.
-
-	* widgets/e-text-event-processor-types.h: Added grab command type
-	so that the event processor can tell the widget to grab the focus.
-
-	* widgets/e-reflow.c: Redefined all sizes using #defines so that
-	they can be tweaked later.  Added scroll wheel handling and set up
-	adjustment increments so that the scroll bars will work correctly.
-
-	* widgets/e-minicard.h: Added minicard focus type enum.  This
-	doesn't mean anything yet, but it will later be used to say which
-	direction the focus is coming from (below for shift-tab, above for
-	tab.)
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard-label.c, widgets/e-minicard.c: Use
-	e_canvas_item_grab_focus so that it will work with old versions of
-	gnome-canvas.
-
-	* widgets/e-canvas.c, widgets/e-canvas.h: Finished working around
-	focus bugs.
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/test-reflow.c: Set the minimum_width.
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added one more column
-	line so that the right edge of the reflow will have a line.  Also
-	added a minimum_width so that even if the reflow is thinner than
-	the window, when you resize it larger all the lines are drawn.
-
-2000-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added an arrow cursor
-	for the draggable columns.  Made the clickable column area
-	larger.  
-
-	* widgets/e-text.h, widgets/e-text.c: Added an I beam cursor for
-	the text item when it is editable.
-
-	* widgets/e-minicard-label.c: Forward enter and leave
-	notifications to the contained editable text item.
-
-2000-01-26  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c: By looking up a mimetype in a
-	hashtable, we can now get a handler function for an arbitrary
-	mimetype.
-
-2000-01-25  Mathieu Lacage <mathieu@advogato.org>
-
-	* .cvsignore s: cvs shutup. 
-
-2000-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-reflow.c, widgets/e-minicard.c: Handle shift-tab
-	properly now.
-
-	* widgets/e-minicard-label.c: Reindented some areas.
-
-	* widgets/test-reflow.c: Use e-canvas.  Set the back pixmap to
-	NULL for the canvas so that scrolling won't flash grey.
-
-	* widgets/e-canvas.c, widgets/e-canvas.h: These subclass
-	GnomeCanvas to work around a few bugs so that evolution will work
-	well with old versions of gnome-libs.
-
-	* widgets/Makefile.am: Added e-canvas.c and e-canvas.h.
-
-	* addressbook/contact-editor/contact-editor.glade: Not much
-	change.  Mostly internal reorganization by glade itself.
-
-2000-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/smallbook.ecps: Example contact printing
-	style.  Not used yet.
-
-	* addressbook/printing/e-contact-print.glade: A glade file for
-	editing contact printing styles.  Not used yet.
-
-	* addressbook/printing/test-print.c: Test file for printing.
-
-	* addressbook/printing/e-contact-print.c,
-	addressbook/printing/e-contact-print.h,
-	addressbook/printing/e-contact-print-types.h,
-	addressbook/printing/Makefile.am, addressbook/printing/.cvsignore:
-	New files for contact printing support.
-
-	* addressbook/Makefile.am (SUBDIRS): Add printing.
-
-	* configure.in: Check for gnome-print.  Build the
-	addressbook/printing Makefile.
-
-2000-01-24  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-data-wrapper.h: 
-	* camel/camel-data-wrapper.c 
-	(_set_input_stream): 
-	(_get_input_stream): 
-	(_set_output_stream): 
-	(_get_output_stream): 
-	The CamelDataWrapper can now be provided with input and
-	output streams, so that nothing has to be kept in memory. 
-	
-	* camel/camel-stream.c (camel_stream_class_init): 
-	added the "data_available" signal.
-	
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Added the gnome-pilot and capplet checks; they
-	will likely be reworked for the Evolution framework, but for now
-	the calendar/ directory needs them.
-
-	* configure.in: Added checks for gnome-vfs.
-
-2000-01-24  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-seekable-stream.c: 
-	* camel/camel-seekable-stream.h: 
-	new files. 
-	
-	* camel/camel-simple-data-wrapper-stream.h:  parent class is now
-	CamelSeekableStream
-	* camel/camel-stream-buffered-fs.h: idem
-	* camel/camel-stream-buffered-fs.c: idem
-	* camel/camel-stream-mem.h: idem
-	* camel/camel-stream-mem.c: idem
-	(_seek): change declaration
-	* camel/camel-stream-fs.c: parent class is now
-	CamelSeekableStream
-	(_seek): change declaration
-
-	* camel/camel-stream-fs.h: parent class is now
-	CamelSeekableStream
-	
-	* camel/camel-stream-fs.[ch]: converted all 
-	gint64 variables into guint32. 
-	
-	
-	* camel/camel-stream-fs.c (_read): fix stupid bug.
-	(_write): ditto. 
-
-	* camel/camel-exception.c (camel_exception_new): don't
-	forget to clean the exception when creating it. 
-
-	* camel/camel-recipient.c (camel_recipient_table_add_list): 
-	add recipient_list to the recipients, not recipients_list. 
-	I don't know what that variable was doing here. 
-
-
-2000-01-24  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (write_header_info_to_stream): new
-	function, broken out from 'camel_formatter_make_html'.
-	(write_mimepart_to_stream): same.
-	(find_text_body_part_in_multipart_related): new function.
-	(camel_formatter_make_html): Now tries to deal with
-	multipart/related, multipart/alternate, and text/(plain|html).
-
-
-2000-01-23  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-store.c (camel_store_get_session): 
-	added a public get_session method.
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(camel_mbox_load_summary): load/save message sizes in the summary file
-
-	* camel/providers/mbox/camel-mbox-summary.h: 
-	added a size field to the message information 
-	structure. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	copy message size to the mbox summary information too. 
-	
-	* camel/camel-stream-fs.c (_seek): updated to 
-	work with bounded fs streams. 
-	(_write): ditto.
-	(_read): ditto.
-
-	* camel/camel-stream-fs.h (struct ): 
-	added the cur_pos, inf_bound and sup_bound
-	members to allow for bounded fs stream. 
-
-	* camel/camel-stream-fs.c (_set_bounds): new func.
-	(_init_with_fd_and_bounds): idem.
-	(_init_with_name_and_bounds): idem. 
-	New functions to allow the usage of bounded fs streams.
-
-	The bounded fs stream allow, for example, to make a stream
-	from a message stored in an mbox file. 
-	
-	
-2000-01-22  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_check_get_or_maybe_generate_summary_file): 
-	use the real summary file path instead of a 
-	stupid hardcoded one. Fixes yet another bug.
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	don't forget to copy the date too. Fix a very annoying bug.
-
-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): 
-	implemented. A lot of fixes too. Works now. 
-	(_get_uid_list): implemented.
-
-2000-01-21  bertrand  <bertrand@helixcode.com>
-
-	* tests/test10.c:
-	test the mbox provider. 
-
-	* camel/camel-folder.c (_set_name): 
-	if camel_folder_get_mode returns an
-	exception, return it instead of
-	overriding it with a new one.
-	(camel_folder_is_open): make the is_open
-	method public.
-	(_set_name): use the is_open instead of
-	get_mode.
-	(_set_name): set the fullname even in the case 
-	where the folder has no parent.
-	(_set_name): use %c, not %d to add the 
-	separator char into the full path.
-
-	* camel/camel-store.c: add exception handling everywhere in
-	the store related functions arguments. 
-	* camel/providers/mbox/camel-mbox-folder.c: idem
-	* camel/providers/mbox/camel-mbox-folder.h: idem
-	* camel/providers/mbox/camel-mbox-store.h: idem
-
-	* camel/providers/mbox/Makefile.am (libcamelmbox_la_SOURCES): 
-	added camel-mbox-provider.c to the mbox provider
-	sources. 
-
-	* camel/providers/mbox/camel-mbox-provider.c: 
-	provider registration code.
-
-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): implemented
-	(_append_message): implemented
-
-	* camel/providers/mbox/camel-mbox-parser.c (initialize_buffer): 
-	use \0 to mark the end of the buffer.
-	(read_next_buffer_chunk): ditto.
-	(read_header): test the presence of a \0 instead of
-	reading the eof field
-	(read_message_begining): idem.
-	(camel_mbox_parse_file): idem.
-	Remove the eof field from the parser
-	structure. 
-	(read_next_buffer_chunk): removed some nasty bugs
-	again. 
-
-	
-2000-01-21  Federico Mena Quintero  <federico@helixcode.com>
-	
-	* libversit/vcc.y: Removed the VFS crap; my mistake, it should not
-	go here.
-
-	* configure.in: Added yacc requirements for libversit.
-
-2000-01-21  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (camel_formatter_make_html): added a
-	CamelMimeMessage as a param to this function, and removed it as a
-	member of the object.
-
-2000-01-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added libversit/Makefile and
-	calendar/Makefile.
-
-	* Makefile.am (SUBDIRS): Added libversit and calendar.
-
-2000-01-20  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	compute and return the file size. 
-
-
-2000-01-20  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c, camel/camel-formatter.h: New
-	files. You'll be able to use a CamelFormatter to get
-	html-formatted versions of a CamelMimeMessage.
-	
-2000-01-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text-event-processor-types.h: Changed some line
-	spacing.
-
-	* widgets/test-reflow.c: Connected to the resize signal of the
-	reflow.
-
-	* widgets/e-minicard.c: Made width argument set function only
-	update if width is different.
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added draggable column dividers.
-
-	* addressbook/contact-editor/test-editor.c: Open two dialogs for
-	more interesting testing.
-
-	* addressbook/contact-editor/e-contact-editor.h,
-	addressbook/contact-editor/e-contact-editor.c: Modified to use
-	glade.  Added menus to change which phone/address/email entries to
-	view.  Added images to the dialog.
-
-	* addressbook/contact-editor/e-contact-editor-strings.h,
-	addressbook/contact-editor/contact-editor.glade: Glade files for
-	the contact editor dialog.
-
-	* addressbook/contact-editor/Makefile.am: Added images and added
-	glade stuff.
-
-	* addressbook/contact-editor/arrow.png,
-	addressbook/contact-editor/briefcase.png,
-	addressbook/contact-editor/netfreebusy.png,
-	addressbook/contact-editor/netmeeting.png: Image files for the
-	contact editor dialog.
-
-2000-01-19  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): 
-	implemented.
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(camel_mbox_load_summary): save/load the next uid. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	Compute the next available uid. 
-	* camel/providers/mbox/camel-mbox-folder.c (_create): 
-	(_check_get_or_maybe_generate_summary_file): 
-	Set and use the next_uid field properly. 
-	* camel/providers/mbox/camel-mbox-summary.h: added
-	an extra field to store the next available uid. 
-
-	* camel/providers/mbox/camel-mbox-folder.c 
-	(_check_get_or_maybe_generate_summary_file): 
-	routine called when the folder is opened. 
-	Reads or creates the summary file. 
-	(_create): initialize the internal summary 
-	structure. 
-	(_close): save the summary file on closing. 
-	(_init_with_store): initialize mbox specific
-	folder members. 
-
-2000-01-18  bertrand  <bertrand@helixcode.com>
-
-	* tests/test9.c:
-	tests for summary and parsing process of mbox files. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): do
-	not use case insensitive comp to detect message separators. Kill 
-	some nasty bugs in netscape file parsing,
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	don't use g_array_append but write directly inside the
-	array data instead. Better performance and bug fix. 
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_load_summary): 
-	fix the name and bugs. 
-
-	* camel/camel-folder-summary.h: update the class
-	method definition to match the public defs. 
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(mbox_load_summary): summary file read/write routines. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	routine to construct the summary after the mbox
-	file has been parsed and the x-evolution fields
-	inserted. 
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	dont use the x_evolution field but rather the uid to 
-	determine the presence of "X-Evolution" in the mail. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	parse the status and uid values if the x-evolution
-	has been found. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_xev_parse_header_content): 
-	return the parsed status field correctly. 
-
-	* camel/providers/mbox/camel-mbox-utils.h: 
-	fixed bad prototype.
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	parse and store the "To:" header.
-
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	added a "to" field 
-
-	* camel/camel-folder-summary.c: 
-	create the arrays here. 
-
-	* camel/camel-folder-summary.h: the list of 
-	summary information is no longer a GList but 
-	rather a GArray.
-
-2000-01-17  Chrsitopher James Lahey  <clahey@helixcode.com>
-
-	* head.png, phone.png, email.png, web.png, snailmail.png: Images
-	for e-contact-editor.c.
-
-	* addressbook/contact-editor/text-editor.c: Test program
-	for contact editor widget.
-
-	* addressbook/contact-editor/e-contact-editor.c,
-	addressbook/contact-editor/e-contact-editor.h: Contact editor
-	widget files.
-
-	* addressbook/contact-editor/.cvsignore,
-	addressbook/contact-editor/Makefile.am: New directory for contact
-	editor files.
-
-	* addressbook/.cvsignore, addressbook/Makefile.am: New directory
-	for addressbook files.
-
-	* widgets/.cvsignore: Added reflow-test.
-
-	* Makefile.am (SUBDIRS): Added addressbook subdirectory.
-
-	* configure.in, widgets/Makefile.am: Removed widgets/toolbar from
-	SUBDIRS since the lack of content was preventing it from
-	compiling.
-
-	* widgets/e-text.c, widgets/e-text.h: Fixed a crashing bug.
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* tests/test9.c (main): test for the mbox utils.
-
-2000-01-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Add the gnomecanvaspixbuf argument to gnome-config
-	invocations.
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	(copy_file_chunk): 
-	(camel_mbox_xev_write_header_content): 
-	(string_to_flag): 
-	(flag_to_string): 
-	(string_to_uid): 
-	(uid_to_string): 
-	A bunch of new funcs to handle x-evolution 
-	private header field. 
-	(copy_file_chunk): fixed a nasty bug. 
-	(camel_mbox_write_xev): create the copy file descriptor
-	with the proper arguments. Exceptions implememnted.
-	(camel_mbox_write_xev): changed the way bytes are counted. 
-	No more uses the message size cause it did not take into
-	account the message separators characters. 
-	(camel_mbox_write_xev): hopefully fixed the last bugs. 
-	works ok now. 
-	
-
-2000-01-15  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): 
-	store the end of headers position. 
-	
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	added the end_of_header_position to locate the 
-	begining of the mail body. 
-	
-
-	* camel/providers/mbox/camel-mbox-utils.c (uid_to_string): 
-	(string_to_uid): 
-	(flag_to_string): 
-	(string_to_flag): 
-	new functions to handle uids and
-	flags in the X-Evolution header. 
-	(camel_mbox_xev_parse_header_content): 
-	new function to parse an X-Evolution 
-	header. 
-	(camel_mbox_xev_write_header_content): 
-	new function to write the X-Evolution 
-	header. 
-
-2000-01-13  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c (read_next_buffer_chunk): 
-	eof is true when no more chars are available, not 
-	when we've read the entire file. 
-	(initialize_buffer): ditto.
-	(read_message_begining): documented.
-	(read_header): ditto.
-	(new_message_detected): ditto.
-	(advance_n_chars): ditto.
-	(goto_next_char): ditto.
-	(read_next_buffer_chunk): ditto.
-	(initialize_buffer): ditto.
-	(parser_free): ditto.
-	(new_parser): ditto.
-
-2000-01-12    <clahey@galapagos.helixcode.com>
-
-	* widgets/e-text-event-processor-types.h,
-	widgets/e-text-event-processor-emacs-like.c, widgets/e-text.c,
-	widgets/e-text.h: Added selection and clipboard support.  Added up
-	and down arrow keys.  Fixed choice of font colors for the
-	selection to be based on the current style.
-
-	* widgets/e-minicard.c: Caused a click to grab the focus.  Changed
-	the fake information added.
-
-	* widgets/e-minicard-label.c: Forward mouse events to the field
-	EText item.
-
-2000-01-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-canvas-utils.c, widgets/e-canvas-utils.h:
-	e_canvas_item_move_absolute is just a helper function not supplied
-	by the gnome_canvas.[ch] I put it here so that multiple items can
-	use it.
-
-	* widgets/e-reflow.c, widgets/e-reflow.h: This item contains a
-	number of other items and places them into multiple columns.  The
-	items contained must support a number of arguments and signals to
-	allow the reflow to interact with them.
-
-	* widgets/test-reflow.c: This is a test program for e-reflow.
-
-	* widgets/e-text.c, widgets/e-text.h: Added properly drawn
-	selected text.  Added some preliminary code for X selection
-	handling and cut & paste.
-
-	* widgets/e-minicard.c, widgets/e-minicard.h: Added ARG_HAS_FOCUS
-	handling.  Made label display random for more interesting tests of
-	multiple cards.  Tweaked sizing information for better display.
-
-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added
-	ARG_HAS_FOCUS handling.
-
-	* widgets/Makefile.am: Added the reflow test and reflow files.
-
-2000-01-12  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.h (camel_mbox_parse_file): 
-	Added the prototype of camel_mbox_parse_file. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	updated in-line documentation.
-
-	* tests/Makefile.am (noinst_PROGRAMS): 
-	remove non updated tests from the build 
-	process. 
-
-	* corrected a bunch of bugs 
-	
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): 
-	parser the subject and date.
-	
-
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): added the ability to 
-	follow the parsing progression. 
-	
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	parse the x-evolution field. 
-
-	* camel/Makefile.am (libcamel_la_SOURCES): 
-	disabled gmime-rfc2047 as it depends on libunicode
-	and is not used for the moment. 
-
-2000-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard.c, widgets/e-minicard.h: Added a resize
-	signal for when the card changes height.  Made it so that when you
-	press tab inside of a field, it goes to the next field.
-
-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added a
-	resize signal for when the label changes height.
-
-	* widgets/e-text.c, widgets/e-text.h: Added a resize signal for
-	multiple lines.  Added scrolling based on cursor position.
-
-	* widgets/Makefile.am: Removed an extraneous build target.
-
-2000-01-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text-event-processor-emacs-like.c: Blocked the tab key
-	from getting inserted into the buffer since the renderer doesn't
-	know what a tab is.
-
-	* widgets/e-text.c, widgets/e-text.h: Fixed a memory leak.  Added
-	a blinking cursor and scrolling for the text item.
-
-2000-01-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/test-minicard.c: Removed some code which got in the way
-	of testing properly.
-
-	* widgets/e-minicard-label.c (e_minicard_label_realize): Made the
-	field text item editable.
-
-	* widgets/Makefile.am: Added e-text-event-process*.[ch].
-
-	* widgets/e-text.c, widgets/e-text.h: Changed these to support
-	editing.
-
-	* widgets/e-text-event-processor.c,
-	widgets/e-text-event-processor.h,
-	widgets/e-text-event-processor-types.h,
-	widgets/e-text-event-processor-emacs-like.c,
-	widgets/e-text-event-processor-emacs-like.h: These are a new pair
-	of classes which handle all events from the text item and convert
-	them into commands.
-
-
-2000-01-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/Makefile.am: Added minicard and text stuff.
-
-	* widgets/e-minicard.c, widgets/e-minicard.h,
-	widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added
-	canvas items for the minicard view in the contact manager.
-
-	* widgets/test-minicard.c, widgets/test-minicard-label.c: Tests
-	for the minicard items.
-
-	* widgets/e-text.h, widgets/e-text.c: New canvas item.  Based on
-	GnomeCanvasText.  Adds ellipsis capabilities.  Used in
-	e-minicard*.[ch].
-
-	* widgets/.cvsignore: Added minicard-test and minicard-label-test.
-
-2000-01-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in: Add Bonobo detection, Bonobo flags for compilation
-	for the components and the shell.
-
-2000-01-06 Elliot Lee <sopwith@redhat.com>
-	* composer/Makefile.am, widgets/e-table/Makefile.am: Work with
-	builddir != srcdir
-
-2000-01-05  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (EXTRA_GNOME_CFLAGS_THREADS,
-	EXTRA_GNOME_LIBS_THREADS): New variables that hold the thread
-	version of the compile/link lines.
-
-1999-11-20  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (PACKAGE): Raise warning level.
-
-2000-01-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): 
-	in the io_error label does not return before the 
-	list has been freed.
-
-2000-01-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): 
-	detects netscape ".sdb" folders as well as simple 
-	non-suffixed folders (as the ones used in pine).
-	
-
-	* camel/string-utils.c (string_prefix): 
-	finished implementation. 
-	(string_prefix): added a boolean flag to indicate if the 
-	suffix has been found. When the suffix does not match, 
-	return NULL.
-
-1999-12-26 bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-exception.c (camel_exception_setv): 
-	new function. Allow printf-like description
-	string constructions. 
-
-	* camel/camel-exception.h: cosmetic changes.
-
-        * camel/providers/mbox/camel-mbox-store.h:
-        * camel/providers/mbox/camel-mbox-store.c:
-        * camel/providers/mbox/camel-mbox-folder.h:
-        * camel/providers/mbox/camel-mbox-folder.c:
-        More work on the mbox provider.
-
-
-1999-12-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-store.h: 
-	* camel/providers/mbox/camel-mbox-store.c: 
-	* camel/providers/mbox/camel-mbox-folder.h: 
-	* camel/providers/mbox/camel-mbox-folder.c: 
-	part of the mbox provider.
-
-1999-12-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_set_name): 
-	check that the folder is closed or raise an exception.
-	(_set_name): unset the name fields as soon as possible, 
-	even if an exception is raised.
-
-	* configure.in:
-	build mbox provider Makefile
-	
-	* camel/Makefile.am (SUBDIRS): 
-	re-enable providers compilation
-
-1999-12-19  Damon Chaplin  <damon@karuna.freeserve.co.uk>
-
-	* configure.in (AC_OUTPUT): added widgets/meeting-time-sel/Makefile
-
-1999-12-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-utils.c: include camel-log.h
-	to avoid unresolved symbols.
-
-1999-12-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_get_summary): 
-	documented.
-
-	* camel/camel-folder-pt-proxy.c (_append_message): 
-	updated to take the change on append into account.
-
-	* camel/camel-folder.h: 
-	updated class def concerning append.
-	* camel/camel-folder.c 
-	(camel_folder_append_message): documented. 
-	(camel_folder_append_message): don't return the 
-	message number. Use specific methods instead.
-	(_append_message): idem.
-
-	(_delete): use 	exception mechanism.
-	(camel_folder_delete): idem.
-	(_delete_messages): idem.
-	(camel_folder_delete_messages): idem.
-	(_get_parent_folder): idem.
-	(camel_folder_get_parent_folder): idem.
-	(_get_parent_store): idem.
-	(_get_mode): idem.
-	(camel_folder_get_parent_store): idem.
-	(camel_folder_get_mode): idem.
-	(_list_subfolders): idem.
-	(camel_folder_list_subfolders): idem.
-	(_expunge): idem.
-	(camel_folder_expunge): idem.
-	(_has_message_number_capability): idem.
-	(camel_folder_has_message_number_capability): idem.
-	(_get_message_by_number): idem.
-	(camel_folder_get_message_by_number): idem.
-	(camel_folder_get_message_count): idem.
-	(_list_permanent_flags): idem.
-	(camel_folder_list_permanent_flags): idem.
-	(_copy_message_to): idem.
-	(camel_folder_copy_message_to): idem.
-	(camel_folder_has_summary_capability): idem.
-	(camel_folder_get_summary): idem.
-	(camel_folder_has_uid_capability): idem.
-	(camel_folder_get_message_uid): idem.
-	(_get_message_uid_by_number): idem.
-	(camel_folder_get_message_uid_by_number): idem.
-	(camel_folder_get_message_by_uid): idem.
-	(camel_folder_get_uid_list): idem.
-
-1999-12-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_set_name): 
-	use exception mechanism.
-	(camel_folder_set_name): idem.
-	(camel_folder_set_full_name): idem.
-	(_get_name): idem.
-	(camel_folder_get_name): idem.
-	(_get_full_name): idem.
-	(camel_folder_get_full_name): idem.
-	(_can_hold_folders): idem.
-	(_can_hold_messages): idem.
-	(_exists): idem.
-	(camel_folder_exists): idem.
-	(_is_open): idem.
-	(_get_subfolder): idem.
-	(camel_folder_get_subfolder): idem.
-
-	* camel/camel-exception.c (camel_exception_clear): 
-	New function. Clear an exception.
-	(camel_exception_get_id): 
-	New function. 
-	(camel_exception_get_description): 
-	New function. 
-
-	* camel/camel-folder.c (_set_name): 
-	Use the exception system. When the folder
-	has no parent, don't set its full name 
-	field.
-
-	
-1999-12-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_expunge): 
-	(_expunge): 
-	* camel/camel-folder-pt-proxy.c (_expunge): 
-	changed the return value. Now returns the list 
-	of expunged messages
-
-	* camel/camel-folder.c (_init_with_store): 
-	cleaned up. Use the exception system now.
-	(_open): ditto.
-	(camel_folder_open): ditto.
-	(camel_folder_open_async): ditto.
-	(_close):  ditto.
-	(camel_folder_close):  ditto.
-	(camel_folder_close_async): ditto.
-
-	* camel/camel-exception.c (camel_exception_set): 
-	When no exception is given, do nothing, just
-	return. 
-	(camel_exception_set): documented.
-	(camel_exception_new): idem.
-	(camel_exception_free): idem.
-	(camel_exception_xfer): idem.
-	
-
-	* camel/camel-folder.c:
-	* camel/camel-folder.h: more clean-ups. 
-	Removed message list related code. 
-	This was braindead design. 
-	
-
-	* camel/camel-folder-utils.c (camel_aml_expunge_messages): 
-	implemented. The routines in this file will be
-	called by providers to handle the list of
-	message already standing in memory. 
-
-1999-12-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-utils.c: 
-	* camel/camel-folder-utils.h: 
-	New files, misc utilities for the 
-	folder providers. Includes active message
-	list utilities. 
-
-	
-	* camel/camel-folder.c (_has_message_number_capability): 
-	(camel_folder_has_message_number_capability): 
-	Added this to know if a folder provides 
-	number-based message access.
-
-	* camel/camel-folder.c (_get_message_count): 
-	added warning when called directly.
-	(_append_message): ditto
-	(_open_async):  ditto
-	(_close_async):  ditto
-	(_delete_messages): ditto 
-	(_expunge):  ditto
-	(_get_message_by_number):  ditto
-	(_get_message_uid):  ditto
-	(_get_message_uid_by_number):  ditto
-	(_get_message_by_uid):  ditto
-	(_get_uid_list):  ditto
-
-	
-	* camel/camel-folder-pt-proxy.c (_open_async): 
-	(_open): 
-	(_close_async): 
-	(_close): 
-	(camel_folder_pt_proxy_class_init): 
-	update 
-	(_get_message_by_number): 
-	Update to reflect changes in CamelFolder
-
-	* camel/camel-folder.h: 
-	* camel/camel-folder.c (_get_subfolder): 
-	(camel_folder_get_subfolder): 
-	The CamelFolder::get_folder is renamed to 
-	get_subfolder as it is more intuitive. 
-
-	* camel/camel-folder.c (_get_message_by_number): 
-	(camel_folder_get_message_by_number): 
-	* camel/camel-folder.h 
-	(camel_folder_get_message_by_number): 
-	The get_message method is now named
-	get_message_by_number for consistency
-	with the _by_uid methods.
-
-	* camel/camel-folder.[ch]: 
-	 clean-ups. 
-
-1999-12-13  Nat Friedman  <nat@helixcode.com>
-
-	* ebook/e-book.h: New file.
-	* ebook/e-book.c: New file.
-	* ebook/e-card.h: New file.
-	* ebook/e-card-fields.h: New file.
-	* ebook/e-commerce.h: New file. :-)
-
-1999-12-08  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/test1.c (main): Removed the strdup()s, which are not
-	deeded anymore.
-
-	* camel/camel-mime-message.c (_set_subject): `subject' made const.
-	(camel_mime_message_set_subject): Likewise.
-	(_set_from): `from' made const.
-	(camel_mime_message_set_from): Likewise.
-	(_set_reply_to): Made `reply_to' const.
-	(camel_mime_message_set_reply_to): Likewise.
-	(_set_set_received_date): Made `received_date' const.
-	(camel_mime_message_set_reply_to): Likewise.
-	(_set_field): `value' made const.  Also, strdup the string before
-	assigning.
-
-	* camel/camel-mime-message.h: Virtual methods changed to use const
-	strings when setting header values.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* composer/Makefile.am (EXTRA_DIST): Added `$(glade_DATA)'.
-
-	* camel/Makefile.am (EXTRA_DIST): Added
-	`$(libcamel_extra_sources)'.
-	(libcamelinclude_HEADERS): Added `gmime-base64.h'.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* camel/camel-mime-message.c (_write_to_stream): Removed extra ':'
-	in the `Mime-Version' header.
-
-	* tests/ui-tests/msg-composer-test.c: Removed.
-
-	* Makefile.am (SUBDIRS): Added `composer'.
-
-	* configure.in: Create `composer/Makefile'.
-
-	* camel/camel-simple-data-wrapper-stream.c
-	(camel_simple_data_wrapper_stream_construct): Updated accordingly.
-	(camel_simple_data_wrapper_stream_new): Updated accordingly.
-	* camel/camel-stream-data-wrapper.c
-	(camel_stream_data_wrapper_construct): Updated accordingly.
-
-	* camel/camel-data-wrapper.h: Replaced `IS_CAMEL...()' type check
-	macro name with `CAMEL_IS...()'.
-	* camel/camel-folder-pt-proxy.h: Likewise.
-	* camel/camel-folder-summary.h: Likewise. 
-	* camel/camel-folder.h: Likewise. 
-	* camel/camel-medium.h: Likewise. 
-	* camel/camel-mime-body-part.h: Likewise.
-	* camel/camel-mime-message.h: Likewise. 
-	* camel/camel-mime-part.h: Likewise. 
-	* camel/camel-multipart.h: Likewise. 
-	* camel/camel-service.h: Likewise. 
-	* camel/camel-session.h: Likewise. 
-	* camel/camel-simple-data-wrapper-stream.h: Likewise. 
-	* camel/camel-simple-data-wrapper.h: Likewise.
-	* camel/camel-store.h: Likewise.
-	* camel/camel-stream-buffered-fs.h: Likewise.
-	* camel/camel-stream-data-wrapper.h: Likewise. 
-	* camel/camel-stream-fs.h: Likewise. 
-	* camel/camel-stream-mem.h: Likewise. 
-	* camel/camel-stream.h: Likewise. 
-
-	* tests/test1.c (main): Updated to match the `RECIPIENT_TYPE'
-	changes.
-
-	* camel/camel-mime-message.h: Changed `RECIPIENT_TYPE_TO',
-	`RECIPIENT_TYPE_CC' and `RECIPIENT_TYPE_BCC' into
-	`CAMEL_RECIPIENT_TYPE_TO', `CAMEL_RECIPIENT_TYPE_CC' and
-	`CAMEL_RECIPIENT_TYPE_BCC', respectively.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* camel/camel-mime-message.c (_write_to_stream): Write
-	"Mime-Version: 1.0" to the stream.
-
-	* tests/test1.c: If executed with a file name parameter, attach a
-	file with with that name to the email without loading it into
-	core, thus demonstrating usage of my latest changes.
-
-	* camel/camel-mime-part.c (_set_encoding): Updated to use
-	`CamelMimePartEncodingType'.
-	(camel_mime_part_set_encoding): Likewise.
-	(_get_encoding): Likewise.
-	(camel_mime_part_get_encoding): Likewise.
-	(_write_content_to_stream): Honour the `encoding' member.
-	(_construct_from_stream): Made static.
-	(camel_mime_part_encoding_to_string): New function.
-	(_write_to_stream): Write the encoding string using it.
-	(camel_mime_part_init): Set encoding to
-	`CAMEL_MIME_PART_ENCODING_DEFAULT'.
-	(_finalize): Don't free `encoding' anymore.
-	(camel_mime_part_encoding_from_string): New function.
-	(_parse_header_pair): Use it.
-
-	* camel/camel-mime-part.h: New enum `CamelMimePartEncodingType'.
-	Member `encoding' of `struct _CamelMimePart' changed from `gchar
-	*' to `CamelMimePartEncodingType'.  All the encoding-related
-	methods changed to use this type instead of `gchar *'.
-
-	* camel/gmime-base64.c (gmime_encode_base64): Got it to work.
-
-	* camel/Makefile.am (libcamel_la_SOURCES): Compile
-	`gmime-base64.c'.
-
-	* camel/gmime-base64.h: New, previously missing, header.
-
-	* camel/camel-stream-data-wrapper.c: New file implementing the
-	`CamelStreamDataWrapper' class.
-	* camel/camel-stream-data-wrapper.h: Corresponding header.
-
-	* camel/camel-simple-data-wrapper.c: Implemented the `get_stream'
-	virtual method.
-	(_get_stream): New function implementing the method.
-	(camel_simple_data_wrapper_class_init): Install it in the class
-	struct.
-	(camel_simple_data_wrapper_init): New function initializing the
-	`stream' member to NULL,
-	(camel_simple_data_wrapper_class_init): Set it as the
-	GtkObjectInitFunc.
-
-	* camel/camel-simple-data-wrapper.h: New member `stream' in
-	`struct _CamelSimpleDataWrapper'.
-
-	* camel/camel-simple-data-wrapper-stream.c: New file implementing
-	the `CamelSimpleDataWrapperStream' class.
-	* camel/camel-simple-data-wrapper-stream.h: Corresponding header.
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_get_stream): New
-	function.
-	(_get_stream): New private function, just returning NULL.
-	(camel_data_wrapper_class_init): Install it as the default
-	`get_stream' virtual method.
-
-	* camel/camel-data-wrapper.h: New virtual method `get_stream' in
-	`CamelDataWrapperClass'.
-	(camel_data_wrapper_get_stream): New function prototype.
-
-1999-11-05  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/ui-tests/msg-composer-test.c: New file for testing the
-	`EMsgComposer' widget.
-	* tests/ui-tests/Makefile.am (noinst_PROGRAMS): Compile it.  Do
-	not compile `store_listing' for now because it's currently broken.
-	(INCLUDES): Added the `widgets' source directory to the include
-	path list.
-	(LDADD): Removed the MH dependency; link with
-	`libevolutionwidgets.la' from the `widgets' directory.
-
-	* configure.in: Create `widgets/Makefile'.
-
-	* camel/gmime-rfc2047.c (rfc2047_clean): Removed C++-like comment.
-	* camel/camel-folder.c (camel_folder_get_message_uid_by_number):
-	Likewise.
-	* camel/gmime-content-field.c (gmime_content_field_get_parameter):
-	Likewise.
-	* camel/camel.c (camel_init): Likewise.
-	* camel/camel-provider.c (camel_provider_register): Likewise.
-	* camel/camel-multipart.c (_construct_from_stream): Likewise.
-	* camel/camel-mime-part.c (_write_content_to_stream): Likewise.
-	* camel/camel-medium.c (camel_medium_class_init): Likewise.
-
-	* camel/camel-data-wrapper.h (camel_data_wrapper_get_type): Make
-	prototype non-static.
-
-	* camel/Makefile.am (libcamelinclude_HEADERS): Move
-	`camel-exception-list.def' from `EXTRA_DIST' to
-	`libcamelinclude_HEADERS'.
-
-	* camel/camel.h: Do not #include <config.h>.
-	* camel/data-wrapper-repository.h: Likewise.
-
-1999-11-05  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/Makefile.am (INCLUDES): Add `-I$(top_srcdir)'.
-
-1999-10-13  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_close): the 
-	folder->close method is now asynchronous.
-
-	* camel/camel-folder-pt-proxy.c (_folder_open_cb): 
-	(_open): 
-	(_folder_open_cb): 
-	(_open): 
-	open/close method implemented in the thread proxy
-	folder. More to come.
-
-	* camel/camel-exception.c (camel_exception_xfer): 
-	new utility func.
-
-	* camel/camel-marshal-utils.c: some new marshallers
-
-	* camel/camel-folder-pt-proxy.c: Some explanations
-	on the thread proxy system.
-
-1999-10-11  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-marshal-utils.c: 
-	camel/camel-marshal-utils.h:
-	Handles operation marshalling. 
-	
-	* camel/camel-thread-proxy.c: 
-	camel/camel-thread-proxy.h: 
-	new files. Generic proxy system.
-	  
-	* camel/camel-folder-pt-proxy.c 
-	moved all proxy related code in dedicated files.
-	
-	(camel_folder_pt_proxy_init): 
-	removed proxy initialisation code
-	(_finalize): 
-	removed proxy finalization code
-
-
-	* camel/camel-exception.c 
-	(camel_exception_new): 
-	(camel_exception_set): 
-	(camel_exception_free): 
-	New funcs.
-
-1999-09-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_async_close): 
-	implemented.
-
-	* configure.in:
-	Check pthreads.
-
-	* camel/Makefile.am: 
-	camel-folder-pt-proxy.c is only compiled
-	when pthreads are available.
-	
-	* camel/camel-folder-pt-proxy.c:
-	Signal proxying implemenatation. 
-	(_signal_marshaller_server_side): 
-	(_signal_marshaller_client_side): 
-	(_init_signals_proxy): 
-	Code not is tested and has to be best 
-	explained as it uses threads conditions and
-	gtk signal system.
-	(_thread_notification_catch): notify pending signals
-	as well as thread availability.
-
-1999-09-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): 
-	completed
-
-	Binch of new funcs:
-	(_maybe_run_next_op): 
-	Called by the watch notification when 
-	a threaded op is completed
-	(_thread_notification_catch): 
-	notification watch call back
-	(_init_notify_system): 
-	set up the notification channel
-	(notify_availability): 
-	called by threads before completion.
-
-1999-09-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): 
-	new func. Try to exec an operation in a thread
-	or queue it if a thread is already busy.
-
-	* camel/camel-op-queue.c (camel_op_queue_set_service_availability): 
-	(camel_op_queue_get_service_availability): 
-	new funcs. 
-
-	* camel/camel-op-queue.c (camel_op_new): 
-	(camel_op_free): 
-	new funcs. Uses glib mem chunks.
-	
-
-1999-09-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_init_with_store): 
-	added notify io_channel.
-
-	* camel/camel-op-queue.h: 
-	* camel/camel-op-queue.c: 
-	New object. Operation queue. Meant to be used in 
-	non-blocking proxy objects.
-	(camel_op_queue_run_next_op): new func. 
-	run the next operation.
-
-1999-09-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/Makefile.am (libcamel_la_SOURCES): 
-	added camel-folder-pt-proxy.[ch] to the build
-	process.
-
-	* camel/camel-folder-pt-proxy.c (_init_with_store): 
-	started implementation of the pthread-based 
-	folder proxy.
-	
-
-1999-09-08  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/mh-summary.c 
-	(mh_load_summary): 
-	(mh_save_summary): 
-	(mh_create_summary): 
-	implemented summary (files) for MH folders.
-	
-	* camel/providers/MH/camel-mh-folder.c 
-	(_get_message_by_uid): implemented.
-	(camel_mh_folder_class_init): 
-	(_get_message_uid): implemented
-
-	* camel/camel-folder.c (camel_folder_has_uid_capability): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_uid_by_number): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Documented UID methods.
-	(camel_folder_get_message_uid_by_number): 
-	const'ified uid.
-	(camel_folder_get_message_by_uid): idem
-	removed stupid camel_folder_get_message_uid_by_number
-	method.
-	
-	* tests/ui-tests/store_listing.c (close_all): 
-	close all open folders and stores. (necessary
-	for UID list saving ).
-
-	* camel/providers/MH/mh-uid.c (mh_generate_uid_list): 
-	fix: store UID list in CamelMHFolder object.
-
-	* camel/providers/MH/camel-mh-folder.c (_open): 
-	read or create UID list.
-	(_close): save UID list.
-
-1999-09-07  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/md5-utils.c (md5_get_digest_from_file): 
-	correct parameter decl (const)
-
-	* camel/md5-utils.h: typo.
-
-	* camel/providers/MH/mh-uid.c 
-	More work on UID stuff for MH.
-	(mh_save_uid_list): 
-	(mh_load_uid_list): 
-	(mh_generate_uid_list): 
-	new funcs. Manage on-disk uid list.
-	
-	* camel/providers/MH/mh-utils.c (mh_is_a_message_file): 
-	Util routines live here now.
-
-	* camel/md5-utils.c 
-	Documented all funcs.
-	
-	(md5_get_digest_from_stream): 
-	correct typo.
-	(md5_get_digest_from_file): 
-	same typo corrected.
-	
-
-	* camel/md5-utils.h : 
-	raw routines are declared public now.
-	Md5 use has to be versatile.
-
-	* camel/providers/MH/mh-uid.c (mh_uid_get_for_file): 
-	new func. Returns an UID for an MH message.
-		
-1999-09-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-
-	* camel/md5-utils.h:
-	* camel/md5-utils.c:
-	changed names to follow camel style.
-	(md5_get_digest_from_stream): 
-	new methods.
-	(md5_get_digest_from_file): 
-	new function : get file md5 signature. 
-	To be used in providers code.
-
-	* camel/md5-utils.c: imported md5 coding 
-	routine from rpm. Compiles.
-	
-
-1999-09-05  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_has_uid_capability): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_uid_by_number): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Basic UID framework.
-	
-	* devel-docs/misc/ref_and_id_proposition.txt:
-	New revision. Some fixes.
-
-	* camel/camel-folder.h (struct _CamelFolder): added 
-	uid_capability field.
-	
-
-	* camel/camel-folder.c (camel_folder_close): publicized
-	the close method.
-
-	* tests/ui-tests/store_listing.c (show_folder_messages): 
-	use folder summary instead of opening all messages.
-	(show_folder_messages): re-enabled old CPU/Mem consumming
-	method. Useful for pop3 for instance.
-
-	* camel/providers/MH/camel-mh-folder.c (_create_summary): 
-	basic and highly non-efficient summary implementation.
-	Should be seen as a proof of concept only.
-	subfolder summary still has to be implemented.
-	
-	* camel/providers/maildir/camel-maildir-folder.c (_init_with_store): 
-	hasn't summary for the moment. 
-	* camel/providers/maildir/camel-maildir-folder.c
-	cosmetic changes.
-	
-
-1999-09-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_create_summary):
-	started summary implementation.
-	(_open): correct use of open.
-
-	* camel/camel-folder.c (camel_folder_get_summary): 
-	get folder associated summary object.
-
-	* camel/Makefile.am:
-	added summary files build
-
-	* camel/camel-folder-summary.[ch]: 
-	basic summary framework
-
-1999-09-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/camel/Makefile.am:
-	sgml doc has camel-recipient now.
-
-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): 
-	added in-line documentation.
-
-1999-09-02  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/maildir: Added (experimental) maildir 
-	provider written by Jukka Zitting <hukka@greywolves.org>
-	
-	* camel/providers/Makefile.am (SUBDIRS): build maildir
-	provider.
-
-	* camel/camel-provider.c (camel_provider_get_for_protocol):
-	bug fix. patch from  Jukka Zitting <hukka@greywolves.org>
-
-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): 
-	changed decl to fit CRLFunc. 
-	(_write_recipients_to_stream): 
-	calls camel_recipient_foreach_recipient_type now.
-
-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): 
-	new convinience function. Iterate over all recipient types.
-
-	* camel/gmime-utils.c (gmime_write_header_table_to_stream): 
-	s/write_header_table_to_stream/gmime_write_header_table_to_stream/
-	(gmime_write_header_with_glist_to_stream): 
-	s/write_header_with_glist_to_stream/gmime_write_header_with_glist_to_stream/
-
-1999-09-01  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_finalize): 
-	(_add_recipient): 
-	(_remove_recipient): 
-	(_get_recipients): now use CamelRecipientTable
-	
-	* camel/gmime-content-field.c: 
-	(gmime_content_field_unref): test if object 
-	to free is non void.
-
-	* camel/camel-folder.c (_finalize): 
-	(_set_name): 
-	* camel/camel-mime-part.c (_finalize): 
-	(_set_description): 
-	(_set_disposition): 
-	* camel/camel-service.c (_finalize): 
-	* camel/camel-stream-fs.c (_finalize): 
-	* camel/gmime-content-field.c: 
-	(gmime_content_field_construct_from_string): 
-
-	* camel/url-util.c (g_url_free): 
-
-	When using g_free (obj) don't test if obj != NULL
-	g_free () already do that. Thanks to elerium for
-	the feedback.
-
-1999-08-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-recipient.c (camel_recipient_get): 
-	(camel_recipient_remove): 
-	(camel_recipient_add): 
-	new func. More work on new independant recipient code. 
-
-1999-08-29  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* MAINTAINERS: updated my e-mail address. 
-
-1999-08-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	text parameter declared const
-
-	* camel/camel-mime-part-utils.c (camel_mime_part_store_stream_in_buffer): 
-	actually test correctly nb_bytes_read_chunk is >0
-
-	* camel/gstring-util.c: 
-	* camel/gmime-content-field.c: 
-	* camel/providers/MH/camel-mh-folder.c:
-	* camel/camel-stream-fs.c:
-	include string.h
-
-	* camel/camel-stream-mem.c (_write): return 
-	the numver of written bytes.
-
-	* camel/camel-stream-buffered-fs.c (_eos): 
-	return sthg
-
-	* camel/camel-stream.c (default_camel_seek): 
-	return something.
-
-1999-08-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_get_content_object): 
-	contruct the content from the buffer before calling
-	CamelMedium implementation.
-	(_construct_from_stream): Do not construct the content 
-	by default, just store the content bytes in 
-	a temporary buffer. Content will be constructed only
-	at caller request (when calling CamelMedium::get_content_object)
-	Providers with better access to the messages (mbox/MH ...)
-	will have to provider lighter implementation, that is
-	shall not read content at all unless the caller asks
-	for it (again with get_content).
-
-	* camel/camel-mime-part-utils.c: new file, groups
-	mime-part related utils. Meant to be used by providers
-	subclassing MimeMessage.
-	(camel_mime_part_construct_headers_from_stream): 
-	(camel_mime_part_construct_content_from_stream): 
-	no more useless temporary hash table. 
-
-	* camel/camel-mime-part.c (_construct_from_stream): calls
-	mime-part-utils functions now.
-
-	* camel/gmime-utils.c (_store_header_pair_from_string): 
-	do not use hash table to store header, use an array instead.
-
-1999-08-25  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c: now descend from CamelMedium.
-
-	* tests/test1.c (main): all headers must be strdup'ed
-	(main): unref created objects
-
-	* camel/camel-medium.c (_set_content_object): 
-	(_get_content_object): these methods are 
-	in CamelMedium now.
-
-1999-08-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-medium.c (camel_medium_class_init): 
-	new class. Will handle all sort of information media 
-	(Mime mail messages, Lotus Notes  mail messages, 
-	postit notes, faxes, who knows .... :)
-	CamelMimePart will inherit from it.
-
-	* camel/camel-mime-part.c (_set_disposition): 
-	(_set_description):
-	description and disposition parameters are now const.
-	 
-
-	* camel/gmime-content-field.c (gmime_content_field_free): added
-	assertion code.
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	uses buffered stream.
-
-	* camel/camel-stream-buffered-fs.c:
-	new stream to accelerate file ops.
-
-1999-08-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): 
-	name parameter is const. This fixes a bug in destroy ()
-
-1999-08-18  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.c: more work on encoder.
-
-1999-08-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream.c (camel_stream_read): 
-	return the number of bytes read. 
-	How can this have ever worked ?
-	(camel_stream_flush): don't return anything.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	mem leak fixed.
-
-1999-08-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c:
-	Now has a popup menu on mailbox tree to allow
-	easier tests. Implemented the copy stuff.
-	Works well for the MH provider :)))
-
-	* camel/providers/MH/camel-mh-folder.c (_copy_message_to): 
-	Test MH provider fast copy implemented.
-	
-	
-1999-08-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_expunge): 
-	moved the active list readjustment code here.
-	Much saner, providers won't have to worry about
-	that.
-	(_copy_message_to): new method.
-
-	* camel/providers/MH/camel-mh-folder.c (_expunge): 
-	no more active list readjustment stuff.
-
-	* camel/camel-folder.h: the expunge virtual no more
-	returns a list of expunged messages. Now providers
-	only have to set the expunge flag on the expunged
-	messages.
-
-	* camel/camel-folder.c (camel_folder_get_message): 
-	moved the caching code here. Finally, I don't want
-	providers to crash the libs with a bad message cache
-	implementation. 
-	(_close): do not call the CamelFolder virtual expunge 
-	method directly, use camel_folder_expunge() instead.
-	(camel_folder_expunge): added the want_list param. 
-	The client can decide if it wants the expunged message
-	list or not. If yes, it'll have to unref the messages 
-	itself.
-
-1999-08-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c (delete_selected_messages): 
-	(expunge_selected_folders): 
-	Implemented deletion/expunge mechanism. 
-
-	* camel/camel-folder.c (_get_message): 
-	Added some debug info.
-
-	* camel/providers/MH/camel-mh-folder.c (_expunge): 
-	implemented and tested.
-
-	* camel/camel-mime-message.c (_set_flag): 
-	changed the old braindead implementation.
-	boolean are inserted in the flag hash 
-	table casted as gpointers.
-	
-
-	* camel/camel-mime-message.c: indentation fix
-	
-
-1999-08-13  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_get_message): default implementation
-	to be called first by providers methods. It looks in the
-	folder message list (in memory) to see if the message has
-	not already been retrieved, and in this case, returns 
-	the same CamelMimeMessage object
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): set
-	message->message_number correctly.
-
-	* camel/camel-folder.h (struct _CamelFolder): 
-	New field (message_list) which will hold a 
-	reference on each message obtained by the folder,
-	which is necessary in order for the caching procedure
-	to work (Getting the same message from a folder twice
-	will return the same CamelMimeMessage object).
-	
-	* camel/camel-folder.c (camel_folder_get_message): 
-	When the store retreives a message put it in its
-	message list.
-	(_finalize): free message list.
-
-	* ChangeLog: fix typo (parmanent)
-
-	* camel/camel-folder.c (_get_permanent_flag_list): 
-	(camel_folder_get_permanent_flag_list): 
-	new method, returns the list of permanent
-	flags supported by the folder.
-
-	* camel/camel-mime-message.c (_get_flag_list): 
-	(camel_mime_message_get_flag_list): new method,
-	return the list of flag name used by this message.
-
-	* camel/hash-table-utils.c (g_strcase_equal): 
-	(g_strcase_hash): those two func go here now.
-
-	* camel/hash_table_utils.c (hash_table_generic_free): 
-	free a (gpointer, gpointer) hash table pair.
-
-	* camel/camel-mime-message.c (camel_mime_message_init): use
-	case insensitive hash table functions. 
-	(_set_flag): 
-	(camel_mime_message_set_flag): 
-	(_get_flag): 
-	(camel_mime_message_get_flag): 
-	Use const for flag name, they are now
-	duplicated.
-
-1999-08-12  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c (show_folder_messages): 
-	remove stupid debug code.
-	(add_mail_store): use camel_session_get_store instead
-	of creating MH store directly.
-	(main): load MH provider.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): 
-	register new provider.
-	(camel_provider_get_for_protocol): 
-	Now, implementation is correct.
-
-	* camel/camel-store.c (_finalize): 
-	* camel/camel-store.h (struct _CamelStore): 
-	further disabled url_name field use. 
-	URL will be generated dynamically.
-
-	* camel/camel-session.c (camel_session_get_store_for_protocol): 
-	compilation and runtime fixes.
-
-	* camel/providers/MH/camel-mh-store.c (_init): 
-	synced with CamelStore.
-
-	* camel/camel-store.c (_init): 
-	in CamelStore::init, url_name is now const.
-	disabled url_name copy.
-
-	* camel/camel-session.c (camel_session_get_store): 
-	new function: returns a store for an URL. 
-	(camel_session_get_store_for_protocol): 
-	new functionc: returns a store for a given 
-	store protocol (as IMAP/POP/MH ...)
-	* camel/string-utils.c (g_strcase_equal): 
-	(g_strcase_hash): case insensitive hash table
-	funcs.
-
-	* camel/camel-session.c (camel_session_init): hash table
-	keys are case insensitive.
-
-	* camel/camel-provider.c (camel_provider_get_for_protocol): 
-	new function, returns the last registered 
-	provider for a protocol.
-
-	* camel/providers/MH/camel-mh-provider.c: 
-	new file. MH provider registration stuff.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): 
-	load a provider from a shared object (plugin).
-	(camel_provider_register): register a provider 
-	"by hand". Used for statically defined providers.
-
-	* tests/test7.c: new test.
-	tests providers loading framework.
-
-1999-08-11  
-
-	* camel/camel-service.c (_finalize): 
-	* camel/camel-stream-fs.c (_finalize): 
-	(_destroy): close file descriptor.
-	* camel/camel-stream-mem.c (_finalize): 
-	* camel/camel-store.c (_finalize): 
-	* camel/camel-folder.c (_finalize): 
-	* camel/camel-multipart.c (_finalize): 
-	* camel/camel-simple-data-wrapper.c (_finalize): 
-	* camel/camel-mime-part.c (_finalize): 
-	implemented destructors.
-	
-
-	* camel/gmime-content-field.c (gmime_content_field_ref): 
-	(gmime_content_field_unref): 
-	New reference mechanism for GMimeContentField objects.
-
-	* camel/camel-data-wrapper.c (_finalize): 
-	Started implementing destructors.
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	* camel/gmime-content-field.c (gmime_content_field_write_to_stream): 
-	* camel/camel-multipart.c (_construct_from_stream): 
-	removed forgotten anarchic traces.
-
-1999-08-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c: 
-	* tests/ui-tests/store_listing.glade:
-	Quick and (very) dirty hack to test Camel more
-	easily.
-
-	* camel/camel-folder.c (camel_folder_append_message): 
-	new method.
-
-1999-08-09  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/misc/ref_and_id_proposition.txt:
-	new file. Document message UID and vfolder
-	implementation.
-
-1999-08-08  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.c: more advanced RFC2047 encoder started.
-	
-1999-08-08  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	fix. In MH, message number is not related to 
-	message position in folder.
-
-	* camel/providers/MH/camel-mh-folder.c (_is_a_message_file): 
-	util func.
-	(_get_message_count): implemented.
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/camel/:
-	updated some autogen doc stuff.
-	Still don't understand warnings :(
-
-	* camel/camel-data-wrapper.c: 
-	* camel/providers/MH/camel-mh-store.c: 
-	* camel/url-util.c: 
-	* camel/gmime-content-field.c: 
-	* camel/camel-store.c: 
-	various inline doc corrections.
-
-	* camel/camel-folder.c (get_message_count): 
-	new method. Returns the number of message 
-	in the folder.
-
-
-
-1999-08-06  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* tests/test6.c: encoder test.
-
-	* camel/gmime-rfc2047.c: Fixed decoder bug : sequence
-	?= is not always the terminator for an encoded-string.
-
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	stat was not testing the good file. Fixed.
-	
-	* tests/test4.c (main): added real test for MH folder 
-	provider. All tested things seem to work OK :)
-
-1998-08-06  Robert Brady  <rwb197@ecs.soton.ac.uk>
-	
-	* tests/test5.c: test for RFC2047 decoder.
-
-	* camel/gmime-rfc2047.c: Improved RFC2047 decoder.
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_exists): add debug information
-	(_list_subfolders): test if first char in folder name is not '.'
-	before adding it to the folder list.
-
-	* camel/camel-store.c (_init): 
-	disable session check temporarily
-	(_get_separator): 
-	(_get_folder): new static func. 
-	Fixed several oddities in class definition. 
-
-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_get_type): 
-	parent type is CAMEL_STORE_TYPE not CAMEL_FOLDER_TYPE
-
-	* camel/camel-store.c: 
-	prent class is CamelServiceClass not GtkObjectClass
-
-	* camel/url-util.c : 
-	cosmetic changes + use of const when possible.
-	(find_host):
-	fix a bug: when there is no host and no port don't skip the '/'
-	all static find_* func are now named _func_*  
-	(g_url_free): destructor func.
-	cache field has been disabled. Constructing the url string
-	won't be too slow and will occur rarely enough that we
-	do not need to add complexity to this code. 
-
-	* camel/providers/MH/camel-mh-store.c: 
-	parent class is CamelStorClass not GtkObjectClass
-
-1999-08-05  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test4.c: 
-	test mh provider.
-	
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	implemented
-	
-	* camel/camel-folder.c (_get_message): 
-	new method. 
-	(camel_folder_get_message): 
-	corresponding public call
-	
-	* camel/README.HACKING: 
-	Some notes.
-
-	* camel/CODING.STYLE: 
-	short note about coding style. 
-
-	* camel/README.COPYRIGHT: 
-	Note about copyright policy.
-
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	minor typo fixes.
-
-
-1999-08-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-rfc2047.c: 
-	* camel/gmime-rfc2047.h:
-	indentation and cosmetic changes.
-	
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	implemented.
-	* camel/providers/MH/camel-mh-folder.c (_delete): 
-	finshed implementation
-	(_delete_messages): implemented.
-
-
-1999-08-04  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.[ch]: added an implemention of RFC2047
-	  (support for character sets other than US-ASCII in MIME
-	  headers). Not actually called from anywhere yet.
-
-
-1999-08-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_create): 
-	implemented.
-	(_delete): started implementation.
-
-	* camel/camel-folder.c (_get_folder): default implementation 
-	calls camel_store_get_folder ().
-
-	* camel/providers/MH/camel-mh-folder.c (_init_with_store): 
-	implemented.
-
-	* camel/camel-folder.h (struct _CamelFolder): 
-	remove useless exist_on_store field.
-
-	* camel/camel-folder.c (_exists): 
-	do not use exist_on_store field.
-
-	* camel/camel-folder.c (camel_folder_set_name): 
-	(camel_folder_get_name): 
-	new public functions 
-	(_set_name): set full_path.
-
-	(_set_full_name): 
-	(camel_folder_set_full_name): 
-	commented out this functions def. 
-	It would make things very difficult to handle, and would not 
-	be very useful. 
-	
-	* camel/providers/MH/camel-mh-store.h: 
-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_set_toplevel_dir): 
-	(camel_mh_store_get_toplevel_dir): 
-	* camel/providers/MH/camel-mh-folder.c (_set_name): 
-	* camel/providers/MH/camel-mh-folder.h: 
-	use (gchar *) instead of (GString *) everywhere.
-	use const when necessary.
-	
-	* camel/camel-folder.h (struct _CamelFolder): 
-	removed unused message_list field.
-	
-	* camel/camel-mime-part.c (_set_content_object): 
-	There is a probleme here. We can not allow mime part
-	content-type field and content_object mime-type to be 
-	different. I thus chosed to set mime part object 
-	content field to be freed (if necessary) and set
-	to be a pointer to content_object mime type
-	field. 
-	(_construct_from_stream): set content_object mime type
-	to be the same as mime_part's one. This is necessary
-	because we use _set_content_type. 
-	
-	This two things are a bit hackish ansd may need
-	to be redesigned.
-	
-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): 
-	use g_strdup_printf and remove a bug.
-
-	* camel/camel-simple-data-wrapper.c (_construct_from_stream): 
-	more debugging output +  nb_bytes_read is now a signed int 
-	to avoid bug when eos is encountered.
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	sync to data_wrapper_repository function name changes. 
-	Use default "text/plain" type when conten-type field
-	is not found. (following RFC 2046 spec).
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_set_data_wrapper_type): 
-	(data_wrapper_repository_get_data_wrapper_type): 
-	change function name prefix (s/data_wrapper/data_wrapper_repository/)
-
-	* camel/camel-multipart.c (_read_part): 
-	add `\n` at eol but not before boundary.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	correct implementation of end of stream detection.
-
-1999-08-01  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-multipart.c (_read_part): 
-	use a stream to store the part instead of GString. 
-	
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	set data wrapper content type to "text/plain".
-
-	* camel/camel-stream-mem.c:
-	* camel/camel-stream-mem.h:
-	new memory buffer based stream.
-
-	* camel/camel-stream-fs.c (_seek): 
-	implementation for file system based stream.
-
-	* camel/camel-stream.c (camel_stream_seek): 
-	new method.
-
-	* camel/camel-stream-fs.c (camel_stream_fs_class_init): 
-	pass CamelStreamFsClass instead of CamelStreamClass.
-
-1999-08-01 bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): 
-	corrected a bug with memory not allocated for '\0' in strtmp
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	do not return NULL when line is empty. 
-
-	* camel/camel-multipart.c (_read_part): return true when end
-	of multipart is found, not the opposite
-
-1999-07-31  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	Don't return crlf at end of line.
-
-1999-07-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	new function: reads a line from a stream.
-	should be in streams utils maybe. 
-
-1999-07-29  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	Uses data wrapper repository to find what data wrapper
-	to use to construct the content from a stream. When 
-	no object is registered for the mime type found in
-	content type field a CamelSimpleDataWrapper is 
-	used. 
-	
-	* camel/camel-mime-part.c (_get_content_type): 
-	(camel_mime_part_get_content_type): returns
-	a pointer on the content_type field instead 
-	of the gchar * mime "type/subtype".
-
-1999-07-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-
-	* camel/data-wrapper-repository.c
-	* camel/data-wrapper-repository.h
-	New files. Handles mime type <-> camel object
-	(for example "multipart" <-> CamelMultipart
-	* tests/tesst3.c: test data repository thing.
-
-1999-07-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-multipart.c (_write_to_stream): 
-	implemented output of multipart.
-	
-	* tests/test1.c (main): testing content objects operations. 
-
-1999-07-25  bertrand  <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	new util function to set a mime part content to be 
-	a text string.
-
-	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_set_buffer_from_text): 
-	new util func. 
-	(camel_simple_data_wrapper_new): new func.
-
-	* camel/camel-multipart.c (_write_to_stream): 
-	implemented output of multiparts.
-
-1999-07-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-content-field.c (gmime_content_field_get_parameter): 
-	New function. Returns the value associated to a 
-	mime parameter. 
-
-
-1999-07-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-multipart.h: 
-	* camel/camel-multipart.c:
-	New class. Models multipart mime objects.
-	
-	* camel/camel-mime-body-part.h: 
-	* camel/camel-mime-body-part.c: 
-	New class. Body part is a mime part contained in 
-	a multipart object.
-	
-
-1999-07-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-log.h: 
-	implemented hard log level stuff.
-	* came/*.c use "CAMEL_LOG_*" instead of "CAMEL_LOG (*"
-	in order to allow hard level switch.
-
-	* tests/test1.c: 
-	* tests/test2.c: 
-	updated to use gchar instead of GString. Tests passed.
-
-
-1999-07-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream.c: 
-	* camel/camel-stream.h: 
-	"const"-antified
-	
-
-	* camel/camel-simple-data-wrapper.c: (_construct_from_stream)
-	do not use any limit when constructing the object from a stream
-	
-	* camel/camel-stream-fs.c: 
-	* camel/camel-stream-fs.h: 
-	* camel/camel-mime-message.c: 
-	* camel/camel-mime-message.h: 
-	* camel/camel-session.c: 
-	* camel/camel-session.h: 
-	* camel/camel-service.c: 
-	* camel/camel-service.h:
-	* camel/camel-store.c: 
-	* camel/camel-store.h: 
-	* camel/camel-folder.c: 
-	* camel/camel-folder.h: 
-	* camel/gmime-utils.c: 
-	* camel/gmime-utils.h: 
-	GString -> gchar
-	constantified what had to be.
-	
-	* camel/string-utils.c: 
-	* camel/string-utils.h: 
-	New files. Meant to replace gstring-util for gchar *
-	
-1999-07-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): 
-	GString -> gchar
-	use const to indicate copied parameter.
-
-1999-07-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-simple-data-wrapper.c: 
-	* camel/camel-simple-data-wrapper.h: 
-	Gstring -> gchar
-	
-1999-07-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/url-util.c:  
-	* camel/url-util.h: 
-	Do not use GStrings any more. 
-	Added assertion code. 
-	Cosmetic reformating
-	
-	* AUTHORS:
-	* ChangeLog:
-	Changed my email address.
-
-	
-1999-07-13  Miguel de Icaza  <miguel@gnu.org>
-
-	* camel/gmime-base64.c (gmime_encode_base64): Implemented base64
-	encoder based on CamelStreams.  Should the encoder/decoder be a
-	Stream itself?
-
-	* camel/gmime-utils.c: include config.h here.
-	* camel/url-util.c: ditto.
-	* camel/gstring-util.c: ditto.
-	* camel/gmime-content-field.c: ditto.
-	* camel/camel-stream.c: ditto.
-	* camel/camel-stream-fs.c: ditto.
-	* camel/camel-store.c: ditto.
-	* camel/camel-simple-data-wrapper.c: ditto.
-	* camel/camel-session.c: ditto.
-	* camel/camel-service.c: ditto.
-	* camel/camel-mime-part.c: ditto.
-	* camel/camel-mime-message.c: ditto.
-	* camel/camel-log.c: ditto.
-	* camel/camel-data-wrapper.c: ditto
-	* camel/camel-folder.c: ditto.
-
-	* camel/camel-stream.c (camel_stream_write): Moved api
-	documentation to the places that they document.
-	(camel_stream_class_init): Virtual classes do not need to have a
-	default implementation.  So null them all.
-	(camel_stream_write): Return value from write.
-	(camel_stream_available): implement.
-	(camel_stream_write_strings): documented.
-
-	* devel-docs/query/virtual-folder-in-depth.sgml: Small
-	reformatting
-
-1999-06-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): now use 
-	CamelDataWrapper::contruct_form_stream to test 
-	message parsing
-
-	* camel/camel-data-wrapper.c: 
-	* camel/camel-data-wrapper.h: 
-	construct_from_stream no longer has maximimum size arg.
-
-	* camel/camel-mime-part.c (_construct_from_stream): new.
-	Construct the mime_part from a stream.
-
-	* camel/camel-mime-part.c:
-	new field (content_type) and associated methods.
-	(camel_mime_part_init): initialize content_type field.
-	(_parse_header_pair): now set content_type MimePart field
-	instead of using DataWrapper Mime typing facility.
-
-1999-06-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.h: 
-	s/content_type/mime_type/
-
-1999-06-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-simple-data-wrapper.[ch]:
-	new class. Simple implementation of a data wrapper:
-	simply keeps the stream result in a byte array.
-
-	* camel/camel-mime-part.c (_parse_header_pair): added a warning. 
-	Have to think about the correct way to store content type stuff.
-
-1999-06-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): 
-	includes gmime-utils header. 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	set separator string in write_header_with_glist_to_stream()
-	
-	* camel/camel-log.c (camel_log): 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	Do not use stderr in initialization of logfile descriptor.
-	
-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	initialize mode field in open(). 
-
-1999-06-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.c (_get_content_type): 
-	moved all the content-type stuff here.
-	(camel_data_wrapper_init): initialize the instance
-	content-type field.
-
-	* camel/camel-mime-part.c (_parse_header_pair): 
-	parse Content-Type stuff in header. 
-	(_write_to_stream): write the content type stuff to 
-	the stream.
-
-	* camel/gmime-content-field.c (gmime_content_field_get_mime_type): 
-	new function, returns "type/subtype" mime type string.
-	(gmime_content_field_construct_from_string): 
-	new function, construbt a content_field object
-	form a string. be used to set the mime_type from a
-	string.
-
-	* camel/camel-mime-part.c (_set_content_type): 
-	(camel_mime_part_set_content_type): 
-	(_get_content_type): 
-	(_get_content_type): 
-	new methods.
-
-1999-06-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	replace CR/LF+'\t' with ' ' 
-
-	* camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	trim \t when splitting
-
-	* camel/gmime-utils.c (get_header_table_from_file): 
-	corrected bug in scanning tabulations ('t' -> '\t')
-
-	* tests/test2.c (main): read mail.test instead
-	of mail1.test
-
-	* camel/camel-mime-part.c (_add_header): 
-	added comments 
-
-1999-06-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/query/virtual-folder-in-depth.sgml: 
-	sgmlized Giao's doc about virtual folders.
-
-1999-05-31  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): 
-	use new stream code instead of raw file * stuff.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	new func. Will replace get_header_table_from_file and will
-	be used to parse headers from files as well as from 
-	memory buffers.
-
-	* camel/camel-stream-fs.c:
-	CamelStream Subclass. File system based
-	stream.
-	
-
-1999-05-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
- 	* camel/camel-stream.h: new class. Represents an 
-	abstract stream object.
-
-       * camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	remove leading and trailing spaces in recipient addresses.
-
-	* camel/gmime-utils.c (_store_header_pair_from_gstring): 
-	remove leading and trailing spaces from header values.
-
-	* camel/gstring-util.c (g_string_trim): new
-	func: remove leading or trailng chars from 
-	a specified char set.
-	(g_string_split): allow trimming of substrings.
-
-	* tests/test1.c (main): remove gtk_main call
-
-1999-05-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c 
-	(_parse_header_pair): 
-	(_init_header_name_table): 
-	More header parsing code.
-
-	
-1999-05-27  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): rewrite message obtained via
-	parsing into a file. Actually, it works pretty well :))
-
-	* camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	create recipient list form a comma separated string.
-	(_parse_header_pair): added recipient lists parsing.
-
-	* camel/camel-mime-part.c (_parse_header_pair): 
-	new (protected) method. Parse a head pair and
-	decides what to do with it.
-	
-	(_add_header): Call in _parse_header_pair
-
-	* camel/camel-mime-message.c (_parse_header_pair): 
-	overload  header parsing MimePart mthod.
-
-	* camel/gstring-util.c (g_string_split): 
-	new func: split a gstring into a GList of
-	substring.
-
-1999-05-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_lines_from_file): 
-	new func. Parses message header zone and returns
-	a Glist of all header lines.
-
-	* tests/test2.c: tests message parsing
-
-	* camel/gmime-utils.c (write_header_table_to_file): 
-	new func to write a table of headers.
-
-1999-05-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_write_to_file): 
-	recipient list printing
-	
-	* tests/test1.c (main): more tests.
-
-1999-05-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_write_to_file): test if content
-	exists before calling its write_to method.
-
-	* camel/camel-mime-message.c (_write_to_file): bugs fix.
-
-	* camel/camel-mime-message.c (camel_mime_message_new_with_session): 
-	new func. Creates a message with the session field set
-	up correctly.
-
-1999-05-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test1.c (main): tests
-
-	* camel/camel-mime-message.c (_write_to_file): 
-	started write_to framework for mime_messages
-
-	* camel/camel-mime-message.c (*_message_number): 
-	message number funcs.
-	
-1999-05-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (*_flag): 
-	flags handling methods
-
-1999-05-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (camel_mime_message_class_init): 
-	added recipient handling class funcs.
-
-1999-05-13  bertrand  <Bertrand.Guiheneuf@aful.org>
-        
-	* camel/camel-mime-message.c (camel_mime_message_init): 
-	create recipients hash table
-	(_remove_recipient): 
-	(_add_recipient):
-	(_get_recipients):  new funcs.
-	Internal Recipients data structure is
-	a bit complicated though.
-
-	* camel/camel-mime-part.c (camel_mime_part_init): 
-	create headers hash table
-
-	* camel/camel-mime-message.h: 
-	a bunch of get/set header field
-	method done. Does nothing yet though.
-
-	* camel/camel-mime-message.[ch] :
-	new file. 
-
-1999-05-12  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.h (struct ): 
-	disposition is now a full GMimeContentField
-	object.
-
-	* camel/gmime-content-field.c: new file
-	handle "type/subtype ;parameter=value ; parameter=value ..."
-	BNF grammar elements
-	(gmime_content_field_write_to_file): new func
-	
-	* camel/gmime-utils.c (gmime_write_header_pair_to_file): 
-	namespace change
-
-1999-05-11  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_write_to_file): 
-	overload wrapper class method.
-	(_write_to_file): start to write some text in 
-	file.
-
-	* camel/camel-store.c: typo fix.
-
-	* camel/camel-store.c: 
-	* camel/camel-service.c: 
-	* camel/camel-folder.c: 
-	* camel/camel-data-wrapper.c: 
-	* camel/camel-mime-part.c: 
-	static functions naming follows gnome 
-	coding style guide.
-
-	* camel/camel-mime-part.h: implemented public interfaces
-	
-
-1999-05-10  Bertrand Guiheneuf  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (__camel_mime_part_get_header_lines): 
-	(__camel_mime_part_set_header_lines): 
-	(__camel_mime_part_get_content_languages): 
-	(__camel_mime_part_set_content_languages): 
-	(__camel_mime_part_get_encoding): 
-	(__camel_mime_part_set_encoding): 
-	(__camel_mime_part_get_content_MD5): 
-	(__camel_mime_part_set_content_MD5): 
-	(__camel_mime_part_get_content_id): 
-	(__camel_mime_part_set_content_id): 
-	A bunch of new set/get func.
-
-	* camel/gstring-util.c (g_string_list_free): 
-	convenience function for string list 
-	complete deallocation.
-
-1999-05-09  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (__camel_mime_part_add_header): 
-	new method
-
-	* camel/camel-mime-part.h (struct CamelMimePart):
-	added core fields.
-
-1999-05-08  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.[ch]: 
-	new class. models a mime mail part.
-
-	* camel/camel-data-wrapper.c 
-	(camel_data_wrapper_write_to_buffer): method to
-	stream data content in a buffer.
-	(camel_data_wrapper_write_to_file): 
-	(camel_data_wrapper_construct_from_buffer): 
-	(camel_data_wrapper_construct_from_file): 
-	new methods.
-	
-1999-05-07  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.[ch]:new class.
-	This should not be a class but rather an 
-	interface. The day Gtk support interfaces, 
-	it dataWrapper should become an interface.
-
-1999-05-04  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-service.c (camel_service_get_url): 
-	new method.
-
-	* devel-docs/camel/camel-sections.txt: added 
-	function doc references
-
-	* camel/camel-folder.c (__camel_folder_close): 
-	fixed indentation.
-	(camel_folder_expunge): new method.
-	(__camel_folder_close): used expunge flag
-
-1999-05-03  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_get_mode): 
-	typo fix
-
-	* camel/camel-folder.c (__camel_folder_list_subfolders): 
-	new func.
-
-	* some doc stuffs
-	
-
-1999-05-01  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c 
-	(__camel_folder_get_mode): 
-	(camel_folder_get_mode): 
-	(camel_folder_get_parent_store): 
-	(__camel_folder_get_parent_store): 
-	(camel_folder_get_parent_folder): 
-	(__camel_folder_get_parent_folder): 
-	new methods
-
-	* camel/camel-service.c: put __ prefix before
-	private virtual funcs.
-
-	* camel/camel-folder.c (camel_folder_delete): 
-	(camel_folder_delete_messages): 
-	new methods.
-
-	* camel/url-util.c (g_url_new): some
-	more comments 
-
-1999-04-27  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_create): 
-	new public function.
-
-1999-04-25  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-session.c (camel_session_get_store_from_provider): 
-	initialize folder object.
-
-	* camel/camel-store.c (init): new method.
-	called by session object at instantiation time.
-
-	* camel/camel-store.h (struct _CamelStore): 
-	new fields : session and url_name
-
-1999-04-25  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-session.c (camel_session_set_provider): 
-	new method to set the default provider for a protocol.
-	(camel_session_get_store_from_provider): 
-	new method to instantiate a folder from a provider.
-
-	* camel/camel-provider.h: s/GString/gchar/g
-	+ typo fix.
-
-	* camel/camel-provider.[ch]:
-	basic provider structure. Have to write the
-	code for dynamic loading.
-
-1999-04-24  bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/url-util.[ch]: s/new_g_url/g_url_new
-
-	* camel/url-util.c (new_g_url): URL 
-	rewritten completely. Error handling not
-	implemented in public functions.
-	But URL scan works pretty well :)))
-
-1999-04-24 bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/url-util.[ch]: I needed the url 
-	functions to use GString, and I wanted a more
-	general scheme so I finally started rewriting 
-	the whole thing from scratch.
-	No more code from gzilla :(
-	
-1999-04-23  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/url-util.[ch]:
-	Utility functions to parse URLs.
-	Stolen shamelessly from gzilla (www.gzilla.com)
-	written by Raph Levien <raph@acm.org>
-	
-	* camel/Makefile.am: added url-util.[ch]
-	compilation.
-
-	* Makefile.am (SUBDIRS): removed devel-docs
-	until I come up with a correct Makefile.am
-
-	* camel/camel-store.h: 
-	* camel/camel-folder.h:
-	correct declarations of structs
-
-
-1999-04-22  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-store.c:
-	more test implementation.
-
-	* camel/camel-store.c (camel_store_get_type): typo fix
-	
-
-1999-04-21  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (camel_mh_folder_get_type): 
-	start test provider.
-
-1999-04-20  bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-store.h: now CamelStore inherits from
-	CamelService.
-
-	* camel/camel-service.c (camel_service_class_init): 
-	basic abstract service class.
-
-1999-04-19  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/README: added some (few) explanations.
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-store.[ch]: started implementation
-	* camel/camel-folder.c (camel_folder_get_type): typo
-	uncommented the store related code.
-	(camel_folder_create): enable som store relted code. 
-	Not finished. Have to define public methods first.
-
-	* camel/camel-log.h: some explanation about the 
-	log system
-
-1999-04-18   bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c: 
-	(camel_folder_create): implemented (partially)
-	have to write CamelStore before finishing it.
-
-	* camel/camel-folder.h (CamelFolder): added full_name field
-	(CamelFolderClass): added set/get_full_name methods
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c: some work
-	* camel/camel-log.c: log system for camel
-	* camel/gstring-util.c: some utilities for GString objects
-	
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* autogen.sh (PKG_NAME): groomf -> gnome-mailer
-
diff --git a/Makefile.am b/Makefile.am
index bf1adb0a25..7d55435953 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,5 @@
 ACLOCAL_AMFLAGS=-I m4
 
-changelogs =				\
-	ChangeLog			\
-	ChangeLog.pre-1-4
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = 				\
 	evolution-calendar.pc			\
@@ -13,7 +9,6 @@ pkgconfig_DATA = 				\
 
 EXTRA_DIST = 			\
 	AUTHORS			\
-	$(changelogs)		\
 	COPYING-DOCS		\
 	COPYING.LGPL2		\
 	COPYING.LGPL3		\
@@ -42,6 +37,11 @@ if WITH_HELP
 HELP_SUBDIR=help
 endif
 
+# For maintainers only.
+if GLADE_CATALOG
+MAINT_SUBDIR=maint
+endif
+
 SUBDIRS = 			\
 	m4			\
 	data			\
@@ -61,6 +61,7 @@ SUBDIRS = 			\
 	art			\
 	plugins			\
 	modules			\
+	$(MAINT_SUBDIR)		\
 	doc			\
 	ui			\
 	views			\
@@ -104,4 +105,20 @@ DISTCHECK_CONFIGURE_FLAGS =		\
 	--enable-test-component		\
 	--with-help
 
+# Generate a ChangeLog file from 'git log'
+dist-hook:
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		echo Creating ChangeLog && \
+		( cd "$(top_srcdir)" && \
+		  echo '# Generated by Makefile. Do not edit.'; echo; \
+		  $(top_srcdir)/missing --run git log --stat \
+		  EVOLUTION_2_30_0..) > ChangeLog.tmp \
+		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+		|| ( rm -f ChangeLog.tmp ; \
+		     echo Failed to generate ChangeLog >&2 ); \
+	else \
+		echo A git clone is required to generate a ChangeLog >&2; \
+	fi
+
 -include $(top_srcdir)/git.mk
diff --git a/NEWS b/NEWS
index f011bfbf63..077362e208 100644
--- a/NEWS
+++ b/NEWS
@@ -1,194 +1,270 @@
-Evolution 2.30.1 2010-04-26
+Evolution 2.31.2 2010-05-24
 ---------------------------
 
 Bug Fixes:
-
-	#374533 - Read window stays open after last email is deleted
+	#220672 - Excessive autosaving uses lots of resources (Milan Crha)
+	#240317 - Allow searching in subscribe dialog (Milan Crha)
+	#304415 - Allow change of signature hash algorithm (Milan Crha)
+	#499320 - Preview before import from command line (Milan Crha)
+	#523775 - Order of Email Addresses in UI is broken (Milan Crha)
+	#531013 - Proxy login window is not in focus. (Vibha Yadav)
+	#531912 - Mail inline parser doesn't always work (Milan Crha)
+	#545462 - Printing of contacts is weird. (Vibha Yadav)
+	#546551 - Dialog for mark-all-read always mentions subfolders
+	          (Milan Crha)
+	#593890 - New folder window is not in focus in filter dialog
 	          (Milan Crha)
-	#488979 - Disable Edit for card views in contacts (Milan Crha)
-	#569945 - Recurrence icon not removed after changing to single event
+	#594153 - Allow setting alarms on any meeting (Jim Ramsay)
+	#598833 - Do not ship dropped evo_mail_notifier.png (Yves-Alexis Perez)
+	#603006 - Move All Contacts To enabled for read-only address books
 	          (Milan Crha)
-	#589393 - Configure fails to detect pilot-link utf8 capabilities
-	          (Dominique Leuenberger)
-	#592117 - Calendar compressed weekend print improvement (pepp)
-	#600861 - Backup utility should use --quit instead of --force-shutdown
+	#604971 - Evolution allows deletion of default views (Milan Crha)
+	#607257 - Add checks for event->comp_data != NULL (Milan Crha)
+	#608855 - Can't drag and drop multiple attachments (Matthew Barnes)
+	#611560 - 'Mark as junk' should be disabled in junk folder (Milan Crha)
+	#615291 - Preview pane's attachment bar accepts drop (Matthew Barnes)
+	#615745 - New task pop up in calendar day view doesn't work
 	          (Matthew Barnes)
-	#608203 - Left pane of mailer window is really narrow at startup
+	#616640 - Don't display attachment size if it's unknown (Matthew Barnes)
+	#616823 - Evolution allows moving IMAP Inbox to other folders
 	          (Milan Crha)
-	#610229 - Status bar progress goes beyond 100 percentage (punit)
-	#611646 - Calendar shows recurring birthdays incorrectly (Milan Crha)
-	#612236 - Find-As-You-Type in Folder list stops working (Milan Crha)
-	#612821 - Uses freed memory when changing task's source (Milan Crha)
-	#612916 - Runtime error on console when opening a message window
+	#616889 - Force 24h format for locales not supporting 12h format
+	          (Gert Michael Kulyk)
+	#617041 - Set translation domain for e-mail-reader actions (Gert Kulyk)
+	#617496 - Critical warnings when open a task (Milan Crha)
+	#617557 - Quits without asking user to save unfinished messages
 	          (Milan Crha)
-	#613261 - application/mbox not shown properly (Milan Crha)
-	#613352 - Changed time range not propagated to calendar (Milan Crha)
-	#613354 - Folder->Mark all messages as read does not work (Milan Crha)
-	#613356 - Calendar doesn't save Task/Memo table state (Milan Crha)
-	#613564 - If no <> in the email address, addr should be the full
-	          email address. (Jeff Cai)
-	#614325 - Shrink/expand To,Cc header images is missing (Milan Crha)
-	#614644 - Email window's title is blank when subject is blank
-	          (Matthew Barnes)
-	#614647 - Don't reset names and colors of default mail labels
-	          (Matt McCutchen)
-	#614813 - Crash during e-mail migration (Jürg Billeter)
-	#614889 - Memory leaks in EMailSidebar (Paolo Borelli)
-	#614892 - String leak in the composer (Paolo Borelli)
-	#614918 - GnomeGoal: Correct Desktop Files (Javier Jardón)
-	#614926 - Memos and Tasks accelerators switched since 2.28
-	          (Matt McCutchen 2)
-	#615331 - Message list/Folder tree focus policy has changed (Milan Crha)
-	#616097 - Remembers page ranges (Matthew Barnes)
-
+	#617865 - Various data file cleanups (Matthew Barnes)
+	#618113 - Missing icon in alarm dialog (Matthew Barnes)
+	#618177 - Mobile Phone of imported contact not shown in preview
+	          (Milan Crha)
+	#618400 - "Mark All Messages as Read" shortcut missing (Matthew Barnes)
+	#618578 - Require automake >= 1.10 (Matthew Barnes)
+	#618902 - Crash when viewing/closing messages quickly (Matthew Barnes)
+	#619010 - Mailer's crash avoidance features are broken (Matthew Barnes)
 
 Other Changes:
-
-	* Fix build settings under capplet. (Matthew Barnes)
-	* Fix build break due to GTK+ deprecations. (Matthew Barnes)
-	* Fix a potential crasher in e_contact_quick_add_email().
-	  (Matthew Barnes)
-	* Initialize dbus threading to avoid loosing alarms (Michael Meeks)
-	* Work around another dropped gnome-icon-theme icon. (Matthew Barnes)
-	* Fix migration event hook for google-account-setup and
-	  calendar-weather plugins (Philip Withnall)
-	* Fix disappearing e-table headers by realising the (horrible)
-	  pet widget we are going to steal the gc from, so it actually
-	  has it. (Michael Meeks)
-	* Add more stock icons dropped from gnome-icon-theme. (Matthew Barnes)
-	* Revise legacy stock icon contexts. (Matthew Barnes)
-	* Use newer GTK+ API to manage print settings. (Matthew Barnes)
-	* Install stock icons in "hicolor" instead of "gnome". (Matthew Barnes)
-	* Remove duplicate use_system_timezone pref, set default to true
-	  (Sandy Armstrong)
-	* Add missing linker flag to NetworkManager extension. (Matthew Barnes)
-	* Remove gtk_notebook_set_tab_label_packing(). (Matthew Barnes)
-	* Introduce a simple extension system for objects. (Matthew Barnes)
-	* Make EShell extensible. (Matthew Barnes)
-	* Convert NetworkManager integration to an EShell extension.
-	  (Matthew Barnes)
-	* Do not hide junk mail when vJunk folder not supported by store
-	  (Milan Crha)
-	* Build libevolution-mail-settings as dll on windows (Fridrich Å trba)
-	* Relocating EVOLUTION_BINDIR which will be used in plugin setting
-	  Evolution comme defaut mail application on windows. (Fridrich Å trba)
-	* Don't bundle 256x256 icon since it does not work anyway
+	* Convert "default-mailer" plugin to an extension. (Matthew Barnes)
+	* Initial implementation of setting evolution as default mail client
+	  and mailto handler. (Fridrich Å trba)
+	* Require GtkHtml 3.31.2 for new API in bug #220672. (Matthew Barnes)
+	* Improve attachment bar selection behavior. (Matthew Barnes)
+	* Create the source groups required to ensure local adresssbooks and
+	  calendars are created (Chenthill Palanisamy)
+	* Consider full name and also the first part of e-mail address for
+	  contact description in the import dialogue. (Fridrich Å trba)
+	* On Windows, some LDIF files can have .ldi extension (Fridrich Å trba)
+	* [win32] Set patch to evolution's bindir because some child
+	  processes need it in some situations. (Fridrich Å trba)
+	* [win32] Don't call glib functions before g_thread_init was called
+	  and register evolution as capable to handle mailto: protocol on
+	  startup (Fridrich Å trba)
+	* [win32] Make Evolution actually appear in "Set Program Access and
+	  Defaults" dialogue and use quoted string instead of short path,
+	  since this is how the "Hotmail" e-mail provider is doing it
+	  (unlike what documentation says) (Fridrich Å trba)
+	* [win32] Implement --reinstall, --show-icons, --hide-icons options
+	  to be used by windows default application setting dialogue
 	  (Fridrich Å trba)
-	* Give the windows version of evolution-alarm-notify a nice win32 icon
+	* [win32] Try to get the default application registration right
 	  (Fridrich Å trba)
-	* Adding the stock_people icon needed and absent in gnome-icon-theme
+	* [win32] Register evolution as "Contacts" application and .vcf
+	  handler (Fridrich Å trba)
+	* [win32] Register evolution as able to handle ldif files too
 	  (Fridrich Å trba)
-	* [win32] Be consistent in disabling the lockdown options.
-	  (Fridrich Strba)
-	* Avoid warning about redefined localtime_r (Fridrich Å trba)
-	* [win32] Implement network status detection (Fridrich Strba)
 
 Translations:
-
-	Jordi Serratosa (ca)
-	Carles Ferrando (ca@valencia)
-	Christian Kirbach (de)
-	Nikos Bakaoukas (el)
-	Jorge González (es)
-	Shankar Prasad (kn)
-	Daniel Nylander (sv)
-	Theppitak Karoonboonyanan (th)
-	Maxim V. Dziumanenko (uk)
-	Funda Wang (zh_CN)
-
-Evolution 2.30.0 2010-03-29
----------------------------
-
-What is new ?
-Diligent UI re-architecture to give farewell to bonobo.
-More GNOME 3.0 cleanup tasks. Gets rid of LibGnome, LibGnomeUi, LibArtLgpl, LibGLade.
-Improved imap implementation with live view updates, non-blocking operations and IDLE support, imapx.
-Evolution-mapi with push mail support and reduced memory footprint.
-Contacts map experimental plugin.
+[be8a061] Updated Galician translations (Fran Diéguez)
+[3a9faf9] Updated Shavian translation (Thomas Thurman)
+[491100b] Updated Spanish translation (Jorge González)
+[c5fa894] Updated Spanish translation (Jorge González)
+[ce37e4c] Estonian translation updated (Ivar Smolin)
+[85ebbc3] Updated Shavian translation (Thomas Thurman)
+[fd151ac] Updated Shavian translation (Thomas Thurman)
+[801c425] Updated Shavian transliteration (Thomas Thurman)
+[933e668] Updated Galician translations (Fran Diéguez)
+[073d7e1] Updated Norwegian bokmål translation (Kjartan Maraas)
+[2f57daa] Updated Oriya Translation (Manoj Kumar Giri)
+[a516af7] Updated Oriya Translation (Manoj Kumar Giri)
+[aa3e354] Updated Oriya Translation (Manoj Kumar Giri)
+[8254cec] [help] Updated German help translation screenshots (Christian Kirbach)
+[e1bae28] Updated Spanish translation (Jorge González)
+[518c616] Estonian translation updated (Mattias Põldaru)
+[27eb820] Added be to LINGUAS (Ihar Hrachyshka)
+[1d4c54e] Updated Galician translations (Fran Diéguez)
+
+Evolution 2.31.1 2010-05-03
+----------------------------
 
 Bug Fixes:
-	#610023 - Does not restore "Current View" on startup (Matthew Barnes)
-	#611727 - Date navigator marks dates for inactive calendars
-		  (Matthew Barnes)
-	#612374 - Build failure due to recent GTK+ deprecations (Matthew Barnes)
-	#612679 - Crash when saving to a directory without permission 
-	          (Matthew Barnes)
-	#612619 - Don't mark message as read after folder change (Matthew Barnes)
-	#612792 - Crash when trying to delete WebDav addressbook (Matthew Barnes)
-	#612916 - e_lookup_action() called too early during initialization
-		  (Matthew Barnes)	
-
-Other Changes:
-	Remove unused variables in evolution-shell.pc. (Matthew Barnes)
-	tag-calendar.c cleanups. (Matthew Barnes)
-	ECalendar header cleanup. (Matthew Barnes)
-	Clean up GalView and related classes. (Matthew Barnes)
-	Prevent "message selected" timeouts from piling up. (Matthew Barnes)
-	Add a private struct to EMailReader. (Matthew Barnes)
-	Shell and UI manager cleanups. (Matthew Barnes)
-	Fix runtime warnings when opening calendar for the first time (Milan Crha)
-	Clean up data/Makefile.am (Ross Burton)
-	Don't poke around a GdkWindowObject directly but use gdk_window_get_parent
-	(Ross Burton)
-	Add missing includes so that -Werror builds don't fail (Ross Burton)
-	Fix missing linker flags in the correct Makefile.am. (Matthew Barnes)
-	Add generic 'express mode' conditionals to the UI XML (Michael Meeks)
-	Add 'express mode' gconf setting (Michael Meeks)
-	Clean up the 'express' mode hooks for UI Managers (Michael Meeks)
-	Restructure capplet stuffs and load only on express mode.
-	(Srinivasa Ragavan)
-	Integrate into new account button. (Srinivasa Ragavan)
-	Integrate account assistant wizard to anjal style. (Srinivasa Ragavan)
-	Integrate anjal's account capplet lib in start up wizard.
-	(Srinivasa Ragavan)
-	Fix POTFILEs to include capplet. (Srinivasa Ragavan)
-	Libify settings capplet. (Srinivasa Ragavan)
-	In express mode, give the accounts first place than on this computer.
-	(Srinivasa Ragavan)
-	Start the mailer's folder sidebar with a reasonable width
-	(Federico Mena Quintero)
-	Update win32 directory relocation and some consistency cleanup
-        (Fridrich Strba)
-	Use proper URIs in markup and be consistent in directory names 
-	(Fridrich Strba)
-	Disabling Gnome schemas for windows (Fridrich Strba)
+	Bug #614346 - Use cached table row height rather than recalculate (Michel Dänzer)
+	Bug #545505 - Properly free unused message infos periodically (Milan Crha)
+	Bug #609052 - Crash printing contacts in List View (Bharath Acharya)
+	Bug #569523 - be.po (Ihar Hrachyshka)
+	Bug #609052 - Proper warning should be shown. (Punit Jain)
+	Bug #614900 - Description field in calendar list view. (Punit Jain)
+	Bug #604430 - Calendar view not remembered (Milan Crha)
+	Bug #610495 - Plugins should define e_plugin_lib_enable (Roy Marples)
+	Bug #615384 - Use contact's free/busy URL only when not empty (Holger Mickler)
+	Bug #603418 - Custom headers not displayed in message preview (Milan Crha)
+	Bug #613392 - No copyright/licensing information for geo-utils (Cedric Bosdonnat)
+	Bug #360461 - Avoid markup in translatable messages (Milan Crha)
+	Bug #583742 — Port to external libgdata (Philip Withnall)
+	Bug #494047 - Unescape uris in composer's Post-To (Milan Crha)
+	Bug #615331 - Message list/Folder tree focus policy has changed (Milan Crha)
+	Bug #616097 - Remembers page ranges (Matthew Barnes)
+	Bug #592986 - Preferences window shows some buttons on icons (Matthew Barnes)
+	Bug #610428 - Duplicate mnemonic in itip formatted message (Matthew Barnes)
+	Bug #614041 - Filter's relative date combos aren't set (Matthew Barnes)
+	Bug #615814 - Missing mnemonic in import dialog (Matthew Barnes)
+	Bug #613867 - Minor typo in Evolution documentation (Marios Zindilis)
+	Bug #600861 - Backup utility should use --quit instead of --force-shutdown (Matthew Barnes)
+	Bug #569516 - Updated Indonesian translation to fix bug #569516 (Andika Triwidada)
+	Bug #608766 - Replace pthread with GLib's GThread (Milan Crha)
+	Bug #608203 - Left pane of mailer window is really narrow at startup (Milan Crha)
+	Bug #610229 - Status bar progress goes beyond 100 percentage (punit)
+	Bug #615263 - SIGSEGV on Evolution close in e-tree.c:1990 (Milan Crha)
+	Bug #611646 - Calendar shows recurring birthdays incorrectly (Milan Crha)
+	Bug #589393 - Configure fails to detect pilot-link utf8 capabilities (Dominique Leuenberger)
+	Bug #614325 - Shrink/expand To,Cc header images is missing (Milan Crha)
+	Bug #612236 - Find-As-You-Type in Folder list stops working (Milan Crha)
+	Bug 614644 - Email window's title is blank when subject is blank (Matthew Barnes)
+	Bug #614647 - Don't reset names and colors of default mail labels (Matt McCutchen)
+	Bug #614813 - Crash during e-mail migration (Jürg Billeter)
+	Bug #614889 - Memory leaks in EMailSidebar (Paolo Borelli)
+	Bug #614892 - String leak in the composer (Paolo Borelli)
+	Bug #614918 - GnomeGoal: Correct Desktop Files (Javier Jardón)
+	Bug #614926 - Memos and Tasks accelerators switched since 2.28 (Matt McCutchen 2)
+	Bug #591939 - Use ngettext in e-datetime-format.c (Milan Crha)
+	Bug #574755 - Add translator comments (Milan Crha)
+	Bug #567304 - Add translator comment and remove few strings (Milan Crha)
+	Bug #571714 - Remove obsolete strings (Milan Crha)
+	Bug #567304 - Review strings for translation (Milan Crha)
+	Bug #549971 - "Report Junk Failed", "Check Junk Failed" strings (Milan Crha)
+	Bug #547368 - Messages with unclear meaning (add translator comments) (Milan Crha)
+	Bug #458828 - What is the "Top Posting Option"? (Milan Crha)
+	Bug #458510 - Cannot translate "_Backup Settings..." (Milan Crha)
+	Bug #458499 - 'epoch' in evolution-mail.schemas.in (Milan Crha)
+	Bug #417412 - Improve "display text part of limited size" DoS strings (Milan Crha)
+	Bug #347330 - Mark forgotten strings for translation (Milan Crha)
+	Bug #333039 - Merge some i18n strings (Milan Crha)
+	Bug #329694 - "Visual" needs translator comments (Milan Crha)
+	Bug #325616 - Remove whitespace, add translator comments (Milan Crha)
+	Bug #325609 - Add translator comment for "%s = %s" (Milan Crha)
+	Bug #592117 - Calendar compressed weekend print improvement (pepp)
+	Bug #325121 - Do not translate developer strings in g_param_spec_* (Milan Crha)
+	Bug #302742 - The mail error messages is difficult to understand/translate (Milan Crha)
+	Bug #272567 - Evolution message needs ngettext support (Milan Crha)
+	Bug #261979 - Untranslatable string due to sentence splitting (Ushveen Kaur)
+	Bug #261062 - Do not translate untranslatable texts (Milan Crha)
+	Bug #605745 - Use a few more named constants (Paul Bolle)
+	Bug #613352 - Changed time range not propagated to calendar (Milan Crha)
+	Bug #613356 - Calendar doesn't save Task/Memo table state (Milan Crha)
+	Bug #613354 - Folder->Mark all messages as read does not work (Milan Crha)
+	Bug #613261 - application/mbox not shown properly (Milan Crha)
+	Bug #612916 - Runtime error on console when opening a message window (Milan Crha)
+	Bug #612821 - Uses freed memory when changing task's source (Milan Crha)
+	Bug #602801 - Duplicate mnemonic (Viswanath S)
+	Bug #569945 - Recurrence icon not removed after changing to single event (Milan Crha)
+	Bug #488979 - Disable Edit for card views in contacts (Milan Crha)
+	Bug #374533 - Read window stays open after last email is deleted (Milan Crha)
+	Bug #614049 - Attachment bar causes drawing issues in RTL locales (Matthew Barnes)
+
+Miscellaneous Fixes:
+	Adapt to Camel API changes. (Matthew Barnes)
+	[i18n] Strings not aligned in ui. (bgo #616181) (Mario Carrion)
+	One more fix of the icon installation (Fridrich Å trba)
+	Fix a typo on Makefile.am that prevents installation of a big chunk of the stock icons (Fridrich Å trba)
+	Use default headers when none stored to display in mailer (Milan Crha)
+	Fix linking of face plugin (Fridrich Å trba)
+	Camel is now GObject-based. (Matthew Barnes)
+	Initialize dbus threading to avoid loosing alarms (Michael Meeks)
+	Relocating EVOLUTION_BINDIR which will be used in plugin setting Evolution comme defaut mail application on windows. (Fridrich Å trba)
+	Remove 3 leftover references to non-existing libraries (Fridrich Å trba)
+	Work around another dropped gnome-icon-theme icon. (Matthew Barnes)
+	Fix migration event hook for google-account-setup and calendar-weather plugins (Philip Withnall)
+	fix disappearing e-table headers by realising the (horrible) pet widget we are going to steal the gc from, so it actually has it. (Michael Meeks)
+	Adapt to Camel API changes. (Matthew Barnes)
+	Fix compiler warnings. (Matthew Barnes)
+	Don't bundle 256x256 icon since it does not work anyway (Fridrich Å trba)
+	Give the windows version of evolution-alarm-notify a nice win32 icon (Fridrich Å trba)
+	Adding the stock_people icon needed and absent in gnome-icon-theme (Fridrich Å trba)
+	Add more stock icons dropped from gnome-icon-theme. (Matthew Barnes)
+	Revise legacy stock icon contexts. (Matthew Barnes)
+	Adapt to libedataserverui API changes. (Matthew Barnes)
+	Use newer GTK+ API to manage print settings. (Matthew Barnes)
+	Miscellaneous string fixes (Philip Withnall)
+	Fix usage of "backup" in translatable strings (Philip Withnall)
+	Open and save smime-ui.ui in Glade 3. (Matthew Barnes)
+	Install stock icons in "hicolor" instead of "gnome". (Matthew Barnes)
+	Remove comments that have no point after pthreads dependency disappeared (Fridrich Å trba)
+	Remove duplicate use_system_timezone pref, set default to true (Sandy Armstrong)
+	[win32] Fix a build breakage by adding a proper define for gmtime_r instead of the broken one that used to be pulled by including pthread.h (Fridrich Å trba)
+	Use accessor functions instead direct access (GSEAL work) (Javier Jardón)
+	Adapt to Camel API changes. (Matthew Barnes)
+	Forgot to commit some bits. (Matthew Barnes)
+	Giant leap towards GSEAL compliance. (Matthew Barnes)
+	Replace ESpinner with GtkSpinner. (Matthew Barnes)
+	Remove gtk_notebook_set_tab_label_packing(). (Matthew Barnes)
+	hook out X symbols via g_module to avoid direct X linkage. (Michael Meeks)
+	Do not hide junk mail when vJunk folder not supported by store (Milan Crha)
+	Fix distcheck errors. (Matthew Barnes)
+	Drop the "hula-account-setup" plugin. (Matthew Barnes)
+	Revert "[win32] #undef some conflicting defines" (Fridrich Å trba)
+	[win32] #undef some conflicting defines (Fridrich Å trba)
+	Adapt to Camel API changes. (Matthew Barnes)
+	Generate ChangeLog files for tarball releases. (Matthew Barnes)
+	Remove dead Bonobo-era source files. (Matthew Barnes)
+	Only #include Camel's top-level header. (Matthew Barnes)
+	Miscellaneous cleanup bits from WebKit branch. (Matthew Barnes)
+	Workaround broken build due to direct X function calls (Milan Crha)
+	Add meego detection logic, it needs to be used (next pass) to configure the shell, to name widgets differently, and re-order some menu/toolbar bits. (Michael Meeks)
+	Enable the alarm daemon on MeeGo. (Michael Meeks)
+	camel/camel-i18n.h gone, adapt to it properly (Milan Crha)
+	Stop relying on CamelObject meta-data. (Matthew Barnes)
+	Add gtk-doc tests, but leave them disabled. (Matthew Barnes)
+	Add --name-space to MKDB_OPTIONS. (Matthew Barnes)
+	Move EPoolv back to Evolution from libedataserver. (Matthew Barnes)
+	Post-release version bump. (Matthew Barnes)
+	[win32] Test for eventsys.h and sensevts.h properly (Fridrich Å trba)
+	Fix build settings under capplet. (Matthew Barnes)
+	Disable the status bar for all but the mail view. Not implemented prettily, but cf. mail_shell_backend_window_created_cb getting invoked even for addressbok windows ... (Michael Meeks)
+	If no <> in the email address, the address should be the full email address. Fix for #613564 (caiqm)
+	Build libevolution-mail-settings as dll on windows (Fridrich Å trba)
+	Express: Composer always defaults to HTML mode (Matthew Barnes)
+	Hide searchbar in calendar view in express mode. (Srinivasa Ragavan)
+	Drop support for migrating from Evolution < 2.0. (Matthew Barnes)
+	Reformat code so that it looks ok (Fridrich Å trba)
+	[win32] Don't brew your own macro if glib has one suitable available (Fridrich Å trba)
+	[win32] Windows SENS module cannot be built with C++ compiler (Fridrich Å trba)
+	[win32] Some buildability tweaks for Windows SENS module (Fridrich Å trba)
+	Last scroll-pane, and manual sizing tweak (Michael Meeks)
+	Get the new contact sizing right despite the scrolled regions. Add Claire's calendar popup feedback wrt. express mode (Michael Meeks)
+	Scrolled window for personal bits ... (Michael Meeks)
+	Add a scrolled area to cope if we want to expand mail settigns (Michael Meeks)
+	Add conditionally enabled expanders for 'Other' address and 'Misc' personal items, to fit on a 600 pixel high screen. (Michael Meeks)
+	Fix mismatched quotes. (Matthew Barnes)
 
 Translations:
-	Matej Urban�i� (sl)
-	Åsmund Skjæveland (nn)
-	Priit Laes (et)
-	Alexander Shopov (bg)
-	Inaki Larranaga Murgoitio (eu)
-	David Planella (ca)
-	Changwoo Ryu (ko)
-	Fran Diéguez (gl)
-	Kenneth Nielsen (da)
-	Daniel Nylander (sv)
+	vasudeven (ta)
+	Mattias Põldaru (et)
+	Rodrigo Flores (pt)
+	Christian Kirbach (de)
+	Shankar Prasad (kn)
+	Valencian translation  (ca)
+	Francisco Diéguez (gl)
 	Jorge González (es)
-	Nils-Christoph Fiedler (nds)
-	Duarte Loreto (pt)
-	Leonid Kanter (ru)
-	Bruce Cowan (en_GB)
-	Luca Ferrett (it)
-	Djavan Fagundes (pt_BR)
-	Rodrigo Flores (pt_BR)
-	Claude Paroz (fr)
+	Fran Diéguez (gl)
+	Nikos Bakaoukas (el)
+	Philip Withnall (en_GB)
 	Bruno Brouard (fr)
-	Chao-Hsiung Liao (zh_HK)
-	A S Alam (pa)
-	Žygimantas Beru�ka (lt)
-	Adi Roiban (ro)
-	Игор �е�торовић (sr)
-	Kostas Papadimas (el)
-	Μά�ιος Ζηντίλης (el)
-	Nikos Bakaoukas (el)	
-	Christian Kirbach (de)
-	Jamil Ahmed (bn)
+	Theppitak Karoonboonyanan (th)
+	Petr Kovar (cs)
+	Mario Blättermann (de)
+	Kjartan Maraas (nn)
 	Maxim V. Dziumanenko (uk)
-	Gabor Kelemen (hu)
-	Kjartan Maraas (nb)
-	Jiri Eischmann (cs)
-	Lucas Lommer (cs)
+	Jordi Serratosa (ca)
+	Peteris Krisjanis (lv)
 
 Evolution 2.29.92 2010-03-08
 ----------------------------
diff --git a/a11y/ChangeLog b/a11y/ChangeLog
deleted file mode 100644
index 973238ce86..0000000000
--- a/a11y/ChangeLog
+++ /dev/null
@@ -1,860 +0,0 @@
-2008-03-08  Matthew Barnes <mbarnes@redhat.com>
-
-	* e-table/gal-a11y-e-cell-tree.c (ectr_model_row_changed_cb):
-	Silence a debug message.
-
-2008-11-19  Li Yuan <li.yuan@sun.com>
-
-	** Fix for bug #560329
-
-	* calendar/ea-cal-view.c (idle_dates_changed): Fix the signature of 
-	the "children-changed" signal emission. 
-
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-table/gal-a11y-e-cell-tree.c:
-
-2008-09-19  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* addressbook/ea-addressbook-view.c:
-	* addressbook/ea-minicard-view.c:
-
-2008-09-16  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-table/gal-a11y-e-cell-text.c:
-
-2008-09-04  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* calendar/ea-day-view.c:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* addressbook/ea-addressbook-view.h:
-	* addressbook/ea-addressbook.c:
-	* addressbook/ea-addressbook.h:
-	* addressbook/ea-minicard-view.h:
-	* addressbook/ea-minicard.c:
-	* addressbook/ea-minicard.h:
-	* calendar/ea-cal-view-event.c:
-	* calendar/ea-cal-view-event.h:
-	* calendar/ea-cal-view.c:
-	* calendar/ea-calendar.c:
-	* calendar/ea-day-view.h:
-	* calendar/ea-gnome-calendar.h:
-	* calendar/ea-week-view-cell.h:
-	* calendar/ea-week-view-main-item.c:
-	* calendar/ea-week-view.c:
-	* e-table/gal-a11y-e-cell-popup.c:
-	* e-table/gal-a11y-e-cell-registry.c:
-	* e-table/gal-a11y-e-cell-registry.h:
-	* e-table/gal-a11y-e-cell-text.h:
-	* e-table/gal-a11y-e-cell-toggle.c:
-	* e-table/gal-a11y-e-cell-toggle.h:
-	* e-table/gal-a11y-e-cell-tree.h:
-	* e-table/gal-a11y-e-cell.c:
-	* e-table/gal-a11y-e-cell.h:
-	* e-table/gal-a11y-e-table-click-to-add-factory.c:
-	* e-table/gal-a11y-e-table-click-to-add-factory.h:
-	* e-table/gal-a11y-e-table-click-to-add.c:
-	* e-table/gal-a11y-e-table-click-to-add.h:
-	* e-table/gal-a11y-e-table-item-factory.c:
-	* e-table/gal-a11y-e-table-item-factory.h:
-	* e-table/gal-a11y-e-table-item.c:
-	* e-table/gal-a11y-e-table.c:
-	* e-table/gal-a11y-e-tree-factory.c:
-	* e-table/gal-a11y-e-tree-factory.h:
-	* e-table/gal-a11y-e-tree.c:
-	* e-table/gal-a11y-e-tree.h:
-	* e-text/gal-a11y-e-text-factory.c:
-	* e-text/gal-a11y-e-text-factory.h:
-	* e-text/gal-a11y-e-text.c:
-	* ea-cell-table.c:
-	* ea-cell-table.h:
-	* gal-a11y-factory.h:
-	* widgets/ea-calendar-cell.h:
-	* widgets/ea-calendar-item.c:
-	* widgets/ea-calendar-item.h:
-	* widgets/ea-widgets.c:
-
-2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #534762
-
-	* addressbook/ea-addressbook-view.c: (ea_ab_view_get_name),
-	(ea_ab_view_get_description):
-	* addressbook/ea-minicard-view.c:
-	(ea_minicard_view_get_description): Change "addressbook" to
-	"address book" in translatable strings.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* calendar/ea-cal-view.h:
-	* calendar/ea-calendar-helpers.c:
-	* calendar/ea-calendar-helpers.h:
-	* calendar/ea-calendar.h:
-	* calendar/ea-day-view-cell.c:
-	* calendar/ea-day-view-cell.h:
-	* calendar/ea-day-view-main-item.c:
-	* calendar/ea-day-view-main-item.h:
-	* calendar/ea-gnome-calendar.c:
-	* calendar/ea-jump-button.c:
-	* calendar/ea-jump-button.h:
-	* calendar/ea-week-view-cell.c:
-	* calendar/ea-week-view-main-item.h:
-	* calendar/ea-week-view.h:
-	* e-table/gal-a11y-e-cell-popup.h:
-	* e-table/gal-a11y-e-cell-vbox.c:
-	* e-table/gal-a11y-e-cell-vbox.h:
-	* e-table/gal-a11y-e-table-column-header.c:
-	* e-table/gal-a11y-e-table-column-header.h:
-	* e-table/gal-a11y-e-table-factory.c:
-	* e-table/gal-a11y-e-table-factory.h:
-	* e-table/gal-a11y-e-table-item.h:
-	* e-table/gal-a11y-e-table.h:
-	* e-text/gal-a11y-e-text.h:
-	* ea-factory.h:
-	* gal-a11y-util.c:
-	* gal-a11y-util.h:
-	* widgets/ea-calendar-cell.c:
-	* widgets/ea-combo-button.c:
-	* widgets/ea-combo-button.h:
-	* widgets/ea-expander.c:
-	* widgets/ea-expander.h:
-	* widgets/ea-widgets.h:
-
-2008-01-24  Tor Lillqvist  <tml@novell.com>
-
-	* widgets/Makefile.am (libevolution_widgets_a11y_la_LIBADD): Link
-	with libeutil.la for e_get_weekday_name().
-
-2007-12-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #392747
-
-	* widgets/ea-calendar-item.c (ea_calendar_item_get_column_label):
-	Get the column label via e_get_weekday_name().
-
-2007-10-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* addressbook/ea-addressbook.c:
-	* calendar/ea-cal-view.c: (action_interface_get_keybinding):
-	* calendar/ea-calendar.c:
-	* calendar/ea-week-view-main-item.c:
-	(selection_interface_clear_selection):
-	* e-table/gal-a11y-e-cell-tree.c: (ectr_subcell_weak_ref),
-	(gal_a11y_e_cell_tree_get_type):
-
-	- Fix warnings from sparse.
-
-2007-09-10  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #471791 
-	
-	* addressbook/ea-minicard-view.c: (ea_minicard_view_get_name),
-	(atk_action_interface_do_action): Move away from g_assert to critical
-	warnings.
-	* calendar/ea-cal-view-event.c:
-	(ea_cal_view_event_get_index_in_parent):
-	* calendar/ea-calendar-helpers.c:
-	(ea_calendar_helpers_get_cal_view_event_from):
-	* calendar/ea-gnome-calendar.c:
-	(ea_gnome_calendar_get_label_description):
-
-2007-09-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #473903
-
-	* e-table/gal-a11y-e-cell-tree.c: (kill_view_cb):
-	Fixes serious compiler warning.
-
-2007-07-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am:
-	Rename EXTRA_GNOME_LIBS to GNOME_PLATFORM_LIBS.
-
-	* e-text/Makefile.am:
-	* e-table/Makefile.am:
-	Rename EXTRA_GNOME_CFLAGS to GNOME_PLATFORM_CFLAGS.
-
-2007-07-26  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* e-table/gal-a11y-e-cell-tree.c: (ectr_subcell_weak_ref):
-	The return value of g_list_remove() should be received because the
-	function returns the new start of the list.
-
-2007-07-19  Li Yuan  <liyuan@tackle>
-
-	* calendar/ea-day-view-main-item.c:
-	(ea_day_view_main_item_get_name):
-	Bug #459413. Just return NULL if parent has gone.
-
-2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #429422
-
-	* e-text/gal-a11y-e-text.c (et_get_extents), (et_get_full_text),
-	(et_set_full_text), (et_get_caret_offset):
-	Use g_object_get() instead of gtk_object_get().
-
-	* e-text/gal-a11y-e-text.c (et_paste_text):
-	Use g_object_set() instead of gtk_object_set().
-
-2007-03-30  Wang Xin  <jedy.wang@sun.com>
-
-	* widgets/ea-calendar-item.c: Fixes #415985 and #416028.
-
-2007-03-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-table/gal-a11y-e-cell-text.c:
-	* e-table/gal-a11y-e-cell-vbox.c:
-	Don't mix declarations and code (#405495).
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/i18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2007-03-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-table/gal-a11y-e-cell-tree.c: (kill_view_cb),
-	(ectr_subcell_weak_ref), (gal_a11y_e_cell_tree_new):
-	Workaround for crash in bug #330728. Patch from
-	Caolan McNamara.
-
-2007-01-24  Wang Xin  <jedy.wang@sun.com>
-
-	* e-text/gal-a11y-e-text.c: Fixes #400121.
-
-2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes #351332
-
-	* calendar/ea-gnome-calendar.c:
-	Fix implicit function declarations.
-
-2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes #353472
-
-	* widgets/ea-calendar-cell.c: (ea_calendar_cell_finalize)
-	* calendar/ea-week-view-cell.c: (ea_week_view_cell_finalize)
-	* calendar/ea-day-view-cell.c: (ea_day_view_cell_finalize)
-	* calendar/ea-cal-view-event.c: (ea_cal_view_finalize)
-	* e-table/gal-a11y-e-cell-registry.c:
-	(gal_a11y_e_call_registry_finalize)
-	Chain up to parent's finalize() method.
-
-2006-08-17  Li Yuan <li.yuan@sun.com>
-
-	Patch submitted by Pavel Roskin <proski@gnu.org>
-
-	* widgets/ea-expander.h:
-	Fix warning about ignored token after #endif.
-
-2006-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* calendar/ea-cal-view-event.c: (ea_cal_view_event_get_name):
-	Don't leak summary_string here.
-
-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
-
-	* calendar/ea-cal-view-event.c: (ea_cal_view_event_get_type),
-	(ea_cal_view_event_class_init), (ea_cal_view_event_init),
-	(ea_cal_view_event_dispose),
-	(ea_cal_view_event_get_index_in_parent),
-	(ea_cal_view_event_ref_state_set):
-	add necessary AtkStateSet to EaCalViewEvent.
-	* calendar/ea-cal-view-event.h:
-	add necessary AtkStateSet to EaCalViewEvent.
-	* calendar/ea-calendar.c: (e_cal_view_a11y_init):
-	replace e_cal_view_get_type with e_calendar_view_get_type
-	* calendar/ea-day-view.c: (ea_day_view_get_type):
-	replace e_cal_view_get_type with e_calendar_view_get_type
-	* calendar/ea-week-view.c:
-	* calendar/ea-week-view.h:
-	change the base class of EaWeekView from GtkAccessible to EaCalView
-
-2006-04-28  Boby Wang <boby.wang@sun.com>
-
-	Fix for # 333725
-
-	* 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> 
-
-	*  e-table/gal-a11y-e-cell-text.c: (ect_check)
-	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.
-
-	* calendar/ea-day-view.c: (ea_day_view_get_name): check the visibility of gcal
-	before trying to get label.
-	* calendar/ea-week-view.c: (ea_week_view_get_name): ditto.
-
-2006-01-27  Kjartan Maraas  <kmaraas@gnome.org>
-
-	reviewed by: Harish Krishnaswamy <kharish@novell.com> 
-
-	* addressbook/ea-addressbook.c: Remove extra semi-colons.
-	* calendar/ea-cal-view.c: (ea_cal_view_event_changed_cb),
-	(ea_cal_view_event_added_cb), (action_interface_get_keybinding):
-	Remove unused code and variables.
-	* calendar/ea-day-view-main-item.c:
-	(table_interface_get_row_description): More removal of unused bits
-	* calendar/ea-week-view-main-item.c:
-	(ea_week_view_main_item_get_row_at_index),
-	(ea_week_view_main_item_get_column_at_index),
-	(ea_week_view_main_item_get_row_label),
-	(table_interface_get_n_columns),
-	(table_interface_get_column_description): Same again.
-	* e-table/gal-a11y-e-table-item.c: (gal_a11y_e_table_item_new):
-	And again.
-	* e-table/gal-a11y-e-table.c: (et_ref_child): Remove unused var.
-	* e-table/gal-a11y-e-tree.c: (gal_a11y_e_tree_new): Again.
-	* e-text/gal-a11y-e-text.c: (et_set_selection),
-	(et_real_initialize): Same here too.
-	* widgets/ea-calendar-item.c:
-	(table_interface_get_column_description),
-	(table_interface_get_row_description),
-	(selection_interface_is_child_selected),
-	(ea_calendar_item_get_cell_data): And here too.
-	* widgets/ea-widgets.c: More redundant semi-colons.
-
-2006-01-10  Simon Zheng  <simon.zheng@sun.com>
-
-	* widgets/ea-calendar-item.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.
-
-2005-12-17  Tor Lillqvist  <tml@novell.com>
-
-	* e-table/gal-a11y-e-cell.c
-	(gal_a11y_e_cell_remove_action_by_name): Use g_ascii_strcasecmp()
-	instead of g_strcasecmp() for well-definedness.
-
-2005-09-27  Harry Lu <harry.lu@sun.com>
-
-	Fix for #316351
-
-	* e-table/gal-a11y-e-cell.c: (idle_do_action),
-	(gal_a11y_e_cell_action_do_action): add a ref/unref pair to make
-	sure the pointer is valid.
-
-2005-08-15  Li Yuan  <li.yuan@sun.com>
-
-	* e-table/gal-a11y-e-table-item.c: (eti_a11y_reset_focus_object):
-	Fixes #313514.
-	For the code change in gnopernicus, we should use 
-	atk_focus_tracker_notify here.
-
-2005-07-18  Li Yuan  <li.yuan@sun.com>
-
-	Fixes #310136 #310138.
-	* e-table/gal-a11y-e-table-item.c: (eti_get_index_at),
-	(eti_get_row_at_index), (eti_get_n_rows), (eti_rows_inserted),
-	(eti_rows_deleted), (eti_header_structure_changed):
-	The first items of e-table are column-header. So we should add
-	number of columns when change (row, col) to index, or subtract
-	when change index to (row, col).
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am
-	* addressbook/Makefile.am
-	* calendar/Makefile.am
-	* widgets/Makefile.am: Use the fake "bootstrap" libraries on Win32
-	to get around circular dependencies. Use NO_UNDEFINED. Use
-	privsolib_LTLIBRARIES instead of privlib_LTLIBRARIES (see
-	../ChangeLog).
-
-	* Makefile.am: No need to pass -I pointing to this directory
-	itself, all inclusions of headers from here are with
-	doublequotes. Link with libeutil. No need to link with REGEX_LIBS.
-
-	* addressbook/Makefile.am
-	* calendar/Makefile.am
-	* widgets/Makefile.am: Prune out superfluous -I options and -D
-	options for EVOLUTION_* pathname macros that aren't used in the
-	source files in that directory.
-
-	* addressbook/Makefile.am: Drop A11Y_CFLAGS, its a subset of
-	EVOLUTION_ADDRESSBOOK_CFLAGS anyway. Link with
-	EVOLUTION_ADDRESSBOOK_LIBS.
-
-	* addressbook/ea-addressbook.c: Include headers from the same
-	directory as such.
-
-	* calendar/Makefile.am: Drop A11Y_CFLAGS, its a subset of
-	EVOLUTION_CALENDAR_CFLAGS anyway. Link with
-	EVOLUTION_CALENDAR_LIBS.
-
-	* e-table/Makefile.am (INCLUDES)
-	* e-text/Makefile.am (INCLUDES): Remove stray trailing slash from
-	-I path, confuses gcc on Win32. Drop the undefined
-	GNOME_BONOBO_CFLAGS and GNOME_INCLUDEDIR. Drop GNOME_FULL_CFLAGS,
-	it's a subset of EXTRA_GNOME_CFLAGS.
-
-	* widgets/Makefile.am: E_WIDGETS_CFLAGS is enough. No need for
-	EVOLUTION_CALENDAR_CFLAGS. Link with E_WIDGET_LIBS. Drop
-	A11Y_CFLAGS, subset of E_WIDGET_CFLAGS.
-
-2005-04-22  Li Yuan  <li.yuan@sun.com>
-
-	* calendar/ea-day-view-main-item.c:
-	(ea_day_view_main_item_destory_cell_data):
-	* calendar/ea-week-view-main-item.c:
-	(ea_week_view_main_item_destory_cell_data):
-	change the order of the code to avoid a crash.
-
-	Fixes #301885
-
-2005-04-06  Yu Mengjie  <meng-jie.yu@sun.com>
-
-	* addressbook/ea-minicard-view.c: (ea_minicard_view_get_name),
-	(ea_minicard_view_ref_state_set):
-	return proper atk_object name and atk_stateset to avoid crash.
-	
-	* addressbook/ea-minicard.c: (ea_minicard_get_name),
-	(ea_minicard_ref_state_set):
-	return proper atk_object name and atk_stateset to avoid crash.
-
-	Fixes #74404
-
-2005-02-23  Li Yuan  <li.yuan@sun.com>
-
-	Fix for 72897 and 72797.
-	* ea-cell-table.c: 
-	(ea_cell_table_destroy): no need to output the information.
-	* widgets/ea-calendar-cell.c: 
-	(ea_calendar_cell_get_type): add instance init function.
-	(ea_calendar_cell_class_init): add ref_state_set function.
-	(ea_calendar_cell_init): instance init function.
-	(ea_calendar_cell_new): change the cell's role to ATK_ROLE_TABLE_CELL.
-	(ea_calendar_cell_ref_state_set): the ref_state_set function.
-	(atk_component_interface_init),
-	(component_interface_get_extents),
-	(component_interface_grab_focus): implement grab focus function.
-	* widgets/ea-calendar-cell.h:
-	add the state_set variable.
-	* widgets/ea-calendar-item.c: 
-	(ea_calendar_item_new): change the item's role to ATK_ROLE_CALENDAR.
-	no need to connect "selection_preview_changed" signal here.
-	(date_range_changed_cb): call ea_calendar_set_focus_object.
-	(ea_calendar_set_focus_object): make the "gail-focus-object" of the item
-	point to the focused cell.
-
-2005-02-21  Harry Lu <harry.lu@sun.com>
-
-	Fix for 72781
-
-	* addressbook/ea-minicard-view.c: (ea_minicard_view_new):
-	set the role to panel.
-	* addressbook/ea-minicard.c: (ea_minicard_new): ditto.
-
-2005-02-02  Harry Lu <harry.lu@sun.com>
-
-	Fix for 72088.
-
-	* calendar/ea-calendar.c: (gnome_calendar_a11y_init): force
-	loading some types so that we can use them.
-
-2005-02-01  Harry Lu <harry.lu@sun.com>
-
-	Fix for 71924, 71926, 71932 
-	Don't split sentences that need translation.
-	Also remove two useless variables.
-
-	* calendar/ea-cal-view-event.c: (ea_cal_view_event_get_name):
-	* calendar/ea-day-view.c: (ea_day_view_get_name):
-	* calendar/ea-week-view.c: (ea_week_view_get_name),
-	(ea_week_view_get_n_children):
-	* widgets/ea-calendar-item.c: (ea_calendar_item_get_name),
-	(e_calendar_item_get_offset_for_date):
-
-2005-01-31  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #71929
-	
-	* calendar/ea-day-view.c (ea_day_view_get_name):
-	* calendar/ea-week-view.c (ea_week_view_get_name): don't use spaces
-	before colons.
-
-2005-01-28  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* addressbook/ea-minicard-view.c 
-	(ea_minicard_view_get_name) : fix a typo present
-	in the string too
-
-2005-01-28  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* addressbook/ea-minicard-view.c 
-	(ea_minicard_view_get_name) : use ngetext
-	instead of splitting the the sentence to take care
-	of different messages for plural vs singular case 
-	Fixes #61060
- 
-2005-01-15  JP Rosevear  <jpr@novell.com>
-
-	* calendar/ea-calendar-helpers.c
-	(ea_calendar_helpers_get_cal_view_from): use E_CALENDAR_VIEW, not
-	E_CAL_VIEW
-
-	Fixes #71306
-	
-	* calendar/Makefile.am: no need for any idl in this directory, it
-	was not used anywhere
-
-2005-01-04  Harry Lu  <harry.lu@sun.com>
-
-	* widgets/Makefile.am: add ea-combo-button.[ch] to Makefile.
-	* widgets/ea-combo-button.c:
-	* widgets/ea-combo-button.h: implement a11y object for e-combo-button.
-	* widgets/ea-widgets.c: (e_combo_button_a11y_init): set a11y factory.
-	* widgets/ea-widgets.h: add declaration.
-
-2004-12-09  Harry Lu  <harry.lu@sun.com>
-
-	Fix a warning.
-
-	* addressbook/ea-addressbook.c: (ea_addressbook_focus_watcher):
-	use object instead of ATK_OBJECT (minicard).
-
-2004-12-1   Hao Sheng <hao.sheng@sun.com>
-
-	* a11y/addressbook/ea-minicard.c:
-	(atk_action_interface_do_action): Change e_minicard_activiate_editor to
-	e_minicard_activate_editor.
-
-2004-11-08  Steven Zhang <steven.zhang@sun.com>
-
-	Implement accessible feature for e-minicard and e-mini-card-view.
-	Add get_n_children, ref_child, ref_state_set, atk_selection_interface,
-	and action_interface for ea-minicard-view and ea-minicard
-
-	*ea-minicard-view.c:
-	(ea_minicard_view_get_n_children),
-	(ea_minicard_view_ref_child),
-	(ea_minicard_view_ref_state_set),
-	(atk_selection_interface_init),
-	(selection_interface_add_selection),
-	(selection_interface_clear_selection),
-	(selection_interface_ref_selection),
-	(selection_interface_get_selection_count),
-	(selection_interface_is_child_selected),
-	(atk_action_interface_init),
-	(atk_action_interface_do_action),
-	(atk_action_interface_get_n_action),
-	(atk_action_interface_get_description),
-	(atk_action_interface_get_name).
-
-	*ea-minicard.c:
-	(ea_minicard_get_n_children),
-	(ea_minicard_ref_child),
-	(ea_minicard_ref_state_set),
-	(atk_action_interface_init),
-	(atk_action_interface_do_action),
-	(atk_action_interface_get_n_action),
-	(atk_action_interface_get_description),
-	(atk_action_interface_get_name).
-
-2004-11-01  Li Yuan  <li.yuan@sun.com>
-
-	* calendar/ea-day-view.c: (ea_day_view_get_name):
-	use ngettext for n_events.
-	* calendar/ea-week-view.c: (ea_week_view_get_name):
-	ditto.
-
-2004-10-26  Li Yuan  <li.yuan@sun.com>
-
-	* calendar/ea-day-view.c: (ea_day_view_get_name):
-	* calendar/ea-gnome-calendar.c:
-	(ea_gnome_calendar_get_label_description),
-	(ea_gcal_dates_change_cb):
-	* calendar/ea-gnome-calendar.h:
-	* calendar/ea-week-view.c: (ea_week_view_get_name):
-	for calendar_get_text_for_folder_bar_label has been removed form
-	calendar-commands.c, we implement it ourself.
-
-2004-09-23  Li Yuan  <li.yuan@sun.com>
-
-	* calendar/ea-cal-view-event.c: (ea_cal_view_event_get_type),
-	(ea_cal_view_event_get_name), (ea_cal_view_event_get_description):
-	Make accessibility name and description translatable.
-	(atk_action_interface_init), (ea_cal_view_event_do_action),
-	(ea_cal_view_event_get_n_actions),
-	(ea_cal_view_event_action_get_name):
-	Add action interface to ea-cal-view-event so that it can be 
-	UI grabbed by GOK.
-	* calendar/ea-cal-view.c:
-	Make accessibility name and description translatable.
-	* calendar/ea-day-view-cell.c: (ea_day_view_cell_new):
-	Change atk role of ea-day-view-cell from ATK_ROLE_TABLE_CELL 
-	to ATK_ROLE_UNKNOWN so that it can be UI grabbed by GOK.
-	(atk_component_interface_init), (component_interface_grab_focus):
-	Add a component interface function : grab_focus.
-	When grab focus, present the Evolution GUI to the front.
-	* calendar/ea-day-view-main-item.c:
-	(ea_day_view_main_item_get_description):
-	Make accessibility name and description translatable.
-	(ea_day_view_main_item_time_change_cb):
-	Notify the item_cell is selected.
-	* calendar/ea-day-view.c: (ea_day_view_get_name),
-	(ea_day_view_get_description):
-	Make accessibility name and description translatable.
-	* calendar/ea-gnome-calendar.c: (ea_gnome_calendar_get_name),
-	(ea_gnome_calendar_get_description), (ea_gnome_calendar_ref_child):
-	Make accessibility name and description translatable.
-	* calendar/ea-jump-button.c: (ea_jump_button_get_name),
-	(ea_jump_button_get_description):
-	Make accessibility name and description translatable.
-	* calendar/ea-week-view-cell.c: (ea_week_view_cell_get_name),
-	(atk_component_interface_init), (component_interface_get_extents),
-	(component_interface_grab_focus):
-	Add a component interface function : grab_focus.
-       	Add support for different week start days.
-	When grab focus, present the Evolutioon GUI to the front.
-	* calendar/ea-week-view-main-item.c: (ea_week_view_main_item_new):
-	Set the atk role to ATK_ROLE_TABLE.
-	(ea_week_view_main_item_get_description):
-	Make accessibility name and description translatable.
-	(ea_week_view_main_item_time_change_cb):
-	Notify the item_cell is selected.
-	* calendar/ea-week-view.c: (ea_week_view_get_name),
-	(ea_week_view_get_description):
-	Make accessibility name and description translatable.
-	* widgets/ea-calendar-cell.c: (ea_calendar_cell_new):
-	Change atk role of ea-calendar-cell from ATK_ROLE_TABLE_CELL 
-	to ATK_ROLE_UNKNOWN so that it can be UI grabbed by GOK.
-	* widgets/ea-calendar-item.c: (ea_calendar_item_class_init),
-	(ea_calendar_item_get_name), (ea_calendar_item_get_description):
-	Make accessibility name and description translatable.
-	(ea_calendar_item_ref_state_set),:
-	Implement ref_state_set so that ea-calendar-item can be UI 
-	grabbed by GOK.
-	(ea_calendar_item_destory_cell_data):
-	Fix a crash here.
-
-2004-04-29  Rodney Dawes  <dobey@ximian.com>
-
-	* calendar/Makefile.am (INCLUDES): Add $(top_srcdir)/widgets/misc
-	for the e-activity-handler.h stuff
-
-2004-04-22  Kidd Wang  <kidd.wang@sun.com>
-
-	* calendar/ea-week-view.c: (ea_week_view_get_n_children): If the
-	week view has no spans, there is no visible events in the view.
-
-2004-03-15  JP Rosevear  <jpr@ximian.com>
-
-	* calendar/ea-cal-view.h: fix include
-
-2003-03-15  Hao Sheng  <hao.sheng@sun.com>
-
-	* Contritbuted by Leon Zhang <leon.zhang@sun.com>
-	* Makefile.am: add directory addressbook.
-	* implement basic accessbility addressbook's minicard.
-	add new directory and Files below:
-		addressbook/
-		addressbook/Makefile.am
-		addressbook/ea-addressbook.c
-		addressbook/ea-addressbook-view.c
-		addressbook/ea-minicard.c
-		addressbook/ea-minicard-view.c
-		addressbook/ea-addressbook.h
-		addressbook/ea-addressbook-view.h
-		addressbook/ea-minicard.h
-		addressbook/ea-minicard-view.h
-
-2003-12-10  Bolian Yin <bolian.yin@sun.com>
-
-	* calendar/ea-cal-view-event.c (ea_cal_view_event_get_index_in_parent): corret index error in week view.
-	* calendar/ea-day-view-cell.c: impl. get_index_in_parent
-	* calendar/ea-day-view-main-item.c: emit signal "active-descendant-changed", fix error in selection_interface_ref_selection.
-	* widgets/ea-calendar-cell.c: impl. get_index_in_parent.
-	* widgets/ea-calendar-item.c: change signature of e_calendar_item_get_offset_for_date, emit signal "active-descendant-changed".
-
-2003-12-09  Andrew Wu <Yang.Wu@sun.com>
-
-	* calendar/Makefile.am: add entries for new source files
-	* calendar/ea-calendar-helpers.c: add cases for jump button.
-	* calendar/ea-calendar.c: add cases for week view and week view main item.
-	* calendar/ea-jump-button.c: new impl.
-	* calendar/ea-week-view-cell.c: new impl.
-	* calendar/ea-week-view-main-item.c: new impl.
-	* calendar/ea-week-view.c: add main item as first child.
-	
-2003-12-05  Bolian Yin <bolian.yin@sun.com>
-                                                                                
-        * calendar/ea-cal-view-event.c (ea_cal_view_event_new): shortcut when cal_view is NULL.
-        * calendar/ea-cal-view.c: Change an action name.
-        * calendar/ea-calendar.c (ea_calendar_focus_watcher): add check for event atk object.
-        * calendar/ea-week-view.c (ea_week_view_get_n_children): correct impl.
-          (get_visible_text_item_count): removed.
-                                                                                
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* */Makefile.am: Remove hard coded disable deprecated flags
-	
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* calendar/Makefile.am (SHELL_IDLS): Only get Evolution.idl.
-
-2003-11-11  Bolian Yin <bolian.yin@sun.com>
-                                                                                
-        Fixes #50538
-                                                                                
-        * new files:
-                widgets/ea-calendar-cell.[hc]
-                                                                                
-        * widgets/ea-calendar-item: impl. atk selection and atk table interface.        
-
-	* widgets/Makefile.am : use shared object library (.so)
-                                                                                
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* calendar/Makefile.am (INCLUDES): don't include toplevel libical
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Handle some more renaming
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Reflect renaming of ECalView to ECalendarView
-
-2003-11-04  Bolian Yin <bolian.yin@sun.com>
-
-	Fixes # 48509
-
-	* new files:
-		ea-cell-table.h ea-cell-table.c
-	* calendar/Makefile.am: add entries for new files
-	* calendar/New files added:
-		ea-day-view-main-item.c ea-day-view-main-item.h
-		ea-day-view-cell.c ea-day-view-cell.h
-	* Add debug info and remove some non-C99 compilers warnings.
-	* calendar/ea-cal-view: add action interface. 
-
-2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* calendar/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-2003-08-27  Bolian Yin <bolian.yin@sun.com>
-
-	* Makefile.am: add widgets directory; move calendar idl stuff to
-	calendar directory; stop make a single shared lib for whole a11y
-	stuff.
-
-	* ea-factory.h: make factory macros available to GOBJECT
-
-	* calendar/Makefile.am: add calendar idl stuff
-
-	* calendar/ea-cal-view-event.c: add atkcomponent interface.
-
-	* calendar/ea-gnome-calendar.c (ea_gcal_switch_view_cb): add
-	details for "children_changed".
-
-	* new widgets directory for widgets a11y stuff, new files are:
-		widgets/Makefile.am, widgets/ea-calendar-item.c,
-		widgets/ea-calendar-item.h, widgets/ea-widgets.c,
-		widgets/ea-widgets.h
-
-2003-08-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* calendar/ea-cal-view-event.c (ea_cal_view_event_get_name):
-	adapted to changes in ECalViewEvent.
-
-2003-08-20  Bolian Yin <bolian.yin@sun.com>
-	setup the a11y directory for evolution accessibility work
-	New files are:
-		ChangeLog
-		ea-factory.h
-		Makefile.am
-		calendar/ea-calendar.c
-		calendar/ea-calendar.h
-		calendar/ea-calendar-helpers.c
-		calendar/ea-calendar-helpers.h
-		calendar/ea-cal-view.c
-		calendar/ea-cal-view.h
-		calendar/ea-cal-view-event.c
-		calendar/ea-cal-view-event.h
-		calendar/ea-day-view.c
-		calendar/ea-day-view.h
-		calendar/ea-week-view.c
-		calendar/ea-week-view.h
-		calendar/ea-gnome-calendar.c
-		calendar/ea-gnome-calendar.h
-		calendar/Makefile.am
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
deleted file mode 100644
index a51d82e1a1..0000000000
--- a/addressbook/ChangeLog
+++ /dev/null
@@ -1,10627 +0,0 @@
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #569652
-
-	* gui/component/addressbook-component.c: (ensure_sources):
-	Use new ESourceList API (simplifies code).
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* gui/component/ldap-config.glade:
-	* gui/contact-editor/fullname.glade:
-	* gui/contact-editor/contact-editor.glade:
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/contact-editor/e-contact-editor-fullname.c:
-	* gui/component/addressbook-config.c:
-	* conduit/address-conduit.c:
-	Remove deprecated Gtk+ symbols.
-
-	* gui/contact-editor/Makefile.am:
-	* gui/contact-editor/im.glade:
-	* gui/contact-editor/e-contact-editor-im.h:
-	* gui/contact-editor/e-contact-editor-im.c:
-	* gui/contact-editor/fulladdr.glade:
-	* gui/contact-editor/e-contact-editor-address.h:
-	* gui/contact-editor/e-contact-editor-address.c:
-	* printing/Makefile.am:
-	* printing/e-contact-print.glade:
-	* printing/e-contact-print-style-editor.h:
-	* printing/e-contact-print-style-editor.c:
-	* printing/test-contact-print-style-editor.c:
-	Remove death files.
-
-2009-02-26  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #572950
-
-	* printing/Makefile.am:
-	Remove meaningless GNOME_INCLUDEDIR.  Patch by Daniel Macks.
-
-2009-02-24  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #572903
-
-	* gui/contact-editor/contact-editor.glade: Change "Novell Groupwise"
-	to "Novell GroupWise". Doesn't break string freeze, as the latter
-	string already exists.
-
-2009-02-12  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #404232
-
-	* gui/widgets/e-addressbook-view.c: (search_activated):
-	Rebuild view immediately for an advanced search too.
-
-2009-02-11  Andre Klapper  <a9016009@gmx.de>
-
-	* /gui/component/addressbook-migrate.c:
-	Substitute some deprecated gtk+ functions.
-
-2009-01-26  Matthew Barnes  <mbarnes@redhat.com>
-
-	* printing/test-print.c:
-	* printing/test-contact-print-style-editor.c:
-	Migrate the test programs off libgnomeui/libbonobo.
-
-2009-01-21  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #362754
-
-	* gui/component/addressbook-component.c: (ensure_sources):
-	Ensure to show default groups and sources with actual
-	localized name, not the one it was stored last time.
-
-2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/widgets/eab-contact-display.c (eab_uri_popup_link_open),
-	(on_link_clicked):
-	Call e_show_uri() instead of gnome_url_show().
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/contact-editor/e-contact-editor-fullname.c:
-	* gui/contact-editor/e-contact-editor-im.c:
-	* gui/contact-editor/e-contact-editor-address.c:
-	* gui/widgets/e-addressbook-view.c:
-	* printing/e-contact-print.c:
-	Remove unneeded #include <libgnome/gnome-util.h>.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/component/addressbook-view.c:
-	* gui/contact-editor/e-contact-editor.h:
-	* gui/contact-editor/e-contact-quick-add.c:
-	* gui/contact-editor/eab-editor.h:
-	* gui/contact-list-editor/e-contact-list-editor.h:
-	Remove unneeded #include <libgnomeui/gnome-app.h>.
-	Remove unneeded #include <libgnomeui/gnome-app-helper.h>
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #567270
-
-	* gui/contact-editor/test-editor.c:
-	* printing/test-contact-style-editor.c:
-	* printing/test-print.c:
-	Remove already-disabled use of gnome_about_new().
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #567276
-
-	* gui/widgets/e-addressbook-view.c:
-	* printing/test-print.c:
-	Remove unneeded #include <libgnomeui/gnome-dialog-util.h>.
-
-2009-01-10  Andre Klapper  <a9016009@gmx.de>
-
-	* Fix for bug #567282
-
-	* /gui/component/addressbook-view.c:
-	Remove unrequired #include of <libgnomeui/gnome-href.h>.
-
-2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>
-
-	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
-
-	* Fix for bug #566011
-
-	* gui/component/Makefile.am:
-	* gui/component/addressbook-component.c
-	(addressbook_component_class_init):
-	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h> and
-	add bindtextdomain().
-
-2009-01-08  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #339879
-
-	* gui/widgets/addresstypes.xml: Use "rawcode" instead of "code"
-	to have not added a "match-all" into the expression.
-
-2009-01-07  Matt Davey  <mcdavey@mrao.cam.ac.uk>
-
-	** Fix for bugs #201167 and #269342
-
-	* conduit/address-conduit.c:
-	Add support for category syncing.  Also, retain an existing
-	given/first name split if it exists in the pilot record.
-
-2009-01-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* ui/component/addressbook-config.c (eabc_general_offline):
-	Use the correct macro when marking strings for translation.
-
-2008-12-23  Andre Klapper  <a9016009@gmx.de>
-
-	* gui/merging/eab-contact-merging.c:
-	Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>
-
-2008-12-09  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #563669
-
-	* gui/component/ldap-config.glade:
-	* printing/e-contact-print.glade:
-	Use zero GtkSpinButton's PageSize, as Gtk+ requires.
-
-2008-12-08  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #270376
-
-	* gui/contact-editor/e-contact-editor.c: (im_service []),
-	(non_string_fields[]):
-	* gui/widgets/eab-contact-display.c: (render_contact):
-	Support Skype field in a contact.
-
-	* gui/contact-editor/e-contact-editor-im.c:
-	Changes here too, but file doesn't seem to be used.
-
-2008-12-08  Jennifer Newman  <jennifer.newman@tufts.edu>
-
-	** Fix for bug #549964
-
-	* gui/widgets/eab-gui-util.c (eab_load_error_dialog),
-	(eab_search_result_dialog): Fix for a few erroneous strings. 
-
-2008-12-05  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #332629
-
-	* gui/widgets/addresstypes.xml:
-	Use dynamically created list of categories in the option's widget.
-
-2008-12-04  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #263268
-
-	* gui/widgets/e-addressbook-view.c: (search_activated),
-	(make_suboptions): Be able to search for contacts without category.
-
-2008-12-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #348299
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Use category completion in the Categories field.
-
-2008-11-17  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #557818
-
-	* gui/component/addressbook-view.c:
-	ESourceSelector now handles most of the drag-and-drop signals.
-	We just have to listen for the new "data-dropped" signal and
-	deal with it.  Gets rid of a lot of duplicate logic.
-
-2008-11-17  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #558322
-
-	* gui/component/addressbook-view.c (rename_addressbook_cb):
-	New "Rename" item in the source selector pop-up menu calls
-	the recently added e_source_selector_edit_primary_selection().
-	Still need to bind the "F2" key to this action, but I'm not
-	sure how whether EPopup supports that.
-
-2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/contact-editor/test-editor.c:
-	* gui/widgets/e-minicard-label.c:
-	* gui/widgets/e-minicard-view-widget.c:
-	* gui/widgets/test-reflow.c:
-	Only include the toplevel GTK+ header.
-
-2008-10-17  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #511918
-
-	* tools/evolution-addressbook-export-list-cards.c:
-	(struct _EContactCSVFieldData), (csv_field_data[]),
-	(e_contact_csv_get_data_type), (e_contact_csv_get):
-	Use TRUE/FALSE texts for boolean values and do not
-	free returned value for them, otherwise it crashes.
-
-2008-10-14  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* conduit/address-conduit.c:
-
-2008-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #555494
-
-	* gui/widgets/e-addressbook-view.c (generate_viewoption_menu):
-	Category icons are not themed.  Load by file, not by icon name.
-
-2008-10-03  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/widgets/eab-contact-display.c:
-
-2008-10-01  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/component/addressbook-config.c:
-	* gui/widgets/e-minicard.c:
-	* importers/evolution-ldif-importer.c:
-	* importers/evolution-vcard-importer.c:
-
-2008-09-30  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/component/addressbook.c:
-
-2008-09-29  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/component/addressbook-view.c:
-
-2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #553148
-
-	* gui/contact-editor/contact-editor.glade:
-	* gui/contact-editor/e-contact-editor-im.c: Standardise "GroupWise"
-	usage in translatable strings.
-
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/contact-editor/e-contact-quick-add.c:
-	* gui/widgets/e-addressbook-view.c:
-
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/widgets/e-addressbook-model.c:
-	* gui/widgets/eab-gui-util.c:
-	* gui/widgets/eab-vcard-control.c:
-
-2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fixes bug #553479
-
-	* gui/component/ldap-config.glade: String capitalisation improvements.
-
-2008-09-23  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #553273
-
-	* gui/component/addressbook-view.c: (delete_addressbook_folder),
-	(delete_addressbook_cb):
-	* gui/widgets/eab-gui-util.c: (save_it):
-	* gui/contact-list-editor/e-contact-list-model.c:
-	(e_contact_list_model_add_email):
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	(contact_list_editor_contact_exists):
-	Always end e_error_run/e_error_new calls with NULL parameter.
-
-2008-09-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #552575
-
-	* gui/widgets/eab-gui-util.c: (eab_send_contact_list_as_attachment):
-	Register default callbacks to composer to be able to send/save draft.
-
-2008-09-23  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #272391
-
-	* gui/component/apps_evolution_addressbook.schemas.in:
-	* gui/component/autocompletion-config.c: (struct AutocompletionConfig),
-	(config_control_destroy_notify), (add_section),
-	(show_address_check_toggled_cb), (autocompletion_config_control_new):
-	New UI for Edit->Preferences->Autocompletion, with the checkbox for
-	the key "/apps/evolution/addressbook/completion/show_address" to be
-	able to setup whether show mail address for the autocompleted contact.
-
-2008-09-19  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/widgets/e-minicard-label.c:
-	* tools/evolution-addressbook-export.c:
-
-2008-09-16  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/component/addressbook-component.c:
-	* gui/contact-editor/eab-editor.c:
-
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/component/addressbook-migrate.c:
-
-2008-09-08  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #361413
-
-	* gui/widgets/eab-gui-util.c: (eab_load_error_dialog):
-	Print detailed error also for LDAP backends.
-
-2008-09-06  Michael Meeks  <michael.meeks@novell.com>
-
-	* gui/component/openldap-extract.h: License fixes.
-
-2008-09-04  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/widgets/e-minicard-view.c:
-	* gui/widgets/eab-popup-control.c:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/component/addressbook-config.h:
-	* gui/component/addressbook.h:
-	* gui/component/autocompletion-config.c:
-	* gui/component/autocompletion-config.h:
-	* gui/component/component-factory.c:
-	* gui/contact-editor/e-contact-editor-address.c:
-	* gui/contact-editor/e-contact-editor-address.h:
-	* gui/contact-editor/e-contact-editor-fullname.c:
-	* gui/contact-editor/e-contact-editor-fullname.h:
-	* gui/contact-editor/e-contact-editor-im.c:
-	* gui/contact-editor/e-contact-editor-im.h:
-	* gui/contact-editor/e-contact-editor.h:
-	* gui/contact-editor/e-contact-quick-add.h:
-	* gui/contact-editor/test-editor.c:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	* gui/contact-list-editor/e-contact-list-editor.h:
-	* gui/contact-list-editor/e-contact-list-model.c:
-	* gui/merging/eab-contact-compare.c:
-	* gui/merging/eab-contact-merging.c:
-	* gui/merging/eab-contact-merging.h:
-	* gui/widgets/e-addressbook-reflow-adapter.c:
-	* gui/widgets/e-addressbook-table-adapter.c:
-	* gui/widgets/e-addressbook-view.h:
-	* gui/widgets/e-minicard-label.h:
-	* gui/widgets/e-minicard-view-widget.c:
-	* gui/widgets/e-minicard-view-widget.h:
-	* gui/widgets/e-minicard.h:
-	* gui/widgets/eab-config.c:
-	* gui/widgets/eab-contact-display.h:
-	* gui/widgets/eab-menu.c:
-	* gui/widgets/eab-popup.c:
-	* gui/widgets/gal-view-factory-minicard.c:
-	* gui/widgets/gal-view-minicard.h:
-	* importers/evolution-csv-importer.c:
-	* printing/e-contact-print-style-editor.c:
-	* printing/e-contact-print-style-editor.h:
-	* printing/e-contact-print-types.h:
-	* printing/e-contact-print.c:
-	* printing/e-contact-print.h:
-	* printing/test-contact-print-style-editor.c:
-	* printing/test-print.c:
-	* tools/evolution-addressbook-export-list-cards.c:
-	* util/eab-book-util.c:
-	* util/eab-book-util.h:
-
-2008-09-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #448435
-
-	* gui/component/addressbook-config.c: (eabc_general_host):
-	Keep UI consistent, disable SSL method for 636 port.
-
-2008-09-01  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #548827
-
-	* gui/widgets/eab-gui-util.c: (eab_error_dialog):
-	Check bounds of the string array before accessing elements.
-	* gui/widgets/e-addressbook-view.c: (delete_contacts_cb):
-	Show more detailed error message if available.
-
-2008-08-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #548348
-
-	* printing/Makefile.am:
-	Add a libecontactprint_la_LIBADD stanza so we link to the
-	correct libemiscwidgets and libeutil.
-
-2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #534762
-
-	* addressbook.error.xml:
-	* conduit/address-conduit.c:
-	* gui/widgets/eab-gui-util.c: (eab_load_error_dialog),
-	(eab_search_result_dialog):
-	* gui/widgets/eab-vcard-control.c: (eab_vcard_control_new):
-	* tools/evolution-addressbook-export-list-folders.c:
-	(action_list_folders_init):
-	* tools/evolution-addressbook-export.c: Change "addressbook" to
-	"address book" in translatable strings.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/component/addressbook-component.h:
-	* gui/component/addressbook-migrate.h:
-	* gui/component/addressbook-view.h:
-	* gui/component/openldap-extract.h:
-	* gui/contact-editor/eab-editor.h:
-	* gui/contact-list-editor/e-contact-list-model.h:
-	* gui/merging/eab-contact-compare.h:
-	* gui/widgets/e-addressbook-model.h:
-	* gui/widgets/e-addressbook-reflow-adapter.h:
-	* gui/widgets/e-addressbook-table-adapter.h:
-	* gui/widgets/e-minicard-view.h:
-	* gui/widgets/eab-config.h:
-	* gui/widgets/eab-gui-util.h:
-	* gui/widgets/eab-menu.h:
-	* gui/widgets/eab-popup-control.h:
-	* gui/widgets/eab-popup.h:
-	* gui/widgets/eab-vcard-control.h:
-	* gui/widgets/gal-view-factory-minicard.h:
-	* gui/widgets/gal-view-minicard.c:
-	* importers/evolution-addressbook-importers.h:
-	* tools/evolution-addressbook-export-list-folders.c:
-	* tools/evolution-addressbook-export.h:
-
-2008-08-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #508732
-
-	* gui/component/addressbook-component.c (impl_createView):
-	Add a "select_item" argument for crash recovery, which the
-	addressbook component does not use.
-
-2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/contact-editor/e-contact-editor.c:
-	Use e_display_help() for displaying help.
-
-2008-08-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	Fix a typo.  (#547369)
-
-	* gui/component/addressbook-migrate.c:
-	Fix TeX-style quotes.  (#547372)
-
-2008-08-12  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #547308
-
-	* gui/component/addressbook.c: (load_source_auth_cb):
-	Do not try to authenticate to the server more than twice when knows
-	the password and it didn't fail because of wrong user name/password.
-	* gui/widgets/eab-gui-util.c: (const char *status_to_string[]):
-	New string for new status code.
-	* gui/widgets/eab-gui-util.c: (eab_load_error_dialog):
-	Include detailed error in generic failure error, if available and is
-	not a repository offline error.
-
-2008-08-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #546892
-
-	* gui/contact-editor/e-contact-editor-fullname.c:
-	* gui/contact-editor/e-contact-editor-im.c:
-	* gui/contact-editor/e-contact-editor-address.c:
-	Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list().
-
-	* gui/contact-editor/e-contact-editor-im.c:
-	Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image().
-
-	* gui/component/addressbook-view.c:
-	e_activity_handler_operation_started() no longer takes a GdkPixbuf.
-	It was ignoring the pixbuf anyway ever since we added a spinner icon.
-
-2008-08-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #324203
-
-	* gui/component/ldap-config.glade:
-	* gui/component/addressbook-config.c: (canbrowse_toggled_cb),
-	(eabc_details_limit): New check box to be able to set LDAP
-	address books browseable until reaches given limits.
-
-2008-08-06  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #249844
-
-	* gui/component/addressbook-component.c:
-	(impl__get_userCreatableItems): Do not let compiler claim.
-
-2008-08-06  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #546263
-
-	* gui/widgets/e-minicard.c: (add_field), (add_email_field), (remodel):
-	Add 'width' property as the last one for 'new' item, thus it will know
-	all the information to properly calculate column widths. Also don't
-	set field names for the contact-lists. Both changes prevents messing
-	of minicard painting for changed contact-lists.
-
-2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #249844
-
-	* gui/component/addressbook-component.c
-	(impl__get_userCreatableItems): 
-	Use C_() macro instead of Q_() macro. 
-	Use fully qualified names for "New" submenu entries. 
-
-2008-08-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #546057
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	* gui/contact-list-editor/contact-list-editor.glade:
-	Use "x-office-address-book" icon name instead of "stock_addressbook".
-
-2008-07-30  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #211267
-
-	* printing/e-contact-print.c: (struct _EContactPrintContext),
-	(e_contact_print_letter_heading), (e_contact_start_new_page),
-	(e_contact_print_contact), (contact_draw_page),
-	(e_contact_print): Report correct number of pages to print
-	and print them as requested.
-
-2008-07-30  Takao Fujiwara  <takao.fujiwara@sun.com>
-
-	Reviewed by Andre Klapper <a9016009@gmx.de>
-
-	** Fix for bug #545300
-
-	* gui/merging/eab-contact-duplicate-detected.glade:
-	Add a translatable tag in "_Merge" string.
-
-2008-07-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #544383
-
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	(e_contact_list_editor_get_contact): Put list members in reverse order,
-	because 'e_vcard_add_attribute' uses prepend, thus changes order on
-	every single save of the contact list.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* addressbook.error.xml: Fix some strings. See bug #543753.
-
-2008-07-13  Keith Packard  <keithp@keithp.com>
-
-	** Fix for bug #541355
-
-	* conduit/address-conduit.c:
-	The pilot link code does call free_match on data returned from the 
-	for_each method, which the evolution conduits aren't prepared to 
-	handle. This patch removes any freed objects from the 'locals' list in 
-	each conduit which otherwise frees them again when the conduit is closed.
-
-2008-07-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #228725
-
-	* gui/widgets/e-minicard-view.h: (struct _EMinicardView):
-	* gui/widgets/e-minicard-view.c: (set_empty_message),
-	(stop_state_changed), (e_minicard_view_set_property),
-	(e_minicard_view_dispose), (e_minicard_view_init):
-	Show different message in a view when searching.
-
-2008-07-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #540152
-
-	* gui/component/addressbook-component.c: (ensure_sources):
-	Unref source only when we created it - the list owns the pointer now.
-
-2008-06-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #539755
-
-	* importers/evolution-csv-importer.c: (parseLine):
-	Do not leak (introduced in bug #440818).
-	* importers/evolution-csv-importer.c: (add_to_notes),
-	(parseLine), (getNextCSVEntry): Do not access memory beyond
-	the columns array.
-
-2008-06-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #440818 (patch by Rodrigo Castro)
-
-	* importers/evolution-csv-importer.c: (parseLine): Convert line
-	to UTF-8 if not a valid one. Pretend it to be an ISO-8859-1 line.
-	* importers/evolution-csv-importer.c: (getNextCSVEntry):
-	Append char-by-char and check for EOF too.
-
-2008-06-13  Tor Lillqvist  <tml@novell.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	Link with the bootstrap libevolution-mail library on Windows.
-
-2008-06-13  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #304029
-	
-	* gui/widgets/addresstypes.xml: changed description of default
-	search filter from "Name begins with" to "Name contains"
-	* gui/widgets/e-addressbook-view.c: (search_activated):
-	same in a filter search query itself
-
-2008-06-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/component/addressbook-component.c:
-	Use <glib/gi18n.h> instead of <bonobo/bonobo-i18n.h>.
-
-2008-06-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/merging/eab-contact-merging.c: (mergeit):
-	Use non-deprecated gtk+ api.
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534360
-
-	* conduit/address-conduit.c:
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/widgets/e-addressbook-view.c:
-	* gui/widgets/e-minicard-view-widget.c:
-	* gui/widgets/e-minicard.c:
-	* gui/widgets/eab-contact-display.h:
-	* printing/e-contact-print-style-editor.c:
-	* printing/e-contact-print-style-editor.h:
-	Migrate from deprecated GtkObject symbols to GObject equivalents.
-
-2008-04-30  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #316390
-
-	* gui/widgets/e-addressbook-view.c: (categories_changed_cb),
-	(get_master_list), (eab_view_dispose), (eab_view_new),
-	(search_activated), (make_suboptions):
-	Listen for changes in categories setup and propagate them to UI.
-
-2008-04-28  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #529768
-
-	* gui/widgets/eab-gui-util.c (eab_send_to_contact_and_email_num_list):
-	Setup default callbacks for the newly created EMsgComposer widget.
-
-2008-04-23  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #529254
-
-	* gui/widgets/eab-gui-util.c: (save_it):
-	Prototype and return value of e_write_file_uri has been changed.
-
-2008-04-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #529465
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	Prefer "popup" to "pop-up" per the GNOME Documentation Style Guide.
-
-2008-04-17  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #526739
-
-	* gui/contact-editor/e-contact-editor.c: Do not include gnome-vfs.
-
-2008-04-02  Matthew Barnes <mbarnes@redhat.com>
-
-	* gui/widgets/Makefile.am:
-	Remove CORBA rules for the old composer.
-
-	* gui/widgets/eab-gui-util.c (eab_send_to_contact_and_email_num_list),
-	(eab_send_contact_list_as_attachment):
-	Adapt to new Bonobo-less composer widget.
-
-2008-03-31  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #521562
-
-	* gui/contact-editor/e-contact-editor-address.c: (countries []):
-	Small typo fix.
-
-2008-03-31  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #506347
-
-	* gui/widgets/eab-contact-display.c:
-	(eab_contact_display_render_compact):
-	Inherit background colors from actual theme, do not use hardcoded one.
-
-2008-03-31  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #404241
-
-	* gui/widgets/e-minicard.c: (get_email_location), (add_email_field):
-	* gui/widgets/eab-contact-display.c: (get_email_location):
-	Never return NULL, rather return "Other" as default.
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #438613
-
-	* addressbook.error.xml:
-	Improved "contact-delete-error-perm" secondary text.
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #316572
-
-	* gui/component/ldap-config.glade: Do not translate unused text.
-
-2008-03-18  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #511952
-
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	(contact_list_editor_create_name_selector):
-	Marking text for translation.
-
-2008-03-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #273177
-
-	* gui/contact-editor/e-contact-quick-add.h:
-	(e_contact_quick_add_vcard):
-	* gui/contact-editor/e-contact-quick-add.c: (struct _QuickAdd),
-	(quick_add_unref), (quick_add_set_vcard), (clicked_cb),
-	(build_quick_add_dialog), (e_contact_quick_add_vcard):
-	Allow adding also whole vCard with this dialog.
-	* gui/widgets/eab-popup-control.h: (struct _EABPopupControl):
-	* gui/widgets/eab-popup-control.c: (eab_popup_control_set_vcard),
-	(eab_popup_control_cleanup), (eab_popup_control_set_vcard),
-	(eab_popup_control_no_matches), (set_prop), (get_prop),
-	(eab_popup_control_new):
-	New property 'vcard', if set, has higher precedence than name/email.
-
-2008-03-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #513951
-
-	* gui/component/addressbook-component.c (ensure_sources):
-	* gui/component/addressbook-migrate.c (addressbook_migrate):
-	Adapt to new meaning of xxx_component_peek_base_directory().
-
-	* gui/component/addressbook-component.c (addressbook_component_init):
-	* gui/component/addressbook-migrate.c (create_groups):
-	Use e_get_user_data_dir() instead of constructing the full path.
-
-2008-02-22  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #514836
-
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	(contact_list_editor_add_destination):
-	Obsoleting EVC_X_DEST_EMAIL and EVC_X_DEST_NAME.
-
-2008-02-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #517458
-
-	* gui/widgets/e-addressbook-reflow-adapter.c:
-	(addressbook_compare): Handle broken UIDs.
-
-2008-02-18  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #515744
-
-	* gui/component/addressbook-migrate.c: (get_source_name):
-	Memory leak fix.
-
-2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/merging/eab-contact-merging.c: (mergeit): Upstream patch from
-	OpenSUSE.
-
-2008-02-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/component/addressbook.c (addressbook_authenticate):
-	Don't allow newlines in the password dialog title.  Use a fixed
-	string instead.  (#516279)
-
-2008-02-10  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #510642
-
-	* addressbook.error.xml: Improved string for read-only-addressbook
-	error-message. 
-
-2008-01-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/widgets/e-minicard.c:
-	* gui/widgets/gal-view-minicard.c:
-	Replace G_GNUC_FUNCTION (deprecated) with G_STRFUNC.
-
-2008-01-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #512020
-
-	* gui/widgets/e-addressbook-view.c: (get_master_list):
-	Use only searchable categories, like in calendar.
-
-2008-01-23  Djihed Afifi  <djihed@gmail.com>
-
-	** Fix for bug #391408
-
-	* gui/widgets/e-minicard-label.c:
-	(e_minicard_label_resize_children):
-	* gui/widgets/e-minicard.c: (add_field), (add_email_field):
-	Fix contact minicards for RTL languages.
-
-2008-01-22  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #503551
-
-	* gui/widgets/e-minicard-view-widget.c: (selection_row_change):
-	Emit selection changed signal even when unselecting, because
-	we enable/disable menu items on selection change.
-
-2008-01-21  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #324604 inspired by patch of makuchaku (Mayank)
-
-	* gui/widgets/eab-gui-util.h:
-	* gui/widgets/eab-gui-util.c: (eab_parse_qp_email),
-	(eab_parse_qp_email_to_html): New helper functions for decoding
-	email addresses from RFC822 or RFC2047 form to UTF-8.
-	* gui/widgets/e-minicard.c: (add_email_field):
-	* gui/widgets/eab-contact-display.c: (render_contact_list),
-	(render_contact), (eab_contact_display_render_compact):
-	* gui/widgets/e-addressbook-table-adapter.c:
-	(struct _EAddressbookTableAdapterPrivate), (addressbook_dispose),
-	(addressbook_value_at), (addressbook_set_value_at), (remove_contacts),
-	(modify_contact), (model_changed), (eab_table_adapter_construct):
-	* gui/widgets/eab-gui-util.c: (get_email),
-	(eab_send_contact_list_as_attachment):
-	Ensure the print of the email is transformed from RFC822 or RFC2047.
-
-2008-01-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/widgets/e-addressbook-view.etspec: Revert my last patch.
-
-2008-01-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/widgets/e-addressbook-view.etspec: Take off the cursor/focus.
-	Now we have a nice cairo rendered message list row.
-
-2008-01-15  Djihed Afifi  <djihed@gmail.com>
-
-	** Fix for bug #507564
-
-	* gui/widgets/eab-contact-display.c: Fix contact view for RTL
-	languages.
-
-2008-01-14  David Turner  <cillian64@googlemail.com>
-
-	** Partial fix for bug #498095
-
-	* gui/contact-editor/contact-editor.glade: Changed mnemonics on
-	"Categories" and "Nickname" to fix a clash. 
-
-2008-01-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #488213
-
-	* gui/contact-editor/e-contact-editor.c: (extract_simple_field):
-	Use global function e_icon_factory_pixbuf_scale for scaling pixbufs.
-
-2008-01-10  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #448441
-
-	* addressbook.error.xml: New message "error-read-only" added.
-	* gui/contact-editor/e-contact-quick-add.c: (struct _QuickAdd),
-	(merge_cb), (sanitize_widgets), (source_changed),
-	(build_quick_add_dialog):
-	Disable "OK" and "Edit Full" buttons if no source is selected.
-	Also set always book from combo, do not use the new created.
-
-2008-01-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #339813
-
-	* gui/contact-editor/e-contact-editor.c: (e_contact_editor_create_date):
-	Setting new option 'e_date_edit_set_twodigit_year_can_future' to FALSE.
-
-2008-01-06  Michael Monreal  <michael.monreal@gmx.net>
-
-	** Fix for bug #492188
-
-	* gui/component/addressbook-view.c:
-
-	Use the new Tangoized icons instead of deprecated icons from 
-	gnome-icon-theme.
-
-2008-01-06  Christian Krause  <chkr@plauener.de>
-
-	** Fix for bug #506772
-
-	* tools/evolution-addressbook-export.c: (main): Not-NULL check for a 
-	string array before finding its length. 
-
-2007-12-11  Sankar P  <psankar@novell.com>
-
-	** Fix for bug #501969
-
-	* gui/component/addressbook.c: (load_source_auth_cb):
-	Passwords should not be forgotten on all errors
-
-2007-12-06  David Turner  <cillian64@googlemail.com>
-
-	** Fix for bug #468277
-
-	* gui/component/addressbook-config.c: (eabc_general_offline):
-	Added a mnemonic to "Copy book content locally for offline operation"
-
-2007-12-05  Lucky Wankhede  <wlakke@novell.com>
-
-	** Fix for bug #409121
-
-	* gui/component/addressbook-view.c:
-	* gui/widgets/e-addressbook-view.c: (save_as), (eab_view_save_as):
-	* gui/widgets/eab-gui-util.c:
-	(eab_send_contact_list_as_attachment):
-	* gui/widgets/eab-vcard-control.c: (toggle_full_vcard),
-	(eab_vcard_control_new):
-	* importers/evolution-vcard-importer.c:
-	(evolution_vcard_importer_peek): Corrected misspelled instances
-	of vCard
-
-2007-11-28  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #489652
-
-	Migrate the contact list editor from ETable to GtkTreeView and
-	fix some HIG issues.
-
-	* gui/contact-list-editor/Makefile.am:
-	Remove e-contact-list-editor.etspec
-	Remove e-contact-list-editor-marshal.list
-
-	* gui/contact-list-editor/contact-list-editor.glade:
-	Fix some HIG issues and give all the widgets proper names.
-
-	* gui/contact-list-editor/e-contact-list-model.c:
-	* gui/contact-list-editor/e-contact-list-model.h:
-	EContactListModel is now a subclass of GtkListStore.
-
-	* gui/contact-list-editor/e-contact-list.c:
-	* gui/contact-list-editor/e-contact-list.h:
-	Use a GtkTreeView instead of an ETable for displaying members.
-	Refactor everything; see bug #489652 for more details.
-
-2007-11-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #495711
-
-	* gui/contact-editor/e-contact-editor.h: (struct _EContactEditor):
-	* gui/contact-editor/e-contact-editor.c: (full_name_response),
-	(full_name_clicked), (e_contact_editor_init):
-	Keep track of previously created Full Name dialog and reuse it.
-
-2007-11-18  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	** Fix bug #495875
-
-	* gui/component/addressbook-view.c:
-	right click menu reordering
-
-2007-11-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Remove dead files from source control.  The dates below
-	   indicate when the file was removed from Makefile.am.
-	   Fixes part of bug #478704.
-
-	* printing/e-contact-print-envelope.c	(Apr 2007)
-	* printing/e-contact-print-envelope.h	(Apr 2007)
-	* tools/evolution-addressbook-abuse.c	(May 2004)
-	* tools/evolution-addressbook-import.c	(no history)
-
-2007-10-31  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #484064
-
-	* gui/component/addressbook-view.c:
-	* gui/widgets/e-addressbook-view.c:
-	Use mail-message-new instead of mail-send for composing
-	mail to contact, contacts or group.
-
-2007-10-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/contact-editor/e-contact-editor.c:
-	Remove unneeded include.
-
-2007-10-26  Matthew Barnes  <mbarnes@redhat.com>
-
-	* conduit/address-conduit.c (local_record_to_pilot_record):
-	Zero out the GnomePilotRecord struct to silence a compiler warning.
-
-2007-10-25  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #489661
-
-	* gui/widgets/gal-view-treeview.c:
-	* gui/widgets/gal-view-treeview.h:
-	* gui/widgets/gal-view-factory-treeview.c:
-	* gui/widgets/gal-view-factory-treeview.h:
-	* gui/widgets/e-addressbook-treeview-adapter.c:
-	* gui/widgets/e-addressbook-treeview-adapter.h:
-	Remove these dead files from SCM.
-
-	* gui/widgets/e-addressbook-view.h:
-	* gui/widgets/e-addressbook-view.c:
-	* gui/widgets/Makefile.am:
-	Remove dead WITH_ADDRESSBOOK_VIEW_TREEVIEW code.
-
-2007-10-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/contact-editor/e-contact-editor-address.c:
-	* gui/contact-editor/e-contact-editor-fullname.c:
-	* gui/contact-editor/e-contact-editor-im.c:
-	* gui/contact-editor/e-contact-editor.c: (save_contact),
-	(app_delete_event_cb), (e_contact_editor_set_property),
-	(e_contact_editor_create_date):
-	* gui/contact-list-editor/e-contact-list-model.c:
-	(e_contact_list_model_new):
-	* gui/merging/eab-contact-merging.c: (mergeit), (response):
-	* gui/widgets/e-minicard.c: (e_minicard_event), (add_field),
-	(get_email_location), (add_email_field), (remodel),
-	(e_minicard_reflow), (e_minicard_compare):
-	* gui/widgets/eab-config.c: (eab_config_new):
-	* gui/widgets/eab-gui-util.c: (eab_load_error_dialog),
-	(file_exists), (save_it), (contact_added_cb),
-	(eab_send_to_contact_and_email_num_list):
-	* gui/widgets/eab-menu.c: (eab_menu_new):
-	* gui/widgets/eab-popup.c: (eab_popup_new):
-	* importers/evolution-csv-importer.c: (parseLine),
-	(getNextCSVEntry):
-	* printing/e-contact-print-style-editor.c:
-	* printing/test-contact-print-style-editor.c:
-	* printing/test-print.c:
-	* util/eab-book-util.c: (eab_get_config_database):
-
-	Warning fixes:
-	- mixing code and declarations
-	- NULL vs 0 vs FALSE/TRUE
-	- mark code static
-	- some coding style fixes
-	- if vs ifdef
-	- Remove some unused bits
-	- ANSIfication of declarations
-
-2007-10-23  Tobias Mueller  <tobiasmue@svn.gnome.org>
-	Patch by Michael Monreal <michael.monreal@gmx.net>
-	
-	** Fixes bug #486406
-
-	* gui/component/addressbook-component.c:
-	Use addressbook-new icon instead of stock_addressbook
-
-2007-10-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #417999
-
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/contact-editor/contact-editor.glade:
-	* gui/contact-editor/e-contact-quick-add.c:
-	* gui/contact-list-editor/contact-list-editor.c:
-	* gui/contact-list-editor/contact-list-editor.glade:
-	Use ESourceComboBox instead of ESourceOptionMenu (deprecated).
-
-2007-10-18  Tobias Mueller  <tobiasmue@svn.gnome.org>
-	Patch by Michael Monreal <michael.monreal@gmx.net>
-	
-	** Fixes bug #482603
-
-	* gui/component/addressbook-view.c:
-	Use document-properties icon instead of stock_folder-properties
-	
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* conduit/address-conduit.c:
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/component/addressbook-config.c:
-	* gui/widgets/eab-gui-util.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-10-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #477045
-
-	* gui/component/addressbook-view.c:
-	Use "edit-copy" icon for the FolderCopy verb.
-
-2007-10-04  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #331421
-
-	* gui/widgets/eab-contact-display.c:
-	(eab_contact_display_render_normal): Make contact list name clickable.
-
-2007-10-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #469657
-
-	* importers/evolution-ldif-importer.c:
-	Use destroy functions in GHashTables to simplify memory management.
-
-2007-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #337539
-
-	* gui/widgets/e-minicard.c: (get_left_width), (remodel):
-	Omit left column when showing list of contacts.
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #474000
-
-	* importers/evolution-ldif-importer.c:
-	Remove redundant Base64 codec implementation.  Use GLib's.
-
-2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #461195
-
-	* util/eab-marshal.list:
-	* gui/contact-list-editor/e-contact-list-editor-marshal.list:
-	* gui/contact-editor/e-contact-editor-marshal.list: Remove
-	needless marshalers.
-	* gui/contact-editor/eab-editor.c:
-	* gui/widgets/e-minicard-view-widget.c:
-	* gui/widgets/eab-marshal.list:
-	* gui/widgets/e-minicard.c:
-	* gui/widgets/e-minicard-label.c:
-	* gui/widgets/e-addressbook-model.c:
-	* gui/widgets/e-addressbook-view.c: Use GObject's marshalers.
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #477045
-
-	* gui/component/addressbook-component.c:
-	* gui/component/addressbook-view.c:
-	* gui/contact-editor/e-contact-editor-address.c:
-	* gui/contact-editor/e-contact-editor-fullname.c:
-	* gui/contact-editor/e-contact-editor-im.c:
-	* gui/widgets/e-addressbook-view.c:
-	* gui/widgets/eab-contact-display.c:
-	Use standard icon names where applicable.
-
-2007-09-21  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #411125
-
-	* gui/widgets/e-addressbook-view.etspec:
-	* gui/contact-list-editor/e-contact-list-editor.etspec:
-	Uses 'compare="collate"' instead of 'compare="string"' to handle UTF
-	characters correctly.
-
-2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #476231
-
-	* gui/widgets/eab-gui-util.c:
-	Remove non-USE_GTKFILECHOOSER code.
-	GtkFileChooser has been around since 2004.
-
-2007-09-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #473903
-
-	* gui/merging/eab-contact-merging.c: (mergeit):
-	Fixes serious compiler warning.
-
-2007-09-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/component/addressbook-config.c: (source_to_uri_parts): Fix for a
-	build break.
-
-2007-09-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #471791 (Move away from assert to g_ret)
-
-	* gui/component/addressbook-config.c: (ldap_unparse_auth),
-	(ldap_unparse_scope), (ldap_unparse_ssl), (source_to_uri_parts):
-	* gui/component/addressbook-view.c: (control_activate_cb):
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	(e_contact_list_editor_close):
-	* gui/widgets/e-addressbook-view.c: (table_double_click),
-	(treeview_row_activated):
-	* gui/widgets/eab-gui-util.c: (eab_search_result_dialog):
-	* gui/widgets/eab-popup-control.c: (set_prop), (get_prop):
-	* printing/e-contact-print.c: (contact_compare):
-
-2007-08-27  Johnny Jacob <jjohnny@novell.com>
-	 
-	Committed on behalf of Ushveen Kaur <kushveen@novell.com>
-	
- 	** Fixes bug #352358
- 
- 	* gui/merging/eab-contact-commit-duplicate-detected.glade: Label
- 	string of GtkLabel,id="label1" harmonised.
- 	* gui/component/addressbook-view.c (rename-addressbook-folder):
- 	Error tag changed from 'addressbook:no-rename-folder' to 
- 	'addressbook:no-rename-folder-exists' so that error messages 
- 	are harmonised.
- 
-2007-08-24  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #440328
-
-	* gui/merging/eab-contact-duplicate-detected.glade:
-	* gui/merging/eab-contact-merging.c: (mergeit): Missing mnemonics for 
-	the 'Merge' buttons in two separate dialogs.
-
-2007-08-23  Anand V M  <avmuttagi@gmail.com>
- 
-       ** Fix for bug #353462
- 
-       * gui/widgets/eab-gui-util.c:Changing the labels of buttons from 
-       "Yes/No" to "Display All Contacts/Don't Display" to make them HIG 
-       compliant.
-
-2007-08-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #412732
-
-	* printing/e-contact-print.c: (load_contacts):
-	Disconnecting previously connected signal handlers.
-
-2007-08-06  Milan Crha  <mcrha@redhat.com>
-
-	** Partial fix for bug #313221
-
-	* gui/component/addressbook-migrate.c
-	(migrate_contacts), (migrate_company_phone_for_local_folders):
-	changes as part of fixing bug #313221,
-	looping through all param values, not only testing first one
-
-2007-08-06  Milan Crha  <mcrha@redhat.com>
-
-	** Partial fix for bug #427469
-
-	* importers/evolution-vcard-importer.c: (vcard_import_contact):
-	if HOME or WORK isn't specified for EMAIL, add TYPE=OTHER
-
-2007-08-02  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #462007
-
-	* gui/contact-editor/e-contact-editor.c: (update_preview_cb): Plugged
-	memory leak.
-
-2007-07-31  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #462002
-
-	* gui/contact-editor/e-contact-editor.c: (extract_simple_field): Save
-	resizing image as its original format.
-
-2007-07-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* gui/widgets/e-minicard.c: (add_email_field): Use g_strdup() instead
-	of g_strdup_printf() for duplication of a string
-
-2007-07-26  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* gui/contact-editor/e-contact-editor.c:
-	(e_contact_editor_create_source_option_menu):
-	* gui/contact-editor/e-contact-quick-add.c: (build_quick_add_dialog):
-	* gui/component/addressbook-config.c: (addressbook_config_edit_source):
-	Plugged memory leaks.
-
-2007-07-26  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* gui/widgets/e-minicard.c: (add_email_field): Plugged memory leak.
-
-2007-07-20  Claude Paroz  <claude@2xlibre.net>
-
-	* tools/evolution-addressbook-export.c: Minor typo.
-
-2007-07-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/widgets/e-addressbook-view.c: (init_collection)
-	Abort if ETable specification file fails to load.
-
-2007-07-07  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	** Fix for bug #448568
-
-	* gui/contact-editor/contact-editor.glade:
-	* gui/contact-editor/e-contact-editor.c: (setup_tab_order):
-	cleanup alignement mess and set correct tabbing order. Thanks
-	to vinod for the initial glade patch.
-
-2007-07-06  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #337787
-
-	* gui/widgets/e-address-view.c: (contact_display_has_selection),
-	(eab_view_copy): Copy selection string in contact preview if the
-	preview widget has selection string.
-
-2007-06-20  Laszlo (Laca) Peter  <laca@sun.com>
-
-	** Fix for bug #433732
-
-	* tools/Makefile.am: expand @PERL@ in evolution-addressbook-clean.in
-	* tools/csv2vcard: rename to csv2vcard.in
-	* tools/csv2vcard.in: make the path to perl configurable
-	* tools/evolution-addressbook-clean.in: make the path to perl
-	  configurable
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #445793 from Gilles Dartiguelongue  
-
-	* conduit/Makefile.am:
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-        ** Fix for bug #448223 from Gilles Dartiguelongue
-
-	* gui/widgets/e-addressbook-view.c: (generate_viewoption_menu):
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-        ** Fix for bug #445812 from Gilles Dartiguelongue
-
-	* gui/widgets/eab-contact-display.c:
-
-2007-06-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #325882
-
-	* gui/contact-editor/im.glade:
-	* gui/contact-editor/fulladdr.glade:
-	* gui/merging/eab-contact-commit-duplicate-detected.glade:
-	* printing/e-contact-print.glade:
-	Changed GTK_WIN_POS_NONE to GTK_WIN_POS_CENTER_ON_PARENT.
-
-2007-06-12  Wang Xin  <jedy.wang@sun.com>
-
-	Fixes #444248.
-
-	* addressbook/gui/widgets/e-minicard.c
-
-2007-06-06  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* Makefile.am:
-	
-	Reverted automake 1.6 breakage. Fixes bug 444747. 
-	Patch by Patch by Daniel Gryniewicz <dang@nemesis.fprintf.net>.
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #386503 from Matthew Barnes
-
-	* gui/contact-editor/e-contact-editor.c: (show_help_cb):
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
-
-	* Makefile.am:
-	* conduit/Makefile.am:
-	* gui/component/Makefile.am:
-
-2007-06-02  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* conduit/address-conduit.c: (local_record_to_pilot_record):
-	* gui/component/addressbook-config.c: (query_for_supported_bases),
-	(eabc_commit):
-	* gui/component/addressbook-migrate.c: (get_integer_child),
-	(migrate_ldap_servers), (migrate_completion_folders):
-	* gui/component/addressbook-view.c:
-	(selector_tree_drag_data_received):
-	* gui/contact-editor/e-contact-editor.c: (fill_in_simple_field),
-	(extract_simple_field):
-	* gui/contact-editor/e-contact-quick-add.c:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	(table_drag_data_received_cb), (extract_info), (fill_in_info):
-	* gui/merging/eab-contact-merging.c: (dialog_map),
-	(dropdown_changed), (mergeit), (check_if_same), (response),
-	(match_query_callback):
-	* gui/merging/eab-contact-merging.h:
-	* gui/widgets/e-addressbook-view.c: (table_drag_data_get),
-	(make_suboptions), (eab_view_delete_selection), (selection_get),
-	(selection_received):
-	* gui/widgets/e-minicard-view.c: (e_minicard_view_drag_data_get):
-	* gui/widgets/e-minicard.c: (add_email_field):
-	* gui/widgets/eab-contact-display.c: (eab_selection_get),
-	(on_url_requested), (render_contact):
-	* gui/widgets/gal-view-minicard.c: (gal_view_minicard_load),
-	(gal_view_minicard_save), (column_width_changed):
-	* printing/e-contact-print.c: (e_contact_build_style):
-	fixing casts and other compilation warnings
-
-2007-05-30  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #333858 from Milan Crha
-
-	* gui/contact-editor/e-contact-editor.c: (categories_response),
-	(categories_clicked), (e_contact_editor_init):
-	* gui/contact-editor/e-contact-editor.h:
-	* importers/evolution-vcard-importer.c: (vcard_import_contacts),
-
-2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/component/addressbook-component.c (ensure_sources):
-	* gui/component/addressbook-migrate.c (ensure_sources):
-	Don't assume the relative URI is non-NULL (#427232).
-
-2007-05-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #424055 from Øystein Gisnås
-
-	* gui/contact-list-editor/contact-list-editor.glade:
-
-2007-05-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #417797 from Øystein Gisnås
-
-	* gui/component/addressbook-view.c: (selector_tree_drag_motion),
-	(selector_tree_drag_data_received):
-
-2007-05-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #404239 from Øystein Gisnås
-
-	* /addressbook/gui/widgets/e-minicard.c: 
-
-2007-05-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #358250 from Javier F. Serrador
-
-	* gui/widgets/e-addressbook-view.etspec:
-	* gui/widgets/eab-contact-display.c: (render_contact):
-
-2007-05-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #337616
-
-	* Makefile.am: Add $(schema_DATA) to DISTCLEANFILES.
-
-2007-05-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Add Tango
-	icons to preference window.
-
-2007-05-08  Wang Xin  <jedy.wang@sun.com>
-
-	* tools/evolution-addressbook-export-list-cards.c:
-	Fixes 394932.
-
-2007-04-23  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/widgets/e-addresbook-reflow-adapter.c:
-	* gui/widgets/e-addresbook-view.c:
-	Don't include e-contact-print-envelope.h.
-
-2007-04-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #426816
-
-	* gui/component/addressbook-view.c:
-	* gui/widgets/e-addressbook-view.c:
-	* gui/widgets/e-addressbook-view.h:
-	* printing/e-contact-print.c:
-	* printing/e-contact-print.h:
-	* printing/e-contact-print-types.h:
-	Refactor the printing infrastructure.
-	Migrate off of libgnomeprint[ui] once and for all.
-
-	* printing/test-print.c:
-	Migrate off of libgnomeprint[ui] once and for all.
-
-	* printing/e-contact-print-envelope.c:
-	* printing/e-contact-print-envelope.h:
-	This module is unused.  Disable it, but keep the logic around for
-	future reference.
-
-	* printing/Makefile.am:
-	Remove e-contact-print-envelope.[ch].
-
-2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #429422
-
-	* tools/evolution-address-export.c:
-	Migrate from popt to GOption.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Use gtk_window_set_icon_from_file() instead of
-	gnome_window_icon_set_from_file().
-
-	* gui/widgets/e-addressbook-table-adapter.c:
-	* gui/widgets/e-addressbook-model.c:
-	* gui/widgets/eab-gui-util.c:
-	Include missing header file(s).
-
-	* gui/widgets/eab-vcard-control.c (pstream_load), (book_open_cb),
-	(free_struct):
-	* gui/widgets/eab-gui-util.c (process_unref):
-	* gui/widgets/e-addressbook-view.c (eab_view_print),
-	(eab_view_print_preview), (eab_view_delete_selection),
-	(eab_view_save_as), (eab_view_view), (eab_view_send),
-	(eab_view_send_to):
-	e_free_object_list() is dead; just do it manually.
-
-	* gui/widgets/e-addressbook-view.c (eab_view_print),
-	(eab_view_print_preview):
-	* conduit/address-conduit.c (addrconduit_load_configuration):
-	Use g_object_ref_sink() instead of gtk_object_sink().
-
-	* conduit/address-conduit.c (e_addr_gui_new):
-	Use gtk_menu_shell_append() instead of gtk_menu_append().
-
-	* printing/e-contact-print.c (e_contact_build_style):
-	Use g_build_filename() instead of g_concat_dir_and_file().
-
-	* printing/e-contact-print-style-editor.c
-	(e_contact_print_style_editor_new):
-	Use g_object_new() instead of gtk_type_new().
-
-2007-04-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Committed Contact Merging patch from Ebby Wiselyn
-
-	* gui/merging/eab-contact-duplicate-detected.glade:
-	* gui/merging/eab-contact-merging.c: (free_lookup), (dialog_map),
-	(dropdown_changed), (mergeit), (check_if_same), (response),
-	(match_query_callback), (eab_merging_book_add_contact),
-	(eab_merging_book_commit_contact): 
-
-2007-04-10  Elizabeth Greene <nerdygirl_ellie@yahoo.com>
-
-        ** Fix for bug #426743.
-	* addressbook/tools/evolution-addressbook-export.c:
-	Corrected typo "asychronous".
-
-2006-04-10  Andre Klapper  <a9016009@gmx.de>
-
-	* gui/widgets/eab-contact-display.c: 
-	change "E-Mail" to "Email". Fixes bug #404233.
-
-2007-04-09  simon.zheng  <simon.zheng@sun.com>
-
-	** Fix for bug #426487
-
-	* gui/widgets/eab-contact-display.c: (accum_time_attribute):
-	strftime() supplied by OS is subject to locale encoding, i.e. 
-	ja_JP.PCK. Using g_date_strftime() instead, which works on a 
-	UTF-8 format string and store a UTF-8 result.
-
-2007-04-09  simon.zheng  <simon.zheng@sun.com>
-
-	** Fix for bug #426829.
-
-	* gui/contact-editor/eab-editor.c: (eab_editor_confirm_delete):
-	* gui/widgets/eab-contact-display.c: (render_contact):
-	To avoid printing a NULL char point, adding statements to
-	check the return result of et_email_location() and e_contact_get().
-
-2007-04-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/component/addressbook-config.c (addressbook_config_edit_source):
-	Call gettext() on the EConfigItem labels.  (#406933)
-	Patch from Jeff Cai.
-
-2007-03-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/contact-editor/e-contact-quick-add.c:
-	* gui/component/addressbook-component.c:
-	* gui/component/addressbook-view.c:
-	* gui/widgets/eab-contact-display.c:
-	* gui/widgets/gal-view-minicard.c:
-	* gui/widgets/e-addressbook-view.c:
-	Don't mix declarations and code (#405495).
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #360240
-
-	* gui/widgets/e-addressbook-view.c (e_contact_print_button):
-	* printing/e-contact-print.c (complete_sequence),
-	(e_contact_build_style), (e_contact_print_response),
-	(e_contact_print_contact_list_dialog_new):
-	Remove unused variables.
-
-2007-03-01  Tor Lillqvist  <tml@novell.com>
-
-	* gui/widgets/e-addressbook-view.c (e_contact_print_button):
-	* printing/e-contact-print.c (e_contact_print_response): 
-	Bypass the body of these functions on non-G_OS_UNIX for now as
-	they use gtk_print_unix_dialog_get_settings(). Gtk printing on
-	Win32 needs work.
-
-2007-02-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #232065
-
-	* gui/widgets/e-addressbook-view.c: (eab_view_delete_selection): Fix
-	for selection jump on delete from Ebby Wiselyn.
-
-2007-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/contact-editor/contact-editor.glade: Fix critical warnings
-	from typos in the glade file. Closes bug #397893. Patch
-	from Wang Xin.
-
-2007-02-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Print migration updates from Ebby Wiselyn.
-
-	* gui/component/addressbook-view.c: (print_cb), (print_preview_cb):
-	* gui/widgets/e-addressbook-view.c: (print),
-	(e_contact_print_button), (eab_view_print),
-	(eab_view_print_preview):
-	* printing/e-contact-print.c: (e_contact_print_contact),
-	(complete_sequence), (book_view_loaded), (print_func),
-	(e_contact_print_response), (e_contact_print_dialog_new),
-	(e_contact_print_contact_dialog_new),
-	(e_contact_print_contact_list_dialog_new), (contact_draw_page):
-
-2007-02-08  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #332908
-
-	* gui/contact-editor/e-contact-editor.c: (extract_simple_field): Dont
-	popup if the size of the image is small
-
-2007-02-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #400726
-
-	* printing/e-contact-print.h: Declare e_contact_print_response().
-
-2007-01-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** GtkPrint api migration from Ebby Wiselyn.
-
-	* gui/component/addressbook-view.c: (print_cb):
-	* gui/widgets/e-addressbook-view.c: (print),
-	(e_contact_print_button), (contact_print_button_draw_page),
-	(eab_view_print), (eab_view_print_preview):
-	* gui/widgets/e-addressbook-view.h:
-	* printing/e-contact-print.c: (e_contact_output),
-	(e_contact_text_height), (e_contact_rectangle),
-	(e_contact_print_letter_heading), (e_contact_start_new_page),
-	(e_contact_get_contact_size), (e_contact_print_contact),
-	(e_contact_start_new_column), (complete_sequence),
-	(book_view_loaded), (e_contact_do_print_contacts),
-	(e_contact_build_style), (e_contact_print_response),
-	(e_contact_print_dialog_new), (e_contact_print_contact_dialog_new),
-	(contact_draw_page):
-
-2007-01-08  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	Patch submitted by Nathan Owens <pianocomp81@yahoo.com> and 
-	Jerry Yu <jijun.yu@sun.com>
-
-	* conduit/address-conduit.c:  Add pilot-link 0.12 compatibility.
-	
-2006-12-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes bug #357970
-
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/widgets/e-minicard.c:
-	* gui/widgets/eab-contact-display.c:
-	Don't call deprecated GLib / GDK functions.
-
-2006-11-11  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* gui/widgets/e-minicard.c: Fixed #358249
-	* gui/widgets/eab-contact-display.c: Fixed #358249
-
-2005-10-16  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/widgets/e-addressbook-view.c (display_view): Changed the
-	parameter passed to gal_view_minicard_attach.
-	
-	* gui/widgets/gal-view-minicard.c (column_width_changed): Sets the
-	horizontal scroll amount for the addresss card view to the current
-	page size. 
-	
-	* gui/widgets/gal-view-minicard.h: Changed function prototype for
-	gal_view_minicard_attach. Passing EABView instead of
-	EMinicardViewWidget.
-	Fixes Bug#218273
-
-2006-10-16  Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug#332908
-	* addressbook.error.xml :
-	* gui/contact-editor/e-contact-editor.c : Prompt-resize dialog
-	options changed. Three options given now, "Resize", "Use as it is"
-	and "Do not save".
-
-2006-10-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/component/addressbook-component.c: Remove duplicate include.
-	* gui/contact-editor/e-contact-editor.c: (extract_simple_field):
-	Fix some compiler warnings.
-	* gui/contact-editor/e-contact-quick-add.c:
-	(build_quick_add_dialog): Cast away a compiler warning.
-	* gui/widgets/e-addressbook-view.c: (generate_viewoption_menu):
-	#if 0 out an unused array, fix 0 vs NULL initialization in some
-	other arrays and remove an unused GSList.
-	* gui/widgets/e-minicard.c: (add_email_field): Make a var const.
-	* gui/widgets/eab-gui-util.c: (eab_contact_save),
-	(eab_contact_list_save): Add some casts to fix compiler warnings
-	and #if 0 out an unused function.
-	* util/eab-book-util.c: (escape), (eab_contact_list_from_string):
-	Some GString fixes. All of this from bug #332101.
-
-2006-08-24  Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #261062
-
-	* addressbook.error.xml: Translator comments added.
-
-2006-09-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #357811
-	
-	* gui/widgets/e-addressbook-view.c: (search_activated): Fix for search
-	on any type to work.
-
-2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #351332
-
-	* gui/widgets/e-minicard.c:
-	Fix implicit function declarations.
-
-2006-09-12  Ushveen Kaur  <kushveen@novell.com>
-
-	** Fixes bug #352353
-
-	* gui/widgets/eab-gui-utils.c (file_exists): Translator comment 
-	is added.
-
-2006-08-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/widgets/e-addressbook-view.c: (string_without_underscores),
-	(generate_viewoption_menu), (make_suboptions): Fixes a lot of search
-	issues.
-
-2006-08-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/component/addressbook-component.c: (impl_requestCreateItem):
-	Plug a leak.
-
-2006-08-09  Ushveen Kaur  <kushveen@novell.com>
-
-	** Fixes bug #261239
-	
-	* gui/contact-editor/contact-editor.glade: Tab focus corrected in
-	Mailing Address tab of Contact Editor.
-
-2006-08-07  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/e-addressbook-view.c (eab_view_delete_selection): Added a
-	callback function to handle the contact deletion error.
-	(delete_contacts_cb): Added new, a callback function.
-
-	* addressbook.error.xml: Added a error code contact-delete-error-perm
-	and corresponding error string. Fixes #260403
-
-	Original patch was submitted by "Vandana Shenoy .B"
-
-2006-07-25  Johnny Jacob  <jjohnny@novell.com>
-	
-	* gui/widgets/e-addressbook-view.c: (search_activated),
-	(query_changed), (make_suboptions) : Assign proper search item ids.
-
-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>
-
-	Reviewed by Harish Krishnaswamy <kharish@novell.com>
-	
-	** Fix 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>
-
-	** Fixes 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
-
-2006-06-14  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fixes bug #344227
-	* gui/widgets/eab-contact-display.c:
-	(eab_contact_display_render_compact): gdk_pixbuf_loader_close should
-	be called before gdk_pixbuf_loader_get_pixbuf.
-
-2006-06-13  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fixes bug #342646
-	* gui/widgets/e-addressbook-view.c: Plugged memory leak.
-	* gui/widgets/e-minicard-view.c: Ditto.
-
-2006-06-13  Oswald Rodrigues <ozzy_rodrigues@yahoo.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (build_quick_add_dialog):
-	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
-	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
-
-	* 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>
-
-	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>.
-
-2006-03-29  Li Yuan <li.yuan@sun.com>
-
-	Fix for bug #336454
-	* gui/component/addressbook-view.c:
-	(source_selector_key_press_event_callback):
-	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):
-	Fix for Bug 332915.
-
-2006-03-06  Devashish Sharma <sdevashish@novell.com>
-
-	* importers/evolution-ldif-importer.c (ldif_import):
-	* importers/evolution-csv-importers.c (csv_import) :
-	* importers/evolution-vcard-importer.c (vcard_import) :
-	Fix for Bug 332136: Evolution fails to import contacts from a file into
-	an addressbook if the addressbook is never opened.
-	Patch by Xiurong Simon Zheng.
-
-2006-03-05  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/widgets/e-addressbook-view.etspec : Fix for bug 268458.
-
-2006-02-28  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (extract_simple_field): Fix for Bug 
-	#332811 crash adding an image to a contact.
-	
-2006-02-27  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c: Fix for Bug #332498: orphaned
-	category editor crashes Evo.
-	Close the category editor when the contact editor is closed.
-
-2006-02-27  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/component/addressbook-view.c (selector_tree_drag_data_received) :
-	Fix for Bug 322689: Cant copy contact to addressbook if addressbook 
-	just created.
-	
-2006-02-23  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (update_preview_cb) :
-	Fixes Bug #332123 - crash while trying to add an image to a contact
-
-2006-02-23  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/component/addressbook-component.c (impl_requestCreateItem) :
-	New Contact should create contact on selected Addressbook.
-	Fixes Bug # 326788 and 326721.
-
-2006-02-22  Simon Zheng <simon.zheng@sun.com>
-
-	Fix for 331993.
-
-	* printing/medbook.ecps: Add "Regular" to the font name.
-
-2006-02-14  Devashish Sharma  <sdevashish@novell.com>
-
-	* e-contact-print.c : Use of pango for text handling when 
-	printing address book.
-	See Bug #269430.
-
-2006-02-13  Andre Klapper  <a9016009@gmx.de>
- 
-	* ldap-config.glade: Fix the Security options to finally be 
-	descriptive, rather than obscuring. Identical to the changes in
-	mail/em-account-editor.c to fix the UI part of bug #321797.
-
-2006-02-05  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: 
-	Correcting "Addressbook" to properly read "Address Book".
-	Fixes bug #326256.
-
-	* gui/component/addressbook-config.c (addressbook_config_edit_source): 
-	* gui/component/addressbook-component.c (impl_upgradeFromVersion): 
-	Correcting "Addressbook" to properly read "Address Book".
-	Fixes bug #326256.
-
-2006-02-05  Andre Klapper  <a9016009@gmx.de>
-
-	* gui/component/ldap-config.glade: fixing one typo.
-	fixes #304996 partially.
-
-2006-02-01  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c: File selector shows preview
-	of the image when choosing picture of a contact.
-	Fixes bug #300884.
-	
-2006-02-01  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/widgets/e-minicard.c : (e_minicard_reflow) Fixed a bug which was
-	causing addressbook view by address card getting all messed up.
-	Fixes Bug #329315.
-
-2006-01-30  Tor Lillqvist  <tml@novell.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	Link with libefilterbar, too.
-
-2006-01-30  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/component/addressbook-view.c:
-	* gui/widgets/e-addressbook-view.c:
-	Remove inclusion of unused header.
-
-2006-01-30  Sushma Rai  <rsushma@novell.com>
-
-	* gui/component/Makefile.am: Removed reference to "search" directory.
-	Fixes the build issue.
-
-2006-01-30  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/widgets/e-addressbook-view.[ch]: Added save advanced search for 
-	contacts.
-	* gui/widgets/addresstypes.xml: Search types for contacts. Moved the file
-	from search directory to here as that directory is no longer required.
-
-2006-01-30  Elijah Newren  <newren@gmail.com>
-
-	* gui/contact-editor/e-contact-editor.c: removed an unused variable.
-
-2006-01-27  Kjartan Maraas  <kmaraas@gnome.org>
-
-	reviewed by: Harish Krishnaswamy <kharish@novell.com>
-
-	* gui/component/addressbook-component.c: (impl_requestCreateItem):
-	Remove unused bits.
-	* gui/component/addressbook-config.c: (eabc_general_type),
-	(eabc_general_offline): Same here.
-	* gui/component/addressbook-migrate.c: Remove unused static function.
-	* gui/component/addressbook-view.c: (selector_tree_drag_motion):
-	Remove unused static function and init uninitialized var.
-	* gui/contact-editor/e-contact-editor-address.c:
-	(fill_in_countries): Return early if setlocale() fails.
-	* gui/contact-editor/e-contact-editor.c: (file_as_get_style),
-	(extract_email), (extract_phone), (sensitize_phone_types),
-	(extract_im), (sensitize_im_types), (init_simple):
-	Mark some arrays static, remove unused variables, fix gcc warnings
-	* gui/contact-list-editor/e-contact-list-editor.c: (fill_in_info):
-	Remove unused var.
-	* gui/merging/eab-contact-compare.c: (eab_contact_compare_name):
-	Remove unused static function and unused vars.
-	* gui/search/e-addressbook-search-dialog.c:
-	(eab_search_dialog_dispose): Remove unused vars.
-	* gui/widgets/e-addressbook-model.c: (get_view): Add comment.
-	* gui/widgets/e-addressbook-view.c: (eab_view_class_init),
-	(eab_view_delete_selection): Remove unused var
-	* gui/widgets/e-addressbook-view.h: Remove extra semi-colon.
-	* gui/widgets/e-minicard-label.c: (e_minicard_label_unrealize):
-	Remove unused var.
-	* gui/widgets/e-minicard.c: (e_minicard_unrealize),
-	(e_minicard_event), (add_field), (remodel), (e_minicard_reflow):
-	Remove unused vars. s/if/ifdef in some places, use passed in parameter
-	instead of redeclaring the thing locally.
-	* gui/widgets/eab-contact-display.c: (accum_address),
-	(eab_contact_display_render_compact): s/if/ifdef.
-	* gui/widgets/eab-gui-util.c: (eab_select_source): Comment out unused var.
-	* gui/widgets/eab-popup-control.c: (eab_popup_control_cleanup): s/if/ifdef
-	* printing/e-contact-print-style-editor.c:
-	(e_contact_print_style_editor_class_init),
-	(e_contact_print_style_editor_set_arg),
-	(e_contact_print_style_editor_get_arg): Remove unused vars.
-	* util/eab-book-util.c: s/if/ifdef
-
-2006-12-7 M Victor Aloysius J <victoraloy@gmail.com>
-
-       * gui/contact-editor/e-contact-editor.c (style_makes_sense): 
-         (name_to_style):Added feature for missing middle name.             
-         Fixes #237297 
-
-2006-01-25  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/component/addressbook-view.c : 
-	* gui/widgets/e-addressbook-view.[ch] :
-	Added functions for handling callbacks from the folder menu items and
-	modified some existing functions.
-
-2006-01-25  Simon Zheng  <simon.zheng@sun.com>
-
-	** Fixes #327203
-
-	* gui/contact-editor/e-contact-editor.c (app_delete_event_cb):
-	Checking the validity of contact editor should be done after
-	extracting all fields. This's done in save_contact().
-	* gui/contact-editor/eab-editor.c
-	(eab_editor_prompt_to_save_changes): To avoid repeating free memory,
-	delete eab_editor_close(). In fact, eab_editor_save_contact() has
-	done it before.
-
-2006-01-23  Devashish Sharma  <sdevashish@novell.com>
-
-	* importers/evolution-csv-importer.c : Made some changes for solving some 
-	bugs in csv and tab file import. Mainly changes made to file parsing 
-	mechanism.
-
-2006-01-23  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-quick-add.c : Added source selector to
-	the quick add dialog so that the user can choose the addressbook also
-	while storing the contact. Earlier it automatically went to the
-	default addressbook.
-
-	* gui/widgets/eab-popup-control.c : It now directly tries to quick add
-	the contact to the selected addressbook. All the duplicate detected and
-	merging contacts logic is then handled by duplicate contact detected
-	dialog. So removed the searching and merging code from the file.
-	Earlier it added the contact to the default addressbook and checked
-	for duplicated there only. 
-
-2006-01-23  Sushma Rai  <rsushma@novell.com>
-
-	* addressbook/gui/component/addressbook.c (addressbook_authenticate):
-	Checking for the property user and username. Fixes #327819.
-
-2006-01-16  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/component/addressbook-component.c:
-	(impl__get_userCreatableItems):
-	remove shortcut keys (UI Hackfest -
-	See http://go-evolution.org/Shortcut_Keys_Review).
-
-2005-01-16  Devashish Sharma  <sdevashish@novell.com>
-	
-	* importers/evolution-csv-importer.c : Added support for CSV and TAB
-	file import.
-	
-2006-01-16  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (full_name_clicked) : Setting
-	the default response for categories dialog.
-	Fixes #317283
-
-2006-01-16  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (full_name_clicked) : Setting
-	the default response for contact full name dialog.
-	Fixes #317282
-
-2006-01-16  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c : Fixed the default focus in
-	the contact editor dialog.
-	
-2006-01-13  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #326268
-	
-	* gui/widgets/e-addressbook-view.c: Adds mnemonics to Advanced Search
-	menu item in contacts view.
-
-2006-01-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-
-	Changes Contacts View accel from Control+F2 to Control+2.	
-
-2006-01-10  Simon Zheng  <simon.zheng@sun.com>
-
-	* gui/widgets/eab-gui-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.
-
-2006-01-09  Ali Akcaagac  / Andre Klapper <a9016009@gmx.de>
-	* tools/evolution-addressbook-clean.in: changing old evo1.4 path to
-	current path. Fixes bug 307513.
-	Committing on behalf of Ali Akcaagac.
-
-2006-01-06  Andre Klapper <a9016009@gmx.de>
-	* evolution/addressbook/gui/widgets/eab-gui-util.c:
-	changing "cancelled" (British English)
-	to "canceled" (American English). Fixes bug 325334.
-
-2006-01-04  Shi Pu  <shi.pu@sun.com>
-
-	* gui/component/addressbook-config.c (eabc_details_search): add a not
-	NULL-pointer check before using lud->scope.
-
-2005-12-22  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/search/addresstypes.xml: Modified the categories to option menu
-	format in advanced search
-	
-2005-12-21  Not Zed  <NotZed@Ximian.com>
- 
- 	* gui/component/addressbook-component.c (impl_createView): changed
- 	from createControls for new shell apis.
-
-	Committed on behalf of Notzed - partha
- 
-2005-12-17  Tor Lillqvist  <tml@novell.com>
-
-	* gui/component/addressbook-migrate.c
-	* importers/evolution-vcard-importer.c
-	* tools/evolution-addressbook-export-list-folders.c: Use gstdio
-	wrappers. Use GDir API instead of dirent. Use GLib to convert file
-	names to URIs and back. Open files in binary mode.
-
-	* gui/widgets/gal-view-minicard.c
-	* printing/e-contact-print.c: Use libedataserver's
-	e_xml_parse_file() and e_xml_save_file() instead of calling libxml
-	functions directly, as they don't understand the GLib file name
-	encoding (UTF-8) on Win32.
-
-	* tools/evolution-addressbook-export-list-cards.c: Use gstdio
-	wrappers. No fork() on Windows, but the fork-to-background
-	functionality doesn't seem essential?
-
-2005-12-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/search/e-addressbook-search-dialog.c: (dialog_response): Added
-	code to set the color from the theme to indicate advance search
-	presence.
-
-2005-12-14  Sushma Rai  <rsushma@novell.com>
-
-	* importers/evolution-ldif-importer.c (ldif_import): Proceeding with
-	the import activity only if the book is writable. 
-
-	* importers/evolution-vcard-importer.c (vcard_import): Similar.
-	Fixes #266003
-
-2005-12-10  Sushma Rai  <rsushma@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (fill_in_address_textview):
-	Not inserting new line at the end and also, placing the cursor at
-	the beginning of the widget. Fixes #300300.
-
-2005-12-06  Veerapuram Varadhan <vvaradhan@novell.com>
-	
-	* conduits/addressbook-conduit.c: (pre_sync):
-	Authenticate by reading the store-password for calendars that has
-	"auth" property set.
-	* conduits/addressbook-conduit.c: (addressbook_authenticate):
-	Implement authentication using e-passwords.
-	
-2005-11-26  Tor Lillqvist  <tml@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	* gui/contact-editor/e-contact-editor-address.c
-	* gui/contact-editor/e-contact-editor-fullname.c
-	* gui/contact-editor/e-contact-editor-im.c
-	* gui/contact-list-editor/e-contact-list-editor.c
-	* gui/merging/eab-contact-merging.c
-	* gui/widgets/e-addressbook-view.c
-	* printing/e-contact-print.c
-	* printing/e-contact-print-style-editor.c: Include
-	e-util-private.h to get redefinition of compile-time pathnames as
-	calls to functions on Windows. Construct the pathnames of files
-	and directories under the installation prefix at run-time to
-	enable install-anywhere on Windows. No effect on functionality on
-	Unix.
-
-2005-11-25  Tor Lillqvist  <tml@novell.com>
-
-	* gui/component/openldap-extract.h: New file. Contains various
-	things lifted from OpenLDAP for use on Windows where we use
-	Microsoft's LDAP implementation. The same file is also in
-	e-d-s/backends/ldap.
-
-	* gui/component/Makefile.am: Distribute openldap-extract.h.
-
-	* gui/component/addressbook-config.c: Include openldap-extract.h on
-	Windows. Include e-util-private.h to get redefinition of
-	EVOLUTION_GLADEDIR (as a call to a function) on Windows.
-	(query_for_supported_bases, eabc_general_name, eabc_general_host,
-	eabc_general_auth, eabc_details_search, eabc_details_limit,
-	addressbook_config_edit_source): Construct the path of the glade
-	file at run-time to enable install-anywhere on Windows.
-
-	* gui/component/addressbook-view.c (control_activate): Include
-	e-util-private,h to get redefinition of EVOLUTION_UIDIR (as a call
-	to a function) on Windows. Construct the path of the xml file at
-	run-time to enable install-anywhere on Windows.
-
-	* importers/evolution-ldif-importer.c (ldif_import)
-	* gui/widgets/eab-gui-util.c (eab_load_error_dialog): Use
-	g_filename_from_uri() instead of just stripping off the "file://"
-	prefix for Win32 portability.
-
-	* importers/evolution-ldif-importer.c (ldif_import): Use gstdio
-	wrappers for better non-ASCII filename support on Windows.
-	
-	* gui/component/addressbook-component.c (ensure_sources): Use
-	g_filename_to_uri() instead of just prefixing "file://" for Win32
-	portability.
-
-2005-11-24  Sushma Rai  <rsushma@novell.com>
-
-	* addressbook.error.xml: Added new error id "gw-book-list-init" and 
-	corresponding warning message.
-
-2005-10-04  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/component/addressbook-view.c (abv_source_popups): 
-	* gui/widgets/e-addressbook-view.c (eabv_popup_items):
-	Added 	keyboard accelerators for contacts.
-	
-2005-11-11 Evan Yan <evan.yan@sun.com>
-
-	* pinting/e-contact-print.c (e_contact_build_style):
-	Add a config argument to get the actual page size and set it to style.
-	(e_contact_print_response): modify the call to e_contact_build_style
-	accordingly.
-	e_contact_print_preview): modify the call to e_contact_build_style
-	accordingly.
-	Fixes # 316280
-
-2005-10-26   Devashish Sharma <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c: Sets the focus to the 
-	corresponding ntry field after changing dropdown menus for phone, im
-	and e-mail fields in contact editor. Fixes #229972.
-
-2005-10-22  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/eab-gui-util.c (eab_send_contact_list_as_attachment): 
-	Marked subject line for translation. Fixes #317753
-
-2005-10-22  Sushma Rai  <rsushma@novell.com>
-
-	* gui/component/addressbook-config.c: Storing the search filter entered
-	at configuration dialog.
-	(addressbook_ldap_init)(source_to_uri_parts): Handling search filter.
-	(eabc_details_search): Storing the serch filter value and added 
-	callback to handle search filter changes.
-	(search_filter_changed_cb)(url_changed): Store search filter in LDAP 
-	url.
-	(from_ldap_search_filter): If search filter entered is missing 
-	parenthesis, adds them. 
-	
-	* gui/component/ldap-config.glade: Added an entry for entering the 
-	search filter.
-	Fixes #311884   	
-
-2005-10-04   Devashish Sharma <sdevashish@novell.com>
-
-	* gui/widgets/e-addressbook-view.etspec: Changed the compare type for
-	"Organization" to stringcase. This new type has been defined for
-	performing case insensitive locale sensitive UTF8 string compares.
-	Fixes #207110. 
-
-2005-10-04   Devashish Sharma <sdevashish@novell.com>
-
-	* gui/widgets/e-addresbook-view.etspec: Changed the compare type for
-	"File As" to "collate", so that proper lexicographical sorting (based
-	on users locale)is employed. Fixes #271594, #273870. 
-
-2005-10-04   Devashish Sharma <sdevashish@novell.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.etspec: Set the
-	sorting column so that the contacts are alphabetically sorted in 
-	contact list editor.  Fixes #265353.
-
-2005-10-03   Devashish Sharma <sdevashish@novell.com>
-
-	*  gui/widgets/e-addressbook-view.c (eab_view_print): Get selected 
-	contacts list and forward it. Earlier list was not being sent so no 
-	chance of printing the selected contacts.
-	(eab_view_print_preview): Same as for print above.
-
-	* printing/e-contact-print.c (e_contact_print_dialog_new): uses_book was
-	being set in every case. removed that and set contact list which is now
-	being passed to it from eab_view_print.
-	(e_contact_print_preview): It was generating preview for the whole 
-	book in all cases. Now if there is a list of selected contacts it
-	generates preview for only those contacts and if the list is NULL (no
-	selected contacts), it generates preview for the whole book.
-	(e_contact_print_response): Checks the current range selected (All or
-	selection) and prints the contacts based on that. If All is selected 
-	all contacts are printed and if Selection is selected only the selected
-	contacts are printed.
-
-	* printing/e-contact-print.h: Changed the function prototype for 
-	e_contact_print_dialog_new and e_contact_print_preview, both of them 
-	now accept a list of selected contacts. 
-	Fixes #248624, #274285, #209354, #202201
-	
-2005-09-30   Devashish Sharma <sdevashish@novell.com>
-
-	* gui/merging/eab-contact-compare.c
-	(name_fragment_match_with_synonyms): Changed name compare logic where
-	it matches names with starting part same. (it matches rob and robert).
-	Fixes #315034.
-
-2005-09-30  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* gui/component/addressbook.c (remove_parameters_from_uri) : This now
-	takes care to escape any auth mechanism in the uri.
-
-2005-09-30  Sushma Rai  <rsushma@novell.com>
-
-	* importers/evolution-ldif-importer.c: Added some missing attrbutes and
-	mozilla specific attributes.
-	(populate_contact_address): Forms the address and also formats it.
-	(parseLine): Handling the work address, home address, wants to receieve
-	html mail option, aim screen name.
-	(getNextLDIFEntry): Handling work and home addresses.
-	Fixes #316373.
-
-2005-09-28  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb): Added a check that the contact received
-	through drag contains an email-id. There is no point in adding a
-	contact to the contact-list if the contact has no email-id. This was 
-	causing a crash also.
-
-	* gui/widgets/eab-contact-display.c
-	(eab_contact_display_render_compact): Added a check for catching null
-	email-ids, in case of contact-lists, so that null ids are not passed
-	for rendering, which was causing a crash.
-	
-2005-09-28  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/component/addressbook-view.c (addressbook_view_init): Added a
-	callback, source_selector_key_press_event_callback() so that the
-	contact folder can be removed with Del/Delete Key.
-	Fixes #233424.
-
-2005-09-28  Tor Lillqvist  <tml@novell.com>
-
-	* gui/component/addressbook.c (get_remember_password): Use
-	g_ascii_strcasecmp() instead of strcasecmp(). We are comparing to
-	the literal "true", just casefolding ASCII is enough. Also better
-	for portability.
-
-2005-09-14  Sushma Rai  <rsushma@novell.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.etspec: Set selection 
-	mode to multiple. Related to the patch submitted already to fix #235038.
-
-2005-08-26  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/widgets/e-addressbook-view.etspec: In ETableSpecification source
-	column and field name were not in proper order. Because of this all the
-	values in view by phone list and view by company were shown in wrong
-	columns. Fixes #313124.
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook.c (addressbook_authenticate):
-	de-constify uri, and fix its creation logic.
-	(load_source_cb): cast for warning.
-
-	* gui/widgets/e-addressbook-view.c: more missing a11y include.
-
-	* gui/widgets/e-minicard-view.c: another missing a11y include.
-
-	* gui/widgets/e-minicard.c: include missing a11y include.
-	(e_minicard_activate_editor): fix cast.
-
-	* gui/widgets/eab-popup-control.c (eab_popup_control_display_contact): remove unused.
-
-	* gui/widgets/eab-gui-util.c (eab_contact_save): fix conditional build.
-	(eab_send_to_contact_and_email_num_list): fix boolean conversion.
-
-	* gui/widgets/eab-contact-display.c (eab_contact_display_init): cast.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info): constify file_as.
-
-	* gui/contact-editor/e-contact-editor.c (init_im_record_location):
-	fix warnings for conditional building.
-	(fill_in_simple_field): do proper boolean conversion.
-	(extract_simple_field): do proper boolean conversion.
-	(response): constify categories, and dont bother initialising it.
-	(image_clicked): remove warnings for conditional build.
-	(e_contact_editor_is_valid): constify text.
-	(e_contact_editor_create_web): cast.
-
-2005-08-22  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/eab-contact-display.c 
-	(eab_contact_display_render_normal): Using e_contact_get() instead of
-	e_contact_get_const() for E_CONTACT_IS_LIST. Patch to fix #314152, by
-	"ross@burtonini.com (Ross Burton)".
-	Also fixed some compile time warnings.
-	(eab_contact_display_render_compact): Fixed some compile time warnings.
-
-2005-08-22  Devashish Sharma <sdevashish@novell.com>
-	
-	* gui/contact-editor/e-contact-editor.c (categories_clicked): Makes Edit
-	categories dialog non-modal.
-	Fixes Bug #241219
-
-2005-08-22  Sushma Rai  <rsushma@novell.com>
-
-	* tools/evolution-addressbook-export-list-cards.c
-	enum _EContactFieldCSV: Handling four e-mail ids.
-	enum _EContactCSVFieldData: Similar.
-	set_pre_defined_field: Similar.
-	Fixes the crash which was happening because list of email ids for a
-	contact was handled as a one email id value. Fixes #269870
-
-2005-08-22  Sushma Rai <rsushma@novell.com>
-
-	*  gui/contact-list-editor/e-contact-list-editor.c (remove_entry_cb):
-	Changes contact-list-editor so that multiple items can be selected and
-	removed at once. Fixes #235038. 
-	Patch submitted by "sean.gao@sun.com (Sean Gao)" and patch was
-	corected by "Devashish Sharma <sdevashish@novell.com>"
-
-2005-08-22  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/widgets/eab-contact-compare.c (match_email_hostname): This
-	function was never returning true and the comparison was also not
-	proper. Fixed this.
-
-2005-08-17  Devashish Sharma <sdevashish@novell.com>
-
-	*  gui/merging/eab-contact-compare.c (use_common_book_cb): When
-	adding/modifying a contact list there is no need to check if the emails
-	in the list are there in existing contact lists or contacts. Also there
-	is no need for comparing EContactName in case of contact list. Added a 
-	condition to check this.
-	(eab_contact_compare): Added a check to skip email comparison in case
-	of contact list.
-	Fixes #312554.
-
-2005-08-17  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/merging/eab-contact-compare.c (eab_contact_compare): Add an email
-	which is not there in any contact to a contact list, now if you want
-	to add a contact with that email id it gives you duplicate detected. So
-	while checking for duplicates when adding a new contact emails should
-	not be compared with existing contact lists email.
-
-2005-08-17  Devashish Sharma <sdevashish@novell.com>
-
-	*  gui/merging/eab-contact-merging.c (response): If the Duplicate
-	Contact Detected Dialog is closed by clicking the cross on the dialog
-	window the contact-list-editor or contact-editor dialog become unusable
-	and cant be closed. Added a case for catching GTK_RESPONSE_DELETE_EVENT.
-
-2005-08-17  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/merging/eab-contact-duplicate-detected.glade: In case of a 
-	duplicate contact list if the list is big the Cancel and Add buttons of
-	the Duplicate Contact Detected Dialog were going out of the screen 
-	scope. Added a scrollbar to the Dialog to fix this problem.
-
-2005-08-17  Tor Lillqvist  <tml@novell.com>
-
-	* gui/widgets/Makefile.am (libeabwidgets_la_SOURCES): Add
-	eab-popup.c back which apparently was accidentally removed.
-
-2005-08-15  Christian Kellner  <gicmo@gnome.org>
-
-	* gui/widgets/Makefile.am: Install missing e-plugin header
-	eab-config.h, eab-menu.h and eab-popup.h. Fixes bug: #313585.
-
-2005-08-13  Sushma Rai  <rsushma@novell.com>
-
-	* gui/component/addressbook-config.c (do_ldap_root_dse_query): Checking
-	for naming context value.
-
-2005-08-10  Tor Lillqvist  <tml@novell.com>
-
-	* importers/Makefile.am: Use privsolib instead of privlib (no
-	difference on Unix, on Win32 privsolib means lib). Use
-	NO_UNDEFINED. Link with libeabutil.la.
-
-2005-08-05  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/eab-contact-display.c (render_contact): Using 
-	gtk_html_stream_printf() with format specifier. Vulnerability patch
-	submitted by "Sitic Vulnerability Advisory <sitic@pts.se>"
-
-2005-08-05  Sushma Rai  <rsushma@novell.com>
-
-	* importers/evolution-ldif-importer.c (ldif_import): Initialize gci->size to
-	the file size, which is used for indicationg the import progress. Fixes the
-	crash due to devide by zero, while importing more than fifty contacts.
-
-2005-08-03  Jules Colding  <colding@omesc.com>
-
-	* gui/component/addressbook-view.c: Added forward references to functions that were
-	used before being defined.
-
-2005-08-03  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/eab-gui-util.c (eab_transfer_contacts): Initialize the
-	flag status to FALSE.
-	(got_book_cb): Set status to TRUE on loading the address book.
-	(contact_added_cb): Set status to FALSE on error or cancel operation.
-	Set status to true on success. Call process_unref always.
-	(delete_contacts): Delete the contacts only on success.
-	Fixes #311133, #273716.	
-
-2005-08-03  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/widgets/eab-gui-util.c (eab_load_error_dialog): Made the error dialog
-	for load-error nonmodal, since it blocks the UI along with popup menu.
-
-	* gui/component/addressbook-view.c (load_uri_for_selection) 
-	(primary_source_selection_changed_callback) (addressbook_view_init):
-	Checks whether 	the book is already selected. If so it doesn't reselect 
-	it on a right-click. Fixes the bug #309247
-
-2005-08-03  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* addressbook.error.xml: Marked string for translation
-	and removed trailing space. Fixes bug #254923 again.
-
-2005-08-01  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/contact-editor/eab-editor.c (sensitize_ok): fixes the behaviour 
-	of OK button. OK is not enabled until both Full name and File Under are
-	specified. Fixes #258257.
-
-2005-07-29  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/contact-editor/eab-editor.c: (eab_editor_prompt_to_save_changes)
-	(eab_editor_request_close_all) Fixes the bug #309416
-
-2005-07-29  Srinivasa Ragavan <sragavan@novell.com>
-
-	* tools/evolution-addressbook-export-list-cards.c: (output_n_cards_file)
-	Fixes the bug #269870. Commiting Michael Meeks patch.
-
-2005-07-29  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c: (extract_simple_field) 
-	(image_selected): Fixed in a genereic way, the resizing of contact 
-	photos.
-
-2005-07-26  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/component/Makefile.am: fix make distcheck issues.
-	* gui/component/addressbook-config.c: remove duplicate
-	 inclusion of header
-
-2005-07-25  Srinivasa Ragavan <sragavam@novell.com>
-
-	* addressbook.error.xml: Added a string for resize popup
-	* gui/contact-editor/e-contact-editor.c: (image_selected) Added
-	code to check the size of image and prompt for resize.
-
-2005-07-25  Arunprakash <arunp@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (file_as_entry_changed)
-	(fill_in_simple) : Modified the way of constructing the title
-	for the contact editor to facilitate proper translation.
-
-2005-07-22  Sushma Rai  <rsushma@novell.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Using 
-	autocompletion stock icon instead of contacts icon, for 
-	autocompletion. Fixes #257329.	
-
-2005-07-22  Arunprakash <arunp@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (name_entry_changed): Modified
-	to reset the title of the contact editor when the name is deleted
-	completely.
-	(file_as_entry_changed) : Modified to update the title with the new
-	file_as name.
-	(fill_in_simple) : Modified to set the title initially with the file_as
-	name. Fixes #235830.
-
-2005-07-21  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/e-addressbook-view.[ch] (eab_view_delete_selection):
-	Prompt for confirmation only while deleting the contact, and not for
-	cut operation.
-	(delete)(eab_view_cut): Using the flag to inidicate delete/cut.
-
-	* addressbook/gui/component/addressbook-view.c (delete_contact_cb):
-	Similar. Fixes #311090
-
-2005-07-19  Arunprakash <arunp@novell.com>
-
-	* gui/widgets/eab-gui-util.c: Added two new entries in array 
-	status_to_string for two left out values of EBookStatus. Fixes #310343.
-	(eab_error_dialog): Marked status_str for translation.
-
-2005-07-15  Sushma Rai  <rsushma@novell.com>
-
-	* gui/component/addressbook-migrate.c (migrate_contacts): unref query.
-	(migrate_contact_lists_for_local_folders): Similar.
-	(migrate_company_phone_for_local_folders): Similar. 
-
-	* util/eab-book-util.c: using e_book_query_unref instead of 
-	g_object_unref.
-
-2005-07-13  Sushma Rai  <rsushma@novell.com>
-
-	* addressbook/importers/evolution-vcard-importer.c (vcard_supported):
-	Return false in the source URI does not start with "file://".
-
-	* addressbook/importers/evolution-ldif-importer.c 
-	(ldif_import_contacts): Using the proper file pointer.
-	(ldif_supported): Return false in the source URI does not start with 
-	"file://".
-	(ldif_import_done): Close the file opened.
-	(ldif_import): Opening the proper file.
-
-2005-07-09  Veerapuram Varadhan <vvaradhan@novell.com>
-	
-	* gui/component/addressbook-component.c: (impl_createControls):
-	* gui/component/addressbook-view.[c,h]: (addressbook_view_edit_contact):
-	(impl_handleURI): Handle contacts:// uris.
-	
-2005-07-08  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/eab-gui-util.c (eab_load_error_dialog): Including the
-	file path in the error string. Fixes #309624
-
-2005-07-07  Frederic Crozat  <fcrozat@mandriva.com>
-
-	* gui/component/addressbook-component.c: (ensure_sources):
-	* gui/component/addressbook-migrate.c: (create_groups):
-	Enable autocompletion on personal addressbook when creating it
-	(Mandriva bug #16427).
-
-2005-07-06  Vivek Jain <jvivek@novell.com>
-	
-	* gui/component/addressbook-view.c: (popup_event_callback)
-	* gui/widget/e-addressbook-view.c :(do_popup_menu)
-	added comments about the hookpoints
-
-2005-07-06  Srinivasa Ragavan <sragavan@novell.com>
-	* gui/widgets/eab-gui-util.c: (contact_added_cb): Fixed for bug 
-	309245.
-	* /gui/widgets/e-addressbook-view.c:  Fixes the bug 206774, 242154.
-	* gui/widgets/eab-popup.c: (eab_popup_target_new_select)  Fixes the
-	bug 206774, 242154.
-	* gui/widgets/eab-popup.h: Fixes the bug 206774, 242154.
-
-2005-07-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (SUBDIRS): build importers before the gui code.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	link to importer plugin builtins.
-
-	* importers/Makefile.am: just build a shared library with all the
-	importers in it, we dont install a plugin, it is just linked to
-	the main app for simplicity.
-
-	* importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in: 
-	* importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
-	removed.
-
-	* importers/evolution-vcard-importer.c: ported
-	to eimport, simplified some logic (why test extensions and then test
-	file content anyway), fixed some memory leaks, etc.
-
-	* importers/evolution-ldif-importer.c (ldif_import): remove
-	progress dialog stuff, move to update e-import api.
-
-2005-07-01  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_init): hookup the builtin importer
-	'plugins'.
-
-	* importers/*: fix for importers->eplugin, also added a
-	window/progress dialog and cancel button.
-
-2005-06-25  Harish Krishnaswamy <kharish@novell.com>
-
-	* gui/contact-list-editor/Makefile.am: The previous commit breaks
-	the build by introducing a circular dependancy. Revert the
-	changes.
-	
-2005-06-25  Sushma Rai  <rsushma@novell.com>
-
-	* gui/component/addressbook-migrate.c (migrate_contacts): Setting 
-	TYPE=OTHER default parameter to email attribute. Fixes #240756.
-
-2005-06-25  Sushma Rai  <rsushma@novell.com>
-
-	* gui/contact-list-editor/Makefile.am: Linking to 
-	libevolution-addressbook.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* gui/component/Makefile.am
-	* gui/contact-editor/Makefile.am
-	* gui/contact-list-editor/Makefile.am
-	* gui/merging/Makefile.am
-	* gui/search/Makefile.am
-	* gui/widgets/Makefile.am: Prune unnecessary and nonexistent
-	directories from the -I options. Prune pathname macros not used in
-	the sources in that directory from the -D options.
-
-	* gui/component/Makefile.am
-	* gui/contact-editor/Makefile.am
-	* gui/contact-list-editor/Makefile.am
-	* util/Makefile.am: Use NO_UNDEFINED. Link with all necessary
-	libraries.
-
-	* gui/component/Makefile.am: Use Win32-specific hack to work
-	around MSYS feature in the gconftool invocation.
-
-	* gui/contact-editor/Makefile.am
-	* gui/contact-list-editor/Makefile.am: Use bootstrap library
-	libevolution-addressbook on Win32.
-
-	* gui/contact-editor/Makefile.am
-	* gui/contact-list-editor/Makefile.am
-	* util/Makefile.am: Use privsolib_LTLIBRARIES instead of
-	privlib_LTLIBRARIES (see ../ChangeLog).
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in
-	* importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
-	* importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in: 
-	Use SOEXT.
-
-2005-06-09  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/e-addressbook-view.c: 
-	Patch submitted by Hans Petter Jansson  <hpj@novell.com>, for
-	Removing the references to the old wombat master category list, 
-	replacing them with e-categories from libedataserver.
-
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* moved e-error to e-util
-
-	* Makefile.am: renamed error xml file & u18n stuff.
-
-2005-05-16  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/components/GNOME_Evolution_Addressbook.server.in.in: Added tooltips
-	
-2005-05-12  Ulrich Neumann  <uli@myuli.com>
- 
- 	* gui/contact-editor/contact-editor.glade:
-	Fixed wrong xalign of Zip/Postal Code. This
- 	was very ugly in languages like german, dutch etc.
- 
-2005-05-11  Srinivasa Ragavan <sragavan@novell.com>
-	* gui/widgets//e-minicard.c: (add_field), (remodel):
-	Fixed the bug 209416. It shows a different view for contact lists
-	
-	
-2005-05-09  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/eab-gui-util.c (eab_contact_save)(eab_contact_list_save):
-	Finding if multiple contacts or a single contact has been selected for
-	saving, and storing it in SaveAsInfo structure.
-	(save_it): Depending on selected contacts, forming a part of error
-	message. 
-
-	* addressbook-errors.xml: Changed the save-error message, to read
-	string contact/contacts.
-	Fixes #261969.
-
-2005-05-09  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/e-addressbook-view.c (eab_view_delete_selection): Checking
-	if single or multiple contacts/contact lists are being deleted. Also
-	finding the name, if the single contact/contact list is being deleted. 
-
-	* gui/contact-editor/eab-editor.c (eab_editor_confirm_delete): Forming
-	the display messages based on the contact/contact list and number of
-	contacts/contact lists being deleted. 
-	Fixes #222599
-
-2005-05-06  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	Fixes #301459
-	* gui/contact-list-editor/contact-list-editor.glade: Corrected 
-	the spelling for addresses and address.
-
-2005-05-06  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #272464
-	* addressbook-errors.xml:
-	* addressbook-errors.xml.h: Changed the primary and secondary
-	to make it more clear.
-
-2005-04-28  Ross Burton  <ross@burtonini.com>
-
-	* gui/widgets/e-addressbook-view.c:
-	* gui/widgets/eab-contact-display.c:
-	Fix some memory leaks.
-
-2005-04-21  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* gui/widgets/e-minicard-view-widget.c:
-	(e_minicard_view_widget_class_init),
-	(e_minicard_view_widget_real_focus_in_event):
-	Add focus_in_event function.
-
-	Fixes #300968 (gnome bugzilla bugID)
-
-2005-04-17  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* gui/widgets/e-minicard.c: (e_minicard_event):
-	We should incarnate the reflow item if it doesn't exist.
-
-	Fixes #300970 (gnome bugzilla bugID)
-
-2005-04-04  Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * gui/component/addressbook.c (load_source_auth_cb)
-        (addressbook_authenticate) : get the uri from Ebook
-       instead of Esource. e_source_get_uri returns NULL when
-       it does not have a reference to source group with it
-       which happens when the source list from which this source
-       was taken is destroyed but Ebook has reference to that source.
-       e_book_get_uri returns the same uri and it will be always present
-       Fixes #73330
-
-2005-04-03  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/eab-gui-util.c (do_copy) :
-	use eab_merging_book_add_contact instead of 
-	e_book_async_add_contact to take care of duplicate
-	checking 
-	Fixes #74255
-
-2005-03-16  Li Yuan  <li.yuan@sun.com>
-
-	* gui/widgets/gal-view-minicard.c: (gal_view_minicard_class_init):
-	remove the edit function.
-
-	Fixes #40762
-
-2005-03-16  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* gui/widgets/e-addressbook-view.c: (search_menu_activated):
-	make the search field consistent with the Search Dialog.
-
-	Fixes #73270
-
-
-2005-03-03   Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/component/addressbook.c (load_source_auth_cb):
-	Make sure LoadSourceData has call back installed
-	before calling it. cb is NULL when called from 
-	auth_required_cb 
-	Fixes #73206 
-	
-2005-02-26   Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/e-addressbook-view.c :
-	Change the e-popup item type for "Cut"
-	from E_POPUP_BAR to E_POPUP_ITEM
-	
-	Fixes #73013
-
-2005-02-25   Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/conact-editor/eab-editor.c 
-	(eab_editor_prompt_to_save_changes) : Just close 
-	the editor when user presees cancel or closes the editor
-	when there are no changes. Seems to be broken 
-	by earlier Change for #70371
-
-	Fixes #73005
-	 
-
-2005-02-24  Sushma Rai  <rsushma@novell.com>
-
-	* gui/component/addressbook-config.c (addressbook_config_edit_source):
-	Removed the hack, setting absolute URI to NULL. Fixes #72715
-
-2005-02-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/component/addressbook-view.c:
-	* gui/component/addressbook.c: Include
-	<libedataserverui/e-passwords.h>.
-
-2005-02-19  Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * gui/contact-editor/eab-editor.c
-       (eab_editor_prompt_to_save_changes) : close
-       the editor here in case of save and discard
-       so that callers need not worry about closing
-
-       * gui/contact-list-editor/e-contact-list-editor.c
-       (closed_cb) (app_delete_event_cb) : don't close
-       the editor here as that is handled by _save_changes
-       call. Also no need to check for return value of that
-       function as it does not matter here.
-
-       Fixes #70371
-
-2005-02-19  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/component/addressbook-component.c 
-	(ensure_sources) : update the base uri 
-	of the "On This Computer" group when user home dir 
-	changes. Also unref personal source if created here.
-
-	Fixes #67724  
-	
-2005-02-09  Sivaiah Nallagatla <snallagatla@novell.com>
-                                                                                
-        * gui/component/addressbook-config.c
-        (eabc_details_limit) : connect to "value_changed"
-        signal of spin button instead of "changed"
-                                                                                
-        Fixes #72369
-
-2005-02-09  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/contact-editor/Makefile.am:
-	* gui/contact-list-editor/Makefile.am:
-	* util/Makefile.am: Install shared libraries to privlibdir.
-
-2005-02-08  Christophe Fergeau <teuf@users.sourceforge.net>
-
-	* importers/evolution-vcard-importer.c (has_bom)
-	(fix_utf16_endianness) (utf16_to_utf8) 
-	guess_vcard_encoding) : New functions which peeks at 
-	the conents of the file and guesses the encoding and 
-	to convert UTF-16 strings to UTF-8.
-	(load_file_fn) : check the encoding of the file
-	and convert UTF-16 and locale encoding to UTF-8
-
-	Fixes #54825 
-
-2005-02-07  JP Rosevear  <jpr@novell.com>
-
-	* gui/component/apps_evolution_addressbook.schemas.in.in: clean up
-	descriptions
-
-2005-01-06  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* e-minicard.c (remodel) : changed the loop
-	termination check to E_CONACT_LAST_SIMPLE_STRING -1
-	so that we will avoid displaying revision field
-	value in the minicard 
-
-2005-01-04 vivek jain <jvivek@novell.com>
-	
-	* gui/component/addressbook.c (load_source_auth_cb):
-	display a warning dialog if the server version is not proper
-
-	* addressbook-errors.xml: added warning message for
-	 invalid server version
-
-2004-02-02  Hans Petter Jansson  <hpj@ximian.com>
-
-       * gui/component/addressbook-component.c (ensure_sources): Implement
-       based on the create_groups () function in addressbook-migrate.c.
-       (addressbook_component_init): Call ensure_sources (). This will create
-       the necessary addressbook source groups if they somehow disappeared
-       from GConf.
-
-       * gui/component/addressbook-config.c (addressbook_config_edit_source):
-       If we can't get any source groups, just issue a console warning and
-       return NULL. Creating sources without groups is meaningless.
-	Work around for #67411
-
-2005-02-02  Rodney Dawes  <dobey@novell.com>
-
-	* gui/component/ldap-config.glade: Fix a small spacing issue in the
-	Display section's children, to be HIG compliant
-
-2005-01-31  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/widgets/eab-config.c (_EABConfigPrivate): Use guint instead of
-	ulong for signal ID.
-
-2004-01-29 Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* addressbook/gui/contact-list-editor/e-contact-list-editor.c
-	 (save_contact) : call the eab_merging_* functions instead of
-	 e_book_sync* directly. The merging function check for duplication. 
-	 The following functions have been called:
-	 1. eab_merging_book_add_contact for adding a new entry
-	 2. eab_merging_book_commit_contact for commiting a modified entry
-	
-	 Fixes bug #57819
-
-2005-01-29  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c 
-	(sensitize_im_types) : new function to sensitize
-	im types based on supported fields
-	
-	(sensitize_im_record) : call sensitize_im_types
-	for each record 
-	(sensitize_im) : if none of the im types 
-	are supported disable the im entries 
-	Fixes #68799
-
-2005-01-28  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/eab-vcard-control.c (pstream_load) :
-	Changed a string to make it complete and clear
-	for transaltion 
-	Fixes #61067 
-
-2005-01-26  Sivaiah Nallagatla <snallagatla@novell.com>
-                                                                                                                             
-        * gui/component/addressbook.c (addressbook_authenticate) :
-        Remove leading "%s" from the transalatable string
-        Fixes #36137
-
-2005-01-26  Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * util/eab-book-util.c (strstrcase) :
-       case insesitive version of strstr. Used
-       from camel
-
-       (eab_contact_list_from_string) : do case in sensitive
-       search for "BEGIN:VCARD" and "END:VCARD" to
-       take care of broken vcards
-
-       Fixes #70339
-
-
-2005-01-26 Hao Sheng  <hao.sheng@sun.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	(setup_name_selector): add access key to 'Member' Button.
-
-2005-01-25  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked): use the
-	new ECategoriesDialog widget.
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #70622
-	
-	* gui/widgets/eab-contact-display.c (eab_contact_display_init):
-	construct the html widget
-
-2005-01-21 Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * gui/widgets/e-addressbook-model.[ch]
-       (eab_model_class_init) : renamed the signal
-       CONTACT_REMOVED to CONTACTS_REMOVED and chaned
-       the param type POINTER from INT
-       (remove_contact) : delete all the contacts
-       from the model and emit CONATCTS_REMOVED
-       signal instead of emitting it many times
-
-       * gui/widgets/e-addressbook-reflow-adpater.c
-       (e_addressbook_reflow_adapter_construct)
-       (remove_contacts) : renamed remove_contact to remove_contacts
-       and when number of conacts is more than 1 use _model_changed
-       instead of _remove_item
-
-       * gui/widgets/e-addressbook-table-adapter.c
-       (eab_table_adapter_construct)
-       (remove_contacts) : ditto
-
-       * gui/widgets/e-addressbook-view.c
-       (eab_view_new) :
-       (contacts_removed) : renamed contact_removed
-       to contacts_removed and traverese over indices
-       to find displayed contact indiex
-
-       fixes #71448
-
-2005-01-21  Rodney Dawes  <dobey@novell.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (build_quick_add_dialog):
-	Change the xpad and ypad to 0 here, we don't need the extra padding
-	Add the GTK_DIALOG_NO_SEPARATOR flag for creating the dialog
-	Set proper border widths on some dialog containers for the HIG
-	Set the row/column spacings for the table widget
-	Create the labels outside of the table packing calls and set the proper
-	alignment for them to be HIG compliant
-	Set the border width of the table widget to 12 for HIG compliance
-	
-	* gui/widgets/eab-popup-control.c (edit_contact_info_cb): Removed
-	(eab_popup_control_display_contact): Just go ahead and open the
-	editor, no need to have an intermittent window with a button for it
-	(add_contacts_cb): Remove this as we don't need it any more
-	(eab_popup_control_no_matches): Just go straight to the quick-add
-	dialog, and don't pop up an intermittent window with a button
-
-	Fixes #41210 #60852 
-
-2005-01-21  Rodney Dawes  <dobey@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Call gtk_widget_ensure_style to ensure that we set the border widths
-	of some dialog containers properly for HIG compliance
-
-2005-01-21  Rodney Dawes  <dobey@novell.com>
-
-	* gui/merging/eab-contact-duplicate-detected.glade:
-	Fix some spacing and remove the separator for HIG compliance
-	* gui/merging/eab-contact-merging.c (match_query_callback): 
-	Set proper border widths on some dialog containers for the HIG
-
-	Fixes #41228
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-	
-	Fixes #46404	
-	
-	* gui/widgets/e-addressbook-view.c (eab_view_print): just show the
-	dialog, not show all (margin settings aren't supposed to be used);
-	use e_print to get the dialog
-	(eab_view_print_preview): use e_print config for previewing
-
-	* printing/e-contact-print.c (e_contact_print_preview): get the
-	e_print config for previewing
-	(e_contact_print_contact_dialog_new): use e_print to get the
-	print dialog
-
-	* printing/e-contact-print-envelope.c
-	(e_contact_print_envelope_dialog_new): use e_print to get the
-	print dialog
-
-2005-01-21  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name)
-	(quick_add_set_email): Don't set properties on the contact immediately.
-	(clicked_cb): Set the properties on the contact immediately before
-	passing it on. This way, the FULL_NAME will only be set once, and so
-	the FILE_AS field will be updated here.
-
-2005-01-21 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/component/addressbook-config.c 
-	(eabc_commit) : in case of new book
-	set the uid of the source as the relative 
-	uri. 
-
-2005-01-19  Hao Sheng <hao.sheng@sun.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	add accessable key to the contact editor UI.
-	* gui/contact-list-editor/contact-list-editor.glade:
-	add accessable key to the contact list editor UI.
-
-2005-01-18  Hao Sheng <hao.sheng@sun.com>
-
-	* gui/component/addressbook-view.c:
-	(addressbook_view_init): add a11y name for the contact's
-	treeview.
-
-2005-01-18 Hao Sheng <hao.sheng@sun.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	add a11y names for widgets named "Image","Anniversary" and "Birthday".
-	* gui/contact-editor/e-contact-editor.c:
-	(e_contact_editor_create_date): add string1 as entry's a11y name.
-
-2005-01-17 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c 
-	(fill_in_email_record) : show "other" when email 
-	does not carry "TYPE"
-	(fill_in_email) : pass deafult email 
-	types instead of -1 when clearing fields 
-	
-	Fixes #70922 
-	
-2005-01-17 Hao Sheng  <hao.sheng@sun.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	add the a11y name for arrow-button named "Telephone".
-
-2005-01-12  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61973
-	
-	* gui/widgets/e-addressbook-view.etspec: add translator comment for TTYTDD 
-
-2005-01-11  Not Zed  <NotZed@Ximian.com>
-
-	* util/eab-book-util.c (eab_name_and_email_query): cast length
-	specifier to int.
-
-2005-01-10  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_activate_editor): When spawning
-	an editor, set the initial editability from the target book, not from
-	the minicard's own (usually stale, useless) editable state.
-
-2005-01-06  JP Rosevear  <jpr@novell.com>
-
-	* gui/component/Makefile.am: install schemas properly
-
-2004-12-21  Andre Klapper <a9016009@gmx.de>
-       
-       * tools/evolution-addressbook-export.c:
-       Fixing bug 61068 (removing a white space in a string).
-
-2004-12-23  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	Part of merge from offline branch 
-	
-	* gui/widgets/addresbook-config.c (eabc_general_offline) :
-	fix some compile warings
-	(offline_status_changed_cb) : set "0" instead of NULL
-	as e-source property when offline is not checked  
-		
-2004-11-23  Sivaiah Nallagatla <snallagatla@novell.com>
-                                          
-        Part of merge from offline brnach 
-                                                                        
-        * gui/widgets/eab-gui-util.c (eab_load_error_dialog) :
-        added message which gets prompted when user tries
-        to access a book which is not available in offline mode
-                                                                                                                             
-        * gui/component/addressbook-config.c (eabc_general_offline)
-        (offline_status_changed_cb) : added a new check box
-        to properties page to mark a book for offline usage
-                                                                                                                             
-        * gui/component/addressbook.c (load_source_cb) : do no try to
-        authenticate in case of offline mode.
-        (auth_required_cb) : new call back which gets called
-        when backend sends notification for  password to client
-	
-2004-12-23  Hans Petter Jansson  <hpj@novell.com>
-
-	This is the last we see of ESelectNames.
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
-	* gui/component/select-names/Makefile.am
-	* gui/component/select-names/e-select-names-bonobo.c
-	* gui/component/select-names/e-select-names-bonobo.h
-	* gui/component/select-names/e-select-names-completion.c
-	* gui/component/select-names/e-select-names-completion.h
-	* gui/component/select-names/e-select-names-config-keys.h
-	* gui/component/select-names/e-select-names-config.c
-	* gui/component/select-names/e-select-names-config.h
-	* gui/component/select-names/e-select-names-factory.c
-	* gui/component/select-names/e-select-names-factory.h
-	* gui/component/select-names/e-select-names-manager.c
-	* gui/component/select-names/e-select-names-manager.h
-	* gui/component/select-names/e-select-names-marshal.list
-	* gui/component/select-names/e-select-names-model.c
-	* gui/component/select-names/e-select-names-model.h
-	* gui/component/select-names/e-select-names-popup.c
-	* gui/component/select-names/e-select-names-popup.h
-	* gui/component/select-names/e-select-names-section.etspec
-	* gui/component/select-names/e-select-names-table-model.c
-	* gui/component/select-names/e-select-names-table-model.h
-	* gui/component/select-names/e-select-names-text-model.c
-	* gui/component/select-names/e-select-names-text-model.h
-	* gui/component/select-names/e-select-names.c
-	* gui/component/select-names/e-select-names.etspec
-	* gui/component/select-names/e-select-names.h
-	* gui/component/select-names/recipient.glade
-	* gui/component/select-names/select-names.glade: Begone.
-
-2004-12-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/component/Makefile.am (SUBDIRS): No more select-names.
-	(libevolution_addressbook_la_LIBADD): Remove libeselectnames.la.
-
-	* gui/component/component-factory.c (factory): Remove the select-names
-	component.
-
-	* gui/contact-list-editor/Makefile.am (IDL)
-	(IDL_GENERATED_H)
-	(selectnamesdir): No longer needed, so removed.
-
-2004-12-22  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_dispose): Unref the name selector.
-	(e_contact_list_editor_save_contact): Fix a warning.
-	(add_to_model): Take a list instead of a vector of destinations.
-	(select_names_ok_cb): Adapt to new name selector.
-	(setup_corba): Renamed to setup_name_selector () and adapted.
-	(select_cb): Adapt to new name selector.
-
-	* gui/contact-list-editor/e-contact-list-editor.h: Adapt to new
-	name selector and remove CORBA/Bonobo.
-
-	* gui/widgets/eab-popup.c (eabp_target_free)
-	(eabp_popup_target_new_select_names): #ifdef out code that
-	depended on the old name selector.
-
-2004-12-17  Not Zed  <NotZed@Ximian.com>
-
-	* util/ea-popup.c (emp_standard_menu_factory): 
-
-	* gui/component/select-names/e-select-names.c (section_right_click_cb): 
-
-	* gui/component/addressbook-view.c (popup_event_callback): 
-
-	* gui/widgets/e-addressbook-view.c (do_popup_menu): api changes.
-
-2004-12-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61975
-	
-	* gui/widgets/test-reflow.c: kill translated strings that were #if
-	0'd anyhow
-
-2004-12-21  JP Rosevear  <jpr@novell.com>
-	
-	* gui/search/e-addressbook-search-dialog.c: convert to
-	G_DEFINE_TYPE
-	
-	* gui/widgets/gal-view-factory-minicard.c: ditto
-
-	* gui/widgets/gal-view-factory-treeview.c: ditto
-
-2004-12-13  Vivek Jain <jvivek@novell.com>
-
-	* gui/component/addressbook-config.c (addressbook_config_edit_source): set the
-	window title based upon the source
-
-2004-12-08  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/component/addressbook-migrate.c
-	* gui/component/select-names/e-select-names-completion.c
-	* gui/component/select-names/e-select-names-manager.c
-	* gui/component/select-names/e-select-names-model.h
-	* gui/contact-list-editor/e-contact-list-editor.h
-	* gui/contact-list-editor/e-contact-list-model.h
-	* gui/widgets/e-minicard.c
-	* gui/widgets/eab-gui-util.c
-	* importers/evolution-ldif-importer.c
-	* importers/evolution-vcard-importer.c: Include
-	<libebook/e-destination.h> from evolution-data-server.
-	* util/Makefile.am: Remove e-destination.[ch] from here.
-	* util/e-destination.[ch]: Removed.
-
-2004-12-08  S. Caglar Onur  <caglar@uludag.org.tr>
-
-	* evolution-2.0.2/addressbook/gui/contact-editor/e-contact-editor.c
-	(get_ui_slot_param)
-	(get_attributes_named): some strcasecmp() calls changed with
-	g_ascii_strcasecmp() for Turkish character conversiton problems
-	[ http://www.i18nguy.com/unicode/turkish-i18n.html ]
-
-2004-12-06  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-config.c (eabc_general_type): set the
-	active item based on the current group.
-
-2004-12-01  Sivaiah Nallagatla <snallagatla@novell.com> 
-
-	* gui/contact-editor/e-contact-editor.c (save_contact) :
-	save the uid and set it again in the contact. Otherwise, there is
-	possibility we trying to save the contact wiht out UID, as we destory the 
-	contact and create new one when data is wrong  
-
-	 
-2004-11-28  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/contact-editor/e-contact-editor.h : Define
-	new list for storing required fields
-
-	* gui/contact-editor/e-contact-editor.c 
-	(e_contact_editor_class_init) : install new REQUIRED_FIELDS
-	property 
-	(e_contact_editor_set_property)
-	(e_contact_editor_get_property) : added handling 
-	for new RQUIRED_FIELDS_PROPERTY
-	(e_contact_editor_dispose) : unref the new 
-	required_fields member 
-	(required_fields_cb) : call back to set required fields into
-	contact editor
-	(is_non_string_field) : new method to detect
-	whether a particular field in contact is a string or not
-	(e_contact_editor_is_valid) : check for presence of 
-	all required fields
-	(save_contact) : extract all the data before 
-	calling e_contact_editor_is_valid so that
-	it can check for required fields. Clean up the contact
-	if there is an error
-	
-2004-11-27  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/e-minicard-view.c (set_empty_message):
-	Checking for the static capability "do-initial-query",
-	and setting the relevent empty addressbook message.
-
-2004-11-26  JP Rosevear  <jpr@novell.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(populate_popup_contact): get image directly from icon factory
-
-	* gui/contact-editor/e-contact-editor-im.c
-	(setup_service_optmenu): ditto
-	
-2004-11-25  Hao Sheng  <hao.sheng@sun.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	add "labelled by" between entry and label,
-	make accessbility work.
-	* gui/contact-editor/e-contact-editor.c:
-	(e_contact_editor_create_web): add accessible name to e_url_entry.
-
-2004-11-22  Joan Sanfeliu  <joan@fibranet.com>
-
-	* gui/component/apps_evolution_addressbook.schemas.in.in:
-	* gui/component/ldap-config.glade : Evolution product name spelled
-	with an uppercase E
-
-	Fixes #61065
-
-2004-11-22  Rodney Dawes  <dobey@novell.com>
-
-	* importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
-	Fix name attribute values to be identical
-
-	Fixes #61976
-
-2004-11-21  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* rever last commit , it is supposed to for offline 
-	branch not to HEAD 
-
-2004-11-21  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/eab-gui-util.c (eab_load_error_dialog) : 
-	added message which gets prompted when user tries 
-	to access a book which is not available in offline mode
-
-	* gui/component/addressbook-config.c (eabc_general_offline) 
-	(offline_status_changed_cb) : added a new check box
-	to properties page to mark a book for offline usage 
-
-	* gui/component/addressbook.c (load_source_cb) : do no try to
-	authenticate in case of offline mode. 
-	(auth_required_cb) : new call back which gets called
-	when backend sends notification for  password to client
-	
-2004-11-07  Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * util/eab-book-util.c (eab_name_and_email_query) :
-       When name is NULL query against complete email id instead of
-       user name part to take care of users@foo.org not matching
-       against users@bar.org . Also include query based on name always
-
-       Fix for  #67656
-
-
-2004-11-16  Not Zed  <NotZed@Ximian.com>
-
-	* util/Makefile.am (libeabutil_la_LIBADD): remove camel, add
-	ADDRESSBOOK_LIBS.
-
-	* conduit/Makefile.am (libeaddress_conduit_la_LIBADD): remove
-	camel.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	remove camel.
-
-2004-11-15  Not Zed  <NotZed@Ximian.com>
-
-	* *.c: Moved various things from e-util to libedataserver, where
-	appropriate.
-
-2004-11-08  Andre Klapper  <a901600@gmx.de>
-
-	Fixes bug #61966.
-
-	* addressbook-errors.xml: Add a missing word to a string.
-
-2004-11-08  Steven Zhang <steven.zhang@sun.com>
-
-	* gui/widgets/e-minicard.c: (e_minicard_activate_editor): 
-	rename and make it a public function.
-	(e_minicard_event): change accordingly.
-	* gui/widgets/e-minicard.h: ditto.
-
-2004-11-04  Sivaiah Nallagatla <snallagatla@novell.com>
-	
-	* gui/contact-editor/e-contact-editor.c (save_contact) :
-	populate contact only afte we are sure that data is valid 
-	and we can create that.
-	Fixes #69079
-
-2004-11-07  Rodney Dawes  <dobey@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(init_email_record_location, init_im_record_location):
-	Translate the category pretty names that we pass for creation of
-	new menu item entries for the E-Mail and IM dropdown selections
-
-	Partially fixes bug #66854
-	
-2004-11-04  mengjie yu  <meng-jie.yu@sun.com>
-
-	fix for bugzilla #44876
-
-	* gui/component/select-names/e-select-names-manager.c:
-       (e_select_names_manager_entry_new):add a atk name for the entry.
-
-2004-11-2   Hao Sheng  <hao.sheng@sun.com>
-
-	* gui/widgets/e-minicard-view.c: popup right-click menu after
-	pressing Shift+F10.
-
-2004-11-01  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/eab-gui-util.c 
-	(added_cb) (_modified_cb) : Don't show
-	error dialogs when status code is E_BOOK_ERROR_CANCELLED. We don't
-	wabt to show "Error adding contact,  Cancelled" dialogs when user 
-	cancels duplicated contact detected dialog.   	  
-	
-2004-10-27  Andre Klapper  <a9016009@gmx.de>
-
-       * tools/evolution-addressbook-export.c: 
-       Fixing a typo (bug 61069).
-
-2004-10-26  Andre Klapper <a9016009@gmx.de>
-
-	Fixes #61972.
-
-	* addressbook/gui/contact-editor/e-contact-editor-address.c:
-	Typo in country name: was "Grena-dines", now "Grenadines".
-
-2004-10-25  Nat Friedman  <nat@novell.com>
-
-	* gui/widgets/eab-contact-display.c (accum_multival_attribute):
-	Display mutlivalued contact attributes in the preview.
-	(render_contact): Render all IM fields using the new multival
-	function.
-
-2004-10-21  JP Rosevear  <jpr@novell.com>
-
-	* gui/widgets/eab-config.c (ecph_class_init): correct hook name
-	typo
-
-	* gui/component/addressbook-view.c: add appropriate popup icons
-
-2004-10-21  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_edit_source): fix a past-o for no-ldap case.
-
-2004-10-20  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_init): register config hook.
-
-	* gui/component/addressbook-config.c: mostly re-written to use econfig.
-	(query_for_supported_bases): convert to gtktreeview.
-
-	* gui/widgets/eab-config.c (ecp_set_target): hook onto source changed.
-	(ecp_source_changed): propagate changed state info.
-	(ecp_class_init): setup private data.
-
-2004-10-19  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/eab-menu.c (eabm_target_free): don't unref null
-	book.
-
-2004-10-19  JP Rosevear  <jpr@novell.com>
-
-	* gui/component/addressbook-view.c,
-	gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c, gui/widgets/eab-menu.c,
-	gui/widgets/eab-popup.c: convert to org.gnome hook names
-	
-2004-10-15 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/e-addressbook-view.c : add EAB_POPUP_SELECT_ANY
-	mask instead of EAB_POPUP_SELECT_MANY, so that 
-	all the options like Save as, Forward etc are enabled even 
-	single contact is selected. 
-
-2004-10-15 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/eab-contact-display.c : uncomment 
-	HANDLE_MAILTO_INTERNALLY define so that we will
-	launch composer through bonobo  instead of using 
-	gnome_url_show	
-	
-2004-10-15  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/eab-popup.c: added an any select mask and updated
-	the hook maps.
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_init): register the addressbook hooks.
-
-	* gui/component/addressbook-view.c (addressbook_view_init): setup
-	the menu manager.
-	(control_activate_cb): activate the menu manager.
-	(update_command_state): and update the menu manager.
-
-	* gui/widgets/eab-menu.[ch]: Added menu manager class.
-
-2004-10-13  JP Rosevear  <jpr@novell.com>
-
-	* importers/evolution-vcard-importer.c: find source selector and
-	option menu in libedataserverui
-
-	* importers/evolution-ldif-importer.c: ditto
-
-	* gui/widgets/eab-popup.c: ditto
-
-	* gui/widgets/eab-gui-util.c: ditto
-
-	* gui/contact-list-editor/e-contact-list-editor.c: ditto
-
-	* gui/contact-editor/e-contact-editor.c: ditto
-
-	* gui/component/select-names/e-select-names.h: ditto
-
-	* gui/component/autocompletion-config.c: ditto
-
-	* gui/component/addressbook-view.c: ditto
-
-2004-10-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-view.c (source_list_changed_cb): Don't
-	unref the view - removing it from the hash table will do this for us.
-	Remove from hash table after removing the notebook page.
-	(addressbook_view_init): Unref views when removed from the hash
-	table.
-
-2004-10-06  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-view.c (popup_event_callback): 
-	* gui/component/select-names/e-select-names.c (section_right_click_cb):
-	* gui/widgets/e-addressbook-view.c (do_popup_menu): fix for
-	e-popup api changes.  Moved all mask specifiers to visible rather
-	than enable in the menu table.
-
-2004-10-06  Not Zed  <NotZed@Ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: removed
-	gnome-popup-menu.h (unused).
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: 
-	* gui/widgets/eab-popup-control.c: remove e-popup-menu.h (unused).
-
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb): use e-popup.  Somewhat overengineered
-	for this use ...
-	(remove_cb): api changes.
-
-	* gui/widgets/eab-popup.c (eab_popup_target_new_select_names):
-	added pretty useless wrapper for the select names popup.  Added to
-	hook maps.
-
-2004-10-01  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (do_popup_menu): convert to
-	using EABPopup.
-	(sources): remove dead code.
-	(has_email_address_1, get_has_email_address): removed now
-	redundant code.
-	(save_as, send_as, send_to, print, copy, paste, cut, delete) 
-	(copy_to_folder, move_to_folder, new_card, new_list): new api.
-	(free_popup_info): dead.
-	(print_envelope): not pining.
-	(get_contact_list): take a popup target instead, don't ref.
-	(get_contact_list_1): not required no more.
-	(contact_and_book_free): same.
-	(delete): call eab_view_delete_selection.
-	(eab_view_delete_selection): do the actual delete here.
-
-	* gui/widgets/eab-popup.c (eab_popup_target_new_select): implement.
-
-2004-10-01  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/eab-popup.[ch]: addressbook popup driver.
-
-	* gui/component/addressbook-view.c (delete_addressbook_cb): use
-	e-error for the message prompt.  don't bother keeping it around,
-	it can never be re-sensitised anyway.
-	(book_removed): no longer destroy the original dialogue.
-
-	* addressbook-errors.xml: add ask-delete for deleting
-	addressbooks.
-
-	* gui/component/addressbook-view.c (addressbook_view_init):
-	connect to popup_event rather than fill_popup_menu now.
-	(fill_popup_menu_callback): renamed to popup_event_callback,
-	changed to use epopup.
-	(add_popup_menu_item): remove, no longer needed.
-
-2004-09-29  Not Zed  <NotZed@Ximian.com>
-
-	Fixes bug #66520.
-
-	* gui/widgets/e-addressbook-view.c (eab_view_dispose): don't unref
-	the contact_display_window, it will be destroyed by being
-	parented.
-
-2004-09-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes bug #66369.
-
-	* util/eab-book-util.c (eab_contact_list_from_string): Make the
-	vcard splitter work with any amount of blank lines between vcards.
-
-2004-09-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes bug #65537.
-
-	* gui/merging/eab-contact-compare.c (query_cb): Protect against NULL
-	UIDs, and make fewer calls to e_contact_get_const () as a bonus.
-
-2004-09-24  Hao Sheng  <hao.sheng@sun.com>
-	
-	Fix for #66523
-
-	* gui/contact-list-editor/e-contact-list-model.c:
-	(e_contact_list_model_add_email): estimate the same mail address
-	and popup a warning dialog.
-	* addressbook-errors.xml: add the question message for the warning
-	dialog.
-
-2004-09-23  Pamplona Hackers <gnome-desarrollo@es.gnome.org>
-
-	Fixes #61978
-
-	* tools/evolution-addressbook-export.c (main): use more
-	meaningful error message.
-
-2004-09-23  Fazlu & Hannah <hannah_lins@yahoo.co.in>
-
-	* tools/evolution-addressbook-export.c (main):
-	Changed the string into proper grammar 'In normal mode, there
-	should not need size option.' to 'In normal mode, there is no need
-	for the size option.'
-
-2004-09-23  JP Rosevear  <jpr@novell.com>
- 
- 	* conduit/address-conduit.c (ecard_from_remote_record): only set
- 	the file as address to the company if no full name exists
- 	(delete_record): don't bail out if the record simply isn't found
- 
- 	Fixes #59725
- 	
- 	* conduit/address-conduit.c (local_record_from_uid): remove
- 	extraneous semicolon
- 
-2004-09-21  William Jon McCann  <mccann@jhu.edu>
-
-	* gui/component/component-factory.c (factory): Quiet debug messages.
-
-	* gui/widgets/e-addressbook-view.c (eab_view_new): Remove
-	unnecessary label widget placeholder.  Make vertical scrollbar
-	policy automatic.  Use gtk_paned_add2 instead of
-	gtk_container_add.
-
-	* gui/component/apps_evolution_addressbook.schemas.in.in: Add
-	missing show_preview schema.  Add missing long descriptions.
-
-2004-09-13  Rodney Dawes  <dobey@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (show_help_cb):
-	Point at the correct XML file for documentation
-
-2004-09-13 Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * gui/contact-editor/e-contact-editor.c
-       (sensitize_address) : check for _LABEL
-       type address fields also in supported fileds
-       while sensitizing the address fields
-
-2004-09-03  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #63191
- 	
- 	* gui/contact-list-editor/contact-list-editor.glade: set the title
- 	properly
-	
-2004-09-08  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #64080.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	link addressbook to camel.
-
-2004-09-04 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/widgets/e-addressbook-view.h : add
-	new widget variable contact_dsiplay_window to _EABView strcut
-	to store. Remove unused scrolled varible
-	* gui/widgets/e-addressbook-view.c (eab_view_init)
-	(eab_view_dispose) : initialize and unref the new widget
-	added 
-	(eab_view_new) : remove the loca variable scrlled_window 
-	instead use eav->contact_display_window
-	(eab_view_show_contact_preview) : show/hide contact_display_window 
-	instead of contact_display
-	Fixes #64024 
-
-
-2004-08-27  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #62856 (workaround).
-
-	* gui/component/addressbook.c (addressbook_authenticate): add
-	online flag to password request.
-
-	** See bug #64011.
-
-	* gui/component/addressbook-view.c (edit_addressbook_cb): Remove
-	double ;; in declaration section (c99 extension).  From Vincent
-	Noel <vnoel@cox.net>.
-
-2004-08-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	Really fixes #61833 and #63697.
-
-	* gui/component/select-names/e-select-names.etspec: Fetch values from
-	column 86 (NAME_OR_ORG), instead of 2 (FILE_AS).
-
-2004-08-26  Chris Toshok  <toshok@ximian.com>
-
-	[ patch for the rest of 60889 ]
-	* gui/merging/eab-contact-merging.c (add_lookup): new function,
-	either start up the query or add it to the queue if we're over the
-	number of simultaneous queries.
-	(finished_lookup): start up enough pending queries to get us to
-	our limit again.
-	(free_lookup): free lookup->avoid.
-	(final_id_cb): call finished_lookup.
-	(eab_merging_book_add_contact): set lookup->avoid to NULL and
-	replace call to eab_contact_locate_match_full with add_lookup.
-	(eab_merging_book_commit_contact): set lookup->avoid to the
-	contact, and make the same
-	s/eab_contact_locate_match_full/add_lookup/ replacement.
-
-2004-08-26  Christian Neumair  <chris@gnome-de.org>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	Don't mark component menu accel for translation.
-
-2004-08-25  Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * gui/component/addressbook-config.c (source_to_dialog) :
-       disbale the display name widget in case of groupwise as we can not handle renames as
-       of now
-       (dialog_to_source) also copy "use_ssl" property to new source so that
-       new books also use ssl
-
-2004-08-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	May fix #61833.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Get E_CONTACT_NAME_OR_ORG (first found from File As,
-	Full Name, Organization, Email 1) for the "name" field. Hopefully
-	will prevent most cases of blank entries.
-
-2004-08-25  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* gui/component/addressbook-view.c: (delete_addressbook_cb):
-	Don't call gtk_dialog_set_has_separator on Gtk Message Dialog
-        with GTK+ >= 2.4.0.
-
-2004-08-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/component-factory.c (factory): remove the dead
-	ldap config control stuff.
-
-2004-08-20  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes bug #62715.
-
-	* gui/contact-editor/e-contact-editor.c
-	(fill_in_address_label_textview): Implement.
-	(fill_in_address_field): If structured address information is not
-	available, try putting the "label" blob in the free-form field.
-
-2004-08-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	Makes the contact image selector use GtkFileChooser if available.
-
-	* gui/contact-editor/e-contact-editor.c (image_selected_cb): Take just
-	the editor as an argument, so we can call from other places without
-	having to supply dummy args. Rename to image_selected, since it's no
-	longer strictly a callback. Include optional code to use the new
-	GtkFileChooser.
-	(image_cleared_cb): Ditto. Rename to image_cleared.
-	(file_chooser_response): Optional response handling for GtkFileChooser.
-	(image_clicked): Include optional code to use the new GtkFileChooser.
-	Move common strings to variables. For GtkFileSelection, swap callback
-	parameters for the modified image_selected () and image_cleared ().
-
-2004-08-19  Chris Toshok  <toshok@ximian.com>
-
-	[ likely fixes #61500 ]
-	* addressbook-errors.xml (remove-addressbook): remove the
-	secondary text, since we don't have the gerror text to supply it
-	anymore.
-
-	* gui/component/addressbook-view.c (book_removed): new function,
-	move the error handling here.
-	(delete_addressbook_cb): create a closure with necessary data, and
-	call the e_book_async_remove instead of e_book_remove.
-
-2004-08-18  Sivaiah Nallagatla <snallagatla@novell.com>
-	
-	* gui/component/select-names/e-select-names.c (e_select_names_init) :
-	select names dialog can not be modal as password dialogs can come up while 
-	user is in this dialog for address books which require authentication
-	like groupwise and LDAP
-	FIxes #63257 
-
-2004-08-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (app_delete_event_cb):
-	Remove the custom prompt-to-save dialogs from here - use
-	eab_prompt_save_dialog (), and then only if the contact actually
-	changed.
-
-2004-08-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-gui-util.c (eab_show_multiple_contacts):
-	reinstate the ngettext patch that was part of the #53464 commit of
-	2004-03-24 by dsegan@gmx.net.
-
-2004-08-12  Carlos Garnacho Parro  <carlosg@gnome.org>
-
-	* gui/widgets/eab-gui-util.c: Optionally use GtkFileChooser if
-	compiled against Gtk+ >= 2.4.0
-
-2004-08-10  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook.c (addressbook_authenticate): e
-	passwords api change/reprompt if we need to.
-
-2004-08-12  Sivaiah nallagatla <snallagatla@novell.com>
-
-	* gui/compoent/addressbook.c : just revering a local change 
-	gone in in the commit i just made 
-
-2004-08-12  Sivaiah Nallagatla <snallagatla@novell.com>
-	
-	* gui/component/addresbook.c (load_source_auth_cb) :
-	when user cancels auth dialog send the anonoymous query
-	only in case of ldap 
-	*gui/component/addresbook-view.c (book_open_cb) : no need to
-	display the error dialog when user cancels that
-
-2004-08-04  Rodney Dawes  <dobey@novell.com>
-
-	* gui/widgets/eab-popup-control.c: #include <gtk/gtkvbox.h>
-
-2004-08-02  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #60529.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_drop_cb): Make sure to get the text/x-vcard target.
-
-2004-08-02  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #62085.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_class_init): Set the save_contact method.
-	(e_contact_list_editor_save_contact): Implement.
-
-2004-08-02  JP Rosevear  <jpr@novell.com>
-
-	* conduit/address-conduit.c (addrconduit_load_configuration): get
-	source uid
-	(addrconduit_dupe_configuration): copy source_uid
-	(addrconduit_destroy_configuration): free source_uid
-	(e_addr_context_new): get the source list
-	(e_addr_context_destroy): unref the source list
-	(pre_sync): open the source that was set earlier
-	(fill_widgets): set the source option menu value
-	(create_settings_window): pass source list to pilot settings
-	(save_settings): save source uid
-
-	* conduit/Makefile.am: link to and include misc. widgets
-
-2004-08-02  Rodney Dawes  <dobey@novell.com>
-
-	* gui/component/ldap-config.glade: Make the main dialog here be
-	an actual GtkDialog instead of a GtkWindow
-	Fix up a few small spacing issues with the UI
-	Change "Contacts Group" to "Address Book"
-
-	* gui/component/addressbook-config.c (query_for_supported_bases):
-	Use gtk_widget_ensure_style instead of gtk_widget_realize
-	(addressbook_add_server_dialog):
-	Use gtk_widget_ensure_style on the dialog and fix the spacing and
-	border width of the dialog containers
-
-	Fixes #61365
-
-2004-07-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #61365 and other misc issues with the addressbook source
-	editors ]
-	
-	* gui/component/ldap-config.glade: change the
-	supported-bases-dialog to be initially hidden.
-
-	* gui/component/addressbook-view.c (editor_weak_notify): new
-	function, remove the editor from our hash.
-	(source_list_changed_cb): destroy the editors for given sources if
-	they're up when the source disappears.
-	(edit_addressbook_cb): add the editor (and some other misc info we
-	need) to our uid_to_editor hash so we can look it up later.  only
-	create the editor if one doesn't exist for the given source.
-	(destroy_editor): GHFunc that destroys the widgets.
-	(addressbook_view_dispose): destroy uid_to_editor.
-	(addressbook_view_init): init uid_to_editor.
-
-	* gui/component/addressbook-config.h: change return values for
-	_edit_source and _new_source - they both return GtkWidget*s now.
-
-	* gui/component/addressbook-config.c (addressbook_ldap_init):
-	attempt set the protocol version to LDAPv3.  This makes the
-	ldap_auth stuff work if the server requires v3.
-	(addressbook_root_dse_query): we don't need the separate window
-	arg, since all of this now happens *before* the supported bases
-	dialog is shown.  we just use the source dialog's window for the
-	various error dialogs.
-	(do_ldap_root_dse_query): same.
-	(query_for_supported_bases): same, and set the supported bases
-	dialog as transient-for the source dialog, and make it modal.
-	Lastly, don't make the editor modal.
-	(addressbook_config_edit_source): return the editor's window.
-	(addressbook_config_create_new_source): same.
-
-2004-07-26  JP Rosevear  <jpr@novell.com>
- 
- 	* gui/component/ldap-config.glade: change contacts group to
- 	address book
- 
- 	* gui/component/addressbook-component.c
- 	(impl__get_userCreatableItems): ditto
-	
-2004-07-19  Radek Doulik  <rodo@ximian.com>
-
-	* gui/widgets/eab-vcard-control.c (eab_vcard_control_new): but
-	buttons to button box, use vbox instead of table
-
-	* gui/widgets/eab-contact-display.c: base this widget directly on
-	gtkhtml
-
-	* gui/widgets/e-addressbook-view.c (eab_view_new): put contact
-	display in scrolled window
-
-2004-07-20  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/eab-contact-display.c: 
-	* gui/contact-editor/eab-editor.c: 
-	* gui/component/addressbook-migrate.c: include config.h #61395.
-
-2004-07-21  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #60508 ]
-	
-	* gui/component/addressbook-config.h: reorder the Scopes so that
-	they match the option menu.
-
-	* gui/component/ldap-config.glade: change the scope option menu to
-	only display One and Sub, and also set the Login field to Lo_gin
-	in both dialogs.  Add accelerators for the details page as well.
-
-2004-07-21  Rodney Dawes  <dobey@novell.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	Give a reasonable name to the widget for the _Where label
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Set the mnemonic widget for the _Where label
-
-	Fixes #61544
-
-2004-07-20  JP Rosevear  <jpr@novell.com>
-
-	* gui/component/autocompletion-config.c
-	(autocompletion_config_control_new): don't set the toggle
-	selection
-
-2004-07-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (contact_added_cb)
-	(save_contact)
-	(app_delete_event_cb): Check source book writeability directly instead
-	of relying on stored state.
-	(e_contact_editor_init): Don't init source_editable.
-	(e_contact_editor_dispose): We don't listen for source writeability
-	anymore.
-	(writable_changed): Source writeability doesn't affect widget
-	status; remove code to check for it.
-	(e_contact_editor_set_property): Do nothing if book being set is
-	the same as currently set book; previously we would end up
-	unreffing then reffing it. Don't watch for source writeability, but
-	do so for target; fixes a warning. Only call sensitize_all() if
-	writeability on target changed.
-
-	* gui/contact-editor/e-contact-editor.h (EContactEditor): We don't
-	need the source_editable and source_editable_id vars anymore.
-
-2004-07-14  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #60873, and possibly other crashes ]
-	
-	* gui/widgets/e-addressbook-model.c (get_view): don't call
-	free_data before potentially making an async call.  Or rather,
-	don't call free_data without ensure we'll be emitting
-	MODEL_CHANGED shortly after.
-
-2004-07-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/.cvsignore: ignore
-	Evolution-Addressbook-SelectNames.h.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: include our
-	local (in this directory) generated
-	Evolution-Addressbook-SelectNames.h
-
-	* gui/contact-list-editor/Makefile.am: add stuff to generate (and
-	clean up) the select names header we need to include.
-
-2004-07-13  Rodney Dawes  <dobey@novell.com>
-
-	[ fixes #56657 ]
-
-	* gui/component/addressbook-migrate.c (get_source_by_uri):
-	Replace this call with get_source_by_name ()
-	(migrate_completion_folders): Fix the non-local folder migration
-	to look up sources for the migrated folders based on name, instead
-	of using the URI
-
-2004-07-12  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #61299 ]
-
-	* gui/component/addressbook.c (addressbook_load_default_book):
-	don't pass @closure to load_source_cb, since that expects to get a
-	LoadSourceData*. also, don't always call e_book_async_open.  only
-	do that when the book is non-NULL.
-
-2004-07-12  Chris Toshok  <toshok@ximian.com>
-
-	[ part of fix for bug #56520 ]
-	
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): init allows_contact_lists to TRUE.
-	(list_deleted_cb): nuke, it's unused.
-	(e_contact_list_editor_set_property): check if the book supports
-	contact lists, and desensitize things if it doesn't.
-	(select_names_ok_cb): this isn't valid C.  declarations must come
-	before code.
-	(set_editable): the editable state of the dialog depends on
-	whether or not the backend supports contact lists.
-	(command_state_changed): the ok button needs to depend on
-	allows_contact_lists.
-	(extract_info): quiet compiler warning.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add allow_contact_lists.
-
-2004-07-08  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* gui/component/Makefile.am:
-	tarball should ship .schemas.in.in files, not generated files.
-
-	* gui/component/apps_evolution_addressbook.schemas.in.in:
-	Don't set empty default value on an int, this causes gconf warning.
-	(bug #60859)
-
-2004-09-04  Not Zed  <NotZed@Ximian.com>
-
-	* util/e-destination.c: include gnome-i18n.h since camel-object no
-	longer does(!).
-
-2004-07-02  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(command_state_changed): Set the source option menu sensitivity here.
-
-2004-06-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_dispose): disconnect source/target_editable
-	signal ids.
-	(e_contact_editor_set_property): disconnect/connect editable
-	signals.
-	(writable_changed): new function - we need this since writable
-	status is generally communicated asynchronously with the async
-	interface.
-
-	* gui/contact-editor/e-contact-editor.h (struct _EContactEditor):
-	add source/target_editable_id slots.
-
-2004-06-29  Rodney Dawes  <dobey@novell.com>
-
-	* tools/Makefile.am (bin_PROGRAMS): Change to privlibexec_PROGRAMS
-
-	Fixes #60832
-
-2004-06-28  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-component.c
-	(impl__get_userCreatableItems): fix shortcuts. #56746
-
-2004-06-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/meging/eab-contact-compare.[ch] (eab_contact_compare_file_as):
-	Implement.
-	(eab_contact_compare_name): Don't leak if only one of the strings is
-	NULL.
-	(use_common_book_cb): Include file_as in query.
-
-2004-06-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (fill_in_address_textview): Add
-	a newline between street line and rest of extended address.
-	(extract_address_textview): Omit the newline trailing the street line.
-
-2004-06-24  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (address_labels): Add table.
-	(append_to_address_label): Implement.
-	(set_address_label): Implement.
-	(extract_address_record): Set the address label fields.
-
-2004-06-24  Hans Petter Jansson  <hpj@ximian.com>
-
-	* util/eab-book-util.c (eab_contact_list_from_string): Don't accept
-	input that doesn't have at least a "BEGIN:VCARD" in it.
-
-2004-06-24  Radek Doulik  <rodo@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_get_textification): do not limit the text
-	len to 2047 characters
-
-	See bug #60366
-
-2004-06-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Set window to be invisible
-	initially.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init): Set
-	the type hint to "normal", and show the window after init.
-
-2004-06-23  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/eab-gui-util.c
-	(eab_send_contact_list_as_attachment): use memcpy not strcpy to
-	copy to memory buffer.  Fixes a UMW.  See #60532.
-
-2004-06-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-view.c: Add an x-source-vcard target entry
-	that includes the source book URI.
-	(destroy_merge_context): Implement.
-	(removed_contact_cb): Implement.
-	(merged_contact_cb): Implement.
-	(selector_tree_drag_data_received): Get the source and target books,
-	and see if we need to remove contacts from source after they're added
-	to target. Copy contacts sequentially, not in parallel, with a
-	callback.
-
-	* gui/widgets/e-addressbook-view.c: Add an x-source-vcard target entry
-	that includes the source book URI.
-	(table_drag_data_delete): Remove. This is handled by the drag target.
-	(table_drag_data_get): Handle more than one contact. Supply source.
-	(create_table_view): Don't connect to the delete signal.
-
-	* gui/widgets/e-minicard-view.c: Add an x-source-vcard target entry
-	that includes the source book URI.
-	(e_minicard_view_drag_data_delete): Remove. This is handled by the
-	drag target.
-	(e_minicard_view_drag_data_get): Handle x-source-vcard target.
-	(e_minicard_view_drag_begin): Don't connect to the delete signal.
-	(e_minicard_view_dispose): Don't disconnect from the delete signal.
-	(e_minicard_view_init): Don't init delete_id.
-
-	* gui/widgets/e-minicard-view.h: Remove delete_id from struct.
-
-	* util/eab-book-util.[ch] (eab_contact_list_from_string): Skip the
-	source URI if present.
-	(eab_book_and_contact_list_from_string): Create the source book from
-	the provided URI, if present.
-	(eab_book_and_contact_list_to_string): Include the book URI in
-	generated string.
-
-2004-06-23  Rodney Dawes  <dobey@novell.com>
-
-	* gui/component/select-names/select-names.glade:
-	Move the search bar to the top and add a label _Search so that the
-	entry has a mnemonic for keyboard accessibility
-
-	Fixes #52914 and #58448
-
-2004-06-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Name the labels.
-
-	* gui/contact-editor/e-contact-editor.c (sensitize_email_record)
-	(sensitize_phone_record)
-	(sensitize_im_record)
-	(sensitize_address_textview)
-	(sensitize_address_field)
-	(simple_field_map)
-	(sensitize_simple_field): Make entries uneditable and labels
-	insensitive, if field is disabled or read-only.
-
-2004-06-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #59622.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_init): Clear drag_list
-	and canvas_drag_data_delete_id.
-	(e_minicard_view_dispose): Clear drag_list. Disconnect drag_data_delete
-	signal if connected.
-	(e_minicard_view_drag_begin): Set up drag_data_delete signal if
-	necessary. Clear old data before drag starts.
-	(clear_drag_data): Implement.
-	(e_minicard_view_drag_data_delete): Implement.
-	(e_minicard_view_drag_data_get): Don't clear drag_list here.
-
-2004-06-22  Chris Toshok  <toshok@ximian.com>
-
-	[ should fix #60495, #58635 ]
-	* gui/widgets/eab-popup-control.c (name_only_query_cb): don't free
-	the list of contacts - libebook still owns it.
-	(query_cb): same.
-
-2004-06-22  Larry Ewing  <lewing@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (add_email_cb):
-	don't set the changed flag unless we actually add something.
-
-2004-06-21  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Make the scrolled
-	windows around text views use GTK_SHADOW_IN, for consistency with
-	the GtkEntries.
-
-2004-06-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/ldap-config.glade: remove the auth-entry-notebook
-	in the edit dialog, and rename the auth entry to... auth-entry.
-
-	* gui/component/addressbook-config.c (source_to_dialog_new): nuke
-	- it's identical to source_to_dialog.
-	(dialog_to_source): we only have one auth entry now.  fill it in
-	properly.
-	(source_to_dialog): fill in the auth entry properly based on the
-	auth type, and remove auth_entry_notebook references.
-	(auth_optionmenu_activated): remove auth_entry_notebook
-	references.
-	(setup_general_tab): same, and use auth-entry instead of
-	email-entry/dn-entry.
-	(general_tab_check): use auth_principle instead of email/binddn.
-	(add_folder_modify): same.
-	(addressbook_add_server_dialog): put setup_connecting_tab inside
-	the ifdef HAVE_LDAP, and call source_to_dialog instead of
-	source_to_dialog_new.
-	(addressbook_config_edit_source): always call setup_general_tab.
-
-	* gui/component/addressbook-config.h (AddressbookLDAPScopeType):
-	reorder to match order in option menu (we should really remove
-	BASE altogether.. it's useless for searching.)
-
-	* gui/component/addressbook-view.c (update_command_state):
-	macroize this, annoying seeing the same 4 lines repeated 15 times.
-
-2004-06-21  Jeffrey Stedfast  <fejj@novell.com>
-
-	* conduit/address-conduit.c (local_record_from_uid): Make sure the
-	UIDs match. Should fix bug #59725.
-
-2004-06-19 Sivaiah Nallagatla <snallagatla@novell.com>
-
-       * gui/component/addressbook-config.c (dialog_to_source) : 
-       set auth-domain property on groupwise sources, so that 
-       newly created contact groups can share remembered passwords 
-
-2004-06-18  Jeffrey Stedfast  <fejj@novell.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): Always set
-	the File_As attribute in case the pilot attrib changed. Fixes bug
-	#59723.
-
-2004-06-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_load_contacts): only go through the process
-	of creating/loading the EBook if the model has some data in it.
-
-2004-06-18  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #59376 ]
-
-	* gui/component/addressbook-view.c (fill_popup_menu_callback):
-	make this work with absolute uris in sources.  Thanks to Sushma
-	Rai for the initial patch to fix this.
-
-2004-06-17  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #58696 ]
-	
-	* gui/widgets/eab-gui-util.c (eab_transfer_contacts): use
-	addressbook_load instead of e_book_async_open, so we do auth stuff
-	for the destination book.
-
-2004-06-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_new):
-	EBookFieldsCallback -> EBookEListCallback.
-	(e_contact_editor_set_property): same.
-
-2004-06-17  Chris Toshok  <toshok@ximian.com>
-
-	* util/eab-book-util.c (eab_name_and_email_query):
-	EBookContactsCallback -> EBookListCallback.
-	(eab_nickname_query): same.
-
-	* printing/e-contact-print.c: e-book-async.h -> e-book.h
-
-	* gui/widgets/eab-vcard-control.c: e-book-async.h -> e-book.h.
-
-	* gui/widgets/e-addressbook-model.h: e-book-async.h -> e-book.h.
-
-	* gui/widgets/eab-popup-control.h: e-book-async.h -> e-book.h.
-
-	* gui/widgets/eab-popup-control.c: remove e-book-async.h include.
-	
-	* gui/merging/eab-contact-merging.h: e-book-async.h -> e-book.h.
-
-	* gui/contact-editor/e-contact-editor.h: e-book-async.h ->
-	e-book.h.
-
-	* gui/contact-editor/e-contact-editor.h: same.
-
-	* gui/contact-list-editor/e-contact-list-editor.h: same.
-	
-	* gui/contact-list-editor/e-contact-list-model.h: remove include
-	of e-book-async.h
-	
-	* gui/component/select-names/e-select-names-completion.h: include
-	e-book.h, not e-book-async.h
-	
-	* gui/component/select-names/e-select-names-model.c: same.
-
-	* gui/component/select-names/e-select-names.c: same.
-
-	* gui/component/addressbook-migrate.c: include e-book.h, not
-	e-book-async.h
-
-	* gui/component/addressbook-view.c: same.
-
-	* gui/component/addressbook.h: same.
-
-	* gui/component/addressbook.c: remove include e-book-async.h.
-
-2004-06-17  Sivaiah Nallagatla <snallagatla@novell.com>
-
-        * gui/widgets/e-addressbook-view.etspec : update
-        the model column numbers as new fields like E_CONTACT_EMAIL_4
-        are added to EContact
-        Fixes #59621
-
-2004-06-16  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/autocompletion-config.c
-	(autocompletion_config_control_new): set the source selector to be
-	able to toggle the current selection.  Fix for #55614.
-
-2004-06-16  Sivaiah Nallagatla <snallagatla@novell.com>
-	
-	* gui/contact-editor/e-contact-editor.c (full_name_clicked) :
-	compare old and new full names and if it is different set the new 
-	the name using gtk_entry_set_text instead of set_entry_text
-	as this function blocks siganls hence preventing ok button being 
-	enabled
-
-2004-06-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (extract_im_record): set
-	things to HOME, since we don't offer TYPE=OTHER IM attributes
-	through the EContact api, and one choice is just as good as
-	another if we aren't displaying it anyway.
-
-	* gui/widgets/eab-contact-display.c (render_contact): move the IM
-	stuff out of home/work, since we don't allow people to edit
-	location for them anymore.  Also, change the IM accounts we look
-	up to "HOME", since that's what we hardcode them to in the contact
-	editor.
-
-2004-06-14  Not Zed  <NotZed@Ximian.com>
-
-	* importers/evolution-ldif-importer.c (parseLine): handle LIST
-	field types.
-	(ldif_fields[]): Add a list type. E_CONTACT_EMAIL is a list field
-	type.  See #58855.
-
-2004-06-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (get_view_idle): new
-	function. do the get_view in an idle handler.
-	(eab_model_set_property): don't call get_view directly from any
-	setter block.  instead just add the idle handler (if it's not
-	already added.)  This keeps us from duplicating queries when both
-	"book" and "query" are set using the same g_object_set.
-
-	* gui/widgets/e-addressbook-model.h: add book_view_idle_id.
-	
-2004-06-07  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #58921.
-
-	* gui/contact-editor/e-contact-editor.c (extract_address_record):
-	Also check if the po box field is non-empty.
-
-2004-06-07  Jon Oberheide  <jon@focalhost.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c: disable editing
-	of cells in the contact table.
-
-2004-06-07  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #57795.
-
-	* gui/component/addressbook-migrate.c (migrate_contacts): Change
-	the "POSTAL" address in 1.4 to "OTHER" in 1.5.
-
-2004-06-07  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/Makefile.am (SUBDIRS): Fix order of dependencies.
-
-2004-06-07  H P Nadig  <hpnadig@pacific.net.in>
-
-	* gui/contact-list-editor/e-contact-list-editor.h: Added few
-	headers needed for select names dialog.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): Added select button handler.
-	(select_cb): The callback function for Select Button.
-	(setup_corba): To setup corba for select names dialog.	
-	(select_names_ok_cb): Handle Select names dialog entries.
-	(add_to_model): Adds cards to the model. 
-
-	* gui/contact-list-editor/contact-list-editor.glade: New 'Select'
-	Button. Tooltips added for buttons in button Box.
-
-2004-06-07  Dan Winship  <danw@novell.com>
-
-	* gui/component/addressbook-view.c: s/stock_save_as/stock_save-as/
-
-2004-06-04  Larry Ewing  <lewing@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: remove bonobo
-	menus and cruft add ok/cancel buttons.
-
-	* gui/contact-list-editor/e-contact-list-editor.h: add buttons for
-	ok/cancel.
-
-	* gui/contact-list-editor/contact-list-editor.glade: add fields for
-	ok/cancel reparent to GtkDialog, other minor adjustments.
-
-2004-06-04  JP Rosevear  <jpr@novell.com>
-
-	Fixes #55945
-	
-	* importers/*.server.in.in: ditto
-
-	* importers/evolution-ldif-importer.c: fix OAFIIDs
-
-	* importers/evolution-vcard-importer.c: ditto
-
-2004-06-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(name_and_email_simple_query_cb): only resolve destinations
-	against persons, not contact lists.
-
-2004-06-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #53643 and #26903.
-
-	* gui/search/addresstypes.xml: category -> category_list
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget): Get
-	filter rule from parent view.
-	(eab_search_dialog_set_property): Implement.
-	(eab_search_dialog_get_property): Impleent.
-	(eab_search_dialog_class_init): Set up property methods.
-	(get_query): Get filter rule from parent view.
-	(eab_search_dialog_init): Don't get the filter widget here,
-	wait until parent view property is set.
-	(eab_search_dialog_new): Don't poke the parent view in, set it
-	as a property instead.
-	(eab_search_dialog_dispose): No longer needs to unref rule.
-
-	* gui/search/e-addressbook-search-dialog.c: EABSearchDialog no
-	longer needs to keep rule internally.
-
-	* gui/widgets/Makefile.am: Set SEARCH_RULE_DIR define.
-
-	* gui/widgets/e-addressbook-view.c (eab_view_new): Set up filter
-	rule and context.
-	(eab_view_peek_search_context): Implement.
-	(eab_view_peek_search_rule): Implement.
-
-	* gui/widgets/e-addressbook-view.h: Keep track of filter rule
-	and context. Add protos for added API.
-
-2004-06-03  Jeffrey Stedfast  <fejj@novell.com>
-
-	* conduit/address-conduit.c (set_status_cleared): Protect against
-	a NULL uid. Fixes bug #57619.
-	(ecard_from_remote_record): Set the full_name of the contact so
-	that we can use that as the FILE_AS rather than the company name,
-	which sucked. Fixes a bug I may or may not have reported months
-	ago. Ahah, fixes bug #57620.
-
-2004-06-02  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-migrate.c
-	(migrate_contact_folder_to_source): Add missing negation that caused
-	a crash.
-
-2004-06-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (addressbook_migrate):
-	remove hidden field migration, and add in a phase to clear the
-	absolute_uri properties on ESources.
-
-2004-06-02  Rodney Dawes  <dobey@novell.com>
-
-	* gui/component/addressbook-config.c (focus_help, add_focus_handler):
-	Don't need these two functions any more
-	(source_to_dialog, auth_optionmenu_func):
-	Don't try to change the notebook page or set the widget sensitive,
-	for a notebook that doesn't exist any more
-	(reparent_to_vbox): Don't need this function any more, as the
-	widgets are all contained in the same dialog in the glade now
-	(setup_general_tab, setup_connecting_tab, setup_searching_tab):
-	We don't need to do the focus-based "tooltip" stuff any more
-	We just use tooltips on the widgets now
-	(ssl_optionmenu_selected, add_ssl_activate_cb):
-	We don't need the ssl_optionmenu_selected callback any more, as the
-	tooltips are just set on the necessary widgets now
-	(query_for_supported_bases): Set the border widths on the dialog's
-	vbox and action_area to be compliant with the HIG
-	(addressbook_add_server_dialog): Unref the GConfClient object
-	(addressbook_config_edit_source): Create the source_list so that
-	we can actually save the changes that we make here
-	Create the GladeXML with only the widget subtree that we need to
-	use here, to avoid popping up other visible dialogs
-	Set the border widths on the dialog's vbox and action_area to be
-	compliant with the HIG
-	We don't need to reparent widgets to vboxes any more, as the widgets
-	are now part of the dialog's widget tree
-	If we are without LDAP or not in LDAP mode, then hide the notebook
-	borders, and change the border size of its child to appear as though
-	we are a normal non-LDAP dialog
-	We don't need to set the type hint on the window as we are no a
-	real GtkDialog
-
-	* gui/component/ldap-config.glade: Update the properties dialogs to
-	be compliant with the HIG layout
-	Get rid of some of the extra windows and put their children in the
-	appropriate places in the properties dialog
-	Make the properties dialog be a real GtkDialog
-
-	Fixes #41141
-
-2004-06-01  Larry Ewing  <lewing@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Add in a source
-	option menu to the dialog and make is sensitive only on new lists.
-
-	* gui/contact-list-editor/e-contact-list-editor.h: add load_book
-	fields for async book loading.
-	
-	* gui/contact-list-editor/contact-list-editor.glade: add the new
-	source selector in a table reorder some of the other widgets.
-	
-2004-05-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (render_contact): render all
-	email addresses, not just the first 3.
-	(eab_contact_display_class_init): use a C comment, not C++.
-
-2004-05-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): call e_select_names_model_load_contacts
-	after setting text/addresses/destinations.
-
-	* gui/component/select-names/e-select-names-model.c
-	(name_and_email_simple_query_cb): new function, ripped from the
-	1.4 e-destination stuff.
-	(book_opened): new function, fire off eab_name_and_email_query for
-	each item in our model (that doesn't represent a contact already).
-	(e_select_names_model_load_contacts): new function, open the
-	default addressbook (yeah yeah, i know we should open something
-	different/more.)
-	(e_select_names_cancel_contacts_load): new (unimplemented, and how
-	do we implement it?) function.
-
-	* gui/component/select-names/e-select-names-model.h: add
-	prototypes for e_select_names_model_load_contacts and
-	e_select_names_cancel_contacts_load.
-
-	* gui/component/select-names/e-select-names.c (set_book): call
-	get_query_string and set the book and query in a single call to
-	g_object_set, just because we can/should.
-	(update_query): reimplement in terms of get_query_string.
-	(get_query_string): new function, build up the query string.
-
-	* gui/component/select-names/Makefile.am (INCLUDES): add
-	$(top_srcdir)/addressbook/util to INCLUDES.
-
-2004-05-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Add back office, spouse,
-	web log fields. Allow for 8 phone numbers, of which 4 can be hidden.
-
-	* gui/contact-editor/e-contact-editor.c (phones_default): Add more
-	defaults.
-	(im_service_default): Add more defaults.
-	(expand_phone): Implement.
-	(fill_in_phone_record): Expand if we have any records past 4.
-	(init_im_record_location)
-	(fill_in_im_record)
-	(extract_im_record)
-	(sensitize_im_record): Remove location.
-	(simple_field_map): Add spouse, office, web log.
-	(expand_phone_toggle): Implement.
-	(e_contact_editor_init): Hook up expander button.
-
-2004-05-28  Christophe Fergeau  <teuf@gnome.org>
-
-	* gui/component/addressbook-config.c: added missing #ifdef HAVE_LDAP
-
-2004-05-26  Radek Doulik  <rodo@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_contact_print_button): call
-	gnome_print_beginpage
-	(e_contact_print_button): call gnome_print_beginpage
-
-	Fixes #58977
-
-2004-05-25  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): reenable this function,
-	in a slightly broken manner.  we don't have e_contact_get_book
-	anymore (well, we never had it really... but we lost
-	e_card_get_book).  load the system addressbook and supply that to
-	the editors.  shouldn't be a problem, since it's a read-only
-	editor anyway.
-
-2004-05-25  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #58654 ]
-	
-	* gui/component/select-names/e-select-names.c (update_query):
-	build up the query using e_book_query calls so we're insulated
-	from field name changes.  also, conjoin if we have more than 1
-	query element, not more than 2 (i *hope* this was an off by 1
-	error...)
-
-2004-05-25 Sivaiah Nallagatla   <snallagatla@novell.com>
-
-        * gui/component/addressbook.c (load_source_auth_cb )
-        (load_source_auth_cb ) : read the "auth-domain" property
-        from e-source and use it as the component name for e_password_*
-        calls if it exists
-
-2004-05-25  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Makefile.am: Generate the addressbook-errors.xml.h file and
-	install the xml file and all that jazz.
-
-	* addressbook-errors.xml: New error xml file.
-
-	* gui/widgets/e-addressbook-view.c (backend_died): Use
-	e_error_run().
-
-	* gui/widgets/eab-gui-util.c (eab_error_dialog): Use
-	e_error_run().
-	(eab_load_error_dialog): Same.
-	(eab_search_result_dialog): Same.
-	(eab_prompt_save_dialog): Same.
-	(save_it): Same.
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked): Use
-	e_error_run().
-	(e_contact_editor_is_valid): Same.
-	(save_contact): Same.
-
-	* gui/component/addressbook-view.c (delete_addressbook_cb): Use
-	e_error_run().
-
-	* gui/component/addressbook-config.c (addressbook_ldap_init): Use
-	e_error_run().
-	(addressbook_ldap_auth): Same.
-	(addressbook_root_dse_query): Same.
-	(do_ldap_root_dse_query): Same.
-	(do_schema_query): Same.
-
-2004-05-24  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): add tools back to the build.
-
-2004-05-24  Chris Toshok  <toshok@ximian.com>
-
-	* tools/Makefile.am: fix this for current build foo.
-
-	* tools/evolution-addressbook-export-list-folders.c,
-	* tools/evolution-addressbook-export-list-cards.c, 
-	* tools/evolution-addressbook-export.c:  revive this.
-
-2004-05-24  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #32194 ]
-	
-	* importers/evolution-vcard-importer.c (process_item_fn): make
-	sure all ADR attributes have HOME/WORK/OTHER.
-
-2004-05-24  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40013 ]
-	
-	* importers/evolution-vcard-importer.c (process_item_fn): for TEL
-	attribute that don't specify a location (HOME/WORK/OTHER), default
-	to "OTHER".  For TEL attributes that *only* specify a location,
-	default to "VOICE".
-
-2004-05-21  H P Nadig  <hpnadig@pacific.net.in>
-
-	Fixes #58516.
-
-	* gui/contact-editor/contact-editor.glade: 'Job Title' is now called
-	'Title'.
-
-2004-05-20  Hans Petter Jansson  <hpj@ximian.com>
-
-	* importers/evolution-ldif-importer.c (add_to_notes): Add helper
-	func.
-	(process_item_fn): Add undisplayed fields to notes.
-
-	* importers/evolution-vcard-importer.c (add_to_notes): Add helper
-	func.
-	(process_item_fn): Add undisplayed fields to notes.
-
-2004-05-20  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-migrate.c (add_to_notes): Implement.
-	(migrate_contacts_hidden_fields): Implement.
-	(migrate_contacts): Copy fields that are now hidden in the UI,
-	to the notes field.
-
-2004-05-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_requestCreateItem):
-	use the new ebook api here.  missed this one in my earlier commit.
-
-2004-05-20  Radek Doulik  <rodo@ximian.com>
-
-	* printing/e-contact-print.c (complete_sequence): finish pages
-	printing by gnome_print_job_close call before showing preview or
-	calling gnome_print_job_print
-
-	See #54482
-
-	* gui/widgets/e-addressbook-view.c (eab_view_print_preview): added
-	call to begin page, ref printable and sink it to avoid finalizing of
-	floating object
-	(eab_view_print): ref and sink printable to avoid finalizing of
-	floating object
-
-	Fixes #46658
-
-2004-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* importers/evolution-vcard-importer.c (load_file_fn): use the new
-	e_book_new and e_book_open apis.
-
-	* importers/evolution-ldif-importer.c (load_file_fn): use the new
-	e_book_new and e_book_open apis.
-
-	* gui/widgets/eab-gui-util.c (eab_transfer_contacts): use the new
-	e_book_new and e_book_async_open apis.
-
-	* gui/contact-editor/e-contact-editor.c (cancel_load):
-	addressbook_load_source_cancel -> addressbook_load_cancel.
-	(source_selected): use the new e_book_new and addressbook_load.
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_source): use the new e_book_new and
-	addressbook_load.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(update_completion_books): use the new e_book_new and
-	addressbook_load.
-
-	* gui/component/addressbook.h: rename
-	addressbook_load_source{_cancel} to addressbook_load{_cancel}, and
-	remove the source arg.
-
-	* gui/component/addressbook.c (addressbook_load): rename since we
-	aren't passing a source anymore.
-	(addressbook_load_cancel): same.
-	(addressbook_load_default_book): use the new e_book_new_* apis.
-
-	* gui/component/addressbook-view.c (delete_addressbook_cb): just
-	use e_book_new, not e_book_load_source.
-	(selector_tree_drag_data_received): switch to new
-	e_book_new_*/e_book_open apis.
-	(activate_source): same, and addressbook_load_source ->
-	addressbook_load.
-
-	* gui/component/addressbook-migrate.c
-	(migrate_contact_folder_to_source): switch to new
-	e_book_new_*/e_book_open apis.
-	(migrate_contact_lists_for_local_folders): same.
-	(migrate_company_phone_for_local_folders): same.
-
-	* conduit/address-conduit.c (pre_sync): switch to new
-	e_book_new_*/e_book_open apis.
-
-2004-05-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (sensitize_email): Check
-	if individual email fields are supported.
-
-2004-05-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (extract_simple_field):
-	Remove debug output.
-	(real_save_contact): Separate out actual save logic from
-	save_contact ().
-	(save_contact): If the user wants to move the contact from one
-	address book to another, but the source is read-only, as to
-	save a copy instead.
-	(e_contact_editor_is_valid): The dialog should be an error dialog.
-	(app_delete_event_cb): If the target book is read-only, prompt
-	to discard. If the user wants to move but cannot, prompt to save
-	a copy. Also validate.
-
-	* gui/contact-editor/eab-editor.c (eab_editor_prompt_to_save_changes):
-	Remove comment about invalid data dialog, it's not handled here
-	anymore.
-
-2004-05-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes a number of bugs, adds some unimplemented functionality, and
-	makes code more structured.
-
-	* gui/contact-editor/e-contact-editor.h: Eliminate company,
-	fullname_editable, address_editable fields from EContactEditor.
-
-	* gui/contact-editor/e-contact-editor.c
-	(enable_writable_fields): Removed.
-	(set_editable): Removed.
-	(fill_in_info): Removed.
-	(extract_field): Removed.
-	(extract_info): Removed.
-	(set_fields): Removed.
-	(command_state_changed): Removed.
-	(widget_changed): Removed.
-	(enable_widget): Removed.
-	(nonempty): Invert and rename to STRING_IS_EMPTY().
-	(STRING_MAKE_NON_NULL): Impl.
-	(is_field_supported): Implement.
-	(file_as_get_style): Eliminate editor->company.
-	(file_as_set_style): Ditto. Also don't set empty fields in combo.
-	(update_file_as_combo): Implement.
-	(sensitize_ok): Implement.
-	(object_changed): Implement.
-	(image_chooser_changed): Don't call widget_changed() from here.
-	(set_option_menu_history): Implement.
-	(init_email_record_location): Hook up signals after init.
-	(init_phone_record_type): Ditto.
-	(init_im_record_location): Ditto.
-	(init_im_record_service): Ditto.
-	(init_address_textview): widget_changed -> object_changed
-	(init_address_field): Ditto.
-	(fill_in_email_record): Use set_option_menu_history(), blocking
-	signals.
-	(fill_in_im_record): Ditto.
-	(fill_in_address_field): Use set_entry_text(), blocking signals.
-	(alloc_ui_slot): nonempty -> STRING_IS_EMPTY
-	(extract_email): Ditto.
-	(fill_in_phone_record): Ditto.
-	(extract_im): Ditto.
-	(extract_address_record): Ditto.
-	(sensitize_email_record): Implement.
-	(sensitize_email): Implement.
-	(sensitize_phone_types): Implement.
-	(sensitize_phone_record): Impleent.
-	(sensitize_phone): Implement.
-	(sensitize_im_record): Implement.
-	(sensitize_im): Implement.
-	(sensitize_address_textview): Implement.
-	(sensitize_address_field): Implement.
-	(sensitize_address_record): Implement.
-	(sensitize_address): Implement.
-	(simple_field_map): Add all simple fields/widgets to a table with
-	attributes saying how to handle sensitivity and data transfer.
-	(init_simple_field): Implement.
-	(fill_in_simple_field): Implement.
-	(extract_simple_field): Implement.
-	(sensitize_simple_field): Implement.
-	(init_simple): Implement.
-	(fill_in_simple): Implement.
-	(extract_simple): Implement.
-	(sensitize_simple): Implement.
-	(fill_in_all): Implement.
-	(extract_all): Implement.
-	(sensitize_all): Implement.
-	(set_entry_changed_signal_field): Removed.
-	(set_urlentry_changed_signal_field): Removed.
-	(set_entry_activate_signal_field): Removed.
-	(new_target_cb): Don't signal changes.
-	(set_entry_activate_signals): Removed.
-	(set_entry_changed_signals): Removed.
-	(full_name_clicked): Honor field_supported and target_editable.
-	Use set_entry_text() and block changed signals.
-	(image_selected_cb): widget_changed -> object_changed. Don't clear
-	pointer to file_selector.
-	(image_cleared_cb): Ditto.
-	(contact_moved_cb): command_state_chaned() -> sensitize_all().
-	(contact_added_cb): Ditto.
-	(supported_fields_cb): Ditto.
-	(contact_modified_cb): Ditto.
-	(save_contact): extract_info() -> extract_all().
-	(e_contact_editor_is_valid): Be more verbose. Make sure File As is
-	non-empty.
-	(e_contact_editor_init): Call init_all() in place of lots of setup
-	calls. Remove reference to editor->company.
-	(e_contact_editor_dispose): Remove reference to editor->company.
-	(command_state_changed): Removed.
-	(e_contact_editor_set_property): Axe unneeded complexity, now that
-	we have sensitize_all() and sensitize_ok().
-	(set_fields): Removed.
-	(fill_in_field): Removed.
-	(field_mapping): Removed.
-	(disable_widget_foreach): Removed.
-	(widget_field_mapping): Removed.
-	(num_widget_field_mappings): Removed.
-	(enable_widget): Removed.	
-
-2004-05-05  William Jon McCann  <mccann@jhu.edu>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	Add menu_label and menu_accelerator.
-
-2004-05-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(file_send_as_cb): pass 0 to eab_send_contact.
-	(file_send_to_cb): same.
-
-2004-05-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-gui-util.c
-	(eab_send_to_contact_and_email_num_list): split out the
-	DISPOSITION_AS_TO stuff here, and make it take a GList of
-	ContactAndEmailNum, so we can set it for the single contact case.
-	(eab_send_contact_list_as_attachment): split out the
-	DISPOSITION_AS_ATTACHMENT stuff here.
-	(eab_send_contact_list): call one or the other of the above,
-	munging the list if disposition is set to TO.
-	(eab_send_contact): call eab_send_to_contact_and_email_num_list
-	directly with the supplied email_num, instead of calling
-	eab_send_contact_list.
-
-	* gui/widgets/eab-gui-util.h (eab_send_contact) add "email_num"
-	arg, so we can specify the email address we want to be selected.
-
-	* gui/widgets/eab-contact-display.c (on_link_clicked): add
-	(ifdefed out at the moment) code to handle mailto: urls
-	internally, instead of farming them out to gnome_url_show.
-	(render_contact): same.
-
-2004-05-18  Jerome Lacoste  <jerome@coffeebreaks.org>
-
-	Fixes #57940
-
-	* gui/widgets/e-addressbook-view.c: "Save as VCard" ->
-	"Save as VCard..."
-
-2004-05-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Hook up image button.
-	(e_contact_editor_dispose): Dispose of file selector if it's around.
-	(image_clicked): Implement.
-	(file_selector_deleted): Implement.
-	(image_cleared_cb): Implement.
-	(image_selected_cb): Implement.
-
-	* gui/contact-editor/contact-editor.glade: Make the contact image
-	be a button that lets you change or discard the image.
-
-2004-05-17  Jeffrey Stedfast  <fejj@novell.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Change E_PIXMAP
-	size args over to E_ICON_SIZE_* values.
-
-	* gui/component/addressbook-view.c: Change E_PIXMAP size args over
-	to E_ICON_SIZE_* values.
-
-	* gui/widgets/e-minicard.c (e_minicard_init): Use an E_ICON_SIZE
-	enum value for the icon_size argument to get_icon.
-
-	* gui/widgets/eab-gui-util.c (eab_create_image_chooser_widget):
-	Use E_ICON_SIZE_DIALOG as the icon_size argument to
-	get_icon_filename.
-
-	* gui/widgets/eab-contact-display.c (on_url_requested): Use an
-	E_ICON_SIZE enum as the icon_size argument to get_icon_filename.
-
-	* gui/contact-editor/e-contact-editor-im.c
-	(setup_service_optmenu): Use E_ICON_SIZE_MENU here.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(populate_popup_contact): Use E_ICON_SIZE_MENU here instead of 16.
-
-	* gui/component/addressbook-view.c (set_status_message): Use the
-	E_ICON_SIZE corresponding to 16x16 pixels.
-
-2004-05-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Add PO box entries.
-
-	* gui/contact-editor/e-contact-editor.c (init_address_record): Hook
-	up PO box entry.
-	(fill_in_address_record): Ditto.
-	(extract_address_record): Ditto.
-
-2004-04-18  S N Tejasvi  <tejasvi_sn@gawab.com>
-
-	Fixes bug #55208.
-
-	* gui/contact-editor/e-contact-editor.c (save_contact):
-	Do e_contact_editor_is_valid check to check the birth date and
-	anniversary date format when user wants to save and warn him.
-
-2004-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-component.c (impl_upgradeFromVersion):
-	set exception properly on failure.
-
-	* gui/component/addressbook-migrate.c (addressbook_migrate): take
-	a GError error return.  Doesn't do anything with it ... but ...
-
-2004-05-11  Dan Winship  <danw@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Remove
-	the addressbook control
-
-	* gui/component/component-factory.c (factory): Remove support for
-	the addressbook control
-
-	* gui/component/addressbook-view.c: Remove all the property-bag
-	stuff.
-
-2004-05-11  Sivaiah Nallagatla  <snallagatla@novell.com>
-                                                                                                                             
-       * gui/component/addressbook-config.c (dialog_to_source) : see if the selected
-        group is groupwise one and setup the relative uri and other properties into
-        e-source
-
-2004-05-10  Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
-
-	Fixes bug #44196 addressbook table view uses ASCII sort
-
-	* addressbook/gui/widgets/e-addressbook-view.c (compare_subitems):
-	Uses g_utf8_collate for right UTF8 sort. Made faster using 
-	g_utf8_collate_key.
-
-	Also fixes a bug in 
-
-	* gui/component/select-names/e-select-names.c (select_entry_changed):
-	Changed g_utf8_collate for strcmp as we are already comparing keys
-	made from g_utf8_collate_key.
-
-2004-05-08  Enver ALTIN  <enver.altin@frontsite.com.tr>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	  Fix parts of #53466.
-
-2004-05-05  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (init_address_textview):
-	Implement.
-	(init_address_record): Init textview.
-	(fill_in_address_textview): Implement.
-	(fill_in_address_record): Fill in textview.
-	(extract_address_textview): Implement.
-	(extract_address_record): Extract from textview.
-
-	* gui/contact-editor/contact-editor.glade: Combine address-[12] fields
-	into one multiline text view, as per Anna's new design.
-
-2004-05-04  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/addressbook-config.c (query_for_supported_bases):
-	fixup the dialog initialization.
-
-2004-05-04  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (phones_default): Use defaults
-	from Anna.
-	(im_service_default): Ditto.
-	(email_default): Ditto.
-	(im_location): Renamed to common_location, as it's used by both IM
-	and e-mail.
-	(init_email_record_location): im_location -> common_location
-	(init_im_record_location): Ditto.
-	(email_index_to_location): Ditto.
-	(im_index_to_location): Ditto.
-	(get_email_location): Ditto.
-	(get_im_location): Ditto.
-	(fill_in_email_record): Consult defaults.
-	(fill_in_im_record): Ditto.
-
-2004-05-04  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (set_entry_activate_signals):
-	Remove blog, add home page.
-	(set_entry_changed_signals): Ditto.
-	(setup_tab_order): Ditto.
-	(field_mapping): Ditto.
-	(widget_field_mappings): Ditto.
-
-	* gui/contact-editor/contact-editor.glade: Replace blog with home
-	page.
-
-2004-05-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_set_property): Do ref, unref
-	in right order, so the same contact can be set twice without ill
-	effects.
-	(e_minicard_finalize): NULL pointers after unreffing their objects.
-
-2004-05-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (phones_default): Establish
-	defaults for the phone number option menus.
-	(fill_in_phone_record): Fall back to defaults.
-
-2004-05-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (show_help_cb): Implement.
-	(e_contact_editor_init): Hook up the help button.
-
-	* gui/contact-editor/contact-editor.glade: Give the help button a
-	sensible name.
-
-2004-05-03  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/ldap-config.glade: bump the maximum download limit
-	to 1000.
-
-	* gui/component/addressbook-config.c (add_folder_modify): set the
-	email entry sesitive only when anonymous isn't selected.  Make the
-	details tab insensitive if the method is local.
-
-	* gui/component/ldap-config.glade: remove unused colorpicker.
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: set the
-	config item type
-
-2004-05-02  Sivaiah Nallagatla  <snallagatla@novell.com>
-                                                                                                                             
-        * gui/component/addressbook-config.c (dialog_to_source) : see if the selected
-         group is groupwise one and setup the relative uri and other properties into
-         e-source
-
-2004-05-01  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/addressbook-config.c: sensitize the details dialog
-	where appropriate.  Don't try to read from widgets that don't
-	exist.
-
-2004-04-30  Chris Toshok  <toshok@ximian.com>
-
-	* util/e-destination.c (e_destination_set_contact): don't use
-	"email" twice for a variable name.. even though they don't really
-	conflict, it's ugly and confusing.
-
-2004-04-30  Enver ALTIN  <enver.altin@frontsite.com.tr>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Fixed a
-	type-o.
-
-2004-04-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	* printing/e-contact-print.c: Don't dereference the file_as pointer
-	if it turns out to be NULL.
-
-2004-04-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/addressbook-migrate.c: We need a migration dialog
-	if the revision <= 10. Fixes bug #57770.
-
-2004-04-27  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/addressbook-config.c: remove debug spew.
-
-2004-04-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/addressbook-migrate.c (addressbook_migrate):
-	Migrate pilot data.
-	(migrate_pilot_data): Oops. Apparently the addressbook didn't
-	change the format of the changelog file from db3 to xml, so fix to
-	simply copy the file over.
-
-2004-04-27  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-fullname.c:
-	(e_contact_editor_fullname_init):
-	* gui/contact-editor/fullname.glade:
-	* gui/search/e-addressbook-search-dialog.c (eab_search_dialog_init):
-	Update dialog vbox and action area border widths to be HIG compliant
-	Update main child widget border widths to be HIG compliant
-
-2004-04-27  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/addressbook-config.c (source_to_dialog_new): fix
-	warnings, remove unused code.
-
-	* gui/component/addressbook-config.c: start integrate the new
-	dialog.
-
-	* gui/component/ldap-config.glade: add the new dialog.
-
-2004-04-26  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Set spacing around notebook widget and the dialog's action area and
-	vbox widgets to be compliant with the HIG dialog specs
-
-2004-04-25  Chris Toshok  <toshok@ximian.com>
-
-	* importers/evolution-ldif-importer.c (ldif_fields): add "mobile"
-	mapping to E_CONTACT_PHONE_MOBILE, which is what thunderbird uses
-	(and really what we should have always been using.)
-
-2004-04-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* conduit/address-conduit.c (get_next_mail): The firt EMAIL item
-	is EMAIL_1, not EMAIL (assuming we want simple strings).
-	(local_record_from_ecard): Use e_contact_get() for getting the
-	EContactAddress. Loop from FIRST_ADDRESS_ID up to and *including*
-	LAST_ADDRESS_ID.
-	(ecard_from_remote_record): When searching for an address field,
-	loop from FIRST_ADDRESS_ID up to and *including* LAST_ADDRESS_ID.
-	(pre_sync): Use e_book_query_any_field_contains() rather than
-	e_book_query_from_string ("#t") which doesn't work anyway.
-
-2004-04-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* conduit/address-conduit.c (map_name): Updated to use
-	~/.evolution as the evolution directory rather than ~/evolution.
-
-2004-04-23  Dan Winship  <danw@ximian.com>
-
-	* gui/component/component-factory.c (factory): Fix the addressbook
-	control to not crash. (Temporary fix.)
-
-2004-04-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-gui-util.c (added_cb): this signal takes an
-	EContact* too.
-	(modified_cb): same.
-	(deleted_cb): same.
-	(eab_error_dialog): pad the table of status messages out with the
-	new status codes, and don't specify gui text for messages that
-	aren't generated by the backends.  This fixes the "U" error
-	messages people were seeing.
-
-2004-04-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Correct the dialog's title.
-
-	* gui/contact-editor/e-contact-editor.c (init_email_record_location):
-	Connect to entry's activate signal.
-	(init_phone_record_type): Ditto.
-	(init_im_record_location): Ditto.
-	(init_address_field): Ditto.
-	(set_entry_changed_signal_field): Remove unnecessary checks.
-	(set_urlentry_changed_signal_field): Ditto.
-	(set_entry_changed_signals): Ditto.
-	(set_entry_activate_signal_field): Implement.
-	(set_urlentry_activate_signal_field): Implement.
-	(set_entry_activate_signals): Implement.
-	(e_contact_editor_init): Call set_entry_activate_signals ().
-
-2004-04-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	Override the save_contact function.
-	(e_contact_editor_save_contact): Implement.
-	(e_contact_editor_init): Remove some unnecessary checks - if
-	something's the matter with the UI files, that needs to be warned
-	about and fixed, not silently worked around.
-
-2004-04-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Make the window be a
-	GtkDialog.
-
-2004-04-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (free_attr_list): Implement.
-	(extract_email): Preserve offscreen addresses.
-	(extract_phone): Preserve offscreen phone numbers.
-	(extract_im): Preserve offscreen IM accounts.
-
-2004-04-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: Add defines for the slot
-	counts for email, phone, im, address.
-	(phones): Add E_CONTACT_PHONE_COMPANY back in, now that we can
-	differentiate it.
-	(init_email): Use EMAIL_SLOTS and a loop.
-	(init_im): Ditto for IM_SLOTS.
-	(init_phone): Ditto for PHONE_SLOTS.
-	(fill_in_address)
-	(extract_address)
-	(init_address): Ditto for ADDRESS_SLOTS.
-	(get_ui_slot_param): Implement.
-	(get_ui_slot): Implement.
-	(set_ui_slot): Implement.
-	(alloc_ui_slot): Implement.
-	(fill_in_email): Add code to preserve spatial organization.
-	(extract_email): Ditto.
-	(fill_in_phone): Ditto.
-	(extract_phone): Ditto.
-	(fill_in_im): Ditto.
-	(exctract_im): Ditto.
-
-2004-04-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (setup_progress_dialog):
-	store off the label as well as the folder name label, so we can
-	reuse the dialog and update the label.  Also, no longer take the
-	string to display here.
-	(dialog_set_label): new function.
-	(migrate_contact_lists_for_local_folders): call
-	dialog_set_folder_name here so we can see the folder being
-	migrated.
-	(migrate_company_phone_for_local_folders): new function for
-	updating the way we store company phone numbers.
-	(addressbook_migrate): split out the logic for setting up/tearing
-	down the dialog from the individual migration points so we can
-	reuse the same dialog and not have get destroyed/recreated for
-	each stage.  Also add a new migration point ( <= 1.5.8) for
-	migrating the company phone numbers.
-
-2004-04-21  Sivaiah Nallagatla   <snallagatla@novell.com>
-
-	* gui/component/addressbook.c (remove_parameters_from_uri) : added
-	a new function to striff off any parameters present after ';' in
-	the uri
-	(load_source_auth_cb) (addressbook_authenticate) : call above
-	function to remove anything after ';' before passing uri to
-	e-password calls
-	
-2004-04-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.h (EContactEditor): Remove
-	unused fields.
-
-	* gui/contact-editor/e-contact-editor.c (emails): Remove.
-	(e_contact_editor_init): Don't init unused fields.
-	(e_contact_editor_dispose): Don't free/clear unused fields.
-	(enable_writable_fields): Don't use email_choice anymore. Enable
-	checkbutton-htmlmail only once.
-
-2004-04-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Make the phone type
-	selectors be option menus.
-
-	* gui/contact-editor/e-contact-editor.c (phones): Store the phone
-	param mappings locally.
-	(set_entry_changed_signals): Don't special-case phone entries here.
-	(enable_writable_fields): Don't mess with the phone widgets anymore.
-	(set_fields): Use fill_in_phone ().
-	(extract_info): Use extract_phone ().
-	(phone_index_to_type): Implement.
-	(get_phone_type): Implement.
-	(get_attributes_named): Implement.
-	(set_attributes_named): Implement.
-	(fill_in_phone_record): Implement.
-	(extract_phone_record): Implement.
-	(fill_in_phone): Implement.
-	(extract_phone): Implement.
-	(init_phone_record_type): Implement.
-	(init_phone): Implement.
-	(connect_arrow_button_signal): Remove.
-	(connect_arrow_button_signals): Remove.
-	(phone_entry_changed): Remove.
-	(set_entry_changed_signal_phone): Remove.
-	(_arrow_pressed): Remove.
-	(_phone_arrow_pressed): Remove.
-	(e_contact_editor_build_ui_info): Remove.
-	(e_contact_editor_build_phone_ui): Remove.
-	(set_phone_field): Remove.
-
-2004-04-21  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-view.c (addressbook_view_init): fix
-	for e_user_creatable_items handle api changes.
-
-2004-04-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.etspec: use cursor-mode="line" to
-	get rid of the annoying cell cursor.
-
-	* gui/widgets/eab-gui-util.c (eab_create_image_chooser_widget):
-	create the image chooser even if we aren't given an initial
-	filename.
-
-	* gui/contact-editor/e-contact-editor.c (new_target_cb):
-	addressbook_show_load_error_dialog -> eab_load_error_dialog.
-
-2004-04-19  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Set the default image for
-	the contact photo to be the stock_person image in the icon theme
-
-2004-04-19  Michael Terry  <mike@mterry.name>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	* gui/component/addressbook-component.c:
-	* gui/component/addressbook-view.c:
-	* gui/component/select-names/e-select-names-popup.c:
-	* gui/contact-editor/e-contact-editor-address.c:
-	* gui/contact-editor/e-contact-editor-fullname.c:
-	* gui/contact-editor/e-contact-editor-im.c:
-	* gui/contact-list-editor/contact-list-editor.glade:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	* gui/merging/eab-contact-commit-duplicate-detected.glade:
-	* gui/merging/eab-contact-duplicate-detected.glade:
-	* gui/widgets/e-minicard.c:
-	* gui/widgets/eab-contact-display.c:
-	* gui/widgets/eab-gui-util.c: Update the addressbook to use the icon
-	theme via the EIconFactory object in e-util
-
-2004-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (nonempty): new macro.
-	(extract_email): only create/add the attribute if the email
-	address is nonempty.
-	(extract_im): same, but for im accounts.
-	(extract_address_record): same, but for addresses.
-
-2004-04-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Add "wants HTML" checkbox.
-
-	* gui/contact-editor/contact-editor.c (email_location_to_index)
-	(email_entry_changed)
-	(set_entry_changed_signal_email)
-	(file_save_cb)
-	(file_close_cb)
-	(file_save_as_cb)
-	(file_send_as_cb)
-	(file_send_to_cb)
-	(contact_deleted_cb)
-	(delete_cb)
-	(print_cb)
-	(print_envelope_cb)
-	(tb_save_and_close_cb)
-	(verbs)
-	(pixmaps)
-	(create_ui): Remove unused funcs.
-	(command_state_changed): Remove bonobo calls.
-	(e_contact_editor_init): Remove bonobo stuff.
-	(fill_in_email)
-	(fill_in_im): Remove unused vars.
-
-2004-04-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (book_loaded_cb): new
-	function, use the async interface to load the book.
-	(impl_requestCreateItem): use
-	e_book_async_get_default_addressbook.
-
-2004-04-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Commit new contact editor
-	UI by Anna.
-
-	* gui/contact-editor/e-contact-editor.c: Comment out bonobo includes.
-	(_email_arrow_pressed)
-	(_address_arrow_pressed)
-	(set_im_fields)
-	(find_address_mailing)
-	(set_address_field)
-	(add_im_clicked)
-	(edit_im_clicked)
-	(remove_im_clicked)
-	(im_button_press_cb)
-	(im_selected_cb)
-	(im_treeview_drag_data_get_cb)
-	(im_treeview_drag_data_rcv_cb)
-	(setup_im_treeview)
-	(email_entry_changed)
-	(address_to_text)
-	(text_to_address)
-	(address_text_changed)
-	(address_mailing_changed)
-	(full_addr_clicked)
-	(e_contact_editor_build_email_ui)
-	(e_contact_editor_build_address_ui)
-	(_email_arrow_pressed)
-	(_address_arrow_pressed)
-	(find_address_mailing)
-	(add_im_field)
-	(set_im_fields)
-	(set_address_field): Removed.
-	(address_name)
-	(im_service)
-	(im_location): Add lookup structs.
-	(init_email_record_location)
-	(init_email)
-	(fill_in_email_record)
-	(extract_email_record)
-	(email_location_to_index)
-	(email_index_to_location)
-	(im_index_to_location)
-	(get_email_location)
-	(get_im_location)
-	(fill_in_email)
-	(extract_email)
-	(init_im_record_location)
-	(init_im_record_service)
-	(init_im)
-	(fill_in_im_record)
-	(fill_in_im)
-	(extract_im_record)
-	(extract_im)
-	(init_address_field)
-	(init_address_record)
-	(init_address)
-	(fill_in_address_field)
-	(fill_in_address_record)
-	(fill_in_address)
-	(extract_address_field)
-	(extract_address_record)
-	(extract_address)
-	(file_save_and_close_cb)
-	(file_cancel_cb)
-	(set_entry_text): Implemented.
-	(connect_arrow_button_signals): Updated some widget names.
-	(set_entry_changed_signals): Removed dead widgets, updated names for
-	others.
-	(print_cb)
-	(tb_save_and_close_cb)
-	(create_ui): Disabled Bonobo toolbar/menus.
-	(e_contact_editor_init): Disabled Bonobo toolbar/menus. Init new
-	UI elements. Remove init of old UI elements.
-	(command_state_changed): Disabled Bonobo toolbar/menus. Act on new
-	ok/cancel buttons.
-	(_phone_arrow_pressed): Updated widget names.
-	(set_phone_field): Use set_entry_text ().
-	(set_fields): Update widget names, remove old address code, call new
-	fill_in_* code.
-	(field_mapping): Remove dead widgets.
-	(widget_field_mapping): Ditto.
-	(enable_writable_fields): Remove calls for old email/address UI.
-	Update some names.
-	(fill_in_info): Don't find_address_mailing() or set_im_fields().
-	(extract_info): Call new extraction funcs.
-
-2004-04-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-view.c (book_open_cb): force the info
-	label to update its contents here if the load was successful.
-
-	* gui/component/addressbook-migrate.c (migration_context_new): use
-	e_book_get_addressbooks instead of getting source_list from the
-	component.
-	(migration_context_free): unref the source_list.
-
-	* gui/component/addressbook-config.c (dialog_to_source): sync the
-	dialog->source_list, since we have it.
-
-2004-04-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: rip out tons of functions - they
-	all live in addressbook-view.c now.  the only thing left in this
-	file is the addressbook_load* calls that do authentication.
-
-	* gui/component/addressbook.h: remove prototypes for
-	addressbook_new_control and addressbook_load_uri (it was #if 0'ed
-	anyway.)
-
-	* gui/component/addressbook-component.h: remove prototypes for
-	_peek_activity_handler and _peek_source_list.
-
-	* gui/component/addressbook-component.c: rip out tons of functions
-	- they all live in addressbook-view.c now.
-	(impl_createControls): simplify this immensely.  we just create an
-	AddressbookView and get the various widgets/controls from it.
-	(impl_requestCreateItem): this function loses slightly - it needs
-	per-window info (the selected source) but there's no way to get
-	it.  So we load the default book.  Also, this uses a synchronous
-	e_book call to load the book, which is not good.
-	(addressbook_component_peek_source_list): nuke, not used by
-	anything anyway.
-	(addressbook_component_peek_activity_handler): nuked, not used by
-	anything - and it's per-window anyway.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	add addressbook-view.[ch].
-
-	* gui/component/addressbook-view.[ch]: rip out all of the per
-	window stuff from addressbook.[ch] and addressbook-component.[ch]
-	and put it here.
-
-2004-04-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (accum_address): disable the
-	map link for 2.0.
-
-2004-04-13  Larry Ewing  <lewing@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (create_table_view): add
-	GDK_ACTION_COPY to the supported drag types.  Connect to the
-	table_drag_data_delete callback.
-	(table_drag_data_delete): remove the drag rows.
-
-2004-04-13  Sivaiah Nallagatla <snallagatla@novell.com>
-
-        * gui/component/addressbook.c  (addressbook_authenicate):
-         added a check for new auth type "plain/password"
-         for groupwise in addressbook_authenicate function
-
-2004-04-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-popup-control.c (email_menu_add_option): treat
-	"" the same as NULL (don't add it to the list).
-
-2004-04-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_load_default_book):
-	quiet valgrind uninitialized memory warning.
-
-2004-04-12  Chris Toshok  <toshok@ximian.com>
-
-	[ should fix #56537 ]
-	
-	* gui/widgets/eab-popup-control.c (EMPTY_ENTRY): use _(), not N_()
-	here.
-	(email_menu_add_options_from_contact): and g_strdup it here, so
-	that the g_list_foreach (... g_free ..) doesn't cause things to
-	blow up.
-	(email_menu_unset_options): nuke ifdefed function.
-	
-	* gui/widgets/eab-popup-control.h: don't include gtk.h, include
-	just what we need.
-
-2004-04-10  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-gui-util.h: add prototypes for
-	eab_load_error_dialog and eab_search_result_dialog.
-
-	* gui/widgets/eab-gui-util.c (eab_load_error_dialog): the new
-	addressbook_show_load_error_dialog.
-	(eab_search_result_dialog): new function, the old contents of
-	addressbook.c:search_result.
-
-	* gui/component/addressbook.c
-	(addressbook_show_load_error_dialog): move this function to
-	eab-gui-utils.[ch]
-	(search_result): split out the body of this into
-	eab_search_result_dialog in eab-gui-utils.[ch].
-	(book_open_cb): call eab_load_error_dialog.
-
-	* gui/component/addressbook.h: remove prototype for
-	addressbook_show_load_error_dialog.
-
-2004-04-10  Chris Toshok  <toshok@ximian.com>
-
-	* util/e-destination.h: remove the e_destination_get_book api,
-	since the function doesn't exist.
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (addressbook_migrate): bump
-	version required to 8 for the contact list migration foo.
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(selector_tree_drag_motion): pass GDK_CURRENT_TIME instead of a
-	function pointer to "time" to gdk_drag_status.  not sure if this
-	is right, but it's definitely more right than it was :)
-	(impl_createControls): create the info label and add it to the
-	sidebar control.  it's not hooked up yet.
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* importers/evolution-ldif-importer.c (resolve_list_card): use the
-	new e_destination_export_to_vcard_attribute call to build up the
-	attributes.
-
-	* importers/evolution-vcard-importer.c (process_item_fn): if we're
-	importing a vcard that we wrote out previously containing xml in
-	the EMAIL attributes, DTRT and strip it out and use
-	e_destination_export_to_vcard_attribute to build up the proper
-	attribute.
-
-	* util/Makefile.am (libeabutil_la_SOURCES): remove
-	eab-destination.[ch] and add e-destination.[ch].
-
-	* printing/e-contact-print.c (e_contact_print_contact): we don't
-	have to worry about the "<?xml..."  EMAIL fields anymore.
-
-	* gui/widgets/eab-gui-util.c (eab_send_contact_list): just use the
-	value as the address (since that's what it is) in the list case.
-
-	* gui/widgets/eab-contact-display.c (render_contact_list): remove
-	the EABDestination stuff from here.
-	(eab_contact_display_render_compact): same.
-
-	* gui/widgets/e-minicard.c (activiate_editor): fix warnings - use
-	EAB_EDITOR instead of G_OBJECT.
-	(add_field): we don't have to worry about the "<?xml..."  EMAIL
-	fields anymore.
-	(remodel): same.
-
-	* gui/widgets/e-addressbook-treeview-adapter.c
-	(adapter_get_value): we don't have to worry about the "<?xml..."
-	EMAIL fields anymore.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_value_at): we don't have to worry about the
-	"<?xml..." EMAIL fields anymore.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_value_at): eab->e.
-	(contact_list_model_dispose): we're not a GtkObject, we're a
-	GObject.  rename _destroy to _dispose, and chain up to the parent
-	class's ::dispose.
-	(e_contact_list_model_class_init): GtkObject -> GObject, and
-	destroy -> dispose.
-	(e_contact_list_model_init): GtkObject -> GObject, and EAB -> E.
-	(e_contact_list_model_add_destination): EAB -> E.
-	(e_contact_list_model_add_email): same.
-	(e_contact_list_model_add_contact): same.
-	(e_contact_list_model_get_destination): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb): add email num arg to
-	e_contact_list_model_add_contact.
-	(extract_info): fill in the vcard attributes instead of just
-	generating xml.
-	(fill_in_info): extract the values from the vcard attributes.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): eab->e, and don't
-	sometimes copy, sometimes ::new.  always ::new.
-	(e_select_names_text_model_delete): same.
-	(e_select_names_text_model_obj_count): same.
-	(nth_obj_index): same.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): eab -> e.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(make_contact_editor_cb): eab -> e.
-	(change_email_num_cb): same.
-	(toggle_html_mail_cb): same.
-	(populate_popup_contact): same, and remove code that checks for
-	<?xml, then imports the EDestination.
-	(quick_add_cb): eab -> e.
-	(populate_popup_nocontact): same.
-	(e_select_names_populate_popup): same.
-
-	* gui/component/select-names/e-select-names-model.h: eab -> e, and
-	remove prototypes for nuked functions.
-
-	* gui/component/select-names/e-select-names-model.c
-	(destination_changed_proxy, send_changed, connect_destination,
-	disconnect_destination): nuke.
-	(e_select_names_model_duplicate): EAB -> E.
-	(e_select_names_model_get_textification): same.
-	(e_select_names_model_get_address_text): same.
-	(e_select_names_model_get_destination): same.
-	(e_select_names_model_export_destinationv): same.
-	(send_changed): same.
-	(e_select_names_model_import_destinationv): same.
-	(e_select_names_model_get_contact): same.
-	(e_select_names_model_contains): same.
-	(e_select_names_model_insert): same, and remove call to
-	connect_destination.
-	(e_select_names_model_append): same.
-	(e_select_names_model_replace): same, and remove call to
-	disconnect/connect_destination.
-	(e_select_names_model_delete): same.
-	(delete_all_iter): nuke.
-	(e_select_names_model_delete_all): use g_object_unref for the
-	foreach call.
-	(e_select_names_model_merge): EAB -> E.
-	(e_select_names_model_name_pos): same.
-	(e_select_names_model_name_pos): same.
-	(e_select_names_model_load_all_contacts): nuke.
-	(e_select_names_model_cancel_all_contact_load): nuke.
-	
-	* gui/component/select-names/e-select-names-manager.c
-	(clean_cb, focus_in_cb, focus_out_cb, completion_popup_cb): nuke.
-	(completion_handler): EAB -> E, and the signals are gone.
-
-	* gui/component/select-names/e-select-names-completion.c: in
-	general, s/eab_dest/e_dest and s/EABDest/EDest.
-	(e_select_names_completion_got_book_view_cb): move the
-	e_book_view_start to below the assignment of
-	sequence_complete_received, just to put my mind at ease.
-	(e_select_names_completion_stop_query): un-#if notyet the call to
-	e_book_cancel.
-	(e_select_names_completion_start_query): free the waiting_query
-	before assigning to it.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): remove calls to
-	e_select_names_model_load_all_contacts, since that function is
-	dead.
-
-	* gui/component/addressbook-migrate.c (setup_progress_dialog):
-	take the label to display to the user as an arg.
-	(migrate_contact_lists_for_local_folders): loop over all contacts
-	in all local addressbooks looking for ones that have <?xml in
-	their EMAIL attributes.  for the ones we find, call
-	e_destination_export_to_vcard_attribute to build up the proper
-	attribute.
-	(addressbook_migrate): add in a clause for all versions under
-	1.5.7 to convert contact lists.  also, move the unrefs of the
-	sources/groups to outside the if, as they're created outside it.
-
-	* gui/component/Makefile.am (INCLUDES): remove the
-	addressbook/backend/ dirs, since libebook isn't there anymore
-	(nothing is, actually).  Add addressbook/util/.
-
-2004-04-09  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_new_control): create an
-	EUserCreatableItemsHandler
-	(addressbook_view_clear): destroy it
-	(control_activate): Activate it
-
-	* gui/component/addressbook-component.c
-	(impl__get_userCreatableItems): Add object/folder flags to the
-	creatable items. Rename "Address Book" to "Contacts Group" per new
-	specs
-
-2004-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* util/e-destination.c (e_destination_copy): we don't have an
-	EBook* anymore.
-	(e_destination_clear): same.
-	(e_destination_set_contact): same.
-	(e_destination_set_book): same, just cache the source_uid.
-	(e_destination_set_book_uri): nuke.
-	(e_destination_set_contact_uid): we don't have an EBook*.
-	(e_destination_xml_decode): same.
-	(e_destination_export_to_vcard_attribute): new function, fill in
-	an EVCardAttribute with EDestination values.
-
-	* util/e-destination.h: add prototype for
-	e_destination_export_to_vcard_attribute.
-
-2004-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/autocompletion-config.c
-	(source_selection_changed): Sync the changes here rather than
-	setting 'changed' on the config control (since that no longer
-	exists).
-	(autocompletion_config_control_new): Don't connect to an apply
-	signal, no such signal.
-
-2004-04-06  Chris Toshok  <toshok@ximian.com>
-
-	* util/e-destination.[ch]: old name, new trimmed down
-	implementation.  This will be replacing eab-destination.[ch].
-
-2004-04-06  Hao Sheng  <hao.sheng@sun.com>
-
-	* gui/widgets/e-minicard.c:
-	(e_minicard_event) : implement keyboard navigation(TAB/shift+TAB)
-	(activaite_editor) : add a new function to activiate contact editor
-	for support "Enter" key
-
-	Fixes #55056
-
-2004-04-05  Chris Toshok  <toshok@ximian.com>
-
-	* util/eab-destination.h: wrap this with the correct #ifdef.
-
-2004-04-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/merging/eab-contact-merging.c (match_query_callback): use
-	the correct glade filename.
-
-2004-04-01  Hari Prasad Nadig  <hp@ndeepak.info>
-
-	Fixes #53433.
-	
-	* gui/component/addressbook-config.c (searching_tab_check): added
-	the tab check for search tab.
-	(dialog_to_source): added timeout to be saved.
-	(source_to_dialog): just a piece to retrieve timeout from source.
-	(addressbook_root_dse_query): few necessary changes.
-	(do_ldap_root_dse_query): again few changes that were required.
-
-	* gui/component/ldap-config.glade : set right the Hscale to
-	display the selected value.
-	
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #34777 ]
-	
-	* gui/contact-editor/e-contact-editor.c (file_as_entry_changed):
-	set the window title to File As if the file as entry has something
-	in it.  "Contact Editor" otherwise.
-	(set_entry_changed_signals): hook up the file-as-entry's "changed"
-	signal.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(list_name_changed_cb): analogous fix, but "List Name" and
-	"Contact List Editor".
-
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53544 ]
-	
-	* gui/component/addressbook-component.c
-	(impl__get_userCreatableItems): add "address_book" to the user
-	creatable items list. complete with incorrect accelerator and
-	shortcut!
-	(impl_requestCreateItem): handle "address_book" here, and plug a
-	memory leak.
-
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ part of the fix for #51977, the other part is in e-d-s ]
-	
-	* gui/widgets/e-addressbook-view.c (search_activated): the name of
-	the category list property has changed from "category" to
-	"category" list in 1.5.  track the change here to get category
-	searching working again.
-
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ part of the fix for #54528, the other part is in e-d-s ]
-	
-	* importers/evolution-vcard-importer.c (process_item_fn): get and
-	set the PHOTO attribute before storing the contact in the book.
-	this has the affect of making EContact sniff the image format.
-	the apple addressbook doesn't give PHOTO's a TYPE.
-
-
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53094 ]
-	
-	* gui/component/ldap-config.glade: nuke
-	addressbook-sources-window.
-
-	* gui/component/addressbook-config.c (main): nuke, we don't need
-	this test case anymore, and it doesn't really work anyway anymore.
-
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53634 ]
-	
-	* gui/widgets/e-addressbook-view.c (eab_view_new): call
-	e_search_bar_set_menu to add the Advanced... menu item to the
-	search menu, and connect to "menu_activated".
-	(search_menu_activated): new function, pop up the advanced dialog
-	if id == ESB_ADVANCED.
-	(query_changed): use e_search_bar_get_item_id instead of
-	g_object_get.
-
-	* gui/component/addressbook.c (verbs): remove ToolSearch.
-	(pixmaps): remove the ToolSearch pixmap.
-
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ gui part of the fix required for #48665 ]
-	
-	* gui/widgets/e-addressbook-model.c (get_view): pass the source's
-	"limit" property (if it exists) to e_book_async_get_book_view.
-
-2004-03-29  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(selector_tree_drag_data_received): call drag_finish properly.
-	(selector_tree_drag_motion): set the drag status properly.
-
-2004-03-25 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/component/eab-editor.c (eab_editor_prompt_to_save_changes) : 
-	do  eab_editor_is_valid check only when user wants to save.
-
-2004-03-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(fill_popup_menu_callback): don't let the user delete their
-	Personal addressbook.  This is just a nice UI thingy..  A similar
-	fix needs to be made to e-d-s. so that attempts that circumvent a
-	nice UI will also fail.
-
-2004-03-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-gui-util.c (eab_show_multiple_contacts): don't
-	know what I was thinking approving this change.  the _() was only
-	used in the plural case (in fact where n > 5), so a singular case
-	was never necessary, and neither was the call to ngettext.
-
-2004-03-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_get_type): parent_type == EAB_TYPE_EDITOR.
-	(e_contact_list_editor_class_init): fill in editor_class virtual
-	functions, and remove all the signals.
-	(list_added_cb): call eab_editor_contact_* instead of emitting a
-	signal here.  also call eab_editor_close
-	(list_modified_cb): same.
-	(e_contact_list_editor_is_valid): new function.
-	(e_contact_list_editor_is_changed): same.
-	(e_contact_list_editor_get_window): same.
-	(file_close_cb): call eab_editor_ functions.
-	(list_deleted_cb): call eab_editor_contact_* instead of emitting a
-	signal here.  also call eab_editor_close
-	(delete_cb): call eab_editor_* functions.
-	(contact_list_editor_destroy_notify): call eab_editor_remove.
-	(e_contact_list_editor_new): call eab_editor_add, and remove the
-	g_object_ref/gtk_object_sink two-step.
-	(e_contact_list_editor_show): make static, and make arg EABEditor.
-	(e_contact_list_editor_raise): same.
-	(e_contact_list_editor_close): same.
-	(app_delete_event_cb): call eab_editor_ functions.
-	(command_state_changed): use eab_editor_is_valid instead of
-	is_named.
-	(e_contact_list_editor_request_close_all): nuke.
-	
-	* gui/contact-list-editor/e-contact-list-editor.h: nuke a bunch of
-	prototypes for functions that are now either virtual functions
-	from EABEditor or eab_editor_* functions.
-	(struct _EContactListEditor): we subclass from EABEditor.
-	(struct _EContactListEditorClass): same, and nuke all the signals.
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_get_type): parent_type == EAB_TYPE_EDITOR.
-	(e_contact_editor_class_init): fill in editor_class virtual
-	functions, and remove all the signals.
-	(contact_moved_cb): call eab_editor_contact_* instead of emitting
-	a signal here.  also call eab_editor_close
-	(contact_added_cb): same.
-	(contact_modified_cb): same.
-	(e_contact_editor_close): rename from close_dialog.
-	(e_contact_editor_is_valid): new function.
-	(e_contact_editor_is_changed): new function.
-	(e_contact_editor_get_window): new function.
-	(file_close_cb): use eab_editor_ calls here.
-	(e_contact_editor_confirm_delete): nuke.
-	(contact_deleted_cb): call eab_editor_contact_* instead of
-	emitting a signal here.  also call eab_editor_close
-	(delete_cb): use eab_editor_ functions.
-	(e_contact_editor_dispose): chain up to our parent's ::dispose.
-	(contact_editor_destroy_notify): use eab_editor_remove.
-	(e_contact_editor_new): use eab_editor_add, and remove the
-	g_object_ref/gtk_object_sink two-step.
-	(_popup_position): nuke dead function.
-	(set_fields): i is an index, not a field_id.
-	(e_contact_editor_raise): make this static, and it takes an
-	EABEditor arg now, not a EContactEditor.
-	(e_contact_editor_show): same.
-	(e_contact_editor_request_close_all): nuke.
-	
-	* gui/contact-editor/e-contact-editor.h: nuke a bunch of
-	prototypes for functions that are now either virtual functions
-	from EABEditor or eab_editor_* functions.
-	(struct _EContactEditor): we subclass from EABEditor.
-	(struct _EContactEditorClass): same, and remove the signals.
-
-	* gui/widgets/e-addressbook-view.c (delete): call
-	eab_editor_confirm_delete.
-
-	* gui/widgets/eab-popup-control.c (contact_editor_cb): don't
-	bother calling e_contact_editor_raise since this is a new contact
-	editor anyway.
-
-	* gui/widgets/eab-gui-util.c (eab_show_contact_list_editor): use
-	EABEditor signals, and eab_editor_show.
-
-	* gui/widgets/e-minicard.h: "editor" is now of type EABEditor, not
-	GObject.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): just use
-	eab_editor_raise instead of
-	e_contact_editor_raise/e_contact_list_editor_raise.
-
-	* gui/component/addressbook-component.c (impl_requestQuit):
-	implement this again, calling eab_editor_request_close_all.
-	(addressbook_component_class_init): fill in epv->requestQuit.
-
-2004-03-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/eab-editor.[ch]: superclass for both
-	EContactEditor and EContactListEditor.  A start toward simplifying
-	the interface to both of them, and a place to abstract code.
-
-	* gui/contact-editor/Makefile.am (libecontacteditor_la_SOURCES):
-	add eab-editor.[ch]
-
-2004-03-24  Danilo Segan  <dsegan@gmx.net>
-
-	* gui/widgets/e-addressbook-model.c (update_folder_bar_message):
-	Use ngettext for handling plural forms (fixes bug #53464).
-	* gui/widgets/eab-gui-util.c (eab_show_multiple_contacts): Likewise.
-	* gui/widgets/eab-vcard-control.c (pstream_load): Likewise.
-
-
-2004-03-22  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53653, and a couple other instances ]
-	
-	* gui/widgets/eab-gui-util.c (file_exists): REJECT -> CANCEL, so
-	esc works (patch from Pratik V. Parikh <pratikvp@despammed.com>)
-	(save_it): REJECT -> CANCEL.
-	(eab_select_source): same.
-
-2004-03-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #53625.
-
-	* gui/widgets/eab-contact-display.c (render_contact): Show home and
-	mobile phone numbers too.
-
-2004-03-15  Sivaiah Nallagatla <snallagatla@novell.com>
-        
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields) :
-         loop only up to < G_N_ELEMENTS instead of <= G_N_ELEMENTS. Prevents
-         out of bound indexing of addresses array
-
-2004-03-15  Hao Sheng  <hao.sheng@sun.com>
-
-	* gui/component/Makefile.am : build a11y/addressbook dir
-	* gui/widgets/e-addressbook-view.c :
-	(eab_view_class_init) : add the accessibility support for 
-	EAddressbookView
-	* gui/widgets/e-minicard-view.c :
-	(e_minicard_view_class_init) : add the accessibility support for 
-	EMinicardView
-	* gui/widgets/e-minicard.c :
-	(e_minicard_class_init) : add the accessibility support for EMinicard
-                                                                                
-2004-03-10  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (render_address): #if 0 this,
-	since nothing uses it anymore.
-	(accum_address): new function, build up a GString.
-	(accum_name_value): same.
-	(accum_attribute): same.
-	(render_contact): don't just blindly render the work/personal
-	blocks, since if they're empty it looks stupid.  instead,
-	accumulate each block into a GString and only output the entire
-	block if the string is non-empty.
-
-2004-03-10  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (phone_entry_changed):
-	phone_choice is an index into the phones array.
-	(_phone_arrow_pressed): same.
-	(address_text_changed): address_choice is an index into the
-	addresses array.
-	(_address_arrow_pressed): same.
-	(set_address_field): same.
-	(_email_arrow_pressed): email_choice is an index into the emails
-	array.
-	(full_addr_clicked): same, and same with
-	s/addresses/address_editable.
-	(e_contact_editor_init): initialize the *_choice fields as indices
-	into their respective *es arrays.
-	(e_contact_editor_build_address_ui): initialize the labels from
-	the addresses array.
-	(set_fields): *_choice fields are indices into *es arrays.
-	(enable_writable_fields): same.
-
-2004-03-09  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (_arrow_pressed): Don't try
-	to calculate the position of the popup menu for the dropdowns
-	
-2004-03-09  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-im.c (e_contact_editor_im_edit):
-	Remove the dialog separator, and set appropriate border widths for the
-	button area box and the dialog's vbox
-	* gui/contact-editor/im.glade: Apply patch from Christian Neumair to
-	make the IM editor dialog HIG compliant
-
-2004-03-08  Sivaiah Nallagatla <snallagatla@novell.com>
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	fixed a typo, which is causing probelm in building up email ui
-	
-2004-03-04  Sivaiah Nallagatla <snallagatla@novell.com>
-                                                                                                                             
-        * gui/component/addressbook-config.c :
-        (addressbook_add_server_druid) : maintain a list of only those source groups which are added to menu
-        instead of all
-        (source_group_changed_cb) : use the new list to get the selected group
-        (addressbook_source_dialog_destroy) : free the new list
-
-2004-03-04  Not Zed  <NotZed@Ximian.com>
-
-	** See #54991.
-	
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): dont try to unref a null
-	query.
-	(name_style_query): use a GString to build the query, so we can
-	use e_sexp_encode_string to properly encode the sub terms.
-
-2004-03-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c (delete_addressbook_cb):
-	Set error to NULL before using it.
-
-2004-03-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c (delete_addressbook_cb):
-	Remove local data, with error reporting on failure.
-
-2004-03-02  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/addressbook-component.c: add drop support for
-	text/x-vcard to the source list.
-
-2004-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c
-	(eab_contact_display_render_compact): ref the pixbuf before we
-	close/unref the loader so the pixbuf sticks around, and make the
-	scaling logic a bit more transparent.
-
-2004-02-27  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Change the button relief
-	back to normal for the drop-down buttons and move the text labels
-	inside the buttons as well
-
-2004-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (eab_view_set_property): add
-	missing "break" to PROP_SOURCE's case.
-
-2004-02-27  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Get rid of some extraneous
-	event boxes that were not needed/used for anything really
-	Set the button relief for the pop-down buttons to NONE
-	Set the shadow type for the arrows in the pop-down buttons to NONE,
-	so that we look good with themes that actually handle shadow types on
-	arrows, since most things just ignore the shadow type anyway
-
-	Fixes #8516
-
-2004-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	* util/eab-destination.c (name_and_email_cb): Move unused variable
-	declaration inside notyet conditional.
-
-	* printing/e-contact-print.c: Include gal/util/e-util.h
-
-	* gui/merging/eab-contact-compare.c (eab_contact_locate_match): Cast
-	callback to an EBookCallback.
-	(eab_contact_locate_match_full): Ditto.
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):
-	Remove unused variable and cast 3rd arg to e_contact_set () (perhaps
-	this should take a gconstpointer?).
-
-	* gui/contact-editor/e-contact-editor-im.c (setup_service_optmenu):
-	Remove unused variable.
-
-	* gui/component/select-names/e-select-names.c (e_select_names_init):
-	Cast the vbox to a GtkBox.
-
-	* gui/component/addressbook-config.c (dialog_to_source): Correctly cast
-	the spin button to a GtkSpinButton, not a GtkEntry.
-
-	* gui/component/addressbook-component.c (load_primary_selection):
-	Remove unused variable.
-
-2004-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (render_contact): add the
-	Groupwise IM attributes to the list of those we render.
-
-2004-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (set_view_preview): call
-	eab_view_show_contact_preview here so we maintain the preview
-	state when switching folders.  we don't (yet... won't ever?) have
-	per-addressbook preview settings.
-
-2004-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c
-	(eab_view_show_contact_preview): view->scrolled ->
-	view->contact_display.  fixes crash.
-
-2004-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (edit_im_clicked): fix
-	checks for locations.
-
-2004-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/im.glade: set the location label/option menu
-	to visible.
-
-	* gui/contact-editor/e-contact-editor.c (add_im_clicked): build up
-	the vcard attributes manually so we can set the TYPE= parameter to
-	the location the user specifies.
-	(edit_im_clicked): same.  Also, use COLUMN_IM_LOCATION_TYPE, which
-	is not localized to pass the location to the editor.
-	(remove_im_clicked): reindent.
-	(im_treeview_drag_data_get_cb): same.
-	(im_treeview_drag_data_rcv_cb): same.
-	(setup_im_treeview): add another column for the (non-localized)
-	location type, and reindent.
-	(add_im_field): use the new attribute api for EContact so we can
-	get the location of each account, and set things appropriately on
-	the store.
-
-	* gui/contact-editor/e-contact-editor-im.c
-	(e_contact_editor_im_class_init): reindent.
-	(e_contact_editor_im_new): same.
-	(fill_in_info): same.
-
-2004-02-25 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/contact-editor/e-contact-editor-im.c : added 
-	groupwise im related label and icon image file name
-	
-	* gui/contact-editor/e-contact-editor.c : 
-	(im_treeview_drag_data_get_cb), (im_treeview_drag_data_rcv_cb) :
-	(set_im_fields) : added code to add Gw Im id to contact-editor 
-	
-
-2004-02-24  Hans petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):
-	Port to new way of setting name in contact.
-
-2004-02-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migration_context_new):
-	don't init the dialog here
-	(addressbook_migrate): init it here
-
-	Fixes #54214
-	
-2004-02-20  Chris Toshok  <toshok@ximian.com>
-	* gui/contact-editor/e-contact-editor.c (phone_entry_changed):
-	remove some spew.
-
-2004-02-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/component-factory.c: s/HAVE_NSS/ENABLE_SMIME.
-
-	* gui/component/addressbook-component.c: s/HAVE_NSS/ENABLE_SMIME.
-
-2004-02-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (activate_source): split out the
-	majority of the set_prop code for PROPERTY_SOURCE_UID_IDX here, so
-	it can be used for both SOURCE_UID and FOLDER_URI.
-	(set_prop): add a setter for "folder_uri".  we sorta fudge things
-	and use the uri for the uid (the uid is only used as a hash key to
-	look up the view associated with the uri/source, so we should be
-	good still.)
-	(get_prop): add getter for "folder_uri".
-	(addressbook_new_control): add the "folder_uri" property to our
-	property bag.
-
-2004-02-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #45308 and duplicates.
-
-	* gui/widgets/e-addressbook-model.c (eab_model_set_property): Store
-	the IDs of book signals connected to, so we can disconnect from them
-	later.
-
-2004-02-18  Hao Sheng  <hao.sheng@sun.com>
-
-	[ fixes bug #52765 ]
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_confirm_delete): make delete dialog support
-	ESC press.
-
-2004-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add image_set slot.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(list_image_changed_cb): set image_set = TRUE.
-	(e_contact_list_editor_init): init image_set = FALSE
-	(extract_info): only set the LOGO attribute if image_set = TRUE.
-
-	* gui/contact-editor/e-contact-editor.h (struct _EContactEditor):
-	add image_set slot.
-
-	* gui/contact-editor/e-contact-editor.c (extract_info): only set
-	the PHOTO attribute if image_set == TRUE.
-	(image_chooser_changed): new function, set image_set = TRUE and
-	call widget_changed.
-	(e_contact_editor_init): init image_set to FALSE.
-	(_address_arrow_pressed): quiet compiler.
-
-2004-02-17  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53620 ]
-	
-	* gui/merging/eab-contact-compare.c (eab_contact_compare_name): ""
-	is a valid (and common) value for elements of EContactName now.
-	it's semantically equivalent to NULL in the old ECard foo.
-
-2004-02-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_contacts): free up
-	the list returned by e_book_get_contacts.
-
-2004-01-12  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-component.c (delete_addressbook_cb):
-	Fix capitalization of Address Book usage in sentence form
-	* gui/component/ldap-config.glade: Use Address Book instead of
-	Addressbook in here (Patch from Aaron Weber <aaron@ximian.com>)
-
-2004-02-11  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-component.c (delete_addressbook_cb):
-	(fill_popup_menu_callback):
-	* gui/widgets/e-addressbook-view.c (init_collection):
-	* gui/widgets/eab-gui-util.c (eab_error_dialog):
-	* gui/widgets/eab-popup-control.c (eab_popup_control_contstruct):
-	Address Book, not Addressbook
-
-	Fixes #54166 and #54120
-
-2004-02-10  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: build importers dir
-
-2004-02-08  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-migrate.c (create_groups): Initialize the
-	personal_source to NULL
-
-	Fixes #54015
-
-2004-02-08  Sivaiah Nallagatla <snallagatla@novell.com>
-                                                                                
-        * gui/widgets/e-addressbook-view.c (delete) : pass contact
-        as an argument instead of contact id to e_book_async_remove_contact
-
-2004-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (create_groups): don't
-	bother using a function-wide variable to store the personal
-	source.  also, use g_build_filename properly (because fejj is a
-	whiner.)
-	(migrate_local_folders): same (wrt fejj whining).
-
-2004-02-06  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_new_control): Hide the
-	border on the notebook also
-	* gui/widgets/e-addressbook-view.c (eab_view_new): Don't pack another
-	scrolled window inside of a scrolled window, just pack the contact
-	display inside the paned, since it already has a scrolled window
-
-2004-02-06  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: Use "Address Book" instead of
-	"folder" or "Addressbook" for the "Address Book Sources..." and
-	copy/move contact menu items
-
-	Fixes #53654
-
-2004-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* importers/evolution-ldif-importer.c (getNextLDIFEntry): only set
-	the address if something in it's been filled in.
-	(resolve_list_card): build up a separate list representing the xml
-	formatted crud.
-	(process_item_fn): remove FIXME.
-	(factory_fn): use g_new0 since we test for NULL-ness later on.
-
-	* importers/evolution-vcard-importer.c (factory_fn): use g_new0
-	since we test for NULL-ness later on.
-
-2004-02-06  JP Rosevear <jpr@ximian.com>
-
-	* importers/evolution-ldif-importer.c (importer_destroy_cb):
-	implement
-
-2004-02-06  JP Rosevear <jpr@ximian.com>
-
-	* importers/evolution-vcard-importer.c (importer_destroy_cb):
-	implement
-	(load_file_fn): use g_file_get_contents to get a string we can
-	convert to a contact list with eab_contact_list_from_string 
-
-2004-02-06  JP Rosevear <jpr@ximian.com>
-
-	* importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
-	shlib importer info
-
-	* importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in: 
-	ditto
-	
-	* importers/Makefile.am: build shlib addressbook importers
-
-	* importers/evolution-ldif-importer.c: First crack at resurrecting
-
-	* importers/evolution-vcard-importer.c: ditto
-	
-2004-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (on_url_requested): remove
-	some spew, and add an evo-icon: handler, for things in evolution's
-	imagedir.
-	(render_address): hack up the html.
-	(render_name_value): new function, just render a name/value/icon.
-	(render_attribute): split out most of this function into
-	render_name_value.  this just checks to see if the EContact
-	attribute has something in it before passing it along.
-	(render_contact_list): split this out from
-	eab_contact_display_render_normal.
-	(start_block): new function, insert a row of height 20 with a
-	header.
-	(end_block): new function, insert a row of height 20.
-	(render_contact): split this out from
-	eab_contact_display_render_normal, and prettify the contact
-	display.
-	(eab_contact_display_render_normal): call render_contact and
-	render_contact_list.
-	(eab_contact_display_new): create a scrolled window and add the
-	GtkHTML to it so we actually have scrollbars.
-
-2004-02-03  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/Makefile.am (INCLUDES): add
-	widgets/misc for e-activity-handler.h
-
-2004-02-03 Sivaiah Nallagatla <snallagatla@novell.com>
-
-        * gui/component/addressbook-config.c (dialog_to_source)
-        (source_to_dialog) : use gtk_spin_button_* apis to get and set
-        values for download limit spin button instead of gtk_entry
-        Fixes #53432
-
-2004-02-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (eab_view_new): hook up
-	contact_changed/contact_removed signals.
-	(contact_changed): new function.  if the changed contact is the
-	one we're displaying, re-render it.
-	(contact_removed): new function.  if the removed contact is the
-	one we're displaying, clear the display.
-	(render_contact): set displayed_contact to the row.
-	(eab_view_init): init displayed_contact to -1.
-	(selection_changed): set displayed_contact to -1 when we clear the
-	display.
-	
-	* gui/widgets/e-addressbook-view.h (struct _EABView): add
-	"displayed_contact" so we can update the contact preview when it
-	changes.
-
-2004-01-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: enable d&d drop photos.
-
-	* gui/contact-editor/contact-editor.glade: use
-	eab_create_image_chooser_widget for the d&d'able image.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: abstract out
-	all the d&d image support (it's now in
-	widgets/misc/e-image-chooser.[ch]).
-
-	* gui/contact-list-editor/contact-list-editor.glade: use
-	eab_create_image_chooser_widget for the d&d'able image.
-
-	* gui/widgets/eab-gui-util.c (eab_create_image_chooser_widget):
-	new function.
-
-	* gui/widgets/eab-gui-util.h: add prototype for
-	eab_create_image_chooser_widget.
-
-2004-01-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/eab-gui-util.c (source_selection_changed_cb): Implement.
-	(eab_select_source): Implement. Public function that prompts user to
-	select a source from a list.
-	(eab_transfer_contacts): Enable and use eab_select_source () and
-	ESource, instead of old shell folder/URI stuff.
-
-2004-01-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/ldap-config.glade: Changed "Finish" to "Apply" in
-	dialog finish page text.
-
-2004-01-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-config.c (dialog_to_source): Sync the
-	modified source list.
-
-	* gui/component/addressbook-component.c (delete_addressbook_cb): Sync
-	the modified source list.
-
-2004-01-29  Chris Toshok  <toshok@m198-139.dsl.rawbw.com>
-
-	* gui/component/addressbook-migrate.c (setup_progress_dialog): use
-	the MigrationContext struct.
-	(dialog_close): same.
-	(dialog_set_folder_name): same.
-	(dialog_set_progress): same.
-	(migrate_contacts): same, and pass it along to other functions.
-	(migrate_contact_folder_to_source): same.
-	(migrate_contact_folder): same.  also, add the old path/uid to the
-	folder_uid_map.
-	(migrate_local_folders): same.
-	(create_groups): use the MigrationContext struct.
-	(migrate_completion_folders): if it's a file uri, look up the old
-	path in our hash table for a uid to use.  otherwise use the old
-	behavior.
-	(migration_context_new): new function, initialize the
-	MigrationContext.
-	(migration_context_free): free up everything.
-	(addressbook_migrate): create the context, pass it to everything,
-	destroy the context, shine toshok's shoes, etc.
-
-2004-01-29  Radek Doulik  <rodo@ximian.com>
-
-	* gui/component/addressbook-config.c (dialog_to_temp_source): set
-	group to temporary source
-
-2004-01-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Get file_as instead of full_name.
-
-	* gui/compoent/select-names/e-select-names.etspec: Show the file_as
-	column instead of full_name.
-
-2004-01-27  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_set_property): Handle NULL name. Fixes
-	#53071.
-
-2004-01-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (dialog_to_source): set the
-	relative_uri of a local source to be its uid.
-
-	* gui/component/addressbook-migrate.c
-	(migrate_contact_folder_to_source): remove the dest_group arg,
-	since we don't use it.
-	(migrate_contact_folder): set the relative uri of the source to be
-	its uid.
-	(PERSONAL_RELATIVE_URI): "Personal" -> "system".
-	(create_groups): don't actually make the directory hierarchy for
-	the personal folder here.  let e-d-s do that.  Also remove
-	OnThisComputer from the base uri.
-	(migrate_local_folders): track change to
-	migrate_contact_folder_to_source.
-
-2004-01-26  Chris Toshok  <toshok@ximian.com>
-
-	[ Should fix #53361 and other migration problems/crashes ]
-	* gui/component/addressbook-migrate.c
-	(migrate_contact_folder_to_source): new function, takes most of
-	migrate_contact_folder's contents.  Fix some of the refcounting
-	problems though, by not unreffing dest_group, and using
-	e_group_add_source instead of e_source_set_group.
-	(migrate_contact_folder): convert to calling
-	migrate_contact_folder_to_source.
-	(create_groups): add an out parameter for *personal_source.
-	(migrate_local_folders): add personal_source as an arg, so we can
-	get the source that create_groups created/found.  Call
-	migrate_contact_folder_to_source for the personal_source.
-	(addressbook_migrate): pass personal_source to
-	migrate_local_folders.
-
-2004-01-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #53238 ]
-	* util/eab-destination.c (nonempty): make this accept NULL's (and
-	return FALSE for them).
-	(eab_destination_is_empty): shorten some of the tests since
-	nonempty takes NULL now.
-	(eab_destination_get_address): only call
-	camel_internet_address_add if both name and email are non-empty.
-	otherwise call camel_address_decode and let camel try to deal with
-	it.
-	(eab_destination_xml_encode): call xmlEncodeEntitiesReentrant on
-	the strings before adding them to the xml, so people that enter
-	[<>&] won't end up with broken EABDestinations.
-
-2004-01-26  Radek Doulik  <rodo@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (selection_received): make sure
-	we pass \0 terminated string to eab_contact_list_from_string
-	[it may fix #51743]
-
-2004-01-25  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #51171 ]
-	* gui/widgets/eab-gui-util.c (eab_send_contact_list): get this
-	working.
-
-2004-01-24  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (e_select_names_init):
-	Select Contacts from Address Book, not Contents
-
-	Fixes #53263
-
-2004-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_local_folders):
-	oops.
-	(migrate_contact_folder): fix the unreffing.
-
-2004-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_local_folders): use
-	_("Personal"), not "Personal".
-
-2004-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_local_folders):
-	don't create/add the source here.  it's done in
-	migrate_contact_folder.
-
-2004-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_local_folders): use
-	e_folder_map_local_folders.
-	(find_addressbook_dirs): nuke.
-
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (init_collection): use
-	.evolution to store view info
-
-2004-01-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #52571 ]
-	* util/eab-book-util.c (escape): ugh.  name fields that have \"
-	around the name break our queries, because it turns it into (for
-	instance): (contains "full_name" ""Toshok"").  so we need to turn
-	that into: (contains "full_name" "\"Toshok\"").
-	(eab_name_and_email_query): escape both the name and email, and
-	use an EBookQuery instead of passing the string to
-	e_book_async_get_contacts.  Looks like ross missed a couple of
-	spots.
-	(eab_nickname_query): same.
-
-	* gui/component/addressbook.c (free_load_source_data): new
-	function, free up the data and unref the source if there is one.
-	(load_source_auth_cb): call free_load_source_data instead of just
-	g_free'ing the struct.
-	(load_source_cb): same.
-	(default_book_cb): new function, we need this so we can fill in
-	the source for the default book.  get the source, then call
-	load_source_cb to continue processing as normal.
-	(addressbook_load_default_book): use default_book_cb instead of
-	load_source_cb.
-
-2004-01-22  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53184 ]
-	* gui/component/addressbook-migrate.c (migrate_contacts): handle
-	the fact that the xml 1.4 spits out contains unescaped ';'s in the
-	EMAIL attributes for mailing lists.
-
-2004-01-22  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #52944 ]
-	* gui/component/addressbook-migrate.c (migrate_contacts): do some
-	massaging of contacts as we import them, to fix up the differences
-	between 1.4 and 1.5 vcards.
-
-2004-01-21  Nat Friedman <nat@novell.com>
-
-	* gui/contact-editor/contact-editor.glade: Added missing
-	entry-blog widget.
-
-2004-01-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-config.c (create_source_dir): Remove.
-	(dialog_to_source): Don't create source dir, backend takes care of
-	that now.
-
-2004-01-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_peek_gconf_client): new function.
-
-	* gui/component/addressbook-component.h: add prototype for
-	addressbook_component_peek_gconf_client.
-
-	* gui/component/addressbook-migrate.c
-	(migrate_completion_folders): more gross hacking.  migrate the
-	completion settings.
-	(get_source_by_uri): function to search for an ESource given the
-	entire uri.  used for migrate_completion_folders.
-	(migrate_ldap_servers): get_string_value -> get_string_child.
-	same with get_integer_child.
-	(get_string_child): rename to make it apparent it's a child, not a
-	property.
-	(get_integer_child): same.
-	(addressbook_migrate): call migrate_completion_folders.
-
-2004-01-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (new_target_cb): call
-	widget_changed here too, since we're changing the destination.
-
-2004-01-20  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #52955 ]
-	* gui/merging/eab-contact-compare.c (use_common_book_cb): handle
-	the case properly where there are no query parts (p == 0).
-	Instead of passing "" to e_book_query_from_string, just set the
-	query to NULL.
-
-	* util/eab-book-util.c (eab_contact_list_to_string): we need to
-	put a blank line here, so \r\n\r\n, not just \r\n.
-
-2004-01-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (create_groups): deal with
-	the groups/sources already being there.  Essentially make this
-	function idempotent.
-	(addressbook_migrate): unconditionally call create_groups now.
-	move the version logic here from ipl_upgradeFromVersion, and
-	include more versions in the set of those we upgrade from.
-
-	* gui/component/addressbook-migrate.h: add major/minor/revision
-	args to addressbook_migrate.
-
-	* gui/component/addressbook-component.c (impl_upgradeFromVersion):
-	remove the version logic from here.
-
-2004-01-20 Sivaiah Nallagatla   <snallagatla@novell.com>
-
-	* printing/e-contact-print.c (e_contact_print_response): do not 
-	try to unref when query is NULL
-
-2004 -01-20 Sivaiah Nallagatla  <snallagatla@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (edit_im_clicked) : do not call
-	gtk_tree_model_get when nothing in the list is selected 
-
-2004-01-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/select-names/e-select-names.etspec: Get name from
-	correct model column.
-
-2004-01-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* printing/e-contact-print.c (complete_sequence): Only unref if we
-	have a query.
-
-2004-01-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(get_primary_source): Implement.
-	(load_primary_selection): Use get_primary_source ().
-	(impl_requestCreateItem): Use get_primary_source (), fixing a crash
-	when we're asked to create a new item and we don't have the controls.
-
-2004-01-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook.c (load_source_auth_cb): Don't run
-	callback if the action was cancelled.
-	(load_source_cb): Ditto.
-	(addressbook_load_source): Return an ID for the load attempt.
-	(addressbook_load_source_cancel): Implement, allows cancelling a
-	load attempt.
-
-	* gui/contact-editor/e-contact-editor.c (new_target_cb): Clear the
-	values for in-progress load operation. Only unref new_book if it's
-	non-NULL.
-	(cancel_load): Implement. Cancels the load operation if one is in
-	progress.
-	(source_selected): Cancel any running load operation before starting
-	a new one. Set up in-progress values.
-	(e_contact_editor_init): Clear the in-progress values.
-	(e_contact_editor_dispose): Cancel load operation.
-	(e_contact_editor_set_property): If a new target book is set, cancel
-	any conflicting load operation in progress.
-
-	* gui/widgets/e-addressbook-view.c (set_paned_position): Remove
-	debug output.
-	(get_paned_position): Ditto.
-
-2004-01-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook.c (set_prop): only set the menus and
-	command state if we actually are already displayed, otherwise wait
-	for activation
-
-2004-01-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (set_paned_position): Implement.
-	(get_paned_position): Implement.
-	(eab_view_new): Connect signal to get paned position changes.
-	Remove old hack.
-	(display_view): Set paned position properly.
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_upgradeFromVersion):
-	revert dumb upgrade change
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_upgradeFromVersion):
-	migrate from 1.5.0 and 1.5.1 properly
-
-2004-01-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: de-bold ui elements
-
-2004-01-09  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c (add_popup_menu_item): Take a
-	sensitivity flag per menu item, and fall back to stock icons.
-	(delete_addressbook_cb): Implement.
-	(fill_popup_menu_callback): Reorder items, remove "remove" item, set
-	sensitivity.
-
-	* gui/component/ldap-config.glade: "Edit LDAP Server" ->
-	"Addressbook Properties".
-
-2004-01-11  Christian Hammond  <chipx86@gnupdate.org>
-
-	* addressbook/gui/contact-editor/e-contact-editor-im.[ch],
-	  addressbook/gui/contact-editor/im.glade: Added a dialog for
-	  adding a new IM account.
-	* addressbook/gui/contact-editor/Makefile.am: Added the previously
-	  mentioned files, and depend on camel for necessary MIME parsing.
-
-	* addressbook/gui/contact-editor/contact-editor.[ch],
-	  addressbook/gui/contact-editor/contact-editor.glade: Add and implement
-
-2004-01-09  Ross Burton  <ross@burtonini.com>
-
-	* gui/component/select-names/e-select-names-completion.c:
-	* gui/merging/eab-contact-compare.c:
-	* gui/widgets/e-addressbook-model.c:
-	* printing/e-contact-print.c:
-	Update for API changes to e-book-async.
-
-2004-01-08  Ross Burton  <ross@burtonini.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	* gui/contact-editor/e-contact-editor.c:
-	Add the video conferencing field.
-
-2004-01-07  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c:
-	* gui/component/select-names/select-names.glade: Make the ESelectNames
-	object be a HIG-compliant dialog, change "Folder" to be "Address Book",
-	and fix a mnemonic conflict with "Category" and "Cancel"
-
-	Fixes #51966
-
-2004-01-07  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-component.c: Move the smime_component_init
-	call to the instance init callback, rather than the class init, and
-	wrap it in #if HAVE_NSS, so the addressbook works without smime support
-
-2004-01-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/Makefile.am: link in printer stuff
-
-	Fixes #51172
-
-2004-01-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (check_for_conflict): remove
-	spew.
-	(migrate_contacts): same.
-	(migrate_contact_folder): same.
-	(migrate_local_folders): same, and plug a leak.
-
-2004-01-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	add addressbook-migrate.[ch].
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_init): remove the source creation from
-	here, it's in the migration code now.
-	(impl_upgradeFromVersion): new function, call the
-	addressbook-migration stuff.
-	(addressbook_component_class_init): fill in
-	epv->upgradeFromVersion, and call smime_component_init.
-	(addressbook_component_peek_base_directory): new function.
-	(addressbook_component_peek_source_list): same.
-
-	* gui/component/addressbook-component.h: add prototypes for
-	_peek_base_directory and _peek_source_list.
-
-	* gui/component/addressbook-migrate.[ch]: add migration code to
-	convert stuff from 1.x over to 1.5/2.0.
-
-2004-01-06  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c: Apply
-	patch from Roozbeh Pournader to update countries list
-
-	Fixes #48151
-
-2004-01-06  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_info_cleanup): disconnect from selection-done signal
-
-2004-01-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook.c
-	(addressbook_show_load_error_dialog): these line breaks in the
-	error messages should actually be spaces
-
-	Fixes #51732
-	
-2003-12-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c (find_first_source): Impl.
-	from calendar.
-	(save_primary_selection): Implement, similar to calendar.
-	(load_primary_selection): Implement, similar to calendar.
-	(primary_source_selection_changed_callback): Save selection.
-	(impl_createControls): Load selection.
-
-2003-12-18  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (widget_changed):
-	editable -> target_editable
-	(e_contact_editor_get_property): Same.
-	(_email_arrow_pressed): Same.
-	(enable_writable_fields): Same.
-	(set_editable): Same.
-	(contact_added_cb): Make sure source book is editable before trying
-	to remove contact from there.
-	(e_contact_editor_init): Set up source/target editability.
-	(command_state_changed): Allow save only if target editable. Allow
-	delete only if source editable.
-	(e_contact_editor_set_property): Set editability flags for
-	source/target.
-
-	* gui/contact-editor/e-contact-editor.h: Add source_editable,
-	target_editable flags in place of old editable flag.
-
-2003-12-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (eab_view_class_init): install
-	the "source" property.
-	(eab_view_init): init eav->source to NULL.
-	(eab_view_dispose): disconnect the ecml_changed_id and unref
-	source.
-	(eab_view_new): create the search bar here.
-	(view_preview): c&p the mailer's code mostly for this - this is
-	the toggle listener for the Preview Pane menuitem.
-	(setup_menus): add a listener for the ContactsViewPreview toggle.
-	(eab_view_set_property): sensitize the search bar based on whether
-	or not we have a book set.  This makes it so you can't search
-	until the book is loaded.  Also add handling for the "source"
-	attribute and print a warning when it's set multiple times
-	(something that's not supported at the moment.)
-	(eab_view_get_property): add "source" case.
-	(search_activated, query_changed, compare_subitems, make_subitems,
-	ecml_changed, get_master_list, connect_master_list_changed): move
-	this here from addressbook.c
-	(eab_view_show_contact_preview): implement - just show or hide the
-	scrolled window.
-	(eab_view_setup_menus): call e_search_bar_set_ui_component here,
-	kind of a hack.
-
-	* gui/widgets/e-addressbook-view.h: make this inherit from GtkVBox
-	instead of GtkEventBox since we'll be packing children.  Add a
-	prototype for eab_view_show_contact_preview.
-
-	* gui/component/addressbook.c (get_current_view): return the
-	EABView associated with the active notebook page.
-	(save_contact_cb): use the current view.
-	(view_contact_cb): same.
-	(search_cb): same.
-	(delete_contact_cb): same.
-	(print_cb): same.
-	(print_preview_cb): same.
-	(stop_loading_cb): same.
-	(cut_contacts_cb): same.
-	(copy_contacts_cb): same.
-	(paste_contacts_cb): same.
-	(select_all_contacts_cb): same.
-	(send_contact_cb): same.
-	(send_contact_to_cb): same.
-	(copy_contact_to_cb): same.
-	(move_contact_to_cb): same.
-	(update_command_state): same.
-	(change_view_type): nuke, nothing uses this.
-	(control_activate): use the current view.
-	(control_activate_cb): same.
-	(source_list_changed_cb): new function, remove the notebook pages
-	(and destroy the EABView's) for sources that no longer exist.
-	(addressbook_view_clear): dispose of the uid_to_view hash.
-	(book_open_cb): store the ESource on the EABView too.  this
-	function now takes a struct containing both EABView and ESource
-	since we can't store either in the AddressbookView.
-	(set_prop): if we have a view already for this uid, bring it up.
-	otherwise create a new one and start the book loading.
-	(addressbook_search_activated): nuked - this is being moved to
-	e-addressbook-view.
-	(addressbook_query_changed): same.
-	(compare_subitems, make_subitems, ecml_changed,
-	connect_master_list_changed): same.
-	(addressbook_new_control): simplify things a bunch.  create a
-	notebook to store the views in.  the search/vbox stuff is gone.
-	use e_source_list_new_for_gconf_default, and handle the source
-	list's "changed" signal.
-	
-2003-12-17  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/autocompletion-config.c:
-	(autocompletion_config_control_new): Embed Tree in GtkScrolledWindow
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (contact_added_cb): Update
-	the contact's UID after normal add.
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_show_load_error_dialog):
-	Make a public function that shows an error dialog, which can be used
-	when a source fails to load.
-	(book_open_cb): Call addressbook_show_load_error_dialog () on error.
-	(set_prop): Don't reuse the book when loading a new source. This was
-	confusing the contact-editor, which gets the book passed in.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	Make "source_book" and "target_book" distinct properties.
-	(new_target_cb): Implement.
-	(source_selected): Implement.
-	(contact_moved_cb): Implement.
-	(contact_added_cb): Handle the case where source_book != target_book as
-	a move - if the add was successful, remove contact from source book.
-	(save_contact): Handle case where source_book != target_book.
-	(delete_cb): "book" renamed to "source_book".
-	(e_contact_editor_init): Set up source_selected signal.
-	(e_contact_editor_dispose): Dispose of both source and target books.
-	(e_contact_editor_new): "book" renamed to "source_book".
-	(e_contact_editor_set_property): If a source book is set, and we don't
-	have a target book, make target_book == source_book. Allow setting
-	target book, and base editability on that. If we're editing an existing
-	contact, treat book change as a change, and update command state.
-	(e_contact_editor_get_property): Allow getting target book.
-	(set_source_field): Indicate the selected book.
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (set_source_field): Implement.
-	Makes the source menu reflect the source for the current book.
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_create_source_option_menu): Implement. Creates
-	source selection option menu.
-
-	* gui/contact-editor/contact-editor.glade: Add source selection custom
-	widget.
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_is_cell_editable): Disable cell editing.
-
-2003-12-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (address_to_text): Implement.
-	(text_to_address): Implement, using EAddressWestern.
-	(address_text_changed): Adapt to EContactAddress.
-	(full_addr_clicked): Ditto. Fix field IDs.
-	(e_contact_editor_init): Init address_choice.
-	(_email_arrow_pressed): Fix field IDs.
-	(_address_arrow_pressed): Adapt to EContactAddress and fix field IDs.
-	(find_address_mailing): Leave out for now. Addresses don't have flags
-	anymore...
-	(set_fields): Adapt to EContactAddress and fix field IDs. Make sure
-	changes to other widgets don't make us go back to the first listed
-	address.
-	(set_address_field): Adapt to EContactAddress and fix field IDs.
-	(enable_writable_fields): Ditto.
-	(fill_in_info): Disable find_address_mailing () for now.
-
-2003-12-10  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): Make "address" a boxed type.
-	(e_contact_editor_address_init): Set address to NULL.
-	(e_contact_editor_address_dispose): Free address.
-	(e_contact_editor_address_new): Take an EContactAddress.
-	(e_contact_editor_address_set_property): Re-implement setting the
-	address property.
-	(e_contact_editor_address_get_property): Ditto for getting.
-	(fill_in_info): Enable, use EContactAddress fields.
-	(extract_info): Ditto.
-
-	* gui/contact-editor/e-contact-editor-address.h:
-	Re-enable the address field, as EContactAddress.
-
-2003-12-09  JP Rosevear <jpr@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):
-	free email list properly
-
-2003-12-09  JP Rosevear <jpr@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (extract_info):
-	free the list, not unref it, and free the elements
-
-	Fixes #51976
-	
-2003-12-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(open_book_cb): change prototype to fix warning, and change the
-	comment to read load_source instead of load_uri (which isn't what
-	we use anymore.)
-	(update_completion_books): just use our source list for this.
-	check the "completion" source property.
-	(source_list_changed): recreate the completion books.
-	(e_select_names_manager_init): connect to the source_list's
-	changed signal.
-	(e_select_names_manager_dispose): don't need to free the
-	completion_uids list anymore.
-
-	* gui/component/select-names/e-select-names-config.c
-	(e_select_names_config_get_completion_books,
-	e_select_names_config_set_completion_books,
-	e_select_names_config_add_notification_completion_books): remove.
-
-	* gui/component/select-names/e-select-names-config.h: remove the
-	completion books calls, since we can just use the source list.
-
-	* gui/component/component-factory.c (factory): create the
-	autocompletion control.
-
-	* gui/component/autocompletion-config.[ch]: new config control for
-	selecting completion folders.  Uses e-source-selector.  Could
-	probably be beautified a bit.
-	
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	add autocompletion-config.[ch]
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: remove
-	the ldap config control server, and add the autocompletion one.
-
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* */Makefile.am: Remove hard coded disable deprecated flags
-	
-2003-12-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/select-names/select-names.glade: no more custom
-	widget for the selection of the search source
-
-	* gui/component/select-names/e-select-names.h: add member
-
-	* gui/component/select-names/e-select-names.etspec: update model
-	column
-
-	* gui/component/select-names/e-select-names.c (find_first_source):
-	find the first source in the list
-	(addressbook_model_set_source): we have the source to set directly
-	now
-	(source_selected): listen for the source item to change
-	(e_select_names_init): create a source option menu and hook it up
-	(e_select_names_dispose): destroy the source list
-	(e_select_names_new): do away with the config setup here
-
-	* gui/component/select-names/e-select-names-manager.h: update
-	members
-
-	* gui/component/select-names/e-select-names-manager.c
-	(update_completion_books): add books based on source uid
-	(config_completion_books_changed_cb): handle the completion list
-	changing
-	(config_min_query_length_changed_cb): handle minimum query length
-	changing
-	(e_select_names_manager_new): we don't do the settings stuff here
-	any more
-	(e_select_names_manager_init): do the initial set up here for the
-	book loaded and listen for changes
-	(e_select_names_manager_dispose): destroy the new stuff
-
-	* gui/component/select-names/e-select-names-config.[hc]: config
-	information
-
-	* gui/component/select-names/e-select-names-config-keys.h: the
-	config keys
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_activate_dialog): do away with the shell client
-	stuff
-
-	* gui/component/select-names/Makefile.am: build new files
-
-2003-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (book_view_loaded): call
-	remove_book_view/free_data here as well, to guard against multiple
-	book_view's being loaded.
-
-2003-12-05  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/e-addressbook-view.etspec: Clean up and sync with
-	current model columns.
-
-2003-12-04  Christian Hammond  <chipx86@gnupdate.org>
-
-	* addressbook/gui/contact-editor/e-contact-editor-im.[ch],
-	  addressbook/gui/contact-editor/im.glade: Added a dialog for
-	  adding a new IM account.
-	* addressbook/gui/contact-editor/Makefile.am: Added the previously
-	  mentioned files, and depend on camel for necessary MIME parsing.
-
-	* addressbook/gui/contact-editor/contact-editor.[ch],
-	  addressbook/gui/contact-editor/contact-editor.glade: Add and implement
-	  the Instant Messaging tab.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c
-	(retrieve_shell_view_interface_from_control): Remove.
-	(set_folder_bar_label): Remove.
-	(addressbook_new_control): Don't connect.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-config.c: Do not depend on
-	e-folder-list.
-
-	* gui/component/select-names/e-select-names.c: Remove dependency
-	on evolution-folder-selector-button.
-	(e_addressbook_create_folder_selector): Just return a FIXME label
-	for now.
-	(folder_selected): #if 0 out.
-	(e_select_names_init): Do not connect.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): Don't get a shell_client
-	arg anymore.
-	(load_completion_books): Stub out.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_new): Don't get an EvolutionShellClient anymore.
-	Don't create the folder selector button for now.
-
-	* gui/component/select-names/e-select-names.h: Remove dependency
-	on evolution-shell-client.
-
-	* gui/component/select-names/e-select-names-bonobo.c: Remove
-	dependency on evolution-shell-client.
-	(impl_SelectNames_activate_dialog): Stub out.
-
-	* gui/widgets/eab-gui-util.c: Remove dependency on
-	evolution-shell-client.
-	(eab_transfer_contacts): Stub out.
-
-2003-12-02  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/Makefile.am: Version the schemas
-	* gui/component/apps_evolution_addressbook.schemas: Removed
-	* gui/component/apps_evolution_addressbook.schemas.in.in: Added
-
-2003-12-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (set_status_message): Call
-	e_activity_handler_operation_finished() on the current activity ID
-	when done.
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (struct AddressbookView): Replace
-	activity_client with activity_id.
-	(set_status_message): Use the EActivityHandler from the
-	AddressbookComponent.
-
-	* gui/component/addressbook-component.c (struct
-	_AddressbookComponentPrivate): New member activity_handler.
-	(addressbook_component_init): Init.
-	(impl_dispose): Unref.
-	(addressbook_component_peek_activity_handler): New.
-	(impl_createControls): Return an ETaskBar as the statusbar control
-	and attach it to the activity handler.
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_createControls):
-	Pass a label for the status bar control for now.
-
-2003-12-01  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/Makefile.am (INCLUDES): remove
-	GTK_DISABLED_DEPRECATED so that we can build with gtk-2.3.
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	* gui/component/addressbook-config.c:
-	* gui/component/addressbook.c:
-	* gui/component/component-factory.c:
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
-	* gui/component/select-names/e-select-names-bonobo.c:
-	* gui/component/select-names/e-select-names-factory.c:
-	* gui/widgets/eab-gui-util.c:
-	* gui/widgets/eab-vcard-control.c: Use BASE_VERSION for repo_ids and
-	  OAFIIDs
-
-2003-12-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/ldap-config.glade: Fix start page text.
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* conduit/Makefile.am: use privconduitdir
-
-	* conduit/e-address.conduit.in: subst right thing
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* conduit/e-address.conduit.in: specify privlibdir as the location
-
-	* conduit/Makefile.am: install the conduit to privlibdir
-
-2003-12-01  JP Rosvear <jpr@ximian.com>
-
-	* conduit/Makefile.am: version the .conduit file
-
-2003-12-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/new-addressbook.glade: Remove this too.
-
-	* gui/component/Makefile.am (glade_DATA): Remove new-addressbook.glade.
-
-2003-12-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	Remove addressbook-storage.[ch] and new-addressbook.[ch].
-
-	* gui/component/addressbook-storage.[ch]: Removed from repository.
-
-	* gui/component/new-addressbook.[ch]: Removed from repository.
-
-	* gui/component/addressbook-component.c (load_uri_for_selection):
-	Set source_uid property on view control, not folder_uri.
-	(new_addressbook_cb): Call addressbook_config_create_new_source ().
-	(edit_addressbook_cb): Implement.
-	(fill_popup_menu_callback): Hook up edit_addressbook_cb ().
-	(addressbook_component_init): Create the LDAP source group.
-
-	* gui/component/addressbook-config.c (AddressbookSourceDialog):
-	Take out the NEW_ADVANCED_UI stuff and add ESource related vars.
-	(ldap_unparse_auth)
-	(ldap_parse_auth)
-	(ldap_unparse_scope)
-	(ldap_unparse_ssl)
-	(ldap_parse_ssl): Moved here from addressbook-storage.c.
-	(addressbook_dialog_get_source)
-	(addressbook_dialog_set_source)
-	(objectclasses_create_server_table)
-	(objectclasses_create_evolution_table)
-	(objectclasses_add_foreach)
-	(objectclasses_add)
-	(objectclasses_sever_double_click)
-	(objectclasses_remove_foreach)
-	(objectclasses_remove)
-	(objectclasses_evolution_double_click)
-	(objectclasses_restore_default)
-	(server_selection_model_changed)
-	(evolution_selection_model_changed)
-	(setup_objectclasses_tab): Nuke aging, unfinished NEW_ADVANCED_UI.
-	(add_source_clicked)
-	(edit_source_clicked)
-	(delete_server)
-	(delete_source_clicked)
-	(ldap_config_control_destroy_callback)
-	(ldap_config_control_apply_callback)
-	(sources_selection_changed)
-	(sources_table_row_activated)
-	(ldap_dialog_new)
-	(addressbook_dialog_create_sources_table)
-	(ldap_config_control_new)
-	(addressbook_config_control_new): Nuke config control.
-	(create_source_dir)
-	(dialog_to_source)
-	(dialog_to_temp_source)
-	(source_to_uri_parts)
-	(source_to_dialog)
-	(source_group_changed_cb)
-	(source_group_menu_add_groups)
-	(folder_page_forward)
-	(finish_page_back): Implement.
-	(addressbook_ldap_init): Take ESource instead of AddressbookSource.
-	(addressbook_ldap_auth): Don't take a source, not needed.
-	(addressbook_root_dse_query): Ditto.
-	(addressbook_source_dialog_destroy): Clean up destroy function.
-	(addressbook_add_server_druid_finish): Clean up, create ESource.
-	(general_tab_check): If it's not LDAP, these options don't matter.
-	(do_ldap_root_dse_query): Source no longer needed here.
-	(query_for_supported_bases): Use a temp source generated from
-	current dialog settings.
-	(display_name_page_prepare): Renamed to folder_page_prepare ().
-	(druid_display_name_page_modify_cb): Renamed to
-	druid_folder_page_modify_cb ().
-	(addressbook_add_server_druid): Set up source list, group selector.
-	Make LDAP pages optional, dependent on selected group. Use ESource.
-	(edit_dialog_store_change): Remove config control list stuff,
-	export settings to ESource.
-	(addressbook_edit_server_dialog): Renamed to
-	addressbook_config_edit_source (), which takes an ESource. Remove
-	config control list stuff, make LDAP pages show up only if we have
-	an LDAP source. Remove NEW_ADVANCED_UI cruft.
-	(addressbook_config_create_new_source): Just call
-	addressbook_add_server_druid ().
-
-	* gui/component/addressbook-config.h: Move LDAP enums here, from
-	addressbook-storage.h.
-
-	* gui/component/addressbook.c (control_activate_cb): uri -> source
-	(addressbook_view_clear): Unref source list.
-	(book_open_cb): Use ESource.
-	(load_uri_auth_cb): Renamed to load_source_auth_cb (), manipulate
-	ESource instead of URI.
-	(get_remember_password): Implement.
-	(set_remember_password): Implement.
-	(addressbook_authenticate): Use ESource properties.
-	(load_uri_cb): Renamed to load_source_cb (), ESource adaptation.
-	(addressbook_load_uri): Renamed to addressbook_load_source (), takes
-	ESource.
-	(addressbook_load_default_book): ESource adaptation.
-	(get_prop): folder_uri property -> source_uid property.
-	(set_prop): folder_uri property -> source_uid property. Find ESource
-	by UID.
-	(addressbook_new_control): Set up source_uid property and ESourceList.
-
-	* gui/component/component-factory.c (factory): Disable config control.
-
-	* gui/component/ldap-config.glade: Druid and notebook dialogs
-	generalized to deal with local sources as well as LDAP. This file
-	should probably be renamed...
-
-	* gui/component/select-names/e-select-names-manager.c
-	(load_completion_books): Use addressbook_load_source (). However, this
-	needs a bit more work to get source UIDs instead of URIs.
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): Use addressbook_load_source (). However,
-	this needs a bit more work to get source UIDs instead of URIs.
-
-2003-11-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/widgets/Makefile.am: turn on deprecated gtk and libgnomeui
-	stuff
-
-	* gui/component/select-names/Makefile.am: turn on deprecated gtk
-	stuff
-
-	* gui/contact-editor/Makefile.am: ditto
-	
-2003-11-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_createControls): Store
-	a ref to the source selector.
-	(impl_requestCreateItem): Implement.
-	(impl_dispose): Unref the source selector.
-	(addressbook_component_init): Set up default sources.
-
-	* gui/widgets/e-addressbook-model.c (eab_model_set_property): If
-	the 'book' property is set, and editability changes, emit a signal
-	to that effect.
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/new-addressbook.c: include e-source from e-d-s
-
-2003-11-13  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_is_cell_editable): Return TRUE for all cells, for now.
-
-	* gui/widgets/e-addressbook-table-adapter.c (card_modified_cb):
-	Renamed to contact_modified_cb ().
-	(addressbook_set_value_at): Port to use EContact instead of ECard.
-	(addressbook_is_cell_editable): Ditto.
-	(addressbook_append_row): Ditto.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_set_property):
-	Make not editable, ever, and add a comment to this effect.
-	(e_minicard_label_realize): Ditto.
-
-	* gui/widgets/e-minicard.c (e_minicard_set_property): Ditto.
-	(add_field): Ditto.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(impl__get_userCreatableItems): New, implementation for the
-	userCreatableItems property.
-	(impl_requestCreateItem): New, implementation for the
-	requestCreateItem method.
-	(addressbook_component_class_init): Install.
-
-2003-11-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Add
-	component_alias of "contacts".
-
-2003-11-08  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	Add new-addressbook.[ch].
-	(glade_DATA): Add new-addressbook.glade.
-
-	* gui/component/addressbook-component.c (add_popup_menu_item):
-	Implement.
-	(new_addressbook_cb): Implement.
-	(delete_addressbook_cb): Implement (skeletal).
-	(fill_popup_menu_callback): Implement.
-	(impl_createControls): Hook up fill_popup_menu_callback().
-
-	* gui/component/new-addressbook.[ch]: New files.
-
-	* gui/component/new-addressbook.glade: New file.
-
-2003-11-07  Dan Winship  <danw@ximian.com>
-
-	* util/Makefile.am (INCLUDES): Remove some includes of directories
-	that don't exist any more
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/contact-editor/Makefile.am: don't include the c marshaller
-	file twice
-
-	* gui/widgets/Makefile.am: ditto
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/widgets/Makefile.am: make sure the marshal header is in the
-	source list
-
-	* gui/component/select-names/Makefile.am: ditto
-
-	* gui/contact-editor/Makefile.am: ditto
-
-	* gui/contact-list-editor/Makefile.am: ditto
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* util/Makefile.am: dist the marshal list
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (change_view_type): don't
-	destroy the widget here - its dead when removed from the paned
-	container
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* In the gui this is a search and replace commit for moving the
-	addressbook to evolution-data-server; it also deletes the old
-	backend files
-
-2003-11-05  Larry Ewing  <lewing@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (create_minicard_view): fix cast.
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names-factory.c: Update
-	factory ID.
-
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
-	Version the SelectNames server IDs by appending a "_2".
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Change
-	"evolution:config_item" into "evolution2:config_item".
-
-2003-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: add the
-	S/MIME config control here.
-
-2003-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c (e_book_listener_new): change
-	the poa hint to PER_REQUEST.  fixes a couple of deadlocks.
-
-2003-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/component-factory.c (factory): ifdef the smime
-	code with HAVE_NSS.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	conditionally include libevolution-smime.la.
-
-2003-10-24  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/Makefile.am (libpas_la_LIBADD): libpas should depend
-	on libebook, but NOT on libpasfile, etc, since it needs to be
-	linked into all backends, not just the wombat.
-	(libpasfile_la_LIBADD): depend on libpas.la and libedb3util.la
-	(libpasvcf_la_LIBADD): depend on libpas.la
-	(libpasldap_la_LIBADD): depend on libpas.la and  $(LDAP_LIBS)
-
-2003-10-23  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-contact.c (e_contact_date_equal): new util func
-
-	* backend/pas/pas-backend-ldap.c (anniversary_compare,
-	birthday_compare): Use it
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_check_contact): Check if an ID exists in the
-	summary.
-
-2003-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* tools/Makefile.am: convert 8 spaces to a tab.
-
-	* tools/.cvsignore: ignore evolution-addressbook-abuse and
-	evolution-addressbook-clean.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	add libevolution-smime.la.
-
-	* gui/component/component-factory.c (factory): add the certificate
-	manager config control stuff here, at least for now.
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: same.
-
-2003-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_dialog_create_source_table): fixed typo in variable name.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Add an
-	"evolution:button_icon" attribute.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Add an
-	"evolution:button_sort_order" property.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_createControls):
-	Make the the scrolled window have an "in" shadow.
-	* gui/component/addressbook-config.c
-	(addressbook_dialog_create_sources_table): Likewise.
-	* gui/widgets/e-addressbook-view.c (create_minicard_view): Likewise.
-	(create_treeview_view): Likewise.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_createControls): Set
-	the GtkScrolledWindow scrollbar policy to "automatic" for both the
-	horizontal and the vertical scrollbar.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Add an
-	"evolution:button_label" property on the component for use in the
-	shell.
-
-2003-10-21  JP Rosevear <jpr@ximian.com>
- 
- 	* conduit/address-conduit.c: make it work with the new ebook api
- 
- 	* backend/pas/pas-book.c (pas_book_respond_get_changes): put the
- 	vcard in for every change
- 
- 	* backend/pas/pas-backend.c (pas_backend_change_add_new): just use
- 	the vcard field
- 	(pas_backend_change_modify_new): ditto
- 	(pas_backend_change_delete_new): ditto
- 
- 	* backend/pas/pas-backend-file.c
- 	(pas_backend_file_changes_foreach_key): create a fake contact with
- 	the uid
- 	(pas_backend_file_get_changes): add the card to the changes
- 
- 	* backend/ebook/tests/ebook/test-changes.c (main): just print the
- 	uid
- 
- 	* backend/ebook/e-book.c (e_book_free_change_list): unref the
- 	contact
- 
- 	* backend/ebook/e-book-types.h: the change struct contains an
- 	EContact now
- 
- 	* backend/ebook/e-book-listener.c
- 	(impl_BookListener_respond_get_changes): create the contact from
- 	the vcard string
- 
- 	* backend/idl/addressbook.idl: Book change item is no longer a
- 	union, it always gives back a card
-	
-2003-10-21  Chris Toshok  <toshok@ximian.com>
-
-	* tools/evolution-addressbook-abuse.c: use the synchronous api for
-	this.  simplifies it a bunch.
-
-2003-10-21  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_remove): we can ill afford
-	bad debug spew.
-	(view_listener_died_cb): implement.
-	(impl_GNOME_Evolution_Addressbook_Book_getBookView): hook up an
-	ORBit_small connection listener on the view's listener.
-	(pas_book_respond_create): use e_contact_get_const instead of
-	e_contact_get here.  fixes a leak.
-
-	* backend/pas/pas-book-view.c
-	(impl_GNOME_Evolution_Addressbook_BookView_stop): implement, call
-	pas_backend_stop_book_view.
-	(pas_book_view_get_listener): return the book view's listener.
-	(pas_book_view_class_init): fill in epv->stop.
-	(pas_book_view_init): use a #define for THRESHOLD_MAX instead of
-	the constant.
-
-	* backend/pas/pas-book-view.h: add prototype for
-	pas_book_view_get_listener.
-
-	* backend/pas/pas-backend.c (pas_backend_stop_book_view):
-	implement.
-	(pas_backend_remove_book_view): implement.
-
-	* backend/pas/pas-backend.h: add prototype for stop_book_view and
-	remove_book_view.
-
-	* backend/pas/pas-backend-vcf.c (load_file): pass in the fd and
-	use fdopen here.
-	(foreach_build_list): don't creat EContacts here, because we'll
-	just be converting them back to vcards anyway.
-	(save_file): use char*'s instead of EContacts, and split entries
-	with 2 blank lines.  Also, hold the lock over the entire function.
-	(do_create): hold the lock around uid generation and touching the
-	hash table.
-	(pas_backend_vcf_process_remove_contacts): same.
-	(pas_backend_vcf_process_modify_contact): same.
-	(pas_backend_vcf_stop_book_view): new function, but leave
-	unimplemented for now.
-	(pas_backend_vcf_load_uri): the uri contains the directory name,
-	not the filename.
-	(pas_backend_vcf_dispose): grab the lock here just for sanity's
-	sake.  Also reorder things a bit, and free the hashtable and
-	mutex.
-	(pas_backend_vcf_init): init the mutex.
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_add_contact): don't unref the contact here.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_stop_book_view): new function, but leave
-	unimplemented for now.
-
-	* backend/pas/pas-backend-file.c (build_summary): use an EContact
-	for this call.
-	(do_summary_query): nuke, the contents of this has been moved to
-	start_book_view.
-	(pas_backend_file_search_timeout): same.
-	(pas_backend_file_search): same.
-	(pas_backend_file_start_book_view): glom everything into here
-	involving searching.  This function could (and should) be renamed
-	and reused from both this function and _get_contact_list.
-	(pas_backend_file_stop_book_view): new function.
-	(pas_backend_file_class_init): fill in backend->stop_book_view.
-
-	* backend/pas/Makefile.am (LDAP_BACKEND): libpasldap.a ->
-	libpasldap.la
-	(noinst_LTLIBRARIES): *.a -> *.la.
-	(libpas_la_SOURCES): same.
-	(libpasfile_la_SOURCES): same.
-	(libpasvcf_la_SOURCES): same.
-	(libpasldap_la_SOURCES): same.
-
-	* backend/idl/addressbook.idl: add BookView::stop.
-
-	* backend/ebook/e-vcard.c (read_attribute_value): fix GString
-	related leaks.
-	(read_attribute_params): same.
-	(parse): don't leak the EVCardAttributes corresponding to
-	BEGIN/END:vCard.
-	(free_gstring): new function
-	(e_vcard_attribute_remove_values): free the decoded_values list,
-	using free_gstring.
-
-	* backend/ebook/e-book.c (e_book_response_get_book_view): ref the
-	listener here.
-
-	* backend/ebook/e-book-view.h: add prototype for e_book_view_stop.
-
-	* backend/ebook/e-book-view.c (e_book_view_stop): new function.
-
-	* backend/ebook/e-book-async.c (_get_book_view_response_dtor):
-	unref the book view.
-
-2003-10-20  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/pas-book-view.c: Queue up removes and modifies as
-	well as adds, and remove the calls that took a list of changes
-	rather than a single change, since no one was really using the
-	list versions. Keep a list of IDs currently in the view so we can
-	more easily figure out what changes count as adds, modifies, and
-	removes.
-	(send_pending_adds): Don't reset next_threshold if it's being
-	called from notify_add.
-	(send_pending_changes, send_pending_removes): New
-	(pas_book_view_notify_update): Simplified add/change interface.
-	Takes an EContact and figures out if it's new, modified, or
-	removed relative to this view.
-	(pas_book_view_notify_change, pas_book_view_notify_change_1,
-	pas_book_view_notify_add, pas_book_view_notify_add_1): Gone.
-	(pas_book_view_notify_remove): Now does what remove_1 used to do.
-	(pas_book_view_vcard_matches): Remove this; no longer used.
-
-	* backend/pas/pas-backend.c (pas_backend_notify_update): New.
-	Calls pas_book_view_notify_update() on each of the backend's views.
-	(pas_backend_notify_remove): Likewise for notify_remove().
-	(pas_backend_notify_complete): And notify_complete().
-
-	* backend/pas/pas-book.c (pas_book_respond_create): Take an
-	EContact instead of an id and a vcard. Use
-	pas_backend_notify_update.
-	(pas_book_respond_remove_contacts): Use pas_backend_notify_remove.
-	(pas_book_respond_modify): Take a single EContact instead of two
-	vcards. Use pas_backend_notify_update.
-
-	* backend/pas/pas-backend-sync.c
-	(pas_backend_sync_create_contact): Return an EContact rather than
-	an id.
-	(pas_backend_sync_modify_contact): Return an EContact rather than
-	the old_vcard.
-	(_pas_backend_create_contact, _pas_backend_modify_contact): Update
-
-	* backend/pas/pas-backend-file.c (do_summary_query): Use
-	pas_book_view_notify_update.
-	(pas_backend_file_search_timeout): Likewise
-	(pas_backend_file_create_contact): Update for API changes
-	(pas_backend_file_modify_contact): Likewise.
-
-	* backend/pas/pas-backend-ldap.c (create_contact_handler,
-	pas_backend_ldap_process_create_contact): Update for API changes
-	(modify_contact_modify_handler, modify_contact_search_handler,
-	pas_backend_ldap_process_modify_contact): Likewise
-	(ldap_search_handler): Use pas_book_view_notify_update
-
-	* backend/pas/pas-backend-vcf.c (foreach_search_compare): Use
-	pas_book_view_notify_update.
-	(pas_backend_vcf_process_create_contact): Update for API changes
-	(pas_backend_vcf_process_modify_contact): Likewise
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_add_contact): Take an EContact instead of a
-	const char *vcard.
-
-	* backend/ebook/e-contact.c (photo_getter): s/malloc/g_malloc/
-
-2003-10-20  JP Rosevear <jpr@ximian.com>
-
-	* backend/pas/pas-backend-vcf.c (pas_backend_vcf_search): compiler
-	with non-c99 compilers
-
-2003-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c (fn_getter): new function, just return
-	the full name value.
-	(fn_setter): rather distasteful hack.  set the N attribute if it's
-	not already present.
-	(n_setter): set the X-EVOLUTION-FILE-AS attribute if it's not
-	already set.
-
-	* backend/pas/pas-backend-ldap.c (prop_info): add PROP_WRITE_ONLY
-	flag for properties (right now just 'sn') that we don't want to
-	use when building the EContact - we only use it when storing the
-	contact out to the ldap server.
-	(build_contact_from_entry): skip WRITE_ONLY properties.
-
-2003-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (init_collection): add the
-	minicard factory back in.
-	(display_view): add the minicard case back in.
-	(get_selection_model): same.
-	(minicard_right_click): resurrect.
-	(create_minicard_view): same.
-	(change_view_type): add the minicard case back in.
-	(eab_view_print): same.
-	(eab_view_print_preview): same.
-
-	* gui/widgets/e-addressbook-view.h (EABViewType): add MINICARD
-	back in.
-
-	* gui/widgets/e-addressbook-model.c (eab_model_new):
-	E_TYPE_AB_MODEL -> EAB_TYPE_MODEL.
-
-	* gui/widgets/e-addressbook-model.h: rename E_TYPE_AB_MODEL to
-	EAB_TYPE_MODEL.
-
-	* gui/widgets/Makefile.am (libeabwidgets_la_SOURCES): add the
-	minicard stuff back into the build.
-
-	* gui/widgets/e-addressbook-reflow-adapter.[ch],
-	gui/widgets/e-minicard-label.[ch],
-	gui/widgets/e-minicard-view-widget.[ch],
-	gui/widgets/e-minicard-view.[ch], gui/widgets/e-minicard.[ch],
-	gui/widgets/gal-view-factory-minicard.[ch], gal-view-minicard.h:
-	resurrect the minicard stuff, in a new uneditable,
-	EContact-friendly state.  no in-place editing anymore.
-
-	
-2003-10-10  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (fill_in_info): un-ifdef
-	the date handling code.
-	(extract_info): same.
-
-	* backend/pas/pas-backend-ldap.c (prop_info): add the address
-	labels and dates to the build.
-	(anniversary_populate): un-ifdef and get this working.
-	(anniversary_ber): same.
-	(anniversary_compare): same.
-	(birthday_populate): same.
-	(birthday_ber): same.
-	(birthday_compare): same.
-
-	* backend/ebook/tests/ebook/.cvsignore,
-	backend/ebook/tests/ebook/Makefile.am
-	backend/ebook/tests/ebook/test-date.c: add a test for EContactDate
-	getting/setting.
-	
-	* backend/ebook/e-vcard.h: add EVC_BDAY.
-
-	* backend/ebook/e-contact.h: add prototypes for the
-	e_contact_date_* functions.
-
-	* backend/ebook/e-contact.c (field_info): add
-	BIRTH_DATE/ANNIVERSARY fields.
-	(date_getter): new
-	(date_setter): new
-	(e_contact_date_new): new
-	(e_contact_date_from_string): new
-	(e_contact_date_to_string): new
-	(e_contact_date_free): new
-
-2003-10-10  Not Zed  <NotZed@Ximian.com>
-
-	*
-	gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
-	Use the main factory on the .so file, so it can be found.
-
-2003-10-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (contact_key): add a
-	descriptive comment about this "#if notyet".
-
-	* gui/component/select-names/e-select-names-model.h
-	(e_select_names_model_thaw): add prorotype for
-	e_select_names_model_cancel_all_contact_load.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(_EntryPropertyID): remove the SIMPLE_CARD_LIST property.
-	(entry_get_property_fn): same.
-	(impl_SelectNames_get_entry_for_section): same.
-
-	* backend/ebook/e-contact.h: add prototype for
-	e_contact_name_to_string.
-
-2003-10-07  Chris Toshok  <toshok@ximian.com>
-
-	* util/eab-book-util.c: remove a bunch of ifdef'ed code (that's
-	going to be living in e-book.c)
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_add_contact): un-ifdef some code.
-	(pas_backend_summary_get_summary_vcard): same.
-
-	* backend/pas/pas-backend-ldap.c (prop_info): remove the
-	query_prop field since we can get it from e_contact_field_name.
-	also remove it from all the macros and their uses.
-	(homephone_populate): un-ifdef.
-	(homephone_ber): same.
-	(homephone_compare): same.
-	(business_populate): same.
-	(business_ber): same.
-	(business_compare): same.
-	(query_prop_to_ldap): use e_contact_field_name to get the query
-	prop for a given attribute.
-	(add_oc_attributes_to_supported_fields): same.
-
-	* backend/pas/pas-backend-card-sexp.c (compare_phone): use the new
-	EContactField constants to iterate over the phone list.
-
-	* backend/ebook/e-contact.h (EContactField): add some useful
-	constants for those pieces of code that iterate over
-	email/phones/addresses.
-
-2003-10-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-vcard-control.c (book_open_cb): un-ifdef this.
-	(eab_vcard_control_new): put the buttons above the vcard so they
-	don't move when it's expanded.
-
-	* gui/widgets/eab-popup-control.h: remove prototypes for
-	eab_popup_control_set_name and eab_popup_control_set_email.
-
-	* gui/widgets/eab-popup-control.c (email_table_ok_cb): remove the
-	stupid idle function and do the work here.
-	(eab_popup_control_set_name): make this static - noone uses it.
-	(eab_popup_control_set_email): same.
-
-	* gui/widgets/eab-gui-util.c (eab_show_contact_editor):
-	e_contact_editor_new is what we use for the time being.
-
-	* gui/widgets/eab-contact-display.c (render_string): abstract this
-	code out.
-	(render_url): same.
-	(eab_contact_display_render_normal): make use of render_string and
-	render_url.
-
-	* gui/widgets/e-addressbook-view.c (delete): un-ifdef this and get
-	it working.
-	(selection_received): same.
-
-	* gui/widgets/e-addressbook-model.c (get_view): nuke some code
-	that was moved to another function.
-	(eab_model_set_property): get the writable state when we set the
-	book - don't rely on the timing of signals.
-
-	* gui/contact/editor/contact-editor.glade: add the blog field
-	below the homepage url field.
-	
-	* gui/contact/editor/e-contact-editor-address.[ch]: get this
-	building with the new stuff.
-	
-	* gui/contact/editor/e-contact-editor-fullname.[ch]: get this
-	building with the new stuff.
-	
-	* gui/contact-editor/e-contact-editor.[ch]: get this most of the
-	way there.
-	
-	* gui/contact-editor/e-contact-quick-add.[ch]: get this building
-	with the new stuff.
-
-	* gui/contact-editor/Makefile.am (libecontacteditor_la_SOURCES):
-	remove e-contact-save-as.[ch].  They're in
-	addressbook/widgets/eab-gui-util.[ch] now.
-
-	* gui/merging/Makefile.am: track all the naming changes.
-	
-	* gui/merging/*.glade: gratuitous renaming.
-	
-	* gui/merging/eab-contact-compare.[ch]: gratuitous renaming, and
-	move this from the old ebook/
-
-	* gui/merging/eab-contact-merging.[ch]: gratuitous renaming.
-
-	* backend/ebook/e-contact.[ch]: lots of overly complicated changes
-	for an overly complicated piece of code.
-
-	* backend/ebook/e-book-view.c (e_book_view_do_added_event): remove
-	some ifdef'ed code.
-	(e_book_view_do_modified_event): same.
-
-	* backend/ebook/e-vcard.c (parse): plug a memory leak.
-	(escape_string): deal with @s being NULL.
-	(e_vcard_remove_attribute): new function.
-	(e_vcard_attribute_remove_params): same.
-	(e_vcard_attribute_param_free): same.
-	(e_vcard_attribute_param_remove_values): same.
-
-	* backend/ebook/e-vcard.h: add prototypes for
-	e_vcard_remove_attribute, e_vcard_attribute_remove_params, and
-	e_vcard_attribute_param_remove_values.
-
-	* backend/ebook/e-book.c (e_book_handle_response): cache the
-	writable state of the ebook before generating the signal.
-	(e_book_unload_uri): initialize cap to NULL and writable to FALSE.
-
-	* backend/ebook/e-book.h: add prototype for e_book_is_writable.
-
-	* backend/ebook/e-book-async.c (_get_fields_response_handler):
-	don't call the callback if it's NULL.
-	(_get_methods_response_handler): same.
-	(_auth_user_response_handler): same.
-	(_get_contact_response_handler): same.
-	(_remove_contacts_response_handler): same.
-	(_add_contact_response_handler): same.
-	(_commit_contact_response_handler): same.
-	(_get_book_view_response_handler): same.
-	(_get_contacts_response_handler): same.
-	(_remove_contacts_dtor): free the list.
-	(e_book_async_remove_contacts): duplicate the list.
-
-	* backend/pas/pas-backend.c (pas_backend_open): if we successfully
-	load the uri, report the writable status back.
-
-	* backend/pas/pas-backend-sync.c (_pas_backend_remove_contacts):
-	free the list of ids.
-
-	* backend/pas/pas-backend-file.c (do_create): return the contact
-	we create here.
-	(pas_backend_file_create_contact): format the newly created
-	contact as a string to add to the summary.
-	(pas_backend_file_remove_contacts): don't free the list of removed
-	cards here - it happens in pas-backend-sync.
-	(pas_backend_file_load_uri): pass NULL for @contact to do_create.
-
-2003-10-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (render_address): move the :'s
-	inside the <b>'s.  Thanks for pointing this out, guenther. :)
-	(eab_contact_display_render_normal): same.
-	(eab_contact_display_render_compact): same.
-
-	* gui/widgets/eab-vcard-control.c (save_in_addressbook): track
-	change to address_load_default_book.
-
-2003-10-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am: remove some commented out crap about
-	e-address-popup.[ch].
-
-	* gui/component/component-factory.c (factory): use
-	eab_popup_control_new for the AddressPopup iid.
-
-	* gui/widgets/Makefile.am (libeabwidgets_la_SOURCES): add
-	eab-popup-control.[ch].
-
-	* backend/ebook/e-book.c (e_book_get_default_addressbook): hack
-	this so it at least sorta works - hardcode the
-	~/evolution/local/Contacts uri for now.
-
-	* gui/component/addressbook.[ch] (addressbook_load_default_book):
-	remove the EBook argument, and call
-	e_book_async_get_default_addressbook.
-
-	* gui/component/e-address-popup.[ch]: nuke.
-	
-	* gui/widgets/eab-popup-control.c: rename
-	gui/component/e-address-popup.c to this.
-
-	* gui/widgets/eab-popup-control.h: rename
-	gui/component/e-address-popup.h to this.
-
-	* backend/ebook/e-book-async.h: add prototype for
-	e_book_async_get_default_addressbook.
-	
-	* backend/ebook/e-book-async.c
-	(e_book_async_get_default_addressbook): new function.
-
-2003-10-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (eab_view_new): create the
-	scrolled window to embed the EABContactDisplay widget inside of.
-
-	* gui/widgets/e-addressbook-view.h (struct _EABView): add scrolled;
-
-	* gui/widgets/eab-contact-display.h: add
-	EABContactDisplayRenderMode enum, and add @render_mode arg to
-	eab_contact_display_render.
-
-	* gui/widgets/eab-contact-display.c
-	(eab_contact_display_render_compact): new function, render a
-	compact format suitable for inclusion in the mail display.
-	(eab_contact_display_render_normal): move the previouw contents of
-	eab_contact_display_render here.
-	(eab_contact_display_render): render in either compact or normal
-	mode depending on @mode.
-	(eab_contact_display_new): remove the scrolled window stuff from
-	here, as in the compact mode we don't want it present.  push it up
-	into the e-addressbook-view.c code.
-	
-	* gui/widgets/eab-vcard-control.[ch]: bonobo control that wraps up
-	the EABContactDisplay stuff and lets us display vcards in a pretty
-	format in mail messages.
-	
-	* gui/component/component-factory.c (factory): replace the #if
-	notyet'ed minicard control code with the new vcard control.
-
-	* gui/component/Makefile.am (INCLUDES): remove gui/minicard.
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: remove
-	the MiniCard_Control iid, and replace it with VCard_Control.
-
-2003-10-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): use
-	eab_contact_list_from_string, and un-"#if notyet" this.
-
-	* gui/component/addressbook.c: remove #include
-	"e-contact-save-as.h"
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(file_save_as_cb): use eab_contact_save.
-	(file_send_as_cb): use eab_send_contact, un-"#if notyet" this.
-	(file_send_to_cb): same.
-	(table_drag_data_received_cb): use eab_contact_list_from_string.
-
-	* gui/widgets/e-addressbook-reflow-adapter.[ch]: nuke.  last
-	vestiges of the minicard view.
-	
-	* gui/widgets/e-addressbook-view.c (eab_view_init):
-	s/clipboard_cards/cliboard_contacts.
-	(eab_view_dispose): same.
-	(get_contact_list_1): s/card/contact
-	(get_contact_list): same.
-	(save_as): same, and use eab_contact_list_save.
-	(send_as): reenable this code, s/card/contact, and use
-	eab_send_contact_list.
-	(send_to): same.
-	(print): s/card/contact.
-	(delete): same.
-	(new_card): same, and un-"#if notyet" some code.
-	(selection_get): use eab_contact_list_to_string.
-	(selection_clear_event): s/card/contact
-	(selection_received): same.
-	(get_selected_contacts): same.
-	(eab_view_save_as): same, and use eab_contact_list_save.
-	(eab_view_view): same, and use eab_show_multiple_contacts.
-	(eab_view_send): reenable this code, s/card/contact, and use
-	eab_send_contact_list.
-	(eab_view_send_to): same.
-	(eab_view_copy): s/card/contact.
-	(view_transfer_contacts): same.
-	(eab_view_copy_to_folder): same.
-	(eab_view_move_to_folder): same.
-
-	* gui/widgets/e-addressbook-view.h (struct _EABView): rename
-	clipboard_cards to clipboard_contacts.
-
-	* gui/widgets/eab-gui-util.c (view_contacts): un-"#if notyet"
-	(file_exists): moved from e-contact-save-as.c
-	(save_it): same.
-	(close_it): same.
-	(destroy_it): same.
-	(make_safe_filename): same.
-	(eab_contact_save): same, and renamed from e_contact_save_as.
-	(eab_contact_list_save): same, and renamed from
-	e_contact_list_save_as.
-	(contact_deleted_cb): s/card/contact.
-	(do_delete): same, and use e_book_async.
-	(delete_contacts): s/card/contact.
-	(process_unref): same.
-	(contact_added_cb): same.
-	(do_copy): same, and use e_book_async.
-	(got_book_cb): same.
-	(eab_transfer_contacts): same, and use e_book_async.
-	(eab_send_contact_list): s/card/contact
-	(eab_send_contact): same.
-
-	* gui/widgets/eab-gui-util.h: some random s/card/contact work, and
-	move the contents of e-contact-save-as.h here.
-
-	* util/eab-book-util.c (eab_contact_list_from_string): rename
-	eab_load_contacts_from_string to this.
-	(eab_contact_list_to_string): new function.
-
-	* util/eab-book-util.h: add prototype for
-	eab_contact_list_to_string, and rename
-	eab_load_contacts_from_string to eab_contact_list_from_string.
-
-	* gui/contact-editor/e-contact-save-as.[ch]: nuke.  the contents
-	of these files has been wrapped up in
-	gui/widgets/eab-gui-util.[ch].
-	
-2003-09-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	add libecontactlisteditor.la back into the build.
-
-	* gui/component/addressbook-component.c (new_item_cb): enable the
-	contact list editor portion.
-
-	* util/eab-book-util.c (eab_load_contacts_from_string): new
-	function, return a GList of EContact*'s parsed from the string.
-
-	* util/eab-book-util.h: add prototype for
-	eab_load_contacts_from_string.
-
-	* gui/contact-list-editor/contact-list-editor.glade: set the id of
-	the list-image widget.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_class_init): PROP_CARD -> PROP_CONTACT.
-	(e_contact_list_editor_init): initialize image_buf to null and
-	card -> contact.  also, hook up the dnd signals on the list_image
-	widget so we can drop images.
-	(e_contact_list_editor_dispose): free the image_buf.
-	(list_added_cb): card -> contact.
-	(list_modified_cb): same.
-	(save_contact): same, and use the ebook-async api.
-	(prompt_to_save_changes): card -> contact.
-	(file_save_cb): same.
-	(file_save_as_cb): same.
-	(file_send_as_cb): #if notyet for now.
-	(file_send_to_cb): same.
-	(tb_save_and_close_cb): card -> contact.
-	(list_deleted_cb): same.
-	(delete_cb): same.
-	(delete_cb): same, and use ebook-async.
-	(e_contact_list_editor_new): card -> contact.
-	(e_contact_list_editor_set_property): same.
-	(table_drag_motion_cb): use GDK_POINTER_TO_ATOM instead of
-	casting.
-	(table_drag_data_received_cb): use eab_load_contacts_from_string,
-	and card -> contact.
-	(set_image_from_data): new function. create a pixbuf from the
-	image data and composite it in an image that's the same size as
-	the initial list_image widget.
-	(image_drag_motion_cb): new function.
-	(image_drag_drop_cb): new function.
-	(image_drag_data_received_cb): new function.
-	(extract_info): port to EContact, and add support for the image.
-	(fill_in_info): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add image stuff, and ECard -> EContact.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_value_at): e_destination -> eab_destination.
-	(e_contact_list_model_init): same.
-	(e_contact_list_model_add_destination): same.
-	(e_contact_list_model_add_email): same.
-	(e_contact_list_model_add_contact): same, and card -> contact.
-	(e_contact_list_model_remove_row): e_destination ->
-	eab_destination.
-	(e_contact_list_model_get_destination): same.
-
-	* gui/contact-list-editor/e-contact-list-model.h: card -> contact,
-	and e-destination -> eab-destination.
-
-	* gui/widgets/e-addressbook-view.etspec: fix a couple of
-	fields.. this needs a completely once-over at some point soon.
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): reenable
-	all of this.
-
-	* gui/widgets/eab-contact-display.c (render_address): use
-	e_text_to_html to convert the \n's to <br>'s.
-	(on_url_requested): get PHOTO if there is one, otherwise LOGO.
-	(eab_contact_display_render): escape all the text we're sending to
-	gtkhtml with e_text_to_html.  also, if it's a contact list, output
-	_("List Members") with the contents of _EMAIL.
-
-	* gui/widgets/eab-gui-util.h: rename eab_send_card{_list} to
-	eab_send_contact{_list}.
-
-2003-09-30  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/tests/ebook/Makefile.am (noinst_PROGRAMS): add
-	test-string.
-
-	* backend/ebook/tests/ebook/test-string.c: test setting/getting a
-	string attribute.
-
-	* backend/ebook/e-contact.c (photo_setter): do gnome-vfs mime type
-	sniffing before we set the attribute value.
-	(e_contact_set_property): implement setting of MULTI list
-	attributes (like MAIL).
-	(e_contact_get_property): rework the ATTR_TYPE attribute handling
-	so we aren't calling g_value_set_pointer on a value that holds a
-	string (and vice versa).
-
-	* backend/ebook/e-vcard.c (e_vcard_remove_attributes): implement.
-	(e_vcard_attribute_add_param): use g_ascii_strcasecmp.
-
-	* backend/ebook/e-vcard.h: rename e_vcard_remove_attribute to
-	e_vcard_remove_attributes, since it removes all matching
-	attributes.
-
-	* backend/ebook/e-book.c (e_book_response_add_contact): we need to
-	strdup the id here since the listener frees it.
-	(e_book_handle_response): implement the WritableStatusEvent part
-	of the switch.
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_report_writable): un-"#if notyet" this.
-
-	* backend/ebook/e-book-async.c (_add_contact_handler): fill in
-	response->id.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print-envelope.c: card -> contact.
-
-	* printing/e-contact-print-envelope.h: card -> contact.
-
-	* printing/e-contact-print.c: card -> contact.
-
-	* printing/e-contact-print.h: card -> contact.
-
-	* printing/Makefile.am (contact_print_test_LDADD): add
-	libeabutil.la and reorder things so it links.
-	(contact_print_style_editor_test_LDADD): same.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c:
-	e-addressbook-util.h -> eab-gui-util.h.
-
-	* gui/component/select-names/e-select-names-popup.c:
-	e-addressbook-util.h -> eab-gui-util.h.
-
-	* gui/component/e-address-popup.c: e-addressbook-util.h ->
-	eab-gui-util.h.
-
-	* gui/component/component-factory.c: #if notyet the minicard
-	control stuff, since it's been completely nuked from the tree.
-
-	* gui/component/addressbook.c: e-addressbook-util.h ->
-	eab-gui-util.h.
-
-	* gui/component/addressbook-component.c: e-addressbook-util.h ->
-	eab-gui-util.h.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	rename libeminicard to libeabwidgets.
-
-	* Makefile.am (SUBDIRS): add util/ to the build.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-treeview-adapter.c:
-	e-addressbook-util.h -> eab-gui-util.h, and convert some
-	EDestination code to EABDestination.
-
-	* gui/widgets/e-addressbook-table-adapter.c: e-addressbook-util.h
-	-> eab-gui-util.h, and include util/eab-destination.h.
-	(addressbook_value_at): un-#if 0 some code.
-
-	* gui/widgets/e-addressbook-model.c: e-addressbook-util.h ->
-	eab-gui-util.h
-
-	* gui/widgets/e-addressbook-view.c: e-addressbook-util.h ->
-	eab-gui-util.h
-
-	* gui/widgets/e-minicard-control.c,
-	gui/widgets/e-minicard-control.h, gui/widgets/e-minicard-label.c,
-	gui/widgets/e-minicard-label.h,
-	gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
-	gui/widgets/e-minicard-widget-test.c,
-	gui/widgets/e-minicard-widget.c, gui/widgets/e-minicard-widget.h,
-	gui/widgets/e-minicard.c, gui/widgets/e-minicard.h,
-	test-minicard-label.c, test-minicard-view.c, test-minicard.c: nuke
-	all of the old minicard stuff.
-	
-	* gui/widgets/eab-gui-util.[ch]: rename e-addressbook-util.[ch] to
-	this and nuke e-addressbook-util.[ch].
-	
-	* gui/widgets/Makefile.am (INCLUDES): change G_LOG_DOMAIN to
-	eab-widgets, and add -I$(top_srcdir)/addressbook.
-	(noinst_LTLIBRARIES): rename to libeabwidgets.la
-	(libeabwidgets_la_SOURCES): rename e-addressbook-util.[ch] to
-	eab-gui-util.[ch].
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (eab_contact_display_new):
-	track change from E_TYPE_AB_CONTACT_DISPLAY to
-	EAB_TYPE_CONTACT_DISPLAY.
-
-	* gui/widgets/eab-contact-display.h: change from E_* type foo to
-	EAB_* type foo.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.[ch]: convert everything
-	from e_addressbook_search_dialog to eab_search_dialog, and
-	EAddressbookSearchDialog to EABSearchDialog.
-
-	* gui/component/addressbook.c (search_cb):
-	e_addressbook_search_dialog -> eab_search_dialog.
-	(addressbook_search_activated): same.
-	(addressbook_query_changed): same.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_respond_get_supported_fields):
-	don't free the fields here - the backends hold onto them.
-	(pas_book_respond_get_supported_auth_methods): don't free the
-	auth_methods here - the backends hold onto them.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_supported_fields): fields go from 1 to
-	E_CONTACT_FIELD_LAST, not 0.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: e-book-util.h -> eab-book-util.h
-
-	* gui/component/addressbook-component.c: e-book-util.h ->
-	eab-book-util.h.
-	(new_item_cb): enable the contact editor portion of this.
-	(user_create_new_item_cb): convert to async_load_uri api, and
-	ifdef the _use_default_book crap.
-	(ensure_completion_uris_exist): e_book_get_config_database ->
-	eab_get_config_database.
-
-	* gui/component/e-address-widget.h: e-book-util.h ->
-	eab-book-util.h.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	add selectnames back in, and add util/libeabutil.la.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c: my head explodes from so many
-	changes.
-
-	* backend/ebook/e-contact.h: reorder fields such that all the
-	string fields are first in the enum (and add a
-	E_CONTACT_LAST_SIMPLE_STRING value, ala the old e-card-simple
-	stuff.)  Also, add E_CONTACT_LOGO, WANTS_HTML, IS_LIST, and
-	LIST_SHOW_ADDRESSES.  remove E_CONTACT_PHOTO_URI.
-
-	* backend/ebook/e-vcard.c (e_vcard_remove_attribute): rename from
-	e_card_remove_attribute, and add a g_assert_not_reached.
-	(_evc_base64_encode_simple): make this not static (we need it for
-	a test.)
-	(_evc_base64_decode_simple): same.
-
-	* backend/ebook/e-vcard.h: add LOGO, X-MOZILLA-HTML,
-	X-EVOLUTION-LIST, and X-EVOLUTION-LIST-SHOW_ADDRESSES #defines.
-																
-	* backend/ebook/e-book.c (EBookLoadState): change from
-	UriNotLoaded to E_BOOK_URI_NOT_LOADED, etc.
-	(e_book_add_contact): track _URI_ change.
-	(e_book_get_supported_fields): same.
-	(e_book_get_supported_auth_methods): same.
-	(e_book_authenticate_user): same.
-	(e_book_get_contact): same.
-	(e_book_response_get_contact): remove the ifdefed call to
-	e_contact_set_book.
-	(e_book_remove_contacts): track _URI_ change.
-	(e_book_get_book_view): same.
-	(e_book_get_contacts): same.
-	(e_book_get_changes): same.
-	(e_book_remove): same.
-	(e_book_unload_uri): same.
-	(e_book_load_uri): same.
-	(e_book_load_uri): same.
-	(e_book_get_self): start the implementation of this.
-	(e_book_get_default_addressbook): ifdef out a possible
-	implementation of this (it's broken.)
-	(e_book_init): track _URI_ change.
-	(e_book_dispose): same.
-																
-	* backend/ebook/e-book.h: move get_default_addressbook out of the
-	ifdef, and change get_default_addressbook/get_addressbooks to be
-	more like the rest of the api.
-																
-	* backend/ebook/e-book-util.[ch]: nuke.
-																
-	* backend/ebook/e-card-compare.[ch]: nuke.
-																
-	* backend/ebook/e-destination.[ch]: nuke.
-																
-	* backend/ebook/e-book-query.c (func_and): fix valgrind error.
-	(func_or): same.
-																
-	* backend/ebook/e-book-listener.h: drop #include of e-list.h
-																
-	* backend/ebook/e-book-async.c (_get_contacts_response_handler)
-	(_get_contacts_response_dtor, _get_contacts_handler)
-	(_get_contacts_dtor, e_book_async_get_contacts): new functions,
-	implementing e_book_async_get_contacts.
-																
-	* backend/ebook/e-book-async.h: add e_book_async_get_contacts.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* util/eab-marshal.list: new file.
-
-	* util/eab-destination.[ch]: rename
-	backend/ebook/e-destination.[ch] to this, and change all the entry
-	point names too.
-
-	* util/eab-book-util.[ch]: rename backend/ebook/e-book-util.[ch]
-	to this, and change all the entry point names too.
-
-	* util/Makefile.am: new file, build libeabutil.la
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): e_addressbook_model -> eab_model.
-	(contact_key): e-contactify this, and remove the call to
-	e_contact_get_book since we don't have it.
-	(sync_one_model): card -> contact.
-	(real_add_address_cb): track various name changes.
-	(esn_get_key_fn): same.
-	(e_addressbook_create_ebook_table): same.
-	(folder_selected): same.
-	(select_entry_changed): same.
-	(e_select_names_new): same.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(dump_model): s/card/contact.
-	(e_select_names_text_model_insert_length): e-destination ->
-	eab-destination.
-	(e_select_names_text_model_delete): same.
-	(e_select_names_text_model_obj_count): same.
-	(nth_obj_index): same.
-	(e_select_names_text_model_activate_obj): ifdef this out since we
-	don't have e_contact_get_book in the new api.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): convert to e_contact/eab_destination.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(change_email_num_cb): e_destination -> eab_destination.
-	(populate_popup_contact): same, and ECard -> EContact.  Also, the
-	email attribute is a GList, not an EList.  lastly, rename from
-	populate_popup_card.
-	(populate_popup_nocontact): same, and rename from
-	populate_popup_nocard.
-	(e_select_names_populate_popup): same.
-
-	* gui/component/select-names/e-select-names-model.h: track changes
-	to e_destination, and rename the cardify methods to something mode
-	descriptive.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_duplicate): e_destination ->
-	eab_destination.
-	(e_select_names_model_get_textification): same.
-	(e_select_names_model_get_address_text): same.
-	(e_select_names_model_get_destination): same.
-	(e_select_names_model_export_destinationv): same.
-	(send_changed): same.
-	(e_select_names_model_import_destinationv): same.
-	(e_select_names_model_get_contact): same, and rename from
-	_get_card
-	(e_select_names_model_get_string): same.
-	(connect_destination): same.
-	(disconnect_destination): same.
-	(e_select_names_model_contains): same.
-	(e_select_names_model_insert): same.
-	(e_select_names_model_append): same.
-	(e_select_names_model_replace): same.
-	(e_select_names_model_delete): same.
-	(e_select_names_model_clean): same.
-	(delete_all_iter): same.
-	(e_select_names_model_overwrite_copy): same.
-	(e_select_names_model_merge): same.
-	(e_select_names_model_name_pos): same.
-	(e_select_names_model_text_pos): same.
-	(e_select_names_model_cardify): nuke.
-	(e_select_names_model_uncardify): nuke.
-	(e_select_names_model_cancel_cardify): nuke.
-	(e_select_names_model_load_all_contacts): rename _cardify_all to
-	this.
-	(e_select_names_model_cancel_all_contact_load): rename
-	_cancel_cardify to this.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_in_cb): cancel_cardify_all -> cancel_all_contact_load
-	(focus_out_cb): cardify_all -> load_all_contacts.
-	(completion_popup_cb): same.
-	(load_completion_books): no e_book_expand_uri anymore.
-	(e_select_names_manager_new): e_book_get_config_database ->
-	eab_get_config_database.
-	(e_select_names_manager_dispose): same.
-
-	* gui/component/select-names/e-select-names-completion.h: e-book.h
-	-> e-book-async.h
-
-	* gui/component/select-names/e-select-names-completion.c:
-	EContactify this.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): ifdef out the SIMPLE_CARD_LIST getter,
-	and cardify_all -> load_all_contacts.
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	nuke all the SimpleCard stuff.  It's a horribly inefficient way to
-	deal with vcards, and since ebook is platform level now, we can
-	(and should) promote just linking to ebook to do this.
-
-2003-09-19  Gilbert Fang  <gilbert.fang@sun.com>
-
-       * addressbook/gui/component/addressbook-component.c (xfer_folder):
-         remove the "addressbook.db.summary" correctly. #48538
-
-2003-09-11  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am (privlib_LTLIBRARIES): Remove
-	libebook-static.la
-
-	* conduit/Makefile.am (libeaddress_conduit_la_LIBADD): Use
-	non-static versions of libraries: the static ones were only needed
-	for libtool 1.3.
-
-2003-09-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c (e_contact_get_property): implement
-	getters for the address labels.  they aren't really synthetic, but
-	we can't handle them as normal strings because they switch off the
-	TYPE parameter, not the attribute name (go go vcard.)  Also add
-	getters for the structured address fields (ADR).  Also fix a spot
-	where we were using strcmp instead of strcasecmp.
-	(e_contact_address_free): new function.
-
-	* backend/ebook/e-contact.h: Add EContactAddress structure, which
-	will probably go away once i merge in my cool spiffy address
-	editor.  Add LABEL fields for the address labels, and add
-	prototype for e_contact_address_free.
-
-	* backend/ebook/e-vcard.h: add EVC_LABEL and EVC_X_BLOG_URL.
-
-	* backend/ebook/e-vcard.c (read_attribute_value): step to the next
-	character after unescaping \-escaped characters.  keeps commas
-	from multiplying.
-
-	* gui/widgets/eab-contact-display.c (render_address): new function
-	(eab_contact_display_render): display email, delivery addresses,
-	and the blog url.
-
-2003-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c (e_contact_set_property): implement
-	E_CONTACT_EMAIL_*.
-
-	* backend/pas/pas-backend-ldap.c (email_ber): EContact-ify and
-	re-enable this code.
-	(email_compare): same.
-	(email_populate): same.
-
-	* backend/pas/pas-backend-vcf.c (pas_backend_vcf_load_uri): use
-	XIMIAN_VCARD.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): use
-	XIMIAN_VCARD, and don't fail if the directory already exists.
-	just try to create the db anyway.
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add ximian-vcard.h
-
-	* backend/pas/ximian-vcard.h (XIMIAN_VCARD): put the initial vcard
-	here, so we can share 1 #define between file/vcf backends.  Also,
-	add a jpeg photo.
-
-2003-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (libeminicard_la_SOURCES): add
-	eab-contact-display.[ch]
-
-	* gui/widgets/e-addressbook-view.c (eab_view_init): just init
-	everything to NULL.
-	(eab_view_new): move a bunch of stuff that was in eab_view_init
-	here.  create a vpaned to hold the contact display, and create the
-	contact display.
-	(render_contact): render the selected contact to the
-	contact_display.
-	(selection_changed): add logic to display the currently selected
-	contact in the preview pane.
-	(create_table_view): add the table to the paned.
-	(create_treeview_view): add the scrolled to the paned.
-	(change_view_type): remove view->widget from the paned.
-
-	* gui/widgets/e-addressbook-view.h: switch from using a GtkTable
-	to a GtkEventBox - we don't need the table logic anymore.
-
-	* gui/widgets/e-addressbook-model.c (create_contact): indent
-	(eab_model_get_contact): same.
-
-	* gui/widgets/eab-contact-display.[ch]: new files - this
-	implements the preview pane.
-	
-2003-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (BINARY_PROP): new type of
-	property, for specifying data coming back from the ldap server
-	with both data/length (like photos).
-	(photo_populate): set the contact's photo.
-	(build_contact_from_entry): add PROP_TYPE_BINARY handling.
-
-	* backend/ebook/e-vcard.c (EVCardEncoding): new enum for use with
-	the ENCODING attribute parameter.  Right now, just "raw",
-	"base64", and "quoted-printable".
-	(struct _EVCardAttribute): add a "decoded_values" list of
-	GString*'s, as well as fields to hold encoding/encoding_set.
-	(e_vcard_class_init): call _evc_base64_init.
-	(e_vcard_attribute_add_value_decoded): based on what encoding the
-	attribute uses, add the value properly.
-	(e_vcard_attribute_add_param): if the parameter is ENCODING, work
-	our magic.
-	(e_vcard_attribute_get_values_decoded): spit out properly decoded
-	values depending on the decoding type.
-	(_evc_base64*): copy the camel base64 routines here.
-
-	* backend/ebook/e-vcard.h: add prototypes for
-	e_vcard_attribute_add_value_decoded and
-	e_vcard_attribute_get_values_decoded.
-
-	* backend/ebook/e-contact.c (e_contact_get_first_attr): move this
-	to above _set_property so we can make use of it there.
-	(e_contact_set_property): fix up the generic STRING field handler,
-	and implement E_CONTACT_PHOTO setting.
-	(e_contact_get_property): add handling for
-	E_CONTACT_PHOTO/E_CONTACT_PHOTO_URI.
-	(e_contact_photo_free): new function.
-
-	* backend/ebook/e-contact.h: add EContactPhoto struct, a prototype
-	for e_contact_photo_free, and two new EContactField elements (PHOTO and
-	PHOTO_URI).
-
-	* backend/ebook/tests/ebook/.cvsignore: ignore test-photo
-
-	* backend/ebook/tests/ebook/Makefile.am (noinst_PROGRAMS): add test-photo
-
-	* backend/ebook/tests/ebook/test-photo.c: test for the photo
-	set/get routines (which do base64 encoding/decoding).
-
-2003-09-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am: comment out a buncha stuff just to
-	get this building.
-
-	* gui/component/select-names/e-select-names.c: #include
-	e-book-async.h
-	(search_result): EAddressbookModel -> EABModel.
-	(addressbook_model_set_uri): same, and don't use
-	e_book_expand_uri, as it's dead.
-	(esn_get_key_fn): EAddressbookModel -> EABModel.
-	(e_addressbook_create_ebook_table): same.
-	(status_message): same.
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): EAddressbookModel -> EABModel.
-
-	* gui/component/addressbook-component.c (new_item_cb): ifdef out
-	for now.
-	(dnd_drop_book_open_cb): s/card/contact.
-	(destination_folder_handle_drop): ifdef out.
-	(request_quit): same.
-
-	* gui/component/addressbook.c: track api changes - e_addressbook_
-	-> eab_, and e_book_* becomes e_book_async_*.
-
-	* gui/component/addressbook.h: #include e-book-async.h
-
-	* gui/component/e-address-widget.c (query_results_cb):
-	e/EBookSimpleQueryStatus/EBookStatus
-
-	* gui/component/e-address-widget.h: s/ECard/EContact.
-
-	* gui/component/e-cardlist-model.[ch]: nuke.
-	
-	* gui/component/e-address-popup.c: s/e-book.h/e-book-async.h
-
-	* gui/component/e-address-popup.h: s/ECard/EContact
-
-2003-09-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/Makefile.am (libebook_la_SOURCES): remove
-	e-card.c,e-card.simple.c
-
-	* backend/ebook/tests/ebook/test-ebook.c: remove #include of
-	e-card-simple.h
-
-	* backend/ebook/tests/ebook/test-changes.c: remove #include of
-	e-card-simple.h
-
-	* backend/ebook/e-card.[ch], backend/ebook/e-card-simple.[ch]:
-	nuke.
-
-	* backend/ebook/e-book-util.h: s/card/contact.
-
-	* backend/ebook/e-book-util.c: ifdef out an #include.
-
-	* backend/ebook/e-book-async.[ch]: stop doing the stupid #define
-	renaming trick, and just rename all the prototypes from e_book_*
-	to e_book_async_*. Also, get rid of the *_vcard variants.
-
-2003-09-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.[ch]
-	(pas_backend_card_sexp_match_contact): rename
-	pas_backend_card_sexp_match_card, and it takes an EContact now.
-	Also, port this file to use EContact instead of ECard, and ifdef
-	out lots of stuff.
-
-	* backend/pas/pas-backend-ldap.c: convert this to use EContact
-	instead of ECard, and ifdef great swaths of code to make it
-	compile.
-
-	* backend/pas/pas-book.c (pas_book_respond_modify): convert this
-	from ECard to EContact.
-
-2003-09-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (libeminicard_la_SOURCES): remove all
-	the reflow/minicard stuff from the build.
-	(e-addressbook-marshal.[ch]): change the prefix on the marshallers to
-	eab_marshal.
-
-	* gui/widgets/e-addressbook-view.etspec: bring this more in line
-	with the field ids for EContact, and comment out a ton of them
-	that aren't there yet.
-
-	* gui/widgets/e-addressbook-view.[ch]: big renaming - rename
-	e_addressbook_view to eab_view, and EAddressbookView to EABView.
-
-	* gui/widgets/e-addressbook-util.c (eab_error_dialog): rename, and
-	change a few of the error strings s/Card/Contact.
-	(added_cb): E_BOOK_STATUS_SUCCESS => E_BOOK_ERROR_OK.
-	(modified_cb): same.
-	(e_addressbook_show_contact_editor): this takes an EContact now,
-	and track the change to the contact editor signal names.
-	(e_addressbook_show_contact_list_editor): this takes an EContact
-	now.
-	(view_contacts): rename view_cards to this, and ifdef the body.
-	(e_addressbook_show_multiple_contacts): rename
-	e_addressbook_show_multiple_cards to this, and s/card/contact.
-
-	* gui/widgets/e-addressbook-util.h: ifdef some things out, and
-	rename e_addressbook_error_dialog to eab_error_dialog.
-
-	* gui/widgets/e-addressbook-table-adapter.[ch]: big renaming -
-	rename e_addressbook_table_adapter to eab_table_adapter, and
-	EAddressbookTableAdapter to EABTableAdapter.  Also, remove the
-	simple mapping - we can do ECardSimple-like operations directly on
-	the EContacts from the EABModel.
-
-	* gui/widgets/e-addressbook-model.[ch]: big renaming - rename
-	e_addressbook_model to eab_model, and EAddressbookModel to
-	EABModel.  Also, convert everything from ECard to EContact.
-
-2003-09-01  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-vcard.c (e_vcard_new_from_string): omg i'm dumb.
-	don't call e_vcard_new here since it just turns around and calls
-	e_vcard_new_from_string again.
-
-2003-09-01  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-view.c (pas_book_view_notify_change): guard
-	pending adds foo.
-	(pas_book_view_notify_remove): same.
-	(pas_book_view_notify_add): same.
-	(pas_book_view_notify_complete): same.
-	(pas_book_view_construct): init mutex
-	(pas_book_view_dispose): free mutex
-
-	* backend/pas/pas-backend-ldap.c (func_exists): new function.
-	(send_pending_adds): remove
-	(ldap_search_handler): let the BookView stuff handle the pending
-	adds for us.
-	(ldap_search_dtor): remove pending adds stuff.
-	(pas_backend_ldap_search): same
-
-	* backend/pas/pas-backend-card-sexp.c (func_exists): new function.
-	
-	* backend/ebook/tests/ebook/test-ebook.c (print_all_emails): use
-	an exists query.
-
-2003-08-31  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-query.c (func_and, func_or, func_not)
-	(func_contains, func_is, func_beginswith, func_endswith)
-	(e_book_query_from_string): adapt the pas ldap backend sexp
-	parsing code to this, build up an EBookQuery that represents the
-	sexp.
-
-	* backend/ebook/e-contact.h (e_contact_field_id): add prototype.
-
-	* backend/ebook/e-contact.c (e_contact_field_id): new function.
-
-	* backend/ebook/Makefile.am (libebook_la_SOURCES): add
-	e-book-util.c back into the build, if only for the config_database
-	thingy.
-
-2003-08-31  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c (e_contact_duplicate): new function.
-
-	* backend/ebook/e-contact.h: add prototype for
-	e_contact_duplicate.
-
-	* backend/ebook/e-book-util.[ch]: massive ifdeffing.  most of this
-	is either gone or will be unnecessary soon.
-
-	* backend/ebook/e-book-query.c (e_book_query_from_string): hack
-	this so it'll at least generate a query.
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_get_view): add some debug spew and
-	remove a c&p'ed comment.
-
-	* backend/ebook/e-book-async.h: add prototype for
-	e_book_async_unload_uri.
-
-	* backend/ebook/e-book-async.c (e_book_async_unload_uri): new
-	function.
-
-	* backend/pas/pas-book-view.c (pas_book_view_construct): switch to
-	CORBA_Object_duplicate, ala pas_book.
-
-	* backend/pas/pas-backend-sync.c (pas_backend_sync_class_init):
-	fix typo and the build.
-
-2003-08-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response):
-	s/card/contact.
-	(pas_backend_ldap_process_create_contact): same.
-	(remove_contact_handler): same.
-	(remove_contact_dtor): same.
-	(pas_backend_ldap_process_remove_contacts): same.
-	(modify_contact_modify_handler): same.
-	(modify_contact_dtor): same.
-	(pas_backend_ldap_process_modify_contact): same.
-	(get_contact_handler): same.
-	(get_contact_dtor): same.
-	(pas_backend_ldap_process_get_contact): same.
-	(pas_backend_ldap_class_init): same.
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_add_contact): s/card/contact, and mostly
-	switch from ECard{Simple} to EContact.
-	(pas_backend_summary_get_summary_vcard): same.
-	(pas_backend_summary_remove_contact): s/card/contact
-
-	* backend/pas/pas-backend-summary.h: s/card/contact.
-
-	* backend/pas/pas-backend-file.c (build_summary): fix g_warning,
-	and return immediately if the db->cursor call fails.
-	(pas_backend_file_create_contact): s/card/contact
-	(pas_backend_file_remove_contacts): same.
-	(pas_backend_file_modify_contact): same.
-	(pas_backend_file_get_contact): same.
-	(pas_backend_file_get_contact_list): same.
-	(pas_backend_file_class_init): same.
-
-	* backend/pas/pas-backend-vcf.c
-	(pas_backend_vcf_process_create_contact): s/card/contact.
-	(pas_backend_vcf_process_remove_contacts): same.
-	(pas_backend_vcf_process_modify_contact): same.
-	(pas_backend_vcf_process_get_contact): same.
-	(pas_backend_vcf_process_get_contact_list): same.
-	(pas_backend_vcf_class_init): same.
-
-	* backend/pas/pas-backend-sync.c (pas_backend_sync_create_contact): s/card/contact.
-	(pas_backend_sync_remove_contacts): same.
-	(pas_backend_sync_modify_contact): same.
-	(pas_backend_sync_get_contact): same.
-	(pas_backend_sync_get_contact_list): same.
-	(_pas_backend_create_contact): same.
-	(_pas_backend_remove_contacts): same.
-	(_pas_backend_modify_contact): same.
-	(_pas_backend_get_contact): same.
-	(_pas_backend_get_contact_list): same.
-	(pas_backend_sync_class_init): same.
-
-	* backend/pas/pas-backend-sync.h: s/card/contact.
-
-	* backend/pas/pas-backend.c (pas_backend_create_contact): s/card/contact.
-	(pas_backend_remove_contacts): same.
-	(pas_backend_modify_contact): same.
-	(pas_backend_get_contact): same.
-	(pas_backend_get_contact_list): same.
-	(pas_backend_change_add_new): same.
-	(pas_backend_change_modify_new): same.
-	(pas_backend_change_delete_new): same.
-
-	* backend/pas/pas-backend.h: s/card/contact.
-
-	* backend/pas/pas-book-view.c (send_pending_adds): s/card/contact
-	(pas_book_view_notify_change): same.
-	(pas_book_view_notify_remove): same.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_getContact): s/card/contact
-	(impl_GNOME_Evolution_Addressbook_Book_getContactList): same.
-	(impl_GNOME_Evolution_Addressbook_Book_addContact): same.
-	(impl_GNOME_Evolution_Addressbook_Book_removeContacts): same.
-	(impl_GNOME_Evolution_Addressbook_Book_modifyContact): same.
-	(pas_book_respond_create): same.
-	(pas_book_respond_remove_contacts): same.
-	(pas_book_respond_modify): same.
-	(pas_book_respond_get_contact): same.
-	(pas_book_respond_get_contact_list): same.
-	(pas_book_respond_get_changes): same.
-	(pas_book_class_init): same.
-
-	* backend/pas/pas-book.h: s/card/contact
-
-	* backend/ebook/tests/vcard/dump-vcard.c: #include
-	"ebook/e-vcard.h"
-
-	* backend/ebook/tests/vcard/Makefile.am (TEST_LIBS): use
-	top_builddir.
-	(CFLAGS): same.
-
-	* backend/ebook/tests/ebook/Makefile.am (TEST_LIBS): use
-	top_builddir.
-	(CFLAGS): use srcdir
-
-	* backend/ebook/test-card.c, backend/ebook/test-client-list.c,
-	backend/ebook/test-client.c, backend/ebook/test-ebook.c: remove.
-	
-	* backend/ebook/e-card-cursor.[ch]: remove.
-
-	* backend/ebook/e-card-pairs.h: remove.
-	
-	* backend/ebook/e-book.c (e_book_add_contact): s/Card/Contact.
-	(e_book_commit_contact): same
-	(e_book_get_contact): same.
-	(e_book_remove_contacts): same.
-	(e_book_get_contacts): same.
-	(e_book_handle_response): same.
-
-	* backend/ebook/e-book-view.c (e_book_view_do_added_event):
-	s/card/contact
-	(e_book_view_do_modified_event): same.
-	(e_book_view_do_removed_event): same.
-	(e_book_view_handle_response): same.
-	(e_book_view_class_init): same.
-
-	* backend/ebook/e-book-view.h: s/card/contact and pad the class
-	struct.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): s/Card/Contact.
-	(e_book_view_listener_queue_status_event): no need to assign
-	things to NULL, we g_new0.
-	(e_book_view_listener_queue_idlist_event): s/Card/Contact, and no
-	need to assign things to NULL, we g_new0.
-	(e_book_view_listener_queue_sequence_event): same.
-	(e_book_view_listener_queue_message_event): same.
-	(impl_BookViewListener_notify_contacts_added): s/Card/Contact.
-	(impl_BookViewListener_notify_contacts_removed): same.
-	(impl_BookViewListener_notify_contacts_changed): same.
-	(e_book_view_listener_class_init): same.
-
-	* backend/ebook/e-book-view-listener.h: s/Card/Contact
-
-	* backend/ebook/e-book-types.h: s/CARD/CONTACT
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): s/Card/Contact
-	(impl_BookListener_respond_create_contact): same.
-	(impl_BookListener_respond_remove_contacts): same.
-	(impl_BookListener_respond_modify_contact): same.
-	(impl_BookListener_respond_get_contact): same.
-	(impl_BookListener_respond_get_contact_list): same.
-	(impl_BookListener_respond_get_changes): same.
-	(e_book_listener_class_init): same.
-
-	* backend/ebook/e-book-listener.h: pad the class struct, and
-	s/Card/Contact.
-
-	* backend/ebook/e-book-async.c (_load_uri_handler): GError
-	changes.
-	(_get_fields_handler): same.
-	(_get_methods_handler): same.
-	(_auth_user_handler): same.
-	(_get_card_handler): same.
-	(_remove_cards_handler): same.
-	(_add_vcard_handler): same.
-	(_commit_vcard_handler): same.
-	(_get_book_view_handler): same.
-	(e_book_async_get_book_view): use an EBookQuery instead of a char*.
-
-	* backend/ebook/Makefile.am: remove the test handling.
-	(SUBDIRS): set to ". tests"
-	(libebook_la_SOURCES): add e-book-async.c
-
-	* backend/idl/addressbook.idl: possibly gratuitous renaming, but i
-	was sick of seeing "Card" being used everywhere.  "Contact" is the
-	new "Card".
-
-2003-08-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_op_free): rename from
-	e_book_free_op.
-	(e_book_op_remove): rename from e_book_remove_op.
-	(e_book_clear_op): new function, remove the op, unlock its mutex,
-	and free it.
-	(e_book_add_contact): use e_book_clear_op.
-	(e_book_commit_contact): same.
-	(e_book_get_supported_fields): same.
-	(e_book_get_supported_auth_methods): same.
-	(e_book_authenticate_user): same.
-	(e_book_get_contact): same.
-	(e_book_remove_contacts): same.
-	(e_book_get_book_view): same.
-	(e_book_get_contacts): same.
-	(e_book_get_changes): same.
-	(e_book_load_uri): same.
-	(e_book_remove): new function.
-	(e_book_response_remove): new function.
-	(e_book_handle_response): add handling for RemoveBookResponse.
-	(e_book_load_local_addressbook): pass TRUE for e_book_load_uri
-	@only_if_exists.
-
-	* backend/ebook/e-book.h: add @only_if_exists arg to
-	e_book_load_uri so we can support folder creation at load_uri
-	time, and add prototype for e_book_remove.
-
-	* backend/ebook/e-book-types.h: add an "id" slot in EBookChange.
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_get_changes): handle union in idl.
-	(impl_BookListener_respond_open_book): remove unnecessary
-	exception check.
-	(impl_BookListener_respond_remove_book): new function.
-	(impl_BookListener_respond_get_supported_fields): rename this from
-	_response_.
-	(impl_BookListener_respond_get_supported_auth_methods): same.
-	(e_book_listener_class_init): add _remove_book and track change to
-	get_supported_fields/get_supported_auth_methods names.
-
-	* backend/ebook/e-book-listener.h: add RemoveBookResponse to
-	EBookListenerOperation enum.
-
-	* backend/idl/addressbook.idl: make BookChangeItem a union that
-	switches over BookChangeType.
-
-	* backend/pas/pas-backend.c (pas_backend_change_add_new): new
-	function, create a BookChangeItem representing the addition of a
-	contact.
-	(pas_backend_change_modify_new): same, but for modifications.
-	(pas_backend_change_delete_new): same, but for deletions.
-
-	* backend/pas/pas-backend.h: add prototypes for
-	pas_backend_change_{add,modify,delete}_new
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes): nuke.
-	(do_create): fix memory corruption.
-	(pas_backend_file_get_changes): copy the body of
-	pas_backend_file_changes here, and rework so that it's synchronous
-	and return a list instead of the book view hack.
-	(pas_backend_file_load_uri): mkdir the directory (we need a mkdir
-	-p here).
-	(select_changes): new function, scandir helper.
-	(pas_backend_file_remove): NULL out bf->priv->summary to quiet
-	valgrind, and call scandir to accumulate the .changes.db files
-	then unlink them.
-
-	* backend/pas/pas-book.c (pas_book_respond_remove): new function.
-	(pas_book_respond_get_supported_fields): unifdef this, and make it
-	use a glist.
-	(pas_book_respond_get_supported_auth_methods): same.
-	(pas_book_respond_get_changes): this code is kinda gross... lots
-	of copying going on, there's got to be a better way.  but it
-	works.
-
-2003-08-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add oneway void Book::remove() and
-	oneway void notifyBookRemoved()
-
-2003-08-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend.c (pas_backend_remove): new function.
-	(pas_backend_add_book_view): new function.
-	(pas_backend_add_client): move the "real_add_client" code here.
-	(pas_backend_remove_client): move the "real_remove_client" code
-	here.
-	(pas_backend_class_init): remove assignments of add_client and
-	remove_client vtable entries.
-	(pas_backend_is_removed): new function.
-	(pas_backend_set_is_removed): new function.
-	(pas_backend_init): init clients_mutex and views_mutex.
-
-	* backend/pas/pas-backend.h: remove the vtable entries for
-	add/remove_client, since these are fully handled in PASBackend.
-	Add prototypes for
-	pas_backend_is_removed/pas_backend_add_book_view/pas_backend_set_is_removed.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_remove): new function.
-	(impl_GNOME_Evolution_Addressbook_Book_getBookView): clean things
-	up a bit, and don't use pas_backend_get_book_views as it can't
-	lock the list of views.
-	(pas_book_respond_get_supported_auth_methods): remove the extra
-	unnecessary arg from the corba call.
-	(pas_book_respond_get_changes): same.
-	(pas_book_class_init): fill in epv "remove" slot.
-
-	* backend/pas/pas-book.h: rename pas_book_respond_remove to
-	pas_book_respond_remove_cards, and add a new
-	pas_book_respond_remove for use with removing books.
-
-	* backend/pas/pas-backend-sync.c (pas_backend_sync_remove): new
-	function.
-	(_pas_backend_remove): new function.
-	(pas_backend_sync_class_init): fill in the "remove" vtable entry.
-	(_pas_backend_remove_cards): track change to
-	pas_book_respond_remove_cards (pas_book_respond_remove is used for
-	removing the book, not the cards.)
-
-	* backend/pas/pas-backend-sync.h: add pas_backend_sync_remove
-	prototype and add remove_sync virtual function.
-
-2003-08-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_create_card,
-	pas_backend_file_remove_cards, pas_backend_file_modify_card,
-	pas_backend_file_get_vcard, pas_backend_file_get_card_list,
-	pas_backend_file_start_book_view, pas_backend_file_get_changes,
-	pas_backend_file_authenticate_user,
-	pas_backend_file_get_supported_fields): rename from
-	pas_backend_file_process_*
-	(pas_backend_file_load_uri): save off the dirname/summary
-	filename.
-	(pas_backend_file_remove): new function, unlink all the files we
-	know about.
-	(pas_backend_file_class_init): track changes to functions, and add
-	pas_backend_file_remove.
-
-2003-08-26  JP Rosevear  <jpr@ximian.com>
- 
-	* conduit/address-conduit.c (ecard_from_remote_record): duplicate
- 	the extra address lines
-	
-2003-08-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.[ch]: switch from using the PASRequest
-	union and a central PASBackend dispatch function.  just call the
-	pas_backend methods directly and expand the args out.
-
-	* backend/pas/pas-backend.[ch]: same.
-	
-	* backend/pas/pas-backend-sync.[ch]: same.
-
-	* backend/pas/pas-backend-vcf.c, backend/pas/pas-backend-file.c,
-	backend/pas/pas-backend-ldap.c: same, and get these all compiling
-	against the rest of the current pas/ebook code.	
-
-2003-08-21  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/test-ebook.c: track GError case.
-
-	* backend/ebook/e-book.[ch]: GError-ify the api, and clean up some
-	cases where we weren't removing the current op.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_convert_status): track change from
-	E_BOOK_VIEW_STATUS_* to E_BOOK_VIEW_ERROR_*.
-
-	* backend/ebook/e-book-types.h: track change from E_BOOK_STATUS_*
-	to E_BOOK_ERROR_*, and some E_BOOK_VIEW_STATUS_* to
-	E_BOOK_VIEW_ERROR_*.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): track change from
-	E_BOOK_STATUS_* to E_BOOK_ERROR_*.
-
-	* backend/ebook/e-book-query.c (e_book_query_any_field_contains):
-	new function.
-	(e_book_query_unref): handle the any_field_contains case.
-	(e_book_query_to_string): same.
-
-	* backend/ebook/e-book-query.h: add prototype for
-	e_book_query_any_field_contains.
-
-	* backend/ebook/e-card.c (e_card_load_uri): ifdef this out for
-	now.
-
-	* backend/ebook/e-contact.[ch] (e_contact_get_const): new
-	function/prototype.
-
-2003-08-20  Gilbert Fang  <gilbert.fang@sun.com>
-
-	* gui/widgets/e-addressbook-util.c
-        (e_addressbook_send_card_list): use memcpy to assign
-        CORBA_char_sequence instead of strcpy. (#46706)
-
-2003-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/component-factory.c: Update OAFIIDs.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Removed extern declaration for global_shell_client [yuck].
-	(e_addressbook_transfer_cards): #if 0 the invocation for
-	evolution_shell_client_user_select_folder(), we need to
-	reimplement this component-side now.
-
-	* gui/component/component-factory.c (factory): Call
-	addressbook_component_peek() here instead of
-	addressbook_component_init() [since the latter is no more].
-
-	* gui/component/addressbook.c (set_status_message): Don't create
-	the activity client for now.
-
-	* gui/component/addressbook-config.c: Removed member shell from
-	struct AddressbookDialog.
-	(ldap_dialog_new): Do not take a shell arg anymore.
-	(ldap_config_control_new): Likewise.
-	(addressbook_config_control_new): No need to get the global shell
-	pointer here anymore.
-
-	* gui/component/addressbook-component.c: Rewritten to support the
-	new ::Component interface.
-	* gui/component/addressbook-component.h: Likewise.
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Version
-	factory's OAFIID.  Remove ShellComponent server, add Component
-	server.
-
-2003-08-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_dispose): unref the
-	EComponentListener before unloading the CORBA object.
-
-2003-08-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_dispose): Chain.
-
-	* gui/component/e-address-widget.c (e_address_widget_destroy): Chain.
-	Prevent double frees. Prevent double GSource removal.
-
-	* gui/component/e-cardlist-model.c (e_cardlist_model_class_init):
-	Store parent class.
-	(e_cardlist_model_dispose): Chain. Prevent double frees and unrefs.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_dispose): Chain.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_dispose): Chain.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_dispose): Chain.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_model_destroy): Chain. Prevent double frees and unrefs.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_dispose):
-	Chain.
-	(addressbook_finalize): Chain.
-
-	* gui/widgets/e-addressbook-table-adapter.c (addressbook_dispose):
-	Chain.
-
-	* gui/widgets/e-addressbook-treeview-adapter.c (addressbook_destroy):
-	Chain. Prevent double free.
-
-	* gui/widgets/gal-view-minicard.c (gal_view_minicard_dispose):
-	Chain. Prevent double free and detach.
-
-	* gui/widgts/gal-view-treeview.c (gal_view_treeview_dispose):
-	Chain. Prevent double free and detach.
-
-	* printins/e-contact-print-style-editor.c
-	(e_contact_print_stule_editor_destroy): Chain. Prevent double unref.
-
-2003-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-vcard.c (e_vcard_to_string_vcard_21): new,
-	unimplemented, function.
-	(e_vcard_to_string_vcard_30): move the 3.0 vcard export code here.
-	(e_vcard_to_string): call e_vcard_to_string_vcard_21 or
-	e_vcard_to_string_vcard_30 based on @format.
-	(e_vcard_attribute_remove_values): new function.
-
-	* backend/ebook/e-vcard.h: add @format to e_vcard_to_string, and
-	add prototype for e_vcard_attribute_remove_values.  also, add
-	prototype for e_vcard_decode_b_encoding.
-
-2003-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_open_book): remove the book arg.
-
-	* backend/ebook/e-book-listener.h (struct _EBookListenerResponse):
-	remove the corba book.
-
-	* backend/ebook/e-book-async.c (_get_book_view_dtor): free the
-	query string.
-	(e_book_async_get_book_view): dup the query string.
-
-	* backend/ebook/e-book.h: change e_book_get_book_view and
-	e_book_get_contacts to take a const char * query string instead of
-	an EBookQuery.
-
-	* backend/ebook/e-book.c (e_book_add_contact): pass
-	EVC_FORMAT_VCARD_30 to e_vcard_to_string.
-	(e_book_commit_contact): same.
-	(e_book_get_book_view): take a const char* query string instead of
-	an EBookQuery.
-	(e_book_get_contacts): same.
-	(e_book_response_open): track change - the Book is no longer
-	communicated back here.
-	(listener_cb): nuke.
-	(e_book_handle_response): track change to e_book_response_open.
-	(e_book_load_uri): rework this from using BookFactory::openBook to
-	BookFactory::getBook + Book::open.
-	(e_book_get_uri): new function, reimplement from old api.
-	(e_book_get_static_capabilities): same.
-	(e_book_check_static_capability): same.
-	(startup_mainloop): new function, run bonobo_main.
-	(e_book_activate): start up a thread with startup_mainloop as the
-	start func.
-	(e_book_new): call e_book_activate.
-
-	* backend/idl/addressbook.idl: Add Book::open, remove the Book
-	from notifyBookOpened's args, and change BookFactory::openBook to
-	BookFactory::getBook.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): add
-	only_if_exists - stop using the "create-initial" special file.
-
-	* backend/pas/pas-backend-vcf.c (pas_backend_vcf_load_uri): add
-	only_if_exists - stop using the "create-initial" special file.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): add
-	@only_if_exists, and pass it along to the virtual method.
-	(pas_backend_open): new function, lock the mutex so only one
-	PASBook can actually call load_uri.  call load_uri with
-	pas_book_get_uri, and req->only_if_exists.
-	(pas_backend_handle_request): rename process_client_request to
-	this, and expose it publicly.  Also add a case statement for
-	"Open".
-	(real_add_client): gut this function, we don't need to create the
-	book anymore, just add the client to the list and do the weak
-	ref/ORBit small stuff.
-	(pas_backend_add_client): track change to signature - BookListener
-	-> PASBook.
-	(pas_backend_init): init open_mutex.
-	(pas_backend_dispose): free open_mutex.
-
-	* backend/pas/pas-backend.h (PASBackendClass): add @only_if_exists
-	to the load_uri virtual method, and change the add_client virtual
-	method to take a PASBook instead of a BookListener.  add the same
-	args to _load_uri and add_client.  Also, add prototypes for
-	pas_backend_handle_request and pas_backend_open.
-
-	* backend/pas/pas-book-factory.c
-	(_pas_book_factory_send_open_book_response): nuke.
-	(pas_book_factory_launch_backend): just return NULL, don't call
-	_pas_book_factory_send_open_book_response, in the error case.
-	(start_backend): nuke
-	(impl_GNOME_Evolution_Addressbook_BookFactory_getBook): rename
-	_openBook to this.  clean up the code a bit.  Create the PASBook
-	here, and always track change to pas_backend_add_client's type (we
-	pass the book now, not the listener).
-	(pas_book_factory_class_init): openBook -> getBook.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_open): new function, call
-	pas_backend_open.
-	(impl_GNOME_Evolution_Addressbook_Book_getVCard): get rid of the
-	signal crap, just call pas_backend_handle_request.
-	(impl_GNOME_Evolution_Addressbook_Book_getCardList): same.
-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): same.
-	(impl_GNOME_Evolution_Addressbook_Book_addCard): same.
-	(impl_GNOME_Evolution_Addressbook_Book_removeCards): same.
-	(impl_GNOME_Evolution_Addressbook_Book_modifyCard): same.
-	(impl_GNOME_Evolution_Addressbook_Book_getChanges): same.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): same.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedAuthMethods):
-	same.
-	(impl_GNOME_Evolution_Addressbook_Book_cancelOperation): same.
-	(pas_book_get_backend): aggregate some g_return_if_fail's.
-	(pas_book_get_listener): new function.
-	(pas_book_get_uri): new function.
-	(pas_book_respond_open): just call BookListener::notifyBookOpened.
-	(pas_book_construct): add @uri, and g_strdup it.
-	(pas_book_new): add @uri, and pass it to pas_book_construct.
-	(pas_book_class_init): remove the "request" signal stuff, and fill
-	in epv->open.
-
-	* backend/pas/pas-book.h: add PASOpenRequest struct/enum entry.
-	Also, add @uri to the pas_book_new args, and add a prototype for
-	pas_book_get_uri.  Also, remove the "request" signal.
-
-2003-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_get_n_backends): lock map_mutex around hash
-	table work.
-	(pas_book_factory_dump_active_backends): same.
-	(backend_last_client_gone_cb): same.
-	(_pas_book_factory_send_open_book_response): track CallStatus idl
-	change.
-	(start_backend): simplify this greatly, since the factory is
-	tagged with HINT_PER_THREAD.
-	(impl_GNOME_Evolution_Addressbook_BookFactory_openBook): lock
-	around hash table.
-	(pas_book_factory_init): initialize map_mutex.
-	(pas_book_factory_dispose): free map_mutex.
-
-2003-08-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_book_view_copy): nuke.
-	(pas_backend_file_book_view_free): same.
-	(view_destroy): same.
-	(pas_backend_file_changes): #if notyet
-	(do_create): e-card -> e-contact.
-	(pas_backend_file_process_create_card): remove view handling from
-	here.
-	(pas_backend_file_process_remove_cards): same.
-	(pas_backend_file_process_modify_card): convert to e-contact, and
-	remove view handling.
-	(pas_backend_file_get_book_view): nuke.
-	(pas_backend_file_process_get_supported_fields): e-card-simple ->
-	e-contact.
-	(pas_backend_file_upgrade_db): e-card -> e-contact.
-	(pas_backend_file_cancel_operation): implement, just return
-	CouldNotCancel.
-	(pas_backend_file_class_init): assign cancel_operation, and remove
-	get_book_view assignment.
-	(pas_backend_file_init): remove book_views assignment.
-
-2003-08-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-vcf.c (pas_backend_vcf_book_view_copy):
-	nuke.
-	(pas_backend_vcf_book_view_free): same.
-	(view_destroy): same.
-	(insert_contact): new function, insert the contact into our hash
-	table.
-	(load_file): reimplement without the e_card stuff.
-	(foreach_build_list): e_card -> e_contact.
-	(save_file): mostly reimplement in terms of e-contact.  more error
-	case work needs doing.
-	(do_create): e-card -> e-contact.
-	(pas_backend_vcf_process_create_card): remove the view handling
-	from here.
-	(pas_backend_vcf_process_remove_cards): implement this, just
-	remove it from the hash table and set ourselves to dirty.
-	(pas_backend_vcf_process_modify_card): remove the view handling
-	from here.
-	(pas_backend_vcf_process_get_book_view): nuke.
-	(pas_backend_vcf_process_get_supported_fields): reimplement in
-	terms of e-contact.
-	(INITIAL_VCARD): add in a FN attribute, and remove the quoted
-	printable encoding.
-	(pas_backend_vcf_cancel_operation): implement, just always return
-	CouldNotCancel.
-	(pas_backend_vcf_class_init): fill in cancel_operation, and remove
-	get_book_view_sync.
-	(pas_backend_vcf_init): remove book_views handling.
-
-	* backend/pas/pas-backend-vcf.h: update copyright.
-
-2003-08-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-sync.c (pas_backend_sync_remove_cards):
-	add out param @ids, so we can call pas_book_respond_remove
-	properly.
-	(_pas_backend_remove_cards): the other half of the change - pass
-	the ids on to pas_book_response_remove.
-	(pas_backend_sync_modify_card): add out param @old_vcard so we can
-	call pas_book_respond_modify properly.
-	(_pas_backend_modify_card): the other half of the change, pass the
-	old_vcard on to pas_book_respond_modify.
-	(pas_backend_sync_get_book_view): nuke.
-	(pas_backend_sync_get_changes): track change (book view -> GList)
-	(_pas_backend_is_threaded): nuke.
-	(_pas_backend_create_card): indent.
-	(_pas_backend_remove_cards): same.
-	(_pas_backend_modify_card): same.
-	(_pas_backend_get_card_list): same.
-	(_pas_backend_get_changes): same.
-	(_pas_backend_authenticate_user): same.
-	(_pas_backend_get_supported_fields): same.
-	(_pas_backend_get_supported_auth_methods): same.
-	(_pas_backend_get_book_view): nuke.
-	(pas_backend_sync_class_init): remove assignment to is_threaded
-	and get_book_view.
-
-	* backend/pas/pas-backend-sync.h: add out-params @ids to
-	remove_cards_sync, @old_vcard to modify_card_sync.
-	get_changes_sync's out-param is a GList instead of a book view,
-	and remove get_book_view_sync.
-
-	* backend/pas/pas-backend.c (pas_backend_get_book_view): nuke.
-	(pas_backend_is_threaded): nuke.
-	(pas_backend_start_threaded): nuke.
-	(pas_backend_init): initialize priv->views.
-	(pas_backend_dispose): free priv->views.
-	(pas_backend_get_book_views): new function, return priv->views.
-
-	* backend/pas/pas-backend.h: remove the get_book_view virtual
-	method, and the pas_backend_get_book_view prototype.  Also, track
-	the CallStatus change, and add a cancel_operation virtual method
-	and prototype, and add pas_backend_get_book_views function, so the
-	PASBook's can get ahold of the list.
-
-	* backend/pas/pas-book-view.h: track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-
-	* backend/pas/pas-book-view.c: same.
-	
-	* backend/pas/pas-card-cursor.[ch]: nuke
-	
-	* backend/pas/pas-book.c: track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-	(impl_GNOME_Evolution_Addressbook_Book_getBookView): implement
-	this all here, instead of farming it out to the backends.
-	(impl_GNOME_Evolution_Addressbook_Book_getChanges): track change
-	to signature.  this is no longer a book view, it'll return an
-	actual list.
-	(impl_GNOME_Evolution_Addressbook_Book_cancelOperation): new
-	function, implement.
-	(pas_book_respond_create): iterate over the views, notifying them
-	if the new card matches their query.
-	(pas_book_respond_remove): iterate over the views, telling them to
-	delete the card matching the id.
-	(pas_book_respond_modify): iterate over the views, notifying them
-	if they need to change/add/remove that card.
-	(view_destroy): move this here from the backends.
-	(pas_book_respond_get_book_view): weak-ref the book view.
-	(pas_book_new): remove the is_threaded switch on POA hints, and
-	always use PER_REQUEST.
-	(pas_book_class_init): fill in cancelOperation.
-
-	* backend/pas/pas-book.h: track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-
-2003-08-01  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-async.c: mostly finished.
-
-2003-08-01  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-async.[ch]: new files, create async methods
-	similar to the old ebook api that use GThread/GAsyncQueue to
-	simulate the old async behavior.
-
-2003-07-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: collapse
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-
-2003-07-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-types.h: add EBookChangeType/EBookChange.
-
-2003-07-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c: track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-
-	* backend/ebook/e-book-listener.c track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-	(response_free): nuked
-	(e_book_listener_check_queue): nuked
-	(e_book_listener_queue_response): nuked
-	(e_book_listener_queue_progress): nuked
-	(e_book_listener_queue_get_view_response): nuked
-	(e_book_listener_queue_get_changes_response): nuked
-	(e_book_listener_queue_writable_status): nuked
-	(e_book_listener_queue_authentication_response): nuked
-	(e_book_listener_queue_get_supported_fields_response): nuked
-	(e_book_listener_queue_get_supported_auth_methods_response): nuked
-	(e_book_listener_dispose): nuked
-	
-	* backend/ebook/e-book-listener.h: remove prototypes for
-	check_pending and pop_response.
-
-	* backend/ebook/e-book.c (e_book_get_changes): new function.
-	implement this as more of a getCardList type function, instead of
-	getBookView.
-	(e_book_response_get_changes): new function.
-	(e_book_free_change_list): new function.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_free_change_list.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_get_book_view): new function,
-	implement this.
-	(e_book_response_get_book_view): same.
-	(e_book_get_contacts): remove the op so we don't see BUSY after
-	this request.
-	(e_book_handle_response): unifdef a few things.
-	(e_book_unload_uri): fix the assertion about URI_NOT_LOADED, and
-	unifdef some code.
-	(e_book_dispose): fix a typo.
-
-	* backend/ebook/e-book-view.c (e_book_view_handle_response):
-	rename _check_listener_queue to this.  we don't need to pop the
-	response either, it's passed as an arg.
-	(e_book_view_construct): "response_queued" -> "response"
-	(e_book_view_start): new function, call BookView.start.
-	(e_book_view_dispose): track the signal id change.
-
-	* backend/ebook/e-book-view.h: add prototype for
-	e_book_view_start.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): remove.
-	(e_book_view_listener_queue_response): just emit the signal.
-	(impl_BookViewListener_notify_card_added): spew.
-	(impl_BookViewListener_notify_card_changed): spew.
-	(impl_BookViewListener_notify_sequence_complete): spew.
-	(impl_BookViewListener_notify_progress): spew.
-	(e_book_view_listener_check_pending): remove
-	(e_book_view_listener_check_pop_response): remove
-	(e_book_view_listener_new): use the ALL_AT_IDLE poa policy.
-	(e_book_view_listener_init): remove the queue/timeout stuff.
-	(e_book_view_listener_dispose): remove the queue/timeout stuff.
-
-	* backend/ebook/e-book-view-listener.h: remove _check_pending and
-	_pop_response.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (do_summary_query): remove the
-	completion_search argument, and remove the aggregating stuff.
-	just call pas_book_view_notify_add_1.
-	(pas_backend_file_book_view_copy): remove card_sexp crap.
-	(pas_backend_file_book_view_free): same.
-	(get_length): remove
-	(get_nth): remove
-	(cursor_destroy): remove
-	(vcard_matches_search): remove
-	(ecard_matches_search): remove
-	(pas_backend_file_search_timeout): remove the aggregating stuff.
-	just call pas_book_view_notify_add_1.
-	(pas_backend_file_search): simplify this a bunch.
-	(do_create): use pas_book_view_vcard_matches.
-	(pas_backend_file_process_get_card_list): add some more error
-	checks.
-	(pas_backend_file_process_get_book_view): unifdef this, and
-	implement it.
-	(pas_backend_file_start_book_view): kick off the search.
-	(pas_backend_file_get_uri): remove.
-	(pas_backend_file_class_init): remove get_uri, add
-	start_book_view.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): don't need to
-	unref the card_sexp, as the PASBookView owns it now.
-	(create_card_handler): use pas_book_view_vcard_matches.
-	(modify_card_modify_handler): same.
-	(ldap_get_view): initialize the view properly.
-	(pas_backend_ldap_get_uri): remove.
-	(pas_backend_ldap_class_init): remove the get_uri assignment.
-
-	* backend/pas/pas-backend-sync.c (_pas_backend_get_card_list):
-	don't free this, it's freed in the pas_book code.
-
-	* backend/pas/pas-backend-sync.h: make use of pas-types.h and
-	remove some typedefs.
-
-	* backend/pas/pas-backend-summary.h: same.
-
-	* backend/pas/pas-backend-card-sexp.h: same.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_getBookView): spew.
-	(pas_book_respond_create): unifdef this.
-	(pas_book_respond_remove): same.
-	(pas_book_respond_modify): same.
-	(pas_book_respond_authenticate_user): same.
-	(pas_book_respond_get_supported_fields): unref the iterator.
-	(pas_book_respond_get_book_view): unifdef, and add spew.
-
-	* backend/pas/pas-book.h: make use of pas-types.h and remove some
-	typedefs.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-types.h: new file, all the typedefs shared
-	between files here.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-view.c (send_pending_adds): abstract all
-	the aggregating code to the book view.  backends just call
-	notify_card_added and the superclass does all the aggregating.
-	(pas_book_view_notify_change): if there are pending adds, send
-	them before we send the change.
-	(pas_book_view_notify_remove): same.
-	(pas_book_view_notify_add): the other part of the aggregating
-	code.
-	(pas_book_view_notify_complete): send pending adds if there are
-	any.
-	(impl_GNOME_Evolution_Addressbook_BookView_start): new function,
-	call pas_backend_start_book_view.
-	(pas_book_view_get_card_query): new function.
-	(pas_book_view_get_card_sexp): new function.
-	(pas_book_view_get_backend): new function.
-
-	* backend/pas/pas-book-view.h: add a PASBackend arg to the
-	constructor, as well as the char* query and PASBackendCardSExp
-	form.  also add accessors for card_query, card_sexp, and backend.
-
-	* backend/idl/addressbook.idl
-	(GNOME::Evolution::Addressbook::BookView): add start() method.
-	(GNOME::Evolution::Addressbook::BookListener): remove the oneway
-	tag from notifyBookOpened, notifyViewRequested, and
-	notifyChangesRequested so the call doesn't return until the remote
-	object has gotten the method call.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): fill in the
-	uri slot if the load was successful.
-	(pas_backend_get_uri): return the uri, remove the virtual method
-	call.
-	(pas_backend_start_book_view): new function.
-	(process_client_request): ifdef out the threaded foo, since i'm
-	not certain it's at all necessary.
-	(real_add_client): remove the bonobo_object_unref of the book,
-	since it's immortal.
-	(pas_backend_dispose): free the uri.
-
-	* backend/pas/pas-backend.h: remove the get_uri virtual method,
-	and add the start_book_view virtual method and
-	pas_backend_start_book_view prototype.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/Makefile.am (libpasvcf_a_SOURCES): new.
-	(noinst_LIBRARIES): add libpasvcf.a
-
-	* backend/pas/pas-backend-vcf.[ch]: new files, implement a vcard
-	file backend.  the backend api still needs a little work, but it's
-	getting easier to write backends.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_print_response): deal with
-	"uses_list".  Fixes #30839.
-	(e_contact_print_dialog_new): use GINT_TO_POINTER instead of
-	casting to void*, and set "uses_list" to FALSE.
-	(e_contact_print_card_dialog_new): same.
-	(e_contact_print_card_list_dialog_new): same, but set "uses_list"
-	to TRUE.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_dispose): fix a typo.
-
-2003-07-22  Akira TAGOH  <tagoh@redhat.com>
-
-	* printing/e-contact-print-envelope.c (ecpe_print): Use 'Sans'
-	instead of 'Helvetica' for the font name.
-	* printing/e-contact-print.c (e_contact_build_style): Likewise.
-
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am: use EVO_MARSHAL_RULE
-	* backend/pas/Makefile.am: Likewise
-	* gui/component/select-names/Makefile.am: Likewise
-	* gui/contact-editor/Makefile.am: Likewise
-	* gui/contact-list-editor/Makefile.am: Likewise
-	* gui/widgets/Makefile.am: Likewise
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_class_init):
-	s/ece_marshal/e_contact_editor_marshal/
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_class_init): Likewise for ecle_marshal
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Remove gtk_window_set_policy
-	call since that function is deprecated and it was just setting
-	everything to the default values anyway.
-
-	* gui/widgets/e-addressbook-util.c: #include gal/util/e-util.h for
-	e_free_object_list.
-
-2003-07-22  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card.c: (e_card_new,
-	e_card_new_with_default_charset): Make the "vcard" arg const.
-	...: add lots and lots of other consts as a side effect
-
-2003-06-30  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_dispose):
-	disconnect from model signals to prevent a race condition at
-	shutdown where the view gets destroyed and then the model notices
-	the backend dying before being destroyed itself.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_finalize): add, to free priv.
-	(e_addressbook_reflow_adapter_class_init): set it up
-
-	* gui/component/e-address-popup.c (e_address_popup_set_free_form):
-	Don't leak strings
-
-	* gui/component/addressbook-storage.c (load_source_data): don't
-	leak xml data.
-
-	* gui/component/addressbook-component.c (new_item_cb): don't leak
-	the new card.
-
-2003-06-25  Gilbert Fang <gilbert.fang@sun.com>
-
-	* gui/widgets/e-minicard-view-widget.c 
-	(e_minicard_view_widget_real_focus_in_event): new function, 
-	override the event handler for focus_in_event, set the first item
-	be focused if no focused item at all.  Fixes bug 41826.
-
-2003-06-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (fill_in_field): in the
-	EUrlEntry case just reassign widget.  it'll be handled by the
-	GtkEditable code below.  Fixes #43841.
-
-2003-06-14  Larry Ewing  <lewing@ximian.com>
-
-        * gui/backend/ebook/e-card-simple.c:
-	* gui/backend/ebook/e-card.c:
-	* gui/backend/ebook/evolution-ldif-importer.c:
-	* gui/backend/ebook/load-pine-addressbook.c:
-	* gui/backend/ebook/test-card.c:
-	* gui/backend/pas/pas-backend-card-sexp.c:
-	* gui/backend/pas/pas-backend-ldap.c: Fix lots of leaks, update
-	for correct use of g_object_get. Some cleanups.
-
-2003-06-13  Larry Ewing  <lewing@ximian.com>
-	
-	* gui/component/addressbook.c:
-        * gui/component/e-cardlist-model.c:
-	* gui/component/select-names/e-select-names-text-model.c:
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/contact-editor/e-contact-save-as.c:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	* gui/widgets/e-addressbook-table-adapter.c:
-	* gui/widgets/e-addressbook-util.c:
-	* gui/widgets/e-addressbook-view.c:
-	* gui/widgets/e-minicard-view.c:
-	* gui/widgets/e-minicard.c:  Fix lots of leaks, update for correct
-	use of g_object_get.  Some misc cleanups.
-
-	* printing/e-contact-print.c: update for correct use of
-	g_object_get.
-
-2003-06-05  Not Zed  <NotZed@Ximian.com>
-
-	** For #42691.
-
-	* gui/component/select-names/Makefile.am (%.server.in): implicit
-	rule for .in file.
-	(BUILT_SOURCES): added server_DATA.
-
-	* gui/component/Makefile.am (%.server.in): use implicit rule for
-	.in file.
-	(BUILT_SOURCES): added, just server_DATA.
-	(CLEANFILES): added
-
-	* backend/ebook/Makefile.am (BUILT_SOURCES): add server_DATA.
-
-2003-06-04  Rodrigo Moya <rodrigo@ximian.com>
-
- 	* backend/ebook/ebook.c (e_book_do_response_open): adapted to
- 	changes in EComponentListener API.
-
-** See ChangeLog.pre-1-4 for older changes
-
diff --git a/addressbook/ChangeLog.pre-1-4 b/addressbook/ChangeLog.pre-1-4
deleted file mode 100644
index b1c12cb82f..0000000000
--- a/addressbook/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,16758 +0,0 @@
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (func_beginswith): use the more
-	convoluted (but more correct) query if evolutionPerson is
-	supported.  Fixes #42825.
-
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-destination.c (use_default_book_cb): handle the
-	case where @book == NULL, which can happen if there was a problem
-	opening the default book.  Should fix #43005.
-	
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(ensure_completion_uris_exist): fix the initial run case.  the
-	config upgrade code creates all elements so we can't just check
-	for NULL - we have to check if the string is empty.  Fixes #43213.
-
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (set_colors): if we've got focus,
-	set the background of the rect to bg[NORMAL], and the fill color
-	of the text and label to text[NORMAL].  This will make the
-	background a different color than the canvas, but won't make it
-	use the selected background.  fixes #42472
-
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/merging/e-card-merging.c (e_card_merging_book_commit_card):
-	add a g_object_ref(card), to match the one in
-	e_card_merging_book_add_card.  Fixes #43175.
-
-2003-05-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c: Added HIG-appropriate
-	HIG-appropriate spacing, padding, accelerators. Fixes bug #41210
-
-	* gui/component/ldap-config.glade: HIG-ified the various dialogs
-	(including the settings pages, the config druid, and the edit dialog) 
-	in this glade file. This fixes bugs #41140, #41137, #41130
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade: 
-	Changed button order, and added HIG-appropriate spacing/padding. 
-	Fixes bug #41232.
-
-	* gui/merging/e-card-duplicate-detected.glade: Changed button 
-	order, and added HIG-appropriate spacing/padding. Fixes bug
-	#41229 and #41231.
-
-2003-05-19  Sean Gao  <sean.gao@sun.com>
-
-	* gui/component/addressbook-component.c (xfer_folder): remove the
-	summary if @remove_source is TRUE.  Fixes 38084.
-
-2003-05-16  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade:  Added 
-	HIG-appropriate spacing, padding, capitalization and accelerators. 
-	Fixes bug #41254
-
-2003-05-16  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/fulladdr.glade: Added HIG-appropriate
-	spacing, padding, capitalization and accelerators. Fixes bug #41251	
-2003-05-14  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/fullname.glade:  Added HIG-appropriate
-	spacing, padding, caps, title and accelerators. Fixes bug #41249, 
-	and also bug #41250..
-
-2003-05-16  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Added HIG-appropriate
-	spacing, padding, capitalization and accelerators. Fixes bug #41248.
-
-
-2003-05-16  Rodney Dawes  <dobey@ximian.com>
-
-	* addressbook/backend/ebook/Makefile.am: Move the tools to a
- 	more appropriate directory, privlibexecdir
-	
-2003-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): backing out a tiny
-	porting of jpr's fix - we need to set the book on the
-	EAddressbookView, or else it won't do queries, and it won't show
-	any cards.  Fixes #43023, #43090.
-
-2003-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/merging/e-card-merging.c (free_lookup): new function, split
-	out the duplicated teardown code from final_cb and final_id_cb.
-	also, unref the card.
-	(final_id_cb): call free_lookup.
-	(final_cb): same.
-	(e_card_merging_book_add_card): ref the card.  fixes bug #43016.
-
-2003-05-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (full_addr_clicked):
-	replace the text_buffer_delete/text_buffer_insert with
-	set_buffer_set_text.  call widget_changed if they clicked OK, so
-	we actually mark the dialog changed.
-	(fill_in_field): make this handle GtkTextViews, because for some
-	reason that escapes rational thought GtkTextView's don't implement
-	GtkEditable.  fixes #42606.
-	(extract_field): same.
-
-2003-05-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_reflow): set
-	the clip_height on reflow so the name of the field is as high as
-	the field's value.  makes it possible to click anywhere to the
-	left of a tall field (like an address) and have it select the
-	field.  Fixes #42625.
-
-2003-05-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (address_mailing_changed):
-	handle the case where we haven't filled in the address yet. fixes
-	#42620.
-
-2003-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_view_unref): clear the
-	view
-	(book_open_cb): track the book in the view, don't unref the book
-	(set_prop): set the book
-	(retrieve_shell_view_interface_from_control): get the shell view
-	every time
-	(set_folder_bar_label): release and unref the shell view
-
-	* gui/component/addressbook-storage.h: add proto
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_cleanup): unref the storage
-
-	* gui/component/addressbook-component.c (owner_unset_cb): clean up
-	storage
-
-	* backend/ebook/e-book.c (e_book_load_uri): track the listener
-	signal
-	(e_book_dispose): unref the listener and disconnect the signal
-
-2003-05-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_set_separator): strlen ->
-	g_utf8_strlen.
-	(e_select_names_text_model_insert): same.
-	(e_select_names_text_model_insert_length): big change, make this
-	work with multibyte utf8.
-	(e_select_names_text_model_delete): same.  this could possibly use
-	a tighter loop + a memmove, but this works.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_get_textification): make sure our truncation
-	to MAX_LENGTH characters uses utf8 characters, not bytes.
-	(e_select_names_model_name_pos): track e-text-model change.
-	pos/length are now in utf8 character terms, so use g_utf8_strlen
-	instead of strlen.
-	(e_select_names_model_text_pos): same.
-
-2003-05-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c (addressbook_dispose):
-	rename addressbook_destroy to this, and guard against multiple
-	calls.
-	(e_addressbook_table_adapter_class_init): GtkObject -> GObject,
-	and destroy -> dispose.
-	(e_addressbook_table_adapter_init): GtkObject -> GObject.
-
-2003-05-12  Sean Gao  <sean.gao@sun.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): terminate g_build_filename with
-	NULL.
-
-2003-05-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #42048 ]
-	* gui/widgets/e-addressbook-view.c (e_contact_print_button):
-	button => response.
-	(e_addressbook_view_print): connect to "response", not "clicked".
-
-2003-05-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41245 ]
-	* gui/component/select-names/select-names.glade: fix
-	spacing/border widths as per HIG.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): set the border width/spacing on widgets we
-	create here.
-	
-2003-05-09  Jeremy Katz  <katzj@redhat.com>
-
-	* printing/e-contact-print.c (e_contact_print_response): Use glib
-	macro to case from pointer to int.
-
-	* printing/e-contact-print-envelope.c: Add missing #include.
-
-	* gui/component/select-names/e-select-names-completion.c 
-	(e_select_names_completion_start_query): Use
-	E_SELECT_NAMES_COMPLETION to avoid warning
-
-2003-05-06  Chris Toshok  <toshok@ximian.com>
-
-	[ really commit this, fixes bug #41910 ] 
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_remove_row): change from model_changed to
-	row_deleted here.  model_changed causes the table to free its
-	ETableSelection, which is what we iterate over when deleting
-	contacts.
-	(e_contact_list_model_add_destination): no need to be calling
-	model_changed here either.
-
-2003-04-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41255 ]
-	* gui/contact-list-editor/contact-list-editor.glade: use stock
-	buttons for Add/Remove.
-
-2003-04-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41144 ]
-	* gui/component/ldap-config.glade: use stock buttons for the
-	Add/Delete buttons.  Switch from "Delete" to "Remove", though, as
-	"Remove" fits much better with the one for "Add".  Also, add our
-	stock-edit-24.png icon for "Edit".
-	
-2003-04-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41211 ]
-	* gui/component/e-address-popup.c (e_address_popup_no_matches):
-	call e_button_new_with_stock_icon to create our button and give it
-	the right icon.
-
-2003-04-29  Gilbert Fang  <gilbert.fang@sun.com>
-
-	* tools/evolution-addressbook-export-list-cards.c
-	(set_pre_defined_field): remove duplicate HOME_COUNTRY field add.
-
-2003-04-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41843]
-	* tools/evolution-addressbook-export-list-cards.c
-	(e_card_simple_csv_get_name): use e_card_simple_get_ecard_field
-	instead of e_card_simple_get_name, so the return value won't be
-	localized.
-
-2003-04-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41779 ]
-	* gui/component/e-address-popup.c (mini_wizard_container_add): we
-	don't need to call gtk_widget_destroy on the old child, since
-	gtk_container_remove will unref it for us.
-
-2003-04-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #37351 ]
-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): the row
-	the signal is called with is already the model row, not the view
-	row, so don't call e_table_view_to_model_row on it.
-
-2003-04-23  Chris Toshok  <toshok@ximian.com>
-
-	[ either mostly or entirely fixes #33708 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_done): new function, factor it out of
-	_seq_complete_cb because we need to run the same code in a couple
-	of places.
-	(e_select_names_completion_got_book_view_cb): treat an error from
-	a book as getting a "sequence_complete", and decrement the count
-	of pending complete signals.
-	(e_select_names_completion_got_book_view_cb): remove the increment
-	of pending_completion_seq from here.
-	(e_select_names_completion_seq_complete_cb): factor out the body
-	of e_select_names_completion_done from here, and call it.
-	(e_select_names_completion_start_query): increment
-	pending_completion_seq here.  remove the async variable, as we can
-	now use pending_completion_seq for that purpose (it's > 0 iff
-	async would have been TRUE).
-
-2003-04-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40954 ]
-	* backend/pas/pas-backend-file.c (pas_backend_file_dispose): guard
-	against NULL bf->priv->summary (happens if the initial load_uri
-	failed).
-	(pas_backend_file_load_uri): always set bf->priv->uri, since it's
-	used in _get_uri, which is called when the backend goes away.
-	This only happened before if you tried to load a folder that
-	didn't exist.
-
-2003-04-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #40694 ]
-	* gui/component/select-names/e-select-names-bonobo.c
-	(control_activate_cb): just grab focus if @activate == TRUE.
-	we'll do all merging/unmerging in the focus handler.
-	(widget_focus_cb): handle the merging here.
-	(e_bonobo_control_automerge_ui): store off the widget (so we can
-	grab focus on it) and connect to "activate".
-
-2003-04-18  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/select-names/Makefile.am: Add missing -DPREFIX
-	
-2003-04-18  Rodney Dawes  <dobey@ximian.com>
-
-	[ fixes #21499 ]
-	* gui/component/Makefile.am:
-	* gui/component/addressbook.c:
-	* gui/component/select-names/e-select-names-bonobo.c:
-	* gui/contact-editor/Makefile.am:
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/contact-list-editor/Makefile.am:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()
-	
-2003-04-15  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #41252 ]
-	* gui/contact-editor/fulladdr.glade: change title from "Check
-	Address" to "Full Address".
-
-2003-04-09  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #40727 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): if the query text is
-	either shorter than the cached query_text or they don't match,
-	don't just set can_reuse_cached_cards to FALSE.  we also need to
-	invalidate the cache.
-
-2003-04-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/e-destination.c (d): Remove all debugging
-	messages.
-
-2003-04-08  Dan Winship  <danw@ximian.com>
-
-	* gui/component/ldap-config.glade: Remove color specifications
-	from the druid so it will use theme colors.
-
-	* gui/component/addressbook-config.c
-	(addressbook_add_server_druid): Use g_signal_connect_after for
-	"prepare" signal (to work around b.g.o 81869)
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #7103 ]
-	* gui/widgets/e-minicard-label.c (e_minicard_label_class_init):
-	init style_set. and add the signal.
-	(e_minicard_label_realize): include e_minicard_label_construct's
-	code here, and call set_colors after we create the sub-items.
-	(e_minicard_label_unrealize): indent, and remove dead code.
-	(e_minicard_label_event): indent, and call set_colors instead of
-	setting the colors manually.
-	(set_colors): new function, set our colors based on the current
-	style.
-	(e_minicard_label_style_set): new function, just call set_colors.
-	(e_minicard_label_new): e_minicard_label_construct doesn't exist
-	anymore.
-
-	* gui/widgets/e-minicard-label.h (struct _EMinicardLabelClass):
-	add style_set signal.
-
-	* gui/widgets/e-minicard.c (set_selected): little tweaks in the
-	coloring.
-	(e_minicard_unrealize): reindent, and remove some unused code.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): add background.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): init
-	widget_class->style_class.
-	(e_minicard_view_widget_style_set): new function, just set the
-	background's fill_color_gdk to base[GTK_STATE_NORMAL].
-	(e_minicard_view_widget_realize): store off the background canvas
-	item so we can set the color later.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40901 ]
-	* gui/component/ldap-config.glade: HIG-ify the ldap server edit
-	dialog's button layout.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #39763 ]
-	* gui/component/select-names/e-select-names-bonobo.c (copy_cb):
-	verb callback for EditCopy
-	(cut_cb): verb callback for EditCut.
-	(paste_cb): verb callback for EditPaste.
-	(select_all_cb): verb callback for SelectAll.
-	(free_closure): new function
-	(merge_menu_items): same
-	(unmerge_menu_items): same
-	(control_set_frame_cb): same
-	(control_activate_cb): same
-	(widget_focus_cb): same
-	(e_bonobo_control_automerge_ui): new function, sets up focus
-	signals on the widget passed in to merge/unmerge the passed in
-	ui/verbs.
-	(impl_SelectNames_get_entry_for_section): call
-	e_bonobo_control_automerge_ui for this entry.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/e-address-popup.c (mini_wizard_new): change the
-	ok/cancel button layout to be higified.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ last portion of #40046 fix ]
-	* gui/component/select-names/e-select-names-popup.c
-	(remove_recipient_cb): ifdef this out to quiet the compiler.
-	(remove_all_recipients_cb): same.
-	(toggle_html_mail_cb): same.
-	(populate_popup_card): change the #if 0 to #if
-	TOO_MANY_MENU_ITEMS.
-	(popup_menu_list): nuke, as it's handled by populate_popup_card.
-	(populate_popup_nocard): rename popup_menu_nocard to this, and
-	implement it as in populate_popup_card.
-	(e_select_names_populate_popup): we don't need the card, since we
-	don't check if it's a list here anymore.  also, remove the #if 0
-	surrounding the nocard case.
-
-2003-04-07  Not Zed  <NotZed@Ximian.com>
- 
- 	Fixes #40252.
- 
- 	* conduit/address-conduit.c:  Change the LOG macro to a
- 	single arg macro which copies its arg.  Fix all callers.  Change
- 	WARN and INFO to simply g_warning/g_message.  Init G_LOG_DOMAIN
- 	before including anything.
- 
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): add tools.
-
-2003-04-07  Gilbert Fang <gilbert.fang@sun.com>
-
-	[ fixes bug #23036 ]
-	* tools/evolution-addressbook-export.c,
-	tools/evolution-addressbook-export-list-cards.c,
-	tools/evolution-addressbook-export-list-folders.c: : new and
-	improved export utility.
-
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Clean up
-	server names.
-
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in: 
-	Likewise
-
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
-	Likewise. Also mark the evolution:menu_name for i18n.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
-	Likewise
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_event): set
-	"handle_popup" on the field to be TRUE if it's got focus, FALSE if
-	not.
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct):
-	doh, set the im_context on the field name too so we get the Input
-	Method submenu in the contxt menu.
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct): set
-	the im_context on the field's EText.
-	(e_minicard_label_event): remove a huge swath of #if 0'd code.
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40715 ]
-	* gui/merging/e-card-merging.c (final_id_cb): add this callback,
-	to unref the book/free the closure after calling the user's
-	callback.
-	(final_cb): same.
-	(doit): use final{_id}_cb
-	(cancelit): same.
-	(response): don't free the lookup struct here.
-	(match_query_callback): same.
-	(e_card_merging_book_add_card): ref the book.
-	(e_card_merging_book_commit_card): same.
-
-	* gui/component/e-address-popup.c (card_picker_init): make sure to
-	set the "text" attribute on the cell renderer so the text actually
-	shows up.  also, g_object_connect -> g_signal_connect *sigh*.
-	Lastly, get rid of the scrolled window and just make the window
-	size to show the text.
-	
-	* gui/widgets/e-minicard.c (e_minicard_style_set): only call
-	set_selected if we're realized (we create all the canvas objects
-	that set_selected manipulates in our realize method.)
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/Makefile.am (INCLUDES): add
-	EVOLUTION_IMAGESDIR
-
-2003-04-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c: change all
-	this around so that we populate the existing popup.  This means we
-	get the select names popup stuff on top of the normal EEntry popup
-	foo.
-
-	* gui/component/select-names/e-select-names-popup.h
-	(e_select_names_populate_popup): rename e_select_names_popup to
-	this.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(populate_popup_cb): rename popup_cb here, and
-	e_select_names_popup -> e_select_names_populate_popup.
-	(e_select_names_manager_entry_new): popup -> populate_popup.
-
-2003-04-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-marshal.list: add NONE:OBJECT
-
-	* gui/widgets/e-minicard.c (e_minicard_class_init): add style_set
-	signal.
-	(e_minicard_style_set): just call set_selected with the currently
-	selected flag, so we recolor properly.
-
-	* gui/widgets/e-minicard.h (struct _EMinicardClass): add style_set
-	signal.
-
-2003-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* backend/ebook/evolution-ldif-importer.c (load_file_fn):
-	* backend/ebook/evolution-vcard-importer.c (load_file_fn): added
-	"folder_type" parameter to EvolutionImporterLoadFileFn.
-
-2003-03-31  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-util.c (get_local_book_uri): new function,
-	just return the local uri.
-	(set_default_book_uri_local): use get_local_book_uri.
-	(e_book_default_book_open): only try and reload the default book
-	if it's not already the local book.
-
-2003-03-31  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (card_removed): it emits a list now
-
-2003-03-31  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Remove folder-selector button
-	initialization.
-	(e_select_names_new): Initialize folder-selector button here,
-	using the passed-in EvolutionShellClient rather than depending on
-	a global variable.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): take an
-	EvolutionShellClient and pass it to e_select_names_new().
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_activate_dialog): get a pointer to the shell
-	from bonobo-activation, create a shell_client, and pass it to
-	e_select_names_manager_activate_dialog.
-
-	* backend/ebook/e-book-util.c (e_book_get_default_book_uri):
-	constify return value
-
-2003-03-30  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-vcard.[ch]: braindead, and *extremely* forgiving
-	vcard parser.  not for public consumption yet.
-
-2003-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #39381 (again) ]
-	* gui/component/e-address-popup.c (edit_contact_info_cb): add
-	"GtkWidget *button" first arg, so we don't crash.
-
-2003-03-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40403 ]
-	* backend/ebook/e-card.c (e_card_get_vobject): revert the fix for
-	28945, as was done on the 1.2 branch.  this is because the "fix"
-	actually breaks internal use of contact lists.  We need to make
-	the exporting of contacts DTRT, instead of fixing it here.
-
-2003-03-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fix the contact editor so that the only time the address is
-	parsed is when the user types in the address GtkTextView. ]
-	* gui/contact-editor/e-contact-editor.c (address_mailing_changed):
-	make this use delivery addresses instead of labels.
-	(full_addr_clicked): same.
-	(find_address_mailing): same.
-
-	* backend/ebook/e-card-simple.c
-	(e_card_simple_set_delivery_address): make this operate similar to
-	e_card_simple_set_address: it sets both the delivery address and
-	the label for the address.
-
-2003-03-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #19178 ]
-	* backend/ebook/evolution-ldif-importer.c (ebook_open): use
-	e_book_load_address_book_by_uri on the passed in uri.
-	(load_file_fn): pass the uri.
-
-	* backend/ebook/evolution-vcard-importer.c (ebook_open): use
-	e_book_load_address_book_by_uri on the passed in uri.
-	(load_file_fn): pass the uri.
-
-2003-03-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #34651 ]
-	* gui/component/select-names/e-select-names.c
-	(select_entry_changed): strcmp -> g_utf8_collate.
-	(update_query): encode the string we pass for the query.
-
-2003-03-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #34085 ]
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb): only successfully complete the drag
-	if they dropped a valid vcard (or vcard list).  Call
-	gtk_drag_finish.
-
-2003-03-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): $evolution_uidir
-	-> $evolutionuidir
-
-2003-03-26  Philip Zhao  <philip.zhao@sun.com>
-
-	[ fixes bug #39170 ]
-	* backend/pas/pas-backend.c (pas_backend_create_card): remove
-	'return'.
-	(pas_backend_remove_cards): same.
-	(pas_backend_modify_card): same.
-	(pas_backend_check_connection): same.
-	(pas_backend_get_vcard): same.
-	(pas_backend_get_cursor): same.
-	(pas_backend_get_book_view): same.
-	(pas_backend_get_completion_view): same.
-	(pas_backend_get_changes): same.
-	(pas_backend_authenticate_user): same.
-	(pas_backend_get_supported_fields): same.
-	(pas_backend_get_supported_auth_methods): same.
-
-2003-03-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): append the
-	second line to the address if necessary
-	(ecard_from_remote_record): split the address line in two if
-	necessary
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: set the
-	dialog to "Visible: No" so it doesn't flash when we bring it up.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40026 ]
-	* gui/contact-editor/e-contact-editor.c (set_field): add
-	EContactEditor arg, and block/unblock signals around the
-	gtk_entry_set_text, since that generates a "changed" signal which
-	causes problems.
-	(set_phone_field): take and pass along an EContactEditor arg.
-	(set_fields): pass editor to set_field.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/arrow.png: nuke.
-	
-	* gui/contact-editor/Makefile.am (EXTRA_DIST): remove images_DATA
-	(images_DATA): nuke, don't need it anymore.
-	
-	* gui/contact-editor/e-contact-editor.c
-	(connect_arrow_button_signal): rename _replace_button to this.  we
-	no longer create an image, as it's a GtkArrow in the .glade file
-	now.
-	(connect_arrow_button_signals): rename _replace_buttons to this.
-	no longer pass the arrow.png's to _replace_button.
-	(e_contact_editor_init): _replace_buttons ->
-	connect_arrow_button_signals.
-	(_arrow_pressed): remove some dead code, and some args that aren't
-	used.
-	(_phone_arrow_pressed): track change to _arrow_pressed.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #31786 ]
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fix some gtk warnings.
-	(set_advanced_button_state): the advanced dialog isn't present in
-	the glade file anymore, so ifdef everything dealing with it.
-	(addressbook_edit_server_dialog): same.
-
-	* gui/component/ldap-config.glade: remove all the unused Advanced
-	UI stuff to lessen the amount of strings needing translation.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #32113 ]
-	* backend/ebook/e-destination.h: add include_email arg to
-	e_destination_get_textrep.
-
-	* backend/ebook/e-destination.c (e_destination_get_textrep): add
-	include_email arg.  if it's TRUE, and if there's an email address to
-	add
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_value_at): use e_destination_get_textrep so we don't
-	display QP text, and pass TRUE for include_email.
-
-	* gui/widgets/e-minicard.c (add_field): same.
-	(remodel): same.
-
-	* gui/widgets/e-addressbook-treeview-adapter.c (adapter_get_value): same.
-
-	* gui/widgets/e-addressbook-table-adapter.c (addressbook_value_at): same.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): pass FALSE for
-	include_email.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_get_textification): pass FALSE for
-	include_email.
-	(e_select_names_model_get_string): same.
-	(e_select_names_model_replace): same.
-	(e_select_names_model_name_pos): same.
-	(e_select_names_model_text_pos): same.
-
-2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
-	Replace "evolution:menu-name" prop with "evolution:menu_name".  [#39692]
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in: Likewise.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(e_select_names_table_model_col_count): up the column count by one
-	for the underline.
-	(e_select_names_table_model_value_at): add handling for underline.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/e-address-popup.c (email_menu_add_option): fix use
-	of deprecated gtk_menu_append.
-	(card_picker_selection_changed): change this to be used with the
-	"changed" signal on GtkTreeSelection.
-	(free_str): yeah, gross.  i know.
-	(card_picker_init): this needed some fixing, so the strings don't
-	go away after we insert them into the model.  also, connect to the
-	"changed" GtkTreeSelection signal instead of using the nonexistant
-	gtk_tree_selection_set_func.
-	(e_address_popup_construct): gtk_style_unref -> g_object_unref.
-	(popup_size_allocate_cb): nuke.
-	(e_address_popup_ambiguous_email_add): use gtk_window_set_position
-	and let the window manager place the window instead of doing it
-	ourself.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes addressbook bug #39730 ]
-	* gui/component/ldap-config.glade: add response ids to the search
-	base dialog.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_destroy): use g_object_unref, not
-	gtk_widget_destroy, on the GladeXML.
-	(addressbook_add_server_druid): call gtk_window_set_type_hint
-	GDK_WINDOW_TYPE_HINT_DIALOG so this window looks like a dialog.
-	(editor_modify_cb): no more apply button.
-	(edit_dialog_apply_clicked): nuked.
-	(edit_dialog_close_clicked): rename to _cancal_clicked.
-	(edit_dialog_ok_clicked): call gtk_widget_destroy here instead of
-	calling _cancel_clicked.
-	(addressbook_edit_server_dialog): no more apply button, and
-	close_button -> cancel_button.  Also, set the hint to
-	GDK_WINDOW_TYPE_HINT_DIALOG.
-	(ldap_dialog_new): fix compiler warning.
-	(addressbook_dialog_create_sources_table): same.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-section.etspec: use
-	alternating-row-colors="false"
-
-	* gui/component/select-names/e-select-names.h: nuke prototypes for
-	e_select_names_get_source/section.
-
-	* gui/component/select-names/e-select-names.c (set_book): remove
-	the signal disconnect from here.
-	(addressbook_model_set_uri): same.
-	(e_select_names_init): connect to the search_result signal on the
-	addressbook model.
-	(e_select_names_child_free): disconnect the changed_id signal.
-	(e_select_names_add_section): set the underline column so the
-	recipient tables look like they did when they were EEntry.
-	(e_select_names_add_section): store off the changed_id.
-	(e_select_names_get_section): nuke.
-	(e_select_names_get_source): nuke.
-
-2003-03-18  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (addrconduit_load_configuration): kill
-	warning by sinking objects
-
-2003-03-18  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/select-names/e-select-names.c (set_book,
-	addressbook_model_set_uri): disconnect/keep track of search result
-	signal id.
-	(e_select_names_init): Keep track of various signals, particularly
-	status signal.
-	(e_select_names_dispose): disconnect from any signals that are
-	still active.  Fixes crash for #38202.
-
-2003-03-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(set_entry_changed_signals): use set_entry_changed_signal_email
-	for the email entry so the email gets saved out.
-	(set_entry_changed_signal_email): new function, analogous to
-	set_entry_changed_signal_phone, but for email.
-
-2003-03-12  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #20210 ]
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): change "Edit Contact Info" to "View Contact
-	Info", as you can't always edit the contact (if the book is read
-	only).
-	(popup_menu_list): same, but for a contact list.
-
-2003-03-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #39507 ]
-	* gui/component/select-names/e-select-names.c (search_result): new
-	function, sync the models after we do a search.
-	(addressbook_model_set_uri): connect to search_result.
-
-2003-03-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): fix compiler warnings about deprecated
-	functions.
-	(e_select_names_child_free): unref the table model.
-	(remove_address): re-enable.
-	(section_right_click_cb): this is an ETable callback now.
-	(e_select_names_add_section): remove a gross gross awful hack, and
-	make the recipient tables ETables instead EEntry's.  We lose the
-	nice underlining, but we can add that back in as another ETable
-	style (like strikeout and bold), and we also fix the longstanding
-	scrolling problems (like bug #25148) and can finally remove
-	addresses by double clicking on them (which is also a bug
-	someplace I think.. dunno the # offhand.)
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(clear_info): always set the count to -1, regardless of what
-	model->data is.
-
-	* gui/component/select-names/e-select-names-model.c: remove some
-	unused enums.
-
-	* gui/component/select-names/Makefile.am (etspec_DATA): add
-	e-select-names-section.etspec
-
-	* gui/component/select-names/e-select-names-section.etspec: new
-	file, spec for the To:/Cc:/Bcc: etable's in the select-names
-	dialog.
-
-2003-03-11  Not Zed  <NotZed@Ximian.com>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Updated phone
-	number.  Bug #37204.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_send_card_list):
-	re-enable in build, include e-destination.h.  For #39256.
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/load-pine-addressbook.c (ebook_create): Likewise.
-	* backend/ebook/load-gnomecard-addressbook.c (ebook_create): Likewise.
-	* backend/ebook/evolution-vcard-importer.c (ebook_create): Likewise.
-	* backend/ebook/evolution-ldif-importer.c (ebook_create): Likewise.
-	* backend/ebook/test-client.c (get_cursor_cb): Likewise.
-	(ebook_create): Likewise.
-	* gui/widgets/e-minicard.c (e_minicard_set_property): Likewise.
-	(card_modified_cb): Likewise.
-	(e_minicard_event): Likewise.
-	* gui/widgets/gal-view-minicard.c (column_width_changed): Likewise.
-	* gui/widgets/test-minicard-view.c (ebook_create): Likewise.
-	* gui/widgets/gal-view-treeview.c (column_width_changed): Likewise.
-
-2003-03-05  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-component.c (bonobo_main_quit_cb):
-	removed.
-	(owner_unset_cb): Basically a noop, the shell does the quit, we
-	just note we have no owner anymore.
-
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #37881
- 	
- 	* gui/component/select-names/e-simple-card-bonobo.c
- 	(impl_SimpleCard_get): if we get a null value, send back the empty
- 	string
- 
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/component/select-names/e-select-names.etspec: reflect prior column addition
- 
- 	* gui/component/select-names/e-select-names-bonobo.c
- 	(entry_get_property_fn): set the arg properly
- 
- 	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
- 	add Icscalendar to field list
- 
- 	* backend/pas/pas-backend-ldap.c: add icscalendar to prop list
- 
- 	* backend/ebook/e-card.h: add icscalendar data member
- 
- 	* backend/ebook/e-card.c: add icscalendar to list and its parse
- 	routine
- 	(e_card_get_vobject): add icscalendar prop value
- 	(parse_icscalendar): parse routine
- 	(e_card_class_init): add icscalendar arg
- 	(e_card_destroy): destroy icscalendar member
- 	(e_card_set_arg): set icscalendar
- 	(e_card_init): init icscalendar
- 	(e_card_get_arg): return icscalendar
- 
- 	* backend/ebook/e-card-simple.c (field_data): add icscalendar
- 
- 	* backend/ebook/e-card-simple.h: ditto
-	
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_new): Don't set the "modal" property through
-	g_object_new().
-	(e_select_names_init): Explictly make the dialog modal here.
-
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (create_minicard_view): No need
-	to do any reparenting here; the widget is created with no parent.
-
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Instead of using gtk_widget_unparent(),
-	remove the widget from the container using gtk_container_remove().
-	This fixes a bunch of crashers in all the places using the
-	ESelectNames widget/control.
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* gui/contact-editor/Makefile.am: Build libecontacteditor as an
-	uninstalled shared library.
-
-	* gui/contact-list-editor/Makefile.am: Likewise for
-	libecontactlisteditor
-
-	* gui/merging/Makefile.am: and libecardmerging
-
-	* gui/search/Makefile.am: and libeaddressbooksearch
-
-	* gui/widgets/Makefile.am: and libeminicard
-
-	* printing/Makefile.am: and libecontactprint
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	Update for new library names (and get rid of libtool portability
-	warnings).
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send, e_card_send): Remove
-	these from here; talking to the mailer doesn't really belong at
-	the libebook level anyway.
-
-	* backend/ebook/Makefile.am: Remove Evolution-Composer CORBA
-	stuff, which fixes some linking problems on OS X.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_send_card_list,
-	e_addressbook_send_card): Move from e-card.c and rename.
-
-	* gui/widgets/Makefile.am: move Evolution-Composer CORBA stuff
-	here
-
-	* gui/widgets/e-addressbook-view.c (send_as, send_to,
-	e_addressbook_view_send, e_addressbook_view_send_to): Update for
-	new function names.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (file_send_as_cb,
-	file_send_to_cb): Likewise
-
-	* gui/contact-editor/e-contact-editor.c (file_send_as_cb,
-	file_send_to_cb): Likewise
-
-2003-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): use g_signal_connect
-	here, not swapped... although since we pass the widget as the
-	closure it really doesn't matter.
-	(load_uri_auth_cb): use a GtkDialog here.
-	(search_result): same.
-
-	* gui/component/select-names/e-simple-card-bonobo.h: add prototype
-	for e_simple_card_bonobo_construct to fix warning.
-
-	* gui/widgets/e-addressbook-view.c (create_alphabet): remove call
-	to gtk_widget_set_usize.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_init): gtk_window_set_policy =>
-	gtk_window_set_resizable.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_init): same.
-
-2003-02-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: link to libversit libtool object
-
-2003-02-27  Rodney Dawes  <dobey@ximian.com>
-
-	* backend/ebook/Makefile.am: Fix for server files from Antonio Xu
-
-2003-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_load_uri): if we fail to activate
-	factories for a given protocol, return.
-
-	* gui/component/ldap-config.glade: remove the two unused custom
-	widgets to cut down on gtk warning spam.
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am (libebook_la_LIBADD): depend on
-	libversit.la, libcamel.la, libename.la, and libeutil.la.
-	(test_client_LDADD, test_client_list_LDADD, test_card_LDADD,
-	evolution_vcard_importer_LDADD, evolution_ldif_importer_LDADD,
-	load_pine_addressbook_LDADD, load_gnomecard_addressbook_LDADD):
-	Remove those dependencies from here, since they're pulled in by
-	libebook.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	Remove libebook's dependencies
-
-	* gui/component/select-names/Makefile.am
-	(libeselectnames_la_LIBADD): add this
-
-	* gui/widgets/Makefile.am (various disabled *_test_LDADD): cleanup
-
-	* printing/Makefile.am (contact_print_test_LDADD,
-	contact_print_style_editor_test_LDADD): cleanup
-
-2003-02-20  Dan Winship  <danw@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	s/libemiscwidgets.a/libemiscwidgets.la/
-
-	* gui/widgets/Makefile.am: Likewise (in a bunch of commented-out
-	test programs)
-
-2003-02-19  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c: Make parent_class static.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: Likewise
-
-	* gui/widgets/e-addressbook-table-adapter.c: Likewise
-
-2003-02-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fix #38074 ]
-	* gui/component/e-address-popup.c (add_contacts_cb): first arg is
-	a GtkWidget.  duh.
-
-2003-02-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/contact-editor/Makefile.am (INCLUDES): Use $(evolutionuidir)
-	instead of $(evolution_uidir).  [Pointed out by Grzegorz Goawski.]
-
-2003-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): if we can complete solely
-	from our cached cards, call e_completion_end_search from here when
-	we're done.
-
-2003-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(ensure_completion_uris_exist): plug memory leak (always free
-	val).
-
-2003-02-16  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_search_timeout): move the bulk of the
-	non-summary searching stuff here.  we aggregate up to our
-	threshold, then send them to the front end and register a timeout
-	to do another batch.  This keeps us from totally spamming the UI,
-	making things a bit more responsive.
-	(pas_backend_file_search): set up the closure and call the timeout
-	in an idle func.
-
-2003-02-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_new): indent properly.
-
-2003-02-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (unlink_model):
-	disconnect search_started and search_result.
-	(addressbook_compare): if we're loading, just compare model
-	positions (so we just append while loading).
-	(remove_card): use e_reflow_model_item_removed.
-	(search_started): new function, set loading = TRUE.
-	(search_result): new function, set loading = FALSE and emit
-	"comparison_changed".
-	(e_addressbook_reflow_adapter_init): init loading and the new
-	signal ids.
-	(e_addressbook_reflow_adapter_construct): connect "search_started"
-	and "search_result".
-
-	* gui/widgets/e-addressbook-model.h (struct
-	_EAddressbookModelClass): add search_started signal.
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_class_init): new signal "search_started".
-	(book_view_loaded): emit "search_started" after "model_changed".
-	(remove_card): simplify this, and use CARD_REMOVED all the time,
-	instead of just in the single card case.
-
-2003-02-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_search_timeout): split out the bulk of the
-	non-summary searching logic to here.  we do 1 "card_threshold"
-	sized lump per timeout.
-	(pas_backend_file_search): use pas_backend_file_search_timeout.
-
-2003-02-10  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #33066 ]
-	* gui/contact-editor/e-contact-editor.c
-	(set_urlentry_changed_signal_field): new function
-	(set_entry_changed_signals): call
-	set_urlentry_changed_signal_field for entry-web, entry-caluri, and
-	entry-fburl.
-	(fill_in_field): add handling for EUrlEntry's.
-	(extract_field): same.
-	(enable_widget): same.
-	(e_contact_editor_create_date): show the widget.
-	(e_contact_editor_create_web): same, create a url entry.
-	(set_urlentry_changed_signal_field): new function
-
-	* gui/contact-editor/contact-editor.glade: entry-web,
-	entry-caluri, and entry-fburl are all custom widgets now.
-
-2003-02-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am: Install load-pine-addressbook and
-	load-gnomecard-addressbook into ${privdatadir}/tools.  Install
-	evolution-vcard-importer and evolution-ldif-importer into
-	${privlibexecdir}.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in:
-	Removed.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in:
-	Removed.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
-	New.  Specify an absolute path for the executable, using
-	@LIBEXECDIR@.
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
-	Likewise.
-
-2003-02-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(sexp_initials): gone.
-	(match_initials): gone.
-	(book_query_sexp): remove the primary handling.
-	(book_query_score): same.
-
-	* backend/ebook/e-card.c (e_card_set_property):
-	g_value_get_pointer => g_value_get_object for "category_list".
-
-	* backend/ebook/e-book.c (struct _EBookPrivate): add a comment.
-
-	* backend/pas/pas-backend-ldap.c (func_beginswith): performance at
-	the cost of a tiny bit of correctness.  If the ldap server doesn't
-	support evolutionPerson don't query on fileAs, use sn (since
-	that's effectively what gets used in the display when fileAs isn't
-	supported.)
-
-2003-02-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c: lots of
-	changes here.  should be a big performance gain.  god i hope this
-	is finally right.
-
-2003-02-08  Chris Toshok  <toshok@ximian.com>
-
-	[ huge change, all for 1 little performance problem :) fixes #18207 ]
-	* gui/widgets/e-addressbook-model.c (get_view): use
-	e_book_check_static_capability here to make things a little
-	prettier.
-	(remove_card): complain about my life, and add code to use one
-	"model_changed" signal if we get back a list of cards instead of
-	multiple "card_removed" signals.
-
-	* gui/widgets/e-addressbook-model.h: little clean up.
-
-	* gui/widgets/e-addressbook-view.c (delete): write a bulk-remove
-	case for this.  if the backend supports it, send all the ids at
-	once.  otherwise loop over the ids.
-	(e_addressbook_view_delete_selection): fake a CardAndBook
-	structure and call delete, instead of duplicating the code in 2
-	places.
-
-	* gui/component/addressbook.c (delete_contact_cb): don't call
-	e_contact_editor_confirm_delete here, it's handled by the
-	EAddressbookView.
-
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_construct): fix a
-	compiler warning about a stupid crash.
-
-	* backend/pas/pas-book.h (PASOperation): RemoveCard ->
-	RemoveCards.
-	(PASRemoveCardsReques): char *id -> GList *ids.
-	(PASRequest): PASRemoveCardRequest -> PASRemoveCardsRequest.
-
-	* backend/pas/pas-book.c (pas_book_queue_remove_cards): build up a
-	GList from the id sequence.
-	(pas_book_respond_remove): notifyCardRemoved ->
-	notifyCardsRemoved.
-	(impl_GNOME_Evolution_Addressbook_Book_removeCards): rename.
-	(pas_book_free_request): free the idlist for RemoveCards.
-	(pas_book_class_init): removeCard -> removeCards.
-
-	* backend/pas/pas-book-view.h: change prototype for
-	pas_book_view_notify_remove, and add prototype for
-	pas_book_view_notify_remove_1.
-
-	* backend/pas/pas-book-view.c (pas_book_view_notify_remove_1):
-	build up a list and call pas_book_view_notify_remove.
-	(pas_book_view_notify_remove): build up the corba id sequence and
-	call BookViewListener::notifyCardsRemoved.
-
-	* backend/pas/pas-backend.h: remove_card -> remove_cards.
-
-	* backend/pas/pas-backend.c (pas_backend_remove_cards): rename
-	from _remove_card.
-	(process_client_requests): RemoveCard -> RemoveCards and
-	_remove_card -> _remove_cards.
-
-	* backend/pas/pas-backend-ldap.c (check_schema_support):
-	g_strcasecmp -> g_ascii_strcasecmp.
-	(remove_card_handler): _remove => _remove_1.
-	(modify_card_modify_handler): same.
-	(pas_backend_ldap_process_remove_cards): rename from _remove_card.
-	(pas_backend_ldap_class_init): _remove_card -> _remove_cards.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_class_init):
-	remove_card -> remove_cards.
-	(pas_backend_file_get_static_capabilities): add "bulk-removes".
-	(pas_backend_file_process_remove_cards): rewrite this function
-	largely, so that it handles lists of ids.  first we loop through
-	and for every successful deletion we build a list of deleted
-	ECards.  Then for each view we build a list (a subset of the
-	deleted ECard list) and pass back that list to the view.
-	(pas_backend_file_process_modify_card): use _remove_1 instead of
-	_remove.
-	(ecard_matches_search): new function.
-
-	* backend/pas/pas-backend-card-sexp.c
-	(pas_backend_card_sexp_match_vcard): rewrite in terms of
-	_match_ecard.
-	(pas_backend_card_sexp_match_ecard): new function, the guts from
-	_match_vcard.
-
-	* backend/pas/pas-backend-card-sexp.h: add prototype for
-	pas_backend_card_sexp_match_ecard.
-
-	* backend/idl/addressbook.idl: the card removal stuff now takes
-	CardIdList.
-
-	* backend/ebook/e-book.c (e_book_get_static_capabilities): cache
-	successful capability queries (since they're static).
-	(e_book_check_static_capability): new, convenience function to
-	check if a particular capability is supported.
-	(e_book_remove_card_by_id): build a single element GList and call
-	e_book_remove_cards.
-	(e_book_remove_cards): build up a CORBA sequence from the GList
-	and call Book::removeCards.
-	(e_book_dispose): free the cached capabilities string.
-
-	* backend/ebook/e-book.h: add new prototypes for
-	e_book_check_static_capability and e_book_remove_cards.
-
-	* backend/ebook/e-book-view.h (struct _EBookViewClass): rename
-	"card_removed" signal to "cards_removed".
-
-	* backend/ebook/e-book-view.c (e_book_view_do_removed_event): id
-	-> ids, and free the id list.
-	(e_book_view_check_listener_queue): CardRemovedEvent ->
-	CardsRemovedEvent.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): free the id list.
-	(e_book_view_listener_queue_idlist_event): new function, used for
-	cards_removed.
-	(e_book_view_listener_queue_status_event): id -> ids.
-	(e_book_view_listener_queue_sequence_event): same.
-	(e_book_view_listener_queue_message_event): same.
-	(impl_BookViewListener_notify_cards_removed): call
-	queue_idlist_event.
-	(e_book_view_listener_dispose): free the id list.
-	(e_book_view_listener_class_init): track change to idl call.
-
-	* backend/ebook/e-book-view-listener.h
-	(EBookViewListenerOperation): CardRemovedEvent ->
-	CardsRemovedEvent.
-	(EBookViewListenerResponse): char *id -> GList *ids.
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_remove_cards): rename from remove_card.
-
-2003-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/e-address-popup.c (email_table_save_card_cb):
-	check the status, not the book, and unref the book here.
-	(contact_editor_cb): same.
-	(start_query): unref the book in the failure case.
-	(add_card_idle_cb): addressbook_load_default_book returns void
-	now.
-	(edit_contact_info_cb): same.
-	(e_address_popup_query): same.
-
-	* gui/component/addressbook.c (control_activate_cb): track change
-	to addressbook_load_uri return type.
-	(set_prop): same.
-	(addressbook_load_uri): return type is void now.
-	(addressbook_load_default_book): same.
-
-	* gui/component/addressbook.h:
-	addressbook_load_uri/addressbook_load_default_book return void
-	now.
-
-	* conduit/address-conduit.c (start_addressbook_server):
-	e_book_load_default_book returns void now.
-
-	* backend/ebook/e-book-util.h: track changes to return types.
-	
-	* backend/ebook/e-book-util.c (e_book_load_address_book_by_uri):
-	fallout from change to e_book_load_uri.  return type for this
-	function is void now too.
-	(e_book_use_address_book_by_uri): same.
-	(e_book_use_default_book): same.
-	(e_book_load_default_book): same.
-	(got_uri_book_cb): if unsuccessful and book is non-NULL, unref it
-	here.
-	(got_default_book_cb): same.
-
-	* backend/ebook/e-book.c (e_book_load_uri): no longer return a
-	gboolean.  any error is communicated to the callback.
-	
-	* backend/ebook/e-book.h: e_book_load_uri no longer returns a
-	gboolean (it's void.)
-
-	* backend/ebook/evolution-ldif-importer.c (ebook_create): track
-	change to the e_book_load_uri family of functions.
-	
-	* backend/ebook/test-client-list.c (ebook_create): same.
-
-	* backend/ebook/test-client.c (ebook_create): same.
-
-	* backend/ebook/load-pine-addressbook.c (ebook_create): same.
-
-	* backend/ebook/evolution-vcard-importer.c (ebook_create): same.
-
-2003-02-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am (e-book-marshal.c, e-book-marshal.h):
-	Use different tmp file names so these rules can be executed in
-	parallel without interfering with each otehr.
-
-	* backend/pas/Makefile.am: Make the ORBit compilation work
-	properly with parallel makes (i.e. make sure it does not spawn
-	multiple orbit-idl processes on the same IDL file at the same
-	time).
-	* gui/component/select-names/Makefile.am: Likewise.
-	* backend/ebook/Makefile.am: Likewise.
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-config.c (main):
-	s/PACKAGE/GETTEXT_PACKAGE/ in gettext setup.
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am (INCLUDES): Remove cruft.
-	(libebookincludedir): Use privincludedir.
-
-	* backend/ebook/e-book-util.c: #include <string.h>
-	* backend/ebook/e-card-compare.c: Likewise
-	* backend/ebook/load-pine-addressbook.c: Likewise
-	* backend/ebook/test-client.c: Likewise
-
-	* backend/ebook/evolution-vcard-importer.c: #include
-	<e-book-util.h>
-	(factory_fn): Fix this to actually return the importer.
-
-	* backend/ebook/evolution-ldif-importer.c (parseLine): #include
-	<e-book-util.h> and <bonobo/bonobo-main.h>. Use g_ascii_strcmp.
-	
-	* backend/ebook/e-card.c (e_card_email_match_single_string): 
-	(e_card_email_find_number): s/g_str/g_ascii_str/
-	* backend/ebook/e-destination.c (e_destination_equal): Likewise.
-	Also, add an "else return FALSE;"
-
-
-	* backend/pas/Makefile.am (INCLUDES): Remove cruft
-	(ldapschemadir): Use privdatadir
-	(pasincludedir): Use privincludedir.
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_activate):
-	Remove unused variable.
-	* backend/pas/pas-book-view.c (pas_book_view_new): Likewise
-
-
-	* printing/Makefile.am (ecpsdir): Define in terms of privdatadir.
-	(gladedir): Defined in configure.in now.
-
-	* printing/e-contact-print.c: #include <string.h>
-
-	* printing/test-print.c: #include <bonobo/bonobo-main.h>
-	* printing/test-contact-print-style-editor.c: Likewise
-
-
-	* gui/contact-editor/Makefile.am (INCLUDES): Remove some cruft.
-	rename ICONSDIR to IMAGESDIR.
-	(images_DATA): Install arrow.png in imagesdir instead of
-	privdatadir.
-
-	* gui/contact-editor/e-contact-quick-add.c: #include <string.h>
-
-	* gui/contact-editor/e-contact-editor.c: #include <string.h>
-	(e_contact_editor_init): s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR/
-	(e_contact_editor_new): s/gtk_object_ref/g_object_ref/
-	(_replace_button): Look in imagesdir, not privdatadir
-	(_phone_arrow_pressed): Remove call to deprecated
-	gtk_check_menu_item_set_show_toggle.
-	(_email_arrow_pressed): Likewise
-	(_address_arrow_pressed): Likewise
-	(set_address_field): Remove unused variable
-	(enable_widget):
-	s/gtk_entry_set_editable/gtk_editable_set_editable/
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_init):
-	s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR
-	(e_contact_editor_address_set_property):
-	s/gtk_entry_set_editable/gtk_editable_set_editable/
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_init):
-	s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR
-	(e_contact_editor_fullname_set_property): Likewise.
-
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): Remove cruft,
-	s/ICONSDIR/IMAGESDIR/
-	(gladedir, etspecdir): Remove definitions.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: #include
-	<string.h>
-	(e_contact_list_editor_init): s/ICONSDIR/IMAGESDIR/
-	(e_contact_list_editor_new): s/gtk_object_ref/g_object_ref/
-
-	* gui/contact-list-editor/e-contact-list-model.c: #include <string.h>
-
-
-	* gui/merging/Makefile.am (INCLUDES): Remove cruft.
-	* gui/search/Makefile.am (ruledir): Define in terms of privdatadir
-
-
-	* gui/widgets/Makefile.am (INCLUDES): Remove cruft.
-	(gladedir, etspecdir): Remove definitions.
-	(glade_DATA): Empty, so remove it.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: #include <string.h>
-	(addressbook_get_property): Remove unused variable
-
-	* gui/widgets/e-addressbook-view.c: #include <string.h>
-	(get_selection_model): Add a g_return_val_if_reached.
-
-	* gui/widgets/e-minicard.c: #include string.h, gtkmain.h,
-	gnome-canvas-pixbuf.h
-	(field_changed): s/gtk_object_unref/g_object_unref/
-	(get_left_width): Remove unused variable
-
-	* gui/widgets/e-minicard-control.c: #include <string.h>
-	(pstream_load, pstream_save): Use g_ascii_strcasecmp
-
-	* gui/widgets/e-minicard-view.c: #include <string.h>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_new): s/gtk_type_new/g_object_new/
-
-
-	* gui/component/select-names/Makefile.am (INCLUDES): Remove cruft.
-	(serverdir, gladedir, etspecdir): Remove definitions
-
-	* gui/component/select-names/e-select-names.c: #include <string.h>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(init_html_mail): Remove deprecated
-	gtk_check_menu_item_set_show_toggle call.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_free):
-	s/gtk_timeout_remove/g_source_remove/
-
-
-	* gui/component/Makefile.am (INCLUDES): Remove cruft, rename
-	ICONSDIR to IMAGESDIR.
-	(serverdir, gladedir): Remove defintions.
-
-	* gui/component/addressbook-component.c (IS_CONTACT_TYPE): use
-	g_ascii_strcasecmp
-	(add_creatable_item): s/ICONSDIR/IMAGESDIR/
-
-	* gui/component/component-factory.c: #include <string.h>
-
-	* gui/component/e-address-widget.c: Likewise.
-	(e_address_widget_destroy): s/gtk_idle_remove/g_source_remove/
-	(e_address_widget_schedule_query): s/gtk_idle_add/g_idle_add/
-
-
-	* conduit/Makefile.am (INCLUDES): Remove cruft
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-config.c (main): Replace deprecated
-	glade_gnome_init() with glade_init().
-
-	* gui/contact-editor/test-editor.c (main): Likewise.
-
-	* printing/test-contact-print-style-editor.c (main): Likewise.
-
-	* printing/test-print.c (main): Likewise.
-
-2003-02-03  Chris Toshok  <toshok@ximian.com>
-
-	[ pull forward Jack Jia's fix for #34900 ]
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as): use
-	a weak ref for the file selector.
-	(e_contact_list_save_as): same.
-	(destroy_it): rewrite this as a weak ref notify function.
-	(close_it): remove frees of the info (it's freed in the weak ref
-	function).
-	(save_it): same.
-
-2003-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): pull
-	forward Jack Jia's fix for #33672, but convert it to use unlink
-	instead of the gnome-vfs stuff.
-
-2003-01-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: add a scrolled window
-	(SHADOW_IN) around the address textview.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: rename the category
-	entry to entry-categories.
-
-	* gui/contact-editor/e-contact-editor.c
-	(set_entry_changed_signals): use the specialized "changed" signal
-	handlers for entry-company and entry-fullname.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am: i need to sleep more.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (componentdir): need to assign this
-	here or else the lib doesn't get built.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_start_new_page): begin the
-	new page after showing the last one.
-	(complete_sequence): beginpage before we start printing.
-	(e_contact_print_response): GtkDialog-ify this.
-	(e_contact_print_dialog_new): "clicked" -> "response".
-	(e_contact_print_card_dialog_new): same.
-	(e_contact_print_card_list_dialog_new): same.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (CONDUIT_SUBDIR): enable this, as building the
-	conduit works if you have gnome-pilot2.
-
-2003-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* conduit/address-conduit.c: GObjectify the stuff in here that
-	refers to addressbook objects.  the gnome-pilot stuff is still
-	GtkObject for the moment.
-
-2003-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am (iconsdir): Remove definition; this is
-	now in configure.in.
-	* gui/contact-editor/Makefile.am (iconsdir): Likewise.
-	* gui/contact-list-editor/Makefile.am (iconsdir): Likewise.
-
-2003-01-23  Sean Gao  <Sean.Gao@Sun.COM>
-
-	[ fixes bug #34898 ]
-	* gui/widgets/e-minicard.c (field_changed): handle modifications
-	to email addresses in contact lists.
-
-2003-01-23  Sean Gao  <Sean.Gao@Sun.COM>
-
-	[ fixes bug #36375 ]
-	* backend/pas/pas-backend-ldap.c: use PHONE_OTHER_FAX instead of
-	PHONE_OTHER for "other_fax".
-	
-2003-01-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #31014, roll this in from the 1.2 branch ]
-	* backend/pas/pas-backend-ldap.c: use "categories" instead of
-	"category" for the ECard field so the UI/get_supported_fields stuff
-	actually thinks its usable in the contact editor..
-
-2003-01-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): fix
-	for bug 34883 broke ssl transactions (at least those where we were
-	connecting to port 636).  Move it to after the SSL stanza.
-
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/Makefile.am (componentdir): Remove
-	definition; no need to set it here since it's now defined in
-	configure.in
-	* gui/component/Makefile.am (componentdir): Likewise.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/Makefile.am (gladedir): Version using
-	$(BASE_VERSION).
-	(etspecdir): Likewise.
-	(iconsdir): Likewise.
-
-	* gui/contact-list-editor/Makefile.am (iconsdir): Version using
-	$(BASE_VERSION).
-	(gladedir): Likewise.
-
-	* gui/merging/Makefile.am (gladedir): Version using $(BASE_VERSION).
-
-	* gui/search/Makefile.am (ruledir): Version using $(BASE_VERSION).
-
-	* gui/component/Makefile.am (INCLUDES): Update EVOLUTION_IMAGESDIR
-	to be versioned through $(BASE_VERSION).
-
-	* gui/widgets/e-addressbook-view.c (init_collection): Use
-	EVOLUTION_GALVIEWSDIR.
-
-	* gui/widgets/Makefile.am (INCLUDES): Define EVOLUTION_GALVIEWSDIR
-	and update EVOLUTION_IMAGESDIR.
-
-2003-01-21  Radek Doulik  <rodo@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_print_button): don't use
-	gnome_print_multipage_new_from_sizes and add warning
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c
-	(e_addressbook_prompt_save_dialog): Change dialog from
-	Yes/No/Cancel to Discard/Cancel/Save to match the HIG.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Change dialog from OK/Cancel
-	to Cancel/OK to match the HIG.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists): Change
-	dialog from Overwrite/Cancel to Cancel/Overwrite to match the HIG.
-
-	* gui/contact-editor/e-contact-quick-add.c
-	(build_quick_add_dialog): Fix typo s/reponse/response/.  Also
-	change the dialog to be Edit/Cancel/OK instead of OK/Edit/Cancel
-	to match the HIG.
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_confirm_delete): Make alert cancel/delete
-	instead of delete/cancel to match the HIG.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_init): Make dialog Cancel/OK instead of
-	OK/Cancel to match the HIG.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_init): Make dialog Cancel/OK instead of
-	OK/Cancel to match the HIG.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Make dialog Cancel/OK instead of OK/Cancel
-	to match the HIG.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am (EXTRA_DIST): Add $(schema_DATA).
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (control_activate_cb): try to load
-	the uri again if it failed previously.
-	(book_open_cb): set failed_to_load based on the response.
-	(set_prop): initialize failed_to_load to FALSE before we kick off
-	the first load.
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): if the load_uri fails, remove
-	it from the hashtable and free it, so we'll try to load it again
-	from scratch the next time it's requested instead of serving up a
-	backend that doesn't function.
-
-	* backend/pas/pas-backend.c (pas_backend_get_uri): we need to be
-	able to get the uri from backends that aren't loaded (so we can
-	remove them from the hashtable.)
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (query_ldap_root_dse): doh, fix
-	build error.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c: #include
-	gtklabel.h, fixes an unresolved symbol.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (query_ldap_root_dse): build up
-	the list of supported auth_methods.
-	(pas_backend_ldap_process_get_supported_auth_methods): respond
-	with the list of auth methods we've built up.
-	(pas_backend_ldap_dispose): unref the auth_method list.
-	(pas_backend_ldap_class_init): hook up
-	pas_backend_ldap_process_get_supported_auth_methods.
-
-	* backend/pas/pas-backend.c
-	(pas_backend_get_supported_auth_methods): new function.
-	(process_client_requests): add clause for GetSupportedAuthMethods.
-
-	* backend/pas/pas-backend.h: add prototype for
-	pas_backend_get_supported_auth_methods, and add it to the class
-	vtable.
-
-	* backend/pas/pas-book.h: add GetSupportedAuthMethods enum member
-	and PASGetSupportedAuthMethodsRequest. and add prototype for
-	pas_book_respond_get_supported_auth_methods.
-
-	* backend/pas/pas-book.c
-	(pas_book_queue_get_supported_auth_methods): new function.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedAuthMethods):
-	new function.
-	(pas_book_respond_get_supported_auth_methods): new function.
-	(pas_book_free_request): add clause for GetSupportedAuthMethods.
-	(pas_book_class_init): hook up getSupportedAuthMethods.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): fields ->
-	list.
-	(e_book_listener_queue_get_supported_auth_methods_response): new
-	function.
-	(impl_BookListener_response_get_supported_auth_methods): new
-	function.
-	(e_book_listener_class_init): hook up
-	epv->notifySupportedAuthMethods.
-
-	* backend/ebook/e-book-listener.h: add
-	GetSupportedAuthMethodsResponse enum member, and change the field
-	name from "fields" to list (and use it for both GetSupportedFields
-	and GetSupportedAuthMethods)
-
-	* backend/ebook/e-book.c (e_book_get_supported_auth_methods): new
-	function.
-	(e_book_do_response_get_supported_auth_methods): new function.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_get_supported_auth_methods.
-
-	* backend/idl/addressbook.idl: add getSupportedAuthMethods IDL
-	call.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c (backend_last_client_gone_cb):
-	deal with backends that might not have loaded successfully
-	(they'll have a NULL uri).
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(e_select_names_bonobo_new): call e_select_names_bonobo_construct
-	on the newly created object.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am: addressbook-config.etspec is gone.
-
-	* gui/component/addressbook-config.c: make the sources table be a
-	gtktreeview instead of an etable.
-
-	* gui/component/ldap-config.glade: remove all references to
-	gnome-hint.png
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.c (column_width_changed): fix
-	parameter types here (this signal isn't generated from an ETable.)
-
-	* gui/widgets/gal-view-factory-minicard.c: include e-util.h
-
-	* gui/widgets/e-minicard.h: include gnome-canvas.h here.
-
-	* gui/widgets/e-addressbook-table-adapter.c: #include
-	e-destination.h here.
-
-	* gui/widgets/e-minicard.c: same.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.[ch]: remove the select
-	names stuff (the Related Contacts button/entry.)
-
-	* gui/contact-editor/contact-editor.glade: same.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
-	comment out the factory oaf_server, and change the location of the
-	SelectNames controls to be
-	OAFIID:GNOME_Evolution_Addressbook_Factory so the normal
-	addressbook.so will create them.
-
-	* gui/component/select-names/Makefile.am
-	(libeselectnames_la_SOURCES): remove the
-	e-select-names-factory.[ch] stuff for the time being.
-
-	* gui/component/component-factory.c (factory): we're now (for the
-	time being) the factory for the select names control.
-
-2003-01-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: oops, don't include
-	e-treeview-selection-model.h unless we're building the treeview.
-
-2003-01-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): Fix to build.
-
-2003-01-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/apps_evolution_addressbook.schemas: add in the
-	schema entry for minimum_query_length.
-
-2003-01-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.h: add
-	E_ADDRESSBOOK_VIEW_TREEVIEW to the enum, ifdef'ed out.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): add ifdefed treeview code.
-	(init_collection): same.
-	(display_view): same.
-	(get_selection_model): same.
-	(treeview_row_activated): same.
-	(create_treeview_view): same.
-	(change_view_type): same.xo
-	(e_addressbook_view_print): same.
-	(e_addressbook_view_print_preview): same.
-
-	* gui/widgets/Makefile.am: add in the treeview sources (commented
-	out).
-
-2003-01-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.c (gal_view_minicard_edit): add
-	parent arg.
-
-	* gui/widgets/e-addressbook-treeview-adapter.[ch]: new files, for
-	a GtkTreeView view of contacts.
-	
-	* gui/widgets/gal-view-treeview.[ch]: same
-	
-	* gui/widgets/gal-view-favroty-treeview.[ch]: same
-	
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am: $(datadir)/evolution/images instead
-	of $(datadir)/images/evolution.
-	* gui/contact-editor/Makefile.am: Likewise.
-	* gui/contact-list-editor/Makefile.am (iconsdir): Likewise.
-	* gui/widgets/Makefile.am: Likewise.
-
-2002-01-08  Dan Winship  <danw@ximian.com>
-
-	Move PASBook request handling into PASBackend itself since all
-	existing backends do it exactly the same way. (Part of 32866).
-
-	* backend/pas/pas-backend.h (PASBackendClass): add new methods for
-	the various pas book requests.
-
-	* backend/pas/pas-backend.c: Add a clients list to
-	PASBackendPrivate.
-	(pas_backend_create_card, etc): Add these to invoke the new
-	methods.
-	(process_client_requests, book_destroy_cb): Moved here and
-	slightly rewritten from pas-backend-file.
-	(last_client_gone): Now static.
-	(add_client, remove_client): Default implementations, based on
-	pas-backend-file, that add the client to/remove it from the
-	backend's clients list and connect to its requests_queued signal.
-	(pas_backend_init, pas_backend_dispose): Deal with the clients
-	list.
-
-	* backend/pas/pas-backend-file.c (struct _PASBackendFilePrivate):
-	Remove GList *clients.
-	(pas_backend_file_process_client_requests,
-	pas_backend_file_book_destroy_db, pas_backend_file_add_client,
-	pas_backend_file_remove_client): Gone.
-	(pas_backend_file_class_init): Remove add_client/remove_client
-	method initializations, add initializations for processing the
-	various book requests.
-
-	* backend/pas/pas-backend-ldap.c (struct _PASBackendLDAPPrivate):
-	Remove GList *clients.
-	(pas_backend_ldap_process_create_card, etc): Make these take the
-	specific PAS*Request types rather than a generic PASRequest.
-	(pas_backend_ldap_process_client_requests,
-	pas_backend_ldap_book_destroy_db, pas_backend_ldap_add_client,
-	pas_backend_ldap_remove_client): Gone.
-	(pas_backend_ldap_class_init): Remove add_client/remove_client
-	method initializations, add initializations for processing the
-	various book requests.
-
-2003-01-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: fix the SYNTAX for the
-	telephone attributes, and make the fax attributes more closely
-	mirror those from core.schema.  Fixes the schema for openldap-2.1.
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* backend/idl/Makefile.am: remove idldir def (defined by
-	configure.in now)
-
-	* gui/component/select-names/Makefile.am: Likewise
-
-2003-01-01  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes the non-ui portion of #36183 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): use the entry's
-	minimum_query_length instead of a constant here.
-	(e_select_names_completion_set_minimum_query_length): new
-	function, set the entry's minimum_query_length.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_new): set the minimum_query length
-	after setting the completion books.
-	(read_completion_settings_from_db): rename
-	read_completion_books_from_db to this, and read the
-	minimum_query_length too.
-	(db_listener): rename uris_listener to this, and listen for
-	changes on both the uris and minimum_query_length settings.
-
-	* gui/component/select-names/e-select-names-completion.h: add
-	prototype for e_select_names_completion_set_minimum_query_length.
-
-	* gui/component/select-names/e-select-names-manager.h: add
-	minimum_query_length to struct _ESelectNamesManager.
-
-2002-12-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_control_new): Made it return an
-	EvolutionConfigControl instead of a BonoboControl (and removed a
-	bogus EvolutionConfigControl -> BonoboControl cast).
-
-2002-12-17  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #34897 ]
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_value_at): don't free the return of
-	e_card_simple_get_const, as this causes a double free later on.
-
-2002-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/e-address-popup.c: convert the clist in here to a
-	GtkTreeView.  your guess is as good as mine if it works (i can't
-	test it at present) but it compiles.
-
-2002-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letters):
-	g_string_sprintfa -> g_string_append_printf.
-	(create_alphabet): same.
-	(create_minicard_view): remove gtk_widget_{push,pop}_visual.
-
-	* gui/widgets/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED.
-
-2002-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_realize): drop use of
-	"font" arg.
-	(get_left_width): use pango to calculate this instead of a GdkFont.
-
-	* gui/widgets/e-minicard-view.c: drop include of e-unicode.h.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct):
-	don't need to create the font anymore.
-
-	* gui/search/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_new): use g_object_new instead of
-	gtk_type_new.
-
-	* gui/merging/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): add
-	-D*_DISABLE_DEPRECATED.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (is_named):
-	strdup (or not, if we don't need to save the value) instead of
-	using the e_utf8 functions.
-	(fill_in_info): same.
-
-	* gui/contact-editor/Makefile.am (INCLUDES): add
-	-D*_DISABLE_DEPRECATED.
-
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as):
-	strdup (or not, if we don't need to save the value) instead of
-	using the e_utf8 functions.
-	(e_contact_list_save_as): same.
-
-	* gui/contact-editor/e-contact-quick-add.c (clicked_cb): strdup
-	(or not, if we don't need to save the value) instead of using the
-	e_utf8 functions.
-	(build_quick_add_dialog): same.
-
-	* gui/contact-editor/e-contact-editor.c (phone_entry_changed):
-	strdup (or not, if we don't need to save the value) instead of
-	using the e_utf8 functions.
-	(file_as_set_style): same.
-	(name_entry_changed): same.
-	(full_name_clicked): same.
-	(categories_clicked): same.
-	(set_field): same.
-	(fill_in_field): same.
-	(fill_in_single_field): same.
-	(extract_field): same.
-	(extract_single_field): same.
-
-	* gui/contact-editor/e-contact-editor-fullname.c (extract_field):
-	just strdup, it's already utf8.
-
-	* gui/contact-editor/e-contact-editor-address.c (extract_field):
-	they're all entries, use GTK_ENTRY foo here.
-
-	* gui/component/select-names/Makefile.am (INCLUDES): add
-	-D*_DISABLE_DEPRECATED.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): remove the extra
-	utf8_from_locale_string stuff.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(set_uiinfo_label): gtk_container_children ->
-	gtk_container_get_children, and remove the extra utf8 stuff.
-
-	* gui/component/Makefile.am (INCLUDES): add
-	-D*_DISABLE_DEPRECATED.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_init_source_uri): g_string_sprintfa ->
-	g_string_append_printf.
-
-	* gui/component/addressbook-config.c (focus_help):
-	gtk_notebook_set_page -> gtk_notebook_set_current_page.
-	(addressbook_source_dialog_set_source): same.
-	(auth_optionmenu_activated): gtk_container_children ->
-	gtk_container_get_children.
-	(ssl_optionmenu_activated): same.
-	(ssl_optionmenu_selected): same, and gtk_notebook_set_page ->
-	gtk_notebook_set_current_page.
-	(scope_optionmenu_activated): same.
-	(set_advanced_button_state): same.
-	(addressbook_ldap_init): hook "response" to gtk_widget_destroy to
-	make the dialog go away when clicked.
-	(addressbook_ldap_auth): same.
-	(addressbook_root_dse_query): same.
-	(do_ldap_root_dse_query): same.
-	(addressbook_config_control_new): fix return type and cast.
-	(main): remove call to gtk_widget_push_visual.
-
-	* gui/component/addressbook-config.h:
-	addressbook_config_control_new returns a BonoboObject, not a
-	BonoboControl.
-
-	* gui/component/addressbook.c: remove e-unicode.h include.
-
-	* backend/pas/Makefile.am (INCLUDES): Add
-	-DLIBGNOME_DISABLE_DEPRECATED.
-
-	* backend/ebook/Makefile.am (INCLUDES): Add
-	-DLIBGNOME_DISABLE_DEPRECATED.
-
-	* backend/ebook/e-card.c (e_card_get_property): remove misleading
-	comment.
-
-2002-12-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (build_card_from_entry):
-	g_strcasecmp -> g_ascii_strcasecmp.
-	(FIND_INSERT): same.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri):
-	g_dirname -> g_path_get_dirname.
-
-	* backend/pas/Makefile.am (INCLUDES):  add
-	-DG_DISABLE_DEPRECATED.
-
-	* backend/ebook/Makefile.am (INCLUDES): add
-	-DG_DISABLE_DEPRECATED.
-
-2002-12-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(uris_listener): oops, use strcmp, not !strcmp here.
-
-2002-12-17  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bug #35135 ]
-	* backend/ebook/e-book-util.c (set_default_book_uri_local): don't
-	free the default_book_uri here, it's done in set_default_book_uri.
-	(set_default_book_uri): break some stuff out from
-	set_default_book_uri_from_bonobo_conf to here so it can be used
-	both from that function and the bonobo listener.
-	(default_folder_listener): set the new default book uri.
-	(set_default_book_uri_from_bonobo_conf): install the bonobo conf
-	listener so we'll get updates.
-
-2002-12-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_control_new): Use
-	evolution_shell_client_corba_objref() instead of BONOBO_OBJREF()
-	to get the Shell CORBA object.
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/addressbook-config.c: Don't #include
-	<e-util/e-html-utils.h>
-
-2002-12-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.[ch]: GObject-ize this.
-
-2002-12-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (load_uri_auth_cb): pass
-	"Addressbook" to e_passwords*.
-	(addressbook_authenticate): same.
-
-2002-12-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (search_cb): remove
-	PENDING_PORT_WORK.
-	(addressbook_search_activated): same.
-	(addressbook_query_changed): same.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	add libfilter.la back in.
-
-2002-12-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/widgets/e-minicard-control.c: #define MINICARD_CONTROL_ID.
-
-2002-12-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	connect ::response to gtk_widget_destroy so the dialog goes away.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct):
-	don't use font_gdk anymore on EText.  it doesn't exist.
-
-2002-12-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (text_height): this
-	uses pango now.
-	(addressbook_height): same.
-
-2002-12-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_commit_card): use e_card_set_book
-	instead of basically duplicating its code here.
-	(e_book_add_card): same.
-
-2002-12-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/e-cardlist-model.c: #include <string.h>.
-
-	* gui/component/addressbook-storage.c: #include <string.h>,
-	<ctype.h>, <unistd.h>.
-
-	* gui/component/addressbook-factory.c: Removed.
-
-	* gui/component/addressbook-component.c: #include
-	<bonobo/bonobo-main.h>, <unistd.h> and <string.h>.
-	(create_view): addressbook_new_control() instead of
-	addressbook_factory_new_control().
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table): Removed unused variable.
-	(e_select_names_add_section): Removed unused variable.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_in_cb): Use g_source_remove() here instead of
-	gtk_timeout_remove().
-
-	* gui/component/component-factory.c: New.
-
-	* gui/widgets/e-minicard-control.c
-	(e_minicard_control_factory_init): Removed.
-	(e_minicard_control_control_factory): Removed.
-	(e_minicard_control_new): New.
-
-	* gui/component/e-address-widget.c
-	(e_address_widget_factory_init): Removed.
-	(e_address_widget_new_control): Renamed from
-	e_address_widget_factory_new_control(), made public.
-	(e_address_widget_factory): Removed.
-
-	* gui/component/e-address-popup.c (e_address_popup_new_control):
-	New.
-	(e_address_popup_factory_new_control): Removed.
-	(e_address_popup_factory): Removed.
-	(e_address_popup_factory_init): Removed.
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_register_factory): Removed.
-	(addressbook_config_create_control): New.
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_factory_init): Removed.
-	(addressbook_component_get_object): New.
-	(owner_set_cb): Do not call addressbok_config_register_factory().
-
-	* gui/component/addressbook.c (addressbook_factory_init): Removed.
-	(addressbook_new_control): Renamed from
-	addressbook_factory_new_control().
-
-2002-12-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/select-names/e-select-names.etspec: Use collate
-	for sorting rather than the normal string sort. This fixes bug
-	#26335 without causing bug #33933 :-)
-
-2002-11-30  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
-	enable the LDAPv3 stuff if TLS is being used.  Also, deal with
-	naming errors returned from query_ldap_root_dse, as some servers
-	(older openldap servers among others i'm sure) don't have a root
-	dse at all.
-	
-2002-12-02  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_contact_print_button):
-	gnomedialog -> gtkdialog stuff.  print dialog is a gtkdialog now.
-
-	* gui/contact-editor/e-contact-editor.c: include gtkstock.h
-
-
-2002-11-27  Not Zed  <NotZed@Ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c: #include gtkstock.h
-
-2002-11-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view-widget.c (column_width_changed): the
-	detail is supposed to go after the signal id, not at the end of
-	the parameter list.
-
-2002-11-28  Chris Toshok  <toshok@ximian.com>
-	[ roll forward from 1.2 branch, partial fix for #31763 ]
-	* gui/component/select-names/select-names.glade: add the Find
-	button back in.
-
-2002-11-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (create_minicard_view): remove
-	the button_press_event handler (that did nothing).  this makes it
-	so button presses actually get to the canvas (and therefore we can
-	now drag the lines in the reflow widget).
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c: add include for
-	gtkstock.h.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_add_destination): add pre_change call.
-	(e_contact_list_model_remove_row): same.
-	(e_contact_list_model_remove_all): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_new): ref/sink the contact list editor so
-	we don't get the floating unref warning from gtk.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_new):
-	ref/sink the contact editor so we don't get the floating unref
-	warning from gtk.
-	(e_contact_editor_init): use g_build_filename instead of
-	g_concat_dir_and_file.
-
-	* gui/widgets/e-minicard-label.c
-	(e_minicard_label_resize_children): use MAX (value, 0) to make
-	sure we aren't passing negative values for clip-widths.
-
-	* gui/widgets/e-minicard.c (e_minicard_realize): use MAX (value,
-	0) to make sure we aren't passing negative values for widths.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	use g_build_filename.
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	[ roll forward from 1.2 branch ]
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_vcard): never pass NULL as the vcard
-	to the corba call, it causes a crash.  This particular bug bit us
-	when we opened a card that contained an unresolvable related
-	contact.
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	[ roll forward from 1.2 branch, Fixes addressbook bug #28945 ]
-	* backend/ebook/e-card.c (e_card_get_vobject): if the email
-	property is xml, get the real address from the e-destination.
-	Fixes saving contact lists.
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_reflow): remove redundant
-	setting of y2.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): show the table.
-
-	* gui/component/select-names/e-select-names-completion.c: remove
-	an unnecessary #include.
-
-	* gui/component/addressbook-storage.c (addressbook_storage_setup):
-	use g_build_filename.
-
-	* gui/component/addressbook-component.c (remove_folder): use
-	g_build_filename.
-	(add_creatable_item): same.
-	(ensure_completion_uris_exist): same, and use the right gconf
-	paths for completion uris.
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(read_completion_books_from_db): use new schema for
-	completion/uris.
-	(uris_listener): same.
-
-	* gui/component/select-names/e-select-names.h: Convert to
-	GtkDialog from GnomeDialog.
-	
-	* gui/component/select-names/e-select-names.c: Convert to
-	GtkDialog from GnomeDialog.
-	(folder_selected): use new schema for last_used_uri.
-	(e_select_names_init): same.
-	(e_select_names_set_default): use pango markup to set
-	bold/not-bold.
-	(e_select_names_add_section): don't bother creating an EEntry, we
-	can use pango and a normal label.  This also keeps us from
-	wrapping "contacts ->" at the '-'.
-
-	* gui/component/apps_evolution_addressbook.schemas: new file.
-
-	* gui/component/Makefile.am: add the schema stuff.
-
-2002-11-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (query_for_supported_bases):
-	show the etable.
-	(addressbook_add_server_druid): show_all before returning the
-	dialog, so the druid shows up.
-
-2002-11-23  Chris Toshok  <toshok@ximian.com>
-
-	[ roll forward from the 1.2 branch.  fixes #25540, part of #29630,
-	as well as other selection issues in the contact editor and ACL
-	issues in the ldap backend ]
-	* backend/pas/pas-backend-ldap.c (check_schema_support): reset the
-	schema check state to FALSE if the read returned nothing (and the
-	user had not authenticated).  we'll requery if/when they auth.
-	(query_ldap_root_dse): free the schema dn before assigning over
-	it.
-	(pas_backend_ldap_connect): added a diagnostic warning about the
-	root dse query failing in anonymous mode (if it in fact did fail.)
-	(pas_backend_ldap_process_authenticate_user): if we successfully
-	authed, requery the root dse to pick up any attributes that might
-	be protected, and retry the schema query if that failed before.
-
-	* gui/contact-editor/e-contact-editor.c (full_name_clicked): set
-	the dialog's editable state based on the new field
-	"fullname_editable", and only do the Ok button handling if this
-	flag is TRUE.
-	(full_addr_clicked): set the dialog's editable state based on the
-	editable state for the particular address (from
-	editor->address_editable[]).  also, only do the Ok button handling
-	if this flag is TRUE.
-	(_address_arrow_pressed): use the address_editable array to
-	determine whether the address text and the mailing address
-	checkbutton are sensitive.
-	(enable_writable_fields): figure out if fullname_editable is
-	TRUE/FALSE, also, init the address_editable flags based on the
-	field list, and handle the address checkbutton.
-
-	* gui/contact-editor/fulladdr.glade: change the label names to
-	label-<name> to match {entry,combo}-<name>.
-
-	* gui/contact-editor/fullname.glade: same.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_class_init): rename ARG_IS_READ_ONLY to
-	ARG_EDITABLE, to reflect the correct sense of the flag.
-	(e_contact_editor_fullname_set_arg): same, and make the labels
-	sensitive/insensitive depending on the editable state of the
-	dialog.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): rename ARG_IS_READ_ONLY to
-	ARG_EDITABLE, to reflect the correct sense of the flag.
-	(e_contact_editor_address_set_arg): same, and make the labels
-	sensitive/insensitive depending on the editable state of the
-	dialog.
-	
-2002-11-22  Chris Toshok  <toshok@ximian.com>
-
-	[ roll forward Sean.Gao@sun.com's fix for #16870 from the 1.2
-	branch ] 
-	* backend/ebook/evolution-ldif-importer.c (getNextLDIFEntry):
-	check for both LR and CRLF as empty line markers.
-
-2002-11-22  Chris Toshok  <toshok@ximian.com>
-
-	[ rolling forward fix for #34254 from 1.2 branch ]
-	* backend/ebook/evolution-vcard-importer.c (check_file_is_vcard):
-	use g-ascii_strncasecmp instead of strncmp.
-	(support_format_fn): use g_ascii_strcasecmp instead of strcmp.
-
-2002-11-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.h: roll forward the scope fix.
-
-2002-11-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: roll forward the fix for
-	the contact editor.
-
-2002-11-21  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_changed): Pass type to bonobo_ctonrol_set_property, and
-	also NULL terminate the valist.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(changed_cb): Fix signature for signal.
-
-2002-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in,
-	* gui/component/select-names/Makefile.am: Same changes as below
-	for the SelectNames component.
-
-2002-11-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): show the custom table.
-
-2002-11-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.c (gal_view_minicard_attach):
-	remove the cast to (int) - column_width is a double.
-
-	* gui/widgets/e-minicard.c (e_minicard_class_init): the height
-	property is only readable, not readwrite.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): make column_width a double
-	property.
-	(e_minicard_view_widget_set_property): don't cast to (int).
-	column_width is double in the e-minicard-view.
-	(e_minicard_view_widget_realize): same.
-	(e_minicard_view_widget_get_property): use g_value_set_double for
-	column_width.
-
-2002-11-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/Makefile.am (servers_DATA): oops,
-	missed some "oaf"'s.
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_build_phone_ui): sink the popup.
-	(e_contact_editor_build_email_ui): same.
-	(e_contact_editor_build_address_ui): same.
-
-	* gui/component/addressbook-config.c (ldap_dialog_new): show
-	everything from dialog->page down, so custom widgets show up.
-
-2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am: Added rule to generate
-	GNOME_Evolution_Addressbook.server.in from
-	GNOME_Evolution_Addressbook.server.in.in, substituting
-	@LIBEXECDIR@.
-
-	* GNOME_Evolution_Addressbook.server.in.in: Renamed from
-	GNOME_Evolution_Addressbook.server.in.  Added @LIBEXECDIR@ before
-	the location of the executable.
-
-	* gui/component/select-names/select-names.glade: Ported to Glade
-	2.
-
-	* gui/component/select-names/recipient.glade: Ported to Glade 2.
-
-2002-11-15  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-component.c: Use bonobo_main_quit.
-	
-2002-11-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-factory-minicard.c: clean this up a tad.
-
-	* gui/widgets/e-addressbook-view.c (init_collection): re-enable
-	this.
-	(setup_menus): same.
-
-	* gui/widgets/gal-view-minicard.[ch]: more GObject work.
-
-2002-11-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (_popup_position): push_in
-	= FALSE, no clue why... :)
-	(_arrow_pressed): call g_signal_stop_emission here, seems to fix
-	things.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): fix warnings.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): fix warning.
-
-	* gui/component/addressbook.c (forget_passwords_cb): remove the
-	PENDING_PORT ifdef.
-	(load_uri_auth_cb): same.
-	(addressbook_authenticate): same.
-
-	* gui/component/addressbook-factory.c (main): same.
-
-	* gui/component/addressbook-storage.c (load_source_data): be
-	silent about text nodes if they contain nothing but whitespace.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_dispose): guard
-	against multiple invocations.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): change signature
-	to that of a weak ref notify function.
-	(cursor_destroy): same.
-	(pas_backend_ldap_book_destroy_cb): same.
-	(get_cursor_handler): ::destroy -> weak_ref.
-	(pas_backend_ldap_process_get_book_view): same.
-	(pas_backend_ldap_add_client): same.
-
-	* backend/pas/pas-backend-file.c (cursor_destroy): change
-	signature to that of a weak ref notify function.
-	(view_destroy): same.
-	(pas_backend_file_book_destroy_cb): same.
-	(pas_backend_file_process_get_cursor): ::destroy -> weak_ref.
-	(pas_backend_file_process_get_book_view): same.
-	(pas_backend_file_process_get_completion_view): same.
-	(pas_backend_file_process_get_changes): same.
-	(pas_backend_file_add_client): same.
-
-	* backend/ebook/test-client.c (get_cursor_cb): unref the book and
-	exit here.
-	(get_card_cb): pass a query string to get_cursor.
-
-	* backend/ebook/e-book-view.c (e_book_view_class_init): correct
-	marshaller for "card_added".
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/test-reflow.c (destroy_callback): change signature
-	to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/test-minicard.c (destroy_callback): change signature
-	to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/test-minicard-view.c (destroy_callback): change
-	signature to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/test-minicard-label.c (destroy_callback): change
-	signature to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/e-minicard-widget.c (e_minicard_widget_init): ifdef
-	out the call to gnome_canvas_set_scroll_region.  It doesn't seem
-	necessary judging from the rest of the code, and it also crashes
-	the addressbook if it's in.
-
-	* gui/widgets/e-minicard-widget-test.c (destroy_callback): change
-	signature to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/e-minicard-control.c (free_struct): change signature
-	to that of a weak ref notify function.
-	(e_minicard_control_factory): ::destroy -> weak_ref.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
-	::destroy -> weak_ref.
-	(e_addressbook_view_print): same.
-	(free_closure): change signature to that of a weak ref notify
-	function.
-	(e_contact_print_destroy): same.
-	(invisible_destroyed): same.
-
-	* gui/widgets/e-addressbook-util.c
-	(e_addressbook_prompt_save_dialog): convert from GnomeDialog to
-	GtkDialog.
-	(e_addressbook_show_multiple_cards): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(prompt_to_save_changes): change response ids to use
-	GTK_RESPONSE_.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(clear_widget): new function.
-	(e_select_names_manager_activate_dialog): ::destroy -> weak_ref.
-
-	* gui/component/select-names/e-select-names.c (clear_widget):
-	change signature to that of a weak ref notify function.
-	(e_select_names_init): ::destroy -> weak_ref.
-
-	* gui/component/e-address-popup.c (mini_wizard_destroy_cb): change
-	signature to that of a weak ref notify function.
-	(mini_wizard_new): ::destroy -> weak_ref.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_destroy): change signature to that of a
-	weak ref notify function.
-	(ldap_config_control_destroy_callback): same.
-	(addressbook_add_server_druid): ::destroy -> weak_ref.
-	(addressbook_edit_server_dialog): same.
-	(ldap_config_control_new): same.
-
-	* gui/component/addressbook.c (destroy_callback): change signature
-	to that of a a weak ref notify function.
-	(addressbook_factory_new_control): ::destroy -> weak_ref.
-
-	* gui/merging/e-card-merging.c (response): rename clicked to this,
-	and destroy the dialog here.
-	(match_query_callback): ::clicked -> ::response
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
-	convert.
-
-	* gui/merging/e-card-duplicate-detected.glade: same.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (_arrow_pressed): change
-	around a little, still ifdefed though.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists): same.
-	(save_it): deal with the GtkDialog response ids.
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_confirm_delete): just build the dialog here
-	(using gtk_message_dialog*).
-
-	* gui/contact-editor/Makefile.am (glade_DATA): remove
-	file-exists.glade and e-contact-editor-confirm-delete.glade.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_dispose): guard
-	against multiple invocations.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): change signature
-	to that of weak ref's notify function - also, don't use the type
-	check macros on the freed GObject.
-	(cursor_destroy): same.
-	(pas_backend_ldap_book_destroy_cb): same.
-	(pas_backend_ldap_add_client): use weak_ref insteead of ::destroy.
-	(get_cursor_handler): same.
-	(pas_backend_ldap_process_get_book_view): same.
-
-	* backend/pas/pas-backend-file.c (cursor_destroy): change
-	signature to that of weak ref's notify function - also, don't use
-	the type check macros on the freed GObject.
-	(pas_backend_file_book_destroy_cb): same.
-	(view_destroy): same.
-	(pas_backend_file_process_get_cursor): use weak_ref instead of
-	::destroy.
-	(pas_backend_file_process_get_book_view): same.
-	(pas_backend_file_process_get_completion_view): same.
-	(pas_backend_file_process_get_changes): same.
-	(pas_backend_file_add_client): same.
-
-2002-11-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.c
-	(pas_backend_card_sexp_dispose): guard against multiple
-	invocations.
-	
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_dispose): same.
-
-	* backend/pas/pas-book.c (pas_book_dispose): same.
-
-	* backend/pas/pas-book-view.c (pas_book_view_dispose): same.
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_dispose): same.
-
-	* backend/pas/pas-backend-summary.c (pas_backend_summary_dispose): same.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_dispose): same.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_dispose): same.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_dispose): guard
-	against multiple invocations.
-
-	* backend/ebook/e-card.c (e_card_dispose): same.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_dispose): same.
-
-	* backend/ebook/e-card-cursor.c (e_card_cursor_dispose): same.
-
-	* backend/ebook/e-book.c (e_book_dispose): same.
-
-	* backend/ebook/e-book-view-listener.c (e_book_view_listener_dispose): same.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (free_data): guard against
-	multiple invocations.
-	(remove_book_view): same.
-	(addressbook_dispose): same.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_dispose):
-	same.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_dispose): same.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_dispose): same.
-
-	* gui/widgets/e-minicard-widget.c (e_minicard_widget_dispose):
-	same.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_get_property): oops, missed these casts.
-
-	* gui/component/addressbook.c (get_master_list): remove the
-	PENDING_PORT_WORK ifdef, just ported ECategoriesMasterList.
-	(make_suboptions): same.
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked):
-	same.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/test-reflow.c: port work.
-
-	* gui/widgets/test-minicard-view.c: port work.
-
-	* gui/widgets/e-minicard.[ch]: port work.
-	
-	* gui/widgets/e-minicard-widget.c: port work.
-
-	* gui/widgets/e-minicard-view.c: port work.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_size_allocate): gtk_->g_ change i missed.
-	(e_minicard_view_widget_reflow): same.
-
-	* gui/widgets/e-minicard-label.c: port work.
-
-	* gui/widgets/e-minicard-control.c (get_prop): gtk_->g_ change i
-	missed.
-
-	* gui/widgets/e-addressbook-view.c (setup_menus): ifdef this
-	PENDING_PORT_WORK for now.
-	(has_email_address_1): gtk_->g_ change i missed.
-	(print): remove the PENDING_PORT_WORK from here, as the print_*
-	symbols now resolve.
-	(delete): gtk_->g_ changes.
-	(new_card): same.
-	(new_list): same.
-	(sources): same.
-	(create_minicard_view): same.
-	(table_double_click): same.
-	(create_table_view): same.
-	(e_contact_print_destroy): same.
-	(e_contact_print_button): same.
-	(e_addressbook_view_print): same, and remove the PENDING_PORT_WORK
-	ifdef.
-	(e_addressbook_view_print_preview): same.
-	(do_remove): gtk_->g_ changes.
-	(e_addressbook_view_save_state): same.
-	(view_transfer_cards): same.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView):
-	GtkObject -> GObject.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	GnomeDialog -> GtkDialog.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_set_value_at): a gtk_->g_ change i missed.
-	(e_addressbook_table_adapter_class_init): gtk_type_class ->
-	g_type_class_peek_parent.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_get_property): use g_object_get_property for
-	aggregated properties.
-	(e_addressbook_reflow_adapter_class_init): gtk_type_class ->
-	g_type_class_peek_parent.
-
-	* gui/merging/e-card-merging.c (match_query_callback): some misc
-	gtk_->g_ changes i missed.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.h: parent class
-	is GObjectClass.
-
-	* gui/component/select-names/e-simple-card-bonobo.c
-	(impl_dispose): guard against multiple invocations, and chain
-	dispose.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_dispose): guard against multiple invocations.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_dispose): guard against multiple
-	invocations.
-	(e_select_names_text_model_set_source): fix casts.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(e_select_names_table_model_add_source): remove the GTK_OBJECT
-	cast, fixes a warning.
-	(clear_info): guard against multiple invocations from ::dispose.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_dispose): same.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_dispose): same.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_dispose): guard against multiple invocations.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: convert to glade-2
-
-	* gui/contact-list-editor/e-contact-list-editor.c: port work.
-	
-	* gui/contact-list-editor/e-contact-list-model.[ch]: port work.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.[ch]: port work.
-
-	* gui/contact-editor/e-contact-editor-fullname.[ch]: port work.
-
-	* gui/contact-editor/e-contact-editor.[ch]: port work.
-
-	* gui/contact-editor/e-contact-quick-add.c: port work.
-
-	* gui/contact-editor/e-contact-save-as.c: port work.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-util.c
-	(set_default_book_uri_from_config_db): prepend /apps/Evolution to
-	config db paths.
-	
-	* gui/component/select-names/e-select-names-manager.c (read_completion_books_from_db): same.
-	(uris_listener): same.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: more porting work.
-
-	* e-contact-editor-fullname.[ch]: more porting work.
-
-	* e-contact-editor.c: more porting work.
-
-	* e-contact-quick-add.c: more porting work.
-
-	* e-contact-save-as.c: more porting work.
-
-	* test-editor.c: more porting work.
-	
-	* e-contact-editor-confirm-delete.glade, file-exists.glade,
-	fulladdr.glade, fullname.glade: run these through
-	libglade-convert.
-
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): add
-	lots of libs back in since they're building now.
-
-	* gui/component/addressbook-config.c: more porting work.
-
-	* gui/component/addressbook.c: more porting work.
-
-	* gui/component/e-address-popup.[ch]: more porting work.
-	
-	* gui/component/e-address-widget.[ch]: more porting work.
-	
-	* gui/component/e-cardlist-model.[ch]: more porting work.
-	
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.[ch]: more
-	porting work.
-
-	* gui/component/select-names/e-select-names-completion.[ch]: more
-	porting work.
-
-	* gui/component/select-names/e-select-names-manager.[ch]: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names-model.[ch]: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names-popup.c: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names-table-model.[ch]: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names-text-model.[ch]: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names.[ch]: more
-	porting work.
-	
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/Makefile.am: tests are linking now, and link in
-	libcamel.la.
-
-	* backend/ebook/e-destination.c (e_destination_get_name): un-ifdef
-	since camel is compiling.
-	(e_destination_get_email): same.
-	(e_destination_get_address): same.
-	(e_destination_get_textrep): same.
-
-	* backend/ebook/e-card-compare.c (name_fragment_match): use e_utf8_casefold_*.
-	(name_fragment_match_with_synonyms): same.
-	(e_card_compare_name_to_string_full): same.
-	(e_card_compare_name): same.
-
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-util.h: add prototypes for e_utf8_casefold_collate{_len}
-
-	* backend/ebook/e-book-util.c (e_utf8_casefold_collate_len): move
-	utf8_casefold_collate_len here.
-	(e_utf8_casefold_collate): move utf8_casefold_collate here.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print-envelope.c: port this to
-	gnome2/gnomeprint2.
-
-	* printing/e-contact-print-style-editor.c: same.
-
-	* printing/e-contact-print.c: same.
-
-	* printing/test-contact-print-style-editor.c: same.
-
-	* printing/test-print.c: same.
-
-	* printing/e-contact-print.glade: libglade-convert to libglade-2.
-	
-	* printing/Makefile.am (contact_print_test_LDADD)
-	(contact_print_style_editor_test_LDADD): remove libcamel.la from
-	these for the time being to get things linking.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.[ch]: gobjectify this.
-
-	* gui/widgets/e-minicard.[ch]: gobjectify this.
-	(e_minicard_class_init): change the
-	min/max values of the width/height paramspecs so that they can
-	actually be set to something other than 0.0.
-
-	* gui/widgets/e-minicard-widget.[ch]: gobjectify this.
-
-	* gui/widgets/e-minicard-view.[ch]: gobjectify this.
-	(set_empty_message): don't need e_utf8_from_locale_string anymore.
-
-	* gui/widgets/e-minicard-view-widget.[ch]: gobjectify this.
-
-	* gui/widgets/e-minicard-label.[ch]: gobjectify this.
-
-	* gui/widgets/e-addressbook-view.[ch]: gobjectify this.
-
-	* gui/widgets/e-addressbook-table-adapter.[ch]: gobjectify this.
-
-	* gui/widgets/e-addressbook-reflow-adapter.[ch]: gobjectify this.
-
-	* gui/widgets/e-addressbook-model.[ch]: gobjectify this.
-
-	* gui/widgets/e-minicard-control.c (e_minicard_control_factory):
-	fix bonobo_persist_stream_new api change.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_add_destination): get rid of the
-	gtk_object_sink here.
-
-	* gui/component/ldap-config.glade: glade-2 version of this file.
-	
-	* gui/component/e-address-popup.c (e_address_popup_refresh_names):
-	don't need e_utf8_to_gtk_string anymore.
-
-	* gui/component/addressbook.c (make_suboptions): don't need
-	e_utf8_to_locale_string anymore.
-
-	* gui/component/addressbook-config.c
-	(addressbook_dialog_get_source): get rid of the e_utf8 gtk_entry
-	functions.
-	(addressbook_source_dialog_set_source): same.
-	(general_tab_check): same.
-	(port_changed_func): same.
-	(connecting_tab_check): same.
-	(query_for_supported_bases): same.
-	(display_name_check): same.
-	(display_name_page_prepare): same.
-	(edit_source_clicked): same.
-	(addressbook_config_create_new_source): same.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.c
-	(pas_backend_card_sexp_class_init): use g_type_class_peek_parent.
-
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_class_init): same.
-
-	* backend/pas/pas-book-view.c (pas_book_view_class_init): same.
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_class_init): same.
-
-	* backend/pas/pas-backend-summary.c (pas_backend_summary_class_init): same.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_class_init): same.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_class_init): same.
-
-	* backend/ebook/e-book-marshal.list: ENUM -> INT.
-
-	* backend/ebook/e-book-view.c (e_book_view_dispose): guard against
-	this being called multiple times.
-	(e_book_view_class_init): ENUM -> INT in the sequence_complete
-	signal.
-	
-	* backend/ebook/e-book.c (e_book_do_response_open): un-ifdef the
-	component_died signal stuff.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_expand_uri): call
-	g_build_filename, not g_build_path.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-destination.[ch]: fix the gnome-xml headers.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.c: fix the gnome-xml headers.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): convert from gtk signals and args
-	to GSignal and GObject properties.
-	(e_addressbook_view_dispose): rename _destroy to this.
-	(e_addressbook_view_set_property): rework _set_arg to this.
-	(e_addressbook_view_get_property): rework _get_arg to this.
-	(display_view): if we're here we need to choose a view, regardless
-	of whether or not the GAL_IS_VIEW_* macros tell us which type it
-	is.
-
-	* gui/widgets/e-addressbook-table-adapter.c: fix the gnome-xml
-	headers.
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_class_init): use INT, not ENUM in the signal here.
-
-	* gui/component/addressbook-config.c: another big gtk_* -> g_*
-	renaming.
-	
-	* gui/component/addressbook.c: same.
-
-	* gui/component/e-address-popup.c: same.
-
-	* gui/component/e-address-widget.c: same.
-	
-	* gui/component/e-cardlist-model.c: fix the gnome-xml headers, and
-	more gtk_* -> g_* renaming.
-	
-	* gui/component/addressbook-component.c (owner_set_cb): use
-	evolution_shell_client_corba_objref as per ettore's change to
-	EvolutionShellClient..
-	(create_view): fix the call to bonobo_control_set_property.
-	(create_component): gtk_signal_connect -> g_signal_connect.
-
-	* gui/component/addressbook-storage.c: fix the gnome-xml
-	headers.
-	(addressbook_storage_setup): use
-	evolution_shell_client_corba_objref as per ettore's change to
-	EvolutionShellClient..
-	(addressbook_get_other_contact_storage): gtk_signal_connect ->
-	g_signal_connect.
-	(load_source_data): root->childs -> root->childrens.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.c: fix some #include's.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): only build the backend and gui dirs for
-	now.  printing and conduits are no-man's land at present.
-
-	* addressbook/gui/merging/e-card-merging.[ch]: Port to
-	GObject/gnome2.
-	
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/.cvsignore: ignore the new .server file.
-	
-	* gui/component/Makefile.am: typical port stuff.  switch the .oaf
-	to .server, and leave out a lot of libs so we can actually get
-	things linking.
-	
-	* gui/component/GNOME_Evolution_Addressbook.server.in: rename
-	.oaf.in here.
-	
-	* gui/component/addressbook-component.c: Port to GObject/gnome2.
-	
-	* gui/component/addressbook-config.c: Port to GObject/gnome2.
-
-	* gui/component/addressbook-factory.c: Port to GObject/gnome2.
-
-	* gui/component/addressbook-storage.c: Port to GObject/gnome2.
-
-	* gui/component/addressbook.[ch]: Port to GObject/gnome2.
-
-	* gui/component/e-address-popup.[ch]: Port to GObject/gnome2.
-
-	* gui/component/e-address-widget.[ch]: Port to GObject/gnome2.
-
-	* gui/component/e-cardlist-model.h: Port to GObject/gnome2.
-	
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/.cvsignore: ignore the marshal generated
-	stuff.
-	
-	* gui/contact-list-editor/Makefile.am: typical port stuff.  add
-	marshaller generation foo, dist it...
-	
-	* gui/contact-list-editor/e-contact-list-editor.[ch]: Port to
-	GObject/gnome2.
-	
-	* gui/contact-list-editor/e-contact-list-model.[ch]: Port to
-	GObject/gnome2.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/.cvsignore: ignore the marshal generated
-	stuff.
-	
-	* gui/contact-editor/Makefile.am: typical port stuff.  add
-	marshaller generation foo, dist it...
-	
-	* gui/contact-editor/e-contact-editor-address.[ch]: Port to GObject/gnome2.
-	
-	* gui/contact-editor/e-contact-editor-fullname.c: Port to GObject/gnome2.
-	
-	* gui/contact-editor/e-contact-editor.c: Port to GObject/gnome2.
-	
-	* gui/contact-editor/e-contact-quick-add.c: Port to GObject/gnome2.
-	
-	* gui/contact-editor/e-contact-save-as.[ch]: Port to GObject/gnome2.
-	
-	* gui/contact-editor/test-editor.c: Port to GObject/gnome2.
-	
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: Port to
-	GObject/gnome2.
-
-	* gui/widgets/e-addressbook-table-adapter.c: Port to
-	GObject/gnome2.
-
-	* gui/widgets/e-addressbook-util.c: Port to GObject/gnome2.
-
-	* gui/widgets/e-addressbook-view.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-control.c: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-label.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-view-widget.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-view.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-widget-test.c: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-widget.c: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/gal-view-factory-minicard.c: Port to GObject/gnome2.
-
-	* gui/widgets/gal-view-minicard.c: Port to GObject/gnome2.
-	
-	* gui/widgets/test-minicard-label.c: Port to GObject/gnome2.
-	
-	* gui/widgets/test-minicard-view.c: Port to GObject/gnome2.
-	
-	* gui/widgets/test-minicard.c: Port to GObject/gnome2.
-	
-	* gui/widgets/test-reflow.c: Port to GObject/gnome2.
-	
-	* gui/widgets/Makefile.am: typical port stuff.  add marshaller
-	generation foo, dist it...
-
-	* gui/widgets/.cvsignore: ignore the marshaller stuff.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-simple-card-bonobo.[ch]: Port to
-	GObject/gnome2.
-	
-	* gui/component/select-names/e-select-names.[ch]: Port to
-	GObject/gnome2.
-	
-	* gui/component/select-names/e-select-names-text-model.c: Port to
-	GObject/gnome2.
-	
-	* gui/component/select-names/e-select-names-table-model.c: Port to
-	GObject/gnome2.
-	
-	* gui/component/select-names/e-select-names-popup.[ch]: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-model.c: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-manager.[ch]: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-factory.c: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-completion.[ch]: Port
-	to GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-bonobo.[ch]: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/Makefile.am: typical port stuff.  add
-	marshaller generation foo, dist it, and switch the .oaf to .server
-
-	* gui/component/select-names/.cvsignore: ignore the marshaller
-	stuff.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/.cvsignore: ignore the generated marshaller files.
-
-	* backend/ebook/e-destination.c (e_destination_dispose): rename
-	e_destination_destroy.
-	(e_destination_equal): ifdef this out for now, PENDING_PORT_WORK.
-	(e_destination_get_name): same.
-	(e_destination_get_email): same.
-	(e_destination_get_address): same.
-	(e_destination_get_textrep): same.
-
-	* backend/ebook/Makefile.am: don't build the executables
-	(importers and loaders) for now.  Also, s/oaf/server, and use
-	INTLTOOL_SERVER_RULE.
-
-	* backend/ebook/e-book-util.c (e_book_get_config_database):
-	un-#ifdef this.
-	(e_book_default_book_open): un-#ifdef ths code in here that relies
-	on the e_config_listener.
-
-2002-11-05  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (send_pending_adds): copy a
-	memleak fix from pas-backend-ad.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card.c: g_date_* => g_date_get_*, fixes
-	G_DISABLE_DEPRECATED build.
-
-	* backend/ebook/e-book-listener.[ch]: remove the servant crap i'd
-	c&p'ed and put in here.
-
-	* backend/ebook/e-book-view-listener.[ch]: remove the servant crap
-	i'd c&p'ed and put in here.
-	
-	* backend/pas/pas-book-factory.[ch]: subclass from BonoboObject,
-	and remove the servant crap from here too.  whee.
-
-	* backend/pas/pas-card-cursor.[ch]: remove the servant crap i'd
-	c&p'ed and put in here.
-
-	* backend/pas/pas-book.[ch]: remove the servant crap i'd c&p'ed
-	and put in here.
-
-	* backend/pas/pas-book-view.[ch]: remove the servant crap i'd
-	c&p'ed and put in here.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.[ch]: port to gnome 2.
-
-	* backend/pas/pas-backend-file.[ch]: same.
-
-	* backend/pas/pas-backend-file.[ch]: same.
-
-	* backend/pas/pas-backend-ldap.[ch]: same.
-
-	* backend/pas/pas-backend-summary.[ch]: same.
-
-	* backend/pas/pas-backend.[ch]: same.
-
-	* backend/pas/pas-book-factory.[ch]: same.
-
-	* backend/pas/pas-book-view.[ch]: same.
-
-	* backend/pas/pas-book.[ch]: same.
-
-	* backend/pas/pas-card-cursor.[ch]: same.
-
-	* backend/pas/pas-marshal.list: list of marshallers.
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add pas-marshal.c
-	also add the marshal building foo.
-
-	* backend/pas/.cvsignore: ignore pas-marshal.[ch]
-	
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/test-client-list.c (main): don't call
-	bonobo_activation_init directly.
-
-	* backend/ebook/test-client.c (get_card_cb): don't unref the card
-	here since we never reffed it.
-	(main): no need to call bonobo_activation_init, as
-	gnome_program_init did it for us.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get_property):
-	s/g_value_{set,get}_pointer/g_value_{set,get}_object
-
-	* backend/ebook/e-book-util.c (set_default_book_uri_local): make
-	sure to terminate args with NULL for g_build_filename.
-
-	* backend/ebook/e-book-listener.c: nuke e_book_listener_get_type
-	and use the BONOBO_TYPE_FUNC_FULL macro.
-
-	* backend/ebook/e-book-listener.h: add the epv to
-	EBookListenerClass so BONOBO_TYPE_FUNC_FULL works.
-
-	* backend/ebook/e-book-view-listener.c: nuke
-	e_book_view_listener_get_type and use the BONOBO_TYPE_FUNC_FULL
-	macro.
-
-	* backend/ebook/e-book-view-listener.h: add the epv to
-	EBookViewListenerClass so BONOBO_TYPE_FUNC_FULL works.
-
-2002-11-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-types.h: just include glib.h instead of the
-	gtk stuff.
-
-	* backend/ebook/e-book-listener.[ch]: convert to
-	GObject/bonobo-activation/etc/etc.
-	* e-book-util.[ch]: same.
-	* e-book-view-listener.[ch]: same.
-	* e-book-view.[ch]: same.
-	* e-book.[ch]: same.
-	* e-card-compare.[ch]: same.
-	* e-card-cursor.[ch]: same.
-	* e-card-simple.[ch]: same.
-	* e-card.[ch]: same.
-	* e-destination.[ch]: same.
-	* evolution-ldif-importer.c: same.
-	* evolution-vcard-importer.c: same.
-	* load-gnomecard-addressbook.c: same.
-	* load-pine-addressbok.c: same.
-	* test-card.c: same.
-	* test-client-list.c: same.
-	* test-client.c: same.
-
-	* backend/ebook/Makefile.am: add e-book-marshal.c to SOURCES, add
-	e-book-marshal.[ch] to CLEANFILES, and add e-book-marshal.list to
-	EXTRA_DIST.  Also, remove the camel libs from the test LDADD's,
-	and leave e-destination.[ch] out of the build.
-
-	* backend/ebook/.cvsignore: ignore e-book-marshal.[ch]
-
-	* backend/ebook/e-book-marshal.list: marshallers for e-book.
-
-2002-10-28  Larry Ewing  <lewing@ximian.com>
-
-	* backend/ebook/e-card.c (addPropValueUTF8): never set the charset
-	on an item without also encoding it.  Mime messages don't like
-	parts with multiple charsets. 	
-
-2002-10-25  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy):
-	Disconnect from the book's backend_died signal.
-
-2002-10-24  Chris Toshok  <toshok@ximian.com>
-
-       * backend/pas/Makefile.am: install evolutionperson.schema to
-       $(datadir)/evolution.
-
-2002-10-24  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #29144 ]
-	* gui/component/addressbook-config.c (edit_dialog_store_change):
-	use e_table_memory_storage_change instead of remove/insert, so the
-	selection is maintained.
-
-2002-10-22  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(folder_selected): Set /Addressbook/select_names_uri in the
-	configdb to the selected folder.
-	(e_select_names_init): Look for /Addressbook/select_names_uri
-	before /DefaultFolders/contacts_uri for the initial folder. So the
-	select names dialog now starts up using the same folder you used
-	last time, which is useful when you have an LDAP company directory
-	(which can't be your default contacts folder because it's
-	read-only).
-
-2002-10-21  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-component.c (IS_CONTACT_TYPE): fix the
-	sense of a strcmp
-
-2002-10-20  Chris Toshok  <toshok@ximian.com>
-
-	[ fix for #23764 ]
-	* gui/widgets/e-addressbook-view.c (jump_to_letters): handle
-	multiple letters associated with a single button.
-	(button_toggled): closure->letter -> closure->letters.
-	(free_closure): free closure->letters.
-	(create_alphabet): init closure->letters.
-
-2002-10-20  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #29067 ] 
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): we
-	need to create a card_sexp even when doing summary queries since
-	it's used to check modifications of cards in the view.
-
-2002-10-20  Chris Toshok  <toshok@ximian.com>
-
-       [ fixes #32144 ]
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as):
-	convert the name to the gtk locale before saving.
-	(e_contact_list_save_as): same.
-	
-2002-10-19  Chris Toshok  <toshok@ximian.com>
-
-	[ probable fix for #25477, and memory leak fix ]
-	* gui/contact-editor/e-contact-editor.c (supported_fields_cb): if
-	the dialog isn't in the list of all dialogs it's been destroyed so
-	just return here.
-
-	* backend/ebook/e-book.c
-	(e_book_do_response_get_supported_fields): plug leak of
-	resp->fields.
-
-2002-10-15  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_email_match_string): Return right
-	away rather than crashing if card->email is NULL.
-	(e_card_email_find_number): Likewise.
-
-2002-10-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	[ Fix #7094, #7064, #7095, #31944, #31945 ]
-	* gui/component/Makefile.am: Hook up new etspec file.
-	* gui/component/addressbook-config.c: Remove ETable spec.
-	* gui/component/addressbook-config.etspec: New file.
-	* gui/component/ldap-config.glade: Fix typo.
-	* gui/component/select-names/e-select-names.c: Remove inline spec.
-	* gui/component/select-names/e-select-names.etspec: New file.
-	* gui/contact-list-editor/Makefile.am: Hook up etspec.
-	* gui/contact-list-editor/e-contact-list-editor.c: Remove inline spec.
-	* gui/contact-list-editor/e-contact-list-editor.etspec: New file.
-	* gui/widgets/Makefile.am: Hook up new spec.
-	* gui/widgets/e-addressbook-view.c: Remove inline spec.
-	* gui/widgets/e-addressbook-view.etspec: New file.
-
-2002-10-02  Chris Toshok  <toshok@ximian.com>
-
-	[ Fix #28392 ]
-	* gui/widgets/e-addressbook-view.c (do_popup_menu): #if 0 out the
-	gal_view submenu, since it's not spec'ed to be there anyway (as
-	per bug #16250).
-
-2002-09-30  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #31321 ]
-	* backend/ebook/e-card.c (e_card_get_vobject): add VERSION:2.1 to
-	exported vCards.
-
-2002-09-30  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #31434 ]
-	* backend/pas/pas-backend-file.c (do_summary_query): always
-	retrieve the card from the db.  use the summary strictly for
-	matching, not for storing all information.  This fixes completion
-	of contact lists, since only 3 addresses were being stored and
-	contact lists can have more.
-
-2002-09-30  Aaron Weber  <aaron@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_show_multiple_cards): rephrase string on l. 213
-	
-2002-09-30  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send): update for
-	Composer_setHeaders change.
-
-2002-09-27  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #27521 ]
-	* gui/contact-editor/e-contact-quick-add.c (editor_closed_cb):
-	always unref the contact editor when we get the editor_closed
-	signal.
-
-2002-09-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (check_schema_support): set the
-	timeout to 30 seconds.
-	(query_ldap_root_dse): same, and also return the ldap_error since
-	this function is the one that actually causes openldap to
-	connect() to the ldap host.
-	(pas_backend_ldap_connect): check the return value of
-	query_ldap_root_dse, and error out if it's not SUCCESS.
-
-2002-09-26  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Change
-	folder type to "contacts/ldap".
-	(addressbook_storage_add_source): Likewise.
-	(create_ldap_folder): Check for type being "contacts" not
-	ldap contacts, since the ldap-specific type doesn't appear in the
-	menu.
-
-2002-09-25  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-component.c (folder_types): Rename
-	"ldap-contacts" to "contacts/ldap" and add "contacts/public".
-	(IS_CONTACT_TYPE): update for new types.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Use "contacts/*" for selector_types.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Likewise.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: add
-	"evolution:config_item:type" = "contacts/ldap" to the LDAP sources
-	control so it comes up by default when you open Preferences in an
-	LDAP folder.
-
-2002-09-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c (addressbook_destroy):
-	free adapter->priv.
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): free
-	model->query.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(load_completion_books): use e_book_expand_uri here, and free the
-	expanded uri after calling addressbook_load_uri, plugging a leak.
-
-	* gui/component/select-names/e-select-names.c (set_book): unref
-	esn->model before we unref esn.  fixes an edge case memory
-	corruption bug.
-	(clear_widget): utility function to set a widget's ref to NULL
-	when it's destroyed.
-	(e_select_names_init): hook the status_message, categories option
-	menu, and select_entry to clear_widget.
-	(addressbook_model_set_uri): use e_book_expand_uri.
-
-2002-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: add libeutil to the link and link with
-	libcamel instead of libcamel-static.la
-
-2002-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.h: oops, add
-	cached_folder_list to struct _ESelectNamesManager.
-
-2002-09-22  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #30481 ] 
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): initialize the select names dialog with the
-	default contacts folder.
-
-2002-09-22  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #28165, 29171 ]
-	* gui/component/select-names/e-select-names-manager.c
-	(uris_listener): check to see if the value has really changed.
-	the way the preferences dialog works is such that we'll get called
-	when any of the Folder Options are changed (default folders,
-	offline stuff, etc.)  we really only want to tear down and build
-	back up the completion books if the autocomplete folder setting
-	changed.
-	(read_completion_books_from_db): cache the folder list, and call
-	load_completion_books.
-	(load_completion_books): new function, loads from the
-	cached_folder_list.
-	(e_select_names_manager_init): init cached_folder_list to NULL.
-	(e_select_names_manager_destroy): g_free (cached_folder_list).
-
-2002-09-20  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #30483 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): argh, contains => beginswith.
-
-2002-09-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (add_creatable_item):
-	don't add the user creatable item for ldap-contact folders atm,
-	since it results in their being duplicate New Contact and New
-	Contact List menu items.
-
-2002-09-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/component/ldap-config.glade: Fix a typo.
-	
-2002-09-13  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bug #30250 ]
-	* backend/ebook/e-destination.c (e_destination_get_name): handle
-	"Unnamed Lists" here by setting their name to _("Unnamed List').
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (is_named): new
-	function, return TRUE if the name field is filled in.
-	(prompt_to_save_changes): return TRUE if the list isn't named
-	(meaning it's not saveable.)
-	(command_state_changed): saving requires a name.
-	(add_email_cb): always call command_state_changed.
-	(remove_entry_cb): same.
-	(list_name_changed_cb): same.
-	(visible_addrs_toggled_cb): same.
-	(table_drag_data_received_cb): same.
-
-2002-09-12  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): return
-	g_strdup("true"), not "true".
-
-2002-09-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): institute an arbitrary
-	minimum limit on the number of characters before we actually try
-	to autocomplete.  It's 3, btw.
-
-2002-09-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes the other half of #17336 ]
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):
-	parse the name when we're asked to set it, so the full name
-	doesn't get stored as (potentially) "Last, First" in the card.
-
-2002-09-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes part of #17336 ]
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_init): get the window title from the
-	.glade file, and supply a suitable wm icon.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_init): same.
-
-2002-09-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #30208 ]
-	* gui/component/addressbook.c (load_uri_auth_cb): if the user
-	clicked cancel in the password dialog, let them off the hook and
-	bind anonymously.  Otherwise (if they failed to auth), prompt them
-	for the password again.
-	(addressbook_authenticate): new function, split out 99% of the
-	auth machinery here so it can be called multiple times.  Also,
-	call the callback with E_BOOK_STATUS_CANCELLED if the user clicked
-	the cancel button in the dialog.
-	(load_uri_cb): call addressbook_authenticate if the book has auth
-	enabled.
-	(addressbook_load_uri): use g_new0.
-
-2002-09-05  Anna Dirks  <anna@ximian.com>
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in : Changed the 
-	description of the Directory Servers page of the settings dialog 
-	to be a little less wordy {This page can be used to configure blah--> 
-	Configure blah.}
-
-
-2002-09-04  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #29904 ]
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): we need to activate
-	either a contact list editor or contact editor depending on if
-	it's a list (this screams for a utility function.)
-
-2002-09-04  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): Pass FALSE to
-	evolution_storage_new: the Other Contacts storage doesn't support
-	shared folders.
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Pass
-	NULL as @unpopulate_folder_context_menu_fn to
-	evolution_shell_component_new().
-
-2002-09-03  Mike Kestner  <mkestner@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (e_select_names_destroy):
-	unref the "without", adapter, and model, then chain up the GnomeDialog
-	destroy function.
-
-2002-09-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Use
-	ldap-settings.png instead of evolution-contacts.png.
-
-2002-09-03  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #29699 ]
-	* gui/component/addressbook-config.c
-	(addressbook_add_server_druid): call _set_source with a NULL
-	source to fill in dialog settings that are set from the option
-	menus (like the SSL setting).
-
-2002-09-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (delete_contact_cb): Fix typo
-	[`view>view' instead of `view->view'].  Also, cast to
-	GTK_WINDOW instead of GTK_WIDGET as it should be.
-
-2002-08-30  Dan Winship  <danw@ximian.com>
-
-	* backend/idl/addressbook.idl (CallStatus): add QueryRefused, for
-	when the backend refuses to perform a query. (part of #25782)
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_convert_status): translate
-	GNOME_Evolution_Addressbook_BookViewListener_QueryRefused.
-
-	* gui/component/addressbook.c (search_result): Handle
-	E_BOOK_VIEW_STATUS_QUERY_REFUSED.
-
-2002-08-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #27923]
-	* backend/pas/pas-backend-summary.c: up the version to 4_0 (4000).
-	(pas_backend_summary_load_item): handle wants_html{_set}, list,
-	and list_show_addresses.
-	(pas_backend_summary_save_item): same.
-	(pas_backend_summary_add_card): same.
-	(pas_backend_summary_get_summary_vcard): same.
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (add_creatable_item): call
-	evolution_shell_component_add_user_creatable_item twice here, once
-	for the "contacts" folder type, and once for "ldap-contacts".
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #20347 ]
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): hook
-	up the backend_died signal.
-	(backend_died): new function, pop up an error dialog saying the
-	backend died.
-
-	* gui/widgets/e-addressbook-model.c (backend_died): new function,
-	emit the backend_died signal.
-	(e_addressbook_model_class_init): create the backend_died signal.
-	(e_addressbook_model_init): init backend_died_id
-	(e_addressbook_model_set_arg): disconnect the backend_died signal
-	from the old book and hook it up to the new book.
-
-	* gui/widgets/e-addressbook-model.h: add the backend_died signal.
-
-	* backend/ebook/e-book.c (backend_died_cb): new function, emit the
-	backend_died signal.
-	(e_book_do_response_open): create the component listener and hook
-	up the backend_died signal.
-	(e_book_destroy): disconnect the component listener and unref it.
-
-	* backend/ebook/e-book.h: add backend_died signal.
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.c (is_helper): use strcasecmp
-	here, since all the other helpers use case insensitive
-	comparisons.
-
-	* backend/pas/pas-backend-summary.c (is_helper): same.
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (category_ber): return NULL if
-	the list is empty.
-	(pas_backend_ldap_connect): always try to use ldapv3, not just
-	when we want to use tls.
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #25038 ]
-	* gui/contact-editor/Makefile.am (INCLUDES): need to have
-	EVOLUTION_ICONSDIR defined.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): same.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	set the window icon to the contact mini icon.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): set the window icon to the new
-	contact list icon.
-	
-	* gui/widgets/e-minicard.c (LIST_ICON_FILENAME): change to (the
-	prettier, imo) "contact-list-16.png"
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_search): spew
-	the filter we're using for the search.
-
-2002-08-28  Mike Kestner  <mkestner@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c : stop the
-	EBookViews before unreffing.
-
-2002-08-28  Dan Winship  <danw@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add an
-	evolution:shell_component_launch_order and rename
-	evolution:shell_component_icon.
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	[ oops, merged the .h and .glade file back to the HEAD from the
-	1-0 branch, but missed the .c file. ]
-	* gui/component/select-names/e-select-names.c (status_message): set
-	the status label's text.
-	(e_select_names_init): get the status message widget from the
-	glade ui.
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #19286 ]
-	* gui/component/addressbook.c (delete_contact_cb): confirm
-	deletion of contacts when using the menubar or toolbar.
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #28897 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_clear_book_data): set book_data to NULL
-	after clearing/freeing the list.  fixes a crash.
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #20348 ]
-	* backend/pas/evolutionperson.schema: deprecate "categories" in
-	favor of "category".  evolution no longer uses "categories".
-
-	* backend/pas/pas-backend-ldap.c (category_populate): new
-	function, "category" is the new name, and it's multivalued so we
-	need the complex-prop stuff..
-	(category_ber): new function, same.
-	(category_compare): new function, same.
-
-	* gui/component/addressbook.c (addressbook_search_activated): the
-	text is "Category is" so we should use "is" instead of "contains"
-	for the query.
-
-2002-08-27  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #14835 ]
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_search):
-	notify_complete with InvalidQuery if the parse fails.
-
-2002-08-27  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #26907 ]
-	* gui/component/addressbook.c (addressbook_search_activated): use
-	beginswith for email.
-
-2002-08-26  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c (complete_sequence): change prototype
-	for complete_sequence to match sequence_complete.
-	(e_contact_print_button): same.
-
-2002-08-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #29446 ]
-	* gui/component/addressbook-config.c (scope_optionmenu_activated):
-	searching_modify_func can be NULL (since we don't require changes
-	to enable the "Next" button on this page when you create a
-	directory server.)
-
-2002-08-26  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes (almost certainly) #24649, #25494, #27351, and other LDAP search crashes ]
-	* backend/pas/pas-backend-ldap.c (view_destroy): use an EList
-	instead of a GList to store the book_view's so we don't have weird
-	issues with modifying the list while it's being traversed.
-	(find_book_view): same.
-	(create_card_handler): same.
-	(remove_card_handler): same.
-	(modify_card_modify_handler): same.
-	(poll_ldap): same, and also ref the book_view before calling
-	ldap_search_op_timeout (and therefore send_pending_adds).
-	(ldap_search_handler): same.
-	(ldap_op_add): warn about conflicting ldap msgid's (shouldn't ever
-	happen..)
-	(homephone_populate): make this a bit more robust (if values[0] ==
-	NULL, values[1] won't be valid).
-	(business_populate): same.
-	(build_card_from_entry): break out of the prop_info loop when we
-	get a match, and only set the simple field if the value != NULL.
-	(ldap_search_dtor): free all the pending adds stuff.
-	(pas_backend_ldap_process_get_book_view): g_list_prepend =>
-	e_list_append.
-	(pas_backend_ldap_remove_client): simplify the removing of the
-	book (use g_list_remove instead of searching and then using
-	g_list_remove_link.)
-	(pas_backend_ldap_destroy): unref the book_views list.
-	(pas_backend_ldap_init): initialize the EList for book_views.
-
-2002-08-25  Mike Kestner  <mkestner@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (remove_book_view): stop the
-	view before unref, in case the listener has pending events.
-
-2002-08-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): not sure what i was
-	thinking here... the EBook isn't valid if we couldn't open it, so
-	we can't turn around and query it for its capabilities.
-
-2002-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.h: add the
-	listener_id slot.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): store off the listener_id.
-	(e_select_names_manager_destroy): remove the bonobo listener -
-	fixes a crash when modifying the completion folders after you
-	bring up a compose window.
-	(e_select_names_manager_entry_new): another random timeout change
-	- make the completion at 100ms.
-
-2002-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-view.c (pas_book_view_notify_complete):
-	take and pass the CallStatus to our listener.
-
-	* backend/pas/pas-book-view.h: change the prototype for
-	notify_complete to include the CallStatus.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_seq_complete_cb): add the status arg.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): init the search_result signal.
-	(e_addressbook_view_init): connect to the model's search_result
-	signal.
-	(emit_search_result): emit our search_result signal.
-	(search_result): call emit_search_result.
-
-	* gui/widgets/e-addressbook-view.h (struct
-	_EAddressbookViewClass): add the search_result signal.
-
-	* gui/widgets/e-addressbook-model.c (sequence_complete): emit both
-	a "search_result" as well as the "stop_state_changed" signal.
-	(e_addressbook_model_class_init): init the search_result signal.
-
-	* gui/widgets/e-addressbook-model.h: add search_result signal.
-
-	* gui/component/addressbook.c (search_result): pop up a dialog
-	telling the user why the search failed or was truncated.
-	(addressbook_factory_new_control): connect to the "search_result"
-	signal on the view.
-
-	* conduit/address-conduit.c (sequence_complete): add the status
-	parameter to sequence_complete.
-
-	* backend/idl/addressbook.idl: add BookViewListener_CallStatus,
-	and change notifySequenceComplete to take a CallStatus.
-
-	* backend/pas/pas-backend-ldap.c (create_card_handler): pass
-	status back in the notify_complete call.
-	(remove_card_handler): same.
-	(modify_card_modify_handler): same
-	(ldap_search_handler): same, and parse out the ldap return code so
-	we can report limits being properly.
-
-	* backend/pas/pas-backend-file.c (do_summary_query): pass status
-	back in the notify_complete call.
-	(pas_backend_file_search): same, and get rid of the
-	status_message, as the status is passed back properly.
-	(pas_backend_file_search): pass status
-	back in the notify_complete call.
-	(pas_backend_file_changes): same.
-	(pas_backend_file_process_create_card): same.
-	(pas_backend_file_process_remove_card): same.
-	(pas_backend_file_process_modify_card): same.
-
-	* backend/ebook/e-book-util.c (simple_query_sequence_complete_cb):
-	add status parameter.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_status_event): change name from
-	_queue_empty_event, and take a status arg.
-	(e_book_view_listener_queue_id_event): init resp->status (to
-	SUCCESS).
-	(e_book_view_listener_queue_sequence_event): same.
-	(e_book_view_listener_queue_message_event): same.
-	(impl_BookViewListener_notify_sequence_complete): call
-	queue_status_event, and convert the corba status to
-	EBookViewStatus.
-	(e_book_view_listener_convert_status): new function, conver the
-	corba status to EBookViewStatus.
-
-	* backend/ebook/e-book-view-listener.h: add a "status" slot to
-	EBookViewListenerResponse.
-
-	* backend/ebook/e-book-view.h: change prototype for
-	sequence_complete signal.
-
-	* backend/ebook/e-book-view.c (e_book_view_do_complete_event):
-	sequence_complete takes a parameter now (EBookViewStatus).
-	(e_book_view_class_init): add the enum arg to the signal.
-
-	* backend/ebook/e-book-types.h: add EBookViewStatus enum.
-
-2002-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_static_capabilities): add
-	"cache-completions" here, since file completion results are
-	blanket cached (as they're generated from a summary).
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_cursor): there should be no search
-	limit on the get_cursor_request, as it's meant to match every card
-	it can.
-	(ldap_search_handler): parse the ldap result in the
-	RES_SEARCH_RESULT case.  we'll want more here soon, so we can
-	notify the front end if the result was truncated due to either the
-	size or time limit being exceeded.
-	(pas_backend_ldap_process_get_book_view): in the case of a
-	completion view, we hardcode (yeah yeah, i know, but really) the
-	search limit to MIN (100, user-specified-limit).
-	(pas_backend_ldap_search): each view has its own limit now,
-	defaulting from the user specified one for normal searches but
-	possibly different for completion views.  use the view's limit
-	here.
-
-2002-08-19  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): add an "addresses" property, to get the
-	"Dan Winship <danw@ximian.com>" form, as opposed to "text", which
-	gets you what's displayed, which might be just "Dan Winship".
-	(entry_set_property_fn): When setting, just reuse the "text" code,
-	since it should properly cardify everything for us anyway.
-	(impl_SelectNames_get_entry_for_section): Add the property.
-
-2002-08-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fix c&p error that was
-	losing the ssl setting.
-
-2002-08-16  Iain <iain@ximian.com>
-
-	* backends/e-book/evolution-ldif-importer.c (ebook_create): Use the
-	default EBook instead of the local one.
-
-	* backends/e-book/evolution-vcard-importer.c (ebook_create): Ditto.
-
-2002-08-16  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (book_view_notify_status): new
-	function to save a little typing.
-	(find_book_view): same.
-	(pas_backend_ldap_connect): reorder things a bit - set the version
-	to VERSION3 *before* doing TLS, as tls requires v3, and if we're
-	doing ldaps://, do tls a little differently (not sure if this is
-	strictly necessary, but the openldap source did it..  *shrug*).
-	also, guard the schema check as this function can be called
-	multiple times for the same server (if the server goes down or
-	times us out.)
-	(pas_backend_ldap_reconnect): new function, reconnect and if
-	necessary reauth the user.
-	(pas_backend_ldap_process_create_card): use
-	find_book_view/book_view_notify_status/pas_backend_ldap_reconnect.
-	(pas_backend_ldap_process_remove_card): same.
-	(pas_backend_ldap_process_modify_card): same.
-	(pas_backend_ldap_process_get_vcard): same.
-	(pas_backend_ldap_process_get_cursor): same.
-	(pas_backend_ldap_search): same.
-	(poll_ldap): reconnect if ldap_result returns -1.
-	(pas_backend_ldap_process_authenticate_user): ick ick ick save off
-	the dn/passwd we auth with so we can use them to reauthenticate.
-
-2002-08-16  Chris Toshok  <toshok@ximian.com>
-
-	[ fix 27333 ]
-	* gui/widgets/e-addressbook-model.c (get_view): "local" ->
-	"do-initial-query".
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_static_capabilities): "local" ->
-	"local,do-initial-query".
-
-	* gui/widgets/e-addressbook-model.c (get_view): "local" ->
-	"do-initial-query".
-
-	* gui/component/addressbook.c (book_open_cb): Only assume the
-	addressbook is local if "local" appears in its static
-	capabilities.  We still use the ldap special case, but be nicer to
-	other networked backends.
-
-2002-08-12  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-component.c (user_create_new_item_cb):
-	If invoked from a non-contact folder, add the contact to the
-	default contact folder, not the local one. If invoked from a
-	contact folder, don't append "addressbook.db" to the URI, let
-	ebook do the right thing. Fixes #28327 and #28325.
-
-	* backend/idl/addressbook.idl (CallStatus): Add NoSuchBook.
-	(Initially intended as part of a fix for #28327, but the other
-	changes make it so the error code never ends up getting used any
-	more, but it's still good to have.)
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	Handle NO_SUCH_BOOK.
-
-	* backend/ebook/e-book-types.h (EBookStatus): Add
-	E_BOOK_STATUS_NO_SUCH_BOOK.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): add case for NoSuchBook.
-
-	* backend/ebook/e-book-util.c (e_book_load_local_address_book):
-	Kill this. Nothing should ever explicitly load the local
-	addressbook.
-	(e_book_use_default_book): Replaces e_book_use_local_address_book,
-	using the default book instead.
-	(e_book_default_book_open): Fall back to local contact folder on
-	E_BOOK_STATUS_NO_SUCH_BOOK too.
-	(e_book_query_address_default): Use default book, not local.
-
-	* gui/component/e-address-widget.c (query_idle_fn): Use the
-	default book, not the local book.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(edit_contact_info_cb): Use the default book, not the local book.
-
-	* backend/ebook/e-destination.c (e_destination_cardify): Use the
-	default book, not the local book.
-	(e_destination_touch): Query the default book, not the local book.
-
-	* backend/ebook/e-card-compare.c (e_card_locate_match,
-	e_card_locate_match_full): Use the default book, not the local
-	book.
-
-2002-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-summary.c (pas_backend_summary_init):
-	initialize summary->upgraded to quiet valgrind.
-
-2002-08-06  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/test-client.c (TEST_VCARD): Use "\r" rather than
-	including literal CRs in the string, which confuses gcc on OS X.
-
-	* backend/ebook/test-card.c (TEST_VCARD): Likewise.
-
-2002-08-01  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #25958 ]
-	* gui/component/addressbook.c (alphabet_state_changed): use
-	FULL_NAME in the case where we're untoggling a letter, and... well
-	use FULL_NAME in the other case too - we should never pop up the
-	advanced dialog.
-
-2002-08-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): no more search_entry.
-
-	* gui/component/select-names/e-select-names.c (update_query): no
-	more search_entry, search_entry => select_entry, and add file_as
-	to the query since some entries don't have names (like the Ximian,
-	Inc. default card.)
-	(e_select_names_init): no more search_entry, and add an "activate"
-	handler on select_entry that updates the query.
-
-2002-08-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): remove folders and folders_by_uri, and the 2
-	listeners.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_destroy): remove the hash_table_destroys of
-	folders and folders_by_uri, since they no longer exist.  same for
-	other_contacts_listener and local_listener.
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Use
-	"contact-list-16.png" for the "New Contact List" item.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Change
-	the order so that "New Contact" is first and "New Contact List" is
-	next.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (add_creatable_item): Pass
-	"contacts" as the @folder_type to
-	evolution_shell_component_add_user_creatable_item().
-
-2002-07-31  Chris Toshok  <toshok@ximian.com>
-
-	[ roll in the following change from the 1.0 branch.]
-	* backend/pas/pas-backend-ldap.c:
-	(prop_info): change the CALURI and FBURL ecard attributes to map to the
-	RFC 2739 specified attributes.
-        (check_schema_support): check to see if calEntry is supported.
-        (add_objectclass_mod): insert calEntry if it's supported.
-	* backend/pas/evolutionperson.schema: deprecate freeBusyURI
-	and calendarURI.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch by Jacob Berkman <jacob@ximian.com>, fixes #25968]
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): Don't
-	double free protocol and query.
-
-2002-07-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-summary.c (save_string): don't save
-	empty strings.
-	(pas_backend_summary_save): print out the errno when we fail.
-
-2002-07-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Don't set up the ContactNew and
-	ContactNewList verbs.
-	(update_command_state): Don't set the sensitivity of
-	/commands/ContactNew and /commands/ContactNewList anymore.
-	(new_contact_cb): Removed.
-	(new_contact_list_cb): Removed.
-
-2002-07-24  Peter Williams  <peterw@ximian.com>
-
-	* conduit/Makefile.am (libeaddress_conduit_la_LIBADD): Change
-	libversit.la -> libversit.a for danw's changes.
-
-2002-07-24  Dan Winship  <danw@ximian.com>
-
-	* conduit/Makefile.am (libeaddress_conduit_la_LIBADD):
-	s/libversit_lt/libversit/
-
-2002-07-22  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/Makefile.am: Split pas-backend-file and
-	pas-backend-ldap out of libpas and build them as separate (noinst)
-	libraries libpasfile.a and libpasldap.a. This gets the db3 and
-	LDAP dependencies out of libpas, and people trying to create an
-	addressbook backend shouldn't be calling functions from the
-	existing backends anyway so there's no reason to install them.
-
-2002-07-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/select-names.glade: remove the option
-	menu and browse button, and add a custom widget placeholder for
-	the folder-selector.
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): move the "append /addressbook.db"
-	stuff here.
-	(e_addressbook_create_ebook_table): remove the code setting
-	initial uri from here.
-	(e_select_names_folder_free): gone.
-	(e_select_names_option_activated): gone.
-	(add_menu_item): gone.
-	(update_option_menu): gone.
-	(new_folder): gone.
-	(removed_folder): gone.
-	(folder_browse): gone.
-	(hookup_listner): gone.
-	(add_additional_select_names_uris): gone.
-	(e_select_names_hookup_listners): gone.
-	(e_addressbook_create_folder_selector): new function, create the
-	folder selector button.
-	(folder_selected): new function, callback for the folder selector.
-	just calls addresbook_model_set_uri.
-	(e_select_names_init): get the folder selector and initialize it
-	to show /local/Contacts.  also, set the model's uri here to the
-	same folder.  nuke the code involving the old option menu and
-	browse button.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* backend/ebook/Makefile.am: Install libebook-static.la. 
-	Also change --all-static to -all-static, which is the right flag.
-	
-	* backend/pas/Makefile.am: Install the PAS headers in 
-	$(includedir)/evolution/pas. Install libpas.a
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* gui/component/select-names/Makefile.am (idl_DATA): Install the
-	SelectNames IDL and ancillary changes.
-
-2002-07-12  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-summary.c (free_summary_item): free the
-	full_name (as well as given_name.  oops.)
-	(pas_backend_summary_new): new summaries are version 3.0 now.
-	(pas_backend_summary_load_item): all loaded summaries should be
-	3.0+, as we fail to load versions lower than that.
-	(pas_backend_summary_load_header): if the summary isn't version
-	3.0 fail out, as we need to rebuild the entire file to cache the
-	full_name fields.
-	(pas_backend_summary_save_item): save out the full_name.
-	(pas_backend_summary_add_card): put the item's full_name in the
-	card.
-
-2002-07-12  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Make the
-	ENTRY_PROPERTY_ID_SIMPLE_CARD_LIST case not crash, although
-	there's still something wrong.
-
-2002-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): e_book_get_book_view =>
-	e_book_get_completion_view, so the backends have the option of
-	using a pregenerated summary.
-
-2002-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-summary.c (clear_items): actually remove
-	the items from the pointer array too, so an error while loading
-	doesn't leave the memory summary corrupted.
-	(pas_backend_summary_load_header): bleah, load the num_items and
-	summary_mtime in the right order :) Also, set upgraded to TRUE if
-	we loaded a v1.0 summary.
-	(pas_backend_summary_open): make this return a gboolean, return
-	TRUE if the summary is already open (priv->fp != NULL).  return
-	FALSE in error conditions.
-	(pas_backend_summary_load): if summary_open returns FALSE, return
-	FALSE, also set the dirty flag to FALSE after we load, and if the
-	summary was upgraded write it out.
-	(pas_backend_summary_save): update the in memory mtime to that of
-	the file when we save.
-	(summary_flush_func): if we're not dirty, do nothing and return.
-	(pas_backend_summary_is_up_to_date): make sure we've opened the
-	summary.
-	(pas_backend_summary_get_summary_vcard): fix compiler warning.
-
-2002-07-10  Peter Williams  <peterw@ximian.com>
-
-	* backend/ebook/e-book-view-listener.h: Oops, missed this one.
-
-	* backend/ebook/Makefile.am (libebookinclude_HEADERS): Also
-	put addressbook.h here because several headers reference it.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* backend/ebook/e-book.h: Normalize includes to <ebook/foo.h>, so
-	that the installed headers will work sanely.
-
-	* backend/ebook/e-card-cursor.h:
-	* backend/ebook/e-book-view.h:
-	* backend/ebook/e-card-simple.h:
-	* backend/ebook/e-card.h:
-	* backend/ebook/e-destination.h: Same.
-
-	* printing/Makefile.am (INCLUDES): add -Iaddressbook/backend
-	to access the ebook headers. Also the builddir version to get
-	the generated addressbook.h
-
-	* conduit/Makefile.am (INCLUDES): Same.
-
-	* gui/widgets/Makefile.am (INCLUDES): Same builddir fix.
-
-	* gui/merging/e-card-merging.c: Fix an ebook #include.
-
-	* gui/merging/Makefile.am (INCLUDES): Same idea.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): Same.
-
-	* gui/contact-editor/Makefile.am (INCLUDES): Same builddir
-	change.
-
-2002-07-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Pass
-	zero as the @sorting_priority to evolution_storage_new_folder().
-	(addressbook_storage_add_source): Likewise.
-
-2002-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add Book.getCompletionView.
-
-	* backend/ebook/e-book.c (e_book_get_completion_view): new
-	function, basically c&p of e_book_get_book_view, but call
-	getCompletionView.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_get_completion_view.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_client_requests): add a
-	GetCompletionView case here that just calls the same code as
-	GetBookView (since we don't build summaries for the ldap backend.)
-
-	* backend/pas/pas-backend-file.c (do_summary_query): add
-	@completion_search.  If it's TRUE, just create the vcards from the
-	summary using pas_backend_summary_get_summary_vcard instead of
-	looking them up from the db.
-	(pas_backend_file_search): add @completion_search and pass it on
-	to do_summary_query.
-	(pas_backend_file_process_get_book_view): pass FALSE to
-	pas_backend_file_search.
-	(pas_backend_file_process_get_completion_view): new function,
-	basically c&p pas_backend_file_process_get_book_view, but pass
-	TRUE to pas_backend_file_search.
-	(pas_backend_file_process_client_requests): add a case for
-	GetCompletionView.
-	(pas_backend_file_load_uri): track the change to the summary api -
-	create the summary filename
-
-	* backend/pas/pas-book.c (pas_book_queue_get_completion_view): new
-	function, queue a GetCompletionView request to our queue.
-	(impl_GNOME_Evolution_Addressbook_Book_getCompletionView): new
-	function, call pas_book_queue_get_completion_view.
-	(pas_book_respond_get_completion_view): new function, just call
-	notifyViewRequested.
-	(pas_book_free_request): add a case for GetCompletionView.
-	(pas_book_get_epv): fill in epv->getCompletionView.
-
-	* backend/pas/pas-book.h: add a GetCompletionView PASOperation,
-	and a new structure (PASGetCompletionViewRequest).  Also, add
-	get_completion_view to PASRequest.
-
-	* backend/pas/pas-backend-summary.c (clear_items): remove the
-	items from the hash table.
-	(pas_backend_summary_new): db_path -> summary_path.
-	(pas_backend_summary_destroy): db_.path -> summary_path, and
-	destroy the hash table.
-	(pas_backend_summary_init): db_path = summary_path, and initialize
-	the id_to_item hashtable.
-	(pas_backend_summary_load_header): handle the upgrading from
-	version 1.0 to version 2.0 (the addition of an mtime field in the
-	header)
-	(pas_backend_summary_load_item): version 1.0 and 2.0 have the same
-	format for items.
-	(pas_backend_summary_open): new function.  open the summary so we
-	can load the header (and get the mtime).
-	(pas_backend_summary_load): rework this a bit since the header has
-	already been loaded, and also add the items to the hashtable.
-	(pas_backend_summary_add_card): add the new item to the hashtable.
-	(pas_backend_summary_remove_card): remove the item from the hash
-	table.
-	(pas_backend_summary_is_up_to_date): new function, chekc @t
-	against the summary's mtime.
-	(pas_backend_summary_get_summary_vcard): create a vcard from the
-	fields we have in the summary.
-
-	* backend/pas/pas-backend-summary.h: add prorotypes for
-	pas_backend_summary_is_up_to_date and
-	pas_backend_summary_get_summary_vcard.
-
-2002-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Pass
-	NULL @custom_icon_name to evolution_storage_new_folder().
-	(addressbook_storage_add_source): Likewise.  [Note we could be
-	passing a nice custom here. ;-)]
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (add_creatable_item): New
-	arg @tooltip; pass it to
-	evolution_shell_component_add_user_creatable_item() [which now has
-	a @tooltip arg].
-
-2002-06-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add
-	pas-backend-summary.[ch].
-
-	* backend/pas/pas-backend-file.c (string_to_dbt): move this to the
-	top of the file so it can be used in..
-	(build_summary): loop over the db, adding cards ot the summary.
-	(do_summary_query): call pas_backend_summary_search and loop over
-	the returned id's looking them up in the db.
-	(pas_backend_file_search): call
-	pas_backend_summary_is_summary_query, and either call
-	do_summary_query if it's a query over just the set of attributes
-	in the summary or use the old, slow method if not.
-	(pas_backend_file_process_create_card): call
-	pas_backend_summary_add_card.
-	(pas_backend_file_process_remove_card): call
-	pas_backend_summary_remove_card.
-	(pas_backend_file_process_modify_card): call remove_card/add_card.
-	(pas_backend_file_load_uri): try to load the summary file, and if
-	it doesn't exist create it.
-	(pas_backend_file_destroy): unref the summary.
-
-	* backend/pas/pas-backend-summary.[ch]: new files, reading and
-	writing (and querying) summaries.
-
-2002-06-27  Sean Atkinson  <sean@cantab.net>
-
-        * gui/component/addressbook-config.c (query_for_supported_bases):
-        don't unref selection_model (otherwise 3 clicks of
-        "Show Supported Bases" crashes if LDAP server isn't running).
-
-2002-06-25  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component):
-	reorder the adding of creatable items so the default is a new
-	contact, not a new contact list.
-
-2002-06-21  Sean Atkinson  <sean@cantab.net>
-
-	* gui/component/addressbook-config.c (addressbook_edit_server_dialog):
-	remove source argument (get it from the dialog).
-	(edit_source_clicked): same.
-	(sources_table_double_click): added to edit server by double-clicking.
-	(ldap_dialog_new): use sources_table_double_click.
-
-2002-06-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_save_as):
-	pass NULL to e_contact_list_save_as.  modality sucks.  fixes
-	broken build.
-	(save_as): same.
-
-2002-06-15  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #26130 ]
-	* gui/contact-editor/e-contact-editor.c (file_save_as_cb): pass
-	ce->app as parent_window.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(file_save_as_cb): same .
-
-	* gui/contact-editor/e-contact-save-as.c (e_contact_list_save_as):
-	if a parent_window is specified, the file selector should be
-	modal/transient for that window.
-	(e_contact_save_as): same.
-
-	* gui/contact-editor/e-contact-save-as.h: track prototype changes
-	(addition of GtkWindow *parent_window to both calls.)
-	
-2002-06-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): use
-	ldap_unbind_ext.
-	(create_card_handler): don't leak the new vcard.
-	(pas_backend_ldap_process_authenticate_user): don't leak the dn.
-
-2002-06-14  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): up the
-	max threshold to 3000 cards from 1000 cards.. seems to improve
-	performance a bit.  also remove the g_list_reverse since it
-	doesn't matter what order the cards arrive to the gui.
-	(pas_backend_file_changes): plug memory leaks.
-
-2002-06-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (compare_email_addresses): Made
-	"" compare as not equal to "" for addresses.
-	(use_common_book_cb): Don't bother checking for nickname here
-	since we don't use it as a match later.  Don't add "" as an
-	address to the list of query parts.
-
-2002-06-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	Don't enable fields if the editor isn't editable and the
-	widget_field_mappings lists this field as being desensitize for
-	read only.
-
-2002-06-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #17332 ]
-	* backend/ebook/e-book.c (e_book_get_static_capabilities): we
-	shouldn't ever return NULL here.  in error cases we need to return
-	g_strdup("");
-
-2002-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): Made
-	double clicking on read only folders not do anything.
-
-2002-06-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_expand_uri): Made expand_uri
-	a bit more robust and readable.
-	(e_book_get_default_book_uri): Made e_book_get_default_book_uri
-	use e_book_expand_uri if using the bonobo_config value.
-
-	* gui/component/e-address-popup.c (start_query): Handle the
-	failure state here by acting as if there are no matches.
-
-2002-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Call
-	e_minicard_selected in the GDK_BUTTON_RELEASE case here.
-	(e_minicard_drag_begin): Set E_REFLOW (parent)->maybe_in_drag =
-	FALSE if it's an EReflow.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_book_ready): Commented out this unused
-	function.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(open_book_cb): Ref if we're keeping the book.  Don't unref if
-	we're not keeping the book.
-	(clean_cb): Commented out this unused function.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (init_collection): Set the
-	title of our GalVIewCollection.
-
-2002-05-29  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/component/select-names/select-names.glade: Changed some spacing 
-	and expanding behavior to make this dialog behave more like I intended 
-	to. 
-
-2002-05-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (CONFIG_CONTROL_FACTORY_ID):
-	put this back in, accidentally got snipped with the hacking going
-	on in here.
-
-2002-05-24  Chris Toshok  <toshok@ximian.com>
-
-	[ part of #25047 ]
-	* gui/component/addressbook-config.c: remove the autocompletion
-	config control from here, as it lives in the shell now.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: same.
-
-2002-05-24  Chris Toshok  <toshok@ximian.com>
-
-	[ #24189 ]
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_out_cb): ifdef out the body of this because it only works
-	with a single completion book.  not sure what to do here, but it
-	doesn't impact most usage scenarios.
-	(completion_popup_cb): same.
-	(e_select_names_manager_entry_new): add the books that have been
-	loaded successfully by the time this entry is created.
-	(open_book_cb): add the opened book to the entries that have
-	already been created, and store it in our list so that entries
-	that are created in the future can catch up.
-	(read_completion_books_from_db): slurp in the folder list from the
-	config db and load all the uris.
-	(uris_listener): listener function - when there's a change it
-	calls _clear_books on all the created entries, and clears our
-	list.  It then re-reads the books from the db.
-	(e_select_names_manager_new): create our bonobo listener and call
-	read_completion_books_from_db.
-	(e_select_names_manager_init): init completion_books.
-	(e_select_names_manager_destroy): free our list of
-	completion_books.
-
-	* gui/component/select-names/e-select-names-manager.h: switch from
-	a single EBook to a GList of completion_books here.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_add_book): deal with the case where
-	there's an active query (by effectively restarting it.)  This is
-	quite a contrived edge case.
-	(e_select_names_completion_clear_books): stop the current query
-	and clear our list of books.
-	(e_select_names_completion_new): track change to prototype, and
-	axe the majority of this method since an EBook* isn't passed
-	anymore.
-	(e_select_names_completion_clear_book_data): split this code out
-	from the destroy method so it can be called from _clear_books.
-
-	* gui/component/select-names/e-select-names-completion.h: the
-	constructor no longer takes an EBook -- pass in as many as you
-	want using _add_book.  Also, add prototype for _clear_books.
-
-	* gui/component/addressbook.c (load_uri_cb): when
-	storing/retrieving passwords, use the cleaned (without params)
-	version of the uri, so changing things like download limit don't
-	cause the user to be prompted for a password again.
-
-	* gui/component/addressbook-component.c
-	(ensure_completion_uris_exist): new function - probably doesn't
-	belong in this file.  Make sure the basic local Contacts folder
-	exists in the completion uris.
-	(addressbook_component_factory_init): call
-	ensure_completion_uris_exist.
-
-	* backend/ebook/e-book-util.h: add prototype for
-	e_book_get_default_book_uri.
-
-	* backend/ebook/e-book-util.c (e_book_get_default_book_uri): new
-	function, just return the default contacts uri.
-	(e_book_load_default_book): change
-	to use e_book_get_default_book_uri.
-
-2002-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_root_dse_query):
-	fix parameter/local variable overloading.
-
-2002-05-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (load_uri_cb): Don't try to invoke
-	e_book_get_uri() on NULL.  Fixes #25069.
-
-2002-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	make sure we map status -> string correctly (add missing strings).
-
-	* backend/ebook/e-book-types.h (EBookStatus): add the missing
-	AUTHENTICATION_REQUIRED status code, to map to the idl response.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): make sure we map all idl status
-	codes to EBookStatus statuses.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Pass
-	FALSE for @sync_offline to evolution_storage_new_folder().
-	(addressbook_storage_add_source): Pass FALSE for @sync_offline to
-	evolution_storage_new_folder().
-
-2002-05-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (request_quit): New, quit
-	handler for the EvolutionShellComponent.
-	(add_creatable_item): Set it up.
-
-	* gui/contact-editor/e-contact-list-editor.c
-	(e_contact_list_editor_request_close_all): New.
-	(e_contact_list_editor_new): Put the contact editor in a static
-	list and gtk_object_weakref() it.
-	(contact_list_editor_destroy_notify): New, GtkDestroyNotify
-	function for the contact editors.
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_request_close_all): New.
-	(e_contact_editor_new): Put the contact editor in a static list
-	and gtk_object_weakref() it.
-	(contact_editor_destroy_notify): New, GtkDestroyNotify function
-	for the contact editors.
-
-2002-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Pass
-	NULL as @request_quit_fn.
-
-2002-05-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/idl/addressbook.idl: Removed an incorrect comment here.
-
-2002-05-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	Enable the dropdown widgets even if the contact is not editable so
-	that you can view any email address, phone number, or postal
-	address on read only contacts.
-
-2002-05-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	Added SimpleCard interface.
-
-	* gui/component/select-names/Makefile.am: Added
-	e-simple-card-bonobo.c and e-simple-card-bonobo.h.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Added SIMPLE_CARD_LIST arg.
-
-	* gui/component/select-names/e-simple-card-bonobo.c,
-	gui/component/select-names/e-simple-card-bonobo.h: New class to
-	represent an ECardSimple across Bonobo.
-
-2002-05-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Added "first_email" property.
-
-2002-05-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): Pass %FALSE as
-	@has_shared_folders to evolution_storage_new().
-
-2002-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: link against the libtool version of
-	libversit
-
-2002-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_control_new): oops, add the NULL back at the
-	end of possible_types.
-
-2002-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_ldap_init):
-	bleah, need to pass the GtkWindow here so we can pop up the a
-	modal parented dialog (gtk modal dialogs suck?).
-	(addressbook_ldap_auth): same.
-	(addressbook_root_dse_query): same.
-	(do_ldap_root_dse_query): same.
-	(addressbook_config_control_new): add "ldap-contacts" to the list
-	of possible types.
-
-2002-05-07  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c (create_ldap_folder):
-	s/ldap_config/addressbook_config/
-
-2002-05-03  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): finally
-	remove the #if 0's and use the oaf query stuff to get backends
-	that handle specific protocols.
-
-2002-05-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_folder_list_changed_callback): Call
-	evolution_config_control_changed when the EFolderList changes.
-
-2002-05-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Updated this
-	to have the ConfigControlFactory have an addressbookwide generic
-	name and added OAFIID:GNOME_Evolution_Addressbook_ConfigControl.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES),
-	gui/component/addressbook-component.c,
-	gui/component/addressbook-storage.c, gui/component/addressbook.c:
-	Replaced ldap-config.c and ldap-config.h with addressbook-config.c
-	andaddressbook-config.h.
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h: Based on ldap-config.c and
-	ldap-config.h.  Added a folder list control.  Made this a multi
-	factory.
-
-	* gui/component/ldap-config.c, gui/component/ldap-config.h:
-	Replaced these with addressbook-config.c and addressbook-config.h.
-
-2002-05-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (selection_change):
-	Desensitize the to, cc, and bcc buttons if there's no selection
-	here.  Fixes Ximian bug #21482.
-
-2002-05-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (verbs): Changed
-	some of these to bind to the ContactListEditor verbs since they're
-	marked as that in the ui file.  Fixes Ximian bug #13034.
-
-2002-04-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/Makefile.am (EXTRA_DIST): fix
-
-2002-04-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h
-	(e_addressbook_model_peek_card): Added this function so that there
-	would be less duplication of cards during run time when
-	duplication is unnecessary.
-
-	* gui/widgets/e-addressbook-view.c: Cleaned up get_card_list and a
-	number of associated functions to be much more uniform and
-	simpler.
-	(get_has_email_address): Don't show the "Send Message to Contact"
-	menu item if there are no email addresses in the listed contacts.
-	Fixes bug #1298.
-
-2002-04-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send): Changed this to set a
-	subject when sending a contact.  This makes the signature be set
-	properly also.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* printing/Makefile.am: Don't link to libibex anymore.
-
-	* conduit/Makefile.am: Same.
-
-	* backend/ebook/Makefile.am: Again here.
-
-	* gui/component/Makefile.am: And finally here.
-
-2002-04-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_child_free): Unref the text_model here instead of
-	the model, since the model never gets set.  Removed the model
-	field since it's no longer used.
-
-2002-04-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/ldap-config.c: Updated this for the new
-	e_table_memory_store_insert function prototype.
-
-2002-04-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/select-names.glade (folder_browse):
-	Added a "Browse..." button to switch to a different addressbook
-	folder.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Moved extern EvolutionShellClient out of this function so that
-	it'd be more readable.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Coded handling of the
-	select_entry to search within the displayed contacts.
-
-	* gui/component/select-names/select-names.glade: Updated this
-	dialog to have an entry-select instead of an entry-find.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/select-names.glade: Updated this
-	dialog to match the redesign.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (do_popup_menu): Make unused
-	menu items disappear instead of graying out.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c,
-	gui/widgets/e-addressbook-reflow-adapter.h: Removed
-	e_addressbook_reflow_adapter_right_click and
-	e_addressbook_reflow_adapter_base_right_click.
-
-	* gui/widgets/e-addressbook-view.c: Handle right click menu for
-	both types of view.  Merged right click on white space with right
-	click on main area.  General clean up.
-
-	* gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h: Removed a couple unnecessary
-	functions.  Added e_minicard_view_widget_get_view.  Added
-	right_click signal.
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Added the right_click signal and the e_minicard_view_get_card_list
-	function.
-
-2002-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.h: Removed an unused
-	variable here.
-
-	* gui/widgets/e-addressbook-view.c (table_right_click,
-	table_white_space_event): Added a current view submenu to the
-	popup menu here.
-
-2002-04-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_begin):
-	Allow GDK_ACTION_COPY also, since the composer for example does
-	not accept MOVE's. Completes bug #8448.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/ldap-config.glade: change order of scope option
-	menu to match how it's stored.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: change ldap
-	config control text so it fits in the config dialog.
-
-	* gui/component/ldap-config.c: #ifdef lots of stuff HAVE_LDAP so
-	it'll build/run in either case.
-	(addressbook_source_dialog_destroy): rename
-	addressbook_add_server_druid_destroy to this, and free lots more
-	stuff.
-	(addressbook_add_server_druid):
-	addressbook_add_server_druid_destroy ->
-	addressbook_source_dialog_destroy.
-	(do_schema_query): add 3 second timeout to schema query.
-	(addressbook_edit_server_dialog): hook up destroy signal.
-	(config_control_new): if HAVE_LDAP isn't defined, put up a label
-	saying so.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (INCLUDES): add LDAP_CFLAGS to INCLUDES
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): no more
-	source->type.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/ldap-config.c (addressbook_dialog_get_source):
-	fill in source->ssl.
-	(addressbook_source_dialog_set_source): set up auth/scope/ssl
-	option menus properly.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_init_source_uri): always include the
-	limit/ssl in the uri so we don't need to rely on defaults
-	everywhere.
-	(ldap_source_foreach): store the ssl option.
-
-	* gui/component/addressbook-storage.h: reorder SSLType to match
-	the UI.
-
-	* backend/pas/pas-backend-ldap.c: (struct _PASBackendLDAPPrivate)
-	add field for ldap_timeout.
-	(pas_backend_ldap_connect): reorder things a bit - we need to
-	start tls before the root dse query, if we can.
-	(pas_backend_ldap_load_uri): track the way ssl parameters are
-	given in the uri, and parse out the timeout.
-
-	* gui/component/ldap-config.c (port_changed_func): use the
-	symbolic SSL name instead of an integer constant.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (get_ldap_library_info): fix
-	memory leaks.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: remove the
-	Addressbook_ConfigControl stuff to LDAP_ConfigControl.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES):
-	remove addressbook-config.* and add ldap-config.*
-	(glade_DATA): same.
-	(evolution_addressbook_LDADD): add LDAP_LIBS.
-
-	* gui/component/addressbook-component.c (owner_set_cb):
-	addressbook_config_register_factory =>
-	ldap_config_register_factory.
-
-	* gui/component/addressbook.c (book_open_cb): remove source->type
-	check - they're always LDAP.
-	(load_uri_cb): same.
-
-	* gui/component/addressbook-storage.c (ldap_unparse_ssl): new
-	function.
-	(ldap_parse_ssl): new function.
-	(addressbook_storage_init_source_uri): use a more flexible scheme
-	to build up the uri's, and add in the ssl parameter.
-	(load_source_data): fill in source->ssl, and remove source->type
-	assignment.
-	(addressbook_source_copy): copy source->ssl, and remove
-	source->type copy.
-	(create_ldap_folder): addressbook_create_new_source =>
-	ldap_config_create_new_source.
-
-	* gui/component/addressbook-storage.h: remove
-	AddressbookSourceType (it was always LDAP), and add
-	AddressbookLDAPSSLType.
-
-2002-04-18  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_load_default_book): Append
-	/addressbook.db to the end of the default URI if it starts with
-	file:
-
-	* backend/ebook/e-book.c (e_book_load_uri_step): Fix this to not
-	loop forever if you have more than one backend.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories): Changed this to use
-	ECategoriesMasterListOptionMenu.
-
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb),
-	gui/widgets/e-addressbook-reflow-adapter.c,
-	gui/widgets/e-addressbook-view.c: Updated these to match the new
-	EPopupMenu.
-
-2002-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c: Include
-	addressbook-config.h here as this file uses it.
-
-	* gui/component/select-names/e-select-names.c (SPEC, SPEC2): Made
-	this dialog searchable by typing in the ETable.
-
-	* gui/widgets/e-addressbook-model.c: Include e-addressbook-util.h
-	here.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click),
-	gui/widgets/e-addressbook-view.c (table_right_click): Fixed a
-	memory leak here by using "selection-done" signal.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c,
-	gui/widgets/e-addressbook-reflow-adapter.h,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-view.c:
-	Added a right click menu for areas that aren't cards.
-
-2002-04-09  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_load_default_book): Update
-	for new-and-improved consistent default folder uri.
-
-	* gui/component/addressbook.c (addressbook_load_default_book): Use
-	e_book_load_default_book rather than duplicating most of its logic
-	here.
-	(load_uri_cb): Modify to work as a callback for
-	addressbook_load_default_book as well as addressbook_load_uri.
-
-2002-04-08  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-component.c (create_view): Add
-	view_info arg, but don't do anything with it.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: add
-	config_item:type
-
-2002-04-04  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: link to the static libversit
-
-2002-04-04  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Update for evolution_shell_client_user_select_folder API change.
-
-2002-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Remove AddressbookConfig,
-	ContactNew, ContactNewList EPixmap entries.
-
-	* gui/component/addressbook-factory.c (main): Print out a
-	debugging message just before the main loop starts, for debugging
-	purposes.
-
-2002-04-02  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card-simple.h: Fix spelling of
-	E_CARD_SIMPLE_PHONE_ID_TTYTDD and E_CARD_SIMPLE_FIELD_PHONE_TTYTDD
-	(they previously ended with "TTD" instead of "TDD")
-
-	* backend/ebook/e-card-simple.c: Update for spelling fix.
-
-	* backend/pas/pas-backend-ldap.c: Likewise
-
-2002-04-01  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c:
-	parent_class should be static. (From Max Horn <max@quendi.de>)
-
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add priority
-	for the config page.  Renamed to "Directory Servers".
-
-2002-03-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): don't free req->vcard.
-	it's freed in pas_book_free_request.
-	(pas_backend_file_process_remove_card): don't free req->id for the
-	same reason.
-	(pas_backend_file_process_modify_card): don't free req->vcard for
-	the same reason.
-	(pas_backend_file_process_get_changes): don't free req->change_id
-	or release_unref the listener for the same reason.
-
-2002-03-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (check_schema_support): make sure
-	to call ldap_value_free (values);, and ldap_msgfree (resp).
-	(get_ldap_library_info): don't ask me why, but it appears we have
-	to free each extension char*.
-	(query_ldap_root_dse): make sure to free values in the
-	subschemaSubentry code before overwriting it, and call
-	ldap_msgfree(resp) when we're all done.
-	(build_card_from_entry): don't leak the DN, ldap attributes, or
-	the berval the ldap_*_attribute calls use to step through the
-	attributes.  the docs say this berval is freed when
-	ldap_next_attribute returns NULL, but if we don't free it it leaks
-	a substantial amount of memory.
-	(pas_backend_ldap_search): make sure to only allocate *op once,
-	and fix the g_warning since op isn't valid in its scope anymore.
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am: Update for libversit change: Use .a
-	rather than .la now.
-
-	* printing/Makefile.am: Likewise
-
-	* gui/component/Makefile.am: Likewise
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_menu_activated):
-	Removed.
-	(addressbook_factory_new_control): Don't connect anymore, as this
-	signal has been removed from the ESearchBar.
-	(addressbook_factory_new_control): No more custom menu items here.
-
-2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_right_click): Update to
-	use new EPopupMenu API.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click): Update to use new
-	EPopupMenu API.
-
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb): Update to match new EPopupMenu api.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Remove the
-	`addressbook_search_menu_items'.
-	(addressbook_menu_activated): Removed.
-	(addressbook_factory_new_control): Don't connect.  No menu items.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (control_activate): Call
-	`e_search_bar_set_ui_component()' to set the BonoboUIComponent for
-	the search bar.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add an icon
-	for the LDAP sources configuration control.
-
-2002-03-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Remove verb "AddressbookConfig".
-	(config_cb): Removed.
-
-	* gui/component/addressbook-config.c: Remove `dialog' member from
-	`AddresbookDialog'.  Instead, add a `config_control' member.
-	(config_control_new): New.
-	(addressbook_config): Removed.
-	(addressbook_config_register_factory): New.
-	(config_control_factory_fn): New, factory function for the
-	ConfigControl page.
-	(addressbook_source_edit_changed): Don't change the sensitivity of
-	the dialog.  Rather, invoke ::changed on the ConfigPage.
-	(auth_checkbutton_changed): No need to manually change the
-	sensitiviness of the buttons here either.
-	(add_source_clicked): Likewise, just invoke
-	evolution_config_control_changed().
-	(edit_source_clicked): Likewise.
-	(addressbook_dialog_close): Removed.
-	(config_control_destroy_callback): New, callback for when the
-	config control gets destroyed.
-	(addressbook_dialog_apply): Removed.
-	(config_control_apply_callback): New callback for
-	EvolutionConfigControl::apply.
-	(addressbook_dialog_ok): Removed.
-	(addressbook_config_control_new): Set up ->config_control and
-	connect the signals.
-
-	* gui/component/addressbook-config.glade: Call the main hbox in
-	the addressbook_sources dialog `addressbook_sources_main_hbox'.
-
-	* gui/component/addressbook-component.c (owner_set_cb): Call
-	`addresbook_config_register_factory'.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add items for
-	OAFIID:GNOME_Evolution_Addresbook_ConfigControl and
-	OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory.
-
-2002-03-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	change contains x-evolution-any-field to beginswith on email,
-	full_name, and nickname.  faster, and more applicable to this
-	dialog.
-
-2002-03-09  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add TLSNotAvailable to
-	BookLister_CallStatus.
-
-	* backend/ebook/e-book-types.h: add TLS_NOT_AVAILABLE to the EBookStatus enum.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): add TLS_NOT_AVAILABLE to the
-	switch.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_get_static_capabilities): fix name.
-	(pas_backend_ldap_class_init): fix name.
-	(pas_backend_ldap_connect): change return type to CallStatus so we
-	can return different errors from here.  Also, do STARTTLS if the
-	user has asked for it and the connection supports it, returning
-	TLSNotAvailable (and close the connection) if they chose to
-	require it.
-	(pas_backend_ldap_load_uri): return pas_backend_ldap_connect.
-	(func_beginswith): pull in change from evolution-1-0-branch to
-	make full_name beginswith search both cn and sn.
-
-2002-03-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): since I've
-	gone ahead and made the file backend (by way of
-	pas-backend-card-sexp.c) use case insensitive searches for
-	beginswith, there's no need to list upper and lower case here.
-
-	* gui/component/addressbook.c (addressbook_search_option_items):
-	reorder things to put "Any field contains" at the end, since it's
-	the least efficient search.  Also reorder the enum to the same
-	ordering.  Change "Name contains" to "Name begins with" and change
-	"Email contains" to "Email is".
-	(addressbook_search_activated): change FULL_NAME to beginswith,
-	and change EMAIL to is to match the labels.
-
-	* backend/pas/pas-backend-card-sexp.c (compare_name): new
-	function, so we can compare both full and family names (so
-	beginswith can operate on them both.)
-	(endswith_helper): use e_utf8_strstrcase here, since all the
-	backends backends use case insensitive searching.
-	(func_endswith): same.
-
-2002-03-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_create_card): track
-	union/struct change.
-	(pas_book_queue_remove_card): same.
-	(pas_book_queue_modify_card): same.
-	(pas_book_queue_get_cursor): same.
-	(pas_book_queue_get_vcard): same.
-	(pas_book_queue_authenticate_user): same.
-	(pas_book_queue_get_book_view): same.
-	(pas_book_queue_get_changes): same.
-	(pas_book_free_request): new function - free everything we need to
-	for each type of request.
-	(pas_book_destroy): call pas_book_free_request here instead of
-	just freeing 3 elements of the old struct.  yay plugging memleaks.
-
-	* backend/pas/pas-book.h: make PASRequest a union and split out
-	members into structs, so it's a little clearer which fields are
-	used by which requests.  Also, add prototype for
-	pas_book_free_request so backends can just free everything at once
-	(usually in their requests_queued signal func.)
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): track struct/union change.
-	(pas_backend_file_process_remove_card): same.
-	(pas_backend_file_process_modify_card): same.
-	(pas_backend_file_build_cards_list): same.
-	(pas_backend_file_process_get_vcard): same.
-	(pas_backend_file_process_get_cursor): same.
-	(pas_backend_file_process_get_book_view): same.
-	(pas_backend_file_process_get_changes): same.
-	(pas_backend_file_process_check_connection): same.
-	(pas_backend_file_process_authenticate_user): same.
-	(pas_backend_file_process_get_supported_fields): same.
-	(pas_backend_file_process_client_requests): case the union to the
-	specific struct and pass it to the process_* functions.  also,
-	call pas_book_free_request here, instead of relying on each of the
-	functions to free their stuff.
-
-2002-03-07  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): Update for
-	evolution_storage_new() change.
-
-2002-03-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_realize): don't set "editable" here, as
-	the way things work the backend isn't able to override a setting
-	from the UI, so writable books never show up as writable.
-
-2002-03-04  Chris Toshok  <toshok@ximian.com>
-
-	[fixes bug #20871]
-	* gui/component/select-names/select-names.glade: add the
-	status-message label.
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add status_message field.
-
-	* gui/component/select-names/e-select-names.c (status_message):
-	new function, set the label's text from the message.
-	(e_select_names_init): get the status-message label, and if it's
-	valid, connect to the status_message signal of the
-	EAddressbookModel.
-
-2002-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_search): don't
-	ref the view here, since it keeps the view alive until the search
-	is over, which we don't want.  we want the view's death to cancel
-	the search.  This speeds up starting new searches after one is
-	already active (since switching searches actually creates a new
-	book view and destroys the old one.)
-	(ldap_search_dtor): remove the matching unref here.  The unref as
-	it was was incorrect anyway, and caused a crash (we needed
-	search_op->view, not op->view.)
-
-2002-02-27  Chris Toshok  <toshok@ximian.com>
-
-	[fixes bug #20690]
-	* backend/pas/pas-backend-ldap.c (func_and): the data arg is not
-	GList** anymore, it's PASBackendLDAPSExpData*, so use
-	ldap_data->list instead of *list.
-	(func_or): same.
-	(func_not): same.
-	(func_contains): same.
-	(func_is): same.
-	(func_endswith): same.
-	(func_beginswith): same, but also special case the beginswith
-	"fileAs" query type (the one used by the alphabet buttons on the
-	right hand side, so we can deal with entries that don't have
-	fileAs attributes, and return meaningful responses.)
-	(pas_backend_ldap_build_query): initialize the
-	PASBackendLDAPSExpData struct and pass that instead of &list.
-	Also, take the PASBackendLDAP arg to add to the struct in case we
-	need it at some point in the future.
-	(ldap_search_handler): pass in the PASBackendLDAP.
-
-2002-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): move
-	card_count++ inside the if that checks to see if a card matches
-	(and adds the card to the list).
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): only
-	handle the ESB_ADVANCED case here now.  the actual query work is
-	done in addressbook_search_activated.
-	(addressbook_search_activated): split out all the searching
-	functionality here.
-	(addressbook_factory_new_control): hook up "search_activated" to
-	addressbook_search_activated.
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): make the right auth page
-	start up open.
-
-	* gui/component/addressbook-storage.c (addressbook_source_free):
-	free the binddn.
-	(addressbook_source_copy): copy the binddn;
-
-2002-02-22  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bugs 20740, 16680, and god knows what else :) ]
-	* gui/widgets/e-addressbook-model.c (create_card): double the
-	allocated size every time we need more space instead of using a
-	fixed size increment.  this helps huge queries.  Also, remove the
-	gtk_object_get of "file_as", as it was dead code.
-	(book_view_loaded): handle errors here (by popping up a dialog).
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): search_idle ->
-	search_timeout.
-	(build_card_from_entry): comment out some spew, and unref ecard
-	when we're done to plug a memory leak.
-	(send_pending_adds): send along to the client all the cards we've
-	been saving up.
-	(poll_ldap): use a timeout for ldap_result to keep the backend
-	from blocking (and it turns out keep the frontend from hanging
-	waiting on a ref to complete) on large db's with few matches.
-
-	Also, add some fairly smart, self-tuning aggregating of cards.
-	Keep track of the number of cards we've sent the last time through
-	as well as this time, and estimate the number we want to aggregate
-	the next time based on them (we average them at the moment),
-	subject to maximum/minimum number of cards.  also, we have a
-	maximum aggregation time, after which we force a flush if there
-	are pending cards and recalculate our target pending number.
-	there's a minimum wait time to possibly keep outselves from
-	spamming the ui, although it's 0 at the moment.
-
-	Lastly, make sure to only notify the GUI of status messages when
-	we need to.  this results in a *huge* savings.
-	(ldap_search_handler): initialize all the pending card stuff, and
-	use a timeout instead of an idle function for poll_ldap.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): performance optimization
-	for large adds.  If we're a CardAddedEvent and there's an existing
-	CardAddedEvent at the end of the queue, just concat the lists of
-	cards together.  This is to keep the gui from falling further and
-	further behind the ldap backend, which is merrily spewing updates
-	at the gui.
-
-2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am: Define $(iconsdir).
-
-	* gui/component/addressbook-component.c (add_creatable_item): New
-	helper function.
-	(create_component): Add the icons for the user creatable items as
-	well.
-
-2002-02-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri):
-	track change to signature, and (for now) just change all the
-	return FALSE's to _RepositoryOffline (what FALSE used to map to in
-	pas_book_factory_process_request), and change TRUE to _Success.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_load_uri):
-	track change to signature, and differentiate between
-	pas_backend_ldap_connect failing (RepositoryOffline), and
-	ldap_url_parse failing (OtherError).
-	
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): since pas_backend_load_uri
-	returns status now, use it to nodify the BookListener if there's a
-	failure.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): track change
-	to signature.
-
-	* backend/pas/pas-backend.h: change return type of
-	pas_backend_load_uri to
-	GNOME_Evolution_Addressbook_BookListener_CallStatus to allow
-	differentiation between failure types.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): handle _AUTHENTICATION_FAILED.
-
-	* backend/ebook/e-book-types.h (EBookStatus): add
-	_AUTHENTICATION_FAILED.
-
-2002-02-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): if the load_uri fails, notify
-	the listener that the repository is offline.  (partial fix for bug
-	20347)
-
-2002-02-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_dn_from_ecard): escape
-	commas in the dn, since they're used by ldap to specify the node's
-	placement in the tree. (fixes bug 20089)
-	(rfc2254_escape): just use sprintf and %02X instead.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (set_book): Keep a
-	ref of the model in this case as well.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (set_book): Make
-	sure to only set the query once when creating a new book and not
-	at all on addressbook model creation.  This prevents an accidental
-	pair of changes from making the addressbook model load a remote
-	addressbook.
-
-	* gui/widgets/e-addressbook-model.c (get_view): If this is the
-	first_get_view and the addressbook is remote, empty the view
-	instead of leaving it in the state it used to be in.  This only
-	occurs if you set the book after the model has existed for a
-	while.
-	(e_addressbook_model_set_arg): When setting the book, set
-	first_get_view to TRUE.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (display_view): Attach to the
-	emvw instead of the emv here.
-
-	* gui/widgets/e-minicard-view-widget.c, e-minicard-view-widget.h:
-	Made this object have a "column_width" argument and a
-	"column_width_changed" signal which are a simple layer down to the
-	EMinicardView contained within.
-
-	* gui/widgets/gal-view-minicard.c, gui/widgets/gal-view-minicard.h
-	(gal_view_minicard_attach): Made this attach to an
-	EMinicardViewWidget instead of a EMinicardView.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-util.c, backend/ebook/e-book-util.h
-	(e_book_expand_uri, e_book_load_address_book_by_uri,
-	e_book_use_address_book_by_uri): New functions that take a file://
-	url ending in the directory name and automatically append the
-	addressbook.db and do the appropriate thing.
-
-	* backend/pas/pas-backend-card-sexp.c,
-	backend/pas/pas-backend-card-sexp.h: Added copyright notice here.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop), gui/component/addressbook.c
-	(set_prop): Use e_book_expand_uri instead of
-	addressbook_expand_uri.
-
-	* gui/component/addressbook-storage.c: Fixed the fcntl include
-	here.
-
-	* gui/component/addressbook.c (ContactsCopyToFolder,
-	ContactsMoveToFolder): Added handlers for these two verbs.
-
-	* gui/component/addressbook.h: Removed addressbook_expand_uri in
-	favor of e_book_expand_uri.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (transfer_cards):
-	Added code to handle Move to and Copy to right click menu items.
-
-	* gui/widgets/e-addressbook-util.c,
-	gui/widgets/e-addressbook-util.h (e_addressbook_transfer_cards):
-	New function to pop up a dialog and transfer a set of cards to the
-	given folder.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (display_view): Don't attach to
-	the view if it doesn't exist yet.  We have to make this then
-	attach later.
-	(e_addressbook_view_copy_to_folder,
-	e_addressbook_view_move_to_folder): New functions utilizing
-	e_addressbook_transfer_cards.
-	(table_right_click): Add copy_to_folder and move_to_folder to the
-	right click menu for tables here.
-	(e_addressbook_view_discard_menus): Handle menu unmerging here.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): Removed unused field.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (display_view): Attach the
-	GalViewMinicard to the EMinicardView here.
-
-	* gui/widgets/gal-view-minicard.c, gui/widgets/gal-view-minicard.h
-	(gal_view_minicard_load, gal_view_minicard_save): Made these save
-	the column width of the view.
-	(gal_view_minicard_attach, gal_view_minicard_detach): Added these
-	functions to allow the GalViewMinicard to set the column width of
-	a EMinicardView and to monitor its changes.
-
-2002-02-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_get_arg): Added an argument to get the model.
-
-	* gui/widgets/e-addressbook-view.c (writable_status): Don't bother
-	connecting to the writable_status callback on the book, simply
-	rely on the writable_status callback on the addressbook model.
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h
-	(set_empty_message): Handle the case of a read only view here.
-
-2002-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): remove
-	"New" from user creatable menu items
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h
-	(e_addressbook_view_setup_menus): Changed this function to use the
-	new GalViewMenus which takes a GalViewInstance, instead of a
-	GalViewCollection.
-
-2002-02-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (find_address_mailing): tidy
-
-	* conduit/address-conduit.c (addrconduit_load_configuration): load
-	default address setting
-	(addrconduit_save_configuration): save default address setting
-	(e_addr_gui_new): new gui routine for conduit settings
-	(e_addr_gui_fill_widgets): ditto
-	(e_addr_gui_fill_config): ditto
-	(e_addr_gui_destroy): ditto
-	(e_addr_context_destroy): destroy the gui and new_cfg
-	(local_record_from_ecard): reinstate commented out bits, determine
-	which address to sync to pilot
-	(ecard_from_remote_record): determine which address to sync from
-	pilot
-	(fill_widgets): put the gui widgets in
-	(create_settings_window): create gui
-	(save_settings): fill gui
-
-2002-02-04  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/contact-editor/e-contact-editor.c (address_text_changed): if
-	the shown address in the mailing address or there is no mailing
-	address, set the default flag and make sure the button is checked
-	(address_mailing_changed): set the flags properly when the mailing
-	address changes
-	(e_contact_editor_init): listen for the check button being toggled
-	(find_address_mailing): find the address (if any) with the default
-	flag
-	(set_address_field): set the mailing address button appropriately
-	(fill_in_info): find the mailing address
-
-	* gui/contact-editor/e-contact-editor.h: add new class data member
-
-	* gui/contact-editor/contact-editor.glade: show mailing address
-	check button
-
-2002-02-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_auto_recipient):
-	New function to find out if a destination was one which was
-	auto-matically set by Evolution.
-	(e_destination_set_auto_recipient): Set whether or not the dest is
-	an auto-recipient.
-	(e_destination_touch): Don't touch the address if it is an
-	auto_recipient.
-	(e_destination_list_to_vector_sized): New function to avoid having
-	to calculate the length of the list ourselves. Allows for a bit of
-	optimization if our caller knows the length of the list.
-	(e_destination_xml_encode): Encode the auto_recipient bit.
-	(e_destination_xml_decode): Decode the auto_recipient bit.
-
-2002-02-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_sync_card): Made
-	this preserve addressbook flags other than the first three.
-
-	* backend/ebook/e-card-types.h: Added E_CARD_ADDR_MASK and
-	E_CARD_ADDR_DEFAULT.
-
-	* backend/ebook/e-card.c (get_address_flags): Added "PREF" to
-	E_CARD_ADDR_DEFAULT mapping.
-
-	* backend/ebook/test-client.c: Added #include "e-book-util.h".
-
-2002-01-30  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes):
-	compute the change db filename based on our contact db filename.
-	(pas_backend_file_load_uri): store the filename in
-	bf->priv->filename.
-	(pas_backend_file_destroy): free the filename, and (!) free
-	bf->priv too.
-
-2002-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_valid): Revert
-	my previous change as trow says this will break auto-completion
-	stuff.
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/contact-editor/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS.
-	* gui/contact-list-editor/Makefile.am: Likewise.
-	* gui/merging/Makefile.am: Likewise.
-	* gui/search/Makefile.am: Likewise.
-	* gui/component/select-names/Makefile.am: Likewise.
-
-2002-01-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_valid): Don't
-	check for an @ in the email address. This is to fix bug #10960.
-
-2002-01-24  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug 16097 ]
-	* gui/component/addressbook-config.glade: gui love for the new
-	auth stuff.
-	
-	* gui/component/addressbook.c (load_uri_cb): track change to auth,
-	and offer up different prompt strings depending on which method
-	(binddn or email) we're using.
-	
-	* gui/component/addressbook-storage.c (ldap_unparse_auth): use the
-	new auth types for ldap.
-	(ldap_parse_auth): same.
-	(addressbook_storage_auth_type_to_string): new function.
-	(load_source_data): get the binddn too.
-	(ldap_source_foreach): store out binddn or emailaddr, depending on
-	the auth type chosen.
-
-	* gui/component/addressbook-storage.h: add the more detailed auth
-	types, add "binddn" to the source structure, and add a prototype
-	for addressbook_storage_auth_type_to_string.
-	
-	* gui/component/addressbook-config.c (auth_checkbutton_changed):
-	set the auth stuff  (in)sensitive.
-	(auth_optionmenu_activated): new function.
-	(addressbook_source_dialog_set_source): track UI change.
-	(addressbook_source_dialog_get_source): same.
-	(add_scope_activate_cb): rename add_activate_cb to this to
-	distinguish it from the auth stuff.
-	(add_auth_activate_cb): new function.
-	(addressbook_source_dialog): track change to auth UI stuff.
-	(addressbook_storage_auth_type_to_string): new function.
-
-	* backend/ebook/e-book.h: add auth_method arg to
-	e_book_authenticate_user.
-
-	* backend/ebook/e-book.c (e_book_authenticate_user): track change
-	to prototype - add auth_method arg, and pass it along to the CORBA
-	call.
-
-	* backend/ebook/test-client.c (book_open_cb): track api change -
-	keep this building.
-
-	* backend/pas/pas-book.h: add auth_method slot in PASRequest.
-
-	* backend/pas/pas-book.c (pas_book_queue_authenticate_user): add
-	auth_method arg and add it to the PASRequest.
-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): track
-	idl change, add auth_method and pass it along to
-	pas_book_queue_authenticate_user.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): support both
-	"ldap/simple-email" and "ldap/simple-binddn" auth methods.
-
-	* backend/idl/addressbook.idl: add "in string authMethod" to
-	authenticateUser.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* conduit/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS
-	and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS and remove unused flags
-
-	* gui/component/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS and
-	EVOLUTION_ADDRESSBOOK_LIBS and remove unused flags.
-	* backend/pas/Makefile.am: Likewise.
-	* backend/ebook/Makefile.am: Likewise.
-	* printing/Makefile.am: Likewise.
-	* backend/ebook/Makefile.am: Likewise.
-	* gui/widgets/Makefile.am (INCLUDES): Likewise.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Pass a
-	NULL @icon to
-	`evolution_shell_component_add_user_creatable_item()'.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c: #include
-	<locale.h>.
-
-2002-01-22  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug # 16864 ]
-	* backend/ebook/evolution-ldif-importer.c (getValue): create and
-	return a GString here, instead of writing to a fixed size buffer.
-	(parseLine): use a GString here instead of a fixed size buffer.
-
-2002-01-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_search_handler): Set the
-	number of cards to return to the value specified in the ldap uri,
-	leaving the default at 100.  Fixes Ximian bug #13953.
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog),
-	gui/component/addressbook-config.glade: Added a limit entry here
-	to edit the limit field of the source.
-
-	* gui/component/addressbook-storage.c,
-	gui/component/addressbook-storage.h
-	(addressbook_storage_init_source_uri): Added a limit field to this
-	class and pass that value through in the uri that's generated.
-
-2002-01-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c: Made username match with no
-	domain match be vague instead of partial.  Fixes Ximian bug
-	#13612.
-
-2002-01-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (view_contact_cb): New verb to open
-	a bunch of cards.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (open_card): Call
-	e_addressbook_show_multiple_cards instead of doing this ourselves.
-
-	* gui/widgets/e-addressbook-util.c,
-	gui/widgets/e-addressbook-util.h
-	(e_addressbook_show_multiple_cards): Added this function to show a
-	bunch of cards, including a dialog if lots of windows are going to
-	appear.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_view,
-	e_addressbook_view_can_view): e_addressbook_view_view calls
-	e_addressbook_show_multiple_cards on the appropriate list of
-	cards.
-
-2002-01-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(fill_in_countries), gui/contact-editor/fulladdr.glade: Sort
-	country list.  Country list moves from fulladdr.glade to
-	e-contact-editor-address.c, but only a few country names have
-	actually changed.  Fixes Ximian bug #16545.
-
-2001-12-20  Zbigniew Chyla  <cyba@gnome.pl>
-
-	Fixes #17725
-
-	* evolution/addressbook/printing/e-contact-print.c (complete_sequence):
-	Do not assume that the first byte of file_as is the first letter, use
-	utf8 functions instead.
-
-2002-01-16  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: move all functions here, get rid of
-	header files, use e-pilot-settings to display gui
-
-2002-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/select-names/select-names.glade: remove misleading
-	title and fix spacing
-
-2002-01-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (alphabet_state_changed): Handle
-	setting the search bar to "Advanced..." when the alphabet buttons
-	are pushed and back when they're cleared.  Fixes Ximian bug
-	#12904.
-	(addressbook_menu_activated): When the user calls Search->clear,
-	set the search to ESB_ANY and "", don't just set the text.  This
-	is especially useful when it's set to ESB_ADVANCED.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (alphabet_state_change): Added
-	this signal which gets emitted when the alphabet buttons are
-	pushed.
-	(command_state_change): Removed the ref pair here.  It's not
-	necessary.  gtk_signal_emit refs the object itself.
-
-2002-01-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (name_synonyms): Added a couple
-	of names here.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_get_nth_obj): Removed an unused
-	variable.
-
-2002-01-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (create_alphabet): Use toggle
-	buttons here.  Fixes Ximian bug #10734.
-
-2002-01-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (set_fields): Choose the
-	first filled in address field here.  Fixes Ximian bug #2222.
-
-2002-01-03  Joe Shaw  <joe@ximian.com>
-
-	* backend/ebook/test-card.c: Add a test for getting arbitrary
-        fields.
-
-	* backend/pas/pas-backend-card-sexp.c (compare_arbitrary): Added.
-	(prop_info_table): Add a LIST_PROP for arbitrary fields.
-
-2002-01-03  Nat Friedman  <nat@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): Free the
-	query if the oaf response is of zero length.
-
-2001-12-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): When we clean, don't clean the model's last
-	element.  This helps keep things working properly when we have
-	signal-character separators.
-	(section_right_click_cb): Changed to work properly with our
-	EText-emitted popup signal.
-	(e_select_names_add_section): Use ETexts for the recipient
-	sections, rather than tables.  This lets us make them directly
-	editable. (Bug #1721)
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_info_new): Pass in a ESelectNamesTextModel, not a
-	ESelectNamesModel.
-	(e_select_names_popup): Adjust for the new signature for
-	e_select_names_model_text_pos.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_out_cb): Schedule a cleaning when we focus out.
-	(focus_in_cb): Cancel pending cleaning when we get focus.  This
-	helps us avoid bad things happening during the fast focus out/ins
-	that happen when the completion dropdown appears.
-	(completion_handler): Adjust for new signatures of
-	e_select_names_model_text_pos and e_select_names_model_name_pos.
-	(e_select_names_manager_entry_new): Pass in our
-	ESelectNamesTextModel when constructing the
-	ESelectNamesCompletion.
-	(e_select_names_manager_entry_free): Cancel any pending clean-ups.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Get the text off of the text model.
-	Which is the only way that really makes sense when you think about
-	it.
-
-	* gui/component/select-names/e-select-names-completion.c: Added a
-	copy of the associated ESelectNamesTextModel to
-	ESelectNamesCompletionPrivate.  This replaces the
-	ESelectNamesModel.
-	(e_select_names_completion_destroy): Unref ->text_model.
-	(e_select_names_completion_handle_request): Pass in our text
-	model's separator info when calling e_select_names_model_text_pos.
-	(e_select_names_completion_new): Pass in the text model as an arg
-	instead of the model, and ref it as needed.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_init): Set separator as either ", " or
-	",", depending on the value of the EVOLUTION_DISABLE_MAGIC_COMMA
-	environment variable.
-	(e_select_names_text_model_destroy): Free the separator.
-	(changed_cb): Flush our cached text on changed.
-	(e_select_names_text_model_set_source): Use our own changed_cb
-	callback on changed, rather than just connecting up
-	e_text_model_changed.
-	(e_select_names_text_model_set_separator): Added.  Lets the
-	separator between recipients be specified.
-	(e_select_names_text_model_get_text): Cache the text we get from
-	calling e_select_names_model_get_textification.
-	(e_select_names_text_model_insert_length): A bunch of small
-	changes to properly support generic separators, rather than
-	(implicit and explicitly) assuming ", ".
-	(e_select_names_text_model_delete): More small tweaks to handle
-	generic separators.
-	(e_select_names_text_model_get_nth_obj): Use new signature when
-	calling e_select_names_model_name_pos, and use our cached text.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_destroy): We don't cache the text or
-	addr_text anymore, so no need to free them here.
-	(e_select_names_model_changed): ...and no need to reset our text
-	and addr_text caches here.
-	(e_select_names_model_get_textification): Take a separator as an
-	arg, rather than just using ", ".  Also, no caching.
-	(e_select_names_model_get_address_text): Take a separator as an
-	arg, rather than just using ", ".  And no caching here either.
-	(e_select_names_model_clean): Add arg that give us control over
-	whether or not the last entry should get cleaned.  We need this
-	when using a one-character separator, so that new destinations
-	that get tacked onto the end don't get immediately cleaned away
-	for being empty.
-	(e_select_names_model_name_pos): Take the separator length as an
-	argument, remove implicit assumption of length 2.
-	(e_select_names_model_text_pos): Take the separator length as an
-	argument, remove implicit assumption of length 2.
-
-2001-12-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #17377, Evolution doesn't work on multi-depth displays.]
-
-	* gui/component/addressbook-factory.c (main): Push GdkRGB visual
-	and colormap.
-
-2001-12-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click): Add cut/copy/paste to
-	right-click menu.
-
-	* gui/widgets/e-addressbook-view.c (table_right_click): Add
-	cut/copy/paste to right-click menu.  (Fixes bug #14528.)  Also,
-	disable some right-click options if our addressbook isn't
-	editable.
-
-2001-12-18  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (check_for_slow_setting): go slow and
-	clear the map if the last uri and the current uri do not match
-	(post_sync): save the last uri
-
-	* conduits/address-conduit-config.h: handle a last uri config
-	option
-
-2001-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_default_book_open):
-	change this to match its e-book counterpart, and only failover to
-	the local addressbook if the protocol wasn't supported.  that way
-	errors like "failure to connect" are still reported to the user.
-
-	* backend/ebook/e-book-util.h: add prototypes for
-	e_book_load_default_book and e_book_get_config_database.
-
-	* backend/ebook/e-book-util.c (e_book_default_book_open): new
-	function, basically cut and paste addressbook_default_book_open
-	from addressbook.c here.
-	(e_book_load_default_book): cut and past
-	addressbook_load_default_book here, pretty much, except leave off
-	the auth stuff.
-	(e_book_get_config_database): new function, returns the
-	Bonobo_ConfigDatabase for e_book_load_default_book to use.
-
-	* conduit/address-conduit.c (start_addressbook_server): use
-	e_book_load_default_book here.
-	
-2001-12-17  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug 17355 ]
-	* gui/component/select-names/e-select-names.c (new_folder): if
-	we're dealing with an LDAP folder, prepend [LDAP] to it.  Now that
-	we have 3 different places where folders are coming from, it helps
-	to be able to differentiate "Contacts" in ~/evolution and a
-	"Contacts" ldap server and a "Contacts" exchange folder.
-	(add_additional_select_names_uris): loop through the bonobo conf
-	settings for additional folders, adding them to the option menu.
-	(e_select_names_hookup_shell_listeners): call
-	add_additional_select_names_uris.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
- 
- 	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_realize): Use an #ECanvasBackground here
-	instead of a #GnomeCanvasRect.
- 
-2001-12-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c: Added
-	'cache_complete' flag to ESelectNamesCompletionPrivate.
-	(e_select_names_completion_seq_complete_cb): Set cache_complete
-	to TRUE if our query wasn't interrupted.
-	(e_select_names_completion_start_query): Set cache_complete to
-	FALSE at the beginning of a potentially-cached query.
-	(e_select_names_completion_do_query): Only reuse cached cards
-	if cache_complete is TRUE.  (Fixes bug #10241)
-
-2001-12-15  JP Rosevear  <jpr@ximian.com>
- 
- 	* conduit/address-conduit.c (e_addr_context_destroy): don't free
- 	the hash table keys, we didn't allocate them and free the change
- 	objects and unref the associated cards
- 	(local_record_from_uid): unref the temp card we create
- 	(replace_record): ref the new card associated with the card change
- 	and unref the old one
-
-2001-12-13  JP Rosevear  <jpr@ximian.com>
- 
- 	* conduit/address-conduit.c (local_record_from_ecard): Make sure
- 	to copy the custom fields so they are not overwritten
-
-2001-12-13  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-util.c (simple_query_new): Used
-	g_strdup_printf to dup a string.  Doh!  Changed to g_strdup.
-	(Bug #17126)
-
-2001-12-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_new): Remove a reference to code
-	I don't want to commit yet. :-)
-
-	* gui/component/select-names/e-select-names-manager.c: Extensively
-	refactored -- this code had gotten _really_ ugly.  Untangle things
-	to the point where our reference counting problems are fixable.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Remove all of the ugly hacks to work around our
-	memory management problems, and just unref the manager.
-	(Fixes #14412)
-
-2001-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(search_for_dn_with_objectclasses): move search_for_dn's contents
-	here, and add an "existing_objectclasses" parameter that we pass
-	on to build_card_from_entry.
-	(search_for_dn): call search_for_dn_with_objectclasses with NULL
-	for existing_objectclasses.
-	(build_card_from_entry): if existing_objectclasses is non-NULL,
-	fill it in with the list of existing objectclass values for this
-	entry.
-	(add_objectclass_mod): if existing_objectclasses is non-NULL,
-	meaning we're modifying an entry, search in the existing
-	objectclasses for the ones we want to be there, and only add
-	what's missing.  If none are missing, don't add objectclass_mod to
-	the list of mods.
-	(create_card_handler): track change to add_objectclass_mod (pass
-	NULL).
-	(modify_card_handler): use search_for_dn_with_objectclasses
-	instead of search_for_dn, and pass the existing objectclasses to
-	add_objectclass_mod.  also, free the list when we're done.
-	(poll_ldap): track change to build_card_from_entry (pass NULL).
-
-2001-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	we need to be able to disable non-labels here as well.  since
-	we're using enable_widget and not gtk_widget_set_sensitive, it's
-	okay to handle entries/text's, etc, here.
-	(widget_field_mappings): add label-caluri and label-fburl here.
-
-	* gui/contact-editor/contact-editor.glade: change the label names
-	for the freebusy/calendar urls to have more descriptive names,
-	since we use them in e-contact-editor.c now.
-
-	* backend/pas/pas-backend-ldap.c: add support for
-	caluri/calendarURI, fburl/freeBusyURI.
-
-	* backend/pas/evolutionperson.schema: add calendarURI and
-	freeBusyURI.
-
-2001-12-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Fixed up the
-	accelerators and such here.
-
-	* gui/contact-editor/e-contact-editor.c (file_save_as_cb):
-	Translate this string.
-	(pixmaps): Added a pixmap for the ContactEditorSaveClose command.
-	(setup_tab_order): Fixed up the tab order here.
-
-	* gui/contact-editor/fulladdr.glade: Made the country combo
-	focusable here.
-
-2001-12-03  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_equal): Make address
-	comparisons case-insensitive. (Fixes 11776)
-
-	* backend/ebook/e-card.c (e_card_email_match_single_string): Make address
-	host comparisons case-insensitive. (Fixes 11776)
-
-	* gui/component/select-names/e-select-names-manager.c (focus_out_cb): Clean
-	ESelectNamesModel on focus-out. (Half of a fix for 15656)
-
-	* backend/ebook/e-destination.c (nonempty): Fix this function
-	and make it utf8-safe. (The other half of the fix for 15656)
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Consistency
-	fixes with standard contact editor.  Added Save As, Send As, and
-	Send To.  Replaced Save toolbar with Save and Close and added Save
-	and Close menu item.  Added a trash icon.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c (setup_tab_order):
-	Setup the tab order here.  Fixes Ximian bug #13751.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (connect_master_list_changed,
-	make_suboptions): Changed how this list of categories gets
-	computed.  Fixes Ximian bugs #7707 and #7708.
-
-2001-11-15  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* printing/e-contact-print-envelope.c (ecpe_linelist_dimensions),
-	printing/e-contact-print.c (e_contact_divide_text, e_contact_output,
-	e_contact_rectangle, e_contact_print_letter_tab,
-	e_contact_print_letter_heading, e_contact_get_card_size,
-	e_contact_print_card, e_contact_print_phone_list):
-	s/gnome_font_get_width_string/gnome_font_get_width_utf8/
-	s/gnome_font_get_width_string_n/gnome_font_get_width_utf8_sized/
-
-2001-11-14  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (search_for_dn): check against
-	LDAP_SUCCESS as the return value, not -1.
-	(pas_backend_ldap_build_all_cards_list): same.
-	(pas_backend_ldap_process_authenticate_user): same.
-
-2001-11-12  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14843 ]
-	* backend/pas/pas-backend-ldap.c (func_and): don't crash if a
-	subexpression wasn't filled in.
-
-	* backend/pas/pas-backend-ldap.c (func_or): same.
-
-2001-11-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (list_added_cb):
-	Release callback's reference to EContactListEditor.
-	(list_modified_cb): Release callback's reference to
-	EContactListEditor.
-	(save_card): Ref the EContactListEditor on behalf of the
-	e_book_foo callback. (Fixes bug #14743)
-	(save_card): Set changed to false once we've saved.
-	(list_deleted_cb): Release callback's reference.
-	(delete_cb): Hold reference for the callback.
-
-2001-11-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked): If
-	our call to e_categories_new returns NULL, put up an error dialog
-	and return.  (Fixed #14780)
-		
-2001-11-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14687 ]
-	* backend/pas/pas-backend-file.c
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): do load_uri before add_client,
-	so we know if the load actually worked (add_client uses this
-	information to respond to the new client.)  before this change,
-	the client would still think the book was in a useful state even
-	if the load_uri failed.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client): if
-	the we're not connected, say so.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	same.
-	(pas_backend_file_load_uri): don't report_writable here,
-	add_client does it.  was only needed before because of the
-	improper ordering in pas-book-factory.c above.
-
-2001-11-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14646 ]
-	* gui/component/addressbook.c (addressbook_default_book_open): new
-	function.  if the default_book failed to load, load the local
-	addressbook in its place.
-	addressbook_load_default_book): if we're loading the default_book
-	uri, use addressbook_default_book_open as the open_response.
-
-	* backend/ebook/e-book.c (e_book_load_uri_step): reset the
-	load_state to NotLoaded so we can attempt another load_uri on
-	the book if it fails.
-
-2001-11-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Explicitly destroy entries.  Part of the fix for
-	the lingering completion window bug.
-
-2001-11-04  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: Use ordering of the pilot's phone
-	label list to find fields we sync in order to avoid strcmp'ing the
-	pilot's labels rendering phone syncing usable only for english
-	language pilots
-
-2001-11-03  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14410 ]
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	init in_async_call to FALSE.
-	(card_added_cb): turn the UI back on and set in_async_call to
-	FALSE.
-	(card_modified_cb): same.
-	(card_deleted_cb): same.
-	(save_card): turn off the UI by setting the dialog insensitive,
-	and set in_async_call to TRUE.
-	(delete_cb): same.
-	(app_delete_event_cb): if we're in an async call don't let the
-	window get deleted.
-
-	* gui/contact-editor/e-contact-editor.h (struct _EContactEditor):
-	add in_async_call flag for when we make a wombat call and need to
-	disable the UI.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): init in_async_call to FALSE.
-	(list_added_cb): turn the UI back on and set in_async_call to
-	FALSE.
-	(list_modified_cb): same.
-	(list_deleted_cb): same.
-	(save_card): turn off the UI by setting the dialog insensitive,
-	and set in_async_call to TRUE.
-	(delete_cb): same.
-	(app_delete_event_cb): if we're in an async call don't let the
-	window get deleted.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add in_async_call flag for when we make a
-	wombat call and need to disable the UI.
-
-2001-11-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Check for
-	NULL dates before converting them to strings.  Fixes Ximian bug
-	#14394.
-
-2001-11-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Leak select-names related data structures until
-	the memory management issues get sorted out.  Fixed bug #14086.
-
-2001-10-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/e-cardlist-model.c,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/widgets/e-addressbook-table-adapter.c: Make the pre_changes
-	and changes match here.
-
-2001-10-31  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_destroy): Check that local_listener and
-	other_contacts_listener are non-NULL before
-	disconnecting/unrefing.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(entry_destroyed): The entry shouldn't unref the manager.
-	(e_select_names_manager_create_entry): The entry shouldn't hold a
-	ref to the manager.  It becomes circular.
-	(e_select_names_manager_create_entry): On the other hand, we
-	should hold a ref to the entry we create.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Remove the explicit dialog destroy hack.
-
-2001-10-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Force the select names dialog to be destroyed.
-	This is a hack to fix bug #14002 -- I'll clean up the refcounting
-	issues post-freeze.  At least now it won't crash.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): make sure
-	to translate the character sets of the names
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/component/select-names/e-select-names-bonobo.c
-	(manager_ok_cb): send a null bonobo arg to prevent explosion
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/widgets/e-addressbook-view.c: correct include typo
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com.
-
-	* gui/widgets/e-minicard.c (add_field): Five characters, not four!
-	
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_value_at): Convert xml-ified destinations into proper
-	addresses.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com.
-
-	* gui/component/select-names/e-select-names-bonobo.c (init):
-	Connect to manager's "ok" signal.
-	(manager_ok_cb): Emit "ok" bonobo-signal.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_class_init): Added "ok" signal.
-	(e_select_names_clicked): Emit 'ok' signal.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c
-	(e_addressbook_prompt_save_dialog): new function, a "Do you want
-	to save changes?" dialog.
-
-	* gui/widgets/e-addressbook-util.h: add prototype for
-	e_addressbook_prompt_save_dialog.
-
-	* gui/contact-editor/e-contact-editor.c (prompt_to_save_changes):
-	call e_addressbook_prompt_save_dialog and save the card if they
-	select save.  return TRUE if the dialog should be closed, FALSE
-	otherwise.
-	(file_close_cb): check prompt_to_save_changes before closing the
-	dialog.
-	(app_delete_event_cb): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(prompt_to_save_changes): call e_addressbook_prompt_save_dialog
-	and save the card if they select save.  return TRUE if the dialog
-	should be closed, FALSE otherwise.
-	(file_close_cb): check prompt_to_save_changes before closing the
-	dialog.
-	(app_delete_event_cb): same.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_objectclass_mod): overload
-	this function for modifying objectclasses too, so we can make sure
-	evolutionPerson shows up in the objectclasses of an entry if it
-	shows up in the schema for the server.
-	(create_card_handler): add @replace = FALSE in the call to
-	add_objectclass_mod.
-	(modify_card_handler): call add_objectclass_mod with @replace =
-	TRUE.
-	(anniversary_compare): fix typo - return "equal", not "TRUE".
-	(birthday_compare): same.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* conduit/address-conduit.c (pre_sync): Comment out spew.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):
-	Comment out spew.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): Comment out spew.
-	(get_dnd_selection): Comment out spew.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_set_value_at): Comment out spew.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (update_command_state): Check that
-	our BonoboUIComponent has a container so we don't get a lot of
-	annoying debug spew.
-
-	* printing/smallbook.ecps: Fixed fonts.
-
-	* printing/phonelist.ecps: Fixed fonts.
-
-	* printing/medbook.ecps: Fixed fonts.
-
-	* printing/e-contact-print.c (e_contact_get_card_size): Commented
-	out spew.
-
-	* gui/widgets/e-minicard.c (remodel): Check that e_minicard->card
-	!= NULL.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): We were using
-	book_data->book_view immediately after unrefing it.  Reordered the
-	code a bit to avoid this.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.h: add prototype for
-	pas_book_factory_dump_active_backends.
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_dump_active_backends): new function.
-	(dump_active_server_map_entry): new function.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Drop a match if either of the text fields is NULL.
-	This could happen if any of the utf-8 involved is invalid, for
-	example. (Bug #13757)
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (is_syncable): fix bug that allowed
-	for phone's not to be in priority order and the item to still be
-	syncable
-
-	* conduit/address-conduit-config.h
-	(addrconduit_load_configuration): get management by id
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.c (is_syncable): a card also needs to
-	have its phone nums in priority order to be "syncable"
-	
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (is_syncable): move the syncable
-	checking code to a different function
-	(ecard_from_remote_record): set the name parts individually
-	(local_record_from_ecard): use is_syncable
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (file_as_get_style,
-	file_as_set_style): Use the actual ECardName in the ECard instead
-	of parsing the full_name here.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_set_name): New function to set the ECardName on
-	this card and fix the file_as if necessary.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_get): Handle returning dates here.
-	(e_card_simple_get_allow_newlines): New function.  Returns whether
-	it makes much sense to have newlines in this string.
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h
-	(addressbook_create_new_source): The first argument here should
-	be const.
-
-	* gui/component/addressbook-storage.c: Added #include
-	"addressbook-config.h".
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_event): On an
-	escape here, cancel editing and remove the focus from the text.
-
-	* gui/widgets/e-minicard.c (add_field): Set allow_newlines here.
-	(field_activated): Stop editing on the activate signal and remove
-	the focus from the text.  Fixes Ximian bug #12286.
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.h: tidy
-
-	* conduit/address-conduit-config.h: ditto
-
-	* conduit/address-conduit.c (add_record): unref ecard when done
-
-2001-10-28  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_date_from_string): Expose this
-	function.
-	(e_card_date_to_string): ...and this one.  Fixes build problem in
-	pas-backend-ldap.c.
-
-2001-10-28  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Change "this should never
-	happen" dialog to not give my name/e-mail.  Sorry translators.
-	But this really should never happen, thanks to my fix below.
-
-	* gui/component/addressbook-component.c: Initialize
-	global_shell_client to NULL. (Bug #6625)
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	[ bug #12979 ]
-	* backend/pas/pas-backend-ldap.c (anniversary_populate): new
-	function.
-	(anniversary_ber): new function.
-	(anniversary_compare): new function.
-	(birthday_populate): new function.
-	(birthday_ber): new function.
-	(birthday_compare): new function.
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): free up all the book_data
-	list stuff.
-	(e_select_names_completion_got_book_view_cb): deal with book_data
-	being passed as the closure, and increment the
-	pending_completion_seq counter.
-	(e_select_names_completion_card_added_cb): deal with book_data
-	being passwd as the closure.
-	(e_select_names_completion_seq_complete_cb): same, and decrement
-	the pending_completion_seq if we haven't gotten one for this book
-	view before.
-	(e_select_names_completion_stop_query): cancel all the
-	book_data's.
-	(e_select_names_completion_start_query): use the books_not_ready
-	counter instead of book_ready.  also, do e_book_get_book_view on
-	each of the book's in our list.
-	(e_select_names_completion_do_query): change to deal with our
-	list.
-	(e_select_names_completion_book_ready): decrement the
-	book_not_ready counter.
-	(e_select_names_completion_new): add the book we're created with
-	to our list.
-	(e_select_names_completion_add_book): implement.
-
-	* gui/component/select-names/e-select-names-completion.h: add
-	prototype for e_select_names_completion_add_book.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): use addressbook_config_data, and
-	don't unref the db.
-	(e_select_names_manager_create_entry): always add NULL for a book
-	(which corresponds to the local book), and if the completion_book
-	is present, add it to the list of books to complete again.
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (merge_cb): change to
-	EBookCallback signature, and unref the book.
-	(quick_add_merge_card): use addressbook_load_default_book.
-	(ce_have_book): change to EBookCallback signature, and unref the
-	book.
-	(edit_card): use addressbook_load_default_book.
-
-	* gui/component/e-address-popup.c (email_table_save_card_cb):
-	change to EBookCallback signature, and unref the book.
-	(add_card_idle_cb): use addressbook_load_default_book, and call
-	the cb if it fails.
-	(e_address_popup_cleanup): fix type -- should be "pop->card =
-	NULL", not "pop = NULL".
-	(contact_editor_cb): change to EBookCallback signature.
-	(edit_contact_info_cb): use addressbook_load_default_book.
-	(start_query): change to EBookCallback signature.
-	(e_address_popup_query): use addressbook_load_default_book.
-
-	* gui/widgets/e-minicard-control.c (book_open_cb): change to
-	EBookCallback signature, and unref the book.
-	(save_in_addressbook): use addressbook_load_default_book instead
-	of e_book_use_local_address_book.
-
-	* gui/widgets/Makefile.am (INCLUDES): change includes since we're
-	including addressbook.h which has it's own set of funky include
-	path requirements.
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): Don't leak
-	stuff. (Bug #13709)
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-destination.c (name_and_email_simple_query_cb,
-	nickname_simple_query_cb): Set book_uri when cardification occurs.
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Turned off use_ellipsis (it breaks
-	emulate_label_resize) and on emulate_label_resize.  Fixes Ximian
-	bug #13693.
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Doh!  We should be sorting our contacts so that the
-	most frequently used ones are at the top of the list, not the
-	bottom.
-
-	* backend/pas/pas-book.c (pas_book_check_queue): That should be a
-	bonobo_object_unref, not a gtk_object_unref.
-	(pas_book_queue_request): Likewise, we need to bonobo_object_ref
-	here.
-	(pas_book_destroy): If our pas_book_check_queue timeout is still
-	active, disable it.  This should never happen, but it never hurts
-	to be careful.
-	(pas_book_destroy): Set book->priv to NULL after we free it.
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): copy phone
-	labels and show phone as well, clear correct entry text and
-	correctly detect unsyncable cases
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): touch the
-	record on lookup
-	(check_for_slow_setting): write touched only if we are doing a
-	slow sync
-	(card_removed): don't touch on lookup
-	(match): touch on lookup
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_check_queue): Added paranoid
-	reentrancy guards.
-	(pas_book_queue_request): Changed our idle handler into a timeout,
-	so as to work w/ reentrancy guards.
-	(pas_book_init): Explicit initialization.
-
-2001-10-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.h: add prototypes for
-	addressbook_config_database, and addressbook_load_default_book.
-
-	* gui/component/addressbook.c (addressbook_config_database): new
-	function, so we aren't activating the db everywhere we need to use
-	it.
-	(addressbook_load_default_book): load the default book, after
-	getting the uri from bonobo-config.
-
-2001-10-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-util.c (simple_query_card_added_cb): Return
-	on cancellation.
-	(simple_query_sequence_complete_cb): Act if not cancelled.
-	(simple_query_book_view_cb): Free & return on cancellation.
-	(e_book_simple_query_cancel): Set cancellation flag.
-
-	* gui/component/e-address-popup.c (e_address_popup_query): Hold a
-	reference to ourselves for the duration of our addressbook fetch.
-	(start_query): Release when we've fetched our addressbook.
-	(e_address_popup_cleanup): Break out most of what we do in
-	_destroy into a separate function.
-	(e_address_popup_destroy): Class cleanup.
-	(contact_editor_cb): Paranoid clean-up.
-	(add_contacts_cb): Paranoid clean-up.
-	(e_address_popup_ambiguous_email_add): Paranoid clean-up.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/e-address.conduit.in: remove the merges as valid sync
-	types
-
-	* conduit/address-conduit.c (pre_sync): write out only the touched
-	records if we are doing copies
-
-	* conduit/address-conduit-config.h
-	(addrconduit_load_configuration): get the sync type
-
-2001-10-26  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c (e_address_popup_destroy):
-	Cancel any pending queries.
-
-	* gui/contact-editor/e-contact-editor.c (close_dialog): Don't
-	assert, but check if ce->app != NULL, since this function can
-	(apparently) get called multiple times.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists): Remove bad
-	dialog ref-counting crap.
-
-	* gui/contact-editor/e-contact-editor.c (save_card): Ref our
-	EContactEditor, since we are holding a pointer to it in
-	EditorCloseStruct.
-	(card_modified_cb): Unref our EContactEditor when we free our
-	EditorCloseStruct.
-	(card_added_cb): Unref our EContactEditor when we free our
-	EditorCloseStruct.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.c (check_for_slow_setting): make debug
-	info more accurate
-	
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (e_addr_context_destroy): prevent
-	double unref
-	(cursor_cb): correct typo
-	(card_removed): remove the card from the map if was archived and
-	is now deleted
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.h: new member
-
-	* conduit/address-conduit.c (print_remote): free the struct after
-	using it
-	(e_addr_context_new): make consistent with other conduits
-	(e_addr_context_destroy): properly destroy the context
-	(cursor_cb): no need to ref the card, its done for us
-	(clear_entry_text): util function to free a field
-	(free_local): free a local record
-	(local_record_to_pilot_record): use a static buffer so we don't
-	have to free it later
-	(local_record_from_ecard): only fill in the fields we might not
-	sync, clear a field before replacing the contents
-	(for_each): track locals
-	(for_each_modified): ditto
-	(free_match): use free_local
-
-2001-10-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h
-	(set_has_cursor): Added has_cursor argument.  Setting the argument
-	to TRUE if the minicard doesn't have focus will grab the focus.
-	Fixes Ximian bug #3024.
-
-2001-10-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Initialize
-	gnome-vfs.
-
-	* gui/component/addressbook-component.c (xfer_file): Added.
-	(Copied from the calendar.)
-	(xfer_folder): Fixed to allow renaming of contact folders.
-
-2001-10-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): Removed key_press handler here
-	since delete and backspace are now handled by keybindings.
-
-2001-10-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c: Fix command paths when we specify
-	our pixmaps, so we don't get a lot of totally useless & very ugly
-	bonobo-ui spew.
-
-	* backend/ebook/e-book-util.c (e_book_nickname_query): The empty
-	string as an arg shouldn't generate a warning.
-
-	* gui/component/select-names/e-select-names-completion.c: Removed
-	our cancelled flag and e_select_names_completion_cancel function,
-	since we were just duplicating stuff that had ended up in
-	ECompletion.
-	(match_name): Form our menu_text properly on an additional-name
-	match.
-	(e_select_names_completion_got_book_view_cb): Store handles for
-	our signals, disconnect them properly when we switch book views.
-	(e_select_names_completion_stop_query): Disconnect signals when we
-	stop our query.
-	(check_capabilities): Spew if we are using LDAP for completion.
-	(e_select_names_completion_destroy): Disconnect our signals when
-	we destroy.
-	This all should fix bug #10241.
-
-2001-10-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Set "draw_button" argument to TRUE
-	on this EEntry.
-
-2001-10-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-save-as.c (save_it): Put up an
-	error dialog if there's an error while saving.  If the person hits
-	cancel on the "file exists" dialog, don't close the file selection
-	dialog.  Fixes Ximian bug #7055.
-
-2001-10-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(model_and_selection_free): right_click_up here when we let go of
-	the popup.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_selection_event):
-	right_click_up here.
-
-2001-10-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section, e_select_names_set_default): Use an
-	EEntry here instead of a GtkLabel.  Fixes Ximian bug #7067.
-
-2001-10-21  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (control_activate_cb): Call
-	e_addressbook_model_force_folder_bar_message when we activate the
-	component. (Fixes bug #11749)
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_force_folder_bar_message): Added.  Forces
-	emission of a folder_bar_message.
-
-2001-10-20  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_set_default): stick with the style font if the
-	efont bold font does not exist.	
-	(e_select_names_set_default): don't forget to unref the oldstyle.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): Fix memory leak.
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): Free our
-	string vector letter_v when we are done with it.
-
-	* gui/contact-editor/e-contact-quick-add.c (edit_card): Unref our
-	QuickAdd structure.
-
-	* gui/component/e-address-popup.c (e_address_popup_construct):
-	Unref our style after we are done with it.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): We
-	shouldn't leak the info returned by oaf_query.
-
-	* gui/contact-editor/e-contact-quick-add.c (card_added_cb): Remove
-	superfluous call to quick_add_unref.
-	(editor_closed_cb): Remove superfluous call to quick_add_unref.
-
-	* gui/component/select-names/e-select-names.c (esn_get_key_fn): We
-	need to unref the card returned by e_addressbook_model_get_card.
-
-2001-10-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Make LDAP servers
-	non-user-creatable.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_print_card): Check that the
-	string we are checking for xml-ness is non-NULL.
-
-	* backend/ebook/e-destination.c (e_destination_importv): Filter
-	out empty destinations. (also Bug #13036)
-
-	* printing/e-contact-print.c (e_contact_build_style): Use
-	gnome_font_new_closest; if gnome_font_new fails and returns NULL,
-	our spacing gets all messed up. (Bug #10785)
-	
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_can_print):
-	Allow printing if there are any cards in our view.  The selection
-	has nothing to do with it.
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Check
-	for strings that contain non-whitespace, rather than just looking
-	for a non-zero first character. (Bug #13036)
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_selection_event):
-	Handle focus_change in event by selecting that contact.  Fixes
-	Ximian bug #3024.
-
-	* gui/component/addressbook-component.c (owner_unset_cb):
-	Repeatedly call gtk_main_quit here as long as there is a main loop
-	around.  This is an ugly hack around Ximian bug #11760.
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c: Added #include
-	<gal/widgets/e-unicode.h>.
-
-	* gui/widgets/e-minicard-control.c: Made this display the number
-	of extra cards in the attachment as well as made it save them all
-	to the local addressbook if the person selects the button.  Fixes
-	Ximian bug #9507.
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Changed this to not
-	grab on a right click.  Fixes Ximian bug #12660.
-
-2001-10-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_motion): Get @folder_type here too [to
-	match the changes in the EvolutionShellComponentDnd interface].
-	Also, remove a debugging message.
-	(destination_folder_handle_drop): Likewise.
-
-2001-10-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (add_menu_item):
-	Translate labels in select-names option menu. (Bug #9604)
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Made the default window size
-	slightly wider. (Bug #7516)
-
-2001-10-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h
-	(e_card_list_get_vcard): Made this take a const GList.
-
-2001-10-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(check_capabilities): Added.  Check if our book is local or
-	networked.
-	(e_select_names_completion_book_ready): Call check_capabilities.
-	(e_select_names_completion_new): Call check_capabilities.
-	(e_select_names_completion_do_query): If we have a networked book,
-	keep trying if we haven't been able to cache any cards --- our
-	earlier attempts could have failed due to too many matches. (Bug
-	#12932)
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_out_cb): Lag our cardification on focus-out.  This seems to
-	help with the unintended cardifications that can result from the
-	weird focus-out/focus-in events that get generated when the popup
-	disappears.
-
-	* backend/ebook/e-card-compare.c: Removed some debug spew.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	grab focus in the Account entry when preparing the dialog, fixes
-	#10406.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (new_folder): make
-	sure to also add "ldap-contacts" folders to the option menu.
-
-2001-10-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): sync all
-	the fields we can, with out overwriting
-	(local_record_from_ecard): write the fields to the pilot in
-	priority order unless there are fields on the pilot we can't
-	store, then fill in the fields as they are on the pilot
-
-2001-10-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_vobject): Did a bit of clean
-	up here.  Might fix some crashes, specifically Ximian bug #10164.
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Updated the model
-	column numbers here.  Fixes Ximian bug #12308.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_upgrade_db):
-	add upgrade from 0.1 to 0.2, where we make sure id dbt's match
-	vcard id's, fixes longstanding bug (#7406) where cards were not
-	modifiable or removable after having been created during a 1-2
-	week long window in early betas.
-	(PAS_BACKEND_FILE_VERSION): change to 0.2
-	(PAS_ID_PREFIX): #define this here.
-	(pas_backend_file_create_unique_id): use PAS_ID_PREFIX instead of
-	the string.
-
-2001-10-16  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-ldif-importer.c (support_format_fn): Return
-	FALSE if no extension.
-
-2001-10-16  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_id): If card->id is NULL,
-	return an empty string.
-	(e_card_set_id): Don't allow the card id to be set to NULL; use
-	the empty string instead.
-	(e_card_get_vobject): When building our vcard, pass in the empty
-	string as the id if card->id is NULL. (Bug #10164)
-
-2001-10-16  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): don't set
-	the phone info if it is blank
-	(ecard_from_remote_record): save up to 3 fax numbers
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	unref the book after we pass it off to evolution-addressbook.
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_dtor): unref
-	op->view.
-	(pas_backend_ldap_process_create_card): ref op->view.
-	(remove_card_dtor): unref op->view.
-	(pas_backend_ldap_process_remove_card): ref op->view.
-	(modify_card_dtor): unref op->view.
-	(pas_backend_ldap_process_modify_card): ref op->view.
-	(ldap_search_dtor): unref op->view.
-	(pas_backend_ldap_search): ref op->view.
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-	
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_book_view): make sure to unref the
-	book_view here so we don't leak them.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): call
-	e_passwords_init and e_passwords_shutdown.
-
-2001-10-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (addPropValueQP, addPropValueSets,
-	e_card_get_vobject): Properly decide whether a property needs to
-	be marked as QP by searching for '\n'.  Fixes Ximian bug #3021.
-
-2001-10-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as,
-	e_contact_list_save_as): Set the default file name here.  Fixes
-	Ximian bug #7053.
-
-2001-10-14  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Added linebreaks to our
-	"this shouldn't happen" dialog message. (Bug #12498)
-
-2001-10-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Add a component name
-	to the e_passwords_init() call.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/evolution-ldif-importer.c: commit the importer
-	originally from Michael M. Morrison, with fixups by toshok.
-
-	* backend/ebook/Makefile.am (bin_PROGRAMS): add
-	evolution-ldif-importer.
-	(oaf_in_files): add
-	GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.
-
-	* backend/ebook/e-card-simple.h: add WANTS_HTML and IS_LIST.
-
-	* backend/ebook/e-card-simple.c (field_data): add WANTS_HTML and
-	IS_LIST.
-	(e_card_simple_set): fix typo.
-
-	* backend/ebook/.cvsignore: ignore
-	GNOME_Evolution_Addressbook_LDIF_Importer.oaf and
-	evolution-ldif-importer.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in:
-	ldif importer oafinfo.
-
-2001-10-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added a boolean type here.
-
-2001-10-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): Check to see if the uri we are
-	setting is the same as the current uri.  If so, do nothing.
-	(Bug #11324)
-
-2001-10-11  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c
-	(e_destination_reverting_is_a_good_idea): Added.  Heuristic for
-	whether or not we want to revert to an earlier cardified state.
-	(e_destination_cardify): Don't be quite as aggressive about
-	reverting to previous cardified states. (Bug #11890)
-
-2001-10-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_destroy,
-	fill_in_info, e_card_simple_sync_card, e_card_simple_set_phone,
-	e_card_simple_set_address, e_card_simple_set_delivery_address,
-	file_as_get_style, file_as_set_style, e_card_simple_set,
-	e_card_simple_set_arbitrary),
-	gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_destroy,
-	e_contact_editor_address_set_arg,
-	e_contact_editor_address_get_arg),
-	gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_destroy,
-	e_contact_editor_fullname_set_arg,
-	e_contact_editor_fullname_get_arg),
-	gui/contact-editor/e-contact-editor.c (phone_entry_changed,
-	address_text_changed, name_entry_changed, full_name_clicked,
-	full_addr_clicked, fill_in_info): Changed these to use the new ref
-	and unref functions for ECard auxillary types.
-
-	* backend/ebook/e-card-simple.h: Added a comment.
-
-	* backend/ebook/e-card-types.h: Added ref_count field to all the
-	types.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added ref and
-	unref functions here for all the ECard auxillary types.  Removed
-	the corresponding free functions.  Switched to using these
-	functions where appropriate.
-
-	* gui/component/addressbook-factory.c: #include
-	<e-util/e-passwords.h>
-
-	* gui/component/addressbook.c (load_uri_cb): const correctify.
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names.c: #include
-	<addressbook/gui/component/addressbook.h>
-
-	* gui/widgets/e-addressbook-model.c (modify_card): Removed an
-	unnecessary ref here.
-
-2001-10-11  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_folder):
-	Don't need this any more.
-
-2001-10-11  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (new_contact_cb): Check that
-	view->view != NULL.
-	(save_contact_cb): Check that view->view != NULL.
-	(search_cb): Check that view->view != NULL.
-	(delete_contact_cb): Check that view->view != NULL.
-	(print_cb): Check that view->view != NULL.
-	(print_preview_cb): Check that view->view != NULL.
-	(stop_loading_cb): Check that view->view != NULL.
-	(cut_contacts_cb): Check that view->view != NULL.
-	(copy_contacts_cb): Check that view->view != NULL.
-	(paste_contacts_cb): Check that view->view != NULL.
-	(select_all_contacts_cb): Check that view->view != NULL.
-	(send_contact_cb): Check that view->view != NULL.
-	(send_contact_to_cb): Check that view->view != NULL.
-	(update_command_state): Check that view->view != NULL.  Hold a
-	reference to the AddressbookView for the duration of the function,
-	in case we exit during bonobo-reentrancy.
-	(addressbook_view_ref): Added.
-	(addressbook_view_unref): Added.  Simple ref counting for
-	AddressbookView objects.
-	(addressbook_view_clear): Zero out an AddressbookView.  This is
-	now separated from the deallocation of the AddressbookView object,
-	so that we don't leave a dangling pointer if we exit during
-	bonobo-reentrancy in update_command_state. (Which often seems to
-	happen if we exit while addressbook operations are going on.)
-	(destroy_callback): Replace previous call to addressbook_view_free
-	with addressbook_view_clear/addressbook_view_unref calls.
-	(addressbook_factory_new_control): Initialize the reference count
-	in the AddressbookView object.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_destroy):
-	Carefully zero out our destroyed object.
-	(command_state_change): Hold a reference to ourselves during the
-	signal emission.
-	(get_selected_cards): Ref cards as we add them to the list.
-	(e_addressbook_view_stop): Check for view != NULL.
-	(e_addressbook_view_can_create): Check for view != NULL.
-	(e_addressbook_view_can_print): Check for view != NULL.
-	(e_addressbook_view_can_save_as): Check for view != NULL.
-	(e_addressbook_view_can_send): Check for view != NULL.
-	(e_addressbook_view_can_send_to): Check for view != NULL.
-	(e_addressbook_view_can_delete): Check for view != NULL.
-	(e_addressbook_view_can_cut): Check for view != NULL.
-	(e_addressbook_view_can_copy): Check for view != NULL.
-	(e_addressbook_view_can_paste): Check for view != NULL.
-	(e_addressbook_view_can_select_all): Check for view != NULL.
-	(e_addressbook_view_can_stop): Check for view != NULL.
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): Be
-	careful about zeroing out our destroyed object.
-	
-	* backend/ebook/e-book-view.c (e_book_view_stop): Added.  Stops
-	event processing in the underlying listener.
-
-2001-10-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_destroy): If our select names dialog is
-	still around, destroy it.  Otherwise, the dialog will hang around
-	after our composer goes away.
-
-2001-10-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.glade: add an Email Address
-	field/label/help text.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fill in the email entry
-	from the source.  also, set the initial state of the email
-	label/entry.
-	(auth_checkbutton_changed): set the email label/entry
-	sensitive/editable if auth is turned on, and
-	insensitive/uneditable if it's off.
-	(addressbook_source_dialog_get_source): get the email address from
-	the email entry.
-	(addressbook_source_dialog): hook up the email entry to the
-	changed signal foo, as well as the focus handler for displaying
-	help text.
-
-2001-10-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): db isn't a BonoboObject, so don't
-	bonobo_object_unref it!
-
-2001-10-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): e_book_load_uri ->
-	addressbook_load_uri.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): e_book_load_uri ->
-	addressbook_load_uri.
-
-	* gui/component/addressbook.c (forget_passwords_cb): new function,
-	call e_passwords_forget_passwords.
-	(verbs): Add ContactsForgetPasswords.
-	(load_uri_auth_cb): new function, call the callback and free up
-	our closure stuff.
-	(load_uri_cb): once the uri is loaded, check if we're configured
-	to authenticate for it, and do so, using the e_passwords stuff.
-	(addressbook_load_uri): wrapper around e_book_load_uri.  save off
-	the parameters and start the load-with-auth machinery.
-	(book_open_cb): remove all the auth stuff from here, as it's
-	handled elsewhere now.
-
-	* gui/component/addressbook-factory.c (main): call
-	e_passwords_init.
-
-	* gui/component/addressbook-component.c (user_create_new_item_cb):
-	e_book_load_uri -> addressbook_load_uri.
-	(destination_folder_handle_drop): same.
-
-	* gui/component/addressbook.h: add prototype for
-	addressbook_load_uri (a wrapper around e_book_load_uri that also
-	handles authentication if the user selects it.)
-
-2001-10-05  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Check to make sure our call to
-	e_addressbook_model_get_card doesn't return NULL.
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_get_card): Chek that we aren't requesting a
-	negative row.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (add_email_cb):
-	Move to the bottom of the scrolled window, so we can see the
-	address we just added.
-	(table_drag_data_received_cb): Move to the bottom of the scrolled
-	window, so we can see the contact we just dropped.
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	We don't own the string returned by e_categories_master_list_nth,
-	so terrible things will happen if we free it. (Bug 10916)
-
-2001-10-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_set_arg):
-	don't set the editable field on the model - let the book do that.
-	(book_writable_cb): call writable_status to propagate a ui-change
-	event up (and sensitize the write-only toolbar buttons after you
-	authenticate with ldap.)
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): for some
-	reason, matching on protocol is causing problems for me.
-	disabling it for now.
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c: use ldap.png for ldap
-	contacts.
-
-2001-10-03  Iain Holmes  <iain@ximian.com>
-
-	* addressbook/gui/component/addressbook-storage.c 
-	(addressbook_storage_setup): Only load_storages if you have LDAP.
-	(load_source_data): Only do stuff if you have LDAP.
-
-2001-10-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height),
-	gui/widgets/e-minicard.c (remodel): Fixed these to determine the
-	fields to use properly.
-
-2001-10-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): Strip out commas before forming our query.
-	(match_name): Use e_card_compare_name_to_string_full, rather
-	than our crufty old matching code.  Not only is this cleaner,
-	but that crufty old code was very broken when it came to 
-	handling strings with whitespace. (Bug 8988)
-	(match_nickname): utf8 and bug fixes.
-
-	* backend/ebook/e-card-compare.c
-	(e_card_compare_name_to_string_full): Added.  This is basically
-	e_card_compare_name_to_string with a bunch of extra options, so
-	that it can more readily be reused in other contexts.
-	(e_card_compare_name_to_string): This is now just a call to
-	e_card_compare_name_to_string_full with the extra args filled in
-	to defaults that simulate the old behavior.
-
-2001-10-02  Chris Toshok  <toshok@ximian.com>
-
-        * backend/ebook/e-book.c (e_book_construct): remove most of the
-	oaf stuff from here.  we do it in load_uri, where we'll have more
-	information (namely, the protocol we're using.)
-	(activate_factories_for_uri): do an oaf query to get a list of all
-	objects implementing our BookFactory interface and also supporting
-	the protocol used in the uri.
-        (e_book_load_uri): try activating book factories to handle this
-	uri, and start the iteration over the list.
-        (e_book_load_uri_from_factory): try and load the uri.
-        (e_book_load_uri_open_cb): callback function for the
-	BookFactory_openBook call - if it succeeds, call the user's
-	callback.  otherwise step to the next factory.
-        (e_book_load_uri_step): go to the next factory in our list, and
-	error out if there are no more.
-	
-2001-10-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_get_textification): Made the max length of
-	the textification be 2047 characters.  Fixes Ximian bug #3021.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): if there
-	was no first name or last name, file as the company.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-	
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): if there is a db error,
-	assume deletion
-	(pas_backend_file_changes): write after all is done for efficiency
-
-2001-09-28  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): g_strdup
-	(pas_backend_file_changes): ditto, make sure to free all data and
-	do a hash write after each add/remove
-
-	* conduit/address-conduit.c (local_record_to_pilot_record): use
-	the local record category
-	(local_record_from_ecard): ndle the fields and category we don't
-	sync by making sure we don't overwrite them
-
-2001-09-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_construct): do an oaf query to
-	get a list of all objects implementing our BookFactory interface,
-	instead of just activating the one IID.  this should really be a
-	global list, not a per EBook.
-	(e_book_load_uri): start the iteration over our list of
-	BookFactory's.
-	(e_book_load_uri_from_factory): try and load the uri.
-	(e_book_load_uri_open_cb): callback function for the
-	BookFactory_openBook call - if it succeeds, call the user's
-	callback.  otherwise step to the next factory.
-	(e_book_load_uri_step): go to the next factory in our list, and
-	error out if there are no more.
-
-2001-09-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): use the old
-	record (if there was one) so as not to overwrite fields we don't
-	sync
-	(pre_sync): store the dbi in the context and don't make it object
-	data
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_destroy): use
-	priv->iid instead of the hardcoded string here.
-	(pas_book_factory_activate): parameterize the factory's iid, as in
-	the calendar server, and provide a default if iid == NULL.
-
-	* backend/pas/pas-book-factory.h: add iid parameter for
-	pas_book_factory_activate.
-
-2001-09-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_textrep): Use
-	camel_address_format, not camel_address_encode.
-
-2001-09-26  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Added help text (thanks 
-	to Aaron) and re-worded the labels, and fixed the shortcuts on the 
-	brand-spanking-new Collaboration tab.
-	
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.h: add
-	completion_book.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): get /Addressbook/Completion/uri, and
-	if it's present, use the corresponding EBook for completing
-	addresses.
-	(focus_out_cb): use manager->completion_book here instead of NULL,
-	which corresponds to the local addressbook.
-	(completion_popup_cb): same.
-	(e_select_names_manager_create_entry): same.
-
-2001-09-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name_to_string):
-	Properly handle names when the individual elements (given,
-	addition, family) contain whitespace.  (Bug #10502)
-
-	* backend/ebook/e-destination.c (e_destination_set_name): Reset
-	textrep when we change the name.
-	(e_destination_set_email): Reset textrep when we change the email.
-	(e_destination_get_textrep): Make sure that the textrep version of
-	the address is properly quoted if it contains unsafe characters.
-	(All related to bug #10796)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Fix nickname matching. (bug #9698)
-	(make_match): Use e_completion_match_new when building our match,
-	rather than ad hoc manipulation of the struct.
-
-2001-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes): set
-	the last_use and use_score fields of the card to known values so
-	the card doesn't register as changed when only they have changed
-
-2001-09-26  Peter Williams  <peterw@ximian.com>
- 
- 	* conduit/address-conduit.c (ecard_from_remote_record): Fix this function
- 	to set email addresses properly, and handle multiple occurrences of
- 	email addresses, home phone numbers, and business phone numbers.
-	
-2001-09-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (user_create_new_item_cb):
-	Handle creating the new contact in the current folder if it's a
-	contacts folder.  Fixes Ximian bug #7814.
-
-2001-09-24  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/Makefile.am (LDAP_SCHEMA): add
-	evolutionperson.schema
-	(EXTRA_DIST): add LDAP_SCHEMA to the dist (but don't install it).
-
-2001-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): sync the
-	note the to pilot and make sure to blank fields when appropriate
-	(local_record_from_ecard): sync the note to the desktop
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (do_create): g_free (id) in the
-	error case to plug a memory leak.
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (remodel): when creating the cards,
-	don't display any of the subname fields (surname, given, middle,
-	suffix, etc.)
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-simple.c
-	(e_card_simple_get): add getters for the additional name fields.
-	(field_data): move FAMILY_NAME to the end of the list, and add
-	GIVEN_NAME, ADDITIONAL_NAME (middle name), and NAME_SUFFIX.
-	
-	* backend/ebook/e-card-simple.h: same.
-
-2001-09-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (print_preview_cb): Hooked up print
-	preview button.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h
-	(e_addressbook_view_print_preview): Added this function.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h
-	(e_contact_print_preview): Added this function.
-
-2001-09-19  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (name_and_email_simple_query_cb):
-	Use the default e-mail address if we have nothing else to go on.
-	Previously we just failed, which basically meant that name-only
-	searches would never work properly.
-	(nickname_simple_query_cb): The logic was a bit tangled here; if
-	our query status isn't SUCCESS, always give up but don't leak the
-	destination.  And if our nickname query fails and we try the
-	name-and-email query, use the textrep for a name-only search.  The
-	only reason we are doing a nickname query in the first place is if
-	we have an obviously invalid e-mail.
-	(launch_cardify_query): Use e_destination_is_valid to determine
-	if we should try a nickname query first.
-	These changes basically fix bug 7728, and generally make the
-	auto-cardification of addresses a lot more clever and robust.
-
-	* backend/ebook/e-book-util.c (name_and_email_cb): Use
-	e_card_compare_name_to_string instead of e_card_name_match_string.
-	(e_book_name_and_email_query): The arguments to g_strsplit were
-	in the wrong order.  Doh!
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name_to_string):
-	Added.  Replaces e_card_name_match_string, and actually works.
-
-	* backend/ebook/e-card.c: Removed e_card_name_match_string
-	function, which didn't work particularly well.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (cursor_cb): don't add to the complete
-	list of cards if the card is a list
-	(card_added): don't add to the list of changes if the card is a
-	list
-	(card_changed): ditto
-	(card_removed): ditto
-
-2001-09-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Change the "this should
-	never happen" message into a request for people to e-mail me
-	directly with info if they encounter that error.
-
-	* backend/ebook/e-book-util.c (e_book_name_and_email_query):
-	Freeing name[i] instead of namev[i] is a bad idea. (bug #10270)
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Properly handle our GnomeUIInfo labels so that
-	they won't be leaked if they are dynamic strings, so that they
-	will be i18n-correct, and so that underscores won't be interpreted
-	as key accelerators.  What a PITA.  Also, don't leak our
-	iterators.  (Bug #10200.)
-	(popup_menu_list): The same GnomeUIInfo tweaking as in
-	popup_menu_card.
-	(popup_menu_nocard): Ditto.
-
-2001-09-18  JP Rosevear  <jpr@ximian.com>
- 
- 	* backend/ebook/e-card-simple.c (field_data): add caluri field data
- 
- 	* backend/ebook/e-card.c (e_card_get_vobject): add the caluri
- 	property when appropriate
- 	(parse_caluri): handle read caluri
- 	(e_card_class_init): add caluri arg
- 	(e_card_destroy): free the caluri
- 	(e_card_get_arg): return caluri arg
- 	(e_card_set_arg): set caluri from arg
- 	(e_card_init): init caluri to null
- 
- 	* backend/ebook/e-card-simple.h: new simple field
- 
- 	* backend/ebook/e-card.h: new member
- 
- 	* gui/contact-editor/e-contact-editor.c (field_changed): util
- 	callback to change the command state
- 	(set_entry_changed_signal_field): hook up a change signal to above
- 	(set_entry_changed_signals): use above function
- 
- 	* gui/contact-editor/e-contact-editor.glade: Add collaboration
- 	page and fields
-	
-2001-09-18  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_build_cards_list): create a sexp and check if
-	the cards match before adding them to the list
-	(pas_backend_file_process_get_cursor): send extra param
-
-2001-09-18  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_process_card_list): unref the destination regardless
-	of whether we get an email addresss.
-
-2001-09-17  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): use g_strfreev.
-	(match_name): s/g_free/g_strfreev.
-	(match_file_as): s/g_free/g_strfreev.
-
-	* backend/ebook/e-book-util.c (e_book_name_and_email_query): fix
-	the memory handling here.  All there members of the vector need to
-	be freed all the time.
-
-	* backend/ebook/load-pine-addressbook.c (parse_line): free the
-	string outside of the test that makes sure there are three
-	entries.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): don't malloc a match we will never use.
-
-	* gui/widgets/e-addressbook-model.c (get_view): free the dup'd
-	capabilities.
-
-2001-09-17  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_valid): We want
-	to assume that a destination that comes from a card is
-	automatically valid, but the right way to check that is by calling
-	e_destination_from_card, not by checking if dest->priv->card !=
-	NULL.  (Fixed bug #10017)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Fixed a stupid bug was causing completion to fail
-	for contacts who have only one name.  (The classic example we all
-	know and love is 'George <jirka@5z.com>')  (bug #8353)
-
-	* backend/ebook/e-card.c (e_card_list_send): Do the right thing if
-	the card we are trying to send to has no valid e-mail addresses.
-	(bug #10137)
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Code implicitly
-	assumed that event->button.button is 1, 2, or 3, causing disaster
-	when using a wheel-mouse.  Fixed. (bug #9400)
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (_phone_arrow_pressed):
-	use enable_widget instead of gtk_widget_set_sensitive.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(disable_widget_foreach): same.
-	(enable_writable_fields): same.
-	(set_editable): same.
-	(enable_widget): new function, using both gtk_widget_set_sensitive
-	and *_set_editable to allow the user to select text in GtkEntry's
-	and GtkText's.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_set_arg): use set_editable as well as
-	set_sensitive, to allow the user to select text in GtkEntry's.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_set_arg): same.
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: fix syntax errors (which are
-	broken, imo...)
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.h: reorder the LDAP scopes so
-	that they match the order of the option menus in the glade file.
-
-	* gui/component/addressbook-config.c (auth_checkbutton_changed):
-	new function, mostly there to house some #ifdef'ed out code.
-	(option_menuitem_activated): new function, to keep track of
-	changes to the ldap scope optionmenu.
-	(addressbook_source_dialog_set_source): set the menu history as
-	well as the dialog's copy of the scope.
-	(addressbook_source_dialog_get_source): fill in the source's scope
-	from the dialog's copy, and add more #if the_ui_gods_smile_on_me
-	code.
-	(add_activate_cb): new function, add an activate callback for the
-	optionmenu's items.
-	(addressbook_source_dialog): more #if the_ui_gods_smile_on_me
-	code, always start the dialog on page 0, and hook up the
-	scope optionmenu's items.
-
-2001-09-15  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): No
-	loose name matches on family names. (#8802)
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): We can't use NULL as the
-	first arg for e_addressbook_show_contact_editor anymore.  Damn.
-	(#8535)
-
-	* backend/ebook/e-book-listener.c (e_book_listener_stop): Make
-	"stop" do nothing but set the stopped flag, as in
-	e-book-view-listener.c.
-	(e_book_listener_destroy): Clean up our queue here, rather than in
-	e_book_listener_stop.
-	(response_free): Added.  Move the rather lengthy bit of code
-	needed to free a EBookListenerResponse into one place.
-	(e_book_listener_check_queue): Properly deal with the stopped
-	flag.
-	(e_book_listener_queue_response): If the stopped flag is set, just
-	drop the incoming response.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_stop): Make "stop" do nothing but set the
-	stopped flag.
-	(e_book_view_listener_destroy): Move all of the clean-up that used
-	to be in e_book_view_listener_stop here.  This considerably simplifies
-	the logic required to avoid various race conditions.
-	(e_book_view_listener_check_queue): Properly deal with the stopped flag.
-	(e_book_view_listener_queue_response): Drop all incoming responses if
-	we are stopped.
-
-2001-09-14  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_request): Hold a
-	reference to the book on behalf of our idle function.
-	(pas_book_check_queue): When we are finished, drop the reference
-	we've been holding on behalf of the idle function.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): Hold a reference to the
-	book_view while sending our notifications.
-	(pas_backend_file_process_remove_card): Hold a reference to the
-	book_view while sending our notifications.
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_unref): Remove
-	debugging spew.
-
-	* backend/ebook/e-book-util.c: Remove a lot of unused code that
-	worked around bugs that have long since been fixed.
-	(simple_query_disconnect): Added.  Breaks out the part of
-	simple_query_free that disconnect signals.
-	(simple_query_free): Replace code w/ a call to
-	simple_query_disconnect.
-	(simple_query_sequence_complete_cb): Call simple_query_disconnect
-	before executing the callback, so that our callbacks don't get
-	triggered by any book changes that might occur during that
-	callback.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Changed to be consistent with
-	e_book_listener_check_queue.
-	(e_book_view_listener_queue_response): Also changed to use a
-	high-frequency timeout.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	OK, I've agonized over this stupid little function, and it should
-	now be race-free.
-	(e_book_listener_queue_response): We process our response queue in
-	a high-frequency timeout rather than an idle.  Using an idle
-	function leads to some tricky race conditions and bad interactions
-	with bonobo's semi-broken attempts to take over event processing.
-	(e_book_view_listener_stop): Manually disable our timeout and
-	clean up.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Automake 1.5 fixes pointed out by Richard Boulton
-	<richard@tartarus.org>, as per #9258.]
-
-	* gui/component/select-names/Makefile.am: Set CLEANFILES directly
-	instead of using `+='.
-
-	* backend/pas/Makefile.am: Rename `LDAP_BACKEND_SOURCES' to
-	`LDAP_BACKEND_FILES'.
-
-	* backend/ebook/Makefile.am: Set CLEANFILES directly instead of
-	using `+='.
-
-2001-09-13  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): use
-	ldap_init.  ldap_open is deprecated in openldap 2.x.
-
-2001-09-12  Iain Holmes  <iain@ximian.com>
-
-	* backends/ebook/evolution-vcard-importer.c (check_file_is_vcard):
-	Fix the check.
-
-2001-09-12  Larry Ewing  <lewing@ximian.com>
-
-	* backend/ebook/e-destination.c: free the values that are being
-	leaked here.
-
-2001-09-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c (match_email): 
-	printf arguments were reversed by mistake.  Fixed bug #9693.
-
-2001-09-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_list): Added.  Treat right-clicks on a contact list as
-	a special case.
-	(e_select_names_popup): Check if we are dealing with a contact
-	list.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): See
-	e_book_listener_check_queue below.
-	(e_book_view_listener_queue_response): See
-	e_book_listener_queue_response below.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	Explicitly prohibit reentrancy.  Use gtk-unref rather than
-	bobobo-unref.
-	(e_book_listener_queue_response): Hold a gtk-ref to the listener
-	while the idle function runs, not a bonobo-ref.  As far as I can
-	tell, it is impossible to avoid a race condition here when we have
-	to worry about bonobo reentrancy.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Alter a copy of the
-	original EDestination, rather than just using a new one.  We need
-	to do this to preserve prior-card information for possible
-	reversion later.
-	(e_select_names_text_model_delete): Ditto.
-
-	* backend/ebook/e-destination.c (e_destination_clear_card): When
-	clearing a destination where ->card != NULL, store it for possible
-	reversion later.
-	(e_destination_revert): If we have an old card stored, go back to
-	using it for the destination.
-	(e_destination_is_valid): Tries to detect obviously broken
-	addresses.
-	(e_destination_cardify): If our destination is invalid, first try
-	to cardify simply by reverting to an older card.
-	(e_destination_destroy): Unref any cached old card.
-	(e_destination_copy): Copy the old card information.
-
-2001-09-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(sync_table_and_models): Show all rows in the table, and then
-	remove the rows that correspond to entries in the
-	ESelectNamesModels in the children.
-	(real_add_address): Freeze/thaw our ESelectNamesModel, so that we
-	don't change our table while we are in the middle of iterating
-	over the selection.
-	(remove_address): Just delete the address from the
-	ESelectNamesModel, the signal handler will do the rest.
-	(selected_rows_foreach_cb): Call remove_address to do our dirty
-	work.
-	(e_select_names_add_section): Connect to the 'changed' signal from
-	the ESelectNamesModel, and call sync_table_and_models explicitly to
-	get our initial state correct.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Deal with EDestinations in our table that don't
-	come from cards.
-
-	* gui/component/select-names/e-select-names-manager.c: Added
-	another ESelectNamesModel* to the ESelectNamesManagerSection
-	struct.  Called 'original_model', this contains a copy of the
-	model as it is when we begin using the SelectNames dialog.
-	(section_copy): Copy the original model.
-	(section_free): Free the original model.
-	(e_select_names_manager_add_section_with_limit): Initialize the
-	original model.
-	(e_select_names_clicked): I've changed the semantics of this
-	dialog quite a bit... no UI freeze can stop me!  If OK is clicked,
-	we do nothing.  If Cancel is clicked, we revert to the
-	'original_model' copy of our address entry state before we started
-	editting.  Finally, we close the dialog before any of thing. Doing
-	it last caused problems, because signals were being triggered
-	which had dangling pointers as their closures.
-	(e_select_names_manager_activate_dialog): Copy our current state
-	to the original model, and share the same ESelectNamesModel
-	between the dialog and the address entry in the composer..
-	(e_select_names_manager_get_cards): Removed.  It had been
-	#if 0/#endif-ed out for a while.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_freeze): Added.
-	(e_select_names_model_thaw): Added.
-	(e_select_names_model_uncardify): Added.  If possible,
-	"uncardifies" a specific model entry.
-	(e_select_names_model_changed): Changed to pay attention
-	to the freeze count.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(clean_query_text): Strip leading/trailing whitespace from
-	queries.
-
-	* backend/ebook/e-destination.c (e_destination_uncardify): Added.
-	Converts a card-associated destination into a text-associated
-	destination w/ the e-mail address.
-	(e_destination_list_to_vector): Added.  A convenience routine.
-	(e_destination_freev): Added.  A convenience routine.
-	(e_destination_touchv): Added.  I'm lazy.
-
-2001-09-08  Chris Toshok  <toshok@ximian.com>
-
-	(make_contact_editor_cb): show the right contact editor (the list
-	editor for list cards).
-	
-2001-09-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): do the EDestination xml magic on email
-	addresses we put in the popup.
-
-2001-08-27  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	For every category:
-	- set .translate to FALSE (e_categories_master_list_nth returns
-	translated category name)
-	- convert category name in UTF-8 to locale's encoding
-
-2001-08-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Fixed two bugs:
-	- missing coversion of contact name to GTK+ locale,
-	- passing dynamically created string (contact name) inside uiinfo struct
-	to gnome-app-helper functions.
-	Remember: these functions may change strings, trying to translate them!
-	(popup_menu_nocard): Ditto
-
-2001-09-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c: Removed unused factory
-	variable.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (notify_listener): new
-	function, notify the bonobo listener.
-	(remove_ldap_folder): track change to EvolutionStorage signal.
-	(create_ldap_folder): same, and make sure the type is
-	"ldap-contacts".
-	(load_source_data): folders that we create should have
-	"ldap-contacts" as their type.
-	(addressbook_storage_add_source): same.
-
-	* gui/component/addressbook-component.c: (folder_types): add
-	"ldap-contacts", for display of ldap servers (they get their own
-	icon, and their own name in the Create New Folder dialog.
-	(create_view): use IS_CONTACT_TYPE since we support two folder
-	types now.
-	(create_folder): same.
-	(remove_folder): same.
-	(xfer_folder): same.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: (pixmaps): change
-	/Toolbar/ContactEditorSave to /Toolbar/ContactEditorSaveClose.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (INCLUDES): add -DEVOLUTION_IMAGESDIR.
-
-	* gui/widgets/e-addressbook-view.c (card_deleted_cb): remove
-	status messages from here.
-	(e_addressbook_view_delete_selection): same.
-
-	* gui/widgets/e-addressbook-model.c (sequence_complete): emit a
-	NULL status message along with the stop_state_changed.  The null
-	status message will clear the status bar for this view.
-
-	* gui/component/addressbook.c (set_status_message): use the
-	EvolutionActivityClient stuff.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): remove status
-	message for abandoning a search.
-	(ldap_op_process_current): wrap status messages in _().
-	(ldap_op_process): same.
-	(create_card_handler): same, and remove the notify_status for ""
-	and add a notify_complete call after the card is added.
-	(remove_card_handler): same.
-	(modify_card_handler): same.
-	(poll_ldap): wrap status messages with _(), and remove the "Search
-	Complete" message.
-	(ldap_search_handler): wrap status message.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): use
-	_() on status messages, and make sure the last notify_* called is
-	notify_complete.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #958, ShellComponents should not be created by factories, for
-	the addressbook.]
-
-	* gui/component/addressbook-component.c
-	(GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_FACTORY_ID): Removed.
-	(GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID): New.
-	(create_component): Renamed from `factory_fn'.  Just register the
-	thing on OAF.
-	(addressbook_component_factory_init): Just call it.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Remove the
-	ShellComponentFactory.
-
-2001-09-04  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c (load_file_fn): Return FALSE
-	if the file isn't a valid VCard file.
-
-2001-08-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	I18n fixes (mainly making buttons on the right side less Anglocentric :-)
-
-	* backend/ebook/e-card-simple.c
-	(field_data): Marked "name" and "short_name" fields for translation.
-	(e_card_simple_get_name, e_card_simple_get_short_name): Return
-	localized version of the name (using U_() macro).
-
-	* gui/contact-editor/e-contact-editor.c (set_entry_changed_signals):
-	Connect "changed" signal from "entry-web" entry to widget_changed.
-	(changing this field wasn't making "Save and Close" button sensitive)
-
-	* gui/widgets/Makefile.am (glade_DATA): Removed alphabet.glade.
-
-	* gui/widgets/e-addressbook-view.c
-	(button_labels, button_letters): New strings containing a list of
-	labels and "values" of all buttons placed on the right side of the
-	addressbook view (intended for localization).
-	(struct LetterClosure): Changed the type of letter field to gunichar.
-	(e_utf8_split): New function, similar to g_strsplit, but operates on
-	UTF-8 strings.
-	(jump_to_letter): Don't hardcode letters, build queries dynamically
-	using UTF-8 and localized letters stored in button_letters.
-	(connect_button): Removed.
-	(create_alphabet): Don't use glade file, build buttons manually using
-	(localized) labels from button_labels. Use (localized) values from
-	button_letters when creating LetterClosure.
-
-	* gui/widgets/e-minicard-view-widget.[ch]
-	(e_minicard_view_widget_jump_to_letter): Changed the type of the
-	second argument from char to gunichar.
-
-	* gui/widgets/e-minicard-view.c
-	(compare_to_utf_str): Renamed from compare_to_letter, now operates on
-	UTF-8 string.
-	(e_minicard_view_jump_to_letter): Changed the type of the second
-	argument from char to gunichar + conversion to UTF-8 string.
-
-	* gui/widgets/e-minicard-view.h
-	(e_minicard_view_jump_to_letter): Changed the type of the second
-	argument from char to gunichar.
-
-2001-09-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_add_card, e_book_commit_card),
-	backend/pas/pas-backend-file.c (do_create),
-	backend/pas/pas-backend-ldap.c
-	(create_card_handler, remove_card_handler, modify_card_handler,
-	pas_backend_ldap_process_get_vcard, poll_ldap): Use
-	e_card_get_vcard_assume_utf8 instead of e_card_get_vcard here
-	since all internal communications and database storage are assumed
-	to be utf8.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_duplicate): Simplified this function considerably.
-	(e_card_simple_get_vcard_assume_utf8): Added this function.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h (e_card_new,
-	e_card_load_cards_from_file, e_card_load_cards_from_string): Made
-	these functions pay attention to charset attributes.
-	(e_card_new_with_default_charset,
-	e_card_load_cards_from_file_with_default_charset,
-	e_card_load_cards_from_string_with_default_charset): New functions
-	that let you change the default charset from UTF-8.
-	(e_card_get_vcard): Made this write out charset attributes when
-	necessary.
-	(e_card_get_vcard_assume_utf8): New function that writes out a
-	card without writing out charset attributes.
-
-	* backend/ebook/evolution-vcard-importer.c (book_open_cb),
-	backend/ebook/load-gnomecard-addressbook.c (book_open_cb),
-	backend/ebook/test-card.c (main),
-	gui/component/addressbook-component.c
-	(destination_folder_handle_drop), gui/contact-editor/test-editor.c
-	(main), gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb), gui/widgets/e-addressbook-view.c
-	(selection_received), gui/widgets/e-minicard-control.c
-	(pstream_load): Changed the default charset to be used here to
-	ISO-8859-1.
-
-	* backend/ebook/load-gnomecard-addressbook.c (add_card_cb),
-	backend/ebook/load-pine-addressbook.c (add_card_cb),
-	backend/ebook/test-client-list.c (get_cursor_cb),
-	backend/ebook/test-client.c (get_cursor_cb, get_card_cb): Use
-	e_card_get_vcard_assume_utf8 to print out testing strings.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h
-	(e_select_names_model_contains): Changed this to be const
-	EDestination *dest to fix a warning.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Translate window title here.
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): s/_/U_/
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_compare):
-	Use g_utf8_collate.
-
-	* gui/widgets/e-minicard.c (e_minicard_compare):
-	Ditto.
-
-	* printing/e-contact-print.c (card_compare):
-	Ditto.
-
-2001-08-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_clicked): Use e_select_names_model_merge to
-	combine the selected names with any existing ones.  This causes
-	you to not lose addresses typed directly into the entry while the
-	SelectNames dialog is up. (Bug #8058)
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_merge): Merge the contents of one
-	ESelectNamesModel into another, avoiding duplicates.
-
-	* backend/ebook/e-destination.c (e_destination_equal): Added.
-	Determines if two destinations appear to refer to the same
-	recipient.
-
-	* backend/ebook/e-card.c (e_card_list_send): Added cast to
-	g_free args to silence compiler warnings.
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):
-	Paranoia.  Check that name != qa->name.
-	(quick_add_set_email): Check that email != qa->email.
-	(ce_have_book): Store the QuickAdd data structure in object data,
-	so that we can be extra-careful and avoid having a dangling
-	pointer floating around out somewhere as the closure for a signal.
-	Fixes bug #8155, I think.
-	(card_added_cb): Clear object data to ensure single unref.
-	(editor_closed_cb): Clear object data to ensure single unref.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_score): Make sure that comp->priv->query_text isn't
-	NULL.  (Fixes bug #8195)
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	This function can be re-entrant during the signal emission; Added
-	extra ref/unrefs and checks to avoid problems if this happens.
-	This is similar to my recent changes to
-	e_book_view_listener_check_queue.  (Fixes bug #7400)
-
-2001-08-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Get rid of a warning by
-	initializing the closing NULL element in folder_types correctly.
-
-	* gui/component/select-names/e-select-names.c: Updated to match
-	the studlyCapsification of attributes in shell/Evolution*.idl.
-
-2001-08-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(sexp_file_as): Added.  Generated queries against file_as.
-	(match_file_as): Added.  Match results of queries against
-	file_as. (Bug #8152)
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Added ref/unref pair to make
-	sure that our listener doesn't get finalized during the signal
-	emission and leave us with a dangling pointer. (Bug #7661)
-
-	* backend/ebook/e-card.c (e_card_list_send): Removed some debugging
-	spew that I left in by mistake.
-
-	* gui/widgets/e-addressbook-model.c (create_card): Removed debugging
-	spew.
-
-	* backend/ebook/e-card.c (e_card_list_send): Do the right thing if
-	the card we are trying to send to is a contact list. (Bug #6580)
-
-2001-08-27  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	Display localized status string (added missing _()).
-
-2001-08-24  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_set_card): Put a
-	freeze/thaw around our the set of operations that changes the
-	internal state of our card, so 'changed' signal callbacks won't be
-	invoked on a card in an intermediary state.  This fixes the bug
-	that was causing the e-mail addresses in cards to be blank when
-	replying to a message.  (An unexpected side-effect of toshok's
-	change on 8/22 to make sure that priv->email != NULL).
-	(e_destination_get_name): Code slightly rearranged for (IMO)
-	clarity.
-
-2001-08-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): add
-	BUTTON_PRESS_MASK so double clicks still work.
-
-2001-08-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): switch
-	"full_name" to "x-evolution-any-field" in all the queries where we
-	want to match all cards, since the backends universally handle
-	this special case more efficiently.
-
-2001-08-22  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (extract_info):
-	In the GUI, the toggle is labelled "hide addresses", not "show
-	addresses" -- so we have to reverse the boolean value we read in.
-	(fill_in_info): Same bug as before: since the GUI reads "hide", we
-	have to initialize the toggle to '!show_addresses', not
-	'show_addresses'.
-
-	* backend/ebook/e-destination.c
-	(e_destination_list_show_addresses): Added.
-	(e_destination_xml_encode): Encode the value of
-	e_destination_list_show_addresses into the XML.
-	(e_destination_xml_decode): Read and store the "show_addresses"
-	flag.
-
-2001-08-22  jacob berkman  <jacob@ximian.com>
-
-	* gui/component/e-address-popup.c (emit_event): emit an event from
-	our event source
-	(contact_editor_cb): emit a destroy event so our control frame can
-	be destroyed.
-	(edit_contact_info_cb): emit a hide event so our control frame can
-	be hidden
-	(e_address_popup_cardify):
-	(add_contacts_cb): emit the destroy event
-	(e_address_popup_factory_new_control): don't unref our object at
-	widget destroy time as that was really really broken
-	(e_address_popup_factory_new_control): create an event source and
-	aggregate ourself with it
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	display a nicer warning when we can't find a widget for a given
-	field
-	(e_contact_editor_raise): only raise if there is a window
-
-	* gui/contact-editor/contact-editor.glade: name some widgets that
-	got unnamed, and set the first entry as defaultable
-
-	* gui/contact-editor/e-contact-editor.c: envelope printing is
-	disabled in 1.0
-
-2001-08-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_email): make
-	sure we don't get into a situation where priv->email == NULL.
-
-2001-08-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): if we're dragging,
-	drag_button_down won't be true in the BUTTON_RELEASE case, since
-	we set it to false in MOTION_NOTIFY once the threshold is reached.
-	(e_minicard_drag_end): remove this function, since it was needed
-	to work around a bug in gnome-canvas.
-	
-2001-08-20  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table): Wrap our addressbook table
-	adapter in an ETableWithout, so that we can make addresses appear
-	and disappear when we remove/add them to the section lists
-	(To/Cc/Bcc) on the right of the dialog.
-	(real_add_address_cb): When we add an address, hide it in the main
-	list.
-	(e_select_names_init): Get pointer to our without table from the
-	table's object data, and store it.
-	(remove_address): When we remove an address, show it in the main
-	list.
-	(card_key): Added.  Allocate a unique key from an ECard.
-	(esn_get_key_fn): Added.  Callback for ETableWithout.
-	(esn_dup_key_fn): Added.  Callback for ETableWithout.
-	(esn_free_gotten_key_fn): Added.  Callback for ETableWithout.
-	(esn_free_duped_key_fn): Added.  Callback for ETableWithout.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Changed
-	E_CARD_SIMPLE_FIELD_NAME_OR_ORG to first try the FILE_AS
-	type.  This allows the cards in the ESelectName dialog to
-	appear in proper sort order (i.e. as 'Doe, John' rather than
-	'John Doe').  Fixes ximian #6002.
-
-2001-08-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_class_init): fix arg info - we're
-	only passing 1 GTK_TYPE_POINTER arg, not 2.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): lots of fixes for
-	DnD.  For GDK_BUTTON_PRESS, we grab immediately.  For
-	GDK_BUTTON_MOTION, we start the drag after a certain threshold,
-	and connect to the "drag_end" signal on our canvas so we'll know
-	when the drag is complete.  For GDK_BUTTON_RELEASE, we release the
-	grab if we were dragging and get the event.
-	(e_minicard_drag_end): new function, just remove the pointer/gtk
-	grabs and disconnect.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add "gint
-	drag_button"
-
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): use DB_NOTFOUND const
-	
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_changes): null out card_sexp so that
-	we don't crash when copying
-
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: fix warnings, get compiling again
-
-	* conduit/address-conduit-config.h: remove c/p typos
-
-	* conduit/address-conduit.h: ditto
-
-	* conduit/Makefile.am: link against the static camel
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: use bigger Save icon for
-	toolbar. Used Delete icon in menu.
-
-	* gui/component/addressbook.c: use 'Save As' icon rather than 'Save'
-	as it seems more appropriate. Also added delete icon for menu.
-
-2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Update the folder list to
-	include a display name and a description.
-
-2001-08-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/component/addressbook.c: use new Cut/Copy/Paste/Save/Search
-	icons.
-
-2001-08-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (set_folder_bar_label),
-	gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h (update_folder_bar_message),
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-addressbook-view.h
-	(folder_bar_message): Set the folder bar message here.  Fixes
-	Ximian bug #4670.
-
-	* gui/component/select-names/e-select-names-model.c (SEPLEN): Use
-	strlen(SEPARATOR) here so that if the separator changes the length
-	will work properly.
-
-2001-08-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/fulladdr.glade: Added full country list.
-	Fixes Ximian bug #5123.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Hook up `delete-message.png' as the
-	icon for "ContactDelete".
-	* gui/contact-editor/e-contact-editor.c: Likewise.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.h: add prototype for
-	addressbook_get_other_contact_storage.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): rename register_storage
-	to this, and return the EvolutionStorage.
-	(load_source_data): register_storage =>
-	addressbook_get_other_contact_storage.
-	(addressbook_storage_add_source): register_storage =>
-	addressbook_get_other_contact_storage.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(set_entry_changed_signals): connect to the "changed" signal on
-	"entry-web" to update command state.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (list_added_cb):
-	call e_card_set_id on the list's card so we can continue to use
-	this dialog.  also, call command_state_changed if we aren't
-	closing the dialog so the toolbar is properly sensitized.
-	(list_deleted_cb): always close the dialog after we successfully
-	delete a list.
-
-	* gui/contact-editor/e-contact-editor.c (card_added_cb): call
-	e_card_set_id on the card so we can continue to use this dialog
-	(to modify or delete the card.)
-	(card_deleted_cb): always close the dialog after we successfully
-	delete a card.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): call
-	e_sexp_encode_string on the search string the user types in so it
-	doesn't break sexp parsing in the wombat.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/component/addressbook.c: changed to new print icon.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c: (struct
-	ESelectNamesFolder): rename physical_uri to uri, since it includes
-	the addressbook.db for file: uris.
-	(e_select_names_folder_free): physical_uri => uri.
-	(e_select_names_option_activated): physical_uri => uri, and we
-	don't need to strdup_printf "addressbook.db" onto the end anymore.
-	(new_folder): if the physical_uri is a file: uri, append
-	/addressbook.db onto it.
-	(hookup_listener): new function, split out lots of code from
-	e_select_names_hookup_shell_listener.
-	(e_select_names_hookup_shell_listeners): rename
-	e_select_names_hookup_shell_listener to this, and hookup both the
-	local and "Other Contacts" listener, using hookup_listener.
-	(e_select_names_destroy): disconnect from the
-	other_contacts_listener and unref it.
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add a listener for Other Contacts, and rename
-	"listener" to "local_listener."
-
-2001-08-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_seq_complete_cb): If we get the
-	"sequence_complete" signal when we aren't searching, it means the
-	addressbook changed out from under us.  Clear the search cache, so
-	that future completion requests won't use the out-of-date cached
-	data.  Also, don't unref book_view... we leave the EBookView open
-	so that we can catch these addressbook changes.
-	(e_select_names_completion_do_query): Don't use the book_view
-	being non-NULL as a sign that another query is still running.
-	(e_select_names_completion_got_book_view_cb): Properly unref any
-	previous value in book_view.
-
-2001-08-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click),
-	gui/widgets/e-addressbook-view.c (table_right_click): Changed the
-	messages here in the right click menus.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): unref our
-	card_sexp.
-	(create_card_handler): make sure to set the id of the vcard so it
-	gets properly transmitted back to the BookView, and notify all
-	matching BookViews to add the created card.
-	(remove_card_handler): notify all matching BookViews to remove the
-	card.
-	(modify_card_handler): notify all matching BookViews to modify the
-	card.
-	(pas_backend_ldap_process_get_book_view): init card_sexp based on
-	the view's search.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_book_view_copy): use card_sexp.
-	(pas_backend_file_book_view_free): same.
-	(vcard_matches_search): use the new pas_backend_card_sexp_match_vcard call.
-	(pas_backend_file_search): use card_sexp.
-	(pas_backend_file_process_get_book_view): same.
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add
-	pas-backend-card-sexp.[ch].
-
-2001-08-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Added code
-	so the user can create a new contact or contact list from anywhere
-	in evolution.
-
-2001-08-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/pas/evolutionperson.schema: Added a closing paren.
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_handle_request): Renamed from _begin to
-	match changes in gal 0.10.99.3.
-
-	* gui/contact-editor/e-contact-quick-add.c (e_contact_quick_add): 
-	Check that name != NULL before we start messing with it.
-	(Fixes bug #7329)
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Boost scoring on an exact nickname match.
-	Manually addressify match.
-	(match_name): Manually addressify matches.
-	(book_query_score): Remove automatic addressification.
-
-	* gui/component/addressbook.c (addressbook_query_changed): Minor
-	tweak to avoid a crash if we have a negative subid with id
-	ESB_CATEGORY.  This should never happen.
-	(addressbook_menu_activated): Reset the entry/option when we
-	select "Clear".
-	Some changes to reflect renaming in ESearchBar.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Cardify after importing destinations.
-	This might fix a problem that Damon is having.
- 
-2001-08-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.glade: set title of initial
-	dialog to Addressbook Sources (bug #6704).
-
-2001-08-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (create_ldap_folder): don't
-	let people add subdirs in the ldap server storage - everything is
-	toplevel there.
-
-2001-08-14  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_vcard): implement using
-	search_for_dn.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Tell the search bar to translate the subitem texts.
-
-2001-08-14  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Add "Any Category" option for category searches.
-	(addressbook_query_changed): Do the right thing on an
-	"Any Category" search.
-
-2001-08-14  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: Fix up to match the
-	pas_book_new/get_vcard changes.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
-	Got rid of an extraneous _ here.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	Changed Canceled to Cancelled here.  Fixes Ximian bug #2465.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_respond_get_vcard): Oops,
-	forgot to write this function.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Added focus targets
-	here.  Fixes part of Ximian bug #5843.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Grab focus here.  Fixes Ximian bug #2265.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control): 
-	(addressbook_query_changed): Fixed two const warnings here.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h: Fixed some missing includes
-	here.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view.c (add_book_iterator): Call
-	e_card_set_book here.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_vcard): Call
-	e_card_set_book here.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Pulled out the
-	part where the uri is made part of the uid.  Made uri a separate
-	field.  Fixes Ximian bug #6490.
-
-	* backend/ebook/e-destination.c, backend/ebook/e-destination.h:
-	Change this to use ECard's split uids and uris.
-
-2001-08-13  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_to_supported_fields): don't
-	g_strdup the stuff we're passing into e_list_append, since it does
-	the copy for us.
-	(check_schema_support): don't initialize supported_fields list
-	here, since there's a gross case where the programmer/user can
-	bring up the contact editor before the connection stuff is
-	finished, and we don't want to crash.
-	(pas_backend_ldap_init): move it here to we can guarantee it's
-	there. (bug #6546).
-
-2001-08-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): don't access source->auth
-	if source == NULL (bug #7086).
-
-2001-08-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c,
-	backend/ebook/e-book-listener.h, backend/ebook/e-book.c,
-	backend/ebook/e-book.h, backend/idl/addressbook.idl,
-	backend/pas/pas-backend-file.c, backend/pas/pas-book.c,
-	backend/pas/pas-book.h: Changed get_card to be asyncronous.
-
-	* backend/ebook/e-card.c, backend/ebook/test-client.c: Changed
-	these to deal with the new get_card functionality.
-
-2001-08-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/component/select-names/e-select-names.c: Mark a string for translation.
-	* This fixes bug #7052
-	* printing/e-contact-print.h: Add headers to make it stand on itw own.
-	* printing/e-contact-print.c: Marked some strings for translation.
-	* printing/e-contact-print-envelope.c: Same here.
-	
-2001-08-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (e_contact_quick_add):
-	Remove single- or double-quotes from names before sticking them
-	into the addressbook. (Bug #6499)
-
-	* gui/component/addressbook.c (addressbook_query_changed):
-	Properly handle "Category is" queries by checking the search bar
-	suboption.
-	(addressbook_factory_new_control): Attach subitems corresponding
-	to all wombat categories to the "Category is" ESearchBarItem.
-
-	* gui/component/addressbook.c: Set the ESearchBarItem
-	subitems explicitly to NULL.
-
-2001-08-10  Anna Marie Dirks <anna@ximian.com>
-	 * gui/component/select-names/select-names.glade: did a little
-	packing-magic to get the two tables at bottom of this dialog
-	to seem to line up. 
-
-	*gui/component/select-names/e-select-names.c: changed the title
-	of this dialog to "Select Contacts from Addressbook". 
-
-2001-08-09  Anna Marie Dirks <anna@ximian.com>
-        * gui/component/select-names/select-names.glade: redesigned
-        this dialog to fix bug #6815. 
-
-	*gui/component/select-names/e-select-names.c: connected the
-	widgets (or one of them anyway. clahey did the rest) for my
-	new and lovely glade file.
-	
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: remove passwd_cb.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	This change is dedicated to Jacob Berkman.
-	(e_select_names_text_model_insert_length): If the last character
-	we inserted was a "magic comma", remember its position.
-	(e_select_names_text_model_delete): If the last character we
-	inserted was a "magic comma", and if the next thing we do is to
-	hit backspace, delete both the comma and the extra whitespace we
-	added.
-	(e_select_names_text_model_init): Initialize our last magic comma
-	position.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Hook up some magic to
-	(basically) cardify an entry on focus-out.  (What we do is actually
-	more complicated than that.)
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): After we set an entry's text, try to
-	cardify it.  We need to do this so that (for example) reply
-	e-mails get properly cardified.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_duplicate): Use e_select_names_model_append,
-	rather than manipulating lists directly.
-	(e_select_names_model_insert): Connect "changed" signal proxy for
-	added EDestination.
-	(e_select_names_model_append): Ditto.
-	(e_select_names_model_replace): Ditto, and disconnect signals for
-	replaced EDestination.
-	(e_select_names_model_delete): Ditto on the disconnection.
-	(e_select_names_model_delete_all): Ditto.
-	(e_select_names_model_cardify): Added.  Try to cardify a specified
-	EDestination.
-	(e_select_names_model_cancel_cardify): Added.  Cancel the pending
-	cardification of a single EDestination.
-	(e_select_names_model_cardify_all): Added.  Cardify all of the
-	EDestinations in the model.
-	(e_select_names_model_cancel_cardify_all): Added.  Cancel's any
-	and all pending cardifications.
-
-	* backend/ebook/e-destination.c (e_destination_class_init): Added
-	"changed" and "cardified" signals.
-	(e_destination_freeze): Added (static).
-	(e_destination_thaw): Added (static).
-	(e_destination_clear_card): Reset allow_cardify and
-	cannot_cardify, cancel any pending cardifications, and emit the
-	"changed" signal.
-	(e_destination_clear_strings): Emit the "changed" signal.
-	(e_destination_clear): Do freeze/thaw to prevent multiple signal
-	emissions.
-	(e_destination_set_card): Check that the card we are setting is
-	not equal to the current card, and emit the "changed" signal if we
-	are actually changing.
-	(e_destination_set_card_uri): Emit "changed" signal, if necessary.
-	(e_destination_set_name): Emit "changed" signal, if necessary.
-	(e_destination_set_email): Emit "changed" signal, if necessary.
-	(e_destination_set_html_mail_pref): Emit "changed" signal, if
-	necessary.
-	(use_card_cb): If we've just loaded/set the ECard, emit the
-	"changed" signal.
-	(e_destination_set_raw): Emit "changed" signal, if necessary.
-	(e_destination_allow_cardification): Added.
-	(e_destination_set_allow_cardification): Added.
-	(e_destination_cardify): Added.  Tries to automatically convert
-	a string-based EDestination to one based on an ECard.
-	(e_destination_cardify_delayed): Added.  Cardifies in a timeout.
-	(e_destination_cancel_cardify): Added.  Cancels any pending
-	cardifications.
-	(e_destination_xml_decode): Added freeze/thaw.
-
-	* backend/ebook/e-book-util.c (e_book_nickname_query): Added.  A
-	canned simple query for nicknames.
-
-	* backend/ebook/e-card.c (e_card_email_find_number): Added.  Given
-	a card and an string containing an email address, return the index
-	number of the address inside of the card, or -1 if the address is
-	not found.
-
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes ximian bugs #5080, #6021, #6704, #6705 ] 
-	
-	* gui/component/addressbook.c (book_open_cb): create our own
-	dialog that prompts for both the email address and the password.
-	the email address is stored in the source and filled in for the
-	user after the first time they enter one and press OK.
-
-	* gui/component/addressbook-storage.c (create_ldap_folder): has a
-	return value, not a int* parameter.
-	(create_ldap_folder): new function, we can create ldap servers
-	from the File->New->Folder menu item now.
-	(register_storage): hook up the "create_folder" signal.
-	(addressbook_storage_init_source_uri): remove the file case, we
-	only build ldap uris here.
-	(load_source_data): remove the file source stuff, and handle
-	"emailaddr".
-	(save_source_data): call ldap_source_foreach directly.
-	(addressbook_source_free): remove file source stuff.
-	(addressbook_source_copy): same.
-
-	* gui/component/addressbook-storage.h: get rid of all the file
-	source stuff from AddressbookSource, since this is only being used
-	for ldap servers.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): look up the ldap
-	entry based on the provided email address and use the resulting
-	DN/passwd to authenticate.
-
-	* gui/component/addressbook-config.c: pretty much gutted to make
-	it work with the new UI.
-
-	* gui/component/addressbook-config.glade: new version from anna.
-	
-2001-08-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Upped the minimum width
-	on all addressbook columns to 75.  Fixes Ximian bug #2773.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (ce_have_book): mark
-	the dialog as changed so the save button is immediately available.
-
-	* gui/contact-editor/e-contact-editor.c (card_modified_cb): once
-	we save reset the change flag to false if we aren't closing the
-	dialog.
-	(card_added_cb): same.
-	(e_contact_editor_class_init): add a "changed" arg.
-	(e_contact_editor_set_arg): add setter for "changed".
-	(e_contact_editor_get_arg): add getter for "changed".
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (ce_have_book): better
-	to assume that we can write to the local addressbook than that we
-	can't write to it :)
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (create_ui):
-	call e_pixmap_update so we can use the same save/save-as pixmaps
-	as the contact editor.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (open_card): new
-	function, used by the context menu.
-	(e_addressbook_reflow_adapter_right_click): put "Open" at the top
-	of the menu.  also, disable "Delete" if the addressbook isn't
-	writable.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (rfc2254_escape): escape *, \, (,
-	and ), as per rfc2254.
-	(func_contains): escape the string.
-	(func_is): same.
-	(func_beginswith): same.
-	(func_endswith): same.
-
-2001-08-08  Nat Friedman  <nat@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (print_envelope): If 0'd out
-	since Envelope printing is disabled for 1.0.	
-	* gui/widgets/e-addressbook-view.c (print_envelope): Likewise.
-	* gui/contact-editor/e-contact-editor.c (print_envelope_cb): Likewise.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click): Removed "Print
-	Envelope" menu item.
-	* gui/widgets/e-addressbook-view.c (table_right_click): Likewise.
-	* gui/contact-editor/e-contact-editor.c	(verbs): Likewise.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (remove_ldap_folder): ifdef
-	this HAVE_LDAP.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): set the title of the window to
-	"Advanced Search".
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (search_cb): pass view->view instead
-	of the EBook.
-	(addressbook_search_menu_items): remove E_FILTERBAR_ADVANCED.
-	(addressbook_menu_activated): remove E_FILTERBAR_ADVANCED.
-	(addressbook_search_option_items): add "Advanced..." here.
-	(addressbook_query_changed): add special handling for Advanced...
-
-	* gui/search/e-addressbook-search-dialog.h (struct
-	_EAddressbookSearchDialog): add EAddressbookView and remove the
-	model/adapter fields.  Also fix prototype of
-	e_addressbook_search_dialog_new.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_class_init): get rid of
-	set_arg/get_arg.
-	(button_press): set the query on the EAddressbookView, and always
-	close the dialog.
-	(e_addressbook_search_dialog_init): get rid of the minicard view,
-	and pack the other widgets accordingly.
-	(e_addressbook_search_dialog_new): pass EAddressbookView instead
-	of EBook.
-	(e_addressbook_search_dialog_destroy): remove model/adapter stuff.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bug #5066 ]
-	* gui/component/addressbook-storage.c (remove_ldap_folder): new
-	function, remove the source.
-	(register_storage): connect to the "remove_folder" signal so we
-	know when to remove the folder.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (build_card_from_entry): use
-	g_strcasecmp since ldap attribute names are not case sensitive.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb): make sure we update the changed
-	state if a successful drop happens.
-
-2001-08-07  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Make the OK button the keyboard default
-	instead of Cancel.  Bug #4942.
-
-2001-08-06  Radek Doulik  <rodo@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_op_free): new EBookOp destructor
-	(e_book_unqueue_op): use e_book_op_free
-	(e_book_do_response_create_card): ditto
-	(e_book_do_response_generic): ditto
-	(e_book_do_response_get_cursor): ditto
-	(e_book_do_response_get_view): ditto
-	(e_book_do_response_get_changes): ditto
-	(e_book_do_response_open): ditto
-	(e_book_do_response_get_supported_fields): ditto
-
-2001-08-05  Radek Doulik  <rodo@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_do_response_get_view): set
-	op->listener to NULL to catch possible use of freed op
-	(e_book_do_response_get_changes): ditto
-
-	* backend/ebook/e-book-view-listener.c
-	   (e_book_view_listener_check_queue): this callback could be (and
-	   indeed is) called from signal emited above, 
-	   signal handler could call e_book_view_listener_stop, so we need to check
-	   if idle is still set and if not we don't want to unref again
-
-2001-08-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): Made it so
-	that if there's one less match than possible compares are
-	considered more VAGUE.  Fixes Ximian bug #3400.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listener): Check for storage != NULL
-	here.  This shouldn't come up unless addressbook has crashed
-	previously within this session of evolution, but this is just a
-	bit of insurance.  Fixes Ximian bug #3699.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_name_match_string): Changed the
-	criteria of whether the first part of each iteration matched or
-	the second one did.  Before it got it wrong sometimes and caused
-	the pointer to jump off the end of the array.  Fixes Ximian bug
-	#4674.
-
-2001-08-03  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Update
-	for EvolutionStorage API changes.
-	(addressbook_storage_add_source): Ditto.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): Made this
-	change the query based on which letter is clicked.  Fixes Ximian
-	bug #2202.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Fixed warnings here.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(hash_cleanup_fn): Removed this unused function.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_sync_card,
-	fill_in_info): Made the list of E_CARD_PHONE types in
-	phone_correspondences more complete by adding the new 5
-	E_CARD_PHONE types.  Also, made it a bit less restrictive for some
-	types (E_CARD_PHONE_HOME will actually match
-	E_CARD_SIMPLE_PHONE_ID_HOME now.)  Made e_card_simple_sync_card
-	and fill_in_info search for an exact match in the list of
-	phone_correspondences and then look for a partial match.  Got rid
-	of not going forward when doing a remove from an EList since EList
-	handles this case automatically.
-
-	* backend/ebook/e-card-types.h: Added E_CARD_PHONE types for
-	assistant, callback, radio, telex, and ttytdd.
-
-	* backend/ebook/e-card.c (get_phone_flags, set_phone_flags):
-	Handle the new E_CARD_PHONE types.
-
-2001-08-02  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/Makefile.am (ecpsdir): Add camel dependency.
-
-	* gui/component/Makefile.am: Add camel dependency.
-
-	* backend/ebook/Makefile.am: Add camel dependency.
-
-	* gui/component/addressbook-factory.c (main): Properly init camel.
-
-	* backend/ebook/e-destination.c (e_destination_clear_strings):
-	Clear ->raw.
-	(e_destination_is_empty): We aren't empty if ->raw is set..
-	(e_destination_set_raw): Replaces e_destination_set_string.
-	(e_destination_get_name): Use camel's parser to extract the name
-	from ->raw.
-	(e_destination_get_email): Use camel's parser to extract the email
-	address from ->raw.
-	(e_destination_get_address): Use camel to produce properly quoted,
-	RFC-compliant addresses.  Thanks camel! (Bug #5860)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(emailify_match): Always append an e-mail address, as long as it
-	doesn't have one already at it's beginning or end.  Don't limit
-	self to just emailifying entries tied to cards with multiple
-	addresses.  (I didn't really want to do this, but people seem to
-	like keeping multiple cards for the same person, and other
-	solutions (like scanning all matches for duplicate names, and only
-	emailifying those) just seemed like way too much work for such a
-	limited payoff.)
-
-	* gui/component/select-names/e-select-names-text-model.c:
-	s/e_destination_set_string/e_destination_set_raw/.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Quote _'s in our popup menus, so that "foo_bar"
-	doesn't get displayed as "foobar" w/ the 'b' underlined. (Bug
-	#5558)
-	(popup_menu_nocard): Ditto.
-
-2001-08-02  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Removed some extra padding and pack the addressbook view into a
-	frame with inward shadowing, just because it looks prettier.
-
-	* gui/contact-editor/e-contact-editor.c: Use the updated Save,
-	Save As, and Print icons for the menus and toolbar.
-
-2001-08-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c: Added ContactsSaveAsVCard,
-	ContactsSendContactToOther, and ContactsSendMessageToContact verbs
-	here.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (e_addressbook_view_save_as,
-	e_addressbook_view_send, e_addressbook_view_send_to): New
-	functions to allow outside users to cause the addressbook to save,
-	send, or send a message to its selection.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/.cvsignore: Removed this file from this unused
-	directory.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/Makefile.am: Added file-exists.glade.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists),
-	gui/contact-editor/file-exists.glade: Added a dialog to ask the
-	user whether to replace an already existing file.  Mostly from a
-	patch by Jos Dehaes.  Fixes Ximian bug #2231.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Removed thrash checking code
-	here since thrashing shouldn't happen now that we've cleaned this
-	up some.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_view): Properly
-	handle cases where construction fails.
-
-2001-07-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c: Added #include
-	<e-util/e-path.h>.
-
-2001-07-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	Convert translated string to UTF8 before calling put_html.
-
-2001-07-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_do_query): Properly handle the case
-	where our "cleaned" completion is the empty string.  This happens,
-	for example, if the query text is the string "\"".  (Bug #5610).
-
-	* backend/ebook/e-destination.c (e_destination_get_address_textv):
-	Reassure fejj that I'm not doing something stupid here.
-	(e_destination_get_address): Fix address quoting.  This is a
-	stop-gap measure until I can change this code to use Camel's
-	superior address-handling routines.  (Also Bug #5610)
-
-2001-07-30  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Fix a
-	return value bug, to make it so if it fails to load an
-	addressbook-sources.xml file (either a parse error or it doesn't
-	exist for example), it deregisters the storage.
-	(register_storage): Don't make a storage for users who don't have
-	LDAP support built in.  Bug #1950.
-
-2001-07-30  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* addressbook/gui/component/addressbook-factory.c: Fix crashes
-	when gtkhtml is compiled with gconf support
-
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: Tidy ldadds
-
-2001-07-26  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c: Fixing a
-	small, stupid mistake; use e_select_names_model_get_textification
-	for the getter for "text".
-
-	* backend/ebook/e-card.c: Removed some debugging chatter.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Store the completion
-	handler in the entry's object data.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Added support for getting "destinations"
-	and "allow_contact_lists" properties.
-	(entry_set_property_fn): Added support for setting "destinations"
-	and "allow_contact_lists" properties.
-	(impl_SelectNames_get_entry_for_section): Added definitions for
-	"destinations" and "allow_contact_lists" properties.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_get_match_contact_lists): Added.
-	(e_select_names_completion_set_match_contact_lists): Added.
-	Controls whether contact lists are offered as options during
-	completion.
-	(book_query_process_card_list): Check if match_contact_lists
-	is set before (duh!) matching on a contact list.
-	(e_select_names_completion_init): Set match_contact_lists
-	to TRUE by default.
-
-2001-07-25  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (func_contains): change the way
-	x-evolution-any-field is converted to an ldap query.  it used to
-	be we'd nest queries like: (|(|(|(foo=*x*))(bar=*x*))(baz=*x*)).
-	now we build it like: (|(foo=*x*)(bar=*x*)(baz=*x*)).  much more
-	efficient (both in the building, and on the server side no doubt).
-
-2001-07-25  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Properly dup
-	the results of e_destination_get_email.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(e_select_names_popup): Check that our destination isn't empty
-	before building our popup. (Bug #5250)
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Made
-	argument const.
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c: Added checks
-	for all of the args of the exposed functions, so that
-	we won't crash on bad inputs.  (Related to bug #4856.)
-
-2001-07-24  Jason Leach  <jleach@ximian.com>
-
-	* gui/merging/e-card-duplicate-detected.glade: "_Add Anyway" to
-	"Add Anyway".
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Added
-	fallbacks for the name in the case of an e-card, to avoid the
-	"nameless contact" bug.
-
-2001-07-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (remodel): need the EDestination magic
-	here too for when we modify an already shown card.
-
-	* gui/contact-list-editor/e-contact-list-model.c: make
-	parent_class static, just to be anal.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(remove_entry_cb): removing entries changes the list, so flag it.
-	(table_drag_data_received_cb): restrict cards we add to lists to
-	be non-list cards.
-	(extract_info): clear out the email list in the card before we
-	repopulate it from the contact list model.
-	(fill_in_info): set the checkbox to active/inactive based on
-	thecard.
-
-2001-07-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (wants_html_changed): call
-	widget_changed.
-	(phone_entry_changed): same.
-	(email_entry_changed): same.
-	(address_text_changed): same.
-	(name_entry_changed): same.
-	(company_entry_changed): same.
-	(widget_changed): new function that we can either call or set as a
-	signal to change the "changed" flag on the dialog.
-	(set_entry_changed_signals): connect lots of "changed" signals on
-	widgets to widget_changed.
-	(add_lists): connect "changed" to widget_changed.
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listener): Check if
-	evolution_shell_client_get_local_storage returns CORBA_OBJECT_NIL,
-	which it should never do.  If it does, print a warning in a dialog
-	and try to recover w/o crashing.  (Bug #5193)
-
-2001-07-24  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-listener.c (e_book_listener_stop): Don't
-	stop the idle_queue and unref from here, since this might be
-	called from inside e_book_listener_check_queue, and we don't want
-	to return to that function with the listener having been
-	destroyed.
-	(e_book_listener_check_queue): Don't exit early if the queue is
-	stopped. Proceed through the check if the queue is NULL (which is
-	must be if the queue is stopped), and then reach the existing code
-	to remove the idle handler. Combined with the above, this fixes
-	ximian #4485 (again). This is not a plot to boost my
-	showstopper-bugfixing count by fixing the same bug over and over
-	again.
-
-2001-07-23  Dan Winship  <danw@ximian.com>
-
-	Re-fix for my 07-18 not-quite-fix.
-
-	* backend/ebook/e-book-listener.c: Add a "stopped" flag like
-	EBookViewListener.
-	(e_book_listener_check_queue): Don't emit signals if the listener
-	is stopped.
-	(e_book_listener_queue_generic_response, etc): Don't queue
-	responses if the listener is stopped.
-	(e_book_listener_stop): Flush the queue and stop queue/emitting
-	further responses.
-
-	* backend/ebook/e-book.c (e_book_unload_uri): Revert the previous
-	change and call e_book_listener_stop() instead.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_stop): When removing an idle handler, unref
-	the listener as well, since e_book_view_listener_queue_response
-	will have ref'ed it.
-
-2001-07-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): Add a
-	@type arg.  If the type is not "contacts", report an
-	`UNSUPPORTED_TYPE' error through the listener.  Also, remove
-	`g_print()' debugging messages.
-	(xfer_folder): Likewise.
-
-2001-07-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Make the "contacts"
-	folders user-creatable by setting `user_creatable' to %TRUE in the
-	`EvolutionShellComponentFolderType's.
-
-2001-07-18  Chris Toshok  <toshok@ximian.com>
-
-	[ patch contributed by Jos Dehaes <jos.dehaes@bigfoot.com> ]
-	
-	* gui/component/addressbook-storage.c (register_storage): new
-	function, register our evolution_storage.
-	(addressbook_storage_setup): remove storage registration from
-	here.
-	(load_source_data): register the storage here before we load
-	addressbook-sources.xml, and deregister it if there are no sources
-	listed.
-	(addressbook_storage_remove_source): unregister the storage if the
-	list of sources hits 0 length.
-
-2001-07-18  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_unload_uri): Flush the listener's
-	queue before unreffing it to ensure that it doesn't emit any more
-	"responses_queued" signals after the EBook is destroyed.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue,
-	e_book_listener_queue_response, e_book_listener_new): Use
-	bonobo_object_ref/unref rather than gtk_object_ref/unref.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response, e_book_view_listener_new):
-	Likewise.
-
-2001-07-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-compare.c (simple_query_cb): prune the list
-	of cards that match our query using the avoid list here, instead
-	of using the avoid list in the query itself, since ldap can't
-	handle that.
-	(use_common_book_cb): remove the block of code including the avoid
-	list in the query sent to wombat.
-
-2001-07-17  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bugs #4611 - crash searching in the name field at Bigfoot for "\"
-	        and  #4554 - general ldap search crash ]
-	
-	* backend/pas/pas-backend-ldap.c (func_contains): the length of
-	the big query string needs to take into account the length of the
-	footer as well as the header - fix random memory corruption here.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_build_query):
-	list can be NULL, specifically if there's a parsing error in the
-	sexp, so deal with it.
-
-2001-07-17  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): Hold a reference to our
-	listener while the idle function is active.
-	(e_book_view_listener_check_queue): Only unref the listener when
-	the idle function is finished.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_clicked): Instead of replacing section->model with
-	source, copy source onto section->model with
-	e_select_names_model_overwrite_copy.  #if 0/#endif out all of the
-	stuff related to ETextModels, because it doesn't make any sense to
-	me, and everything appears to work without it.
-	(Die bug #2059.  Die! Die! Die!)
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_overwrite_copy): Added.  Copies the contents
-	of one ESelectNamesModel onto another.
-
-	* backend/ebook/e-destination.c (e_destination_copy): Made the argument
-	const.
-
-	* backend/ebook/e-destination.c (e_destination_set_string): Removed
-	old, broken code and annoying g_messages.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_response): Hold a reference to the listener
-	while the idle function is active.
-	(e_book_listener_check_queue): Only release our reference to the
-	listener when the queue is empty.  These two changes fix a race
-	condition, since the listener could be unrefed while the listener
-	was still active. (Seems to fix bug #4485)
-
-2001-07-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade,
-	gui/merging/e-card-duplicate-detected.glade,
-	gui/merging/e-card-merging-book-commit-duplicate-detected.glade,
-	printing/e-contact-print.glade: Patch from Taylor Hayward
-	<thayward@gjpc.com>.  Added accelerators to a few dialogs.
-
-2001-07-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	Added addSectionWithLimit to the SelectNames interface.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_add_section_with_limit): Added.  Implements
-	addSectionWithLimit.
-	(e_select_names_bonobo_construct): Set up as a BonoboEventSource.
-	(init): Listen for "changed" signals from our manager.
-	(manager_changed_cb): Notify our listeners if we get a changed
-	signal from our manager.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_class_init): Added a "changed" signal".
-	(section_copy): Propogate the signal connection.
-	(section_free): Disconnect the changed handler.
-	(e_select_names_manager_add_section_with_limit): Connect to the
-	new section's model, listening for changes.
-	(e_select_names_manager_activate_dialog): Connect to the "working
-	copy" model, listening for changes.
-	(e_select_names_manager_add_section_with_limit): Added.
-	(e_select_names_manager_add_section): Changed to just be a special
-	case of e_select_names_manager_add_section_with_limit.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_set_limit): Added.  Allows a max number of
-	names allowed in the model.
-	(e_select_names_model_get_limit): Added.  Returns the limit.
-	(e_select_names_model_at_limit): Added.  Returns TRUE if the
-	model is "full".
-	(e_select_names_model_insert): Check that we aren't at the
-	limit before inserting.  Silently return if we are.
-	(e_select_names_model_append): Check that we aren't at the
-	limit before appending.  Silently return if we are.
-
-2001-07-16  Chris Toshok  <toshok@ximian.com>
-
-	[ Fix bug #4705 - LDAP storage gets saved with corrupted binddn]
-	
-	* gui/component/addressbook-config.c (addressbook_dialog_apply):
-	call addressbook_storage_write_sources here after we're done
-	rebuilding them.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_clear_sources): don't write the source file
-	here.
-	(addressbook_storage_add_source): same.
-	(addressbook_storage_remove_source): same.
-	(addressbook_storage_write_sources): new function, write the
-	source file out.
-	(addressbook_source_copy): g_strdup the binddn so we don't end up
-	free'ing it multiple times thanks to copies freeing theirs.
-
-	* gui/component/addressbook-storage.h: add prototype for
-	address_storage_write_sources.
-
-2001-07-16  Iain Holmes  <iain@ximian.com>
-
-	* backend/pas/evolution-vcard-importer.c (ebook_create): Don't just 
-	use the default directory. Use the directory that is passed into the
-	load file function.
-
-2001-07-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_set_string):
-	Commented out some unused variables and labels.
-	(e_destination_importv): Check for the xml not parsing correctly
-	and just return NULL here.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_import_destinationv): Handle a NULL destv
-	here.
-
-2001-07-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): Added a
-	call to e_table_view_to_model_row here.
-	(e_addressbook_view_can_print, e_addressbook_view_can_delete,
-	e_addressbook_view_can_copy): If the selection model is NULL here,
-	return NULL (this was done before in a g_return_val_if_fail which
-	is only conditionally included.)
-
-2001-07-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Changed Company to
-	Organization here.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/Makefile.am: add ldap cflags
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_xml_decode):
-	Oops. I introduced my own bug, accidently set `email' to a
-	g_free'd pointer - eek!
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_importv): Optimized
-	the same way I optimized g_strsplit. If you use a GPtrArray
-	instead of a linked list, you save yourself from having to iterate
-	through the list an extra 3 times.
-	(e_destination_xml_decode): Do NOT, I repeat: do NOT!
-	e_utf8_xml1_decode something which is already in UTF-8 or you'll
-	corrupt it!! I smack thee who hath done this evil deed!
-
-2001-07-12  Iain Holmes  <iain@ximian.com>
-
-	* backend/e-book/evolution-vcard-importer.c (support_format_fn):
-	Check for no extension. Actually same as Jason's fix below :) but
-	also check the file contents.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook-config.glade: add accelerators,
-	taylor's patch
-
-2001-07-12  Jason Leach  <jleach@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c (support_format_fn):
-	Crash fix because strcmp() hates NULL arguments.  Bug #3777.
-
-2001-07-11  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (remove_cb): Added
-	some comments for clarity and fixed a pretty noticable bug with
-	how right click "Remove" was deleting more than it should with
-	consecutive runs.
-
-2001-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: assign OID's to the schema
-	entries, and add schema support for contact lists.
-
-2001-07-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Set
-	bf->priv->file_db before calling do_create.
-
-2001-07-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Fixed order
-	of arguments to evolution_shell_component_new.
-
-2001-07-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Check that str isn't
-	the empty string before doing an insert.
-
-	* backend/ebook/e-destination.c (e_destination_set_string): We were
-	being too smart for our own good here, and causing problems for
-	the completion code... (bug #4253, bug #4255, bug #4280)
-	(e_destination_set_name): Clear any cached address.
-	(e_destination_set_email): Clear any cached address.
-	(e_destination_get_address): Handle the cases where the name
-	contains some e-mail information.
-
-2001-07-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Marked a
-	string for translation. Also add the neccesary includes to make
-	_() macros work.
-	
-2001-07-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-minicard.c (add_field): Detect the embedded
-	EDestination XML, and convert it to a nice-looking e-mail address.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Adjusted to
-	reflect changes to EContactListModel.  (Yeah, this is vague,
-	but the changes are _really_ obvious and boring.)
-
-	* gui/contact-list-editor/e-contact-list-model.c: Revamped
-	to make everything an EDestination, rather than storing either
-	cards or strings.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Use
-	e_destination_get_textrep.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Use e_destination_get_name and
-	e_destination_get_email.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Use e_destination_get_name instead of
-	e_card_name_to_string.
-	(quick_add_cb): Use e_destination_get_address.
-	(popup_menu_nocard): Use e_destination_get_name.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_changed): Removed obsolete debugging code.
-	(e_select_names_model_get_textification): Use e_destination_get_textrep.
-	(e_select_names_model_get_address_text): Use e_destination_get_address.
-	(e_select_names_model_get_string): Use e_destination_get_textrep.
-	(e_select_names_model_replace): Use e_destination_get_textrep.
-	(e_select_names_model_name_pos): Use e_destination_get_textrep.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(emailify_match): Match only if this isn't a contact list.
-	(match_email): Match only if this isn't a contact list.
-	(match_name): Do the right thing in the case of a contact list.
-	(book_query_process_card_list): Don't construct a match for
-	each possible e-mail address if this is a contact list.
-
-	* backend/ebook/e-destination.c: Major-league de-crufting and
-	rationalization, combined with lots of hacks to make things work
-	properly with contact lists.
-	(e_destination_copy): Copy contact list info.
-	(e_destination_clear_card): Clear contact list info.
-	(e_destination_is_empty): If we contain a contact list, we aren't
-	empty.
-	(e_destination_set_card_uri): Added.  Allows us to set a
-	destination by card URI.
-	(e_destination_set_name): Allows the contact's name only ("Jane
-	Smith") to be set.
-	(e_destination_set_email): Allows the contact's e-mail only
-	("jane@assbarn.com") to be set.
-	(e_destination_set_string): Takes a free-form string containing a
-	contact's name and/or e-mail, and tries to do the right thing with
-	it.
-	(e_destination_contains_card): Renamed.  Used to be
-	e_destination_has_card.
-	(e_destination_from_card): Added.  Returns TRUE if the
-	EDestination comes from either a ECard (which we presently hold)
-	or is specified by an ECard URI.
-	(e_destination_use_card): Allows an EDestination's ECard to be
-	accessed, via a callback.  If we only are holding the URI, the
-	card will be loaded and stored in the EDestination.
-	(e_destination_get_name): Returns the name only ("Jane Smith"), or
-	NULL.
-	(e_destination_get_email): Returns the email only
-	("jane@assbarn.com"), or NULL.
-	(e_destination_get_address): Added.  Returns a "full address" if
-	both the name & e-mail are available ("Jane Smith
-	<jane@assbarn.com>"), or just the e-mail if the name is unknown
-	("jane@assbarn.com>").  If the destination is a contact list,
-	returns a comma-separated list of addresses.
-	(e_destination_get_textrep): Added.  Returns a "text
-	representation" of the EDestination.  This is what is now
-	displayed for completed, "cardified" destinations in addressbook
-	entries.
-	(e_destination_is_evolution_list): Check to see if this
-	destination is for a contact list.
-	(e_destination_xml_encode): Added.  Build an XML data structure
-	representing an EDestination.
-	(e_destination_xml_decode): Added.  Parse an XML data structure,
-	constructing an EDestination.
-	(e_destination_export): Added.  Returns a null-terminated string
-	containing an XML representation of the EDestination, with
-	newlines and excess whitespace removed.
-	(e_destination_import): Added.  Parses a string containing an XML
-	representation of an EDestination.
-	(e_destination_exportv): Added.  Returns a null-terminated string
-	containing an XML representation of a collection of EDestinations,
-	with newlines and excess whitespace removed.
-	(e_destination_importv): Added.  Takes an XML representation of a
-	collection of destinations, parses it, and returns a vector of
-	EDestinations.
-
-	* backend/ebook/e-card.c (e_card_duplicate): Copy the ->book
-	pointer.
-	(e_card_get_id): Check that the argument is valid.
-	(e_card_set_id): Check that the argument is valid.
-	(e_card_get_book): Added.  Return the EBook the ECard came from.
-	(e_card_get_uri): Added.  Tries to returns a URI for the ECard,
-	which is of the form (EBook URI)/(ECard unique ID).  Returns NULL
-	if the EBook URI or the ID are unknown/not set.
-	(e_card_get_vobject): If we have the URI, use it as the
-	VCUniqueStringProp, rather than just the ID.  This is a hack to
-	make DnD work properly.
-	(parse_id): Detect if the unique ID we've been passed is a URI or
-	just a plain card ID, and do the right thing in either case.
-	(e_card_uri_extract_book_uri): Added.  Convenience function for
-	parsing card URIs.
-	(e_card_uri_extract_card_id): Added.  Convenience function for
-	parsing card URIs.
-	(e_card_load_uri): Added.  Allows an ECard to be loaded by its
-	URI.
-
-	* backend/ebook/e-book-view.c: Added a EBook * to the
-	_EBookViewPrivate struct.  This is meant to contain the EBook the
-	EBookView is associated with.
-	(add_book_iterator): Added.  A convenience function for attaching
-	the EBook to a GList of cards (if no EBook is already stored).
-	(e_book_view_do_added_event): Record the EBook in the added
-	ECards.
-	(e_book_view_do_modified_event): Record the EBook in the modified
-	ECards.
-	(e_book_view_set_book): Added.  Stores a pointer to the
-	EBookView's "parent" EBook.
-	(e_book_view_init): Init book_view->priv->book to NULL.
-	(e_book_view_destroy): Unref book_view->priv->book.
-
-	* backend/ebook/e-book.c: Added a uri field to _EBookPrivate.
-	(e_book_unqueue_op): Removed debugging spew.
-	(e_book_do_response_get_view): Attach the current EBook to the
-	created EBookView.
-	(e_book_do_response_get_changes): Attach the current EBook to the
-	created EBookView.
-	(e_book_load_uri): Save a copy of the uri in the EBook.
-	(e_book_get_uri): Added.  Just returns book->priv->uri.
-	(e_book_get_card): Attach a pointer to the Ebook to the
-	newly-loaded ECard.
-	(e_book_add_card): Attach a pointer to the EBook to the
-	newly-added ECard.
-	(e_book_commit_card): Attach a pointer to the EBook to the
-	committed ECard.
-	(e_book_init): Initialize the uri to NULL.
-	(e_book_destroy): Free the uri string on destruction.
-
-2001-07-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (populate_context_menu):
-	Removed.  [It was just bogus testing code for the right-click menu
-	populating interface in the shell].
-	(factory_fn): Pass NULL as the PopulateContextMenuFn.
-
-2001-07-05  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: 
-	Added some accelerators, padding, and a "memebers" frame;
-	also fixed spacing and growth behaviour of this dialog. 
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (compare_category): Fix a memory
-	leak here.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): Set
-	info->avoid = NULL.  This shouldn't make a difference, but it
-	can't hurt.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_is_cell_editable): Check if the row is within our
-	table and return from this function as if the card is a standard
-	card, not a list.
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): 
-	added $(BONOBO_CONF_LIBS) to get it to compile.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	$(BONOBO_CONF_LIBS).
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories),
-	gui/contact-editor/e-contact-editor.c (categories_clicked):
-	Switched to an ECategoriesMasterListWombat instead of an
-	ECategoriesMasterListArray here.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* gui/contact-editor/Makefile.am (INCLUDES): srcdir !=
-	builddir compile fix.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): Same.
-
-	* gui/widgets/Makefile.am (INCLUDES): Same.
-
-	* gui/search/Makefile.am (INCLUDES): Same.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked):
-	Turned off wombatification of the categories master list here.
-
-2001-07-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):
-	use ECARD_UID_LINK_PREFIX.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_get_email): use ECARD_UID_LINK_PREFIX.
-
-	* backend/ebook/e-destination.h: add prototype for
-	e_destination_importv_list.
-
-	* backend/ebook/e-destination.c (e_destination_importv_list): new
-	function, take an ECard corresponding to an address list and
-	resolve any linked cards, returning an EDestination vector.
-
-	* backend/ebook/e-card.h (ECARD_UID_LINK_PREFIX): #define this here,
-	since we need to use it in a few places.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	related_contacts field.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h
-	(e_select_names_model_import_destinationv): Added this function.
-
-	* gui/contact-editor/contact-editor.glade: Replaced the entry here
-	for related contacts with a table which is filled in in the C code.
-
-	* gui/contact-editor/e-contact-editor.c,
-	gui/contact-editor/e-contact-editor.h (add_lists): Added a select
-	names entry here for the related contacts field.
-
-	* gui/widgets/Makefile.am: Removed all the test programs here
-	since there are circular dependencies now.
-
-2001-07-01  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_string): Fall
-	back to use the name field if all else fails (which can happen
-	with imported EDestinations).
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Fix for the
-	"recipient not specified" bug --- we were not correctly checking
-	for whether or not an EDestination was actually empty.
-
-2001-06-30  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_evolution_list): Check args.
-	Somewhere in the code (somewhere in the minicard stuff) this can
-	be called with a NULL arg, which was causing crashes.
-	(e_card_evolution_list_show_addresses): Check args.
-
-	* backend/ebook/e-destination.c (build_field): I was accidentally
-	comparing characters and strings here, and didn't see the compiler
-	warning.  Fixed.
-	(e_destination_exportv): Don't export any empty destinations.
-	(bug#3825).
-
-2001-06-30  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/e-address-popup.c (e_address_popup_construct): Marked
-	strings for translation.
-
-2001-06-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/merging/e-card-merging.c (match_query_callback): Make the
-	standard for considering two cards to be match stricter.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Use the card's use-score to set the match's
-	sort_major value.
-	(match_name): Removed obsolete code.
-	(e_select_names_completion_begin): Added (double) cast to make
-	match->score calculation come out properly.
-
-	* backend/ebook/e-card.c: Added X-EVOLUTION-LAST-USE and
-	X-EVOLUTION-USE-SCORE to attribute_jump_array.
-	(e_card_get_today): Added.  A convenience routine for getting
-	today's date and putting it in a GDate.
-	(e_card_get_use_score): Added.  Compute the current, time-decayed,
-	use-score for the card.
-	(e_card_touch): Increment the use-score by one; update the last
-	used date.
-	(e_card_date_to_string): Added as a convenience routine, getting
-	rid of some code duplication.
-	(e_card_get_vobject): Add handlers for X-EVOLUTION-USE-SCORE and
-	X-EVOLUTION-LAST-USE.
-	(parse_last_use): Added.
-	(parse_use_score): Added.
-	(e_card_class_init): Added args for last-use and use-score.
-	(e_card_get_arg): Added handlers for last-use and use-score.
-	o
-	(e_card_set_arg): Added handlers for last-use and use-score.
-
-	* backend/ebook/e-destination.c: Added pending_card_id to
-	EDestinationPrivate struct.
-	(e_destination_copy): Copy the pending_card_id.
-	(e_destination_is_empty): Check for a pending_card_id.  We are
-	non-empty if we have one.
-	(e_destination_clear_card): Clear pending_card_id.
-	(e_destination_set_card): Clear pending_card_id.
-	(e_destination_has_pending_card): Added.
-	(e_destination_use_card): Added.  An asynchronous way to load a
-	pending card and then apply a callback to it.
-	(build_field): Be paranoid, map our special characters to '_'.
-	(e_destination_export): Use EXPORT_MAX_FIELDS symbol rather than a
-	hard-wired array size.  Added the "card" entry.
-	(e_destination_import): Fix bug in handling of the "name" field.
-	Process the "card" field.
-	(e_destination_touch): "Touch" and commit the ECard corresponding
-	to the e-mail address in the destination.  (A query against the
-	local addressbook is actually performed, in case the destination
-	isn't cardified.
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): Revamp the
-	way E_CARD_MATCH_FOO results are mapped to comparison results.
-	Report better matches when the family name is matched.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	Added a search field to the query here.
-	(e_select_names_init): Update the query on a number of signals here.
-
-	* gui/component/select-names/e-select-names.h: Added search_entry
-	here.
-
-	* gui/component/select-names/select-names.glade: Added the search
-	entry here.  Added some labels.  Removed the update button.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_option_activated): Change the uri here to have
-	addressbook.db at the end.
-
-	* gui/component/select-names/select-names.glade: Changed the name
-	of the folder option menu here to match the name used in the code.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	Change the query when the "Update List" button is pushed.
-
-	* gui/component/select-names/e-select-names.h: Removed
-	currently_selected field.  Added categories_entry field.
-
-	* gui/component/select-names/select-names.glade: Added "Update
-	List" button.
-
-2001-06-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (INCLUDES): add EVOLUTION_IMAGESDIR
-	define.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add our pixbuf and
-	pixbuf size.
-
-	* gui/widgets/e-minicard.c (e_minicard_init): init the icon pixbuf
-	and its size.
-	(e_minicard_destroy): unref the list_icon_pixbuf.
-	(e_minicard_realize): create the list_icon GnomeCanvasPixbuf.
-	(e_minicard_resize_children): clip the header_text by the
-	list_icon, and place the list_icon in the right spot.
-	(remodel): show the list_icon if we're a list, and hide it
-	otherwise.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): pop up
-	list editor for lists, contact editor otherwise.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): same.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): change "editor" to
-	GtkOjbect, since it can be either a contact editor or contact list
-	editor.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_is_cell_editable): don't allow editting of any fields
-	except the name and file_as for lists.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): remove ancient
-	e-table include, and add include for contact-editor so we can
-	reuse the confirm_delete dialog.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): remove prototype for
-	e_contact_list_editor_close, since the function no longer exists.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(list_deleted_cb): new function, emit our "list_deleted" signal.
-	(delete_cb): new function, called from the Delete toolbar item.
-	(e_contact_list_editor_raise): flesh out function.
-	(extract_info): "evolution_list" => "list".
-	(fill_in_info): same.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_vobject): add support for
-	X-EVOLUTION-LIST and X-EVOLUTION-LIST-SHOW-ADDRESSES.
-	(parse_list): new function, parse the boolean X-EVOLUTION-LIST.
-	(parse_list_show_addresses): new function, parse the boolean
-	X-EVOLUTION-LIST-SHOW-ADDRESSES.
-	(e_card_class_init): add args for "list" and
-	"list_show_addresses".
-	(e_card_set_arg): add support for list and list_show_addresses.
-	(e_card_get_arg): same.
-	(e_card_init): init list and list_show_addresses.
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL as
-	the @external_uri_schemas argument to
-	`evolution_shell_component_new()'.
-
-2001-06-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_row_count): track storage change - we're only using
-	1 array now.
-	(contact_list_value_at): same.
-	(contact_list_model_destroy): same.
-	(e_contact_list_model_init): same.
-	(e_contact_list_model_add_email): same.
-	(e_contact_list_model_add_card): same.
-	(e_contact_list_model_remove_row): same.
-	(e_contact_list_model_remove_all): new function - just free/unref
-	all existing rows.
-	(e_contact_list_model_get_email): new function, returns the
-	alloc'ed string containing either an email address or an encoded
-	ECardId.
-
-	* gui/contact-list-editor/e-contact-list-model.h: remove the 2
-	separate arrays for email and cards, and store them in the same
-	array.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add the visible_addr_checkbutton widget.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(visible_addrs_toggled_cb): new function.
-	(e_contact_list_editor_init): connect to "toggled" on
-	visible_addrs_checkbutton.
-	(file_save_cb): new function.
-	(tb_save_and_close_cb): new function.
-	(verbs): add Save and Save & Close.
-	(list_added_cb): new function.
-	(list_modified_cb): new function.
-	(save_card): new function - we do *not* use e_card_merging_* calls
-	here.
-	(e_contact_list_editor_get_arg): un-#if 0 code in the "card"
-	getter.
-	(e_contact_list_editor_set_arg): same for the "card" setter.
-	(extract_info): new function.
-	(fill_in_info): new function.
-
-	* gui/contact-list-editor/contact-list-editor.glade: add a
-	checkbutton at the bottom to determine whether to visibly include
-	mail addresses in mail sent to this list.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories): Oops.  Can't use the wombat
-	version of the master categories list yet.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c (create_card): memmove
-	counts were off in this function.
-	(remove_card, modify_card): Moved the table notifications around a
-	bit here.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/select-names.glade
-	(e_select_names_create_categories): Added a categories combo here.
-	It's not used yet.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/search/addresstypes.xml: Added category searching to the
-	advanced search dialog here.
-	
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (compare_category): Added
-	category searching to the file backend.
-
-	* gui/component/addressbook.c (addressbook_query_changed): Added
-	category searching to the search bar.
-
-2001-06-25  Peter Williams  <peterw@ximian.com>
-
-	* conduit/Makefile.am (INCLUDES): Fix for srcdir != builddir.
-
-2001-06-25  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: change layout
-	slightly, the icon no longer pushes everything to the left, and
-	make the buttons on the right smaller and more in line with the
-	other widgets.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_value_at): return the SimpleAndString->string
-	instead of querying the ecardsimple.
-	(e_contact_list_model_init): initially allocate 10 of each type
-	(email and simple).
-	(e_contact_list_model_add_email): realloc if need be.
-	(e_contact_list_model_add_card): same, and initialize the string
-	displayed to be "[Name] [<email>]".
-	(e_contact_list_model_remove_row): change for SimpleAndString.
-	(contact_list_model_destroy): free our 2 arrays.
-
-	* gui/contact-list-editor/e-contact-list-model.h: add alloc counts
-	and the SimpleAndString struct.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Helix Code =>
-	Ximian.
-	(e_contact_list_editor_init): hook up d&d destination signals, and
-	un-#if 0 the delete_event signal.
-	(table_drag_motion_cb): new function.
-	(table_drag_drop_cb): new function.
-	(table_drag_data_received_cb): new function.
-	(file_close_cb): new function.
-	(verbs) uncomment the close verb.
-	(close_dialog): new function.
-	(app_delete_event_cb): new function.
-
-	* gui/contact-list-editor/e-contact-list-editor.h: Helix Code =>
-	Ximian.
-
-2001-06-25  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c: Add a huge steaming pile of
-	code to handle the case of single-address merging.  In other
-	words, if you go to "harvest" an address by right-clicking on it
-	in the mail viewer, and you already have a closely-matching
-	contact (w/ a different e-mail address), this gives you the
-	option of editting that contact's e-mail addresses to add the
-	one you just clicked on.
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): It is
-	amazing how much better things work when you don't try to
-	dereference the pointer you just freed.
-
-2001-06-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (minicard_test_LDADD): correct path to
-	libecontacteditor.a.
-	(minicard_widget_test_LDADD): same.
-	(INCLUDES): same, for the includes.
-
-	* gui/widgets/e-minicard.h: correct e-contact-editor.h path.
-
-	* gui/widgets/e-addressbook-util.h: correct path to
-	e-contact-editor.h, and add e-contact-list-editor.h.  Add
-	prototype for e_addressbook_show_contact_list_editor.
-
-	* gui/widgets/e-addressbook-util.c: remove #include
-	"e-contact-editor.h" (our header includes it.)
-	(added_cb): rename card_added_cb to this, and make it so it can be
-	reused in both the list and card cases.  remove the g_print too.
-	(modified_cb): same for modified case.
-	(deleted_cb): same for deleted case.
-	(editor_closed_cb): change first arg to GtkObject* so we can reuse
-	this for both list and card.
-	(e_addressbook_show_contact_editor): use added_cb, modified_cb,
-	deleted_cb, and pass FALSE as user_data.
-	(e_addressbook_show_contact_list_editor): new function, same as
-	above but creating a contact-list-editor, and pass TRUE as
-	user_data.
-
-	* gui/component/e-address-popup.c: correct path to contact-editor.
-
-	* gui/component/e-address-widget.c: same.
-	
-	* gui/component/select-names/e-select-names-popup.c: same.
-
-	* gui/component/select-names/e-select-names-text-model.c: same.
-
-	* gui/component/addressbook.c (new_contact_list_cb): new function.
-	(update_command_state): update ContactNewList command.
-	(verbs): remove ViewAll from the toolbar from the verb list.  Add
-	ContactNewList.
-	(pixmaps): same for pixmaps.
-	
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): new
-	path for contact-editor.
-	(INCLUDES): same.
-
-	* gui/contact-list-editor/e-contact-list-model.h:
-	* gui/contact-list-editor/e-contact-list-model.c:
-	* gui/contact-list-editor/e-contact-list-editor.h:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	* gui/contact-list-editor/Makefile.am: Initial contact-list editor
-	  commit.
-
-	* gui/Makefile.am (SUBDIRS): add contact-editor.
-
-	* Makefile.am: (SUBDIRS): remove contact-editor.
-
-2001-06-21  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(make_contact_editor_cb): Renamed.  (The old name,
-	edit_contact_info_have_book_cb was a hold-over from before, when
-	we weren't using e_book_use_local_address_book.)
-
-	* gui/component/e-address-popup.c
-	(e_address_popup_schedule_refresh): A Added.  We now do the name
-	refreshes in an idle function, rather than in the setters.
-	(e_address_popup_set_free_form): Added.  Properly handle inputs of
-	the form "Foo <bar@zar.com>", extracting the name and e-mail
-	address.
-	(e_address_popup_set_name): Check to make sure that the free-form
-	handler shouldn't be used to handle the input.  Schedule a refresh
-	after making any changes.
-	(e_address_popup_set_email): Check to make sure that the free-form
-	handler shouldn't be used to handle the input.  Schedule a refresh
-	after making any changes.
-	(e_address_popup_name_only_matches): Temporary place-holder for
-	handling name-only matches.
-	(query_cb): If our initial query fails (and included e-mail
-	information), do a name-only query.  This is to handle the case of
-	adding new e-mail addresses to existing contacts.
-	(e_address_popup_query): Eliminated the "common_book" crap; using
-	e_book_use_local_address_book instead.
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): Make
-	sure that the ->avoid list gets properly freed.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): fix a refcounting
-	memleak.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): fix memory
-	leak.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c: add prototype for
-	close_dialog to remove warnings.
-
-2001-06-20  Dave Camp  <dave@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send): Changed attach_data
-	to be a GNOME_Evolution_Composer_AttachmentData rather than a
-	CORBA_char*.
-
-2001-06-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): track
-	change to e_addressbook_show_contact_editor signature.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): same.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): same.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	add an entry for "Card ID already exists".
-	(e_addressbook_show_contact_editor): track the change to signal
-	names and e_contact_editor_new signature here.
-
-	* gui/widgets/e-addressbook-util.h: change
-	e_addressbook_show_contact_editor's signature to match
-	e_contact_editor_new more closely.
-
-	* gui/widgets/e-addressbook-table-adapter.c (unlink_model): free
-	up the simple mapping to plug a potentially sizeable memory leak.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): call
-	e_addressbook_show_contact_editor here.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(edit_contact_info_have_book_cb): remove the get_supported_fields
-	stuff, since the contact editor handles it for us now, and call
-	e_addressbook_show_contact_editor.
-
-	* gui/component/e-address-popup.c (edit_contact_info_cb): same.
-
-	* gui/component/addressbook.c (new_contact_cb): track change to
-	e_addressbook_show_contact_editor.
-
-2001-06-19  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c (ce_have_book): rename
-	ce_book_found_fields to this, remove the fetching of fields (the
-	contact editor code handles that now.), and change the add_card
-	signal to card_added.
-	(card_added_cb): copied somewhat from merge_cb above.  we don't
-	need to do the merge here, just call the callback.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	track signal change.  add book arg, and is_read_only -> editable.
-	(wants_html_changed): if the card isn't already changed, flag it
-	as such (and update the commands.)
-	(phone_entry_changed): same.
-	(email_entry_changed): same.
-	(address_text_changed): same.
-	(name_entry_changed): same.
-	(company_entry_changed): same.
-	(full_name_clicked): is_read_only -> editable.
-	(full_addr_clicked): same.
-	(card_added_cb): new function, emit our card_added signal, and
-	close the dialog if we're supposed to.  properly deal with error
-	status here.
-	(card_modified_cb): same, modulo card_added -> card_modified.
-	(save_card): actually call e_card_merging_book_{add/commit}_card
-	instead of using a signal.  Also, add a gboolean arg to tell
-	whether or not to close the dialog after saving the card.
-	(card_deleted_cb): new function, just emit our "card_deleted"
-	signal.
-	(delete_cb): actually call e_book_remove_card here, instead of
-	using a signal.
-	(tb_save_and_close_cb): call save_card with TRUE for should_close.
-	(e_contact_editor_init): init changed = FALSE;
-	(e_contact_editor_destroy): unref our book if we have one.
-	(e_contact_editor_new): new signature, set the "book" arg, and
-	call e_book_get_supported_fields here.
-	(supported_fields_cb): new function, show the contact editor.
-	(e_contact_editor_set_arg): initialize changed to FALSE when
-	setting the card (but *after*, since the changed callbacks will
-	set it to TRUE.)  also, call command_state_changed if editable
-	changes.  also handle setting "book".  oh, and is_read_only ->
-	editable.
-	(command_state_changed): new function - set the state of the
-	commands we care about.
-	(e_contact_editor_get_arg): add "book" handling, and is_read_only
-	-> editable.
-	(_phone_arrow_pressed): is_read_only -> editable.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(enable_writable_fields): same.
-	(set_editable): rename set_read_only to this, and is_read_only ->
-	editable.
-
-	* contact-editor/e-contact-editor.h (struct _EContactEditor):
-	is_read_only -> editable, add a "changed" flag so we can sensitize
-	commands correctly, and add an EBook* arg to e_contact_editor_new
-	and to the EContactEditor struct.  Also, change all the signals to
-	past tense, and send the EBookStatus in them.
-
-	* contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): is_read_only -> editable.
-	(e_contact_editor_address_set_arg): same.
-	(e_contact_editor_address_get_arg): same.
-
-	* contact-editor/e-contact-editor-address.h (struct
-	_EContactEditorAddress): same.
-
-	* contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_class_init): same.
-	(e_contact_editor_fullname_set_arg): same.
-	(e_contact_editor_fullname_get_arg): same.
-
-	* contact-editor/e-contact-editor-fullname.h (struct
-	_EContactEditorFullname): same.
-
-	* contact-editor/Makefile.am: don't build contact-editor-test now,
-	until contact-editor gets moved to gui/ and we can more easily
-	depend on the e_card_merging_* calls.
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): return
-	CardIdAlreadyExists for LDAP_ALREADY_EXISTS.
-
-	* backend/idl/addressbook.idl: Add CardIdAlreadyExists to the
-	BookListener status enum.
-
-	* backend/ebook/e-book-types.h: add
-	E_BOOK_STATUS_CARD_ID_ALREADY_EXISTS.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): add support for
-	CardIdAlreadyExists.
-
-2001-06-19  Jon Trowbridge  <trow@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c: Serious de-crufting,
-	removal of gtk_object_set_data() hacks, simplified by using
-	some of the newer ebook convenience routines, etc.
-	(ce_book_found_fields):
-	s/e_contact_editor_raise/e_contact_editor_show/, to accomodate the
-	small changes in the contact editor API.
-
-2001-06-18  Eskil Heyn Olsen  <eskil@eskil.dk>
-
-	* conduit/address-conduit.c: (check_for_slow_setting),
-	(conduit_get_gpilot_conduit):
-	Tweaked for some gnome-pilot api changes
-
-2001-06-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (search_for_dn): implement this
-	properly, using base and (objectclass=*).
-
-2001-06-14  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (delete_cb): save ourselves a
-	function call - call close_dialog instead of file_close_cb.
-
-2001-06-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/addressbook-component.c: Set the
-	"expoted_dnd_types" to NULL in the folder_types.
-
-2001-06-11  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(search_override_check): Add a workaround for an EText bug.
-	(e_select_names_completion_begin): Fix up the match scoring in the
-	search_override case so the lines are offered in the correct
-	order.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/merging/Makefile.am (glade_DATA): Added
-	e-card-merging-book-commit-duplicate-detected.glade here.
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
-	Added this file.  The GUI for asking whether to commit a modified
-	card.
-
-	* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h
-	(e_card_merging_book_commit_card): Added this function.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_set_value_at), gui/widgets/e-addressbook-util.c
-	(commit_card_cb), gui/widgets/e-minicard.c (e_minicard_event): Use
-	e_card_merging_book_commit_card instead of e_book_commit_card here.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Made e_card_simple_get_id return const char *.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Made
-	e_card_get_id return const char *.
-
-	* gui/component/e-cardlist-model.c (e_cardlist_model_add): Made id
-	variable const here.  Added a break to make it slightly more
-	efficient.
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made
-	e_minicard_get_card_id return const char *.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (entry_compare): Made this handle
-	the "id" property in searches.
-	(pas_backend_file_process_modify_card): Made id variable const
-	here.
-
-	* backend/pas/pas-backend-ldap.c (modify_card_handler): Made id
-	variable const here.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c,
-	backend/ebook/e-book-listener.h, backend/ebook/e-book.c: Rolled
-	back the change 2 ago, dated 06/11/2001 01:51 in CVS, involving
-	e-book-listener.[ch] and e-book.c.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_load_uri,
-	e_book_get_supported_fields, e_book_authenticate_user,
-	e_book_remove_card_by_id, e_book_add_vcard, e_book_commit_vcard,
-	e_book_get_cursor, e_book_get_book_view, e_book_get_changes): Made
-	it so that all of these functions queue their ops before calling
-	their CORBA functions.  This way, if the response is sent back
-	before the CORBA function returns there's no problem.  Added
-	e_book_unqueue_op so that the op could be unqueued if the CORBA
-	call fails.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c, backend/ebook/e-book-listener.h
-	(e_book_listener_unpop_response): Added this function to put a
-	response back into the queue.
-
-	* backend/ebook/e-book.c (e_book_check_listener_queue,
-	e_book_queue_op): Handle the case where the op hasn't been queued
-	yet when we get the response.  In this case we unpop the response.
-	Also, when queueing an op, we check to see if there are any
-	responses waiting.
-
-	* This change has been reverted.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c, backend/ebook/e-card-compare.h
-	(e_card_locate_match_full): Added this function to let you do
-	slightly more complicated searches.
-
-	* gui/merging/e-card-merging.c (e_card_merging_book_add_card): Use
-	e_card_locate_match_full to check if the card exists in the book
-	it's being added to instead of in the default book.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Removed unused email variable.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (use_common_book_cb): Null
-	terminate the strv here.
-	(e_card_locate_match): ref here instead of unref.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Handle a NULL
-	card here.
-
-	* contact-editor/Makefile.am (INCLUDES), gui/widgets/Makefile.am
-	(INCLUDES): Added addressbook/gui/merging here.
-
-	* contact-editor/e-contact-quick-add.c (book_ready_cb),
-	gui/component/addressbook-component.c (dnd_drop_book_open_cb),
-	gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_append_row), gui/widgets/e-addressbook-util.c
-	(add_card_cb), gui/widgets/e-addressbook-view.c
-	(selection_received), gui/widgets/e-minicard-control.c
-	(book_open_cb): Use e_card_merging_book_add_card instead of
-	e_book_add_card here.
-
-	* gui/Makefile.am (SUBDIRS): Added merging.
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD),
-	gui/widgets/Makefile.am (minicard_test_LDADD,
-	minicard_widget_test_LDADD): Added libecardmerging.a here.
-
-	* gui/merging/, gui/merging/.cvsignore, gui/merging/Makefile.am:
-	New addressbook library.
-
-	* gui/merging/e-card-duplicate-detected.glade: Glade file for
-	duplicate detected dialog.
-
-	* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h: New
-	files for detecting duplicates before adding and putting up a
-	dialog if duplicates are found.
-
-	* gui/widgets/e-minicard-view.c: Include e-addressbook-util.h
-	here.
-
-2001-06-08  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_new): remove
-	the gtk_widget_show call...
-	(e_contact_editor_show): and put it here.
-
-	* contact-editor/e-contact-editor.h: add prototype for
-	e_contact_editor_show.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): call
-	e_addressbook_show_contact_editor.
-	(card_modified_cb): call e_addressbook_error_dialog if status !=
-	SUCCESS.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): call
-	e_addressbook_show_contact_editor.  also, use card_modified_cb as
-	the commit_card callback.
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): clean
-	this area up alot, call e_addressbook_show_contact_editor.
-	(card_deleted_cb): call e_addressbook_error_dialog.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(card_modified_cb): new function, call e_addressbook_error_dialog
-	if the status != SUCCESS.
-	(addressbook_set_value_at): use card_modified_cb as the callback
-	for e_book_commit_card.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add
-	e-addressbook-util.[ch].
-
-	* gui/component/addressbook.c (new_contact_cb): use
-	e_addressbook_show_contact_editor here.
-
-2001-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Remove
-	references to ECategoryMasterListWombat.
-
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (remove_cb): Make
-	this work when multiple names are selected then right
-	click->Remove.
-
-2001-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): Copy dates as they come
-	in.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key, pas_backend_file_changes,
-	pas_backend_file_process_remove_card,
-	pas_backend_file_process_modify_card,
-	pas_backend_file_build_all_cards_list, pas_backend_file_get_vcard,
-	pas_backend_file_maybe_upgrade_db): memset DBTs to 0 before using
-	them.
-	(pas_backend_file_build_all_cards_list): Reindented.
-
-	* contact-editor/contact-editor.glade: Replaced GnomeDateEdits
-	with a custom widget that creates an EDateEdit.
-
-	* contact-editor/e-contact-editor.c: Use an EDateEdit here instead
-	of a GnomeDateEdit.
-
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	(Fix bug #655: SelectNames doesn't let you remove addresses after
-	 you add them)
-	
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb): New function, provides a popup menu with
-	just "Remove" in it.
-	(remove_cb): New callback to do the remove.
-	(e_select_names_add_section): Attach the "right_click" signal to
-	the section_right_click_cb above.
-
-2001-06-05  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(completion_handler): Change the completion handler to use the
-	ECompletionMatch.
-
-	* gui/component/select-names/e-select-names-completion.c
-	General changes to convert for ECompletionMatch use.
-	(emailify_match): Use extra sort keys in ECompletionMatch to let
-	us ensure that the primary email address is always the first
-	option, the secondary comes second, etc.  There was no nice way to
-	do this previously.
-	(match_name): Removed code that adjusted score based on
-	similarities between the "real name" and the e-mail address.  It
-	seemed like a good idea at the time, but produced unexpected and
-	confusing results.
-
-2001-06-04  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c: Added.  Code for testing
-	if two ECards appear to pertain to the same contact (using loose
-	matching rules, as opposed to requiring exact equality) and to
-	query the addressbook for the "best match" to ECard.
-
-2001-06-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (set_status_message): remove spew,
-	and don't call the ShellView CORBA method if the interface doesn't
-	exist (for whatever reason.)
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_destroy):
-	unref the EAddressbookModel.
-	(create_minicard_view): unref the adapter.
-	(card_added_cb): call e_book_error_dialog if status != SUCCESS.
-	(card_modified_cb): same.
-	(card_removed_cb): new function, and same.
-	(delete_card_cb): pass card_removed_cb as the callback.
-	(emit_status_message): new function, just emit status_message.
-	(status_message): change to call emit_status_message.
-	(card_deleted_cb): emit_status_message ("Done."), and call
-	e_book_error_dialog if status != SUCCESS.
-	(do_remove): pass view in the closure arg.
-	(e_addressbook_view_delete_selection): emit status "Removing
-	cards..." before starting the removal.
-	(e_book_error_dialog): new function - pop up a (possibly) helpful
-	message about why an operation failed.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_new): ref the EAddressbookReflowAdapter.
-	(e_minicard_view_widget_destroy): unref the adapter.
-	(e_minicard_view_widget_get_selection_model): if there isn't a
-	minicard view return NULL.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(e_addressbook_table_adapter_construct): ref the
-	EAddressbookModel.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_finalize): rename this from addressbook_destroy, to
-	reflect the method change.
-	(e_addressbook_reflow_adapter_class_init): same.
-	(e_addressbook_reflow_adapter_construct): ref the
-	EAddressbookModel.
-
-	* gui/widgets/e-addressbook-model.h: add editable_set flag.
-
-	* gui/widgets/e-addressbook-model.c (writable_status): only record
-	the writable state of the addressbook if the user hasn't set it.
-	(e_addressbook_model_init): init editable_set to FALSE.
-	(e_addressbook_model_set_arg): set editable_set to TRUE.
-
-2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Move
-	`$(DB3_LDADD)' before libeutil.
-
-2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Add
-	$(DB3_LDADD)'.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/Makefile.am (INCLUDES): Added db3 cflags.
-
-	* backend/pas/pas-backend-file.c: Updated this to use db3.
-
-2001-05-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/widgets/e-addressbook-view.h (EAddressbookView): Added
-	fields for the GalViewMenus and GalViewCollection; we need to keep
-	them around while the component is active.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Plug leak; unref the spec.
-	Unref the factories.  Do not unref the collection, since we need
-	it for the signal emission (okay, so the views object adds a
-	reference to it, but if we are interested in it we should keep a
-	reference anyways).
-	(e_addressbook_view_setup_menus): Create the collection and views
-	on the EAddressbookView's fields so that we can keep them around.
-	(e_addressbook_view_discard_menus): New function; gets rid of the
-	collection and views objects.
-
-	* gui/component/addressbook.c (control_activate_cb): Call
-	e_addressbook_view_discard_menus().
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add the EAddressbookModel* and change the
-	ETableModel's name to "adapter".
-
-	* gui/component/select-names/e-select-names.c (set_book),
-	(addressbook_model_set_uri): these two things take an
-	EAddressbookModel* instead of an ETableModel now.
-	(e_addressbook_create_ebook_table): don't case the
-	EAddressbookModel* to ETableModel*, create an EAddressbookTableAdapter
-	on the EAddressbookModel instead.
-	(e_select_names_init): set e_select_names->adapter.
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (remove_card): decrement
-	data_count before emitting the card_removed signal, and break
-	after we've removed the matching card.
-	(e_addressbook_model_class_init): change signature of
-	"card_removed" signal to match what we emit (and what is
-	expected.)
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): the
-	signal name is "destroy", not "destroyed".
-	(do_remove): new function, actually remove the card.
-	(e_addressbook_view_delete_selection): get this working for both
-	view types.
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: Print Preview =>
-	ContactsPrintPreview.  Changed peter's change so that the node
-	name is more in line with "Print.."'s
-
-2001-05-30  Peter Williams  <peterw@ximian.com>
-
-	* gui/component/addressbook.c: Use the correct path to the print
-	preview menu item.
-
-2001-05-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (cut_contacts_cb): new function, for
-	the Cut verb.
-	(copy_contacts_cb): new function, for the Copy verb.
-	(paste_contacts_cb): new function, for the Paste verb.
-	(select_all_contacts_cb): new function, for the Select All verb.
-	(update_command_state): add handling for sensitivity of
-	Cut/Copy/Paste/Select All.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): init
-	the invisible and set up selection/destroy signals.
-	(get_selection_model): new function, so we can get the
-	ETableSelectionModel from either view type.  makes lots of the
-	other functions easier, since we can get the list of selected
-	cards using the same code regardless of view type.
-	(invisible_destroyed): new function.
-	(selection_get): new function.  convert the clipboard list to
-	string.
-	(selection_clear_event): new function - free up the list of
-	ECards.
-	(selection_received): if the selection data is valid and
-	well-formed, add the corresponding cards to the ebook.
-	(add_to_list): new function.
-	(get_selected_cards): new function.
-	(e_addressbook_view_cut): new function, implement in terms of
-	_copy and _delete_selection.
-	(e_addressbook_view_copy): claim ownership of the CLIPBOARD
-	selection after saving the list of selected ECards.
-	(e_addressbook_view_paste): call gtk_selection_convert.
-	(e_addressbook_view_select_all): new function, using
-	e_selection_model_select_all.
-	(e_addressbook_view_can_print): re-implement in terms of
-	get_selection_model.
-	(e_addressbook_view_can_delete): same.
-	(e_addressbook_view_can_cut): new function.
-	(e_addressbook_view_can_copy): new function.
-	(e_addressbook_view_can_paste): new function.  hmm, always return
-	TRUE here.
-	(e_addressbook_view_can_select_all): new function.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	selection stuff - the list of selected cards, and the GtkInvisible
-	selection owner, and add prototypes for
-	e_addressbook_view_[can]_{cut,copy,paste,select_all}.
-	
-	* gui/widgets/e-minicard-view-widget.h: add a prototype for
-	e_minicard_view_widget_get_selection_model.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_get_selection_model): new function.
-
-2001-05-27  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook.c: #include
-	"evolution-shell-component-utils.h" rather than "e-gui-utils.h"
-	for e_pixmaps_update.
-
-2001-05-25  Peter Williams  <peterw@ximian.com>
-
-	* gui/component/Makefile.am: Reference libeshell.la instead of
-	libeshell.a.
-
-2001-05-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height):
-	Correct the height calculation here to not include the
-	E_CARD_SIMPLE_FIELD_FAMILY_NAME since it won't be displayed.
-
-	* gui/widgets/e-minicard.c (remodel): Changed this to continue to
-	be more consistent and simpler.
-
-2001-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): fix strings such
-	that ones that happening at the beginning or during an operation
-	are followed by "..." and those that stop the operation are
-	followed by "."
-	(create_card_handler): same.
-	(ldap_op_process_current): same, and also call _notify_complete if
-	we can't connect to ldap server.
-	(poll_ldap): same, and change "Polling for LDAP search result" to
-	"Receiving LDAP search results"
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): call
-	notify_status_message at the beginning of this function, and
-	whenever we call _notify_complete.
-
-2001-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.h: add sequence_complete_id to
-	EAddressbookModel and stop_state_changed to
-	EAddressbookModelClass.  also, add prototype for
-	e_addressbook_model_can_stop.
-
-	* gui/widgets/e-addressbook-model.c (remove_book_view): disconnect
-	from "sequence_complete", and set search_in_progress to FALSE.
-	(sequence_complete): set search_in_progress to FALSE and emit
-	"stop_state_changed."
-	(e_addressbook_model_class_init): create the "stop_state_changed"
-	signal.
-	(e_addressbook_model_init): init stuff.
-	(book_view_loaded): connect to "sequence_complete" signal.
-	(book_view_loaded): set search_in_progress to TRUE and emit
-	"stop_state_changed"
-	(e_addressbook_model_stop): set search_in_progress to false, emit
-	"stop_state_changed", and set our status to "Search Interrupted."
-	(e_addressbook_model_can_stop): return search_in_progress.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
-	connect to the stop_state_changed signal on EAddressbookModel.
-	(stop_state_changed): new function.
-	(e_addressbook_view_can_stop): call e_addressbook_model_can_stop.
-
-	* gui/component/addressbook.c (update_command_state): use
-	e_addressbook_view_can_stop to set the sensitivity of the stop
-	button.
-
-2001-05-22  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	ref the listener for the duration of this function, since emitting
-	"responses_queued" may cause it to be unreffed by its EBook in
-	some cases, which could cause the second response_queue check to
-	look at garbage data if it got destroyed.
-	(e_book_listener_destroy): Call g_source_remove if idle_id is set.
-
-2001-05-22  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: track the change in
-	evolution-addressbook.xml's bonobo ui path's.
-
-2001-05-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (change_view_type): update_view_type
-	is gone, since the menu item is gone.
-
-	* gui/widgets/e-addressbook-table-adapter.c (create_card): use
-	e_table_model_rows_inserted here.
-
-2001-05-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_item_new): Removed an unused variable.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Made text here non-const.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(edit_contact_info_cb): Cast to a gpointer here.
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table): Cast to E_TABLE_MODEL here.
-
-2001-05-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Do a better job constructing match strings, so we
-	never try to use a segment of the name that isn't there (resulting
-	in ugly (null)'s in the string).  Boost our score if some part of
-	the name also matches the front part of the e-mail address, so the
-	name match will always trump the e-mail match.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Return the serialized EDestinations
-	(rather than just a string w/ e-mail addresses) through the bonobo
-	component's property bag.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_export_destinationv): Added.  A convenience routine
-	for serializing the model's EDestinations into a string.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(add_html_mail): Added.  Puts in a check menu item for whether or
-	not the recipient wants HTML mail.
-	(popup_menu_card): Add menu item for HTML mail.  Enable edit
-	contact info item.
-	(popup_menu_nocard): Add menu item for HTML mail.  Enable edit
-	contact info item.
-
-	* backend/ebook/e-book-util.c (e_book_use_local_address_book):
-	Added.  Fetches the local addressbook and caches it on the first
-	call.  This is meant to be an easy and efficient way to get at the
-	local addressbook with the minimum of code.
-	(e_book_query_address_locally): Added.  Convenience code that
-	does an e-mail only e_book_name_and_email_query against the
-	local address book.
-
-	* backend/ebook/e-destination.c
-	(e_destination_set_html_mail_pref): Added.  Allows the intended
-	recipient's HTML mail preference to be manipulated.
-	(e_destination_get_email_verbose): Added.  Cleaned up to use
-	e_destination_get_name.
-	(e_destination_get_html_mail_pref): Added.  Read the recipient's HTML mail
-	preference.  If the destination is linked to a card, the
-	preference is taken from the card (unless it has been explicitly
-	overridden by a called to e_destination_set_html_mail_pref).
-	(e_destination_get_address_textv): Added.  Form a unified address string
-	from a NULL-terminated vector of EDestinations.
-	(e_destination_export): Added.  Serialize an EDestination to a string.
-	(e_destination_import): Added.  Unserialize a string to build an
-	EDestination.
-	(e_destination_exportv): Added.  Serialize a NULL-terminated vector of
-	EDestinations to a string.
-	(e_destination_importv): Added.  Unserialize a string to build a
-	NULL-terminated vector of EDestinations.
-
-	* gui/component/select-names/e-select-names-completion.c:
-	Implemented local versions of g_strcasecmp and g_strncasecmp
-	(which should really be in glib, I think...) for utf8, and used
-	them to make this code utf8-safe.
-
-2001-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (update_command_state): no more
-	ContactFind command.
-
-2001-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): add our selection_change
-	signal.
-	(e_minicard_view_widget_realize): connect to the ESelectionModel's
-	selection_changed signal.
-	(e_minicard_view_widget_selected_count): new function.
-	(selection_change): new function - emit our "selection_change"
-	signal.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidgetClass): add selection_change signal.  also,
-	add prototype for e_minicard_view_widget_selected_count.  
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): add our command_state_change
-	signal.
-	(e_addressbook_view_init): connect to the writable_status signal
-	on the EAddressbookModel.
-	(minicard_selection_change): new function - calls
-	command_state_change.
-	(create_minicard_view): connect to selection_change on the
-	minicard_view so we know when to update command state.
-	(table_selection_change): new function - calls
-	command_state_change.
-	(writable_status): new function - calls command_state_change.
-	(command_state_change): new function - emits our
-	"command_state_change" signal.
-	(create_table_view): connect to the selection_change signal so we
-	know to update the command state.
-	(change_view_type): update the command state every time we change
-	view types.
-	(e_addressbook_view_can_create): new function.
-	(e_addressbook_view_can_print): new function.
-	(e_addressbook_view_can_delete): new function.
-	(e_addressbook_view_can_stop): new function.
-
-	* gui/widgets/e-addressbook-view.h (struct
-	_EAddressbookViewClass): add command_state_change signal, and
-	prototypes of functions the component can use to test the state of
-	commands.
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): unlink
-	the writable_status signal on the EBook.
-	(writable_status): new function.
-	(e_addressbook_model_class_init): add our writable_status signal.
-	(e_addressbook_model_init): init writable_status_id.
-	(e_addressbook_model_set_arg): unlink the writable_status signal
-	on the old EBook, and connect it on the new one.
-
-	* gui/widgets/e-addressbook-model.h: add writable_status signal.
-
-	* gui/component/addressbook.c (update_command_state): new
-	function, set the sensitivity of the bonobo commands.
-	(control_activate): update our command state immediately upon
-	activating the control.
-	(addressbook_factory_new_control): register command_state_change
-	to update the commands.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): initialize the model and
-	adapter.
-	(button_press): set on the model.
-	(e_addressbook_search_dialog_new): same.
-	(e_addressbook_search_dialog_set_arg): same.
-	(e_addressbook_search_dialog_destroy): unref the model and
-	adapter.
-
-	* gui/search/e-addressbook-search-dialog.h (struct
-	_EAddressbookSearchDialog): add our model and reflow adapter.
-
-2001-05-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c: (e_minicard_view_destroy): Fixed
-	up the lifetime of the drag_data_get signal a bit.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (add_to_list): MinicardViewModel
-	-> ReflowAdapter name change.
-	(get_card_list): same.
-	(e_minicard_view_drag_begin): same.
-	(supported_fields_cb): model -> adapter.
-	(adapter_changed): hook up signals and set the empty message on
-	our adapter.
-	(e_minicard_view_set_arg): add support for "adapter", and set
-	model -> adapter.
-	(e_minicard_view_get_arg): same.
-	(disconnect_signals): no more status_message.
-	(do_remove): track to use adapter.
-	(e_minicard_view_class_init): add adapter arg, and remove
-	status_message.
-	(e_minicard_view_init): all the code here is in adapter_changed
-	now.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView):
-	EMinicardViewModel -> EAddressbookReflowAdapter.
-	(struct _EMinicardViewClass): get rid of status_message.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): remove the status_message
-	signal.
-	(e_minicard_view_widget_new): take the adapter as our argument,
-	and store it away for when we create the view.
-	(e_minicard_view_widget_realize): when we create the view just set
-	the adapter field on it.  also, don't connect to status_message.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): add our adapter here, so we can pass it
-	into the view when we create it.
-	(struct _EMinicardViewWidgetClass): remove status_message.
-
-	* gui/widgets/e-addressbook-view.c (status_message): new function,
-	no more propagating status messages!
-	(e_addressbook_view_init): create our model and conenct to its
-	status_message signal.
-	(book_writable_cb): set "editable" on the model, not our object.
-	(e_addressbook_view_set_arg): same, but with "book" and "query" as
-	well.
-	(create_minicard_view): create our reflow adapter and pass it to
-	the minicard view widget.  also, call e_reflow_model_changed so
-	it'll pick up any already present cards.
-	(table_double_click): ADDRESSBOOK_MODEL -> TABLE_ADAPTER.
-	(get_card_list_1): remove the cast, since we don't need it any
-	longer.
-	(table_right_click): ADDRESSBOOK_MODEL -> TABLE_ADAPTER.
-	(table_drag_data_get): same.
-	(create_table_view): create the table adapter, and use it as our
-	ETableModel.
-	(change_view_type): remove the status_message hook up and setting
-	of query/book/editable.
-	(e_addressbook_view_stop): just call e_addressbook_model_stop here
-	instead of switching on the view type.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	our EAddressbookModel.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add the
-	adapter files, and remove e-minicard-view-model.[ch].
-
-	* gui/widgets/e-minicard-view-model.[ch]: removed.
-	
-	* gui/widgets/e-addressbook-table-adapter.c: new file.
-
-	* gui/widgets/e-addressbook-table-adapter.h: new file.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: new file.
-
-	* gui/widgets/e-addressbook-reflow-adapter.h: new file.
-
-	* gui/widgets/e-addressbook-model.c: rework this class to now
-	subclass from ETableModel anymore.  It not subclasses from
-	GtkObject, and we use table and reflow adapters to get at the
-	data.
-
-	* gui/widgets/e-addressbook-model.h: same.
-
-2001-05-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view-model.c (remove_card): Fix a small
-	error not decreasing the data_count here.
-
-2001-05-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.h: add prototype for
-	addressbook_expand_uri.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): create an EBook for
-	@physical_uri.
-	(dnd_drop_book_open_cb): actually add the dropped cards.
-
-	* gui/component/addressbook.c (addressbook_expand_uri): abstract
-	this code out from the set_prop method so we can use it in the
-	component.
-	(set_prop): call addressbook_expand_uri.
-
-	* backend/ebook/e-card.c (e_card_load_cards_from_string): new
-	function.
-
-	* backend/ebook/e-card.h: add prototype for
-	e_card_load_cards_from_string.
-
-2001-05-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): spew the data passed to us.
-	(destination_folder_handle_motion): the suggested_action is not an
-	ActionSet, but an Action, so don't or together multiple actions.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	correct bug causing the Ok button to never be enabled.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (populate_context_menu):
-	example.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_data_get):
-	use e_card_list_get_vcard to build up the data to send.
-	(e_minicard_view_init): connect to the model's drag_begin signal.
-	(e_minicard_view_drag_begin): gather the list of cards being
-	dragged and call gtk_drag_begin.
-	(add_to_list): new function.
-	(get_card_list): same.
-	(disconnect_signals): disconnect the drag_data_get signal.
-	(e_minicard_view_init): connect to the drag_begin signal on our
-	model.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): change
-	drag_card to drag_list.
-	
-	* gui/widgets/e-minicard-view-model.c (minicard_drag_begin): new
-	function, emit our drag_begin signal.
-	(addressbook_incarnate): connect to the item's drag_begin signal.
-	(e_minicard_view_model_class_init): init our drag_begin signal.
-
-	* gui/widgets/e-minicard-view-model.h: add drag_begin signal.
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	always loop through all source types here, making LDAP first so
-	it's forces as the first notebook item.
-	(addressbook_config_auth_label): remove SASL case.
-	(addressbook_source_edit_changed): same.
-	(addressbook_source_item_new): flag the area of code that needs to
-	go into the advanced dialog (if we add one before someone
-	graciously redesigns the entire addressbook gui :)
-
-
-	* gui/component/addressbook-storage.c (ldap_unparse_auth): remove
-	SASL case.
-	(ldap_parse_auth): same.
-
-	* gui/component/addressbook-storage.h: make LDAP come first in our
-	source type enumeration, and remove the SASL auth type.
-
-2001-05-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): If the name is set and
-	the full_name or file_as haven't been yet, set them.
-
-2001-05-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c: Reordered the includes here.
-	(string_to_dbt): The sleepycat libdb documentation suggests
-	memseting the DBT to 0 so we do that here.
-
-	* gui/widgets/e-minicard-view-model.c (addressbook_height): Skip
-	the E_CARD_SIMPLE_FIELD_FAMILY_NAME field.
-
-	* gui/widgets/e-minicard.c (remodel): Skip the
-	E_CARD_SIMPLE_FIELD_FAMILY_NAME field.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
-	check schema support if we've connected.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (enable_writable_fields):
-	don't leak the ECard or ECardSimple.
-
-2001-05-08  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in:
-	Renamed the GnomeCard_Importer.oaf.in to this, and change the IID.
-
-	* Makefile.am: Rename all the GnomeCard to VCard.
-
-	* evolution-vcard-importer.c: Make the GnomeCard a generic 
-	vcard importer.
-
-2001-05-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/Makefile.am (libebookinclude_HEADERS): Removed
-	e-card-pairs.h since we're not using it.
-
-	* backend/ebook/e-book-view.c (e_book_view_check_listener_queue):
-	Added break; to default: case here.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added changed variable so as to avoid sync_card when possible.
-	(e_card_simple_destroy): Free all the data here properly.
-	(e_card_simple_get_arg): Slight simplification here.
-	(fill_in_info, e_card_simple_arbitrary_foreach,
-	e_card_simple_get_arbitrary): Call e_card_free_empty_lists here to
-	save a bit of memory.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Fixed up
-	includes a bit.
-	(e_card_list_get_vcard, e_card_list_send): Added these functions
-	for acting on a group of cards.
-	(parse_org): Cleaned up this function a bit.
-	(e_card_free_empty_lists): Added this function to delete
-	unnecessary ELists and save a bit of memory.
-	(e_v_object_get_child_value): Made this return NULL if not found
-	instead of g_strdup("").
-
-	* contact-editor/e-contact-save-as.c,
-	contact-editor/e-contact-save-as.h (e_contact_list_save_as): Added
-	this function to save multiple contacts.
-
-	* gui/widgets/Makefile.am: Commented out reflow test.
-	(libeminicard_a_SOURCES): Added e-minicard-view-model.c and
-	e-minicard-view-model.h.
-
-	* gui/widgets/e-minicard-view-model.c,
-	gui/widgets/e-minicard-view-model.h: Model for use in
-	EMinicardView.
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Reworked this to use the new EReflow stuff.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Doesn't handle
-	right click menus now.  Emits a signal on the parent canvas item
-	instead.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h
-	(e_contact_print_envelope_list_dialog_new): Added this function to
-	print multiple envelopes (only prints first for now.)
-
-	* printing/e-contact-print.c, printing/e-contact-print.h
-	(e_contact_print_card_list_dialog_new): Added this function to
-	print multiple cards.  Only prints the first for now.
-
-2001-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): flesh out
-	the function more.  It should work now, but there's no way to
-	invoke this method from the ui at the moment, heh.
-
-2001-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): Use a different
-	error message in the ldap support/no ldap support/file cases.
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/component/addressbook.c: use define from
-	widgets/misc/e-filter-bar.h instead of own enumeration and search menu
-	names.
-
-	* gui/component/Makefile.am, gui/component/select-names/Makefile.am:
-	removed EVOLUTION_VERSION.
-
-2001-05-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): un-#if 0
-	this.
-	(xfer_folder): add skeleton code to validate xfer request.  always
-	notifies with PERMISSION_DENIED at present.
-	(populate_context_menu): un-#if 0 this.
-	(get_dnd_selection): same.
-	(destination_folder_handle_motion): new function.
-	(destination_folder_handle_drop): new function.
-	(factory_fn): create a EvolutionShellComponentDndDestinationFolder
-	interface, and add it to our shell component.
-
-2001-05-04  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): init change_id to NULL
-
-2001-05-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_view_free): unref the
-	book if the view is being destroyed
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): unref the book_view when
-	we are finished, it is only interesting if someone else has reffed
-	it now (weak reference)
-	(pas_backend_file_add_client): unref the book for the same reason
-	as above
-
-	* Fixes bug #2255
-
-2001-04-30  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c (vcard_matches_search): if the
-	view does not contain a search context, the result is by default
-	false fixes #2470
-
-2001-04-25  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Remove call to
-	unicode_init.
-
-2001-04-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c: Lots of code has been
-	simplified here.
-	(e_address_popup_factory_new_control): Rather than directly pop
-	our control up in a window (via the e_address_popup_popup
-	function, which is now gone), just return the widget and let the
-	caller do the popping.  This works better, since it means we don't
-	have to work around the vagaries of bonobo focus & event handling.
-	(e_address_popup_set_name): Refresh when both name & email have
-	been set, rather than checking a stupid counter.
-	(e_address_popup_set_email): Ditto.
-
-2001-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_clear_sources): Added save_source_data here.
-
-2001-04-21  Jon Trowbridge  <trow@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c (clicked_cb): Properly
-	convert to utf8. (Bug #2256)
-	(build_quick_add_dialog): Properly convert from utf8. (Bug #2256)
-
-2001-04-16  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Added.
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Use e_select_names_model_append.  It's
-	nicer.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_append): Added.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_process_card_list): Filter out completion matches that
-	don't have an associated e-mail address.
-	(book_query_score): Give a bonus to the primary address, so that
-	it always comes up first in the completion results.
-
-	* gui/component/e-address-popup.c (e_address_popup_refresh_names):
-	Convert utf8 strings into gtk strings before displaying.
-
-2001-04-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c,
-	backend/ebook/e-book-view-listener.h: Added the function
-	e_book_view_listener_stop to tell the book view listener to stop
-	sending signals.
-
-	* backend/ebook/e-book-view.c (e_book_view_destroy): Tell the
-	EBookViewListener to stop when we're destroyed.
-
-	* backend/pas/pas-backend-file.c (view_destroy,
-	pas_backend_file_process_get_book_view,
-	pas_backend_file_process_get_changes): Cleaned these up a bit
-	using bonobo_object_ref and bonobo_object_unref.
-	(pas_backend_file_process_get_book_view,
-	pas_backend_file_process_get_changes): bonobo_object_release_unref
-	the EBookListener here.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_book_view): Cleaned this up a bit
-	using bonobo_object_ref.  Make sure to unref the listener when
-	we're done with it.  Put the new book_view in the list before
-	telling the book_listener that it's ready.
-
-	* backend/pas/pas-book-view.c (pas_book_view_construct): Cleaned
-	this up a bit using bonobo_object_dup_ref.
-	(pas_book_view_destroy): Cleaned this up a bit using
-	bonobo_object_release_unref.
-
-	* backend/pas/pas-book.c (pas_book_queue_get_book_view,
-	pas_book_queue_get_changes): bonobo_object_dup_ref here instead of
-	just duplicating.
-
-2001-04-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_get_cursor): Ref the cursor here when
-	we receive it.
-	(impl_BookListener_respond_get_view,
-	impl_BookListener_respond_get_changes): Ref the book_view here
-	when we receive it.
-	(impl_BookListener_respond_open_book): Ref the book here when we
-	receive it.
-	(e_book_listener_destroy): Unref the objects in our queue here.
-
-	* backend/ebook/e-book-view.c (e_book_view_construct): Cleaned
-	this up using bonobo_object_dup_ref.
-	(e_book_view_destroy): Cleaned this up using
-	bonobo_object_release_unref.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_cursor,
-	e_book_do_response_get_view, e_book_do_response_get_changes,
-	e_book_unload_uri): Cleaned this up using
-	bonobo_object_release_unref.
-
-2001-04-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Get the ESelectNamesModel from the
-	widget's text model instead of storing it as a gtk_object_set_data
-	since it may change.
-
-2001-04-12  Jason Leach  <jasonleach@usa.net>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Update the Voice
-	and Fax phone numbers too, finishing off bug #1667.
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Update the built
-	in VCard.
-
-2001-04-12  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): put the
-	business address into the pilot record as that is what we put into
-	the desktop record
-	(ecard_from_remote_record): set both the address label and
-	delivery address to avoid bad parser guessing, fixes #2143
-
-	* backend/ebook/e-card-types.h: remove deprecated pilot code
-
-	* backend/ebook/e-card.c: ditto
-
-	* backend/ebook/e-card.h: ditto
-	
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): Don't add
-	more than five phone numbers and set the remaining blank entries
-	to some reasonable defaults
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.h: Added
-	E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING.
-
-	* gui/component/addressbook-component.c (accepted_dnd_types):
-	Fixed a warning here.
-
-	* gui/widgets/e-addressbook-model.c: Modified this to have more
-	columns, but not let them be edited if they're not a simple
-	string.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_init): Fixed a
-	warning and a memory leak here.
-
-2001-04-10  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* backend/ebook/evolution-gnomecard-importer.c: added missing #include.
-	* contact-editor/e-contact-editor.c (_arrow_pressed): popup menu items were
-	not translated after selecting one of them.
-	* gui/widgets/e-addressbook-view.c: mark popup menu items with N_().
-	Updated list[] for translators.
-	* gui/widgets/e-minicard.c: same.
-	* gui/widgets/e-minicard-view-widget.c (e_minicard_view_widget_set_arg): fix warning
-	for "editable" arg.
-	* gui/widgets/e-minicard-view.c: convert "empty_message" to utf8.
-
-2001-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): stubbed,
-	#if 0'ed
-	(xfer_folder): same.
-	(populate_context_menu): same.
-	(get_dnd_selection): same.
-	(factory_fn): add the accepted drag types ("text/x-vard") to
-	folder_types.
-
-2001-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): on BUTTON_PRESS: if
-	it's button 1, store the button x, y, and set drag_button_down to
-	TRUE.  on BUTTON_RELEASE: always set drag_button_down to FALSE.
-	for MOTION_NOTIFY: initiate drag if the pointer has moved 3
-	pixels.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add fields for
-	button x, y, and a bit for if the button has been pressed so we
-	can tell whether a motion should be a drag.
-	(struct _EMinicardClass): add drag_begin signal.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_begin): new
-	function, starts the drag.
-	(book_view_loaded): connect the "drag_data_get" signal.
-	(e_minicard_view_drag_data_get): new function.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): add
-	drag_card and id for canvas_drag_data_get_id.
-
-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): new
-	function.
-	(create_table_view): add d&d stuff.
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c: add #include <sys/types.h> since
-	gnome-print.h uses time_t without including it.  this really
-	should be fixed in gnome-print.
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	make sure to notify new clients to the writable status of an
-	already open (and authenticated) book.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* contact-editor/e-contact-editor.[ch]: Fix headers.
-	* component/addressbook-storage.c: Same here.
-	* gui/search/e-addressbook-search-dialog.c: Same here.
-	* gui/widgets/e-addressbook-view.c: Same here.
-	* gui/widgets/e-minicard-label.c: Same here.
-	* gui/widgets/e-minicard-view-widget.c: Same here.
-	* gui/widgets/e-minicard-view.c: Same here.
-	* gui/widgets/e-minicard-widget-test.c: Same here.
-	* gui/widgets/e-minicard-widget.c: Same here.
-	* gui/widgets/e-minicard.c: Same here.
-	* gui/widgets/test-minicard-label.c: Same here.
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): Fixed a
-	crash here.
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (COLS): Made this table model
-	more consistent in the number of columns it has.
-	(addressbook_append_row): Fixed this function.  We removed the col
-	offset.
-
-2001-04-02  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-gnomecard-importer.c (importer_init): Shut
-	down and unregister the factory on exit. 
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* contact-editor/contact-editor.glade: changed icon to
-	evolution-contacts-plain.png.
-	* gui/component/addressbook.c: use new pixmap cache. Added icon for new
-	contact, print, print preview, changed filenames of renamed icons.
-
-2001-03-31  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Call e_select_names_model_clean after
-	adding address.  This should deal with the bug reports related
-	to stray commas.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_clean): Added.  Remove all empty destinations.
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Added.  Check
-	if an EDestination is in essentially a null state.
-
-2001-03-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	Tell new clients that are added whether they're writable.
-
-2001-03-29  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/e-contact-print.c: Added #include <libgnome/gnome-paper.h>
-	
-	* printing/e-contact-print-envelope.c: Added #include <time.h>
-	and #include <libgnome/gnome-paper.h>
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_email): Better handle matching of "nameless" contacts.
-
-	* backend/ebook/e-destination.c (e_destination_get_string): Better
-	handle the case of a "nameless" contact.
-
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* *.*: Clean up #includes. Replace <gnome.h>, <bonobo.h> and
-	<gtk/gtk.h> with more finegrained headers where needed.
-
-2001-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): Fixed some crashes.
-
-2001-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Use E_CARD_SIMPLE_FIELD_NAME_OR_ORG instead of
-	getting the NAME and then the ORG.  That way if we expand
-	NAME_OR_ORG, this will use it.
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table, SPEC): Use the correct column
-	in the SPEC.
-
-2001-03-25  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_seq_complete_cb): Rather than starting
-	the pending query by directly calling
-	e_select_names_completion_do_query, call
-	e_completion_begin_search.  Circumventing the ECompletion API was
-	causing it to get confused in some cases.
-
-2001-03-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-minicard-widget.c (e_minicard_widget_set_card):
-	Added.  Call me old-fashioned, but I just prefer to have a real
-	API rather than doing everything via gtk_object_get/set-type
-	calls.
-	(e_minicard_widget_set_arg): Changed to call
-	e_minicard_widget_set_card.
-
-	* backend/ebook/e-book-util.c: Small changes to get rid of
-	compiler warnings.  (Casting out const, removed unused variables,
-	etc.)  Removed some debugging messages.
-
-	* gui/component/addressbook-factory.c (main): Added call
-	to e_address_popup_factory_init.
-
-	* gui/component/e-address-popup.c: Added.  A popup gadget that is
-	invoked (as a bonobo control) when an address is left-clicked in
-	the mailer.  The addressbook is queries, and the address is either
-	displayed as a minicard (if it already exists) or in a "generic
-	format".  A button is provided for editting/adding the contact.
-	Some of the semantics of this widget are a bit... non-standard,
-	because of bonobo issues.  I can't really seem to replicate
-	popup-menu behavior because of how bonobo propogates events, etc.
-	so I've tried to produce something that I think is non-annoying.
-	YMMV.
-
-2001-03-22  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-gnomecard-importer.c: Update to the new
-	IDL.
-
-2001-03-20  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Added artwork from
-	Jakub. 
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* Merged branch:
-
-2001-03-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c: Call
-	e_selection_model_simple_insert_rows and
-	e_selection_model_simple_delete_rows instead of
-	e_selection_model_simple_insert_row and
-	e_selection_model_simple_delete_row.
-
-End of branch
-
-2001-03-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c: Brutally
-	refactored to boost performance in large-addressbook situations.
-	These fixes give accepable performance (even with the suboptimal
-	pas-backend-file searching) using tigert's addressbook-of-death.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): 
-	Start feeding query matches back to the caller before the
-	entire search is complete; this gives us some "instant feedback"
-	rather than causing evolution to totally lock up...
-
-	* backend/ebook/e-book.c (e_book_queue_op): Tag all queued ops.
-	(e_book_cancel_op): Added.  Search for a pending op with a given
-	tag, and mark it as inactive.
-	(e_book_do_response_get_cursor): Don't execute callback if this
-	operations has been cancelled.
-	(e_book_do_response_get_view): Ditto.
-	(e_book_do_response_get_changes): Ditto.
-	(e_book_do_response_get_supported_fields): Ditto.
-	(e_book_get_supported_fields): Return an operation tag (that can
-	be used to cancel the operation) rather than just TRUE/FALSE.
-	Zero is always an invalid tag and is returned in the case of an
-	error, so this shouldn't break any code that looked at the return
-	value (unless it did so in a particularly stupid way, of course).
-	(e_book_get_cursor): Ditto.
-	(e_book_get_book_view): Ditto.
-	(e_book_get_changes): Ditto.
-	(e_book_cancel): Added.  Cancel a pending operation.  (Basically
-	a call to e_book_cancel_op with error checking, etc.)
-
-	* backend/ebook/e-book-types.h: Added E_BOOK_STATUS_CANCELLED.
-
-2001-03-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_writable_status): new function.
-	(impl_BookListener_report_writable): new function.
-	(e_book_listener_get_epv): fill in epv->notifyWritable.
-
-	* backend/ebook/e-book-listener.h: add writable status entries.
-
-	* backend/ebook/e-book.c (e_book_do_writable_event): new function.
-	(e_book_check_listener_queue): add WritableStatusEvent to the
-	switch.
-	(e_book_class_init): register writable_status signal.
-
-	* backend/ebook/e-book.h: add writable_status signal.
-
-	* backend/idl/addressbook.idl: add notifyWritable method to
-	BookListener.
-
-	* gui/widgets/e-minicard.c (e_minicard_class_init): add "editable"
-	arg.
-	(e_minicard_init): init editable.
-	(e_minicard_set_arg): loop over the minicard fields setting their
-	"editable".
-	(e_minicard_get_arg): add editable.
-	(supported_fields_cb): use editable when creating the
-	contact_editor.
-	(add_field): set "editable" when creatin the e_minicard.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add "editable".
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_class_init): add
-	editable arg.
-	(e_minicard_view_init): init editable.
-	(create_card): pass editable to e_minicard canvas item.
-	(e_minicard_view_set_arg): bit of a hack - loop over all the
-	canvas items setting their "editable."
-	(e_minicard_view_get_arg): add editable.
-	(supported_fields_cb): use editable when creating the contact
-	editor.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): add
-	"editable."
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): add "editable" field.
-	(e_minicard_view_widget_init): init editable to FALSE.
-	(e_minicard_view_widget_set_arg): save editable, and pass it along
-	the e-minicard-view.
-	(e_minicard_view_widget_realize): same.
-	(e_minicard_view_widget_get_arg): add editable.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): add "editable" field.
-
-	* gui/widgets/e-minicard-label.h (struct _EMinicardLabel): add
-	"editable" field.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_class_init):
-	add "editable" arg.
-	(e_minicard_label_set_arg): editable, set it on the e_text too.
-	(e_minicard_label_get_arg): editable.
-	(e_minicard_label_construct): set the "editable" field when we
-	create the e_text cavas item
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
-	default editable to FALSE.
-	(book_writable_cb): new function, set our editable field and
-	gtk_object_set it on the active view.
-	(e_addressbook_view_set_arg): set the active view's editable when
-	we set the view's book, and connect the "writable_status" signal
-	to book_writable_cb.
-	(change_view_type): same.
-	(supported_fields_cb): use our "editable" when creating the
-	contact editor.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	editable field.
-
-	* gui/widgets/e-addressbook-model.c (e_addressbook_model_init):
-	change the default of editable to FALSE.
-
-	* backend/pas/pas-book.c (pas_book_report_writable): new function.
-
-	* backend/pas/pas-book.h: prototype for pas_book_report_writable.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): if
-	we open the file O_RDWR (or create it) report it as writable.  if
-	we can't open it as O_RDWR, try opening it read-only before we
-	attempt to create it.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): if we authenticate
-	successfully, grant write permissions (this is lacking but there's
-	really nothing we can do to determine the extent of the access
-	afforded a user.)
-
-
-2001-03-15  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-widget.c: Added addressbook querying and
-	"cardification" functions, which are turned off by default for now
-	because of addressbook bugs.  Added a popup menu option to turn
-	queries on, so that others can enjoy the thrill of massive flaming
-	death.
-
-	* gui/component/addressbook-factory.c (main): Made warnings always
-	be fatal.
-
-	* backend/pas/pas-book-view.c: Added some debugging spew.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): Added
-	a little experimental code to try to make file searches scale
-	better.  #if 0/#endif-ed out for now.
-
-	* contact-editor/e-contact-quick-add.c: #included e-book-util.h.
-
-	* backend/ebook/e-card.c (e_card_name_match_string): Added.
-	Looser name-matching function.
-	(e_card_email_match_string): Added.  Loose e-mail matching.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Added code to cause us to
-	abort rather than get trapped in a 100%-CPU-consuming loop in
-	certain situations.  Now we just need to figure out how to avoid
-	these situations altogether.
-
-	* backend/ebook/e-book-util.c: Added.  Now contains the simple
-	query stuff and the open local addressbook functions.
-
-	* backend/ebook/e-book.c: Moved simple query stuff and open local
-	addressbook functions into e-book-util.c.
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_set_arg): 
-	* gui/widgets/e-minicard.c (e_minicard_set_arg, e_minicard_event):
-	Update arguments to e_canvas_item_grab_focus.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Fix a warning
-	here.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/Makefile.am (minicard_label_test_LDADD): Change to
-	ld order from Greg Williams.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): Moved where we call
-	pas_book_respond_get_book_view.
-
-2001-03-12  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: add E_STRING_PROP for
-	categories.
-
-	* backend/pas/evolutionperson.schema: add categories attribute.
-
-	* backend/ebook/e-card-simple.c (field_data): add
-	E_CARD_SIMPLE_FIELD_CATEGORIES.
-
-	* backend/ebook/e-card-simple.h: add
-	E_CARD_SIMPLE_FIELD_CATEGORIES.
-
-2001-03-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (supported_fields_cb): add is_read_only
-	param.
-
-	* gui/widgets/e-minicard-view.c (supported_fields_cb): add
-	is_read_only param.
-
-	* gui/widgets/e-addressbook-view.c (supported_fields_cb): add
-	is_read_only param.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): add is_read_only param.
-	also, include a little policy here and make it TRUE, as the user
-	shouldn't be editting in this context anyway (imo).
-
-	* gui/component/addressbook.c (supported_fields_cb): add
-	is_read_only param.
-
-	* contact-editor/test-editor.c (main): add is_read_only param.
-
-	* contact-editor/e-contact-editor.c (set_read_only): new function,
-	that either enables or disables all the text fields, combo boxes,
-	and some buttons, depending on the state of is_read_only.
-	(e_contact_editor_class_init): add read/write arg "is_read_only".
-	(full_name_clicked): set the is_read_only of the fullname dialog
-	to the editor's.
-	(full_addr_clicked): same.
-	(e_contact_editor_new): add is_read_only param, that gets set
-	along with the other params.
-	(e_contact_editor_set_arg): add setter for is_read_only.
-	(e_contact_editor_get_arg): add getter for is_read_only.
-	(_phone_arrow_pressed): change TRUE to !editor->is_read_only for
-	entry.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(enable_writable_fields): same.
-
-	* contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_class_init): add read/write arg
-	"is_read_only".
-	(e_contact_editor_fullname_set_arg): add setter for is_read_only
-	that enables/disables all the entries/combos.
-	(e_contact_editor_fullname_get_arg): add getter for is_read_only.
-
-	* contact-editor/e-contact-editor-fullname.h (struct
-	_EContactEditorFullname): add is_read_only flag.
-
-	* contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): add read/write arg
-	"is_read_only".
-	(e_contact_editor_address_set_arg): add setter for is_read_only
-	that disables/enables all the entries/combos.
-	(e_contact_editor_address_get_arg): add getter for is_read_only.
-
-	* contact-editor/e-contact-editor-address.h (struct
-	_EContactEditorAddress): add is_read_only flag.
-
-2001-03-13  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/Makefile.am: Change the importer includes around a bit.
-
-	* backend/ebook/evolution-gnomecard-importer.c: Correctly add the includes.
-
-2001-03-09  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: PISOCK_INCLUDEDIR has become
-	PISOCK_CFLAGS in gnome-pilot.m4 and remove capplet foo
-
-2001-03-11  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_simple_query): Added. A
-	simplified, cancellable query mechanism that lets you avoid
-	dealing with EBookView.
-	(e_book_simple_query_cancel): Added. Cancels a running query.
-
-	* backend/ebook/e-book-types.h: Add enum EBookSimpleQueryStatus.
-
-2001-03-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(quick_add_cb): Switched to use e_contact_quick_add_free_form.
-	Removed debugging code, hopefully without introducing any bugs
-	in the process.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Fix bug with commas
-	inside of name/address combos.  As long as the comma is inside of
-	quotes, it will be treated as part of the name rather than as a
-	break between addresses.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Use e_card_name_to_string for nickname match
-	strings.
-	(match_email): Use e_card_name_to_string for email match strings.
-	(e_select_names_completion_begin): Strip quotes out of query text,
-	so we don't produce malformed sexps.
-	Added William Blake quote easter egg.
-
-	* contact-editor/e-contact-quick-add.c: Further attempts to fix...
-	mostly unsuccessful.
-	(e_contact_quick_add_free_form): Added.  Takes a single string
-	and tries to parse out (using some simple, loose rules) the
-	name and e-mail -- then calls e_contact_quick_add.  An attempt to 
-	get the computer to automatically Do The Right Thing.
-
-	* backend/ebook/e-book.c: Fixed some broken indentation.  Yes, I'm
-	anal.
-
-	* gui/component/GNOME_Evolution_Addressbook.oafinfo: Added oaf_server
-	info for EAddressWidget.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Added oaf_server
-	info for EAddressWidget.
-
-	* gui/component/addressbook-factory.c (main): Add call to
-	e_address_widget_factory_init.
-
-	* gui/component/e-address-widget.h: 
-	* gui/component/e-address-widget.c: Added.  A little widget (and a
-	Bonobo control, BTW) for displaying addresses, with a left-click
-	menu.  Used to display addresses in the mail viewer (as embedded
-	GtkHTML objects, replacing the text previously used).  Still quite
-	incomplete.
-
-2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Specify a
-	NULL `EvolutionShellComponentGetDndSelectionFn'.
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Fix glitch with
-	inserting comma-delimited stuff when length > 1.
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_load_local_address_book): Added.
-	Just encapsulates opening
-	file://~username/evolution/local/Contactes/addressbook.db, so that
-	path doesn't need to be hardwired in throughout the code.
-
-2001-03-06  Benjamin Kahn  <xkahn@cybersites.com>
-
-	* contact-editor/e-contact-quick-add.c (clicked_cb): 
-	Added the third argument to e_contact_editor_new.  (Cheated
-	and send NULL for the field argument, which is probably
-	troublesome.  It will be fixed soon by either clahey or 
-	toshok.)
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_replace): Fix a reference counting bug.
-
-	* gui/component/select-names/e-select-names-manager.c (popup_cb):
-	A callback for creating the appropriate popup by calling
-	e_select_names_popup.
-	(e_select_names_manager_create_entry): Connect popup_cb to the
-	entry's popup signal
-
-	* gui/component/select-names/e-select-names-popup.c: Added.  Code
-	for popup right-click menus for recipient entries.  Still a bit
-	incomplete.
-
-	* backend/ebook/e-destination.c (e_destination_get_email_num):
-	Added.
-
-	* contact-editor/e-contact-quick-add.c: Added.  Some code and a
-	dialog for very quickly adding entries to the address book.
-	Still not fully working.
-
-2001-03-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c: Cleaned up the formatting in this
-	file a bit.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_set_arg):
-	Made it so that passing in NULL to the writable_fields arg sets
-	the set of writable fields to the empty set.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): Pass NULL as the
-	writable_fields argument here.
-
-	* gui/widgets/e-addressbook-model.c: Don't offset by one here.
-	This way we will get the file_as field as one of our
-	ETableColumns.
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Updated this for the
-	changes in ECardSimple.
-
-	* gui/widgets/e-minicard.c (remodel): Don't remodel if the item
-	isn't realized.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: doh, track renaming of
-	objectclass from evolvePerson to evolutionPerson.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: rename evolveperson.schema
-	to this, and add remaining attributes.
-
-	* backend/pas/pas-backend-ldap.c: add remaining fields, and fix up
-	ones that were incorrent (either the ldap_attr or the query prop).
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: update sed script
-
-	* conduit/e-address.conduit.in: update for new pilot foo
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): track change to
-	e_contact_editor_new.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_objectclass_mod): add
-	objectclasses for "person", "organizationalPerson", and "top" as
-	well, just to be complete.
-	(check_schema_support): rename check_for_evolve_person to this, to
-	reflect that we're doing more than just checking for that
-	objectClass.
-	(add_oc_attributes_to_supported_fields): new function.
-	(add_to_supported_fields): new function.
-	(pas_backend_ldap_destroy): unref supported_fields.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (supported_fields_cb): new
-	function.
-	(e_minicard_view_event): split out the creation of the contact
-	editor to the supported_fields callback.
-
-	* gui/widgets/e-minicard.c (supported_fields_cb): new function.
-	(e_minicard_event): split out the creation of the contact editor
-	to the supported_fields callback.
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): split
-	function into two functions, since e_book_get_supported_fields
-	requires a callback now.
-	(supported_fields_cb): new function.
-
-	* gui/component/addressbook.c (new_contact_cb): split this into
-	two functions, since e_book_get_supported_fields requires a
-	callback now.
-	(supported_fields_cb): new function.
-
-	* contact-editor/test-editor.c (main): track change to
-	e_contact_editor_new (pass NULL for the writable_fields arg.)
-
-	* contact-editor/contact-editor.glade: fix several labels so they
-	make better sense (since we look them up in e-contact-editor.c.)
-
-	* contact-editor/e-contact-editor.h (struct _EContactEditor): add
-	writable_fields.  also, add it to e_contact_editor_new.
-	
-	* contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	add writable_fields arg.
-	(e_contact_editor_destroy): unref the writable_fields list.
-	(e_contact_editor_new): pass @fields as the writable_fields arg.
-	(e_contact_editor_set_arg): add writable_fields support.
-	(enable_writable_fields): new (very hairy) function, to disable
-	everything and reenable just the fields listed in the
-	writable_fields list.
-	(_email_arrow_pressed): set label-email1, entry-email1, and
-	checkbutton-htmlmail to be sensitive since the only way to get
-	here is to activate a writable field in the menu.
-	(_address_arrow_pressed): set label-address, button-fulladdr, and
-	text-address to be sensitive for the same reason.
-	(_phone_arrow_pressed): sensitize the label and entry for the same
-	reason.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-simple.c (field_data): add new entries for
-	phone enums, and fill in the ecard_field with (bogus in all but a
-	few cases) strings.  these are the strings sent from wombat to
-	evolution-addressbook for supported_fields.
-	(e_card_simple_get_ecard_field): new function.
-	(e_card_simple_map_phone_to_field): new function.
-	(e_card_simple_map_email_to_field): new function.
-	(e_card_simple_map_address_to_field): new function.
-
-	* backend/ebook/e-card-simple.h: add a few phone entries to the
-	ECardSimpleField enum, and add prototypes for mapping the list
-	types (phone, email, address) to ECardSimpleField.  Also, add
-	prototype for e_card_simple_get_ecard_field.
-
-	* backend/ebook/e-book.c
-	(e_book_do_response_get_supported_fields): don't build the EList
-	here, it's already built.
-
-	* backend/ebook/e-book-listener.h: change fields from the CORBA
-	sequence to the EList in our reponse struct.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): we make the
-	EList here, since after we return the CORBA list is freed up.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): implement
-	properly, we support everything.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Oops, we do need to be able to write to
-	"text" after all (for things like Reply-to: to work properly).
-	Fixed.
-	(impl_SelectNames_get_entry_for_section): Made "text" a writeable
-	property again.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Increment pos so that
-	we don't reverse strings when length > 1 (a particularly amusing
-	bug).
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): Check for NULL before calling
-	gtk_object_unref (GTK_OBJECT (---)), to get rid of annoying error
-	messages.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-	
-	* gui/component/select-names/e-select-names-completion.c: I am an
-	idiot.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Change for new EDestination/ESelectNamesModel API.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_get_source): Added.  A function for
-	looking up the ESelectNamesModel by id.  (I didn't end up using
-	this function, but it might come in handy later.)
-	(e_select_names_manager_get_cards): #if 0/#endif out this
-	function.
-	(e_select_names_manager_create_entry): Modified to attach an
-	ESelectNamesCompletion to the entry we create.
-	(completion_handler): A post-completion handler for our EEntry, to
-	take the completion's extra data (an EDestination) and properly
-	stick it into our ESelectNamesModel.
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Changed to operate on EDestinations rather
-	than ECards and to use the new ESelectNamesModel API.  This leads
-	to a rather nice code simplication.
-	(remove_address): Changed for new ESelectNamesModel API.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Rather than just passing the entry's text
-	through the property bag, get the "address text" from the model.
-	This returns a nice, verbose string of addresses with names
-	expanded when the address is tied to an ECard (i.e. "Jon
-	Trowbridge <trow@ximian.com>").
-	(impl_SelectNames_get_entry_for_section): Make the text property
-	read-only.
-	(entry_set_property_fn): ...and since it is read-only now, chop
-	out the setter code.
-	
-	* gui/component/select-names/e-select-names-text-model.h: 
-	* gui/component/select-names/e-select-names-text-model.c: Again,
-	this code has been (pretty much) totally rewritten to convert all
-	text operations into changes on the ESelectNamesModel.  This lets
-	us give the associated EEntry some (IMHO) nice semantics regarding
-	whitespace, etc.  Includes object activation, so destinations tied
-	to ECards are underlined and can be double-clicked to bring up a
-	contact editor.
-
-	* gui/component/select-names/e-select-names-model.h: 
-	* gui/component/select-names/e-select-names-model.c: I've heavily
-	modified this object to both hide all implementation details
-	(which the old version exposed a bit too much for my peculiar
-	tastes) and to act as an EDestination container.  The old code put
-	the text model operations here.  I've moved them all to
-	ESelectNamesTextModel --- so the text model actions (insert,
-	delete, etc.) are all done through the API rather than operating on
-	ESelectNamesModel internals.
-
-	* gui/component/select-names/e-select-names-completion.c: Added.  A
-	fairly complicated object derived from ECompletion that searches
-	our local addressbook in various and sundry ways.
-
-	* gui/component/select-names/e-select-names-completion.h: 
-
-	* backend/ebook/e-destination.h: 
-	* backend/ebook/e-destination.c: Added.  This object encapsulates
-	a place to sent an email to, which can either be just a address as
-	a string ("trow@ximian.com"), a fancier string ("Jon Trowbridge
-	<trow@ximian.com>"), or an ECard and a specific address within
-	that ECard.
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
-	gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Used
-	ESelectionModelSimple and the changes to EReflow and EReflowSorted
-	to get multiple selection in the minicard view.
-
-	* gui/widgets/test-reflow.c: Changed this to get it to compile
-	with the changes to EReflow.
-
-2001-02-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): Made
-	this pay attention to the return value of e_sexp_parse.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): Fixed a const
-	inconsistency here.
-
-2001-02-21  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_get_supported_fields):
-	new function.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): track
-	change to idl.
-	(pas_book_respond_get_supported_fields): new function.
-
-	* backend/pas/pas-book.h: add GetSupportedFields to the
-	PASOperation enum.  Also, add a stringlist field to the PASRequest
-	struct.  lastly, add a prototype for
-	pas_book_respond_get_supported_fields.
-	
-	* backend/pas/pas-backend.h: remove prototype for
-	pas_backend_get_supported_fields, and remove it from the vtable.
-
-	* backend/pas/pas-backend.c (pas_backend_get_supported_fields):
-	remove.
-	(pas_backend_class_init): no vtable entry for get_supported_fields
-	anymore.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_supported_fields): new function.
-	(pas_backend_ldap_process_client_requests): add case for
-	GetSupportedFields.
-	(pas_backend_ldap_class_init): get_supported_fields isn't in
-	vtable anymore.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): new function.
-	(pas_backend_file_process_client_requests): add case for
-	GetSupportedFields.
-	(pas_backend_file_class_init): get_supported_fields isn't in
-	vtable anymore.
-
-	* backend/idl/addressbook.idl: Book::getSupportedFields now
-	returns void and add BookListener::notifySupportedFields.
-
-	* backend/ebook/test-client.c (get_fields_cb): new function.
-	(auth_user_cb): track change to e_book_get_supported_fields.
-
-	* backend/ebook/e-book.c
-	(e_book_do_response_get_supported_fields): new function.
-	(e_book_check_listener_queue): add case
-	GetSupportedFieldsResponse.
-	(e_book_get_supported_fields): switch to async model.
-
-	* backend/ebook/e-book.h: switch e_book_get_supported_fields to an
-	async model.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): new
-	function.
-	(impl_BookListener_response_get_supported_fields): new function.
-	(e_book_listener_get_epv): fill in epv's "notifySupportedFields"
-
-	* backend/ebook/e-book-listener.h: add an async response for
-	GetSupportedFields and add a stringlist member to the
-	EBookListenerResponse struct.
-
-2001-02-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_activate):
-	Moved the register_factory() code to here, since it was the only
-	thing being called anyways.
-	(PasBookFactoryPrivate): Added a "registered" flag.
-	(pas_book_factory_activate): Set the registered flag.
-	(pas_book_factory_destroy): Deactivate the factory when we go away.
-
-2001-02-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_get_supported_fields): new function.
-
-	* backend/ebook/e-book.h: add e-book interface to getting
-	supported fields.
-
-	* backend/ebook/test-client.c (auth_user_cb): shoe-horn in some
-	spew about supported fields.
-
-2001-02-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: Remove PISOCK_LIBDIR
-
-2001-02-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): When creating the entry,
-	open up an ebook (corresponding to the local addressbook) and make
-	the entry use an EAddressCompletion.
-	(completion_handler): Added; this is the actual completion
-	handler, which manipulates the entry when the user selects
-	something from the drop-down.
-
-	* gui/component/select-names/e-select-names-model.c: Various hacks
-	by clahey to unbreak e_select_names_model_add_item,
-	e_select_names_model_replace_item (which I added) and
-	e_select_names_model_remove_item.
-	
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_obj_count,
-	e_select_names_text_model_get_nth_obj): Make chunks of text that
-	correspond to ECards in the ESelectNamesModel be embedded objects.
-	(e_select_names_text_model_activate_obj): On activation, pop up a
-	contact editor for the embedded object's card.
-	(e_select_names_text_model_model_changed): Fixed to work with
-	ETextModel API changes.
-	(e_select_names_text_model_set_text): Make const correct.
-	(e_select_names_text_model_insert): Make const correct.
-	(e_select_names_text_model_insert_length): Make const correct.
-
-	* backend/ebook/e-address-completion.h,
-	backend/ebook/e-address-completion.c: Added.  EAddressCompletion
-	is a derived class of ECompletion that does asynchronous address
-	lookups for completions.
-
-2001-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add sequence<string> typedef, and
-	add getSupportedFields method.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): new
-	function.
-
-	* backend/pas/pas-backend.c (pas_backend_class_init): init
-	get_supported_fields = NULL.
-	(pas_backend_get_supported_fields): new function.
-
-	* backend/pas/pas-backend.h: add prototype for
-	pas_backend_get_supported_fields.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_supported_fields): new function.
-	(pas_backend_file_class_init): fill in get_supported_fields.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_get_supported_fields): new function.
-	(pas_backend_ldap_class_init): fill in get_supported_fields.
-
-2001-02-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: Undefine E_STRING_PROP and
-	E_LIST_PROP here.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h (e_contact_editor_raise): Added
-	this function.
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h
-	(e_minicard_event): Added an editor field to the EMinicard object.
-	Made it so that if you double click on the same card twice, it
-	doesn't open a new window, but instead raises the old.
-
-2001-02-08  Iain Holmes  <iain@ximian.com>
-
-	* gui/component/addressbook-storage.c (addressbook_source_free):
-	Free the ldap.binddn.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Free the dir strings.
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Set the
-	header on the category dialog we pop up.
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in: Translations.
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in:
-	Marked strings for translation in this newly created file.
-	* gui/component/select-names/Makefile.am: Hook up the .oaf.in files in the
-	xml-i18n-tools framework.
-	* gui/component/Makefile.am: Same as above.
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Marked stuff for translation here
-	too.
-	
-2001-02-11  Jason Leach  <jasonleach@usa.net>
-
-	* gui/component/addressbook.c: Removed an ancient #include
-	<libgnorba/gnorba.h>
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	Really use xml-i18n-tools.
-	
-	* conduit/e-address-conduit-control-applet.desktop: removed.
-	* conduit/e-address-conduit-control-applet.desktop.in: added empty.
-	* conduit/Makefile.am: reflect above changes, merge translations.
-	
-	* contact-editor/e-contact-editor-strings.h,
-	contact-editor/fulladdr.glade.h, contact-editor/fullname-strings.h,
-	contact-editor/e-contact-editor-confirm-delete.glade.h,
-	gui/component/select-names/select-names.glade.h:
-	removed these files, xml-i18n-extract takes care of strings itself.
-	
-	* contact-editor/*.glade,
-	gui/component/select-names/select-names.glade,
-	gui/widgets/alphabet.glade, printing/e-contact-print.glade:
-	changed project options to not output_translatable_strings.
-	
-	* contact-editor/Makefile.am, gui/widgets/Makefile.am,
-	gui/component/select-names/Makefile.am, printing/Makefile.am:
-	do not include removed files in EXTRA_DIST.
-
-2001-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (check_for_evolve_person): flesh
-	out this check.  #ifdef the entire thing OPENLDAP2, as it only
-	works with the new schema stuff in openldap 2.x (both on server
-	and client, so upgrade your server.)
-	
-2001-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: Added N_("* Click here to add
-	a contact *").
-
-2001-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
-	set the DEBUG_LEVEL if we're OPENLDAP2.
-
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (email_compare): return TRUE if
-	equal, FALSE otherwise.
-	(business_compare): same.
-	(homephone_compare): same.
-	(email_ber): return NULL if there are no elements in our list.
-	(homephone_ber): same.
-	(business_ber): same.
-	(build_mods_from_ecards): add smarts to handle list elements
-	properly (like email, business_phone, home_phone.)  now we'll
-	properly send updates if any element in the list changes.
-
-2001-02-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/Makefile.am (INCLUDES): Added
-	-DEVOLUTION_DATADIR=\""$(datadir)"\".
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Changed the local and system
-	directories.
-
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_handler): doh,
-	didn't mean to commit this.
-	
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolveperson.schema: new file.  this will eventually
-	form the suggested additions to an existing openldap server that,
-	along with support for inetorgperson, will allow people to store
-	all evolution attributes in ldap.
-	
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_init): don't
-	need the = NULL's since we g_new0.
-	(check_for_evolve_person): new function.
-	(pas_backend_ldap_connect): check to see if the evolvePerson
-	objectclass is there.
-	(build_mods_from_ecards): right now, just silently skip the extra
-	attributes if we don't support evolvePerson.
-	(add_objectclass_mod): new function, add both inetOrgPerson and
-	(if it's available) evolvePerson as objectclasses.
-	(pas_backend_ldap_process_authenticate_user): also check to see if
-	evolvePerson is there, if we couldn't do it (due to auth reasons)
-	in the connect method.
-	(prop_info): change the telephoneNumber LDAP attribute to be used
-	for evolution's business phone numbers.  the primary phone number
-	will be a single valued attribute on evolvePerson.
-	(business_populate): new function.
-	(business_ber): new function.
-	(business_compare): new function.
-
-2001-02-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_handler): err,
-	allocate 2 char*s when i assign 2 char*s.
-
-2001-02-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (modify_card_handler): switch to
-	ldap_modify_ext_s if OPENLDAP2, as ldap_modify_s is deprecated.
-	(build_mods_from_ecards): don't include the mod if the value is ""
-	- this isn't valid on schema checking ldap servers.
-	(homephone_populate): new function.
-	(homephone_ber): new function.
-	(homephone_compare): new function.
-	(create_card_handler): add spew when adding cards so I can see
-	what's going on.
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-config.c (table_add_elem): Save the
-	help_text in the closure.
-
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): Added
-	gal-view-factory-minicard.c, gal-view-factory-minicard.h,
-	gal-view-minicard.c, and gal-view-minicard.h.
-
-	* gui/widgets/gal-view-factory-minicard.c,
-	gui/widgets/gal-view-factory-minicard.h,
-	gui/widgets/gal-view-minicard.c, and
-	gui/widgets/gal-view-minicard.h: New classes for minicard view
-	type.
-
-	* gui/widgets/e-addressbook-view.c: Deploy gal-view stuff
-	properly.
-	
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_get_vcard): Make the Note field
-	be quoted printable.
-
-2001-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): This should be a close button,
-	not a cancel button.
-
-2001-02-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): Call
-	e_select_names_set_default when appropriate.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added support for
-	double clicking sending the selected contacts to the default
-	section.  Added a set_default function.  Made multiple selection
-	work.
-
-2001-01-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_source_label): #ifdef INCLUDE_FILE_SOURCE.
-	(table_add_elem): add help_text parameter and set up focus_in
-	events to display the help in the dialog's html area.
-	(focus_help): new function, calls put_html on the help text.
-	(addressbook_ldap_auth_item_new): add help texts.
-	(addressbook_source_item_new): add help texts.
-	(addressbook_source_dialog): add help texts.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Remove the butt-ugly arrow icon and
-	replace it with a less invasive "->" icon.
-
-2001-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (build_mods_from_ecards): add
-	comment about the else block here.
-	(prop_info): add home_address, business_address, business_fax,
-	assistant, and isdn.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Made
-	this only add the initial VCard if it finds a file
-	"create-initial" in the directory it's creating the database in.
-
-	* gui/component/addressbook-component.c (factory_fn): Added a
-	create_folder function.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Fixed an unused variable
-	warning.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Setup the view collection
-	properly and handle the "display_view" signal.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-	
-	* gui/component/addressbook.c (update_pixmaps): Consider the
-	placeholder in the path for the "Print" item.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Set the icon for
-	"/Toolbar/Find" to "24_find_contact.xpm".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (set_pixmap): New.
-	(update_pixmaps): New function, setting the pixmaps for the items
-	of type "pixbuf", using `set_pixmap'.
-	(control_activate): Call it.
-
-2001-01-25  Not Zed  <NotZed@Ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: esexp api change fixes.
-
-	* backend/pas/pas-backend-file.c (entry_compare): Fix for e_sexp api changes.
-	(vcard_matches_search): esexp api fixes.
-	(pas_backend_file_search): Ouch, unref the e-sexp properly (not gtk object).
-
-2001-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (email_ber_func): make sure to
-	add the lengths here (include the \0?  anyone?).
-	(build_mods_from_ecards): if we're filling in mod->mod_bvalues,
-	set mod_op |= LDAP_MOD_BVALUES.
-
-2001-01-23  Jason Leach  <jasonleach@usa.net>
-	
-	(Fix #1225: advanced search cancel/close)
-	
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Set it up with Search and a
-	Cancel button, Search is still the default.
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): properly ref
-	the ecard. still need to kill some memory leaks.
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: remove vfs dependency
-
-2001-01-21  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (delete_record):  Remove
-	deleted records from the pilot map so we don't have dupes in the future
-	
-2001-01-19  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_right_click): 
-	* gui/widgets/e-minicard.c (e_minicard_event): Update for
-	e_popup_menu_run prototype change.
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	(Adding a boolean "entry_changed" BonoboPropertyBag arg)
-	
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Use a gtk_object_set_data to set the
-	property to TRUE here.
-
-	(entry_changed): New function, calls bonobo_control_set_property
-	if entry_changed hasn't been set to TRUE yet.
-	
-	(impl_SelectNames_get_entry_for_section): Connect "changed" on
-	each entry_widget to the new entry_changed() func.
-
-2001-01-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): always free 
-	the delivery elements and correct embarrassingly stupid memory error 
-	that was causing the addressbook conduit problems.
-
-	* backend/ebook/e-book-view-listener.c 
-	(e_book_view_listener_check_queue): ref/unref ourself when processing 
-	in case someone we signal unrefs us.
-
-	* conduit/address-conduit.c (sequence_complete): disconnect signals
-	when complete
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_activate): Made
-	it return a gboolean; it was completely ignoring the return value
-	from register_factory().
-
-2001-01-17  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/ebook/.cvsignore: add evolution-gnomecard-importer.
-
-	* backend/ebook/Makefile.am (oaf_DATA): don't require the pine
-	oainfo file until it is actually added to the repository.  We need
-	to keep the build working for nightlies to work.
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): s/Helix
-	Code/Ximian/ for the initial contact card.
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (print_local): prevent segfaults and 
-	buffer overflows
-	(print_remote): ditto
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: pass -module and -avoid-version to conduit
-	linker
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL as
-	the @copy_folder_fn arg to `evolution_shell_component_new'.
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: added i18n for etable.
-
-2001-01-11  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_create_card): get a book view from
-	somewhere so we can give status messages - choose the first one in
-	the list.
-	(pas_backend_ldap_process_modify_card): same.
-	(pas_backend_ldap_process_remove_card): same.
-	(prop_info): add more properties, like home_phone, mobile, pager,
-	uri, org_unit, office, title, and manager.
-
-2001-01-09  Miguel de Icaza  <miguel@gnu.org>
-
-	* gui/widgets/Makefile.am (minicard_widget_test_LDADD): Put GNOME
-	libraries at the end to make the thing compile.
-
-	* printing/Makefile.am: Order LDADD flags correctly so it compiles.
-
-2001-01-09  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	connect with the EAddressbookView's status_message signal.
-	(set_status_message): set the status message on the ShellView
-	Interface associated with our control.
-	(retrieve_shell_view_interface_from_control): new function.  get
-	the shell view inteface associated with a control.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): register status_message signal.
-	(status_message): new function, emit our status_message signal.
-	(change_view_type): connect with the view->object's
-	"status_message" signal.
-
-	* gui/widgets/e-addressbook-view.h (struct
-	_EAddressbookViewClass): add status_message signal.
-
-2001-01-09  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): register our status_message
-	signal.
-	(status_message): new function, emit our status_message signal.
-	(e_minicard_view_widget_realize): connect to the EMinicardView's
-	status_message signal.
-
-	* gui/widgets/e-minicard-view-widget.h: add status_message signal.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_class_init):
-	register our status_message signal.
-	(e_minicard_view_init): init status_message_id.
-	(status_message): new function, emit our status_message signal.
-	(book_view_loaded): connect to the EBookView's status_message
-	signal.
-	(disconnect_signals): disconnect status_message_id.
-
-	* gui/widgets/e-minicard-view.h: add status_mesage_id, and
-	status_message signal.
-
-	* gui/widgets/e-addressbook-model.c (status_message): new
-	function, emit our status_message.
-	(e_addressbook_model_class_init): register our "status_message"
-	signal.
-	(book_view_loaded): connect to the EBookView's status_message
-	signal, so we can chain it to our parent.
-	(e_addressbook_model_init): init status_message_id.
-	(remove_book_view): disconnect status_message_id.
-
-	* gui/widgets/e-addressbook-model.h: add status_message_id, and
-	status_message signal.
-
-	* backend/pas/pas-backend-ldap.c change the objectclass we create
-	objects with to "inetOrgPerson" as it encompasses the fields we
-	use.
-	(create_dn_from_ecard): remove the mail/org handling from
-	here.  we just prepend cn=$cn onto the base dn.
-	(create_card_handler): remove the NULL that build_mods_from_ecards
-	adds at the end, and insert our objectClass.
-	(modify_card_handler): call search_for_dn to get the ECardSimple
-	of the old card, since it might (and does in the current code)
-	doing a brute force search.
-	(search_for_dn): new function, to search for an entry by its dn.
-	right now we brute force (objectclass=*) under the base dn and
-	compare dn's.  going to add a first pass that explodes the dn and
-	searches that way, using (objectclass=*) as a last resort.  also,
-	here's where we'd put the extensibleMatch code if we want to go
-	that route.
-
-	* backend/ebook/e-card.c (e_card_set_arg): if we're setting the
-	full name regenerate ecard->name.
-
-2001-01-04  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_authentication_response): new function.
-	(impl_BookListener_respond_authentication_result): new function.
-	(e_book_listener_get_epv): fill in
-	epv->notifyAuthenticationResult.
-
-	* backend/ebook/e-book-listener.h: add AuthenticationResponse to
-	EBookListenerOperation.
-
-	* backend/ebook/e-book.c (e_book_authenticate_user): new function.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_authenticate_user.
-
-	* backend/idl/addressbook.idl (GNOME:Evolution:Addressbook:Book):
-	add authenticateUser method.
-	(GNOME:Evolution:Addressbook:BookListener): add
-	AuthenticationFailed and AuthenticationRequired to CallStatus.
-	also add notifyAuthenticationResult method.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_authenticate_user): dummy
-	authenticate_user function that always succeeds.
-	(pas_backend_file_process_client_requests): respond to the
-	AuthenticateUser request.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_build_query):
-	gtk_object_unref(sexp) => s_exp_unref(sexp).
-	(pas_backend_ldap_process_authenticate_user): fill in to use
-	ldap_simple_bind_s.
-	(pas_backend_ldap_process_client_requests): respond to the
-	AuthenticateUser request.
-
-	* backend/pas/pas-book.c (pas_book_queue_authenticate_user): new
-	function.
-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): new
-	function.
-	(pas_book_respond_authenticate_user): new function.
-	(pas_book_get_epv): fill in epv->authenticateUser.
-
-	* backend/pas/pas-book.h: add AuthenticateUser operation type, and
-	add user/passwd to the PASRequest struct.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_get_source_by_uri): new function.  should use
-	a hashtable, perhaps, but the lists will generally be small
-	anyway.
-
-	* gui/component/addressbook-storage.h: add prototype for
-	addressbook_storage_get_source_by_uri.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fill in the binddn if the
-	auth page is shown.
-
-	* gui/component/addressbook.c (book_open_cb): shoe-horn
-	authentication in here.  if the source was configured to use
-	authentication, authenticate the user after opening the ebook.
-	also, be paranoid and clear out the password after authenticating.
-	(book_auth_cb): callback for auth.  set the "book" arg on the
-	view->view here.
-	(passwd_cb): set the view's passwd that'll be used in
-	book_open_cb.
-	(addressbook_view_free): g_free view->passwd.
-
-2001-01-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-component.c,
-	gui/component/addressbook-component.h
-	(addressbook_component_get_shell_client): Added this function.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added code for the
-	ability to switch between different folders.  This doesn't work
-	yet.
-
-	* gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: Added an option
-	menu to this dialog.
-
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/Makefile.am: Fix hard coded library names that were 
-	accidentally committed (i'm looking at you miggie)
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Reflect
-	renaming.
-
-	* contact-editor/e-contact-editor-categories.[hc]: These are
-	living in gal now
-	
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_free): 
-	Need to e_sexp_unref the the sexp, not gtk_object_unref it.
-
-2001-01-03  Michael Meeks  <michael@helixcode.com>
-
-	* gui/widgets/e-addressbook-model.c (get_view): check
-	capabilities is valid before doing a strstr.
-
-2001-01-03  Michael Meeks  <michael@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search):
-	g_strdup things we g_free.
-
-2001-01-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (delete_cb): Make sure this
-	won't crash if the given contact is removed from the database
-	while this function is being called.
-
-	* gui/widgets/e-minicard.c: Made sure this won't crash if the
-	given contact is removed from the database while the right click
-	menu is being displayed.
-
-2000-12-30  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook-config.c (edit_source_clicked): copy
-	the dialog's source, destroy the dialog after we're done, and make
-	sure to update both columns in the clist.
-	(add_source_clicked): copy the dialog's source, and destroy the
-	dialog when we're done.
-	(addressbook_source_dialog_destroy): free up all the dialog's
-	memory.
-
-	* gui/component/addressbook.c (set_prop): allow file: uri's that
-	point to files, not just dirs that contain addressbook.db.  The
-	rule is the addressbook file has to end in .db.
-
-	* gui/component/addressbook-storage.c (file_source_foreach):
-	contactserver => contactfile.  cut and paste error.
-	(addressbook_storage_init_source_uri): use file://%s to build the
-	uri.
-
-	* gui/component/e-ldap-server-dialog.[ch]: forgot to remove these
-	in my last commit.
-
-2000-12-29  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (config_cb): new function, calling
-	our new config ui code.
-	(control_activate): no longer load evolution-addressbook-ldap.xml,
-	as it's not there.
-
-	* gui/component/addressbook-component.c (owner_set_cb):
-	setup_ldap_storage => addressbook_storage_setup.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES):
-	remove e-ldap-storage.[ch] and add addressbook-storage.[ch].
-	(glade_DATA): remove ldap-server-dialog.glade and add
-	addressbook-config.glade.
-	(EXTRA_DIST): same.
-
-	* gui/component/addressbook-config.[ch]: add another dialog to
-	give a list of our sources and offer the Add/Delete/Edit
-	interface.  This plugs into the previous dialog work (the source
-	editor.)
-
-	* gui/component/addressbook-storage.[ch]: new files, containing
-	the remains of e-ldap-storage.[ch] and adding the new
-	AddressbookSource type and it's subordinates.  Also, the xml
-	format has changed slightly and the file name is no longer
-	~/evolution/ldap-servers.xml - it's
-	~/evolution/addressbook-sources.xml.
-
-	* gui/component/addressbook-config.glade: new file, new config
-	interface.
-
-	* gui/component/ldap-server-dialog.glade: removed.
-
-	* gui/component/e-ldap-storage.[ch]: removed.
-
-2000-12-28  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): add
-	addressbook-config.[ch].
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h: new files, containing at the
-	moment a beautiful "new/edit source dialog" inspired by the
-	mail-config-gui code.  It'll be ready for prime time after rev'ing
-	the .xml file the addressbook uses to store it's "other sources"
-	to include files, and the addition of the ldap auth stuff.
-
-2000-12-25  Miguel de Icaza  <miguel@helixcode.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_realize): Set draw
-	background to FALSE.
-	
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct): ditto.
-	(e_minicard_label_construct): ditto
-
-2000-12-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fullname-strings.h,
-	contact-editor/fullname.glade: Added Ms. and Miss to the prefix
-	drop down box.  Patch submitted by Martin Hicks <mort@bork.org>.
-
-2000-12-21  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (cursor_cb): Ref the cards that get put
-	in the change list
-	(next_changed_item): util function to get the real next changed item
-	(compute_status): really compute the status of the record
-	(local_record_from_uid): Set the id of the temporary card
-	(check_for_slow_setting): Make this check a little saner
-	(card_added): Only record the CardObjectChange if the card is not
-	archived
-	(card_changed): ditto
-	(card_removed): ditto
-	(set_status_cleared): actually clear the status
-	(for_each_modified): Clean out cruft and use next_changed_item
-	(add_record): Set the new id properly in our local card copy
-	(replace_record): handle the case where the record has been deleted
-	and we need to call add.  need to update the changed_hash entry
-	(delete_record): Don't panic if the card is not found, its already
-	been deleted.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	The change_context no longer has a del_cards member
-	(pas_backend_file_book_view_free): ditto
-	(pas_backend_file_process_get_changes): ditto
-	(pas_backend_file_changes_foreach_key): just record the id
-	(pas_backend_file_changes): notify_remove needs an id not a vcard
-
-2000-12-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (match): Use my own wrapper
-	functions instead of trying to *directly* access the the data 
-	structures my self
-	(post_sync): Put in hack to prevent syncing the same records twice
-	(local_record_from_uid): set the card id when creating a blank one
-	(add_record): Set the id of the card we have and don't go to the
-	server to get the latest version
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): Convert
-	pilot strings to utf for the e-cards.
-	
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): Convert ecard
-	strings to pilot encodings
-
-2000-12-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c (delete): Made it so that if
-	you select multiple contacts, the right click menu to delete
-	deletes them all.
-
-2000-12-18  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): always
-	use LDAP_NAME_ERROR (in the openldap1 case it's #defined to
-	NAME_ERROR).
-	(build_card_from_entry): ldap_get_values can return NULL.  also,
-	openldap2 keeps us from getting at ldap->ld_errno, so we can't
-	tell if there was a decoding error like we used to.  the double
-	free problem where ldap would free the ber if there was a decoding
-	problem might be fixed now..  further investigation is needed.
-	for now we leak in openldap2.
-	(ldap_search_handler): the ldap structure is opaque, so use
-	ldap_search_ext to give the extra information (the max responses,
-	timeout, etc.) in the openldap2 case.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): Test
-	for the existance of LDAP_NAME_ERROR and if it exists as a macro,
-	use it instead of NAME_ERROR.
-
-2000-12-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oafinfo: update cut
-	and paste description error.
-
-2000-12-13  Dan Winship  <danw@helixcode.com>
-
-	* gui/widgets/e-minicard-control.c (stream_read): NULL-terminate
-	the returned vcard so we don't sometimes end up with trailing
-	junk that makes libversit unhappy.
-
-2000-12-13  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c 
-	(e_select_names_add_section): Make the -> into a GNOME stock image.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Connect to the "cursor_change" signal on
-	the ETable here instead of the ETableScrolled.
-	(remove_address): Added the col and event parameters to this
-	callback to match the added parameters to the double click signal.
-	(e_select_names_add_section): Connect to the "double_click" signal
-	on the ETable here instead of the ETableScrolled.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): When setting the "name"
-	argument, copy the incoming name.  This fixes a crash.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Made editing the name using
-	the full name button set the file as entry properly.  Made it
-	so that the address parse that the user chooses after
-	clicking on the Full Address... button gets saved.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (full_name_clicked): Made it
-	so that the editor->name is set after the entry is changed.  This
-	means that the reparse that the person chose is saved.
-
-2000-12-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Pass NULL
-	as the @toplevel_node_handler_id argument to
-	`evolution_storage_new'.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed some formatting.
-
-	* contact-editor/e-contact-editor-categories.h: Removed an
-	unneeded #include.
-
-	* gui/widgets/e-addressbook-view.c: Connect to the signals on the
-	ETable instead of the ETableScrolled.
-
-2000-12-07  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_from_uid): Pass "" rather
-	than NULL to e_card_new.
-	(local_record_from_ecard): Make sure ecard->name is valid
-	(check_for_slow_setting): Remove hard coded test value
-	(card_added): g_strdup the resul of e_card_get_id
-	(card_changed): ditto
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c: Got rid of code referencing
-	the ETableScrolled proxy functions.
-
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Moved the gal view menu stuff from
-	here to EAddressbookView.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: New function to set up the menus
-	for the EAddressbookView.
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/Makefile.am: Another conduit build fix
-
-2000-12-05  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes_foreach_key): 
-	Create an empty vcard with the appropriate id for deleted cards
-
-	* conduit/address-conduit.c (ecard_from_remote_record): Ensure the
-	address fields are added sensibly
-
-2000-12-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Updated the
-	call to `evolution_storage_new()': pass NULL for
-	@toplevel_node_uri.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_to_pilot_record): Return
-	a struct rather than a pointer to a struct
-	(view_cb): kill warning
-	(compare): local_record_to_pilot_record now returns a struct
-	(prepare): ditto
-	(free_prepare): remove as per gnome-pilot changes
-	(conduit_get_gpilot_conduit): don't listen for free_prepare signal
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Remove "complete" field
-
-	* conduit/address-conduit.c (print_local): Make it print useful debug
-	info
-	(print_remote): ditto
-	(local_record_from_ecard): Make sure phone numbers get out to the pilot
-	(ecard_from_remote_record): Set phone strings to "" if they are null
-	(sequence_complete): unref the book view
-	(view_cb): ref the book view
-	(free_prepare): do nothing
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_free): 
-	Destroy the card lists with the rest of the view.
-	(pas_backend_file_changes): Don't destroy the card lists here
-	(pas_backend_file_book_view_free): Free the card/id lists in the
-	change context here, the correct place.
-	(pas_backend_file_changes): instead of here...
-
-2000-11-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Set view.change_context to NULL
-	in pas_backend_file_process_get_book_view.  Changed
-	pas_backend_file_book_view_copy a bit.
-
-	* backend/pas/pas-backend-ldap.c: Got rid of a warning.
-
-2000-11-18  Matt Bissiri  <matt@bissiri.org>
-
-	* gui/component/Makefile.am:
-	Add widgets/menus/libmenus.la to evolution_addressbook_LDADD
-	so that it will link properly now that gal-view-menus.[ch]
-	was moved from gal into evolution.
-
-2000-11-15  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	Initialize destination struct with '0's.
-
-2000-11-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Changed the mime type from "text/vcard"
-	to "text/x-vcard".
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* backend/ebook/.cvsignore: Add idl-generated files.
-	* backend/ebook/e-book.c: (e_book_do_response_get_changes):
-	* backend/ebook/e-card.c: (e_card_send):
-	s/Evolution_/GNOME_Evolution_/g;
-
-2000-11-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Link in composer bonobo code.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to
-	send mail to an ECard or send an ECard as a VCard attachment.
-
-	* contact-editor/e-contact-editor.c: Add verbs to send the contact
-	as a VCard or send mail to the contact.
-
-	* gui/search/e-addressbook-search-dialog.c: Removed some unused
-	variables.
-
-	* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c:
-	Added menu items to send the contact as a VCard or send mail to
-	the contact.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* gui/component/addressbook.oafinfo:
-	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: Fixed a warning.
-
-	* gui/component/addressbook.c: Put in gal view menus for testing
-	purposes.
-
-	* printing/e-contact-print-envelope.c: Fixed up envelope printing
-	a bit.  Added code for printing return addresses.
-
-2000-11-09  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Add changed_hash, change list and complete bool
-
-	* conduit/address-conduit.c (local_record_from_ecard): Add empty field checks
-	(card_added): callback for book view
-	(card_changed): ditto
-	(card_removed): ditto
-	(sequence_complete): ditto
-	(view_cb): callback for the get changes call
-	(pre_sync): force synchronous loading of book view
-	(for_each): we already have the card so create the local record directly
-	(for_each_modified): Uncomment and fix
-	(delete_record): ditto
-
-	* conduit/Makefile.am: link against gal for ebook - needs fixing
-
-	* backend/ebook/e-book.c (e_book_do_response_get_changes): Properly respond
-	to a get_changes call
-	(e_book_check_listener_queue): define the get changes response operation
-
-	* backend/ebook/e-book-listener.c (e_book_listener_queue_get_changes_response):
-	Queue up a get changes response
-	(impl_BookListener_respond_get_changes): Implement the get_changes method
-	(e_book_listener_get_epv): add get_changes implementation to epv
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): Only
-	copy the search_context and change_context elements if they actually exist
-	(pas_backend_file_changes): Hard code a path for now, only notify if
-	there is something to notify about
-
-2000-11-07  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-book.h: Update PASRequest structure
-
-	* backend/pas/pas-book.c (impl_Evolution_Book_get_changes): update param name
-	(pas_book_queue_get_changes): Use PASRequest change_id slot
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	Properly copy change_id and change_context
-	(pas_backend_file_book_view_free): Free change_id/change_context
-	(pas_backend_file_changes_foreach_key): Callback to figure out the
-	deleted cards
-	(pas_backend_file_changes): Use new e-dbhash stuff to implement.
-	Write out updated hash
-
-	* backend/idl/addressbook.idl: Rename get_changes param
-
-2000-11-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Switched from EAddressbookSearch to
-	ESearchBar.
-
-	* gui/widgets/Makefile.am, gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: Removed EAddressbookSearch.
-	This has been moved to filter/ and renamed ESearchBar.
-
-	* printing/e-contact-print-envelope.c: Forgot to set the font.
-	This works for me now.
-
-2000-11-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_get_entry_for_section): Duplicate the object
-	reference before returning.
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Add
-	menus items to the envelope printing stuff.
-
-	* gui/component/addressbook.c: Hook up the search menu.
-
-	* gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: Add the search menu.
-
-	* printing/Makefile.am: Add e-contact-print-envelope.c and
-	e-contact-print-envelope.h.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h: Added envelope printing.
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Clean the idl-generated
-	files properly.
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/.cvsignore, gui/minicard/.cvsignore: Removed these
-	unnecessary .cvsignores.
-
-	* gui/component/addressbook.c: Switch to using EAddressbookSearch
-	instead of custom quick search widget.
-
-	* gui/component/select-names/e-select-names.c: Made this do a
-	slightly better job of rendering names.
-
-	* gui/widgets/Makefile.am: Added e-addressbook-search.c and
-	e-addressbook-search.h.
-
-	* gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: New class that puts up an
-	entry and a combo box.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): 
-	(e_ldap_storage_add_server): Add "highlighted" flag to
-	evolution_storage_new_folder
-
-2000-10-31  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (cursor_cb): Let the warning make sense
-	(compute_pid): remove
-	(local_record_from_ecard): Create local record from ecard - not finished
-	(local_record_from_uid): Obtain local_record from uid with the proper
-	e-book way
-	(set_status_cleared): Add empty callback
-	(add_archive_record): kill
-	(delete_archive_record): kill
-	(archive_record): Add empty callback
-	(conduit_get_gpilot_conduit): Update signal connects
-
-	* backend/pas/pas-backend-file.c (vcard_change_type): Function to determine
-	the type of change - not finished
-	(pas_backend_file_search_changes): Create a view and callback based on 
-	how the cards have changed
-	(pas_backend_file_process_get_changes): Implement the get changes operation
-	for files
-	(pas_backend_file_process_client_requests): Add GetChanges method for
-	processing
-
-	* backend/pas/pas-book.c (pas_book_queue_get_changes): Add changes to
-	the list
-	(impl_Evolution_Book_get_changes): implement object method
-	(pas_book_get_epv): Add get changes to epv
-	(pas_book_respond_get_changes): Respond to the get changes operation
-
-	* backend/pas/pas-book.h: Add GetChanges PASOperation
-
-	* backend/idl/addressbook.idl: add get_changes and respond_get_changes
-	methods
-
-	* backend/ebook/e-book.c (e_book_get_changes): Client function
-	to a view of the changed objects
-
-	* backend/ebook/e-book.h: New prototype
-
-2000-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* backend/e-book/e-card.c: Fixed marking of strings
-	for translation. Use "_(" instead of "_ (".
-	* gui/component/addressbook-factory.c: Add missing
-	calls to bindtextdomain() and textdomain noticed by
-	Dan Winship.
-	* gui/component/addressbook.c: Marked string for translation.
-	
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/Makefile.am, gui/search/Makefile.am,
-	printing/Makefile.am: Fixed these to include EXTRA_GNOME_CFLAGS.
-
-	* gui/component/select-names/e-select-names-manager.c: Turned off
-	newlines in header fields.
-
-2000-10-26  Michael Meeks  <michael@helixcode.com>
-
-	* printing/e-contact-print.c (e_contact_print_letter_tab),
-	(complete_sequence, e_contact_do_print_phone_list, lowify):
-	unsigned charness.
-
-2000-10-25  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_op_process_current): only
-	call the handler if the if we're connected, and if we fail to
-	connect finish the op and post a message.
-	(pas_backend_ldap_connect): add debug spew if DEBUG is defined.
-	(modify_card_handler): LDAP_RES_SEARCH_ENTRY => LDAP_SUCCESS.
-	(modify_card_handler): only perform the ldap_modify_s if we have a
-	list of modifications.
-	(get_cursor_handler): use ldap_error_to_response here.
-	(pas_backend_ldap_load_uri): use LDAP_PORT instead of the constant
-	389.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am (INCLUDES): 
-	* gui/component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-	* backend/pas/Makefile.am (INCLUDES): 
-	* backend/ebook/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Use new libeconduit calls and
-	abstraction
-
-	* conduit/address-conduit.c: ditto
-	
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (pre_sync): Use e_pilot_map_read
-	(post_sync): Use e_pilot_map_write
-
-	* conduit/Makefile.am: Link libeconduit and not libical
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (tb_save_and_close_cb): 
-
-	* gui/component/addressbook.c (toggle_view_as_cb): 
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: New structure of file - similar
-	to calendar/todo conduits
-
-	* conduit/address-conduit.c: ditto
-
-	* conduit/address-conduit-config.h: Config stuff for conduit
-
-	* conduit/.cvsignore: Update
-
-	* conduit/Makefile.am: Build fixes
-
-	* conduit/address-conduit-control-applet.desktop: Renamed
-	to e-address-conduit-control-applet.desktop
-
-	* conduit/address.conduit.in: Renamed to e-address.conduit.in
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Remove Family name
-	column since it's a bit weird.  This also fixes the initial state
-	since all of the column choices were off by one.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* printing/Makefile.am (glade_DATA): Remove
-	`e-contact-print.glade.h'.
-	(EXTRA_DIST): Move here.
-
-	* gui/component/Makefile.am (glade_DATA): Remove
-	`ldap-server-dialog.glade.h'.
-	(EXTRA_DIST): Move here.
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Change how the extension field acts when
-	converting delivery addresses to labels.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added the
-	function e_card_delivery_address_to_label.
-
-	* contact-editor/e-contact-editor-address.c: Fixed a potential
-	crash.
-
-	* contact-editor/e-contact-editor.c: Made this save the changed
-	data to the string version of the address.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (change_view_type): update to new
-	UI handler.
-	(update_view_type): split from (change_view_type).
-	(control_activate): add an update_view_type.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Change NAME_OR_ORG to return the
-	email address if both name and organization are taken.
-
-	* gui/component/select-names/e-select-names.c: Fixed up the spec
-	strings in this class.  Removed the "cursor_mode" argument to
-	ETable since it's part of the spec now.
-
-2000-10-17  Iain Holmes  <iain@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Change the initial dialog 
-	visibility to FALSE
-	so the contact editor doesn't flash when it appears.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c 
-	(e_select_names_manager_activate_dialog): Only allow one dialog
-	per manager.
-
-2000-10-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade: Fixed a typo.  Made this look a
-	bit better.
-
-2000-10-15  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am:
-	* gui/component/Makefile.am: Remove CPPFLAGS since they just
-	duplicate flags that were already in INCLUDES.
-
-	* printing/Makefile.am (ecpsdir): 
-	* gui/widgets/Makefile.am:
-	* contact-editor/Makefile.am: Move -D flags from CPPFLAGS to
-	INCLUDES so they don't override any CPPFLAGS set at configure
-	time.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): if we are in
-	LDAP mode then merge in the extra few items, otherwise just merge
-	the standard thing; saves duplication.
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Added
-	"evolution:shell-component-icon" property.
-
-2000-10-14  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c 
-	(e_select_names_manager_activate_dialog): Only allow one dialog
-	per id.
-	(e_select_names_manager_destroy): Destroy the hashtable.
-	(e_select_names_manager_init): Init the hashtable.
-
-2000-10-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	Rearranged these fields a bit more.
-
-2000-10-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Changed these for boolean
-	ascending attribute instead of int ascending attribute.  Fixed
-	e-select-names to not use a column past the end of its array.
-
-	* contact-editor/e-contact-editor-address.c,
-	contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	Rearranged the address editor dialog.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed the column
-	elements, the no-headers attribute and added a cursor-mode=line
-	attribute.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Fixed the column elements here.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Updated these to the new style
-	ETables.
-
-2000-10-06  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget): Removed
-	ondemand callback nonsense from rule_context_load().
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-	(e_contact_editor_init): upd.
-
-	* gui/component/addressbook.c (control_activate_cb): upd.
-	(control_deactivate): kill.
-	(control_activate): upd.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): update.
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-
-Fri Sep 29 07:33:54 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made it so
- 	that minicard doesn't write out changes to the backend unless
- 	something's actually changed.
-
-Tue Sep 26 16:28:47 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Make sure that card->name and
- 	card->full_name are always valid.
-
-	* contact-editor/e-contact-editor.c: Removed some unused
- 	variables.
-
-2000-09-22  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* contact-editor/e-contact-editor-fullname.c (extract_info): If
-	(editor->name == NULL), store ptr to newly allocated ECardName in
- 	editor->name, not just in a stack variable.  This fixes a crash
- 	which happened when you click "New", then click "Full Name...",
- 	then enter name, then click "OK".
-
-	* backend/ebook/e-card.c (e_card_name_to_string): Add
- 	g_return_val_if_fail.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/widgets/Makefile.am:
-	* gui/component/Makefile.am:
-	* contact-editor/Makefile.am:
-	* printing/Makefile.am: Look for ename in /e-util/ename instead of
-	/addressbook/ename
-	
-	* backend/ebook/e-card.c: Updated to include e-util/ename/*.h
-
-	* ename: Moved to /e-util so it could be shared
-
-	* Makefile.am (SUBDIRS): took out ename
-
-2000-09-25  Nat Friedman  <nat@helixcode.com>
-
-	* ename/e-name-western-tables.h: Added a ton of new prefixes and
-	suffixes.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): update.
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-
-2000-09-22  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: lots of changes.  flesh out the
- 	remove/modify/create functions.  add another flag for the property
- 	table, PROP_DN, which makes it easy for us to determine when we
- 	need to create a new DN for a record when we're modifying.  also
- 	add a ber_func to the table for PROP_TYPE_LIST fields, which fills
- 	in the list of bvalues that we send to the ldap server.  The
- 	add/modify/delete stuff hasn't been tested yet, and it hopelessly
- 	complex (yay ldap).
-	(ldap_search_handler): act synchronous when ldap_search responds
- 	with -1.
-	(view_destroy): use pas_book_view_notify_status_message.
-	(ldap_op_process_current): same
-	(ldap_op_process): same
-	(poll_ldap): same
-	(ldap_search_handler): same
-
-2000-09-22  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card-simple.h: add
- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME to the enum.
-
-	* backend/ebook/e-card-simple.c (field_data): add
- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME.
-	(e_card_simple_get): add getter for FAMILY_NAME.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Made addresses be quoted printable again
- 	so that they will encode properly if they have carriage returns in
- 	them.  This is possible now because of a fix in libversit.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c,
- 	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,
- 	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,
- 	backend/pas/pas-book-view.c, backend/pas/pas-book-view.h: Added a
- 	function to set the status message associated with a given view.
-  	This is not yet implemented in the gui.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book.c, backend/ebook/e-book.h,
-	backend/idl/addressbook.idl, backend/pas/pas-backend-file.c,
-	backend/pas/pas-backend-ldap.c, backend/pas-backend.c,
-	backend/pas/pas-backend.h, backend/pas/pas-book.c,
-	backend/pas/pas-book.h: Added a function to query static
-	capabilities (capabilities that can be reported immediately) and
-	implemented them in the 2 servers.
-
-	* gui/component/addressbook.c: Added a View All button and a Stop
-	button.  Sorted out the new directory server stuff a bit.
-
-	* gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h: Cleaned up a bit.  Added a stop
-	function.  Check for capabilities before deciding whether to load
-	all cards when initially viewed.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: Added stop and view all
-	functions.
-
-	* gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Added a stop function.  Check for capabilities before deciding
-	whether to load all cards when initially viewed.
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): remove _UIHandler
-
-2000-09-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Added a missing include
-	of ctype.h.
-
-	* backend/pas/pas-backend-file.c: Fixed a problem where using a
-	GList was causing us to not be reentrant.  We now use an EList
-	here and so now this is reentrant.  This should fix the "wombat
-	crashes every time you run evolution" bug.
-
-	* contact-editor/e-contact-editor.c: Fixed a type mismatch.
-
-2000-09-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Make this work when a
-	field is spread across multiple lines.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added a
-	wants_html field to cards.  Uses "x-mozilla-html".
-
-	* contact-editor/Makefile.am: Added definition of
-	EVOLUTION_DATADIR.
-
-	* contact-editor/contact-editor.glade: Make Wants HTML check
-	button visible.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Make Wants HTML check button
-	active.  Fix UI stuff to use XML.  Set parent window of
-	confirm_delete dialog.
-
-	* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Set
-	the parent window of the confirm_delete dialog.
-	
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c: Fixed display of the minicards
-	when the addressbook was first loading.  (It was overwriting a
-	string with NULL during init.)
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* gui/search/Makefile.am (ruledir): Use $(datadir), not
-	$(prefix)/share
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am, contact-editor/Makefile.am,
-	ename/Makefile.am, gui/component/Makefile.am,
-	gui/widgets/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* backend/ebook/e-card.c, backend/pas/pas-backend-file.c,
-	contact-editor/e-contact-editor-address.c,
-	contact-editor/e-contact-editor-categories.c,
-	contact-editor/e-contact-editor-categories.h,
-	contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-save-as.c, ename/e-address-western.c,
-	ename/test-ename-western-gtk.c,
-	gui/component/addressbook-factory.c, gui/component/addressbook.c,
-	gui/component/e-cardlist-model.h, gui/component/e-ldap-storage.c,
-	gui/component/select-names/e-select-names-bonobo.c,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.h,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/search/e-addressbook-search-dialog.c,
-	gui/widgets/e-addressbook-model.h,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-label.c,
-	gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
-	gui/widgets/e-minicard-widget.h, gui/widgets/e-minicard.c,
-	gui/widgets/test-minicard-label.c, gui/widgets/test-reflow.c,
-	printing/e-contact-print.c: Fixed the #include lines to deal
-	properly with gal.
-	
-2000-09-15  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.h,
-	contact-editor/e-contact-save-as.h,
-	gui/widgets/e-addressbook-model.h,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.h, gui/widgets/e-minicard.c,
-	gui/widgets/e-minicard.h: Fixed the paths of some .h #includes.
-
-	* gui/component/addressbook.c: Removed all of the code to actually
-	create and display the correct view of the addressbook and moved
-	it to the new class gui/widgets/e-addressbook-view.c.
-
-	* gui/widgets/Makefile.am: Added everything necessary for
-	e-addressbook-view.c and e-addressbook-view.h.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: New class to deal with actual
-	display of addresses and switching between card view and table
-	view.
-
-	* gui/widgets/e-minicard-view-widget.c: Made this deal more
-	gracefully with having the book set to NULL.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c: fix broken include.
-
-	* gui/component/Makefile.am (INCLUDES): define datadir.
-	(evolution_addressbook_SOURCES): remove e-addressbook-model.[ch]
-
-	* gui/component/addressbook.c (control_activate): use datadir.
-
-2000-09-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/widgets/Makefile.am (gladedir): Define.
-	(glade_DATA): Install `alphabet.glade'.
-	(EXTRA_DIST): Define.
-
-	* gui/component/Makefile.am (glade_DATA): Remove `alphabet.glade'.
-	(EXTRA_DIST): Remove `alphabet.glade.h'.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): Add
-	`e-addressbook-model.c' and `e-addressbook-model.h'.  I hope this
-	is what Chris meant to do.
-
-	* gui/component/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/addressbook/gui/widgets'.
-	(evolution_addressbook_SOURCES): Remove `e-addressbook-model.c'
-	and `e-addressbook-model.h'.
-
-	* gui/component/select-names/e-select-names.c: #include
-	"e-addressbook-model.h" from "addressbook/gui/widgets" instead of
-	"addressbook/gui/component", as it has been moved there.
-
-2000-09-15  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: split all the ldap operations
-	into 2 halves, a handler, and destructor, and create a structure
-	containing two function pointers and any data they need.  this
-	allows us queue up pending operations (since the LDAP*'s are no
-	longer view specific.  there's one per backend.)  also, add
-	support for restarting async operations if the SERVER DOWN error
-	isn't communicated until sometime after the handler is called (as
-	is the case with the async search stuff.)
-
-2000-09-14  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook-factory.c (main): Call unicode_init
-	for e-font stuff.
-
-2000-09-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am, gui/widgets/Makefile.am: Added
-	$(GNOME_PRINT_LIBS) to all of the test files in these directories.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): fix path.
-
-	* gui/component/addressbook.c: update include.
-
-	* gui/component/addressbook-factory.c: update include.
-
-	* gui/widgets/e-minicard-view.h: update include.
-
-	* gui/search/e-addressbook-search-dialog.c: update include path.
-
-2000-09-13  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_init): hack.
-	(create_toolbar): ditto.
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c: Radicaly update UI handler code.
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/*, gui/minicard/*: Moved gui/minicard to
-	gui/widgets, except for e-reflow.c, e-reflow.h, e-reflow-sorted.c,
-	and e-reflow-sorted.h.
-
-	* gui/widgets/Makefile.am: Added e-reflow to the INCLUDES list and
-	libereflow.a to a bunch of LDADD lines.
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	libereflow.a here.
-
-	* gui/Makefile.am (SUBDIRS): Replaced minicard with widgets.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Add space after `-I'
-	when invoking `orbit-idl'.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/Makefile.am (EXTRA_DIST): Remove `ui.xml'.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed a crash error.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/e-address-western.c: Fixed some warnings.
-
-2000-09-11  Jesse Pavel <jpavel@helixcode.com>
-
-	* ename/e-address-western.c: fixed certain address parsing
-	problems.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade: Made this a bit better balanced.
-
-	* gui/component/addressbook.c: Make the toolbar button for find do
-	the same thing that the menu item for search does.
-
-	* gui/search/e-addressbook-search-dialog.c: Made the top half of
-	this not expand.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Removed a bunch of redundant code.  Made it so that when you set
-	an address label, it sets the delivery address as well.  Added
-	functions to set and get the delivery address.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to
-	convert and address label to a delivery address.
-
-	* contact-editor/Makefile.am: Added e-contact-editor-address.[ch],
-	fulladdr.glade, fulladdr.glade.h.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Switched from a label
-	to a button to show the parsed address.
-
-	* contact-editor/e-contact-editor-address.c,
-	contact-editor/e-contact-editor-address.h: New class to implement
-	the parsed address dialog.
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor-fullname.h: Added const to the
-	_new function.
-
-	* contact-editor/e-contact-editor.c: Implemented clicking on the
-	address button.
-
-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	New glade files for the parsed address dialog.
-
-	* contact-editor/fullname-strings.h, fullname.glade: Changed these
-	accellabels to labels.
-
-	* ename/Makefile.am: Added e-address-western.c.
-
-	* ename/e-address-western.c: Fixed some warnings.
-
-2000-09-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/e-address-western.c: Added by Jesse.
-
-2000-09-08  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/minicard/e-minicard-label.c (e_minicard_label_construct):
-	Use canvas default font
-
-	* gui/minicard/e-minicard.c (e_minicard_realize): Ditto
-	(get_left_width): Ditto
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a few warnings.
-
-2000-09-02  Lauris kaplinski  <lauris@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: e_utf8 wrappers
-
-	* contact-editor/e-contact-editor.c: e_utf8 wrappers
-
-2000-09-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): Updated for the
-	extra arg now needed by `evolution_storage_new_folder()'.
-	(e_ldap_storage_add_server): Likewise.
-
-2000-08-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* conduit/Makefile.am (INCLUDES): Add `BONOBO_GNOME_CFLAGS' and
-	`-I$(top_srcdir)'.
-
-2000-08-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Install load-gnomecard-addressbook
-	and load-pine-addressbook.
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* printing/e-contact-print.c: Countless small changes for gnome-print 0.21+
-
-2000-08-30  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Add a name to the minicard
-	viewer.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* backend/ebook/e-book.c: 
-	* backend/ebook/test-client.c: 
-	* backend/ebook/test-client-list.c: 
-	* backend/ebook/load-gnomecard-addressbook.c: 
-	* backend/ebook/load-pine-addressbook.c: 
-	* backend/pas/pas-book-factory.c: 
-	* conduit/address-conduit.h: Remove USING_OAF checks
-
-2000-08-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Use the right argument name to turn
-	on grid lines.
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/minicard/Makefile.am: Comment out minicard-view-test
-	since its gnorba dependent
-	
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/component/addressbook-component.c: Remove gnorba stuff
-
-	* gui/minicard/e-minicard-control.c (e_minicard_control_factory_init):
-	ditto
-
-	* gui/component/addressbook.c: ditto
-
-	* gui/component/addressbook-factory.c: ditto
-
-2000-08-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* demo/* Removed the demo directory since it's no longer used.
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/minicard/Makefile.am: Remove gnorba stuff
-
-	* gui/minicard/e-minicard-control.gnorba: Kill
-	
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/component/addressbook.gnorba: Kill
-
-	* gui/component/Makefile.am:  Remove gnorba stuff
-
-2000-08-25  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDFLAGS): Add
-	-export-dynamic so libglade will be able to resolve custom widget
-	callbacks.
-
-2000-08-23  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (func_contains): Use e_utf8_strstrcase
-
-	* contact-editor/e-contact-editor-fullname.c (fill_in_field): Use e_utf8 wrapper
-	(extract_field): Same
-
-	* contact-editor/e-contact-editor.c (full_name_clicked): Don't crash
-
-	* ename/Makefile.am: Link demo with libeutil.la
-
-	* ename/test-ename-western-gtk.c (full_changed_cb): Use e_utf8 wrapper
-
-	* gui/component/addressbook.c (find_contact_cb): Use e_utf8 wrapper
-	(search_entry_activated): Same
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c: Fix an error in the
-	arguments to rule_context_load.
-
-	* backend/ebook/e-card.c: Fix this to not mess up if the person
-	passes a VCard with a carriage return in the mailing address.
-
-2000-08-14  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/search/addresstypes.xml: Fixed fullname->full_name for
-	search field.
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget): Check we
-	actually got any parts to build the dialogue with.
-
-2000-08-13  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Set the
-	global_shell_client nastyhack when we know it.
-	This is only required to link with the filter code ...
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	libfilter.a to the link line.
-
-	* gui/search/Makefile.am (noinst_LIBRARIES): Change library name
-	from libaddressbooksearchdialog to libaddressbooksearch, as used
-	elsewhere.
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget):
-	Implement.
-	(get_query): Likewise.
-	(e_addressbook_search_dialog_destroy): Unref filter stuff when
-	done.
-
-	* gui/component/addressbook.c (control_deactivate): Added chris's
-	patch to put the meny in
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Use e_utf8 wrappers everywhere
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/e-card.h: Started adding a time zone field to ECard.
-
-	* gui/component/e-addressbook-model.c: Added
-	e_table_model_pre_change where appropriate.
-
-	* gui/minicard/e-minicard-control.c: Added a ref and unref pair.
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Linked in the search dialog again.
-	It looks like some changes in the shell made this not work.
-
-2000-08-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* conduit/address-conduit.c, conduit/address-conduit.h: Changed
-	this to use ECardSimple.
-
-	* contact-editor/e-contact-editor.c: Fixed a memory leak.
-
-	* gui/component/addressbook.c: Added stuff to the right click
-	menu.  Activated the new search dialog that doesn't quite work
-	yet.
-
-	* gui/minicard/e-minicard-view.c: Fixed some run time warnings.
-
-2000-08-15  Larry Ewing  <lewing@helixcode.com>
-
-	* gui/minicard/e-minicard.c (e_minicard_event): use style colors
-	for the selected state.  This doesn't properly redraw the minicard
-	when there is a style_change event, that is next.
-	(e_minicard_realize): use style colors.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Include the proper db1/db.h
-	as in RedHat 7.0 -- patch from Kenny Graunke <kwg@teleport.com>
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/Makefile.am (libaddress_conduit_la_SOURCES): add
-	address-conduit.h
-
-	* Makefile.am (CONDUIT_SUBDIR): only set subdir if
-	ENABLE_PILOT_CONDUITS is set.
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (SUBDIRS): add conduit subdir.
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (conduit_get_gpilot_conduit): add
-	special oaf initialization hack so conduit can find wombat, and
-	accept all cookies so that we can actually talk to oaf.
-
-2000-08-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed a typo that cause the
-	wrong field to be searched.
-
-	* gui/component/select-names/e-select-names.c: Made the select
-	names dialog only display entries with email addresses.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Fixed a typo in the name of
-	the first phone entry.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/Makefile.am,
-	gui/search/e-addressbook-search-dialog.c,
-	gui/search/e-addressbook-search-dialog.h: A few small interface
-	fixes.
-
-	* gui/component/Makefile.am: Link in the addressbook search
-	dialog.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added the search directory.
-
-	* backend/ebook/e-book.c: Fixed a potential crash.
-
-	* gui/minicard/e-reflow-sorted.h: Fixed an include line.
-
-	* gui/search/.cvsignore, gui/search/Makefile.am: New files.
-
-	* gui/search/e-addressbook-search-dialog.c: Fixed compilation.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* printing/Makefile.am: Ettore fixed compilation.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/.cvsignore: Added load-gnomecard-addressbook.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c,
-	gui/search/e-addressbook-search-dialog.h: Made this into a Gtk
-	object.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-view.c: Ref our book view listener.
-
-	* gui/component/addressbook.c: Updated to use new minicard view
-	widget.
-
-	* gui/minicard/Makefile.am: Added e-minicard-view-widget.c and
-	e-minicard-view-widget.h.
-
-	* gui/minicard/e-minicard-view-widget.c,
-	gui/minicard/e-minicard-view-widget.h: New class that's just a
-	minicard view in an ECanvas.
-
-	* gui/search/e-addressbook-search-dialog.c: New file for
-	implementing a search dialog.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (transmit): implement code to encode
-	the first email address and send to the pilot.
-	(get_phone_label_by_flag): rename find_phone_label_for_flags to
-	this, and implement by calling get_phone_label_by_name.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): add code
-	for handling email addresses from pilot (which stores it as a
-	phone number entry.  go figure.)
-	(check_for_slow_setting): #if 0 out, since we don't use it (yet).
-	(update_record): un #if 0 the code to handle the case where the
-	pilot info has changed for a local record.
-	(merge_ecard_with_remote_record): implement function, but for now
-	just return the existing (desktop) record - we still don't allow
-	merge from the pilot.
-
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/addresstypes.xml: Changed a couple of input field
-	names.
-
-2000-08-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c: Remove prototype for
-	`setup_ldap_storage()', which shouldn't be here anyway.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/, gui/search/addresstypes.xml: New search dialog for
-	addressbook.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Update for
-	changed prototype, pass evolution_homedir arg to
-	setup_ldap_storage.
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Now takes
-	an evolution_homedir arg, uses that to generate the path to the
-	ldapservers.xml file, and stores the result in a static variable.
-	(e_ldap_storage_add_server, e_ldap_storage_remove_server): Use that
-	static variable rather than hardcoding the path to the file.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed any search to not crash on
-	missing phone numbers or email addresses.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c: Added a button to save to
-	your addressbook.
-
-2000-08-09  Cody Russell  <bratsche@gnome.org>
-
-	* gui/component/addressbook.c: Make the toolbar honor the user's
-	gnomecc settings for detachable toolbars.
-
-2000-08-09  Nat Friedman  <nat@helixcode.com>
-
-	* ename/e-name-western-tables.h: Added some military prefixes.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Fixed a warning.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Add the stock
-	print icon to the print item.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Put the print
-	item in the right placeholder so that it gets the right position
-	in the "File" menu.
-	(control_deactivate): Updated accordingly.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c, gui/minicard/e-minicard.c: Changed
-	e_popup_menu_run call to match the new arguments.
-
-	* gui/component/addressbook.oafinfo: Fixed this file to work
-	properly.
-
-	* gui/minicard/e-minicard-control.c: Use the correct oafinfo ID
-	here.  Also cleaned up the code a bit with the help of Michael
-	Meeks.
-
-2000-08-08  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-addressbook-model.c (e_addressbook_model_init):
-	use x-evolution-any-field.
-
-	* gui/component/addressbook.c (search_entry_activated): use
-	x-evolution-any-field.
-	(change_view_type): same.
-
-	* gui/minicard/e-minicard-view.c (e_minicard_view_init): set query
-	to x-evolution-any-field.
-
-	* backend/pas/pas-backend-ldap.c (func_contains): support
-	x-evolution-any-field for matching any evolution supported field.
-
-	* backend/pas/pas-backend-file.c (compare_email): switch to using
-	ECardSimple calls.
-	(compare_phone): same.
-	(compare_address): same.
-	(entry_compare): switch to using ECardSimple calls, and support a
-	'x-evolution-any-field' wildcard field.
-	(vcard_matches_search): use an ECardSimple.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Removed the next and prev
-	toolbar buttons since they don't do anything.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor.c: Fixed the tab order to not
-	repeat the web page address field.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed the tab order for this
-	dialog.
-
-2000-08-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed a warning.
-
-	* backend/ebook/e-card.c: Cast to (char *) in
-	e_card_load_cards_from_file since libversit isn't const correct.
-
-	* backend/pas/pas-backend-file.c: Fixed a warning.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): unref.
-
-	* demo/addressbook.c (control_activate): unref.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/e-addressbook-model.c: Emit "model_pre_change"
-	signal as appropriate.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Adapted this to supply the
-	new append_row API of ETableModel.
-
-2000-07-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Changed the default set of columns.
-
-2000-07-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added load-gnomecard-addressbook
-	compilation.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_load_cards_from_file helper function to load multiple cards
-	from a single file.
-
-	* backend/ebook/load-gnomecard-addressbook.c: New file to load
-	vcard files.  I think this is the format that gnomecard uses so if
-	you copy your gnomecard file to gnomecard.vcf and then run this
-	program in the same directory, it'll copy all your gnome contacts
-	into evolution.  It needs to be changed to take a filename as a
-	parameter.  Some fields (phone and address information, for
-	example) aren't displayed properly, but are saved.  This is new
-	code, so some other than phone and address may be lost.
-
-2000-07-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* backend/pas/Makefile.am: Add `pas-backend-ldap.c' and
-	`pas-backend-ldap.h' to `EXTRA_DIST' so they get distributed even
-	if the OpenLDAP support is not enabled.
-
-2000-07-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Changed the URI to load
-	to.
-
-2000-07-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-widget-test.c: Fixed a warning.
-
-2000-07-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): wait to free the
-	view until we've taken care of freeing its internals.  also, close
-	the ldap connection here.
-	(pas_backend_ldap_connect): rename p_b_l_ensure_connected to this,
-	since it's always called when we create a view.
-	(pas_backend_ldap_build_all_cards_list): open an ldap connection
-	in this function and close it at the end.
-	(poll_ldap): make sure to call ldap_unbind to close the view's
-	connection here.
-	(pas_backend_ldap_search): call pas_backend_ldap_connect here -
-	ldap_unbind will either be called from poll_ldap or from
-	view_destroy.
-	(pas_backend_ldap_get_vcard): the PASBackendLDAP no longer has an
-	LDAP*.
-
-2000-07-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_build_all_cards_list): add support for user settable scope.
-	(pas_backend_ldap_search): same.
-	(pas_backend_ldap_load_uri): same.
-
-2000-07-26  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: lowercasify the
-	supported_mime_types
-
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card-types.h: add enum for e-card pilot status.
-
-	* conduit/address-conduit.c: #ifdef out all the archiving code with SUPPORT_ARCHIVING.
-	(purge): implement correctly - deleting ecards whose pilot status is DELETED.
-	(set_status): implement.
-	(set_pilot_id): add gtk_main call here to change commit_card into a synchronous
-	(delete_all): implement correctly - don't delete the records, just set their status to DELETED.
-	(local_record_from_ecard): get the current status from the ecard.
-
-	* backend/ebook/e-card.c (e_card_get_vcard): add vcard support for pilot status.
-	(parse_pilot_status): new function.
-	(e_card_class_init): add pilot status object arg.
-	(e_card_set_arg): add pilot status support.
-	(e_card_get_arg): same.
-	(e_card_init): initialize pilot_status to 0.
-
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c: add comment headers to signals that
-	didn't have any.
-	
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (start_address_server): use the user's
-	Contact db.  not toshok's.
-
-2000-07-25  Michael Meeks  <michael@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c (book_open_cb): check we
-	opened ok.
-
-2000-07-25  Seth Alves  <alves@hungry.com>
-
-	* ename/Makefile.am (libename_static_la_LDFLAGS): build static
-	version of the library for address conduit to use
-
-	* backend/ebook/Makefile.am: build a static version of the library
-	to link into the conduit
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Added a #define for
-	"X-EVOLUTION-PILOTID".  Added a parse_pilot_id to read pilot id's
-	in properly from VCards.  Rearranged some field orders.  Added a
-	get_arg case for ARG_PILOTID.  Initialize pilot_id field to 0.
-
-2000-07-24  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card.h: add pilot_id.
-
-	* backend/ebook/e-card.c (e_card_get_vcard): add support for
-	X-EVOLUTION-PILOTD vcard field.
-	(e_card_class_init): add pilot_id arg.
-	(e_card_set_arg): handle pilot_id arg.
-
-2000-07-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c: Remove the idle handler
-	when we're destroyed.
-
-	* printing/e-contact-print.c: Fixed the spacing on the card
-	header.
-
-2000-07-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Fixed the oaf info.
-
-	* gui/minicard/.cvsignore, gui/minicard/Makefile.am,
-	gui/minicard/e-minicard-widget-test.c: Added a test for the
-	minicard widget.
-
-	* gui/minicard/e-minicard-control.c: Fixed the mime type.
-
-	* gui/minicard/e-minicard.c: Fixed some crashes if your parent
-	isn't a minicard view.
-
-	* gui/minicard/e-minicard-control.oafinfo: Removed.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Update for
-	the new `evolution_shell_component_new()'.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-	
-	* conduit/address-conduit-control-applet.desktop:
-		Added the Turkish desktop entry.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c: Added "text/vCard" to the
-	list of mime types we support.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/Makefile.am: Added
-	gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c, and
-	gui/minicard/e-minicard-widget.h.
-
-	* gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c,
-	gui/minicard/e-minicard-widget.h: Got these to compile.
-
-	* gui/minicard/e-minicard-control.gnorba,
-	gui/minicard/e-minicard-control.oafinfo: Copied directly from
-	bonobo-clock-control.  These aren't done yet.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c,
-	gui/minicard/e-minicard-widget.h: New files for using a minicard
-	as a widget or a bonobo control.
-
-2000-07-14  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (ldap_server_foreach): duh.
-	don't save the port in the host slot either.
-
-2000-07-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-confirm-delete.glade,
-	contact-editor/e-contact-editor-confirm-delete.glade.h: Added
-	these.
-
-2000-07-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched the order of compilation of printing and
-	contact-editor.
-
-	* contact-editor/Makefile.am: Added printing libraries and a
-	confirm delete dialog glade file.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Enabled the delete and print
-	functions as well as providing a confirm delete dialog to the
-	outside world.
-
-	* gui/component/addressbook.c: Made the delete button on new cards
-	active.
-
-	* gui/minicard/Makefile.am: Added printing libraries to a number
-	of test programs.
-
-	* gui/minicard/e-minicard.c: Added print and delete to the right
-	click menu.  Made the delete button on the card editor active.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h: Added a
-	function to print a single card.
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (ldap_server_foreach): oops.  fix
-	typo that was saving the port in the rootdn spot.
-	(save_ldap_data): make this a bit safer - writing to a new file
-	and renaming it.
-	(load_ldap_data): make this a bit smarter - if parsing the
-	ldapservers.xml file fails and there's a .new file there,
-	rename it.
-	
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Do case insensitive compares.
-
-	* addressbook/gui/component/addressbook.c: Make quick search
-	search both name and company name.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Add icons to the toolbars.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am: Added installation of arrow.png.
-
-	* contact-editor/e-contact-editor.c: Use EVOLUTIONDIR #define.
-
-2000-07-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed an unused function
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am (EXTRA_DIST): add idl
-	file to EXTRA_DIST
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Remove the
-	SelectNames test.
-
-2000-07-10  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* gui/component/select-names/e-select-names-model.c: (Clahey's fix)
-	Make multiple addresses be concatenated correctly.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Switched from ETable
-	to ETableScrolled.
-
-	* addressbook/gui/minicard/e-minicard.c: Don't display mailer or
-	"name or org" fields.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added a field that gives the name if it exists and the company
-	name otherwise.
-
-	* gui/component/e-addressbook-model.c: Formatting changes.
-
-	* gui/component/select-names/e-select-names-table-model.c: Added
-	stripping of names and display of company name if name doesn't
-	exist.
-
-	* gui/component/select-names/e-select-names.c: Fixed up the
-	display so that we display both name and email address.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-model.c: Fixed a small
-	off by one error that was causing an extra character to get
-	deleted sometimes.
-
-2000-07-09  Anders Carlsson  <andersca@gnu.org>
-
-	* gui/minicard/test-reflow.c (allocate_callback): Fix off by one bug with
-	scroll region setting.
-	(resize): Likewise.
-	(main): Put the contacts list in an EScrolledFrame instead of using a
-	separate GtkScrollbar.
-
-	* gui/minicard/e-reflow.c (e_reflow_event): Don't change mouse cursor and
-	don't allow drags on dividers that aren't visible.
-
-	* gui/component/addressbook.c (allocate_callback): Fix off by one bug with
-	scroll region setting.
-	(resize): Likewise.
-	(create_minicard_view): Put the contacts list in an EScrolledFrame instead of
-	using a separate GtkScrollbar.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed unused do_nothing_cb
-	function.
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h: Made the OK
-	and Cancel buttons in the ESelectNames dialog we create work
-	properly.
-	
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Added
-	e_select_names_model_duplicate.
-
-	* gui/component/select-names/e-select-names-text-model.c: Made the
-	text be set correctly if there's already data in the source when
-	the text model is created.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Removed handling of
-	the buttons (the user of this dialog will have to handle them.)
-	Added e_select_names_get_source.  Fixed some typos.
-
-2000-07-09  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/component/addressbook.c: Link the toolbar print button to
-	the print callback.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_clicked): Hitting OK or Cancel at least closes the
-	dialog now.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Set the returned entry to
-	use the ellipsis.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-factory.c: Include
-	e-select-names-factory.h.
-
-	* gui/component/select-names/e-select-names-model.c: Handle a NULL
-	iterator properly in the replace function.
-
-	* gui/component/select-names/e-select-names-table-model.c: Fill in
-	info properly in the value_at function.
-
-	* gui/component/select-names/e-select-names-text-model.c: Don't
-	strlen a NULL text object.
-
-	* gui/component/select-names/e-select-names.c: Close if the person
-	hits ok or cancel (doesn't yet actually undo changes if Cancel is
-	hit.)  Handle removing addresses when they're double clicked on.
-
-	* gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: Hid some unused
-	fields and changed the text at the top of the dialog.
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/component/select-names/.cvsignore: Ignore dynamically 
-	created source files
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): New function to set the properties.
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-factory.c (main): Start up the factory
-	for `Evolution::Addressbook::SelectNames'.
-
-	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:
-	New.
-
-	* gui/component/select-names/e-select-names-factory.c: New.
-	* gui/component/select-names/e-select-names-factory.h: New.
-
-	* gui/component/select-names/e-select-names-bonobo.c: New.
-	* gui/component/select-names/e-select-names-bonobo.h: New.
-
-	* gui/component/addressbook-factory.c (main): Call
-	`e_select_names_factory_init()'.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_add_section): Made const-aware.
-	(e_select_names_manager_create_entry): Made const-aware.
-	(e_select_names_manager_activate_dialog): Made const-aware.
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	New.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: Added an "editable" argument.
-
-	* gui/component/select-names/e-select-names.c: Set our
-	EAddressModel to not be editable.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c: Changed to line
-	mode.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-model.c: Implemented the
-	get_cards function.
-
-	* gui/component/select-names/e-select-names.c: Implemented adding
-	cards through the interface.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c: Make the
-	entry widgets we create editable.
-
-	* gui/component/select-names/e-select-names-model.c: Use
-	e_strsplit instead of g_strsplit.  Fixed an off by 1 error.
-
-	* gui/component/select-names/e-select-names-table-model.c: When
-	the model changes, send a model changed signal.
-
-	* gui/component/select-names/e-select-names-text-model.c: Made
-	changing this work correctly if it's empty.  Made change signals
-	propagate properly.  Is a bit better about freeing iterators when
-	done.
-
-	* gui/component/select-names/e-select-names.c: Made the finished
-	lists be in order instead of being sorted.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c (new_server_cb): Since
-	ELDAPServer->port is a char *, allocate a string with the number
-	389 contained.
-
-	* gui/component/addressbook.c: Make the select names test test the
-	new code instead of the old way of getting to an ESelectNames
-	dialog.
-
-	* gui/component/select-names/e-select-names-manager.c: Coded
-	storing the model for each section, creating an entry and
-	returning it, and for activating the dialog.  Wrote a bit of the
-	get_cards code, but not all of it.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Coded all of
-	the code needed to make ESelectNamesTextModel work (it doesn't
-	yet, but all the code should be there.)  Removed
-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.
-
-	* gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-text-model.c: Changed
-	these to compensate for removal of
-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.
-
-	* gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.h: Fixed some
-	silly typos.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added a parameter to
-	add_section that lets you specify the source ESelectNamesModel.
-	
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.h: add scope to ELDAPServer, and
-	make port a string.
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): don't load a
-	uri, load all the bits and pieces and build up the uri when
-	creating the folder, according to the openldap url format.
-	(ldap_server_foreach): store out each of the individual uri
-	pieces.
-	(e_ldap_storage_remove_server): free the new fields.
-	(get_string_value): if the text is empty, return the empty string
-	instead of NULL.
-
-	* gui/component/e-ldap-server-dialog.c (extract_server_info): port is a string now.
-	(fill_in_server_info): port is a string now.
-
-2000-07-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Changed "FIXME: Save and
-	Close" to "Save and Close".  Removed some toolbar items that will
-	never be used.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Added functions
-	to allow you to modify the model (not implemented yet.)
-
-	* gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h: Finished
-	this.  Doesn't support changing the model at all.
-
-	* gui/component/select-names/e-select-names-text-model.c: Finished
-	this.  Changing the model by typing is done, but doesn't work
-	since none of the functions in the base model are implemented.
-
-2000-07-05  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (new_server_cb): call
-	e_ldap_storage_add_server call.
-
-	* gui/component/ldap-server-dialog.glade: add name row.
-
-	* gui/component/e-ldap-server-dialog.h: remove the ELDAPServer type.
-
-	* gui/component/e-ldap-server-dialog.c (extract_server_info): add
-	support for the name-entry.
-
-	* gui/component/e-ldap-server-dialog.c (fill_in_server_info): same.
-
-	* gui/component/e-ldap-storage.h: add ELDAPServer type, and add
-	prototypes for e_ldap_storage_add_server and
-	e_ldap_storage_remove_server.
-
-	* gui/component/e-ldap-storage.c (e_ldap_storage_add_server): new
-	function, add it to our hash table, add a shell folder, and save
-	out the metadata.
-	(ldap_server_foreach): add the ldap server info under a
-	"contactserver" node.
-	(setup_ldap_storage): create our hashtable.
-
-2000-07-05  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (set_prop): remove hack to read
-	"uri" file from local directory.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): add
-	e-ldap-storage.{c,h}
-
-	* gui/component/addressbook-component.c (owner_set_cb): call
-	setup_ldap_storage.
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Register
-	the LDAP storage and load the .xml file.
-	(load_ldap_data): function to load our xml file.
-	(save_ldap_data): function to save our xml file.
-
-	* gui/component/e-ldap-storage.h: new file.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-text-model.c,
-	gui/component/select-names/e-select-names.c: Fixed more compile
-	errors.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Fixed compile error.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Removed e-card-iterator.c,
-	e-card-iterator.h, e-card-list-iterator.c, e-card-list-iterator.h,
-	e-card-list.c, e-card-list.h.
-
-	* backend/ebook/e-card-iterator.c,
-	backend/ebook/e-card-iterator.h,
-	backend/ebook/e-card-list-iterator.c,
-	backend/ebook/e-card-list-iterator.h, backend/ebook/e-card-list.c,
-	backend/ebook/e-card-list.h: Removed in favor or versions without
-	the -card in the e-util directory since these classes are not
-	specific to cards at all.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,
-	backend/ebook/e-card.c, backend/ebook/e-card.h,
-	backend/ebook/load-pine-addressbook.c, backend/ebook/test-card.c,
-	backend/pas/pas-backend-file.c: Changed the references to
-	e-card-list.c and friends to e-list.c and friends.
-
-	* contact-editor/e-contact-editor.c: Added #include
-	<e-contact-save-as.h> to fix a warning.
-
-	* gui/component/Makefile.am: Moved a number of classes associated
-	with the select-names object to the new select-names directory.
-
-	* gui/component/addressbook.c: Changed the reference to
-	e-select-names.h.
-
-	* gui/component/e-select-names.c, gui/component/e-select-names.h,
-	gui/component/select-names.glade,
-	gui/component/select-names.glade.h: Moved these files into
-	select-names/.
-
-	* gui/component/select-names/.cvsignore,
-	gui/component/select-names/Makefile.am,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h,
-	gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.c,
-	gui/component/select-names/e-select-names-text-model.h,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/recipient.glade,
-	gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: New files for
-	select names dialog (e-select-names.c, e-select-names.h,
-	select-names.glade, select-names.glade.h and recipient.glade moved
-	from gui/component/.)
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h: New select
-	names manager interface (Not complete.)
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	addressbook/gui/component/e-cardlist-model.c: Added
-	value_to_string handlers.
-
-	* demo/addressbook-widget.c, demo/demo.c: Removed usage of "x" and
-	"y" arguments.
-
-	* addressbook/gui/component/addressbook.c: Activated Click To Add
-	and set the click to add message.
-
-	* addressbook/gui/component/e-addressbook-model.c: Added
-	value_to_string and append_row handlers.
-
-	* addressbook/gui/component/e-select-names.c: Added a column.
-
-2000-06-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (poll_ldap): remove spew.
-	(pas_backend_ldap_ensure_connected): duh, don't access a pointer
-	we know to be NULL.
-	(query_prop_to_ldap): rename map_e_card_prop_to_ldap to this.
-	easier to type.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/test-minicard-label.c,
-	gui/minicard/test-minicard.c, gui/minicard/test-reflow.c: Remove
-	usage of "x" and "y" arguments.
-
-2000-06-18    <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (INCLUDES): Use
-	`$(BONOBO_GNOME_CFLAGS)' so that we compile when Bonobo is not in
-	the default GNOME prefix.
-
-2000-06-17  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-label.c,
-	gui/minicard/e-minicard-label.h, gui/minicard/e-minicard.c: Made
-	the left column of minicards not get any wider than the widest
-	possible name.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_addressbook_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Removed the
-	ETableModel thaw handler.
-	* gui/component/e-cardlist-model.c: Likewise.
-
-2000-06-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-select-names.c: Fixed the widget reparenting.
-
-2000-06-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/Makefile.am: Added glade files.
-
-	* gui/component/addressbook.c: Added a test of the Select Names
-	functionality.
-
-	* gui/component/e-addressbook-model.c: Made this class_init
-	function a bit cleaner.
-
-	* gui/component/e-select-names.c: Tested this and fixed some
-	obvious errors.
-
-	* gui/component/select-names.glade: The main window shouldn't be
-	visible by default.
-
-2000-06-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Link
-	with libemiscwidgets.a.
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Likewise.
-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise.
-	(reflow_test_LDADD): Likewise.
-	(minicard_view_test_LDADD): Likewise.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-cardlist-model.c: Renamed a bunch of functions
-	for better readability.
-
-	* gui/component/e-select-names.c, gui/component/e-select-names.h:
-	This should be a working dialog now.
-
-	* gui/component/select-names.glade: Changed the name & creation
-	function of the ETable here.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names.glade,
-	gui/component/select-names.glade.h: Glade files for Select Names
-	dialog.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Do e_card_simple_sync and
-	extract_info more often.
-
-	* gui/component/addressbook.c: Added table printing code.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL
-	for the new args @create_folder_fn and @remove_folder_fn.
-
-2000-06-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (create_view): Updated for
-	the new `EvolutionShellComponentCreateViewFn'.  Return
-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if @type is not
-	"contacts".
-
-2000-06-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Bind Save As to save the
-	current view of the contact as a vcard.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (save_card): Doh, sync the
-	card simple and extract the card info.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor.h (EContactEditor): Now this
-	derives from GtkObject.  It follows the same strategy as the
-	EventEditor in the calendar.
-	(EContactEditor): Added an is_new_card field so that we can know
-	whether to add() or commit() the card.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_get_type):
-	Derive from GtkObject.
-	(e_contact_editor_class_init): Likewise.
-	(e_contact_editor_class_init): Added an "is_new_card" argument.
-	(e_contact_editor_set_arg): Handle ARG_IS_NEW_CARD.
-	(e_contact_editor_get_arg): Likewise.
-	(e_contact_editor_new): Take in an is_new_arg argument and set it
-	on the object.
-	(e_contact_editor_init): Load the app widget into the app field of
-	the EContactEditor structure.  Create its UIHandler as well.
-	(e_contact_editor_class_init): New "add_card", "commit_card", and
-	"editor_closed" signals.
-
-	* contact-editor/test-editor.c (main): Modified for the new API.
-	(editor_closed_cb): Tweaked for the new API.
-	Since this test program does not use Bonobo, it doesn't work,
-	though.
-
-	* gui/component/addressbook.c (new_contact_cb): Use the new
-	contact editor API.
-	(table_double_click): Ditto.
-
-	* gui/minicard/e-minicard-view.c (e_minicard_view_event): Use the
-	new contact editor API.
-
-	* gui/minicard/e-minicard.c (e_minicard_event): Use the new
-	contact editor API.
-
-2000-06-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Remove
-	the `$(srcdir)/' prefix from `libecontacteditor.a' because [of
-	course] the library is built in the build directory, not in the
-	source directory.
-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise with
-	`libeminicard.a'.
-	(minicard_label_test_LDADD): Likewise.
-	(reflow_test_LDADD): Likewise.
-	(minicard_view_test_LDADD): Likewise.
-
-2000-06-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Bind right click on the ETable to
-	"Save to VCard."
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Made phone/email/address
-	labels change correctly again.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-component.c: Made
-	evolution-addressbook shut down when the shell is done with it.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c: Made
-	double click only work on the first button.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: return TRUE if opening a contact
-	editor so that we don't get a "new dialog" contact editor.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (new_contact_cb): Use the stock
-	cancel button for the dialog.
-	(table_double_click): Likewise.
-	(find_contact_cb): Likewise.
-
-2000-05-31  Miguel de Icaza  <miguel@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Added accelerators for
-	the remaining items.
-
-	Add spacing, beautify the dialogs.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Put the toolbar
-	into a frame to make it look like standard GNOME toolbars.  Also,
-	set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not do
-	evil things when its moved to the left or the right of the window.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-cardlist-model.c,
-	gui/component/e-cardlist-model.h: New files for card list.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Fixed a memory leak.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/alphabet.glade: Made the alphabet buttons not
-	focusable.
-
-	* gui/minicard/e-minicard-view.c: Made the "123" button work.
-
-	* gui/minicard/e-reflow-sorted.c: Made all buttons past the last
-	letter available work.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/alphabet.glade: Added a bit of space around the
-	alphabet bar.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/Makefile.am: Added alphabet.glade and
-	alphabet.glade.h.
-
-	* gui/component/addressbook.c, gui/component/alphabet.glade,
-	gui/component/alphabet.glade.h: Added an alphabet bar.
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h,
-	gui/minicard/e-reflow-sorted.c, gui/minicard/e-reflow-sorted.h:
-	Added the ability to just to a particular spot in the reflow.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* printing/Makefile.am: Added BONOBO_GNOME_CFLAGS to CPPFLAGS.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c: Made double clicking create a
-	new card.  Set the empty message.
-
-	* gui/minicard/e-minicard.c: Made sorting be case insensitive.
-
-	* gui/minicard/e-reflow-sorted.c, e-reflow.c, e-reflow.h: Added a
-	message for when the reflow is empty.
-
-	* printing/e-contact-print.c, printing/medbook.ecps: Made the
-	default printout be full page.  Made sorting case insensitive.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c,
-	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,
-	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,
-	backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c,
-	backend/pas/pas-book-factory.c, backend/pas/pas-book-view.c,
-	backend/pas/pas-book-view.h: Added "sequence_complete" signal.
-
-	* printing/e-contact-print.c: Made printing wait for
-	"sequence_complete" signal and made it sort.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c,
-	gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: Added double click to open
-	contact editor.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed some columns.
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	New function.
-	(addressbook_factory): Use it.
-
-	* Makefile.am (evolution_addressbook_LDADD): Link with
-	`evolution-shell-component.o' from the shell directory.
-
-	* gui/component/addressbook-component.c: New.
-	* gui/component/addressbook-component.h: New.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched printing and gui.
-
-	* backend/ebook/e-book-view-listener.h,
-	backend/ebook/e-book-view.h, backend/ebook/e-book.h,
-	backend/ebook/e-card-cursor.h, backend/ebook/e-card-list.h,
-	backend/ebook/e-card-simple.h, backend/ebook/e-card.h: Fixed the
-	#defines to work elsewhere in evolution.
-
-	* gui/component/Makefile.am: Added linking to libecontactprint.
-
-	* gui/component/addressbook.c: Added a menu item to print the
-	current query.
-
-	* printing/Makefile.am: Add linking to libebook and requirements.
-	Add installation of ecps files.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h: Changed
-	this to use real data from an EBook.
-
-	* printing/test-print.c: Made this pass NULL, NULL to
-	e_contact_print_dialog_new so that it will compile.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-save-as.c: Fixed some memory leaks.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am: Added e-contact-editor-save-as.c and
-	e-contact-editor-save-as.h.
-
-	* contact-editor/e-contact-save-as.c,
-	contact-editor/e-contact-save-as.h: New files that display a save
-	as dialog and then save the given card to that file.
-
-	* gui/minicard/e-minicard.c: Call e_contact_save_as in a right
-	click menu.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/e-addressbook-model.c: Added initialize_value and
-	value_is_empty callbacks.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed a bug that broke
-	address field support.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Added support for arbitrary
-	fields in the contact editor.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed e_card_name_copy and
-	e_card_arbitrary_copy to deal correctly with a passed NULL.
-
-	* contact-editor/Makefile.am: Removed imagesdir stuff.
-
-	* contact-editor/arrow.png: Made this transparent.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Renamed some widgets
-	and added custom widgets for all of the images.
-
-	* contact-editor/e-contact-editor.c: Worked on making this work
-	decently well with messed up glade files.  Cleaned up a lot of code.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed the code to write out and read in
-	arbitrary fields.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,
-	backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	backend/ebook/e-card.h: Implemented "MAILER" field.  Added
-	arbitrary field support.
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a warning.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added E_CARD_SIMPLE_FIELD_MAILER.  Not implemented yet.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (construct_email_list): convert to use ECardSimple.
-	(poll_ldap): same.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-book.h: add typedefs for the can_write
-	functions, and add parameters to pas_book_new.
-
-	* backend/pas/pas-book.c (pas_book_construct): add can_write/can_write_card params.
-	(pas_book_new): same.
-	(impl_Evolution_Book_can_write): new function.
-	(impl_Evolution_Book_can_write_card): same.
-	(pas_book_get_epv): assign the can_write/can_write_card slots in the epv.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_can_write): new function.
-	(pas_backend_ldap_can_write_card): same.
-	(pas_backend_ldap_add_client): add can_write/can_write_card to pas_book_new call.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_can_write_card): new function, calls can_write.
-	(pas_backend_file_can_write): same.
-	(can_write): return TRUE if we can write to the addressbook file.
-	(pas_backend_file_add_client): add can_write/can_write_card to pas_book_new call.
-
-	* backend/idl/addressbook.idl (Evolution): add can_write and
-	can_write_card permission requests.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_get_vcard): Fixed a large memory leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (add_list_unique): Fixed another memory
-	leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/pas/pas-backend-file.c,
-	contact-editor/e-contact-editor.c, ename/e-name-western.c,
-	gui/component/addressbook.c, gui/minicard/e-minicard-view.c: Fixed
-	some memory leaks.
-
-	* backend/ebook/e-card.c: Rearranged some code.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a reference
-	leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a compile
-	error.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Got rid of a
-	memory leak.  Rearranged a couple functions.
-	
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h:
-	Added some code to stop watching the EBook when the canvas is
-	destroyed (apparently the canvas is destroyed before our widget is
-	destroyed.)
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Use the correct
-	policy for resize.
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added libeutil for e-card's support
-	for categories.
-
-	* backend/ebook/e-card-list.c, backend/ebook/e-card-list.h: Added
-	a function to get the length.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added categories
-	support (accessible either as "categories" or "category_list".)
-
-	* contact-editor/Makefile.am: Added e-table and all of the
-	categories files.
-
-	* contact-editor/categories.glade,
-	contact-editor/categories-strings.h,
-	contact-editor/e-contact-editor-categories.c,
-	contact-editor/e-contact-editor-categories.h:
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Rearranged this dialog.
-
-	* contact-editor/e-contact-editor.c: Rearranged dialog a bit.
-	Added opening of categories dialog.
-
-	* gui/component/Makefile.am: Rearranged libraries so that
-	libetable would be available for the contact editor categories
-	dialog.
-
-	* gui/component/addressbook.c: Fix for new ETable resizing.  Make
-	contact editor dialog resizable.
-
-	* gui/minicard/Makefile.am: Added libetable contact editor
-	categories dialog.
-
-	* gui/minicard/e-minicard.c: Make contact editor dialog resizable.
-
-2000-05-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* contact-editor/fulname.glade: Use accelerators here.
-
-2000-05-13  Valek Filippov  <frob@df.ru>
-
-	* gui/component/ldap-server-dialog.glade: save translatable strings
-	* gui/component/ldap-server-dialog.glade.h: file with strings
-	* printing/e-contact-print.glade: save translatable strings
-	* printing/e-contact-print.glade.h: file with strings
-		
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Now that we
-	depend on recent gnome-libs we can make the toolbar detachable
-	again.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Make the table view be sorted by
-	name initially.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: Send a proper response when you
-	can't find the ldap URI.
-
-	* gui/component/addressbook.c: Cleaned up the open error dialog a
-	bit.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Added a dialog for when you can't
-	open an addressbook.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added e-book-types.h, e-card-pairs.h,
-	e-card-types.h.
-
-	* backend/pas/Makefile.am: Added pas-backend-ldap.h.
-
-	* contact-editor/Makefile.am: Added a proper EXTRA_DIST section.
-	Removed some old defines.
-
-	* ename/Makefile.am: Added e-name-western-tables.h.
-
-	* gui/component/Makefile.am: Added e-ldap-server-dialog.h.  Added
-	a proper EXTRA_DIST section.
-
-	* gui/minicard/e-reflow.c: Added a missed cast.
-
-	* printing/Makefile.am: Added a proper EXTRA_DIST section.
-	
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Make sure that the canvas
-	doesn't intercept keyboard focus.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Use new art.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Replaced the Address
-	button with a label and rearranged the address area a bit.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: Reenable editting.
-
-	* gui/minicard/e-reflow-sorted.c: Make reflow flow on deletion.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Destroy the view object when
-	leaving the minicard view.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-reflow-sorted.c: Fixed reflow sorting to call
-	reflow_request when sorting on an item changes.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Make File As change if name or
-	company are changed pretty much anywhere.
-
-	* gui/minicard/e-minicard.c: Turned off having minicard editing
-	effect anything since it's so crashy.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: Enabled a couple more fields
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Added a default card to all new
-	file backends.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Rearranged order of things
-	getting destroyed.
-
-	* gui/minicard/e-minicard-view.c: Rearranged order of things
-	getting destroyed.  Don't set attributes of non-null or destroyed
-	items.  Destroy parent object when destroyed.  Maintain ref_count
-	of items in list.
-
-	* gui/minicard/e-minicard.c: Don't set attributes of non-null
-	items.
-
-	* gui/minicard/e-reflow-sorted.c: Maintain ref_count of items in
-	list.
-
-	* gui/minicard/e-reflow.c: Maintain ref_count of items in list.
-	Destroy parent object when destroyed.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed some indentation.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Changed Email to
-	Primary Email.
-
-	* contact-editor/e-contact-editor.c: Added checkmarks to indicate
-	if data exists in the pull down menus for the phone, address, and
-	email fields.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed the string duplication
-	problem.  Fixed the business/home address string mix up.
-
-	* gui/component/addressbook.c: Made the minicard view the default
-	view.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed this up a bit.  Syncing
-	should work better now.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c,
-	gui/minicard/e-minicard.h, gui/minicard/e-reflow-sorted.c,
-	gui/minicard/e-reflow-sorted.h: Made a minimal number of things be
-	destroyed and recreated when updating a field.
-
-2000-05-07    <toshok@the-dot-in.helixcode.com>
-
-	* gui/minicard/e-minicard.c (remodel): make sure to free the
-	return value of e_card_simple_get.
-
-	* gui/component/addressbook.c (teardown_table_view): destroy the
-	ECardSimple here, plug memory leak.
-	(create_table_view): use view->simple so we can destroy the
-	ECardSimple later on.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* ename/e-name-western.c (e_name_western_extract_middle): comment
-	function, and fix an ABR.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* ename/e-name-western.c (e_name_western_cleanup_string): comment
-	function, and fix an ABR.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: Added saving in minicard view.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed an off by 2 error.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (set_prop): don't create a new
-	ebook.  instead, unload the current uri (if there is one) and load
-	the new one.
-	(addressbook_factory): create the ebook once.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Replaced some model_changed
-	calls with row_inserted calls.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:
-	Removed some code that was notifying too many clients at the wrong
-	times.
-
-	* gui/component/addressbook.c: Set view->book.  Unreffed
-	view->book.  Unreffed the model instead of destroying it.  Removed
-	the /tmp/test.db stuff.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Make the addressbook create the
-	correct file uri.  Added a default query.  Initialize view->model
-	and view->view to NULL.
-
-	* gui/component/e-addressbook-model.c,
-	gui/minicard/e-minicard-view.c: Only call get_book_view if both
-	book and query and non-null.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (control_deactivate): remove the
-	separator and toggle view items as well.
-	(toggle_view_as_cb): callback for the "/View/Toggle View" menu
-	item.
-	(get_query): getter for the query string that takes into account
-	the two view types.
-	(set_query): setter for the query string that takes into account
-	the two view types.
-	(set_book): setter for the EBook type - not really a setter, since
-	the book is kept in the AddressbookView, but this method actually
-	sets the "book" property on the current view.
-	(find_contact_cb): make use of get/set_query
-	(search_entry_activated): make use of set_query.
-	(control_activate): add a menu separator and an item to toggle
-	between view types.
-	(book_open_cb): make use of set_book.
-	(ebook_create): no longer needs to return the EBook, since we set
-	the book field in our view.
-	(teardown_minicard_view): destructor function for the minicard
-	specific ui.
-	(create_minicard_view): constructor function for the minicard
-	specific ui.
-	(teardown_table_view): destructor function for the e-table
-	specific ui.
-	(create_table_view): constructor function for the e-table specific
-	ui.
-	(change_view_type): destroy the old and create the new view ui,
-	change the label of the Toggle View menu item, and reset the book
-	and query on the new view type.
-	(addressbook_factory): create an all-encompassing vbox that the
-	view uses to create the bonobo control, which contains 1 widget
-	per ui specific view (the e-table in the table case, and another
-	vbox in the minicard case.)  use change_view_type to create the
-	initial view.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book.c: Made a NULL callback just mean to not
-	call back.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Reordered fields.  Added a get_const function to get a constant
-	string that persists until the simple is destroyed.
-
-	* gui/component/Makefile.am: Added e-addressbook-model.c and
-	e-addressbook-model.h and all of the libraries and includes that
-	they are dependent on.
-
-	* gui/component/addressbook-factory.c: Initialize e cursors.
-
-	* gui/component/addressbook.c: Added inactive code to display an
-	ETable view of the addressbook.
-
-	* gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: New files to implement an
-	ETable model with a EBook back end.
-	
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Mostly finished ECardSimple.
-
-	* contact-editor/e-contact-editor.c: Changed this to match with
-	some of the changes to ECardSimple.
-
-	* gui/component/addressbook.c: Changed this to look for
-	"addressbook.db" in the given directory if it doesn't find the
-	file "uri".
-
-	* gui/minicard/e-minicard.c, gui/minicard/e-minicard.h: Changed
-	this to use ECardSimple.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	
-	* gui/component/.cvsignore: ignore evolution-addressbook.pure
-
-	* gui/component/Makefile.am: add support for generating 
-	evolution-addressbook.pure.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_load_uri): if a
-	port isn't specified in the uri default to 389.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Made this take a uri through its
-	property bag.
-
-2000-05-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added e-card-simple.c and
-	e-card-simple.h.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	New card wrapper class to simplify things.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Changed e-contact-editor to use
-	ECardSimple a bit.
-
-2000-05-03  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (control_deactivate): #ifdef
-	HAVE_LDAP the ldap specific stuff.
-	(null_cb): same.
-	(control_activate): same.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* backend/ebook/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/addressbook/ename'.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* demo/Makefile.am: set G_LOG_DOMAIN.
-	* printing/Makefile.am: same.
-
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: Add back in the
-	CORBA_Object_release.
-
-	* backend/pas/pas-book.c: Properly duplicate and release the
-	listener passed to us.
-
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:
-	Made uri slightly better managed.
-	
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): Remove this
-	CORBA_Object_release that causes things not to work.  This is just
-	a temporary fix until we figure out what's actually wrong.
-
-	* backend/pas/pas-book.c: Fixed a copy and paste error in a warning.
-	
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched the subdirs order since backend depends on
-	ename.
-
-2000-05-01  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_remove_client):
-	fix a typo in the for loop.
-
-2000-05-01  Michael Meeks  <michael@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: include gtk.
-
-2000-04-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* backend/ebook/e-book-types.h (EBookStatus): Added new status
-	values for the IDL stuff.
-
-	* backend/pas/pas-book-factory.h (PASBookFactoryClass): New
-	"last_book_gone" signal.
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_launch_backend): Better error handling.
-	(pas_book_factory_process_queue): Let
-	pas_book_factory_process_request() free the request.
-	(pas_book_factory_process_request): Free the request here.
-	Perform better error handling.
-	(free_active_server_map_entry): Free an active server map entry;
-	free the URI key and unref the backend value.  This function was
-	renamed; the old one was trying to CORBA_Object_unref() a GTK+
-	object!
-	(remove_backends_entry): Free a backend table entry; free the URI
-	key.
-	(backend_last_client_gone_cb): Remove the backend from the active
-	server map and emit the "last_book_gone" signal if appropriate.
-	(pas_book_factory_get_n_backends): New function to query the
-	number of running backends in an addressbook factory.
-
-	* backend/idl/addressbook.idl (BookListener::CallStatus): Added a
-	ProtocolNotSupported code.  This is for when the addressbook
-	factory cannot find a provider for the requested URI.
-
-	* backend/pas/pas-backend.h (PASBackendClass): New
-	"last_client_gone" signal.
-	(PASBackendClass): New get_uri virtual method.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): Return a
-	gboolean success code.
-	(pas_backend_add_client): Return a gboolean success code.
-	(pas_backend_last_client_gone): New function used by backend
-	implementations to notify upwards when the backend's last client
-	is destroyed.
-	(pas_backend_get_uri): New function to get the URI of a backend.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	Pass the backend as the closure data to the "destroy" handler of
-	the book.  We cannot call pas_book_get_backend() in the callback
-	since the book's private data has already been destroyed when the
-	callback is invoked.  Alternatively, we could move the private
-	data destruction step to the book's ::finalize() method.
-	(pas_backend_file_book_destroy_cb): Get the backend from the
-	callback's data, not from the book.
-	(pas_backend_file_remove_client): Remove the book from the list of
-	clients.  When all clients go away, call
-	pas_backend_last_client_gone().
-	(PASBackendFilePrivate): Added an uri field.
-	(pas_backend_file_get_uri): Implement the get_uri method.
-	(pas_backend_file_load_uri): Return a gboolean success code.
-	Also, store the URI in the private structure.
-	(pas_backend_file_add_client): Return a gboolean success code.
-	Also, call pas_backend_last_client_gone() if appropriate.
-	(pas_backend_file_destroy): Free the bf->priv->uri.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	Pass the backend as the closure data to the "destroy" handler of
-	the book.  See above for rationale.
-	(pas_backend_ldap_book_destroy_cb): Get the backend from the
-	callback's data.
-	(pas_backend_ldap_remove_client): Remove the book from the list of
-	clients.  When all clients go away, call
-	pas_backend_last_client_gone().
-	(pas_backend_ldap_load_uri): Return a gboolean success code.
-	(pas_backend_ldap_add_client): Return a gboolean success code.
-	Also, call pas_backend_last_client_gone() if appropriate.
-	(PASBackendLDAPPrivate): New uri field.
-	(pas_backend_ldap_get_uri): Implement the get_uri method.
-	(pas_backend_ldap_load_uri): Store the uri in the private
-	structure.
-	(pas_backend_ldap_destroy): Free the bl->priv->uri.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): added
-	e-ldap-server-dialog.c
-	(glade_DATA): added ldap-server-dialog.glade
-
-	* gui/component/ldap-server-dialog.glade: new file.
-
-	* gui/component/e-ldap-server-dialog.h: new file.
-
-	* gui/component/e-ldap-server-dialog.c: new file, contains logic
-	associated with ldap server dialog.
-
-	* gui/component/addressbook.c (control_deactivate): remove the
-	directory server menu item.
-	(null_cb): do nothing callback for e_book_load_uri call.  should
-	change to (at the very least) pop up a dialog if there was an
-	error.
-	(new_server_cb): new function - really just switches to a
-	particular ldap server, since the information isn't saved
-	anywhere.
-	(control_activate): add directory server menu item.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-book.c (e_book_load_uri): create the book
-	listener here, since it's destroyed in unload_uri.
-	(e_book_construct): remove the book listener construction here.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/.cvsignore: Added load-pine-addressbook.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor.c, gui/minicard/e-minicard.c: Made
-	some fields invisible that were visible before.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Make file as not have the : after it if
-	it's empty.  If there's no name, or file_as, fill in these fields
-	with defaults based on full_name or name respectively.
-
-	* backend/ebook/load-pine-addressbook.c: New file to do import of
-	pine .addressbook files.
-
-	* backend/pas/pas-backend-file.c: Made empty fields act as the
-	empty string for searches.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Made the File As field update
-	properly as you edit the name and company fields.  Added the pull
-	down list of File As choices.  Made sure that all fields will
-	be set to NULL if they are deleted to the empty string.
-
-	* gui/minicard/e-minicard.c: Use the File As field instead of the
-	Full Name field for the header.  Make identical compares on the
-	File As field do a compare on the uid.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/fullname.glade: Fixed a string mismatch.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added ename includes and libs.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_name_from_string.  Added header for
-	e_card_delivery_address_from_string, even though it's not
-	implemented yet.
-
-	* contact-editor/Makefile.am: Removed the ename includes since we
-	no longer use ename directly here.
-
-	* contact-editor/e-contact-editor.c: Fixed this to properly save
-	the address labels displayed.  Updated this to use the function
-	e_card_name_from_string instead of doing it by hand.
-
-	* contact-editor/fullname-strings.h,
-	contact-editor/fullname.glade: Deleted an unused field.  Changed
-	the set of prefixes and suffixes.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_ensure_connected): add support for a rootdn in
-	the uri.
-	(pas_backend_ldap_build_all_cards_list): make use of the rootdn in
-	the call to ldap_search_s.
-	(pas_backend_ldap_search): same.
-	(pas_backend_ldap_load_uri): get the rootdn out of the passed in uri.
-
-2000-04-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_phone_new e_card_delivery_address_new,
-	e_card_delivery_address_to_string, e_card_name_copy,
-	e_card_name_new, e_card_name_to_string, and made e_card_name_free
-	public.  Removed some unused code.
-
-	* backend/pas/pas-backend-file.c: Fixed a warning.
-
-	* contact-editor/Makefile.am: Added e-contact-editor-fullname.[ch]
-	and fullname.glade.  Added e-name libs and includes.
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor-fullname.h,
-	contact-editor/fullname-strings.h, contact-editor/fullname.glade:
-	New dialog for editing the fields of a name separately.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Create an
-	EContactEditorFullname when you click on the Full Name button.
-	Maintain a parsed name at all times.
-
-	* gui/component/Makefile.am, gui/minicard/Makefile.am: Added
-	e-name libs.
-
-2000-04-28  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/pas/pas-book-factory.c (register_factory): fix the
-	`USING_OAF' changes so that they work for when we are not using
-	oaf.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* ename/Makefile.am
-	(gnome_libs): Use `BONOBO_GNOME_LIBS'.
-	(INCLUDES): Add `-I$(srcdir)/..'.
-
-	* backend/pas/pas-book-factory.c
-	(register_factory): New function to register the factory.
-	Implementation different according to `USING_OAF'.
-	(pas_book_factory_activate): Use `register_factory()'.
-
-	* gui/component/addressbook.c: New #define `CONTROL_FACTORY_ID',
-	varying depending on whether we are `USING_OAF'.
-	(addressbook_factory_init): Use `CONTROL_FACTORY_ID'.
-
-	* backend/ebook/test-client.c (init_corba): New function,
-	implemented differently according to the `USING_OAF' #define.
-
-	* backend/ebook/e-book.c: New #define `CARDSERVER_OAF_ID'.
-	(e_book_construct): Work with OAF #if `USING_OAF'.
-
-	* backend/ebook/Makefile.am (gnome_libs): Removed.
-	(corbadir): Removed.
-	(ebook_libs): Removed.
-	(test_client_LDADD): Just add `libebook.la'.
-	(test_card_LDADD): Likewise.
-	(test_client_list_LDADD): Likewise.
-
-	* gui/component/addressbook-factory.c
-	(init_corba): New helper function, implemented differently
-	according to `USING_OAF'.
-	(main): Call `init_corba()'.
-
-2000-04-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added file as,
-	office, manager, assistant, spouse, and anniversary fields.  These
-	all use "X-EVOLUTION-" fields in the VCards.
-
-	* backend/pas/pas-backend-file.c: Added all the new fields (except
-	anniversary) to the list of fields.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Fixed some misnamed
-	fields and fixed the placement of the comments field.
-
-	* contact-editor/e-contact-editor.c: Made the newly added fields
-	display properly.
-
-	* Makefile.am: Added ename.
-
-	* ename/e-name-western.h, ename/test-ename-western-gtk.c,
-	ename/test-ename-western.c: Fixed up some #includes.
-
-	* ename/.cvsignore: Added .cvsignore.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	backend/ebook/e-card.h: Added an address label field.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Got rid of some unused
-	fields.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Added the address label field.
-	Load only.  Editing these fields seems to mess things up.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Added proper handling of the
-	email field.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	gui/minicard/e-minicard.c: Prefixed the ADDR_ flags.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Edited the glade file.
-	Removed all the fields that we don't use.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Made the phone fields work
-	properly.  The address and email fields are temporarily turned off
-	until they can be made to work as the phone fields do.
-
-2000-04-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/minicard/Makefile.am (INCLUDES): Use
-	`$(BONOBO_GNOME_CFLAGS)'.
-
-	* backend/pas/Makefile.am (idl_flags): Add `-I $(datadir)/idl' to
-	pick up IDL files in the installation prefix as well.
-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.
-
-	* backend/ebook/Makefile.am (ORBIT_IDL): Use `-I $(datadir)/idl'
-	to get the IDLs from the installation prefix as well.
-	(INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'.
-	(test_client_LDADD): Use `$(BONOBO_GNOME_LIBS)' instead of
-	hardcoding `-lbonobo'!  Also get rid of some other useless flags,
-	as `$(BONOBO_GNOME_LIBS)' really has all what we need.
-	(test_client_list_LDADD): Likewise.
-	(test_card_LDADD): Likewise.
-
-2000-04-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/minicard/Makefile.am (INCLUDES): Use "e-minicard" as the log
-	domain.
-
-	* gui/component/Makefile.am (INCLUDES): Use
-	"evolution-addressbook" as the log domain.
-
-	* backend/pas/Makefile.am: Build libpas.a, not a shared library.
-	Do not install any header files.
-	(INCLUDES): Remove spurious include paths.
-
-	* backend/pas/*.[ch]: Fix includes.
-
-	* backend/ebook/Makefile.am: Do not install the test programs.
-	Fixed some include weirdness.
-
-	* backend/ebook/*.[ch]: Fix includes.
-
-	* contact-editor/Makefile.am (INCLUDES): Set the log domain to
-	"contact-editor".
-	(INCLUDES): Fix.
-
-	* contact-editor/*.[ch]: Fix includes.
-
-	* gui/minicard/*.[ch]: Fix includes.
-
-	* ChangeLog: Started a ChangeLog here.
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index ed0acc92d3..ca0916e74d 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -11,7 +11,6 @@ errordir = $(privdatadir)/errors
 @EVO_PLUGIN_RULE@
 
 EXTRA_DIST =			\
-	ChangeLog.pre-1-4	\
 	addressbook.error.xml
 
 dist-hook:
diff --git a/addressbook/addressbook.error.xml b/addressbook/addressbook.error.xml
index 8a8bb68ddc..a93ea8578b 100644
--- a/addressbook/addressbook.error.xml
+++ b/addressbook/addressbook.error.xml
@@ -44,22 +44,18 @@
  </error>
 
  <error id="generic-error" type="error">
- <!--For Translators: '{0}' is the type of error (eg: "invalid contact", "error adding contact", "error modifying contact", "error removing contact") -->
-  <_primary>{0}</_primary>
-  <!-- For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT") -->
-  <_secondary>{1}</_secondary>
+  <primary>{0}</primary>
+  <secondary>{1}</secondary>
  </error>
 
  <error id="load-error" type="error">
   <_primary>Unable to open address book</_primary>
-  <!-- For Translators: {0} is string describing the error why the address book could not be loaded -->
-  <_secondary>{0}</_secondary>
+  <secondary>{0}</secondary>
  </error>
 
  <error id="search-error" type="error">
   <_primary>Unable to perform search.</_primary>
-  <!-- For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query." -->
-  <_secondary>{0}</_secondary>
+  <secondary>{0}</secondary>
  </error>
 
  <error id="prompt-save" type="question" default="GTK_RESPONSE_YES">
diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui
index 51fc9c9e29..3701557062 100644
--- a/addressbook/gui/contact-editor/contact-editor.ui
+++ b/addressbook/gui/contact-editor/contact-editor.ui
@@ -448,7 +448,7 @@
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">6</property>
                             <child>
-                              <object class="GtkEntry" id="entry-email-2">
+                              <object class="GtkEntry" id="entry-email-3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="editable">True</property>
@@ -486,7 +486,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEntry" id="entry-email-3">
+                              <object class="GtkEntry" id="entry-email-2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="editable">True</property>
@@ -567,7 +567,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkComboBox" id="combobox-email-2">
+                              <object class="GtkComboBox" id="combobox-email-3">
                                 <property name="visible">True</property>
                                 <property name="add_tearoffs">False</property>
                                 <property name="focus_on_click">True</property>
@@ -589,7 +589,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkComboBox" id="combobox-email-3">
+                              <object class="GtkComboBox" id="combobox-email-2">
                                 <property name="visible">True</property>
                                 <property name="add_tearoffs">False</property>
                                 <property name="focus_on_click">True</property>
@@ -752,7 +752,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkEntry" id="entry-phone-2">
+                                      <object class="GtkEntry" id="entry-phone-3">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="editable">True</property>
@@ -790,7 +790,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkEntry" id="entry-phone-3">
+                                      <object class="GtkEntry" id="entry-phone-2">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="editable">True</property>
@@ -824,7 +824,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="combobox-phone-2">
+                                      <object class="GtkComboBox" id="combobox-phone-3">
                                         <property name="visible">True</property>
                                         <property name="add_tearoffs">False</property>
                                         <property name="focus_on_click">True</property>
@@ -839,7 +839,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="combobox-phone-3">
+                                      <object class="GtkComboBox" id="combobox-phone-2">
                                         <property name="visible">True</property>
                                         <property name="add_tearoffs">False</property>
                                         <property name="focus_on_click">True</property>
@@ -902,7 +902,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkEntry" id="entry-phone-6">
+                                      <object class="GtkEntry" id="entry-phone-7">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="editable">True</property>
@@ -921,7 +921,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkEntry" id="entry-phone-7">
+                                      <object class="GtkEntry" id="entry-phone-6">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="editable">True</property>
@@ -974,7 +974,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="combobox-phone-6">
+                                      <object class="GtkComboBox" id="combobox-phone-7">
                                         <property name="visible">True</property>
                                         <property name="add_tearoffs">False</property>
                                         <property name="focus_on_click">True</property>
@@ -989,7 +989,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="combobox-phone-7">
+                                      <object class="GtkComboBox" id="combobox-phone-6">
                                         <property name="visible">True</property>
                                         <property name="add_tearoffs">False</property>
                                         <property name="focus_on_click">True</property>
@@ -1540,7 +1540,7 @@
                         <child>
                           <object class="GtkLabel" id="label-weblog">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Web Log:</property>
+                            <property name="label" translatable="yes">_Blog:</property>
                             <property name="use_underline">True</property>
                             <property name="use_markup">False</property>
                             <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1570,7 +1570,7 @@
                             <property name="visible">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="a11y-entry-weblog">
-                                <property name="AtkObject::accessible_name" translatable="yes">Web Log:</property>
+                                <property name="AtkObject::accessible_name" translatable="yes" comments="Translators: an accessibility name">Blog:</property>
                               </object>
                             </child>
                           </object>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index 79d665e6c7..a872afb7d9 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -85,14 +85,14 @@ e_contact_editor_fullname_class_init (EContactEditorFullnameClass *klass)
 
 	g_object_class_install_property (object_class, PROP_NAME,
 					 g_param_spec_pointer ("name",
-							       _("Name"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Name",
+							       NULL,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_EDITABLE,
 					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Editable",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 }
@@ -101,20 +101,28 @@ static void
 e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullname)
 {
 	GtkBuilder *builder;
+	GtkDialog *dialog;
+	GtkWidget *parent;
 	GtkWidget *widget;
+	GtkWidget *action_area;
+	GtkWidget *content_area;
+	const gchar *title;
+
+	dialog = GTK_DIALOG (e_contact_editor_fullname);
+	action_area = gtk_dialog_get_action_area (dialog);
+	content_area = gtk_dialog_get_content_area (dialog);
 
 	gtk_widget_realize (GTK_WIDGET (e_contact_editor_fullname));
-	gtk_dialog_set_has_separator (GTK_DIALOG (e_contact_editor_fullname),
-				      FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (e_contact_editor_fullname)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (e_contact_editor_fullname)->action_area), 12);
+	gtk_dialog_set_has_separator (dialog, FALSE);
+	gtk_container_set_border_width (GTK_CONTAINER (action_area), 12);
+	gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
 
-	gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_fullname),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
+	gtk_dialog_add_buttons (
+		dialog,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
 
-	gtk_window_set_resizable(GTK_WINDOW(e_contact_editor_fullname), TRUE);
+	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
 
 	e_contact_editor_fullname->name = NULL;
 
@@ -124,14 +132,15 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam
 	e_contact_editor_fullname->builder = builder;
 
 	widget = e_builder_get_widget(builder, "dialog-checkfullname");
-	gtk_window_set_title (GTK_WINDOW (e_contact_editor_fullname),
-			      GTK_WINDOW (widget)->title);
+	title = gtk_window_get_title (GTK_WINDOW (widget));
+	gtk_window_set_title (GTK_WINDOW (e_contact_editor_fullname), title);
 
 	widget = e_builder_get_widget(builder, "table-checkfullname");
-	g_object_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
-	g_object_unref(widget);
+	parent = gtk_widget_get_parent (widget);
+	g_object_ref (widget);
+	gtk_container_remove (GTK_CONTAINER (parent), widget);
+	gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0);
+	g_object_unref (widget);
 
 	gtk_window_set_icon_name (
 		GTK_WINDOW (e_contact_editor_fullname), "contact-new");
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 0f8eb07b15..2f885e4721 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -293,57 +293,57 @@ e_contact_editor_class_init (EContactEditorClass *klass)
 
 	g_object_class_install_property (object_class, PROP_SOURCE_BOOK,
 					 g_param_spec_object ("source_book",
-							      _("Source Book"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Source Book",
+							      NULL,
 							      E_TYPE_BOOK,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_TARGET_BOOK,
 					 g_param_spec_object ("target_book",
-							      _("Target Book"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Target Book",
+							      NULL,
 							      E_TYPE_BOOK,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_CONTACT,
 					 g_param_spec_object ("contact",
-							      _("Contact"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Contact",
+							      NULL,
 							      E_TYPE_CONTACT,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_IS_NEW_CONTACT,
 					 g_param_spec_boolean ("is_new_contact",
-							       _("Is New Contact"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Is New Contact",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_WRITABLE_FIELDS,
 					 g_param_spec_object ("writable_fields",
-							      _("Writable Fields"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Writable Fields",
+							      NULL,
 							      E_TYPE_LIST,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_REQUIRED_FIELDS,
 					 g_param_spec_object ("required_fields",
-							      _("Required Fields"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Required Fields",
+							      NULL,
 							      E_TYPE_LIST,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_EDITABLE,
 					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Editable",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_CHANGED,
 					 g_param_spec_boolean ("changed",
-							       _("Changed"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Changed",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 }
@@ -1202,13 +1202,16 @@ expand_mail (EContactEditor *editor, gboolean expanded)
 	check = e_builder_get_widget (editor->builder, "checkbutton-htmlmail");
 	table = GTK_TABLE (e_builder_get_widget (editor->builder, "email-table"));
 	if (check != NULL && table != NULL) {
-		g_object_ref (G_OBJECT (check));
-		gtk_container_remove (GTK_CONTAINER (check->parent), check);
+		GtkWidget *parent;
+
+		g_object_ref (check);
+		parent = gtk_widget_get_parent (check);
+		gtk_container_remove (GTK_CONTAINER (parent), check);
 		if (expanded)
 			gtk_table_attach_defaults (table, check, 0, 4, 2, 3);
 		else
 			gtk_table_attach_defaults (table, check, 2, 4, 0, 1);
-		g_object_unref (G_OBJECT (check));
+		g_object_unref (check);
 	}
 }
 
@@ -3484,11 +3487,7 @@ expand_phone_toggle (EContactEditor *ce)
 	GtkWidget *phone_ext_table;
 
 	phone_ext_table = e_builder_get_widget (ce->builder, "table-phone-extended");
-#if GTK_CHECK_VERSION(2,19,7)
 	expand_phone (ce, !gtk_widget_get_visible (phone_ext_table));
-#else
-	expand_phone (ce, !GTK_WIDGET_VISIBLE (phone_ext_table));
-#endif
 }
 
 static void
@@ -3497,11 +3496,7 @@ expand_mail_toggle (EContactEditor *ce)
 	GtkWidget *mail;
 
 	mail = e_builder_get_widget (ce->builder, "entry-email-4");
-#if GTK_CHECK_VERSION(2,19,7)
 	expand_mail (ce, !gtk_widget_get_visible (mail));
-#else
-	expand_mail (ce, !GTK_WIDGET_VISIBLE (mail));
-#endif
 }
 
 static void
@@ -3509,6 +3504,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
 {
 	GtkBuilder *builder;
 	EShell *shell;
+	GtkWidget *container;
 	GtkWidget *widget, *label;
 	GtkEntryCompletion *completion;
 
@@ -3539,8 +3535,10 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
 
 	gtk_widget_ensure_style (widget);
 	gtk_window_set_type_hint (GTK_WINDOW (widget), GDK_WINDOW_TYPE_HINT_NORMAL);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (widget)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (widget)->action_area), 12);
+	container = gtk_dialog_get_action_area (GTK_DIALOG (widget));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 12);
+	container = gtk_dialog_get_content_area (GTK_DIALOG (widget));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 0);
 
 	init_all (e_contact_editor);
 
@@ -3938,9 +3936,12 @@ static void
 e_contact_editor_raise (EABEditor *editor)
 {
 	EContactEditor *ce = E_CONTACT_EDITOR (editor);
+	GdkWindow *window;
+
+	window = gtk_widget_get_window (ce->app);
 
-	if (GTK_WIDGET (ce->app)->window)
-		gdk_window_raise (GTK_WIDGET (ce->app)->window);
+	if (window != NULL)
+		gdk_window_raise (window);
 }
 
 /**
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 6a8a5fd19d..0feced4ca0 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -342,6 +342,7 @@ build_quick_add_dialog (QuickAdd *qa)
 {
 	ESourceList *source_list;
 	GConfClient *gconf_client;
+	GtkWidget *container;
 	GtkWidget *dialog;
 	GtkWidget *label;
 	GtkTable *table;
@@ -350,19 +351,21 @@ build_quick_add_dialog (QuickAdd *qa)
 
 	g_return_val_if_fail (qa != NULL, NULL);
 
-	dialog = gtk_dialog_new_with_buttons (_("Contact Quick-Add"),
-					      e_shell_get_active_window (NULL),
-					      GTK_DIALOG_NO_SEPARATOR,
-					      _("_Edit Full"), QUICK_ADD_RESPONSE_EDIT_FULL,
-					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					      GTK_STOCK_OK, GTK_RESPONSE_OK,
-					      NULL);
+	dialog = gtk_dialog_new_with_buttons (
+		_("Contact Quick-Add"),
+		e_shell_get_active_window (NULL),
+		GTK_DIALOG_NO_SEPARATOR,
+		_("_Edit Full"), QUICK_ADD_RESPONSE_EDIT_FULL,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OK, GTK_RESPONSE_OK,
+		NULL);
 
 	gtk_widget_ensure_style (dialog);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),
-					0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area),
-					12);
+
+	container = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 12);
+	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 0);
 
 	g_signal_connect (dialog, "response", G_CALLBACK (clicked_cb), qa);
 
@@ -460,11 +463,10 @@ build_quick_add_dialog (QuickAdd *qa)
 			  1, 2, 2, 3,
 			  GTK_EXPAND | GTK_FILL, 0, xpad, ypad);
 
-	gtk_container_set_border_width (GTK_CONTAINER (table),
-					12);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-			    GTK_WIDGET (table),
-			    FALSE, FALSE, 0);
+	gtk_container_set_border_width (GTK_CONTAINER (table), 12);
+	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_box_pack_start (
+		GTK_BOX (container), GTK_WIDGET (table), FALSE, FALSE, 0);
 	gtk_widget_show_all (GTK_WIDGET (table));
 
 	return dialog;
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c
index d6946e8341..17ac1c391c 100644
--- a/addressbook/gui/contact-editor/eab-editor.c
+++ b/addressbook/gui/contact-editor/eab-editor.c
@@ -164,8 +164,8 @@ eab_editor_class_init (EABEditorClass *class)
 		PROP_SHELL,
 		g_param_spec_object (
 			"shell",
-			_("Shell"),
-			_("The EShell singleton"),
+			"Shell",
+			"The EShell singleton",
 			E_TYPE_SHELL,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY));
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 23da590e72..dc2edd281b 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -210,6 +210,7 @@ contact_list_editor_book_loaded (EBook *new_book,
                                  EContactListEditor *editor)
 {
 	EContactListEditorPrivate *priv = editor->priv;
+	EContactStore *contact_store;
 	ENameSelectorEntry *entry;
 
 	priv->load_source_id = 0;
@@ -227,7 +228,8 @@ contact_list_editor_book_loaded (EBook *new_book,
 	}
 
 	entry = E_NAME_SELECTOR_ENTRY (WIDGET (EMAIL_ENTRY));
-	e_contact_store_add_book (entry->contact_store, new_book);
+	contact_store = e_name_selector_entry_peek_contact_store (entry);
+	e_contact_store_add_book (contact_store, new_book);
 	e_contact_list_editor_set_book (editor, new_book);
 	g_object_unref (new_book);
 }
@@ -439,6 +441,7 @@ contact_list_editor_drag_data_received_cb (GtkWidget *widget,
 	EContactListModel *model;
 	gboolean changed = FALSE;
 	gboolean handled = FALSE;
+	const guchar *data;
 	GList *list, *iter;
 	GdkAtom target;
 
@@ -451,7 +454,8 @@ contact_list_editor_drag_data_received_cb (GtkWidget *widget,
 	if (!e_targets_include_directory (&target, 1))
 		goto exit;
 
-	list = eab_contact_list_from_string ((gchar *) selection_data->data);
+	data = gtk_selection_data_get_data (selection_data);
+	list = eab_contact_list_from_string ((gchar *) data);
 
 	if (list != NULL)
 		handled = TRUE;
@@ -1088,7 +1092,10 @@ contact_list_editor_close (EABEditor *editor)
 static void
 contact_list_editor_raise (EABEditor *editor)
 {
-	gdk_window_raise (WIDGET (DIALOG)->window);
+	GdkWindow *window;
+
+	window = gtk_widget_get_window (WIDGET (DIALOG));
+	gdk_window_raise (window);
 }
 
 static void
@@ -1234,8 +1241,8 @@ contact_list_editor_class_init (EContactListEditorClass *class)
 		PROP_BOOK,
 		g_param_spec_object (
 			"book",
-			_("Book"),
-			/*_( */"XXX blurb" /*)*/,
+			"Book",
+			NULL,
 			E_TYPE_BOOK,
 			G_PARAM_READWRITE));
 
@@ -1244,8 +1251,8 @@ contact_list_editor_class_init (EContactListEditorClass *class)
 		PROP_CONTACT,
 		g_param_spec_object (
 			"contact",
-			_("Contact"),
-			/*_( */"XXX blurb" /*)*/,
+			"Contact",
+			NULL,
 			E_TYPE_CONTACT,
 			G_PARAM_READWRITE));
 
@@ -1254,8 +1261,8 @@ contact_list_editor_class_init (EContactListEditorClass *class)
 		PROP_IS_NEW_LIST,
 		g_param_spec_boolean (
 			"is_new_list",
-			_("Is New List"),
-			/*_( */"XXX blurb" /*)*/,
+			"Is New List",
+			NULL,
 			FALSE,
 			G_PARAM_READWRITE));
 
@@ -1264,8 +1271,8 @@ contact_list_editor_class_init (EContactListEditorClass *class)
 		PROP_EDITABLE,
 		g_param_spec_boolean (
 			"editable",
-			_("Editable"),
-			/*_( */"XXX blurb" /*)*/,
+			"Editable",
+			NULL,
 			FALSE,
 			G_PARAM_READWRITE));
 }
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
index e10c3ef765..01af6b2534 100644
--- a/addressbook/gui/merging/Makefile.am
+++ b/addressbook/gui/merging/Makefile.am
@@ -7,7 +7,8 @@ libeabbookmerging_la_CPPFLAGS =				\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/addressbook			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libeabbookmerging_la_SOURCES =			\
 	eab-contact-compare.c			\
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index a4659c7402..ec37972b46 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -173,12 +173,15 @@ cancelit (EContactMergingLookup *lookup)
 static void
 dialog_map (GtkWidget *window, GdkEvent *event, GtkWidget *table)
 {
+	GtkAllocation allocation;
 	gint h, w;
 
+	gtk_widget_get_allocation (table, &allocation);
+
 	/* Spacing around the table */
-	w = table->allocation.width + 30;
+	w = allocation.width + 30;
 	/* buttons and outer spacing */
-	h = table->allocation.height + 60;
+	h = allocation.height + 60;
 	if (w > 400)
 		w = 400;
 	if (h > 450)
@@ -204,6 +207,7 @@ static gint
 mergeit (EContactMergingLookup *lookup)
 {
 	GtkWidget *scrolled_window, *label, *hbox, *dropdown;
+	GtkWidget *content_area;
 	GtkDialog *dialog;
 	GtkTable *table;
 	EContactField field;
@@ -216,6 +220,8 @@ mergeit (EContactMergingLookup *lookup)
 	dialog = (GtkDialog *)(gtk_dialog_new_with_buttons (_("Merge Contact"), NULL, GTK_DIALOG_NO_SEPARATOR, NULL));
 	gtk_container_set_border_width (GTK_CONTAINER(dialog), 5);
 
+	content_area = gtk_dialog_get_content_area (dialog);
+
 	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
 					GTK_POLICY_AUTOMATIC,
@@ -355,7 +361,7 @@ mergeit (EContactMergingLookup *lookup)
 
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 420, 300);
 	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), GTK_WIDGET (table));
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), GTK_WIDGET (scrolled_window), TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (content_area), GTK_WIDGET (scrolled_window), TRUE, TRUE, 0);
 	gtk_widget_show (scrolled_window);
 	g_signal_connect (dialog, "map-event", G_CALLBACK (dialog_map), table);
 	gtk_widget_show_all ((GtkWidget *)table);
@@ -477,8 +483,9 @@ match_query_callback (EContact *contact, EContact *match, EABContactMatchType ty
 		doit (lookup, same_uids);
 	} else {
 		GtkBuilder *builder;
-
-		GtkWidget *widget, *merge_button;
+		GtkWidget *container;
+		GtkWidget *merge_button;
+		GtkWidget *widget;
 
 		/* XXX I think we're leaking the GtkBuilder. */
 		builder = gtk_builder_new ();
@@ -518,11 +525,16 @@ match_query_callback (EContact *contact, EContact *match, EABContactMatchType ty
 		widget = e_builder_get_widget (builder, "dialog-duplicate-contact");
 
 		gtk_widget_ensure_style (widget);
-		gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (widget)->vbox), 0);
-		gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (widget)->action_area), 12);
 
-		g_signal_connect (widget, "response",
-				  G_CALLBACK (response), lookup);
+		container = gtk_dialog_get_action_area (GTK_DIALOG (widget));
+		gtk_container_set_border_width (GTK_CONTAINER (container), 12);
+
+		container = gtk_dialog_get_content_area (GTK_DIALOG (widget));
+		gtk_container_set_border_width (GTK_CONTAINER (container), 0);
+
+		g_signal_connect (
+			widget, "response",
+			G_CALLBACK (response), lookup);
 
 		gtk_widget_show_all (widget);
 	}
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 4d40ced9e8..e323d3d8a5 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -509,7 +509,7 @@ addressbook_model_class_init (EAddressbookModelClass *class)
 		PROP_BOOK,
 		g_param_spec_object (
 			"book",
-			_("Book"),
+			"Book",
 			NULL,
 			E_TYPE_BOOK,
 			G_PARAM_READWRITE));
@@ -519,7 +519,7 @@ addressbook_model_class_init (EAddressbookModelClass *class)
 		PROP_EDITABLE,
 		g_param_spec_boolean (
 			"editable",
-			_("Editable"),
+			"Editable",
 			NULL,
 			FALSE,
 			G_PARAM_READWRITE));
@@ -529,7 +529,7 @@ addressbook_model_class_init (EAddressbookModelClass *class)
 		PROP_QUERY,
 		g_param_spec_string (
 			"query",
-			_("Query"),
+			"Query",
 			NULL,
 			NULL,
 			G_PARAM_READWRITE |
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 5928f51a74..127b63daa1 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -410,29 +410,29 @@ e_addressbook_reflow_adapter_class_init (GObjectClass *object_class)
 
 	g_object_class_install_property (object_class, PROP_BOOK,
 					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Book",
+							      NULL,
 							      E_TYPE_BOOK,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_QUERY,
 					 g_param_spec_string ("query",
-							      _("Query"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Query",
+							      NULL,
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_EDITABLE,
 					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Editable",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_MODEL,
 					 g_param_spec_object ("model",
-							       _("Model"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Model",
+							      NULL,
 							      E_TYPE_ADDRESSBOOK_MODEL,
 							      G_PARAM_READABLE));
 
diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c
index 3fcf8e8f8b..690ad007ba 100644
--- a/addressbook/gui/widgets/e-addressbook-selector.c
+++ b/addressbook/gui/widgets/e-addressbook-selector.c
@@ -295,7 +295,7 @@ addressbook_selector_data_dropped (ESourceSelector *selector,
 	priv = E_ADDRESSBOOK_SELECTOR_GET_PRIVATE (selector);
 	g_return_val_if_fail (priv->current_view != NULL, FALSE);
 
-	string = (const gchar *) selection_data->data;
+	string = (const gchar *) gtk_selection_data_get_data (selection_data);
 	remove_from_source = (action == GDK_ACTION_MOVE);
 
 	target_book = e_book_new (destination, NULL);
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index d3538899ba..88255fc0a9 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -241,6 +241,7 @@ table_drag_data_get (ETable *table,
 	EAddressbookModel *model;
 	EBook *book;
 	GList *contact_list;
+	GdkAtom target;
 	gchar *value;
 
 	if (!E_IS_ADDRESSBOOK_TABLE_ADAPTER (view->priv->object))
@@ -250,14 +251,15 @@ table_drag_data_get (ETable *table,
 	book = e_addressbook_model_get_book (model);
 
 	contact_list = e_addressbook_view_get_selected (view);
+	target = gtk_selection_data_get_target (selection_data);
 
 	switch (info) {
 		case DND_TARGET_TYPE_VCARD:
 			value = eab_contact_list_to_string (contact_list);
 
 			gtk_selection_data_set (
-				selection_data, selection_data->target,
-				8, (guchar *)value, strlen (value));
+				selection_data, target, 8,
+				(guchar *)value, strlen (value));
 
 			g_free (value);
 			break;
@@ -267,8 +269,8 @@ table_drag_data_get (ETable *table,
 				book, contact_list);
 
 			gtk_selection_data_set (
-				selection_data, selection_data->target,
-				8, (guchar *)value, strlen (value));
+				selection_data, target, 8,
+				(guchar *)value, strlen (value));
 
 			g_free (value);
 			break;
@@ -755,7 +757,7 @@ addressbook_view_class_init (EAddressbookViewClass *class)
 		PROP_MODEL,
 		g_param_spec_object (
 			"model",
-			_("Model"),
+			"Model",
 			NULL,
 			E_TYPE_ADDRESSBOOK_MODEL,
 			G_PARAM_READABLE));
@@ -771,7 +773,7 @@ addressbook_view_class_init (EAddressbookViewClass *class)
 		PROP_SHELL_VIEW,
 		g_param_spec_object (
 			"shell-view",
-			_("Shell View"),
+			"Shell View",
 			NULL,
 			E_TYPE_SHELL_VIEW,
 			G_PARAM_READWRITE |
@@ -782,7 +784,7 @@ addressbook_view_class_init (EAddressbookViewClass *class)
 		PROP_SOURCE,
 		g_param_spec_object (
 			"source",
-			_("Source"),
+			"Source",
 			NULL,
 			E_TYPE_SOURCE,
 			G_PARAM_READWRITE |
@@ -1150,11 +1152,12 @@ contact_print_button_draw_page (GtkPrintOperation *operation,
                                 EPrintable *printable)
 {
 	GtkPageSetup *setup;
-	gdouble top_margin;
+	gdouble top_margin, page_width;
 	cairo_t *cr;
 
 	setup = gtk_print_context_get_page_setup (context);
 	top_margin = gtk_page_setup_get_top_margin (setup, GTK_UNIT_POINTS);
+	page_width = gtk_page_setup_get_page_width (setup, GTK_UNIT_POINTS);
 
 	cr = gtk_print_context_get_cairo_context (context);
 
@@ -1162,8 +1165,9 @@ contact_print_button_draw_page (GtkPrintOperation *operation,
 
 	while (e_printable_data_left (printable)) {
 		cairo_save (cr);
+		contact_page_draw_footer(operation,context,page_nr++);
 		e_printable_print_page (
-			printable, context, 6.5 * 72, top_margin + 10, TRUE);
+			printable, context, page_width - 16, top_margin + 10, TRUE);
 		cairo_restore (cr);
 	}
 }
@@ -1503,18 +1507,25 @@ view_transfer_contacts (EAddressbookView *view,
 	GtkWindow *parent;
 
 	book = e_addressbook_model_get_book (view->priv->model);
+	parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view)));
 
 	if (all) {
 		EBookQuery *query;
+		GError *error = NULL;
 
 		query = e_book_query_any_field_contains ("");
-		e_book_get_contacts (book, query, &contacts, NULL);
+		e_book_get_contacts (book, query, &contacts, &error);
 		e_book_query_unref (query);
+
+		if (error) {
+			e_alert_run_dialog_for_args (parent, "addressbook:search-error", error->message, NULL);
+			g_error_free (error);
+			return;
+		}
 	} else {
 		contacts = e_addressbook_view_get_selected (view);
 	}
 
-	parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view)));
 	eab_transfer_contacts (book, contacts, delete_from_source, parent);
 
 	g_object_unref(book);
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 4107bb9be8..0eb166bcf3 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -112,57 +112,57 @@ e_minicard_label_class_init (EMinicardLabelClass *klass)
 
 	g_object_class_install_property (object_class, PROP_WIDTH,
 					 g_param_spec_double ("width",
-							      _("Width"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Width",
+							      NULL,
 							      0.0, G_MAXDOUBLE, 10.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HEIGHT,
 					 g_param_spec_double ("height",
-							      _("Height"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Height",
+							      NULL,
 							      0.0, G_MAXDOUBLE, 10.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HAS_FOCUS,
 					 g_param_spec_boolean ("has_focus",
-							       _("Has Focus"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Has Focus",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_FIELD,
 					 g_param_spec_string ("field",
-							      _("Field"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Field",
+							      NULL,
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_FIELDNAME,
 					 g_param_spec_string ("fieldname",
-							      _("Field Name"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Field Name",
+							      NULL,
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_TEXT_MODEL,
 					 g_param_spec_object ("text_model",
-							      _("Text Model"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Text Model",
+							      NULL,
 							      E_TYPE_TEXT_MODEL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_MAX_FIELD_NAME_WIDTH,
 					 g_param_spec_double ("max_field_name_length",
-							      _("Max field name length"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Max field name length",
+							      NULL,
 							      -1.0, G_MAXDOUBLE, -1.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_EDITABLE,
 					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Editable",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
@@ -414,9 +414,13 @@ e_minicard_label_resize_children(EMinicardLabel *e_minicard_label)
 static void
 set_colors (EMinicardLabel *label)
 {
-	if ((GTK_OBJECT_FLAGS( label ) & GNOME_CANVAS_ITEM_REALIZED)) {
-		GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (label)->canvas);
-		GtkStyle *style = gtk_widget_get_style (canvas);
+	if ((GTK_OBJECT_FLAGS (label) & GNOME_CANVAS_ITEM_REALIZED)) {
+		GnomeCanvas *canvas;
+		GtkStyle *style;
+
+		canvas = GNOME_CANVAS_ITEM (label)->canvas;
+		style = gtk_widget_get_style (GTK_WIDGET (canvas));
+
 		if (label->has_focus) {
 			gnome_canvas_item_set (label->rect,
 					       "outline_color_gdk", &style->mid[GTK_STATE_SELECTED],
@@ -424,11 +428,11 @@ set_colors (EMinicardLabel *label)
 					       NULL);
 
 			gnome_canvas_item_set (label->field,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
+					       "fill_color_gdk", &style->text[GTK_STATE_NORMAL],
 					       NULL);
 
 			gnome_canvas_item_set (label->fieldname,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
+					       "fill_color_gdk", &style->text[GTK_STATE_NORMAL],
 					       NULL);
 		}
 		else {
@@ -438,11 +442,11 @@ set_colors (EMinicardLabel *label)
 					       NULL);
 
 			gnome_canvas_item_set (label->field,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
+					       "fill_color_gdk", &style->text[GTK_STATE_NORMAL],
 					       NULL);
 
 			gnome_canvas_item_set (label->fieldname,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
+					       "fill_color_gdk", &style->text[GTK_STATE_NORMAL],
 					       NULL);
 		}
 	}
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index e6f9791731..7a78d83a42 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -116,29 +116,29 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *class)
 
 	g_object_class_install_property (object_class, PROP_BOOK,
 					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Book",
+							      NULL,
 							      E_TYPE_BOOK,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_QUERY,
 					 g_param_spec_string ("query",
-							      _("Query"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Query",
+							      NULL,
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_EDITABLE,
 					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Editable",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_COLUMN_WIDTH,
 					 g_param_spec_double ("column_width",
-							      _("Column Width"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Column Width",
+							      NULL,
 							      0.0, G_MAXDOUBLE, 150.0,
 							      G_PARAM_READWRITE));
 
@@ -361,11 +361,14 @@ static void
 e_minicard_view_widget_style_set (GtkWidget *widget, GtkStyle *previous_style)
 {
 	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
+	GtkStyle *style;
+
+	style = gtk_widget_get_style (widget);
 
 	if (view->background)
-		gnome_canvas_item_set (view->background,
-				       "fill_color_gdk", &widget->style->base[GTK_STATE_NORMAL],
-				       NULL );
+		gnome_canvas_item_set (
+			view->background, "fill_color_gdk",
+			&style->base[GTK_STATE_NORMAL], NULL);
 
 	if (GTK_WIDGET_CLASS(parent_class)->style_set)
 		GTK_WIDGET_CLASS(parent_class)->style_set (widget, previous_style);
@@ -420,11 +423,7 @@ e_minicard_view_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocatio
 	if (GTK_WIDGET_CLASS(parent_class)->size_allocate)
 		GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_get_realized (widget)) {
-#else
-	if (GTK_WIDGET_REALIZED(widget)) {
-#endif
 		gdouble width;
 		EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
 
@@ -447,15 +446,18 @@ e_minicard_view_widget_reflow(ECanvas *canvas)
 {
 	gdouble width;
 	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(canvas);
+	GtkAllocation allocation;
 
 	if (E_CANVAS_CLASS(parent_class)->reflow)
 		E_CANVAS_CLASS(parent_class)->reflow (canvas);
 
-	g_object_get(view->emv,
-		     "width", &width,
-		     NULL);
-	width = MAX(width, GTK_WIDGET(canvas)->allocation.width);
-	gnome_canvas_set_scroll_region(GNOME_CANVAS(canvas), 0, 0, width - 1, GTK_WIDGET(canvas)->allocation.height - 1);
+	g_object_get (view->emv, "width", &width, NULL);
+	gtk_widget_get_allocation (GTK_WIDGET (canvas), &allocation);
+
+	gnome_canvas_set_scroll_region (
+		GNOME_CANVAS(canvas), 0, 0,
+		MAX (width, allocation.width) - 1,
+		allocation.height - 1);
 }
 
 ESelectionModel *
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index ed8954adcd..b69f842d63 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -83,19 +83,22 @@ e_minicard_view_drag_data_get(GtkWidget *widget,
 			      guint time,
 			      EMinicardView *view)
 {
+	GdkAtom target;
+
 	if (!E_IS_MINICARD_VIEW(view))
 		return;
 
+	target = gtk_selection_data_get_target (selection_data);
+
 	switch (info) {
 	case DND_TARGET_TYPE_VCARD_LIST: {
 		gchar *value;
 
 		value = eab_contact_list_to_string (view->drag_list);
 
-		gtk_selection_data_set (selection_data,
-					selection_data->target,
-					8,
-					(guchar *)value, strlen (value));
+		gtk_selection_data_set (
+			selection_data, target, 8,
+			(guchar *) value, strlen (value));
 		g_free (value);
 		break;
 	}
@@ -106,10 +109,9 @@ e_minicard_view_drag_data_get(GtkWidget *widget,
 		g_object_get (view->adapter, "book", &book, NULL);
 		value = eab_book_and_contact_list_to_string (book, view->drag_list);
 
-		gtk_selection_data_set (selection_data,
-					selection_data->target,
-					8,
-					(guchar *)value, strlen (value));
+		gtk_selection_data_set (
+			selection_data, target, 8,
+			(guchar *) value, strlen (value));
 		g_free (value);
 		break;
 	}
@@ -524,29 +526,29 @@ e_minicard_view_class_init (EMinicardViewClass *klass)
 
 	g_object_class_install_property (object_class, PROP_ADAPTER,
 					 g_param_spec_object ("adapter",
-							      _("Adapter"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Adapter",
+							      NULL,
 							      E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_BOOK,
 					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Book",
+							      NULL,
 							      E_TYPE_BOOK,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_QUERY,
 					 g_param_spec_string ("query",
-							      _("Query"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Query",
+							      NULL,
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_EDITABLE,
 					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Editable",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 09a09730f5..213d600746 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -151,52 +151,52 @@ e_minicard_class_init (EMinicardClass *class)
 
 	g_object_class_install_property (object_class, PROP_WIDTH,
 					 g_param_spec_double ("width",
-							      _("Width"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Width",
+							      NULL,
 							      0.0, G_MAXDOUBLE, 10.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HEIGHT,
 					 g_param_spec_double ("height",
-							      _("Height"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Height",
+							      NULL,
 							      0.0, G_MAXDOUBLE, 10.0,
 							      G_PARAM_READABLE));
 
 	g_object_class_install_property (object_class, PROP_HAS_FOCUS,
 					 /* XXX should be _enum */
 					 g_param_spec_int ("has_focus",
-							   _("Has Focus"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Has Focus",
+							   NULL,
 							   E_MINICARD_FOCUS_TYPE_START, E_MINICARD_FOCUS_TYPE_END,
 							   E_MINICARD_FOCUS_TYPE_START,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_SELECTED,
 					 g_param_spec_boolean ("selected",
-							       _("Selected"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Selected",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HAS_CURSOR,
 					 g_param_spec_boolean ("has_cursor",
-							       _("Has Cursor"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Has Cursor",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_EDITABLE,
 					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Editable",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_CONTACT,
 					 g_param_spec_object ("contact",
-							      _("Contact"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Contact",
+							      NULL,
 							      E_TYPE_CONTACT,
 							      G_PARAM_READWRITE));
 
@@ -267,26 +267,31 @@ e_minicard_init (EMinicard *minicard)
 static void
 set_selected (EMinicard *minicard, gboolean selected)
 {
-	GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(minicard)->canvas);
+	GnomeCanvas *canvas;
+	GtkStyle *style;
+
+	canvas = GNOME_CANVAS_ITEM (minicard)->canvas;
+	style = gtk_widget_get_style (GTK_WIDGET (canvas));
+
 	if (selected) {
 		gnome_canvas_item_set (minicard->rect,
-				       "outline_color_gdk", &canvas->style->bg[GTK_STATE_ACTIVE],
+				       "outline_color_gdk", &style->bg[GTK_STATE_ACTIVE],
 				       NULL);
 		gnome_canvas_item_set (minicard->header_rect,
-				       "fill_color_gdk", &canvas->style->bg[GTK_STATE_SELECTED],
+				       "fill_color_gdk", &style->bg[GTK_STATE_SELECTED],
 				       NULL);
 		gnome_canvas_item_set (minicard->header_text,
-				       "fill_color_gdk", &canvas->style->text[GTK_STATE_SELECTED],
+				       "fill_color_gdk", &style->text[GTK_STATE_SELECTED],
 				       NULL);
 	} else {
 		gnome_canvas_item_set (minicard->rect,
 				       "outline_color", NULL,
 				       NULL);
 		gnome_canvas_item_set (minicard->header_rect,
-				       "fill_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL],
+				       "fill_color_gdk", &style->bg[GTK_STATE_NORMAL],
 				       NULL);
 		gnome_canvas_item_set (minicard->header_text,
-				       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
+				       "fill_color_gdk", &style->text[GTK_STATE_NORMAL],
 				       NULL);
 	}
 	minicard->selected = selected;
@@ -471,11 +476,14 @@ e_minicard_realize (GnomeCanvasItem *item)
 {
 	EMinicard *e_minicard;
 	GnomeCanvasGroup *group;
-	GtkWidget *canvas;
+	GnomeCanvas *canvas;
+	GtkStyle *style;
 
 	e_minicard = E_MINICARD (item);
-	group = GNOME_CANVAS_GROUP( item );
-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas);
+	group = GNOME_CANVAS_GROUP (item);
+
+	canvas = GNOME_CANVAS_ITEM (item)->canvas;
+	style = gtk_widget_get_style (GTK_WIDGET (canvas));
 
 	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->realize)
 		(* GNOME_CANVAS_ITEM_CLASS(parent_class)->realize) (item);
@@ -497,7 +505,7 @@ e_minicard_realize (GnomeCanvasItem *item)
 				 "y1", (double) 2,
 				 "x2", (double) MAX (e_minicard->width - 3, 0),
 				 "y2", (double) MAX (e_minicard->height - 3, 0),
-				 "fill_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL],
+				 "fill_color_gdk", &style->bg[GTK_STATE_NORMAL],
 				 NULL );
 
 	e_minicard->header_text =
@@ -507,7 +515,7 @@ e_minicard_realize (GnomeCanvasItem *item)
 				 "width", (double) MAX( e_minicard->width - 12, 0 ),
 				 "clip", TRUE,
 				 "use_ellipsis", TRUE,
-				 "fill_color_gdk", &canvas->style->fg[GTK_STATE_NORMAL],
+				 "fill_color_gdk", &style->fg[GTK_STATE_NORMAL],
 				 "text", "",
 				 "draw_background", FALSE,
 				 NULL );
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index dda6081137..8c0e37fccc 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -984,31 +984,11 @@ contact_display_url_requested (GtkHTML *html,
 }
 
 static void
-contact_display_link_clicked (GtkHTML *html,
-                              const gchar *uri)
-{
-	EABContactDisplay *display;
-	gsize length;
-
-	display = EAB_CONTACT_DISPLAY (html);
-
-	length = strlen ("internal-mailto:");
-	if (g_ascii_strncasecmp (uri, "internal-mailto:", length) == 0) {
-		gint index;
-
-		index = atoi (uri + length);
-		contact_display_emit_send_message (display, index);
-		return;
-	}
-
-	/* Chain up to parent's link_clicked() method. */
-	GTK_HTML_CLASS (parent_class)->link_clicked (html, uri);
-}
-
-static void
-contact_display_on_url (GtkHTML *html,
-                        const gchar *uri)
+contact_display_hovering_over_link (EWebView *web_view,
+                                    const gchar *title,
+                                    const gchar *uri)
 {
+	EWebViewClass *web_view_class;
 	EABContactDisplay *display;
 	EContact *contact;
 	const gchar *name;
@@ -1020,7 +1000,7 @@ contact_display_on_url (GtkHTML *html,
 	if (!g_str_has_prefix (uri, "internal-mailto:"))
 		goto chainup;
 
-	display = EAB_CONTACT_DISPLAY (html);
+	display = EAB_CONTACT_DISPLAY (web_view);
 	contact = eab_contact_display_get_contact (display);
 
 	name = e_contact_get_const (contact, E_CONTACT_FILE_AS);
@@ -1029,14 +1009,37 @@ contact_display_on_url (GtkHTML *html,
 	g_return_if_fail (name != NULL);
 
 	message = g_strdup_printf (_("Click to mail %s"), name);
-	e_web_view_status_message (E_WEB_VIEW (html), message);
+	e_web_view_status_message (web_view, message);
 	g_free (message);
 
 	return;
 
 chainup:
-	/* Chain up to parent's on_url() method. */
-	GTK_HTML_CLASS (parent_class)->on_url (html, uri);
+	/* Chain up to parent's hovering_over_link() method. */
+	web_view_class = E_WEB_VIEW_CLASS (parent_class);
+	web_view_class->hovering_over_link (web_view, title, uri);
+}
+
+static void
+contact_display_link_clicked (EWebView *web_view,
+                              const gchar *uri)
+{
+	EABContactDisplay *display;
+	gsize length;
+
+	display = EAB_CONTACT_DISPLAY (web_view);
+
+	length = strlen ("internal-mailto:");
+	if (g_ascii_strncasecmp (uri, "internal-mailto:", length) == 0) {
+		gint index;
+
+		index = atoi (uri + length);
+		contact_display_emit_send_message (display, index);
+		return;
+	}
+
+	/* Chain up to parent's link_clicked() method. */
+	E_WEB_VIEW_CLASS (parent_class)->link_clicked (web_view, uri);
 }
 
 static void
@@ -1086,10 +1089,10 @@ eab_contact_display_class_init (EABContactDisplayClass *class)
 
 	html_class = GTK_HTML_CLASS (class);
 	html_class->url_requested = contact_display_url_requested;
-	html_class->link_clicked = contact_display_link_clicked;
-	html_class->on_url = contact_display_on_url;
 
 	web_view_class = E_WEB_VIEW_CLASS (class);
+	web_view_class->hovering_over_link = contact_display_hovering_over_link;
+	web_view_class->link_clicked = contact_display_link_clicked;
 	web_view_class->update_actions = contact_display_update_actions;
 
 	g_object_class_install_property (
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 0a159da304..d127d50786 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -43,7 +43,7 @@
 #include "eab-contact-merging.h"
 
 /* we link to camel for decoding quoted printable email addresses */
-#include <camel/camel-mime-utils.h>
+#include <camel/camel.h>
 
 #include "addressbook/util/addressbook.h"
 
@@ -234,6 +234,7 @@ eab_select_source (ESource *except_source, const gchar *title, const gchar *mess
 {
 	ESource *source;
 	ESourceList *source_list;
+	GtkWidget *content_area;
 	GtkWidget *dialog;
 	GtkWidget *ok_button;
 	/* GtkWidget *label; */
@@ -272,8 +273,8 @@ eab_select_source (ESource *except_source, const gchar *title, const gchar *mess
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
 	gtk_container_add (GTK_CONTAINER (scrolled_window), selector);
 
-	/* gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, FALSE, FALSE, 4); */
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scrolled_window, TRUE, TRUE, 4);
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_box_pack_start (GTK_BOX (content_area), scrolled_window, TRUE, TRUE, 4);
 
 	gtk_widget_show_all (dialog);
 	response = gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index 7ccc4c7545..742f46a334 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -7,6 +7,7 @@ libevolution_addressbook_importers_la_CPPFLAGS =	\
 	-DG_LOG_DOMAIN=\"Evolution-Importer\"		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook			\
+	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/addressbook			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
@@ -21,6 +22,7 @@ libevolution_addressbook_importers_la_LDFLAGS = $(NO_UNDEFINED)
 libevolution_addressbook_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la 				\
 	$(top_builddir)/addressbook/util/libeabutil.la			\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(IMPORTERS_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/addressbook/importers/evolution-addressbook-importers.h b/addressbook/importers/evolution-addressbook-importers.h
index 747fe4281d..adaa62931a 100644
--- a/addressbook/importers/evolution-addressbook-importers.h
+++ b/addressbook/importers/evolution-addressbook-importers.h
@@ -23,3 +23,6 @@ struct _EImportImporter *evolution_vcard_importer_peek(void);
 struct _EImportImporter *evolution_csv_outlook_importer_peek(void);
 struct _EImportImporter *evolution_csv_mozilla_importer_peek(void);
 struct _EImportImporter *evolution_csv_evolution_importer_peek(void);
+
+/* private utility function for importers only */
+struct _GtkWidget *evolution_contact_importer_get_preview_widget (const GList *contacts);
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index 6a12d7075a..9ad939dea9 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -762,17 +762,26 @@ csv_import (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	CSVImporter *gci;
 	EBook *book;
+	gchar *filename;
 	FILE *file;
 	EImportTargetURI *s = (EImportTargetURI *) target;
 
+	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
+	if (filename == NULL) {
+		g_message (G_STRLOC ": Couldn't get filename from URI '%s'", s->uri_src);
+		return;
+	}
+
 	book = e_book_new(g_datalist_get_data(&target->data, "csv-source"), NULL);
 	if (book == NULL) {
 		g_message("Couldn't Create EBook");
 		e_import_complete(ei, target);
+		g_free (filename);
 		return;
 	}
 
-	file = g_fopen (g_filename_from_uri(s->uri_src, NULL, NULL), "r");
+	file = g_fopen (filename, "r");
+	g_free (filename);
 	if (file == NULL) {
 		g_message("Can't open .csv file");
 		e_import_complete(ei, target);
@@ -825,6 +834,73 @@ csv_cancel(EImport *ei, EImportTarget *target, EImportImporter *im) {
 		gci->state = 1;
 }
 
+static GtkWidget *
+csv_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+{
+	GtkWidget *preview;
+	GList *contacts = NULL;
+	EContact *contact;
+	EImportTargetURI *s = (EImportTargetURI *)target;
+	gchar *filename;
+	FILE *file;
+	CSVImporter *gci;
+
+	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
+	if (filename == NULL) {
+		g_message (G_STRLOC ": Couldn't get filename from URI '%s'", s->uri_src);
+		return NULL;
+	}
+
+	file = g_fopen (filename, "r");
+	g_free (filename);
+	if (file == NULL) {
+		g_message (G_STRLOC ": Can't open .csv file");
+		return NULL;
+	}
+
+	gci = g_malloc0 (sizeof (*gci));
+	gci->file = file;
+	gci->count = 0;
+	fseek(file, 0, SEEK_END);
+	gci->size = ftell (file);
+	fseek (file, 0, SEEK_SET);
+
+	while (contact = getNextCSVEntry (gci, gci->file), contact != NULL) {
+		contacts = g_list_prepend (contacts, contact);
+	}
+
+	contacts = g_list_reverse (contacts);
+	preview = evolution_contact_importer_get_preview_widget (contacts);
+
+	g_list_foreach (contacts, (GFunc) g_object_unref, NULL);
+	g_list_free (contacts);
+	fclose (file);
+	g_free (gci);
+
+	return preview;
+}
+
+static GtkWidget *
+outlook_csv_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+{
+	importer = OUTLOOK_IMPORTER;
+	return csv_get_preview (ei, target, im);
+}
+
+static GtkWidget *
+mozilla_csv_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+{
+	importer = MOZILLA_IMPORTER;
+	return csv_get_preview (ei, target, im);
+}
+
+static GtkWidget *
+evolution_csv_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+{
+	importer = EVOLUTION_IMPORTER;
+	return csv_get_preview (ei, target, im);
+}
+
 static EImportImporter csv_outlook_importer = {
 	E_IMPORT_TARGET_URI,
 	0,
@@ -832,6 +908,7 @@ static EImportImporter csv_outlook_importer = {
 	csv_getwidget,
 	outlook_csv_import,
 	csv_cancel,
+	outlook_csv_get_preview,
 };
 
 static EImportImporter csv_mozilla_importer = {
@@ -841,6 +918,7 @@ static EImportImporter csv_mozilla_importer = {
 	csv_getwidget,
 	mozilla_csv_import,
 	csv_cancel,
+	mozilla_csv_get_preview,
 };
 
 static EImportImporter csv_evolution_importer = {
@@ -850,6 +928,7 @@ static EImportImporter csv_evolution_importer = {
 	csv_getwidget,
 	evolution_csv_import,
 	csv_cancel,
+	evolution_csv_get_preview,
 };
 
 EImportImporter *
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index cfc363756d..0e6b707426 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -221,7 +221,7 @@ populate_contact_address (EContactAddress *address, gchar *attr, gchar *value)
 }
 
 static gboolean
-parseLine (LDIFImporter *gci, EContact *contact,
+parseLine (GHashTable *dn_contact_hash, EContact *contact,
 	   EContactAddress *work_address, EContactAddress *home_address,
 	   gchar **buf)
 {
@@ -307,7 +307,7 @@ parseLine (LDIFImporter *gci, EContact *contact,
 		if (!field_handled) {
 			if (!g_ascii_strcasecmp (ptr, "dn"))
 				g_hash_table_insert (
-					gci->dn_contact_hash,
+					dn_contact_hash,
 					g_strdup (ldif_value->str), contact);
 			else if (!g_ascii_strcasecmp (ptr, "objectclass") &&
 				!g_ascii_strcasecmp (ldif_value->str, "groupofnames")) {
@@ -342,7 +342,7 @@ parseLine (LDIFImporter *gci, EContact *contact,
 }
 
 static EContact *
-getNextLDIFEntry(LDIFImporter *gci, FILE *f )
+getNextLDIFEntry(GHashTable *dn_contact_hash, FILE *f )
 {
 	EContact *contact;
 	EContactAddress *work_address, *home_address;
@@ -372,7 +372,7 @@ getNextLDIFEntry(LDIFImporter *gci, FILE *f )
 
 	buf = str->str;
 	while (buf) {
-		if (!parseLine (gci, contact, work_address, home_address, &buf)) {
+		if (!parseLine (dn_contact_hash, contact, work_address, home_address, &buf)) {
 			/* parsing error */
 			g_string_free (str, TRUE);
 			e_contact_address_free (work_address);
@@ -480,7 +480,7 @@ ldif_import_contacts(gpointer d)
 	   ones till the end */
 
 	if (gci->state == 0) {
-		while (count < 50 && (contact = getNextLDIFEntry(gci, gci->file))) {
+		while (count < 50 && (contact = getNextLDIFEntry(gci->dn_contact_hash, gci->file))) {
 			if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
 				gci->list_contacts = g_slist_prepend(gci->list_contacts, contact);
 			} else {
@@ -674,6 +674,58 @@ ldif_cancel(EImport *ei, EImportTarget *target, EImportImporter *im)
 		gci->state = 2;
 }
 
+static GtkWidget *
+ldif_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+{
+	GtkWidget *preview;
+	GList *contacts = NULL;
+	EContact *contact;
+	EImportTargetURI *s = (EImportTargetURI *)target;
+	gchar *filename;
+	GHashTable *dn_contact_hash;
+	FILE *file;
+
+	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
+	if (filename == NULL) {
+		g_message (G_STRLOC ": Couldn't get filename from URI '%s'", s->uri_src);
+		return NULL;
+	}
+
+	file = g_fopen(filename, "r");
+	g_free (filename);
+
+	if (file == NULL) {
+		g_message (G_STRLOC ": Can't open .ldif file");
+		return NULL;
+	}
+
+	dn_contact_hash = g_hash_table_new_full (
+		g_str_hash, g_str_equal,
+		(GDestroyNotify) g_free,
+		(GDestroyNotify) NULL);
+
+	while (contact = getNextLDIFEntry (dn_contact_hash, file), contact != NULL) {
+		if (!e_contact_get (contact, E_CONTACT_IS_LIST)) {
+			add_to_notes(contact, E_CONTACT_OFFICE);
+			add_to_notes(contact, E_CONTACT_SPOUSE);
+			add_to_notes(contact, E_CONTACT_BLOG_URL);
+		}
+
+		contacts = g_list_prepend (contacts, contact);
+	}
+
+	g_hash_table_destroy (dn_contact_hash);
+
+	contacts = g_list_reverse (contacts);
+	preview = evolution_contact_importer_get_preview_widget (contacts);
+
+	g_list_foreach (contacts, (GFunc) g_object_unref, NULL);
+	g_list_free (contacts);
+	fclose (file);
+
+	return preview;
+}
+
 static EImportImporter ldif_importer = {
 	E_IMPORT_TARGET_URI,
 	0,
@@ -681,6 +733,7 @@ static EImportImporter ldif_importer = {
 	ldif_getwidget,
 	ldif_import,
 	ldif_cancel,
+	ldif_get_preview,
 };
 
 EImportImporter *
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index 080ef940f2..59aba913d2 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -42,6 +42,8 @@
 #include <libebook/e-destination.h>
 
 #include "e-util/e-import.h"
+#include "e-util/e-datetime-format.h"
+#include "misc/e-web-view-preview.h"
 
 #include "evolution-addressbook-importers.h"
 
@@ -550,6 +552,61 @@ vcard_cancel(EImport *ei, EImportTarget *target, EImportImporter *im)
 		gci->state = 1;
 }
 
+static GtkWidget *
+vcard_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+{
+	GtkWidget *preview;
+	GList *contacts;
+	gchar *contents;
+	VCardEncoding encoding;
+	EImportTargetURI *s = (EImportTargetURI *)target;
+	gchar *filename;
+
+	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
+	if (filename == NULL) {
+		g_message (G_STRLOC ": Couldn't get filename from URI '%s'", s->uri_src);
+		return NULL;
+	}
+
+	encoding = guess_vcard_encoding (filename);
+	if (encoding == VCARD_ENCODING_NONE) {
+		g_free (filename);
+		return NULL;
+	}
+
+	if (!g_file_get_contents (filename, &contents, NULL, NULL)) {
+		g_message (G_STRLOC ": Couldn't read file.");
+		g_free (filename);
+		return NULL;
+	}
+
+	g_free (filename);
+
+	if (encoding == VCARD_ENCODING_UTF16) {
+		gchar *tmp;
+
+		gunichar2 *contents_utf16 = (gunichar2 *) contents;
+		tmp = utf16_to_utf8 (contents_utf16);
+		g_free (contents);
+		contents = tmp;
+	} else if (encoding == VCARD_ENCODING_LOCALE) {
+		gchar *tmp;
+		tmp = g_locale_to_utf8 (contents, -1, NULL, NULL, NULL);
+		g_free (contents);
+		contents = tmp;
+	}
+
+	contacts = eab_contact_list_from_string (contents);
+	g_free (contents);
+
+	preview = evolution_contact_importer_get_preview_widget (contacts);
+
+	g_list_foreach (contacts, (GFunc) g_object_unref, NULL);
+	g_list_free (contacts);
+
+	return preview;
+}
+
 static EImportImporter vcard_importer = {
 	E_IMPORT_TARGET_URI,
 	0,
@@ -557,6 +614,7 @@ static EImportImporter vcard_importer = {
 	vcard_getwidget,
 	vcard_import,
 	vcard_cancel,
+	vcard_get_preview,
 };
 
 EImportImporter *
@@ -567,3 +625,305 @@ evolution_vcard_importer_peek(void)
 
 	return &vcard_importer;
 }
+
+/* utility functions shared between all contact importers */
+static void
+preview_contact (EWebViewPreview *preview, EContact *contact)
+{
+	gint idx;
+	gboolean had_value = FALSE;
+
+	const gint fields[] = {
+		E_CONTACT_FILE_AS,
+		E_CONTACT_CATEGORIES,
+
+		E_CONTACT_IS_LIST,
+		E_CONTACT_LIST_SHOW_ADDRESSES,
+		E_CONTACT_WANTS_HTML,
+
+		E_CONTACT_FULL_NAME,
+		E_CONTACT_GIVEN_NAME,
+		E_CONTACT_FAMILY_NAME,
+		E_CONTACT_NICKNAME,
+		E_CONTACT_SPOUSE,
+		E_CONTACT_BIRTH_DATE,
+		E_CONTACT_ANNIVERSARY,
+		E_CONTACT_MAILER,
+		E_CONTACT_EMAIL,
+
+		-1,
+
+		E_CONTACT_ORG,
+		E_CONTACT_ORG_UNIT,
+		E_CONTACT_OFFICE,
+		E_CONTACT_TITLE,
+		E_CONTACT_ROLE,
+		E_CONTACT_MANAGER,
+		E_CONTACT_ASSISTANT,
+
+		-1,
+
+		E_CONTACT_PHONE_ASSISTANT,
+		E_CONTACT_PHONE_BUSINESS,
+		E_CONTACT_PHONE_BUSINESS_2,
+		E_CONTACT_PHONE_BUSINESS_FAX,
+		E_CONTACT_PHONE_CALLBACK,
+		E_CONTACT_PHONE_CAR,
+		E_CONTACT_PHONE_COMPANY,
+		E_CONTACT_PHONE_HOME,
+		E_CONTACT_PHONE_HOME_2,
+		E_CONTACT_PHONE_HOME_FAX,
+		E_CONTACT_PHONE_ISDN,
+		E_CONTACT_PHONE_MOBILE,
+		E_CONTACT_PHONE_OTHER,
+		E_CONTACT_PHONE_OTHER_FAX,
+		E_CONTACT_PHONE_PAGER,
+		E_CONTACT_PHONE_PRIMARY,
+		E_CONTACT_PHONE_RADIO,
+		E_CONTACT_PHONE_TELEX,
+		E_CONTACT_PHONE_TTYTDD,
+
+		-1,
+
+		E_CONTACT_ADDRESS_HOME,
+		E_CONTACT_ADDRESS_WORK,
+		E_CONTACT_ADDRESS_OTHER,
+
+		-1,
+
+		E_CONTACT_HOMEPAGE_URL,
+		E_CONTACT_BLOG_URL,
+		E_CONTACT_CALENDAR_URI,
+		E_CONTACT_FREEBUSY_URL,
+		E_CONTACT_ICS_CALENDAR,
+		E_CONTACT_VIDEO_URL,
+
+		-1,
+
+		E_CONTACT_IM_AIM,
+		E_CONTACT_IM_GROUPWISE,
+		E_CONTACT_IM_JABBER,
+		E_CONTACT_IM_YAHOO,
+		E_CONTACT_IM_MSN,
+		E_CONTACT_IM_ICQ,
+		E_CONTACT_IM_GADUGADU,
+		E_CONTACT_IM_SKYPE,
+
+		-1,
+
+		E_CONTACT_NOTE
+	};
+
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (contact != NULL);
+
+	for (idx = 0; idx < G_N_ELEMENTS (fields); idx++) {
+		EContactField field;
+
+		if (fields[idx] == -1) {
+			if (had_value)
+				e_web_view_preview_add_empty_line (preview);
+			had_value = FALSE;
+			continue;
+		}
+
+		field = fields[idx];
+
+		if (field == E_CONTACT_BIRTH_DATE || field == E_CONTACT_ANNIVERSARY) {
+			EContactDate *dt = e_contact_get (contact, field);
+			if (dt) {
+				GDate gd = { 0 };
+				struct tm tm;
+				gchar *value;
+
+				g_date_set_dmy (&gd, dt->day, dt->month, dt->year);
+				g_date_to_struct_tm (&gd, &tm);
+
+				value = e_datetime_format_format_tm ("addressbook", "table", DTFormatKindDate, &tm);
+				if (value) {
+					e_web_view_preview_add_section (preview, e_contact_pretty_name (field), value);
+					had_value = TRUE;
+				}
+
+				g_free (value);
+				e_contact_date_free (dt);
+			}
+		} else if (field == E_CONTACT_IS_LIST || field == E_CONTACT_WANTS_HTML || field == E_CONTACT_LIST_SHOW_ADDRESSES) {
+			if (e_contact_get (contact, field)) {
+				e_web_view_preview_add_text (preview, e_contact_pretty_name (field));
+				had_value = TRUE;
+			}
+		} else if (field == E_CONTACT_ADDRESS_HOME || field == E_CONTACT_ADDRESS_WORK || field == E_CONTACT_ADDRESS_OTHER) {
+			EContactAddress *addr = e_contact_get (contact, field);
+			if (addr) {
+				gboolean have = FALSE;
+
+				#define add_it(_what)	\
+					if (addr->_what && *addr->_what) {	\
+						e_web_view_preview_add_section (preview, have ? NULL : e_contact_pretty_name (field), addr->_what);	\
+						have = TRUE;	\
+						had_value = TRUE;	\
+					}
+
+				add_it (po);
+				add_it (ext);
+				add_it (street);
+				add_it (locality);
+				add_it (region);
+				add_it (code);
+				add_it (country);
+
+				#undef add_it
+
+				e_contact_address_free (addr);
+			}
+		} else if (field == E_CONTACT_IM_AIM || field == E_CONTACT_IM_GROUPWISE ||
+			   field == E_CONTACT_IM_JABBER || field == E_CONTACT_IM_YAHOO ||
+			   field == E_CONTACT_IM_MSN || field == E_CONTACT_IM_ICQ ||
+			   field == E_CONTACT_IM_GADUGADU || field == E_CONTACT_IM_SKYPE ||
+			   field == E_CONTACT_EMAIL) {
+			GList *attrs, *a;
+			gboolean have = FALSE;
+
+			attrs = e_contact_get_attributes (contact, field);
+			for (a = attrs; a; a = a->next) {
+				EVCardAttribute *attr = a->data;
+				GList *value;
+
+				if (!attr)
+					continue;
+
+				for (value = e_vcard_attribute_get_values (attr); value; value = value->next) {
+					const gchar *str = value->data;
+
+					if (str && *str) {
+						e_web_view_preview_add_section (preview, have ? NULL : e_contact_pretty_name (field), str);
+						have = TRUE;
+						had_value = TRUE;
+					}
+				}
+				e_vcard_attribute_free (attr);
+			}
+
+			g_list_free (attrs);
+		} else if (field == E_CONTACT_CATEGORIES) {
+			gchar *value = e_contact_get (contact, field);
+
+			if (value && *value) {
+				e_web_view_preview_add_section (preview, e_contact_pretty_name (field), value);
+				had_value = TRUE;
+			}
+
+			g_free (value);
+		} else {
+			const gchar *value = e_contact_get_const (contact, field);
+
+			if (value && *value) {
+				e_web_view_preview_add_section (preview, e_contact_pretty_name (field), value);
+				had_value = TRUE;
+			}
+		}
+	}
+}
+
+static void
+preview_selection_changed_cb (GtkTreeSelection *selection, EWebViewPreview *preview)
+{
+	GtkTreeIter iter;
+	GtkTreeModel *model = NULL;
+
+	g_return_if_fail (selection != NULL);
+	g_return_if_fail (preview != NULL);
+
+	e_web_view_preview_begin_update (preview);
+
+	if (gtk_tree_selection_get_selected (selection, &model, &iter) && model) {
+		EContact *contact = NULL;
+
+		gtk_tree_model_get (model, &iter, 1, &contact, -1);
+
+		if (contact) {
+			preview_contact (preview, contact);
+			g_object_unref (contact);
+		}
+	}
+
+	e_web_view_preview_end_update (preview);
+}
+
+GtkWidget *
+evolution_contact_importer_get_preview_widget (const GList *contacts)
+{
+	GtkWidget *preview;
+	GtkTreeView *tree_view;
+	GtkTreeSelection *selection;
+	GtkListStore *store;
+	GtkTreeIter iter;
+	const GList *c;
+
+	if (!contacts)
+		return NULL;
+
+	store = gtk_list_store_new (2, G_TYPE_STRING, E_TYPE_CONTACT);
+
+	for (c = contacts; c; c = c->next) {
+		const gchar *description;
+		gchar *free_description = NULL;
+		EContact *contact = (EContact *) c->data;
+
+		if (!contact || !E_IS_CONTACT (contact))
+			continue;
+
+		description = e_contact_get_const (contact, E_CONTACT_FILE_AS);
+		if (!description)
+			description = e_contact_get_const (contact, E_CONTACT_UID);
+		if (!description)
+			description = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
+		if (!description) {
+			description = e_contact_get_const (contact, E_CONTACT_EMAIL_1);
+			if (description) {
+				const gchar *at = strchr (description, '@');
+				if (at) {
+					free_description = g_strndup (description, (gsize)(at - description));
+					description = free_description;
+				}
+			}
+		}
+
+		gtk_list_store_append (store, &iter);
+		gtk_list_store_set (store, &iter,
+			0, description ? description : "",
+			1, contact,
+			-1 );
+
+		g_free (free_description);
+	}
+
+	if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)) {
+		g_object_unref (store);
+		return NULL;
+	}
+
+	preview = e_web_view_preview_new ();
+	gtk_widget_show (preview);
+
+	tree_view = e_web_view_preview_get_tree_view (E_WEB_VIEW_PREVIEW (preview));
+	g_return_val_if_fail (tree_view != NULL, NULL);
+
+	gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (store));
+	g_object_unref (store);
+
+	gtk_tree_view_insert_column_with_attributes (tree_view, -1, _("Contact"),
+		gtk_cell_renderer_text_new (), "text", 0, NULL);
+
+	if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) > 1)
+		e_web_view_preview_show_tree_view (E_WEB_VIEW_PREVIEW (preview));
+
+	selection = gtk_tree_view_get_selection (tree_view);
+	gtk_tree_selection_select_iter (selection, &iter);
+	g_signal_connect (selection, "changed", G_CALLBACK (preview_selection_changed_cb), preview);
+
+	preview_selection_changed_cb (selection, E_WEB_VIEW_PREVIEW (preview));
+
+	return preview;
+}
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 93b76bff20..eca65221be 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -121,6 +121,7 @@ e_contact_output (GtkPrintContext *context,
 	pango_layout_set_text (layout, text, -1);
 	pango_layout_set_width (layout, pango_units_from_double (width));
 	pango_layout_set_indent (layout, pango_units_from_double (indent));
+	pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
 
 	cr = gtk_print_context_get_cairo_context (context);
 
@@ -217,12 +218,78 @@ e_contact_start_new_page (EContactPrintContext *ctxt)
 }
 
 static void
+e_contact_start_new_column (EContactPrintContext *ctxt)
+{
+	if (++ctxt->column >= ctxt->style->num_columns)
+		e_contact_start_new_page (ctxt);
+	else {
+		ctxt->x = ctxt->column *
+			(ctxt->column_width + ctxt->column_spacing);
+		ctxt->y = .0;
+	}
+}
+
+static gdouble
+e_contact_get_contact_height (EContact *contact, EContactPrintContext *ctxt)
+{
+	GtkPageSetup *setup;
+	gchar *file_as;
+	gdouble page_height;
+	gint field;
+	gdouble cntct_height = 0.0;
+
+	setup = gtk_print_context_get_page_setup (ctxt->context);
+	page_height = gtk_page_setup_get_page_height (setup, GTK_UNIT_POINTS);
+
+	cntct_height += get_font_height (ctxt->style->headings_font) * .2;
+
+	file_as = e_contact_get (contact, E_CONTACT_FILE_AS);
+
+	cntct_height += e_contact_text_height (
+		ctxt->context, ctxt->style->headings_font, file_as);
+
+	g_free (file_as);
+
+	cntct_height += get_font_height (ctxt->style->headings_font) * .2;
+
+	for (field = E_CONTACT_FILE_AS; field != E_CONTACT_LAST_SIMPLE_STRING; field++)
+	{
+		const gchar *value;
+		gchar *text;
+
+		value = e_contact_get_const (contact, field);
+		if (value == NULL || *value == '\0')
+			continue;
+
+		text = g_strdup_printf ("%s:  %s",
+			e_contact_pretty_name (field), value);
+
+		cntct_height += e_contact_text_height (
+			ctxt->context, ctxt->style->body_font, text);
+
+		cntct_height += .2 * get_font_height (ctxt->style->body_font);
+
+		g_free (text);
+	}
+
+	cntct_height += get_font_height (ctxt->style->headings_font) * .4 + 8;
+
+	return cntct_height;
+}
+
+
+static void
 e_contact_print_contact (EContact *contact, EContactPrintContext *ctxt)
 {
+	GtkPageSetup *setup;
 	gchar *file_as;
 	cairo_t *cr;
+	gdouble page_height;
 	gint field;
 
+	setup = gtk_print_context_get_page_setup (ctxt->context);
+	page_height = gtk_page_setup_get_page_height (setup, GTK_UNIT_POINTS);
+
 	cr = gtk_print_context_get_cairo_context (ctxt->context);
 	cairo_save(cr);
 	ctxt->y += get_font_height (ctxt->style->headings_font) * .2;
@@ -254,6 +321,10 @@ e_contact_print_contact (EContact *contact, EContactPrintContext *ctxt)
 	{
 		const gchar *value;
 		gchar *text;
+		gint wrapped_lines=0;
+
+		if (ctxt->y > page_height)
+			e_contact_start_new_column (ctxt);
 
 		value = e_contact_get_const (contact, field);
 		if (value == NULL || *value == '\0')
@@ -265,10 +336,12 @@ e_contact_print_contact (EContact *contact, EContactPrintContext *ctxt)
 		if (ctxt->pages == ctxt->page_nr)
 			e_contact_output (
 				ctxt->context, ctxt->style->body_font,
-				ctxt->x, ctxt->y, -1, text);
+				ctxt->x, ctxt->y, ctxt->column_width + 4, text);
 
-		ctxt->y += e_contact_text_height (
-			ctxt->context, ctxt->style->body_font, text);
+		if ( get_font_width (ctxt->context, ctxt->style->body_font, text) > ctxt->column_width)
+			wrapped_lines =  ( get_font_width (ctxt->context, ctxt->style->body_font, text) / (ctxt->column_width+4)) + 1;
+		ctxt->y = ctxt->y + ((wrapped_lines+1) *e_contact_text_height (
+			ctxt->context, ctxt->style->body_font, text));
 
 		ctxt->y += .2 * get_font_height (ctxt->style->body_font);
 
@@ -280,17 +353,7 @@ e_contact_print_contact (EContact *contact, EContactPrintContext *ctxt)
 	cairo_restore (cr);
 }
 
-static void
-e_contact_start_new_column (EContactPrintContext *ctxt)
-{
-	if (++ctxt->column >= ctxt->style->num_columns)
-		e_contact_start_new_page (ctxt);
-	else {
-		ctxt->x = ctxt->column *
-			(ctxt->column_width + ctxt->column_spacing);
-		ctxt->y = .0;
-	}
-}
+
 
 static gint
 contact_compare (EContact *contact1, EContact *contact2)
@@ -580,7 +643,7 @@ contact_draw (EContact *contact, EContactPrintContext *ctxt)
 		if (!ctxt->first_contact) {
 			if (ctxt->style->sections_start_new_page)
 				e_contact_start_new_page (ctxt);
-			else if (ctxt->y > page_height)
+			else if ((ctxt->y + e_contact_get_contact_height (contact, ctxt)) > page_height)
 				e_contact_start_new_column (ctxt);
 		}
 		if (ctxt->style->letter_headings)
@@ -588,7 +651,7 @@ contact_draw (EContact *contact, EContactPrintContext *ctxt)
 		ctxt->first_section = FALSE;
 	}
 
-	else if (!ctxt->first_contact && (ctxt->y > page_height)) {
+	else if (!ctxt->first_contact && (( ctxt->y + e_contact_get_contact_height (contact, ctxt)) > page_height)) {
 		e_contact_start_new_column (ctxt);
 		if (ctxt->style->letter_headings)
 			e_contact_print_letter_heading (ctxt, ctxt->section);
@@ -649,6 +712,55 @@ contact_begin_print (GtkPrintOperation *operation,
 	}
 }
 
+/* contact_page_draw_footer inserts the 
+ * page number at the end of each page 
+ * while printing*/
+void
+contact_page_draw_footer (GtkPrintOperation *operation,
+			  GtkPrintContext *context,
+			  gint page_nr)
+{
+	PangoFontDescription *desc;
+	PangoLayout *layout;
+	gdouble x, y, page_height, page_width, page_margin;
+	/*gint n_pages;*/
+	gchar *text;
+	cairo_t *cr;
+	GtkPageSetup *setup;
+	
+	/*Uncomment next if it is successful to get total number if pages in list view
+	 * g_object_get (operation, "n-pages", &n_pages, NULL)*/
+	text = g_strdup_printf (_("Page %d"), page_nr + 1);
+
+	setup = gtk_print_context_get_page_setup ( context);
+	page_height = gtk_page_setup_get_page_height (setup, GTK_UNIT_POINTS);
+	page_width = gtk_page_setup_get_page_width (setup, GTK_UNIT_POINTS);
+	page_margin = gtk_page_setup_get_bottom_margin (setup, GTK_UNIT_POINTS);
+
+	desc = pango_font_description_from_string ("Sans Regular 8");
+	layout = gtk_print_context_create_pango_layout (context);
+	pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
+	pango_layout_set_font_description (layout, desc);
+	pango_layout_set_text (layout, text, -1);
+	pango_layout_set_width (layout, -1);
+
+	x = page_width/2.0 - page_margin;
+	y = page_height - page_margin/2.0;
+
+	cr = gtk_print_context_get_cairo_context (context);
+
+	cairo_save (cr);
+	cairo_set_source_rgb (cr, .0, .0, .0);
+	cairo_move_to (cr, x, y);
+	pango_cairo_show_layout (cr, layout);
+	cairo_restore (cr);
+
+	g_object_unref (layout);
+	pango_font_description_free (desc);
+
+	g_free (text);
+}
+
 static void
 contact_draw_page (GtkPrintOperation *operation,
                    GtkPrintContext *context,
@@ -666,6 +778,7 @@ contact_draw_page (GtkPrintOperation *operation,
 	ctxt->section = NULL;
 
 	g_list_foreach (ctxt->contact_list, (GFunc) contact_draw, ctxt);
+	contact_page_draw_footer (operation, context, page_nr);
 }
 
 static void
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
index 1604693471..e16abf2435 100644
--- a/addressbook/printing/e-contact-print.h
+++ b/addressbook/printing/e-contact-print.h
@@ -31,5 +31,8 @@ void            e_contact_print               (EBook *book,
 					       EBookQuery *query,
 					       GList *contact_list,
 					       GtkPrintOperationAction action);
+void 		contact_page_draw_footer      (GtkPrintOperation *operation, 
+						GtkPrintContext *context, 
+						gint page_nr);
 
 #endif /* E_CONTACT_PRINT_H */
diff --git a/art/ChangeLog b/art/ChangeLog
deleted file mode 100644
index 5548a03715..0000000000
--- a/art/ChangeLog
+++ /dev/null
@@ -1,230 +0,0 @@
-2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #547411
-
-	* online.png:
-	* offline.png:
-	New, Tangoized versions of these images now live in data/icons.
-	Remove them from here.
-
-2008-07-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #542125
-
-	* Makefile.am:
-	Move query-free-busy.png to data/icons.
-
-2007-10-12  Michael Monreal <michael.monreal@gmail.com>
-
-         ** Migration of theme icons to data/icons/ (bug #479257)
-
-         * art/Makefile.am: Remove references to art/$size.
-
-2007-06-03  Srinivasa Ragavan <sragavan@novell.com>
-
-        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
-
-	* art/Makefile.am:
-
-2007-05-03  David Farning <dfarning@gmail.com>
-
-	** Fix for bug #435610
-
-	* art/Makefile.am (update-icon-cache): fix gtk-update-icon-cache
-	for uninstall-hook.
-
-2007-05-11  Jakub Steiner <jimmac@ximian.com>
-
-	** Fix for bug #398145
-
-	* Makefile.am: Added Tango icons for preferences window in 48x48.
-
-2007-02-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #350253
-
-	* Add new evolution icons:
-		16x16/evolution.png
-		22x22/evolution.png
-		24x24/evolution.png
-		32x32/evolution.png
-		scalable/evolution.svg
-
-	* Remove obsolete icons:
-		about-box.png
-		bcg.png
-		evolution.png
-		monkey-16.png
-
-	* Makefile.am: Ship our own named icons.
-
-2006-09-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes bug #356811
-
-	* Makefile.am: Add a uninstall-local rule to remove
-	$(DESTDIR)$(datadir)/pixmaps/evolution-$(BASE_VERSION).png.
-
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added new icons to evolution.
-
-	* Makefile.am: Added them to build.
-	* minus.png: + icon.
-	* plus.png: - icon.
-
-2006-03-06  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	* Makefile.am (images_DATA): Add query-free-busy.png
-	
-2004-05-20  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): Add README and jump.xpm
-
-2004-05-19  Jeffrey Stedfast  <fejj@novell.com>
-
-	* README: New file explaining how to add icons to the build, etc.
-
-	* broken-image-*.xpm: Added for use with e-icon-factory.c so we
-	can return a "bropken image" icon for any icon we can't find/load.
-
-	* .: Removed many *many* icons that are no longer used.
-
-2004-03-09  Jakub Steiner <jimmac@ximian.com>
-
-	* autocompletion.png:
-	* Makefile.am: autocompletion icon for the preferences
-
-2004-03-08  Radek Doulik  <rodo@ximian.com>
-
-	* Makefile.am (images_DATA): added 16 pixels versions of junk
-	icons from the gnome-icon-theme module
-
-2004-03-08  Jakub Steiner <jimmac@ximian.com>
-
-	* alarm.png
-	* briefcase.png
-	* cellphone.png
-	* envelope.png
-	* evolution-calendar.png
-	* evolution-notes-mini.png
-	* evolution-notes.png
-	* evolution-tasks-mini.png
-	* evolution-tasks.png
-	* evolution-today.png
-	* ico-calendar.png
-	* im-invisible.png
-	* import.png
-	* mail-config-druid-identity.png
-	* print-preview-24.png
-	* print.png
-	* schedule-meeting-16.png
-	* schedule-meeting-16.xpm
-	* schedule-meeting-24.png
-	* stock-notjunk-24.png
-	* summary-settings.png: since using gnome-icon-theme is miles away, I tried
-	  bringing the art/ mess a bit up to date. Lots of xpm hell still
-	  :(
-
-2004-03-08  Jakub Steiner <jimmac@ximian.com>
-
-	* im-nov.png: (16x16). closes bug #54972
-	
-2004-02-25 Sivaiah Nallagatla <snallagatla@novell.com>
-	* Makefile.am : added im-nov.png (icon for Groupwise im)
-	to images_DATA
-
-2004-02-03  Jakub Steiner <jimmac@ximian.com>
-
-	* im-jabber.png: 16x16 jabber
-
-2004-01-29  Jakub Steiner <jimmac@ximian.com>
-
-	* im-aim.png
-	* im-icq.png
-	* im-msn.png
-	* im-yahoo.png: it indeed appears you need 16x16
-
-2004-01-29  Jakub Steiner <jimmac@ximian.com>
-
-	* im-aim.png
-	* im-icq.png
-	* im-msn.png
-	* im-yahoo.png: although I'm adding these to gnome-icon-theme
-	  instead, these are so ugly I replaced them here too. The rest
-	  of the im-* stuff I'm not quite sure what those represent. Will
-	  try to redo those as well.
-
-	  I have 16x16 versions of these in git, so if those are used
-	  scaled down, as I saw in a screenshot, feel free to use the
-	  16x16 versions. They will look better.
-
-	  Also feel free to file icon requests agains the
-	  gnome-icon-theme if you want Evolution icons.
-
-2004-01-15  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (images_DATA): added flag-for-followup-done-16.png
-	(glade_DATA): added flag-for-followup-done-48.png
-
-2003-01-11  Christian Hammond  <chipx86@gnupdate.org>
-
-	* art/im*.png, art/Makefile.am: Added IM png files from Gaim.
-
-2004-01-08  Ross Burton  <ross@burtonini.com>
-
-	* Makefile.am:
-	* videoconf.png:
-	Add a video conferencing icon.
-
-	* globe.png:
-	Replace with the 24x24 version.
-
-	Both of these are for the redesigned Collaboration tab in the
-	contact editor.
-
-2003-12-04  Radek Doulik  <rodo@ximian.com>
-
-	* Makefile.am (buttons_DATA): added stock junk button and notjunk
-	placeholder (until artists have the right one)
-
-2003-12-02  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am: Add flag-for-followup-done.xpm to EXTRA_DIST
-
-2003-12-02  Not Zed  <NotZed@Ximian.com>
-
-	* flag-for-folloup*: Changed the base flag colour to reddish, and
-	created a -done set, the original blue-ish colour.
-
-2003-11-12  Jakub Steiner <jimmac@ximian.com>
-
-	* about-box.png: replace the foobar file
-
-2003-10-10  Hans Petter Jansson  <hpj@ximian.com>
-
-	* listview.xpm: Add calendar list view icon.
-
-2003-09-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png: More artwork from Jakub.
-
-2003-09-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* splash.png: New artwork from Jakub.
-
-2003-09-12  Bolian Yin <bolian.yin@sun.com>
-
-	* jump.xpm: add icon for the focused jump button.
-
-2003-08-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* appointment-reminder.png:
-	* appointment-reminder-excl.png: Add icons used by the calendar alarm's
-	systray notification. These are also in gnome-icon-theme HEAD, but
-	until we have workable stock packages, we use this.
-
-2003-06-23  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png:
-	* about-box.png: update Copyright info
diff --git a/art/ChangeLog.pre-1-4 b/art/ChangeLog.pre-1-4
deleted file mode 100644
index 9dec5cedc8..0000000000
--- a/art/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,712 +0,0 @@
-2003-06-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (install-data-local) [DEFAULT_BINARY]: Symlink
-	evolution.png to evolution-$(BASE_VERSION).png.  [#43596]
-
-2003-05-27  Jakub Steiner <jimmac@ximian.com>
-
-	* about-box.png, splash.png: Update copyright info
-
-2003-05-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png, splash.png: New artwork from Jakub.
-
-2003-05-05  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-contacts-plain.png
-	* evolution-contacts.png:
-	* globe.png:
-	* malehead.png:
-	* next-message.png:
-	* previous-message.png:
-	* receive-24.png:
-	* reply-to-all.png:
-	* reply.png:
-	* send-24-receive.png:
-	* send-24.png:
-	* send-16.png:
-	* send-receive.xpm:
-	* send.png: quick fix of the artwork, the rest goes to the
-	  (future) icon theme
-
-2003-04-29  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): add stock-edit-{16,24}.png
-
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png: New artwork from Jakub.
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: remove imagesdir, etc, which are now defined in
-	configure.in
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (imagesdir): Version using $(BASE_VERSION).
-	(buttonsdir): Likewise.
-	(conduitsdir): Likewise.
-	(install-data-local): New rule to install evolution.png as
-	evolution-$(BASE_VERSION).png.
-	(EXTRA_DIST): Add evolution.png.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (imagesdir): Install images into
-	$(datadir)/evolution/images instead of
-	$(datadir)/images/evolution.
-	(buttonsdir): Likewise, these go into
-	$(datadir)/evolution/images/buttons now.
-	(conduits_DATA): Likewise, $(datadir)/evolution/images/conduits.
-
-2002-11-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* splash.png: New work-in-progress splash from Jakub.
-
-2002-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* splash.png: New artwork from Jakub.
-	* about-box.png: New artwork from Jakub.
-
-2002-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* settings.png: New.
-	* settings-16.png: New.
-
-2002-10-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* splash.png: New artwork from Jakub.
-
-2002-09-27  Dan Winship  <danw@ximian.com>
-
-	* post-reply-24.png: New icon for "Post a Reply" from Jakub.
-
-2002-02-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png, splash.png: New artwork from Jakub.
-	
-2002-09-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-settings.png: New icon from Jakub.
-
-2002-09-03  Jakub Steiner <jimmac@ximian.com>
-
-	* ldap-settings.png: use a more gnomeish version
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* contact-list-16.png: New artwork from Jakub.
-	* post-message-16.png: Likewise.
-	* meeting-request-16.png: Likewise.
-
-	* meeting.xpm: Removed.
-
-2002-07-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail.png: New icon for mail (gnome-textfile.png from GNOME 2, by
-	Tuomas' suggestion).
-
-2002-07-23  Jakub Steiner <jimmac@ximian.com>
-
-	* inbox.png,outbox.png: fix the arrows
-	* font.png: the former one was vector style - from gorilla
-	
-2002-07-22    <jpr@ximian.com>
-
-	* Makefile.am: add new image
-
-2002-07-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* inbox.png, outbox.png: Added final large versions of the Inbox
-	and Outbox icons.
-
-2002-07-09  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA): add folder.png, folder-mini.png,
-	public-folder.png, and public-folder-mini.png
-
-	* folder-mini.png: Renamed from local-16.png
-
-	* folder.png, public-folder.png, public-folder-mini.png: New, from
-	Jakub.
-
-2002-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (images_DATA): inbox-mini.png instead of
-	inbox-16.png, outbox-mini.png instead of outbox-16.png.  Also add
-	inbox.png and outbox.png.
-	(inbox.png): New.
-	(outbox.png): New.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* schedule-meeting-24.png: New.
-
-2002-04-25  Larry Ewing  <lewing@ximian.com>
-
-	* Makefile.am (images_DATA): font.png: Add for the font config
-	prefs.
-
-2002-04-17  Dan Winship  <danw@ximian.com>
-
-	* monkey-16.png: Replace with an antialiased version
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA), folder-settings.png: Add. (Copied
-	from Unscalable Gorilla because it was handy. Will probably get
-	changed to something else...)
-
-2002-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* calendar-and-tasks-settings.png: New.
-	* composer-settings.png: New.
-	* ldap-settings.png: New.
-	* mail-accounts-settings.png: New.
-	* summary-settings.png: New.
-
-2002-03-25  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA): Add working-16.png (the GNOME2 stock
-	"wait" icon, from Jakub)
-
-2002-03-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* forward.xpm, reply.xpm, reply_to_all.xpm: Rename the internal
-	structure to coincide with the filenames.
-
-2002-02-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png, splash.png: New cool artwork from Jakub.
-	
-2002-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Remove meeting_widget.png from the build since it
-	doesn't seem to be in cvs?
-
-2002-02-20  Jakub Steiner <jimmac@ximian.com>
-
-	* summary_preferences-16.png: menu icon for summary preferences
-	* Makefile.am: added the icon
-
-2002-02-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* flag-for-followup.xpm:
-	* flag-for-followup-16.png:
-	* flag-for-followup-48.png: New icons.
-
-	* Makefile.am: Added the new icons...
-
-2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Install mail-new.xpm, mail-read.xpm and
-	priority-high.xpm in the same place as other bonobo-ui menu
-	pixmaps so we can use these in menus too.
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* connect_to_url-16.xpm: new icon
-
-	* new_all_day_event.png: ditto
-
-	* Makefile.am: install and dist new images
-
-2001-12-11  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-need-reply.xpm: A new icon that sucks less.  We still need
-	some Tuomas-love.
-
-2001-12-09  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-need-reply.xpm: Added a really, really ugly and
-	awful icon to symbolize "message needs a reply".
-
-	* Makefile.am (EXTRA_DIST): Added mail-need-reply.xpm.
-
-2001-11-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.png: New, updated icon from Tuomas.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): dist the glade data
-
-2001-11-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (gladedir): New.
-	(glade_DATA): Pixmap files required to be installed by the glade
-	files.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Install `evolution.png', not `evolution-icon.png'.
-
-	* evolution.png: Renamed from `evolution-icon.png', removing the
-	old, now unused `evolution.png'.
-
-2001-10-30  Jakub Steiner <jimmac@ximian.com>
-
-	* splash-1-0.png: new style splash 
-
-2001-10-23  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* splash.png: Remove the "1" from "1.0 Release Candidate 1" so it
-	looks better.
-
-2001-10-23  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* Makefile.am (appicon_DATA): Changed the filename here too 
-	so the icon gets installed.
-
-	* evolution-icon.png: New icon that scales better.
-
-2001-10-22  Jakub Steiner <jimmac@ximian.com>
-
-	* about-box.png: update the layout a bit
-	* splash.png: update to 0.17 
-
-2001-10-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (images_DATA): Add `about-box.png'.
-
-	* about-box.png: New image for the about box from Jakub.
-
-2001-10-18  Larry Ewing  <lewing@ximian.com>
-
-	* Makefile.am (images_DATA): add alarm.png for the new alarm
-	notification code.
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): change ldap-16.png to ldap-mini.png,
-	and add ldap.png.
-
-2001-10-04  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: bump to 0.16
-	* ldap.png: 48x48 version for shortcut bar
-
-2001-09-25  Iain Holmes  <iain@ximian.com>
-
-	* add task.png
-
-2001-09-21  Iain Holmes  <iain@ximian.com>
-
-	* remove timezone.png...dunno where it came from.
-
-2001-09-21  Iain Holmes  <iain@ximian.com>
-
-	* install timezone-16.xpm
-
-2001-09-21  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: beta4
-
-2001-09-08  Jakub Steiner <jimmac@ximian.com>
-
-	* pgp-signature-*: for the pgp signature checking
-	* Makefile.am (images_DATA): add the icon files
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): add ldap-16.png.
-
-2001-09-05  Jakub Steiner <jimmac@ximian.com>
-
-	* meeting-request.png: for the inline .ics stuff
-	* Makefile.am (images_DATA): add the icon file
-
-2001-09-04  Jakub Steiner <jimmac@ximian.com>
-
-	* timezone-48.png: for the timezone configuration step in the
-	  first-time-druid
-	* Makefile.am (images_DATA): add the icon file
-	
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: install new file
-
-	* talking-heads.png: new graphic for meeting requests
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): added goto-16.png & new_task-16.png.
-	(buttons_DATA): added save-24.png.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (buttons_DATA): added cut.png, copy.png & paste.png,
-	so we can use them for the tasks toolbar.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): added 16_copy.png, 16_customize.png,
-	16_cut.png & 16_paste.png.
-	(buttons_DATA): added new_task.png, which I made from scaling up the
-	smaller task.xpm icon.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (buttons_DATA): Added `delete-message.png'.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): moved task.xpm here, so it gets installed,
-	so we can use it for the menus. Note that we don't have an icon to
-	use in the toolbar for a new task, and we need one. Jakub?
-
-2001-08-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* wax-seal.png: Added.
-
-	* wax-seal-broken.png: Added.
-
-2001-08-17  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: marketing spoils the fun. boring splash again.
-	
-2001-08-17  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: Ruperzilla splash
-	
-	* splash-1-0.png: 1.0 candidate
-
-2001-08-16  Jakub Steiner <jimmac@ximian.com>
-
-	* {next,previous}-message.png: use new document template. maybe
-	  still a bit dark.
-	
-2001-08-15  Jakub Steiner <jimmac@ximian.com>
-
-	* add-attachment.png: get rid of the yellow
-
-	* compose-message.png: the old one seemed too dark to me. This one
-	shares the same document base as the new stuff.
-
-2001-08-15  Jakub Steiner <jimmac@ximian.com>
-
-	* all_contacts.xpm, new_contact.xpm: Nat wanted something bigger
-	  that would match the new button style. The filename of
-	  all_contacts.xpm is crap, maybe you guys can fix it to be
-	  "new_list.xpm" or something. Didn't want to break things.
-	 
-2001-08-15  Jakub Steiner <jimmac@ximian.com>
-
-	* save-16.png, save-as-16.png: fix bottom. Tuomas didn't like too
-	  much detail.
-
-2001-08-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* goto-24.png: Icon for "Goto date.." -button. Someone could add
-	this into the code?
-
-2001-08-14  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* arrow-[left,right]-24.png: new arrow icons for calendar
-	toolbar..
-
-2001-08-14  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-today-mini.png: new summary tree view icon.
-
-2001-08-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* 16_category_*: removed these files, which are now in gal
-
-2001-08-09  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* send-receive.xpm: Updated this to have the yellow/green arrows
-	so it matches the style of other icons. Noticed that tasklist
-	scales 16x16 icons larger, so they generally look Bad(tm). (fixes
-	#6475)
-
-2001-08-07  Damon Chaplin  <damon@ximian.com>
-
-	* timezone-16.xpm: copied from the international category icon.
-	It would be better to have 2 different icons for these, but I had
-	to get rid of that square timezone icon!
-
-2001-08-07  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-trash-mini.png: scaled down Tuomas' trash icon.
-	  tweaked a bit. looks a lot better than the previous one.
-	
-2001-08-07  Jakub Steiner <jimmac@ximian.com>
-
-	* inbox-*, outbox-*: tree view icons * filters.xpm, edit-16.xpm,
-	marlboro_filters.xpm: remove unused * vfolder-16.xpm,
-	delete-message.xpm, undelete-message.xpm: let's not use xpms *
-	evolution-trash-mini.png: new version for edit>delete message,
-	tree view and everything * undelete_message-16.png,
-	folder-move-16.png, open-in-new-window-16.png, folder-copy-16.png:
-	tree view icons * faq-16.png, mark-as-important-16.png: menu icons
-	* Makefile.am (images_DATA): add new icons, change some xpms to
-	pngs
-      
-
-2001-08-03  Jakub Steiner <jimmac@ximian.com>
-
-	* ldap-16.png, imap-16.png, local-16.png: tree view icons for
-	  imap, ldap and local folders.
-
-2001-08-02  Jakub Steiner <jimmac@ximian.com>
-
-	* myevo-mail-summary.png, myevo-post-it.png, *
-	myevo-appointments.png: icons for My Evolution -- mail summary,
-	tasks, appointments. These are _NOT_TO_ replace the shortcut
-	icons, but solely for My Evolution.
-	
-2001-08-02  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* receive-24.png: Icon for the send/receive dialog at least.
-
-2001-07-31  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: beta2 splash
-
-2001-07-31  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* send-24-receive.png: New version, looks more consistent with the
-	other icons.
-
-2001-07-30  Jakub Steiner <jimmac@ximian.com>
-
-	* search-16.png, search-and-replace-16.png: menu versions for
-	  shell and editor.  * properties-16.png: properties for shel
-	  (maybe other places too) * send-16.png, send-later-16.png:
-	  editor, shell menu.  * work_online-16.png: to accompany work
-	  online menu toggle.  * save-16.png, save-as-16.png:
-	  everywhere. (based on Tuomas new gnome stock panel icon)
-	
-2001-07-27    <tigert@ximian.com>
-
-	* new_appointment.[xpm,png]: New version, fixes bug #4704
-	hopefully.
-
-2001-07-25  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): added print-preview-24.png.
-
-2001-07-25  Jakub Steiner <jimmac@ximian.com>
-
-	* print-preview-24.png: toolbar icon for calendar's appointment
-	  dialog (now using the menu version)
-
-2001-07-20  JP Rosevear  <jpr@ximian.com>
-
-	* Pull in new splash screen
-
-2001-07-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: install 2 new category icons
-	(16_category_suppliers.png and 16_category_time-and-expenses.png)
-
-2001-07-20    <tigert@ximian.com>
-
-	* 16_category_time-and-expenses.png: Icon for "Time & Expenses"
-	category..
-
-	* 16_category_suppliers.png: Icon for "Suppliers" category..
-
-	* evolution-calendar.png, evolution-contacts.png,
-	evolution-inbox.png, evolution-tasks.png, evolution-today.png:
-	Took out the colored background circles from the icons, apparently
-	people found them confusing rather than useful, especially on
-	small icons -mode of the shortcutbar.
-
-2001-07-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: install the 2 new category icons
-
-2001-07-19    <tigert@ximian.com>
-
-	* 16_category_strategies.png, 16_category_status.png: New category
-	icons.
-
-2001-07-19  Jakub Steiner <jimmac@ximian.com>
-
-	* insert-link-24.png, insert-table-24.png, insert-image-24.png:
-	  toolbar icons for message editor.
-
-2001-07-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: install category icons
-
-2001-07-17  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* 16_category_holiday-cards.png 16_category_hot-contacts.png
-	16_category_ideas.png: new category icons..
-
-2001-07-16  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* 16_category_favorites.png 16_category_gifts.png
-	16_category_goals.png: New additions for the category stuff..
-	still more to do..
-
-2001-07-13  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* 16_category_*.png: Some category icons for calendar/tasks, to
-	match the different category types for events. Still many to do,
-	but I wanted to commit them so you people can start hacking on the
-	code already. More to follow shortly.
-
-	* 16_customize.png: Icon for "Customize toolbars" or whatever menu
-	item that deals with customizing stuff (the icon is a wrench)
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: extra dist another xpm
-
-2001-07-12    <tigert@ximian.com>
-
-	* delete_message.[png,xpm]: New versions for the trashcan icon.  I
-	am wondering if we should do some filename cleanup here, all menu
-	icons should really be 16_foo.png, whereas the toolbar ones should
-	be foo.png. Currently we are mixing PNG and XPM here with some
-	files having otherwise same names (like this one)..
-
-2001-07-11    <tigert@ximian.com>
-
-	* new_appointment.[png,xpm]: New versions
-
-2001-07-10  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* new_appointment.png: New appointment icon.  *
-	new_appointment.xpm: Small version.. (should we change this to
-	16_new_appointment.png btw?
-
-2001-07-09  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Install the myweather-* icons.
-
-2001-07-07    <tigert@ximian.com>
-
-	* 16_[cut,copy,paste].png: New icons for the
-	Edit->[Cut,Copy,Paste] entries, the current gnome-stock ones start
-	to look bad when scaled down, so these are already 16x16 pixels.
-
-2001-07-05  Jakub Steiner <jimmac@ximian.com>
-
-	* myweather-*: weather status icons for My Evolution
-
-2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* Makefile.am: install apply-filters-16.xpm
-
-2001-07-03  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* cut.png, copy.png, paste.png: icons for cut/copy/paste to fit
-	the general style.
-
-2001-07-01  Jakub Steiner <jimmac@ximian.com>
-
-	* print.xpm, print-preview.xpm: nat didn't like the jaggy
-	  version. This one is based on tuomas 48x48 print icon.
-
-2001-06-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (buttons_DATA): Add `print.png', `next-message.png',
-	`previous-message.png'.
-
-2001-06-29  Jakub Steiner <jimmac@ximian.com>
-
-	* remove-nntp-folder-24.png, add-nntp-folder-24.png,
-	  refresh-nntp-folders-24.png: manage subscriptions toolbar icons
-
-2001-06-29  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* print.png: Icon for print message.
-
-	* next-message.png, previous-message.png: New icons to replace the
-	< > arrows in the mailer.
-
-2001-06-29  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): add contact-is-a-list.png
-
-2001-06-29  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* contact-is-a-list.png: icon for toshok, for contact lists.
-
-2001-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Install the add-attachment.png icon.
-
-2001-06-27  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* evolution-calendar-mini.png: New version of the folder tree's
-	calendar icon. Doesnt look too much like the contacts icon.
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* world_map-960.png: world map picture used for selecting
-	timezones.  * Makefile.am (images_DATA): added world_map-960.png
-	for timezones.
-
-2001-06-14  Jakub Steiner <jimmac@ximian.com>
-
-	* apply-filters-16.xpm: for mailer menu.  * vfolder-16.xpm:
-	vfolder icon for menu items * hand-16.xpm: originally ment for
-	customize toolbars. might not work * edit-16.xpm: edit message
-	(message open)
-	
-2001-06-13  Jakub Steiner <jimmac@ximian.com>
-
-	* rdf.png, ico-rdf.png: ximianize those
-
-2001-06-13  Jakub Steiner <jimmac@ximian.com>
-
-	* splash-1-0.png: Initial mockup for the final splash.  Didn't
-	  wan't to overwrite the unstable splash.png.
-	
-2001-06-07  Iain Holmes  <iain@ximian.com>
-
-	* empty.gif: es-weather.png es-appointments.png ico-calendar.png
-	  ico-mail.png ico-rdf.png ico-weather.png bcg.png rdf.png
-	  pattern.png: Added all these for the new My Evolution
-
-2001-06-04  Jakub Steiner <jimmac@ximian.com>
-
-	* timezone-16.xpm: for events in a diffrent timezone
-
-2001-05-22  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-inbox-mini.png: fixed the shadow
-
-2001-05-17  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA): Install Jakub's new icons
-
-2001-05-16  Jakub Steiner <jimmac@ximian.com>
-
-	* mail-config-druid-48.png, mail-config-druid-identity.png,
-	  mail-config-druid-account-name.png,
-	  mail-config-druid-receive.png, mail-config-druid-send.png,
-	  thankyou.png: config druid icons
-	  
-	      thankyou.png can be used for the last step in every evo
-	      druid (like the import one)
-
-2001-05-16  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-calendar.png, evolution-contacts.png,
-	  evolution-inbox.png, evolution-today.png, evolution-tasks.png:
-	  fixed bug #2862. Also changed the envelope icon Oh and we use
-	  #b39169 for calendar now
-	  
-2001-05-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (images_DATA): Added `online.png' and `offline.png'.
-
-	* online.png: New icon by Tuomas.  * offline.png: New icon by
-	Tuomas.
-
-2001-05-14  Duncan Mak  <duncan@ximian.com>
-
-	* Makefile.am (images_DATA): add in the new find_message.xpm
-
-2001-05-14  Jakub Steiner <jimmac@ximian.com>
-
-	* find_message.xpm: Duncan requested this
-
diff --git a/art/Makefile.am b/art/Makefile.am
index 9c39dbf762..850be7e8ce 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -4,8 +4,6 @@ images_DATA = \
 	minus.png
 
 EXTRA_DIST = 				\
-	ChangeLog			\
-	ChangeLog.pre-1-4		\
 	README				\
 	empty.xpm			\
 	jump.xpm			\
diff --git a/autogen.sh b/autogen.sh
index f346c77651..33433f578d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="Evolution"
 REQUIRED_AUTOCONF_VERSION=2.58
-REQUIRED_AUTOMAKE_VERSION=1.9
+REQUIRED_AUTOMAKE_VERSION=1.10
 REQUIRED_LIBTOOL_VERSION=2.2
 REQUIRED_INTLTOOL_VERSION=0.35.5
 
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
deleted file mode 100644
index feba01be00..0000000000
--- a/calendar/ChangeLog
+++ /dev/null
@@ -1,18580 +0,0 @@
-2009-04-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #491755
-
-	* gui/alarm-notify/config-data.c:
-	(config_data_set_last_notification_time),
-	(config_data_get_last_notification_time):
-	Sanitize values from GConf before using them.
-
-2009-04-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #575773
-
-	* gui/e-calendar-table.etspec:
-	* gui/e-cal-list-view.etspec:
-	* gui/e-memo-table.etspec:
-	* gui/e-cal-model.h: (ECalModelField), (struct _ECalModelComponent):
-	* gui/e-cal-model.c: (get_datetime_from_utc), (ecm_value_at),
-	(ecm_duplicate_value), (ecm_free_value), (ecm_initialize_value),
-	(ecm_value_is_empty), (ecm_value_to_string),
-	(e_cal_view_objects_modified_cb), (e_cal_model_component_finalize),
-	(e_cal_model_component_init):
-	Allow showing CREATED and LAST-MODIFIED properties in a table.
-
-	* gui/print.c: (print_comp_draw_real):
-	* gui/e-cal-component-preview.c: (write_html):
-	* conduits/todo/todo-conduit.c: (local_record_from_comp):
-	Possible leak fix.
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #573704
-
-	* gui/dialogs/comp-editor.c: (action_save_cb), (real_send_comp):
-	Do not close editor after error.
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #571272
-
-	* gui/e-cal-model.c: (search_by_id_and_client):	Possible leak fix.
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #569652
-
-	* gui/calendar-component.c: (ensure_sources):
-	* gui/memos-component.c: (ensure_sources):
-	* gui/tasks-component.c: (ensure_sources):
-	Use new ESourceList API (simplifies code).
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #381132
-
-	* gui/apps_evolution_calendar.schemas.in:
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/cal-prefs-dialog.h: (struct _CalendarPrefsDialog):
-	* gui/dialogs/cal-prefs-dialog.c: (update_system_tz_widgets),
-	(use_system_tz_changed), (setup_changes), (show_config),
-	(calendar_prefs_dialog_construct):
-	* gui/calendar-config-keys.h:
-	* gui/calendar-config.h:
-	* gui/calendar-config.c: (calendar_config_get_use_system_timezone),
-	(calendar_config_set_use_system_timezone),
-	(calendar_config_add_notification_use_system_timezone),
-	(calendar_config_get_timezone), (calendar_config_get_timezone_stored):
-	Be able to set system timezone as calendar's time zone.
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #205804
-
-	* gui/e-calendar-view.c: (e_calendar_view_get_tooltips):
-	Include timezone information in a tooltip when differs from user's.
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #577615
-
-	* gui/dialogs/cal-prefs-dialog.h: (struct _CalendarPrefsDialog):
-	* 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/apps_evolution_calendar.schemas.in:
-	* gui/calendar-config-keys.h:
-	* gui/calendar-config.h:
-	* gui/calendar-config.c: (set_standard_offsets),
-	(calendar_config_get_icaltimezone),
-	(calendar_config_get_daylight_saving),
-	(calendar_config_set_daylight_saving),
-	(calendar_config_add_notification_daylight_saving):
-	Get rid of "Adjust for daylight saving time" option.
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* gui/dialogs/task-page.glade:
-	* gui/dialogs/task-page.c:
-	* gui/dialogs/task-details-page.glade:
-	* gui/dialogs/task-details-page.c:
-	* gui/dialogs/recurrence-page.glade:
-	* gui/dialogs/recurrence-page.c:
-	* gui/dialogs/alarm-dialog.glade:
-	* gui/dialogs/alarm-dialog.c:
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/event-page.c:
-	* gui/dialogs/memo-page.glade:
-	* gui/dialogs/memo-page.c:
-	* gui/goto-dialog.glade:
-	* gui/goto.c:
-	* gui/e-itip-control.c:
-	Remove deprecated Gtk+ symbols.
-
-	* gui/dialogs/Makefile.am:
-	* gui/dialogs/meeting-page.glade:
-	Remove death files.
-
-2009-04-13  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #561312
-	* calendar/gui/comp-util.c:
-	* calendar/gui/comp-util.h: Added a new function to
-	sanitize master recurrence event before modifying 
-	all instances.
-	* calendar/gui/dialogs/comp-editor.c:
-	* calendar/gui/e-day-view.c:
-	* calendar/gui/e-week-view.c: Used the new util api.
-	Do not invoke recurrence dialog while modifying detached
-	instances.
-
-2009-04-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #523802
-
-	* gui/e-tasks.h: (e_tasks_get_preview):
-	* gui/e-tasks.c: (e_tasks_get_preview):
-	* gui/e-cal-component-preview.h: (e_cal_component_preview_get_html):
-	* gui/e-cal-component-preview.c: (e_cal_component_preview_get_html):
-	* gui/tasks-control.c: (tasks_control_new), (tasks_sensitize_table[]),
-	(tasks_control_sensitize_commands), (tasks_control_focus_changed),
-	(tasks_control_copy_cmd):
-	* gui/e-memos.h: (e_memos_get_preview):
-	* gui/e-memos.c: (e_memos_get_preview):
-	* gui/e-cal-component-memo-preview.h:
-	* gui/e-cal-component-memo-preview.c:
-	(e_cal_component_memo_preview_get_html):
-	* gui/memos-control.c: (memos_control_new),
-	(memos_control_sensitize_commands), (memos_control_focus_changed),
-	(memos_control_copy_cmd):
-	Use copy of the preview panel, when focused, and events' copy otherwise.
-
-2009-04-02  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #577717
-
-	* gui/dialogs/alarm-dialog.c: (alarm_to_dialog),
-	(malarm_widgets_to_alarm): Fill some default values
-	to mandatory properties of ECalComponentAttendee.
-
-2009-03-06  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #401346
-
-	* gui/e-meeting-time-sel.c: (e_meeting_time_selector_destroy):
-	Do not remove notification twice.
-	* gui/dialogs/event-editor.c: (create_schedule_page),
-	(action_free_busy_cb): Do not show Free/Busy dialog modal.
-
-2009-03-05  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #435455 (bnc)
-	* calendar/gui/dialogs/comp-editor.c:
-	* calendar/gui/dialogs/event-editor.c:
-	* calendar/gui/dialogs/event-page.c:
-	* calendar/gui/dialogs/memo-page.c:
-	* calendar/gui/dialogs/task-page.c:
-	* calendar/gui/e-calendar-view.c:
-	* calendar/gui/e-calendar-view.h:
-	* calendar/gui/e-day-view.c:
-	* calendar/gui/itip-utils.c:
-	* calendar/gui/itip-utils.h: Do not allow read-only
-	events to be resized.
-
-2009-03-04  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #573119
-
-	* gui/dialogs/comp-editor.c: (set_attendees_for_delegation):
-	* gui/e-cal-popup.c: (is_delegated), (needs_to_accept):
-	Do not ask value of not included (NULL) parameters.
-
-2009-03-04  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #573193
-
-	* gui/e-calendar-view.c: (error_response): Always destroy dialog.
-
-2009-03-04  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #573122
-
-	* gui/dialogs/cal-prefs-dialog.c: (timezone_changed), (show_config):
-	* gui/calendar-config.c: (calendar_config_get_icaltimezone):
-	* gui/e-cal-model.c: (ecm_value_at):
-	Do not pass NULL to icalcomponent_get_first_component.
-
-2009-02-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #558366
-
-	* gui/alarm-notify/alarm-notify.c: (alarm_notify_add_calendar):
-	Set default timezone to resolve floating DATE-TIME properly.
-
-2009-02-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #238346
-
-	* gui/e-calendar-view.c: (e_calendar_view_add_event): Keep old
-	timezone when adding event if possible, use the default one otherwise.
-	* gui/e-calendar-view.c: (add_related_timezones), (clipboard_get_text_cb):
-	Set timezones from component to the calendar first, then add events. Also
-	fetch timezones from the calendar, when not part of the component already.
-
-2009-02-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #529037
-
-	* gui/gnome-cal.c: (gnome_calendar_destroy):
-	Disconnect signals on ESource-s too, not only on ECal-s.
-
-2009-02-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #561465
-
-	* gui/e-meeting-list-view.c: (build_table):
-	Expand 'Attendee' column instead of the last.
-
-2009-02-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572543
-
-	* gui/e-cal-popup.c: (ecalp_standard_menu_factory):
-	Always look for alternative apps for application/octet-stream.
-
-2009-02-22  Tobias Mueller  <tobiasmue@svn.gnome.org>
-
-	* gui/e-itip-control.c (refresh_options_object):
-	Make it use the proper action. Patch by Paweł Zembrzuski
-	
-	** Fixes bug 566556
-
-2009-02-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #567949
-
-	* gui/e-day-view.c: (set_text_as_bold):
-	* gui/e-week-view.c: (set_text_as_bold):
-	Do not free memory before done with it.
-
-2009-02-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #572348
-
-	* gui/alarm-notify/alarm-queue.c (display_notification):
-	Call gtk_status_icon_set_tooltip_text() instead of
-	gtk_status_icon_set_tooltip() (deprecated).
-
-	* gui/weekday-picker.c (configure_items):
-	Remove dead code.
-
-2009-02-19  Andre Klapper  <a9016009@gmx.de>
-
-	* /gui/e-day-view.c:
-	Remove useless and deprecated gtk_layout_freeze and gtk_layout_thaw
-	calls.
-
-2009-02-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #550114
-
-	* gui/e-calendar-table.h: (ec_query_tooltip):
-	* gui/e-calendar-table.c: (ec_query_tooltip): Offer it to others too.
-	* gui/e-calendar-table.c: (query_tooltip_cb): Use above funtion.
-	Show proper tooltip in table with grouping columns.
-	* gui/e-memo-table.c: (query_tooltip_cb), (e_memo_table_init):
-	Show tooltips in memo view too.
-
-2009-02-13  Chow Loong Jin <hyperair@gmail.com>
-
-	** Fixes bug #571625
-
-	* calendar/gui/e-day-view.c
-	* calendar/gui/e-week-view.c:
-	Use black/white for foreground instead of active/inactive text color
-
-2009-02-11  Andre Klapper  <a9016009@gmx.de>
-
-	* /gui/migration.c:
-	* /gui/dialogs/alarm-dialog.c:
-	Substitute some deprecated gtk+ functions.
-
-2009-02-09  Milan Crha  <mcrha@redhat.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade:
-	Do not use non-zero page size in an adjustment, it's deprecated now.
-
-2009-02-03  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* gui/alarm-notify/alarm-notify.glade:
-	Mark a string for translation. Fixes bug #570364
-
-2009-02-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/calendar-config.c:
-	* gui/calendar-config.h:
-	* gui/e-itip-control.c:
-	* gui/alarm-notify/alarm-queue.c:
-	* gui/dialogs/event-page.c:
-	* gui/dialogs/task-details-page.c:
-	* gui/dialogs/task-page.c:
-	Fix compiler warnings.
-
-2009-01-30  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #450554 (bugzilla.novell.com)
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp):
-	* gui/dialogs/event-page.c (event_page_remove_all_attendees):
-	* gui/dialogs/event-page.h:
-	Remove all attendees from the list-view and name-selector before
-	populating it on 'event_changed' callback.
-	* gui/e-meeting-list-view.c
-	(e_meeting_list_view_remove_attendee_from_name_selector),
-	(e_meeting_list_view_remove_all_attendees_from_name_selector):
-	Fix the GtkTreePath when iterating over the attendee list. It used
-	to cause a mis-match between the model and the view (critical)
-	* gui/e-meeting-list-view.h:
-	* gui/e-meeting-store.c (e_meeting_store_remove_all_attendees):
-	New function added.
-
-2009-01-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #463602 (bnc)
-	* calendar/gui/e-day-view-main-item.c: Align the summary
-	so that it does not intercept with time.
-
-2009-01-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #450535 (bnc)
-	* calendar/gui/e-calendar-view.c: If multiple days are
-	selected in month view, show same selected times in the
-	editor also.
-
-2009-01-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #347287
-	* calendar/gui/e-cal-model.c:
-	* calendar/gui/gnome-cal.c: Increased the number of tries
-	to 10 and wait to 500 micro seconds.
-
-2009-01-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #318003
-
-	* gui/memos-component.c: (selector_tree_data_dropped):
-	* gui/tasks-component.c: (selector_tree_data_dropped):
-	* gui/calendar-component.c: (selector_tree_data_dropped),
-	(create_component_view):
-	* gui/comp-util.h: (cal_comp_process_source_list_drop):
-	* gui/comp-util.c: (update_single_object), (update_objects),
-	(cal_comp_process_source_list_drop):
-	Support move of the event in day view when dropped over the source
-	list. Use the same function for events/tasks/memos.
-
-	* gui/e-day-view.c: (e_day_view_on_drag_data_get):
-	Encode string data same as memos and tasks do, with a source UID.
-
-	* gui/e-calendar-table.c: (e_calendar_table_copy_clipboard):
-	* gui/e-memo-table.c: (e_memo_table_copy_clipboard):
-	Removed inappropriate comments.
-
-2009-01-27  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #463597, bug #463594, bug#463599 (BNC) and 
-	**	   bug #567824(BGO)
-
-	* gui/print.c (titled_box), (print_day_background),
-	(print_day_view), (print_week_view), (print_month_view): Fix all header
-	related bugs in calendar printing.
-
-	Bug reports:
-	1) Daily Printouts Display Hour In Wrong Spot :
-	When you print your daily calendar, it prints the hours in the left 
-	column below the :30 time slot
-
-	2) Font Problems On Printout, Days Of Week
-
-	3) Calendar Heading Printout Problems, Overlapping Fonts
-	In print preview, short week day names in the header of the page are 
-	overlapped.
-
-	Fixes all header issues mentioned at 
-	http://www.go-evolution.org/CalendarPrintoutLove
-
-2009-01-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #559604
-
-	* gui/itip-utils.h: (itip_organizer_is_user_ex):
-	* gui/itip-utils.c: (itip_organizer_is_user_ex),
-	(itip_organizer_is_user):
-	* gui/e-calendar-view.c: (e_calendar_view_get_attendees_status_info):
-	Let the feature work with Groupwise too.
-
-2009-01-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #442869
-
-	* gui/dialogs/task-page.c: (attendee_added_cb):
-	* gui/dialogs/event-page.c: (attendee_added_cb): Do not work
-	with NULL delegator and do not set 'delfrom' with two MAILTO.
-	* gui/e-meeting-list-view.c: (name_selector_dialog_close_cb):
-	Delete attendee only if we have enough rights for it.
-
-2009-01-21  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #362754
-
-	* gui/tasks-component.c: (ensure_sources):
-	* gui/memos-component.c: (ensure_sources):
-	* gui/calendar-component.c: (ensure_sources):
-	Ensure to show default groups and sources with actual
-	localized name, not the one it was stored last time.
-
-2009-01-21  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #541209
-
-	** Adapt to the new APIs from upstream libical. Changes made include
-	using the "_r" counterpart for the following APIs:
-	+ icalproperty_as_ical_string ()
-	+ icalvalue_as_ical_string ()
-	+ icalcomponent_as_ical_string ()
-	+ icalparameter_as_ical_string ()
-	+ icaldurationtype_as_ical_string ()
-	+ icalenum_reqstat_code ()
-	+ icallangbind_property_eval_string ()
-	+ icallangbind_quote_as_ical ()
-	+ icalmime_text_end_part ()
-	+ icalperiodtype_as_ical_string ()
-	+ icalproperty_enum_to_string ()
-	+ icalproperty_get_parameter_as_string ()
-	+ icalproperty_get_value_as_string ()
-	+ icalproperty_get_property_name ()
-	+ icalrecurrencetype_as_string ()
-	+ icaltime_as_ical_string ()
-	+ icalreqstattype_as_string ()
-	+ icalvalue_binary_as_ical_string ()
-	+ icalvalue_int_as_ical_string ()
-	+ icalvalue_utcoffset_as_ical_string ()
-	+ icalvalue_string_as_ical_string ()
-	+ icalvalue_recur_as_ical_string ()
-	+ icalvalue_text_as_ical_string ()
-	+ icalvalue_attach_as_ical_string ()
-	+ icalvalue_duration_as_ical_string ()
-	+ icalvalue_date_as_ical_string ()
-	+ icalvalue_datetime_as_ical_string ()
-	+ icalvalue_float_as_ical_string ()
-	+ icalvalue_geo_as_ical_string ()
-	+ icalvalue_datetimeperiod_as_ical_string ()
-	+ icalvalue_period_as_ical_string ()
-	+ icalvalue_trigger_as_ical_string ()
-	+ icalvalue_as_ical_string ()
-
-	* gui/dialogs/e-send-options-utils.c
-	(e_sendoptions_utils_fill_component):
-	* gui/e-cal-model.c (search_by_id_and_client):
-	* gui/e-calendar-table.c (copy_row_cb),
-	(e_calendar_table_copy_clipboard):
-	* gui/e-calendar-view.c (e_calendar_view_copy_clipboard),
-	(transfer_item_to), (icalcomp_contains_category):
-	* gui/e-day-view.c (update_row), (model_comps_deleted_cb),
-	(e_day_view_find_event_from_uid), (e_day_view_reshape_day_events),
-	(e_day_view_on_drag_data_get):
-	* gui/e-itip-control.c (update_item):
-	* gui/e-memo-table.c (copy_row_cb), (e_memo_table_copy_clipboard):
-	* gui/e-memos.c (obtain_list_of_components):
-	* gui/e-tasks.c (obtain_list_of_components):
-	* gui/e-week-view.c (update_row), (model_comps_deleted_cb),
-	(e_week_view_reshape_events), (e_week_view_find_event_from_uid):
-	* gui/gnome-cal.c (gnome_calendar_purge):
-	* gui/itip-utils.c (comp_limit_attendees), (itip_send_comp),
-	(reply_to_calendar_comp), (itip_publish_comp):
-
-2009-01-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #353460
-
-	* gui/gnome-cal.c: (setup_widgets):
-	Do not allow shrinking of Tasks/Memos components in calendar view.
-
-2009-01-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #568331
-
-	* gui/dialogs/comp-editor.c: (classification_changed_cb),
-	(comp_editor_init): Notify changes of the classification.
-	* gui/dialogs/comp-editor.c: (fill_widgets): Block classification
-	change signal when filling widgets with values from a component.
-
-2009-01-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #567850
-
-	* gui/e-cal-model.h: (e_cal_model_set_default_time_func):
-	* gui/e-cal-model.c: (struct _ECalModelPrivate), (ecm_append_row),
-	(e_cal_model_set_default_time_func):
-	New functionality to retrieve a default time for a model's new
-	event created from a "click-to-add" row.
-	* gui/gnome-cal.c: (gc_get_default_time), (setup_widgets):
-	Set the new time callback for the memo table.
-
-2009-01-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #550735
-
-	* gui/print.c: (get_summary_with_location), (print_day_long_event),
-	(print_day_event), (print_week_event):
-	Print location with summary in all views, not only in a day view.
-
-2009-01-19  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #260853
-
-	* gui/calendar-config-keys.h:
-	* gui/calendar-config.h:
-	(calendar_config_get_ba_reminder), (calendar_config_set_ba_reminder):
-	* gui/calendar-config.c:
-	(calendar_config_get_ba_reminder), (calendar_config_set_ba_reminder),
-	(string_to_units), (calendar_config_get_default_reminder_units):
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/cal-prefs-dialog.h: (struct _CalendarPrefsDialog):
-	* gui/dialogs/cal-prefs-dialog.c: (ba_reminder_toggled),
-	(ba_reminder_interval_changed), (ba_reminder_units_changed),
-	(setup_changes), (show_config), (calendar_prefs_dialog_construct):
-	User interface and related function to allow use change setup of
-	the alarm for Birthdays and Anniversaries calendar.
-
-2009-01-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #225712
-
-	* gui/dialogs/comp-editor.h: (CompEditorClass::send_comp),
-	(comp_editor_send_comp): Changed function prototypes.
-	* gui/dialogs/comp-editor.c: (real_send_comp), (save_comp_with_send),
-	(comp_editor_send_comp): Strip alarms based on user's choice.
-	* gui/dialogs/send-comp.h: (send_component_dialog):
-	* gui/dialogs/send-comp.c: (have_nonprocedural_alarm),
-	(send_component_dialog): Show option "Send my alarms with this event"
-	when prompting to send event or not, but only if have any non-procedure
-	alarms and if it the caller want to know user's opinion. Default is
-	to strip all alarms. Procedure alarms are always strip out.
-	* gui/dialogs/event-editor.c: (event_editor_send_comp):
-	* gui/dialogs/task-editor.c: (task_editor_send_comp):
-	Honor function prototype changes and use new parameter strip_alarms.
-	* gui/itip-utils.h: (itip_send_comp):
-	* gui/itip-utils.c: (comp_compliant), (itip_send_comp),
-	(reply_to_calendar_comp):
-	New parameter to strip all alarms or only procedure alarms.
-	* gui/tasks-control.c: (tasks_control_forward_cmd):
-	* gui/e-itip-control.c: (send_item), (send_freebusy), (ok_clicked_cb):
-	* gui/e-calendar-table.c: (e_calendar_table_on_forward):
-	* gui/e-memo-table.c: (e_memo_table_on_forward):
-	* gui/e-calendar-view.c: (e_calendar_view_cut_clipboard),
-	(delete_event), (e_calendar_view_delete_selected_occurrence),
-	(on_forward):
-	Always strip alarms when sending component.
-	* gui/e-calendar-view.c: (e_calendar_view_add_event),
-	(e_calendar_view_modify_and_send):
-	* gui/e-cal-model-calendar.c: (ecmc_set_value_at):
-	Strip alarms based on user's choice.
-
-2009-01-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #200254
-
-	* gui/apps_evolution_calendar.schemas.in:
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/cal-prefs-dialog.h: (struct _CalendarPrefsDialog):
-	* gui/dialogs/cal-prefs-dialog.c: (dview_show_week_no_toggled),
-	(setup_changes), (show_config), (calendar_prefs_dialog_construct):
-	* gui/calendar-config-keys.h:
-	* gui/calendar-config.h:
-	* gui/calendar-config.c: (calendar_config_get_dview_show_week_no),
-	(calendar_config_set_dview_show_week_no),
-	(calendar_config_add_notification_dview_show_week_no):
-	New option whether to show week number in Day and Work Week view.
-	* gui/e-day-view.h: (struct _EDayView),
-	(e_day_view_get_show_week_number), (e_day_view_set_show_week_number):
-	* gui/e-day-view.c: (dview_show_week_no_changed_cb), (e_day_view_init),
-	(e_day_view_destroy), (e_day_view_recalc_day_starts),
-	(e_day_view_get_show_week_number), (e_day_view_set_show_week_number):
-	New widget showing week number of the first day in a view.
-
-2009-01-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #360813
-
-	* conduits/calendar/calendar-conduit.c: (comp_from_remote_record):
-	RFC 2445 - CREATED/DTSTAMP/LAST-MODIFIED always in UTC.
-
-2009-01-16  Milan Crha  <mcrha@redhat.com>
-
-	** Partial fix for bug #310844
-
-	* gui/e-calendar-view.c: (transfer_item_to):
-	Transfer master object instead of the instance for recurring events.
-
-2009-01-15  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #303738
-
-	* gui/gnome-cal.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb):
-	* gui/e-memos.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb):
-	* gui/e-tasks.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb):
-	Forget password on AuthFailed or AuthRequired and try to reopen
-	on AuthFailed status, which will ask for a password again.
-
-	* gui/comp-editor-factory.c: (cal_opened_cb):
-	Show "Authentication Required" on such status returned.
-
-	* common/authentication.c: (auth_cal_forget_password):
-	Do not free memory which hold ECal. Also always forget password
-	for calendar with the URL key.
-
-2009-01-15  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #245156
-
-	* gui/e-day-view.c: (e_day_view_finish_long_event_resize),
-	(e_day_view_finish_resize), (e_day_view_change_event_time),
-	(e_day_view_on_top_canvas_drag_data_received),
-	(e_day_view_on_main_canvas_drag_data_received):
-	* gui/e-week-view.c: (e_week_view_change_event_time):
-	* gui/e-calendar-view.c: (on_unrecur_appointment):
-	Keep old timezone for dtstart/dtend when changing it.
-	* gui/comp-util.h: (cal_comp_set_dtstart_with_oldzone),
-	(cal_comp_set_dtend_with_oldzone):
-	* gui/comp-util.c: (cal_comp_set_dtstart_with_oldzone),
-	(cal_comp_set_dtend_with_oldzone), (datetime_to_zone):
-	Helper functions to make it easier.
-
-2009-01-15  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #246313
-
-	* gui/e-day-view.c: (e_day_view_check_if_new_event_fits): Removed.
-	* gui/e-day-view.h: (struct _EDayView):
-	* gui/e-day-view.c: (e_day_view_init), (e_day_view_size_allocate),
-	(e_day_view_recalc_main_canvas_size), (e_day_view_recalc_cell_sizes),
-	(e_day_view_update_scroll_regions), (e_day_view_check_layout):
-	* gui/e-day-view-layout.h: (e_day_view_layout_day_events):
-	* gui/e-day-view-layout.c: (e_day_view_layout_day_events),
-	(e_day_view_layout_day_event), (e_day_view_expand_day_event):
-	Added ability to show all event in one-day view, but show only up
-	to 6 columns in a multi-day view.
-	* gui/print.c: (print_day_details): Always print all events.
-
-2009-01-14  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #554454
-
-	* gui/e-cal-model.c: (e_cal_view_objects_modified_cb):
-	Do not crash when received 'modified' event for something
-	not in a model. And a leak fix.
-
-2009-01-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #489437
-
-	* gui/dialogs/recurrence-page.c: (fill_component): Check whether
-	the 'until' date is in the future, and report error if not.
-
-2009-01-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #567045
-
-	* gui/e-meeting-time-sel.c: (e_meeting_time_selector_construct),
-	(e_meeting_time_selector_on_canvas_scroll_event): Escalate scroll
-	event's to a scrolled window, to let mouse wheel work over data too.
-
-2009-01-12  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #563364
-
-	* gui/e-day-view-time-item.h: (EDayViewTimeItem):
-	* gui/e-day-view-time-item.c: (e_day_view_time_item_class_init),
-	(e_day_view_time_item_init), (e_day_view_time_item_finalize),
-	(e_day_view_time_item_get_column_width), (edvti_draw_zone),
-	(e_day_view_time_item_draw), (edvti_second_zone_changed_cb),
-	(edvti_on_select_zone), (edvti_on_set_zone),
-	(e_day_view_time_item_show_popup_menu):
-	Show two timezones in the day view's time column.
-
-	* gui/apps_evolution_calendar.schemas.in:
-	* gui/calendar-config-keys.h:
-	* gui/calendar-config.h:
-	* gui/calendar-config.c: (calendar_config_get_day_second_zones),
-	(calendar_config_free_day_second_zones),
-	(calendar_config_set_day_second_zone),
-	(calendar_config_get_day_second_zone),
-	(calendar_config_select_day_second_zone),
-	(calendar_config_add_notification_day_second_zone):
-	Access configuration for the second day time zone.
-
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/cal-prefs-dialog.h: (struct _CalendarPrefsDialog):
-	* gui/dialogs/cal-prefs-dialog.c: (update_day_second_zone_caption),
-	(on_set_day_second_zone), (on_select_day_second_zone),
-	(day_second_zone_clicked), (setup_changes), (show_config),
-	(calendar_prefs_dialog_construct):
-	Manage the second day zone in a Preferences dialog.
-
-2009-01-12  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #555310
-
-	* importers/icalendar-importer.c: (ivcal_getwidget):
-	Localize strings properly.
-
-2009-01-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fix for bug #567148
-
-	* gui/e-timezone-entry.c (e_timezone_entry_init): Use a labelled button
-	to bring up the timezone selector widget. 
-
-2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/e-cal-component-preview (on_link_clicked):
-	* gui/e-cal-component-memo-preview (on_link_clicked):
-	* gui/e-memo-table.c (open_url_cb):
-	* gui/dialogs/comp-editor.c (open_attachment):
-	Call e_show_uri() instead of gnome_url_show().
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/calendar-commands.c:
-	* gui/e-cal-list-view.c:
-	* gui/e-day-view.c:
-	* gui/e-itip-control.c:
-	* gui/e-meeting-list-view.c:
-	* gui/e-meeting-store.c:
-	* gui/e-week-view.c:
-	* gui/gnome-cal.c:
-	* gui/memos-control.c:
-	* gui/tasks-control.c:
-	Remove unneeded #include <libgnome/gnome-util.h>.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/calendar-commands.c:
-	* gui/e-cell-date-edit-text.c:
-	* gui/e-itip-control.c:
-	* gui/memos-control.c:
-	* gui/print.c:
-	* gui/tasks-control.c:
-	Remove unneeded #include <libgnomeui/gnome-stock-icons.h>.
-
-	* gui/alarm-notify/alarm-queue.c:
-	* gui/dialogs/cal-attachment-select-file.c:
-	* gui/dialogs/cancel-comp.c:
-	* gui/dialogs/changed-comp.c:
-	* gui/dialogs/delete-error.c:
-	* gui/dialogs/recur-comp.c:
-	* gui/e-itip-control.c:
-	* gui/print.c:
-	Remove unneeded #include <libgnomeui/gnome-uidefs.h>.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #567281
-
-	* gui/calendar-commands.c:
-	* gui/e-cell-date-edit-text.c:
-	Remove unneeded #include <libgnomeui/gnome-messagebox.h>.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #567276
-
-	* gui/calendar-commands.c:
-	* gui/control-factory.c:
-	* gui/e-itip-control.c:
-	* gui/gnome-cal.c:
-	* gui/goto.c:
-	* gui/memos-control.c:
-	* gui/print.c:
-	* gui/tasks-control.c:
-	* gui/alarm-notify/alarm-queue.c:
-	* gui/dialogs/schedule-page.c:
-	Remove unneeded #include <libgnomeui/gnome-dialog-util.h>.
-
-	* gui/calendar-config.c:
-	* gui/calendar-config.h:
-	Removed unused function calendar_config_check_timezone_set().
-
-2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>
-
-	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
-
-	* Fix for bug #566011
-
-	* gui/Makefile.am:
-	* gui/calendar-component.c (calendar_component_class_init):
-	* gui/dialogs/comp-editor.c:
-	* gui/memos-component.c (memos_component_class_init):
-	* gui/tasks-component.c (tasks_component_class_init):
-	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h> and
-	add bindtextdomain().
-
-2009-01-07  Ashish Shrivastava  <shashish@novell.com>
-
-	** Fix for bug #565553, #462372 (bnc)
-
-	* gui/e-cal-popup.c (temp_save_part):
-	Add supported URI format.
-
-2009-01-07  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #443544 (bugzilla.novell.com)
-
-	* gui/e-meeting-attendee.c (e_meeting_attendee_add_busy_period):
-	* gui/e-meeting-store.c (process_free_busy_comp):
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	* gui/e-meeting-types.h:
-	Handle E_MEETING_FREE_BUSY_FREE.
-
-2009-01-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #566599
-
-	* gui/itip-utils.c (comp_subject):
-	Add translator comments and gettext context for meeting mail
-	subject prefixes.
-
-2009-01-06  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #458968 (bugzilla.novell.com)
-
-	* gui/dialogs/comp-editor.c (comp_editor_set_summary),
-	(comp_editor_set_changed): Don't warn the user about changes being lost
-	if he is trying to delegate the meeting. 
-
-2009-01-05  Ashish Shrivastava  <shashish@novell.com>
-
-	** Fix for bug #458153 (bugzilla.novell.com)
-
-	* gui/dialogs/comp-editor.c: Added a separator in the toolbar.
-	* gui/dialogs/event-editor.c (action_all_day_event_cb): Toggle 'Show
-	time as busy' in all_day_event callback. 
-
-2008-01-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #566566
-
-	* gui/e-itip-control.c (insert_rsvp):
-	Mark "RSVP" for translation.
-
-2008-12-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fix for bug #562091
-
-	* gui/dialogs/memo-editor.c (memo_editor_constructed),
-	(memo_editor_class_init), (memo_editor_init): Create MemoPage
-	after the base class object has been created and initialized. 
-
-2008-12-29  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #446285 (bnc)
-
-	* gui/e-select-names-editable.c:
-	(e_select_names_editable_get_emails),
-	(e_select_names_editable_get_names): Traverse all the entries in the 
-	added list.
-
-2008-12-29  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #439998 (bnc)
-
-	* gui/dialogs/comp-editor.c: (remove_event_dialog),
-	(action_save_cb): Ask the user if he wants to remove the delegated 
-	events or keep a copy.
-	
-2008-12-22  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #559604
-
-	* gui/e-calendar-view.h: (e_calendar_view_get_attendees_status_info):
-	* gui/e-calendar-view.c: (e_calendar_view_get_attendees_status_info),
-	(e_calendar_view_get_tooltips):
-	* gui/e-calendar-table.c: (query_tooltip_cb): Show additional status
-	information for the meeting only when user is an organizer.
-
-2008-12-17  Milan Crha  <mcrha@redhat.com>
-
-	* gui/e-cal-model.c: (update_e_cal_view_for_client):
-	Show reason of a failure on a console too.
-
-2008-12-15  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #540181
-
-	* gui/tasks-component.c: (destroy_component_view):
-	Do not touch already freed object.
-
-2008-12-15  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #564229
-
-	* gui/dialogs/alarm-dialog.c: (populate_widgets_from_alarm):
-	Cast to proper object.
-	* gui/alarm-notify/alarm-queue.c: (free_tray_icon_data):
-	Do not leak.
-
-2008-12-15  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #563669
-
-	* gui/dialogs/recurrence-page.c: (make_ending_count_special):
-	* conduits/todo/todo-conduit.c: (e_todo_gui_new):
-	Use zero GtkSpinButton's PageSize, as Gtk+ requires.
-
-2008-12-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for BNC bug #435452
-
-	* gui/e-meeting-list-view.c: (ense_update), (editing_started_cb),
-	(build_table):
-
-2008-12-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #333224
-
-	* gui/e-day-view.c: (e_day_view_on_text_item_event): Sanitize returned
-	values from 'e_day_view_convert_position_in_main_canvas', because it
-	can let the 'event_num' or 'day' set to -1, which means invalid value.
-
-2008-12-09  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #563669
-
-	* gui/dialogs/recurrence-page.glade:
-	* gui/dialogs/alarm-dialog.glade:
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/task-details-page.glade:
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/alarm-notify/alarm-notify.glade:
-	* gui/goto-dialog.glade:
-	Use zero GtkSpinButton's PageSize, as Gtk+ requires.
-
-2008-12-08  Jeff Cai <jeff.cai@sun.com>
-
-	** Fix for bug #563633
-
-	* gui/e-cal-model.c: Add an unused member for _ECalModelComponentPrivate
-
-2008-12-08  Jennifer Newman  <jennifer.newman@tufts.edu>
-
-	** Fix for bug #555371
-
-	* gui/dialogs/comp-editor.c: Added print menu option to task, memo and
-	event editors. 
-
-2008-12-08  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #350725
-
-	* gui/e-calendar-view.c (e_calendar_view_class_init),
-	(clipboard_clear_calendar_cb), (clipboard_get_calendar_cb),
-	(e_calendar_view_copy_clipboard), (clipboard_get_calendar_data),
-	(e_calendar_view_paste_text), (clipboard_paste_received_cb),
-	(e_calendar_view_paste_clipboard):
-	* gui/e-calendar-view.h:
-	* gui/e-day-view.c (e_day_view_class_init),
-	(e_day_view_add_new_event_in_selected_range),
-	(e_day_view_do_key_press), (e_day_view_get_num_events_selected),
-	(e_day_view_paste_text):
-	* gui/e-week-view.c (e_week_view_class_init),
-	(e_week_view_add_new_event_in_selected_range),
-	(e_week_view_do_key_press), (e_week_view_is_jump_button_visible),
-	(e_week_view_paste_text):
-
-	Copy/Paste support in day/week views. 
-
-2008-12-08  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #551599
-
-	* gui/dialogs/alarm-dialog.c: (populate_widgets_from_alarm):
-	Do not fallback to default 15 minutes alarm offset if alarm is
-	triggered at start (or end) of appointment.
-
-2008-12-05  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #332629
-
-	* gui/caltypes.xml:
-	* gui/memotypes.xml:
-	* gui/tasktypes.xml:
-	Use dynamically created list of categories in the option's widget.
-
-2008-12-03  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #352287
-
-	* gui/e-day-view-top-item.c: (e_day_view_top_item_draw_long_event):
-	Draw top icons in full detail/color depth (for weather, for example).
-
-2008-12-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #348299
-
-	* gui/dialogs/event-page.c (get_widgets):
-	* gui/dialogs/memo-page.c (get_widgets):
-	* gui/dialogs/task-page.c (get_widgets):
-	Use category completion in the Categories field.
-
-	* gui/dialogs/event-editor.c:
-	* gui/dialogs/memo-editor.c:
-	* gui/dialogs/task-editor.c:
-	Fix some reference count leaks.
-
-2008-11-28  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #561467
-
-	* gui/dialogs/comp-editor.c (real_send_comp): Don't replace 
-	attachment list if backend can CREATE_MESSAGES
-	* gui/itip-utils.c (itip_send_comp): Check whether backend 
-	could handle sending requests/updates. 
-
-2008-11-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #560138
-
-	* gui/e-calendar-table.c: (query_tooltip_cb):
-	Let wrap description text in a tooltip.
-
-2008-11-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #556224
-
-	* gui/gnome-cal.c: (struct _GnomeCalendarPrivate), (setup_widgets),
-	(update_todo_view_async), (update_todo_view), (gnome_calendar_init),
-	(gnome_calendar_destroy): Run always 'update_todo_view' in a separate
-	thread and guard its body with a mutex.
-
-	* gui/gnome-cal.c: (update_query_async): Do not leak.
-
-2008-11-17  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #557818
-
-	* gui/calendar-component.c:
-	* gui/memos-component.c:
-	* gui/tasks-component.c:
-	ESourceSelector now handles most of the drag-and-drop signals.
-	We just have to listen for the new "data-dropped" signal and
-	deal with it.  Gets rid of a lot of duplicate logic.
-
-2008-11-17  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #558322
-
-	* gui/calendar-component.c (rename_calendar_cb):
-	* gui/memos-component.c (rename_memo_list_cb):
-	* gui/tasks-component.c (rename_task_list_cb):
-	New "Rename" item in the source selector pop-up menu calls
-	the recently added e_source_selector_edit_primary_selection().
-	Still need to bind the "F2" key to this action, but I'm not
-	sure how whether EPopup supports that.
-
-2008-11-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #559604
-
-	* gui/e-calendar-view.h: (e_calendar_view_get_attendees_status_info):
-	* gui/e-calendar-view.c: (e_calendar_view_get_attendees_status_info),
-	(e_calendar_view_get_tooltips):
-	* gui/e-calendar-table.c: (query_tooltip_cb):
-	Show attendees' status in the tooltip if available.
-
-2008-11-11  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #490503
-
-	* gui/e-day-view.c (set_text_as_bold),
-	(e_day_view_update_event_label),
-	(e_day_view_update_long_event_label):
-	* gui/e-week-view.c (set_text_as_bold),
-	(e_week_view_reshape_event_span):
-	Summary of unaccepted meetings in calendar views now appear as bolded. 
-	If the meeting was sent to a mailing-list - the summary will always 
-	appear as normal. 
-
-2008-11-10  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #443190 (bugzilla.novell.com)
-
-	* gui/dialogs/comp-editor.c (fill_widgets), (real_edit_comp):
-	Block signals from attachment-bar while still filling the widgets. 
-
-2008-11-07  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #440007 (bugzilla.novell.com)
-
-	* gui/print.c: (print_comp_draw_real): Print the attendees only if
-	its the first page.
-
-2008-11-04  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #558354
-
-	* gui/alarm-notify/alarm-notify.glade:
-	* gui/alarm-notify/alarm-notify-dialog.h: (enum AlarmNotifyResult):
-	* gui/alarm-notify/alarm-notify-dialog.c: (struct AlarmNotify),
-	(dismiss_pressed_cb), (notified_alarms_dialog_new):
-	* gui/alarm-notify/alarm-queue.c: (notify_dialog_cb):
-	Changed "Close" button to "Dismiss All" and added a "Dismiss" button
-	to the alarm notification dialog to be able to dismiss only some of
-	the alarms shown in the dialog.
-
-2008-11-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/calendar-commands.c:
-	* gui/calendar-component.h:
-	* gui/gnome-cal.c:
-	Fix compiler warnings.
-
-2008-11-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/e-itip-control.c (write_recurrence_piece):
-	Remove extra space in translated string.
-
-2008-10-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/itip-utils.c (itip_send_comp):
-	Fix a crash when selecting "Forward as iCalendar".
-
-2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/control-factory.c:
-	* gui/e-calendar-table.c:
-	* gui/e-week-view-event-item.c:
-	* gui/weekday-picker.c:
-	Only include the toplevel GTK+ header.
-
-2008-10-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #555958 (patch by Anis Elleuch)
-
-	* gui/dialogs/comp-editor.c (comp_editor_init):
-	Add the UI manager's accelerator group to the editor window
-	so that menu shortcut keys work.
-
-2008-10-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #553715
-
-	* gui/e-week-view.c: (e_week_view_on_editing_stopped):
-	Set end time for the event properly, not same as start time.
-
-2008-10-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #528816
-
-	* importers/icalendar-importer.c: (vcal_supported): We do not support
-	vCalendar importer when we can parse the iCalendar from the file,
-	because the latter holds more information, like timezones.
-
-2008-10-17   Matt Davey  <mcdavey@mrao.cam.ac.uk>
-
-	** Fix for bug #556059
-
-	* conduits/common/Makefile.am:
-	* conduits/common/libecalendar-common-conduit.c: Allow building outside
-	the source tree.
-
-2008-10-17  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #553609
-
-	* gui/e-week-view.c: (e_week_view_set_selected_time_range):
-	Do not do any changes when the view has not been shown yet.
-
-2008-10-17  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #530872
-
-	* gui/e-calendar-table.c: (e_calendar_table_on_open_task):
-	Check for NULL soon enough to not crash.
-
-2008-10-14  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* conduits/calendar/calendar-conduit.c:
-	* conduits/memo/memo-conduit.c:
-	* conduits/todo/todo-conduit.c:
-	* gui/calendar-commands.c:
-	* gui/calendar-commands.h:
-	* gui/gnome-cal.c:
-	* gui/gnome-cal.h:
-
-2008-10-13  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #424818 (bugzilla.novell.com)
-
-	* gui/dialogs/calendar-setup.c (eccp_general_offline): Don't show offline
-	availability option for B&A calendars. 
-	* gui/e-cal-popup.c (e_cal_popup_target_new_source): Check for the correct 
-	property ("offline_sync" instead of "offline") while setting the GUI mask. 
-	* gui/calendar-component.c (set_offline_availability),
-	(mark_no_offline_cb), (mark_offline_cb):
-	* gui/memos-component.c (set_offline_availability),
-	(mark_no_offline_cb), (mark_offline_cb):
-	* gui/tasks-component.c (set_offline_availability), 
-	(mark_no_offline_cb), (mark_offline_cb):
-	Integrate the mark-calendar-offline plugin into the main code as we already 
-	have a similar per-calendar option which does the same thing. 
-
-2008-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #555494
-
-	* gui/cal-search-bar.c (generate_viewoption_menu):
-	Category icons are not themed.  Load by file, not by icon name.
-
-2008-10-08  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/alarm-notify/alarm.c:
-	* gui/dialogs/comp-editor.c:
-
-2008-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #554418
-
-	* gui/dialogs/comp-editor.c: (set_attachment_list):
-	* gui/e-cal-popup.c: (ecalp_standard_menu_factory):
-	Allow/disallow guessing of the mime_type based on the file content.
-
-2008-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #554458
-
-	* gui/e-cal-popup.c: (ecalp_standard_menu_factory):
-	Use content-type to call of g_app_info_get_all_for_type.
-
-2008-10-01  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/dialogs/recurrence-page.c:
-	* importers/icalendar-importer.c:
-
-2008-09-30  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/e-week-view.c:
-	* gui/goto.c:
-
-2008-09-29  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* shell.error.xml: Unbreak build, sorry for the inconvenience.
-
-2008-09-29  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* calendar.error.xml: Mark some forgotten strings for translation. Fixes bug #553105
-
-2008-09-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #553297
-
-	* gui/e-day-view.c: (e_day_view_on_editing_stopped):
-	Do not try to access uninitialized variables.
-
-2008-09-25  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/e-itip-control.c:
-	* gui/e-itip-control.h:
-	* gui/itip-utils.c:
-	* gui/itip-utils.h:
-	* gui/main.c:
-
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/alarm-notify/config-data.c:
-	* gui/cal-search-bar.c:
-	* gui/calendar-component.c:
-	* gui/comp-util.c:
-	* gui/comp-util.h:
-	* gui/dialogs/cal-prefs-dialog.c:
-	* gui/dialogs/e-send-options-utils.c:
-	* gui/dialogs/event-page.c:
-	* gui/dialogs/memo-page.c:
-	* gui/dialogs/task-page.c:
-	* gui/e-cal-component-memo-preview.c:
-	* gui/e-cal-component-preview.c:
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-week-view-event-item.c:
-	* gui/e-week-view.h:
-	* gui/memos-component.c:
-	* gui/tasks-component.c:
-
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/dialogs/delete-comp.c:
-	* gui/e-alarm-list.c:
-
-2008-09-23  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #553273
-
-	* gui/alarm-notify/alarm-queue.c: (edit_component):
-	* gui/tasks-component.c: (delete_task_list_cb):
-	* gui/calendar-component.c: (delete_calendar_cb):
-	* gui/memos-component.c: (delete_memo_list_cb):
-	Always end e_error_run/e_error_new calls with NULL parameter.
-
-2008-09-19  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/alarm-notify/alarm-queue.c:
-	* gui/e-calendar-view.c:
-
-2008-09-16  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/alarm-notify/alarm.h:
-	* gui/comp-editor-factory.c:
-	* gui/dialogs/changed-comp.c:
-	* gui/dialogs/copy-source-dialog.c:
-	* gui/dialogs/delete-error.c:
-	* gui/e-cal-model-tasks.c:
-	* gui/e-cal-popup.c:
-	* gui/e-calendar-table.c:
-	* gui/e-memo-table.c:
-	* gui/e-timezone-entry.c:
-	* gui/print.c:
-	* gui/tasks-control.c:
-
-2008-09-14  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	** Fix for bug #551628
-
-	* gui/e-cal-model.c: (e_cal_view_objects_modified_cb):
-	* gui/e-day-view.c: (update_row), (model_comps_deleted_cb):
-	* gui/e-week-view.c: (update_row): Remove old events from the 
-	view when objects are modified. 
-
-2008-09-12  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #551895
-
-	* gui/dialogs/alarm-list-dialog.c: (edit_clicked_cb):
-	Copy paste error.
-
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/alarm-notify/notify-main.c:
-	* gui/calendar-config-keys.h:
-	* gui/calendar-config.c:
-	* gui/calendar-config.h:
-	* gui/dialogs/cal-prefs-dialog.h:
-	* gui/dialogs/recur-comp.c:
-	* gui/e-meeting-store.c:
-	* gui/e-meeting-store.h:
-	* gui/e-meeting-time-sel.c:
-	* gui/e-meeting-time-sel.h:
-	* gui/migration.c:
-
-2008-09-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #551382
-
-	* gui/e-week-view.c: (model_comps_deleted_cb):
-	* gui/e-cal-model.c: (redo_queries):
-	Get rid of unused variables.
-	* gui/e-cal-model.c: (e_cal_view_objects_modified_cb):
-	Use result of g_list_prepend, thus report changes properly.
-
-2008-11-03  Ashish Shrivastava  <shashish@novell.com>
-
-	** Most of the errors are now non-intrusive
-
-	* calendar.error.xml: Added a new error message for
-	  non-intrusive backend_died.
-	* apps_evolution_calendar.schemas.in:
-	* calendar-commands.c: Added new verb for help debug message
-	  (help_debug):
-	* gnome-cal.c: Support for non-intrusive error.
-	  (client_cal_opened_cb), Define fash table and accessing errors:
-	* e-calendar-view.c: (error_response):
-	  (e_calendar_utils_show_error_silent), (e_calendar_utils_show_info_silent):
-	* e-calendar-view.h:
-	* calendar-component.c: Added EActivityHandler and ELogger:
-	(calendar_component_peek_activity_handler), (calendar_component_show_logger):
-	* calendar-component.h:
-
-2008-09-08  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #544187
-	* calendar/gui/e-cal-model.c:
-	* calendar/gui/e-cal-model.h:
-	* calendar/gui/e-day-view.c:
-	* calendar/gui/e-week-view.c: Added a new signal
-	handler to update the views on comp deletion.
-
-2008-09-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #549968
-
-	* gui/dialogs/comp-editor.c (comp_editor_init):
-	Use the same mnemonic for "Recent Documents" as composer.
-
-2008-09-04  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/alarm-notify/util.c:
-	* gui/dialogs/calendar-setup.c:
-	* gui/e-day-view-time-item.c:
-	* gui/e-meeting-list-view.c:
-	* gui/misc.c:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* conduits/common/libecalendar-common-conduit.c:
-	* gui/alarm-notify/alarm-notify-dialog.c:
-	* gui/alarm-notify/alarm-notify-dialog.h:
-	* gui/alarm-notify/alarm-notify.c:
-	* gui/calendar-component.h:
-	* gui/calendar-view-factory.c:
-	* gui/calendar-view.c:
-	* gui/comp-editor-factory.h:
-	* gui/control-factory.c:
-	* gui/dialogs/alarm-dialog.c:
-	* gui/dialogs/alarm-list-dialog.c:
-	* gui/dialogs/cal-attachment-select-file.c:
-	* gui/dialogs/cancel-comp.c:
-	* gui/dialogs/changed-comp.h:
-	* gui/dialogs/comp-editor-page.h:
-	* gui/dialogs/comp-editor-util.c:
-	* gui/dialogs/comp-editor-util.h:
-	* gui/dialogs/comp-editor.h:
-	* gui/dialogs/e-delegate-dialog.c:
-	* gui/dialogs/e-send-options-utils.h:
-	* gui/dialogs/event-editor.c:
-	* gui/dialogs/event-editor.h:
-	* gui/dialogs/event-page.h:
-	* gui/dialogs/memo-editor.c:
-	* gui/dialogs/recur-comp.h:
-	* gui/dialogs/schedule-page.c:
-	* gui/dialogs/schedule-page.h:
-	* gui/dialogs/send-comp.c:
-	* gui/dialogs/task-details-page.c:
-	* gui/dialogs/task-editor.c:
-	* gui/dialogs/task-editor.h:
-	* gui/e-cal-component-memo-preview.h:
-	* gui/e-cal-config.c:
-	* gui/e-cal-event.c:
-	* gui/e-cal-list-view-config.c:
-	* gui/e-cal-list-view.c:
-	* gui/e-cal-menu.c:
-	* gui/e-cal-model-calendar.c:
-	* gui/e-cal-model-memos.c:
-	* gui/e-cal-model.c:
-	* gui/e-calendar-table-config.c:
-	* gui/e-calendar-table.h:
-	* gui/e-calendar-view.h:
-	* gui/e-cell-date-edit-config.c:
-	* gui/e-cell-date-edit-text.c:
-	* gui/e-cell-date-edit-text.h:
-	* gui/e-comp-editor-registry.c:
-	* gui/e-comp-editor-registry.h:
-	* gui/e-date-edit-config.c:
-	* gui/e-date-time-list.c:
-	* gui/e-day-view-config.c:
-	* gui/e-day-view-main-item.h:
-	* gui/e-meeting-attendee.c:
-	* gui/e-meeting-time-sel-item.c:
-	* gui/e-memo-table-config.c:
-	* gui/e-memo-table-config.h:
-	* gui/e-memos.c:
-	* gui/e-memos.h:
-	* gui/e-mini-calendar-config.c:
-	* gui/e-mini-calendar-config.h:
-	* gui/e-select-names-editable.c:
-	* gui/e-select-names-renderer.c:
-	* gui/e-tasks.c:
-	* gui/e-tasks.h:
-	* gui/e-week-view-config.c:
-	* gui/e-week-view-config.h:
-	* gui/e-week-view-layout.c:
-	* gui/e-week-view-main-item.c:
-	* gui/e-week-view-titles-item.c:
-	* gui/goto.h:
-	* gui/itip-bonobo-control.c:
-	* gui/memos-component.h:
-	* gui/tasks-component.h:
-	* gui/weekday-picker.c:
-	* importers/main.c:
-
-2008-08-28  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Related to bug #547822
-
-	* gui/print.c (print_table_draw_page), (print_table):
-	Use g_malloc() and g_free() instead of malloc() and free().
-	Also fix an "assignment discards qualifiers" compiler warning.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* common/authentication.c:
-	* common/authentication.h:
-	* conduits/common/libecalendar-common-conduit.h:
-	* gui/alarm-notify/alarm-notify.h:
-	* gui/alarm-notify/alarm-queue.h:
-	* gui/alarm-notify/config-data.h:
-	* gui/alarm-notify/util.h:
-	* gui/cal-search-bar.h:
-	* gui/calendar-view-factory.h:
-	* gui/calendar-view.h:
-	* gui/control-factory.h:
-	* gui/dialogs/alarm-dialog.h:
-	* gui/dialogs/alarm-list-dialog.h:
-	* gui/dialogs/cal-attachment-select-file.h:
-	* gui/dialogs/calendar-setup.h:
-	* gui/dialogs/cancel-comp.h:
-	* gui/dialogs/comp-editor-page.c:
-	* gui/dialogs/copy-source-dialog.h:
-	* gui/dialogs/delete-comp.h:
-	* gui/dialogs/delete-error.h:
-	* gui/dialogs/e-delegate-dialog.h:
-	* gui/dialogs/memo-editor.h:
-	* gui/dialogs/memo-page.h:
-	* gui/dialogs/recurrence-page.h:
-	* gui/dialogs/save-comp.c:
-	* gui/dialogs/save-comp.h:
-	* gui/dialogs/select-source-dialog.c:
-	* gui/dialogs/select-source-dialog.h:
-	* gui/dialogs/send-comp.h:
-	* gui/dialogs/task-details-page.h:
-	* gui/dialogs/task-page.h:
-	* gui/e-alarm-list.h:
-	* gui/e-cal-component-preview.h:
-	* gui/e-cal-config.h:
-	* gui/e-cal-event.h:
-	* gui/e-cal-list-view-config.h:
-	* gui/e-cal-list-view.h:
-	* gui/e-cal-menu.h:
-	* gui/e-cal-model-calendar.h:
-	* gui/e-cal-model-memos.h:
-	* gui/e-cal-model-tasks.h:
-	* gui/e-cal-model.h:
-	* gui/e-cal-popup.h:
-	* gui/e-calendar-table-config.h:
-	* gui/e-cell-date-edit-config.h:
-	* gui/e-date-edit-config.h:
-	* gui/e-date-time-list.h:
-	* gui/e-day-view-config.h:
-	* gui/e-day-view-layout.c:
-	* gui/e-day-view-layout.h:
-	* gui/e-day-view-time-item.h:
-	* gui/e-day-view-top-item.h:
-	* gui/e-day-view.h:
-	* gui/e-meeting-attendee.h:
-	* gui/e-meeting-list-view.h:
-	* gui/e-meeting-time-sel-item.h:
-	* gui/e-meeting-types.h:
-	* gui/e-meeting-utils.c:
-	* gui/e-meeting-utils.h:
-	* gui/e-memo-table.h:
-	* gui/e-select-names-editable.h:
-	* gui/e-select-names-renderer.h:
-	* gui/e-timezone-entry.h:
-	* gui/e-week-view-event-item.h:
-	* gui/e-week-view-layout.h:
-	* gui/e-week-view-main-item.h:
-	* gui/e-week-view-titles-item.h:
-	* gui/itip-bonobo-control.h:
-	* gui/memos-control.c:
-	* gui/memos-control.h:
-	* gui/migration.h:
-	* gui/misc.h:
-	* gui/print.h:
-	* gui/tag-calendar.c:
-	* gui/tag-calendar.h:
-	* gui/tasks-control.h:
-	* gui/weekday-picker.h:
-	* importers/evolution-calendar-importer.h:
-	* zones.h:
-
-2008-08-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #523327
-
-	* gui/e-cal-component-preview.c: (write_html):
-	* gui/e-cal-component-memo-preview.c: (write_html):
-	Show description in monospace font and wrap lines too.
-
-2008-08-22  Tobias Mueller  <tobiasmue@svn.gnome.org>
-
-	* gui/print.c (print_table_draw_page):
-	Make it show "Tasks" for printing tasks list and "Calendar" for
-	printing a calendar. Patch by
-	Rouslan Solomakhin <rouslan@solomakhin.net>
-	
-	** Fixes bug 547822
-
-2008-08-18  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #462242
-
-	* gui/gnome-cal.c: (default_client_cal_opened_cb):
-	Do not unref NULL pointers.
-
-2008-08-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #508732
-
-	* gui/calendar-component.c (impl_createView):
-	* gui/memos-component.c (impl_createView):
-	* gui/tasks-component.c (impl_createView):
-	Add a "select_item" argument for crash recovery, which these
-	components do not use.
-
-2008-08-04  Paul Bolle  <pebolle@tiscali.nl>
-
-	* gui/gui/calendar-component.c: (set_info):
-	Use "Calendars" as label for component, not "Calendar", for
-	consistency.
-
-2008-08-14  Sebastien Bacher  <seb128@ubuntu.com>
-
-	** Fix for bug #547805
-
-	* gui/e-cal-popup.c: (ecalp_standard_menu_factory):
-	don't filter applications using g_app_info_should_show()
-
-2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/dialogs/comp-editor.c:
-	Use e_display_help() for displaying help.
-
-2008-08-17  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/event-page.c: (source_changed_cb):
-	* gui/dialogs/memo-page.c: (source_changed_cb):
-	* gui/e-cal-model.c: (e_cal_model_set_timezone),
-	(e_cal_view_done_cb):
-	* gui/e-day-view-config.c: Fixed some warnings.
-
-2008-08-15  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #347287
-	* gui/e-cal-list-view-config.c: (e_cal_list_view_config_set_view):
-	* gui/e-cal-list-view.c: (e_cal_list_view_new):
-	* gui/e-cal-list-view.h:
-	* gui/e-cal-model.c: (e_cal_model_set_timezone), (add_instance_cb),
-	(e_cal_view_objects_added_cb), (e_cal_view_done_cb),
-	(update_e_cal_view_for_client), (cal_opened_cb), (add_new_client),
-	(e_cal_model_component_class_init),
-	(e_cal_model_component_finalize), (e_cal_model_component_init),
-	(e_cal_model_component_get_type),
-	(e_cal_model_copy_component_data),
-	(e_cal_model_free_component_data):
-	* gui/e-cal-model.h:
-	* gui/e-calendar-view.c: (e_calendar_view_init),
-	(e_calendar_view_set_model):
-	* gui/e-calendar-view.h:
-	* gui/e-day-view-config.c: (e_day_view_config_set_view):
-	* gui/e-day-view.c: (time_range_changed_cb),
-	(model_row_changed_cb), (model_cell_changed_cb),
-	(model_rows_inserted_cb), (model_rows_deleted_cb),
-	(timezone_changed_cb), (e_day_view_init), (init_model),
-	(e_day_view_new), (e_day_view_set_mins_per_row),
-	(e_day_view_add_event), (e_day_view_check_layout):
-	* gui/e-day-view.h:
-	* gui/e-week-view-config.c: (e_week_view_config_set_view):
-	* gui/e-week-view.c: (time_range_changed_cb),
-	(model_row_changed_cb), (model_cell_changed_cb),
-	(model_rows_inserted_cb), (model_rows_deleted_cb),
-	(timezone_changed_cb), (e_week_view_init), (init_model),
-	(e_week_view_new), (e_week_view_add_event),
-	(e_week_view_check_layout):
-	* gui/e-week-view.h:
-	* gui/gnome-cal.c: (message_proxy), (create_thread_pool),
-	(message_push), (update_query_async), (update_query),
-	(set_search_query), (set_timezone), (setup_widgets),
-	(update_view_times), (display_view), (display_view_cb),
-	(add_mclient_async), (add_mclient), (client_cal_opened_cb),
-	(default_client_cal_opened_cb),
-	(gnome_calendar_remove_source_by_uid),
-	(gnome_calendar_on_date_navigator_selection_changed): Use a
-	single model for all the views.			
-
-2008-08-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/migration.c:
-	Fix TeX-style quotes.  (#547372)
-
-2008-08-12  Dmitrijs Ledkovs  <dmitrij.ledkov@gmail.com>
-
-	** Fixes bug #498095
-
-	* gui/dialogs/event-page.glade: "D_escription" -> "_Description"
-	* gui/dialogs/task-page.glade: As above and "_Due Date" -> "D_ue Date"
-	Change mnemonics to resolve clash with "_Edit".
-	* gui/dialogs/memo-page.glade:
-	Set proper mnemonic widget for description label.
-
-2008-08-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #546892
-
-	* gui/alarm-notify/alarm-notify-dialog.c:
-	* gui/dialogs/alarm-dialog.c:
-	* gui/dialogs/alarm-list-dialog.c:
-	* gui/dialogs/cal-attachment-select-file.c:
-	* gui/dialogs/changed-comp.c:
-	* gui/dialogs/delete-error.c:
-	* gui/dialogs/select-source-dialog.c:
-	Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list().
-
-	* gui/dialogs/event-page.c:
-	* gui/e-timezone-entry.c:
-	Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image().
-
-	* gui/alarm-notify/alarm-queue.c:
-	Prefer gtk_status_icon_set_from_icon_name() over
-	gtk_status_icon_set_from_pixbuf().
-
-	* gui/e-calendar-table.c:
-	* gui/e-calendar-view.c:
-	* gui/e-memo-table.c:
-	e_activity_handler_operation_started() no longer takes a GdkPixbuf.
-	It was ignoring the pixbuf anyway ever since we added a spinner icon.
-
-2008-08-08  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #544117
-
-	* gui/itip-utils.c: (itip_send_comp): Initialize variables to NULL,
-	to not free uninitialized memory in the cleanup part on the error.
-
-2008-08-06  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #249844
-
-	* gui/tasks-component.c: (impl__get_userCreatableItems):
-	* gui/memos-component.c: (impl__get_userCreatableItems):
-	Do not let compiler claim.
-	* gui/calendar-component.c: (impl__get_userCreatableItems):
-	Use C_() macro instead of Q_() macro.
-	Use fully qualified names for "New" submenu entries.
-
-2008-08-04  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #544157
-
-	* gui/GNOME_Evolution_Calendar.server.in.in:
-	Sort View / Window (sub)menu in shortcut order.
-
-2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #249844
-
-	* gui/memos-component.c (impl__get_userCreatableItems):
-	* gui/tasks-component.c (impl__get_userCreatableItems):
-	Use C_() macro instead of Q_() macro. 
-	Use fully qualified names for "New" submenu entries. 
-
-2008-08-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #546057
-
-	* gui/GNOME_Evolution_Calendar.server.in.in:
-	* gui/calendar-component.c:
-	* gui/e-calendar-view.c:
-	* gui/dialogs/alarm-dialog.c:
-	* gui/dialogs/alarm-list-dialog.c:
-	* gui/dialogs/changed-comp.c:
-	* gui/dialogs/comp-editor.c:
-	* gui/dialogs/delete-error.c:
-	* gui/dialogs/select-source-dialog.c:
-	Use "x-office-calendar" icon name instead of "stock_calendar".
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #544857
-
-	* gui/memotypes.xml: Fix a typo.
-
-2008-08-01  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #353927
-
-	* gui/alarm-notify/alarm-queue.c: (tray_icon_blink_cb),
-	(display_notification): Do not blink the icon more than 15 seconds.
-
-2008-07-30  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #211267
-
-	* gui/print.c: (bound_text), (print_attendees), (print_day_event),
-	(print_todo_details), (print_comp_draw_real), (print_comp_draw_page),
-	(print_comp_begin_print), (print_comp): When printing only one event,
-	then divide it to more pages if required, also word-wrap description
-	text if necessary to fit the page.
-
-2008-07-29  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #329821
-
-	* gui/e-calendar-table.c: (query_tooltip_cb):
-	Recalculate returned row to the model row, if we are sorting.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* calendar.error.xml: Fix some strings. See bug #543753.
-
-2008-07-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #542125
-
-	** This set of changes migrates CompEditor, CompEditorPage and the
-	   various subclasses from using BonoboUI to GtkUIManager for menus
-	   and toolbars.  It also substantially cleans up the code and
-	   streamlines the CompEditorPage API, making more effective use
-	   of GObject properties.
-
-	Core changes:
-	* gui/dialogs/comp-editor-page.c:
-	* gui/dialogs/comp-editor-page.h:
-	* gui/dialogs/comp-editor.c:
-	* gui/dialogs/comp-editor.h:
-	* gui/dialogs/event-editor.c:
-	* gui/dialogs/event-editor.h:
-	* gui/dialogs/event-page.c:
-	* gui/dialogs/event-page.h:
-	* gui/dialogs/memo-editor.c:
-	* gui/dialogs/memo-editor.h:
-	* gui/dialogs/memo-page.c:
-	* gui/dialogs/memo-page.h:
-	* gui/dialogs/recurrence-page.c:
-	* gui/dialogs/recurrence-page.h:
-	* gui/dialogs/schedule-page.c:
-	* gui/dialogs/schedule-page.h:
-	* gui/dialogs/task-details-page.c:
-	* gui/dialogs/task-details-page.h:
-	* gui/dialogs/task-editor.c:
-	* gui/dialogs/task-editor.h:
-	* gui/dialogs/task-page.c:
-	* gui/dialogs/task-page.h:
-
-	Supporting changes:
-	* gui/calendar-component.c:
-	* gui/comp-editor-factory.c:
-	* gui/e-cal-popup.c:
-	* gui/e-calendar-table.c:
-	* gui/e-calendar-view.c:
-	* gui/e-comp-editor-registry.c:
-	* gui/e-memo-table.c:
-	* gui/e-tasks.c:
-	* gui/gnome-cal.c:
-	* gui/memos-component.c:
-	* gui/tasks-component.c:
-	* gui/dialogs/alarm-dialog.c:
-	* gui/dialogs/comp-editor-util.c:
-
-2008-07-15  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #329821
-
-	* gui/e-calendar-table.c: (get_time_as_text), (query_tooltip_cb),
-	(e_calendar_table_init): Show tooltips over task's table.
-
-2008-17-14  Paolo Borelli  <pborelli@katamail.com>
-
-	** Fix for bug #542889
-
-	* gui/dialogs/event-page.c:
-	* gui/alarm-notify/alarm-queue.c:
-	Port to the new gtk tooltip api.
-
-2008-07-13  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #542101
-
-	* gui/e-calendar-view.c: (e_calendar_view_get_tooltips):
-	Escape PlaceOfTheMeeting in the Location: line of the tooltip.
-
-2008-07-13  Keith Packard  <keithp@keithp.com>
-
-	** Fix for bug #541355
-
-	* conduits/calendar/calendar-conduit.c:
-	* conduits/memo/memo-conduit.c:
-	* conduits/todo/todo-conduit.c:
-	The pilot link code does call free_match on data returned from the 
-	for_each method, which the evolution conduits aren't prepared to 
-	handle. This patch removes any freed objects from the 'locals' list in 
-	each conduit which otherwise frees them again when the conduit is closed.
-
-2008-07-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #524130
-
-	* gui/e-cal-component-preview.c: (write_html):
-	* gui/e-cal-component-memo-preview.c: (write_html): Pass description
-	text through 'camel_text_to_html' to have links clickable in a preview.
-
-2008-07-04  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #368038
-
-	* gui/calendar-component.c: (ensure_sources):
-	Ensure only one Birthdays & Anniversaries source.
-
-2008-07-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #540152
-
-	* gui/calendar-component.c: (ensure_sources):
-	Unref sources only when we created it - the list owns the pointer now.
-	* gui/tasks-component.c: (ensure_sources):
-	* gui/memos-component.c: (ensure_sources): Do not leak ESource.
-
-2008-06-16  Maciej Piechotka <uzytkownik2@gmail.com>
-
-	* gui/caltypes.xml:
-	* gui/memotypes.xml:
-	* gui/tasktypes.xml:
-	Usage _title instead of title to allow translations.
-
-2008-06-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* common/authentication.c:
-	* gui/calendar-component.c:
-	* gui/comp-editor-factory.c:
-	* gui/dialogs/copy-source-dialog.c:
-	* gui/dialogs/select-source-dialog.c:
-	* gui/memos-component.c:
-	* gui/migration.c:
-	* gui/tasks-component.c:
-	Use <glib/gi18n.h> instead of <bonobo/bonobo-i18n.h>.
-
-2008-06-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #536813
-
-	* gui/comp-util.h: (is_icalcomp_on_the_server):
-	* gui/comp-util.c: (is_icalcomp_on_the_server): Similar helper function
-	as cal_comp_is_on_server only the parameter is icalcomponent.
-	* gui/e-week-view-event-item.c: (e_week_view_event_item_double_click):
-	* gui/e-week-view.c: (e_week_view_on_text_item_event):
-	Do not start to edit the event on the double click if the event is not
-	on the server yet. Storing the event can cause the renumbering events
-	so the result can be that the edited event would be different.
-
-2008-06-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes security vulnerabilities
-	   CVE-2008-1108 and CVE-2008-1109
-
-	* gui/itip-utils.c (html_new_lines_for):
-	Do not use a fixed-size buffer for parsing external data.
-	Simplify the logic to just split and rejoin the string with a
-	different line separator.
-
-	* gui/e-itip-control.c (write_label_piece), (write_recurrence_piece),
-	(set_date_label):
-	Use a GString rather than a fixed-size buffer to build the HTML
-	string to avoid the possibility of an overflow.
-
-2008-06-04  Shuai Liu <shuai.liu@sun.com>
-
-	** Fix for bug #535204
-
-	* gui/tasks-component.c: (destroy_component_view):
-	The tasks objects had been destroyed before the call of destroy_
-        component in tasks-component.c. No need to call them.
-
-2008-05-29  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #535459
-
-	* gui/itip-utils.h: (is_icalcomp_valid):
-	* gui/itip-utils.c: (is_icalcomp_valid), (check_time):
-	New function to make some sanity checks on component properties.
-	* gui/e-itip-control.c: (e_itip_control_set_data):
-	Do not use component when sanity check fails.
-
-2008-05-23  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534476
-
-	* gui/e-cal-popup.c (ecalp_standard_menu_factory):
-	Remove the special check for "winmail.dat".  GIO correctly
-	identifies it as "application/ms-tnef".
-
-2008-05-23  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #523402
-
-	* gui/e-calendar-view.c: (e_calendar_view_add_event): Do not leak.
-	* conduits/calendar/calendar-conduit.c: (process_multi_day):
-	Reassign back the old values before freeing.
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/e-select-names-renderer.c
-	(e_select_names_renderer_focus_out_event):
-	Remove this unused function.
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534360
-
-	* conduits/calendar/calendar-conduit.c:
-	* conduits/memo/memo-conduit.c:
-	* conduits/todo/todo-conduit.c:
-	* gui/cal-search-bar.c:
-	* gui/cal-search-bar.h:
-	* gui/calendar-commands.c:
-	* gui/calendar-view-factory.h:
-	* gui/calendar-view.h:
-	* gui/comp-editor-factory.h:
-	* gui/dialogs/comp-editor-page.c:
-	* gui/dialogs/comp-editor-page.h:
-	* gui/dialogs/comp-editor.h:
-	* gui/dialogs/e-delegate-dialog.h:
-	* gui/dialogs/event-editor.h:
-	* gui/dialogs/event-page.h:
-	* gui/dialogs/memo-editor.h:
-	* gui/dialogs/memo-page.h:
-	* gui/dialogs/recurrence-page.c:
-	* gui/dialogs/recurrence-page.h:
-	* gui/dialogs/schedule-page.h:
-	* gui/dialogs/task-details-page.h:
-	* gui/dialogs/task-editor.h:
-	* gui/dialogs/task-page.h:
-	* gui/e-alarm-list.c:
-	* gui/e-alarm-list.h:
-	* gui/e-cal-component-memo-preview.h:
-	* gui/e-cal-component-preview.h:
-	* gui/e-cal-list-view-config.h:
-	* gui/e-cal-list-view.h:
-	* gui/e-calendar-table-config.h:
-	* gui/e-calendar-table.h:
-	* gui/e-cell-date-edit-config.h:
-	* gui/e-cell-date-edit-text.h:
-	* gui/e-date-edit-config.h:
-	* gui/e-date-time-list.c:
-	* gui/e-date-time-list.h:
-	* gui/e-day-view-config.h:
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-main-item.h:
-	* gui/e-day-view-time-item.c:
-	* gui/e-day-view-time-item.h:
-	* gui/e-day-view-top-item.c:
-	* gui/e-day-view-top-item.h:
-	* gui/e-day-view.c:
-	* gui/e-day-view.h:
-	* gui/e-itip-control.h:
-	* gui/e-meeting-time-sel-item.c:
-	* gui/e-meeting-time-sel-item.h:
-	* gui/e-meeting-time-sel.c:
-	* gui/e-meeting-time-sel.h:
-	* gui/e-memo-table-config.h:
-	* gui/e-memo-table.h:
-	* gui/e-memos.c:
-	* gui/e-memos.h:
-	* gui/e-mini-calendar-config.h:
-	* gui/e-tasks.c:
-	* gui/e-tasks.h:
-	* gui/e-timezone-entry.c:
-	* gui/e-timezone-entry.h:
-	* gui/e-week-view-config.h:
-	* gui/e-week-view-event-item.c:
-	* gui/e-week-view-event-item.h:
-	* gui/e-week-view-main-item.c:
-	* gui/e-week-view-main-item.h:
-	* gui/e-week-view-titles-item.c:
-	* gui/e-week-view-titles-item.h:
-	* gui/e-week-view.c:
-	* gui/e-week-view.h:
-	* gui/gnome-cal.c:
-	* gui/gnome-cal.h:
-	* gui/weekday-picker.c:
-	* gui/weekday-picker.h:
-	Migrate from deprecated GtkObject symbols to GObject equivalents.
-
-2008-05-22  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	** Fix for bug #533820
-
-	* gui/e-day-view.c: (e_day_view_update_resize),
-	(e_day_view_finish_resize): Fix for a crash on double-clicking the
-	border of meetings in day-view. 
-
-2008-05-08  Tor Lillqvist  <tml@novell.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c: Include e-util-private.h
-	for the mapping of EVOLUTION_GLADEDIR to a function call on
-	Windows. Construct the glade file pathname at run-time so that it
-	is found also on Windows where we don't use compile-time pathnames
-	at run-time.
-
-2008-05-05  Johan Euphrosine  <proppy@aminche.com>
-
-	* gui/migration.c: Fix include path for e-dbhash.h, now in libebackend.
-
-2008-04-30  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #316390
-
-	* calendar/gui/e-memos.c: (struct _EMemosPrivate), (categories_changed_cb),
-	(setup_widgets), (e_memos_init), (e_memos_destroy):
-	* calendar/gui/gnome-cal.c: (struct _GnomeCalendarPrivate), (setup_widgets),
-	(categories_changed_cb), (gnome_calendar_init),
-	(gnome_calendar_destroy):
-	* calendar/gui/e-tasks.c: (struct _ETasksPrivate), (categories_changed_cb),
-	(setup_widgets), (e_tasks_init), (e_tasks_destroy):
-	Listen for changes in categories setup and propagate them to UI.
-
-2008-04-30  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bnc #363908
-	Evolution crashed during exit
-
-	* gui/tasks-component.c: (destroy_component_view):
-
-2008-04-30  Ashish Shrivastava <shashish@novell.com>
-
-	** Fix for bnc #368277
-	Can't C & P Email Addresses from an Appt. to a Mail Message
-
-	* gui/e-select-names-renderer.c:
-	(e_select_names_renderer_start_editing):
-
-2008-04-29  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #240823
-
-	* gui/itip-utils.c: (comp_to_list):
-	Send notification only to individuals and groups.
-
-2008-04-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #524121
-
-	* gui/e-calendar-table.c: (copy_row_cb):
-	Fixing typo from patch for bug #516408.
-
-2008-04-25  Danny Baumann  <dannybaumann@web.de>
-
-	** Fix for bug #529893
-
-	* gui/e-calendar-view.c: (e_calendar_view_get_tooltips):
-	Properly set type hint on tooltip window.
-
-2008-04-18  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #509923
-
-	* gui/dialogs/comp-editor.c: (real_send_comp):
-	* gui/e-calendar-view.c: (e_calendar_view_modify_and_send):
-	* gui/e-cal-model-calendar.c: (ecmc_set_value_at):
-	Send changes based on the user's choice of "all instances" or
-	"only this instance" for recurring events.
-	* gui/e-cal-model-calendar.c: (ecmc_set_value_at):
-	Also modify objects based on the user's choice.
-
-2008-04-17  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #526739
-
-	* gui/e-meeting-store.c: (start_async_read), (freebusy_async),
-	(async_read): Read data with gio, not with gnome-vfs.
-	* gui/e-meeting-store.c: (async_close): Function removed.
-	* gui/migration.c:
-	* gui/e-memos.c:
-	* gui/alarm-notify/notify-main.c:
-	* gui/e-tasks.c:
-	* gui/main.c:
-	* gui/e-meeting-list-view.c:
-	Do not include gnome-vfs.
-	* gui/dialogs/comp-editor.c: (set_attachment_list):
-	* gui/dialogs/comp-editor.c: (attachment_guess_mime_type):
-	Function removed, use e-util function instead.
-	* gui/e-cal-popup.c: (temp_save_part):
-	Reflect changes in CamelStreamVFS.
-	* gui/e-cal-popup.c: (ecalp_apps_open_in), (ecalp_apps_popup_free),
-	(ecalp_standard_menu_factory): Use gio to fill popup and launch app.
-	* gui/e-cal-component-preview.h: (e_cal_comp_preview_url_requested_cb):
-	* gui/e-cal-component-preview.c: (e_cal_comp_preview_url_requested_cb):
-	New helper function to manage file:// urls for GtkHTML component.
-	* gui/e-cal-component-preview.c: (e_cal_component_preview_init):
-	* gui/e-cal-component-memo-preview.c:
-	(e_cal_comp_preview_url_requested_cb):
-	Use above helper function.
-	* gui/e-cal-component-memo-preview.c: (url_requested_cb):
-	* gui/e-cal-component-preview.c: (url_requested_cb): Function removed.
-
-2008-04-17  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #523402
-
-	* gui/e-calendar-view.c: (e_calendar_view_add_event):
-	Do not free value returned by icaltimezone_get_tzid.
-
-2008-04-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #232594
-
-	* gui/e-meeting-list-view.c: (attendee_edited_cb):
-	Set status to Needs Action when attendee's address have been changed.
-
-2008-04-11  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #517134
-
-	* gui/dialogs/comp-editor.c: (add_to_bar),
-	(menu_insert_attachment_cb), (menu_insert_attach_recent_docs_cb),
-	(comp_editor_init): Code re-factoring. Extend the 'Insert' menu to
-	show a "Recent Documents" submenu (to quickly add them as
-	attachments). New callback to handle these actions. 
-
-2008-04-07  Ondrej Jirman  <megous@megous.com>
-
-	** Fix for bug #525234
-
-	* gui/Makefile.am:
-	* gui/dialogs/Makefile.am: Install more include files that are useful
-	to the out of tree evolution plugins.
-
-2008-04-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/Makefile.am:
-	Remove CORBA rules for the old composer.
-
-	* gui/itip-utils.c (comp_from), (comp_to_list), (comp_subject),
-	(comp_content_type), (comp_filename), (comp_description),
-	(append_cal_attachments), (itip_send_comp), (reply_to_calendar_comp):
-	Adapt to new Bonobo-less composer widget.
-
-2008-03-31  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #346555
-
-	* gui/dialogs/calendar-setup.c: (eccp_get_source_color): 
-	Fixed a mnemonic conflict. 
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #517492
-
-	* gui/dialogs/calendar-setup.c: (calendar_setup_edit_calendar),
-	(calendar_setup_edit_task_list), (calendar_setup_edit_memo_list):
-	Set proper dialog caption with New or Properties.
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #438613
-
-	* calendar.error.xml: New message "prompt-read-only-cal-editor".
-	* gui/dialogs/comp-editor.c: (prompt_and_save_changes),
-	(menu_file_save_cb): Use different read-only message when checking
-	from contact editor and from calendar UI.
-
-2008-03-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #512543
-
-	* gui/e-day-view.c:
-	* gui/e-week-view-event-item.c:
-	* gui/e-calendar-view.c:
-	* gui/e-calendar-view.h:
-	* gui/e-week-view-main-item.c:
-	* gui/e-day-view-time-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-day-view-main-item.c:
-	Get rid of ENABLE_CAIRO define.
-
-2008-03-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #513951
-
-	* gui/cal-search-bar.c (cal_search_bar_construct):
-	* gui/migration.c (create_calendar_sources), (create_task_sources),
-	(migrate_calendars), (migrate_tasks), (create_memo_sources):
-	* gui/e-memos.c (e_memos_setup_view_menus):
-	* gui/tasks-component.c (ensure_sources):
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus):
-	* gui/calendar-component.c (ensure_sources):
-	* gui/memos-component.c (ensure_sources):
-	Adapt to new meaning of xxx_component_peek_base_directory().
-
-	* gui/tasks-component.c (tasks_component_init):
-	* gui/calendar-component.c (calendar_component_init):
-	* gui/memos-component.c (memos_component_init):
-	Use e_get_user_data_dir() instead of constructing the full path.
-
-	* gui/migration.c (add_gw_esource):
-	Emit warnings when saving to GConf fails.
-
-2008-02-25  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #516498
-	* gui/comp-util.c: (cal_comp_is_on_server):
-	* gui/e-calendar-view.c: (e_calendar_view_cut_clipboard),
-	(delete_event), (e_calendar_view_delete_selected_occurrence):
-	* gui/e-day-view.c: (process_component):
-	* gui/e-week-view.c: (process_component): Free memory returned 
-	by e_cal_component_get_recurid_as_string.						  	
-
-2008-02-24  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes#516408
-	* gui/dialogs/e-send-options-utils.c
-	(e_sendoptions_utils_fill_component):
-	* gui/e-cal-model.c (search_by_id_and_client):
-	* gui/e-calendar-table.c (copy_row_cb),
-	(e_calendar_table_copy_clipboard):
-	* gui/e-calendar-view.c (e_calendar_view_copy_clipboard),
-	(icalcomp_contains_category):
-	* gui/e-day-view.c (model_rows_deleted_cb),
-	(e_day_view_find_event_from_uid), (e_day_view_reshape_day_events),
-	(e_day_view_on_drag_data_get):
-	* gui/e-itip-control.c (update_item):
-	* gui/e-memo-table.c (copy_row_cb), (e_memo_table_copy_clipboard):
-	* gui/e-memos.c (obtain_list_of_components):
-	* gui/e-tasks.c (obtain_list_of_components):
-	* gui/e-week-view.c (model_rows_deleted_cb),
-	(e_week_view_reshape_events), (e_week_view_find_event_from_uid):
-	* gui/gnome-cal.c (gnome_calendar_purge):
-	* gui/itip-utils.c (comp_limit_attendees), (itip_send_comp),
-	(reply_to_calendar_comp), (itip_publish_comp): Free the memory
-	returned by libical
-
-2008-02-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #440426
-
-	* gui/e-cal-model.c: (e_cal_model_dispose), (remove_client):
-	Unset also default_client if removing it.
-
-2008-02-20  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #515744
-
-	* gui/dialogs/comp-editor.c: (drop_action):
-	Fixing previous fix - do not double free.
-
-2008-02-18  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #515744
-
-	* gui/dialogs/comp-editor.c: (drop_action):
-	* gui/calendar-config.c:
-	(calendar_config_get_hide_completed_tasks_sexp):
-	* gui/comp-editor-factory.c: (edit_existing):
-	* gui/e-day-view.c: (e_day_view_reshape_long_event),
-	(e_day_view_on_top_canvas_drag_data_received):
-	* gui/e-day-view-main-item.c:
-	(e_day_view_main_item_draw_events_in_vbars),
-	(e_day_view_main_item_draw_long_events_in_vbars):
-	* gui/e-day-view-top-item.c: (e_day_view_top_item_draw_long_event):
-	* gui/e-cal-model.c: (redo_queries):
-	* gui/e-calendar-table.c: (e_calendar_table_open_task):
-	* gui/e-memo-table.c: (open_memo):
-	* gui/print.c: (print_todo_details):
-	* gui/migration.c: (get_source_name):
-	Memory leak fix.
-	* gui/e-week-view.c: (e_week_view_reshape_events): Simplifies things.
-
-2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bnc #178778 
-
-	* gui/dialogs/recurrence-page.c: (preview_recur):
-
-2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bnc #160049. Patch from OpenSUSE.
-
-	* common/authentication.c: (build_pass_key),
-	(auth_cal_forget_password):
-	* common/authentication.h:
-	* gui/e-tasks.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb):
-	* gui/gnome-cal.c: (client_cal_opened_cb):
-
-2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Downstream patches from OpenSUSE
-
-	* conduits/calendar/calendar-conduit.c:
-	(local_record_to_pilot_record):
-	* conduits/memo/memo-conduit.c: (local_record_to_pilot_record):
-	* conduits/todo/todo-conduit.c: (local_record_to_pilot_record):
-
-2008-02-14  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #516453
-
-	* gui/e-cal-model-tasks.c: (set_status):
-	Change Not Started status back to Canceled when Canceled requested.
-
-2008-02-14  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #514987
-
-	* gui/e-calendar-table.etspec:
-	* gui/e-calendar-table.c: (status_from_string), (status_compare_cb),
-	(e_calendar_table_init):
-	New sorting by Status based on the index in popup, not on the text.
-
-2008-02-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/alarm-notify/alarm-notify.c: (alarm_notify_add_calendar): Google
-	Calendar alarm works now.
-
-2008-02-10  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #510642
-
-	* gui/dialogs/comp-editor.c: (prompt_and_save_changes),
-	(menu_file_save_cb):
-	* gui/e-calendar-view.c: (e_calendar_view_new_appointment_for):
-	* calendar.error.xml: Improved string for read-only-calendar 
-	error-message. 
-
-2008-02-08  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fixes for bug #395939
-
-	* gui/alarm-notify/alarm-queue.c: (update_cqa):
-	* conduits/calendar/calendar-conduit.c: (local_record_from_comp):
-	Free alarm properly.
-
-2008-01-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #240073
-
-	* gui/e-cal-model-tasks.h: (enum ECalModelTasksField):
-	Move strikeout field to known fields, otherwise the "Click to add" row
-	will have text strikeouted.
-
-2008-01-28  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/print.c: (print_week_summary): Free the component
-	data.
-
-2008-01-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #355864
-
-	* gui/e-week-view.c: (e_week_view_remove_event_cb):
-	Update span->background_item->event_num properly because of remove
-	of the item with lower event_num.
-
-2008-01-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #240073
-
-	* gui/e-cal-model-tasks.h:
-	* gui/e-cal-model-tasks.c: (is_status_canceled), (ecmt_value_at):
-	Define new virtual readonly column to calculate strikeout state.
-	* gui/e-calendar-table.c: (e_calendar_table_init):
-	Use new virtual column as strikeout column.
-
-2008-01-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #475781
-
-	* gui/dialogs/recurrence-page.c: (fill_ending_date),
-	(recurrence_page_fill_widgets):
-	* gui/dialogs/memo-page.c: (memo_page_fill_widgets):
-	* gui/e-day-view.c: 2*(e_day_view_finish_long_event_resize),
-	2*(e_day_view_on_editing_stopped):
-	* gui/itip-utils.c: (comp_compliant), (reply_to_calendar_comp):
-	* gui/e-week-view.c: (e_week_view_on_editing_stopped):
-	* gui/e-calendar-view.c: (e_calendar_view_add_event),
-	(e_calendar_view_get_tooltips):
-	* gui/e-cal-component-preview.c: (write_html):
-	* gui/e-cal-component-memo-preview.c: (write_html):
-	* gui/e-cal-model.c: (add_instance_cb):
-	Fix memory leaks around ECalComponentDateTime.
-
-2008-01-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #510409
-
-	* gui/e-memos.c: (obtain_list_of_components):
-	* gui/e-tasks.c: (obtain_list_of_components):
-	* gui/e-calendar-table.c: (e_calendar_table_copy_clipboard):
-	* gui/e-memo-table.c: (e_memo_table_copy_clipboard):
-	Do not free memmory owned by libical.
-	* gui/e-week-view.c: (e_week_view_reshape_events):
-	Free memory before assigning NULL.
-
-2008-01-25  Tor Lillqvist  <tml@novell.com>
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD): Link with
-	libefilterbar.
-
-2008-01-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #402487
-
-	* gui/cal-search-bar.c: (notify_e_cal_view_contains):
-	Memory leak fix.
-
-2008-01-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #337046
-
-	* gui/dialogs/comp-editor.c: (get_attachment_list): Have a ticking
-	filename for attachment, if the mime doesn't carry it.
-
-2008-01-17  Dan Winship  <danw@gnome.org>
-
-	* gui/itip-utils.c (itip_publish_comp): Port to libsoup 2.4. Plug
-	a leak.
-
-2008-01-17  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #509879
-
-	* gui/e-memos.c: (struct _EMemosPrivate), (update_view_cb),
-	(setup_widgets), (e_memos_destroy):
-	Drop code to clear memo preview every 60 seconds.
-
-2008-01-17  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #426159
-
-	* gui/alarm-notify/alarm-notify-dialog.c: (snooze_pressed_cb):
-	* gui/alarm-notify/alarm-notify.glade: Allow users to snooze for 
-	1+ hour 0 minutes. 
-
-2008-01-15  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #333695
-
-	* gui/print.c: (print_attendees): Print attendee name instead of email
-	address if available.
-
-2008-01-14  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #333695
-
-	* gui/print.c: (get_type_as_string), (get_role_as_string),
-	(print_attendees), (print_comp_draw_page):
-	Helper functions to print attendees and their types and roles
-	in detailed print of the event.
-
-2008-01-14  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #507359
-
-	* gui/e-meeting-time-sel.h: (struct _EMeetingTimeSelector):
-	* gui/e-meeting-time-sel.c: (e_meeting_time_selector_class_init),
-	(e_meeting_time_selector_destroy), (style_change_idle_func),
-	(e_meeting_time_selector_style_set): Recalculate sizes in idle queue,
-	which will ensure the style is propagated in list_view too, because we
-	read from there the height of the row and the style isn't set there
-	before it is set in our widget.
-
-2008-01-14  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #490464
-
-	* gui/dialogs/memo-page.c: (get_recipients): New helper function to
-	obtain recipients from the component.
-	* gui/dialogs/memo-page.c: (memo_page_fill_widgets),
-	(memo_page_fill_component), (memo_page_construct):
-	Always show recipient's widgets for shared memo, but keep it readonly
-	when editing old event. Also make sure the organizer is set by
-	the value in the component, not by the default account.
-
-2008-01-14  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #339620
-
-	* gui/dialogs/recurrence-page.c: (recurrence_page_finalize): Disconnect
-	signal handlers on destroy.
-
-2008-01-14  Suresh Chandrasekharan  <suresh.chandrasekharan@sun.com>
-
-	** Fix for bug #264404
-
-	* gui/e-day-view.c (e_day_view_on_text_item_event):
-	* gui/e-week-view.c (e_week_view_on_text_item_event):
-	Pass down Enter if in preedit-mode.
-
-2008-01-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #508731
-
-	* gui/e-calendar-view.c: (e_calendar_view_new_appointment_full):
-	Have a safe default, if the values from gconf isn't so nice.
-
-2008-01-10  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #457842
-
-	* gui/e-week-view-event-item.c: (e_week_view_event_item_double_click):
-	* gui/e-week-view.c: (e_week_view_start_editing_event):
-	Do not call edit/start editing of the event when double clicked
-	on the same component as is actually editing.
-
-	* gui/calendar-commands.c: (gcal_calendar_selection_changed_cb):
-	Removed forgotten printf call.
-
-2008-01-06  Michael Monreal  <michael.monreal@gmx.net>
-
-	** Fix for bug #492188
-
-	* gui/dialogs/comp-editor.c:
-
-	Use the new Tangoized icons instead of deprecated icons from 
-	gnome-icon-theme.
-
-2008-01-03  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #270605
-
-	* gui/dialogs/event-page.c: (event_page_init),
-	(event_page_select_organizer), (event_page_construct): Code cleanup
-	* gui/dialogs/memo-page.c: (memo_page_init), (source_changed_cb),
-	(memo_page_select_organizer), (memo_page_construct): Skip disabled 
-	accounts.
-	* gui/dialogs/task-page.c: (task_page_init),
-	(task_page_fill_widgets), (task_page_select_organizer),
-	(task_page_construct): Code cleanup, show organizer of assigned tasks,
-	if it already exists.
-
-2008-01-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/memos-component.c: (create_new_memo): Refix the last patch
-
-2008-01-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #506814
-
-	* gui/tasks-component.c: (create_new_todo):
-	* gui/tasks-component.c: (create_new_todo): Add the signal only if the
-	view is present.
-
-2007-12-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #362638
-
-	* gui/alarm-notify/alarm-notify.c:
-	* gui/alarm-notify/alarm-notify.h:
-	* gui/alarm-notify/alarm-queue.c:
-	Rewrite message passing to use GThreadPool instead of EThread.
-
-2007-12-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #340267
-
-	* gui/e-cal-component-preview.c: (write_html):
-	* gui/e-cal-component-memo-preview.c: (write_html):
-	Show description in preview as preformatted text, so
-	tabulators are kept instead of treated as white spaces.
-
-2007-12-11  Sankar P  <psankar@novell.com>
-
-	** Fix for bug #501969
-
-	* gui/gnome-cal.c: (client_cal_opened_cb):
-	Passwords should not be forgotten on all errors
-
-2007-12-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #392747 (extra cleanup work)
-
-	* gui/e-day-view.c (e_day_view_style_set):
-	* gui/e-week-view-titles-item.c (e_week_view_titles_item_draw):
-	* gui/e-week-view.c (e_week_view_style_set):
-	* gui/print.c (print_month_summary):
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_recalc_date_form):
-	Call e_get_month_name() or e_get_weekday_name() instead of
-	e_utf8_strftime() or g_date_strftime().
-
-2007-12-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #501474
-
-	* gui/gnome-cal.c: (update_memo_view):
-	Fix wrong expression from bug #359267
-
-2007-12-04  David Turner  <cillian64@googlemail.com>
-
-	** Fix for bug #354265
-
-	* gui/e-calender-table.c:
-	* gui/e-memo-table.c:
-	* gui/e-calender-view.c:
-	Fixed mnemonic clash between print and paste mnemonics
-
-2007-12-04  Wang Xin  <jedy.wang@sun.com>
-
-	Fixes #501182.
-
-	* gui/gnome-cal.c: (update_todo_view): Handle NULL pointer.
-
-2007-12-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #440497
-
-	* gui/e-meeting-list-view.h: (e_meeting_list_view_column_set_visible):
-	Prototype changed to refer to column based on enum identifier.
-	* gui/e-meeting-list-view.c: (build_table): Store column enum
-	identifier in column datas, for later use.
-	* gui/e-meeting-list-view.c: (e_meeting_list_view_column_set_visible):
-	* gui/dialogs/task-page.c:
-	* gui/dialogs/event-page.c:
-	* gui/e-meeting-time-sel.c:
-	Refer for column based on the enum, not on the column title.
-
-2007-12-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #392747
-
-	* gui/weekday-picker.c (get_day_text):
-	Convert the day_index to GDateWeekday and call e_get_weekday_name().
-
-2007-11-30  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #325730
-
-	* gui/e-calendar-table.c: (hide_completed_rows):
-	* gui/e-cal-model.c: (e_cal_view_objects_added_cb),
-	(e_cal_view_objects_removed_cb), (remove_client_objects):
-	Reverting part of previous patch (2007-11-23) and added
-	notifications about model_changed after done with deleting.
-
-2007-11-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #500024
-
-	* gui/print.c: (print_comp): Set number of pages first.
-
-2007-11-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #214645
-
-	* gui/e-week-view.c: (e_week_view_get_day_position),
-	(e_week_view_convert_position_to_day):
-	* gui/e-week-view-layout.c: (e_week_view_layout_event),
-	(e_week_view_layout_get_span_position):
-	Collapses non-working days to occupy one row and expand other days
-	if possible.
-
-2007-11-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #346693
-
-	* gui/e-day-view.c: (e_day_view_on_editing_started):
-	Ensure new event in top canvas will be visible.
-
-2007-11-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #380644
-
-	* gui/dialogs/task-page.h: (task_page_add_attendee):
-	* gui/dialogs/task-page.c: (task_page_add_attendee):
-	* gui/dialogs/event-page.h: (event_page_add_attendee):
-	* gui/dialogs/event-page.c: (event_page_add_attendee):
-	New function to add attendee to store and name selector.
-	* gui/dialogs/task-page.c: (remove_attendee): Remove attendee also
-	from name selector (keep consistent).
-	* gui/dialogs/task-editor.c: (task_editor_edit_comp):
-	Use task_page_add_attendee to add known attendees.
-	* gui/dialogs/event-editor.c: (event_editor_edit_comp):
-	Use event_page_add_attendee to add known attendees.
-
-	* gui/e-meeting-store.c: (e_meeting_store_remove_all_attendees),
-	(e_meeting_store_remove_attendee): Code cleanup by Matthew Barnes.
-
-2007-11-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #325730
-
-	* gui/e-memos.c: (table_selection_change_cb):
-	* gui/e-tasks.c: (table_selection_change_cb):
-	Clear task/memo preview when have more or less than one row selected.
-	* gui/e-cal-model.c: (e_cal_view_objects_added_cb),
-	(e_cal_view_objects_removed_cb), (remove_client_objects):
-	First delete, then notify, so we read from updated store.
-
-2007-11-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #484603
-
-	* gui/e-week-view.c: (e_week_view_reshape_event_span):
-	Do not forget for organizer icon when counting used icons.
-
-2007-11-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #401337
-
-	* gui/dialogs/task-page.glade:
-	* gui/dialogs/task-page.c: (sensitize_widgets), (get_widgets):
-	Use other mnemonic for Organizer and let it work properly.
-
-2007-11-18  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	** Fix bug #495875
-
-	* gui/calendar-component.c:
-	* gui/memos-component.c:
-	* gui/tasks-component.c:
-	right click menu reordering
-
-2007-11-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #492793
-
-	* gui/dialogs/task-page.c: (task_page_fill_component):
-	* gui/dialogs/comp-editor.c: (page_changed_cb),
-	(page_summary_changed_cb), (page_dates_changed_cb):
-	* gui/dialogs/event-page.c: (event_page_fill_component):
-	* gui/dialogs/memo-page.c: (memo_page_fill_component):
-	Pass real widget as parent to e_notice, not a GObject.
-
-2007-11-13  Ondrej Jirman  <megous@megous.com>
-
-	** Fix for bug #494323
-
-	* gui/e-meeting-store.c: removed useless EBook use.
-
-2007-11-12  Andre Klapper  <a9016009@gmx.de>
-
-	** Fix for bug #496248
-
-	* gui/alarm-notify/alarm-notify.glade:
-	mark "location" field selectable.
-
-2007-11-10  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #209425
-
-	* gui/calendar-commands.c:
-	* gui/e-calendar-view.c:
-	Don't use gtk-home for the go-today action.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #491345
-
-	* gui/e-tasks.c: (config_hide_completed_tasks_changed_cb):
-	Also change default filter for tasks, to let this work without restart.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #353780
-
-	* gui/dialogs/comp-editor.h: (comp_editor_get_current_comp):
-	* gui/dialogs/comp-editor.c: (prompt_and_save_changes),
-	(menu_file_save_cb), (comp_editor_append_page),
-	(comp_editor_get_current_comp):
-	Stop processing immediately when page is filled incorrectly.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #341085
-
-	* gui/e-day-view.c: (e_day_view_reshape_day_event):
-	Use 'x_offset' instead of changing event size when has icons.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #359267
-
-	* gui/gnome-cal.c: (update_memo_view):
-	Changed memo_sexp to show always memos without start date.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #351932
-
-	* gui/dialogs/task-page.c: (check_start_before_end), (times_updated),
-	(start_date_changed_cb), (due_date_changed_cb), (init_widgets):
-	Ensure due date is not before start date.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #315101
-
-	* drag and drop to other source for multiselect
-	* gui/comp-util.h:
-	* gui/comp-util.c: (cal_comp_selection_set_string_list),
-	(cal_comp_selection_get_string_list): Two new helper functions
-	to set and get list of strings into GtkSelectionData.
-	* gui/e-tasks.c: (get_selected_components_cb),
-	(do_for_selected_components), (obtain_list_of_components),
-	(table_drag_data_get):
-	* gui/e-memos.c: (get_selected_components_cb),
-	(do_for_selected_components), (obtain_list_of_components),
-	(table_drag_data_get): Pass list of selected components as data
-	for drag and drop instead of focused component from the list.
-	* gui/e-tasks.c: (table_drag_data_delete):
-	* gui/e-memos.c: (table_drag_data_delete): Obsolete now.
-	* gui/tasks-component.c: (selector_tree_drag_data_received):
-	* gui/memos-component.c: (selector_tree_drag_data_received):
-	Receiving list of components, so made changes here to reflect it.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #318604
-
-	* Enable source when adding event to disabled source.
-	* gui/gnome-cal.h: (gnome_calendar_emit_user_created_signal):
-	New helper function which will store used calendar before emitting
-	signal "user_created" on the instance to GnomeCalendar for later use
-	and unset it right after the emit.
-	* gui/gnome-cal.c: (struct _GnomeCalendarPrivate): New member to store
-	used ECal before emitting "user_created" signal.
-	* gui/gnome-cal.c: (gnome_calendar_emit_user_created_signal),
-	(user_created_cb): Implementation of new helper function and enabling
-	last used source instead of default one on "user_created" signal.
-	* gui/e-day-view.c: (e_day_view_on_editing_stopped):
-	* gui/e-week-view.c: (e_week_view_on_editing_stopped):
-	* gui/e-calendar-view.c: (object_created_cb): Use our new
-	helper function to emit "user_created" signal with proper ECal.
-	* gui/e-calendar-table.h: (struct _ECalendarTable):
-	* gui/e-memo-table.h: (struct _EMemoTable): New member added.
-	* gui/e-calendar-table.c: (e_calendar_table_init):
-	* gui/e-memo-table.c: (e_memo_table_init): Initialize member to NULL.
-	* gui/tasks-component.c: (object_created_cb), (create_new_todo):
-	* gui/memos-component.c: (object_created_cb), (create_new_memo):
-	Add new callback function to notice new object created and emit
-	"user_created" signal with proper ECal stored in ECalendarTable.
-	* gui/e-tasks.c: (user_created_cb):
-	* gui/e-memos.c: (user_created_cb): Use previously stored ECal, which
-	has been used to create event, instead of using default ECal.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #346693
-
-	* gui/e-day-view-top-item.h: (EDayViewTopItem):
-	New property 'show_dates'.
-	* gui/e-day-view-top-item.c: (e_day_view_top_item_draw),
-	(e_day_view_top_item_class_init), (e_day_view_top_item_init),
-	(e_day_view_top_item_set_arg):
-	Always draw background rectangle over whole requested place and
-	draw dates or event only, based on new property 'show_dates'.
-	* gui/e-day-view.h: (struct _EDayView): New properties 'tc_vscrollbar',
-	'top_dates_canvas', 'top_dates_canvas_item'.
-	* gui/e-day-view.c: (E_DAY_VIEW_MAX_ROWS_AT_TOP),
-	(e_day_view_top_scroll), (e_day_view_update_top_scroll),
-	(e_day_view_on_top_canvas_scroll), (e_day_view_init),
-	(e_day_view_style_set), (e_day_view_size_allocate),
-	(e_day_view_check_layout), (e_day_view_on_editing_started):
-	Added support for scrolling 'top_canvas' when number of items there
-	increases over the 'E_DAY_VIEW_MAX_ROWS_AT_TOP'.
-	* gui/e-day-view.c: (e_day_view_set_selected_time_range),
-	(e_day_view_set_selected_time_range_in_top_visible),
-	(e_day_view_set_selected_time_range_visible),
-	(e_day_view_set_selected_time_range), (e_day_view_update_query),
-	(e_day_view_goto_start_of_work_day), (e_day_view_goto_end_of_work_day),
-	(e_day_view_change_duration_to_start_of_work_day),
-	(e_day_view_change_duration_to_end_of_work_day),
-	(e_day_view_layout_timeout_cb): Redraw top_dates_canvas if necessary.
-
-2007-11-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Remove dead files from source control.  The dates below
-	   indicate when the file was removed from Makefile.am.
-	   Fixes part of bug #478704.
-
-	* gui/dialogs/calendar-setup.glade	(Nov 2004)
-	* gui/dialogs/meeting-page.etspec	(Sep 2003)
-	* gui/dialogs/new-calendar.glade	(Jan 2003)
-	* gui/dialogs/new-task-list.glade	(Jan 2004)
-	* gui/dialogs/url-editor-dialog.c	(Dec 2005)
-	* gui/dialogs/url-editor-dialog.glade	(Dec 2005)
-	* gui/dialogs/url-editor-dialog.h	(Dec 2005)
-	* gui/e-pub-utils.c			(Dec 2005)
-	* gui/e-pub-utils.h			(Dec 2005)
-	* gui/gnome-calendar-conduit.png	(May 2000)
-
-2007-11-02  Damien Carbery  <damien.carbery@sun.com>
-
-	** Fixes bug #492058
-
-	* gui/e-itip-control.c: Name the anonymous unions to build
-	with the Sun Studio compiler.
-
-2007-10-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/alarm-notify/alarm-notify.glade:
-	Fix spacing between alarm description and buttons.
-
-2007-10-29  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #490538
-
-	* gui/dialogs/memo-page.c: (fill_comp_with_recipients):
-	* gui/e-meeting-list-view.c: (process_section):
-	Free memory properly after call of e_contact_store_get_books.
-
-2007-10-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #417999
-
-	* gui/dialogs/task-page.c: (init_widgets): Use "changed" signal,
-	instead of old "source_changed" to notify change of selected source.
-
-2007-10-26  Matthew Barnes  <mbarnes@redhat.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_to_pilot_record):
-	* conduits/memo/memo-conduit.c (local_record_to_pilot_record):
-	* conduits/todo/todo-conduit.c (local_record_to_pilot_record):
-	Zero out the GnomePilotRecord struct to silence a compiler warning.
-
-	* gui/dialogs/memo-page.c (memo_page_select_organizer):
-	Initialize def_address.
-
-	* gui/e-itip-control.c:
-	Use unions to avoid strict-aliasing violations.
-
-2007-10-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/alarm-notify/alarm-notify-dialog.c:
-	* gui/alarm-notify/alarm-notify.c: 
-	* gui/alarm-notify/alarm-queue.c:
-	* gui/alarm-notify/config-data.c:
-	* gui/cal-search-bar.c: 
-	* gui/calendar-commands.c:
-	* gui/calendar-config.c: 
-	* gui/dialogs/alarm-dialog.c: 
-	* gui/dialogs/alarm-list-dialog.c: 
-	* gui/dialogs/cal-prefs-dialog.c: 
-	* gui/dialogs/comp-editor.c: 
-	* gui/dialogs/event-page.c: 
-	* gui/dialogs/recurrence-page.c: 
-	* gui/e-alarm-list.c: 
-	* gui/e-cal-config.c:
-	* gui/e-cal-event.c: 
-	* gui/e-cal-menu.c:
-	* gui/e-cal-popup.c: 
-	* gui/e-calendar-table.c: 
-	* gui/e-calendar-view.c:
-	* gui/e-date-time-list.c:
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-time-item.c:
-	* gui/e-day-view.c: 
-	* gui/e-itip-control.c: 
-	* gui/e-meeting-list-view.c: 
-	* gui/e-memo-table.c:
-	* gui/e-select-names-editable.c: 
-	* gui/e-week-view-event-item.c: 
-	* gui/e-week-view.c: 
-	* gui/goto.c:
-	* gui/migration.c: 
-	* gui/print.c: 
-	* gui/tasks-control.c: 
-	* importers/icalendar-importer.c: 
-
-	Warning fixes:
-	- NULL vs 0 vs FALSE/TRUE
-	- ANSIfication of declarations
-	- mixing declarations and code
-	- mark some code static
-	- remove use of some deprecated Gtk+ apis
-
-2007-10-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #417999
-
-	* gui/dialogs/event-page.c:
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/memo-page.c:
-	* gui/dialogs/memo-page.glade:
-	* gui/dialogs/task-page.c:
-	* gui/dialogs/task-page.glade:
-	* gui/e-itip-control.c:
-	Use ESourceComboBox instead of ESourceOptionMenu (deprecated).
-
-2007-10-12  Michael Monreal <michael.monreal@gmail.com>
-
-	** New view-calendar icons (bug #479257)
-
-	* calendar/gui/calendar-commands.c: Change icon references.
-
-2007-10-12  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #466659
-
-	* gui/e-cal-list-view.c: (setup_e_table): Do not allow the user to set
-	a 'no-date' for start/end of appointments in list view.
-
-2007-10-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/alarm-notify/alarm-queue.c:
-	Fix an implicit GTK+ function declaration on x86_64.
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* conduits/calendar/calendar-conduit.c:
-	* conduits/memo/memo-conduit.c:
-	* conduits/todo/todo-conduit.c:
-	* gui/dialogs/alarm-dialog.c:
-	* gui/dialogs/event-page.c:
-	* gui/dialogs/memo-page.c:
-	* gui/dialogs/task-page.c:
-	* gui/e-day-view-layout.c:
-	* gui/e-day-view-layout.h:
-	* gui/print.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-10-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #324526
-
-	* gui/print.c: (print_week_event): Draw picture with dots to indicate
-	that not all events are printed in a day.
-
-2007-10-07  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #455862
-	Plugged memory leaks.
-
-	* gui/comp-util.c:
-	* gui/comp-util.h:(cal_comp_util_get_n_icons): A new function to
-	get the number of icons owned by ECalComponent.
-
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view.c:
-	* gui/e-week-view-event-item.c:
-	* gui/e-week-view.c: Use cal_comp_util_get_n_icons.
-
-2007-10-05  Milan Crha  <mcrha@redhat.com>
-
-	* gui/alarm-notify/alarm-queue.c: (alarm_queue_remove_client):
-	Fixed leak caused by my changes in fix for bug #325685.
-
-2007-10-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #477045
-
-	* gui/calendar-component.c:
-	* gui/memos-component.c:
-	* gui/tasks-component.c:
-	Use "edit-copy" and "document-properties" icons in the pop-up menu.
-
-2007-10-04  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #325685
-
-	* gui/print.c: (print_week_day_event): Show end time of the event only
-	when printing week view with less than 3 weeks (because of no space).
-
-2007-10-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #469657
-
-	* gui/comp-editor-factory.c:
-	Use destroy functions in GHashTables to simplify memory management.
-
-2007-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #428402
-
-	* gui/e-itip-control.c: (show_current): First move to next component,
-	then remove last alarm and then free that last component.
-
-	* gui/e-itip-control.c: (update_item): Free component when done.
-
-	* importers/icalendar-importer.c: (prepare_events), (prepare_tasks):
-	Really go through every component when removing one.
-
-2007-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #342283
-
-	* gui/calendar-commands.h: (calendar_command_print): New function.
-	* gui/calendar-commands.c: (calendar_command_print), (file_print_cb),
-	(file_print_preview_cb):
-	* gui/e-calendar-view.c: (on_print):
-	Behaves consistently when printing from File->Print and popup->Print.
-
-2007-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #230339
-
-	* gui/print.c: (print_day_event): Print also location, if present.
-
-2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #461195
-
-	* gui/e-calendar-marshal.list: Remove needless marshalers.
-	* gui/e-memos.c:
-	* gui/e-tasks.c: Use GObject's marshalers.
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #477045
-
-	* gui/calendar-commands.c:
-	* gui/calendar-component.c:
-	* gui/dialogs/cal-attachment-select-file.c:
-	* gui/dialogs/comp-editor.c:
-	* gui/dialogs/event-editor.c:
-	* gui/dialogs/task-editor.c:
-	* gui/e-cal-popup.c:
-	* gui/e-calendar-table.c:
-	* gui/e-calendar-view.c:
-	* gui/e-day-view.c:
-	* gui/e-memo-table.c:
-	* gui/e-week-view.c:
-	* gui/memos-component.c:
-	* gui/memos-control.c:
-	* gui/tasks-component.c:
-	* gui/tasks-control.c:
-	Use standard icon names where applicable.
-
-2007-09-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #346686
-
-	* gui/e-cal-model.h: (e_cal_model_test_row_editable):
-	* gui/e-cal-model.c: (e_cal_model_test_row_editable): New helper
-	function to check if row is editable or not, based on calendar.
-	* gui/e-cal-model-memos.c: (ecmm_is_cell_editable):
-	* gui/e-cal-model-tasks.c: (ecmt_is_cell_editable):
-	* gui/e-cal-model-calendar.c: (ecmc_is_cell_editable):
-	* gui/e-cal-model.c: (ecm_is_cell_editable):
-	Uses new helper function to determine if row is editable.
-
-2007-09-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #324472
-
-	* gui/e-calendar-table.c: (struct AffectedComponents),
-	(e_calendar_table_complete_selected),  (get_selected_components_cb),
-	(do_for_selected_components), (mark_comp_complete_cb),
-	(mark_comp_incomplete_cb): Added new helper structure and functions.
-	* gui/e-calendar-table.c: (mark_as_complete_cb),
-	(mark_as_incomplete_cb): Using new helper functions.
-	* gui/e-cal-model-tasks.h: (e_cal_model_tasks_mark_comp_complete),
-	(e_cal_model_tasks_mark_comp_incomplete): New functions (replace old).
-	* gui/e-cal-model-tasks.c: (commit_component_changes),
-	(ecmt_set_value_at), (e_cal_model_tasks_mark_comp_complete),
-	(e_cal_model_tasks_mark_comp_incomplete): Added new functions to work
-	with components instead of table's rows and using them.
-
-2007-09-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #300693
-
-	* gui/e-calendar-table.c: (task_compare_cb), (e_calendar_table_init):
-	* gui/e-calendar-table.etspec:
-	* gui/e-memo-table.c: (task_compare_cb):
-	* gui/e-memo-table.etspec:
-	Removed obsolete code and references to "task-sort" virtual column.
-
-2007-09-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fixes part of bug #228832
-
-	* gui/gnome-cal.h: (gnome_calendar_new_task):
-	* gui/gnome-cal.c: (gnome_calendar_new_task): Added parameters to
-	inherit selected time for 'dtstart' and 'due' of new task.
-	* gui/e-calendar-view.c: (on_new_task): Passing selected time to use.
-
-2007-09-21  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #411125
-
-	* gui/dialogs/meeting-page.etspec:
-	* gui/e-meeting-time-sel.etspec:
-	* gui/e-memo-table.etspec:
-	* gui/e-calendar-table.etspec:
-	* gui/e-cal-list-view.etspec:
-	Uses 'compare="collate"' instead of 'compare="string"' to handle UTF
-	characters correctly.
-
-2007-09-21  Jedy Wang  <jedy.wang@sun.com>
-
-	** Fixes bug #476124.
-
-	* calendar/gui/dialogs/comp-editor.c: Handle NULL pointer.
-
-2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #476231
-
-	* gui/dialogs/cal-attachment-select-file.c:
-	Remove non-USE_GTKFILECHOOSER code.
-	GtkFileChooser has been around since 2004.
-
-2007-09-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #476040
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c:
-	* gui/dialogs/comp-editor.c:
-	Use "mail-attachment" icon instead of "stock_attach".
-
-2007-09-10  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #300284 (bnc)
-
-	* gui/e-cal-list-view.c: (setup_e_table): Do not allow the user to set
-	a 'no-date' for start/end of appointments in list view.
-
-2007-09-10  Milan Crha  <mcrha@redhat.com>
-	
-	** Fix for bug #368033
-
-	* gui/calendar-component.c: (ensure_sources):
-	Assign default color for B&A when no color is set.
-
-2007-09-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes#332026
-	* gui/e-day-view.c: (e_day_view_do_key_press),
-	(e_day_view_start_editing_event): Filter the input context
-	key events.					  
-
-	Committing on behalf of Mayank <mayank.gnu@gmail.com>
-
-2007-09-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #270605
-	* gui/dialogs/event-page.c: (event_page_select_organizer),
-	(event_page_construct):
-	* gui/dialogs/task-page.c: (task_page_select_organizer),
-	(task_page_construct): Skip disabled accounts and choose first available address as 
-	organizer.
-
-	Reworked the patch from Milan Crha  <mcrha@redhat.com> to apply properly as the previous
-	commit made changes in the same area.		  
-
-2007-09-09  Suman Manjunath  <msuman@novell.com>
-
-	* gui/dialogs/event-page.c: (event_page_init),
-	(event_page_finalize), (clear_widgets),
-	(event_page_fill_component), (source_changed_cb),
-	(event_page_select_organizer), (event_page_construct):
-	* gui/dialogs/memo-page.c: (memo_page_init), (memo_page_finalize),
-	(clear_widgets), (memo_page_fill_widgets),
-	(memo_page_fill_component), (source_changed_cb),
-	(set_subscriber_info_string), (memo_page_select_organizer),
-	(memo_page_construct):
-	* gui/dialogs/task-page.c: (task_page_init), (task_page_finalize),
-	(clear_widgets), (task_page_fill_widgets),
-	(task_page_fill_component), (task_page_set_info_string),
-	(source_changed_cb), (set_subscriber_info_string),
-	(task_page_select_organizer), (task_page_construct): code cleanup.
-
-2007-09-07  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	* gui/e-itip-control.c: (insert_boxes), (insert_ok):
-	fix weak references, pointed by Milan Crha <mcrha@redhat.com>
-	which fixes one issue of the patch from bug #439122
-
-2007-09-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #473903
-
-	* gui/e-meeting-store.c: (freebusy_async):
-	* gui/cal-search-bar.c: (get_current_category ):
-	* gui/itip-utils.c: (comp_limit_attendees):
-	* gui/e-tasks.c: (e_tasks_open_task_id):
-	* gui/print.c: (struct PrintCompItem), (struct PrintCalItem):
-	Fixes serious compiler warnings.
-
-2007-01-08  Wang Xin  <jedy.wang@sun.com>
-	
-	Fixes #470968
-
-	* calendar/gui/e-calendar-table.c: Delete the task with attendee if OK button
-	of the confirm dialog is clicked.
-
-2007-09-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix a build break.
-
-	* conduits/common/libecalendar-common-conduit.c:
-	(e_pilot_remote_category_to_local):
-	* conduits/common/libecalendar-common-conduit.h:
-
-2007-09-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #201167 by Nathan Owens
-
-	* conduits/todo/Makefile.am:
-	* conduits/todo/todo-conduit.c:
-	* conduits/common/libecalendar-common-conduit.c:
-	* conduits/common/libecalendar-common-conduit.h:
-	* conduits/common/Makefile.am:
-	* conduits/calendar/Makefile.am:
-	* conduits/calendar/calendar-conduit.c:
-	* conduits/Makefile.am:
-	* conduits/memo/memo-conduit.c:
-	* conduits/memo/Makefile.am:
-
-2007-09-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #471791 (Move away from asserts to g_ret*)
-
-	* gui/alarm-notify/alarm-queue.c: (alarm_trigger_cb),
-	(remove_comp), (notify_dialog_cb), (audio_notification),
-	(procedure_notification), (remove_cqa), (remove_client_alarms):
-	* gui/alarm-notify/notify-main.c: (alarm_notify_factory_fn),
-	(init_alarm_service):
-	* gui/cal-search-bar.c: (free_categories), (get_current_category),
-	(regen_query), (make_suboptions), (cal_search_bar_set_categories):
-	* gui/calendar-commands.c: (sensitize_items),
-	(calendar_control_sensitize_calendar_commands),
-	(sensitize_taskpad_commands), (gcal_calendar_focus_change_cb),
-	(gcal_taskpad_focus_change_cb), (calendar_control_activate),
-	(calendar_control_deactivate):
-	* gui/calendar-component.c: (set_info):
-	* gui/calendar-config.c: (units_to_string),
-	(calendar_config_get_hide_completed_tasks_sexp):
-	* gui/calendar-view-factory.c: (calendar_view_factory_get_title),
-	(calendar_view_factory_get_type_code):
-	* gui/calendar-view.c: (calendar_view_get_type_code):
-	* gui/comp-editor-factory.c: (free_request), (editor_destroy_cb),
-	(edit_existing), (edit_new), (queue_edit_existing),
-	(queue_edit_new):
-	* gui/comp-util.c: (cal_comp_event_new_with_defaults):
-	* gui/dialogs/alarm-dialog.c: (repeat_widgets_to_alarm),
-	(dialog_to_alarm), (action_selection_done_cb):
-	* gui/dialogs/comp-editor-page.c: (comp_editor_page_get_widget),
-	(comp_editor_page_focus_main_widget),
-	(comp_editor_page_fill_widgets):
-	* gui/dialogs/comp-editor-util.c: (comp_editor_strip_categories):
-	* gui/dialogs/comp-editor.c: (comp_editor_append_page),
-	(raise_and_focus):
-	* gui/dialogs/event-page.c: (event_page_fill_component),
-	(event_page_set_all_day_event), (times_updated),
-	(alarm_custom_clicked_cb):
-	* gui/dialogs/recurrence-page.c: (simple_recur_to_comp),
-	(fill_component), (make_weekly_special), (make_monthly_special),
-	(make_recurrence_special), (make_ending_until_special),
-	(make_ending_count_special), (make_ending_special),
-	(recurrence_page_fill_widgets), (exception_add_cb):
-	* gui/e-cal-model.c: (clear_objects_array), (ecm_value_at),
-	(ecm_set_value_at), (e_cal_model_set_default_client),
-	(update_e_cal_view_for_client), (cal_opened_cb),
-	(remove_client_objects):
-	* gui/e-calendar-table.c: (e_calendar_table_get_selected_comp):
-	* gui/e-calendar-view.c: (e_calendar_view_add_event):
-	* gui/e-day-view.c: (update_row), (model_rows_inserted_cb),
-	(e_day_view_convert_event_coords), (e_day_view_update_query),
-	(cancel_editing), (e_day_view_on_editing_stopped):
-	* gui/e-itip-control.c: (find_cal_opened_cb),
-	(write_recurrence_piece), (get_cancel_options), (show_current),
-	(ok_clicked_cb):
-	* gui/e-meeting-list-view.c: (name_selector_dialog_close_cb):
-	* gui/e-meeting-store.c: (refresh_busy_periods):
-	* gui/e-memo-table.c: (get_selected_comp):
-	* gui/e-memos.c: (e_memos_setup_view_menus),
-	(e_memos_discard_view_menus):
-	* gui/e-tasks.c: (e_tasks_setup_view_menus),
-	(e_tasks_discard_view_menus):
-	* gui/e-week-view-event-item.c: (e_week_view_event_item_draw):
-	* gui/e-week-view-layout.c: (e_week_view_find_day):
-	* gui/e-week-view.c: (update_row), (model_rows_inserted_cb),
-	(e_week_view_update_query), (e_week_view_start_editing_event),
-	(cancel_editing), (e_week_view_cursor_key_up),
-	(e_week_view_cursor_key_down), (e_week_view_cursor_key_left),
-	(e_week_view_cursor_key_right):
-	* gui/gnome-cal.c: (get_times_for_views), (get_focus_location),
-	(update_query), (gnome_calendar_direction), (set_view),
-	(display_view), (gnome_calendar_setup_view_menus),
-	(gnome_calendar_discard_view_menus), (client_cal_opened_cb),
-	(open_ecal), (backend_died_cb),
-	(gnome_calendar_remove_source_by_uid):
-	* gui/memos-control.c: (memos_control_sensitize_commands),
-	(memos_control_activate), (memos_control_deactivate):
-	* gui/print.c: (print_calendar_draw_page):
-	* gui/tasks-control.c: (sensitize_items),
-	(tasks_control_sensitize_commands), (tasks_control_activate),
-	(tasks_control_deactivate):
-	* gui/weekday-picker.c: (day_event_cb):
-	* importers/icalendar-importer.c: (ivcal_import_items):
-
-2007-08-29  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #466051
-
-	* gui/dialogs/memo-page.c: (memo_page_fill_component): When memo start
-	date is set to 'None', do not store DTSTART property.
-
-2007-08-28  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/e-cal-popup.c (e_cal_popup_target_new_source):
-	g_strncasecmp() is deprecated; use g_ascii_strncasecmp() instead.
-
-2007-08-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for the same issue of week view of bug #330628
-
-	* gui/e-week-view.h: Add meeting_icon.
-	* gui/e-week-view.c: (e_week_view_realize): Load meeting_icon.
-	* gui/e-week-view.c: (e_week_view_unrealize): Dispose meeting_icon.
-	* gui/e-week-view-event-item.c: (e_week_view_event_item_draw_icons):
-	Show meeting icon.
-
-2007-08-24  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Fix for bug #468440
-
-	* gui/e-week-view-event-item.c: Dont popup if the event is destroyed
-	(e_week_view_event_item_button_press):
-	* gui/e-week-view.c: (e_week_view_init), Init a variable to tell the
-	event handler that the event is destroyed
-	(e_week_view_on_editing_stopped): Set event_destroyed.
-	* gui/e-week-view.h:
-
-2007-08-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #468411
-
-	* gui/e-week-view.c: (e_week_view_on_text_item_event): Grab focus to
-	main view, so that the even gets created.
-
-2007-08-24  Johnny Jacob  <jjohnny@novell.com>	
-
-	** Fix for bug #466796
-	
-	* gui/calendar-config.c :  adds calendar_config_init() to the beginning of every function
-	that uses the 'config' variable.
-
-	Committing on behalf of Rouslan Solomakhin
-	<rouslan@solomakhin.net>
-	
-2007-08-24  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #330628
-
-	* gui/e-day-view-top-item.c: (e_day_view_top_item_draw_long_event):
-	Show meeting icon.
-
-2007-08-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #385517
-
-	* gui/dialogs/cal-prefs-dialog.c: (show_task_list_config):
-	Use actual state to sensitive tasks_hide_completed_* widgets.
-
-2007-08-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #329746
-
-	* gui/dialogs/comp-editor.c: (make_icon_from_comp):
-	Return proper icon for memo components.
-	* gui/dialogs/delete-comp.c: (delete_component_dialog),
-	(prompt_retract_dialog):
-	* gui/dialogs/changed-comp.c: (changed_component_dialog):
-	* gui/dialogs/comp-editor.c: (make_title_from_comp),
-	(make_title_from_string):
-	* gui/dialogs/cancel-comp.c: (cancel_component_dialog):
-	* gui/dialogs/delete-error.c: (delete_error_dialog):
-	* gui/dialogs/recur-comp.c: (recur_component_dialog):
-	* gui/itip-utils.c: (comp_subject), (comp_description):
-	* calendar.error.xml:
-	Renamed 'Journal' to 'Memo'.
-
-2007-08-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #428110
-
-	* gui/memos-component.c: (update_single_object):
-	Added parameter to rather fail on adding same object with drag&drop,
-	rather than modify and then delete existing one.
-	* gui/memos-component.c: (update_objects): Use new parameter above.
-	* gui/memos-component.c: (selector_tree_drag_data_received):
-	Use result of call 'update_objects' and prevent delete object when
-	the call fails.
-
-2007-08-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #201201
-
-	* gui/e-week-view.h: (struct _EWeekView): Added properties.
-	* gui/e-week-view.c: (e_week_view_init),
-	(e_week_view_on_button_press): First click stores actual selection
-	in structure and when second click was inside this selection, then
-	the selection is restored and used for new appointment.
-
-	** Fix for bug #201202
-
-	* gui/e-day-view.h: (struct _EDayView): Added properties.
-	* gui/e-day-view.c: (e_day_view_init),
-	(e_day_view_on_top_canvas_button_press),
-	(e_day_view_on_main_canvas_button_press):
-	Same as with week view above.
-
-2007-08-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #338803
-
-	* gui/e-meeting-time-sel-item.c:
-	(e_meeting_time_selector_item_button_press):
-	Keeps actual meeting duration, not reset to half/full hour.
-
-	* gui/dialogs/event-page.c: (update_time):
-	Updates also duration spin buttons, not only end date/time edits.
-
-2007-08-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #347770
-
-	* gui/e-cal-component-memo-preview.c: (write_html):
-	Improved description text parsing.
-
-2007-08-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #355864
-
-	* gui/e-week-view.c: (e_week_view_remove_event_cb):
-	Better remove array item after done with it, not before.
-
-2007-08-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #272167
-
-	* gui/e-cal-popup.c: (e_cal_popup_target_new_source):
-	Marks both offline flags on local calendars, so both popup menu
-	items are hidden.
-
-2007-08-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #308636
-
-	* gui/dialogs/calendar-setup.c: (eccp_get_source_type):
-	Add only source groups without property 'create_source=no'.
-	* gui/dialogs/calendar-setup.c: (cs_load_sources):
-	New helper function avoids code copying.
-	* gui/dialogs/calendar-setup.c: (calendar_setup_edit_calendar),
-	(calendar_setup_edit_task_list), (calendar_setup_edit_memo_list):
-	Uses 'cs_load_sources'.
-	* gui/calendar-component.c: (ensure_sources):
-	Sets 'create_source=no' for contacts when not set before.
-
-2007-08-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #262226
-
-	* gui/e-calendar-view.h:
-	* gui/e-calendar-view.c: (e_calendar_view_new_appointment_full):
-	Changed meaning of the last parameter: no_past_date to indicate if
-	we accept past dates (we do not for File->New->items).
-	Also changed behavior: when don't need all_day event and there are
-	24 hours selected, then change start/end to actual time in actual day,
-	or to 'day begins' from pereferences for other selected days,
-	instead of setting all_day event to TRUE.
-	* gui/calendar-component.c: (create_new_event):
-	Don't force all day event.
-	* gui/e-week-view.c: (e_week_view_on_button_press):
-	Changing call of 'e_calendar_view_new_appointment_full'.
-
-	* gui/dialogs/event-page.c: (clear_widgets):
-	Fixed critical warning when no default_address set.
-	* gui/dialogs/event-page.c: (event_page_finalize),
-	(event_page_select_organizer): Free memory when no longer needed.
-	* gui/dialogs/event-page.c: (event_page_init): There was twice the same.
-
-2007-08-17  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #420492
-	* gui/dialogs/event-page.c: (event_page_fill_widgets):
-	set the free_busy flag properly.		
-	
-	Committing on behalf of Ebby Wiselyn <ebbywiselyn@gmail.com>
-
-2007-08-17  Suman Manjunath  <msuman@novell.com>
-
-	reviewed by: Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-day-view.c: (e_day_view_do_key_press):
-	* gui/e-week-view.c: (e_week_view_do_key_press):
-	Set the free/busy info of events entered directly on the canvas, with 
-	the editor defaults.
-
-2007-08-17  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #274070 (bnc)
-	* gui/e-meeting-attendee.[ch]: (e_meeting_attendee_finalize),
-	(e_meeting_attendee_get_fburi), (e_meeting_attendee_set_fburi):
-	* gui/e-meeting-list-view.c: (process_section):
-	* gui/e-meeting-store.c: (freebusy_async), (start_async_read):
-	If the contact has a free busy url specified with it, use it to show
-	free busy information.	
-
-2007-08-16  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #350539
-
-	* gui/e-cal-popup.c: (ecalp_part_popup_set_background):
-	Ensures non-NULL part.
-
-2007-08-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #464106
-
-	* gui/goto.c: (goto_dialog):
-	Set week_view_start with respect to settings.
-
-2007-08-13  Suman Manjunath  <msuman@novell.com>
-
-	reviewed by: Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/event-page.c: (event_page_init),
-	(sensitize_widgets), (get_current_account),
-	(event_page_fill_widgets), (event_page_fill_component),
-	(existing_attendee), (event_page_set_info_string), (get_widgets),
-	(source_changed_cb), (init_widgets), (event_page_select_organizer),
-	(event_page_construct):
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/memo-page.c: (memo_page_init), (sensitize_widgets),
-	(memo_page_fill_widgets), (get_current_account),
-	(memo_page_fill_component), (memo_page_set_info_string),
-	(get_widgets), (source_changed_cb), (init_widgets),
-	(memo_page_select_organizer), (memo_page_construct):
-	* gui/dialogs/memo-page.glade:
-	* gui/dialogs/task-page.c: (task_page_init), (sensitize_widgets),
-	(get_current_account), (task_page_fill_widgets),
-	(task_page_fill_component), (existing_attendee),
-	(task_page_set_info_string), (get_widgets), (source_changed_cb),
-	(init_widgets), (task_page_select_organizer),
-	(task_page_construct):
-	* gui/dialogs/task-page.glade: Add a label on the top to show information string 
-	for calendar, task and memo editors. It would be shown while operating on subscribed
-	user's folder items.
-	 * gui/itip-utils.c: (itip_send_comp), (reply_to_calendar_comp): A
-	utility function sanitize_component has been removed. The sentby parameter
-	is set in the event pages.										  
-
-2007-08-10  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #351552
-
-	* gui/alarm-notify/alarm-queue.h: (alarm_queue_remove_client):
-	* gui/alarm-notify/alarm-queue.c: (alarm_queue_remove_client):
-	Added new parameter to free immediately, not by thread.
-	* gui/alarm-notify/alarm-notify.c: (dequeue_client),
-	(alarm_notify_remove_calendar): Using alarm_queue_remove_client.
-
-	* gui/alarm-notify/alarm-notify.c: (alarm_notify_add_calendar):
-	Fixed critical warning with e_passwords for calendars without
-	'auth-domain' property (will use name instead).
-
-2007-08-06  Milan Crha  <mcrha@redhat.com>
-
-	** Partially fix bug #401533
-
-	* gui/e-cal-component-memo-preview.c: (write_html):
-	Text marked to localize.
-
-2007-08-06  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #463129
-
-	* gui/calendar-component.c: (update_task_memo_selection),
-	(destroy_component_view): Frees task_source_selection and
-	memo_source_selection in destroy_component_view instead of
-	immediately after assigning it to the structure.
-
-2007-08-06  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #454253
-
-	* gui/alarm-notify/alarm.c: (pop_alarm), (alarm_ready_cb),
-	(setup_timeout), (alarm_done): Fail safe instead of crash, when it is
-	not really required to crash. 
-
-2007-08-03  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #377173
-
-	* gui/e-cal-component-memo-preview.c:
-	* gui/e-cal-component-preview.c: Show category icon correctly. 
-
-2007-08-02  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #322624
-
-	* gui/alarm-notify/alarm-queue.c: (has_known_notification),
-	(add_component_alarms), (query_objects_changed_async):
-	Don't add alarms for types with unknown/none notification method.
-
-2007-07-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	* common/authentication.c: Include <libedataserver/e-source.h>
-	to fix implicit declaration of e_source_get_duped_property().
-
-2007-07-30  Andre Klapper  <a9016009@gmx.de>
-
-	* gui/dialogs/schedule-page.glade:
-	gui/dialogs/memo-page.glade:
-	gui/dialogs/meeting-page.glade:
-	gui/dialogs/task-page.glade:
-	gui/dialogs/task-details-page.glade:
-	gui/dialogs/cal-prefs-dialog.glade:
-	gui/dialogs/event-page.glade:
-	gui/e-itip-control.glade:
-	remove "window1" string from translation
-
-2007-07-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes a memory corruption.
-	* common/authentication.c: (auth_func_cb): Use
-	e_source_get_duped_property.						   
-
-2007-07-30  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #343716
-
-	* gui/dialogs/memo-page.c: (memo_page_fill_component):
-	Working properly with UTF-8 characters when cutting and
-	added ellipsize for longer texts.
-
-2007-07-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #453860
-	* gui/e-select-names-editable.c:
-	(e_select_names_editable_get_emails): Check if contact
-	is present before fetching information from it.					      
-	
-	Committing on behalf of Xiurong Simon Zheng <simon.zheng@sun.com>		
-
-2007-07-29  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #200977
-
-	* gui/e-day-view.c: (time_range_changed_cb):
-	Ensures selection start row is visible.
-
-2007-07-29  Rob Bradford  <rob@robster.org.uk>
-
-	Fixes #461474
-	* gui/dialogs/task-page.c: (task_page_set_dates):
-	Remove redundant code.
-
-2007-07-29  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #455862
-
-	* gui/e-memo-table.c: Paste raw text data from clipboard while
-	editing column.
-
-2007-07-29  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #335881
-
-	* gui/e-calendar-table.c: Paste raw text data from clipboard while
-	editing column.
-
-2007-07-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	Fixes #460825
-	* gui/cal-search-bar.c: (cal_search_bar_class_init): Remove needless
-	EFilterBarClass.
-
-2007-07-18  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #326388
-
-	* gui/calendar-component.c: (ensure_sources):
-	Set 'delete=no' property for birthdays_source if its not set.
-
-2007-07-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #444433 from Lucky
-
-	* gui/cal-search-bar.c: (make_suboptions):
-	* gui/caltypes.xml:
-	* gui/memotypes.xml:
-	* gui/tasktypes.xml:
-
-2007-07-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #457394
-
-	* gui/e-calendar-table.c: (hide_completed_rows):
-	Properly free component with e_cal_model_free_component_data.
-	* gui/e-calendar-table.c: (show_completed_rows):
-	Reference 'client' on new component.
-
-2007-07-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* dialogs/cal-prefs-dialog.c: (calendar_prefs_dialog_finalize):
-	* dialogs/task-page.c: (task_page_create_source_option_menu):
-	* dialogs/e-send-options-utils.c:
-	(e_sendoptions_utils_set_default_data):
-	* dialogs/url-editor-dialog.c: (init_widgets):
-	* dialogs/event-page.c: (event_page_create_source_option_menu):
-	* dialogs/memo-page.c: (memo_page_create_source_option_menu):
-	* e-week-view-event-item.c: (e_week_view_event_item_draw):
-	* e-day-view-top-item.c: (e_day_view_top_item_draw_long_event):
-	* e-pub-utils.c: (e_pub_publish): Plugged memory leaks.
-
-2007-07-26  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* gui/main.c: Do not need to call g_source_remove(). If the callback
-	function returns FALSE, the event source is automatically removed.
-
-2007-07-26  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* gui/alarm-notify/config-data.c, gui/tasks-component.c,
-	gui/calendar-component.c, gui/memos-component.c: Plugged memory leaks.
-
-2007-07-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #273699
-
-	* gui/alarm-notify/notify-main.c: (main):
-	Do g_warning instead of g_error when factory could not be created.
-
-2007-07-18  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* gui/cal-search-bar.c: (cal_search_bar_construct): Remove "/" as
-	separator.
-
-2007-07-09  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	reviewed by: Veerapuram Varadhan <vvaradhan@novell.com>
-
-	* gui/dialogs/comp-editor.c: (save_comp), (save_comp_with_send),
-	(real_edit_comp): Organizer/Sentby can save/edit components.
-	* gui/dialogs/event-editor.c: (event_editor_edit_comp):
-	* gui/e-calendar-view.c: (e_calendar_view_add_event),
-	(e_calendar_view_cut_clipboard), (delete_event),
-	(e_calendar_view_delete_selected_occurrence),
-	(set_attendee_status_for_delegate),
-	(e_calendar_view_edit_appointment),
-	(e_calendar_view_modify_and_send):
-	* gui/itip-utils.c: (get_attendee),
-	(get_attendee_if_attendee_sentby_is_user), (sanitize_component),
-	(itip_get_comp_attendee), (comp_to_list), (comp_subject),
-	(comp_limit_attendees), (comp_sentby), (itip_send_comp),
-	(reply_to_calendar_comp): Adding the exchange delegation feature.
-
-	Committing on behalf of Suman Manjunath <msuman@novell.com> 
-
-2007-07-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/e-memos.c: (e_memos_setup_view_menus)
-	* gui/e-tasks.c: (e_tasks_setup_view_menus)
-	* gui/gnome-cal.c: (gnome_calendar_setup_view_menus)
-	Abort if ETable specification file fails to load.
-
-2007-06-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #234294
-
-	* gui/dialogs/cancel-comp.c: (is_past_event): New helper function.
-	* gui/dialogs/cancel-comp.c: (cancel_component_dialog):
-	Returns FALSE to EVENTs in the past, based on date, not time part.
-
-2007-07-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #300584
-
-	* gui/e-calendar-view.h: Added public helper
-	function e_calendar_view_get_icalcomponent_summary
-	* gui/e-calendar-view.c: (e_calendar_view_get_icalcomponent_summary),
-	(icalcomp_contains_category), (e_calendar_view_get_tooltips):
-	Implementing helper functions and added year number also into tooltip.
-	* gui/e-day-view.c: (e_day_view_update_long_event_label):
-	* gui/e-week-view.c: (e_week_view_reshape_event_span),
-	(cancel_editing): Using e_calendar_view_get_icalcomponent_summary.
-
-2007-07-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #438613 and #329594
-
-	* gui/dialogs/event-page.c: (sensitize_widgets):
-	Disable recurrence and free/busy actions with read only calendars.
-	* gui/dialogs/comp-editor.c: (prompt_and_save_changes):
-	When clicked "Save", then claim on readonly calendars and didn't
-	discard changes silently.
-	* gui/dialogs/comp-editor.c: (menu_file_save_cb):
-	Claims on readonly calendars before validating form datas.
-
-	* gui/e-meeting-list-view.c: (build_table): Fixed runtime warning.
-	* gui/dialogs/alarm-list-dialog.glade: Fixed runtime warnings.
-
-2007-07-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #321741
-
-	* gui/e-calendar-view.h:
-	* gui/e-calendar-view.c: (e_calendar_view_new_appointment_full):
-	Added new parameter 'actual_day', with true always use actual day.
-	* gui/e-calendar-view.c: (on_new_event), (on_new_meeting),
-	(e_calendar_view_new_appointment):
-	* gui/calendar-component.c: (create_new_event):
-	* gui/e-week-view.c: (e_week_view_on_button_press):
-	Changing call of 'e_calendar_view_new_appointment_full'.
-
-2007-06-22  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #328484
-
-	* gui/calendar-component.c: (source_changed_cb):
-	New callback to refresh view after source changed.
-	* gui/calendar-component.c: (source_added_cb),
-	(source_removed_cb): Connecting and disconnecting
-	on change callback to source.
-
-2007-07-02  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #445526
-
-	* gui/dialogs/alarm-list-dialog.h: (alarm_list_dialog_set_client):
-	* gui/dialogs/alarm-list-dialog.c: (alarm_list_dialog_set_client)
-	New function, need to be called when page source changed.
-	* gui/dialogs/event-page.c: (struct _EventPagePrivate), (init_widgets),
-	(event_page_init), (event_page_finalize), (source_changed_cb):
-	New private property alarm_list_dlg_widget points on dialog's box and
-	calling new callback in source_changed_cb.
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-        ** Fix for bug #448223 from Gilles Dartiguelongue
-
-	* gui/cal-search-bar.c: (generate_viewoption_menu):
-
-2007-06-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #325882
-
-	* gui/dialogs/e-delegate-dialog.glade:
-	* gui/dialogs/schedule-page.glade:
-	* gui/goto-dialog.glade:
-	* gui/e-itip-control.glade:
-	Changed GTK_WIN_POS_NONE to GTK_WIN_POS_CENTER_ON_PARENT.
-
-2007-06-15  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/dialogs/alarm-dialog.c:
-	Remove the aalarm_attach widget and retrieve the selected filename
-	using the GtkFileChooser API (#440075).
-
-2007-06-06  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* Makefile.am:
-	
-	Reverted automake 1.6 breakage. Fixes bug 444747. 
-	Patch by Patch by Daniel Gryniewicz <dang@nemesis.fprintf.net>.
-
-2007-06-04  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/Makefile.am: Added the filter flags and the new files.
-	* gui/cal-search-bar.c: (cal_search_bar_class_init),
-	(cal_search_bar_init), (cal_search_bar_destroy),
-	(get_current_category), (get_show_option_sexp),
-	(notify_e_cal_view_contains), (notify_category_is), (regen_query),
-	(setup_category_options), (make_suboptions),
-	(search_menu_activated), (cal_search_bar_construct),
-	(cal_search_bar_get_category), (cal_search_bar_get_time_range):
-	* gui/cal-search-bar.h: 
-	* gui/e-cal-model.[ch]:
-	(e_cal_model_set_search_query_with_time_range): Set the time range
-	and the search query.							
-	* gui/gnome-cal.c: (set_search_query),
-	(search_bar_sexp_changed_cb), (update_memo_view),
-	(gnome_calendar_init), (update_view_times), (display_view),
-	(display_view_cb), (gnome_calendar_update_date_navigator): Hide
-	the date navigator in list view for searches based on date.	   
-	* gui/caltypes.xml:
-	* gui/memotypes.xml:
-	* gui/tasktypes.xml: Added the Advanced search options.
-
-	Committing on behalf of Keshav Upadhyaya <ukeshav@novell.com> and 
-	Abhishek Parwal <pabhishek@novell.com>.
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #386503 from Matthew Barnes
-
-	* gui/dialogs/comp-editor.c: (comp_editor_show_help):
-
-2007-06-03  Srinivasa Ragavan <sragavan@novell.com>
-
-        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
-
-	* Makefile.am:
-	* conduits/calendar/Makefile.am:
-	* conduits/memo/Makefile.am:
-	* conduits/todo/Makefile.am:
-	* gui/Makefile.am:
-	* gui/alarm-notify/Makefile.am:
-
-2006-09-08  Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #347767
-	
-	* gui/dialogs/send-comp.c : (send_component_prompt_subject):
-	error id "calendar:prompt-send-no-subject-memo" or
-	"calendar:prompt-send-no-subject-memo-to-recipients" is called
-	when memo is saved without a summary.
-	* calendar.error.xml : error id "prompt-send-no-subject-memo" is
-	added.
-	
-2007-06-02  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	** Fixes bug #439122
-
-	* conduits/calendar/calendar-conduit.c:
-	(local_record_to_pilot_record):
-	* conduits/memo/memo-conduit.c: (local_record_to_pilot_record):
-	* conduits/todo/todo-conduit.c: (local_record_to_pilot_record):
-	* gui/calendar-component.c: (selector_tree_drag_data_received):
-	* gui/dialogs/alarm-list-dialog.c: (edit_clicked_cb):
-	* gui/dialogs/cal-prefs-dialog.c: (alarms_selection_changed):
-	* gui/dialogs/calendar-setup.c: (eccp_commit):
-	* gui/dialogs/comp-editor.c: (drop_action),
-	(comp_editor_get_mime_attach_list):
-	* gui/dialogs/event-page.c: (remove_clicked_cb):
-	* gui/dialogs/task-page.c: (remove_clicked_cb):
-	* gui/e-day-view.c: (e_day_view_on_drag_data_get):
-	* gui/e-itip-control.c: (url_requested_cb), (insert_boxes),
-	(insert_ok):
-	* gui/e-meeting-time-sel.c: (e_meeting_time_selector_construct):
-	* gui/e-memos.c: (table_drag_data_get), (backend_error_cb):
-	* gui/e-tasks.c: (table_drag_data_get), (e_tasks_open_task_id):
-	* gui/e-week-view-event-item.c: (e_week_view_event_item_draw):
-	* gui/gnome-cal.c: (backend_error_cb):
-	* gui/memos-component.c: (selector_tree_drag_data_received):
-	* gui/print.c: (print_calendar):
-	* gui/tasks-component.c: (selector_tree_drag_data_received):
-	compilation warnings cleanup
-
-2007-06-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #321741
-
-	* gui/e-calendar-view.c: (e_calendar_view_new_appointment_full):
-	Default first date for appointment or meeting is changed on actual
-	date if have selected start date in past. (This doesn't affect
-	double click in calendar view.)
-
-2007-05-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #351729 from Milan Crha
-
-	* gui/dialogs/event-editor.c: (event_editor_construct):
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/task-editor.c: (task_editor_construct):
-
-2007-05-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/e-cal-popup.c: Addup missing hooks in the previous commit.
-
-2007-05-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #326388 from Raghavendaran
-
-	* gui/calendar-component.c: (ensure_sources): Create a popup key for
-	readonly calendar.
-	* gui/e-cal-popup.c: (e_cal_popup_target_new_source):
-	* gui/e-cal-popup.h:
-
-2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/migration.c (create_calendar_sources), (create_task_sources),
-	(create_memo_sources):
-	* gui/tasks-component.c (ensure_sources):
-	* gui/calendar-component.c (ensure_sources):
-	* gui/memos-component.c (ensure_sources):
-	Don't assume the relative URI is non-NULL (#427232).
-
-2007-05-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #424562
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog):
-	Remove check for obsolete GTK+ version.
-
-	* gui/alarm-notify/alarm-queue.c:
-	EggTrayIcon is dead; always use GtkStatusIcon.
-
-2007-05-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Fix for bug #407104
-
-2007-05-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #330098 from Naresh
-
-	* gui/dialogs/select-source-dialog.c: (select_source_dialog):
-
-2007-05-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #337616
-
-	* gui/Makefile.am: Add $(schema_DATA) to DISTCLEANFILES.
-
-2007-05-12  simon.zheng  <simon.zheng@sun.com>
-
-	** Fix for bug #427789
-
-        * gui/e-calendar-view.c: (e_calendar_view_copy_clipboard):
-        The last arguments in API gtk_clipboard_set_text() should be
-        the length of string in bytes rather than in characters.
-
-2007-05-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add tango icon to
-	preference window.
-
-2007-05-04  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Downstream fixes from OpenSUSE
-
-	* gui/dialogs/event-page.c: (update_time):
-	* gui/e-cal-component-preview.c: (write_html):
-
-2007-05-04  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #415562
-
-	* gui/alarm-notify/alarm-queue.c: (tray_icon_clicked_cb),
-	(popup_menu), (display_notification):
-
-2007-04-28  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/dialogs/task-page.glade: Fix a mnemonic conflict.
-	Patch from Jens Knutson. Closes bug #397463.
-
-2007-04-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/calendar-commands.c:
-	* gui/dialogs/comp-editor.c:
-	* gui/e-calendar-table.c:
-	* gui/e-calendar-view.c:
-	* gui/e-memo-table.c:
-	* gui/memos-control.c:
-	* gui/print.c:
-	* gui/print.h:
-	* gui/tasks-control.c:
-	Refactor the printing infrastructure. (#426816)
-
-2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #429422
-
-	* gui/e-select-names-renderer.c
-	(e_select_names_renderer_editing_done):
-	Use gtk_cell_renderer_stop_editing() instead of
-	gtk_cell_renderer_editing_canceled().
-
-	* gui/dialogs/task-details-page.c (get_widgets):
-	* gui/dialogs/schedule-page.c (get_widgets):
-	* gui/dialogs/task-page.c (get_widgets):
-	* gui/dialogs/recurrence-page.c (get_widgets):
-	* gui/dialogs/event-page.c (get_widgets):
-	* gui/dialogs/memo-page.c (get_widgets):
-	Use g_object_ref() instead of gtk_widget_ref().
-
-	* gui/dialogs/task-details-page.c (task_details_page_finalize):
-	* gui/dialogs/schedule-page.c (schedule_page_finalize):
-	* gui/dialogs/task-page.c (task_page_finalize):
-	* gui/dialogs/recurrence-page.c (recurrence_page_finalize):
-	* gui/dialogs/event-page.c (event_page_finalize):
-	* gui/dialogs/memo-page.c (memo_page_finalize):
-	Use g_object_unref() instead of gtk_widget_unref().
-
-	* gui/dialogs/event-editor.c (create_schedule_page):
-	* gui/dialogs/memo-editor.c (memo_editor_construct):
-	* gui/dialogs/task-editor.c (task_editor_construct):
-	* gui/print.c (print_table):
-	* conduits/todo/todo-conduit.c (todoconduit_load_configuration):
-	* conduits/calendar/calendar-conduit.c
-	(calconduit_load_configuration):
-	* conduits/memo/memo-conduit.c (memoconduit_load_configuration):
-	Use g_object_ref_sink() instead of gtk_object_sink().
-
-	* gui/dialogs/task-details-page.c (sensitize_widgets):
-	* gui/dialogs/task-page.c (sensitize_widgets):
-	* gui/dialogs/event-page.c (sensitize_widgets),
-	(event_page_fill_widgets):
-	* gui/dialogs/memo-page.c (sensitize_widgets),
-	(memo_page_fill_widgets):
-	* gui/e-timezone-entry.c (e_timezone_entry_init):
-	Use gtk_editable_set_editable() instead of gtk_entry_set_editable().
-
-	* gui/dialogs/task-details-page.c (get_widgets):
-	* gui/dialogs/schedule-page.c (get_widgets):
-	* gui/dialogs/task-page.c (get_widgets):
-	* gui/dialogs/recurrence-page.c (get_widgets):
-	* gui/dialogs/event-page.c (get_widgets):
-	* gui/dialogs/memo-page.c (get_widgets):
-	Use g_object_ref() instead of gtk_accel_group_ref().
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy):
-	Use g_object_unref() instead of gtk_accel_group_unref().
-
-	* gui/dialogs/task-page.c (task_page_new):
-	* gui/dialogs/memo-page.c (memo_page_new):
-	Use g_object_new() instead of gtk_type_new().
-
-	* gui/dialogs/comp-editor.c (save_comp), (obj_modified_cb):
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_display_validation_error):
-	* gui/e-memos.c (backend_error_cb):
-	* gui/e-itip-control.c (update_item), (update_attendee_status),
-	(send_item), (send_freebusy):
-	* gui/gnome-cal.c (backend_error_cb):
-	* gui/e-tasks.c (backend_error_cb):
-	* gui/e-cell-date-edit-text.c (show_date_warning):
-	Use gtk_message_dialog_new() instead of gnome_error_dialog(),
-	gnome_warning_dialog(), gnome_question_dialog(), or gnome_ok_dialog().
-
-	* gui/dialogs/comp-editor.c (comp_editor_show_page):
-	* gui/dialogs/alarm-dialog.c (action_selection_done_cb):
-	* gui/gnome-cal.c (display_view):
-	* importers/icalendar-importer.c (button_toggled_cb):
-	Use gtk_notebook_set_current_page() instead of
-	gtk_notebook_set_page().
-
-	* gui/dialogs/alarm-dialog.glade:
-	* gui/dialogs/alarm-dialog.c:
-	Use GtkFileChooserButton instead of GnomeFileEntry.
-
-	* gui/e-memos.c (e_memos_class_init):
-	* gui/e-tasks.c (e_tasks_class_init):
-	Use g_cclosure_marshal_VOID__INT instead of gtk_marshal_NONE__INT.
-
-	* gui/e-day-view.c (e_day_view_style_set), (e_day_view_check_layout):
-	* gui/e-itip-control.c (e_itip_control_init):
-	* gui/gnome-cal.c (gnome_calendar_hpane_resized):
-	* gui/e-week-view.c (e_week_view_style_set):
-	* gui/e-meeting-time-sel (e_meeting_time_selector_construct),
-	(e_meeting_time_selector_style_set):
-	Use gtk_widget_set_size_request() instead of gtk_widget_set_usize().
-
-	* gui/e-day-view.c (e_day_view_stop_auto_scroll),
-	(e_day_view_cancel_layout):
-	* gui/e-week-view.c (e_week_view_cancel_layout):
-	Use g_source_remove() instead of gtk_timeout_remove().
-
-	* gui/tasks-component.c (task_component_peek):
-	* gui/calendar-component.c (calendar_component_peek):
-	* gui/memos-component.c (memos_component_peek):
-	Use g_mkdir_with_parents() instead of e_util_mkdir_hier().
-
-	* gui/print.c (range_selector_new):
-	* gui/e-day-view-time-item.c (e_day_view_time_item_show_popup_menu):
-	Use gtk_radio_button_get_group() instead of gtk_radio_button_group().
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_show_popup_menu):
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Use gtk_menu_shell_append() instead of gtk_menu_append().
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	e_button_new_with_stock_icon() is dead; just do it manually.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Use gtk_radio_menu_item_get_group() instead of
-	gtk_radio_menu_item_group().
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct),
-	(e_meeting_time_selector_draw_shadow):
-	Use gtk_paint_shadow() instead of gtk_draw_shadow().
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_timeout_handler):
-	Remove gtk_layout_freeze() and gtk_layout_thaw().
-
-2007-04-10  Andre Klapper  <a9016009@gmx.de>
-
-	* gui/dialogs/cal-prefs-dialog.glade: add missing mnemonic widgets. 
-	Fixes bug #329168.
-
-2007-04-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/itip-utils.c (reply_to_calendar_comp):
-	Use a GString to construct the body contents and also fix several
-	memory leaks.  (#408423)  Based on a patch from Daniel Gryniewicz.
-
-2007-04-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/memos-component.c (impl__get_userCreatableItems):
-	Fix a duplicate keyboard shortcut.  (#353922)
-	Patch from Diego Escalante Urrelo
-
-2007-04-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/print.c (print_calendar): Fix a crasher. (#401539)
-
-2007-04-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #373116
-
-	* gui/calendar-component.c (ensure_sources):
-	* gui/e-cal-model.c (ecm_get_color_for_component):
-	* gui/memos-component.c (ensure_sources):
-	* gui/migration.c (create_calendar_contact_source),
-	(create_calendar_sources), (create_task_sources),
-	(create_memo_sources), (add_gw_esource):
-	* gui/tasks-component.c (ensure_sources):
-	Use the new ESource color API.
-
-	* gui/calendar-component.c
-	(calendar_config_get_tasks_due_today_color),
-	(calendar_config_get_tasks_overdue_color):
-	Return a GdkColor instead of an X color specification.
-
-	* gui/calendar-component.c
-	(calendar_config_set_tasks_due_today_color),
-	(calendar_config_set_tasks_overdue_color):
-	Accept a GdkColor instead of an X color specification.
-
-	* gui/e-cal-model-tasks.c (ecmt_get_color_for_component):
-	Adapt to modified color API in calendar-component.c by converting
-	the GdkColor to an X color specification.  This is an ugly hack to
-	be fixed later.
-
-	* gui/dialogs/cal-prefs-dialog.c:
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/calendar-setup.c:
-	* gui/dialogs/calendar-setup.glade:
-	Migrate from GnomeColorPicker to GtkColorButton.
-
-2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/e-cal-component-memo-preview.c (write_html):
-	Use a format string ("%s") when passing uncontrolled data to a
-	printf-style function (CVE-2007-1002).
-
-2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c:
-	* gui/tasks-control.c:
-	Fix "incompatible pointer type" warnings (#360619).
-
-2007-03-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/alarm-notify/alarm-queue.c:
-	* gui/dialogs/comp-editor.c:
-	* gui/dialogs/event-page.c:
-	* gui/dialogs/memo-page.c:
-	* gui/dialogs/task-page.c:
-	* gui/e-cal-popup.c:
-	* gui/e-meeting-list-view.c:
-	* gui/e-tasks.c:
-	* gui/gnome-cal.c:
-	Don't mix declarations and code (#405495).
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2007-03-05  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/event-page.c: (event_page_fill_component): Set the
-	description only if summary has some value.								
-	* gui/dialogs/schedule-page.c: (schedule_page_update_free_busy):
-	* gui/dialogs/schedule-page.h:
-	* gui/e-meeting-time-sel.[ch]: exposed e_meeting_time_selector_refresh_free_busy.
-	* gui/dialogs/event-editor.c: (menu_action_freebusy_cb),
-	(create_schedule_page), (menu_action_freebusy_cmd),
-	(event_editor_construct): Form the FreeBusy dialog only when the button is
-	clicked. The FreeBusy queries would not start until the button is clicked. So
-	the users can choose the appropriate dates in the editor before the clicking 
-	the button.
-
-2007-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-meeting-list-view.c: (e_meeting_list_view_init):
-	Fix window title. Patch from Matthias Clasen. Closes
-	bug #381498.
-
-2007-02-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Print migration updates from Ebby Wiselyn
-
-	* gui/print.c: (print_day_view), (print_calendar), (print_comp),
-	(print_table), (comp_draw_page), (cal_draw_page),
-	(table_draw_page), (create_custom_widget), (apply_custom_widget):
-
-2007-01-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Committing GtkPrint migration from Ebby Wiselyn.
-
-	* gui/print.c: (evo_calendar_print_cal_data_new),
-	(evo_calendar_print_data_new),
-	(evo_calendar_print_renderer_get_width),
-	(print_border_with_triangles), (print_border_rgb), (print_border),
-	(print_rectangle), (print_text), (print_text_size),
-	(print_text_size_bold), (titled_box), (print_month_small),
-	(bound_text), (print_day_background), (print_day_add_event),
-	(print_day_long_event), (print_day_event), (print_day_details),
-	(print_week_long_event), (print_week_day_event),
-	(print_week_event), (print_week_view_background),
-	(print_week_summary), (print_month_summary), (print_todo_details),
-	(print_day_view), (print_week_view), (print_month_view),
-	(print_year_view), (print_comp_item), (print_calendar),
-	(print_comp), (print_title), (print_table), (comp_draw_page),
-	(cal_draw_page), (table_draw_page):
-
-2007-01-08  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	Patch submitted by Nathan Owens <pianocomp81@yahoo.com> and 
-	Jerry Yu <jijun.yu@sun.com>
-
-	* conduits/calendar/calendar-conduit.c: 
-	* conduits/todo/todo-conduit.c:
-	* conduits/memo/memo-conduit.c:Add pilot-link 0.12
-	compatibility
-	
-2007-01-08  Matthew Barnes  <mbarnes@redhat.com>
-	
-	Fixes #383027
-	* gui/itip-utils.c: (itip_get_comp_attendee): Handle the case
- 	when there is no default account.						      
-
-2007-01-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes #377511
-	* gui/e-meeting-list-view.c: (get_index_from_role):
-	Return the default value 1.
-	(role_edited_cb): Move the attendee to the right section
-	in the name selector.			  
-
-2007-01-08  Wang Xin  <jedy.wang@sun.com>
-	
-	Fixes #389966
-	* gui/e-cal-model-tasks.c: (set_status):
-	Do not create the status property if its pointing to None.
-
-2007-01-08  Wang Xin  <jedy.wang@sun.com>
-
-	Fixes #389961
-	* gui/e-cal-model.c: (e_cal_model_set_instance_times):
-	Check if the item is a event before processing the end time.
-
-2006-12-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes bug #357970
-
-	* gui/e-alarm-list.c:
-	* gui/e-calendar-table.c:
-	* gui/e-day-view.c:
-	* gui/e-meeting-attendee.c:
-	* gui/e-meeting-store.c:
-	* gui/e-meeting-time-sel-item.c:
-	* gui/e-meeting-time-sel.c:
-	* gui/e-week-view-main-item.c:
-	* gui/e-week-view.c:
-	* gui/gnome-cal.c:
-	* gui/goto.c:
-	* gui/dialogs/event-page.c:
-	* gui/dialogs/task-page.c:
-	Don't call deprecated GLib / GDK functions.
-
-2006-12-04 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
-
-	Fixes #270751.
-	Adds support for command line uri in tasks.
-	* gui/GNOME_Evolution_Calendar.server.in.in: Added the specification
-	for task uri.
-	* gui/e-calendar-table.c: (e_calendar_table_open_selected),
-	(e_calendar_table_open_task), (open_task_by_row),
-	(e_calendar_table_on_open_task), (e_calendar_table_on_assign):
-	* gui/e-calendar-table.h:
-	* gui/tasks-control.c: (tasks_control_assign_cmd): 
-	* gui/e-tasks.c: (e_tasks_open_task_id):
-	* gui/e-tasks.h: Pass just the required arguments.
-	* gui/tasks-component.c: (impl_handleURI),
-	(tasks_component_class_init): Implement the uri interface
-
-2006-11-28  Wang Xin  <jedy.wang@sun.com>
-
-	Fix for bug #380064
-
-	* gui/alarm-notify/alarm-queue.c: (mail_notification): Only
-	popup the dialog if calendar backend does not support
-	email alarm.
-
-2006-12-03  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/calendar-config.c:
-	(calendar_config_get_icaltimezone): Fix leaks of
-	'location' at various exit points. 
-
-2006-11-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Added support to print/preview from Calendar Editor.
-
-	* gui/dialogs/comp-editor.c: (menu_file_print_cb),
-	(menu_file_print_preview_cb):
-
-2006-11-28  Daniel Gryniewicz <dang@gentoo.org>
-
-	** Fix for bug #349966
-
-	* gui/apps_evolution_calendar.schemas.in.in:
-	* gui/calendar-config-keys.h:
-	* gui/dialogs/alarm-dialog.c: (action_selection_done_cb):
-
-2006-11-20  Carlos Garcia Campos  <carlosgc@gnome.org>
-	
-	Fixes bug #367183
-	* gui/e-cal-model.c: (e_cal_model_set_instance_times): Make end_time a
-	valid date for all day events when ical file doesn't provide neither
-	DTEND nor DURATION for such events. 
-
-2006-11-15  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/gnome-cal.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb): Diplay a warning
-	if calendar fails to open.
-
-2006-11-14  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/gnome-cal.c: (gnome_calendar_destroy):
-	Disconnect signal handlers before gcal is destroyed.
-	Fixes #208959 (bugzilla.novell.com).
-
-2006-11-07  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/alarm-notify/alarm-notify.c: (list_changed_cb),
-	(load_calendars), (cal_opened_cb), (alarm_notify_add_calendar):
-	* gui/dialogs/cal-prefs-dialog.c: (alarms_selection_changed):
-	Disable alarms for subscribed exchange calendars.
-	Fixes #208318 (bugzilla.novell.com)
-
-2006-11-06  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Committing for Ben Gamari <bgamari@gmail.com>
-
-	* recurrence-page.c: Correct recurrence editor default behavior.
-	Fixes #354875 
-
-2006-10-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/cal-search-bar.c: (notify_e_cal_view_contains),
-	(regen_query), (generate_viewoption_menu), (make_suboptions):
-	Add missing header, #if 0 out some unused code, copy and free
-	some data to avoid warnings.
-	* gui/dialogs/cal-attachment-select-file.c: (run_selector):
-	* gui/dialogs/comp-editor.c: (fill_widgets):
-	* gui/dialogs/delete-comp.c: (prompt_retract_dialog):
-	Typecasting fixes.
-	* gui/dialogs/event-page.c: (init_widgets):
-	* gui/dialogs/memo-editor.c: (memo_editor_edit_comp):
-	Remove some unused code.
-	* gui/dialogs/memo-page.c: (fill_comp_with_recipients):
-	More GString changes.
-	* gui/e-cal-component-memo-preview.c: (write_html):
-	Micro-optimization of GString handling.
-	* gui/e-cal-component-preview.c: (write_html):
-	Same as above.
-	* gui/e-cal-model-tasks.c:
-	(e_cal_model_tasks_mark_task_incomplete):
-	Remove unused variables.
-	* gui/e-cal-model.c: (get_description),
-	(e_cal_model_set_instance_times):
-	More GString stuff and constification of the timezone arg.
-	* gui/e-cal-model.h:
-	Constify
-	* gui/e-cal-popup.c: (ecalp_standard_menu_factory):
-	Remove unused code.
-	* gui/e-day-view-config.c: (e_day_view_config_set_view):
-	Fix signedness warnings.
-	* gui/e-day-view-main-item.c:
-	(e_day_view_main_item_draw_day_event):
-	Init a variable to NULL to avoid a compiler warning.
-	* gui/e-day-view-time-item.c:
-	(e_day_view_time_item_get_column_width):
-	Remove unused var.
-	* gui/e-day-view.c: (e_day_view_update_event_label),
-	(e_day_view_on_text_item_event):
-	Add braces and a cast to get rid of compiler warnings.
-	* gui/e-meeting-list-view.c:
-	(e_meeting_list_view_remove_attendee_from_name_selector),
-	(attendee_edited_cb), (row_activated_cb), (add_to_list):
-	Add some typecasts to avoid compiler warnings and remove an unused var.
-	* gui/e-meeting-store.c: (e_meeting_store_get_num_queries):
-	Return a value when checking the arguments.
-	* gui/e-tasks.c: (setup_widgets):
-	Add a cast to fix a compiler warning.
-	* gui/e-week-view.c: (tooltip_event_cb),
-	(e_week_view_on_text_item_event):
-	More typecasting.
-	* gui/gnome-cal.c: (gnome_calendar_get_tag),
-	(gnome_calendar_cut_clipboard), (gnome_calendar_copy_clipboard):
-	More typecasting and fix cutting/copying memos.
-	* gui/gnome-cal.h:
-	Add a prototype for gnome_calendar_get_tag().
-	* gui/itip-utils.c: (comp_to_list):
-	Fix shadowed variable.
-	* gui/memos-component.c: (set_info):
-	* gui/migration.c: (get_source_name):
-	* gui/tasks-component.c: (set_info):
-	GString fixes.
-
-2006-10-16  Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #347768
-	
-	* gui/dialogs/memo-page.glade : Label changed from "_Memo Content"
-	to "_Description".
-
-2006-10-16 Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #329696
-	* gui/e-itip-control.c : (show_current_event),(show_current_todo):
-	String change to make it more clear.
-
-2006-10-16  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/e-day-view.c: (e_day_view_init),
-	(e_day_view_on_top_canvas_button_press),
-	(e_day_view_on_main_canvas_button_press),
-	(e_day_view_on_long_event_button_press),
-	(e_day_view_on_event_button_press),
-	(e_day_view_on_text_item_event): Disable tooltips
-	on drag, resize and edit. Fixes #333224. Patch 
-	submitted by Srinivasa Ragavan.
-
-2006-10-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes bug #352546
-
-	* gui/dialogs/event-page.c: (init_widgets) Fix typo in a
-	translated string ("appointement").
-
-2006-10-03  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* gui/dialogs/recurrence-page.c: Fix to allow translate some
-	strings (Closes: #359271)
-
-2006-09-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #343369
-	* gui/dialogs/comp-editor.c: (attach_message), (drop_action):
-	Set the filename as email followed the number of the attachment.
-
-2006-09-28  Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #261082
-
-	* gui/e-itip-control.c: (write_recurrence_piece): Translator
-	comments added.
-
-2006-08-24 Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #261980, #325611
-
-	* gui/e-itip-control.c (write_recurrence_piece) (set_date_label) :
-	Translator comment added.
-
-2006-08-24 Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #325613
-
-	* gui/dialogs/recurrence-page.c (make_recur_month_menu) :
-	Translator comment added.
-
-2006-09-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #334692
-	
-	* gui/e-week-view.c: (e_week_view_on_scroll), (tooltip_destroy),
-	(tooltip_event_cb), (e_week_view_on_text_item_event): Remove the
-	timers that are left out when using scroll. They seem to trigger
-	crashes.
-
-2006-09-21  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Fix for bug #354775
-	
-	* gui/calendar-component.c: (create_component_view): Fix to restore
-	the pane position.
-
-2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes #351332
-
-	* gui/cal-search-bar.c:
-	* gui/e-cal-model-tasks.h:
-	* gui/e-calendar-view.h:
-	* gui/gnome-cal.h:
-	* gui/dialogs/memo-page.h:
-	Fix implicit function declarations.
-
-2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #352450
-
-	* gui/calendar-commands.c:
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-meeting-list-view.c:
-	* gui/e-meeting-time-sel-item.c:
-	* gui/e-meeting-time-sel.c:
-	* gui/e-week-view-event-item.c:
-	Replace deprecated GLib and GDK function calls.
-
-2006-09-11  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	Fixes #344276
-	* gui/e-cal-component-memo-preview.c: (write_html): made 
-	the memo preview work fine with special char.
-	Committing on behalf of Arvind <sa.phoenix@gmail.com>.
-
-2006-09-08  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #343409
-	* gui/e-select-names-editable.c:
-	(e_select_names_editable_get_emails),
-	(e_select_names_editable_get_name),
-	(e_select_names_editable_get_names): Reverting the 
-	fix for the bug 320101 as it breaks delegation feature.
-	* gui/e-meeting-list-view.c: (attendee_edited_cb): copy
-	the delfrom parameter from the attendee being edited.							   
-
-2006-09-01  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #353763
-	* gui/dialogs/memo-page.c: (sensitize_widgets):
-	set sens to TRUE if its not a shared memo.
-
-2006-08-30  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Fix for bug #344463
-
-	* gui/alarm-notify/alarm-queue.c: (open_alarm_dialog),
-	(tray_icon_clicked_cb): Use unref to remove GtkStatusIcon.
-
-2006-08-29  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-cal-model-memos.c: (ecmm_fill_component_from_model):
-	set dtstart while creating memos using quick add.
-
-2006-08-28  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/migration.c: (is_groupwise_account), (add_gw_esource),
-	(migrate_memos): Create e-sources for the Groupwise reminder
-	notes while migrating to 2.8 from a lower version.			
-
-2006-08-28  Andre Klapper  <a9016009@gmx.de>
-
-	** Fix for bug #352988
-	
-	* gui/gnome-cal.c: (setup_widgets): Marking two strings for 
-	translation. 
-
-2006-08-24  Ross Burton  <ross@openedhand.com>
-
-	* gui/e-week-view-main-item.c:
-	Don't manipulate the style's font description and don't use custom
-	sizes (#347933).
-
-2006-08-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/alarm-notify/alarm-notify-dialog.c: (dialog_response_cb):
-	* gui/alarm-notify/alarm-notify.c: (list_changed_cb),
-	(dequeue_client), (alarm_msgport_replied),
-	(alarm_notify_add_calendar), (alarm_notify_remove_calendar):
-	* gui/alarm-notify/alarm-queue.c: (queue_midnight_refresh),
-	(add_client_alarms_cb), (midnight_refresh_async),
-	(remove_queued_alarm), (add_component_alarms), (cal_opened_cb),
-	(remove_alarms), (remove_comp), (query_objects_changed_async),
-	(edit_component), (tray_list_remove_cqa_async),
-	(tray_list_remove_data_async), (notify_dialog_cb),
-	(open_alarm_dialog), (tray_icon_clicked_cb), (tray_list_add_async),
-	(free_client_alarms_cb), (alarm_queue_add_async), (remove_cqa),
-	(remove_client_alarms):
-	* gui/dialogs/alarm-dialog.c: (alarm_to_dalarm_widgets),
-	(populate_widgets_from_alarm), (action_selection_done_cb):
-	* gui/dialogs/alarm-list-dialog.c: (alarm_list_dialog_peek):
-	* gui/dialogs/cal-prefs-dialog.c: (show_alarms_config):
-	* gui/dialogs/memo-editor.c: (memo_editor_finalize):
-	* gui/dialogs/memo-page.c: (sensitize_widgets):
-	* gui/dialogs/task-page.c: (edit_clicked_cb):
-	Fix all compiler warnings and correct some other issues.
-
-2006-08-23  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #341691
-	* gui/comp-util.c: (cal_comp_is_on_server):
-	Do not send the recurrence id for backends which
-	support recurrence with master object.
-
-2006-08-23  Matthew Barnes  <mbarnes@redhat.com>
-  	 
-	* gui/e-itip-control.c:
-	fix an uninitialized GError - fixes bug 352423.
-
-2006-02-14  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	**Fixes #325935
-
-	* gui/memos-component.c: (selector_tree_drag_motion):
-	Edited code to move the memo from one task list to another.
-
-2006-08-22  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #351263
-	* gui/dialogs/event-page.c: (init_widgets):
-	do not add  duplicate items in menu.
-
-	Committing the patch from Sebastien Bacher <seb123@debian.org> 
-
-2006-08-22  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/calendar-component.c (ensure_sources): Plug a leak.
-	* gui/migration.c (create_calendar_sources): Same thing here.
-
-2006-08-21  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #346549
-	* gui/dialogs/task-details-page.c (priority_index_to_value):
-	set the priority to undefined if its value does not match the cases.
-	Removed the assertion so that we don't quit.
-
-2006-08-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/cal-search-bar.c: (string_without_underscores),
-	(generate_viewoption_menu), (make_suboptions): Fixes few search
-	issues.
-
-2006-08-18  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #343369
-	* gui/itip-utils.c: (append_cal_attachments):
-	Set the file name to empty string in its absence.
-
-2006-08-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-week-view-event-item.c:
-	(e_week_view_event_item_draw_icons): Plug a leak.
-
-2006-08-14  Li Yuan  <li.yuan@sun.com>
-
-	* gui/alarm-notify/alarm-queue.c: (mail_notification):
-	Fixes #351253, make the dialog shows the label and 
-	can be closed.
-
-2006-08-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-cal-model-calendar.c: (ecmc_set_value_at):
-	* gui/e-calendar-table.c: (e_calendar_table_on_forward):
-	* gui/e-calendar-view.c: (e_calendar_view_add_event),
-	(e_calendar_view_cut_clipboard), (delete_event),
-	(e_calendar_view_delete_selected_occurrence), (on_forward),
-	(e_calendar_view_modify_and_send):
-	* gui/e-itip-control.c: (send_item), (send_freebusy),
-	(ok_clicked_cb):
-	* gui/e-memo-table.c: (e_memo_table_on_forward):
-	* gui/tasks-control.c: (tasks_control_forward_cmd):
-	* gui/dialogs/task-editor.c: (task_editor_send_comp):
-	* gui/dialogs/event-editor.c: (event_editor_send_comp):
-	Updated the itip_send_comp.
-	* gui/dialogs/memo-page.c: (fill_comp_with_recipients),
-	(memo_page_fill_component), (summary_changed_cb), (init_widgets):
-	Connect the changed signal to summary, date and group widgets.
-	Fill the list of users from the component and send the component.
-	* gui/dialogs/send-comp.c: (send_component_dialog):
-	* gui/dialogs/comp-editor.c: (save_comp_with_send),
-	(get_users_from_memo_comp), (real_send_comp):
-	* gui/itip-utils.c: (comp_to_list), 
-	Fill the recipient list while sharing memos.	
-	* gui/itip-utils.h (itip_send_comp):
-	adding an argument to send the list of users.
-	
-2006-08-09  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/alarm-list-dialog.h: Add missing
-	declaration. Fixes #350391 (Patch from Øystein Gisnås).
-
-2006-08-08  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes bug #235909
-	* gui/e-cal-model-tasks.c (get_due_status): Get the timezone for
-	the due date field correctly.
-
-	Committing for  Mubeen Jukaku  <jmubeen@novell.com>
-
-2006-08-07  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Fix for bug #350267
-	
-	* gui/calendar-component.c: (calcomp_vpane_realized): Fix the
-	miscalculation becoz of convertion from float to int.
-
-2006-08-04  Johnny Jacob <jjohnny@novell.com>
-
-	* gui/cal-search-bar.h : Changed the CAL_SEARCH items mask for
-	tasks, memos, calendar.
-
-2006-07-31  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #335276
-	* gui/dialogs/event-editor.c: (event_editor_edit_comp):
-	Set the meeting time in the time selector.
-	* gui/dialogs/schedule-page.c: (schedule_page_set_meeting_time):
-	* gui/dialogs/schedule-page.h: Added a function to set the meeting
-	time in the time selector.
-
-2006-07-31  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	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.
-
-2006-07-31  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	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-27  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-07-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* 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  Li Yuan <li.yuan@sun.com>
-
-	* gui/e-week-view.c: (e_week_view_remove_event_cb):
-	remove week_view->comp_data first, since garray is not thread
-	safe and the event's address may be changed.
-	Fix for #345969.
-
-2006-07-11  Li Yuan	<li.yuan@sun.com>
-
-	* gui/dialogs/event-page.c: (sensitize_widgets):
-	* gui/dialogs/event-page.glade:
-	Add mnemonic widget to widget, and change calendar's shortcut key.
-
-	Fix for #345510.
-
-2006-07-11  Li Yuan  <li.yuan@sun.com>
-
-	* gui/e-week-view.c: (e_week_view_focus):
-	Fix for 345923.
-	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.
-
-2006-06-14  Aishwarya k <aishkalyan@gmail.com>
-
-	 *Fix for bug #339217
-	 * gui/dialogs/cal-prefs-dialog.glade:
-	 Added translator comments for weekdays.
-
-2006-06-14  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/print.c: (evo_calendar_print_data_new),
-	(evo_calendar_print_data_free),
-	(evo_calendar_print_renderer_get_width), (get_font_size),
-	(get_font_for_size), (print_text), (print_text_size),
-	(print_text_size_bold), (titled_box), (print_month_small),
-	(bound_text), (print_day_background), (print_day_long_event),
-	(print_day_event), (print_day_details), (print_week_long_event),
-	(print_week_day_event), (print_week_event),
-	(print_week_view_background), (print_week_summary),
-	(print_year_summary), (print_month_summary), (print_todo_details),
-	(print_day_view), (print_week_view), (print_month_view),
-	(print_year_view), (print_date_label), (print_comp_item),
-	(print_calendar), (print_comp), (print_title), (print_table):
-	Use the pango layout for printing. Do not use gnome_print_show
-	as it is broken on i18n character set.
-	
-	Committing the patch from Dave Malcolm <dmalcolm@redhat.com>
-	Fixed some compiler warnings.
-
-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.
-	* gui/dialogs/event-page.c: (event_page_fill_widgets):
-	Removed unnecessary e_cal_component_clone.
-
-2006-06-05  Li Yuan <li.yuan@sun.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade:
-	add labelled by relationship between label and e-timezone-entry.
-	* gui/e-timezone-entry.c: (add_relation),
-	(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 
-	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.
-
-	* 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>
-
-	More alarm fixes
-
-	* 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):
-
-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
-	right time slot. Partially fixes #332911
-	* gui/e-cal-model.c: (e_cal_model_set_instance_times):
-	* gui/e-calendar-view.c: (get_label),
-	(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
-	* gui/dialogs/event-page.c
-	(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
-	* 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
-	#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>
-
-	Fixes #163039
-	* gui/e-meeting-store.c: (ems_finalize), (ems_init),
-	(process_callbacks), (refresh_busy_periods): Removed the
-	async queue, updated the gui via the callback function in a
-	idle loop as and when we receive the free busy information.
-	(e_meeting_store_get_num_queries): Fixed a warning.
-	* gui/e-meeting-store.h:
-	* gui/e-meeting-time-sel.c: 
-	(e_meeting_time_selector_refresh_cb): Changed the return type of 
-	the function to return a boolean variable.
-
-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
-	in event page also.
-	* gui/dialogs/event-page.[ch] 
-	(event_page_get_name_selector): Gets the name selector from the meeting list
-	view.
-	* gui/dialogs/schedule-page.[ch]
-	(schedule_page_set_name_selector): Sets the name selector to the meeting
-	list view.
-	* gui/e-meeting-list-view.[ch]:
-	(e_meeting_list_view_get_name_selector),
-	(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>
-
-	Fixes #162005
-	* gui/comp-util.c: (cal_comp_is_on_server): Pass the recurrence
-	id to find if the object is on the server.
-
-2006-04-05  Simon Zheng  <simon.zheng@sun.com>
-
-	Fixes bug #333704
-	* gui/dialogs/comp-editor-util.c: (comp_editor_strip_categories):
-	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>
-
-       	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.
-
-2006-03-28  Jeff Cai  <jeff.cai@sun.com> 
-	
-	Fixes #333877
-	* gui/e-meeting-list-view.c: (row_activated_cb):
-	Use gtk_tree_selection_get_selected_rows instead of 
-	gtk_tree_selection_get_selected to get selected rows from
-	a multi-row selection.
-
-2006-03-28  Harry Lu  <harry.lu@sun.com>
-
-	Fix for 333693.
-	* 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>
-
-	Fixes #329502
-	* gui/e-meeting-list-view.c: (attendee_edited_cb):
-	Include MAILTO: with the email id while adding
-	it to the list view.
-	* gui/dialogs/task-page.c: (task_page_fill_widgets):
-	add the organizer to the name selector dialog.
-	
-2006-03-22  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #330842
-	* gui/e-cal-model.c: 
-	(e_cal_view_objects_added_cb): Check if the icalcomp
-	is set to ECalComponent.
-
-2006-03-22  Harry Lu  <harry.lu@sun.com>
-
-	Fix for 333697
-	* gui/dialogs/task-page.c: (task_page_init), (sensitize_widgets):
-	remove two useless widgets: sendoptions_frame and sendoptions_button.
-
-2006-03-22  Harry Lu  <harry.lu@sun.com>
-
-	Fix for 333706
-
-	* 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
-	* gui/e-cal-model.c: 
-	(e_cal_model_set_instance_times): Use the timezone present in
-	the appointment.
-
-2006-03-06  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	**Fixes #321832
-	* gui/dialogs/event-editor.c: Pickup the right-icon for f/b.
-	* gui/dialgos/Makefile.am: Define EVOLUTION_ICONSDIR to pickup f/b icon.
-	
-2006-03-06  Simon Zheng  <simon.zheng@sun.com>
-
-	Fixes bug #332140
-	* gui/dialogs/comp-editor.c: (get_attachment_list):
-	* gui/e-cal-popup.c: (temp_save_part):
-	Transfer filenames from utf-8 to glib encoding before really
-	saving files.
-
-2006-03-06  Simon Zheng  <simon.zheng@sun.com>
-
-	Fixes #311482
-	* gui/dialogs/comp-editor.c: (set_attachment_list): As uri is 
-	encaped ASCII-encoded, it can't be recognized when setting 
-	mime part. Use filename instead of uri.
-
-2006-03-06  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	** Fixes bug #328988
-	
-	* gui/alarm-notify/util.c: (calculate_time):
-	* gui/misc.c: (calculate_time): Added code to simplify the function
-	calculate_time and made strings translatable.
-
-2006-03-06  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #330448
-	* gui/e-meeting-list-view.c: (attendee_edited_cb): Remove
-	attendees from the e-name-selector when its removed from
-	meeting list view.
-
-2006-03-06  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #329353	
-	* gui/gnome-cal.c:
-	(gnome_calendar_on_date_navigator_selection_changed): If the previous
-	selection is not list view, set the view as month view.
-
-2006-03-04  Jeff Cai <jeff.cai@sun.com>
-
-	Fixes #333234
-	* gui/calendar-config.c: (calendar_config_get_primary_tasks),
-	(calendar_config_get_primary_memos):
-	Initialize calendar to ensure gconf_client is valid.
-
-2006-03-04  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #331089
-	* gui/dialogs/event-page.c: (sensitize_widgets):
-	Let the recurrence button in tool bar remain
-	active always.
-
-2006-03-03  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #330448
-	* gui/e-meeting-list-view.c: (attendee_edited_cb): Remove
-	attendees from the e-name-selector when its removed from
-	meeting list view.	
-
-2006-03-03  Sam Yang  <sam.yang@sun.com>
-
-	Fixes #324560
-	* gui/calendar-config.[ch]:
-	(calendar_config_add_notification_preview_state): Request 
-	notification of changes to show_task_preview.
-	* gui/e-tasks.c: (config_preview_state_changed_cb): Callback function.
-	(setup_config): Send notification request and store connection ID.
-
-2006-02-17  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	Fixes #312423, #329749
-	* gui/dialogs/event-page.c: (sensitize_widgets): Enable/Disable
-	based on read_only status.
-	(alarm_store_changed_cb): Added. Changed signal handler for alarm list.
-	* gui/dialogs/alamm-list-dialog.c: (edit_clicked_cb): Emit changed 
-	signal for alarm list.
-
-2006-02-28  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #332726
-	* gui/dialogs/recur-comp.c: (recur_component_dialog): Dont
-	remove the recurrence id, the backend would remove it.							     
-
-2006-02-23  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #330677
-	* gui/itip-utils.c: 
-	(comp_content_type): Removed the content setting as text/plain.
-	(itip_send_comp): Changed the reply all to FALSE.
-	(reply_to_calendar_comp): Set the content type as text/plain.
-
-2006-02-15  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	* gui/dialogs/memo-page.glade: Changed the layout spacing of memo 
-	editor.
-
-2006-02-14  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	**Fixes #330374
-
-	* gui/tasks-control.c: (tasks_control_complete_cmd): Added code
-	to disable Edit->Mark as complete for completed events.
-
-2006-02-14  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	**Fixes #326477
-
-	* gui/dialogs/task-page.glade: Changed size of the new task popup 
-	window to display Status Details in its default size.
-
-2006-02-14  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-	
-	**Fixes #325935
-
-	* gui/dialogs/task-page.c: (source_changed_cb): Added code to
-	enable Save button if group is changed in task editor
-
-2006-02-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #330931 #331029
-	
-	* gui/e-calendar-view.c: (e_calendar_view_get_tooltips):
-
-2006-02-13  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/task-page.c: (sensitize_widgets):
-	sensitize should be initialized to TRUE since it is
-	being ANDed to compute sens.
-	Fixes #330957 and #330958.
-
-2006-02-13  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* calendar.error.xml: Added mnemonics. Fixes bug #330933.
-
-2006-02-12  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* gui/dialogs/recurrence-page.c (make_recur_month_num_menu): 
-	Marked strings for translation. Fixes bug #330863.
-
-2006-02-12  Andre Klapper  <a9016009@gmx.de>
-
-	* gui/dialogs/recurrence-page.glade:
-	* gui/dialogs/recurrence-page.c:	
-	added translator comments for some occurrences of heavy sentence 
-	splitting. Hopefully fixes bug 329695.
-
-2006-02-11  Andre Klapper  <a9016009@gmx.de>
-	* gui/dialogs/recurrence-page.c:
-	* gui/alarm-notify/util.c:
-	* gui/misc.c:
-	adding translator comments to "second" strings to distinguish
-	ordinal numbers and time divisions. Fixes bug 328988.
-
-2006-02-11  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* gui/dialogs/comp-editor.c (setup_widgets): 
-	* gui/e-memo-table.c (e_memo_table_init): 
-	* gui/e-calendar-table.c (e_calendar_table_init): 
-	Change a11y names and add description. Fixes part of bug #330723.
-
-2006-02-10  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* gui/e-timezone-entry.c (e_timezone_entry_init): Correct the a11y
-	string for the Timezone button to not include its role and to be
-	more descriptive, fixes bug #330712.
-
-2006-02-12  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #329570
-	* gui/e-calendar-view.c: (on_unrecur_appointment):
-	Just remove the instances pass the rid. The exception
-	date will be set in the backend.
-
-2006-02-09  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	Fixes #330521
-	* gui/dialogs/alarm-dialog.c: (alarm_to_aalarm_widgets), 
-	(alarm_to_palarm_widgets): use icalattach_unref. 
-
-2006-02-09  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/e-cal-model.c: (e_cal_view_objects_added_cb):
-	Pass the client along with the id for search to handle 
-	cases where the same backend source has multiple clients 
-	in the view. Remove the FIXME.
-
-2006-01-09  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	Fixes #329768
-	* gui/dialogs/comp-editor.c: (key_press_event): Corrected problem with 
-	casting EAttachmentBar.
-
-2006-02-09  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #330465
-	* gui/dialogs/event-page.c: (event_page_fill_widgets): Fixes the build
-	break.
-
-2006-02-08  Tor Lillqvist  <tml@novell.com>
-
-	* gui/dialogs/task-editor.c (task_editor_init): Construct the
-	pathname to the xml file at run-time to avoid using compile-time
-	paths on Windows.
-
-2006-01-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/alarm-notify/alarm-notify-dialog.c:
-	(add_alarm_to_notified_alarms_dialog):
-	* gui/alarm-notify/alarm-queue.c: (remove_queued_alarm),
-	(open_alarm_dialog), (menu_item_toggle_callback), (populate):
-	* gui/alarm-notify/alarm.c: (pop_alarm), (alarm_remove):
-	* gui/alarm-notify/config-data.c:
-	(config_data_replace_string_list):
-	* gui/cal-search-bar.c: (regen_query):
-	* gui/calendar-view-factory.c:
-	* gui/calendar-view.c:
-	* gui/comp-editor-factory.c: (edit_existing),
-	(resolve_pending_requests), (impl_editExisting), (impl_editNew):
-	* gui/control-factory.c:
-	* gui/dialogs/cal-attachment-select-file.c:
-	(comp_editor_select_file_attachments):
-	* gui/dialogs/calendar-setup.c: (eccp_get_source_type):
-	* gui/dialogs/comp-editor.c: (comp_editor_class_init),
-	(commit_all_fields), (delete_event_cb), (editor_key_press_event),
-	(menu_file_save_cb), (menu_file_close_cb), (make_icon_from_comp),
-	(comp_editor_focus), (needs_send_cb):
-	* gui/dialogs/delete-comp.c: (delete_component_dialog):
-	* gui/dialogs/e-delegate-dialog.c:
-	* gui/dialogs/event-editor.c:
-	* gui/dialogs/event-page.c: (event_page_fill_widgets),
-	(popup_delete_cb), (list_key_press):
-	* gui/dialogs/meeting-page.c: (remove_clicked_cb),
-	(popup_delete_cb), (button_press_event), (list_key_press),
-	(meeting_page_construct):
-	* gui/dialogs/memo-editor.c: (init_widgets),
-	(memo_editor_set_e_cal), (memo_editor_edit_comp),
-	(memo_editor_send_comp):
-	* gui/dialogs/memo-page.c:
-	* gui/dialogs/recurrence-page.c: (fill_exception_widgets),
-	(exception_add_cb):
-	* gui/dialogs/schedule-page.c: (clear_widgets),
-	(schedule_page_fill_component):
-	* gui/dialogs/task-details-page.c:
-	(task_details_page_fill_timezones), (complete_date_changed):
-	* gui/dialogs/task-editor.c:
-	* gui/dialogs/task-page.c: (task_page_fill_widgets),
-	(popup_delete_cb), (list_key_press):
-	* gui/e-alarm-list.c: (get_alarm_string):
-	* gui/e-cal-component-memo-preview.c: (write_html):
-	* gui/e-cal-component-preview.c: (write_html):
-	* gui/e-cal-list-view-config.c:
-	(e_cal_list_view_config_set_property),
-	(e_cal_list_view_config_get_property),
-	(e_cal_list_view_config_dispose):
-	* gui/e-cal-list-view.c:
-	* gui/e-cal-model-calendar.c: (ecmc_value_at):
-	* gui/e-cal-model-memos.c: (ecmm_value_at):
-	* gui/e-cal-model-tasks.c: (get_due_status), (ecmt_value_at),
-	(ecmt_set_value_at), (ecmt_is_cell_editable),
-	(ecmt_value_is_empty), (e_cal_model_tasks_mark_task_complete),
-	(e_cal_model_tasks_update_due_tasks):
-	* gui/e-cal-model.c: (get_classification),
-	(ecm_get_color_for_component), (e_cal_model_set_default_client),
-	(e_cal_view_objects_modified_cb), (e_cal_model_add_client),
-	(e_cal_model_remove_client), (e_cal_model_set_instance_times):
-	* gui/e-cal-popup.c: (ecalp_part_popup_saveas):
-	* gui/e-calendar-table-config.c:
-	(e_calendar_table_config_set_property),
-	(e_calendar_table_config_get_property),
-	(e_calendar_table_config_dispose):
-	* gui/e-calendar-table.c: (e_calendar_table_class_init):
-	* gui/e-calendar-table.h:
-	* gui/e-calendar-view.c: (e_calendar_view_set_property),
-	(e_calendar_view_get_property), (open_event_with_flags),
-	(e_calendar_view_get_tooltips):
-	* gui/e-cell-date-edit-config.c:
-	(e_cell_date_edit_config_set_property),
-	(e_cell_date_edit_config_get_property),
-	(e_cell_date_edit_config_dispose):
-	* gui/e-cell-date-edit-text.c:
-	* gui/e-comp-editor-registry.c:
-	* gui/e-date-edit-config.c: (e_date_edit_config_set_property),
-	(e_date_edit_config_get_property), (e_date_edit_config_dispose):
-	* gui/e-day-view-config.c: (e_day_view_config_set_property),
-	(e_day_view_config_get_property), (e_day_view_config_dispose):
-	* gui/e-day-view-main-item.c: (e_day_view_main_item_set_arg),
-	(e_day_view_main_item_draw_day_event),
-	(e_day_view_main_item_event):
-	* gui/e-day-view-time-item.c: (e_day_view_time_item_set_arg),
-	(e_day_view_time_item_get_column_width):
-	* gui/e-day-view-top-item.c: (e_day_view_top_item_set_arg),
-	(e_day_view_top_item_draw_long_event),
-	(e_day_view_top_item_draw_triangle), (e_day_view_top_item_event):
-	* gui/e-day-view.c: (process_component), (e_day_view_style_set),
-	(e_day_view_recalc_cell_sizes), (e_day_view_foreach_event),
-	(e_day_view_reshape_resize_long_event_rect_item),
-	(e_day_view_update_long_event_resize), (e_day_view_update_resize),
-	(e_day_view_reshape_long_event), (e_day_view_reshape_day_event),
-	(e_day_view_change_duration_to_start_of_work_day),
-	(tooltip_destroy), (e_day_view_on_text_item_event),
-	(e_day_view_on_editing_stopped):
-	* gui/e-itip-control.c: (e_itip_control_class_init),
-	(find_cal_opened_cb), (find_server), (set_date_label),
-	(ok_clicked_cb):
-	* gui/e-meeting-attendee.c:
-	* gui/e-meeting-list-view.c:
-	(e_meeting_list_view_remove_attendee_from_name_selector):
-	* gui/e-meeting-store.c: (role_to_text), (partstat_to_text),
-	(e_meeting_store_set_value):
-	* gui/e-meeting-time-sel-item.c:
-	(e_meeting_time_selector_item_set_arg),
-	(e_meeting_time_selector_item_paint_all_attendees_busy_periods):
-	* gui/e-meeting-time-sel.c: (e_meeting_time_selector_construct),
-	(e_meeting_time_selector_recalc_date_format):
-	* gui/e-memo-table-config.c: (e_memo_table_config_set_property),
-	(e_memo_table_config_get_property), (e_memo_table_config_dispose):
-	* gui/e-memo-table.c: (e_memo_table_class_init), (task_compare_cb):
-	* gui/e-memos.c: (update_view), (backend_error_cb), (open_ecal):
-	* gui/e-mini-calendar-config.c:
-	(e_mini_calendar_config_set_property),
-	(e_mini_calendar_config_get_property),
-	(e_mini_calendar_config_dispose):
-	* gui/e-pub-utils.c: (is_publish_time), (e_pub_publish):
-	* gui/e-tasks.c: (process_completed_tasks), (backend_error_cb):
-	* gui/e-timezone-entry.c: (e_timezone_entry_destroy):
-	* gui/e-week-view-config.c: (e_week_view_config_set_property),
-	(e_week_view_config_get_property), (e_week_view_config_dispose):
-	* gui/e-week-view-event-item.c: (e_week_view_event_item_draw),
-	(e_week_view_event_item_draw_icons):
-	* gui/e-week-view-main-item.c: (e_week_view_main_item_set_arg):
-	* gui/e-week-view-titles-item.c: (e_week_view_titles_item_set_arg),
-	(e_week_view_titles_item_draw):
-	* gui/e-week-view.c: (process_component), (tooltip_destroy),
-	(tooltip_event_cb), (e_week_view_reshape_event_span),
-	(e_week_view_on_text_item_event), (e_week_view_event_move),
-	(e_week_view_on_editing_stopped), (e_week_view_do_key_press):
-	* gui/gnome-cal.c: (dn_e_cal_view_objects_modified_cb),
-	(dn_e_cal_view_done_cb), (table_selection_change_cb),
-	(gnome_calendar_goto), (focus_current_view), (backend_error_cb),
-	(gnome_calendar_set_selected_time_range),
-	(gnome_calendar_get_current_time_range),
-	(gnome_calendar_get_visible_time_range),
-	(gnome_calendar_delete_selected_occurrence):
-	* gui/goto.c: (goto_dialog):
-	* gui/itip-utils.c: (comp_fb_normalize):
-	* gui/memos-component.c: (create_new_memo),
-	(impl_requestCreateItem):
-	* gui/migration.c: (migrate_memos):
-	* gui/print.c: (print_month_small), (print_day_details),
-	(print_todo_details), (print_comp_item):
-	* gui/tasks-component.c: (create_new_todo),
-	(impl_requestCreateItem):
-	* gui/weekday-picker.c: Cleanups:
-	- remove unused vars
-	- remove extraneous semi-colons
-	- add some comments where assignments were done without using
-	  the results later
-	- remove break; statements after return foo;
-	- add casts in some places to be more type correct
-	- rename variables with name clashes
-	- s/if/ifdef in some cases
-	- mark some code static
-	- remove some unused functions
-	- use guint for 1-bit bitfields
-
-2006-02-01  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	** Fixes #326997
-	* gui/dialogs/event-page.c (sensitize_widgets):
-	set/unset the editability of description.
-
-2006-01-17  Ranjan Somani  <sranjan@novell.com>
-
-	** Fixes #322009
-	* gui/e-meeting-time-sel.c: line 431: Changed Label "Contacts..." to "Attendees..."
-
-2006-01-06  Johnny Jacob  <johnnyjacob@gmail.com>
-	
-	** Fixes #325941
-
-	* gui/dialogs/event-page.c (sensitize_widgets) : Handle the 
-	sensitivity of hour_selector and minute_selector.
-
-2006-01-31  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	** Fixes #327723
-	
-	* gui/dialogs/event-page.c (init_widgets): Handle the
-	delete-event for alarm dialog.
-
-2006-01-31  Oswald Rodrigues <ozzy_rodrigues@yahoo.com>
-
-	** Fixes #328515
-	
-	* gui/dialogs/comp-editor.c (attachment_bar_changed_cb):Changed Attachment 
-	bar behaivour to expand when attachment is present and collapse when no 
-	attachment is present.
-	
-2006-02-03  Johnny Jacob  <johnnyjacob@gmail.com>
-	
-	** Fixes bug #329775
-	
-	* gui/dialogs/task-editor.c (task_editor_construct): Handle
-	delete-event signal for task_details_window.
-
-2006-02-05  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* gui/dialogs/event-page.glade: Correct typo, fixes bug #329748.
-
-2006-01-31  Tor Lillqvist  <tml@novell.com>
-
-	* gui/alarm-notify/alarm-queue.c (open_alarm_dialog,
-	tray_icon_clicked_cb): Fix compilation against HEAD gtk and on
-	Win32, where we use the GtkStatusIcon API and there is no
-	tray_image variable.
-
-2006-01-31  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/cal-prefs-dialog.c: (show_alarms_config):
-	Show the widget.
-
-2006-01-30  Harish Krishnaswamy <kharish@novell.com>
-
-	* gui/e-week-view.c : Reverting Chakravarthi's
-	commit on Jan 17 to fix miscellaneous problems
-	manifesting in the week/month views.
-	
-2006-01-30  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	* gui/dialogs/event-page.c: (sensitize_widgets),
-	(alarm_changed_cb):
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/task-page.c: (sensitize_widgets):
-	* gui/dialogs/task-page.glade:
-
-	Fixed the page layouts as per HIG spacing.
-
-2006-01-30  Johnny Jacob  <johnnyjacob@gmail.com>
- 
- 	Fixes #328285
- 	* gui/dialogs/memo-page.c (widget_focus_out_cb), 
- 	(widget_focus_out_cb) : Added. Handle focus in and out
- 	events.
- 	(init_widgets): Connect focus in and out signals for 
- 	memo_content .
-
-	Committed to HEAD on behalf of johnny since he does not
-	have commit rights - partha
- 
-2006-01-18  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	Fixes #225816
-	* gui/dialogs/alatm-list-dialog.glade : Added edit button.
-	* gui/dialogs/alarm-list-dialog.c (init_widgets), (get_widgets) : 
-	Get and connect signals for edit button.
-	(sensitize_buttons) : Handle the sesitivity of edit button.
-	(edit_clicked_cb) : Added. Handle edit button click event.
-	* gui/dialogs/alarm-dialogs.c (populate_widgets) : Added. Extract data
-	from alarm and fill in the widgets.
-	(alarm_to_repeat_widgets): Added. Alarm data to repeat widgets.
-	(alarm_to_aalarm_widgets): Added. Alarm data to audio alarm widgets.
-	(alarm_to_dalarm_widgets): Added. Alarm data to display alarm widgets.
-	(alarm_to_palarm_widgets): Added. Alarm data to procedure alarm widgets.
-	(alarm_to_dialog): call populate_widgets.
-
-2006-01-28  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	** Fixes Bug #327347
-
-	* calendar/gui/dialogs/cal-prefs-dialog.glade:
-	Changed W_eek starts mnemonic to Wee_k starts on and added a 
-	translation string to that.
-
-2006-01-30  Johnny Jacob <johnnyjacob@gmail.com>
-
-	Fixes #327344
-	* gui/dialogs/cal-prefs-dialog.c: (cal_prefs_dialog_create_time_edit):
-	Show date edit component.
-	* gui/main.c: (factory): changed gtk_widget_ahow_all to 
-	gtk_widget_show.
-
-2006-01-29  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	** Fixes Bug #327304
-	
-	* gui/calendar-commands.c :Next" and "Previous" buttons in toolbar for 
-	calendar and mail are made same.
-
-2006-01-28  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	** Fixes bug #328510, #328885
-
-	* calendar.error.xml: Added error for saving memos.
-	* gui/dialogs/event-editor.c: (menu_class_public_cb),
-	(menu_class_private_cb), (menu_class_confidential_cb):
-	Added change notification for event page.
-	* gui/dialogs/memo-editor.c: (menu_show_categories_cb),
-	(menu_class_public_cb), (menu_class_private_cb),
-	(menu_class_confidential_cb), (memo_editor_init),
-	(memo_editor_construct), (memo_editor_set_e_cal),
-	(memo_editor_finalize): Added menus to memo.
-	* gui/dialogs/memo-page.c: (memo_page_init), (memo_page_finalize),
-	(set_classification_menu), (memo_page_get_widget),
-	(memo_page_focus_main_widget), (clear_widgets),
-	(memo_page_set_classification), (sensitize_widgets),
-	(memo_page_fill_widgets), (memo_page_fill_component),
-	(memo_page_set_show_categories), (get_widgets),
-	(categories_clicked_cb), (field_changed_cb), (source_changed_cb),
-	(init_widgets), (memo_page_construct), (memo_page_new): Added code to 
-	handle memos.
-	* gui/dialogs/memo-page.glade:
-	* gui/dialogs/memo-page.h: 
-	* gui/dialogs/save-comp.c: (save_component_dialog):
-	* gui/dialogs/task-editor.c: (menu_class_public_cb),
-	(menu_class_private_cb), (menu_class_confidential_cb): Added code to
-	change notification for task page.
-
-2006-01-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/dialogs/alarm-list-dialog.c (get_widgets),
-	(alarm_list_dialog_run), (alarm_list_dialog_peek): Added a function to
-	peek parts of a dialog.
-	* gui/dialogs/alarm-list-dialog.glade: Changed the layout of the alarm
-	dialog.
-	* gui/dialogs/event-page.c (event_page_init), (clear_widgets),
-	(sensitize_widgets), (event_page_fill_widgets),
-	(event_page_fill_component), (get_widgets), (alarm_changed_cb),
-	(alarm_store_inserted_cb), (alarm_store_deleted_cb),
-	(alarm_custom_clicked_cb), (init_widgets): Added code to handle the
-	new alarm dialog layout.
-	* gui/dialogs/event-page.glade: Changed the alarm dialog layout.
-
-2006-01-23  Tino Meinen <a.t.meinen@chello.nl>
-	Fixes #325831
-	* calendar.error.xml: Corrected a grammatical error in a message
-	for saving changed appointments, and changed the corresponding
-	message for tasks correspondingly
-
-2006-01-25  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/alarm-notify/alarm-queue.c: (popup_notification):
-	Removed the unsed variable filename. Do not set the icon
-	from pixbuf. Just pass the icon name to notification_new.
-	
-2006-01-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Fixes #325762
-	* gui/alarm-notify/alarm-notify.c: (process_removal_in_hash),
-	(list_changed_cb), (load_calendars), (alarm_notify_init):
-	* gui/alarm-notify/alarm-queue.c: (open_alarm_dialog),
-	(tray_icon_clicked_cb), (icon_activated), (tray_icon_blink_cb),
-	(display_notification), , (alarm_queue_init),
-	(alarm_queue_remove_client):
-	* gui/dialogs/cal-prefs-dialog.c: (alarms_selection_changed),
-	(setup_changes), (initialize_selection), (show_alarms_config),
-	(show_config), (calendar_prefs_dialog_construct):
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/cal-prefs-dialog.h: The alarms icon is show in the 
-	notification tray only when there is an alarm. The selection
-	of calendars for alarms is moved to preferences.
-
-2006-01-25  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #327879
-	
-	* gui/dialogs/recurrence-page.c: (clear_widgets):
-	Use make_ending_special to fill the ending fields 
-	properly.
-
-2006-01-24  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #323700
-	* gui/gnome-cal.c:
-	(gnome_calendar_on_date_navigator_selection_changed),
-	(gnome_calendar_purge): For clients which have no master object
-	for recurrences need not call generate instances. Pass the 
-	recurrence id to remove the detached instances.
-
-2005-09-17  Jon Ander Hernandez <hernandez@movimage.com>
-	
-	** Fixes bug #313118
-
-	* calendar/gui/alarm-notify/alarm-notify-dialog.c 
-	(add_alarm_to_notified_alarms_dialog): Don't use mark-up for
-	translatable strings.
-
-2006-01-24  Andre Klapper <a9016009@gmx.de>
-
-	* gui/dialogs/meeting-page.c: removed surrounding
-	markup. Fixes bug 313120. Committing on behalf of
-	Pablo Arroyo.
-
-2006-01-23  Andre Klapper <a9016009@gmx.de>
-
-	* gui/e-day-view-time-item.c: added translator comment
-	to a string. Fixes bug 328006.
-
-2006-01-23  Andre Klapper <a9016009@gmx.de>
-
-	* gui/print.c: added translator comments to workday
-	abbreviations. Fixes bug 328007.
-
-2006-01-23  Pavithran <pavithran@gmx.de>
-
-	** Fixes bug #327713 , #327730
-	
-	* gui/dialogs/event-editor.c: (event_editor_construct):
-	* gui/dialogs/task-editor.c: (task_editor_construct):
-	Removes extra seperator. 
-	
-2006-01-23  Irene Huang <Irene.Huang@sun.com>
-
-	Fixes #327958
-
-	* gui/e-calendar-view.c: (e_calendar_view_get_tooltips):
-	Check if ptr==NULL, for special occassion with SunOne 
-	accouts.
-
-2006-01-16  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #326478
-	* gui/dialogs/cal-prefs-dialog.c: (spec_from_picker),
-	(tasks_due_today_set_color), (tasks_overdue_set_color),
-	(set_color_picker):
-	* gui/dialogs/cal-prefs-dialog.glade: Changed the gtk color
-	button to gnome color picker.
-
-2006-01-20  Andre Klapper <a9016009@gmx.de>
-	* gui/dialogs/task-page.c (field_changed_cb):
-	Removed wrong parameter to be able compile again.
-
-2006-01-17  Johnny Jacob <johnnyjacob@gmail.com>
-
-	* gui/dialogs/event-page.c (edit_button_cb): Added.
-	edit the selected attendee.
-	(sensitize_widgets): enable/disable edit button and 
-	Attendee list view.
-	(button_press_event): don't popup the menu if editing is
-	disabled.
-	(get_widgets): get and connect signals for edit button
-
-2006-01-19  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	Fixes #327487
-	* gui/dialogs/cal-prefs-dialog.c (default_reminder_units_changed),
-	(time_divisions_changed), (week_start_day_changed) : Use 
-	e_dialog_combo_box functions to access the widgets.
-	(default_reminder_interval_changed): Hack to update the spin
-	 button value
-
-2006-01-19  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #327293
-	* gui/dialogs/event-editor.c: (window_delete_event),
-	(event_editor_construct): handle delete event to just
-	hide the window.
-
-2006-01-17  P S Chakravarthi <pchakravarthi@novell.com>
-
-	* gui/e-week-view.c : added some code in e_week_view_on_button_press ()
-	to handle double click on an event in week and month view.
-
-2006-01-16  Johnny Jacob <johnnyjacob@gmail.com>
-
-	* gui/dialogs/event-page.c (edit_button_cb): Added.
-	edit the selected attendee.
-	(sensitize_widgets) : enable/disable edit button and 
-	Attendee list view.
-	(button_press_event) : don't popup the menu if editing is
-	disabled.
-	(get_widgets) : get and connect signals for edit button
-	* gui/e-meetings-list-view.ch (e_meeting_list_view_set_editable ) :
-	Added. set/unset the editable property of list view.
-
-2006-01-16  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/calendar-component.c: (impl__get_userCreatableItems):
-	* gui/memos-component.c: (impl__get_userCreatableItems):
-	* gui/tasks-component.c: (impl__get_userCreatableItems):
-	remove shortcut keys (UI Hackfest -
-	See http://go-evolution.org/Shortcut_Keys_Review).
-
-2006-01-16  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Fixes #324739
-	* gui/e-calendar-view.c: (tooltip_grab),
-	(e_calendar_view_get_tooltips):
-	* gui/e-day-view.c: (e_day_view_convert_event_coords),
-	(e_day_view_on_time_canvas_scroll), (tooltip_get_view_event),
-	(tooltip_destroy), (e_day_view_on_text_item_event),
-	(e_day_view_on_editing_stopped):
-	* gui/e-week-view.c: (e_week_view_on_scroll), (tooltip_destroy),
-	(tooltip_event_cb), (e_week_view_on_text_item_event),
-	(e_week_view_on_editing_stopped):
-
-2006-01-16  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Patch submitted by Sebastien Bacher <seb128@debian.org>
-	
-	Fixes #325629
-	* gui/alarm-notify/alarm-queue.c: (popup_notification): Use the new
-	apis in libnotify.
-	
-2006-01-16 P S Chakravarthi <pchakravarthi@novell.com>
-
-	Fixes #324816 #324889
-
-	* gui/alarm-notify/alarm-queue.c : menu_item_toggle_callback :
-	revised the code to use only e_source_group_add_source and
-	e_source_group_remove_source alone to update gconf rather than
-	explicit updating of the gconf xml
-	[along with a patch in e-source-list.c]
-
-
-2006-01-16 P S Chakravarthi <pchakravarthi@novell.com>
-
-	Minor Feature: Reply and Reply all for calendar items of clients
-	that support such facility (personal, exchange).
-
-	* gui/e-cal-popup.[ch] : added a definition for
-	E_CAL_POPUP_SELECT_NOSAVESCHEDULES which separates out calendar items
-	of clients without the static capability of saving schedules.
-	* gui/itip-utils.c:
-	reply_to_calendar_comp (), html_new_lines_for (): added.
-	comp_to_list (): added another boolean parameter called reply_all which
-	indicates if reply to everyone is wanted or not.
-	added code for E_CAL_COMPONENT_METHOD_REPLY
-	itip_get_comp_attendee () : added code for E_CAL_COMPONENT_METHOD_REPLY
-	comp_content_type () : added code for E_CAL_COMPONENT_METHOD_REPLY
-	* gui/e-calendar-view.c on_reply (), on_reply_all (): added.
-	modified E_CAL_POPUP_* menu items to include Reply and Reply All
-
-
-2006-01-16 P S Chakravarthi <pchakravarthi@novell.com>
-
-	Fixes a crash in alarm-daemon on selecting "Quit" in panel options
-	* gui/alarm-notify/alarm-queue.c  (remove_client_alarms):
-	Removed the code loops through a list of ids generated.
-	used g_hash_table_foreach instead.
-	* gui/alarm-notify/alarm-queue.c (add_id_cb) : removed.
-	* gui/alarm-notify/alarm-queue.c (remove_comp_by_id) : added
-	* gui/alarm-notify/alarm-queue.c (alarm_queue_add_client) :
-	replaced g_str_equal with g_direct_equal in g_hash_table_new
-	to consider structure pointers rather than strings for keys.
-
-
-2006-01-13  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	Fixes #213660
-	* gui/dialogs/alarm-dialog.c (check_custom_sound):
-	Save the directory path in gconf.
-	(action_selection_done_cb) : Read from gconf and set
-	the default path for the file entry.
-	* gui/dialogs/calendar-config.ch (calendar_config_set_dir): Added.
-	save the path in gconf.
-	(calendar_config_get_dir_path): Added. Retrive the path from gconf.
-
-2006-01-13  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #320101
-	* gui/e-select-names-editable.c:
-	(e_select_names_editable_get_emails),
-	(e_select_names_editable_get_names): Append the list of email ids
-	and names.
-
-2006-01-13  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #311888
-	* gui/dialogs/recurrence-page.c: (recurrence_page_set_dates):
-	Set the selection based on the start date of the appointment.
-
-2006-01-13  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	* gui/dialogs/comp-editor-page.c: (comp_editor_page_class_init),
-	(comp_editor_page_unset_focused_widget),
-	(comp_editor_page_set_focused_widget):
-	* gui/dialogs/comp-editor-page.h:
-	* gui/dialogs/comp-editor.c: (menu_edit_copy_cb),
-	(menu_edit_paste_cb), (menu_edit_selectall_cb), (menu_edit_cut_cb),
-	(comp_editor_init), (comp_editor_append_page),
-	(page_focus_out_widget_cb), (page_focus_in_widget_cb):
-	* gui/dialogs/event-page.c: (widget_focus_in_cb),
-	(widget_focus_out_cb), (init_widgets):
-	* gui/dialogs/task-page.c: (widget_focus_in_cb),
-	(widget_focus_out_cb), (init_widgets): Implementation for the edit button.
-
-2006-01-13  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #313112
-	* gui/e-calendar-view.c: (on_unrecur_appointment):
-	Remove the old instance if its a detached instance.
-
-2006-01-13  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #259505
-	* gui/gnome-cal.c:
-	(gnome_calendar_on_date_navigator_selection_changed): Check 
-	the previous selection before setting the view.
-
-2006-01-13  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #271810
-	* gui/dialogs/comp-editor.c: (comp_editor_class_init), (save_comp):
-	* gui/dialogs/comp-editor.h: Added to signal to indicate the object
-	has been created.
-	* gui/e-calendar-view.c: (user_created_cb),
-	(open_event_with_flags): Emit the user_created signal if object
-	is created to ensure the calendar is selected.
-
-2006-01-13  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #274234
-	
-	* gui/e-week-view-main-item.c: (e_week_view_main_item_draw_day): Bolds 
-	the date if drawing Today.
-	* gui/gnome-cal.c (gnome_calendar_goto)
-	(gnome_calendar_on_date_navigator_selection_changed): Call the parent
-	views to update the selection.
-
-2006-01-13  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #271541
-	* calendar.error.xml: Added a new message for displaying 
-	error message while trying to create a new event in read only
-	calendars
-	* gui/e-calendar-view.c: (e_calendar_view_new_appointment_for):
-	Run the error dialog using the message.
-
-2006-01-13  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #326735
-	* gui/dialogs/event-page.c: (event_page_fill_widgets): If
-	the user is not the organizer, set the orignal organizer in
-	the combobox and make it non-editable.
-
-2006-01-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in:
-
-	Changes accels for Calendar (C+F3 -> C+3), Tasks (C+F4 ->C+4) and
-	Memo (C+F6 to C+5).
-
-2006-01-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/gnome-cal.c: (gnome_calendar_class_init):
-	Re-define keyboard shortcuts for switching between views.
-	UI Hackfest - Refer http://go-evolution.org/Shortcut_Keys_Review
-
-2006-01-10  Simon Zheng  <simon.zheng@sun.com>
-
-	* gui/calendar-component.c: (calendar_component_peek): 
-	* gui/calendar-config.c:
-	* gui/e-cal-model-tasks.c:
-	* gui/e-cal-popup.c:
-	* gui/e-cell-date-edit-text.c:
-	* gui/e-meeting-store.c:
-	* gui/memos-component.c: (memos_component_peek):
-	* gui/print.c:
-	* gui/tasks-component.c: (tasks_component_peek):
-	Use e_util_mkdir_hier() instead of e_mkdir_hier().
-
-        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_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-08  Tor Lillqvist  <tml@novell.com>
-
-	* gui/migration.c: Bypass most of this file on Win32, as there are
-	no 1.x installations on Win32 to migrate from. Use
-	g_filename_to_uri() in a couple places instead of just prefixing
-	file://.
-
-2006-01-08  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/dialogs/alarm-dialog.glade: Added code to hscroll the custom
-	message of alarm. Fixes bug #325446
-	
-	* gui/dialogs/task-page.glade: Added code to expand the description
-	scrolled window when the parent window is dragged. Fixes bug #325502
-	
-2005-01-06  Andre Klapper <a9016009@gmx.de>
-	* gui/e-alarm-list.c: added translator comments to several strings.
-	Fixes bug 325612.
-
-2006-01-06  Andre Klapper <a9016009@gmx.de>
-	* evolution/calendar/calendar.error.xml:
-	* evolution/calendar/gui/e-itip-control.c:
-	* evolution/calendar/gui/dialogs/task-details-page.glade:
-	* evolution/calendar/gui/e-cal-component-preview.c:
-	* evolution/calendar/gui/e-cal-model-tasks.c:
-	* evolution/calendar/gui/e-calendar-table.c:
-	* evolution/calendar/gui/print.c:
-	changing "cancelled" (British English)
-	to "canceled" (American English). Fixes bug 325334.
-
-2005-01-06  Andre Klapper <a9016009@gmx.de>
-	* calendar.error.xml: changed "RSVP" to "reply". Fixes bug 261071.
-
-2006-01-06  Simon Zheng <simon.zheng@sun.com>
-
-	* gui/itip-utils.h: use libedataserver/e-account-list.h instead
-	of e-util/e-account-list.h.
-
-2006-01-06  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	* gui/dialog/event-page.c: (set_all_day), (sensitize_widgets)
-	(time_sel_changed), (update_end_time_selector), (hour_minute_changed),
-	(event_page_set_all_day_event), (alarm_changed_cb), (init_widgets) :
-	Fixed warnings.
-
-2005-01-06  Boby Wang <boby.wang@sun.com>
-
-	* gui/e-day-view.c: (e_day_view_on_text_item_event):
-	Change the keys which need to be pressed to alter the end time
-	of the event selected. Now: Ctrl+Shift+Up(or Down)
-	Before: Ctrl+Alt+Shift+Up(or Down) conflict with switching
-	the workspace in Gnome Desktop.
- 
-2006-01-05  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	* gui/dialogs/event-page.c (init_widgets): Set alarm-dialog as
-	modal.
-
-2006-01-05  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	Fixes #216535
-	* gui/dialogs/event-page.c (end_date_changed_cb ): Added. Signal
-	handler for end_time.
-	(start_date_changed_cb) : Added. Changes the end_time according to 
-	the duration.
-
-2006-01-05  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c: 
-	Include the e-time-utils.h from libedataserver
-	as it has been removed from e-util. Fixes a build
-	break.
-	(snooze_pressed_cb):Fixed a warning.
-
-2006-01-05  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	Fixes #258786 
-	* gui/e-cal-popup.c (e_cal_popup_target_new_select) : When more than
-	one event is selected, check for ICAL_COMPLETED_PROPERTY and set the bit
-	accordingly.
-	* gui/e-calendar-table.c (tasks_popup_items) : Enable "b0.markmanycomplete" menu item
-	only if E_CAL_POPUP_SELECT_NOTCOMPLETE is set.
-
-2006-01-05  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	Fixes #303193
-	* gui/alarm-notify/alarm-notify-dialog.c (notified_alarms_dialog_new):
-	Changed events handled for edit_btn, snooze_btn from pressed to
-	clicked
-	(snooze_pressed_callback) : Grab keyboard focus to snooze_btn.
-	
-2006-01-05  P S Chakravarthi <pchakravarthi@novell.com>
-
-	Fixes 317808
-
-	* gui/alarm-notify/alarm-notify.glade : added hours as a 
-	spin button for snooze
-	* gui/alarm-notify/alarm-notify-dialog.c : added code to 
-	include hours in calculation of snooze time.
-
-2006-01-04  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-day-view.c: (e_day_view_convert_event_coords),
-	(tooltip_get_view_event), (tooltip_destroy),
-	(e_day_view_on_text_item_event): Reverting the patch as it
-	causes crash while viewing the tooltip in top canvas.
-
-2006-01-04  Tor Lillqvist  <tml@novell.com>
-
-	* gui/dialogs/cal-prefs-dialog.c: Reinstate the run-time glade
-	file pathname lookup change from 2005-11-26. It had been
-	overwritten on 2005-12-19.
-
-2006-01-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #325416
-	
-	* gui/e-day-view.c: (e_day_view_convert_event_coords),
-	(tooltip_get_view_event), (tooltip_destroy),
-	(e_day_view_on_text_item_event): Read the event num from the position
-	of x,y.
-
-2006-01-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #325414
-
-	* gui/e-calendar-view.c: (e_calendar_view_get_tooltips): Added null
-	check for the string before creating the tooltips and stopped showing
-	it.
-	* gui/e-day-view.c: (e_day_view_on_editing_stopped):
-	* gui/e-week-view.c: (e_week_view_on_editing_stopped): Added code to
-	hide tooltips window when start/stop hiding
-
-2006-01-02  Harish Krishnaswamy  <kharish@novell.com>
-
-	reviewed by: Chenthill Palanisamy <pchenthill@novell.com> 
-
-	* gui/e-tasks.c: (open_ecal): The timezone should be set on
-	the task we are trying to open - not on the default.
-	Fixes #325489.
-
-2006-01-02  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/cal-prefs-dialog.c: (show_fb_config):
-	Fixes #325468 (critical warning crasher).
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* icalendar-importer.c: removed a duplicated exclamation mark.
-	  Fixes bug 325123.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* gui/apps_evolution_calendar.schemas.in.in:
- 	  harmonized "URL", "Url" and "url". Fixes bug 325125.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* calendar.error.xml:
-	  changing "canceled" to "cancelled" to stay consistant to the rest.
-	  Fixes bug 325116.
-
-2005-12-20  Andre Klapper  <a9016009@gmx.de>
-
-	* calendar.error.xml: Adding punctation to some error messages.
-	  Fixes bug 313144.
-
-2005-12-20  Andre Klapper  <a9016009@gmx.de>
-
-	* gui/dialogs/recur-comp.c: fixing string bug 308851
-
-2005-12-23  Harish Krishnaswamy  <kharish@novell.com>
-
-	* conduits/calendar/calendar-conduit.c
-	(calconduit_load_configuration): Fix a build breaker.
-	g_filename_to_uri takes 3 arguments.
-
-2005-12-21  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #306150
-	* gui/apps_evolution_calendar.schemas.in.in: Changed the 
-	message id to be gramatically correct.
-	
-2005-12-21  P S Chakravarthi <pchakravarthi@novell.com>
-
-	Fixes #248133
-	* gui/e-meeting-time-sel.c :
-	modified the code in options and autopick call backs
-	so that the menu that drops is at appropriate position
-	as suggested in the bug report.
-
-2005-12-21  Johnny Jacob <johnnyjacob@gmail.com>
-
-	* gui/memos-component.c (impl_createControls): -> createView for
-	new shell apis.
-
-2005-12-21  Not Zed  <NotZed@Ximian.com>
-
-	* gui/tasks-component.c (impl_createControls): same.
-
-	* gui/calendar-component.c (impl_createControls): ->createView for
-	new shell apis.
-
-2005-12-20  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #324525
-	* calendar.error.xml: Set the default response while deleting a
-	calendar item to Cancel. Reverting fix for #320210. 
-
-2005-12-20  Veerapuram Varadhan	 <vvaradhan@novell.com>
-
-	Fixes #323125, #323126
-	* gui/cal-search-bar.c: Re-order the search-bar menu items and
-	make "Summary contains", which is what most people use to search
-	for an item (be it a calendar/task/memo), as default.
-	(cal_search_bar_construct): Do not set "Category is" as default
-	option in search-bar menu.
-
-	* gui/cal-search-bar.h: Re-order the bit-values in accordance to
-	re-ordered search-bar menu items.
-	
-2005-12-20  P S Chakravarthi <pchakravarthi@novell.com>  
-
-	Fixes #323955
-	
-	* gui/alarm-notify/notify-main.c main (), init_alarm_service (), 
-	  alarm_notify_factory_fn ():
-	Removed the mutex code for creating alarm_notify_service and
-	made init_alarm_service a simple function call rather than in 
-	a g_idle_add () to avoid evolution hang.
-
-2005-12-19  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	Fixes Bug #324196 
-
-	* gui/dialogs/comp-editor.c: (prompt_and_save_changes) :
-	Renamed from prompt_to_save_changes. Check wheather the 
-	summary is empty and prompt.
-
-2005-12-21  Sam Yang  <sam.yang@sun.com>
-
-	Fixes #323984
-	* gui/dialogs/task-page.c: (task_page_fill_widgets): Invoke 
-	task_page_set_show_timezone() to check whether to show timezone 
-	widgets on task page. Just like what we did in init_widgets(). 
-	(init_widgets): Since we have called task_page_set_show_timezone() 
-	before, remove its duplicate code. Invoke 
-	task_page_set_show_categories() directly other than copy its code here.
-    	    
-
-2005-12-19  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	Committing for David Trowbridge <trowbrds cs colorado edu>
-
-	* gui/Makefile.am, gui/calendar-commands.c,
-	gui/calendar-componet.[hc], gui/calendar-config-keys.h,
-	gui/calendar-config.c, gui/e-calendar-view.c: remove references to the
-	old f/b publishing code
-
-	* gui/e-cal-config.[hc]: add 'prefs' target
-
-	* gui/main.c: remove calls to publishing, use new EConfig-based
-	preferences dialog
-
-	* gui/dialogs/Makefile.am, gui/dialogs/cal-prefs-dialog.[ch]: Convert
-	to use EConfig
-
-	* gui/dialogs/cal-prefs-dialog.glade: reorganize for EConfig and clean
-	up UI for better HIG compliance
-
-2005-12-19  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #324195
-	* gui/e-cal-model.c: (e_cal_model_set_instance_times): If the 
-	start and end times are same dates, increment the enddate by one.
-
-2005-12-17  Tor Lillqvist  <tml@novell.com>
-
-	* conduits/calendar/calendar-conduit.c
-	* gui/e-cal-component-memo-preview.c
-	* gui/e-cal-component-preview.c: Use GLib to construct
-	filenames from URIs and vice versa.
-
-	* gui/e-cal-list-view.c
-	* gui/e-calendar-table.c
-	* gui/e-calendar-view.c
-	* gui/e-itip-control.c
-	* gui/e-memo-table.c: Use gstdio wrappers.
-
-	* gui/e-cal-model-tasks.c
-	* gui/e-meeting-store.c: Use e_util_utf8_strcasecmp() to do
-	proper casefolded comparison of translated (UTF-8) strings.
-
-	* gui/migration.c: Use gstdio wrappers. Use GDir API instead of
-	dirent. Use g_filename_{to,from}_uri(). Open files in binary
-	mode. Use e_xml_parse_file() instead of xmlParseFile().
-
-	* gui/alarm-notify/alarm-queue.c: When building against GTK+ 2.9.0
-	or later, and always on Win32, use the GtkStatusIcon API instead
-	of EggTrayIcon.
-
-	* gui/dialogs/cal-attachment.h
-	* gui/dialogs/cal-attachment.c
-	* gui/dialogs/cal-attachment-bar.h
-	* gui/dialogs/cal-attachment-bar.c: Remove unused files from CVS.
-
-	* gui/dialogs/comp-editor.c: : Use gstdio wrappers. Use
-	g_filename_from_uri().
-
-	* importers/icalendar-importer.c: Use g_build_filename(),
-	g_filename_from_uri(), g_usleep().
-
-2005-12-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #324094
-
-	* gui/e-calendar-view.c: (e_calendar_view_get_tooltips): Added
-	comments to few strings for translation.
-
-2005-12-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/e-week-view.c: (e_week_view_reshape_event_span),
-	(e_week_view_on_text_item_event): Added event-num to the
-	CanvasItem to be picked up by the event handler. This causes 
-	crash in the tooltip in the week/month view.
-
-2005-12-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-
-	* gui/e-calendar-view.c: (e_calendar_view_get_tooltips): Removed
-	markup from translatable strings.
-
-2005-12-15  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #324058
-	* gui/dialogs/comp-editor.c: (key_press_event),
-	(editor_key_press_event), (real_send_comp): Removed the 
-	obsolete code which caused the crash. Corrected an invalid type
-	cast.
-
-2005-12-15  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #321739
-	* gui/dialogs/event-page.c: (event_page_fill_widgets),
-	(remove_attendee): Add/remove attendee from e-name-selector also.
-	* gui/e-meeting-list-view.h:
-	* gui/e-meeting-list-view.c: (get_index_from_role),
-	(e_meeting_list_view_add_attendee_to_name_selector),
-	(e_meeting_list_view_remove_attendee_from_name_selector),
-	(attendee_edited_cb), (process_section), (add_to_list),
-	(name_selector_dialog_close_cb): Syncronize the adding/removing
-	attendees between EMeetingListView and ENameSelector dialog.	
-
-2005-12-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/e-calendar-view.c: (e_calendar_view_get_tooltips): Added 
-	code to make the tooltips strings translatable. Also picked up
-	the color from the theme for the tooltip instead of hardcoded
-	colors.
-
-2005-12-09  Johnny Jacob <johnnyjacob@gmail.com>
-
-	* gui/dialogs/event-page.c : 
-	(hour_sel_changed) : Added. Event handler for hour_selector
-	(minute_sel_changed) : Added. Event handler for minute_selector
-	(update_end_time_selector) : Added. Updates hour_selector 
-	& minute_selector  
-	(hour_minute_changed) : Added. Updates DateEdit based on hour 
-	and minute selectors
-	(sensitize_widgets) : Handle end_time_selector's sensitivity.
-	(get_widgets) : Get minute_selector.
-	(init_widgets) : Initialize hour_selector and minute_selector.
-	gui/dialogs/event-page.glade : minute_selector GtkSpinButton added.
-
-	* gui/dialogs/event-page.glade: Added the widgets to the glade
-	
-2005-11-27  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	** Fixes bug #324060
-
-	* gui/dialogs/comp-editor.c (menu_file_close_cb): 
-	Check wheather the summary is empty and prompt accordingly,
-
-2005-11-28  Srinivasa Ragavan <sragavan@novell.com>
-
-	** Refixes the bug #320210
-
-	* calendar.error.xml : Default button is changed to GTK_RESPONSE_YES
-	in "prompt-delete-appointment". It was missed out in the earlier
-	patch.
-
-2005-11-28  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	** Fixes the bug #320210
-
-	* calendar.error.xml : Default button is changed to GTK_RESPONSE_YES
-	in "prompt-delete-titled-appointment".
-
-2005-12-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-	reviewed by: Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/comp-editor.c: (editor_key_press_event),
-	(setup_widgets):
-	* gui/dialogs/event-page.c: (event_page_init),
-	(create_image_event_box), (sensitize_widgets), (get_widgets),
-	(alarm_changed_cb), (init_widgets),
-	(event_page_create_source_option_menu), (make_status_icons):
-	* gui/dialogs/event-page.glade:
-	* gui/e-calendar-view.c: (e_calendar_view_get_tooltips):
-	* gui/e-calendar-view.h:
-	* gui/e-day-view.c: (e_day_view_reshape_long_event),
-	(e_day_view_reshape_day_event), (tooltip_get_view_event),
-	(tooltip_destroy), (e_day_view_on_text_item_event):
-	* gui/e-timezone-entry.c: (e_timezone_entry_init):
-	* gui/e-week-view.c: (tooltip_get_view_event), (tooltip_destroy),
-	(tooltip_event_cb), (e_week_view_on_text_item_event): Fixes tooltip
-	crash while editing a component in view. Fixes for layout issues
-	and added the alarm icon in the editor.
-
-2005-12-06  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	* conduits/todo/todo-conduit.c (start_calendar_server):
-	Authenticate by reading the stored-password for tasks that has
-	"auth" property set.  
-	(pre_sync): Moved setting of timezone to start_calendar_server as
-	per the current e-d-s requirements.
-	** Fixes #316315
-
-2005-12-06  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-	Authenticate by reading the stored-password for calendar that has
-	"auth" property set.  
-	(pre_sync): Moved setting of timezone to start_calendar_server as
-	per the current e-d-s requirements.
-	** Fixes #316315
-	
-2005-12-06  Tor Lillqvist  <tml@novell.com>
-
-	* gui/e-cal-config.c (ecph_class_init)
-	* gui/memos-component.c (memos_component_init): Remove stray
-	leftover debugging output.
-
-	* gui/memos-component.c (ensure_sources): Use g_filename_to_uri()
-	instead of just prefixing "file://".
-
-2005-11-29  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #322616
-	* gui/e-cal-model-calendar.c: (get_dtend): Convert to
-	proper time zone.
-
-2005-11-28  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #317322
-	* gui/e-calendar-view.c:
-	(e_calendar_view_delete_selected_occurrence): Do not
-	set a new rid if the component already has it. If an 
-	instance is removed from master component, send a modify
-	request setting the exception for that instance. Cleaned
-	up the code.
-	
-2005-11-28  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #314639
-	* gui/e-calendar-view.c: 
-	(e_calendar_view_new_appointment_for): Check if the default
-	client is loaded before creating the appointment.
-
-2005-11-28  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #318777
-	* gui/e-cal-model.c: 
-	(add_instance_cb): Set the instance start as the started date for
-	the recurring instance.
-	(e_cal_view_objects_added_cb): 
-	(e_cal_view_objects_removed_cb): Check if the comp_data is removed
-	from the array before freeing the data.
-
-2005-11-26  Tor Lillqvist  <tml@novell.com>
-
-	* gui/calendar-commands.c
-	* gui/e-cal-list-view.c
-	* gui/e-calendar-table.c
-	* gui/e-memo-table.c
-	* gui/e-memos.c
-	* gui/e-tasks.c
-	* gui/gnome-cal.c
-	* gui/goto.c
-	* gui/memos-control.c
-	* gui/tasks-control.c
-	* gui/alarm-notify/alarm-notify-dialog.c
-	* gui/alarm-notify/notify-main.c
-	* gui/dialogs/alarm-dialog.c
-	* gui/dialogs/alarm-list-dialog.c
-	* gui/dialogs/cal-attachment.c
-	* gui/dialogs/cal-prefs-dialog.c
-	* gui/dialogs/comp-editor.c
-	* gui/dialogs/e-delegate-dialog.c
-	* gui/dialogs/event-editor.c
-	* gui/dialogs/event-page.c
-	* gui/dialogs/meeting-page.c
-	* gui/dialogs/memo-page.c
-	* gui/dialogs/recurrence-page.c
-	* gui/dialogs/schedule-page.c
-	* gui/dialogs/task-details-page.c
-	* gui/dialogs/task-page.c
-	* gui/dialogs/url-editor-dialog.c: Include e-util-private.h to get
-	redefinition of compile-time pathnames as calls to functions on
-	Windows. Construct the pathnames of files and directories under
-	the installation prefix at run-time to enable install-anywhere on
-	Windows. No effect on functionality on Unix.
-
-2005-11-25  Tor Lillqvist  <tml@novell.com>
-
-	* gui/calendar-component.c (ensure_sources)
-	* gui/tasks-component.c (ensure_sources): Use g_filename_to_uri()
-	instead of just prefixing "file://" for Win32 portability.
-
-	* gui/e-itip-control.c
-	* gui/itip-utils.c: Use g_ascii_strcasecmp() instead of
-	strcasecmp() for portability.
-
-2005-11-24  Srinivasa Ragavan and P.S.Chakravarthi <sragavan@novell.com>, <pchakravarthi@novell.com>
-
-	(simultaneously a patch for configure.in in evolution source dir is
-	 applied to include libnotify, if present)
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_get_selected_calendars):
-	added a field in _AlarmNotifyPrivate called selected_calendars and relevant
-	code elsewhere for use in disabling and enabling alarms for particular calendars.
-	* gui/alarm-notify/alarm-queue.c (free_tray_icon_data):added
-	(notify_dialog_cb): modified to free the non snoozed alarms on close.
-	(open_alarm_dialog): code added to set up tooltip on the panel icon if there
-	are alarms present.
-	(alarm_quit): added. Call back when "Quit" option is chosen on right click of the
-	panel icon.
-	(alarms_configure): added. The call back function for generating the "Configure Alarms"
-	dialog on right click on the panel icon.
-	(menu_item_toggle_cb): added. Call back when a particular calendar is selected
-	or deselected in the "Configure Alarms" dialog.
-	(populate): added. Function to populate the view in the dialog that appears when
-	"Configure Alarms" option is chosen on right click of the panel icon.
-	(alarm_preference_response):added. Called when the "Configure Alarms" dialog is
-	closed.
-	(tray_icon_clicked_cb): modified to get tooltip, giving alarm summary on mouse over
-	the panel icon, to have the panel icon blink in case of active alarms.
-	(display_notification): modified the code to change the strings shown in the alarm
-	dialog.
-	(popup_notification): added. Compiles if there is libnotify. If present, gives
-	a small notification bubble on alarm trigger giving necesary information on the
-	appointment.
-	(alarm_queue_init): modified to add the panel icon that is being used in above
-	functions.
-	* gui/alarm-notify/config-data.[ch](config_data_get_calendars):added. Gets calendar
-	information for notification from a gconf key.
-	(config_data_replace_string_list): added. To replace an old gconf key with a new one.
-	* gui/alarm-notify/util.[ch] (calculate_time):added. An utility function which
-	gives a time difference between two time_t instances in hours, minutes and seconds.
-
-
-2005-11-24  Tor Lillqvist  <tml@novell.com>
-
-	* gui/e-alarm-list.c
-	* gui/e-cal-component-memo-preview.c
-	* gui/e-cal-component-preview.c
-	* gui/e-cal-model.c
-	* gui/e-cell-date-edit-text.c
-	* gui/e-date-time-list.c
-	* gui/e-itip-control.c
-	* gui/e-memos.c
-	* gui/e-tasks.c
-	* gui/itip-utils.c
-	* gui/print.c
-	* gui/alarm-notify/alarm-notify-dialog.c
-	* gui/alarm-notify/util.c
-	* gui/e-calendar-view.c
-	* gui/dialogs/alarm-dialog.c
-	* gui/dialogs/alarm-list-dialog.c
-	* gui/dialogs/comp-editor-util.c
-	* gui/dialogs/recurrence-page.c: Include e-time-utils.h from
-	libedataserver instead of using evolution's copy which is going
-	away.
-
-2005-11-23  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/e-calendar-view.c (tooltip_grab), (get_label),
-	(e_calendar_view_get_tooltips): Added a function to get tooltip
-	tooltip widget
-	* gui/e-calendar-view.h:
-	* gui/e-day-view.c (e_day_view_add_event),
-	(e_day_view_reshape_long_event), (e_day_view_reshape_day_event),
-	(e_day_view_on_text_item_event): Added tooltip for day/work week
-	view.
-	* gui/e-week-view.c (e_week_view_add_event), (tooltip_event_cb),
-	(e_week_view_reshape_event_span), (e_week_view_on_text_item_event):
-	Added tooltip for week/month view.
-	* gui/e-week-view.h:
-	* gui/misc.c (get_position_in_array), (calculate_time): Added a 
-	function for converting time to string.
-	* gui/misc.h:
-
-2005-11-22  Boby Wang <boby.wang@sun.com>
-	Fixes #321237
-	* gui/dialogs/event-page.glade: Add the categories' name
-	The name of categories in new appointment dialog was missed.
-
-2005-11-17  P. S. Chakravarthi <pchakravarthi@novell.com>
-
-	Fixes #314550
-	* gui/alarm-notify/alarm-notify.glade: modified the
-	description widget to a scrolled window.
-	* gui/alarm-notify/alarm-notify-dialog.c (fill_in_labels):
-	modified the way in which description needs to be filled
-	to reflect the change of the description from a GtkLabel
-	to a GtkScrolledWindow.
-
-2005-11-16  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/task-editor.c: (menu_option_status_cmd):
-	Modified the body of the function to show the details page.
-
-2005-11-16  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Reviewed/Edited the patch from Srinivasa Ragavan <sragavan@novell.com>
-	
-	* gui/apps_evolution_calendar.schemas.in.in:
-	* gui/calendar-config.c:
-	* gui/calendar-config.h: Removed the view_attendee function and its
-	gconf keys.
-	* gui/dialogs/event-editor.c: (menu_action_recurrence_cb),
-	(menu_action_recurrence_cmd), (event_editor_init),
-	(event_editor_construct): 
-	* gui/dialogs/event-page.c: (sensitize_widgets): Do not sensitize
-	labels.
-	(set_classification_menu), (event_page_set_classification), 
-	(event_page_fill_widgets), (event_page_fill_component),
-	(init_widgets):
-	* gui/dialogs/event-page.h:Corrected the spelling of recurrence and
-	removed the printf's.
-	* gui/dialogs/task-editor.c: (menu_view_role_cb),
-	(menu_view_status_cb), (menu_view_type_cb), (menu_view_rsvp_cb),
-	(menu_show_time_zone_cb), (menu_show_categories_cb),
-	(menu_class_public_cb), (menu_class_private_cb),
-	(menu_class_confidential_cb), (menu_option_status_cb),
-	(menu_insert_send_options_cmd), (menu_show_time_zone_cmd),
-	(menu_option_status_cmd), (task_editor_init),
-	(task_editor_construct), (task_editor_edit_comp),
-	(task_editor_send_comp), (task_editor_finalize), (show_assignment),
-	(task_editor_show_assignment):
-	* gui/dialogs/task-page.c: (task_page_init), (cleanup_attendees),
-	(task_page_finalize), (set_classification_menu), (clear_widgets),
-	(task_page_set_view_role), (task_page_set_view_status),
-	(task_page_set_view_type), (task_page_set_view_rsvp),
-	(task_page_set_classification), (sensitize_widgets),
-	(task_page_hide_options), (task_page_show_options),
-	(task_page_set_assignment), (get_current_account),
-	(task_page_fill_widgets), (set_attendees),
-	(task_page_fill_component), (add_clicked_cb), (existing_attendee),
-	(remove_attendee), (remove_clicked_cb), (invite_cb),
-	(attendee_added_cb), (popup_add_cb), (popup_delete_cb),
-	(context_popup_free), (button_press_event), (list_view_event),
-	(list_key_press), (task_page_set_show_timezone),
-	(task_page_set_show_categories), (task_page_fill_timezones),
-	(get_widgets), (date_changed_cb), (timezone_changed_cb),
-	(task_page_sendoptions_clicked_cb), (init_widgets),
-	(task_page_construct), (task_page_new),
-	(task_page_get_cancel_comp):
-	* gui/dialogs/task-page.glade:
-	* gui/dialogs/task-page.h: UI changes for task editor.
-
-2005-11-16 Irene Huang <Irene.Huang@sun.com>
-
-	* gui/e-cal-model-memos.c: struct _ECalModelMemosPrivate
-	should not be zero sized.
-
-2005-11-16  Irene Huang <Irene.Huang@sun.com>
-
-	* gui/dialogs/cal-prefs-dialog.c:
-	(cal_prefs_dialog_url_add_clicked): Use strcmp instead of !=.
-	(cal_prefs_dialog_url_remove_clicked):
-	When new a dialog of confirm, set parent to
-	PREFS_WINDOW (dialog_data->page)
-	instead of using PREFS_WINDOW (dialog_data).
-
-2005-11-14  Srinivasa Ragavan <sragavan@novell.com>
- 
-	reviewed by: Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/apps_evolution_calendar.schemas.in.in:
-	* gui/calendar-config-keys.h:
-	* gui/calendar-config.h:
-	* gui/calendar-config.c: (calendar_config_get_show_attendee),
-	(calendar_config_set_show_attendee),
-	(calendar_config_get_show_rsvp), (calendar_config_set_show_rsvp),
-	(calendar_config_get_show_role), (calendar_config_set_show_role),
-	(calendar_config_get_show_type), (calendar_config_set_show_type),
-	(calendar_config_get_show_status),
-	(calendar_config_set_show_status),
-	(calendar_config_get_show_timezone),
-	(calendar_config_set_show_timezone),
-	(calendar_config_get_show_categories),
-	(calendar_config_set_show_categories): Gconf keys to store the last
-	modified state.
-	* gui/dialogs/Makefile.am: Added the evolution UI directory.
-	* gui/dialogs/comp-editor.h:
-	* gui/dialogs/comp-editor.c: (menu_file_save_cb),
-	(menu_file_close_cb), (menu_edit_copy_cb), (menu_edit_paste_cb),
-	(menu_edit_cut_cb), (menu_insert_attachment_cb), (menu_help_cb),
-	(setup_widgets), (comp_editor_init), (comp_editor_set_changed),
-	(comp_editor_append_page), (comp_editor_notify_client_changed):
-	Add only the event page into the notebook.
-	* gui/dialogs/event-editor.c: (menu_view_attendee_cb),
-	(menu_view_role_cb), (menu_view_status_cb), (menu_view_type_cb),
-	(menu_view_rsvp_cb), (menu_action_alarm_cb),
-	(menu_show_time_busy_cb), (menu_all_day_event_cb),
-	(menu_show_time_zone_cb), (menu_show_categories_cb),
-	(menu_class_public_cb), (menu_class_private_cb),
-	(menu_class_confidential_cb), (menu_action_recurrance_cb),
-	(menu_action_freebusy_cb), (menu_action_alarm_cmd),
-	(menu_all_day_event_cmd), (menu_show_time_zone_cmd),
-	(menu_action_recurrance_cmd), (menu_action_freebusy_cmd),
-	(menu_insert_send_options_cmd), (event_editor_init),
-	(event_editor_construct), (event_editor_edit_comp),
-	(event_editor_send_comp), (event_editor_finalize), (show_meeting),
-	(event_editor_show_meeting): Added the menu and tool bar. Schedule
-       	page and recurrence page are shown as dialogs.	
-	* gui/dialogs/event-page.h:
-	* gui/dialogs/event-page.c: (event_page_init), (cleanup_attendees),
-	(event_page_finalize), (set_classification_menu),
-	(set_busy_time_menu), (enable_busy_time_menu),
-	(set_all_day_event_menu), (set_all_day), (update_time),
-	(clear_widgets), (event_page_set_view_attendee),
-	(event_page_set_view_role), (event_page_set_view_status),
-	(event_page_set_view_type), (event_page_set_view_rsvp),
-	(event_page_set_classification), (sensitize_widgets),
-	(event_page_hide_options), (event_page_show_options),
-	(event_page_set_meeting), (event_page_set_delegate),
-	(get_current_account), (event_page_fill_widgets),
-	(event_page_fill_component), (time_sel_changed), (add_clicked_cb),
-	(existing_attendee), (remove_attendee), (remove_clicked_cb),
-	(invite_cb), (attendee_added_cb), (popup_add_cb),
-	(popup_delete_cb), (context_popup_free), (button_press_event),
-	(list_view_event), (list_key_press),
-	(event_page_set_all_day_event), (event_page_set_show_time_busy),
-	(event_page_show_alarm), (event_page_set_show_timezone),
-	(event_page_set_show_categories), (get_widgets),
-	(summary_changed_cb), (notify_dates_changed), (times_updated),
-	(start_timezone_changed_cb), (event_page_sendoptions_clicked_cb),
-	(init_widgets), (event_page_construct), (event_page_new),
-	(event_page_create_source_option_menu), (set_attendees),
-	(event_page_get_cancel_comp):
-	* gui/dialogs/event-page.glade: UI Changes to have the event 
-	page alone.
-	* gui/dialogs/task-editor.c: (task_editor_construct),
-	(task_editor_edit_comp), (show_assignment):
-	* gui/dialogs/memo-editor.c: (memo_editor_construct): Make changes
-	for append page function.
-	* gui/dialogs/schedule-page.c: (schedule_page_construct): Set the 
-	size of the meeting time selector.
-
-2005-11-09  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #313538
-	* gui/dialogs/event-editor.c: 
-	(event_editor_edit_comp): Do not remove the attendees. Removed
-	the obsolete code as scheduling and meeting pages will be created
-	only for meetings now.
-
-2005-11-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #321088
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	(e_meeting_time_selector_style_set),
-	(e_meeting_time_selector_ensure_meeting_time_shown): Set the 
-	scroll_increment to days width. Show only 35 days in the canvas
-	since we query freebusy only for those. Set the canvas view to 
-	meetings day start instead of time.
-
-2005-11-09  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	Committing for Nathan Owens <pianocomp81@yahoo.com>	
-	
-	* calendar/conduit/todo/todo-conduit.c (local_record_from_comp)
-	(comp_from_remote_record) (post_sync) (add_category_if_possible):
-	Category syncing in todo-conduits.
-	
-2005-11-09  Dinesh Layek <LDinesh@novell.com>
-
-	Fixes #273322
-	* gui/e-pub-utils.c
-	(e_pub_publish): removed the source from uri->calendars when the 
-	calendar backend no longer exists.
-	
-2005-11-08  P. S. Chakravarthi <pchakravarthi@novell.com>
-
-	Fixes #316710
-	* gui/alarm-notify/alarm-notify.c 
-	(alarm_notify_add_calendars): modified the code to
-	generate the correct key for obtaining the password
-	for an authenticated calendar.
-
-2005-11-08  P. S. Chakravarthi <pchakravarthi@novell.com>
-
-	Fixes 319217
-	* gui/alarm-notify/alarm-queue.c (load_alarms_for_today):
-	changed the code to load alarms from current day beginning if
-	last notification time is beyond current day's begin time and
-	* gui/alarm-notify/alarm.c (setup_timeout):
-	removed the check which sees if the alarm's trigger time has
-	got past current time so that alarms missed in current day are
-	always shown.
-
-2005-10-21  Mubeen Jukaku  <jmubeen@novell.com>
-
-	Sankar Committting for Mubeen
-	
-	Fixes #310495
-	* gui/e-calendar-table.etspec: Do string case comparison for Summary
-	and Categories field
-
-2005-10-21  Viren.L  <lviren@novell.com>
-
-	Sankar committing for Viren
-
-	Fixes #272920
-
-	* gui/gnome-cal.c (setup_widgets):
-	Connect signal to catch the scroll-event on the widget of date navigator 
-	and handle the GDK_SCROLL_UP,GDK_SCROLL_DOWN in the callback.
-
-		
-2005-10-19  Harish Krishnaswamy <kharish@novell.com>
-
-	Committing for Nathan Owens <pianocomp81@yahoo.com>
-	
-	* calendar.error.xml: Added strings for memos
-	* calendar/conduits/Makefile.am: added 'memo' to SUBDIRS
-	* calendar/conduits/memo/*: initial memo conduit
-	* calendar/gui/calendar-config.[ch]: (calendar_config_get_memos_selected)
-	(calendar_config_set_memos_selected) (calendar_config_add_notification_memos_selected): 
-	gconf get/set for memos lists
-	* calendar/gui/calendar-config-keys.h: added gconf keys for Memos component
-	* calendar/gui/comp-util.[ch] (cal_comp_memo_new_with_defaults): added function
-	to create memo component with defaults
-	* calendar/gui/e-cal-component-memo-preview.[ch]: initial file for preview of a memo
-	* calendar/gui/e-cal-model-memos.[ch]: initial model for the memos component.
-	* calendar/gui/e-memos.[ch]: initial memos base
-	* calendar/gui/e-memo-table.[ch]: initial view for memos component
-	* calendar/gui/e-memo-table.etspec: etspec for memos e-table
-	* calendar/gui/e-memo-table-config.[ch]: initial configuration for memos e-table view
-	* calendar/gui/GNOME_Evolution_Calendar.server.in.in: added Memos component
-	* calendar/gui/main.c: added initialization code for Memos component
-	* calendar/gui/Makefile.am: added entries for new files for Memos component
-	* calendar/gui/memos-component.[ch]: Memos component base code
-	* calendar/gui/memos-control.[ch]: initial user control code. Used for printing,
-	copying, etc.
-	* calendar/gui/migration.c: added migration for memos component - also takes care
-	of initialization for the first time the Memos component is run.
-	* calendar/gui/dialogs/calendar-setup.[ch]: added code to create a new Memo List
-	* calendar/gui/dialogs/Makefile.am: added files for build
-	* calendar/gui/dialogs/memo-editor.[ch]: initial memo editor
-	* calendar/gui/dialogs/memo-page.[ch]: page in editor for editing a memo
-	* calendar/gui/dialogs/memo-page.glade: glade file for memo-editor-page
-	* calendar/gui/dialogs/send-comp.c: added E_CAL_COMPONENT_JOURNAL support for Memo
-	component
-	
-2005-10-18  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #308802
-	* gui/calendar-component.c: (setup_create_ecal):
-	* gui/dialogs/event-page.c: (source_changed_cb):
-	* gui/dialogs/task-page.c: (source_changed_cb):
-	* gui/e-itip-control.c: (cal_opened_cb), (start_calendar_server),
-	(find_cal_opened_cb):
-	* gui/e-tasks.c: (set_timezone), (client_cal_opened_cb),
-	(default_client_cal_opened_cb), (open_ecal):
-	* gui/gnome-cal.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb), (open_ecal),
-	(gnome_calendar_set_default_source):
-	* gui/tasks-component.c: (setup_create_ecal): Set the default
-	timezone in the ecal once its created and before opening ecal.
-
-2005-10-18  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/dialogs/comp-editor.c: (open_attachment)
-	(attachment_bar_icon_clicked_cb), (cab_open), (cab_popup),
-	(button_press_event): Handles the popup menu on the attachment
-	bar.
-	* gui/e-cal-popup.c: (temp_save_part), (ecalp_part_popup_saveas),
-	(ecalp_part_popup_save_selected),
-	(ecalp_part_popup_set_background), (ecalp_apps_open_in),
-	(ecalp_apps_popup_free), (ecalp_standard_items_free),
-	(ecalp_standard_menu_factory), (ecalp_class_init),
-	(e_cal_popup_target_new_attachments): Provides the background
-	image setting, open with application for each attachment.
-	* gui/e-cal-popup.h:
-	* gui/e-calendar-table.c: (e_calendar_table_on_save_as)
-	* gui/e-calendar-view.c: (on_save_as): Change the parameters to
-	e_file_dialog_save.
-
-2005-10-17 Irene Huang <Irene.Huang@sun.com> 
-
-	* gui/e-tasks.c: (e_tasks_show_preview): Should not return a value, so, 
-	change all the g_return_val_if_fail to g_return_if_fail.
-
-2005-10-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #266144, 317575, 313725.
-	* gui/alarm-notify/alarm-queue.c: (remove_queued_alarm),
-	(add_component_alarms), (lookup_comp_queued_alarms), (remove_comp),
-	(query_objects_changed_cb), (compare_ids),
-	(alarm_queue_add_client), (add_id_cb), (remove_client_alarms),
-	(update_cqa): 
-	* gui/e-cal-model.c (search_by_id_and_client):Use ECalComponentId.
-	(e_cal_view_objects_added_cb), (e_cal_view_objects_modified_cb),
-	(e_cal_view_objects_removed_cb),
-	(e_cal_model_get_component_for_uid),
-	(e_cal_model_set_instance_times): set the proper timezone.
-	* gui/e-cal-model.h:
-	* gui/e-calendar-view.c: (delete_event): Do not remove the 
-	recurrence id.
-	* gui/e-calendar-table.c (hide_completed_rows),
-	(show_completed_rows): Use ECalComponentId to get a component
-	for model.
-	* gui/gnome-cal.c: (dn_e_cal_view_objects_removed_cb):
-
-2005-10-06  Srinivasa Ragavan <sragavan@novell.com>
-
-	* calendar.error.xml: Added accels to the Disard new event/
-	task dialog.
-
-	* gui/apps_evolution_calendar.schemas.in.in: Added new key
-	for storing the presence of preview.
-
-	* gui/calendar-config-keys.h: Added key for preview status
-
-	* gui/calendar-config.[ch] (calendar_config_set_vpane_pos): Added
-	functions to get preview status.
-
-	* gui/e-meeting-list-view.c (build_table): makes the invites
-	tab list view tabs resizable and reorderable.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct): Made
-	the recursive not show status and type.
-
-	* gui/e-tasks.[ch] (setup_widgets) (e_tasks_new_task): made a provsion
-	to show/hide the preview.
-
-	* gui/tasks-control.c (tasks_control_activate)
-	(tasks_control_forward_cmd): Added bonobo interface to show/hide
-	preview pane.
-
-	* gui/dialogs/comp-editor.c (attachment_bar_changed_cb) (setup_widgets) 
-	(comp_editor_append_page) (set_attachment_list): Added expander
-	for attachment bar.
-
-	* gui/dialogs/event-editor.c (event_editor_construct) (event_editor_edit_comp)
-	(show_meeting): Added accelerators for the comp editor dialogs for
-	tasks, event, meeting etc.
-
-	* gui/dialogs/event-page.glade: key accelerator for 'busy'
-
-	* gui/dialogs/meeting-page.c (remove_clicked_cb) (client_changed_cb) 
-	(popup_delete_cb) (button_press_event) (meeting_page_construct) 
-	
-	* gui/dialogs/meeting-page.glade: key accelerators for dialog.
-	
-	* gui/dialogs/task-details-page.glade: key accelerators for dialog.
-
-	* gui/dialogs/task-editor.c (task_editor_construct) (task_editor_edit_comp)
-	(show_assignment): Key accelerators for task tab 
-
-	* gui/dialogs/task-page.glade: key accelerators for task dialog
-
-
-2005-10-02  Srinivasa Ragavan <sragavan@novell.com>
-	
-	Provides across calendars keyboard accelerators for popup menus
-
-	* gui/calendar-component.c (ecc_source_popups):
-	* gui/e-calendar-view.c (ecv_main_items) (ecv_main_items):
-	* gui/gnome-cal.c (gc_popups):
-	* gui/tasks-component.c (etc_source_popups):
-	Added Keybinding for popup menu.
-	
-2005-09-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #315095
-	* gui/e-pub-utils.c: Added a global variable to check
-	if the publish time is modified in gconf and removed
-	just_published function.
-	(is_publish_time): cleaned up the code. 
-	(e_pub_publish): send the list of users in the get_freebusy
-	information.
-
-2005-10-03  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #271480
-	* gui/alarm-notify/notify-main.c: (alarm_notify_factory_fn),
-	(init_alarm_service): Added a global static mutex to ensure 
-	the alarm_notify object is created only once.
-
-2005-10-03  Mubeen Jukaku  <jmubeen@novell.com>
-
-	Fixes #264449
-	* gui/e-tasks.c: (update_view_cb),
-	(config_process_completed_tasks_changed_cb): Use process_completed_tasks
-	instead of update_view
-	* gui/gnome-cal.c (update_todo_view_cb),
-	(config_process_completed_tasks_changed_cb): ditto
-	* gui/e-calendar-table.[ch]:
-	(e_cal_model_process_completed_tasks): New function to hide
-	completed tasks
-	* gui/calendar-config.[ch]: 
-	(calendar_config_get_process_completed_tasks_sexp): Added a parameter
-	get_completed to get completed or not completed tasks
-	* gui/misc.[ch]: 
-	(get_position_in_array): Moved from gui/e-cal-model.c
-	* gui/e-cal-model.[ch]:
-	(e_cal_model_set_instance_times): Renamed from static function
-	set_instance_times
-	(search_by_uid_and_client): fix for client is NULL
-	* gui/e-cal-model-tasks.[ch]:
-	(e_cal_model_tasks_update_due_tasks): Update due tasks
-
-2005-10-01  Viren.L  <lviren@novell.com>
-	
-	Fixes #257649
-	* gui/e-calendar-view.h:
-	  Added E_CAL_VIEW_MOVE_PAGE_UP & E_CAL_VIEW_MOVE_PAGE_DOWN to ECalViewMoveDirection.
-	* gui/e-week-view.c (e_week_view_do_key_press), (e_week_view_scroll_a_step):
-	Handled PageUp & PageDown cases and compute new value for
-	adjustment using the current page size value.
-
-2005-10-01  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #244981
-	* gui/print.c: (print_week_day_event): Add the end date
-	while printing in the week view.
-
-2005-10-01  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #316954
-	* gui/e-calendar-view.c: (e_calendar_view_edit_appointment): Set
-	the USER_ORG flag if the appointment is converted to a meeting.
-
-2005-10-01  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #301391
-	* gui/e-calendar-view.c: (clipboard_get_text_cb):
-	Remove the X-EVOLUTION-ENDDATE property, so that
-	the copy/paste of recurrence event expands properly in 
-	the view.
-2005-10-01  P. S. Chakravarthi <pchakravarthi@novell.com>
-
-	Fixes #269685
-	* gui/alarm-notify/alarm-queue.c:
-	(update_cqa): added.
-	(update_qa): added. Invoked by update_cqa ()
-	(query_objects_changed_cb): Modified to invoke update_cqa ()
-	inorder to update the local alarm structures whenver any
-	non time related modifications are made to an existing calendar
-	component.
-
-2005-09-30  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	Fixes #303702
-	* calendar/conduits/calendar/calendar-conduit.c:
-	(process_multi_day): Call e_cal_component_commit_sequence() after
-	modifying the properties of an ECalComponent and before fetching
-	its icalcomponent.
-
-	Reworked the patch from Dave Malcolm <dmalcolm@redhat.com>
-	
-2005-09-30  Viren.L  <lviren@novell.com>
-
-	Fixes #258786
-	* gui/e-cal-popup.[ch] (e_cal_popup_target_new_select) : Added 
-	E_CAL_POPUP_SELECT_NOTCOMPLETE flag.
-	* gui/e-cal-menu.[ch] (e_cal_menu_target_new_select) : Added 
-	E_CAL_MENU_SELECT_NOTCOMPLETE flag.
-	* gui/tasks-control.c (tasks_sensitize_table):
-	* gui/e-calendar-table.c (tasks_popup_items): Added the NOT_COMPLETE
-	flag.
-
-2005-09-30  Viren.L  <lviren@novell.com>
-
-	Fixes #314599.
-	* gui/dialogs/recurrence-page.c (clear_widgets):
-	Changed parameter ENDING_FOREVER to ENDING_FOR while invoking 
-	e_dialog_option_menu_set, invoked make_ending_count_special ().
-
-2005-09-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #273781
-	* gui/alarm-notify/alarm-notify-dialog.c:
-	(notified_alarms_dialog_new): Set the alarm window to
-	appear on the top.
-
-2005-09-30  P. S. Chakravarthi <pchakravarthi@novell.com>
-
-	Fix #274188
-	* gui/e-cal-model.c
-	(get_dtstart): make use of internal zone information so that
-	previous date is not shown in list view for an all-day event.
-
-2005-09-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #273847
-	* gui/dialogs/comp-editor.c: (comp_editor_get_mime_attach_list): set
-	the disposition from the attachment.
-	* gui/itip-utils.c: (append_cal_attachments): Send the right disposition
-	value.
-	* gui/itip-utils.h: Adding variable dipostion to CalMimeAttach structure.
-
-2005-09-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #246480
-	* gui/e-calendar-view.c: (e_calendar_view_add_event): Remember
-       the time if the event is copy pasted in week or month views.	
-
-2005-08-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #270036
-	(init_widgets): added the missing signal handler when
-	the list selection changes.
-
-	Reworked the patch from Dinesh Layek <ldinesh@novell.com>
-
-2005-08-29  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_open_task): Set the 
-	USER_ORG flag while converting a personal task to assigned one.
-
-2005-09-28  Viren.L  <lviren@novell.com>
-
-	Fixes #317014
-	* gui/e-calendar-table.c (e_calendar_table_open_task):
-	Set the flags in e_calendar_table_open_task.
-	* gui/gnome-cal.c (gnome_calendar_new_task):set the NEW_ITEM flag.
-	* gui/tasks-component.c (create_new_todo),
-	* gui/e-tasks.c (e_tasks_new_task): set NEW_ITEM & USER_ORG flag.
-	* gui/comp-editor-factory.c (edit_existing):check itip_organizer_is_user
-	  for tasks as well. 
-	* gui/dialogs/comp-editor.h: Added COMP_EDITOR_IS_ASSIGNED to CompEditorFlags.
-	* gui/dialogs/comp-editor-page.h: Added COMP_EDITOR_PAGE_IS_ASSIGNED to page flags.
-	* gui/dialogs/task-editor.[ch]: Changed parameters for task_editor_new and
-	  task_editor_construct.
-
-2005-09-28  Tor Lillqvist  <tml@novell.com>
-
-	* gui/e-cal-model-calendar.c (set_transparency)
-	* gui/e-cal-model.c (set_classification)
-	* gui/itip-bonobo-control.c (pstream_load, pstream_save): Use
-	g_ascii_strcasecmp() instead of strcasecmp(). We are comparing to
-	literal ASCII strings, just casefolding ASCII is enough. Also
-	better for portability.
-
-2005-09-08  P. S. Chakravarthi <pchakravarthi@novell.com>
-
-	Fix #261625
-	* gui/alarm-notify/alarm.c
-	(queue_alarm): add the alarm in the queue only when the 
-	the alarm trigger time is after the current time.
-
-2005-09-01  Dinesh Layek  <ldinesh@novell.com>
-
-	Fixes #314922, 311694, 314918
-	* calendar-component.c (create_new_event): Set the USER_ORG and MEETING flag properly.
-
-2005-08-24  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #313705
-	* gui/alarm-notify/Makefile.am: Added CAMEL_LIBS.
-	* gui/alarm-notify/notify-main.c: (main): Initialize
-	the camel object.
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-cal-config.h: source-type is an enum not a pointer!
-
-	* gui/tasks-component.c (selector_tree_drag_data_received):
-	constify uid.
-
-	* gui/itip-utils.c (comp_sentby): use the right list type for
-	attendees.
-
-	* gui/gnome-cal.c (config_categories_changed_cb): fix cast.
-	(setup_widgets): fix casts.
-
-	* gui/e-tasks.c: add missing e-categories.h include.
-	(config_categories_changed_cb): fix cast.
-
-	* gui/e-week-view.c (e_week_view_realize): remove unused.
-
-	* gui/e-select-names-editable.c
-	(e_select_names_editable_get_emails): remve unused.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
-	remove/comment unused.
-
-	* gui/e-meeting-store.c (freebusy_async): g* strikes again, use
-	the right lock/unlock function for the g-spastic-mutex.
-	(process_callbacks_main_thread): fix signature to match usage.
-	(refresh_queue_add): cast off warning
-
-	* gui/e-itip-control.c (cleanup_ecal): fix signature to match use
-
-	* gui/e-day-view.c (process_component): remove unused vars.
-	(e_day_view_realize): more.
-	(e_day_view_on_event_double_click): cast
-	(e_day_view_update_calendar_selection_time): define out unused
-
-	* gui/e-calendar-table.c (e_calendar_table_init): more a11y
-	related casts.
-
-	* gui/e-calendar-view.c (on_edit_appointment): proper boolean
-	conversion of a pointer.
-	(transfer_selected_items): cast
-	(on_unrecur_appointment): remove unused prop
-	(e_calendar_view_open_event): proper boolean conversion of pointer.
-
-	* gui/e-cal-popup.c (needs_to_accept): remove unused.
-
-	* gui/e-cal-model.c (set_instance_times): remove unused.
-	:include missing calendar-config.
-
-	* gui/dialogs/meeting-page.c (clear_widgets): yawn, another
-	gtklabel wawrning.
-	(meeting_page_fill_component): constify attendees.
-
-	* gui/dialogs/e-send-options-utils.c: remove unused global sod,
-	add missing string.h
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	remove unused.
-
-	* gui/dialogs/comp-editor.c (response_cb): wtf, this can't use
-	em_utils!!!  #if 0 it out and add a build warning.
-	(cab_popup_position): pointer cast.
-	(set_attachment_list): remove unused.
-
-	* gui/dialogs/calendar-setup.c (eccp_general_offline): change very
-	incorrect N_ macro to _.
-	(CalendarSourceDialog): Umm, source_type is an enum, not a
-	pointer.
-	(eccp_get_source_color): remove unused.
-
-2005-08-19  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/comp-editor.h: Remove unwanted include of
-	header that also borks the build.
-
-2005-08-02  Viren.l  <lviren@novell.com>
-
-	* gui/dialogs/meeting-page.c:(meeting_page_fill_widgets):
-	  Removed sensitizing of Add, Remove & Invite buttons.
-	  Assigned user_org using CompEditorPageFlags.
-	* gui/dialogs/recurrence-page.c: (sensitize_button):
-	  Added a check for COMP_EDITOR_PAGE_MEETING.    	
-	* gui/dialogs/event-page.c: (sensitize_widgets):
-	  Added sensitize boolean variable to store the && operation of
-	  user_org,!read_only.	  
-	* gui/dialogs/event-editor.c: (show_meeting):
-	  If user is not organizer dont allow the widget to receive 
-	  notification of drags.
-	* gui/e-cal-popup.[ch]: (e_cal_popup_target_new_attachments):
-	  Added a flag E_CAL_POPUP_ATTACHMENTS_MODIFY and set it in the
-	  e_cal_popup_target_new_attachments function.
-	* gui/dialogs/comp-editor.c: Added visibility mask 
-	  to Remove and Add attachments popup menus.
-	  Removed function comp_editor_sensitize_attachment_bar which
-	  is no longer required.
-	* gui/dialogs/task-editor.c: (task_editor_construct):
-	  Removed call made to comp_editor_sensitize_attachment_bar.		
-2005-08-16  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #312668.
-
-	* gui/calendar-offline-handler.[ch]: removed.  Not even used
-	anyway, god knows how it works.
-
-2005-08-17  Carsten Guenther <carsten.guenther@scalix.com>
-
-	Fixes http://bugzilla.gnome.org/show_bug.cgi?id=313555
-	* gui/dialogs/comp-editor.c:
-	(get_attachment_list): Only save attachment to file
-	if file does not exist yet.
-
-2005-08-17  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #311904
-	* gui/dialogs/task-details-page.c:
-	(task_details_page_fill_component): Check if the date is
-	set before comparing it with current day for validation.
-
-2005-08-12  Viren.L  <lviren@novell.com>
-
-	Fixes #312739
-	* gui/e-day-view.c: (e_day_view_on_event_double_click):
-	Removed the checks for event_num, editing_event_day and ical_component_get_current_property. 
-
-2005-08-12  Viren.L  <lviren@novell.com>
-
-	Fixes #310338
-	* gui/alarm-notify-dialog.c:(notified_alarms_dialog_new),
-	(edit_pressed_cb),(snooze_pressed_cb),(dialog_response_cb):	
-	Get the widget and connected "pressed" signal.
-	Removed AN_ALARM_EDIT and AN_ALARM_SNOOZE enums.
-	Removed check of these enums in dialog_response_cb and
-	moved the code to it's associated call backs.
-	* gui/alarm-notify/alarm-notify.glade:
-	Changed the button name to button-edit and button-snooze.
-	* gui/comp-editor-factory.c: (edit_existing):
-	Added CompEditorFlags and used to invoke event_editor_new.		
-
-2005-08-11  Carsten Guenther <carsten.guenther@scalix.com>
-
-	* gui/dialogs/comp-editor.c: (get_attachment_list),
-	(attachment_bar_icon_clicked_cb): Use g_build_path
-	instead of g_strconcat to build the pathname to the
-	attachment file.
-	(set_attachment_list): Fixed how mime filename gets
-	extracted from attachments pathname.
-
-2005-08-10  Tor Lillqvist  <tml@novell.com>
-
-	* importers/Makefile.am: Use privsolib instead of privlib (they
-	are the same on Unix, on Win32 privsolibdir is libdir). Use
-	NO_UNDEFINED.
-
-2005-08-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/comp-editor.c: (get_attachment_list),
-	(set_attachment_list), (comp_editor_get_mime_attach_list):
-	Removed the warnings.
-
-2005-08-10  Dinesh Layek  < LDinesh@novell.com >
-
-        Fixes #310438
-	* gui/e-tasks.c:
-        (table_drag_data_delete): removing e_cal_object only when the 
-	success flag is true
-        * gui/tasks-component.c:
-	(selector_tree_drag_data_received): made the success flag FALSE 
-	when the data is already present in the destination calendar, 
-	and TRUE otherwise.
-
-2005-08-05  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-cal-component-preview.c: (write_html): Using format
-	specifier with gtk_html_stream_printf ().
-	* gui/e-calendar-table.c: (e_calendar_table_on_save_as):
-	* gui/e-calendar-view.c: (on_save_as): Using format
-	specifier for fprintf.
-	Vulnerability patch submitted by 
-	"Sitic Vulnerability Advisory <sitic@pts.se>"
-
-2005-08-05  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #311686
-	* gui/e-meeting-list-view.c (row_activated_cb):Added
-	a null check for path.
-
-2005-08-05  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #312460
-	* gui/itip-utils.c (itip_get_comp_attendee): Removed
-	a double free.
-
-
-2005-08-04  Viren.l <lviren@novell.com>
-
-	Fixes #302460
-	* gui/e-day-view.c (e_day_view_on_event_double_click):
-	  use icalcomponent_get_current_property and invoke 
-	  e_calendar_view_edit_appointment with appropriate 
-	  parameters.	  
-
-2005-08-03  Harry Lu  <harry.lu@sun.com>
-
-	Fix for #312447.
-
-	* gui/gnome-cal.c: (notify_selected_time_changed): new function
-	to emit "selected_time_changed" signal for all views.
-	(gnome_calendar_goto_date): call notify_selected_time_changed
-	after date changing.
-
-2005-08-03  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #309601
-	* gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received):
-	 (e_day_view_on_main_canvas_drag_data_received):
-	 (e_day_view_finish_long_event_resize):
-	 (e_day_view_finish_resize):
-	 (e_day_view_change_event_time): Allow modification of the item only 
-	 for organizer.	
-	 * gui/itip-utils.c (itip_organizer_is_user): added the check for the 
-	 static capability "no-organizer".
-	
-	 commiting for viren.l <lviren@novell.com>	
-	 
-2005-08-03  P. S. Chakravarthi	<pchakravarthi@novell.com>
-
-	Fixes #306017
-	* gui/e-calendar-view.c: (e_calendar_view_delete_selected_occurrence):
-	Obtain the default zone information from cal-view and eventually use it to 
-	determine the correct rid for an all-day event.
-
-2005-08-01  Shakti Sen <shprasad@novell.com>
-
-	* gui/tasks-control.c (tasks_control_sensitize_commands): Added support
-	for the Target selection for 'Tasks'.
-	* gui/e-calendar-table.c (e_calendar_table_open_selected): Resolved
-	one undefined symbol.
-	* gui/e-tasks.c: Renamed the function name from 'e_tasks_get_tasks_menu'
-	to 'e_tasks_get_tasks_menu'
-	* gui/e-tasks.h: Added the declaration for 'e_tasks_get_tasks_menu'.
-	Thus fixes few warning messages.
-	* gui/e-cal-menu.c (e_cal_menu_target_new_select): Set the mask for
-	E_CAL_MENU_SELECT_ASSIGNABLE.
-
-	Fixes bug #231968
-
-2005-07-29  Chenthill Palanisamy  <pchenthill@novell.com>
-
-
-	* gui/e-day-view.c: (e_day_view_update_event_label),
-	(e_day_view_update_long_event_label):
-	* gui/e-week-view.c: (e_week_view_reshape_event_span):
-	Commenting the code for marking the summary of unaccepted
-	meetings as bold, since pango crashes for some meetings.
-
-2005-07-27  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* gui/e-cal-model-calendar.c:
-	Add reserved field for an empty structure.
-	* gui/e-cal-model-tasks.c:
-	Add reserved field for an empty structure.
-
-	Fixes #310198
-
-2005-07-25  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-cal-popup.c: 
-	(e_cal_popup_target_new_select): send the comp_data->client
-	to itip_get_comp_attendee.
-
-2005-07-25  Viren.l  <lviren@novel.com>
-
-	Fixes:248126
-	* gui/tasks-control.c (tasks_control_assign_cmd)
-	(tasks_control_forward_cmd): Added 2 Bonobo UI verbs for Assign Task and Forward as iCalendar
-        and the definitions to commands.
-        * gui/e-calendar-table.[ch] (e_calendar_table_open_task)
-        (e_calendar_table_get_selected_comp): renamed static functions open_task and get_selected_comp
-        and made them public.
-
-2005-07-23  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-cal-popup.[ch]: (needs_to_accept),
-	(e_cal_popup_target_new_select): Added a mask 
-	to check if the meeting needs to be accepted.
-	* gui/e-calendar-view.c: Increased the index of the 
-	labels.
-	* gui/e-day-view.c: (set_text_as_bold):
-	* gui/e-week-view.c: (set_text_as_bold): Show as bold
-	even if the attendee property is not found, since it might
-	be a mailing list. The attendee will be added once he accepts 
-	meeting.
-
-2005-07-22  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #309991
-	* gui/e-cal-model.c: (ensure_dates_are_in_default_zone),
-	(e_cal_view_objects_added_cb): 
-	* gui/gnome-cal.c: (ensure_dates_are_in_default_zone),
-	(dn_e_cal_view_objects_added_cb): If the start date and end
-	date are in UTC convert them to default zone while displaying.
-
-2005-07-21  Shakti Sen  <shprasad@novell.com>
-
-	* gui/e-tasks.c (e_tasks_init): Creating the tasks-menu.
-	* gui/tasks-control.c (tasks_control_activate,
-	tasks_control_deactivate): Activated/deactivated the menu.
-	In brief, added support for 'Tasks' menu creation.
-
-	Fixes bug #310985.
-
-2005-07-21  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #309602
-	* gui/e-day-view.c: (set_text_as_bold),
-	(e_day_view_update_event_label),
-	(e_day_view_update_long_event_label),
-	(e_day_view_ensure_rows_visible):
-	* gui/e-week-view.c: (set_text_as_bold),
-	(e_week_view_update_event_cb): Check if the backend
-	allows to adding the unaccepted appointments to calendar
-	and show its summary as bold text.
-	
-2005-07-21  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/gnome-cal.c (gnome_calendar_class_init),
-	(adjust_e_cal_view_sexp), (display_view),
-	(gnome_calendar_change_view):
-	* gui/gnome-cal.h:
-	Fixes #245331. Keybindings for switching b/w
-	calendar views.
-
-2005-07-20  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #310340
-	* gui/e-calendar-view.c:
-	(e_calendar_view_delete_selected_occurrence): Check if the 
-	backend supports having master object for recurrences and set
-	the recurrence id accordingly.
-
-2005-07-20  Srinivasa Ragavan <sragavan@novell.com>
-	
-	* gui/dialogs/comp-editor.c: (get_attachment_list) (comp_editor_get_mime_attach_list)
-	made it use e_attachment_bar_get_parts instead of the old api
-
-2005-07-20  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #309680
-	* gui/e-calendar-view.c (on_unrecur_appointment): Remove 
-	the recurrence id only from e_cal_comp.
-
-2005-07-08  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/alarm-notify/alarm-notify.c: (alarm_notify_add_calendar):
-	Free the uri to the source in a few cases. 
-	* gui/calendar-config.c: (calendar_config_get_icaltimezone):
-	Free the timezone location.
-
-2005-07-12  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-meeting-list-view.c: 
-	(process_section): Expand the mailing list into list of email
-	ids if the server has not expanded them while autocompletion.
-
-2005-07-12  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/dialogs/comp-editor.c: (get_attachment_list) (attachment_guess_mime_type)
-	(comp_editor_close) (comp_editor_get_mime_attach_list): Fixed some compiler 
-	warning and checked some negative cases
-	
-2005-07-11  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/dialogs/comp-editor.c:(get_attachment_list) (attachment_bar_changed_cb)
-	(attachment_bar_icon_clicked_cb) (cab_popups_free) (setup_widgets)
-	(set_attachment_list) (comp_editor_get_mime_attach_list)
-	Fixed huge memory leak, and come compile warnings. Also fixed
-	a crash, when double click on attachments.
-	
-2005-07-11  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/itip-utils.[ch]: Added a structure.
-	* gui/dialogs/Makefile.am: Removed cal-attachment*
-	* gui/dialogs/comp-editor.[ch]: (attach_message) (drop_action)
-	(send_timezone) (save_comp) (response_cb) (delete_event_cb) 
-	(attachment_bar_changed_cb) (attachment_bar_icon_clicked_cb)
-	(setup_widgets) (set_icon_from_comp) (fill_widgets) (real_edit_comp)
-	Removed the attachment bar specific to calendar and made a merged
-	one at widgets/misc/e-attachment*
-
-2005-07-11  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* conduits/calendar/calendar-conduit.c: (process_multi_day),
-	(delete_record):
-	* gui/dialogs/comp-editor.c: (save_comp), (delete_comp):
-	* gui/e-calendar-view.c: (e_calendar_view_cut_clipboard),
-	(delete_event), (transfer_item_to):
-	* gui/e-itip-control.c: (remove_item):
-	* gui/gnome-cal.c: (gnome_calendar_purge):
-	* gui/dialogs/meeting-page.c: (meeting_page_construct): Use 
-	e_cal_remove_with_mod for removing recurring apppointment and call
-       	e_cal_remove_object for non-recurring ones.
-	* gui/itip-utils.c: (itip_organizer_is_user),
-	(itip_get_comp_attendee): Fixed some memory leaks.
-
-2005-07-07  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	* gui/calendar-component.c: (impl_handleURI): Added support for
-	opening a calendar-item in the editor when its source-UID and UID/RID
-	is passed in the command-line.
-	* gui/gnome-cal.[c,h]: (gnome_calendar_edit_appointment): Newly added
-	for the above functionality.
-	
-2005-07-06  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/event-page.c: (sensitize_widgets): Enable alarms
-	even if we are not organizer.
-
-2005-07-06  Sankar P  <psankar@novell.com>
-
-	* gui/dialogs/comp-editor.c (response_cb):
-	Changed the way in which calendars having null summary are handled.
-	Fixes #237844
-	
-	* calendar-errors.xml:
-	Changed the button label from Send to Save
-
-2005-07-05  Srinivasa Ragavan <sragavan@novell.com>
-	
-	* gui/e-cal-popup.c: Created new target type
-	* gui/e-cal-popup.h: Added #define for the new target type
-	* gui/dialogs/cal-attachment-bar.c: (cab_popup) Poped e-cal instead of 
-	em_*. Removed mailer code from calendar
-	* gui/dialogs/comp-editor.c: (drag_data_received) Poped e-cal instead of
-	em_*. Removed mailer code from calendar.
-
-2005-07-04  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/calendar-component.c: (create_new_event): Set
-	the new item flag.
-	* gui/dialogs/event-editor.c: (event_editor_construct): 
-	Check the new item flag and create the scheduling page.
-
-2005-07-04  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/dialogs/meeting-page.c: (meeting_page_construct) Added 
-	vertical scrollbar policy of list view to always so that it does
-	not extend the view when there are more contacts.
-
-2005-07-02  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-meeting-list-view.c: (process_section):
-	* gui/e-select-names-editable.c:
-	(e_select_names_editable_get_emails): If the contact list
-	does not have all the mail ids, use the name of the contact
-	list as the email id.
-
-2005-07-01  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-cal-model.c: (e_cal_model_class_init),
-	(e_cal_view_progress_cb), (e_cal_view_done_cb):
-	* gui/e-cal-model.h: Added two new signals to notify
-	the progress information from the model to UI.
-	* gui/e-calendar-marshal.list: Added a new item to marshal
-	the string,int,int arguments.
-	* gui/e-calendar-table.h:
-	* gui/e-calendar-table.c: (delete_selected_components),
-	(clipboard_get_text_cb), (e_calendar_table_set_status_message):
-	* gui/e-calendar-view.h:
-	* gui/e-calendar-view.c: (e_calendar_view_set_status_message),
-	(e_calendar_view_cut_clipboard), (clipboard_get_text_cb),
-	(transfer_selected_items):
-	* gui/e-tasks.c: (view_progress_cb), (view_done_cb),
-	(setup_widgets), (set_status_message), (backend_died_cb):
-	* gui/gnome-cal.c: (update_query), (view_progress_cb),
-	(view_done_cb), (setup_widgets), (client_cal_opened_cb),
-	(default_client_cal_opened_cb), (open_ecal), (backend_died_cb),
-	(gnome_calendar_purge): Added a new variable to 
-	e_calendar_view_set_status_message and
-       	e_calendar_table_set_status_message methods to show the progress
-	information.
-
-2005-06-27  Mark G. Adams <mark.g.adams@sympatico.ca>
-
-	* conduits/todo/todo-conduit.c: (add_record): Fix leak of uids
-	* conduits/calendar/calendar-conduit.c: (process_multi_day): Fix leak of uids
-
-2005-07-01  Praveen Kumar <kpraveen@novell.com>
-
-	* gui/e-cal-config.h : Added the source type field in
-	_ECalConfigTargetSource
-	* gui/dialogs/calendar-setup.c (calendar_setup_edit_calendar) : Set
-	the source type as calendar
-	(calendar_setup_edit_task_list) : Set the source type as tasks.
-
-2005-06-25  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	* gui/dialogs/event-editor.c
-       	(event_editor_construct): Do not desensitize the attachment
-	bar as there will be no way to open an attachement.
-
-2005-07-06  Not Zed  <NotZed@Ximian.com>
-
-	* importers/icalendar-importer.c (ivcal_getwidget): fix a missing
-	init on sd.
-	(ivcal_getwidget): pack the notebook with fill on.
-
-	* importers/Makefile.am: remove -module flags.
-
-	* Makefile.am: build importers before the gui.
-
-	* gui/main.c (initialize): register the inbuild calendar importers.
-
-	* importers/icalendar-importer.c: Converted to eplugin, cleaned up
-	some stuff as well.  Put the selectors in scrolledwindows so they
-	dont grow unbounded.
-	(gnome_calendar_getwidget): set the default actions based on
-	wether we've run or not.
-	(update_single_object): removed dead code?
-
-2005-07-05  Not Zed  <NotZed@Ximian.com>
-
-	* importers/icalendar-importer.c: start work on e-plugin importer.
-
-2005-06-27  Tor Lillqvist  <tml@novell.com>
-
-	* */Makefile.am: Prune unnecessary and nonexistent directories
-	from the -I options. Prune pathname macros not used in the sources
-	in that directory from the -D options. Use NO_UNDEFINED. Link with
-	all necessary libraries. On Win32 link with bootstrap libraries
-	where necessary.
-
-	* common/Makefile.am: As this is a noinst library, no use for
-	LDFLAGS or LIBADD.
-
-	* gui/Makefile.am: Use Win32-specific hack to work around MSYS
-	feature in the gconftool invokation.
-
-	* gui/calendar-commands.c: Remove superfluous inclusion of <pwd.h>.
-
-	* gui/e-cal-list-view.c
-	* gui/e-day-view.c: Remove superfluous inclusion of <gdk/gdkx.h>.
-
-	* gui/gnome-cal.c: Remove superfluous inclusion of <sys/wait.h>.
-	
-	* importers/icalendar-importer.c: Use g_usleep() instead of sleep().
-
-2005-06-25  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/comp-editor.c: 
-	(real_send_comp): check save schedules before sending
-	the comp through send_comp.
-
-2005-06-23  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/event-page.c: (sensitize_widgets): 
-	desensitize the source selector if a meeting is
-	delegated.
-
-2005-06-22  viren.l <viren@novell.com>
-
-	Fixes #305590 
-	* gui/e-meeting-store.c: (freebusy_async):
-	Lock the mutex before invoking e_cal_get_free_busy(),
-	unlock the mutex after the function call.
- 
-2005-06-22  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/comp-editor.c: (real_edit_comp): Do
-	not sensitize the attachment bar here.
-	* gui/dialogs/event-editor.c (event_editor_construct):
-	 Do not construct the scheduling page for non organizer
-	 and sensitize the attachment bar.
-	* gui/dialogs/event-page.c: (event_page_fill_widgets): Need
-	not call the e_cal_get_object to find if the event is existing
-	one or not.
-	* gui/e-calendar-view.c: (e_calendar_view_new_appointment_for),
-	(e_calendar_view_edit_appointment): Set the user org flags
-	here itslef.
-
-2005-06-22  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/comp-editor.c 
-	(save_comp): Commit the sequence all the fields event if 
-	the delegator is delegating a paticular instance.
-	(prompt_to_save_changes): Send FALSE to recur_comp_dialog 
-	for last argument.
-	(response_cb): Send the delegate as true if the 
-	event is being delegated.
-       	(delete_event_cb),(set_attendees_for_delegation): removed the warning.
-	* gui/dialogs/event-page.c: (sensitize_widgets),
-	(event_page_fill_widgets): Do not sensitize the send options 
-	button if the item is being delegated.
-	* gui/dialogs/recur-comp.c: (recur_component_dialog):
-	* gui/dialogs/recur-comp.h: Added a new boolean argument
-	to recurrence dialog to indicate the item is delegated.
-	* gui/e-cal-model-calendar.c: (ecmc_set_value_at):
-	* gui/e-day-view.c: (e_day_view_finish_long_event_resize),
-	(e_day_view_finish_resize), (e_day_view_change_event_time),
-	(e_day_view_on_editing_stopped),
-	(e_day_view_on_top_canvas_drag_data_received),
-	(e_day_view_on_main_canvas_drag_data_received):
-	* gui/e-week-view.c: (e_week_view_change_event_time),
-	(e_week_view_on_editing_stopped): Send FALSE to delegate
-	if the delegate in the call recur_component_dialog.
-
-2005-06-20  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/comp-editor.c (save_comp_with_send),
-	(real_edit_comp), (set_attendees_for_delegation), (real_send_comp):
-	If a meeting is delegated. Send a Request to the delegate and a
-	reply to the organizer.
-	* gui/dialogs/event-editor.c: (event_editor_edit_comp): Add the 
-	delegator alone in the meeting editor for personal calendar.
-	(event_editor_send_comp), (show_meeting): Show the scheduling
-	page if the meeting is being delegated. 
-	* gui/dialogs/meeting-page.c: (clear_widgets),
-	(meeting_page_fill_widgets), (meeting_page_fill_component),
-	(add_clicked_cb), (remove_attendee), (remove_clicked_cb),
-	(init_widgets), (attendee_added_cb), (meeting_page_construct):
-	Do not allow only non-attendees to be added as delegatees.
-	While sending the delegated item remove the other attendees.
-	Allow only one delegate to be added for personal calendar.
-	* gui/e-cal-popup.c: (get_attendee_prop), (is_delegated)
-	(e_cal_popup_target_new_select):Disabled
-	the popup menu item if the meeting is already delegated.
-	* gui/e-cal-popup.h: Added a new mask to check if the meeting
-	is already delegated.
-	* gui/e-calendar-view.c: (set_attendee_status_for_delegate),
-	(on_delegate): Change the status of the attendee to delegated.
-	Set the new mask for the delegate popup menu item.
-	* gui/e-meeting-list-view.c: (e_meeting_list_view_class_init),
-	(attendee_edited_cb): Added a new signal to identify the attendee
-	added in meeting page. Do not remove the attendee if the user
-	modifies the existing email id to NULL value.
-	* gui/e-meeting-list-view.h: Added the notification signal.
-	* gui/itip-utils.h: Added a new function to get our email id
-	from the list of attendees.
-	* gui/itip-utils.c (get_attendee), (itip_get_comp_attendee),
-	(comp_from), (comp_to_list), (comp_subject), (comp_sentby),
-	(itip_send_comp):  Send udpates to delegator only
-        if the rsvp is enabled. Set the status of the attendee
-	properly in the REPLY method, since there will two attendees
- 	unlike the updating attendee status.	
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in
-	* importers/GNOME_Evolution_Calendar_Importer.server.in.in: Use SOEXT.
-
-2005-06-13  Jedy Wang  <jedy.wang@sun.com>
-
-	We need compare backend for long events too.
-
-	* gui/e-day-view.c: (e_day_view_find_event_from_uid):
-
-2005-06-08 viren.l <viren@novell.com>
-
-	 * gui/dialogs/event-editor.c (event_editor_edit_comp): set COMP_EDITOR_PAGE_USER_ORG
-	   flag. sensitizing attachment bar if user is organizer.
-	 * gui/dialogs/event-page.c, gui/dialogs/recurrencepage.c, 
-	   gui/dialogs/meeting-page.c 
-	   (fill_widgets)
-	   (sensitize_widget) 
-	   (sensitize_button): 
-	   sensitizing widgets if user is not an organizer.Boolean check 
-	   for user_org is achieved by using the flags in CompEditorPage structure.
-	   check that variable while sensitizing widgets.Remove the scheduling page 
-	   if user is not organizer.Retrive values based on a key using hash table. 
-	   Added a call back for row_activation. Enabling and disabling the 
-	   "editing" property of the renderers based E_MEETING_STORE_EDIT_STATUS.
-	   Also check whether user is creating new meeting or openning an existing 
-	   meeting and hence disable widgets appropriate.
-	 * gui/e-meeting-list-view.c (build_table, edit_col_for_user, 
-	   edit_col_for_organizer, row_activation_cb): store renderers in hash table
-	   using direct hashing since we can to enable/disable only column-wise since 
-	   tree view is used here.
-		
-2005-06-07  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/calendar-component.c: (create_new_event):
-	call the event_editor_new with comp editor flags.
-	* gui/dialogs/comp-editor-page.h:
-	* gui/dialogs/comp-editor.c: (comp_editor_set_flags), 
-	(comp_editor_get_flags), (comp_editor_append_page):
-	* gui/dialogs/comp-editor.h: Set the comp editor
-	flags, to indicate whether the item is a meeting, appointment,
-	a new event, or a delegated item etc.
-	* gui/dialogs/event-editor.c: (event_editor_construct),
-	(event_editor_edit_comp): Do not show the existing attendees
-	while delegating.
-	(event_editor_new): Replaced the meeting variable  with 
-	the comp editor flags
-       	(show_meeting): Show the delegate page while delegating a
-	meeting.
-	* gui/dialogs/event-editor.h: Modified the event_editor_new
-	function.
-	* gui/dialogs/meeting-page.c: 
-	(set_attendees):
-	(meeting_page_finalize),(clear_widgets),
-	(sensitize_widgets),(meeting_page_fill_widgets), 
-	(meeting_page_fill_component), (get_widgets), 
-	(add_clicked_cb), (meeting_page_construct): Set the label
-	for the meeting page to Delegatee. Changed the organizer label
-	to From since groupwise does have a concept of organizer.
-       	Enabled Add, remove buttons for delegation. Added the delegte's
-	to the exiting attendee list while filling the component. Added
-	a boolean variable to the private structure to store the user's
-	address. Modified the label for meeting page as Attendees. If 
-	the meeting is delegated, then to delegatees.
-	* gui/dialogs/meeting-page.glade: Added a reference to organizer
-	widget as org-label.
-	* gui/e-cal-popup.c: (e_cal_popup_target_new_select):
-	* gui/e-cal-popup.h: Added new masks for supporring delegation.
-	* gui/e-calendar-view.c: (set_attendee_status_for_delegate),
-	(on_delegate), (e_calendar_view_new_appointment_for),
-	(open_event_with_flags), (e_calendar_view_edit_appointment):
-	Call the event editor with comp editor flags. Set the users
-	partstat to delegated.
-
-2005-05-30  Thouis R. Jones  <thouis@csail.mit.edu>
-
-	Fixes #272301
-
-	* gui/apps_evolution_calendar.schemas.in.in: 
-	* gui/calendar-config-keys.h:
-	* gui/calendar-config.c: (calendar_config_get_marcus_bains,
-	calendar_config_add_notification_marcus_bains): 
-	* gui/calendar-config.h:
-	* gui/e-day-view-config.c: (set_marcus_bains,
-	marcus_bains_changed_cb, e_day_view_config_set_view): 
-	* gui/e-day-view-main-item.c: (e_day_view_main_item_draw):
-	* gui/e-day-view-time-item.c: (e_day_view_time_item_draw):
-	* gui/e-day-view.c: (e_day_view_init, e_day_view_set_colors,
-	e_day_view_get_show_marcus_bains, e_day_view_set_marcus_bains,
-	e_day_view_update_marcus_bains):
-	* gui/e-day-view.h:
-	* gui/gnome-cal.c: (update_marcus_bains_line_cb, setup_widgets,
-	gnome_calendar_destroy):  Added Marcus Bains Line to main item
-	view and time bar.
-	
-2005-05-30  Harry Lu  <harry.lu@sun.com>
-
-	* gui/itip-utils.c: (itip_send_comp): check whether backend could 
-	handle sending resuests/updates, and if so, just return.
-
-2005-05-24  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #272114
-	* gui/dialogs/calendar-setup.c: (eccp_commit),
-	(calendar_setup_edit_calendar): Check if the color is 
-	present in the source before setting it.
-
-2005-05-24  Srinivasa Ragavan <sragavan@novell.com>
-	* gui/dialogs/cal-attachment-bar.c, gui/dialogs/cal-attachment-bar.h,
-	  gui/dialogs/cal-attachment.c, gui/dialogs/cal-attachment.h, 
-	  gui/dialogs/comp-editor.c, calendar.error.xml: Added the support to DnD
-	  remote URL to the attachment window. It downloads asynchronously and
-	  attaches.
-
-2005-05-16  Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/dialogs/comp-editor.c (attachment_bar_changed_cb) 
-	  (attachment_bar_icon_clicked_cb)   (setup_widgets) 
-	  (comp_editor_sensitize_attachment_bar) (fill_widgets): 
-	  Removed the expander in calendar attachment. It keeps showing
-	  now, to ease DnD.
-	  
-2005-05-16  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/gnome-cal.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb): Removed the debug 
-	messages.
-
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* moved e-error to e-util/
-
-2005-05-16: Srinivasa Ragavan <sragavan@novell.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Added tooltips
-
-2005-05-13  Sushma Rai  <rsushma@novell.com>
-
-	* gui/dialogs/recurrence-page.c (make_ending_until_special): Setting
-	two weeks after the start date as default "until" date. 
-	Fixes #268906
-
-2005-05-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	on behalf of jack jia <jack.jia@sun.com>
-	fixes #229794
-
-	* gui/dialogs/recurrence-page.c: (make_weekly_special):
-	Allow deselection of the current day while scheduling
-	recurrences based on weeek days.
-
-2005-05-12  Sushma Rai  <rsushma@novell.com>
-
-	* gui/e-cal-model-tasks.c (get_geo): Not marking geographical locations
-	for translation.
-	Fixes #261080
- 
-2005-05-12 Vivek Jain <jvivek@novell.com>
-
-	Fixes #271523
-
-	* gui/dialogs/calendar-setup.c:
-	(CalendarSourceDialog):	included an ECalSourceType member in
-	the structure 
-	(calendar_setup_edit_calendar): set source_type as EVENT
-	(calendar_setup_edit_task_list): set source_type as TODO
-	(eccp_general_offline): Change the label according to the type
-
-2005-05-12  Srinivasa Ragavan <sragavan@novell.com>
-	* gui/task-component.c (selector_tree_drag_motion): Fixes the bug 269416
-	It makes the DnD to move tasks instead copying.
-
-
-2005-05-09  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #301350
-
-	* gui/alarm-notify/alarm-queue.c (alarm_queue_init): install a timeout
-	handler to check, every 30 minutes, for not losing the midnight refresh.
-	(check_midnight_refresh): check the midnight refresh and if we missed it,
-	reload alarms.
-	(queue_midnight_refresh): made the midnight value be global.
-
-2005-05-09  Philip Van Hoof <pvanhoof@gnome.org>
-
-	* gui/alarm-notify/*: Made the alarm-notify dialog
-	multi-alarm aware
-	
-2005-05-09  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/migration.c (migrate_ical_folder_to_source): cover the case when
-	there is no calendar.ics/tasks.ics file in the folder to migrate.
-	
-2005-05-06  Vivek Jain <jvivek@novell.com>
-	
-	**Fixes #261079
-	* gui/e-alarm-list.c:(get_alarm_string)
-	 Added translator comments.
-
-2005-05-06  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/apps_evolution_calendar.schemas.in.in: Fixing a 
-	grammar mistake.
-	See 301459
-
-2005-05-06  Changwoo Ryu  <cwryu@debian.org>
-
-	* gui/apps_evolution_calendar.schemas.in.in: added a missing
-	period in long description. and fixed an invalid tag.
-
-2005-05-06  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #272464
-	* calendar-errors.xml:
-	* calendar-errors.xml.h: Changed the primary and secondary
-	messages to make it more clear.
-
-2005-05-06  Vivek Jain <jvivek@novell.com>
-	
-	**Fixes #272566
-	* gui/dialogs/event-page.glade:
-	removed unwanted space in button label
-
-2005-05-06  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (e_cal_view_objects_added_cb): uncomment code that
-	shouldn't be.
-
-2005-05-06  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #271679
-
-	* gui/dialogs/comp-editor.c (save_comp):
-	* gui/e-week-view.c (e_week_view_on_editing_stopped,
-	e_week_view_change_event_time): set correct start/end times for
-	individual instances and remove all rules and exceptions.
-	(e_week_view_reshape_event_span): show recurrence icons for
-	detached instances also.
-
-	* gui/e-day-view.c (e_day_view_finish_resize,
-	e_day_view_finish_long_event_resize, e_day_view_on_editing_stopped,
-	e_day_view_on_top_canvas_drag_data_received,
-	e_day_view_on_main_canvas_drag_data_received,
-	e_day_view_change_event_time): set the correct start/end times when
-	modifying individual instances and remove all rules and exceptions.
-	(e_day_view_on_top_canvas_motion, e_day_view_on_main_canvas_motion):
-	disable D&D for recurring events.
-	(e_day_view_reshape_long_event, e_day_view_reshape_day_event):
-	check for detached instances and show recurrence icons for them also.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	check for detached instances and show recurrence icons for them also.
-
-	* gui/e-cal-model.c (set_instance_times): don't use the RECURRENCE-ID
-	to get the datetime.
-
-	* gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence):
-	exceptions need to be date only.
-	(e_calendar_view_copy_clipboard): remove RECURRENCE-IDs from components
-	we copy to the clipboard.
-	(e_calendar_view_cut_clipboard): when cutting instances, remove only
-	the selected instances.
-	(on_unrecur_appointment): use MOD_ALL to modify the master object and
-	remove recurrence-id from detached event.
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): re-enabled.
-
-2005-05-05  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/event-page.c:
-	* gui/dialogs/task-page.c: removed GAL's e-categories.h include.
-
-2005-05-01  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #274406
-	* gui/alarm-notify/alarm-notify.c: (cal_opened_cb): Removed the
-	additional unref present.
-
-2005-04-18  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #274476
-	* gui/e-calendar-view.c: (e_calendar_view_open_event): Send the
-	right value boolean variable meeting to e_calendar_view_edit_appointment
-	method.
-
-2005-04-08  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #70035
-
-	* importers/icalendar-importer.c (support_format_fn, load_file_fn):
-	use e_cal_util_parse_ics_string instead of icalparser_parse_string.
-
-2005-04-05  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-cal-model.c: (cal_opened_cb): If the status
-	is busy call open method again, do not remove the
-	client.
-	* gui/gnome-cal.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb): IF the status is busy
-	and the load_state is not loaded call open method.
-
-2005-04-04  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #68423
-
-	* gui/migration.c (migrate_ical):
-	* gui/e-tasks,c (e_tasks_expunge):
-	* gui/gnome-cal.c (gnome_calendar_purge): fixed huge (in some cases)
-	memory leaks.
-
-2005-04-01  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #41740
-
-	* gui/calendar-errors.xml:
-	* gui/calendar-errors.xml.h: added editor error.
-
-	* gui/alarm-notify/alarm-queue.c (edit_component): display error messages
-	when we can't load the component in the editor.
-
-	* gui/alarm-notify/Makefile.am: linked against libemiscwidgets.la.
-
-2005-04-01  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #73879
-	* gui/dialogs/comp-editor.[ch]:
-	(comp_editor_sensitize_attachment_bar): Added a function
-	to sensitize/desensitize the attachment bar.
-	(comp_editor_notify_client_changed): When client changes
-	sensitize the attachment bar.
-	* gui/dialogs/event-editor.c: (event_editor_construct): 
-	* gui/dialogs/task-editor.c: (task_editor_construct): Sensitize
-	the attachment bar.
-
-2005-03-31  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #73969
-	* gui/e-calendar-view.c: (delete_event): Remove the
-	recurrence id property if its present.
-
-2005-03-30  Li Yuan  <li.yuan@sun.com>
-
-	Fixes #73914
-
-	* gui/dialogs/cal-prefs-dialog.glade:
-	add a11y name to Publishing Table.
-
-2005-03-28  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #44719
-
-	* gui/alarm-queue.c (display_notification): make the alarm dialog sticky
-	when not using the system tray.
-
-2005-03-24  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #69272
- 	
- 	* gui/comp-util.c (cal_comp_event_new_with_defaults): ensure we
- 	always return a valid comp
- 
- 	* gui/comp-util.c (cal_comp_task_new_with_defaults): ditto; fix
- 	obvious pasto that would cause a leak
-	
-2005-03-24  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	Fixes #73320
-	* gui/e-meeting-list-view.c: (attendee_edited_cb): Check if
-	we are editing the same row and if so do not remove the attendee.
-
-2005-03-24  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	Fixes #73508
-	* gui/dialogs/meeting-page.c: (meeting_page_fill_widgets): Set the 
-	organizers status as NEEDS ACTION, checking for the static capability.
-
-2005-03-16  Li Yuan  <li.yuan@sun.com>
-
-	* gui/calendar-view.c: (calendar_view_class_init):
-	remove the edit function.
-
-	Fixes # 40762
-
-2005-03-22  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/calendar-component.c: (popup_event_cb): Popup all the 
-	menu items when clicked on the source. 
-
-2005-03-21  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #73031
-	* gui/dialogs/event-editor.c: (event_editor_finalize):
-	* gui/dialogs/task-editor.c: (task_editor_finalize): Added
-	a check for the presence of the object before unreffing it.
-
-2005-03-21  JP Rosevear  <jpr@novell.com> 
- 
- 	* gui/gnome-cal.c (default_client_cal_opened_cb): if its busy, try
- 	again
- 	(client_cal_opened_cb): ditto
-  
-2005-03-21  JP Rosevear  <jpr@novell.com> 
- 
- 	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received):
- 	abort sequence
- 	(e_day_view_on_top_canvas_motion): prevent drag of recurring events
- 	(e_day_view_on_main_canvas_motion): ditto
- 
- 	* gui/e-calendar-view.c (on_unrecur_appointment): clear recur id
-	
-2005-03-21  JP Rosevear  <jpr@novell.com>
-  
- 	* gui/tasks-component.c (ensure_sources): ensure the color and
- 	primary config are set on the personal source
- 
- 	* gui/calendar-component.c (ensure_sources): ditto
-	
-2005-03-21  Li Yuan  <li.yuan@sun.com>
-
-	* gui/print.c: (print_comp_item):
-	Fixes #44579
-
-2005-03-17  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #68525, 68580
-	* gui/gnome-cal.c (update_query), (gnome_calendar_init):
-	Added a boolean variable to avoid crash when a race condition
-	occurs.
-
-2005-03-16  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #73101
-
-	* calendar-errors.xml:
-	* calendar-errors.xml.h: removed unnecessary leading space.
-
-2005-03-16  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #72983
-
-	* gui/e-cal-list-view.c (e_cal_list_view_new): set EXPAND_RECURRENCES
-	flag on the model.
-
-2005-03-15  JP Rosevear  <jpr@novell.com>
-
-	* gui/itip-utils.c (itip_send_comp): when publishing, the to_list
-	will always be null so don't error out then
-
-2005-03-13  JP Rosevear  <jpr@novell.com>
-
-	Fixes #73563
-	
-	* gui/alarm-notify/alarm-queue.c (notify_dialog_cb): make sure in
-	the snooze case the tray (and via callbacks then) the dialog is
-	destroyed
-
-2005-03-14  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #72979
-	* gui/e-cal-list-view.c (find_meeting),
-	(e_cal_list_view_on_table_double_click): Check whether its a
-	meeting and send appropriate boolean variable.
-
-2005-03-11  Sushma Rai  <rsushma@novell.com>
-
-	* gui/dialogs/event-page.c (event_page_show_options): Removed the check
-	for general options page static capability. Send options dialog will
-	not be created at this point.
-	(e_sendoptions_clicked_cb): Checking for the general options page
-	static capability, when used clicks send options button.
-
-	* gui/dialogs/task-page.c (task_page_show_options)
-	(e_sendoptions_clicked_cb): Similar.
-	Fixes #73501
-
-2005-03-09  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	* gui/e-day-view.c (e_day_view_reshape_day_event): free the ecalcomponent
-	after using it.
-
-2005-03-08  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #73141
-	* gui/dialogs/comp-editor.c: 
-	(comp_editor_notify_client_changed):Assign the updated client
-	to priv->client and unref the old one.	
-
-2005-03-07  JP Rosevear  <jpr@novell.com>
-
-	* gui/alarm-notify/alarm-queue.c: add remove_client_alarms prototype
-	
-2005-03-06  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): disable dialog for
-	asking user which instance(s) to modify.
-
-2005-03-04  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #72835
-
-	* gui/alarm-notify/alarm-notify-dialog.[ch] (alarm_notify_dialog):
-	changed to return the dialog we create, and to run in the background.
-	(dialog_response_cb): response callback for the dialog.
-
-	* gui/alarm-notify/alarm-queue.c (alarm_queue_done): don't g_assert,
-	just check for midnight_refresh pointer, and clear it up if not NULL.
-	Also, traverse all clients with g_hash_table_foreach_remove.
-	(free_client_alarms_cb, alarm_queue_remove_client, load_alarms): added
-	missing cleanup code.
-	(queue_midnight_refresh): don't g_assert, just check for midnigh_refresh
-	pointer and clear it up if not NULL.
-	(open_alarm_dialog): store the dialog returned by alarm_notify_dialog().
-	(tray_icon_destroyed_cb): destroy the dialog if still around.
-
-2005-02-28  Harish Krishnaswamy  <kharish@novell.com>
-
-        Fixes #69556
-        * gui/dialogs/cal-attachment-bar.c:
-        (cal_attachment_bar_attach_mime_part): Add missing call to
-        attach_mime_part.
-
-2005-02-28  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #72928
-
-	* gui/alarm-notify/notify-main.c (main): don't call alarm_queue_done...
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_finalize): ...do it at
-	the same level than alarm_queue_init.
-
-2005-02-28  JP Rosevear  <jpr@novell.com>
-
-	* gui/gnome-cal.c (gnome_calendar_goto_today): revert fix for
-	70000, its a ui change
-
-2005-02-28  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/comp-editor.c: (attachment_bar_icon_clicked_cb),
-	(setup_widgets): Connect the signal to "event", and open the attachment
-	only if its a double click from the cal attachment bar.
-
-2005-02-28  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #72958
-	* gui/dialogs/comp-editor.c: (save_comp): If the backend
-	returns success, if the delay delivery is set, do not
-	show them in the view, since it will not be created in the 
-	server.
-	
-2005-02-25  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/calendar-component.c (ensure_sources) :
-	Make sure the base uri is same as the one
-	migration code uses. Avoids two "On This Computer"
-	groups when both migration and this code runs.
-	
-2005-02-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* common/authentication.c:
-	* gui/e-pub-utils.c:
-	* gui/alarm-notify/alarm-notify.c:
-	* gui/alarm-notify/notify-main.c:
-	* gui/dialogs/url-editor-dialog.c:
-	Include <libedataserverui/e-passwords.h>.
-	* gui/itip-utils.c: Remove e-passwords.h include, it's not
-	needed.
-
-2005-02-23  JP Rosevear  <jpr@novell.com>
-
-	Fixes #70000
-	
-	* gui/gnome-cal.c (gnome_calendar_goto_today): set the view type
-	to day view
-
-2005-02-23  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #72006	
-	* gui/dialogs/comp-editor.c: (real_edit_comp):
-	* gui/dialogs/event-editor.c: (show_meeting):
-	* gui/dialogs/task-editor.c: (show_assignment): Reset
-	the changed state, to suppress the promt_to_changes
-	dialog when the fields are not changed.
-
-2005-02-21  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #63866, #67714, #62089, #47747, #61495, #28947
- 	
- 	* gui/e-select-names-renderer.h: update signal
- 
- 	* gui/e-select-names-renderer.c
- 	(e_select_names_renderer_editing_done): emit the cancelled signal
- 	properly and don't update if it was cancelled
- 	(e_select_names_renderer_focus_out_event): if the cell loses focus
- 	the editing is done
- 	(e_select_names_renderer_start_editing): listen for focus out
- 	event, and only set the address if appropriate
- 	(e_select_names_renderer_get_property): handle name/email props
- 	(e_select_names_renderer_set_property): ditto
- 	(e_select_names_renderer_finalize): free name/email
- 	(e_select_names_renderer_class_init): install name/email props;
- 	cell_edited returns lists now
- 
- 	* gui/e-select-names-editable.h: update protos
- 
- 	* gui/e-select-names-editable.c: don't really override any of the
- 	gtkentry editable cell routines since we directly inherit from
- 	ENameSelectorEntry
- 	(e_select_names_editable_get_emails): get all the email addresses
- 	(e_select_names_editable_get_names): get all the names
- 	(e_select_names_editable_set_address): set the destination
- 	correctly for editing
- 
- 	* gui/e-meeting-list-view.c (attendee_edited_cb): handle a blank
- 	entry by removing it and don't allow an entry that already exists
- 	to be entered
- 	(attendee_editing_canceled_cb): if the item editing is cancelled
- 	and it has no name or email address, remove it
- 	(process_section): if the contact has multiple addresses (ie a
- 	mailing list), expand the entries
- 
- 	* gui/e-calendar-marshal.list: add new marshaller
-	
-2005-02-19  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/calendar-component.c (ensure_sources) :
-	Make sure all the default source groups and sources
-	are present by adding missing ones. Also update the
-	base uri of "On This Computer" group to take care 
-	of change in user home dir.
-	(calendar_component_init) : call ensure_sources 
-
-	* gui/tasks-component.c (ensure_sources)
-	(tasks_component_init) : ditto
-
-	Takes care of #67411 & #67724 for
-	calendar and tasks components. 
-
-
-2005-02-18  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/alarm-notify/alarm-notify.c (cal_opened_cb): if opening
-	the calendar failed, disconnect signals and unref it.
-
-2005-02-18  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* _EventPagePrivate: added a boolean variable is_meeting.
-	* _TaskPagePrivate: added a boolean variable is_assignment.
-	* gui/dialogs/task-page.h:
-	* gui/dialogs/event-page.h: Added a function to set
-	the is_meeting boolean variable.
-	* gui/dialogs/event-editor.c: (show_meeting):
-	* gui/dialogs/task-editor.c: (show_assignment): Called
-	the function to set the boolean variable.
-	* gui/dialogs/event-page.c: (event_page_init),
-	(event_page_set_meeting), (source_changed_cb):
-	* gui/dialogs/task-page.c: (task_page_init),
-	(task_page_set_assignment), (source_changed_cb):
-	If the source is changed and only if its a group
-	event show the send options frame.
-	* gui/gnome-cal.c: (client_cal_opened_cb): Do not
-	popup the offline error dialog for tasks.
-
-2005-02-15  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/migration.c (migrate_ical_folder_to_source): check return value
-	from e_cal_new, to display a better warning message.
-
-2005-02-11  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #72038
-
-	* gui/itip-utils.c (itip_send_comp): when we get no recipients, don't
-	send the message and return an error.
-
-2005-02-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-cal-model.c: (e_cal_view_objects_added_cb): Remove
-	the component from the view, if its already present before 
-	adding it.
-
-2005-02-09  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/event-editor.c: (event_editor_edit_comp):
-	Always remove the meeting and scheduling pages when there are no
-	attendees. This allows the sender to be added to the attendees list 
-	by default while creating new meetings.
-
-2005-02-08  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (set_instance_times): set instance times correctly.
-
-2005-02-07  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61075
-	
-	* gui/apps_evolution_calendar.schemas.in.in: add long descriptions
-	and clean up short items
-
-2005-02-05  Harish Krishnaswamy  <kharish@novell.com>
-
-	* calendar-errors.xml:
-	* calendar-errors.xml.h:
-	* gui/e-tasks.c: (client_cal_opened_cb):
-	* gui/gnome-cal.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb): add messages for
-	calendar/tasks not marked for offline usage.
-	
-
-2005-02-05  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/comp-editor.c (attach_message), (drop_action),
-	(drop_popup_copy), (drop_popup_move), (drop_popup_cancel),
-	(drop_popup_free), (drag_data_received), (drag_motion),
-	(comp_editor_class_init), (comp_editor_init), (real_edit_comp):
-	fix the dnd woes on calendar attachments.
-	* gui/dialogs/cal-attachment-bar.c (add_from_file): reuse  
-	mail composer's error message.
-	
-2005-02-04  Harry Lu  <harry.lu@sun.com>
-
-	Add a11y name for attachment button and bars.
-
-	* gui/dialogs/cal-attachment-bar.c: (cal_attachment_bar_new):
-	* gui/dialogs/comp-editor.c: (setup_widgets):
-
-2005-02-04  Rodney Dawes  <dobey@novell.com>
-
-	* gui/dialogs/comp-editor.[ch]: Add a string to CompEditorPrivate to
-	store the name of the help section we need to refer for derived dialogs
-	(response_cb): Handle the GTK_RESPONSE_HELP response and show help
-	(setup_widgets): Add a button to the dialog for Help
-	(comp_editor_init): Default to the "usage-calendar" help section
-	(comp_editor_finalize): Free the help_section variable
-	(comp_editor_show_help): Add a new method to actually open the help
-	(comp_editor_set_help_section): Add a method for derivatives to set the
-	help section they want to open
-
-	* gui/dialogs/event-editor.c (event_editor_init): Set the help section
-	we want to open for the event editor to "usage-calendar-apts"
-
-	* gui/dialogs/task-editor.c (task_editor_init): Set the help section
-	we want to open for the event editor to "usage-calendar-todo"
-	
-2005-02-04  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-tasks.c (update_view): clear the component preview when we
-	update the view.
-
-	* gui/e-cal-model.c (set_instance_times): use the correct timezone.
-	Removed commented code.
-
-2005-02-04  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #71265
-
-	* gui/e-week-view.c (e_week_view_remove_event_cb):
-	* gui/e-day-view.c (e_day_view_remove_event_cb): if we remove the
-	event we were editing, update internal pointers.
-
-2005-02-04  Vivek Jain <jvivek@novell.com>
-	
-	* calendar-errors.xml.h
-	* calendar-errors.xml : changed the warning message string for
-	server-version
-
-2005-02-04  Yong Sun <yong.sun@sun.com>
-
-	Fix for #56901
-
-	* gui/print.c: (bound_text): When the width>maxwidth, the 
-	pointer 'p' should also be backwarded, same as 'o'.
-
-2005-02-03  Rodney Dawes  <dobey@novell.com>
-
-	* calendar-errors.xml.h: Update to include new strings from the
-	calendar-errors.xml file
-
-2005-02-03  Li Yuan  <li.yuan@sun.com>
-
-	* gui/dialogs/task-details-page.c: (get_widgets):
-	add a11y name to url.
-	* gui/dialogs/task-details-page.glade:
-	add a11y name to date completed.
-	* gui/dialogs/task-page.glade:
-	add a11y names to due date and start date.
-
-2005-02-03  Vivek Jain <jvivek@novell.com>
-	
-	* calendar-errors.xml : added a warning message for invalid server
-	version
-	* gui/gnome-cal.c (default_client_cal_opened_cb)
-	(client_cal_opened_cb): added a case to check the
-	call status and display warning	
-
-2005-02-02  Rodney Dawes  <dobey@novell.com>
-
-	* gui/dialogs/alarm-dialog.c (alarm_dialog_run): Set the border width
-	for the internal dialog containers to be HIG compliant
-
-	* gui/dialogs/alarm-dialog.glade: Remove the separator in the dialog
-	and fix some spacing/padding issues to be HIG compliant
-
-	* gui/dialogs/alarm-list-dialog.c (alarm_list_dialog_run): Set the
-	border width for the internal dialog containers to be HIG compliant
-	
-	* gui/dialogs/alarm-list-dialog.glade: Remove the separator in the
-	dialog and fix some spacing/padding issues to be HIG compliant
-
-2005-02-02  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #72090
-
-	* gui/calendar-component.c (impl_handleURI): don't assume the URI is
-	always correct.
-
-2005-02-01  Rodney Dawes  <dobey@novell.com>
-
-	* gui/dialogs/comp-editor.c (setup_widgets): Clean up the spacing
-	and padding, and shove the notebook and expander arrow into a vbox
-	so that we can be HIG compliant
-	(comp_editor_init): Remove the separator from the "dialog" and set
-	the border width for the internal dialog widgets appropriately to
-	be compliant with the HIG for dialog borders
-	
-2005-02-01  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-tasks.c (e_tasks_destroy): fix typo
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): ditto
-	
-2005-02-01  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-menu.c (e_cal_menu_target_new_select):
-	* gui/e-cal-popup.c (e_cal_popup_target_new_select): add correct mask
-	for detached recurrences.
-
-2005-02-01  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/calendar-commands.c
-	(calendar_control_sensitize_calendar_commands): only add real data
-	to the array.
-
-2005-02-01  JP Rosevear  <jpr@novell.com>
-
-	Fixes #71944
-	
-	* gui/e-tasks.c: declare config_categories_changed_cb before its
-	used
-
-2005-01-31  Hans Petter Jansson  <hpj@novell.com>
-
-	* common/Makefile.am (libevolution_calendarprivate_la_LDFLAGS):
-	Remove the -module flag, this isn't supposed to be a module.
-
-2005-01-31  Hans Petter Jansson  <hpj@novell.com>
-
-	* idl/evolution-calendar.idl: Remove definition of CalObjUID and
-	include that from Evolution-DataServer-Calendar.idl instead. This
-	prevents the typecode from being defined twice.
-
-2005-01-31  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/e-cal-config.c (_ECalConfigPrivate): Use guint instead of ulong
-	for signal ID.
-
-2005-01-31  Priit Laes <amd@tt.ee>
-
-	Fixes #61078
-
-	* gui/dialogs/task-page.glade: use consistent style for markup.
-
-2005-01-31  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #64682
-	* gui/e-calendar-view.c: (transfer_item_to): Added an 
-	X property to identify if the appointment is moved from 
-	another calendar.
-
-2005-01-28  JP Rosevear  <jpr@novell.com>
-
-	Fixes #71452
-	
-	* gui/dialogs/comp-editor.c (setup_widgets): listen for
-	delete_event signal and handle it outside of the response signal
-	so that cancel works properly
-
-2005-01-28  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-tasks.c (setup_widgets):
-	* gui/gnome-cal.c (setup_widgets): use correct key name.
-
-2005-01-28  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #33078
-
-	* gui/gnome-cal.c: deal now with categories entirely here, no more
-	"categories_changed" signal from the backends.
-	(free_categories, add_categories, append_category_cb,
-	client_categories_changed_cb, copy_categories): removed.
-	(gnome_calendar_add_source): don't connect to removed signal.
-	(gnome_calendar_destroy): destroy the config listener.
-	(gnome_calendar_init): create a listener for the categories list
-	GConf key.
-	(config_categories_changed_cb): callback for configuration changes
-	in category list.
-	(setup_widgets): initialize the search bar with categories from
-	the configuration.
-
-	* gui/e-tasks.c (client_categories_changed_cb, e_tasks_add_todo_source,
-	e_tasks_init, config_categories_changed_cb, e_tasks_destroy,
-	setup_widgets): same as gnome-cal.c.
-
-2005-01-26  JP Rosevear  <jpr@novell.com>
-
-	Fixes #71485
-	
-	* calendar-errors.xml: fix paste-o
-
-2005-01-27  Harry Lu <harry.lu@sun.com>
-
-	Fix a runtime invalid cast warning.
-
-	* gui/e-calendar-table.c: (e_calendar_table_init): only set
-	a11y name if atk is enabled.
-
-2005-01-26  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/recurrence-page.c (sensitize_buttons): objects returned
-	from e_cal_get_objects_for_uid are ECalComponent's, so use
-	g_object_unref to free them, not icalcomponent_free.
-
-2005-01-26  Li Yuan  <li.yuan@sun.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade:
-	use full name for the weekday checkbox.
-
-	Fixes #71729.
-
-
-2005-01-26  JP Rosevear  <jpr@novell.com>
-
-	* gui/itip-utils.c (itip_send_comp): make sure we free the user
-	list
-
-2005-01-25  Li Yuan  <li.yuan@sun.com>
-
-	* gui/e-calendar-table.c: (e_calendar_table_init):
-	add a11y name to task table.
-
-2005-01-24  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/recurrence-page.c (sensitize_buttons): if there are
-	detached instances, disable recurrence date widgets.
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #46404
-	
-	* gui/tasks-control.c (tasks_control_print_cmd): just call print
-	tasks, we don't do the dialog here
-
-	* gui/print.h: update protos
-
-	* gui/print.c (print_calendar): use e_print routines for config
-	and dialog and make copies and range settings properly available
-	(print_comp): ditto
-	(print_table): bring up dialog here so that printing for calendar
-	list view works correctly
-
-	* gui/calendar-commands.c (print): pass extra params to print
-	table
-
-2005-01-19  Rodrigo Moya <rodrigo@novell.com>
-
-	* importers/icalendar-importer.c (update_objects): use receive_objects
-	method instead of individually updating objects. Set the method on the
-	VCALENDAR object we create.
-
-2005-01-18  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #71407
-
-	* gui/e-week-view.c (process_component): killed warnings.
-	(e_week_view_start_editing_event): do nothing if the calendar is
-	read only.
-
-	* gui/e-day-view.c (e_day_view_start_editing_event): ditto.
-
-2005-01-18  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/cal-attachment-bar.c 
-	(cal_attachment_bar_get_attachment_list): handle error conditions more
-	gracefully.
-
-2005-01-17  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/calendar-component.c:
-	* gui/calendar-offline-handler.c:
-	* gui/comp-editor-factory.c:
-	* gui/e-tasks.c:
-	* gui/gnome-cal.c:
-	* gui/misc.c:
-	* gui/alarm-notify/alarm-notify.c: use libedataserver's e-url.
-
-2005-01-17  Nat Friedman  <nat@novell.com>
-
-	* gui/dialogs/url-editor-dialog.glade: Changed the title for the
-	free/busy publishing settings dialog to "Free/Busy Publishing
-	Settings" (away from "Free/Busy Editor" which made no sense).
-
-2005-01-17  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-calendar-view.c (on_unrecur_appointment): removed the
-	e_day_view_... prefix in warning messages.
-
-2005-01-17  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/cal-attachment-bar.c (destroy):
-	fixed a kludge.
-
-2005-01-12  JP Rosevear  <jpr@novell.com>
-
-	Fixes #65820
-	
-	* gui/weekday-picker.c (get_day_text): add translator comment
-
-2005-01-08  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-day-view.c (e_day_view_finish_resize): set
-	last_Edited_comp_string to NULL, not test it for null.
-
-2005-01-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/cal-attachment-bar.c:
-	(cal_attachment_bar_set_attachment_list):
-	reverting the offset 'hyphen' fix - not required anymore.	
-
-2005-01-10  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): remove the
-	temporary object from the view when stopping editing.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): ditto.
-	
-2005-01-10  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/cal-attachment-bar.c:
-	(cal_attachment_bar_set_attachment_list):
-	offset the file name to account for the 'hyphen'.
-
-2005-01-10  Chenthill Palanisamy <pchenthill@novell.com>
-
-	* gui/dialogs/event-page.glade
-	* gui/dialogs/task-page.glade: Showed the send options
-	button and label. Hided the Send options Frame.
-
-2005-01-10  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/cal-attachment-bar.[ch]: (destroy), (init),
-	(cal_attachment_bar_set_local_attachment_store),
-	(cal_attachment_bar_get_attachment_list),
-	(cal_attachment_bar_get_nth_attachment_filename),
-	(cal_attachment_bar_set_attachment_list):
-	Modified cal-attachment-bar to allow the path to 
-	the local attachment store be set externally, thereby
-	hiding the storage policy of different backends from it.
-	* gui/dialogs/comp-editor.c: (real_edit_comp):
-	set the local attachment store after obtaining it from 
-	the calendar.
-
-2005-01-09  JP Rosevear  <jpr@novell.com>
-
-	* gui/calendar-component.c (impl_handleURI): handle calendar://
-	uris
-
-2005-01-07  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): clear the
-	attendees, somehow I remove this in an earlier commit
-
-2005-01-07  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/task-page.glade: put a name to the 'Send options' frame.
-
-	* gui/dialogs/event-page.c (event_page_init): initialize reference to
-	the 'Send options' frame.
-	(get_widgets): get the 'Send options' frame from the .glade file.
-	(event_page_hide_options): just hide the frame.
-	(event_page_show_options): just show the frame.
-
-	* gui/dialogs/task-page.c (task_page_init): initialize reference to the
-	'Send options' frame.
-	(get_widgets): get the 'Send options' frame from the .glade file.
-	(task_page_hide_options): just hide the frame.
-	(task_page_show_options): just show the frame.
-
-2005-01-06  David Trowbridge  <trowbrds@cs.colorado.edu>
-
-	* gui/e-cal-event[hc]: initial import of ECalEvent targets
-
-	* gui/migration.c (migrate_calendars): add component.migration event
-
-2005-01-06  JP Rosevear  <jpr@novell.com>
-
-	* gui/Makefile.am: install schemas properly
-
-2005-01-06  Chenthill Palanisamy <pchenthill@novell.com>
-	
-	merging send options
-	* gui/dialogs/Makefile.am: Added two new files for send options.
-	* gui/dialogs/e-send-options-utils.{ch}:
-	(e_sendoptions_utils_set_default_data),
-	(e_sendoptions_utils_fill_component): For setting and gettings the 
-	send options.
-	* gui/dialogs/event-editor.c (event_editor_construct): Check for the static
-	capabilities before showing send options.
-	* gui/dialogs/event-page.c: (event_page_show_options),
-	(event_page_fill_component), (e_sendoptions_clicked_cb):
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/event-page.h: Added function to show/hide the send options button
-	and label and run the send options dialog. 
-	* gui/dialogs/task-editor.c: (task_editor_construct),
-	(task_editor_edit_comp):
-	* gui/dialogs/task-page.c: (task_page_init), (task_page_finalize),
-	(sensitize_widgets), (task_page_hide_options),
-	(task_page_show_options), (task_page_fill_widgets),
-	(task_page_fill_component), (get_widgets), (source_changed_cb),
-	(e_sendoptions_clicked_cb), (init_widgets): Same as event-page.
-	* gui/dialogs/task-page.glade: Added the send options button
-	* gui/dialogs/task-page.h: Added functions hiding and showing send
-	options button
-
-2005-01-05  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-day-view.c (e_day_view_find_event_from_uid): added a new
-	argument to pass the calendar client, since it might happen to have
-	events with the same UID on different calendars.
-	(e_day_view_do_key_press, model_rows_deleted_cb): added new argument
-	to e_day_view_find_event_from_uid.
-
-	* gui/e-week-view.c (e_week_view_find_event_from_uid): same as
-	e-day-view.c.
-	(e_week_view_do_key_press, model_rows_deleted_cb): added new argument
-	to e_week_view_find_event_from_uid.
-
-2005-01-04  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-component-preview.c (write_html): use the new e-categories
-	API in e-d-s.
-
-2005-01-04  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-week-view.c (model_rows_deleted_cb): search our internal data
-	for the correct event.
-
-2005-01-04  Harry Lu  <harry.lu@sun.com>
-
-	* gui/calendar-component.c: (create_component_view): add a11y name 
-	to calendar sidebar selector.
-	* gui/tasks-component.c: (create_component_view): add a11y name 
-	to task sidebar selector.
-
-2005-01-03  JP Rosevear  <jpr@novell.com>
-
-	Fixes #69663
-	
-	* gui/e-cal-model-tasks.c (is_complete): look at the percent
-	complete and status properties as well for completeness clues
-
-2005-01-03  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (e_cal_model_set_time_range): redo the queries
-	after emitting the 'time_range_changed' signal, since now the
-	views will only update their internal data but not redraw the
-	events on that signal.
-
-	* gui/e-day-view.c (model_changed_cb): removed, no longer needed.
-	(e_day_view_recalc_day_starts): no need to call e_day_view_update_query.
-	(e_day_view_init): no need to connect to 'model_changed' signal
-	on the model, we already connect to the row/cell_changed ones.
-
-	* gui/e-week-view.c (time_range_changed_cb): no need to call
-	e_week_view_update_query.
-	(model_changed_cb): removed, no longer needed.
-	(e_week_view_init): no need to connect to 'model_changed' signal
-	on the model, we already connect to the row/cell_changed ones.
-
-2004-12-31  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/schedule-page.c: add necessary include
-
-	* gui/dialogs/meeting-page.c (sensitize_widgets): kill warning
-
-	* gui/dialogs/cal-prefs-dialog.c (template_url_changed): kill warning
-
-	* gui/dialogs/alarm-dialog.c (malarm_widgets_to_alarm): kill warnings
-	(init_widgets): ditto
-
-	* gui/main.c (initialize): no need to init the config system now
-
-	* gui/e-cell-date-edit-config.h: include date edit text header
-
-	* gui/e-cal-config.c (ecp_target_free): kill warning
-
-	* gui/calendar-config.c: clean up includes, internally initialize
-	the config setup to make it easier for others; kill dead functions
-
-2004-12-26  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (search_by_uid_and_client): removed superfluous if
-	check.
-	(e_cal_view_objects_modified_cb): add all objects at once.
-
-	* gui/e-day-view.c (e_day_view_remove_event_cb): set fields we
-	free to NULL.
-
-2004-12-24  Harish Krishnaswamy <kharish@novell.com>
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp):
-	Check for the existence of the meet/sched pages before
-	attempting to remove them.
-
-2004-12-23  Chenthill Palanisamy <pchenthill@novell.com>
-
-	Part of merge from offline branch 
-	
-	* gui/dialogs/calendar-setup.c
-	(eccp_general_offline): function to add the check box for
-	folder offline settings.
-	(offline_status_changed_cb): call back function for the same.
-	(ECalConfigItem eccp_items[]), (ECalConfigItem ectp_items[]):
-	 Added the check box function call in both the structures.
-	
-2004-12-23  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (set_instance_times): get instance times using
-	the correct timezone.
-	(redo_queries): emit signals before clearing the array.
-
-	* gui/e-day-view.c (process_component):
-	* gui/e-week-view.c (process_component): no need to try to update,
-	always add.
-
-2004-12-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/e-select-names-editable.c: Correct bad include.
-
-	* gui/dialogs/Makefile.am (IDL_GENERATED_H)
-	(IDL_GENERATED)
-	(BUILT_SOURCES): No longer needed, removed.
-
-2004-12-22  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/Makefile.am (IDLS)
-	(SELECT_NAMES_IDL_GENERATED_H)
-	(SELECT_NAMES_IDL_GENERATED_C)
-	(SELECT_NAMES_IDL_GENERATED)
-	(IDL_GENERATED): Remove the addressbook IDL.
-
-	* gui/e-meeting-list-view.c (e_meeting_list_finalize)
-	(add_section)
-	(e_meeting_list_view_init)
-	(process_section)
-	(name_selector_dialog_close_cb)
-	(get_select_name_dialog): Adapt to new ENameSelector.
-
-	* gui/e-select-names-editable.c (esne_start_editing)
-	(esne_finalize)
-	(esne_init)
-	(e_select_names_editable_get_type)
-	(entry_activate)
-	(e_select_names_editable_construct)
-	(e_select_names_editable_get_address)
-	(e_select_names_editable_get_name)
-	(e_select_names_editable_set_address): Adapt to new ENameSelector.
-
-	* gui/e-select-names-renderer.c (e_select_names_renderer_editing_done)
-	(e_select_names_renderer_activated)
-	(e_select_names_renderer_start_editing): Adapt to new ENameSelector.
-
-	* gui/dialogs/alarm-dialog.c (malarm_widgets_to_alarm)
-	(addressbook_clicked_cb)
-	(addressbook_response_cb)
-	(setup_select_names)
-	(check_custom_email)
-	(malarm_addresses_changed_cb): Adapt to new ENameSelector.
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_finalize)
-	(e_delegate_dialog_construct)
-	(addressbook_clicked_cb)
-	(addressbook_response_cb)
-	(e_delegate_dialog_get_delegate)
-	(e_delegate_dialog_get_delegate_name): Adapt to new ENameSelector.
-	
-2004-12-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-meeting-store.c (freebusy_async): prevent compare against
-	null default_fb_uri and fix thinko
-
-2004-12-22  JP Rosevear  <jpr@novell.com>
-	
-	* gui/e-cal-model.c: Change copyright from ximian to novell
-
-2004-12-17  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu): 
-
-	* gui/tasks-component.c (popup_event_cb): 
-
-	* gui/gnome-cal.c (gnome_calendar_view_popup_factory): 
-
-	* gui/e-calendar-view.c (e_calendar_view_create_popup_menu): 
-
-	* gui/alarm-notify/alarm-queue.c (tray_icon_clicked_cb): 
-
-	* gui/dialogs/meeting-page.c (button_press_event): 
-
-	* gui/calendar-component.c (popup_event_cb): 
-
-2004-12-22  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61077
-	
-	* gui/dialogs/task-details-page.glade: remove extraneous tab
-
-	* gui/dialogs/alarm-dialog.c: ditto
-	
-2004-12-22  JP Rosevear  <jpr@novell.com>
-	
-	Fixes #61076
-	
-	* gui/comp-editor-factory.c (open_client): don't translate command
-	line warnings
-
-	* gui/calendar-offline-handler.c (backend_go_online): ditto
-	(backend_go_offline): ditto
-	
-2004-12-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #41624
-	
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	append the exceptions, don't keep overwriting the first
-
-2004-12-21  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (set_instance_times): no need to convert times now.
-	(add_instance_cb): no need to convert here.
-
-2004-12-21  Rodrigo Moya <rodrigo@novell.com>
-
-	Merge from recurrences-work-branch
-
-	* gui/e-cal-model.c (free_comp_data): renamed to
-	e_cal_model_free_component_data and made it public.
-	(clear_objects_array, e_cal_view_objects_removed_cb,
-	remove_client_objects): use e_cal_model_free_component_data.
-	(get_dtstart): get the DTSTART correctly for recurrences.
-	(add_instance_cb): initialize all members of ECalModelComponent, and
-	use the correct icalcomponent when setting the field.
-	(set_instance_times): new function to set the instance_* fields of
-	the ECalModelComponent when not expanding recurrences.
-	(e_cal_view_objects_added_cb): expand recurrences for all objects when
-	the model is set to expand. Call set_instance_times when not
-	expanding recurrences.
-	(e_cal_view_objects_modified_cb): made it remove objects and re-add
-	them.
-	(copy_ecdv): check values before using them.
-	(e_cal_model_copy_component_data): Added code to copy the instance_* and
-	color fields.
-
-	* gui/e-cal-model-calendar.c (get_dtend): get the DTEND correctly for
-	recurrences.
-	(ecmc_set_value_at): ask user which instances to modify.
-
-	* gui/e-day-view.c (e_day_view_find_event_from_uid): changed to search
-	by UID and RID if given.
-	(process_component): changed to not expand recurrences at all, this is
-	now done on the model.
-	(row_deleted_check_cb, remove_uid_cb): removed these functions.
-	(model_rows_deleted_cb): changed to just remove the rows signalled from
-	the model, which is the responsible for the recurrence expansion.
-	(e_day_view_new): set the model to expand recurrences.
-	(e_day_view_remove_event_cb): check the value searched in the array.
-	(e_day_view_do_key_press): use e_day_view_find_event_from_uid correctly.
-
-	* gui/e-week-view.c (e_week_view_find_event_from_uid): changed to search
-	by UID and RID if given.
-	(process_component_recur_cb): removed.
-	(process_component): changed to not expand recurrences at all, this is
-	now done on the model.
-	(row_deleted_check_cb, remove_uid_cb): removed these functions.
-	(model_rows_deleted_cb): changed to just remove the rows signalled from
-	the model, which is the responsible for the recurrence expansion.
-	(e_week_view_new): set the model to expand recurrences.
-	(e_week_view_remove_event_cb): check the value searched in the array.
-	Set the ECalModelComponent field to NULL after freeing it.
-	(e_week_view_do_key_press): use e_week_view_find_event_from_uid
-	correctly.
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): remove the
-	RECURRENCE-ID from the object when modifying all instances.
-
-2004-12-18  James Bowes  <bowes@cs.dal.ca>
-
-	* gui/apps_evolution_calendar.schemas.in.in: Add schema for Free/Busy
-	template uri.
-	* gui/calendar-config-keys.h:
-	* gui/calendar-config.c: (calendar_config_get_free_busy_template),
-	(calendar_config_set_free_busy_template),
-	(calendar_config_add_notification_free_busy_template):
-	* gui/calendar-config.h: Functions to get, set and monitor the 
-	Free/Busy template uri gconf setting.
-	* gui/dialogs/cal-prefs-dialog.c: (template_url_changed),
-	(setup_changes), (get_widgets), (show_fb_config):
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/cal-prefs-dialog.h: Change 'Free/Busy Publish' tab to
-	'Free/Busy'. Add an entry for setting the default Free/Busy uri. 
-	Only change the gconf setting on 'focus out' event
-	* gui/e-meeting-store.c: (refresh_queue_remove): Check the hash using
-	the attendee's mailto: address, rather than the memory address of the 
-	attendee object as the key.
-	(e_meeting_store_get_fb_uri), (e_meeting_store_set_fb_uri): Get and set
-	the EMeetingStore's Free/Busy template string.
-	(process_callbacks_main_thread), (process_callbacks): Process callbacks
-	in the main thread, so that widgets can be redrawn properly.
-	(replace_string): Utility function for replacing wildcards in the
-	default Free/Busy uri.
-	(ems_finalize),	(ems_init), (freebusy_async), (refresh_busy_periods), 
-	(refresh_queue_add), (e_meeting_store_refresh_busy_periods): Add the 
-	ability to check for Free/Busy information from a default location, 
-	if all else fails.
-	(start_async_read): Use gnome-vfs to read the Free/Busy information.
-	* gui/e-meeting-store.h: Add function prototypes for get and set fb_uri
-	* gui/e-meeting-time-sel.c: (e_meeting_time_selector_init),
-	(e_meeting_time_selector_destroy), (free_busy_timeout_refresh), 
-	(free_busy_template_changed_cb): Watch for a change in the Free/Busy 
-	template gconf setting, and check for new Free/Busy data if it occurs.
-	* gui/e-meeting-time-sel.h: Include variable for notification function
-	id on changes to the Free/Busy uri in the EMeetingTimeSelector .
- 
-2004-12-17  Rodney Dawes  <dobey@novell.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c (an_minutes_update_label):
-	Add callback function for doing ngettext on the "minutes" label
-	(alarm_notify_dialog): Get the "minutes" label from the glade file
-	and set the callback for its "value_changed" signal
-
-	Fixes #47535
-
-2004-12-13  Harish Krishnaswamy <kharish@novell.com>
-
-	* gui/dialogs/calendar-setup.c : Correct some white space 
-	ugliness in the previous commit.
-
-2004-12-13  Vivek Jain <jvivek@novell.com>
-
-	* gui/dialogs/calendar-setup.c : Changed the window title based upon
-	the source.
-
-2003-12-09  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-calendar-view.c (on_unrecur_appointment): keep a local copy
-	of the ECal.
-
-2004-12-08  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/e-meeting-list-view.c
-	* gui/e-select-names-editable.c
-	* gui/dialogs/alarm-dialog.c
-	* gui/dialogs/e-delegate-dialog.c: Include <libebook/e-destination.h>
-	from evolution-data-server.
-
-2004-12-08  Harish Krishnaswamy <kharish@novell.com>
-	
-	* gui/e-week.c (time_range_changed_cb, e_week_view_set_first_day_shown):
-	update the query so currently held events can be cleared off.
-
-2004-12-08  David Mosberger <davidm@napali.hpl.hp.com>
-
-	* gui/main.c: include plugin headers to fix 64 bit problems.
-
-2004-12-06  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #67403
-
-	* gui/dialogs/event-page.c (sensitize_widgets): don't unsensitize
-	the 'Customize' button, to allow users to look at the alarm list
-	for read only events.
-
-	* gui/dialogs/alarm-list-dialog.c (sensitize_buttons): unsensitize
-	buttons if the event is read only.
-
-2004-12-02  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/dialogs/task-editor.[ch] (task_editor_new), (task_editor_construct),
-	(show_assignment):
-	Add a boolean variable to denote assigned task and construct the 
-	meeting page only for the assigned task. Set it as a group item
-	in component editor.
-	(_TaskEditorPrivate): added the boolean variable (is_assigned).
-	(task_editor_init): initialized the variable.
-	* gui/dialogs/comp-editor.[ch]: Added functions to set and get whether comp
-	 is a group item or individual item.
-	* gui/comp-editor.c (make_title_from_string), (make_title_from_comp):
-	Set the Title for the appointment editor window as "Meeting" or "Assigned
-	Task" if its a group calendar/task item.
-	(_CompEditorPrivate): added a boolean variable (is_group_item).
-	(comp_editor_init): initialized the same.
-	* gui/dialogs/event-editor.c (event_editor_construct), (show_meeting): Set whether
-	the component is a group item or not in comp editor.
-	* gui/e-calendar-table.c (e_calendar_table_open_task), (e_calendar_table_open_selected),
-	(open_task_by_row): Check whether the component being opened is an assigned task by
-	checking for attendees and call open_task with proper value for boolean variable assign.
-	* gui/comp-editor-factory.c (edit_existing):
-	* gui/e-calendar-table.c (open_task):
-	* gui/e-tasks.c (e_tasks_new_task):
-	* gui/gnome-cal.c (gnome_calendar_new_task):
-	* gui/tasks-component.c (create_new_todo):
-	Called the function task_editor_new with a added argument.
-
-2004-12-02  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-day-view.c (e_day_view_finish_resize), (e_day_view_reshape_day_event)
-       	(e_day_view_change_event_time): Free the string day_view->last_edited_comp_string
-	before changing assigning it another value.
-	* gui/e-week-view.c (e_week_view_change_event_time): Free the string
-	week_view->last_edited_comp_string for the same reason above.
-	
-2004-11-29  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* calendar-errors.xml.h: committng this file. Missed to
-	commit this one.
-
-2004-11-29  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	* gui/dialogs/comp-editor.c (response_cb): Moved the call
-	for the warning dialog (send_component_prompt_subject) after 
-	the component is saved (save_comp_with_send). 
-	
-2004-11-26  JP Rosevear  <jpr@novell.com>
-
-	* gui/alarm-notify/alarm-queue.c (display_notification): ditto
-
-	* gui/e-timezone-entry.c (e_timezone_entry_init): get the image
-	directly from the icon factory
-
-2004-11-26  JP Rosevear  <jpr@novell.com>
-	
-	* gui/alarm-notify/alarm-queue.c (display_notification): prevent
-	crash if there is no description
-
-2004-11-25  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/calendar-component.c: 
-	(new_calendar_cb), (edit_calendar_cb): Use modified_setup_edit_calendar call.
-	(popup_event_cb): If source is null (Rt click on a source group), show the new 
-	calendar popup menu item. Else, do not show the new calendar option. 
-	* gui/dialogs/calendar-setup.[ch] (eccp_get_source_type): Compare the
-	source_groups by their uid and not the pointers, so that the correct option
-	is activated on the combo box.
-	(calendar_setup_edit_calendar) : add a source_group parameter to the function.
-	(calendar_setup_new_calendar): Use modified signature of the above function.
-	* gui/e-calendar-view.c (on_edit_appointment): check the icalcomponent
-	to see if it is a meeting and set the argument to e_calendar_view_edit_appointment
-	correctly.
-
-2004-11-25  Chenthill Palanisamy  <pchenthill@novell.com>
-		
-	* gui/dialogs/event-deitor.c (show_meeting): removed the
-	call for comp_editor_show_page, so that the event page
-	shows up at first instead of meeting page when a meeting
-	is opened.
-
-2004-11-25  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* calendar-errors.xml: Added two error ids to display use
-	it when the meeting is created without a summary.
-	* gui/dialogs/send-comp.[ch] (send_component_prompt_subject): Added a 
-	function to prompt for a dialog when a meeting/assigned task is sent 
-	without a summary.
-	* gui/dialogs/comp-editor.c (response_cb): Called the above mentioned
-	function when the summary is not present.
-	
-2004-11-23  Rodney Dawes  <dobey@novell.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.[ch]:
-	Add gtkimage.h to includes, and remove gtkhtml headers
-	Add and remove some widgets in the AlarmNotify struct
-	(dialog_destroy_cb, delete_event_cb, close_clicked_cb):
-	(snooze_clicked_cb, edit_clicked_cb, url_requested_cb):
-	(make_html_display, write_times, write_html_heading):
-	(alarm_notify_dialog_disable_buttons): 
-	Remove all these unneeded functions (no more GtkHTML in the dialog)
-	(alarm_notify_dialog): Add description and location arguments
-	Rename message argument to summary
-	Update gtk-doc comment block to reflect API changes
-	Clean up code to use gtk_dialog_run () and use a HIG compliant dialog
-
-	* gui/alarm-notify/alarm-notify.glade: Update the alarm notify
-	dialog to be HIG compliant and not use GtkHTML, and display more
-	information that is relevant to the appointment we are alerting of
-
-	* gui/alarm-notify/alarm-queue.c: Add new variables to the
-	TrayIconData structure so we can access the description and location
-	(on_dialog_objs_removed_cb): Remove alarm_dialog bits
-	(notify_dialog_cb): Remove alarm_dialog bits
-	(tray_icon_destroyed_cb): Free the description and location as well
-	(open_alarm_dialog): alarm_notify_dialog does all the work now, we
-	don't need to trap the dialog widget here
-	(display_notification): Add code to get the description and location
-	information from the cal component
-	Avoid using an alarm component which has less useful API
-	Fix a warning when creating the tray_icon widget
-	
-2004-11-15  Not Zed  <NotZed@Ximian.com>
-
-	* gui/dialogs/Makefile.am (libcal_dialogs_la_LIBADD): add
-	libeabutil, since we use e-destination.
-
-2004-11-08  Rodney Dawes  <dobey@novell.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading):
-	Don't try to convert the results of timet_to_str_with_zone to UTF-8,
-	since the return value is already encoded in UTF-8
-
-	Fixes #47529
-
-2004-11-04  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/task-page.glade: expand the horizontal box so that it
-	fills all available space.
-
-2004-11-03  David Trowbridge  <trowbrds@cs.colorado.edu>
-
-	* gui/e-cal-config.c: added EConfig subclass for calendars
-	* gui/calendar-component.c, gui/tasks-component.c: initialize
-	  plugin hooks on component startup.
-	* gui/dialogs/calendar-setup.c: Converted to use EConfig
-
-2004-11-04  Li Yuan  <li.yuan@sun.com>
-
-	Fixes #6767
-
-	* gui/e-day-view-main-item.c:
-	(e_day_view_main_item_draw_day_event):
-	use widget->style instead of hard code colors.
-	* gui/e-day-view.c: (e_day_view_realize), (e_day_view_set_colors),
-	(e_day_view_style_set), (e_day_view_reshape_long_event),
-	(e_day_view_reshape_day_event):
-	ditto.
-	* gui/e-week-view.c: (e_week_view_realize),
-	(e_week_view_set_colors), (e_week_view_style_set),
-	(e_week_view_reshape_event_span):
-	ditto.
-
-2004-11-02  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-day-view-config.c (set_twentyfour_hour): make sure the day
-	view times redraw themselves if we switch 24/12 hour modes
-
-2004-11-02  JP Rosevear  <jpr@novell.com>
-	
-	Fixes #68707
-	
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw):
-	restrict the range to 0-23 (midnight end times became '24')
-
-2004-10-28  Not Zed  <NotZed@Ximian.com>
-
-	* gui/tasks-component.c (popup_event_cb): 
-	* gui/e-calendar-view.c (e_calendar_view_create_popup_menu): 
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu):
-	* gui/calendar-component.c (popup_event_cb): added hook doco.
-
-2004-10-27  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-list-view.c (e_cal_list_view_new): don't expand recurrences
-	for the list view.
-
-2004-10-21  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/e-cal-popup.[ch]: (e_cal_popup_target_new_source):
-	Add status bits to denote if the calendar source is available offline
-	so that plugins to calendar popups can use the status qualifier to denote 
-	their visibility preferences.
-
-2004-10-21  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/select-source-dialog.c: use the new source selector
-	dialog in libedataserverui.
-
-2004-10-20  JP Rosevear  <jpr@novell.com>
-
-	* gui/calendar-component.c: put an icon on the properties menu item
-
-	* gui/tasks-component.c: ditto
-	
-	* gui/main.c (initialize): register plugin hooks for tasks and
-	calendar
-
-2004-10-20  JP Rosevear  <jpr@novell.com>
-	
-	* gui/e-cal-popup.c (ecalph_class_init): correct classid
-
-2004-10-19  JP Rosevear  <jpr@novell.com>
-
-	* gui/calendar-component.c, gui/e-cal-menu.c, gui/e-cal-popup.c,
-	gui/e-calendar-table.c, gui/e-calendar-view.c, gui/gnome-cal.c,
-	gui/tasks-component.c, gui/alarm-notify/alarm-queue.c,
-	gui/dialogs/meeting-page.c: convert to org.gnome hook names
-
-2004-10-19  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/comp-editor-factory.c: (edit_existing):
-	Use e_cal_component_has_attendees to test if it is a meeting.
-	* gui/dialogs/event-editor.c: (event_editor_init):
-	By default, the event is not a meeting.
-	(event_editor_construct): Do not add the invitation, scheduling pages
-	to the editor if it is not a meeting. 
-	* gui/e-day-view.c: (e_day_view_on_event_double_click):
-	check the icalproperty to test if the event is a meeting.
-	
-2004-10-19  JP Rosevear  <jpr@novell.com>
-
-	* gui/gnome-cal.c (connect_list_view_focus): listen to the canvas
-	for focus events
-	(setup_widgets): listen for listen view selection changes
-
-	* gui/e-cal-list-view.c (setup_e_table): listen for the cursor to
-	move
-	(e_cal_list_view_cursor_change_cb): indicate the selection changed
-
-2004-10-19  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/calendar-component.c (create_new_event):
-	* gui/e-calendar-view.c: (e_calendar_view_edit_appointment):
-	* gui/comp-editor-factory.c (edit_existing), (edit_new):
-	* gui/dialogs/event-editor.c (event_editor_edit_comp),
-	 (event_editor_new): updated the calls to event_editor_new 
-	with additional argument.
-	* gui/dialogs/event-editor.h: add parameter is_meeting to
-	distinguish between events and  meetings.
-	* gui/dialogs/meeting-page.c: (sensitize_widgets):
-	use explicit GError variable so that BUSY_ERROR
-	conditions do not lead us to think the calendar is readonly.
-	* gui/e-meeting-store.c: (refresh_queue_remove), (ems_init),
-	(e_meeting_store_remove_attendee), (freebusy_async),
-	(refresh_busy_periods), (refresh_queue_add): Make free-busy calls 
-	to backends async. Fixed the problem of spurious attendees getting 
-	added to the refresh_data.
-	
-2004-10-14  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-cal-menu.c (e_cal_menu_target_new_select): dont access a
-	NULL client.
-
-	* gui/gnome-cal.c (gnome_calendar_get_taskpad_menu)
-	(gnome_calendar_get_calendar_menu): accessors to get the menu
-	managers.
-	(gnome_calendar_init): setup menu managers.
-
-2004-10-13  Not Zed  <NotZed@Ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_activate)
-	(calendar_control_deactivate): activate and deactivate the
-	calendar and taskpad menu handlers.
-	(sensitize_items): helper to sensitise items based on target
-	masks.
-	(calendar_control_sensitize_calendar_commands): update the
-	calendar menu manager target appropriately.
-	(sensitize_taskpad_commands): same for the taskpad.
-
-	* gui/e-cal-menu.[ch]: Targets for main menu management.
-
-	* gui/e-cal-popup.c (e_cal_popup_target_new_select): fix cast.
-	Also include the tasks stuff in the hook metadata.
-
-2004-10-15  JP Rosevear  <jpr@novell.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): remove
-	useless ifdef'd out statement (its been unused for 3+ years)
-	
-2004-10-15  JP Rosevear  <jpr@novell.com>
-	
-	* gui/calendar-commands.h (calendar_goto_today): remove prototype
-
-	* gui/calendar-commands.c: remove dead function
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-meeting-attendee.c: convert to G_DEFINE_TYPE
-
-	* gui/e-meeting-list-view.c: ditto
-
-	* gui/e-meeting-time-sel.c: ditto
-
-	* gui/e-meeting-time-sel-item.c: ditto
-
-	* gui/e-select-names-renderer.c: ditto
-
-	* gui/e-timezone-entry.c: ditto
-
-	* gui/e-tasks.c: ditto
-
-	* gui/gnome-cal.c: ditto
-
-	* gui/weekday-picker.c: ditto
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-	
-	* gui/e-cell-date-edit-config.c: convert to G_DEFINE_TYPE
-
-	* gui/e-cell-date-edit-text.c: ditto
-
-	* gui/e-comp-editor-registry.c: ditto
-
-	* gui/e-date-edit-config.c: ditto
-
-	* gui/e-mini-calendar-config.c: ditto
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-	
-	* gui/e-cal-list-view-config.c: convert to G_DEFINE_TYPE
-
-	* gui/e-cal-list-view.c: ditto
-
-	* gui/e-cal-model-calendar.c: ditto
-
-	* gui/e-cal-model-tasks.c: ditto
-
-	* gui/e-cal-model.c: ditto
-
-	* gui/e-calendar-table-config.c: ditto
-
-	* gui/e-calendar-table.c: ditto
-
-	* gui/e-calendar-view.c: ditto
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-	
-	* gui/calendar-view.c: convert to G_DEFINE_TYPE
-
-	* gui/calendar-view-factory.c: ditto
-
-	* gui/cal-search-bar.c: ditto
-
-	* gui/e-cal-component-preview.c: ditto
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-	
-	* gui/e-week-view-config.c: convert to G_DEFINE_TYPE
-
-	* gui/e-week-view-event-item.c: ditto
-
-	* gui/e-week-view-main-item.c: ditto
-
-	* gui/e-week-view-titles-item.c: ditto
-
-	* gui/e-week-view.c: ditto
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-	
-	* gui/e-day-view.c: convert to G_DEFINE_TYPE
-	
-	* gui/e-day-view-config.c: ditto
-
-	* gui/e-day-view-main-item.c: ditto
-
-	* gui/e-day-view-time-item.c: ditto
-
-	* gui/e-day-view-top-item.c: ditto
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-	
-	* gui/dialogs/comp-editor.c: convert to G_DEFINE_TYPE
-	
-	* gui/dialogs/meeting-page.c: ditto
-
-	* gui/dialogs/recurrence-page.c: ditto
-
-	* gui/dialogs/schedule-page.c: ditto
-
-	* gui/dialogs/e-delegate-dialog.c: ditto
-
-	* gui/dialogs/event-editor.c: ditto
-
-	* gui/dialogs/task-editor.c: ditto
-
-	* gui/dialogs/task-details-page.c: ditto
-
-	* gui/dialogs/select-source-dialog.c
-	(primary_selection_changed_cb): fix warning
-	
-2004-10-13  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/task-page.c: ditto
-
-	* gui/calendar-component.h: remove e-source-selector include
-
-	* gui/tasks-component.h: ditto
-	
-	* gui/calendar-component.c: update include to libedataserverui for
-	source selector and option menus
-	
-	* gui/e-cal-popup.c: ditto
-
-	* gui/dialogs/url-editor-dialog.h: ditto
-
-	* gui/dialogs/select-source-dialog.c: ditto
-
-	* gui/tasks-component.c: ditto
-
-	* importers/icalendar-importer.c: ditto
-	
-	* gui/e-itip-control.c: ditto; use G_DEFINE_TYPE instead of
-	E_MAKE_TYPE
-	
-	* gui/dialogs/event-page.c: ditto	
-
-	* gui/dialogs/task-page.c: ditto
-	
-2004-10-12  Li Yuan  <li.yuan@sun.com>
-
-	* gui/e-day-view.c: (e_day_view_on_main_canvas_button_press):
-	* gui/e-week-view.c: (e_week_view_on_button_press):
-	If main_canvas has focus, do not grub it. Emit the 
-	selected_time_changed signal after the selection day changed.
-
-2004-10-12  Not Zed  <NotZed@Ximian.com>
-
-	* gui/dialogs/meeting-page.c (button_press_event): convert menu to
-	epopup.
-
-2004-10-12  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-calendar-table.c (setup_popup_icons): removed.
-	(e_calendar_table_show_popup_menu): convert to use e-popup for
-	pluggable popup menu.
-	(e_calendar_table_on_open_task, e_calendar_table_on_save_as)
-	(e_calendar_table_on_print_task, e_calendar_table_on_cut)
-	(e_calendar_table_on_copy, e_calendar_table_on_paste)
-	(e_calendar_table_on_assign, e_calendar_table_on_forward)
-	(delete_cb):
-	(mark_as_complete_cb, open_url_cb): convert to epopup callbacks.
-	Moved all of the callbacks above the table rather than maintaining
-	forward declarations for some of them.
-
-	* gui/e-cal-popup.c (e_cal_popup_target_new_select): add the task
-	required masks, and make one vs many mutally exclusive.
-
-	* gui/e-calendar-view.c (e_calendar_view_create_popup_menu):
-	copy/setup the event list here.
-
-	* gui/e-cal-popup.c (e_cal_popup_target_new_select): take model +
-	events rather than the calendar view.
-
-2004-10-12  Li Yuan  <li.yuan@sun.com>
-
-	* gui/calendar-commands.c:
-	(calendar_get_text_for_folder_bar_label):
-	When the start year and the end year are the same, the num should
-	be displayed in start time.
-	* gui/dialogs/alarm-dialog.glade:
-	Add names to comboxes in alarm-dialog page.
-	* gui/dialogs/cal-prefs-dialog.glade:
-	Add labbled_by relation for e_date_edit.
-	Add names to comboxes in general tab and display tab.
-	Add shortcut keys to start_of_day_label and end_of_day_label.
-	* gui/dialogs/event-page.c: (init_widgets):
-	Use the default text_buffer of gtk_text_view instead of
-	creating one.
-	* gui/dialogs/event-page.glade:
-	Add labbled_by relation for e_date_edit.
-	* gui/dialogs/meeting-page.glade:
-	Set an atk name for organizer widget.
-	* gui/dialogs/task-page.c: (init_widgets):
-	Use the default text_buffer of gtk_text_view instead of
-	creating one.
-	* gui/dialogs/task-page.glade:
-	Add labbled_by relation for e_date_edit.
-	Add a11y names to task description and categories.
-	* gui/e-alarm-list.c: (e_alarm_list_iter_n_children):
-	Remove the iter checker. The iter can't have a valid value at this time.
-	* gui/e-date-time-list.c: (e_date_time_list_iter_n_children):
-	Remove the iter checker. The iter can't have a valid value at this time.
-	* gui/e-meeting-time-sel.c: (e_meeting_time_selector_construct):
-	Add labbled_by relation for e_date_edit.
-	* gui/e-timezone-entry.c: (e_timezone_entry_class_init),
-	(e_timezone_entry_init), (e_timezone_entry_mnemonic_activate),
-	(e_timezone_entry_focus):
-	Add a focus handler for e-timezone-entry. Set an atk name for the
-	button.
-	* gui/e-week-view.c: (e_week_view_do_cursor_key_up),
-	(e_week_view_do_cursor_key_down), (e_week_view_do_cursor_key_left),
-	(e_week_view_do_cursor_key_right), (e_month_view_do_cursor_key_up),
-	(e_month_view_do_cursor_key_down),
-	(e_month_view_do_cursor_key_left),
-	(e_month_view_do_cursor_key_right):
-	Emit the selected_time_changed signal after the selection day changed.
-
-2004-10-11  Not Zed  <NotZed@Ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (tray_icon_clicked_cb): convert
-	to epopup.
-	(add_popup_menu_item): removed, now redundant.
-
-2004-10-08  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #45951
-
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/task-page.glade: attach the description field correctly
-	to the table so that it scrolls correctly instead of making the dialog
-	bigger as you write.
-
-	* gui/dialogs/comp-editor.c (setup_widgets): no need to create an extra
-	GtkVBox, just use the GtkDialog's one.
-
-2004-10-07  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/cal-prefs-dialog.c: remove useless include
-
-	* gui/dialogs/url-editor-dialog.c: ditto
-	
-2004-10-07  JP Rosevear  <jpr@novell.com>
-	
-	* gui/print.c: guard config.h
-
-	* gui/tasks-control.c: guard config.h, remove useless include
-
-	* gui/migration.c: remove useless include
-
-	* gui/main.c: remove useless include
-
-	* gui/e-calendar-view.h: #define the type
-
-	* gui/calendar-offline-handler.c: remove useless include
-
-	* gui/calendar-config.c: tidy header
-
-2004-10-07  JP Rosevear  <jpr@novell.com>
-	
-	* gui/calendar-commands.c: guard config.h include, kill warning
-	and remove useless include
-
-2004-10-06  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #65932
-
-	* common/authentication.c: keep a hash table of all the source lists.
-	(auth_new_cal_from_uri): do a search in the source list for the given
-	URI, and use that ESource if we find it. Also, keep the hash table of
-	source lists up to date.
-
-	* gui/comp-editor-factory.c (cal_opened_cb): don't assert on error
-	cases, just display an error dialog.
-
-2004-10-06  Not Zed  <NotZed@Ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_popup): rename to
-	view_popup_factory.  Make it build an epopup item list directly.
-	Can't re-use the galview cruft :-/
-	(gnome_calendar_discard_view_popup): no longer needed.
-	(gc_set_view, gc_save_custom_view, gc_define_views_response) 
-	(gc_define_views): implement the gal-view popup menu items.
-
-	* gui/gnome-cal.h:
-	* gui/e-week-view.h:
-	* gui/e-day-view.h:
-	* gui/e-cal-list-view.h: removed old e-popup-menu header.
-
-	* gui/e-calendar-view.c (setup_popup_icons): removed.
-	(e_calendar_view_create_popup_menu): converted to use e-popup.
-	(on_paste, on_copy, on_cut, on_delete_occurrence) 
-	(on_unrecur_appointment, on_delete_appointment, on_publish) 
-	(on_forward, on_meeting, on_move_to, on_copy_to, on_print_event) 
-	(on_save_as, on_print, on_edit_appointment, on_goto_today) 
-	(on_goto_date, on_new_task, on_new_meeting, on_new_event) 
-	(on_new_appointment): convert to use e-popup stuff.
-
-	* gui/tasks-component.c (popup_event_cb): e-popup api changes.
-
-	* gui/e-cal-popup.c (e_cal_popup_target_new_select): implement the
-	selection target.
-	(ecalp_target_free): and free it.
-
-	* gui/e-cal-model.h: Make the ECalModel struct non-anonymous so it
-	can be forward-declared.
-
-	* gui/calendar-component.c (popup_event_cb): e-popup api changes.
-
-2004-10-06  Rodrigo Moya <rodrigo@novell.com>
-
-	Revert fix for #60551
-
-	* gui/dialogs/task-page.c (task_page_fill_component): start date
-	can be after the due date, no need to compare.
-
-2004-10-02  Iván Frade <frade@asturlinux.org>
-
-	Fixes #48116
-
-	* gui/dialogs/task-details.page.c (task_details_page_fill_component):
-	Validation: completed date is not a future date.
-	
-2004-10-01  Not Zed  <NotZed@Ximian.com>
-
-	* gui/tasks-component.c (create_component_view): cast warning
-	away.
-	(create_component_view): connect to popup_event rather than
-	fill_popup_menu.
-
-	* gui/calendar-component.c (create_component_view): cast a warning
-	away.
-
-	* calendar-errors.xml: add prompt-delete-task-list.
-
-	* gui/tasks-component.c (fill_popup_menu_cb): renamed to
-	popup_event_cb, make use e-cal-popup.
-	(edit_task_list_cb, new_task_list_cb, delete_task_list_cb) 
-	(copy_task_list_cb): deja-vu.  update for api.
-	(add_popup_menu_item): killed. murdered. drawn and quatered.
-	(delete_task_list_cb): use e-error for the delete prompt.
-
-	* gui/calendar-component.c (create_component_view): hook onto
-	popup event instead of fill_popup_menu.
-
-	* calendar-errors.xml: added prompt-delete-calendar.
-
-	* gui/calendar-component.c (fill_popup_menu_cb): rename to
-	popup_event_cb, make use e-cal-popup.
-	(edit_calendar_cb, new_calendar_cb, delete_calendar_cb) 
-	(copy_calendar_cb): fix for api changes.
-	(add_popup_menu_item): removed.
-	(delete_calendar_cb): use e-error for the delete thing.
-
-	* gui/e-cal-popup.[ch]: calendar popup driver.
-
-2004-09-29  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #64683
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct): create
-	a scrolled window for the attendees list, and synchronize it with the
-	scrolling in the F/B area.
-
-2004-09-28  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #66736.
-
-	* gui/e-itip-control.c (e_itip_control_set_data): noop if we were
-	destroyed (priv == null).
-
-2004-09-28  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #61766
- 	
- 	* gui/migration.c (create_calendar_contact_source): set a color
- 	for the contacts
- 	(create_calendar_sources): set a color for the personal source and
- 	make in primary and default if nothing else is either
- 	(create_task_sources): ditto for tasks personal source
-	
-2004-09-24  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #65599
-
-	* gui/itip-utils.c (comp_fb_normalize): don't use NULL properties.
-
-	* gui/e-pub-utils.c (e_pub_publish): use auth_new_cal_from_source()
-	instead of auth_new_cal_from_uri().
-
-2004-09-24  JP Rosevear  <jpr@novell.com>
-
-	Fixes #64955, Vincent Noel <vnoel@cox.net>
-	
-	* libecal/e-cal.c (e_cal_get_alarms_in_range): fix c99-ism
-
-2004-09-24  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #66344
- 
- 	* gui/e-cal-model-calendar.c (get_dtend): check for existence of
- 	property and null time instead of sending through bad data
- 
- 	* gui/e-cal-model.c (get_dtstart): ditto
- 
- 	* gui/e-cal-model-tasks.c (get_completed): ditto
- 	(get_due): ditto
-
-2004-09-24  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #63513
-	* gui/e-itip-control.c
-	(ok_clicked_cb): Now the myaddress can be set to ecal address
-	since ok will be sentized only when ecal is loaded.
-
-2004-09-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/calendar-component.c (fill_popup_menu_cb): ditto
-
-	* gui/tasks-component.c (fill_popup_menu_cb): don't allow a delete
-	of the system calendar
-
-2004-09-21  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #60904
- 	
- 	* gui/gnome-cal.c (set_week_start): update the view
- 	(get_times_for_views): mimic the work week guessing code exactly
- 	for calculating the time range needed instead of hardcoding 5 days
- 	(set_working_days): new routine to update the view
- 	(working_days_changed_cb): use above when getting config change
- 	notification
- 	(setup_config): set working days and add notification
-	
-2004-09-21  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #66158
- 	
- 	* gui/e-cal-model-tasks.c (e_cal_model_tasks_mark_task_complete):
- 	notify of change so completion status updates immediately
-	
-2004-09-21  JP Rosevear  <jpr@novell.com>
- 
-	Fixes #59194
- 	
- 	* gui/e-cal-model-calendar.c (get_location): return "" instead of
- 	NULL
-	
-2004-09-21  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #65682
-	* gui/itip-utils.c 
-	(itip_send_comp): check the static capability before
-	booking the deletion.
-
-2004-09-15  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #55172
- 	
- 	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
- 	handle -1 (last) for monthly recurrences and check both by_set_pos
- 	and by_day since either can indicate this type of recurrence
-	
-2004-09-20  Tony Tsui <ttsui9@gmail.com>
-
-	Fixes #66174
-
-	* gui/dialogs/meeting-page.c (existing_attendee): fixed memory leak.
-
-2004-09-10   Hannah & Fazlu <hannah_lins@yahoo.co.in>
-
-	Fixes bug #65051
-
-	* calendar/gui/dialogs/task-page.c (task_page_fill_component):
-	Compared the dates and time
-
-2004-09-10  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #62374
-
-	* gui/alarm-notify/alarm-queue.c (load_missed_alarms): removed this
-	function.
-	(cal_opened_cb): no need to call load_missed_alarms,
-	load_alarms_for_today will do everything.
-	(alarm_queue_add_client): ditto.
-	(load_alarms_for_today): take into account the last saved notification
-	time.
-	(load_alarms): unref the previous query, this function should now
-	only be called once per time range.
-
-2004-09-09  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #65454
- 	
- 	* gui/e-itip-control.c (class_init): only use a destroy function,
- 	no finalize
- 	(cleanup_ecal): util function
- 	(init): use above for hash table and killed destroyed flag
- 	(weren't using it anywhere)
- 	(destroy): collapse finalize work into here and guard against
- 	multiple destroy calls
-
-2004-09-08  JP Rosevear  <jpr@novell.com>
-
-	Fixes #62728
-	
-	* gui/e-week-view.c (e_week_view_set_week_start_day): trigger a
-	redraw when changing the start day
-
-2004-09-05  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-calendar-table.c
-	(e_calendar_table_show_popup_menu): Check the
-	static capability to enable or disable the assign
-	tasks in the popup menu.
-
-	* gui/dialogs/recurrence-page.c
-	(sensitize_buttons): Check for the static capability
-	to convert a existing appointment to recurrence appointment
-	for enabling or diabling the recurrence widgets.
-
-2004-08-31  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #62392
-
-	* gui/alarm-notify/alarm-queue.c (display_notification): ref the
-	client's query object so that it doesn't disappear on us.
-	(tray_icon_destroyed_cb): unref the query previously ref'ed.
-
-2004-08-31  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model-tasks.c: include missing string.h, to avoid
-	problems in 64 bit builds.
-	
-2004-08-27  Not Zed  <NotZed@Ximian.com>
-
-	* common/authentication.c (auth_func_cb): constify the strings to
-	remove a warning.
-
-	** See bug #64856 (workaround).
-
-	* common/authentication.c (auth_func_cb): 
-	* gui/e-pub-utils.c(e_pub_publish): add ONLINE flag to password
-	request.
-
-2004-08-28  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-itip-control.c (rsvp_clicked_cb): get the active state
-	(insert_rsvp): set inital rsvp state
-
-	* gui/alarm-notify/alarm-queue.c (alarm_queue_add_client): load
-	immediately if they are loaded
-
-2004-08-27  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/alarm-notify/alarm-queue.c (load_alarms): use the
-	new 'has-alarms-in-range' query.
-	(alarm_queue_add_client): make sure we don't add twice the same alarm.
-
-2004-08-27  JP Rosevear  <jpr@novell.com>
-
-	Fixes #62911, #54101
-	
-	* gui/e-itip-control.c (set_ok_sens): util routine to set
-	sensitivity of OK button
-	(cal_opened_cb): cal back when calendar opens, sensitize ok button
-	(start_calendar_server): open async and take call back arg
-	(source_selected_cb): desensitize ok button until calendar is
-	loaded
-	(find_cal_opened_cb): check to see if the calendar contains the
-	object we are looking for, if none do show the source selector
-	option menu
-	(find_server): search async for the server
-	(destroy): clean up html widget
-	(finalize): instead of here
-	(get_publish_options): use only object tag
-	(get_request_options): ditto
-	(get_request_fb_options): ditto
-	(get_reply_options): ditto
-	(get_refresh_options): ditto
-	(get_cancel_options): ditto
-	(show_current_event): use new options, remove groupwise NEEDS
-	ACTION check, handle async loading
-	(show_current_todo): use new options, handle async loading
-	(option_activated_cb): record action
-	(add_option): add action item
-	(insert_boxes): layout widgets
-	(insert_label): insert label
-	(rsvp_clicked_cb): record rsvp status
-	(insert_rsvp): insert rsvp check box
-	(insert_ok): insert ok button
-	(publish_options_object): spit out relevant options
-	(request_options_object): ditto
-	(freebusy_options_object): ditto
-	(reply_options_object): ditto
-	(refresh_options_object): ditto
-	(cancel_options_object): ditto
-	(object_requested_cb): handle object requests
-	(ok_clicked_cb): use recorded actions
-
-2004-08-27  JP Rosevear  <jpr@novell.com>
-	
-	* gui/alarm-notify/alarm-notify.h: update proto
-
-	* gui/alarm-notify/alarm-notify.c (list_changed_cb): use per
-	source type client hash
-	(alarm_notify_init): ditto
-	(alarm_notify_finalize): ditto
-	(cal_opened_cb): ditto
-	(alarm_notify_add_calendar): ditto
-	(alarm_notify_remove_calendar): ditto, take source_type arg
-	(load_calendars_cb): don't call list_changed if the source list is
-	NULL
-	
-2004-08-26  Christian Neumair  <chris@gnome-de.org>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in:
-	Don't mark component menu accels for translation.
-
-2004-08-25  JP Rosevear  <jpr@novell.com>
-
-	* conduits/todo/todo-conduit.c (for_each): prepare the local
-	record correctly, should fix copy to/from problems when syncing
-
-	* conduits/calendar/calendar-conduit.c (for_each): ditto
-
-2004-08-25  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* gui/dialogs/recur-comp.c: (recur_component_dialog):
-	Don't call gtk_dialog_set_has_separator on Gtk Message Dialog
-        with GTK+ >= 2.4.0.
-
-2004-08-25  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-tasks.c
-	(default_client_cal_opened_cb): Reset the Status Bar message to
-	NUll, if the status of the Calendar is returned OK.
-
-2004-08-24  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #58824
-
-	* gui/gnome-cal.c (open_ecal): Only try to open the calendar if not
-	loaded yet.
-	(update_query, client_cal_opened_cb, default_client_cal_opened_cb,
-	backend_died_cb): use always the same view for status messages.
-	(gnome_calendar_set_activity_handler): set the activity handlers on
-	all views, not just the current one.
-	(display_view): no need to set the activity handler here.
-
-2004-08-13  Jeffrey Stedfast  <fejj@novell.com>
-
-	* gui/dialogs/event-page.glade: Make the description scrolled
-	window scroll policy "automatic" rather than "never". Fixes bug
-	#62063.
-
-2004-08-18  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm-notify_init) :
-	initialize the mutext needed to prevent concurrect access 
-	priv->uri_clients_hash. Also install a timeout handler for
-        loading sources which requires  auth later
-	(alarm_notify_finalize) : free the new mutex
-	(load_calendars_cb) : call back which adds sources again after
-	one minute
-	(alarm_notify_add_calendar) : lock ad unlock the new mutex
-	before and after accessing uri_clients_hash  
-
-2004-08-16  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #62706
-	
-	* gui/e-cal-model.c (e_cal_model_set_timezone): set the default
-	timezone on the server
-
-2004-08-16  Sivaiah Nallagatla <snallagatla@novell.com>
-	
-	* gui/alarm-notify/alarm-notify.h : change the prototype of 
-	alarm_notify_add_calendar to take Esource instead of uri 
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar) :
-	use auth_new_cal_from_source instead of _from_uri to create cal
-	client also do not try to load the cal backend which require auth
-	and for which there is no password availble in e-password seesion
-        (list_changed_cb) (load_calendars) : pass Esource insted of uri to
-	alarm_notify_add_calendar
-	 
-2004-08-14  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gui/e-tasks.c (e_tasks_init) : initialize priv->default_lcient
-        (default_client_cal_opened_cb) : unref priv->default_client and
-	make it NULL
-	(client_cal_opened_cb) : don't unref client explicitly as removing
-	from priv->clients already does that.  Remove client based on uid
-	instead of uri
-	(backend_died_cb) : Remove client based on uid insted of uri Fixes
-	#62869
-
-2004-08-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/calendar-setup.glade: make the button say Add Task
-	List instead of Add Group (matches menu item)
-
-2004-08-12  Carlos Garnacho Parro  <carlosg@gnome.org>
-
-	* gui/dialogs/alarm-dialog.glade: added the property
-	"use_filechooser" to the GnomeFileEntry
-
-2004-08-10  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-pub-utils.c (e_pub_publish): 
-	* common/authentication.c (auth_func_cb): epasswords api change.
-
-2004-08-11  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #61555
-	
-	* gui/dialogs/meeting-page.c (existing_attendee): check if an
-	attendee was pre-existing
-	(remove_attendee): only add the attendee to the cancel comp if it
-	was pre-existing
-
-2004-08-10  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (e_cal_model_set_search_query): guard against
-	re-running the same query.
-
-2004-08-10  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/alarm-notify/alarm-queue.c (tray_icon_destroyed_cb): disconnect
-	from signals also when using only the system tray. Fixes a crash when
-	removing an event that had an alarm popup recently.
-
-2004-08-09  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-calendar-view.c: re-added 'Make this occurrence movable' menu
-	item, gone by mistake.
-	(on_unrecur_appointment): new callback for the new menu item.
-
-2004-08-06  JP Rosevear  <jpr@ximian.com>
- 
-	Fixes #62452
- 	
-	* gui/e-itip-control.c (find_my_address): take option to retrieve
-	current status as well, actually look for the delegator in the
-	list so we can retrieve status there as well
-	(show_current_event): use find_my_address to get the status so we
-	properly handle not finding the address in the list of attendees
-	(show_current): pass extra param
-	(ok_clicked_cb): ditto
-
-2004-08-06  JP Rosevear  <jpr@ximian.com>
- 
-	Fixes #62021
- 	
-	* gui/dialogs/event-page.c (source_changed_cb): set the default
-	timezone
- 
-	* gui/e-itip-control.c (start_calendar_server): set the default
-	timezone
- 
-	* gui/calendar-component.c (setup_create_ecal): set the default
-	timezone, as the component view is not alive and hence has not set
-	it
-
-	* gui/tasks-component.c (setup_create_ecal): ditto
-
-2004-08-05  Parthasarathi S A   <sparthasarathi@novell.com>
-
-	Fix for bug #61673.
-	* calendar/gui/dialogs/save_comp.c(save_component_dialog):
-	  The function takes two arguments now, instead of one. The second
-	  argument is the pointer to the ECalComponent from which the component
-	  type can be determined. Based on the component type the corresponding
-	  error message is displayed.
-	* calendar/gui/dialogs/save_comp.h:
-	  Function definition updated for save_component_dialog.
-	* calendar/gui/dialogs/comp_editor.c(prompt_to_save_changes):
-	  passing the ECalComponent pointer to the 'save_component_dialog' function
-	* calendar/calendar-errors.xml: New error message string for task included
-	* calendar/calendar-errors.xml.h
-
-2004-08-05  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #62030
-
-	* gui/alarm-notify/alarm-queue.c (tray_icon_destroyed_cb):
-	only remove the tray icon blinking timeout if we installed
-	it.
-	(display_notification): only install the tray icon blinking
-	timeout if using the system tray.
-	(tray_icon_blink_cb): use g_object_unref instead of the
-	deprecated gdk_pixbuf_unref.
-
-	* gui/alarm-notify/alarm.c (alarm_add): added missing argument
-	documentation.
-
-2004-08-03  JP Rosevear  <jpr@novell.com>
- 
-	* gui/gnome-cal.c (gnome_calendar_destroy): clean up all the
- 	default clients
- 	(default_client_cal_opened_cb): change the if statement to a
- 	switch to be consistent with the other code bits and set the
- 	default client for the source type
- 	(gnome_calendar_add_source): look at the default based on the
- 	source type
- 	(gnome_calendar_set_default_source): set the default for the
- 	source type
- 	(gnome_calendar_new_task): bail out if we have no ecal
- 
-	* gui/gnome-cal.c (set_timezone): set the timezone for all the
- 	default clients
- 
-	* gui/calendar-component.c (update_primary_task_selection): look
-	in the task source list, not the plain source list
-	
-2004-08-05  JP Rosevear  <jpr@novell.com>
-
-	* gui/tasks-control.c (tasks_control_sensitize_commands): kill
- 	warning by checking if there is a default client first (can happen
- 	when first starting up)
-	
-2004-08-05  JP Rosevear  <jpr@novell.com>
-
-	Fixes #62363
-	
-	* gui/calendar-component.c (create_new_event):
-	commit the sequence
-
-2004-08-04  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/e-itip-control.c: (ok_clicked_cb): Handle decline request by
-	using update_item rather than remove_item, so the backend receives
-	the notification and can handle it. Also, do not rsvp if the backend
-	has the 'save_schedule' capability.
-
-2004-08-01  JP Rosevear  <jpr@novell.com>
- 
- 	* conduits/todo/todo-conduit.c (todoconduit_load_configuration):
- 	get source list and source
- 	(todoconduit_dupe_configuration): copy source list and source
- 	(todoconduit_destroy_configuration): unref source list and source
- 	(start_calendar_server): open the source that was set earlier
- 	(fill_widgets): set the source option menu value
- 	(create_settings_window): pass source list to pilot settings
- 	(save_settings): mark source with pilot-sync property
-
- 	* conduits/calendar/calendar-conduit.c: as above
- 	
- 	* conduits/todo/Makefile.am: link to and include misc. widgets
- 
- 	* conduits/calendar/Makefile.am: ditto	
-	
-2004-07-30  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #57622
-
-	* gui/e-cal-model.h: added ECalModelFlags enum type.
-
-	* gui/e-cal-model.c (e_cal_model_set_flags, e_cal_model_get_flags):
-	new functions.
-	(e_cal_model_init): initialize the new internal field to keep the flags.
-	(e_cal_view_objects_added_cb): expand recurrences if the model flags
-	contain the EXPAND_RECUR bit.
-	(e_cal_view_objects_modified_cb): if EXPAND_RECUR is on, remove all
-	recurrences and regenerate them.
-	(e_cal_view_objects_removed_cb): remove all instances for given UIDs.
-	(add_new_client): killed warning.
-	(get_dtstart): use the instance_start time when dealing with recurrences.
-
-	* gui/e-cal-model-calendar.c (get_dtend): use the instance_end time
-	when dealing with recurrences.
-
-	* gui/e-cal-list-view.c (e_cal_list_view_new): set the EXPAND_RECUR
-	flag on the model for the list view.
-
-	* gui/e-week-view.c (e_week_view_add_event):
-	* gui/e-day-view.c (e_day_view_add_event): fill in the instance's
-	start and end times in the ECalModelComponent struct.
-
-	* gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence):
-	use the instance_start field to retrieve the RECUR-ID, now that all the
-	views fill it in.
-
-2004-07-29  JP Rosevear  <jpr@novell.com>
- 
- 	* gui/e-calendar-view.c: creating new items no longer needs to be
- 	disabled since the user can switch to a writable calendar and the
- 	editor ui is disabled properly
-	
-2004-07-31  JP Rosevear  <jpr@novell.com>
- 
- 	* gui/dialogs/event-editor.c (show_meeting): use Invitations not
- 	Meetings
- 	(event_editor_edit_comp): ditto
-	
-2004-07-31  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-day-view.c (e_day_view_finish_long_event_resize): guard
-	with is_instance instead of has_recurrences because most of the
-	backends don't support this yet
-	(e_day_view_finish_resize): ditto
-	(e_day_view_change_event_time): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-	* gui/e-week-view.c (e_week_view_change_event_time): ditto
-	(e_week_view_on_editing_stopped): ditto
-	
-2004-07-30  Harish Krishnaswamy  <kharish@novell.com>
-	
-	* gui/e-tasks.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb):
-	* gui/gnome-cal.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb):
-	Handle E_CALENDAR_STATUS_BUSY conditions and do not 
-	remove the source from the gnome-calendar. The fix
-	for #59335 exposed this problem.
-
-2004-07-28  Larry Ewing  <lewing@novell.com>
-
-	* gui/dialogs/calendar-setup.c (dialog_hide_unused_options): hide
-	dialog items that don't apply when editing properties.
-	(general_update_dialog): check to make sure we have a source
-	before checking its state.
-
-2004-07-27  JP Rosevear  <jpr@novell.com>
-
-	Fixes #62006
-	
-	* gui/e-cal-model.c (add_new_client): don't load the events if we
-	are already doing the query
-
-2004-07-25  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #61058
- 	
- 	* gui/e-week-view.c (process_component_recur_cb): add but don't
- 	prepend
- 	(process_component): use above as call back so we can pass the
- 	prepend bool
- 	(e_week_view_add_event): take a prepend bool and prepend to the
- 	events array if asked so the event will be shown first when drawn
- 	(e_week_view_do_key_press): If the event can't be fit on the
- 	screen, ie not even one event can be shown in the day, don't try
- 	to edit it
-	
-2004-07-26  Rodney Dawes  <dobey@novell.com>
-
-	* gui/dialogs/event-page.glade: Fix mnemonic for "Location" to not
-	be duplicated with "OK"
-
-	* gui/dialogs/meeting-page.c (get_widgets): Get the "Attendees" label
-	(meeting_page_construct): Fix padding of GtkScrolledWindow widget
-	Set the mnemonic widget for the "Attendees" label
-
-	* gui/dialogs/meeting-page.glade: Fix HIG spacing to be correct
-	Fix the mnemonic for "Organizer" to not conflict
-	Add mnemonic for "Attendees"
-
-	* gui/dialogs/task-page.glade: Add mnemonic for "Description"
-
-2004-07-26  JP Rosevear  <jpr@novell.com>
- 
- 	* gui/dialogs/calendar-setup.c (calendar_setup_edit_calendar): set
- 	a different title if we are editing; de-sensitize option menu if
- 	we are editing
- 	(calendar_setup_edit_task_list): set a different title if we are editing
- 
- 	* gui/dialogs/calendar-setup.glade: use task list instead of tasks
- 	group
- 
- 	* gui/tasks-component.c (impl__get_userCreatableItems): add
- 	assigned task as an item, use task list instead of tasks group
- 
- 	* gui/calendar--component.c (impl__get_userCreatableItems): fiddle
- 	with shortcuts
-	
-2004-07-25 pchenthill <pchenthill@novell.com>
-
-	Fixes #59983
-	If the ecal component is already loaded, check for the participation 
-	status of the attendee and display the menu for selecting the 
-	calendar.
-
-2004-07-23  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #61571
- 	
- 	* gui/e-week-view.c (e_week_view_start_editing_event): if the
- 	event moves, find it again using the model data as the invariant
- 	and then find the span again
-	
-2004-07-23  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #61760
- 	
- 	* gui/e-cal-model.c (add_new_client): don't check against the URI,
- 	just against the client
- 
-2004-07-23 pchenthill <pchenthill@novell.com>
-
-	* Retracting the commit made below for #59983 as it has
-	results in crash some cases
-
-2004-07-23 pchenthill <pchenthill@novell.com>
-
-        Fixes #59983
-        * gui/e-itip-control.c (show_current_event):
-        If the ecal component is already loaded, check for the participation
-        status of the attendee and display the menu for selecting the
-        calendar.
-
-2004-07-22  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
-	fix the row heights and tweek the offsets so that things come out
-	OK.
-
-2004-07-21  JP Rosevear  <jpr@novell.com>
- 
-  	Fixes #61776
-		
- 	* gui/e-calendar-table.c (clipboard_get_text_cb): make sure the
- 	text is not NULL
-	
-2004-07-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61738
-	
-	* gui/dialogs/meeting-page.c (clear_widgets): by default we have a
-	user as organizer
-	(sensitize_widgets): use user_org to determine widget sensitivity
-	(meeting_page_fill_widgets): set user_org value appropriately
-	(change_clicked_cb): set user_org to TRUE
-
-2004-07-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61779
-	
-	* gui/dialogs/task-page.c (init_widgets): listen for changes on
-	start and due dates
-
-	* gui/dialogs/task-details-page.c (init_widgets): listen for
-	changes on completion date
-
-2004-07-20  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-cal-model.c: 
-	* importers/icalendar-importer.c: 
-	* gui/dialogs/select-source-dialog.c: 
-	* gui/dialogs/copy-source-dialog.c: 
-	* gui/alarm-notify/util.c: 
-	* common/authentication.c: 
-	* gui/migration.c: include config.h.  See #61395.
-
-2004-07-16  JP Rosevear  <jpr@novell.com>
-
-	Fixes #61451
-
-	* gui/e-itip-control.c (get_cancel_options): don't give a cancel
-	option if the event is no where to be found
-	(show_current_event): pass in kind
-	(show_current_todo): ditto
-
-2004-07-16  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
-	fix the row heights and tweek the offsets so that things come out
-	OK.
-
-2004-07-16  Larry Ewing  <lewing@ximian.com>
-
-	* gui/calendar-component.c (set_info): use short month forms to
-	limit the maximum width of the label.
-
-2004-07-15  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #57142
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): commit the
-	sequence on the object before sending it to the backend.
-	(e_day_view_add_event): s/abort_sequence/commit_sequence.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): commit the
-	sequence here also.
-	(e_week_view_add_event): s/abort_sequence/commit_sequence.
-
-	* gui/comp-util.c (cal_comp_event_new_with_current_time): don't
-	commit the sequence here.
-
-2004-07-14  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #61572
- 	
- 	* gui/dialogs/schedule-page.c (times_changed_cb): call notify
- 	changed
- 
- 	* gui/dialogs/comp-editor.c (page_summary_changed_cb): no need to
- 	mark the editor changed here, it doesn't do the right thing anyhow
- 	(page_dates_changed_cb): ditto
- 	
-2004-07-14  JP Rosevear  <jpr@novell.com>
-
-	Fixes #60678
-	
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): flip the
-	messages around, the "deleting" flag means something else is doing
-	the deleting
-
-2004-07-12  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #57287, 58748
- 	
-	* gui/tasks-component.c (source_added_cb): if the source was
- 	added in the main calendar, select it because the user caused this
- 	to happen by creating a task
- 	(create_component_view): listen for source_added signal on the
- 	tasks
- 
- 	* gui/gnome-cal.c (view_selection_changed_cb): if the user created
- 	a task, make sure we are displaying the relevant event list
- 	(set_timezone): set the default zone of the default client
- 	(setup_widgets): listen for the user_created signal
- 	(gnome_calendar_destroy): clean up default client
- 	(client_cal_opened_cb): disconnect from the open signal
- 	(default_client_cal_opened_cb): set the default client on the
- 	models
- 	(open_ecal): make the callback function a param
- 	(gnome_calendar_add_source): include the default client when
- 	searching for an existing client
- 	(gnome_calendar_set_default_source): make the default client
- 	independent of the rest of the clients
- 
- 	* gui/e-week-view.c (e_week_view_on_editing_stopped): emit
- 	user_created signal
- 
- 	* gui/e-tasks.c (user_created_cb): if the user created a task,
- 	make sure we are displaying the relevant task list
- 	(set_timezone): set the timezone on the client
- 	(setup_widgets): listen for user_created signal
- 	(e_tasks_destroy): unref default client
- 	(default_client_cal_opened_cb): set the default on the model when
- 	it opens
- 	(open_ecal): open a task list
- 	(e_tasks_add_todo_source): include the default client when
- 	searching for an existing client
- 	(e_tasks_set_default_source): make the default client independent
- 	of the rest of the clients
- 
- 	* gui/e-day-view.c (e_day_view_on_editing_stopped): emit
- 	user_created signal
- 
- 	* gui/e-calendar-view.h: add signal proto
- 
- 	* gui/e-calendar-view.c (e_calendar_view_class_init): add
- 	user_created signal
- 
- 	* gui/e-calendar-table.h: add signal proto
- 
- 	* gui/e-calendar-table.c (e_calendar_table_class_init): add
- 	user_created signal
- 	(row_appended_cb): if row is appended, emit user_created signal
- 	(e_calendar_table_init): listen for row_appended signal
- 
- 	* gui/e-cal-model.h: add signal proto
- 
- 	* gui/e-cal-model.c (e_cal_model_class_init): add row_appended
-	signal
- 	(ecm_append_row): don't leak, emit row appended signal
- 	(e_cal_model_set_default_client): remove the existing default if
- 	it was only used as the default
- 	(update_e_cal_view_for_client): short circuit query create
- 	(add_new_client): look for an existing client and update its
- 	record if found, handle opening things here
- 	(e_cal_model_add_client): just call add_new_client
- 	(remove_client_objects): just remove a client's objects
- 	(remove_client): use above, handle removal of client if its
- 	default
- 
- 	* gui/calendar-component.c (source_added_cb): if the source was
- 	added in the main calendar, select it because the user caused this
- 	to happen by creating an appointment
- 	(create_component_view): listen for source_added signal on the
- 	calendar
-	
-2004-07-08  Radek Doulik  <rodo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_date_value_to_string): as below
-
-	* gui/e-cal-model-calendar.c (ecmc_value_to_string): as below
-
-	* gui/e-cal-model.c (ecm_value_to_string): as below
-
-	* gui/e-cal-model-tasks.c (ecmt_value_to_string): dup the string
-	value, it's free-ed later. instead of returning NULL return
-	g_strdup ("") as gal does
-
-	Fixes #56271
-
-2004-07-12  Rodney Dawes  <dobey#novell.com>
-
-	* gui/e-tasks.c (pane_realized): Add this callback so we can set the
-	paned position on realize
-	(setup_widgets): Move the paned widget to the priv structure so that
-	we can access it elsewhere
-	(display_view_cb): Set the paned position when the view gets displayed
-
-	Fixes #55653
-
-2004-07-12  Rodney Dawes  <dobey@novell.com>
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog):
-	Update the layout of the dialog to be more usable
-
-	Partially fixes #56171
-
-2004-07-11  Jürg Billeter <j@bitron.ch>
-
-	* gui/dialogs/event-page.c (event_page_fill_component):
-	busy should be opaque, not transparent
-
-2004-07-09  Rodrigo Moya <rodrigo@novell.com>
-
-	Revert my patches from July 5th and 6th.
-
-	* gui/gnome-cal.c (gnome_calendar_init): call setup_config/widgets
-	in the previous order.
-	(setup_widgets): set the timezone on the views when creating them.
-	(set_timezone): no need to set the timezone on the views here.
-	(client_cal_opened_cb): removed call to set_timezone().
-
-2004-07-09  Rodney Dawes  <dobey@novell.com>
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_triangle):
-	Add an argument for the event_num so we can get the event object
-	Draw the left/right triangles with the right color for the event
-	Fix a small alignment bug with the triangle points
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_triangle):
-	Draw the left/right triangles with the right color for the event
-	Fix a small alignment bug with the triangle points
-
-2004-07-09  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #60289
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog): set the
-	absolute URI on the selected source, so that the ESource we keep
-	around has a valid URI.
-
-	* gui/e-calendar-view.c (transfer_item_to): when copying appointments,
-	change the UID.
-	(transfer_selected_items): don't pass hardcoded values to transfer_item_to.
-
-2004-07-08  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* gui/Makefile.am:
-	tarball should ship .schemas.in.in files, not generated files.
-
-2004-07-06  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/gnome-cal.c (gnome_calendar_init): setup the widgets before
-	the configuration.
-
-2004-07-06  JP Rosevear  <jpr@novell.com>
-
-	Fixes #60645
-	
-	* gui/e-calendar-view.c (e_calendar_view_new_appointment_full):
-	guess when an item should be all day based on the selection time
-
-2004-07-05  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/gnome-cal.c (setup_widgets): don't set the timezone on the views
-	here.
-	(set_timezone): do it here.
-	(client_cal_opened_cb): call set_timezone() here.
-
-2004-07-02  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/gnome-cal.c (set_view): update the internal current_view_type
-	field and focus the newly selected view.
-
-2004-07-02  Rodney Dawes  <dobey@novell.com>
-
-	* gui/dialogs/url-editor-dialog.c (get_widgets):
-	Get the label for the calendar list header also
-	(init_widgets): Set the border widths for the dialog's vbox and
-	action area to be more compliant with the HIG
-	Set the mnemonic widget for the calendar label, to the Source Selector
-	Remove the unneeded settings for the scrolled window, these are in the
-	glade xml for the widget
-	Set the icon list on the correct dialog widget, not the settings dialog
-
-	* gui/dialogs/url-editor-dialog.h:
-	Add the calendar_list_label widget here so we can access it
-
-	* gui/dialogs/url-editor-dialog.glade:
-	Change the dialog's layout to be HIG compliant and fix some strings
-	to do the same
-	Add mnemonics to all the labels that are associated with widgets
-
-2004-06-29  Sivaiah Nallagatla <snallagatla@novell.com>
-
-        * gui/e-tasks.c (e_tasks_add_todo_source)
-         (e_tasks_remove_todo_source) : store and lookup  clients
-        based on ESource uid instead of uri in priv->clients
-
-2004-06-28  Not Zed  <NotZed@Ximian.com>
-
-	* gui/tasks-component.c (impl__get_userCreatableItems): same.
-
-	* gui/calendar-component.c (impl__get_userCreatableItems): fix up
-	shortcuts.  #56746.
-
-2004-06-25  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/alarm-dialog.glade: don't show option tabs
-
-2004-06-25  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/task-editor.c (task_editor_construct): use "Task"
-	instead of "Basic"
-
-	* gui/dialogs/event-editor.c (event_editor_construct): use
-	"Invitations" instead of "Meeting"
-
-2004-06-25  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/e-delegate-dialog.glade: use "Contacts..."
-
-	* gui/dialogs/alarm-dialog.glade: add custom message email toggle
-
-	* gui/dialogs/alarm-dialog.c (get_widgets): get custom email
-	message toggle
-	(check_custom_email): check the custom message when setting
-	sensitivity of OK button
-	(malarm_message_toggled_cb): check custom email
-	(malarm_description_changed_cb): ditto
-	(action_selection_done_cb): ditto
-
-2004-06-25  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/alarm-dialog.c (alarm_to_dialog): set the default
-	address here if possible
-	(dialog_to_alarm): don't set it here
-	(check_custom_email): check for To: entries
-	(malarm_addresses_changed_cb): update when the text in the to
-	entry changes
-	(action_selection_done_cb): for the custom email settings
-	(init_widgets): listen for email To: changes
-	(alarm_dialog_run): only save the alarm if the response was "OK"
-
-2004-06-25  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/event-page.c (event_page_init): init alarm interval
-	to -1
-	(clear_widgets): give the alarm time option menu a sensible
-	default
-	(is_custom_alarm): account for the user defined alarm time if it
-	doesn't match the default set
-	(event_page_fill_widgets): default the option menu to the 15
-	minute or user define alarm if no alarm is currently set
-	(event_page_fill_component): account for the user defined alarm
-	tme
-	(init_widgets): add in the user defined alarm time if it doesn't
-	match the default set
-
-2004-06-25  JP Rosevaer  <jpr@novell.com>
-
-	* gui/dialogs/alarm-dialog.c (palarm_widgets_to_alarm): the args
-	are optional, don't store them if they aren't there
-	(check_custom_sound): sensitize the ok button based on whether or
-	not there needs to be input
-	(check_custom_message): ditto
-	(check_custom_program): ditto
-	(dalarm_message_toggled_cb): check custom message
-	(dalarm_description_changed_cb): ditto
-	(aalarm_sound_toggled_cb): check custom sound
-	(aalarm_attach_changed_cb): ditto
-	(palarm_program_changed_cb): check custom program
-	(action_selection_done_cb): use above checks as appropriate
-	(init_widgets): listen for changed signals
-
-2004-06-25  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/event-page.c (event_page_finalize): free old_summary
-	(is_custom_alarm): take description into account when checking for
-	custom alarm
-	(is_custom_alarm_uid_list): pass old_summary
-	(is_custom_alarm_store): ditto
-	(is_custom_alarm_store): ditto
-	(sensitize_widgets): ditto
-	(event_page_fill_component): ditto
-	(event_page_fill_widgets): store the initial summary
-	(alarm_changed_cb): make sure the needs description property gets
-	set on the default alarm
-	(alarm_custom_clicked_cb): copy the current store in case the user
-	hits cancel, if all the alarms are erased uncheck the alarm toggle
-
-	* gui/dialogs/alarm-dialog.glade: add toggles for custom messages
-	and sound
-
-	* gui/dialogs/alarm-dialog.c (aalarm_widgets_to_alarm): store
-	custom sound only if the toggle is checked
-	(dalarm_widgets_to_alarm): store custom message only if toggle is
-	checked
-	(get_widgets): load new widgets
-	(aalarm_sound_toggled_cb): sensitize sound entry
-	(dalarm_message_toggled_cb): sensitize message entry
-	(init_widgets): listen for toggle signals
-
-2004-06-24  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/alarm-list-dialog.c (selection_changed_cb):
-	sensitize the buttons
-	(init_widgets): listen for selection changes so we can delete
-	alarms
-
-2004-06-24  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/event-page.c (event_page_fill_component): store all
-	the custom alarms
-	(alarm_custom_clicked_cb): emit changed signal if necessary
-
-	* gui/dialogs/alarm-list-dialog.c (alarm_list_dialog_run): return
-	true/false based on button pushed
-
-	* gui/dialogs/alarm-dialog.c: move repeat options and per alarm
-	type options here
-
-	* gui/dialogs/alarm-dialog.glade: ditto
-	
-	* gui/dialogs/Makefile.am: remove alarm options dialog
-
-2004-06-24  Rodney Dawes  <dobey@novell.com>
-
-	* gui/calendar-component.c (create_component_view):
-	* gui/tasks-component.c (create_component_view):
-	Add a call to e_source_selector_set_select_new here so that we can
-	select new sources when we create them
-
-2004-06-23  Jeffrey Stedfast  <fejj@novell.com>
-
-	* conduits/todo/todo-conduit.c: Bump the version to 0.1.5 to help
-	track down bug #59726.
-
-2004-06-23  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_init): set the window
-	type hint to normal so it can go below the shell window
-
-2004-06-23  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_notify_client_changed):
-	fixed gtk-doc comments and made it enable/disable the dialog's
-	OK button depending on the selected source.
-
-2004-06-23  Rodney Dawes  <dobey@novell.com>
-
-	* gui/calendar-component.c: Revert previous change to add the
-	callbacks for notification of calendar selection changes
-	(create_new_view): Update the comment for watching notification on
-	the tasks selection to state it is for the mini tasks view
-
-2004-06-23 JP Rosevear  <jpr@novell.com>
-
-	Fixes #57862
-	
-	* gui/gnome-cal.c (connect_day_view_focus): connect after the
-	focus events happen so the day view knows what is selected
-
-2004-06-23  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-itip-control.c (update_attendee_status): tidy up to work
-	again
-	(ok_clicked_cb): use above when replying
-
-2004-06-23  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/meeting-page.c (remove_attendee): util function to
-	do the actual removal
-	(remove_attendee_at_row): ditto based on row number
-	(remove_clicked_cb): make the remove button work
-	(popup_delete_cb): use utility routines to do removal
-	(button_press_event): do the icon properly
-
-2004-06-22  Rodney Dawes  <dobey@novell.com>
-
-	* gui/calendar-component.c (config_calendars_selection_changed_cb):
-	(config_primary_calendar_selection_changed_cb):
-	Add these two callbacks so that we can update the selection in the
-	calendar when the gconf key changes, like we do for tasks
-
-	(create_component_view): Register the two callbacks that we created
-	for updating the selection in the view, and their notification IDs
-
-
-2004-06-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	clean up mnemonic handling and put the proper icon in the contacts
-	button
-
-2004-06-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/recurrence-page.glade: fix mnemonics
-
-	* gui/dialogs/event-page.glade: ditto
-
-2004-06-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/comp-editor.c: kill warnings
-
-2004-06-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/calendar-component.c (create_new_event): kill warning
-
-2004-06-22  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/Makefile.am: removed alarm-page.*.
-
-2004-06-22  JP Rosevear  <jpr@novell.com>
-
-	 * gui/dialogs/Makefile.am, gui/dialogs/alarm-dialog.c,
-	 gui/dialogs/alarm-dialog.glade, gui/dialogs/alarm-dialog.h,
-	 gui/dialogs/alarm-list-dialog.c,
-	 gui/dialogs/alarm-list-dialog.glade,
-	 gui/dialogs/alarm-list-dialog.h, gui/dialogs/alarm-options.c,
-	 gui/dialogs/alarm-options.h, gui/dialogs/alarm-page.c,
-	 gui/dialogs/alarm-page.glade, gui/dialogs/alarm-page.h,
-	 gui/dialogs/comp-editor.c, gui/dialogs/comp-editor.h,
-	 gui/dialogs/event-editor.c, gui/dialogs/event-page.c,
-	 gui/dialogs/event-page.glade, gui/dialogs/meeting-page.c,
-	 gui/dialogs/meeting-page.glade, gui/dialogs/recurrence-page.c,
-	 gui/dialogs/recurrence-page.glade,
-	 gui/dialogs/task-details-page.c,
-	 gui/dialogs/task-details-page.glade, gui/dialogs/task-editor.c,
-	 gui/dialogs/task-page.c, gui/dialogs/task-page.glade: HIGify and
-	 newer design; alarm page is gone, Cancel/OK buttons for the
-	 dialog, no more menus; slightly improve read-only workings for
-	 entry areas
-	
-2004-06-22  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	rename widgets to be consistent with those else where
-	(e_meeting_time_selector_set_read_only): cast properly
-	(e_meeting_time_selector_on_invite_others_button_expose): remove,
-	the widget sensitization is taken care of elsewhere
-
-2004-06-22  Larry Ewing  <lewing@ximian.com>
-
-	Fixes #59824
-	
-	* gui/e-week-view.h: increase some of the passing so that the text
-	does not appear to run together.  Ideally this would be based on
-	the font size but this will work for now.
-
-2004-06-21  Rodney Dawes  <dobey@novell.com>
-
-	Fixes #56892
-
-	* gui/dialogs/select-source-dialog.c (row_activated_cb): Add this
-	callback to activate the OK button when we double-click or press
-	the Enter key on a row
-	(select_source_dialog): Change the default size to be reasonable
-	Use ensure_style instead of realize on the dialog
-	Set the default response for the dialog to OK
-	Fix the packing of the group label to not have extraneous padding
-	Connect up the callback for row_activated
-
-2004-06-18  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fixes bug #57592
-
-	* conduits/calendar/calendar-conduit.c (pre_sync): Same as below.
-
-	* conduits/todo/todo-conduit.c (pre_sync):
-	s/wombat/evolution-data-server/g
-
-2004-06-18  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #58747
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes): if the source
-	is read only, don't prompt the user.
-
-2004-06-18  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #56323
-
-	* gui/calendar-component.c (create_new_event): removed read-only
-	check, just call the editor with the currently selected client and
-	let it do the job.
-
-	* gui/tasks-component.c (create_new_todo): ditto.
-
-2004-06-18  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #60293
-
-	* gui/dialogs/recurrence-page.c (type_toggled_cb): make sure
-	we enable/disable correctly the 'Add' button.
-
-2004-06-17 Sivaiah Nallagatla <snallagatla@novell.com>
-
-        * gui/itip-utils.c (itip_publish_comp) : check for
-        host being non-NULL in soup uri. host can be null
-        for uri's of the form file:/foo or http:/foo etc
-
-2004-06-17  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #60309
-
-	* gui/meeting-page.c (sensitize_widgets): moved up in the file, to
-	be declared before any use.
-
-2004-06-16  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-itip-control.c: use e-util's HTML conversion function,
-	instead of camel's.
-	(write_html): use e_text_to_html_full().
-
-2004-06-15  JP Rosevear  <jpr@novell.com>
-
-	Fixes #56197
-	
-	* gui/e-cal-list-view.etspec: add back categories
-
-	* gui/e-calendar-table.etspec: ditto
-	
-2004-06-15  JP Rosevear  <jpr@novell.com>
-
-	Fixes #59401
-	
-	* gui/e-week-view.c (e_week_view_on_text_item_event): if we are
-	editing the event, don't ignore the right click, stop editing the
-	event and continue on
-
-2004-06-15  JP Rosevear  <jpr@novell.com>
-
-	Fixes #57393
-	
-	* gui/e-week-view.c (e_week_view_set_compress_weekend): redraw the
-	titles as well since the spacing is different
-
-2004-06-15  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/meeting-page.c (meeting_page_construct): connect
-	to "client_changed" signal on the page.
-	(client_changed_cb): new callback.
-	(sensitize_widgets): new function.
-	(meeting_page_fill_widgets): call sensitize_widgets().
-
-	* gui/e-meeting-time-sel.[ch]
-	(e_meeting_time_selector_set_read_only): new function.
-	(e_meeting_time_selector_construct): store some missing buttons
-	in the EMeetingTimeSelector structure.
-
-	* gui/dialogs/schedule-page.c (schedule_page_construct):
-	connect to "client_changed" signal on the page.
-	(client_changed_cb): new callback.
-	(sensitize_widgets): new function.
-	(schedule_page_fill_widgets): call sensitize_widgets().
-
-2004-06-10  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-cal-model.c (e_cal_view_objects_modified_cb): removed
-	g_assert call, since we shouldn't crash when getting wrong
-	notifications from a backend.
-
-2004-06-10  JP Rosevear  <jpr@novell.com>
-
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): only do the
-	range selected hack in one case
-
-2004-06-10  JP Rosevear  <jpr@novell.com>
-
-	* gui/gnome-cal.c (setup_widgets): set 6 weeks shown
-	(display_view): ditto
-
-2004-06-10  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #58748
-
-	* gui/gnome-cal.c (setup_widgets): set the timezone on all views
-	when creating them.
-
-2004-06-10  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): don't set
-	the "bg_color_column" property on the ECellToggle class.
-
-2004-06-10  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #58799
-
-	* gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence):
-	Use the timezone for getting the RECUR-ID from the instance start
-	date if available. Also, use dates only as the recurrence ID, and
-	do nothing if not a recurrent appointment.
-
-2004-06-09  JP Rosevear  <jpr@novell.com>
-
-	Fixes #59242, #57404, ##55394
-	
-	* gui/gnome-cal.c (get_times_for_views): calculate the work week,
-	week, and month views more exactly
-	(update_adjustment): update the view based on week view scrolling
-	(setup_widgets): listen for the scroll bar moving on the week
-	views
-	(gnome_calendar_update_date_navigator): adjust for compressed
-	weekends in the month view
-	(gnome_calendar_on_date_navigator_selection_changed): ditto
-
-	* gui/e-week-view.h: add protos
-
-	* gui/e-week-view.c (time_range_changed_cb): calculate the
-	base_date and first_day_shown more simply, allows multi-week
-	selection to work better; update the base date when told to do so
-	(e_week_view_init): init update_base_value var
-	(e_week_view_get_update_base_date): accessor
-	(e_week_view_set_update_base_date): ditto
-
-2004-06-08  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #57578
-
-	* gui/e-calendar-view.c (on_move_to, on_copy_to): simplified to
-	just call transfer_selected_items() with the approppriate
-	arguments.
-	(transfer_selected_items): new function to transfer all selected
-	items to another calendar.
-	(transfer_item_to): added missing implementation.
-
-2004-06-08  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #57579
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog): start
-	with the OK button disabled.
-	(primary_selection_changed_cb): enable/disable the OK button depending
-	on the selection on the ESourceSelector.
-
-2004-06-08  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/comp-editor.[ch] (comp_editor_notify_client_changed):
-	new function for notifying all pages of the client change.
-	(page_client_changed_cb): no need for this callback.
-	(comp_editor_append_page): no need to connect to "client_changed"
-	signal on the pages.
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_notify_client_changed): re-added the call to
-	comp_editor_page_set_e_cal(), the client was not being set anywhere.
-
-	* gui/dialogs/event-page.c (source_changed_cb): use
-	comp_editor_notify_client_changed() so that all pages get informed
-	of the client change.
-
-	* gui/dialogs/task-page.c (source_changed_cb): ditto.
-
-2004-06-08  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_notify_client_changed): do not set the private
-	client here, it is set in comp-editor.c.
-
-	* gui/dialogs/event-page.c (sensitize_widgets): new function.
-	(source_changed_cb): call sensitize_buttons().
-
-	* gui/dialogs/recurrence-page.c (sensitize_buttons): new
-	function, to deal correctly with the sensitivity of all widgets
-	in the page.
-	(recurrence_page_fill_widgets, type_toggled_cb, client_changed_cb):
-	call sensitize_buttons() instead of sensitize_recur_widgets().
-	(recurrence_page_construct): g_signal_connect_after for
-	"client_changed", to get notifications after CompEditorPage
-	gets his.
-
-	* gui/dialogs/alarm-page.c (sensitize_buttons): sensitize the missing
-	widgets in the page.
-	(alarm_page_construct): g_signal_connect_after for "client_changed",
-	to get notifications after CompEditorPage gets his.
-
-2004-06-08  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-week-view.c (e_week_view_do_key_press): cast week view
-	correctly
-
-2004-06-08  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_construct): connect
-	to "client_changed" signal on the page.
-	(client_changed_cb): new callback.
-
-	* gui/dialogs/alarm-page.c (sensitize_buttons): fixed missing stuff
-	in last commit.
-
-2004-06-08  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #59650
-
-	* gui/dialogs/alarm-page.c (alarm_page_construct): connect to
-	"client_changed" signal on the page.
-	(client_changed_cb): new callback.
-	(sensitize_buttons): added code for dealing with read only calendars
-	and disable/enable buttons approppriately.
-
-2004-06-07  Dan Winship  <danw@novell.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): s/stock_save_as/stock_save-as/
-
-2004-06-07  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-tasks.c (e_tasks_add_todo_source): open task lists
-	asynchronously.
-	(client_cal_opened_cb): callback from the client when opened.
-
-	* gui/gnome-cal.c (client_cal_opened_cb): disconnect from all
-	signals of the client when opening it fails. Clean up the status
-	messages correctly, based on source type.
-	(open_ecal): for tasks, use e_calendar_table_set_status_message
-	not e_calendar_view_set_status_message.
-	(gnome_calendar_remove_source_by_uid): call update_query only when
-	removing calendars, not tasks lists.
-	(update_query): set meaningful status messages.
-
-2004-06-06 Vardhman Jain <vardhman@students.iiit.net>
-
-	* Bug #36247
-	* gui/e-itip-control.c (write_html, set_date_label):
-	Changes to improve the performance of _(str) function call on strings
-	str of the type <tar>str</tag> to avoid translation of tag.
-
-2004-06-04    <jpr@novell.com>
-
-	* gui/gnome-cal.c: define G_MAXINT32 if it isn't already
-
-2004-06-04  JP Rosevear  <jpr@novell.com>
-
-	Fixes #58739
-	
-	* gui/migration.c (migrate_calendars): guard against NULL
-	gconf_val
-
-2004-06-04  JP Rosevear  <jpr@novell.com>
-
-	Fixes #59058
-	
-	* gui/gnome-cal.c (gnome_calendar_purge): make purging actually
-	work
-
-2004-06-04  JP Rosevear  <jpr@novell.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): guard
-	against the text value being NULL
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): add guards
-	here as well
-	
-2004-06-03  Jeffrey Stedfast  <fejj@novell.com>
-
-	* conduits/calendar/calendar-conduit.c
-	(calconduit_load_configuration): If the last_uri string value is
-	the Evolution 1.4 URI, change it to the new URI. Fixes bug #54134.
-
-2004-06-03  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #59481
-	
-	* gui/e-tasks.c (set_status_message): don't use vsprintf with
-	NULL strings, crashes on FreeBSD.
-
-2004-06-03  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_notify_client_changed): update the internal client
-	when it changes.
-
-2004-06-03  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #56875
-
-	* gui/dialogs/event-editor.c (event_editor_construct): connect to
-	"client_changed" signal on the EventPage.
-	(client_changed_cb): set menu sensibility when the client changes.
-
-	* gui/dialogs/task-editor.c (task_editor_construct): connect to
-	"client_changed signal on the TaskPage.
-	(client_changed_cb): set menu sensibility when the client changes.
-
-2004-06-02  JP Rosevear  <jpr@novell.com>
-	
-	* gui/alarm-notify/alarm-notify.c (process_removal_in_hash): free
-	the correct uri, preventing bad memory corruption
-	(list_changed_cb): track the removals in a list so we don't
-	clobber the hash table data during the foreach loop
-
-2004-06-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/migration.c (migrate_calendars): remove absolute_uri from
-	ESource's.
-	(migrate_tasks): same.
-
-2004-06-02  Rodrigo Moya <rodrigo@novell.com>
-
-	* gui/e-meeting-list-view.c (start_addressbook_server): removed
-	pre-completion code, not needed anymore.
-	(emlv_finalize): no need to unref the book anymore.
-	(emlv_init): don't call start_addressbook_server.
-
-	* gui/dialogs/copy-source-dialog.c (copy_source): fixed
-	leak and pass the correct icalcomponent to e_cal_modify_object.
-
-2004-06-02  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #59333
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): guard against
-	list items being NULL.
-
-2004-06-02  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-tasks.c (table_drag_data_delete): add a drag delete handler.
-	(table_drag_data_get): support text/vcard drags.
-	(setup_widgets): setup the etable as a drag source.
-
-	* gui/tasks-component.c: add source selector Drag & Drop handlers.
-
-2004-06-01  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: rename can_add to is_mutable, add
-	sensitivity logic for both readonly and mutable cases.  The
-	esource attributes are a complete mess and need discussion.
-
-	* gui/dialogs/calendar-setup.glade: remove edit dialogs and name
-	the tables.
-
-
-2004-06-01  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #59369
-
-	* gui/e-calendar-view.c (clipboard_get_text_cb): don't pass NULL strings
-	to libical functions.
-
-2004-05-31  Priyanshu Raj <Priyanshu@students.iiit.net>
-
-	* Bug #51968 "Invite others.." button confusing in Appointment
-	editor dialog(Fixed)"
-
-2004-05-29  Priyanshu Raj <priyanshu@students.iiit.net>
-
-	* Bug #48134: Menu items in Scheduling tab should have sentence
-	capitalization (Fixed)
-	
-2004-05-28  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-week-view.c: (e_week_view_event_move),
-	(e_week_view_get_day_offset_of_event): a more straightforward way
-	to calculate the offset of a day within the week.
-
-2004-05-26  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fix for bug #57818.
-
-	* gui/e-tasks.c (setup_widgets): Same.
-
-	* gui/gnome-cal.c (setup_widgets): Updated to pass a set of
-	bitflags to cal_search_bar_new().
-
-	* gui/cal-search-bar.c (cal_search_bar_new): Now takes a bit flag
-	argument specifying which search options to present.
-	(cal_search_bar_construct): Same as above. Construct the search
-	menu to use based on the bit flags.
-
-	* gui/apps_evolution_calendar.schemas.in.in: Changed the default
-	"Tasks due today" colour to be a light-blue (one of the default
-	colour values in the colour picker dialog). Fixes bug #53412.
-
-2004-05-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #57759
-
-	* gui/gnome-cal.c (gnome_calendar_remove_source_by_uid): remove all
-	queries we've got for the removed source.
-
-2004-05-26  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-week-view.c: (e_week_view_event_move),
-	(e_week_view_get_day_offset_of_event): a more straightforward way
-	to calculate the offset of a day within the week.
-
-2004-05-26  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-week-view.c: (e_week_view_event_move),
-	(e_week_view_change_event_time): In week view all-day events should
-	keep all-dayness when moved around.
-
-2004-05-25  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: remove now unused functions.
-	(source_group_can_add): fix can add logic, remove more unused
-	functions.
-
-	* gui/dialogs/calendar-setup.c (calendar_setup_edit_task_list):
-	use the new dialog.
-	(calendar_setup_edit_calendar): use the new dialog.
-	(key_press_event): look for escape press and destroy dialog.
-
-2004-05-25  Jeffrey Stedfast  <fejj@novell.com>
-
-	* gui/dialogs/url-editor-dialog.c (init_widgets): Use
-	gtk_window_set_icon_list() here instead of gtk_window_set_icon().
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog): Use
-	gtk_window_set_icon_list() here instead of gtk_window_set_icon().
-
-	* gui/dialogs/calendar-setup.c (source_to_dialog): Huh?? Why are
-	integer colours in an array of char*? Fixed to be an array of
-	guint32.
-
-	* gui/dialogs/changed-comp.c (changed_component_dialog): Use
-	gtk_window_set_icon_list() here instead of gtk_window_set_icon().
-
-	* gui/dialogs/calendar-setup.c (calendar_setup_new_calendar):
-	Don't bother calling tk_window_set_icon() if we are gonna call
-	gtk_window_set_icon_list a few lines later.
-	(calendar_setup_edit_calendar): Same.
-	instead.
-	(calendar_setup_new_task_list): Same.
-	(calendar_setup_edit_task_list): Same.
-
-	* gui/dialogs/alarm-options.c (alarm_options_dialog_run): Use
-	gtk_window_set_icon_list() instead of gtk_window_set_icon() so gtk
-	can do the Right Thing (tm).
-
-2004-05-25  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Makefile.am: Make calendar-errors.xml.h and install the xml
-	file.
-
-	* calendar-errors.xml: New error definitions file.
-
-	* gui/gnome-cal.c (backend_died_cb): Use e-error
-
-	* gui/e-tasks.c (backend_died_cb): Use e-error
-
-	* gui/dialogs/send-comp.c (send_component_dialog): Use e-error
-
-	* gui/dialogs/save-comp.c (save_component_dialog): Use e-error
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Use e-error
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): Use e-error
-
-2004-05-25  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* common/authentication.c (auth_func_cb): read the "auth-domain"
-	property to use as component name for e-password calls instead of
-	hard coded component name
-
-2004-05-25  Trent Lloyd  <lathiat@bur.st>
-
-	Fixes: #57472
-
-	* gui/dialogs/alarm-options.c:
-	* gui/dialogs/calendar-setup.c:
-	* gui/dialogs/cancel-comp.c:
-	* gui/dialogs/changed-comp.c:
-	* gui/dialogs/delete-comp.c:
-	* gui/dialogs/delete-error.c:
-	* gui/dialogs/save-comp.c:
-	* gui/dialogs/select-source-dialog.c:
-	* gui/dialogs/send-comp.c
-	* gui/dialogs/url-editor-dialog.c:
-	- Add include of e-icon-factory.h
-	- Set icon on window to be calendar/tasks icon rather than mail icon
-
-2004-05-21  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: set the dialog icons appropriately
-	for add task and calendar dialogs.
-
-2004-05-21  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: remove references to the uri
-	buttons.
-
-	* gui/dialogs/calendar-setup.glade: remove uri buttons, make add
-	task window wider and make the button spacing larger.
-
-2004-05-21  H P Nadig  <hpnadig@pacific.net.in>
-
-       * gui/dialogs/calendar-setup.glade: Adjusted the default size of
-       New Calendar Dialog. Fixes 57469.
-
-2004-05-20  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (find_server): proper look for figuring out
-	if the object is on the server
-
-2004-05-20  JP Rosevear  <jpr@novell.com>
-
-	* gui/tag-calendar.c (tag_calendar_by_comp): pass the client
-	properly
-
-2004-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/e-meeting-store.c (start_addressbook_server): use the new
-	e_book_new_* and e_book_open apis.
-
-	* gui/e-meeting-list-view.c (start_addressbook_server): use the
-	new e_book_new_* and e_book_open apis.
-
-2004-05-19  William Jon McCann  <mccann@jhu.edu>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add menu_label and
-	menu_accelerator.
-
-2004-05-18  JP Rosevear  <jpr@novell.com>
-
-	* idl/evolution-calendar.idl: add arg
-
-	* gui/alarm-notify/alarm-queue.c (edit_component): send a mode
-	type
-
-	* gui/alarm-notify/alarm-notify.c: add fixme note
-
-	* gui/comp-editor-factory.c (impl_editExisting): take a editor
-	mode and twist it into a source type
-	(impl_editNew): ditto
-	(open_client): take a source type for creating the client
-	(lookup_open_client): ditto
-
-2004-05-18  JP Rosevear  <jpr@novell.com>
-
-	* gui/alarm-notify/notify-main.c (init_alarm_service): just set up
-	the alarm notify object
-
-	* gui/alarm-notify/alarm-notify.h: update proto
-
-	* gui/alarm-notify/alarm-notify.c (process_removal_in_hash):
-	process removals using the source list
-	(list_changed_cb): when the list changes, update
-	(load_calendars): initially load the calendars
-	(alarm_notify_init): load the calendars here and don't listen for
-	a selection notification
-	(alarm_notify_add_calendar): get the source type when adding a
-	calendar
-
-	* gui/alarm-notify/notify-main.c (main): no need to init/shutdown
-	gnome vfs
-
-	* gui/alarm-notify/config-data.h: new proto
-
-	* gui/alarm-notify/config-data.c
-	(config_data_get_notify_with_tray): routine to get schema value
-
-	* gui/alarm-notify/alarm.c (alarm_ready_cb): no timeout checking
-	here, setup_timeout does that
-	(queue_alarm): ditto
-	(setup_timeout): calculate the timeout better
-
-	* gui/alarm-notify/alarm-queue.c (query_objects_changed_cb): tidy
-	(edit_component): clean up exception handling
-	(display_notification): don't show the tray icon if we aren't
-	notifying with the tray
-
-	* gui/apps_evolution_calendar.schemas.in.in: add notify_with_tray
-	option
-
-2004-05-18  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-week-view.c: (e_week_view_do_cursor_key_up),
-	(e_week_view_do_cursor_key_down), (e_week_view_do_cursor_key_left),
-	(e_week_view_do_cursor_key_right), (e_month_view_do_cursor_key_up),
-	(e_month_view_do_cursor_key_down),
-	(e_month_view_do_cursor_key_left),
-	(e_month_view_do_cursor_key_right), (e_week_view_cursor_key_up),
-	(e_week_view_cursor_key_down), (e_week_view_cursor_key_left),
-	(e_week_view_cursor_key_right), (e_week_view_do_key_press): make
-	the focus movable in week/month view when no events are selected.
-
-2004-05-17  Jeffrey Stedfast  <fejj@novell.com>
-
-	* gui/dialogs/event-editor.c: Same.
-
-	* gui/dialogs/comp-editor.c: Change E_PIXMAP size args
-	over to E_ICON_SIZE_* values.
-
-	* gui/alarm-notify/alarm-queue.c (tray_icon_blink_cb): Use
-	E_ICON_SIZE enum here.
-	(display_notification): Same.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading): Use
-	E_ICON_SIZE_DIALOG here.
-
-	* gui/e-week-view.c (e_week_view_realize): Same as below.
-
-	* gui/e-day-view.c (e_day_view_realize): Use E_ICON_SIZE_MENU for
-	the icon sizes rather than using pixel values.
-
-	* gui/calendar-commands.c (pixmaps): Change E_PIXMAP size args
-	over to E_ICON_SIZE_* values.
-
-	* gui/tasks-component.c (add_popup_menu_item): Use
-	E_ICON_SIZE_MENU
-
-	* gui/e-timezone-entry.c (e_timezone_entry_init): Use
-	E_ICON_SIZE_BUTTON
-
-	* gui/e-itip-control.c (write_error_html): Use E_ICON_SIZE enums.
-	(write_html): Same.
-
-	* gui/e-calendar-view.c (e_calendar_view_set_status_message): Use
-	E_ICON_SIZE_STATUS
-	(setup_popup_icons): Use E_ICON_SIZE_MENU
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Use
-	E_ICON_SIZE_LIST rather than a hard-coded value of 16 pixels.
-	(e_calendar_table_set_status_message): Use E_ICON_SIZE_STATUS
-
-	* gui/calendar-component.c (add_popup_menu_item): Use
-	E_ICON_SIZE_MENU rather than hard-coding the pixel size.
-
-2004-05-17  JP Rosevear  <jpr@novell.com>
-
-	Fixes #56373
-	
-	* gui/comp-editor-factory.c (open_client): guess its an event for
-	now
-
-2004-05-17  V Ravi Kumar Raju <vravikr@yahoo.co.uk>
-
-	*  gui/e-alarm-list.c (get_alarm_string):
-	*  gui/dialogs/alarm-page.glade: Change dropdown list item 'Display
-	a message' for reminder types to 'Pop up an alert'
-
-2004-05-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence):
-	if we don't have a RECURRENCE-ID, remove nothing, and use the instance
-	start time for the RECURRENCE-ID as the default.
-
-2004-05-17  H P Nadig  <hpnadig@pacific.net.in>
-
-	Fixes #56885
-	
-	* gui/dialogs/select-source-dialog.c (select_source_dialog): Changed
-	the window size of source dialog and a minor naming issue. 
-
-2004-05-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (process_component):
-	* gui/e-week-view.c (process_component):
-	* gui/gnome-cal.c (gnome_calendar_purge):
-	* gui/tag-calendar.c (tag_calendar_by_comp):
-	* gui/e-cal-model.c (e_cal_model_generate_instances): use
-	e_cal_generate_instances_for_object instead of
-	e_cal_recur_generate_instances.
-
-2004-05-14  Nicel KM  <mnicel@novell.com>
-
-	* gui/dialogs/alarm-page.c (button_options_clicked_cb): invoke options 
-	dialog even if backend does not support email alarms and get email 
-	address only if supported.
-
-2004-05-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/alarm-page.c (add_clicked_cb): only get the email address
-	for alarms if the backend supports email alarms.
-
-2004-05-13  Not Zed  <NotZed@Ximian.com>
-
-	Fixes #57644.
-
-	* gui/e-day-view.c (row_deleted_check_cb): strdup the uid, as
-	below.
-	(remove_uid_cb): and free it.
-
-	* gui/e-week-view.c (row_deleted_check_cb): strdup the uid, 'cause
-	otherwise it can go away later as we delete stuff.
-	(remove_uid_cb): free the uid.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): add
-	some array bounds checking as an attempt to isolate the crash in
-	#57644.
-
-2004-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* gui/migration.c (migrate_calendars, migrate_tasks): add GError
-	return for error details & return errors.
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): fix for api
-	change, and erturn exception if we need to.
-
-2004-05-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-itip-control.c (update_item): get error information from
-	the call to e_cal_receive_objects, and use that as the error message.
-
-2004-05-11  Dan Winship  <danw@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Remove the calendar
-	and task list controls
-
-	* gui/main.c (factory): Remove support for the calendar and task
-	list controls
-
-	* gui/control-factory.c: Remove the property-bag stuff
-
-	* gui/tasks-control.c: Likewise
-
-2004-05-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53137
-
-	* gui/dialogs/schedule-page.c (schedule_page_fill_widgets): check dates
-	from the ECalComponent before using them.
-
-2004-05-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model-tasks.c (set_due): use/set the DUE date, not
-	the DTEND date.
-
-2004-05-07  Umeshtej <umeshtej@gawab.com>
-
-	Fixes #58014
-	
-	* gui/e-meeting-list-view.c (process_section):Run the for loop 
-	for the number of elements in cards.
-	
-2004-05-10  Trent Lloyd  <lathiat@bur.st>
-
-	* gui/dialogs/select-source-dialog.c: Include gtkhbox.h and gtkvbox.h
-	to fix implicit declaration
-	* gui/dialogs/meeting-page.c: (get_current_page) Cast GTK_ENTRY from
-	GTK_COMBO to fix compiler warning
-	* gui/dialogs/cal-prefs-dialog.c: Remove lvalue casts, produces
-	compiler warnings and are not necessary
-	
-2004-05-07  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #52294
-	
-	* gui/e-cal-model.c (set_dtstart): set the tzid properly
-	(ecm_is_cell_editable): set check properly
-
-	* gui/e-cal-model-tasks.c (set_due): set the tzid properly
-	(ecmt_is_cell_editable): set check properly
-
-	* gui/e-cal-model-calendar.c (set_dtend): set the tzid properly
-	(ecmc_is_cell_editable): kill fixme and set check properly
-
-2004-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-cal-model.c (ecm_is_cell_editable): fix comment and check
-
-	* gui/e-cal-model-tasks.c (ecmt_set_value_at): set a parent field
-	properly
-	(ecmt_is_cell_editable): fix comment and check
-
-2004-05-06  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c (source_to_dialog): use random
-	color for calendar default.
-
-2004-05-05  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #58025
-	
-	* gui/gnome-cal.c (set_search_query): kill warning
-	(setup_config): don't set time out here
-	(setup_widgets): set it here
-	(gnome_calendar_destroy): clear the time out
-
-	* gui/e-tasks.c (search_bar_sexp_changed_cb): kill warning
-	(setup_config): don't set time out here
-	(setup_widgets): set it here and remember the time out id
-	(e_tasks_destroy): clear the time out
-
-2004-05-05  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: make sure that we don't crash if
-	there are no sources.
-	(calendar_setup_new_task_list): fix the previous fix to work if
-	there are sources.
-
-2004-05-04  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: fix logic error.
-	(source_group_can_add): helper function to fix groupwise case.
-	I'm still not happy with this but it will work for now.
-
-	* gui/dialogs/calendar-setup.c (source_to_dialog): convert units.
-	(dialog_to_source): convert time units.
-
-	* gui/dialogs/calendar-setup.glade. name the unit option menus.
-
-2004-05-03  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog):
-	Make this dialog be HIG-compliant and accessible
-
-2004-05-03  Edgar Luna Díaz  <eald@linuxuanl.org>
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog):
-	Set the default window size to 276 x 320
-
-	Fixes #57298
-
-2004-05-03  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.glade: rename the cancel button.
-
-2004-04-29  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-cal-model.c (ecm_get_color_for_component): use the source
-	color if it is set.  Yay for ugly colors.
-
-	* gui/e-cal-model.h: add a color holder to the ECalModelComponent
-	since the return value of the color stuff is const.
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #51714
-	
-	* gui/e-cal-list-view.c (setup_e_table): listen for double click
-	signal
-	(e_cal_list_view_on_table_double_click): edit the appointment that
-	was double clicked on
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-component.c (set_info): set the info label
-	(calendar_dates_changed_cb): call back for when the dates of the
-	calendar change
-	(create_component_view): store the info label for later use;
-	listen for date changes to set the info label
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #57897
-	
-	* gui/e-tasks.c (setup_widgets): no need to listen for the deleted
-	signal, the cursor will change in that case
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-cal-model-tasks.c (set_completed): remove useless debug
-	statement
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/tasks-component.c (set_info): set the info label message
-	(model_changed_cb): call above
-	(table_selection_change_cb): ditto
-	(model_rows_inserted_cb): ditto
-	(model_rows_deleted_cb): ditto
-	(create_component_view): remember the info in the view struct;
-	listen for events that require the info label to be updated
-
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #57899
-	
-	* gui/e-day-view.c (e_day_view_do_key_press): bail if the client
-	is read only (or we get an error trying to find out)
-
-	* gui/e-week-view.c (e_week_view_do_key_press): ditto
-	
-2004-05-03  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #57894
-	
-	* gui/gnome-cal.c (gnome_calendar_new_task): make sure we use the
-	default component of the correct model
-
-2004-04-30  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):
-	* gui/alarm-notify/alarm-notify.glade:
-	Update the alarm notify dialog to be HIG compliant
-
-	Fixes #41224
-
-2004-04-30  Gary Ekker  <gekker@novell.com>
-
-	* gui/e-tasks.c: (e_tasks_init): Set up the model to use the correct 
-	query. Setup callbacks for gconf changes. Add an idle timeout to hide 
-	completed items.
-	Add update_view, update_view_cb, and 
-	config_hide_completed_tasks_changed_cb to update the model view.
-
-	* gui/gnome-cal.c: ditto
-	
-	* gui/calendar-config.h: Add notifications for hide_completed_tasks
-	settings.
-
-	* gui/calendar-config.c: ditto
-
-2004-04-30  Not Zed  <NotZed@Ximian.com>
-
-	* gui/dialogs/meeting-page.c (get_widgets): make the entry
-	non-editable.  Quick fix for #48132 (could convert to optionmenu
-	but then we need to change again for gnome >?2.6).
-
-2004-04-29  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Update the prefs dialog pages
-	for the calendar and tasks components to be HIG compliant
-
-2004-04-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/tasks-component.h (tasks_component_peek_source_list): remove
-	prototypes
-
-	* gui/tasks-component.c (source_removed_cb):  unselect the
-	source in the selector if source removed from calendar
-	(create_component_view): create the activity handler and listen to
-	source remove signal
-
-	* gui/gnome-cal.h: add signals, protos
-
-	* gui/gnome-cal.c (gnome_calendar_class_init): add source added
-	and removed signals
-	(client_cal_opened_cb): emit source removed signal
-	(open_ecal): set the status message
-	(backend_died_cb): emit source removed signal
-	(gnome_calendar_set_activity_handler): allow an activity handler
-	to be set
-	(gnome_calendar_add_source): emit source added signal
-	(gnome_calendar_remove_source): emit source removed signal
-	(display_view): update the active activity handler
-	
-	* gui/e-tasks.h: add signal prototypes
-
-	* gui/e-tasks.c (e_tasks_class_init): add source added and removed
-	signals
-	(backend_died_cb): emit source removed signal
-	(e_tasks_add_todo_source): emit source added/removed signals
-	(e_tasks_remove_todo_source): emit source removed signal
-
-	* gui/e-calendar-view.h: add proto
-
-	* gui/e-calendar-view.c (e_calendar_view_set_activity_handler):
-	allow an activity handler to be set
-	(e_calendar_view_set_status_message): use private activity handler
-	(if any) to set status message
-
-	* gui/e-calendar-table.h: add data member and proto
-
-	* gui/e-calendar-table.c (e_calendar_table_set_activity_handler):
-	allow an activity handler to be set
-	(e_calendar_table_set_status_message): use private activity
-	handler (if any) to set status message
-
-	* gui/e-calendar-marshal.list: add extra marshallers
-
-	* gui/calendar-component.h: kill protos
-
-	* gui/calendar-component.c (source_removed_cb): unselect the
-	source in the selector if source removed from calendar
-	(create_component_view): create the activity handler and listen to
-	source remove signal
-
-2004-04-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (send_timezone): ditto
-
-	* gui/dialogs/task-page.c (task_page_fill_component): kill warning
-
-2004-04-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_set_default_client): kill warning
-
-2004-04-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/migration.c (migrate_pilot_data): Removed the terminating
-	NULL vararg since we don't need it for g_strdup_printf, it was
-	only needed when it was g_build_filename(). Gets rid of a gcc
-	warning.
-
-2004-04-29  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_set_data): check we find
-	any usable components of the icalendar entry before dereferncing
-	it.  Fixes crash in #57264.
-
-2004-04-28  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-itip-control.c (object_requested_cb): dont shadow source
-	with another source in the fallback case.  Related to #54094.
-
-2004-04-27  JP Rosevear  <jpr@ximian.com>
-
-	* gui/cal-search-bar.c: disable comment searching which is
-	currently useless
-
-2004-04-27  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #52270 and #57593
-	
-	* gui/e-cal-model-tasks.c (ecmt_set_value_at): remove checks for
-	start after due
-	(ecmt_duplicate_value): copy the completed and due dates properly
-	(ecmt_fill_component_from_model): only set the percent and status
-	if the completion isn't set
-	(ensure_task_partially_complete): ensure the task is not complete,
-	in progress and make the percentage sensible if its 0 or 100
-	(set_status): make sure the status and related vars are set
-	properly
-	(ecmt_set_value_at): handle status
-	(ecmt_fill_component_from_model): make sure the click to add
-	fields don't clobber each other
-	(ecmt_is_cell_editable): status is editable
-
-	* gui/e-cal-model-calendar.c (ecmc_duplicate_value): copy the
-	dtend correctly
-
-2004-04-27  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c: hook up the color picker and test
-	buttons in the new task dialog.
-
-	* gui/dialogs/calendar-setup.glade: fix visibility and color
-	picker names.
-
-2004-04-27  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/calendar-setup.c (new_calendar_test_uri): add
-	handler for test button.
-	(calendar_setup_new_calendar): connect test button, fill in color
-	picker member.
-	(source_to_dialog): set the color picker color if the source has
-	one.
-	(dialog_to_source): set the source color.
-	
-2004-04-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/migration.c (migrate_tasks): Fixed the version checks for
-	migrating pilot data.
-	(migrate_calendars): Same.
-	(migrate_pilot_data): Doh. Take a third argument to specify what
-	component we are migrating ("todo" vs "calendar") so that we can
-	compare against the correct filename. Might help :-)
-	(migrate_pilot_db_key): Just set an empty value for the data since
-	there's no way to actually get it and I don't think it really
-	matters anyway.
-
-2004-04-27  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-cal-model-tasks.c: (ecmt_set_value_at): compare the start
-	time and the due time only when both are not null.
-
-2004-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/migration.c (migrate_pilot_data): New function to migrate
-	pilot data.
-	(migrate_calendars): Migrate pilot data if upgrade version <=1.5.9
-	(migrate_tasks): Same.
-
-2004-04-23  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (main): Call e_icon_factory_init ()
-
-	Fixes #57497
-
-2004-04-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-	Use e_cal_open_default() instead of e_cal_open().
-	(map_name): Changed the path for the pilot map filename.
-	(pre_sync): Changed the query to "#t" instead of "(#t)" and
-	removed a duplicate block of code (seems to have been a paste-o?).
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): Use
-	e_cal_open_default() instead of e_cal_open().
-	(map_name): Changed the path for the pilot map filename.
-	(pre_sync): Changed the query to "#t" instead of "(#t)" and
-	removed a duplicate block of code (seems to have been a paste-o?).
-
-2004-04-22  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #56092
-	
-	* gui/e-day-view.c (e_day_view_show_popup_menu): weak ref for the
-	menu to be destroyed
-	(popup_destroyed_cb): reset popup_event_num and popup_event_day
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): weak ref for
-	the menu to be destroyed
-	(popup_destroyed_cb): reset the popup_event_num
-
-2004-04-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-component.c (create_new_event): make sure we don't
-	deref a NULL pointer
-
-2004-04-21  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #56504
-	
-	* gui/gnome-cal.c (gnome_calendar_destroy): no need to destroy the
-	creatable item handler
-	(gnome_calendar_set_ui_component): don't do the creatable
-	item stuff here
-
-	* gui/e-tasks.c (e_tasks_set_ui_component): don't do the creatable
-	item stuff here
-	(e_tasks_destroy): no need to destroy creatable item handler
-
-	* gui/e-calendar-table.c (e_calendar_table_set_status_message):
-	comment out temporarily
-
-	* gui/e-calendar-view.c (e_calendar_view_set_status_message): ditto
-	
-	* gui/calendar-component.c: switch to using per component view
-	information; don't listen for config changes to the primary
-	selection and selection so that different windows can have
-	different calendar selections; use a local creatable items handler
-	so that the new button is associated with the right window when
-	setting the default times
-
-	* gui/tasks-component.c: ditto
-	
-2004-04-21  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-tasks.c (set_timezone): only set the preview zone if the
-	preview has been created
-	(setup_widgets): set the default zone for the preview pane
-
-2004-04-21  JP Rosevear <jpr@ximian.com>
-
-	Fixes #55797
-	
-	* gui/calendar-component.c (create_new_event): force an all day
-	event if we are viewing the week, month or list view, which mimics
-	double click in the view
-
-2004-04-21  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* gui/migration.c: (migrate_calendars):
-	Fix crash when gconf value are not existing in the gconf
-        database.
-
-2004-04-21  Not Zed  <NotZed@Ximian.com>
-
-	** Fixes #57034.
-	
-	* gui/dialogs/calendar-setup.c (create_new_source_with_group):
-	NULL out source if we can't open the calendar.
-	(source_group_menu_add_groups): if the group is readonly, then
-	desensitise it.
-	(source_group_menu_add_groups): return the first non-readonly
-	calendar index.
-	(calendar_setup_new_calendar): set the group history to the first
-	non-readonly group.
-	(calendar_setup_new_task_list): same.
-
-	* gui/gnome-cal.c (gnome_calendar_set_ui_component): fix for
-	user_creatable_items api changes.
-
-	* gui/e-tasks.c (e_tasks_set_ui_component): fix for
-	user_creatable_items api changes.
-
-2004-04-19  Michael Terry  <mike@mterry.name>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in:
-	* gui/calendar-commands.c:
-	* gui/calendar-component.c:
-	* gui/e-calendar-table.c:
-	* gui/e-calendar-view.c:
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-day-view.c:
-	* gui/e-day-view.h:
-	* gui/e-itip-control.c:
-	* gui/e-timezone-entry.c:
-	* gui/e-week-view-event-item.c:
-	* gui/e-week-view.c:
-	* gui/e-week-view.h:
-	* gui/tasks-component.c:
-	* gui/alarm-notify/alarm-notify-dialog.c:
-	* gui/alarm-notify/alarm-queue.c:
-	* gui/dialogs/comp-editor.c:
-	* gui/dialogs/event-editor.c: Update the calendar to use the icon theme
-	through the EIconFactory object in e-util
-
-2004-04-19  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (set_view): take a range_selected boolean for
-	internal use
-	(gnome_calendar_set_view): use above
-	(display_view): use priv->range_selected, we'll set it correctly
-	before this
-	(display_view_cb): only pass focus boolean
-	(gnome_calendar_on_date_navigator_selection_changed): set the view
-	so the view menu is accurate
-
-2004-04-18  JP Rosevear <jpr@ximian.com>
-
-	Fixes #54021
-	
-	* importers/icalendar-importer.c (update_single_object): ensure
-	UID exists
-
-2004-04-18  JP Rosevear <jpr@ximian.com>
-
-	Fixes #53124
-	
-	* gui/e-tasks.c: remove preview pieces, they are in their own
-	class now; use the new class for preview
-
-	* gui/e-cal-component-preview.[hc]: implement a preview area for
-	tasks and events
-
-2004-04-17  Trent Lloyd  <lathiat@sixlabs.org>
-
-	* gui/e-calendar-view.c: include libecal/e-cal-component.h to kill
-	implicit declaration of e_cal_component_get_recur_id_as_string at line
-	869.
-
-2004-04-15 Gary Ekker <gekker@novell.com>
-
-	Fixes #52271
-
-	* gui/e-cal-model-tasks.c: (set_percent): shouldn't call 
-	ensure_task_not_complete here, it removes the percent property that 
-	we just set.
-	
-
-2004-04-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_component): don't
-	actually check if start date is after due date, its perfectly
-	valid for that to occur
-
-2004-04-15  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #53903
-	
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets):
-	show/hide add button properly
-	(change_clicked_cb): ditto
-
-	* gui/dialogs/comp-editor.c (needs_send_cb): call back when "needs_send"
-	(page_changed_cb): use accessor
-	
-2004-04-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): stop listening to changes
-	since we are just going to save and close
-	(save_cmd): remove, its ok since we are toasting menus shortly
-	anyhow
-	(obj_modified_cb): no need to look at update flag
-	(obj_removed_cb): ditto
-
-2004-04-15  Gary Ekker  <gekker@novell.com>
-
-	* gui/calendar-component.h: move the calendar publishing initialization
-	from createControls to main.c
-
-	* gui/calendar-component.c: (create_controls): Ditto
-
-	* gui/main.c: (initialize): Ditto
-
-	* gui/dialogs/cal-prefs-dialog.c: (url_list_changed): remove a gfree
-	that was freeing a before it should have been. Also removed cruft from 
-	a previous attempt to fix the crash.
-
-2004-04-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog): added some
-	spacing.
-
-	* gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence):
-	use the DTSTART for the recur-id if it's not available.
-
-2004-04-14  Larry Ewing  <lewing@ximian.com>
-
-	* gui/calendar-component.c (selector_tree_drag_motion): fix
-	missing parameters, wow that was a mess.
-
-	* gui/dialogs/calendar-setup.glade: add the new "new" dialogs,
-	remove the old druids.
-
-	* gui/dialogs/calendar-setup.c (calendar_setup_new_calendar): use
-	the new dialogs, colors are still not functional.
-	(calendar_setup_new_task_list): use the new dialogs, with no colors.
-
-2004-04-14  JP Rosevear <jpr@ximian.com>
-
-	Fixes #56613
-	
-	* gui/gnome-cal.h: add proto
-
-	* gui/gnome-cal.c (client_cal_opened_cb): key the clients by uid
-	(backend_died_cb): ditto
-	(gnome_calendar_add_source): ditto
-	(gnome_calendar_remove_source): use remove_source_by_uid
-	(gnome_calendar_remove_source_by_uid): new function to remove a
-	source by uid
-	(gnome_calendar_set_default_source): key the clients by uid
-
-	* gui/calendar-component.c (update_task_selection): the source
-	could be NULL if the source was deleted rather than unchecked
-	(update_primary_task_selection): look at the task source list
-
-2004-04-14  JP Rosevear <jpr@ximian.com>
-
-	Fixes #56553
-	
-	* importers/icalendar-importer.c (prepare_events): don't double
-	free or continue, we need to move to the next item
-	 (prepare_tasks): don't continue, move to the next item
-	
-2004-04-14  Not Zed  <NotZed@Ximian.com>
-
-	* gui/tasks-component.c (impl_createControls): Same as below for
-	the tasks component.
-
-	* gui/calendar-component.c (impl_createControls): add the info
-	area label widget to the sidebar control (c&p the addressbook
-	code).
-
-2004-04-12  Gary Ekker  <gekker@novell.com>
-
-        Fixes #56628
-	
-	* gui/calendar-component.c (create_new_event): Add informational dialog
-	when user attempts event creation in read-only calendar.
-	
-
-2004-04-09  Gary Ekker  <gekker@novell.com>
-
-	* gui/dialogs/url-editor-dialog.c: Fixed to use e-passwords.
-
-	* gui/dialogs/cal-prefs-dialog.c: Fixed crash and bugs created by 
-	changes made for instant apply.
-
-	* gui/itip-utils.c: Fixed to use e-passwords.
-
-	* gui/e-pub-utils.c: Fixed to use e-passwords.
-	(just_published): Fixed error in logic.
-	(e_pub_publish): Fixed crash if ESource is NULL.
-	
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	EABDestination -> EDestination.
-	(e_delegate_dialog_get_delegate): same.
-	(e_delegate_dialog_get_delegate_name): same.
-
-	* gui/dialogs/alarm-options.c (alarm_to_malarm_widgets):
-	EABDestination -> EDestination.
-	(malarm_widgets_to_alarm): same.
-
-	* gui/e-select-names-editable.c
-	(e_select_names_editable_get_address): EABDestination ->
-	EDestination.
-	(e_select_names_editable_get_name): same.
-
-	* gui/e-meeting-list-view.c (process_section): EABDestination ->
-	EDestination.
-	(select_names_ok_cb): same.
-
-2004-04-09  Dan Winship  <danw@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_set_ui_component): Create an
-	EUserCreatableItemsHandler for the view if there isn't one yet,
-	and then activate it.
-	(gnome_calendar_destroy): destroy it.
-
-	* gui/calendar-component.c (impl__get_userCreatableItems): add
-	object/folder flags to items.
-
-	* gui/e-tasks.c (e_tasks_set_ui_component): Create an
-	EUserCreatableItemsHandler for the view if there isn't one yet,
-	and then activate it.
-	(e_tasks_destroy): destroy it.
-
-	* gui/tasks-component.c (impl__get_userCreatableItems): add
-	object/folder flags. Change "Task List" to "Tasks Group" per new
-	specs.
-
-	* gui/calendar-commands.c (calendar_control_deactivate): clear the
-	GnomeCal's ui_component rather than setting it again
-
-2004-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c: Fixed to be instant-apply.
-
-2004-04-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_set_default_client): just add the
-	client, we have protection against re-adding it any how
-	(cal_opened_cb): stop listening to the open signal
-
-2004-04-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_dayjump): remove extra set view
-	params
-	(gnome_calendar_set_view): simplify, just set the current view id
-	and let the gal view stuff do the rest
-	(display_view): modify from set_view, don't set the view id here
-	or update the default view config setting
-	(display_view_cb): update the date navigator
-	(gnome_calendar_construct): kill the default view stuff, gal view
-	handles that
-	(gnome_calendar_on_date_navigator_selection_changed): use display_view
-
-	* gui/e-week-view.c (time_range_changed_cb): ditto
-	(e_week_view_set_selected_time_range): just set the selection,
-	don't fool with the base date
-	(e_week_view_on_button_press): do a full day event if double
-	clicked on
-
-	* gui/e-day-view.c (time_range_changed_cb): only set the selection
-	if we can't preserve an existing selection
-
-	* gui/control-factory.c (set_prop): allow list view, remove
-	default view usage
-
-	* gui/calendar-config.h: remove protos
-
-	* gui/calendar-config.c: remove default view calls
-
-	* gui/calendar-commands.c (show_day_view_clicked): remove extra
-	params to gnome_calendar_set_view
-	(show_work_week_view_clicked): ditto
-	(show_week_view_clicked): ditto
-	(show_month_view_clicked): ditto
-	(show_list_view_clicked): ditto
-
-	* gui/apps_evolution_calendar.schemas.in.in: remove default view
-	setting, gal view remembers this for us
-
-2004-04-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-week-view.c (time_range_changed_cb): only select one day
-
-2004-04-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c: removed commented code.
-
-	* gui/alarm-notify/notify-main.c (main): removed useless call to set
-	the POA after construction.
-
-2004-04-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #56316
-
-	* gui/dialogs/comp-editor-page.[ch]: added "fill_timezones" virtual
-	method to CompEditorPage class.
-	(comp_editor_page_fill_timezones): new function.
-	(comp_editor_page_class_init): initialize new virtual method.
-
-	* gui/dialogs/event-page.c (event_page_fill_timezones,
-	event_page_class_init):
-	* gui/dialogs/task-page.c (task_page_fill_timezones,
-	task_page_class_init):
-	* gui/dialogs/task-details-page.c (task_details_page_fill_timezones,
-	task_details_page_class_init): implemented new virtual method for pages
-	dealing with timezones.
-
-	* gui/dialogs/comp-editor.c (save_comp): call the "fill_timezones"
-	method on all pages, and call...
-	(send_timezone): ...this function for each hash table item.
-
-2004-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): set the default timezone
-	on all clients when opened.
-
-2004-04-01  Radek Doulik  <rodo@ximian.com>
-
-	* gui/e-calendar-view.c
-	(e_calendar_view_delete_selected_occurrence): fix small typo
-
-2004-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): return correct
-	values (boolean).
-
-2004-03-31  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_calendars): make sure we unset the
-	float value for the panes if converting from 1.4 and earlier
-
-2004-03-31  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #56120
-	
-	* gui/gnome-cal.c (append_category_cb): update the correct element
-	(client_categories_changed_cb): pass the array, not a reference to
-	it
-
-2004-03-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c: fixed documentation typos.
-
-2004-03-31  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* gui/config-control.c (set_prop) : Replaced add_event_source 
-	with add_source and passed the VEVENT type as argument.
-
-2004-03-30  William Jon McCann  <mccann@jhu.edu>
-
-	* gui/dialogs/calendar-setup.glade:
-	* gui/dialogs/calendar-setup.c (new_task_list_finish)
-	(calendar_setup_new_task_list, calendar_setup_edit_task_list):
-	add remote calendar setup page to task list setup assistant and
-	edit dialog.  Remove separators from dialog.
-
-2004-03-29  Larry Ewing  <lewing@ximian.com>
-
-	* gui/calendar-component.c (selector_tree_drag_data_received):
-	deal with the action type a properly. in the normal case.
-	
-	* gui/calendar-component.c (selector_tree_drag_data_received):
-	call drag_finish properly, change the uid.
-	(selector_tree_drag_motion): set drag status properly.
-
-2004-03-29  William Jon McCann  <mccann@jhu.edu>
-
-	* gui/tasks-component.c (delete_task_list_cb): 
-	* gui/calendar-component.c (delete_calendar_cb):
-	don't require client to be loaded in order to remove the source
-
-	* gui/migration.c (create_task_sources, migrate_tasks): create
-	On The Web source group for tasks.
-
-2004-03-29  Hari Prasad Nadig  <hp@ndeepak.info>
-
-	* gui/goto-dialog.glade: Naming issue, Go to Date -> Select Date,
-	Go to Today -> Select today. Solves 48293
-	
-	* gui/e-calendar-view.c: gives aid to the above change.
-
-2004-03-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (query_objects_changed_cb): removed
-	misplaced return statement that prevented the rest of the objects list
-	to be processed.
-
-2004-03-29  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-calendar-view.c: (e_calendar_view_class_init): remove the
- 	EVENT_MOVE signal which was binded to Alt + Arrows.
- 	* gui/e-calendar-view.h: ditto.
- 	* gui/e-day-view.c: (e_day_view_class_init),
-	(e_day_view_do_key_press), (e_day_view_event_move): handle Alt + Arrows
-	in the more general place e_day_view_do_key_press so that we can avoid
-	the conflicting accessible key. When an appointment is selected,
-	pressing Alt + Arrows causes it to be moved around. Otherwise, pressing
-	Alt + LEFT/RIGHT will move the focus to the same day in the
-	previous/next week.
-	* gui/e-week-view.c: (e_week_view_class_init),
-	(e_week_view_event_move), (e_week_view_do_key_press): ditto.
-
-2004-03-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (update_e_cal_view_for_client): guard against
-	the case that we redo queries while still waiting for a client to
-	open
-
-2004-03-26  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #53134
-	
-	* gui/e-cal-model.c (get_description): make sure to set the string
-	to NULL so that if this component doesn't have a description we
-	don't double free next time we are called
-
-2004-03-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_calendars): no need to explicitly add
-	the contacts group, the create function does this properly
-
-2004-03-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_calendars): make sure we always sync
-	the source list and just do it once; unref the sources we get
-	(migrate_tasks): make sure we always sync
-	the source list and just do it once
-
-2004-03-26  JP Rosevear <jpr@ximian.com>
-
-	Fixes #55648
-	
-	* gui/print.c (print_todo_details): get the default from the model
-
-	* gui/gnome-cal.h: remove and update protos
-
-	* gui/gnome-cal.c (update_query): the clients and client_list
-	members are now arrays of source types
-	(setup_widgets): default the query to everything for tasks, cast
-	the config items
-	(gnome_calendar_init): init all the client hashs
-	(gnome_calendar_destroy): clean them up, clean up all categories
-	(client_cal_opened_cb): handle based on source type
-	(append_category_cb): don't track the size in the closure
-	(client_categories_changed_cb): do all the merging here
-	(backend_died_cb): handle based on source type
-	(gnome_calendar_construct): we don't special case the task stuff
-	any more
-	(gnome_calendar_get_default_client): return the default of the
-	current view
-	(gnome_calendar_add_source): take a source type argument and
-	append accordingly
-	(gnome_calendar_remove_source): similar, but remove accordingly
-	(gnome_calendar_set_default_source): take a source type argument and
-	set the default accordingly
-	(gnome_calendar_new_task): use the default of the task model
-
-	* gui/e-calendar-view.c (e_calendar_view_add_event): kill warning
-
-	* gui/calendar-component.c (update_uris_for_selection): pass
-	source type when adding/removing
-	(update_uri_for_primary_selection): ditto
-	(update_task_selection): make sure we show the correct list of
-	tasks
-	(update_primary_task_selection): make sure we track the primary
-	task correctly
-	(delete_calendar_cb): pass source type when removing
-	(config_primary_selection_changed_cb): config listener callback
-	for tasks
-	(config_tasks_selection_changed_cb): ditto
-	(impl_createControls): load the initial task selection, listen for
-	changes
-	(calendar_component_init): get the source lists
-
-	* gui/calendar-commands.c (sensitize_taskpad_commands): get the
-	task pad and then the default client from that
-
-2004-03-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (find_client_data): finds the client data for
-	a client
-	(cal_opened_cb): update the query
-	(add_new_client): return client data
-	(e_cal_model_add_client): add the client immediately no matter
-	what, and possibly wait for it to open
-	(remove_client): guard against NULL query
-	(e_cal_model_remove_client): use find_client_data
-	(e_cal_model_dispose): guard against a NULL query
-
-2004-03-25  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (remove_client): fix off by one error when
-	emitting deleted signal
-
-2004-03-25  JP Rosevear <jpr@ximian.com>
-
-	Fixes #53499
-	
-	* gui/gnome-cal.c (setup_widgets): don't give the state file to
-	the list view
-	(set_view): ensure that if the list view was in custom mode it
-	stays that way
-	(display_view_cb): attach to the etable of the list view
-	(gnome_calendar_setup_view_menus): use an etable gal view for the
-	list view and don't set the view twice
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus): the instance should no
-	longer be per task uri since all the uris are shown together
-
-	* gui/e-cal-list-view.h: update/add protos
-
-	* gui/e-cal-list-view.etspec: limit the available columns to what
-	product design agreed on
-
-	* gui/e-calendar-table.etspec: ditto
-
-	* gui/e-cal-list-view.c (e_cal_list_view_class_init): ignore
-	update query calls
-	(e_cal_list_view_load_state): make public
-	(e_cal_list_view_save_state): ditto
-	(setup_e_table): don't handle state saving ourselves
-	(e_cal_list_view_construct): ditto
-	(e_cal_list_view_new): ditto
-	(e_cal_list_view_destroy): ditto
-
-	* gui/calendar-view.c (calendar_view_get_type_code): we don't
-	handle the list view here
-
-	* gui/calendar-view-factory.c
-	(calendar_view_factory_get_type_code): we don't handle the list
-	view here
-	(calendar_view_factory_get_title): ditto
-
-2004-03-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (update_query): don't create queries for the clients
-	that are not loaded yet.
-
-2004-03-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): remove debug code that
-	slipped in
-
-2004-03-24  Danilo Å egan  <dsegan@gmx.net>
-
-	* gui/e-alarm-list.c (get_alarm_duration_string): Use ngettext for
-	handling plural forms (fixes bug #53464). 
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Likewise.
-	* gui/e-itip-control.c (write_recurrence_piece): Likewise.
-
-2004-03-23  JP Rosevear <jpr@ximian.com>
-
-	Fixes #51948
-	
-	* gui/dialogs/meeting-page.c (button_press_event): compile this
-	again, determine the row with a different method
-	(button_press_event): pass mpage
-	(meeting_page_construct): listen for button press event
-
-	* gui/e-meeting-list-view.c: remove commit that wasn't supposed to
-	go in
-
-2004-03-23  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-calendar-view.c: make the flow control correct
-
-2004-03-23  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (create_calendar_sources, create_task_sources):
-	ensure that only one Personal calendar/task list gets created when
-	moving between minor versions
-
-2004-03-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c (copy_source): remove unused
-	variable
-
-	* gui/e-cal-model.c (e_cal_model_copy_component_data): make the
-	precondition return NULL
-
-	* gui/control-factory.c (get_prop): make sure this code isn't
-	reached
-
-	* gui/calendar-component.c
-	(calendar_component_peek_source_selector): cast to kill warning
-
-2004-03-23 Umesh Tiwari   <tiwariumesh232@rediffmaiil.com>
-
-	For bug#53417
-
-	* gui/e-tasks.c:
-	Clear the preview panel after the last task is deleted.
-
-2004-03-23  Alfred Peng <alfred.peng@sun.com>
-
-	* gui/dialogs/alarm-options.c (malarm_widgets_to_alarm): get
-	the mail alarm description message from "malarm_description"
-	instead of "dalarm_description".
-
-2004-03-23  Alfred Peng <alfred.peng@sun.com>
-
-	* gui/alarm-notify/alarm-queue.c (audio_notification): If there
-	is no attachment for a audio reminder, only a message window
-	shows up.
-	Get a beep sound even without attachment for audio reminder.
-
-2004-03-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-view.c (e_calendar_view_add_event): get the UID
-	from the server on newly created events and set the ECalComponent's
-	UID to that, for further operations.
-
-2004-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-view.c: added 'Copy/Move to Calendar' menu entries.
-	(on_copy_to, on_move_to): callbacks for new menu items.
-	(on_print_event): don't leak selection list.
-
-2004-03-19  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #55716
-	
-	* gui/e-cal-model.c (remove_client): unset the default if the
-	client removed was the default
-
-2004-03-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (update_uris_for_selection): if
-	gnome_calendar_add_event_source fails, don't add the client to the
-	internal client list.
-
-2004-03-19  JP Rosevear <jpr@ximian.com>
-
-	Fixes #55723
-	
-	* gui/e-day-view.c (process_component): compare ecalcomponents,
-	not icalcomponents (the compare func is borked), check recurrence
-	changes better
-	(e_day_view_init): just use the model the parent creates
-
-	* gui/e-week-view.c (process_component): create the temporary item
-	from the correct icalcomp
-	(e_week_view_init): just use the model the parent creates
-
-2004-03-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/select-source-dialog.c (select_source_dialog): create
-	an ESourceSelector instead of a ESourceOptionMenu, to be consistent
-	with the other components, and create a scrolled window to hold the
-	source selector.
-	(primary_selection_changed_cb): callback for "primary_selection_changed"
-	signal in the ESourceSelector.
-
-2004-03-18  Alfred Peng <alfred.peng@sun.com>
-
-	* Fix #51187 on bugzilla of ximian
-	* gui/alarm-notify/alarm-queue.c (query_objects_changed_cb):
-	If "alarms" or "alarms->alarms" is NULL after querying a calendar
-	for the alarms of a particular object, the reuse of "cqa" will
-	probably cause evolution-alarm-notify to crash.
-	So remove "cqa" when "alarms" or "alarms->alarms" is NULL. Otherwise
-	update it.
-
-2004-03-17  hpnadig  <hp@ndeepak.info>
-
-	* gui/dialogs/task-page.glade: Capitalized words changed. Solves 48115.
-
-	* gui/dialogs/task-details-page.glade: s/Date Completed/Date completed.
-
-	* gui/e-calendar-table.etspec: Capitalization checked. Solves 48130.
-
-2004-03-17 Gary Ekker <gekker@novell.com>
-
-	Fixes #55292
-	
-	* gui/e-pub-utils.c (e_pub_publish): fix a crash when trying to
-	publish a NULL component
-
-2004-03-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/select-source-dialog.[ch]: new dialog for allowing the
-	user to select a source.
-
-	* gui/dialogs/copy-source-dialog.c (copy_source_dialog): use the
-	select_source_dialog function to ask user for the source to use.
-	(source_selected_cb): removed unneeded function.
-
-	* gui/dialogs/Makefile.am: added new files.
-
-2004-03-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c
-	(calendar_control_sensitize_calendar_commands): check if the selected
-	event has its associated ECalModelComponent.
-
-2004-03-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-tasks.c (search_bar_sexp_changed_cb): set the search query
-	(e_tasks_init): set the query to be #t by default
-
-	* gui/e-cal-model.c (redo_queries): use the search query if there
-	is one (and no time is set), make sure to dup the #f
-
-2004-03-15  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_fill_widgets):
-	use right cast macro
-
-2004-03-15  JP Rosevear  <jpr@ximian.com>
-
-	* Rename e-cal-view to e-calendar-view and fix includes
-	
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_fill_widgets):
-	pre-conditions should return FALS
-
-	* gui/e-cal-model.c (copy_ecdv): return the new struct
-
-	* gui/Makefile.am: build renamed files
-
-2004-03-15  JP Rosevear <jpr@ximian.com>
-
-	Fixes #52253
-	
-	* gui/print.c (print_week_summary_cb): copy component data
-
-	* gui/gnome-cal.c (get_times_for_views): calculate the time range
-	for each view
-	(set_search_query): set the search query on the model
-	(set_week_start): set the week start day
-	(week_start_changed_cb): track if it changes
-	(setup_config): set its notification
-	(setup_widgets): update the view times and date navigator
-	(gnome_calendar_init): remove dead values
-	(gnome_calendar_goto_date): just calc the new time and let
-	update_view_times handle it
-	(gnome_calendar_goto): ditto
-	(gnome_calendar_direction): ditto
-	(gnome_calendar_set_selected_time_range): ditto
-	(gnome_calendar_dayjump): ditto
-	(update_view_times): set the time ranges on the models
-	(set_view): use the new preserve day setting
-	(gnome_calendar_set_view): don't update the view times, just
-	switch
-	(gnome_calendar_get_selected_time_range): get the time range
-	(gnome_calendar_on_date_navigator_selection_changed): don't
-	re-update the date navigator, centralize the view setting
-
-	* gui/e-week-view.c (time_range_changed_cb): handle the time range
-	changing
-	(process_component): move here
-	(model_changed_cb): handle the model changing
-	(update_row): updated a changed row
-	(model_row_changed_cb): update a row
-	(model_cell_changed_cb): ditto
-	(model_rows_inserted_cb): handle events being added
-	(row_deleted_check_cb, remove_uid_cb, model_rows_deleted_cb):
-	handle events being deleted
-	(timezone_changed_cb): handle timezone changing
-	(e_week_view_init): create the model and listen to it
-	(e_week_view_new): don't create the model here
-	(e_week_view_set_selected_time_range): no need to cast
-	(e_week_view_set_first_day_shown): ditto
-	(e_week_view_set_weeks_shown): ditto
-	(e_week_view_update_event_cb): free and copy the data using new
-	routines
-	(e_week_view_foreach_event): step through every event
-	(e_week_view_remove_event_cb): we no longer track allocated status
-	(e_week_view_on_button_release): don't set the seleciton in the
-	calendar
-	(e_week_view_free_events): free the data with the util
-	(e_week_view_add_event): no need to track allocated status
-	(e_week_view_on_adjustment_changed): no need to cast
-
-	* gui/e-day-view.c (e_day_view_class_init): update query is no
-	longer used via class method
-	(time_range_changed_cb): handle the time range changing
-	(process_component): move here
-	(model_changed_cb): handle the model changing
-	(update_row): updated a changed row
-	(model_row_changed_cb): update a row
-	(model_cell_changed_cb): ditto
-	(model_rows_inserted_cb): handle events being added
-	(row_deleted_check_cb, remove_uid_cb, model_rows_deleted_cb):
-	handle events being deleted
-	(timezone_changed_cb): handle timezone changing
-	(e_day_view_init): create a model, connect to its signals
-	(e_day_view_destroy): we don't have our own query anymore
-	(e_day_view_update_event_cb): free and copy the data using new
-	routines
-	(e_day_view_remove_event_cb): we no longer track allocated status
-	(e_day_view_set_selected_time_range): actually set the selection
-	(e_day_view_recalc_day_starts): no need to cast
-	(e_day_view_recalc_work_week): ditto
-	(e_day_view_update_calendar_selection_time): don't call back to
-	the main calendar
-	(e_day_view_free_event_array): use the free util
-	(e_day_view_add_event): don't track allocated status
-
-	* gui/e-calendar-marshal.list: add marshaller
-
-	* gui/e-cal-view.h: remove field
-
-	* gui/e-cal-view.c: no longer listen for model signals
-	(e_calendar_view_class_init): make the model arg not construct
-	time
-
-	* gui/e-cal-model.h: update/add protos
-
-	* gui/e-cal-model.c (e_cal_model_class_init): set the dispose
-	handler and add a time_range_changed signal
-	(e_cal_model_init): defaults for queries
-	(e_cal_model_dispose): dispose of things
-	(e_cal_model_finalize): remove bits that are in dispose now
-	(search_by_uid_and_client): allow NULL client to find any uid
-	(e_cal_view_objects_added_cb): ref the client
-	(update_e_cal_view_for_client): use the full query
-	(remove_client): pre change for each row and emit deleted signals
-	(redo_queries): relaunch the query for each client
-	(e_cal_model_get_time_range): get the time range
-	(e_cal_model_set_time_range): set the time range and redo the
-	queries
-	(e_cal_model_set_search_query): get the search query
-	(e_cal_model_set_search_query): set the search query and redo the
-	queries
-	(e_cal_model_get_component_for_uid): get the component info based
-	on uid
-	(copy_ecdv): copy and ECellDateEditValue
-	(e_cal_model_copy_component_data): copy component data
-	(e_cal_model_free_component_data): unref the client
-
-2004-03-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #48112
-
-	* gui/calendar-commands.c (calendar_control_sensitize_calendar_commands):
-	disable the 'Delete' menu item on recurring meetings, since 'Delete all
-	Occurrences' already deals with that.
-
-2004-03-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #35577
-
-	* gui/e-cal-view.c (e_calendar_view_delete_selected_occurrence):
-	if the component is an instance, pass the recurrence ID to
-	e_cal_remove_object_with_mod. Also, make the user confirm the
-	deletion, and send the cancellation message for meetings.
-
-2004-03-12  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-cal-model.c (ecm_initialize_value): return "" instead of
-	NULL if there is no default_category set.  Fixes #53419.
-
-2004-03-09  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-day-view.c: (e_day_view_finish_long_event_resize): add a call
-	to e_cal_component_commit_sequence since we have changed the property
-	of the component. Whether the new event is all day should also be
-	set properly according to the value of the original event.
-
-2004-03-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #48106
-
-	* gui/dialogs/alarm-page.glade: s/Send an Email/Send an email.
-
-2004-03-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_init): set a GConf
-	listener callback to list for changes in selected calendars.
-	(alarm_notify_finalize): remove the GConf notification listener.
-	(conf_changed_cb): callback to react on configuration changes. Process
-	the new selected calendars and remove the unselected ones.
-	(process_removal_in_hash): callback to remove unselected calendars.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #50294
-
-	* gui/e-tasks.c (setup_widgets): connect to "model_rows_deleted" signal
-	on the ETable's model.
-	(model_rows_deleted_cb): callback for clearing the preview widget when
-	the currently selected task is removed.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_sensitize_calendar_commands):
-	set the sensitivity correctly, depending on whether the command applied
-	to the currently selected event or the default client.
-	(calendar_control_activate): make sure we start with the menu items
-	correctly enabled/disabled.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53496
-
-	* gui/dialogs/cal-prefs-dialog.glade: set the same spacing for all
-	tabs in the notebook.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_append_page): always add
-	the page.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): continue filling
-	up all other fields even if there are missing ones, and return the
-	validation result.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):
-	don't make the dialog window sticky, the icon on the system tray
-	already shows in all workspaces.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #54028
-
-	* gui/alarm-notify/alarm-queue.c (query_objects_changed_cb): fixed the
-	time range for the alarm query, to include the end of today.
-
-2004-03-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53137
-
-	* gui/dialogs/comp-editor-page.[ch]: made fill_widgets virtual
-	method return a gboolean.
-	(comp_editor_page_fill_widgets): return value from virtual method
-	implementation.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets):
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets):
-	* gui/dialogs/recurrence-page.c (recurrence_page_fill_widgets):
-	* gui/dialogs/schedule-page.c (schedule_page_fill_widgets):
-	* gui/dialogs/task-details-page.c (task_details_page_fill_widgets):
-	* gui/dialogs/task-page.c (task_page_fill_widgets):
-	* gui/dialogs/alarm-page.c (alarm_page_fill_widgets): return value,
-	as expected from the virtual method signature.
-
-	* gui/dialogs/comp-editor.c (comp_editor_append_page): dont add the
-	page if there was an error calling the fill_widgets method.
-
-2004-03-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_add_client): prevent from adding
-	the same client more than once.
-
-2004-03-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/cal-search-bar.c: added support for searching the location
-	field also.
-	(regen_query): take into account the new search field.
-
-2004-03-02  JP Rosevear <jpr@ximian.com>
-
-	* gui/Makefile.am: remove conduit dir creation
-
-2004-03-02  Larry Ewing  <lewing@ximian.com>
-
-	* gui/calendar-component.c: add untested start of dnd support for
-	source selector.
-
-2004-03-01  Dan Winship  <danw@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c: fix rampant double-freeing.
-
-2004-03-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/itip-utils.c (comp_server_send): pass the user list and
-	returned icalcomponent to e_cal_send_objects().
-
-2004-03-01  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/print.c: (print_date_label): ignore the timezone info of all-day
-	events.
-
-2004-02-27  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.h: remove proto
-
-	* gui/gnome-cal.c (set_query): rename from
-	gnome_calendar_set_query and make static
-
-	* gui/e-day-view.h: remove proto for dead function
-
-	* gui/e-day-view.c: guard config.h include
-
-2004-02-26  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Create the arrows in these widgets as GTK_SHADOW_NONE, since the
-	default arrow type in GTK+ 2.x is flat triangle arrows, and shadow
-	types are generally ignored for arrows anyway, and so we don't look
-	ugly with themes that handle shadow types on arrows correctly
-
-2004-02-26  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	Fix the repo_id to include the evolution base version
-
-2004-02-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): make sure we unref the
-	task pad client and the calendar clients are unreffed by the hash
-	table
-
-2004-02-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_calendars): fix float type pane
-	position keys (we migrated these improperly in the past), just use
-	the default value
-
-	Fixes #53087
-
-2004-02-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (free_client_hash): remove the client
-	from the queue also.
-
-	* gui/gnome-cal.c (client_cal_opened_cb): set the task pad client to NULL
-	if opening it failed. Show more verbose status bar messages.
-
-2004-02-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* common/authentication.c (auth_func_cb): call first e_passwords_get_password
-	before calling _ask_password.
-
-	* gui/alarm-notify/alarm-queue.c (query_objects_changed_cb): add 1 second
-	to the last notification time, or we'll get many times the same notification.
-
-2004-02-18  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-cal-view.c: (e_calendar_view_add_event),
-	(clipboard_get_text_cb): make copy & paste and drag & drop behave
-	the same way described as follows:
-	In day view and work week view
-		from main canvas to top canvas
-			before copy or drag: short event
-			after paste or drop: all-day event
-		from main canvas to main canvas
-			before copy or drag: short event
-			after paste or drop: short event
-		from top canvas to top canvas
-			before copy or drag: all-day event
-			after paste or drop: all-day event			
-			before copy or drag: long event
-			after paste or drop: long event
-		from top canvas to main canvas
-			before copy or drag: all-day event
-			after paste or drop: short event
-			before copy or drag: long event
-			after paste or drop: short event
-	In week view, month view and list view life is pretty simple since
-	there's no top canvas in these three views. We just get what we copy
-	or drag after we perform paste or drop.
-
-2004-02-18  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/itip-utils.c: (itip_send_comp): set the string length properly.
-
-2004-02-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (tray_icon_clicked_cb): removed buggy
-	characters from menu items' texts.
-
-2004-02-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): open the
-	calendars asynchonously.
-	(cal_opened_cb): callback for "cal_opened" signal. Add the calendars to
-	the alarm queue here.
-
-	* gui/alarm-notify/alarm-queue.c (query_objects_changed_cb): get alarms
-	since the last notification, only use current time when there is no
-	previous notification time.
-
-	* gui/alarm-notify/notify-main.c (init_session): set session restart
-	style to RESTART_IF_RUNNING.
-
-2004-02-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/notify-main.c: no need to keep the master client.
-	(init_session): just set the daemon's restart style, not the restart
-	command. Connect to "save_yourself" signal on the session also.
-	(save_session_cb): set the restart command here.
-
-2004-02-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c (copy_source_dialog): Instead
-	of saying "Select destination source", we now say "... calendar" or
-	"... task list", based on object type.
-
-2004-02-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/migration.c (CONTACTS_BASE_URI): rename from
-	CONTACT_BASE_URI, and change to contacts:// to match e-d-s.
-	(create_calendar_contact_source): CONTACT -> CONTACTS.
-	(create_calendar_sources): same.
-
-2004-02-13  Bruce Tao  <bruce.tao@sun.com>
-                                                                                
-        See #51567
-	* gui/dialogs/delete-comp.c (delete_component_dialog):
-        use "gtk_dialog_add_buttons" to change the response_id of button
-        "YES" and "NO".
-
-2004-02-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53886
-
-	* gui/gnome-cal.c (gnome_calendar_paste_clipboard,
-	gnome_calendar_delete_selection, gnome_calendar_cut_clipboard,
-	gnome_calendar_copy_clipboard): removed g_assert_if_reached calls
-	since we might get a different widget getting the focus.
-	(get_focus_location): check the canvas's' focused item.
-
-2004-02-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53271
-
-	* gui/calendar-component.c (delete_calendar_cb): remove the source from
-	the GnomeCalendar widget also.
-
-	* gui/tasks-component.c (delete_task_list_cb): ditto.
-
-2004-02-11  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/print.c: (print_date_label): guarantee we do have some timezone
-	before the time convertion.
-
-2004-02-10  JP Rosevear <jpr@ximian.com>
-
-	* importers/icalendar-importer.c: remove useless include
-
-	* importers/Makefile.am: remove executable build cruft
-
-2004-02-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): don't add the clients to the
-	internal hash/list here, just remove it if opening the calendar fails.
-	(gnome_calendar_add_event_source): add the client to the internal
-	hash/list here.
-
-2004-02-09  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-cal-model-tasks.c: (ecmt_set_value_at): refuse to update
-	the task info if due date is before start date.
-
-2004-02-05  JP Rosevear <jpr@ximian.com>
-
-	* Convert the calendar_config_get_timezone and
-	icaltimezone_get_builtin_timezone pair to just
-	calendar_config_get_icaltimezone, this also guarantees we will
-	have some timezone (even if its just UTC)
-
-	Fixes #53754
-	
-2004-02-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-config.h: add proto
-
-	* gui/calendar-config.c (calendar_config_get_icaltimezone): return
-	the icaltimezone based on the location and default to utc if we
-	can't find one
-	(calendar_config_get_hide_completed_tasks_sexp): use above
-
-2004-02-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (set_color_picker): make failure
-	not so draconian - make the color black
-
-	Fixes #53547
-	
-2004-02-05  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/goto-dialog.glade: add a mnemonic for the 'Go to Today' button
-	in the 'Go To Date' dialog.
-
-2004-02-05  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-        Fixes #53388
-
-        * gui/e-itip-control.c (get_next): added a check for NULL
-
-2004-02-04  JP Rosevear <jpr@ximian.com>
-
-	* importers/icalendar-importer.c (gnome_calendar_import_data_fn):
-	use new cal auth functions
-
-	* common/authentication.c (auth_new_cal_from_default): get a
-	default calendar with auth
-
-	* common/authentication.h: add proto
-
-2004-02-04  JP Rosevear <jpr@ximian.com>
-
-	* importers/icalendar-importer.c (importer_destroy_cb): we only
-	have a single client to free
-	(prepare_events): make the vtodo list optional
-	(button_toggled_cb): handle the type of thing to import switching
-	(primary_selection_changed_cb): handle the selected item switching
-	(create_control_fn): create a control with types (events, tasks)
-	and corresponding source selectors
-	(process_item_fn): only import one type of item at a time
-	(load_file_fn): load the ecal as dictated by the source and type
-	(vcal_importer_new): pass in control function
-	(gnome_calendar_import_data_fn): get the default calendars
-
-	* importers/Makefile.am (importersdir): add lib
-
-2004-02-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #52970
-
-	* idl/evolution-calendar.idl: added back the AlarmNotify interface.
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	changed to have the AlarmNotify component be created via a factory.
-
-	* gui/alarm-notify/alarm-notify.[ch]: converted to implement the
-	AlarmNotify interface.
-
-	* gui/alarm-notify/notify-main.c (main): register the factory with
-	bonobo_generic_factory_new, not the object itself. Removed redundant
-	call to bonobo_object_unref. Call e_passwords_shutdown on exit.
-
-	* gui/alarm-notify/config-data.c (config_data_get_calendars_to_load):
-	get only the selected calendars/task lists.
-
-2004-02-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_add_event_source): don't update the
-	date navigator query nor the internal lists here...
-	(client_cal_opened_cb): do it here.
-
-2004-02-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/main.c (launch_alarm_daemon_cb): display the exception message
-	on error.
-
-	* gui/gnome-cal.c (open_ecal): open calendars asynchronously.
-	(client_cal_opened_cb): on success, add the clients to the models here.
-	(gnome_calendar_add_event_source, gnome_calendar_construct): not here.
-
-2004-02-04  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/dialogs/alarm-page.glade: change the access key for adding a
-	reminder from Alt+a to Alt+d to avoid conflict with the menuitem.
-
-2004-02-04 Yong Sun <Yong.Sun@sun.com>
-
-	* gui/print.c: Fix a bug in evolution/calendar/gui/print.c:
-	bound_text(). It does not break lines with the correct boundary of UTF-8
-	characters. So, for non-latin locales, it will cause printing issues.
-
-2004-02-03  Dan Winship  <danw@ximian.com>
-
-	* gui/tasks-component.h: Fix location of e-activity-handler.h
-	#include
-
-	* gui/Makefile.am (INCLUDES): add widgets/misc for
-	e-activity-handler.h and e-task-bar.h
-
-	* gui/dialogs/Makefile.am (INCLUDES): Likewise
-
-2004-02-02  JP Rosevear <jpr@ximian.com>
-
-	* importers/icalendar-importer.c (support_format_fn): use
-	g_file_get_contents
-	(load_file_fn): ditto
-	(vcal_support_format_fn): ditto
-	(load_vcalendar_file): ditto
-
-2004-01-30  JP Rosevear <jpr@ximian.com>
-
-	* remove dead files
-
-2004-01-29 Gary Ekker <gekker@novell.com>
-
-	Fixes #51871
-
-	* gui/dialogs/calendar-setup.c (calendar_setup_edit_calendar): add
-	activate handler for name_entry
-	(calendar_setup_edit_task_list): ditto
-
-2004-01-30  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (create_new_todo): remove extraneous ;
-
-	Fixes #53418
-
-2004-01-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (create_calendar_contact_source): don't set the
-	group to be read only until after the source is added.
-
-2004-01-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_ical_folder_to_source): migrate to a
-	specific source
-	(migrate_ical_folder): create a new source based on the new source
-	name/uid
-	(create_calendar_contact_source): use the #define for the base uri
-	(create_calendar_sources): try and find the right sources if they
-	already exist
-	(create_task_sources): ditto
-	(migrate_calendars): make sure the personal source is the system
-	source
-	(migrate_tasks): ditto
-
-2004-01-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-view.c (calendar_view_get_type_code): added support for
-	the list view also.
-
-2004-01-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (update_query):
-	* gui/e-cal-list-view.c (e_cal_list_view_update_query):
-	* gui/e-cal-view.c (e_calendar_view_update_query): stop status bar
-	messages madness.
-
-2004-01-27  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-component.c (delete_calendar_cb): use e_cal_remove
-
-	* gui/tasks-component.c (delete_task_list_cb): ditto
-
-2004-01-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53276
-
-	* gui/dialogs/copy-source-dialog.c (show_error): new function to
-	create an error message dialog.
-	(copy_source): check if the destination calendar is read only, and
-	if so, don't try to copy components over. Fixed leaks. Call show_error
-	to display meaningful error messages.
-
-2004-01-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_ical_folder): add the source to the
-	group so it actually shows up
-
-2004-01-26  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (migrate_calendars): get the source name with
-	out using freed memory
-	(migrate_tasks): ditto
-
-2004-01-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #53338
-
-	* gui/dialogs/calendar-setup.c (dialog_to_source): set the relative
-	URI on the source for remote sources.
-
-2004-01-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #52312
-
-	* gui/dialogs/calendar-setup.c (create_new_source_with_group):
-	* gui/migration.c (migrate_ical_folder, create_calendar_sources,
-	create_task_sources): set the relative URI for local calendars and
-	task lists to be the source UID.
-
-2004-01-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.[ch]
-	(calendar_component_peek_source_selector): new function.
-
-	* gui/tasks-component.[ch]
-	(tasks_component_peek_source_selector): new function.
-
-	* gui/e-tasks.c (backend_died_cb):
-	* gui/gnome-cal.c (backend_died_cb): don't tell the user to restart
-	Evolution, there is no need now, just unselecting and selecting
-	back the calendar loads it again. Also, remove the crashed client
-	from the list of loaded clients. Also, unselect the source on
-	the source selector.
-
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (update_primary_selection): use
-	e_source_list_peek_source_any
-	(setup_create_ecal): ditto
-	(create_new_todo): just use the default call directly
-	(update_uris_for_selection): just use e-tasks remove/add todo
-	source directly
-
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_add_todo_source): don't unref and ref,
-	the hash table does this
-	(e_tasks_remove_todo_source): ditto
-
-	Fixes #53281
-
-2004-01-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): use the colors from
-	the model as background, not as foreground.
-
-	* gui/e-cal-model-tasks.c (ecmt_get_color_for_component): return the
-	color assigned to each URI if it's not overdue.
-
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (delete_task_list_cb): sync the source
-	list after the source removal
-
-	* gui/calendar-component.c (delete_calendar_cb): ditto
-
-	Fixes #53271
-	
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (setup_progress_dialog): display a progress
-	dialog
-	(dialog_close): destroy it
-	(dialog_set_folder_name): display the folder being migrated
-	(dialog_set_progress): update the progress
-	(check_for_conflict): make sure we don't name anything the same
-	(get_source_name): create a source name
-	(migrate_ical): migrate the events/tasks from one ecal to another
-	(migrate_ical_folder): migrate a specific folder
-	(migrate_calendars): use above
-	(migrate_tasks): ditto
-
-2004-01-23  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/e-itip-control.c: Use PUBLISH if no METHOD defined
-
-	Fixes #45564
-
-2004-01-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_view_objects_removed_cb): don't assert
-	if we can't find the component, just continue with next item in
-	the list.
-
-2004-01-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c (process_old_dir): remove useless e_mkdir_hier
-	call.
-
-	Fixes #53065
-
-2004-01-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus): Remove debugging
-	statement
-
-2004-01-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): use the calendar component
-	config dir
-	(gnome_calendar_setup_view_menus): use the calendar component base
-	dir for the view storage
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus): use the task component
-	base dir for the view storage
-
-	Fixes #53133
-
-2004-01-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_add_todo_source): check return value
-	from auth_new_cal_from_source(). Connect to "backend_died"
-	signal on the ECal class.
-	(backend_died_cb): callback for "backend_died" that displays
-	an error message when that happens.
-
-	* gui/gnome-cal.c (backend_died_cb): use a GtkMessageDialog.
-
-2004-01-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-tasks.[ch] (e_tasks_add_todo_uri, e_tasks_remove_todo_uri,
-	e_tasks_get_default_uri): renamed to _source and made them work
-	with ESource's.
-
-	* gui/tasks-component.c (update_uri_for_primary_selection,
-	add_uri_for_source, remove_uri_for_source):
-	* gui/tasks-control.c (tasks_control_set_property): updated for
-	changes in e-tasks.[ch].
-
-2004-01-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/calendar-setup.c (create_new_source_with_group):
-	added 'ECalSourceType' argument to be able to create the
-	ECal correctly. Added a call to e_cal_open with 'only_if_exists'
-	set to FALSE so that the backend creates the calendar.
-	(new_calendar_finish, new_task_list_finish): pass new argument
-	to create_new_source_with_group.
-
-2004-01-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (delete_task_list_cb): call
-	e_cal_remove_calendar to actually remove the task list via
-	the backend.
-
-2004-01-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #51705
-
-	* gui/calendar-component.c (delete_calendar_cb): call
-	e_cal_remove_calendar to actually remove the calendar via
-	the backend.
-
-2004-01-21  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/calendar-setup.c (calendar_setup_new_calendar): just
-	use the convienence function for the default gconf client (fixes
-	leak)
-	(calendar_setup_new_task_list): ditto
-	(new_task_list_finish): we don't support task uri's
-	
-2004-01-21  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/calendar-setup.c (source_to_dialog): only block
-	widgets that exist
-
-2004-01-19  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model-tasks.c (ensure_task_not_complete): correct
-	property name c/p error
-
-	Fixes # 52269
-	
-2004-01-19  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (update_primary_selection): handle the
-	case where we have a bogus uid
-
-	* gui/calendar-component.c (update_primary_selection): ditto
-	
-2004-01-19  Radek Doulik  <rodo@ximian.com>
-
-	* gui/print.c (print_day_add_event): uncomment and use
-	ECalModelComponent
-	(print_day_details): use e_cal_model_generate_instances
-	(print_day_details_cb): use ECalModelGenerateInstancesData
-	(print_day_long_event): use event color
-	(print_day_event): ditto
-	(print_month_small): use e_cal_model_generate_instances
-	(instance_cb): use ECalModelGenerateInstancesData
-
-2004-01-18  Radek Doulik  <rodo@ximian.com>
-
-	* gui/print.c (print_border_with_triangles): use rgb color as
-	fillcolor
-	(print_week_day_event): ditto
-	(print_table): set page orientation, it may be changed from last
-	printing
-	(print_comp): ditto
-
-	* gui/e-cal-model.c (e_cal_model_get_rgb_color_for_component): new
-	helper function, gets component color as rgb double values
-
-	* gui/print.c (print_week_summary_cb): uncommented and updated for
-	e_cal_model_generate_instances
-	(print_week_summary): use e_cal_model_generate_instances
-	(print_border_with_triangles): pass rgb fillcolor
-	(print_border_rgb): new function to print border with rgb color
-	background
-
-	* gui/e-cal-model.c (e_cal_model_generate_instances): new
-	function, similar to e_cal_generate_instances. see comments to
-	understand how to use cb_data
-
-2004-01-17  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_delete_selected): don't
-	create the component if there is a multiple selection
-
-	Fixes #52266
-	
-2004-01-17  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-view.c (on_print): we are required to pass in the end
-	in-out arg
-
-	Fixes #52972
-	
-2004-01-17  JP Rosevear <jpr@ximian.com>
-
-	* gui/print.h: update protos
-
-	* gui/print.c (print_title): util routine to print a title
-	(print_table): print out an etable
-
-	* gui/calendar-commands.c (print): handle printing the list view
-
-	* gui/e-cal-list-view.etspec: draw the grid to mimic tasks
-
-	* gui/tasks-control.c (tasks_control_print_cmd): use print_table
-
-	Fixes #51751, #52958
-	
-2004-01-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-commands.c (print): handle list view by printing
-	the month
-
-2004-01-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-itip-control.c (find_server): we actually want to not
-	return on any error as well (like NOT FOUND)
-
-2004-01-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-comp-editor-registry.h: convert to GObject
-
-	* gui/e-comp-editor-registry.c (registry_data_free): routine to
-	free the registry data
-	(dispose): destroy the registry data
-	(finalize): finalize it
-	(class_init): setup above
-	(init): create full hash table
-	(e_comp_editor_registry_add): weak ref the editor and strdup the
-	hash table key
-	(editor_destroy_cb): we get the registry data now, just remove it
-
-	* gui/dialogs/comp-editor.c (close_dialog): disconnect the signal
-	handlers, its a bit of a hack but it is a simple fix
-
-2004-01-16  Radek Doulik  <rodo@ximian.com>
-
-	* gui/print.c (print_calendar): don't set old orientation, preview
-	needs right orientation even after everything is printed
-
-2004-01-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #52920
-
-	* gui/dialogs/calendar-setup.glade: match label's text with the
-	button's text.
-
-2004-01-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (impl_dispose): unref the activity
-	handler.
-
-2004-01-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.[ch]
-	(tasks_component_peek_activity_handler): new function.
-	(impl_createControls): create a task bar also for the tasks
-	component. We can't rely on the calendar component's one.
-	(tasks_component_init): create the private activity handler.
-
-	* gui/e-calendar-table.c (e_calendar_table_set_status_message):
-	use the tasks component's activity handler.
-
-	* gui/e-tasks.c (on_url_cb): new callback to display status
-	bar messages when mousing over links.
-	(setup_widgets): connect to "on_url" signal on the HTML widget.
-
-2004-01-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor.c: reverted my changes made on Jan 8th.
-
-2004-01-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/save.[ch]: removed.
-
-	* gui/alarm-notify/Makefile.am: removed save.[ch].
-
-	* gui/alarm-notify/notify-main.c: removed obsolete headers.
-
-	* gui/alarm-notify/config-data.[ch]
-	(config_data_set_last_notification_time,
-	config_data_get_last_notification_time,
-	config_data_save_blessed_program, config_data_is_blessed_program):
-	new functions.
-
-	* gui/alarm-notify/alarm-queue.c: dont use removed functions.
-	(alarm_trigger_cb, procedure_notification_dialog,
-	alarm_queue_init):
-	use config_data_* functions.
-	
-	* gui/alarm-notify/alarm-notify.c: dont use removed functions.
-
-2004-01-15  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.h: update protos
-	
-	* gui/tasks-component.c (impl_finalize): free base dir
-	(impl_upgradeFromVersion): just call migrate_tasks
-	(tasks_component_init): set base dir value
-	(tasks_component_peek_base_directory): accessor
-	(tasks_component_peek_source_list): ditto
-
-	* gui/migration.c (process_old_dir): look for a source with the
-	name and fallback to creating it
-	(create_calendar_contact_source): create the contacts:// source
-	(create_calendar_sources): use above and create all the necessary
-	sources
-	(create_task_sources): create all the necessary sources
-	(migrate_calendars): do all the migration logic here, upgrade
-	bonobo-conf to gconf
-	(migrate_tasks): ditto
-
-	* gui/calendar-component.h: update prototypes
-
-	* gui/calendar-component.c (impl_finalize): free the base
-	directory
-	(impl_upgradeFromVersion): just call migrate_calendars
-	(calendar_component_init): fill in base dir value
-	(calendar_component_peek_base_directory): accessor
-	(calendar_component_peek_source_list): ditto
-
-2004-01-15  Radek Doulik  <rodo@ximian.com>
-
-	* gui/calendar-component.c (create_new_event): test priv->calendar
-	is not NULL before getting current view
-
-	* gui/tasks-component.c (primary_source_selection_changed_cb):
-	reset create_ecal
-
-	* gui/calendar-component.c (impl_requestCreateItem): merge with
-	JP's changes
-	(primary_source_selection_changed_cb): reset create_ecal
-
-2004-01-14  Radek Doulik  <rodo@ximian.com>
-
-	* gui/e-cal-list-view.c (e_cal_list_view_get_selected_time_range):
-	new implementation, use time range from selected event
-
-	* gui/e-cal-view.c (e_calendar_view_get_selected_time_range):
-	return gboolean, TRUE if requested time was set, FALSE otherwise
-	(e_calendar_view_new_appointment_full): use current time if time
-	range is unavailable
-
-	* gui/calendar-component.c (impl_requestCreateItem): use
-	e_calendar_view_new_appointment_full instead of
-	cal_comp_event_new_with_current_time
-
-	* gui/e-cal-view.c (e_calendar_view_new_appointment_full): new
-	helper function
-
-	* gui/comp-editor-factory.c (edit_new): use
-	cal_comp_event_new_with_current_time
-
-	* gui/calendar-component.c (impl_requestCreateItem): use
-	cal_comp_event_new_with_current_time
-
-	* gui/comp-util.c (cal_comp_event_new_with_current_time): new
-	function, cut'n'pasted from get_default_event
-	(calendar-component.c and comp-editor-factory.c)
-
-2004-01-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (impl_requestCreateItem): new utility
-	routine to create new tasks
-	(create_new_todo): use above so we don't try to set up the
-	creation ecal unless we are actually creating a new item
-
-	* gui/calendar-component.c (create_new_event): new utility routine
-	to create new events
-	(impl_requestCreateItem): use above so we don't try to set up the
-	creation ecal unless we are actually creating a new item
-
-2004-01-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu):
-	use get_selected_objects() instead of get_selected_comp().
-
-2004-01-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model-tasks.c (get_status): removed assertion.
-
-2004-01-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* common/authentication.c (auth_new_cal_from_source): check
-	return value from e_cal_new().
-
-	* gui/gnome-cal.c (gnome_calendar_construct): if there is no
-	default tasks folder, don't create the ECal from it.
-
-2004-01-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (impl_requestCreateItem): don't try to set
-	up the creation ecal unless we are actually creating a new item
-
-2004-01-13  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/Makefile.am: Only link in libsoup where we need it
-
-2004-01-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): free 'base_uri'
-	at the end of the function, or it will leak, and removed duplicated
-	code to create the birthdays backend.
-
-2004-01-12 Gary Ekker <gekker@novell.com>
- 
- 	* gui/Makefile.am: add e-pub-utils.[ch]
- 	for Free/Busy publishing
- 	
- 	* gui/apps_evolution_calendar.schemas.in.in: add schema for
- 	/apps/evo/calendar/free_busy key
- 	
- 	* gui/calendar-commands.c (publish_freebusy_cmd): change to
- 	publish component rather than attach as email
- 	
- 	* gui/calendar-config-keys.h: add free_busy/urls key definition
- 	
- 	* gui/calendar-config.[ch] (calendar_config_get_free_busy): new
-   	method for retrieving FB gconf key
- 	(calendar_config_set_free_busy): new method for saving FB
- 	gconf key
- 	
- 	* gui/e-cal-view.c (on_publish): change to publish component
- 	rather than attach as email
- 	
- 	* gui/itip-utils.[ch] (itip_publish_begin): new method to process 
- 	e_cal_components and aggregate the data if we are publishing
- 	for multiple calendars
- 	(itip_publish_comp): new method to publish the ical data to an
- 	http server via libsoup
- 	(comp_fb_normalize): new static method to ensure rfc 2446 compliant 
- 	data before publishing icalcomponent_get_uid
- 	(fb_sort): new static method to sort FB properties in ascending order
- 	
- 	* gui/dialogs/Makefile.am: add url-editor-dialog.[ch] and 
- 	url-editor-dialog.glade for configure FB publishing
- 	
- 	* gui/dialogs/cal-prefs-dialog.[ch] (cal_prefs_dialog_url_add_clicked):
- 	(cal_prefs_dialog_url_edit_clicked):new method for events in FB tab 
- 	of cal-prefs-dialog
- 	(cal_prefs_dialog_url_remove_clicked): ditto
- 	(cal_prefs_dialog_url_enable_clicked): ditto
- 	(cal_prefs_dialog_url_url_list_change): ditto
- 	(cal_prefs_dialog_url_url_list_enable_toggled): ditto
- 	(cal_prefs_dialog_url_url_list_double_click): ditto
- 	(show_fb_config): new method for updating dialog with FB specific
- 	data in gconf
- 	(update_fb_config): new method for updating gconf with FB specific
- 	data from dialogs
- 	(setup_changes): detect changes in url_list gtk_tree_view
- 	(get_widgets): include new dialog widgets for FB config
- 	(init_widgets): connect signals for new FB config widgets
- 	
- 	* gui/dialogs/cal-prefs-dialog.glade: add new widgets for FB config
- 	
- 	* gui/dialogs/url-editor-dialog.[ch]: add files for FB url-editor dialog
- 	
- 	* gui/dialogs/url-editor-dialog.glade: ditto
- 	
- 	* gui/e-pub-utils.[ch]: add files with FB publishing utilities
- 
- 	* gui/calendar-component.c (init_calendar_publishing): sets up
- 	listeners to publish calendar, g_idle_add, and on gconf change
- 	(init_calendar_publishing_cb): ditto
- 	(conf_changed_callback): ditto
- 	(impl_createControls): ditto
-
-2004-01-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): sync the source
-	list after creating the remote source group.
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* Revert William McCann's patch of 2003-12-19 until we can get
-	consistent across all of evolution
-
-2004-01-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/calendar-setup.c (source_to_dialog): Only update dialog
-	widgets if they exist.
-
-2004-01-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c: Fix copyright notice, its copyright
-	Novell not our hackers
-
-	* gui/tasks-component.h: ditto
-	
-	* gui/calendar-component.c: ditto
-
-	* gui/calendar-component.h: ditto
-
-2004-01-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (open_ecal): cast the views to E_CALENDAR_VIEW,
-	not to E_CAL_VIEW.
-
-2004-01-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/notify-main.c: added missing headers.
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_remove_calendar):
-	use the correct variable when calling alarm_queue_remove_client().
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): removed redundant
-	variable declarations.
-
-	* gui/migration.c (process_old_dir):
-	* gui/e-timezone-entry.c (e_timezone_entry_mnemonic_activate):
-	* gui/e-date-time-list.c (e_date_time_list_finalize):
-	* gui/e-alarm-list.c (e_alarm_list_finalize): fixed warnings.
-
-	* gui/e-calendar-table.c: added missing prototypes at the top to
-	avoid warnings.
-
-	* gui/e-week-view.c (e_week_view_scroll_a_step):
-	* gui/e-day-view.c (e_day_view_event_move): directly return in the
-	default: case.
-
-	* gui/e-tasks.c (setup_widgets): connect to changes on the model.
-	(model_row_changed_cb): callback to update the HTML detailed view
-	when the currently selected task changes.
-	(client_obj_updated_cb): removed unused function.
-	(set_status_message): changed to accept a variable list of arguments.
-	(e_tasks_add_todo_uri): display status messages and get error message
-	from backend and display it in a dialog.
-	(cal_opened_cb, load_error, method_error, permission_error): removed
-	unused functions.
-
-	* gui/gnome-cal.c (open_ecal): added a GnomeCalendar argument, and
-	display status messages.
-	(gnome_calendar_construct, gnome_calendar_add_event_source):
-	adapted to changes in open_ecal().
-
-2004-01-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (display_notification): keep
-	all the tray icons we create in a list.
-	(tray_icon_destroyed_cb): remove the tray icon data from the list.
-	(popup_dismiss_cb, popup_dismiss_all_cb): implemented missing
-	popup menu items.
-
-2004-01-09  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-component.c (new_calendar_cb): calendar_config ->
-	calendar_setup.
-	(edit_calendar_cb): Ditto.
-	(impl_requestCreateItem): Ditto.
-
-	* gui/tasks-component.c (new_task_list_cb): Use calendar_setup.
-	(edit_task_list_cb): Implement properties callback.
-	(rename_task_list_cb): Remove.
-	(fill_popup_menu_cb): Remove "rename" and add "properties".
-	(impl_requestCreateItem): Use calendar_setup.
-
-	* gui/dialogs/Makefile.am (libcal_dialogs_la_SOURCES): calendar_config
-	-> calendar_setup. Remove new-task-list.[ch].
-	(glade_DATA): calendar_config -> calendar_setup. Remove
-	new-task-list.glade.
-
-	* gui/dialogs/new-task-list.[ch]: Remove.
-
-	* gui/dialogs/calendar-config.[ch]: Rename to calendar-setup.[ch].
-
-	* gui/dialogs/calendar-config.glade: Rename to calendar-setup.glade.
-
-2004-01-09  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): make sure we
-	sync the source list when appropriate
-
-	* gui/tasks-component.c (impl_upgradeFromVersion): ditto
-	
-2004-01-09  ERDI Gergo  <cactus@cactus.rulez.org>
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): Create
-	ESource for anniversaries
-
-2004-01-09  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-component.c (new_calendar_cb): Call
-	calendar_config_new_calendar().
-	(rename_calendar_cb): Remove.
-	(edit_calendar_cb): Implement properties callback.
-	(fill_popup_menu_cb): Add "Properties..." item and remove "Rename".
-
-	* gui/dialogs/Makefile.am (libcal_dialogs_la_SOURCES): Add
-	calendar-config.[ch] and remove new-calendar.[ch].
-	(glade_DATA): Add calendar-config.glade and remove new-calendar.glade.
-
-	* gui/dialogs/calendar-config.[ch]: Implement calendar creation and
-	editing.
-
-	* gui/dialogs/calendar-config.glade: Add GUI for above.
-
-2004-01-09  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (impl_upgradeFromVersion): return the
-	corba values
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): ditto
-
-2004-01-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): only migrate
-	old calendars if migrating from <= 1.4.x.
-
-	* gui/tasks-component.c (impl_upgradeFromVersion): ditto for tasks.
-
-2004-01-09  Andrew Wu <Yang.Wu@sun.com>
-
-	* gui/e-cal-view.c (e_calendar_view_class_init):
-	add a new signal "event_move" and its key binding.
-
-	* gui/e-cal-view.h:
-	add a new type "ECalViewMoveDirection".
-	add a new virtual method "event_move" for ECalView.
-
-	* gui/e-day-view.c
-	(e_day_view_event_move), (e_day_view_change_event_time):
-	Use "Alt + Arrow" to move a selected event through time lines
-	or different days.
-
-	* gui/e-day-view.h:
-	add a new property "last_edited_comp_string" for EWeekView.
-
-	* gui/e-week-view.c (e_week_view_class_init), (e_week_view_init),
-	(e_week_view_reshape_events), (e_week_view_event_move),
-	(e_week_view_get_day_offset_of_event), (e_week_view_scroll_a_step),
-	(e_week_view_change_event_time), (e_week_view_do_key_press),
-	(e_week_view_move_selection_day),
-	(e_week_view_get_adjust_days_for_move_up),
-	(e_week_view_get_adjust_days_for_move_down),
-	(e_week_view_get_adjust_days_for_move_left),
-	(e_week_view_get_adjust_days_for_move_right):
-	Use "Alt + Arrow" to move a selected event through different days.
-
-	* gui/e-week-view.h:
-	add a new property "last_edited_comp_string" for EWeekView.
-
-2004-01-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (display_notification): store
-	the ECal's associated ECalView, and connect to its "objects_removed"
-	signal.
-	(notifiy_dialog_cb): disconnect signals from the ECalView, not the
-	ECal.
-	(on_dialog_objs_removed_cb): adapted to respond to "objects_removed"
-	signal on ECalView. Made it destroy the tray bar icon also.
-	(add_popup_menu_item): new function to create the popup items.
-	(tray_icon_clicked_cb): remove connection to obsolete signal, and
-	made it popup a menu on right-click.
-	(popup_open_cb, popup_dismiss_cb, popup_dismiss_all_cb): callbacks
-	for popup menu.
-
-	* gui/gnome-cal.c (connect_week_view_focus): don't access the
-	widget's private fields if NULL.
-
-2004-01-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): moved the line that sets
-	priv->updating to FALSE up some lines, to avoid getting callbacks
-	with an incorrect value on it.
-	(obj_modified_cb): check the UIDs of the objects we get passed to
-	see if the one being edited is amongst them.
-
-2004-01-08  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-cal-view.h: delete the ECalViewMoveDirection type declaration
-        which was added by mistake yesterday.
-
-        * ChangeLog: add a missed entry for calender-commands.c.
-
-2004-01-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (load_alarms): call e_cal_view_start
-	to actually start the live query.
-	(add_component_alarms): check the 'alarms' parameter before using it.
-
-2004-01-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c: added an ECalQuery for each loaded
-	client.
-	(load_alarms): use a live query to the calendar instead of calling
-	e_cal_get_alarms_in_range().
-	(alarm_queue_add_client): set query initially to NULL.
-	(query_objects_changed_cb): renamed and made it manage both
-	"objects_added" and "objects_modified" signals of ECalView.
-	(query_objects_removed_cb): manage the "objects_removed" signal of
-	ECalView.
-	(alarm_queue_remove_client): unref the live query.
-
-2004-01-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_add_event_source): remove the
-	item from the hash last and don't free its members because the
-	hash table does that for us
-
-2004-01-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (impl_upgradeFromVersion): new
-	method's implementation.
-	(calendar_component_class_init): initialize new epv's member.
-	(calendar_component_init): moved migration code to
-	impl_upgradeFromVersion.
-	(update_uri_for_primary_selection): fixed warning.
-
-	* gui/tasks-component.c (impl_upgradeFromVersion): new
-	method's implementation.
-	(tasks_component_class_init): initialize new epv's member.
-	(tasks_component_init): moved migration code to
-	impl_upgradeFromVersion.
-
-2004-01-06  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-select-names-renderer.c (esnr_editing_done): disconnect
-	the activated signal
-
-2004-01-06  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_finalize): we don't put
-	any signal handlers on the client or source client now, but we do
-	on the view
-	(real_set_e_cal): no signal handlers on the client
-	(obj_modified_cb): we are guaranteed this is a signal for our
-	component
-	(obj_removed_cb): ditto
-	(listen_for_changes): listen for changes on the object
-	(save_comp): use above since the source_client changed
-	(real_edit_comp): use above since the comp changed
-
-2004-01-06  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-select-names-renderer.c (esnr_activated): if we are
-	de-activated, the editing is done
-	(esnr_start_editing): listen for activated signal on the control
-	frame
-
-	Fixes #52196
-	
-2004-01-06  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/e-calendar-table.[ch] (e_calendar_table_open_selected):
-	open a dialog for the selected task.
-	* gui/e-tasks.[ch] (e_tasks_open_task): ditto.
-	* gui/tasks-control.c (tasks_control_sensitize_commands),
-	(tasks_control_open_task_cmd): add a menu item for "Open Task".
-	* gui/calender-commands.c: the event should also be allowed to open
-	even when it's readonly. 
-
-2004-01-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (open_ecal): new function to open ECal's, get any
-	error information and display it to the user, all-in-one.
-	(gnome_calendar_construct, gnome_calendar_add_event_source): use the
-	above function, instead of e_cal_open().
-	(open_error, method_error, permission_error): removed unneeded
-	functions, we just display the error message returned from the
-	backend.
-
-2004-01-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): no need to connect to
-	the "cal_opened" signal on the task client. Also, added code to
-	add the client to the ECalendarTable's model.
-	(client_cal_opened_cb, update_e_cal_view_timeout): removed unneeded
-	function.
-
-2004-01-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): display the tasks'
-	primary selection in the task list, and actually open the tasks
-	folder.
-
-	* gui/e-tasks.c (e_tasks_set_default_uri): use the ECalModel to
-	get the client for a given URI.
-
-2004-01-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (add_uri_for_source,
-	remove_uri_for_source): removed redundant functions.
-	(update_uris_for_selection): dont call above functions, use
-	gnome_calendar_* directly.
-
-2003-12-29  Kidd Wang  <kidd.wang@sun.com>
-
-	* gui/calendar-commands.c (file_open_event_cb): add a menu item
-	for "open appointment".
-
-	* gui/e-cal-view.[ch] (e_calendar_view_open_event): add a signal
-	"open_event" and bind it to "ctrl+o". When the signal is delivered,
-	a dialog will be opened to edit the selected event.
-
-	* gui/e-calendar-table.c (e_calendar_table_on_key_press): press "ctrl-o"
-	to open a dialog.
-
-2003-12-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-select-names-renderer.c (esnr_start_editing): fix the
-	signal name
-
-	* gui/dialogs/meeting-page.glade: add Add Attendee button
-
-	* gui/dialogs/meeting-page.c (get_widgets): extract add button
-	(add_clicked_cb): edit the attendee after we add it
-	(init_widgets): listen for add clicked
-	(meeting_page_construct): the add button is in the glade file now
-
-	* gui/e-select-names-editable.c (esne_start_editing): activate the
-	control
-	(e_select_names_editable_get_address): handle null dest
-	(e_select_names_editable_get_name): ditto
-
-	* gui/e-meeting-store.h: add proto
-
-	* gui/e-meeting-store.c (e_meeting_store_find_attendee_path):
-	create the path to a given attendee
-
-	* gui/e-meeting-list-view.h: add proto
-
-	* gui/e-meeting-list-view.c (e_meeting_list_view_edit): start
-	editing the address of a particular
-
-2003-12-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.[ch] (gnome_calendar_add_event_source,
-	gnome_calendar_remove_event_source): renamed from *_uri, to work with
-	ESource's rather than with plain URIs.
-	(gnome_calendar_set_default_source): ditto.
-
-	* gui/control-factory.c (set_prop):
-	* gui/calendar-component.c (add_uri_for_source, remove_uri_for_source,
-	update_uri_for_primary_selection):
-	use sources instead of uris with the GnomeCalendar widget.
-
-2003-12-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/save.c (get_saved_notification_time): if the setting
-	is not in the config database, use the current time, to avoid getting
-	hundreds of alarms for past events.
-
-2003-12-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* common/authentication.[ch]: new files for managing interactive
-	authentication with backends.
-
-	* common/Makefile.am: build new private library.
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar):
-	* gui/dialogs/event-page.c (source_changed_cb):
-	* gui/dialogs/task-page.c (source_changed_cb):
-	* gui/dialogs/copy-source-dialog.c (copy_source):
-	* gui/calendar-component.c (setup_create_ecal):
-	* gui/calendar-offline-handler.c (backend_go_offline,
-	backend_go_online, calendar_offline_handler_init):
-	* gui/comp-editor-factory.c (open_client):
-	* gui/e-itip-control.c (start_calendar_server):
-	* gui/e-tasks.c (e_tasks_add_todo_uri):
-	* gui/gnome-cal.c (gnome_calendar_construct,
-	gnome_calendar_add_event_uri):
-	* gui/tasks-component.c (setup_create_ecal):
-	* importers/icalendar-importer.c (load_file_fn, vcal_load_file_fn,
-	gnome_calendar_import_data_fn): create the ECal's via the
-	auth_new_cal_from* functions in the authentication module.
-
-	* gui/alarm-notify/Makefile.am:
-	* gui/Makefile.am:
-	* importers/Makefile.am: link new private library.
-	
-	* Makefile.am: added new directory to the build.
-
-2003-12-21  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-itip-control.[hc]: rewrite for new ecal api, cache all
-	ecal's by type and minimize loading.  Switch to using the source
-	option menu
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): ditto
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-	use ECalSourceType
-	
-	* importers/icalendar-importer.c (load_file_fn): ditto
-	(vcal_load_file_fn): ditto
-	(gnome_calendar_import_data_fn): ditto
-
-	* gui/dialogs/task-page.c (source_changed_cb): ditto
-
-	* gui/dialogs/event-page.c (source_changed_cb): ditto
-
-	* gui/dialogs/copy-source-dialog.h: update proto
-
-	* gui/dialogs/copy-source-dialog.c (copy_source_dialog): ditto
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): ditto
-
-	* gui/tasks-component.c (copy_task_list_cb): ditto
-	(setup_create_ecal): ditto
-
-	* gui/gnome-cal.c (gnome_calendar_construct): ditto
-	(gnome_calendar_add_event_uri): ditto
-
-	* gui/e-tasks.c (e_tasks_add_todo_uri): ditto
-
-	* gui/comp-editor-factory.c (open_client): ditto
-
-	* gui/calendar-offline-handler.c (backend_go_offline): ditto
-	(backend_go_online): ditto
-	(calendar_offline_handler_init): ditto
-
-	* gui/calendar-component.c (copy_calendar_cb): ditto
-	(setup_create_ecal): ditto
-
-	* gui/print.c (print_month_small): don't pass type to
-	e_cal_generate_instances	
-	(print_day_details): ditto
-	(print_week_summary): ditto
-
-	* gui/tag-calendar.c (tag_calendar_by_client): ditto
-	
-2003-12-19  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_sensitize_commands): make
-	sure there is a ui container
-
-	* gui/calendar-commands.c (calendar_control_sensitize_calendar_commands): ditto
-	
-	* gui/tasks-component.c (impl_createControls): update after the
-	signals are connected so that the ecal's are actually loaded
-
-	* gui/calendar-component.c: ditto
-	
-2003-12-19  William Jon McCann  <mccann@jhu.edu>
-
-	* gui/dialogs/task-page.c (source_changed_cb): 
-	* gui/dialogs/send-comp.c (send_component_dialog): 
-	* gui/dialogs/save-comp.c (save_component_dialog): 
-	* gui/dialogs/recur-comp.c (recur_component_dialog): 
-	* gui/dialogs/event-page.c (source_changed_cb): 
-	* gui/dialogs/delete-error.c (delete_error_dialog): 
-	* gui/dialogs/delete-comp.c (delete_component_dialog): 
-	* gui/dialogs/changed-comp.c (changed_component_dialog): 
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): 
-	* gui/dialogs/alarm-options.glade:
-	* gui/dialogs/alarm-page.glade:
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/e-delegate-dialog.glade:
-	* gui/dialogs/event-page.glade:
-	* gui/dialogs/new-calendar.glade:
-	* gui/dialogs/new-task-list.glade:
-	* gui/dialogs/recurrence-page.glade:
-	* gui/dialogs/task-details-page.glade:
-	* gui/dialogs/task-page.glade:
-	* gui/tasks-control.c (confirm_purge): 
-	* gui/tasks-component.c (delete_task_list_cb) 
-	(rename_task_list_cb, setup_create_ecal): 
-	* gui/goto-dialog.glade: 
-	* gui/e-cal-model-tasks.c (show_geo_warning): 
-	* gui/comp-editor-factory.c (cal_opened_cb): 
-	* gui/calendar-component.c (delete_calendar_cb) 
-	(rename_calendar_cb, setup_create_ecal, delete_calendar_cb): 
-	* gui/calendar-commands.c (purge_cmd):
-	Remove separators from dialogs.  Use frame style recommended
-	by the HIG.
-
-2003-12-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (impl_createControls):
-	* gui/calendar-component.c (impl_createControls): make sure we
-	connect to the "changed" signals after setting the initial selections
-	on the ESourceSelector. Fixes some nasty warnings because of
-	calendar_control_sensitize_calendar_commands being called with
-	no container yet for the control.
-
-2003-12-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/comp-editor.c: Add the concept of a source client, where
-	the object lives currently. The plain client is where it will be
-	stored.
-	(comp_editor_finalize): If we have a source client, disconnect from
-	and unref it.
-	(save_comp): Check if the object is being moved, and if so, remove it
-	from the source client, and make the target client the new source.
-	(comp_editor_append_page): Connect to client_changed signal.
-	(real_set_e_cal): Change an old gtk_signal_disconnect_by_data() to
-	the GLib equivalent, and don't cast ECal to GtkObject. If the source
-	client is not set, make it equivalent to the target client.
-	(page_client_changed_cb): Implement. Handles a client change.
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_class_init): Add
-	a new signal, "client_changed", that notifies that the ECal client
-	was changed from one of the editor pages.
-	(comp_editor_page_set_e_cal): Fix two bugs in this function; if the
-	same client is set twice, its ref count could drop to 0. Additionally,
-	it was unreffing the new client instead of the old one.
-	(comp_editor_page_notify_client_changed): Implement.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): Fill in the
-	source menu.
-	(get_widgets): Get the source menu.
-	(source_changed_cb): Implement. Try to open a client for the new
-	source, and if successful, notify of the change. Show a dialog on
-	failure, and revert to last selected source.
-	(init_widgets): Connect to source menu.
-	(event_page_create_source_option_menu): Implement Glade helper.
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): Fill in the source
-	menu.
-	(get_widgets): Get the source menu.
-	(source_changed_cb): Implement, similar to the event page, but for
-	tasks.
-	(init_widgets): Connect to source menu.
-	(task_page_construct): Fix a message booboo.
-	(task_page_create_source_option_menu): Implement Glade helper.
-
-	* gui/dialogs/event-page.glade: Add source menu widget.
-
-	* gui/dialogs/task-page.glade: Add source menu widget.
-
-2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (add_popup_menu_item):
-	* gui/calendar-component.c (add_popup_menu_item): use g_file_test
-	to check if the 'pixmap' argument is a file. If so, get the pixmap
-	from it, or gtk_image_new_from_stock will return an empty pixmap.
-
-2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): set a correct status
-	message.
-
-	* gui/tasks-component.c (fill_popup_menu_cb):
-	* gui/calendar-component.c (fill_popup_menu_cb): use the folder*.png
-	icons for folder operations.
-
-	* gui/Makefile.am: removed cal-client directory from $INCLUDES.
-
-2003-12-17  Harry Lu  <harry.lu@sun.com>
- 
- 	Fixes #51665.
- 
- 	* gui/e-week-view.c: (e_week_view_focus): call 
- 	e_week_view_check_layout() so that the spans won't be NULL.
-
-2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c: removed the 'NewCalendar' verb.
-	(file_new_calendar_cb): removed callback for 'NewCalendar' verb.
-
-	* gui/calendar-component.c: (impl__get_userCreatableItems): added
-	'New Calendar' to the list of user creatable items.
-	(impl_requestCreateItem): implemented 'New Calendar'.
-
-	* gui/tasks-component.c (impl__get_userCreatableItems): added
-	'New Task List' to the list of user creatable items.
-	(impl_requestCreateItem): implemented 'New Task List'.
-
-2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-control.[ch] (tasks_control_sensitize_commands): made
-	it public.
-
-	* gui/tasks-component.c (update_uri_for_primary_selection): call
-	tasks_control_sensitize_commands() when the primary selection
-	changes.
-
-2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (update_uri_for_primary_selection): call
-	calendar_control_sensitize_calendar_commands when the primary selection
-	changes.
-	(impl_createControls): keep the view_control in the private structure and
-	use control_factory_new_control() to create the control.
-	(control_activate_cb): removed unneeded function.
-
-	* gui/tasks-component.c (impl_createControls): use tasks_control_new to
-	create the tasks view control.
-	(control_activate_cb): removed unneeded function.
-
-	* gui/gnome-cal.c (gnome_calendar_add_event_uri): check the return
-	value from e_cal_new_from_uri.
-
-2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_remove_calendar):
-	make sure we free the data stored in the hash table.
-	(alarm_notify_add_calendar): call alarm_queue_add_client, or we wont
-	have alarms at all.
-
-	* gui/alarm-notify/alarm-queue.c: no need to hold a ref count.
-	(alarm_queue_add_client, alarm_queue_remove_client): don't use the
-	refcount private member.
-	(alarm_queue_add_client): don't connect to non-existing ECal signals.
-	(display_notification, free_client_alarms_cb): fixed warnings.
-
-2003-12-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes part of #41237
-	
-	* gui/e-calendar-table.c: use GtkClipboard instead of GtkInvisible
-	for cut/copy/paste.
-	(selection_clear_event, selection_received, selection_get): removed
-	unneeded functions.
-	(e_calendar_table_init): don't create the invisible widget.
-	(e_calendar_table_copy_clipboard): use gtk_clipboard_set_text().
-	(e_calendar_table_paste_clipboard): use gtk_clipboard_request_text().
-	(clipboard_get_text_cb): callback for gtk_clipboard_request_text().
-
-	* gui/e-cal-view.c (e_calendar_view_init, e_calendar_view_destroy,
-	e_calendar_view_copy_clipboard): no need anymore to keep the last
-	clipboard selection, GtkClipboard does it for us.
-
-2003-12-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (alarm_notify_factory_fn): return
-	a reference to the alarm_notify_service, not NULL and ref the object
-	before returning it.
-
-2003-12-15  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): set the list view config
-	properly (so we don't blow away the month view config
-
-2003-12-15  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): set the calendar for the day
-	view
-
-2003-12-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-component.c (impl_requestCreateItem): set a proper
-	exception if we fail
-
-2003-12-14  JP Rosevear <jpr@ximian.com>
-	
-	* gui/calendar-config.c
-	(calendar_config_get_hide_completed_tasks_units): make sure the
-	string is non-null before strcmp'ing it
-
-	Fixes #52033
-	
-2003-12-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_add_event_uri): remove the client
-	from the list if there are errors, instead of re-adding it again.
-	Also, unref the ECal object on errors, for not leaking.
-
-2003-12-10  Bolian Yin <bolian.yin@sun.com>
-
-	*gui/e-week-view.c: Fix a event/jump button tabbing bug
-
-2003-12-10  Harry Lu  <harry.lu@sun.com>
-
-        Fix for bugzilla bug #51628.
-
-        * gui/weekday-picker.c: (weekday_picker_class_init): setup focus
-        handler.
-        (day_clicked): new function to set day_mask when mouse clicked
-        or keyboard input of space/enter.
-        (handle_key_press_event): new function to handle key press event.
-        (day_event_cb): handle key press event too.
-        (weekday_picker_init): set widget can be focused.
-        (colorize_items): change the box's outline if it is focused.
-        (weekday_picker_focus): new function to handler focus event.
-
-2003-12-09  Andrew Wu <Yang.Wu@sun.com>
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_class_init): init a11y.
-	* gui/e-week-view.c: emit signal "selected_time_changed".
-
-2003-12-08  Bolian Yin <bolian.yin@sun.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_started): remove setting property of "handle_popup".
-	* gui/e-week-view.c (e_week_view_on_editing_started): remove setting property of "handle_popup".
-
-2003-12-08 Carl Sun <carl.sun@sun.com>
-
-        Fixes #46351
-
-	* gui/e-timezone-entry.c  (e_timezone_entry_mnemonic_activate):
-	new function. override the  member function of GtkWidget to handle
-	nemonic_activate signal of custom class ETimezoneEntry.
-
-
-2003-12-08  Bolian Yin <bolian.yin@sun.com>
-
-	* gui/gnome-cal.c (gnome_calendar_class_init): correct argument mismatch in "goto_date" signal definition.
-
-2003-12-05  Yong Sun <Yong.Sun@Sun.com>
-
-	Fix for #51337
-
-	* gui/dialogs/alarm-page.c
-	Change raw string "Action/Trigger" to _("Action/Trigger")
-	* gui/dialogs/recurrence-page.c
-	Change raw string "Date/Time" to _("Date/Time")
-
-2003-12-04  Harry Lu  <harry.lu@sun.com>
-
-	Fix for bugzilla bug #51627.
-
-	* gui/goto.c: (create_ecal): set calitem's move_selection_when_moving 
-	to FALSE so that changing month and year won't send out 
-	a "selection_changed" signal.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_activate): Do not call
-	control_util_set_folder_bar_label().
-
-	* gui/e-calendar-table.c (e_calendar_table_set_status_message):
-	Use e_activity_handler_operation_progressing(), not
-	evolution_activity_client_update().
-
-	* gui/e-cal-view.c: Remove settings menu.
-	(on_settings): Remove.
-
-	* gui/calendar-commands.c (get_shell_view_interface): Remove.
-	(control_util_set_folder_bar_label): Remove.
-	(calendar_set_folder_bar_label): Remove.
-	(control_util_show_settings): Remove.
-	(gcal_calendar_dates_change_cb): Remove.
-	(calendar_control_activate): Do not connect, do not call
-	calendar_set_folder_bar_label().
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): free the notification
-	list
-	
-	* gui/tasks-component.c (impl_dispose): ditto
-
-	* gui/calendar-component.c (impl_dispose): ditto
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (impl_dispose): free up the notifications
-	and the ecal
-	(config_create_ecal_changed_cb): clear the create_ecal if the
-	primary selection changes
-	(setup_create_ecal): find a default ecal to do creation with
-	(impl_requestCreateItem): use above
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (rename_task_list_cb): cast the parent
-	(impl_createControls): add notification for primary tasks
-	(config_primary_selection_changed_cb): handle primary selection
-	changing in gconf
-
-	* gui/calendar-config-keys.h: fix config key for primary tasks
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-component.c (rename_calendar_cb): cast the parent
-	(config_primary_selection_changed_cb): handle the primary
-	selection changing elsewhere
-	(impl_dispose): remove the list of notifications
-	(impl_createControls): add primary calendar notification
-	(config_create_ecal_changed_cb): clear create_ecal if the primary
-	key changes
-	(setup_create_ecal): find an ecal to use for creation
-	(impl_requestCreateItem): use above
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/icalendar-importer.c: Do not #include shell stuff.
-
-	* gui/main.c: Do not #include <evolution-shell-client.h>.
-
-	* gui/e-itip-control.c: Do not #include
-	<e-folder-selector-button.h> nor <evolution-shell-client.h>.
-	(start_default_server): Return FALSE.
-	(default_server_started_cb): Do not connect the "selected" signal
-	on the button since it's now NULL.
-	(button_selected_cb): #if 0 out.
-
-	* gui/e-cal-list-view.h: Do not #include
-	"evolution-activity-client.h".
-
-	* gui/tasks-component.c (impl_createControls): Give an empty label
-	for the status bar.
-
-	* gui/e-day-view.h: Remove all deps on evolution-activity-client.
-
-2003-12-02  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/Makefile.am: Version the schemas
-	* gui/apps_evolution_calendar.schemas: Removed
-	* gui/apps_evolution_calendar.schemas.in.in: Added
-
-2003-12-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c (copy_source_dialog): added
-	a label to the dialog to make it look less ugly.
-
-2003-12-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c: converted to use an
-	ESourceOptionMenu instead of the ESourceSelector.
-	(primary_selection_changed_cb): removed.
-	(copy_source_dialog): create the ESourceOptionMenu here.
-	(source_selected_cb): callback for the "source_selected"
-	signal on the ESourceOptionMenu widget.
-
-2003-12-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-calendar-table.h (struct _ECalendarTable): Replace member
-	"activity" with an "activity_id".
-
-	* gui/e-cal-view.c (struct _ECalendarViewPrivate): Replace member
-	"activity" with "activity_id".
-	(e_calendar_view_destroy): Don't unref activity here anymore.
-	(e_calendar_view_set_status_message): Report progress using the
-	EActivityHandler off the CalendarComponent.
-
-	* gui/calendar-component.c
-	(struct _CalendarComponentPrivate): New member activity_handler.
-	(calendar_component_init): Init.
-	(calendar_component_peek_activity_handler): New.
-	(impl_dispose): Unref.
-	(impl_createControls): Return an ETaskBar for the statusbar
-	control.
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-component.c (impl_createControls): Pass a label for
-	the status bar control for now.
-
-	* gui/tasks-component.c (impl_createControls): Pass a label for
-	the status bar control for now.
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in:
-	* gui/calendar-commands.c:
-	* gui/e-meeting-list-view.c:
-	* gui/e-meeting-model.c:
-	* gui/e-select-names-editable.c:
-	* gui/itip-bonobo-control.c:
-	* gui/itip-utils.c:
-	* gui/main.c:
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	* gui/alarm-notify/alarm-queue.c:
-	* gui/alarm-notify/notify-main.c:
-	* gui/dialogs/alarm-options.c:
-	* gui/dialogs/e-delegate-dialog.c:
-	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
-	* importers/main.c: Use BASE_VERSION for repo_ids and OAFIIDs
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: put the conduits in their own dir
-
-	* conduits/calendar/Makefile.am: ditto
-	
-	* conduits/todo/e-todo.conduit.in: subst in correct thing
-
-	* conduits/calendar/e-calendar.conduit.in: ditto
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: install to privlibdir
-
-	* conduits/calendar/Makefile.am: ditto
-	
-	* conduits/todo/e-todo.conduit.in: subst in correct thing
-
-	* conduits/calendar/e-calendar.conduit.in: subst in correct thing
-
-2003-12-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (add_uri_to_load, remove_uri_to_load):
-	removed unneeded functions.
-	(alarm_notify_add_calendar, alarm_notify_remove_calendar): no need
-	anymore to add/remove URIs to load on startup to the configuration.
-
-2003-12-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/save.c (save_calendars_to_load): removed this
-	function, since we now use the ESourceList to know what calendars
-	to load.
-	(get_calendars_to_load): moved to config-data.c.
-	(save_notification_time, get_saved_notification_time,
-	save_blessed_program, is_blessed_program): use the
-	shared GConfClient.
-
-	* gui/alarm-notify/config-data.[ch]: use a GConfClient instead of a
-	EConfigListener.
-	(config_data_get_conf_client): renamed from _get_listener.
-	(config_data_get_timezone, config_data_get_24_hour_format): changed
-	to use the GConfClient.
-	(config_data_get_calendars_to_load): new function.
-	(ensure_inited): create the source lists for calendar and tasks here.
-	(do_cleanup): cleanup the source lists here.
-
-	* gui/alarm-notify/notify-main.c (load_calendars): use
-	config_data_get_calendars_to_load().
-
-2003-11-28  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_delete_completed): we want to skip if it
-	*is* read only
-
-2003-11-28  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-meeting-store.c (e_meeting_store_get_type): allocate the
-	type information correctly
-
-2003-11-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_go_offline): e_cal_new () ->
-	e_cal_new_from_uri ().
-	(backend_go_online): Ditto.
-	(calendar_offline_handler_init): Ditto.
-
-	* gui/comp-editor-factory.c (open_client): Ditto.
-
-	* gui/e-itip-control.c (start_calendar_server): Ditto.
-	(object_requested_cb): Ditto.
-
-	* gui/e-tasks.c (e_tasks_add_todo_uri): Ditto.
-
-	* gui/gnome-cal.c (gnome_calendar_construct): Ditto.
-	(gnome_calendar_add_event_uri): Ditto.
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): Ditto.
-
-	* importers/icalendar-importer.c (load_file_fn): Ditto.
-	(vcal_load_file_fn): Ditto.
-	(gnome_calendar_import_data_fn): Ditto.
-
-	* gui/dialogs/copy-source-dialog.c (copy_source): Pass sources to
-	e_cal_new ().
-
-2003-11-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c (copy_source): use the correct
-	icalcomponent when calling e_cal_create_object.
-
-	* gui/tasks-control.c (sensitize_commands): no need to have a
-	selection for Paste to work.
-
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu): disable
-	editing items if the selected task list is read only, not if it's not.
-
-2003-11-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-task-list.glade:
-	* gui/dialogs/new-task-list.[ch]: new files containing the
-	implementation of the 'New Task List' dialog.
-
-	* gui/dialogs/Makefile.am: added new files.
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): use G_STRLOC
-	for g_warning messages.
-
-	* gui/tasks-component.c (new_task_list_cb): implemented.
-
-2003-11-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c (copy_source_dialog): actually
-	add the source selector to the dialog's box.
-
-2003-11-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c:
-	* gui/dialogs/copy-source-dialog.[ch]: fixed compilation errors.
-
-	* gui/dialogs/Makefile.am: added missing header directories.
-
-2003-11-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.[ch]: fixed copyright notices.
-
-	* gui/dialogs/copy-source-dialog.[ch]: implementation of the
-	Copy command for sources.
-
-	* gui/dialogs/Makefile.am: added new files.
-
-	* gui/calendar-component.c (fill_popup_menu_cb, copy_calendar_cb):
-	added Copy command.
-
-	* gui/tasks-component.c (fill_popup_menu_cb, copy_task_list_cb):
-	added Copy command.
-
-2003-11-23  Ross Burton  <ross@burtonini.com>
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	Append "_2" to the OAFIID to avoid conflicting with Evo 1.4.
-	
-	* gui/main.c:
-	* gui/alarm-notify/notify-main.c:
-	Updated with new OAFIID.
-
-2003-11-20  JP Rosevear <jpr@ximian.com>
-
-	* Remove a bunch of gal includes that are no longer needed
-
-2003-11-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #43556
-
-	* gui/e-cal-view.c (selection_get, selection_clear_event,
-	selection_received): removed this unneeded functions.
-	(e_calendar_view_init): don't create a GtkInvisible anymore.
-	(e_calendar_view_destroy): no need to destroy the GtkInvisible.
-	(e_cal_view_copy_clipboard, e_cal_view_paste_clipboard):
-	use GtkClipboard.
-
-2003-11-19  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model-tasks.c (get_due): make sure timezone value is
-	sane
-	(get_completed): ditto
-
-	* gui/e-cal-model.c (get_dtstart): add more guards
-
-	* gui/e-cal-model-calendar.c (get_dtend): ditto
-	
-2003-11-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #51052
-
-	* importers/icalendar-importer.c (prepare_events, prepare_tasks):
-	call icalcompiter_next to move the pointer to the next before
-	removing a component avoid breaking the link.
-
-2003-11-18  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (get_dtstart): make sure the timezone value is
-	sane
-
-	* gui/e-cal-model-calendar.c (get_dtend): ditto
-	
-2003-11-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-config.h: add protos
-
-	* gui/calendar-config.c (calendar_config_get_primary_calendar):
-	get the primary calendar
-	(calendar_config_set_primary_calendar): set it
-	(calendar_config_add_notification_primary_calendar): set
-	notifications for it
-	(calendar_config_get_primary_tasks): get the primary task list
-	(calendar_config_set_primary_tasks): set it
-	(calendar_config_add_notification_primary_tasks): set
-	notifications for it
-
-	* gui/calendar-config-keys.h: add primary keys
-
-	* gui/calendar-component.c (find_first_source): find any source
-	(update_uri_for_primary_selection): set the default uri and save
-	the source uid
-	(update_primary_selection): set the primary selection
-	(primary_source_selection_changed_cb): use above
-	(impl_createControls): set the primary selection
-
-	* gui/tasks-component.c: as above
-	
-2003-11-18  JP Rosevear <jpr@ximian.com>
-
-	* gui/Makefile.am: remove db3 include
-
-2003-11-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c
-	(calendar_control_sensitize_calendar_commands,
-	sensitize_taskpad_commands): removed the 'New...' menu items
-	from the UI, it's now implemented in the shell.
-	(file_new_appointment_cb, file_new_event_cb, file_new_meeting_cb,
-	file_new_task_cb): removed.
-
-2003-11-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (add_popup_menu_item): added 'sensitive'
-	argument.
-	(fill_popup_menu_cb): disable/enable menu items depending on whether
-	there is a selection or not.
-
-	* gui/tasks-component.c (add_popup_menu_item, fill_popup_menu_cb):
-	ditto.
-
-2003-11-17  JP Rosevear <jpr@ximian.com>
-
-	* Cleanup some ref/unref calls
-
-2003-11-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (delete_calendar_cb, rename_calendar_cb):
-	* gui/tasks-component.c (delete_task_list_cb, rename_task_list_cb):
-	peek the primary selection.
-
-2003-11-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (fill_popup_menu_cb): added 'Delete' and
-	'Rename' menu items.
-	(delete_task_list_cb, rename_task_list_cb): callbacks for new
-	menu items.
-
-2003-11-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (add_popup_menu_item): try first to
-	create the icon from the stock, and then from a file.
-	(fill_popup_menu_cb): set callback for 'Rename' menu item.
-	(rename_calendar_cb): callback for 'Rename' menu item.
-	(new_calendar_cb): fixed arguments.
-
-	* gui/tasks-component.c (impl_createControls): connect to
-	"fill_popup_menu" signal on the source selector.
-	(fill_popup_menu_cb): callback to create our menu items.
-
-2003-11-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: remove the AlarmNotify service, no
-	more need for it, since the alarm daemon will listen for changes
-	on the GConf key.
-
-	* gui/gnome-cal.c (add_alarms): removed function to talk to the
-	alarm daemon.
-	(client_cal_opened_cb): don't call add_alarms().
-
-	* gui/alarm-notify/alarm-notify.[ch]: made it a basic GObject.
-	(AlarmNotify_addCalendar, AlarmNotify_removeCalendar): removed
-	AlarmNotify interface implementation.
-	(alarm_notify_class_init): no epv to initialize.
-	(alarm_notify_remove_calendar): new function, copied from the
-	CORBA method implementation.
-	(alarm_notify_factory_fn): return NULL, since there is no objects
-	that can be created via this factory now.
-
-	* gui/alarm-notify/notify-main.c (main): now the factory is the alarm
-	notification service itself.
-	(load_calendars): no need to use exceptions here.
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	now the factory is the alarm notification service itself.
-
-	* gui/main.c (launch_alarm_daemon_cb): dont use the AlarmNotify CORBA
-	types.
-
-2003-11-17  Harry Lu  <harry.lu@sun.com>
-
-        * gui/dialogs/recurrence-page.c (make_ending_count_special):
-        Make ending count of occurrences of Recurrence tab numeric only.
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_set_property): add a uri
-
-	* gui/e-tasks.c: kill e_tasks_open
-
-	* gui/e-tasks.h: remove proto
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_view_objects_added_cb): emit the added
-	signal for the correct rows
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (is_in_uids): copy in here
-	(update_uris_for_selection): save the selection
-	(update_selection): update the selection when its changed
-	somewhere else
-	(config_selection_changed_cb): update the selection if the
-	configuration changes
-	(impl_createControls): store the source selector
-
-	* gui/calendar-config.h: add protos
-
-	* gui/calendar-config.c (calendar_config_get_tasks_selected): get
-	the list of task lists selected
-	(calendar_config_set_tasks_selected): save it
-	(calendar_config_add_notification_tasks_selected): get notified
-	about it
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (add_uri_for_source): add it via e-tasks
-	(remove_uri_for_source): remove it via e-tasks
-	(get_default_task): provide a default for editing
-	(impl_createControls): create the control directly
-	(impl_requestCreateItem): implement
-
-	* gui/gnome-cal.c (gnome_calendar_purge): don't let the two list
-	iterators clobber each other
-
-	* gui/e-tasks.h: add protos
-
-	* gui/e-tasks.c (e_tasks_destroy): free the client list and the
-	hash, disconnect signals
-	(e_tasks_new_task): use the default client
-	(e_tasks_add_todo_uri): add a uri
-	(e_tasks_remove_todo_uri): remove a uri
-	(e_tasks_set_default_uri): set default uri
-	(e_tasks_get_default_client): get default client
-	(e_tasks_delete_completed): expunge from all clients
-	(e_tasks_setup_view_menus): use default client uri
-
-	* gui/e-tasks.c (set_timezone): set the timezone for all clients
-	(e_tasks_init): set up the clients has table
-
-	* gui/e-calendar-table.etspec: yank some useless display columns
-
-	* gui/e-cal-model.c (remove_client): remove objects in reverse
-	order so we don't clobber ourselves
-
-	* gui/calendar-component.c: add FIXME
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-component.c (get_default_event): set up a event to
-	be edited
-	(impl_requestCreateItem): implement
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/*.[hc]: include e-source* from e-d-s
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_calendars_selected):
-	config accessor
-	(calendar_config_set_calendars_selected): ditto
-	(calendar_config_add_notification_calendars_selected): config
-	notification
-
-	* gui/calendar-config.h: add protos
-
-	* gui/calendar-config-keys.h: add new key
-
-	* gui/calendar-component.c (is_in_uids): util function
-	(update_uris_for_selection): save the selection in the
-	configuration
-	(update_selection): update the selection from the config info
-	(source_selection_changed_cb): only pass one param
-	(config_selection_changed_cb): listen for config changes
-	(impl_dispose): remove config notification
-	(impl_createControls): use bonobo_exception_set; add a config
-	notification
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-component.c (impl__get_userCreatableItems): New.
-	(impl_requestCreateItem): New.
-	(tasks_component_class_init): Install.
-
-	* gui/calendar-component.c (impl__get_userCreatableItems): New.
-	(impl_requestCreateItem): New, for now just a stub.
-	(calendar_component_class_init): Install into the EPV.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add a component_alias
-	of "calendar" for the calendar and "tasks" for the tasks.
-
-2003-11-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-component.c (add_popup_menu_item): Use non-deprecated
-	gtk_menu_shell_append ().
-
-2003-11-11  Bolian Yin <bolian.yin@sun.com>
-                                                                                
-        Fixes #50808
-                                                                                
-        * gui/goto.c (goto_dialog): set initial selection to current day.
-                                                                                
-2003-11-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_cal_opened_offline): use
-	a standard calendar status
-	(backend_cal_opened_online): ditto
-	
-	* gui/alarm-notify/alarm-queue.c (cal_opened_cb): ditto
-
-	* gui/gnome-cal.c (client_cal_opened_cb): ditto
-
-	* gui/e-tasks.c (cal_opened_cb): ditto
-
-	* gui/e-itip-control.c (default_server_started_cb): ditto
-
-	* gui/e-cal-model.c (cal_opened_cb): ditto
-
-	* gui/comp-editor-factory.c (cal_opened_cb): ditto
-
-2003-11-11  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): load the
-	calendar synchronously
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server): ditto
-	
-2003-11-10  JP Rosevear <jpr@ximian.com>
-
-	* importers/icalendar-importer.c (update_single_object): return
-	boolean not ECalStatus
-	(update_objects): ditto
-	(process_item_fn): handle above returns
-
-2003-11-10  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model-tasks.c (get_due_status): just check the boolean
-
-2003-11-10  JP Rosevear <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c
-	(e_calendar_context_destroy): use proper change list free function
-	name
-	(post_sync): ditto
-
-	* conduits/todo/todo-conduit.c: same
-	
-2003-11-10  Dan Winship  <danw@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_delete_completed): Remove get-vtype check
-	from the completed-tasks query (and don't leak the sexp string).
-
-	* gui/e-cal-model.c (update_e_cal_view_for_client): Don't adjust
-	the sexp to use get-vtype.
-
-	* gui/gnome-cal.c (adjust_e_cal_view_sexp, gnome_calendar_purge):
-	Remove get-vtype check from queries
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/Makefile.am: remove includes for toplevel libical dir
-
-	* gui/dialogs/Makefile.am: ditto
-
-	* importers/Makefile.am: ditto
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* In the gui this is a search and replace commit for moving the
-	calendar to evolution-data-server; it also deletes the old backend
-	files; e-cal-view was rename to e-calendar-view to remove name
-	conflict
-	
-2003-11-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c: fix typo
-
-2003-11-05  Larry Ewing  <lewing@ximian.com>
-
-	* gui/migration.c (process_old_dir): add a unimplemented warning
-	so we at least avoid relocation errors.
-
-2003-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (fill_popup_menu_callback): added more
-	menu items.
-	(delete_calendar_cb): callbacks for new popup menu items.
-	(impl_createControls): add the source selector widget to the
-	CalendarComponentPrivate structure.
-
-	* gui/migration.[ch] (migrate_old_tasks): new function to migrate
-	old tasks setups.
-	(process_old_dir): renamed and added a "filename" argument, so that
-	the same function can be used for tasks and calendar directories.
-	(migrate_old_calendars): added new argument when calling
-	process_old_dir().
-
-	* gui/tasks-component.c (tasks_component_init): call
-	migrate_old_tasks() if there are no groups defined.
-
-2003-11-04  Bolian Yin <bolian.yin@sun.com>
-
-	* gui/e-cal-view.c: add new signal "selected_time_changed" 
-	* gui/e-day-view-main-item.c (e_day_view_main_item_class_init):
-	a11y initialization
-	* gui/e-day-view-top-item (e_day_view_top_item_get_day_label):
-	new public function.
-	* gui/e-day-view.c (e_day_view_ensure_rows_visible,
-	e_day_view_update_calendar_selection_time): make static functions public
-	(e_day_view_cursor_key_up, e_day_view_cursor_key_down,
-	e_day_view_cursor_key_left, e_day_view_cursor_key_right): emit
-	"selected_time_changed".
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-meeting-model.c (SELECT_NAMES_OAFID): Append "_2".
-	* gui/e-select-names-editable.c (SELECT_NAMES_OAFIID): Likewise.
-	* gui/e-meeting-list-view.c (SELECT_NAMES_OAFID): Likewise.
-	* gui/dialogs/alarm-options.c (SELECT_NAMES_OAFID): Likewise.
-	* gui/dialogs/e-delegate-dialog.c (SELECT_NAMES_OAFID): Likewise
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: use
-	"evolution2:config_item" properties instead of
-	"evolution:config_item" ones.
-
-2003-11-03  Harry Lu  <harry.lu@sun.com>
-
-	Fix for #50387.
-
-	* importers/icalendar-importer.c (support_format_fn):
-	Call icalcomponent_is_valid() to check whether the returned
-	icalcomponent is valid.
-
-2003-10-31  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_init): Add the webcal
-	source group.
-
-	* gui/dialogs/new-calendar.c (print_uri_noproto): Implement.
-	(group_is_remote): Implement.
-	(create_new_source_with_group): Implement webcal case.
-	(new_calendar_dialog): Get optional location from dialog.
-
-	* gui/dialogs/new-calendar.glade: Add location entry.
-
-	* pcs/Makefile.am: Build http backend.
-
-	* pcs/cal-backend-http.[ch]: Add skeleton based on cal-backend-file.
-
-2003-10-31  Dan Winship  <danw@ximian.com>
-
-	* cal-util/cal-util.h: Add CAL_STATIC_CAPABILITY_NO_THISANDFUTURE
-	and CAL_STATIC_CAPABILITY_NO_THISANDPRIOR
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): Add a
-	CalClient argument. Use cal_client_get_static_capability to decide
-	whether or not to offer THISANDFUTURE and THISANDPRIOR options
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes, save_cmd,
-	save_close_cmd): Pass a CalClient to recur_component_dialog.
-
-	* gui/e-day-view.c (e_day_view_finish_long_event_resize,
-	e_day_view_finish_resize, e_day_view_on_editing_stopped,
-	e_day_view_on_top_canvas_drag_data_received,
-	e_day_view_on_main_canvas_drag_data_received): Likewise
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise
-
-	* gui/calendar-component.c (impl_createControls): set an exception
-	if we fail, so evo won't crash.
-
-2003-10-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu): fixed
-	mismatched condition in if/else statement.
-
-2003-10-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-tasks.[ch] (e_tasks_get_cal_client): removed.
-
-	* gui/tasks-control.c (sensitize_commands): fixed to work correctly
-	with the ECalView's model.
-	(tasks_control_set_property): don't use e_tasks_get_cal_client.
-
-	* gui/alarm-notify/alarm-notify.c (free_client_hash): new function
-	to remove items from the CalClient's hash table.
-	(alarm_notify_finalize): call free_client_hash() for each item
-	in the hash table.
-
-2003-10-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (client_die_cb): use
-	bonobo_main_quit, not gtk_main_quit.
-
-	* gui/alarm-notify/alarm-queue.c (free_client_alarms_cb): callback
-	for freeing ClientAlarms stored in the hash table.
-	(alarm_queue_done): call free_client_alarms_cb() for each opened
-	client.
-
-2003-10-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (mark_dirty, save_idle): removed, since
-	we dont save the file anymore in idle callbacks.
-	(cal_backend_file_dispose): removed all traces of the idle saving.
-	(check_dup_uid, create_cal, cal_backend_file_add_timezone,
-	cal_backend_file_create_object, cal_backend_file_modify_object,
-	cal_backend_file_remove_object, cal_backend_file_receive_objects):
-	call save() directly instead of mark_dirty().
-
-2003-10-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_modify_object):
-	implemented THIS and ALL recurrences cases, blowing away or detaching
-	recurrences from the main component as required.
-	(get_rid_string): make it return const.
-	(get_rid_timetype): new convenience function for getting
-	libical's recurrence ID from a CalComponent.
-	(cal_backend_file_is_read_only, remove_recurrence_cb,
-	remove_component): fixed warnings.
-	(remove_object_instance_cb): callback to remove the instances
-	from the hash on the THISANDPRIOR and THISANDFUTURE cases.
-	(cal_backend_file_remove_object): replaced mismatched if/else
-	statement with proper management of each of the recurrence cases.
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/Makefile.am: build new files
-
-	* gui/dialogs/comp-editor-util.c (date_edit_destroy_cb): unref the
-	config manager
-	(comp_editor_new_date_edit): set up a config manager for the date
-	editor
-
-	* gui/e-date-edit-config.[hc]: config manager for e-date-edit
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (update_config): no need to
-	update config settings everywhere explicitly
-
-	* gui/tasks-component.c (update_uris_for_selection): cast the
-	widget
-
-	* gui/gnome-cal.h: remove proto
-
-	* gui/gnome-cal.c (setup_widgets): don't update config settings
-	explicitly
-	(gnome_calendar_update_config_settings): kill
-
-	* gui/e-week-view.c: remove null chars
-
-	* gui/e-tasks.h: remove proto
-
-	* gui/e-tasks.c (set_timezone): set the timezone on the client
-	(timezone_changed_cb): changed timezone callback
-	(setup_config): setup config stuff
-	(e_tasks_init): setup config and widgets here
-	(e_tasks_new): construct is dead, no need to track all widgets
-	(cal_opened_cb): set the timezone upon opening
-	(e_tasks_update_all_config_settings): kill
-
-	* gui/control-factory.c (control_factory_new_control): create the
-	calendar ourselves
-
-	* gui/calendar-config.c (on_timezone_set): don't update the
-	settings everywhere here, we have config managers now
-
-	* gui/calendar-component.c (impl_createControls): create the
-	calendar ourselves
-
-	* gui/calendar-commands.h: remove protos
-
-	* gui/calendar-commands.c: remove dead functions
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-day-view-config.c (set_twentyfour_hour): set the format on
-	the cal view
-
-	* gui/e-week-view-config.c (set_twentyfour_hour): ditto
-	
-	* gui/e-cal-list-view-config.c (set_twentyfour_hour): set the 24
-	hour format on the view
-	(twentyfour_hour_changed_cb): 24 hour format change callback
-	(e_cal_list_view_config_set_view): handle 24 hour format changes
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_finalize): unref
-	config manager
-	(init_widgets): create config manager for the e-calendar
-
-	* gui/e-tasks.c (setup_widgets): create config manager for the
-	table view
-	(e_tasks_destroy): unref config manager
-	(e_tasks_open): return FALSE not NULL
-	(e_tasks_update_all_config_settings): don't configure the calendar
-	table here, we have a manager
-
-	* gui/calendar-config.c: remove dead config functions (handled by
-	config managers now)
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (set_timezone): set the timezone for all clients
-	(timezone_changed_cb): callback for changes
-	(setup_config): setup the configuration
-	(setup_widgets): setup up configuration managers for the list
-	view, task list and date navigator
-	(gnome_calendar_init): setup config
-	(gnome_calendar_destroy): destroy configuration managers and
-	notifications
-	(gnome_calendar_update_config_settings): remove dead bits
-
-	* gui/e-mini-calendar-config.[hc]: manage configuration of an
-	e-calendar
-
-	* gui/e-day-view-config.h: remove extraneous comment, type the
-	parent class correctly
-
-	* gui/e-week-view-config.h: ditto
-	
-	* gui/e-day-view-config.c (e_day_view_config_class_init): type the
-	class correctly
-	(set_timezone): set timezone
-	(timezone_changed_cb): timezone changed callback
-	(e_day_view_config_set_view): track timezone changes
-
-	* gui/e-week-view-config.c: ditto
-	
-	* gui/e-cell-date-edit-config.[hc]: manage configuration of a date
-	edit cell
-
-	* gui/e-calendar-table-config.[hc]: manage configuration of a
-	e-calendar-table
-
-	* gui/e-cal-list-view.c (get_current_time_cb): use the view
-	timezone to compute
-
-	* gui/e-cal-list-view-config.[hc]: manage configuration of a
-	list view
-
-	* gui/calendar-config.h: update protos
-
-	* gui/calendar-config.c
-	(calendar_config_add_notification_timezone): notify of timezone
-	change
-	(calendar_config_add_notification_dnav_show_week_no): notify of
-	show week number setting change
-
-	* gui/calendar-component.c (calendar_component_peek): remove bad
-	comma
-
-	* gui/Makefile.am: build new config classes
-
-2003-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (fill_popup_menu_callback): fixed
-	typo in menu item label.
-
-	* gui/e-cal-model.[ch] (e_cal_model_get_use_24_hour_format): new
-	function.
-
-	* gui/e-cal-view.[ch]: no need to keep the 'use_24_hour' setting,
-	it's already in the model.
-	(e_cal_view_get_use_24_hour_format,
-	e_cal_view_set_use_24_hour_format): new functions.
-
-	* gui/e-day-view.[ch] (e_day_view_get_24_hour_format,
-	(e_day_view_set_24_hour_format): removed.
-	(e_day_view_convert_time_to_display, e_day_view_update_event_label,
-	e_day_view_get_time_string_width): use the ECalView's function to
-	get the 24 hour format.
-
-	* gui/e-week-view.[ch] (e_week_view_get_24_hour_format,
-	e_week_view_set_24_hour_format): removed.
-	(e_week_view_convert_time_to_display,
-	e_week_view_get_time_string_width): use the ECalView's function
-	to get the 24 hour format.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw):
-	* gui/e-week-view-event-item.c (e_week_view_draw_time):
-	don't use the view's use_24_hour_format, but the ECalView method.
-
-2003-10-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (impl_createControls): connect to
-	"fill_popup_menu" on the ESourceSelector.
-	(fill_popup_menu_callback): add popup menu items here.
-	(add_popup_menu_item): new function to add items to the
-	popup menu.
-	(new_calendar_cb): callbacks for the popup menu items.
-
-2003-10-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c: no need to keep the timezone here, it is
-	already stored in the model.
-	(e_cal_view_get_timezone): call e_cal_model_get_timezone().
-	(e_cal_view_set_timezone): call e_cal_model_set_timezone().
-	(e_cal_view_new_appointment_for): use the model's timezone.
-
-2003-10-27  Dan Winship  <danw@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_notify_object_created,
-	cal_backend_notify_object_modified,
-	cal_backend_notify_object_removed): New; tell each query about a
-	created/modified/removed object.
-
-	* pcs/cal.c (cal_notify_object_created): Use
-	cal_backend_notify_object_created.
-	(cal_notify_object_modified, cal_notify_object_removed): Likewise
-	for modified/removed
-	(cal_notify_objects_received): we need both the before and after
-	forms for the modified objects so they can be resolved as
-	adds/modifies/removes per-query. But the caller can just call the
-	cal_backend_* routines for each object anyway, so just remove the
-	created/modified/removed lists.
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_receive_objects):
-	Remove created/modified/removed list arguments.
-	(_cal_backend_receive_objects): Likewise.
-
-	* pcs/cal-backend-file.c (cal_backend_file_receive_objects):
-	Remove created/modified/removed list arguments. Replace the one
-	use of *removed with a call to cal_backend_notify_object_removed.
-
-2003-10-27  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): store config objects as well
-	(gnome_calendar_set_default_uri): return FALSE if the
-	pre-condition fails
-	(gnome_calendar_update_config_settings): remove settings that are
-	now handled by the config objects
-
-	* gui/e-week-view.c (e_week_view_set_compress_weekend): queue a
-	draw
-
-	* gui/e-itip-control.c (start_default_server): comment out
-
-	* gui/e-day-view-config.[hc]: a class to track config changes of
-	interest to day views
-
-	* gui/e-week-view.[hc]: ditto for week views
-	
-	* gui/calendar-config.h: add protos
-
-	* gui/calendar-config.c: use the #defines for the keys and add
-	notification routines
-
-	* gui/calendar-config-keys.h: a list of defines for gconf keys
-
-	* gui/Makefile.am: build new files
-
-2003-10-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.h: changed fill_component_from_model virtual
-	method to get an ETableModel, not an ECalModel.
-
-	* gui/e-cal-model.c (ecm_append_row): the source model sent from
-	ETable is an ETableModel, not an ECalModel.
-
-	* gui/e-cal-model-calendar.c (ecmc_fill_component_from_model):
-	get an ETableModel for the 'source_model' argument.
-
-	* gui/e-cal-model-tasks.c (ecmt_fill_component_from_model): ditto.
-
-2003-10-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (add_uri_for_source): pass FALSE as the
-	'only_if_exists' parameter, so that the calendar gets created when
-	it still does not exist.
-
-2003-10-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (tasks_component_init): initialize private
-	structure on TasksComponent.
-
-2003-10-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_class_init): removed
-	repeated initialization.
-	(calendar_component_peek): use G_STRLOC for g_warning's.
-
-	* gui/tsaks-control.[ch] (tasks_control_activate,
-	tasks_control_deactivate): made these 2 functions public.
-
-	* gui/tasks-component.[ch]: implementation of the tasks component.
-
-	* gui/Makefile.am:
-	* gui/GNOME_Evolution_Calendar.server.in.in: added tasks component.
-
-	* gui/main.c: ditto.
-	(factory): added code to create the tasks component when requested.
-
-2003-10-24  Dan Winship  <danw@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_get_changes): Remove type arg
-
-	* conduits/calendar/calendar-conduit.c (pre_sync, post_sync):
-	Update for that
-
-	* conduits/todo/todo-conduit.c (pre_sync, post_sync): Likewise
-
-	* idl/evolution-calendar.idl (getChanges): Remove type arg.
-
-	* pcs/cal.c (impl_Cal_getChanges): Likewise
-
-	* pcs/cal-backend.c (cal_backend_get_changes): Likewise
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_changes): Likewise
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_changes): Update
-	for that
-
-	* pcs/Makefile.am: build libpcs.la and libpcsfile.la instead of
-	just .a.
-	(libpcs_la_LIBADD): depend on libcal-util.la and libeutil.la
-	(libpcsfile_la_LIBADD): depend on libpcs.la
-
-2003-10-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_construct_instance,
-	cal_util_remove_instances): new functions for individual
-	instances management.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_object): if we
-	dont have a recurrence in our hash table, generate one for the
-	specified recurrence ID.
-	(match_recurrence_sexp): new function to match recurrences on
-	regular expresessions.
-	(match_object_sexp): call match_recurrence_sexp() for all recurrences.
-	(cal_backend_file_modify_object): handle mod_types.
-	(cal_backend_file_remove_object): handle mod_types.
-
-2003-10-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.h: update protos
-
-	* gui/gnome-cal.c (gnome_calendar_set_default_uri): set the
-	default client based on uri
-
-	* gui/calendar-component.c (add_uri_for_source): rename from
-	load_uri_for_source and take a calendar
-	(remove_uri_for_source): utility routine to remove the source's
-	uri from the calendar
-	(is_in_selection): checks to see if the uid of the given source
-	matches any of those in the given selection
-	(update_uris_for_selection): remove any uris no longer in the
-	selection, add those that still exist
-	(source_selection_changed_callback): call above
-	(primary_source_selection_changed_callback): we have the calendar
-	easily now; set the default by uri
-	(control_activate_cb): handle activation and de-activation
-	(impl_createControls): create the calendar control ourselves so we
-	have access to the calendar
-	(impl_dispose): release the source selection
-
-2003-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (add_component): if the component received
-	is an instance, add it to the recurrences hash table.
-	(free_recurrence): callback for g_hash_table_foreach() to free
-	the recurrences in the CalBackendFileObject structure.
-	(free_object): call free_recurrence for each recurrence.
-	(remove_recurrence_cb): g_hash_table_foreach() callback to
-	remove recurrences from the calendar.
-	(remove_component): remove all recurrences.
-	(cal_backend_file_open): check write access on the file, and
-	set read_only flag appropriately.
-	(cal_backend_file_is_read_only): return the private flag.
-	(cal_backend_file_init): initialize read_only flag.
-	(cal_backend_file_get_object): deal with recurrences.
-
-	* gui/alarm-notify/notify-main.c (main): unref the alarm
-	notification service when terminating.
-	(client_die_cb): call bonobo_main_quit instead of gtk_main_quit.
-
-2003-10-23    <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_get_current_view_widget): just
-	uses the views array and the current view type
-	(setup_widgets): ditto
-	(set_view): ditto
-	(backend_died_cb): ditto
-	(gnome_calendar_get_calendar_model): ditto
-	(gnome_calendar_update_config_settings): ditto
-
-2003-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c: accept also text/calendar for D&D.
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received):
-	fix typo
-	(e_day_view_on_main_canvas_drag_data_received): fix C99 issue, fix
-	typo
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (update_query): use the internal client list to
-	create the queries
-	(gnome_calendar_destroy): use the internal client list to
-	disconnect signal handlers
-	(gnome_calendar_add_event_uri): add the client to the internal
-	list
-	(gnome_calendar_remove_event_uri): remove the client from the
-	internal list and lookup the client
-	(gnome_calendar_update_config_settings): use the internal client
-	list to update the config settings
-
-2003-10-23  Harry Lu  <harry.lu@sun.com>
-
-	* cal-client/cal-client.c: (cal_client_get_timezone): remove and free
-	op before return.
-
-	* gui/e-cal-view.c (e_cal_view_add_event): modified from
-	selection_received_add_event() so that it call be called out of
-	e-cal-view.c.
-	(selection_received): modified to call e_cal_view_add_event().
-
-	* gui/e-cal-view.h: add declaration for e_cal_view_add_event().
-
-	* gui/e-day-view.c (e_day_view_on_drag_data_get): Provide a
-	icalcomponent for both TARGET_CALENDAR_EVENT and TARGET_VCALENDAR.
-	(e_day_view_on_top_canvas_drag_data_received): If dragging between
-	different windows, make it works like a copy and paste.
-	(e_day_view_on_main_canvas_drag_data_received): ditto.
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-util/cal-recur.c: update g_date calls to non-deprecated
-	calls
-
-	* cal-util/Makefile.am: turn off deprecated funcs
-
-	* cal-client/Makefile.am: turn off deprecated funcs
-
-	* cal-client/cal-client.c (cal_client_get_error_message): add OK
-	message
-
-	* pcs/cal-backend.[hc]: remove dead funcs
-
-	* pcs/query.c: tidy headers
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
-
-	* pcs/query.c (query_notify_objects_removed_1): Fix c/p typo -
-	call removed instead of modify
-
-2003-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (e_cal_view_init): connect also to ETableModel's
-	"model_cell_changed" signal.
-	(e_cal_view_set_model): likewise.
-	(model_cell_changed_cb): callback for "model_cell_changed".
-	(e_cal_view_destroy): use g_signal_handlers_disconnect_matched instead
-	of g_signal_handlers_disconnect_by_func, so that all handlers are
-	disconnected.
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
- 
- 	* pcs/cal.c (cal_notify_object_modified): guard against irrelevant
- 	args (ie if there was an error) 
- 	(cal_notify_object_removed): ditto
- 	(cal_notify_timezone_added): ditto
- 
- 	* pcs/cal-backend-sync.c (_cal_backend_is_read_only): init value
- 	to something known
- 	(_cal_backend_get_cal_address): ditto
- 	(_cal_backend_get_alarm_email_address): ditto
- 	(_cal_backend_get_ldap_attribute): ditto
- 	(_cal_backend_get_static_capabilities): ditto
- 	(_cal_backend_modify_object): ditto
- 	(_cal_backend_remove_object): ditto
- 	(_cal_backend_get_object_list): ditto
- 
-2003-10-22  JP Rosevear <jpr@ximian.com>
- 
- 	* gui/e-cal-list-view.c (e_cal_list_view_new): create a model and
- 	pass it as an arg during creation
- 
- 	* gui/e-day-view.c (e_day_view_new): unref the model
- 
- 	* gui/e-week-view.c (e_week_view_new): ditto
-	
-2003-10-22  JP Rosevear <jpr@ximian.com>
- 
- 	* cal-client/cal-client.c (cal_client_get_object): only change to
- 	invalid object error code if we got the object but couldn't parse
- 	it, and only check for timezones if we had success
- 
- 	* gui/comp-util.c (cal_comp_is_on_server): don't throw a warning
- 	if the object simply does not exist
-	
-2003-10-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.[ch] (gnome_calendar_remove_event_uri): new
-	function to remove calendars from the views.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add an
-	"evolution:button_icon" attribute.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add an
-	"evoution:button_sort_order" attribute.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-component.c (impl_createControls): Make the
-	scrolled window have a GTK_SHADOW_IN shadow.
-	* gui/dialogs/meeting-page.c (meeting_page_construct): Likewise.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-component.c (impl_createControls): Set the
-	scrollbar policy to "automatic" for both the horizontal and
-	vertical scrollbars around the source selector.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add an
-	"evolution:button_label" property on the component for use in the
-	shell.
-
-2003-10-21  Rodney Dawes  <dobey@ximian.com>
-
-	* cal-client/Makefile.am: Fix typo in libcal_client_la_SOURCES
-	
-2003-10-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_init): fixed
-	a leak caused by only freeing 'base_uri' in some cases.
-
-2003-10-21  JP Rosevear <jpr@ximian.com>
-
-	* gui/control-factory.c (get_prop): fix parse error
-	(set_prop): gnome_calendar_open was renamed
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): adapt to
-	the cal_client_new changes and the lack of a default calendar
-	routine
-	(pre_sync): don't have to pass a type for the default object any
-	more
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-	adapt to the cal_client_new changes and the lack of a default
-	calendar routine
-	(pre_sync): don't have to pass a type for the default object any
-	more
-
-	* cal-client/cal-client.c (cal_client_open_async): add FIXME
-	comment
-
-2003-10-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c: store recurrences per object.
-	(free_object): free correctly the CalBackendFileObject's
-	contained in 'priv->comp_uid_hash'.
-	(lookup_component, check_dup_uid, add_component, remove_component,
-	match_object_sexp):
-	adapted to changes in comp_uid_hash.
-	
-2003-10-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.[ch] (gnome_calendar_add_event_uri): renamed
-	from gnome_calendar_open.
-
-	* gui/calendar-component.c (load_uri_for_source): call
-	gnome_calendar_add_event_uri instead of setting the URI property on
-	the Bonobo control.
-
-2003-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/migration.c (process_calendar_dir): process subfolders.
-
-2003-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/migration.[ch] (migrate_old_calendars): new function.
-
-	* gui/calendar-component.c (calendar_component_init): call
-	the above function to migrate from old setups.
-
-	* gui/Makefile.am: added new files.
-
-2003-10-17  Jeffrey Stedfast <fejj@ximian.com>
-	
-	* conduits/calendar/Makefile.am: Fixed for libical build changes.
-
-	* conduits/todo/Makefile.am: Same.
-
-2003-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (on_print): call
-	e_cal_view_get_visible_time_range, not the gnome_calendar_
-	version.
-	(e_cal_view_new_appointment_for, e_cal_view_new_appointment,
-	e_cal_view_edit_appointment): new functions.
-
-	* gui/gnome-cal.[ch] (gnome_calendar_new_appointment_for,
-	gnome_calendar_new_appointment, gnome_calendar_edit_object):
-	removed these functions, now available in e-cal-view.
-
-	* gui/calendar-commands.c:
-	* gui/e-day-view.c:
-	* gui/e-week-view-event-item.c:
-	* gui/e-week-view.c: replaced calls to gnome_calendar_* with
-	e_cal_view_* equivalents.
-
-2003-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.[ch] (e_cal_view_get_default_category):
-	(e_cal_view_set_default_category): new functions.
-	(e_cal_view_destroy): free the default_category field.
-
-	* gui/e-day-view.[ch] (e_day_view_set_default_category):
-	removed obsolete function.
-	(e_day_view_init, e_day_view_destroy, e_day_view_do_key_press):
-	use the ECalView's default_category.
-
-	* gui/e-week-view.[ch] (e_week_view_set_default_category):
-	removed obsolete function.
-	(e_week_view_init, e_week_view_destroy, e_week_view_do_key_press):
-	use the ECalView's default_category.
-
-	* gui/gnome-cal.c (gnome_calendar_set_query): set the query
-	also on the list view by using the priv->views array.
-	(search_bar_category_changed_cb, gnome_calendar_set_default_client):
-	use the priv->views array.
-	(gnome_calendar_get_calendar_model): return the model for the
-	current view widget.
-	(gnome_calendar_open): removed tasks opening code.
-
-2003-10-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): if the user
-	presses Cancel, just terminate.
-
-2003-10-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_init): create
-	directories for the newly-created calendars.
-
-	* gui/dialogs/new-calendar.c (create_new_source_with_group): use
-	e_mkdir_hier instead of mkdir.
-
-2003-10-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_init): if no groups
-	are present in the configuration, create the "On This Computer"
-	group and the "Personal" and "Work" calendars on it.
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): moved the
-	source creation...
-	(create_new_source_with_group): ...here, and made the code create
-	the directory for the new calendar.
-
-2003-10-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-select-names-editable.c (e_selct_names_editable_get_address):
-	EDestination -> EABDestination.
-
-	* gui/gnome-cal.c (setup_widgets): evolution_dir -> ".evolution".
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-select-names-editable.c (e_select_names_editable_get_address):
-	use EABDestination instead of EDestination.
-
-	* gui/gnome-cal.c (gnome_calendar_open): disabled tasks opening code.
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-meeting-list-view.c: adapted to new addressbook API.
-
-	* gui/e-meeting-store.c: adapted to new addressbook API.
-	(find_zone): fixed usage of icalcomponent where an icalproperty
-	is expected.
-	(refresh_busy_periods): fixed call to cal_client_get_free_busy().
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	added missing variable.
-	
-2003-10-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/dialogs/meeting-page.c: #include <gal/e-table/e-table.h>
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-meeting-list-view.c (start_addressbook_server):
-	updated to new addressbook API.
-	(book_open_cb): removed unneeded function, since we load
-	the local addressbook synchronously.
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/Makefile.am: added missing header directories.
-
-	* pcs/cal-factory.h: include <libical/ical.h>, not <ical.h>.
-
-	* gui/dialogs/meeting-page.c: added missing headers.
-	(meeting_page_construct): free 'backend_address' as returned
-	by cal_client_get_cal_address(). Removed code to create the
-	meeting model's ETable not removed with the merge.
-
-	* gui/e-meeting-list-view.c: updated addressbook headers.
-
-	* gui/gnome-cal.h: added missing ',' in the GnomeCalendarViewType
-	enum.
-	
-2003-10-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_update_query): dont set status
-	messages here, already set in e_cal_view_update_query.
-	(update_query): removed this function.
-	(e_day_view_recalc_day_starts): call e_day_view_update_query,
-	not update_query.
-
-	* gui/e-week-view.c (e_week_view_update_query): dont set status
-	messages here, already set in e_cal_view_update_query.
-
-	* gui/gnome-cal.c (adjust_query_for_view): new function to adjust
-	the query for the visible time range on a given view.
-	(gnome_calendar_set_query): call adjust_query_for_view for each
-	one of the views.
-
-2003-10-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (e_cal_view_init): connect to signals on the
-	model we create here, so that we get notifications for changes.
-
-	* gui/gnome-cal.c (gnome_calendar_set_query): set the query
-	on all models.
-	(gnome_calendar_open): update the date navigator query.
-
-2003-10-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.c (cal_notify_timezone_requested): never send NULL
-	strings to ORBit.
-
-	* gui/e-cal-view.c (e_cal_view_create_popup_menu): removed
-	unneeded variables. Also, fixed a typo that was making the
-	menu options be disabled when they should be enabled.
-
-2003-10-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.[ch] (e_cal_model_get_client_for_uri): new function.
-
-	* gui/gnome-cal.[ch] (gnome_calendar_set_default_client): new function.
-
-	* gui/calendar-component.c (primary_source_selection_changed_callback):
-	set the default client on the calendar view to be the primary
-	selection on the source list.
-
-2003-10-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): set a default group
-	on the calendar group option menu and create the source if all checks
-	are passed.
-
-2003-10-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): set up widgets
-	loaded from the Glade file.
-
-2003-10-10  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/Makefile.am (etspec_DATA): Add e-cal-list-view.etspec.
-	(libevolution_calendar_la_SOURCES): Add e-cal-list-view.[ch].
-
-	* gui/calendar-commands.c (show_list_view_clicked): Implement.
-	(calendar_get_text_for_folder_bar_label): Add case for list view.
-	Use month case and tweak it so it doesn't show "%d - %d" if the
-	time span contains only one day.
-	(verbs): Add list view.
-	(pixmaps): Add list view.
-
-	* gui/calendar-view-factory.c (calendar_view_factory_get_title):
-	Add list view case.
-	(calendar_view_factory_get_type_code): Add list view case.
-
-	* gui/control-factory.c (get_prop): Add list view case.
-
-	* gui/e-cal-model.c (get_classification): Fix to conform to updated
-	libical.
-	(ecm_set_value_at): Add missing break statements.
-	(ecm_get_color_for_component): Add braces for clarity.
-
-	* gui/gnome-cal.c (gnome_calendar_get_current_view_widget): Add
-	list view case.
-	(get_focus_location): Add list view case.
-	(connect_list_view_focus): Implement.
-	(setup_widgets): Set up list view.
-	(gnome_calendar_direction): Add list view case.
-	(set_view): Add list view case.
-	(gnome_calendar_setup_view_menus): Add list view factory.
-	(gnome_calendar_construct): Account for list view.
-	(gnome_calendar_update_config_settings): Account for list view.
-	(get_days_shown): Implement list view case.
-
-	* gui/gnome-cal.h (GnomeCalendarViewType): Add list view.
-
-	* gui/e-cal-list-view.[ch]: Implement ECalListView, subclassing
-	ECalView.
-
-2003-10-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.[ch]: added new widget, which implements
-	the dialog to create new calendars.
-
-	* gui/dialogs/new-calendar.glade: basic mockup of the dialog.
-
-	* gui/dialogs/Makefile.am: added new files.
-
-	* gui/calendar-commands.c (file_new_calendar_cb): open the new calendar
-	dialog to allow user to create a new cal.
-
-2003-10-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/control-factory.c (calendar_properties_init): pass the
-	BonoboControl to get_prop/set_prop.
-	(get_prop): obtain the GnomeCalendar from the control.
-	(set_prop): ditto, and when the URI property is changed,
-	sensitize the UI as approppriate.
-
-	* gui/calendar-commands.c (calendar_control_sensitize_calendar_commands):
-	made this function public.
-
-	* gui/calendar-commands.h: added new prototype.
-
-2003-10-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c (file_new_calendar_cb,
-	file_new_appointment_cb, file_new_event_cb, file_new_meeting_cb,
-	file_new_task_cb): callbacks for "New..." verbs.
-	(sensitize_calendar_commands): sensitize new verbs, and made it
-	sensitize correctly based on the set of clients currently loaded.
-	(sensitize_taskpad_commands): likewise.
-
-2003-10-09  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-cal-model.c (get_classification): Adapt to libical API changes.
-	(ecm_set_value_at): Break after each case, so we don't set the passed value
-	in more than one field.
-
-2003-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (e_cal_view_delete_selected_occurrence):
-	* cal-client/cal-client.c (cal_client_remove_object): added missing
-	argument when calling cal_client_remove_object_with_mod().
-
-2003-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added missing 'rid' argument to the
-	removeObject method.
-
-	* cal-client/cal-client.c (cal_client_remove_object_with_mod):
-	* pcs/cal-backend.h:
-	* pcs/cal-backend.c (cal_backend_remove_object):
-	* pcs/cal-backend-sync.h:
-	* pcs/cal-backend-sync.c (cal_backend_sync_remove_object,
-	_cal_backend_remove_object):
-	* pcs/cal-backend-file.c (cal_backend_file_remove_object):
-	* pcs/cal.c (impl_cal_removeObject): adapted to changes in IDL.
-
-2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* cal-client/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-	* cal-util/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-	* cal-util/*.[c,h]: #include <libical/ical.h> instead of <ical.h>
-
-	* gui/Makefile.am: INCLUDE path fixes for changes made to libical
-	build.
-
-	* gui/*.[c,h]: #include <libical/ical.h> instead of <ical.h>
-
-	* gui/alarm-notify/Makefile.am: INCLUDE path fixes for changes
-	made to libical build.
-
-	* gui/alarm-notify/config-data.h: #include <libical/ical.h>
-	instead of <ical.h>
-
-	* gui/dialogs/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-	* gui/dialogs/comp-editor-util.c: #include <libical/ical.h>
-	instead of <ical.h>
-
-	* gui/dialogs/e-delegate-dialog.c: #include <libical/ical.h>
-	instead of <ical.h>
-
-	* importers/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-	* pcs/Makefile.am: INCLUDE path fixes for changes made to libical
-	build.
-
-	* pcs/cal.c: #include <libical/ical.h> instead of <ical.h>
-
-2003-10-08  Harry Lu  <harry.lu@sun.com>
-
-	* gui/dialogs/alarm-options.glade: Make repeat-quantity and
-	repeat-value of alarm option dialog numeric only.
-
-	* gui/dialogs/task-details-page.glade: Make percent-complete of
-	task details dialog numeric only.
-
-2003-10-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	EDestination => EABDestination, and e_destination =>
-	eab_destination.
-	(e_delegate_dialog_get_delegate): same.
-	(e_delegate_dialog_get_delegate_name): same.
-
-	* gui/dialogs/comp-editor-util.c: remove unnecessary #include of
-	e-destination.h.
-
-	* gui/dialogs/alarm-options.c (alarm_to_malarm_widgets):
-	EDestination => EABDestination, and e_destination =>
-	eab_destination.
-	(malarm_widgets_to_alarm): same.
-
-	* gui/e-meeting-model.c (book_open_cb): track change to error
-	return codes.
-	(start_addressbook_server): use
-	e_book_async_get_default_addressbook.
-	(contacts_cb): rename cursor_cb to this, as we no longer get
-	passed a cursur, and we don't need to check the email address
-	since the query is now "is" instead of "contains".
-	(refresh_busy_periods): use an "is" query, and use
-	e_book_async_get_contacts instead of getting a CardCursor.
-	(process_section): this takes an EABDestination** instead of a
-	SimpleCardList*, which is gone.
-	(select_names_ok_cb): get "destinations" instead of
-	"simple_card_list".
-
-2003-10-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_is_read_only): fixed
-	documentation comments.
-
-	* gui/calendar-commands.c (sensitize_calendar_commands): figure
-	out read-only menu items to disable based on the currently
-	selected object's CalClient.
-
-2003-10-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c: set better error m,essages on the
-	E_CALENDAR_CHECK_STATUS macro.
-	(cal_client_get_error_message): new function.
-
-	* cal-client/cal-client.h: added new prototype.
-
-	* gui/dialogs/comp-editor.c (save_comp): use the GError argument
-	for the cal_client_create/_modify_object calls, and display the
-	error message coming from the backend.
-
-	* gui/comp-util.c (cal_comp_is_on_server): likewise.
-
-2003-10-07  Dan Winship  <danw@ximian.com>
-
-	* idl/evolution-calendar.idl (getDefaultObject): Remove the "type"
-	arg; the backend knows what type it is
-
-	* pcs/cal.c (impl_Cal_getDefaultObject): Likewise
-
-	* pcs/cal-backend.c (cal_backend_get_default_object): Likewise
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_default_object,
-	_cal_backend_get_default_object): Likewise
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_default_object):
-	Likewise. (Use cal_backend_get_kind() instead.)
-
-	* cal-client/cal-client.c (cal_client_get_default_object):
-	Likewise
-
-	* gui/comp-util.c (cal_comp_event_new_with_defaults,
-	cal_comp_task_new_with_defaults): Update calls to
-	cal_client_get_default_object().
-
-	* pcs/cal-backend-sync.c (_cal_backend_get_static_capabilities):
-	Use the right cal notification
-
-2003-10-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_create_component_with_defaults):
-	dont clone NULL icalcomponent's.
-
-2003-10-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_get_default_client): make sure we
-	always return a default client, if possible, since we rely on having
-	a default client in many places.
-
-	* gui/e-day-view.c (e_day_view_do_key_press): dont create event if
-	e_cal_model_create_component_with_defaults returns NULL.
-
-	* gui/e-week-view.c (e_week_view_do_key_press): dont create event if
-	e_cal_model_create_component_with_defaults returns NULL.
-	
-2003-10-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_create_component_with_defaults):
-	make sure the component has always an UID.
-
-	* gui/e-day-view.c  (e_day_view_find_event_from_uid):
-	* gui/e-week-view.c (e_week_view_find_event_from_uid): check
-	pointers passed to strcmp().
-
-2003-10-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): added missing call to
-	cal_client_open().
-
-	* cal-client/cal-client.c (cal_client_new): fixed documentation
-	comments.
-	(cal_client_open): emit CAL_OPENED signal with appropriate status codes.
-	(open_sync): dont emit CAL_OPENED signal, it's already emitted in
-	cal_client_open().
-
-2003-10-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/comp-editor-factory.c (open_client):
-	* gui/gnome-cal.c (gnome_calendar_open, gnome_calendar_construct):
-	* gui/calendar-offline-handler.c (backend_go_offline, backend_go_online,
-	calendar_offline_handler_init): adapted to changes in cal_client and
-	manage GError's returned by cal_client_open.
-
-	* gui/e-itip-control.c: dont run anymore sub event loops.
-	(start_calendar_server): use synchronous interface for opening calendars.
-	(start_default_server): renamed it from *_async.
-	(start_calendar_server_cb): removed unneeded function.
-	(object_requested_cb): use sync interface.
-
-	* gui/e-tasks.c (e_tasks_construct): dont create the CalClient here.
-	(e_tasks_open): do it here, where we've got all the info needed.
-
-	* importers/icalendar-importer.c (update_single_object): killed warning.
-	(ical_importer_new, vcal_importer_new): don't create CalClient's here.
-	(load_file_fn): create them here.
-	(vcal_load_file_fn): and here.
-	(gnome_calendar_import_data_fn): fixed usage of cal_client_*.
-
-	* */*: integrated JP's changes for synchronous open's in cal_client
-	and one model per view instead of one model for all views.
-	
-2003-10-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_modify_object): return FALSE
-	if the icalcomponent is NULL.
-
-	* gui/e-day-view.c (e_day_view_finish_resize): commit sequence on
-	CalComponent after changing start/end dates.
-
-2003-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (process_component):
-	* gui/e-week-view.c (process_component): expand recurrences here.
-
-2003-09-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (match_recurrence_sexp): removed.
-	(match_object_sexp): dont expand recurrences here.
-
-2003-09-30  Mike Kestner <mkestner@ximian.com>
-
-	* cal-util/cal-util-marshal.list : new VOID:STRING,STRING,STRING
-	* gui/Makefile.am : build the new view/store/renderer/editable
-	* gui/e-select-names-renderer.* : new completion cell renderer
-	* gui/e-select-names-editable.* : new completion cell editable
-	* gui/e-meeting-model.* : killed. code reused in list-view/store
-	* gui/e-meeting-store.* : port of EMeetingModel to GtkTreeModel
-	* gui/e-meeting-list-view.* : GtkTreeView subclass for attendee lists
-	* gui/e-meeting-time-sel.c : Use the new store/view
-	* gui/e-meeting-time-sel-item.c : Use the new store/view
-	* gui/dialogs/Makefile.am : don't install the etspec anymore.
-	* gui/dialogs/event-editor.c : Use the new store/view.
-	* gui/dialogs/meeting-page.c : Use the new store/view.
-	* gui/dialogs/shedule-page.c : Use the new store/view.
-	* gui/dialogs/task-editor.c : Use the new store/view.
-
-2003-09-29  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: link to libical-evolution
-
-	* conduits/calendar/Makefile.am: ditto	
-	
-2003-09-26  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_class_init): remove cal_added
-	signal
-
-2003-09-26  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c (cal_get_backend): accessor
-	(cal_get_listener): ditto
-
-	* pcs/cal-factory.c (impl_CalFactory_getCal): update to new
-	routine name
-
-	* pcs/cal-backend.h: add protos
-	
-	* pcs/cal-backend.c (cal_backend_init): init client mutex
-	(cal_backend_finalize): destroy client mutex
-	(cal_destroy_cb): just remove the client
-	(listener_died_cb): remove the client, the listener died so it
-	can't really do anything
-	(last_client_gone): signal the last client gone
-	(cal_backend_add_client): add a client with locking and listen for
-	the death of the listener
-	(cal_backend_remove_client): remove client
-
-2003-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-sync.c (_cal_backend_create_object): only free the
-	returned UID if it's not NULL.
-
-	* pcs/cal.c (cal_notify_object_created): dont send NULL strings to
-	ORBit code.
-
-2003-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/comp-util.c (cal_comp_is_on_server): free the icalcomponent
-	returned from cal_client_get_object, and return TRUE if we find
-	the component on the backend.
-
-	* gui/e-day-view.c (process_component):
-	* gui/e-week-view.c (process_component): added missing case, so that
-	we also display recurrent meetings starting before the time range and
-	ending after the time range.
-
-	* cal-client/cal-listener.c (impl_notifyReadOnly): pass the
-	'read_only' argument to the signal callback correctly (a gboolean
-	not a 'gboolean *').
-
-	* gui/comp-editor-factory.c (resolve_pending_requests): removed
-	the g_assert on 'oc->pending != NULL', since there are now cases
-	(local calendar) where we get to call this function (cal_opened_cb)
-	with no pending requests yet.
-
-2003-09-25  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): adapt to new
-	get_free_busy api
-
-	* conduits/calendar/calendar-conduit.c (post_sync): ditto
-	(pre_sync): ditto
-
-	* conduits/todo/todo-conduit.c (pre_sync): ditto
-	(post_sync): ditto
-
-	* gui/e-meeting-model.c (refresh_busy_periods): ditto
-
-	* gui/e-itip-control.c (send_freebusy): ditto
-
-	* gui/e-cal-view.c (on_publish): ditto
-
-	* cal-client/cal-listener.h: add signals
-
-	* cal-client/cal-listener.c (build_change_list): move here from
-	cal-client.c
-	(impl_notifyChanges): implement
-	(build_free_busy_list): util to create the GList of free busy
-	objects
-	(impl_notifyFreeBusy): implement
-	(cal_listener_class_init): set free busy and changes epv methods,
-	add signals
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c (cal_get_changes_cb): get changes call
-	back
-	(cal_get_free_busy_cb): get free busy call back
-	(cal_client_init): listen for free busy and changes signals
-	(cal_client_get_changes): convert to new threaded sync api
-	(cal_client_get_free_busy): ditto
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c: remove dead type conversion function
-	(impl_Cal_getChanges): implement by just calling, no return stuff
-	(impl_Cal_getFreeBusy): ditto
-	(cal_notify_changes): do getChanges callback
-	(cal_notify_free_busy): do getFreeBusy callback
-
-	* pcs/cal-backend.h: update protos, vmethods
-	
-	* pcs/cal-backend.c (cal_backend_get_free_busy): call through
-	(cal_backend_get_changes): ditto
-
-	* pcs/cal-backend-sync.h: add vmethods, protos
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_changes): call
-	through
-	(cal_backend_sync_get_free_busy): ditto
-	(_cal_backend_get_changes): backend implementation, notify
-	(_cal_backend_get_free_busy): ditto
-	(cal_backend_sync_class_init): set free busy and changes
-	implementations
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): convert
-	to sync backend method
-	(cal_backend_file_compute_changes_foreach_key): remove from the
-	hash here
-	(cal_backend_file_compute_changes): no need to build the sequence
-	here
-	(cal_backend_file_get_changes): convert to sync backend method
-	(cal_backend_file_class_init): set sync backend methods for free
-	busy and changes
-
-	* idl/evolution-calendar.idl: convert getChanges and getFreeBusy
-	to new async api
-
-2003-09-25  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend.h: remove dead result enums
-
-	* pcs/cal-backend.c: fix comments
-
-	* idl/evolution-calendar.idl: remove dead exceptions
-
-2003-09-25  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.c (cal_notify_default_object): send back the empty
-	string if the object is NULL
-	(cal_notify_object): ditto
-
-2003-09-25  JP Rosevear <jpr@ximian.com>
-
-	* gui/comp-editor-factory.c (edit_existing): convert to api
-	changes
-
-	* conduits/todo/todo-conduit.c (local_record_from_uid): ditto
-	(pre_sync): ditto
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_uid):
-	ditto
-	(pre_sync): ditto
-
-	* importers/icalendar-importer.c (update_single_object): ditto
-
-	* gui/dialogs/comp-editor.c (obj_updated_cb): ditto
-
-	* gui/e-itip-control.c (get_real_item): ditto
-	(find_server): ditto
-
-	* gui/comp-util.c (cal_comp_is_on_server): ditto
-	(cal_comp_event_new_with_defaults): ditto
-	(cal_comp_task_new_with_defaults): ditto
-
-	* cal-client/cal-listener.h: add signals
-
-	* cal-client/cal-listener.c (impl_notifyDefaultObjectRequested):
-	implement
-	(impl_notifyObjectRequested): ditto
-	(cal_listener_class_init): set above epv implementations, add signals
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c (cal_default_object_requested_cb): get
-	default object callback
-	(cal_object_requested_cb): get object callback
-	(cal_client_init): listen for get and get default object signals
-	(cal_client_get_default_object): convert to new sync api
-	(cal_client_get_object): ditto
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c (impl_Cal_getDefaultObject): just call the backend, it
-	does the notification now
-	(impl_Cal_getObject): ditto
-	(cal_notify_default_object): do getDefaultObject response
-	(cal_notify_object): do getObject response
-
-	* pcs/cal-backend.h: remove vmethods, protos
-
-	* pcs/cal-backend.c: remove a couple of dead functions
-	(cal_backend_class_init): get_object_component is no longer a
-	vmethod
-	(cal_backend_get_default_object): call through
-	(cal_backend_get_object): ditto
-
-	* pcs/cal-backend-sync.h: add protos, vmethods
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_default_object):
-	call through
-	(cal_backend_sync_get_object): ditto
-	(_cal_backend_discard_alarm): pass correct params to
-	cal_notify_discard_alarm
-	(_cal_backend_get_default_object): call through and notify
-	(_cal_backend_get_object): ditto
-	(cal_backend_sync_class_init): set backend implementations
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_default_object):
-	convert to sync backend method
-	(cal_backend_file_get_object): ditto
-	(cal_backend_file_compute_changes_foreach_key): just look up the
-	component rather than using the backend vmethod
-	(cal_backend_file_remove_object): return valid sync status codes
-	(cal_backend_file_class_init): move get_object, get_default_object
-	to sync class
-
-	* idl/evolution-calendar.idl: convert getObject and
-	getDefaultObject to new async idl
-
-2003-09-25  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.c (impl_Cal_discardAlarm): just call the backend
-	function, it does the notification
-	(cal_notify_alarm_discarded): notify of discard alarm call
-
-	* pcs/cal-backend.h: update proto
-
-	* pcs/cal-backend.c (cal_backend_discard_alarm): call through
-
-	* pcs/cal-backend-sync.h: add proto, vmethod
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_discard_alarm): call
-	through
-	(_cal_backend_discard_alarm): call through and notify
-	(cal_backend_sync_class_init): set discard alarm implementation
-
-	* pcs/cal-backend-file.c (cal_backend_file_discard_alarm): match
-	sync backend vmethod
-	(cal_backend_file_class_init): set alarm vmethod implementation
-
-	* idl/evolution-calendar.idl: switch discardAlarm to new api
-
-	* gui/alarm-notify/alarm-queue.c (remove_queued_alarm): match new
-	api
-
-	* cal-client/cal-listener.h: add signal
-
-	* cal-client/cal-listener.c (impl_notifyAlarmDiscarded): implement
-	(cal_listener_class_init): add alarm, send, receive epv functions,
-	alarm signal
-
-	* cal-client/cal-client.h: update proto
-
-	* cal-client/cal-client.c (cal_alarm_discarded_cb): discardAlarm
-	callback
-	(cal_client_init): listen to discard alarm signal
-	(cal_client_discard_alarm): implement with new threaded sync api
-
-2003-09-25  JP Rosevear <jpr@ximian.com>
-
-	* idl/evolution-calendar.idl: remove unused user exceptions
-
-2003-09-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-util.[ch] (cal_backend_util_fill_alarm_instances_seq):
-	removed unneeded function.
-
-2003-09-24  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/*/*.c: adjust to new timezone api calls
-
-	* gui/*.c: ditto
-
-	* gui/dialogs/*.c: ditto
-
-	* cal-client/cal-listener.h: add new signals
-
-	* cal-client/cal-listener.c (convert_status): convert invalid
-	object as well
-	(impl_notifyTimezoneRequested): implement
-	(impl_notifyDefaultTimezoneSet): ditto
-	(cal_listener_class_init): set epv implementations for timezone
-	functions
-	(cal_listener_class_init): create timezone response signals
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c: fix return values all over the place
-	(cal_get_timezone_cb): getTimezone response
-	(cal_query_cb): setDefaultTimezone response
-	(cal_client_init): listen for new response signals
-	(cal_client_get_timezone): implement using new thread sync api
-	(cal_client_ensure_timezone_on_server): use add timezone call
-	(cal_client_set_default_timezone): oimplement using new thread sync
-	api
-
-	* cal-client/cal-client-types.h: add invalid object status code
-
-	* idl/evolution-calendar.idl: getQuery no longer raises any user
-	exceptions, remove dead types and exceptions
-
-2003-09-24  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.h: new protos
-
-	* pcs/cal.c (impl_Cal_getTimezone): call backend implementation
-	(impl_Cal_addTimezone): ditto
-	(impl_Cal_setDefaultTimezone): ditto
-	(cal_class_init): set epv implementations of timezone functions
-	(cal_notify_timezone_requested): notify of get timezone response
-	(cal_notify_default_timezone_set): notify of default timezone
-	being set
-
-	* pcs/cal-backend.h: new vmethods, protos
-
-	* pcs/cal-backend.c (cal_backend_class_init): init new timezone
-	vmethods
-	(cal_backend_get_timezone): call through
-	(cal_backend_set_default_timezone): ditto
-	(cal_backend_add_timezone): ditto
-	(cal_backend_internal_get_default_timezone): ditto
-	(cal_backend_internal_get_timezone): ditto
-
-	* pcs/cal-backend-sync.h: add vmethods, protos
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_timezone): call
-	through
-	(cal_backend_sync_set_default_timezone): ditto
-	(_cal_backend_set_default_timezone): call through and notify
-	(_cal_backend_get_timezone): ditto
-	(cal_backend_sync_class_init): set backend implementations for new
-	funcs
-
-	* pcs/cal-backend-object-sexp.c (func_occur_in_time_range): get
-	time_t values based on the zone
-
-	* pcs/cal-backend-file.c: reorg so we don't have to prototype
-	everything
-	(cal_backend_file_get_timezone): implement the sync backend way
-	(cal_backend_file_add_timezone): ditto
-	(cal_backend_file_set_default_timezone): ditto
-	(cal_backend_file_internal_get_default_timezone): internal method,
-	for sexp comparison
-	(cal_backend_file_internal_get_timezone): ditto
-
-	* idl/evolution-calendar.idl: convert timezone routines to async
-	api
-
-2003-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-object-sexp.c (func_occur_in_time_range): dont expand
-	recurrences, since they are supposed to be expanded in the backends.
-	(instance_occur_cb, resolve_tzid): removed unneeded functions.
-
-	* pcs/cal-backend-file.c (cal_backend_file_add_timezone): guard against
-	adding the timezone if it's already there.
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.c (cal_notify_object_created): notify with the object,
-	not the uid
-
-	* gui/e-cal-model.c (add_new_client): don't listen for
-	non-existent signal
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-client.h: remove dead proto
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-client.h: remove send result enum
-
-	* gui/itip-utils.c (comp_server_send): use the new send_objects
-	routine
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-client.h: remove send result enum
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-client.h: remove enum, protos
-
-	* cal-client/cal-client.c: remove remove status enum typing
-
-2003-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (update_objects): new function
-	to manage the update of components, taking into account
-	VTIMEZONE components.
-	(process_item_fn, gnome_calendar_import_data_fn): use
-	update_objects instead of cal_client_update_objects.
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.h: update proto
-
-	* pcs/cal.c (impl_Cal_addTimezone): just call add_timezone, it
-	does the notification
-	(cal_notify_object_created): only notify the query if the object
-	matches
-	(cal_notify_object_removed): ditto
-
-	* pcs/cal-backend.h: update proto, vmethod
-
-	* pcs/cal-backend.c (cal_backend_add_timezone): returns void
-
-	* pcs/cal-backend-sync.h: update proto, vmethod
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_remove_object): add the
-	object as an out param
-	(_cal_backend_remove_object): get the object and pass it in the
-	notification
-
-	* pcs/cal-backend-file.c (cal_backend_file_create_object): kill
-	cal_backend_file_update_objects call, its more efficient to create
-	the comp ourselves; stamp the creation time, add the component to
-	the toplevel
-	(cal_backend_file_modify_object): kill the
-	cal_backend_file_update_objects call, add the component to the
-	toplevel
-	(cal_backend_file_remove_object): pass back the object when
-	removing
-
-2003-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-query.c (cal_query_finalize): disconnect the
-	signal handlers
-
-	* cal-client/cal-client.c (cal_client_get_query): unref the
-	listener when done
-
-2003-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (selection_received): add VTIMEZONE components
-	contained in the clipboard data to the backend.
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): modify and create instead
-	of update, simplify mod code
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_finish_long_event_resize): modify
-	the object instead of update, simplify the instance handling
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2003-09-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_get_alarms_in_range): use
-	'has-alarms' function in the search expression.
-
-	* pcs/cal-backend-object-sexp.c (func_has_alarms): new SExp function.
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): create the
-	object if its not on the server or modify it if it is
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): we return if
-	there is no text and it *not* on the server
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): create the
-	object if its not on the server or modify it if it is
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.h: remove proto
-
-	* gui/gnome-cal.c: remove gnome_calendar_unrecur_selection
-
-	* gui/e-week-view.h: remove proto
-
-	* gui/e-week-view.c: remove e_week_view_unrecur_appointment
-
-	* gui/e-day-view.h: remove proto
-
-	* gui/e-day-view.c: remove e_day_view_unrecur_appointment
-
-	* gui/e-cal-view.c: remove on_unrecur_appointment (this is handled
-	better via recurrence id's now)
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-itip-control.c (update_attendee_status): ifdef out, leave
-	temporarily for reference, but otherwise it shouldn't be needed
-	(update_item): switch to using receive objects
-	(ok_clicked_cb): update item when receiving a reply
-
-	* gui/e-calendar-table.c (selection_received): switch to using
-	create object from update_objects
-
-	* gui/e-cal-view.c (selection_received_add_event): util routine to
-	prevent duplication
-	(selection_received): use above
-
-	* gui/e-cal-model.c (ecm_set_value_at): switch to using modify
-	object from update_objects
-	(ecm_append_row): switch to using create object from
-	update_objects
-
-	* gui/e-cal-model-calendar.c (ecmc_set_value_at): switch to using
-	modify object from update_objects
-
-	* gui/e-cal-model-tasks.c (ecmt_set_value_at): ditto
-
-2003-09-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-util/Makefile.am (libical_util_la_LIBADD):
-	libical.la -> libical-evolution.la
-
-	* importers/Makefile.am (libevolution_calendar_importers_la_LIBADD):
-	libicalvcal.la -> libicalvcal-evolution.la
-
-	
-2003-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: removed getAlarmsInRange and
-	getAlarmsForObject methods.
-
-	* pcs/cal.c (impl_Cal_getAlarmsInRange, impl_Cal_getAlarmsForObject):
-	removed unneeded CORBA methods.
-	(cal_class_init): dont set removed methods in the epv.
-
-	* pcs/cal-backend.[ch]: removed get_alarms_in_range and
-	get_alarms_for_object virtual methods.
-	(cal_backend_get_alarms_in_range, cal_backend_get_alarms_for_object):
-	removed.
-	(cal_backend_class_init): dont set removed virtual methods.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_alarms_in_range,
-	cal_backend_file_get_alarms_for_object): removed.
-	(cal_backend_file_class_init): dont set removed virtual methods.
-
-2003-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_get_alarms_in_range): changed
-	to use queries.
-	(build_component_alarms_list): create the alarm list from a list
-	of iCalendar strings.
-	(build_alarm_instance_list): removed.
-	(cal_client_get_alarms_for_object): dont call the CORBA methods,
-	just get alarms by itself.
-
-2003-09-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-listener.[ch]: added "add_timezone" signal.
-	(impl_notifyTimezoneAdded): implemented new CalListener method.
-	(cal_listener_class_init): create "add_timezone" signal for the class.
-
-	* cal-client/cal-client.[ch] (cal_client_add_timezone): new function.
-	(cal_client_init): connect to "add_timezone" signal on the
-	CalListener.
-	(cal_add_timezone_cb): callback for the "add_timezone" signal.
-
-2003-09-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added 'notifyTimezoneAdded' method
-	to the Calendar::Listener interface.
-
-	* pcs/cal-backend-sync.[ch] (cal_backend_sync_add_timezone):
-	(_cal_backend_add_timezone): new functions for the new virtual
-	method implementation.
-
-	* pcs/cal.[ch] (cal_notify_timezone_added): new function.
-
-	* pcs/cal-backend-file.c (cal_backend_add_timezone): converted to
-	return a CalBackendSyncStatus.
-	(cal_backend_file_class_init): the 'add_timezone' method we implement
-	is the one in the CalBackendSync class.
-	(cancel_receive_object): added missing 'return'.
-	(free_cal_component): removed unused function.
-
-2003-09-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_add_timezone): added new
-	virtual method implementation.
-
-	* pcs/cal.c (impl_Cal_addTimezone): check return value from
-	cal_backend_add_timezone, and set an exception if an error is
-	returned.
-
-2003-09-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added addTimezone method.
-
-	* pcs/cal.c (impl_Cal_addTimezone): implemented new method.
-	(cal_class_init): set new method on the epv.
-
-	* pcs/cal-backend.[ch]: added 'add_timezone' virtual method.
-	(cal_backend_add_timezone): implemented new virtual method.
-
-	* pcs/cal-backend-file.c (cal_backend_file_modify_object): it's
-	cal_component_get_as_string, not cal_component_as_string.
-
-	* cal-client/cal-client.c (cal_client_ensure_timezone_on_server):
-	dont use anymore updateObjects method, use addTimezone instead.
-	
-2003-09-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* conduits/todo/Makefile.am: removed libwombat reference.
-
-2003-09-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_create_object): return
-	the UID of the added object.
-	(cal_backend_file_remove_object): ditto for old_object.
-
-2003-09-15  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (replace_record): switch to modify
-	object
-	(add_record): switch to using create object
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day): switch
-	to using create object
-	(add_record): switch to using create object
-	(replace_record): switch to modify object
-
-	* cal-client/cal-listener.h: add signals
-
-	* cal-client/cal-listener.c (impl_notifyObjectsReceived):
-	implement listener method
-	(build_object_list): ditto
-	(cal_listener_class_init): create receive_objects and send_objects
-	signals
-
-	* cal-client/cal-client.h: add, update protos
-
-	* cal-client/cal-client.c (cal_objects_received_cb):
-	receive_objects callback
-	(cal_objects_sent_cb): send_objects callback
-	(cal_client_init): listen for above signals
-	(cal_client_create_object): pass back uid
-	(cal_client_receive_objects): implement
-	(cal_client_send_objects): ditto
-
-	* idl/evolution-calendar.idl: add receive/send objects methods and
-	yank updateObjects
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c (impl_Cal_receiveObjects): implement
-	(impl_Cal_sendObjects): ditto
-	(cal_class_init): add epv methods
-	(cal_notify_objects_received): notify of objects received call,
-	updating queries
-	(cal_notify_objects_sent): notify of objects sent
-
-	* pcs/cal-backend.h: remove proto
-
-	* pcs/cal-backend.c (cal_backend_class_init): remove obj_updated
-	signal
-	(cal_backend_class_init): init vmethods properly
-	(cal_backend_receive_objects): call through
-	(cal_backend_send_objects): ditto
-
-	* pcs/cal-backend-sync.h: add protos, vmethods
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_receive_objects): call
-	through
-	(cal_backend_sync_send_objects): ditto
-	(_cal_backend_receive_objects): call backend method and notify
-	(_cal_backend_send_objects): ditto
-	(cal_backend_sync_class_init): override send/receive object
-	vmethods
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): set
-	remove/send objects sync vmethods
-	(cal_backend_file_create_object): remove call to dead method
-	(cal_backend_file_remove_object): ditto
-	(cal_backend_file_modify_object): ditto
-	(cancel_received_object): cancel an object
-	(check_tzids): check we have all the tzid's for the object
-	(cal_backend_file_receive_objects): receive a bunch of objects via
-	itip
-	(cal_backend_file_send_objects): skeleton implementation
-
-2003-09-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added InvalidObject CallStatus.
-
-	* pcs/cal-backend-file.c (cal_backend_file_create_object): implemented.
-	(cal_backend_file_modify_object): implemented.
-
-2003-09-15  Harry Lu  <harry.lu@sun.com>
-
-	* gui/apps_evolution_calendar.schemas: change last_notification_time's
-	type from string to int.
-
-2003-09-12  Bolian Yin <bolian.yin@sun.com>
-
-	* e-week-view.c (e_week_view_focus): make jump button focusable
-	 (e_week_view_on_jump_button_event): key_press and focus event for jump button
-	 (e_week_view_jump_to_button_item): new function, jump to the day view.
-	 (e_week_view_is_jump_button_visible): new function.
-
-	
-2003-09-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.c (cal_notify_cal_address, cal_notify_alarm_email_address,
-	cal_notify_ldap_attribute, cal_notify_static_capability):
-	make sure we always notify listeners, regardless of whether the
-	string is empty or not.
-
-	* cal-client/cal-client.c (check_capability): guard against using
-	NULL strings with strstr.
-
-2003-09-12  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/client-test.c (cal_opened_cb): listen for other query
-	signals
-
-	* cal-client/cal-listener.h: add signals
-
-	* cal-client/cal-listener.c (impl_notifyObjectCreated): implement
-	(impl_notifyObjectModified): implement
-	(cal_listener_class_init): assign epv implementations
-	(cal_listener_class_init): add create/modify object signals
-
-	* cal-client/cal-client.h: add protos
-
-	* cal-client/cal-client.c (cal_object_created_cb): object created
-	callback
-	(cal_object_modified_cb): object modified callback
-	(cal_client_init): listen for create/modify object signals from
-	the listener
-	(cal_client_create_object): call the create object method
-	(cal_client_modify_object): call the modify object method
-
-	* cal-client/client-test.c (cal_opened_cb): listen for all the
-	query signals, tidy
-
-2003-09-12  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.c (impl_Cal_createObject): implement
-	(impl_Cal_modifyObject): ditto
-	(cal_class_init): set epv methods for create/modify
-
-	* pcs/cal-backend.h: add protos, vmethod
-
-	* pcs/cal-backend.c (cal_backend_class_init): init new vmethods
-	(cal_backend_create_object): call through
-	(cal_backend_modify_object): ditto
-
-	* pcs/cal-backend-sync.h: add protos, vmethods
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_create_object): call
-	through
-	(cal_backend_sync_modify_object): ditto
-	(_cal_backend_create_object): create object and notify
-	(_cal_backend_modify_object): modify object and notify
-
-	* pcs/cal-backend-file.c (cal_backend_file_create_object):
-	skeleton routine for creating objects
-	(cal_backend_file_modify_object): ditto for modifying
-
-	* idl/evolution-calendar.idl: add createObject and modifyObject
-	calls
-
-2003-09-12  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.c (cal_notify_object_removed): its uid, not uids
-
-2003-09-12  JP Rosevear <jpr@ximian.com>
-
-	* pcs/query.h: add protos
-
-	* pcs/query.c (query_object_matches): use the sexp to check for a
-	match
-	(query_notify_objects_added_1): notify of one object added to
-	query
-	(query_notify_objects_modified_1): ditto for modification
-	(query_notify_objects_removed_1): ditto for removal
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c (cal_notify_object_created): notify of object creation
-	(cal_notify_object_modified): notify of object modification
-	(cal_notify_object_removed): use the _1 routines
-
-	* pcs/cal-backend-file.c (match_recurrence_sexp): this returns a
-	boolean
-	(cal_backend_file_update_objects): don't signal removals here now
-
-	* idl/evolution-calendar.idl: add object created and modified
-	responses
-
-	
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.h: update proto
-
-	* pcs/cal.c (cal_notify_object_removed): notify relevant queries
-	of removal
-
-	* pcs/cal-backend.c (cal_backend_get_queries): ref the list before
-	passing it back
-
-	* pcs/cal-backend-sync.c (_cal_backend_remove_object): pass uid to
-	notification
-
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (match_recurrence_sexp): don't unref the
-	component
-
-	* cal-client/client-test.c (cal_opened_cb): listen to objects
-	added signal
-	(objects_added_cb): print the object uid
-	
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal-backend-object-sexp.c (cal_backend_object_sexp_text):
-	return the base text
-
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (update_query): fix c/p typo
-
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (update_query): start the query
-
-	* gui/e-cal-model.c (update_query_for_client): ditto
-
-	* cal-client/client-test.c (cal_opened_cb): ditto
-	
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-query.h: add proto
-
-	* cal-client/cal-query.c (cal_query_start): start the query
-
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/delete-error.c (delete_error_dialog): accept GError
-	and base error messages on that
-
-	* gui/dialogs/delete-error.h: update proto
-
-	* gui/e-tasks.c (e_tasks_delete_completed): pass extra param to
-	cal_client_remove_object
-
-	* conduits/todo/todo-conduit.c (delete_record): ditto
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day): ditto
-	(delete_record): ditto
-	
-	* gui/gnome-cal.c (gnome_calendar_purge): ditto
-
-	* gui/dialogs/comp-editor.c (delete_comp): ditto
-	
-	* gui/e-cal-view.c (e_cal_view_cut_clipboard): pass the error to
-	delete_error_dialog
-	(delete_event): ditto
-	(e_cal_view_delete_selected_occurrence): ditto
-	
-	* gui/e-itip-control.c (remove_item): ditto
-
-	* gui/e-calendar-table.c (delete_selected_components): ditto
-
-	* cal-client/cal-listener.h: add signal
-
-	* cal-client/cal-listener.c (impl_notifyObjectRemoved): implement
-	(cal_listener_class_init): set object removed implementation and
-	create signal
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c (cal_object_removed_cb): object removal
-	callback
-	(cal_client_init): listen for object removal signal
-	(cal_client_remove_object_with_mod): make call synchronous
-	(cal_client_remove_object): pass new params
-
-	* pcs/cal.h: add proto
-
-	* pcs/cal.c (impl_Cal_removeObject): just call the backend
-	function
-	(cal_notify_object_removed): notify of removal
-
-	* pcs/cal-backend.h: remove and update protos, remove signal
-
-	* pcs/cal-backend.c (cal_backend_class_init): kill obj_removed
-	signal
-	(cal_backend_remove_object): there is no return value now
-
-	* pcs/cal-backend-sync.h: add vmethod, proto
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_remove_object): call
-	through
-	(_cal_backend_remove_object): remove the object and then do the
-	notification
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): remove
-	object is not part of the sync class
-	(cal_backend_file_update_objects): there is no more removed signal
-	(cal_backend_file_remove_object): return sync status codes
-
-	* idl/evolution-calendar.idl: make removeObject oneway and and a
-	notification method in the listener
-
-2003-09-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.[ch] (query_get_text): new function.
-	(query_get_object_sexp): new function.
-
-	* pcs/cal-backend-file.c (cal_backend_file_start_query): implemented.
-
-2003-09-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-util/Makefile.am (libcal_util_la_LIBADD):
-	libical-evolution.la -> libical.la
-
-	* cal-util/cal-component.c (cal_component_get_classification)
-	(cal_component_set_classification)
-	(get_text_list)
-	(get_icaltimetype)
-	(get_datetime)
-	(get_period_list)
-	(get_recur_list)
-	(cal_component_get_transparency)
-	(cal_component_set_transparency): Adapt to new libical.
-
-	* cal-util/cal-util.c (cal_util_event_dates_match): Ditto.
-
-	* pcs/cal-backend-file.c (create_user_free_busy): Ditto.
-
-	* gui/e-cal-model-tasks.c (get_completed)
-	(get_due)
-	(get_due_status): Ditto.
-
-	* gui/e-cal-model.c (get_dtstart)
-	(set_classification): Ditto.
-
-	* gui/e-cal-model-calendar.c (get_dtend)
-	(get_transparency)
-	(set_transparency): Adapt to new libical and fix a comparison bug.
-
-	* importers/Makefile.am (libevolution_calendar_importers_la_LIBADD):
-	libical-evolution.la -> libical.la
-
-2003-09-11  Dan Winship  <danw@ximian.com>
-
-	* cal-util/Makefile.am (privlib_LTLIBRARIES): Remove
-	libcal-util-static.la
-
-	* cal-client/Makefile.am (noinst_LTLIBRARIES): Remove
-	libcal-client-static.la
-
-	* conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD):
-	use non-static libraries. The static ones were only needed for
-	libtool 1.3.
-
-	* conduits/todo/Makefile.am (libetodo_conduit_la_LIBADD): Likewise
-
-        * gui/Makefile.am (IDL_GENERATED): Don't compile the calendar idl
-        here. It's already in libcal-client.
-
-2003-09-11  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* conduits/todo/Makefile.am:
-	Statically link with wombat. Fix ETodo conduit.
-	(Mdk bug #5348)
-
-	
-2003-09-10  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.h: update proto
-
-	* pcs/cal.c (impl_Cal_getObjectList): just call the backend, it
-	will do the notification now
-	(cal_notify_object_list): the list is a list of strings
-
-	* pcs/cal-backend.h: update vmethod, proto
-
-	* pcs/cal-backend.c (cal_backend_get_object_list): call through
-
-	* pcs/cal-backend-sync.h: add proto, vmethod
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_object_list): call
-	through
-	(_cal_backend_get_object_list): get the list of objects from the
-	sync backend and do the notification
-	(cal_backend_sync_class_init): set vmethod implementation
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): the get
-	object list call is now part of the sync backend
-	(cal_backend_file_get_object_list): return a status and put the
-	object list in the passed in param
-
-2003-09-10  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_finalize): unref the elist
-	(cal_backend_init): init the query elist
-
-2003-09-10  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (dn_query_objects_added_cb): match new query
-	signals - just tag here
-	(dn_query_objects_modified_cb): always retag
-	(dn_query_objects_removed_cb): ditto
-	(update_query): connect to new signals
-	(gnome_calendar_destroy): we don't keep a list of expunging
-	queries
-	(gnome_calendar_purge): no need to do the
-	expunge async, just get the object list immediately
-
-	* gui/e-tasks.c (e_tasks_delete_completed): no need to do the
-	expunge asyn
-
diff --git a/calendar/ChangeLog.pre-1-4 b/calendar/ChangeLog.pre-1-4
deleted file mode 100644
index 912411acd1..0000000000
--- a/calendar/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,21872 +0,0 @@
-2003-06-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes part of #43388
-
-	* importers/icalendar-importer.c (prepare_events):
-	(prepare_tasks): use external iterators for removing components from
-	the main component.
-
-2003-05-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #43763
-
-	* gui/e-week-view.c (e_week_view_init): use g_signal_connect_after
-	for "button_press_event" callback.
-
-	* gui/e-day-view.c (e_day_view_init): ditto.
-
-2003-05-29  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #43775
-	
-	* gui/weekday-picker.c (get_day_text): calculate the characters to
-	display correctly
-	(configure_items): use it
-	(weekday_picker_style_set): ditto
-
-	* gui/print.c (format_date): use e_utf8_strftime
-	(print_week_view_background): ditto
-	(print_month_summary): ditto
-	(range_selector_new): ditto
-	(print_comp_item): ditto
-
-	* gui/itip-utils.c (comp_description): the translation is already
-	utf8
-
-	* gui/e-itip-control.c (write_label_piece): the string is already
-	in utf8
-
-	* gui/e-day-view.c (e_day_view_style_set): use e_utf8_strftime
-	(e_day_view_recalc_cell_sizes): ditto
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): use
-	e_utf8_strftime
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text): return the
-	duplicated buffer (its already utf8)
-	(show_date_warning): use e_utf8_strftime
-
-	* gui/calendar-model.c (date_value_to_string): return the
-	duplicated buffer (its already utf8)
-	(calendar_model_value_to_string): the translations should already
-	be in utf8
-
-	* gui/calendar-config.c
-	(calendar_config_locale_supports_12_hour_format): use
-	e_utf8_strftime
-
-	* gui/calendar-commands.c (calendar_set_folder_bar_label): use
-	e_utf8_strftime
-
-2003-05-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #43455
-
-	* gui/tasks-control.c (confirm_expunge): converted to a GtkMessageDialog
-	and removed object weak's ref code, not needed anymore.
-	
-2003-05-20  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #43308
- 	
- 	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
- 	adjust row heights to reflect changes in etable row heights and
- 	set display top to align properly
-	
-2003-05-22  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy): unref
- 	not ref the client
-	
-2003-05-22  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #41329
-	
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_zoomed_out_toggled): make sure the
-	meeting time is shown afterwards
-	(e_meeting_time_selector_on_working_hours_toggled): ditto
-
-2003-05-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41234
-
-	* gui/dialogs/e-delegate-dialog.glade: changed button ordering.
-
-2003-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus): Removed
-	debugging message.
-
-2003-05-20  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/save-comp.c (save_component_dialog): Change this
-	dialog from using a gnome_message_box (which has been deprecated), 
-	to using a gtk_message_dialog. This HIG-ifies this dialog, and 
-	fixes bug #42046.
-
-2003-05-20  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #42056
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Don't create accel groups for menuitem mnemonics. Don't use
-	deprecated functions where we actually need accel groups.
-
-2003-05-19  Dan Winship  <danw@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_finalize): Don't double-free
-	newly-added categories that the gui hasn't been told about yet.
-	#43321
-
-2003-05-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/main.c (factory): set 'initialized' to TRUE when initialization
-	is done, or we get the initialization code called over and over.
-
-2003-05-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/e-meeting-time-sel.c:  (e_meeting_time_selector_construct): 
-	Added HIG-blessed padding to (some of) the widgets in the
-	dialog.
-
-	* gui/dialogs/meeting-page.glade: Added HIG-blessed border width
-	and spacing to the meeting page of the event editor.
-
-	* gui/dialogs/schedule-page.glade: Added HIG-blessed border width
-	to the schedule page on the event editor. 
-
-
-2003-05-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): remove the query time
-	out if its still alive
-	(update_query_timeout): update the query and clear the time out
-	(client_cal_opened_cb): add the query update timeout
-
-2003-05-19  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #43103
-	
-	* gui/e-day-view.c (e_day_view_init): connect normally instead of
-	after so that our boolean return values afffect the action signal
-	emmissions properly
-	(e_day_view_on_top_canvas_drag_motion): fix proto to be a gboolean
-	(e_day_view_on_main_canvas_drag_motion): ditto
-
-	* gui/e-week-view.c (e_week_view_init): connect normally instead
-	of after so that our boolean return values afffect the action
-	signal emmissions properly
-
-2003-05-16  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (make_title_from_comp): the title is
-	already in UTF-8
-
-2003-05-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #42220
-
-	* gui/e-day-view.c (e_day_view_finish_resize): hide canvas items and
-	update internal fields before updating the object.
-
-2003-05-15  JP Rosevear  <jpr@ximian.com>
- 
-	* gui/dialogs/comp-editor.c (comp_editor_finalize): unref the
-	client and the ui component
-	
-2003-05-15  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #41935
- 	
-	* gui/e-week-view.c (e_week_view_init): listen for scroll events
-	on the canvas
-	(e_week_view_on_button_press): don't scroll here
-	(e_week_view_on_scroll): scroll here
- 
-	* gui/e-day-view.c (e_day_view_init): listen for scroll events on
-	the time and main canvases
-	(e_day_view_on_main_canvas_button_press): don't scroll here
-	(e_day_view_on_main_canvas_scroll): scroll here
-	(e_day_view_on_time_canvas_scroll): and here
-	
-2003-05-15  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #43029
- 	
-	* gui/e-week-view.c (e_week_view_init): don't listen for destroy
-	signal
-	(e_week_view_destroy): check for NULL and make invisible NULL
-	after we destroy it, unref cursors and NULL them out as well,
-	guard against freeing events multiple times
- 
-	* gui/e-day-view.c (e_day_view_destroy): check for NULL and make
-	invisible NULL after we destroy it, unref cursors and NULL them
-	out as well, guard against freeing events multiple times
-	(e_day_view_init): don't listen for destroy signal
- 
-	* gui/e-calendar-table.c (e_calendar_table_init): don't listen for
-	destroy signal
-	(e_calendar_table_destroy): check for NULL and make invisible NULL
-	after we destroy it
-	
-2003-05-15  JP Rosevear	 <jpr@ximian.com>
- 
-	Fixes #41930
-	
-	* idl/evolution-calendar.idl: Make sure everything that can raise
-	a NotFound exception lists it
-	
-2003-05-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_refresh_free_busy): ref ourselves the
-	number of times we'll get called back
-
-2003-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_destroy): guard against multiple destroys
-
-	* cal-client/cal-client.c (cal_client_finalize): unref the
-	bonobo listener
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): guard against multiple
-	destroy calls
-
-	* gui/e-week-view.c (e_week_view_init): connect after destroy
-	(invisible_destroyed): don't unref, its already destroyed
-
-	* gui/e-day-view.c (e_day_view_init): connect after destroy
-	(invisible_destroyed): don't unref, its already destroyed
-
-	* gui/e-calendar-table.c (e_calendar_table_class_init): make sure
-	we set the parent class
-	(e_calendar_table_init): connect after the destroy handler runs
-	(e_calendar_table_destroy): guard against multiple destroys
-	(invisible_destroyed): don't unref the invisible, its already
-	being destroyed
-
-	* gui/calendar-offline-handler.c (backend_cal_set_mode): unref the
-	client, we are done with it now
-	(backend_cal_opened_online): ditto
-	(impl_dispose): unref our main client
-
-	* gui/calendar-commands.c (control_util_set_folder_bar_label):
-	release/unref the shell view once we are done with it
-	(control_util_show_settings): ditto
-
-2003-05-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (notify_dialog_cb): fixed memory
-	leak introduced by previous commit.
-
-2003-05-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41760
-
-	* gui/alarm-notify/alarm-queue.c (create_snooze): don't add a new
-	alarm, but update the already existing one.
-	(notify_dialog_cb): make sure we don't remove the alarm if we are
-	snoozing.
-	
-2003-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-page.glade: fix button conversion problem
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_widgets): only free the percent if its
-	non-null
-
-2003-05-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_discard_alarm): added missing
-	assignment.
-
-2003-05-05  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #41811
-	
-	* gui/alarm-notify/Makefile.am: don't dist idl generated files
-
-2003-05-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_finalize): unref the
-	model again
-	(task_editor_edit_comp): don't allow editing if the assignee has
-	delegated
-
-	* gui/dialogs/meeting-page.c (popup_delete_cb): set the new
-	non-delegator to be editable
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): don't allow
-	editing if the attendee has delegated
-	(event_editor_finalize): unref the model again
-
-	* gui/e-meeting-model.c: remove e-table-without related functions
-	(finalize): don't create without table
-	(e_meeting_model_etable_from_model): build the table with this as
-	model
-	(e_meeting_model_etable_model_to_view_row): directly use the
-	model_to_view call
-	(e_meeting_model_etable_view_to_model_row): as above
-	(attendee_changed_cb): make sure pre change is alwasy called
-
-	* gui/e-meeting-model.h: use DECLS, remove protos for long dead
-	functions, don't include config.h
-
-2003-04-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): removed
-	unused code.
-	
-2003-04-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_finalize): ditto
-
-	* gui/dialogs/event-editor.c (event_editor_finalize): don't unref
-	the model here
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_destroy): null
-	up the display_top and display_main for re-entrancy purposes
-
-2003-04-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): kill warnings
-
-2003-04-28  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/alarm-options.glade: Added HIG-blessed padding
-	to the alarm options dialog. Fixes bug #41221.
-
-2003-04-28  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Added appropriate spacing
-	and padding to the calendar/tasks page of the settings dialog. 
-	Fixes bug #41129
-
-
-2003-04-28  Anna Marie Dirks  <anna@ximian.com>
-	
-	* gui/dialogs/task-page.glade: Finishes up fixing #41256 by
-	adding appropriate spacing/padding to the main task page.
-
-	* gui/dialogs/task-details-page.glade: Added appropriate
-	spacing and padding to the task-details page. Partially 
-	fixes #41256.
-
-
-2003-04-28  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/recurrence-page.glade: Added padding/spacing
-	to this page as specified by the HIG. Partially fixes #41215.
-
-	* gui/dialogs/alarm-page.glade: Added padding/spacing/stock 
-	buttons to the alarm page. Partially fixes #41215.
-
-	* gui/dialogs/event-page.glade: Added padding/spacing to the
-	event-page (partially fixes #41215)
-
-
-2003-04-27  Rodney Dawes  <dobey@ximian.com>
-
-	Fixes #35814
-	
-	* gui/calendar-component.c: Change mnemonic/keybinding for
-	New Meeting to not conflict with other items in the File->New menu
-	
-2003-04-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41661
-
-	* idl/evolution-calendar.idl: added discardAlarm method to
-	GNOME:Evolution:Calendar:Cal interface.
-
-	* pcs/cal.c (cal_class_init): set new epv's method.
-	(impl_Cal_discardAlarm): implementation of new CORBA method.
-
-	* pcs/cal-backend.[ch]: added 'discard_alarm' virtual method, and
-	CAL_BACKEND_RESULT_NOT_IMPLEMENTED to CalBackendResult enum.
-	(cal_backend_class_init): initialize new class method.
-	(cal_backend_discard_alarm): new method.
-	(cal_backend_update_objects, cal_backend_remove_object): return
-	proper CalBackendResult values.
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): initialize
-	new class method.
-	(cal_backend_file_discard_alarm): implementation of new method.
-	
-	* pcs/cal-client.[ch] (cal_client_discard_alarm): new function.
-
-	* gui/alarm-notify/alarm-queue.c (remove_qeueud_alarm): don't remove
-	the alarm directly from the component, call cal_client_discard_alarm
-	and let the backend deal with it.
-
-2003-04-24  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/apps_evolution_calendar.schemas: set the hpane default to
- 	32000 so we never see a pane no matter the start up window size
- 	unless the user changes it
-
-2003-04-24  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #37552
-	
-	* gui/dialogs/Makefile.am: build delete-error.[hc]
-
-	* gui/e-tasks.c: wrap calls to cal_client_remove_object with
-	delete_error_dialog
-
-	* gui/e-itip-control.c: ditto
-
-	* gui/e-calendar-table.c: ditto
-
-	* gui/e-week-view.c: ditto
-
-	* gui/e-day-view.c: ditto
-
-	* gui/dialogs/delete-error.[hc]: gemerate an error message based
-	on result
-
-2003-04-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): removed
-	unused variable..
-
-2003-04-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #41641
-
-	* gui/e-day-view.c (e_day_view_focus_in): Remove assert an old
-	input method code.
-	(e_day_view_focus_out): Ditto.
-	(e_day_view_reshape_long_event): Set input method context.
-	(e_day_view_reshape_day_event): Ditto.
-	(e_day_view_on_editing_started): Let EText handle the context popup.
-	(e_day_view_on_editing_stopped): Turn off EText's handling of context
-	popup.
-
-	* gui/e-week-view.c (e_week_view_reshape_event_span): Set input
-	method context.
-	(e_week_view_on_text_item_event): Let the EText item handle
-	right-click context popup if we're editing it.
-	(e_week_view_on_editing_started): Let the EText item handle the
-	context popup.
-	(e_weeK_view_on_editing_stopped): Turn off EText's handling of
-	context popup.
-
-2003-04-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41671
-
-	* gui/alarm-notify/notify-main.c (main): added calls to gnome_sound_init
-	and gnome_sound_shutdown.
-
-	* gui/alarm-notify/alarm-queue.c (audio_notification): check that the
-	sound file exists, and gdk_beep if not.
-
-2003-04-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes part of #41148, #41216 and #41235
-
-	* gui/e-itip-control.c (init):
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct,
-	  e_meeting_time_selector_add_key_color):
-	* gui/e-timezone-entry.c (e_timezone_entry_init):
-	* gui/gnome-cal.c (setup_widgets):
-	* gui/tasks-control.c (confirm_expunge):
-	* gui/dialogs/comp-editor.c (setup_widgets):
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	* gui/dialogs/meeting-page.c (meeting_page_construct):
-	* gui/dialogs/recurrence-page.c (make_weekly_special,
-	  make_monthly_special, make_ending_count_special):
-	* gui/dialogs/schedule-page.c (schedule_page_construct):
-	use HIG-suggested spacing.
-
-2003-04-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #22444
-
-	* gui/calendar-commands.c: added new verbs for occurrence-related
-	menu items.
-	(delete_occurrence_cmd): added callback for "Delete this occurrence"
-	menu item. "Delete all occurrences" is just the same as "Delete".
-	(sensitize_calendar_commands): sensitive ocurrence-related menu items.
-
-	* gui/gnome-cal.[ch] (gnome_calendar_delete_selected_occurrence): new
-	function.
-	(gnome_calendar_get_current_view_widget): made this public.
-
-	* gui/e-week-view.[ch] (e_week_view_get_selected_event):
-	(e_week_view_delete_occurrence): new functions.
-	(e_week_view_delete_occurrence_internal): real implementation of the
-	'Delete Occurrence' logic.
-	(e_week_view_on_delete_occurrence): call delete_instance_internal.
-
-	* gui/e-day-view.[ch] (e_day_view_get_selected_event):
-	(e_day_view_delete_occurrence): new functions.
-	(e_week_view_delete_occurrence_internal): real implementation of the
-	'Delete Occurrence' logic.
-	(e_week_view_on_delete_occurrence): call delete_occurrence_internal.
-
-2003-04-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.glade: removed 'heading' and
-	'message' labels.
-
-	* gui/alarm-notify/alarm-notify-dialog.c: removed deleted widgets.
-	(alarm_notify_dialog): don't load the removed widgets.
-
-2003-04-18  Rodney Dawes  <dobey@ximian.com>
-
-	Fixes #21499
-
-	* gui/Makefile.am:
-	* gui/calendar-commands.c:
-	* gui/tasks-control.c:
-	* gui/dialogs/Makefile.am:
-	* gui/dialogs/comp-editor.c:
-	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()
-	
-2003-04-17  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #41459
-	
-	* gui/dialogs/meeting-page.c: comment out delegation stuff
-
-2003-04-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #34498
-
-	* gui/alarm-notify/alarm-queue.c: added a 'uid' field to the
-	CompQueuedAlarms structure.
-	(remove_queued_alarm): free the 'uid' field when freeing the
-	structure.
-	(add_component_alarms): g_strdup the component's UID and use that as
-	the key for the hash table.
-
-2003-04-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41129, #41215, #41221, #41256
-
-	* gui/alarm-notify/alarm-notify.glade:
-	* gui/dialogs/alarm-options.glade:
-	* gui/dialogs/alarm-page.glade:
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/e-delegate-dialog.glade:
-	* gui/dialogs/meeting-page.glade:
-	* gui/dialogs/recurrence-page.glade:
-	* gui/dialogs/schedule-page.glade:
-	* gui/dialogs/task-details-dialog.glade:
-	* gui/dialogs/task-page.glade:
-	* gui/dialogs/event-page.glade: set spacing to 6 pixels
-	everywhere.
-
-2003-04-16  JP Rosevear  <jpr@ximian.com>
- 
-	Fixes #41230
- 	
- 	* gui/e-itip-control.c (show_current): make sure to pass TRUE for
- 	tasks
- 	(start_calendar_server): make sure we don't gtk_main_quit if we
- 	haven't gtk_main'ed
- 	(start_calendar_server_cb): ditto
-
-2003-04-15  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #39735 and 40257
-	
-	* gui/gnome-cal.c: convert float pane positions to ints
-	(setup_widgets): set the initial position after realization and
-	track the drags to get the new position, pack the panes slightly
-	differently
-	(gnome_calendar_set_pane_positions): set purely pixel oriented
-	positions
-	(gnome_calendar_update_config_settings): no need to update quanta
-	setting
-	(gnome_calendar_hpane_realized): realization callback
-	(gnome_calendar_vpane_realized): ditto
-	(gnome_calendar_vpane_resized): resize callback, store new size
-	(gnome_calendar_hpane_resized): ditto
-
-	* gui/calendar-model.c (get_due_status): handle an error getting
-	the timezone
-
-	* gui/calendar-config.c (calendar_config_get_hpane_pos): return an int
-	(calendar_config_set_hpane_pos): take an int
-	(calendar_config_get_vpane_pos): return an int
-	(calendar_config_set_vpane_pos): take an int
-
-	* gui/calendar-config.h: update protos
-
-	* gui/apps_evolution_calendar.schemas: update defaults for pane
-	positions
-
-2003-04-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-component.c (owner_set_cb): If we already have an
-	evolution_dir, free the old one before setting it anew.
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw): Unref the
-	metrics.
-
-	* gui/e-day-view.c (e_day_view_style_set): Unref the metrics.
-	(e_day_view_recalc_cell_sizes): We don't need font metrics here.
-	(e_day_view_reshape_long_event): Ditto.
-
-	* gui/e-meeting-model.c (init): Don't dup the string passed to
-	e_table_without_hide().
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
-	Unref the metrics.
-	(e_meeting_time_selector_recalc_date_form): Doesn't need metrics.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	Unref the metrics.
-
-	* gui/e-week-view.c (e_week_view_style_set): Unref metrics.
-	(e_week_view_recalc_cell_sizes): Ditto.
-	(e_week_view_reshape_event_span): Move Pango stuff to where it
-	can't be leaked due to an early return. Unref metrics.
-
-	* gui/weekday-picker.c (weekday_picker_style_set): Unref metrics.
-
-	* gui/dialogs/meeting-page.c (meeting_page_finalize): Free default
-	address.
-
-2003-04-11  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/Makefile.am (IDL_GENERATED, etc): Oops. Add this
-	back. Turns out it's still needed by other parts.
-
-2003-04-11  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/task-page.glade: Remove the "Contacts" button and
-	entry from here too. Supposed to have been part of #35926
-
-	* gui/dialogs/task-page.c: Remove all code pertaining to the
-	contacts button
-
-	* gui/dialogs/comp-editor-util.c: 
-	* gui/dialogs/comp-editor-util.h: Likewise
-
-	* gui/dialogs/Makefile.am (IDL_GENERATED, etc): Remove
-	select-names stuff, which is no longer used.
-
-2003-04-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.h: added missing capabilities.
-
-	* cal-client/cal-client.c (cal_client_get_one_alarm_only,
-	  cal_client_get_organizer_must_attend,
-	  cal_client_get_save_schedules):
-	* gui/itip-utils.c (itip_organizer_is_user):
-	* gui/e-calendar-table.c (e_calendar_table_on_right_click):
-	* gui/dialogs/task-editor.c (set_menu_sens):
-	* gui/dialogs/event-page.c (event_page_fill_widgets):
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets):
-	* gui/dialogs/alarm-page.c (button_options_clicked_cb): use the macros
-	defined in cal-util.h for static capabilities.
-
-2003-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (start_addressbook_server): load the
-	default book to look for additional free/busy info in
-	(init): ugly hack to make sure we get destroyed, set idle id to 0
-	(process_callbacks): unref the im because we are now done with it
-	(refresh_busy_periods): set idle id to 0, ref the model and handle
-	e_book_get_cursor error
-
-2003-04-11  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_destroy): guard against multiple
-	destroy calls
-
-2003-04-11  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-client/cal-client.c (cal_client_get_free_busy): only print a
-	message if the exception isn't the reasonable NotFound
-
-2003-04-11  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/schedule-page.c (schedule_page_finalize): unref the
-	main widget since we ref it when we un-parent it
-
-	* gui/dialogs/alarm-page.c (alarm_page_finalize): ditto
-
-	* gui/dialogs/task-page.c (task_page_finalize): ditto
-
-	* gui/dialogs/event-page.c (event_page_finalize): ditto
-
-	* gui/dialogs/task-details-page.c (task_details_page_finalize):
-	ditto
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_finalize): ditto
-
-	* gui/dialogs/meeting-page.c (meeting_page_finalize): ditto
-
-2003-04-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_options_menu_position_callback):
-	(e_meeting_time_selector_autopick_menu_position_callback): added the
-	allocation's X and Y position to the calculated coordinates.
-
-2003-04-10  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #41127
-	
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_refresh_cb):
-	unref here, when the callback is done
-	(e_meeting_time_selector_refresh_free_busy): don't unref here
-
-	* gui/e-meeting-model.c (process_free_busy): if the type is
-	unexpected, make sure we cleanup properly
-
-2003-04-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (remove_queued_alarm): only remove
-	the alarm for backends that want it (Exchange).
-
-2003-04-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.h: added #define's for static capabilities.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_static_capabilities):
-	use the #define's above.
-
-2003-04-09  Chris Toshok  <toshok@ximian.com>
-
-	Fixes #40133
-	
-	* pcs/cal-backend.c (cal_backend_class_init): use G_TYPE_INT
-	instead of G_TYPE_ENUM as a parameter type for the signal to get
-	rid of runtime warning.
-
-2003-04-09  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #40915
-	
-	* gui/calendar-model.c (get_due_status): when getting the current
-	time for date values, use a timezone aware function
-
-2003-04-09  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #40952
-	
-	* pcs/cal-backend-file.c (cal_backend_file_open): check for file
-	method instead of is_local
-
-2003-04-08  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #40894
-	
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): update the
-	selection for all view types
-
-2003-04-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/alarm-options.c: Remove button_ok, button_cancel,
-	canceled members from struct Dialog.
-	(get_widgets): Do not initialize.
-	(close_dialog): Destroy the toplevel.
-	(toplevel_delete_event_cb): Removed.
-	(button_cancel_clicked_cb): Removed.
-	(button_ok_clicked_cb): Removed.
-	(close_dialog): Removed.
-	(alarm_options_dialog_run): Use gtk_dialog_run.
-	(init_widgets): Do not init ->canceled, do not connect OK/Cancel
-	buttons.
-	(alarm_to_dialog): No need to make the file entry modal from here
-	anymore.
-
-	* gui/dialogs/alarm-options.glade: Turned into a GtkDialog.  Set
-	the "modal" property to True for the file entry.
-
-2003-04-07  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #35926.
-
-	* gui/dialogs/event-page.glade: Remove contacts entry/chooser.
-
-	* gui/dialogs/event-page.c: Remove contacts entry/chooser.
-	(event_page_init): Remove references.
-	(event_page_finalize): Ditto.
-	(event_page_fill_widgets): Ditto.
-	(event_page_fill_component): Ditto.
-	(get_widgets): Ditto.
-	(init_widgets): Ditto.
-	(contacts_clicked_cb): Remove wholesale.
-	(contacts_changed_cb): Ditto.
-
-2003-04-07  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #40876
-	
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_refresh_free_busy): guard against
-	callbacks after destruction
-	(e_meeting_time_selector_refresh_cb): ditto
-
-2003-04-07  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/event-page.glade: create buttons properly
-
-	* gui/itip-utils.c (comp_server_send): for errors other than busy,
-	we want to email the results
-
-	* pcs/cal-backend.c (cal_backend_ref_categories): insert the new
-	category in the category list as well
-	(idle_notify_categories_changed): reset idle id
-
-2003-04-07  Not Zed  <NotZed@Ximian.com>
- 
- 	Fixes #40252
- 
- 	* conduits/todo/todo-conduit.c: Same as below.
- 
- 	* conduits/calendar/calendar-conduit.c: Change the LOG macro to a
- 	single arg macro which copies its arg.  Fix all callers.  Change
- 	WARN and INFO to simply g_warning/g_message.  Init G_LOG_DOMAIN
- 	before including anything.
-	
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Clean up server names
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in: 
-	Likewise
-
-	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
-	Likewise. Also mark the evolution:menu_name for i18n
-
-2003-04-07  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-attendee.[ch]: GObjectify. Eliminates ref/sink
-	warnings from the meeting editor.
-
-2003-04-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	Week view part of fix for #39895.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	Use the UNFOCUSSED colour if we're not focused, rather than not
-	drawing anything.
-
-	* gui/e-week-view.c: Set up the UNFOCUSSED colour.
-
-	* gui/e-week-view.h: Add the UNFOCUSSED colour.
-
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #40790
-	
-	* gui/alarm-notify/alarm-queue.c (procedure_notification_dialog):
-	return based on the response code (not old button stuff)
-
-2003-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/alarm-options.c (alarm_to_dialog): Make the file
-	entry modal.  [#40792]
-  
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #40789
-	
-	* gui/dialogs/alarm-options.c (alarm_to_dalarm_widgets):
-	description is a text buffer
-	(alarm_to_malarm_widgets): ditto
-	(dalarm_widgets_to_alarm): ditto
-	(malarm_widgets_to_alarm): ditto
-	(alarm_to_repeat_widgets): check repeat status correctly
-
-2003-04-04  Dan Winship  <danw@ximian.com>
-
-	* gui/e-itip-control.c (write_html): Don't free static string.
-
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/cal-search-bar.c (cal_search_bar_destroy): guard against
-	multiple destroy calls
-
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-client/cal-client.c (get_default_uri): guard against empty
-	uri as well
-
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #40722
-	
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_destroy):
-	guard against multiple destroy calls
-
-2003-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/control-factory.c (set_prop): Add a check to see if the view
-	should be the day-view and change the default to be whatever
-	calendar_config_get_default_view() returns. Should fix bug #39735.
-
-	* gui/calendar-config.h: calendar_config_write() and
-	calendar_config_write_on_exit() no longer exist. Removed
-	prototypes.
-
-	* gui/control-factory.c (set_prop): g_strcasecmp() is
-	deprecated. Since the values can never be anything other than all
-	lowercase anyway, just use strcmp.
-
-2003-04-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39262
-	
-	* importers/icalendar-importer.c (load_file_fn, vcal_load_file_fn):
-	use folder_type argument to determine what to import.
-	
-2003-04-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (load_file_fn, vcal_load_file_fn):
-	added "folder_type" parameter to EvolutionImporterLoadFileFn.
-	
-2003-04-02  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #39955
-	
-	* gui/itip-utils.c (comp_sentby): don't unref the the account
-
-2003-04-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #40661
-	
-	* gui/itip-utils.c: added missing header for Forte compilation.
-
-2003-04-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw):
-	Nuke GdkFont and use Pango's font measuring.
-
-	* gui/e-day-view-time-itme.c (e_day_view_time_item_get_column_width)
-	(e_day_view_time_item_draw): Ditto.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw)
-	(e_day_view_top_item_draw_long_event): Ditto.
-
-	* gui/e-day-view.c (e_day_view_style_set)
-	(e_day_view_recalc_cell_sizes)
-	(e_day_view_reshape_long_event)
-	(e_day_view_update_top_canvas_drag)
-	(e_day_view_update_main_canvas_drag): Ditto.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set)
-	(e_meeting_time_selector_recalc_date_form): Ditto.
-
-	* gui/e-week-view-event-item.c (e_week_view_draw_time): Ditto.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	Ditto.
-
-	* gui/e-week-view-titles-item.c (e_week_view_titles_item_draw):
-	Ditto.
-
-	* gui/e-week-view.c (e_week_view_style_set)
-	(e_week_view_recalc_cell_sizes)
-	(e_week_view_reshape_event_span): Ditto.
-
-	* gui/weekday-picker.c (weekday_picker_style_set): Ditto.
-
-2003-04-01  JP Rosevear  <jpr@ximian.com>
-
-	Fix for #17231 (Evo portion)
-	
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): test for
-	secret flag properly
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	ditto
-
-2003-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (load_file_fn, vcal_load_file_fn):
-	added filename (tasks.ics/calendar.ics) to the URI if it does not
-	contain it.
-
-2003-03-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39961
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_options_menu_position_callback):
-	(e_meeting_time_selector_autopick_menu_position_callback): use the
-	button's allocation to position the popup menu.
-
-2003-03-29  Not Zed  <NotZed@Ximian.com>
-
-	Fixes #39895
-
-	* gui/e-day-view.h (EDayViewColors): add an unfocussed colour to
-	draw the selection in when we're not focussed.
-
-	* gui/e-day-view.c (e_day_view_realize): Initialise
-	E_DAY_VIEW_COLOR_BG_SELECTED_UNFOCUSSED to be 1/2 saturation of
-	the focussed colour.
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw): Use the
-	UFOCUSSED colour if we aren't focussed, rather than just not
-	drawing anything.
-
-2003-03-28  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (get_servers): the shell client is a
-	g_object now, ref appropriately
-
-2003-03-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view.c (comp_destroy_cb)
-	(e_day_view_on_long_event_button_press)
-	(e_day_view_on_event_button_press)
-	(e_day_view_on_long_event_click)
-	(e_day_view_on_event_click)
-	(e_day_view_on_event_double_click)
-	(e_day_view_on_delete_appointment): Hold weak references to the
-	CalComponent instead of connecting to the "destroy" signal.
-
-	* gui/e-week-view.c (comp_destroy_cb)
-	(e_week_view_on_text_item_event): Ditto.
-
-2003-03-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #39954
-	
-	* gui/dialogs/recurrence-page.c (make_recurrence_special):
-	Destroy would-be children of the container before the container.
-
-2003-03-28  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/meeting-page.c (meeting_page_init): init new members
-	(get_current_account): get a matching account for the currently
-	selected user in the combo
-	(meeting_page_finalize): unref the meeting attendee if there is
-	one
-	(meeting_page_fill_widgets): don't set the combo list here
-	(clear_widgets): set the default organizer here and if we don't
-	have an organizer, add the default organizer as an attendee
-	(meeting_page_fill_component): use get_current_account
-	(org_changed_cb): if this is a new meeting and the organizer
-	changes, change the attendee
-	(change_clicked_cb): no need to set the default here
-	(init_widgets): reflect changed callback name
-	(meeting_page_construct): set the combo strings here
-	(popup_delete_cb): remove the organizer attendee if the user
-	explicitly deletes it
-
-	* gui/e-meeting-model.c (attendee_changed_cb): set row properly
-
-	* gui/itip-utils.c (comp_to_list): skip the user themselves if
-	cancelling or requesting
-
-2003-03-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (gnome_calendar_import_data_fn): use
-	g_object_unref for CalClient's.
-	(create_checkboxes_control): use g_signal_connect.
-
-	* cal-client/cal-client.c (cal_client_get_load_state): return correct
-	values in g_return_val_if_fail.
-
-2003-03-26  Jack Jia <jack.jia@sun.com>
-
-	* calendar/gui/dialogs/alarm-options.c
-	(malarm_widgets_to_alarm): add a parameter(TC_CORBA_string) to
-	the bonobo_widget_get_property.
-	
-2003-03-25  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c: Update for e_notice move
-
-	* gui/tasks-control.c (confirm_expunge): Move the code that used
-	to be e_gnome_dialog_set_parent here, since it was marked
-	deprecated and this was the only place using it.
-
-	* gui/dialogs/comp-editor.c: Update for e_notice move
-	(page_changed_cb, page_summary_changed_cb, page_dates_changed_cb):
-	Pass a parent_window to e_notice.
-
-	* gui/dialogs/meeting-page.c: Update for e_notice move.
-	(meeting_page_fill_component, meeting_page_fill_component,
-	popup_delegate_cb): Pass a parent_window to e_notice
-
-2003-03-25  Dan Winship  <danw@ximian.com>
-
-	* cal-util/cal-util.c (cal_util_parse_ics_file): Utility wrapper
-	around icalparser.
-
-	* cal-util/test-recur.c (main): Use it
-
-	* pcs/cal-backend-file.c (open_cal): Likewise
-
-	* gui/comp-editor-factory.c (open_client): Add the OpenClient to
-	the hash before calling cal_client_open_calendar, since in some
-	failure cases, that will call cal_opened_cb (which will free the
-	oc) with a failure immediately, causing a crash if we then try to
-	deref it.
-
-2003-03-21  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #32248
-	
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): make
-	sure the due date is actually a date
-
-2003-03-21  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #31660
-	
-	* conduits/calendar/calendar-conduit.c (rrules_mostly_equal):
-	check if the rrules are equal other than until/count
-	(find_last_cb): update the data with the start timet
-	(local_record_from_comp): handle the case where the recurrence
-	rule ends after a certain number occurrences
-	(comp_from_remote_record): same
-
-2003-03-20  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c
-	(e_calendar_context_destroy): calcomponents are gobjects now
-	(calconduit_load_configuration): ref and sink to avoid warnings
-
-	* conduits/todo/todo-conduit.c (todoconduit_load_configuration):
-	ref and sink to avoid warnings
-	(e_todo_context_destroy): calcomponents are gobjects now
-
-2003-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): use a
-	GtkMessageDialog and deal correctly with the dialog's reponses.
-
-2003-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39770
-
-	* gui/itip-utils.c (itip_Send_comp): check the CORBA exception instead
-	of the g_return_val_if_fail. Also, use a CORBA_Object for the value
-	returned from bonobo_activation_activate_from_id.
-
-2003-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/ical-importer.c: removed activation of shell_client.
-	(importer_destroy_cb): no need to unref shell_client.
-	(connect_to_shell): removed.
-	(ical_importer_new, vcal_importer_new): don't call connect_to_shell.
-
-2003-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/ical-importer.c (get_uri_from_folder_path): removed.
-	(load_file_fn, vcal_load_file_fn): use physical_uri instead of
-	folderpath.
-
-2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
-	Replace "evolution:menu-name" prop with "evolution:menu_name".
-	[#39692]
-
-2003-03-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/send-comp.c (send_component_dialog): use GtkMessageDialog
-	instead of gnome_question_dialog, and deal correctly with the dialog's
-	response.
-
-2003-03-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #34505
-
-	* gui/alarm-notify/alarm-queue.c (remove_queued_alarm): added removal
-	of the alarm itself in the calendar if the (new) argument says so.
-	Also, set expecting_update flag to TRUE.
-	(add_component_alarms): initialize expecting_update to FALSE.
-	(remove_alarms): don't remove the component if expecting_update is
-	TRUE.
-	(obj_updated_cb, notify_dialog_cb, procedure_notification): adapted
-	to changes in remove_queued_alarm.
-	
-2003-03-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #34095
-
-	* gui/e-meeting-model.c (append_row): Don't leak meeting attendees;
-	unref the attendee after it's assigned to model.
-
-	* gui/dialogs/meeting-page.c (meeting_page_destroy): Free the actual
-	array of deleted attendees.
-
-	* gui/dialogs/event-editor.c (event_editor_destroy): Free the private
-	structure.
-
-	* gui/itip-utils.c (comp_description): Rework free/busy information
-	composer so we can free date/time information after use. Then free it.
-	(itip_send_comp): Free the allocated CORBA buffer for attachment data.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_component):
-	Free the destination contacts string once we're done with it.
-
-	* gui/e-calendar-table.c (invisible_destroyed): Unref the invisible.
-
-	* gui/e-day-view.c (invisible_destroyed): Ditto.
-
-	* gui/e-week-view.c (invisible_destroyed): Ditto.
-
-2003-03-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #39757
-
-	* gui/dialogs/alarm-page.c (sensitize_buttons): Somehow this code
-	reverted to thinking it was dealing with a GtkCList, when in reality
-	it's a GtkTreeView. Fix that, so the buttons are sensitized correctly.
-
-2003-03-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #39736
-
-	* gui/e-day-view.c: Reduce the size of the large-digits font so it's
-	en par with the one in 1.2.
-
-2003-03-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39740
-
-	* gui/e-meeting-model.c (is_cell_editable): check row number is valid
-	before using it as index for the GPtrArray.
-
-2003-03-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39356
-
-	* gui/Makefile.am:
-	* gui/tasks-migrate.[ch]: removed tasks migration obsolete stuff.
-
-	* gui/calendar-component.c (owner_set_cb): don't call tasks_migrate.
-
-2003-03-14  Rodrigo Moya <rodrigo@ximian.com>
-	
-	* pcs/cal-factory.c (impl_CalFactory_uriList): set_release
-	on the sequence we create.
-
-	* cal-client/cal-client.c (cal_client_uri_list): don't leak the
-	string sequence returned by CalFactory_uriList.
-
-2003-03-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query-backend.c (query_backend_new): use a weak ref instead
-	of connecting to backend's "destroy" signal.
-	(backend_destroyed_cb, query_destroyed_cb): changed to be weak
-	reference callbacks.
-
-2003-03-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/save-comp.c (save_component_dialog): don't use
-	GNOME_STOCK_* defines, but GTK_STOCK_*.
-
-2003-03-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/save-comp.[ch] (save_component_dialog): corrected
-	button ordering and changed the return type to be a GtkResponseType.
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes): adapted to
-	changes in save_component_dialog.
-
-2003-03-11  Dan Winship  <danw@ximian.com>
-
-	* gui/calendar-config.c (on_timezone_set): Update for timezone
-	dialog API changes.
-
-	* gui/e-timezone-entry.c: Likewise
-
-2003-03-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): issue more descriptive
-	warnings.
-
-2003-03-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): if we
-	already have the client loaded, don't remove it, just increment its
-	reference count.
-
-	* gui/alarm-notify/alarm-queue.c (remove_queued_alarm): added new
-	argument to specify whether we want the component's structure removed
-	if no more alarms exist, and only free the structure if TRUE.
-	(remove_alarms): added same new argument and pass it over to
-	remove_queued_alarm.
-	(remove_comp, obj_updated_cb): passed new argument to remove_alarms.
-	(procedure_notification): passed new argument to remove_queued_alarm.
-	(obj_removed_cb): set all freed pointers to NULL.
-	(notify_dialog_cb): only remove the alarm if the pointers are not NULL.
-
-2003-03-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/save.c (get_calendars_to_load): create the array
-	to be returned only once.
-
-2003-03-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-queue.c (display_notification): ref the CalClient.
-	(notify_dialog_cb): unref the CalClient.
-
-2003-03-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.[ch]
-	(alarm_notify_dialog_disable_buttons): new function.
-	(alarm_notify_dialog): made it return a pointer to the dialog structure.
-
-	* gui/alarm-notify/alarm-queue.c (remove_alarms, remove_comp): splitted
-	alarm removal out of remove_comp.
-	(obj_updated_cb): remove the component only when needed. In normal
-	updates, just update the internal structure.
-	(edit_component): don't get a CompQueuedAlarms as argument, since it
-	might be removed.
-	(on_dialog_obj_updated_cb, on_dialog_obj_removed_cb): callbacks for
-	modifications during dialog display.
-	(notify_dialog_cb): disconnect from "obj_*ed" signals and call
-	edit_component with the new set of arguments.
-	(display_notification): added more data to the closure structure.
-
-2003-03-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #31382
-
-	* gui/e-meeting-model.c (async_read): don't assume the buffer is
-	always full, but use GNOME_VFS_ERROR_EOF instead for knowing when
-	the read has finished.
-
-2003-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/apps_evolution_calendar.schemas: fix defaults and
-	descriptions to match what calendar-config wants them to be
-
-2003-03-05  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-itip-control.c (show_current): g_objectify ref/unref
-
-	* gui/itip-bonobo-control.c (set_data_idle_cb): as above
-	(pstream_load): ditto
-
-	* gui/dialogs/alarm-options.c (alarm_to_malarm_widgets): as above
-
-2003-03-05  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (class_init): override finalize, not
- 	destroy
- 	(start_calendar_server): take itip as a param and gtk_main_quit if
- 	it gets destroyed while we are waiting for the cal client to load
- 	(start_default_server): ditto
- 	(get_servers): take itip as a param and don't load if we've been
- 	destroyed, check for an except when retrieving the folder list
- 	(init): ref the html control
-	(destroy): mark ourselves as destroyed
- 	(finalize): clean up, unref html control
- 	(write_html): if the html widget has been destroyed, don't write
- 	anything out
- 	(show_current_todo): pass extra param
- 	(show_current): ref/unref the itip control to avoid finalization while
- 	we are working, pass extra param
- 	(button_selected_cb): pass extra param
- 	(object_requested_cb): ditto
-
-2003-03-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_go_offline,
-	backend_go_online): cast CalClient's to GObject, not GtkObject.
-
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): don't
- 	let the user change to an email organizer if the back end is not
- 	an email addres
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #37881
- 	
- 	* gui/e-meeting-model.c (process_section): if the attendee is the
- 	empty string, try to get the email
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_cal_opened_online): set
-	the backend to REMOTE mode when it opens
-	(backend_go_online): prepare to set calendar mode to REMOTE
-	(impl_goOnline): get all the local calendars and set to REMOTE
-
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #37881
- 	
- 	* gui/e-meeting-model.c (process_section): if the attendee is the
- 	empty string, try to get the email
- 
-2003-03-04  JP Rosevear  <jpr@ximian.com>
-  
- 	Fixes #37883
- 	
- 	* idl/evolution-calendar.idl: getLdapAttribute can raise NotFound
- 
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #37806, #37697
- 	
- 	* gui/e-itip-control.c (e_itip_control_set_data): if the text is
- 	null or the empty string, just clear the widget
- 	(init): set the html widget to initially be blank
- 
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* pcs/cal.c (impl_Cal_get_ldap_attribute): implement
- 
- 	* pcs/cal-backend.h: add virtual method
- 
- 	* pcs/cal-backend.c (cal_backend_get_ldap_attribute): call
- 	get_ldap_attribute_method
- 
- 	* pcs/cal-backend-file.c (cal_backend_file_class_init): overrid
- 	get_ldap_attribute method
- 
- 	* idl/evolution-calendar.idl: add getLdapAttribute method
- 
- 	* gui/e-meeting-model.c (process_section): take simple card list
- 	as arg and try to use the ldap attribute (if any) as the attendee,
- 	else use the email address
- 	(select_names_ok_cb): get the simple card list 
- 
- 	* cal-client/cal-client.h: add proto
- 
- 	* cal-client/cal-client.c (cal_client_init): init ldap_attribute
- 	to NULL
- 	(cal_client_destroy): free ldap_attribute
- 	(cal_client_get_ldap_attribute): accessor
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
-
-       * gui/itip-utils.c (itip_organizer_is_user): call
-       cal_client_get_cal_address instead of cal_client_get_email_address
-
-       * gui/dialogs/meeting-page.c (meeting_page_construct): ditto
-
-       * pcs/cal.c (impl_Cal_get_cal_address): implement updated method
-       name
-       (cal_class_init): set method implementation
-
-       * pcs/cal-backend.c (cal_backend_class_init): init get_cal_address
-       virtual function
-       (cal_backend_get_cal_address): call proper function
-
-       * pcs/cal-backend.h: update proto, rename get_email_address
-       virtual function to get_cal_address virtual function
-
-       * pcs/cal-backend-file.c (cal_backend_file_class_init): match
-       get_cal_address call
-       (cal_backend_file_get_cal_address): rename from
-       cal_backend_file_get_email_address
-
-       * cal-client/cal-client.c: rename email_address private member to
-       cal_address
-       (cal_client_init): init cal_address
-       (cal_client_destroy): free cal_address and properly free
-       alarm_email_address
-       (cal_client_get_cal_address): rename from
-       cal_client_get_email_address and call proper corba function
-       
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
-  	* idl/evolution-calendar.idl: fix comment
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/calendar-model.c (calendar_model_append_row): update FIXME
- 	note
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/dialogs/recur-comp.h: fix copyright
- 
- 	* gui/dialogs/recur-comp.c: fix copyright
- 	(recur_component_dialog): say "recurring journal entry" instead of
- 	just "recurring journal"
-
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
-        Partially  Fixes #23606 (from Jack Jia <jack.jia@sun.com>)
- 	
- 	* gui/dialogs/schedule-page.c (update_time): handle no end date if
- 	the start is date only
- 
- 	* gui/dialogs/event-page.c (update_time): ditto
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
-
-	Merging in 1.2 stuff
-	
-	Fixes #35598
-	
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_widgets): count a status of needs action
-	as a status of none (not started)
-	(date_changed_cb): set the option menu to a status of none
-	(status_changed): no need to handle needs action status now
-
-	* gui/dialogs/task-details-page.glade: remove needs-action menu
-	item
-
-	Fixes #36763	
-		
-	* gui/dialogs/alarm-page.c (add_clicked_cb): if no address was set
-	for an email alarm, set the default
-	(button_options_clicked_cb): pass the default email address
-
-	* gui/dialogs/alarm-options.h (alarm_options_dialog_run): update proto
-
-	* gui/dialogs/alarm-options.c (alarm_to_malarm_widgets): if there
-	are no email attendees, default to the passed in value
-	(alarm_options_dialog_run): take and track an email param
-
-	* pcs/cal.c (impl_Cal_get_alarm_email_address): implement by
-	calling backend method
-	(cal_class_init): set alarm email address method implementation
-
-	* pcs/cal-backend.h: add new virtual proto
-
-	* pcs/cal-backend.c (cal_backend_class_init): set alarm email
-	address virtual method to NULL
-	(cal_backend_get_alarm_email_address): call backend method
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): set alarm
-	email address method
-	(cal_backend_file_get_alarm_email_address): implement by returning
-	NULL
-
-	* idl/evolution-calendar.idl: add getAlarmEmailAddress method
- 
-	Fixes #37102
-	
-	* gui/dialogs/task-editor.c (set_menu_sens): don't allow task
-	assignment if the backend says not to
-
-	* gui/dialogs/recurrence-page.c (fill_component): kill warning
-	(preview_recur): display the recurrences in the dtstart timezone
-	if possible
-
-	* gui/gnome-cal.c (dn_query_obj_updated_cb): pass NULL to use
-	default tag zone
-
-	* gui/tag-calendar.c (tag_calendar_by_comp): allow display zone
-	for the tagged calendar to be passed in
-	(prepare_tag): use the passed in timezone for display if non-null
-
-	* gui/tag-calendar.h (tag_calendar_by_comp): update proto
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): make
-	sure we always update the preview
-
-	* conduits/todo/todo-conduit.c (add_record): make sure to create a
-	unique uid for the record
-
-	* conduits/calendar/calendar-conduit.c (add_record): ditto
-
-	* conduits/todo/todo-conduit.c (e_todo_context_new): init default
-	comp and timezone to NULL
-	(e_todo_context_destroy): unref default comp
-	(pre_sync): et the default comp via the client and set the default
-	timezone
-	(add_record): pass the default comp as the base comp
-
-	* conduits/calendar/calendar-conduit.c (e_calendar_context_new):
-	init default comp to NULL
-	(e_calendar_context_destroy): unref default comp
-	(pre_sync): get the default comp via the client
-	(add_record): pass the default comp as the base comp
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	only add the recurrence rule if its not an instance
-
-	* gui/itip-control-factory.c (set_data_idle_cb): idle call back to
-	set control data
-	(pstream_load): set the data in an idle callback to avoid deadlock
-	(get_prop): handle view_only
-	(set_prop): ditto
-	(itip_control_factory): add view_only
-
-	* gui/e-itip-control.h: add protos
-
-	* gui/e-itip-control.c (write_html): only write out the options if
-	we aren't in view_only mode
-	(e_itip_control_set_view_only): accessor
-	(e_itip_control_get_view_only): ditto
-	
-	Fixes #36909
-	
-	* gui/dialogs/alarm-page.c (button_options_clicked_cb): indicate
-	whether the options dialog should allow repeating
-
-	* gui/dialogs/alarm-options.h: update proto
-
-	* gui/dialogs/alarm-options.c (alarm_to_repeat_widgets): if
-	repeating is not allowed, sensitize the widgets appropriately
-	(alarm_options_dialog_run): store the repeat param
-
-	* gui/calendar-model.c (calendar_model_append_row): guard against
-	saving before the calendar is open
-
-	* gui/e-day-view.c (e_day_view_key_press): ditto
-	
-	* gui/dialogs/comp-editor.c (page_changed_cb): change warning
-	dialog to not mention email
-	(page_summary_changed_cb): ditto
-	(page_dates_changed_cb): ditto
-
-	* gui/itip-utils.c (itip_organizer_is_user): make the compare case
-	insensitive
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): don't
-	allow the organizer to be changed if its not an email address
-
-	* gui/e-day-view.c, calendar-model.c, e-week-view.c,
-	task-editor.c, event-editor.c, comp-editor.c, meeting-page.c: pass
-	additional param
-
-	* gui/itip-utils.c (itip_organizer_is_user): take client as param,
-	and if organizer-not-email-address and email address and organizer
-	match, assume the user is the organizer
-
-	* gui/itip-utils.h: update proto
-
-	* pcs/cal.c (build_fb_seq): set the max
-
-	* gui/e-meeting-model.c
-	(e_meeting_model_add_attendee_with_defaults): correct typo and set
-	rsvp appropriately
-
-	* gui/dialogs/send-comp.c (send_component_dialog): if save
-	schedules, return FALSE for now
-
-	* gui/dialogs/recurrence-page.c (sensitize_recur_widgets):
-	de-sensitize the preview widget if we are viewing an instance
-	(preview_recur): return if the comp is an instance
-
-	* gui/dialogs/event-page.glade: name the show time frame
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets) 
-	(event_page_init): init show time frame
-	(event_page_fill_widgets): hide/show frame as needed
-	(get_widgets): get the frame
-
-	* gui/alarm-notify/alarm-queue.c (mail_notification): kill mail
-	notification code
-
-	* cal-client/cal-client.c (load_static_capabilities): grab static
-	capabilities string
-	(check_capability): see if a capability is in the string
-	(cal_client_get_one_alarm_only): accessor
-	(cal_client_get_organizer_must_attend): use check_capability
-	(cal_client_get_static_capability): ditto
-
-	* cal-client/cal-client.h: new, changed protos
-
-	* idl/evolution-calendar.idl: change over getSchedulingInformation
-	to a more general getStaticCapabilities call
-
-	* pcs/cal-backend-file.c
-	(cal_backend_file_get_static_capabilities): return
-	"no-email-alarms"
-
-	* pcs/cal-backend.c (cal_backend_get_static_capabilities): ditto
-
-	* pcs/cal-backend.h: ditto
-
-	* pcs/cal.c (impl_Cal_get_static_capabilities): ditto
-
-	* gui/alarm-notify/alarm-queue.c (get_default_address): utility
-	routine to snag address info
-
-	* gui/alarm-notify/Makefile.am: build composer idl
-
-	* *.c: pass client param for send an cancel params
-	
-	* gui/dialogs/send-comp.c (send_component_dialog): take client as
-	a parm and if save schedules return true right away
-
-	* gui/dialogs/send-comp.h: update proto
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): take client
-	as a param and if we are deleting and schedule saves, return true
-	right away
-
-	* gui/dialogs/cancel-comp.h (cancel_component_dialog): update proto
-
-	* gui/dialogs/alarm-options.glade: add Send To: button
-
-	* gui/dialogs/alarm-options.c (addressbook_clicked_cb): display
-	dialog
-	(setup_select_names): attach above to Send To: button clicked
-	signal
-
-	* gui/dialogs/alarm-options.c (get_widgets): get mail alarm
-	widgets
-	(setup_select_names): add the select names widget
-	(alarm_to_malarm_widgets): show the attendees and description
-	(alarm_to_dialog): set the title for mail alarms properly
-	(malarm_widgets_to_alarm): save attendees and descriptions in
-	alarm
-	(alarm_options_dialog_run): call setup_select_names
-
-	* gui/dialogs/alarm-page.c: add email to alarm types
-
-	* gui/dialogs/alarm-options.glade: add mail alarm widgets
-
-	* gui/dialogs/alarm-page.glade: add email to alarm types
-
-	* cal-util/cal-component.c (scan_attendee): kill unnecessary
-	CalComponent param
-	(scan_property): don't pass same
-	(set_attendee_list): take an icalcomp instead of a CalComponent
-	(cal_component_set_attendee_list): pass same
-	(scan_alarm_property): if its an attendee, scan it
-	(make_alarm): set attendee_list member to null
-	(cal_component_alarm_new): ditto
-	(cal_component_alarm_free): free attendee list
-	(cal_component_alarm_get_attendee_list): return attendee list
-	(cal_component_alarm_set_attendee_list): set attendee list
-	(cal_component_alarm_has_attendees): return true if alarm has attendees
-
-	* cal-util/cal-component.h: new protos
-
-	* gui/calendar-model.c (calendar_model_append_row): use
-	cal_comp_task_new_with_defaults
-
-	* gui/comp-editor-factory.c (get_default_task): ditto
-
-	* gui/e-tasks.c (e_tasks_new_task): ditto
-
-	* gui/gnome-cal.c (gnome_calendar_new_task): ditto
-
-	* gui/comp-util.h (cal_comp_task_new_with_defaults): new proto
-
-	* gui/comp-util.c (cal_comp_task_new_with_defaults): new utility
-	routine
-
-	* cal-util/cal-util.c (generate_absolute_triggers): skip omitted
-	alarm types
-	(add_alarm_occurrences_cb): ditto
-	(cal_util_generate_alarms_for_list): take/pass omit param
-	(cal_util_generate_alarms_for_comp): ditto
-
-	* cal-util/cal-util.h: update protos
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_alarms_for_object):
-	add omit param
-	(cal_backend_file_get_alarms_in_range): ditto
-
-	* pcs/cal-backend.c (cal_backend_get_scheduling_information):
-	remove dead param
-
-	* gui/dialogs/meeting-page.h: delete proto
-
-	* gui/dialogs/meeting-page.c: remove dead routine
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): we don't
-	need to add the organizer as an attendee ourselves, just set the
-	edit level properly
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): ditto
-
-	* gui/comp-util.c (cal_comp_event_new_with_defaults): take client
-	as arg so we can obtain the default from the backend
-	
-	* gui/comp-editor-factory.c (get_default_event): pass
-	cal_comp_event_new_with_defaults the new param
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): ditto
-
-	* gui/e-week-view.c (e_week_view_key_press): ditto
-
-	* gui/e-day-view.c (e_day_view_key_press): ditto
-
-	* gui/calendar-model.c (calendar_model_append_row): ditto
-
-	* gui/comp-util.h (cal_comp_event_new_with_defaults): update proto
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_default_object):
-	return appropriate default object
-
-	* pcs/cal-backend.c (cal_backend_get_default_object): call
-	get_default_backend class method
-
-	* pcs/cal-backend.h: add proto
-
-	* pcs/cal.c (impl_Cal_get_default_object): implement
-	(cal_class_init): set handler for getDefaultObject call
-
-	* idl/evolution-calendar.idl: remove always schedule from
-	SchedulingInformation and add getDefaultObject call
-
-	* cal-client/cal-client.c (cal_client_get_default_object): gets a
-	default object from the server
-	(cal_client_init): remove always_schedule
-	(load_scheduling_info): ditto
-
-	* cal-client/cal-client.h: add a proto, delete a proto
-
-	* gui/dialogs/meeting-page.c (right_click_cb): if the attendee is
-	not fully editable, don't allow deletion
-	(meeting_page_construct): keep the default organizer as an itip
-	address
-	(meeting_page_get_default_organizer): return the default organizer
-
-	* gui/dialogs/meeting-page.h: new proto
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): we set
-	appropriate edit levels now for users and if the backend always
-	schedules we always show the meeting pages and add the organizer
-	as an attendee
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): same
-
-	* gui/e-meeting-model.c (is_cell_editable): use the edit level of
-	the attendee to determine if cell is editable
-	(init): we no longer keep the attendee list of restricted
-
-	* gui/e-meeting-attendee.c (e_meeting_attendee_get_edit_level): accessor
-	(e_meeting_attendee_set_edit_level): ditto
-
-	* gui/e-meeting-attendee.h: new protos and edit level enum
-
-	* cal-client/cal-client.c (load_scheduling_info): load the
-	scheduling info
-	(cal_client_get_always_schedule): accessor
-	(cal_client_get_organizer_must_attend): ditto
-	(cal_client_get_save_schedules): ditto
-	(cal_client_init): init scheduling data members
-
-	* cal-client/cal-client.h: accessors for scheduling information
-
-	* pcs/cal-backend-file.c
-	(cal_backend_file_get_scheduling_information): implement the new
-	virtual method
-
-	* pcs/cal-backend.c (cal_backend_get_scheduling_information): call
-	the class specific method
-
-	* pcs/cal-backend.h: add virtual method
-
-	* idl/evolution-calendar.idl: add a getSchedulingInformation call
-	which describes how the backend does its scheduling
-
-	* pcs/cal.c (impl_Cal_get_scheduling_information): implement above
-
-	* gui/e-day-view.c: pass NULL as parent to recur dialog
-
-	* gui/e-week-view.c: ditto
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes): show recur
-	dialog after prompting, not before
-	(save_cmd): ditto
-	(save_close_cmd): ditto
-	(real_edit_comp): don't show recur dialog before opening
-
-	* gui/dialogs/recur-comp.h (recur_component_dialog): update proto
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): take a parent
-	argument and set the dialog parent if non-null
-	
- 	* gui/e-week-view.c (e_day_view_on_editing_stopped): Don't update
- 	appointment if both the old and the new summary texts are empty.
- 
-	* gui/e-week-view.c (e_week_view_show_popup_menu): mask out "make
-	moveable" if its an instance
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): ditto
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): if its
-	an instance, show the recur comp dialog and modify it based on the
-	response (or not if cancel is hit)
-
-	* gui/e-day-view.c (e_day_view_finish_long_event_resize): if its
-	an instance, show the recur comp dialog and modify it based on the
-	response (or not if cancel is hit)
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-	* gui/dialogs/comp-editor.c (real_edit_comp): reflect changes in
-	proto of recur_component_dialog
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): use ok/cancel
-	instead and radio buttons for the mod type
-
-	* gui/dialogs/recur-comp.h: update proto
-
-	* gui/e-day-view.c (e_day_view_on_long_event_click): allow
-	dragging if its an instance
-	(e_day_view_on_event_click): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-
-	* gui/dialogs/comp-editor.c (save_comp): if its an instance,
-	update with the mod type
-	(real_edit_comp): ask the user what instances they want to change
-
-	* gui/dialogs/recur-comp.[hc]: new dialog to ask user what
-	recurrences to modify
-
-	* gui/dialogs/Makefile.am: Compile new files
-	
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): if its an
-	instance, just remove with THIS mod
-
-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): ditto
-	
-	* cal-client/cal-client.c (cal_client_remove_object_with_mod):
-	send the mod parameter to the backend
-	(cal_client_remove_object): implement with above
-	(cal_client_update_object_with_mod): send the mod parameter to the
-	backend
-	(cal_client_update_object): implement with above
-
-	* cal-client/cal-client.h: new protos
-
-	* cal-client/cal-client.c (cal_client_is_read_only): return
-	booleans in the pre conditions
-	(cal_client_update_object): pass mod param
-	(cal_client_update_objects): ditto
-	(cal_client_remove_object): ditto
-	(cal_client_ensure_timezone_on_server): ditto
-
-	* pcs/cal.c (impl_Cal_update_objects): take mod param
-	(impl_Cal_remove_object): ditto
-
-	* pcs/cal-backend.h: fix protos
-
-	* pcs/cal-backend.c (cal_backend_update_objects): take mod param
-	(cal_backend_remove_object): ditto
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_objects): take
-	mod param
-	(cal_backend_file_remove_object): ditto
-
-	* cal-util/cal-util.h: add mod enum
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances_of_rule): if
-	its an instance, just report the instance
-
-	* cal-util/cal-component.h: new protos
-
-	* cal-util/cal-component.c (cal_component_is_instance): indicate
-	whether the component is an instance or not
-	(cal_component_free_range): free a range
-
-	* idl/evolution-calendar.idl: get remove and update to take mod
-	type 
-
-2003-03-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/alarm-page.c
-	* gui/dialogs/event-page.c
-	* gui/dialogs/meeting-page.c
-	* gui/dialogs/recurrence-page.c
-	* gui/dialogs/schedule-page.c
-	* gui/dialogs/task-details-page.c
-	* gui/dialogs/task-page.c (get_widgets): gtk_widget_unparent() ->
-	gtk_container_remove(). The former caused crashes in the
-	addressbook's name-selector.
-
-2003-03-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* Makefile.am: Do importers after the other dirs, as it relies on
-	generated files from there. This is still not optimal... Should
-	probably introduce dependencies.
-
-2003-02-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* importers/Makefile.am: Shlibify.
-
-	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
-	Shlibify.
-
-	* importers/icalendar-importer.c: Add necessary includes.
-	(importer_destroy_cb): This is now a GWeakNotify func. gtk_ -> g_.
-	(ical_importer_new)
-	(vcal_importer_new)
-	(gnome_calendar_importer_destroy_cb): Destroy signal -> weak ref.
-
-	* importers/main.c: Add necessary includes. Shlibify.
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/Makefile.am: build libcal-dialogs as an uninstalled
-	shared library
-	($(IDL_GENERATED_H), etc): Only generate
-	Evolution-Addressbook-SelectNames.h, not the corresponding .c
-	files, or we'll get duplicate symbol errors trying to link this
-	into libevolution_calendar.la
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD): Update for
-	that (and eliminate libtool portability warnings)
-
-2003-02-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* Makefile.am (SUBDIRS): Add importers/.
-
-	* importers/Makefile.am (server_in_files)
-	(server_DATA): Insert $(libexecdir).
-
-	* importers/icalendar-importer.c (connect_to_shell):
-	oaf_activate_from_id() -> bonobo_activation_activate_from_id().
-	(load_vcalendar_file): U_() -> _().
-
-	* importers/GNOME_Evolution_Calendar_Importer.server.in:
-	Renamed to corresponding .in.in.
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD): Remove
-	libalarm.a, which was not being used by the calendar.
-
-	* gui/main.c: Remove unneeded alarm.h include.
-
-	* gui/alarm-notify/Makefile.am (noinst_LIBRARIES): Stop building
-	libalarm.a
-	(evolution_alarm_notify_SOURCES): Add alarm.c, alarm.h
-	(evolution_alarm_notify_LDADD): Remove libalarm.a
-
-2003-02-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: link to versist libtool object
-
-	* conduits/calendar/Makefile.am: ditto
-	
-2003-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	This makes alarm notification work.
-
-	* gui/alarm-notify/notify-main.c (main): Initialize GTK. Don't
-	initialize bonobo activation - bonobo_init() does that for us.
-
-2003-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	This makes creating appointments and tasks from the "New" button work.
-
-	* gui/main.c (comp_editor_factory_fn): Doesn't need to take any args.
-	(factory): Add a handler for CompEditorFactory.
-
-2003-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes Ximian #37895.
-
-	* gui/e-day-view.c (e_day_view_destroy): g_object_unref () ->
-	pango_font_description_free ().
-	(e_day_view_style_set): Ditto.
-
-	* gui/e-week-view.c (e_week_view_destroy): Ditto.
-
-2003-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes Ximian #38306.
-
-	* gui/e-itip-control.c (clean_up): Do nothing if the private structure
-	has been freed. Don't call non-g_free() freers with NULL pointers.
-	(destroy): Do nothing if the private structure has been freed. Clear
-	pointers to freed blocks.
-
-2003-02-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/print.c (print_calendar): Use fixed margins of 5% of page
-	width/height. This is the same cheat as gtkhtml employs to get
-	around the fact that GNOME_PRINT_KEY_PAGE_MARGIN_* don't return
-	useful values (I think). It sort of sucks, but is better than
-	no margins at all.
-	(print_comp): Ditto.
-
-2003-02-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_default_view): Get
-	default view from correct key.
-
-2003-02-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (get_widgets): Show start/end-of-day
-	widgets.
-	
-2003-02-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_is_read_only): Don't warn
-	if calendar isn't loaded... Doesn't seem to hurt, but this should
-	probably be investigated further.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_widget):
-	If we have no contacts, don't bother trying to set them in the
-	widget. Used to pass a NULL list, which would lead to much anxiety
-	in callees.
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets):
-	If we have no potential organizers, emit a sensible warning.
-
-	* gui/dialogs/task-page.c (init_widgets): Don't try to connect to
-	the "changed" signal of the GtkTextView -- we listen to the
-	GtkTextBuffer now.
-
-2003-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-itip-control.c (destroy): dont unref accounts anymore.
-	(change_status): itipAddress -> EAccount.
-
-	* gui/calendar-model.c (calendar_model_destroy): dont unref
-	accounts anymore.
-	(calendar_model_value_at): simplify logic using account_list_find.
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): use new
-	itip_addresses interfaces.
-
-	* gui/dialogs/meeting-page.c (meeting_page_construct): use new
-	itip_addresses_* interfaces.  Should probably be using e_account
-	directly.
-	(meeting_page_finalize): dont unref the accounts list.
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): dont unref
-	accounts anymore.
-
-	* gui/itip-utils.c (itip_addresses_get_default): Just use
-	e_account_list_get_default.
-	(itip_addresses_get): dont ref the account object, just keep 1 ref
-	to it.
-	(find_account): remove.
-	(itip_organizer_is_user): use e_account_list_find now.
-	(itip_sentby_is_user): "
-	(comp_limit_attendees): "
-
-2003-02-19  Not Zed  <NotZed@Ximian.com>
-
-	* gui/dialogs/meeting-page.c: addresses->accounts
-	(meeting_page_finalize): unref accounts.
-
-	* gui/dialogs/event-editor.c: Use EAccountList api's
-
-	* pcs/cal-backend-util.c (cal_backend_mail_account_get): Removed,
-	use a global EAccountList instead.
-	(cal_backend_mail_account_get_default): Use the global
-	EAccountList directly.
-	(cal_backend_mail_account_is_valid): And here too.
-
-	* gui/itip-utils.h: Removed ItipAddress structure.
-
-	* gui/itip-utils.c (itip_addresses_get): Change it to return a
-	global account object, so we dont need to duplicate all account
-	info in the calendar.
-	(itip_addresses_free, itip_address_free): Removed, use
-	g_object_unref.
-	(itip_addresses_get_default): Return an EAccount.
-	(find_account): helper to lookup accounts based on name/address.
-	(itip_organizer_is_user): Use helper to find account.
-	(itip_sentby_is_user): "
-	(comp_limit_attendees): "
-	(comp_sentby): Update to use an EAccount direclty.
-	(get_address): Removed, now redundant.
-
-	* gui/e-itip-control.c: Changed priv->addresses to be accounts
-	EAccountList.
-	(destroy): unref accounts.
-	(find_my_address): Change to use accounts list directly, also fix
-	a small potential memleak.
-
-	* gui/calendar-model.c: Change priv->addresses to be a direct
-	reference to an EAccountList, renamed priv->accounts.
-	(calendar_model_destroy): unref accounts.
-	(calendar_model_value_at): Use EAccountList directly to lookup
-	members.
-
-	* gui/calendar-config.c (calendar_config_get_timezone)
-	(calendar_config_set_timezone): Fix timezone key.
-	(calendar_config_get_24_hour_format): Same for 24 hour format key.
-	(calendar_config_set_24_hour_format): And here.
-	(calendar_config_get_week_start_day): "
-	(calendar_config_set_week_start_day): "
-	(calendar_config_get_day_start_hour): "
-	(calendar_config_set_day_start_hour): "
-	(calendar_config_get_day_start_minute): "
-	(calendar_config_set_day_start_minute): "
-	(calendar_config_get_day_end_hour): "
-	(calendar_config_set_day_end_hour): "
-	(calendar_config_get_day_end_minute)
-	(calendar_config_set_day_end_minute)
-	(calendar_config_get_time_divisions)
-	(calendar_config_set_time_divisions)
-	(calendar_config_get_dnav_show_week_no)
-	(calendar_config_set_dnav_show_week_no)
-	(calendar_config_get_default_view)
-	(calendar_config_set_default_view)
-	(calendar_config_get_hpane_pos, calendar_config_set_hpane_pos)
-	(calendar_config_get_vpane_pos, calendar_config_set_vpane_pos)
-	(calendar_config_get_month_hpane_pos)
-	(calendar_config_set_month_hpane_pos)
-	(calendar_config_get_month_vpane_pos)
-	(calendar_config_set_month_vpane_pos)
-	(calendar_config_get_compress_weekend)
-	(calendar_config_set_compress_weekend)
-	(calendar_config_get_show_event_end)
-	(calendar_config_set_show_event_end)
-	(calendar_config_get_working_days)
-	(calendar_config_set_working_days)
-	(calendar_config_get_hide_completed_tasks)
-	(calendar_config_set_hide_completed_tasks)
-	(calendar_config_get_hide_completed_tasks_units)
-	(calendar_config_set_hide_completed_tasks_units)
-	(calendar_config_get_hide_completed_tasks_value)
-	(calendar_config_set_hide_completed_tasks_value)
-	(calendar_config_get_confirm_delete)
-	(calendar_config_set_confirm_delete)
-	(calendar_config_get_confirm_expunge)
-	(calendar_config_set_confirm_expunge)
-	(calendar_config_get_tasks_due_today_color)
-	(calendar_config_set_tasks_due_today_color)
-	(calendar_config_get_tasks_overdue_color)
-	(calendar_config_set_tasks_overdue_color)
-	(calendar_config_get_use_default_reminder)
-	(calendar_config_set_use_default_reminder)
-	(calendar_config_get_default_reminder_interval)
-	(calendar_config_set_default_reminder_interval)
-	(calendar_config_get_default_reminder_units)
-	(calendar_config_set_default_reminder_units)
-	(calendar_config_default_calendar_folder)
-	(calendar_config_default_tasks_folder): Update config paths for
-	new config convention, etc.
-
-	* gui/alarm-notify/save.c (KEY_LAST_NOTIFICATION_TIME, etc):
-	Updated keys to lowercase/proper path.
-	(save_calendars_to_load): Store the calendars list as a gconf
-	list.
-	(get_calendars_to_load): Load the calendars list as a gconf list.
-	(save_blessed_program): Similar, for the blessed program list.
-	(is_blessed_program): Same here.
-
-	* gui/alarm-notify/config-data.c (config_data_get_timezone): Update
-	the path to the timezone key.
-	(config_data_get_24_hour_format): Fix path to config option.
-
-	* conduits/todo/todo-conduit.c (get_default_timezone): lower-case
-	the timezone key.
-
-	* conduits/calendar/calendar-conduit.c (get_default_timezone):
-	lower-case the timezone key.
-
-	* cal-client/cal-client.c (get_default_uri): Use the proper path
-	to get the default folder uri's.
-
-2003-02-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/gnome-cal.c (backend_died_cb): Appease the compiler.
-	(gnome_calendar_update_paned_quanta): Don't actually try to set
-	the quantum properties. The quantum code should probably go away
-	entirely now that the panes update during resize, but let's keep
-	it around for a bit more.
-
-	* gui/dialogs/event-editor.c (event_editor_construct): Ref & sink
-	the pages.
-
-	* gui/dialogs/task-editor.c (task_editor_construct): Ref & sink
-	the pages.
-
-2003-02-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/cal-search-bar.c (make_suboptions): Eliminate
-	e_utf8_to_gtk_string ().
-
-	* gui/e-timezone-entry.c (e_timezone_entry_get_display_name):
-	Ditto.
-
-	* gui/calendar-model.c (date_value_to_string):
-	e_utf8_from_locale_string () -> g_locale_to_utf8 ().
-	(calendar_model_value_to_string): Ditto.
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text): Ditto.
-
-	* gui/e-itip-control.c (write_label_piece): Ditto.
-
-	* gui/print.c (format_date): Ditto.
-	(print_week_view_background): Ditto.
-	(print_month_summary): Ditto.
-	(print_date_label): Ditto.
-	(print_comp_item): Ditto.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading):
-	Ditto.
-
-2003-02-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/task-details-page.c (get_widgets): Show the custom
-	widgets, since libglade appears to not want to do that.
-
-	* gui/dialogs/task-page.c (clear_widgets): Make the description
-	field use a GtkTextView.
-	(task_page_fill_widgets): Ditto.
-	(task_page_fill_component): Ditto.
-	(init_widgets): Ditto.
-	(get_widgets): Show the custom widgets, since libglade doesn't do it.
-
-2003-02-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_unref_categories): Add an
-	iteration statement. Fixes hang in wombat.
-
-2003-02-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/apps_evolution_calendar.schemas: Commit fixes from
-	Grzegorz Goawski <grzegol@pld.org.pl>.
-
-2003-02-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_class_init): GObject, not
-	GtkObject.
-	(calendar_model_destroy): -> calendar_model_finalize ().
-
-	* gui/calendar-view.c (calendar_view_class_init): GObject, not
-	GtkObject.
-	(calendar_view_destroy): -> calendar_view_finalize ().
-
-	* gui/comp-editor-factory.c (comp_editor_factory_class_init):
-	GObject, not GtkObject.
-	(comp_editor_factory_destroy): -> comp_editor_factory_finalize ().
-
-	* gui/e-day-view.c (e_day_view_long_event_button_press):
-	gtk_signal_disconnect () -> g_signal_handler_disconnect ().
-	(e_day_view_on_event_button_press): Ditto.
-	(e_day_view_on_long_event_click): Ditto.
-	(e_day_view_on_event_click): Ditto.
-	(e_day_view_on_event_double_click): Ditto.
-	(e_day_view_on_delete_appointment): Ditto.
-
-	* gui/e-week-view.c (e_week_view_on_text_item_event):
-	gtk_signal_disconnect () -> g_signal_handler_disconnect ().
-
-	* gui/alarm-notify/alarm-notify.c (AlarmNotify_RemoveCalendar):
-	Don't cast to GtkObject.
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* cal-client/Makefile.am (libcal_client_la_LIBADD): depend on
-	libcal-util, libwombat, and libeutil
-	(client_test_LDADD): Remove those deps from here
-
-	* cal-util/Makefile.am (libcal_util_la_LIBADD): depend on
-	libical-evolution.la
-	(test_recur_LDADD): Remove that dependency here (and an ancient
-	libversit dependency).
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_LDADD):
-	remove some deps
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD): Likewise.
-
-2003-02-20  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/apps_evolution_calendar.schemas: Add GConf schemas.
-
-	* gui/Makefile.am (EXTRA_DIST): Dist GConf schemas.
-	(install-data-local): Install GConf schemas.
-
-2003-02-20  Dan Winship  <danw@ximian.com>
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD):
-	s/libemiscwidgets.a/libemiscwidgets.la/ and likewise for
-	libetimezonedialog
-
-2003-02-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* pcs/Makefile.am: Split $(CORBA_GENERATED_H) rule from the
-	$(CORBA_GENERATED_C) rule to that it autogens properly when using
-	parallel makes.
-	* cal-client/Makefile.am: Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus): Fix path to
-	the calendar's GAL Views directory.  [Pointed out by Grzegorz
-	Goawski.]
-
-2003-02-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	Enable printing for calendar and tasks.
-
-	* gui/print.c: Set default font to be "Sans". Store the PrintConfig
-	globally instead of PaperInfo (which doesn't exist anymore).
-	(get_font_for_size): Don't use
-	gnome_font_face_find_closest_from_weight_slant() anymore, since
-	it's broken. Instead, use gnome_font_face_find() and put bold- and
-	italicness in the name to look for. Descenders can now be negative,
-	so have to take the absolute value to get font height.
-	(print_comp): Use global, persistent print configuration.
-	GnomePrintDialog is now a GtkDialog. Remove manual configuration
-	parameter shuffling. Set up page using new methods.
-	(print_calendar): Like print_comp(). For month view, force landscape
-	mode by temporarily setting it in the config, and remove the old hack.
-	(print_setup): Port. I'm not sure this works, but at least it
-	compiles now. How do I test this code path?
-	(print_day_view): Pass NULL for page denominator.
-	(print_week_view): Ditto.
-	(print_month_view): Ditto.
-	(print_year_view): Ditto.
-	(print_comp_item): Add missing gnome_print_beginpage(). How did this
-	work before?
-
-	* gui/tasks-control.c: Store the PrintConfig globally instead of
-	passing individual parameters every time. Persistent too.
-	(print_title): Look for "Sans Bold" instead of "Times" with
-	GNOME_FONT_BOLD property. Don't use find_closest_from_weight_slant().
-	(print_tasks): Set up page using new methods. GnomePrintMaster ->
-	GnomePrintJob. Get params from global config instead of args.
-	(tasks_control_print_cmd): Use global, persistent print configuration.
-	Remove manual portrait/landscape hack. GnomePrintDialog is now a
-	GtkDialog. Set params in global config instead of passing them to
-	print_tasks().
-	(tasks_control_print_preview_cmd): print_tasks() now takes fewer
-	args.
-
-2003-02-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Don't use gtk_scrolled_window_set_scrollbar_spacing() anymore.
-
-2003-02-10  Hans Petter Jansson  <hpj@ximian.com>
-
-	* pcs/cal-backend-file.c (save): Don't try to make an error string
-	from an uninitialized GnomeVFSResult.
-
-2003-02-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/Makefile.am: Make the CORBA IDL compilation work with
-	parallel makes.
-	* gui/dialogs/Makefile.am: Likewise.
-	* gui/alarm-notify/Makefile.am: Likewise.
-
-2003-02-07  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in:
-	remove this file, as it's generated now
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	Add this file to generate the .server.in from, with hardcoded path
-	* gui/alarm-notify/Makefile.am: Hardcode path in server file
-	
-2003-02-07  Rodrigo Moya <rodrigo@ximian.com>
-	
-	Fixes #37706
-
-	* gui/comp-editor-factory.c (cal_opened_cb): added PERMISSION_DENIED
-	case for not ending process on g_assert_not_reached.
-
-2003-02-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-day-view-time-item.c
-	(e_day_view_time_item_show_popup_menu): Use
-	e_auto_kill_popup_menu_on_selection_done() instead of
-	e_auto_kill_popup_menu_on_hide().
-	* gui/dialogs/meeting-page.c (right_click_cb): Likewise.
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/event-page.c (make_timezone_entry): show the widget
-	before returning it.
-
-	* importers/main.c (main): s/PACKAGE/GETTEXT_PACKAGE/ in gettext
-	init
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* gui/Makefile.am (INCLUDES): Remove cruft. Rename ICONSDIR to
-	IMAGESDIR.
-	(gladedir, etspecdir, serverdir): Remove definitions
-	(libevolution_calendar_la_LDFLAGS): Remove -export-dynamic, add
-	-module.
-	
-	* gui/calendar-config.c: #include <string.h>
-
-	* gui/calendar-component.c (add_creatable_item):
-	s/ICONSDIR/IMAGESDIR/
-
-	* gui/comp-util.c: #include <string.h>
-
-	* gui/e-alarm-list.c: #include e-time-utils.h
-	(row_deleted): Remove unused variable.
-	(e_alarm_list_append): Likewise.
-
-	* gui/e-date-time-list.c: #include e-time-utils.h, timeutil.h,
-	calendar-config.h
-	(row_deleted): Remove unused variable
-	(e_date_time_list_append): Likewise.
-
-	* gui/e-day-view.c (e_day_view_unrealize): Remove unused var
-	(e_day_view_style_set): Likewise.
-	(e_day_view_set_event_font_cb): Likewise.
-
-	* gui/e-day-view-time-item.c: #include <string.h>
-	(e_day_view_time_item_get_column_width): Remove unused variable.
-
-	* gui/e-itip-control.c: #include <unistd.h>
-	(url_requested_cb): s/ICONSDIR/IMAGESDIR/
-
-	* gui/e-week-view.c (e_week_view_unrealize): Remove unused variable
-	(e_week_view_style_set): Likewise
-
-	* gui/e-week-view-titles-item.c: #include string.h
-	* gui/itip-bonobo-control.c: Likewise
-	* gui/print.c: Likewise
-
-
-	* gui/alarm-notify/Makefile.am: Use privlibexecdir.
-	(INCLUDES): Remove cruft.
-	(gladedir, serversdir): Remove definitions
-	(evolution_alarm_notify_LDFLAGS): Remove no-longer-needed
-	-export-dynamic.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading):
-	s/ICONSDIR/IMAGESDIR
-
-	* gui/alarm-notify/notify-main.c (main): Fix up gettext
-	initialization
-
-
-	* gui/dialogs/Makefile.am (INCLUDES): Remove cruft. Rename
-	ICONSDIR to IMAGESDIR.
-	(gladedir, etspecdir): Remove definitions
-
-	* gui/dialogs/alarm-page.c: #include gtktreeselection.h and
-	gtkcellrenderertext.h
-	(append_reminder): Remove unused variable.
-	(alarm_page_fill_component): Likewise.
-	(alarm_page_set_summary): Likewise.
-	(delete_clicked_cb): Likewise.
-
-	* gui/dialogs/comp-editor.c (make_icon_from_comp):
-	s/ICONSDIR/IMAGESDIR/
-
-	* gui/dialogs/event-page.c: #include <string.h>
-
-	* gui/dialogs/meeting-page.c (meeting_page_construct): Remove
-	unused variable.
-	(meeting_page_fill_widgets): Likewise
-
-	* gui/dialogs/recurrence-page.c: #include gtktreeselection.h and
-	gtkcellrenderertext.h
-	(append_exception): Remove unused variable
-	(fill_component): Likewise
-	(recurrence_page_set_summary): Likewise.
-	(exception_delete_cb): Likewise
-
-
-	* cal-client/Makefile.am (libcal_clientincludedir): Define in
-	terms of privincludedir
-
-	* cal-client/client-test.c (main): Fix up gettext initialization
-
-	* cal-client/cal-client.c (cal_client_construct): Likewise
-
-
-	* cal-util/Makefile.am (INCLUDES): Remove cruft.
-	(libcal_utilincludedir): Define in terms of privincludedir
-
-
-	* pcs/Makefile.am (INCLUDES): Remove cruft.
-	(pcsincludedir): Define in terms of privincludedir
-
-	* pcs/cal-backend-file.c (cal_backend_file_finalize): Remove
-	unused variable
-
-
-	* importers/Makefile.am: Update this some although it's not
-	currently being built
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (main):
-	s/glade_gnome_init/glade_init/
-
-	* gui/calendar-offline-handler.c: s/BonoboXObject/BonoboObject/
-
-	* gui/comp-editor-factory.c: Likewise
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* cal-util/cal-recur.c (cal_recur_nth): array of localized month
-	day names ("1st" - "31st")
-
-	* gui/dialogs/recurrence-page.c (make_recur_month_num_submenu,
-	make_recur_month_num_menu, month_num_menu_selection_done_cb): Use
-	the new cal_recur_nth[] array. The way this was done before didn't
-	localize properly.
-
-	From evolution-1-2-branch:
-
-	* gui/e-itip-control.c (write_recurrence_piece): Describe
-	recurrences, if we can. #30993
-	(set_date_label): If the meeting has recurrences, call
-	write_recurrence_piece after writing the start and end dates.
-	(write_label_piece): Wrap the timezone in <font size=-1> to
-	de-emphasize it a bit and try to keep the timestamp on a single
-	line even with big Outlook timezone names. Add an option to show
-	just the date, for describing the end of recurrences (since the
-	time in the UNTIL is the *beginning* of the last instance, which
-	would confuse people).
-	(update_item): Set the VCALENDAR's METHOD.
-	(ok_clicked_cb): Use update_item, not remove_item, to process a
-	cancelation. Part of #33875.
-
-	* pcs/cal-backend-file.c (cal_backend_file_cancel_object): New,
-	handle an ICAL_METHOD_CANCEL update.
-	(cal_backend_file_update_objects): Call
-	cal_backend_file_update_object or cal_backend_file_cancel_object
-	as appropriate.
-
-2003-02-04  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_invite_others_button_draw):
-	Rename to e_meeting_time_selector_on_invite_others_button_expose()
-	and handle "expose-event" instead of "draw".
-	(e_meeting_time_selector_construct): The "draw" signal doesn't exist
-	anymore - connect to "expose-event" instead.
-
-	* gui/dialogs/event-page.c (clear_widgets): Clear the GtkTextBuffer
-	for the description.
-	(event_page_fill_widgets): Use the GtkTextBuffer.
-	(event_page_fill_component): Use the GtkTextBuffer.
-	(init_widgets): Create a GtkTextBuffer for the GtkTextView. Set word
-	wrap. Connect to the "changed" signal of the model instead of the view.
-
-2003-02-04  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_paint_day_top): Use PangoLayout to
-	draw text.
-
-2003-02-02  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_set_event_font_cb): Skip setting the
-	"font_gdk" arg for now.
-	(e_day_view_update_main_canvas_drag): Ditto.
-
-	* gui/e-week-view.c (e_week_view_style_set): Ditto.
-
-	* gui/weekday-picker.c (configure_items): Ditto.
-
-	* gui/dialogs/event-page.c (get_widgets): Show custom widgets
-	manually, since the visibility specified in the Glade XML appears
-	to not have any effect.
-
-	* gui/dialogs/recurrence-page.c (get_widgets): Ditto.
-
-2003-01-30 Ronald Kuetemeier <ronald@kuetemeier.com>
-
-	Fixes #35572
-
-	* gui/alarm-notify/alarm-queue.c: set saved_notification_time to last
-	notification time when we update the config to last notification, so
-	alarms will not get trigged again if a new calendar window is opened.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* conduits/todo/todo-conduit.c: CalClient and CalComponent are
-	GObjects.
-
-	* conduits/calendar/calendar-conduit.c: same.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-	fix warning.
-	(get_default_timezone): BonoboConfigDatabase -> e_config_listener.
-	(accept_all_cookies): remove.
-	(conduit_get_gpilot_conduit): remove the oaf initialization stuff.
-
-	* conduits/todo/todo-conduit.c (start_calendar_server):
-	fix warning.
-	(get_default_timezone): BonoboConfigDatabase -> e_config_listener.
-	(accept_all_cookies): remove.
-	(conduit_get_gpilot_conduit): remove the oaf initialization stuff.
-
-	* Makefile.am (CONDUIT_DIR): uncomment the conduit stuff.
-
-2003-01-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	Make clicks, drags and resizes work, and pangoize remaining strings.
-	Fix EText placement.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	Use Pango.
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_press):
-	Don't add scroll offset, it's already factored in.
-	(e_day_view_on_main_canvas_button_press): Ditto.
-	(e_day_view_on_top_canvas_motion): Ditto.
-	(e_day_view_on_main_canvas_motion): Ditto.
-	(e_day_view_reshape_long_event): Don't set the "font_gdk" property.
-	Its non-existence will prevent the other properties from being set as
-	well.
-	(e_day_view_reshape_day_event): Ditto.
-	(e_day_view_update_top_canvas_drag): Ditto.
-	(e_day_view_start_editing_event): ETextEventProcessor is a GObject
-	now. So use g_signal_stuff.
-	(e_day_view_check_auto_scroll): Factor out scroll offset before
-	checking the pointer's position relative to widget.
-	(e_day_view_auto_scroll_handler): Don't freeze the canvas when
-	scrolling - it will fail to update the canvas. If this is not
-	intended behaviour, it's a bug in the canvas, I think.
-	(e_day_view_on_main_canvas_drag_motion): Factor in the scroll offset
-	before checking for auto-scroll, since the function requires this.
-
-	* gui/e-week-view.c (e_week_view_reshape_event_span): Don't set the
-	"font_gdk" property. Its non-existence will prevent the other
-	properties from being set as well.
-	(e_week_view_start_editing_event): ETextEventProcessor is a GObject
-	now. So use g_signal_stuff.
-
-2003-01-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	Mainly making all views use PangoLayouts for text. When drawing a
-	PangoLayout, the draw offset is the top left corner of the layout,
-	not the text's baseline. Keep this in mind when viewing the
-	changes. I'll be brief about the exact changes, since they speak
-	better for themselves.
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_get_column_width):
-	Use Pango.
-	(e_day_view_time_item_draw): Use Pango.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): Use Pango.
-	(e_day_view_top_item_draw_long_event): Add some FIXME text so we can
-	see when this is being used. Is it in use at all?
-
-	* gui/e-day-view.c: No longer specify an explicit X font string for
-	the large font. Use the main font, and change the point size.
-	(e_day_view_init): Use Pango.
-	(e_day_view_style_set): Use Pango. Comment out the gdk_font setting
-	for the drag text items for now.
-
-	* gui/e-day-view.h: Use Pango.
-
-	* gui/e-week-view-event-item.c (e_week_view_draw_time): Use Pango.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	Use Pango.
-
-	* gui/e-week-view-titles-item.c (e_week_view_titles_item_draw):
-	Use Pango.
-
-	* gui/e-week-view.c: No longer specify an explicit X font string for
-	the small font. Use the main font, and change the point size.
-	(e_week_view_init): Use Pango.
-	(e_week_view_destroy): Use Pango.
-	(get_string_width): Implemented for convenience.
-	(get_digit_width): Implemented for convenience.
-	(e_week_view_style_set): Use Pango.
-	(e_week_view_recalc_cell_sizes): Use Pango.
-	(e_week_view_get_time_string_width): Use Pango.
-
-	* gui/e-week-view.h: Use Pango.
-
-	Following are some random UTF-8 fixes and a crash fix.
-
-	* gui/itip-utils.c (comp_description): Use g_locale_to_utf8 ().
-
-	* gui/dialogs/comp-editor.c (make_title_from_comp): Return a
-	UTF-8 string.
-
-	* gui/dialogs/alarm-page.c (alarm_page_set_summary): Pass UTF-8
-	directly to GTK.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Ditto.
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): Ditto.
-	(meeting_page_construct): Ditto.
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_summary): Ditto.
-
-	* gui/dialogs/event-editor.c (event_editor_finalize): Fix crash caused
-	by gtk_object_destroy()-ing a non-GtkObject.
-
-2003-01-24  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): Don't insist
-	appointment is updated if both old and new summary are blank.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Ditto.
-
-	* gui/e-timezone-entry.c (on_button_clicked): Timezone dialog is now
-	a GtkDialog. Treat it as such.
-
-	* gui/goto.c (ecal_event): Goto dialog is now a GtkDialog. Treat it
-	as such.
-	(goto_dialog): Ditto.
-
-	* gui/goto-dialog.glade: Set the return IDs from the dialog buttons.
-
-	* gui/dialogs/meeting-page.c (popup_delegate_cb): Enable the delegate
-	dialog. It's now a GtkDialog, so treat it like one.
-	(right_click_cb): Use GTK stock item, not GNOME (that doesn't work
-	anymore).
-
-	* gui/e-delegate-dialog.glade: Set the return IDs from dialog buttons.
-
-	* gui/print.c (print_calendar): Correct the print dialog init. Code
-	is still not enabled, though.
-
-	* gui/tasks-control.c (print_tasks): Add a warning about printing
-	being disabled.
-
-2003-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am (iconsdir): Remove, this is now defined
-	in configure.in.
-
-	* gui/Makefile.am (iconsdir): Remove; this is now defined in
-	configure.in.
-
-	* gui/alarm-notify/Makefile.am (iconsdir): Remove; this is now
-	defined in configure.in.
-
-2003-01-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/event-page.c (get_widgets): GTK_OBJECT -> G_OBJECT cast.
-	
-	* gui/dialogs/alarm-page.c (get_widgets): Ditto.
-
-	* gui/dialogs/meeting-page.c (get_widgets): Ditto.
-
-	* gui/dialogs/recurrence-page.c (get_widgets): Ditto.
-
-	* gui/dialogs/schedule-page.c (get_widget): Ditto.
-
-	* gui/dialogs/task-details-page.c (get_widget): Ditto.
-
-	* gui/dialogs/task-page.c (get_widget): Ditto.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct): Add a
-	FIXME comment to think about.
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): Add a terminating
-	NULL to the concatenation.
-
-2003-01-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes some trivial, but distracting, warnings.
-
-	* gui/calendar-config.c (on_timezone_set): Fix constness.
-
-	* gui/e-timezone-entry.c (on_button_clicked): Fix constness.
-
-	* gui/dialogs/event-page.c (contacts_changed_cb): Fix constness.
-
-	* gui/dialogs/task-page.c (contacts_changed_cb): Fix constness.
-
-	* gui/e-itip-control.c (start_default_server): Cast callback with
-	G_CALLBACK ().
-
-	* gui/dialogs/schedule-page.c (init_widgets): Cast callback with
-	G_CALLBACK ().
-
-	* gui/calendar-offline-handler.c (impl_dispose): Takes GObject,
-	not GtkObject.
-	(impl_finalize): Ditto.
-
-	* gui/calendar-view.c (calendar_view_edit): Now takes parent window
-	as second arg.
-
-	* gui/e-meeting-model.c (select_names_ok_cb): Fix constness.
-	(get_select_name_dialog): Cast callback to BonoboListenerCallbackFn.
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_options_menu_position_callback): Add the
-	push_in arg to arg list. This was crash-prone before.
-	(e_meeting_time_selector_autopick_menu_position_callback): Ditto.
-
-	* gui/alarm-notify/alarm-notify-dialog.c: Include e-unicode.h.
-
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/Makefile.am (componentdir): Removed definition; this is now
-	defined in configure.in.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_ref_categories): Do not put the
-	category in both the changed_categories and the categories hashes;
-	fixes a double-free when finalizing the CalBackend.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus): Use
-	EVOLUTION_GALVIEWSDIR.
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus): Use
-	EVOLUTION_GALVIEWSDIR.
-
-	* cal-util/Makefile.am: Install libcal-util.la in $(privlibdir)
-	instead of $(libdir).
-
-	* gui/dialogs/comp-editor.c (setup_widgets): Get
-	evolution-comp-editor.xml from EVOLUTION_UIDIR.
-	(comp_editor_merge_ui): Get the file in EVOLUTION_UIDIR.
-
-	* gui/tasks-control.c (tasks_control_activate): Get
-	evolution-tasks.xml from EVOLUTION_UI_DIRECTORY.
-
-	* gui/calendar-commands.c (calendar_control_activate): Get
-	evolution-calendar.xml from EVOLUTION_UI_DIRECTORY.
-
-	* pcs/Makefile.am (pcsincludedir): Version using $(BASE_VERSION).
-
-	* importers/Makefile.am: Install evolution-calendar-importer in
-	$(libexecdir)/evolution/$(BASE_VERSION).
-	(sounddir): Remove.
-
-	* gui/dialogs/Makefile.am (iconsdir): Version using
-	$(BASE_VERSION).
-	(gladedir): Likewise.
-	(etspecdir): Likewise.
-
-	* gui/Makefile.am (help_base): Remove.
-	(install-data-local): Do not make the $(help_base)/C directory.
-	(etspecdir): Version using $(BASE_VERSION).
-	(gladedir): Likewise.
-	(iconsdir): Likewise.
-	(INCLUDES): Update the EVOLUTION_IMAGESDIR define to be versioned,
-	and add a -DEVOLUTION_GALVIEWSDIR.
-
-	* cal-util/Makefile.am: Install evolution-alarm-notify in
-	$(libexecdir)/evolution/$(BASE_VERSION).
-
-	* cal-util/Makefile.am (libcal_utilincludedir): Version using
-	$(BASE_VERSION).
-	* gui/alarm-notify/Makefile.am (iconsdir): Likewise.
-	(gladedir): Likewise.
-
-	* cal-client/Makefile.am: Install libcal-client.la in privlibdir
-	instead of libdir.
-	(libcal_clientincludedir): Version using $(BASE_VERSION).
-
-2003-01-18  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/print.c (print_calendar): Create a GnomePrintDialog,
-	not a GnomePrinterDialog. They're different things. Patch from
-	Chema.
-
-2003-01-17  Dan Winship  <danw@ximian.com>
-
-	* pcs/cal-backend.c: Move some non-file-backend-specific stuff
-	from cal-backend-file here so it can be shared with other
-	backends.
-	(CalBackendPrivate): add this, containing the categories hashes
-	and the (formerly public) clients list.
-	(cal_backend_init, cal_backend_finalize): Handle backend->priv.
-	(cal_destroy_cb): Simplify this (and redo it as a weak notify
-	func)
-	(cal_backend_add_cal): Keep a weak ref on the cal rather than
-	connecting to its "destroy" signal. Call notify_categories_changed
-	to let the new cal know about them.
-	(get_object): Default implementation of cal_backend_get_object.
-	that calls cal_component_get_as_string on the return value of
-	cal_backend_get_object_component.
-	(cal_backend_notify_mode, cal_backend_notify_update,
-	cal_backend_notify_remove, cal_backend_notify_error): Notify each
-	Cal about something.
-	(cal_backend_ref_categories, cal_backend_unref_categories):
-	Maintain a list of categories that are used by components in the
-	backend, and trigger categories_changed notifications as needed.
-
-	* pcs/cal-backend-file.c: Remove stuff that was moved to
-	CalBackend (notify funcs, category handling, get_object
-	implementation)
-
-2003-01-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-alarm-list.[ch]: Implement EAlarmList as CalComponentAlarm
-	list with a GtkTreeModel interface.
-
-	* gui/Makefile.am: Add e-alarm-list.[ch].
-
-	* gui/dialogs/alarm-page.[ch]: Use GtkTreeView with the new
-	EAlarmList as model for the alarm list. Update copyright.
-
-	* gui/dialogs/recurrence-page.[ch]: Update copyright.
-	(free_exception_date_time): Removed.
-	(fill_exception_widgets): Kill a lingering clist operation.
-
-2003-01-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Create accel groups for popup menus. Fixes crash.
-
-	* gui/e-date-time-list.[ch]: Implement EDateTimeList as
-	CalComponentDateTime list with a GtkTreeModel interface.
-
-	* gui/Makefile.am: Add e-date-time-list.[ch]. 
-
-	* gui/dialogs/recurrence-page.c: Use GtkTreeView with the new
-	EDateTimeList as model for the exception list.
-
-	* gui/e-day-view.c: Silence warnings caused by missing casts.
-
-	* gui/e-week-view.c: Silence warnings caused by missing casts.
-
-2003-01-15  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/Makefile.am: Added libevolution_calendar_la_LDFLAGS, and
-	avoid versioning the shlib component
-	
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* cal-client/Makefile.am (CORBA_SOURCES_GENERATED): Renamed from
-	CORBA_GENERATED.
-	(CORBA_GENERATED): New, put both $(CORBA_SOURCES_GENERATED) and
-	$(CORBA_HEADERS_GENERATED) in it.
-	(BUILT_SOURCES): Put $(CORBA_GENERATED) in here.
-
-2003-01-14  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-calendar-table.c (tasks_popup_menu): Cast signal handlers
-	to GtkSignalFunc, avoid warnings.
-
-	* gui/gnome-cal.c (set_view): Only set view ID if we have an instance.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* cal-util/Makefile.am (EXTRA_DIST): cal-util-marshal.list.
-
-	* Makefile.am: Comment out the CONDUIT_DIR stuff for now.
-
-2003-01-14  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/gnome-cal.c: Use GtkPaned instead of EPaned
-	
-2003-01-14  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_init): Work around canvas crashes
-	by ensuring rectangles have an initial width.
-
-2003-01-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/config-control-factory.h: Removed.
-	* gui/config-control-factory.c: Removed.
-
-	* gui/itip-bonobo-control.c: Renamed from itip-control-factory.c.
-	(itip_bonobo_control_new): New.
-	(itip_control_factory_init): Removed.
-
-	* gui/itip-bonobo-control.h: Renamed from itip-control-factory.h.
-
-	* gui/tasks-control-factory.c: Removed.
-	* gui/tasks-control-factory.h: Removed.
-
-	* gui/control-factory.c (control_factory_init): Removed.
-
-	* gui/Makefile.am: Updated to build everything as
-	libevolution-calendar.so and install in the COMPONENTDIR.
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Updated to build the
-	component as a shared library.
-
-	* gui/main.c (main): Removed.
-
-	* gui/calendar-component.c (calendar_component_get_object): New.
-	(owner_set_cb): Do not store the shell pointer in shells.
-	(owner_unset_cb): Do not remove the shell pointer from shells;
-	instead, just set global_shell_client to NULL.
-
-	* gui/calendar-component.h: Renamed from component-factory.h.
-	* gui/calendar-component.c: Renamed from component-factory.c.
-
-2003-01-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/icalendar-importer.c (connect_to_shell):
-	CORBA_Object_release() the CORBA shell.
-
-2003-01-09  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (make_recur_month_num_submenu,
-	make_recur_month_num_menu, month_num_menu_selection_done_cb): Use
-	the new cal_recur_nth[] array. The way this was done before didn't
-	localize properly.
-
-	* cal-util/cal-recur.c (cal_recur_nth): array of localized month
-	day names ("1st" - "31st")
-
-	* cal-util/cal-component.c (cal_component_set_recurid): Allow
-	recur_id to be NULL to clear the recurrence id. (Based on a story
-	by JP on evolution-1-2-recurid-branch)
-
-	* gui/print.c: Remove unused gnome-print-copies.h #include
-
-	* pcs/query.c (query_new): Use g_object_weak_ref rather than
-	connecting to "destroy" (which doesn't actually exist on a
-	CalBackend)
-	(backend_destroyed_cb): Update prototype.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/alarm-notify/Makefile.am: Icons are now in
-	$(datadir)/evolution/images instead of
-	$(datadir)/images/evolution.
-	* gui/Makefile.am: Likewise.
-	* gui/dialogs/Makefile.am: Likewise.
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* idl/Makefile.am: remove idldir definition. (It's defined in
-	configure.in now)
-
-2002-12-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_deactivate):
-	Replace gtk_signal_disconnect_by_data() with
-	g_signal_handlers_disconnect_matched(). Former takes GtkObject,
-	latter takes GObject.
-
-	* gui/calendar-model.c (calendar_model_destroy): Ditto.
-	(update_query): Ditto.
-	(calendar_model_set_cal_client): Ditto.
-
-	* gui/e-day-view.c (e_day_view_destroy): Ditto.
-	(update_query): Ditto.
-	(e_day_view_set_cal_client): Ditto.
-
-	* gui/e-tasks.c (query_eval_error_cb): Ditto.
-	(query_query_done_cb): Ditto.
-
-	* gui/e-week-view.c (e_week_view_destroy): Ditto.
-	(update_query): Ditto.
-	(e_week_view_set_cal_client): Ditto.
-
-	* gui/gnome-cal.c (update_query): Ditto.
-	(gnome_calendar_destroy): Ditto.
-
-	* gui/tasks-control.c (tasks_control_deactivate): Ditto.
-
-	* gui/e-comp-editor-registry.c (foreach_close_cb): Replace
-	gtk_signal_handler_(un)block_by_data() with
-	g_signal_handlers_(un)block_matched(). Former takes GtkObject, latter
-	takes GObject.
-
-	* gui/dialogs/alarm-page.c (alarm_page_get_type): Replace with
-	E_MAKE_TYPE().
-	(alarm_page_class_init): Use GObject as base class instead of
-	GtkObject, and set up finalization instead of destroy handler.
-	(alarm_page_destroy): Change to alarm_page_finalize() and assume
-	parent is GObject, not GtkObject.
-	(alarm_page_new): Use g_object_new(), not gtk_type_new().
-
-	* gui/dialogs/event-page.c: Same general changes as above file.
-	(update_time): Replace gtk_signal_handler_(un)block_by_data()
-	with g_signal_handlers_(un)block_matched().
-	(clear_widgets): Ditto.
-	(times_updated): Ditto.
-
-	* gui/dialogs/recurrence-page.c: Same general changes as above file.
-	(clear_widgets): Replace gtk_signal_handler_(un)block_by_data()
-	with g_signal_handlers_(un)block_matched().
-	(append_exception): Ditto.
-	(fill_ending_date): Ditto.
-	(recurrence_page_fill_widgets): Ditto.
-
-	* gui/dialogs/comp-editor.c: Same general changes as above file.
-	(comp_editor_finalize): Replace gtk_signal_disconnect_by_data()
-	with g_signal_handlers_disconnect_matched().
-	(comp_editor_remove_page): Ditto.
-
-	* gui/dialogs/event-editor.c: Same general changes as above file.
-	* gui/dialogs/meeting-page.c: Same general changes as above file.
-	* gui/dialogs/schedule-page.c: Same general changes as above file.
-	* gui/dialogs/task-details-page.c: Same general changes.
-	* gui/dialogs/task-editor.c: Same general changes as above file.
-	* gui/dialogs/task-page.c: Same general changes as above file.
-	* gui/dialogs/e-delegate-dialog.c: Same general changes.
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/e-itip-control.c (write_html): Use camel_text_to_html()
-	instead.
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/e-itip-control.c (write_html): Correctly convert text.value
-	into HTML here (ie, don't pass "<i>None</i>" into e_text_to_html()
-	if text.value is NULL).
-
-2002-12-06  Rodrigo Moya <rodrigo@ximian.com>
-                                                                                                
-        Fixes #35003
-
-	* gui/misc.[ch] (get_uri_without_password): new function for
-	removing the password from the CalClient's uris.
-
-	* gui/gnome-cal.c (client_cal_opened_cb): use the URI returned by
-	get_uri_without_password for messages.
-	(backend_error_cb): likewise.
-	(backend_died_cb): likewise.
-	(gnome_calendar_open): likewise.
-	(open_error, method_error, permission_error): likewise.
-
-	* gui/e-tasks.c (e_tasks_open): hide the password from the URI
-	being displayed in messages.
-	(backend_error_cb): likewise.
-
-2002-12-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-client/cal-query.c (cal_query_done_status_enum_get_type):
-	Implement GType for this enumeration.
-	(cal_query_class_init): Use the enumeration instead of the
-	abstract one.
-
-	* cal-client/cal-query.h: Add type macro and proto for enum.
-
-2002-12-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component-factory.c (create_view): Pass the env argument to
-	bonobo_control_set_property ().
-
-	* gui/e-meeting-model.c (class_init): We're no longer derived from
-	GtkObject, so use GObject class methods instead. destroy->finalize.
-	(destroy): Zapped.
-	(finalize): Implement based on old destroy ().
-
-2002-12-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_open_status_enum_get_type):
-	Create a non-abstract enumeration type derived from GEnum.
-	(cal_client_set_mode_status_enum_get_type): Ditto.
-	(cal_mode_enum_get_type): Ditto.
-	(cal_client_class_init): Use our enumerations and not the abstract
-	one.
-	(cal_client_finalize): Don't destroy factories, since the CalClient
-	doesn't own them anymore. They're shared between CalClients now.
-	(get_factories): Implement. Move the factory setup code here from
-	cal_client_construct (), and cache the factories. This is hopefully
-	temporary, until wombat goes away or is fixed.
-	(cal_client_construct): Most of the code moved to get_factories ().
-
-	* cal-client/cal-client.h: Add enumeration type macros and protos.
-
-	* gui/cal-search-bar.c (cal_search_bar_get_type): Removed in favour
-	of E_MAKE_TYPE, which uses GObject calls.
-	(cal_search_bar_class_init): Use g_type_class_peek_parent ().
-
-	* gui/calendar-model.c (calendar_model_get_type):
-	(calendar_model_class_init): Ditto, like above file.
-	* gui/calendar-view.c (calendar_view_get_type):
-	(calendar_view_class_init): Ditto.
-	* gui/e-calendar-table.c (e_calendar_table_get_type):
-	(e_calendar_table_class_init): Ditto.
-	* gui/e-comp-editor-registry.c (e_comp_editor_registry_get_type):
-	(class_init): Ditto.
-	* gui/e-day-view-main-item.c (e_day_view_main_item_get_type):
-	(e_day_view_main_item_class_init): Ditto.
-	* gui/e-day-view-time-item.c (e_day_view_time_item_get_type):
-	(e_day_view_time_item_class_init): Ditto.
-	* gui/e-day-view-top-item.c (e_day_view_top_item_get_type):
-	(e_day_view_top_item_class_init): Ditto.
-	* gui/e-day-view.c (e_day_view_get_type):
-	(e_day_view_class_init): Ditto.
-	* gui/e-itip-control.c (e_itip_control_get_type):
-	(class_init): Ditto.
-	* gui/e-meeting-attendee.c (e_meeting_attendee_get_type):
-	(class_init): Ditto.
-	* gui/e-meeting-model.c (e_meeting_model_get_type):
-	(class_init): Ditto.
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_get_type):
-	(e_meeting_time_selector_item_class_init): Ditto.
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_get_type):
-	(e_meeting_time_selector_class_init): Ditto.
-	* gui/e-timezone-entry.c (e_timezone_entry_get_type):
-	(e_timezone_entry_class_init): Ditto.
-	* gui/e-week-view-event-item.c (e_week_view_event_item_get_type):
-	(e_week_view_event_item_class_init): Ditto.
-	* gui/e-week-view-main-item.c (e_week_view_main_item_get_type):
-	(e_week_view_main_item_class_init): Ditto.
-	* gui/e-week-view-titles-item.c (e_week_view_titles_item_get_type):
-	(e_week_view_titles_item_class_init): Ditto.
-	* gui/gnome-cal.c (gnome_calendar_get_type):
-	(gnome_calendar_class_init): Ditto.
-	* gui/weekday-picker.c (weekday_picker_get_type):
-	(weekday_picker_class_init): Ditto.
-
-	* gui/e-week-view.c (e_week_view_get_type):
-	(e_week_view_class_init): Ditto, but parent_class init was moved
-	from get_type() to class_init().
-
-	* gui/calendar-view-factory.c (calendar_view_factory_get_type):
-	(calendar_view_factory_class_init): Ditto, and set up finalize
-	callback instead of destroy.
-	(calendar_view_factory_finalize): It's a GObject, so implement this.
-	(celendar_view_factory_destroy): Move code to _finalize() and remove.
-
-	* gui/main.c (init_bonobo): Remove extraneous bonobo_activation_init().
-
-2002-11-27  Not Zed  <NotZed@Ximian.com>
-
-	* gui/itip-utils.[ch]: run fix.sh over this.
-
-	* gui/dialogs/*.[ch]: run fix.sh over all of this.
-
-2002-11-26  Richard Li <Richard.Li@Sun.COM>
-
-	* cal-client/cal-client.c (cal_client_construct): removed extra call
-	to CORBA_exception_init.
-
-2002-11-22  Not Zed  <NotZed@Ximian.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Changed
-	e_messagebox -> gtk_messagedialog.
-
-2002-11-21  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component-factory.c (create_view): pass type to
-	bonobo_control_set_property.
-
-2002-11-20  Not Zed  <NotZed@Ximian.com>
-
-	* gui/Makefile.am (EXTRA_DIST): fix typo, servers_in_files ->
-	server_in_files.
-
-2002-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Added rule to generate
-	GNOME_Evolution_Calendar.server.in from
-	GNOME_Evolution_Calendar.server.in.in, substituting @LIBEXECDIR@.
-	Also, install evolution-calendar in $libexecdir instead of
-	$bindir.
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Renamed from
-	GNOME_Evolution_Calendar.server.in.  Prepended the executable name
-	with @LIBEXECDIR@.
-
-2002-11-19  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-meeting-model.c (get_select_name_dialog): pass type to
-	bonobo_widget::set_property.
-	(select_names_ok_cb): ", for get_property.
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	pass type to bonobo_widget::set_property & plug small leak.
-	(e_delegate_dialog_get_delegate): ", for get_property.
-	(e_delegate_dialog_get_delegate_name): "
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_widget):
-	pass type to bonobo_widget::set_property.
-	(comp_editor_contacts_to_component): ", for get_property
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
-	use new e_table_header_compute_height signature.
-
-2002-11-15  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component-factory.c: Use bonobo_main_quit instead of gtk
-	
-2002-11-13  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-client/cal-query.c: #include <string.h>
-	(obj_removed_cb): Fixed prototype.
-
-	* cal-client/cal-client.c (get_objects_atomically): Fix use of
-	g_signal_handler_disconnect().
-
-	* cal-client/client-test.c (create_client): Add G_CALLBACK casts.
-
-2002-11-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-backend-util.c: #include <string.h>
-
-	* pcs/cal.c: Fixed prototypes of the CORBA method implementations.
-
-	* pcs/cal-backend-file.c (cal_backend_file_dispose): Added a
-	dispose method.
-	(cal_backend_file_get_free_busy): Converted to use EConfigListener
-	rather than BonoboConfigDatabase.
-
-	* gui/alarm-notify/alarm-notify.c: #include <string.h>, fix use of
-	g_hash_table_lookup_extended().
-
-	* gui/alarm-notify/alarm-notify-dialog.c: Substitute deprecated
-	GTK+ functions for new ones.
-
-	* gui/alarm-notify/alarm-queue.c: Likewise.
-
-	* gui/alarm-notify/notify-main.c: #include <string.h>,
-	<gtk/gtkmain.h>.
-
-	* gui/alarm-notify/save.c: #include <string.h>.
-
-2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_deactivate): Use
-	g_object_set_data(..., NULL) instead of gtk_object_remove_data().
-
-	* gui/calendar-commands.c: Use g_object_{set,get}_* functions
-	instead of gtk_object_{set,get}_*.
-	* gui/calendar-commands.c: Likewise.
-	* gui/calendar-config.c: Likewise.
-	* gui/control-factory.c: Likewise.
-	* gui/e-calendar-table.c: Likewise.
-	* gui/e-comp-editor-registry.c: Likewise.
-	* gui/e-day-view-main-item.c: Likewise.
-	* gui/e-day-view-time-item.c: Likewise.
-	* gui/e-day-view-top-item.c: Likewise.
-	* gui/e-day-view.c: Likewise.
-	* gui/e-meeting-attendee.c: Likewise.
-	* gui/e-meeting-model.c: Likewise.
-	* gui/e-meeting-time-sel-item.c: Likewise.
-	* gui/e-meeting-time-sel.c: Likewise.
-	* gui/e-week-view-event-item.c: Likewise.
-	* gui/e-week-view-layout.c: Likewise.
-	* gui/e-week-view-main-item.c: Likewise.
-	* gui/e-week-view-titles-item.c: Likewise.
-	* gui/e-week-view.c: Likewise.
-	* gui/gnome-cal.c: Likewise.
-	* gui/print.c: Likewise.
-
-2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-commands.c: Use g_object_ref()/g_object_unref()
-	instead of gtk_object_ref/gtk_object_unref().
-	* gui/calendar-config.c: Likewise.
-	* gui/calendar-model.c: Likewise.
-	* gui/comp-editor-factory.c: Likewise.
-	* gui/comp-util.c: Likewise.
-	* gui/e-calendar-table.c: Likewise.
-	* gui/e-day-view.c: Likewise.
-	* gui/e-itip-control.c: Likewise.
-	* gui/e-meeting-model.c: Likewise.
-	* gui/e-meeting-time-sel.c: Likewise.
-	* gui/e-tasks.c: Likewise.
-	* gui/e-timezone-entry.c: Likewise.
-	* gui/e-week-view.c: Likewise.
-	* gui/gnome-cal.c: Likewise.
-	* gui/goto.c: Likewise.
-	* gui/itip-utils.c: Likewise.
-	* gui/print.c: Likewise.
-	* gui/tasks-control.c: Likewise.
-	* gui/tasks-migrate.c: Likewise.
-
-	* gui/cal-search-bar.c: Use g_object_new() instead of
-	gtk_type_new().
-	* gui/calendar-model.c: Likewise.
-	* gui/calendar-view-factory.c: Likewise.
-	* gui/calendar-view.c: Likewise.
-	* gui/calendar-view.c: Likewise.
-	* gui/comp-editor-factory.c: Likewise.
-	* gui/e-calendar-table.c: Likewise.
-	* gui/e-cell-date-edit-text.c: Likewise.
-	* gui/e-comp-editor-registry.c: Likewise.
-	* gui/e-day-view.c: Likewise.
-	* gui/e-itip-control.c: Likewise.
-	* gui/e-meeting-attendee.c: Likewise.
-	* gui/e-meeting-attendee.c: Likewise.
-	* gui/e-meeting-model.c: Likewise.
-	* gui/e-meeting-time-sel.c: Likewise.
-	* gui/e-tasks.c: Likewise.
-	* gui/e-timezone-entry.c: Likewise.
-	* gui/e-week-view.c: Likewise.
-	* gui/gnome-cal.c: Likewise.
-	* gui/weekday-picker.c: Likewise.
-
-	* gui/e-itip-control.c (get_servers): g_object_unref the
-	shell_client instead of using bonobo_object_unref().
-
-	* gui/component-factory.c (owner_set_cb): Use
-	evolution_shell_client_corba_objref() instead of
-	bonobo_object_corba_objref().
-
-2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-commands.c: Use g_signal_connect() instead of
-	gtk_signal_connect().
-	* calendar-commands.c: Likewise.
-	* calendar-config.c: Likewise.
-	* calendar-model.c: Likewise.
-	* comp-editor-factory.c: Likewise.
-	* component-factory.c: Likewise.
-	* control-factory.c: Likewise.
-	* e-calendar-table.c: Likewise.
-	* e-comp-editor-registry.c: Likewise.
-	* e-day-view-time-item.c: Likewise.
-	* e-day-view.c: Likewise.
-	* e-itip-control.c: Likewise.
-	* e-meeting-model.c: Likewise.
-	* e-meeting-time-sel.c: Likewise.
-	* e-tasks.c: Likewise.
-	* e-timezone-entry.c: Likewise.
-	* e-week-view.c: Likewise.
-	* gnome-cal.c: Likewise.
-	* goto.c: Likewise.
-	* tasks-control.c: Likewise.
-	* tasks-migrate.c: Likewise.
-	* weekday-picker.c: Likewise.
-
-2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-offline-handler.c
-	(calendar_offline_handler_class_init): GObjectified.
-	(impl_finalize): Finalize impl.
-	(impl_dispose): Dispose impl.
-	(calendar_offline_handler_new): Use g_object_new().
-	(backend_cal_opened): use g_signal_connect() instead of
-	gtk_signal_connect().
-	(backend_go_offline): Likewise.
-	(backend_cal_opened): g_object_unref() instead of
-	gtk_object_unref().
-	(backend_go_offline): Likewise.
-
-2002-11-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/evolution-calendar-importer.h: use GLib macros.
-
-	* importers/main.c (init_importer): use bonobo_generic_factory_new,
-	not bonobo_generic_factory_new_multi.
-	(main): don't use libgnome functions.
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/client-test.c: don't use GTK, we don't need it.
-
-2002-11-07  JP Rosevear  <jpr@ximian.com>
-
-	* Initial port of gui/ subdir to GNOME 2
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c: removed non-existant headers.
-
-	* importers/Makefile.am: changes for BonoboActivation.
-
-	* gui/GNOME_Evolution_Calendar.server.in: install to $libdir, not
-	$datadir.
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/query-listener.[ch]: converted to BonoboObject.
-
-	* gui/dialogs/comp-editor-util.c (parse_contact_string): use glib's
-	g_utf8_strchr.
-
-	* gui/dialogs/delete-comp.c: removed non-existant headers. Use
-	GtkStock instead of GnomeStock.
-
-	* gui/dialogs/e-delegate-dialog.c: converted to BonoboActivation.
-	(e_delegate_dialog_construct): adapted to changes in glade_xml_new.
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.[ch]: converted to BonoboObject.
-	(impl_Cal_get_query): bonobo_object_unref the query returned by
-	cal_backend_get_query if we can't duplicate it.
-
-	* pcs/query.[ch]:
-	* pcs/cal-factory.[ch]: converted to BonoboObject.
-
-	* pcs/query-backend.[ch]:
-	* pcs/cal-backend-file.[ch]:
-	* pcs/cal-backend.[ch]: GObjectify.
-
-2002-11-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/cal-prefs-dialog.c: #include gtkoptionmenu.h.
-	(cal_prefs_dialog_new): adapted to changes in glade_xml_new.
-
-	* gui/dialogs/event-page.h:
-	* gui/dialogs/meeting-page.h:
-	* gui/dialogs/recurrence-page.h:
-	* gui/dialogs/schedule-page.h:
-	* gui/dialogs/task-details-page.h:
-	* gui/dialogs/task-page.h:
-	* gui/cal-prefs-dialog.h: use correctly the macros.
-
-	* gui/dialogs/cancel-comp.c:
-	* gui/dialogs/changed-comp.c:
-	* gui/dialogs/comp-editor-page.c:
-	* gui/gnome-cal.h: removed non-existent headers.
-
-	* gui/dialogs/comp-editor.c: remove non-existent headers.
-	(close_dialog): gtk_widget_destroy the widget.
-	(setup_widgets, comp_editor_merge_ui): use BonoboWindow correctly.
-	(comp_editor_set_cal_client, comp_editor_send_comp,
-	 comp_editor_edit_comp): use G_OBJECT_GET_CLASS for
-	getting the class of an object.
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_class_init):
-	use g_signal_* functions.
-
-	* gui/dialogs/comp-editor-util.c: converted to BonoboActivation.
-
-	* gui/dialogs/comp-editor.h: #include bonobo-window.h, not
-	bonobo-win.h.
-
-2002-11-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in:
-	* gui/GNOME_Evolution_Calendar.server.in: renmaed .oaf.in files.
-
-	* gui/alarm-notify/Makefile.am:
-	* gui/Makefile.am: fixed rules for .server files.
-
-2002-11-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor-util.[ch]
-	(comp_editor_connect_contacts_changed): don't return a
-	Bonobo_EventSource_ListenerId, since it does not exist anymore,
-	and was not even being used.
-
-	* gui/e-timezone-entry.h: use GLib macros.
-
-	* gui/dialogs/*.glade:
-	* gui/alarm-notify/*.glade:
-	* gui/*.glade: converted to Glade2 format.
-
-2002-11-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/alarm-options.c (alarm_options_dialog_run): adapted to
-	to new glade_xml_new signature.
-
-	* gui/calendar-model.h:
-	* gui/dialogs/comp-editor-page.h:
-	* gui/dialogs/alarm-page.[ch]: removed non-existant header files.
-
-	* gui/dialogs/comp-editor-util.h: added missing headers.
-
-2002-11-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend.c: use libxml2 headers.
-
-	* gui/alarm-notify/Makefile.am:
-	* gui/dialogs/Makefile.am:
-	* gui/Makefile.am: s/XML_I18N/INTLTOOL. Fixed execution of
-	$(ORBIT_IDL).
-
-	* gui/alarm-notify/alarm-notify.[ch]: converted to BonoboObject.
-
-	* gui/alarm-notify/alarm-notify-dialog.c: compilation fixes.
-	(alarm_notify_dialog): adapted to new glade_xml_new signature.
-
-	* gui/alarm-notify/alarm-queue.c: ported to BonoboActivation and
-	GtkStock and GtkDialog.
-
-	* gui/alarm-notify/notify-main.c: ported to BonoboActivation and
-	use GObject functions instead of GtkObject ones.
-
-	* gui/alarm-notify/save.h: removed BonoboConfig related functions.
-
-	* gui/alarm-notify/config-data.c: use GObject functions instead of
-	GtkObject ones.
-
-	* TODO.port: added file for keeping track of disabled things while we
-	port.
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util-marshal.list: added new marshallers.
-
-	* cal-client/cal-client.c (get_objects_atomically): fixed calls to
-	g_signal_handler_disconnect_by_func.
-	(cal_client_class_init): fixed typos.
-
-	* cal-client/cal-client-multi.[ch]:
-	* cal-client/cal-client-types.c:
-	* cal-client/cal-query.[ch]: ported to GObject.
-
-	* cal-client/cal-listener.[ch]: converted to BonoboObject.
-
-	* cal-client/Makefile.am:
-	* pcs/Makefile.am: fixed flags for orbit-idl
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/Makefile.am:
-	* cal-util/cal-util-marshal.list: added marshallers.
-
-	* cal-client/cal-client.[ch]: ported to GObject.
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-component.[ch]: ported to GObject.
-
-	* cal-util/cal-util.c (cal_util_generate_alarms_for_comp): use
-	g_object_* instead of gtk_object_*.
-
-2002-11-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (get_default_uri): use EConfigListener
-	instead of BonoboConfig.
-
-	* cal-client/cal-client.c:
-	* cal-client/cal-listener.[ch]:
-	* cal-client/query-listener.c: warning free.
-
-2002-11-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-util.[ch]: don't use BonoboConfig, but
-	EConfigListener.
-
-	* gui/calendar-config.c: use /apps/Evolution prefix for all
-	configuration keys.
-
-2002-10-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-component.[ch]:
-	* cal-util/cal-recur.h:
-	* cal-util/cal-util.[ch]:
-	* cal-client/cal-client.h:
-	* cal-client/cal-client-multi.h:
-	* cal-client/cal-client-types.[ch]:
-	* cal-client/cal-listener.h
-	* cal-client/cal-query.[ch]:
-	* cal-client/query-listener.h:
-	* pcs/cal.h:
-	* pcs/cal-backend.[ch]:
-	* pcs/cal-backend-file.h:
-	* pcs/cal-backend-util.h:
-	* pcs/cal-common.h:
-	* pcs/cal-factory.h:
-	* pcs/query.[ch]:
-	* pcs/query-backend.[ch]: started GNOME 2 porting.
-	cal-util, cal-client and pcs compiled ok.
-
-	* cal-client/cal-client.c (cal_client_construct):
-	* pcs/cal-factory.c: use b-a instead of OAF and bonobo-config
-	instead of bonobo-conf.
-
-2002-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (backend_died_cb): cleaned up the status bar
-	messages for all widgets.
-
-2002-10-24  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-itip-control.c (init): initialize new values
-	(clean_up): free new values
-	(find_my_address): if we have a delegator address, use it instead
-	(write_html): display delegator info to user
-	(show_current_event): if we have a calendar uri, use that and
-	describe the event differently
-	(show_current_todo): ditto
-	(show_current): search for delegator X properties
-	(e_itip_control_set_delegator_address): accessor
-	(e_itip_control_get_delegator_address): ditto
-	(e_itip_control_set_delegator_name): ditto
-	(e_itip_control_get_delegator_name): ditto
-	(e_itip_control_set_calendar_uri): ditto
-	(e_itip_control_get_calendar_uri): ditto
-
-	* gui/e-itip-control.h: add protos
-
-	* gui/itip-utils.c (comp_from): use the first attendee as the from
-	address for things other than request, cancel and add (use
-	organizer) and publish (use default address)
-
-2002-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #32613
-
-	* gui/component-factory.c (sc_user_create_new_item_cb): use the
-	default calendar/tasks folder to activate the component editor.
-	(get_data_uri): deal correctly with the URIs being used.
-
-2002-10-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (show_current): fix warning
-
-2002-10-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #32371
-
-	* pcs/query.c (start_cached_query_cb): CORBA_exception_init the
-	CORBA_Environment before using it.
-	
-2002-10-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-factory.c (lookup_backend): use NULL for pointer instead of
-	FALSE.
-
-2002-10-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (get_address): use e_config_listener_* to get
-	values
-	(itip_addresses_get): ditto
-	(itip_addresses_get_default): ditto
-
-	* gui/calendar-model.c (calendar_model_value_to_string): don't
-	send back a null string (affects if it is the group header)
-	(calendar_model_init): pre load config database info so we don't
-	do corba calls during draws
-
-	Fixes #32276
-	
-2002-10-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): fix c/p type
-
-2002-10-17  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/recurrence-page.c (fill_ending_date): if the value
-	is a datetime, convert it to a date
-
-	* gui/itip-utils.c (comp_compliant): convert an UNTIL date value
-	to a datetime value
-
-	* cal-util/cal-component.c (cal_component_has_simple_recurrence):
-	check to see if the component recurrences meet our definition of
-	"simple"
-
-	* cal-util/cal-component.h: new proto
-
-2002-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (fill_component): changed to have a
-	gboolean return type, which is what it's supposed to do.
-	(recurrence_page_fill_component): return the result from
-	fill_component.
-
-	* gui/dialogs/comp-editor-page.h: fixed typo in function prototype.
-
-2002-10-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): try to
-	preserve the work week view setting if it makes sense
-	(set_view): don't update the info again based on our view change
-	call
-
-	Fixes #16036
-	
-2002-10-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #11434
-	
-	* gui/dialogs/comp-editor-page.[ch]
-	(comp_editor_page_display_validation_error): new function.
-	
-	* gui/dialogs/event-page.c (event_page_fill_component):
-	* gui/dialogs/recurrence-page.c (fill_component):
-	* gui/dialogs/task-details-page.c (task_details_page_fill_component):
-	* gui/dialogs/task-page.c (task_page_fill_component): added
-	checks for all date values, and return FALSE if we find
-	some invalid date/times.
-	
-	* gui/dialogs/comp-editor.c (save_comp): activate the page that
-	returns error in fill_component.
-
-2002-10-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c
-	(cal_prefs_dialog_create_time_edit): set the 24 hour format
-	initially
-
-	Fixes #31812
-	
-2002-10-08  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view.c: remove pilot settings from contextual menu
-
-	* gui/e-day-view.c: ditto
-
-2002-10-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #31774
-
-	* gui/dialogs/alarm-options.c (dalarm_widgets_to_alarm,
-	palarm_widgets_to_alarm): use correct pointer in loop.
-
-2002-10-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (setup_changes): cast the correct
-	item
-
-2002-10-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes crash in #19159
-
-	* gui/alarm-notify/alarm-queue.c (lookup_queued_alarm): don't crash if
-	we don't find the queued alarm in the internal list.
-	(alarm_trigger_cb, create_snooze, display_notification,
-	 audio_notification, procedure_notification, remove_queued_alarm):
-	check return value from lookup_queued_alarm.
-
-2002-10-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #15892
-
-	* idl/evolution-calendar.idl: added notifyErrorOccurred method to
-	the Listener interface, so that backends can notify clients of errors
-	that can't be reported otherwise.
-
-	* pcs/cal.[ch] (cal_notify_error): new function.
-
-	* pcs/cal-backend-file.c (save): made to save to temporary file and
-	then moved to the correct file, so that we don't lose any data if
-	there's a problem while saving.
-	(notify_error): new function for notifying error messages to clients.
-
-	* cal-client/cal-listener.[ch]: added new callback function for getting
-	error messages from backends.
-	(impl_notifyErrorOccurred): new method implementation.
-	(cal_listener_class_init): initialize new epv member.
-	(cal_listener_init, cal_listener_destroy, cal_listener_construct,
-	 cal_listener_new): initialize new function pointer.
-
-	* cal-client/cal-client.[ch]: adapted to changes in CalListener class.
-	(cal_client_class_init): added "backend_error" signal to CalClient class.
-	(backend_error_cb): callback for "error_occurred" signal on the CalListener,
-	which just emits the "backend_error" signal of CalClient.
-
-	* gui/gnome-cal.c (gnome_calendar_construct): connect to "backend_error"
-	signal on the CalClient's we create.
-	(backend_error_cb): display error message on error from backend.
-
-	* gui/e-tasks.c: likewise.
-
-2002-10-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (alarm_notify_factory_fn): removed
-	unneeded g_assert which was preventing the alarm daemon to
-	start correctly in some cases.
-
-2002-10-02  Rodrigo Moya <rodrigo@ximian.com>
-	
-	Fixes #30057
-	
-	* cal-client/cal-client.c (cal_client_is_read_only): added check
-	of the status of the client before trying to make CORBA calls.
-
-	* gui/calendar-commands.c (sensitize_calendar_commands,
-	  sensitize_taskpad_commands):
-	* gui/tasks-control.c (sensitize_commands):
-	* gui/dialogs/event-editor.c (set_menu_sens):
-	* gui/dialogs/task-editor.c (set_menu_sens):
-	* gui/e-calendar-table.c (e_calendar_table_on_right_click):
-	* gui/e-day-view.c (e_day_view_on_event_right_click):
-	* gui/e-week-view.c (e_week_view_show_popup_menu): take into account
-	the read-onlyness of clients to disable/enable menu items.
-
-2002-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added isReadOnly method to Cal
-	interface.
-
-	* pcs/cal.c (impl_Cal_is_read_only): new method implementation.
-
-	* pcs/cal-backend.[ch]: added is_read_only method to CalBackend class.
-	(cal_backend_is_read_only): new function.
-
-	* pcs/cal-backend-file.c (cal_backend_file_is_read_only): new method.
-	(cal_backend_file_class_init): set new signal's virtual method.
-
-	* cal-client/cal-client.[ch] (cal_client_is_read_only): new function.
-
-2002-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #15710
-
-	* gui/dialogs/alarm-page.c (alarm_page_init): added a
-	X-EVOLUTION-NEEDS-DESCRIPTION property, so that we later set it
-	correctly if it hasn't been set in the meanwhile (editing options for
-	the alarm).
-
-	* gui/dialogs/alarm-options.c (dalarm_widgets_to_alarm,
-	palarm_widgets_to_alarm): removed X-EVOLUTION-NEEDS-DESCRIPTION
-	property from alarms every time we set the description of the alarm.
-
-2002-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #30290
-
-	* importers/icalendar-importer.c (process_item_fn): return a status of
-	BUSY rather than NOT_READY, to avoid the display of the error message.
-	
-2002-09-30  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c
-	(calconduit_load_configuration): load multi_day_split
-	(calconduit_save_configuration): save it
-	(calconduit_dupe_configuration): copy it
-	(e_cal_gui_new): create gui for it
-	(e_cal_gui_fill_widgets): fill gui with value
-	(e_cal_gui_fill_config): get value from gui and store in config
-	(e_calendar_context_destroy): destroy new_cfg and gui properly
-	(process_multi_day): skip item if its multi-day and we don't want
-	to split
-	(fill_widgets): fill local config widgets
-	(create_settings_window): create local config widgets
-	(save_settings): fill config from local widgets
-
-	Fixes #23763
-	
-2002-09-30  Aaron Weber  <aaron@ximian.com>
-
-	* gui/e-itip-control.c (update_item): adjust string on line 1609
-	and 1517.
-
-	* gui/dialogs/alarm-options.glade: rephrase string on line 270
-
-2002-09-27  Dan Winship  <danw@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): Remove "/Toolbar/New" and
-	"/Toolbar/NewTask" since they're not there any more. Kills some
-	bonobo-ui spewage.
-
-2002-09-26  Dan Winship  <danw@ximian.com>
-
-	Non-Connector part of #29334 (meeting created by a delegate in the
-	delegator's calendar should have the delegator as Organizer).
-
-	* idl/evolution-calendar.idl: add Cal_getEmailAddress, to return
-	the email address associated with a backend (if any).
-
-	* pcs/cal-backend.c (cal_backend_get_email_address): New.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_email_address):
-	Return NULL (for now).
-
-	* pcs/cal.c (impl_Cal_get_email_address): Implement this by
-	calling cal_backend_get_email_address and returning a NotFound
-	exception if it returns NULL.
-
-	* cal-client/cal-client.c (cal_client_get_email_address): New.
-	(cal_client_init, cal_client_destroy, etc): initialize/free
-	email_address
-
-	* gui/dialogs/event-editor.c (event_editor_construct): Split this
-	out of event_editor_init. Take and set a CalClient.
-	(event_editor_new): Take a CalClient.
-
-	* gui/dialogs/task-editor.c (task_editor_construct,
-	task_editor_new): Likewise.
-
-	* gui/dialogs/meeting-page.c (meeting_page_new,
-	meeting_page_construct): Take a CalClient and call
-	cal_client_get_email_address to find the default organizer
-	address. (Also fix a bug if the default account's name has
-	non-ASCII characters.)
-
-	* gui/itip-utils.c (comp_from): New. When sending a REQUEST or
-	CANCEL, use the Organizer as the From address.
-	(itip_send_comp): Call comp_from and pass the result to
-	Composer_setHeaders.
-
-	* gui/comp-editor-factory.c (edit_existing, edit_new): Pass the
-	CalClient to event_editor_new/task_editor_new
-
-	* gui/e-calendar-table.c (open_task): Likewise.
-
-	* gui/e-tasks.c (e_tasks_new_task): Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object,
-	gnome_calendar_new_task): Likewise.
-
-2002-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (set_value_at): only change the attendee
-	value if it isn't empty
-
-2002-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	Should fix once for all #24210
-
-	* idl/evolution-calendar.idl: changed the notifyObjUpdated method
-	of the QueryListener interface accept a list of UIDs.
-
-	* cal-client/query-listener.[ch] (impl_notifyObjUpdated): likewise for
-	the QueryListener class.
-
-	* cal-client/cal-query.c (obj_updated_cb): changed to adapt the
-	multiple-id's received in the QueryListener class' signal to the
-	one-by-one update notification of the public CalQuery class, thus
-	keeping the changes needed for this minimal.
-
-	* pcs/query.c (add_component, start_cached_query_cb): changed to
-	send sequences of UIDs.
-
-2002-09-25  Dan Winship  <danw@ximian.com>
-
-	* gui/component-factory.c (folder_types): Add "calendar/public"
-	and "tasks/public".
-	(type_is_calendar, type_is_tasks): New utility functions
-	(create_view, create_folder, remove_folder, xfer_folder,
-	sc_user_create_new_item_cb): Use type_is_calendar/type_is_tasks
-
-	* importers/icalendar-importer.c (get_uri_from_folder_path): allow
-	importing into public calendar/task folders too.
-
-	* gui/e-itip-control.c: Note that it's intentional that we use
-	"calendar" and "tasks" here instead of "calendar/*" and "tasks/*".
-	(31032)
-
-2002-09-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): if the item being sent is not
-	a meeting, send it as a mixed item with a description and the
-	calendar text in an attachment
-
-	Fixes #30638
-
-2002-09-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #27961
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_object): set the
-	LAST-MODIFIED time of the components when we save them.
-
-2002-09-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_timezone_object,
-	cal_backend_file_get_timezone): return a builtin timezone if we
-	don't find the timezone in our component.
-
-2002-09-24  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	make sure the start/end for no time palm events are DATE values,
-	tidy code slightly
-
-	Fixes #21631
-	
-2002-09-24  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day):
-	convert to date values if the original start and end were both
-	dates
-
-2002-09-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-query.c (cal_query_destroy): unref the query
-	since now the query object on the server keeps a copy of it and
-	must know when the listener is no longer valid.
-
-	* pcs/query.c (listener_died_cb): unref the QueryListener object.
-	(query_construct): create an EComponentListener for the non-cached
-	queries' listeners also.
-
-2002-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: add libeutil to the link
-
-	* conduits/calendar/Makefile.am: ditto
-
-2002-09-23  Dan Winship  <danw@ximian.com>
-
-	* pcs/cal.c (imple_Cal_update_objects, impl_Cal_remove_object):
-	fix non-ANSI switch statements.
-
-	* gui/e-meeting-model.c (is_cell_editable, value_is_empty,
-	process_free_busy_comp): Likewise
-
-	* gui/itip-utils.c (comp_compliant): Likewise.
-
-2002-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/main.c (launch_alarm_daemon): install an idle callback that will
-	start the alarm daemon.
-	(launch_alarm_daemon_cb): actually activate the alarm daemon here.
-
-	* pcs/query.c (start_cached_query_cb): remove timeout function always
-	and re-add it if the query is in progress.
-
-2002-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c (start_cached_query_cb): move success notification code
-	to its own code block, since it was being run for parse errors also.
-	Also, remove all traces of the query from the cache if there is an
-	error. Also, use GINT_TO_POINTER instead of GPOINTER_TO_INT.
-
-2002-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #28310
-
-	* gui/alarm-notify/save.c (save_notification_time): only save the
-	new notification time if it is bigger than the already saved one.
-	This should avoid some reminders showing up twice.
-
-2002-09-20  JP Rosevear  <jpr@ximian.com>
-
-	* gui/comp-util.c (cal_comp_is_on_server): check to see if the
-	component is already on the server or not
-
-	* gui/comp-util.h: change proto
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): only delete
-	the event if the summary is empty and the component is not already
-	on the server
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): same
-
-	Fixes #14111
-	
-2002-09-20  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): set the
-	deleted attendees array to size 0 after we clean it up
-
-	Fixes #30479
-	
-2002-09-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c (parse_sexp): remove the query from the cache if it
-	failed.
-	(start_cached_query_cb): notify of errors in the query.
-
-2002-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: added a list of EComponentListener's to control the
-	lifetime of the listeners.
-	(query_init): initialize new member.
-	(query_destroy): free new member.
-	(start_cached_query_cb): create a EComponentListener for the new
-	listener being added.
-
-2002-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	More fixes for #24210
-
-	* pcs/query.c: added list of cached queries and changed the Query
-	class to work with several listeners, not only one.
-	(query_init): initialize new members.
-	(query_destroy): free new members.
-	(add_component, remove_component, parse_sexp, match_component,
-	 process_components_cb): notify all listeners.
-	(notify_uid_cb, start_cached_query_cb): implemented integration of
-	cached queries.
-	(query_new): search the query in the cache before creating a new
-	one. And if we create a new one, store it in the cache.
-
-2002-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): bump the
-	month_num by 1 because it indexs at 0
-	(recurrence_page_fill_widgets): lower the month_num by one as above
-
-	Fixes #30381
-	
-2002-09-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #26362
-
-	* gui/e-itip-control.c (show current): add a default reminder if
-	default reminders are set in the configuration.
-
-2002-09-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_press): keep
-	the selection if we right click in it (but not on an appointment)
-	(e_day_view_on_main_canvas_button_press): ditto
-
-	* gui/e-week-view.c (e_week_view_on_button_press): same
-
-2002-09-11  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view.c (e_week_view_new_appointment): create a new
-	appointment based on the selection
-	(e_week_view_on_button_press): use above
-	(e_week_view_on_new_appointment): ditto
-	(e_week_view_on_new_meeting): ditto
-
-	Fixes #18162
-	
-2002-09-10  JP Rosevear  <jpr@ximian.com>
-
-	* gui/comp-editor-factory.c (get_default_event): duh, don't
-	blindly increment the hour without adjusting for the day
-	boundaries
-
-	Fixes #29983
-	
-2002-09-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #24032
-
-	* gui/e-itip-control.c (init): don't get servers here, since we don't
-	know the type of the component(s) to be loaded.
-	(show_current): get servers here.
-	(destroy): only free stuff that needs to be freed.
-
-2002-09-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): display status messages for
-	all operations we make, so that when using remote slow backends, so
-	that users have always indication of what's happening.
-
-2002-09-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): kill warning
-
-	* gui/e-week-view.h: new proto
-
-	* gui/e-week-view.c (e_week_view_set_selected_time_range_visible):
-	select a range of time in the currently visible area, if out side
-	the visible area, select as much as possible
-	(e_week_view_on_text_item_event): call above
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_button_press): call above
-
-	* gui/e-day-view.c
-	(e_day_view_set_selected_time_range_in_top_visible): select a
-	range of time in the currently visible area, if out side the
-	visible area, select as much as possible
-	(e_day_view_set_selected_time_range_visible): the same for the
-	main canvas
-	(e_day_view_on_long_event_button_press): call above
-	(e_day_view_on_event_button_press): ditto
-
-2002-09-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): don't try to send via the
-	server if we are publishing; don't bail out on a 0 length to list
-	if we are publishing
-
-2002-09-05  Anna Marie Dirks <anna@ximian.com>	
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Changed the description of
-	the calendar/tasks page of the settings dialog, to be hopefully
-	more descriptive and less awkwardly worded.
-
-
-2002-09-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_drag_data_get): added support for
-	text/x-calendar targets, in which case a VCALENDAR component, with
-	full timezone information is returned.
-
-2002-09-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): don't listen to client
-	signals after we get destroyed
-
-	Fixes #17036
-	
-2002-09-04  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/event-editor.c (event_editor_send_comp): bail out if
-	we couldn't send the cancel
-
-	* gui/dialogs/task-editor.c (task_editor_send_comp): ditto
-
-	* gui/dialogs/comp-editor.c (save_comp_with_send): indicate send
-	status
-	(real_send_comp): return success/fail, only resave the component a
-	if we successfully sent
-	(comp_editor_send_comp): return success/fail
-
-	* gui/itip-utils.h: update proto
-
-	* gui/itip-utils.c (itip_send_comp): return true if we sent the
-	message
-	
-2002-09-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (comp_server_send): provide error message
-	param, give a dialog with the message if we get a busy result;
-	return TRUE if we succeed
-	(itip_send_comp): bail out if we had a problem sending via the
-	server
-
-	* cal-client/cal-client.c (cal_client_send_object): pass back
-	error message if we get the busy exception in the new param
-
-	* cal-client/cal-client.h: update proto
-
-	* pcs/cal.c (impl_Cal_send_object): dump backend error message
-	into Busy exception
-
-	* pcs/cal-backend.h: update proto
-
-	* pcs/cal-backend.c (cal_backend_send_object): take/pass new error
-	message parameter
-
-	* pcs/cal-backend-file.c (cal_backend_file_send_object): take new param
-
-	* idl/evolution-calendar.idl: add errorMsg to Busy exception
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Pass NULL as
-	@unpopulate_folder_context_menu_fn to
-	evolution_shell_component_new().
-
-2002-09-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (comp_compliant): don't make the reply
-	component minimal
-
-	Fixes #28956
-	
-2002-08-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): make the sure to list is 0
-	length before sending via imip
-
-	Fixes #29624
-	
-2002-08-30  Mike Kestner  <mkestner@ximian.com>
-
-	* gui/dialogs/event-page.c:
-	* gui/dialogs/task-page.c: use bonobo_object_release_unref to release
-	the remote SelectNames component, not CORBA_Object_release.
-
-2002-08-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_press): select
-	the top canvas if the user right-clicks on it
-	(e_day_view_on_main_canvas_button_press): select the row the user
-	is right-clicking on
-	(e_day_view_on_long_event_button_press): select the top canvas if
-	the user right-clicks on an event there
-	(e_day_view_on_event_button_press): select the relevant rows if
-	the user right-clicks on an event
-	(e_day_view_set_selected_time_range_in_top): select a number of
-	days in the top canvas
-
-	* gui/e-week-view.c (e_week_view_on_button_press): select the day
-	the user is right-clicking on
-	(e_week_view_on_text_item_event): select the corresponding time
-	range when showing the contextual menu for an event
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_button_press): select the corresponding
-	time range when showing the contextual menu for an event
-
-	Fixes #14660
-	
-2002-08-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: added missing header file.
-
-2002-08-28  Dan Winship  <danw@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Add an
-	evolution:shell_component_launch_order and rename
-	evolution:shell_component_icon.
-
-2002-08-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.c: use EConfigListener instead of direct access
-	to the bonobo-conf database.
-	(calendar_config_init): create the EConfigListener here, and install
-	an atexit function to unref the config listener object.
-	(config_read, property_change_cb, calendar_config_write,
-	 calendar_config_write_on_exit): removed unneeded functions.
-	(calendar_config_get_*, calendar_config_set_*): changed to make use of
-	EConfigListener directly.
-
-	* gui/main.c (main): removed call to calendar_config_write_on_exit.
-
-	* gui/dialogs/cal-prefs-dialog.c (update_config): removed call to
-	calendar_config_write.
-
-2002-08-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #12326
-
-	* gui/alarm-notify/config-data.c (ensure_inited): create a
-	EConfigListener for configuration access.
-	(do_cleanup): g_atexit installed function, to clean up configuration
-	database resources.
-	(config_data_get_timezone): retrieve the configuration for the
-	EConfigListener object.
-	(config_data_get_listener): new function.
-
-	* gui/alarm-notify/save.c (get_config_db, discard_config_db): removed.
-	Use EConfigListener instead.
-	(save_notification_time, get_saved_notification_time,
-	 save_calendars_to_load, get_calendars_to_load, save_blessed_program,
-	 is_blessed_program): use EConfigListener.
-
-	* gui/alarm-notify/notify-main.c (init_alarm_notify_service): removed.
-	(alarm_notify_factory_fn): create here the alarm_notify_service if it
-	hasn't been created yet.
-	(load_calendars): likewise.
-	(main): don't call init_alarm_notify_service.
-
-2002-08-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (process_section): if its a
-	non-participant, add it as a resource to match dialog label
-	(set_value_at): if the type is set to be a resource, switch the
-	role to non-participant by default
-
-2002-08-22  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/calendar-model.c (set_completed): if the value given is a
-	date, convert to a time in the current zone
-
-2002-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_activate): don't set the
-	tasks ui component until the container is set, remove unused
-	pixmaps
-
-2002-08-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (destroy): disconnect destroy signal
-	callbacks on tables
-
-	Fixes #28231
-
-2002-08-19  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/itip-utils.c (comp_toplevel_with_zones): clone the ical
-	component before adding it
-
-	Fixes #29061
-	
-2002-08-19  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/comp-editor-factory.c (get_default_event): make sure to get
-	the date in the current zone, not at UTC
-
-	Fixes #17692
-	
-2002-08-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (set_date_label): stop adding redundant
-	information for start/end/due/complete times
-	(write_html): convert newlines properly and escape characters for
-	summary, location, description; put text information on separate
-	line from bolded title to make it look nicer when there are line
-	breaks
-
-	Fixes #26964
-	
-2002-08-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.[ch]: added internal EComponentListener
-	object, to listen for the activated Cal.
-	(cal_client_class_init): added "backend_died" signal.
-	(cal_client_destroy): clean up component listener.
-	(backend_died_cb): new callback for getting signals from the
-	EComponentListener.
-	(cal_opened_cb): setup component listener.
-	
-	* cal-client/Makefile.am: added libetuil to needed LIBS.
-
-	* gui/gnome-cal.c (backend_died_cb): new callback.
-	(gnome_calendar_construct): connect to "backend_died" signal
-	on all CalClient's we create.
-	
-2002-08-14  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (init_widgets): listen for the
-	time editors to change
-	(cal_prefs_dialog_start_of_day_changed): make sure the start is
-	never after the end
-	(cal_prefs_dialog_end_of_day_changed): make sure the end is never
-	after the start
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_set_working_hours): make sure to show a
-	minimum of 1 hour for work day
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw):
-	calculate the work/not working color boxes to the nearest pixel,
-	rather the the nearest time division
-
-	Fixes #10286, #26285
-	
-2002-08-13  Dan Winship  <danw@ximian.com>
-
-	* gui/e-itip-control.c: Remove a bunch of old #if 0 code.
-	(update_item): Set X-MICROSOFT-CDO-REPLYTIME here.
-
-	* gui/itip-utils.c (comp_toplevel_with_zones): Don't set it here.
-
-	* cal-util/cal-component.c (ensure_mandatory_properties): Use
-	icaltime_current_time_with_zone rather than rolling our own.
-	(cal_component_strip_errors): Remove unused variable.
-
-2002-08-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): set status message on
-	ECalendarTable when opening the tasks.
-	(client_cal_opened_cb): set ECalendarTable status message to NULL
-	when we open the tasks folder. Also, clear up calendar status message
-	in all cases, not only if the folder was opened successfully.
-
-2002-08-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): set status message to NULL
-	if there is an error opening the calendar.
-	(client_cal_opened_cb): set status message to NULL only when we have
-	successfully opened the main CalClient.
-
-2002-08-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (real_send_comp): set the editor to
-	changed so the item actually gets saved
-
-2002-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (users_has_attendee): check for an attendee in
-	the list
-	(comp_to_list): only add the user if they aren't on the list
-	(comp_server_send): don't remove the users, pass back the list
-	(itip_send_comp): send to server before doing comp_minimal
-
-	* gui/dialogs/comp-editor.c (real_send_comp): edit and save the
-	updated comp
-
-	* pcs/cal.c (impl_Cal_send_object): copy the correct item to pass
-	back
-
-2002-08-08  Dan Winship  <danw@ximian.com>
-
-	* pcs/query-backend.c (query_backend_new): Initialize
-	loaded_backends before using it. (Just kills off a harmless
-	g_warning.)
-
-2002-08-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #15710
-
-	* cal-util/cal-component.[ch]
-	(cal_component_alarm_get_icalcomponent): new function for getting
-	the icalcomponent from a CalComponentAlarm.
-
-	* gui/comp-util.c (cal_comp_event_new_with_defaults): added
-	X-EVOLUTION-NEEDS-DESCRIPTION property to the default reminder
-	alarm, so that we can identify it when saving the component.
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_component): if the
-	alarm has the X-EVOLUTION-NEEDS-DESCRIPTION property, set the
-	description to be the same as of the component.
-
-2002-08-07  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_send_object): just
-	return the object untouched since we don't send anything
-
-	* pcs/cal-backend.c (cal_backend_remove_object): call virtual method
-
-	* pcs/cal-backend.h: add send result codes, new proto
-
-	* pcs/cal.c (impl_Cal_send_object): implement sendObject corba call
-	(cal_class_init): add to epv
-
-	* gui/itip-utils.c (comp_toplevel_with_zones): utility function to
-	create icalcomponent with necessary timezone info
-	(comp_has_attendee): see if attendee is in the attendee list
-	(comp_server_send): use above and remove attendees if the server
-	sends them
-
-	* gui/e-itip-control.c (show_current_todo): remove unused var
-
-	* idl/evolution-calendar.idl: add Busy exception and
-
-	* cal-client/cal-client.c (cal_client_send_object): send object
-	via the server (if the server can)
-
-	* cal-client/cal-client.h: add send results and new proto
-
-2002-08-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query-backend.[ch] (query_backend_get_object_component): new
-	function.
-	(query_backend_get_uids): new function.
-	(query_backend_new): create the static GHashTable if it hasn't been
-	created yet.
-	(query_backend_destroy): destroy the static GHashTable if empty.
-	(foreach_uid_cb): call object_updated_cb, which does everything.
-
-	* pcs/query.c: make use of the new QueryBackend class.
-	(query_init): initialize new private structure member.
-	(query_destroy): clean up new member, without freeing it, since it is
-	managed internally in query-backend.c.
-	(query_construct): create a QueryBackend for the query.
-	
-2002-08-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes the crash in #19159
-
-	* gui/alarm-notify/alarm-queue.c (create_snooze): check for NULL
-	pointers before using them.
-
-2002-08-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_init): don't warn if we can't use
-	the small font, just set use_small_font to FALSE
-
-2002-08-02  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-itip-control.c (adjust_item): new util function to add
-	information to an itip message that might not already be there for
-	display purposes (summary, location, etc)
-	(show_current_event): use above
-	(show_current_todo): ditto
-
-2002-08-02  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (init): initialize value to corba nil
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Use
-	meeting-request-16.png instead of meeting-request.png.
-
-	* gui/calendar-commands.c (pixmaps): Remove pixmaps in
-	/menu/File/New/NewFirstItem/.
-
-2002-08-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (is_overdue): use get_due_status
-	(get_color): ditto
-	(get_due_status): utility function to reduce replicated code,
-	handle the case where the due date is just a date
-
-2002-07-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query-backend.[ch]: new class for implementing a backend cache
-	for the calendar queries.
-
-	* pcs/Makefile.am: added new files.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Change the order of the
-	user creatable items a bit so that "New Appointment" and "New
-	Meeting" are at the top when in a calendar folder.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (add_creatable_item): New arg
-	@folder_type, pass it to
-	evolution_shell_component_add_user_creatable_item().
-	(create_object): Set the right folder types for the various
-	user-creatable items.
-
-2002-07-31  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_destroy): we no longer need to manually
-	save the state
-	(e_tasks_open): we no longer need to manually load the state
-	(display_view_cb): attach the gal view to the table
-
-	Fixes #27894
-	
-2002-07-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_find_work_week_start): make sure
-	that the work week view goes to the current work week if the day
-	selected is before the start of the work week
-
-	Fixes #20317
-	
-2002-07-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/task-details-page.c: fixed mapping of popdown menu
-	to ICAL_STATUS_ values.
-	(task_details_page_fill_widgets): when we can't set the status,
-	default to ICAL_STATUS_NONE, which maps to 'Not started'. Fixed
-	use of 'percent' variable, which was being used after being freed.
-	(percent_complete_changed): default to ICAL_STATUS_NONE (Not Started).
-
-	* gui/dialogs/task-details-page.glade: added 'Needs Action' to
-	popdown menu values.
-
-2002-07-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_add_timezones_from_component):
-	new function for adding VTIMEZONE components to a VCALENDAR
-	component.
-
-	* gui/e-calendar-table.c (copy_row_cb): added VTIMEZONE components
-	to resulting VCALENDAR top-level component.
-
-	* gui/e-week-view.c (e_week_view_copy_clipboard): copy to the
-	clipboard a top-level VCALENDAR component, with all the needed
-	VTIMEZONE components.
-	(e_week_view_on_copy): likewise.
-
-	* gui/e-day-view.c (e_day_view_copy_clipboard): likewise.
-	(e_day_view_on_copy): likewise.
-
-2002-07-26  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_construct): remove useless
-	debug statement
-
-	Probably fixes #19333
-	
-2002-07-26  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/comp-editor-factory.c (impl_editExisting): focus the editor
-	if it does exist, create a new one if it doesn't (not vice-versa)
-
-	Fixes #23468
-	
-2002-07-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_init): set large_font to NULL
-	(e_day_view_style_set): calculate large font, fall back to the
-	style->font if necessary
-
-	Fixes #11773
-	
-2002-07-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (write_html): display the location in the
-	itip information
-
-	Fixes #24690
-	
-2002-07-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (set_percent): set status to in progress if
-	the percent is between 0 and 100
-	(set_status): if the value is set to in process, change the
-	percent to 50
-
-	Fixes #1590
-	
-2002-07-24  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/timeutil.c (time_day_of_year): add a day for the leap
-	year only if we are currently counting Feb., not if the month
-	passed in is Feb.  Fixes #23446.
-
-2002-07-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_realize): use proper meeting icon
-
-2002-07-22  Dan Winship  <danw@ximian.com>
-
-	* pcs/Makefile.am: Split pcs-backend-file out of libpcs and build
-	it as a separate (noinst) library libpcsfile.a. This gets the db3
-	dependencies out of libpcs, and people trying to create a calendar
-	backend shouldn't be calling functions from the existing backends
-	anyway so there's no reason to install them.
-
-	* cal-util/timeutil.c: Replace a bunch of old gnomecal functions
-	with the functionally identical ones from Connector.
-
-2002-07-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (get_uri_from_folder_path): if
-	there's an exception, continue with the next item.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* cal-util/Makefile.am: Install libcal-util-static.la
-	and fix the -all-static flag to make it install statically.
-	
-	* pcs/Makefile.am: Install libpcs.a and its headers.
-
-	* pcs/cal-backend-util.h: Same sort of include namespacing fix,
-	but for pcs.
-
-	* pcs/cal.h:
-	* pcs/query.h:
-	* pcs/cal-factory.h:
-	* pcs/cal-backend.h:
-	* pcs/cal-backend-file.h: Same.
-
-2002-07-17    <jpr@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_value_at): use util
-	function to see if the user is the organizer
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): add
-	deleting proto to indicate whether cancelling or deleting is the
-	primary operation
-
-	* gui/dialogs/cancel-comp.h: update proto
-
-	* gui/dialogs/comp-editor.c (delete_cmd): offer to cancel
-
-	* gui/dialogs/task-editor.c (cancel_task_cmd): call
-	cancel_component_dialog with new param
-
-	* gui/dialogs/event-editor.c (cancel_meeting_cmd): ditto
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): only update
-	request if user is organizer
-	(e_week_view_show_popup_menu): disable the meeting and meeting
-	organizer mask if appropriate
-	(e_week_view_delete_event_internal): offer to cancel the meeting
-	(e_week_view_on_cut): ditto
-	(selection_received): send request if its a meeting
-
-	* gui/e-day-view.h: add meeting icon/mask
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): disable the
-	meeting and meeting organizer mask if appropriate
-	(e_day_view_delete_event_internal): offer to cancel meeting
-	(e_day_view_on_cut): ditto
-	(e_day_view_finish_long_event_resize): only update request if user
-	is organizer
-	(e_day_view_reshape_long_event): add meeting icon to count
-	(e_day_view_reshape_day_event): ditto
-	(e_day_view_on_top_canvas_drag_data_received): only update request
-	if user is organizer
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-	(selection_received): offer to send meeting info
-
-	* gui/e-day-view-main-item.c
-	(e_day_view_main_item_draw_day_event): draw meeting icon if
-	appropriate (using dummy icon atm)
-
-2002-07-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #8001
-
-	* importers/icalendar-importer.c (connect_to_shell): new function for
-	connecting the importers (both iCal and vCal) to the shell, needed for
-	some information retrieval about the folders we're importing to.
-	(ical_importer_new, vcal_importer_new): call connect_to_shell.
-	(importer_destroy_cb): unref the shell client object.
-	(get_uri_from_folder_path): retrieve the uri from the storage
-	registry.
-	(check_folder_type): removed.
-
-	* importers/Makefile.am: included libeshell to LIBS.
-
-2002-07-12  Peter Williams  <peterw@ximian.com>
-
-	* pcs/cal.c: Sigh, fix for the wombat.idl -> Evolution-Wombat.idl
-	rename here too. At least grep indicates that's all that needs to
-	be fixed.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* gui/Makefile.am (INCLUDES): Change the -I flags to get
-	it to play nicely with the new Ebook header paradigm.
-
-	* gui/dialogs/Makefile.am: Same.
-	
-	* gui/e-meeting-model.c: More of the same.
-
-	* gui/dialogs/e-delegate-dialog.c:
-	* gui/dialogs/e-meeting-model.c:
-	* gui/dialogs/comp-editor-util.c: Fix include lines to get
-	ebook headers.
-
-	* pcs/Makefile.am: Same.
-
-2002-07-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #16034
-
-	* gui/e-day-view.c (e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	* gui/e-week-view.c (e_week_view_reshape_event_span):
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	Don't assume all categories have icons when allocating space for
-	the icons.
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (add_creatable_item): New arg @tooltip.
-	Pass it to evolution_shell_component_add_user_creatable_item(),
-	which now has a @tooltip arg.
-	(create_object): Added tooltips.
-
-2002-07-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-config.c (config_read): listen for timezone config
-	change
-	(property_change_cb): set the timezone if it changed elsewhere
-
-	* gui/main.c (init_bonobo): call bonobo_activate because we make
-	bonobo related calls before the bonobo_main call
-
-2002-06-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #25410
-
-	* gui/alarm-notify.c (AlarmNotify_removeCalendar): do proper
-	cleanup on removal of clients.
-	(alarm_notify_add_calendar): ditto.
-
-2002-06-27  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/itip-utils.c (comp_compliant): plug leak and actually use
-	the minimal comp we create
-	
-2002-06-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor-page.h: add back proto
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_notify_needs_send): add page needs_send signal
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_invite_others_button_draw): check to
-	see if the button should be sensitive when drawing
-	(e_meeting_time_selector_construct): listen for the button draw
-	signal
-
-	* cal-util/cal-component.c (cal_component_strip_errors): remove
-	X-LIC-ERROR x properties
-
-	* cal-util/cal-component.h: new proto
-
-	* gui/dialogs/meeting-page.c (change_clicked_cb): set needs_send
-	to true
-	(meeting_page_fill_widgets): set up gui based on if the user or
-	someone else is the organizer
-	(meeting_page_construct): read the addresses here for the combo
-	box
-	(get_widgets): explicitly set the value in list values
-	
-	* gui/dialogs/event-editor.c (set_menu_sens): base this on the
-	exist org and user org values of the comp editor
-	(event_editor_edit_comp): set up editable row restrictions on the
-	meeting model if the user is not an organizer, and don't set needs
-	send if we aren't the organizer initially
-	(model_row_changed_cb): set needs_send to true
-	(row_count_changed_cb): ditto
-
-	* gui/dialogs/meeting-page.glade: update gui
-	
-	* gui/dialogs/comp-editor.c (save_comp_with_send): if the user is
-	not the organizer, REPLY rather than REQUEST
-	(comp_editor_set_existing_org): accessor
-	(comp_editor_get_existing_org): ditto
-	(comp_editor_set_user_org): ditto
-	(comp_editor_get_user_org): ditto
-	(real_edit_comp): determine if there is an existing organizer and
-	if the organizers is a user
-	(page_changed_cb): warn the user that changes may be discarded
-	(page_summary_changed_cb): ditto
-	(page_dates_changed_cb): ditto
-
-	* gui/dialogs/comp-editor.h: new protos
-
-	* gui/itip-utils.c (itip_organizer_is_user): determine if the
-	organizer of a component is a user
-	(itip_sentby_is_user): same for sentby field of organizer
-	(comp_sentby): use above routines instead
-	(comp_compliant): strip all X-LIC-ERROR fields generated by
-	libical
-
-	* gui/e-meeting-model.c (is_cell_editable): if there is a list of
-	editable rows, allow only the status column of those rows to be
-	edited
-	(init): init edit_rows
-	(e_meeting_model_restricted_add): add an editable row to the model
-	(e_meeting_model_restricted_remove): remove an editable row
-	(e_meeting_model_restricted_clear): clear all editable rows
-	(e_meeting_model_etable_click_to_add): set the click to add arg on
-	all tables
-	(e_meeting_model_etable_from_model): track the tables
-	(table_destroy_list_cb): remove the table being destroyed from the
-	list
-	(table_destroy_state_cb): remove the table being destroyed from
-	the list
-	
-	* gui/e-meeting-model.h: new protos
-
-	* gui/e-itip-control.c (update_attendee_status): kill warning
-	
-2002-06-18  JP Rosevear  <jpr@ximian.com>
-	
-	* zones.h: update for new zones
-
-2002-06-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes wombat crash (for JP and myself)
-
-	* gui/gnome-cal.c (gnome_calendar_open): don't call add_alarms here,
-	since the client is not yet attached to the backend, and the alarm
-	daemon does unref the client before creating a new one.
-	(client_cal_opened_cb): call add_alarms here.
-
-2002-06-12  Rodrigo Moya <rodrigo@ximian.com>
-
-        * gui/alarm-notify.c: added timeout_id to LoadedClient structure, to
-	keep track of the timeout function.
-	(retry_timeout_cb): don't use RetryData, but the LoadedClient.
-	(cal_opened_cb): ditto, and assigned lc->timeout_id to the return
-	value of g_timeout_add().
-	(alarm_notify_add_calendar): destroy the timeout callback when
-	destroying the LoadedClient structure.
-
-2002-06-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* pcs/cal-factory.c (open_fn): Free the uri_string once we're done
-	with it.
-
-2002-06-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Fix a typo.
-	
-2002-06-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): removed
-	already loaded client when asked to be opened again, and *really*
-	re-open it again.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus):
-	gal_view_menus_set_show_define_views (..., FALSE);
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus), gui/gnome-cal.c
-	(gnome_calendar_setup_view_menus): Set the title of our
-	GalViewCollection.
-
-2002-06-03  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: In an attempt to clean up the 
-	config dialog (and to reduce its overall girth), I have re-laid-out the
-	calendar preferences dialog. It now conforms to standard Evolution 
-	spacing and padding guidelines, and exhibits proper alignment, etc.
-
-2002-06-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: keep a reference to the Query object, to avoid
-	crashes when the queries are destroyed before finishing processing.
-	Fixes #25056.
-
-2002-05-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.h: update proto
-
-	* gui/dialogs/comp-editor.c (comp_editor_get_comp): new function
-	to get base comp
-
-	* gui/e-comp-editor-registry.c (e_comp_editor_registry_add): get
-	the base comp, not the current comp, don't unref it
-	(foreach_close_cb): block the signal, unblock it if the editor
-	could not be closed
-	(e_comp_editor_registry_close_all): fix preconditions
-	(editor_destroy_cb): get the base comp, not the current comp,
-	don't unref it
-
-2002-05-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-comp-editor-registry.c (e_comp_editor_registry_close_all):
-	if there are remaining items, return false
-	(foreach_close_cb): don't remove the item if it couldn't be closed
-
-	* gui/e-comp-editor-registry.h: update proto
-
-	* gui/component-factory.c (request_quit): return a boolean
-	indicating if everything was closed
-
-	* gui/dialogs/comp-editor.h: update proto
-
-	* gui/dialogs/comp-editor.c (comp_editor_close): return true if
-	the editor was closed, false otherwise
-
-2002-05-26  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-comp-editor-registry.[hc]: a registry of comp editors so
-	we can close them all centrally
-
-	* gui/gnome-cal.c (gnome_calendar_init): there is no editor hash
-	now
-	(gnome_calendar_destroy): ditto
-	(gnome_calendar_edit_object): look for the event editor in the
-	registry, if it isn't there, create it and add it to the registry
-
-	* gui/e-calendar-table.c (open_task): look for the task editor in
-	the registry, if it isn't there, create it and add it to the
-	registry
-
-	* gui/component-factory.c (request_quit): close all open editors
-	(create_object): add a request_quit function to the shell
-	component
-
-	* gui/comp-editor-factory.c (free_client): there is no
-	uid_comp_hash to free any more
-	(editor_destroy_cb): we get an OpenClient as callback data now,
-	reduce the editor count and destroy it if it is 0
-	(edit_existing): don't create the Component, add the new editor to
-	the registry, increase the editor count
-	(edit_new): ditto
-	(open_client): set the editor count to 0
-	(impl_editExisting): look in the registry for the editor
-
-	* gui/Makefile.am: Build new sources
-
-	* gui/main.c (main): create the registry
-
-	* gui/dialogs/comp-editor.c (comp_editor_close): prompt to save
-	and then close dialog
-
-	* gui/dialogs/comp-editor.h: new proto
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: remove dead summary stuff
-
-2002-05-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (save): check the value returned by
-	gnome_vfs_uri_to_string before using it.
-	(cal_backend_file_open): ditto.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/event-editor.c (event_editor_init): Pass the
-	@component_pixmaps in so we give the new "Meeting" button an icon.
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): New arg
-	@component_pixmaps to pass in custom pixmaps.
-
-2002-05-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c:
-	* gui/alarm-notify/notify-main.c: ported changes from evolution-1-0
-	to make it work with reminders on remote backends.
-
-	* pcs/cal-backend-file.c (cal_backend_file_open): check the string
-	returned by gnome_vfs_uri_to_string, which can be empty. If so,
-	return an error.
-
-2002-05-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus): set the view
-	to the current view
-
-2002-05-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): added support for
-	CAL_CLIENT_OPEN_PERMISSION_DENIED error code.
-	(permission_error): new function to display 'Permission Denied'
-	error message when opening the calendar.
-
-	* gui/e-tasks.c: likewise.
-
-	* idl/evolution-calendar.idl: added PERMISSION_DENIED to Listener's
-	OpenStatus enumeration.
-
-	* cal-client/cal-client.c (cal_opened_cb): added code for retrieving
-	'Permission Denied' errors, and convert it to CalClientOpenStatus
-	values.
-
-	* pcs/cal-factory.c (open_backend): added code for informing of
-	'Permission Denied' errors.
-
-2002-05-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added PermissionDenied exception and
-	make it be raised in open, updateObjects and removeObject.
-
-	* pcs/cal-backend.h: added CAL_BACKEND_OPEN_PERMISSION_DENIED to
-	CalBackendOpenStatus enumeration, added CalBackendResult enumeration.
-
-	* pcs/cal.c:
-	* pcs/cal-backend.c:
-	* pcs/cal-backend-file.c: adapted to changes in update_objects and
-	remove_object methods.
-
-	* cal-client/cal-client.[ch]: added CalClientResult enumeration.
-	(cal_client_update_object, cal_client_update_objects,
-	 cal_client_remove_object): changed to return a CalClientResult.
-
-	* conduits/calendar/calendar-conduit.c:
-	* calendar/conduits/todo/todo-conduit.c:
-	* importers/icalendar-importer.c:
-	* gui/dialogs/comp-editor.c:
-	* gui/calendar-model.c:
-	* gui/e-calendar-table.c:
-	* gui/e-day-view.c:
-	* gui/e-itip-control.c:
-	* gui/e-week-view.c:
-	* gui/comp-util.c:
-	* gui/e-tasks.c:
-	* gui/tasks-migrate.c: adapted to changes in cal_client_update_object(s)
-	and cal_client_remove_object.
-	
-2002-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Pass NULL as
-	@request_quit_fn.
-
-2002-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/schedule-page.c (schedule_page_construct): set the
-	working hours for the meeting time selector
-	
-2002-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.h: make the range datetime member a
-	struct not a pointer
-
-	* cal-util/cal-component.c (cal_component_get_recurid): take a
-	pointer to a range
-	(cal_component_set_recurid): ditto
-
-	* gui/itip-utils.c (comp_minimal): get/set the recurrence id
-	properly
-	
-2002-05-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-itip-control.c (get_servers): use
-	GNOME_Evolution_Storage__get_folderList instead of
-	GNOME_Evolution_Storage_getFolderList since I have now changed
-	that to be an attribute instead of a method.
-
-2002-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (start_calendar_server): start a server a
-	uri
-	(start_default_server): start a default server
-	(get_servers): get all clients for all folders of the given
-	type(s)
-	(find_server): locate a server for a particular uid
-	(init): get_servers, listen for object_requested signal
-	(destroy): destroy all clients
-	(write_html): put options is there own cell
-	(get_publish_options): place selector in if param is true
-	(get_request_options): ditto
-	(get_real_item): only try and look up the item if we know its in
-	the server
-	(show_current_event): find the server (if any) for the current
-	comp
-	(show_current_todo): ditto
-	(update_attendee_status): if there is no server for the comp, it
-	doesn't exist
-	(remove_item): ditto
-	(button_selected_cb): get a client for the selected folder
-	(object_requested_cb): draw the folder button in
-
-	* gui/calendar-config.h: new protos
-
-	* gui/calendar-config.c (calendar_config_default_tasks_folder):
-	get default tasks uri
-	(calendar_config_default_calendar_folder): get default calendar
-	uri
-
-	* cal-client/cal-client.c (get_default_uri): use
-	cal_util_expand_uri
-
-	* cal-util/cal-util.h: new proto
-
-	* cal-util/cal-util.c (cal_util_expand_uri): tack on the file name
-	if its a file uri
-
-2002-05-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_delete_selected):
-	(e_tasks_complete_selected): show progress messages
-	on the status bar.
-
-2002-05-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: #include <gtk/gtkmain.h> to avoid warnings.
-
-2002-05-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-week-view.c (free_view_popup): only discard the popup if
-	we created one
-
-2002-05-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: refactored a bit, to not do things in idle loops.
-
-2002-05-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/print.c (print_day_details): modify the start and end hours
-	to accomodate all the events in the day
-
-	* gui/e-day-view.c (free_view_popup): only discard the popup if we
-	created one
-
-2002-04-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): remove setup_widgets
-	from here
-	(gnome_calendar_init): move setup_widgets back here
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/Makefile.am: Don't link to libibex anymore!!
-
-2002-04-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_pilot_settings): launch pilot
-	settings capplet
-
-	* gui/e-week-view.c (e_week_view_on_pilot_settings): ditto
-	
-2002-04-24  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view.c (free_view_popup): free the view popup
-	(e_week_view_show_popup_menu): add the view popup to the
-	"main_item" menu and listen for destruction
-
-	* gui/e-day-view.c (free_view_popup): as above
-	(e_day_view_on_event_right_click): as above
-
-	* gui/e-week-view.h: add class member
-
-	* gui/e-day-view.h: add a class member
-
-	* gui/gnome-cal.h: new protos
-
-	* gui/gnome-cal.c (set_view): set the instance view id properly
-	when switching views
-	(gnome_calendar_setup_view_popup): generate a view popup
-	(gnome_calendar_discard_view_popup): destroy a view popup
-
-2002-04-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.c (impl_Cal_get_alarms_in_range): raise an exception if the
-	backend's method returns NULL, since we can't send a NULL pointer to
-	ORBit.
-
-2002-04-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Collapsed notebook into two pages
-	and added accelerators for everything, as part of my config dialog
-	polishing project
-
-2002-04-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): properly
-	handle -ve recurrence values
-	(month_num_submenu_selection_done_cb): track the current date in
-	use
-	(make_recur_month_num_submenu): make a submenu of dates
-	(make_recur_month_num_menu): make the date/relation option menu
-	(month_num_menu_selection_done_cb): update the date properly and
-	keep both option menus consistent
-	(month_day_menu_selection_done_cb): keep both option menus
-	consistent
-	(make_monthly_special): listen for selection done signal
-	(make_recurrence_special): destroy old month_num_menu
-	(recurrence_page_fill_widgets): properly handle -ve recurrence
-	values
-
-2002-04-18  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-day-view.c (e_day_view_on_settings): show the settings
-
-	* gui/e-week-view.c (e_week_view_on_settings): ditto
-
-	* gui/calendar-commands.c (control_util_show_settings): show the
-	settings dialog
-
-	* gui/calendar-commands.h: new proto
-
-	* gui/control-factory.c (control_factory_new_control): set the
-	control as object data on the calendar
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/dialogs/meeting-page.c: Updated these to match the new
-	EPopupMenu.
-
-2002-04-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend.[ch] (cal_backend_get_query): new method.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_query): new method.
-
-	* pcs/cal.c (impl_Cal_get_query): call the CalBackend's implementation
-	instead of calling query_new directly.
-
-	* pcs/query.[ch]: fixed headers.
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): Fix this: Rodrigo's patch
-	used one of the functions I just removed. :)
-
-2002-04-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): use the default uri for
-	tasks (as stored in the configuration) when the calendar URI is not
-	a local one (connector, etc).
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* cal-client/cal-client.c (get_default_uri): Use new-and-improved
-	default folder URI config paths.
-
-	* gui/calendar-config.c (calendar_config_{get,set}_default_uri,
-	calendar_config_{get,set}_default_tasks_uri): Remove these. The
-	shell owns this information now. (Weren't being used anyway.)
-
-	* gui/component-factory.c (get_data_uri): Fix another place that
-	hardcoded tacking foo.ics on to the end of URLs.
-
-2002-04-08  Dan Winship  <danw@ximian.com>
-
-	* gui/component-factory.c (create_view): Add view_info arg. If the
-	view_info is non-empty and this is a calendar folder, set the
-	"view" property on the control's propertybag.
-
-	* gui/control-factory.c (calendar_properties_init): Set up the
-	"view" property.
-	(get_prop, set_prop): handle the "view" property by
-	getting/setting the GnomeCalendar's view. Unfortunately, this
-	doesn't actually work. See #23208.
-
-	* gui/calendar-commands.c (calendar_control_activate): Set the UI
-	component's container before calling
-	gnome_calendar_set_ui_component so that the search bar
-	initialization will work.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-db.[hc]: Remove dead files.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/GNOME_Evolution_Calendar.oaf.in: add config_item:type
-
-2002-04-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-itip-control.c: Fix a string.
-	
-2002-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c: simple fix for DB3 header inclusion in
-	Mac OS X, by Max Horn <max@quendi.de>
-
-2002-03-31  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (clean_up): free the my_address member
-	(find_my_address): fall back on a CN match if possible
-	(change_status): handle changing the status of a non-existent
-	address by adding a new attendee
-	(update_attendee_status): if the attendee response is not from a
-	user on the list of attendees, ask the user if they want to add
-	the attendee any how (as an optional participant)
-	(ok_clicked_cb): if we are suppose to rsvp and the status was ok,
-	but the attendee address is not known, find it
-	
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Set a priority for the
-	config item.  Rename to "Calendar and Tasks".
-
-2002-03-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/Makefile.am: s/libversit.la/libversit.a/
-
-	* conduits/todo/Makefile.am: ditto
-
-2002-03-29  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-calendar-table.c: implement new pop up menu items for
-	"Save as", "Print", "Assign Task", "Forward as iCalendar"
-
-	* gui/e-day-view.c: similarly, also "Publish Free/Busy
-	Information" and "New Meeting" and "New Task"
-
-	* gui/e-week-view.c: ditto
-
-	* gui/dialogs/task-editor.c (show_assignment): move the assignment
-	page stuff here
-	(task_editor_show_assignment): use it
-	(assign_task_cmd): ditto
-
-	* gui/dialogs/task-editor.h: new proto
-
-	* gui/dialogs/comp-editor.c (save_as_cmd): use new e-util file
-	selector function
-
-	* meeting-mockup.glade: Remove old file
-
-	* topic.dat
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* cal-util/Makefile.am: s/libversit.la/libversit.a/
-
-	* cal-client/Makefile.am: Likewise
-
-	* gui/Makefile.am: Likewise
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/cal-search-bar.c: Removed `search_menu_items'.
-	(cal_search_bar_menu_activated): Removed.
-	(cal_search_bar_class_init): Don't install.
-	(cal_search_bar_construct): No menu items here.
-
-2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/e-day-view.c: Updated to use new EPopupMenu API.
-
-	* gui/e-week-view.c: Updated to use new EPopupMenu API.
-
-	* gui/e-calendar-table.c: Updated to use new EPopupMenu API.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_activate): Call
-	`e_tasks_set_ui_component()' here to give it the
-	BonoboUIComponent.
-	(tasks_control_deactivate): Likewise, call it here to unset the
-	BonoboUIComponent.
-
-	* gui/e-tasks.c (e_tasks_set_ui_component): New.
-
-	* gui/calendar-commands.c (calendar_control_activate): Call
-	gnome_calendar_set_ui_component() here.
-	(calendar_control_deactivate): ...And here, with a NULL
-	BonoboUIComponent.
-
-	* gui/gnome-cal.c (gnome_calendar_set_ui_component): New.
-
-2002-03-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/main.c: use bonobo exception macros to tidy
-
-	* gui/itip-control-factory.c: ditto
-
-	* gui/gnome-cal.c: ditto
-
-	* gui/comp-editor-factory.c: ditto
-
-	* gui/calendar-commands.c: ditto
-
-2002-03-14  JP Rosevear  <jpr@ximian.com>
-
-	* idl/evolution-calendar.idl: add all day event editor mode
-
-	* gui/component-factory.c: clean up exception handling
-	(sc_user_create_new_item_cb): support the all day event id
-	(create_object): add a user creatable all day appointment item
-
-	* gui/comp-editor-factory.c (get_default_event): get a default
-	event either all day or starting at the top of the hour
-	(get_default_task): get a default task
-	(edit_new): support the all day event mode
-
-	* gui/calendar-commands.c: remove unused functions/verbs
-
-2002-03-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Add an
-	"evolution:config_item:icon_path" attribute so we get an icon for
-	the calendar preferences.
-
-2002-03-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Add <visible>False</visible>
-	to cal-prefs-dialog so it doesn't get shown when we load the Glade
-	file with libglade.
-
-	* gui/component-factory.c (owner_set_cb): Register the
-	ConfigControl factory.
-
-	* gui/tasks-control.c: Removed verb "TaskSettings".
-	(tasks_control_settings_cmd): Removed.
-
-	* gui/calendar-commands.c: Removed verb "CalendarSettings".
-	(settings_cmd): Removed.
-
-	* gui/dialogs/cal-prefs-dialog.c: Renamed `CalPrefsDialogPrivate'
-	to `DialogData'.  Replace `dialog' member with a `page' member.
-	Remove `toplevel_notebook' member.
-	(init_widgets): Renamed from `cal_prefs_dialog_init_widgets'.
-	Just get a DialogData.
-	(get_widgets): Get a DialogData pointer.
-	(cal_prefs_dialog_destroy): Removed.
-	(config_control_destroy_callback): New, signal handler for
-	::destroy for ConfigControl.
-	(cal_prefs_dialog_new): Create a new DialogData, connect all the
-	signal handlers.
-	(create_time_edit): Renamed from
-	`cal_prefs_dialog_create_time_edit'.
-	(cal_prefs_dialog_show): Removed.
-	(cal_prefs_dialog_button_clicked): Removed.
-	(show_task_list_config): Get a DialogData.
-	(show_config): Renamed from `cal_prefs_dialog_show_config'.
-	Likewise.
-	(update_task_list_config): Likewise.
-	(update_config): Renamed from
-	`cal_prefs_dialog_update_config'. Likewise.
-	(color_set_callback): New callback, makes the dialog report
-	changes when the setting in any of the color widgets is changed.
-	(widget_changed_callback): New callback, makes the dialog report
-	changes when any of the widgets changes status.
-	(connect_changed): New utility function to connect this callback
-	to all the widgets.
-	(setup_widgets): Connect all the widgets.
-	(cal_prefs_dialog_new): Call `setup_widgets'.
-
-	* gui/config-control-factory.c: New.
-	* gui/config-control-factory.h: New.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Add
-	OAFIID:GNOME_Evolution_Calendar_ConfigControl and
-	OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory.
-
-2002-03-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	Should fix #21240
-
-	* gui/alarm-notify/alarm-notify.c: replaced use of GnomeVFSURI
-	with EUri, to allow non-registered methods.
-
-2002-03-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_set_data): reverted my last
-	change of adding the METHOD property to the incoming request.
-
-	* gui/itip-utils.c (comp_string): added extra
-	X-MICROSOFT-CDO-REPLYTIME property for broken Outlook. Should fix
-	#20783.
-
-2002-03-04  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (comp_compliant): Reset the DTSTAMP of the new
-	component. (RFC2245 says DTSTAMP corresponds to the time the
-	particular iCalendar representation of the object was created.)
-	Fixes #21198.
-
-2002-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/print.c: remove unneeded parameter from print_text_size
-	everywhere
-	(get_font_for_size): calculate a font size based on the available
-	height
-	(print_text): calculate the top of where the font should be drawn
-	(print_text_size): use get_font_for_size
-	(print_day_background): use get_font_for_size
-
-2002-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_draw): pass the real table
-	to e_meeting_model_etable_view_to_model_row
-	(e_meeting_time_selector_item_paint_busy_periods): ditto
-
-	* gui/dialogs/meeting-page.c (right_click_cb): ditto
-	
-	* gui/e-meeting-model.h: update protos
-
-	* gui/e-meeting-model.c
-	(e_meeting_model_etable_model_to_view_row): take in to account the
-	fact the table used the without model
-	(e_meeting_model_etable_view_to_model_row): ditto
-
-2002-03-04  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tasks-control.c: added support for printing the Tasks table.
-	I hacked it a bit so the user could choose portrait or landscape mode.
-	This is bug #9677. ETable printing has a few issues, though, and it
-	isn't very pretty.
-
-2002-03-04  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (comp_subject): Prefix the subject with an
-	indicator like "Accepted" or "Cancelled" explaining what the
-	action is, since Outlook doesn't display any of that information
-	inline like we do. (20780)
-
-2002-02-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* calendar/gui/e-itip-control.c (e_itip_control_set_data): added the
-	METHOD property to the top level component we create.
-
-2002-02-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/control-factory.c (set_prop):
-	* gui/tasks-control.c (tasks_control_set_property): display an error
-	message if the call to gnome_calendar_open or e_tasks_open does not
-	return TRUE. Fixes #20346.
-
-2002-02-25  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): use
-	GNOME_Evolution_Composer_setBody rather than _setMultipartType and
-	_attachData now, to send a message containing just a text/calendar
-	part. Fixes 14705. Mostly.
-	(comp_content_type): Include the filename here since we can't add
-	a Content-Disposition now.
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/cal-search-bar.c (cal_search_bar_class_init): change
-	query_changed to search_activated.
-	(cal_search_bar_search_activated): rename
-	cal_search_bar_query_changed to this.
-
-2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (add_creatable_item): New helper
-	function.
-	(create_object): Add icons for the various user creatable items.
-
-2002-02-19  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (send_item): pass extra itip_send_comp
-	params
- 	(send_freebusy): ditto
- 	(ok_clicked_cb): ditto, including the timezones culled from the
-	component
- 
- 	* gui/e-week-view.c: pass extra itip_send_comp params
- 
- 	* gui/calendar-commands.c: ditto
- 
- 	* gui/e-day-view.c: ditto
- 
- 	* gui/dialogs/task-editor.c: ditto
- 
- 	* gui/dialogs/event-editor.c: ditto
- 
- 	* gui/dialogs/comp-editor.c: ditto
- 	
- 	* gui/itip-utils.h (itip_send_comp): update proto
- 
- 	* gui/itip-utils.c (foreach_tzid_callback): check the passed in
- 	zones, then the builtin time zones then the client
-
-2002-02-19  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (find_my_address): strip the ical value and
- 	do a case insensitive compare
- 	(find_attendee): ditto
- 	(change_status): put the error message here
- 	(ok_clicked_cb): don't update the item or rsvp unless
- 	change_status was successful, trip the ical value and do a case
- 	insensitive compare
- 
- 	* gui/itip-utils.c (get_address): strip the incoming address
- 	(itip_strip_mailto): use g_strncasecmp
- 	(comp_limit_attendees): strip the ical value and do a case
- 	insensitive compare
-
-2002-02-14  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-meeting-model.c: use new column enums
- 	(set_value_at): emit pre-change/cell change signals
- 	(destroy): destroy refresh_queue and refresh_data
- 	(init): init new elements
- 	(refresh_queue_add): if the attendee is being refreshed already,
- 	possibly update the start/end times to look for and update the
- 	callback info, otherwise add it to the queue
- 	(refresh_queue_remove): remove a refreshing attende from the queue
- 	(process_callbacks): make all the callbacks and remove the
- 	attendee from the queue
- 	(process_free_busy): process the callbacks immediately if parsing
- 	fails or on successful completion of processing
- 	(async_close): process free busy
-	(cursor_cb): we're only looking for one at a time now
- 	(refresh_busy_periods): idle callback to start processing the queue
- 	(e_meeting_model_refresh_all_busy_periods): add every row to the queue
- 	(e_meeting_model_refresh_busy_periods): add a single row to the queue
- 
- 	* gui/e-meeting-model.h: new protos, enum the columns
- 
- 	* gui/e-meeting-time-sel.c: use new compare time function
- 	(e_meeting_time_selector_construct): listen for a cell changed
- 	signal and use separate callbacks for rows_inserted and
- 	rows_deleted
- 	(e_meeting_time_selector_refresh_free_busy): util function to
- 	refresh free busy info
- 	(e_meeting_time_selector_on_update_free_busy): use above
- 	(rows_inserted_cb): refresh free busy on the new rows
- 	(cell_changed_cb): refresh free busy on the row when the address
- 	changes
- 	(rows_deleted_cb): redraw
- 
- 	* gui/e-meeting-utils.[hc]: a holding spot for a meeting time
- 	comparison function
- 
- 	* gui/Makefile.am: compile new files
-	
-2002-02-13  Rodrigo Moya <rodrigo@ximian.com>
-
-        * gui/control-factory.c (set_prop): don't append 'calendar.ics'
-	to the URI.
-	(get_prop): finished.
-
-	* gui/tasks-control.c (tasks_control_set_property): don't append
-	'tasks.ics' to the URI.
-	(tasks_control_get_property): finished.
-
-	* gui/gnome-cal.c (gnome_calendar_open):
-	* gui/e-tasks.c (e_tasks_open): append $filename.ics to the uri to be
-	opened if the uri is local. Leave intact in other cases.
-
-2002-02-08  Damon Chaplin  <damon@ximian.com>
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): check if
-	the CalComponentDateTime values are set before trying to use them.
-	Possibly fixes bug #18529.
-
-	* importers/icalendar-importer.c: added vCalendar importer and
-	intelligent GnomeCalendar importer code here, as it shares a lot of
-	code with the iCalendar importer.
-
-	NOTE: check_folder_type() needs to be finished at some point.
-	It needs a new shell Corba call so it can decide whether to import
-	events or tasks into the folder. Currently it just imports both.
-
-	* importers/main.c (importer_factory_fn): create vCalendar importer
-	or GnomeCalendar importer if required.
-
-	* importers/evolution-calendar-importer.h: added declarations for
-	creating a vCalendar importer and intelligent Gnome Calendar importer.
-
-	* importers/Makefile.am: added -DEVOLUTION_SOUNDDIR so the importer
-	knows what filename to use for audio alarms in vCalendar files.
-	Added libicalvcal-evolution to LDADD.
-
-	* importers/GNOME_Evolution_Calendar_Importer.oaf.in: added vCalendar
-	importer and intelligent Gnome Calendar importer.
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): return TRUE
-	if the event uses UTC. We don't want to flag all events from Outlook,
-	which use UTC.
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.glade: change custom widget
-	creator to e_url_entry_new
-
-	* gui/dialogs/task-details-page.c (get_widgets): get the url entry
-	and its entry
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.glade: add a custom widget created
-	with e_url_button_new
-
-	* gui/dialogs/task-details-page.c (task_details_page_init): init
-	url_button member to NULL
-	(init_widgets): set the url button entry
-	(get_widgets): get the url button
-
-	* gui/calendar-commands.c (pixmaps): use new all day event icon
-
-2002-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c: pass meeting boolean for
-	gnome_calendar_edit_object and gnome_calendar_new_appointment_for
-
-	* gui/e-week-view-event-item.c: ditto
-
-	* gui/e-week-view.c: ditto
-
-	* gui/tasks-control.c (confirm_expunge): kill warning
-
-	* gui/calendar-commands.c (new_meeting_cb): show a new meeting
-	dialog
-	(new_event_cb): pass new param
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): take meeting
-	boolean and show meeting page if true
-	(gnome_calendar_new_appointment_for): takeing meeting param and
-	pass to above
-	(gnome_calendar_new_appointment): add new param
-
-	* gui/gnome-cal.h: update proto
-
-	* gui/component-factory.c (create_component): take a comp editor
-	mode, determine vtype
-	(sc_user_create_new_item_cb): check for meeting user creatable
-	item
-	(create_object): add meeting as user creatable item
-
-	* gui/comp-editor-factory.c (edit_new): get a comp editor mode
-	now, determine vtype and show meeting page if required
-	(queue_edit_new): get comp editor mode
-	(impl_editNew): ditto, plus queue the mode directly instead of
-	determining the vtype
-
-	* gui/dialogs/event-editor.c (show_meeting): new internal util
-	function to show meeting page
-	(event_editor_show_meeting): show the meeting
-	(schedule_meeting_cmd): use show_meeting
-
-	* gui/dialogs/event-editor.h: new proto
-
-	* idl/evolution-calendar.idl: editNew takes a mode rather than a
-	type now
-
-	* cal-util/Makefile.am: fix includes
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus), gui/gnome-cal.c
-	(gnome_calendar_setup_view_menus): Made these use the new
-	GalViewMenus stuff.
-
-2002-02-06  Damon Chaplin  <damon@ximian.com>
-
-	* cal-util/cal-recur.c (cal_recur_from_icalproperty): convert months
-	from 1-12 to 0-11. Fixes bug #19235.
-
-2002-02-04  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (e_todo_gui_new): new gui routines
-	for conduit settings
-	(e_todo_gui_fill_config): ditto
-	(e_todo_gui_fill_widgets): ditto
-	(e_todo_gui_destroy): ditto
-	(e_todo_context_destroy): destroy new_cfg and gui properly
-	(local_record_from_comp): set the priority to the default setting
-	if none is set on the icalendar object
-	(fill_widgets): fill gui widgets
-	(create_settings_window): create gui
-
-2002-01-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (write_html): if this is a reply, print the
-	attendee status
-
-2002-01-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.glade: Use 1 instead of zero as the
-	minimum value for the repetitions spin button as we use a check
-	box to specify whether the alarm has repetitions or not.  Fixes
-	bug #19054.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/Makefile.am (evolution_calendar_importer_LDADD):
-	Ooops.  Forgot to use EVOLUTION_CALENDAR_LIBS here.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* conduits/calendar/Makefile.am: Use
-	EVOLUTION_CALENDAR_CONDUIT_LIBS and
-	EVOLUTION_CALENDAR_CONDUIT_CFLAGS.
-	* conduits/todo/Makefile.am: Likewise.
-
-	* cal-client/Makefile.am: Use EVOLUTION_CALENDAR_LIBS and
-	EVOLUTION_CALENDAR_CFLAGS.
-	* cal-util/Makefile.am: Likewise.
-	* gui/alarm-notify/Makefile.am: Likewise.
-	* gui/Makefile.am: Likewise.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Pass a NULL @icon to
-	`evolution_shell_component_add_user_creatable_item()'.
-
-2002-01-21  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (todoconduit_load_configuration):
-	return a new configuration struct, load default priority setting
-	(todoconduit_save_configuration): save default priority setting
-	(e_todo_context_new): dupe configuration
-
-	* conduits/calendar/calendar-conduit.c (e_calendar_context_new):
-	set ps to NULL
-
-2002-01-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): save the alarm string
-	in the correct variable (str), so it actually gets shown for alarms
-	with specific trigger times. Fixes bug #18801.
-
-2002-01-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): default component
-	classification to PUBLIC. Fixes internal bug #1066
-
-2002-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c: move all functions here,
-	get rid of header files, use e-pilot-settings to display gui
-
-	* conduits/todo/todo-conduit.c: as above
-	
-2002-01-14  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/gnome-cal.c (get_current_time): use icaltimetype_to_tm
-	
-2002-01-14  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	figure out when today is and highlight if it is not selected
-
-	* gui/e-week-view.h: enum the "today" color
-
-	* gui/e-week-view.c (e_week_view_realize): init the "today" color
-
-2002-01-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/alarm-notify/save.h: add protos
-
-	* gui/alarm-notify/save.c (save_blessed_program): records a
-	program as blessed
-	(is_blessed_program): checks to see if a program is blessed
-
-	* gui/alarm-notify/alarm-queue.c (procedure_notification_dialog):
-	popup a dialog notifying the user that is a program and let them
-	not see the dialog about this program again
-	(procedure_notification): use above
-
-2002-01-11  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-timezone-entry.c: 
-	* gui/e-itip-control.c (write_label_piece): 
-	* gui/calendar-config.c (on_timezone_set): translate timezone names
-	when displayed. Fixes bug #6544.
-
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_complete_cmd): new verb
-	callback
-	(sensitize_commands): set sensitivity of mark complete command
-
-	* gui/e-tasks.h: new proto
-
-	* gui/e-tasks.c (e_tasks_complete_selected): mark selected tasks
-	in the table as complete
-
-	* gui/e-calendar-table.h: new proto
-
-	* gui/e-calendar-table.c (e_calendar_table_complete_selected):
-	mark selected rows as complete
-
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/tasks-control.c (confirm_expunge): only need one warning
-	message now
-
-	* gui/e-tasks.c (create_sexp): change the logic to expunge all
-	completed tasks not just hidden ones
-
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/tasks-control.c (confirm_expunge): confirm expunging of the
-	tasks
-	(tasks_control_expunge_cmd): verb callback
-
-	* gui/calendar-config.c (config_read): read confirm expunge value
-	(calendar_config_write): write confirm expunge value
-	(calendar_config_write_on_exit): ditto
-	(calendar_config_get_confirm_expunge): get value
-	(calendar_config_set_confirm_expunge): set value
-
-	* gui/calendar-config.h: new proto
-
-	* gui/e-itip-control.c (start_calendar_server): kill warning
-
-	* gui/e-tasks.c (e_tasks_init): init query member to NULL
-	(set_status_message): util function to set status message
-	(e_tasks_open): use above
-	(cal_opened_cb): ditto
-	(create_sexp): create sexp of items to be deleted
-	(query_obj_updated_cb): remove any items found
-	(query_eval_error_cb): bail out on error
-	(query_query_done_cb): tidy when done
-	(e_tasks_delete_completed): set up query
-
-	* gui/e-tasks.h: new proto
-
-	* gui/calendar-model.c (query_query_done_cb): use g_warning
-	instead of printing to stderr
-	(query_eval_error_cb): ditto
-	(update_query): clear the status message if we can't create the
-	query
-
-	* gui/tag-calendar.c (resolve_tzid_cb): make this static
-
-2001-12-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c: remove needs send signal related
-	cruft
-	(save_comp_with_send): with send_component_dialog, indicate if the
-	meeting info is newly created or not
-	(real_edit_comp): remember if the dialog initially needs a send
-
-	* gui/dialogs/send-comp.c (send_component_dialog): take a "new"
-	parameter indicating whether the dialog should intimate if the
-	component to be sent is a new meeting or not
-
-	* gui/dialogs/send-comp.h: update proto
-
-	* gui/dialogs/comp-editor.c: remove no longer used needs_send
-	notification and signal
-
-	* gui/dialogs/comp-editor.h: remove proto
-
-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received): add new
-	param to send_component_dialog
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): add new
-	param to send_component_dialog
-
-2001-12-21 JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/comp-editor.h: inherit from bonobo window	
-
-	* gui/dialogs/comp-editor.c: inherit from bonobo window
-	(comp_editor_key_press_event): Look for an escape key press and
-	close the window if found
-
-2001-12-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes #17377, Evolution doesn't work on multi-depth displays.]
-
-	* gui/main.c (main): Push GdkRGB visual and colormap.
-
-2001-12-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):
-	go slow and clear the map if the last uri and the current uri do
-	not match
-	(post_sync): save the last uri
-
-	* conduits/calendar/calendar-conduit-config.h: handle a last uri
-	config option
-
-	* conduits/todo/todo-conduit-config.h: ditto
-
-    	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-    	use the open_default_calendar method
-    
-    	* conduits/todo/todo-conduit.c (start_calendar_server): same as above
-	
-    	* cal-client/Makefile.am: link with bonobo conf
-    
-    	* cal-client/cal-client.h: new protos
-    
-    	* idl/evolution-calendar.idl: make sure open method raises
-    	appropriate exceptions
-    
-     	* gui/e-itip-control.c (start_calendar_server): use
-     	cal_client_open_default_* calls
-     
-     	* cal-client/cal-client.c (real_open_calendar): do the real work
-     	of loading
-     	(cal_client_open_calendar): use above
-     	(get_fall_back_uri): get the basic local uri
-     	(get_default_uri): get the default uri from the config db
-     	(cal_client_open_default_calendar): open the default uri or the
-     	fallback if the method is unsupported
-     	(cal_client_open_default_tasks): same for tasks
-	
-2001-12-17  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (send_item): use get_real_item
- 	(get_refresh_options): uncomment out
- 	(get_real_item): obtain the real object which has the uid of the
- 	item received
- 	(show_current_todo): use get_refresh_options for refresh method
- 	and provide the description and summary from the real component
- 	since its not in the reply
- 	(show_current_event): ditto
- 	(send_item): use get_real_item
-
-2001-12-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (comp_limit_attendees): can't remove properties
-	in an iteration loop, so remove them outside the loop
-	(comp_minimal): don't set a recurid if there isn't one, add the x
-	properties to the clone
-	(comp_compliant): unref the clone for DECLINECOUNTER
-
-	* gui/e-itip-control.c (get_refresh_options): make function
-	available again
-	(show_current_event): use it here
-	(ok_clicked_cb): can't remove properties in an iteration loop, so
-	remove them outside the loop
-
-	* cal-util/cal-component.c (free_icalcomponent): properly free the
-	attendee list
-	(cal_component_rescan): don't destroy the alarm hash
-
-2001-12-13  Damon Chaplin  <damon@ximian.com>
-
-	* zones.h: new file to contain all timezone names for translation.
-	We won't be using the translations in 1.0.1, but it gives translators
-	time before we do use them in 1.0.2.
-
-	* Makefile.am: added zones.h to EXTRA_DIST.
-
-2001-12-12  JP Rosevear  <jpr@ximian.com>
- 
-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_release):
- 	ungrab the pointer before calling
- 	e_day_view_finish_long_event_resize
- 	(e_day_view_on_main_canvas_button_release): ditto
- 	(e_day_view_finish_long_event_resize): ask if the meeting should
- 	be sent
- 	(e_day_view_finish_resize): ditto
- 	(e_day_view_on_editing_stopped): ditto
- 	(e_day_view_on_top_canvas_drag_data_received): ditto
- 	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2001-12-11  JP Rosevear  <jpr@ximian.com>
-
- 	* gui/e-meeting-model.c (process_free_busy_comp): properly convert
- 	the dtstart and dtend times if they are UTC
- 	(cursor_cb): if we don't have anybody to get f/b info for, process
- 	the callbacks immediately
- 	(e_meeting_model_refresh_busy_periods): take start/end times,
- 	calculate the timet values with object timezone
- 	(e_meeting_model_etable_model_to_view_row): proper cast
- 	(e_meeting_model_etable_view_to_model_row): ditto
-	(async_open): bail out if we couldn't open properly
-
-	* gui/e-meeting-time-sel.c
- 	(e_meeting_time_selector_on_update_free_busy): use defines for
- 	determining the number of days before and after of free busy to
- 	request
- 	(e_meeting_time_selector_update_dates_shown): use defines for the
- 	number of days shown
- 
- 	* gui/e-meeting-model.h: update proto
-
-2001-12-10  Damon Chaplin  <damon@ximian.com>
-
-	* gui/control-factory.c (control_factory_new_control): removed code
-	that connects to GnomeCalendar's "dates_shown_changed" signal.
-
-	* gui/calendar-commands.c (gcal_calendar_dates_change_cb): 
-	(calendar_control_activate): moved it here, so it gets reconnected
-	whenever the control is activated. Fixes bug #15798.
-
-2001-12-10  Damon Chaplin  <damon@ximian.com>
-
-	* importers/GNOME_Evolution_Calendar_Importer.oaf.in: fixed executable
-	name. Fixes bug #16880.
-
-2001-12-08  JP Rosevear  <jpr@ximian.com>
-  
-  	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-  	if we have an alarm that can be represented on the pilot, set the
-  	appointment fields appropriately, if the duration has values for
-  	minutes and/or hours and/or days, use the lowest common
-  	denominator
-  	(comp_from_remote_record): if the appointment on the pilot has an
-  	alarm, find the first alarm an item currently had that is relative
-  	to the start and with a negative duration and update it (or create
-  	a new one if no valid ones exist)
-  
- 	* cal-util/cal-component.c (cal_component_get_alarm_uids): build
-  	list in the order they appear in the component so we get
-  	consisting order for the gui and for the pilot
- 
-2001-12-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_default_uri):
-	(calendar_config_get_default_tasks_uri): s/%/%s
-
-2001-11-09  Federico Mena Quintero  <federico@ximian.com>
-
-	(committed by Damon)
-
-	Fix bug #14699.
-
-	* pcs/query.c (QueryState): Added a state QUERY_WAIT_FOR_BACKEND
-	to indicate that the query is not populated as we are waiting for
-	the backend to be opened.
-	(query_init): Start in the QUERY_WAIT_FOR_BACKEND state.
-	(query_destroy): Only disconnect from the backend if we are in a
-	state that implies that we are connected to its signals.
-	(query_construct): If the backend is already loaded, immediately
-	set the state to QUERY_START_PENDING.
-	(backend_opened_cb): Disconnect from the backend's "opened"
-	signal.  Set the state to QUERY_START_PENDING.
-	(match_component): We can now only match components if the query
-	is in progress or if it is done.  Assert to that effect, and do
-	not ensure_sexp().
-	(match_component): Do not check for a nonexistent component using
-	g_return_if_fail().  Also, there is no need to ref/unref the
-	component.
-	(backend_obj_updated_cb): Assert to the effect of our state.
-	(backend_obj_removed_cb): Likewise.
-	(parse_sexp): Renamed from ensure_sexp().  Assert that the query
-	has not started.  Do not disconnect from the backend's signals
-	here, since we have no connections.
-	(start_query_cb): Set the state to QUERY_IN_PROGRESS here instead
-	of in populate_query().
-
-2001-12-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_default_uri):
-	(calendar_config_get_default_tasks_uri): if the key in the config
-	database does not exist, just return the local URIs, but never
-	return NULL
-
-2001-12-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): default
-	component classification to PUBLIC
-
-2001-12-06  Jon Trowbridge  <trow@ximian.com>
-
-        * gui/dialogs/event-editor.c (event_editor_destroy): Explicitly
-	destroy the EMeetingModel.  This is a hack to work around problems
-	with the reference counting; we are still leaking the
-	EMeetingModels.
-
-        * gui/e-meeting-time-sel.c
-        (e_meeting_time_selector_construct): Ref our EMeetingModel.
-        (e_meeting_time_selector_destroy): Unref the model.
-
-        * gui/e-meeting-model.c (destroy): Properly destroy
-	corba_select_names with a call to bonobo_object_release_unref.
-        (Fixes 14002)
-
-2001-12-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/event-page.glade: added entry for the LOCATION field
-
-	* gui/dialogs/event-page.c: added support for the new LOCATION entry
-	added in the Event editor.
-
-2001-12-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/itip-utils.c (comp_subject, comp_description):
-	Marked strings for translation.
-
-2001-12-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-meeting-model.c: 
-	* gui/calendar-model.c: make sure we call e_table_model_pre_change()
-	before changing the model.
-
-	* gui/calendar-config.c (calendar_config_configure_e_calendar_table): 
-	removed call to e_table_model_changed(). calendar_model_refresh()
-	results in that anyway.
-
-2001-12-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-calendar-table.etspec: disabled 'Alarms', 'End Date' and
-	'Show Time As' fields, as these are not useful for tasks. We may want
-	to reenable them later if we add a table view of calendar events.
-
-2001-12-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_cal_opened): connect to
-	"cal_set_mode" signal before calling cal_client_set_mode. Also,
-	s/cal_mode_set/cal_set_mode
-	(backend_go_offline): connect to "cal_opened" signal before calling
-	cal_client_open_calendar
-
-2001-11-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c (remove_item): only show the dialog if we
-	created it. Hopefully fixes bug #15774.
-	Also ifdef'ed out a lot of code that isn't currently used, including
-	code to use a label which is never created. The unused code was there
-	to support handling multiple iTIP objects in a message, but was never
-	updated when we switched to use HTML for the control. Fixes bug #16232.
-
-2001-11-28  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new_task): Set the category of
-	the new task to that of the search bar.  Fixes bug #15533.
-
-2001-11-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-itip-control.c (update_attendee_status):
-	* gui/itip-utils.c (comp_to_list): fixed typos in translatable
-	strings. Fixes Ximian #15456
-
-2001-11-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c: Substituted gnome_font_get_width_string() with
-	gnome_font_get_width_utf8() and gnome_font_get_width_string_n()
-	with gnome_font_get_width_utf8_sized(). Fixes calendar part of #15379.
-
-2001-11-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (date_value_to_string): Convert the buffer
-	to UTF8.
-	(calendar_model_value_to_string): Do not convert the string fields
-	to UTF8 again; they are already in UTF8.  Fixes the UTF8-related
-	bits of bug #15304.
-
-2001-11-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c: 
-	* cal-util/cal-component.h: #ifdef'ed out the LOCATION field for now,
-	since it wasn't supported everywhere, or in the .etspec file.
-
-2001-11-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-calendar-table.c: don't abort when e_table_selected_count()
-	returns odd values. There seems to be a bug in ETable. This is to
-	avoid bug #13843.
-
-2001-11-13  Federico Mena Quintero  <federico@ximian.com>
-
-	(committed to CVS by Damon)
-	Fixes bug #15137.
-	
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Do not try
-	to operate on the event if it gets deleted while stopping the
-	edition.
-	(e_day_view_on_event_double_click): Likewise.
-	(e_day_view_on_long_event_button_press): Likewise.
-	(e_day_view_on_event_button_press): Likewise.
-	(e_day_view_on_long_event_click): Likewise.
-	(e_day_view_on_event_click): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_text_item_event): Likewise.
-
-2001-11-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (pre_sync): remove silly
-	debug warning
-
-2001-11-13  Damon Chaplin  <damon@ximian.com>
-
-	* gui/alarm-notify/config-data.c (ensure_inited): 
-	* gui/calendar-config.c (config_read): 
-	* conduits/todo/todo-conduit.c (get_default_timezone): 
-	* conduits/calendar/calendar-conduit.c (get_default_timezone): 
-	make the timezone default to UTC. Fixes bug #14362.
-
-2001-11-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-week-view.c (selection_received): only change the day,
-	month and year for the start date, for not screwing up the start
-	time, which was being set to midnight always (Fixes Ximian #5287)
-	Also, deal correctly with VCALENDAR components
-	
-	* gui/e-day-view.c (selection_received): dela correctly with
-	VCALENDAR components being pasted
-
-2001-11-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/save.c (get_calendars_to_load): The last
-	argument to the bonobo_config_get_XXX_with_default() is a gboolean
-	*, not a CORBA_Environment *.  Fixes bug #14655.
-
-2001-11-11  JP Rosevear  <jpr@ximian.com>
-
- 	* pcs/cal-backend-file.c (free_busy_instance): recurrence
- 	expansion callback for free/busy
- 	(create_user_free_busy): expand recurrences and use date/time
- 	values for dtstart and dtend
- 
-2001-11-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.h: new protos
-
-	* gui/e-meeting-model.c (e_meeting_model_get_zone): accessor
-	(e_meeting_model_set_zone): ditto
-	(init): init to the calendar default zone
-	(process_free_busy_comp): take the zone to convert to as a param
-	(e_meeting_model_refresh_busy_periods): redraw properly
-
-	* gui/dialogs/schedule-page.c (update_time): set the zone of the
-	model
-
-2001-11-09  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_key_press): don't subtract a day
-	from DTEND. For DATE values we don't include the entire day now.
-	Fixes bug #14842.
-
-2001-11-09  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view-layout.c (e_week_view_layout_events): fix buffer
-	overflow. Fixes bug #10285 (the printing of lines & dates in the
-	printout of the month view).
-
-2001-11-09  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/dialogs/meeting-page.c
-	(meeting_page_fill_widgets): Convert strings to GTK+ encoding.
-	(meeting_page_destroy): Free allocated strings before freeing the list
-	itself.
-
-2001-11-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_timeout_handler): don't let an empty
-	event occur for all days when auto scrolling
-
-2001-11-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c 
-	(cal_backend_file_compute_changes_foreach_key): don't leak the
-	string returned by cal_component_get_as_string nor the temporary
-	CalComponent we create
-
-2001-11-08  JP Rosevear  <jpr@ximian.com>
-	
- 	* gui/e-itip-control.c (ok_clicked_cb): don't add the item, remove
- 	it if declining (in case it was added before)
- 	(remove_item): Since we can't discern between an item not found
- 	and another error, always say the removal is complete
-
-2001-11-07  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text):
-	Convert generated string to UTF-8.
-
-2001-11-07  JP Rosevear  <jpr@ximian.com>
-
- 	* gui/e-meeting-time-sel.c
- 	(e_meeting_time_selector_on_start_time_changed): emit changed
- 	signal
- 	(e_meeting_time_selector_on_end_time_changed): emit changed
- 	signal, if end time is now before start time and all day event,
- 	make sure a whole day is still selected
- 	(e_meeting_time_selector_drag_meeting_time): calculate the first
- 	and last_time's in whole days for all day events
- 	(e_meeting_time_selector_timeout_handler): calculate the drag time
- 	to be whole days for all day events and scroll the canvas even if
- 	we don't update the time so the user can see where they're headed
-
-2001-11-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): make sure
-	to remove all attendees from the model when we edit a new comp,
-	append the pages if they are needed and we weren't showing them
-	before
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): same as above
-
- 	* gui/dialogs/comp-editor.c (comp_editor_remove_page): check for a
- 	return value indicating the page was not found and return if so
- 
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/e-delegate-dialog.c: #include
-	"Evolution-Addressbook-SelectNames.h", not
-	"../Evolution-Addressbook-SelectNames.h".  Grrr.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_class_init):
-	add a changed signal
-	(e_meeting_time_selector_construct): emit changed signal
-	(e_meeting_time_selector_set_meeting_time): ditto
-	(e_meeting_time_selector_set_all_day): set the all day setting
-	(e_meeting_time_selector_autopick): emit changed signal
-	(e_meeting_time_selector_find_nearest_interval): find proper
-	interval when in all day mode
-	(e_meeting_time_selector_find_nearest_interval_backward): ditto
-	(e_meeting_time_selector_drag_meeting_time): for all day events,
-	move the time when past the 12 hour mark, and and always make sure
-	1 full day is selected, emit changed signal when appropriate
-	(e_meeting_time_selector_update_start_date_edit): set date and
-	time of day together
-	(e_meeting_time_selector_update_end_date_edit): ditto, and adjust
-	display time if all day event
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_draw): remove unused variable
-	(e_meeting_time_selector_item_button_press): for all day mode,
-	make the interval a whole day
-
-	* gui/dialogs/schedule-page.c (update_time): set the meeting time
-	selector setting instead of manual mucking with the e-date-edit
-	widgets
-	(init_widgets): listen to the changed signal of the meeting time
-	selector instead of propagating multiple events as it updates
-
-	* gui/dialogs/event-page.c (update_time): block time zone change
-	signals
-
-2001-11-05  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c (dup_date_edit_value): removed ';' in the wrong
-	place. Fixes bug #14421.
-
-2001-11-05  Dan Winship  <danw@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_LDFLAGS):
-	-export-dynamic for libglade custom widget.
-
-2001-11-04  Damon Chaplin  <damon@ximian.com>
-
-	* gui/comp-editor-factory.c (get_default_component): use TZID from the
-	builtin timezone, instead of using the location name.
-
-2001-11-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-util/cal-util.c (compute_alarm_range): Short-circuit the
-	calculation of the repeat time if there are zero repetitions.
-	(compute_alarm_range): I'm a moron.  De-reference alarm_start when
-	subtracting stuff from it!  Fixes bug #14209.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am: Added rules to generate
-	`Evolution-Addressbook-SelectNames.h'.
-
-	* gui/dialogs/comp-editor-util.h: #include
-	"Evolution-Addressbook-SelectNames.h" from this directory.
-
-2001-10-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.c: #include <string.h>
-
-2001-10-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (dn_query_obj_updated_cb): If a query is not in
-	progress, just retag the whole thing.  An event may change dates
-	and tag_calendar_by_comp() would not know how to untag the old
-	dates.  Fixes bug #10220.
-
-	* pcs/query.c (start_query_cb): Connect to the backend's
-	"obj_updated" and "obj_removed" signals here instead of in
-	query_construct().  If a query is started while another one is
-	notifying of an update, these signal connections would get appened
-	to the running signal (the one that triggered the notification
-	about an update) and the new signal handlers would also get
-	called.  We are really not interested in updates before we
-	populate the query, because we'll catch the changes anyways.
-
-2001-10-31  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #13723.
-
-	* gui/gnome-cal.h (GnomeCalendarClass): New signals
-	"calendar_focus_change", "taskpad_focus_change", and
-	"taskpad_selection_changed".  Renamed "selection_changed" to
-	"calendar_selection_changed".
-
-	* gui/gnome-cal.c (gnome_calendar_get_num_tasks_selected): New
-	function.
-	(setup_widgets): Connect to the focus event signals of the task
-	pad and the calendar view widgets.
-	(gnome_calendar_delete_selection): Renamed from
-	gnome_calendar_delete_event().
-	(gnome_calendar_cut_clipboard): Handle the current focus location.
-	(gnome_calendar_copy_clipboard): Likewise.
-	(gnome_calendar_paste_clipboard): Likewise.
-	(gnome_calendar_delete_selection): Likewise.
-	(table_selection_change_cb): New callback.
-
-	* gui/calendar-commands.c (sensitize_calendar_commands): Take in
-	whether we should unconditionally disable everything.
-	(sensitize_taskpad_commands): Analogous function to the above.
-	(gcal_calendar_focus_change_cb): New callback, used for calendar
-	views.
-	(gcal_taskpad_focus_change_cb): New callback, used for the
-	taskpad.
-
-	* gui/e-day-view.c (e_day_view_key_press): Use a better test for
-	keys that should start editing.  Fixes bug #6447.
-
-	* gui/e-week-view.c (e_week_view_key_press): Likewise.
-
-2001-10-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/calendar-model.c: Make the pre_changes and changes match
-	here.
-
-2001-10-31  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): send as mixed rather than
-	alternative
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/alarm-notify/save.c (KEY_CALENDARS_TO_LOAD):
-	Removed.
-	(KEY_NUM_CALENDARS_TO_LOAD): New key, containing the number of
-	calendars to load.
-	(BASE_KEY_CALENDAR_TO_LOAD): New base key name for the URIs of the
-	calendars to load.
-	(save_calendars_to_load): Rewrote to not use a sequence, to work
-	around an ORBit bug that causes bonobo-moniker-xmldb to crash.
-	(get_calendars_to_load): Likewise.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): disconnect
-	signals added in append_page(). Fixes Gtk-Critical warning about
-	GtkAccelGroup being added twice to a window.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): set a body for the message
-
-2001-10-30  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): call
-	GNOME_Evolution_Composer_setMultipartType to get a
-	multipart/alternative.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_start_time_changed): don't overwrite
-	memory
-	(e_meeting_time_selector_on_end_time_changed): ditto
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c (dup_date_edit_value): return NULL if passed
-	NULL. Should fix bug #14048.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-config.c (config_read): Do not ignore the
-	exceptions of the cases that do not have defaults.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_drag_meeting_time): if we are doing all
-	day stuff, make the drag increment 1 day at a time
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_component): Add
-	_() to a string that was missing it.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/meeting-page.c (table_canvas_focus_out_cb): Commit
-	the ETable click-to-add for if the dialog is being destroyed.
-	Should fix bug #13959.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): Allocate enough space for the
-	string!  (was missing the null terminator) Possibly fixes #13924.
-	Thanks a *LOT* to Michael Zucchi for running this through Purify.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_button_press): move in whole day
-	increments if we are in all day mode
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_start_time_changed): get rid of
-	localtime call
-	(e_meeting_time_selector_on_end_time_changed): ditto
-	(e_meeting_time_selector_update_start_date_edit): set the date
-	editor using the meeting time fields directly
-	(e_meeting_time_selector_update_end_date_edit): ditto
-
-	* gui/dialogs/schedule-page.c (update_time): do the set_show_time
-	stuff first
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day): don't
-	adjust the time, set the default timezone for date values
-
-2001-10-30  Dan Winship  <danw@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (INCLUDES):
-	s/BONOBO_HTML_GNOME_LIBS/BONOBO_HTML_GNOME_CFLAGS/
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (e_meeting_model_count_actual_attendees):
-	count the actual attendees (doesn't include people delegating
-
-	* gui/e-meeting-time-sel.c: use
-	e_meeting_model_count_actual_attendees (renamed)
-
-	* gui/e-meeting-time-sel-item.c: use
-	e_meeting_model_etable_view_to_model_row calls instead of calling
-	on the model directly, use e_meeting_model_count_actual_attendees
-
-	* gui/e-meeting-model.c
-	(e_meeting_model_etable_model_to_view_row): get the real mapping
-	(e_meeting_model_etable_view_to_model_row): ditto
-	(get_key): e-table-without callback
-	(duplicate_key): ditto
-	(free_gotten_key): ditto
-	(free_duplicated_key): ditto
-	(init): create without model
-	(e_meeting_model_etable_from_model): build etable from without
-	model
-
-	* gui/e-meeting-model.h: update protos
-
-	* gui/dialogs/meeting-page.c (right_click_cb): convert row from
-	view to model row
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): set to the default
-	timezone for DATE values, in case the user switches to a DATE-TIME.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c: handle DATE values for Start and Due dates.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/schedule-page.c: 
-	* gui/dialogs/event-page.c: 
-	* gui/dialogs/comp-editor-util.c: updated code to handle DATE values.
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): 
-	* gui/e-day-view.c (e_day_view_key_press): updated DATE code.
-
-	* gui/e-cell-date-edit-text.c: 
-	* gui/calendar-model.c: updated to support DATE values.
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances_of_rule): updated
-	to use DATE values in same way as Outlook - i.e. the DTEND date is
-	not included entirely. Though I did make it so that if the DTSTART
-	and DTEND used the same DATE value, it includes the entire day.
-	So 1-day events should be the same. Long All-Day events will be
-	1 day shorter.
-
-	* cal-util/cal-component.c (cal_component_get_start_plus_duration): 
-	don't subtract a day from the end date.
-
-	* gui/tasks-control.c: updated the EPixmap paths for Cut/Copy etc.
-	Removed Print & Print Preview paths, since we don't have menu commands
-	for these any more.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #10016.
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): Use
-	bonobo_ui_util_set_ui() instead of doing things by hand.  Hmmm, if
-	only that function had a way of telling us whether it failed so
-	that we could avoid setting the verb list...
-
-	* gui/dialogs/event-editor.c (event_editor_init): Do not pass the
-	filename with the full path so that Bonobo can find it in a smart
-	way.
-
-	* gui/dialogs/task-editor.c (task_editor_init): Likewise.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Use an
-	EMessageBox instead of a gnome_dialog_question so that the label
-	gets line breaking.  Fixes bug #11260.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #13649.
-
-	* gui/calendar-config.c
-	(calendar_config_get_use_default_reminder): New function.
-	(calendar_config_set_use_default_reminder): New function.
-	(calendar_config_get_default_reminder_interval): New function.
-	(calendar_config_set_default_reminder_interval): New function.
-	(calendar_config_get_default_reminder_units): New function.
-	(calendar_config_set_default_reminder_units): New function.
-	(config_read): Get the options for default reminders.
-	(calendar_config_write): Set the options for default reminders.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config):
-	Set the default reminder widgets from the config values.
-	(cal_prefs_dialog_update_config): Set the config values from the
-	widgets.
-
-	* gui/comp-util.c (cal_comp_event_new_with_defaults): New
-	function; creates a VEVENT component with the default alarm.
-
-	* gui/e-day-view.c (e_day_view_key_press): Use
-	cal_comp_event_new_with_defaults ();
-
-	* gui/e-week-view.c (e_week_view_key_press): Likewise.
-	* gui/calendar-model.c (calendar_model_append_row): Likewise.
-	* gui/comp-editor-factory.c (get_default_component): Likewise.
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): Likewise.
-
-	* cal-util/cal-component.c (ensure_alarm_properties_cb): Ensure we
-	have a DESCRIPTION property.
-	(cal_component_commit_sequence): Ensure we have the mandatory
-	alarm properties.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (process_section): process an individual
-	section here
-	(select_names_ok_cb): call above
-	(get_select_name_dialog): listen for ok:dialog signal
-
-2001-10-29  Damon Chaplin  <damon@ximian.com>
-
-	* importers/Makefile.am (evolution_calendar_importer_LDADD): 
-	* gui/Makefile.am (evolution_calendar_LDADD): 
-	* cal-util/Makefile.am (test_recur_LDADD): 
-	* cal-client/Makefile.am (client_test_LDADD): use libical-evolution.la
-
-	* gui/dialogs/schedule-page.c: save the timezone passed in for the
-	start time, so if our times are changed we use this. Also, if the
-	end time was passed in in a different timezone, convert it.
-	Also hide the time fields for DATE values. Note that DATE values still
-	do not work.
-
-	* gui/dialogs/meeting-page.glade: changed "Invite Others" to
-	"Invite Others..." to be consistent with the other page.
-
-	* gui/dialogs/event-page.c (times_updated):
-	(all_day_event_toggled_cb): set is_date if appropriate.
-
-	* gui/e-itip-control.c (write_label_piece): convert all UTC times to
-	the current timezone. Outlook sends simple, non-recurring, events as
-	UTC times, which isn't very useful.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/main.c (launch_alarm_daemon): Launch the alarm daemon as
-	soon as the calendar component is started.  Fixes bug #13867;
-	we can't really do much better than this.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/tasks-control.c (pixmaps): Fix the verb names for the
-	pixmaps in the Edit menu; they were out of synch with the XML
-	UI description.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* pcs/cal-factory.c (cal_factory_dump_active_backends): new
-	function.
-	(dump_backend): new function.
-
-	* pcs/cal-factory.h: add prototype for
-	cal_factory_dump_active_backends.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #12163.
-
-	* cal-util/cal-util.c (compute_alarm_range): Take alarm
-	repetitions into account.
-	(add_alarm_occurrences_cb): Add alarm repetitions.
-	(generate_absolute_triggers): Likewise.
-	(generate_absolute_triggers): Oops, absolute triggers are in UTC,
-	so convert them as such.  Also, pay attention to the timezones of
-	the dtstart and dtend properties.
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* importers/Makefile.am: include the header as a source so it gets
-	dist'ed.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/Makefile.am (INCLUDES):
-	s/BONOBO_CFLAGS/BONOBO_GNOME_CFLAGS/.
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (load_file_fn): fixed URI
-	construction, which was preventing importing into the root
-	calendar (~/evo/local/Calendar/)
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (is_all_day): handle date
-	values
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/: added evolution-calendar-importer binary, starting
-	with an iCalendar file importer
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit-config.h
-	(todoconduit_load_configuration): get the management object by id
-
-	* conduits/calendar/calendar-conduit-config.h
-	(calconduit_load_configuration): ditto
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.[ch] (calendar_config_get_default_uri):
-	(calendar_config_set_default_uri):
-	(calendar_config_get_default_tasks_uri):
-	(calendar_config_set_default_tasks_uri): new functions for setting
-	and retrieving the default calendar URIs
-
-	* gui/e-itip-control.c (init): don't use
-	hard-coded URI, but use the default calendar URI, as returned
-	by calendar_config_get_default_uri
-	(start_calendar_server): added a "gboolean tasks" parameter, so
-	that the local tasks.ics file is used if the calendar to be
-	started is for tasks when no default tasks URI is found in
-	the configuration
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (add_record): unref the
-	comp when finished
-
-	* conduits/todo/todo-conduit.c (add_record): ditto
-	
-2001-10-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): added break
-	statements after each case, when setting the classification.
-	Fixes bug #13772.
-
-2001-10-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (destroy_wombat_client): removed this
-	function, as we don't need to unref at all the WombatClient
-	object, since it is aggregated to the CalListener object, which
-	will take care of unrefing it (Fixes Ximian #12001)
-	(cal_client_open_calendar): create the WombatClient here
-
-2001-10-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c (print_todo_details): get the tasks directly from the
-	CalendarModel, so we get the filtering & sorting for free. Fixes
-	bug #10280. Hmm. This seems too easy. It isn't going to work is it...
-
-	* gui/gnome-cal.c (gnome_calendar_get_task_pad): new function to get
-	the TaskPad ECalendarTable, for printing.
-
-	* gui/calendar-model.c: 
-	* gui/calendar-config.c (calendar_config_get_hide_completed_tasks_sexp): 
-	split this out from calendar-model.c so we could use it for printing,
-	but ended up doing that a different way.
-
-	* gui/dialogs/task-page.c (init_widgets): removed a duplicated signal
-	connected to field_changed_cb().
-
-2001-10-27  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c (print_week_view): 
-	(range_selector_new): when the week start day is set to Sunday, we
-	have to be careful to make sure we print the correct week, since
-	the previous Saturday is actually printed first. Fixes bug #13687.
-	(print_week_summary): always set compress_weekend to true if
-	multi_week_view is FALSE (i.e. we are printing the week view).
-	Fixes bug #13688.
-
-	* gui/e-itip-control.c (send_freebusy): use the timezones from the
-	DTSTART and DTEND.
-	(write_label_piece): output the date-time and the timezone after it.
-	Note that we may want to convert it to the current timezone and display
-	that as well. Also converted COMPLETED to the current timezone.
-	And fixed all uses of old timezone functions.
-
-	* gui/dialogs/comp-editor.c (commit_all_fields): added function to
-	set the focus in the window to NULL, so all fields lose their focus,
-	so they emit "changed" signals and update their values if needed.
-	We call this when most menu commands are used, e.g. 'Save and Close',
-	'Print' etc. Fixes bug #11434. In future we should also check fields
-	are valid and show dialogs if they are not.
-
-	* gui/calendar-model.c (get_completed): use the completed value
-	properly. Fixes bug #13694.
-
-	* cal-util/timeutil.c (icaltimetype_to_tm_with_zone): don't check
-	from_zone and to_zone != NULL. A NULL zone is valid, it is for
-	floating times.
-
-2001-10-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_text_item_event): Cancel editing
-	if the user presses Escape.
-
-	* gui/e-week-view.c (e_week_view_on_text_item_event): Likewise.
-
-	* gui/cal-search-bar.c: #include <string.h>
-
-2001-10-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): Delete
-	appointments with empty summaries.  Fixes Ximian bug #780.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Added an
-	argument to specify whether we unconditionally want single
-	components to be considered as not having a summary.
-
-	* gui/comp-util.c (cal_comp_confirm_delete_empty_comp): New
-	function.
-
-	* gui/misc.[ch]: New files with miscellaneous utility functions;
-	moved string_is_empty() over from calendar-model.c.
-
-	* gui/calendar-model.c: Use the string_is_empty()
-	function from misc.c.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added misc.[ch] to
-	the list of sources.
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): touch on
-	lookup
-	(check_for_slow_setting): write touched only if slow sync
-	(match): touch on lookup
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	touch the record on lookup
-	(check_for_slow_setting): write touched only if slow sync
-	(pre_sync): don't touch on lookup
-	(match): touch on lookup
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/e-calendar.conduit.in: remove the merges as
-	valid sync types
-
-	* conduits/todo/e-todo.conduit.in: as above
-
-	* conduits/calendar/calendar-conduit.c (pre_sync): write out only
-	the touched records if we are doing copies
-
-	* conduits/todo/todo-conduit.c: as above
-	
-	* conduits/calendar/calendar-conduit-config.h
-	(calconduit_load_configuration): get the sync type
-
-	* conduits/todo/todo-conduit-config.h: as above
-	
-2001-10-26  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c (write_label_piece): convert the formatted
-	date to UTF-8.
-
-	* cal-util/cal-recur.c (CAL_OBJ_DEBUG): turn off debug functions.
-
-	* gui/dialogs/comp-editor-util.c (parse_contact_string): handle UTF8
-	correctly. Bug #4450. Good enough for 1.0.
-
-	* gui/e-week-view-event-item.c (e_week_view_draw_time): set the gc
-	color before drawing. Should fix bug #11469.
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): show or hide the
-	meeting page as appropriate. Note this may be called more than once,
-	if the task gets updated somewhere else and the user clicks 'Update
-	the object'. Hopefully fixes bug #12930.
-
-	* gui/print.c (print_comp_item): printed more fields and made a little
-	prettier. Fixes bug #9352.
-	(print_date_label): used the correct timezones for each date field.
-
-	* *.c: removed several debug messages.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):
-	make debug output more accurate
-
-	* conduits/todo/todo-conduit.c (check_for_slow_setting): ditto
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduits/todo/todo-conduit.c (pre_sync): remove the uid from the
-	map if was archived and is now deleted
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-2001-10-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar_table.c (delete_selected_components):
-	(selection_received): added status bar messages
-
-	* gui/e-day-view.c (e_day_view_cut_clipboard):
-	(selection_received): likewise
-
-	* gui/e-week-view.c (e_week_view_cut_clipboard):
-	(selection_received): likewise
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.h: modify fields
-
-	* conduits/todo/todo-conduit.h: as above
-
-	* conduits/calendar/calendar-conduit.c (print_remote): free the
-	struct after use
-	(e_calendar_context_new): explicitly init context fields
-	(e_calendar_context_destroy): free local records and properly free
-	changed hash elements
-	(start_calendar_server_cb): tidy
-	(start_calendar_server): ditto
-	(free_local): free a local record
-	(local_record_to_pilot_record): use a static buffer to avoid leaks
-	(local_record_from_comp): only copy over alarm stuff from the
-	original record, we sync everything else
-	(local_record_from_uid): unref the comp when we are done
-	(pre_sync): free change_id
-	(post_sync): ditto
-	(for_each): track locals
-	(for_each_modified): ditto
-	(free_match): use free_local
-
-	* conduits/todo/todo-conduit.c: as above
-	
-2001-10-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal.c (cal_construct): Get a fresh CORBA_Environment for
-	every CORBA call.  Hopefully will fix #11978, but I'm not sure
-	about what else could be happening.
-	(cal_get_password): Free the exception.
-
-2001-10-25  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c: used functions to get PUBLISH_OPTIONS etc.,
-	so we can translate them.
-
-2001-10-25  Damon Chaplin  <damon@ximian.com>
-
-	* cal-util/cal-recur.c (cal_obj_bysetpos_filter): subtract 1 from
-	any positive BYSETPOS value, since our array is 0-based.
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): 
-	(recurrence_page_fill_widgets): Outlook (2000) will not accept monthly
-	recurrences like BYDAY=2TU. Instead it uses BYDAY=TU;BYSETPOS=2.
-	So to be compatable with it we now do the same, although we still
-	accept and convert the old format.
-
-	* cal-client/cal-client.c (cal_client_get_component_as_string): new
-	function to return a complete VCALENDAR string containing a VEVENT
-	or VTODO with all the VTIMEZONEs it uses.
-
-	* gui/dialogs/comp-editor.c (save_as_ok): use above function so we
-	save the VTIMEZONE data with the VEVENT/VTODO. Fixes bug #8626.
-	Also made sure we output "METHOD:PUBLISH" since Outlook (2000) will
-	not import it otherwise.
-
-	* gui/dialogs/comp-editor.c (page_mapped_cb): 
-	(page_unmapped_cb): install/uninstall the GtkAccelGroup for the page.
-	(comp_editor_append_page): connect to the map/unmap signals to
-	install/uninstall the accelerators. (This is all for bug #11609,
-	though of course it doesn't work too well in GTK+ 1.2 anyway.)
-
-	* gui/dialogs/task-page.c (get_widgets): 
-	* gui/dialogs/task-details-page.c (get_widgets): 
-	* gui/dialogs/schedule-page.c (get_widgets): 
-	* gui/dialogs/recurrence-page.c (get_widgets): 
-	* gui/dialogs/meeting-page.c (get_widgets): 
-	* gui/dialogs/event-page.c (get_widgets): 
-	* gui/dialogs/alarm-page.c (get_widgets): got the GtkAccelGroup from
-	the original window, ref'ed it and placed it in the CompEditorPage
-	struct.
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy): unref
-	any GtkAccelGroup for the page.
-
-	* gui/dialogs/task-page.glade: changed '_Confidential' to
-	'Con_fidential' as it clashed with '_Contacts'. It now matches the
-	event editor as well.
-
-	* gui/dialogs/event-page.glade: 
-	* gui/dialogs/task-page.glade: Set CAN_FOCUS to TRUE for the custom
-	EDateEdit widgets, and set them as the accel targets of the labels.
-
-2001-10-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): show an error message when
-	we can't update the object on the calendar server
-
-2001-10-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/control-factory.c: Ifdef-ed out the PersistFile bits.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: The tasks folder does not
-	support the PersistFile interface; removed it.  Removed it as well
-	from the calendar folder since it is aggregated but not actually
-	implemented.
-
-2001-10-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (xfer_folder): Handle tasks folders as
-	well; was always using "calendar.ics" as the filename.
-
-2001-10-24  Damon Chaplin  <damon@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: added sections for Tasks
-	factory and control. I hope someone checks these!
-
-2001-10-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (xfer_folder): Fixed to only copy the
-	`calendar.ics' and `calendar.ics~' files.
-
-2001-10-24  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_objects): when
-	iterating over the subcomponents, use 'subcomp' rather than 'icalcomp'.
-	That meant it wasn't working at all well when an entire VCALENDAR
-	was passed in.
-
-	* cal-util/cal-component.c: handle DURATION property used instead of
-	DTEND or DUE. In cal_component_get_dtend/due we will return DTSTART
-	+ DURATION if necessary. In set_dtend/due we remove any DURATION
-	property. Fixes bug #11262.
-
-	* gui/e-meeting-model.c (build_etable): 
-	* gui/e-calendar-table.c (e_calendar_table_init): use U_ for the
-	ECellCombo popdown strings, as it expects UTF-8 strings.
-
-2001-10-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	track the spacer vbox
-	(e_meeting_time_selector_style_set): make sure the rows are the
-	correct size for the style
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_paint_day_top): slight adjustments
-	to where the text is drawn
-
-	* gui/e-meeting-time-sel.h: new member
-
-	* gui/e-meeting-model.c (build_etable): ensure uniform row height
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): mark
-	status as completed in appropriate places and don't overwrite
-	legitimate percentages and such
-
-2001-10-24  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #5282.
-
-	* cal-util/timeutil.c (icaltimetype_to_tm_with_zone): New function
-	to avoid copying the same code all over the place.
-	(icaltimetype_to_tm): Also set the tm.tm_wday.
-
-	* gui/alarm-notify/alarm-queue.c (queue_midnight_refresh): Use
-	time_day_end_with_zone().
-	(load_alarms_for_today): Likewise.  And oops, we were only
-	computing the times and not loading the alarms.
-	(obj_updated_cb): Likewise.
-	(load_alarms): Removed assertion that is no longer valid because
-	we may load the alarms for a client in two stages.
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): Convert absolute
-	trigger times to the local timezone.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading):
-	Convert the times to the local timezone.
-	(alarm_notify_dialog): Likewise, for the window title.
-	(alarm_notify_dialog): Set the window layer to WIN_LAYER_ONTOP.
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text): Use
-	icaltimetype_to_tm_with_zone().
-
-	* gui/alarm-notify/save.c (get_config_db): Made public.
-	(discard_config_db): Made public.
-
-	* gui/alarm-notify/config-data.[ch]: New files with functions to
-	fetch the calendar configuration data used by the alarm daemon.
-
-2001-10-23  Damon Chaplin  <damon@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_event_dates_match): make sure
-	we free all the CalComponentDateTime's when we are finished.
-
-	* gui/gnome-cal.c (gnome_calendar_notify_dates_shown_changed): just
-	return if no time range is set.
-
-2001-10-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_table_vadjustment_changed): adjust the
-	display canvas when the table scrolls
-	(e_meeting_time_selector_construct): listen for table scrolling
-
-2001-10-23  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (build_etable): no longer set the
-	scrollbar policy here
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_update_main_canvas_scroll_region): add an
-	extra row to the height so the click to add row can be properly
-	seen
-	(e_meeting_time_selector_construct): set the scrollbar policy for
-	the etable scrolled
-
-2001-10-23  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/timeutil.c (icaltimetype_to_tm): convert an
-	icaltimetype to a tm
-	(tm_to_icaltimetype): vice versa
-
-	* cal-util/timeutil.h: new protos
-
-	* conduits/calendar/calendar-conduit.c: replace all mktime and
-	localtime calls (except for debugging calls)
-
-	* conduits/todo/todo-conduit.c: ditto
-	(comp_from_remote_record): make sure the completed time is in UTC
-	
-2001-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-query.c (cal_query_construct) set priv->corba_query
-	to CORBA_OBJECT_NIL if there was an error
-
-2001-10-22  Damon Chaplin  <damon@ximian.com>
-
-	* idl/evolution-calendar.idl: added setDefaultTimezone() method.
-
-	* pcs/cal-backend.c (cal_backend_get_default_timezone): 
-	(cal_backend_set_default_timezone): new functions to call class
-	methods.
-
-	* pcs/cal-backend-file.c: lots of changes to handle the default
-	timezone and use it.
-
-	* pcs/query.c: use the default timezone.
-
-	* gui/dialogs/task-details-page.c (date_changed_cb): initialized
-	completed_tt.
-
-	* gui/dialogs/event-page.c: changed it to handle DATE values. The
-	'All Day Event' checkbox is only set now when the DTSTART and DTEND
-	are DATE values.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_free_dates): free the
-	CalComponentDateTime structs as well.
-
-	* gui/e-tasks.c: set the default timezone on the server.
-
-	* gui/tag-calendar.c: 
-	* gui/gnome-cal.c: 
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: updates to handle DATE values.
-
-	* gui/e-calendar-table.c (date_compare_cb): updated to use the new
-	ECellDateEditValue values, so it now works.
-	(percent_compare_cb): updated to use GPOINTER_TO_INT values.
-	(e_calendar_table_init): use an ECellPercent for the percent field
-	and an ECellDateEditText for the date fields.
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): return TRUE
-	if the DTSTART or DTEND is a DATE value. We don't want to show the
-	timezone icons for DATE values.
-
-	* gui/comp-editor-factory.c (resolve_pending_requests): set the default
-	timezone on the server.
-
-	* gui/calendar-model.c: major changes to support sorting properly.
-	For date and percent fields we now use subclasses of ECellText, so
-	we don't use a char* as the model value. For the percent field we now
-	use a GINT_TO_POINTER. For the date fields we now use a
-	ECellDateEditValue* as the value.
-
-	* gui/calendar-config.c (calendar_config_configure_e_cell_date_edit): 
-	set the timezone and use_24_hour flags of the new ECellDateEditText.
-
-	* conduits/todo/todo-conduit.c (pre_sync): 
-	* conduits/calendar/calendar-conduit.c (pre_sync): set the default
-	timezone on the server.
-
-	* cal-util/timeutil.c (time_days_in_month): removed debug message.
-
-	* cal-util/test-recur.c: try to handle timezones in the iCalendar
-	file properly, and updated to pass default timezone.
-
-	* cal-util/cal-util.c (cal_util_generate_alarms_for_comp):
-	(cal_util_generate_alarms_for_list): added default timezone argument.
-
-	* cal-util/cal-recur.c: changed many of the functions to take a default
-	timezone, to use to resolve DATE and floating DATE-TIME values.
-
-	* cal-client/cal-client.c (cal_client_set_default_timezone): new
-	function to set the default timezone.
-	(cal_client_ensure_timezone_on_server): new function to ensure that
-	a given timezone is on the server.
-
-	* gui/e-cell-date-edit-text.c: new subclass of ECellText to display
-	and edit a date value.
-
-	* cal-util/cal-recur.c (cal_obj_byday_expand_monthly): changed week_num
-	to -week_num when calculating the weeks to go back from the end of the
-	month for things like BYDAY=-2WE. Fixes bug #11525.
-	(cal_recur_generate_instances_of_rule): only go up to MAX_YEAR (2037).
-	We can't really handle anything past that anyway.
-	(cal_recur_ensure_rule_end_date): initialize cb_date.end_date to 0,
-	so if the RULE doesn't generate COUNT instances we save 0 as the
-	time_t.
-
-2001-10-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/tasks-control-factory.c (tasks_control_factory_fn): Put up a
-	warning dialog box if we failed to create the tasks control.
-	Fixes bug #13033.
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (set_date_label): write out the correct
-	time in the control
-
-	* pcs/cal.c (build_fb_seq): utility function to build sequences of
-	f/b data
-	(impl_Cal_get_free_busy): use above so we never return a NULL
-
-	* conduits/calendar/calendar-conduit-config.h
-	(calconduit_save_configuration): fix c/p error
-	(calconduit_load_configuration): ditto
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/meeting-page.c (meeting_page_destroy): we don't need
-	to save the state
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_destroy):
-	ditto
-
-	* gui/e-meeting-model.c (build_etable): listen for the etable
-	being destroyed
-	(table_destroy_cb): save the state when the etable is destroyed
-
-2001-10-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/schedule-page.c (init_widgets): listen for changes
-	in the date editors
-	(schedule_page_set_dates): update the times when they change
-	elsewhere
-	(update_time): set the time in the dialog
-	(time_changed_cb): notify of changed times
-	
-	* gui/dialogs/comp-editor.c (page_dates_changed_cb): don't call
-	the set dates function on the page that noted the change
-	(page_summary_changed_cb): same for set summary function
-	
-	* gui/dialogs/event-page.c (update_time): move time setting stuff
-	to util function
-	(event_page_set_dates): use it
-	(event_page_fill_component): ditto
-
-	* gui/e-meeting-time-sel.h: fix comment
-
-2001-10-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (add_uri_to_load): Do not assert
-	if we fail to load the URI list.  This would of course have been a
-	bonobo-conf activation problem.
-	(remove_uri_to_load): Likewise.
-
-	* gui/alarm-notify/notify-main.c (load_calendars): Likewise.
-
-	* gui/alarm-notify/alarm-queue.c (load_missed_alarms): Make the
-	time range half-open so that we do not display the last alarm
-	twice.
-
-2001-10-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_set_status_message): make
-	it a public function
-
-	* gui/e-tasks.c (e_tasks_open): display progress messages
-	(cal_opened_cb): clean up status bar messages
-
-	* gui/gnome-cal.c (gnome_calendar_open): display progress messages
-	(client_cal_opened_cb): clean up status bar messages
-
-2001-10-19  Rodrigo Moya <rodrigo@ximian.com>
-	
-	* gui/calendar-model.c (set_status_message): new function
-	(update_query): call set_status_message
-	(query_query_done_cb):
-	(query_eval_error_cb): clean up status bar messages
-	(get_location, set_location): new functions for setting and
-	retrieving the location in the calendar model
-
-2001-10-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c (owner_set_cb): keep a reference to the
-	EvolutionShellClient component
-
-	* gui/e-week-view.c (e_week_view_set_status_message): new function
-	(update_query): call e_week_view_set_status_message
-	(query_query_done_cb):
-	(query_eval_error_cb): clean up status bar messages
-
-	* gui/e-day-view.c (e_day_view_set_status_message): new function
-	(update_query): call e_day_view_set_status_message
-	(query_query_done_cb):
-	(query_eval_error_cb): clean up status bar messages
-
-	* gui/Makefile.am: added EVOLUTION_IMAGESDIR to CFLAGS
-	
-2001-10-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_invite_others_button_clicked): call
-	the invite others dialog in the model
-
-	* gui/e-meeting-attendee.c (e_meeting_attendee_get_atype): pick
-	attendee type based on role and cutype
-
-	* gui/e-meeting-attendee.h: remove proto
-
-	* gui/Makefile.am: compile select names idl
-
-	* gui/e-meeting-model.h: new proto
-
-	* gui/dialogs/meeting-page.c: remove invite others dialogs bits
-	from here
-
-	* gui/e-meeting-model.c (e_meeting_model_invite_others_dialog):
-	and put them here
-	
-	* gui/dialogs/Makefile.am: compile corba bits in parent dir
-
-	* gui/dialogs/comp-editor-util.h: reflect above in includes
-
-	* gui/dialogs/e-delegate-dialog.c: ditto
-
-	* gui/dialogs/schedule-page.c: ditto and clean includes
-	
-2001-10-18  Larry Ewing  <lewing@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c: add html widget
-	(url_requested_cb): add function to load images from file as they
-	are requested.
-	(write_html_heading): convert to using html.
-	(alarm_notify_dialog): convert to use html display.
-	(make_html_display): this is the function the custom widget in the
-	galde file uses to create the html widget.
-
-	* gui/alarm-notify/alarm-notify.glade: add placeholder for the
-	custom html widget.
-
-	* gui/alarm-notify/Makefile.am: add flags for gtkhtml and gal.
-	
-2001-10-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Adds session management for the alarm daemon.  Also makes it store
-	a list of calendars to be monitored.  Those calendars will all be
-	loaded when the alarm daemon starts up.
-
-	* idl/evolution-calendar.idl (AlarmNotify): Removed the ::die()
-	method.  The alarm daemon now handles termination via the session
-	manager's commands.
-
-	* gui/alarm-notify/notify-main.c (set_session_parameters): New
-	function, sets some parameters so that the session manager can
-	restart the daemon via the evolution-alarm-client program.  Also,
-	sets up the "die" signal so that the daemon can terminate when the
-	session ends.
-	(load_calendars): New function to load the calendars on startup.
-	(main): Set the session parameters.  Load the calendars on startup.
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): New
-	function, moved over from the impl_ function.  Added a
-	load_afterwards argument to indicate whether the calendar should
-	just be loaded or if it should also be added to the list of
-	calendars to load on startup.
-	(AlarmNotify_addCalendar): Use alarm_notify_add_calendar().
-	(AlarmNotify_removeCalendar): Remove the calendar from the list of
-	calendars to load on startup.
-
-	* gui/alarm-notify/save.c (save_calendars_to_load): New function,
-	saves a sequence of the URIs to load.
-	(get_calendars_to_load): New function, loads a sequence of
-	calendars to load.
-
-	* gui/alarm-notify/alarm.h: Removed stale prototype for alarm_init().
-
-	* gui/component-factory.c (remove_folder): Ask the alarm daemon to
-	stop monitoring alarms for the folder that is being deleted.
-
-2001-10-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_paint_day_top): use 12 or 24 hour
-	settings
-
-	* gui/e-meeting-time-sel.c: strings for 12 hour setting
-	(e_meeting_time_selector_construct): increase width slightly
-	
-	* gui/e-meeting-time-sel.h: extern the new char array
-
-2001-10-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-component.[ch] (cal_component_get_location):
-	(cal_component_set_location): new functions
-
-2001-10-18  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (process_callbacks): util routine to
-	handle calling back
-	(async_close): use above
-	(e_meeting_model_refresh_busy_periods): ditto
-
-2001-10-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): translate
-	1-5 priorites to 1-9 priorities better
-	(comp_from_remote_record): ditto
-
-2001-10-17  JP Rosevear  <jpr@ximian.com>
-	
-	* idl/evolution-calendar.idl: allow some decent exceptions
-
-2001-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c (match_component): there may be cases when the backend
-	will return an invalid component from a valid UID (an UID returned
-	by the get_uids method), so don't abort if that's the case
-
-2001-10-15  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: removed Help button. Do we have
-	any others?
-
-2001-10-15  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/comp-editor.c (set_icon_from_comp): remove warnings.
-
-2001-10-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day):
-	function to break up multi day events into single events for both
-	evo and the pilot and create new CalClientChange structures
-	(pre_sync): call above function, and adjust changed list if
-	necessary
-
-2001-10-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (is_all_day): util function
-	to determine if event is all day
-	(local_record_from_comp): use new util function
-	(comp_from_remote_record): kill use of deprecated time functions
-
-2001-10-13  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/comp-editor.c (real_edit_comp): call
-	set_icon_from_comp.
-	(set_icon_from_comp): set the window icon from the comp.
-	(make_icon_from_comp): get the icon path based on comp type.
-	
-	* gui/dialogs/Makefile.am (iconsdir): EVOLUTION_ICONSDIR bits.
-
-2001-10-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_send_comp): send
-	cancellation comp if necessary
-
-2001-10-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/alarm-page.c: return fill_component success
-
-	* gui/dialogs/task-page.c: ditto
-
-	* gui/dialogs/task-details-page.c: ditto
-
-	* gui/dialogs/schedule-page.c: ditto
-
-	* gui/dialogs/recurrence-page.c: ditto
-
-	* gui/dialogs/event-page.c: ditto
-
-	* gui/dialogs/meeting-page.c: use e_notice instead of
-	duplicate_error
-	(meeting_page_get_cancel_comp): duh, deleted_attendees is an array
-	now
-	(meeting_page_fill_component): spew gui errors if there is no
-	organizer or no attendees, return success
-
-	* gui/dialogs/event-editor.c (event_editor_send_comp): always call
-	parent method and don't send the cancellation comp if the method
-	is publish
-	(refresh_meeting_cmd): use the orginal comp to refresh
-	(forward_cmd): prompt the user for the version they want to send
-	(current, original)
-
-	* gui/dialogs/task-editor.c (forward_cmd): as above
-	(refresh_task_cmd): ditto
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_fill_component): return boolean of whether the
-	component could be filled or not
-
-	* gui/dialogs/comp-editor-page.h: update proto
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes): take a param
-	on whether to try and send or not
-	(comp_editor_get_current_comp): only fill component if its changed
-	(comp_editor_save_comp): prompt user as well
-
-	* gui/dialogs/comp-editor.h: change proto
-
-	* gui/itip-utils.c: replace error_dialog with e_notice
-	(comp_content_type): specify charset
-
-2001-10-11  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-itip-control.c: large reworking of i18n tagging and now
-	uses gtk_html_stream write and U_ where appropriate.  More to
-	come.
-
-2001-10-10  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-itip-control.c (init): set the default character set to
-	utf-8.
-
-2001-10-10  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-factory.c (lookup_backend): Return the original key in
-	the hash table if requested.
-	(backend_last_client_gone_cb): Use lookup_backend() so that we
-	have the URI mangling done for us.
-	(impl_CalFactory_open): The type should be GtkType *, not GtkType!
-
-2001-10-10  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-client.c (cal_set_mode_cb): remove unneeded
-	assertions
-
-2001-10-10  JP Rosevear  <jpr@ximian.com>
-	
-	* pcs/cal-factory.c (add_uri): fix logic checks
-
-	* gui/dialogs/event-editor.c (event_editor_init): init the
-	exisiting_org boolean
-	(set_menu_sens): base sensitivity on existing_org boolean
-	(event_editor_edit_comp): set exisiting_org boolean
-
-	* gui/dialogs/task-editor.c: same as above
-
-	* gui/calendar-offline-handler.c (add_connection): handle the
-	protocol or host being unknown
-
-	* cal-util/cal-component.c (cal_component_has_organizer):
-	implement
-
-2001-10-09  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #884.
-
-	* gui/alarm-notify/save.[ch]: New files with functions to
-	save/load the last notification time.
-
-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): Save the last
-	notification time.
-	(alarm_queue_init): Load the last notification time when the
-	daemon is inited.
-	(alarm_queue_add_client): Load the alarms that we missed while the
-	alarm daemon was not running.
-	(cal_opened_cb): Likewise.
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_SOURCES):
-	Added save.[ch] to the list of sources.
-
-2001-10-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (get_address): util function to get address
-	(itip_addresses_get_default): get only the default address
-	(itip_address_free): free single address
-	(itip_addresses_free): use above
-	(comp_limit_attendees): limit the number of attendees to one, the
-	user
-	(comp_sentby): set the sentby parameter if the user is not the
-	organizer
-	(comp_minimal): remove extraneous info for send (for refresh and
-	declinecounter)
-	(comp_compliant): remove all alarms, do various things to make the
-	components comply with itip spec based on method
-	(itip_send_comp): use comp_compliant method
-
-	* gui/itip-utils.h: new protos
-
-	* gui/e-itip-control.c: rescan the component when necessary
-	(get_next): don't get stuck in infinite loop if there are no
-	viewable components
-	(e_itip_control_set_data): if there are no viewable components,
-	spit an error message
-
-	* gui/dialogs/meeting-page.h: tidy
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): use
-	organizer's cn if possible
-	(other_clicked_cb): no longer doing the sent by stuff directly,
-	hide more widgets
-
-	* pcs/query.c: use bonobo exception stuff
-
-	* cal-util/cal-component.c (cal_component_rescan): have the comp
-	rescan its libical component (for when you change things directly)
-	(free_icalcomponent): take a param on whether to free the
-	component or just clean up the mappings
-	(cal_component_has_attendees): util function
-
-	* cal-util/cal-component.h: new protos
-	
-2001-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-factory.c (lookup_backend, add_backend): deal correctly with
-	URIs to be inserted into the hash table, so that we don't add the same
-	backend over and over because the URI strings were different (although
-	refering to the same backend)
-
-	* pcs/cal-backend-file.c (mail_account_*): moved to a common place
-	(cal_backend_file_open): check if "uristr != NULL" and not
-	"uri != NULL"
-
-	* pcs/cal-backend-util.c: moved to here
-
-	* gui/e-day-view.c: add missing header file
-
-2001-10-09  Dan Winship  <danw@ximian.com>
-
-	* gui/e-meeting-model.c (process_free_busy_comp): Fix incorrect
-	variable name check.
-
-2001-10-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): refactor functionality into
-	several function
-	(comp_string): if we are publishing, empty the attendee list
-
-	* gui/dialogs/event-editor.c (schedule_meeting_cmd): when we
-	schedule a new meeting, mark the event editor as changed
-
-	* pcs/cal.c (cal_class_init): get correct parent class
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): use the
-	generated ui component name
-
-2001-10-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c:
-	* gui/calendar-offline-handler.c:
-	* gui/comp-editor-factory.c: replace use of gnome_vfs_uri with e_uri
-
-	* gui/e-meeting-model.c (start_addressbook_server): make it return void,
-	since the return value does not mind
-
-	* pcs/cal.c:
-	* pcs/cal-factory.c:
-	* pcs/cal-backend.[ch]: don't use GnomeVFS for URI management
-	
-	* pcs/cal-backend-file.c: ditto, only use GnomeVFS for internal
-	operations
-
-	* cal-client/cal-client.c (cal_client_open_calendar): don't CORBA_exception_free
-	before checking for exceptions
-
-2001-10-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-calendar-table.etspec: Added priorities to a bunch of
-	these columns.  Fixes Ximian bug #7158.
-
-2001-10-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/comp-util.c (cal_comp_util_add_exdate): save the EXDATE as a
-	DATE-TIME value, since we know the exact time. Fixes bug #11278.
-	(Before we were setting is_date, but icaltime_from_timet_with_zone()
-	didn't convert it properly. We need to figure out how to handle DATEs
-	when using time_t's.)
-
-	* gui/dialogs/recurrence-page.c (get_exception_string): use
-	e_time_format_date_and_time() so we show the time as well, if the
-	exception is a DATE-TIME value.
-
-	* cal-util/timeutil.c: removed time_add_month(), time_year_begin(),
-	time_month_begin() & time_week_begin() - old pre-timezone functions
-	which we no longer use.
-
-	* cal-util/cal-recur.c (cal_recur_from_icalproperty): set
-	ir.until.is_date to FALSE before converting to a time_t.
-	Hopefully fixes bug #5034.
-
-2001-10-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/comp-editor.c (setup_widgets): Use
-	`bonobo_ui_component_new_default()', not
-	`bonobo_ui_component_new()'.
-
-2001-10-02  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-query.c: use bonobo-exception to tidy
-
-2001-10-02  JP Rosevear  <jpr@ximian.com>
-	
-	* conduits/calendar/calendar-conduit.c (nth_weekday): handle -1 as
-	well
-	(comp_from_remote_record): fix monthly by day recurrences and
-	handle "last" day type
-
-2001-10-01  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): unref the page
-	objects here, instead of in close_dialog(). (This was fixed a while
-	ago, but accidentally reverted.) Fixes bug #7543.
-
-2001-10-01  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):
-	Set the window state to sticky.  Thanks to Peter Teichman for the
-	suggestion.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Convert the comp exceptions to the pilot record
-	(comp_from_remote_record): record exceptions on the desktop and
-	use time zone stuff on recurrence end date
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-	
-	* pcs/cal-backend-file.c (cal_backend_file_compute_changes):
-	strdup the uid to avoid double free, write out only after
-	everything is done
-
-2001-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): don't use
-	gnome_vfs_uri_is_local on URIs created with
-	gnome_vfs_uri_new_private
-
-2001-09-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c (print_comp_item): use bound_text to print the summary,
-	so it wraps instead of being clipped to 1 line. Fixes part 3 of bug
-	#10285, I think.
-
-	* gui/dialogs/alarm-page.glade: left-aligned the Date/Time label.
-	Also set the width of the Summary & Date/Time labels to 10, and set
-	expand to TRUE, to make sure that the dialog doesn't keep getting
-	wider as the summary text on the main page gets longer. Could possibly
-	use an EClippedLabel here instead, so we get a '...' at the end if it
-	is clipped.
-
-	* gui/dialogs/recurrence-page.glade: changed Summary & Date/Time
-	widths as above.
-
-	* gui/print.c (print_calendar): use landscape mode for the month
-	preview.
-	(print_border_with_triangles): use EPSILON to account for floating
-	point errors. Hopefully fixes part 2b of bug #10285.
-
-2001-09-28  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Handle the fields and category we don't sync by making sure we
-	don't overwrite them
-	(local_record_to_pilot_record): use local record category
-	(pre_sync): track db info
-
-	* conduits/calendar/calendar-conduit.h: db info field
-
-	* conduits/todo/todo-conduit.[hc]: same as above
-
-	* pcs/cal-backend-file.c
-	(cal_backend_file_compute_changes_foreach_key): create a dummy
-	component of the right type and strdup the uid
-	(cal_backend_file_compute_changes): sync the db hash after each
-	change and free the uid
-
-2001-09-28  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-client/cal-client.c (cal_client_open_calendar): init the
-	execption rather than freeing it
-
-2001-09-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_construct): use bonobo-exception
-	for exceptions
-	(cal_client_open_calendar): likewise
-
-2001-09-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): Update pixmap menu paths;
-	/menu/ComponentToolsPlaceholder/Tools ->
-	/menu/Tools/ComponentPlaceholder .
-	* gui/tasks-control.c: Likewise.
-
-2001-09-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added InvalidURI and UnsupportedMethod
-	exceptions to the CalFactory interface
-
-	* pcs/cal-factory.c (impl_CalFactory_open): raise InvalidURI exception on
-	URI errors and UnsupportedMethod when we don't support the method for
-	a given URI
-	
-2001-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c: added support for using multiple calendar
-	factories
-	(cal_client_uri_list): use the list of factories loaded for this
-	CalClient
-
-2001-09-26  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-calendar-table.c (date_compare_cb): 
-	(percent_compare_cb): 
-	(priority_compare_cb): added comparison functions for these special
-	cell types. But the date and percent ones don't work yet due to the
-	use of static text buffers for return cell values.
-	(e_calendar_table_init): added the comparison functions to the
-	ETableExtras. NOTE: task_compare_cb() never seems to be called.
-	I'm not sure why it is there.
-
-	* gui/e-calendar-table.etspec: set the comparison function names for
-	the date/percent/priority fields.
-
-	* cal-util/cal-util.c (cal_util_priority_to_string): 
-	(cal_util_priority_from_string): new utility functions.
-
-	* gui/calendar-model.c (get_priority): 
-	(set_priority): used above utility functions, and removed the warning
-	dialog which isn't useful now that the field isn't editable.
-
-	* gui/dialogs/event-page.c (times_updated): handle timezones and for
-	all-day events make sure it stays an all-day event after adjusting.
-	Fixes bugs #5945 and #10222.
-
-	* gui/calendar-commands.c (pixmaps): fixed the E_PIXMAP paths - the
-	edit items were moved beneath 'EditPlaceholder'. This gets rid of
-	those long Bonobo warnings! (and we get the icons back)
-
-	* gui/dialogs/comp-editor.c (pixmaps): removed the PrintPreview toolbar
-	icon, since it doesn't appear in the xml file. Gets rid of warning.
-
-	* gui/dialogs/event-page.c (notify_dates_changed): new function to
-	emit the notification signal when the dates are changed. It also
-	handles timezones now.
-
-	* gui/dialogs/comp-editor-page.h (CompEditorPageDates): used
-	CalComponentDateTime for start/end/due so we have the timezone as well
-	as the time.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_dates): updated to get
-	the timezones as well as the times.
-	(comp_editor_free_dates): new function needed to free all the structs.
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): added call
-	to preview_recur() to make sure the preview gets updated.
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_widgets): free the
-	CompEditorPageDates struct after use.
-
-	* gui/tag-calendar.c (tag_calendar_by_comp): added 'comp_is_on_server'
-	argument. If FALSE, we try to use builtin timezones first. This is
-	needed for the recurrence page of the event editor, because the
-	timezones may not have been added to the server yet. This and the
-	changes to the notification stuff should fix bug #5034.
-
-	* gui/gnome-cal.c (dn_query_obj_updated_cb): call above
-	tag_calendar_by_comp() with TRUE since the events will be on the
-	server in this case.
-
-	* gui/e-day-view-layout.c:
-	* gui/e-day-view.c: made sure an event always takes up at least one
-	row, even when the start & end times are the same. Fixes bug #5944.
-	I don't know if we should try to also handle events with the end time
-	before the start time.
-
-	* gui/e-week-view.c (e_week_view_style_set): check that the small font
-	is actually smaller than the normal font. If it isn't, don't use it.
-	Hopefully fixes bug #6876.
-	(e_week_view_on_new_appointment): if only one day is selected, then
-	we set the initial time of the event to 1/2-hour from the start of the
-	working day, to differentiate 'New Appointment' from 'New All Day
-	Event'. Fixes bug #8892.
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): do the same as the
-	above.
-
-2001-09-26  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes the GUI part of bug #7892.
-
-	* gui/dialogs/alarm-page.c (get_alarm_duration_string): Return
-	NULL if the duration is zero.
-	(get_alarm_string): Handle duration of zero.  Also, hopefully
-	make the strings be more l10n-friendly.
-
-	* gui/alarm-notify/alarm.c (alarm_ready_cb): I am a moron.  Fix
-	reversed test.
-
-2001-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): disconnect
-	signals first thing
-
-2001-09-26  Dan Winship  <danw@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_LDFLAGS): Add
-	-export-dynamic to make glade custom widgets work on non-Linux.
-
-2001-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.h: added CAL_MODE_INVALID to CalMode enum
-
-2001-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.h: new proto
-
-	* pcs/cal.c (impl_Cal_set_mode): implement set mode method
-	(cal_class_init): set setMode function in epv
-	(cal_notify_mode): notify listener of mode change
-
-	* pcs/cal-factory.c (add_uri): deal with UriType renaming
-
-	* pcs/cal-backend.h: add new virtual methods and protos
-
-	* pcs/cal-backend.c (cal_backend_class_init): init new virtual
-	methods to null
-	(cal_backend_set_mode): sets mode
-	(cal_backend_get_mode): gets mode
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): overide
-	get_mode and set_mode methods
-	(cal_backend_file_get_mode): return mode
-	(notify_mode): have listeners notified of the set mode call
-	(cal_backend_file_set_mode): set the mode by indicating not
-	supported
-
-	* cal-client/cal-listener.h: update proto
-
-	* cal-client/cal-listener.c (impl_notifyCalSetMode): implement set
-	mode callback
-	(cal_listener_construct): take set mode callback
-	(cal_listener_new): ditto
-
-	* cal-client/cal-client.h: update protos, add signal proto
-
-	* cal-client/cal-client.c (cal_client_class_init): add
-	cal_set_mode signal
-	(cal_set_mode_cb): handle set mode callback from listener
-	(cal_client_open_calendar): pass additional param to cal_listener_new
-	(cal_client_set_mode): wrapper to set the calendar mode
-
-	* idl/evolution-calendar.idl: make UriType into CalMode, add
-	SetModeStatus enum and notifyCalSetMode method to the listener
-
-	* gui/calendar-offline-handler.c (create_connection_list): fetch
-	the uri list ourselves
-	(impl_prepareForOffline): reflect param change of
-	create_connect_list
-	(update_offline): ditto
-	(backend_cal_set_mode): set mode call back
-	(backend_cal_opened): cal opened call back, set mode to local
-	(impl_goOffline): reflect UriType renaming
-
-	* cal-util/cal-util.h: rename UriType to CalMode
-
-2001-09-25  Federico Mena Quintero  <federico@ximian.com>
-
-	Warning fixes courtesy of Chris Lahey <clahey@ximian.com>.
-
-	* gui/e-itip-control.c (write_html): Warning fixes.  Also, don't
-	strdup() more than necessary.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_refresh_cb):
-	Warning fixes.
-
-	* gui/itip-utils.c (itip_addresses_get): Warning fixes.
-
-	* gui/print.c (print_day_background): Warning fixes.
-
-	* gui/dialogs/alarm-options.c (alarm_to_aalarm_widgets): Warning
-	fixes.
-	(alarm_to_palarm_widgets): Likewise.
-
-	* gui/dialogs/delete-comp.c: #include "../calendar-config.h"
-
-2001-09-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm.c (alarm_ready_cb): Check that the
-	timeout is not set up before we create a new one; the alarm_fn
-	callback may cause the alarm system to re-enter and add a new
-	alarm.  Fixes bug #10840.
-	(pop_alarm): Assert that there is at least one alarm in the queue.
-
-2001-09-25  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.c: use bonobo-exception stuff to clean code
-
-	* pcs/cal-factory.c (add_uri): add uri to the list if the type
-	matches
-	(impl_CalFactory_uriList): implement uriList method
-
-	* pcs/cal-backend.h: new virtual function member
-
-	* pcs/cal-backend.c (cal_backend_is_remote): call virtual function
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): override
-	virtual function
-	(cal_backend_file_is_remote): new virtual function, always return
-	FALSE
-
-	* idl/evolution-calendar.idl: uriList factory call, with flags for
-	types to get
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): cast to remove
-	warning
-
-	* gui/e-itip-control.c (write_label_piece): kill warnings by take
-	const char *
-
-	* gui/component-factory.c (create_object): aggregate offline
-	interface
-
-	* gui/Makefile.am: compile new files
-
-	* calobj.[hc]: Remove obsolete files
-
-	* cal-util/cal-util.h: enum URI types for uriList call
-
-	* cal-client/cal-client.c (build_uri_list): build list from string
-	sequence
-	(cal_client_uri_list): factory call to get uri list
-
-	* cal-client/cal-client.h: new proto
-
-	* cal-client/cal-client.c: use bonobo exception stuff to clean
-	code
-
-	* gui/calendar-offline-handler.[hc]: Start some skeleton routines
-	for online/offline handling
-
-	* pcs/cal-factory.c (launch_backend_for_uri): use accessor and
-	remove FIXME
-
-2001-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (set_date_label): base text on component
-	type
-
-2001-09-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c: don't use gnome_vfs_uri_new_private
-	(fixes Ximian #10544)
-
-2001-09-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c: #include a few files we were missing
-	from libgnomevfs.
-
-2001-09-20  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (load_db): gets a config db
-	(cal_backend_file_destroy): release config db
-	(cal_backend_file_init): use load_db
-	(mail_account_get): gets a mail account by number
-	(mail_account_get_default): gets the default mail account
-	(mail_account_is_valid): looks to see if any accounts have the
-	given address
-	(create_user_free_busy): modularize so we can call multiple times
-	if necessary, set organizer
-	(cal_backend_file_get_free_busy): if the list of users is null,
-	use the default account otherwise get the same info for each
-	address that is an identity in the mailer
-
-	* gui/itip-utils.c (itip_addresses_get): s/gint/glong/ for bonobo
-	conf returns
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): fix problems
-	from a merge so that we publish 6 weeks of free/busy information
-	again
-
-2001-09-20  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_destroy): make
-	sure to release the ref on priv->comp.
-
-	* gui/dialogs/comp-editor.c (real_edit_comp): make sure to release
-	the ref on priv->comp.
-
-2001-09-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (audio_notification): Display a
-	notification message always, in addition to playing the sound.
-	(procedure_notification): Present a confirmation dialog before
-	actually running the alarm's program.
-	(procedure_notification): Use gnome_execute_shell() instead of
-	gnome_execute_async() so that we handle multiple arguments
-	properly.  Plus, it is most likely what the user expects.
-	(mail_notification): Display a message about unsupported email
-	reminders instead of blindly dropping the alarm.
-
-	* gui/dialogs/alarm-options.glade: Added an explanatory message
-	about mail alarms not being supported.
-
-	* gui/dialogs/alarm-page.glade: Removed the "Send an email"
-	option.
-
-	* gui/dialogs/alarm-page.c (action_map): Removed CAL_ALARM_EMAIL.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (init_widgets): listen for model
-	changes
-	(task_editor_edit_comp): add the attendees to the model and notify
-	of need send
-	(row_count_changed_cb): mark as changed when row added/deleted
-	(model_row_changed_cb): mark as changed when row changes
-	
-	* gui/dialogs/event-editor.c (init_widgets): listen for model
-	changes
-	(event_editor_init): flip page order
-	(event_editor_edit_comp): set needs send value
-	(schedule_meeting_cmd): flip page order
-	(row_count_changed_cb): mark as changed when row added/deleted
-	(model_row_changed_cb): mark as changed when row changes
-	
-	* gui/dialogs/schedule-page.c: remove model change notification
-	stuff
-	(schedule_page_fill_widgets): no need to do the needs_send here
-	because the editor handles this since it owns the model
-
-	* gui/dialogs/event-editor.c (init_widgets): listen for model
-	changes
-	(event_editor_init): flip page order
-	(event_editor_edit_comp): set needs send value
-	(schedule_meeting_cmd): flip page order
-	(row_count_changed_cb): mark as changed when row added/deleted
-	(model_row_changed_cb): mark as changed when row changes
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): no need
-	to do the needs_send here because the editor handles this since it
-	owns the model
-	(invite_entry_changed): ditto
-
-	* gui/dialogs/comp-editor.c (comp_editor_set_changed): new
-	accessor
-	(comp_editor_get_changed): ditto
-	(comp_editor_set_needs_send): ditto
-	(comp_editor_get_needs_send): ditto
-
-	* gui/dialogs/comp-editor.h: new protos
-
-	* gui/itip-utils.c (itip_addresses_get): reflect configuration
-	path changes in the mailer
-
-	* gui/e-meeting-model.c: remove commented out code, ifdef one
-	section for later
-
-2001-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-factory.c (cal_factory_oaf_register): add a new parameter
-	(const char *iid) to specify the OAFIID of the factory being
-	registered
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (e_meeting_model_refresh_busy_periods):
-	remove silly debug #if 0
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): g_list_free
-	rather than g_free
-
-	* gui/e-itip-control.c (write_html): eliminate code path that
-	caused double freed memory
-
-2001-09-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/schedule-page.*: A page that shows the meeting time
-	selector and free/busy data for attendees
-
-	* gui/dialogs/meeting-page.c: use the meeting model to track/edit
-	attendees, remove table value conversion routines and simple table
-	routines
-	(set_attendees): take a pointer array
-	(meeting_page_destroy): destroy the pointer array, save state
-	(meeting_page_init): new pointer array
-	(meeting_page_fill_widgets): don't null the deleted attendees
-	field
-	(popup_delegate_cb): array add
-	(popup_delete_cb): array add
-	(cleanup_attendees): iterate over the array to unref now
-	(meeting_page_fill_widgets): don't null out fields, no need to add
-	attendees here
-	(invite_entry_changed): use e_meeting_attendee routines
-	(popup_delegate_cb): ditto
-	(popup_delete_cb): ditto
-	(meeting_page_new): take new arg and pass it to construct
-	(meeting_page_construct): take new arg, use e-meeting-model
-	routines to construct table
-
-	* gui/dialogs/task-editor.c (task_editor_init): new meeting model
-	(task_editor_destroy): unref the model
-
-	* gui/dialogs/event-editor.c (event_editor_init): make new model
-	and pass it to meeting and schedule pages
-	(event_editor_set_cal_client): virtual function, set meeting model
-	client
-	(event_editor_edit_comp): add the attendees to the model
-	(event_editor_destroy): unref model
-	
-	* gui/dialogs/comp-editor.h: add virtual function
-	* gui/dialogs/comp-editor.c (comp_editor_set_cal_client): make
-	set_cal_client a virutal function
-
-	* gui/e-meeting-types.h: generally useful type defines
-
-	* gui/e-meeting-time-sel*.[hc]: Move here and use an e-table for
-	the attendee list and extract display information from the new
-	meeting model and attendees
-
-	* gui/e-meeting-time-sel.etspec: spec for the table
-
-	* gui/e-meeting-attendee.[hc]: meeting attendees for the model,
-	with to/from conversions for CalComponentAttendee structure, emits
-	changed signal and allows getting and setting of free busy
-	periods
-
-	* gui/e-meeting-model.[hc]: move the model out on its own
-
-	* gui/e-itip-control.c (write_error_html): clean up warnings
-	
-2001-09-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #6350.
-
-	* gui/component-factory.c (remove_folder): Use a simplified method
-	for removing our folder data; we just need to remove calendar.ics
-	or tasks.ics and the corresponding backup files.
-
-2001-09-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #2830.
-
-	* gui/calendar-config.c (calendar_config_get_confirm_delete): New
-	function.
-	(calendar_config_set_confirm_delete): New function.
-	(config_read): Get the default value for the ConfirmDelete option.
-	(calendar_config_write): Set the value of ConfirmDelete.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Handle the
-	configuration option for confirmation.
-
-	* gui/dialogs/cal-prefs-dialog.c (CalPrefsDialogPrivate): Added
-	the fields for the Other page.
-	(get_widgets): Handle the new widgets.
-	(cal_prefs_dialog_show_config): Likewise.
-	(cal_prefs_dialog_update_config): Likewise.
-
-2001-09-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client-multi.[ch]: new class for managing multiple
-	calendars, with an API very similar to the CalClient one,
-	for ease of transition from one to the other
-
-	* gui/component-factory.c (xfer_folder, remove_folder, create_folder):
-	reworked to be able to manage folders for any calendar backend, and
-	not only the file: one
-
-2001-09-18  Rodrigo Moya <rodrigo@ximian.com>
-	
-	* idl/evolution-calendar.idl: changed signature for the getFreeBusy
-	method, to return a sequence of CalObj's, and added sequence of users
-	as a new parameter to that method
-
-	* cal-client/cal-client.c (cal_client_get_free_busy): adapted to new
-	IDL method signature, by adding a new "GList *users" parameter, for
-	callers to be able to specify a list of users
-
-	* pcs/cal-backend.[ch] (cal_backend_get_free_busy):
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): add the
-	"GList *users" parameter. In cal_backend_file_get_free_busy, call
-	lookup_component to get the CalComponent for each uid, instead
-	of calling cal_backend_get_object, which meant converting the
-	component to a string and then parsing it again.
-
-	* cal-client/client-test.c (cal_opened_cb):
-	* gui/e-itip-control.c (send_freebusy):
-	* gui/calendar-commands.c (publish_freebusy_cmd): adapted to
-	new getFreeBusy method signature
-
-2001-09-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c: added a timeout to refresh the list every
-	10 minutes. Not ideal, as the user may be editing a task when it gets
-	refreshed.
-	(adjust_query_sexp): use the 'completed-before?' operator to filter
-	out tasks according to the config settings.
-
-	* gui/dialogs/task-details-page.c (task_details_page_fill_widgets): 
-	added support for the 'Completed' date. This code must have got lost
-	somewhere, as it used to work.
-	(date_changed_cb): set the priv->updating flag while updating the other
-	widgets.
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_objects): made sure
-	we freed the components.
-
-	* pcs/query.c (func_completed_before): added 'completed-before?'
-	operator.
-
-	* gui/calendar-config.c (calendar_config_configure_e_cell_date_edit): 
-	don't set the lower & upper hour. Use 0-24 like the EDateEdit does.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config): set
-	the 12/24-hour time format options sensitive only if we support both.
-
-	* gui/calendar-config.c (config_read): if the locale doesn't define
-	'am' and 'pm' strings then we must use 24-hour format.
-
-	* gui/calendar-commands.c (calendar_set_folder_bar_label): don't
-	translate the '%d' as it doesn't make much sense. Resolves bug #8027.
-
-2001-09-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (owner_set_cb): Do not call
-	calendar_config_init() here.
-
-	* gui/main.c (main): Call calendar_config_init() here.
-
-2001-09-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm.c (queue_alarm): Duh, only setup the
-	timeout if the list was empty.
-	(alarm_ready_cb): Notify with the ID of the original alarm.
-	(alarm_remove): Likewise.
-
-2001-09-17  Federico Mena Quintero  <federico@ximian.com>
-
-	Switch the alarm system from using SIGALRM to normal glib timers.
-	Also, use a more robust de-queueing mechanism.
-
-	* gui/alarm-notify/alarm.c (alarm_init): Removed.
-	(alarm_done): Remove the glib timeout instead of closing the pipes
-	and the signal handler.
-	(alarm_add): Allow adding alarms that happen before right now.
-	(queue_alarm): Use a glib timer instead of a signal.
-	(alarm_remove): Adjust the timeout as appropriate.
-
-	* gui/alarm-notify/notify-main.c (main): There is no need to
-	initialize the alarm system now.
-
-	* gui/main.c (main): Likewise.
-
-2001-09-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_init): get itip addresses
-	(calendar_model_destroy): destroy same
-	(calendar_model_value_at): do more thorough checking on whether to
-	use recurring, assigned, assigned to or regular task icons
-
-2001-09-17  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/cal-component.c (for_each_remove_all_alarms): for each
-	call back, removes the alarms
-	(cal_component_remove_all_alarms): remove all alarms from the
-	component
-
-	* cal-util/cal-component.h: new proto
-
-	* gui/e-itip-control.c (write_error_html): writes error messages
-	rather than normal html
-
-	* gui/itip-utils.c (itip_send_comp): remove all alarms if the
-	method warrants it
-
-2001-09-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/dialogs/meeting-page.c (build_etable): Updated this to match
-	the new ETableSimple interface.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Automake 1.5 fixes pointed out by Richard Boulton
-	<richard@tartarus.org>, as per #9258.]
-
-	* cal-client/Makefile.am: Set CLEANFILES directly instead of using
-	`+='.
-	* gui/Makefile.am: Likewise.
-	* gui/alarm-notify/Makefile.am: Likewise.
-	* pcs/Makefile.am: Likewise.
-
-2001-09-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c (ok_clicked_cb): added space after 'identities'
-	in the message. Fixes bug #9896.
-
-2001-09-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/e-calendar.conduit.in: remove translation
-	marker for now	
-
-2001-09-13  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.h: use ical partstat, role, cutypes
-	directly 
-
-	* cal-util/cal-component.c: ditto
-
-	* gui/e-itip-control.c (find_my_address): set my addresses if the
-	addresses match
-	(find_attendee): strstr returns non-null on a match
-	(write_html): use new icon, select the name displayed (organizer
-	or attendee) based on method,
-	(ok_clicked_cb): when rsvp'ing strip off all but the attendee
-	being replied for as is specified in the spec
-	(find_attendee_partstat): new util function to extract the
-	partstat of an attendee
-	(update_attendee_status): updates the partstat of a specific
-	attendee in the reply message
-
-	* gui/dialogs/meeting-page.c: use ical partstat, role, cutypes
-	directly
-	(popup_delegate_cb): if we delegate, notify of needs send and
-	changed
-	(popup_delete_cb): notify of needs send and changed for each
-	deletion
-	
-2001-09-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): send 6 weeks of
-	free busy info starting with the UTC start of day
-
-	* gui/itip-utils.c (get_label): create a text representation of
-	the given icaltime
-	(itip_send_comp): if the summary is empty, set the subject based
-	on the type of component, put the right extension on free/busy
-	components and base descriptions on type of component, include
-	start/end for free/busy info
-	
-2001-09-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (display_notification): Added an
-	use_description argument so that other alarms can fall back to
-	this type.
-	(audio_notification): Implemented.
-	(remove_comp): Call remove_queued_alarm() here; there is no longer
-	a destroy notification function for alarms so must we do this
-	manually.
-	(alarm_trigger_cb): Do not pass the alarm to the notification
-	functions so that we can free it ourselves before all the alarms
-	in the component get freed.
-	(display_notification): Get the alarm here instead of getting it
-	as an argument.
-	(procedure_notification): Implemented.
-
-2001-09-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): free the
-	destination vector when we finish with it, if we actually add
-	anyone, notify listeners of the needs send and changed info. Fixes
-	bug #8632.
-
-2001-09-10  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/print.c
-	(format_date): Convert string generated by strftime to UTF-8.
-	(print_week_view_background): Ditto.
-	(print_month_summary): Ditto.
-	(print_month_small): Use U_() instead of _().
-	(print_day_background): Ditto.
-	(print_todo_details): Ditto.
-	(print_date_label): Convert generated string to UTF-8.
-
-2001-09-10  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_get_attach):
-	Handle the new icalattach type instead of struct icalattachtype.
-	(cal_component_alarm_set_attach): Likewise.
-
-	* gui/dialogs/alarm-options.c (alarm_to_aalarm_widgets): Likewise.
-	(alarm_to_palarm_widgets): Likewise.
-	(aalarm_widgets_to_alarm): Likewise.
-	(palarm_widgets_to_alarm): Likewise.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #958, ShellComponents should not be created by factories, for
-	the calendar.]
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Remove the
-	ShellComponentFactory.
-
-	* gui/component-factory.c (create_object): Renamed from
-	`component_fn'.  Don't get any args.
-	(component_factory_init): Create the component using
-	`create_object()' and register it into OAF.
-	(COMPONENT_FACTORY_ID): Removed.
-	(COMPONENT_ID): New.
-
-2001-09-04  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (sc_user_create_new_item_cb):
-	Implemented.
-
-	* gui/main.c (component_editor_factory_init): New function to
-	create the factory for the comp_editor_factory.
-
-	* gui/comp-editor-factory.c: Finished implementation.
-
-	* gui/alarm-notify/alarm-queue.c (edit_component): Implemented the
-	Edit command.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	comp-editor-factory.[ch] to the list of sources.
-
-2001-09-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): 
-	* gui/tasks-control.c (tasks_control_activate): don't call
-	calendar_config_check_timezone_set() now, since the startup wizard
-	handles that.
-
-	* gui/e-tasks.c (e_tasks_class_init): changed selection_changed signal
-	to GTK_RUN_LAST. It has no reason to be GTK_RUN_FIRST.
-
-	* gui/gnome-cal.c: 
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: added "selection_changed" signal,
-	XX_delete_event() and XX_get_num_events_selected().
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): fix the shadow
-	around the dates at the top - it was 1 pixel off.
-
-	* gui/calendar-commands.c: added sensitize_commands(), similar to in
-	tasks-control.c, so we only make Cut/Copy/Delete sensitive when an
-	event is selected. Also added delete_event_cmd().
-
-	* gui/dialogs/task-page.c (task_page_set_summary): 
-	* gui/dialogs/event-page.c (event_page_set_summary): do nothing,
-	since the summary only gets changed on the main event/task page now.
-	Fixes bug #6939.
-
-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received): 
-	(e_day_view_on_top_canvas_drag_data_received): check that we are
-	dragging an event from the same EDayView. We currently don't support
-	DnD from other widgets.
-	(e_day_view_update_top_canvas_drag): only get the summary if we
-	actually have an event. Fixes bug #5162.
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): if the text hasn't
-	changed we need to call e_day_view_update_event_label() to show the
-	times again if necessary. Fixes bug #1813.
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): destroy the
-	CompEditorPage objects here rather than in close_dialog(), after the
-	widgets have been destroyed. We do this because the widgets have lots
-	of signal handlers connected with the CompEditorPage objects as the
-	signal data, so we want to ensure that the data pointer is always
-	valid. (Alternatively we could disconnect all the handlers when the
-	CompEditorPage objects are destroyed, or use connect_while_alive()).
-	Fixes bug #7543.
-
-	Note: there is still a small bug in that if you type in a time and
-	then hit 'Save and Close', the time won't be saved. I'm not sure
-	where this should be fixed - should the actions which close the
-	dialog grab the focus to the toplevel, so any widgets currently
-	being edited finish the edit and emit 'changed'?
-	
-	* gui/dialogs/recurrence-page.c (append_exception): use
-	gtk_clist_set_row_data_full() so freeing is handled automatically by
-	the GtkClist. This helps avoid problems at destroy-time.
-	(exception_delete_cb): just call gtk_clist_remove() now. No need to
-	free the row data as GtkCList now handles it.
-	(recurrence_page_destroy): no need to free the data in the clist.
-
-	* gui/dialogs/alarm-page.c: ditto.
-
-	* gui/dialogs/meeting-page.c: ditto.
-	(etable_destroy_cb): save the ETable state in this new handler cb
-	rather than in the destroy method, since the widget will already be
-	destroyed by then.
-
-2001-08-31  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c: changed 3 occurrences of 'Replyed' to 'replied'
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/e-itip-control.c (write_html):
-	Marked strings for translation (with U_).
-
-	* gui/itip-utils.c (itip_send_comp):
-	Ditto.
-
-2001-08-31  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_widget): 
-	(comp_editor_contacts_to_component): fix debugging messages so they
-	use "" rather than NULL. Fixes bug #8559.
-
-2001-08-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_remove_object): See if
-	the set of categories changed by using the removed_categories hash
-	table.
-	(cal_backend_file_init): Create a table of removed categories.
-	This allows us to notify if and only if the set of category
-	changes when an object is updated/removed, instead of
-	unconditionally notifying if an object is updated.
-	(cal_backend_file_update_objects): Only notify if the set of
-	categories really changed.
-	(update_categories_from_comp): Shuffle the categories between the
-	priv->categories and priv->removed_categories lists.
-
-2001-08-28  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #7879, a query may receive an update notification from
-	the backend before the query itself gets populated.
-
-	* pcs/query.c (ensure_sexp): New function; ensures that the esexp
-	is created and notifies of parse errors.  It is the bulk of
-	start_query_cb() but put in a separate function so that we can
-	share it elsewhere.
-	(start_query_cb): Use ensure_sexp().
-	(process_component_cb): Oops, notify of a successfully finished
-	query.
-	(match_component): Call ensure_sexp().  This function can be
-	called by the backend notification callbacks before the query is
-	populated, so we need to make sure the esexp exists here.
-
-2001-08-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.c (cal_search_bar_construct): Set the
-	"category is" criterion as the default for the calendar and tasks.
-
-2001-08-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_fill_widgets):
-	Unset the priv->updating flag before returning in the case the
-	component has no recurrence information.  Fixes bug #6850.
-
-2001-08-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (QueuedAlarm): Added a snooze
-	flag to differentiate snoozed alarms from real occurrences.
-	(add_component_alarms): Do not specify a destroy function for the
-	alarm trigger.  We handle this in the callbacks now.
-	(alarm_trigger_cb): Just remove the alarms for the unimplemented
-	notification types.
-	(create_snooze): Implemented snooze.
-	(notify_dialog_cb): Snooze as appropriate.
-
-2001-08-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (foreach_tzid_callback): call back to add
-	timezones to the top level
-	(itip_send_comp): call icalcomponent_foreach_tzid
-
-2001-08-22  Dan Winship  <danw@ximian.com>
-
-	* gui/gnome-cal.c: #include <libgnomevfs/gnome-vfs-types.h> so
-	this will compile against gnome-vfs 1.0.1.
-
-2001-08-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): open the tasks folder
-	associated with the calendar being opened, and not always the local
-	tasks.ics file
-
-	* pcs/cal-factory.c (open_fn): use gnome_vfs_uri_new_private when
-	parsing the URI to allow non-registered URIs
-
-2001-08-21  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.c (alarm_to_palarm_widgets): Handle
-	the case where there is no attachment.  Fixes bug #7257.
-
-2001-08-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (write_html): strip the mailto bit for the
-	email address if we display it
-
-2001-08-21  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/query.c (func_is_completed): added new e-sexp operator. We
-	don't currently use it though.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Changed '_Overdue' to 'O_verdue'
-	since we have an '_Other' notebook tab. Added '_Hide' accel.
-
-	* gui/dialogs/cal-prefs-dialog.c: hooked up config options to dialog.
-
-	* gui/calendar-config.c: added config options for hiding completed
-	tasks.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): 
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event): 
-	* gui/e-day-view.c (e_day_view_reshape_long_event): added 2 pixels
-	extra space between icons and text for long events, and 1 pixel space
-	between icons in all events.
-	(e_day_view_realize): changed the background color to match the
-	EGrayBar in the shell.
-
-2001-08-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-util.[ch]: new files to contain utility functions
-	for calendar backends
-
-	* pcs/cal-backend.c (cal_backend_add_cal): implement it here, and not in
-	the calendar backends. Add a "cal_added" signal, so that backends are
-	notified when a new Cal is added, if they need to
-	(cal_backend_get_type_by_uid): implement it here
-
-	* pcs/cal-backend-file.c (fill_alarm_instances_seq): moved to
-	cal-backend-util.c
-	(cal_backend_file_add_cal): removed
-	(cal_backend_file_init): connect to the "cal_added" signal in the
-	CalBackend class so that we can update categories when a new Cal is
-	added
-	(cal_backend_file_get_type_by_uid): removed
-
-	* pcs/cal-backend-db.c (fill_alarm_instances_seq): moved to
-	cal-backend-util.c
-	(cal_backend_db_add_cal): removed
-	(cal_backend_db_get_type_by_uid): removed
-
-	* AUTHORS: added JP and Damon to list of authors
-
-2001-08-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_generate_alarms_for_list):
-	(cal_util_generate_alarms_for_comp): 
-	new functions moved from the CalBackendFile, to allow its use outside
-	of it. The signature has changed a little bit, since these functions
-	need a way to get the timezones from the callers, so a callback
-	function to resolve the timezones has been added to the list of
-	parameters
-
-	* pcs/cal-backend-file.c (generate_alarms_for_list):
-	(generate_alarms_for_comp): moved to cal-util, with all their related
-	functions/structures
-
-	* pcs/cal-backend-db.c: removed functions that were moved to cal-util
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): use Delete icon in menu, and
-	change to bigger Save icon in toolbar.
-
-	* gui/tasks-control.c: 
-	* gui/calendar-commands.c (pixmaps): used new_task-16.png and
-	goto-16.png.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): added delete icons for menu
-	and toolbar.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tasks-control.c: added Cut/Copy/Paste icons for toolbar.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tasks-control.c: uses new delete icons in menu & toolbar.
-
-2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c: Update the folder list to include a
-	display name and a description.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): use new delete icon for toolbar.
-
-2001-08-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c: fixed typo, 'send' -> 'sent'. Bug #7621.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: added option to hide completed
-	tasks after a given number of minutes/hours/days. Unfinished.
-
-	* gui/dialogs/event-page.c (event_page_fill_component): initialize
-	zone to NULL to avoid a warning.
-	(contacts_clicked_cb): work around a bug in SelectNames by notifying
-	that the page has changed when you click the 'Contacts' button.
-	Otherwise it is easy to lose changes.
-
-	* gui/dialogs/task-page.c (contacts_clicked_cb): ditto.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): used new Save/Save As icons.
-
-	* gui/tasks-control.c:
-	* gui/calendar-commands.c (pixmaps): added new Cut/Copy/Paste icons,
-	and changed the 'New Task' icon to use the bigger one I made.
-
-2001-08-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/dialogs/task-page.c (summary_changed_cb):
-	Use e_dialog_editable_get instead of gtk_editable_get_chars (we need
-	UTF-8 string).
-
-2001-08-18  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/calendar-config.c (locale_uses_24h_time_format): New.
-	(config_read): Use locale's setting as default for
-	/Calendar/Display/Use24HourFormat so that Europeans don't have to
-	switch to 24-hour format manually.
-
-2001-08-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (destroy): destroy the addresses
-	(clean_up): don't free the addresses, we need them
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new_task): new function to open the
-	task editor to add a new task.
-
-	* gui/calendar-commands.c: added new_task_cb() to create a new task
-	in the calendar folder, and added menu commands for it, and a toolbar
-	button (I think that is what Ettore wanted. Maybe he just meant menu
-	commands. Anyway, it is easy to take out.) Note that we don't have a
-	decent icon for 'New Task' for the toolbar.
-	Also added the new Goto button (but we don't have a similar one for
-	the menu command).
-
-2001-08-16  Iain Holmes  <iain@ximian.com>
-
-	* gui/Makefile.am: Add the libetimezonedialog.a lib link
-
-	* gui/calendar-config.c: Change the #include for the timezone dialog
-
-	* gui/e-timezone-entry.c: Ditto.
-
-	* gui/dialogs/Makefile.am: Remove the e-timezone-dialog stuff.
-
-2001-08-16  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/event-page.c: hide the timezone fields for all-day
-	events. We will use DATE values for these eventually, and these
-	don't have timezones associated with them. Currently we just use the
-	default timezone for all-day events, as a workaround until we have
-	DATE values working.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_new_date_edit): added
-	make_time_insensitive flag. Though we may not use it.
-
-	* gui/dialogs/event-page.glade: made the 'All day event' toggle
-	right-aligned, so it doesn't move when the other widgets are shown
-	and hidden.
-
-	* gui/e-timezone-entry.c (e_timezone_entry_set_default_timezone): new
-	function to set the default timezone of the widget. If the current
-	timezone setting matches the default then the entry field is hidden.
-	Most people won't use timezones so this makes the GUI simpler.
-
-	* gui/dialogs/event-page.c (init_widgets): 
-	* gui/dialogs/task-page.c (init_widgets): set the default timezone
-	using the above function.
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): if the start date
-	or due date is not set, we use the default timezone, so the user
-	doesn't have to set this each time they set the date.
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_widgets): If the
-	component has no alarms remember to set the priv->updating flag to
-	FALSE before returning.
-
-2001-08-16  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/e-delegate-dialog.c
-	(e_delegate_dialog_get_delegate_name): get the destinations
-	property, not the text property
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-page.c (clear_widgets): Set the default-to-add
-	notification to be display a message 15 minutes before the start
-	of the appointment.  Fixes bug #7175.
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_strip_categories):
-	New function to strip surrounding whitespace from a string of
-	categories entered by the user.
-
-	* gui/dialogs/task-page.c (task_page_fill_component): Use
-	comp_editor_strip_categories().
-
-	* gui/dialogs/event-page.c (event_page_fill_component): Likewise.
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_configure_e_date_edit):
-	Do not set the time popup range.  We also want to be able to
-	create appointments that are not within nine-to-five!  Think of
-	going to the movies!  Fixes bug #7436.
-
-	* gui/dialogs/cal-prefs-dialog.glade: "am/pm" is now "AM/PM".
-	Fixes bug #7367.
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/cal-search-bar.c: Changed to reflect my renaming of some of
-	the more hideously-named functions in the ESearchBar API.
-
-2001-08-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): only fill the component
-	and save it if something has changed
-	(save_comp_with_send): only try to send if something has changed
-	and the editor needs a send
-
-2001-08-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: OK, re-added the default
-	alarm options.  Way too many people are asking for them.
-
-2001-08-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (factory_fn): Add the user creatable
-	items.  The callback is not actually implemented yet; this is just
-	to finalize the GUI.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Added an option to ask for
-	confirmation when deleting items.  Added underlined shortcuts
-	(they may not all work currently).
-
-2001-08-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c: 
-	* gui/dialogs/event-page.c: added support for the Contacts field.
-	Note that I'm not sure what we should put in the iCalendar CONTACT
-	properties. Currently we put "name <email>", but it isn't recognized
-	as a contact when we reopen the dialog, so we may need more info here.
-	Also we currently use a simple parser to parse the above format, and
-	we should maybe use some camel function.
-
-	* gui/dialogs/task-page.glade: 
-	* gui/dialogs/event-page.glade: replaced the GtkEntry fields for the
-	Contacts with a GtkEventBox which we put the BonoboControl in at
-	runtime.
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): added FIXMEs
-	since it doesn't seem to be freeing the EDestination stuff. JP?
-
-	* gui/dialogs/comp-editor-util.c: added bunch of utility functions to
-	handle the Contacts field in the main Event and Task pages.
-
-	* gui/gnome-cal.c: added visible_start and visible_end fields, so we
-	only emit the 'dates-shown-changed' signal when really necessary.
-	Currently changing the folder title bar label results in a complete
-	redraw of the Evolution window (silly GtkLabel queueing a resize),
-	so we want to avoid that as much as possible.
-	(gnome_calendar_new_appointment_for): only move the event's end time
-	to the end of the day if it is not already 00:00:00.
-
-	* gui/e-week-view-event-item.c: 
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: added support for double-clicking on an event to
-	open it, and for double-clicking on the background to create a new
-	event. There is still a minor problem to sort out, but it basically
-	works.
-
-	* cal-util/cal-component.c: added support for CONTACT properties,
-	mainly by copying the code for COMMENT properties which are exactly
-	the same type.
-
-	* gui/e-day-view.c (e_day_view_realize): use the same color for the
-	top canvas background as the shortcut bar, to make it look a little
-	nicer (I think). Although we still have the theme problem with
-	hard-coded colors.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-calendar-table.etspec: Made the click-to-add message
-	shorter.  Fixes bug #7177.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): Added Tigert's new icons for
-	Prev and Next.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.c (make_suboptions): Make the "Any Category"
-	item consistent with the one in the addressbook.  Also, free the
-	items correctly.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.c (get_current_category): Handle an array of
-	categories in the CalSearchBar instead of our own menu items.
-	(notify_query_contains): Fetch the text from the search bar here
-	instead of in regen_query().
-	(regen_query): Handle category searches.
-	(notify_category_is): New function.
-	(cal_search_bar_construct): Do not create an option menu.
-	(make_suboptions): New function to create the suboption items from
-	the list of categories.
-	(notify_query_contains): Do not include a category sexp here.
-
-2001-08-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (update_item): add dialog for feedback
-	(remove_item): ditto
-	(send_item): ditto
-	(send_freebusy): ditto
-
-2001-08-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c: rewrite the gui to use gtkhtml
-
-	* gui/Makefile.am: define the icon dir
-
-2001-08-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-itip-control.h: Remove #include <config.h> from here.
-	* gui/itip-utilss.h: Same here.
-	
-2001-08-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-control.c: Update the paths of the Tools menu
-	according to the changes in the XML [i.e. things are moved to the
-	ComponentToolsPlaceholder].
-
-	* gui/calendar-commands.c: Likewise.
-
-2001-08-11  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/event-page.c (init_widgets): 
-	* gui/dialogs/task-page.c (init_widgets): turn on word-wrap for the
-	description fields. Fixes bug #6821.
-
-2001-08-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/cal-search-bar.c: Where we have ESearchBarItems, set their
-	subitems to NULL.
-
-2001-08-09  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_get_object_component): added new
-	backend method to get the component given a UID.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_object_component): 
-	added implementation of above virtual method.
-	
-	* pcs/query.c (match_component): use the new backend function to get
-	the CalComponent rather than the string. This avoids converting all
-	the calendar components to strings and parsing them back into
-	components for every query! (That wasn't a good idea, was it ;)
-
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: use a timeout handler to layout the events,
-	to avoid doing a layout for each event we get from a query.
-
-	* gui/print.c (print_day_add_event): 
-	* gui/e-day-view.c (e_day_view_add_event): set start_row_or_col and
-	num_columns to 0. They are guint8's.
-
-	* gui/e-week-view.c (e_week_view_free_events): hide all the jump
-	buttons. Fixes bug #5946.
-
-	* gui/calendar-commands.c (calendar_set_folder_bar_label): added the
-	day numbers for the month view.
-
-	* gui/dialogs/recurrence-page.glade: changed "_Delete" to "_Remove",
-	since it clashed with "_Add". Also added underlined accelerators for
-	the recurrence radio buttons. Note that none of these accelerators
-	actually work at present, due to the way we are using .glade files
-	for each notebook page. I need to add a bug about this.
-	Also, the "_Action" menu doesn't popup when I press Alt+A, even though
-	the "_File" menu does popup when I press Alt+F. Strange.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_timezone_object):
-	removed debug msgs.
-
-2001-08-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	unref the GdkPixmap and GdkBitmap returned by the function
-	e_categories_config_get_icon_for ()
-
-2001-08-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-page.*: Remove progress frame
-
-	* gui/dialogs/task-details-page.*: Put in progress frame, remove
-	basics frame
-	
-	* gui/dialogs/task-editor.c (set_menu_sens): util function to set
-	menu sensitivity based on state
-	(task_editor_init): add meeting page
-	(task_editor_edit_comp): show page if necessary
-	(task_editor_destroy): unref meeting page
-	(assign_task_cmd): bring up meeting page
-	(refresh_task_cmd): save before sending
-	(forward_cmd): ditto
-
-	* gui/dialogs/comp-editor.c (save_cmd): implement new save command
-
-2001-08-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-itip-control.c (destroy): Chain to the destroy handler in
-	the parent class!
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy):
-	Likewise.  Sigh.
-
-	* gui/cal-search-bar.c (cal_search_bar_destroy): Whoops, added a
-	destroy handler.
-
-2001-08-08  Damon Chaplin  <damon@ximian.com>
-
-	* gui/goto-dialog.glade: removed underlined accelerator key from
-	"_Go To Today" button. GnomeDialog doesn't actually support underlined
-	accelerator keys for buttons. We could hack it, like Glade does, if
-	we really need to. Fixes bug #6418.
-
-2001-08-08  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (update_query): Stop editing any event.  Fixes
-	bug #5949.
-
-2001-08-08  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_component): Duuuh, set
-	the alarm_copy on the component, not the original alarm.  Fixes
-	bug #5214.
-
-2001-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (set_attendees): set the attendees of
-	a component
-	(meeting_page_fill_component): use above
-	(meeting_page_get_cancel_comp): return a comp with the attendees
-	to be cancelled
-
-	* gui/dialogs/meeting-page.h: get a component that will be sent as
-	a cancellation
-
-	* gui/dialogs/event-editor.c (event_editor_class_init): override
-	send_comp class method
-	(event_editor_send_comp): send cancellation notices to deleted
-	attendees
-	(refresh_meeting_cmd): save before send
-	(forward_cmd): ditto
-
-	* gui/dialogs/comp-editor.c (comp_editor_class_init): set default
-	send_comp method
-	(real_send_comp): do the real work
-	(comp_editor_send_comp): call class method
-	(save_comp): don't do any sending
-	(save_comp_with_send): save and send here
-	(prompt_to_save_changes): use above
-	(save_close_cmd): ditto
-
-	* gui/dialogs/comp-editor.h: add virtual function
-
-2001-08-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_draw_icons): don't use a NULL mask in the
-	call to gdk_gc_set_clip_mask
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	ditto
-
-	* gui/e-day-view-main-item.c
-	(e_day_view_main_item_draw_day_event): ditto
-
-2001-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit-config.h: fix pre-processor
-	macros
-
-	* conduits/calendar/calendar-conduit.h: ditto
-
-	* conduits/todo/todo-conduit-config.h: fix pre-processor macros
-
-	* conduits/todo/todo-conduit.h: ditto
-
-2001-08-07  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-client/cal-listener.c (cal_listener_stop_notification): New
-	function to stop further notification from happening.
-	(impl_notifyCalOpened): Do not notify if requested.
-	(impl_notifyObjUpdated): Likewise.
-	(impl_notifyObjRemoved): Likewise.
-	(impl_notifyCategoriesChanged): Likewise.
-	(CalListenerPrivate): Do not keep a reference to the server-side
-	Cal.  This would create a circular reference since the server
-	keeps a reference to the listener.
-	(cal_listener_destroy): Likewise.
-	(impl_notifyCalOpened): Likewise.
-
-	* pcs/cal.c (cal_destroy): bonobo_object_release_unref() the listener.
-
-	* cal-client/cal-client.c (cal_client_destroy): Ask the listener
-	to stop notifications.  Also, do not unref it as the server does
-	that itself when we unref the Cal.
-
-2001-08-07  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_free_value): Only unref the
-	FIELD_COMPONENT if it is non-NULL.  We return a NULL for that
-	field from ::initialize_value(), after all.  Fixes bug #6098.
-
-2001-08-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): Make calendar.ics the
-	suggested name when attaching the ical object
-
-2001-08-06  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view.h: 
-	* gui/e-day-view.h: added 'different_timezone' fields to EDayViewEvent
-	and EWeekViewEvent, to note that the event is in a different timezone.
-	We now compute this once when we add the event to the array, rather
-	than each time we draw the event. If it is set, we will draw the
-	timezone icon next to the event.
-
-	* gui/e-day-view-main-item.c: take transparency into account when
-	drawing the blue vertical bars to represent busy time.
-
-	* gui/tag-calendar.c: take transparency into account when tagging
-	the mini calendar.
-
-	* gui/e-calendar-table.c (e_calendar_table_init): removed the "None"
-	options for transparency and classification, since these properties
-	have defaults anyway, so we may as well use those to keep it simple.
-	Also use "Free" and "Busy" for transparency, rather than "Transparent"
-	and "Opaque".
-
-	* gui/calendar-model.c: updated classification & transparency code
-	as above.
-
-	* gui/e-calendar-table.etspec: changed "Transparency" to "Show Time As"
-	since people have a chance of understanding that.
-
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: 
-	* gui/gnome-cal.c: added functions to get the visible time range.
-
-	* gui/calendar-commands.c: finished stuff to set the folder bar
-	label to the dates currently displayed.
-
-	* gui/control-factory.c (control_factory_new_control): connected
-	signal to update the folder title bar label when the dates shown
-	are changed. I had to connect it here since we need the BonoboControl
-	in the callback, and I don't know how to get the control from the
-	widget.
-
-	* gui/tasks-control.c (tasks_control_activate): clear the folder bar
-	label. We could display something here at some point.
-
-	* gui/dialogs/recurrence-page.glade: changed "_Add" to "A_dd", since
-	we have an "_Actions" menu. (These also use Alt+key, right?)
-
-	* gui/dialogs/event-page.glade: 
-	* gui/dialogs/event-page.c: added 'Show Time As' field, which is
-	really the TRANSP property but with a better name!
-	Also changed one of the "_Confidential" to "Con_fidential" since we
-	already have "_Contacts" using the same 'C' key.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): skip
-	events that are TRANSPARENT. Also added comment as this code looks
-	inefficient.
-
-	* cal-util/cal-component.c: removed stuff for comparing timezones.
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): moved the
-	above function here, and updated it to compare the UTC offsets of the
-	times as well as the TZIDs.
-
-2001-08-06  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: In process of fixing bug
-	#6005.  The "Calendar" page is now "Display", and it has no
-	frames.  The "Task list" page has colons between the labels and
-	the color pickers, and it has no frame.
-
-2001-08-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (destroy_wombat_client): added check for
-	NULL pointers. Maybe fixes #5203 (I can't reproduce it, so I'm not
-	sure)
-
-2001-08-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-client/query-listener.c (query_listener_stop_notification):
-	New function; stops further notification from happening.  This is
-	needed since the listener is destroyed asynchronously from the
-	Wombat and the corresponding CalQuery may already have died.
-	(impl_notifyObjUpdated): Do not notify if requested.
-	(impl_notifyObjRemoved): Likewise.
-	(impl_notifyQueryDone): Likewise.
-	(impl_notifyEvalError): Likewise.
-
-	* cal-client/cal-query.c (cal_query_destroy): Use
-	query_listener_stop_notification().
-
-	* cal-client/cal-listener.c (cal_listener_destroy): Nullify the
-	pointers to the callback functions.
-
-	* gui/e-day-view.c (update_query): Commit our state of no longer
-	having a query before unrefing it.  We may reenter from the ORBit
-	main loop and we *really* want this information to be committed.
-
-	* gui/e-week-view.c (update_query): Likewise.
-
-	* gui/calendar-model.c (update_query): Likewise.
-
-	* gui/tag-calendar.c (tag_calendar_by_comp): Added a "clear_first"
-	argument that indicates whether the ECalendar should be cleared of
-	any marks first.
-
-	* gui/calendar-commands.c (calendar_control_activate): Removed
-	ifdefed-out view buttons code from the Gnomecal days.
-
-	* gui/gnome-cal.c (client_categories_changed_cb): Merge the
-	categories of the calendar and tasks clients so that we can
-	display the categories in both sets.
-	(gnome_calendar_construct): Connect to "categories_changed" on
-	both clients.
-	(gnome_calendar_on_date_navigator_selection_changed): Removed call
-	to gnome_calendar_update_view_buttons().
-	(gnome_calendar_update_view_buttons): Removed.  We cannot have
-	this until Bonobo supports radio toolbar items.
-	(gnome_calendar_set_view_buttons): Removed.
-	(gnome_calendar_dayjump): Do not use priv->day_button.
-	(GnomeCalendarPrivate): Removed the {day,work_week,week,month}_button 
-	fields.
-	(gnome_calendar_set_query): Start a retagging process of the date
-	navigator so that it reflects the current query.
-	(update_query): New function to restart a query for the date navigator.
-	(initial_load): Use update_query() instead of tagging the date
-	navigator directly.
-	(gnome_calendar_on_date_navigator_date_range_changed): Likewise.
-	(client_cal_opened_cb): Use update_query() instead of initial_load().
-	(initial_load): Removed.
-	(client_obj_updated_cb): Removed.
-	(client_obj_removed_cb): Removed.
-	(gnome_calendar_new_appointment_for): Set the default category of
-	the new component.
-	(search_bar_category_changed_cb): Set the default category for the
-	calendar views.
-
-	* gui/cal-search-bar.c (cal_search_bar_set_categories): Sort the
-	categories before creating the menu.
-
-	* gui/e-day-view.c (adjust_query_sexp): Return NULL instead of
-	"#f" if the time range is not set yet.
-	(update_query): Do not start a query if the time range is not set.
-	(e_day_view_set_default_category): New function.
-	(e_day_view_key_press): Set the default category on the new
-	component.
-
-	* gui/e-week-view.c (adjust_query_sexp): Analogous to the above.
-	(update_query): Analogous to the above.
-	(e_week_view_set_default_category): Analogous to the above.
-	(e_week_view_key_press): Analogous to the above.
-
-2001-08-03  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #1407.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Removed the alarm
-	preferences page, since we decided it was unnecessary.
-
-2001-08-03  Zbigniew Chyla  <cyba@gnome.pl>
-
-	I18n fixes.
-
-	* gui/dialogs/event-page.c (summary_changed_cb):
-	Use e_dialog_editable_get instead of gtk_editable_get_chars (we need
-	UTF-8 string).
-
-	* gui/itip-utils.c:
-	Added missing #include <config.h>
-
-2001-08-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/Makefile.am: Added camel dependency (now needed by ebook).
-
-2001-08-01  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_value_is_empty): If the
-	default category is the same as the value passed in to this
-	function, return TRUE.  This could be a hack or not, but it
-	prevents two items from being added to the table if a category is
-	selected.
-
-	* gui/e-tasks.c (setup_widgets): Allow the search bar to shrink
-	horizontally.
-
-	* gui/dialogs/task-page.c (clear_widgets): Pass valid values to
-	e_dialog_option_menu_set(); these need to come from the status map.
-
-2001-08-01  Damon Chaplin  <damon@ximian.com>
-
-	* cal-client/cal-client.c: removed debugging messages.
-
-2001-08-01  Federico Mena Quintero  <federico@ximian.com>
-
-	The calendar search bar widget now includes a drop-down menu of
-	available categories.
-
-	* pcs/query.c (func_has_categories): Handle one and only one #f
-	value as meaning "unfiled", for components that have no categories
-	at all.
-
-	* pcs/cal-backend-file.c (open_cal): Duh, do not notify here about
-	changed categories since at this point we don't have any clients
-	bound to us yet.
-	(create_cal): Likewise.
-	(cal_backend_file_add_cal): Notify here.
-
-	* gui/cal-search-bar.h (CalSearchBarClass): New signal
-	"category_changed".
-
-	* gui/cal-search-bar.c (cal_search_bar_construct): Add a drop-down
-	menu for the list of categories.
-	(search_option_items): Removed the "Has category" option, since we
-	now have the drop-down menu instad and it would be confusing to
-	have both options.
-	(regen_query): Likewise.  Also, this function is now the old
-	cal_search_bar_query_changed() and is shared by that very function
-	and by the callback from the drop-down menu.
-	(notify_query_contains): Include the sub-sexp for the categories.
-	(cal_search_bar_set_categories): New function.
-	(cal_search_bar_get_category): New function.
-	(categories_selection_done_cb): Emit the "category_changed" signal.
-
-	* gui/e-tasks.c (obj_updated_cb): Removed function since it did
-	not do anything; all updates are handled by the CalendarModel.
-	(obj_removed_cb): Likewise.
-	(ETasksPrivate): Removed the fields for the categories option
-	menu, since now it is in the ESearchBar.
-	(search_bar_sexp_changed_cb): Use calendar_model_set_query()
-	directly here, as we do not need to frob the sexp anymore.
-	(update_query): Removed.
-	(client_categories_changed_cb): New callback.
-	(search_bar_category_changed_cb): New callback.
-	(e_tasks_new_task): Set the default category on the component to
-	the one that is selected in the search bar.
-	(e_tasks_on_filter_selected): Removed.
-	(e_tasks_on_categories_changed): Removed.
-	(e_tasks_rebuild_categories_menu): Removed.
-	(e_tasks_add_menu_item): Removed.
-	(e_tasks_setup_view_menus): Sanitized not to sink objects wildly.
-	(e_tasks_discard_view_menus): New function.
-
-	* gui/calendar-model.h (CalendarModelClass): Removed the
-	"categories_changed" signal since this is handled in the Wombat
-	now.
-
-	* gui/calendar-model.c (calendar_model_get_categories): Removed.
-	(calendar_model_set_value_at): Do not collect the categories.
-	(query_obj_updated_cb): Likewise.
-	(calendar_model_collect_categories): Removed.
-	(calendar_model_set_default_category): Constify.
-
-	* gui/tasks-control.c (tasks_control_deactivate): Call
-	e_tasks_discard_view_menus().
-
-	* gui/gnome-cal.c (search_bar_category_changed_cb): Set the
-	default category for the task pad's model.
-
-2001-07-31  Federico Mena Quintero  <federico@ximian.com>
-
-	The Wombat now keeps track of which categories are present in the
-	objects of a calendar.  It will notify the clients of changes in
-	this set.  This is to make the category drop-down menus in the
-	calendar/tasks views be always up to date.
-
-	* idl/evolution-calendar.idl (Listener): Added a
-	notifyCategoriesChanged() method.  The Wombat now keeps track of
-	the categories within a calendar.
-
-	* cal-client/cal-listener.[ch]: Switched it to use BonoboXObject.
-	Also added the notifyCategoriesChanged implementation.
-
-	* cal-client/cal-client.[ch]: Added a "categories_changed" signal.
-
-	* pcs/cal-backend-file.c: Maintain a list of the live categories.
-	(update_categories_from_comp): New function to maintain the set of
-	live categories.
-	(add_component): Update the set of categories.
-	(remove_component): Likewise.
-	(open_cal): Notify about changes in the set of categories.
-	(create_cal): Likewise.
-	(cal_backend_file_update_objects): Likewise.
-	(cal_backend_file_remove_object): Likewise.
-	(notify_categories_changed): New function to notify the clients
-	about the current set of categories.
-
-	* pcs/cal.c (cal_notify_categories_changed): New function.
-
-2001-07-31  Rodrigo Moya <rodrigo@ximian.com>
-
-        * gui/e-day-view.c (selection_received):
-        * gui/e-week-view.c (selection_received): yes, set the end date, but
-	correctly calculated, not by using the component's duration, which
-	may not exist. Now really fixes #5836
-
-2001-07-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received):
-	* gui/e-week-view.c (selection_received): don't set the end date
-	for the pasted components, since it will be recalculated when the start
-	date is set, thus keeping the same duration than the original
-	cut/copied component. Fixes #5836
-
-2001-07-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/gnome-cal.c: 
-	* gui/calendar-commands.c (clear_folder_bar_label): started some code
-	to show the currently displayed dates in the folder title bar.
-	Unfinished.
-
-	* gui/e-itip-control.c (set_date_label):
-	* conduits/todo/todo-conduit.c (local_record_from_comp): 
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): free
-	the CalComponentDateTimes. (Note the iTIP control needs updating for
-	timezone support.)
-
-	* cal-util/cal-component.c: Changed CalComponentDateTime so that the
-	TZID is malloc'ed and freed rather than being a pointer to a static
-	string. This was causing problems as sometimes we were freeing the
-	string that was being pointed to, so we got corrupted TZIDs.
-
-	* gui/comp-util.c (cal_comp_util_add_exdate): set TZID to NULL.
-	DATE values do not have timezones.
-
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: Moved 'Paste' after the New Appointment commands,
-	since I think they are more commonly-used. Also added underlined
-	accelerator keys.
-
-	* gui/e-calendar-table.c: changed 'Edit this task' to 'Open' in the
-	popup menu to be consistent with other folders, and separated from the
-	clipboard commands. Also changed to use EPopupMenu so the accelerators
-	work, and the masks may be useful at some point.
-
-	* gui/dialogs/recurrence-page.c: use DATE values for UNTIL, since
-	that makes it simpler. Fixes bug #5034.
-
-	* gui/calendar-config.c (calendar_config_set_timezone): strdup the
-	location string. Fixes bug #4990.
-
-	* gui/tag-calendar.c (tag_calendar_cb): take 1 off iend as the times
-	don't include the end time.
-
-	* gui/e-week-view-layout.c (e_week_view_layout_event): fixed
-	days_shown. Fixes bug #5709.
-
-	* cal-client/cal-client.c (cal_client_get_timezone): took out some
-	debugging messages.
-
-2001-07-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: added Help button. Though of
-	course it doesn't do anything yet.
-
-2001-07-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: Mark strings for translation
-
-2001-07-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/client-test.c (cal_opened_cb): call
-	cal_client_get_free_busy for testing the new method
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): implemented
-
-2001-07-28  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #5352.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show): Added a
-	`page' argument so that we can select which page to show when
-	popping up the dialog.
-	(cal_prefs_dialog_construct): Added the `page' argument as well.
-	(cal_prefs_dialog_new): Likewise.
-
-	* gui/calendar-commands.c (settings_cmd): Set the page to the main
-	calendar settings one.
-
-	* gui/tasks-control.c (tasks_control_settings_cmd): Implemented
-	callback for the "Task Settings" command.
-	(verbs): Added the "TasksSettings" verb.
-	(pixmaps): Added an icon for the tasks settings command.
-
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	recur is always in UTC
-	
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c: handle timezones
-	everywhere
-	(get_timezone): new function to get a timezone based
-	on a tzid
-	(get_default_timezone): get default timezone
-
-	* conduits/calendar/calendar-conduit.h: time zone field for the
-	context
-
-	* conduits/calendar/Makefile.am: link to bonobo conf
-
-	* conduits/todo/todo-conduit.c: handle timezones
-	everywhere
-	(get_timezone): new function to get a timezone based
-	on a tzid
-	(get_default_timezone): get default timezone
-
-	* conduits/todo/todo-conduit.h: time zone field for the
-	context
-
-	* conduits/todo/Makefile.am: link to bonobo conf
-	
-2001-07-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* 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_icons): 
-	initialize to NULL some pointers
-
-	* e-calendar-table.c (selection_received): deal correctly with
-	VCALENDAR objects
-	(e_calendar_table_copy_clipboard): g_strdup the value returned by
-	icalcomponent_get_as_ical_string
-
-2001-07-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_set_query): Constify and set the
-	query sexp on the task pad's model as well.
-
-2001-07-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.[ch]: New files with a derivative of
-	ESearchBar that generates sexps for calendar queries directly.
-
-	* gui/gnome-cal.c (setup_widgets): Use CalSearchBar instead of
-	ESearchBar.
-
-	* gui/e-calendar-table.h (ECalendarTable): Removed the ->colors
-	array since it is handled by ETableExtras now.
-
-	* gui/e-calendar-table.[ch]: Removed the subset_model.  Now we use
-	the live query facility to filter tasks.  Removed the filter
-	function stuff as well.
-
-	* gui/e-tasks.c (e_tasks_construct): Use
-	calendar_model_set_cal_client() directly instead of
-	e_calendar_table_set_model().
-	(setup_widgets): Create a calendar search bar for the tasks
-	component.
-	(search_bar_sexp_changed_cb): Set the query sexp on the table model.
-	(e_tasks_on_filter_selected): Regenerate the query from the
-	selected category and the current sexp.
-	(update_query): New convenience function to recompute the real
-	query sexp.
-
-	* gui/gnome-cal.c (gnome_calendar_construct): Likewise.
-
-	* gui/e-calendar-table.c (e_calendar_table_set_cal_client):
-	Removed function; people are now supposed to get the model from
-	the calendar table and operate on it.
-
-	* gui/calendar-commands.c (verbs): Consistency fixes with the XML
-	file.
-	(pixmaps): Likewise.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	cal-search-bar.[ch] to the list of sources.
-
-2001-07-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* idl/evolution-calendar.idl (CompEditorFactory): New interface to
-	a centralized factory for calendar component editors.  Has
-	editExisting() and editNew() methods to edit an existing component
-	from a URI/UID pair, and to create a new component in a calendar
-	that is in a particular URI, respectively.
-
-	* gui/comp-editor-factory.[ch]: Implementation files for the
-	component editor factory.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Added the CompEditorFactory
-	stuff.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	comp-editor-factory.[ch] to the list of sources.
-
-2001-07-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): when an entry
-	has changed, iterate over the elements of the entry and add them
-	to the list if need be
-	(get_select_name_dialog): add a Chair Persons section
-
-	* gui/itip-utils.c (itip_send_comp): send the empty string as
-	subject if there is no summary
-	
-2001-07-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): send the empty string as
-	subject if there is no summary
-
-	* gui/dialogs/meeting-page.c (cleanup_attendees): free a list of
-	attendees
-	(meeting_page_fill_widgets): clean up attendee lists and fix typo
-	(find_match): add ability to return pos of match
-	(popup_delete_cb): if deletion happens, make sure to tidy up
-	delegation chain
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	use the destination rather than text property
-	(e_delegate_dialog_get_delegate): ditto
-	(e_delegate_dialog_new): take name/address pair for dialog default
-
-	* gui/dialogs/e-delegate-dialog.h: update protos
-
-	* gui/e-itip-control.c (clean_up): only unref the object if we
-	have one
-	
-	* gui/itip-control-factory.c (stream_read): make sure we null
-	terminate the final buffer
-
-	* gui/itip-utils.c (itip_send_comp): strip the mailto: from the
-	organizer address if necessary
-
-2001-07-26  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (exception_select_row_cb): check that
-	the row passed in is valid. Sometimes we get the "row-selected"
-	signal for row 0 when there are no rows in the list. Fixes bug #4266.
-
-	* cal-client/cal-client.c (cal_client_get_object): prefetch all the
-	timezone data needed by the object, to try to avoid making Corba
-	calls all over the place. They can cause problems because they call
-	the GTK+ main loop recursively. This currently leads to an assertion
-	failure in the GnomeCanvas occasionally.
-
-2001-07-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_set_data): gracefully
-	handle the lack of a method
-
-2001-07-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received_cb): check type of component
-	before actually pasting.
-	Deal with VCALENDAR components also (fixes bug #5140)
-
-	* gui/e-week-view.c (selection_received_cb): ditto
-
-	* cal-client/cal-client.c (cal_client_update_object): check the return
-	value from cal_component_get_as_string and don't call
-	GNOME_Evolution_Calendar_Cal_updateObjects if NULL
-
-2001-07-25  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): used the new print preview icon.
-
-	* gui/print.c (range_selector_new): changed the 'Current day/week...'
-	strings to 'Selected day/week...' to make a little less confusing.
-	Fixes bug #5451.
-
-2001-07-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (is_duplicate): see if the address is
-	already in the list of attendees
-	(duplicate_error): throw up an error dialog
-	(popup_delegate_cb): if the attendee has already delegated, delete
-	the old delegatee
-	(value_at): cast to kill warnings
-	(append_row): don't add the new attendee if they are already in
-	the list
-
-2001-07-24  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (get_exception_string): calculate
-	tmp_tm.tm_wday ourselves. strftime has a habit of crashing if you
-	have weird values here. I think this fixes bug #4574.
-
-2001-07-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (value_at): stip the delto and
-	delfrom
-	(popup_delegate_cb): show a delegate dialog and add the new
-	delegatee and update the delegator
-	(add_section): listen for changes in a more direct manner
-	(get_select_name_dialog): add_section now takes a limit argument
-
-	* gui/dialogs/e-delegate-dialog.[hc]: New dialog to query the user
-	for a person to delegate to
-
-	* gui/dialogs/Makefile.am: build/install new files
-
-	* gui/Makefile.am: add ldadd line for ebook
-
-2001-07-21  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): fixed
-	the test to see whether we should draw the icons.
-
-2001-07-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (get_local_file_name_for_folder_type):
-	New helper function.
-	(remove_folder): Add a @type arg and handle it, by deleting
-	"tasks.ics" instead of "calendar.ics" if the type is "tasks".  If
-	the type is not "tasks" or "calendar", report an
-	`UNSUPPORTED_TYPE' error.
-	(xfer_folder): Likewise.
-
-2001-07-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c: Make folders of type "calendar" and
-	"tasks" user-creatable by setting `user_creatable' to %TRUE in the
-	`EvolutionShellComponentFolderType's.
-
-2001-07-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/event-editor.h (event_editor_update_widgets):
-	Removed unused prototype.
-
-	* gui/dialogs/task-editor.h (task_editor_update_widgets):
-	Likewise.
-
-2001-07-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (clean_up): free various data related
-	settings
-	(destroy): use cleanup and unref the clients
-	(e_itip_control_set_data): clean up before setting the data and
-	store the timezones in a top level component
-	(update_item): use cal_client_update_objects and our top level
-	(including the timezones)
-
-2001-07-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): 
-	* gui/calendar-commands.c (pixmaps): updated to use new print icon.
-
-2001-07-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (init_widgets): don't show the time
-	in the EDateEdit widget for adding EXDATEs.
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): don't
-	set t.time.is_date to -1. It is a boolean flag, 0 or 1. We probably
-	don't want a date value, so we leave it at 0.
-
-2001-07-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	do not discard drawing icon if mask is NULL
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	ditto
-
-2001-07-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (get_next): find the next displayable
-	component
-	(get_prev): find the previous displayable component
-	(e_itip_control_set_data): use above
-	(prev_clicked_cb): ditto
-	(next_clicked_cb): ditto
-
-2001-07-17  Federico Mena Quintero  <federico@ximian.com>
-
-	Really fixes #4380.  The previous fix was necessary but not
-	sufficient; it worked for me because my system timezone happens to
-	match the Evolution timezone --- if they don't match, the bug
-	would persist.  Not matching is *not* an error; it is just a
-	matter of Unix sucking a lot and XST not being finished :)
-
-	* cal-util/timeutil.c (time_to_gdate_with_zone): New function.  We
-	cannot use g_date_set_time() anymore because it does not take
-	timezones into account.
-
-	* gui/gnome-cal.c (get_days_shown): Use the function above.
-
-	* gui/e-day-view.c (e_day_view_find_work_week_start): Likewise.
-
-	* gui/e-week-view.c (e_week_view_set_selected_time_range): Likewise.
-
-2001-07-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): Print
-	a g_message when the list of invited people changes
-	in the SelectNames control.
-	(add_section): #if 0/#endif out some (broken?) code.
-	(get_select_name_dialog): Listen for changes in the
-	SelectNames control.
-
-2001-07-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/e-timezone-dialog.c (e_timezone_dialog_destroy): destroy
-	the dialog widget here. Fixes bug #4198.
-
-2001-07-16  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): 
-	* gui/dialogs/event-page.c (event_page_fill_widgets): try to use
-	builtin timezones before getting them from the server. When creating
-	new events/tasks the timezones may not be on the server.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): for all-day
-	events we subtract a day from the end date rather than add it.
-
-	* gui/dialogs/e-timezone-dialog.c (on_map_leave): ignore the event
-	if it isn't a GDK_CROSSING_NORMAL event. For some reason we are getting
-	leave events when the button is pressed, which meant that selecting
-	timezones in the map didn't work.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_dates): 
-	* gui/print.c (print_date_label): only free icaltimetype if not NULL.
-
-2001-07-12  Taylor Hayward  <taylorhayward@yahoo.com>
-
-	* gui/goto-dialog.glade:
-	* gui/meeting-mockup.glade:
-	* gui/alarm-notifyålarm-notify.glade:
-	* gui/dialogs/alarm-page.glade:
-	* gui/dialogs/meeting-page.glade:
-	* gui/dialogs/recurrence-page.glade: Added missing underlined
-	shortcuts.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/cal-util.h: new proto
-
-	* cal-util/cal-util.c (cal_util_new_top_level): standard place to
-	get your top level calendar component
-
-	* pcs/cal-backend-file.c (create_cal): use it
-
-	* gui/itip-utils.c (itip_send_comp): ditto
-
-	* gui/e-calendar-table.c (e_calendar_table_copy_clipboard): ditto
-	
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_copy_clipboard): fix
-	typo breaking compilation
-
-	* gui/dialogs/meeting-page.c: fix include
-
-	* gui/dialogs/Makefile.am: build select names idl here
-
-	* gui/Makefile.am: remove select names compilation from here
-	
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.c (task_details_page_set_dates):
-	guard against infinite loops with the updating boolean, fixes 4270
-
-2001-07-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c: added support for multiple selections in
-	cut/copy/paste. Also, it's now ready for the
-	s/update_object/update_objects change (I think)
-
-2001-07-11  Damon Chaplin  <damon@ximian.com>
-
-	* idl/evolution-calendar.idl: renamed updateObject to updateObjects
-	and removed the UID argument, since it can add/update multiple objects
-	at once. (It can't yet, but it will!)
-
-	* pcs/cal.c: 
-	* pcs/cal-backend.[hc]: 
-	* pcs/cal-backend-file.c: renamed update_object to update_objects and
-	got rid of the UID arg.
-
-	* cal-client/cal-client.c (cal_client_update_objects): new function to
-	add/update multiple objects in one go, i.e for iTIP and for importing
-	calendars.
-
-	* gui/print.c (print_date_label): fixed type bug.
-
-	* gui/e-week-view.[hc]: 
-	* gui/e-week-view-event-item.c: draw the timezone icons if the event's
-	DTSTART or DTEND is in a different timezone to the current one.
-	Note that we may want to change this so it compares the UTC offsets
-	rather than the TZIDs, since currently it will draw the icons for all
-	events coming from iTIP requests from other clients.
-
-2001-07-11  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #4380 as well as some leftovers from the days of struct
-	tm and some uninitialized values.
-
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): Initialize
-	the icaltimetype structures completely.
-	(gnome_calendar_init): Do not reset priv->zone to NULL here, since
-	it was set by gnome_calendar_update_config_settings() from
-	setup_widgets().
-
-	* gui/calendar-model.c (set_completed): Do not set is_daylight.
-
-	* gui/e-day-view.c (e_day_view_convert_grid_position_to_time):
-	Likewise.
-
-	* gui/e-week-view.c (e_week_view_set_timezone): Likewise.
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): Likewise,
-	and initialize start_tt and end_tt completely.
-
-	* cal-util/timeutil.c (time_year_begin_with_zone): Likewise.
-	(time_month_begin_with_zone): Likewise.
-	(time_week_begin_with_zone): Likewise.
-	(time_day_begin_with_zone): Likewise.
-	(time_day_end_with_zone): Likewise.
-	(time_from_isodate): Likewise.
-
-	* gui/dialogs/task-page.c (task_page_fill_component): Initialize
-	icaltime before using it.
-
-	* gui/dialogs/event-page.c (event_page_fill_component): Likewise.
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): Removed an
-	unused icaltimetype.
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_component): Initialize icaltime before
-	using it.
-
-2001-07-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component-factory.c: fix the calendar not exiting with a
-	gross hack because i don't have time to fix the ref counting right
-	now
-	
-2001-07-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: be careful about adding and
-	stripping MAILTO:'s properly
-
-	* gui/dialogs/meeting-page.etspec: add missing columns
-
-	* gui/itip-utils.c (itip_strip_mailto): point to the real start of
-	the email address
-
-	* gui/itip-utils.h: add proto
-
-	* gui/itip-control-factory.c: get rid of the my address property
-
-	* gui/e-itip-control.c: use the users real identity to figure out
-	which attendee they are
-	(find_my_address): figure out who the user is among the attendees
-
-	* gui/e-itip-control.h: remove protos
-
-	* gui/dialogs/Makefile.am: extra dist etspecs
-
-	* gui/Makefile.am: ditto
-
-2001-07-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-calendar-table.c: Added a hack to get the last
-	string translated since xml-i18n-tools doesn't recognize
-	_click-to-add-message="Click here to add a task".
-	
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* gui/Makefile.am (BUILT_SOURCES): Move this higher so that
-	Makefile properly depends on us. Fixes distcheck.
-
-2001-07-11  Jason Leach  <jleach@ximian.com>
-
-	[Fix bug #4389: ETableSpecification still in e-calendar-table.c
-	file]
-	
-	* gui/e-calendar-table.etspec: New file containing the spec that
-	was in e-calendar-table.c as a big string.
-	
-	* gui/e-calendar-table.c (e_calendar_table_init): Use the spec
-	file instead of a string.
-	(e_calendar_table_get_spec): Removed this function, we don't need
-	it anymore.
-
-	* gui/e-tasks.c (e_tasks_setup_menus): Don't load from string,
-	from file instead.
-	
-	* gui/Makefile.am: Necessary changes to get the new .etspec file
-	installed.
-
-2001-07-10  Jason Leach  <jleach@ximian.com>
-
-	[Fix bug #4388: ETableSpecification still in meeting-page.c file]
-
-	* gui/dialogs/meeting-page.etspec: New file containing the spec
-	that was previously in meeting-page.c as a string.
-	
-	* gui/dialogs/meeting-page.c: One line change to get it to use
-	this spec file instead of a string.
-
-	* gui/dialogs/Makefile.am: Necessary changes to get the new
-	meeting-page.etspec installed.
-
-2001-07-10  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c:
-	* gui/e-calendar-table.c:
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-day-view.[hc]:
-	* gui/e-week-view.c:
-	* gui/gnome-cal.c:
-	* gui/print.c:
-	* gui/dialogs/cal-prefs-dialog.c:
-	* gui/dialogs/comp-editor-util.c:
-	* gui/dialogs/event-page.c:
-	* pcs/cal-backend-file.c:
-	* pcs/query.c:
-	* cal-util/cal-component.[hc]: 
-	* cal-util/cal-recur.c: 
-	* cal-util/timeutil.[hc]: 
-	* cal-client/cal-client.[hc]: more timezone updates. I'm pretty much
-	done with the calendar code now, except for alarms and conduits,
-	which Federico and JP know more about. And there are a couple of
-	other minor things to fix. But it is still pretty buggy.
-
-2001-07-10  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: Add popup support so you can delete
-	users from the list
-
-	* gui/dialogs/comp-editor.c (setup_widgets): fix typo
-
-2001-07-10  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): Handle the
-	different alarm actions.
-	(display_notification): Do the alarm notification dialog here.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (make_heading): Take in a
-	CalComponentVType, not a whole component.
-	(alarm_notify_dialog): Take in a CalComponentVType and the final
-	message instead of generating it ourselves.
-
-2001-07-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-backend-file.c (generate_alarms_for_comp): Pass the
-	parent vCalendar component as the timezone closure of
-	cal_recur_generate_instances().
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): Make the string
-	consistent with the option menu text.
-	(get_alarm_string): Removed extra spaces from the last part of the
-	alarm string.
-
-2001-07-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_key_press): Use
-	e_utf8_from_gtk_event_key() so that we can input utf8 text
-	properly.
-	(e_day_view_cut_clipboard): Constify.
-	(e_day_view_on_cut): Constify.
-	(e_day_view_reshape_long_event): Remove unused variable.
-
-	* gui/e-week-view.c (e_week_view_key_press): Use
-	e_utf8_from_gtk_event_key() so that we can input utf8 text
-	properly.
-	(e_week_view_cut_clipboard): Constify.
-	(e_week_view_on_cut): Constify.
-
-	* cal-client/cal-client.c (cal_client_resolve_tzid_cb): Fix the
-	prototype so that this matches CalRecurResolveTimezoneFn.  Also
-	renamed it so that it is clear that it is supposed to be a
-	callback.
-
-2001-07-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (init_widgets): connect to the entry
-	not the combo
-
-	* gui/dialogs/event-editor.c (set_menu_sens): set menu
-	sensitivities based on whether or not the meeting page is shown
-	(event_editor_init): call above
-	(event_editor_edit_comp): ditto
-	(schedule_meeting_cmd): ditto
-
-	* gui/dialogs/comp-editor.h: new proto
-
-	* gui/dialogs/comp-editor.c (comp_editor_set_ui_prop): new
-	function to allow for set of ui props (esp. "sensitive")
-	
-2001-07-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (clear_widgets): actually clear some
-	widgets and hide/show widgets in the default setup
-	(meeting_page_destroy): destroy the address lists
-	(meeting_page_fill_widgets): allow the user to select among their
-	identities as a new organizer, or show the existing organizer as
-	label
-	(meeting_page_fill_component): set the "MAILTO:" bit of the
-	organizer to match spec, set CN properly if we know it
-	(get_widgets): load new widgets
-	(other_clicked_cb): handle "Other Organizer" click
-	(change_clicked_cb): handle "Change Organizer" click
-	(init_widgets): listen for clicks on new buttons
-
-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): remove the
-	page from our internal list and unref it
-
-	* gui/itip-utils.c (itip_addresses_get): get the configure mail
-	identities
-	(itip_addresses_free): free a list of identities returned by
-	itip_addresses_get
-
-	* gui/itip-utils.h: remove obsolete protos, and new protos
-
-	* gui/gnome-cal.html: Remove ancient file
-
-2001-07-04  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #4018 and what would be the analogous bugs for the other
-	component editors.
-
-	* gui/dialogs/comp-editor-page.h (CompEditorPageClass): New
-	virtual method "::focus_main_widget()".
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_focus_main_widget): New function.
-
-	* gui/dialogs/comp-editor.c (comp_editor_append_page): If we are
-	inserting the main page, ask it to focus its main widget.
-
-	* gui/dialogs/alarm-page.c (alarm_page_focus_main_widget):
-	Implemented.
-
-	* gui/dialogs/event-page.c (event_page_focus_main_widget):
-	Implemented.
-	#include "e-util/e-categories-config.h".
-
-	* gui/dialogs/meeting-page.c (meeting_page_focus_main_widget):
-	Implemented.
-
-	* gui/dialogs/recurrence-page.c
-	(recurrence_page_focus_main_widget): Implemented.
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_focus_main_widget): Implemented.
-
-	* gui/dialogs/task-page.c (task_page_focus_main_widget):
-	Implemented.
-
-2001-07-04  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-commands.c (clear_folder_bar_label): New function.
-	(calendar_control_activate): Clear the folder bar label; we really
-	don't have anything interesting to display.
-
-2001-07-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: Add new columns for information
-	specification
-	(meeting_page_destroy): save the table state
-	(build_etable): load new table state
-
-	* gui/dialogs/task-editor.c (task_editor_destroy): unref pages
-
-	* gui/dialogs/event-editor.c (event_editor_destroy): unref pages
-
-	* gui/dialogs/comp-editor.c (setup_widgets): kill warning
-	(comp_editor_append_page): ref page passed in
-	(close_dialog): unref pages
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-day-view.c (query_obj_updated_cb): fix warning, and added
-	some debug messages.
-
-	* gui/dialogs/comp-editor-util.c (write_label_piece): 
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): call mktime()
-	to set the weekday, though this is a temporary fix.
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal-backend.[hc]: added virtual method to get a VTIMEZONE
-	component given a TZID. We need this to resolve TZIDs when expanding
-	an event using cal_recur_generate_instances() in query.c.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_timezone): implemented
-	virtual method.
-	(cal_backend_file_update_object): fixed bug, kind -> child_kind.
-
-	* pcs/query.c (func_occur_in_time_range): use the virtual method for
-	resolving TZIDs. The other way didn't work anyway, as we didn't have
-	the entire VCALENDAR with VTIMEZONEs in it.
-
-	* gui/dialogs/recurrence-page.c (init_widgets): 
-	(make_ending_until_special): moved the call to
-	e_date_edit_set_get_time_callback() from init_widgets to
-	make_ending_until_special(), since that is where the widget gets
-	created.
-
-	* gui/e-timezone-entry.c (e_timezone_entry_set_timezone): handle zone
-	being NULL.
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.[ch]: New files with the alarm options
-	dialog; this configures the repeat/duration properties and the
-	options specific to each alarm action type.
-
-	* gui/dialogs/alarm-page.c (AlarmPagePrivate): Added the alarm
-	options button.  Also, keep an alarm structure which we are
-	editing and an alarm options dialog.
-	(init_widgets): Connect to the options button.
-	(add_clicked_cb): Clone the component we are editing instead of
-	creating a new one so that we preserve the data from the alarm
-	options dialog.
-	(button_options_clicked_cb): Pop up the alarm options dialog.
-
-	* cal-util/cal-component.c (cal_component_alarm_new): Doh,
-	initialize the other fields in the new alarm.
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* cal-client/cal-client.[hc]
-	* cal-util/cal-component.c
-	* cal-util/cal-recur.[hc]
-	* cal-util/test-recur.c
-	* cal-util/timeutil.c
-	* gui/calendar-config.c
-	* gui/calendar-model.[hc]
-	* gui/comp-util.[hc]
-	* gui/e-calendar-table.c
-	* gui/e-day-view-main-item.c
-	* gui/e-day-view-top-item.c
-	* gui/e-day-view.[hc]
-	* gui/e-itip-control.c
-	* gui/e-timezone-entry.[hc]
-	* gui/e-week-view.[hc]
-	* gui/gnome-cal.[hc]
-	* gui/goto.c
-	* gui/tag-calendar.[hc]
-	* gui/dialogs/cal-prefs-dialog.c
-	* gui/dialogs/comp-editor-page.[hc]
-	* gui/dialogs/comp-editor-util.[hc]
-	* gui/dialogs/comp-editor.c
-	* gui/dialogs/e-timezone-dialog.[hc]
-	* gui/dialogs/event-page.c
-	* gui/dialogs/meeting-page.c
-	* gui/dialogs/recurrence-page.c
-	* gui/dialogs/task-details-page.c
-	* gui/dialogs/task-details-page.glade
-	* gui/dialogs/task-page.c
-	* idl/evolution-calendar.idl
-	* pcs/cal-backend-file.c
-	* pcs/cal-backend.c
-	* pcs/cal-backend.h
-	* pcs/cal.c
-	* pcs/query.c: timezone changes everywhere. There's still quite a
-	few things to update, and its not working well at present.
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): publish
-	free/busy information for the currently viewed time range
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS).
-	(evolution_calendar_LDADD): Added $(BONOBO_CONF_LIBS).
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	Support for ATTACH, DESCRIPTION properties in alarm components.
-
-	* cal-util/cal-component.c (scan_alarm_property):  Deal with
-	ATTACH, DESCRIPTION properties.
-	(cal_component_alarm_get_attach): New function.  Libical is
-	actually bogus; supposedly icalattachtype structures are
-	refcounted but the property functions return them by value.
-	(cal_copmonent_alarm_set_attach): New function.
-	(cal_component_alarm_get_description): New function.
-	(cal_component_alarm_set_description): New function.
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	Support for repeat/duration properties in alarm components.
-
-	* cal-util/cal-component.h (CalAlarmRepeat): New structure that
-	pairs the repeat/duration values of an alarm component, which must
-	be set both together or not set at all.
-
-	* cal-util/cal-component.c (CalComponentAlarm): Added fields for
-	the repeat and duration properties.
-	(scan_alarm_property): Scan the DURATION and REPEAT properties.
-	(make_alarm): Nullify/initialize all the fields in the alarm.
-	(cal_component_alarm_get_repeat): New function.
-	(cal_component_alarm_set_repeat): New function.
-
-	* gui/dialogs/alarm-page.glade: Changed the label of display
-	alarms from "Show a dialog" to "Display a message".
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_widgets): fill in delegated from field
-	
-2001-07-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/task-page.c (categories_clicked_cb): 
-	* gui/dialogs/event-page.c (categories_clicked_cb): use the new
-	self-contained e_categories_config_open_dialog_for_entry() function
-
-	* gui/e-week-view-event-item.c (e_week_view_item_draw_icons): 
-	* gui/e-day-view-top-item.c (e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event): ditto
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	use e_categories_config_get_icon_for() to retrieve the icon
-	associated with each category
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (send_freebusy): implement
-
-	* cal-util/cal-component.c (set_attendee_list): add the delto
-	property rather than the delfrom property twice
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): show
-	delegation info if appropriate
-	(delegate_task_cmd): delegate command
-	(cancel_task_cmd): cancel command
-	(refresh_task_cmd): refresh command
-
-	* gui/dialogs/task-details-page.c: Load new widgets
-	(task_details_page_show_delegation): show/hide delegation info widgets
-
-	* gui/dialogs/task-details-page.h: new proto
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): free
-	attendee list when finished
-
-	* gui/dialogs/comp-editor.c (setup_widgets): explicitly show the
-	widgets, update pixmaps after the verbs have been added
-	(comp_editor_focus): don't do a show all
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #1406.
-
-	* gui/calendar-config.c (config_read): Handle the options for the
-	task list colors.
-	(calendar_config_write): Ditto.
-	(calendar_config_get_tasks_due_today_color): New function.
-	(calendar_config_set_tasks_due_today_color): New function.
-	(calendar_config_get_tasks_overdue_color): New function.
-	(calendar_config_set_tasks_overdue_color): New function.
-	(calendar_config_configure_e_calendar_table): Use
-	e_table_model_changed() for the colors.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Updated the options for the
-	task list and alarms.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config):
-	Update the task list settings.
-	(cal_prefs_dialog_update_config): Ditto.
-
-	* gui/calendar-model.c (get_color): Deal with tasks for today as
-	well as overdue tasks.  Make it cleaner, even though we have to
-	duplicate a chunk of is_overdue().
-
-	* gui/calendar-commands.c (preferences_cmd): Renamed from
-	properties_cmd().
-
-2001-07-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-main-item.c
-	(e_day_view_main_item_draw_day_event): draw icons per category
-
-	* gui/e-day-view-top-item.c
-	(e_day_view_top_item_draw_long_event): draw icons per category
-
-	* gui/e-day-view.c
-	(e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event): calculate space for category icons
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_draw_icons): draw icons per category
-
-	* gui/e-week-view.c
-	(e_week_view_reshape_event_span): calculate space for category icons
-	
-2001-07-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_*_clipboard): fixed clibpoard
-	command activation from the menu entries. CTRL-C and CTRL-X don't
-	work though, since it seems the key presses are being captured by
-	the text item
-
-	gui/e-week-view.c (e_week_view_*_clipboard): ditto
-
-2001-06-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_button_press): Only set the
-	pressed_event_num and pressed_span_num if button 1 was pressed.
-	Fix up return values a bit.  This fixes bug #3780.
-
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): Doh, the
-	call for the day view was supposed to be
-	gnome_calendar_set_view(), not set_view().  Fixes bug #3779.
-
-2001-06-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_cut_cmd): call
-	e_calendar_table_cut_clipboard with the correct object
-
-	(tasks_control_copy_cmd): ditto
-
-	(sensitize_commands): sensitize clipboard commands based on the
-	number of selected tasks
-
-2001-06-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.[ch] (e_calendar_table_cut_clipboard),
-	(e_calendar_table_copy_clipboard),
-	(e_calendar_table_paste_clipboard): new functions for allowing the
-	execution of clipboard-related commands
-
-	* gui/tasks-control.c (tasks_control_cut_cmd),
-	(tasks_control_copy_cmd), (tasks_control_paste_cmd): added
-	callbacks for the new clipboard-related menu entries
-
-2001-06-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c: removed not-uses-anymore parameter in
-	call to evolution_shell_component_new
-
-	* gui/gnome-cal.[ch] (gnome_calendar_cut_clipboard),
-	(gnome_calendar_copy_clipboard), (gnome_calendar_paste_clipboard):
-	new functions for allowing execution of clipboard-related commands
-
-	* gui/e-day-view.[ch] (e_day_view_cut_clipboard),
-	(e_day_view_copy_clipboard), (e_day_view_paste_clipboard): ditto
-
-	* gui/e-week-view.[ch] (e_week_view_cut_clipboard),
-	(e_week_view_copy_clipboard), (e_week_view_paste_clipboard): ditto
-
-2001-06-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c (cut_event_cmd),
-	(copy_event_cmd), (paste_event_cmd): added callbacks for the new
-	clipboard-related menu entries
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (factory_fn): Pass NULL as the
-	@external_uri_schemas argument to
-	`evolution_shell_component_new()'.
-
-2001-06-27  Peter Williams  <peterw@ximian.com>
-
-	* conduits/*/Makefile.am (INCLUDES): More srcdir != builddir
-	fixes.
-
-2001-06-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c (selection_received): fixed
-	(e_calendar_table_on_copy): fixed
-
-2001-06-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* idl/evolution-calendar.idl (CalAlarmInstance): Renamed the occur
-	field to occur_start; added an occur_end field.  This way we can
-	present the complete times for the occurrence from the server.
-
-	* cal-util/cal-component.h (CalAlarmInstance): Likewise.
-
-	* pcs/cal-backend-file.c (add_alarm_occurrences_cb): Fill the new
-	fields appropriately.
-	(generate_absolute_triggers): Likewise; we use -1 in case the
-	component has no DTSTART or DTEND because there are no meaningful
-	occurrence dates here.
-	(fill_alarm_instances_seq): Fill in the new fields.
-
-	* cal-client/cal-client.c (build_alarm_instance_list): Likewise.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):
-	Take in both the occur_start and occur_end times.
-
-	* gui/goto.c (goto_dialog): Free the dlg structure on the bail-out
-	cases.
-
-	* gui/dialogs/event-page.c (get_widgets): Do not assert if we
-	cannot find the main widget; just return FALSE.
-
-	* gui/dialogs/alarm-page.c (get_widgets): Likewise.
-
-	* gui/dialogs/task-page.c (get_widgets): Likewise.
-
-	* gui/dialogs/task-details-page.c (get_widgets): Likewise.
-
-	* gui/dialogs/meeting-page.c (get_widgets): Likewise.
-
-2001-06-25  Peter Williams  <peterw@ximian.com>
-
-	* conduits/calendar/Makefile.am (INCLUDES): Fixes for
-	srcdir != builddir. Link to the static libwombat.
-
-	* conduits/todo/Makefile.am (INCLUDES): Here too.
-
-2001-06-24  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (main): Initialize libglade.
-
-	* pcs/cal-backend-file.c (compute_alarm_range):
-	icaldurationtype_as_int() will now return a negative value if
-	dur->is_neg is true, so we need to flip the sign of some
-	operations here.
-	(add_alarm_occurrences_cb): Likewise.
-
-	* pcs/cal-backend-db.c (compute_alarm_range): Likewise.
-	(add_alarm_occurrences_cb): Likewise.
-
-2001-06-24  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c: Converted to use BonoboXObject.
-
-	* gui/gnome-cal.c (gnome_calendar_open): Ask the alarm
-	notification service to add the calendar and tasks URIs.
-	(add_alarms): New function.
-
-	* gui/alarm-notify/notify-main.c (main): Doh, fixed typo in the
-	OAFIID.
-	(main): Initialize and shut down gnome-vfs.
-
-	* gui/Makefile.am (IDLS): Added evolution-calendar.idl, sigh.
-	(evolution_calendar_SOURCES): Added the files generated from the IDL.
-
-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): New function
-	used when an alarm is triggered.
-
-	* gui/dialogs/Makefile.am: Removed the alarm-notify-dialog files;
-	they are now in gui/alarm-notify.
-
-	* gui/alarm-notify/Makefile.am: Added the alarm-notify-dialog
-	files.
-
-	* pcs/cal.c (cal_forget_password): This was incorrectly named
-	cal_client_forget_password(); renamed it.
-
-	* gui/main.c (main): Initialize and shut down gnome-vfs.
-
-2001-06-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-calendar-table.c (task_compare_cb): New function to
-	compare tasks like the Pilot task list.
-
-	* cal-util/cal-component.h (CalComponentField): Added a
-	semi-hackish CAL_COMPONENT_FIELD_COMPONENT.  In the ETable model,
-	it is intended to return a pointer to the component itself.
-
-	* gui/calendar-model.c (calendar_model_value_at): Return the
-	component itself for CAL_COMPONENT_FIELD_COMPONENT.  Be more
-	paranoid about invalid columns.
-	(calendar_model_set_value_at): Be more paranoid about invalid
-	columns.
-	(calendar_model_duplicate_value): Ref the component field.
-	(calendar_model_initialize_value): Deal with the component field.
-	(calendar_model_value_is_empty): Likewise.
-	(calendar_model_value_to_string): Likewise.
-
-2001-06-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/Makefile.am: Added itip-control-factory.* to the build.
-
-2001-06-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.[ch] (cal_get_password): new function for the backends to
-	be able to call the getPassword method on the associated
-	WombatClient
-	(cal_forget_password): ditto for the forgetPassword method
-
-2001-06-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: changed getFreeBusy method to return
-	a CalObj instead of a sequence
-
-	* cal-client/cal-client.[ch] (cal_client_get_free_busy): changed it to
-	work like the cal_client_get_object function, that is, it does not
-	return anymore a list of UIDs, but a CalClientGetStatus code, and
-	added a new parameter for the caller to get the component back when
-	this function returns
-	(cal_client_open): aggregate WombatClient interface to the CalListener
-	being used
-
-	* pcs/cal-backend-db.c, pcs/cal-backend-file.c (..get_free_busy): set
-	return value to "char *" as it will be returning a FreeBusy object,
-	and not a list of UIDs
-
-	* pcs/cal-backend.[ch] (cal_backend_get_free_busy): ditto
-
-	* pcs/cal.c (cal_construct): queryInterface on the listener to obtain
-	the WombatClient interface
-
-2001-06-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/main.c (main): update to new call
-
-	* gui/e-itip-control.[hc]: break the widget bits out on their own
-	into a proper object, basic stuff seems to be working again
-	
-	* gui/itip-control-factory.c: put the control specific bits here
-	from e-itip-control.c
-
-	* gui/itip-control-factory.h: new header
-
-2001-06-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/Makefile.am (gladedir): add include path
-
-	* gui/dialogs/comp-editor.c (setup_widgets): remove buttons and
-	use evolution's standard ui config
-
-	* gui/print.c (print_comp_item): print description text
-
-2001-06-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.[ch]:
-	(cal_client_init): create a WombatClient when creating a CalClient
-	object, so that we can receive authentication notifications from
-	the wombat
-	(cal_client_destroy): destroy the WombatClient object when dying
-	(cal_client_set_auth_func): new function to set the authentication
-	function to be called when a password is required by the calendar
-	server (through the WombatClient object)
-	(cal_client_get_free_busy): new function for calling the new IDL
-	method Cal::getFreeBusy
-
-	* gui/alarm-notify/Makefile.am: add libwombat to LDADD
-
-	* gui/Makefile.am: add libwombat to LDADD
-
-2001-06-20  Dave Camp  <dave@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): Changed attach_data
-	to be a GNOME_Evolution_Composer_AttachmentData rather than a
-	CORBA_char*.
-
-2001-06-20  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (print_cmd): print menu command
-	(print_preview_cmd): ditto for print preview
-	(print_setup_cmd): ditto for print setup
-	(comp_editor_set_cal_client): listen for updated and removed
-	signals
-	(obj_updated_cb): if the item changes else where, query the user
-	for the course of action
-	(obj_removed_cb): ditto for removal
-
-	* gui/print.c (print_setup): rudimentary page setup support
-	(print_comp): rudimentary individual event/task printing support
-
-	* gui/print.h: new protos
-
-	* gui/dialogs/changed-comp.[hc]: dialog to query the user about
-	what to do when a item is changed elsewhere
-
-	* gui/dialogs/Makefile.am: build new files
-
-	* gui/dialogs/send-comp.c (send_component_dialog): remove useless
-	assignment
-	
-2001-06-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added getFreeBusy method
-
-	* pcs/cal.c (impl_Cal_get_free_busy): implementation of the new
-	getFreeBusy added method
-	
-	* pcs/cal-backend.[ch]: added new virtual method to the CalBackend
-	class (get_free_busy)
-
-	* pcs/cal-backend-db.c (cal_backend_db_get_free_busy): new function,
-	not implemented yet
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): new funtion,
-	not implemented yet
-
-2001-06-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-config.[hc]:
-	* gui/gnome-cal.[hc]: 
-	* gui/tasks-control.c (tasks_control_activate): 
-	* gui/calendar-commands.c (calendar_control_activate): moved the
-	function to check for a default timezone to calendar-config.c, and
-	also used it in the tasks control.
-
-	* gui/dialogs/e-timezone-dialog.h: #include <gtk/gtkwidget.h> fix.
-
-2001-06-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): 
-	* gui/gnome-cal.[hc]: added code to show the timezone dialog if the
-	user hasn't set a default timezone yet.
-
-	* gui/dialogs/e-timezone-dialog.c (e_timezone_dialog_add_timezones): 
-	set the "None" item string before adding it to the combo, to stop the
-	combo putting "None" in the entry initially.
-
-2001-06-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.[ch]: added cut/copy/paste support. It works
-	with single selections (a single component selected) and with
-	multiple ones (several components selected)
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/event-page.c: if the timezones of the start and end of
-	the event are the same, then if the start timezone is changed we
-	change the end timezone as well, since that is what most users will
-	want.
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal.c: 
-	* idl/evolution-calendar.idl: 
-	* cal-client/cal-client.[hc]: removed stuff to get builtin timezone
-	info from the server.
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c: added a 'Time zone' setting. Also
-	rearranged a little, adding a new 'General' page, since we had too
-	many settings on the 'Calendar' page.
-
-	* gui/e-timezone-entry.[hc]: 
-	* gui/dialogs/e-timezone-dialog.[hc]: 
-	* gui/dialogs/comp-editor.c: 
-	* gui/dialogs/comp-editor-page.[hc]: 
-	* gui/dialogs/event-page.c: 
-	* gui/dialogs/task-details-page.c: 
-	* gui/dialogs/task-page.c: removed CalClient stuff. The timezone dialog
-	now uses the timezone data directly from the client's libical library.
-
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_init): add ui
-	(forward_cmd): implement forward command
-
-	* gui/dialogs/comp-editor.c (save_as_ok): bug fix, seems to work
-	now
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/control-factory.c (control_factory_init): add auto exit unref
-
-	* gui/component-factory.c (destroy_cb): destroy our selves if we
-	have no more shells
-	(component_factory_init): add auto exit unref
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/Makefile.am: don't compile or install the old meeting edit
-	stuff
-
-	* gui/e-week-view.c: ditto
-
-	* gui/e-day-view.c: Remove scheduling menu option
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c: add some needed commas
-	(itip_send_comp): if publishing, don't set the to list and show
-	the message.  unless publishing, just send the email
-
-	* gui/Makefile.am: remove typo
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/send-comp.c: itip/imip send dialog
-
-	* gui/dialogs/send-comp.h: new proto
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): only
-	use the weekday picker if visible
-
-	* gui/dialogs/meeting-page.c: just show the meeting list
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): remove the
-	meeting page if no attendees
-	(schedule_meeting_cmd): schedule a meeting menu item
-	(refresh_meeting_cmd): refresh meeting request menu item
-	(cancel_meeting_cmd): ditto for cancel
-	(forward_cmd): send as attachment
-
-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): remove page
-	from dialog
-	(comp_editor_show_page): show a given page
-	(comp_editor_get_current_comp): return a cal component
-	representing the current widget state
-	(comp_editor_save_comp): save the cal component
-	(comp_editor_delete_comp): delete the cal component
-	(comp_editor_send_comp): send the cal component
-	(comp_editor_merge_ui): merge xml in to the bonobo gui
-	(setup_widgets): use a bonobo window instead of a gtk window, add menus again
-	(save_as_cmd): save to file on disk - still broken
-	(save_close_cmd): close menu command
-	(save_close_cmd): save and close menu command
-
-	* gui/dialogs/comp-editor.h: new protos
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): itip/imip
-	cancellation dialog
-
-	* gui/dialogs/cancel-comp.h: new proto
-
-	* gui/dialogs/Makefile.am: build new files
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_notify_needs_send): emit needs_send signal
-
-	* gui/dialogs/comp-editor-page.h: new signal protos
-
-	* gui/itip-utils.c (itip_send_comp): new function to send cal
-	components
-
-	* gui/itip-utils.h: new proto
-
-	* gui/e-itip-control.c (pstream_load): trim using cal-component
-	wrapper stuff
-	(accept_button_clicked_cb): use itip_send_comp
-	(tentative_button_clicked_cb): ditto
-	(decline_button_clicked_cb): ditto
-
-	* gui/Makefile.am: compile select name idl stuff
-
-	* cal-util/cal-component.c (cal_component_get_organizer): get the organizer
-	(cal_component_set_organizer): set the organizer
-	(cal_component_get_recurid): get the recurrence id
-	(cal_component_set_recurid): set the recurrence id
-	(set_attendee_list): actually set the attendee list
-	(get_attendee_list): build the attendee list
-
-	* cal-util/cal-component.h: new protos
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-details-page.glade: 
-	* gui/dialogs/task-page.glade: 
-	* gui/dialogs/event-page.glade: added timezone fields. Also moved the
-	'All Day' flag into an alignment so it doesn't mess up the height of
-	the other widgets.
-
-	* gui/dialogs/task-details-page.c: 
-	* gui/dialogs/task-page.c: 
-	* gui/dialogs/event-page.c: added code to handle the timezone fields.
-	This still needs to be hooked up when the libical code is finished.
-
-	* gui/dialogs/e-timezone-dialog.c (on_map_leave): new function to
-	clear the preview label and turn off the highlighted point on the
-	map when you move the mouse outside it.
-	(find_selected_point): new function to try to find the point
-	corresponding to the text in the combo.
-	(on_combo_changed): call the above function to update the selected
-	point.
-	(on_map_leave): turn off the preview point & label when the mouse
-	leaves the map.
-	(e_timezone_dialog_set_cal_client): changed it so that selecting "None"
-	clears the entry.
-	
-	* gui/dialogs/comp-editor-page.[hc]: added set_cal_client() virtual
-	method since some pages need to access the CalClient to get timezone
-	information. Also added comp_editor_page_set_cal_client() to call
-	the virtual method.
-
-	* gui/dialogs/comp-editor.c (comp_editor_set_cal_client): called
-	comp_editor_page_set_cal_client() on each page.
-
-	* gui/calendar-config.c: added functions to get & set the timezone.
-
-2001-06-18  Eskil Heyn Olsen  <eskil@eskil.dk>
-
-	* conduits/calendar/calendar-conduit.c: (comp_from_remote_record),
-	(check_for_slow_setting), (conduit_get_gpilot_conduit):
-	* conduits/todo/todo-conduit.c: (check_for_slow_setting),
-	(conduit_get_gpilot_conduit):
-	Tweaked for some gnome-pilot api changes
-
-2001-06-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-view.[ch]: New files with the generic calendar view
-	object.  It sucks that we have to implement at least two classes
-	to define a GalView and its factory.
-
-	* gui/calendar-view-factory.[ch]: New files; factory for calendar
-	views.
-
-	* gui/gnome-cal.h (GnomeCalendarViewType): Moved from gnome-cal.c
-	and renamed from ViewType.  We no longer use strings to identify
-	the view types.
-
-	* gui/gnome-cal.c (gnome_calendar_get_view_type): New function.
-	(set_view): Renamed from gnome_calendar_set_view_internal().
-	(gnome_calendar_set_query): Made public; renamed from set_query().
-	(gnome_calendar_setup_view_menus): New function to set up the view
-	collection and the GalViewMenus.
-	(gnome_calendar_discard_view_menus): New function to discard them.
-
-	* gui/calendar-commands.c (calendar_control_activate): Set up the
-	GalView menus.
-	(calendar_control_deactivate): Discard the GalView menus.
-
-	* gui/e-day-view.c: #include <gtk/gtkinvisible.h>
-
-	* gui/dialogs/comp-editor.c (comp_editor_get_type): The type info
-	structure should be static.
-
-2001-06-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received): generate a new UID
-	when pasting
-
-	* gui/e-week-view.c (selection_received): ditto
-
-2001-06-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received): finished implementation
-	of Paste stuff
-
-	* gui/e-week-view.c (selection_received): ditto
-
-2001-06-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.[ch]: added popup menu items for cut/copy/paste
-
-	* gui/e-week-view.[ch]: ditto
-
-2001-06-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-timezone-entry.[hc]: new widget to enter a timezone.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): added the above.
-	* gui/Makefile.am (evolution_calendar_LDADD): had to move
-	libcal-dialogs.a above libmiscwidgets.a to get it to compile.
-
-2001-06-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/e-timezone-dialog.[hc]: 
-	* gui/dialogs/e-timezone-dialog.glade: new dialog for setting the
-	time zone.
-
-	* gui/dialogs/Makefile.am: added timezone dialog files.
-
-	* idl/evolution-calendar.idl: added CalTimezoneInfo struct and seq,
-	and getBuiltinTimezoneInfo method.
-
-	* pcs/cal.c (impl_Cal_get_builtin_timezone_info): implemented method.
-	(cal_class_init): added method to epv.
-	
-	* cal-client/cal-client.c (struct CalClientPrivate): added
-	timezone_info array to contain cached info on builtin timezone city
-	names and coordinates.
-	(cal_client_get_builtin_timezone_info): new function to get the info
-	about builtin timezones.
-
-	* cal-client/cal-client.h: added CalTimezoneInfo struct, to contain
-	the city names and coords of the builtin timezones.
-
-2001-06-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_date_label): remove
-	unnecessary space
-
-	* gui/dialogs/task-page.c (task_page_set_summary): indicate we are
-	updating, Fixes #3307
-
-2001-06-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.c (task_details_page_set_dates):
-	set the completed time in the date editor if appropriate
-
-	* gui/dialogs/task-page.c (task_page_set_dates): if we are
-	updating, return
-	(complete_date_changed): don't returns if we are updating - the
-	guards are done in the calling function
-	(status_changed): indicate when we are updating and when we are
-	finished, round the completion time to the nearest minute
-	(percent_complete_changed): indicate when are updating and when we
-	are finished
-	(percent_complete_changed): notify of the date change after the
-	option menu is updated
-	
-2001-06-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.[ch]: added cut&paste support, by using a GtkInvisible
-	widget to manage the clipboard selections.
-	
-	* gui/e-week-view.[ch]: ditto
-
-2001-06-08  Iain Holmes  <iain@ximian.com>
-
-	* gui/component-factory.c: Removed the executive-summary includes.
-	(component_factory_init): Don't init the summary factory.
-
-	* gui/calendar-summary.[ch]: Removed.
-
-	* gui/Makefile.am: Remove executive-summary stuff, move some libs 
-	around a bit.
-
-2001-06-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates):
-	update the blocked/selected days if the starting day of the
-	appointment changes, fixes #2188
-
-	* gui/dialogs/task-details-page.h: tidy proto
-
-2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-itip-control.c: #include <bonobo/bonobo-context.h> instead
-	of <bonobo/bonobo-running-context.h>.
-	* gui/tasks-control-factory.c: Likewise.
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Move `$(DB3_LDADD)'
-	before libeutil.
-
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/Makefile.am: no longer build widget-util.*, the code has
-	been moved
-	
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/event-page.c (make_date_edit): use new func
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_create_date_edit): ditto
-
-	* gui/dialogs/recurrence-page.c (make_ending_until_special): ditto
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_new_date_edit):
-	rename date_edit_new function
-
-	* gui/dialogs/comp-editor-util.h: new proto
-
-	* gui/dialogs/task-page.c (task_page_set_summary): no longer any
-	need to block/unblock the handler
-	(task_page_create_date_edit): use new func
-	
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/.cvsignore: Update
-
-	* gui/evolution-calendar-control.c: Remove dead file
-
-	* gui/*.vcf: Remove dead files
-	
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor-page.[hc]: renamed from editor-page for
-	consistency, more complete implementation
-
-	* gui/dialogs/comp-editor.[hc]: More complete implementation
-
-	* gui/dialogs/*-page.*: The various pages needed to construct the
-	event and task dialogs
-	
-	* gui/dialogs/comp-editor-util.[hc]: useful utility functions for the
-	component editor pages to use
-
-	* gui/dialogs/Makefile.am: Build and install new files
-
-	* gui/event-editor*: Remove, obsoleted by the new comp-editor
-	stuff
-
-	* gui/dialogs/task-editor-dialog.glade: ditto
-
-	* gui/e-calendar-table.c (open_task): update to use comp editor
-	stuff
-
-	* gui/e-tasks.c (e_tasks_new_task): ditto
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): ditto
-
-	* gui/Makefile.am: don't build non-existent files nor try to
-	install them
-
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_factory_init): ditto
-
-	* gui/tasks-control-factory.c (tasks_control_factory_init):
-	auto_exit_unref the factory
-
-2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Add `$(DB3_LDADD)'.
-
-2001-05-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_get_calendar_table): New function.
-
-	* gui/tasks-control.c (tasks_control_activate): Connect to the
-	"selection_changed" signal of the tasks widget here, not in
-	tasks_control_new().  Also, update the sensitivity of the commands
-	here for the first time.
-	(tasks_control_deactivate): Disconnect from the signal here since
-	it only makes sense to monitor selection changes while the control
-	is active.
-	(selection_changed_cb): Removed hack that tested the presence of
-	the remote UI container.
-	(sensitize_commands): New function.
-
-2001-05-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view-layout.[hc]: 
-	* gui/e-day-view-layout.[hc]: new files to contain layout code split
-	off from EDayView an EWeekView, so we can use it for printing.
-
-	* gui/print.c: rewritten to use the same layout code as the EDayView
-	and EWeekView widgets.
-
-	* gui/gnome-cal.c (gnome_calendar_get_task_pad_cal_client): added
-	function so we can get the CalClient used for the TaskPad for printing.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): added
-	e-day-view-layout.[hc] amd e-week-view-layout.[hc].
-
-	* cal-util/timeutil.c (time_week_begin): 
-	(time_week_end): added week_start_day argument.
-
-	* cal-util/cal-recur.c: added comments describing problems in it.
-
-2001-05-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c (remove_folder): implemented the
-	'remove_folder' function for the calendar shell component
-	(xfer_folder): ditto for 'xfer_folder'
-
-2001-05-27  Dan Winship  <danw@ximian.com>
-
-	* gui/calendar-commands.c: #include
-	"evolution-shell-component-utils.h" rather than "e-gui-utils.h"
-	for e_pixmaps_update.
-
-	* gui/tasks-control.c: Likewise.
- 
-2001-05-25  Peter Williams  <peterw@ximian.com>
-
-	* gui/Makefile.am: Reference libeshell.la instead of libeshell.a.
-
-2001-05-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/recurrence-page.c: Finished porting from the old
-	event-editor.c.  Made it store a clone of the component for when
-	we need to expand the recurrence set.
-
-	* gui/dialogs/event-page.c (event_page_get_dates): New function.
-
-	* gui/dialogs/editor-page.c (editor_page_set_dates): Renamed from
-	editor_page_set_dtstart(); now sets both DTSTART and DTEND.
-
-	* gui/dialogs/alarm-page.c (alarm_page_set_dates): Ahem, it is a
-	label, not an entry.
-
-2001-05-21  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #2831; the tasks toolbar and menu now have a button to
-	delete the selected tasks.
-
-	* gui/e-calendar-table.c (e_calendar_table_delete_selected): New
-	function.
-	(delete_cb): Use e_calendar_table_delete_selected().
-	(e_calendar_table_get_table): New function.
-
-	* gui/tasks-control.c (tasks_control_new_task_cmd): Handle the
-	delete command.
-	(selection_changed_cb): Change the sensitivity of the TasksDelete
-	command when the selection in the table changes.
-
-	* gui/e-tasks.c (table_selection_change_cb): Notify upstream when
-	the ETable selection changes.
-
-2001-05-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #2829.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Allow the
-	caller to specify whether just one or many components are to be
-	deleted.
-
-	* gui/e-calendar-table.c (tasks_popup_one): Popup menu definition
-	for when one and only one task is selected.
-	(tasks_popup_many): Likewise, for more than one task.
-	(e_calendar_table_on_right_click): Do not create a structure for
-	the closure data; we can simply pass the cal_table.  Use a
-	different menu depending on the number of selected tasks.
-	(mark_as_complete_cb): Renamed; now iterates over the selected
-	rows.
-	(delete_selected_components): New function to delete all the
-	selected components.
-	(delete_cb): Adjusted for delete_component_dialog().
-	(open_task): New function, simply open a CalComponent in the task
-	editor.
-	(open_task_by_row): Renamed; use open_task().
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Updated
-	for delete_component_dialog().
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Likewise.
-
-2001-05-16  Duncan Mak  <duncan@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): removed
-	editor-page.[ch] because they've now moved dialogs.
-
-2001-05-16  Federico Mena Quintero  <federico@ximian.com>
-
-	Split the event and task editors into different objects for the
-	separate pages; this way they can be shared by both editors.
-
-	* gui/dialogs/editor-page.[ch]: New abstract class for a page in a
-	calendar component editor.
-
-	* gui/dialogs/event-page.[ch]: Main page of an event editor.
-
-	* gui/dialogs/alarm-page.[ch]: Alarm page of a calendar component
-	editor.
-
-	* gui/dialogs/recurrence-page.[ch]: Recurrence page of a calendar
-	component editor.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): Eeek, this
-	was missing a bunch of break statements.
-	(event_page_fill_component): Use a temporary variable rather than
-	allocating a struct icaltimetype.
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): Do not use
-	fixed-size buffers.
-	(alarm_page_fill_widgets): Use cal_obj_uid_list_free().
-	(append_reminder): Now the list stores the plain CalComponentAlarm
-	structures in the row data.  We do *NOT* want to be frobbing the
-	component's data directly.  Rather, we clone the alarms from the
-	component and maintain them on our own.
-	(alarm_page_fill_component): Clone the alarms before adding them
-	to the component so that we maintain the invariant that the alarm
-	structures in the list did *not* come from the component.
-
-	* cal-util/cal-component.c (cal_component_add_alarm): Added
-	documentation.
-	(cal_component_remove_alarm): Added documentation.
-	(cal_component_remove_alarm): Do a lookup in our hash table of
-	alarms instead of scanning the whole component.
-	(CalComponentAlarm): Removed the `parent' field, since it was
-	unused.
-	(cal_component_free_alarm_uids): Removed function, since
-	cal_component_get_alarm_uids() is documented so that the user will
-	know that he must use cal_obj_uid_list_free().
-	(cal_component_alarm_clone): New function.
-
-2001-05-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	editor-page.[ch] to the list of sources.
-
-2001-05-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (reminder_add_cb): switch on the correct
-	widget and map
-
-2001-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_factory): unref the
-	property bag when we finish with it
-
-	* gui/evolution-calendar-control.c (calendar_properties_init): ditto
-
-	* gui/control-factory.c (calendar_properties_init): ditto
-
-	* gui/calendar-summary.c (create_summary_view): ditto
-
-2001-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_free):
-	(cal_component_alarm_free): free the alarm component if it doesn't
-	have a parent, rather than if it does
-
-	* gui/Makefile.am: sanitize LD_ADDS and CFLAGS so the libtool
-	lines are shorter (fixes problem on solaries due to sed)
-
-2001-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-factory.[hc]: Convert to bonobo xobject
-
-	* pcs/cal.[hc]: Convert to bonobo xobject
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/event-editor.c (make_title_from_comp): conversion summary
-	from utf8 here, use translated strings as is.
-	(set_title_from_comp): reflect this, simplify.
-
-	* gui/dialogs/task-editor.c: updated copies of above functions here.
-
-	* gui/gnome-cal.c: use defines from widgets/misc/e-filter-bar.h for
-	consistency in "Show all".
-
-2001-05-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_append_row): unref the
-	calcomponent when we're done with it
-
-	* cal-util/cal-component.c (cal_component_gen_uid): free the iso
-	date string when we finish with it
-
-2001-04-27  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-edit.c (put_property_in_list): remove hardcoded
-	values
-	(edit_attendee): ditto, and there are only 4 roles now
-
-	* gui/e-meeting-dialog.glade: tweak
-
-	* gui/itip-utils.c: There shouldn't be an "other" role
-
-2001-04-26  JP Rosevear  <jpr@ximian.com>
-
-	 * gui/e-meeting-edit.c (edit_attendee): use enums not hard code
-	 values
-	
-2001-04-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-edit.c (add_button_clicked_cb):
-	icalparameter_new_rsvp now takes an enum
-
-2001-04-26  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): the
-	value type should be inited with ICAL_VALUE_* rather than
-	ICAL_*_VALUE because it is a param argument.
-
-2001-04-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (get_is_overdue): Replace "<" by "<=" in
-	the comparison for due dates against the current time.  This makes
-	tasks appear immediately as red when you click Now in the due date
-	popup field.
-
-	This is not a complete solution to the more general problem of
-	tasks staying the same color even if they become overdue while the
-	task list remains the same on the screen.  This has been logged as
-	bug #2399.
-
-2001-04-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am (INCLUDES): Add `$(EXTRA_GNOME_CFLAGS)'.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* conduits/todo/Makefile.am (libetodo_conduit_la_LIBADD): Remove
-	UNICODE_LIBS
-
-	* cal-client/Makefile.am (client_test_LDADD): Remove -lunicode
-
-2001-04-24  Duncan Mak  <duncan@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (funny_trigger_cb): Fixed
-	Strftime so it uses the locale prefered way to display date/time. 
-	("%x %X" instead of "%Y/%m/%d %H:%M:%S")
-
-2001-04-21  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/calendar-summary.c: translate "Things to do" etc. and convert them
-	to utf8. Changed some link from helixcode to ximian.
-
-2001-04-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/calendar/cal-client',
-	`-I$(top_builddir)/calendar/cal-client'.
-	* gui/Makefile.am (INCLUDES): Likewise.
-
-	* cal-client/cal-query.h: #include "evolution-calendar.h".
-
-2001-04-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor.c (init_widgets): Connect to the "changed"
-	signal of the categories entry so that they will be applied
-	correctly.
-	(EventEditorPrivate): Added fields for the contacts button and
-	entry.
-	(init_widgets): Disable the contacts widgets as we do not support
-	them yet.
-	(get_widgets): Get the contacts widgets.
-
-	* gui/dialogs/task-editor.c (get_widgets): Get the contacts
-	button, which was missing.
-	(init_widgets): Disable the contacts widgets as we do not support
-	them yet.
-
-	* pcs/query.c (matches_text_list): Use e_utf8_strstrcasedecomp()
-	instead of plain e_utf8_strstrcase().
-	(matches_summary): Likewise.
-
-2001-04-17  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_action): the
-	libical action stuff uses enums rather than strings to enumerate
-	the various actions now
-	(cal_component_alarm_get_action): ditto
-
-2001-04-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_SOURCES):
-	Add `$(CORBA_GENERATED)'.
-
-2001-04-16  Dan Winship  <danw@ximian.com>
-
-	* pcs/Makefile.am (INCLUDES): Add EXTRA_GNOME_CFLAGS, for gal.
-
-2001-04-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): Create the ESearchBar thingy.
-	(search_bar_query_changed_cb): Build the different queries based
-	on the type and string.
-
-	* pcs/query.c (backend_obj_updated_cb): Ref the query while we are
-	notifying the listener so that it will not disappear from under us.
-	(backend_obj_removed_cb): Likewise.
-	(process_component_cb): Likewise.
-	(func_contains): New function to match text fields.
-	(matches_comment): New function to match comment lists.
-	(matches_description): New function to match description lists.
-	(matches_summary): New function to match summaries.
-	(matches_any): New function to match any text field.
-	(func_has_categories): New function to match categories.
-
-2001-04-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (main): Initialize the trigger
-	and queue systems.
-
-2001-04-13  Dan Winship  <danw@ximian.com>
-
-	* cal-util/timeutil.c (time_from_isodate): Fix the syntactic bogon
-	here, and attempt to fix the logical bogon too. (tm_gmtoff and
-	timezone have opposite signs... I'm assuming Federico tested the
-	Linux case, so I'm flipping the sign of the BSD case. But maybe he
-	didn't and it's supposed to be the other way...)
-
-2001-04-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (update_query): New function to restart a query
-	for the day view.
-	(query_obj_updated_cb): Renamed from obj_updated_cb(); updated for
-	queries instead of calendar clients.
-	(query_obj_removed_cb): Likewise.
-	(cal_opened_cb): Just update_query() instead of queueing reloading
-	all the events.
-	(e_day_view_set_cal_client): Likewise.
-	(e_day_view_set_query): Likewise.
-	(e_day_view_set_selected_time_range): Likewise.
-	(e_day_view_set_days_shown): Likewise.
-	(e_day_view_recalc_work_week): Likewise.
-	(e_day_view_queue_reload_events): Removed function now that events
-	are updated entirely by the query.
-	(e_day_view_reload_events_idle_cb): Likewise.
-	(e_day_view_reload_events): Likewise.
-	(e_day_view_init): Use a pretty arrow instead of GDK_TOP_LEFT_ARROW.
-
-	* gui/e-week-view.c: Analogous changes to the ones in e-day-view.c.
-	(e_week_view_init): Use a pretty arrow instead of GDK_TOP_LEFT_ARROW.
-
-	* cal-util/timeutil.c (isodate_from_time_t): Return a g_strdup()ed
-	version of the string instead of a pointer to a static buffer.
-	(time_from_isodate): Resurrected function.  Polished up to our
-	current standards of paranoia.
-
-	* pcs/query.c (func_time_now): New function (time-now).
-	(func_make_time): New function (make-time ISODATE).
-	(func_time_add_day): New function (time-add-day TIME N).
-	(func_time_day_begin): New function (time-day-begin TIME).
-	(func_time_day_end): New function (time-day-end TIME).
-	(func_occur_in_time_range): Use time_t values instead of ints.
-	(match_component): Free the stringized component.  Free the ESexp
-	result value.
-
-	* gui/e-day-view.h: Removed a couple of unused prototypes.
-
-	* pcs/query.c (query_destroy): Oops, disconnect from the backend.
-
-	* pcs/cal.c (Cal_get_query): Duplicate the query reference before
-	we return it.
-
-	* gui/calendar-commands.c (pixmaps): Fixed paths to image files.
-
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_compute_changes):
-	prepend to both changes and change_ids when different and mark as
-	modified, not added
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_append_row): Fix this to
-	just send the data to the wombat instead of inserting it
-	ourselves.
-
-2001-04-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	Display fixes, thanks to Kjartan for finding these.
-
-	* gui/event-editor.c: use simple (not e_utf8_) gtk_clist_append for
-	strings which are never in utf-8.
-	* dialogs/delete-comp.c (delete_component_dialog): convert only
-	summary from utf-8 to gtk charset. Translated values are in correct
-	craset already.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/calendar-commands.c: Fix headers.
-	* gui/calendar-config.c: Same here.
-	* gui/calendar-model.c: Same here.
-	* gui/e-day-view-time-item.c: Same here.
-	* gui/e-day-view-top-item.c: Same here.
-	* gui/e-day-view.c: Same here.
-	* gui/e-meeting-edit.c: Same here.
-	* gui/e-week-view-main-item.c: Same here.
-	* gui/e-week-view.c: Same here.
-	* gui/event-editor.c: Same here.
-	* gui/gnome-cal.c: Same here.
-	* gui/goto.c: Same here.
-	* gui/main.c: Same her.
-	* gui/print.c: Same here.
-
-2001-04-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_setup_menus): Plug leak.
-
-	* gui/event-editor.c (obj_updated_cb): Do nothing for now until we
-	think of something sensible to do.
-	(obj_removed_cb): Likewise.
-
-	* gui/dialogs/task-editor.c (obj_updated_cb): Likewise.
-	(obj_removed_cb): Likewise.
-
-	* gui/event-editor.c (dialog_to_comp_object): Plug leak.
-
-2001-04-01  Federico Mena Quintero  <federico@ximian.com>
-
-	Client-side glue for the live query engine.
-
-	* cal-client/query-listener.[ch]: New files with the
-	implementation fo the QueryListener interface.
-
-	* cal-client/cal-query.[ch]: New files with the client-side
-	convenience object for live queries.
-
-	* cal-client/cal-listener.h (CalListenerClass): Removed unused
-	slots for signal handlers.
-
-	* cal-client/Makefile.am (libcal_clientinclude_HEADERS): Now we
-	install the evolution-calendar.h header.  This sucks a bit.
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/calendar-commands.c: use new pixmap cache. Added some menu icons
-	and changed filenames of renamed icons.
-	* gui/tasks-control.c: added icons for new task and print in menu.
-
-2001-03-29  Federico Mena Quintero  <federico@ximian.com>
-
-	Engine for live queries to calendars.  A query object watches a
-	CalBackend in the PCS and is otherwise completely separate from
-	it; backends need to do nothing to support live queries.  Right
-	now we have the following functions:
-
-		(get-vtype)
-
-			Returns a string indicating the type of component
-			(VEVENT, VTODO, VJOURNAL, VFREEBUSY, VTIMEZONE,
-			UNKNOWN).
-
-		(occur-in-time-range? START END)
-
-			START - int, time_t start of the time range
-			END - int, time_t end of the time range
-
-			Returns a boolean indicating whether the component
-			has any occurrences in the specified time range.
-
-	* idl/evolution-calendar.idl (Cal::getQuery): New method that
-	initiates a live query.
-	(Query): New interface for a handle to a live query.
-	(QueryListener): New interface for a listener to changes in a live
-	query.
-
-	* pcs/query.[ch]: New files with the live query engine.
-
-	* pcs/cal-backend.h (CalBackendClass): Added notification signals
-	so that the query system can catch them.
-	(CalBackendClass): New virtual method ::get_load_state().
-
-	* pcs/cal-backend.c (cal_backend_opened):
-	(cal_backend_obj_updated):
-	(cal_backend_obj_updated): New functions to emit the notification
-	signals; to be used only by backend implementations.
-	(cal_backend_get_load_state): New function.
-
-	* pcs/cal-backend-file.c (notify_update): Call
-	cal_backend_obj_updated().
-	(notify_remove): Call call_backend_obj_removed().
-	(open_cal): Free the icalcomp if it is not of the correct type.
-	(cal_backend_file_get_load_state): Implemented new method.
-
-	* pcs/cal-backend-db.c (cal_backend_db_update_object): Call
-	cal_backend_obj_updated().
-	(cal_backend_db_remove_object): Call cal_backend_obj_removed().
-	(cal_backend_db_get_load_state): Implemented new method.
-
-	* pcs/cal.c (Cal_get_query): Implementation of the ::getQuery()
-	method.
-
-2001-03-27 Anna Marie Dirks <anna@ximian.com>
-
-	* gui/e-itip-control.c: fixed button placement to comply
-	with gnome standards.
-
-2001-03-27 Anna Marie Dirks <anna@ximian.com>
-
-	* gui/e-itip-control.glade: fixed spacing and label alignment to
-	comply with gnome standards. Also removed shadows from extraneous
-	scrolled windows to avoid bevelitous. There are many more changes
-	that need to happen to this viewer, but they all require a hacker
-	to do some c-coding, so I will avoid committing them until after the
-	.10 release.
-
-2001-03-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* cal-client/client-test.c: Replace includes of <gnome.h>, <bonobo.h>
-	and <gtk/gtk.h> with the needed headers to speed up compile.
-	* cal-util/test-recur.c: Same here for <gtk/gtk.h>
-	* gui/calendar-commands.c: Replace <bonobo.h> and remove
-	<libgnorba/gnorba.h>
-	* gui/calendar-summary.c: Replace <gnome.h> and <bonobo.h>
-	* gui/calendar-summary.h: Added <bonobo/bonobo-generic-factory.h>
-	* gui/component-factory.c: Remove <bonobo.h>
-	* gui/control-factory.c: Replace <bonobo.h>
-	* gui/e-calendar-table.c: Remove <gnome.h>
-	* gui/e-itip-control.c: Replace <gnome.h> and <bonobo.h>
-	* gui/e-meeting-edit.c: Replace <bonobo.h>
-	* gui/e-tasks.c: Replace <gnome.h>
-	* gui/e-tasks.h: Replace <bonobo.h>
-	* gui/gnome-cal.h: Remove <bonobo.h>
-	* gui/main.c: Replace <bonobo.h> and <glade/glade.h>
-	* gui/tasks-control-factory.c: Replace <bonobo.h>
-	* gui/tasks-control.c: Replace <gnome.h> and <bonobo.h>
-	* gui/weekday-picker.c: Add <string.h> and <libgnome/gnome-defs.h>
-	* gui/alarm-notify/client-main.c: Remove <gnome.h> and <bonobo.h>
-	* gui/alarm-notify/notify-main.c: Replace <gnome.h> and <bonobo.h>
-	* gui/dialogs/alarm-notify-dialog.c: Replace <gnome.h>
-	* pcs/cal-backend.c: Replace <gtk/gtk.h>
-
-2001-03-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): The
-	model_rows_{inserted,deleted} signals changed names; deal with it.
-	(e_calendar_table_on_rows_inserted): Updated for new ETable API.
-	(e_calendar_table_on_rows_deleted): Likewise.
-
-	* gui/gnome-cal.h (GnomeCalendarOpenMode): Removed unused enum.
-
-	* gui/gnome-cal.c (gnome_calendar_open): Constify.
-
-	* gui/calendar-commands.c (calendar_set_uri): Removed function,
-	since it was just calling gnome_calendar_open().
-
-	* gui/control-factory.c (set_prop): Replace usage of
-	calendar_set_uri() with gnome_calendar_open().
-	(load_calendar): Likewise.
-	(calendar_persist_init): Made static.
-
-	* gui/e-tasks.c: #include "calendar-config.h"
-	(e_tasks_update_all_config_settings): We are configuring a table,
-	not a calendar!  Use the appropriate function.
-
-2001-03-17  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_new_event,
-	e_day_view_on_new_appointment): Simplifed this function to use the
-	shared code.
-
-	* gui/e-week-view.c (e_week_view_on_new_event,
-	e_week_view_on_new_appointment): ditto.
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): New
-	function used to launch editor components with a time range.   A
-	bunch of functions use this code now instead of duplicating code
-	all over the place
-
-	* gui/e-week-view.c (e_week_view_new_event): Moved functionality
-	here from e_day_view_on_new_appointment.  Allows setting for "full
-	day" event.
-	(e_week_view_on_new_full_day): New function for making a full day
-	event.
-	(e_week_view_on_goto_date): Go To support.
-	(e_week_view_on_goto_today): Goto today support.
-
-	* gui/e-day-view.c (e_day_view_new_event): Moved functionality
-	here from e_day_view_on_new_appointment.  Allows setting for "full
-	day" event.
-	(e_day_view_on_new_full_day): New function for making a full day
-	event.
-	(e_day_view_on_goto_date): Go To support.
-	(e_day_view_on_goto_today): Goto today support.
-
-	* main_items: Add New All Day Event;  Go to Today; Go to Date.
-
-2001-03-07  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/control-factory.c (calendar_persist_init): New function:
-	inits the BonoboPersistFile server.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Added BonoboPropertyBag to
-	the list of supported interfaces that were supported but not
-	reported.  Add the new PersistFile.
-
-	Add text/calendar mime type attribute.
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_start_editing_event):
-	* gui/e-day-view.c (e_day_view_start_editing_event): Update
-	arguments to e_canvas_item_grab_focus.
-
-2001-03-15  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/*.xpm: moved to ../art.
-	* gui/Makefile.am: removed *.xpm and oaf_DATA from EXTRA_DIST.
-	* gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c:
-	#include "art/*.xpm".
-
-2001-03-09  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: PISOCK_INCLUDEDIR has become
-	PISOCK_CFLAGS in gnome-pilot.m4 and remove capplet foo
-
-	* conduits/calendar/Makefile.am: ditto
-
-2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (factory_fn): Specify a NULL
-	`EvolutionShellComponentGetDndSelectionFn'.
-
-2001-02-27  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): Reorganize
-	the menus to have entries always in a consistent fashion, as
-	reported to the genepool mailing list.
-	(e_day_view_on_event_right_click): Added a FIXME comment to the
-	FIXME comment without a FIXME.
-
-	Now we use e_popup_menu.  This allows us to hide/show items on
-	demand, and to sensitize/de-sensitize items depending on their
-	state.
-
-	This will also let us add icon support (when we get nice icons for
-	this)
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): Ditto.
-
-	The files popup-menu.c and popup-menu.h can now be removed.
-
-2001-03-05  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-tasks.c: keep list of all Tasks folders so we can update the
-	preference settings when necessary.
-
-	* gui/gnome-cal.c: configure the TaskPad according to the settings.
-
-	* gui/e-calendar-table.c: use ECellCombo and ECellDateEdit for fields,
-	so the tasks folders is almost usable now.
-
-	* gui/calendar-model.c: added support for the Status property.
-
-	* gui/calendar-config.[hc]: added convenience functions to setup
-	ECalendarTable and ECellDateEdit objects.
-
-	* gui/calendar-commands.c: connected to "destroy" signal of calendars
-	so we can remove them from all_calendars list.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_update_config):
-	call e_tasks_update_all_config_settings() to update all the settings
-	in the Tasks folders as well.
-
-	* cal-util/cal-component.h: added CAL_COMPONENT_FIELD_STATUS.
-
-	* cal-util/cal-component.c (cal_component_get_transparency): fixed
-	calls to strcasecmp so they check for '== 0'.
-
-	Applied patch from Miguel...
-
-2001-02-27  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): Reorganize
-	the menus to have entries always in a consistent fashion, as
-	reported to the genepool mailing list.
-	(e_day_view_on_event_right_click): Added a FIXME comment to the
-	FIXME comment without a FIXME.
-
-	Now we use e_popup_menu.  This allows us to hide/show items on
-	demand, and to sensitize/de-sensitize items depending on their
-	state.
-
-	This will also let us add icon support (when we get nice icons for
-	this)
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): Ditto.
-
-	The files popup-menu.c and popup-menu.h can now be removed.
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/e-todo.conduit.in: update for new pilot foo
-
-	* conduits/calendar/e-calendar.conduit.in: ditto
-
-	* conduits/todo/Makefile.am: update sed script
-
-	* conduits/calendar/Makefile.am: ditto
-
-2001-02-28  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor.c (recurrence_exception_select_row_cb): New
-	function to set the EDateEdit's value when a row is selected in
-	the exception date list.  Fixes bug #1638.
-	(append_exception): Set the value as well. Block/unblock signals
-	from the clist as appropriate.  Gotta love non-model/view widgets.
-	(recurrence_exception_delete_cb): Be more paranoid about the
-	contents of the list row's data.
-	(recur_to_comp_object): Likewise.
-	(fill_exception_widgets): Select the first row after we are done
-	appending the exception dates.
-
-2001-02-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (libalarm_a_SOURCES): Create a
-	little stand-alone library for the low-level alarm trigger
-	mechanism.  This is so that the GUI parts of the calendar can use
-	it in addition to the alarm daemon.
-
-	* gui/main.c: #include "alarm-notify/alarm.h".
-
-	* gui/calendar-summary.c: Likewise.
-	(alarm_fn): Do not remove the previous alarm; it is removed
-	automatically when it is triggered.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed alarm.[ch]
-	from the sources.
-
-	* gui/alarm.[ch]: Removed obsolete files.
-
-2001-02-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (AlarmNotify_addCalendar):
-	Switched to using our own refcounted structure for loaded clients.
-	(AlarmNotify_removeCalendar): Ditto.  Also, do the full
-	destruction of the client.
-	(alarm_notify_destroy): Destroy each element in the hash table.
-
-	* cal-client/cal-client.c (cal_client_construct): Test for
-	exceptions from OAF when activating the Wombat calendar factory.
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in:
-	New .oaf.in file.
-
-	* gui/alarm-notify/Makefile.am (oaf_in_files): Updated.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Put all the servers here
-	instead of in a million files.
-
-	* gui/GNOME_Evolution_Calendar_Control.oaf.in: Removed file.
-
-	* gui/GNOME_Evolution_Calendar_gnomecal.oaf.in: Removed *REALLY*
-	obsolete file.
-
-	* gui/Makefile.am (oaf_in_files): Updated.
-
-2001-02-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c (add_history): fixed generation of history records
-
-2001-02-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-factory.c (CalFactoryPrivate): Added a `registered'
-	field.
-	(cal_factory_oaf_register): New function; now the factory performs
-	its own registration with OAF.
-	(cal_factory_destroy): Unregister from OAF if appropriate.
-
-2001-02-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: Remove PISOCK_LIBDIR
-
-	* conduits/calendar/Makefile.am: ditto
-
-2001-02-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/calbackend-db.c (cal_backend_db_destroy): close DB environment.
-	Some compilation warnings removed
-
-2001-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Added libmenus.la.
-
-	* gui/e-calendar-table.c, gui/e-calendar-table.h
-	(e_calendar_table_get_spec): Added this function.
-
-	* gui/e-tasks.c, gui/e-tasks.h (e_tasks_setup_menus): Added this
-	function.
-
-	* gui/tasks-control.c (tasks_control_activate): Call
-	e_tasks_setup_menus.
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_new_task): call task_editor_focus
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (update_pixmaps): Set toolbar new
-	appointment icon
-	(set_pixmap): load files rather than create from xpm file
-
-	* gui/*view.xpm: move to the art directory
-
-2001-02-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c (cal_backend_db_get_alarms_for_object):
-	implemented
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (update_pixmaps): Set toolbar new command
-
-	* gui/e-calendar-table.c: Add titles to pixbuf column for grouping
-
-	* gui/calendar-model.c (calendar_model_class_init): override value
-	to string virtual method
-	(calendar_model_value_to_string): implement value to string for
-	etable (necessary for group by)
-
-2001-02-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c:
-	cal_backend_db_update_object(): manage both updates and additions/add notification
-	cal_backend_db_get_object(): don't use DB cursors
-	cal_backend_db_get_type_by_uid(): don't use DB cursors
-	cal_backend_db_remove_object(): don't use DB cursors/add notification
-	cal_backend_db_get_alarms_in_range(): implemented
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/Makefile.am: Hook up the xml-i18n-tools + .oaf.in stuff.
-	* gui/GNOME_Evolution_Calendar*.oaf.in: Marked strings for translation.
-
-2001-02-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c: added DB3 transactions support
-	* pcs/cal-backend-db.[ch]: added the new DB3-based backend. This is just
-	the beginning, there are some missing things still.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	Really use xml-i18n-tools.
-
-	* conduits/calendar/e-calendar-conduit-control-applet.desktop,
-	conduits/todo/e-todo-conduit-control-applet.desktop: removed.
-
-	* conduits/calendar/e-calendar-conduit-control-applet.desktop.in,
-	conduits/todo/e-todo-conduit-control-applet.desktop.in: added empty.
-
-	* conduits/calendar/Makefile.am, conduits/todo/Makefile.am:
-	reflect above changes, merge translations.
-
-	* gui/*.glade.h, gui/dialogs/*.glade.h: removed, xml-i18n-extract
-	takes care of strings itself.
-
-	* gui/*.glade, gui/dialogs/*.glade: do not output_translatable_strings
-
-	* gui/Makefile.am, gui/dialogs/Makefile.am: do not include removed
-	files in EXTRA_DIST.
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor-dialog.glade: Oops, remove old widget
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (fill_widgets): fill in new
-	classification stuff properly
-	(get_widgets): load new class. widgets
-	(init_widgets): if the class. widgets change, mark the dialog
-	dirty
-	(dialog_to_comp_object): set the comp class. from the new widgets
-
-	* gui/dialogs/task-editor-dialog.glade: Make more consistent,
-	fixing bugs 1247 and 1249
-
-	* gui/dialogs/task-editor.c (fill_widgets):
-
-	* gui/event-editor-dialog.glade: Gui tidying
-
-	* gui/event-editor.c: Remove old alarm cruft
-
-	* cal-util/cal-component.c (cal_component_set_url): Don't try and
-	write an empty string as a property
-
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c: Move the get_change code here
-
-	* pcs/cal-backend.c: Remove get_changes related stuff and
-	implement by calling the virtual method instead
-
-	* pcs/cal-backend.h: New virtual method.
-
-	* pcs/cal-backend-file.c (compute_alarm_range): Use
-	icaldurationtype_as_int (replace _as_timet)
-	(add_alarm_occurrences_cb): ditto
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (compute_alarm_range): Use
-	icaldurationtype_as_int (replace _as_timet)
-	(add_alarm_occurrences_cb): ditto
-
-	* gui/e-week-view.c (e_week_view_on_schedule_meet): new routine to
-	throw up the meeting schedule dialog
-	(e_week_view_show_popup_menu): add schedule meeting to the
-	contextual menu where appropriate
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c: Remove assorted menu/bonobo stuff
-
-	* gui/dialogs/task-editor.c: Remove assorted menu/bonobo stuff
-	(task_editor_construct): no longer suck out the glade contents
-	into a bonobo win, listen for apply and close signals
-	(tedit_apply_event_cb): listen for apply signal and save object
-	(tedit_close_event_cb): listen for close signal and prompt to save
-	if need be
-	(task_editor_focus): new function to bring the dialog to the front
-
-	* gui/dialogs/task-editor.h: new prototype
-
-	* gui/e-meeting-edit.c (schedule_button_clicked_cb): no need to
-	update widgets in the event editor since the event editor won't be
-	open
-	(e_meeting_editor_new): don't need the event editor reference any
-	more
-
-	* gui/e-meeting-edit.h: Change prototype
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): Make
-	schedule meeting a new contextual menu item
-	(e_day_view_on_schedule_meet): new routine to schedule a meeting
-	from the contextual menu
-
-	* gui/e-calendar-table.c (e_calendar_table_open_task): Call
-	task_editor_focus
-
-	* gui/event-editor-dialog.glade: Update to be a property box
-
-	* gui/dialogs/task-editor-dialog.glade: Update to be a property
-	box
-
-2001-02-07  Iain Holmes  <iain@ximian.com>
-
-	* gui/calendar-summary.c (create_summary_view): Add a setter to the
-	property bag.
-	(set_property): The setter.
-	(generate_html_summary): Sort the UIDs accodring to time.
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (fill_reminder_widgets): Match new
-	append_alarm signature
-	(reminder_to_comp_object): only add alarms tagged as new, no
-	longer delete all alarms first
-	(append_reminder): the row data is now of type ReminderData,
-	rename from append_alarm
-	(reminder_add_cb): math new append_alarm signature
-	(reminder_delete_cb): if the alarm existed before the dialog was
-	loaded, delete it immediately from the cal component
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor-dialog.glade: Gui tweaks for bugs 1248 and 1246
-
-	* gui/dialogs/task-editor-dialog.glade: ditto
-
-2001-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor-dialog.glade: Fix spacing
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor-dialog.glade: Gui tweaks for bugs 1248 and 1246
-
-	* gui/dialogs/task-editor-dialog.glade: ditto
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): Make the menus more
-	consistent
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): ditto
-
-	* gui/e-calendar-table.c: ditto
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_set_categories): If the
-	categories string is empty, remove the property
-	(get_period_list): Fixes from clahey to handle the new rdate
-	format in libical
-	(set_period_list): ditto
-
-2001-02-05  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): Set
-	the time and duration values in the trigger to null by default
-	(cal_component_free_alarm_uids): properly free the list of alarm
-	uids
-
-2001-02-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (get_widgets): get the new reminder widgets
-	(sync_entries): different callback data
-	(summary_changed_cb): take different data and handle various cases
-	(init_widgets): connect signals for the new widgets
-	(get_alarm_duration_string): give a text string of the alarm
-	duration
-	(get_alarm_string): give a string representing the alarm
-	(fill_widgets): make sure we don't loop infinitely and remove old
-	alarm cruft
-	(reminder_to_comp_object): dump alarm info in the gui into the cal
-	component
-	(append_alarm): add alarm to the clist
-	(reminder_add_cb): create new alarm
-	(reminder_delete_cb): remove the alarm from the list
-
-	* gui/event-editor-dialog.glade: Update gui
-
-	* gui/e-calendar-table.c: include gnome.h for all the menu stuff
-
-	* gui/calendar-summary.c: for internationalization
-
-	* gui/tasks-control.c: include gnome.h
-
-	* gui/e-tasks.c: ditto
-
-	* gui/e-itip-control.c: ditto
-
-	* cal-util/cal-recur.c (cal_recur_set_rule_end_date): Update for
-	libical changes
-
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Fixed up these #includes.
-
-2001-02-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/save-comp.c (save_component_dialog):
-	gnome_dialog_grab_focus() on the Yes button.  Fixes bug #1242.
-
-2001-01-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-calendar-table.c: Mark a string for translation.
-	* gui/e-itip-control.c: Mark a bunch of strings for translation.
-
-2001-01-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/print.c: #include <sys/time.h>.
-
-2001-01-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-config.c: <gnome.h> trimming to reduce compilation
-	time.
-	* gui/calendar-summary.c: Likewise.
-	* gui/e-calendar-table.c: Likewise.
-	* gui/e-day-view-time-item.c: Likewise.
-	* gui/e-day-view.c: Likewise.
-	* gui/e-itip-control.c: Likewise.
-	* gui/e-meeting-edit.c: Likewise.
-	* gui/e-meeting-edit.h: Likewise.
-	* gui/e-tasks.c: Likewise.
-	* gui/e-week-view.c: Likewise.
-	* gui/event-editor.c: Likewise.
-	* gui/gnome-cal.c: Likewise.
-	* gui/goto.c: Likewise.
-	* gui/itip-utils.h: Likewise.
-	* gui/main.c: Likewise.
-	* gui/popup-menu.c: Likewise.
-	* gui/print.c: Likewise.
-	* gui/tasks-control-factory.c: Likewise.
-	* gui/tasks-control.c: Likewise.
-	* gui/tasks-migrate.c: Likewise.
-
-2001-01-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-util/timeutil.c: <gnome.h> trimming to reduce compilation time.
-	* gui/dialogs/task-editor.c: Ditto.
-	* gui/dialogs/cal-prefs-dialog.c: Ditto.
-	* gui/dialogs/save-comp.c: Ditto.
-	* gui/dialogs/delete-comp.c: Ditto.
-	* gui/calendar-commands.c: Ditto.
-	* gui/calendar-model.c: Ditto.
-
-2001-01-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-itip-control.c (itip_control_destroy_cb): Don't attempt to
-	call `icalcomponent_remove_component()' on a NULL component or a
-	NULL subcomponent.
-
-2001-01-25  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tag-calendar.c: don't tag the calendar if no dates are shown.
-	(e_calendar_item_get_date_range() now returns FALSE in this case.)
-
-2001-01-23  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (ensure_task_complete): make sure the status
-	is set to "Completed". Fixes bug #1253.
-
-	* gui/e-tasks.c (e_tasks_open): load the ETable state after opening
-	the tasks folder, since it relies on the folder uri, which isn't set
-	now until you open the folder.
-
-	* gui/calendar-model.c (obj_updated_cb): add the categories from the
-	updated object to our tree, and emit the "categories-changed" signal
-	if they have changed. Fixes bug #1255.
-
-	* gui/e-tasks.c: removed debug messages.
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	*  libical import cleanup
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): properly ref
-	the cal component when we use it, prevents double free
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): ditto
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/Makefile.am: compile new stuff
-
-	* gui/dialogs/task-editor.c (prompt_to_save_changes): use new
-	standard dialog
-
-	* gui/event-editor.c (prompt_to_save_changes): ditto
-
-	* gui/dialogs/save-comp.h: new header
-
-	* gui/dialogs/save-comp.c (save_component_dialog): shows the save
-	dialog
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (for_each_modified): remove duplicate
-	message
-
-	* conduits/calendar/Makefile.am: Remove vfs lib dependency
-
-	* conduits/todo/Makefile.am: ditto
-
-	* conduits/calendar/calendar-conduit.c: Remove alarm foo for now
-	(for_each_modified): remove duplicate message
-
-2001-01-21  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (delete_record): Remove
-	deleted records from the pilot map so we don't have dupes in the future
-
-	* conduits/todo/todo-conduit.c (delete_record): ditto
-
-2001-01-21  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/task-editor.c (file_delete_cb): Fix bug #1250; now
-	we present a confirmation dialog before deleting the component.
-
-2001-01-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor-dialog.glade: Fix bug #1243.  Turn on the Y
-	expand/fill options for the date widgets in the General page.
-	This makes them be vertically aligned with the "All day event"
-	toggle so that they will get the focus in the proper order; the
-	toggle would get the focus before them because it was a pixel or
-	two above them.
-
-2001-01-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/weekday-picker.c (weekday_picker_init): Unset the
-	GTK_CAN_FOCUS flag on the weekday picker.  This will do until it
-	supports being used with the keyboard.
-
-2001-01-19  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_new): create a new
-	cal component alarm
-	(cal_component_add_alarm): add alarm to the cal component
-	(cal_component_remove_alarm): remove alarm from the cal component
-	(remove_alarm): remove alarm from hash
-
-	* cal-util/cal-component.h: new protos
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	add alarm information, still needs to be hacked to replace an already
-	existing alarm.  questions abound about the heuristic for doing this.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Properly set categories
-	to NULL if there are none
-
-2001-01-18  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/tasks-migrate.[ch]: New files with a simple sequence to
-	migrate the task components from the old calendar folder into the
-	new tasks folder.
-
-	* gui/component-factory.c (owner_set_cb): Call tasks_migrate()
-	once evolution_dir is set.  It sucks to have to do this here.
-
-	* cal-client/cal-client.c (cal_client_get_uids): In the inline
-	docs, indicate how to free the return value.
-	(cal_opened_cb): Ahem, moved assertion to the right place.  Also,
-	ref() and unref() around our own signal emission because we are
-	not inside a signal handler, rather a simple callback from the
-	listener object; we want to have a chance to clean up even if the
-	client is unrefed during the emission.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	tasks-migrate.[ch] to the list of sources.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor.c (init_widgets): Use
-	e_calendar_item_set_max_days_sel() instead of setting GTK+ object
-	arguments.
-
-	* gui/e-day-view.c (e_day_view_set_cal_client): Oops, we had a
-	reversed test for the client being loaded.
-
-	* gui/tag-calendar.c (tag_calendar_by_client): Fixed similarly
-	reversed test.
-
-2001-01-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view*.c
-	* gui/e-day-view*.c: don't use the theme colors at all within
-	the graphical parts of the widgets, since they may clash with
-	our colors. May make them configurable in future so people can tweak
-	them to go with their theme. At least the calendars are usable in any
-	theme now, even though the colors may not go well with the theme.
-	Also set the font of all the EText items in style_set.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): don't
-	draw the icons if we are editing the event.
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: reinstated the optimizations so we don't do a
-	complete relayout if the event's dates haven't been changed.
-	(Though we still do a re-layout when recurring events change, since
-	comparing all the RDATES/RRULES/EXDATES/EXRULES is too much hassle.)
-	A side-effect of this change is that the EWeekView won't crash so
-	often - only recurring events will be a problem.
-
-	* cal-util/cal-component.[hc]: added function to check if the start
-	and end dates of a component match. Used for optimizing the updating
-	of the EDayView & EWeekView.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server): Check
-	for open error and handled
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): ditto
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server): Check
-	for open error and handled
-
-	* pcs/cal-backend.c (cal_backend_compute_changes): Fix transposition
-	of sync db location
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* */*: Ximianified email addresses and copyrights.
-
-	* idl/evolution-calendar.idl (CalFactory::open): Renamed from
-	::load(), and added an only_if_exists argument.
-	(CalFactory::create): Removed method.
-	(Listener::OpenStatus): Removed the IN_USE error and replaced it
-	with a NOT_FOUND one; renamed the enum from LoadStatus.
-	(Listener::notifyCalOpened): Renamed from notifyCalLoaded().
-
-	* pcs/cal-backend.h (CalBackend): Removed the uri field.
-	(CalBackendOpenStatus): Renamed from CalBackendLoadStatus and
-	added a NOT_FOUND value.
-	(CalBackendClass::open): Put in a slot for the open method.
-
-	* pcs/cal-backend.c (cal_backend_create): Removed function.
-
-	* pcs/cal-backend-file.c (cal_backend_file_open): Return the
-	appropriate value when only_if_exists is TRUE.
-	(create_cal): We are Ximian now, so set the PRODID property to
-	the appropriate foo.
-
-	* pcs/cal-factory.c (CalFactory_open): implemented, replacing
-	CalFactory_load() and CalFactory_create().
-	(CalFactory_open): Moved the queue_load_create_job() stuff to
-	here, since we now only need to contemplate the open case instead
-	of load/create ones.
-	(open_backend): Do everything here; replaces load_backend() and
-	create_backend().
-
-	* cal-client/cal-listener.h (CalListenerClass::cal_opened):
-	Renamed from cal_loaded.
-	(CalListenerClass): Replaced the silly signals, which are
-	gratuitous abstraction, by a set of function pointers in the
-	instance structure.
-
-	* cal-client/cal-listener.c (cal_listener_get_calendar): Removed
-	unused function.
-	(cal_listener_construct): Added the listener notification functions.
-	(cal_listener_new): Ditto.
-	(Listener_notifyCalOpened): Renamed to our new naming convention
-	for servant implementations.
-	(Listener_notifyObjUpdated): Ditto.
-	(Listener_notifyObjRemoved): Ditto.
-
-	* cal-client/cal-client.h (CalClientOpenStatus): Renamed from
-	CalClientLoadStatus.
-	(CalClientClass::cal_opened): Renamed from ::cal_loaded().
-	(CalClientLoadState): New enum; basically make LoadState public so
-	that users of this code do not have to maintain their own states.
-
-	* cal-client/cal-client.c (cal_client_create_calendar): Removed
-	function.
-	(cal_client_open_calendar): Moved the functionality over from
-	load_or_create(); now we do everything here.
-	(*): Use the CalClientLoadState enum values instead of the old
-	LoadState values.
-	(cal_client_get_load_state): Renamed from cal_client_is_loaded(),
-	and return the appropriate value.
-	(CalClientPrivate): Added an uri field.
-	(cal_client_init): Initialize priv->uri.
-	(cal_client_destroy): Free the priv->uri.
-	(cal_opened_cb): Maintain the priv->uri.
-	(cal_client_open_calendar): Fill in the priv->uri.
-	(cal_client_get_uri): New function.
-
-	* gui/calendar-model.c (calendar_model_set_new_comp_vtype): New
-	function to configure the type of calendar components to create
-	when doing click-to-add.  This makes the model usable for
-	something other than task lists.
-	(calendar_model_get_new_comp_vtype): New function.
-
-	* gui/e-calendar-table.c (e_calendar_table_get_model): New function.
-	(e_calendar_table_destroy): Unref the subset_model.
-
-	* gui/gnome-cal.h (GnomeCalendarOpenMode): Removed enum.
-
-	* gui/gnome-cal.c (LoadState): Removed enum; we now use the
-	CalClientLoadState from the client objects.
-	(GnomeCalendarPrivate): Removed the loading_uri and
-	task_pad_loading_uri fields as well as the load_state and
-	task_pad_load_state fields, as we can now query them directly from
-	the CalClient.
-	(open_error): Renamed from load_error().
-	(create_error): Removed function.
-	(gnome_calendar_open): Do not take in the mode parameter.
-	(cal_opened_cb): Get rid of our beautifully-crafted state machine
-	and replace it with simple code; all the loading smarts are in the
-	Wombat now.
-	(setup_widgets): Set the new component vtype of the table model to
-	CAL_COMPONENT_TODO.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed
-	gnome-month-item.[ch] from the list of sources.
-
-	* gui/calendar-summary.c (CalSummary): Removed unused cal_loaded
-	field.
-	(create_summary_view): Do not check if the file exists; this is
-	the job of the Wombat.
-	(generate_html_summary): Fixed prototype.
-	(alarm_fn): Fixed prototype.
-	(property_dialog): Fixed prototype.  Wonder if/how this ever
-	worked.
-	(create_summary_view): Cast the component and view as
-	appropriate.  Removed unused html variable.
-
-	[Iain dude, are you compiling with -Wall?]
-
-	* gui/e-itip-control.c (cal_opened_cb): Sigh, this function
-	signature was *very* wrong.  It was using CalClientGetStatus
-	instead of CalClientOpenStatus.
-
-	* gui/e-tasks.h (ETasksOpenMode): Removed enum.
-
-	* gui/e-tasks.c (setup_widgets): Set the new component vtype of
-	the table model to CAL_COMPONENT_TODO.
-	(LoadState): Removed the state machine foo.
-	(e_tasks_open): Removed the mode parameter.
-	(initial_load): Removed function.
-	(create_error): Removed function.
-	(ETasksPrivate): Removed folder_uri field.
-	(cal_opened_cb): Remove the state machine.
-
-	* gui/component-factory.c: #include "tasks-control.h"
-
-	* conduits/calendar/calendar-conduit.h (ECalConduitContext):
-	Removed calendar_load_tried field.
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server_cb):
-	Sigh, fixed function prototype.
-
-	* conduits/todo/todo-conduit.h (EToDoConduitContext): Removed
-	calendar_load_tried field.
-
-	* conduits/todo/todo-conduit.c (start_calendar_server_cb): Fixed
-	function prototype.
-
-2001-01-16  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (print_local): fix debug output
-	(print_remote): ditto
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_compute_changes): accomadate tasks
-	in their new dir
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): ditto
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (print_local): prevent segfaults and
-	buffer overflows.
-	(print_remote): ditto
-
-	* conduits/calendar/calendar-conduit.c: as above
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): changed the expansion
-	values so that small text fields are 1.0, all the date fields and the
-	URL field are 2.0, and the Summary is 3.0. Hopefully the user will
-	resize the fields as desired, but at least this is a better start.
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/Makefile.am: pass -module and -avoid-version to
-	conduit linker
-
-	* conduits/todo/Makefile.am: ditto
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor.[hc]: moved #include
-	<cal-client/cal-client.h> to the .h file.
-
-	* gui/e-tasks.c: load & save the Tasks folders' ETable layout.
-	Added an option menu to filter tasks by category.
-
-	* gui/gnome-cal.c: use the "Tasks" folder for the TaskPad.
-	(We may make the actual tasks folder shown a per-calendar option.)
-
-	* gui/tasks-control.c (tasks_control_new_task_cmd): added support for
-	the New Task icon on the toolbar.
-
-	* gui/e-calendar-table.[hc]: we now use an ETableSubsetVariable model
-	to filter the tasks by a category. And tidied up a little.
-
-	* gui/calendar-model.[hc]: added way to get all the categories used by
-	the tasks, so we can show an option menu of them. Also a signal which
-	is emitted when they are changed.
-	Also allows a default category to be set, which is used to initialize
-	the 'click-to-add' row.
-	Also made sure the initialize_value()/get_value() functions don't
-	return NULL since that can cause a SEGV.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: set the "fill_color_rgba" arg of the EText items
-	to black since it doesn't seem to set up a default color properly.
-	Hopefully this fixes the bug on Solaris where the items appear with
-	strange colors.
-
-	* gui/widget-util.c (date_edit_new): use the calendar_config function
-	to set most of the options. It wasn't setting the 12/24 hour option
-	before.
-
-	* gui/dialogs/task-editor-dialog.glade: added "Undefined" priority.
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Pass NULL as the
-	@copy_folder_fn arg to `evolution_shell_component_new()'.
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-calendar-table.c: Add translation strings.
-
-2001-01-08  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (create_summary_view): Add a PropertyControl
-	interface to set whether or not to show tasks and appointments. Add
-	a PersistStream to remember this.
-
-2001-01-09  Dave Camp  <dave@helixcode.com>
-
-	* gui/Makefile.am: Replaced e-meet-dialog.glade.h with
-	e-meeting-dialog.glade in glade_messages.
-
-	* gui/e-meeting-dialog.glade: Enabled the translatable string option.
-
-	* gui/e-itip-control.glade: Likewise.
-
-2001-01-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (AlarmNotify): New interface for the
-	alarm notification system.
-
-	* gui/alarm-notify: New directory for the alarm notification
-	daemon and its auxiliary stuff.
-
-	* gui/alarm-notify/alarm.[ch]: Moved over from gui/alarm.[ch].
-
-	* gui/alarm-notify/alarm-queue.[ch]: Moved over from
-	gui/alarm-notify.[ch].  Renamed functions from alarm_notify_*() to
-	alarm_queue_*().
-
-	* gui/alarm-notify/alarm-notify.[ch]: Implementation of the
-	GNOME::Evolution::Calendar::AlarmNotify interface.
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Removed the
-	LINK_FLAGS variable and reordered the libraries to remove some
-	duplicated ones.
-	(SUBDIRS): Added the alarm-notify directory.
-
-2001-01-08  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (generate_html_summary): Get the tasks
-	correctly.
-	(generate_html_summary): Mark the tasks as completed if so.
-
-2001-01-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am: added new source files for the Tasks folders.
-
-	* gui/e-tasks.[hc]: new widget to encapsulate the Tasks view.
-
-	* gui/tasks-control.[hc]: new files to implement the Tasks control.
-
-	* gui/tasks-control-factory.[hc]: new files to implement the factory
-	for the Tasks controls. (I think the way I've split the code up is a
-	lot cleaner than the GnomeCal implementation - the factory file just
-	contains the factory functions and the control file contains all the
-	control functions. Maybe we should make GnomeCal like this.)
-
-	* gui/main.c: initialize the Tasks control factory.
-
-	* gui/component-factory.c: added support for the Tasks control.
-	Also added a "create_folder" function so we can now create new Tasks
-	and Calendar folders within Evolution.
-	I'm not a Bonobo expert so someone might want to check these over.
-
-	* gui/calendar-config.[hc]: added convenience functions to configure
-	the common settings of ECalendar and EDateEdit widgets.
-
-	* gui/dialogs/task-editor.c (task_editor_create_date_edit):
-	* gui/gnome-cal.c (gnome_calendar_update_config_settings):
-	* gui/event-editor.c: used function to configure the ECalendars
-	and EDateEdits.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	fixed minor bug in format strings.
-
-2001-01-06  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (generate_html_summary): Neaten the HTML,
-	and fix the time printing stuff. Add stuff the get Tasks.
-	(alarm_fn): Set up an alarm for midnight everynight and regenerate
-	the HTML for the new day.
-
-2001-01-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (get_widgets): get categories button
-	(init_widgets): listen for button click
-	(fill_widgets): fill in the categories area
-	(dialog_to_comp_object): set the cal component categories
-	(categories_clicked): throw up the categories dialog and update
-	when ok is clicked
-
-	* gui/event-editor-dialog.glade: Add categories and contacts buttons
-	and fields
-
-	* gui/dialogs/task-editor-dialog.glade: Rename button
-
-2001-01-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/dialogs/task-editor.c (get_widgets): get categories button
-	(init_widgets): listen for button click
-	(fill_widgets): fill in the categories area
-	(dialog_to_comp_object): set the cal component categories
-	(categories_clicked): throw up the categories dialog and update
-	when ok is clicked
-
-	* gui/dialogs/task-editor-dialog.glade: Tweak to name the categories
-	button and make it active
-
-	* gui/calendar-model.c (get_categories): We can get the string list of
-	categories directly now
-
-	* cal-util/cal-component.c (cal_component_get_categories): new function
-	to get the categories list as a string
-	(cal_component_set_categories): same but for setting
-	(free_icalcomponent): init the categories var
-	(scan_categories): kill
-	(scan_property): assign the prop to the categories var
-	(cal_component_get_categories_list): deal with renaming var to categories
-	(cal_component_set_categories_list): fix brokeness
-
-2001-01-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (new_calendar): Handle the case where
-	the calendar view cannot be created; present a warning dialog box.
-	(new_calendar): Do not show the widget here, since we already show
-	it in control-factory.c.
-
-	* gui/control-factory.c (control_factory_new_control): Handle the
-	case where the calendar view cannot be created.
-
-	* gui/component-factory.c (create_view): Ditto.
-
-	* gui/calendar-summary.h: Added prototype for
-	calendar_summary_factory_init().
-
-2001-01-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/alarm-notify.c (add_component_alarms): If the component has
-	no alarms, do not try to queue them.
-	(remove_client_alarms): New function to remove all the queued
-	alarms for a calendar client.
-	(alarm_notify_remove_client): Remove the client's alarms.
-
-2001-01-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Do not
-	compose strings so that they can be localized correctly.  Also,
-	convert from UTF8 into the font's encoding.  Fixes bug #1030.
-
-	* gui/e-calendar-table.c (delete_component): Pass the widget
-	argument to delete_component_dialog().
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.
-
-	* gui/event-editor.c (file_delete_cb): Likewise.
-
-	* gui/calendar-commands.c: Use BONOBO_UI_VERB() instead of
-	BONOBO_UI_UNSAFE_VERB().  Guess what, all of our handler
-	signatures were wrong.
-
-	* gui/event-editor.c: Likewise.
-
-	* gui/dialogs/task-editor.c: Likewise.
-
-	* gui/goto-dialog.glade: Added some spacing between the month/year
-	widgets and the calendar widget.
-
-2001-01-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): Unconditionally remove
-	the client from the alarm notification system.
-	Removed all the obsolete alarm code.
-
-	* gui/event-editor.c: Removed some crufty externs left over from
-	Gnomecal.
-
-	* gui/calendar-commands.c: #include "goto.h"
-	Removed crufty variables left over from Gnomecal.
-	(new_calendar): Do not take a full_name parameter.
-	(init_username): Removed function.
-	(init_calendar): Wheeeeeeee!  Removed crufty function.
-	(quit_cmd): Removed function.
-
-	* gui/print.c (WEEK_STARTS_ON_MONDAY): Made it unconditionally
-	FALSE because we do not use the configuration setting anyways.
-	Sigh, all the printing code needs to be revamped.
-
-2000-12-26  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (create_summary_view): Create a shared
-	BonoboEventSource object.
-
-2000-12-25  Miguel de Icaza  <miguel@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_init): Set draw background to FALSE.
-	(e_day_view_reshape_long_event): ditto.
-	(e_day_view_reshape_day_event): ditto.
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Clean up
-	translatable strings for translators, fixes bug 993
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/goto.c (create_ecal): Make sure the current month is shown
-	when the dialog pops up.
-
-	* gui/goto-dialog.glade: Remove flicker
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_alarms_for_object):
-	account for the case where there are no alarms, fixes crash
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/goto.c (ecal_date_range_changed): New function to keep the
-	ecal marked properly
-	(create_ecal): move more creation code here, update marks
-	(goto_dialog_init_widgets): listen for date_range_changed signal
-	in the ecal
-
-	* gui/calendar-commands.c (init_calendar): Remove ancient gnomecal
-	cruft
-
-	* gui/mark.[hc], gui/prop.c: Remove ancient gnomecal code that is
-	no longer needed, last bit of bug 904
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/goto-dialog.glade.h: translations
-
-	* gui/goto-dialog.glade: new glade file for goto dialog
-
-	* gui/gnome-cal.c (setup_widgets): Set date navigator attributes
-
-	* gui/calendar-commands.h: remove prototype
-
-	* gui/goto.h: Add prototype
-
-	* gui/Makefile.am: Add glade file stuff
-
-	* gui/gnome-cal.c (setup_widgets): Use accessors to configure the
-	calendar item properly
-
-2000-12-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	Alarm trigger queueing for the GUI part.
-
-	* gui/alarm-notify.[ch]: New files with the high-level alarm
-	notification system; mostly moved over from gnome-cal.c.  The
-	low-level timer stuff is still in alarm.[ch].
-
-	* gui/alarm-notify.c (alarm_notify_init): New function to
-	initialize the alarm notification system.
-	(alarm_notify_done): New function to shut down the alarm
-	notification system.
-	(alarm_notify_add_client): New function to start monitoring a
-	calendar client for alarm notification.
-	(alarm_notify_remove_client): New function to stop monitoring a
-	client.
-
-	* gui/alarm.h (AlarmDestroyNotify): Also pass in the alarm ID so
-	the callback may know which ID is being destroyed.
-
-	* gui/alarm.c (clear_itimer): New function.
-	(pop_alarm): Use clear_itimer().
-	(alarm_done): New function to shut down the timer system.
-	(alarm_add): Add some preconditions.  Do not call the destroy
-	notification function if we could not create the alarm.
-	(alarm_ready): Pass the alarm ID to the destroy notify function.
-	(alarm_remove): Likewise.  Also, add some preconditions.
-
-	* gui/gnome-cal.c: Removed the alarm notification functions from
-	here since they are now in alarm-notify.c.
-	(gnome_calendar_construct): Register the client with
-	alarm_notify_add_client().
-	(gnome_calendar_destroy): Use alarm_notify_remove_client() to
-	unregister the client.
-	(obj_updated_cb): Do not do any alarm-related stuff.
-	(obj_removed_cb): Likewise.
-
-	* gui/main.c (main): Shut down the alarm timer system.
-	(main): Initialize and shut down the alarm notification system.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	alarm-notify.[ch] to the list of sources.
-
-	* gui/calendar-model.c (calendar_model_set_cal_client): Only
-	connect to the "cal_loaded" signal if the client is not already
-	loaded.
-
-	* gui/e-day-view.c (e_day_view_set_cal_client): Likewise.
-
-	* gui/e-week-view.c (e_week_view_set_cal_client): Likewise.
-
-	* gui/e-itip-control.c (update_calendar): Connect to "cal_loaded"
-	before issuing the load request.
-
-2000-12-21  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c: Updated for new executive summary.
-
-	* gui/component-factory.c: Reenabled the summary.
-
-	* gui/GNOME_Evolution_Calendar.oafinfo: Added the summary.
-
-2000-12-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Fix erroneous documentation
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): if
-	!is_empty_time rather than is_empty_time
-	(e_todo_context_new): Return a pointer rather than fill in
-	a parameter
-	(e_todo_context_foreach_change): Free just the key
-	(e_todo_context_destroy): Plug this enormous leakage.  I had assumed
-	i had done this earlier, which isn't too bright when anything beyond
-	2 minutes ago is fuzzy.
-	(comp_from_remote_record): Kill warnings
-	(post_sync): Destroy the map later
-	(conduit_get_gpilot_conduit): Fix e_todo_context_new params
-
-	* conduits/calendar/calendar-conduit.[hc]: Similar to above
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c: Remove pointless comment
-
-	* conduits/todo/todo-conduit.c (is_empty_time): add utility function
-	(comp_from_remote_record): use it
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Convert cal component strings to pilot character set
-	(comp_from_remote_record): vice versa
-
-	* conduits/todo/todo-conduit.c: Same as above
-
-2000-12-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (compute_alarm_range): Fix confusion in
-	the way the range is expanded.
-
-	* cal-util/cal-component.c (cal_component_alarms_free): Doh,
-	alarms->alarms is a list, not a generic pointer.  Free it properly.
-	(cal_component_free_pilot_id): Removed unused function.
-	(cal_component_free_pilot_status): Likewise.
-
-	* gui/main.c (init_bonobo): Use VERSION instead of a hardcoded
-	string.  Pass argc by value, not by reference.  Test the return
-	value of gnome_init_with_popt_table().
-
-	* cal-client/cal-client.c (cal_client_free_alarms): Oops, missed
-	implementing this function.
-
-	* cal-util/timeutil.c (print_time_t): Better printing format.
-	(isodiff_to_secs): Removed unused function.
-	(isodiff_from_secs): Removed unused function.
-	(time_day_end): Removed crufty part.
-	(time_day_begin): Removed crufty part.
-	(time_day_hour): Removed unused function.
-	(format_simple_hour): Removed unused function.
-	(get_time_t_hour): Removed unused function.
-	(time_from_start_duration): Removed unused function.
-
-	* cal-util/timeutil.h (parse_date): Removed unimplemented, unused
-	function prototype.
-
-2000-12-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/gnome-cal.c: Removed prototype for setup_alarm to fix a
-	warning.
-
-2000-12-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	Alarm instance generation support for the Wombat.
-
-	* idl/evolution-calendar.idl (Cal::CalAlarmInstance): Changed to
-	have an alarm UID, the trigger time, and the actual occurrence
-	time.
-	(Cal::CalComponentAlarms): New structure to hold a pair of a
-	component and its alarms that trigger in a particular range of
-	time.
-	(Cal::getAlarmsInRange): Changed to return a CalComponentAlarmsSeq.
-
-	* cal-util/cal-component.h (CalAlarmInstance): New C-side
-	structure to match the one on the IDL.
-	(CalComponentAlarms): Ditto.
-	(CalAlarmAction): Renamed from CalComponentAlarmAction.
-	(CalAlarmTriggerType): Renamed from CalComponentAlarmTriggerType.
-	Encoded the START and END parameters for the RELATED parameter in
-	this enum, too.  Added a NONE value for invalid or missing trigger
-	specifications.
-	(CalComponentAlarmTriggerRelated): Removed.
-	(CalAlarmTrigger): Renamed from CalComponentAlarmTrigger.  Renamed
-	the duration/time fields to rel_duration/abs_time, respectively.
-
-	* cal-util/cal-component.c (cal_component_alarm_get_trigger):
-	Changed to use the new trigger structure.
-	(cal_component_alarm_set_trigger): Likewise.
-	(cal_component_alarm_free_trigger): Removed function.
-	(cal_component_has_alarms): Count the elements in the
-	alarm_uid_hash instead of trying to fetch the first alarm subcomponent.
-	(cal_component_alarms_free): New function to free a
-	CalComponentAlarms structure.
-	(CalComponentAlarmPrivate): Added an uid property pointer.
-	(scan_alarm_property): Scan for the our extension UID property.
-	(cal_component_alarm_get_uid): New function.
-
-	* pcs/cal-backend.h (CalBackendClass): Changed the signatures of
-	the ::get_alarms_in_range() and ::get_alarms_for_object() methods.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_in_range): Changed
-	signature; use the new method.
-	(cal_backend_get_alarms_for_object): Likewise.
-
-	* pcs/cal-backend-file.c (compute_alarm_range): New spiffy
-	function to compute a range of time for alarm occurrences.
-	(add_alarm_occurrences_cb): New function to add alarms for a
-	particular occurrence of the component.
-	(generate_absolute_triggers): New function to add the absolute
-	alarm triggers.
-	(generate_alarms_for_comp): New function to generate all the alarm
-	instances for a component.
-	(cal_backend_file_get_alarms_in_range): Implemented.
-
-	* pcs/cal.c (Cal_get_alarms_in_range): Use the new CalBackend API.
-	(Cal_get_alarms_for_object): Likewise.
-	(build_alarm_instance_seq): Removed old function.
-
-	* cal-util/cal-util.c (cal_alarm_instance_list_free): Removed
-	function.
-
-	* cal-client/cal-client.c (build_component_alarms_list): New
-	function to demarshal the component alarms sequence.
-	(build_alarm_instance_list): New function to demarshal the alarm
-	instances sequence.
-	(cal_client_get_alarms_in_range): Updated for the new API.
-	(cal_client_get_alarms_for_object): Updated for the new API.
-
-	* gui/gnome-cal.c: Temporary #ifdef-ing out of alarm-related stuff
-	to make it build.
-
-2000-12-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/timeutil.[ch] (time_from_isodate): Removed unused
-	function, a relic from Gnomecal.
-
-2000-12-15  Dan Winship  <danw@helixcode.com>
-
-	* cal-util/timeutil.c (time_from_isodate): Fix the sign in the
-	HAVE_TM_GMTOFF case
-
-2000-12-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed getdate.y.
-	We no longer use it; it is a relic from Gnomecal.
-
-	* gui/getdate.y: Removed file.
-
-2000-12-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fixes bug #955.
-
-	* gui/weekday-picker.c (WeekdayPickerPrivate): Added a field for
-	the week_start_day, to be used in the same way as
-	calendar-config.h defines it.  Removed the week_starts_on_monday
-	flag.
-	(day_event_cb): Use the week_start_day.
-	(colorize_items): Likewise.
-	(configure_items): Likewise.
-	(weekday_picker_set_week_start_day): New function.
-	(weekday_picker_get_week_start_day): New function.
-	(weekday_picker_set_week_starts_on_monday): Removed function.
-	(weekday_picker_get_week_starts_on_monday): Removed function.
-
-	* gui/widget-util.[ch]: New files with utilities for creating or
-	configuring widgets.
-
-	* gui/widget-util.c (date_edit_new): New function to create an
-	EDateEdit configured with the calendar's preferences; moved over
-	from event-editor.c.
-
-	* gui/event-editor.c (make_recur_weekly_special): Use
-	weekday_picker_set_week_start_day() and the corresponding function
-	from calendar-config.h.
-	(init_widgets): Likewise.
-	(make_date_edit_with_time): Removed function.
-	(make_recur_ending_until_special): Use date_edit_new().
-	(make_date_edit): Likewise.
-
-	* gui/dialogs/task-editor.c (task_editor_create_date_edit): Likewise.
-
-	* gui/event-editor-dialog.glade: Removed references to
-	make_date_edit_with_time(); replace them with make_date_edit().
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	widget-util.[ch] to the list of sources.
-
-2000-12-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Reset the widths
-	of the columns with pixbufs to the actual pixbufs' sizes; now
-	ETable properly computes its column widths so we do not need to
-	add extra padding here.
-
-2000-12-14  Dan Winship  <danw@helixcode.com>
-
-	* gui/calendar-model.c (_XOPEN_SOURCE): #define this to 500, not
-	nothing. Also, move this bit after the other #includes to
-	prevent potential messiness.
-
-2000-12-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (ensure_mandatory_properties): Even
-	though icaltime_from_timet() now properly ignores the is_utc
-	argument since time_t values *are* in UTC by definition, we were
-	passing FALSE for that argument's value in a bunch of places.  So
-	although it is ignored, changed them to TRUE for consistency.
-	Hopefully newer versions of libical will remove that argument
-	entirely since it does not make sense to speak of non-absolute
-	time_t values.
-
-	* cal-util/cal-recur.c (cal_recur_set_rule_end_date): Likewise.
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record): Likewise.
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Likewise.
-
-	* gui/dialogs/task-editor.c (dialog_to_comp_object): Likewise.
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Likewise.
-	(e_day_view_on_delete_occurrence): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_finish_long_event_resize): Likewise.
-	(e_day_view_finish_resize): Likewise.
-	(e_day_view_key_press): Likewise.
-	(e_day_view_on_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-
-	* gui/e-week-view.c (e_week_view_key_press): Likewise.
-	(e_week_view_on_new_appointment): Likewise.
-	(e_week_view_on_delete_occurrence): Likewise.
-	(e_week_view_on_unrecur_appointment): Likewise.
-
-	* gui/event-editor.c (simple_recur_to_comp_object): Likewise.
-	(recur_to_comp_object): Likewise.
-	(dialog_to_comp_object): Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): Likewise.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/cal-recur.c: #if 0ed cal_obj_date_only_compare_func.
-	(cal_object_get_rdate_end): Changed this function to get rid of a
-	possible uninitialized error on the rdate function.
-
-	* gui/calendar-model.c: Fixed some warnings involving the #define
-	_XOPEN_SOURCE lines here.
-
-	* gui/component-factory.c: #ifdef WANT_THE_EXECUTIVE_SUMMARYed out
-	the summary_factory object since it's unused if
-	WANT_THE_EXCUTIVE_SUMMARY is not defined.
-
-	* gui/e-day-view.c: #if 0ed out e_day_view_remove_event_cb.
-	(obj_updated_cb): #ifndef NO_WARNINGSed out a #warning.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): Made
-	it so that
-
-	* gui/e-week-view.c (obj_updated_cb): #ifndef NO_WARNINGSed out a
-	#warning.
-
-2000-12-13  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Revert federico's change for now
-	because of libtool limitations with ldadding shared libtool
-	libs
-
-	* conduits/calendar/Makefile.am: ditto
-
-2000-12-12  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/dialogs/task-editor.c (task_editor_set_todo_object): Use
-	set_title_from_comp
-	(save_todo_object): ditto
-	(set_title_from_comp): Make sure the title is encoded properly (as in
-	event-editor)
-
-2000-12-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (get_text_list): Constify for new
-	libical API.
-	(set_text_list): Likewise.
-
-	* cal-util/cal-recur.c (cal_recur_get_rule_end_date): Likewise.
-	(cal_recur_set_rule_end_date): Likewise.
-
-	* gui/e-itip-control.c (find_attendee): Likewise.
-	(pstream_load): Likewise.
-
-	* gui/gnome-cal.c (released_event_object_cb): Removed unused function.
-
-	* gui/dialogs/task-editor.c (status_string_map): Removed unused
-	variable.
-
-2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am (test_recur_LDADD): Link to the libical
-	shared library.
-
-	* cal-client/Makefile.am (client_test_LDADD): Likewise.
-
-	* conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD):
-	Likewise.
-
-	* gui/Makefile.am (LINK_FLAGS): Likewise.
-
-2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	This is to make things work with libical 0.21helix1 and later.
-	Warnings remain because at last libical was constified; will take
-	care of those tomorrow.
-
-	* cal-util/timeutil.h: #include <ical.h> instead of <icaltypes.h>
-
-	* gui/e-itip-control.c: Likewise.
-
-	* gui/e-meeting-edit.c: Likewise.
-
-	* gui/itip-utils.h: Likewise.
-
-	* cal-util/cal-component.c (alarm_uid_from_prop): constify.
-	(cal_component_get_status): Updated for new libical API.
-	(cal_component_set_status): Likewise.
-
-	* gui/calendar-model.c (ensure_task_complete): Removed unused
-	status code.
-	(ensure_task_not_complete): Update for new status API.
-
-	* gui/dialogs/task-editor.c (status_string_to_value): Removed
-	function.
-	(status_value_to_string): Removed function.
-	(status_string_map): Removed variable.
-	(fill_widgets): Update for new status API.
-	(dialog_to_comp_object): Likewise.
-
-2000-12-11  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): updated the
-	tests on the start & end time just before calling the callback. It
-	was skipping occurrences that started before the required interval's
-	start time, which was wrong. We want all occurrences that intersect
-	the interval.
-	(cal_obj_time_weekday): removed the CalRecurrence* argument, since it
-	isn't needed.
-
-2000-12-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c: added changed flags and added calls to a new
-	function event_editor_set_changed() to set & reset this flag.
-	Added prompt_to_save_changed() which is called when the user
-	selects File/Close or the window's close button.
-	Fixed the 'All day event' toggle button.
-	Made the 'Alarm' page sensitive as appropriate when filling widgets.
-	(Though note that the alarm widgets are not being set yet.)
-
-	* gui/dialogs/task-editor.c: added changed flag as above.
-
-	* gui/event-editor-dialog.glade: used good names for all the
-	classification radio buttons so we can access them in the code.
-
-	* gui/event-editor.c (init_widgets): use the "show week numbers" config
-	option in the recurrence preview calendar.
-
-	* gui/e-day-view.c (e_day_view_update_event_label): use 9:00 instead
-	of 09:00 in the main view, as we do everywhere else now. It means the
-	times won't line up, but they are easier to read which I think is
-	better.
-	Added support for Page Up/Down, though I think it should move the
-	selection rather than just scroll the canvas.
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): removed the
-	end parameter since we should be using the chunk end time now.
-	Added single_rule parameter for when we are generating the
-	occurrences of a single RRULE, in which case the event's start date is
-	not included in the occurrences output (unless it results from the
-	RRULE expansion). Both of these fix problems when using COUNT.
-
-	* gui/gnome-cal.c (gnome_calendar_on_date_navigator_selection_changed):
-	fixed bug when checking if the new start day starts on the week start
-	day. If you select a complete week it should now show the Week view.
-
-2000-12-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Free the strings we
-	get from the editables.
-
-	* gui/dialogs/task-editor.c (dialog_to_comp_object): Likewise.
-	This sucks; this code should be shared between the two dialogs.
-
-2000-12-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (fill_widgets): Free the dates we get from
-	the component.
-
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Attach signal
-	handlers to the e_scrolled_table's etable rather than to the
-	e_scrolled_table directly
-	(e_calendar_table_on_double_click): This signal provides more
-	params now
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Got rid of code referencing the
-	ETableScrolled proxy functions.
-
-2000-12-07  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (post_sync): Ugly hack for syncing
-	until pcs can be altered (longer term)
-
-	* conduits/todo/todo-conduit.c (post_sync): ditto
-
-2000-12-07  Chris Toshok  <toshok@helixcode.com>
-
-	* cal-client/Makefile.am (client_test_LDADD): add
-	EXTRA_GNOME_LIBS.
-
-2000-12-07  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_compute_changes_foreach_key): Create
-	an empty cal component if the object has been deleted.
-
-	* idl/evolution-calendar.idl: Bit shift the change type constants
-	properly
-
-2000-12-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_generate_instances): Unref
-	the component from the objects list; it got referenced as many
-	times as appropriate for the instances list.
-
-2000-12-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Confirm before deleting the
-	event.
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_init): unref the pixbuf when
-	finished with it
-
-2000-12-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fixes bug #920.
-
-	* gui/e-calendar-table.c (delete_component): New function.
-	(e_calendar_table_on_delete_task): Use delete_component().
-	(e_calendar_table_on_key_press): Likewise.  Also, mark the event
-	as handled.
-
-	* gui/calendar-model.c (calendar_model_get_component): Renamed
-	function from calendar_model_get_cal_object().
-	(calendar_model_delete_task): Removed function.
-
-	* gui/dialogs/delete-comp.[ch]: New files with the dialog for
-	deleting a calendar component.
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Confirm
-	before actually deleting the appointment.
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.
-
-	* gui/dialogs/Makefile.am (libcal_dialogs_a_SOURCES): Added
-	delete-comp.[ch] to the list of sources.
-
-	* cal-util/cal-component.c (cal_component_destroy): Free the alarm
-	UID hash.
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal.c (build_change_seq): kill
-	(Cal_get_changes): return the corba sequence directly
-
-	* pcs/cal-backend.h: update prototype
-
-	* pcs/cal-backend.c (cal_backend_compute_changes_foreach_key): Build
-	the corba struct rather than the old calobjchange thing
-	(cal_backend_compute_changes): ditto.  build and return the actual
-	corba sequence rather than the list of calobjchanges
-	(cal_backend_get_changes): return the corba sequence
-
-	* cal-util/cal-util.h: Remove CalObjChange cruft
-
-	* cal-util/cal-util.c (cal_obj_change_list_free): Kill
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-util.c:
-
-	* conduits/calendar/calendar-conduit.c (map_name): Update so as not to conflict
-	with calendar
-	(next_changed_item): update to use CalClientChange instead of CalObjChange
-	(compute_status): ditto
-	(pre_sync): ditto
-	(for_each_modified): since we now have the cal component we can call
-	local_record_from_comp directly
-
-	* conduits/todo/todo-conduit.c: same as above
-
-	* pcs/cal-backend.c: Remove much logging cruft
-	(cal_backend_compute_changes): Calculate the changes based on the
-	hashed database
-	(cal_backend_get_changes): call cal_backend_compute_changes
-	(cal_backend_compute_changes_foreach_key): hash callback for
-	calculating deletions
-
-	* pcs/cal-backend.h: update protype, remove logging cruft from
-	object
-
-	* pcs/cal.c (build_change_seq): dup the calobj rather than the uid
-	now
-	(Cal_get_changes): rename from Cal_get_changed_uids
-	(cal_get_epv): reflect name change in epv
-
-	* cal-util/cal-util.c (cal_obj_change_list_free): update assertion
-
-	* cal-util/cal-util.h: CalObjChange now returns the entire ical
-	component, update the change types.  This should all go away shortly
-
-	* idl/evolution-calendar.idl: getChangedUIds -> getChanges.
-	CalObjChange now contains the calobj rather than the uid, update
-	the change types
-
-	* cal-client/cal-client.c (cal_client_get_changes): rename from
-	cal_client_get_changed_uids to make idl and addressbook
-
-	* cal-client/cal-client.h: Update prototype
-
-	* cal-client/cal-client.c (build_change_list): Build a list of
-	CalClientChange instead of CalObjChange
-
-	* cal-client/cal-client-types.c (cal_client_change_list_free): Free
-	a glist of CalClientChanges
-
-	* cal-client/cal-client-types.h: New file. Declarations for
-	CalClientChange.
-
-	* cal-client/Makefile.am: Build new files
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Fix my build stupidty READ THE MACRO
-
-	* conduits/calendar/Makefile.am: ditto
-
-2000-12-04  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_get_column_width):
-	Initialize max_large_digit_width to 0 to prevent crazy sizing issues.
-
-2000-12-04  Dan Winship  <danw@helixcode.com>
-
-	* gui/e-itip-control.c: Remove mysterious #include inserted by
-	mmeeks to break the build.
-
-2000-12-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fixes bug #918.
-
-	* gui/weekday-picker.c (WeekdayPickerPrivate): Added a field for a
-	set of blocked days.
-	(weekday_picker_set_blocked_days): New function to configure a set
-	of days that cannot be modified by the user.
-	(weekday_picker_get_blocked_days): Query function for the above.
-	(day_event_cb): Block the appropriate days from being modified.
-
-	* gui/event-editor.c (get_start_weekday_mask): New function to
-	compute a day mask for the start day of a calendar component.
-	(set_recur_special_defaults): New function to set sane defaults
-	for the recurrence special widgets.
-	(fill_recurrence_widgets): Use set_recur_special_defaults().
-	(make_recur_weekly_special): Block the appropriate days.
-
-2000-12-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/control-factory.c (set_prop): Removed debugging message.
-	(control_factory_init): Ditto.
-
-	* gui/calendar-commands.c (calendar_set_uri): Ditto.
-
-	* gui/main.c (main): Ditto.
-
-	* gui/event-editor.c (set_title_from_comp): New function to
-	generate a title and convert it from UTF8 before setting it on the
-	window.
-	(save_event_object): Uset set_title_from_comp().
-	(event_editor_set_event_object): Likewise.
-
-2000-11-30  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c:  Debug message cleanups
-	(comp_from_remote_record): Properly set the ical description field
-
-	* conduits/calendar/calendar-conduit.c (is_empty_time): New utility
-	functions that look for all 0's in a struct tm
-	(comp_from_remote_record): use above
-	(local_record_from_comp): Correctly set the repeatForever value so
-	that we repeat forever instead of a really long time
-	(comp_from_remote_record): Only set the cal component recurrence
-	until field when repeatForever is 0
-
-2000-11-30  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: fixed a bug that caused the calendar to
-	segfault when the iTip control was destroyed.
-
-2000-11-30  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): Empty
-	by_day entries are no longer indicated by ICAL_RECURRENCE_ARRAY_MAX not
-	SHRT_MAX. Calculate weekly and monthly by date recurrences properly
-	(get_pilot_day): Convert ical day to corresponding integer for pilot day
-
-2000-11-30  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c: Debug message cleanups
-	(get_ical_day): Fix off-by-one error which affected weekly occurences.
-	(comp_from_remote_record): Monthly by day and by date were reversed
-	(nth_weekday): function taken from event-editor.c that encodes BYDAY
-	values - this needs to be in libical really.
-	(comp_from_remote_record): Don't set the description if the pilot note
-	is null.  Rejig so that we don't have to free objects.
-
-2000-11-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	Upgrade of the alarm framework.  We now access alarms by a unique
-	identifier.  This UID is added as an extension property to alarm
-	subcomponents when their parent components are scanned by
-	CalComponent.
-
-	* cal-util/cal-component.c (CalComponentPrivate): Added a hash
-	table of alarm UIDs -> alarm properties.
-	(cal_component_init): Initialize priv->alarm_uid_hash.
-	(free_icalcomponent): Free the elements in the
-	priv->alarm_uid_hash.
-	(scan_alarm): New function to add scan an alarm subcomponent and
-	ensure that it has an alarm UID extension property so that we can
-	add it to our mapping table.
-	(cal_component_get_first_alarm): Removed function.
-	(cal_component_get_next_alarm): Removed function.
-	(cal_component_get_alarm_uids): New function.
-	(cal_component_get_alarm): New function.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (local_record_to_pilot_record): Return
-	a struct rather than a pointer to a struct
-	(compare): local_record_to_pilot_record now returns a struct
-	(prepare): ditto
-	(free_prepare): remove as per gnome-pilot changes
-	(conduit_get_gpilot_conduit): don't listen for free_prepare signal
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-2000-11-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Reformatted the
-	table spec to make it easier to read.
-
-	* gui/tag-calendar.c: Oops, Damon wrote this, not me.  Fixed the
-	Authors line.
-
-2000-11-28  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view*.[hc]:
-	* gui/e-week-view*.[hc]: finished 12-hour support and tried to tidy
-	up & comment the drawing code in places. Also fixed a couple of bugs I
-	spotted. All the options on the 'Calendar' page should now work.
-
-2000-11-28  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: removed some debugging code that I had,
-	which might have caused problems.
-
-2000-11-27  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/calendar-model.c: added a preliminary change to have
-	Assigned To-Do items have a corresponding icon.
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (free_prepare): Ditto
-
-	* conduits/calendar/calendar-conduit.c (free_prepare): Adjust
-	free_prepare to the correct signal parameters.  Don't actually
-	do anything - there is a semantic discrepancy that needs to be
-	resolved.
-
-2000-11-26  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_set_days_shown): == instead of =.
-
-2000-11-26  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c: added more support for config settings.
-
-	* gui/e-week-view.[hc]:
-	* gui/e-day-view.[hc]: added support for setting - show event end
-	times, week start day and 12-hour format (unfinished).
-
-	* gui/e-day-view-time-item.c: started 12-hour support.
-
-	* gui/tag-calendar.c (prepare_tag): use end_day + 1 since we want to
-	include the last day.
-
-	* gui/event-editor.c (set_all_day): minor change when turning all_day
-	off - set the event end to one hour after the event start if it is on
-	or before the start time. Also added more comments to make it a bit
-	clearer.
-
-	* cal-util/cal-recur.c (cal_obj_time_add_days): use a gint for day
-	rather than a guint since we now support -ve days.
-	Also fixed bug with weekly recurrences.
-
-	* gui/dialogs/task-editor.c (task_editor_create_date_edit): use
-	config settings.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_update_config):
-	updated EDateEdit calls.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Unref the ETable
-	extras.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (free_icalcomponent): DOH, fixed
-	reversed test for the presence of the icalcomp's parent.  This was
-	causing memory leaks in the Wombat and elsewhere.
-
-	* pcs/cal-backend.c (cal_backend_set_node_timet): Plug leak.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (scan_vcalendar): Use the new libical
-	external iterators (icalcomponent_begin_component() and friends);
-	the internal iterators are deprecated.
-
-	* cal-util/test-recur.c (generate_occurrences): Likewise.
-
-	* gui/e-itip-control.c (pstream_load): Likewise.
-
-	* gui/e-meeting-edit.c (e_meeting_edit): Likewise.
-
-	* pcs/cal-backend.c (cal_backend_log_entry): Plug leak.
-	(cal_backend_log_sync): Free the entry->uid.
-
-	* util/icalendar-save.[ch]:
-	* util/icalendar-test.c:
-	* util/icalendar.[ch]: Removed obsolete files.
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/task.xpm: Remove the check because it makes it look like the
-	task is already completed.  This fixes bug #819.
-
-	* gui/task-recurring.xpm: Make it use a prettier overlaid icon.
-
-	* gui/task-*.xpm: Made the things look like little spiral-bound
-	notebooks.
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Make the default
-	column order be icon/completed/summary.  You may need to erase
-	your ~/evolution/config/TaskPad for this to appear.
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_is_cell_editable): The icon
-	column is not editable!
-
-	* gui/calendar-commands.c (todo_properties_changed): Removed.
-	(time_format_changed): Removed.
-	(colors_changed): Removed.
-
-	* gui/calendar-commands.h:
-	* gui/prop.c (prop_apply):
-	* gui/calendar-commands.c (init_calendar): Removed the old to-do
-	list crap.
-
-	* gui/gncal-todo.[ch]: Removed obsolete files.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed gncal-todo.[ch].
-
-	* gui/gnome-cal.c (gnome_calendar_todo_properties_changed): Removed.
-	(gnome_calendar_time_format_changed): Removed.
-	(gnome_calendar_colors_changed): Removed.
-
-2000-11-21   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: fixed the stupid Bonobo widget size
-	allocation bug that had been vexing me.
-
-	* gui/e-itip-control.glade: I removed some hacks that were
-	necessary for said size bug.
-
-2000-11-16   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-meeting-edit.c: added cancellation
-	code to our program; people can cancel meetings, which is the best
-	thing to do for most meetings.
-
-2000-11-13   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: made the REPLY code actually work.
-
-2000-11-13   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/itip-utils.[ch]: I created this file to store some commonly used enumeration to
-	string mappings and functions.
-
-	* gui/Makefile.am: this was changed to reflect the addition of the above file.
-
-	* gui/e-itip-control.c: added code to take action on a REPLY message.
-
-	* gui/e-meeting-edit.c: bug fixes.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	OK, bugzilla bug #829 is fixed and that does not redeem me from
-	extreme procrastination.  Wheeeeeeeeeeeeeeee!
-
-	* gui/event-editor-dialog.c: Changed the "Rule view" label to
-	"Preview"
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (make_recur_ending_count_special): Misspelled
-	"occurrences".
-	(fill_recurrence_widgets): Sensitize the "Custom recurrence" radio
-	button as appropriate.
-	(sensitize_recur_widgets): Resurrected the recurrence custom
-	warning label.
-	(get_widgets): Load the recurrence custom warning bin.
-
-	* gui/event-editor-dialog.glade: Add an empty alignment for the
-	recurrence custom warning label.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (recur_preview_date_range_changed_cb): New
-	function; re-tag the calendar when its date range changes.
-	(init_widgets): Connect to "date_range_changed" on the recurrence
-	preview calendar.
-	(make_recur_weekly_special): Connect to "changed" on the weekday
-	picker.
-	(recur_weekday_picker_changed_cb): New function; re-tag the calendar.
-	(month_day_menu_selection_done_cb): Re-tag the calendar.
-	(recur_month_index_value_changed_cb): Likewise.
-	(recur_ending_until_changed_cb): Likewise.
-	(recur_ending_count_value_changed_cb): Likewise.
-	(make_recur_monthly_special): Connect to "value_changed" on the
-	adjustment of the month index.
-	(make_recur_ending_until_special): Connect to "changed" on the
-	ending-until date picker.
-	(make_recur_ending_count_special): Connect to "value_changed" on
-	the ending-count adjustment.
-	(init_widgets): Set to zero the maximum number of selectable days
-	in the recurrence preview calendar.  Set the week_start_day from
-	the calendar's configuration.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (clear_widgets): Block the signals as appropriate.
-	(fill_ending_date): Ditto.
-	(fill_recurrence_widgets): Ditto.
-	(recurrence_type_toggled_cb): Only sensitize the widgets and
-	preview the recurrence if the toggle button is active.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (recur_to_comp_object): Clear the rdate and
-	exrule lists from the component if we are setting a simple
-	recurrence.
-	(recur_to_comp_object): Set the exdate list here instead of in
-	dialog_to_comp_object().
-	(preview_recur): New function to tag the recurrence preview
-	calendar based on the information from the dialog box.
-	(fill_exception_widgets): Fill the exception widgets here; moved
-	over from fill_widgets().
-	(fill_recurrence_widgets): Call preview_recur().  Also, call
-	fill_exception_widgets() first of all.
-	(recurrence_type_toggled_cb): Call preview_recur().
-	(recur_interval_selection_done_cb): Likewise.
-	(recur_ending_selection_done_cb): Likewise.
-	(recurrence_exception_add_cb): Likewise.
-	(recurrence_exception_modify_cb): Likewise.
-	(recurrence_exception_delete_cb): Likewise.
-	(date_changed_cb): Likewise.
-	(recur_interval_value_changed_cb): Likewise, new function.
-
-	* gui/tag-calendar.[ch]: New files with utilities for tagging
-	calendars.  mark.[ch] should go away some day.
-
-	* gui/tag-calendar.c (tag_calendar): Moved over from
-	gnome_calendar_tag_calendar().  Take in a CalClient instead of a
-	GnomeCalendar.  Added API docs.
-	(tag_calendar_by_comp): New function to tag a calendar based on a
-	single calendar component instead of a whole client.
-
-	* gui/gnome-cal.c (initial_load): Use tag_calendar_by_client().
-	(obj_updated_cb): Likewise.
-	(obj_removed_cb): Likewise.
-	(gnome_calendar_on_date_navigator_date_range_changed): Likewise.
-	(editor_closed_cb): Free the closure.
-	(destroy_editor_cb): Renamed from free_uid().  Do not free the
-	UID; just unref the event editor.  Our destroy handler to it will
-	free things properly.  This will also cause the corresponding
-	calendar client to be unrefed.
-	(editor_closed_cb): Use a flag on the GnomeCalendar to decide
-	whether to remove the editor from the hash table.  This is sort of
-	icky.
-
-	* gui/calendar-model.c (obj_updated_cb): If the object is new, we
-	have to use e_table_model_row_inserted(), not row_changed().
-	Thanks to JP Rosevear for reporting this.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	tag-calendar.[ch] to the list of sources.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* gui/evolution-calendar.oafinfo:
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-11-10  Michael Meeks  <michael@helixcode.com>
-
-	* gui/Makefile.am ($(IDL_GENERATED)): sort include order.
-
-	* pcs/Makefile.am (idl_flags): ditto.
-
-2000-11-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (for_each_modified): Inc the
-	iterator before finding the next changed item.
-
-	* conduits/todo/todo-conduit.c (for_each_modified): ditto
-
-2000-11-09   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: I wrote the code so that recipients of meeting requests
-	can reply appropriately.
-
-2000-11-09   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c:  fixed a bug that would make the calendar segfault
-	if the meeting editor were called up twice without first saving the
-	component.
-
-2000-11-08   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-itip-control.glade: updated the GUI
-	to allow the user to add PUBLISHed events to his calendar, and created
-	unworking buttons for meeting requests.
-
-2000-11-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	These changes fix bugzilla bugs #874 and #875.
-
-	* cal-util/cal-component.c (cal_component_get_exdate_list): Return
-	a list of CalComponentDateTime instead of simple struct
-	icaltimetype objects.  Exception date properties *can* contain a
-	timezone parameter, so we need to include those if they are
-	present.
-	(cal_component_set_exdate_list): On the input, handle a list of
-	CalComponentDateTime structures.  On the internals, handle a list
-	of struct datetime instead of plain properties.
-	(cal_component_free_exdate_list): Handle a list of
-	CalComponentDateTime structures.
-	(scan_exdate): Create a list of struct datetime structures.
-	(free_icalcomponent): Free the exdate_list properly.
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): Use the
-	proper types for exception dates.
-
-	* gui/comp-util.h:
-	* gui/comp-util.c: New files with utilities for manipulating
-	calendar component objects.
-	(cal_comp_util_add_exdate): New function.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	comp-util.[ch] to the list of sources.
-
-	* gui/e-day-view.c (add_exdate): New convenience function to add
-	an exception date to a calendar component.
-	(e_day_view_on_unrecur_appointment): Use cal_comp_util_add_exdate().
-	(e_day_view_on_delete_occurrence): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): Likewise.
-	(e_week_view_on_unrecur_appointment): Likewise.
-
-	* gui/event-editor.c (nth_weekday): Be paranoid about valid
-	position values.
-	(fill_widgets): Use the proper types for exdates.
-	(dialog_to_comp_object): Likewise.
-
-2000-11-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (adjust_day_index_spin): Adjust the valid
-	range of the month index spin button depending on the selection of
-	the day/weekday menu.
-
-2000-11-07   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-itip-control.glade: changed the GUI,
-	and added some extra feedback for the user.
-
-2000-11-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/weekday-picker.h (WeekdayPickerClass): Added a "changed"
-	signal to notify of changes to the set of selected days.
-
-	* gui/weekday-picker.c (weekday_picker_class_init): Create the
-	"changed" signal.
-	(weekday_picker_set_days): Emit the "changed" signal.
-
-2000-11-06   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-itip-control.glade: changed to GUI to
-	accomodate dynamically generated buttons, which will be tailored to
-	the type of iTip message that is incoming.
-
-	* gui/e-meeting-dialog.glade gui/e-meeting-edit.c: added a new button
-	to publish events, in addition to requesting meetings.
-
-2000-11-05  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Removed the old recurrence page.
-	Wheeeeeeeeee!
-
-	* gui/event-editor.c (make_recurrence_special): Clear the monthly
-	widgets.
-	(make_recur_monthly_special): Create the monthly widgets.
-	(clear_widgets): Clear the monthly values.
-	(simple_recur_to_comp_object): Fill in the monthly values.
-	(fill_recurrence_widgets): Fill in the monthly and yearly source
-	values.
-	(dialog_to_comp_object): Take in a CalComponent instead of using
-	the event editor's directly.
-	(recur_to_comp_object): Likewise.
-	(simple_recur_to_comp_object): Likewise.
-	(EventEditorPrivate): Removed the widgets from the old recurrence
-	page.
-	(get_widgets): Likewise.
-	(clear_widgets): Likewise.
-	(dialog_to_comp_object): If the description or summary are empty,
-	just clear the description list or summary property, respectively,
-	instead of saving empty ones.
-	(simple_recur_to_comp_object): Set the week_start field.
-
-	* gui/main.c: Fix includes, and add calendar-config.h.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): The glade messages
-	file should not be in SOURCES.
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* doc/.cvsignore, doc/C/.cvsignore: Removed unnecessary .cvsignore
-	files.
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (check_all_day): Block signals from the
-	toggle button.
-	(date_changed_cb): Merged check_dates() and check_times() into
-	this function; provide better behavior as well.
-	(check_dates): Removed function.
-	(check_times): Removed function.
-	(init_widgets): Connect to the "changed" signal on the start_time
-	and end_time widgets.
-	(check_all_day): Use a better test.
-
-	* gui/Makefile.am: Clean the idl-generated sources properly.
-	* cal-client/Makefile.am: Likewise.
-
-2000-11-03  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: added some checks for the type of an
-	incoming iCal component before passing it off to the CalComponent
-	routines.
-
-2000-11-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/dialogs/task-editor.c (init_widgets): The date editor's
-	signal is now "changed".
-	(completed_changed): Renamed callback to reflect the name of the
-	signal.
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* gui/main.c: (main): added call to bindtextdomain and textdomain, so
-	all calendar gui shows up localized.
-
-2000-10-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (count_by_xxx): Hmmm.  SHRT_MAX changed to
-	ICAL_RECURRENCE_ARRAY_MAX in libical.  Deal with it.
-	(fill_recurrence_widgets): Likewise.
-	(simple_recur_to_comp_object): Fixed incorrect assertion.  The
-	weekday picker is not the immediate child of the recurrence
-	special container.
-	(fill_recurrence_widgets): Call make_recurrence_special() after
-	setting the recurrence period type.
-	(fill_ending_date): Call make_recurrence_ending_special().  This
-	would be so much nicer if GTK+ were model/view all over.
-
-2000-10-31  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Remove add/del/mod hashes and
-	add changed_hash.
-
-	* conduits/calendar/calendar-conduit.h: ditto
-
-	* conduits/todo/todo-conduit.c (next_changed_item): Utility function
-	to get the next "really" changed item (changed status can be cleared now)
-	(compute_status): Compute status based on changed_hash
-	(pre_sync): Fill changed_hash and counts adds/mods/dels
-	(set_status_cleared): New callback handler - avoid double syncing
-	(for_each_modified): Use next_changed_item to iterate
-	(add_archive_record): kill
-	(delete_archive_record): kill
-	(archive_record): New callback handler - mark/unmark archive status
-	(conduit_get_gpilot_conduit): Adjust signal connects
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-2000-10-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (sensitize_recur_widgets): New function.  We
-	split it from the radio callback so that we can call it explicitly
-	from fill_recurrence_widgets().
-	(fill_recurrence_widgets): Call sensitize_recur_widgets() as
-	appropriate.
-
-2000-10-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (new_calendar): Removed the geometry and
-	hidden arguments.  This code is ancient.
-	(all_calendars): Made static.  This sucks; configuration should be
-	notification-based instead of "let's iterate through all open
-	calendars".
-	(active_calendars): Removed.  Functions can check the length of
-	the all_calendars list if they are interested.
-
-	* gui/event-editor.c (sync_entries): Do not take in an extra data
-	pointer.
-	(summary_changed_cb): Use a single call back to sync both entries.
-	(sync_date_edits): New function to sync two EDateEdit widgets.
-	(init_widgets): Connect the general and recurrence starting date
-	widgets.
-
-2000-10-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (sync_entries): New function.
-	(general_summary_changed_cb): Sync the general summary to the
-	recurrence summary widget.
-	(recurrence_summary_changed_cb): Vice-versa.
-	(init_widgets): Hook to the summaries.
-
-	* event-editor-dialog.glade: Do not expand/fill the start and end
-	date so that the "all day event" button is not pushed all the way
-	to the right.
-	Decrease the spacing between the recurrence sentence widgets.
-	Remove a spurious empty label that was lurking around the
-	recurrence widgets.
-	Make the alarm widgets expand the right way.
-	Delete old recurrence widgets.
-
-2000-10-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (init_widgets): Connect to the recurrence
-	ending menu.
-	(recur_ending_selection_done_cb): Implemented.
-	(make_recurrence_ending_special): Implemented.
-	(make_recur_ending_until_special): Implemented.
-	(fill_ending_date): Implemented.
-	(make_recur_ending_count_special): Implemented.
-	(simple_recur_to_comp_object): Fill in the ending date.
-	(clear_widgets): Clear the recurrence ending widgets.
-
-	* gui/event-editor-dialog.glade: Moved the recurrence type radio
-	buttons to a single hbox to save space.
-	Fixed the lower value of the recurrence interval spin button.
-	Removed the stale widgets from the recurrence ending date part.
-
-2000-10-27  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: fixed problems in which I allocated CORBA
-	strings of 0 length, but then didn't NULL terminate them.
-
-2000-10-27    <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):
-	Check boundary case of fast sync
-
-	* conduits/todo/todo-conduit.c (check_for_slow_setting): ditto
-
-2000-10-27    <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (add_archive_record): Remove
-	invalid test.
-	(local_record_from_comp): If the event is all day, mark it as timeless
-	(comp_from_remote_record): Timeless events take up all day
-
-	* conduits/todo/todo-conduit.c (add_archive_record): ditto
-
-2000-10-27  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (add_archive_record): Take proper
-	number of parameters
-
-	* conduits/calendar/calendar-conduit.c (add_archive_record): ditto
-
-2000-10-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (EventEditorPrivate): Integrate Anna's new
-	recurrence page.  Replace the old widget pointers with the new
-	ones.  Modified the relevant functions accordingly and added
-	plenty of new ones.
-	(event_editor_get_cal_client): New function.
-	(fill_recurrence_widgets): This is *THE* tricky function for you.
-	It has to discriminate whether we get a recurrence we support for
-	editing or not.  And this is not trivial.  Sigh.
-	(event_editor_update_widgets): Added preconditions and API docs.
-
-	* event-editor-dialog.glade: Fixed all the spacings/
-	paddings/packing options so that the widgets will look right if
-	the dialog box is resized.  Also fixes some misaligned widgets.
-
-	* cal-util/cal-component.c (cal_component_set_rdate_list): Removed
-	incorrect assertion.
-
-2000-10-26  Michael Meeks  <michael@helixcode.com>
-
-	* pcs/cal-factory.c (str_tolower): unsigned chars to isalpha
-
-	* cal-util/calobj.c (weekdaylist, weekdaynum): ditto.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: brushed up some code to deal with
-	the organizer entry, and solidified the CORBA memory-freeing
-	issues.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* removed the Evolution-Composer generated files, due
-	to a tip on how we do things.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: I fixed a bunch of memory-deallocation
-	bugs, and finished the initial integration with the mailer.
-
-	* gui/Makefile.am: made the build us the Evolution-Composer.idl
-	from the composer directory.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/Evolution-Composer.idl: added this from the composer IDL sources
-
-	* gui/Makefile.am: changed to reflect the above IDL and the associated
-	orbit-idl generated files.
-
-	* gui/Evolution-Composer.h,
-	  gui/Evolution-Composer-common.c,
-	  gui/Evolution-Composer-stubs.c,
-	  gui/Evolution-Composer-skels.c:
-	the generated files, as per the above description.
-
-	* gui/e-meeting-edit.c: more work towards mailer integration.
-
-2000-10-24  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: I've added code to interact with the mailer's
-	CORBA interfaces, though it's not yet working.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): Use
-	new e-pilot-map lookup function
-	(match): ditto
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): Use
-	new e-pilot-map lookup function
-	(match): ditto
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES):
-	* gui/dialogs/Makefile.am (INCLUDES):
-	* gui/Makefile.am (INCLUDES):
-	* cal-util/Makefile.am (INCLUDES):
-	* cal-client/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Use new libeconduit calls and
-	abstraction
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-	* conduits/calendar/calendar-conduit.h: ditto
-
-	* conduits/todo/todo-conduit.c: ditto
-
-	* conduits/calendar/Makefile.am: Add libeconduit-static.la
-
-	* conduits/calendar/calendar-conduit.c (post_sync): Use e_pilot_map_write
-	(pre_sync): Use e_pilot_map_read
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Add libeconduit-static.la
-
-	* conduits/todo/todo-conduit.c (post_sync): Use e_pilot_map_write
-	(pre_sync): Use e_pilot_map_read
-
-2000-10-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/cal-prefs-dialog.c
-	(cal_prefs_dialog_use_24_hour_toggled): removed debug message.
-
-	* gui/e-calendar-table.c (e_calendar_table_save_state): new function
-	to save the state of the table to a given file.
-
-	* gui/e-calendar-table.h (struct _ECalendarTable): added etable field
-	so we can access it to save the state.
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): call
-	e_calendar_table_save_state() to save the state of the TaskPad.
-	(setup_widgets): load the state of the TaskPad.
-
-	* gui/calendar-config.c: added support for the default view.
-
-	* gui/gnome-cal.c (gnome_calendar_construct):
-	(gnome_calendar_set_view_internal): use/set the default view setting.
-
-2000-10-20  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-editor.c: added more (working) integration with the
-	meeting schedular.
-
-2000-10-20  Jesse Pavel <jpavel@helixcode.com>
-
-	* cal-utils/cal-component.c: in set_datetime(), I put an #if 0'd portion
-	of the code back into operation, because the icalproperty_remove_parameter()
-	function is now implemented.
-
-	* gui/e-meeting-editor.c: added more (unworking) integration with the
-	meeting schedular.
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_destroy): New destroy
-	handler to properly stop the timer, sync the log and unref
-	the URI.
-	(cal_backend_last_client_gone): Just emit the signal,
-	clean up work is done in cal_backend_destroy now.
-
-	* pcs/cal-backend-file.c (cal_backend_file_load): Unref the
-	uri we are replacing NOT the new uri.
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Fix build
-
-	* conduits/calendar/Makefile.am: Fix build
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (delete_archive_record):
-	Don't throw an error
-
-	* conduits/todo/todo-conduit.c (delete_archive_record): ditto
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit-control-applet.c: Add defines
-
-	* conduits/todo/todo-conduit-config.h: put #ifdefs around functions
-	can't make this a public interface in the usual way as then the
-	symbols would be exported
-
-	* conduits/todo/todo-conduit.c: Kill warnings. clahey will be
-	happy! Add some defines to include only the necessary config functions.
-	(conduit_get_gpilot_conduit): Hook up archive signals
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-	* conduits/calendar/calendar-conduit-control-applet.c: ditto
-
-	* conduits/calendar/calendar-conduit-config.h: ditto
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.h: s/BonoboUIHandler/BonoboUIComponent/
-
-	* gui/calendar-commands.c (properties_cmd): ditto.
-
-2000-10-20  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_value_at): use
-	cal_component_has_alarms().
-
-2000-10-20  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): added
-	_click-to-add-message, though I'm not sure if i18n will work.
-
-	* cal-util/cal-recur.c (cal_obj_time_add_hours):
-	(cal_obj_time_add_minutes):
-	(cal_obj_time_add_seconds): updated to handle -ve args.
-
-	* cal-util/timeutil.c (time_add_day): set tm_isdst to -1 before calling
-	mktime().
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): don't call the
-	callback if the event ends exactly on the interval start time.
-
-	* gui/e-week-view.c (e_week_view_reshape_event_span):
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	* gui/e-day-view.c (e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event): use cal_component_has_alarms().
-
-	* cal-util/cal-component.[hc]: added cal_component_has_alarms().
-
-2000-10-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-config.c (config_read): set default MonthVPanePosition
-	to 1 rather than 0, so if you move the hpane you'll see the date
-	navigator.
-
-2000-10-19  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/event-editor.[ch]: added a public function which causes the
-	event editor to reload its widgets to the associated CalComponent.
-
-	* gui/e-meeting-edit.c: added rudimentary support for the phat
-	e-meeting-time-selector widget, though it has no effect on the
-	component yet.
-
-	* gui/Makefile.am: the meeting editor depends on the meeting widget
-	library, now.
-
-	* gui/e-itip-control.glade: I added another toolbar button that summons
-	from the hoary deep the meeting time widget.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Add `event-editor-dialog.glade.h'.
-	(EXTRA_DIST): Add `$(glade_messages)'.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (tb_print_cb): remove; redundant.
-
-	* gui/event-editor.c (create_menu, create_toolbar): kill.
-	(event_editor_destroy): upd.
-	(event_editor_construct): update to new UI handler, cast
-	priv->general_summary to a widget not an object.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* gui/dialogs/task-editor.c (create_menu, create_toolbar): die.
-	(debug_xml_cb): add debugging hook.
-
-	* gui/dialogs/Makefile.am: add EVOLUTION_DATADIR
-
-	* gui/dialogs/task-editor.c (task_editor_construct): upd for new UI.
-
-2000-10-17  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit-control-applet.c: Add defines
-
-	* conduits/todo/todo-conduit-config.h: put #ifdefs around functions
-	can't make this a public interface in the usual way as then the
-	symbols would be exported
-
-	* conduits/todo/todo-conduit.c: Kill warnings. clahey will be
-	happy! Add some defines to include only the necessary config functions.
-	(conduit_get_gpilot_conduit): Hook up archive signals
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-	* conduits/calendar/calendar-conduit-control-applet.c: ditto
-
-	* conduits/calendar/calendar-conduit-config.h: ditto
-
-2000-10-16  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: You can now add incoming iTip
-	messages to your calendar store.
-
-	* gui/e-itip-control.glade: added a progress bar dialog
-	in case the calendar loading takes a long time.
-
-2000-10-16  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-client/cal-client.h: Remove pilot cruft.  All pilot stuff
-	is in the conduits now and uses the logging facility.
-
-	* pcs/cal-backend-file.c: ditto
-
-	* pcs/cal-backend.h: ditto
-
-	* pcs/cal-backend.c: ditto
-
-	* pcs/cal.c: ditto
-
-	* pcs/cal.h: ditto
-
-	* idl/evolution-calendar.idl: ditto
-
-	* cal-util/cal-component.h: ditto
-
-	* cal-util/cal-component.c: ditto
-
-	* cal-client/cal-client.c: ditto
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Take a stab at storing recurrence stuff on the pilot properly
-
-	* pcs/cal-backend.c (cal_backend_update_object): Don't log the
-	event until after the update in case its a new item
-
-2000-10-16  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* gui/dayview.xpm, gui/workweekview.xpm, gui/weekview.xpm
-	gui/monthview.xpm gui/yearview.xpm: Updated icons, let me know
-	if you like these or not, I might work on these some more but
-	I wanted to put these versions up anyway to get feedback..
-
-2000-10-15  Dan Winship  <danw@helixcode.com>
-
-	* gui/Makefile.am: Remove CPPFLAGS def since the -D there was
-	already in INCLUDES
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar.oafinfo: Added an
-	"evolution:shell-component-icon" attribute.
-
-2000-10-12  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.{c,glade}: Made the control much more
-	relavent to the function at hand.
-
-2000-10-12  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): set the 2 icon
-	columns to a min width of 18 and resizable to FALSE.
-
-2000-10-12  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate):
-	(update_pixmaps):
-	(set_pixmap): set the pixmaps of the toolbar buttons for the views,
-	and removed a lot of old unused stuff. We'll use plain buttons for
-	the view buttons for now, until Bonobo toolbars support radio buttons.
-
-	* gui/gnome-cal.c (gnome_calendar_dayjump): check day_button is not
-	NULL before using it.
-	(gnome_calendar_update_view_buttons): check button is not NULL.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw): got 12/24
-	hour format the wrong way round.
-
-2000-10-12  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	Store recurrence stuff on the desktop properly
-	(get_ical_day): Utility function
-
-2000-10-12  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component-factory.c: Disable the executive summary.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_entry): Take CalObjType
-	as a param because its impossible to determine after a delete.
-	(cal_backend_remove_object): Calculate CalObjType and pass
-	it to cal_backend_log_entry
-	(cal_backend_update_object): ditto
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): Kill
-	unused variables.
-	(add_archive_record): Don't kill the sync if this happens
-	(update_record): Kill old function
-	(replace_record): New function to handle replace_record signal
-	(conduit_get_gpilot_conduit): Listen for replace record signal
-	(add_record): Always add a new record, never replace
-	(replace_record): Always replace an existing record
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-2000-10-10  Jesse Pavel  <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: set a default size for the control.
-
-2000-10-10  Jesse Pavel  <jpavel@helixcode.com>
-
-	* gui/evolution-calendar.oafinfo: Added information about the
-	text/calendar MIME type, so that the evolution-calendar is called
-	to deal with iMIP attachments.
-
-	* gui/e-itip-control.[ch]: These files implement a Bonobo
-	control that will eventually deal with iMIP/iTIP messages from
-	the mailer. Right now, it's not working.
-
-	* gui/e-itip-control.glade: The Glade GUI for the above-mentioned
-	control.
-
-	* gui/Makefile.am: added references to the files I created.
-
-	* gui/main.c: called the initialization function of the Bonobo
-	control factory.
-
-2000-10-11  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* gui/task-assigned-to.xpm gui/task-assigned.xpm
-	gui/recur.xpm gui/task-recurring.xpm gui/task.xpm:
-	New versions of the icons for the tasklist/pad.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/component-factory.c (owner_unset_cb): don't free evolution_dir
-	as we need it to save the config settings.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/main.c (main): call calendar_config_write_on_exit() to write
-	out some special config settings (as the mail component does).
-
-	* gui/calendar-commands.c (properties_cmd): changed to use the new
-	preferences dialog.
-	(update_all_config_settings): new function to iterate over all the
-	calendars and update the config settings.
-
-	* gui/dialogs/cal-prefs-dialog.glade: preferences dialog.
-
-	* gui/dialogs/cal-prefs-dialog.[hc]: new files for the preferences
-	dialog.
-
-	* gui/calendar-config.[hc]: new files to handle loading/saving config
-	settings.
-
-	* cal-util/cal-recur.c: fixed bug in YEARLY when no filters were set,
-	plus minor changes.
-
-	* cal-util/test-recur.c: updated.
-
-	* gui/e-day-view-time-item.c:
-	* gui/popup-menu.c: update to #include <gal/widgets/e-gui-utils.h>
-
-	* gui/component-factory.c (owner_set_cb): called calendar_config_init.
-	(owner_set_cb):
-	(owner_unset_cb): updated the prototypes.
-
-	* gui/main.c (main): added call to calendar_config_write_on_exit().
-
-	* gui/component-factory.h:
-	* gui/component-factory.c (owner_set_cb): added global evolution_dir
-	just like the mail component, so we know we to store config stuff.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Fixed the column elements here.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Updated to use the new ETable
-	specification stuff.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (map_sax_start_element): The
-	element is "pilot_id" not "pilotid".  Update both maps
-	(compute_pid): Utility function to set a local records pid
-	(local_record_from_comp): Compute the pid and status here,
-	no longer use the old cal_component pilot interfaces
-	(free_match): Its a *local not a **local
-
-	* conduits/calendar/calendar-conduit.c: same as above
-
-	* conduits/todo/todo-conduit.h: Have both a uid and pid map
-
-	* conduits/todo/calendar-conduit.h: same as above
-
-2000-10-09  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/*: Adjust to using gnome-pilot-sync-abs conduit which
-	is based on the latest pilot link changes.
-
-2000-10-09  Iain Holmes  <iain@helixcode.com>
-
-	* Makefile.am: Added the executive-summary library and cflags
-
-	* gui/evolution-calendar.oafinfo: Added oaf servers for the
-	executive summary and executive summary factory.
-
-	* gui/calendar-summary.[ch]: New files to create the summary.
-
-	* gui/component-factory.c (summary_fn): Create the executive
-	summary component.
-	(component_factory_init): Start the summary factory as well.
-
-2000-10-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/weekday-picker.[ch]: New widget to pick weekdays.
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c: upd.
-	(calendar_control_activate): upd.
-	(calendar_control_deactivate): upd.
-
-2000-10-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: when the user types in a new event, don't create
-	it until the user hits Return or switches focus. Removed the
-	editing_new_event flags.
-
-	* cal-util/test-recur.c: rewritten to work on ics files. Now I can
-	start testing the recurrence code.
-
-	* cal-util/cal-recur.c: a few fixes.
-
-	* gui/e-day-view.c (e_day_view_check_if_new_event_fits): fixed to
-	return TRUE for long events, not FALSE.
-
-2000-10-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c (print_todo_details): As a temporary solution to the
-	to-do printing, just print the summaries.  We'll use the ETable
-	printing stuff later.
-
-	* gui/print.c (print_day_summary_cb): Use g_list_append() correctly.
-	(print_todo_details_cb): Likewise.
-	(print_day_summary): Initialize psi.events.  This code was
-	obviously never tested.
-	(print_todo_details): Likewise.
-	(print_day_details): Initialize pdi.slots.
-
-	* gui/print.c (range_selector_new): Fix strftime() %a versus %b
-	confusion.  Fixes bugzilla #644.
-	(range_selector_new): Fix the whole localization mess by making
-	better use of strftime().  Now we generate whole date strings at a
-	time and compose them later.  Fixes bugzilla #643.
-
-2000-10-02  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added support for the ROLE and RSVP parameters
-	in both the GUI and underlying iCal.
-
-2000-09-29  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added support for organizers in the meeting
-	scheduler.
-
-2000-09-29  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added code that makes changes to the underlying
-	iCAL structure of an event, when the user changes meeting information.
-
-	* gui/e-meeting-dialog.glade: this is the Glade UI for the meeting dialog
-	and accoutrements.
-
-2000-09-29  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.c: updated to support RDATE end times or
-	durations. Note that if you have two RDATEs with the same start times,
-	but with different end dates/durations set, the results are
-	unpredictable. So the event editor dialog should check for this.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	make strftime() strings translatable, and changed the formats a bit.
-
-	* NOTE: someone needs to check print.c to make sure strftime strings
-	are OK for i18n.
-
-	* gui/e-day-view.h: Changed EDayViewDateFormat enum. We now try to
-	include the weekday if possible. Also changed EDayView struct so we
-	store the month & weekdays with the longest names rather than the
-	actual widths. This helps i18n.
-
-	* gui/e-day-view.c (e_day_view_recalc_cell_sizes): used _() for
-	strftime strings, tried to see if weekday fits, and rearranged a
-	bit to make i18n easier.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): used _() for
-	strftime strings, and updated to use new formats.
-
-	* gui/calendar-model.c: added use_24_hour_format boolean to
-	CalendarModelPrivate so we can display dates in 12-hour format if
-	requested. This meant adding a CalendarModel argument to a few
-	functions. Also added get/set functions to set use_24_hour_format.
-	I suppose ideally we should have an ECellDate renderer and this option
-	should go there.
-
-2000-09-27  Jesse Pavel	  <jpavel@helixcode.com>
-
-	* gui/event-editor.c: changed a menu entry so that it will invoke
-	my meeting editor.
-
-	* gui/e-meeting-edit.[ch]: added these files to provide preliminary
-	support for iTIP meeting scheduling. Currently, only the GUI works;
-	there is not yet any backend support.
-
-	* gui/Makefile.am: added entries for e-meeting-edit.[ch]
-
-2000-09-24  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor-dialog.glade: set the height of the scrolled
-	window for the description field, since the default window height
-	doesn't seem to be working.
-
-	* cal-util/cal-component.h: added functions to get the actual
-	icalproperty lists for RRULE and EXRULE properties.
-
-	* cal-util/cal-recur.[hc]: added support for COUNT, though I need to
-	test it a bit. Also fixed the call to generate_instances_for_year() so
-	it uses the chunk dates.
-
-2000-09-20  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c: got rid of 1 '_' in '__Formatting'.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): upd.
-
-2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (verbs): Removed the "about calendar"
-	command, since we don't want to have both "About Evolution" and
-	"About Calendar".
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): _UIHandler
-	update.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (pre_sync): Don't fail if there
-	is no map file.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Add since field to context
-
-	* conduits/todo/todo-conduit.c (map_set_node_timet): New utility
-	function
-	(map_sax_start_element): Look for the map timestamp as well
-	(map_write): Write the map timestamp
-	(pre_sync): Use the map time stamp when looking for changed entries
-
-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Make sure
-	we are in a valid timestamp
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_name): Make the log file
-	name relevant to the actual calendar file, rather than just the
-	directory.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_log_entries): Oops
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_log_entries): Use a local
-	sax handler.
-
-	* conduits/todo/todo-conduit.c (pre_sync): Use xmlSAXParseFile
-	(map_sax_parse): Delete
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Properly
-	assign the CalObjChange type.
-	(cal_backend_log_sax_parse): Delete
-	(cal_backend_get_log_entries): Use xmlSAXUserParseFile
-
-2000-09-19  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_set_uri): New utility function
-	(cal_backend_load): use above
-	(cal_backend_create): use above
-	(cal_backend_log_name): Take a uri instead of a backend param
-
-	* pcs/cal-backend-file.c: Get rid of useless hash functions
-	(cal_backend_file_load): Check to make sure path exists and is
-	local
-	(cal_backend_file_load): Unref the current uri if there is one
-	(cal_backend_file_create): ditto
-
-	* pcs/cal-backend.c (cal_backend_last_client_gone): Sync before
-	shooting ourselves in the foot
-
-	* pcs/cal-backend-file.c (save): Fully implement backing up the
-	calendar before writing out the new entry.
-
-2000-09-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (check_for_slow_setting): Add some
-	other cases where a slow sync is in order
-	(pre_sync): Pre load the uids, the map and the add/mod/del lists
-	(match_record): Use the map hash to match records
-	(iterate): Iterate using the pre-loaded uid list
-	(iterate_specific): Iterate using the add/mod/del lists
-	(purge): Delete all entries in the del list
-	(set_status): Set status by adding to an appropriate list
-	(set_pilot_id): Set pilot_id by updating map hash
-
-	* conduits/todo/todo-conduit.h: Add lists for added, modified and
-	deleted objects
-
-	* conduits/todo/todo-conduit.c (map_name): Get the pilot_id->uid map
-	file name
-	(map_sax_start_element): SAX handler to extract a pilot_id->uid
-	mapping
-	(map_sax_parse): Parse the given file and build a pilot_id->uid hash
-	(map_write_foreach): Write out individual mapping elements
-	(map_write): Write out the pilot_id->uid mapping
-	(start_calendar_server_cb): Rename from gnome_calendar_load_cb
-
-	* conduits/todo/todo-conduit-config.h: Rename pilotID to pilot_id
-
-	* conduits/todo/e-todo.conduit.in: A little renaming
-
-	* conduits/todo/Makefile.am: Fix build slightly
-
-	* pcs/cal.c (build_change_seq): Build a corba sequence out of a list
-	of CalObjChanges
-	(Cal_get_objects_in_range): Implement new corba function
-
-	* pcs/cal-backend.c (cal_backend_init): Intiliaze to NULL
-	(cal_backend_load): Track the uri so we can write the log file
-	to the same place
-	(cal_backend_log_name): Figure out the log filename/path based on
-	the calendar uri
-	(cal_backend_set_node_timet): Set an xml node property value from
-	a time_t
-	(cal_backend_log_entry): Adds a log entry to list waiting to be written
-	out
-	(cal_backend_log_sync): Syncs the log entries to disk
-	(cal_backend_log_sax_start_element): SAX callback for reading in
-	log entries
-	(cal_backend_log_sax_end_element): ditto
-	(cal_backend_log_sax_parse): Main SAX parser call to parse the log
-	file looking for particular log entries and creating a CalObjChange
-	hash with the last change for each object
-	(cal_backend_get_log_entries): Returns a hash of objects of a given
-	type changed since the given time
-	(cal_backend_update_object): Add appropriate log entries
-	(cal_backend_remove_object): ditto
-	(cal_backend_get_changed_uids): Implement new idl interface call
-	(cal_backend_foreach_changed): Convert CalObjChange hash into a list
-
-	* pcs/cal-backend-imc.[hc]: Remove crufty files
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_type_by_uid): New
-	function that returns the CalObjType for a uid.
-
-	* cal-client/cal-client.h: Update prototypes.
-
-	* cal-client/cal-client.c (build_change_list): Build a list
-	of CalObjChange items from a corba sequence.
-	(cal_client_get_changed_uids): New accessor method for the
-	similarly named addition to the idl file.
-
-	* cal-util/cal-util.h: Update prototypes and add CalObjChangeType
-	enum.
-
-	* cal-util/cal-util.c (cal_obj_change_list_free): New utility
-	method to free a list of CalObjChange objects.
-
-	* idl/evolution-calendar.idl: Add get_changed_uids method
-	and associated types.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* gui/calendar-model.h, gui/e-calendar-table.c, gui/e-day-view.c,
-	gui/e-week-view-event-item.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/main.c,
-	gui/print.c, gui/dialogs/task-editor.c: Fixed the #include lines
-	to deal properly with gal.
-
-	* gui/check-filled.xpm: New file since we can't include it from
-	e-table anymore.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* gui/Makefile.am (INCLUDES): add datadir
-
-	* gui/calendar-commands.c (calendar_control_activate): use it.
-
-2000-09-14  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/.cvsignore: Shush
-
-2000-09-14  JP Rosevear  <jpr@helixcode.com>
-
-	* Add headers with GPL notice and credit copyright to those appropriate
-
-	* conduits/todo/todo-conduit-control-applet.c (doHelp): Update name,
-	authors, copyright for about dialog.
-	(activate_sync_type): Tidy
-
-	* conduits/todo/Makefile.am: Rename binaries and libs to e-todo*
-	to avoid conflicts.
-
-	* conduits/todo/e-todo.conduit.in: Reflect binary/lib name changes
-
-	* conduits/todo/e-todo-conduit-control-applet.desktop: ditto
-
-	* conduits/todo/todo.conduit.in: Removed
-
-	* conduits/todo/todo-conduit-control-applet.desktop: Removed
-
-	* conduits/todo/todo-conduit-config.h (todoconduit_load_configuration):
-	The config file will now be called e-todo-conduit
-	(todoconduit_save_configuration): ditto
-
-	* conduits/todo/todo-conduit.c: Some renaming to keep consistent.
-	(pre_sync): Remove commented out function that does not exist.
-
-	* conduits/todo/todo-conduit-control-applet.c: ditto
-
-	* conduits/todo/todo-conduit-config.h: ditto
-
-	* conduits/todo/todo-conduit.h: ditto
-
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c: Re-write most UI handler code.
-
-2000-09-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (obj_updated_cb): Removed an unused
-	variable.
-
-	* gui/calendar-model.c (obj_updated_cb): See if the new object
-	matches the type of objects we were told to deal with.
-	(load_objects): Likewise.
-
-2000-09-13  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (remove_component): Only remove the pilot
-	item from the hash if it exists in the first place.
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (add_component): plug leakage
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c: Hack to compile for distcheck.
-
-	* conduits/calendar/calendar-conduit.h: Remove calobj.h dependency
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_load): Use g_int_*
-	for now
-	(cal_backend_file_create): ditto
-
-	* conduits/todo/todo-conduit.c (local_record_from_compobject): Make
-	this actually fill in the todo record.
-	(find_record_in_repository): Add debug stuff
-	(iterate_specific): Use the already exisiting utility function
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id): correct
-	the status and id types. g_strdup the uid since this is not a
-	constified return
-	(cal_backend_file_get_uid_by_pilot_id): correct the id type
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Remove `ui.xml' stuff.
-
-	* pcs/cal-backend.c: Dont' #include calobj.h anymore as it's gone.
-
-2000-09-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): Connect to the
-	"cal_loaded" signal of the client here.
-	(connect_load): Removed function.
-	(disconnect_load): Removed function.
-	(cal_loaded_cb): Store the URI we are loading in the GnomeCal
-	structure instead of in a weird closure.  This gets rid of the
-	connect/disconnect mess as well.
-	(gnome_calendar_open): Store the URI in the GnomeCal.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-day-view.c: Fixed a warning (removed unused variable
-	gfloat width from e_day_view_get_event_position.)
-
-2000-09-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Handle renaming, header cleanup
-
-	* conduits/todo/todo-conduit.h: Rename GCalLocalRecord to
-	EToDoLocalRecord, header cleanup
-
-2000-09-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Use
-	description list instead of comment list for pilot todo note
-	(transmit): Check for null cal component properties, set priority
-	correctly, use description list instead of comment list.  Make
-	pilot record private when appropriate.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Only
-	set the due date only if it exists
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): Relying on the status
-	field is somewhat faulty since it is related to group scheduling
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (update_calendar_entry_in_repository):
-	Make log output a little more sensible
-	(comp_from_remote_record): Minor correction when making a CalComponent
-	from scratch.
-	(update_record): Use comp_from_remote_record for new items, rather
-	than repeating the code here.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Remove catch_ret_val function
-	since its no longer useful.  Fix naming of various fields from
-	the header changes.  Use GnomePilotRecord* stuff instead of
-	ICAL_PILOT_SYNC_*
-	(e_todo_context_new): Rename from gcalconduit_new_context. Now takes
-	a pilot id and loads the configuration here
-	(e_todo_context_destroy): Rename from gcalconduit_destroy_context.
-	Unref the client and destroy the configuration if they exist here
-	(start_calendar_server): Change the default calendar name
-	(local_record_from_comp_uid): Rename from local_record_from_ical_uid
-	(local_record_from_compobject): Rename from
-	local_record_from_icalobject.  Properly do the pilot id and status.
-	(comp_from_remote_record): Rename from ical_from_remote_record.
-	Handle due, complete, classification and pilot stuff properly
-	(pre_sync): Remove some old stuff.  We need to figure out how to
-	set some of the field values.
-	(set_status): Reflect pilot status changes from above
-	(conduit_destroy_gpilot_conduit): Remove cleanup stuff that is
-	now done by e_todo_context_destroy
-	(conduit_get_gpilot_conduit): Only set the context as object
-	data of the conduit.
-
-	* conduits/todo/todo-conduit.h: Rename GCalConduitContext to
-	EToDoConduitContext.  Remove some unused struct fields.
-	For GCalLocalRecord, rename ical to comp.
-
-2000-09-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor.c: changed to use EDateEdit.
-
-	* gui/dialogs/task-editor-dialog.glade: added "None" option to
-	Classification option menu, and used custom widgets for the date
-	entries so we can use EDateEdit widgets.
-
-	* gui/event-editor.c: changed to use EDateEdit. Note that this needs
-	to be fixed at some point to handle invalid dates, i.e. when
-	e_date_edit_get_time returns -1.
-
-	* gui/calendar-model.c (ensure_task_complete):
-	(ensure_task_not_complete): new functions to set the related properties
-	to make sure a task is marked as complete on not, i.e. "Date Completed"
-	"Status" and "Percent" properties.
-
-2000-09-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): use the status field rather
-	than the completed date, as it is more reliable.
-	(get_is_overdue): use get_is_complete().
-	(calendar_model_mark_task_complete): check if it is already complete,
-	and if so don't update it.
-
-	* cal-util/cal-component.c (cal_component_get_status):
-	(cal_component_set_status): added functions to support the STATUS
-	property. Also added the property to CalComponentPrivate and set it
-	to NULL in free_icalcomponent(). Someone should check my code as I've
-	mainly done a Cut & Paste job.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-	* conduits/todo/todo-conduit.c: Convert "//" style comments
-	(local_record_from_ical_uid): Remove iCalObject cruft
-	(ical_from_remote_record): ditto
-	(free_match): Properly unref the CalComponent
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_icalobject): Use
-	cal component pilot stuff properly
-	(find_record_in_repository): Remove cruft
-	(ical_from_remote_record): Remove cruft
-	(update_record): Set the vtype immediately after creation. Remove cruft
-
-	* conduits/todo/todo-conduit.h: Remove iCalObject stuff
-
-	* conduits/todo/todo-conduit-config.h: Move all the config stuff
-	here, I need to kill the warnings at some point
-
-	* conduits/todo/todo-conduit-control-applet.c (doRevertSettings):
-	Set all the state variables correctly on a revert
-	(doSaveSettings): Update original state
-	(doHelp): Rename from about_cb
-	(main): Destroy configurations when done
-
-	* conduits/todo/Makefile.am: Tidy
-
-	* pcs/cal-backend-file.c (cbf_pilot_hash): Function for hashing
-	pilot ids
-	(cbf_pilot_equal): For hash table of pilot ids
-	(cal_backend_file_destroy): Destroy pilot id hash
-	(add_component): Insert the uid into the pilot hash
-	(remove_component): Remove the uid from the pilot hash
-	(cal_backend_file_load): Create the pilot hash
-	(cal_backend_file_create): ditto
-	(cal_backend_file_get_uid_by_pilot_id): Implement using the pilot hash
-	(cal_backend_file_update_pilot_id): ditto
-
-	* cal-util/cal-component.h: Update prototypes
-
-	* cal-util/cal-component.c (cal_component_get_pilot_id): Implement
-	using ical X properties
-	(cal_component_set_pilot_id): ditto
-	(cal_component_get_pilot_status): ditto
-	(cal_component_set_pilot_status): ditto
-	(cal_component_free_pilot_id): Free a pilot id
-	(cal_component_free_pilot_status): Free a pilot status
-
-2000-09-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/dialogs/Makefile.am (INCLUDES): Add
-	`-I$(top_builddir)/libical/src/libical' so that we get
-	`icalversion.h' from the build directory instead of taking it from
-	the installation directory, which is of course Wrong (tm).
-	* gui/Makefile.am (INCLUDES): Likewise.
-
-2000-09-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (cal_loaded_cb): New function with the
-	loading/creation state machine.  It is carefully modelled after
-	the state machine that started the Universe, so bow before it.
-	(gnome_calendar_construct): Do not connect to cal_loaded here.
-	(connect_load): The closure for the cal_loaded callback is a bit
-	tricky, so provide a function to create it and connect to the
-	signal.
-	(disconnect_load): Disconnect from the signal and free the
-	closure.
-	(gnome_calendar_load_cb): Removed obsolete buggy function.
-	(gnome_calendar_open): Use the new mechanism.
-
-	* gui/control-factory.c (set_prop): The default filename is now
-	calendar.ics.
-
-2000-09-08  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (transmit): Use
-	icaltime_as_timet
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/cal-recur.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/getdate.y, gui/gncal-todo.c,
-	gui/gnome-cal.c, gui/dialogs/task-editor.c: Fixed some warnings.
-
-2000-09-08  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/Makefile.am: Tidy
-
-	* conduits/todo/Makefile.am: Tidy
-
-2000-09-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fall equinox cleanup!
-
-	OK, I know the equinox is not here yet, but weather has changed
-	enough to warrant it.
-
-	Sigh.  This place is definitely not the tropics.
-
-	* gui/gnome-cal.c (obj_updated_cb): Renamed from
-	gnome_calendar_object_updated_cb(); fixed prototype.
-	(obj_removed_cb): Renamed from gnome_calendar_object_removed_cb();
-	fixed prototype.
-	(GnomeCalendarPrivate): Moved all the GnomeCalendar fields to a
-	private structure so I don't have to rebuild the whole calendar
-	GUI directory every time something changes in the object.
-	(GnomeCalendarPrivate): Removed the property bag and the control
-	fields; they are local to the control-factory now.
-	(gnome_calendar_update_view_buttons): Remove the
-	ignore_view_button_clicks mess and just block the signal.
-	(gnome_calendar_set_view): Added a "focus" argument to indicate
-	whether we want the main widget in the specified view to grab the
-	focus.
-	(gnome_calendar_set_view_internal): Handle the focus argument here.
-	(gnome_calendar_set_view_buttons): Temporary hack to notify the
-	calendar about its buttons.
-	(gnome_calendar_get_selected_time_range): New function.
-	(gnome_calendar_get_cal_client): New function.
-
-	* gui/control-factory.c (calendar_properties_init): Keep the
-	property bag local to here; it does not need to be in the calendar
-	object yet.
-	(control_factory_fn): Renamed from control_factory().  Just use
-	control_factory_new_control().
-	(control_factory_new_control): Moved the stuff over from
-	create_control(), and keep the control local to here.  Check the
-	return value of bonobo_control_new().
-
-	* gui/calendar-commands.c (show_day_view_clicked): Remove the
-	ignore_view_button_clicks mess.
-	(new_calendar): Removed the useless "page" argument.
-	(calendar_control_activate): Use gnome_calendar_set_view_buttons()
-	for now.
-
-2000-09-07  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* cal-client/Makefile.am: Added -lunicode
-
-	* gui/dialogs/task-editor.c: More UTF-8 wrappers
-	(priority_index_to_value): Kill warning, add assertion
-
-2000-09-06  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	Use new cal_component_has_recurrences convenience function
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): ditto
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	ditto
-
-	* gui/calendar-model.c (calendar_model_value_at): ditto
-	(calendar_model_value_at): ditto
-
-	* gui/e-day-view.c (e_day_view_on_event_click): ditto
-	(e_day_view_on_event_right_click): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_reshape_day_event): ditto
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	ditto
-
-	* gui/e-day-view.c (e_day_view_on_long_event_click): ditto
-
-2000-09-06  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances): Use
-	new convenience functions and only get the recurrence
-	stuff if needed.  Free the recurrence stuff if used.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-component.h: Add new prototypes
-
-	* cal-util/cal-component.c (cal_component_has_exrules): Utility
-	function to determine whether a cal component has any exrules
-	(cal_component_has_exdates): Ditto for exdates
-	(cal_component_has_exceptions): Utility function to determine
-	whether a cal component has any exception rules
-	(cal_component_has_recurrences):Utility function to determine
-	whether a cal component has any recurrence rules
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Kill all exdates if
-	there are no dates in the box
-
-	* cal-util/cal-recur.c (generate_instances_for_year): Add a special
-	case for when there are exceptions but no rrules or rdates.
-	(cal_obj_remove_exceptions): Use date only compare func
-	(cal_obj_date_only_compare_func): New compare function that
-	compares the date only, not the time.
-
-	* gui/event-editor.c (dialog_to_comp_object): Need a break for the
-	yearly recurrence type
-	(dialog_to_comp_object): We need to allocate icaltimetypes for the
-	exdate list
-	(fill_widgets): Handle a weekly recurrence with no particular day set
-	(dialog_to_comp_object): Kill all rrules if "None" is selected as
-	the recurrence type by the user
-
-2000-09-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_open_task): uses the new
-	TaskEditor dialog.
-
-	* gui/dialogs/task-editor.[hc]:
-	* gui/dialogs/task-editor-dialog.glade: updated. Still need to fix the
-	'Status' property (CalComponent doesn't support it yet), and use a
-	replacement for GnomeDateEdit, since we need to support setting 'None'
-	as the date.
-
-2000-09-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c (obj_updated_cb):
-	(obj_removed_cb): compare the updated object's uid with the one we
-	are editing, and just return if it doesn't match.
-
-2000-09-01  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): added check to see
-	if the client has loaded successfully. Gets rid of a few warnings.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (generate_instances_for_year): The exdate
-	and rdate lists are a list of icaltimetypes, not CalComponentPeriods
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): The exdate list
-	is a list of icaltimetypes, not CalComponentDateTimes
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Append
-	the exdate to the list AFTER we create the date value.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_free_recur_list): Free
-	the data, not the list element.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances): Compute
-	the event duration using the event start/end times, not the
-	interval times.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_from_icalrecurrencetype): Check
-	to see if r->enddate is (time_t)-1 and set to 0 if so
-
-2000-09-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* conduits/calendar/Makefile.am (INCLUDES): Add libical include
-	directories and `$(BONOBO_GNOME_CFLAGS)'.
-	* conduits/todo/Makefile.am (INCLUDES): Likewise.
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/event-editor.c: e_utf8 wrappers
-
-	* gui/gncal-todo.c: e_utf8_wrappers
-
-2000-09-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c,
-	conduits/todo/todo-conduit.c, gui/e-week-view.c, gui/gnome-cal.c:
-	Fixed some warnings.
-
-2000-09-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new): Use
-	gnome_calendar_construct() so that we can check for proper
-	creation of the client.
-	(gnome_calendar_destroy): Check that the client exists before we
-	unref it.
-	(gnome_calendar_construct): Do the CalClient creation here.  Bind
-	the views to it here as well instead of in setup_widgets().
-	(gnome_calendar_init): Call setup_widgets() here.
-
-	* gui/e-calendar-table.c (e_calendar_table_destroy): Unref the
-	model.
-
-2000-09-01  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Update for new libical.
-	Conduits should atleast compile now.
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-	* Makefile.am: Build the conduits only when they've been
-	enabled.
-
-2000-09-01  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c: Make toolbar save and close button.
-	We should put a similar menu option in sometime.
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (array_to_list): Use
-	ICAL_RECURRENCE_ARRAY_MAX instead of MAX_SHORT
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Implement delete option
-	(dialog_to_comp_object): Set the weekday start value and use
-	local not UTC time
-
-2000-08-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): No need to spit a warning
-	if removal fails.
-	(event_editor_destroy): Free the exception clist data.  Unref the
-	calendar client here.
-	(close_dialog): Just call gtk_object_destroy() on the event
-	editor; the destroy handler will free everything else.
-
-	* cal-client/cal-client.c (cal_client_object_exists): Removed
-	function; this is not useful because we operate asynchronously.
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): No need to
-	spit a warning if removal fails.
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.
-
-	* gui/calendar-model.c (calendar_model_delete_task): Likewise.
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Implement delete option
-	(recurrence_toggled): Make an ugly hack to get the recurrence
-	pages showing properly since we don't yet implement all of the
-	recurrence rule stuff.
-
-	* cal-client/cal-client.c (cal_client_object_exists): New function
-	to see if an object exists and is obtainable from the backend
-
-	* cal-client/cal-client.h: Add prototype
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (editor_closed_cb): Event editor destroyed
-	callback to do hash cleanup
-	(gnome_calendar_edit_object): Set event editor calendar client.
-
-	* gui/event-editor.h: Add new prototype
-
-	* gui/event-editor.c: Trash signal stuff.  We will manipulate
-	the client directly.  Make the toolbar save and menu save items
-	work identically.  Add icons to the toolbar.
-	(save_event_object): Call cal_client_update_object
-	(close_dialog): Unref the client and disconnect signals
-	Actually destroy the event editor object.
-	(obj_updated_cb): New function.  Doesn't really do anything
-	yet but it will inform the user the event has changed elsewhere
-	in the future.
-	(obj_removed_cb): ditto
-	(event_editor_set_cal_client): New function to set the calendar
-	client
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): Commit
-	the sequence to the cal component and use non UTC times.
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/print.c: Countless small changes for gnome-print 0.21+
-
-2000-08-30  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.[hc]:
-	* gui/e-day-view-main-item.c:
-	* gui/e-week-view.[hc]:
-	* gui/e-week-view-main-item.c:
-	* gui/calendar-commands.c:
-	* gui/gnome-cal.[hc]: switched to using new ECalendar widget,
-	and a few other fixes.
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.h (GnomeCal): Removed unused field event_editor.
-
-	* gui/e-day-view.c (e_day_view_key_press): Oops, set the
-	dtstart/dtend on the component before adding it.
-	(e_day_view_on_editing_stopped): No need to check for an UID.
-	Update the summary properly.
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c: Make sure the is_utc flag is always
-	FALSE for icaltime_from_timet
-	(e_week_view_on_unrecur_appointment): Use icaltimetype struct
-	from the stack and make sure tzid is always NULL
-	(e_week_view_key_press): ditto
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c: Make sure the is_utc flag is always
-	FALSE for icaltime_from_timet
-	(e_day_view_on_unrecur_appointment): Use icaltimetype struct
-	from the stack and make sure tzid is always NULL
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-client/cal-client.c (add_instance): Actually add the
-	comp_instance struct to the instances list.  We now appear
-	to able to keep events and todos between sessions. Yay!
-
-2000-08-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	Now the views monitor the client by themselves; it does not make
-	sense to proxy all notifications through the GnomeCal.  The
-	GnomeCal should just be a meta-widget that holds all the views.
-
-	At some later point we'll want to decouple the views from the
-	GnomeCal so that they can be embedded anywhere; they should emit
-	signals to request appropriate actions from the toplevel GUI
-	instead of calling the GnomeCal directly.
-
-	* gui/e-day-view.c (e_day_view_set_cal_client): New function; now
-	the day view monitors the client by itself.
-	(cal_loaded_cb): New callback; moved over from
-	e_day_view_update_all_events().
-	(obj_updated_cb): New callback; moved over from
-	e_day_view_update_event().
-	(obj_removed_cb): New callback; moved over from
-	e_day_view_remove_event().
-	(e_day_view_update_all_events): Removed function.
-	(e_day_view_update_event): Removed function.
-	(e_day_view_remove_event): Removed function.
-	(*): Use the day_view->client directly instead of fetching it from
-	the GnomeCal.
-	(e_day_view_destroy): Unref the client.
-	(e_day_view_reload_events): Check if the client is loaded.
-	(e_day_view_key_press): Set the vtype of the new component.
-
-	* gui/e-week-view.c (e_week_view_set_cal_client): New function.
-	(cal_loaded_cb): New callback.
-	(obj_updated_cb): New callback.
-	(obj_removed_cb): New callback.
-	(e_week_view_update_all_events): Removed function.
-	(e_week_view_update_event): Removed function.
-	(e_week_view_remove_event): Removed function.
-	(*): Use the week_view->client directly.
-	(e_week_view_destroy): Unref the client.
-	(e_week_view_reload_events): Check if the client is loaded.
-
-	* gui/gnome-cal.c (setup_widgets): Set the cal_client on all the
-	views.
-	(gnome_calendar_update_all): Do not update the views, since now
-	they do it themselves.
-	(gnome_calendar_object_updated_cb): Likewise.
-	(gnome_calendar_object_removed_cb): Likewise.
-	(setup_widgets): Remove all to-do list cruft.
-	(gnome_calendar_colors_changed): Likewise.
-	(gnome_calendar_todo_properties_changed): Likewise.
-
-	* gui/calendar-commands.h (todo_style_changed): Removed variable.
-
-	* gui/gncal-todo.c: Removed old clist cruft; just left in the
-	temporary dialog box for now.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* cal-client/client-test.c:
-	* cal-client/cal-client.c:
-	* conduits/todo/todo-conduit.h:
-	* conduits/calendar/calendar-conduit.h: remove USING_OAF checks.
-
-2000-08-29  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use
-	event_editor_set_event_object
-
-	* gui/event-editor.c (event_editor_set_event_object): Rename
-	from event_editor_set_ical_object
-
-	* gui/event-editor.h: Update prototype
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment):
-	Call cal_component_commit_sequence after event changes. Default
-	to these being all day events.
-
-2000-08-29  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): These are not UTC
-	times
-
-2000-08-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_is_loaded): New function.
-	We need this from code that dynamically updates from a client and
-	could not have connected to the "cal_loaded" signal right after
-	the client was created.
-
-	* gui/calendar-model.c (load_objects): Do not try to load the
-	objects if the client has not been loaded yet.
-	(cal_loaded_cb): Check the status value.
-
-	* gui/calendar-model.h (CalendarModel): Declare the private
-	structure here so that gdb will give me love.
-
-	* pcs/cal-factory.h (CalFactory): Likewise.
-
-	* pcs/cal.h (Cal): Likewise.
-
-	* cal-client/cal-listener.h (CalListener): Likewise.
-
-	* cal-client/cal-client.h (CalClient): Likewise.
-
-	* pcs/cal-backend.h (CalBackend): This no longer has a private
-	structure, so remove it.
-
-	* cal-util/Makefile.am (libcal_util_la_SOURCES): Removed the
-	vCalendar and old iCalendar cruft.
-	(libcal_utilinclude_HEADERS): Likewise.
-	Removed the obsolete iCalendar test program.
-
-2000-08-28  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/timeutil.h: We no longer need time_from_icaltimetype
-	as libical has the API for this
-
-	* cal-util/timeutil.c: ditto
-
-	* cal-util/cal-recur.c: Replace time_from_icaltimetype with
-	icaltime_as_timet
-
-	* gui/calendar-model.c: ditto
-
-	* gui/event-editor.c: ditto
-
-	* gui/gnome-cal.c: ditto
-
-2000-08-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (remove_component): Remove the
-	icalcomponent from the toplevel calendar here.
-	(cal_backend_file_update_object): Do not remove it here.
-	(cal_backend_file_remove_object): Do not remove it here.
-	(add_component): Add the icalcomponent to the toplevel calendar if
-	asked to.
-	(cal_backend_file_update_object): Do not add it here.
-
-2000-08-28  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Initiliaze tzid to
-	null, only set recurrence rules and exception dates if there
-	are any
-
-2000-08-27  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (save): Write out the calendar object
-	(cal_backend_file_update_object): Remove/add the icalcomponent
-	from our master icalcomponent (the calendar)
-	(cal_backend_file_remove_object): Remove the icalcomponent
-	from our master icalcomponent
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/Makefile.am: Remove gnorba stuff
-
-	* gui/main.c: ditto
-
-	* gui/component-factory.c: ditto
-
-	* gui/control-factory.c: ditto
-
-	* gui/*.gnorba: ditto
-
-2000-08-25  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Uncomment
-	debug code.
-
-	* gui/calendar-model.c (set_complete): Set the completed
-	date to the current date
-	(calendar_model_set_value_at): Handle complete field
-
-2000-08-25  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): Don't attempt to
-	free this if its null
-	(calendar_model_duplicate_value): Implement for summary field
-	value
-	(calendar_model_initialize_value): Remove debug code
-
-	* gui/e-calendar-table.c: Correct etable init xml
-	(create_column): Pass the id to e_table_header_add_column
-	rather than a hard coded one
-	(e_calendar_table_init): Make sure summary column isn't
-	added twice.  Add an alarms column, else etable won't
-	work with columns who have an ID higher than that
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gncal-todo.c (ok_button): Properly append to list
-
-	* gui/event-editor.c (dialog_to_comp_object): ditto
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): The base
-	times are not UTC
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): ditto
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* Update for libical 0.19
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-commands.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/prop.c:
-	Fixed some warnings.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): Do not alloc
-	the struct icaltimetype but point to one on the stack.  More
-	importantly, set the date.tzid to NULL.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (save_event_object_cb): Make signal
-	names saner
-	(released_event_object_cb): ditto
-	(gnome_calendar_edit_object): ditto
-
-	* gui/event-editor.h: Make signal names saner
-
-	* gui/event-editor.c (event_editor_class_init): Make signal
-	names saner now that we don't use ical object
-	(save_event_object): ditto with callback names
-	(file_save_cb): ditto
-	(tb_save_and_close_cb): ditto
-	(event_editor_set_ical_object): ditto
-
-	* gui/e-day-view.c (e_day_view_update_event): Umm,
-	!= CAL_COMPONENT_EVENT (I hope that wasn't me!)
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Do not alloc
-	the struct icaltimetype but point to one on the stack.  More
-	importantly, set the date.tzid to NULL.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Remove owner field
-
-	* gui/event-editor.c (clear_widgets): Forget about owner field
-	(get_widgets): ditto
-	(fill_widgets): ditto
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_initialize_value): Handle
-	summary field
-	(calendar_model_value_is_empty): ditto
-	(calendar_model_free_value): ditto
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Remove status bar
-
-	* cal-util/cal-component.c (cal_component_set_rrule_list): Allow
-	a null list
-	(cal_component_set_rdate_list): Allow a null list
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Commit
-	the CalComponent sequence
-
-2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c: #include <e-util/e-cursors.h>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw):
-	Initialize time_min_x1 and hour_r to keep gcc happy.
-
-	* gui/e-day-view.c (e_day_view_update_event_label): Warning fix.
-	(e_day_view_update_main_canvas_drag): Initialize start_row.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw):
-	Initialize time_y_small_min, icon_x.
-
-	* Makefile.am (SUBDIRS): Re-enable the gui directory.
-
-	* gui/prop.c (prop_store_alarm_default_values): Temporarily #if 0
-	out.
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_key_press): Set vtype of new
-	CalComponent
-	(e_week_view_on_new_appointment): ditto
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): ditto
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-time-item.c: Include gnome.h for gettext purposes
-
-	* gui/gnome-cal.c: ditto
-
-	* gui/prop.c: #if out some alarm stuff
-
-2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Updated
-	function.
-	(e_calendar_table_open_task): Updated function.
-
-2000-08-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_duplicate_value): Updated
-	function.
-	(calendar_model_free_value): Updated function.
-	(calendar_model_initialize_value): Updated function.
-	(calendar_model_value_is_empty): Updated function.
-	(remove_object): Updated function.
-	(obj_updated_cb): Updated function.
-	(calendar_model_get_cal_client): Added inline docs.
-	(calendar_model_delete_task): Updated.
-	(calendar_model_mark_task_complete): Updated.
-	(calendar_model_get_cal_object): Updated.
-
-2000-08-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (set_categories): New function.
-	(parse_time): Moved over from the old set_time_t().  This just
-	parses the time and leaves the warning dialog for the caller.
-	(set_datetime): New function.
-	(set_geo): Updated old function.
-	(set_percent): Updated old function.
-	(set_priority): Updated old function.
-	(set_summary): New function.
-	(set_url): New function.
-	(calendar_model_set_value_at): Updated function.
-	(calendar_model_is_cell_editable): Updated function.
-	(calendar_model_append_row): Updated.  Added an ugly hack to
-	accomodate ETable's lack of a real API for adding new items.
-	Also, don't try to set columns that are not editable.
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_reload_events):
-	Use CalObjType
-
-	* gui/e-day-view.c (e_day_view_reload_events): ditto
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-top-item.c (e_day_view_top_draw_long_event):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.h: Update prototypes
-
-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment):
-	Remove commented out portions.
-
-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment):
-	Tidy.
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c
-	(e_day_view_update_event): Use CalComponent
-	instead of iCalObject.  Work around not having a compare
-	dates routine for two CalComponents.
-	(e_day_view_reshape_long_event): Use CalComponent instead
-	of iCalObject, #if some alarm stuff
-	(e_day_view_reshape_day_event): ditto
-	(e_day_view_reload_events): Use revamped CalClient
-	(e_day_view_update_event_cb): Use CalComponent
-	instead of iCalObject
-	(e_day_view_foreach_event_with_uid): ditto
-	(e_day_view_remove_event_cb): ditto
-	(e_day_view_update_event_label): ditto
-	(e_day_view_find_event_from_uid): ditto
-	(e_day_view_on_event_click): ditto
-	(e_day_view_on_event_right_click): ditto
-	(e_day_view_on_new_appointment): ditto
-	(e_day_view_on_edit_appointment): ditto
-	(e_day_view_on_delete_occurrence): ditto
-	(e_day_view_on_delete_appointment): ditto
-	(e_day_view_on_unrecur_appointment): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_free_event_array): ditto
-	(e_day_view_add_event): ditto
-	(e_day_view_key_press): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_update_top_canvas_drag): ditto
-	(e_day_view_update_main_canvas_drag): ditto
-	(e_day_view_on_drag_data_get): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2000-08-20  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-20  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_update_event): Use CalComponent
-	instead of iCalObject.  Work around not having a compare
-	dates routine for two CalComponents.
-	(e_week_view_reload_events): Use revamped CalClient
-	(e_week_view_reshape_event_span): Use CalComponent instead
-	of iCalObject, #if some alarm stuff
-	(e_week_view_update_event_cb): Use CalComponent instead of
-	iCalObject
-	(e_week_view_foreach_event_with_uid): ditto
-	(e_week_view_remove_event_cb): ditto
-	(e_week_view_free_events): ditto
-	(e_week_view_add_event): ditto
-	(e_week_view_on_editing_stopped): ditto
-	(e_week_view_find_event_from_uid): ditto
-	(e_week_view_key_press): ditto
-	(e_week_view_show_popup_menu): ditto
-	(e_week_view_on_new_appointment): ditto
-	(e_week_view_on_edit_appointment): ditto
-	(e_week_view_on_delete_occurrence): ditto
-	(e_week_view_on_delete_appointment): ditto
-	(e_week_view_on_unrecur_appointment): ditto
-
-	* gui/e-week-view.h: Update prototypes.
-
-2000-08-18  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.h: Update prototypes.
-
-	* gui/event-editor.c: Need to come back here later to fix the
-	alarm stuff.  The gui also needs to be completely redone to
-	support the fancier CalComponent settings (exrules, rdates, etc)
-	There are some warnings that I put in to mark some of these
-	spots
-	(event_editor_destroy): Use Calcomponent instead
-	of iCalObject
-	(make_title_from_comp): ditto
-	(clear_widgets): ditto
-	(fill_widgets): ditto
-	(classification_get): ditto
-	(dialog_to_comp_object): ditto
-	(save_ical_object): ditto
-	(close_dialog): ditto
-	(event_editor_set_ical_object): ditto
-
-2000-08-17  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gncal-todo.c (ok_button): Use CalComponent instead of
-	iCalObject
-	(cancel_button): ditto
-	(gncal_todo_edit): ditto
-	(add_todo): ditto
-	(edit_todo): ditto
-	(delete_todo): ditto
-	(insert_in_clist): ditto
-	(gncal_todo_update): ditto
-
-	* gui/gncal-todo.h: Update prototypes
-
-2000-08-16  JP Rosevear  <jpr@helixcode.com>
-
-	Rework gnome-cal.c - alarms are a tad broken ATM so this
-	will need more cleaning later.
-
-	* gui/gnome-cal.c (snooze): Use CalComponent instead of
-	iCalObject
-	(edit): ditto
-	(audio_notification): ditto
-	(display_notification_cb): Use CalComponent member of
-	alarm_notify_closure rather than iCalObject
-	(display_notification): ditto
-	(trigger_alarm_cb): ditto.  Use CalComponent alarm types
-	(gnome_calendar_tag_calendar_cb): New
-	cal_client_generate_instances callback to
-	mark_gtk_calendar_day's
-	(gnome_calendar_tag_calendar): Use above callback
-	(save_ical_object_cb): Use CalComponent instead of
-	iCalObject
-	(gnome_calendar_edit_object): ditto
-	(gnome_calendar_new_appointment): ditto
-
-2000-08-15  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/mark.c (mark_month_item_cb): Callback used to mark every
-	event in a month.
-	(mark_month_item): Use cal_client_generate_instances with
-	above callback
-
-2000-08-15  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/print.c (print_month_small): Use
-	cal_client_get_objects_in_range
-	(print_day_details_cb): Callback used to create columns and fill
-	events into a day view.  Code should be shared with e-day-view
-	in reality.  Maybe need to go back to layout.[hc] a bit later
-	(print_day_details): Use cal_client_generate_instances with
-	above callback. Iterate over results to expand events to fit.
-	(print_day_summary_cb): Callback to build list of event info
-	for a day
-	(print_day_summary): Use cal_client_generate_instances with
-	above callback to generate the required event info for printing
-	(print_todo_details_cb): Callback used create list of todo info
-	(print_todo_details): Use cal_client_generate_instances with
-	above callback to generate required todo info for printing.
-
-	* gui/layout.[hc]: No longer used.
-
-2000-08-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (get_is_overdue): Finished implementing.
-	(calendar_model_value_at): Handle the color field.
-
-2000-08-11  Seth Alves  <alves@hungry.com>
-
-	* cal-util/cal-component.c (cal_component_get_pilot_id):
-	(cal_component_set_pilot_id):  stubs for pilot id accessors
-	(cal_component_get_pilot_status):
-	(cal_component_set_pilot_status): stubs for pilot status accessors
-
-	* conduits/calendar/calendar-conduit.c (transmit): start to
-	convert to cal-component interface
-
-	* conduits/todo/todo-conduit.c (transmit): same
-
-2000-08-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (get_geo): Generate a prettier string for
-	the geographical position.
-	(get_classification): New function.
-	(get_categories): New function.
-	(get_completed): New function.
-	(get_dtend): New function.
-	(get_dtstart): New function.
-	(get_due): New function.
-	(get_percent): New function.
-	(get_priority): New function.
-	(get_summary): New function.
-	(get_transparency): New function.
-	(get_url): New function.
-	(get_has_alarms): New function.
-	(get_has_recurrences): New function.
-	(get_is_complete): New function.
-	(get_is_overdue): New function.
-
-	* cal-util/cal-component.c (scan_property): Handle the GEO
-	property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_geo): Likewise.
-	(cal_component_set_geo): Likewise.
-	(cal_component_free_geo): Likewise.
-	(cal_component_set_exdate_list): Removed incorrect assertion.
-	(cal_component_set_exrule_list): Removed incorrect assertion.
-	(cal_component_get_next_alarm): Oops, this had not been
-	implemented at all.
-	(cal_component_has_rdates): New function.
-	(cal_component_has_rrules): New function.
-
-	* cal-util/cal-component.h (CalComponentField): Added the GEO
-	property.
-
-2000-08-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the
-	PERCENT-COMPLETE property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_percent): Likewise.
-	(cal_component_set_percent): Likewise.
-	(cal_component_free_percent): Likewise.
-	(scan_property): Handle the PRIORITY property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_priority): Likewise.
-	(cal_component_set_priority): Likewise.
-	(cal_component_free_priority): Likewise.
-
-	* cal-util/cal-component.h (CalComponentField): New enumeration
-	with the list of fields we support for ETable.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component-factory.c (owner_set_cb): Update prototype.
-
-2000-08-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): New function.
-	Mostly moved over from calendar-commands.c:display_objedit().
-
-	* gui/calendar-commands.c (calendar_iterate): Removed.  Wheee!
-	(display_objedit): Removed.
-	(new_appointment_cb): New function.  Just call
-	gnome_calendar_new_appointment().
-	(display_objedit_today): Removed.
-	(calendar_control_activate): Removed the "New appointment for
-	today" option, since it is pretty useless.
-
-2000-08-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_generate_instances): There.
-	A pretty function to generate recurrence instances atomically so
-	that clients don't have to jump through hoops.  Now we can get rid
-	of the ugly calendar_iterate() function.
-
-2000-08-09  Cody Russell  <bratsche@gnome.org>
-
-	* gui/calendar-commands.c: Make the toolbar honor the user's
-	gnomecc settings for detachable toolbars.
-
-2000-08-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/alarm.c (pop_alarm): Oops, subtract the new alarm's trigger
-	time from the current time.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-client/cal-client.c: Fixed a warning.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-client/cal-client.c, gui/e-calendar-table.c, pcs/cal.c:
-	Fixed some warnings.
-
-2000-08-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (Cal): Added a get_objects_in_range()
-	method.  Takes in a time range and the type of component we are
-	interested in; returns a list of UIDs.  The idea is that
-	ocurrences get computed in the client; we can have multiple
-	recurrences in iCalendar and we cannot identify them trivially
-	across the wire.
-	(Cal): Removed the get_events_in_range() method.
-
-	* pcs/cal-backend.c (cal_backend_free_uid_list): New function.
-	(cal_backend_get_objects_in_range): New function.
-	(cal_backend_get_events_in_range): Removed.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_objects_in_range):
-	Implemented new method.
-	(cal_backend_file_get_events_in_range): Removed.
-
-	* pcs/cal.c (Cal_get_events_in_range): Removed.
-	(uncorba_obj_type): New function.
-	(Cal_get_uids): Use uncorba_obj_type().
-	(Cal_get_n_objects): Likewise.
-	(Cal_get_objects_in_range): Implemented new method.
-
-	* cal-client/cal-client.c (cal_client_get_events_in_range): Removed.
-	(cal_client_get_objects_in_range): Implemented.
-	(corba_obj_type): New function.
-	(cal_client_get_n_objects): Use corba_obj_type().
-	(cal_client_get_uids): Likewise.
-
-2000-08-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_clone): New function.
-	(cal_component_get_icalcomponent): Ensure that the SEQUENCE
-	property does not need incrementing.
-
-	* gui/dialogs/alarm-notify-dialog.c (alarm_notify_dialog): Use
-	CalComponent.  Deal with an empty summary property.
-
-2000-08-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_as_string): Doh,
-	libical owns the string's memory, so do not free it.
-
-	* cal-client/client-test.c (create_client): Connect to the destroy
-	signal of the client here.
-
-	* cal-client/test.ics: New test file, modified from Eric Busboom's
-	test file from RFC 2445.
-
-2000-08-05  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/client-test.c (dump_component): This was gone for
-	some reason.
-	(main): Load a new test file.
-
-2000-08-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_commit_sequence): New
-	function to commit changes to the SEQUENCE property.
-	(cal_component_get_as_string): Ensure that the sequence has been
-	committed.
-
-	* cal-client/cal-client.c (cal_client_get_object): Use
-	CalComponent instead of the old iCalObject.
-	(cal_client_update_object): Use iCalObject.  Commit the SEQUENCE
-	property before stringifying the object and piping it over to the
-	Wombat.
-
-2000-08-04  Seth Alves  <alves@hungry.com>
-
-	* conduits/todo/todo-conduit.c (conduit_get_gpilot_conduit): if
-	oaf isn't initialized by the time the conduit starts, start it
-	up.  we do this because we need to start wombat with oaf, and
-	gpilotd doesn't currently start oaf.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): unref.
-
-2000-08-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_uid_by_pilot_id):
-	Added stub for now.
-	(cal_backend_file_update_pilot_id): Likewise.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Removed cal-backend-imc.[ch]
-	from the list of sources.  The idea is to move vCalendar importing
-	to the GUI as a convenience function.
-
-2000-08-02  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id): call
-	save (cbimc) after setting the pilot id and status.
-
-2000-08-02  Joe Shaw  <joe@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id):
-	Fixed a g_return_if_fail that had two parameters and thus
-	wouldn't build.
-
-2000-08-03  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_append_row): updated to match
-	the new ETableModel append_row. This meant we could also get rid of
-	the row_being_added and idle_id hack.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Emit "model_pre_change" signals as
-	appropriate.
-
-2000-08-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.[ch]: New files for the iCalendar file
-	backend.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-file.[ch].
-
-	* cal-util/cal-component.c (cal_component_set_icalcomponent):
-	Return an operation success code for if we are passed a component
-	of a type we don't support.
-
-2000-07-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-recur.c (*): Use CalComponent and the new property
-	types instead of the old iCalObject stuff.
-	(cal_recur_generate_instances): Renamed from
-	cal_object_generate_events().  Ensure that the component has the
-	DTSTART property.
-	(generate_instances_for_year): Renamed from
-	cal_object_generate_events_for_year().
-	(cal_obj_expand_recurrence): Made static.
-	(cal_recur_from_icalrecurrencetype): New function.  We should
-	really convert this whole file to use struct icalrecurrencetype
-	instead.
-	(cal_recur_free): New function.
-
-	* cal-util/cal-recur.h (CalRecurType): Renamed from CalObjRecurType.
-	(CalRecurrence): Renamed from CalObjRecurrence.
-
-	* cal-util/timeutil.c (time_from_icaltimetype): New function.
-
-	* cal-util/Makefile.am: Commented out the test-recur program.
-
-2000-08-01  Damon Chaplin  <damon@helixcode.com>
-
-	* Removed doc directory, since it is the old gnome-pim docs which
-	aren't used any more.
-
-	* Makefile.am (SUBDIRS): removed doc.
-
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-
-	* gui/calendar-model.c: compile fix for Solaris
-	(works under Linux, too; don't know about others)
-
-	* this is a test of whether CVS merge does what I
-	think it will do.
-
-2000-07-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	OK, it seems that we have all the interesting properties for
-	single-user calendars now.  RFC 2445 can bite me.
-
-	* cal-util/cal-component.c (scan_property): Handle the RRULE
-	property.  Yay!.
-	(scan_recur): Likewise, yow!
-	(get_recur_list): Likewise, yeehaw!
-	(get_recur_list): Likewise, honk honk!
-	(set_recur_list): Likewise, booooga booooga!
-	(cal_component_get_rrule_list): Likewise, squeek squeek!
-	(cal_component_set_rrule_list): That's it, I ran out of sounds.
-	(cal_component_free_recur_list): Likewise.
-	(scan_property): Handle the EXRULE property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_exrule_list): Likewise.
-	(cal_component_set_exrule_list): Likewise.
-	(set_period_list): Oops, free the old properties as well as
-	removing them.
-	(set_text_list): Ditto.
-	(cal_component_set_exdate_list): Ditto.
-
-	* cal-util/cal-component.c: Put all the functions used to free
-	returned values all together.
-	(cal_component_set_rdate_list): Oops, mark SEQUENCE property to be
-	incremented since the RFC requires it.
-	(scan_property): Handle the EXDATE property.
-	(scan_exdate): Likewise.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_exdate_list): Likewise.
-	(cal_component_set_exdate_list): Likewise.
-	(cal_component_free_exdate_list): Likewise.
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/Makefile.am: Fixed a typo
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/Makefile.am: Added a few xpm files to the EXTRA DIST section
-
-2000-07-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_free_period_list): New function.
-	(scan_property): Handle the RDATE property.
-	(scan_period): Likewise.
-	(free_icalcomponent): Likewise.
-	(get_period_list): Likewise.
-	(set_period_list): Likewise.
-	(cal_component_get_rdate_list): Likewise.
-	(cal_component_set_rdate_list): Likewise.
-	(scan_text): Simplify a bit since we only handle the ALTREP
-	parameter; there is no need to iterate over all parameters.
-	(scan_datetime): Simplify; just handle the TZID parameter.
-	(scan_summary): Simplify; just handle the ALTREP parameter.
-	(cal_component_get_as_string): New function.
-
-	* idl/evolution-calendar.idl (CalObjType): Removed the TYPE_OTHER;
-	now we only expose the types of objects we know about.
-
-	* cal-util/cal-util.h (CalObjType): Likewise.
-
-	* cal-client/cal-client.c (cal_client_get_n_objects): Likewise.
-	(cal_client_get_uids): Likewise.
-
-	* conduits/calendar/calendar-conduit.c (get_calendar_objects): Likewise.
-	(check_for_slow_setting): Likewise.
-
-	* pcs/cal-backend-imc.c (count_objects): Likewise.
-	(build_uids_list): Likewise.
-
-	* pcs/cal.c (Cal_get_uids): Likewise.
-	(Cal_get_n_objects): Likewise.
-
-2000-07-25  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.[hc]: new ECalendarTable to show an ETable view
-	for Todo/Event items.
-
-	* gui/task-assigned-to.xpm:
-	* gui/task-recurring.xpm:
-	* gui/task-assigned.xpm:
-	* gui/task.xpm: new pixmaps (all the same at present) to go in the
-	icon column of the ETable.
-
-	* gui/event-editor.c: hid the silly 'Calendar' labels on the
-	GnomeDateEdits and hid the times when you select 'All day event'.
-	Also adjusted the time_t's so that when an all day event finishes on
-	say midnight 13th May, we show 12th May in the dialog, since it
-	implicitly includes all of that day up to midnight.
-
-	* gui/dialogs/task-editor-dialog.glade:
-	* gui/dialogs/task-editor.[hc]: unfinished dialog to edit tasks.
-
-	* gui/gncal-todo.c: temporary hack so that we can use the simple dialog
-	with our new ETable.
-
-2000-07-23  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.h: added a few more fields.
-
-	* cal-util/calobj.c (ical_object_create_from_vobject): check for a
-	NULL return from vObjectUStringZValue for URL property to avoid SEGV.
-	For some reason an empty 'URL:' property appears and causes trouble.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Update for the new
-	`evolution_shell_component_new()' arg.
-
-2000-07-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger):
-	Finish filling the trigger.  What a pain, again.
-	(cal_component_alarm_free_trigger): Implemented.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-
-	* conduits/calendar/calendar-conduit-control-applet.desktop:
-
-	* conduits/todo/todo-conduit-control-applet.desktop:
-		Added the Turkish desktop entries.
-
-2000-07-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_free): Free the
-	icalcomponent if this is an unattached alarm.
-	(scan_alarm_property): Handle the TRIGGER property.
-	(cal_component_alarm_get_trigger): Ditto.  Royal pain.
-	(cal_component_alarm_set_trigger): Ditto.  Less pain.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_get_object): Fixed inline
-	docs.
-	(cal_client_new): Ditto.
-	(cal_client_get_n_objects): Added inline docs.
-
-2000-07-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (CalComponentAlarm): New internal
-	represntation for alarm components.  We really don't map them to a
-	CalComponent because it is more convenient to handle them as
-	"child" structures.
-	(make_alarm): New function to create a CalComponentAlarm from an
-	icalcomponent representing a VALARM.
-	(scan_alarm_property): New function to scan a property from an
-	alarm component.  We support ACTION.
-	(cal_component_get_first_alarm): New function to start an iterator
-	over the alarms in a calendar component.
-	(cal_component_alarm_get_action): New function.
-	(cal_component_alarm_set_action): New function.
-
-2000-07-13  Seth Alves  <alves@hungry.com>
-
-	* conduits/todo/todo-conduit.c: conduit based on the calendar conduit.
-	this conduit syncs a pilot's ToDoDB database to wombat's list of "todo"
-	events.
-
-	* gui/gncal-todo.c (simple_todo_editor): set todo's priority control
-	based on value from ical object during edit.
-
-2000-07-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c: Revert Michael's GnomeFont patch until the
-	gnome-print API stabilizes.
-
-2000-07-12  Michael Meeks  <michael@helixcode.com>
-
-	* gui/print.c (titled_box, print_text, print_month_small),
-	(bound_text): GnomeFont update.
-
-2000-07-12  Seth Alves  <alves@hungry.com>
-
-	* conduits/calendar/calendar-conduit.c: fixed various problems
-
-	* cal-client/Makefile.am: build a static version of the library
-	to link with the conduits
-
-	* cal-util/Makefile.am: same
-
-2000-07-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the COMPLETED
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_completed): Ditto.
-	(cal_component_set_completed): Ditto.
-	(scan_property): Handle the TRANSPARENCY property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_transparency): Ditto.
-	(cal_component_set_transparency): Ditto.
-	(scan_property): Handle the URL property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_url): Ditto.
-	(cal_component_set_url): Ditto.
-
-	* pcs/cal-factory.c (queue_load_create_job): Removed unneeded
-	check for the URI.
-	(load_fn): Be more paranoid about the URI and notify the listener
-	if we got passed a bad URI.  Simplify the termination code a bit.
-	(create_fn): Likewise.
-	(queue_load_create_job): Be more paranoid about the URI.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Remove pilot stuff for now.
-
-	* Makefile.am (SUBDIRS): Remove `conduits'.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/Makefile.am (EXTRA_DIST): remove gnomecal.conduit
-
-	* conduits/calendar/Makefile.am (EXTRA_DIST): We want
-	calendar.conduit.in, not calendar.conduit.
-
-2000-07-10  Seth Alves  <alves@hungry.com>
-
-	* gui/Makefile.am (SUBDIRS):
-	* conduits/calendar/Makefile.am: moved calendar-conduit stuff from
-	the gui directory to here.
-
-	* Makefile.am (SUBDIRS): added conduits to SIBDIRS
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Remove
-	"close calendar" command.
-
-2000-07-08  Anders Carlsson  <andersca@gnu.org>
-
-	* gui/e-week-view.c (e_week_view_on_button_press): Handle mouse wheel scrolling.
-
-	* gui/e-day-view.c (e_day_view_on_time_canvas_button_press): New function to handle
-	mouse wheel scrolling.
-	(e_day_view_on_main_canvas_button_press): Handle mouse wheel scrolling.
-
-2000-07-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the SEQUENCE
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_sequence): Ditto.
-	(cal_component_set_sequence): Ditto.
-	(cal_component_free_sequence): Ditto.
-	(cal_component_set_last_modified): Removed incorrect assertion.
-	(CalComponentPrivate): New need_sequence_inc flag.  The sequence
-	number must be incremented when certain properties change, so we
-	store a flag that says if we need to bump it when piping the
-	object over the wire.
-	(free_icalcomponent): Reset need_sequence_inc.
-	(cal_component_set_dtstart): Set need_sequence_inc.
-	(cal_component_set_dtend): Ditto.
-	(cal_component_set_due): Ditto.
-
-2000-07-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the
-	LAST-MODIFIED property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_last_modified): Ditto.
-	(cal_component_set_last_modified): Ditto.
-	(get_icaltimetype): New function to get struct icaltimetype
-	values.
-	(cal_component_get_created): Use get_icaltimetype().
-	(set_icaltimetype): New function to set struct icaltimetype
-	values.
-	(cal_component_set_created): Use set_icaltimetype().
-
-	* cal-util/cal-component.c (scan_property): Handle the CREATED
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_free_icaltimetype): Ditto.
-	(cal_component_get_created): Ditto.
-	(cal_component_set_created): Ditto.
-	(cal_component_init): Do not create an UID here.
-	(ensure_mandatory_properties): New function to ensure that the
-	mandatory RFC properties are indeed in the component.  If they are
-	not, we create them on the fly.
-	(cal_component_set_new_vtype): Use ensure_mandatory_properties().
-	(cal_component_set_icalcomponent): Ditto.
-	(cal_component_get_uid): Return the UID in a parameter, not as a
-	function return value, for consistency's sake.
-	(scan_property): Handle the DTSTAMP property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_dtstamp): Ditto.
-	(cal_component_set_dtstamp): Ditto.
-
-2000-07-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gncal-todo.c (gncal_todo_update): Use &obj instead of &ico in
-	the call to cal_client_get_object(). The ToDo list should work now.
-
-	* gui/event-editor-dialog.glade: set the toplevel GnomeApp to invisible
-	so it doesn't appear and then resize.
-
-2000-07-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_summary): Use
-	CalComponentText instead of CalComponentPropSummary.  Removed the
-	latter typedef.
-	(cal_component_set_summary): Likewise.
-	(scan_property): Handle the CLASSIFICATION property.
-	(cal_component_get_classification): Ditto.
-	(cal_component_set_classification): Ditto.
-
-	* cal-util/cal-component.c (cal_component_free_text_list): Renamed
-	from cal_component_free_description_list().  We can share this
-	function since both comments and descriptions have the same form.
-	(scan_text): Ditto.
-	(get_text_list): New function.
-	(set_text_list): New function.
-	(cal_component_get_description_list): Use get_text_list().
-	(cal_component_set_description_list): Use set_text_list().
-	(cal_component_set_uid): Add sanity check.
-	(cal_component_get_summary): Ditto.
-	(cal_component_get_description_list): Ditto.
-	(cal_component_get_dtstart): Ditto.
-	(cal_component_get_dtend): Ditto.
-	(cal_component_get_due): Ditto.
-	(scan_property): Handle the COMMENT property.
-	(cal_component_get_comment_list): Ditto.
-	(cal_component_set_comment_list): Ditto.
-
-2000-07-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_categories): Handle CATEGORIES.
-	This can appear multiple times, so we maintain a list.  We
-	compress them later to a single property with multiple values.
-	(cal_component_get_categories_list): Ditto.
-	(cal_component_set_categories_list): Ditto.
-	(cal_component_free_categories_list): Ditto.
-	(free_icalcomponent): Properly free the mappings.
-
-2000-07-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_datetime): Handle date/time and
-	timezone pairs.
-	(scan_property): Handle DTSTART and DTEND.
-	(cal_component_free_datetime): Ditto.
-	(get_datetime): Ditto.
-	(cal_component_get_dtstart): Ditto.
-	(set_datetime): Ditto.
-	(cal_component_set_dtstart): Ditto.
-	(cal_component_get_dtend): Ditto.
-	(cal_component_set_dtend): Ditto.
-	(scan_property): Handle DUE date.
-	(cal_component_get_due): Ditto.
-	(cal_component_set_due): Ditto.
-
-2000-07-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_description_list):
-	Handle the DESCRIPTION property.  There can be multiple
-	descriptions with parameters each, so we deal with a list instead
-	of a single structure.
-	(cal_component_set_description_list): Ditto.
-	(cal_component_free_description_list): Ditto.
-	(scan_property): Ditto.
-	(scan_description): Ditto.
-
-2000-06-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_summary): To avoid
-	passing a million parameters to setters/getters for properties
-	that support parameters, we now pass client-side structures
-	instead.  Here we use CalComponentPropSummary.
-	(cal_component_set_summary): Ditto.
-
-2000-06-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component-factory.c: Make calendar die when evolution quits.
-
-2000-06-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c: Change of plans.  We use an
-	icalcomponent from libical as our core representation so that we
-	can preserve extension fields and fields that we don't (yet)
-	support.  CalComponent is just a wrapper with a nice API that
-	provides non-iterative, random access to the ical's fields.
-	(cal_component_destroy): Free the thing correctly.
-	(cal_component_get_vtype): Re-implement in terms of icalcomponent.
-	(cal_component_set_icalcomponent): New function to set the
-	CalComponent's data from an existing icalcomponent.
-	(cal_component_get_icalcomponent): New function.
-	(cal_component_set_new_vtype): New convenience function to create
-	an empty component.
-	(scan_icalcomponent): Core scanning function.
-	(scan_property): Another core scanning function.
-	(cal_component_get_uid): Use the property directly.
-	(cal_component_get_summary): Ditto.  Handle the altrep parameter
-	as well.
-	(cal_component_set_summary): Ditto.  Feel the pain, motherfucker.
-	It is ridiculous how much code this involves.
-	(scan_summary): Ditto.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am: Do not link and include the pilot stuff for the
-	calendar component, just for the Pilot conduit.  Commented out the
-	Pilot part so that Evolution can build.  Sigh, we'll have to
-	modify gnome-pilot to use OAF.
-
-2000-06-29  Peter Williams  <peterw@helixcode.com>
-
-	* gui/Makefile.am (LINK_FLAGS): Make the calendar-pilot-sync
-	program conditional on HAVE_GNOME_PILOT, and add
-	GNOME_PILOT_CFLAGS, GNOME_PILOT_LIBS, and PISOCK_LIBS in the
-	appropriate places.
-
-2000-06-29  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal.c (Cal_get_uid_by_pilot_id):
-	(Cal_update_pilot_id):
-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id):
-	(cal_backend_imc_get_uid_by_pilot_id):
-	* pcs/cal-backend.c (cal_backend_get_uid_by_pilot_id):
-	(cal_backend_update_pilot_id):  server code to service these:
-
-	* gui/calendar-pilot-sync.c: updated to make use of cal-client.
-	also uses dirty bits on both sides to aid in syncing.
-
-	* cal-client/cal-client.c (cal_client_get_uid_by_pilot_id): new
-	function -- ask the cal server to return uid given an object's
-	pilot id.
-	(cal_client_update_pilot_id): new function -- inform the
-	cal server of an objects pilot id and pilot dirty-flag.
-
-2000-06-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.[ch]: New files for the new iCalendar
-	component object.  Today's properties: basic component type, UID,
-	SUMMARY.
-
-	* cal-util/Makefile.am: Added cal-component.[ch] to the list of
-	sources.
-
-2000-06-27  Michael Meeks  <michael@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES): use BONOBO_VFS_GNOME_CFLAGS.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Added an #ifdefed value_to_string handler
-	assignment.
-
-2000-06-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_duplicate_value):
-	Implement.
-	(calendar_model_initialize_value): Implement.
-	(calendar_model_value_is_empty): Implement.
-
-2000-06-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_reshape_long_event): set event before
-	using it!
-	(e_day_view_init): used new colors from tigert.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-day-view.c, gui/e-week-view.c: Remove the usage of the "x"
-	and "y" arguments.
-
-2000-06-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_direction): changed so it keeps the
-	selection range. It just moves it on one day/week etc. This makes
-	it very handy for the keyboard shortcut code.
-
-	* gui/calendar-commands.c (calendar_control_activate): fixed bug
-	setting the radio button active.
-
-	* gui/e-day-view.[hc]: added support for keyboard navigation and
-	selection of the time range.
-
-2000-06-20  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_set_value_at): Implemented.
-	(calendar_model_is_cell_editable): Implemented.
-
-	* cal-client/cal-client.c (cal_client_update_object): Take in an
-	iCalObject instead of a stringified version.
-
-	* gui/gnome-cal.c (gnome_calendar_update_object): Removed.
-	(gnome_calendar_remove_object): Removed.
-	(save_ical_object_cb): Use the CalClient function.
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_finish_long_event_resize): Likewise.
-	(e_day_view_finish_resize): Likewise.
-	(e_day_view_key_press): Likewise.
-	(e_day_view_on_editing_stopped): Likewise.
-	(e_day_view_on_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-	(e_day_view_on_delete_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise.
-	(e_week_view_key_press): Likewise.
-	(e_week_view_on_delete_occurrence): Likewise.
-	(e_week_view_on_unrecur_appointment): Likewise.
-	(e_week_view_on_delete_appointment): Likewise.
-
-	* gui/gncal-todo.c (ok_button): Likewise.
-	(delete_todo): Likewise.
-
-2000-06-19  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor-dialog.glade: tidied up dialog a bit, adding
-	space etc.
-
-	* gui/e-week-view.c (e_week_view_reshape_events): removed debug msg.
-
-2000-06-18  Ettore Perazzoli <ettore@helixcode.com>
-
-	* cal-util/Makefile.am (INCLUDES): Include from
-	`$(top_builddir)/libical/src/libical' too.  [For the generated
-	libical `icalversion.h' header.]
-	* cal-client/Makefile.am (INCLUDES): Likewise.
-
-2000-06-18  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received):
-	fixed a DnD bug.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* cal-client/Makefile.am (INCLUDES): Fix to not depend on
-	installed ical.h
-
-2000-06-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view.c: added little buttons which are shown when there
-	are more events than will fit in a day. Clicking on the button takes
-	the user to the 1-Day view and shows the full day.
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: set the "use_ellipsis" arg to TRUE for the EText
-	items so we get tooltips automatically. Though we may want to use our
-	own code to show tooltips so we can show the tips when the mouse is
-	around the edges of the event box, and we may want to show the start
-	and end times of the event in full.
-
-	* gui/calendar-commands.c (calendar_control_activate):
-	* gui/gnome-cal.h: added view_toolbar_buttons[] so we can access the
-	radio buttons in the code easily. We need this if we want to jump to
-	another view programmatically.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/jump.xpm: new icon for the EWeekView to jump to the day.
-
-	* gui/Makefile.am (EXTRA_DIST): added jump.xpm
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_class_init): #ifdef'ed out
-	references to functions which don't exist yet, so evolution still
-	compiles.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/test-recur.c: updated.
-
-	* cal-util/cal-recur.[hc]: mostly finished, though it depends on the
-	iCalObject struct being updated to support more of iCalendar.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* pcs/.cvsignore: added icalendar-test.
-
-2000-06-15  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/Makefile.am (test_recur_LDADD): use libical.a
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* cal-util/Makefile.am (noinst_PROGRAMS): merge the two separate
-	noinst_PROGRAMS declarations into one so automake accepts it.
-	(INCLUDES): include libical src dir so we don't depend on having
-	ical.h already installed
-
-2000-06-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c: GPtrArray cannot insert stuff in the
-	middle of the array (!), so use plain GArray everywhere.  Sigh.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_get_object): Use vCalendar
-	again.
-
-	* cal-util/calobj.c (ical_object_find_in_string): From Seth, make
-	it use vCalendar again.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (obj_updated_cb): Juggle some eggs in
-	asynchronous fashion.  Finished implementing.
-	(obj_removed_cb): Implemented.  This one needs no juggling.
-	(calendar_model_set_cal_client): Only load the objects if we have
-	a client.
-	(calendar_model_destroy): Disconnect from the client's signals.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	calendar-model.[ch] to the list of sources.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects): Doh,
-	return the computed value.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (CalendarModelPrivate): Added the array of
-	objects and the hash table of UID->array index.
-	(calendar_model_row_count): Return the length directly from the
-	array instead of asking the Wombat.
-	(calendar_model_value_at): Implemented.
-	(calendar_model_new): Create an empty model.  We provide a new
-	setter function now.
-	(calendar_model_construct): Removed function.
-	(calendar_model_set_cal_client): New function to set the calendar
-	client and object type at any time.  This lets us reuse a calendar
-	model object.
-
-	* cal-util/calobj.h (iCalObjectField): Just report whether the
-	object has alarms; not every single alarm.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_calendar_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Pass NULL for the new args
-	@create_folder_fn and @remove_folder_fn.
-	(create_view): Updated to match the new
-	`EvolutionShellComponentCreateViewFn'.  Return
-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if type is not
-	"calendar".
-
-2000-06-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (Cal): Added a get_n_objects()
-	method.
-
-	* pcs/cal-backend.c (cal_backend_get_n_objects): New function.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects):
-	Implemented.
-
-	* pcs/cal.c (Cal_get_n_objects): Implemented.
-
-	* cal-client/cal-client.c (cal_client_get_uids): Free the ev.
-	(cal_client_get_n_objects): Implemented.
-
-	* cal-util/calobj.h (iCalObjectField): New enumeration to identify
-	the fields in an iCalObject.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (event_editor_destroy): Free the private
-	structure.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_to_vobject): Allow for NULL
-	summaries.
-
-2000-06-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (toolbar): Added missing tooltips.  We still
-	need icons, though.
-
-2000-06-07  Seth Alves  <alves@hungry.com>
-
-	* cal-util/calobj.c (ical_object_find_in_string): put this back in,
-	it's still used in cal-backend-imc.c:cal_backend_imc_update_object
-
-	* cal-client/cal-client.c (cal_client_get_object): instead of
-	returning a text representation, decode the text and return an
-	iCalObject.  Also added CalClientGetStatus which indicates
-	success or type of failure.
-
-	* cal-util/calobj.c (ical_object_find_in_string): #ifed out
-	ical_object_find_in_string since it is unused now.
-
-	* cal-client/client-test.c (list_uids): track get_object change
-	* gui/calendar-commands.c (calendar_iterate): same
-	* gui/e-day-view.c (e_day_view_update_event): same
-	* gui/e-week-view.c (e_week_view_update_event): same
-	* gui/print.c (print_day_details): same
-	(print_day_summary): same
-	(print_todo_details): same
-	* gui/gnome-cal.c (trigger_alarm_cb): same
-	* gui/gncal-todo.c (gncal_todo_update): same
-
-2000-06-06  Seth Alves  <alves@hungry.com>
-
-	* cal-util/icalendar.c, icalendar-save.c: fixed a bunch of problems
-	* cal-util/calobj.c (ical_object_find_in_string): use libical
-	instead of libversit
-	(ical_object_to_string): same
-	(dump_icalobject): prints the contents of an icalobject for debugging
-
-	* gui/Makefile.am (LINK_FLAGS): link libical.a instead of libical.la
-	so we don't have to modify the build system of the released libical
-	* cal-client/Makefile.am (client_test_LDADD): same
-	* cal-util/Makefile.am (icalendar_test_LDADD): same
-
-2000-06-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_destroy): Removed from the public
-	header; made static.  Now everyone should use refcounting.
-
-	* pcs/cal-backend-imc.c (free_ical_object): Use
-	ical_object_unref().
-	(remove_object): Likewise.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (print): New function to call the print
-	engine.
-	(calendar_toolbar): Added the Print button.
-	(calendar_control_activate): Added the File/Print item.
-
-	* gui/e-day-view.c (e_day_view_get_selected_time_range): Allow
-	start_time and end_time to be NULL.
-
-	* gui/e-week-view.c (e_week_view_get_selected_time_range):
-	Likewise.
-
-	* gui/print.c (range_selector_new): Show the range selector
-	widgets.  Use the correct radio group for all of them!
-	(print_calendar): Do the dialog box here.  We may want to split
-	this function later into smaller chunks.
-
-2000-06-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_button_press):
-	allow the right button to popup the menu, even when the event is
-	being edited.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: Set the keyboard focus to the EDayView/EWeekView
-	when the right button is clicked, so that any event being edited is
-	saved before any action (e.g. opening the Event Editor dialog) is
-	started. Note that this won't work if we switch to asynchronous
-	notification.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (tb_save_and_close_cb): Implemented.
-	(toolbar): Added an icon for the Save and Close command.
-	(save_ical_object): Recompute the title of the window here.  Maybe
-	it would be better to do it when we actually get the
-	"object_changed" signal from the CalClient.
-	(file_close_cb): Implemented.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (save_ical_object_cb): Implemented.
-	(gnome_calendar_add_object): Removed function, since it was
-	identical to gnome_calendar_update_object().  Modified the rest
-	of the code to use only the latter.
-	(gnome_calendar_remove_object): Be more paranoid about the UID.
-	(gnome_calendar_update_object): Ditto.  Also, renamed this
-	function from gnome_calendar_object_changed(), for consistency
-	with the lower-level CalClient interface.
-
-	* gui/event-editor.c (event_editor_class_init): New
-	"save_ical_object" signal to ask that our parent store the
-	calendar object to the backend.
-	(save_ical_object): New function to save the calendar object,
-	actually if just emits the signal.
-	(file_save_cb): Implemented.
-	(dialog_to_ical_object): We want priv->
-	alarm_program_run_program_entry (i.e. the entry inside the
-	GnomeFileEntry), not the file entry itself.
-	(dialog_to_ical_object): Only insert the recurrence ending date if
-	the event is recurrent!
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Fixed EXTRA_DIST.
-
-2000-06-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (editor_closed_cb): Handler for the
-	"editor_closed" signal of the event editor; we just destroy it
-	then.
-
-	* gui/event-editor.c (app_delete_event_cb): Callback used when the
-	dialog is closed.  Release the iCalObject here instead of the
-	event editor's destroy handler, and emit the new "editor_closed"
-	signal.
-
-2000-06-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Change of plans.  The toplevel
-	GnomeApp is now generated with Glade instead of being created in
-	the program code.  Otherwise we can't migrate the accelerators to
-	the new toplevel and they won't work.
-
-	* gui/event-editor.[ch]: EventEditor now derives from GtkObject.
-	This lets us use the GnomeApp created by libglade and still have
-	signals and stuff.
-
-	* gui/event-editor.c (create_menu): Tell the UI handler that the
-	menubar is the GnomeApp's existing one, not to create a new one.
-	(create_toolbar): Tell the UI handler to use the GnomeApp's
-	existing toolbar.
-	(event_editor_focus): New function to raise/focus an event editor.
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use
-	event_editor_focus().
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Put the
-	toolbar into a frame to make it look like standard GNOME toolbars.
-	Also, set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not
-	do evil things when its moved to the left or the right of the
-	window.
-
-2000-05-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.h (GnomeCalendar): Added a hash table to map
-	calendar objects to their respective event editors.
-
-	* gui/gnome-cal.c (gnome_calendar_init): Create the
-	object_editor_hash.
-	(gnome_calendar_destroy): Free the object_editor_hash.
-	(gnome_calendar_edit_object): New function to centralize the
-	launching of event editors; if one already exists for a particular
-	calendar object, we just raise its window.
-	(edit): Use gnome_calendar_edit_object().
-
-	* gui/calendar-commands.c (display_objedit): Use
-	gnome_calendar_edit_object().
-	(display_objedit_today): Likewise.
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Likewise.
-	(e_day_view_on_edit_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): Likewise.
-	(e_week_view_on_edit_appointment): Likewise.
-
-	* gui/event-editor.c (event_editor_new): Do not take in an
-	iCalObject; rather provide an event_editor_set_ical_object()
-	function.  We need this because a single editor may be switched
-	between different calendar objects.  Also, do not show the event
-	editor; leave it up to the client code.
-	(event_editor_construct): Likewise.
-	(clear_widgets): New function to clear the widgets to default
-	values.
-	(fill_widgets): New function to fill in the widgets from the
-	iCalObject.  We don't do this in init_widgets() anymore.
-	(free_exception_clist_data): New function to free the exceptions
-	clist data.  We were leaking the row data.
-	(init_widgets): Hook to the destroy signal of the exceptions
-	clist.
-	(event_editor_set_ical_object): New function.  Now it also makes a
-	copy of the calendar object for the event editor; clients do not
-	need to copy it anymore.
-	(event_editor_destroy): Unref the UI handler as well.
-	(event_editor_class_init): New "ical_object_released" signal to
-	notify the parent that we are no longer editing the calendar
-	object.
-	(make_title_from_ico): Handle NULL objects.
-
-	* gui/event-editor.h (EventEditor): Removed fields that are no
-	longer used.
-
-2000-05-31  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/Makefile.am: added test-recur test program.
-
-	* cal-util/test-recur.c: new file to test the recurrence code.
-
-	* cal-util/.cvsignore: added test-recur.
-
-	* cal-util/cal-recur.c: updated.
-
-2000-05-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (event_editor_construct): Create the UI
-	handler after we have constructed the parent GnomeApp.
-	(main_menu): Menu template is now in place.
-	(toolbar): Tollbar template is now in place.
-	(create_toolbar): Turn off labels in the toolbar since it sucks;
-	it should support non-homogeneous buttons with horizontal icons
-	and text.
-
-2000-05-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_object_changed): Removed the
-	flags argument, since now we just proxy the calendar object to the
-	calendar client.
-
-	* gui/event-editor.c (alarm_unit_get): Moved over from
-	event-editor-utils.c.
-
-	* gui/event-editor-utils.[ch]: Removed files, since the two
-	functions that were left there (i.e. the ones not present in
-	e-dialog-widgets) can simply be moved to event-editor.c.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed
-	event-editor-utils.[ch] from the list of sources.
-
-2000-05-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-utils.c: Moved many functions to
-	e-util/e-dialog-widgets.c.
-
-2000-05-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Put the main notebook directly
-	under a simple GtkWindow.  We are going to pull out the notebook
-	and slap it into our custom-built GnomeApp, anwyays.
-
-	* gui/event-editor.c: Made the EventEditor derive from GnomeApp.
-	Added a BonoboUIHandler for its menu and toolbar.
-	(make_title_from_ico): Create a nice title for the window.
-	(get_widgets): Fetch the Glade widgets here instead of all over
-	the place.
-	(event_editor_new): Temporary hack to show the dialog here, just
-	so that I can test it.
-
-	* gui/Makefile.am (EXTRA_DIST): Added the Glade messages file.
-
-2000-05-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (init_bonobo): Do not initialize libglade twice.
-
-	* gui/component-factory.c (create_view): Set the folder_uri
-	property, otherwise the calendar will not get loaded into the
-	view.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/main.c: Make it so that warnings don't crash calendar.
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar-control.c: Removed.
-
-	* gui/main.c: New.
-
-	* gui/control-factory.c: New.
-	* gui/control-factory.h: New.
-
-	* gui/calendar-component-factory.c: New.
-	* gui/calendar-component-factory.c: New.
-
-	* gui/evolution-calendar-control.c (calendar_control_factory):
-	Renamed from `calendar_factory'.
-	(calendar_control_factory_init): Renamed from
-	`calendar_factory_init'.
-
-	* gui/Makefile.am: Link with the files from `$(builddir)/shell'.
-
-	* gui/evolution-calendar.gnorba: New.
-	* gui/evolution-calendar.oafinfo: New.
-
-2000-05-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c (range_selector_new): New function to create the
-	custom range selector.
-	(print_dialog): New function to show the print dialog.
-	(print_calendar): Use the print dialog.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added libepaned.a.
-
-	* gui/gnome-cal.c: Switched from GtkPaned to EPaned.
-
-2000-05-22  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_get_events_in_range): Removed
-	function.
-
-	* gui/mark.c (mark_month_item): Use
-	cal_client_get_events_in_range().
-
-	* gui/calendar-commands.c (show_year_view_clicked): Comment out,
-	since we don't have a year view.
-
-	* gui/gnome-cal.c (setup_widgets): Removed the year view stuff.
-	(gnome_calendar_get_current_view_name): Likewise.
-	(gnome_calendar_update_view_times): Likewise.
-	(gnome_calendar_direction): Likewise.
-	(gnome_calendar_set_view): Likewise.
-	(gnome_calendar_update_all): Likewise.
-	(gnome_calendar_object_updated_cb): Likewise.
-	(gnome_calendar_object_removed_cb): Likewise.
-	(gnome_calendar_time_format_changed): Likewise.
-	(gnome_calendar_get_current_time_range): Likewise.
-
-	* gui/gnome-cal.h (GnomeCalendar): Removed the year view stuff.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added layout.[ch],
-	print.[ch].  Removed quick-view.[ch], year-view.[ch] since they
-	are no longer used.  Removed all the old Pilot crap.
-
-2000-05-20  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.[hc]: new files to implement iCalendar recurrence
-	rules. These are only part finished, but people may like to check that
-	the architecture seems OK.
-
-2000-05-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence):
-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): use a copy of
-	the iCalObject so we detect the change in the "update_event" callback.
-	Maybe we should just update the view ourselves and then we wouldn't
-	need to detect any change in the callback.
-
-	* cal-util/calobj.c (ical_object_reset_recurrence): new function to
-	get rid of any recurrence rules. Used when we 'unrecur' an event.
-
-	* gui/e-day-view.c (e_day_view_key_press): don't add a new event if it
-	won't fit, or we end up adding a new event for each key press.
-	(e_day_view_update_event_label): don't update it if it doesn't have
-	an EText item (i.e. it isn't visible).
-
-	* gui/e-day-view-time-item.c: allow selection of times using this
-	column.
-
-2000-05-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/timeutil.c (time_add_minutes): Fixed warning message.
-	(time_add_day): Likewise.
-	(time_add_month): Likewise.
-	(time_add_year): Likewise.
-	(time_from_day): Of all functions, *this* one had to have a bug.
-	Set the tm.tm_isdst to -1 to specify that we don't know whether
-	the time is in DST or not.  This fixes *many* bugs upstream.
-	(time_week_begin): Likewise.  We never noticed this since the week
-	functions are never used.
-	(time_week_end): Likewise.
-
-2000-05-17  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.c: hooked up more widget signals to callbacks
-	to the gladified dialog acts more like the original one.
-
-2000-05-16  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.c (recurrence_toggled): hook the radio buttons
-	to the pages of the notebook.
-	(append_exception):
-	(recurrence_exception_added):
-	(recurrence_exception_deleted):
-	(recurrence_exception_changed): code to deal with the recurrence
-	exception list.
-
-2000-05-15  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.[ch]: gladeified replacement for eventedit.c
-
-	* gui/event-editor-utils.[ch]: utilities used by event-editor.c
-
-	* gui/event-editor-dialog.glade: glade file used by event-editor.c
-
-2000-05-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (display_notification): Use the alarm
-	notification dialog.
-	(display_notification_cb): New callback for the result of the
-	alarm notification dialog.
-
-	* gui/dialogs/alarm-notify.glade: New file with the alarm
-	notification dialog.
-
-	* gui/dialogs/alarm-notify-dialog.[ch]: New file.
-
-	* gui/dialogs/Makefile.am: New file.
-
-	* gui/Makefile.am (SUBDIRS): Added the dialogs directory.
-
-2000-05-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (trigger_alarm_cb): Better error checking, and
-	plug leaks of str_ico and ico.
-
-	* gui/evolution-calendar-control.c (main): Initialize libglade.
-
-2000-05-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES): Add
-	`-I$(top_builddir)/libical/src/libical'.
-
-2000-05-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (generate): Use a (dtend - dtstart) offset to
-	compute the ending time of the occurrence.  This takes care of
-	recurring events that span multiple days.  Also, removed the DST
-	condition since it did not look right at all:  if you have a daily
-	appointment at 18:00, it still should happen at 18:00 even during
-	daylight savings.
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): Use the timeutil
-	functions instead of calculating the month's times by hand.  Use
-	cal_obj_instance_list_free() instead of freeing the list by hand.
-	Clip the range we pass to mark_gtk_calendar_day().
-	(mark_gtk_calendar_day): Fixed off-by-one error at the end of the
-	month by adding real day offsets.
-
-2000-05-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (add_alarms_for_object): New function to add
-	today's alarms for a single object.
-	(gnome_calendar_object_updated_cb): Update the object's alarms.
-
-	* idl/evolution-calendar.idl (Cal): Added a
-	get_alarms_for_object() method.
-
-	* pcs/cal.c (Cal_get_alarms_for_object): Implemented method.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_for_object): New
-	function.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_for_object):
-	Implemented.
-
-	* cal-client/cal-client.c (cal_client_get_alarms_for_object): New
-	function.
-
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Now that we
-	depend on current gnome-libs we can make the toolbar detachable
-	again.
-
-	* pcs/icalendar-save.c (timet_to_icaltime): remove unused timezone
-	variable to make this compile on BSD systems (where timezone is
-	the name of a function)
-
-2000-05-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_update_all): Removed unused
-	arguments.  Load the initial alarms here.
-	(load_alarms): New function to load a day's worth of alarms.
-	(gnome_calendar_class_init): Eeeek!  This was taking in an
-	incorrect argument type.
-	(gnome_calendar_init): Now the calendar keeps a hash table of
-	UIDs->queued alarms.  Create the hash table here.
-	(gnome_calendar_destroy): Destroy the alarms hash table.
-	(gnome_calendar_object_updated_cb): Remove the alarms for the
-	object and regenerate them.
-	(gnome_calendar_object_removed_cb): Remove the alarms for the
-	object.
-
-	* gui/alarm.c (alarm_add): Do not take in a CalendarAlarm, just
-	the trigger time, the callback and the closure data.  Return an
-	opaque identifier for the alarm so that it can be removed by the
-	client code if needed.  Use the queue_alarm() helper function.
-	(queue_alarm): Helper function to actually queue the alarm and set
-	up the itimer.  Deal with a nonzero return value from
-	setitimer().
-	(alarm_remove): New function to remove an alarm based on its ID.
-	(pop_alarm): New helper function; pops the first alarm of the
-	queue and resets the timer as appropriate.
-	(alarm_ready): Simplified a lot by using pop_alarm().
-
-	* idl/evolution-calendar.idl (Cal): Added get_alarms_in_range().
-
-	* pcs/cal.c (build_instance_seq): New function to build a CORBA
-	sequence from the internal list of instances.
-	(Cal_get_events_in_range): Use build_instance_seq().
-	(Cal_get_alarms_in_range): Implemented new method.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_in_range): New
-	function with the get_alarms_in_range() engine.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_in_range):
-	Implemented the get_alarms_in_range() method.
-
-	* cal-client/cal-client.c (cal_client_get_alarms_in_range): New
-	client-side function for getting the alarms.
-	(build_instance_list): New helper function to build the
-	CalObjInstance list from the CORBA sequence.
-	(cal_client_get_events_in_range): Use build_instance_list().
-
-	* gui/calendar-commands.h: #include <cal-util/calobj.h>.  #include
-	"gnome-cal.h".
-
-	* gui/e-week-view.c: #include "calendar-commands.h" instead of
-	main.h; the latter is an obsolete file and will be killed.
-
-	* gui/evolution-calendar-control.c (main): Call init_bonobo()
-	before anything else.  We need the GTK+ object system initialized.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Do not use main.h.
-
-	* cal-util/cal-util.c (cal_alarm_instance_list_free): New function.
-
-2000-05-10  Matt Loper  <matt@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Move
-	"about" menuitem to the help menu.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added main.h.  Combined the two EXTRA_DIST
-	sections.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* pcs/cal-backend-imc.c: Set the format when creating a new
-	calendar.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* pcs/cal-factory.c: Removed double free of method_string in
-	uri->method_string.
-
-2000-05-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* pcs/cal.h: Include "calendar/pcs/evolution-calendar.h" instead
-	of "evolution-calendar.h".
-
-	* pcs/cal-backend.h: Include "calendar/pcs/evolution-calendar.h"
-	instead of "evolution-calendar.h".
-
-2000-05-08  Seth Alves  <alves@hungry.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): call
-	e_day_view_stop_editing_event here to avoid a divide by zero
-	a bit further on.  i'm not sure if this is the best fix for this.
-
-2000-05-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend.h (CalBackendClass): CalBackendClass now is just
-	an interface for calendar backends; this is an abstract class.
-	Put in the vtable for the backend methods.
-
-	* pcs/cal-backend.c (cal_backend_new): Removed function, since
-	CalBackend is not just an abstract class.
-	Removed implementation-specific functions and made public
-	functions call the virtual methods instead.
-
-	* pcs/cal-backend-imc.[ch]: New files with the CalBackendIMC
-	implementation; this implements a backend for iCalendar and
-	vCalendar files.  Moved the implementation-specific stuff from
-	cal-backend.[ch] to here.
-
-	* pcs/cal-backend-imc.c (CalendarFormat): Moved enumeration to
-	here.  Added a CAL_UNKNOWN value for when the backend is not
-	loaded yet.
-	(cal_backend_imc_init): Initialize priv->format as CAL_UNKNOWN.
-	(save_to_vcal): Use the same VCProdIdProp value as in
-	cal-util/calobj.c.  Use "1.0" as the VCVersionProp as per the
-	vCalendar spec.
-	(ensure_uid): Return nothing, since the result value need not be
-	used anymore.
-	(add_object): Since we mark the calendar as dirty anyways, we do
-	not need to check the result value of ensure_uid() anymore.
-	(remove_object): Asssert that we know how to handle the object's
-	type.  We do this in add_object() anyways.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-imc.[ch].
-
-	* gui/gnome-cal.c: Replaced debugging printf()s with g_message()
-	so that we can see the line number where they occur.
-
-	* gui/gnome-cal.c (gnome_calendar_load_cb): Sort of handle the
-	LOAD_METHOD_NOT_SUPPORTED result code, and added a default for the
-	switch.
-
-	* cal-client/cal-listener.h (CalListenerLoadStatus): Removed
-	enumeration; it is stupid to translate all values for the
-	CalClient when it is going to translate them again.
-	(CalListenerClass::cal_loaded): This signal now passes the
-	LoadStatus directly from the CORBA side.
-
-	* cal-client/cal-listener.c (Listener_cal_loaded): Do not
-	translate the status value.
-
-	* cal-client/cal-client.h (CalClientLoadStatus): Added the
-	CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED error code.
-
-	* cal-client/cal-client.c (cal_loaded_cb): Translate the CORBA
-	version of the LoadStatus result code.
-
-	* pcs/cal-factory.c (CalFactoryPrivate): New methods field for the
-	hash table from method strings to the GtkTypes for backend class
-	types.
-	(cal_factory_init): Create the priv->methods hash table.
-	(cal_factory_destroy): Free the priv->methods hash table.
-	(cal_factory_register_method): New function to register a backend
-	class for a particular URI method.
-	(launch_backend_for_uri): New function to launch a backend for a
-	particular URI's method.
-	(load_backend): Use launch_backend_for_uri().  Move the error
-	notification code from load_fn() to here.
-	(create_backend): Use launch_backend_for_uri().  Move the error
-	notification code form create_fn() to here; it is #ifdefed out
-	since currently cal_backend_create() does not have any error
-	reporting capabilities.
-
-	* idl/evolution-calendar.idl (Listener::LoadStatus): Added a
-	PROTOCOL_NOT_SUPPORTED error code.
-
-	* pcs/cal-factory.c (cal_factory_load cal_factory_create): Removed
-	functions, since they were supposed to be internal only.
-	(CalFactory_load): Call queue_load_create_job() directly.
-	(CalFactory_create): Likewise.
-
-2000-05-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_remove_event_cb):
-	* gui/e-day-view.c (e_day_view_remove_event_cb): don't set the ico->uid
-	to NULL or we won't find any other occurrences of the event. Set the
-	editing_event_day/num to -1 instead.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): fixed the
-	positioning of the icons for long events.
-
-	* cal-util/calobj.c (ical_object_normalize_summary): forgot to
-	terminate the string.
-
-2000-05-07  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received):
-	(e_day_view_on_top_canvas_drag_data_received): show the EText item,
-	just in case it hasn't moved, otherwise it won't appear.
-
-	* gui/e-day-view.h (E_DAY_VIEW_BAR_WIDTH): increased from 6 to 8 to
-	make it easier to drag an event. Also increased E_DAY_VIEW_GAP_WIDTH
-	since it must be >= the BAR_WIDTH.
-
-2000-05-07  Matt Loper  <matt@helixcode.com>
-
-	* gui/evolution-calendar-control.c (PROPERTY_CALENDAR_URI):
-	Changed to "folder_uri" from "calendar_uri".
-	(set_prop): The uri given to us is a directory, so we append a
-	filename onto the end before we use it.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/timeutil.c (time_day_begin):
-	(time_day_end): changed these so they just do a simple localtime(),
-	update the struct tm, then do a mktime(). I don't know why it used to
-	look at the tm_isdst flags etc. From a little test program I wrote
-	which steps through testing every hour for a year it wasn't working
-	correctly, and the new code does.
-	(time_add_day): also got rid of the stuff that looked at tm_isdst here.
-	My test program now works better.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	* gui/.cvsignore: ignore evolution-calendar.pure
-
-	* gui/Makefile.am: add support for building evolution-calendar.pure
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: finish editing event when user hits Return key.
-	(e_week_view_on_text_item_event): stop event signals after doing any
-	other calls, since otherwise it will also stop any other resulting
-	event signals.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): don't
-	draw the start/end times while editing.
-
-	* gui/eventedit.c: changed the Summary field to a GtkEntry, since we
-	now only want a single line of text.
-
-	* cal-util/calobj.c (ical_object_normalize_summary): new function to
-	convert the summary field to a single line of text, by converting any
-	sequence of CR & LF characters to a single space.
-	(ical_object_create_from_vobject): call the above function. I think
-	all functions that load iCalObjects go through this.
-	(ical_new): called it here as well just in case.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/week-view.[hc]: removed.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gncal-day-panel.[hc]:
-	* gui/gncal-day-view.[hc]:
-	* gui/gncal-full-day.[hc]:
-	* gui/gncal-week-view.[hc]:
-	* gui/layout.[hc]:
-	* gui/view-utils.[hc]: removed old calendar view files.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.[hc]: added guint ref_count to iCalObject struct,
-	and ical_object_ref/unref() functions. I've updated all the gui/
-	stuff to use ref_counts but I haven't touched the pcs/ stuff. Maybe
-	just using ical_object_destroy() is OK there.
-
-	* gui/gncal-todo.c:
-	* gui/calendar-commands.c:
-	* gui/eventedit.c:
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: use refcounting for iCalObjects.
-
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-day-view.c: try not to ever draw outside the event, even when
-	the event is very small.
-
-2000-05-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c: don't allow recurring events to be resized or
-	dragged, and don't show the resize/drag cursors. Actually it may be
-	better to let the user do the resize/drag and then ask them what they
-	want to do - change the single occurrence or the entire series.
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_show_popup_menu):
-	use e_auto_kill_popup_menu_on_hide() to destroy the popup menu.
-
-	* gui/popup-menu.c: include e-gui-utils.h
-
-2000-05-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_foreach_event_with_uid): for the long
-	events pass E_DAY_VIEW_LONG_EVENT as the day. Fixes SEGV.
-
-	* gui/calendar-commands.c: when we switch views, grab the focus.
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar):
-	(gnome_calendar_mark_gtk_calendar_day): changed this so it uses
-	cal_client_get_events_in_range(), and doesn't load any objects.
-	Also just return if it isn't visible.
-
-	* gui/calendar-commands.c (calendar_get_events_in_range): call
-	g_list_sort() to sort the list rather than g_list_insert_sorted() for
-	each element. It is much more efficient.
-	Also changed it so that the co->ev_start/end fields are copied from
-	the CalObjInstance rather than the parameters to the function
-	(that is right, isn't it?)
-	Also freed the list elements, and finally the list.
-	(calendar_iterate): changed this to use cal_client_get_events_in_range
-	since that is more efficient than getting all the uids and then loading
-	and parsing all the events.
-
-	* pcs/cal-backend.c (save): output the '... saved' message before
-	freeing the string!
-
-	* gui/gncal-todo.c (gncal_todo_update):
-	* gui/e-week-view.c (e_week_view_update_event):
-	* gui/e-day-view.c (e_day_view_update_event):
-	* gui/calendar-commands.c (calendar_get_events_in_range):
-	(calendar_iterate): free obj_string after it is parsed.
-
-2000-05-02  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): set the active
-	radio button here. Oops - it wasn't a Bonobo problem after all.
-
-	* gui/popup-menu.c (popup_menu): added call to
-	e_auto_kill_popup_menu_on_hide() to destroy the menu.
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu):
-	* gui/e-day-view.c (e_day_view_on_event_right_click): ico->user_data
-	isn't useful any more, since the event editor keeps its own iCalObject.
-	So for now we make the menu commands available even when the event is
-	being edited in the event editor.
-	Also corrected misspellings of 'occurance' -> 'occurrence'.
-
-	* gui/eventedit.c (event_editor_destroy): destroy the iCalObject.
-	The event editor now uses its own independent iCalObject.
-
-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment):
-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment): create a new
-	uid for the new single instance. I'm not sure what we should do about
-	the creation/last modification times of the objects.
-
-	* gui/e-week-view.c (e_week_view_on_edit_appointment):
-	* gui/e-day-view.c (e_day_view_on_edit_appointment): duplicate the
-	iCalObject before passing it to the event editor, since it will change
-	the fields. If we don't duplicate it we won't know what has changed
-	when we get the "update_event" callback.
-
-	* gui/e-week-view.c (e_week_view_key_press):
-	* gui/e-day-view.c (e_day_view_key_press): set the created and last_mod
-	times of the new iCalObject. We may want to set the default alarm as
-	well.
-
-	* cal-util/calobj.c (ical_gen_uid): made this function public so we
-	can generate new uids if necessary.
-
-2000-05-01  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.[hc] (gnome_calendar_get_current_time_range): new
-	function to get the currently seleted time range form the current view.
-
-	* gui/calendar-commands.c (display_objedit): use the above function
-	to get the time for the new appointment.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: use a shallow copy of the ico when we update the
-	times (when resizing/dragging). Otherwise we won't detect that the
-	time has changed in the "update_event" callback.
-
-	Also added functions to get the currently selected time range.
-
-2000-04-30  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar-save.c (icalcomponent_create_from_ical_object): set
-	attendee and contact address correctly.
-
-	* pcs/cal-backend.c (icalendar_calendar_load): init priv->object_hash
-	when loading.
-	(cal_get_type_from_filename): if file extension is .ical, consider
-	the file an ical file.
-
-2000-05-01  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_compare_dates): new function to see
-	if the event dates have changed (including any recurrence rules).
-	It is used for optimization when we get the "object_changed" signal.
-	We have to do far less work if the dates are unchanged.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: only draw the selection when we have the keyboard
-	focus, since the user expects to be able to type in a new event when
-	the selection is shown. Also keep the selection when we lose focus,
-	but just don't show it.
-
-	Also quite a few changes to cope with the new client/server
-	architecture.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw):
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	only draw the selection if the widget has the keyboard focus.
-
-	* gui/gnome-cal.c (mark_gtk_calendar_day): fixed so it works with
-	events longer than one day. And changed the code for updating events
-	in the new views.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar-control.c
-	(init_bonobo): OAFized.
-
-	* gui/main.c (main): Initialize with OAF if `USING_OAF'.
-
-	* gui/evolution-calendar-control.c: New #define
-	`CONTROL_FACTORY_ID', varying according to whether we are
-	`USING_OAF'.
-	(calendar_factory_init): Use `CONTROL_FACTORY_ID'.
-
-	* gui/Makefile.am: Updated for OAF.
-
-	* pcs/cal-factory.h: Explicitly #include
-	"calendar/pcs/evolution-calendar.h" instead of just
-	"evolution-calendar.h".
-
-	* cal-client/cal-client.c (cal_client_construct) [USING_OAF]: Use
-	OAF.
-
-	* cal-client/client-test.c (init_corba): New function, implemented
-	differently depending on `USING_OAF'.
-
-2000-04-27    <alves@hungry.com>
-
-	* pcs/cal-backend.c (cal_backend_load): fix memory leak
-	(save_to_vcal): same
-	(save): same
-	(cal_backend_load): same
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/.cvsignore: Replaced libcal-util.la with *.la
-
-	* pcs/.cvsignore: Added *.la and *.lo.
-
-2000-04-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-factory.c (backend_last_client_gone_cb): Renamed from
-	backend_destroy_cb.  Now we use it for the "last_client_gone"
-	signal from the backend.  Also, unref the backend to destroy it.
-	(add_backend): Connect to the "last_client_gone" signal of the
-	backend.
-	(cal_factory_get_n_backends): New function to query the number of
-	running backends.
-
-	* pcs/cal-backend.c (cal_backend_class_init): Register the new
-	"last_client_gone" signal.  It is emitted when the last Cal client
-	goes away.  It is used to notify the factory when a backend may be
-	safely destroyed.
-	(cal_destroy_cb): Emit the "last_client_gone" signal when the last
-	client disconnects from the backend.
-
-2000-04-25  Seth Alves  <alves@hungry.com>
-
-	* gui/e-day-view.c (e_day_view_find_event_from_ico): compare
-	iCalObjects by their UIDs instead of by their pointers.
-
-	* pcs/cal-backend.c (cal_backend_destroy): don't save on destroy.
-
-2000-04-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* cal-client/Makefile.am: Add `$(datadir)/idl'.
-
-	* pcs/Makefile.am (idl_flags): Add `$(datadir)/idl'.
-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.
-
-2000-04-25  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): hook for widget
-	destroy -- used to unref the CalClient so wombat knows we are gone.
-	(gnome_calendar_class_init): added a class init for this widget.
-
-	* gui/e-day-view.c (e_day_view_update_event): allow for null ico
-
-	* gui/e-week-view.c (e_week_view_update_event): allow for null ico
-
-2000-04-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/client-test.c (main): The path to the test calendar
-	changed when we moved stuff around.  Users will have to tweak this
-	for their CVS setup, anyways.
-	(create_client): Create or load the calendar as appropriate.
-	(client_destroy_cb): Exit the main loop if both clients are gone.
-	(main): Connect to the "destroy" signal of the clients so that we
-	can terminate the test program.
-
-2000-04-24  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar.c (parse_person): allow for null CN
-	(parse_person): allow for null sent_by
-
-	* pcs/Makefile.am: build icalendar-test
-
-	* pcs/icalendar-test.c: a test which loads an ical file and
-	converts it to our internal format, and then saves it back out.
-
-2000-04-24  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am: added new source files and pixmaps, and removed
-	old source files, which can be deleted.
-
-	* gui/e-week-view-titles-item.[hc]:
-	* gui/e-week-view-main-item.[hc]:
-	* gui/e-week-view-event-item.[hc]:
-	* gui/e-week-view.[hc]: new files implementing the week/month views.
-
-	* gui/yearview.xpm:
-	* gui/monthview.xpm:
-	* gui/weekview.xpm:
-	* gui/workweekview.xpm:
-	* gui/dayview.xpm: new pixmaps for the toolbar buttons. These aren't
-	intended to be the final pixmaps.
-
-	* gui/calendar-commands.c: added radio buttons to the toolbar to
-	switch between the calendar views, and moved the am_pm_flag here so we
-	can get rid of view-utils.c.
-
-	* gui/gnome-cal.[hc]: made it a subclass of GtkVBox, rearranged the
-	widgets into 2 notebooks, and added the	selection_start_time and
-	selection_end_time fields.
-
-	* gui/goto.c: updated to use new selection time range.
-
-	* gui/quick-view.c: added '#include <gtk/gtkwindow.h>' so it compiles.
-
-	* gui/e-day-view.[hc]: changed the interface to support the new
-	selection time range, got rid of a few debugging messages and changed
-	a few bits.
-
-2000-04-21  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar-save.c: start on code to do the opposite of
-	icalendar.c (convert from iCalObjects to libical's icalcomponents).
-
-	* gui/calendar-commands.c (calendar_control_activate): moved
-	"About Calendar" into the View menu so it shows up.
-
-2000-04-20  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_changed_cb): new function: callback
-	for listener's object updated signal.
-	(gnome_calendar_object_removed_cb): new function: callback for
-	listener's object removed signal.
-	(gnome_calendar_new): hook up listener's "obj_updated" and
-	"obj_removed" signals so if evolution is running twice,
-	they will both see changes right away.
-	(gnome_calendar_object_changed): don't call update_all, since
-	it will be called by the listener.
-	(gnome_calendar_remove_object): don't call update_all
-	(gnome_calendar_add_object): don't call update_all
-
-	* gui/gncal-full-day.c (child_realize): create fullday's gcs
-	even if pixmap_bell has already been created.  this was
-	causing crashes if the calendar was run twice.
-
-2000-04-19  Seth Alves  <alves@hungry.com>
-
-	* gui/eventedit.c (ee_rp_init_rule): changed the order around
-	a bit to avoid a Gtk-CRITICAL crash
-
-	* gui/gncal-todo.c (gncal_todo_update): fixed code to populate
-	the todo clist
-
-	* cal-client/cal-client.c (cal_client_get_uids): don't check
-	type against CALOBJ_TYPE_ANY since it will always match.
-	(cal_client_get_uids): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal-backend.c (build_uids_list): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal.c (Cal_get_uids): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal-backend.c (remove_object): don't call save from here
-	because in all cases the caller of remove_object calls save
-
-	* gui/calendar-commands.c (calendar_set_uri): calls gnome_calendar_open
-	instead of checking on disk and calling load or create.
-
-	* gui/gnome-cal.c (gnome_calendar_object_changed): fixed to use
-	cal_client_update_object -- editing and dragging events works again
-	(gnome_calendar_open): collapsed gnome_calendar_load and
-	gnome_calendar_create into this function.  added new type
-	GnomeCalendarOpenMode which has the value CALENDAR_OPEN or
-	CALENDAR_OPEN_OR_CREATE.
-
-	* gui/evolution-calendar-control.c (calendar_properties_init): create
-	a property bag for this control
-	(set_prop): callback for property sets
-	(get_prop): callback for proprety gets
-
-	* gui/calendar-commands.c (calendar_set_uri): new function,
-	called when the "calendar_uri" property is set on the calendar-
-	control's property bag.
-
-2000-04-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am (INCLUDES): Fix include path.
-
-2000-04-16  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-factory.h (CalFactoryClass): We have a new
-	"last_calendar_gone" signal that Wombat can use to terminate
-	itself properly.
-
-	* pcs/cal-factory.c (cal_factory_class_init): Register the
-	"last_calendar_gone" signal.
-	(backend_destroy_cb): Emit the "last_calendar_gone" signal instead
-	of killing the factory.
-
-	* pcs/Makefile.am: Added $(CORBA_GENERATED) to BUILT_SOURCES.
-	(INCLUDES): Make the log domain be "wombat-pcs".
-
-2000-04-17  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend.c (add_object): removed implicit save, since
-	we don't want to save as we load from disk.
-	(cal_backend_update_object): added a call to save, since it
-	isn't done by add_object now.
-
-2000-04-16  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am: Renamed library from libcalutil to
-	libcal-util, to be consistent with libcal-client.  Install header
-	files in $(includedir)/evolution/cal-util.
-	(INCLUDES): Add "cal-util" log domain for glib.
-	(libcal_clientincludedir): The header files are now installed in
-	$(includedir)/evolution/cal-client.
-
-	* cal-util/cal-util.h: Fix includes.
-
-	* cal-client/client-test.c: Fix includes.
-
-	* pcs/Makefile.am: Create libpcs.a, not a shared library, because
-	it is for internal use by Wombat only.  The header files should
-	not be installed, either.  Removed all the old Tlacuache stuff.
-
-	* gui/Makefile.am (EXTRA_DIST): We no longer distribute
-	gncal.desktop.
-	(evolution_calendar_INCLUDES): Add "calendar-gui" for the glib log
-	domain.
-
-	* gui/*.[ch]: Fix cal-util and cal-client includes.
-
-	* pcs/Makefile.am (INCLUDES): Added "pcs" log domain for glib.
-
-	* pcs/*.[ch]: Fix cal-util includes.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* pcs/icalendar.c (icaltime_to_timet): use HAVE_TIMEZONE to switch
-	between linux's timezone variable and *bsd's method of getting the
-	gmt offset.
-
-2000-04-10  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend.c (save_to_vcal): create and save an actual
-	vcalendar instead of a list of vcal objects.
-
-2000-04-10  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am (INCLUDES): moved srcdir directories to the top so
-	we search headers in the evolution tree before installed headers.
-	(Otherwise when you do 'make install' lots of files in gui/ get
-	rebuilt, since they depend on the installed cal-client.h which has just
-	been updated.)
-
-2000-04-09  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_load): catch cal_loaded signal
-	on the cal client.
-	(gnome_calendar_load_cb): callback for cal_loaded signal.  moved
-	gnome_calendar_update_all from gnome_calendar_load to here.
-
-	* gui/calendar-commands.c: minor cleanups
-
-	* pcs/cal-backend.c (save_to_vcal): copied code from gnome-pim
-	to write vcal to a file
-	(save): filled it with more gnome-pim code
-	(add_object): call save () after changing
-	(remove_object): same
-	(cal_backend_create): same
-	(cal_backend_remove_object): same
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Removed linking with libetable and libeminicard
-	since they weren't being used.
-
-2000-04-08  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_create): new function:
-	friendly wrapper for cal_client_create_calendar
-
-	* gui/calendar-commands.c (new_calendar): call gnome_calendar_create
-	if no filename is provided
-
-	* gui/prop.c (properties): calendar is a frame
-
-	* gui/calendar-commands.c (calendar_control_activate): sort out the
-	menus a bit, more of them show up now.
-
-	* gui/Makefile.am: don't build library or test, just the bonobo control
-
-	* gui/gncal-todo.c (simple_todo_editor): calendar is a frame instead
-	of a window, now.
-
-	* gui/gnome-cal.c (gnome_calendar_new): same
-
-	* gui/goto.c (goto_dialog): same
-
-2000-04-06  Seth Alves  <alves@hungry.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): removed
-	uih from the argument list, added cal.  use cal as user_data
-	in callbacks rather than the control.
-	(calendar_control_deactivate): removed uih from argument list
-
-2000-04-05  Seth Alves  <alves@hungry.com>
-
-	* gui/calendar-commands.c (setup_menu): removed
-	(setup_appbar): removed
-	(calendar_control_activate): new function -- does the work
-	that setup_appbar and setup_menu used to do.
-	(calendar_control_deactivate): undoes what calendar_control_activate
-	does by removing the toolbar items and menu items.
-
-	* gui/Makefile.am: build test-calendar-widget and evolution-calendar,
-	common stuff is in a library
-
-	* gui/gnome-cal.c (gnome_calendar_get_type): made the calendar widget
-	based on a gtk_frame rather than a gnome_app
-
-	* gui/calendar-commands.c: split out some of main.c
-
-	* gui/evolution-calendar-control.c: bonobo bung so evolution
-	can use the calendar widget
-
-2000-04-01  Matt Loper  <matt@helixcode.com>
-
-	* pcs/.cvsignore: Added *.lo.
-
-2000-03-30  Seth Alves  <alves@hungry.com>
-
-        * gui/main.c (calendar_get_events_in_range):
-        cal_client_get_events_in_range returns a list of CalObjInstance *, not
-        a list of (char *) uid.
-
-	* Makefile.am (SUBDIRS): readded the gui directory
-
-	* gui/main.c: temporarily added alarm_defaults back in,
-	since the calendar doesn't link without it
-
-2000-03-29  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: remove the gui directory, which doesn't compile.
-
-2000-03-28  Matt Loper  <matt@helixcode.com>
-
-	* pcs/Makefile.am: create a libpcs.la library, for use in the
-	wombat.
-
-2000-03-28  Seth Alves  <alves@hungry.com>
-
-	* gui/Makefile.am (LINK_FLAGS): added libeutil.la and libetext.a
-
-	* gui/main.c (calendar_iterate): switch from string_to_ical_object to
-	ical_object_find_in_string
-	(calendar_get_events_in_range): same
-	(session_save_state): commented out references
-	to gcal->client->filename
-
-2000-03-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_object): Use
-	ical_object_to_string().
-
-	* cal-util/calobj.c (ical_object_to_string): Moved over from
-	pcs/cal-backend.c (was string_from_ical_object).
-	(get_calendar_base_vobject): Likewise, moved over from
-	pcs/cal-backend.c.
-
-	* cal-util/cal-util.c: Removed string_to_ical_object(); the
-	correct function is in calobj.[ch], called
-	ical_object_find_in_string().  Removed ical_object_to_string,
-	since we now implement it in calobj.c.
-
-	* cal-util/calobj.c: Removed ical_object_new_from_string(); see
-	above.
-
-	* idl/evolution-calendar.idl (CalObjInstance): Calendar object
-	instances now contain only the UID for the object, not the whole
-	string representation of the object.  This allows clients to
-	implement caching of objects if they wish.
-
-	* pcs/cal.c (Cal_get_events_in_range): Likewise.
-
-	* pcs/cal-backend.c (build_event_list): Likewise.
-
-	* cal-client/cal-client.c (cal_client_get_events_in_range):
-	Likewise.
-
-	* cal-util/cal-util.h (CalObjInstance): Likewise.
-
-	* cal-util/cal-util.c (cal_obj_instance_list_free): Likewise.
-	(cal_obj_uid_list_free): Assert that the UIDs in the list are not
-	NULL.
-
-	* pcs/tlacuache.gnorba (repo_id): The calendar factory also
-	supports the Unknown interface.
-
-2000-03-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-day-view.c: Fix includes.
-	(e_day_view_on_delete_occurance): Do not call save_default_calendar().
-	(e_day_view_on_delete_appointment): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_finish_long_event_resize): Likewise.
-	(e_day_view_finish_resize): Likewise.
-	(e_day_view_key_press): Likewise.
-	(e_day_view_on_editing_stopped): Likewise.
-	(e_day_view_on_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-
-2000-03-13  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view*.[hc]: new files for the Day/Work-Week views.
-
-2000-03-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (gnome_calendar_locate): Removed function now that it
-	is no CORBA server in the GUI.
-	(save_default_calendar): Removed function.  Now the personal
-	calendar server will take care of saving modified calendars when
-	appropriate.
-	(close_cmd): Do not call unregister_calendar_services().
-
-	* gui/eventedit.c (ee_ok): Do not save the calendar.
-
-	* gui/gncal-day-panel.c (day_view_range_activated): Likewise.
-
-	* gui/gncal-todo.c (ok_button): Likewise.
-	(delete_todo): Likewise.
-
-	* gui/gncal-full-day.c (delete_occurance): Likewise.
-	(delete_appointment): Likewise.
-	(unrecur_appointment): Likewise.
-	(child_focus_out): Likewise.
-	(update_from_drag_info): Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_new): Removed obsolete call to
-	create the CORBA server.
-
-	* gui/gnome-cal.h (GnomeCalendar): Renamed `calc' field to
-	`client'.
-
-	* cal-client/cal-client.h (CalClient): Removed filename and
-	corba_server fields.
-
-2000-03-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (main): Do not pass the INIT_SERVER flag to
-	gnome_CORBA_init_with_popt_table().  Check for exceptions
-	properly.
-	(main): Initialize Bonobo.
-	(main): Call process_dates() to parse the dates from the command
-	line before we dump the events or the TODOs.
-	(main): Use bonobo_main() instead of gtk_main().
-
-	* cal-util/calobj.c (ical_new): Initialize the alarm types here.
-	Do not call default_alarm() anymore, since that is a GUI issue.
-	(default_alarm): Removed function.
-	(alarm_defaults): Removed defaults data.
-
-	* pcs/tlacuache.c (calendar_notify): Removed stubs for
-	alarm_defaults, calendar_notify(), debug_alarms.
-
-2000-03-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am: Removed the corba-cal stuff.  Commented out the
-	Pilot conduit stuff for now.
-
-	* gui/calendar.c: Random #ifdefs to make it build, although this
-	file is going away.
-
-	* gui/Makefile.am: Removed referenes to calobj.[ch] and timeutil.[ch].
-
-	* gui/calendar-conduit.c: Fixup includes.
-
-	* gui/calendar-conduit.h: Fixup includes.
-
-2000-03-09  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.h: replaced "Calendar *cal" with "CalClient *calc"
-	in the GnomeCalendar struct.
-
-	* gui/*.c: tracked change from Calendar * to CalClient
-
-	* gui/main.c: moved alarm_defaults from here to cal-util/calobj.c
-	(calendar_get_events_in_range): pulled this out of calendar.c and
-	fixed it up to use cal-client stuff.  i'm not sure where to put it yet.
-
-	* gui/main.c (calendar_iterate): pulled this one out of calendar.c also
-
-2000-03-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/Makefile.am: Removed cal-client-alarm.[ch] from the
-	list of sources.  This was a miscommunication on our part.
-
-2000-03-05  Seth Alves  <alves@hungry.com>
-
-	* cal-client/cal-client-alarm.c: stubs for client side
-	access to alarm structures.  this will probably change,
-	since i don't know what i'm doing.
-
-	* cal-util/alarm-enums.h: enums for alarms needed by
-	both the client and the server
-
-	* remaining source files in calendar/... have been moved
-	to calendar/gui.
-
-	* gui/alarm.c: start to decouple the view from the model
-	in the alarm editing code
-
-2000-03-03  Seth Alves  <alves@hungry.com>
-
-	* cal-util/Makefile.am: new file -- things shared between
-	the client and server go in this directory
-
-	*  calobj.c calobj.h icalendar.c icalendar.h
-	timeutil.c timeutil.h cal-util.c cal-util.h where moved
-	backend stuff went into pcs.  shared stuff went into
-	cal-util.
-
-2000-03-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	At this point the calendar client and personal calendar server
-	files were moved to the idl/, cal-client/, and pcs/ directories.
-
-	* idl/Makefile.am: New file.
-
-	* cal-client/Makefile.am: New file.  Moved the libcal-client stuff
-	from calendar/Makefile.am to here.
-
-	* pcs/Makefile.am: New file.  Moved the tlacuache stuff from
-	calendar/Makefile.am to here.
-
-	* Makefile.am (SUBDIRS): Added the idl and cal-client directories.
-
-	* calendar.h: Removed the references to cal-backend.h and its
-	stuff.  This file is going away soon!
-
-	* icalendar.c: #include <config.h>.  Also, we don't need to
-	include cal-backend.h or gnome.h.
-
-	* icalendar.h: Protect from multiple inclusions.
-
-2000-03-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Use the gnome-config flags for orbit-idl.
-	Create a libcal-client library with the calendar client object.
-
-2000-02-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Removed stale rule for the conduit.
-
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added *.lo.
-
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added tlacuache and tl-test.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* Makefile.am (INCLUDES): Use BONOBO_VFS_GNOME_CFLAGS instead of
-	GNOMEUI_INCLUDES, as we use Bonobo and VFS.
-
-2000-02-17  Seth Alves  <alves@hungry.com>
-
-	* cal-backend.h: moved CalendarFormat type def here
-
-	* cal-backend.c (cal_backend_load): if extension suggests
-	an ical file, attempt to load an iCal file.
-	(cal_get_type_from_filename): returns CAL_ICAL if file
-	extension is 'ics' or 'ifb', else returns CAL_VCAL
-	(icalendar_calendar_load): moved this here from
-	icalendar.c because it needs to call the static function
-	add_object.
-
-2000-02-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_client_remove_object): Implemented.
-
-	* cal.c (cal_notify_remove): Implemented.
-	(Cal_remove_object): Implemented.
-	(cal_get_epv): Fill in the remove_object field in the epv.
-
-	* cal-backend.c (cal_backend_remove_object): Implemented.
-	(notify_remove): New function to notify clients that an object was
-	removed.
-
-2000-02-16  Russell Steinthal  <rms39@columbia.edu>
-
-	* calobj.[ch], eventedit.c, main.c: Change iCalObject.organizer
-	from char* to iCalPerson*
-
-	* calobj.[ch]: Change iCalObject.related from list of char* to
-	list of iCalRelation*; assorted related fixes
-
-	* icalendar.c: interface between libical and the gnomecal
-	internal representation
-
-2000-02-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_client_update_object): Implemented.
-
-	* cal.c (cal_notify_update): New function to notify the listener
-	about an updated object.
-	(Cal_update_object): Implemented.
-	(Cal_get_uids): set_release() the sequence to TRUE.
-	(Cal_get_events_in_range): Likewise.
-
-	* cal-backend.c (remove_object): New function to remove objects
-	from a calendar backend.
-	(cal_backend_update_object): New public function to update an
-	object and notify clients about it.
-
-	* evolution-calendar.idl (Cal): Added update_object() and
-	delete_object() methods.
-	(Listener): Removed the obj_changed method and renamed obj_added
-	to obj_updated.  We now only have updated and removed notifiers.
-
-	* cal-listener.[ch]: Removed the "changed" notification code.
-	Changed the "added" notification code to the "updated"
-	notification.
-
-	* cal-client.c: Likewise.
-
-	* tlacuache.c (create_cal_factory): Connect to "destroy" on the
-	factory and exit the main loop when the factory is destroyed.
-
-	* cal-factory.c (backend_destroy_cb): New callback used when a
-	backend is destroyed.  Removes the backend from the factory's hash
-	table and unrefs the factory if all backends go away.
-	(add_calendar_client): Free the environment.
-
-	* cal.c (cal_new): Use bonobo_object_unref() if we fail to
-	initialize.
-
-	* cal-listener.c (cal_listener_new): Likewise.
-
-	* layout.c (layout_events): Plug li.partition memory leak.
-
-2000-02-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (cal_backend_add_cal): Connect to the Cal's
-	destroy signal.
-	(cal_backend_remove_cal): Killed function now that removal of Cal
-	objects is done in their destroy callback.
-	(cal_destroy_cb): New callback to remove a Cal from the backend's
-	list of clients.  Also, the backend destroys itself when there are
-	no more clients connected to it.
-	(save): New placeholder function to save a backend.
-	(destroy): New function to destroy a backend's data.
-	(cal_backend_destroy): Save the calendar and destroy it.
-
-	* cal.c (cal_destroy): Reset the priv->backend to NULL.
-
-	* cal-factory.c (add_calendar_client): There is no need to call
-	cal_backend_remove_cal(); we can now just destroy the Cal object.
-	(create_fn): Make sure we always unref the URI.
-	(load_fn): Move the URI unref to the end of the function for
-	safety.
-
-	* cal-factory.c (add_calendar_client): Unref the Cal only if
-	notification of the listener was unsuccessful.  Otherwise, the
-	calendar user agent (Listener side) keeps the reference.
-
-	* tl-test.c (list_uids): Free the calobj.
-
-	* cal-client.c (cal_loaded_cb): Use bonobo_object_unref() to get
-	rid of the listener.
-	(load_or_create): Likewise.
-	(destroy_factory): New function to get rid of the factory.
-	(destroy_listener): New function to get rid of the listener.
-	(destroy_cal): New function to get rid of the calendar client
-	interface object.
-	(cal_client_destroy): Free all resources.
-	(cal_client_get_object): CORBA_free() the calobj string.  Boy, I
-	love memprof.
-
-	* cal-listener.c (cal_listener_destroy): Reset the priv->cal to
-	CORBA_OBJECT_NIL.
-
-	* cal-backend.c (cal_backend_remove_cal): Do not unref the Cal,
-	since the calendar user agent owns it.
-	(cal_backend_add_cal): Do not ref the Cal, since the calendar user
-	agent owns it.
-
-	* cal-factory.c (add_calendar_client): Use bonobo_object_unref()
-	to get rid of the calendar client interface object.
-
-	* calobj.c (ical_object_create_from_vobject): Duplicate the
-	default "PUBLIC" string.
-
-2000-02-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (cal_factory_load): Added documentation comment.
-	(load_fn): Do not print a message if the backend could not be
-	loaded due to a non-fatal error.
-	(queue_load_create_job): Moved the stuff from cal_factory_load()
-	to here.  Now this function serves to queue load or create
-	requests.
-	(cal_factory_load): Use queue_load_create_job().
-	(cal_factory_create): Implemented; use queue_load_create_job().
-	(create_fn): New job handler for creating new calendars.
-	(create_backend): New function to create a new backend with a new
-	calendar.
-	(add_backend): New helper function to add backends to the
-	factory's hash table.
-	(load_backend): Use add_backend() instead of adding the backend by
-	ourselves.
-
-	* cal-client.c (load_or_create): Moved the functionality from
-	cal_client_load_calendar() to here, and added an option to create
-	a new calendar instead of loading an existing one.
-	(cal_client_load_calendar): Use load_or_create().
-	(cal_client_create_calendar): Implemented.
-
-	* cal-backend.c (cal_backend_create): Implemented.
-
-	* evolution-calendar.idl (LoadStatus): Added an IN_USE error for
-	create requests.
-
-	* cal-listener.h (CalListenerLoadStatus): Added CAL_LISTENER_LOAD_IN_USE.
-
-	* cal-listener.c (Listener_cal_loaded): Convert the IN_USE error.
-
-	* cal-client.h (CalClientLoadStatus): Added CAL_CLIENT_LOAD_IN_USE.
-
-	* cal-client.c (cal_loaded_cb): Handle CAL_LISTENER_LOAD_IN_USE.
-
-	* tl-test.c: New test program for the calendar client side; it
-	also exercises the server side by sending commands to it.
-
-	* Makefile.am: Added the tl-test program.
-
-	* tlacuache.gnorba: Updated.
-
-	* tlacuache.c (create_cal_factory): Use the right GOAD id.
-
-	* cal-client.c (cal_client_construct): Use the right GOAD id.
-
-2000-02-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (Cal): Added get_uids() method to get a
-	list of UIDs based on object types.
-
-	* cal-backend.c (cal_backend_get_uids): Implemented get_uids() in
-	the backend.
-
-	* cal.c (Cal_get_uids): Implemented get_uids() method.
-
-	* cal-client.c (cal_client_get_uids): Implemented client-side
-	function.
-
-	* cal-util.c (cal_obj_instance_list_free): Doh.  Free the list,
-	not the last link.
-	(cal_obj_uid_list_free): New function to free a list of UIDs.
-
-	* GnomeCal.idl (Repository): Removed unused method
-	get_object_by_id_list().  This is just for cleanup purposes and to
-	remind me exactly of what needs to be moved over to
-	evolution-calendar.idl.
-	(Repository): Removed unused get_objects() method.
-
-	* corba-cal.c (init_calendar_repo_class): Removed the unused
-	get_objects method.
-
-	* calobj.h (CalObjFindStatus): New status value enumeration for
-	the find function.
-
-	* calobj.c (ical_object_find_in_string): New function to parse a
-	complete calendar and find a calendar object in it.  This should
-	be used instead ical_object_new_from_string() in the future.
-
-	* evolution-calendar.idl (CalObjInstance): Added an uid field.
-	Now the idea is that whenever calendar object strings are passed
-	around, their UIDs are passed along with them so that the actual
-	object can be pulled from the whole VCAL object using its UID to
-	identify it.
-
-	* cal-util.h (CalObjInstance): Added uid field.
-
-	* cal-util.c (cal_obj_instance_list_free): Free the UIDs.
-
-	* cal-backend.c (build_event_list): Store the object's UID in the
-	instance structure.
-
-	* cal.c (Cal_get_events_in_range): Copy the UID field to the CORBA
-	structure.
-
-	* cal-client.c (cal_client_get_events_in_range): Copy the UID
-	field from the CORBA structure.
-
-	* main.c (gnome_cal_file_menu): Removed unfinished html-month stuff.
-
-	* Makefile.am (gnomecal_SOURCES): Removed html-month.c.
-
-	* gnome-cal.c: #include "alarm.h"
-	(mail_notify): Made static.
-
-	* alarm.h: #include "calobj.h"
-
-	* corba-cal-factory.h (init_corba_server): Fixed prototype.
-
-	* quick-view.c (create_items_for_event): Made static.
-
-	* gncal-todo.c (column_resized): Made static.
-
-	* layout.c (find_index): Made static.
-
-2000-02-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (CalObjInstance): New struct to wrap
-	instances of calendar objects for recurrencies and alarms.
-	(Cal::get_events_in_range): New method to get ocurring and
-	recurring events by time range.
-
-	* cal-backend.c (cal_backend_get_events_in_range): New function to
-	get a list of event instances in a time range.
-	(string_from_ical_object): New internal function.
-	(cal_backend_get_object): Use string_from_ical_object() instead of
-	doing everything ourselves.
-	(cal_backend_get_events_in_range): New function to get a list of
-	the events that occur or recur in a specified time range.
-
-	* cal-client.c (cal_client_get_events_in_range): Implemented
-	client-side function.
-
-	* cal-util.h:
-	* cal-util.c: New files with utilities and types common to the
-	client and server parts.
-	(CalObjInstance): New structure to hold an instance of an actual
-	occurrence, recurrence, or alarm trigger of a calendar object.
-	(cal_obj_instance_list_free): New function to free a list of
-	calendar object instances.
-
-	* cal.c (Cal_get_events_in_range): Implemented new method.
-
-	* corba-cal.c (cal_repo_get_updated_objects): Free `str' with
-	free(), not g_free(), since calendar_get_as_vcal_string() uses
-	writeMemVObject(), which uses realloc().  Fixed in gnome-pim as
-	well.
-
-2000-02-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (get_calendar_base_vobject): New function to
-	create the base VObject for a calendar.
-	(cal_backend_get_object): Create the base calendar and add the
-	sought object to it, then stringify it.
-
-	* evolution-calendar.idl (Listener::obj_added
-	Listener::obj_changed): Now these pass in just the UIDs, not the
-	complete objects.
-
-	* cal-listener.c (Listener_obj_added): Changed to pass in the uid,
-	not the object.
-	(Listener_obj_changed): Likewise.
-
-	* cal-client.h (CalClientClass): Made the obj_added and
-	obj_changed signals take in the UIDs, not the full objects.
-
-	* cal-client.c (obj_added_cb): Likewise.
-	(obj_changed_cb): Likewise.
-
-2000-02-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (CalBackendPrivate): Renamed the event_hash field
-	to object_hash.  Now we hash all the calendar's objects here based
-	on their UIDs.
-	(ensure_uid): New function to create UIDs for calendar objects
-	that don't have them.
-	(add_object): Ensure the object has an UID before inserting it in
-	the calendar.
-	(cal_backend_get_object): New function.
-
-2000-02-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (Cal): Added the get_object() method.
-
-	* cal-client.c (cal_client_get_object): New function to get a
-	calendar object by its UID.
-
-	* cal.c (Cal_get_object): Implemented.
-
-	* cal-backend.c (cal_backend_get_object): New unfinished backend
-	function.  We need some reorganizing of how the calendar objects
-	are stored.
-
-2000-02-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (gnomecal_SOURCES): Added the CORBA generated
-	sources.
-
-2000-02-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_loaded): Handle the cal_loaded signal from the
-	listener.  Store the calendar client interface object, and emit
-	our own cal_loaded signal.
-	(cal_client_load_calendar): Connect to the listener's signals.
-	(cal_client_class_init): Added the "obj_added", "obj_removed",
-	öbj_changed" signals.
-	(obj_added_cb): Handle the signal from the listener.
-	(obj_removed_cb): Likewise.
-	(obj_changed_cb): Likewise.
-
-2000-01-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (gnomecal_SOURCES): Added cal-client.[ch] and
-	cal-listener.[ch].
-
-2000-01-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl: Changed the namespace from
-	GNOME::Calendar to Evolution::Calendar.
-	(Listener::LoadStatus): Fixed SUCESSS -> SUCCESS typo.  And I
-	never noticed it in the implementation.  Ain't M-/ grand?
-
-	* Makefile.am: Changed ocurrences of gnome-calendar.idl to
-	evolution-calendar.idl.
-
-	* *.[ch]: Changed GNOME_Calendar_foo identifiers to
-	Evolution_Calendar_foo.
-
-2000-01-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c cal-client.h: New files with the calendar client
-	object.
-
-2000-01-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (CalFactory_load): Check that the listener is not
-	nil and emit and exception if it is.
-
-	* gnome-calendar.idl (CalFactory::load CalFactory::create): Now
-	these raise the NilListener exception.
-
-	* tlacuache.c (calendar_notify): Error stub for alarms.
-	(alarm_defaults): Stub array.
-	(debug_alarms): Stub variable.
-	(main): Initialize gnome-vfs.
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* tlacuache.c: New main module for the Tlacuache personal calendar
-	server.
-
-	* tlacuache.gnorba: New gnorba file for Tlacuache, the GNOME
-	personal calendar server.
-
-	* Makefile.am: Added the stuff necessary to build Tlacuache.
-
-	* cal.c (Cal_get_uri): Convert the URI to a string before
-	returning it.
-
-	* cal-factory.c (CalFactory_create): Doh, this function is void.
-
-	* job.c (job_add): Use g_idle_add(), not gtk_idle_add().
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (cal_backend_remove_cal): New function to remove a
-	calendar client interface object from a backend.
-	(cal_backend_load): Convert the URI to string and use
-	Parse_MIME_FromFileName().  The conversion is not very smart,
-	though.
-
-	* cal-factory.c (load_backend): Moved most of the error handling
-	upstream to load_fn().
-	(load_fn): Handle failure in case the backend could not be loaded.
-	(cal_factory_destroy): Free the backends and the backend hash
-	table.
-	(add_calendar_client): Implemented.  We create a Cal client
-	interface object and attach it to the backend, and we notify the
-	listener.
-
-2000-01-22  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (lookup_backend): Renamed from lookup_calendar().
-	Also, return a backend instead of a Cal client object.
-
-	* cal-backend.c (cal_backend_load): Take in a GnomeVFSURI, not a
-	string.
-
-	* cal-listener.c (Listener_cal_loaded): Pass the load status to
-	the signal.
-	(cal_listener_destroy): Better error checking.
-	(cal_listener_new): Better error checking.
-
-	* cal-listener.h (CalListenerLoadStatus): New enum for the load
-	status of a calendar.
-	(CalListenerClass): Added the status argument to the cal_loaded
-	signal.
-
-	* gnome-calendar.idl (cal_loaded): Added a load status code.
-
-	* cal-backend.h (CalBackendLoadStatus): Renamed from
-	CalBackendLoadResult.
-
-2000-01-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c cal-backend.h: Moved the calendar backend here.
-	This is the actual calendar-handling object.
-	(load_from_vobject): Moved over from calendar.c.  Modified to use
-	a CalBackend instead of the old Calendar structure.
-	(add_object): Likewise.
-
-	* cal.c: Now the Cal object is just a calendar client interface
-	object; we use it as a "viewport" onto a CalBackend.  This also
-	lets us do correct resource management.
-
-	* cal-common.h: New file with common forward declarations; we
-	can't have circular dependencies between headers.
-
-2000-01-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (cal_factory_load): Queue a load job.
-	(load_fn): Load job handler.  Lookup the calendar by URI, load it
-	if it is not loaded, or just report it to the new listener if it is.
-
-	* job.c job.h: New files with a simple job queue manager.
-
-	* gnome-calendar.idl (Listener::cal_loaded): Do not return the
-	whole calendar object string.  The client will be able to query
-	the calendar for the events it needs.
-
-	* cal-listener.c (Listener_cal_loaded): Ref the calendar GNOME
-	object.  We unref it when the listener is destroyed.
-
-2000-01-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	The files from the gncal directory of the gnome-pim module on CVS
-	were moved here, to evolution/calendar, in preparation for the
-	Evolution work.  The calendar is being split into a model/view
-	architecture.  The model is a personal calendar server (PAS):  it
-	provides storage, notification, and event generation; the
-	views/controllers are the calendar user agents and things like
-	Pilot synchronizers.
-
-2000-01-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal.c: Removed the CORBA listener methods, adjusted for the new
-	IDL.
-
-	* cal-listener.c (cal_listener_init): Create the private
-	structure.  In it we hold a reference to the calendar the listener
-	is watching.
-	(cal_listener_destroy): Destroy the private structure and unref
-	the calendar.
-	(Listener_cal_loaded): Stuff the calendar into our private data.
-	(Listener_obj_added): Adjusted for new IDL.
-	(Listener_obj_removed): Likewise.
-
-	* gnome-calendar.idl: New IDL for the personal calendar server.
-
-	* cal.h cal.c: New files with the calendar object.
-
-	* cal-listener.h cal-listener.c: New files with the calendar
-	listener object.
-
-	* cal-factory.h cal-factory.c: New files with the calendar factory
-	object.
-
-2000-01-09  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am: Changes to remove todo capplet stuff from distro.
-
-2000-01-08  Vadim Strizhevsky  <vadim@optonline.net>
-
-	* calendar-conduit-control-applet.c: Added pilotID argument to
-	gpilotd_conduit_mgmt_new.
-
-
-2000-01-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* GnomeCal.idl: Added an argument to get_number_of_objects, so you
-	can choose which state the object should have
-	(any/new/modified/...). Will also add one to choose type
-	(event/journal etc).
-
-	* corba-cal.c (cal_repo_get_number_of_objects): Implemented the
-	new version of get_number_of_objects.
-
-	* calendar-conduit.c (pre_sync): Calls various
- 	gnome_pilot_conduit_standard_abs_set_num_yadayda to get progress bars.
-
-2000-01-04  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (start_calendar_server): Let's not call
-	g_error, but g_warning instead.
-	(pre_sync): Get record numbers info, total, new, deleted etc, and
-	tell gpilotd.
-
-1999-12-31  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* eventedit.c (ee_store_recur_end_to_ical): Adds 86400 secs (1
-	day) to the date chooses by the user. This ensures the recurrence
-	also occurs on that date.
-	(ee_rp_init_ending_date): And subtracts 86400 secs when about to
-	redisplay the box.
-
-	* calendar.h: Added an argument to calendar_new, to enable certain
-	features, such as initing alarms or nor.
-
-	* calendar.c (calendar_new): Implemented support for the
-	CALENDAR_INIT_ALARMS option to calendar_new.
-
-	* corba-cal.c (cal_repo_get_updated_objects): Added
- 	CALENDAR_INIT_ALARMS to calendar_new calls.
-
-	* main.c: Added CALENDAR_INIT_ALARMS to calendar_new calls. This
- 	should probably be CALENDAR_INIT_NIL, but I'm not sure, guess
- 	steintr should check it.
-
-	* gnome-cal.c: Added CALENDAR_INIT_ALARMS to calendar_new calls.
-
-	* calendar-pilot-sync.c: Added CALENDAR_INIT_NIL to calendar_new calls.
-
-1999-12-10  Russell Steinthal  <rms39@columbia.edu>
-
-	* eventedit.c (ee_create_ae): Fix sensitivity bug when used to
-	create default alarm box (widgets in that box should always be
-	sensitive, even if the enabled checkbutton is not set)
-
-1999-12-08  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit-control-applet.c (setSettings): Capplets now
-	sets first_sync on enable, this should make the conduit copy old
-	entries from the pilot to gnomecal.
-
-1999-12-07  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (pre_sync): Check if local store is
-	empty. If, force slow sync.
-
-	* GnomeCal.idl (GNOME): Added get_number_of_objects.
-
-	* corba-cal.c (cal_repo_get_number_of_objects): implemented the
- 	get_number_of_objects.
-
-	* calendar-conduit-control-applet.c (setStateCfg): Fixed bug that
-	caused the capplet to always set the sync action to Disable upon start.
-
-1999-12-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (Conduits_second_DATA): Also install .desktop files
-	for conduit capplets in the gnome/apps menu dir.
-
-1999-12-04  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (EXTRA_DIST): Added .desktop files to EXTRA_DIST.
-
-1999-10-12  Clifford R. Conover  <rusty@zootweb.com>
-
-	* gncal-todo.c Todo List improvements.
-
-	Cleaned up todo item highlighting, added support for highlighting
- 	events due today, and events not due yet.  Colors are configurable
- 	on the Colors Tab of the properties window.
-
-	Renamed Frame in Properties window to Colors rather then Month
- 	Colors since we are now asking for Todo item colors.
-
-	Added ability to display time until todo item is due in list, it
- 	automatically selects the best denomination of time (up to weeks)
- 	and down to seconds to display.  This should be made configurable
- 	in a future version.
-
-	Changed Todo dialog to ask for time that event is due.  This
- 	allows more accurate tracking of then the item is due, before the
- 	dialog was only asking for the date of the todo item.
-
-1999-12-03  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c: undef DEBUG_CALCONDUT, suppresses debug output.
-
-1999-12-02  Russell Steinthal  <rms39@columbia.edu>
-
-	* alarm.c: Enhanced debug support: can be toggled on and off by
-	SIGUSR1, reports alarms which could not be added
-
-	* gnome-cal.c, main.[ch], prop.c: Add snooze capability for audio
-	and display alarms.  Snooze interval can be configured in the
-	Properties box.
-
-1999-11-30  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (compare): Fixed compare bug. Also neated up
-	some of the if's in set_status.
-
-1999-11-22  Russell Steinthal  <rms39@columbia.edu>
-
-	* Merged todo list coloring patch from stable
-	* Added myself to AUTHORS, about box (per Miguel)
-
-1999-11-22  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (pre_sync): Writes some warning
- 	messages when pre_sync fails.
-
-1999-11-14  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am: Stupid misplaced endif cause gncal to depend on an
-	install gnome-pilot... fixed... sorry.
-
-1999-11-12  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (extra_pilot_bins): Fixed the if then else problem,
-	using solution suggested by James Henstridge, appears to be caused
-	by a (by now fixed) bug in my automake.
-
-1999-11-12  Russell Steinthal  <rms39@columbia.edu>
-
-	* prop.c: Config code for timeout, make Alarms property page use a
-	vbox instead of an hbox so that the propbox stays a reasonable width.
-
-	* gnome-cal.c, main.[ch]: Add timeout for audio alarms, code to load
-	from config file
-
-	* eventedit.c: Give some static functions external linkage so they
-	can be used elsewhere (make_spin_button); add some prototypes to
-	appease gcc.
-
-1999-11-11  Russell Steinthal  <rms39@columbia.edu>
-
-	* calendar.c (calendar_day_change): Add call to
-	calendar_init_alarms() to schedule another day change alarm.
-
-1999-11-09  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c: Enabled debug output. Sets a g_log_domain,
-	now version 0.8.5. Consistent use of GSList/GList. Implemented
-	compare, default uses one that compares the contents of a struct
-	Appointment, but also has #ifdeffed code that does a field level
-	comparison, not complete, but perhaps educational.
-
-	* Makefile.am (#todo_conduit_control_applet_SOURCES): Fixed an
-	unwanted conditional on libcalendar_conduit_la_LDFLAGS
-
-1999-11-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit-control-applet.c (readStateCfg): Commented the
-	code out, thus the capplet works again.
-
-1999-11-04  Eskil Olsen   <deity@eskil.dk>
-
-	* Makefile.am: Uses the PISOCK_LIBDIR, for people with odd install
- 	dirs for their pilot-link. Also install a pretty icon for the
- 	calendar-conduit.
-
-	* calendar-conduit-control-applet.c: Modfied the
-	try/revert/ok/cancel scheme to be more intuitive, also uses a
-	GtkOptionMenu for the possible sync methods.
-
-	* calendar-conduit-control-applet.desktop: use the nice icon...
-
-	* calendar-conduit.c: Ack, had to define debug_alarms and
-	alarm_default, otherwise they are undefined. Is gncal code messy
-	or is this considered a way of configuring the cal engine ?
-	Implemented delete_all syncabs methods.
-
-	* calendar-pilot-sync.c: also had to declare debug_alarms and
- 	alarm_defaults, just as ugly.
-
-1999-11-02  Russell Steinthal  <rms39@columbia.edu>
-
-	* prop.c: Add new alarm page to properties box
-
-	* prop.c, calobj.c, main.[ch] eventedit.c: New support for default
-	alarms, configurable in the properties box.
-
-	* gnome-cal.c, prop.c, main.[ch]: add option to beep on Display
-	alarms
-
-1999-10-23  Russell Steinthal  <rms39@columbia.edu>
-
-	* calendar.c (calendar_new): Correctly initialize calendar_day_end
-	and calendar_day_begin *before* installing day-change alarm.
-
-1999-10-21  Russell Steinthal  <rms39@columbia.edu>
-
-	* alarm.c, main.c: Added alarm debugging code
-
-	* main.c (open_ok): Show an error box if the user tries to open a
-	non-existent file; fixes bug #1818
-
-1999-10-19  Russell Steinthal  <rms39@columbia.edu>
-
-	* gnome-cal.c (calendar_notify): Fix typos which were causing
-	invalid times in audio notification dialogs; fixes Bug #2561
-
-1999-10-18  Russell Steinthal  <rms39@columbia.edu>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Placed the various
-	elements of the day view in paned windows so that the user can
-	adjust the relative sizes of the daily schedule, monthly calendar,
-	and to-do list.
-
-1999-10-18  Martin Norbäck  <norpan@bigfoot.com>
-
-	* gncal.desktop: Added swedish translation
-
-1999-10-13  Eskil Olsen   <deity@eskil.dk>
-
-	* Makefile.am: Hopefully the fixes the much-hated
-	gnome-pilot dependency.
-
-1999-10-07  Eskil Olsen   <deity@eskil.dk>
-
-	* calendar.c (calendar_object_changed): moved the pilot_status =
-	MOD up, so even a CHANGE_SUMMARY will set the modified flag.
-
-	* calendar-conduit.c: more _free calls, vamped the noise on output.
-
-1999-10-06  Eskil Olsen   <deity@eskil.dk>
-
-	* *conduit*[ch]: checks return values from gpilotd_init/connect.
-
-	* calender.c (vcalendar_create_from_calendar): removed a set
- 	of cleanVObject cleanStrTbl, since the freed memory that the
-	function returned.
-
-1999-09-27  Timur Bakeyev  <mc@bat.ru>
-
-	* timeutil.c (time_from_isodate): Use tm.gmtoff or timezone to get
-	correct offset from UTC, according to HAVE_TM_GMTOFF or HAVE_TIMEZONE.
-	See also 1999-07-19  Matt Martin <matt@abacusnet.net>
-
-1999-09-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* month-view.c (add_event): ditto
-	(mark_current_day): ditto
-	(month_view_set): ditto
-
-	* goto.c (goto_dialog): ditto.
-
-	* gnome-month-item.c (gnome_month_item_init): ditto.
-
-	* gncal-day-panel.c (gncal_day_panel_new): ditto.
-
-	* getdate.c (RelativeDate): ditto.
-
-	* eventedit.c (set_all_day): ditto.
-	(ee_rp_init_rule): ditto.
-
-	* calendar.c (vcalendar_create_from_calendar): ditto.
-
-	* calendar-conduit.c (update_record): ditto.
-
-	* calobj.c (ical_object_generate_events): Get rid of pointers to
-	values returned from localtime, as it uses a static buffer.
-
-1999-09-26  Eskil Olsen <deity@eskil.dk>
-
-	* corba-cal.c: the g_free that was commented out since glib said
-	was a duplicate free, was supposed to be a free.
-
-	* GnomeCal.idl/corba-cal.c: added a get_object_id_list and a
-	get_objects_by_id_list. Latter is not done.
-
-	* calendar-conduit.c: rewrote the way the conduit iterates over
-	records. It no longers fetches all entries (since that didn't work
-	with more then 285 entries. It now fetches the id list, and gets
-	each record. (will be using get_objects_by_id_list to get records
-	in amounts of 10 or so later, to reduce amount of corba calls).
-
-	* calendar-conduit.c: now sets alarm parameters when transferring
-	from gnomecal to pilot.
-
-1999-09-23  Eskil Olsen <deity@eskil.dk>
-
-	* calendar-conduit.c: better merge of summary/description
- 	when doing ical_from_remote (update_record), also handles
-	import from gnomecal to pilot better, and on both ways, repeat
-	events are much better now.
-
-1999-09-22  Eskil Olsen <deity@eskil.dk>
-
-	* corba-cal.c: commented out a g_free that glib reported
-	as being a duplicate free.
-	* calendar-conduit.c: got gnomecal->pilot up and runnning.
-
-1999-02-06  Lauris Kaplinski <lauris@ariman.ee>
-
-	* gncal.desktop: Added Estonian translations.
-
-1999-09-14  Federico Mena Quintero  <federico@redhat.com>
-
-	* gncal-full-day.c (child_popup_menu): Set the data pointers for
-	all the items.
-
-1999-09-14  Kjartan Maraas  <kmaraas@online.no>
-
-	* doc/C/gnomecal.sgml: Merge from gnome-pim-1-0. Synced with newest
-	user-guide.
-
-1999-09-01  Miguel de Icaza  <miguel@gnu.org>
-
-	* eventedit.c (ee_create_buttons): Make the OK button the default
-	button per Russell's suggestion.
-
-1999-08-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calendar.c (calendar_object_changed): Modify the
-	object->last_mod field.
-	(calendar_add_object): Ditto.
-
-	Closes bug #676
-
-	* main.c (save_calendar_cmd): Fix problem in which we warned the
-	user about the calendar being modified the first time the calendar
-	was used.
-
-1999-08-22  Tomas Ogren  <stric@ing.umu.se>
-
-	* gnomecal.gnorba: "GenericFactoy" is wrong...
-
-1999-08-15  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_gen_uid): Fix the hostname part.
-
-1999-08-07  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* calendar-pilot-sync.c (sync_pilot): sync correctly for objects
-	created on the pilot, but not dirty (because they have been synced
-	with some other program in the past)
-
-1999-07-30  Miguel de Icaza  <miguel@gnu.org>
-
-	* month-view.c (month_view_init): Release points here.
-
-1999-08-02  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* Makefile.am (libcalendar_conduit_la_LDFLAGS):
-	libcalendar_conduit now installs
-
-	* calendar-pilot-sync.c (sync_pilot): do deletion of appointments
-	correctly, when they are deleted on the pilot
-	(conduit_free_Appointment): protect against double-freeing parts
-	of the Appointment structure
-	(update_record): all-day events from the pilot are handled a bit
-	more reasonably
-
-1999-08-01  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* calendar-pilot-sync.c (sync_object_to_pilot): The multi-day
-	appointment corruption bug is dead. Whoo!
-
-1999-07-31  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* Makefile.am: fixed this up slightly with respect to pilot conduits
-
-1999-07-30  Jonathan Blandford  <jrb@redhat.com>
-
-	* Makefile.am (libcalendar_conduit_la_LIBADD): More autoconf-stuff
-
-1999-07-29  Jonathan Blandford  <jrb@redhat.com>
-
-	* gnome-cal.c (setup_widgets): Add scrolling to the yearview.
-
-1999-07-28  Miguel de Icaza  <miguel@gnu.org>
-
-	* calendar-pilot-sync.c: (sync_object_to_pilot): If the enddate is
-	not set, set the repeatForever to 1.  This fixes all of the
-	birthdays problems I had.
-
-	Make the code not take arguments
-	(sync_cal_to_pilot): Nice event update information
-
-	* calendar.c (calendar_new): Add Event UID hash table.
-	(calendar_add_object): Add events to the hash table here.
-	(calendar_remove_object): Remove events here.
-	(calendar_object_find_event): Use the hash table here.
-
-	* main.c (save_calendar_cmd): The object is already destroyed by
-	gnome_dialog_run.
-
-	* calendar-pilot-sync.c (sync_object_to_pilot): Do not turn
-	archived bit on.
-
-	* calobj.c (ical_gen_uid): Use the hostname, not the domain name.
-	(ical_gen_uid): Add a serial number.  Isodates can be small.
-
-	* corba-cal.c (cal_repo_update_pilot_id): New method to update the
-	pilot status.
-	(cal_repo_get_updated_objects): New method.  Returns a list of
-	modified and not-sycned objects
-
-	* calendar-pilot-sync.c (sync_cal_to_pilot): New function to sync
-	from the GnomeCalendar to the pilot.
-	(sync_object_to_pilot): Sync a single event to the pilot.
-	(try_alarm): Alarm syncing code.
-
-1999-07-27  Miguel de Icaza  <miguel@gnu.org>
-
-	* calendar-pilot-sync.c: New file.  Implements PalmPilot
-	syncronization with the Gnome Calendar.
-
-	* calobj.c (ical_object_new_from_string): New function.  Creates
-	an iCalObject from a vCalendar string that is supposed to contain
-	only one vEvent.
-
-	* calendar.c:
-	(calendar_save): Split this routine in two.
-
-	* gnome-cal.c (gnome_calendar_new): Create the corba server here.
-
-	* main.c: Include gnorba.h, and corba-cal-factory.h here
-	(close_cmd): Kill the calendar server on shutdown.
-
-	* calobj.c (load_recur_yearly_day): Added a fixme comment.  WE
-	need to handle intervals in the years.
-
-	* calendar.c (calendar_object_find_in_list, calendar_object_find,
-	calendar_object_find_todo, calendar_object_find_event): New
-	functions for looking up information.
-
-	* main.c (gnome_calendar_locate): New function.
-
-	* corba-cal.c (calendar_create_object): New file.  Implements the
-	corba server.
-
-	* calendar.c (calendar_object_changed): Flag pilot-status as changed.
-
-	* calobj.c (ical_object_to_vobject): Save pilot information for syncing.
-	(ical_object_create_from_vobject): Load syncing information for
-	pilot.  Do it in a way compatible with KOrganizer.
-
-1999-07-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs
-	on Vevents we load that lack it.  WE need this for the old
-	gnome calendar generated files (ie, before now :-).
-
-	Required to sync with the Palm
-
-1999-07-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs
-	on Vevents we load that lack it.  WE need this for the old
-	gnome calendar generated files (ie, before now :-).
-
-	Required to sync with the Palm
-
-1999-07-19  Matt Martin <matt@abacusnet.net>
-
-	* timeutil.c (time_from_isodate): Handle the 'Z' parameter to the
-	ISO date format to convert from GMT time.
-
-1999-07-17  Nat Friedman  <nat@gnome-support.com>
-
-	* calendar.c (calendar_add_object): Copy the new UID into the
- 	iCalObject structure.
-
-1999-07-16  Miguel de Icaza  <miguel@gnu.org>
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Merge fix from
-	gnome-pim-1-0: Fixed cut&paste bug for day fontsets.
-
-1999-07-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_gen_uid): Returns a UID.
-	(ical_object_new): Use a UID when creating an event.  Should get
-	syncing done easier.
-
-1999-07-14  Nicholas J Kreucher <nick@poetic.com>
-
-	* calobj.c (skip_numbers): Actually skip over the numbers.
-	(ical_object_to_vobject): Test the proper variable for storing the
-	proper information.
-
-1999-07-14  Jean-Noel Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>
-
-	* timeutil.c (time_add_month): Fixed the problem with next month
-	going from a 31-day to a 30-day by adjusting the date to the
-	closest day at the end of the month.
-
-1999-06-07  Mike McEwan  <mike@lotusland.demon.co.uk>
-
-        * timeutil.c (time_add_month): Tell ktime' that we don't know
-        about daylight saving time so that it does *not* make adjustments
-        when we traverse a DST boundary.
-        (time_year_begin): ditto.
-        (time_year_end): ditto.
-        (time_month_begin): ditto.
-        (time_month_end): ditto.
-
-1999-06-16  Anders Carlsson  <anders.carlsson@tordata.se>
-
-	* main.c (new_calendar): Realize the toplevel widget when
-	--hidden is passed to gnomecal. This fixes a segfault.
-
-1999-06-04  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* gnome-cal.h, gnome-cal.c: Fix abort() problem with the year view.
-	(Bug #1367). Thanks to Owen Cliffe <oc197@ecs.soton.ac.uk> for
-	helping track it down.
-
-1999-06-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (daynumberlist): One line bug fix from Sergey I Panov.
-
-1999-06-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* view-utils.c (nicetime): Use %H instead of %k, as %k is a GNU
-	extension, not available in other systems.
-
-1999-06-01  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (daynumberlist): Work around broken software that
-	writes a broken month-of-day as "zero".  Use the dtstart date for
-	this on this event.
-
-1999-05-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* Makefile.am (install-data-local): help files be gone.  They are
-	now installed from the Docbook stuff.
-
-1999-05-26  Russell Steinthal  <steintr@condor.penguinpowered.com>
-
-	* gncal-todo.c main.c main.h prop.c: Added support for priorities
-	for todo items.  Doesn't do much, but you can set them and sort by
-	them.  (Use the properties box to enable them; should they be on
-	by default?)
-
-1999-05-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (parse_an_arg): Added missing break here.  It was causing
-	core dumps when invoked with --userfile.
-
-	* gnome-cal.c (gnome_calendar_set_view): Add some assertions here,
-	to pin point the bug reported on gnome-list.
-
-	* calobj.c (load_recurrence): Make intervals always exist.  a 0
-	interval is wrong.
-
-1999-05-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c: Removed unused macro CALENDAR_HEIGHT.
-
-1999-05-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (idle_handler): Set the canvas scroll region here,
-	not in size_allocate().  Also, use the correct width and height
-	based on the allocation and the precomputed minimum width/height
-	values.
-
-	* gnome-cal.c (setup_widgets): Set the scrollbar policy of the
-	scrolled window.
-
-	* main.c (setup_appbar): Use the correct type for the appbar.
-
-	* gncal-day-view.c: Removed unused function switch_to_day().
-
-	* gncal-day-panel.c (calendar_day_selected): Removed unused variable.
-
-1999-05-25  Nat Friedman  <nat@nat.org>
-
-	* doc/C/gnomecal.sgml: Fixed a typo.
-
-	* gnome-cal.c (setup_widgets): Added a scrolled window widget into
- 	which the year view is placed.
-
-	* year-view.c (CALENDAR_HEIGHT): The height of the total year view
- 	inside the scrolled window.
-	(idle_handler): Set the height of the year view to
- 	CALENDAR_HEIGHT.
-	(year_view_size_allocate): Set the scroll region of the year view
- 	canvas to allocation->width, CALENDAR_HEIGHT.
-
-1999-04-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (dump_todo): Add --todo flag to dump the todo contents.
-
-1999-04-19  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (add_activated): Use same hack used in edit_activated
-
-1999-04-16  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (edit_activated): Kill all grabs from the CList
-	before running the new dialog box.
-
-	This fixes the problem of button-3/Edit on the todo item blocking
-	the GUI (actually, the main window responds, but not the todo
-	window).
-
-1999-04-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (gncal_todo_init): Make sure we can get events for
-	button3.  The code for the nice popup menu was there but was not
-	getting invoked.
-
-1999-04-01 Steve Murphy <murf@e-tools.com>
-
-	* calobj.c (weekdaynum): Added this routine so Monthly recurrences
-	use the weekday field as a simple integer for a single weekday.
-
-	* calobj.c (load_recur_monthly_pos): Call weekdaynum instead of
-	weekdaylist. The interface only lets the user input a single value
-	anyway.
-
-	* calobj.c (ical_object_to_vobject): instead of code to output day
-	names from a bit array, use instead the value as an int and output
-	a single dayname.
-
-	* calobj.c (ical_object_generate_events): first_week_day gets the
-	day int instead of the first entry in the bit field. I inserted a
-	fair chunk of code to avoid calling generate if the day is out of
-	range for a month. It may be unneccessary, because mktime will
-	turn the extra days into a valid date the next month. But not all
-	mktimes are equal, I fear.
-
-	* eventedit.c (ee_store_recur_rule_to_ical): For case 3,
-	(Monthly), I added code to set the interval slot of the recur
-	struct; without this value, selecting a monthly recursing, by
-	date, would lead to an infinite loop broken only by a failure to
-	alloc more memory. Also, in the "by position" case, both
-	u.month_pos and u.month_day were being assigned values. This is a
-	mistake, as they are both part of an union, and the same
-	thing. The weekday field should get the recur_rr_month_weekday
-	value.
-
-	* eventedit.c (ee_rp_init_rule): set default day from the weekday
-	field instead of the u.month_day field, which is really the
-	month_pos value.
-
-	* gnome-cal.c (gnome_calendar_tag_calendar): Month days start with
-	1, not 0; thus, setting tm.tm_mday = 0, and then calling mktime
-	will generate a time corresponding to the end of the previous
-	month, which may have a mday anywhere from 28 to 31. The end time
-	just adds 1 to the month, so your end time may not cover the last
-	few days of this month, depending on what the biggest mday of last
-	month was. I changed it so tm_mday is set to 1 instead.
-
-1999-03-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c (convert_time_t_to_char): Made static.  Make it use
-	the full year format for strftime().
-
-1999-03-27  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* calobj.c: Include <config.h> So that strings get translated.
-
-1999-03-26  Tomas Ogren  <stric@ing.umu.se>
-
-	* prop.c (build_hours_menu): Made it respect 12/24h settings..
-	Doesn't show until next time you open the dialog.. yet..
-
-1999-03-24  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal-week-view.c (gncal_week_view_set): Did some i18n work
-	* eventedit.c (get_exception_string): Did some i18n work
-
-1999-03-24  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal-todo.c (gncal_todo_init): Made clist titles i18n:able
-	* main.c (poptOption): Added which views that are possible for
-	--view in the --help text (closes #367)
-	* main.c (dump_events): Added (short) month to the strftime and made
-	the strings i18n:able
-
-1999-03-23  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal/calobj.c: Added 2 paranthesis..
-	"foobar = d / 60*60" is _NOT_ the same as "foobar = d / (60*60)"
-	which caused heavy alarm-corruption with alarms between 2 hrs and
-	2 days.
-
-1999-03-23  Nat Friedman  <nat@nat.org>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): Set the
- 	recur->interval to the value of the recur_rr_month_period spin
- 	button if the event is being set "by day."  This closes bug #675
- 	as reported by bagfors@hpc2n.umu.se.  Thanks for the report!
-
-1999-03-10  Clifford R. Conover <rconover@montana.edu>
-
-	* gncal-todo.c (simple_todo_editor): Add support for Due Date when
-	adding a TODO item here.
-	(column_resized): New function
-	(init_column_sorting): New function.
-	(todo_click_column): New function.
-	(convert_time_t_to_char, make_overdue_todo_style): New functions.
-
-	* gnome-cal.c (gnome_calendar_todo_properties_changed): New
-	function used to update the TODO when the properties have been
-	chagned for it.
-
-	* prop.c (prop_apply_todo): Apply TODO properties.
-
-	* gncal-day-panel.c (todo_list_properties_changed): Update the
-	TODO display here.
-
-	* eventedit.c (date_edit_new): Made public
-
-1999-03-10  Craig A Soules (soules+@andrew.cmu.edu)
-
-	* timeutil.c, calendar.c, calobj.c, gncal-day-panel.c: Add support
-	for daylight time savings.
-
-1999-02-28  Martin Baulig  <martin@home-of-linux.org>
-
-	* gncal-full-day.c (recompute_motion): For DRAG_MOVE, DRAG_SIZE_TOP
-	and DRAG_SIZE_BOTTOM: call child_focus_out () if the child currently
-	has the focus.
-
-1999-02-27  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
-
-	* quick-view.c (QUICK_VIEW_FONTSET): Added Korean font to the
-	fontset string.
-	* mark.h (*_FONTSET): Likewise.
-
-1999-02-23  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_to_vobject): Save the owner/organizer of
-	the event.
-	(ical_object_create_from_vobject): Load the owner/organizer of the event.
-
-	* gncal-full-day.c (delete_occurance): Assign child to data (fixes
-	crash on "delete this occurrance").
-
-1999-02-22  Timur Bakeyev  <mc@bat.ru>
-
-	* calendar.c: According to configured values, use either tm.tm_zone
-	or tzname. In last case, also declare it extern.
-
-	* prop.c: langinfo.h not available everywhere. Wrapped. BTW, works
-	fine without it.
-
-1999-02-20  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c (init_username): Made use of g_get_{user,real}_name() instead
-	of our own home-brew...
-
-1999-02-17  Sergey Panov <sipan@mit.edu>
-
-	* gnome-month-item.c,gnome-month-item.h,goto.c,mark.h,
-	month-view.c,prop.c,quick-view.c,year-view.c: will define
-	fonts via fontset. Friendlier to locales that use iso8859-[^1]
-	and koi8-r encodings. Does not solve problem for Asian languiges
-	--- better solution is needed (e.g. standart GNOME fontstyles
-	defined in gtkrc).
-
-1999-02-16  Sergey Panov <sipan@mit.edu>
-
-	* main.c: Use N_() macro for color settings labels in
-	color_props structure.
-
-1999-02-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (goto_dialog): Indentation fixes.
-
-1999-02-15  Tomas Ogren  <stric@ing.umu.se>
-
-	* goto.c: Made a private copy of what localtime() returns, to be able
-	to keep the data after more calls to localtime().
-
-1999-02-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (save_default_calendar): New function.  Saves the
-	calendar if it is the user's default calendar
-
-	* gncal-full-day.c (unrecur_appointment):
-	* gncal-day-panel.c (day_view_range_activated):
-	* eventedit.c (ee_ok):
-	* gncal-todo.c (ok_button): Added autosave for the default
-	calendar.
-
-1999-02-09  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c: Removed the gtk_widget_realize call.
-
-1999-02-06  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
-
-	* gncal.desktop: Added Korean translations.
-
-1999-02-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (date_edit_new): New convenience function to create
-	a properly-configured date editor widget.
-
-1999-02-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.c (gncal_week_view_new): Make the calendar start
-	weeks on Monday if appropriate.
-	(gncal_week_view_time_format_changed): New function to notify the
-	week view that the time format has changed.
-
-	* gncal-day-panel.c (gncal_day_panel_new): Make the calendar start
-	weeks on Monday if appropriate.
-	(gncal_day_panel_time_format_changed): New function to notify the
-	day panel that the time format has changed.
-
-	* gnome-cal.c (gnome_calendar_time_format_changed): Tell the day
-	and week views that the time format has changed.
-
-1999-02-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (event_editor_init): Set the title of the event
-	editor window.
-
-1999-01-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_expose): Do not remove the
-	clipping rectangle here.
-
-	* view-utils.c (view_utils_draw_events): Remove the clipping
-	rectangle here, since the user of this function should not know
-	about it.
-
-1999-01-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): Improve this draw
-	routine.  Now it can split the text in lines and fit as many
-	events as possible.
-	(nicetime): Return strings without spaces at the beginning.
-
-	* gncal-day-view.c (gncal_day_view_expose): Move clip-clear
-	operation here.
-
-1999-01-29 Jason Tackaberry <tack@dok.org>
-
-	* gncal-full-day.c (child_popup_menu): if the user clicks on an
-        event that is an occurance, the menu will allow the user to delete
-        all occurances of this event, or just the selected occurance.
-        (delete_occurance): added.
-
-        * eventedit.c (append_exception): force the clist to select the
-        new exception.  (fixes segfault)
-        (delete_exception): if the last exception in the clist is deleted,
-        move the selection index up. (fixes segfault)
-
-1999-01-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (parse_an_arg): Add --hidden key to hide the calendar at
-	startup. Only works with GNOME window managers though :-(
-
-	* calendar.c (calendar_day_change): Reschedule alarms for the new day.
-
-	(calendar_init_alarms): Schedule an alarm for midnight to change
-	the calendar_day_begin/calendar_day_end.
-
-	* alarm.c (alarm_ready): If we reschedule, there is no need to
-	activate any pending alarms.
-
-1999-01-28  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_new): Insert the summary text here.
-	(child_focus_in): No need to raise the window, since we have
-	Spiffo(tm) layout code.  Boy, this is old code.
-	(gncal_full_day_focus_child): Now that GtkText works better, we
-	can avoid synthesizing a click which was causing grief, anyway.
-	(child_button_press): Grab the focus before popping up the menu.
-
-	* layout.c (find_index): Added a sanity check.
-
-	* gncal-full-day.c (child_destroy): Unmap and unrealize the child
-	before unparenting/destroying it.
-	(child_unrealize): Unrealize the widget.  What was I thinking?
-	(child_new): Save the focus_out_event signal connection id in
-	Child structure (in a new field).
-	(child_destroy): Disconnect from the focus_out_event signal, since
-	we don't want to get such an event when the widget is destroyed.
-	(gncal_full_day_destroy): Destroy the children properly; it was
-	leaking memory.
-
-1999-01-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (save_calendar_cmd): Warn if the calendar file has
-	changed.
-
-	* calendar.c (calendar_load, calendar_save): Keep track of the
-	modification time for the calendar file.
-
-1999-01-20  Nat Friedman  <nat@nat.org>
-
-	* gncal-full-day.c (gncal_full_day_key_press): Only trap printable
- 	characters such that hotkeys work.
-	(UNSELECT_TIMEOUT): Changed to 0.  Much saner behavior.
-
-	* prop.c (properties): Connect gnome_help_pbox_display to the
- 	GnomePropertyBox help button.
-
-1999-01-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* quick-view.c (quick_view_do_popup): Do not grab the mouse here
-	(it was being grabbed incorrectly, anyways).
-	(quick_view_map_event): Grab the mouse when the window is mapped.
-	This avoids the ugly "while (xGrabPointer () != Success)" hack.
-	(quick_view_button_release): Handle button releases here.
-
-1999-01-19  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c: do gtk_widget_realize on the toplevel window..
-
-1999-01-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Make the little
-	calendar start up with the correct date.
-
-	* gncal-week-view.c (gncal_week_view_set): Add the month to the
-	date range display label.
-
-1999-01-08  Nat Friedman  <nat@nat.org>
-
-	* main.c: Converted some more stuff to use the standards.
-
-1999-01-08  Nat Friedman  <nat@nat.org>
-
-	* main.c (setup_appbar): New function to create the status bar.
-	(setup_menu): Install menu hints.
-
-	Menu items updated to match the standards.  New Settings menu
- 	created.
-
-1998-12-30  Jeff Garzik  <jgarzik@pobox.com>
-
-	* gncal/calendar.c, gncal/gnome-cal.c, gncal/main.c,
-	  gncal/quick-view.c:
-	s/g_copy_strings/g_strconcat/
-
-1998-12-16  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	Rewrote the old and broken alarm system.  It never actually
-	worked properly.  Now it works properly, and I figured a nice way
-	to get the Audio alarm do something nicer (it is now like an alarm
-	clock :-).
-
-	* gnome-cal.c (calendar_notify): Now we take a CalendarAlarm to
-	actually distinguish which alarm was triggered.
-
-	* alarm.c (alarm_ready): The code was only activating the first
-	alarm.  Reschedule the timer upon delivery of an alarm.
-
-1998-12-14  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (idle_handler): Use the allocation size instead of
-	the old fields in the canvas structure.
-
-	* goto.c (create_days): Use gtk_widget_set_usize() instead of
-	gnome_canvas_set_size().
-	* quick-view.c (setup_event_list): Likewise.
-
-1998-12-09  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (simple_todo_editor): Use gnome_dialog_set_parent.
-	* goto.c (goto_dialog): ditto
-	* prop.c (properties): ditto.
-
-1998-11-23  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_exceptions): Update GtkClist usage.
-
-1998-11-23  Andrew T. Veliath  <andrewtv@usa.net>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Use
-	gtk_scrolled_window_add_with_viewport instead of
-	gtk_container_add (gtk changes).
-
-1998-11-23  Herbert V. Riedel <hvr@hvrlab.ml.org>
-
-	* eventedit.c: use GPOINTER_TO_INT
-
-	* gncal-todo.c: same.
-
-1998-11-22  Matthew Wilson  <msw@redhat.com>
-
-	* main.c: Fixed the popt event parsing callback to have the
-	correct number of arguments.  This stops it from segfaulting.
-
-1998-11-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_classification_widgets): Doh.  Fixed stupid bug
-	where the classification buttons were not being set correctly.
-	(ee_store_general_values_to_ical): Take into account the fact that
-	radio group lists are stored in reverse order of insertion.
-
-	* gncal-todo.c (gncal_todo_init): Use a scrolled window to put the
-	clist into.
-
-1998-11-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calendar.c (calendar_save): Backup the old file before saving
-	the caledar.
-
-1998-11-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c: Add ctype.h
-
-1998-10-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_direction): Add the offset from the
-	beginning of the current time unit (day/month/etc), otherwise it
-	does not work right, for example, you are on the 31st day of a
-	month and the next month is a 30-day one and you jump to the next
-	month.
-
-1998-10-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c: Changed a lot of stuff not to use the layout code
-	-- the month view's days are too small to display layout
-	usefully.  Now they display a little list of the events in each
-	day.  We also have a popup menu for the days in the month view.
-
-	* calendar.c (calendar_get_objects_in_range): Reverse the list so
-	that it is returned in increasing order.
-
-	* eventedit.c (event_editor_new_whole_day): New public function to
-	create an event for the complete span of day_begin to day_end.
-
-	* year-view.c (new_appointment): Use event_editor_new_whole_day().
-
-	* year-view.c (yv_popup_menu): Mark strings for i18n.
-
-1998-10-12  Ji Lee <g@ucsd.edu>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): The interval was
-	never being loaded from the spin button.
-
-1998-10-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c (month_view_update): Create a list of children and
-	lay them out nicely.  Lots of functions added for this purpose.
-	(adjust_segment): Main event segment adjustment routine.
-	(adjust_children): Adjusts all the children in the month view.
-	(child_create_segments): Creates the segments for a particular event.
-	(layout_children): Uses the generic layout engine to organize the children.
-
-1998-10-08  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c (clist_row_selected): Set the sensitivity of the
-	edit/delete buttons.
-	(gncal_todo_update): Likewise.  Thanks to Dirk Luetjens for the
-	bug report.
-
-	* layout.c: Do some cleanup; now we pass a struct with the layout
-	algorithm's state instead of passing a trillion parameters around.
-
-	* gncal-full-day.c (layout_children): Use the new generic layout
-	engine.
-	(child_compare): Sort keys are start time then end time, not just
-	start time.  This produces somewhat nicer results for the layout
-	algorithm.
-
-	The new layout code uses a partition of the time range occupied by
-	the events, rather than using a fixed time granularity.  This is
-	better since the different parts of the program that use the
-	layout module will have different semantics regarding snapping the
-	event bounds to a fixed "time grid".
-
-1998-10-07  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* layout.[ch]: New files that abstract the event layout code from
-	gncal-full-day.c into something useful for other parts of the
-	program.  Now all event layout is done here.
-
-	* Makefile.am (gnomecal_SOURCES): Added layout.[ch] to the list of
-	sources.
-
-1998-10-07  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* main.c (main): Replaced the 'gnome_client_new_default' call with
-	'gnome_master_client'.
-
-1998-10-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* timeutil.c (time_day_begin): Changed name from
-	time_start_of_day() to be consistent with the other begin/end functions.
-	(time_day_end): Likewise.
-
-	* calobj.c (ical_object_get_first_weekday): New public function to
-	get the first toggled day in a weekday mask.  Since we do not
-	support multiple weekdays in a monthly-by-pos rule, we just fetch
-	the first toggled one.
-	(ical_object_generate_events): Added a missing break statement.
-
-	* timeutil.c (time_month_end): Made it consistent with the rest of
-	the time begin/end functions -- now it returns the first second of
-	the *next* month.
-	(time_week_end): Actually implemented this function.  It will be
-	used when the week view is rewritten.
-
-	* calobj.c (time_in_range): Fix off-by-one in the comparison of
-	the time against the end time.
-
-	* gncal-full-day.c (expand_space): Fixed bug where the columns not
-	were being expanded due to a missing "slot + j".
-
-1998-10-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c (month_view_init): Use the font #defines.
-	(month_view_new): Set the colors of the month view upon creation.
-	(mark_current_day): New function to mark the current day in the
-	month view.
-	(month_view_set): Mark the current day.
-	(month_view_colors_changed): Mark the current day and colorify the
-	month item appropriately.
-
-	* month-view.h: Added year and month fields to the MonthView
-	structure.
-
-	* main.c: Renamed the Appointments color property, since it will
-	be used by the month view as well.
-
-	* goto.c (update): Set the current day's font and color.
-
-	* year-view.c (year_view_init): Set the fonts of the month items
-	when creating them.
-
-	* mark.h: Added new #defines for HEADING_FONT and TITLE_FONT.
-
-	* year-view.c (year_view_init): Use the new font #defines.
-
-	* prop.c (prop_apply_colors): Fixed to work with the
-	I-am-paranoid-and-I-need-to-size-my-ints changes to
-	GnomeColorPicker.
-	(color_spec_from_picker): Likewise.
-
-1998-09-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (create_days): Colorify the month item and prepare it for
-	prelighting here.
-
-	* main.c (color_props):  Changed the default colors to something
-	not dull.
-
-	* year-view.c (compute_min_size): New function to compute the
-	minimum size of the year view properly.
-	(year_view_size_request): Added two new fields to the year view
-	structure that contain the minimum size.  Return this in the
-	size_request method.
-	(year_view_new): Call compute_min_size to save the minimum size
-	for later use.
-	(idle_handler): Make it resize the items correctly.
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Reshape when
-	necessary.  This is needed becaues we now actually calculate a
-	minimum size for the month item based on the font sizes and paddings.
-	(check_heading_sizes): New function to calculate a minimum size
-	based on the headings' dimensions.
-	(check_day_sizes): New function to calculate a minimum size based
-	on the day number labels' dimensions.
-	(check_sizes): New function that computes a minimum size for the
-	month item.
-	(reshape): Now calls check_sizes() to ensure a minimum size for
-	the month item.
-
-	* year-view.c (mark_current_day): New function to mark the current
-	day in the year view.
-
-	* mark.c: Removed mark_current_day from here.
-
-1998-09-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* prop.c (fetch_color_spec): Changed name from fetch_prelight_spec
-	and made it conform to the new prelighting mechanism.
-	(fake_mark_days): Set the proper day attributes.
-	(reconfigure_month): Use colorify_month_item().
-	(fake_mark_days): Use mark_month_item_index().
-
-	* mark.c (colorify_month_item): New public function to reset the
-	colors in a month item.
-	(get_attributes): New internal function that creates an array of
-	attributes for the days in a month item.  This is the basis of all
-	the new optimizations to month item marking.
-	(unmark_month_item): Now it uses the attributes array to unmark
-	only the days that need unmarking.
-	(mark_event_in_month): Update the day attributes array.
-	(month_item_prepare_prelight): Changed the definition of the
-	prelight color query function.  Use the new function.
-	(day_event): Do color changes based on the day attributes array.
-	(mark_month_item_index): New public function to mark a single day
-	by index.
-	(mark_event_in_month): Use mark_month_item_index().
-
-	* gnome-month-item.c (gnome_month_item_num2child): Now takes an
-	int, not a GnomeMonthItemChild.
-	(gnome_month_item_child2num): Now returns an int, not a
-	GnomeMonthItemChild.
-	(gnome_month_item_num2day): Now takes an int, not a
-	GnomeMonthItemChild.
-
-	* goto.c (goto_dialog): Create the days before the year spin
-	button, because the year_changed callback expects the month item
-	to be created.  The new semantics of the spin button cause it to
-	emit a value_changed signal on the adjustment upon creation -- is
-	this the behavior we want from it?
-	(goto_dialog): Use gtk_window_set_modal() instead of the
-	deprectaed gnome_dialog_set_modal().
-
-	* quick-view.c (quick_view_new): Make it look not as crappy by
-	putting the title inside the frame.
-	(quick_view_do_popup): Fixed the pointer grab and added a cursor.
-	(create_items_for_event): Query the text width/height from the
-	text item using the new object arguments, so that the size of the
-	popup window can be set properly.
-
-	* year-view.c (do_quick_view_popup): Calculate a nice date string
-	for the popup window.
-
-1998-09-28  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* quick-view.[ch]: New file that presents a quick view of the
-	events in a particular day when the mouse is clicked on the year
-	view.  Work in progress.
-
-	* year-view.c (do_quick_view_popup): New function that creates a
-	quick view for the events in a day.
-
-	* Makefile.am (gnomecal_SOURCES): Added quick-view.[ch] to the
-	list of sources.
-
-1998-09-27  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c: Hotkey for File/Exit should be C-q, not C-x.
-
-1998-09-24  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (do_popup_menu): New function to execute the popup
-	menu in the year view.
-	(day_event): Invoke the popup menu with the context set to days.
-	(new_appointment): New function to create a new appointment from
-	the year view.
-	(do_jump): New function to do the appropriate view/date jumping
-	from the popup menu.
-
-	* main.c: Fixed two icons in the File menu.
-
-1998-09-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c: Added underlined shortcuts and accelerators to the main menu.
-
-1998-09-16  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* gncal-week-view.c (<gtk/gtklabel.h>): Include.
-	* gncal-week-view.h (<gtk/gtkvbox.h>): Include.
-
-1998-09-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (mail_notify): Fixed the bug reported about the mail
-	notification not beint sent until the program was terminated.
-
-1998-09-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (gncal_full_day_forall): Updated foreach ->
-	forall from Gtk changes, bleah.
-
-	* year-view.c (day_event): New function to handle events from
-	days.  Jumps to the day that is clicked.
-
-	* main.c: Use a watch cursor while the previous/today/next
-	functions are doing their job.
-
-	* mark.c (month_item_prepare_prelight): New public utility
-	function to prepare a month item for prelighting.  It will store
-	the proper prelight information and attach the appropriate signals.
-	(mark_current_day): Make the current day bold as well (useful for
-	color-blind people, I guess).
-
-	* prop.c (set_current_day): Reset the date in the sample calendar
-	and mark the current day.
-	(fake_mark_days): Mark fake events in the sample calendar.
-
-	* year-view.c (year_view_set): Use the general prelighting engine.
-
-	* goto.c (day_event): Just process button presses, as prelighting
-	is done behind the scenes now.
-	(update): Use the general prelighting engine.
-
-	* prop.c (create_colors_page): We can now configure the colors of
-	the monthly calendars!  Wheeeeee!  There are still some nits to be
-	fixed, which are listed in the TODO file.
-	(build_color_spec): New function to build color specifications.
-	(parse_color_spec): New function to parse color specifications.
-
-	* mark.c: Modified all functions to use the configured colors.
-	* goto.c: Likewise.
-
-	* main.c (colors_changed): New function that notifies all
-	calendars that colors have changed.
-
-	* gnome-cal.c (gnome_calendar_colors_changed): New function that
-	notifies all the views that the colors have changed.
-
-	* month-view.c (month_view_colors_changed): New function that
-	notifies the month view that colors have changed.
-
-	* year-view.c (year_view_colors_changed): New function that
-	notifies the year view that colors have changed.
-
-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for
-	outline and day box colors.
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Added
-	outline_color, outline_color_gdk, day_box_color, and
-	day_box_color_gdk arguments to month items.  These are convenient
-	to quickly set the colors of the month item.
-	(gnome_month_item_get_arg): Likewise.
-
-	* main.[ch]: Added a global array of structures for color preferences.
-
-1998-08-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c: Small code cleanup.
-	(day_event): Upon receiving a LeaveNotify event, Reset the day's
-	background to the correct color.
-
-1998-08-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* mark.[ch]: New files with utility functions to mark calendars
-	with their events.
-
-	* mark.c (mark_month_item): New public function to mark a month
-	item with events.
-	(unmark_month_item): New public function to unmark all the days in
-	a month item to their default appearance.
-
-	* year-view.c (year_view_set): Use the new unmark_month_item() and
-	mark_month_item() to mark the months with events.
-
-	* goto.c (update): New function that updates the calendar in the
-	Go-to dialog by marking the days.
-
-	* timeutil.c (time_year_begin): Modified to take a time_t value.
-	(time_year_end): Likewise.
-	(time_month_begin): Actually implemented this function, which was
-	in the header file but not here.
-	(time_days_in_month): New public function that returns the number
-	of days in a month.
-
-	* Makefile.am (gnomecal_SOURCES): Added mark.[ch] to the sources.
-
-	* year-view.c (unmark_days): Use unmark_month_item().
-
-	* gncal-full-day.c (gncal_full_day_destroy): Fixed crash when
-	destroying the full day view.  The full day's destroy method is
-	unusual in that it destroys the list of child widgets itself, as
-	it does not have a remove method, so it needs to reset the list to
-	NULL.
-
-1998-08-27  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (build_month): Now does the correct thing
-	when the user wants weeks to start on Monday.  Now all the Monday
-	special casing, as far as day numbering is concerned, is only in
-	this function.
-
-	* year-view.c (mark_days): This function marks the days that have
-	events in them.  It also fixes a memory leak in the old
-	implementation (it was leaking the whole list).
-	(unmark_days): New function used to unmark all the days in the
-	year view.
-	(mark_event): New function that marks all the days that are
-	spanned by a time range.  It also fixes the bug in the old
-	implementation where it could possibly mark days past the ends of
-	the year (if the event crosses year boundaries, for example).
-
-	* timeutil.c (time_year_begin): Take the year parameter since year
-	1, not 1900.
-	(time_year_end): Likewise.
-
-	* year-view.c (year_view_size_allocate): Now changing the size of
-	the calendars is done in the idle loop.
-	(idle_handler): This function actually does the resizing of the items.
-
-	* year-view.h (struct _YearView): Added idle_id and need_resize
-	fields.
-
-1998-08-26  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c: Beginning of the new year view.  Sizing and event
-	marking needs to be finished.
-
-	* gnome-cal.c: Updated for year-view.
-	(gnome_calendar_time_format_changed): Use year_view_time_format_changed().
-
-	* year-view.[ch]: Renamed the gncal-year-view.[ch] files to
-	year-view.[ch].
-
-	* Makefile.am (gnomecal_SOURCES): Updated year-view.[ch] in the
-	list of source files.
-
-1998-08-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (create_days): Set the heading color of the month item.
-
-	* main.c: Use GNOME_STOCK_PIXMAP_JUMP_TO, now that it exists,
-	instead of goto.xpm.  Also, removed goto.xpm from cvs.
-
-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for
-	the heading and day number fonts.  Added fields for heading and
-	day number label colors.
-
-	* gnome-month-item.c (gnome_month_item_class_init): ARG_DAY_NAMES
-	should be write-only.  Also, added arguments for heading and day
-	number fonts.  Added arguments for heading and day number colors.
-
-1998-08-24  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* prop.c (build_two_radio_group): Doh.  Set the state of the radio
-	buttons properly.
-
-	* month-view.c (month_view_time_format_changed): New public
-	function that notifies the month view of a time format change.
-
-	* gnome-cal.c (gnome_calendar_time_format_changed): New public
-	function that notifies the calendar of a time format change.
-
-	* main.c (time_format_changed): Use gnome_calendar_time_format_changed().
-
-	* month-view.c (month_view_update): New public function to update
-	the month view when an event changes.  This is still unfinished.
-	(month_view_set): New public function to set the month in the
-	month view.
-
-	* gnome-cal.c (gnome_calendar_direction): Add case for month view.
-	(gnome_calendar_set_view): Likewise.
-	(gnome_calendar_update_all): Likewise.
-
-	* timeutil.c (time_add_week): Implemented the time_add_week()
-	function, which was on the header file.
-	(time_add_month): Added public month-adding routine.
-
-	* gnome-cal.c (gnome_calendar_get_current_view_name): Add case for
-	month view.
-	(gnome_calendar_goto): Likewise, and set the time on the month view.
-
-	* month-view.c (month_view_new): Now it takes the calendar plus
-	the time_t representing the month.
-
-	* gnome-month-item.h: Added documentation on the object arguments
-	for the month item.
-
-	* month-view.c (month_view_init): Added a month/year heading to
-	the month view.
-
-	* TODO: Updated the TODO list a bit.
-
-	* main.c (gnome_cal_file_menu): The preferences menu option should
-	go in the File menu.
-	(gnome_cal_edit_menu): Added stock pixmaps to the menu items.
-	(gnome_cal_menu): Renamed the Calendar menu to Edit.
-	(gnome_cal_help_menu): Use "About Gnomecal", not just "About".
-
-	* prop.c (hour_activated): Notify the property box that it has changed.
-
-	* main.c: Changed the Properties menu item to Preferences.  These
-	are global application preferences, not a single calendar's
-	properties.
-
-	* prop.c (prop_apply): Save the week_starts_on_monday flag to the
-	configuration file.
-	(properties): Added a check button for weeks starting on Monday.
-	(properties): Beautified the Preferences dialog.
-
-	* month-view.c (month_view_init):
-	* goto.c (create_days): Set the month item to start weeks on
-	Monday if appropriate.
-
-	* main.c (init_calendar): A boolean is not an hour, so don't
-	range_check_hour() on it.
-	(init_calendar): Added a global week_starts_on_monday flag.
-
-	* main.h: Added global week_starts_on_monday flag.
-
-1998-08-21  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_create_from_vobject): If mail alarm or
-	program alarm are missing the action, then set an empty default.
-
-1998-08-18  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (gnome_month_item_day2index): New public
-	function to get the displayed day index of the specified date.
-
-	* gnome-cal.c (gnome_calendar_goto_today): New public function to
-	jump to the current day.
-
-	* goto.c (day_event): Jump to the selected day when the user
-	clicks the mouse, and prelight days as appropriate.
-
-	* timeutil.c (time_from_day): New public function to build a
-	time_t from a year/month/day triplet.
-
-	* gnome-month-item.c (gnome_month_item_num2child):
-	(gnome_month_item_child2num): New public functions to convert an
-	index into a child and vice-versa, respectively.
-	(gnome_month_item_num2day): New public function to convert a child
-	number into a displayed day number.
-
-	* goto.c (goto_dialog): Doh, use gnome-dialog properly :-)
-
-	* gnome-month-item.c (create_items): Use g_strdup()ed day names
-	from the start.
-
-1998-08-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c (gnome_toolbar): Made it use goto.xpm.
-
-	* Makefile.am (EXTRA_DIST): Added goto.xpm to the list of files.
-
-1998-08-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Doh.  Actually
-	recalculate the days using the month and year.
-
-	* main.c: Added "Go to" button to quickly jump to a specific date.
-
-	* goto.c: New file that defines the quick go-to date dialog.
-
-	* Makefile.am (gnomecal_SOURCES): Added goto.c to the sources.
-
-1998-08-11  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* main.c (new_calendar): Made title i18n friendly. This was bug
-	#215.
-
-	* eventedit.c (ee_store_recur_end_to_ical): Set recur->enddate to
-	recur->_enddate, not to itself, when adding recurring event and
-	supplying an end date. This fixes (at least part of) bug #99.
-
-1998-08-10  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.[ch]: Start of the month view widget.  This will use
-	the generic month item and extend it to have the semantics desired
-	for the gnomecal month view.
-
-	* gnome-month-item.[ch]: New generic canvas item for the month
-	view and the "small calendars".  This is intended to be a
-	high-level display engine for monthly calendars.  This is a work
-	in progress.
-
-	* gnome-cal.h (GnomeCalendar): Added a month_view field.
-
-	* gnome-cal.c (setup_widgets): Create the month view and insert it
-	into the notebook.
-
-	* Makefile.am: Added month-view.[ch] and gnome-month-item.[ch] to
-	the sources.
-
-1998-08-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c (about_calendar_cmd): Use an array of const strings to
-	keep gcc happy.
-
-	* alarm.c (alarm_compare_by_time): Use gconstpointer to keep gcc happy.
-	* calendar.c (calendar_object_compare_by_start): Likewise.
-	* gncal-full-day.c (child_compare_by_start): Likewise.
-
-1998-07-07  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c: Add support for --view flag.
-	(session_save_state): Save the view mode;
-	(new_calendar): Now takes a view mode flag.
-
-	* gnome-cal.c (gnome_calendar_get_current_view_name): New
-	function for enhancing the session management support for
-	gnomecal.
-	(gnome_calendar_set_view): New function that makes a given page
-	active.
-
-1998-07-01  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* gncal.desktop: Added Portuguese translation.
-
-Mon Jun 22 13:01:16 1998  Havoc Pennington  <hp@pobox.com>
-
-	* main.c (session_save_state): Use gnome_geometry_string to get
-	the geometry string.
-
-1998-06-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_rule): Do not subtract 1 from
-	tm->tm_mday for the default_day.
-
-	* gnome-cal.c (gnome_calendar_new):
-	(gnome_calendar_goto): Use the start of the day -- things expect
-	it to be that way.
-
-1998-05-27  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): Fill in
-	ical->recur->interval from value in spin_button. This ixed an
-	infinnite loop.
-
-1998-05-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_draw): Paint the decorations correctly.
-	(child_draw_decor): Paint the recurrence/bell icons correctly.
-
-1998-05-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_rule): Use the contents of
-	ee->ical->dtstart for computing the predefined values of the recurrence.
-
-	* gncal-full-day.c (gncal_full_day_unrealize): Fix the gc
-	destruction in the unrealization code and fix the pixmap unrefing.
-
-	* main.c (close_cmd): Remove a bad hack that disabled calendar
-	widget destruction.
-
-	* calobj.c (ical_object_generate_events): Fix for the weekly event
-	generation.  Was reported on the bug tracking system.
-
-1998-05-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (layout_children): Implemented ultra-cool
-	layout for the events that share the same time range.  Gals and
-	guys you can now drop Outlook on the recycle bin.
-
-	Which reminds me.  We do not have a recycle bin.  How could that
-	happen in a project as cool as this one?  Someone explain this to
-	me.
-
-1998-05-18  Federico Mena  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (paint_back): Eliminated unnecessary border repainting.
-
-Sun May 17 17:55:03 1998  Havoc Pennington  <hp@pobox.com>
-
-	* gncal-todo.c (simple_todo_editor): Close dialog when return is pressed.
-
-1998-05-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (mark_gtk_calendar_day): Bug free version of the
-	range computation in place.
-
-	* gncal-year-view.c (year_view_mark_day): Use the same new version
-	of the range computation here.
-
-	* calobj.c (ical_object_generate_events): Fix the begin/end
-	condition.
-
-1998-05-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (isodate_from_time_t): Do not add the spurious
-	padding.
-
-	* calobj.c (store_date_list): Bug fix:  I was using the wrong
-	pointer when saving the exception date list.
-	(set_date_list): Bug fix:  load correctly the complete exception
-	date list.
-	(set_date_list): Use ',' for the exception date separator as the
-	versit people can not get their standard right.
-
-	* gncal-full-day.c (unrecur_appointment): Support for making an
-	existing recurrent event `movable' for a day.
-
-	* calobj.c (ical_object_add_exdate): New routine, used to add
-	exception dates.
-	(ical_object_duplicate): New routine:  used to do the magic
-	recur->no-recur event.
-
-1998-05-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (new_appointment): Use gtk_calendar freeze/thaw
-
-	* gncal-year-view.c (gncal_year_view_set_year): Use gtkcalendar freeze/thaw.
-
-	* eventedit.c (event_editor_init): Use gnome_dialog_set_close to
-	avoid the ugly warning.
-
-	* main.c (display_objedit): Default to the day the user is looking
-	at.
-
-1998-05-05  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (full_day_size_allocated): Do not emit a value
-	changed signal if the value is the same.
-
-1998-05-04  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (prop_apply): Only run the apply code once.
-
-1998-05-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (update): Draw the day at startup.
-	(gncal_day_panel_set): Fix selected-day display.
-	(gncal_day_panel_new): Switch day on double clicks, not on single
-	clicks.
-
-	* calobj.c (ical_object_compute_end): Removed debug messages.
-
-1998-04-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (prop_apply): Do not call prop_cancel, ths is now using
-	GnomePropertyDialog.
-
-1998-04-29  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-week-view.c (sync_week): Use gnome_calendar_tag_calendar.
-
-	* gnome-cal.c (gnome_calendar_tag_calendar): New routine used to
-	fill a gtk_calendar with the events on a GnomeCalendar object.
-
-	* gncal-week-view.c (gncal_week_view_new): Set the week to the day
-	we double clicked.
-
-1998-04-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (calendar_notify): Apply black magic to get mail
-	notifications to work.
-
-	* gncal-full-day.c (child_focus_out): Temporary optimization, the
-	child_focus_out is constantly calling the
-	gnome_calendar_object_changed when the property editor has been
-	invoked.  This happens every time the mouse moves crosses the main
-	window.
-
-	* calendar.c (calendar_object_changed): Reschedule alarms when a
-	calendar object has changed its times.
-
-Sat Apr 25 22:20:45 1998  Havoc Pennington  <hp@pobox.com>
-
-	* eventedit.c, eventedit.h: Descend from GnomeDialog. Took vbox
-	out of class structure; use GnomeDialog vbox
-	instead. gnome_dialog_set_destroy instead of destroying in button
-	callbacks. Don't create buttons, separator, or vbox manually.
-	#include <libgnomeui/gnome-dialog.h>.
-
-1998-04-24  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_create_from_vobject): Fixed alarm loading;
-	Load snooze time and snooze count
-
-1998-04-23  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* calendar.c (calendar_save): Actually save the to-do entries.
-
-	* gncal-todo.c (simple_todo_editor): Now you can add and edit
-	to-do entries.
-
-1998-04-22  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: Made it use popup_menu().
-
-	* popup-menu.c: New file with utility functions for creating popup
-	menus.  Maybe such a thing would be useful in libgnomeui, a la
-	gnome-app-helper?
-
-	* Makefile.am (gnomecal_SOURCES): Added popup-menu.[ch] to the sources.
-
-1998-04-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (properties): Added Calendar properties editor.
-	(properties): Make the code use a propery box.
-
-	* main.c: Save/load properties (fix to old commit).
-
-1998-04-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c: New widget for editing TODO lists.  This will be
-	worked on a lot.
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-todo.[ch] to the sources.
-
-	* gncal-day-panel.c: Make it use the new TODO widget.
-
-1998-04-21  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (isodate_from_time_t): Do not save with the global
-	time flag (Z at the end of the isodate).  When we figure out a way
-	to load times in GMT time, we will add this back
-
-	* view-utils.c (popup_menu): Moved this routine here as there are
-	more users of this code.
-
-	* gncal-day-view.c (gncal_day_view_class_init): Add button press
-	handler.
-	(new_appointment): New routine for creating appointments on a day.
-
-
-
-	* main.c (save_ok): Added call to gtk_window_set_wmclass.
-
-	* gncal-day-panel.c (calendar_day_selected): Fix, years for mktime
-	should substract 1900 and gtk_calendar stores years relative to
-	year 0.
-
-	* gncal-week-view.c (gncal_week_view_new): Make the week view
-	descend from VBox so that we can add a label to it.
-	(gncal_week_view_set): Display the ending day of the week
-	correctly.
-
-	Added a label that displays the week range.
-
-1998-04-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c: Made it use GncalDayPanel.
-
-	* gncal-day-panel.c: New widget for the day view in the main
-	calendar toplevel.  It basically takes care of everything
-	gnome-cal did by hand with respect to the day view.
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-day-panel.[ch] to
-	the rules.
-
-	* main.c: Added a separator between the About menu item and the
-	help topics.
-
-1998-04-20  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_ok): Mark the event as non-new after accepting changes.
-
-1998-04-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (gncal_full_day_get_day_start_yoffset): New
-	public function that returns the y offset for the row
-	corresponding to the "day begin" time.
-
-	* gncal-full-day.c (gncal_full_day_key_press): Now any printable
-	keystroke (not just Return) will activate the selected range.
-
-	* gncal-full-day.c (paint_back): Made it use the new paint_row
-	function instead of painting everything directly.  We calculate
-	areas in a smarter way so there is even less flicker than before,
-	especially when selecting regions.
-
-	* eventedit.c: Sensitize recurrence widgets properly.
-
-	* calobj.c (duration_callback): Pass the correct pointer type to
-	is_date_in_list().
-
-1998-04-20  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (duration_callback): Take exception dates into
-	account.
-
-	* gncal-full-day.c (new_appointment): Setup the event editor dates
-	to those of the currently displayed day.
-	(gncal_full_day_selection_range): Use sensible values in the case
-	no range is selected.
-	(new_appointment): Events now use the current day for event creation.
-
-	* view-utils.c: Pretty up the time display.
-
-	* calobj.c (ical_object_compute_end): Initialize
-	ico->recur->enddate, otherwise we loop forever during final date computation.
-
-	* eventedit.c: Now recurrence is toggled by a radio button in the
-	recurrence page, as the checkbox is confusing.
-
-	* calobj.c (is_date_in_list): Add support for the exclussion
-	dates.
-
-1998-04-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-year-view.c (double_click): Fix this routine as well.
-
-	* gncal-week-view.c (jump_to_day): Bind the gtkcalendar signals to
-	the week.
-
-	* gncal-year-view.c (gncal_year_view_set_year): Put things in the
-	proper range.  Now the year view actually matches this year.
-
-	* gnome-cal.html: Added small documentation.
-
-	* main.c: Add more icons to the menus;  Rename some menubar
-	entries;  Add `new' icon to the toolbar.
-	(dump_events): Added argument handling and dumping of events from
-	the command line.  Extremely cool.
-
-	* getdate.y: Taken from the CVS source code.  Used for date
-	parsing in the command line.
-
-	Internationalized getdate.y.  Wee!  It even works with spanish.
-
-	* calobj.c (ical_object_to_vobject): Add Quoted printable property
-	to items containing new lines.
-	(duration): Use unsigned integers, to work around buggy calendar
-	files generated by korganizer.
-
-	* main.c (save_calendar_cmd): Do not ask for file name if we are
-	saving.
-	(save_as_calendar_cmd): New command.
-
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* alarm.c (alarm_kill, alarm_init, alarm_add): Implement the alarm
-	management framework.
-
-1998-04-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* calobj.c (ical_new): Added mandatory status property.
-	(ical_object_to_vobject): Only store "related" list if it exists.
-	(store_list): Add terminating null char and free the correct data.
-
-	* main.c (save_calendar_cmd): Implemented calendar saving.
-	(open_calendar_cmd): Implemented calendar loading.
-	(new_calendar_cmd): Implemented calendar creation.
-	(new_calendar): Don't load our test calendar by default.
-
-	* gncal-full-day.c (delete_appointment): Delete appointment implemented.
-
-	* eventedit.c (ee_store_recur_values_to_ical): Free/create
-	ical's recurrence appropriately.
-	(ee_rp_init_rule): Initialize all missing parameters from ical.
-	(ee_rp_init_ending_date): Initialize missing fields from ical.
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_remove_object): Add support for
-	removing objects.
-
-1998-04-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_init_recurrence_page): New function that creates
-	the recurrence page in the toplevel notebook.
-	(ee_store_recur_values_to_ical): Now we can also store the recurrences.
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_generate_events): Implement
-	RECUR_MONTHLY_BY_POS implemented.
-	(ical_object_create_from_vobject): Fix the alarm
-	initialization code.
-	(save_alarm): Save alarms.
-	(ical_object_generate_events): Fixed the recurrent code to take
-	into account the recur->endate field (if at all specified).
-
-	(ical_object_to_vobject): Implement recurrence rule saving.
-
-1998-04-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_store_alarm): Use menu_shell->children, not
-	menu->children.  Why does GtkMenu have a children field in the
-	object structure?
-	(check_dates): New function that insures that start_date < end_date.
-	(check_times): In addition to checking whether the event spans the
-	whole day, now it insures that start_time < end_time.
-
-	* gncal-full-day.c (child_set_size): Now children get bigger
-	temporarily while they are focused.  This allows the handles not
-	to "overlap" the rows used by the child and thus allow editing of
-	very thin events.
-	(recompute_motion): Fix for new child coordinates.
-	(gncal_full_day_expose): Make it use find_child_by_window()
-	instead of looking for it by hand.
-
-	* bell.xpm recur.xpm: XPM files for events with alarm and
-	recurrence, respectively.
-
-1998-04-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (button_1): Preserve the up/down cursor while dragging.
-
-	* gncal-full-day.c (child_draw): Now children have a vertical
-	handle as well.  This can be used to move the child anytime, not
-	only when it is focused.
-	(recompute_motion): Modified for new drag behavior.
-
-	* eventedit.c (ee_init_general_page): The general_owner may be
-	null.  Do the proper thing when creating the label.
-	(ee_ok): Update the gnome calendar appropriately.
-
-	* timeutil.h:
-	* gncal-year-view.h: Add some missing prototypes.
-
-	* gncal-full-day.c (child_popup_menu): Set the sensitivity of menu
-	items according to whether the ical object is being edited or not.
-
-	* eventedit.c (event_editor_new): Set the "being edited" flag on
-	the ical object (stored as the ical object's user data).
-	(event_editor_destroy): Release the flag.
-
-	* calobj.h: The iCalObject structure now has a generic user_data pointer.
-	* calobj.c (ical_object_set_user_data ical_object_get_user_data):
-	Functions to set this data.
-
-	* gncal-full-day.c (child_button_press): Do child popup menu correctly.
-
-	* main.c (about_calendar_cmd): Fixed my address and added Arturo
-	to the authors in the about box.
-
-	* gncal-full-day.c (find_child_by_window): Compare child's widget
-	windows by user_data (which will be the parent widget, that is,
-	the text widget).  We cannot assume that child->widget->window
-	will be *the* window we are interested on because there may be
-	child widgets with multiple windows.
-
-1998-04-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_foreach): Define iterator routine.
-
-1998-04-15  Arturo Espinosa Aldama  <arturo@nuclecu.unam.mx>
-
-	* gncal-year-view.[hc]: Now using time_t for new and set.
-	  Random fixes, as well.
-
-1998-04-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (button_3): New popup menus activated with
-	mouse button 3.
-	(create_appointment): Create a new appointment from the popup
-	menus.  See the FIXME.
-
-1998-04-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (layout_kill_rows): Routine to destory rows
-	array properly.
-
-	* gncal-year-view.c (gncal_year_view_new): Add missing year in
-	call to strftime.
-
-	* calobj.c (ical_object_create_from_vobject): Fixed memory leaks
-	from the return values of versit's fakeCString.
-
-1998-04-14  Arturo Espinosa Aldama  <arturo@nuclecu.unam.mx>
-
-	* gncal-year-view.[hc]: New widget for the year view.
-	* Makefile.am: added required compilation of the new files.
-
-1998-04-14  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (event_editor_setup_time_frame): Fixed some table
-	expansions to make the dialog look nicer when resized.
-
-	* calobj.c (ignore_space): Fixed compiler warning about unused
-	computed value.
-	(ocurrencelist): Replace str by p confusion.  Removed unused
-	variables value and q.
-	(daynumber): Fixed a couple of warnings about unused values.
-	(load_recurrence): Removed unused variable c.  Added a default
-	clause to the switch(type).
-
-	* eventedit.c (ee_rp_init_frequency): Removed unused variable content.
-	Fixed a compiler warning by adding a missing cast.
-
-	* calobj.c (ical_object_create_from_vobject): Make the
-	load_recurrence() part work correctly.  Eliminated use of
-	syntax_error variable.
-
-1998-04-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_key_press): Unfocus the child and focus
-	the parent fullday widget when the user presses Esc.
-
-	* gncal-week-view.c (gncal_week_view_update): Now takes object and
-	flags parameters.
-	* gncal-day-view.c (gncal_day_view_update): Likewise.
-	* gncal-full-day.c (gncal_full_day_update): Likewise.
-	(child_focus_in): New function.  In conjunction with
-	child_focus_out(), these only display the handles in the child
-	when it is focused.  The result is that the user can see more of
-	the child's text when nothing is focused, and we can also display
-	fatter and nicer drag handles.
-
-	* gnome-cal.c (gnome_calendar_object_changed): Now takes an
-	additional flags parameter
-	(gnome_calendar_update_all): Made function static.  Now takes
-	changed object and flags parameters as well.
-	(gnome_calendar_object_changed): Now takes additional flags
-	parameter to indicate what changed in the specified object.
-
-	* calobj.h (CalObjectChange): New enum with flags to describe what
-	has been changed in an object.
-
-	* gncal-full-day.h:
-	* gncal-full-day.c (gncal_full_day_focus_child): New function to
-	let the outside world decide which child to focus.
-	(gncal_full_day_focus_child): Bleah.  We have to synthesize a
-	click because GtkText will not set the cursor when you focus it.
-
-	* gnome-cal.c (day_view_range_activated): Focus the new child in
-	the full day widget.
-
-	* eventedit.c (event_editor_setup_time_frame): Re-aligned some
-	widgets to make it look prettier.
-	(ee_alarm_widgets): Likewise.
-	(ee_init_general_page): Likewise.
-	(ee_classification_widgets): Likewise.
-	(event_editor_init_widgets): Likewise.
-
-	* gnome-cal.c (day_view_range_activated): Create new object and
-	add it to the calendar.  You can now select a range in the
-	full-day view, hit Return, and a new event will be added at the
-	selected range.  I still have to figure out how to focus this new child.
-
-	* gncal-full-day.c (paint_back): Rewrote function to avoid
-	painting an area more than once -- eliminate flicker.
-	(paint_back_rows): New function that calls paint_back() only for
-	the area of the specified rows.
-	(gncal_full_day_button_press):
-	(gncal_full_day_button_release):
-	(gncal_full_day_motion): Made these functions use
-	paint_back_rows() instead of paint_back(), to eliminate flicker.  Wheee!
-
-1998-04-12  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c (setup_day_view): We now connect to the
-	range_activated signal of the fullday widget instead of catching
-	key presses ourselves.
-	(day_view_range_activated): New function that creates a new
-	iCalObject and inserts it into the calendar, not finished yet.
-
-1998-04-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (get_time_from_rows): New function, calculates
-	a pair of time_t values from the specified start and number of rows.
-
-	* gncal-full-day.h (GncalFullDayClass): New signal
-	"range_activated".  It is emitted when a range is selected and the
-	user hits Return.
-	(gncal_full_day_selection_range): New function, returns the
-	selected range.
-
-	* gncal-full-day.c (struct drag_info): Moved selection information
-	to their own fields instead of sharing the child's drag fields.
-	This allows us to keep the selection when a child is moved.
-	(recompute_motion): Made the case when (row < di->sel_click_row)
-	work correctly.
-
-1998-04-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_goto): Add support for navigating
-	on the day view.
-
-	* timeutil.c (time_start_of_day, time_end_of_day, time_day_hour):
-	New time manipulation functions.
-
-	* eventedit.c (ee_rp_init_frequency): Add the different frequency
-	editors to a notebook.  Make the notebook startup on the entry
-	selected recurrence type;
-
-1998-04-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (recompute_motion): Now we support selecting a
-	range in the main window (by clicking+dragging).  It flickers
-	horribly and is not perfect, but it is a start.
-
-1998-04-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: #include <string.h>
-
-	* gncal-full-day.c (child_map): Show instead of just map the child
-	widget (otherwise the text widget gets confused and will not focus).
-
-	* calobj.c (ical_object_to_vobject): Quote chars as 'x', not "x".
-
-	* calobj.h: Added prototype for ical_object_to_vobject().
-
-	* gnome-cal.c (gnome_calendar_object_changed): New function.  This
-	should be called when a calendar object is changed.
-
-	* gncal-full-day.c (update_from_drag_info): Call
-	gnome_calendar_object_changed() instead of updating manually.
-
-	* calendar.c (calendar_add_object):
-	(calendar_remove_object): Set the modified flag to true.
-
-	* gncal-full-day.c (gncal_full_day_draw): Finished implementing
-	this function.
-
-1998-04-08  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* gncal.c (update_calendar): Say `#if 0', not `#ifdef 0'.
-
-1998-04-07  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c: Removed unused global variable parent_class.
-
-	* eventedit.h: Renamed gtk_window field to window.
-	Made the parent_class field in the EventEditorClass structure be a
-	GtkWindowClass, not a gnome property box class.
-	Added prototype for event_editor_get_type().
-
-1998-04-06  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.c (gncal_week_view_new): Use the new
-	gtk_table_set_homogeneous() instead of setting the variable directly.
-
-1998-04-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_create_ae): Make it return void.
-	(ee_alarm_widgets): Remove some unused variables.
-	(ee_store_alarm): Make it return void.
-	#include <string.h>
-
-	* eventedit.h: #include "gnome-cal.h"
-
-	* calobj.c (list_free): Don't use g_free in the g_list_foreach.
-
-	* calendar.h: Add prototype for calendar_load().
-
-	* timeutil.h: Add prototypes for time_add_*().
-
-	* calendar.c:
-	* calobj.c:
-	* eventedit.c:
-	* gnome-cal.c: #include "timeutil.h"
-
-	* gncal-day-view.c (gncal_day_view_size_request): Make the minimum
-	width equal or larger to the title width.
-
-	* main.c: #include "eventedit.h"
-	(main): Add a return statement.
-	(new_calendar): Show stuff *after* the calendar has been loaded.
-
-	* gnome-cal.c (gnome_calendar_load): Update the day view.
-	(setup_widgets): Hackish setup of a day view widget - will fix later.
-	(gnome_calendar_init): Initialize all fields.
-
-	* gnome-cal.h: Added day_view field.  Maybe this should be changed
-	when the a complete day view panel is complete.
-
-	* gncal-day-view.c (gncal_day_view_update): Draw after update, not
-	before.
-
-1998-04-06  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* versit/.cvsignore: New file.
-
-Fri Apr  3 22:31:54 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* calendar.c: Include <config.h>.
-
-1998-04-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (time_add_year, time_add_year, time_add_week):
-	Routines for time manipulation.
-
-	* calobj.c (ical_object_destroy): Full destruction of the object.
-
-	* eventedit.c: Finished the main event editor form;  It still
-	lacks the details and the recurrence bits.  It now adds events
-	and cancels.
-
-1998-04-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): The "better" format
-	string for strftime() wasn't better, after all :-(
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: New full-day widget.  It is still a work in
-	progress.  It will be similar to M$ Schedule's nifty full day view
-	widget, but with Gtk's elegance :-)
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-full-day.[ch] to the sources.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c: Object editor widget.  We dropped ObjEdit.
-
-	* timeutil.c (time_from_isodate): Fix.
-
-	* view-utils.c (view_utils_draw_events): Changed the display
-	formats.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): Use better format
-	specifier for strftime().
-	(view_utils_draw_textured_frame): Ultra-nifty function to draw
-	textured "metal" frames, like Netscape's handles.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_update): Day events are now
-	cached inside the widget.  They get initialized at this time.
-
-	* view-utils.c (view_utils_draw_events): Use the list of events.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_set_shadow): New customization
-	function.  We can't decide on a stupid border type :-)
-	(gncal_day_view_init): Made GTK_SHADOW_ETCHED_IN be the default
-	shadow type.  Looks good.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c: New main program that uses our new datatypes and
-	objects.
-
-	* calendar.c (calendar_load_from_vobject, calendar_load):
-	Implement loading of vCalendar objects and vCalendar files.
-
-	* calobj.c (ical_object_create_from_vobject): Implement loading of
-	vCalendar event and todo objects.
-
-	* timeutil.c (isodate_from_time_t): New function.
-
-	* gnome-cal.c, gnome-cal.h: Implement a toplevel widget, derived
-	from GnomeApp.  It holds all of the day views and arbitrates the
-	display.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.[ch]: New week view composite widget.  This
-	provides a full week view (7 day views plus busy time display --
-	the latter is currently unimplemented).
-
-1998-04-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c: New day view widget.  It is intended to be a
-	child widget of the week view composite widget.
-
-	* calendar.c (calendar_get_objects_in_range):
-	(calendar_get_events_in_range):
-	(calendar_get_journal_in_range):
-	(calendar_get_journal_in_range): These functions now take a
-	sort_func parameter, which is of type GCompareFunc.  If the
-	specified value is non-NULL, it will return a sorted list.
-	Otherwise, it will return an unordered list.
-	(calendar_compare_by_dtstart): Provide a generic sorting routine
-	for calendar objects.
-
-1998-04-01 Miguel de Icaza <miguel@kernel.org>
-
-	* Start from scratch
-
-Tue Mar 31 23:46:50 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* timeutil.c (format_simple_hour): `buf' now static.
-
-1998-03-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal.c: Removed #include "gtkcalendar.h", because it now comes
-	from libgnomeui.
-
-	* Makefile.am (gncal_SOURCES): Added new source files to the rules.
-
-	* timeutil.c (format_simple_hour): New function, formats an
-	hour/am_pm pair into a string of the form "3am", "12pm", "05h",
-	"19h", etc.  It is used by the day view widget for its labels.
-
-1998-03-31 Craig Small <csmall@small.dropbear.id.au>
-
-	* Now has (non working) session maangement
-	* Uses a clist for the dailylist like gtt
-
-Sat Mar 21 15:43:20 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* gncal.c: Use gnome_message_box_*, not gnome_messagebox_*.
-
-1998-03-12  Craig Small <csmall@small.dropbear.id.au>
-
-	* Now linked (in some horrible way) to the gtkcalendar widget.
-
-Sun Mar  8 16:38:10 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.am (INCLUDES): Added GNOME_INCLUDEDIR.
-	(gncal_LDADD): Don't include libsupport.a.
-
-	* gncal.c (main): Use new gnome_init.
-
-1998-02-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal.c (main): Added app_id "gncal".
-
-1998-02-19  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* Makefile.am (gncal_LDADD): Added '$(INTLLIBS)'
-
-1998-02-18  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* Makefile.am (gncal_LDADD): Include `libsupport.a'.
-
-	* calcs.c (month_atoi): Replace buggy explicit loop string compare
-	with strcasecmp.
-	(day_atoi): Likewise.
-
-Sun Jan 25 23:38:30 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* menus.c: Replace "Quit" with "Exit".
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index ecdd2d2cc6..e8974cdeb5 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -12,7 +12,6 @@ errordir = $(privdatadir)/errors
 
 EXTRA_DIST =			\
 	calendar.error.xml	\
-	ChangeLog.pre-1-4	\
 	$(error_DATA)		\
 	zones.h
 
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index b6afd2ea40..eaaaa35533 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -193,21 +193,9 @@
    <_secondary>Your calendars will not be available until Evolution is restarted.</_secondary>
 </error>
 
-<error id="unable-to-load-the-calendar" type="error" default="GTK_RESPONSE_YES">
- <_primary>Unable to load the calendar</_primary>
- <_secondary>Calendar repository is offline.</_secondary>
- <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-</error>
-<error id="error-on-loading-the-calendar" type="error" default="GTK_RESPONSE_YES">
- <!-- For Translators: {0} is specify the backend server -->
- <_primary>Error on '{0}'</_primary>
- <_secondary>No response from the server.</_secondary>
- <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-</error>
-
  <error id="editor-error" type="error">
   <_primary>Editor could not be loaded.</_primary>
-  <_secondary>{0}.</_secondary>
+  <secondary>{0}.</secondary>
  </error>
 
  <error id="prompt-delete-calendar" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
@@ -231,18 +219,18 @@
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
  
- <error id="prompt-send-no-subject-calendar" type="question" default="GTK_RESPONSE_YES">
-  <_primary>Are you sure you want to send the appointment without a summary?</_primary>
-  <_secondary>Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about.</_secondary>
+ <error id="prompt-save-no-subject-calendar" type="question" default="GTK_RESPONSE_YES">
+  <_primary>Are you sure you want to save the appointment without a summary?</_primary>
+  <_secondary>Adding a meaningful summary to your appointment will give you an idea of what your appointment is about.</_secondary>
   <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
   <button _label="_Save" response="GTK_RESPONSE_YES"/>
  </error>
 
- <error id="prompt-send-no-subject-task" type="question" default="GTK_RESPONSE_YES">
-  <_primary>Are you sure you want to send the task without a summary?</_primary>
-  <_secondary>Adding a meaningful summary to your task will give your recipients an idea of what your task is about.</_secondary>
+ <error id="prompt-save-no-subject-task" type="question" default="GTK_RESPONSE_YES">
+  <_primary>Are you sure you want to save the task without a summary?</_primary>
+  <_secondary>Adding a meaningful summary to your task will give you an idea of what your task is about.</_secondary>
   <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Send" response="GTK_RESPONSE_YES"/>
+  <button _label="_Save" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="prompt-send-no-subject-memo" type="question" default="GTK_RESPONSE_CANCEL">
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 4c4137651b..a168582db0 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -71,7 +71,8 @@ libevolution_calendar_la_CPPFLAGS =			\
 	-DPREFIX=\""$(prefix)"\"			\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(LIBSOUP_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)
+	$(EVOLUTION_CALENDAR_CFLAGS)			\
+	$(CAMEL_CFLAGS)
 
 ui_DATA = 					\
 	e-itip-control.ui			\
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index a6259d69ab..aa42987caa 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -232,6 +232,7 @@ dialog_destroyed_cb (GtkWidget *dialog, gpointer user_data)
 AlarmNotificationsDialog *
 notified_alarms_dialog_new (void)
 {
+	GtkWidget *container;
 	GtkWidget *edit_btn;
 	GtkWidget *snooze_btn;
 	GtkWidget *image;
@@ -298,8 +299,13 @@ notified_alarms_dialog_new (void)
 		G_CALLBACK (tree_selection_changed_cb), an);
 
 	gtk_widget_realize (an->dialog);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (an->dialog)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (an->dialog)->action_area), 12);
+
+	container = gtk_dialog_get_action_area (GTK_DIALOG (an->dialog));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 12);
+
+	container = gtk_dialog_get_content_area (GTK_DIALOG (an->dialog));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 0);
+
 	image = e_builder_get_widget (an->builder, "alarm-image");
 	gtk_image_set_from_icon_name (
 		GTK_IMAGE (image), "stock_alarm", GTK_ICON_SIZE_DIALOG);
@@ -310,11 +316,7 @@ notified_alarms_dialog_new (void)
 	g_signal_connect (G_OBJECT (an->dialog), "response", G_CALLBACK (dialog_response_cb), an);
 	g_signal_connect (G_OBJECT (an->dialog), "destroy", G_CALLBACK (dialog_destroyed_cb), an);
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_realized (an->dialog))
-#else
-	if (!GTK_WIDGET_REALIZED (an->dialog))
-#endif
 		gtk_widget_realize (an->dialog);
 
 	gtk_window_set_icon_name (GTK_WINDOW (an->dialog), "stock_alarm");
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index ffa3d4b1f2..f7ef6fdcf4 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -1674,6 +1674,7 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa,
 static void
 mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)
 {
+	GtkWidget *container;
 	GtkWidget *dialog;
 	GtkWidget *label;
 
@@ -1694,7 +1695,9 @@ mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)
 				 "configured to send an email.  Evolution will display\n"
 				 "a normal reminder dialog box instead."));
 	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, TRUE, TRUE, 4);
+
+	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_box_pack_start (GTK_BOX (container), label, TRUE, TRUE, 4);
 
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
@@ -1704,7 +1707,10 @@ mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)
 static gboolean
 procedure_notification_dialog (const gchar *cmd, const gchar *url)
 {
-	GtkWidget *dialog, *label, *checkbox;
+	GtkWidget *container;
+	GtkWidget *dialog;
+	GtkWidget *label;
+	GtkWidget *checkbox;
 	gchar *str;
 	gint btn;
 
@@ -1728,15 +1734,15 @@ procedure_notification_dialog (const gchar *cmd, const gchar *url)
 	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
 	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-			    label, TRUE, TRUE, 4);
+
+	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_box_pack_start (GTK_BOX (container), label, TRUE, TRUE, 4);
 	g_free (str);
 
 	checkbox = gtk_check_button_new_with_label
 		(_("Do not ask me about this program again."));
 	gtk_widget_show (checkbox);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-			    checkbox, TRUE, TRUE, 4);
+	gtk_box_pack_start (GTK_BOX (container), checkbox, TRUE, TRUE, 4);
 
 	/* Run the dialog */
 	btn = gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 483704f1e4..b20e7c5e16 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -30,9 +30,9 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#include <camel/camel.h>
 #include <unique/unique.h>
 #include <dbus/dbus-glib.h>
-#include <camel/camel-object.h>
 #include <libedataserver/e-source.h>
 #include <libedataserverui/e-passwords.h>
 
diff --git a/calendar/gui/calendar-commands.c.dead b/calendar/gui/calendar-commands.c.dead
deleted file mode 100644
index 6368857ead..0000000000
--- a/calendar/gui/calendar-commands.c.dead
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Evolution calendar - Commands for the calendar GUI control
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Miguel de Icaza <miguel@ximian.com>
- *      Federico Mena-Quintero <federico@ximian.com>
- *      Seth Alves <alves@hungry.com>
- *      Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-exception.h>
-#include <libecal/e-cal-time-util.h>
-#include "shell/Evolution.h"
-#include "calendar-commands.h"
-#include "calendar-component.h"
-#include "calendar-config.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-#include "gnome-cal.h"
-#include "goto.h"
-#include "print.h"
-#include "dialogs/cal-prefs-dialog.h"
-#include "itip-utils.h"
-#include "e-cal-list-view.h"
-#include "evolution-shell-component-utils.h"
-#include "e-util/e-icon-factory.h"
-#include "e-util/e-util-private.h"
-#include "e-cal-menu.h"
-
-/* Focusing information for the calendar view.  We have to keep track of this
- * ourselves because with Bonobo controls, we may get unpaired focus_out events.
- */
-typedef struct {
-	guint calendar_focused : 1;
-	guint taskpad_focused : 1;
-} FocusData;
-
-/* Sets a clock cursor for the specified calendar window */
-static void
-set_clock_cursor (GnomeCalendar *gcal)
-{
-	GdkCursor *cursor;
-
-	cursor = gdk_cursor_new (GDK_WATCH);
-	gdk_window_set_cursor (GTK_WIDGET (gcal)->window, cursor);
-	gdk_cursor_unref (cursor);
-	gdk_flush ();
-}
-
-/* Resets the normal cursor for the specified calendar window */
-static void
-set_normal_cursor (GnomeCalendar *gcal)
-{
-	gdk_window_set_cursor (GTK_WIDGET (gcal)->window, NULL);
-	gdk_flush ();
-}
-
-static void
-show_day_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_DAY_VIEW);
-}
-
-static void
-show_work_week_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_WORK_WEEK_VIEW);
-}
-
-static void
-show_week_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_WEEK_VIEW);
-}
-
-static void
-show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_MONTH_VIEW);
-}
-
-static void
-show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_LIST_VIEW);
-}
-
-struct _sensitize_item {
-	const gchar *command;
-	guint32 enable;
-};
-
-static void
-sensitize_items(BonoboUIComponent *uic, struct _sensitize_item *items, guint32 mask)
-{
-	while (items->command) {
-		gchar command[32];
-
-		if (strlen(items->command)>=21) {
-			g_warning ("items->command >= 21: %s\n", items->command);
-			continue;
-		}
-		sprintf(command, "/commands/%s", items->command);
-
-		bonobo_ui_component_set_prop (uic, command, "sensitive",
-					      (items->enable & mask) == 0 ? "1" : "0",
-					      NULL);
-		items++;
-	}
-}
-
-static struct _sensitize_item taskpad_sensitize_table[] = {
-	{ "Cut", E_CAL_MENU_SELECT_EDITABLE | E_CAL_MENU_SELECT_ANY },
-	{ "Copy", E_CAL_MENU_SELECT_ANY },
-	{ "Paste", E_CAL_MENU_SELECT_EDITABLE },
-	{ "Delete", E_CAL_MENU_SELECT_EDITABLE },
-	{ NULL }
-};
-
-/* Sensitizes the UI Component menu/toolbar tasks commands based on the number
- * of selected tasks.  If enable is FALSE, all will be disabled.  Otherwise, the
- * currently-selected number of tasks will be used.
- */
-static void
-sensitize_taskpad_commands (GnomeCalendar *gcal, BonoboControl *control, gboolean enable)
-{
-	BonoboUIComponent *uic;
-	ECalendarTable *task_pad;
-	ECalModel *model;
-	GSList *selected, *l;
-	ECalMenu *menu;
-	GPtrArray *events;
-	ECalMenuTargetSelect *t;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_return_if_fail (uic != NULL);
-
-	menu = gnome_calendar_get_calendar_menu (gcal);
-	task_pad = gnome_calendar_get_task_pad(gcal);
-	model = e_calendar_table_get_model (task_pad);
-	selected = e_calendar_table_get_selected(task_pad);
-	events = g_ptr_array_new();
-	for (l=selected;l;l=g_slist_next(l))
-		g_ptr_array_add(events, e_cal_model_copy_component_data((ECalModelComponent *)l->data));
-	g_slist_free(selected);
-
-	t = e_cal_menu_target_new_select(menu, model, events);
-	if (!enable)
-		t->target.mask = ~((~t->target.mask) & E_CAL_MENU_SELECT_EDITABLE);
-
-	sensitize_items(uic, taskpad_sensitize_table, t->target.mask);
-}
-
-/* Callback used when the selection in the calendar views changes */
-static void
-gcal_calendar_selection_changed_cb (GnomeCalendar *gcal, gpointer data)
-{
-	BonoboControl *control;
-
-	control = BONOBO_CONTROL (data);
-
-	calendar_control_sensitize_calendar_commands (control, gcal, TRUE);
-}
-
-/* Callback used when the selection in the taskpad changes */
-static void
-gcal_taskpad_selection_changed_cb (GnomeCalendar *gcal, gpointer data)
-{
-	BonoboControl *control;
-
-	control = BONOBO_CONTROL (data);
-
-	sensitize_taskpad_commands (gcal, control, TRUE);
-}
-
-/* Callback used when the focus changes for a calendar view */
-static void
-gcal_calendar_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
-{
-	BonoboControl *control;
-	FocusData *focus;
-
-	control = BONOBO_CONTROL (data);
-
-	focus = g_object_get_data (G_OBJECT (control), "focus_data");
-	g_return_if_fail (focus != NULL);
-
-	if (in) {
-		g_signal_connect (gcal, "calendar_selection_changed",
-				  G_CALLBACK (gcal_calendar_selection_changed_cb), control);
-		calendar_control_sensitize_calendar_commands (control, gcal, TRUE);
-		focus->calendar_focused = TRUE;
-	} else if (focus->calendar_focused) {
-		g_signal_handlers_disconnect_by_func (
-			gcal, G_CALLBACK (gcal_calendar_selection_changed_cb), control);
-		calendar_control_sensitize_calendar_commands (control, gcal, FALSE);
-		focus->calendar_focused = FALSE;
-	}
-}
-
-/* Callback used when the taskpad focus changes */
-static void
-gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
-{
-	BonoboControl *control;
-	FocusData *focus;
-
-	control = BONOBO_CONTROL (data);
-
-	focus = g_object_get_data (G_OBJECT (control), "focus_data");
-	g_return_if_fail (focus != NULL);
-
-	if (in) {
-		g_signal_connect (gcal, "taskpad_selection_changed",
-				  G_CALLBACK (gcal_taskpad_selection_changed_cb), control);
-		sensitize_taskpad_commands (gcal, control, TRUE);
-		focus->taskpad_focused = TRUE;
-	} else if (focus->taskpad_focused) {
-		/* With Bonobo controls, we may get unpaired focus_out events.
-		 * That is why we have to keep track of this ourselves instead
-		 * of blindly assumming that we are getting this event because
-		 * the taskpad was in fact focused.
-		 */
-		g_signal_handlers_disconnect_by_func (
-			gcal, G_CALLBACK (gcal_taskpad_selection_changed_cb), control);
-		sensitize_taskpad_commands (gcal, control, FALSE);
-		focus->taskpad_focused = FALSE;
-	}
-
-}
-
-static void
-help_debug (BonoboUIComponent *uid, gpointer data, const gchar *path)
-{
-	calendar_component_show_logger ((GtkWidget *) data);
-}
-
-static BonoboUIVerb verbs [] = {
-
-	BONOBO_UI_VERB ("ShowDayView", show_day_view_clicked),
-	BONOBO_UI_VERB ("ShowWorkWeekView", show_work_week_view_clicked),
-	BONOBO_UI_VERB ("ShowWeekView", show_week_view_clicked),
-	BONOBO_UI_VERB ("ShowMonthView", show_month_view_clicked),
-	BONOBO_UI_VERB ("ShowListView", show_list_view_clicked),
-
-	BONOBO_UI_VERB ("HelpDebug", help_debug),
-	BONOBO_UI_VERB_END
-};
-
-void
-calendar_control_activate (BonoboControl *control,
-			   GnomeCalendar *gcal)
-{
-	Bonobo_UIContainer remote_uih;
-	BonoboUIComponent *uic;
-	FocusData *focus;
-	gchar *xmlfile;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_return_if_fail (uic != NULL);
-
-	remote_uih = bonobo_control_get_remote_ui_container (control, NULL);
-	bonobo_ui_component_set_container (uic, remote_uih, NULL);
-	bonobo_object_release_unref (remote_uih, NULL);
-
-	gnome_calendar_set_ui_component (gcal, uic);
-
-	bonobo_ui_component_add_verb_list_with_data (uic, verbs, gcal);
-
-	bonobo_ui_component_freeze (uic, NULL);
-
-	xmlfile = g_build_filename (EVOLUTION_UIDIR,
-				    "evolution-calendar.xml",
-				    NULL);
-	bonobo_ui_util_set_ui (uic, PREFIX,
-			       xmlfile,
-			       "evolution-calendar",
-			       NULL);
-	g_free (xmlfile);
-
-	gnome_calendar_setup_view_menus (gcal, uic);
-
-	g_signal_connect (gcal, "calendar_focus_change",
-			  G_CALLBACK (gcal_calendar_focus_change_cb), control);
-	g_signal_connect (gcal, "taskpad_focus_change",
-			  G_CALLBACK (gcal_taskpad_focus_change_cb), control);
-
-	e_menu_activate((EMenu *)gnome_calendar_get_calendar_menu (gcal), uic, 1);
-	e_menu_activate((EMenu *)gnome_calendar_get_taskpad_menu (gcal), uic, 1);
-
-	calendar_control_sensitize_calendar_commands (control, gcal, TRUE);
-	sensitize_taskpad_commands (gcal, control, TRUE);
-
-	bonobo_ui_component_thaw (uic, NULL);
-
-	focus = g_new (FocusData, 1);
-	focus->calendar_focused = FALSE;
-	focus->taskpad_focused = FALSE;
-
-	g_object_set_data (G_OBJECT (control), "focus_data", focus);
-}
-
-void
-calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal)
-{
-	FocusData *focus;
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_return_if_fail (uic != NULL);
-
-	e_menu_activate((EMenu *)gnome_calendar_get_calendar_menu (gcal), uic, 0);
-	e_menu_activate((EMenu *)gnome_calendar_get_taskpad_menu (gcal), uic, 0);
-
-	gnome_calendar_set_ui_component (gcal, NULL);
-
-	focus = g_object_get_data (G_OBJECT (control), "focus_data");
-	g_return_if_fail (focus != NULL);
-
-	g_object_set_data (G_OBJECT (control), "focus_data", NULL);
-	g_free (focus);
-
-	gnome_calendar_discard_view_menus (gcal);
-
-	g_signal_handlers_disconnect_matched (gcal, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, control);
-
-	bonobo_ui_component_rm (uic, "/", NULL);
-	bonobo_ui_component_unset_container (uic, NULL);
-}
diff --git a/calendar/gui/calendar-commands.h.dead b/calendar/gui/calendar-commands.h.dead
deleted file mode 100644
index 605230302e..0000000000
--- a/calendar/gui/calendar-commands.h.dead
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Evolution calendar - Commands for the calendar GUI control
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Miguel de Icaza <miguel@ximian.com>
- *      Federico Mena-Quintero <federico@ximian.com>
- *      Seth Alves <alves@hungry.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef CALENDAR_COMMANDS_H
-#define CALENDAR_COMMANDS_H
-
-#include "gnome-cal.h"
-
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-ui-component.h>
-
-void calendar_control_activate (BonoboControl *control, GnomeCalendar *gcal);
-void calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal);
-
-void calendar_control_sensitize_calendar_commands (BonoboControl *control, GnomeCalendar *gcal, gboolean enable);
-
-void calendar_goto_today (GnomeCalendar *gcal);
-
-void calendar_command_print (GnomeCalendar *gcal, GtkPrintOperationAction action);
-
-#endif /* CALENDAR_COMMANDS_H */
diff --git a/calendar/gui/calendar-component.c.dead b/calendar/gui/calendar-component.c.dead
deleted file mode 100644
index 9cd0e8eb21..0000000000
--- a/calendar/gui/calendar-component.c.dead
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Ettore Perazzoli <ettore@ximian.com>
- *      Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <errno.h>
-#include <glib/gi18n-lib.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-exception.h>
-#include <libical/icalvcal.h>
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-url.h>
-#include <libecal/e-cal-time-util.h>
-#include <libedataserverui/e-source-selector.h>
-#include <shell/e-user-creatable-items-handler.h>
-#include <shell/e-component-view.h>
-#include "e-calendar-view.h"
-#include "calendar-config-keys.h"
-#include "calendar-config.h"
-#include "calendar-component.h"
-#include "calendar-commands.h"
-#include "control-factory.h"
-#include "gnome-cal.h"
-#include "migration.h"
-#include "comp-util.h"
-#include "common/authentication.h"
-#include "dialogs/calendar-setup.h"
-#include "dialogs/comp-editor.h"
-#include "dialogs/copy-source-dialog.h"
-#include "dialogs/event-editor.h"
-#include "misc/e-info-label.h"
-#include "e-util/e-non-intrusive-error-dialog.h"
-#include "e-util/gconf-bridge.h"
-#include "e-util/e-error.h"
-#include "e-cal-menu.h"
-#include "e-cal-popup.h"
-#include "e-attachment-handler-calendar.h"
-
-/* IDs for user creatable items */
-#define CREATE_EVENT_ID        "event"
-#define CREATE_MEETING_ID      "meeting"
-#define CREATE_ALLDAY_EVENT_ID "allday-event"
-#define CREATE_CALENDAR_ID      "calendar"
-#define CALENDAR_ERROR_LEVEL_KEY "/apps/evolution/calendar/display/error_level"
-#define CALENDAR_ERROR_TIME_OUT_KEY "/apps/evolution/calendar/display/error_timeout"
-
-static BonoboObjectClass *parent_class = NULL;
-
-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;
-
-	GtkWidget *source_selector;
-
-	BonoboControl *view_control;
-
-	GList *notifications;
-
-	gfloat	     vpane_pos;
-} CalendarComponentView;
-
-struct _CalendarComponentPrivate {
-
-	gint gconf_notify_id;
-
-	ESourceList *source_list;
-	ESourceList *task_source_list;
-	ESourceList *memo_source_list;
-
-	EActivityHandler *activity_handler;
-        ELogger *logger;
-
-	GList *views;
-
-	ECal *create_ecal;
-
-	GList *notifications;
-};
-
-static void
-calcomp_vpane_realized (GtkWidget *vpane, CalendarComponentView *view)
-{
-	gtk_paned_set_position (GTK_PANED (vpane), (gint)(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/(gfloat)vpane->allocation.height);
-
-	return FALSE;
-}
-
-/* Utility functions.  */
-
-static gboolean
-is_in_selection (GSList *selection, ESource *source)
-{
-	GSList *l;
-
-	for (l = selection; l; l = l->next) {
-		ESource *selected_source = l->data;
-
-		if (!strcmp (e_source_peek_uid (selected_source), e_source_peek_uid (source)))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-is_in_uids (GSList *uids, ESource *source)
-{
-	GSList *l;
-
-	for (l = uids; l; l = l->next) {
-		const gchar *uid = l->data;
-
-		if (!strcmp (uid, e_source_peek_uid (source)))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-update_task_memo_selection (CalendarComponentView *component_view, ECalSourceType type)
-{
-	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;
-	}
-
-	/* Remove any that aren't there any more */
-	for (l = source_selection; l; l = l->next) {
-		gchar *uid = l->data;
-		ESource *source;
-
-		source = e_source_list_peek_source_by_uid (component_view->source_list, uid);
-		if (!source)
-			gnome_calendar_remove_source_by_uid (component_view->calendar, type, uid);
-		else if (!is_in_uids (uids_selected, source))
-			gnome_calendar_remove_source (component_view->calendar, type, source);
-
-		g_free (uid);
-	}
-	g_slist_free (source_selection);
-
-	/* Make sure the whole selection is there */
-	for (l = uids_selected; l; l = l->next) {
-		gchar *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)) {
-			/* 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;
-}
-
-static void
-update_primary_task_memo_selection (CalendarComponentView *component_view, ECalSourceType type)
-{
-	ESource *source = NULL;
-	gchar *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;
-	}
-
-	if (uid) {
-		source = e_source_list_peek_source_by_uid (source_list, uid);
-
-		g_free (uid);
-	}
-
-	if (source)
-		gnome_calendar_set_default_source (component_view->calendar, type, source);
-}
-
-static void
-config_primary_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	CalendarComponent *calendar_component = data;
-	CalendarComponentPrivate *priv = calendar_component->priv;
-
-	if (priv->create_ecal) {
-		g_object_unref (priv->create_ecal);
-		priv->create_ecal = NULL;
-	}
-}
-
-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);
-}
-
-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);
-}
-
-/* Evolution::Component CORBA methods.  */
-static void
-impl_handleURI (PortableServer_Servant servant, const gchar *uri, CORBA_Environment *ev)
-{
-	CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
-	CalendarComponentPrivate *priv;
-	GList *l;
-	CalendarComponentView *view = NULL;
-	gchar *src_uid = NULL;
-	gchar *uid = NULL;
-	gchar *rid = NULL;
-
-	priv = calendar_component->priv;
-
-	l = g_list_last (priv->views);
-	if (!l)
-		return;
-
-	view = l->data;
-
-	if (!strncmp (uri, "calendar:", 9)) {
-		EUri *euri = e_uri_new (uri);
-		const gchar *p;
-		gchar *header, *content;
-		gsize len, clen;
-		time_t start = -1, end = -1;
-
-		p = euri->query;
-		if (p) {
-			while (*p) {
-				len = strcspn (p, "=&");
-
-				/* If it's malformed, give up. */
-				if (p[len] != '=')
-					break;
-
-				header = (gchar *) p;
-				header[len] = '\0';
-				p += len + 1;
-
-				clen = strcspn (p, "&");
-
-				content = g_strndup (p, clen);
-
-				if (!g_ascii_strcasecmp (header, "startdate")) {
-					start = time_from_isodate (content);
-				} else if (!g_ascii_strcasecmp (header, "enddate")) {
-					end = time_from_isodate (content);
-				} else if (!g_ascii_strcasecmp (header, "source-uid")) {
-					src_uid = g_strdup (content);
-				} else if (!g_ascii_strcasecmp (header, "comp-uid")) {
-					uid = g_strdup (content);
-				} else if (!g_ascii_strcasecmp (header, "comp-rid")) {
-					rid = g_strdup (content);
-				}
-
-				g_free (content);
-
-				p += clen;
-				if (*p == '&') {
-					p++;
-					if (!strcmp (p, "amp;"))
-						p += 4;
-				}
-			}
-
-			if (start != -1) {
-
-				if (end == -1)
-					gnome_calendar_set_selected_time_range (view->calendar, start);
-			}
-			if (src_uid && uid)
-				gnome_calendar_edit_appointment (view->calendar, src_uid, uid, rid);
-
-			g_free (src_uid);
-			g_free (uid);
-			g_free (rid);
-		}
-		e_uri_free (euri);
-	}
-}
-
-static void
-config_create_ecal_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	CalendarComponent *calendar_component = data;
-	CalendarComponentPrivate *priv;
-
-	priv = calendar_component->priv;
-
-	g_object_unref (priv->create_ecal);
-	priv->create_ecal = NULL;
-
-	priv->notifications = g_list_remove (priv->notifications, GUINT_TO_POINTER (id));
-}
-
-static ECal *
-setup_create_ecal (CalendarComponent *calendar_component, CalendarComponentView *component_view)
-{
-	CalendarComponentPrivate *priv;
-	ESource *source = NULL;
-	gchar *uid;
-	guint not;
-
-	priv = calendar_component->priv;
-
-	/* Try to use the client from the calendar first to avoid re-opening things */
-	if (component_view) {
-		ECal *default_ecal;
-
-		default_ecal = gnome_calendar_get_default_client (component_view->calendar);
-		if (default_ecal)
-			return default_ecal;
-	}
-
-	/* If there is an existing fall back, use that */
-	if (priv->create_ecal)
-		return priv->create_ecal;
-
-	/* Get the current primary calendar, or try to set one if it doesn't already exist */
-	uid = calendar_config_get_primary_calendar ();
-	if (uid) {
-		source = e_source_list_peek_source_by_uid (priv->source_list, uid);
-		g_free (uid);
-
-		priv->create_ecal = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
-	}
-
-	if (!priv->create_ecal) {
-		/* Try to create a default if there isn't one */
-		source = e_source_list_peek_source_any (priv->source_list);
-		if (source)
-			priv->create_ecal = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
-	}
-
-	if (priv->create_ecal) {
-		icaltimezone *zone;
-
-		zone = calendar_config_get_icaltimezone ();
-		e_cal_set_default_timezone (priv->create_ecal, zone, NULL);
-
-		if (!e_cal_open (priv->create_ecal, FALSE, NULL)) {
-			GtkWidget *dialog;
-
-			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-							 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;
-		}
-
-	} else {
-		GtkWidget *dialog;
-
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-						 _("There is no calendar available for creating events and meetings"));
-		gtk_dialog_run (GTK_DIALOG (dialog));
-		gtk_widget_destroy (dialog);
-
-		return NULL;
-	}
-
-	/* Handle the fact it may change on us */
-	not = calendar_config_add_notification_primary_calendar (config_create_ecal_changed_cb,
-								 calendar_component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Save the primary source for use elsewhere */
-	calendar_config_set_primary_calendar (e_source_peek_uid (source));
-
-	return priv->create_ecal;
-}
-
-static CalendarComponentView *
-create_component_view (CalendarComponent *calendar_component)
-{
-	CalendarComponentPrivate *priv;
-	CalendarComponentView *component_view;
-	GtkWidget **vpane;
-	guint not;
-
-	priv = calendar_component->priv;
-
-	/* 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);
-	/* Create sidebar selector */
-	component_view->source_selector = e_source_selector_new (calendar_component->priv->source_list);
-	g_signal_connect (
-		component_view->source_selector, "data-dropped",
-		G_CALLBACK (selector_tree_data_dropped), calendar_component);
-
-	gtk_drag_dest_set(component_view->source_selector, GTK_DEST_DEFAULT_ALL, drag_types,
-			  num_drag_types, GDK_ACTION_COPY | GDK_ACTION_MOVE);
-
-	gtk_widget_show (component_view->source_selector);
-
-	selector_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_container_add (GTK_CONTAINER (selector_scrolled_window), component_view->source_selector);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					     GTK_SHADOW_IN);
-	gtk_widget_show (selector_scrolled_window);
-
-	component_view->info_label = (EInfoLabel *)e_info_label_new("x-office-calendar");
-	e_info_label_set_info (component_view->info_label, _("Calendars"), "");
-	gtk_widget_show (GTK_WIDGET (component_view->info_label));
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	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, FALSE);
-
-	component_view->sidebar_control = bonobo_control_new (vpane);
-
-	/* Create main view */
-	component_view->view_control = control_factory_new_control ();
-	if (!component_view->view_control) {
-		/* FIXME free memory */
-
-		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, FALSE);
-
-	/* This signal is thrown if backends die - we update the selector */
-	g_signal_connect (component_view->calendar, "source_added",
-			  G_CALLBACK (source_added_cb), component_view);
-	g_signal_connect (component_view->calendar, "source_removed",
-			  G_CALLBACK (source_removed_cb), component_view);
-
-	/* Create status bar */
-	statusbar_widget = e_task_bar_new ();
-	component_view->activity_handler = e_activity_handler_new ();
-	e_activity_handler_attach_task_bar (component_view->activity_handler, E_TASK_BAR (statusbar_widget));
-	e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (statusbar_widget));
-
-	gtk_widget_show (statusbar_widget);
-
-	component_view->statusbar_control = bonobo_control_new (statusbar_widget);
-
-	gnome_calendar_set_activity_handler (component_view->calendar, component_view->activity_handler);
-
-	/* connect after setting the initial selections, or we'll get unwanted calls
-	   to calendar_control_sensitize_calendar_commands */
-	g_signal_connect (component_view->source_selector, "selection_changed",
-			  G_CALLBACK (source_selection_changed_cb), component_view);
-	g_signal_connect (component_view->source_selector, "primary_selection_changed",
-			  G_CALLBACK (primary_source_selection_changed_cb), component_view);
-	g_signal_connect (component_view->source_selector, "popup_event",
-			  G_CALLBACK (popup_event_cb), component_view);
-
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:calendar/gui/calendar-component.c
-	/* Set up the "new" item handler */
-	g_signal_connect (component_view->view_control, "activate", G_CALLBACK (control_activate_cb), component_view);
-
-	/* Load the selection from the last run */
-	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);
-
-	/* If the tasks/memos 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;
-}
-
-static void
-destroy_component_view (CalendarComponentView *component_view)
-{
-	GList *l;
-
-	if (component_view->source_list)
-		g_object_unref (component_view->source_list);
-
-	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);
-
-	for (l = component_view->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-	g_list_free (component_view->notifications);
-
-	if (component_view->task_source_selection) {
-		g_slist_foreach (component_view->task_source_selection, (GFunc) g_free, NULL);
-		g_slist_free (component_view->task_source_selection);
-	}
-
-	if (component_view->memo_source_selection) {
-		g_slist_foreach (component_view->memo_source_selection, (GFunc) g_free, NULL);
-		g_slist_free (component_view->memo_source_selection);
-	}
-
-	g_free (component_view);
-}
-
-static void
-view_destroyed_cb (gpointer data, GObject *where_the_object_was)
-{
-	CalendarComponent *calendar_component = data;
-	CalendarComponentPrivate *priv;
-	GList *l;
-
-	priv = calendar_component->priv;
-
-	for (l = priv->views; l; l = l->next) {
-		CalendarComponentView *component_view = l->data;
-
-		if (G_OBJECT (component_view->view_control) == where_the_object_was) {
-			priv->views = g_list_remove (priv->views, component_view);
-			destroy_component_view (component_view);
-
-			break;
-		}
-	}
-}
-
-/* GObject methods.  */
-
-static void
-impl_dispose (GObject *object)
-{
-	CalendarComponent *calendar_component = CALENDAR_COMPONENT (object);
-	CalendarComponentPrivate *priv = calendar_component->priv;
-	GList *l;
-
-	if (priv->source_list != NULL) {
-		g_object_unref (priv->source_list);
-		priv->source_list = NULL;
-	}
-
-	if (priv->activity_handler != NULL) {
-		g_object_unref (priv->activity_handler);
-		priv->activity_handler = NULL;
-	}
-
-	if (priv->activity_handler != NULL) {
-		g_object_unref (priv->activity_handler);
-		priv->activity_handler = NULL;
-	}
-
-	if (priv->create_ecal) {
-		g_object_unref (priv->create_ecal);
-		priv->create_ecal = NULL;
-	}
-
-	for (l = priv->views; l; l = l->next) {
-		CalendarComponentView *component_view = l->data;
-
-		g_object_weak_unref (G_OBJECT (component_view->view_control), view_destroyed_cb, calendar_component);
-	}
-	g_list_free (priv->views);
-	priv->views = NULL;
-
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
-
-	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-calendar_component_class_init (CalendarComponentClass *class)
-{
-	POA_GNOME_Evolution_Component__epv *epv = &class->epv;
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-
-	parent_class = g_type_class_peek_parent (class);
-
-	epv->handleURI               = impl_handleURI;
-
-	object_class->dispose  = impl_dispose;
-}
-
-static void
-calendar_component_init (CalendarComponent *component)
-{
-	CalendarComponentPrivate *priv;
-	guint not;
-
-	not = calendar_config_add_notification_primary_calendar (config_primary_selection_changed_cb,
-								 component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	priv->logger = e_logger_create ("calendar");
-	priv->activity_handler = e_activity_handler_new ();
-	e_activity_handler_set_logger (priv->activity_handler, priv->logger);
-	e_activity_handler_set_error_flush_time (priv->activity_handler,eni_config_get_error_timeout (CALENDAR_ERROR_TIME_OUT_KEY)*1000);
-
-	component->priv = priv;
-
-	e_cal_get_sources (&priv->task_source_list, E_CAL_SOURCE_TYPE_TODO, NULL);
-	e_cal_get_sources (&priv->memo_source_list, E_CAL_SOURCE_TYPE_JOURNAL, NULL);
-}
diff --git a/calendar/gui/calendar-component.h.dead b/calendar/gui/calendar-component.h.dead
deleted file mode 100644
index fbdd8efd23..0000000000
--- a/calendar/gui/calendar-component.h.dead
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef _CALENDAR_COMPONENT_H_
-#define _CALENDAR_COMPONENT_H_
-
-#include <bonobo/bonobo-object.h>
-#include <libedataserver/e-source-list.h>
-#include <widgets/misc/e-activity-handler.h>
-#include "Evolution.h"
-
-#define CALENDAR_TYPE_COMPONENT			(calendar_component_get_type ())
-#define CALENDAR_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), CALENDAR_TYPE_COMPONENT, CalendarComponent))
-#define CALENDAR_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), CALENDAR_TYPE_COMPONENT, CalendarComponentClass))
-#define CALENDAR_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALENDAR_TYPE_COMPONENT))
-#define CALENDAR_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), CALENDAR_TYPE_COMPONENT))
-
-typedef struct _CalendarComponent        CalendarComponent;
-typedef struct _CalendarComponentPrivate CalendarComponentPrivate;
-typedef struct _CalendarComponentClass   CalendarComponentClass;
-
-struct _CalendarComponent {
-	BonoboObject parent;
-
-	CalendarComponentPrivate *priv;
-};
-
-struct _CalendarComponentClass {
-	BonoboObjectClass parent_class;
-
-	POA_GNOME_Evolution_Component__epv epv;
-};
-
-GType calendar_component_get_type  (void);
-
-#endif /* _CALENDAR_COMPONENT_H_ */
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index a8fa9aef72..e8cbc72436 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -483,6 +483,7 @@ cal_comp_selection_set_string_list (GtkSelectionData *data, GSList *str_list)
 	/* format is "str1\0str2\0...strN\0" */
 	GSList *p;
 	GByteArray *array;
+	GdkAtom target;
 
 	g_return_if_fail (data != NULL);
 
@@ -497,7 +498,8 @@ cal_comp_selection_set_string_list (GtkSelectionData *data, GSList *str_list)
 			g_byte_array_append (array, c, strlen ((const gchar *) c) + 1);
 	}
 
-	gtk_selection_data_set (data, data->target, 8, array->data, array->len);
+	target = gtk_selection_data_get_target (data);
+	gtk_selection_data_set (data, target, 8, array->data, array->len);
 	g_byte_array_free (array, TRUE);
 }
 
@@ -512,17 +514,22 @@ cal_comp_selection_set_string_list (GtkSelectionData *data, GSList *str_list)
  * @return Newly allocated GSList of strings.
  **/
 GSList *
-cal_comp_selection_get_string_list (GtkSelectionData *data)
+cal_comp_selection_get_string_list (GtkSelectionData *selection_data)
 {
 	/* format is "str1\0str2\0...strN\0" */
 	gchar *inptr, *inend;
 	GSList *list;
+	const guchar *data;
+	gint length;
 
-	g_return_val_if_fail (data != NULL, NULL);
+	g_return_val_if_fail (selection_data != NULL, NULL);
+
+	data = gtk_selection_data_get_data (selection_data);
+	length = gtk_selection_data_get_length (selection_data);
 
 	list = NULL;
-	inptr = (gchar *)data->data;
-	inend = (gchar *)(data->data + data->length);
+	inptr = (gchar *) data;
+	inend = (gchar *) (data + length);
 
 	while (inptr < inend) {
 		gchar *start = inptr;
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 6e9cb26c05..0bd89de799 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -15,7 +15,8 @@ libcal_dialogs_la_CPPFLAGS = 						\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"				\
 	-DPREFIX=\""$(prefix)"\"					\
 	$(GNOME_PLATFORM_CFLAGS)					\
-	$(EVOLUTION_CALENDAR_CFLAGS)
+	$(EVOLUTION_CALENDAR_CFLAGS)					\
+	$(CAMEL_CFLAGS)
 
 ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs
 
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index f7d5443da0..9fe23fe525 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -1209,6 +1209,7 @@ gboolean
 alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
 {
 	Dialog dialog;
+	GtkWidget *container;
 	gint response_id;
 
 	g_return_val_if_fail (alarm != NULL, FALSE);
@@ -1234,8 +1235,12 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
 	alarm_to_dialog (&dialog);
 
 	gtk_widget_ensure_style (dialog.toplevel);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12);
+
+	container = gtk_dialog_get_action_area (GTK_DIALOG (dialog.toplevel));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 12);
+
+	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog.toplevel));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 0);
 
 	gtk_window_set_icon_name (
 		GTK_WINDOW (dialog.toplevel), "x-office-calendar");
diff --git a/calendar/gui/dialogs/alarm-dialog.ui b/calendar/gui/dialogs/alarm-dialog.ui
index 94ae8009c4..bf6e570e4a 100644
--- a/calendar/gui/dialogs/alarm-dialog.ui
+++ b/calendar/gui/dialogs/alarm-dialog.ui
@@ -411,7 +411,7 @@
                         <child>
                           <object class="GtkLabel" id="label1">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">extra times every</property>
+                            <property name="label" translatable="yes" comments="This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.">extra times every</property>
                             <property name="use_underline">False</property>
                             <property name="use_markup">False</property>
                             <property name="justify">GTK_JUSTIFY_CENTER</property>
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index c350b4774d..b8588d666d 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -261,6 +261,7 @@ gboolean
 alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store)
 {
 	Dialog dialog;
+	GtkWidget *container;
 	gint response_id;
 
 	dialog.ecal = ecal;
@@ -279,14 +280,19 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store)
 	sensitize_buttons (&dialog);
 
 	gtk_widget_ensure_style (dialog.toplevel);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12);
+
+	container = gtk_dialog_get_action_area (GTK_DIALOG (dialog.toplevel));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 12);
+
+	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog.toplevel));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 0);
 
 	gtk_window_set_icon_name (
 		GTK_WINDOW (dialog.toplevel), "x-office-calendar");
 
-	gtk_window_set_transient_for (GTK_WINDOW (dialog.toplevel),
-				      GTK_WINDOW (parent));
+	gtk_window_set_transient_for (
+		GTK_WINDOW (dialog.toplevel),
+		GTK_WINDOW (parent));
 
 	response_id = gtk_dialog_run (GTK_DIALOG (dialog.toplevel));
 	gtk_widget_hide (dialog.toplevel);
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index f6ba176d00..914c26c3ec 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -779,8 +779,8 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
 
 	/* date/time format */
 	table = e_builder_get_widget (prefs->builder, "datetime_format_table");
-	e_datetime_format_add_setup_widget (table, 0, "calendar", "table",  DTFormatKindDateTime, _("Time and date:"));
-	e_datetime_format_add_setup_widget (table, 1, "calendar", "table",  DTFormatKindDate, _("Date only:"));
+	e_datetime_format_add_setup_widget (table, 0, "calendar", "table",  DTFormatKindDateTime, _("Ti_me and date:"));
+	e_datetime_format_add_setup_widget (table, 1, "calendar", "table",  DTFormatKindDate, _("_Date only:"));
 
 	/* Hide senseless preferences when running in Express mode */
 	e_shell_hide_widgets_for_express_mode (shell, prefs->builder,
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index 9b396ce2cf..b21c027fe1 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -137,7 +137,7 @@ static GtkWidget *
 eccp_get_source_type (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	static GtkWidget *label, *type;
-	gint row;
+	guint row;
 	CalendarSourceDialog *sdialog = data;
 	ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target;
 	ESource *source = t->source;
@@ -147,7 +147,7 @@ eccp_get_source_type (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidg
 	if (old)
 		gtk_widget_destroy (label);
 
-	row = ((GtkTable *)parent)->nrows;
+	g_object_get (parent, "n-rows", &row, NULL);
 
 	if (sdialog->original_source) {
 		label = gtk_label_new (_("Type:"));
@@ -214,14 +214,14 @@ static GtkWidget *
 eccp_get_source_name (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	static GtkWidget *label, *entry;
-	gint row;
+	guint row;
 	ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target;
 	ESource *source = t->source;
 
 	if (old)
 		gtk_widget_destroy (label);
 
-	row = ((GtkTable*)parent)->nrows;
+	g_object_get (parent, "n-rows", &row, NULL);
 
 	label = gtk_label_new_with_mnemonic (_("_Name:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -257,14 +257,14 @@ eccp_general_offline (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidg
 	CalendarSourceDialog *sdialog = data;
 	GtkWidget *offline_setting = NULL;
 	const gchar *offline_sync;
-	gint row;
+	guint row;
 	const gchar *base_uri = e_source_group_peek_base_uri (sdialog->source_group);
 	gboolean is_local = base_uri && (g_str_has_prefix (base_uri, "file://") || g_str_has_prefix (base_uri, "contacts://"));
 	offline_sync =  e_source_get_property (sdialog->source, "offline_sync");
 	if (old)
 		return old;
 	else {
-		row = ((GtkTable*)parent)->nrows;
+		g_object_get (parent, "n-rows", &row, NULL);
 
 		if (sdialog->source_type == E_CAL_SOURCE_TYPE_EVENT)
 			offline_setting = gtk_check_button_new_with_mnemonic (_("Cop_y calendar contents locally for offline operation"));
@@ -322,10 +322,12 @@ eccp_get_source_color (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWid
 {
 	CalendarSourceDialog *sdialog = data;
 	static GtkWidget *label, *color_button;
-	guint row = GTK_TABLE (parent)->nrows;
+	guint row;
 	const gchar *color_spec = NULL;
 	GdkColor color;
 
+	g_object_get (parent, "n-rows", &row, NULL);
+
 	if (old)
 		gtk_widget_destroy (label);
 
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index 9f96011eda..9856bd7c96 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -111,102 +111,6 @@ comp_editor_free_dates (CompEditorPageDates *dates)
 		e_cal_component_free_icaltimetype (dates->complete);
 }
 
-/* dtstart is only passed in if tt is the dtend. */
-static void
-write_label_piece (struct icaltimetype *tt,
-                   gchar *buffer,
-                   gint size,
-                   gchar *stext,
-                   const gchar *etext,
-                   struct icaltimetype *dtstart)
-{
-	struct tm tmp_tm = { 0 };
-	struct icaltimetype tt_copy = *tt;
-	gint len;
-
-	/* FIXME: May want to convert the time to an appropriate zone. */
-
-	if (stext != NULL)
-		strcat (buffer, stext);
-
-	/* If we are writing the DTEND (i.e. DTSTART is set), and
-	   DTEND > DTSTART, subtract 1 day. The DTEND date is not inclusive. */
-	if (tt_copy.is_date && dtstart
-	    && icaltime_compare_date_only (tt_copy, *dtstart) > 0) {
-		icaltime_adjust (&tt_copy, -1, 0, 0, 0);
-	}
-
-	tmp_tm.tm_year = tt_copy.year - 1900;
-	tmp_tm.tm_mon = tt_copy.month - 1;
-	tmp_tm.tm_mday = tt_copy.day;
-	tmp_tm.tm_hour = tt_copy.hour;
-	tmp_tm.tm_min = tt_copy.minute;
-	tmp_tm.tm_sec = tt_copy.second;
-	tmp_tm.tm_isdst = -1;
-
-	tmp_tm.tm_wday = time_day_of_week (tt_copy.day, tt_copy.month - 1,
-					   tt_copy.year);
-
-	len = strlen (buffer);
-	e_time_format_date_and_time (&tmp_tm,
-				     calendar_config_get_24_hour_format (),
-				     !tt_copy.is_date, FALSE,
-				     &buffer[len], size - len);
-	if (etext != NULL)
-		strcat (buffer, etext);
-}
-
-/**
- * comp_editor_date_label:
- * @dates: The dates to use in constructing a label
- * @label: The label whose text is to be set
- *
- * Set the text of a label based on the dates available and the user's
- * formatting preferences
- **/
-void
-comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label)
-{
-	gchar buffer[1024];
-	gboolean start_set = FALSE, end_set = FALSE;
-	gboolean complete_set = FALSE, due_set = FALSE;
-
-	buffer[0] = '\0';
-
-	if (dates->start && !icaltime_is_null_time (*dates->start->value))
-		start_set = TRUE;
-	if (dates->end && !icaltime_is_null_time (*dates->end->value))
-		end_set = TRUE;
-	if (dates->complete && !icaltime_is_null_time (*dates->complete))
-		complete_set = TRUE;
-	if (dates->due && !icaltime_is_null_time (*dates->due->value))
-		due_set = TRUE;
-
-	if (start_set)
-		write_label_piece (dates->start->value, buffer, 1024,
-				   NULL, NULL, NULL);
-
-	if (start_set && end_set)
-		write_label_piece (dates->end->value, buffer, 1024,
-				   _(" to "), NULL, dates->start->value);
-
-	if (complete_set) {
-		if (start_set)
-			write_label_piece (dates->complete, buffer, 1024, _(" (Completed "), ")", NULL);
-		else
-			write_label_piece (dates->complete, buffer, 1024, _("Completed "), NULL, NULL);
-	}
-
-	if (due_set && dates->complete == NULL) {
-		if (start_set)
-			write_label_piece (dates->due->value, buffer, 1024, _(" (Due "), ")", NULL);
-		else
-			write_label_piece (dates->due->value, buffer, 1024, _("Due "), NULL, NULL);
-	}
-
-	gtk_label_set_text (GTK_LABEL (label), buffer);
-}
-
 /**
  * comp_editor_new_date_edit:
  * @show_date: Whether to show a date picker in the widget.
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 062e483562..010dd1cbf6 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -42,16 +42,6 @@
 #include <e-util/gconf-bridge.h>
 #include <shell/e-shell.h>
 
-#include <camel/camel-url.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-stream-fs.h>
-
-#include "mail/mail-tools.h"
-
 #include "../print.h"
 #include "../comp-util.h"
 #include "save-comp.h"
@@ -2974,7 +2964,8 @@ comp_editor_get_mime_attach_list (CompEditor *editor)
 		EAttachment *attachment;
 		CamelDataWrapper *wrapper;
 		CamelMimePart *mime_part;
-		CamelStreamMem *mstream;
+		CamelStream *stream;
+		GByteArray *byte_array;
 		guchar *buffer = NULL;
 		const gchar *desc, *disp;
 		gint column_id;
@@ -2990,16 +2981,18 @@ comp_editor_get_mime_attach_list (CompEditor *editor)
 			continue;
 
 		cal_mime_attach = g_malloc0 (sizeof (struct CalMimeAttach));
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-		mstream = (CamelStreamMem *) camel_stream_mem_new ();
+		wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
+
+		byte_array = g_byte_array_new ();
+		stream = camel_stream_mem_new_with_byte_array (byte_array);
 
-		camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream);
-		buffer = g_memdup (mstream->buffer->data, mstream->buffer->len);
+		camel_data_wrapper_decode_to_stream (wrapper, stream);
+		buffer = g_memdup (byte_array->data, byte_array->len);
 
 		camel_mime_part_set_content_id (mime_part, NULL);
 
 		cal_mime_attach->encoded_data = (gchar *)buffer;
-		cal_mime_attach->length = mstream->buffer->len;
+		cal_mime_attach->length = byte_array->len;
 		cal_mime_attach->filename = g_strdup (camel_mime_part_get_filename (mime_part));
 		desc = camel_mime_part_get_description (mime_part);
 		if (!desc || *desc == '\0')
@@ -3014,7 +3007,7 @@ comp_editor_get_mime_attach_list (CompEditor *editor)
 
 		attach_list = g_slist_append (attach_list, cal_mime_attach);
 
-		camel_object_unref (mstream);
+		g_object_unref (stream);
 
 	}
 
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index e0a431ffb7..ecdaf58762 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -166,12 +166,12 @@ delete_component_dialog (ECalComponent *comp,
 }
 
 static void
-cb_toggled_cb (GtkWidget *toggle, gpointer data)
+cb_toggled_cb (GtkToggleButton *toggle, gpointer data)
 {
 	gboolean active = FALSE;
 	GtkWidget *entry = (GtkWidget *) data;
 
-	active = GTK_TOGGLE_BUTTON (toggle)->active;
+	active = gtk_toggle_button_get_active (toggle);
 	gtk_widget_set_sensitive (entry, active);
 }
 
@@ -208,13 +208,13 @@ prompt_retract_dialog (ECalComponent *comp, gchar **retract_text, GtkWidget *par
 
 	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
 
-	gtk_box_set_spacing ((GtkBox *) (GTK_DIALOG (dialog)->vbox), 12);
-	vbox = GTK_WIDGET (GTK_DIALOG (dialog)->vbox);
+	vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_box_set_spacing (GTK_BOX (vbox), 12);
 
 	cb = gtk_check_button_new_with_mnemonic (_("_Delete this item from all other recipient's mailboxes?"));
 	gtk_container_add (GTK_CONTAINER (vbox), cb);
 
-	label = gtk_label_new_with_mnemonic ("_Retract comment");
+	label = gtk_label_new_with_mnemonic (_("_Retract comment"));
 
 	frame = gtk_frame_new (NULL);
 	gtk_frame_set_label_widget ((GtkFrame *) frame, label);
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 7184a63d9e..262751fa86 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -117,6 +117,7 @@ create_schedule_page (CompEditor *editor)
 	EventEditorPrivate *priv;
 	ENameSelector *name_selector;
 	CompEditorPage *page;
+	GtkWidget *content_area;
 
 	priv = EVENT_EDITOR_GET_PRIVATE (editor);
 
@@ -124,6 +125,9 @@ create_schedule_page (CompEditor *editor)
 		_("Free/Busy"), GTK_WINDOW (editor), GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
 
+	content_area =
+		gtk_dialog_get_content_area (GTK_DIALOG (priv->sched_window));
+
 	g_signal_connect (
 		priv->sched_window, "response",
 		G_CALLBACK (gtk_widget_hide), NULL);
@@ -134,7 +138,7 @@ create_schedule_page (CompEditor *editor)
 	priv->sched_page = schedule_page_new (priv->model, editor);
 	page = COMP_EDITOR_PAGE (priv->sched_page);
 	gtk_container_add (
-		GTK_CONTAINER (GTK_DIALOG (priv->sched_window)->vbox),
+		GTK_CONTAINER (content_area),
 		comp_editor_page_get_widget (page));
 
 	name_selector = event_page_get_name_selector (priv->event_page);
@@ -282,6 +286,7 @@ event_editor_constructor (GType type,
 	CompEditorPage *page;
 	EventEditorPrivate *priv;
 	GtkActionGroup *action_group;
+	GtkWidget *content_area;
 	ECal *client;
 	gboolean is_meeting;
 	GtkWidget *alarm_page;
@@ -317,6 +322,9 @@ event_editor_constructor (GType type,
 		priv->recur_window, "delete-event",
 		G_CALLBACK(gtk_widget_hide_on_delete), NULL);
 
+	content_area =
+		gtk_dialog_get_content_area (GTK_DIALOG (priv->recur_window));
+
 	priv->recur_page = recurrence_page_new (editor);
 	page = COMP_EDITOR_PAGE (priv->recur_page);
 	if (!e_shell_get_express_mode(e_shell_get_default())) {
@@ -556,6 +564,9 @@ event_editor_init (EventEditor *ee)
 		g_error_free (error);
 	}
 
+	action = comp_editor_get_action (editor, "print");
+	gtk_action_set_tooltip (action, _("Print this event"));
+
 	/* Hide send options. */
 	action = comp_editor_get_action (editor, "send-options");
 	gtk_action_set_visible (action, FALSE);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index f37861827d..1dfabb7597 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -2137,6 +2137,7 @@ get_widgets (EventPage *epage)
 	EventPagePrivate *priv;
 	GSList *accel_groups;
 	GtkAction *action;
+	GtkWidget *parent;
 	GtkWidget *toplevel;
 	GtkWidget *sw;
 
@@ -2178,7 +2179,8 @@ get_widgets (EventPage *epage)
 	priv->attendees_label = GW ("attendees-label");
 
 	g_object_ref (priv->main);
-	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
+	parent = gtk_widget_get_parent (priv->main);
+	gtk_container_remove (GTK_CONTAINER (parent), priv->main);
 
 	priv->categories = GW ("categories");
 	priv->categories_btn = GW ("categories-button");
@@ -2457,11 +2459,7 @@ safe_to_process_date_changed_signal (GtkWidget *dedit_widget)
 
 	entry = e_date_edit_get_entry (dedit);
 
-#if GTK_CHECK_VERSION(2,19,7)
 	return !entry || !gtk_widget_has_focus (entry);
-#else
-	return !entry || !GTK_WIDGET_HAS_FOCUS (entry);
-#endif
 }
 
 /* Callback used when the start date widget change.  We check that the
diff --git a/calendar/gui/dialogs/event-page.ui b/calendar/gui/dialogs/event-page.ui
index 328b6eac42..061c0b1e43 100644
--- a/calendar/gui/dialogs/event-page.ui
+++ b/calendar/gui/dialogs/event-page.ui
@@ -323,7 +323,7 @@
                 <child>
                   <object class="GtkLabel" id="summary-label">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Su_mmary:</property>
+                    <property name="label" translatable="yes">_Summary:</property>
                     <property name="use_underline">True</property>
                     <property name="use_markup">False</property>
                     <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -858,7 +858,7 @@
                                 <child>
                                   <object 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/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index 8e988c00a5..9486ef6770 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -133,6 +133,7 @@ memo_editor_init (MemoEditor *me)
 {
 	CompEditor *editor = COMP_EDITOR (me);
 	GtkUIManager *ui_manager;
+	GtkAction *action;
 	const gchar *id;
 	GError *error = NULL;
 
@@ -150,6 +151,9 @@ memo_editor_init (MemoEditor *me)
 		g_critical ("%s: %s", G_STRFUNC, error->message);
 		g_error_free (error);
 	}
+
+	action = comp_editor_get_action (editor, "print");
+	gtk_action_set_tooltip (action, _("Print this memo"));
 }
 
 /**
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index adb10dc9fa..8ffe45d2c5 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -438,12 +438,14 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp)
 			if (contact && e_contact_get (contact , E_CONTACT_IS_LIST)) {
 				EBook *book = NULL;
 				ENameSelectorDialog *dialog;
+				ENameSelectorModel *model;
 				EContactStore *c_store;
 				GList *books, *l;
 				gchar *uri = e_contact_get (contact, E_CONTACT_BOOK_URI);
 
 				dialog = e_name_selector_peek_dialog (name_selector);
-				c_store = e_name_selector_dialog_peek_model (dialog)->contact_store;
+				model = e_name_selector_dialog_peek_model (dialog);
+				c_store = e_name_selector_model_peek_contact_store (model);
 				books = e_contact_store_get_books (c_store);
 
 				for (l = books; l; l = l->next) {
@@ -768,6 +770,7 @@ get_widgets (MemoPage *mpage)
 	MemoPagePrivate *priv;
 	GSList *accel_groups;
 	GtkWidget *toplevel;
+	GtkWidget *parent;
 
 	priv = mpage->priv;
 
@@ -787,7 +790,8 @@ get_widgets (MemoPage *mpage)
 		page->accel_group = g_object_ref (accel_groups->data);
 
 	g_object_ref (priv->main);
-	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
+	parent = gtk_widget_get_parent (priv->main);
+	gtk_container_remove (GTK_CONTAINER (parent), priv->main);
 
 	priv->info_hbox = GW ("generic-info");
 	priv->info_icon = GW ("generic-info-image");
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index 0d9197546b..7793647723 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -40,6 +40,7 @@ recur_component_dialog (ECal *client,
 	gchar *str;
 	GtkWidget *dialog, *rb_this, *rb_prior, *rb_future, *rb_all, *hbox;
 	GtkWidget *placeholder, *vbox;
+	GtkWidget *content_area;
 	ECalComponentVType vtype;
 	gboolean ret;
 
@@ -72,8 +73,10 @@ recur_component_dialog (ECal *client,
 	g_free (str);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
 
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
 	hbox = gtk_hbox_new (FALSE, 12);
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox);
+	gtk_container_add (GTK_CONTAINER (content_area), hbox);
 
 	placeholder = gtk_label_new ("");
 	gtk_widget_set_size_request (placeholder, 48, 48);
@@ -105,7 +108,7 @@ recur_component_dialog (ECal *client,
 	gtk_widget_show_all (hbox);
 
 	placeholder = gtk_label_new ("");
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), placeholder, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (content_area), placeholder, FALSE, FALSE, 0);
 	gtk_widget_show (placeholder);
 
 	ret = gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK;
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 578f98929c..ae79698efd 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -532,6 +532,7 @@ sensitize_recur_widgets (RecurrencePage *rpage)
 	CompEditor *editor;
 	CompEditorFlags flags;
 	gboolean recurs, sens = TRUE;
+	GtkWidget *child;
 	GtkWidget *label;
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage));
@@ -548,8 +549,9 @@ sensitize_recur_widgets (RecurrencePage *rpage)
 	else
 		gtk_widget_set_sensitive (priv->preview_calendar, TRUE && sens);
 
-	if (GTK_BIN (priv->custom_warning_bin)->child)
-		gtk_widget_destroy (GTK_BIN (priv->custom_warning_bin)->child);
+	child = gtk_bin_get_child (GTK_BIN (priv->custom_warning_bin));
+	if (child != NULL)
+		gtk_widget_destroy (child);
 
 	if (recurs && priv->custom) {
 		gtk_widget_set_sensitive (priv->params, FALSE);
@@ -681,7 +683,7 @@ simple_recur_to_comp (RecurrencePage *rpage, ECalComponent *comp)
 		guint8 day_mask;
 		gint i;
 
-		g_return_if_fail (GTK_BIN (priv->special)->child != NULL);
+		g_return_if_fail (gtk_bin_get_child (GTK_BIN (priv->special)) != NULL);
 		g_return_if_fail (priv->weekday_picker != NULL);
 		g_return_if_fail (IS_WEEKDAY_PICKER (priv->weekday_picker));
 
@@ -717,7 +719,7 @@ simple_recur_to_comp (RecurrencePage *rpage, ECalComponent *comp)
 		enum month_num_options month_num;
 		enum month_day_options month_day;
 
-		g_return_if_fail (GTK_BIN (priv->special)->child != NULL);
+		g_return_if_fail (gtk_bin_get_child (GTK_BIN (priv->special)) != NULL);
 		g_return_if_fail (priv->month_day_combo != NULL);
 		g_return_if_fail (GTK_IS_COMBO_BOX (priv->month_day_combo));
 		g_return_if_fail (priv->month_num_combo != NULL);
@@ -901,11 +903,7 @@ fill_component (RecurrencePage *rpage, ECalComponent *comp)
 	e_cal_component_set_exdate_list (comp, list);
 	e_cal_component_free_exdate_list (list);
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_get_visible (priv->ending_combo) && gtk_widget_get_sensitive (priv->ending_combo) &&
-#else
-	if (GTK_WIDGET_VISIBLE (priv->ending_combo) && GTK_WIDGET_IS_SENSITIVE (priv->ending_combo) &&
-#endif
 	    e_dialog_combo_box_get (priv->ending_combo, ending_types_map) == ENDING_UNTIL) {
 		/* check whether the "until" date is in the future */
 		struct icaltimetype tt;
@@ -950,7 +948,7 @@ make_weekly_special (RecurrencePage *rpage)
 
 	priv = rpage->priv;
 
-	g_return_if_fail (GTK_BIN (priv->special)->child == NULL);
+	g_return_if_fail (gtk_bin_get_child (GTK_BIN (priv->special)) == NULL);
 	g_return_if_fail (priv->weekday_picker == NULL);
 
 	/* Create the widgets */
@@ -1228,7 +1226,7 @@ make_monthly_special (RecurrencePage *rpage)
 
 	priv = rpage->priv;
 
-	g_return_if_fail (GTK_BIN (priv->special)->child == NULL);
+	g_return_if_fail (gtk_bin_get_child (GTK_BIN (priv->special)) == NULL);
 	g_return_if_fail (priv->month_day_combo == NULL);
 
 	/* Create the widgets */
@@ -1282,6 +1280,7 @@ make_recurrence_special (RecurrencePage *rpage)
 {
 	RecurrencePagePrivate *priv;
 	icalrecurrencetype_frequency frequency;
+	GtkWidget *child;
 
 	priv = rpage->priv;
 
@@ -1289,8 +1288,10 @@ make_recurrence_special (RecurrencePage *rpage)
 		gtk_widget_destroy (priv->month_num_combo);
 		priv->month_num_combo = NULL;
 	}
-	if (GTK_BIN (priv->special)->child != NULL) {
-		gtk_widget_destroy (GTK_BIN (priv->special)->child);
+
+	child = gtk_bin_get_child (GTK_BIN (priv->special));
+	if (child != NULL) {
+		gtk_widget_destroy (child);
 
 		priv->weekday_picker = NULL;
 		priv->month_day_combo = NULL;
@@ -1345,7 +1346,7 @@ make_ending_until_special (RecurrencePage *rpage)
 	EDateEdit *de;
 	ECalComponentDateTime dt_start;
 
-	g_return_if_fail (GTK_BIN (priv->ending_special)->child == NULL);
+	g_return_if_fail (gtk_bin_get_child (GTK_BIN (priv->ending_special)) == NULL);
 	g_return_if_fail (priv->ending_date_edit == NULL);
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage));
@@ -1394,7 +1395,7 @@ make_ending_count_special (RecurrencePage *rpage)
 
 	priv = rpage->priv;
 
-	g_return_if_fail (GTK_BIN (priv->ending_special)->child == NULL);
+	g_return_if_fail (gtk_bin_get_child (GTK_BIN (priv->ending_special)) == NULL);
 	g_return_if_fail (priv->ending_count_spin == NULL);
 
 	/* Create the widgets */
@@ -1435,11 +1436,13 @@ make_ending_special (RecurrencePage *rpage)
 {
 	RecurrencePagePrivate *priv;
 	enum ending_type ending_type;
+	GtkWidget *child;
 
 	priv = rpage->priv;
 
-	if (GTK_BIN (priv->ending_special)->child != NULL) {
-		gtk_widget_destroy (GTK_BIN (priv->ending_special)->child);
+	child = gtk_bin_get_child (GTK_BIN (priv->ending_special));
+	if (child != NULL) {
+		gtk_widget_destroy (child);
 
 		priv->ending_date_edit = NULL;
 		priv->ending_count_spin = NULL;
@@ -1985,6 +1988,7 @@ get_widgets (RecurrencePage *rpage)
 	RecurrencePagePrivate *priv;
 	GSList *accel_groups;
 	GtkWidget *toplevel;
+	GtkWidget *parent;
 
 	priv = rpage->priv;
 
@@ -2002,7 +2006,8 @@ get_widgets (RecurrencePage *rpage)
 		page->accel_group = g_object_ref (accel_groups->data);
 
 	g_object_ref (priv->main);
-	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
+	parent = gtk_widget_get_parent (priv->main);
+	gtk_container_remove (GTK_CONTAINER (parent), priv->main);
 
 	priv->recurs = GW ("recurs");
 	priv->params = GW ("params");
@@ -2082,6 +2087,7 @@ create_exception_dialog (RecurrencePage *rpage, const gchar *title, GtkWidget **
 	RecurrencePagePrivate *priv;
 	GtkWidget *dialog, *toplevel;
 	CompEditor *editor;
+	GtkWidget *container;
 
 	priv = rpage->priv;
 
@@ -2096,7 +2102,8 @@ create_exception_dialog (RecurrencePage *rpage, const gchar *title, GtkWidget **
 
 	*date_edit = comp_editor_new_date_edit (TRUE, FALSE, TRUE);
 	gtk_widget_show (*date_edit);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), *date_edit, FALSE, TRUE, 6);
+	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_box_pack_start (GTK_BOX (container), *date_edit, FALSE, TRUE, 6);
 
 	return dialog;
 }
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 2e13cba1b9..7cd177e410 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -307,6 +307,7 @@ get_widgets (SchedulePage *spage)
 	SchedulePagePrivate *priv;
 	GSList *accel_groups;
 	GtkWidget *toplevel;
+	GtkWidget *parent;
 
 	priv = spage->priv;
 
@@ -324,7 +325,8 @@ get_widgets (SchedulePage *spage)
 		page->accel_group = g_object_ref (accel_groups->data);
 
 	g_object_ref (priv->main);
-	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
+	parent = gtk_widget_get_parent (priv->main);
+	gtk_container_remove (GTK_CONTAINER (parent), priv->main);
 
 #undef GW
 
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index a42501c9d6..4a9f80ef21 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -108,6 +108,7 @@ send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gbo
 	ECalComponentVType vtype;
 	const gchar *id;
 	GtkWidget *dialog, *sa_checkbox = NULL, *ona_checkbox = NULL;
+	GtkWidget *content_area;
 	gboolean res;
 
 	if (strip_alarms)
@@ -155,11 +156,12 @@ send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gbo
 	}
 
 	dialog = e_alert_dialog_new_for_args (parent, id, NULL);
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
 	if (strip_alarms)
-		sa_checkbox = add_checkbox (GTK_BOX (GTK_DIALOG (dialog)->vbox), _("Send my alarms with this event"));
+		sa_checkbox = add_checkbox (GTK_BOX (content_area), _("Send my alarms with this event"));
 	if (only_new_attendees)
-		ona_checkbox = add_checkbox (GTK_BOX (GTK_DIALOG (dialog)->vbox), _("Notify new attendees _only"));
+		ona_checkbox = add_checkbox (GTK_BOX (content_area), _("Notify new attendees _only"));
 
 	res = gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES;
 
@@ -183,11 +185,11 @@ send_component_prompt_subject (GtkWindow *parent, ECal *client, ECalComponent *c
 
 	switch (vtype) {
 	case E_CAL_COMPONENT_EVENT:
-			id = "calendar:prompt-send-no-subject-calendar";
+			id = "calendar:prompt-save-no-subject-calendar";
 		break;
 
 	case E_CAL_COMPONENT_TODO:
-			id = "calendar:prompt-send-no-subject-task";
+			id = "calendar:prompt-save-no-subject-task";
 		break;
 	case E_CAL_COMPONENT_JOURNAL:
 			id = "calendar:prompt-send-no-subject-memo";
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index c549633eb5..f84b07ecd3 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -448,6 +448,7 @@ get_widgets (TaskDetailsPage *tdpage)
 	TaskDetailsPagePrivate *priv;
 	GSList *accel_groups;
 	GtkWidget *toplevel;
+	GtkWidget *parent;
 
 	priv = tdpage->priv;
 
@@ -465,7 +466,8 @@ get_widgets (TaskDetailsPage *tdpage)
 		page->accel_group = g_object_ref (accel_groups->data);
 
 	g_object_ref (priv->main);
-	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
+	parent = gtk_widget_get_parent (priv->main);
+	gtk_container_remove (GTK_CONTAINER (parent), priv->main);
 
 	priv->status_combo = GW ("status-combobox");
 	priv->priority_combo = GW ("priority-combobox");
@@ -661,6 +663,7 @@ static void
 init_widgets (TaskDetailsPage *tdpage)
 {
 	TaskDetailsPagePrivate *priv;
+	GtkAdjustment *adjustment;
 
 	priv = tdpage->priv;
 
@@ -677,13 +680,15 @@ init_widgets (TaskDetailsPage *tdpage)
 	/* Connect signals. The Status, Percent Complete & Date Completed
 	   properties are closely related so whenever one changes we may need
 	   to update the other 2. */
-	g_signal_connect (GTK_COMBO_BOX (priv->status_combo),
-			    "changed",
-			    G_CALLBACK (status_changed), tdpage);
+	g_signal_connect (
+		GTK_COMBO_BOX (priv->status_combo), "changed",
+		G_CALLBACK (status_changed), tdpage);
 
-	g_signal_connect((GTK_SPIN_BUTTON (priv->percent_complete)->adjustment),
-			    "value_changed",
-			    G_CALLBACK (percent_complete_changed), tdpage);
+	adjustment = gtk_spin_button_get_adjustment (
+		GTK_SPIN_BUTTON (priv->percent_complete));
+	g_signal_connect (
+		adjustment, "value_changed",
+		G_CALLBACK (percent_complete_changed), tdpage);
 
 	/* Priority */
 	g_signal_connect_swapped (
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 7e35cbe070..46a2f95d0e 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -309,6 +309,8 @@ task_editor_init (TaskEditor *te)
 	CompEditor *editor = COMP_EDITOR (te);
 	GtkUIManager *ui_manager;
 	GtkActionGroup *action_group;
+	GtkWidget *content_area;
+	GtkAction *action;
 	const gchar *id;
 	GError *error = NULL;
 
@@ -333,8 +335,10 @@ task_editor_init (TaskEditor *te)
 		G_CALLBACK(gtk_widget_hide), NULL);
 
 	te->priv->task_details_page = task_details_page_new (editor);
+	content_area = gtk_dialog_get_content_area (
+		GTK_DIALOG (te->priv->task_details_window));
 	gtk_container_add (
-		GTK_CONTAINER (GTK_DIALOG (te->priv->task_details_window)->vbox),
+		GTK_CONTAINER (content_area),
 		comp_editor_page_get_widget ((CompEditorPage *) te->priv->task_details_page));
 	gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (te->priv->task_details_window)));
 	comp_editor_append_page (
@@ -362,6 +366,9 @@ task_editor_init (TaskEditor *te)
 		g_error_free (error);
 	}
 
+	action = comp_editor_get_action (editor, "print");
+	gtk_action_set_tooltip (action, _("Print this task"));
+
 	g_signal_connect_swapped (
 		te->priv->model, "row_changed",
 		G_CALLBACK (task_editor_model_changed_cb), te);
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index fb6338005f..9747501eea 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1335,6 +1335,7 @@ get_widgets (TaskPage *tpage)
 	TaskPagePrivate *priv;
 	GSList *accel_groups;
 	GtkWidget *toplevel;
+	GtkWidget *parent;
 	GtkWidget *sw;
 	GtkTreeSelection *selection;
 
@@ -1352,7 +1353,8 @@ get_widgets (TaskPage *tpage)
 		page->accel_group = g_object_ref (accel_groups->data);
 
 	g_object_ref (priv->main);
-	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
+	parent = gtk_widget_get_parent (priv->main);
+	gtk_container_remove (GTK_CONTAINER (parent), priv->main);
 
 	priv->info_hbox = e_builder_get_widget (priv->builder, "generic-info");
 	priv->info_icon = e_builder_get_widget (priv->builder, "generic-info-image");
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 77fa25c995..da7e853863 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -27,13 +27,13 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#include <camel/camel.h>
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-categories.h>
 #include <libedataserver/e-time-utils.h>
 #include <e-util/e-util.h>
 #include <e-util/e-categories-config.h>
 #include "calendar-config.h"
-#include <camel/camel-mime-filter-tohtml.h>
 
 #define E_CAL_COMPONENT_PREVIEW_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -401,14 +401,8 @@ cal_component_preview_class_init (ECalComponentPreviewClass *class)
 static void
 cal_component_preview_init (ECalComponentPreview *preview)
 {
-	GtkHTML *html;
-
 	preview->priv = E_CAL_COMPONENT_PREVIEW_GET_PRIVATE (preview);
 
-	html = GTK_HTML (preview);
-	gtk_html_set_default_content_type (html, "charset=utf-8");
-	gtk_html_load_empty (html);
-
 	preview->priv->zone = icaltimezone_get_utc_timezone ();
 }
 
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index 0a3c3de0be..aabf98ce55 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -235,6 +235,7 @@ setup_e_table (ECalListView *cal_list_view)
 	strings = g_list_append (strings, (gchar *) _("Confidential"));
 	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
 					  strings);
+	g_list_free (strings);
 
 	e_table_extras_add_cell (extras, "classification", popup_cell);
 
@@ -420,6 +421,9 @@ e_cal_list_view_get_selected_time_range (ECalendarView *cal_view, time_t *start_
 		ECalComponentDateTime dtstart, dtend;
 		ECalComponent *comp;
 
+		if (!is_comp_data_valid (event))
+			return FALSE;
+
 		comp = e_cal_component_new ();
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 		if (start_time) {
diff --git a/calendar/gui/e-cal-list-view.etspec b/calendar/gui/e-cal-list-view.etspec
index f8f2d72853..ba0130fac4 100644
--- a/calendar/gui/e-cal-list-view.etspec
+++ b/calendar/gui/e-cal-list-view.etspec
@@ -2,6 +2,7 @@
   <ETableColumn model_col="5" _title="Start Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
   <ETableColumn model_col="12" _title="End Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
   <ETableColumn model_col="8" _title="Summary" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="collate" priority="10"/>
+  <ETableColumn model_col="4" _title="Description" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="collate" priority="10"/>
   <ETableColumn model_col="13" _title="Location" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="collate" priority="10"/>
   <ETableColumn model_col="0" _title="Categories" cell="calstring" compare="collate" expansion="1.0" minimum_width="10" resizable="true" priority="-2"/>
   <ETableColumn model_col="10" _title="Created" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index e48b95999d..e745d33810 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -323,7 +323,7 @@ e_cal_model_class_init (ECalModelClass *class)
 		PROP_DEFAULT_CLIENT,
 		g_param_spec_object (
 			"default-client",
-			_("Default Client"),
+			"Default Client",
 			NULL,
 			E_TYPE_CAL,
 			G_PARAM_READWRITE));
diff --git a/calendar/gui/e-calendar-selector.c b/calendar/gui/e-calendar-selector.c
index 0747b55b59..915c970871 100644
--- a/calendar/gui/e-calendar-selector.c
+++ b/calendar/gui/e-calendar-selector.c
@@ -105,12 +105,12 @@ calendar_selector_data_dropped (ESourceSelector *selector,
 	GtkTreePath *path = NULL;
 	ECal *client;
 	icalcomponent *icalcomp;
-	const gchar *string;
+	const guchar *data;
 	gboolean success = FALSE;
 	gpointer object = NULL;
 
-	string = (const gchar *) selection_data->data;
-	icalcomp = icalparser_parse_string (string);
+	data = gtk_selection_data_get_data (selection_data);
+	icalcomp = icalparser_parse_string ((const gchar *) data);
 
 	if (icalcomp == NULL)
 		goto exit;
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index d41ef007a4..63088350c2 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -170,6 +170,9 @@ calendar_view_delete_event (ECalendarView *cal_view,
 	gboolean  delete = FALSE;
 	GError *error = NULL;
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	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);
@@ -341,6 +344,15 @@ calendar_view_finalize (GObject *object)
 }
 
 static void
+calendar_view_constructed (GObject *object)
+{
+	/* Do this after calendar_view_init() so extensions can query
+	 * the GType accurately.  See GInstanceInitFunc documentation
+	 * for details of the problem. */
+	e_extensible_load_extensions (E_EXTENSIBLE (object));
+}
+
+static void
 calendar_view_update_actions (ESelectable *selectable,
                               EFocusTracker *focus_tracker,
                               GdkAtom *clipboard_targets,
@@ -442,6 +454,9 @@ calendar_view_cut_clipboard (ESelectable *selectable)
 		if (!event)
 			continue;
 
+		if (!is_comp_data_valid (event))
+			continue;
+
 		comp = e_cal_component_new ();
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
@@ -551,7 +566,7 @@ calendar_view_copy_clipboard (ESelectable *selectable)
 	for (l = selected; l != NULL; l = l->next) {
 		event = (ECalendarViewEvent *) l->data;
 
-		if (event) {
+		if (event && is_comp_data_valid (event)) {
 			e_cal_util_add_timezones_from_component (vcal_comp, event->comp_data->icalcomp);
 
 			add_related_timezones (vcal_comp, event->comp_data->icalcomp, event->comp_data->client);
@@ -561,6 +576,9 @@ calendar_view_copy_clipboard (ESelectable *selectable)
 	for (l = selected; l != NULL; l = l->next) {
 		event = (ECalendarViewEvent *) l->data;
 
+		if (!is_comp_data_valid (event))
+			continue;
+
 		new_icalcomp = icalcomponent_new_clone (event->comp_data->icalcomp);
 
 		/* remove RECURRENCE-IDs from copied objects */
@@ -736,6 +754,7 @@ e_calendar_view_class_init (ECalendarViewClass *class)
 	object_class->get_property = calendar_view_get_property;
 	object_class->dispose = calendar_view_dispose;
 	object_class->finalize = calendar_view_finalize;
+	object_class->constructed = calendar_view_constructed;
 
 	class->selection_changed = NULL;
 	class->selected_time_changed = NULL;
@@ -1197,6 +1216,9 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 	if (!selected)
 		return;
 	event = (ECalendarViewEvent *) selected->data;
+	if (!is_comp_data_valid (event))
+		return;
+
 	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);
@@ -1307,7 +1329,7 @@ e_calendar_view_open_event (ECalendarView *cal_view)
 	selected = e_calendar_view_get_selected_events (cal_view);
 	if (selected) {
 		ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data;
-		if (event)
+		if (event && is_comp_data_valid (event))
 			e_calendar_view_edit_appointment (cal_view, event->comp_data->client,
 					event->comp_data->icalcomp, icalcomponent_get_first_property(event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY) != NULL);
 
@@ -1644,39 +1666,42 @@ get_label (struct icaltimetype *tt, icaltimezone *f_zone, icaltimezone *t_zone)
 void
 e_calendar_view_move_tip (GtkWidget *widget, gint x, gint 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);
+	GtkAllocation allocation;
+	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;
+
+	gtk_widget_get_allocation (widget, &allocation);
+
+	if ((y + h + allocation.height + 4) > monitor.y + monitor.height)
+		y = y - h - 36;
+
+	gtk_window_move (GTK_WINDOW (widget), x, y);
+	gtk_widget_show (widget);
 }
 
 /**
@@ -1779,6 +1804,7 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data)
 	ECalendarViewEvent *pevent;
 	GtkStyle *style = gtk_widget_get_default_style ();
 	GtkWidget *widget = (GtkWidget *) g_object_get_data (G_OBJECT (data->cal_view), "tooltip-window");
+	GdkWindow *window;
 	ECalComponent *newcomp = e_cal_component_new ();
 	icaltimezone *zone, *default_zone;
 	ECal *client = NULL;
@@ -1791,6 +1817,9 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data)
 	default_zone = e_calendar_view_get_timezone  (data->cal_view);
 	pevent = data->get_view_event (data->cal_view, data->day, data->event_num);
 
+	if (!is_comp_data_valid (pevent))
+		return FALSE;
+
 	client = pevent->comp_data->client;
 
 	clone_comp = icalcomponent_new_clone (pevent->comp_data->icalcomp);
@@ -1938,7 +1967,8 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data)
 
 	e_calendar_view_move_tip (pevent->tooltip, pevent->x +16, pevent->y+16);
 
-	gdk_keyboard_grab (pevent->tooltip->window, FALSE, GDK_CURRENT_TIME);
+	window = gtk_widget_get_window (pevent->tooltip);
+	gdk_keyboard_grab (window, FALSE, GDK_CURRENT_TIME);
 	g_signal_connect (pevent->tooltip, "key-press-event", G_CALLBACK (tooltip_grab), data->cal_view);
 	pevent->timeout = -1;
 
@@ -2091,3 +2121,38 @@ get_today_background (const GdkColor base_background)
 	return res;
 }
 
+gboolean
+is_comp_data_valid_func (ECalendarViewEvent *event, const gchar *location)
+{
+	g_return_val_if_fail (location != NULL, FALSE);
+
+	if (!event) {
+		g_warning ("%s: event is NULL", location);
+		return FALSE;
+	}
+
+	if (!event->comp_data) {
+		g_warning ("%s: event's (%p) comp_data is NULL", location, event);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+gboolean
+is_array_index_in_bounds_func (GArray *array, gint index, const gchar *location)
+{
+	g_return_val_if_fail (location != NULL, FALSE);
+
+	if (!array) {
+		g_warning ("%s: array is NULL", location);
+		return FALSE;
+	}
+
+	if (index < 0 || index >= array->len) {
+		g_warning ("%s: index %d is out of bounds [0,%d) at array %p", location, index, array->len, array);
+		return FALSE;
+	}
+
+	return TRUE;
+}
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index 62fcabcc37..6f68e6376b 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -87,6 +87,14 @@ typedef struct {
 	E_CALENDAR_VIEW_EVENT_FIELDS
 } ECalendarViewEvent;
 
+/* checks if event->comp_data is not NULL, returns FALSE when it is and prints a warning on a console */
+gboolean is_comp_data_valid_func (ECalendarViewEvent *event, const gchar *location);
+#define is_comp_data_valid(_event) is_comp_data_valid_func ((ECalendarViewEvent *) (_event), G_STRFUNC)
+
+/* checks if index is within bounds for the array; returns FALSE when not, and prints a warning on a console */
+gboolean is_array_index_in_bounds_func (GArray *array, gint index, const gchar *location);
+#define is_array_index_in_bounds(_array, _index) is_array_index_in_bounds_func (_array, _index, G_STRFUNC)
+
 typedef struct _ECalendarView ECalendarView;
 typedef struct _ECalendarViewClass ECalendarViewClass;
 typedef struct _ECalendarViewPrivate ECalendarViewPrivate;
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 11baebf67b..5de9b76546 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -107,6 +107,9 @@ day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *main_item,
 		gboolean first = TRUE;
 		event = &g_array_index (day_view->long_events, EDayViewEvent, event_num);
 
+		if (!is_comp_data_valid (event))
+			continue;
+
 		/* If the event is TRANSPARENT, skip it. */
 		if (icalcomp_is_transparent (event->comp_data->icalcomp)) {
 			continue;
@@ -248,9 +251,15 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item,
 
 	font_options = get_font_options ();
 
+	if (!is_array_index_in_bounds (day_view->events[day], event_num))
+		return;
+
 	event = &g_array_index (day_view->events[day], EDayViewEvent,
 				event_num);
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	/* Fill in the event background. Note that for events in the first
 	   column of the day, we might not want to paint over the vertical bar,
 	   since that is used for multiple events. But then you can't see
@@ -279,11 +288,7 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item,
 		g_object_get (G_OBJECT (event->canvas_item), "x_offset", &text_x_offset, NULL);
 
 	/* Draw shadow around the event when selected */
-#if GTK_CHECK_VERSION(2,19,7)
 	if (is_editing && (gtk_widget_has_focus (day_view->main_canvas))) {
-#else
-	if (is_editing && (GTK_WIDGET_HAS_FOCUS (day_view->main_canvas))) {
-#endif
 		/* For embossing Item selection */
 		item_x -= 1;
 		item_y -= 2;
@@ -870,6 +875,9 @@ day_view_main_item_draw_events_in_vbars (EDayViewMainItem *main_item,
 	for (event_num = 0; event_num < day_view->events[day]->len; event_num++) {
 		event = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
 
+		if (!is_comp_data_valid (event))
+			continue;
+
 		/* We can skip the events in the first column since they will
 		   draw over this anyway. */
 		if (event->num_columns > 0 && event->start_row_or_col == 0) {
@@ -1103,11 +1111,7 @@ day_view_main_item_draw (GnomeCanvasItem *canvas_item,
 
 			if (can_draw_in_region (draw_region, rect_x, rect_y, rect_width, rect_height)) {
 				cairo_save (cr);
-#if GTK_CHECK_VERSION(2,19,7)
 				gdk_cairo_set_source_color (cr, &day_view->colors[gtk_widget_has_focus (GTK_WIDGET (day_view)) ? E_DAY_VIEW_COLOR_BG_SELECTED : E_DAY_VIEW_COLOR_BG_SELECTED_UNFOCUSSED]);
-#else
-				gdk_cairo_set_source_color (cr, &day_view->colors[GTK_WIDGET_HAS_FOCUS(day_view) ? E_DAY_VIEW_COLOR_BG_SELECTED : E_DAY_VIEW_COLOR_BG_SELECTED_UNFOCUSSED]);
-#endif
 				cairo_rectangle (cr, rect_x, rect_y, rect_width, rect_height);
 				cairo_fill (cr);
 				cairo_restore (cr);
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 6f7b8313c0..edc446ac25 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -853,6 +853,7 @@ static void
 e_day_view_time_item_on_button_press (EDayViewTimeItem *time_item,
 				      GdkEvent *event)
 {
+	GdkWindow *window;
 	EDayView *day_view;
 	GnomeCanvas *canvas;
 	gint row;
@@ -868,14 +869,12 @@ e_day_view_time_item_on_button_press (EDayViewTimeItem *time_item,
 	if (row == -1)
 		return;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_has_focus (GTK_WIDGET (day_view)))
-#else
-	if (!GTK_WIDGET_HAS_FOCUS (day_view))
-#endif
 		gtk_widget_grab_focus (GTK_WIDGET (day_view));
 
-	if (gdk_pointer_grab (GTK_LAYOUT (canvas)->bin_window, FALSE,
+	window = gtk_layout_get_bin_window (GTK_LAYOUT (canvas));
+
+	if (gdk_pointer_grab (window, FALSE,
 			      GDK_POINTER_MOTION_MASK
 			      | GDK_BUTTON_RELEASE_MASK,
 			      NULL, NULL, event->button.time) == 0) {
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 4012ba6289..f622b8252b 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -93,8 +93,15 @@ day_view_top_item_draw_triangle (EDayViewTopItem *top_item,
 	if (h % 2 == 0)
 		c1--;
 
+	if (!is_array_index_in_bounds (day_view->long_events, event_num))
+		return;
+
 	event = &g_array_index (day_view->long_events, EDayViewEvent,
 				event_num);
+
+	if (!is_comp_data_valid (event))
+		return;
+
 	cairo_save (cr);
 	/* Fill it in. */
 	if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)),
@@ -187,9 +194,15 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item,
 						 &item_w, &item_h))
 		return;
 
+	if (!is_array_index_in_bounds (day_view->long_events, event_num))
+		return;
+
 	event = &g_array_index (day_view->long_events, EDayViewEvent,
 				event_num);
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	style = gtk_widget_get_style (GTK_WIDGET (day_view));
 	gc = day_view->main_gc;
 	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
@@ -581,6 +594,7 @@ day_view_top_item_draw (GnomeCanvasItem *canvas_item,
 	GtkStyle *style;
 	GdkGC *fg_gc;
 	gchar buffer[128];
+	GtkAllocation allocation;
 	GdkRectangle clip_rect;
 	gint canvas_width, canvas_height, left_edge, day, date_width, date_x;
 	gint item_height, event_num;
@@ -598,7 +612,9 @@ day_view_top_item_draw (GnomeCanvasItem *canvas_item,
 
 	style = gtk_widget_get_style (GTK_WIDGET (day_view));
 	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	canvas_width = GTK_WIDGET (canvas_item->canvas)->allocation.width;
+	gtk_widget_get_allocation (
+		GTK_WIDGET (canvas_item->canvas), &allocation);
+	canvas_width = allocation.width;
 	canvas_height = (show_dates ? 1 : (MAX (1, day_view->rows_in_top_display) + 1)) * day_view->top_row_height;
 	left_edge = 0;
 	item_height = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;
@@ -648,11 +664,7 @@ day_view_top_item_draw (GnomeCanvasItem *canvas_item,
 		cairo_restore (cr);
 
 		/* Draw the selection background. */
-#if GTK_CHECK_VERSION(2,19,7)
 		if (gtk_widget_has_focus (GTK_WIDGET (day_view))
-#else
-		if (GTK_WIDGET_HAS_FOCUS (day_view)
-#endif
 			&& day_view->selection_start_day != -1) {
 			gint start_col, end_col, rect_x, rect_y, rect_w, rect_h;
 
@@ -684,9 +696,11 @@ day_view_top_item_draw (GnomeCanvasItem *canvas_item,
 			e_day_view_top_item_get_day_label (day_view, day, buffer, sizeof (buffer));
 			clip_rect.x = day_view->day_offsets[day] - x;
 			clip_rect.y = 2 - y;
-			if (day_view->days_shown == 1)
-				clip_rect.width = day_view->top_canvas->allocation.width - day_view->day_offsets[day];
-			else
+			if (day_view->days_shown == 1) {
+				gtk_widget_get_allocation (
+					day_view->top_canvas, &allocation);
+				clip_rect.width = allocation.width - day_view->day_offsets[day];
+			} else
 				clip_rect.width = day_view->day_widths[day];
 			clip_rect.height = item_height - 2;
 
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index cc8581fb00..010f5bdb32 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -591,6 +591,9 @@ day_view_constructed (GObject *object)
 {
 	ECalModel *model;
 
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_day_view_parent_class)->constructed (object);
+
 	model = e_calendar_view_get_model (E_CALENDAR_VIEW (object));
 
 	g_signal_connect_swapped (
@@ -981,9 +984,11 @@ e_day_view_init (EDayView *day_view)
 {
 	gint day;
 	GnomeCanvasGroup *canvas_group;
+	GtkAdjustment *adjustment;
+	GtkLayout *layout;
 	GtkWidget *w;
 
-	GTK_WIDGET_SET_FLAGS (day_view, GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus (GTK_WIDGET (day_view), TRUE);
 
 	day_view->long_events = g_array_new (FALSE, FALSE,
 					     sizeof (EDayViewEvent));
@@ -1239,8 +1244,10 @@ e_day_view_init (EDayView *day_view)
 	 * 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);
+	layout = GTK_LAYOUT (day_view->main_canvas);
+	adjustment = gtk_layout_get_vadjustment (layout);
+	layout = GTK_LAYOUT (day_view->time_canvas);
+	gtk_layout_set_vadjustment (layout, adjustment);
 	gtk_table_attach (GTK_TABLE (day_view), day_view->time_canvas,
 			  0, 1, 1, 2,
 			  GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
@@ -1259,16 +1266,22 @@ e_day_view_init (EDayView *day_view)
 	/*
 	 * Scrollbar.
 	 */
-	day_view->mc_hscrollbar = gtk_hscrollbar_new (GTK_LAYOUT (day_view->main_canvas)->hadjustment);
+	layout = GTK_LAYOUT (day_view->main_canvas);
+	adjustment = gtk_layout_get_hadjustment (layout);
+	day_view->mc_hscrollbar = gtk_hscrollbar_new (adjustment);
 	gtk_table_attach (GTK_TABLE (day_view), day_view->mc_hscrollbar, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
 	gtk_widget_show (day_view->mc_hscrollbar);
 
-	day_view->tc_vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (day_view->top_canvas)->vadjustment);
+	layout = GTK_LAYOUT (day_view->top_canvas);
+	adjustment = gtk_layout_get_vadjustment (layout);
+	day_view->tc_vscrollbar = gtk_vscrollbar_new (adjustment);
 	gtk_table_attach (GTK_TABLE (day_view), day_view->tc_vscrollbar,
 			  2, 3, 0, 1, 0, GTK_FILL, 0, 0);
 	/* gtk_widget_show (day_view->tc_vscrollbar); */
 
-	day_view->vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (day_view->main_canvas)->vadjustment);
+	layout = GTK_LAYOUT (day_view->main_canvas);
+	adjustment = gtk_layout_get_vadjustment (layout);
+	day_view->vscrollbar = gtk_vscrollbar_new (adjustment);
 	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);
@@ -1321,8 +1334,10 @@ static void
 e_day_view_on_canvas_realized (GtkWidget *widget,
 			       EDayView *day_view)
 {
-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window,
-				    NULL, FALSE);
+	GdkWindow *window;
+
+	window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
+	gdk_window_set_back_pixmap (window, NULL, FALSE);
 }
 
 /**
@@ -1404,12 +1419,14 @@ e_day_view_realize (GtkWidget *widget)
 {
 	EDayView *day_view;
 	GdkColormap *colormap;
+	GdkWindow *window;
 
 	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);
+	window = gtk_widget_get_window (widget);
+	day_view->main_gc = gdk_gc_new (window);
 
 	colormap = gtk_widget_get_colormap (widget);
 
@@ -1446,21 +1463,25 @@ e_day_view_realize (GtkWidget *widget)
 static void
 e_day_view_set_colors(EDayView *day_view, GtkWidget *widget)
 {
-	day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING] = widget->style->base[GTK_STATE_NORMAL];
-	day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING] = widget->style->bg[GTK_STATE_ACTIVE];
-	day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED] = widget->style->base[GTK_STATE_SELECTED];
-	day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED_UNFOCUSSED] = widget->style->bg[GTK_STATE_SELECTED];
-	day_view->colors[E_DAY_VIEW_COLOR_BG_GRID] = widget->style->dark[GTK_STATE_NORMAL];
+	GtkStyle *style;
+
+	style = gtk_widget_get_style (widget);
+
+	day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING] = style->base[GTK_STATE_NORMAL];
+	day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING] = style->bg[GTK_STATE_ACTIVE];
+	day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED] = style->base[GTK_STATE_SELECTED];
+	day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED_UNFOCUSSED] = style->bg[GTK_STATE_SELECTED];
+	day_view->colors[E_DAY_VIEW_COLOR_BG_GRID] = style->dark[GTK_STATE_NORMAL];
 	day_view->colors[E_DAY_VIEW_COLOR_BG_MULTIDAY_TODAY] = get_today_background (day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING]);
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS] = widget->style->dark[GTK_STATE_NORMAL];
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED] = widget->style->bg[GTK_STATE_SELECTED];
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID] = widget->style->light[GTK_STATE_NORMAL];
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR] = widget->style->base[GTK_STATE_SELECTED];
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND] = widget->style->base[GTK_STATE_NORMAL];
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER] = widget->style->dark[GTK_STATE_NORMAL];
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND] = widget->style->bg[GTK_STATE_ACTIVE];
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER] = widget->style->dark[GTK_STATE_NORMAL];
-	day_view->colors[E_DAY_VIEW_COLOR_MARCUS_BAINS_LINE] = widget->style->dark[GTK_STATE_PRELIGHT];
+	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS] = style->dark[GTK_STATE_NORMAL];
+	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED] = style->bg[GTK_STATE_SELECTED];
+	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID] = style->light[GTK_STATE_NORMAL];
+	day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR] = style->base[GTK_STATE_SELECTED];
+	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND] = style->base[GTK_STATE_NORMAL];
+	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER] = style->dark[GTK_STATE_NORMAL];
+	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND] = style->bg[GTK_STATE_ACTIVE];
+	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER] = style->dark[GTK_STATE_NORMAL];
+	day_view->colors[E_DAY_VIEW_COLOR_MARCUS_BAINS_LINE] = style->dark[GTK_STATE_PRELIGHT];
 }
 
 static void
@@ -1495,6 +1516,7 @@ e_day_view_unrealize (GtkWidget *widget)
 static GdkColor
 e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget *widget)
 {
+	GtkStyle *style;
 	GdkColor bg_color;
 	guint16 red, green, blue;
 	gdouble	cc = 65535.0;
@@ -1503,7 +1525,7 @@ e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget *
 	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),
+	if (is_comp_data_valid (event) && 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));
@@ -1514,15 +1536,18 @@ e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget *
                 }
 	}
 
+	style = gtk_widget_get_style (widget);
+
 	if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
-		return widget->style->black;
+		return style->black;
 	else
-		return widget->style->white;
+		return style->white;
 }
 
 static void
 e_day_view_update_top_scroll (EDayView *day_view, gboolean scroll_to_top)
 {
+	GtkAllocation allocation;
 	gint top_rows, top_canvas_height;
 	gdouble old_x2, old_y2, new_x2, new_y2;
 
@@ -1541,7 +1566,8 @@ e_day_view_update_top_scroll (EDayView *day_view, gboolean scroll_to_top)
 	/* Set the scroll region of the top canvas */
 	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view->top_canvas),
 					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = day_view->top_canvas->allocation.width - 1;
+	gtk_widget_get_allocation (day_view->top_canvas, &allocation);
+	new_x2 = allocation.width - 1;
 	new_y2 = (MAX (1, day_view->rows_in_top_display) + 1) * day_view->top_row_height - 1;
 	if (old_x2 != new_x2 || old_y2 != new_y2) {
 		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view->top_canvas),
@@ -1577,6 +1603,7 @@ e_day_view_style_set (GtkWidget *widget,
 	PangoFontMetrics *font_metrics;
 	PangoLayout *layout;
 	gint week_day, event_num;
+	GtkAdjustment *adjustment;
 	EDayViewEvent *event;
 	GdkColor color;
 
@@ -1635,16 +1662,25 @@ e_day_view_style_set (GtkWidget *widget,
 		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->row_height =
+		MAX (day_view->row_height,
+		E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD + 2);
+
+	adjustment = gtk_layout_get_vadjustment (GTK_LAYOUT (day_view->main_canvas));
+	gtk_adjustment_set_step_increment (adjustment, 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);
-	GTK_LAYOUT (day_view->top_canvas)->vadjustment->step_increment = day_view->top_row_height;
+	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);
+
+	adjustment = gtk_layout_get_vadjustment (GTK_LAYOUT (day_view->top_canvas));
+	gtk_adjustment_set_step_increment (adjustment, day_view->top_row_height);
 	gtk_widget_set_size_request (day_view->top_dates_canvas, -1, day_view->top_row_height - 2);
 
 	e_day_view_update_top_scroll (day_view, TRUE);
@@ -1791,11 +1827,14 @@ e_day_view_recalc_cell_sizes	(EDayView	*day_view)
 	gint day, max_width;
 	struct tm date_tm;
 	gchar buffer[128];
+	GtkAllocation allocation;
 	PangoContext *pango_context;
 	PangoLayout *layout;
 	gint pango_width;
 
-	g_return_if_fail (((GtkWidget*)day_view)->style != NULL);
+	g_return_if_fail (gtk_widget_get_style (GTK_WIDGET (day_view)) != NULL);
+
+	gtk_widget_get_allocation (day_view->main_canvas, &allocation);
 
 	/* Set up Pango prerequisites */
 	pango_context = gtk_widget_get_pango_context (GTK_WIDGET (day_view));
@@ -1804,7 +1843,7 @@ e_day_view_recalc_cell_sizes	(EDayView	*day_view)
 	/* Calculate the column sizes, using floating point so that pixels
 	   get divided evenly. Note that we use one more element than the
 	   number of columns, to make it easy to get the column widths. */
-	width = day_view->main_canvas->allocation.width;
+	width = allocation.width;
 	if (day_view->days_shown == 1)
 		width = MAX (width, day_view->max_cols * (E_DAY_VIEW_MIN_DAY_COL_WIDTH + E_DAY_VIEW_GAP_WIDTH) - E_DAY_VIEW_MIN_DAY_COL_WIDTH - 1);
 	width /= day_view->days_shown;
@@ -1969,6 +2008,9 @@ e_day_view_foreach_event_with_uid (EDayView *day_view,
 			event = &g_array_index (day_view->events[day],
 						EDayViewEvent, event_num);
 
+			if (!is_comp_data_valid (event))
+				continue;
+
 			u = icalcomponent_get_uid (event->comp_data->icalcomp);
 			if (uid && !strcmp (uid, u)) {
 				if (!(*callback) (day_view, day, event_num, data))
@@ -1983,6 +2025,9 @@ e_day_view_foreach_event_with_uid (EDayView *day_view,
 		event = &g_array_index (day_view->long_events,
 					EDayViewEvent, event_num);
 
+		if (!is_comp_data_valid (event))
+			continue;
+
 		u = icalcomponent_get_uid (event->comp_data->icalcomp);
 		if (u && !strcmp (uid, u)) {
 			if (!(*callback) (day_view, E_DAY_VIEW_LONG_EVENT, event_num, data))
@@ -2004,12 +2049,19 @@ e_day_view_remove_event_cb (EDayView *day_view,
 		 day, event_num);
 #endif
 
-	if (day == E_DAY_VIEW_LONG_EVENT)
+	if (day == E_DAY_VIEW_LONG_EVENT) {
+		if (!is_array_index_in_bounds (day_view->long_events, event_num))
+			return TRUE;
+
 		event = &g_array_index (day_view->long_events,
 					EDayViewEvent, event_num);
-	else
+	} else {
+		if (!is_array_index_in_bounds (day_view->events[day], event_num))
+			return TRUE;
+
 		event = &g_array_index (day_view->events[day],
 					EDayViewEvent, event_num);
+	}
 
 	if (!event)
 		return TRUE;
@@ -2029,7 +2081,8 @@ e_day_view_remove_event_cb (EDayView *day_view,
 	if (event->canvas_item)
 		gtk_object_destroy (GTK_OBJECT (event->canvas_item));
 
-	g_object_unref (event->comp_data);
+	if (is_comp_data_valid (event))
+		g_object_unref (event->comp_data);
 	event->comp_data = NULL;
 
 	if (day == E_DAY_VIEW_LONG_EVENT) {
@@ -2053,6 +2106,9 @@ set_text_as_bold (EDayViewEvent *event)
 	gchar *address;
 	ECalComponentAttendee *at = NULL;
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 	address = itip_get_comp_attendee (comp, event->comp_data->client);
@@ -2091,10 +2147,13 @@ e_day_view_update_event_label (EDayView *day_view,
 	gchar *text;
 	gint interval;
 
+	if (!is_array_index_in_bounds (day_view->events[day], event_num))
+		return;
+
 	event = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
 
 	/* If the event isn't visible just return. */
-	if (!event->canvas_item)
+	if (!event->canvas_item || !is_comp_data_valid (event))
 		return;
 
 	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
@@ -2142,11 +2201,14 @@ e_day_view_update_long_event_label (EDayView *day_view,
 	const gchar *summary;
 	gboolean free_text = FALSE;
 
+	if (!is_array_index_in_bounds (day_view->long_events, event_num))
+		return;
+
 	event = &g_array_index (day_view->long_events, EDayViewEvent,
 				event_num);
 
 	/* If the event isn't visible just return. */
-	if (!event->canvas_item)
+	if (!event->canvas_item || !is_comp_data_valid (event))
 		return;
 
 	summary = e_calendar_view_get_icalcomponent_summary (event->comp_data->client, event->comp_data->icalcomp, &free_text);
@@ -2231,6 +2293,9 @@ e_day_view_find_event_from_uid (EDayView *day_view,
 			event = &g_array_index (day_view->events[day],
 						EDayViewEvent, event_num);
 
+			if (!is_comp_data_valid (event))
+				continue;
+
 			if (event->comp_data->client != client)
 				continue;
 
@@ -2259,6 +2324,9 @@ e_day_view_find_event_from_uid (EDayView *day_view,
 		event = &g_array_index (day_view->long_events,
 					EDayViewEvent, event_num);
 
+		if (!is_comp_data_valid (event))
+			continue;
+
 		if (event->comp_data->client != client)
 			continue;
 
@@ -2976,25 +3044,34 @@ e_day_view_recalc_work_week	(EDayView	*day_view)
 static gboolean
 e_day_view_update_scroll_regions (EDayView *day_view)
 {
+	GtkAllocation main_canvas_allocation;
+	GtkAllocation time_canvas_allocation;
 	gdouble old_x2, old_y2, new_x2, new_y2;
 	gboolean need_reshape = FALSE;
 
+	gtk_widget_get_allocation (
+		day_view->main_canvas, &main_canvas_allocation);
+	gtk_widget_get_allocation (
+		day_view->time_canvas, &time_canvas_allocation);
+
 	/* Set the scroll region of the time canvas to its allocated width,
 	   but with the height the same as the main canvas. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view->time_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = day_view->time_canvas->allocation.width - 1;
+	gnome_canvas_get_scroll_region (
+		GNOME_CANVAS (day_view->time_canvas),
+		NULL, NULL, &old_x2, &old_y2);
+	new_x2 = time_canvas_allocation.width - 1;
 	new_y2 = MAX (day_view->rows * day_view->row_height,
-		      day_view->main_canvas->allocation.height) - 1;
+		      main_canvas_allocation.height) - 1;
 	if (old_x2 != new_x2 || old_y2 != new_y2)
 		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view->time_canvas),
 						0, 0, new_x2, new_y2);
 
 	/* Set the scroll region of the main canvas to its allocated width,
 	   but with the height depending on the number of rows needed. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view->main_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = day_view->main_canvas->allocation.width - 1;
+	gnome_canvas_get_scroll_region (
+		GNOME_CANVAS (day_view->main_canvas),
+		NULL, NULL, &old_x2, &old_y2);
+	new_x2 = main_canvas_allocation.width - 1;
 
 	if (day_view->days_shown == 1)
 		new_x2 = MAX (new_x2, day_view->max_cols * (E_DAY_VIEW_MIN_DAY_COL_WIDTH + E_DAY_VIEW_GAP_WIDTH) - E_DAY_VIEW_MIN_DAY_COL_WIDTH - 1);
@@ -3005,7 +3082,7 @@ e_day_view_update_scroll_regions (EDayView *day_view)
 						0, 0, new_x2, new_y2);
 	}
 
-	if (new_x2 <= day_view->main_canvas->allocation.width - 1)
+	if (new_x2 <= main_canvas_allocation.width - 1)
 		gtk_widget_hide (day_view->mc_hscrollbar);
 	else
 		gtk_widget_show (day_view->mc_hscrollbar);
@@ -3070,6 +3147,11 @@ e_day_view_on_top_canvas_button_press (GtkWidget *widget,
 {
 	gint event_x, event_y, day, event_num;
 	ECalendarViewPosition pos;
+	GtkLayout *layout;
+	GdkWindow *window;
+
+	layout = GTK_LAYOUT (widget);
+	window = gtk_layout_get_bin_window (layout);
 
 	if (day_view->resize_event_num != -1)
 		day_view->resize_event_num = -1;
@@ -3079,9 +3161,8 @@ e_day_view_on_top_canvas_button_press (GtkWidget *widget,
 
 	/* 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*) event,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
+	if (!e_day_view_convert_event_coords (
+		day_view, (GdkEvent*) event, window, &event_x, &event_y))
 		return FALSE;
 
 	pos = e_day_view_convert_position_in_top_canvas (day_view,
@@ -3116,14 +3197,10 @@ e_day_view_on_top_canvas_button_press (GtkWidget *widget,
 			return TRUE;
 		}
 
-#if GTK_CHECK_VERSION(2,19,7)
 		if (!gtk_widget_has_focus (GTK_WIDGET (day_view)))
-#else
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-#endif
 			gtk_widget_grab_focus (GTK_WIDGET (day_view));
 
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
+		if (gdk_pointer_grab (window, FALSE,
 				      GDK_POINTER_MOTION_MASK
 				      | GDK_BUTTON_RELEASE_MASK,
 				      NULL, NULL, event->time) == 0) {
@@ -3133,11 +3210,7 @@ e_day_view_on_top_canvas_button_press (GtkWidget *widget,
 			e_day_view_start_selection (day_view, day, -1);
 		}
 	} else if (event->button == 3) {
-#if GTK_CHECK_VERSION(2,19,7)
 		if (!gtk_widget_has_focus (GTK_WIDGET (day_view)))
-#else
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-#endif
 			gtk_widget_grab_focus (GTK_WIDGET (day_view));
 
 		if (day < day_view->selection_start_day || day > day_view->selection_end_day) {
@@ -3211,11 +3284,16 @@ e_day_view_on_main_canvas_button_press (GtkWidget *widget,
 {
 	gint event_x, event_y, row, day, event_num;
 	ECalendarViewPosition pos;
+	GtkLayout *layout;
+	GdkWindow *window;
 
 #if 0
 	g_print ("In e_day_view_on_main_canvas_button_press\n");
 #endif
 
+	layout = GTK_LAYOUT (widget);
+	window = gtk_layout_get_bin_window (layout);
+
 	if (day_view->resize_event_num != -1)
 		day_view->resize_event_num = -1;
 
@@ -3224,9 +3302,8 @@ e_day_view_on_main_canvas_button_press (GtkWidget *widget,
 
 	/* 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*) event,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
+	if (!e_day_view_convert_event_coords (
+		day_view, (GdkEvent*) event, window, &event_x, &event_y))
 		return FALSE;
 
 	/* Find out where the mouse is. */
@@ -3262,14 +3339,10 @@ e_day_view_on_main_canvas_button_press (GtkWidget *widget,
 			return TRUE;
 		}
 
-#if GTK_CHECK_VERSION(2,19,7)
 		if (!gtk_widget_has_focus (GTK_WIDGET (day_view)) && !gtk_widget_has_focus (GTK_WIDGET (day_view->main_canvas)))
-#else
-		if (!GTK_WIDGET_HAS_FOCUS (day_view) && !GTK_WIDGET_HAS_FOCUS (day_view->main_canvas))
-#endif
 			gtk_widget_grab_focus (GTK_WIDGET (day_view));
 
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
+		if (gdk_pointer_grab (window, FALSE,
 				      GDK_POINTER_MOTION_MASK
 				      | GDK_BUTTON_RELEASE_MASK,
 				      NULL, NULL, event->time) == 0) {
@@ -3280,11 +3353,7 @@ e_day_view_on_main_canvas_button_press (GtkWidget *widget,
 			g_signal_emit_by_name (day_view, "selected_time_changed");
 		}
 	} else if (event->button == 3) {
-#if GTK_CHECK_VERSION(2,19,7)
 		if (!gtk_widget_has_focus (GTK_WIDGET (day_view)))
-#else
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-#endif
 			gtk_widget_grab_focus (GTK_WIDGET (day_view));
 
 		if ((day < day_view->selection_start_day || day > day_view->selection_end_day)
@@ -3383,6 +3452,9 @@ e_day_view_on_long_event_button_press (EDayView		*day_view,
 	} else if (event->button == 3) {
 		EDayViewEvent *e;
 
+		if (!is_array_index_in_bounds (day_view->long_events, event_num))
+			return TRUE;
+
 		e = &g_array_index (day_view->long_events, EDayViewEvent, event_num);
 
 		e_day_view_set_selected_time_range_in_top_visible (day_view, e->start, e->end);
@@ -3421,6 +3493,9 @@ e_day_view_on_event_button_press (EDayView	  *day_view,
 	} else if (event->button == 3) {
 		EDayViewEvent *e;
 
+		if (!is_array_index_in_bounds (day_view->events[day], event_num))
+			return TRUE;
+
 		e = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
 
 		e_day_view_set_selected_time_range_visible (day_view, e->start, e->end);
@@ -3442,12 +3517,20 @@ e_day_view_on_long_event_click (EDayView *day_view,
 				gint	     event_y)
 {
 	EDayViewEvent *event;
+	GtkLayout *layout;
+	GdkWindow *window;
 	gint start_day, end_day, day;
 	gint item_x, item_y, item_w, item_h;
 
+	if (!is_array_index_in_bounds (day_view->long_events, event_num))
+		return;
+
 	event = &g_array_index (day_view->long_events, EDayViewEvent,
 				event_num);
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	/* Ignore clicks on the EText while editing. */
 	if (pos == E_CALENDAR_VIEW_POS_EVENT
 	    && E_TEXT (event->canvas_item)->editing) {
@@ -3467,14 +3550,13 @@ e_day_view_on_long_event_click (EDayView *day_view,
 
 		/* Grab the keyboard focus, so the event being edited is saved
 		   and we can use the Escape key to abort the resize. */
-#if GTK_CHECK_VERSION(2,19,7)
 		if (!gtk_widget_has_focus (GTK_WIDGET (day_view)))
-#else
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-#endif
 			gtk_widget_grab_focus (GTK_WIDGET (day_view));
 
-		if (gdk_pointer_grab (GTK_LAYOUT (day_view->top_canvas)->bin_window, FALSE,
+		layout = GTK_LAYOUT (day_view->top_canvas);
+		window = gtk_layout_get_bin_window (layout);
+
+		if (gdk_pointer_grab (window, FALSE,
 				      GDK_POINTER_MOTION_MASK
 				      | GDK_BUTTON_RELEASE_MASK,
 				      NULL, NULL, bevent->time) == 0) {
@@ -3517,11 +3599,19 @@ e_day_view_on_event_click (EDayView *day_view,
 			   gint		  event_y)
 {
 	EDayViewEvent *event;
+	GtkLayout *layout;
+	GdkWindow *window;
 	gint tmp_day, row, start_row;
 
+	if (!is_array_index_in_bounds (day_view->events[day], event_num))
+		return;
+
 	event = &g_array_index (day_view->events[day], EDayViewEvent,
 				event_num);
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	/* Ignore clicks on the EText while editing. */
 	if (pos == E_CALENDAR_VIEW_POS_EVENT
 	    && E_TEXT (event->canvas_item)->editing) {
@@ -3541,14 +3631,13 @@ e_day_view_on_event_click (EDayView *day_view,
 
 		/* Grab the keyboard focus, so the event being edited is saved
 		   and we can use the Escape key to abort the resize. */
-#if GTK_CHECK_VERSION(2,19,7)
 		if (!gtk_widget_has_focus (GTK_WIDGET (day_view)))
-#else
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-#endif
 			gtk_widget_grab_focus (GTK_WIDGET (day_view));
 
-		if (gdk_pointer_grab (GTK_LAYOUT (day_view->main_canvas)->bin_window, FALSE,
+		layout = GTK_LAYOUT (day_view->main_canvas);
+		window = gtk_layout_get_bin_window (layout);
+
+		if (gdk_pointer_grab (window, FALSE,
 				      GDK_POINTER_MOTION_MASK
 				      | GDK_BUTTON_RELEASE_MASK,
 				      NULL, NULL, bevent->time) == 0) {
@@ -3596,12 +3685,22 @@ e_day_view_on_event_double_click (EDayView *day_view,
 	EDayViewEvent *event;
 	icalproperty *attendee_prop = NULL;
 
-	if (day == -1)
+	if (day == -1) {
+		if (!is_array_index_in_bounds (day_view->long_events, event_num))
+			return;
+
 		event = &g_array_index (day_view->long_events, EDayViewEvent,
 				event_num);
-	else
+	} else {
+		if (!is_array_index_in_bounds (day_view->events[day], event_num))
+			return;
+
 		event = &g_array_index (day_view->events[day], EDayViewEvent,
 				event_num);
+	}
+
+	if (!is_comp_data_valid (event))
+		return;
 
 	attendee_prop = icalcomponent_get_first_property (event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY);
 
@@ -3643,23 +3742,37 @@ e_day_view_get_selected_events (ECalendarView *cal_view)
 	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), NULL);
 
 	if (day_view->editing_event_num != -1) {
-		if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT)
+		if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT) {
+			if (!is_array_index_in_bounds (day_view->long_events, day_view->editing_event_num))
+				return NULL;
+
 			event = &g_array_index (day_view->long_events,
 						EDayViewEvent,
 						day_view->editing_event_num);
-		else
+		} else {
+			if (!is_array_index_in_bounds (day_view->events[day_view->editing_event_day], day_view->editing_event_num))
+				return NULL;
+
 			event = &g_array_index (day_view->events[day_view->editing_event_day],
 						EDayViewEvent,
 						day_view->editing_event_num);
+		}
 	} else if (day_view->popup_event_num != -1) {
-		if (day_view->popup_event_day == E_DAY_VIEW_LONG_EVENT)
+		if (day_view->popup_event_day == E_DAY_VIEW_LONG_EVENT) {
+			if (!is_array_index_in_bounds (day_view->long_events, day_view->popup_event_num))
+				return NULL;
+
 			event = &g_array_index (day_view->long_events,
 						EDayViewEvent,
 						day_view->popup_event_num);
-		else
+		} else {
+			if (!is_array_index_in_bounds (day_view->events[day_view->popup_event_day], day_view->popup_event_num))
+				return NULL;
+
 			event = &g_array_index (day_view->events[day_view->popup_event_day],
 						EDayViewEvent,
 						day_view->popup_event_num);
+		}
 	}
 
 	if (event)
@@ -3787,16 +3900,18 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget,
 	gint event_x, event_y, canvas_x, canvas_y;
 	gint day, event_num;
 	GdkCursor *cursor;
+	GdkWindow *window;
 
 #if 0
 	g_print ("In e_day_view_on_top_canvas_motion\n");
 #endif
 
+	window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
+
 	/* 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))
+	if (!e_day_view_convert_event_coords (
+		day_view, (GdkEvent*) mevent, window, &event_x, &event_y))
 		return FALSE;
 
 	canvas_x = event_x;
@@ -3805,9 +3920,13 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget,
 	pos = e_day_view_convert_position_in_top_canvas (day_view,
 							 canvas_x, canvas_y,
 							 &day, &event_num);
-	if (event_num != -1)
+	if (event_num != -1) {
+		if (!is_array_index_in_bounds (day_view->long_events, event_num))
+			return FALSE;
+
 		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);
@@ -3820,9 +3939,15 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget,
 	} else if (day_view->pressed_event_day == E_DAY_VIEW_LONG_EVENT) {
 		GtkTargetList *target_list;
 
+		if (!is_array_index_in_bounds (day_view->long_events, day_view->pressed_event_num))
+			return FALSE;
+
 		event = &g_array_index (day_view->long_events, EDayViewEvent,
 					day_view->pressed_event_num);
 
+		if (!is_comp_data_valid (event))
+			return FALSE;
+
 		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
@@ -3850,7 +3975,7 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget,
 		cursor = day_view->normal_cursor;
 
 		/* Recurring events can't be resized. */
-		if (event && !e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) {
+		if (event && is_comp_data_valid (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:
@@ -3863,8 +3988,12 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget,
 
 		/* Only set the cursor if it is different to last one set. */
 		if (day_view->last_cursor_set_in_top_canvas != cursor) {
+			GdkWindow *window;
+
 			day_view->last_cursor_set_in_top_canvas = cursor;
-			gdk_window_set_cursor (widget->window, cursor);
+
+			window = gtk_widget_get_window (widget);
+			gdk_window_set_cursor (window, cursor);
 		}
 
 		if (event && E_IS_TEXT (event->canvas_item) && E_TEXT (event->canvas_item)->editing) {
@@ -3884,17 +4013,19 @@ e_day_view_on_main_canvas_motion (GtkWidget *widget,
 	ECalendarViewPosition pos;
 	gint event_x, event_y, canvas_x, canvas_y;
 	gint row, day, event_num;
+	GdkWindow *window;
 	GdkCursor *cursor;
 
 #if 0
 	g_print ("In e_day_view_on_main_canvas_motion\n");
 #endif
 
+	window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
+
 	/* 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))
+	if (!e_day_view_convert_event_coords (
+		day_view, (GdkEvent*) mevent, window, &event_x, &event_y))
 		return FALSE;
 
 	canvas_x = event_x;
@@ -3904,9 +4035,13 @@ e_day_view_on_main_canvas_motion (GtkWidget *widget,
 							  canvas_x, canvas_y,
 							  &day, &row,
 							  &event_num);
-	if (event_num != -1)
+	if (event_num != -1) {
+		if (!is_array_index_in_bounds (day_view->events[day], event_num))
+			return FALSE;
+
 		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) {
@@ -3953,7 +4088,7 @@ e_day_view_on_main_canvas_motion (GtkWidget *widget,
 		cursor = day_view->normal_cursor;
 
 		/* Check if the event is editable and client is not readonly while changing the cursor */
-		if (event && event->is_editable && e_cal_is_read_only (event->comp_data->client, &read_only, NULL) && !read_only) {
+		if (event && event->is_editable && is_comp_data_valid (event) && e_cal_is_read_only (event->comp_data->client, &read_only, NULL) && !read_only) {
 
 			switch (pos) {
 			case E_CALENDAR_VIEW_POS_LEFT_EDGE:
@@ -3970,8 +4105,12 @@ e_day_view_on_main_canvas_motion (GtkWidget *widget,
 
 		/* Only set the cursor if it is different to last one set. */
 		if (day_view->last_cursor_set_in_main_canvas != cursor) {
+			GdkWindow *window;
+
 			day_view->last_cursor_set_in_main_canvas = cursor;
-			gdk_window_set_cursor (widget->window, cursor);
+
+			window = gtk_widget_get_window (widget);
+			gdk_window_set_cursor (window, cursor);
 		}
 
 		if (event && E_IS_TEXT (event->canvas_item) && E_TEXT (event->canvas_item)->editing) {
@@ -4139,10 +4278,14 @@ e_day_view_update_resize (EDayView *day_view,
 
 	day = day_view->resize_event_day;
 	event_num = day_view->resize_event_num;
+
+	if (!is_array_index_in_bounds (day_view->events[day], event_num))
+		return;
+
 	event = &g_array_index (day_view->events[day], EDayViewEvent,
 				event_num);
 
-	if (event && (!event->is_editable || (e_cal_is_read_only (event->comp_data->client, &read_only, NULL) && read_only))) {
+	if (event && (!event->is_editable || !is_comp_data_valid (event) || (e_cal_is_read_only (event->comp_data->client, &read_only, NULL) && read_only))) {
 		return;
 	}
 
@@ -4186,9 +4329,16 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
 	gint is_date;
 
 	event_num = day_view->resize_event_num;
+
+	if (!is_array_index_in_bounds (day_view->long_events, event_num))
+		return;
+
 	event = &g_array_index (day_view->long_events, EDayViewEvent,
 				event_num);
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	client = event->comp_data->client;
 
 	/* We use a temporary copy of the comp since we don't want to
@@ -4297,9 +4447,16 @@ e_day_view_finish_resize (EDayView *day_view)
 
 	day = day_view->resize_event_day;
 	event_num = day_view->resize_event_num;
+
+	if (!is_array_index_in_bounds (day_view->events[day], event_num))
+		return;
+
 	event = &g_array_index (day_view->events[day], EDayViewEvent,
 				event_num);
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	client = event->comp_data->client;
 
 	/* We use a temporary shallow copy of the ico since we don't want to
@@ -4386,6 +4543,7 @@ e_day_view_finish_resize (EDayView *day_view)
 static void
 e_day_view_abort_resize (EDayView *day_view)
 {
+	GdkWindow *window;
 	gint day, event_num;
 
 	if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_NONE)
@@ -4401,16 +4559,16 @@ e_day_view_abort_resize (EDayView *day_view)
 		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);
+		window = gtk_widget_get_window (day_view->top_canvas);
+		gdk_window_set_cursor (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);
+		window = gtk_widget_get_window (day_view->main_canvas);
+		gdk_window_set_cursor (window, day_view->normal_cursor);
 	}
 }
 
@@ -4447,7 +4605,8 @@ e_day_view_free_event_array (EDayView *day_view,
 		if (event->canvas_item)
 			gtk_object_destroy (GTK_OBJECT (event->canvas_item));
 
-		g_object_unref (event->comp_data);
+		if (is_comp_data_valid (event))
+			g_object_unref (event->comp_data);
 	}
 
 	g_array_set_size (array, 0);
@@ -4660,6 +4819,9 @@ e_day_view_reshape_long_event (EDayView *day_view,
 	PangoContext *pango_context;
 	PangoLayout *layout;
 
+	if (!is_array_index_in_bounds (day_view->long_events, event_num))
+		return;
+
 	event = &g_array_index (day_view->long_events, EDayViewEvent,
 				event_num);
 
@@ -4674,6 +4836,9 @@ e_day_view_reshape_long_event (EDayView *day_view,
 		return;
 	}
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	/* Take off the border and padding. */
 	item_x += E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD;
 	item_w -= (E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD) * 2;
@@ -4819,6 +4984,10 @@ e_day_view_reshape_day_events (EDayView *day_view,
 
 		e_day_view_reshape_day_event (day_view, day, event_num);
 		event = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
+
+		if (!is_comp_data_valid (event))
+			continue;
+
 		current_comp_string = icalcomponent_as_ical_string_r (event->comp_data->icalcomp);
 		if (day_view->last_edited_comp_string == NULL) {
 			g_free (current_comp_string);
@@ -4843,6 +5012,9 @@ e_day_view_reshape_day_event (EDayView *day_view,
 	gint item_x, item_y, item_w, item_h;
 	gint num_icons, icons_offset;
 
+	if (!is_array_index_in_bounds (day_view->events[day], event_num))
+		return;
+
 	event = &g_array_index (day_view->events[day], EDayViewEvent,
 				event_num);
 
@@ -4864,9 +5036,9 @@ e_day_view_reshape_day_event (EDayView *day_view,
 		   draw them on top of the resize rect. */
 		icons_offset = 0;
 		num_icons = 0;
-		if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_NONE
+		if (is_comp_data_valid (event) && (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_NONE
 		    || day_view->resize_event_day != day
-		    || day_view->resize_event_num != event_num) {
+		    || day_view->resize_event_num != event_num)) {
 			ECalComponent *comp;
 
 			comp = e_cal_component_new ();
@@ -5839,24 +6011,50 @@ static void
 e_day_view_scroll	(EDayView	*day_view,
 			 gfloat		 pages_to_scroll)
 {
-	GtkAdjustment *adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-	gfloat new_value;
+	GtkLayout *layout;
+	GtkAdjustment *adjustment;
+	gdouble new_value;
+	gdouble page_size;
+	gdouble lower;
+	gdouble upper;
+	gdouble value;
+
+	layout = GTK_LAYOUT (day_view->main_canvas);
+	adjustment = gtk_layout_get_vadjustment (layout);
+
+	page_size = gtk_adjustment_get_page_size (adjustment);
+	lower = gtk_adjustment_get_lower (adjustment);
+	upper = gtk_adjustment_get_upper (adjustment);
+	value = gtk_adjustment_get_value (adjustment);
 
-	new_value = adj->value - adj->page_size * pages_to_scroll;
-	new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-	gtk_adjustment_set_value (adj, new_value);
+	new_value = value - page_size * pages_to_scroll;
+	new_value = CLAMP (new_value, lower, upper - page_size);
+	gtk_adjustment_set_value (adjustment, new_value);
 }
 
 static void
 e_day_view_top_scroll	(EDayView	*day_view,
 			 gfloat		 pages_to_scroll)
 {
-	GtkAdjustment *adj = GTK_LAYOUT (day_view->top_canvas)->vadjustment;
-	gfloat new_value;
+	GtkLayout *layout;
+	GtkAdjustment *adjustment;
+	gdouble new_value;
+	gdouble page_size;
+	gdouble lower;
+	gdouble upper;
+	gdouble value;
 
-	new_value = adj->value - adj->page_size * pages_to_scroll;
-	new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-	gtk_adjustment_set_value (adj, new_value);
+	layout = GTK_LAYOUT (day_view->top_canvas);
+	adjustment = gtk_layout_get_vadjustment (layout);
+
+	page_size = gtk_adjustment_get_page_size (adjustment);
+	lower = gtk_adjustment_get_lower (adjustment);
+	upper = gtk_adjustment_get_upper (adjustment);
+	value = gtk_adjustment_get_value (adjustment);
+
+	new_value = value - page_size * pages_to_scroll;
+	new_value = CLAMP (new_value, lower, upper - page_size);
+	gtk_adjustment_set_value (adjustment, new_value);
 }
 
 void
@@ -5864,14 +6062,20 @@ e_day_view_ensure_rows_visible (EDayView *day_view,
 				gint start_row,
 				gint end_row)
 {
-	GtkAdjustment *adj;
-	gfloat value, min_value, max_value;
+	GtkLayout *layout;
+	GtkAdjustment *adjustment;
+	gdouble max_value;
+	gdouble min_value;
+	gdouble page_size;
+	gdouble value;
 
-	adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
+	layout = GTK_LAYOUT (day_view->main_canvas);
+	adjustment = gtk_layout_get_vadjustment (layout);
 
-	value = adj->value;
+	value = gtk_adjustment_get_value (adjustment);
+	page_size = gtk_adjustment_get_page_size (adjustment);
 
-	min_value = (end_row + 1) * day_view->row_height - adj->page_size;
+	min_value = (end_row + 1) * day_view->row_height - page_size;
 	if (value < min_value)
 		value = min_value;
 
@@ -5879,10 +6083,7 @@ e_day_view_ensure_rows_visible (EDayView *day_view,
 	if (value > max_value)
 		value = max_value;
 
-	if (value != adj->value) {
-		adj->value = value;
-		gtk_adjustment_value_changed (adj);
-	}
+	gtk_adjustment_set_value (adjustment, value);
 }
 
 static void
@@ -5906,13 +6107,22 @@ e_day_view_start_editing_event (EDayView *day_view,
 		return;
 
 	if (day == E_DAY_VIEW_LONG_EVENT) {
+		if (!is_array_index_in_bounds (day_view->long_events, event_num))
+			return;
+
 		event = &g_array_index (day_view->long_events, EDayViewEvent,
 					event_num);
 	} else {
+		if (!is_array_index_in_bounds (day_view->events[day], event_num))
+			return;
+
 		event = &g_array_index (day_view->events[day], EDayViewEvent,
 					event_num);
 	}
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	if (!e_cal_is_read_only (event->comp_data->client, &read_only, NULL) || read_only)
 		return;
 
@@ -5984,10 +6194,20 @@ cancel_editing (EDayView *day_view)
 
 	g_return_if_fail (day != -1);
 
-	if (day == E_DAY_VIEW_LONG_EVENT)
+	if (day == E_DAY_VIEW_LONG_EVENT) {
+		if (!is_array_index_in_bounds (day_view->long_events, event_num))
+			return;
+
 		event = &g_array_index (day_view->long_events, EDayViewEvent, event_num);
-	else
+	} else {
+		if (!is_array_index_in_bounds (day_view->events[day], event_num))
+			return;
+
 		event = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
+	}
+
+	if (!is_comp_data_valid (event))
+		return;
 
 	/* Reset the text to what was in the component */
 
@@ -6006,9 +6226,15 @@ tooltip_get_view_event (EDayView *day_view, gint day, gint event_num)
 	EDayViewEvent *pevent;
 
 	if (day == E_DAY_VIEW_LONG_EVENT) {
+		if (!is_array_index_in_bounds (day_view->long_events, event_num))
+			return  NULL;
+
 		pevent = &g_array_index (day_view->long_events, EDayViewEvent,
 					event_num);
 	} else {
+		if (!is_array_index_in_bounds (day_view->events[day], event_num))
+			return NULL;
+
 		pevent = &g_array_index (day_view->events[day], EDayViewEvent,
 					event_num);
 	}
@@ -6111,6 +6337,8 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
 			gint event_x, event_y, row, day, event_num;
 			ECalendarViewPosition pos;
 			gboolean main_canvas = TRUE;
+			GdkWindow *window;
+			GtkLayout *layout;
 
 			if (day_view->editing_event_num != -1)
 				break;
@@ -6123,13 +6351,19 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
 
 			/* 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*) event,
-							      GTK_LAYOUT (day_view->main_canvas)->bin_window,
-							      &event_x, &event_y)) {
+			layout = GTK_LAYOUT (day_view->main_canvas);
+			window = gtk_layout_get_bin_window (layout);
+			if (!e_day_view_convert_event_coords (
+				day_view, (GdkEvent*) event,
+				window, &event_x, &event_y)) {
+
 				main_canvas = FALSE;
-				if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) event,
-								      GTK_LAYOUT (day_view->top_canvas)->bin_window,
-								      &event_x, &event_y))  {
+
+				layout = GTK_LAYOUT (day_view->top_canvas);
+				window = gtk_layout_get_bin_window (layout);
+				if (!e_day_view_convert_event_coords (
+					day_view, (GdkEvent*) event,
+					window, &event_x, &event_y))  {
 					return FALSE;
 				}
 			}
@@ -6217,6 +6451,9 @@ e_day_view_event_move (ECalendarView *cal_view, ECalViewMoveDirection direction)
 	if ((day == -1) || (day == E_DAY_VIEW_LONG_EVENT))
 		return FALSE;
 
+	if (!is_array_index_in_bounds (day_view->events[day], event_num))
+		return FALSE;
+
 	event = &g_array_index (day_view->events[day], EDayViewEvent,
 				event_num);
 	day_view->resize_event_day = day;
@@ -6293,8 +6530,16 @@ e_day_view_change_event_time (EDayView *day_view, time_t start_dt, time_t end_dt
 
 	day = day_view->editing_event_day;
 	event_num = day_view->editing_event_num;
+
+	if (!is_array_index_in_bounds (day_view->events[day], event_num))
+		return;
+
 	event = &g_array_index (day_view->events[day], EDayViewEvent,
 				event_num);
+
+	if (!is_comp_data_valid (event))
+		return;
+
 	client = event->comp_data->client;
 
 	/* We use a temporary shallow copy of the ico since we don't want to
@@ -6368,6 +6613,10 @@ e_day_view_change_event_end_time_up (EDayView *day_view)
 	event_num = day_view->editing_event_num;
 	if ((day == -1) || (day == E_DAY_VIEW_LONG_EVENT))
 		return;
+
+	if (!is_array_index_in_bounds (day_view->events[day], event_num))
+		return;
+
 	event = &g_array_index (day_view->events[day], EDayViewEvent,
 				event_num);
 	day_view->resize_event_day = day;
@@ -6398,6 +6647,10 @@ e_day_view_change_event_end_time_down (EDayView *day_view)
 	event_num = day_view->editing_event_num;
 	if ((day == -1) || (day == E_DAY_VIEW_LONG_EVENT))
 		return;
+
+	if (!is_array_index_in_bounds (day_view->events[day], event_num))
+		return;
+
 	event = &g_array_index (day_view->events[day], EDayViewEvent,
 				event_num);
 	day_view->resize_event_day = day;
@@ -6422,6 +6675,7 @@ static void
 e_day_view_on_editing_started (EDayView *day_view,
 			       GnomeCanvasItem *item)
 {
+	GtkAllocation allocation;
 	gint day, event_num;
 
 	if (!e_day_view_find_event_from_item (day_view, item,
@@ -6444,6 +6698,8 @@ e_day_view_on_editing_started (EDayView *day_view,
 	day_view->editing_event_day = day;
 	day_view->editing_event_num = event_num;
 
+	gtk_widget_get_allocation (day_view->top_canvas, &allocation);
+
 	if (day == E_DAY_VIEW_LONG_EVENT) {
 		gint item_x, item_y, item_w, item_h, scroll_y;
 		gint start_day, end_day;
@@ -6454,11 +6710,16 @@ e_day_view_on_editing_started (EDayView *day_view,
 						       &start_day, &end_day,
 						       &item_x, &item_y,
 						       &item_w, &item_h)) {
+			GtkLayout *layout;
+			GtkAdjustment *adjustment;
+
+			layout = GTK_LAYOUT (day_view->top_canvas);
+			adjustment = gtk_layout_get_vadjustment (layout);
+
 			/* and ensure it's visible too */
 			/*item_y = (event_num * (day_view->top_row_height + 1)) - 1;*/
-			scroll_y = gtk_adjustment_get_value (GTK_LAYOUT (day_view->top_canvas)->vadjustment);
-			if (item_y + day_view->top_row_height > day_view->top_canvas->allocation.height + scroll_y ||
-			    item_y < scroll_y)
+			scroll_y = gtk_adjustment_get_value (adjustment);
+			if (item_y + day_view->top_row_height > allocation.height + scroll_y || item_y < scroll_y)
 				gnome_canvas_scroll_to (GNOME_CANVAS (day_view->top_canvas), 0, item_y);
 		}
 	} else {
@@ -6499,14 +6760,23 @@ e_day_view_on_editing_stopped (EDayView *day_view,
 		return;
 
 	if (day == E_DAY_VIEW_LONG_EVENT) {
+		if (!is_array_index_in_bounds (day_view->long_events, event_num))
+			return;
+
 		event = &g_array_index (day_view->long_events, EDayViewEvent,
 					event_num);
 	} else {
+		if (!is_array_index_in_bounds (day_view->events[day], event_num))
+			return;
+
 		event = &g_array_index (day_view->events[day], EDayViewEvent,
 					event_num);
 
 	}
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	/* Reset the edit fields. */
 	day_view->editing_event_day = -1;
 	day_view->editing_event_num = -1;
@@ -6719,6 +6989,7 @@ e_day_view_check_auto_scroll (EDayView *day_view,
 			      gint event_x,
 			      gint event_y)
 {
+	GtkAllocation allocation;
 	gint scroll_x, scroll_y;
 
 	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (day_view->main_canvas),
@@ -6730,10 +7001,11 @@ e_day_view_check_auto_scroll (EDayView *day_view,
 	day_view->last_mouse_x = event_x;
 	day_view->last_mouse_y = event_y;
 
+	gtk_widget_get_allocation (day_view->main_canvas, &allocation);
+
 	if (event_y < E_DAY_VIEW_AUTO_SCROLL_OFFSET)
 		e_day_view_start_auto_scroll (day_view, TRUE);
-	else if (event_y >= day_view->main_canvas->allocation.height
-		 - E_DAY_VIEW_AUTO_SCROLL_OFFSET)
+	else if (event_y >= allocation.height - E_DAY_VIEW_AUTO_SCROLL_OFFSET)
 		e_day_view_start_auto_scroll (day_view, FALSE);
 	else
 		e_day_view_stop_auto_scroll (day_view);
@@ -6765,7 +7037,11 @@ e_day_view_auto_scroll_handler (gpointer data)
 	EDayView *day_view;
 	ECalendarViewPosition pos;
 	gint scroll_x, scroll_y, new_scroll_y, canvas_x, canvas_y, row, day;
-	GtkAdjustment *adj;
+	GtkAdjustment *adjustment;
+	GtkLayout *layout;
+	gdouble step_increment;
+	gdouble page_size;
+	gdouble upper;
 
 	g_return_val_if_fail (E_IS_DAY_VIEW (data), FALSE);
 
@@ -6782,13 +7058,18 @@ e_day_view_auto_scroll_handler (gpointer data)
 	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (day_view->main_canvas),
 					 &scroll_x, &scroll_y);
 
-	adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
+	layout = GTK_LAYOUT (day_view->main_canvas);
+	adjustment = gtk_layout_get_vadjustment (layout);
+
+	step_increment = gtk_adjustment_get_step_increment (adjustment);
+	page_size = gtk_adjustment_get_page_size (adjustment);
+	upper = gtk_adjustment_get_upper (adjustment);
 
 	if (day_view->auto_scroll_up)
-		new_scroll_y = MAX (scroll_y - adj->step_increment, 0);
+		new_scroll_y = MAX (scroll_y - step_increment, 0);
 	else
-		new_scroll_y = MIN (scroll_y + adj->step_increment,
-				    adj->upper - adj->page_size);
+		new_scroll_y = MIN (scroll_y + step_increment,
+				    upper - page_size);
 
 	if (new_scroll_y != scroll_y) {
 		/* NOTE: This reduces flicker, but only works if we don't use
@@ -6844,6 +7125,9 @@ e_day_view_get_event_rows (EDayView *day_view,
 	g_return_val_if_fail (day < E_DAY_VIEW_LONG_EVENT, FALSE);
 	g_return_val_if_fail (event_num >= 0, FALSE);
 
+	if (!is_array_index_in_bounds (day_view->events[day], event_num))
+		return FALSE;
+
 	event = &g_array_index (day_view->events[day], EDayViewEvent,
 				event_num);
 	start_row = event->start_minute / day_view->mins_per_row;
@@ -6868,6 +7152,9 @@ e_day_view_get_event_position (EDayView *day_view,
 	EDayViewEvent *event;
 	gint start_row, end_row, cols_in_row, start_col, num_columns;
 
+	if (!is_array_index_in_bounds (day_view->events[day], event_num))
+		return FALSE;
+
 	event = &g_array_index (day_view->events[day], EDayViewEvent,
 				event_num);
 
@@ -6922,6 +7209,9 @@ e_day_view_get_long_event_position	(EDayView	*day_view,
 {
 	EDayViewEvent *event;
 
+	if (!is_array_index_in_bounds (day_view->long_events, event_num))
+		return FALSE;
+
 	event = &g_array_index (day_view->long_events, EDayViewEvent,
 				event_num);
 
@@ -6946,9 +7236,12 @@ e_day_view_get_long_event_position	(EDayView	*day_view,
 	}
 
 	*item_x = day_view->day_offsets[*start_day] + E_DAY_VIEW_BAR_WIDTH;
-	if (day_view->days_shown == 1)
-		*item_w = day_view->top_canvas->allocation.width;
-	else
+	if (day_view->days_shown == 1) {
+		GtkAllocation allocation;
+
+		gtk_widget_get_allocation (day_view->top_canvas, &allocation);
+		*item_w = allocation.width;
+	} else
 		*item_w = day_view->day_offsets[*end_day + 1];
 	*item_w = MAX (*item_w - *item_x - E_DAY_VIEW_GAP_WIDTH, 0);
 	*item_y = (event->start_row_or_col) * day_view->top_row_height;
@@ -7189,6 +7482,9 @@ e_day_view_update_top_canvas_drag (EDayView *day_view,
 	num_days = 1;
 
 	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
+		if (!is_array_index_in_bounds (day_view->long_events, day_view->drag_event_num))
+			return;
+
 		event = &g_array_index (day_view->long_events, EDayViewEvent,
 					day_view->drag_event_num);
 		row = event->start_row_or_col + 1;
@@ -7205,6 +7501,9 @@ e_day_view_update_top_canvas_drag (EDayView *day_view,
 		day = MIN (day, day_view->days_shown - num_days);
 
 	} else if (day_view->drag_event_day != -1) {
+		if (!is_array_index_in_bounds (day_view->events[day_view->drag_event_day], day_view->drag_event_num))
+			return;
+
 		event = &g_array_index (day_view->events[day_view->drag_event_day],
 					EDayViewEvent,
 					day_view->drag_event_num);
@@ -7252,7 +7551,7 @@ e_day_view_update_top_canvas_drag (EDayView *day_view,
 	      & GNOME_CANVAS_ITEM_VISIBLE)) {
 		const gchar *summary;
 
-		if (event) {
+		if (event && is_comp_data_valid (event)) {
 			summary = icalcomponent_get_summary (event->comp_data->icalcomp);
 			text = g_strdup (summary);
 		} else {
@@ -7345,9 +7644,15 @@ e_day_view_update_main_canvas_drag (EDayView *day_view,
 	num_rows = 1;
 
 	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
+		if (!is_array_index_in_bounds (day_view->long_events, day_view->drag_event_num))
+			return;
+
 		event = &g_array_index (day_view->long_events, EDayViewEvent,
 					day_view->drag_event_num);
 	} else if (day_view->drag_event_day != -1) {
+		if (!is_array_index_in_bounds (day_view->events[day_view->drag_event_day], day_view->drag_event_num))
+			return;
+
 		event = &g_array_index (day_view->events[day_view->drag_event_day],
 					EDayViewEvent,
 					day_view->drag_event_num);
@@ -7411,7 +7716,7 @@ e_day_view_update_main_canvas_drag (EDayView *day_view,
 	if (!(day_view->drag_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
 		const gchar *summary;
 
-		if (event) {
+		if (event && is_comp_data_valid (event)) {
 			summary = icalcomponent_get_summary (event->comp_data->icalcomp);
 			text = g_strdup (summary);
 		} else {
@@ -7475,12 +7780,19 @@ e_day_view_on_drag_begin (GtkWidget      *widget,
 	g_return_if_fail (day != -1);
 	g_return_if_fail (event_num != -1);
 
-	if (day == E_DAY_VIEW_LONG_EVENT)
+	if (day == E_DAY_VIEW_LONG_EVENT) {
+		if (!is_array_index_in_bounds (day_view->long_events, event_num))
+			return;
+
 		event = &g_array_index (day_view->long_events, EDayViewEvent,
 					event_num);
-	else
+	} else {
+		if (!is_array_index_in_bounds (day_view->events[day], event_num))
+			return;
+
 		event = &g_array_index (day_view->events[day], EDayViewEvent,
 					event_num);
+	}
 
 	/* Hide the text item, since it will be shown in the special drag
 	   items. */
@@ -7504,10 +7816,16 @@ e_day_view_on_drag_end (GtkWidget      *widget,
 		return;
 
 	if (day == E_DAY_VIEW_LONG_EVENT) {
+		if (!is_array_index_in_bounds (day_view->long_events, event_num))
+			return;
+
 		event = &g_array_index (day_view->long_events, EDayViewEvent,
 					event_num);
 		gtk_widget_queue_draw (day_view->top_canvas);
 	} else {
+		if (!is_array_index_in_bounds (day_view->events[day], event_num))
+			return;
+
 		event = &g_array_index (day_view->events[day], EDayViewEvent,
 					event_num);
 		gtk_widget_queue_draw (day_view->main_canvas);
@@ -7540,12 +7858,22 @@ e_day_view_on_drag_data_get (GtkWidget          *widget,
 	g_return_if_fail (day != -1);
 	g_return_if_fail (event_num != -1);
 
-	if (day == E_DAY_VIEW_LONG_EVENT)
+	if (day == E_DAY_VIEW_LONG_EVENT) {
+		if (!is_array_index_in_bounds (day_view->long_events, event_num))
+			return;
+
 		event = &g_array_index (day_view->long_events,
 					EDayViewEvent, event_num);
-	else
+	} else {
+		if (!is_array_index_in_bounds (day_view->events[day], event_num))
+			return;
+
 		event = &g_array_index (day_view->events[day],
 					EDayViewEvent, event_num);
+	}
+
+	if (!is_comp_data_valid (event))
+		return;
 
 	vcal = e_cal_util_new_top_level ();
 	e_cal_util_add_timezones_from_component (
@@ -7557,15 +7885,17 @@ e_day_view_on_drag_data_get (GtkWidget          *widget,
 	if (comp_str) {
 		ESource *source = e_cal_get_source (event->comp_data->client);
 		const gchar *source_uid = e_source_peek_uid (source);
+		GdkAtom target;
 		gchar *tmp;
 
 		if (!source_uid)
 			source_uid = "";
 
 		tmp = g_strconcat (source_uid, "\n", comp_str, NULL);
+		target = gtk_selection_data_get_target (selection_data);
 		gtk_selection_data_set (
-			selection_data, selection_data->target,
-			8, (guchar *) tmp, strlen (tmp));
+			selection_data, target, 8,
+			(guchar *) tmp, strlen (tmp));
 
 		g_free (tmp);
 	}
@@ -7579,7 +7909,7 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 					      GdkDragContext     *context,
 					      gint                x,
 					      gint                y,
-					      GtkSelectionData   *data,
+					      GtkSelectionData   *selection_data,
 					      guint               info,
 					      guint               time,
 					      EDayView		 *day_view)
@@ -7595,6 +7925,12 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 	gboolean all_day_event;
 	ECal *client;
 	gboolean drag_from_same_window;
+	const guchar *data;
+	gint format, length;
+
+	data = gtk_selection_data_get_data (selection_data);
+	format = gtk_selection_data_get_format (selection_data);
+	length = gtk_selection_data_get_length (selection_data);
 
 	if (day_view->drag_event_day != -1)
 		drag_from_same_window = TRUE;
@@ -7604,8 +7940,7 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 	client = e_cal_model_get_default_client (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)));
 
 	/* Note that we only support DnD within the EDayView at present. */
-	if ((data->length >= 0) && (data->format == 8)
-	    && (day_view->drag_event_day != -1)) {
+	if (length >= 0 && format == 8 && day_view->drag_event_day != -1) {
 		/* We are dragging in the same window */
 
 		pos = e_day_view_convert_position_in_top_canvas (day_view,
@@ -7620,8 +7955,15 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 			end_offset = 0;
 
 			if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
+				if (!is_array_index_in_bounds (day_view->long_events, day_view->drag_event_num))
+					return;
+
 				event = &g_array_index (day_view->long_events, EDayViewEvent,
 							day_view->drag_event_num);
+
+				if (!is_comp_data_valid (event))
+					return;
+
 				day -= day_view->drag_event_offset;
 				day = MAX (day, 0);
 
@@ -7637,9 +7979,15 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 				start_offset = event->start_minute;
 				end_offset = event->end_minute;
 			} else {
+				if (!is_array_index_in_bounds (day_view->events[day_view->drag_event_day], day_view->drag_event_num))
+					return;
+
 				event = &g_array_index (day_view->events[day_view->drag_event_day],
 							EDayViewEvent,
 							day_view->drag_event_num);
+
+				if (!is_comp_data_valid (event))
+					return;
 			}
 
 			client = event->comp_data->client;
@@ -7731,11 +8079,9 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 		}
 	}
 
-	if ((data->length >= 0) && (data->format == 8)
-		&& !drag_from_same_window) {
+	if (length >= 0 && format == 8 && !drag_from_same_window) {
 		/* We are dragging between different window */
 
-		gchar *comp_str;
 		icalcomponent *icalcomp;
 		icalcomponent_kind kind;
 		time_t dtstart;
@@ -7747,8 +8093,7 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 		if (pos == E_CALENDAR_VIEW_POS_OUTSIDE)
 			goto error;
 
-		comp_str = (gchar *) data->data;
-		icalcomp = icalparser_parse_string ((const gchar *) comp_str);
+		icalcomp = icalparser_parse_string ((const gchar *) data);
 		if (!icalcomp)
 			goto error;
 
@@ -7804,7 +8149,7 @@ e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 					       GdkDragContext     *context,
 					       gint                x,
 					       gint                y,
-					       GtkSelectionData   *data,
+					       GtkSelectionData   *selection_data,
 					       guint               info,
 					       guint               time,
 					       EDayView		  *day_view)
@@ -7819,6 +8164,12 @@ e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 	time_t dt;
 	ECal *client;
 	gboolean drag_from_same_window;
+	const guchar *data;
+	gint format, length;
+
+	data = gtk_selection_data_get_data (selection_data);
+	format = gtk_selection_data_get_format (selection_data);
+	length = gtk_selection_data_get_length (selection_data);
 
 	if (day_view->drag_event_day != -1)
 		drag_from_same_window = TRUE;
@@ -7833,8 +8184,7 @@ e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 	y += scroll_y;
 
 	/* Note that we only support DnD within the EDayView at present. */
-	if ((data->length >= 0) && (data->format == 8)
-	    && (day_view->drag_event_day != -1)) {
+	if (length >= 0 && format == 8 && (day_view->drag_event_day != -1)) {
 		/* We are dragging in the same window */
 
 		pos = e_day_view_convert_position_in_main_canvas (day_view,
@@ -7849,12 +8199,25 @@ e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 			end_offset = 0;
 
 			if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
+				if (!is_array_index_in_bounds (day_view->long_events, day_view->drag_event_num))
+					return;
+
 				event = &g_array_index (day_view->long_events, EDayViewEvent,
 							day_view->drag_event_num);
+
+				if (!is_comp_data_valid (event))
+					return;
 			} else {
+				if (!is_array_index_in_bounds (day_view->events[day_view->drag_event_day], day_view->drag_event_num))
+					return;
+
 				event = &g_array_index (day_view->events[day_view->drag_event_day],
 							EDayViewEvent,
 							day_view->drag_event_num);
+
+				if (!is_comp_data_valid (event))
+					return;
+
 				row -= day_view->drag_event_offset;
 
 				/* Calculate time offset from start row. */
@@ -7936,11 +8299,9 @@ e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 		}
 	}
 
-	if ((data->length >= 0) && (data->format == 8)
-		&& !drag_from_same_window) {
+	if (length >= 0 && format == 8 && !drag_from_same_window) {
 		/* We are dragging between different window */
 
-		gchar *comp_str;
 		icalcomponent *icalcomp;
 		icalcomponent_kind kind;
 		time_t dtstart;
@@ -7952,8 +8313,7 @@ e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 		if (pos == E_CALENDAR_VIEW_POS_OUTSIDE)
 			goto error;
 
-		comp_str = (gchar *) data->data;
-		icalcomp = icalparser_parse_string ((const gchar *) comp_str);
+		icalcomp = icalparser_parse_string ((const gchar *) data);
 		if (!icalcomp)
 			goto error;
 
@@ -8112,10 +8472,16 @@ e_day_view_paste_text (ECalendarView *cal_view)
 		return;
 
 	if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT) {
+		if (!is_array_index_in_bounds (day_view->long_events, day_view->editing_event_num))
+			return;
+
 		event = &g_array_index (day_view->long_events,
 					EDayViewEvent,
 					day_view->editing_event_num);
 	} else {
+		if (!is_array_index_in_bounds (day_view->events[day_view->editing_event_day], day_view->editing_event_num))
+			return;
+
 		event = &g_array_index (day_view->events[day_view->editing_event_day],
 					EDayViewEvent,
 					day_view->editing_event_num);
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index c941310a2e..fed200d34c 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -758,7 +758,7 @@ write_recurrence_piece (EItipControl *itip, ECalComponent *comp,
 	struct icalrecurrencetype *r;
 	gint i;
 
-	g_string_append_len (buffer, "<b>Recurring:</b> ", 18);
+	g_string_append_printf (buffer, "<b>%s</b> ", _("Recurring:"));
 
 	if (!e_cal_component_has_simple_recurrence (comp)) {
 		g_string_append_printf (
@@ -1021,6 +1021,18 @@ write_error_html (EItipControl *itip, const gchar *itip_err)
 	g_string_free (buffer, TRUE);
 }
 
+static gchar *
+dupe_first_bold (const gchar *format, const gchar *organizer, const gchar *delegator)
+{
+	gchar *tmp, *res;
+
+	tmp = g_strconcat ("<b>", organizer ? organizer : "", "</b>", NULL);
+	res = g_strdup_printf (format, tmp, delegator ? delegator : "");
+	g_free (tmp);
+
+	return res;
+}
+
 static void
 write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title, const gchar *options)
 {
@@ -1072,12 +1084,12 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title,
 		e_cal_component_get_attendee_list (priv->comp, &attendees);
 		if (attendees != NULL) {
 			attendee = attendees->data;
-			html = g_strdup_printf (itip_desc,
+			html = dupe_first_bold (itip_desc,
 						attendee->cn ?
 						attendee->cn :
-						itip_strip_mailto (attendee->value));
+						itip_strip_mailto (attendee->value), NULL);
 		} else {
-			html = g_strdup_printf (itip_desc, _("An unknown person"));
+			html = dupe_first_bold (itip_desc, _("An unknown person"), NULL);
 		}
 		break;
 	case ICAL_METHOD_REQUEST:
@@ -1085,7 +1097,7 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title,
 		e_cal_component_get_organizer (priv->comp, &organizer);
 		if (priv->delegator_address != NULL) {
 			if (organizer.value != NULL)
-				html = g_strdup_printf (itip_desc,
+				html = dupe_first_bold (itip_desc,
 							organizer.cn ?
 							organizer.cn :
 							itip_strip_mailto (organizer.value),
@@ -1093,18 +1105,18 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title,
 							priv->delegator_name :
 							priv->delegator_address);
 			else
-				html = g_strdup_printf (itip_desc, _("An unknown person"),
+				html = dupe_first_bold (itip_desc, _("An unknown person"),
 							priv->delegator_name ?
 							priv->delegator_name :
 							priv->delegator_address);
 		} else {
 			if (organizer.value != NULL)
-				html = g_strdup_printf (itip_desc,
+				html = dupe_first_bold (itip_desc,
 							organizer.cn ?
 							organizer.cn :
-							itip_strip_mailto (organizer.value));
+							itip_strip_mailto (organizer.value), NULL);
 			else
-				html = g_strdup_printf (itip_desc, _("An unknown person"));
+				html = dupe_first_bold (itip_desc, _("An unknown person"), NULL);
 		}
 
 		break;
@@ -1116,20 +1128,21 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title,
 		/* The organizer sent this */
 		e_cal_component_get_organizer (priv->comp, &organizer);
 		if (organizer.value != NULL)
-			html = g_strdup_printf (itip_desc,
+			html = dupe_first_bold (itip_desc,
 						organizer.cn ?
 						organizer.cn :
-						itip_strip_mailto (organizer.value));
+						itip_strip_mailto (organizer.value), NULL);
 		else
-			html = g_strdup_printf (itip_desc, _("An unknown person"));
+			html = dupe_first_bold (itip_desc, _("An unknown person"), NULL);
 		break;
 	}
 	g_string_append_printf (buffer, "%s", html);
 	g_free (html);
 
+	g_string_append (buffer, "<br> ");
 	/* Describe what the user can do */
 	g_string_append (
-		buffer, _("<br> Please review the following information, "
+		buffer, _("Please review the following information, "
 		"and then select an action from the menu below."));
 
 	/* Separator */
@@ -1353,28 +1366,28 @@ show_current_event (EItipControl *itip)
 
 	switch (priv->method) {
 	case ICAL_METHOD_PUBLISH:
-		itip_desc = _("<b>%s</b> has published meeting information.");
+		itip_desc = _("%s has published meeting information.");
 		itip_title = _("Meeting Information");
 		options = get_publish_options ();
 		show_selector = TRUE;
 		break;
 	case ICAL_METHOD_REQUEST:
 		if (priv->delegator_address != NULL)
-			itip_desc = _("<b>%s</b> requests the presence of %s at a meeting.");
+			itip_desc = _("%s requests the presence of %s at a meeting.");
 		else
-			itip_desc = _("<b>%s</b> requests your presence at a meeting.");
+			itip_desc = _("%s requests your presence at a meeting.");
 		itip_title = _("Meeting Proposal");
 		options = get_request_options ();
 		show_selector = TRUE;
 		break;
 	case ICAL_METHOD_ADD:
 		/* FIXME Whats going on here? */
-		itip_desc = _("<b>%s</b> wishes to be added to an existing meeting.");
+		itip_desc = _("%s wishes to be added to an existing meeting.");
 		itip_title = _("Meeting Update");
 		options = get_publish_options ();
 		break;
 	case ICAL_METHOD_REFRESH:
-		itip_desc = _("<b>%s</b> wishes to receive the latest meeting information.");
+		itip_desc = _("%s wishes to receive the latest meeting information.");
 		itip_title = _("Meeting Update Request");
 		options = get_refresh_options ();
 
@@ -1382,7 +1395,7 @@ show_current_event (EItipControl *itip)
 		adjust_item (itip, priv->comp);
 		break;
 	case ICAL_METHOD_REPLY:
-		itip_desc = _("<b>%s</b> has replied to a meeting request.");
+		itip_desc = _("%s has replied to a meeting request.");
 		itip_title = _("Meeting Reply");
 		options = get_reply_options ();
 
@@ -1390,7 +1403,7 @@ show_current_event (EItipControl *itip)
 		adjust_item (itip, priv->comp);
 		break;
 	case ICAL_METHOD_CANCEL:
-		itip_desc = _("<b>%s</b> has canceled a meeting.");
+		itip_desc = _("%s has canceled a meeting.");
 		itip_title = _("Meeting Cancelation");
 		/* FIXME priv->current_ecal will always be NULL so the
 		 * user won't see an error message, the OK button will
@@ -1401,7 +1414,7 @@ show_current_event (EItipControl *itip)
 		adjust_item (itip, priv->comp);
 		break;
 	default:
-		itip_desc = _("<b>%s</b> has sent an unintelligible message.");
+		itip_desc = _("%s has sent an unintelligible message.");
 		itip_title = _("Bad Meeting Message");
 		options = NULL;
 	}
@@ -1429,7 +1442,7 @@ show_current_todo (EItipControl *itip)
 
 	switch (priv->method) {
 	case ICAL_METHOD_PUBLISH:
-		itip_desc = _("<b>%s</b> has published task information.");
+		itip_desc = _("%s has published task information.");
 		itip_title = _("Task Information");
 		options = get_publish_options ();
 		show_selector = TRUE;
@@ -1437,21 +1450,21 @@ show_current_todo (EItipControl *itip)
 	case ICAL_METHOD_REQUEST:
 		/* FIXME Does this need to handle like events above? */
 		if (priv->delegator_address != NULL)
-			itip_desc = _("<b>%s</b> requests %s to perform a task.");
+			itip_desc = _("%s requests %s to perform a task.");
 		else
-			itip_desc = _("<b>%s</b> requests you perform a task.");
+			itip_desc = _("%s requests you perform a task.");
 		itip_title = _("Task Proposal");
 		options = get_request_options ();
 		show_selector = TRUE;
 		break;
 	case ICAL_METHOD_ADD:
 		/* FIXME Whats going on here? */
-		itip_desc = _("<b>%s</b> wishes to be added to an existing task.");
+		itip_desc = _("%s wishes to be added to an existing task.");
 		itip_title = _("Task Update");
 		options = get_publish_options ();
 		break;
 	case ICAL_METHOD_REFRESH:
-		itip_desc = _("<b>%s</b> wishes to receive the latest task information.");
+		itip_desc = _("%s wishes to receive the latest task information.");
 		itip_title = _("Task Update Request");
 		options = get_refresh_options ();
 
@@ -1459,7 +1472,7 @@ show_current_todo (EItipControl *itip)
 		adjust_item (itip, priv->comp);
 		break;
 	case ICAL_METHOD_REPLY:
-		itip_desc = _("<b>%s</b> has replied to a task assignment.");
+		itip_desc = _("%s has replied to a task assignment.");
 		itip_title = _("Task Reply");
 		options = get_reply_options ();
 
@@ -1467,7 +1480,7 @@ show_current_todo (EItipControl *itip)
 		adjust_item (itip, priv->comp);
 		break;
 	case ICAL_METHOD_CANCEL:
-		itip_desc = _("<b>%s</b> has canceled a task.");
+		itip_desc = _("%s has canceled a task.");
 		itip_title = _("Task Cancelation");
 		/* FIXME priv->current_ecal will always be NULL so the
 		 * user won't see an error message, the OK button will
@@ -1478,7 +1491,7 @@ show_current_todo (EItipControl *itip)
 		adjust_item (itip, priv->comp);
 		break;
 	default:
-		itip_desc = _("<b>%s</b> has sent an unintelligible message.");
+		itip_desc = _("%s has sent an unintelligible message.");
 		itip_title = _("Bad Task Message");
 		options = NULL;
 	}
@@ -1503,22 +1516,22 @@ show_current_freebusy (EItipControl *itip)
 
 	switch (priv->method) {
 	case ICAL_METHOD_PUBLISH:
-		itip_desc = _("<b>%s</b> has published free/busy information.");
+		itip_desc = _("%s has published free/busy information.");
 		itip_title = _("Free/Busy Information");
 		options = NULL;
 		break;
 	case ICAL_METHOD_REQUEST:
-		itip_desc = _("<b>%s</b> requests your free/busy information.");
+		itip_desc = _("%s requests your free/busy information.");
 		itip_title = _("Free/Busy Request");
 		options = get_request_fb_options ();
 		break;
 	case ICAL_METHOD_REPLY:
-		itip_desc = _("<b>%s</b> has replied to a free/busy request.");
+		itip_desc = _("%s has replied to a free/busy request.");
 		itip_title = _("Free/Busy Reply");
 		options = NULL;
 		break;
 	default:
-		itip_desc = _("<b>%s</b> has sent an unintelligible message.");
+		itip_desc = _("%s has sent an unintelligible message.");
 		itip_title = _("Bad Free/Busy Message");
 		options = NULL;
 	}
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 0e48f7cb32..9920de85e1 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -771,12 +771,14 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role
 			if (contact && e_contact_get (contact , E_CONTACT_IS_LIST)) {
 				EBook *book = NULL;
 				ENameSelectorDialog *dialog;
+				ENameSelectorModel *model;
 				EContactStore *c_store;
 				GList *books, *l;
 				gchar *uri = e_contact_get (contact, E_CONTACT_BOOK_URI);
 
 				dialog = e_name_selector_peek_dialog (view->priv->name_selector);
-				c_store = e_name_selector_dialog_peek_model (dialog)->contact_store;
+				model = e_name_selector_dialog_peek_model (dialog);
+				c_store = e_name_selector_model_peek_contact_store (model);
 				books = e_contact_store_get_books (c_store);
 
 				for (l = books; l; l = l->next) {
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 6c4c2ad8dc..c7c81e12ce 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -203,7 +203,7 @@ e_meeting_time_selector_item_realize (GnomeCanvasItem *item)
 	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
 
 	canvas = item->canvas;
-	window = GTK_WIDGET (canvas)->window;
+	window = gtk_widget_get_window (GTK_WIDGET (canvas));
 
 	mts_item->main_gc = gdk_gc_new (window);
 	mts_item->stipple_gc = gdk_gc_new (window);
@@ -976,8 +976,14 @@ e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem *mts_item,
 
 	/* Only set the cursor if it is different to the last one we set. */
 	if (mts_item->last_cursor_set != cursor) {
+		GdkWindow *window;
+		GnomeCanvas *canvas;
+
 		mts_item->last_cursor_set = cursor;
-		gdk_window_set_cursor (GTK_WIDGET (GNOME_CANVAS_ITEM (mts_item)->canvas)->window, cursor);
+
+		canvas = GNOME_CANVAS_ITEM (mts_item)->canvas;
+		window = gtk_widget_get_window (GTK_WIDGET (canvas));
+		gdk_window_set_cursor (window, cursor);
 	}
 
 	return FALSE;
@@ -1043,7 +1049,12 @@ e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts,
 void
 e_meeting_time_selector_item_set_normal_cursor (EMeetingTimeSelectorItem *mts_item)
 {
+	GnomeCanvas *canvas;
+	GdkWindow *window;
+
 	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR_ITEM (mts_item));
 
-	gdk_window_set_cursor (GTK_WIDGET (GNOME_CANVAS_ITEM (mts_item)->canvas)->window, mts_item->normal_cursor);
+	canvas = GNOME_CANVAS_ITEM (mts_item)->canvas;
+	window = gtk_widget_get_window (GTK_WIDGET (canvas));
+	gdk_window_set_cursor (window, mts_item->normal_cursor);
 }
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index dd3f49df75..4c19b5a3aa 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -133,9 +133,9 @@ static void e_meeting_time_selector_options_menu_position_callback (GtkMenu *men
 								    gint *y,
 								    gboolean *push_in,
 								    gpointer user_data);
-static void e_meeting_time_selector_on_zoomed_out_toggled (GtkWidget *button,
+static void e_meeting_time_selector_on_zoomed_out_toggled (GtkCheckMenuItem *button,
 							   EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_working_hours_toggled (GtkWidget *button,
+static void e_meeting_time_selector_on_working_hours_toggled (GtkCheckMenuItem *menuitem,
 							      EMeetingTimeSelector *mts);
 static void e_meeting_time_selector_on_invite_others_button_clicked (GtkWidget *button,
 								     EMeetingTimeSelector *mts);
@@ -403,6 +403,9 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 {
 	GtkWidget *hbox, *vbox, *separator, *label, *table, *sw;
 	GtkWidget *alignment, *child_hbox, *arrow, *menuitem;
+	GtkWidget *child;
+	GtkAdjustment *adjustment;
+	GtkLayout *layout;
 	GSList *group;
 	guint accel_key;
 	time_t meeting_start_time;
@@ -473,7 +476,9 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	sw = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
-	gtk_widget_set_child_visible (GTK_SCROLLED_WINDOW (sw)->vscrollbar, FALSE);
+	gtk_widget_set_child_visible (
+		gtk_scrolled_window_get_vscrollbar (
+		GTK_SCROLLED_WINDOW (sw)), FALSE);
 	gtk_widget_show (sw);
 	gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (mts->list_view));
 
@@ -512,18 +517,26 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	g_signal_connect (mts->display_main, "scroll-event",
 			  G_CALLBACK (e_meeting_time_selector_on_canvas_scroll_event), mts);
 
-	gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (sw), GTK_LAYOUT (mts->display_main)->vadjustment);
+	layout = GTK_LAYOUT (mts->display_main);
 
-	mts->hscrollbar = gtk_hscrollbar_new (GTK_LAYOUT (mts->display_main)->hadjustment);
-	GTK_LAYOUT (mts->display_main)->hadjustment->step_increment = mts->day_width;
-	gtk_table_attach (GTK_TABLE (mts), mts->hscrollbar,
-			  1, 4, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+	adjustment = gtk_layout_get_vadjustment (layout);
+	gtk_scrolled_window_set_vadjustment (
+		GTK_SCROLLED_WINDOW (sw), adjustment);
+
+	adjustment = gtk_layout_get_hadjustment (layout);
+	mts->hscrollbar = gtk_hscrollbar_new (adjustment);
+	gtk_adjustment_set_step_increment (adjustment, mts->day_width);
+	gtk_table_attach (
+		GTK_TABLE (mts), mts->hscrollbar,
+		1, 4, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 	gtk_widget_show (mts->hscrollbar);
 
-	mts->vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (mts->display_main)->vadjustment);
-	GTK_LAYOUT (mts->display_main)->vadjustment->step_increment = mts->row_height;
-	gtk_table_attach (GTK_TABLE (mts), mts->vscrollbar,
-			  4, 5, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
+	adjustment = gtk_layout_get_vadjustment (layout);
+	mts->vscrollbar = gtk_vscrollbar_new (adjustment);
+	gtk_adjustment_set_step_increment (adjustment, mts->row_height);
+	gtk_table_attach (
+		GTK_TABLE (mts), mts->vscrollbar,
+		4, 5, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
 	gtk_widget_show (mts->vscrollbar);
 
 	/* Create the item in the top canvas. */
@@ -562,7 +575,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	gtk_widget_show (hbox);
 
 	mts->add_attendees_button =
-		gtk_button_new_with_mnemonic (_("A_ttendees..."));
+		gtk_button_new_with_mnemonic (_("Atte_ndees..."));
 	gtk_button_set_image (
 		GTK_BUTTON (mts->add_attendees_button),
 		gtk_image_new_from_stock (
@@ -600,7 +613,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 				   e_meeting_time_selector_options_menu_detacher);
 
 	menuitem = gtk_check_menu_item_new_with_label ("");
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("Show _only working hours"));
+	child = gtk_bin_get_child (GTK_BIN (menuitem));
+	gtk_label_set_text_with_mnemonic (GTK_LABEL (child), _("Show _only working hours"));
 	gtk_menu_shell_append (GTK_MENU_SHELL (mts->options_menu), menuitem);
 	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
 					mts->working_hours_only);
@@ -610,7 +624,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	gtk_widget_show (menuitem);
 
 	menuitem = gtk_check_menu_item_new_with_label ("");
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("Show _zoomed out"));
+	child = gtk_bin_get_child (GTK_BIN (menuitem));
+	gtk_label_set_text_with_mnemonic (GTK_LABEL (child), _("Show _zoomed out"));
 	gtk_menu_shell_append (GTK_MENU_SHELL (mts->options_menu), menuitem);
 	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
 					mts->zoomed_out);
@@ -625,7 +640,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	gtk_widget_show (menuitem);
 
 	menuitem = gtk_menu_item_new_with_label ("");
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("_Update free/busy"));
+	child = gtk_bin_get_child (GTK_BIN (menuitem));
+	gtk_label_set_text_with_mnemonic (GTK_LABEL (child), _("_Update free/busy"));
 	gtk_menu_shell_append (GTK_MENU_SHELL (mts->options_menu), menuitem);
 
 	g_signal_connect (menuitem, "activate",
@@ -639,9 +655,9 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	gtk_widget_show (hbox);
 
 	mts->autopick_down_button = gtk_button_new_with_label ("");
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (mts->autopick_down_button)->child),
-					  _("_<<"));
-	accel_key = gtk_label_get_mnemonic_keyval (GTK_LABEL (GTK_BIN (mts->autopick_down_button)->child));
+	child = gtk_bin_get_child (GTK_BIN (mts->autopick_down_button));
+	gtk_label_set_text_with_mnemonic (GTK_LABEL (child), _("_<<"));
+	accel_key = gtk_label_get_mnemonic_keyval (GTK_LABEL (child));
 	gtk_widget_add_accelerator (mts->autopick_down_button, "clicked", mts->accel_group,
 				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
 	gtk_box_pack_start (GTK_BOX (hbox), mts->autopick_down_button, TRUE, TRUE, 6);
@@ -672,9 +688,9 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	gtk_widget_show (arrow);
 
 	mts->autopick_up_button = gtk_button_new_with_label ("");
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (mts->autopick_up_button)->child),
-					  _(">_>"));
-	accel_key = gtk_label_get_mnemonic_keyval (GTK_LABEL (GTK_BIN (mts->autopick_up_button)->child));
+	child = gtk_bin_get_child (GTK_BIN (mts->autopick_up_button));
+	gtk_label_set_text_with_mnemonic (GTK_LABEL (child), _(">_>"));
+	accel_key = gtk_label_get_mnemonic_keyval (GTK_LABEL (child));
 	gtk_widget_add_accelerator (mts->autopick_up_button, "clicked", mts->accel_group,
 				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
 	gtk_box_pack_start (GTK_BOX (hbox), mts->autopick_up_button, TRUE, TRUE, 6);
@@ -689,8 +705,9 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 
 	menuitem = gtk_radio_menu_item_new_with_label (NULL, "");
 	mts->autopick_all_item = menuitem;
+	child = gtk_bin_get_child (GTK_BIN (menuitem));
 	group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("_All people and resources"));
+	gtk_label_set_text_with_mnemonic (GTK_LABEL (child), _("_All people and resources"));
 	gtk_menu_shell_append (GTK_MENU_SHELL (mts->autopick_menu), menuitem);
 	g_signal_connect (menuitem, "toggled",
 			  G_CALLBACK (e_meeting_time_selector_on_autopick_option_toggled), mts);
@@ -698,8 +715,9 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 
 	menuitem = gtk_radio_menu_item_new_with_label (group, "");
 	mts->autopick_all_people_one_resource_item = menuitem;
+	child = gtk_bin_get_child (GTK_BIN (menuitem));
 	group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("All _people and one resource"));
+	gtk_label_set_text_with_mnemonic (GTK_LABEL (child), _("All _people and one resource"));
 	gtk_menu_shell_append (GTK_MENU_SHELL (mts->autopick_menu), menuitem);
 	g_signal_connect (menuitem, "toggled",
 			  G_CALLBACK (e_meeting_time_selector_on_autopick_option_toggled), mts);
@@ -707,8 +725,9 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 
 	menuitem = gtk_radio_menu_item_new_with_label (group, "");
 	mts->autopick_required_people_item = menuitem;
+	child = gtk_bin_get_child (GTK_BIN (menuitem));
 	group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("_Required people"));
+	gtk_label_set_text_with_mnemonic (GTK_LABEL (child), _("_Required people"));
 	gtk_menu_shell_append (GTK_MENU_SHELL (mts->autopick_menu), menuitem);
 	g_signal_connect (menuitem, "activate",
 			  G_CALLBACK (e_meeting_time_selector_on_autopick_option_toggled), mts);
@@ -716,7 +735,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 
 	menuitem = gtk_radio_menu_item_new_with_label (group, "");
 	mts->autopick_required_people_one_resource_item = menuitem;
-	gtk_label_set_text_with_mnemonic (GTK_LABEL (GTK_BIN (menuitem)->child), _("Required people and _one resource"));
+	child = gtk_bin_get_child (GTK_BIN (menuitem));
+	gtk_label_set_text_with_mnemonic (GTK_LABEL (child), _("Required people and _one resource"));
 	gtk_menu_shell_append (GTK_MENU_SHELL (mts->autopick_menu), menuitem);
 	g_signal_connect (menuitem, "activate",
 			  G_CALLBACK (e_meeting_time_selector_on_autopick_option_toggled), mts);
@@ -830,12 +850,18 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 						    8, 8);
 
 	/* Connect handlers to the adjustments  scroll the other items. */
-	g_signal_connect (GTK_LAYOUT (mts->display_main)->hadjustment, "value_changed",
-			  G_CALLBACK (e_meeting_time_selector_hadjustment_changed), mts);
-	g_signal_connect (GTK_LAYOUT (mts->display_main)->vadjustment, "value_changed",
-			  G_CALLBACK (e_meeting_time_selector_vadjustment_changed), mts);
-	g_signal_connect (GTK_LAYOUT (mts->display_main)->vadjustment, "changed",
-			  G_CALLBACK (e_meeting_time_selector_vadjustment_changed), mts);
+	layout = GTK_LAYOUT (mts->display_main);
+	adjustment = gtk_layout_get_hadjustment (layout);
+	g_signal_connect (
+		adjustment, "value_changed",
+		G_CALLBACK (e_meeting_time_selector_hadjustment_changed), mts);
+	adjustment = gtk_layout_get_vadjustment (layout);
+	g_signal_connect (
+		adjustment, "value_changed",
+		G_CALLBACK (e_meeting_time_selector_vadjustment_changed), mts);
+	g_signal_connect (
+		adjustment, "changed",
+		G_CALLBACK (e_meeting_time_selector_vadjustment_changed), mts);
 
 	e_meeting_time_selector_recalc_grid (mts);
 	e_meeting_time_selector_ensure_meeting_time_shown (mts);
@@ -881,28 +907,36 @@ e_meeting_time_selector_expose_key_color (GtkWidget *darea,
 					  GdkColor *color)
 {
 	EMeetingTimeSelector * mts;
+	GtkAllocation allocation;
+	GdkWindow *window;
+	GtkStyle *style;
 	GdkGC *gc;
-	gint width, height;
+
+	style = gtk_widget_get_style (darea);
+	window = gtk_widget_get_window (darea);
+	gtk_widget_get_allocation (darea, &allocation);
 
 	mts = g_object_get_data (G_OBJECT (darea), "data");
 	gc = mts->color_key_gc;
-	width = darea->allocation.width;
-	height = darea->allocation.height;
 
-	gtk_paint_shadow (darea->style, darea->window, GTK_STATE_NORMAL,
-			  GTK_SHADOW_IN, NULL, NULL, NULL, 0, 0, width, height);
+	gtk_paint_shadow (
+		style, window, GTK_STATE_NORMAL,
+		GTK_SHADOW_IN, NULL, NULL, NULL, 0, 0,
+		allocation.width, allocation.height);
 
 	if (color) {
 		gdk_gc_set_foreground (gc, color);
-		gdk_draw_rectangle (darea->window, gc, TRUE, 1, 1,
-				    width - 2, height - 2);
+		gdk_draw_rectangle (
+			window, gc, TRUE, 1, 1,
+			allocation.width - 2, allocation.height - 2);
 	} else {
 		gdk_gc_set_foreground (gc, &mts->grid_color);
 		gdk_gc_set_background (gc, &mts->stipple_bg_color);
 		gdk_gc_set_stipple (gc, mts->stipple);
 		gdk_gc_set_fill (gc, GDK_OPAQUE_STIPPLED);
-		gdk_draw_rectangle (darea->window, gc, TRUE, 1, 1,
-				    width - 2, height - 2);
+		gdk_draw_rectangle (
+			window, gc, TRUE, 1, 1,
+			allocation.width - 2, allocation.height - 2);
 		gdk_gc_set_fill (gc, GDK_SOLID);
 	}
 
@@ -1027,13 +1061,15 @@ static void
 e_meeting_time_selector_realize (GtkWidget *widget)
 {
 	EMeetingTimeSelector *mts;
+	GdkWindow *window;
 
 	if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->realize)
 		(*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->realize)(widget);
 
 	mts = E_MEETING_TIME_SELECTOR (widget);
 
-	mts->color_key_gc = gdk_gc_new (widget->window);
+	window = gtk_widget_get_window (widget);
+	mts->color_key_gc = gdk_gc_new (window);
 }
 
 static void
@@ -1065,10 +1101,11 @@ get_cell_height (GtkTreeView *tree)
 }
 
 static gboolean
-style_change_idle_func (gpointer widget)
+style_change_idle_func (EMeetingTimeSelector *mts)
 {
-	EMeetingTimeSelector *mts;
 	EMeetingTime saved_time;
+	GtkAdjustment *adjustment;
+	GtkWidget *widget;
 	gint hour, max_hour_width;
 	/*int maxheight;      */
 	PangoFontDescription *font_desc;
@@ -1076,9 +1113,8 @@ style_change_idle_func (gpointer widget)
 	PangoFontMetrics *font_metrics;
 	PangoLayout *layout;
 
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
 	/* Set up Pango prerequisites */
+	widget = GTK_WIDGET (mts);
 	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,
@@ -1121,8 +1157,13 @@ style_change_idle_func (gpointer widget)
 
 	gtk_widget_set_size_request (mts->attendees_vbox_spacer, 1, mts->row_height * 2 - 6);
 
-	GTK_LAYOUT (mts->display_main)->hadjustment->step_increment = mts->day_width;
-	GTK_LAYOUT (mts->display_main)->vadjustment->step_increment = mts->row_height;
+	widget = mts->display_main;
+
+	adjustment = gtk_layout_get_hadjustment (GTK_LAYOUT (widget));
+	gtk_adjustment_set_step_increment (adjustment, mts->day_width);
+
+	adjustment = gtk_layout_get_vadjustment (GTK_LAYOUT (widget));
+	gtk_adjustment_set_step_increment (adjustment, mts->row_height);
 
 	g_object_unref (layout);
 	pango_font_metrics_unref (font_metrics);
@@ -1142,7 +1183,8 @@ e_meeting_time_selector_style_set (GtkWidget *widget,
 		(*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->style_set)(widget, previous_style);
 
 	if (!mts->style_change_idle_id)
-		mts->style_change_idle_id = g_idle_add (style_change_idle_func, widget);
+		mts->style_change_idle_id = g_idle_add (
+			(GSourceFunc) style_change_idle_func, widget);
 }
 
 /* This draws a shadow around the top display and main display. */
@@ -1165,19 +1207,24 @@ e_meeting_time_selector_expose_event (GtkWidget *widget,
 static void
 e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts)
 {
-	GtkWidget *widget;
+	GtkAllocation allocation;
+	GdkWindow *window;
+	GtkStyle *style;
 	gint x, y, w, h;
 
-	widget = GTK_WIDGET (mts);
-
 	/* Draw the shadow around the graphical displays. */
-	x = mts->display_top->allocation.x - 2;
-	y = mts->display_top->allocation.y - 2;
-	w = mts->display_top->allocation.width + 4;
-	h = mts->display_top->allocation.height + mts->display_main->allocation.height + 4;
+	gtk_widget_get_allocation (mts->display_top, &allocation);
+	x = allocation.x - 2;
+	y = allocation.y - 2;
+	w = allocation.width + 4;
+	h = allocation.height + allocation.height + 4;
 
-	gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL,
-			  GTK_SHADOW_IN, NULL, NULL, NULL, x, y, w, h);
+	style = gtk_widget_get_style (GTK_WIDGET (mts));
+	window = gtk_widget_get_window (GTK_WIDGET (mts));
+
+	gtk_paint_shadow (
+		style, window, GTK_STATE_NORMAL,
+		GTK_SHADOW_IN, NULL, NULL, NULL, x, y, w, h);
 }
 
 /* When the main canvas scrolls, we scroll the other canvases. */
@@ -1185,26 +1232,30 @@ static void
 e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment,
 					     EMeetingTimeSelector *mts)
 {
-	GtkAdjustment *adj;
+	GtkAdjustment *hadjustment;
+	GtkLayout *layout;
+	gdouble value;
 
-	adj = GTK_LAYOUT (mts->display_top)->hadjustment;
-	if (adj->value != adjustment->value) {
-		adj->value = adjustment->value;
-		gtk_adjustment_value_changed (adj);
-	}
+	layout = GTK_LAYOUT (mts->display_top);
+	hadjustment = gtk_layout_get_hadjustment (layout);
+
+	value = gtk_adjustment_get_value (adjustment);
+	gtk_adjustment_set_value (hadjustment, value);
 }
 
 static void
 e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment,
 					     EMeetingTimeSelector *mts)
 {
-	GtkAdjustment *adj;
+	GtkAdjustment *vadjustment;
+	GtkTreeView *tree_view;
+	gdouble value;
 
-	adj = gtk_tree_view_get_vadjustment (GTK_TREE_VIEW (mts->list_view));
-	if (adj->value != adjustment->value) {
-		adj->value = adjustment->value;
-		gtk_adjustment_value_changed (adj);
-	}
+	tree_view = GTK_TREE_VIEW (mts->list_view);
+	vadjustment = gtk_tree_view_get_vadjustment (tree_view);
+
+	value = gtk_adjustment_get_value (adjustment);
+	gtk_adjustment_set_value (vadjustment, value);
 }
 
 void
@@ -1467,12 +1518,20 @@ e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, gint row,
 EMeetingTimeSelectorAutopickOption
 e_meeting_time_selector_get_autopick_option (EMeetingTimeSelector *mts)
 {
-	if (GTK_CHECK_MENU_ITEM (mts->autopick_all_item)->active)
+	GtkWidget *widget;
+
+	widget = mts->autopick_all_item;
+	if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)))
 		return E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_RESOURCES;
-	if (GTK_CHECK_MENU_ITEM (mts->autopick_all_people_one_resource_item)->active)
+
+	widget = mts->autopick_all_people_one_resource_item;
+	if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)))
 		return E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE;
-	if (GTK_CHECK_MENU_ITEM (mts->autopick_required_people_item)->active)
+
+	widget = mts->autopick_required_people_item;
+	if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)))
 		return E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE;
+
 	return E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE;
 }
 
@@ -1639,14 +1698,20 @@ e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu,
 {
 	EMeetingTimeSelector *mts;
 	GtkRequisition menu_requisition;
+	GtkAllocation allocation;
+	GtkWidget *widget;
+	GdkWindow *window;
 	gint max_x, max_y;
 
 	mts = E_MEETING_TIME_SELECTOR (user_data);
 
 	/* Calculate our preferred position. */
-	gdk_window_get_origin (mts->options_button->window, x, y);
-	*x += mts->options_button->allocation.x;
-	*y += mts->options_button->allocation.y + mts->options_button->allocation.height - 2;
+	widget = mts->options_button;
+	window = gtk_widget_get_window (widget);
+	gdk_window_get_origin (window, x, y);
+	gtk_widget_get_allocation (widget, &allocation);
+	*x += allocation.x;
+	*y += allocation.y + allocation.height - 2;
 
 	/* Now make sure we are on the screen. */
 	gtk_widget_size_request (mts->options_menu, &menu_requisition);
@@ -1662,11 +1727,7 @@ e_meeting_time_selector_on_update_free_busy (GtkWidget *button,
 {
 	/* Make sure the menu pops down, which doesn't happen by default if
 	   keyboard accelerators are used. */
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_get_visible (mts->options_menu))
-#else
-	if (GTK_WIDGET_VISIBLE (mts->options_menu))
-#endif
 		gtk_menu_popdown (GTK_MENU (mts->options_menu));
 
 	e_meeting_time_selector_refresh_free_busy (mts, 0, TRUE);
@@ -1690,14 +1751,20 @@ e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,
 {
 	EMeetingTimeSelector *mts;
 	GtkRequisition menu_requisition;
+	GtkAllocation allocation;
+	GtkWidget *widget;
+	GdkWindow *window;
 	gint max_x, max_y;
 
 	mts = E_MEETING_TIME_SELECTOR (user_data);
 
 	/* Calculate our preferred position. */
-	gdk_window_get_origin (mts->autopick_button->window, x, y);
-	*x += mts->autopick_button->allocation.x;
-	*y += mts->autopick_button->allocation.y + mts->autopick_button->allocation.height - 2;
+	widget = mts->autopick_button;
+	window = gtk_widget_get_window (widget);
+	gdk_window_get_origin (window, x, y);
+	gtk_widget_get_allocation (widget, &allocation);
+	*x += allocation.x;
+	*y += allocation.y + allocation.height - 2;
 
 	/* Now make sure we are on the screen. */
 	gtk_widget_size_request (mts->autopick_menu, &menu_requisition);
@@ -1713,11 +1780,7 @@ e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button,
 {
 	/* Make sure the menu pops down, which doesn't happen by default if
 	   keyboard accelerators are used. */
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_get_visible (mts->autopick_menu))
-#else
-	if (GTK_WIDGET_VISIBLE (mts->autopick_menu))
-#endif
 		gtk_menu_popdown (GTK_MENU (mts->autopick_menu));
 }
 
@@ -2112,36 +2175,34 @@ e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts,
 }
 
 static void
-e_meeting_time_selector_on_zoomed_out_toggled (GtkWidget *menuitem,
+e_meeting_time_selector_on_zoomed_out_toggled (GtkCheckMenuItem *menuitem,
 					       EMeetingTimeSelector *mts)
 {
+	gboolean active;
+
 	/* Make sure the menu pops down, which doesn't happen by default if
 	   keyboard accelerators are used. */
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_get_visible (mts->options_menu))
-#else
-	if (GTK_WIDGET_VISIBLE (mts->options_menu))
-#endif
 		gtk_menu_popdown (GTK_MENU (mts->options_menu));
 
-	e_meeting_time_selector_set_zoomed_out (mts, GTK_CHECK_MENU_ITEM (menuitem)->active);
+	active = gtk_check_menu_item_get_active (menuitem);
+	e_meeting_time_selector_set_zoomed_out (mts, active);
 	e_meeting_time_selector_ensure_meeting_time_shown (mts);
 }
 
 static void
-e_meeting_time_selector_on_working_hours_toggled (GtkWidget *menuitem,
+e_meeting_time_selector_on_working_hours_toggled (GtkCheckMenuItem *menuitem,
 						  EMeetingTimeSelector *mts)
 {
+	gboolean active;
+
 	/* Make sure the menu pops down, which doesn't happen by default if
 	   keyboard accelerators are used. */
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_get_visible (mts->options_menu))
-#else
-	if (GTK_WIDGET_VISIBLE (mts->options_menu))
-#endif
 		gtk_menu_popdown (GTK_MENU (mts->options_menu));
 
-	e_meeting_time_selector_set_working_hours_only (mts, GTK_CHECK_MENU_ITEM (menuitem)->active);
+	active = gtk_check_menu_item_get_active (menuitem);
+	e_meeting_time_selector_set_working_hours_only (mts, active);
 	e_meeting_time_selector_ensure_meeting_time_shown (mts);
 }
 
@@ -2360,8 +2421,10 @@ static void
 e_meeting_time_selector_on_canvas_realized (GtkWidget *widget,
 					    EMeetingTimeSelector *mts)
 {
-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window,
-				    NULL, FALSE);
+	GdkWindow *window;
+
+	window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
+	gdk_window_set_back_pixmap (window, NULL, FALSE);
 }
 
 /* This is called when the meeting start time GnomeDateEdit is changed,
@@ -2509,12 +2572,12 @@ e_meeting_time_selector_on_canvas_scroll_event (GtkWidget *widget, GdkEventScrol
 static void
 e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector *mts)
 {
-	gint height, canvas_height;
+	GtkAllocation allocation;
+	gint height;
 
+	gtk_widget_get_allocation (mts->display_main, &allocation);
 	height = mts->row_height * (e_meeting_store_count_actual_attendees (mts->model) + 2);
-	canvas_height = GTK_WIDGET (mts->display_main)->allocation.height;
-
-	height = MAX (height,  canvas_height);
+	height = MAX (height, allocation.height);
 
 	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->display_main),
 					0, 0,
@@ -2534,11 +2597,13 @@ e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,
 	EMeetingTime first_time, last_time, drag_time, *time_to_set;
 	gint scroll_x, scroll_y, canvas_width;
 	gboolean set_both_times = FALSE;
+	GtkAllocation allocation;
 
 	/* Get the x coords of visible part of the canvas. */
 	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
 					 &scroll_x, &scroll_y);
-	canvas_width = mts->display_main->allocation.width;
+	gtk_widget_get_allocation (mts->display_main, &allocation);
+	canvas_width = allocation.width;
 
 	/* Save the x coordinate for the timeout handler. */
 	mts->last_drag_x = (x < scroll_x) ? x - scroll_x
@@ -2684,6 +2749,7 @@ e_meeting_time_selector_timeout_handler (gpointer data)
 	gint scroll_x, max_scroll_x, scroll_y, canvas_width;
 	gint scroll_speed, scroll_offset;
 	gboolean set_both_times = FALSE;
+	GtkAllocation allocation;
 
 	mts = E_MEETING_TIME_SELECTOR (data);
 
@@ -2698,7 +2764,8 @@ e_meeting_time_selector_timeout_handler (gpointer data)
 	/* Get the x coords of visible part of the canvas. */
 	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
 					 &scroll_x, &scroll_y);
-	canvas_width = mts->display_main->allocation.width;
+	gtk_widget_get_allocation (mts->display_main, &allocation);
+	canvas_width = allocation.width;
 
 	/* Calculate the scroll delay, between 0 and MAX_SCROLL_SPEED. */
 	scroll_speed = abs (mts->last_drag_x / E_MEETING_TIME_SELECTOR_SCROLL_INCREMENT_WIDTH);
@@ -2870,8 +2937,9 @@ e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts)
 static void
 e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts)
 {
-	gint start_x, end_x, scroll_x, scroll_y, canvas_width;
+	gint start_x, end_x, scroll_x, scroll_y;
 	gint new_scroll_x;
+	GtkAllocation allocation;
 	EMeetingTime time;
 
 	/* Check if we need to change the range of dates shown. */
@@ -2895,8 +2963,8 @@ e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts)
 
 	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
 					 &scroll_x, &scroll_y);
-	canvas_width = mts->display_main->allocation.width;
-	if (start_x > scroll_x && end_x <= scroll_x + canvas_width)
+	gtk_widget_get_allocation (mts->display_main, &allocation);
+	if (start_x > scroll_x && end_x <= scroll_x + allocation.width)
 		return;
 
 	new_scroll_x = start_x;
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index d5e5093a93..a078fd140f 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -570,6 +570,7 @@ memo_table_query_tooltip (GtkWidget *widget,
 			FALSE, FALSE, buff, 1000);
 
 		if (buff [0]) {
+			/* Translators: This is followed by an event's start date/time */
 			g_string_append (tmp2, _("Start: "));
 			g_string_append (tmp2, buff);
 		}
@@ -588,6 +589,7 @@ memo_table_query_tooltip (GtkWidget *widget,
 			if (tmp2->len)
 				g_string_append (tmp2, "; ");
 
+			/* Translators: This is followed by an event's due date/time */
 			g_string_append (tmp2, _("Due: "));
 			g_string_append (tmp2, buff);
 		}
@@ -912,11 +914,7 @@ memo_table_paste_clipboard (ESelectable *selectable)
 
 	/* Paste text into a cell being edited. */
 	if (gtk_clipboard_wait_is_text_available (clipboard) &&
-#if GTK_CHECK_VERSION(2,19,7)
 		gtk_widget_has_focus (GTK_WIDGET (table_canvas)) &&
-#else
-		GTK_WIDGET_HAS_FOCUS (table_canvas) &&
-#endif
 		E_IS_TABLE_ITEM (item) &&
 		E_TABLE_ITEM (item)->editing_col >= 0 &&
 		E_TABLE_ITEM (item)->editing_row >= 0) {
@@ -1050,7 +1048,7 @@ memo_table_class_init (EMemoTableClass *class)
 		PROP_MODEL,
 		g_param_spec_object (
 			"model",
-			_("Model"),
+			"Model",
 			NULL,
 			E_TYPE_CAL_MODEL,
 			G_PARAM_READWRITE |
@@ -1067,7 +1065,7 @@ memo_table_class_init (EMemoTableClass *class)
 		PROP_SHELL_VIEW,
 		g_param_spec_object (
 			"shell-view",
-			_("Shell View"),
+			"Shell View",
 			NULL,
 			E_TYPE_SHELL_VIEW,
 			G_PARAM_READWRITE |
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
index bb0698fa29..ddb8e72efe 100644
--- a/calendar/gui/e-select-names-renderer.c
+++ b/calendar/gui/e-select-names-renderer.c
@@ -54,11 +54,13 @@ static void
 e_select_names_renderer_editing_done (GtkCellEditable *editable, ESelectNamesRenderer *cell)
 {
 	GList *addresses = NULL, *names = NULL, *a, *n;
+	gboolean editing_canceled;
 
 	/* We don't need to listen for the focus out event any more */
 	g_signal_handlers_disconnect_matched (editable, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, cell);
 
-	if (GTK_ENTRY (editable)->editing_canceled) {
+	g_object_get (editable, "editing-canceled", &editing_canceled, NULL);
+	if (editing_canceled) {
 		gtk_cell_renderer_stop_editing (GTK_CELL_RENDERER (cell), TRUE);
 		goto cleanup;
 	}
@@ -103,13 +105,20 @@ e_select_names_renderer_start_editing (GtkCellRenderer *cell, GdkEvent *event, G
 	ESelectNamesRenderer *sn_cell = E_SELECT_NAMES_RENDERER (cell);
 	GtkCellRendererText *text_cell = GTK_CELL_RENDERER_TEXT (cell);
 	ESelectNamesEditable *editable;
+	gboolean is_editable;
+	gfloat xalign;
 
-	if (!text_cell->editable)
+	g_object_get (
+		text_cell,
+		"editable", &is_editable,
+		"xalign", &xalign, NULL);
+
+	if (!is_editable)
 		return NULL;
 
 	editable = E_SELECT_NAMES_EDITABLE (e_select_names_editable_new ());
 	gtk_entry_set_has_frame (GTK_ENTRY (editable), FALSE);
-	gtk_entry_set_alignment (GTK_ENTRY (editable), cell->xalign);
+	gtk_entry_set_alignment (GTK_ENTRY (editable), xalign);
 	if (sn_cell->priv->email && *sn_cell->priv->email)
 		e_select_names_editable_set_address (editable, sn_cell->priv->name, sn_cell->priv->email);
 	gtk_widget_show (GTK_WIDGET (editable));
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index c71eeeeb04..98d422aa16 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -412,6 +412,7 @@ task_table_constructed (GObject *object)
 	GList *strings;
 	AtkObject *a11y;
 	gchar *etspecfile;
+	gint percent;
 
 	task_table = E_TASK_TABLE (object);
 	model = e_task_table_get_model (task_table);
@@ -488,6 +489,7 @@ task_table_constructed (GObject *object)
 	strings = g_list_append (strings, (gchar *) _("Confidential"));
 	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
 					  strings);
+	g_list_free (strings);
 
 	e_table_extras_add_cell (extras, "classification", popup_cell);
 
@@ -511,6 +513,7 @@ task_table_constructed (GObject *object)
 	strings = g_list_append (strings, (gchar *) _("Undefined"));
 	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
 					  strings);
+	g_list_free (strings);
 
 	e_table_extras_add_cell (extras, "priority", popup_cell);
 
@@ -527,20 +530,19 @@ task_table_constructed (GObject *object)
 	g_object_unref (cell);
 
 	strings = NULL;
-	strings = g_list_append (strings, (gchar *) _("0%"));
-	strings = g_list_append (strings, (gchar *) _("10%"));
-	strings = g_list_append (strings, (gchar *) _("20%"));
-	strings = g_list_append (strings, (gchar *) _("30%"));
-	strings = g_list_append (strings, (gchar *) _("40%"));
-	strings = g_list_append (strings, (gchar *) _("50%"));
-	strings = g_list_append (strings, (gchar *) _("60%"));
-	strings = g_list_append (strings, (gchar *) _("70%"));
-	strings = g_list_append (strings, (gchar *) _("80%"));
-	strings = g_list_append (strings, (gchar *) _("90%"));
-	strings = g_list_append (strings, (gchar *) _("100%"));
+	for (percent = 0; percent <= 100; percent += 10) {
+		/* Translators: "%d%%" is the percentage of a task done.
+		   %d is the actual value, %% is replaced with a percent sign.
+		   Result values will be 0%, 10%, 20%, ... 100%
+		*/
+		strings = g_list_append (strings, g_strdup_printf (_("%d%%"), percent));
+	}
 	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
 					  strings);
 
+	g_list_foreach (strings, (GFunc) g_free, NULL);
+	g_list_free (strings);
+
 	e_table_extras_add_cell (extras, "percent", popup_cell);
 
 	/* Transparency field. */
@@ -561,6 +563,7 @@ task_table_constructed (GObject *object)
 	strings = g_list_append (strings, (gchar *) _("Busy"));
 	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
 					  strings);
+	g_list_free (strings);
 
 	e_table_extras_add_cell (extras, "transparency", popup_cell);
 
@@ -584,6 +587,7 @@ task_table_constructed (GObject *object)
 	strings = g_list_append (strings, (gchar *) _("Canceled"));
 	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
 					  strings);
+	g_list_free (strings);
 
 	e_table_extras_add_cell (extras, "calstatus", popup_cell);
 
@@ -1133,11 +1137,7 @@ task_table_paste_clipboard (ESelectable *selectable)
 
 	/* Paste text into a cell being edited. */
 	if (gtk_clipboard_wait_is_text_available (clipboard) &&
-#if GTK_CHECK_VERSION(2,19,7)
 		gtk_widget_has_focus (GTK_WIDGET (table_canvas)) &&
-#else
-		GTK_WIDGET_HAS_FOCUS (table_canvas) &&
-#endif
 		E_IS_TABLE_ITEM (item) &&
 		E_TABLE_ITEM (item)->editing_col >= 0 &&
 		E_TABLE_ITEM (item)->editing_row >= 0) {
@@ -1349,7 +1349,7 @@ task_table_class_init (ETaskTableClass *class)
 		PROP_MODEL,
 		g_param_spec_object (
 			"model",
-			_("Model"),
+			"Model",
 			NULL,
 			E_TYPE_CAL_MODEL,
 			G_PARAM_READWRITE |
@@ -1366,7 +1366,7 @@ task_table_class_init (ETaskTableClass *class)
 		PROP_SHELL_VIEW,
 		g_param_spec_object (
 			"shell-view",
-			_("Shell View"),
+			"Shell View",
 			NULL,
 			E_TYPE_SHELL_VIEW,
 			G_PARAM_READWRITE |
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 309661a2db..c281a4aedf 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -236,44 +236,20 @@ timezone_entry_focus (GtkWidget *widget,
 	priv = E_TIMEZONE_ENTRY_GET_PRIVATE (widget);
 
 	if (direction == GTK_DIR_TAB_FORWARD) {
-#if GTK_CHECK_VERSION(2,19,7)
 		if (gtk_widget_has_focus (priv->entry))
-#else
-		if (GTK_WIDGET_HAS_FOCUS (priv->entry))
-#endif
 			gtk_widget_grab_focus (priv->button);
-#if GTK_CHECK_VERSION(2,19,7)
 		else if (gtk_widget_has_focus (priv->button))
-#else
-		else if (GTK_WIDGET_HAS_FOCUS (priv->button))
-#endif
 			return FALSE;
-#if GTK_CHECK_VERSION(2,19,7)
 		else if (gtk_widget_get_visible (priv->entry))
-#else
-		else if (GTK_WIDGET_VISIBLE (priv->entry))
-#endif
 			gtk_widget_grab_focus (priv->entry);
 		else
 			gtk_widget_grab_focus (priv->button);
 
 	} else if (direction == GTK_DIR_TAB_BACKWARD) {
-#if GTK_CHECK_VERSION(2,19,7)
 		if (gtk_widget_has_focus (priv->entry))
-#else
-		if (GTK_WIDGET_HAS_FOCUS (priv->entry))
-#endif
 			return FALSE;
-#if GTK_CHECK_VERSION(2,19,7)
 		else if (gtk_widget_has_focus (priv->button)) {
-#else
-		else if (GTK_WIDGET_HAS_FOCUS (priv->button)) {
-#endif
-#if GTK_CHECK_VERSION(2,19,7)
 			if (gtk_widget_get_visible (priv->entry))
-#else
-			if (GTK_WIDGET_VISIBLE (priv->entry))
-#endif
 				gtk_widget_grab_focus (priv->entry);
 			else
 				return FALSE;
@@ -328,7 +304,7 @@ e_timezone_entry_init (ETimezoneEntry *timezone_entry)
 
 	timezone_entry->priv = E_TIMEZONE_ENTRY_GET_PRIVATE (timezone_entry);
 
-	GTK_WIDGET_SET_FLAGS (GTK_WIDGET (timezone_entry), GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus (GTK_WIDGET (timezone_entry), TRUE);
 
 	widget  = gtk_entry_new ();
 	gtk_editable_set_editable (GTK_EDITABLE (widget), FALSE);
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 90d8831747..ba44b7a24a 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -87,11 +87,14 @@ week_view_event_item_get_position (EWeekViewEventItem *event_item,
 {
 	EWeekView *week_view;
 	GnomeCanvasItem *item;
+	GtkWidget *parent;
 
 	item = GNOME_CANVAS_ITEM (event_item);
 
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), E_CALENDAR_VIEW_POS_NONE);
+	parent = gtk_widget_get_parent (GTK_WIDGET (item->canvas));
+	g_return_val_if_fail (E_IS_WEEK_VIEW (parent), E_CALENDAR_VIEW_POS_NONE);
+
+	week_view = E_WEEK_VIEW (parent);
 
 	if (x < item->x1 + E_WEEK_VIEW_EVENT_L_PAD
 	    || x >= item->x2 - E_WEEK_VIEW_EVENT_R_PAD)
@@ -120,19 +123,31 @@ week_view_event_item_double_click (EWeekViewEventItem *event_item,
 	EWeekView *week_view;
 	EWeekViewEvent *event;
 	GnomeCanvasItem *item;
+	GtkWidget *parent;
 
 	item = GNOME_CANVAS_ITEM (event_item);
 
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
+	parent = gtk_widget_get_parent (GTK_WIDGET (item->canvas));
+	g_return_val_if_fail (E_IS_WEEK_VIEW (parent), FALSE);
+
+	week_view = E_WEEK_VIEW (parent);
+
+	if (!is_array_index_in_bounds (week_view->events, event_item->priv->event_num))
+		return TRUE;
 
 	event = &g_array_index (
 		week_view->events, EWeekViewEvent,
 		event_item->priv->event_num);
 
+	if (!is_comp_data_valid (event))
+		return TRUE;
+
 	if (week_view->editing_event_num >= 0) {
 		EWeekViewEvent *editing;
 
+		if (!is_array_index_in_bounds (week_view->events, week_view->editing_event_num))
+			return TRUE;
+
 		editing = &g_array_index (
 			week_view->events, EWeekViewEvent,
 			week_view->editing_event_num);
@@ -141,6 +156,7 @@ week_view_event_item_double_click (EWeekViewEventItem *event_item,
 		 * on the component, which is not on the server. */
 		if (editing && event &&
 			editing->comp_data == event->comp_data &&
+			is_comp_data_valid (editing) &&
 			(!event->comp_data ||
 			 !is_icalcomp_on_the_server (
 				event->comp_data->icalcomp,
@@ -167,14 +183,24 @@ week_view_event_item_button_press (EWeekViewEventItem *event_item,
 	EWeekViewEvent *event;
 	EWeekViewEventSpan *span;
 	GnomeCanvasItem *item;
+	GtkWidget *parent;
 
 	item = GNOME_CANVAS_ITEM (event_item);
 
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
+	parent = gtk_widget_get_parent (GTK_WIDGET (item->canvas));
+	g_return_val_if_fail (E_IS_WEEK_VIEW (parent), FALSE);
+
+	week_view = E_WEEK_VIEW (parent);
+
+	if (!is_array_index_in_bounds (week_view->events, event_item->priv->event_num))
+		return FALSE;
 
 	event = &g_array_index (week_view->events, EWeekViewEvent,
 				event_item->priv->event_num);
+
+	if (!is_array_index_in_bounds (week_view->spans, event->spans_index + event_item->priv->span_num))
+		return FALSE;
+
 	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
 			       event->spans_index + event_item->priv->span_num);
 
@@ -201,11 +227,7 @@ week_view_event_item_button_press (EWeekViewEventItem *event_item,
 
 		return TRUE;
 	} else if (bevent->button.button == 3) {
-#if GTK_CHECK_VERSION(2,19,7)
 		if (!gtk_widget_has_focus (GTK_WIDGET (week_view))) {
-#else
-		if (!GTK_WIDGET_HAS_FOCUS (week_view)) {
-#endif
 			gtk_widget_grab_focus (GTK_WIDGET (week_view));
 			if (week_view->event_destroyed) {
 				week_view->event_destroyed = FALSE;
@@ -235,11 +257,14 @@ week_view_event_item_button_release (EWeekViewEventItem *event_item,
 {
 	EWeekView *week_view;
 	GnomeCanvasItem *item;
+	GtkWidget *parent;
 
 	item = GNOME_CANVAS_ITEM (event_item);
 
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
+	parent = gtk_widget_get_parent (GTK_WIDGET (item->canvas));
+	g_return_val_if_fail (E_IS_WEEK_VIEW (parent), FALSE);
+
+	week_view = E_WEEK_VIEW (parent);
 
 	if (week_view->pressed_event_num != -1
 	    && week_view->pressed_event_num == event_item->priv->event_num
@@ -368,6 +393,8 @@ week_view_event_item_draw_icons (EWeekViewEventItem *event_item,
 	EWeekView *week_view;
 	EWeekViewEvent *event;
 	ECalComponent *comp;
+	GnomeCanvas *canvas;
+	GtkWidget *parent;
 	GdkGC *gc;
 	gint num_icons = 0, icon_x_inc;
 	gboolean draw_reminder_icon = FALSE, draw_recurrence_icon = FALSE;
@@ -376,10 +403,19 @@ week_view_event_item_draw_icons (EWeekViewEventItem *event_item,
 	GSList *categories_pixbufs = NULL, *pixbufs;
 	cairo_t *cr;
 
-	week_view = E_WEEK_VIEW (GTK_WIDGET (GNOME_CANVAS_ITEM (event_item)->canvas)->parent);
+	canvas = GNOME_CANVAS_ITEM (event_item)->canvas;
+	parent = gtk_widget_get_parent (GTK_WIDGET (canvas));
+	week_view = E_WEEK_VIEW (parent);
+
+	if (!is_array_index_in_bounds (week_view->events, event_item->priv->event_num))
+		return;
 
 	event = &g_array_index (week_view->events, EWeekViewEvent,
 				event_item->priv->event_num);
+
+	if (!is_comp_data_valid (event))
+		return;
+
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (
 		comp, icalcomponent_new_clone (event->comp_data->icalcomp));
@@ -484,6 +520,8 @@ week_view_event_item_draw_triangle (EWeekViewEventItem *event_item,
 	ECalModel *model;
 	EWeekView *week_view;
 	EWeekViewEvent *event;
+	GnomeCanvas *canvas;
+	GtkWidget *parent;
 	GdkPoint points[3];
 	const gchar *color_spec;
 	gint c1, c2;
@@ -492,11 +530,19 @@ week_view_event_item_draw_triangle (EWeekViewEventItem *event_item,
 	if (!can_draw_in_region (draw_region, x, y, w, h))
 		return;
 
-	week_view = E_WEEK_VIEW (GTK_WIDGET (GNOME_CANVAS_ITEM (event_item)->canvas)->parent);
+	canvas = GNOME_CANVAS_ITEM (event_item)->canvas;
+	parent = gtk_widget_get_parent (GTK_WIDGET (canvas));
+	week_view = E_WEEK_VIEW (parent);
+
+	if (!is_array_index_in_bounds (week_view->events, event_item->priv->event_num))
+		return;
 
 	event = &g_array_index (week_view->events, EWeekViewEvent,
 				event_item->priv->event_num);
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	cr = gdk_cairo_create (drawable);
 
 	points[0].x = x;
@@ -621,12 +667,15 @@ week_view_event_item_update (GnomeCanvasItem *item,
 	GnomeCanvasItemClass *canvas_item_class;
 	EWeekViewEventItem *event_item;
 	EWeekView *week_view;
+	GtkWidget *parent;
 	gint event_num, span_num;
 	gint span_x, span_y, span_w;
 
 	event_item = E_WEEK_VIEW_EVENT_ITEM (item);
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
+	parent = gtk_widget_get_parent (GTK_WIDGET (item->canvas));
+	g_return_if_fail (E_IS_WEEK_VIEW (parent));
+
+	week_view = E_WEEK_VIEW (parent);
 
 	/* Chain up to parent's update() method. */
 	canvas_item_class = GNOME_CANVAS_ITEM_CLASS (parent_class);
@@ -666,6 +715,7 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item,
 	EWeekViewEventSpan *span;
 	ECalModel *model;
 	GdkGC *gc;
+	GtkWidget *parent;
 	gint x1, y1, x2, y2, time_x, time_y;
 	gint icon_x, icon_y, time_width, min_end_time_x, max_icon_x;
 	gint rect_x, rect_w, rect_x2 = 0;
@@ -686,21 +736,32 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item,
 	const gchar *color_spec;
 
 	event_item = E_WEEK_VIEW_EVENT_ITEM (canvas_item);
-	week_view = E_WEEK_VIEW (GTK_WIDGET (canvas_item->canvas)->parent);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
+	parent = gtk_widget_get_parent (GTK_WIDGET (canvas_item->canvas));
+	g_return_if_fail (E_IS_WEEK_VIEW (parent));
+
+	week_view = E_WEEK_VIEW (parent);
 
 	if (event_item->priv->event_num == -1 || event_item->priv->span_num == -1)
 		return;
 
 	g_return_if_fail (event_item->priv->event_num < week_view->events->len);
 
+	if (!is_array_index_in_bounds (week_view->events, event_item->priv->event_num))
+		return;
+
 	event = &g_array_index (week_view->events, EWeekViewEvent,
 				event_item->priv->event_num);
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	g_return_if_fail (
 		event->spans_index + event_item->priv->span_num <
 		week_view->spans->len);
 
+	if (!is_array_index_in_bounds (week_view->spans, event->spans_index + event_item->priv->span_num))
+		return;
+
 	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
 			       event->spans_index + event_item->priv->span_num);
 
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index eb8de3af9a..3522790401 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -169,11 +169,7 @@ week_view_main_item_draw_day (EWeekViewMainItem *main_item,
 	    || week_view->selection_end_day < day)
 		selected = FALSE;
 	if (selected) {
-#if GTK_CHECK_VERSION(2,19,7)
 		if (gtk_widget_has_focus (GTK_WIDGET (week_view))) {
-#else
-		if (GTK_WIDGET_HAS_FOCUS (week_view)) {
-#endif
 			gdk_cairo_set_source_color (cr, &week_view->colors[E_WEEK_VIEW_COLOR_SELECTED]);
 		} else {
 			gdk_cairo_set_source_color (cr, &week_view->colors[E_WEEK_VIEW_COLOR_SELECTED]);
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index f2d90e7150..ab7a9db652 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -126,9 +126,10 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item,
 	EWeekView *week_view;
 	GtkStyle *style;
 	GdkGC *fg_gc, *light_gc, *dark_gc;
-	gint canvas_width, canvas_height, col_width, col, date_width, date_x;
+	gint col_width, col, date_width, date_x;
 	gchar buffer[128];
 	GdkRectangle clip_rect;
+	GtkAllocation allocation;
 	gboolean abbreviated;
 	gint weekday;
 	PangoLayout *layout;
@@ -137,28 +138,29 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item,
 	week_view = e_week_view_titles_item_get_week_view (titles_item);
 	g_return_if_fail (week_view != NULL);
 
+	gtk_widget_get_allocation (
+		GTK_WIDGET (canvas_item->canvas), &allocation);
+
 	style = gtk_widget_get_style (GTK_WIDGET (week_view));
 	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
 	light_gc = style->light_gc[GTK_STATE_NORMAL];
 	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-	canvas_width = GTK_WIDGET (canvas_item->canvas)->allocation.width;
-	canvas_height = GTK_WIDGET (canvas_item->canvas)->allocation.height;
 	layout = gtk_widget_create_pango_layout (GTK_WIDGET (week_view), NULL);
 
 	/* Draw the shadow around the dates. */
 	gdk_draw_line (drawable, light_gc,
 		       1 - x, 1 - y,
-		       canvas_width - 2 - x, 1 - y);
+		       allocation.width - 2 - x, 1 - y);
 	gdk_draw_line (drawable, light_gc,
 		       1 - x, 2 - y,
-		       1 - x, canvas_height - 1 - y);
+		       1 - x, allocation.height - 1 - y);
 
 	gdk_draw_rectangle (drawable, dark_gc, FALSE,
 			    0 - x, 0 - y,
-			    canvas_width - 1, canvas_height);
+			    allocation.width - 1, allocation.height);
 
 	/* Determine the format to use. */
-	col_width = canvas_width / week_view->columns;
+	col_width = allocation.width / week_view->columns;
 	abbreviated = (week_view->max_day_width + 2 >= col_width);
 
 	/* Shift right one pixel to account for the shadow around the main
@@ -182,7 +184,7 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item,
 		clip_rect.x = week_view->col_offsets[col] - x;
 		clip_rect.y = 2 - y;
 		clip_rect.width = week_view->col_widths[col];
-		clip_rect.height = canvas_height - 2;
+		clip_rect.height = allocation.height - 2;
 		gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
 
 		if (weekday == 5 && week_view->compress_weekend)
@@ -212,22 +214,22 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item,
 				       week_view->col_offsets[col] - x,
 				       4 - y,
 				       week_view->col_offsets[col] - x,
-				       canvas_height - 4 - y);
+				       allocation.height - 4 - y);
 
 			gdk_draw_line (drawable, dark_gc,
 				       week_view->col_offsets[col] - 1 - x,
 				       4 - y,
 				       week_view->col_offsets[col] - 1 - x,
-				       canvas_height - 4 - y);
+				       allocation.height - 4 - y);
 		}
 
 		/* Draw the lines between each column. */
 		if (col != 0) {
 			gdk_draw_line (drawable, style->black_gc,
 				       week_view->col_offsets[col] - x,
-				       canvas_height - y,
+				       allocation.height - y,
 				       week_view->col_offsets[col] - x,
-				       canvas_height - y);
+				       allocation.height - y);
 		}
 
 		if (weekday == 5 && week_view->compress_weekend)
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 696113987b..accafd9ac2 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -405,8 +405,14 @@ week_view_time_range_changed_cb (EWeekView *week_view,
 	/* Reset the adjustment value to 0 if the base address has changed.
 	   Note that we do this after updating first_day_shown so that our
 	   signal handler will not try to reload the events. */
-	if (update_adjustment_value)
-		gtk_adjustment_set_value (GTK_RANGE (week_view->vscrollbar)->adjustment, 0);
+	if (update_adjustment_value) {
+		GtkRange *range;
+		GtkAdjustment *adjustment;
+
+		range = GTK_RANGE (week_view->vscrollbar);
+		adjustment = gtk_range_get_adjustment (range);
+		gtk_adjustment_set_value (adjustment, 0);
+	}
 
 	if (!E_CALENDAR_VIEW (week_view)->in_focus) {
 		e_week_view_free_events (week_view);
@@ -524,6 +530,9 @@ week_view_constructed (GObject *object)
 	ECalModel *model;
 	ECalendarView *calendar_view;
 
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_week_view_parent_class)->constructed (object);
+
 	calendar_view = E_CALENDAR_VIEW (object);
 	model = e_calendar_view_get_model (calendar_view);
 
@@ -687,7 +696,7 @@ e_week_view_init (EWeekView *week_view)
 	GdkPixbuf *pixbuf;
 	gint i;
 
-	GTK_WIDGET_SET_FLAGS (week_view, GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus (GTK_WIDGET (week_view), TRUE);
 
 	week_view->query = NULL;
 	week_view->event_destroyed = FALSE;
@@ -894,12 +903,14 @@ e_week_view_realize (GtkWidget *widget)
 {
 	EWeekView *week_view;
 	GdkColormap *colormap;
+	GdkWindow *window;
 
 	if (GTK_WIDGET_CLASS (e_week_view_parent_class)->realize)
 		(*GTK_WIDGET_CLASS (e_week_view_parent_class)->realize)(widget);
 
 	week_view = E_WEEK_VIEW (widget);
-	week_view->main_gc = gdk_gc_new (widget->window);
+	window = gtk_widget_get_window (widget);
+	week_view->main_gc = gdk_gc_new (window);
 
 	colormap = gtk_widget_get_colormap (widget);
 
@@ -940,17 +951,21 @@ color_inc (GdkColor c, gint amount)
 static void
 e_week_view_set_colors(EWeekView *week_view, GtkWidget *widget)
 {
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS] = widget->style->base[GTK_STATE_INSENSITIVE];
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS] = widget->style->base[GTK_STATE_NORMAL];
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND] = widget->style->base[GTK_STATE_NORMAL];
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER] = widget->style->dark[GTK_STATE_NORMAL];
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_TEXT] = widget->style->text[GTK_STATE_NORMAL];
-	week_view->colors[E_WEEK_VIEW_COLOR_GRID] = widget->style->dark[GTK_STATE_NORMAL];
-	week_view->colors[E_WEEK_VIEW_COLOR_SELECTED] = widget->style->base[GTK_STATE_SELECTED];
-	week_view->colors[E_WEEK_VIEW_COLOR_SELECTED_UNFOCUSSED] = widget->style->bg[GTK_STATE_SELECTED];
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES] = widget->style->text[GTK_STATE_NORMAL];
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED] = widget->style->text[GTK_STATE_SELECTED];
-	week_view->colors[E_WEEK_VIEW_COLOR_TODAY] = widget->style->base[GTK_STATE_SELECTED];
+	GtkStyle *style;
+
+	style = gtk_widget_get_style (widget);
+
+	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS] = style->base[GTK_STATE_INSENSITIVE];
+	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS] = style->base[GTK_STATE_NORMAL];
+	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND] = style->base[GTK_STATE_NORMAL];
+	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER] = style->dark[GTK_STATE_NORMAL];
+	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_TEXT] = style->text[GTK_STATE_NORMAL];
+	week_view->colors[E_WEEK_VIEW_COLOR_GRID] = style->dark[GTK_STATE_NORMAL];
+	week_view->colors[E_WEEK_VIEW_COLOR_SELECTED] = style->base[GTK_STATE_SELECTED];
+	week_view->colors[E_WEEK_VIEW_COLOR_SELECTED_UNFOCUSSED] = style->bg[GTK_STATE_SELECTED];
+	week_view->colors[E_WEEK_VIEW_COLOR_DATES] = style->text[GTK_STATE_NORMAL];
+	week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED] = style->text[GTK_STATE_SELECTED];
+	week_view->colors[E_WEEK_VIEW_COLOR_TODAY] = style->base[GTK_STATE_SELECTED];
 	week_view->colors[E_WEEK_VIEW_COLOR_TODAY_BACKGROUND] = get_today_background (week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND]);
 	week_view->colors[E_WEEK_VIEW_COLOR_MONTH_NONWORKING_DAY] = color_inc (week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS], -0x0A0A);
 }
@@ -1021,6 +1036,7 @@ get_digit_width (PangoLayout *layout)
 static GdkColor
 e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidget *widget)
 {
+	GtkStyle *style;
 	GdkColor bg_color;
 	guint16 red, green, blue;
 	gdouble	cc = 65535.0;
@@ -1029,7 +1045,7 @@ e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidg
 	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),
+	if (is_comp_data_valid (event) && 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));
@@ -1040,10 +1056,12 @@ e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidg
                 }
 	}
 
+	style = gtk_widget_get_style (widget);
+
 	if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
-		return widget->style->black;
+		return style->black;
 	else
-		return widget->style->white;
+		return style->white;
 }
 
 static void
@@ -1075,9 +1093,10 @@ e_week_view_style_set (GtkWidget *widget,
 			span = &g_array_index (week_view->spans,
 					EWeekViewEventSpan, span_num);
 			if (span->text_item) {
-				gnome_canvas_item_set (span->text_item,
-						"fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
-						NULL);
+				gnome_canvas_item_set (
+					span->text_item,
+					"fill_color_gdk", &style->text[GTK_STATE_NORMAL],
+					NULL);
 			}
 		}
 	}
@@ -1169,6 +1188,7 @@ static void
 e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 {
 	EWeekView *week_view;
+	GtkAllocation canvas_allocation;
 	gdouble old_x2, old_y2, new_x2, new_y2;
 
 	week_view = E_WEEK_VIEW (widget);
@@ -1178,23 +1198,31 @@ e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 	e_week_view_recalc_cell_sizes (week_view);
 
 	/* Set the scroll region of the top canvas to its allocated size. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view->titles_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = week_view->titles_canvas->allocation.width - 1;
-	new_y2 = week_view->titles_canvas->allocation.height - 1;
+	gnome_canvas_get_scroll_region (
+		GNOME_CANVAS (week_view->titles_canvas),
+		NULL, NULL, &old_x2, &old_y2);
+	gtk_widget_get_allocation (
+		week_view->titles_canvas, &canvas_allocation);
+	new_x2 = canvas_allocation.width - 1;
+	new_y2 = canvas_allocation.height - 1;
 	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view->titles_canvas),
-						0, 0, new_x2, new_y2);
+		gnome_canvas_set_scroll_region (
+			GNOME_CANVAS (week_view->titles_canvas),
+			0, 0, new_x2, new_y2);
 
 	/* Set the scroll region of the main canvas to its allocated width,
 	   but with the height depending on the number of rows needed. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view->main_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = week_view->main_canvas->allocation.width - 1;
-	new_y2 = week_view->main_canvas->allocation.height - 1;
+	gnome_canvas_get_scroll_region (
+		GNOME_CANVAS (week_view->main_canvas),
+		NULL, NULL, &old_x2, &old_y2);
+	gtk_widget_get_allocation (
+		week_view->main_canvas, &canvas_allocation);
+	new_x2 = canvas_allocation.width - 1;
+	new_y2 = canvas_allocation.height - 1;
 	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view->main_canvas),
-						0, 0, new_x2, new_y2);
+		gnome_canvas_set_scroll_region (
+			GNOME_CANVAS (week_view->main_canvas),
+			0, 0, new_x2, new_y2);
 
 	/* Flag that we need to reshape the events. */
 	if (old_x2 != new_x2 || old_y2 != new_y2) {
@@ -1208,6 +1236,7 @@ e_week_view_recalc_cell_sizes (EWeekView *week_view)
 {
 	gfloat canvas_width, canvas_height, offset;
 	gint row, col;
+	GtkAllocation allocation;
 	GtkWidget *widget;
 	GtkStyle *style;
 	gint width, height, time_width;
@@ -1223,12 +1252,14 @@ e_week_view_recalc_cell_sizes (EWeekView *week_view)
 		week_view->columns = 2;
 	}
 
+	gtk_widget_get_allocation (week_view->main_canvas, &allocation);
+
 	/* Calculate the column sizes, using floating point so that pixels
 	   get divided evenly. Note that we use one more element than the
 	   number of columns, to make it easy to get the column widths.
 	   We also add one to the width so that the right border of the last
 	   column is off the edge of the displayed area. */
-	canvas_width = week_view->main_canvas->allocation.width + 1;
+	canvas_width = allocation.width + 1;
 	canvas_width /= week_view->columns;
 	offset = 0;
 	for (col = 0; col <= week_view->columns; col++) {
@@ -1243,7 +1274,7 @@ e_week_view_recalc_cell_sizes (EWeekView *week_view)
 	}
 
 	/* Now do the same for the row heights. */
-	canvas_height = week_view->main_canvas->allocation.height + 1;
+	canvas_height = allocation.height + 1;
 	canvas_height /= week_view->rows;
 	offset = 0;
 	for (row = 0; row <= week_view->rows; row++) {
@@ -1491,9 +1522,16 @@ e_week_view_focus (GtkWidget *widget, GtkDirectionType direction)
 			EWeekViewEventSpan *span;
 			gint current_day;
 
+			if (!is_array_index_in_bounds (week_view->events, new_event_num))
+				break;
+
 			event = &g_array_index (week_view->events,
 						EWeekViewEvent,
 						new_event_num);
+
+			if (!is_array_index_in_bounds (week_view->spans, event->spans_index + new_span_num))
+				break;
+
 			span = &g_array_index (week_view->spans,
 					       EWeekViewEventSpan,
 					       event->spans_index + new_span_num);
@@ -1523,9 +1561,15 @@ e_week_view_get_selected_events (ECalendarView *cal_view)
 	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), NULL);
 
 	if (week_view->editing_event_num != -1) {
+		if (!is_array_index_in_bounds (week_view->events, week_view->editing_event_num))
+			return NULL;
+
 		event = &g_array_index (week_view->events, EWeekViewEvent,
 					week_view->editing_event_num);
 	} else if (week_view->popup_event_num != -1) {
+		if (!is_array_index_in_bounds (week_view->events, week_view->popup_event_num))
+			return NULL;
+
 		event = &g_array_index (week_view->events, EWeekViewEvent,
 					week_view->popup_event_num);
 	}
@@ -1565,22 +1609,25 @@ e_week_view_update_query (EWeekView *week_view)
 static void
 e_week_view_draw_shadow (EWeekView *week_view)
 {
+	GtkAllocation allocation;
 	gint x1, y1, x2, y2;
 	GtkStyle *style;
 	GdkGC *light_gc, *dark_gc;
 	GdkWindow *window;
 
+	gtk_widget_get_allocation (week_view->main_canvas, &allocation);
+
 	/* Draw the shadow around the graphical displays. */
-	x1 = week_view->main_canvas->allocation.x - 1;
-	y1 = week_view->main_canvas->allocation.y - 1;
-	x2 = x1 + week_view->main_canvas->allocation.width + 2;
-	y2 = y1 + week_view->main_canvas->allocation.height + 2;
+	x1 = allocation.x - 1;
+	y1 = allocation.y - 1;
+	x2 = x1 + allocation.width + 2;
+	y2 = y1 + allocation.height + 2;
 
-	style = GTK_WIDGET (week_view)->style;
+	style = gtk_widget_get_style (GTK_WIDGET (week_view));
 	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
 	light_gc = style->light_gc[GTK_STATE_NORMAL];
 
-	window = GTK_WIDGET (week_view)->window;
+	window = gtk_widget_get_window (GTK_WIDGET (week_view));
 	gdk_draw_line (window, dark_gc, x1, y1, x1, y2);
 	gdk_draw_line (window, dark_gc, x1, y1, x2, y1);
 	gdk_draw_line (window, light_gc, x2, y1, x2, y2);
@@ -1634,8 +1681,14 @@ e_week_view_set_selected_time_range	(ECalendarView	*cal_view,
 	/* Reset the adjustment value to 0 if the base address has changed.
 	   Note that we do this after updating first_day_shown so that our
 	   signal handler will not try to reload the events. */
-	if (update_adjustment_value)
-		gtk_adjustment_set_value (GTK_RANGE (week_view->vscrollbar)->adjustment, 0);
+	if (update_adjustment_value) {
+		GtkRange *range;
+		GtkAdjustment *adjustment;
+
+		range = GTK_RANGE (week_view->vscrollbar);
+		adjustment = gtk_range_get_adjustment (range);
+		gtk_adjustment_set_value (adjustment, 0);
+	}
 
 	gtk_widget_queue_draw (week_view->main_canvas);
 }
@@ -1813,8 +1866,14 @@ e_week_view_set_first_day_shown		(EWeekView	*week_view,
 	/* Reset the adjustment value to 0 if the base address has changed.
 	   Note that we do this after updating first_day_shown so that our
 	   signal handler will not try to reload the events. */
-	if (update_adjustment_value)
-		gtk_adjustment_set_value (GTK_RANGE (week_view->vscrollbar)->adjustment, 0);
+	if (update_adjustment_value) {
+		GtkRange *range;
+		GtkAdjustment *adjustment;
+
+		range = GTK_RANGE (week_view->vscrollbar);
+		adjustment = gtk_range_get_adjustment (range);
+		gtk_adjustment_set_value (adjustment, 0);
+	}
 
 	e_week_view_update_query (week_view);
 	gtk_widget_queue_draw (week_view->main_canvas);
@@ -1865,6 +1924,7 @@ void
 e_week_view_set_multi_week_view	(EWeekView	*week_view,
 				 gboolean	 multi_week_view)
 {
+	GtkRange *range;
 	GtkAdjustment *adjustment;
 	gint page_increment, page_size;
 
@@ -1899,10 +1959,10 @@ e_week_view_set_multi_week_view	(EWeekView	*week_view,
 		}
 	}
 
-	adjustment = GTK_RANGE (week_view->vscrollbar)->adjustment;
-	adjustment->page_increment = page_increment;
-	adjustment->page_size = page_size;
-	gtk_adjustment_changed (adjustment);
+	range = GTK_RANGE (week_view->vscrollbar);
+	adjustment = gtk_range_get_adjustment (range);
+	gtk_adjustment_set_page_increment (adjustment, page_increment);
+	gtk_adjustment_set_page_size (adjustment, page_size);
 
 	e_week_view_recalc_cell_sizes (week_view);
 
@@ -1939,6 +1999,7 @@ void
 e_week_view_set_weeks_shown	(EWeekView	*week_view,
 				 gint		 weeks_shown)
 {
+	GtkRange *range;
 	GtkAdjustment *adjustment;
 	gint page_increment, page_size;
 
@@ -1960,10 +2021,10 @@ e_week_view_set_weeks_shown	(EWeekView	*week_view,
 			page_size = 5;
 		}
 
-		adjustment = GTK_RANGE (week_view->vscrollbar)->adjustment;
-		adjustment->page_increment = page_increment;
-		adjustment->page_size = page_size;
-		gtk_adjustment_changed (adjustment);
+		range = GTK_RANGE (week_view->vscrollbar);
+		adjustment = gtk_range_get_adjustment (range);
+		gtk_adjustment_set_page_increment (adjustment, page_increment);
+		gtk_adjustment_set_page_size (adjustment, page_size);
 
 		e_week_view_recalc_cell_sizes (week_view);
 
@@ -2083,6 +2144,9 @@ set_text_as_bold (EWeekViewEvent *event, EWeekViewEventSpan *span)
 	gchar *address;
 	ECalComponentAttendee *at = NULL;
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 	address = itip_get_comp_attendee (comp, event->comp_data->client);
@@ -2128,6 +2192,9 @@ e_week_view_foreach_event_with_uid (EWeekView *week_view,
 		event = &g_array_index (week_view->events, EWeekViewEvent,
 					event_num);
 
+		if (!is_comp_data_valid (event))
+			continue;
+
 		u = icalcomponent_get_uid (event->comp_data->icalcomp);
 		if (u && !strcmp (uid, u)) {
 			if (!(*callback) (week_view, event_num, data))
@@ -2145,6 +2212,9 @@ e_week_view_remove_event_cb (EWeekView *week_view,
 	EWeekViewEventSpan *span;
 	gint span_num;
 
+	if (!is_array_index_in_bounds (week_view->events, event_num))
+		return TRUE;
+
 	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
 	if (!event)
 		return TRUE;
@@ -2157,13 +2227,17 @@ e_week_view_remove_event_cb (EWeekView *week_view,
 	if (week_view->popup_event_num == event_num)
 		week_view->popup_event_num = -1;
 
-	g_object_unref (event->comp_data);
+	if (is_comp_data_valid (event))
+		g_object_unref (event->comp_data);
 	event->comp_data = NULL;
 
 	if (week_view->spans) {
 		/* We leave the span elements in the array, but set the canvas item
 		   pointers to NULL. */
 		for (span_num = 0; span_num < event->num_spans; span_num++) {
+			if (!is_array_index_in_bounds (week_view->spans, event->spans_index + span_num))
+				break;
+
 			span = &g_array_index (week_view->spans, EWeekViewEventSpan,
 					       event->spans_index + span_num);
 
@@ -2261,6 +2335,9 @@ e_week_view_get_span_position	(EWeekView	*week_view,
 
 	g_return_val_if_fail (span_num < event->num_spans, FALSE);
 
+	if (!is_array_index_in_bounds (week_view->spans, event->spans_index + span_num))
+		return FALSE;
+
 	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
 			       event->spans_index + span_num);
 
@@ -2303,7 +2380,14 @@ ewv_pass_gdkevent_to_etext (EWeekView *week_view, GdkEvent *gevent)
 		EWeekViewEvent *event;
 		EWeekViewEventSpan *span;
 
+		if (!is_array_index_in_bounds (week_view->events, week_view->editing_event_num))
+			return FALSE;
+
 		event = &g_array_index (week_view->events, EWeekViewEvent, week_view->editing_event_num);
+
+		if (!is_array_index_in_bounds (week_view->spans, event->spans_index + week_view->editing_span_num))
+			return FALSE;
+
 		span = &g_array_index (week_view->spans, EWeekViewEventSpan, event->spans_index + week_view->editing_span_num);
 
 		if (span->text_item && E_IS_TEXT (span->text_item)) {
@@ -2356,15 +2440,15 @@ e_week_view_on_button_press (GtkWidget *widget,
 	}
 
 	if (event->button == 1) {
+		GdkWindow *window;
+
 		/* Start the selection drag. */
-#if GTK_CHECK_VERSION(2,19,7)
 		if (!gtk_widget_has_focus (GTK_WIDGET (week_view)) &&  !gtk_widget_has_focus (GTK_WIDGET (week_view->main_canvas)))
-#else
-		if (!GTK_WIDGET_HAS_FOCUS (week_view) &&  !GTK_WIDGET_HAS_FOCUS (week_view->main_canvas))
-#endif
 			gtk_widget_grab_focus (GTK_WIDGET (week_view));
 
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
+		window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
+
+		if (gdk_pointer_grab (window, FALSE,
 				      GDK_POINTER_MOTION_MASK
 				      | GDK_BUTTON_RELEASE_MASK,
 				      NULL, NULL, event->time) == 0) {
@@ -2380,11 +2464,7 @@ e_week_view_on_button_press (GtkWidget *widget,
 			gtk_widget_queue_draw (week_view->main_canvas);
 		}
 	} else if (event->button == 3) {
-#if GTK_CHECK_VERSION(2,19,7)
 		if (!gtk_widget_has_focus (GTK_WIDGET (week_view)))
-#else
-		if (!GTK_WIDGET_HAS_FOCUS (week_view))
-#endif
 			gtk_widget_grab_focus (GTK_WIDGET (week_view));
 
 		if (day < week_view->selection_start_day || day > week_view->selection_end_day) {
@@ -2426,8 +2506,14 @@ e_week_view_on_scroll (GtkWidget *widget,
 		       GdkEventScroll *scroll,
 		       EWeekView *week_view)
 {
-	GtkAdjustment *adj = GTK_RANGE (week_view->vscrollbar)->adjustment;
-	gfloat new_value;
+	GtkRange *range;
+	GtkAdjustment *adjustment;
+	gdouble page_increment;
+	gdouble new_value;
+	gdouble page_size;
+	gdouble lower;
+	gdouble upper;
+	gdouble value;
 	GtkWidget *tool_window = g_object_get_data (G_OBJECT (week_view), "tooltip-window");
 	guint timeout;
 
@@ -2442,19 +2528,28 @@ e_week_view_on_scroll (GtkWidget *widget,
 		g_object_set_data (G_OBJECT (week_view), "tooltip-window", NULL);
 	}
 
+	range = GTK_RANGE (week_view->vscrollbar);
+	adjustment = gtk_range_get_adjustment (range);
+
+	page_increment = gtk_adjustment_get_page_increment (adjustment);
+	page_size = gtk_adjustment_get_page_size (adjustment);
+	lower = gtk_adjustment_get_lower (adjustment);
+	upper = gtk_adjustment_get_upper (adjustment);
+	value = gtk_adjustment_get_value (adjustment);
+
 	switch (scroll->direction) {
-	case GDK_SCROLL_UP:
-		new_value = adj->value - adj->page_increment;
-		break;
-	case GDK_SCROLL_DOWN:
-		new_value = adj->value + adj->page_increment;
-		break;
-	default:
-		return FALSE;
+		case GDK_SCROLL_UP:
+			new_value = value - page_increment;
+			break;
+		case GDK_SCROLL_DOWN:
+			new_value = value + page_increment;
+			break;
+		default:
+			return FALSE;
 	}
 
-	new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-	gtk_adjustment_set_value (adj, new_value);
+	new_value = CLAMP (new_value, lower, upper - page_size);
+	gtk_adjustment_set_value (adjustment, new_value);
 
 	return TRUE;
 }
@@ -2603,7 +2698,9 @@ e_week_view_free_events (EWeekView *week_view)
 	for (event_num = 0; event_num < week_view->events->len; event_num++) {
 		event = &g_array_index (week_view->events, EWeekViewEvent,
 					event_num);
-		g_object_unref (event->comp_data);
+
+		if (is_comp_data_valid (event))
+			g_object_unref (event->comp_data);
 	}
 
 	g_array_set_size (week_view->events, 0);
@@ -2785,6 +2882,9 @@ e_week_view_reshape_events (EWeekView *week_view)
 	for (event_num = 0; event_num < week_view->events->len; event_num++) {
 		event = &g_array_index (week_view->events, EWeekViewEvent,
 					event_num);
+		if (!is_comp_data_valid (event))
+			continue;
+
 		for (span_num = 0; span_num < event->num_spans; span_num++) {
 			gchar *current_comp_string;
 
@@ -2795,6 +2895,12 @@ e_week_view_reshape_events (EWeekView *week_view)
 			current_comp_string = icalcomponent_as_ical_string_r (event->comp_data->icalcomp);
 			if (strncmp (current_comp_string, week_view->last_edited_comp_string,50) == 0) {
 				EWeekViewEventSpan *span;
+
+				if (!is_array_index_in_bounds (week_view->spans, event->spans_index + span_num)) {
+					g_free (current_comp_string);
+					continue;
+				}
+
 				span = &g_array_index (week_view->spans, EWeekViewEventSpan, event->spans_index + span_num);
 				e_canvas_item_grab_focus (span->text_item, TRUE);
 				g_free (week_view->last_edited_comp_string);
@@ -2843,6 +2949,9 @@ tooltip_get_view_event (EWeekView *week_view, gint day, gint event_num)
 {
 	EWeekViewEvent *pevent;
 
+	if (!is_array_index_in_bounds (week_view->events, event_num))
+		return NULL;
+
 	pevent = &g_array_index (week_view->events, EWeekViewEvent, event_num);
 
 	return pevent;
@@ -2941,7 +3050,17 @@ e_week_view_reshape_event_span (EWeekView *week_view,
 	PangoFontMetrics *font_metrics;
 	PangoLayout *layout;
 
+	if (!is_array_index_in_bounds (week_view->events, event_num))
+		return;
+
 	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
+
+	if (!is_comp_data_valid (event))
+		return;
+
+	if (!is_array_index_in_bounds (week_view->spans, event->spans_index + span_num))
+		return;
+
 	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
 			       event->spans_index + span_num);
 	comp = e_cal_component_new ();
@@ -3211,7 +3330,17 @@ e_week_view_start_editing_event (EWeekView *week_view,
 	    && span_num == week_view->editing_span_num)
 		return TRUE;
 
+	if (!is_array_index_in_bounds (week_view->events, event_num))
+		return FALSE;
+
 	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
+
+	if (!is_comp_data_valid (event))
+		return FALSE;
+
+	if (!is_array_index_in_bounds (week_view->spans, event->spans_index + span_num))
+		return FALSE;
+
 	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
 			       event->spans_index + span_num);
 
@@ -3223,7 +3352,12 @@ e_week_view_start_editing_event (EWeekView *week_view,
 		return FALSE;
 
 	if (week_view->editing_event_num >= 0) {
-		EWeekViewEvent *editing = &g_array_index (week_view->events, EWeekViewEvent, week_view->editing_event_num);
+		EWeekViewEvent *editing;
+
+		if (!is_array_index_in_bounds (week_view->events, week_view->editing_event_num))
+			return FALSE;
+
+		editing = &g_array_index (week_view->events, EWeekViewEvent, week_view->editing_event_num);
 
 		/* do not change to other part of same component - the event is spread into more days */
 		if (editing && event && editing->comp_data == event->comp_data)
@@ -3260,6 +3394,10 @@ e_week_view_start_editing_event (EWeekView *week_view,
 		}
 		g_return_val_if_fail (event_num >= 0, FALSE);
 	}
+
+	if (!is_array_index_in_bounds (week_view->spans, event->spans_index + span_num))
+		return FALSE;
+
 	span = &g_array_index (week_view->spans, EWeekViewEventSpan,  event->spans_index + span_num);
 
 	/* Try to move the cursor to the end of the text. */
@@ -3304,7 +3442,17 @@ cancel_editing (EWeekView *week_view)
 
 	g_return_if_fail (event_num != -1);
 
+	if (!is_array_index_in_bounds (week_view->events, event_num))
+		return;
+
 	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
+
+	if (!is_comp_data_valid (event))
+		return;
+
+	if (!is_array_index_in_bounds (week_view->spans, event->spans_index + span_num))
+		return;
+
 	span = &g_array_index (week_view->spans, EWeekViewEventSpan, event->spans_index + span_num);
 
 	/* Reset the text to what was in the component */
@@ -3360,9 +3508,15 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 						       &event_num, &span_num))
 			return FALSE;
 
+		if (!is_array_index_in_bounds (week_view->events, event_num))
+			return FALSE;
+
 		event = &g_array_index (week_view->events, EWeekViewEvent,
 					event_num);
 
+		if (!is_comp_data_valid (event))
+			return FALSE;
+
 		/* if we started to editing new item on the canvas, then do not open editing dialog until it's saved,
 		   because the save of the event recalculates event numbers and you can edit different one */
 		if (!is_icalcomp_on_the_server (event->comp_data->icalcomp, event->comp_data->client))
@@ -3389,13 +3543,12 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 				return FALSE;
 			}
 
+			if (!is_array_index_in_bounds (week_view->events, event_num))
+				return FALSE;
+
 			e = &g_array_index (week_view->events, EWeekViewEvent, event_num);
 
-#if GTK_CHECK_VERSION(2,19,7)
 			if (!gtk_widget_has_focus (GTK_WIDGET (week_view)))
-#else
-			if (!GTK_WIDGET_HAS_FOCUS (week_view))
-#endif
 				gtk_widget_grab_focus (GTK_WIDGET (week_view));
 
 			e_week_view_set_selected_time_range_visible (week_view, e->start, e->end);
@@ -3530,8 +3683,14 @@ static gboolean e_week_view_event_move (ECalendarView *cal_view, ECalViewMoveDir
 	if (event_num == -1)
 		return FALSE;
 
+	if (!is_array_index_in_bounds (week_view->events, event_num))
+		return FALSE;
+
 	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
 
+	if (!is_comp_data_valid (event))
+		return FALSE;
+
 	end_dt = event->end;
 	start_time = icalcomponent_get_dtstart (event->comp_data->icalcomp);
 	end_time = icalcomponent_get_dtend (event->comp_data->icalcomp);
@@ -3601,27 +3760,43 @@ e_week_view_get_day_offset_of_event (EWeekView *week_view, time_t event_time)
 void
 e_week_view_scroll_a_step (EWeekView *week_view, ECalViewMoveDirection direction)
 {
-	GtkAdjustment *adj = GTK_RANGE (week_view->vscrollbar)->adjustment;
-	gfloat new_value;
+	GtkAdjustment *adjustment;
+	GtkRange *range;
+	gdouble step_increment;
+	gdouble page_size;
+	gdouble new_value;
+	gdouble lower;
+	gdouble upper;
+	gdouble value;
+
+	range = GTK_RANGE (week_view->vscrollbar);
+	adjustment = gtk_range_get_adjustment (range);
+
+	step_increment = gtk_adjustment_get_step_increment (adjustment);
+	page_size = gtk_adjustment_get_page_size (adjustment);
+	lower = gtk_adjustment_get_lower (adjustment);
+	upper = gtk_adjustment_get_upper (adjustment);
+	value = gtk_adjustment_get_value (adjustment);
 
 	switch (direction) {
-	case E_CAL_VIEW_MOVE_UP:
-		new_value = adj->value - adj->step_increment;
-		break;
-	case E_CAL_VIEW_MOVE_DOWN:
-		new_value = adj->value + adj->step_increment;
-		break;
-	case E_CAL_VIEW_MOVE_PAGE_UP:
-		new_value = adj->value - adj->page_size;
-		break;
-	case E_CAL_VIEW_MOVE_PAGE_DOWN:
-		new_value = adj->value + adj->page_size;
-		break;
-	default:
-		return;
+		case E_CAL_VIEW_MOVE_UP:
+			new_value = value - step_increment;
+			break;
+		case E_CAL_VIEW_MOVE_DOWN:
+			new_value = value + step_increment;
+			break;
+		case E_CAL_VIEW_MOVE_PAGE_UP:
+			new_value = value - page_size;
+			break;
+		case E_CAL_VIEW_MOVE_PAGE_DOWN:
+			new_value = value + page_size;
+			break;
+		default:
+			return;
 	}
-	new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-	gtk_adjustment_set_value (adj, new_value);
+
+	new_value = CLAMP (new_value, lower, upper - page_size);
+	gtk_adjustment_set_value (adjustment, new_value);
 }
 
 static void
@@ -3642,7 +3817,14 @@ e_week_view_change_event_time (EWeekView *week_view, time_t start_dt, time_t end
 	if (event_num == -1)
 		return;
 
+	if (!is_array_index_in_bounds (week_view->events, event_num))
+		return;
+
 	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
+
+	if (!is_comp_data_valid (event))
+		return;
+
 	client = event->comp_data->client;
 
 	/* We use a temporary shallow copy of the ico since we don't want to
@@ -3749,7 +3931,17 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
 	if (event_num == -1)
 		return;
 
+	if (!is_array_index_in_bounds (week_view->events, event_num))
+		return;
+
 	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
+
+	if (!is_comp_data_valid (event))
+		return;
+
+	if (!is_array_index_in_bounds (week_view->spans, event->spans_index + span_num))
+		return;
+
 	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
 			       event->spans_index + span_num);
 
@@ -3898,6 +4090,9 @@ e_week_view_find_event_from_item (EWeekView	  *week_view,
 		event = &g_array_index (week_view->events, EWeekViewEvent,
 					event_num);
 		for (span_num = 0; span_num < event->num_spans; span_num++) {
+			if (!is_array_index_in_bounds (week_view->spans, event->spans_index + span_num))
+				continue;
+
 			span = &g_array_index (week_view->spans,
 					       EWeekViewEventSpan,
 					       event->spans_index + span_num);
@@ -3940,6 +4135,9 @@ e_week_view_find_event_from_uid (EWeekView	  *week_view,
 		event = &g_array_index (week_view->events, EWeekViewEvent,
 					event_num);
 
+		if (!is_comp_data_valid (event))
+			continue;
+
 		if (event->comp_data->client != client)
 			continue;
 
@@ -3971,10 +4169,16 @@ e_week_view_is_one_day_event	(EWeekView	*week_view,
 	EWeekViewEvent *event;
 	EWeekViewEventSpan *span;
 
+	if (!is_array_index_in_bounds (week_view->events, event_num))
+		return FALSE;
+
 	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
 	if (event->num_spans != 1)
 		return FALSE;
 
+	if (!is_array_index_in_bounds (week_view->spans, event->spans_index))
+		return FALSE;
+
 	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
 			       event->spans_index);
 
@@ -4103,8 +4307,15 @@ e_week_view_add_new_event_in_selected_range (EWeekView *week_view, const gchar *
 		return FALSE;
 	}
 
+	if (!is_array_index_in_bounds (week_view->events, event_num))
+		return FALSE;
+
 	wvevent = &g_array_index (week_view->events, EWeekViewEvent,
 				  event_num);
+
+	if (!is_array_index_in_bounds (week_view->spans, wvevent->spans_index + 0))
+		return FALSE;
+
 	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
 			       wvevent->spans_index + 0);
 
@@ -4484,8 +4695,15 @@ e_week_view_paste_text (ECalendarView *cal_view)
 	    !e_week_view_add_new_event_in_selected_range (week_view, NULL))
 		return;
 
+	if (!is_array_index_in_bounds (week_view->events, week_view->editing_event_num))
+		return;
+
 	event = &g_array_index (week_view->events, EWeekViewEvent,
 				week_view->editing_event_num);
+
+	if (!is_array_index_in_bounds (week_view->spans, event->spans_index + week_view->editing_span_num))
+		return;
+
 	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
 			       event->spans_index + week_view->editing_span_num);
 
diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c
index 230d7ca84f..b2bdc5c4b3 100644
--- a/calendar/gui/ea-cal-view-event.c
+++ b/calendar/gui/ea-cal-view-event.c
@@ -198,9 +198,17 @@ ea_cal_view_event_new (GObject *obj)
 						       &event_num,
 						       &span_num))
 			return NULL;
+
+		if (!is_array_index_in_bounds (week_view->events, event_num))
+			return NULL;
+
 		week_view_event = &g_array_index (week_view->events,
 						  EWeekViewEvent,
 						  event_num);
+
+		if (!is_array_index_in_bounds (week_view->spans, week_view_event->spans_index))
+			return NULL;
+
 		/* get the first span */
 		event_span = &g_array_index (week_view->spans,
 					     EWeekViewEventSpan,
@@ -269,6 +277,8 @@ ea_cal_view_event_get_name (AtkObject *accessible)
 	if (!g_obj || !E_IS_TEXT (g_obj))
 		return NULL;
 	event = ea_calendar_helpers_get_cal_view_event_from (GNOME_CANVAS_ITEM(g_obj));
+	if (!is_comp_data_valid (event))
+		return NULL;
 
 	alarm_string = recur_string = meeting_string = "";
 	if (event && event->comp_data) {
@@ -445,6 +455,7 @@ ea_cal_view_get_extents (AtkComponent   *component,
 	ECalendarView *cal_view;
 	gint item_x, item_y, item_w, item_h;
 	GtkWidget *canvas = NULL;
+	GdkWindow *window;
 
 	g_return_if_fail (EA_IS_CAL_VIEW_EVENT (component));
 
@@ -509,8 +520,8 @@ ea_cal_view_get_extents (AtkComponent   *component,
 	if (!canvas)
 		return;
 
-	gdk_window_get_origin (canvas->window,
-			       &x_window, &y_window);
+	window = gtk_widget_get_window (canvas);
+	gdk_window_get_origin (window, &x_window, &y_window);
 	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (canvas), &scroll_x, &scroll_y);
 
 	*x = item_x + x_window - scroll_x;
@@ -519,10 +530,10 @@ ea_cal_view_get_extents (AtkComponent   *component,
 	*height = item_h;
 
 	if (coord_type == ATK_XY_WINDOW) {
-		GdkWindow *window;
 		gint x_toplevel, y_toplevel;
 
-		window = gdk_window_get_toplevel (GTK_WIDGET (cal_view)->window);
+		window = gtk_widget_get_window (GTK_WIDGET (cal_view));
+		window = gdk_window_get_toplevel (window);
 		gdk_window_get_origin (window, &x_toplevel, &y_toplevel);
 
 		*x -= x_toplevel;
diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index ceffaa0483..67969c75ec 100644
--- a/calendar/gui/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
@@ -331,11 +331,7 @@ action_interface_do_action (AtkAction *action, gint index)
 		 */
 		return FALSE;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_sensitive (widget) || !gtk_widget_get_visible (widget))
-#else
-	if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
-#endif
 		return FALSE;
 
 	cal_view = E_CALENDAR_VIEW (widget);
@@ -399,11 +395,7 @@ action_interface_get_keybinding (AtkAction *action, gint index)
 		 */
 		return NULL;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_sensitive (widget) || !gtk_widget_get_visible (widget))
-#else
-	if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
-#endif
 		return NULL;
 
 	 switch (index) {
diff --git a/calendar/gui/ea-day-view.c b/calendar/gui/ea-day-view.c
index c75bf89f7b..d197f49e04 100644
--- a/calendar/gui/ea-day-view.c
+++ b/calendar/gui/ea-day-view.c
@@ -133,11 +133,7 @@ ea_day_view_get_name (AtkObject *accessible)
 
 	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
 	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view));
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_visible (GTK_WIDGET (gcal)))
-#else
-	if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (gcal)))
-#endif
 		return NULL;
 
 	label_text = ea_gnome_calendar_get_label_description (gcal);
diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c
index c3b4658e78..a34326cf74 100644
--- a/calendar/gui/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
@@ -134,11 +134,7 @@ ea_week_view_get_name (AtkObject *accessible)
 
 	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
 	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view));
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_visible (GTK_WIDGET (gcal)))
-#else
-	if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (gcal)))
-#endif
 		return NULL;
 
 	label_text = ea_gnome_calendar_get_label_description (gcal);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index f22e70efc7..a24dfa26ed 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -138,7 +138,6 @@ struct _GnomeCalendarPrivate {
 enum {
 	PROP_0,
 	PROP_DATE_NAVIGATOR,
-	PROP_SHELL_SETTINGS,
 	PROP_VIEW,
 	PROP_MEMO_TABLE,
 	PROP_TASK_TABLE
@@ -231,14 +230,17 @@ update_adjustment (GnomeCalendar *gcal,
 	time_t lower;
 	guint32 old_first_day_julian, new_first_day_julian;
 	icaltimezone *timezone;
+	gdouble value;
 
 	/* If we don't have a valid date set yet, just return. */
 	if (!g_date_valid (&week_view->first_day_shown))
 		return;
 
+	value = gtk_adjustment_get_value (adjustment);
+
 	/* Determine the first date shown. */
 	date = week_view->base_date;
-	week_offset = floor (adjustment->value + 0.5);
+	week_offset = floor (value + 0.5);
 	g_date_add_days (&date, week_offset * 7);
 
 	/* Convert the old & new first days shown to julian values. */
@@ -2087,11 +2089,7 @@ gnome_calendar_update_date_navigator (GnomeCalendar *gcal)
 		return;
 
 	/* If the ECalendar isn't visible, we just return. */
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_visible (GTK_WIDGET (priv->date_navigator)))
-#else
-	if (!GTK_WIDGET_VISIBLE (priv->date_navigator))
-#endif
 		return;
 
 	if (priv->current_view_type == GNOME_CAL_LIST_VIEW && !priv->lview_select_daten_range)
diff --git a/calendar/gui/goto-dialog.ui b/calendar/gui/goto-dialog.ui
index 2e9fbf19d0..a7e3014712 100644
--- a/calendar/gui/goto-dialog.ui
+++ b/calendar/gui/goto-dialog.ui
@@ -81,7 +81,7 @@
                 <property name="visible">True</property>
                 <property name="can_default">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">_Select Today</property>
+                <property name="label" translatable="yes">Select _Today</property>
                 <property name="use_underline">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 9fe0f1bdb6..d40a7ac633 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -38,7 +38,6 @@
 #include "dialogs/comp-editor-util.h"
 
 #include <composer/e-msg-composer.h>
-#include <camel/camel-mime-filter-tohtml.h>
 
 static const gchar *itip_methods[] = {
 	"PUBLISH",
@@ -1194,7 +1193,7 @@ append_cal_attachments (EMsgComposer *composer,
 			camel_mime_part_set_disposition (
 				attachment, "attachment");
 		e_msg_composer_attach (composer, attachment);
-		camel_object_unref (attachment);
+		g_object_unref (attachment);
 
 		g_free (mime_attach->filename);
 		g_free (mime_attach->content_type);
@@ -1363,7 +1362,7 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
 			camel_mime_part_set_description (attachment, description);
 		camel_mime_part_set_disposition (attachment, "inline");
 		e_msg_composer_attach (composer, attachment);
-		camel_object_unref (attachment);
+		g_object_unref (attachment);
 
 		g_free (description);
 	}
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index a3e9af3bdd..ab2f784c33 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -1092,6 +1092,9 @@ print_day_long_event (GtkPrintContext *context,
 	struct tm date_tm;
 	gdouble red, green, blue;
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	/* If the event starts before the first day being printed, draw a
 	   triangle. (Note that I am assuming we are just showing 1 day at
 	   the moment.) */
@@ -1172,6 +1175,9 @@ print_day_event (GtkPrintContext *context, PangoFontDescription *font,
 	struct tm date_tm;
 	gdouble red, green, blue;
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	if ((event->start_minute >= pdi->end_minute_offset)
 	    || (event->end_minute <= pdi->start_minute_offset))
 		return;
@@ -1561,6 +1567,9 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 	gdouble red, green, blue;
 	GdkPixbuf *pixbuf = NULL;
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	text = get_summary_with_location (event->comp_data->icalcomp);
 
 	for (span_num = 0; span_num < event->num_spans; span_num++) {
@@ -2414,21 +2423,36 @@ print_date_label (GtkPrintContext *context, ECalComponent *comp, ECal *client,
 	if (start > 0)
 		write_label_piece (start, buffer, 1024, NULL, NULL);
 
-	if (end > 0 && start > 0)
+	if (end > 0 && start > 0) {
+		/* Translators: This is part of "START to END" text,
+		 * where START and END are date/times. */
 		write_label_piece (end, buffer, 1024, _(" to "), NULL);
+	}
 
 	if (complete > 0) {
-		if (start > 0)
+		if (start > 0) {
+			/* Translators: This is part of "START to END
+			 * (Completed COMPLETED)", where COMPLETED is a
+			 * completed date/time. */
 			write_label_piece (complete, buffer, 1024, _(" (Completed "), ")");
-		else
+		} else {
+			/* Translators: This is part of "Completed COMPLETED",
+			 * where COMPLETED is a completed date/time. */
 			write_label_piece (complete, buffer, 1024, _("Completed "), NULL);
+		}
 	}
 
 	if (due > 0 && complete == 0) {
-		if (start > 0)
+		if (start > 0) {
+			/* Translators: This is part of "START (Due DUE)",
+			 * where START and DUE are dates/times. */
 			write_label_piece (due, buffer, 1024, _(" (Due "), ")");
-		else
+		} else {
+			/* Translators: This is part of "Due DUE",
+			 * where DUE is a date/time due the event
+			 * should be finished. */
 			write_label_piece (due, buffer, 1024, _("Due "), NULL);
+		}
 	}
 
 	print_text_size_bold (context, buffer, PANGO_ALIGN_LEFT,
diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c
index a6a7e520ab..f700da5a3b 100644
--- a/calendar/gui/tag-calendar.c
+++ b/calendar/gui/tag-calendar.c
@@ -142,11 +142,7 @@ tag_calendar_by_client (ECalendar *ecal,
 	g_return_if_fail (E_IS_CAL (client));
 
 	/* If the ECalendar isn't visible, we just return. */
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_visible (GTK_WIDGET (ecal)))
-#else
-	if (!GTK_WIDGET_VISIBLE (ecal))
-#endif
 		return;
 
 	if (e_cal_get_load_state (client) != E_CAL_LOAD_LOADED)
@@ -214,11 +210,7 @@ tag_calendar_by_comp (ECalendar *ecal,
 	g_return_if_fail (E_IS_CAL_COMPONENT (comp));
 
 	/* If the ECalendar isn't visible, we just return. */
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_visible (GTK_WIDGET (ecal)))
-#else
-	if (!GTK_WIDGET_VISIBLE (ecal))
-#endif
 		return;
 
 	if (!prepare_tag (ecal, &c, display_zone, clear_first))
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 12dd47d16a..69ba5b79f3 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -93,20 +93,22 @@ colorize_items (WeekdayPicker *wp)
 	GdkColor *fill, *sel_fill;
 	GdkColor *text_fill, *sel_text_fill;
 	GtkStateType state;
+	GtkStyle *style;
 	gint i;
 
 	priv = wp->priv;
 
 	state = gtk_widget_get_state (GTK_WIDGET (wp));
+	style = gtk_widget_get_style (GTK_WIDGET (wp));
 
-	outline = &GTK_WIDGET (wp)->style->fg[state];
-	focus_outline = &GTK_WIDGET (wp)->style->bg[state];
+	outline = &style->fg[state];
+	focus_outline = &style->bg[state];
 
-	fill = &GTK_WIDGET (wp)->style->base[state];
-	text_fill = &GTK_WIDGET (wp)->style->fg[state];
+	fill = &style->base[state];
+	text_fill = &style->fg[state];
 
-	sel_fill = &GTK_WIDGET (wp)->style->bg[GTK_STATE_SELECTED];
-	sel_text_fill = &GTK_WIDGET (wp)->style->fg[GTK_STATE_SELECTED];
+	sel_fill = &style->bg[GTK_STATE_SELECTED];
+	sel_text_fill = &style->fg[GTK_STATE_SELECTED];
 
 	for (i = 0; i < 7; i++) {
 		gint day;
@@ -144,14 +146,17 @@ static void
 configure_items (WeekdayPicker *wp)
 {
 	WeekdayPickerPrivate *priv;
+	GtkAllocation allocation;
 	gint width, height;
 	gint box_width;
 	gint i;
 
 	priv = wp->priv;
 
-	width = GTK_WIDGET (wp)->allocation.width;
-	height = GTK_WIDGET (wp)->allocation.height;
+	gtk_widget_get_allocation (GTK_WIDGET (wp), &allocation);
+
+	width = allocation.width;
+	height = allocation.height;
 
 	box_width = (width - 1) / 7;
 
@@ -321,11 +326,7 @@ weekday_picker_focus (GtkWidget *widget,
 	if (!gtk_widget_get_can_focus (widget))
 		return FALSE;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_has_focus (widget)) {
-#else
-	if (GTK_WIDGET_HAS_FOCUS (widget)) {
-#endif
 		priv->focus_day = -1;
 		colorize_items (wp);
 		return FALSE;
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index a5274b60e1..b54e619249 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -6,6 +6,7 @@ libevolution_calendar_importers_la_CPPFLAGS = 		\
 	-DG_LOG_DOMAIN=\"Evolution-Importer\"		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/calendar			\
+	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/calendar			\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
@@ -19,6 +20,8 @@ libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED)
 libevolution_calendar_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la 				\
 	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
+	$(top_builddir)/shell/libeshell.la				\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(EVOLUTION_CALENDAR_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)
 
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index 1f7da5e421..f719c9ce41 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -36,13 +36,18 @@
 #include <gtk/gtk.h>
 
 #include <libecal/e-cal.h>
+#include <libecal/e-cal-time-util.h>
 #include <libedataserverui/e-source-selector.h>
 #include <libical/icalvcal.h>
 #include "evolution-calendar-importer.h"
+#include "shell/e-shell.h"
 #include "common/authentication.h"
+#include "gui/calendar-config-keys.h"
 
 #include "e-util/e-import.h"
 #include "e-util/e-util-private.h"
+#include "e-util/e-datetime-format.h"
+#include "misc/e-web-view-preview.h"
 
 /* We timeout after 2 minutes, when opening the folders. */
 #define IMPORTER_TIMEOUT_SECONDS 120
@@ -81,6 +86,16 @@ static const gchar *import_type_strings[] = {
  * Functions shared by iCalendar & vCalendar importer.
  */
 
+static GtkWidget *ical_get_preview (icalcomponent *icalcomp);
+
+static gboolean
+is_icalcomp_usable (icalcomponent *icalcomp)
+{
+	return icalcomp && icalcomponent_is_valid (icalcomp) && (
+		icalcomponent_get_first_component (icalcomp, ICAL_VEVENT_COMPONENT) != NULL ||
+		icalcomponent_get_first_component (icalcomp, ICAL_VTODO_COMPONENT) != NULL);
+}
+
 static void
 ivcal_import_done(ICalImporter *ici)
 {
@@ -379,13 +394,14 @@ ical_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
 		return FALSE;
 
 	if (g_file_get_contents (filename, &contents, NULL, NULL)) {
-		icalcomponent *icalcomp;
+		icalcomponent *icalcomp = NULL;
 
-		icalcomp = e_cal_util_parse_ics_string (contents);
+		if (g_ascii_strncasecmp (contents, "BEGIN:", 6) == 0)
+			icalcomp = e_cal_util_parse_ics_string (contents);
 		g_free (contents);
 
 		if (icalcomp) {
-			if (icalcomponent_is_valid (icalcomp))
+			if (is_icalcomp_usable (icalcomp))
 				ret = TRUE;
 			else
 				ret = FALSE;
@@ -427,6 +443,40 @@ ical_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 		e_import_complete(ei, target);
 }
 
+static GtkWidget *
+ivcal_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+{
+	GtkWidget *preview;
+	EImportTargetURI *s = (EImportTargetURI *)target;
+	gchar *filename;
+	icalcomponent *icalcomp;
+	gchar *contents;
+
+	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
+	if (filename == NULL) {
+		g_message (G_STRLOC ": Couldn't get filename from URI '%s'", s->uri_src);
+		return NULL;
+	}
+
+	if (!g_file_get_contents (filename, &contents, NULL, NULL)) {
+		g_free (filename);
+		return NULL;
+	}
+	g_free (filename);
+
+	icalcomp = e_cal_util_parse_ics_string (contents);
+	g_free (contents);
+
+	if (!icalcomp)
+		return NULL;
+
+	preview = ical_get_preview (icalcomp);
+
+	icalcomponent_free (icalcomp);
+
+	return preview;
+}
+
 static EImportImporter ical_importer = {
 	E_IMPORT_TARGET_URI,
 	0,
@@ -434,6 +484,7 @@ static EImportImporter ical_importer = {
 	ivcal_getwidget,
 	ical_import,
 	ivcal_cancel,
+	ivcal_get_preview,
 };
 
 EImportImporter *
@@ -480,7 +531,7 @@ vcal_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
 
 		icalcomp = e_cal_util_parse_ics_string (contents);
 
-		if (icalcomp && icalcomponent_is_valid (icalcomp)) {
+		if (icalcomp && is_icalcomp_usable (icalcomp)) {
 			/* If we can create proper iCalendar from the file, then
 			   rather use ics importer, because it knows to read more
 			   information than older version, the vCalendar. */
@@ -568,6 +619,33 @@ vcal_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 		e_import_complete(ei, target);
 }
 
+static GtkWidget *
+vcal_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+{
+	GtkWidget *preview;
+	EImportTargetURI *s = (EImportTargetURI *)target;
+	gchar *filename;
+	icalcomponent *icalcomp;
+
+	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
+	if (filename == NULL) {
+		g_message (G_STRLOC ": Couldn't get filename from URI '%s'", s->uri_src);
+		return NULL;
+	}
+
+	icalcomp = load_vcalendar_file (filename);
+	g_free (filename);
+
+	if (!icalcomp)
+		return NULL;
+
+	preview = ical_get_preview (icalcomp);
+
+	icalcomponent_free (icalcomp);
+
+	return preview;
+}
+
 static EImportImporter vcal_importer = {
 	E_IMPORT_TARGET_URI,
 	0,
@@ -575,6 +653,7 @@ static EImportImporter vcal_importer = {
 	ivcal_getwidget,
 	vcal_import,
 	ivcal_cancel,
+	vcal_get_preview,
 };
 
 EImportImporter *
@@ -772,6 +851,7 @@ static EImportImporter gnome_calendar_importer = {
 	gnome_calendar_getwidget,
 	gnome_calendar_import,
 	gnome_calendar_cancel,
+	NULL, /* get_preview */
 };
 
 EImportImporter *
@@ -782,3 +862,430 @@ gnome_calendar_importer_peek(void)
 
 	return &gnome_calendar_importer;
 }
+
+/* ********************************************************************** */
+
+static gchar *
+format_dt (const ECalComponentDateTime *dt, GHashTable *timezones, icaltimezone *users_zone)
+{
+	struct tm tm;
+
+	g_return_val_if_fail (dt != NULL, NULL);
+	g_return_val_if_fail (timezones != NULL, NULL);
+
+	if (!dt->value)
+		return NULL;
+
+	dt->value->zone = NULL;
+	if (dt->tzid) {
+		dt->value->zone = g_hash_table_lookup (timezones, dt->tzid);
+		if (!dt->value->zone)
+			dt->value->zone = icaltimezone_get_builtin_timezone_from_tzid (dt->tzid);
+	}
+
+	if (dt->value->zone)
+		tm = icaltimetype_to_tm_with_zone (dt->value, (icaltimezone *) dt->value->zone, users_zone);
+	else
+		tm = icaltimetype_to_tm (dt->value);
+
+	return e_datetime_format_format_tm ("calendar", "table", dt->value->is_date ? DTFormatKindDate : DTFormatKindDateTime, &tm);
+}
+
+static const gchar *
+strip_mailto (const gchar *str)
+{
+	if (!str || g_ascii_strncasecmp (str, "mailto:", 7) != 0)
+		return str;
+
+	return str + 7;
+}
+
+static void
+preview_comp (EWebViewPreview *preview, ECalComponent *comp)
+{
+	ECalComponentText text = { 0 };
+	ECalComponentDateTime dt;
+	ECalComponentClassification classif;
+	const gchar *str;
+	gchar *tmp;
+	gint percent;
+	gboolean have;
+	GHashTable *timezones;
+	icaltimezone *users_zone;
+	GSList *slist, *l;
+
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (comp != NULL);
+
+	timezones = g_object_get_data (G_OBJECT (preview), "iCalImp-timezones");
+	users_zone = g_object_get_data (G_OBJECT (preview), "iCalImp-userszone");
+
+	str = NULL;
+	switch (e_cal_component_get_vtype (comp)) {
+	case E_CAL_COMPONENT_EVENT:
+		str = e_cal_component_has_attendees (comp) ? C_("iCalImp", "Meeting") : C_("iCalImp", "Event");
+		break;
+	case E_CAL_COMPONENT_TODO:
+		str = C_("iCalImp", "Task");
+		break;
+	case E_CAL_COMPONENT_JOURNAL:
+		str = C_("iCalImp", "Memo");
+		break;
+	default:
+		str = "??? Other ???";
+		break;
+	}
+
+	have = FALSE;
+	if (e_cal_component_has_recurrences (comp)) {
+		e_web_view_preview_add_section (preview, have ? NULL : str, C_("iCalImp", "has recurrences"));
+		have = TRUE;
+	}
+
+	if (e_cal_component_is_instance (comp)) {
+		e_web_view_preview_add_section (preview, have ? NULL : str, C_("iCalImp", "is an instance"));
+		have = TRUE;
+	}
+
+	if (e_cal_component_has_alarms (comp)) {
+		e_web_view_preview_add_section (preview, have ? NULL : str, C_("iCalImp", "has alarms"));
+		have = TRUE;
+	}
+
+	if (e_cal_component_has_attachments (comp)) {
+		e_web_view_preview_add_section (preview, have ? NULL : str, C_("iCalImp", "has attachments"));
+		have = TRUE;
+	}
+
+	if (!have) {
+		e_web_view_preview_add_section (preview, str, "");
+	}
+
+	str = NULL;
+	classif = E_CAL_COMPONENT_CLASS_NONE;
+	e_cal_component_get_classification (comp, &classif);
+	if (classif == E_CAL_COMPONENT_CLASS_PUBLIC) {
+		/* Translators: Appointment's classification */
+		str = C_("iCalImp", "Public");
+	} else if (classif == E_CAL_COMPONENT_CLASS_PRIVATE) {
+		/* Translators: Appointment's classification */
+		str = C_("iCalImp", "Private");
+	} else if (classif == E_CAL_COMPONENT_CLASS_CONFIDENTIAL) {
+		/* Translators: Appointment's classification */
+		str = C_("iCalImp", "Confidential");
+	}
+	if (str)
+		/* Translators: Appointment's classification section name */
+		e_web_view_preview_add_section (preview, C_("iCalImp", "Classification"), str);
+
+	e_cal_component_get_summary (comp, &text);
+	if ((text.value && *text.value) || (text.altrep && *text.altrep))
+		/* Translators: Appointment's summary */
+		e_web_view_preview_add_section (preview, C_("iCalImp", "Summary"), (text.value && *text.value) ? text.value : text.altrep);
+
+	str = NULL;
+	e_cal_component_get_location (comp, &str);
+	if (str && *str)
+		/* Translators: Appointment's location */
+		e_web_view_preview_add_section (preview, C_("iCalImp", "Location"), str);
+
+	dt.value = NULL;
+	e_cal_component_get_dtstart (comp, &dt);
+	if (dt.value) {
+		tmp = format_dt (&dt, timezones, users_zone);
+		if (tmp)
+			/* Translators: Appointment's start time */
+			e_web_view_preview_add_section (preview, C_("iCalImp", "Start"), tmp);
+		g_free (tmp);
+	}
+	e_cal_component_free_datetime (&dt);
+
+	dt.value = NULL;
+	e_cal_component_get_due (comp, &dt);
+	if (dt.value) {
+		tmp = format_dt (&dt, timezones, users_zone);
+		if (tmp)
+			/* Translators: 'Due' like the time due a task should be finished */
+			e_web_view_preview_add_section (preview, C_("iCalImp", "Due"), tmp);
+		g_free (tmp);
+	} else {
+		e_cal_component_free_datetime (&dt);
+
+		dt.value = NULL;
+		e_cal_component_get_dtend (comp, &dt);
+		if (dt.value) {
+			tmp = format_dt (&dt, timezones, users_zone);
+
+			if (tmp)
+				/* Translators: Appointment's end time */
+				e_web_view_preview_add_section (preview, C_("iCalImp", "End"), tmp);
+			g_free (tmp);
+		}
+	}
+	e_cal_component_free_datetime (&dt);
+
+	str = NULL;
+	e_cal_component_get_categories (comp, &str);
+	if (str && *str)
+		/* Translators: Appointment's categories */
+		e_web_view_preview_add_section (preview, C_("iCalImp", "Categories"), str);
+
+	percent = e_cal_component_get_percent_as_int (comp);
+	if (percent >= 0) {
+		tmp = NULL;
+		if (percent == 100) {
+			icaltimetype *completed = NULL;
+
+			e_cal_component_get_completed (comp, &completed);
+
+			if (completed) {
+				dt.tzid = "UTC";
+				dt.value = completed;
+
+				tmp = format_dt (&dt, timezones, users_zone);
+
+				e_cal_component_free_icaltimetype (completed);
+			}
+		}
+
+		if (!tmp)
+			tmp = g_strdup_printf ("%d%%", percent);
+
+		/* Translators: Appointment's complete value (either percentage, or a date/time of a completion) */
+		e_web_view_preview_add_section (preview, C_("iCalImp", "Completed"), tmp);
+		g_free (tmp);
+	}
+
+	str = NULL;
+	e_cal_component_get_url (comp, &str);
+	if (str && *str)
+		/* Translators: Appointment's URL */
+		e_web_view_preview_add_section (preview, C_("iCalImp", "URL"), str);
+
+	if (e_cal_component_has_organizer (comp)) {
+		ECalComponentOrganizer organizer = { 0 };
+
+		e_cal_component_get_organizer (comp, &organizer);
+
+		if (organizer.value && *organizer.value) {
+			if (organizer.cn && *organizer.cn) {
+				tmp = g_strconcat (organizer.cn, " <", strip_mailto (organizer.value), ">", NULL);
+				/* Translators: Appointment's organizer */
+				e_web_view_preview_add_section (preview, C_("iCalImp", "Organizer"), tmp);
+				g_free (tmp);
+			} else {
+				e_web_view_preview_add_section (preview, C_("iCalImp", "Organizer"), strip_mailto (organizer.value));
+			}
+		}
+	}
+
+	if (e_cal_component_has_attendees (comp)) {
+		GSList *attendees = NULL, *a;
+		have = FALSE;
+
+		e_cal_component_get_attendee_list (comp, &attendees);
+
+		for (a = attendees; a; a = a->next) {
+			ECalComponentAttendee *attnd = a->data;
+
+			if (!attnd || !attnd->value || !*attnd->value)
+				continue;
+
+			if (attnd->cn && *attnd->cn) {
+				tmp = g_strconcat (attnd->cn, " <", strip_mailto (attnd->value), ">", NULL);
+				/* Translators: Appointment's attendees */
+				e_web_view_preview_add_section (preview, have ? NULL : C_("iCalImp", "Attendees"), tmp);
+				g_free (tmp);
+			} else {
+				e_web_view_preview_add_section (preview, have ? NULL : C_("iCalImp", "Attendees"), strip_mailto (attnd->value));
+			}
+
+			have = TRUE;
+		}
+
+		e_cal_component_free_attendee_list (attendees);
+	}
+
+	slist = NULL;
+	e_cal_component_get_description_list (comp, &slist);
+	for (l = slist; l; l = l->next) {
+		ECalComponentText *txt = l->data;
+
+		e_web_view_preview_add_section (preview, l != slist ? NULL : C_("iCalImp", "Description"), (txt && txt->value) ? txt->value : "");
+	}
+
+	e_cal_component_free_text_list (slist);
+}
+
+static void
+preview_selection_changed_cb (GtkTreeSelection *selection, EWebViewPreview *preview)
+{
+	GtkTreeIter iter;
+	GtkTreeModel *model = NULL;
+
+	g_return_if_fail (selection != NULL);
+	g_return_if_fail (preview != NULL);
+
+	e_web_view_preview_begin_update (preview);
+
+	if (gtk_tree_selection_get_selected (selection, &model, &iter) && model) {
+		ECalComponent *comp = NULL;
+
+		gtk_tree_model_get (model, &iter, 3, &comp, -1);
+
+		if (comp) {
+			preview_comp (preview, comp);
+			g_object_unref (comp);
+		}
+	}
+
+	e_web_view_preview_end_update (preview);
+}
+
+static icaltimezone *
+get_users_timezone (void)
+{
+	/* more or less copy&paste of calendar_config_get_icaltimezone */
+	icaltimezone *zone = NULL;
+	gchar *location;
+
+	if (e_shell_settings_get_boolean (e_shell_get_shell_settings (e_shell_get_default ()), "cal-use-system-timezone")) {
+		location = e_cal_util_get_system_timezone_location ();
+	} else {
+		GConfClient *client = gconf_client_get_default ();
+
+		location = gconf_client_get_string (client, CALENDAR_CONFIG_TIMEZONE, NULL);
+
+		g_object_unref (client);
+	}
+
+	if (location) {
+		zone = icaltimezone_get_builtin_timezone (location);
+
+		g_free (location);
+	}
+
+	return zone;
+}
+
+static void
+free_zone_cb (gpointer ptr)
+{
+	icaltimezone *zone = ptr;
+
+	if (zone)
+		icaltimezone_free (zone, 1);
+}
+
+static GtkWidget *
+ical_get_preview (icalcomponent *icalcomp)
+{
+	GtkWidget *preview;
+	GtkTreeView *tree_view;
+	GtkTreeSelection *selection;
+	GtkListStore *store;
+	GtkTreeIter iter;
+	GHashTable *timezones;
+	icalcomponent *subcomp;
+	icaltimezone *users_zone;
+
+	if (!icalcomp || !is_icalcomp_usable (icalcomp))
+		return NULL;
+
+	store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, E_TYPE_CAL_COMPONENT);
+
+	timezones = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, free_zone_cb);
+	users_zone = get_users_timezone ();
+
+	/* get timezones first */
+	for (subcomp = icalcomponent_get_first_component (icalcomp, ICAL_VTIMEZONE_COMPONENT);
+	     subcomp;
+	     subcomp = icalcomponent_get_next_component (icalcomp,  ICAL_VTIMEZONE_COMPONENT)) {
+		icaltimezone *zone = icaltimezone_new ();
+		if (!icaltimezone_set_component (zone, icalcomponent_new_clone (subcomp)) || !icaltimezone_get_tzid (zone)) {
+			icaltimezone_free (zone, 1);
+		} else {
+			g_hash_table_insert (timezones, (gchar *) icaltimezone_get_tzid (zone), zone);
+		}
+	}
+
+	/* then each component */
+	for (subcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
+	     subcomp;
+	     subcomp = icalcomponent_get_next_component (icalcomp,  ICAL_ANY_COMPONENT)) {
+		icalcomponent_kind kind = icalcomponent_isa (subcomp);
+
+		if (kind == ICAL_VEVENT_COMPONENT ||
+		    kind == ICAL_VTODO_COMPONENT ||
+		    kind == ICAL_VJOURNAL_COMPONENT) {
+			ECalComponent *comp = e_cal_component_new ();
+			ECalComponentText summary = { 0 };
+			ECalComponentDateTime dt = { 0 };
+			gchar *formatted_dt;
+
+			if (!e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (subcomp))) {
+				g_object_unref (comp);
+				continue;
+			}
+
+			e_cal_component_get_summary (comp, &summary);
+			e_cal_component_get_dtstart (comp, &dt);
+			formatted_dt = format_dt (&dt, timezones, users_zone);
+
+			gtk_list_store_append (store, &iter);
+			gtk_list_store_set (store, &iter,
+				0, kind == ICAL_VEVENT_COMPONENT ? (e_cal_component_has_attendees (comp) ? C_("iCalImp", "Meeting") : C_("iCalImp", "Event")) :
+				   kind == ICAL_VTODO_COMPONENT ? C_("iCalImp", "Task") :
+				   kind == ICAL_VJOURNAL_COMPONENT ? C_("iCalImp", "Memo") : "??? Other ???",
+				1, formatted_dt ? formatted_dt : "",
+				2, summary.value && *summary.value ? summary.value : summary.altrep && *summary.altrep ? summary.altrep : "",
+				3, comp,
+				-1);
+
+			g_free (formatted_dt);
+			e_cal_component_free_datetime (&dt);
+			g_object_unref (comp);
+		}
+	}
+
+	if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)) {
+		g_object_unref (store);
+		g_hash_table_destroy (timezones);
+		return NULL;
+	}
+
+	preview = e_web_view_preview_new ();
+	gtk_widget_show (preview);
+
+	g_object_set_data_full (G_OBJECT (preview), "iCalImp-timezones", timezones, (GDestroyNotify) g_hash_table_destroy);
+	g_object_set_data (G_OBJECT (preview), "iCalImp-userszone", users_zone);
+
+	tree_view = e_web_view_preview_get_tree_view (E_WEB_VIEW_PREVIEW (preview));
+	g_return_val_if_fail (tree_view != NULL, NULL);
+
+	gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (store));
+	g_object_unref (store);
+
+	/* Translators: Column header for a component type; it can be Event, Task or Memo */
+	gtk_tree_view_insert_column_with_attributes (tree_view, -1, C_("iCalImp", "Type"),
+		gtk_cell_renderer_text_new (), "text", 0, NULL);
+
+	/* Translators: Column header for a component start date/time */
+	gtk_tree_view_insert_column_with_attributes (tree_view, -1, C_("iCalImp", "Start"),
+		gtk_cell_renderer_text_new (), "text", 1, NULL);
+
+	/* Translators: Column header for a component summary */
+	gtk_tree_view_insert_column_with_attributes (tree_view, -1, C_("iCalImp", "Summary"),
+		gtk_cell_renderer_text_new (), "text", 2, NULL);
+
+	if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) > 1)
+		e_web_view_preview_show_tree_view (E_WEB_VIEW_PREVIEW (preview));
+
+	selection = gtk_tree_view_get_selection (tree_view);
+	gtk_tree_selection_select_iter (selection, &iter);
+	g_signal_connect (selection, "changed", G_CALLBACK (preview_selection_changed_cb), preview);
+
+	preview_selection_changed_cb (selection, E_WEB_VIEW_PREVIEW (preview));
+
+	return preview;
+}
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
index 6352f020bd..aa090e36fd 100644
--- a/capplet/anjal-settings-main.c
+++ b/capplet/anjal-settings-main.c
@@ -91,7 +91,7 @@ mail_message_received_cb (UniqueApp         *app G_GNUC_UNUSED,
 		  //mail_shell_set_cmdline_args ((MailShell *)window, args);
 		  //mail_shell_handle_cmdline ((MailShell *)window);
 		  g_free (url);
-		  gdk_window_raise (((GtkWidget *)window)->window);
+		  gdk_window_raise (gtk_widget_get_window (GTK_WIDGET (window)));
 		  gtk_window_deiconify (window);
 		  gtk_window_present (window);
 
diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
index cd47ae5223..54401412e2 100644
--- a/capplet/settings/mail-account-view.c
+++ b/capplet/settings/mail-account-view.c
@@ -451,6 +451,7 @@ create_review (MailAccountView *view)
 	gchar *uri;
 	gchar *enc;
 	CamelURL *url;
+	gchar *buff;
 
 	uri = (gchar *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_SOURCE_URL);
 	if (!uri  || (url = camel_url_new(uri, NULL)) == NULL)
@@ -460,7 +461,9 @@ create_review (MailAccountView *view)
 	gtk_table_set_row_spacings ((GtkTable *)table, 4);
 
 	label = gtk_label_new (NULL);
-	gtk_label_set_markup ((GtkLabel *)label, _("<span size=\"large\" weight=\"bold\">Personal details:</span>"));
+	buff = g_strconcat ("<span size=\"large\" weight=\"bold\">", _("Personal details:"), "</span>", NULL);
+	gtk_label_set_markup ((GtkLabel *)label, buff);
+	g_free (buff);
 	gtk_widget_show (label);
 	PACK_BOXF(label)
 	gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
@@ -1050,7 +1053,9 @@ static gboolean
 mav_btn_expose (GtkWidget *w, GdkEventExpose *event, MailAccountView *mfv)
 {
 	GdkPixbuf *img = g_object_get_data ((GObject *)w, "pbuf");
-	cairo_t *cr = gdk_cairo_create (w->window);
+	cairo_t *cr;
+
+	cr = gdk_cairo_create (gtk_widget_get_window (w));
 	cairo_save (cr);
 	gdk_cairo_set_source_pixbuf (cr, img, event->area.x-5, event->area.y-4);
 	cairo_paint(cr);
diff --git a/capplet/settings/mail-account-view.h b/capplet/settings/mail-account-view.h
index 7d5153172b..3d01156e5b 100644
--- a/capplet/settings/mail-account-view.h
+++ b/capplet/settings/mail-account-view.h
@@ -26,7 +26,6 @@
 #include <gtk/gtk.h>
 #include "mail/em-account-editor.h"
 #include <libedataserver/e-account-list.h>
-#include <camel/camel-provider.h>
 #include "mail-view.h"
 
 #define MAIL_ACCOUNT_VIEW_TYPE        (mail_account_view_get_type ())
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
index da22b9d0d5..33b22f80be 100644
--- a/capplet/settings/mail-capplet-shell.c
+++ b/capplet/settings/mail-capplet-shell.c
@@ -240,7 +240,7 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean
 	gtk_box_pack_end ((GtkBox *)priv->box, (GtkWidget *)shell->view, TRUE, TRUE, 2);
 
 	/* This also initializes Camel, so it needs to happen early. */
-	mail_session_init ();
+	mail_session_start ();
 	mail_config_init ();
 	mail_msg_init ();
 	custom_dir = g_build_filename (e_get_user_data_dir (), "mail", NULL);
@@ -267,7 +267,11 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean
 gint
 mail_capplet_shell_toolbar_height (MailCappletShell *shell)
 {
-	return shell->priv->top_bar->allocation.height;
+	GtkAllocation allocation;
+
+	gtk_widget_get_allocation (shell->priv->top_bar, &allocation);
+
+	return allocation.height;
 }
 
 MailCappletShell *
diff --git a/capplet/settings/mail-decoration.c b/capplet/settings/mail-decoration.c
index 056283dabe..d208981a65 100644
--- a/capplet/settings/mail-decoration.c
+++ b/capplet/settings/mail-decoration.c
@@ -86,7 +86,7 @@ md_translate_position (GdkWindow *w, double ex, double ey, gint *x, gint *y, Gtk
 	*x = (gint)ex;
 	*y = (gint)ey;
 
-	while (w && w != window->window) {
+	while (w && w != gtk_widget_get_window (window)) {
 		gint cx, cy, cw, ch, cd;
 		gdk_window_get_geometry (w, &cx, &cy, &cw, &ch, &cd);
                 *x += cx;
@@ -110,19 +110,29 @@ in_left (MailDecoration *md, double x)
 static gboolean
 in_bottom (MailDecoration *md, double y)
 {
-	return y >= ((GtkWidget *)md->window)->allocation.height - md->priv->resize_width;
+	GtkAllocation allocation;
+
+	gtk_widget_get_allocation (GTK_WIDGET (md->window), &allocation);
+
+	return y >= allocation.height - md->priv->resize_width;
 }
 
 static gboolean
 in_right (MailDecoration *md, double x)
 {
-	return x >= ((GtkWidget *)md->window)->allocation.width - md->priv->resize_width;
+	GtkAllocation allocation;
+
+	gtk_widget_get_allocation (GTK_WIDGET (md->window), &allocation);
+
+	return x >= allocation.width - md->priv->resize_width;
 }
 
 static void
 set_cursor (MailDecoration *md, GdkWindowEdge edge)
 {
-	gdk_window_set_cursor (((GtkWidget *)md->window)->window, md->priv->cursors[edge]);
+	gdk_window_set_cursor (
+		gtk_widget_get_window (GTK_WIDGET (md->window)),
+		md->priv->cursors[edge]);
 	md->priv->default_cursor = FALSE;
 }
 
@@ -131,7 +141,9 @@ reset_cursor (MailDecoration *md)
 {
 	if (!md->priv->default_cursor) {
 		md->priv->default_cursor = TRUE;
-		gdk_window_set_cursor (((GtkWidget *)md->window)->window, NULL);
+		gdk_window_set_cursor (
+			gtk_widget_get_window (GTK_WIDGET (md->window)),
+			NULL);
 	}
 
 }
diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c
index 0a5f07d75b..d6a65e8c53 100644
--- a/capplet/settings/mail-guess-servers.c
+++ b/capplet/settings/mail-guess-servers.c
@@ -340,10 +340,17 @@ main (gint argc, gchar **argv)
 
 	mail_guess_servers (provider);
 
-	printf("Recv: %s\n%s(%s), %s by %s \n Send: %s\n%s(%s), %s by %s\n via %s to %s\n",
-	  provider->recv_type, provider->recv_hostname, provider->recv_port, provider->recv_username, provider->recv_auth,
-	  provider->send_type, provider->send_hostname, provider->send_port, provider->send_username, provider->send_auth,
-	  provider->recv_socket_type, provider->send_socket_type);
+	printf (
+		"Recv: %s\n%s(%s), %s by %s \n "
+		"Send: %s\n%s(%s), %s by %s\n via %s to %s\n",
+		provider->recv_type, provider->recv_hostname,
+		provider->recv_port, provider->recv_username,
+		provider->recv_auth,
+		provider->send_type, provider->send_hostname,
+		provider->send_port, provider->send_username,
+		provider->send_auth,
+		provider->recv_socket_type,
+		provider->send_socket_type);
 	return 0;
 }
 #endif
diff --git a/capplet/settings/mail-settings-view.c b/capplet/settings/mail-settings-view.c
index 3a9864ae23..25a87cfbd4 100644
--- a/capplet/settings/mail-settings-view.c
+++ b/capplet/settings/mail-settings-view.c
@@ -176,11 +176,14 @@ msv_regen_view (MailSettingsView *acview)
 	EAccountList *accounts = acview->priv->accounts;
 	EIterator *node;
 	GtkWidget *box, *label;
+	gchar *buff;
 
 	gtk_container_foreach((GtkContainer *)acview->priv->box, (GtkCallback)gtk_widget_destroy, NULL);
 
 	label = gtk_label_new (NULL);
-	gtk_label_set_markup ((GtkLabel *)label, _("<span size=\"large\" weight=\"bold\">Account management</span>"));
+	buff = g_strconcat ("<span size=\"large\" weight=\"bold\">", _("Account management"), "</span>", NULL);
+	gtk_label_set_markup ((GtkLabel *)label, buff);
+	g_free (buff);
 	PACK_BOX(label,12);
 
 	node = e_list_get_iterator ((EList *) accounts);
@@ -227,7 +230,9 @@ static gboolean
 msv_btn_expose (GtkWidget *w, GdkEventExpose *event, MailSettingsView *mfv)
 {
 	GdkPixbuf *img = g_object_get_data ((GObject *)w, "pbuf");
-	cairo_t *cr = gdk_cairo_create (w->window);
+	cairo_t *cr;
+
+	cr = gdk_cairo_create (gtk_widget_get_window (w));
 	cairo_save (cr);
 	gdk_cairo_set_source_pixbuf (cr, img, event->area.x-5, event->area.y-4);
 	cairo_paint(cr);
diff --git a/composer/ChangeLog b/composer/ChangeLog
deleted file mode 100644
index 5a38c77178..0000000000
--- a/composer/ChangeLog
+++ /dev/null
@@ -1,2468 +0,0 @@
-2009-04-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #553535
-
-	* e-msg-composer.c: (is_top_signature), (get_signature_html),
-	(set_editor_text), (e_msg_composer_show_sig_file): Do not eat
-	lines of text when changing signature at top of the message.
-	Add one extra empty line between the signature and the body
-	of the mail when placing signature to the bottom.
-
-2009-03-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #574680
-
-	* e-msg-composer.c: (is_special_header): Function removed.
-	* e-msg-composer.c: (e_msg_composer_new_with_message):
-	Remove all headers except "References" and "In-Reply-To" when
-	composing from an existing message.
-
-2009-02-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #551470
-
-	* e-composer-private.h:
-	* e-msg-composer.c: (add_signature_delim), (get_signature_html),
-	(set_editor_text): Do not force adding "-- \n" above the signature.
-
-2009-02-12  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #567089
-
-	* e-msg-composer.c: (get_signature_html):
-	Do not crash when no From set yet.
-
-2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-msg-composer.c (msg_composer_link_clicked):
-	Call e_show_uri() instead of gnome_url_show().
-
-2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>
-
-	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
-
-	* Fix for bug #566011
-
-	* e-composer-header-table.c:
-	* e-composer-private.h:
-	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h>.
-
-2008-12-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-composer-actions.c:
-	Change "Save Draft" menu item to "Save as Draft" to be consistent
-	with "Save as Template".  I like that better.  But leave the toolbar
-	button alone.
-
-2008-12-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #564248
-
-	* e-msg-composer.c: (msg_composer_paste_clipboard):
-	Attach images pasted from a clipboard.
-
-2008-12-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #562450
-
-	* e-msg-composer.c (handle_multipart_signed):
-	Fix a typo that broke "Edit as New Message" for signed messages.
-
-2008-12-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #562886
-
-	* e-msg-composer.c (handle_mailto):
-	Don't double-decode attachment URIs.  Also, parse &amp; correctly.
-
-2008-11-07  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #559701
-
-	* e-msg-composer.c: (e_load_spell_languages): Don't save when its
-	NULL.
-
-2008-11-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #559371
-
-	* e-msg-composer.c (e_load_spell_languages):
-	New function loads a list of GtkhtmlSpellLanguage structs from
-	GConf, taking care of details like converting language codes to
-	structs and ensuring the returned list is non-empty.
-
-	* e-msg-composer.c (e_save_spell_languages):
-	New function saves a list of GtkhtmlSpellLanguage structs to
-	GConf, taking care of details like converting the structs to
-	language codes.
-
-	* e-msg-composer.c (msg_composer_constructor):
-	Simplify the logic by using e_load_spell_languages().
-
-2008-11-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #554450
-
-	* e-msg-composer.c (msg_composer_init):
-	Get drag-and-drop to the attachment bar working again, but see
-	my note in the source code.  I'm still not sure why it broke.
-
-2008-11-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #559028
-
-	* e-msg-composer.c (msg_composer_key_press_event):
-	Skip over the style toolbar when tabbing in reverse.
-
-2008-10-29  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-composer-actions.c:
-	* e-composer-actions.h:
-	* e-composer-autosave.c:
-	* e-composer-autosave.h:
-	* e-composer-header-table.c:
-	* e-composer-header-table.h:
-	* e-composer-header.h:
-	* e-composer-name-header.h:
-	* e-composer-private.c:
-	* e-composer-private.h:
-	* e-composer-text-header.c:
-
-2008-10-13  Bharath Acharya  <abharath@novell.com>
-
-	** Updated fix for bug #555775
-
-	* e-composer-private.c: (e_composer_private_init): Reverting a hunk 
-	from the previous patch as suggested by Matthew Barnes.
-
-2008-10-10  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #555775
-
-	* e-composer-private.c: (e_composer_private_init): Include 
-	e-util-private.h for Win32 redefinition of EVOLUTION_UIDIR and build 
-	the filename using it.
-
-2008-10-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #554664
-
-	* e-composer-actions.c: (action_attach_cb):
-	Call attach_remote_file when knows the URI points to it.
-
-2008-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #554418
-
-	* e-msg-composer.c: (handle_uri),
-	(e_msg_composer_add_inline_image_from_file): Guess mime_type based
-	on the file content, if failed, then on the filename.
-
-2008-09-29  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-msg-composer.c:
-
-2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #553148
-
-	* mail-composer.error.xml: Standardise "GroupWise" usage in
-	translatable strings.
-
-2008-09-23  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #553273
-
-	* e-composer-actions.c: (action_save_cb):
-	Always end e_error_run/e_error_new calls with NULL parameter.
-
-2008-09-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #551548
-
-	* e-msg-composer.c:
-	* e-composer-action.c:
-	Remove pointless SMIME_SUPPORTED check, which was hard-coded to 1.
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-msg-composer.h:
-
-2008-09-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #545661
-
-	* e-composer-autosave.c: (e_composer_autosave_snapshot):
-	Do not mark composer as not changed, that's not truth possibly.
-	* e-msg-composer.h: (e_msg_composer_is_exiting):
-	* e-msg-composer.c: (e_msg_composer_is_exiting):
-	* e-composer-actions.c: (action_close_cb): Skip question
-	for "not-saved" only when not changed or application is exiting.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-composer-common.h:
-	* e-composer-from-header.c:
-	* e-composer-from-header.h:
-	* e-composer-header.c:
-	* e-composer-name-header.c:
-	* e-composer-post-header.c:
-	* e-composer-post-header.h:
-	* e-composer-text-header.h:
-
-2008-08-18  Baptiste Mille-Mathias  <bmm80@free.fr>
-
-	** Fixes bug #546867
-
-	* e-composer-private.c (e_composer_private_init): Set the 'Send' button
-	as important to have a label. 
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #428384
-
-	* mail-composer.error.xml:
-	Improve buttons in the "exit-unsaved" dialog by replacing "Cancel"
-	with "Continue Editing" and "Save Message" with "Save Draft".
-	Suggested by bytesmythe.
-
-2008-07-20  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #200147
-
-	* evolution-composer.ui: Added a Template placeholder
-
-2008-07-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #206592
-
-	* evolution-composer.ui:
-	* e-composer-actions.h:
-	* e-composer-actions.c: (action_new_message_cb), (entries):
-	Action to invoke New Message window from the composer itself.
-
-2008-06-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-composer-post-header.c (composer_post_header_finalize):
-	Add a finalize() method to free priv->base_url, which was leaking.
-
-2008-06-21  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #310988
-
-	* e-msg-composer.c:
-	Don't even show the "send-options" action unless an Exchange
-	or GroupWise account appears in the From combo box.
-
-2008-06-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #538908
-
-	* e-composer-actions.h:
-	Define E_COMPOSER_ACTION_SEND_OPTIONS.
-
-	* e-msg-composer.c (msg_composer_account_changed_cb):
-	Desensitize the "send-options" action unless we've selected an
-	Exchange or GroupWise account.  Based on a patch by Paul Bolle.
-
-2008-06-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #330597
-
-	* e-msg-composer.c: (add_attachments_handle_mime_part): Add all
-	text/* parts which has a filename set and also attach all submessages.
-
-2008-05-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #525241 (EPluginUI)
-
-	* e-msg-composer.c (msg_composer_destroy), (msg_composer_init):
-	Rip out the EMenu logic.
-
-	* e-msg-composer.c (msg_composer_init):
-	Register the GtkUIManager with EPluginUI.
-
-2008-05-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #424744
-
-	* e-composer-private.c:
-	* e-composer-private.h:
-	* e-msg-composer.c:
-	Use camel-iconv.c instead of e-iconv.h (now deprecated).
-
-2008-04-28  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-composer-actions.c (action_send_options_cb):
-	Fix a typo in the EError tag.
-
-2008-04-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gconf-bridge.c:
-	* gconf-bridge.h:
-	Move these files to e-util.
-
-	* Makefile.am:
-	* e-composer-private.h:
-	Adapt.
-
-2008-04-17  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #526739
-
-	* e-msg-composer.h: (e_msg_composer_guess_mime_type):
-	* e-msg-composer.c: (e_msg_composer_guess_mime_type), (handle_uri),
-	(e_msg_composer_add_inline_image_from_file):
-	Use shared e_util_guess_mime_type instead of its own.
-
-2008-04-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-composer-autosave.c (e_composer_autosave_unregister):
-	Remove some unused variables.
-
-2008-04-11  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #517134
-
-	* e-composer-actions.c: (action_attach_cb): Save some CPU cycles. 
-	* e-composer-private.c: (composer_setup_charset_menu),
-	(composer_setup_recent_menu), (e_composer_private_init): Extend the
-	'Insert' menu to show a "Recent Documents" submenu (to quickly add
-	them as attachments). 
-	* evolution-composer.ui: Added a placeholder to dock the "Recent
-	Documents" menu. 
-
-2008-04-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #523413
-
-	* e-msg-composer.c (msg_composer_dispose):
-	Use the 'application_exiting' private flag to determine whether
-	to tell e_composer_autosave_unregister() to delete the autosave
-	file.
-
-	* e-msg-composer.c (msg_composer_class_init),
-	(e_msg_composer_save_draft):
-	Remove the 'quit' parameter from the 'save-draft' signal.
-
-	* e-msg-composer.c (e_msg_composer_request_close_all):
-	Take an autosave snapshot before activating the CLOSE action,
-	and set the private 'application_exiting' flag.  This should
-	avoid prompting the user before shutting down.
-
-	* e-composer-actions.c (action_close_cb):
-	When electing to save a message before closing, hide the window
-	immediately.  The callback function can then check the window's
-	visibility after the save is complete to know whether to destroy
-	the window.
-
-	* e-composer-autosave.c (e_composer_autosave_unregister):
-	Add a 'delete_file' boolean parameter to determine whether to
-	delete the autosave file.
-
-	* e-composer-private.h:
-	Add an 'application_exiting' flag.
-
-2008-04-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #525966
-
-	* e-composer-actions.c (action_close_cb):
-	Fix a boolean error in detecting unsaved changes.
-
-2008-04-07  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #328146
-
-	* e-composer-actions.c:
-	Fix missing and conflicting mnemonics.
-
-2008-04-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #526152
-
-	* e-msg-composer.c:
-	* e-composer-private.h:
-	Initialize a new composer's spell checking language menu via
-	our new "spell_languages" GConf key.
-
-2008-04-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Adapt to GtkHTML's new editor widget.
-
-	* Makefile.am:
-	Remove CORBA rules for the old composer.
-
-	* e-msg-composer.c:
-	* e-msg-composer.h:
-	EMsgComposer is now a subclass of GtkhtmlEditor.
-	Extensive refactoring and cleanup, too much to list in detail.
-
-	* e-composer-header.c:
-	* e-composer-header.h:
-	Add "sensitive" property along with get/set functions.
-
-	* e-composer-from-header.c:
-	* e-composer-from-header.h:
-	Propagate "refreshed" signal from EAccountComboBox.
-	Add function e_composer_from_header_get_account_list().
-
-	* e-composer-private.c:
-	* e-composer-private.h:
-	New files manage composer's private data.
-	Allows other composer files to manipulate private data.
-
-	* e-msg-composer-hdrs.c:
-	* e-msg-composer-hdrs.h:
-	Remove these files; replaced by EComposerHeaderTable widget.
-
-	* evolution-composer.c:
-	* evolution-composer.h:
-	Remove these files; composer is now a subclass of GtkhtmlEditor.
-
-	* e-msg-composer-select-file.c:
-	* e-msg-composer-select-file.h:
-	Remove these files; logic moved to e-msg-composer.c.
-
-	* listener.c:
-	* listener.h:
-	Remove these files; event handlers moved to e-msg-composer.c.
-
-	* Composer.idl:
-	* Evolution-Composer.idl:
-	Remove these files; composer is no longer a Bonobo object.
-
-2008-03-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #513951
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans),
-	(autosave_init_file):
-	Use e_get_user_data_dir() instead of constructing the full path.
-
-	* e-msg-composer.c (e_msg-composer_unrealize),
-	(e_msg_composer_set_view_from), (e_msg_composer_set_view_replyto),
-	(e_msg_composer_set_view_to), (e_msg_composer_set_view_postto),
-	(e_msg_composer_set_view_cc), (e_msg_composer_set_view_bcc):
-	Emit warnings if saving to GConf fails.
-
-2008-02-25  Johny Jacob  <jjohnny@novell.com>
-
-	* e-msg-composer.c (e_msg_composer_show_sig_file): Reverting
-	commit for #371011.
-	
-2008-02-20  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #515744
-
-	* e-msg-composer.c: (drop_action):
-	Fixing previous fix - do not double free.
-
-2008-02-18  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #515744
-
-	* e-msg-composer.c: (drop_action): Memory leak fix.
-
-2008-01-25  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fix for bug #371011
-	
-	* e-msg-composer.c (e_msg_composer_show_sig_file): Insert a new 
-	paragraph for signature.
-
-2008-01-25  Johnny Jacob  <jjohnny@novell.com>
- 
-	** Fixes bug #503327 & #503678
-	
- 	* e-msg-composer.c (e_msg_composer_get_raw_message_text): Return
- 	GByteArray instead of gchar*
- 
-2008-01-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #509124
-
-	* e-msg-composer.c (e_msg_composer_get_message_print),
-	(e_msg_composer_get_message_draft):
-	Check result of build_message() for NULL before proceeding.
-
-2008-01-14  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #502783
-	** Patch from <nickspoon0@gmail.com>
-
-	* e-msg-composer.c: (e_msg_composer_new_with_message): Restore states 
-	of 'Request Read Receipt' and 'Prioritize Message' when opening a
-	draft message. 
-
-2008-01-06  Michael Monreal  <michael.monreal@gmx.net>
-
-	** Fix for bug #492188
-
-	* e-msg-composer.c:
-
-	Use the new Tangoized icons instead of deprecated icons from 
-	gnome-icon-theme.
-
-2008-01-02  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #364642
-
-	* e-msg-composer.c: (create_composer): Preset "Request Read Receipt"
-	based on gconf key "/apps/evolution/mail/composer/request_receipt".
-
-2007-12-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #495123
-
-	* e-msg-composer.c:
-	* e-msg-composer-hdrs.h:
-	* e-msg-composer-hdrs.c:
-	Move signature handling to e-msg-composer-hdrs.c.
-	Use an ESignatureComboBox.
-
-	* e-composer-from-header.h:
-	* e-composer-from-header.c:
-	Clean up the GtkHBox hack.  The signature combo is now packed
-	directly into the GtkTable.
-
-	* e-composer-name-header.c:
-	* e-composer-text-header.c:
-	Code cleanup.
-
-2007-11-29  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #271551
-
-	* e-msg-composer.h: (e_msg_composer_set_attach_path),
-	(e_msg_composer_get_attach_path):
-	* e-msg-composer.c: (e_msg_composer_set_attach_path),
-	(e_msg_composer_get_attach_path):
-	Functions to set/get attach path to both composer and editor.
-	* e-msg-composer.c: (prepare_engine):
-	Set last used path right after creation of the engine.
-	* e-msg-composer-select-file.c: (get_selector), (select_file_response),
-	(select_attach_response): Using new functions.
-	* listener.c: (impl_event): Store new file path when received event
-	about its change.
-
-	* e-msg-composer.c: (set_signature_gui): Leak fix.
-
-2007-11-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #495123
-
-	* Makefile.am:
-	Add a bunch of files for managing composer headers.
-
-	* e-msg-composer.c (build_message), (from_changed_cb),
-	(set_editor_signature), (e_msg_composer_set_body),
-	(e_msg_composer_get_preferred_account):
-	Use e_msg_composer_hdrs_get_from_account() to obtain the EAccount.
-
-	* e-msg-composer-hdrs.c:
-	* e-msg-composer-hdrs.h:
-	Massive refactoring to use new EComposerHeader classes.
-
-	* e-composer-header.c:
-	* e-composer-header.h:
-	* e-composer-from-header.c:
-	* e-composer-from-header.h:
-	* e-composer-name-header.c:
-	* e-composer-name-header.h:
-	* e-composer-post-header.c:
-	* e-composer-post-header.h:
-	* e-composer-text-header.c:
-	* e-composer-text-header.h:
-	New GObject classes manage different types of composer headers.
-	See bug #495123 for a more detailed description of each class.
-
-2007-11-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #318592
-
-	* e-msg-composer.h: (e_msg_composer_link_clicked):
-	* e-msg-composer.c: (e_msg_composer_link_clicked):
-	Helper function to response on editor's "link_clicked" event.
-	* listener.c: (impl_event): Call helper function on that event.
-
-2007-11-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-msg-composer.c (e_msg_composer_set_body_text):
-	Don't compare a character pointer to a string literal.
-
-2007-10-31  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer.c: Remove one more unused header.
-
-2007-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer-hdrs.c: Remove unneeded include
-
-2007-10-25  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer.c:
-	* e-msg-composer.h:
-	* listener.c: 
-	Warning fixes.
-	- NULL vs. 0
-	- ANSIfication of declarations
-	- mixing code and declarations
-
-2007-10-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #412360
-
-	* e-msg-composer-hdrs.c: (entry_query_tooltip):
-	New callback to query tooltip over GtkEntry.
-	* e-msg-composer-hdrs.c: (connect_entry_for_tooltip):
-	New function to connect GtkEntry to previous function and let it works.
-	* e-msg-composer-hdrs.c: (create_addressbook_entry), (create_headers):
-	Connect entries for tooltips.
-
-2007-10-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-msg-cmposer.c:
-	Remove the entry_pixcache array to silence the run-time warnings
-	when opening a new composer window.  The composer seems to work
-	fine without them; not sure why it was needed in the first place.
-
-2007-10-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #469657
-
-	* e-msg-composer.c:
-	Use destroy functions in GHashTables to simplify memory management.
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #477045
-
-	* e-msg-composer-select-file.c:
-	* e-msg-composer.c:
-	Use standard icon names where applicable.
-
-2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #476231
-
-	* e-msg-composer-select-file.c:
-	Remove non-USE_GTKFILECHOOSER code.
-	GtkFileChooser has been around since 2004.
-
-2007-09-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #476040
-
-	* e-msg-composer.c:
-	* e-msg-composer-attachment-bar.c:
-	Use "mail-attachment" icon instead of "stock_attach".
-	Use "mail-attachment" icon for unknown attachment types.
-
-2007-09-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #473903
-
-	* e-msg-composer.c: (handle_multipart_encrypted):
-	Fixes serious compiler warning.
-
-2007-09-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #471791 (Move away from asserts to g_ret*)
-
-	* e-msg-composer-hdrs.c: (setup_name_selector),
-	(create_from_optionmenu), (e_msg_composer_hdrs_get_recipients):
-	* e-msg-composer.c: (menu_edit_cut_cb), (menu_edit_copy_cb),
-	(menu_edit_paste_cb), (menu_edit_select_all_cb),
-	(update_auto_recipients), (composer_entry_focus_out_event_cb):
-
-2007-08-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #355766
-
-	* e-msg-composer.[ch] (e_msg_composer_get_message_print):
-	New function overrides composer flags for printing.
-	Patch by Mayank Jain.
-
-2007-08-23  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Raghavendran <raghavguru7@gmail.com>
-
-	** Fix for bug #328405
-
-	* e-msg-composer.c: (e_msg_composer_show_sig_file):
-	A signature will be attached when redirecting an email.
-	Fixes that issue.
-
-2007-08-16  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #350539
-
-	* e-msg-composer-attachment.c: (e_msg_composer_attachment_edit):
-	* e-msg-composer-attachment-bar.c: (update), (attach_to_multipart):
-	* e-msg-composer.c: (add_attachments_handle_mime_part),
-	(handle_multipart_signed), (handle_multipart_alternative),
-	(handle_multipart):
-	Ensures non-NULL part.
-
-2007-08-10  Johnny Jacob  <jjohnny@novell.com>
-	
-	* Modified and committed on behalf of Sankar P  <psankar@novell.com>
-	
-	** Fixes #462138
-	
-	* e-msg-composer.c: (set_editor_text):	Signature on top does not work if 
-	no signature is set as default.
-
-2007-08-02  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #462332
-
-	* e-msg-composer.c: Handle _NETSCAPE_URL correctly.
-	Suppress many warnings.
-	Remove unused e_msg_composer_show_attachments().
-
-2007-08-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for downstream bug from openSUSE (bnc #271045)
-
-	* e-msg-composer.c: (do_exit): When exitting, close after the message
-	was saved.
-
-2007-07-16  Sankar P  <psankar@novell.com>
-
-	* e-msg-composer.c: (set_editor_text):
-	Provide option to keep signature on top,
-	while replying. Outlook users need it. 
-
-2007-07-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-
-	* e-msg-composer.h: Fix for build break
-
-2007-07-09  Johnny Jacob  <jjohnny@novell.com>	
-	
-	* e-msg-composer.h : Added prototypes for
-	e_msg_composer_get_raw_message_text and
-	e_msg_composer_get_attachment_bar
-	
-2007-07-08  Johnny Jacob  <jjohnny@novell.com>
-
-	* e-msg-composer.c : (e_msg_composer_get_raw_message_text ) Added.
-	(e_msg_composer_get_attachment_bar) : Added. Returns the reference
-	to the attachment bar.
-	
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #444107
-
-	* e-msg-composer.c: (drop_action), (drop_popup_copy),
-	(drop_popup_move), (drag_data_received):
-
-2007-06-13  Bastien Nocera  <hadess@hadess.net>
-
-	* e-msg-composer.c: (composer_key_pressed): Use the
-	proper object to send the signal on (Closes: #442631)
-
-2007-06-13  Sankar P  <psankar@novell.com>
-
-	* e-msg-composer.c: (composer_key_pressed):
-	Fixes build break. Includes a missing header.
-	Fixes an invalid variable name.
-	See #442631
-
-2007-06-12  Bastien Nocera  <hadess@hadess.net>
-
-	* e-msg-composer.c: (composer_key_pressed):
-	Add support for the XF86Send multimedia key
-	(Closes: #442631)
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #386503 from Matthew Barnes
-	
-	* e-msg-composer.c: (e_msg_composer_show_help):
-
-2007-06-01  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #315012 from Pascal Terjan
-
-	* e-msg-composer.c: (handle_multipart_signed),
-	(handle_multipart_encrypted), (handle_multipart_alternative),
-	(handle_multipart), (e_msg_composer_new_with_message): Pass mime part
-	instead of multipart to camel_cipher_decryp
-
-2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #429422
-
-	* e-msg-composer-hdrs.c (init), (e_msg_composer_hdrs_new):
-	Use g_object_ref_sink() instead of gtk_object_sink().
-
-2007-04-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #356523 from Martin Olsson
-
-	* e-msg-composer.c: (e_msg_composer_add_inline_image_from_file): Copies 
-	the file uri and decodes it before trying to attach the image.
-
-2007-04-05  Sankar P  <psankar@novell.com>
-
-	* Patch committed on behalf of Paul Iadonisi <pri.gnome-bz@iadonisi.to>
-
-	* e-msg-composer-hdrs.c: (create_from_optionmenu):
-	Show only enabled accounts on composer.
-	Look at bug #243241
-
-2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-msg-composer-select-file.c:
-	Fix "incompatible pointer type" warnings (#360619).
-
-2007-03-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-msg-composer.c: Don't mix declarations and code (#405495).
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #360240
-
-	* e-msg-composer-hdrs (header_new_recipient):
-	* e-msg-composer.c (e_msg_composer_show_help), (drop_action):
-	Remove unused variables.
-
-2007-02-26  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	** Fixes #401546
-
-	mail-composer.error.xml: Added a new error in case if send options
-	is not supported by a provider and user tries to use it.
-	
-2007-02-26  Sankar P  <psankar@novell.com>
-
-	* e-msg-composer.c: (autosave_manager_query_load_orphans),
-	(autosave_init_file): 
-	Use ~/.evolution as the auto-save location.
-	
-	* Patch pushed upstream from Red Hat 
-	by Matthew Barnes <mbarnes@redhat.com>	
-
-	* Fixes #336612
-
-2007-02-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #343943
-
-	* e-msg-composer.c: (composer_key_pressed): Removes the extra tab in
-	the composer window.
-
-2007-01-25 Raghavendran <raghavguru7@gmail.com>
-
-	**Fixes bug #343943
-	* e-msg-composer.c:Added code for tab sequence to go from
-	  BCC into Body.
-
-2007-01-18  Raghavendran R<raghavguru7@gmail.com>
-	* e-msg-composer.[c,h]:
-	  (e_msg_composer_modify_header): ,
-	  (e_msg_composer_remove_header):
-	  Added code for modifying and removing camel
-	  mime message header .
-	  (menu_send_options_cb):Creates and emits the event
-	   when send options is clicked . 	
-
-2006-08-24  Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #261062
-	* mail-composer.error.xml: Translator comments added.
-
-2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes #351332
-
-	* e-msg-composer.c: Fix implicit function declarations.
-
-2006-08-06  Andre Klapper <a9016009@gmx.de>
-
-	* e-msg-composer.c: close an html tag properly. Fixes bug #350154.
-
-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.
-	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
-
-	* e-msg-composer.c (drop_action, attachment_guess_mime_type):
-	Modified to add images in plain text mode and other files in both
-	html and plain text mode as attachment during DnD.
-
-2006-02-16  Tor Lillqvist  <tml@novell.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_to)
-	(e_msg_composer_hdrs_get_cc, e_msg_composer_hdrs_get_bcc): Return
-	a value... Why are blatant errors like this just warnings in gcc?
-
-2006-02-09  Frederic Crozat  <fcrozat@mandriva.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_internal),
-	(e_msg_composer_hdrs_get_to, e_msg_composer_hdrs_get_cc),
-	(e_msg_composer_hdrs_get_bcc): Factorize some code.
-
-2006-02-07  Andre Klapper <a9016009@gmx.de>
-
-	* mail-composer.error.xml: fixing a patch to again fix 325276.
-
-2006-01-24  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* 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),
-	(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
-
-	* 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.
-	(show_attachments): Show/Hide attachment bar.
-	(attachment_expander_activate_cb): Event handler for attachment
-	bar.
-
-2006-01-13  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #326378
-	
-	* mail-composer.error.xml: Added mnemonics to Recover, Do not Recover
-	buttons in composer.
-
-2005-12-21 Rohini S <srohini@novell.com>
-
-	** See bug #246237
-
-	* 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-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
-	mkstemp(). Construct xml file names at run-time.
-
-	* e-msg-composer.c (autosave_manager_unregister): Close file
-	before unlinking so we don't leave stray autosave files laying
-	around on Win32.
-
-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".
-
-2005-12-07  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* e-msg-composer.[ch]:
-	(build_message):
-	(menu_insert_priority_cb):
-	(setup_ui):
-	(e_msg_composer_get_priority):
-	(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.
-
-2005-11-26  Tor Lillqvist  <tml@novell.com>
-
-	* e-msg-composer-attachment.c: Include e-util-private.h to get
-	redefinition of compile-time pathnames as calls to functions on
-	Windows. Construct the pathnames of files and directories under
-	the installation prefix at run-time to enable install-anywhere on
-	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
-
-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.
-
-2005-10-19  Philip Van Hoof <pvanhoof@gnome.org>
-
-	* composer/e-msg-composer-select-file.c,
-	* composer/e-msg-composer.c, composer/e-msg-composer.h,
-	* composer/evolution-composer.c, composer/listener.c,
-	* mail/em-composer-utils.c,
-	* plugins/mailing-list-actions/mailing-list-actions.c:
-	data hiding
-	
-2005-10-05  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	Reverting the last commit
-
-2005-10-05  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	** 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
-
-2005-10-04  Srinivasa Ragavan <sragavan@novell.com>
-
-	** fixes bug #316937
-	
-	* e-msg-composer.c (handle_mailto): Shows the attachments
-	when added via a mailto: url.
-	
-2005-09-29  Parthasarathi Susarla <sparthasarathi@novell.com>
-
-	** 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.
-	
-2005-08-22  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-msg-composer.c (drop_action): Show the bar depending on the 
-	number of attachments.
-	
-	* e-msg-composer-select-file.c (select_attach_response): Show the bar 
-	depending on the number of attachments.
-	
-	** Fixes the bug #313083
-	
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (build_message): only define skip_content: if
-	it is used.
-	(menu_file_add_attachment_cb): fixed the warning.  Boy, what on
-	earth is this thing doing!
-	(add_to_bar): fix signature to match code.
-	(emcab_add): more warning fixes for bizarre functions.
-	(emcab_popup_position): more casting crap
-
-	* e-msg-composer-hdrs.c (addressbook_dialog_response): Remove
-	unused.
-	(account_can_send): make this static, and define before first use.
-	: include missing e-name-selector-entry header.
-	(create_headers): fix casts/style
-	(e_msg_composer_hdrs_set_to, e_msg_composer_hdrs_set_cc)
-	(e_msg_composer_hdrs_set_bcc, e_msg_composer_hdrs_get_to)
-	(e_msg_composer_hdrs_get_cc, e_msg_composer_hdrs_get_bcc): remove
-	unused str.  lazy addressbook hackers!
-
-2005-07-27  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* e-msg-composer-select-file.h:
-	C99 keyword 'inline' could not been used as variable name.
-
-	Fixes #310198
-
-2005-07-26  Jody Goldberg <jody@gnome.org>
-
-	* Makefile.am: Fix build breakage due to extra whitespace after a
-	  backslash.
-
-2005-07-26  Harish Krishnaswamy  <kharish@novell.com>
-
-	* 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
-
-2005-07-21  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* e-msg-composer-hdrs.c (account_can_send): Use camel_object_unref
-	instead of g_object_unref.
-	
-2005-07-15  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* e-msg-composer-hdrs.c (account_can_send): unref the store which
-	was being leaked.
-	
-2005-07-14  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-hdrs.c (address_button_clicked_cb): add casts in
-	previous patch to fix warnings.
-	(account_can_send): fix the permission mode name.
-
-2005-07-13 S.Antony Vincent Pandian <santony@gmail.com>
-
-	** See bug #309869
-
-	* 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
-	leak the file name here.
-
-	* e-msg-composer.c (build_message): Don't allocate charset twice.
-
-2005-07-13  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am (INCLUDES): There are no camel or
-	addressbook/backend directories in evolution.
-
-2005-07-11  Srinivasa Ragavan <sragavan@novell.com>
-
-	* 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.h: Added removed old header includes
-
-2005-07-10  Shreyas Srinivasan <sshreyas@novell.com>
-
-	* e-msg-composer-hdrs.c: Take into account store
-	permissions (Read Only). These are proxy specific as of now.
-	
-2005-06-03  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-msg-composer.c (e_msg_composer_attach): Fixed to show the
-	attachment bar, when a message is forwarded
-
-2005-06-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-hdrs.c: hack up so we dont include
-	mail-component.h anymore, since it now relies on files generated
-	in mail/
-
-2005-06-03  Srinivasa Ragavan <sragavan@novell.com>
-
-	* 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.
-	 
-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.
-
-2005-05-24  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-msg-composer-attachment.c (finalise): Fixed a potential memory
-	  leak.
-
-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.
-
-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.
-	  
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* moved e-error to e-util.
-
-2005-05-09  Rodney Dawes  <dobey@novell.com>
-
-	* e-msg-composer-select-file.c (get_selector): Set a mnemonic for
-	the "Attach" button
-
-2005-05-06  Rodney Dawes  <dobey@novell.com>
-
-	* e-msg-composer-select-file.c (get_selector): Use "Attach" as the
-	text for the "Open" action button in the file chooser
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* mail.error.xml: renamed from mail-errors.xml, add i18n tags, fix
-	some whitespace issues.  Removed some unecessary translations.
-
-2005-05-05  Radek Doulik  <rodo@site>
-
-	* e-msg-composer.c (e_msg_composer_ignore): removed old unused
-	function which was using low level gtkhtml APIs
-
-2005-04-06  Radek Doulik  <rodo@novell.com>
-
-	* e-msg-composer.c (delete_old_signature): block gtkhtml's
-	selection so that we don't set primary X selection
-
-	Fixes #36972
-
-2005-04-05  ERDI Gergo  <cactus@cactus.rulez.org>
-
-	* e-msg-composer.c: implement read-receipt functionality.
-
-2005-03-16  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #73347
-
-	* mail-composer-errors.xml: set the default for auto-recover.
-
-2005-03-15  Hans Petter Jansson  <hpj@novell.com>
-
-	* e-msg-composer.c (setup_cut_copy_paste): Set up c/c/p for To: Cc:
-	Bcc: and Post To: entries too.
-
-2005-03-03  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #66592
-
-	* e-msg-composer.c (e_msg_composer_get_message_draft): set the uid
-	for the x-evolution-account, not the account name, which can
-	change.
-	(e_msg_composer_new_with_message): find the account by uid first,
-	fallback to name search.
-
-2005-03-02  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #66592
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): scan all
-	x-evolution-postto headers.  This makes post-to drafts work
-	properly.
-	(e_msg_composer_new_with_message): change for XEvolution removal.
-
-	* e-msg-composer-hdrs.c (set_pair_visibility): track visibility
-	ourselves.
-	(e_msg_composer_hdrs_to_message_internal): dont use the visibility
-	mask to determine what headers to add, use the actually shown
-	list.  Add back the x-evolution-postto headers.
-
-2005-02-15  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer-select-file.c (select_attach_response): Fix
-	previous patch for the !USE_GTKFILECHOOSER case.
-
-2005-02-16  Harry Lu  <harry.lu@sun.com>
-
-	Add a11y name for attachment button and bars
-
-	* e-msg-composer-attachment-bar.c:
-	(e_msg_composer_attachment_bar_new):
-
-	* e-msg-composer.c (create_composer):
-
-2005-02-10  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #66126.
-
-	* e-msg-composer-attachment-bar.c (destroy): destroy async file
-	requesters.
-	(add_from_user_response, add_from_user): use async file
-	requesters.
-
-	* e-msg-composer.c (save): don't fallback to saveas if the
-	filename is null.
-	(saveas, saveas_response): new functions for async file
-	requesters.
-	(menu_file_save_cb): call saveas if we have no filename.
-	(menu_file_save_as_cb): call saveas.
-	(menu_file_open_cb, file_open_response): change for async file
-	loading (which doesn't appear to be used anymore).
-	(destroy): destroy async requesters.
-
-	* e-msg-composer-select-file.c (get_selector): make it no longer
-	modal, no longer show the window.
-	(select_file_response, e_msg_composer_select_file): make it async.
-	(select_attach_response, e_msg_composer_select_file_attachments):
-	same.
-
-2005-01-24  Hans Petter Jansson  <hpj@novell.com>
-
-	* e-msg-composer-hdrs.c (create_addressbook_entry): Set pointers to the
-	contact editor creation functions in the entries, so they can pop up
-	said editors.
-
-2005-01-12  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (destroy): initialise composer before using it.
-	sigh.
-
-2005-01-05  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (d): turn off debug, setup g private instance
-	data structure.
-	(setup_ui): activate the composer plugin menu.
-	(destroy): clean up the composer plugin menu.
-	(class_init, init): init private instance data & plugin menu.
-
-2004-12-24  JP Rosevear  <jpr@novell.com>
-
-	* e-msg-composer.c (setup_signatures_menu): kill warnings
-	(map_default_cb): the to entry widget is now just a gtk entry at
-	its core, so check for text that way
-
-2004-12-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* Makefile.am (selectnamesdir)
-	(IDL_GENERATED)
-	(INCLUDES): Remove select-names from here.
-
-	* Composer.idl: Remove Evolution-Addressbook-SelectNames.idl include.
-
-2004-12-22  Hans Petter Jansson  <hpj@novell.com>
-
-	* e-msg-composer-hdrs.c (addressbook_dialog_response)
-	(setup_corba)
-	(setup_name_selector)
-	(address_button_clicked_cb)
-	(addressbook_entry_changed)
-	(create_addressbook_entry)
-	(destroy)
-	(e_msg_composer_hdrs_new)
-	(destinations_to_name_selector_entry)
-	(e_msg_composer_hdrs_set_to)
-	(e_msg_composer_hdrs_set_cc)
-	(e_msg_composer_hdrs_set_bcc)
-	(destination_list_to_destv)
-	(e_msg_composer_hdrs_get_to)
-	(e_msg_composer_hdrs_get_cc)
-	(e_msg_composer_hdrs_get_bcc): Adapt to new ENameSelector.
-
-2004-12-17  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (emcab_popup): 
-
-	* e-msg-composer.c (drag_data_received): 
-
-2004-12-08  Hans Petter Jansson  <hpj@novell.com>
-
-	* e-msg-composer-hdrs.h: Include <libebook/e-destination.h> from
-	evolution-data-server.
-
-2004-12-07  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c: include camel-cipher-context.h so we build if
-	nss isn't available.
-
-2004-11-26  JP Rosevear  <jpr@novell.com>
-
-	* e-msg-composer.c (create_composer): get image from icon factory
-	directly
-
-2004-11-15  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (handle_multipart_encrypted): remove the old
-	camel_multipart_encrypted api.
-
-2004-10-28  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (drag_data_received): fix the popup id.
-
-	* e-msg-composer-attachment-bar.c (emcab_popup): added popup doco.
-
-2004-10-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_key_pressed): Close on Esc.
-	(create_composer): Connect to the key-press-event signal.
-
-2004-10-26  mengjie yu  <meng-jie.yu@sun.com>
-	
-	fix for bugzilla #44876
-
-	* e-msg-composer-hdrs.c (header_new_recipient, create_headers):
-	add access key for Reply_to, From, Subject, To, Cc, Bcc, Post_to
-
-	* e-msg-composer.c (setup_signatures_menu): Add accesss key for
-	Signature.
-
-2004-10-19  JP Rosevear  <jpr@novell.com>
-
-	* e-msg-composer.c, e-msg-composer-attachment-bar.c: convert to
-	org.gnome hook names
-
-2004-10-08  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer.c (build_message): g_strdup() the gpg/smime keys
-	into the recipients list or else we end up free'ing them later
-	when we shouldn't. Fixes bug #66703
-
-2004-10-06  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (drag_data_received): 
-	* e-msg-composer-attachment-bar.c (emcab_popup): e-popup api changes.
-
-2004-10-01  JP Rosevear  <jpr@novell.com>
-
-	* e-msg-composer.c: uses GTKHTML_API_VERSION for the bonobo server
-	look up
-
-2004-10-01  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (create_composer): enable ask drop action and
-	hook onto drag motion.
-	(drag_motion): implement.
-	(drop_action): do the work here now.
-	(drag_data_received): popup a menu if the action is ask.
-	(drop_popup_copy, drop_popup_move, drop_popup_cancel):
-	(drop_popup_free): Popup callbacks.
-
-2004-09-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer.c: (autosave_manager_start),
-	(autosave_manager_stop), (create_composer): Use non-deprecated
-	functions.
-
-2004-08-17  Michael Meeks  <michael@ximian.com>
-
-	* e-msg-composer.c (handle_mailto): handle 'attachment' as
-	well, as per Mozilla's mangling, and the new desktop-launch spec.
-	[ this was approved months ago, but somehow never got committed ]
-	** See bug #65592
-
-2004-09-08  Not Zed  <NotZed@Ximian.com>
-
-        ** See bug #64454.
-
-	* mail-composer-errors.xml: add accelerators to modified message
-	dialogue.
-
-2004-08-13  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_show_sig_file): set paragraph
-	style to normal to avoid signature landing in PRE paragraph
-
-2004-07-29  Carlos Garnacho Parro  <carlosg@gnome.org>
-
-	* e-msg-composer-select-file.[ch]: Optionally use GtkFileChooser
-	if compiled against Gtk+ >= 2.4.0. (e_msg_composer_select_file):
-	added save_mode parameter
-
-	* e-msg-composer.c: use the modified e_msg_composer_select_file()
-	function
-
-2004-07-28  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c: Fixes for api changes in mail/ for 61940.
-
-2004-07-23  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c: removed unused static variable listener_vepv
-
-	* added len parameter to set_editor_text,
-	e_msg_composer_set_body_text, e_msg_composer_set_pending_body. it
-	allows us to send whole buffer (even if it contains \0 in the
-	middle) to gtkhtml editor.
-
-2004-07-22  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (set_editor_text): removed body content +
-	signature html concatenating and call e_msg_composer_show_sig_file
-	instead
-
-	Fixes #59490
-
-2004-07-20  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment.c: include config.h.  See #61395.
-
-2004-09-04  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-*.c: include gnome-i18n.h if required.
-
-2004-08-30  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (emcab_popup): em-popup based
-	popup menu to replace the gnome one.
-	(popup_menu_event): use new func above.
-	(button_press_event): ", some cleanup.
-
-2004-06-18  Not Zed  <NotZed@Ximian.com>
-
-	** Fix for #60387.
-
-	* mail-composer-errors.xml: added an error for failing to retrieve
-	to-be-attached messages.
-
-	* e-msg-composer.c (message_rfc822_dnd): remove this, we only want
-	to treat it as a real rfc822 message, not a berkeley mailbox.
-	(drag_data_received): handle the rfc822 type here, and also the
-	new x-uid-list type.
-	(attach_message): helper set a description on attached messages.
-
-2004-06-16  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_guess_mime_type): clean up the
-	code slightly.
-
-	* evolution-composer.c (impl_Composer_set_headers): Fix all the
-	strn?casecmp calls.
-
-	* e-msg-composer.c (from_changed_cb, drag_data_received) 
-	(is_special_header, e_msg_composer_new_with_message) 
-	(handle_mailto, e_msg_composer_new_from_url): as above.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): as
-	above.
-
-	* e-msg-composer.c (drag_data_received): handle comments in uri
-	lists.
-
-2004-06-14  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer.c (create_composer): Don't connect to the
-	key_pressed_event.
-	(composer_key_pressed): Removed. We don't want to close the
-	compose on Escape. To do so would violate the HIG.
-
-2004-06-07  Dan Winship  <danw@novell.com>
-
-	* e-msg-composer.c (pixcache): s/stock_save_as/stock_save-as/
-
-2004-06-04  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer.c (create_composer): Use e_error_run() instead of
-	the e_activation_error_dialog() stuff that no longer exists.
-
-2004-06-03  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_show_sig_file): always insert
-	new paragraph for signature
-
-	Fixes #37601
-
-2004-05-27  Jeffrey Stedfast  <fejj@novell.com>
-
-	* mail-composer-errors.xml: s/${0}/{0}/g
-
-2004-05-27  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am (EXTRA_DIST): Add $(error_i18n)
-
-2004-05-25  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (pixcache[]): use e-icon-factory sizes.
-
-	* e-msg-composer-attachment-bar.c (update): if we have a cached
-	icon, use it, don't just ignore it!  #58831.
-
-2004-05-19  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: don't dist the error .h file
-
-2004-05-18  Not Zed  <NotZed@Ximian.com>
-
-	* mail-composer-errors.xml: set the default for exit-unsaved to
-	save, as in 1.4.  #57995.
-
-	* e-msg-composer-hdrs.c (post_browser_clicked_cb): fix for folder
-	selector api change.
-
-2004-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* mail-composer-errors.xml.h: add for translators.
-
-	* mail-composer-errors.xml: renamed from xml.in file.
-
-	* Makefile.am: Fix for i18n build stuff.
-
-2004-05-11  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer.c (build_message): Use CAMEL_EXCEPTION_SYSTEM
-	instead of '1', also don't use camel_exception_setv() if we aren't
-	using the printf-style arguments. Just use camel_exception_set() -
-	safer anyway, since then we don't have to worry about translated
-	strings containing printf-style formatters that could break stuff.
-
-2004-05-08  Enver ALTIN <enver.altin@frontsite.com.tr>
-
-	* e-msg-composer.c: Fixing parts of #53466.
-
-2004-05-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c: header cleanups.
-
-2004-04-28  Not Zed  <NotZed@Ximian.com>
-
-	** Changed error messages to EError.
-
-2004-04-27  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (update): duh, pass the string
-	not the content type to the warning message.  And derrr, print it
-	for the actual error case, not the ok case.  Fixes #57680.
-
-2004-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_load_draft): Only unlink the original
-	autosave draft file if we are successful in saving a new copy,
-	otherwise don't unlink the file. Fixes bug #57540.
-
-2004-04-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (update): fallback to stock
-	unknown if we can't ifnd the icon.  #56717.
-
-2004-04-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (create_composer): Use the E_ICON_SIZE enums
-	rather than specifying an absolute pixel size.
-
-2004-04-19  Michael Terry  <mike@mterry.name>
-
-	* e-msg-composer.c: Update the composer to use the icon theme via
-	the EIconFactory object in e-util
-
-2004-04-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Same idea
-	here as with build_mesage(), don't convert th gconf charset
-	setting to the iconv name before setting it on the mime part.
-
-	* e-msg-composer.c (best_charset): Now returns a malloc'd string
-	bufefr containing the charset that has NOT been converted to the
-	iconv name. This is important in order to avoid using the iconv
-	charset name which may or may not necessarily be the IANA blessed
-	name.
-	(composer_get_default_charset_setting): Changed to always return
-	the actual value in the settings (eg. don't return the iconv
-	name).
-	(build_message): Updated for changes to best_charset(). Set the
-	actual charset name as the charset param and then get the
-	iconv_charset from that. Use iconv_charset everywhere else.
-	(get_file_content): Updated for changes to
-	get_default_charset_setting().
-	(setup_ui): Same.
-
-2004-04-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (get_file_content): To be on the safe side
-	(even though the real bug behind bug #51924 can't happen here),
-	protect against adding a NULL charset filter tot he filtered
-	stream.
-
-2004-04-13  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (drag_data_received): accept text/calendar
-	drops.
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients_from_destv):
-	EABDestination -> EDestination.
-	(e_msg_composer_hdrs_to_message_internal): same.
-	(e_msg_composer_hdrs_set_to): same.
-	(e_msg_composer_hdrs_set_cc): same.
-	(e_msg_composer_hdrs_set_bcc): same.
-	(e_msg_composer_hdrs_get_to): same.
-	(e_msg_composer_hdrs_get_cc): same.
-	(e_msg_composer_hdrs_get_bcc): same.
-	(e_msg_composer_hdrs_get_recipients): same.
-
-	* e-msg-composer-hdrs.h: convert prototypes such that
-	EABDestination -> EDestination.
-
-	* e-msg-composer.h: convert prototypes such that EABDestination ->
-	EDestination.
-
-	* e-msg-composer.c (destination_list_to_vector_sized): new
-	function, ripped from EABDestination, as this code is the only
-	consumer.
-	(destination_list_to_vector): same.
-	(update_auto_recipients): EABDestination -> EDestination.
-	(e_msg_composer_new_with_message): same.
-	(add_recipients): same.
-	(handle_mailto): same.
-	(e_msg_composer_set_headers): same.
-	(e_msg_composer_get_recipients): same.
-	(e_msg_composer_get_to): same.
-	(e_msg_composer_get_cc): same.
-	(e_msg_composer_get_bcc): same.
-
-	* evolution-composer.c (corba_recipientlist_to_destv):
-	EABDestination -> EDestination.
-	(impl_Composer_set_headers): same.
-
-2004-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (sig_select_item): Reversed the logic for
-	setting the signature menu to "None" (only set it to "None" if a
-	signature *isn't* set, doh!)
-	(prepare_signatures_menu): Removed. Combined with
-	setup_signature_menu().
-
-2004-04-06  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (prepare_signatures_menu): added empty hbox so
-	that we have 12pxs between account setting and signature setting
-	(set_editor_text): added pad_signature parameter to tell if we
-	want to pad signature with <BR> (used when creating new mail, in
-	other cases we don't want to pad the signature)
-
-	Fixes #42866
-
-2004-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (set_editor_text): Revert Radek's last change
-	to fix bug #56381.
-
-2004-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): Fixed some breakage I
-	introduced in the changes below.
-
-2004-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c: Updated to use the new signature APIs.
-	(signature_added): _()ify the "Autogenerated" signature name.
-
-2004-03-31  Not Zed  <NotZed@Ximian.com>
-
-	* *.[ch]: Fixed missing headers now mail/* doesn't include gtk/*,
-	camel/*, and gnome/* for you.
-
-2004-03-29  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (set_editor_text): do not add <br> between text
-	and signature
-
-2004-03-22  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (disable_editor): do not set editor
-	insensitive, use editable-off command instead
-
-	Fixes #55049
-
-2004-03-22  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-hdrs.c (post_browser_clicked_cb): exclude
-	non-viable folder targets for selection, related to #55089.
-
-2004-03-18  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (impl_event): delete event: if empty paragraph has
-	signature == 1 then set it to 0
-
-	Fixes #55735 (be sure to update gtkhtml as well)
-
-2004-03-17  Bill Zhu  <bill.zhu@sun.com>
-
-	* e-msg_composer-attachment-bar.c: If we select multi-attachments, the
-	"properities" menu item in popup icon context menu will be disabled.
-
-	Fixes bug #55299
-	
-2004-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (do_exit): If the subject is empty, use
-	_("Untitled Message") as the subject instead.
-
-2004-03-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #55202
-
-	* e-msg-composer.c (add_recipients): No longer takes a decode
-	argument (handle_mailto is the only function that calls it, and
-	the decode value always has to be TRUE for mailto).
-	(handle_mailto): Updated.
-
-2004-02-27  Bruce Tao <bruce.tao@sun.com>
-
-	* e-msg-composer-attachment-bar.c: add a key-press event handler, 
-	with which a little modification to Paolo Borelli's patch.
-	 <pborelli@katamail.com> When one attachment is deleted, the 
-	icon right after the last deleted one will be focused.
-
-2004-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (set_editor_text): Add a <br> tag between the
-	message text and the signature text (makes it nicer looking and
-	also fixes bug #53747.
-
-2004-02-17  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_unrealize): renamed from unmap
-
-2004-02-13  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (create_composer): get default composer size
-	from gconf, hook to unrealize event and save size to gconf
-	(e_msg_composer_unmap): new handler, saves composer window size
-
-2004-02-06  Rodney Dawes  <dobey@ximian.com>
-
-	* e-msg-composer-attachment-bar.c: add accel and icon for
-	the "remove" item in the popup menu.
-	Patch from Paolo Borelli  <pborelli@katamail.com>
-
-2004-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_guess_mime_type): use
-	FORCE_SLOW_MIME_TYPE so gnome-vfs actually sniffs the file
-	contents before coming up with a mime type.
-
-2004-02-03  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): add widgets/misc
-
-2004-02-02  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-composer.c (impl_Composer_set_body): use
-	g_ascii_strcasecmp rather than strcasecmp.
-
-	** See bug #53506, again.
-
-	* e-msg-composer.c (set_editor_text): Add an argument to make
-	adding the signature optional.  Also fix a memleak with the sig
-	content.
-	(e_msg_composer_new_with_type, e_msg_composer_flush_pending_body)
-	(handle_mailto, e_msg_composer_set_body_text)
-	(e_msg_composer_set_body): Fixed callers for above change
-	appropriately.
-
-2004-01-29  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_type): reverted
-	radek's patch below, it was already fixed (#53176).  Changed the
-	init order though, set_editor_signature only sets the current one,
-	it doen'st insert it.
-
-	** See bug #53506.
-	
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_post_to_list):
-	use a GString to build the result.
-	(e_msg_composer_hdrs_set_post_to_base): same here.
-	(e_msg_composer_hdrs_set_post_to_base): dont bother copying the
-	post_to string.
-	(e_msg_composer_hdrs_get_post_to): change the relative-url test to
-	":/" rather than "://", so that mbox url's work.
-
-2004-01-27  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_type): set body text
-	after setting composer's signature, so that signature is shown
-
-	Fixes #53367
-
-2004-01-28  Not Zed  <NotZed@Ximian.com>
-
-	** See Bug #53176, probably fixes others too.
-
-	* e-msg-composer.c (set_editor_text): When we set the text, always
-	add the signature implictly.  Means we don't have to set it
-	manually and break changing the file, or hit any races.
-	(e_msg_composer_set_body_text): dont call show_sig_file here.
-
-2004-01-14  Not Zed  <NotZed@Ximian.com>
-
-	** See Bug #20017.
-
-	* e-msg-composer.c (create_composer): set the composer to
-	unchanged after all setup, some setup (from_changed_cb) will mark
-	it changed.
-	(create_composer): remove a warning.
-
-	** See Bug #52794.
-	
-	(e_msg_composer_get_message_draft): save sign/encrypt settings to
-	X-Evolution-Format header.
-	(e_msg_composer_new_with_message): restore sign/encrypt settings
-	from X-Evolution-Format header.
-	(e_msg_composer_set_pgp_sign, e_msg_composer_set_pgp_encrypt)
-	(e_msg_composer_set_smime_sign, e_msg_composer_set_smime_encrypt):
-	Set composer changed if it did.
-
-2004-01-12  JP Rosevear  <jpr@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_post_to): fix
-	compilation error
-
-2004-01-12  Meilof Veeningen  <meilof@wanadoo.nl>
-
-	* e-msg-composer.[ch]: added "View To", "View Post To" menu items,
-	made it possible to see both at the same time, new
-	e_msg_composer_new_with_type, only visibility info of headers if
-	in the visible mask.
-
-	* e-msg-composer.[ch]: replaced folder selection button by entry
-	with selection button next to it, enabled multiple folder selection,
-	made it possible to see both To and PostTo fields, disabled
-	setting the "X-Evolution-PostTo" header.
-
-2004-01-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans):
-	s/unsaved files/unsaved messages/ as per bug #45407.
-
-2004-01-08  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (set_editor_signature): add an assertion for no
-	account set.  Discovered from bug #50786.
-
-2004-01-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (create_composer): Remove the 6-pixel border
-	around the main window. That just looked ugly.
-
-2004-01-07  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: missed this - remove disable deprecated flag
-
-2003-12-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_headers): Unifdef out the post-to
-	code and fix it to use the new folder selection button.
-	(e_msg_composer_hdrs_set_post_to): Same.
-	(e_msg_composer_hdrs_get_post_to): Same.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer-hdrs.c: Do not #include
-	<evolution-folder-selector-button.h>.
-	(e_msg_composer_hdrs_set_post_to): #if 0 out for now.
-	(e_msg_composer_hdrs_get_post_to): Likewise.
-
-2003-12-02  ERDI Gergo  <cactus@cactus.rulez.org>
-
-	* e-msg-composer.c: Implemented #127527: the attachment bar is
-	packed inside an EExpander
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* e-msg-composer-hdrs.h: Use BASE_VERSION for repo_ids and OAFIIDs
-
-2003-11-11  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_autosaved): new method to
-	wrap autosaved flag setting
-	(e_msg_composer_unset_autosaved): ditto
-	(e_msg_composer_is_autosaved): new method, says if composer was
-	autosaved only
-	(autosave_save_draft): unset changed so that we don't autosave all
-	the time when anything else than gtkhtml control changed
-
-2003-11-06  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (autosave_save_draft): call gtkhtml's saved
-	command to clean is-saved flag, set composer's autosaved flag
-	(do_exit): complain if last save was just autosave
-	(e_msg_composer_unset_changed): reset autosaved flag
-	(save): reset autosaved flag
-
-	* e-msg-composer.h: added autosaved flag, it tells whether last
-	save was autosave or regular save, when changed flag is reset the
-	autosaved one is reset too
-
-2003-11-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_headers): #if 0 the "post to"
-	stuff for now (it requires the global_shell_client and the
-	evolution_folder_selector_button which we don't have anymore).
-
-2003-11-26  Chris Toshok  <toshok@ximian.com>
-
-	* e-msg-composer.c (build_message): switch from just checking
-	SMIME_SUPPORTED to checking both HAVE_NSS and SMIME_SUPPORTED.
-
-2003-11-26  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: turn on deprecated gtk widgets
-
-2003-11-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (build_message): changed to use ciphercontext
-	directly to sign the message, no multipart-signed usage.
-	(build_message): do the same for multipart/encryption for gpg encrypting.
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer-hdrs.h (SELECT_NAMES_OAFIID): Append "_2".
-
-2003-10-31  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (build_message): fix for e-account smime info
-	changes.  Also enforce having a signing certificate set in
-	preferences before doing any signing.
-	(from_changed_cb): handle smime sign/encrypt default for account
-	(create_composer): force a from-changed when we start, to properly
-	setup signing options.
-
-2003-10-30  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c: Turn on SMIME_SUPPORTED.
-	(build_message): move some of the security code around, and fix
-	up smime code.
-
-2003-10-08  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-composer.c (corba_recipientlist_to_destv): EDestination =>
-	EABDestination, and e_destination => eab_destination.
-	(impl_Composer_set_headers): same.
-
-	* e-msg-composer.c (update_auto_recipients): EDestination =>
-	EABDestination, and e_destination => eab_destination.
-	(e_msg_composer_new_with_message): same.
-	(add_recipients): same.
-	(handle_mailto): same.
-	(e_msg_composer_set_headers): same.
-	(e_msg_composer_get_recipients): same.
-	(e_msg_composer_get_to): same.
-	(e_msg_composer_get_cc): same.
-	(e_msg_composer_get_bcc): same.
-
-	* e-msg-composer.h: EDestination => EABDestination, and
-	e_destination => eab_destination.
-
-	* e-msg-composer-hdrs.c (set_recipients_from_destv): EDestination
-	=> EABDestination, and e_destination => eab_destination.
-	(e_msg_composer_hdrs_to_message_internal): same.
-	(e_msg_composer_hdrs_set_to): same.
-	(e_msg_composer_hdrs_set_cc): same.
-	(e_msg_composer_hdrs_set_bcc): same.
-	(e_msg_composer_hdrs_get_to): same.
-	(e_msg_composer_hdrs_get_cc): same.
-	(e_msg_composer_hdrs_get_bcc): same.
-	(e_msg_composer_hdrs_get_recipients): same.
-
-	* e-msg-composer-hdrs.h: EDestination => EABDestination, and
-	e_destination => eab_destination.
-
-2003-09-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save): Don't blindly claim that the file
-	exists and then ask the user if he/she would like to overwrite
-	it. First check that the file even exists, if not - then we've got
-	a different error. Fixes bug #48759.
-
-	* e-msg-composer-select-file.c (e_msg_composer_select_file): Use
-	the proper selector title, otherwise it says "Attach files" when
-	we are trying to save a message.
-
-2003-09-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (get_default_charset): Same as
-	below.
-
-	* e-msg-composer.c (composer_get_default_charset_setting): Handle
-	empty-string as the charset value gotten from gconf as this can
-	happen. Partial fix for bug #47638.
-
-2003-09-13  Charles Zhang  <charles.zhang@sun.com>
-
-	* e-msg-composer-attachment-bar.c (remove_attachment): Add some
-	assertion. Send Close response signal to the properties dialog
-	while removeing an attachment.
-	* e-msg-composer-attachment-bar.c (remove_selected): Fix a re-
-	remove-attachment bug. [#48466]
-
-2003-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c: updated for
-	CamelTransferEncoding namespace changes
-
-	* e-msg-composer.c: updated for CamelTransferEncoding namespace
-	changes
-
-2003-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c:
-	* e-msg-composer-attachment.c:
-	* e-msg-composer.c: Updated for namespace changes in Camel.
-
-2003-09-17  Not Zed  <NotZed@Ximian.com>
-
-	** Merge in mail-refactor-2-branch
-
-2003-09-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer-hdrs.c (header_new_recipient): Make the entry
-	non-focusable again.  The right fix for A11Y is to add
-	accelerators.
-
-2003-09-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-msg-composer.h (EMsgComposer): Added an entry_uic field for a
-	BonoboUIComponent for the non-control entries (e.g. the Subject
-	line).
-
-	* e-msg-composer.c (create_composer): Set autoactivate to true on
-	the HTML control's BonoboControlFrame.
-	(setup_ui): Create the composer->entry_uic.
-	(destroy): Free the composer->entry_uic.
-	(entry_verbs): New array of verbs for the non-control entries.
-	Moved the Edit* verbs to here, as they should not be part of the
-	main set.
-	(composer_entry_focus_in_event_cb): Load
-	evolution-composer-entries.xml here for the non-control entries' UI.
-	(composer_entry_focus_out_event_cb): Remove the menu items.
-
-2003-09-10  Not Zed  <NotZed@Ximian.com>
-
-	* listener.c (impl_event): We want to use decode to stream for
-	attachment parts.
-
-2003-09-08  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (autosave_load_draft): ugh, direct linking to
-	evolution-mail suckage.  Should these callbacks just be handled
-	internally?
-	(handle_multipart_encrypted, handle_multipart_signed)
-	(handle_multipart_alternative, handle_multipart)
-	(e_msg_composer_new_with_message): Use new em_utils stuff for
-	message formatting.
-
-2003-08-22  Antonio Xu  <antonio.xu@sun.com>
-
-	* e-msg-composer-attachment.c (): Connect response signal to
-	attachment properties dialog, fix bug #47950.
-
-2003-08-21  Antonio Xu  <antonio.xu@sun.com>
-
-	* Makefile.am (INCLUDES): add EVOLUTION_IMAGESDIR define
-	* e-msg-composer.c (create_composer): use EVOLUTION_IMAGESDIR
-	and composer icon name to get the path of composer icon.
-	[#47781]
-
-2003-08-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Original patch from David Woodhouse, but modified a bit by me.
-
-	* e-msg-composer.c (handle_mailto): Fix insertion of arbitrary
-	headers from mailto: links. Ignore From: and Reply-To: headers.
-
-2003-08-13  Lorenzo Gil Sanchez  <lgs@sicem.biz>
-
-	* e-msg-composer-hdrs.c (account_removed_cb): fixed an insulting
-	error message. Fixes bug #47413.
-
-2003-08-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (update): This needs to use
-	camel_data_wrapper_decode_to_stream() rather than
-	write_to_stream(). Also simplify a bit - no sense looping to load
-	the pixbuf data into the gdk-pixbuf loader 4K at a time when we
-	have the whole thing in a memory buffer already. Once done, unref
-	the stream instead of closing it so we don't leak.
-	(attach_to_multipart): Use decode_to_stream().
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Avoid constructing thwe data-wrapper from the stream twice for
-	message/rfc822 parts.
-
-2003-07-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): don't set
-	the rawtext bit anymore.
-
-	* e-msg-composer.c (build_message): Convert the plain part's
-	content stream from UTF-8 to whatever charset we want.
-
-2003-07-31  Antonio Xu  <antonio.xu@sun.com>
-
-	* e-msg-composer.c (drag_data_received): add the drop type of
-	mozilla browser link to make composer support to handle mozilla
-	DnD data.  [#47131]
-
-2003-07-28  Antonio Xu <antonio.xu@sun.com>
-
-	* e-msg-composer-attachment-bar.c  (update): add
-	gdk_pixbuf_loader_close to close pix buffer loading.  [#45908]
-
-2003-07-25  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (GNOME_GTKHTML_EDITOR_CONTROL_ID): require the
-	new composer control version.
-
-2003-07-17  Michel Daenzer  <michel@daenzer.net>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): Set
-	default answer of dialog to 'yes' to try and prevent autosaved
-	messages from getting lost accidentally.
-
-2003-07-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Revert my
-	previous changes here too.
-
-	* e-msg-composer.c (build_message): Revert my previous changes.
-
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* bad-icon.xpm: Remove this. It was only used by e-icon-list,
-	which is no longer there.
-
-	* composer-marshal.list: Likewise
-
-	* Makefile.am: Update
-
-2003-07-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Init charset to NULL.
-
-2003-07-21  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (build_message): Make this work again.
-
-2003-07-17  Maxx Cao  <maxx.cao@sun.com>
-
-	** For bug #46013
-
-	* e-msg-composer-hdrs.c (header_new_recipient): To/cc/bcc buttons
-	made focusable.
-
-2003-07-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): don't set
-	the rawtext bit anymore.
-
-	* e-msg-composer.c (build_message): Convert the plain part's
-	content stream from UTF-8 to whatever charset we want.
-
-2003-07-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (popup_menu_event): Fix warnings
-	and other breakage introduced by Maxx.
-
-2002-07-14  Maxx Cao  <maxx.cao@sun.com>
-
-	** For bug #45826
-
-	* e-msg-composer-attachment-bar.c (class_init): connect the 
-	"popup_menu" signal, so that S-F10 keybinding will work.
-	(popup_menu_event): funcion added to handle "popup_menu" (S-F10 key).
-	(popup_menu_placement_callback): function added to place the popup 
-	menu to the center of attachment icon, in case it is activated by 
-	keyboard.
-	
-2003-07-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Updated to
-	use camel_strcase_hash/equal.
-
-2003-07-01  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (pixbuf_for_mime_type): Gone.
-	(update): Use e_icon_for_mime_type instead.
-
-	* Makefile.am (INCLUDES): remove EVOLUTION_IMAGESDIR define
-
-2003-06-25  Antonio Xu  <antonio.xu@sun.com>
-
-	* e-msg-composer.c (handle_mailto): Change file url to absolute
-	path. Fixes bug #44065.
-
-2003-07-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_load_draft): Connect to the
-	save-draft signal too. Fixes bug #45531.
-
-2003-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Set the rawtext bits for the
-	'plain' and 'html' data wrappers to FALSE.
-
-2003-06-19  Larry Ewing  <lewing@ximian.com>
-
-	* listener.c (insert_paragraph_after): free the return value.
-	(impl_event): free the return value.
-
-2003-06-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (best_encoding): Use e_iconv_open/close so that
-	we get charset aliasing for free. Fixes bug #44991.
-
-2003-06-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #44139.
-
-	* e-msg-composer-hdrs.c (attach_couple): Set the vertical and
-	horizontal padding to 3 always.
-	(create_from_optionmenu): Change the hbox spacing to 6 pixels.
-
-	* e-msg-composer.c (create_composer): Set the border width around
-	the composer's vbox to HIG specification and make the box_spacing
-	6 pixels as well.
-
-2003-06-10  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_and_string_free):
-	free the structure as well.
-
-2003-06-09  Larry Ewing  <lewing@ximian.com>
-
-	* listener.c (insert_paragraph_before): free the return values.
-
-2003-05-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_get_default_charset_setting): Same as
-	the rest.
-	(setup_ui): We didn't even seem to be using the gconf client
-	here. Removed.
-	(e_msg_composer_load_config): Unref the gconf client after we're
-	finished.
-	(e_msg_composer_new): Same.
-	(e_msg_composer_new_post): Here too.
-	(e_msg_composer_set_view_from): And here.
-	(e_msg_composer_set_view_replyto): And here.
-	(e_msg_composer_set_view_cc): Here too.
-	(e_msg_composer_set_view_bcc): Again here.
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Same as below.
-	(e_msg_composer_hdrs_set_from_account): Here too.
-
-	* e-msg-composer-attachment-bar.c (get_default_charset): Unref the
-	gconf client.
diff --git a/composer/ChangeLog.pre-1-4 b/composer/ChangeLog.pre-1-4
deleted file mode 100644
index 58f0eebec1..0000000000
--- a/composer/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,4037 +0,0 @@
-2003-05-20  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (composer_settings_update): set the various
-	bonobo properties that are composer preferences.
-	(create_composer): add notification of gconf changes.
-	(destroy): disconnect notification.
-
-	* e-msg-composer.h: keep the gcond notify handler id.
-
-2003-05-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):
-	Don't connect to the focus-out-event in order to update the
-	mime-type. Simply don't update the mime-type ever. Fixes bug
-	#42798.
-
-2003-04-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): Change
-	the "would you like to recover unsaved drafts?" dialog a QUESTION
-	dialog rather than an ERROR dialog. Fixes bug #42024.
-
-2003-04-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (pixbuf_for_mime_type): If we
-	fail to load the icon that gnome_vfs_get_icon() gave us, the
-	default back to gnome-unknown.png. This is the only POSSIBLE way
-	for Anna to be getting a NULL pixbuf if she has gnome-unknown.png
-	that I can see. Should fix bug #41513.
-
-2003-04-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (map_default_cb): removed debug printfs.
-
-2003-04-22  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (add_attachments_handle_mime_part): added
-	related argument, TRUE means that container of mime_part is
-	multipart/related
-	(add_attachments_handle_mime_part): add images as inline when
-	related is TRUE
-	(add_attachments_from_multipart): pass related to
-	add_attachments_handle_mime_part
-
-2003-04-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (add_attachments_handle_mime_part): Don't ever
-	attach non-inlined text or message parts. Reverts a prior fix.
-
-2003-04-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.glade: Change the order of the
-	ok/cancel buttons.
-
-2003-04-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #40694 ]
-	* e-msg-composer-hdrs.c (create_addressbook_entry): this can't
-	hurt - set the frame to autoactivate so if by some chance the
-	widget is focused the control will end up being activated.
-
-	* e-msg-composer.c (map_default_cb): activate the To: control
-	instead of focusing the widget.
-
-2003-04-18  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am:
-	* e-msg-composer.c:
-	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ().
-	Fixes bug #21499.
-	
-2003-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (file_name_focus_out_cb): Return
-	FALSE so the signal gets propogated further up the chain. Fixes
-	bug #41238.
-	(e_msg_composer_attachment_edit): The focus-out-event signal name
-	changed (although the old name still works...for now?).
-
-2003-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.glade: Updated to comply with the
-	HIG. Fixes bug #41239 and bug #41241.
-
-2003-04-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_get_default_charset_setting): Use
-	e_iconv_locale_charset() instead of e_iconv_locale_name(), dunno
-	what I was thinking. locale_name() doesn't even exist.
-	(setup_ui): Don't free the default_charset, it's a const char*.
-
-	* e-msg-composer-attachment-bar.c (get_default_charset): Same.
-
-2003-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-msg-composer.c (setup_ui): fix build, it's
-	composer_get_default_charset_setting.
-
-2003-04-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_get_default_charset_setting): Same as
-	with attachment-bar's get_default_charset().
-	(setup_ui): Instead of pulling the default charset from gconf,
-	call our helper function above.
-
-	* e-msg-composer-attachment-bar.c (get_default_charset): If gconf
-	returns a NULL string, default back to the locale charset.
-
-2003-04-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (map_default_cb): Added some debug printfs.
-	(create_composer): Call map_default_cb directly instead of having
-	it in a "map" callback. Ettore says we shouldn't be doing this
-	*shrug*. Still doesn't work tho.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #39763 ]
-	* e-msg-composer.c (setup_cut_copy_paste): remove the
-	control_entry_focus_{in,out}_event_cb signal stuff.
-	(control_entry_focus_in_event_cb): nuke
-	(control_entry_focus_in_event_cb): same.
-
-	* e-msg-composer-hdrs.c (create_addressbook_entry): pass the
-	contain to bonobo_widget_new_control_from_objref when creating the
-	entries.
-
-2003-04-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_save_draft): If the composer isn't
-	'dirty', then don't autosave the draft (no need to). Fixes bug
-	#40764.
-
-2003-04-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (menu_edit_select_all_cb): Add a select-all
-	callback and verb.
-	(composer_entry_focus_in_event_cb): Set our bonobo-ui verbs.
-
-2003-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-select-file.c (e_msg_composer_select_file): Guard
-	against the filesel's selection being NULL. Fixes bug #40679.
-
-2003-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_entry_focus_in_event_cb): Keep track
-	of which entry widget has focus.
-	(composer_entry_focus_out_event_cb): Same.
-	(control_entry_focus_in_event_cb): Same idea, but since this is in
-	another component, tell that component that its widget has focus
-	so it can merge bonoboui cut/copy/paste (and anything else) menus.
-	(control_entry_focus_out_event_cb): Same.
-	(setup_cut_copy_paste): Connect to the focus-in and focus-out
-	events for all the entry widgets and the html editor.
-	(menu_edit_cut_cb): New callback function since the composer will
-	now own the Cut/Copy/Paste menu items sometimes (depending on
-	which widget is in focus... confused yet? good).
-
-	* e-msg-composer-hdrs.c (from_changed): Update the Reply-To entry
-	to be a normal GtkEntry.
-	(create_headers): Same.
-	(e_msg_composer_hdrs_set_reply_to): Here too.
-	(e_msg_composer_hdrs_get_reply_to): And finally here.
-
-2003-04-01  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #40300 & probably others.
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): make the
-	composer arg a parent arg, its only used parent the dialogue.
-	Fix caller casts.
-	(e_msg_composer_check_autosave): new function, checks for
-	autosave files, and recovers them per user instructions.
-
-2003-03-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.glade: Convert to libglade-2's format.
-
-	* e-msg-composer.c (set_editor_signature): E_MSG_COMPOSER_HDRS
-	(composer->hdrs)->account->id can never be NULL anymore.
-
-2003-03-25  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c: Update for e_notice move
-
-2003-03-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes for bug #39813
-
-	* e-msg-composer.c (composer_finalise): Don't unregister the
-	signature event handler here.
-	(destroy): Unregister it here instead.
-
-2003-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (add_attachments_handle_mime_part): Change the
-	logic to attach text parts when appropriate.
-	(map_default_cb): Grab the focus of the To entry widget. Fixes bug
-	#39800. Fixes another #warning too.
-
-2003-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (do_exit): e_msg_composer_hdrs_get_subject()
-	now returns const so don't g_free() it :-)
-	(map_default_cb): Same as above. Also, the subject entry no longer
-	derives from GnomeCanvas so eliminate the now unneeded casting to
-	grab the focus of the subject widget.
-	(e_msg_composer_get_subject): Return a const char * now.
-
-	* e-msg-composer-hdrs.c (create_headers): Make the subject entry
-	into a GtkEntry so we don't have to worry about i18n and other
-	EEntry bugs anymore. Fixes numerous bugs (including #39924).
-	(e_msg_composer_hdrs_set_subject): Use gtk_entry_set_text().
-	(e_msg_composer_hdrs_to_message_internal):
-	e_msg_composer_hdrs_get_subject() now returns const.
-	(e_msg_composer_hdrs_get_subject): Return a const char *.
-	(entry_changed): e_msg_composer_hdrs_get_subject() now returns
-	const.
-
-2003-03-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (create_composer): Default the composer's title
-	to "Create a message". Fixes bug #39696.
-
-2003-03-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c: Use GnomeIconList instead of
-	EIconList so we don't have to maintain an exact copy/paste of
-	GnomeIconList ourselves. I don't udnerstand why we ever did.
-
-	* e-icon-list.[c,h]: Removed.
-
-2003-03-11  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-composer.c (evolution_composer_new): add
-	send_cb/save_draft_cb arguments.
-	(impl_Composer_send): use the local send_cb.
-	(evolution_composer_init): dont init send, save-draft signals
-	here.
-	(evolution_composer_new): init signals here, fix params to
-	composer_construct().
-	(evolution_composer_factory_init): remove, part of mailer now.
-	(factory_fn): same.
-	(finalise): disconnect from callbacks first.
-
-	* evolution-composer.h: add send_cb/save_draft_cb to composer object.
-
-2003-03-10  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-composer.c (finalise): from destroy.
-	(evolution_composer_class_init): gtkobject->gobject stuff.
-	(evolution_composer_new): remove old redundant stuff.
-
-2003-03-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_get_default_charset_setting): Don't
-	allow the returned charset to be NULL.
-	(get_file_content): Make sure there is buffered data before trying
-	to convert it to UTF-8.
-
-2003-03-04  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-hdrs.c (destroy): disconnect any signal handlers
-	on the accounts object.  For bug #37873.
-
-2003-02-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c: Same as below.
-
-	* e-msg-composer-attachment-bar.c: Go back to using
-	e_iconv_charset_name().
-
-2003-02-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (drag_data_received): Make sure the url is !=
-	NULL? I can't think of anything else in this code that could
-	possibly cause bug #38382.
-
-	* e-msg-composer-attachment-bar.c (pixbuf_for_mime_type): Fixed a
-	memory leak.
-
-2003-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_send_html): Don't save the
-	HTML format setting to gconf. This option menu is meant for a
-	per-essage setting (ie. once the composer closes, the next
-	composer will again use the default and not what the user chose
-	last time).
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: build libcomposer as a shared library so it can be
-	linked into libevolution-mail.so without portability problems
-
-2003-02-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (composer_get_default_charset_setting): Same as
-	below.
-
-	* e-msg-composer-attachment-bar.c (get_default_charset): Use
-	camel_charset_canonical_name() rather than e_iconv_charset_name()
-	as the latter will be removed shortly.
-
-2003-02-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account):
-	default_account is now a string value, not an int.
-	(create_from_optionmenu): Same.
-	(header_new_recipient): Use g_signal_connect_data() instead of the
-	now deprecated gtk_signal_connect_full().
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: clean up
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): #include
-	string.h
-	(menu_file_send_cb): s/gtk_signal_emit/g_signal_emit/
-
-	* e-msg-composer-attachment.c: #include string.h
-	(e_msg_composer_attachment_edit): s/E_GLADEDIR/EVOLUTION_GLADEDIR
-
-	* e-msg-composer-attachment-bar.c: #include string.h
-	(pixbuf_for_mime_type): s/ICONSDIR/IMAGESDIR/
-
-	* e-msg-composer-hdrs.c: #include string.h
-
-	* e-msg-composer-select-file.c (run_selector): Remove unused var
-
-	* evolution-composer.c: #include string.h
-	(evolution_composer_init): Remove unused var
-
-	* listener.c: #include string.h
-	(listener_new): Remove unused var
-
-2003-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_from_url): Split out the
-	mailto handling code from here so we can use it in the drag-n-drop
-	code too.
-	(drag_data_received): If we find a mailto: url in the
-	text/uri-list drop, pass that off to handle_mailto() so it can
-	fill in the fields for us.
-
-2003-02-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c: Just use
-	gnome_vfs_get_mime_type_from_name().
-
-2003-02-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (update_mime_type): Give
-	gnome_vfs_get_uri_from_local_path a full path.
-
-2003-01-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_from_url): If the subject
-	or body components of the mailto url are not in UTF-8, convert
-	them to UTF-8.
-
-	* e-msg-composer-attachment.c (update_mime_type): Fixed a #warning
-	by converting the filename into a uri before passing it into
-	gnome_vfs_get_mime_type() since that function really needs a uri.
-
-2003-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (init): Get the list of accounts here and
-	ref the account-list.
-	(destroy): Unref the accounts list here.
-	(create_from_optionmenu): Connect to the added/changed/removed
-	account-list signals here.
-	(account_added_cb): New callback function that adds the newly
-	added account to the from-dropdown menu.
-	(account_changed_cb): New callback that changes the label for the
-	account that got changed in the dropdown menu.
-	(account_removed_cb): Removes the account from the from dropdown
-	menu.
-
-2003-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (iconsdir): Remove, this is now defined in
-	configure.in.
-
-2003-01-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_load_config): Load the view
-	menu states from gconf.
-	(e_msg_composer_set_send_html): Save the setting via gconf instead
-	of bonobo-config.
-	(e_msg_composer_set_view_from): Same.
-	(e_msg_composer_set_view_replyto): Here too.
-	(e_msg_composer_set_view_cc): Again here.
-	(e_msg_composer_set_view_bcc): And finally here.
-	(setup_ui): Fixed a #warning - use gconf instead of bonobo-conf.
-	(destroy): No need to sync/destroy the bonobo-conf db, we don't
-	use it anymore.
-
-2003-01-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Get evolution-message-composer.xml
-	from EVOLUTION_UI_DIRECTORY.
-
-	* Makefile.am (gladedir): Version it using $(BASE_VERSION).
-	(iconsdir): Likewise.
-	(libcomposerincludedir): Removed.
-
-2003-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-composer.c (impl_Composer_set_headers): Updated to use
-	EAccountList and iterators.
-	(evolution_composer_init): Updated to use EAccount.
-
-	* e-msg-composer.c (from_changed_cb): Updated to use the EAccount
-	object.
-	(e_msg_composer_new_with_message): Same.
-	(e_msg_composer_get_preferred_account): Updated to return an
-	EAccount object.
-	(set_editor_signature): Updated to use an EAccountIdentity pointer.
-	(get_signature_html): Same.
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Updated to use
-	EAccount and EAccountList foo.
-	(destroy): Same here.
-	(e_msg_composer_hdrs_set_from_account): Here too.
-	(e_msg_composer_hdrs_get_from): Updated.
-
-2003-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (signature_cb): mail_config_get_signature_list
-	now returns a GSList.
-	(setup_signatures_menu): Same.
-	(set_signature_gui): Here too.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (do_exit): Make dialog HIG compliant
-	[Discard/Cancel/Save].
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_to): don't pass
-	NULL to bonobo_widget_set_property.
-	(e_msg_composer_hdrs_set_cc): same.
-	(e_msg_composer_hdrs_set_bcc): same.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_new): need to
-	ref/sink "new" so that the g_object_unref doesn't spew a warning.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Icons are now in $(datadir)/evolution/images
-	instead of $(datadir)/images/evolution.
-
-2003-01-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Use gconf to get
-	the default account index.
-	(e_msg_composer_hdrs_set_from_account): Same.
-
-2003-01-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (get_default_charset): New
-	convenience function.
-	(attach_to_multipart): Use get_default_charset().
-
-	* e-msg-composer.c (composer_get_default_charset): Convenience
-	function.
-	(get_file_content): Use the convenience function to get the
-	default charset setting.
-	(best_charset): Same.
-	(e_msg_composer_new): Use gconf to get the send_html setting.
-	(e_msg_composer_new_post): Same.
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: Remove idldir definition. (It's defined in
-	configure.in now)
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): Use camel_text_to_html().
-	(e_msg_composer_new_from_url): Same.
-
-	* evolution-composer.c (impl_Composer_set_body): Use
-	camel_text_to_html().
-
-2002-12-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #33295
-
-	* e-msg-composer-attachment.c: Change the parent_class to a
-	GObjectClass pointer instead of a GtkObjectClass pointer.
-	(e_msg_composer_attachment_edit): Ref the attachment object so
-	that if the attachment is removed while it is still being edited,
-	the attachment object will still exist and therefor foil the
-	user's attempt to make Evolution crash when they close the
-	properties dialog for this attachment.
-	(close_cb): Unref the attachment object.
-
-2002-12-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (message_rfc822_dnd): Get rid of the unused
-	exception variable.
-
-2002-11-27  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (save): removed warning about e_notice.  its
-	used too much, its here to stay.
-
-	* *.[ch]: run fix.sh over everything.
-
-2002-12-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c: s/g_str[n]casecmp/str[n]casecmp
-
-2002-11-26  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (composer_finalise): properly chain finalise.
-
-2002-11-25  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (init): Remove the window size
-	setting.
-	(e_msg_composer_attachment_bar_new): Move the window size setting
-	here.  Also set icon width based on 15 approximate characters, so
-	the icon text is more readable.
-
-2002-11-22  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-select-file.c: rewrote most of this.  Just use
-	gtkfileselection directly, no e-file-selector, much
-	smaller/simpler.
-
-2002-11-21  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (remove_attachment): fix
-	g_signal_emit params, detail in wrong spot.
-	(add_common): Same.
-
-	* e-icon-list.c (icon_new_from_pixbuf): remove the
-	'use_broken_event_handling' set.
-	(emit_select): Add detail to signal emit.
-	(text_changed): Same.
-
-	* e-msg-composer.c (subject_changed_cb): Duh!  dont free subject &
-	simplify logic a little.
-
-2002-11-20  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-hdrs.c (entry_changed): duh, emit the signal
-	using an initialised value(!).
-
-2002-11-19  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_get_sig_file_content): use
-	CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT flag
-
-2002-11-19  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (add_from_file): dont unref
-	after destroy. duh.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_to): Add type
-	code to set_property call.
-	(e_msg_composer_hdrs_set_cc): "
-	(e_msg_composer_hdrs_set_bcc): "
-	(e_msg_composer_hdrs_get_to): Do the same for get_property calls.
-	(init): ref/sink the tooltip object.
-	(e_msg_composer_hdrs_get_type): fix return type.
-
-	* e-msg-composer.c (GNOME_GTKHTML_EDITOR_CONTROL_ID): we want
-	version 3.0 not 1.1.
-	(create_composer): Add type code to set property call.
-	(autosave_manager_query_load_orphans): my bad, we dont unref
-	dialog's once we've destroyed 'em.
-	(build_message): "
-	(get_file_content): "
-	(save): "
-	(do_exit): "
-	(composer_dispose): moved the autosave shutdown here.
-
-2002-11-18  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (create_composer): Remove check for
-	gtk_main_level().  as far as i can tell it serves no real purpose,
-	and i think gtkmain is now redundant.
-	(e_msg_composer_new_with_message): Same here.
-	(destroy): moved some stuff into finalise, and made destroy
-	mulitcall safe.
-
-2002-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* listener.h: Removed {BEGIN,END}_GNOME_DECLS.
-
-	* e-msg-composer-select-file.c: Do not #include
-	<libgnome/gnome-defs.h>.
-	* e-msg-composer.c: Likewise.
-	* listener.h: Likewise.
-
-2002-11-13  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (setup_ui): bonobo api changes.
-
-	* e-icon-list.c (e_icon_list_new): Use the right object_new method.
-
-	* e-icon-list.h: get rid of BEGIN/END_GNOME_DECLS stuff.
-
-2002-11-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c: Remove some unused ehaders and
-	ones that cause compilation failures (such as gnome-defs.h).
-
-	* e-icon-list.h: Same.
-
-2002-11-08  Not Zed  <NotZed@Ximian.com>
-
-	* listener.c: Fix bonobo object setup.
-
-	* e-msg-composer-hdrs.c: Remove oaf stuff, fix destroy to be
-	multi-call safe.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Remove utf8 from locale conversions, & glib api changes.
-	(ok_cb): "
-
-	* e-msg-composer-attachment-bar.c (add_from_file): gtk message
-	dialog.
-	(pixbuf_for_mime_type): glib,gnome-vfs api changes.
-	(init): Estimate the icon_height based on the pango font
-	description size, this is probably not correct.
-	(properties_cb): 
-	(remove_cb): Changed signature for gnomeui callbacks.
-	(popup_icon_context_menu): 
-	(popup_context_menu): popup_menu api change
-	(destroy): Protect from multiple calls.
-	(e_msg_composer_attachment_bar_new): Remove push/pop
-	visual/colormap stuff.
-
-	* composer-marshal.list: The list of marshallers used by the
-	composer.
-
-	* Makefile.am (composer-marshal.h): Added composer marshal builder.
-
-	* evolution-composer.c (class_init): bonobo object epv setup change.
-	(factory_fn): Fix changes to factory callback.
-
-	* e-icon-list.c: (icon_get_height): Use bounding box to calc
-	height.
-	(icon_event): drop gtk_selection_extended.
-	(e_icon_list_remove): "
-	(select_icon): 
-	(unselect_icon): "
-
-	* e-msg-composer.c (autosave_save_draft): Dup fd rather than poke
-	camel_stream_fd's data.  Also, use camel_stream_close() rather
-	than flush.
-	(autosave_manager_query_load_orphans): Port to gtk dialog.
-	(autosave_query_cb): Removed, redundant.
-	(save): Port to gtkdialog.
-	(prepare_engine): Fix bonobo-object-client code.
-	(get_file_content): gtk dialog
-	(do_exit): gtk dialog.
-	(setup_signatures_menu): dump gtkutf8 stuff.
-	(marshal_NONE__NONE_INT): What WAS jeff thinking?  Removed :)
-	(class_init): g object setup.
-	(e_msg_composer_get_type): "
-	(create_composer): remove bonobo_window_construct, use create
-	property instead.  g_signal stuff.  bonobo stuff.
-	(is_special_header): Use ascii_strncasecmp
-	(e_msg_composer_set_pending_body): gtk->g_object_get/set_data.
-	(e_msg_composer_set_body): use ascii_strncasecmp
-	(e_msg_composer_add_inline_image_from_mime_part): make cid const.
-	(autosave_manager_register): 
-	(autosave_manager_unregister): Use g_path_get_basename() & account
-	for differences.
-	(composer_shutdown): rename to finalise/etc.
-	(class_init): Use object:finalize instead of shutdown.
-	(e_msg_composer_set_body): Use _() rather than U_().
-	(build_message): gtk dialog.
-
-2002-11-06  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-attachment-bar.c (pixbuf_for_mime_type): Add
-	error return to gdk_pixbuf_new_from_file().
-
-2002-11-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_from_url): Add support for
-	an attach option in the mailto: url.
-
-2002-10-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Make sure to
-	save References and In-Reply-To headers. Fixes bug #32932.
-
-2002-10-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Don't set
-	the charset param on text parts nor tha rawtext bit on the content
-	if a charset for the part is already specified.
-
-2002-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (size_to_string): Return NULL
-	instead of the empty string if the size is less than one K.
-	(update): Only put the size if size_to_string() doesn't return
-	NULL.  [#32751]
-
-2002-10-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Only add the
-	account address to the list of addresses if it is non-NULL. Fixes
-	bug #32446 although it shouldn't ever happen anyway (an account
-	address is not allowed to be NULL).
-
-2002-10-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): We
-	need to treat message/rfc822 streams differently. Fixes bug
-	#32378.
-
-2002-10-16  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-select-file.c (select_file_internal): Mark the
-	file selector modal.  Quick fix for bug #32256.
-
-2002-10-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Set
-	content->rawtext to TRUE for text parts because the content is in
-	its raw form (since we didn't know the charset when we created
-	it). Also only write out the content-object to discover the best
-	encoding, we don't want to include the headers of the MIME
-	part. Second half of the fix for bug #31655.
-
-2002-10-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (get_file_content): Don't create a new file if
-	the file doesn't exist.
-
-2002-10-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): If the user hits cancel when
-	signing/encrypting, don't continue constructing the message,
-	instead abort (and just don't pop up a dialog).
-
-2002-10-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): When signing/encrypting a
-	part, if a USER_CANCEL occurs, re-use the part otherwise unref it
-	and replace it with the new part.
-
-2002-09-30  Aaron Weber  <aaron@ximian.com>
-
-	* evolution-composer.c (evolution_composer_factory_init): adjust
-	string on line 391
-
-	* e-msg-composer.c (create_composer): adjust string on 2872
-
-2002-09-27  Dan Winship  <danw@ximian.com>
-
-	* Evolution-Composer.idl (setHeaders): let the caller set the
-	"From" account too (by name or address).
-
-	* evolution-composer.c (impl_Composer_set_headers): Update for
-	that.
-
-2002-09-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Don't reuse the part that
-	we've signed and/or encrypted, create a new part container
-	instead. Fixes bug #31379.
-
-2002-09-25  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_headers): Use "mail/*" for the
-	allowed_types for the posting folder selector.
-
-2002-09-24  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Only append the
-	account name to the end of the From menu item if the email address
-	is not unique. (That was added for people who have multiple
-	accounts with the same email address but different transports. The
-	rest of us don't need to be reminded of the account name, and
-	having it there can make the window very wide.)
-
-2002-09-24  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* e-msg-composer-attachment-bar.c (size_to_string):
-	Don't mark empty string with _().
-
-2002-09-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-icon-list.c (icon_new_from_pixbuf): Removed a #warning.
-
-	* e-msg-composer-attachment-bar.c (size_to_string): Don't use dots
-	here so we don't get funny wrapping from GnomeIconList.  [#236]
-
-2002-09-22  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (save): Fix non-ANSI switch statement
-
-2002-09-19  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (signature_cb): allow to select last 2 menu
-	items
-
-2002-09-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (add_attachments_from_multipart): Handle
-	multipart/signed and multipart/encrypted parts in a more expected
-	way. Fixes bug #28453.
-
-2002-09-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer.c: Mark a string for translation.
-
-2002-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (composer_key_pressed): Don't chain the event
-	handler here -- that's just wrong!  Also stop emission of the
-	signal when we catch Escape.
-
-2002-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (create_composer): Make it so that the composer
-	will close when the user hits Escape.
-
-2002-08-27  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (signature_cb): removed "Set as default" menu item
-
-2002-08-26  Peter Williams  <peterw@ximian.com>
-
-	* e-msg-composer.c (handle_multipart): Oops, we were overwriting
-	'multipart' with our child multipart. Fixes 29399.
-	(handle_multipart_alternative): Here too.
-
-2002-08-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #29016
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): If the
-	X-Evolution-PostTo header exists, then treat this message composer
-	as a PostTo composer rather than a mail composer.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message_internal):
-	Set the X-Evolution-PostTo header if that is the mdoe we are in.
-
-2002-08-16  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_headers): Use an
-	EvolutionFolderSelectorButton instead of a label to indicate the
-	posting destination. #27920.
-	(e_msg_composer_hdrs_set_post_to): Use
-	evolution_folder_button_set_uri.
-	(e_msg_composer_hdrs_get_post_to): Use
-	evolution_folder_button_get_folder.
-
-2002-08-14  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (from_changed_cb): Don't turn on pgp signing if
-	this is an iMIP message and pgp_no_imip_sign is set.
-	(e_msg_composer_set_body): If setting a text/calendar body and
-	pgp_no_imip_sign is true, turn off signing.
-
-2002-08-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (do_exit): Make the warning dialog display the
-	message subject so that it is more clear which composer the dialog
-	is referring to. Fixes bug #25467.
-
-2002-08-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-select-file.c (create_file_selection): Set the
-	file-selection window icon. Fixes the mailer part of bug #7368.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Don't call new_from_mime_part() since that function now does some
-	copying of the mime part rather than simply reffing it.
-	(e_msg_composer_attachment_new_from_mime_part): Make a copy of the
-	MIME part so that if the message that this part belongs to gets
-	deleted from the the remote store, the composer will still have a
-	copy of it. Fixes bug #20308.
-
-2002-07-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Parse the
-	auto-cc/bcc recipients and then later when parsing the cc/bcc
-	recipients into EDestination objects, if the address is an
-	auto-*cc address, then set auto_recipient to TRUE on that
-	EDestination. This fixes bug #28339.
-
-2002-07-29  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (encode_signature_name): new helper function
-	(decode_signature_name): new helper function
-	(get_signature_html): use encode_signature_name
-	(set_signature_gui): use decode_signature_name
-
-2002-07-26  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (do_exit): don't assert on default, when ESC is
-	pressed, the dialog is closed as well and we get button number -1
-	(set_signature_gui): new helper method to set signature from draft
-	message
-	(e_msg_composer_new_with_message): use set_signature_gui
-
-2002-07-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (pixbuf_for_mime_type):
-	Special-case message/digest, multipart/digest and message/rfc822
-	and give them a nice icon.  [#9786]
-
-	* Makefile.am (INCLUDES): Add -D for EVOLUTION_ICONSDIR.
-
-2002-07-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_headers): Create the Post-To
-	header.
-	(headers_set_visibility): Possibly show the Post-To header.
-	(attach_headers): Attach the Post-To header.
-	(e_msg_composer_hdrs_set_post_to): Set the text for the Post-To
-	header.
-	(e_msg_composer_hdrs_get_post_to_label): Return the label widget
-	for this header pair.
-	(e_msg_composer_hdrs_set_visible_mask): New function to set the
-	visible mask (so we can disallow certain headers to be shown).
-	(e_msg_composer_hdrs_new): Save the visible mask argument.
-	(setup_headers): To: does not always have to be visible anymore.
-	(e_msg_composer_hdrs_get_post_to): New function to get the url for
-	the Post-To folder.
-
-	* e-msg-composer.c (e_msg_composer_get_visible_flags): Set the
-	Post-To bit when it is supposed to be visible.
-	(e_msg_composer_new_post): Set the visible_mask to only allow the
-	headers needed for Posting.
-
-2002-07-25  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_body): Fix spelling.
-
-2002-07-23  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (autosave_run): restart automanager to avoid
-	multiple dialog apearing
-
-2002-07-23  Not Zed  <NotZed@Ximian.com>
-
-	* Applied patch below.
-
-2002-07-19  Christian Kreibich <christian@whoop.org>
-
-	* e.msg-composer.c (get_signature_html): Test for the signature
-	delimiter not only at the beginning of a signature file, but also
-	inside the signature.
-
-2002-07-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_view_bcc): Reverted some
-	code that got committed by accident.
-	(e_msg_composer_set_view_cc): Same.
-	(e_msg_composer_set_view_replyto): Here too.
-	(e_msg_composer_set_view_from): And here.
-
-2002-07-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c: Removed a lot of extra g_return_if_fail's that
-	we don't need (if we are going to check if the pointer is a a
-	composer widget using the gtk type-check macros, then there is no
-	need to first check that it isn't NULL).
-	(get_file_content): Signatures are now supposed to be in UTF-8 and
-	not the user's locale charset, so we must first read in the
-	content, then check that it is valid UTF-8. If it isn't, then we
-	need to try to convert it to UTF-8.
-
-2002-07-22  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c: removed Insert File menu item
-
-2002-07-19  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message_internal):
-	This should use address_encode, since its an rfc822 address, not
-	address_format which is for display.
-
-2002-07-17  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (save): use "saved" gtkhtml command
-	(e_msg_composer_is_dirty): use "is-saved" gtkhtml command
-
-2002-07-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_headers): Set the
-	from-account last so that auto-cc/bcc recipients don't get
-	overwritten when setting the cc/bcc recipient fields.
-
-2002-07-16  Peter Williams  <peterw@ximian.com>
-
-	* e-msg-composer.c (create_composer): Instead of doing this with a
-	weakref, do it by connecting to the destroy signal. The weakref was
-	not getting notified in certain conditions that I could never really
-	pin down, and this caused problems at exit.
-
-	* e-msg-composer-hdrs.c (create_headers): Reorder to create reply_to
-	before from, because create_from_optionmenu causes from_changed to
-	be called, which expects reply_to.entry to exist.
-
-2002-07-15  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (build_message): added save_html_object_data
-	parameter, use gtkhtml command to save object data when wanted
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am (INCLUDES): Fix cflags for ebook header namespacing.
-
-2002-07-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-composer.c (init): Don't connect to the postpone
-	signal, but do connect to the save-draft signal.
-	(evolution_composer_factory_init): No longer takes a postpone_cb
-	argument, but does now take a save_draft_cb argument.
-
-	* e-msg-composer.c (menu_file_send_later_cb): Removed.
-	(class_init): Removed the POSTPONE signal.
-	(setup_ui): Don't need to swap the Send/SendLater tooltips and
-	accels anymore, since SendLater no longer exists.
-
-2002-06-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Use the new
-	CamelMultipartEncrypted class to do our encryption work for us. We
-	also need to always get the user's userid before encrypting since
-	pgp/gpg need that.
-	(e_msg_composer_new_with_message): Handle multipart/signed and
-	multipart/encrypted parts by adding the (decrypted) content and
-	setting the composer to pgp sign/encrypt the message when the user
-	re-sends it.
-
-2002-06-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Use
-	mail_crypto_get_pgp_cipher_context() so that the PGP/GPG decision
-	is done for us.
-
-2002-06-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Use the new gpg cipher context
-	rather than the old pgp context.
-
-2002-06-19  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): don't convert text to
-	html twice
-
-2002-06-10  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (signature_cb): added "Set as default" menu
-	item
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_from_omenu): new
-	method
-	(e_msg_composer_hdrs_set_from_account): use
-	e_msg_composer_hdrs_get_from_omenu
-
-2002-06-07  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): use new script signature
-	interface
-
-2002-06-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account):
-	Agh, priv->from.entry is no longer a GtkOptionMenu - it is an hbox
-	containing the GtkOptionMenu.
-
-	* e-msg-composer.c (setup_ui): Remove the customize toolbar thingy
-	since Michael said that this would fix bug #17952.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account):
-	Clean up the logic in this. For one, we don't need to do strstr
-	using the account address (wtf??).
-
-2002-06-05  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): put option menu
-	to hbox to make space for signatures menu
-	(e_msg_composer_hdrs_get_from_hbox): new helper function
-
-	* e-msg-composer.c: moved signatures from menu to option menu next
-	to From:
-
-2002-06-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (build_message): Properly handle user
-	cancellation for signing/encrypting, just dont sign but create
-	anyway.
-	(e_msg_composer_get_subject): Wrapper function to get the subject
-	from the header object.
-	(e_msg_composer_get_to):
-	(e_msg_composer_get_cc):
-	(e_msg_composer_get_bcc): Same for the destination types.
-
-2002-06-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_guess_mime_type): Allocate a
-	new FileInfo struct here rather than using and unref it when we're
-	finished with it.
-
-2002-05-30  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (build_message): Changes for multipart/signed
-	api changes.
-
-2002-05-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c: New local `all_composers'; keeps a list of all
-	the composer windows created.  Changed type of `parent_class' to
-	BonoboWindowClass *.
-	(do_exit): Cleaned up a bit.  Raise the composer window before
-	showing the message box dialog.
-	(exit_dialog_cb): Removed.
-	(e_msg_composer_request_close_all): New.
-	(create_composer): Add the composer to the all_composers list and
-	weakref it.
-	(msg_composer_destroy_notify): GtkDestroyNotify function for the
-	composer's weakref; remove the composer from the all_composers
-	list.
-
-2002-05-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Just use g_basename.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Check for empty-string pgp-key
-	ids and don't use them.
-
-2002-04-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (destroy): Unref the priv->tooltips object
-	here.
-
-	* e-msg-composer-attachment-bar.c (destroy): Free the priv struct.
-
-	* e-msg-composer.c (set_editor_signature): We don't need a 'name'?
-	So don't strdup it.
-
-2002-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (from_changed): Change the Reply-To header
-	contents.
-	(e_msg_composer_hdrs_set_reply_to): The Reply-To entry was an
-	EEntry, not a bonobo control so fix this to set the text using
-	e_entry_set_text.
-	(e_msg_composer_hdrs_get_reply_to): Use e_entry_get_text here for
-	the same reason.
-
-2002-04-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (set_editor_text): No need to query for the
-	persist-stream interface here, just re-use
-	composer->persist_stream_interface - this might improve the speed
-	at which a reply action brings up the composer.
-
-2002-04-09  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients_from_destv): Use decode
-	rather than unformat - the e_destination was changed (long time
-	ago) to rfc2047 encode the addresses, so we should decode
-	likewise.  Should fix #16158.
-
-	* e-msg-composer.c (next_word): g_utf8_next_char never returns
-	NULL, it just skips to the next character.  So like normal string
-	code, we just check for a nul explicitly.  Fixes a bug found while
-	checking #16158.
-
-2002-04-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #3980.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_cc): If a Cc list
-	is set to something non-empty, make sure to show the Cc widgets.
-	(e_msg_composer_hdrs_set_bcc): Same but for Bcc.
-	(e_msg_composer_hdrs_set_reply_to): And here.
-
-2002-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-msg-composer-select-file.c: Switch to using EFileSelection
-	here instead of GtkFileSelection.
-
-2002-03-27  Larry Ewing  <lewing@ximian.com>
-
-	* Makefile.am: fix for the changes to GTKHTML_DATADIR that include
-	the release number.
-
-2002-03-18  Dan Winship  <danw@ximian.com>
-
-	* Evolution-Composer.idl, evolution-composer.c
-	(impl_Composer_show): "Forward as iCalendar" uses set_body, so we
-	can't make the composer un-showable after doing that. So get rid
-	of the "cannot show" exception.
-
-	* e-msg-composer.c (e_msg_composer_set_body): Prepare the composer
-	to be shown in its weird state: Put an explanatory message in the
-	body, then call disable_editor.
-	(disable_editor): Common editor-disabling code - makes the editor
-	and attachment bar insensitive and disables any menu items that
-	could be used to modify them.
-	(e_msg_composer_new_redirect): Use disable_editor here now.
-	
-2002-03-15  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c: use gtkhtml editor API version 1.1
-
-2002-03-11  Dan Winship  <danw@ximian.com>
-
-	* listener.c (impl_event): Remove the extremely verbose printf
-	here.
-
-2002-03-07  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (destroy): ops, unregister and not register new
-	one sig_event_client
-
-2002-03-04  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (build_message): Fix a dumb bug in previous
-	commit that broke iMIP containing 8-bit data.
-
-2002-02-25  Dan Winship  <danw@ximian.com>
-
-	Mailer side of 14705.
-	
-	* Evolution-Composer.idl (setBody): Change setBodyText to setBody
-	and take a MIME type as well.
-	(show): Add an exception.
-
-	* evolution-composer.c (impl_Composer_set_body, etc): Update for
-	IDL change. While I'm here, fix this to DTRT with both plaintext
-	and HTML bodies. (It claimed to take plain text before, but then
-	passed it to the composer as HTML.)
-	(impl_Composer_show): Raise an exception if setBody has been
-	called, since the composer window will not display the real data
-	in that case.
-
-	* e-msg-composer.c (e_msg_composer_set_body): interface for
-	impl_Composer_set_body.
-	(build_message): If e_msg_composer_set_body has been called, use
-	the body and MIME type supplied to it rather than the contents of
-	the HTML editor.
-
-2002-02-14  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (delete_old_signature): don't insert paragraph
-	here, also delete paragraph where signature was
-	(e_msg_composer_show_sig_file): test if we are in empty document
-	and if so, insert new paragraph for signature
-
-2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_flush_pending_body): Use
-	set_editor_text()
-	(e_msg_composer_new_from_url): Same.
-	(e_msg_composer_set_body_text): Re-Show the signature.
-
-2002-02-12  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_is_dirty): reflect gtkhtml API
-	change
-
-2002-02-11  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_drop_editor_undo): new method,
-	drops undo in editor and resets dirty flag in editor
-	(do_exit): remove TRUE from condition as dirty flag in editor
-	should work now
-	(e_msg_composer_is_dirty): use new editor API for dirty flag
-
-2002-02-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (update_auto_recipients): Update the
-	auto-cc/bcc recipients in the composer header fields to match the
-	ones chosen in the account configuration.
-
-2002-01-31  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_ignore): new method, tells
-	composer to ignore all word in str string
-	(next_word): helper function to get next word from s, saves rest
-	of s to sr
-
-2002-01-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): If we are in redirect mode,
-	use the original message and set the resent-* headers using
-	e_msg_composer_hdrs_to_redirect() and then return.
-	(destroy): Unref the redirected message if it exists.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_redirect): New
-	function for a composer in redirect mode.
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Use GNOME_FULL_CFLAGS.
-
-2002-01-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (get_file_content): Rewrote to use CamelStreams
-	and also convert the file contents to UTF-8 (assums the file
-	charset is the same charset that the composer is set to).
-	(menu_file_insert_file_cb): Pass the composer into
-	get_file_content().
-	(e_msg_composer_get_sig_file_content): Pass NULL as the composer
-	argument.
-
-2002-01-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (class_init): Fixed the setup of the
-	"save-draft" signal so that it would actually work.
-
-2002-01-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (is_special_header): Greatly simplified. No
-	need to have a list of headers to not accept - we can just refuse
-	all headers that are not X-* headers (other than X-Evolution
-	headers).
-
-2002-01-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_get_message_draft): Set the
-	X-Evolution-Format header to text/plain if that is the editing
-	mode we are really in. This fixes bug #11499.
-
-2002-01-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_from_url): A few minor
-	fixes to make it more compliant with rfc2368. Should now be fully
-	rfc compliant as far as I can tell.
-
-2002-01-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):
-	Only connect to the parent's destroy/hide signals while the
-	attachment editor dialog is "alive".
-
-2001-12-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-select-file.c (composer_hide_cb): Only cancel the
-	selection dialog if it is currently in use, otherwise we'll get an
-	extra gtk_main_quit and the mailer will exit :-(
-
-2001-12-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (read_file_content): Don't block forever if we
-	are reading a fifo with no data.
-
-2001-12-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (class_init): Setup the SAVE_DRAFT signal.
-	(menu_file_save_draft_cb): Emit the SAVE_DRAFT signal.
-	(exit_dialog_cb): Same here.
-	(save_draft): Removed. This code is now a signal that
-	mail-callbacks will connect to.
-
-2001-12-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):
-	Attach to the parent widget's destroy signal - when that gets
-	destroyed, we need to cancel the editor dialog too. Also connect
-	to our parent window's "hide" signal so that when the composer
-	gets hidden (ie, it's being sent), we also close the dialogs.
-
-	* e-msg-composer.c (init): Default composer->enable_autosave to
-	TRUE.
-
-2001-12-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-select-file.c (confirm): If multiple-selection is
-	enabled but nothing is slected, fall back to using the filename in
-	the entry box as the "selected" file.
-	(create_file_selection): If the composer gets hidden (ie it's
-	being "sent") then cancel the file selection dialog.
-
-2001-12-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-select-file.c
-	(file_selection_info_destroy_notify): If the widget is non-NULL,
-	then gtk_widget_destroy that bad boy...
-
-2001-12-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (add_from_user):
-	select_file_attachments now returns a GPtrArray so handle that and
-	loop until we've added all the attachment files.
-
-	* e-msg-composer-select-file.c (confirm): Add an evil kludge to
-	get a list of filenames from the GtkFileSelection widget based on
-	the label in the history option menu item and the base filenames
-	of the selected items in the filename clist.
-	(create_file_selection): Setup the clist to allow multiple
-	selection.
-	(file_selection_info_destroy_notify): Destroy the GPtrArray
-	containing the list of xselected files.
-	(select_file_internal): Return a GPtrArray of files instead of a
-	char *.
-
-2001-12-10  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer.c (get_file_content): Only execute an executable
-	sig file if a magic environment variable is set.
-
-2001-12-06  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer.c (executed_file_output): Added.  Executes the
-	given file and returns its output as a string.
-	(get_file_content): Stats the file to see if it is executable.
-	If it is, execute it and return the string.  If not, just read
-	the file and return the contents.
-
-2001-11-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Change the FileSend tooltip the be
-	the same as the FileSendLater tooltip if we are in offline mode.
-
-2001-11-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (drag_data_received): Allow drag & drop for
-	vcards.
-
-2001-11-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Change the FileSend tooltip the be
-	the same as the FileSendLater tooltip if we are in offline mode.
-
-2001-11-14  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (create_composer): popup failure dialog if we
-	cannot get a valid editor_engine.
-	(prepare_engine): make the checks robust and make sure that we
-	unset the engine if any part fails. 
-
-2001-11-02  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (add_inlined_images): use hash table to
-	eliminate duplicates
-
-2001-11-02    <NotZed@Ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_enable_autosave): New
-	function, enable/disable autosave for the composer temporarily.
-	(autosave_run_foreach_cb): Only save if we have enable autosave
-	turned on.  In other cases we want to save it regardless.
-
-2001-10-30  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (build_message): Add back the "remove
-	Content-Disposition when sending itip" hack.
-
-	* Evolution-Composer.idl (setMultipartType): New.
-
-	* evolution-composer.c (impl_Composer_set_multipart_type): Allow
-	caller to specify a multipart/alternative rather than
-	multipart/mixed.
-
-	* e-msg-composer.c (build_message): Revert yesterday's changes.
-	Add new ones for sending multipart/alternative.
-
-2001-10-30  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.h: add dirty prototype.
-
-	* e-msg-composer.c: add dirty implementation.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (insert_paragraph_before): new helper function,
-	extracted
-	(insert_paragraph_after): ditto
-	(impl_event): process command_before and command_after, use new
-	functions
-	(clear_signature): reset style to be sure
-	(reply_indent): ditto
-
-2001-10-30  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (build_message): Remove Content-Disposition in
-	the no_body case. (More kludging around Outlook iCalendar
-	brokenness.)
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Put the charset encoding submenu in
-	the EncodingPlaceholder.
-
-2001-10-29  Dan Winship  <danw@ximian.com>
-
-	* evolution-composer.c (init): Set the (new) "no_body" flag on the
-	composer.
-	(impl_Composer_set_body_text): And unset it here.
-	(unset_no_body): And here (called if/when the composer is
-	realized).
-
-	* e-msg-composer.c (build_message): If the composer has the
-	"no_body" flag set, and a single attachment, promote that
-	attachment to be the message body.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (reply_indent): simplified, requires new gtkhtml
-
-2001-10-29  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.h: add GList to hold the current images.
-
-	* listener.c (resolve_image_url): keep track of the images that
-	the editor is currently uses in current_images as well as storing
-	the images in the hash.
-
-	* e-msg-composer.c (clear_current_images): clear the list of
-	images actually in the message.
-	(add_inlined_images): use the current image list rather than the
-	hash tables.
-	(build_message): clear the current image list when appropriate.
-	(init): initialize current_images.
-	
-2001-10-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (add_attachments_from_multipart): New function
-	that replaces handle_multpart() and handle_multipart_alternative()
-	for add_message_attachments().
-	(e_msg_composer_add_message_attachments): Call
-	add_attachments_from_multipart().
-	(handle_multipart_alternative): Now only used by
-	new_with_message() and is really only designed to work well with
-	messages generated by Evolution (ie for editing Drafts and such).
-	(handle_multipart): Same.
-	(e_msg_composer_new_with_message): No longer calls
-	add_message_attachments() because we can't ever have this fail and
-	the logic in add_message_attachments() is impossible
-	logic. Instead do like what we used to do before the addition of
-	add_message_attachments() came along.
-
-2001-10-24  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c
-	(e_msg_composer_add_inline_image_from_mime_part): rework this so
-	that we don't end up freeing the cid then reading from it.
-
-2001-10-22  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Check that
-	account->id->address != NULL.
-
-2001-10-21  Dan Winship  <danw@ximian.com>
-
-	Make inline images used for replies not show up as
-	attachments. Also, I think this should make replies to HTML
-	messages containing inline images referenced via Content-Location
-	work, but that's not tested.
-
-	* e-msg-composer.c (various): Keep two hash tables of inline image
-	data: one mapping from cid: URLs to CamelMimeParts for all
-	attachments, the other mapping from file: and Content-Location
-	urls to CamelMimeParts (for those inline images that came from a
-	file or have a Content-Location).
-	(add_inlined_images): Simplify. Most of this code is in
-	e_msg_composer_add_inline_image_from_file() now.
-	(e_msg_composer_add_message_attachments, handle_multipart): Change
-	"attach_all" arg to "just_inlines". If it is set, call
-	e_msg_composer_add_inline_image_from_mime_part on any attachment
-	with a Content-Id or Content-Location.
-	(e_msg_composer_add_inline_image_from_file): Create a mime part
-	from a file and add it to the inline images hash.
-	(e_msg_composer_add_inline_image_from_mime_part): Add a mime part
-	directly to the inline images hash.
-
-	* listener.c (resolve_image_url): If asked to resolve a file: URL
-	that isn't in the inline images hash, call
-	e_msg_composer_add_inline_image_from_file to get a cid for it.
-	(impl_event): Look up the URL in the inline_images and
-	inline_images_by_url hashes.
-
-	* e-msg-composer-attachment-bar.c
-	(e_msg_composer_attachment_bar_find_message): Gone. No longer
-	used.
-
-2001-10-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (handle_multipart): Now takes a 'attach_all'
-	argument. If !attach_all, then only attach the attachment if the
-	part has a content-id, otherwise we can safely assume that nothing
-	references it thus we don't need to attach it.
-	(e_msg_composer_add_message_attachments): Now takes a 'attach_all'
-	argument that overrides the "only attach attachments if they have
-	a content-id header" behavior.
-	(e_msg_composer_new_with_message): Pass TRUE as the attach_all
-	argument to add_message_attachments.
-
-2001-10-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (best_encoding): Don't use a
-	g_return_val_if_fail after iconv_open, this is a valid error
-	condition and so should use check it for real.
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Correctly
-	set the charset parameter and use camel's bestenc filter to
-	determine which content transfer encoding to use.
-
-2001-10-15  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_add_message_attachments):
-	s/apply/flush/.
-	(e_msg_composer_flush_pending_body): renamed from apply now takes
-	apply as an argument.
-	(e_msg_composer_show_sig_file): s/g_assert/g_return_if_fail/
-	warnings make for less painful bugs than crashes.
-	(set_editor_text): s/g_assert/g_return_if_fail/
-
-2001-10-13  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_unregister): Don't pop up an
-	"unable to retrieve message" if the composer never finished
-	initializing.
-	(init): Don't call autosave_manager_register here: wait until the
-	end of create_composer.
-	(create_composer): Remove the distinction between this and
-	e_msg_composer_construct since there's no need for the latter. Use
-	e_activation_failure_dialog if either the selectnames component or
-	the gtkhtml editor fails.
-
-	* e-msg-composer-hdrs.c (setup_corba): Don't g_warn if the oaf
-	activation fails. create_composer() will tell the user.
-
-2001-10-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* listener.c (impl_event): Deleted declaration of len.
-
-	* e-msg-composer.c (e_msg_composer_add_message_attachments): Take
-	a settext argument.
-	(e_msg_composer_new_with_message): Updated to pass the settext argument.
-
-2001-10-10  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account):
-	Check for either a matching account name, or for a matching e-mail
-	address embedded in the passed-in string. (Fixes half of bug
-	#3255)
-	(destroy): Call bonobo_object_release_unref on corba_select_names,
-	not CORBA_Object_release.  Otherwise we leak stuff all over the
-	place. (Bug #11878)
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): If our message
-	doesn't contain an X-Evolution-Account header, pass in the From
-	header as the account name.  (Fixes the other half of #3255)
-
-2001-10-10  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.h: add prototype.
-
-	* e-msg-composer.c (e_msg_composer_add_message_attachments): new
-	function to copy attachments from the a message to a composer.
-	(e_msg_composer_set_pending_body): make simple function to
-	abstract this.
-	(e_msg_composer_apply_pending_body): apply the pending body to
-	the composer.
-	(e_msg_composer_new_with_message): use
-	e_msg_composer_add_message_attachments to copy attachments.
-
-2001-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (add_from_file): If the
-	attachment fails, report the error to the user.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): Now
-	takes a CamelException argument.
-
-	* e-msg-composer.c (setup_ui): Pass /menu/Edit as the menu path to
-	e_charset_picker thingy.
-
-2001-10-05  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer-attachment-bar.c
-	(e_msg_composer_attachment_bar_find_message): fix cut&pasteo.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	remove unused variable.
-
-	* e-msg-composer-attachment-bar.c
-	(e_msg_composer_attachment_bar_find_message): generalize this to
-	lookup content locations as well.
-
-	* e-msg-composer-attachment-bar.h: change prototype to match the
-	new function.
-
-	* listener.c (impl_event): handle the url_requested event, look up
-	parts in the attachment part and feed them down the stream if it
-	is found.
-
-	* e-msg-composer.c (handle_multipart_alternative): delay setting
-	the body text.
-	(handle_multipart): delay setting body text
-	(e_msg_composer_new_with_message): set the body text from the
-	object data.  Doing this ensures that we will have the attachments
-	processed before we try to look them up.
-
-2001-10-04  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer-attachment-bar.c 
-	(e_msg_composer_attachment_bar_find_content_id): change to return
-	a CamelMimePart.
-
-	* e-msg-composer-attachment-bar.h: update prototype.
-	
-	* e-msg-composer-attachment-bar.c
-	(e_msg_composer_attachment_bar_find_content_id): look up an
-	attachment by it's content id.
-
-	* e-msg-composer-attachment-bar.h: add prototype for
-	e_msg_composer_attachment_bar_find_content_id.
-
-2001-10-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_save_draft): Make sure to unref the
-	message object so we don't leak it or any references to
-	attachments (child mime parts).
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Unref the mime part after passing it along to new_from_mime_part.
-
-2001-10-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save_draft): Pass an empty flags argument to
-	mail_get_folder.
-
-2001-10-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Use
-	`bonobo_ui_component_new_default()', not
-	`bonobo_ui_component_new()'.
-
-2001-09-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Don't set Content-Ids on these parts since they are not contained
-	within a multipart/related - this fixes bug #10032.
-
-2001-09-26  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_from_url): Fixes glitch in
-	mailto: url parsing that caused it to fail when recipient names
-	contained commas. (Bug #10796)
-
-2001-09-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save_draft): Update to reflect changes to
-	mail_get_folder.
-
-2001-09-20  Iain Holmes  <iain@ximian.com>
-
-	* e-msg-composer.c (get_file_content): Open the file with O_CREAT so
-	that if it doesn't exist, it's created. Never return a NULL as this
-	could potentially crash on Solaris.
-
-2001-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Attach an X-Evolution-Format
-	header so if people re-edit a message in say their Sent folder, we
-	will preserve format preferences.
-	(e_msg_composer_get_message_draft): Don't attach
-	X-Evolution-Format headers here since it is now done in
-	build_message().
-	(e_msg_composer_new_with_message): Make sure to remove *all*
-	X-Evolution headers by using the mail-tools functions.
-
-2001-09-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (update): Don't
-	gtk_object_destroy() the pixbuf loader, unref it instead.
-
-	* e-msg-composer-hdrs.c (destroy): Don't forget to free the
-	private structure.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Automake 1.5 fixes pointed out by Richard Boulton
-	<richard@tartarus.org>, as per #9258.]
-
-	* Makefile.am (CLEANFILES): Set directly with `=' instead of `+='.
-
-2001-09-13  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (map_default_cb): free the text values we get
-	from the property bag and release the property bag properly.
-
-2001-09-12  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-composer.c (corba_recipientlist_to_destv): null
-	terminate the destination vector
-
-2001-09-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-composer.c (init): Don't call new_with_sig_file, it no
-	longer exists.
-
-	* e-msg-composer.c (setup_ui): Make sure that the session is
-	non-NULL.
-	(menu_file_send_cb): And here too.
-	(e_msg_composer_new_with_sig_file): Removed.
-
-2001-09-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Wrap the S/MIME code in ifdef
-	SMIME_SUPPORTED which isn't defined but by some later version will
-	be.
-	(setup_ui): And again here.
-
-2001-09-09  Maciej Stachowiak  <mjs@noisehavoc.org>
-
-	* Makefile.am: Add VFS_CFLAGS so things don't break when the
-	gnome-vfs headers move.
-
-2001-09-08  Jon Trowbridge  <trow@ximian.com>
-
-	* evolution-composer.c (corba_recipientlist_to_destv): Originally
-	was corba_recipientlist_to_glist.
-	(impl_Composer_set_headers): Use corba_recipientlist_to_destv, new
-	destination-based api.
-
-	* e-msg-composer.c (build_message): Get rid of that 'sending'
-	stuff.  That was a bad idea.
-	(e_msg_composer_new_with_message): Apply the revised api and work
-	with vectors of destinations rather than just lists.
-	(e_msg_composer_get_recipients): Added.  Returns the full set of
-	recipient destinations in a vector.
-
-	* e-msg-composer-hdrs.c: Removed free_destv function.  We use
-	e_destination_freev instead.
-	(e_msg_composer_hdrs_get_to): Changed to return a vector of
-	EDestinations.  This function now works.
-	(e_msg_composer_hdrs_get_cc): Ditto.
-	(e_msg_composer_hdrs_get_bcc): Ditto.
-	(e_msg_composer_hdrs_get_recipients): Added.  Returns a vector of
-	EDestinations that is the union of the to, cc and bcc lines.
-	(e_msg_composer_hdrs_set_to): Changed to take a vector of
-	EDestinations, rather than a GList.
-	(e_msg_composer_hdrs_set_cc): Ditto.
-	(e_msg_composer_hdrs_set_bcc): Ditto.
-	(e_msg_composer_hdrs_to_message): Use our new, improved API, rather
-	than a bunch of poking around in BonoboPropertyBags, etc.
-
-2001-09-07  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients_from_destv): Remove some
-	debugging messages that don't check for NULL strings and crash
-	Solaris.
-
-2001-09-06  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (save): Have to specify a mode when using
-	O_CREAT.
-	(handle_multipart_alternative, handle_multipart,
-	e_msg_composer_new_with_message): Update for mail_get_message_body
-	change.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans):
-	s/Evolution/Ximian Evolution/.
-	(do_exit): Set the title to be "Warning: Modified Message".
-
-2001-08-29  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_get_message_draft): Pass
-	in FALSE as the 'sending' arg to e_msg_composer_get_message.
-	(build_message): Added a 'sending' arg, which is passed to
-	e_msg_composer_get_message.
-	(e_msg_composer_get_message): Added a 'sending' arg,
-	which gets passed directly on to build_message.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Added
-	a "sending" arg, which should be TRUE if the message is being
-	sent now (rather than being autosaved, etc.).  The address
-	use scores are only updated when sending. (Bug #8332)
-	Removed obsolete (#if 0/#endif-ed) code.
-
-2001-08-22  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients_from_destv): Added.  Try
-	to properly handle contact lists in which the addresses of the
-	list members should be hidden.
-	(e_msg_composer_hdrs_to_message): Changed to extract the
-	destination data from the entries and pass it along to
-	set_recipients_from_destv.
-
-2001-08-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save): When reporting an error, use
-	my_file_name instead of file_name since file_name can be NULL.
-
-2001-08-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans):
-	s/attempt recovery/try to recover them/.
-
-2001-08-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save_draft): Reset the "changed" state to
-	FALSE after a successful save.
-
-2001-08-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (show_attachments): Toggle the
-	View->Attachments menu item. This fixes bug #6107.
-
-2001-07-12  Peter Williams  <peterw@ximian.com>
-
-	* e-msg-composer.c (map_default_cb): New function. Figure out
-	which widget gets the default and assign it. Harder to do than
-	it sounds.
-	(e_msg_composer_construct): Hook map_default_cb up to the "map"
-	signal.
-	(set_focus_to_editor): Removed.
-	(set_focus_to_editor_idle): Removed.
-	
-2001-08-10  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients): Removed comment about
-	the need to resolve nicknames properly, because we now do that.
-
-2001-08-09  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (set_focus_to_editor): new helper function,
-	just setup idle callback to grab focus
-	(set_focus_to_editor_idle): grab focus for editor, before we have
-	better solution, it run grab-focus command on editor control
-	(e_msg_composer_construct): call prepare_engine here, set focus to
-	editor
-
-2001-08-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): Don't
-	forget to closedir() when we finish with dir.
-
-2001-08-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (from_changed_cb): Set the smime/pgp
-	always-sign options when here so it updates when the user changes
-	his/her identity.
-
-2001-08-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_get_message_draft): Set the
-	PGP/MIME and S/MIME options to FALSE before getting the message
-	draft and restore the values afterward.
-
-2001-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (add_inlined_image): Use g_basename().
-	(setup_ui): Get the default charset from the mail config db.
-
-2001-08-06  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (impl_event): handle delete event
-
-2001-07-31  Peter Williams  <peterw@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Set the config path for the composer so
-	that the customize toolbar command works.
-
-2001-07-31  Jason Leach  <jleach@ximian.com>
-
-	* e-msg-composer.c: Use Tuomas' and Jakub's new (and beautiful)
-	icons for Send and Send Later in the toolbar and menus.
-
-2001-07-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (message_rfc822_dnd): Properly add the
-	message/rfc822 part.
-
-2001-07-27  Jason Leach  <jleach@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): "-- \n" is 4 chars long,
-	so when checking if it's already in the sig, strncmp should check
-	4 chars, not 3.
-
-2001-07-26  Peter Williams  <peterw@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): Correct our manually inserted
-	signature dash thingie (it was missing the space).
-
-2001-07-26  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients): Get "destinations",
-	rather than "text" from the entry_widget.  (The getters/setters in
-	the control have been made more symmetric.)
-
-2001-07-18  Jason Leach  <jleach@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Update to the
-	new way of finding the default account.
-
-2001-07-18  Iain Holmes  <iain@ximian.com>
-
-	* e-msg-composer.c (do_exit): Use a messagebox.
-
-2001-07-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (drag_data_received): Correctly handle
-	text/uri-list's that contain more than a single file reference.
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (menu_changed_charset_cb): Removed a warning
-	that I don't need anymore. This code is working wonderfully ;-)
-
-2001-07-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer.c: Fix typo. s/sesiion/session/
-	
-2001-07-09  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): Only ask
-	once about recovery, assume if they want to recover one file they
-	want to recover all of them.
-
-2001-07-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Use
-	camel_internet_address_format_address rather than
-	camel_address_encode since we want display-friendly addresses.
-
-2001-07-09  Iain Holmes  <iain@ximian.com>
-
-	* e-msg-composer-select-file.c (file_selection_info_destroy_notify):
-	Unref the file selection dialog when the data is destroyed.
-
-2001-07-09  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (composer_shutdown): Do the
-	autosave_manager_unregister at shutdown time instead of destroy
-	time (by which point the contents of the window, including the
-	remote editor control, will have already been destroyed).
-
-2001-07-09  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* e-msg-composer-select-file.c: Added missing #include <config.h> to
-	make translations working.
-
-2001-07-07  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients): Make sure that our
-	destination string (dest_str) is not the empty string before we
-	try to use it.
-
-2001-07-06  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_new): add missing static.
-	(best_encoding): make sure we don't try to call iconv_open with a
-	NULL tocode.
-	(autosave_manager_query_load_orphans): remove zero length orphans
-	so that they don't clutter things up.
-
-2001-07-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Convert the filename string to UTF8 before setting it on the
-	CamelMimePart because that code expects it to be in UTF8.
-
-2001-07-06  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_query_load_orphans): only ask
-	if there are actually contents in the file.  Asking about an
-	emptry fil is not very useful.
-	(autosave_load_draft): add some sanity chacks.
-	(autosave_run_foreach_cb): remove debugging warning.
-	(autosave_manager_new): add a missing static.
-
-2001-07-06  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (autosave_manager_unregister): make sure we
-	only remove the file if we think we saved it properly.
-	(autosave_manager_stop): make sure we set the timeout back to 0 so
-	that we will restart next time since we stop the timer when there
-	are no active composers.
-	(destroy): move this to the beginning of the destroy process.
-	(autosave_save_draft): add a return value indicating success.
-	(autosave_manager_register): go ahead and ask next time.
-
-2001-07-05  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c: add ask argment.
-	(autosave_manager_query_load_orphans): move the load loop out of
-	the dir reading loop.
-	(autosave_manager_new): move initialization out or register.
-	(autosave_manager_register): protect against recursion with ask.
-	(init): call new, this still needs to be moved.
-
-2001-07-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save): Play the "File exists, overwrite?"
-	game.
-	(autosave_run_foreach_cb): Change the return val from a gboolean
-	to void.
-
-2001-07-04  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (autosave_load_draft): attach send and postpone
-	handlers. and be more tolerant of errors.
-
-2001-07-03  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (autosave_save_draft): make sure we seek to the
-	begining.
-
-	* e-msg-composer.h: remove the timer id.
-
-	* e-msg-composer.c: use autosave manager.
-	(autosave_save_draft): moved initialization to
-	autosave_init_file. Only save the buffer if we get a valid
-	message.
-	(autosave_load_draft): unlink the old file, we own it now. and
-	unref the stream when we are done with it.
-	(autosave_is_owned): check if we own the file, this needs to be
-	extended to check for other valid processes.
-	(autosave_query_load_orphans): make this search through the
-	managers list as it walks the dir.
-	(autosave_query_load_orphans): make sure we use the full path.
-	(autosave_run_foreach_cb): timeout foreach handler.
-	(autosave_run): the timeout function.
-	(autosave_start): start timer.
-	(autosave_stop): stop timer.
-	(autosave_register): register a composer with the autosave manager.
-	(autosave_unregister): unregister a composer.
-	(destroy): unregister the composer, everything is okay.
-	(init): register the composer.
-
-2001-07-02  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.h: add autosave members.
-	
-	* e-msg-composer.c (autosave_query_load_orphans): query the user to
-	check if they want to load any orphans we've found.
-	(autosave_query_cb): the dialog callback.
-	(autosave_is_orphan): test if if a particular file is orphaned.
-	(autosave_load_draft): load a message from an autosave file.
-	(autosave_save_draft): save the current buffer to the autosave file.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS).
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Set the
-	user-chosen charset.
-
-	* e-msg-composer.c (menu_change_charset_cb): New callback function
-	to get the user-set charset.
-	(init): Set the charset to NULL.
-	(best_charset): Take a default_charset param that holds the value
-	the user set for this particular message using the menu.
-	(destroy): Free the charset.
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (setup_ui): Construct an e-charset-picker
-	bonobo-ui menu.
-	(menu_change_charset_cb): 
-
-2001-06-30  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients): Touch all of our
-	EDestinations before we unref them, updating the last-use records
-	in the addressbook.
-
-2001-06-29  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_show_sig_file): remove now
-	invalid argument in the documentation.
-
-2001-06-28  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c: removed obsolete e_msg_composer_get_sig_file
-
-	* e-msg-composer.h: removed sig_file field from EMsgComposer
-
-	* e-msg-composer.c (e_msg_composer_get_sig_file_content): exported
-	(get_file_content): make it const safe
-	(e_msg_composer_get_sig_file_content): refactored, don't try to be
-	clever about signature filename, as it's exact now
-	(get_signature_html): use has_html_signature flag
-	(e_msg_composer_show_sig_file): renamed from
-	e_msg_composer_set_sig_file, removed sig_file parameter as it's
-	obsolete now
-	(e_msg_composer_new_with_sig_file): removed obsolete parameters
-
-2001-06-27  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (menu_file_insert_file_cb): make hook this up.
-	(get_sig_file_content): use get_file_content.
-	(get_file_content): make this usable for both insertion and
-	signatures.
-	(read_file_content): added helper function to read file.
-
-2001-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c: Added a pixcache array for special pixmaps to
-	use in the composer.
-	(setup_ui): Set the pixcache.
-
-2001-06-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (menu_file_send_cb): Emit the POSTPONE signal
-	if we are offline.
-	(setup_ui): If we are offline, change the Control+Enter accel to
-	be on the SendLater menu item.
-
-2001-06-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (save_draft): Save the formatting preference
-	for this message draft using a X-Evolution-Format header.
-	(e_msg_composer_new_with_message): Restore the format editing
-	preference and also remove any other X-Evolution-* headers that we
-	may have set.
-
-2001-06-20  Dave Camp  <dave@ximian.com>
-
-	* Evolution-Composer.idl: Changed attachData to accept a sequence of
-	chars rather than a string.
-
-	* evolution-composer.c (impl_Composer_attach_data): Changed the 'data'
-	argument to a GNOME_Evolution_Composer_AttachmentData, and pass
-	data->_buffer and data->_length to camel_mime_part_set_content().
-
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-composer.c (impl_Composer_send): send the message
-
-	* Evolution-Composer.idl: add a "send" method to send a message
-	without showing the editor
-
-2001-06-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_construct): Don't define the
-	drop_types here.
-	(drag_data_received): Implement message/rfc822 dnd drop type
-	handling.
-
-2001-06-12  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-attachment.glade: Replace the disposition option
-	menu with a checkbox.
-
-	* e-msg-composer-select-file.c
-	(e_msg_composer_select_file_attachment): New function to select a
-	file to attach. Adds a "suggest inline disposition" checkbox.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): Add
-	a disposition argument rather than always defaulting to
-	"attachment".
-	(struct _DialogData, ok_cb, e_msg_composer_attachment_edit):
-	Update for optionmenu->checkbox change for disposition.
-
-	* e-msg-composer-attachment-bar.c (add_from_file): Add a
-	disposition argument.
-	(add_from_user): Use e_msg_composer_select_file_attachment, pass
-	chosen disposition to add_from_file.
-	(e_msg_composer_attachment_bar_attach): Pass "attachment" to
-	add_from_file for the disposition.
-
-2001-06-11  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (best_charset): Fix again... don't leave
-	*encoding uninitialized in the US-ASCII case.
-
-2001-06-11  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_construct): Rearranged
-	gtk_widget_show()s a bit to fix Bug#3204.  The composer is now
-	(like the rest of Evo) properly network transparent.
-
-2001-06-08  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer.c (save_draft): When saving a draft, attach
-	information about the From: identity via X-Evolution-Account.
-	This lets us select the correct identity when we edit it later.
-	(e_msg_composer_new_with_message): If the message we are editting
-	is tagged with an account (via X-Evolution-Account), make sure
-	that the composer chooses that account's identity by default.
-
-2001-06-08  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (best_charset): Don't use the default charset
-	if the message is US-ASCII.
-
-2001-06-07  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_sig_file): just set
-	sig_file field, but don't actualy insert signature, it will be
-	done by format menu item callback
-	(e_msg_composer_set_body_text): don't set signature here
-
-2001-06-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): If user is trying to sign
-	his/her message, try first to use the key that they might have
-	provided in their account settings. If that was never set, default
-	to their email address. Also respect their config option to
-	encrypt-to-self.
-
-2001-05-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Oops. Fix a few compile problems.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (HTML_EDITOR_GENERATED): Use GTKHTML_DATADIR here.
-
-2001-05-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Fixed up the S/MIME
-	signing/encrypting code to work with the new API.
-
-2001-05-31  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (best_encoding): Add a missing iconv_close
-
-2001-05-30  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (build_message): Use the config-specified
-	default character set (which in turn defaults to the locale
-	character set) as the default for encoding non-US-ASCII messages,
-	assuming it works. Fall back to camel_charset_best() if it fails.
-	Also, pick the Content-Transfer-Encoding based on how the data
-	looks in the destination charset, not in UTF8.
-
-	While I was here, I also refactored a bunch and tried to reduce
-	redundant code. There are still too many places that set the
-	transfer-encoding on the plaintext part though... Also, I think
-	some more cleanliness could happen if the sign/encrypt interfaces
-	returned CamelMultiparts instead of CamelMimeParts.
-
-2001-05-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (update): Use
-	e_utf8_to_gtk_string() on the description of the attachment since
-	camel stores these as utf-8 strings.
-
-2001-05-28  Jason Leach  <jleach@ximian.com>
-
-	* Makefile.am (INCLUDES): srcdir != builddir fix.
-
-2001-05-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Populate the
-	extra_hdr_* arrays with any non-special-case headers.
-	(is_special_header): New convenience function to determine if a
-	header is a "special" header or not.
-
-2001-05-24  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (menu_edit_delete_all_cb): new callback
-	(menu_edit_delete_all_cb): set orig to 0 too
-	(menu_edit_delete_all_cb): be more careful about text color and
-	style
-
-2001-05-23  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_sig_file): set orig to 0
-
-2001-05-18  Jon Trowbridge  <trow@ximian.com>
-
-	* e-msg-composer-hdrs.c (set_recipients): Properly unserialize the
-	string returned by the "text" property of the bonobo control,
-	convert it into EDestinations, and use them to get the e-mail
-	addresses of our recipients.
-
-2001-05-17  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (save_draft): Draft messages should be marked
-	read.
-
-2001-05-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Added S/MIME sign/encrypt code.
-	(init): Initalize smime_sign/encrypt.
-	(e_msg_composer_get_smime_encrypt): new
-	(e_msg_composer_set_smime_encrypt): new
-	(e_msg_composer_get_smime_sign): new
-	(e_msg_composer_set_smime_sign): new
-	(menu_security_smime_sign_cb): new
-	(menu_security_smime_encrypt_cb): new
-	(setup_ui): Setup the UI for S/MIME stuff.
-
-2001-05-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): If we are creating a message
-	with only a single part (ie no attachments and we will not be
-	signing/encrypting the part) then `part = CAMEL_MIME_PART(message)` 
-	otherwise create a new MIME part and set it's content-object as the 
-	message's content-object at a later date.
-
-2001-05-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (add_inlined_image): Don't wrap content-id with
-	brackets here as it is now done internally in camel.
-
-2001-05-03  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (get_signature_html): put signature in 100%
-	width table
-	(delete_old_signature): look only for first flow with signature == 1
-	(e_msg_composer_new): don't insert <BR>
-	(e_msg_composer_new_with_sig_file): ditto
-	(delete_old_signature): don't delete whole signature paragraph,
-	but just it's content
-	(delete_old_signature): if signature isn't found, insert new empty
-	paragraph to end of document for new signature
-	(e_msg_composer_set_sig_file): delete signature always
-	(e_msg_composer_set_sig_file): don't place signature to the end of
-	document, but place it where previous one was (if there wasn't
-	then new one is appended to the document)
-
-2001-05-02  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (impl_event): do automagic indenting only when
-	in_signature_insert is FALSE
-
-	* e-msg-composer.c (e_msg_composer_set_sig_file): do indent-zero
-	before signature inserting
-	(e_msg_composer_set_sig_file): use in_signature_insert flag
-
-2001-05-01  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (impl_event): set signature to 0 in newly created
-	empty paragraphs
-	(clear_signature): new helper function
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): Remove UNICODE_CFLAGS
-
-2001-04-25  Radek Doulik  <rodo@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_send_html): block/unblock
-	redraw
-
-	* listener.c (impl_event): reflect object data type change
-
-	* e-msg-composer.c (get_sig_file_content): renamed from
-	get_signature
-	(get_signature_html): new helper function, uses
-	get_sig_file_content
-	(set_editor_text): removed signature parameters
-	(from_changed_cb): new signal handler, sets signature by identity
-	change
-	(delete_old_signature): new function, deletes old signature from
-	the document
-	(e_msg_composer_set_sig_file): new method, set's signature
-	filename
-	(e_msg_composer_mark_text_orig): removed (obsolete)
-
-	* e-msg-composer-hdrs.c: added signal FROM_CHANGED
-
-2001-04-21  Duncan Mak  <duncan@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_construct): Set window_icon to
-	"compose-message.png" for the composer window.
-
-	Did #include <libgnomeui/gnome-window-icon.h> so we could use
-	gnome_window_icon_set_from_file() here.
-
-2001-04-17  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (reply_indent): more auto-indentation magic
-
-2001-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Use the mail-crypto pgp-mime
-	wrappers.
-	(build_message): s/CAMEL_PGP_HASH_TYPE_SHA1/CAMEL_CIPHER_HASH_SHA1
-
-2001-04-11  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-select-file.c (create_file_selection): Fix
-	previous.
-
-2001-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-select-file.c (create_file_selection): Set the
-	default filename to the user's homedir.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer-attachment.c: Fix headers.
-	* e-msg-composer-hdrs.c: Same here.
-	
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-icon-list.c: Replace #include <gtk/gtk.h>
-	* e-msg-composer-attachment-bar.c: Replace #include <gnome.h>
-	* e-msg-composer-attachment-bar.h: Remove #include <gnome.h>
-	* e-msg-composer-attachment.c: Remove #include <gnome.h>
-	* e-msg-composer-attachment.h: Same here.
-	* e-msg-composer-hdrs.c: Replace #include <gnome.h> and <bonobo.h>
-	* e-msg-composer-hdrs.h: Replace #include <gnome.h>
-	* e-msg-composer-file.c: #include <gtk/gtkmain.h>, <gtk/gtksignal.h>
-	* e-msg-composer.c: Replace #include <bonobo.h>, <gnome.h>
-	* e-msg-composer.h: Replace #include <gnome.h> and <bonobo.h>
-	* evolution-composer.c: Replace #include <bonobo.h>
-	* listener.c: Same here.
-	
-2001-03-28  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer.c (save_draft): Use the drafts folder specified
-	by the account, if possible. Also, fix the setting of "send_html"
-	after saving the draft in case the user plans to keep editting...
-
-2001-03-27  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_set_send_html): set the
-	FormatHTML property on the editor to let it know the mode.
-	(e_msg_composer_construct): set the property at construct time.
-
-2001-03-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): Set
-	the mime part content-id.
-
-2001-03-19  Radek Doulik  <rodo@ximian.com>
-
-	* listener.c (reply_indent): set default text color
-
-2001-03-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_reply_to): Make
-	sure the reply_to text is non-NULL before trying to pass it off to
-	the address parser.
-
-2001-03-13  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-attachment.c (update_mime_type): Use
-	gnome_vfs_mime_type_from_name rather than gnome_vfs_mime_info,
-	since the entered filename doesn't have to be a real file on disk.
-	Deal with it returning NULL too.	
-	(e_msg_composer_attachment_edit): Select the right item in the
-	inline/attachment menu.
-
-	* e-msg-composer-hdrs.c: s/Pair/EMsgComposerHdrPair/. Namespace!
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.h: Added view_replyto member.
-
-	* e-msg-composer.c (e_msg_composer_get_visible_flags): Find out if
-	we want to view the Reply-To header.
-	(e_msg_composer_set_view_replyto): A new function to set the state
-	of the replyto header.
-	(menu_view_replyto_cb): Callback for setting the ReplyTo state.
-	(set_config): Make static.
-	(setup_ui): Setup the ReplyTo bonobo stuff.
-	(load_from_property_bag): More defaults for the ReplyTo, yay.
-	(load_from_gnome_config): Again...
-	(e_msg_composer_get_view_bcc): Implemented.
-	(e_msg_composer_get_view_cc): Implemented.
-	(e_msg_composer_get_view_from): Implemented.
-	(e_msg_composer_get_view_replyto): Implemented.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_reply_to_entry):
-	New function, yay.
-	(e_msg_composer_hdrs_get_reply_to): Another new function.
-	(e_msg_composer_hdrs_set_reply_to): Yet another new function...
-	(create_headers): Create the reply-to header.
-	(attach_headers): Attach the reply_to.
-	(headers_set_visibility): Set the reply_to visibility.
-	(e_msg_composer_hdrs_to_message): Set the message's reply-to here
-	based on the user-set reply-to header.
-
-2001-03-06  Miguel de Icaza  <miguel@ximian.com>
-
-	* e-msg-composer.c (set_config): New function.  Used to store
-	integer values into the configuration engine.  Handles the case of
-	Bonobo-conf being installed, or falls back to gnome_config.
-
-	* e-msg-composer-hdrs.c (add_header): Renamed to be
-	header_new_recipient().  Now we take care of the other cases in
-	create_headers, which is a lot nicer now.
-	
-	(create_optionmenu): Removed extra "name" argument which was not
-	being used anyways (the only arg passed was From:).
-	(init): Removed all the redundant NULL initialization by using
-	nice g_new0
-	
-	(create_headers): New function, much cleaner. 
-
-	Use of Pair structure everywhere instead of individual widgets to
-	keep track of which ones are visible and which ones are not.
-	
-	* e-msg-composer.c (setup_ui): Handle ViewFrom and ViewBCC
-	commands. 
-	(menu_view_bcc_cb, menu_view_from_cb): New functions that
-	implement the features described.
-
-	(menu_format_html_cb): Removed unrequired test, as
-	e_msg_composer_set_send_html already optimizes the case of the
-	state being the same.
-	(menu_security_pgp_encrypt_cb): Remove redundant code.
-	(menu_security_pgp_sign_cb): ditto.
-
-2001-03-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-icon-list.c (icon_new_from_pixbuf): Added a comment reminding
-	us that we should probably not force a particular font in the icon
-	caption.
-
-2001-02-27  Dan Winship  <danw@ximian.com>
-
-	* evolution-composer.c (factory_fn): If
-	!mail_config_is_configured(), give an error and return NULL.
-
-2001-02-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (INCLUDES): Add `-I$(top_srcdir)/shell'.
-
-2001-02-21  Not Zed  <NotZed@Ximian.com>
-
-	* e-msg-composer.c (menu_file_save_draft_cb):
-	(exit_dialog_cb):  Use mail_append_mail to save to drafts instead
-	of custom thread handler.
-
-2001-02-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Handle exceptions a little
-	nicer and pop up a nice GnomeDialog with the error message - also,
-	don't return a CamelMimeMessage if it fails to sign/decrypt
-	because we want to let the user decide what to do based on the
-	error message he/she gets.
-
-2001-02-15  Dan Winship  <danw@ximian.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account): If
-	@account_name is NULL, pick the default account rather than giving
-	a g_warning.
-
-	* e-msg-composer.c (e_msg_composer_set_headers): Note in the
-	doc comment that @from can be NULL if you want the default account
-	(since there is code that expects this).
-
-2001-02-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-composer.c (corba_recipientlist_to_glist): Use the
-	camel-internet-address code to format the address rather than
-	doing it the broken way.
-
-2001-02-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-composer.c (impl_Composer_set_headers): Updated. We
-	might want to change the corba interface for this to allow setting
-	the from-address as well.
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Updated.
-	(e_msg_composer_set_headers): Now takes a 'From' argument so that
-	we can try to pre-determine the account the user will want to send
-	from.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* e-msg-composer-attachment.glade.h: removed.
-	* e-msg-composer-attachment.glade: do not write strings to above.
-	* Makefile.am: don't include glade.h in EXTRA_DIST.
-	
-2001-02-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart):
-	multipart/* is another mime type we DO NOT want to encode ;-)
-
-2001-02-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-msg-composer-hdrs.c (address_button_clicked_cb, add_header):
-	Set the default argument to
-	GNOME_Evolution_Addressbook_SelectNames_activateDialog correctly.
-
-2001-01-30  Larry Ewing  <lewing@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_optionmenu): make sure we convert
-	from utf-8 before creating the option menu items.
-
-2001-01-25  Jason Leach  <jasonleach@usa.net>
-
-        (Moving the flag for has_changed from the Hdrs to the Composer
-	 itself. Providing public methods to set/unset a composer as
-	 changed. Adding attachments now flags the composer as changed)
-	
-	* e-msg-composer.c (e_msg_composer_unset_changed): New function.
-	(e_msg_composer_set_changed): New function.
-
-	* e-msg-composer.c (hdrs_changed_cb): Callback to the new signal,
-	uses the new composer_set_changed.
-	(attachment_bar_changed_cb): Add a call to the new
-	composer_set_changed.
-	
-	* e-msg-composer-hdrs.c (class_init): New signal "hdrs_changed" to
-	tell the parent composer that any of the headers have changed.
-	(addressbook_entry_changed): emit the new signal here.
-	(entry_changed): And here.
-
-2001-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (menu_security_pgp_encrypt_cb): New callback.
-	(menu_security_pgp_sign_cb): Another new callback.
-	(setup_ui): Added initialization for the PGP sign and encrypt
-	bonobo menu items.
-	(e_msg_composer_set_pgp_encrypt): Change the Bonobo UI name to
-	SecurityPGPEncrypt.
-	(e_msg_composer_set_pgp_sign): Change the Bonobo UI name to
-	SecurityPGPSign.
-
-2001-01-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Fixed some memory leaks
-	dealing with content-type temp strings. Also implemented code to
-	sign and/or encrypt the message if the user has specified that it
-	should.
-
-2001-01-20  Jason Leach  <jasonleach@usa.net>
-
-	(Fix #1222: doing File->New->Mail Message doesn't include .sig)
-	
-	* evolution-composer.c (init): Get the users account information,
-	see if they've specified a sig file, if they do, create a composer
-	with that sig.
-
-2001-01-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_optionmenu): Use "Full Name
-	<address>" for the label in the menu rather than the account
-	name. Specify the account name only if it's not the same as the
-	address.
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	* e-msg-composer-hdrs.c (create_addressbook_entry): Listen for
-	property bag changes to "entry_changed" on here, which means on
-	the To, Cc, and Bcc entries.
-	(addressbook_entry_changed): New function that gets called when
-	"entry_changed" property is changed (to TRUE).
-
-2001-01-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (build_message): Updated to reflect changes to
-	e_msg_composer_hdrs_get_from().
-
-	* e-msg-composer-hdrs.c (set_recipients): Don't do anymore utf8
-	conversions, the widget already does this (or should unless there
-	is brokenness).
-	(e_msg_composer_hdrs_get_from): Return a CamelInternetAddress like
-	we should.
-	(e_msg_composer_hdrs_to_message): Update to reflect changes made
-	the the above function.
-
-2001-01-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* Makefile.am: Make the composer a standard library, not a libtool
-	one.  Nobody ever uses it as a shared library and it is not
-	installed. 
-
-2001-01-17  Jason Leach  <jasonleach@usa.net>
-
-	(Bug #1192: Set the Composer window title to something useful)
-	
-	* e-msg-composer.c (e_msg_composer_construct): Connect up the new
-	signal here.
-	(subject_changed_cb): Set the composer window title to the subject
-	as it's changed, or if it goes blank make it the default "Compose
-	a message".
-
-	* e-msg-composer-hdrs.c (class_init): Create a new signal
-	"subject_changed".
-	(entry_changed): Emit the signal here when the subject entry is
-	changed.
-	
-2001-01-17  Iain Holmes  <iain@ximian.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):
-	Get the option menu from the XML file.
-	(ok_cb): Set the attachment disposition depending on the option
-	menu results.
-	(option_menu_get_history): Really should have been in GTK at some
-	point.
-
-	* e-msg-composer-attachment.glade: Add the option menu.
-
-2001-01-17  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-composer.c (enum_objects): comment out for now
-	to ease compat issues.
-	(evolution_composer_construct): pass in NULL for the item
-	handler enum_objects fn + calm warning.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Use the 
-	to/cc/bcc addresses insted of just the to.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-icon-list.[ch]: Ximianified email addresses.
-
-2001-01-16  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_mark_text_orig): publicate
-	mark_orig_text
-	(set_editor_text): don't call mark_orig_text, let it for reply
-
-2001-01-15  Jason Leach  <jasonleach@usa.net>
-
-	(Plug leaking the subject string on each message sent)
-	
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_subject): Don't
-	strdup before returning the subject, it's already been strdup'd
-	from the gtk_object_get().
-
-2001-01-13  Jason Leach  <jasonleach@usa.net>
-
-	(Fix Bug #1083: Composer IDLs not getting installed)
-	
-	* Makefile.am: add @idl and @idl_DATA vars.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_optionmenu): Oops. Make sure to
-	attach the item to the menu ;-)
-
-2001-01-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (build_message): Call set_from_account which
-	means we no longer have to do all the crap involved in formatting
-	strings into an internet-address.
-	(e_msg_composer_get_preferred_account): New access function.
-
-	* e-msg-composer-hdrs.c (add_header): case COMBOBOX has changed to
-	OPTIOMENU.
-	(create_optionmenu): Update to use an optionmenu of accounts.
-	(from_changed): New callback for the From optionmenu.
-	(setup_headers): s/COMBOBOX/OPTIONMENU
-	(init): Set the account and from_options to NULL.
-	(e_msg_composer_hdrs_get_from): Updated.
-	(destroy): free the from_options.
-	(e_msg_composer_hdrs_set_from_address): Renamed from set_from
-	because it no longer takes a string arg but rather an account arg.
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* e-msg-composer-hdrs.c (add_header): Only attach to "changed" if
-	the widget is an EEntry.  The HEADER_COMBOBOX and the
-	HEADER_ADDRBOOK are a ComboBox and a remote Bonobo control
-	respectively. 
-
-	* evolution-composer.c (get_object): Move getObject functionality
-	here from e-msg-composer.c
-
-2001-01-11  Miguel de Icaza  <miguel@ximian.com>
-
-	* e-msg-composer-hdrs.c (create_dropdown_entry): Only set the
-	popdown strings if we have anything to popdown.
-
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* evolution-composer.c (evolution_composer_construct): Add an
-	ItemContainer Bonobo interface to allow client applications to
-	locate the Message Composer component.
-
-2001-01-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (menu_file_save_draft_cb): New callback to save
-	draft. Fixes bug #1045.
-
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-msg-composer.c: Removed more UNSAFE stuff.  Maybe we should
-	kill this macro, and have people that want these broken things
-	define their own macros.
-	(setup_item_container): Add an ItemContainer bonobo interface to
-	handle options to the window component.
-
-2001-01-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (create_dropdown_entry): Updated for new
-	config code - this time it works!
-
-2001-01-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (create_dropdown_entry): Reverted back to
-	old config code temporarily until I get the new config code
-	working 100%.
-
-2001-01-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (create_dropdown_entry): Updated to
-	reflect changes to the mail-config API.
-
-2001-01-05  Radek Doulik  <rodo@helixcode.com>
-
-	* listener.c (impl_event): disable indenting for now, it crashes
-	editor
-
-2001-01-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (do_exit): If the headers have changed, then
-	continue with the prompt else just destroy the window.
-
-	* e-msg-composer-hdrs.c (init): Initialize has_changed to FALSE.
-	(entry_changed): New callback to set the value of has_changed.
-	(add_header): Attach the "changed" signal.
-
-2001-01-02  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit): 
-	* e-msg-composer-attachment-bar.c (update): Use
-	header_content_type_simple, not header_content_type_format.
-
-	* e-msg-composer-hdrs.c (create_dropdown_entry): Call
-	e_utf8_to_gtk_string on the combobox strings.
-
-2000-12-28  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (handle_multipart_alternative,
-	handle_multipart, e_msg_composer_new_with_message): Use
-	CamelContentType instead of GMimeContentField.
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit): 
-	* e-msg-composer-attachment-bar.c (update, attach_to_multipart):
-	Use CamelContentType, and use the header_content_type_* functions
-	rather than operating on the structure by hand.
-
-2000-12-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_get_pgp_encrypt): New function
-	to get whether or not to encrypt the message.
-	(e_msg_composer_set_pgp_encrypt): New function to set encryption.
-	(e_msg_composer_get_pgp_sign): New function to get whether or not
-	to sign the message.
-	(e_msg_composer_set_pgp_sign): New function to set pgp_sign.
-	(init): Initialize pgp_sign and pgp_encrypt to FALSE.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer-hdrs.c (add_header): Made it so that carriage
-	return doesn't insert a newline in the subject entry.
-
-2000-12-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (set_entry): Don't convert the utf-8
-	string to a gtkstring because the widget expects to get a utf-8
-	string.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (EXTRA_DIST): Add $(IDLS). (From campd.)
-
-2000-12-07  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (prepare_engine): added warnings
-	(prepare_engine): updated to IDL:GNOME/GtkHTML/Editor/Engine:1.0
-
-	* Makefile.am: renamed HTMLEditor* to Editor*, added Editor-common.c:
-	$(HTML_EDITOR_GENERATED) rule
-
-2000-12-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (add_recipients): Use camel to construct the
-	list of recipients rather than just strchr(recips, ',') which is
-	very prone to errors.
-
-2000-11-03  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (update): Pass NULL
-	instead of icon_name to the e_icon_list_append_pixbuf
-	function.
-	(init) Take the font size into account when setting the
-	height of the bar.
-
-2000-11-02  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (update): Use the 
-	pixbuf_for_mime_type function to get the icon.
-	(pixbuf_for_mime_type): Functino that searches nautilus/
-	and mc/ for icon files.
-
-2000-11-15  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (prepare_engine): update namespace
-
-	* updates for HTMLEditor API changes
-
-	* e-msg-composer.c: added #include <libgnomevfs/gnome-vfs.h>
-
-	* e-msg-composer.h: e_msg_composer_guess_mime_type renamed and
-	moved mime_guess_type_from_file_name from camel as it uses VFS
-
-2000-11-14  Radek Doulik  <rodo@helixcode.com>
-
-	* listener.c (reply_indent): rename command to runCommand
-
-	* e-msg-composer.c: updated to HTMLEditor API changes
-
-	* listener.c: updated to HTMLEditor API changes
-
-2000-11-13  Radek Doulik  <rodo@helixcode.com>
-
-	* listener.c (reply_indent): extracted function, does reply
-	indentation, use updated editor engine api
-
-2000-11-10  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am ($(HTML_EDITOR_GENERATED)): rearrnace
-	includes.
-
-2000-11-10  Larry Ewing  <lewing@helixcode.com>
-
-	* e-msg-composer.c (build_message): set the HTML charset to utf-8
-	for all the html message parts.
-	(build_message): make sure we set the proper encoding on the html
-	part now that it may contain utf-8 characters
-
-2000-11-08  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_clear_inlined_table): new
-	function
-	(destroy): use e_msg_composer_clear_inlined_table, destroy
-	inlined_images hash table
-	(get_signature): added in_html arg, it tells if we should use HTML
-	signature
-	(set_editor_text): try to use HTML signature
-	(e_msg_composer_new_with_sig_file): added send_html arg to be able
-	to use HTML signature
-
-	* listener.c (resolve_image_url): don't add inlined images to
-	attachement bar
-
-	* e-msg-composer.c (add_inlined_images): new function, adds
-	inlined images to multipart
-	(add_inlined_image): helper function, adds one image to multipart
-	(build_message): store HTML messages with inlined images to
-	multipart/related
-
-	* e-msg-composer-attachment-bar.c (add_from_file): removed
-	content_id arg
-	(e_msg_composer_attachment_bar_attach): likewise
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	removed content_id arg
-
-2000-11-06  Not Zed  <NotZed@HelixCode.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Changed
-	for message api changes.  Use camel_address_unformat to convert
-	the editable->usable.
-	(set_recipients): Same.  Now we set the recipients as
-	camel_internet_address's.  Fixed a memleak indirectly.
-	(decode_addresses): Removed, no longer needed.
-	(create_dropdown_entry): We dont want to use _encode(), we want to
-	_format, as we are displaying the result.  We can use the static
-	function too to avoid the object creation, and the memory leak!
-	(set_entry): Convert the args to gtk-safe characters, since the
-	entry doesn't understand utf8.
-	(set_recipients): And likewise do the reverse when retrieving the
-	contents of the widget.
-
-2000-11-06  Larry Ewing  <lewing@helixcode.com>
-
-        * e-msg-composer.c (build_message): set the content type on the
-        plain part of outgoing messages.
-        (best_content): a helper function to get the best content type for
-        the attachment.  This should probably use the helper functions in
-        the future.
-
-2000-11-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer-attachment.c: Added #include <config.h>
-	* e-msg-composer-hdrs.c: s/_HAVE_CONFIG_H/HAVE_CONFIG_H for
-	working i18n.
-	
-2000-11-04  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): fix
-	test for regular file to !S_ISREG (statbuf.st_mode)
-
-	* listener.c (resolve_image_url): use inline images hash table
-
-	* e-msg-composer.c (init): create inlined images hash table
-	(destroy): destroy it
-	(clear_inline_images): helper function, used from
-	g_hash_table_foreach_remove to destroy one inline image record
-
-	* e-msg-composer.h: added hash table with inlined images url ->
-	cid info
-
-2000-11-03  Radek Doulik  <rodo@helixcode.com>
-
-	* listener.c (impl_event): updated for API changed
-	implemented image_url event
-	(resolve_image_url): new helper function, attaches image to mail
-	and returns new (resolved) url pointing to mime component
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	added conponent_id parameter
-
-	* e-msg-composer-attachment-bar.c
-	(e_msg_composer_attachment_bar_attach): added parameter content_id
-	(add_from_file): likewise
-
-2000-11-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Don't allow attaching anything but regular files.
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Clean the idl-generated files properly.
-
-2000-11-02  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): CamelStreamMem
-	steals our byte array; we can't destroy the byte array explicitly, and
-	we must unref the stream only when done using the array.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Don't create
-	the To, Cc, and Bcc lists based only on the address, use both the
-	name and address and camel_address_encode() them.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Fix the
-	CTE kludge, calculate the best mime transfer encoding for the mime
-	part and use that. Include e-msg-composer-select-file.h
-
-2000-10-31  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (prepare_engine): new function, tries prepare
-	editor engine
-	(mark_orig_text): marks original text in editor
-	(set_editor_text): call mark_orig_text
-	(create_composer): call prepare_engine
-
-	* Makefile.am (IDL_GENERATED): added HTMLEditor generated files to
-	IDL_GENERATED
-	($(IDL_GENERATED)): generate also files from HTMLEditor.idl
-	(libcomposer_la_SOURCES): added listener.[ch]
-
-	* e-msg-composer.h: added editor_engine and editor_listener to
-	EMsgComposer
-
-	* listener.[ch]: new files, implementation of HTMLEditor::Listener
-
-2000-10-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am ($(IDL_GENERATED)): Get `Composer.idl' from
-	`$(srcdir)' so that it builds with builddir != srcdir.
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Fixed my
-	not-quite-right logic so that we don't accidently set the body
-	contents using a plain text attachment instead of the actual body
-	of the message :-)
-
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Populate the
-	composer with any attachments.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-select-file.c (create_file_selection): Set the
-	wmclass and wmclass_name for the file selectors so that Sawfish
-	doesn't make the dialogs the same size as the parent.
-
-2000-10-25  Dan Winship  <danw@helixcode.com>
-
-	* evolution-composer.c (init): Attach send/postpone signal
-	handlers to the EMsgComposer.
-	(evolution_composer_factory_init): Take send/postpone signal
-	handlers as arguments.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c, e-msg-composer-attachment-bar.c: add some
-	missing _()s.
-
-	* e-msg-composer-address-dialog.*, e-msg-composer-address-entry.*:
-	Old cruft. Remove.
-
-	* Makefile.am: Update for removed files.
-
-	* e-msg-composer-hdrs.c: Remove e-msg-composer-address-entry.h
-	include.
-
-	* e-msg-composer.c: Remove e-msg-composer-address-dialog.h include
-	
-2000-10-23  Ariel Rios   <ariel@arcavia.com>
-
-	* e-msg-composer-hdrs.c: Include Composer.h
-	instead of volution-Addressbook-SelectNames.h
-
-2000-10-22  Dan Winship  <danw@helixcode.com>
-
-	* .cvsignore: No, don't ignore Evolution-Addressbook-SelectNames*.
-	They're not supposed to be there any more. 
-
-2000-10-22  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_cb): Removed.
-	(add_from_user): Use `e_msg_composer_select_file()' instead of
-	doing the file selector widget magic by yourself.
-
-2000-10-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* .cvsignore: Ignore Evolution-Addressbook-SelectNames*
-
-2000-10-20  Dan Winship  <danw@helixcode.com>
-
-	* Evolution-Composer.idl: Evolution::Composer interface
-
-	* evolution-composer.[ch]: Implementation and factory. So
-	entirely not tested.
-
-	* Makefile.am (libcomposer_la_SOURCES): Add
-	evolution-composer.[ch]
-	(IDLS): Update this for Evolution-Composer.idl / Composer.idl
-
-	* main.c: Removed. (Old, dead code)
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (glade_data): Add `e-msg-composer-attachment.glade'.
-	(glade_messages): New.
-	(EXTRA_DIST): Add `$(glade_messages)'.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* e-msg-composer.c (create_menubar_file, create_menubar_edit),
-	(create_menubar_format, create_menubar_view, create_menubar): kill.
-	(create_toolbar): die.
-	(setup_ui): impl.
-	(e_msg_composer_construct): hook in.
-	(menu_format_html_cb): update.
-	(menu_view_attachments_activate_cb): ditto.
-	(destroy): upd.
-	(e_msg_composer_construct): upd.
-	(e_msg_composer_set_send_html): upd.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-hdrs.c (init): Don't need the ID anymore.
-
-2000-10-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): If the body
-	text was NULL, then don't bother turning it into HTML (besides, it
-	causes a nasty segfault).
-
-2000-10-15  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: Move CPPFLAGS flags to INCLUDES to avoid bashing
-	any CPPFLAGS set at configure time.
-
-2000-10-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-attachment.c (set_entry): If the entry widget is
-	NULL, obviously we can't set any text on it.
-
-2000-10-14  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-hdrs.c (init): Create a unique-ish id for this set
-	of headers, so that only one select-names dialog will be created for
-	a given set of headers.
-	(address_button_clicked_cb): Pass the unique-ish id to the activate
-	dialog command.
-
-2000-10-13  Larry Ewing  <lewing@helixcode.com>
-
-	* e-msg-composer.c (build_message): stop using format_text,
-	gtkhtml handles this now.
-	(format_text): function removed.
-
-2000-10-10  Iain Holmes  <iain@helixcode.com>
-
-	* e-icon-list.c: Allow NULL pixbufs, and load the "broken" image
-
-	* e-msg-composer-attachment-bar.c (update): If the image isn't 
-	found load the default text/plain icon.
-
-2000-10-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (build_message): If the body of the message has
-	8-bit chars, set the Content-Transfer-Encoding type to the best
-	encoding.
-
-2000-10-02  Dan Winship  <danw@helixcode.com>
-
-	* e-icon-list.c: fix #include of gnome-canvas-pixbuf.h
-
-2000-10-02  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c: If the description of an attachment
-	is a blank string, revert to displaying the filename.
-
-2000-10-01  Iain Holmes  <iain@helixcode.com>
-
-	* e-icon-list.c: If you try to add an icon from a file that doesn't
-	exist put a "Broken icon" image.
-
-	* bad-icon.xpm: Broken icon image.
-
-2000-10-01  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-attachment-bar.[ch] (update): If the attachment is
-	an image, then make a thumbnail for it.
-	Base the attachment bar on e-icon-list instead of gnome-icon-list.
-
-	* e-icon-list.[ch]: New files. These are modified versions of 
-	gnome-icon-list from gnome-libs HEAD that uses gdk-pixbuf instead
-	of the evil Imlib.
-
-	* e-msg-composer-attachment.[ch]: Add a pixbuf_cache member, to
-	save us having to generate a thumbnail for the attachment every
-	time the bar changes.
-	
-	* e-msg-composer.c (e_msg_composer_construct): Add dnd support for
-	files. Drag a file to the composer to add it as an attachment.
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (build_message): Check to see if the body has
-	8bit chars, if so - set the Content-Transfer-Encoding to 8bit.
-	Addresses Bugzilla bug #652.
-
-2000-09-25  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-hdrs.c (setup_headers): fix typo in tooltip.
-	* e-msg-composer.c (create_menubar_file): fix accelerator for
-	"Save as" to be different from "Save". (Both problems pointed out
-	by menthos@menthos.com.)
-
-2000-09-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (get_signature): Updated to handle FIFO
-	streams.
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_construct): Don't g_error out
-	if the html-editor-control fails.
-	(create_composer): New internal function to create and construct a
-	msg_composer and pop up an error message if it fails.
-	(e_msg_composer_new, e_msg_composer_new_with_sig_file,
-	e_msg_composer_new_with_message, e_msg_composer_new_from_url): Use
-	create_composer, return if it fails, change return type to
-	EMsgComposer *.
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment.c (get_mime_type): Use
-	gnome_vfs_get_file_info.
-
-	* e-msg-composer-attachment-bar.c (update): Use gnome_vfs_mime
-	functions, not old gnome_mime.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* e-msg-composer-address-dialog.c, e-msg-composer-address-entry.c,
-	e-msg-composer-attachment.c, e-msg-composer-hdrs.c,
-	e-msg-composer.c: Fixed the #include lines to deal properly with
-	gal.
-
-2000-09-12  Michael Meeks  <michael@helixcode.com>
-
-	* e-msg-composer.c: Update for new UI handler.
-
-2000-09-12  Larry Ewing  <lewing@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (add_common): add a make sure
-	the attachment isn't NULL.  A more complete fix coming soon.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am ($(IDL_GENERATED)): Add space after `-I'.
-
-2000-09-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (create_menubar_format): Accelerate the
-	`Format' menu with an `o' instead of an `f' [the `f' is already
-	taken by the "File" menu].
-
-2000-09-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_sig_file): Applied
-	Jesse's patch that sets the composer's sig_file
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-msg-composer-address-dialog.c: Use e_utf8 wrappers
-
-2000-09-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_get_sig_file): This needs to
-	return a const char * and not a char *, because we're not actually
-	allocating memory here.
-	(create_menubar_file): Changed "Send" to "Send Now" and added
-	"Send Later"
-	(menu_file_send_later_cb): New callback that emits the POSTPONE
-	signal (equivalent to "Send Later"
-
-2000-08-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Always
-	request to import the HTML version if at all possible so that we
-	maintain formatting and other nifty stuff :-)
-
-2000-08-28  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Set the
-	"From" address in the CamelMimeMessage. Also updated to use
-	get_subject to both make our lives easier and prepare for using UTF8
-	(e_msg_composer_hdrs_get_subject): Updated to behave similarly to
-	get_from and return allocated memory (it will have to return
-	allocated memory once it's converted to use UTF8 anyways)
-
-	* e-msg-composer.c (setup_save_draft): Always set
-	composer->send_html = TRUE so that formatting is preserved.
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-msg-composer-address-entry.c: Use e_utf8 wrappers
-
-	* e-msg-composer-attachment.c: Use e_utf8 wrappers
-
-	* e-msg-composer-hdrs.c: Use e_utf8 wrappers
-	
-2000-08-24  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add builddir/shell so we can
-	get Evolution.h
-
-2000-08-12  Michael Meeks  <michael@helixcode.com>
-
-	* e-msg-composer.c (get_text): get_text not get_txt.
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Use
-	new config accessors
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c: Remove unneeded e-setup.h include
-
-2000-08-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (exit_dialog_cb): Made async
-
-2000-08-10  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer.c (do_exit): Temporarily disable draft saving
-	while we figure out how to work around Zucchi's new append_message.
-
-2000-08-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_from): Return the
-	text in GtkCombo->entry
-
-2000-08-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (create_dropdown_entry): Fixed the GList
-	identity stuff, should now display all configured identities.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer-address-dialog.c: Fixed some warnings.
-
-	* e-msg-composer-hdrs.c: Switched the composer to use an EEntry
-	for the subject field.
-
-	* e-msg-composer.c: Changed the non scaling objects in this vbox
-	to be FALSE, FALSE instead of FALSE, TRUE.
-
-2000-08-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (add_header): Modified to allow dropdown
-	entry-boxes as well (for headers like From:)
-	(setup_headers): Modified to use the correct enum type.
-	(create_dropdown_entry): New convenience function to add a
-	drop-down combo box and fill it in with identities
-	(init): Set from_entry to NULL
-	(e_msg_composer_hdrs_get_from): New convenience function to get
-	the text in the From widget in the composer
-	(e_msg_composer_hdrs_set_from): New convenience function to set
-	the From header in the composer
-
-2000-08-08  JP Rosevear  <jpr@helixcode.com>
-
-	* Makefile.am: Fix build by allowing includes for e-table dir
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart):
-	s/strcasecmp/g_strcasecmp
-
-	* e-msg-composer.c: s/strncasecmp/g_strncasecmp - this will help
-	later with building on different platforms :-)
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Added code
-	to set the body text based on the CamelMimeMessage.
-	(set_editor_text): Use lowercase html tags...
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (do_exit): Prompt the user to save their
-	composition in Drafts.
-	(set_editor_text): Uhm, use "-- \n" not "--\n" because the space
-	is called for in the standard
-	(e_msg_composer_new_with_message): New convenience function that
-	takes a CamelMimeMessage as an argument. This will be useful when
-	we code the ability to resume the editing of a message draft (like
-	in the Drafts folder).
-
-2000-08-01  JP Rosevear  <jpr@helixcode.com>
-
-	* e-msg-composer.h: Constify param
-
-	* e-msg-composer.c (get_signature): Constify param
-	(set_editor_text): ditto
-	(e_msg_composer_new_with_sig_file): ditto
-
-2000-08-01  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer.c (set_editor_text): sizeof("--\") !=
-	strlen("--\n"), breaking the test for the signature prefix.
-
-2000-07-28  JP Rosevear  <jpr@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_sig_file): New
-	function to create composer with sig file set.
-	(e_msg_composer_get_sig_file): New function to get sig file
-	(e_msg_composer_set_sig_file): New function to set sig file
-
-2000-07-25  Michael Meeks  <michael@helixcode.com>
-
-	* e-msg-composer.c (get_text): add textual exception printout.
-	(set_editor_text): close pre tags & check for pre-existing
-	sig separator.
-
-2000-07-25  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer.c (menu_file_insert_file_cb): Mark this function
-	as FIXME because we're waiting for the HTML Editor Control to
-	support paste commands. Also some updates for when that happens.
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c: Remove GOAD support.
-	(create_editor): Try to give a more helpful error message when
-	failing to load the editor control.
-
-2000-07-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (menu_format_html_cb): New callback for the
-	"Send HTML" menu toggle item.
-	(create_menubar_format): New.
-	(create_menubar): Call it.
-	(create_menubar_options): Removed.
-	(init): Initialize `send_html' and `attachment_bar_visible' to
-	FALSE.
-	(get_signature): Add `void' to the declaration.  This is C, not
-	C++.
-	(menu_file_close_cb): Renamed from `exit_cb'.
-	(menu_file_send_cb): Renamed from `send_cb'.
-	(menu_file_save_as_cb): Renamed from `save_as_cb'.
-	(menu_file_save_cb): Renamed from `save_cb'.
-	(menu_file_open_cb): Renamed from `open_cb'.
-	(menu_file_add_attachment_cb): Renamed from `add_attachment_cb'.
-	(menu_file_insert_file_cb): Renamed from `insert_file_cb'.
-	(e_msg_composer_set_send_html): New.
-	(build_message): Use the `send_html' flag instead of peeking the
-	`msg_format' gnome-config value directly.
-
-	* e-msg-composer.h: New member `send_html' in `EMsgComposer'.
-
-2000-07-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c: Changed to use BonoboUIHandler stuff directly
-	instead of translating from GnomeUIInfo.
-	(create_menubar_file): New.
-	(create_menubar_edit): New.
-	(create_menubar_view): New.
-	(create_menubar_options): New.
-	(create_menubar): Use these functions to set up the menu bar.
-	(create_toolbar): Use BonoboUIHandler directly instead of
-	converting from GnomeUIInfo.
-	(toolbar_view_attachments_clicked_cb): Removed.
-	(address_dialog_cb): Removed.
-	(address_dialog_destroy_cb): Removed.
-	(address_dialog_apply_cb): Removed.
-	(setup_address_dialog): Removed.
-
-2000-07-12  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer.c: (view_tree) Make the "View Attachments" item
-	a toggleitem ... so that it can be toggled...
-	(menu_view_attachments_activate_cb): Treat the widget correctly
-	and toggle correctly.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (exit_cb): Use it.
-	(delete_event): New, handler for the "delete_event" signal.
-
-2000-07-09  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (set_editor_text): Don't load "" into the
-	editor, because it will cause the editor component to g_warning.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer-hdrs.c: Removed the extra frame here.
-
-2000-07-08  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (create_menubar): Create an empty "Edit" menu
-	for the editor control to insert itself into.
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* .cvsignore: Ignore dynamically created source files
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer-hdrs.c (set_entry): New.
-	(e_msg_composer_hdrs_set_to): Use it.
-	(e_msg_composer_hdrs_set_cc): Likewise
-	(e_msg_composer_hdrs_set_bcc): Likewise.
-	(e_msg_composer_hdrs_get_to): Replace implementation with a
-	`g_assert_not_reached()'.
-	(e_msg_composer_hdrs_get_cc): Likewise.
-	(e_msg_composer_hdrs_get_bcc): Likewise.
-
-	* e-msg-composer.c: Get rid of cut/copy/paste/undo as they
-	duplicate the editor toolbar and cannot be made to work for all
-	the widgets anyway.
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer-hdrs.c: New member `corba_select_names' in
-	`EMsgComposerHdrsPrivate'.
-	(destroy): If not `CORBA_OBJECT_NIL', release.
-	(init): Init to `CORBA_OBJECT_NIL'.
-	(setup_corba): New.
-	(e_msg_composer_hdrs_new): Call it.
-	(add_entry): Create the entries by using the ::SelectNames
-	interface.
-	(address_button_clicked_cb): Activate the dialog through the
-	::SelectNames interface.
-
-2000-06-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c: Changed "Exit" to "Close" in the File menu.
-	This is a little more intuitive as it does not suggest exiting
-	the application, just says "close this window".
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-msg-composer-select-file.h for make
-	distcheck.
-
-2000-06-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c
-	(load): New.
-	(open_cb): Use it.
-	(save): New function.
-	(save_cb): Implemented by using it.
-	(save_as_cb): Likewise.
-
-2000-06-17  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_construct): I18N the title bar.
-
-	* Makefile.am (libcomposerinclude_HEADERS): Removed.  Move all the
-	`.h' files into `libcomposer_la_SOURCES' so that they get
-	distributed, but not installed.
-
-	* e-msg-composer.c (open_cb): New; implement the `Open' command.
-	(save_as_cb): New; implement the `Save as' command.
-	(init): Initialize the `persist_file_interface' and
-	`persist_stream_interface' members to NULL.
-	(destroy): Release the PersistStream and PersistFile interfaces.
-	(e_msg_composer_construct): Query the PersistFile and
-	PersistStream interfaces on the control and save them in the
-	`persist_file_interface' and `persist_stream_interface' members.
-	(get_text): Renamed from `get_editor_text'.  Get a
-	@persist_stream_interface instead of querying it a the control.
-	(build_message): Return NULL if `persist_stream_interface' is nil.
-
-	* e-msg-composer.h: New member `persist_file_interface' in
-	`EMsgComposer'.
-
-	* e-msg-composer-select-file.c: New.
-	* e-msg-composer-select-file.h: New.
-
-	* e-msg-composer.c (e_msg_composer_construct): Make the `To:'
-	entry grab the keyboard focus.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_to_entry): New.
-	(e_msg_composer_hdrs_get_cc_entry): New.
-	(e_msg_composer_hdrs_get_bcc_entry): New.
-	(e_msg_composer_hdrs_get_subject_entry): New.
-
-	* e-msg-composer.c (e_msg_composer_construct): Set the scroll
-	frame's shadow type to `GTK_SHADOW_IN'.
-	(format_text): Initialize `tabbing' to zero to shut down the
-	compiler.
-
-2000-06-14  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (add_from_user): keep the
-	GtkFileSelection around between calls so we start up in the same
-	directory we ended up in last time around. (Also fixes a big
-	memory leak in that the code was already keeping the
-	GtkFileSelection around, it just wasn't remembering to reuse it.)
-
-	* e-msg-composer.c (format_text): Don't line-wrap lines that start
-	with ">".
-
-2000-06-12  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (format_text): If a paragraph starts with TABs,
-	indent the whole paragraph to that tab level.
-
-2000-06-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c: Make the `attachment_scroll_frame' an
-	`EScrollFrame'.
-	(exit_cb): I18N the quit message.
-
-	* e-msg-composer.h: `attachment_scrolled_window' renamed to
-	`attachment_scroll_frame'.
-
-2000-06-12  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (format_text): Don't break on non-breaking
-	spaces, don't keep non-breaking spaces that fall after a line
-	wrap, and translate non-breaking spaces to regular ones after
-	wrapping.
-
-2000-06-05  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_attach): New convenience
-	function.
-
-	* e-msg-composer-attachment.c: Store a CamelMimePart rather than
-	filename/description/mime_type info. Also record whether we were
-	told or guessed the MIME type.
-	(e_msg_composer_attachment_new_from_mime_part): New constructor.
-	(e_msg_composer_attachment_edit): Remove the "browse" button. (If
-	the user wants to change the actual file that the attachment is
-	based on, he should delete the attachment and create a new one...)
-	Remove the "Apply" button, because it's not all that useful. Make
-	the MIME type only track the filename if it was guessed rather
-	than being provided.
-
-	* e-msg-composer-attachment.glade: Remove "browse" and "apply"
-	buttons. Make filename editable.
-
-	* e-msg-composer-attachment-bar.c (sort): Removed. Send the
-	attachments in the order the user attached them in.
-	(text_changed): Removed, since we weren't enabling the relevant
-	GnomeIconList functionality that would have used this.
-	(update): Don't print the size if it's 0.
-	(attach_to_multipart, etc): adjust for EMsgComposerAttachment
-	changes.
-	(attach_to_multipart): Use 7bit encoding for message/ subparts.
-	(e_msg_composer_attachment_bar_attach_mime_part): New convenience
-	function.
-	
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer.c: Added the ability to save plain text mail.
-
-2000-05-29  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (get_editor_text): add a "format" argument so
-	we can fetch different kinds of text.
-	(format_text): New function to do line wrapping on plain text.
-	(build_message): Build multipart/alternative messages rather than
-	HTML-only ones. Yay. We don't suck (as much) any more!
-
-2000-05-28  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c: #include <errno.h>
-
-2000-05-26  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (get_editor_text, set_editor_text): Update for
-	PersistStream changes
-	(build_message): Update for CamelMultipart changes.
-
-	* e-msg-composer.c (get_signature): routine to read the user's
-	signature file.
-	(set_editor_text): If the user has configured a signature, append
-	it to the set text.
-	(e_msg_composer_new): Call set_editor_text with "" to load the
-	signature (if any).
-	
-2000-05-25  Not Zed  <NotZed@HelixCode.com>
-
-	* e-msg-composer.c (build_message): Use camel_data_wrapper_new
-	instead of camel_simple_data_wrapper_new.
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (build_message): Use
-	camel_simple_data_wrapper_new rather than camel_data_wrapper_new.
-
-2000-05-13  Valek Filippov  <frob@df.ru>
-
-	* e-msg-composer-attachment.glade: save translatable strings
-	* e-msg-composer-attachment.glade.h: file with strings
-	* e-msg-composer-address-dialog.glade: save translatable strings
-	* e-msg-composer-address-dialog.glade.h: file with strings
-
-2000-05-12  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (get_editor_text): NUL-terminate the data
-	extracted from the BonoboStream.
-
-2000-05-10  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): deal with
-	Content-Transfer-Encoding a little bit at least.
-
-2000-05-07  Mathieu Lacage <mathieu@gnu.org>
-
-	* e-msg-composer.c (create_editor): remove FIXME and hardcoded 
-	string. You can write mails with OAF now.
-	
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (build_message): unref content, etc. after
-	attaching it to message.
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): unref
-	part after attaching it.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer-hdrs.c: Turned off focus in the To, Cc, and Bcc
-	buttons.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-04-28  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-hdrs.c (set_recipients): Update (minimally) for
-	Camel recipient changes.
-
-2000-04-27  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_from_url): New routine, to
-	process mailto URLs.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (build_message): Only generate a multipart
-	message if there are attachments. Otherwise generate a single
-	part.
-
-	* Update for CamelMimeBodyPart -> CamelMimePart
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): add a
-	s/SIMPLE_// that notzed missed. Update to use
-	camel_mime_part_set_content.
-	* e-msg-composer.c (build_message): remove a now-unused variable.
-	Update for camel_mime_part_set_content.
-
-2000-04-26  NotZed  <NotZed@HelixCode.com>
-
-	* e-msg-composer.c (build_message): Use camel_mime_part_set_text()
-	to set the text rather than messing with data wrappers.
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Change
-	for new camel-stream interfaces.
-	(attach_to_multipart): Also set base64 encoding by default.
-
-2000-04-25  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (create_editor): use uih here
-	(e_msg_composer_construct): create menubar/toolbar before creating
-	editor control
-
-2000-04-23  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: build libcomposer static and don't install it.
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): This was
-	only half-implemented. Finish it, mostly.
-
-2000-04-22  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_add_header): new function to
-	make the composer record additional headers it should output.
-	(In-Reply-To), etc.
-	(build_message): output them
-
-2000-04-21  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_set_headers): 
-	(e_msg_composer_set_body_text): new functions
-	(exit_cb): Connect "Exit" menu item finally.
-
-	* e-msg-composer-hdrs.c: const poisoning
-	(e_msg_composer_hdrs_set_subject): 
-	(e_msg_composer_hdrs_get_subject): new functions
-
-	* e-msg-composer-address-entry.c: const poisoning
-
-2000-04-20  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (get_editor_text, set_editor_text): new
-	functions to get and set the contents of the HTML editor via
-	Bonobo::PersistStream.
-	(build_message): use get_editor_text. This works again.
-
-2000-04-17  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (build_message): Change
-	camel_mime_message_new_with_session to camel_mime_message_new
-
-2000-03-17  bertrand  <bertrand@helixcode.com>
-
-	* e-msg-composer.c (create_menubar): Pass the composer as the data
-	for the menubar callbacks.
-
-2000-03-12  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: Modified to make the composer into a library, to be
-	used by the mail component.
-
-2000-03-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (create_toolbar): Pass the composer as the data
-	for the toolbar callbacks.
-	(e_msg_composer_construct): Connect the "changed" signal of the
-	attachment bar to `attachment_bar_changed()'.
-	(attachment_bar_changed): Renamed to `attachment_bar_changed_cb'.
-
-2000-03-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new): Precondition:
-	gtk_main_level() greater than zero.
-	(e_msg_composer_construct): Likewise.
-	(create_menus): New function.  Set up menus through
-	BonoboUIHandler.
-	(e_msg_composer_construct): Use it.
-
-	* main.c (main): Initialize Bonobo.
-
-	* e-msg-composer.c (init): Initialize `uih' and `editor' to NULL.
-	Do not init `text' and `text_scrolled_window' anymore.
-	(destroy): Unref `uih'.
-	(e_msg_composer_construct): Create a new BonoboUIHandler and put
-	it into `uih'.
-	(create_editor): New helper function.
-	(e_msg_composer_construct): Use it to set up the editor.
-
-	* e-msg-composer.h: New member `uih' in `EMsgComposer'.  Removed
-	members `text', `text_scrolled_window'.  New member `editor'.
-
-	* Makefile.am (INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'.
-	(evolution_msg_composer_LDADD): Add `$(BONOBO_GNOME_LIBS)'.
-
-	* e-msg-composer.c (glade_connect): Removed.
-	(setup_signals): Removed.
-	(e_msg_composer_construct): Do not use libglade to set the toolbar
-	and menubar up.
-	(destroy): Removed libglade stuff.
-	(init): Likewise.
-
-	* e-msg-composer.h: Removed `menubar_gui', `toolbar_gui',
-	`appbar_gui'.
-
-	* e-msg-composer.glade: Removed.
-
-2000-01-12  bertrand  <bertrand@helixcode.com>
-
-	* Makefile.am (evolution_msg_composer_LDADD): 
-	use $(EXTRA_GNOME_LIBS_THREADS) to link with gthread
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* Makefile.am: New Makefile to compile the message composer
-	executable.
-
-	* main.c: New file.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Use
-	`CAMEL_RECIPIENT*' macros instead of the old `RECIPIENT*' ones
-	that do not exist anymore.
-
-	* e-msg-composer-address-dialog.c
-	(e_msg_composer_address_dialog_construct): Use `E_GLADEDIR'
-	instead of `E_GUIDIR'.
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):
-	Likewise.
-	* e-msg-composer.c (e_msg_composer_construct): Likewise.
-
-(See `$(top_srcdir)/widgets/ChangeLog' for previous changes to the
-message composer.)
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 108ab470ee..68a7ec142c 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -69,8 +69,7 @@ ui_DATA = evolution-composer.ui
 
 EXTRA_DIST =					\
 	$(ui_DATA)				\
-	mail-composer.error.xml			\
-	ChangeLog.pre-1-4
+	mail-composer.error.xml
 
 BUILT_SOURCES = $(error_DATA)
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 70f7c44ed9..e5c9372f59 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -58,6 +58,7 @@ action_close_cb (GtkAction *action,
 {
 	GtkhtmlEditor *editor;
 	EComposerHeaderTable *table;
+	GdkWindow *window;
 	GtkWidget *widget;
 	const gchar *subject;
 	gint response;
@@ -70,7 +71,8 @@ action_close_cb (GtkAction *action,
 		return;
 	}
 
-	gdk_window_raise (widget->window);
+	window = gtk_widget_get_window (widget);
+	gdk_window_raise (window);
 
 	table = e_msg_composer_get_header_table (composer);
 	subject = e_composer_header_table_get_subject (table);
diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c
index eefb47e6d1..3db7ef20e4 100644
--- a/composer/e-composer-autosave.c
+++ b/composer/e-composer-autosave.c
@@ -24,8 +24,6 @@
 
 #include <e-util/e-alert-dialog.h>
 #include <e-util/e-util.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
 
 #define AUTOSAVE_PREFIX		".evolution-composer.autosave"
 #define AUTOSAVE_SEED		AUTOSAVE_PREFIX "-XXXXXX"
@@ -34,13 +32,17 @@
 typedef struct _AutosaveState AutosaveState;
 
 struct _AutosaveState {
+	EMsgComposer *composer;
 	GFile *file;
+	gboolean changed;
+	guint source_id; /* timeout source ID */
 	gboolean enabled;
 	gboolean error_shown;
 };
 
 static GList *autosave_registry;
-static guint autosave_source_id;
+
+static void composer_changed_cb (EMsgComposer *composer);
 
 static EMsgComposer *
 composer_autosave_registry_lookup (const gchar *basename)
@@ -69,12 +71,17 @@ composer_autosave_registry_lookup (const gchar *basename)
 }
 
 static AutosaveState *
-composer_autosave_state_new (void)
+composer_autosave_state_new (EMsgComposer *composer)
 {
 	AutosaveState *state;
 
 	state = g_slice_new0 (AutosaveState);
 	state->enabled = TRUE;
+	state->changed = FALSE;
+	state->source_id = 0;
+	state->composer = composer;
+
+	g_signal_connect (composer, "notify::changed", G_CALLBACK (composer_changed_cb), NULL);
 
 	return state;
 }
@@ -82,6 +89,8 @@ composer_autosave_state_new (void)
 static void
 composer_autosave_state_free (AutosaveState *state)
 {
+	if (state->source_id)
+		g_source_remove (state->source_id);
 	if (state->file)
 		g_object_unref (state->file);
 	g_slice_free (AutosaveState, state);
@@ -155,26 +164,54 @@ composer_autosave_finish_cb (EMsgComposer *composer,
 	}
 }
 
-static void
-composer_autosave_foreach (EMsgComposer *composer)
+static gboolean
+composer_autosave_timeout (EMsgComposer *composer)
 {
-	/* Make sure the composer is still alive. */
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
+	AutosaveState *state;
+
+	g_return_val_if_fail (composer != NULL, FALSE);
+	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
 
-	if (e_composer_autosave_get_enabled (composer))
+	state = g_object_get_data (G_OBJECT (composer), "autosave");
+	g_return_val_if_fail (state != NULL, FALSE);
+	g_return_val_if_fail (state->composer == composer, FALSE);
+
+	if (!state->changed) {
+		state->source_id = 0;
+		return FALSE;
+	}
+
+	composer = state->composer;
+
+	if (e_composer_autosave_get_enabled (composer)) {
+		state->changed = FALSE;
 		e_composer_autosave_snapshot_async (
 			composer, (GAsyncReadyCallback)
 			composer_autosave_finish_cb, NULL);
+	}
+
+	return TRUE;
 }
 
-static gboolean
-composer_autosave_timeout (void)
+static void
+composer_changed_cb (EMsgComposer *composer)
 {
-	g_list_foreach (
-		autosave_registry, (GFunc)
-		composer_autosave_foreach, NULL);
+	AutosaveState *state;
 
-	return TRUE;
+	g_return_if_fail (composer != NULL);
+	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
+
+	state = g_object_get_data (G_OBJECT (composer), "autosave");
+	g_return_if_fail (state != NULL);
+	g_return_if_fail (state->composer == composer);
+
+	g_object_get (G_OBJECT (composer), "changed", &state->changed, NULL);
+
+	if (state->changed && state->source_id == 0) {
+		state->source_id = g_timeout_add_seconds (
+			AUTOSAVE_INTERVAL, (GSourceFunc)
+			composer_autosave_timeout, state->composer);
+	}
 }
 
 static void
@@ -184,12 +221,6 @@ composer_autosave_notify (gpointer unused,
 	/* Remove the dead composer from the registry. */
 	autosave_registry = g_list_remove (
 		autosave_registry, where_the_object_was);
-
-	/* Cancel timeouts if the registry is now empty. */
-	if (autosave_registry == NULL && autosave_source_id != 0) {
-		g_source_remove (autosave_source_id);
-		autosave_source_id = 0;
-	}
 }
 
 GList *
@@ -258,7 +289,7 @@ e_composer_autosave_register (EMsgComposer *composer)
 
 	g_object_set_data_full (
 		G_OBJECT (composer), "autosave",
-		composer_autosave_state_new (),
+		composer_autosave_state_new (composer),
 		(GDestroyNotify) composer_autosave_state_free);
 
 	autosave_registry = g_list_prepend (autosave_registry, composer);
@@ -266,11 +297,6 @@ e_composer_autosave_register (EMsgComposer *composer)
 	g_object_weak_ref (
 		G_OBJECT (composer), (GWeakNotify)
 		composer_autosave_notify, NULL);
-
-	if (autosave_source_id == 0)
-		autosave_source_id = g_timeout_add_seconds (
-			AUTOSAVE_INTERVAL, (GSourceFunc)
-			composer_autosave_timeout, NULL);
 }
 
 void
@@ -390,8 +416,8 @@ autosave_snapshot_cb (GFile *file,
 		CAMEL_STREAM_MEM (camel_stream), buffer);
 	camel_data_wrapper_decode_to_stream (
 		CAMEL_DATA_WRAPPER (message), camel_stream);
-	camel_object_unref (message);
-	camel_object_unref (camel_stream);
+	g_object_unref (message);
+	g_object_unref (camel_stream);
 
 	/* Load the buffer into a GMemoryInputStream.
 	 * But watch out for zero length MIME parts. */
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 98b004d616..7a5d485933 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -19,7 +19,6 @@
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <camel/camel-internet-address.h>
 #include <libedataserverui/e-name-selector.h>
 
 #include "e-util/e-binding.h"
@@ -244,7 +243,7 @@ composer_header_table_update_destinations (EDestination **old_destinations,
 		}
 	}
 
-	camel_object_unref (inet_address);
+	g_object_unref (inet_address);
 
 skip_auto:
 
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index 4c968d43d8..0c634175de 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -85,7 +85,7 @@ composer_header_constructor (GType type,
 
 	if (header->priv->button) {
 		widget = gtk_button_new_with_mnemonic (header->priv->label);
-		GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS);
+		gtk_widget_set_can_focus (widget, FALSE);
 		g_signal_connect (
 			widget, "clicked",
 			G_CALLBACK (composer_header_button_clicked_cb),
diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c
index 39e079a790..46121eb7ba 100644
--- a/composer/e-composer-name-header.c
+++ b/composer/e-composer-name-header.c
@@ -112,6 +112,7 @@ composer_name_header_constructor (GType type,
 	ENameSelectorModel *model;
 	ENameSelectorEntry *entry;
 	GObject *object;
+	GList *sections;
 	gchar *label;
 
 	/* Chain up to parent's constructor() method. */
@@ -125,9 +126,11 @@ composer_name_header_constructor (GType type,
 	label = e_composer_header_get_label (E_COMPOSER_HEADER (object));
 	g_assert (label != NULL);
 
-	/* XXX Peeking at private data. */
-	priv->destination_index = model->sections->len;
+	sections = e_name_selector_model_list_sections (model);
+	priv->destination_index = g_list_length (sections);
 	e_name_selector_model_add_section (model, label, label, NULL);
+	g_list_foreach (sections, (GFunc) g_free, NULL);
+	g_list_free (sections);
 
 	e_composer_header_set_title_tooltip (
 		E_COMPOSER_HEADER (object),
diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c
index cb297fe375..43b2a9d37d 100644
--- a/composer/e-composer-post-header.c
+++ b/composer/e-composer-post-header.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
 
 #define E_COMPOSER_POST_HEADER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -45,16 +45,26 @@ static gchar *
 composer_post_header_folder_name_to_string (EComposerPostHeader *header,
                                             const gchar *url)
 {
+	gchar *res = NULL;
 	const gchar *base_url = header->priv->base_url;
 
 	if (base_url != NULL) {
 		gsize length = strlen (base_url);
 
-		if (g_ascii_strncasecmp (url, base_url, length) == 0)
-			return g_strdup (url + length);
+		if (g_ascii_strncasecmp (url, base_url, length) == 0) {
+			res = g_uri_unescape_string (url + length, NULL);
+			if (!res)
+				res = g_strdup (url + length);
+		}
+	}
+
+	if (!res) {
+		res = g_uri_unescape_string (url, NULL);
+		if (!res)
+			res = g_strdup (url);
 	}
 
-	return g_strdup (url);
+	return res;
 }
 
 static void
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 5fbf7cdb86..22b4565f4b 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -109,14 +109,14 @@ msg_composer_url_requested_cb (GtkHTML *html,
 
 	array = g_byte_array_new ();
 	camel_stream = camel_stream_mem_new_with_byte_array (array);
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+	wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 	camel_data_wrapper_decode_to_stream (wrapper, camel_stream);
 
 	gtk_html_write (html, stream, (gchar *) array->data, array->len);
 
 	gtk_html_end (html, stream, GTK_HTML_STREAM_OK);
 
-	camel_object_unref (camel_stream);
+	g_object_unref (camel_stream);
 
 	/* gtk_html_end() destroys the GtkHTMLStream, so we need to
 	 * stop the signal emission so nothing else tries to use it. */
@@ -185,7 +185,7 @@ e_composer_private_constructed (EMsgComposer *composer)
 	priv->inline_images_by_url = g_hash_table_new_full (
 		g_str_hash, g_str_equal,
 		(GDestroyNotify) g_free,
-		(GDestroyNotify) camel_object_unref);
+		(GDestroyNotify) g_object_unref);
 
 	priv->charset = e_composer_get_default_charset ();
 
@@ -445,7 +445,7 @@ e_composer_private_dispose (EMsgComposer *composer)
 	g_hash_table_remove_all (composer->priv->inline_images_by_url);
 
 	if (composer->priv->redirect != NULL) {
-		camel_object_unref (composer->priv->redirect);
+		g_object_unref (composer->priv->redirect);
 		composer->priv->redirect = NULL;
 	}
 }
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index cac41aabe4..570439530a 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -27,25 +27,6 @@
 #include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 
-#include <camel/camel-charset-map.h>
-#include <camel/camel-cipher-context.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-gpg-context.h>
-#include <camel/camel-iconv.h>
-#include <camel/camel-mime-filter-basic.h>
-#include <camel/camel-mime-filter-canon.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-multipart-encrypted.h>
-#include <camel/camel-multipart-signed.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-string-utils.h>
-#if defined (HAVE_NSS)
-#include <camel/camel-smime-context.h>
-#endif
-
 #include "e-composer-actions.h"
 #include "e-composer-autosave.h"
 #include "e-composer-header-table.h"
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 469327214a..67a9781395 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -147,7 +147,7 @@ emcu_part_to_html (CamelMimePart *part, gssize *len, EMFormat *source)
 	g_object_unref(emfq);
 
 	camel_stream_write((CamelStream *) mem, "", 1);
-	camel_object_unref(mem);
+	g_object_unref (mem);
 
 	text = (gchar *)buf->data;
 	if (len)
@@ -163,6 +163,7 @@ emcu_prompt_user (GtkWindow *parent, const gchar *promptkey, const gchar *tag, .
 {
 	GtkDialog *mbox;
 	GtkWidget *check = NULL;
+	GtkWidget *container;
 	va_list ap;
 	gint button;
 	GConfClient *gconf = gconf_client_get_default ();
@@ -184,7 +185,8 @@ emcu_prompt_user (GtkWindow *parent, const gchar *promptkey, const gchar *tag, .
 	if (promptkey) {
 		check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again."));
 		gtk_container_set_border_width((GtkContainer *)check, 12);
-		gtk_box_pack_start ((GtkBox *)mbox->vbox, check, TRUE, TRUE, 0);
+		container = gtk_dialog_get_content_area (mbox);
+		gtk_box_pack_start (GTK_BOX (container), check, TRUE, TRUE, 0);
 		gtk_widget_show (check);
 	}
 
@@ -457,9 +459,9 @@ set_recipients_from_destv (CamelMimeMessage *msg,
 		camel_mime_message_set_recipients (msg, header, bcc_addr);
 	}
 
-	camel_object_unref (to_addr);
-	camel_object_unref (cc_addr);
-	camel_object_unref (bcc_addr);
+	g_object_unref (to_addr);
+	g_object_unref (cc_addr);
+	g_object_unref (bcc_addr);
 }
 
 static void
@@ -502,7 +504,7 @@ build_message_headers (EMsgComposer *composer,
 		} else
 			camel_mime_message_set_from (msg, addr);
 
-		camel_object_unref (addr);
+		g_object_unref (addr);
 	}
 
 	/* Reply-To: */
@@ -515,7 +517,7 @@ build_message_headers (EMsgComposer *composer,
 		if (camel_address_unformat (CAMEL_ADDRESS (addr), reply_to) > 0)
 			camel_mime_message_set_reply_to (msg, addr);
 
-		camel_object_unref (addr);
+		g_object_unref (addr);
 	}
 
 	/* To:, Cc:, Bcc: */
@@ -555,6 +557,25 @@ build_message_headers (EMsgComposer *composer,
 	}
 }
 
+static CamelCipherHash
+account_hash_algo_to_camel_hash (const gchar *hash_algo)
+{
+	CamelCipherHash res = CAMEL_CIPHER_HASH_DEFAULT;
+
+	if (hash_algo && *hash_algo) {
+		if (g_ascii_strcasecmp (hash_algo, "sha1") == 0)
+			res = CAMEL_CIPHER_HASH_SHA1;
+		else if (g_ascii_strcasecmp (hash_algo, "sha256") == 0)
+			res = CAMEL_CIPHER_HASH_SHA256;
+		else if (g_ascii_strcasecmp (hash_algo, "sha384") == 0)
+			res = CAMEL_CIPHER_HASH_SHA384;
+		else if (g_ascii_strcasecmp (hash_algo, "sha512") == 0)
+			res = CAMEL_CIPHER_HASH_SHA512;
+	}
+
+	return res;
+}
+
 static CamelMimeMessage *
 build_message (EMsgComposer *composer,
                gboolean html_content,
@@ -599,7 +620,7 @@ build_message (EMsgComposer *composer,
 	/* evil kludgy hack for Redirect */
 	if (p->redirect) {
 		build_message_headers (composer, p->redirect, TRUE);
-		camel_object_ref (p->redirect);
+		g_object_ref (p->redirect);
 		return p->redirect;
 	}
 
@@ -667,44 +688,46 @@ build_message (EMsgComposer *composer,
 
 	/* convert the stream to the appropriate charset */
 	if (iconv_charset && g_ascii_strcasecmp (iconv_charset, "UTF-8") != 0) {
-		CamelStreamFilter *filter_stream;
-		CamelMimeFilterCharset *filter;
+		CamelStream *filter_stream;
+		CamelMimeFilter *filter;
 
-		filter_stream = camel_stream_filter_new_with_stream (stream);
-		camel_object_unref (stream);
+		filter_stream = camel_stream_filter_new (stream);
+		g_object_unref (stream);
 
-		stream = (CamelStream *) filter_stream;
-		filter = camel_mime_filter_charset_new_convert ("UTF-8", iconv_charset);
-		camel_stream_filter_add (filter_stream, (CamelMimeFilter *) filter);
-		camel_object_unref (filter);
+		stream = filter_stream;
+		filter = camel_mime_filter_charset_new ("UTF-8", iconv_charset);
+		camel_stream_filter_add (
+			CAMEL_STREAM_FILTER (filter_stream), filter);
+		g_object_unref (filter);
 	}
 
 	if (plain_encoding == CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE) {
 		/* encode to quoted-printable by ourself, together with
 		   taking care of "\nFrom " text */
-		CamelStreamFilter *filter_stream;
+		CamelStream *filter_stream;
 		CamelMimeFilter *mf, *qp;
 
 		if (!CAMEL_IS_STREAM_FILTER (stream)) {
-			filter_stream = camel_stream_filter_new_with_stream (stream);
-			camel_object_unref (stream);
+			filter_stream = camel_stream_filter_new (stream);
+			g_object_unref (stream);
 
-			stream = (CamelStream *) filter_stream;
+			stream = filter_stream;
 		}
 
-		qp = (CamelMimeFilter *) camel_mime_filter_basic_new_type (CAMEL_MIME_FILTER_BASIC_QP_ENC);
+		qp = camel_mime_filter_basic_new (
+			CAMEL_MIME_FILTER_BASIC_QP_ENC);
 		camel_stream_filter_add (CAMEL_STREAM_FILTER (stream), qp);
-		camel_object_unref (qp);
+		g_object_unref (qp);
 
 		mf = camel_mime_filter_canon_new (CAMEL_MIME_FILTER_CANON_FROM);
 		camel_stream_filter_add (CAMEL_STREAM_FILTER (stream), mf);
-		camel_object_unref (mf);
+		g_object_unref (mf);
 	}
 
 	/* construct the content object */
 	plain = camel_data_wrapper_new ();
 	camel_data_wrapper_construct_from_stream (plain, stream);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	if (plain_encoding == CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE) {
 		/* to not re-encode the data when pushing it to a part */
@@ -740,27 +763,28 @@ build_message (EMsgComposer *composer,
 		if (pre_encode) {
 			/* encode to quoted-printable by ourself, together with
 			   taking care of "\nFrom " text */
-			CamelStreamFilter *filter_stream;
+			CamelStream *filter_stream;
 			CamelMimeFilter *mf, *qp;
 
 			if (!CAMEL_IS_STREAM_FILTER (stream)) {
-				filter_stream = camel_stream_filter_new_with_stream (stream);
-				camel_object_unref (stream);
+				filter_stream = camel_stream_filter_new (stream);
+				g_object_unref (stream);
 
-				stream = (CamelStream *) filter_stream;
+				stream = filter_stream;
 			}
 
-			qp = (CamelMimeFilter *) camel_mime_filter_basic_new_type (CAMEL_MIME_FILTER_BASIC_QP_ENC);
+			qp = camel_mime_filter_basic_new (
+				CAMEL_MIME_FILTER_BASIC_QP_ENC);
 			camel_stream_filter_add (CAMEL_STREAM_FILTER (stream), qp);
-			camel_object_unref (qp);
+			g_object_unref (qp);
 
 			mf = camel_mime_filter_canon_new (CAMEL_MIME_FILTER_CANON_FROM);
 			camel_stream_filter_add (CAMEL_STREAM_FILTER (stream), mf);
-			camel_object_unref (mf);
+			g_object_unref (mf);
 		}
 
 		camel_data_wrapper_construct_from_stream (html, stream);
-		camel_object_unref (stream);
+		g_object_unref (stream);
 		camel_data_wrapper_set_mime_type (html, "text/html; charset=utf-8");
 
 		if (pre_encode) {
@@ -775,18 +799,18 @@ build_message (EMsgComposer *composer,
 		camel_multipart_set_boundary (body, NULL);
 
 		part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (part), plain);
-		camel_object_unref (plain);
+		camel_medium_set_content (CAMEL_MEDIUM (part), plain);
+		g_object_unref (plain);
 		camel_mime_part_set_encoding (part, plain_encoding);
 		camel_multipart_add_part (body, part);
-		camel_object_unref (part);
+		g_object_unref (part);
 
 		part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (part), html);
-		camel_object_unref (html);
+		camel_medium_set_content (CAMEL_MEDIUM (part), html);
+		g_object_unref (html);
 		camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE);
 		camel_multipart_add_part (body, part);
-		camel_object_unref (part);
+		g_object_unref (part);
 
 		/* If there are inlined images, construct a
 		 * multipart/related containing the
@@ -802,10 +826,10 @@ build_message (EMsgComposer *composer,
 			camel_multipart_set_boundary (html_with_images, NULL);
 
 			part = camel_mime_part_new ();
-			camel_medium_set_content_object (CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER (body));
-			camel_object_unref (body);
+			camel_medium_set_content (CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER (body));
+			g_object_unref (body);
 			camel_multipart_add_part (html_with_images, part);
-			camel_object_unref (part);
+			g_object_unref (part);
 
 			add_inlined_images (composer, html_with_images);
 			clear_current_images (composer);
@@ -828,12 +852,12 @@ build_message (EMsgComposer *composer,
 		camel_multipart_set_boundary (multipart, NULL);
 
 		part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (part), current);
+		camel_medium_set_content (CAMEL_MEDIUM (part), current);
 		if (current == plain)
 			camel_mime_part_set_encoding (part, plain_encoding);
-		camel_object_unref (current);
+		g_object_unref (current);
 		camel_multipart_add_part (multipart, part);
-		camel_object_unref (part);
+		g_object_unref (part);
 
 		e_attachment_store_add_to_multipart (
 			store, multipart, p->charset);
@@ -874,7 +898,7 @@ build_message (EMsgComposer *composer,
 
 		recipients = g_ptr_array_new ();
 		for (i = 0; i < G_N_ELEMENTS (types); i++) {
-			const CamelInternetAddress *addr;
+			CamelInternetAddress *addr;
 			const gchar *address;
 
 			addr = camel_mime_message_get_recipients (new, types[i]);
@@ -888,15 +912,12 @@ build_message (EMsgComposer *composer,
 		const gchar *pgp_userid;
 		CamelInternetAddress *from = NULL;
 		CamelCipherContext *cipher;
-		EAccount *account;
 
 		part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (part), current);
+		camel_medium_set_content (CAMEL_MEDIUM (part), current);
 		if (current == plain)
 			camel_mime_part_set_encoding (part, plain_encoding);
-		camel_object_unref (current);
-
-		account = e_composer_header_table_get_account (table);
+		g_object_unref (current);
 
 		if (account && account->pgp_key && *account->pgp_key) {
 			pgp_userid = account->pgp_key;
@@ -914,16 +935,17 @@ build_message (EMsgComposer *composer,
 					CAMEL_GPG_CONTEXT (cipher),
 					account->pgp_always_trust);
 			camel_cipher_sign (
-				cipher, pgp_userid, CAMEL_CIPHER_HASH_SHA1,
+				cipher, pgp_userid, account_hash_algo_to_camel_hash (
+				account ? e_account_get_string (account, E_ACCOUNT_PGP_HASH_ALGORITHM) : NULL),
 				part, npart, &ex);
-			camel_object_unref (cipher);
+			g_object_unref (cipher);
 
 			if (camel_exception_is_set (&ex)) {
-				camel_object_unref (npart);
+				g_object_unref (npart);
 				goto exception;
 			}
 
-			camel_object_unref (part);
+			g_object_unref (part);
 			part = npart;
 		}
 
@@ -942,26 +964,26 @@ build_message (EMsgComposer *composer,
 			camel_cipher_encrypt (
 				cipher, pgp_userid, recipients,
 				part, npart, &ex);
-			camel_object_unref (cipher);
+			g_object_unref (cipher);
 
 			if (account && account->pgp_encrypt_to_self && pgp_userid)
 				g_ptr_array_set_size (recipients, recipients->len - 1);
 
 			if (camel_exception_is_set (&ex)) {
-				camel_object_unref (npart);
+				g_object_unref (npart);
 				goto exception;
 			}
 
-			camel_object_unref (part);
+			g_object_unref (part);
 			part = npart;
 		}
 
 		if (from)
-			camel_object_unref (from);
+			g_object_unref (from);
 
-		current = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-		camel_object_ref (current);
-		camel_object_unref (part);
+		current = camel_medium_get_content (CAMEL_MEDIUM (part));
+		g_object_ref (current);
+		g_object_unref (part);
 	}
 
 #if defined (HAVE_NSS)
@@ -970,10 +992,10 @@ build_message (EMsgComposer *composer,
 		CamelCipherContext *cipher;
 
 		part = camel_mime_part_new ();
-		camel_medium_set_content_object ((CamelMedium *)part, current);
+		camel_medium_set_content ((CamelMedium *)part, current);
 		if (current == plain)
 			camel_mime_part_set_encoding (part, plain_encoding);
-		camel_object_unref (current);
+		g_object_unref (current);
 
 		if (smime_sign
 		    && (account == NULL || account->smime_sign_key == NULL || account->smime_sign_key[0] == 0)) {
@@ -1002,15 +1024,17 @@ build_message (EMsgComposer *composer,
 				camel_smime_context_set_encrypt_key ((CamelSMIMEContext *)cipher, TRUE, account->smime_encrypt_key);
 			}
 
-			camel_cipher_sign (cipher, account->smime_sign_key, CAMEL_CIPHER_HASH_SHA1, part, npart, &ex);
-			camel_object_unref (cipher);
+			camel_cipher_sign (cipher, account->smime_sign_key,
+				account_hash_algo_to_camel_hash (account ? e_account_get_string (account, E_ACCOUNT_SMIME_HASH_ALGORITHM) : NULL),
+				part, npart, &ex);
+			g_object_unref (cipher);
 
 			if (camel_exception_is_set (&ex)) {
-				camel_object_unref (npart);
+				g_object_unref (npart);
 				goto exception;
 			}
 
-			camel_object_unref (part);
+			g_object_unref (part);
 			part = npart;
 		}
 
@@ -1024,7 +1048,7 @@ build_message (EMsgComposer *composer,
 			camel_smime_context_set_encrypt_key ((CamelSMIMEContext *)cipher, TRUE, account->smime_encrypt_key);
 
 			camel_cipher_encrypt (cipher, NULL, recipients, part, (CamelMimePart *)new, &ex);
-			camel_object_unref (cipher);
+			g_object_unref (cipher);
 
 			if (camel_exception_is_set (&ex))
 				goto exception;
@@ -1034,24 +1058,24 @@ build_message (EMsgComposer *composer,
 		}
 
 		if (from)
-			camel_object_unref (from);
+			g_object_unref (from);
 
 		/* we replaced the message directly, we don't want to do reparenting foo */
 		if (smime_encrypt) {
-			camel_object_unref (part);
+			g_object_unref (part);
 			goto skip_content;
 		} else {
-			current = camel_medium_get_content_object ((CamelMedium *)part);
-			camel_object_ref (current);
-			camel_object_unref (part);
+			current = camel_medium_get_content ((CamelMedium *)part);
+			g_object_ref (current);
+			g_object_unref (part);
 		}
 	}
 #endif /* HAVE_NSS */
 
-	camel_medium_set_content_object (CAMEL_MEDIUM (new), current);
+	camel_medium_set_content (CAMEL_MEDIUM (new), current);
 	if (current == plain)
 		camel_mime_part_set_encoding (CAMEL_MIME_PART (new), plain_encoding);
-	camel_object_unref (current);
+	g_object_unref (current);
 
 #if defined (HAVE_NSS)
 skip_content:
@@ -1072,9 +1096,9 @@ skip_content:
  exception:
 
 	if (part != CAMEL_MIME_PART (new))
-		camel_object_unref (part);
+		g_object_unref (part);
 
-	camel_object_unref (new);
+	g_object_unref (new);
 
 	if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) {
 		e_alert_run_dialog_for_args ((GtkWindow *)composer, "mail-composer:no-build-message",
@@ -1401,7 +1425,7 @@ autosave_load_draft (const gchar *filename)
 	msg = camel_mime_message_new ();
 	camel_data_wrapper_construct_from_stream (
 		CAMEL_DATA_WRAPPER (msg), stream);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	composer = e_msg_composer_new_with_message (msg);
 	if (composer) {
@@ -2260,7 +2284,7 @@ add_attachments_handle_mime_part (EMsgComposer *composer,
 		return;
 
 	content_type = camel_mime_part_get_content_type (mime_part);
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+	wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 
 	if (CAMEL_IS_MULTIPART (wrapper)) {
 		/* another layer of multipartness... */
@@ -2332,7 +2356,7 @@ e_msg_composer_add_message_attachments (EMsgComposer *composer,
 {
 	CamelDataWrapper *wrapper;
 
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message));
+	wrapper = camel_medium_get_content (CAMEL_MEDIUM (message));
 	if (!CAMEL_IS_MULTIPART (wrapper))
 		return;
 
@@ -2370,7 +2394,7 @@ handle_multipart_signed (EMsgComposer *composer,
 
 	content_type = camel_mime_part_get_content_type (mime_part);
 
-	content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+	content = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 
 	if (CAMEL_IS_MULTIPART (content)) {
 		multipart = CAMEL_MULTIPART (content);
@@ -2437,7 +2461,7 @@ handle_multipart_encrypted (EMsgComposer *composer,
 	cipher = camel_gpg_context_new (session);
 	mime_part = camel_mime_part_new ();
 	valid = camel_cipher_decrypt (cipher, multipart, mime_part, &ex);
-	camel_object_unref (cipher);
+	g_object_unref (cipher);
 	camel_exception_clear (&ex);
 	if (valid == NULL)
 		return;
@@ -2445,7 +2469,7 @@ handle_multipart_encrypted (EMsgComposer *composer,
 
 	content_type = camel_mime_part_get_content_type (mime_part);
 
-	content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+	content = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 
 	if (CAMEL_IS_MULTIPART (content)) {
 		CamelMultipart *content_multipart = CAMEL_MULTIPART (content);
@@ -2478,7 +2502,7 @@ handle_multipart_encrypted (EMsgComposer *composer,
 		e_msg_composer_attach (composer, mime_part);
 	}
 
-	camel_object_unref (mime_part);
+	g_object_unref (mime_part);
 }
 
 static void
@@ -2503,7 +2527,7 @@ handle_multipart_alternative (EMsgComposer *composer,
 			continue;
 
 		content_type = camel_mime_part_get_content_type (mime_part);
-		content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+		content = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 
 		if (CAMEL_IS_MULTIPART (content)) {
 			CamelMultipart *mp;
@@ -2563,7 +2587,7 @@ handle_multipart (EMsgComposer *composer,
 			continue;
 
 		content_type = camel_mime_part_get_content_type (mime_part);
-		content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+		content = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 
 		if (CAMEL_IS_MULTIPART (content)) {
 			CamelMultipart *mp;
@@ -2643,7 +2667,7 @@ set_signature_gui (EMsgComposer *composer)
 EMsgComposer *
 e_msg_composer_new_with_message (CamelMimeMessage *message)
 {
-	const CamelInternetAddress *to, *cc, *bcc;
+	CamelInternetAddress *to, *cc, *bcc;
 	GList *To = NULL, *Cc = NULL, *Bcc = NULL, *postto = NULL;
 	const gchar *format, *subject;
 	EDestination **Tov, **Ccv, **Bccv;
@@ -2720,7 +2744,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 						g_hash_table_insert (auto_cc, g_strdup (addr), GINT_TO_POINTER (TRUE));
 					}
 				}
-				camel_object_unref (iaddr);
+				g_object_unref (iaddr);
 			}
 
 			if (account->always_bcc) {
@@ -2735,7 +2759,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 						g_hash_table_insert (auto_bcc, g_strdup (addr), GINT_TO_POINTER (TRUE));
 					}
 				}
-				camel_object_unref (iaddr);
+				g_object_unref (iaddr);
 			}
 		}
 
@@ -2882,7 +2906,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 	}
 
 	/* Restore the attachments and body text */
-	content = camel_medium_get_content_object (CAMEL_MEDIUM (message));
+	content = camel_medium_get_content (CAMEL_MEDIUM (message));
 	if (CAMEL_IS_MULTIPART (content)) {
 		CamelMultipart *multipart;
 
@@ -2977,7 +3001,7 @@ e_msg_composer_new_redirect (CamelMimeMessage *message,
 	subject = camel_mime_message_get_subject (message);
 
 	composer->priv->redirect = message;
-	camel_object_ref (message);
+	g_object_ref (message);
 
 	e_composer_header_table_set_account_name (table, resent_from);
 	e_composer_header_table_set_subject (table, subject);
@@ -3298,12 +3322,15 @@ e_msg_composer_set_body (EMsgComposer *composer,
 {
 	EMsgComposerPrivate *p = composer->priv;
 	EComposerHeaderTable *table;
+	gchar *buff;
 
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 
 	table = e_msg_composer_get_header_table (composer);
 
-	set_editor_text (composer, _("<b>(The composer contains a non-text message body, which cannot be edited.)</b>"), FALSE);
+	buff = g_strconcat ("<b>(", _("The composer contains a non-text message body, which cannot be edited."), ")</b>", NULL);
+	set_editor_text (composer, buff, FALSE);
+	g_free (buff);
 	gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (composer), FALSE);
 	disable_editor (composer);
 
@@ -3467,7 +3494,7 @@ e_msg_composer_add_inline_image_from_file (EMsgComposer *composer,
 
 	wrapper = camel_data_wrapper_new ();
 	camel_data_wrapper_construct_from_stream (wrapper, stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
+	g_object_unref (CAMEL_OBJECT (stream));
 
 	mime_type = e_util_guess_mime_type (dec_file_name, TRUE);
 	if (mime_type == NULL)
@@ -3476,8 +3503,8 @@ e_msg_composer_add_inline_image_from_file (EMsgComposer *composer,
 	g_free (mime_type);
 
 	part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);
-	camel_object_unref (wrapper);
+	camel_medium_set_content (CAMEL_MEDIUM (part), wrapper);
+	g_object_unref (wrapper);
 
 	cid = camel_header_msgid_generate ();
 	camel_mime_part_set_content_id (part, cid);
@@ -3522,7 +3549,7 @@ e_msg_composer_add_inline_image_from_mime_part (EMsgComposer  *composer,
 
 	url = g_strdup_printf ("cid:%s", cid);
 	g_hash_table_insert (p->inline_images, url, part);
-	camel_object_ref (part);
+	g_object_ref (part);
 
 	location = camel_mime_part_get_content_location (part);
 	if (location != NULL)
@@ -3623,7 +3650,7 @@ e_msg_composer_get_message_print (EMsgComposer *composer,
 		return NULL;
 
 	temp_composer = e_msg_composer_new_with_message (msg);
-	camel_object_unref (msg);
+	g_object_unref (msg);
 
 	/* Override composer flags. */
 	flags = msg_composer_get_message_print_helper (
@@ -3822,7 +3849,7 @@ e_msg_composer_get_reply_to (EMsgComposer *composer)
 
 	address = camel_internet_address_new ();
 	if (camel_address_unformat (CAMEL_ADDRESS (address), reply_to) == -1) {
-		camel_object_unref (CAMEL_OBJECT (address));
+		g_object_unref (CAMEL_OBJECT (address));
 		return NULL;
 	}
 
@@ -3892,7 +3919,7 @@ e_msg_composer_load_from_file (const gchar *filename)
 	msg = camel_mime_message_new ();
 	camel_data_wrapper_construct_from_stream (
 		CAMEL_DATA_WRAPPER (msg), stream);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	composer = e_msg_composer_new_with_message (msg);
 	if (composer != NULL)
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 884b077862..25c78ced03 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -24,9 +24,7 @@
 #ifndef E_MSG_COMPOSER_H
 #define E_MSG_COMPOSER_H
 
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-session.h>
+#include <camel/camel.h>
 #include <libedataserver/e-account.h>
 #include <libebook/e-destination.h>
 #include <gtkhtml-editor.h>
diff --git a/configure.ac b/configure.ac
index 5aea6ea15c..f9938df788 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Evolution Versions
 m4_define([evo_major_version], [2])
-m4_define([evo_minor_version], [30])
-m4_define([evo_micro_version], [2])
+m4_define([evo_minor_version], [31])
+m4_define([evo_micro_version], [3])
 m4_define([evo_version],
 	[evo_major_version.evo_minor_version.evo_micro_version])
 m4_define([evo_stable_version],
@@ -13,8 +13,8 @@ dnl Base Version: This is for API/version tracking for things like
 dnl Bonobo server files.  This should always be the major/minor of
 dnl the stable version or stable version to be.  Note, this is set
 dnl the way it is so that GETTEXT_PACKAGE will be parsed correctly.
-BASE_VERSION=2.30
-m4_define([base_version], [2.30])
+BASE_VERSION=3.0
+m4_define([base_version], [3.0])
 
 dnl Upgrade Revision: This is for triggering migration calls between
 dnl varying versions. Reset to 0 whenever BASE_VERSION changes.
@@ -23,7 +23,7 @@ m4_define([upgrade_revision], [0])
 dnl Autoconf / Automake Initialization
 AC_PREREQ(2.58)
 AC_INIT([evolution],[evo_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution])
-AM_INIT_AUTOMAKE([1.9 -Wall -Werror foreign])
+AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR(README)
@@ -36,11 +36,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl Required Packages
 m4_define([glib_minimum_version], [2.22.0])
-m4_define([gtk_minimum_version], [2.18.0])
+m4_define([gtk_minimum_version], [2.20.0])
 m4_define([eds_minimum_version], [evo_version])
 m4_define([gnome_icon_theme_minimum_version], [2.19.91])
 m4_define([gnome_desktop_minimum_version], [2.26.0])
-m4_define([libgtkhtml_minimum_version], [3.29.6])
+m4_define([libgtkhtml_minimum_version], [3.31.2])
 m4_define([gconf_minimum_version], [2.0.0])		dnl XXX Just a Guess
 m4_define([libsoup_minimum_version], [2.4.0])		dnl XXX Just a Guess
 m4_define([libgnomecanvas_minimum_version], [2.0.0])	dnl XXX Just a Guess
@@ -59,6 +59,7 @@ m4_define([libnotify_minimum_version], [0.3.0])
 m4_define([gnome_pilot_minimum_version], [2.0.16])
 m4_define([gweather_minimum_version], [2.25.3])
 m4_define([gtkimageview_minimum_version], [1.6])
+m4_define([gladeui_minimum_version], [3.0.0])
 
 dnl ******************************
 dnl Compiler Warning Flags
@@ -235,9 +236,8 @@ PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER],
 	 libedataserver-1.2 >= eds_minimum_version
 	 libedataserverui-1.2 >= eds_minimum_version
 	 libegroupwise-1.2 >= eds_minimum_version
-	 libebackend-1.2 >= eds_minimum_version
-	 libgdata-1.2 >= eds_minimum_version
-	 libgdata-google-1.2 >= eds_minimum_version])
+	 libebackend-1.2 >= eds_minimum_version])
+
 
 dnl ******************************
 dnl Canberra / Canberra-GTK Sound
@@ -898,10 +898,10 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 					[Please specify the path to libnspr4.a]
 					[Example: --with-nspr-libs=/usr/lib])
 				else
-					nsprlibs="$DL_LIB $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
+					nsprlibs="$DL_LIB $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a"
 				fi
 			else
-				nsprlibs="$DL_LIB -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
+				nsprlibs="$DL_LIB -lplc4 -lplds4 -lnspr4"
 			fi
 
 			AC_CACHE_CHECK([for Mozilla nspr libraries], [ac_cv_moz_nspr_libs],
@@ -1140,7 +1140,6 @@ if test "$enable_nm" = yes; then
 	AC_SUBST(HAVE_NM)
 	AC_SUBST(NM_CFLAGS)
 fi
-
 AM_CONDITIONAL([ENABLE_NETWORK_MANAGER], [test "$enable_nm" = yes])
 
 dnl ******************************
@@ -1176,6 +1175,25 @@ if test "$enable_sens" = yes; then
 	AC_SUBST(HAVE_SENS)
 	AC_SUBST(SENS_LIBS)
 fi
+AC_MSG_CHECKING([if Windows SENS support is enabled])
+AC_MSG_RESULT([$enable_sens])
+if test "$enable_sens" = yes; then
+	SENS_LIBS="-lole32 -loleaut32 -luuid -lrpcrt4"
+	AC_CHECK_HEADER([eventsys.h],
+		[AC_DEFINE([HAVE_EVENTSYS_H], 1, [Have <eventsys.h>])],,
+		[[	#if HAVE_EVENTSYS_H
+			#include <eventsys.h>
+			#endif
+		]])
+	AC_CHECK_HEADER([sensevts.h],
+		[AC_DEFINE([HAVE_SENSEVTS_H], 1, [Have <sensevts.h>])],,
+		[[	#if HAVE_SENSEVTS_H
+			#include <sensevts.h>
+			#endif
+		]])
+	AC_SUBST(HAVE_SENS)
+	AC_SUBST(SENS_LIBS)
+fi
 AM_CONDITIONAL([ENABLE_WINDOWS_SENS], [test "$enable_sens" = yes])
 
 dnl ******************************
@@ -1306,7 +1324,11 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.4 >= libsoup_minimum_version)
 AC_SUBST(LIBSOUP_CFLAGS)
 AC_SUBST(LIBSOUP_LIBS)
 
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-3.14 libebook-1.2 libecal-1.2 libedataserverui-1.2 libebackend-1.2 $libnotify gtkhtml-editor libgdata-1.2 libgdata-google-1.2)
+EVO_SET_COMPILE_FLAGS(GDATA, libgdata >= 0.4.0)
+AC_SUBST(GDATA_CFLAGS)
+AC_SUBST(GDATA_LIBS)
+
+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-3.14 libebook-1.2 libecal-1.2 libedataserverui-1.2 libebackend-1.2 $libnotify gtkhtml-editor)
 AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
 AC_SUBST(EVOLUTION_CALENDAR_LIBS)
 
@@ -1418,12 +1440,12 @@ plugins_base_always="calendar-file calendar-http itip-formatter plugin-manager d
 plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN"
 dist_plugins_base="$plugins_base_always calendar-weather sa-junk-plugin bogo-junk-plugin"
 
-plugins_standard_always="bbdb subject-thread save-calendar mail-to-task mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates vcard-inline"
+plugins_standard_always="bbdb subject-thread save-calendar mail-to-task mailing-list-actions prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates vcard-inline"
 
 plugins_standard="$plugins_standard_always"
 dist_plugins_standard="$plugins_standard audio-inline image-inline pst-import"
 
-plugins_experimental_always="face external-editor hula-account-setup"
+plugins_experimental_always="face external-editor"
 
 plugins_experimental="$plugins_experimental_always $TNEF_ATTACHMENTS"
 dist_plugins_experimental="$plugins_experimental_always profiler tnef-attachments contacts-map"
@@ -1632,6 +1654,19 @@ fi
 AM_CONDITIONAL(HAVE_KDE_APPLNK, test x"$KDE_APPLNK_DIR" != x)
 AC_SUBST(KDE_APPLNK_DIR)
 
+dnl ********************************************
+dnl Glade 3 catalog files (for maintainers only)
+dnl ********************************************
+AC_ARG_WITH([glade-catalog],
+	[AS_HELP_STRING([--with-glade-catalog],
+	[Install the catalog files for Glade 3 ]
+	[(for maintainers only) [default=no]])],
+	[with_catalog="$withval"], [with_catalog="no"])
+if test "$with_catalog" = "yes"; then
+	PKG_CHECK_MODULES(GLADEUI, [gladeui-1.0 >= gladeui_minimum_version])
+fi
+AM_CONDITIONAL(GLADE_CATALOG, test "x$with_catalog" != "xno")
+
 dnl ******************************
 dnl Makefiles
 dnl ******************************
@@ -1739,10 +1774,12 @@ mail/default/sr@latin/Makefile
 mail/default/sv/Makefile
 mail/default/zh_CN/Makefile
 mail/importers/Makefile
+maint/Makefile
 modules/Makefile
 modules/addressbook/Makefile
 modules/calendar/Makefile
 modules/mail/Makefile
+modules/mailto-handler/Makefile
 modules/network-manager/Makefile
 modules/connman/Makefile
 modules/plugin-lib/Makefile
@@ -1760,14 +1797,12 @@ plugins/caldav/Makefile
 plugins/calendar-file/Makefile
 plugins/calendar-http/Makefile
 plugins/calendar-weather/Makefile
-plugins/default-mailer/Makefile
 plugins/default-source/Makefile
 plugins/email-custom-header/Makefile
 plugins/external-editor/Makefile
 plugins/face/Makefile
 plugins/google-account-setup/Makefile
 plugins/groupwise-features/Makefile
-plugins/hula-account-setup/Makefile
 plugins/image-inline/Makefile
 plugins/imap-features/Makefile
 plugins/itip-formatter/Makefile
diff --git a/designs/ChangeLog b/designs/ChangeLog
deleted file mode 100644
index 5cbc73b814..0000000000
--- a/designs/ChangeLog
+++ /dev/null
@@ -1,53 +0,0 @@
-2007-06-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #325882
-
-	* read_receipts/read.glade:
-	* OOA/ooa.glade:
-	Changed GTK_WIN_POS_NONE to GTK_WIN_POS_CENTER_ON_PARENT.
-
-2006-07-12  Andre Klapper  <a9016009@gmx.de>
-
-	* read_receipts/read.glade: remove empty tab from translation.
-	Fixes bug #339411.
-
-2005-05-06  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* read_receipts/read.glade: Corrected the spelling for receipt.
-
-2003-01-15  Anna Marie Dirks  <anna@ximian.com>
-
-	* OOA/Comments: Added this file to store discussion of OOA designs
-
-2003-01-09  Anna Marie Dirks  <anna@ximian.com>
-	
-	* OOA/oooa_question.png: Updated question test
-
-
-
-2003-01-09  Anna Marie Dirks  <anna@ximian.com>
-	
-	* OOA/outlook_screenshot.png: Screenshot of outlook's OOOA Config dialog.
-	
-	* OOA/outlook_question.png: Screenshot of outlook's OOOA question dialog
-	
-	* OOA/spec.txt: Spec file for Out of Office Assistant
-
-	* OOA/oooa_screenshot.png: Screenshot of mockup of OOOA Config dialog.
-	
-	* OOA/oooa_question.png: Screenshot of mockup of question dialog
-	
-	* OOA/ooa.glade: Glade file for the Out of Office Assistant
-
-	*OOA : New directory
-
-
-2003-01-06  Anna Marie Dirks  <anna@ximian.com>
-
-	* proposal.png : Changed help message
-
-
-2003-01-03  Anna Marie Dirks  <anna@ximian.com>
-
-	* read_receipts: New directory.
-
diff --git a/doc/ChangeLog b/doc/ChangeLog
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/ChangeLog
+++ /dev/null
diff --git a/doc/ChangeLog.pre-1-4 b/doc/ChangeLog.pre-1-4
deleted file mode 100644
index e7dd37db31..0000000000
--- a/doc/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,1146 +0,0 @@
-2001-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* C/Makefile.am: Small fix to build.
-	* C/evolution-C.omf: Small fix. Remove an extra space.
-	* no/Makefile.am: Same here.
-	* no/evolution-no.omf: And here.
-	
-2001-08-15  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Updated one line about bullet points.
-
-2001-08-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no/*: Added beginnings of a Norwegian translation.
-	* sgmldocs.make: Forgot to add this. Kinda important.
-	* C/*.sgml: s/fig/figures/
-	* C/Makefile.am: Make it use the sgmldocs.make framework.
-	
-2001-08-14  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: Commented out menuref.
-	* C/usage-contact.sgml: Commented out menuref.
-	* C/evolution.sgml: commented out menuref.
-	* C/preface.sgml: commented out menuref.
-
-2001-08-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* C/apx-authors.sgml: Added missing ;'s after entities.
-	* C/evolution-C.omf: s/en/C in Language.
-	* C/usage-mail-org.sgml: Add missing ;.
-	* C/usage-mainwindow.sgml: Same here.
-	
-2001-08-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: Switched all images in entire document to
-	*not* use file extensions, so that they work properly with
-	db2ps. This doesn't completely fix the db2ps issues, but it's
-	apparently the right way to do this.
-
-2001-08-09  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.sgml: Made sharing tip an orderedlist.
-
-2001-08-08  Kevin Breit  <battery841@mediaone.net>
-
-	* C/config-prefs.sgml: Add information about sharing mailbox files.
-
-2001-08-03  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Add information about gathering actions.
-
-2001-08-02  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Added a <tip> for scrolling through mails.
-
-2001-07-30  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Fixed some breakage Aaron caused.
-
-2001-07-26  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: revised.
-
-	* C/usage-mail.sgml: revisions and stuff.
-
-2001-07-24  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Reworded a few questions.
-
-2001-07-23  Kevin Breit <battery841@mediaone.net>
-
-	* C/Makefile.am: Pulled instance of config-setupassist.sgml to make stuff build right.
-
-2001-07-23  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: validated.
-
-	* C/config-setupassist.sgml: Removed.
-
-	* C/evolution.sgml: removed config-setupassist.
-
-	* C/usage-exec-summary.sgml: Minor revisions.
-
-	* C/usage-contact.sgml:  Added 'format="png"' to all <image> tags
-	missing the attribute.
-
-	* C/usage-calendar.sgml: Added 'format="png"' to all <image> tags
-	missing the attribute.
-
-	* C/usage-mail.sgml: Added 'format="png"' to all <image> tags
-	missing the attribute.
-
-	* C/usage-mainwindow.sgml: Style. Merged info from preface. Added
-	'format="png"' to all <image> tags missing the attribute.
-
-	* C/preface.sgml: Style changes. Removed info that was duplicated
-	in mainwindow.sgml.
-
-2001-07-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mainwindow.sgml: Fixed the first time druid stuff a little more.
-	
-2001-07-16  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Sepllcheck.
-
-2001-07-15  Kevin Breit  <battery841@mediaone.net>
-
-	* C/config-sync.sgml: Updated slightly for new design.
-
-2001-07-13  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mainwindow.sgml: Added lots of good stuff with the first time druid.
-
-2001-07-12  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: TYPO fixing.
-
-2001-07-12  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Added "get bt for component-only crash" qandaentry.
-
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* */Makefile.am (dist-hook): Clean up make dist.
-
-2001-07-11  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution.sgml: validation on usage-mainwindow and usage-contact.	
-
-2001-07-11  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: More edits.
-
-	* C/usage-contact.sgml: Sick amounts of changes too!
-
-	* C/usage-mail-org.sgml: Heavy editing...touched almost everything.
-
-	* C/usage-exec-summary.sgml: Minor change.  There was only one change for this chapter, cuz I'm such a 'godly' writer...yeah.
-
-	* C/usage-mainwindow.sgml: A bit of editing.
-
-	* C/preface.sgml: Screwed with the examples and did some cleanup.
-
-2001-07-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: validation.
-
-2001-07-10  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Added <application> tags
-
-	* C/usage-mail-org.sgml: Added <application> tags
-
-	* C/config-prefs.sgml: Added <application> tags
-
-2001-07-09  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-exec-summary.sgml: Editing
-
-	* C/usage-mail.sgml: Editing
-
-	* C/usage-mail-org.sgml: Editing
-
-	* C/usage-calendar.sgml: Editing
-
-	* C/usage-contact.sgml: Editing
-
-	* C/usage-mail-org.sgml: Mention UNMATCHED
-
-	* C/usage-mail.sgml: Commented on trash being a vFolder
-
-2001-07-06  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Spell check
-
-	* C/usage-calendar.sgml: Spell check
-
-2001-07-05  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mainwindow.sgml: Added orderedlists.
-
-	* C/usage-exec-summary.sgml: Added orderedlists.
-
-	* C/usage-contact.sgml: Added orderedlists.
-
-	* C/usage-mail-org.sgml: Added orderedlists.
-
-2001-07-03  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Put in lots of orderedlists...more SGML, less
-	for the user to read.  They'll thank me in droves later.
-
-	* C/usage-exec-summary.sgml: Fixed build error
-
-2001-06-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* white-papers/mail/camel.sgml: Updated slightly.
-
-	* Camel-Classes: Updated.
-
-2001-07-02  Kevin Breit  <battery841@mediaone.net>
-
-	* C/apx-common-tasks.sgml: Created its own file.
-
-	* C/usage-mainwindow.sgml: You name it.
-
-	* C/preface.sgml: Pulled shortcuts from here into its own apx
-
-	* C/evolution.sgml: Reordered entities
-	
-2001-06-30  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Pulled organizing stuff, made its own file.
-
-2001-06-26  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Revised move/rename/copy questions, now
-	that these functions work.
-
-2001-06-25  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Now that bug-buddy works with our
-	bugzilla, update faq to reflect it.
-
-2001-06-25  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Put config-encryption in usage-mail.sgml.
-	config-encryption.sgml should be depreciated.
-
-	* C/usage-contact.sgml: Fixed typo
-
-	* C/usage-mail.sgml: Added info about mailing lists Elaborated on
-	mailing lists
-
-	* C/usage-exec-summary.sgml: Fixed a few typos
-
-	* C/preface.sgml: Added section for importing files
-
-	* C/usage-calendar.sgml: Removed some *'s that are causing
-	problems.
-
-2001-06-22  Kevin Breit  <battery841@mediaone.net>
-
-	* C/preface.sgml: Put in Contacts information in the quicktasks.
-
-	* C/usage-mail.sgml: Pulled some redundant information.
-
-2001-06-21  battery841  <battery841@mediaone.net>
-	
-	* C/preface.sgml, C/fig/mail-inbox.png, C/fig/mainwindow-pic.png,
-	C/usage-mail.sgml: Updated screenshots and redid layout for
-	graphics on pages.
-	
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-	
-	* C/usage-contact.sgml: Fixed .gif problem
-		
-	* C/usage-mail.sgml:
-	
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Specify the file format
-
-	* C/usage-contact.sgml, C/usage-mail.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-		
-	* C/usage-mail.sgml: Trying to fix the .gif problem
-
-	* C/fig/calendar.png, C/fig/contact.png, C/usage-calendar.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Redid graphics to add labels to them and
-		described the labels in text.
-
-	* C/config-encryption.sgml, C/evolution.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/evolution.sgml: Added config-encryption.sgml for building
-
-	* C/fig/calendar.png, C/fig/config-cal.png, C/fig/config-mail.png,
-	C/fig/filter-assist-fig.png, C/fig/filter-new-fig.png,
-	C/fig/mail-composer.png, C/fig/mail-druid-pic.png,
-	C/fig/mail-inbox.png, C/fig/print-dest.png,
-	C/fig/print-preview.png, C/fig/vfolder-createrule-fig.png:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/fig/*png: Updated graphics for newer UI.
-
-	* C/fig/full-1.png, C/fig/full-2.png, C/fig/full-3.png,
-	C/fig/full-4.png, C/fig/full-5.png, C/fig/full-6.png,
-	C/fig/full-7.png, C/fig/mainwindow-pic.png, C/usage-mail.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Redid graphics to add labels to them and
-	described in labels in text.  Looks good!
-
-	* C/usage-encryption.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/encryption.sgml: Added file
-
-	* C/preface.sgml:
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/ChangeLog: Moved my entires to doc/ChangeLog per request of
-	danw
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-contact.sgml: Fixed .gif problem
-
-	* C/usage-mail.sgml: Specify the file format
-	
-	* C/usage-mail.sgml: Trying to fix the .gif problem
-	
-	* C/usage-calendar.sgml: Redid graphics to add labels to them and
-	described the labels in text.
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/evolution.sgml: Added config-encryption.sgml for building
-
-	* C/fig/*png: Updated graphics for newer UI.
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Redid graphics to add labels to them and
-	described in labels in text.  Looks good!
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/encryption.sgml: Added file
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* ChangeLog: Moved my entires to doc/ChangeLog per request of danw
-	
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/config-setupassist.sgml: Updated for new UI.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-sync: Reworded a little bit for more descrip.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Documented categorizing an event.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Updated Bcc: example
-
-2001-06-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: A couple changes to Kevin's update.
-
-2001-06-19  Kevin Breit <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Basic edits
-	
-2001-06-19  Kevin Breit <battery841@mediaone.net>
-
-	* C/usage-exec-summary: Updated to say "My Evolution"
-
-2001-06-19  Kevin Breit <battery841@mediaone.net>
-
-	* C/apx-gloss.sgml: Added definition.
-
-	* C/usage-mainwindow.sgml: Routine updates.
-	
-2001-06-07  Duncan Mak  <duncan@lumox.simplemente.net>
-
-	* C/evolution-faq.sgml: Fixed a typo. Thanks to Greg Leblanc for
-	pointing this out.
-
-2001-05-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/evolution-faq.sgml: Re-indented.
-
-2001-05-18  Duncan Mak  <duncan@ximian.com>
-
-	* C/evolution-faq.sgml: Added two questions about importing
-	Outlook (text from Iain).  Fixed some tags and cleaned up a bit
-	here and there.
-
-2001-05-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/evolution-faq.sgml: Added a question about the permission
-	issues with /var/spool/mail.
-
-2001-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/Makefile.am (SGML_FILES): Renamed to `GUIDE_SGML_FILES'.
-	(EXTRA_DIST): Add `$(FAQ_SGML_FILES)'.
-	(all): Depend on `evolution-faq' too.
-	(evolution-faq): New.
-	(install-data-local): Depend on `evolution-faq' too.  Install the
-	FAQ into `$(evolution_helpdir)/evolution-faq' and the guide into
-	`$(evolution_helpdir)/evolution-guide'.
-
-	* C/evolution-faq.sgml: New.
-
-2001-04-23  Jon Trowbridge  <trow@ximian.com>
-
-	* C/Makefile.am (install-data-local): Changed dependency for
-	install-data-local from "evolution" to "evolution-guide".
-
-2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/Makefile.am (evolution-guide): Use `$(srcdir)' here.
-
-2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/Makefile.am (SGML_FILES): Add `evolution.sgml'.
-	(evolution-guide): Process `evolution.sgml', not
-	`evolution-guide.sgml'.
-	(dist-hook): s/evolution-guide/evolution/
-	(install-data-local): Likewise.
-
-2001-02-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-authors.sgml: s/helixcode/ximian (How I missed this page
-	on the first go-round I don't know).
-
-2001-03-14  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* C/Makefile.am: there's no apx-fdl.sgml and evolution-guide.sgml
-	anymore
-
-2001-02-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: IMAP subscriptions stuff.
-
-2001-02-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Advanced search/show all/save search stuff.
-
-	* C/evolution.sgml: This file replaces evolution-guide.sgml, for
-	Nautilus Readiness.
-
-	* C/apx-gloss.sgml: glossterm conduit.
-
-	* C/config-sync.sgml: Glossterm conduit.
-
-	* C/preface.sgml: Checked over for Keyboard-Shortcut and other
-	truthfulness.
-
-2001-02-15  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Validated. Verified. Markup fixed in
-	several individual files.
-
-	* C/apx-gpl.sgml: cvs-removed for GNOME 1.4 compliance.
-
-	* C/apx-fdl.sgml: cvs-removed for GNOME 1.4 compliance.
-
-2001-02-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-sync.sgml: Overhaul. Now accurate and truthful and
-	clear.
-
-	* C/usage-calendar.sgml: Minor Changes.
-
-2001-02-08  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Minor Changes.
-
-	* C/usage-mail.sgml: Minor Changes.
-
-2001-02-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Added section, but left blank til UI stabilizes.
-
-	* C/usage-exec-summary.sgml: A little functionality described.
-
-	* C/usage-mainwindow.sgml: Added tasks and Exec-summary.
-
-	* C/usage-calendar.sgml: Describe semi-autonomy of task pad.
-
-2001-02-06 Aaron Weber <aaron@ximian.com>
-
-	* C/usage-contact.sgml: s/contact manager/address book/ and
-	revised text.
-
-	* C/usage-exec-summary.sgml: New file. Describes Executive
-	Summary.
-	
-2001-01-19  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: More of Megan's revisions, and Field Chooser
-	functions in the Sort section.
-
-	* C/apx-gloss.sgml: added "ToolTip"
-
-2001-01-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: s/Helix Code/Ximian, and Megan's comments.
-
-	* C/usage-mainwindow.sgml: s/Helix Code/Ximian/, and Megan's
-	comments.
-
-	* C/evolution-guide.sgml: s/Helix Code/Ximian/
-
-2000-12-13  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Revisions as suggested by Dan.  Especially to
-	filter dialogs... which still need some renaming, IMHO.
-
-	* C/usage-mainwindow.sgml: Revisions as suggested by
-	Dan. Especially to the Folder Limits thing, which still upsets me
-	somehow.
-
-	* C/preface.sgml: Revisions as suggested by Dan.
-
-2000-11-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-setupassist.sgml: added some <glossterms>, added
-	linkends to existing glossterms.
-
-2000-11-28  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Changed intro to Config section. Now
-	defines what, exactly, "configurable" means.
-
-	* C/usage-print.sgml: Stylistic revisions.
-
-	* C/usage-calendar.sgml: Stylistic revisions.
-
-	* C/usage-contact.sgml: Stylistic revisions.
-
-2000-11-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Message heading Right-Click Menu.
-
-2000-11-03  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: The regexp example was quite wrong. Props to
-	Sasha.
-
-2000-11-02  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Style and spelling.
-
-2000-11-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed validation errors.
-
-	* C/apx-gloss.sgml: Fixed HTML, style stuff.
-
-	* C/usage-mail.sgml: Stylistic overhaul.
-
-	* C/usage-mainwindow.sgml: Fixed groups in shortcut bar, fixed
-	folder navigation tips.
-
-2000-10-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor stylistic revisions.
-
-2000-10-30  Aaron Weber  <aaron@helixcode.com>
-
-	* COPYING-DOCS: New file. This is the official place to put the
-	FDL now.
-	
-
-2000-11-01  Radek Doulik  <rodo@helixcode.com>
-
-	* Keybindings: added composer keybindings description
-
-2000-10-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Actions -> New Directory Server added.
-
-	* C/config-prefs.sgml: Actions -> New Directory Server added.
-
-	* C/usage-contact.sgml: Actions -> New Directory Server added.
-
-	* C/menuref.sgml: Added mail Settings->Manage Subscriptions menu.
-
-	* C/usage-mail.sgml: Subscriptions section added. Quite
-	incomplete, though.
-
-2000-10-11  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Re-checked validity of all files. Made
-	minor changes to menuref.sgml, usage-mail.sgml, usage-print.sgml
-	to bring up to spec.
-
-	* C/usage-mail.sgml: Redid Filter & Vfolder to match the new &
-	improved functionality.
-
-	* C/fig/*: Re-did remaining screenshots.
-
-2000-10-10  Aaron Weber  <aaron@helixcode.com>
-	
-	* C/usage-print.sgml: New file, describing printing and
-	print-preview.
-
-	* C/fig/print-preview.png: New file.
-
-	* C/fig/print-dest.png: New file.
-
-	* C/evolution-guide.sgml: Added usage-print entity.
-
-	* C/menuref.sgml: Fixed calendar menu stuff.
-
-	* C/usage-mail.sgml: No more "Actions" menu, other assorted
-	menu-related changes.
-
-2000-10-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ * replaced a whole bunch of screenshots.
-
-2000-10-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Described Search features.
-
-	* C/menuref.sgml: Contact Manager menus fixed.
-
-2000-10-04  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Fixed glossterms.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames, spellchecked.
-
-	* C/apx-gloss.sgml: Added "Inline," "VCard".
-
-	* C/usage-mainwindow.sgml: Fixed glossterms,
-	filenames. Spellchecked.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames. Spellchecked.
-
-	* C/evolution-guide.sgml: New Legalnotice. Removed FDL and GPL,
-	  which are now included as part of the gnome-help package.
-
-	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and
-	responded to clahey's suggestions-- notably, commented out the
-	"add to master list" category feature.
-
-	* C/usage-calendar.sgml: Spellcheck. Fixed wording, event overlap
-	description.
-	
-	* C/evolution-guide.sgml: Spellcheck. Commented out Notes
-	entities.
-
-	* C/usage-notes.sgml: Spellchecked, then decided to comment out
-	this file/chapter and all references to it, since it's unlikely to
-	be implemented any time soon.
-
-	* C/config-setupassist.sgml: Spellcheck. Other minor updates. May
-	  need more work in the near future.
-
-	* C/usage-sync.sgml: Now it's really short. And spelled correctly.
-
-2000-10-03  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Mostly spelling. Still needs major
-	alteration.
-
-	* C/menuref.sgml: s/Appintment/Appointment, fixed small errors,
-	ran spellcheck. Still needs lots of work, since many menus have
-	changed.
-
-	* C/apx-gloss.sgml: Added Virus, Protocol, fixed vFolder,
-	spellchecked.
-
-2000-09-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: Added sendmail and SMTP.
-
-2000-09-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Changed to reflect new menu layout.
-
-	* C/usage-mainwindow.sgml: Changed to reflect new menu
-	layout. Again.
-
-	* C/usage-contact.sgml: Stop and Display All features.
-
-2000-09-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Switched to the "official" FSF markup.
-	  I will have to make changes to the markup-- adding ids, etc, or
-	  switch to another version of the markup. Pending discussion by
-	  GDP.
-
-	* C/apx-authors.sgml: Changed Matt Loper's email address to
-	loper.org; added Jeff Stedfast and Peter Williams to authors list,
-	realphebetized.
-
-	* C/config-prefs.sgml: Revision to reflect current options
-	labelling.
-
-	* C/evolution-guide.sgml: Changes to part intros.
-
-	* C/preface.sgml: Spelling and menu fixes.  Will need more work
-	tomorrow.
-	
-2000-09-20  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed sig stuff here and in setupassist.
-
-	* C/config-sync.sgml: Fixed description of conduit usage.
-
-2000-09-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Spelling fixes, etc.
-
-2000-09-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* C/Makefile.am: Fixed to install the stylesheet-images as well.
-
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ New files: contact-editor.png, mail-composer.png,
-	filter-assist-fig.png, mail-inbox.png
-
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Redid "soft" intro stuff.
-
-	* C/evolution-guide.sgml: Accidentally broke docs, now valid.
-
-2000-09-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Editing, proofing.
-
-2000-09-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Grammar, links, screenshots.
-
-	* fig/* Re-took most screenshots.
-
-	* C/usage-mail.sgml: Filters, proofing.
-
-2000-09-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added coverage of news, clarified POP/IMAP
-	distinction (there's a theme to these four log entries here).
-
-	* C/usage-mail.sgml: Added coverage of news.
-
-	* C/config-setupassist.sgml: Revised mail sources content for
-	IMAP/POP stuff.
-
-	* C/apx-gloss.sgml: Added IMAP and POP.
-
-2000-08-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: Added regular expressions to glossary.
-	Explanation should be removed from other portions of the book now.
-
-	* C/usage-mainwindow.sgml: Revisions, minor.
-
-	* C/apx-menuref.sgml: Now named menuref.sgml, to reflect its new
-	status as a part.
-
-	* C/evolution-guide.sgml: Structural alterations: Menuref is now a
-	part, not an appendix.
-
-	* C/apx-menuref.sgml: Added contextual menus for mail.
-
-	* C/preface.sgml: Added "quickref and pointers" sections. Props to
-	  O'Reilly for the copy of Outlook in a Nutshell which gave me the
-	  idea.
-
-2000-08-30  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: Minor fixes.
-
-	* C/preface.sgml: Corrected grammar, added glossterms, described
-	menuref.
-
-2000-08-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Redid filter and vFolder assistant
-	descriptions.
-
-	* C/fig/filter-new-fig.png: Replaced with new assistant pic.
-
-	* C/fig/filter-assist-fig.png: New file, showing only assistant.
-
-	
-	* C/apx-menuref.sgml: Finished message composer and calendar
-	editor menus. Looked at Contact Editor menus and decided to
-	document those features after implementation.
-
-2000-08-24  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Message Composer File and Edit menus.
-
-2000-08-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Added editor sections.
-	
-	* C/evolution-guide.sgml: Included Menu Reference Appendix.
-
-2000-08-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Minor markup changes.
-
-	* C/apx-menuref.sgml: New File. Menu Reference. Still needs much
-	work, but not bad for an evening.
-
-2000-08-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Kevin's diff applied, with minor changes.
-
-2000-08-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Fixed bugs in validation. Went home to
-	sleep.
-
-	* C/usage-mainwindow.sgml: Redid menubar description.
-	
-
-	* C/config-prefs.sgml: Added coverage of folder config, requested
-	that feature be transferred to config section. Switched to
-	variablelist in "Other" config section.
-
-	* C/usage-mail.sgml: Added coverage of right-click on messages,
-	threaded-view.
-
-	* C/usage-mainwindow.sgml: Right-click on folder menu reinstated.
-
-2000-08-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added news server coverage.  Other config
-	proofing changes.
-	
-
-2000-08-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gpl.sgml: New file.  Contains contents of "COPYING", but
-	marked up (probably not very well, but valid) as docbook
-	(SGML).
-
-	* C/evolution-guide.sgml: Subtle change to the legal notice:
-	distinguished manual license from software license. Linked to
-	apx-gpl.sgml above.
-
-	* C/usage-calendar.sgml: I redid all the usage files.
-
-2000-07-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Added password remembering/forgetting
-	feature.
-
-	* C/config-prefs.sgml: Mostly moved to variablelists, a few
-	language changes.
-
-	* C/config-setupassist.sgml: Minor changes to formatting, wording.
-
-	* C/usage-notes.sgml: Changed trademark references, other minor
-	changes.
-
-	* C/usage-calendar.sgml: Minor fixes, added additional calendar
-	section, removed references to unimplemented features. Spellcheck,
-	prep for 0.3 release.
-	
-2000-07-19  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: lots of minor fixes to language. added
-	desc. of clahey's cool button-address thing.
-
-	* C/usage-mainwindow.sgml: fixed itemizedlists, ch. to shortcut
-	bar & folder descs, removed refs to trash.
-
-2000-07-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Altered category addition stuff, plus
-	suggestions from Kevin.
-
-	* C/apx-gloss.sgml: Added ldap and signature definitions (from
-	Kevin).
-
-	* C/usage-mail.sgml: Move to variablelists from itemizedlists.
-
-2000-07-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: moved to variablelists from itemizedlists
-	* C/usage-calendar.sgml: moved to variablelists from itemizedlists
-
-2000-06-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor fixes.
-
-	* C/usage-notes.sgml: New File for feature that is yet to come.
-	* C/evolution-guide.sgml: Added entity for notes chapter.
-	* C/usage-mainwindow.sgml: Un-commented references to notes section.
-	
-	* C/apx-authors.sgml: Removed dcm from author list.
-
-	* C/usage-calendar.sgml: Added to-do list features.
-
-2000-06-28  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: commented out future features; redid
-	contact editor stuff.
-
-	* C/apx-gloss.sgml: Removed "live doc" and added "minicard"
-
-2000-06-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/devel-action.sgml: Removed file.
-	* C/devel-script.sgml: Same.
-	* C/devel-component.sgml: Same.
-	* C/preface.sgml: Removed references to devel section.
-	* C/evolution-guide.sgml: Removed references to devel section.
-
-2000-06-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Made moderate to major stylistic updates
-	to this, apx-gloss.sgml, and to all files beginning with "usage,"
-	especially wrt HTML mail.
-	
-
-2000-06-15  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Category stuff improved.
-
-	* C/usage-calendar.sgml: Now covers how to add an event properly.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Added the devel directory.
-
-2000-06-28  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* C/Makefile.am (SGML_FILES): Don't depend on the newly-removed
-	devel-*.sgml files.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* C/.cvsignore: added evolution-guide and evolution-guide.junk
-	so we don't get the '? doc/C/evolution-guide' messages each time we
-	do a cvs update.
-
-2000-06-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.
-
-	* C/usage-mail.sgml: Improved filter and vfolder
-	description, and some minor changes from me and Kevin.
-
-2000-06-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: finished adding calendar prefs. screenshots.
-	* C/fig/config-cal.png: new file (screenshot for above)
-	* C/fig/config-mail.png: same
-	
-2000-06-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-calendar.sgml: Incorporated chgs from Kevin.
-	
-	* C/config-prefs.sgml: began total overhaul of structure and added
-	content reflecting new prefs items.  needs LOTS more work.
-
-	* C/usage-mail.sgml: changed some references to id's in the 
-	config-prefs section.	
-
-	* C/fig/config-mail.png: changed filename from config-prefs.png
-
-2000-06-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: filename was wrong, altered.
-
-	* C/usage-mail.sgml: improved filter instructions, vFolder
-	instructions.  still need work though.
-	
-
-	* C/usage-contact.sgml: added screenshot.
-
-	* C/usage-calendar.sgml: added screenshot.
-
-	* C/config-prefs.sgml: added screenshots, and now describes the
-	actual prefs dialogs.
-
-	* C/fig/config-camel.png: new (screenshot) file
-	* C/fig/filter-druid.png: same
-	* C/fig/vfolder-druid.png: same
-	* C/fig/calendar.png: same
-	* C/fig/contact.png: same
-	* C/fig/vfolder-createrule-fig.png: same
-	* C/fig/filter-new-fig.png: same
-	* C/fig/config-camel.png: same
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: recurse into the C directory
-
-	* C/Makefile.am: Rules to build and install the docs. Mostly
-	stolen from gnomecal. Only works if you have GDP stuff
-	(http://www.gnome.org/gdp/) set up on your machine, but won't make
-	the build fail if you don't.
-
-2000-05-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: incorporated kevins notes.
-	* C/usage-mainwindow.sgml: incorporated kevins notes.
-
-2000-05-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: added Kevin Breit to author and
-	copyright.
-
-	* C/apx-authors.sgml: Put app authors in a simplelist.
-
-	* C/usage-mail.sgml: Removed USAGE-SETUP insertion, added xref to send
-        users to config-setupassist chapter. This and the following changes 
-	take setup druid coverage out of usage 
-	section and put it in config section. 
-	* C/config-setupassist.sgml: Added mail druid coverage from
-	usage-setup.sgml.
-	* C/usage-setup.sgml: Removed file. contents in
-	config-setupassist.sgml.  
-	* C/evolution-guide.sgml: Removed
-	USAGE-SETUP entity (and file usage-setup.sgml.)
-
-	
-2000-05-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/mainwindow-pic.png: new file
-	* C/fig/mail-druid-pic.png: new file
-	* C/fig: New directory, for figure graphics.
-
-	* C/apx-gloss.sgml: new file. glossary. thx. to kevin from chicago.
-	
-	* C/usage-setup.sgml: More accurate description of druid, and
-	moved to mail section-- see usage-mail.sgml entry.  This is a new
-	location for this entity, and it may move more later.
-	
-
-	* C/usage-mainwindow.sgml: altered description of starting
-	evolution. added screenshot for main-window picture. 
-
-	* C/usage-mail.sgml: added screenshots, added coverage of setup
-	druid and put it into get-and-send section, which is probably not
-	where it should stay.  Also started filter druid coverage and
-	clarified examples, esp. in Bcc: section.
-
-	* C/usage-contact.sgml: Clarified examples.
-
-	* C/preface.sgml: rewording of "what is" and "about book" sections.
-
-	* C/evolution-guide.sgml: added glossary entity APX-GLOSS, altered
-	phrasing in part intros, changed order of Setup-assistant section.
-
-	* C/config-prefs.sgml: changed wording, removed ref. to re-running
-	setup assistant.
-
-2000-05-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: removed.	
-
-	* C/apx-authors.sgml: new file.
-	* C/apx-bugs.sgml: same.
-	* C/apx-fdl.sgml: same.
-	* C/config-prefs.sgml: same.
-	* C/config-setupassist.sgml: same.
-	* C/config-sync.sgml: same.
-	* C/devel-action.sgml: same.
-	* C/devel-component.sgml: same.
-	* C/devel-script.sgml: same.
-	* C/evolution-guide.sgml: same.
-	* C/preface.sgml: same.
-	* C/usage-calendar.sgml: same.
-	* C/usage-contact.sgml: same.
-	* C/usage-mail.sgml: same.
-	* C/usage-mainwindow.sgml: same.
-	* C/usage-setup.sgml: same.
-	* C/usage-sync.sgml: same.
-
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	* Camel-Classes: sync
-
-2000-04-16  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: new file (doc sgml)
-	
-	* C/ : New directory for doc sgml & graphics
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/e-table.sgml: Added Miguel to the author
-	list for ETable.
-
-2000-03-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/, white-papers/widgets/e-table.sgml: New
-	doc for the ETable widget.
-
-	* ChangeLog: Created a ChangeLog file for the docs file and
-	integrated the individual ChangeLogs.
-
-2000-03-01  Dan Winship  <danw@helixcode.com>
-
-	* ibex.sgml: Ibex white paper
-
-2000-02-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Sections for the calendar user agent and the
-	calendar client library.
-
-2000-02-29  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Reorg a bit more, make the <PRE> section narrower,
-	add more references to graphics (the graphics themselves are
-	still in beta), add a section on CamelStream.
-
-2000-02-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Section for the personal calendar server.
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: add Bertrand to authors, edit his additions
-
-2000-02-28  bertrand  <bertrand@helixcode.com>
-
-	* camel.sgml: add a blurb about camel offering
-	uniform interface. needs style and grammar corrections. 
-	Talk about virtual folders.
-	Talk about lightweight messages
-	Talk about IMAP. 
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Beginnings of a Camel white paper
-
-2000-02-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: New file for the Evolution calendaring white paper.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d2ac0cf244..034926c592 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,3 @@
 SUBDIRS = reference
 
-EXTRA_DIST = ChangeLog.pre-1-4
-
 -include $(top_srcdir)/git.mk
diff --git a/doc/devel/ChangeLog b/doc/devel/ChangeLog
deleted file mode 100644
index a4c70a70c1..0000000000
--- a/doc/devel/ChangeLog
+++ /dev/null
@@ -1,82 +0,0 @@
-2005-08-31  Not Zed  <NotZed@Ximian.com>
-
-	* build-eplugin-manual.pl: fix e-import.c not to be included twice
-	& added invocation of xsltproc to build the html.
-
-	* evolution-plugin-manual.xml: fixed some syntax errors.
-
-	* evolution-plugin-manual.xml: added missing localedir thing.
-
-2005-07-12  Not Zed  <NotZed@Ximian.com>
-
-	* build-eplugin-manual.pl:
-
-	* evolution-plugin-manual.xml: Added some e-import stuff.
-
-2005-05-19  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-plugin-manual.xml: added some stuff about the pseudo
-	mime types used for finer control of the formatter.
-
-2005-05-13  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-plugin-manual.xml: added some info on the menu tag for
-	popup menus.
-
-2004-11-18  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-plugin-manual.xml: define load-on-startup parameter.
-
-2004-11-03  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-plugin-manual.xml: added author section to eplugin
-	definition.
-
-2004-10-28  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-plugin-manual.xml: setup for more auto-built stuff.
-
-	* build-eplugin-manual.pl: auto-build more stuff.
-
-2004-10-12  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-plugin-manual.xml: doc updates for new 'check' callback.
-
-2004-10-07  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-plugin-manual.xml: some updates.
-
-2004-09-09  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-plugin-manual.xml: updates.  some not very readable, sigh.
-
-	* images: Added e-popup-merge-[12].pic.
-
-2004-09-04  Not Zed  <NotZed@Ximian.com>
-
-	* images/Makefile: add a temporary makefile to build images from
-	source pic files.
-
-	* evolution-plugin-manual.xml: updates/rearrangements.
-
-2004-09-01  Not Zed  <NotZed@Ximian.com>
-
-	* images/*: added some image files.
-
-	* evolution-plugin-manual.xml: fix for some api changes.  Updates.
-
-2004-08-25  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-plugin-manual.xml: Added the working plugin manual
-	in-case i crash my bike going to work one day.
-
-2003-11-20  JP Rosevear <jpr@ximian.com>
-
-	* Remove dead doc files.
-
-2003-09-11  Dan Winship  <danw@ximian.com>
-
-	* calendar/cal-client/Makefile.am (GTKDOC_LIBS): Use non-static
-	libraries.
-
-	* calendar/cal-util/Makefile.am (GTKDOC_LIBS): Likewise
diff --git a/doc/devel/ChangeLog.pre-1-4 b/doc/devel/ChangeLog.pre-1-4
deleted file mode 100644
index 4d90e1e515..0000000000
--- a/doc/devel/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,286 +0,0 @@
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (HTML_DIR): Version using $(BASE_VERSION).
-
-2002-07-17  Peter Williams  <peterw@ximian.com>
-
-	* calendar/cal-util/Makefile.am (GTKDOC_LIBS): Because we're
-	using libtool as our LD, we can reference .la's and libtool
-	will DTRT for us.
-
-	* calendar/cal-client/Makefile.am (GTKDOC_LIBS): Same here.
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* calendar/cal-util/Makefile.am (GTKDOC_LIBS): Update for
-	libversit change.
-
-	* calendar/cal-client/Makefile.am (GTKDOC_LIBS): Likewise
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* calendar/cal-client/Makefile.am: Use EVOLUTION_CALENDAR_CFLAGS
-	and EVOLUTION_CALENDAR_LIBS.
-	* calendar/cal-util/Makefile.am: Likewise.
-
-2001-12-18  JP Rosevear  <jpr@ximian.com>
-
-	* calendar/cal-client/Makefile.am: cal-client needs bonobo-conf
-	now
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* calendar/alarm-generation.sgml: Updated docs for repeating
-	alarms.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (dist-hook): Remove the copying of the 
-	index.sgml file which doesn't seem to be generated 
-	anywhere anyway.
-
-2001-06-25  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am: ... and comment out more exec summary stuff.
-
-	* reference.sgml: Here too.
-	
-2001-06-25  Peter Williams  <peterw@ximian.com>
-
-	* calendar/cal-util/Makefile.am,
-	calendar/cal-client/Makefile.am: Fix make dist.
-
-	* Makefile.am: clean up a bit.
-
-2001-06-21  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: disable executive summary build because it is no
-	longer built
-	
-2001-06-21  JP Rosevear  <jpr@ximian.com>
-
-	* calendar/cal-client/Makefile.am: add new lib
-
-2001-06-21  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am:
-	calendar/cal-client/Makefile.am:
-	calendar/cal-util/Makefile.am:
-	importer/Makefile.am:
-	executive-summary/Makefile.am: Changed to used gtk-doc's
-	canonical Makefile.am (plus some tweaks because not every
-	dir builds html).
-
-2001-06-14  Damon Chaplin  <damon@ximian.com>
-
-	* executive-summary/.cvsignore: 
-	* calendar/cal-util/.cvsignore: 
-	* calendar/cal-client/.cvsignore: added *-undocumented.txt
-
-2001-05-24  Federico Mena Quintero  <federico@ximian.com>
-
-	* evolution-devel-guide.sgml: s/Helix Code/Ximian
-
-2001-05-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Removed some evolution-*-decl.txt files since these are
-	autogenerated by gtk-doc and don't belong in cvs anyway.
-	Should the tmpl/ dirs also be removed??
-
-	Updated: Readded them and updated the .cvsignore files - I guess
-	we do need them after all ;-)
-
-2001-04-25  Jon Trowbridge  <trow@ximian.com>
-
-	* Removed generated files from CVS, updated .cvsignore files
-	to include generated files.
-
-2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* executive-summary/Makefile.am (scan) [ENABLE_GTK_DOC]: Kludge
-	builddir != srcdir behavior by symlinking the $(DOC_MODULE).types
-	file into the builddir.
-	* calendar/cal-client/Makefile.am (scan) [ENABLE_GTK_DOC]:
-	Likewise.
-	* calendar/cal-util/Makefile.am (scan) [ENABLE_GTK_DOC]: Likewise.
-
-2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-devel-guide.sgml: Disable the importer references here
-	too.
-
-	* Makefile.am: Remove the importer stuff for now.
-
-2001-04-20  Damon Chaplin  <damon@ximian.com>
-
-	* importer/evolution-shell-importer.types: changed path to the
-	importer header files, since we've had reports that they aren't being
-	found (though it worked OK for me).
-
-2001-04-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* calendar/cal-client/Makefile.am (install-data-local): Install
-	the $(DOC_DIR_INSTALL_FILES) from the srcdir.
-	* calendar/cal-util/Makefile.am (install-data-local): Likewise.
-	* importer/Makefile.am (install-data-local): Likewise.
-	* executive-summary/Makefile.am (install-data-local): Likewise.
-
-2001-01-26  John R. Sheets  <dusk@ravendusk.org>
-
-	* importer/Makefile.am: Change (nonexistant) importer.sgml
-	references to evolution-importer.sgml to fix dependency problem.
-
-2001-01-17  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am (local_entities): Added the importer stuff.
-
-	* evolution-devel-guide.sgml: Added entities for the importer documents.
-
-	* reference.sgml: Added the public and private APIs for the importer.
-
-	* importer/*: New directory containing all the documenation for the
-	importer.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* evolution-devel-guide.sgml: Ximianified.
-
-	* calendar/evolution-calendar.sgml: Ditto.
-
-	* calendar/cal-util/evolution-cal-util-sections.txt: Updated.
-
-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated.
-
-2001-01-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Make it work when gtk-doc is not installed.
-
-	* calendar/cal-client/Makefile.am: Likewise.
-
-	* calendar/cal-util/Makefile.am: Likewise.
-
-2000-12-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	Added proper dependency lists to the gtk-doc mess.
-
-	* calendar/cal-client/Makefile.am (TARGET_DIR): Removed unused
-	variable.
-	(SOURCE_FILES): New variable with the list of source files we
-	depend on.
-	(IGNORED_SOURCE_HEADERS): New variable with the headers we ignore
-	for the gtkdoc-scan phase.
-	(scan_generated):
-	(tmpl_dependencies):
-	(tmpl_sources):
-	(tmpl_generated);
-	(sgml_dependencies):
-	(sgml_generated): Lists of stuff that is generated and that other
-	stuff depends on.
-	(all): Added the $(sgml_generated) as the final target.
-	(install-data-local): Added an installation hook; gtk-doc seems to
-	want some of its generated files to be installed.
-
-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated.
-
-	* calendar/cal-util/Makefile.am: Made the same changes as for
-	calendar/cal-client/Makefile.am.
-
-	* calendar/cal-util/evolution-cal-util-sections.txt: Updated.
-
-	* Makefile.am (local_entities): Added alarm-generation.sgml.
-	(all): Made the main target be the html/index.html.
-
-2000-12-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/alarm-generation.sgml: New file with a description of
-	the algorithm used to generate alarm instances.
-
-	* evolution-devel-guide.sgml: Added an entity for the above
-	chapter.
-
-	* calendar/evolution-calendar.sgml: Reference the entity here.
-
-	* calendar/Makefile.am (EXTRA_DIST): Added alarm-generation.sgml.
-
-2000-12-13  Larry Ewing  <lewing@helixcode.com>
-
-	* calendar/Makefile.am (EXTRA_DIST): make it public-reference.sgml
-	not referenc.sgml here.
-
-2000-11-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/architecture.sgml: Finished the calendar architecture
-	chapter.
-
-2000-11-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-devel-guide.sgml: Added an id for the API reference <part>.
-	Added the FDL <legalnotice>.
-	Added the preface and toplevel reference entities.
-	Added entities for Evolution, Wombat, and Camel.
-	Added an appendix for the GNU FDL.
-	
-	* preface.sgml: New file with the introduction to the Evolution
-	Developer's Guide.
-
-	* reference.sgml: Split the toplevel reference part into its own
-	file.
-
-	* fdl.sgml: Added the GNU Free Documentation License.
-
-	* calendar/evolution-calendar.sgml: Added an id for the <part>.
-
-	* calendar/public-reference.sgml: Added an id for the <reference>.
-	Moved this file over from calendar/reference.sgml.
-
-	* Makefile.am (local_entities): Added a list of the SGML files
-	that define entities for inclusion in the toplevel document.  This
-	way we can track documentation file dependencies down to all
-	levels.
-	(html/index.html): Made the toplevel document depend on
-	$(local_entities).  Also, removed the "html" target and put its
-	contents directly here; this way we avoid having .PHONY targets.
-	(EXTRA_DIST): Removed the evolution_devel_guideDATA; it made no
-	sense.
-	(content_files): Added preface.sgml and reference.sgml.
-
-2000-09-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-devel-guide.sgml: Made the toplevel <book> id be
-	"index".
-
-2000-08-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/cal-util/*: Integrated the cal-util library into the
-	documentation framework.
-
-	* calendar/Makefile.am (SUBDIRS): Added the cal-util directory.
-
-	* evolution-devel-guide.sgml: Added entities for the cal-util stuff.
-	Added entity for libical.
-
-	* calendar/reference.sgml: Added the cal-util reference entries.
-
-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated
-	for new API.
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (maintainer-clean-local): Don't depend
-	on 'clean'; this messes up maintainer-clean.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/cal-client/tmpl/cal-client.sgml: Populated.
-
-	* evolution-devel-guide.sgml: New <book> toplevel for the
-	Evolution Developer's Guide.
-
-	* calendar/evolution-calendar.sgml: New <part> for the calendar
-	developer's documentation.
-
-	* calendar/architecture.sgml: New <chapter> for the calendar
-	architecture.
-
-	* calendar/reference.sgml: New <reference> for the calendar API
-	reference.
diff --git a/doc/devel/Makefile.am b/doc/devel/Makefile.am
index cd7881e23b..25173a2a14 100644
--- a/doc/devel/Makefile.am
+++ b/doc/devel/Makefile.am
@@ -91,8 +91,7 @@ EXTRA_DIST =				\
 	$(extra_files)		  	\
 	$(installed_content_files)	\
 	$(HTML_IMAGES)			\
-	$(DOC_MAIN_SGML_FILE)		\
-	ChangeLog.pre-1-4
+	$(DOC_MAIN_SGML_FILE)
 
 #	$(DOC_MODULE).types	     \
 #	$(DOC_MODULE)-sections.txt      \
diff --git a/doc/reference/shell/Makefile.am b/doc/reference/shell/Makefile.am
index 97322a1c40..931db22b27 100644
--- a/doc/reference/shell/Makefile.am
+++ b/doc/reference/shell/Makefile.am
@@ -18,8 +18,7 @@ SCANGOBJ_OPTIONS=
 SCAN_OPTIONS=
 
 # Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=e
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -77,7 +76,6 @@ EXTRA_DIST +=
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
 #DISTCLEANFILES +=
 
-# Comment this out if you want your docs-status tested during 'make check'
 #TESTS = $(GTKDOC_CHECK)
 
 -include $(top_srcdir)/git.mk
diff --git a/doc/reference/shell/eshell-docs.sgml b/doc/reference/shell/eshell-docs.sgml
index 2556a58320..6101932139 100644
--- a/doc/reference/shell/eshell-docs.sgml
+++ b/doc/reference/shell/eshell-docs.sgml
@@ -37,6 +37,7 @@
     <xi:include href="xml/e-html-utils.xml"/>
     <xi:include href="xml/e-icon-factory.xml"/>
     <xi:include href="xml/e-logger.xml"/>
+    <xi:include href="xml/e-poolv.xml"/>
     <xi:include href="xml/e-print.xml"/>
     <xi:include href="xml/e-selection.xml"/>
     <xi:include href="xml/e-signature.xml"/>
diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index c176e23ee3..7ee56ab6bf 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -546,6 +546,16 @@ EModulePrivate
 </SECTION>
 
 <SECTION>
+<FILE>e-poolv</FILE>
+<TITLE>EPoolv</TITLE>
+EPoolv
+e_poolv_new
+e_poolv_set
+e_poolv_get
+e_poolv_destroy
+</SECTION>
+
+<SECTION>
 <FILE>e-print</FILE>
 <TITLE>Printing</TITLE>
 e_print_operation_new
@@ -681,11 +691,8 @@ e_file_lock_exists
 e_util_guess_mime_type
 e_util_get_category_filter_options
 e_charset_add_radio_actions
-e_folder_map_local_folders
 e_file_replace_contents_async
 e_file_replace_contents_finish
-e_fsutils_usage
-e_fsutils_avail
 e_mktemp
 e_mkstemp
 e_mkdtemp
diff --git a/doc/reference/shell/tmpl/e-util.sgml b/doc/reference/shell/tmpl/e-util.sgml
index e140452d0b..1d17258128 100644
--- a/doc/reference/shell/tmpl/e-util.sgml
+++ b/doc/reference/shell/tmpl/e-util.sgml
@@ -29,6 +29,15 @@ Miscellaneous Utilities
 @Returns: 
 
 
+<!-- ##### FUNCTION e_get_gnome2_user_dir ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
 <!-- ##### FUNCTION e_get_accels_filename ##### -->
 <para>
 
@@ -348,16 +357,6 @@ Miscellaneous Utilities
 @Returns: 
 
 
-<!-- ##### FUNCTION e_folder_map_local_folders ##### -->
-<para>
-
-</para>
-
-@local_dir: 
-@type: 
-@Returns: 
-
-
 <!-- ##### FUNCTION e_file_replace_contents_async ##### -->
 <para>
 
@@ -386,24 +385,6 @@ Miscellaneous Utilities
 @Returns: 
 
 
-<!-- ##### FUNCTION e_fsutils_usage ##### -->
-<para>
-
-</para>
-
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_fsutils_avail ##### -->
-<para>
-
-</para>
-
-@path: 
-@Returns: 
-
-
 <!-- ##### FUNCTION e_mktemp ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index 1cb81172df..93f3a149fa 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -4,14 +4,6 @@
 </para>
 
 
-<!-- ##### FUNCTION e_get_gnome2_user_dir ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
 <!-- ##### FUNCTION e_shell_content_get_search_name ##### -->
 <para>
 
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
deleted file mode 100644
index 77d035cccd..0000000000
--- a/e-util/ChangeLog
+++ /dev/null
@@ -1,2737 +0,0 @@
-2009-04-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #561188
-
-	* e-error.c: (e_error_newv): Do not localize already localized text.
-	Use default title for empty titles too, not only for NULL titles.
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* e-config.c:
-	* e-cursor.c:
-	* e-dialog-utils.c:
-	* e-dialog-widgets.h:
-	* e-dialog-widgets.c:
-	Remove deprecated Gtk+ symbols.
-
-2009-04-07  Tobias Mueller  <tobiasmue@gnome.org>
-
-	** Fixes bug #577989
-
-	* conf-bridge.c (error_handler):
-	Call gtk_message_dialog_new with a proper format string ("%s")
-
-2009-02-13  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #564229
-
-	* e-plugin-ui.c (plugin_ui_hook_class_init):
-	Initialize the EPluginUI registry during class initialization,
-	so that it's sure to be there when we need it.
-
-2009-01-15  Milan Crha  <mcrha@redhat.com>
-
-	* e-plugin.c: (epl_construct): Compiler warning fix.
-
-2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-error.c (ee_response):
-	Call e_display_help() instead of gnome_url_show().
-
-	* e-util.c (e_show_uri):
-	New convenience function calls gtk_show_uri() and displays an
-	error dialog if the URI cannot be shown.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-dialog-utils.c:
-	Remove unneeded #include <libgnome/gnome-util.h>.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-util.c (e_display_help):
-	Now that we require GTK+ 2.14, use gtk_show_uri() instead of
-	gnome_help_display().
-
-2009-01-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-config.c (ec_rebuild):
-	Use the translated the EConfigItem label when building the UI.
-
-2008-12-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #564860
-
-	* e-util-label.c (e_util_labels_parse):
-	Don't crash on malformed label strings.
-
-2008-12-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #563250
-
-	* e-util.c (e_get_accels_filename):
-	New function returns the filename where custom keyboard
-	accelerators are stored.  Currently only applies to the
-	various editor windows in Evolution.
-
-2008-12-10  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #563870
-
-	* e-util-labels.h: (e_util_labels_get_filter_options):
-	* e-util-labels.c: (e_util_labels_get_filter_options):
-	New helper function to be used in FilterOption.
-
-2008-12-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #555663
-
-	* gconf-bridge.c: (struct WindowBinding), (gconf_bridge_bind_window),
-	(window_binding_unbind): Do not overwrite signal id.
-
-2008-12-05  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #332629
-
-	* e-util.h: (e_util_get_category_filter_options):
-	* e-util.c: (e_util_get_category_filter_options):
-	New helper function to be used in FilterOption.
-
-2008-11-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #332729
-
-	* e-config.c: (ep_finalise): Disconnect handlers on the widget before
-	freeing the structure it is using.
-
-2008-11-12  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #559810
-
-	* e-util-labels.c: (e_util_labels_parse):
-	Do not localize empty label names, also localize them only first time.
-
-2008-11-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-non-intrusive-error-dialog.c:
-	* e-non-intrusive-error-dialog.h:
-	Fix compiler warnings.
-
-2008-11-04  Akhil Laddha  <lakhil@novell.com>              
-
-	* e-non-intrusive-error-dialog.c (eni_query_tooltip_cb),
-	(eni_render_pixbuf), (eni_render_date), (eni_append_logs),
-	(eni_config_get_error_level), (eni_config_get_error_timeout),
-	(eni_error_timeout_changed), (eni_error_level_value_changed),
-	(eni_show_logger):
-	* e-non-intrusive-error-dialog.h:
-	Missed commiting these files in the previous commit. 
-
-2008-11-03  Ashish Shrivastava  <shashish@novell.com>
-
-	** Support for Non-intrusive error in calendar.
-
-	* Makefile.am: Added new files:
-	* e-non-intrusive-error-dialog.c, e-non-intrusive-error-dialog.h:
-
-2008-11-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-util.c (do_format_number_as_float):
-	Remove this unused internal function.
-
-2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-icon-factory.c:
-	Only include the toplevel GTK+ header.
-
-2008-10-29  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-plugin-ui.c:
-	* e-plugin-ui.h:
-
-2008-10-06  Sankar P  <psankar@novell.com>
-
-	* widgets/table/e-cell-float.c:
-	* widgets/table/e-cell-float.h:
-	Remove obsolete function
-
-2008-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #554418
-
-	* e-util.h: (e_util_guess_mime_type):
-	* e-util.c: (e_util_guess_mime_type): Guess mime_type based on
-	the file content only when permitted by the caller, otherwise
-	check based on the filename only, where it fallbacks if file
-	content guess fails.
-
-2008-09-29  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-util.c:
-	* e-util.h:
-	* e-xml-utils.c:
-
-2008-09-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #535248
-
-	* e-logger.c: (flush_logfile), (logger_set_component),
-	(logger_finalize), (e_logger_log), (e_logger_get_logs):
-	Check if log file has been opened successfully before using it.
-
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-event.c:
-
-2008-09-16  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-error.c:
-	* e-icon-factory.c:
-	* e-plugin.c:
-
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-dialog-utils.c:
-	* e-sorter-array.c:
-
-2008-09-04  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-gui-utils.c:
-	* e-html-utils.c:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-categories-config.c:
-	* e-config-listener.c:
-	* e-config-listener.h:
-	* e-config.c:
-	* e-corba-utils.c:
-	* e-corba-utils.h:
-	* e-cursor.c:
-	* e-dialog-utils.h:
-	* e-dialog-widgets.c:
-	* e-dialog-widgets.h:
-	* e-error.h:
-	* e-fsutils.h:
-	* e-gui-utils.h:
-	* e-html-utils.h:
-	* e-import.c:
-	* e-logger.h:
-	* e-menu.c:
-	* e-mktemp.c:
-	* e-mktemp.h:
-	* e-pilot-map.c:
-	* e-pilot-map.h:
-	* e-pilot-util.c:
-	* e-plugin.h:
-	* e-popup.c:
-	* e-profile-event.c:
-	* e-request.c:
-	* e-request.h:
-	* e-sorter-array.h:
-	* e-sorter.c:
-	* e-text-event-processor-emacs-like.c:
-	* e-text-event-processor.c:
-	* e-text-event-processor.h:
-	* e-util-labels.c:
-	* e-xml-utils.h:
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-bconf-map.c:
-	* e-bconf-map.h:
-	* e-bit-array.c:
-	* e-bit-array.h:
-	* e-categories-config.h:
-	* e-config.h:
-	* e-cursor.h:
-	* e-event.h:
-	* e-folder-map.c:
-	* e-folder-map.h:
-	* e-fsutils.c:
-	* e-icon-factory.h:
-	* e-import.h:
-	* e-logger.c:
-	* e-menu.h:
-	* e-pilot-util.h:
-	* e-popup.h:
-	* e-print.c:
-	* e-print.h:
-	* e-profile-event.h:
-	* e-signature-list.c:
-	* e-signature-list.h:
-	* e-signature.c:
-	* e-signature.h:
-	* e-sorter.h:
-	* e-text-event-processor-emacs-like.h:
-	* e-text-event-processor-types.h:
-	* e-util-labels.h:
-	* e-util-private.h:
-	* e-win32-reloc.c:
-
-2008-08-18  Bharath Acharya  <abharath@novell.com>
-
-	* e-icon-factory.c: (e_icon_factory_get_icon_filename),
-	(e_icon_factory_get_icon): Added a debug macro and turned it off.
-
-2008-08-16  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	* e-icon-factory.c: (e_icon_size_to_gtk_icon_size),
-	(e_icon_factory_get_icon_filename), (e_icon_factory_get_icon):
-	Make evolution respect GTK_ICON_SIZE changes, part of bug #416258.
-
-2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-util.c (e_display_help):
-	New convenience function for launching help from Evolution.
-	Displays an error dialog over the given parent window if an
-	error occurs.
-
-2008-08-13  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-gui-utils.c (e_create_image_widget):
-	Remove this unused function.
-
-	* e-util.h: Cosmetic cleanups.
-
-2008-08-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #546892
-
-	* e-gui-utils.c:
-	* e-popup.c:
-	Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image().
-
-	* e-icon-factory.c (e_icon_factory_get_image):
-	Kill this function.  Use gtk_image_new_from_icon_name().
-
-	* e-icon-factory.c (e_icon_factory_get_icon_list):
-	Kill this function.  Use gtk_window_set_icon_name().
-
-2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #545568
-
-	* e-plugin.c (ep_load):
-	Make sure system plugins are enabled on startup.
-
-2008-07-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #540282
-
-	* e-print.c:
-	Store printer and page settings in a key file rather than GConf.
-	Also properly apply page settings to print operations, including
-	custom margins.
-
-2008-07-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #540972
-
-	* e-plugin.c: (ep_load): Small memory leak fix.
-
-2008-06-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #509595
-
-	* e-logger.c: (e_logger_get_logs): Do not crash if file does not
-	exists. Also be able to read lines more than 249 characters long.
-
-2008-06-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-logger.[ch]: Code cleanup.
-
-2008-06-06  Tor Lillqvist  <tml@novell.com>
-
-	* e-plugin.c (epl_loadmodule): Tell which plugin it could not load
-	in the warning message.
-
-2008-05-29  Frederic Crozat  <fcrozat@mandriva.com>
-
-	** Fixes bug #535273
-	        
-	* Makefile.am:
-	Link e-util and econduit libraries with gnome-pilot.
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-plugin.c:
-	* e-plugin.h:
-	Code cleanup.  Also add an "enabled" property to EPlugin.
-
-2008-05-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #530392
-
-	* e-util-labels.c (e_util_labels_add_with_dlg):
-	Pressing Enter in the entry activates the default response.
-
-2008-05-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #514383
-
-	* e-error.c (e_error_newv): Widget packing adjustments.
-
-2008-05-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #531592
-
-	* e-error.c (ee_build_label):
-	Add an 'escape_args' parameter for strings that should /not/ be
-	escaped, such as window titles and status bar messages.
-
-	* e-error.c (e_error_newv):
-	Pass an appropriate 'escape_args' value to ee_build_label().
-
-2008-05-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #525241 (EPluginUI)
-
-	* Makefile.am:
-	Add e-plugin-ui.[ch].
-
-	* e-plugin.h (EPluginClass):
-	Add a "get_symbol" method for extracting arbitrary symbols
-	from an EPlugin.  Implementation of the method is optional.
-
-	* e-plugin.c (e_plugin_get_symbol):
-	New function invokes the new "get_symbol" EPlugin method.
-
-	* e-plugin.c (epl_get_symbol):
-	New function implements the new "get_symbol" EPlugin method.
-	It extracts the given symbol name from the GModule.
-
-	* e-plugin-ui.[ch]:
-	New EPluginHook subclass that allows plugins to extend menus,
-	toolbars, and popups that are managed by GtkUIManager instead
-	of BonoboUI.  Should eventually replace EMenu/EPopup.
-
-2008-04-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #529254
-
-	* e-util.c: (e_write_file_uri):	Save file properly.
-	Handle either URI or filename. Return success or failure, not gint.
-
-2008-04-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am:
-	Add gconf-bridge.[ch] from composer.
-
-2008-04-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #528817
-
-	* e-plugin.c (e_plugin_register_type):
-	Fix a typo in the logic.  This might explain why I occasionally
-	find Exchange Operations disabled on startup.
-
-2008-04-17  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #526739
-
-	* e-gui-utils.c: Do not include gnome-vfs.
-	* e-util.c: (e_write_file_uri), (e_file_get_save_path):
-	* e-dialog-utils.c: (e_file_can_save), (e_file_check_local):
-	Use gio instead of gnome-vfs.
-	* e-util.h:
-	* e-util.c: (e_util_guess_mime_type), (e_util_filename_to_uri),
-	(e_util_uri_to_filename), (e_util_read_file): New helper functions.
-
-2008-04-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-util-labels.c (e_util_labels_add_with_dlg):
-	Clarify an error message.  (#509672)
-
-2008-04-07  Takao Fujiwara  <takao.fujiwara@sun.com>
-
-	reviewed by: Milan Crha
-
-	** Fix for bug #408579
-
-	* e-util/e-system.error.xml:
-	  Changed '&quot;' to '\"' to work with intltool.
-
-2008-03-20  Sankar P  <psankar@novell.com>
-
-	* e-plugin.c: (ep_load):
-	Changed a stupid conditional statement, 
-	in the previous commit.
-
-2008-03-19  Sankar P  <psankar@novell.com>
-
-	** Fix for bug #496839 
-
-	* e-plugin.c: (ep_load), (e_plugin_load_plugins),
-	(e_plugin_get_configure_widget):
-	* e-plugin.h:
-	- Implement Plugin Load Levels. You can decide
-	on which load-level you want your plugin to be loaded.
-	- Load Levels are mandatory if you need other language loaders
-	like Mono-Loader or Python-Loader.
-	- Introduce FLAGS as part of EPlugin. Futuristic. 
-
-2008-03-17  Alex Rostovtsev  <tetromino@gmail.com>
-
-	** Fix for bug #522631
-
-	* e-profile-event.c: Make 'e_profile_event_emit' non-static when 
-	ENABLE_PROFILING is defined.
-
-2008-03-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #513951
-
-	* e-mktemp.c (get_dir):
-	* e-util.c (get_lock_filename):
-	Use e_get_user_data_dir() instead of constructing the full path.
-
-	* e-util.c (e_get_user_data_dir):
-	New function returns the base directory for Evolution user data.
-	This should be the /only/ place in the application where this
-	directory is hard-coded.
-
-	* e-util.c (e_file_update_save_path), (e_file_get_save_path):
-	Emit warnings when saving to GConf fails.
-
-2008-02-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #209353
-
-	* e-text-event-processor-emacs-like.c:
-	(e_text_event_processor_emacs_like_event):
-	Allow paste text on mouse middle button click.
-
-2008-02-18  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #515744
-
-	* e-config.c: (ep_finalise): Use proper member to free.
-
-2008-02-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #509741
-
-	* e-error.c (e_error_newv):
-	If the error dialog has no primary text, fallback to the window
-	title for the "primary" data key.  This is what gets displayed
-	in the status bar.
-
-	* e-error.c (e_error_count_buttons):
-	New function counts buttons in a dialog's action area.
-
-2008-01-24  Tor Lillqvist  <tml@novell.com>
-
-	* e-icon-factory.c (e_icon_factory_init): Construct pathname under
-	EVOLUTION_DATADIR at run-time because EVOLUTION_DATADIR is a
-	function call on Windows.
-
-2008-01-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #488213
-
-	* e-icon-factory.h: (e_icon_factory_pixbuf_scale):
-	* e-icon-factory.c: (e_icon_factory_pixbuf_scale):
-	New global function for pixbuf scaling which speeds up scaling when
-	HAVE_LIBGNOMEUI_GNOME_THUMBNAIL_H.
-	* e-icon-factory.c: (load_icon):
-	Use global function e_icon_factory_pixbuf_scale for scaling pixbufs.
-
-2008-01-10  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #211353
-
-	* Makefile.am:
-	* e-util-labels.h:
-	* e-util-labels.c: New files to work with labels.
-
-2008-01-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #507363
-
-	* e-cursor.c: (e_cursor_set):
-	Also check if toplevel widget has non-NULL window property.
-
-2007-12-14  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #211353
-
-	* e-popup.h:
-	* e-popup.c: (ep_build_tree):
-	Toggles can be in inconsistent state now, and can also contain
-	an image, which is a pointer to GtkImage widget.
-
-2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* Makefile.am: Add e-logger.[ch] to compilation
-	* e-error.c: (e_error_newv): Add primary/secondary text to the error 
-	dialog to the gobject as data.
-	* e-logger.[ch]: A new logger provision Evolution. 
-
-2007-12-05  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-util.h: Fix a compiler warning
-
-2007-12-05  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-util.c: (get_lock_filename), (e_file_lock_create),
-	(e_file_lock_destroy), (e_file_lock_exists): Add utility functions for 
-	startup-running lock create, check and delete.
-	* e-util.h:
-
-2007-12-04  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #500210
-
-	* e-plugin.h:
-	* e-plugin.c: (e_plugin_configure), (e_plugin_is_configurable),
-	(epl_configure), (e_plugin_get_configure_widget),
-	(epl_get_configure_widget): Removed old configure functions,
-	replaced by get_configure_widget functions, to be able show
-	plugin configuration in a tab of plugin manager.
-
-2007-12-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #392747
-
-	* e-utils.c (e_get_month_name), (e_get_weekday_name):
-	New functions cache localized month and weekday names (respectively)
-	for easier retrieval than resorting to strftime().
-
-2007-11-13  Ondrej Jirman  <megous@megous.com>
-
-	** Fix for bug #494320
-
-	* e-popup.c: (e_popup_create_menu): Add support for redefining
-	existing menu items.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #492692
-
-	* e-util.c: (e_str_case_compare): Leak fix.
-
-2007-11-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Remove dead files from source control.  The dates below
-	   indicate when the file was removed from Makefile.am.
-	   Fixes part of bug #478704.
-
-	* e-categories-master-list-wombat.c	(Jun 2005)
-	* e-categories-master-list-wombat.h	(Jun 2005)
-
-2007-10-26  Sankar P  <psankar@novell.com>
-
-	** Fix for bug #461272
-
-	* e-plugin.c: (ep_load), (e_plugin_load_plugins),
-	(e_plugin_is_configurable), (epl_configure):
-	* e-plugin.h:
-	Configure button should not be enabled for all.
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-config.c:
-	* e-event.c:
-	* e-gui-utils.c:
-	* e-import.c:
-	* e-menu.c:
-	* e-mktemp.c: (get_dir):
-	* e-popup.c:
-	* e-profile-event.c: (e_profile_event_peek):
-	* e-util.c: (get_font_options):
-	* e-xml-utils.c: (e_xml_get_string_prop_by_name),
-	(e_xml_get_string_prop_by_name_with_default),
-	(e_xml_get_translated_string_prop_by_name):
-
-	Warning fixes.
-	- NULL vs 0
-	- ANSIfication of declarations
-	- missing include
-
-2007-10-12  Michael Monreal <michael.monreal@gmail.com>
-
-	** Migration of theme icons to data/icons/ (bug #479257)
-
-	* file e-util/e-icon-factory.c:
-	Append a private icon directory to the search path.
-
-2007-10-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #311179
-
-	* e-error.c: (e_error_newv): Unset GTK_CAN_FOCUS on label to prevent
-	gaining focus by Tab, still can select and copy text by mouse.
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* e-plugin.c:
-	* e-pilot-map.c:
-	* e-profile-event.c:
-	* e-signature.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-10-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #469657
-
-	* e-config-listener.c:
-	Use destroy functions in GHashTables to simplify memory management.
-
-2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #461195
-
-	* e-uril-marshal.list: Remove needless marshalers.
-	* e-text-event-processor.c:
-	* e-signature-list.c: Use GObject's marshalers.
-
-2007-09-10  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #471791 
-
-	* e-config-listener.c: Move away from g_asserts to g_crit*
-	(e_config_listener_get_boolean_with_default),
-	(e_config_listener_get_float_with_default),
-	(e_config_listener_get_long_with_default),
-	(e_config_listener_get_string_with_default):
-	* e-config.c: (e_config_construct), (ec_rebuild),
-	(e_config_create_widget), (e_config_target_new):
-	* e-dialog-widgets.c: (e_dialog_radio_get),
-	(e_dialog_option_menu_get), (e_dialog_get_values):
-	* e-event.c: (e_event_target_new):
-	* e-import.c: (e_import_target_new):
-	* e-menu.c: (e_menu_target_new):
-	* e-pilot-map.c: (map_sax_start_element),
-	(e_pilot_map_remove_by_pid), (e_pilot_map_lookup_uid):
-	* e-popup.c: (e_popup_target_new):
-	* e-util.c: (e_flexible_strtod), (e_ascii_dtostr):
-
-2007-09-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #473903
-
-	* e-print.c: (load_page_setup):
-	Fixes serious compiler warnings.
-
-2007-08-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #367760
-
-	* e-dialog-utils.c: (e_file_get_save_filesel):
-	Don't escape characters of file name, suppose it has been already done.
-
-2007-08-18  Tobias Mueller  <muelli@auftrags-killer.org>
-
-        patch by: Tim Yamin <plasm@roo.me.uk>
-        reviewed by: Srinivasa Ragavan <sragavan@novell.com> 
-
-        * e-icon-factory.c: (load_icon):
-        Optimize pixbuf behaviour, fixes #465573
-
-2007-08-07  Sankar P  <psankar@novell.com>
-
-	reviewed by: Srinivasa Ragavan <sragavan@novell.com> 
-
-	* e-plugin.c: (ep_load_pending):
-	Do not load pending hooks,
-	if the corresponding plugin is disabled.
-	Fixes #383684
-
-2007-07-29  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #451211.
-
-	* e-event.c: (e_event_emit): Replase "==" with "!=" because g_assert()
-	occurs if expression is NOT true.
-
-2007-07-27  Lucky Wankhede <wlakke@novell.com>
-
-	** Fixes bug #451211
-
-	* e-event.c
-	Changed in (e_event_emit)
-	
-2007-07-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* e-util.h: Remove E_MAKE_TYPE macro.
-
-	* e-text-event-processor.c: 
-	* e-sorter.c:
-	* e-text-event-processor-emacs-like.c:
-	* e-sorter-array.c:
-	* e-bit-array.c: Use G_DEFINE_TYPE instead of E_MAKE_TYPE.
-
-2007-07-26  Sankar P  <psankar@novell.com>
-
-	* e-plugin.c: (e_plugin_configure), (epl_configure),
-	(epl_class_init):
-	* e-plugin.h:
-	Plugins should be configurable within the plugin-manager itself.
-	Fixes Preferences dialog bloating.
-	See bug #459522
-
-2007-07-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #446894
-
-	* e-print.c (load_page_setup):
-	Extract GtkPageSetup properties from a GtkPrintSettings object.
-
-	* e-print.c (save_page_setup):
-	Merge GtkPageSetup properties into a GtkPrintSettings object.
-
-	* e-print.[ch] (e_print_run_page_setup_dialog):
-	New function runs a preconfigured Page Setup dialog and saves
-	the configuration to GConf (/apps/evolution/shell/printing).
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #448223 from Gilles Dartiguelongue  
-
-	* e-util.c: (e_str_without_underscores):
-	* e-util.h:
-
-2007-06-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #446870
-
-	* e-gui-utils.c: (e_create_image_widget): Add this function back. It
-	is used in glade files.
-	* e-gui-utils.h:
-
-2007-06-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #438467 (Patch from Gilles Dartiguelongue)
-
-	* e-bconf-map.c: (e_bconf_hex_decode), (e_bconf_get_path),
-	(e_bconf_get_entry), (e_bconf_get_value), (build_xml),
-	(e_bconf_import_xml_blob), (e_bconf_import):
-	* e-config.c: (emph_construct_menu), (emph_construct):
-	* e-error.c: (ee_load):
-	* e-event.c: (emph_construct_item), (emph_construct):
-	* e-folder-map.c: (is_type_folder):
-	* e-html-utils.c: (url_extract), (email_address_extract),
-	(is_citation), (e_text_to_html_full):
-	* e-import.c: (emph_construct_importer), (emph_construct):
-	* e-menu.c: (emph_construct_menu), (emph_construct):
-	* e-pilot-map.c: (map_set_node_timet), (map_sax_start_element),
-	(map_write_foreach), (e_pilot_map_write):
-	* e-plugin.c: (ep_construct), (ep_load_plugin), (ep_load),
-	(ep_load_pending), (e_plugin_register_type), (e_plugin_xml_prop),
-	(e_plugin_xml_prop_domain), (e_plugin_xml_int),
-	(e_plugin_xml_content), (e_plugin_xml_content_domain),
-	(epl_construct), (e_plugin_hook_mask), (e_plugin_hook_id),
-	(epth_construct):
-	* e-popup.c: (emph_construct_menu), (emph_construct):
-	* e-signature.c: (xml_set_bool), (xml_set_prop), (xml_set_content),
-	(e_signature_uid_from_xml), (e_signature_set_from_xml),
-	(e_signature_to_xml):
-	* e-xml-utils.c: (e_xml_get_child_by_name_by_lang),
-	(e_xml_get_child_by_name_by_lang_list_with_score),
-	(e_xml_get_child_by_name_by_lang_list),
-	(e_xml_get_child_by_name_no_lang),
-	(e_xml_get_integer_prop_by_name_with_default),
-	(e_xml_set_integer_prop_by_name),
-	(e_xml_get_uint_prop_by_name_with_default),
-	(e_xml_set_uint_prop_by_name),
-	(e_xml_get_bool_prop_by_name_with_default),
-	(e_xml_set_bool_prop_by_name),
-	(e_xml_get_double_prop_by_name_with_default),
-	(e_xml_set_double_prop_by_name),
-	(e_xml_get_string_prop_by_name_with_default),
-	(e_xml_set_string_prop_by_name),
-	(e_xml_get_translated_string_prop_by_name): cast fixes and
-	compilation warning cleanups.
-
-2007-05-04  Milan Crha  <mcrha@redhat.com>
-
-	** Fixes bug #432867
-
-	* e-util/e-util.c (e_write_file_uri) changed default
-	attribute for file from 0755 to 0644
-
-2007-05-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-icon-factory.c: (e_icon_factory_init): Add support for themable
-	application support icons.
-
-2007-04-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-print.c:
-	* e-print.h:
-	Refactor the printing infrastructure. (#426816)
-
-2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #429422
-
-	* Makefile.am:
-	Remove e-gtk-utils.h and e-gtk-utils.c.
-
-	* e-mktemp.c (get_dir):
-	Use g_mkdir_with_parents() instead of e_util_mkdir_hier().
-
-	* e-gui-utils.[ch]:
-	Remove e_create_image_widget() and e_button_new_with_stock_icon()
-
-	* e-gui-utils.c (e_icon_for_mime_type):
-	Use GtkIconTheme instead of GnomeIconTheme.
-
-	* eggtrayicon.c (gtk_status_icon_init):
-	Use g_object_ref_sink() instead of gtk_object_sink().
-
-	* e-sorter-array.c (esa_sort):
-	Use g_qsort_with_data() instead of e_sort().
-
-	* e-util.[ch]:
-	Some cosmetic cleanups.
-	Remove some unused or redundant symbols:
-		E_MAKE_X_TYPE
-		GET_STRING_ARRAY_FROM_ELLIPSIS
-		GET_DUPLICATED_STRING_ARRAY_FROM_ELLIPSIS
-		E_OBJECT_CLASS_ADD_SIGNALS
-		E_OBJECT_CLASS_TYPE
-		e_strdup_strip()
-		e_free_object_list()
-		e_free_object_slist()
-		e_free_string_list()
-		e_free_string_slist()
-		e_read_file()
-		e_write_file_mkstemp()
-		e_read_uri()
-		e_strsplit()
-		e_create_directory()
-		e_sort()
-		e_strdupv()
-
-	* e-util.c (e_format_number), (e_format_number_as_float):
-	e_free_string_list() is dead; just do it manually.
-
-	* e-icon-factory.c:
-	Use GtkIconTheme instead of GnomeIconTheme.
-	Use GStaticMutex instead of pthread_mutex_t.
-	Allocate icons with GSlice.
-
-	* e-xml-utils.c:
-	Include missing header file(s).
-
-	* e-dialog-widget.c:
-	Drop support for GnomePropertyBox; nothing uses it.
-
-	* e-dialog-widget.c (e_dialog_dateedit_get):
-	Use gnome_date_edit_get_time() instead of gnome_date_edit_get_date().
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-	* e-util.c: Remove e_gettext().
-
-	* e-xml-utils.c (e_xml_get_child_by_name_by_lang_list): Use
-	g_get_language_names() instead of gnome_i18n_get_language_list().
-
-	* Makefile.am: Remove e-i18n.h.
-
-2007-03-01  Tor Lillqvist  <tml@novell.com>
-
-	* e-print.c (print_dialog_response)
-	(e_print_get_dialog_with_config): Bypass the body of these
-	functions on non-G_OS_UNIX for now as they use
-	gtk_print_unix_dialog_get_settings(). Gtk printing on Win32 needs
-	work.
-
-2007-02-27  Jeff Cai <jeff.cai@sun.com>
-
-	* e-mktemp.c: (get_dir):
-	Use g_build_filename to get the tempoary directory name.
-	Fix #399307
-
-2007-02-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Print settings revamp from Matthew Barnes
-
-	* e-print.c: (pack_settings), (unpack_settings),
-	(e_print_load_settings), (e_print_save_settings),
-	(print_dialog_response), (e_print_get_dialog):
-	* e-print.h:
-
-2007-01-27  Andre Klapper  <a9016009@gmx.de>
-
-	* e-html-utils.c: (e_text_to_html_full):
-	identify "sip:" URL's. Fixes bug #396543.
-
-2007-01-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** GtkPrint API migration from Ebby Wiselyn.
-
-	* e-print.c: (e_print_load_config), (e_print_save_config),
-	(print_dialog_response), (e_print_get_dialog),
-	(e_print_get_dialog_with_config):
-	* e-print.h:
-
-2006-11-28  Daniel Gryniewicz <dang@gentoo.org>
-
-	** Fix for bug #349966 
-
-	* e-dialog-utils.c: (save_ok), (filechooser_response),
-	(e_file_dialog_save), (save_folder_ok), (folderchooser_response),
-	(e_file_dialog_save_folder), (e_file_get_save_filesel),
-	(e_file_can_save), (e_file_check_local):
-	* e-dialog-utils.h:
-	* e-util.c: (e_file_update_save_path), (e_file_get_save_path):
-	* e-util.h:
-
-2006-11-20  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-icon-factory.c: (load_icon), (e_icon_factory_get_icon):
-	Remove unreachable code and fix the leak of basename.
-
-2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #352450
-
-	* e-cursor.c:
-	Replace deprecated GDK function call.
-
-2006-09-07  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am (ruledir): Define ruledir here, too, like in
-	addressbook/gui/widgets/Makefile.am, as we use it in
-	SEARCH_RULE_DIR for the benefit of e-win32-reloc.c. Fixes the
-	Win32-specific problem "eab-widgets-WARNING **: Could not load
-	addressbook search; no parts". (#348419)
-
-2006-08-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #352941
-
-	* e-util.c: (e_write_file_uri): Allow files to be overwritten.
-
-2006-08-24  Tor Lillqvist  <tml@novell.com>
-
-	* e-util.h: Include <cairo.h>, not <cairo/cairo.h>.
-
-2006-08-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #349310. Patch from both Laurent Goujon
-	and Pavel Roskin.
-	
-	* e-util.h: Added function declaration for get_font_options.
-
-2006-08-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-util.c: (get_font_options): Plug some leaks.
-
-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
-	localedir's prefix from the plugin's .eplug file matches
-	Evolution's compile-time prefix, replace it with the run-time
-	prefix (installation directory).
-
-2006-06-09  Chris Heath <chris@heathens.co.nz>
-
-	* e-plugin.c (ep_construct): Fix memory leak.
-	Fixes bug #335423.
-
-2006-06-08  Gary Coady  <garycoady@ubuntu.com>
-
-	* e-i18n.h: Use the correct gettext domain for translations.
-	Fixes bug #333003. (Committed by Andre Klapper)
-
-2006-06-02  Tor Lillqvist  <tml@novell.com>
-
-	* e-util.c: Don't need the Win32-only fix_percent_l() after all,
-	this is taken care of in e_strftime(). (The check in e-d-s's
-	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:
-	(e_text_event_processor_emacs_like_event):
-	Handle SUN Type 6 keyboard's copy, paste and cut key.
-	Fix #271661.
-
-2006-03-27  Tor Lillqvist  <tml@novell.com>
-
-	* e-util.c (fix_percent_l): [Win32] Instead of %l (which is a GNU
-	extension not implemented in the Microsoft C library) use %I.
-	Fixes #336055.
-	(e_strftime_fix_am_pm): Call fix_percent_l() when necessary.
-
-2006-02-12  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* e-error.c (e_error_newv): 
-	Removing unnecessary markup in translateable string.
-	Fixes part of bug #272789.
-
-2006-02-09  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-bconf-map.c: Upstreaming Olaf Hering's patch
-	to use signed chars. 
-
-2006-02-08  Kjartan Maraas <kmaraas@gnome.org>
-
-	* e-config.c: Use guint for 1-bit bitfield.
-	* e-icon-factory.c: (load_icon): Remove unused var
-	* e-import.c: (ep_init), (ep_finalise): Remove unused vars
-	* e-plugin.c: (e_plugin_register_type): Rename a var
-	* e-plugin.h: guint for 1-bit bitfield
-	* e-popup.c: (ep_finalise): Add comment.
-	* e-profile-event.c: Remove unused prototype
-	* e-text-event-processor-emacs-like.c: 
-	(e_text_event_processor_emacs_like_event): Add comment about
-	a compiler warning from the Intel compiler.
-
-2006-02-07  Benjamin Berg  <benjamin@sipsolutions.net>
-	* e-gui-utils.c:
-	* e-icon-factory.c:
-	accept SVGs for stock icons. Fixes bug 304417.
-
-2006-01-11  Harry Lu  <harry.lu@sun.com>
-
-	* e-marshal.list: removed.
-
-2006-01-11  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* e-menu.c: Fixes a build break. Replace the 
-	libedataserver/e-util.h with libedataserver/e-data-server-util.h.
-
-2006-01-10  Simon Zheng  <simon.zheng@sun.com>
-
-	* e-mktemp.c (get_dir):
-	* e-plugin.c:
-	* e-util.[ch] (e_create_directory):
-	(e_sort):
-	Delete e_mkdir_hier(), and use e_util_mkdir_hier() 
-	instead of it.
-
-	Delete e_strstrcasea(), and use e_util_strstrcase() 
-	instead of it.
-
-	Delete e_strftime(), use the copy in evolution-data-server/
-	libedataserver/e-data-server-util.c instead of it.
-
-	Delete e_filename_make_safe(), and use the copy in 
-	evolution-data-server/libedataserver/e-data-server-util.c
-	instead of it.
-
-	Detelte e_utf8_strftime(), and use the copy in 
-	evolution-data-server/libedataserver/e-data-server-util.c
-	instead of it.     
-
-2006-01-06  Simon Zheng <simon.zheng@sun.com>
-
-	* e-account.[ch], e-account-list.[ch]: removed. 
-	Merged to evolution-data-server/libedataserver/.
-	* Makefile.am: remove above files from list.
-
-2006-01-05  Tor Lillqvist  <tml@novell.com>
-
-	* e-plugin.c (epl_construct)
-	* e-menu.c (emph_construct_menu): [Win32] The interface of
-	e_util_replace_prefix() changed a bit.
-
-2006-01-02  Tor Lillqvist  <tml@novell.com>
-
-	* e-menu.c (emph_construct_menu): Don't eventually free a return
-	value from xmlGetProp() with g_free(). g_strdup() it first, and
-	xmlFree() what xmlGetProp() returned.
-
-	On Win32, replace a configure-time prefix of the ui file with the
-	run-time one.
-
-2005-12-19  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	committing for David Trowbridge <trowbrds cs colorado edu>
-
-	* e-dialog-widgets.[ch]	(e_dialog_combo_box_set), 
-	(e_dialog_combo_box_get): Added	new functions to get/set
-       	combox values.
-
-2005-12-18  Tor Lillqvist  <tml@novell.com>
-
-	* e-dialog-utils.c (e_file_dialog_save_folder): Silence unused
-	variable warning.
-
-2005-12-17  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am (INCLUDES): Don't need EXTRA_GNOME_CFLAGS or
-	GNOME_FULL_CFLAGS.
-
-	* e-error.c
-	* e-fsutils.c
-	* e-icon-factory.c
-	* e-mktemp.c
-	* e-plugin.c: Use GLib API where applicable for portability.
-
-	* e-error.c
-	* e-folder-map.c
-	* e-pilot-map.c
-	* e-plugin.c: Use e_xml_parse_file() and e_xml_save_file()
-	instead of using libxml directly.
-
-	* e-plugin.c: Add copyright header.
-	(epl_construct): [Win32 only:] Remap the plugin location from the
-	compile-time path to to a run-time path, to handle the common case
-	where the location in the .eplug file is in Evo's compile-time
-	prefix. Use libedataserver's e_util_get_prefix() and
-	e_util_replace_prefix(). We could alternatively use relative paths
-	in the .eplug files on Win32, like we do for .server files.
-
-	* e-util-private.h (fsync)
-	* e-util.c: Don't bother with a Win32 implementation of fsync() as
-	the uses of fsync() in evo are pretty irrelevant. Just #define
-	fsync() away on Win32.
-
-	* e-xml-utils.c (e_xml_get_child_by_name, e_xml_save_file): Remove
-	these functions that are now in libedataserver/e-xml-utils.c
-
-	* eggtrayicon.c: For building on Win32 against GTK+ 2.8, include a
-	copy of the GtkStatusIcon code from GTK+ HEAD (i.e., what will be
-	GTK+ 2.10) and some helper functions from gdk/win32. Eventually
-	when GTK+ 2.10 is released and Evo no longer needs to support
-	older GTK+ versions, eggtrayicon.[ch] can be removed completely
-	from here, as the use of eggtrayicon in ../calendar/gui/
-	alarm-notify/alarm-queue.c will automatically switch to using
-	GtkStatusIcon instead.
-
-	* eggtrayicon.h: Ditto, for building on Win32 against GTK+ 2.8,
-	include a copy of gtkstatusicon.h from GTK+ HEAD.
-
-2005-12-12  Irene Huang <Irene.Huang@sun.com>
-
-	reviewed by: Veerapuram Varadhan  <vvaradhan@novell.com>
-	
-	* Makefile.am: Remove files that have an identical counterpart in
-	libedataserver, e-list.[c|h], e-list-iterator.[c|h], e-iconv.[c|h]
-	e-component-listener.[c|h], md5-utils.[c|h], e-time-utils.[c|h],
-	e-uid.[c|h]. Change md5-utils.h to e-html-utils.h in pilot-compile.
-	* e-component-listener.c:
-	* e-component-listener.h: 
-	* e-iterator.c:
-	* e-iterator.h:
-	* e-time-utils.c:
-	* e-time-utils.h:
-	* e-iconv.c:
-	* e-iconv.h:
-	* e-uid.c:
-	* e-uid.h:
-	* md5-utils.c:
-	* md5-utils.h:
-	* e-list-iterator.h:
-	* e-list-iterator.c:
-	* e-list.h:
-	* e-list.c: 
-	Removed
-	* e-account-list.h:
-	* e-account.c:
-	* e-signature-list.c:
-	* e-signature.c:
-	* e-signature-list.h: Change inclusion of <e-util/e-list.h>
-	to <libedataserver/e-list.h>. Change inclusion of "e-uid.h" and
-	"e-list.h" to <libedataserver/e-uid.h> and <libedataserver/e-list.h>.
-
-2005-12-09  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-util.[ch] (e_str_compare), (e_str_case_compare),
-	(e_collate_compare), (e_int_compare): prefix the wrapper 
-	functions with e - do not use g lest it is assumed to 
-	be a glib function.
-
-2005-11-26  Tor Lillqvist  <tml@novell.com>
-
-	* e-dialog-utils.c
-	* e-gtk-utils.c: Conditionalize X11 specific code on GDK_WINDOWING_X11.
-
-	* e-menu.c (emph_construct_menu): Use g_get_tmp_dir() instead of
-	hardcoding /tmp.
-
-	* e-util.c (e_strstrcase): Use g_ascii_strncasecmp() instead of
-	the deprecated g_strncasecmp(). What kinds of strings this
-	function is supposed to be used on (UTF-8 or some random single-
-	or multi-byte encoding) is anybody's guess. This function isn't
-	used in Evolution and should probably go away, though. And this is
-	one of the files that have a partially duplicated copy in
-	e-d-s/libedataserver, too, so doubly so.
-	(e_filename_make_safe): Mark more bytes as unsafe on Win32. Add
-	comments. This function is really under-specified and weird, one
-	wonders whether it really does what the author thought it should
-	do.
-	(fsync): Add Win32 implementation of fsync().
-	
-	* e-xml-utils.c (e_xml_get_bool_prop_by_name_with_default): Use
-	g_ascii_strcasecmp() instead of the deprecated g_strcasecmp(),
-	especially as we are comparing to literal ASCII strings.
-
-2005-11-25  Tor Lillqvist  <tml@novell.com>
-
-	* e-util-private.h: Sort the stuff in the Win32 part for
-	clarity. Add some new run-time overrides for compile-time
-	paths. Include fcntl.h and define O_BINARY as zero if not defined
-	(on Unix).
-
-	* e-win32-reloc.c: Sort here, too, and add the implementation for
-	the new run-time overrides.
-
-	* Makefile.am: Ditto here. Link with INTLLIBS.
-
-2005-11-09  P. S. Chakravarthi <pchakravarthi@novell.com>
-
-	Fixes #314638
-	* e-categories-config.c (e_categories_config_get_icon_for):
-	added a g_object_unref to unref the GdkPixBuff object
-	created in this function.
-
-2005-10-18  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-dialog-utils.c: (save_ok), (e_file_dialog_save),
-	(save_folder_ok), (folderchooser_response),
-	(e_file_dialog_save_folder): Shows the default file name in the
-	save file dialog. Added code to choose folder to save multiple
-	attachments
-	* e-dialog-utils.h: Added an additional parameter to e_file_dialog_save.
-
-2005-10-04  Devashish Sharma  <sdevashish@novell.com>
-
-	* e-util.c (g_str_case_compare): added a function for case insensitive
-	and locale sensitive UTF8 string compare. See #207110.
-
-2005-09-28  Tor Lillqvist  <tml@novell.com>
-
-	* e-html-utils.c (e_text_to_html_full): Use g_ascii_strncasecmp()
-	instead of strncasecmp(). We are comparing to literal ASCII
-	strings, just casefolding ASCII is enough. Also better for
-	portability.
-
-	* e-profile-event.c (e_profile_event_target_new): Use
-	g_get_current_time() instead of gettimeofday() for portability.
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-util.c (e_mkdir_hier): cast warning, good ol win32 patches.
-	(e_strftime): fix some clahey-code to use the right variable and
-	not try to modify const strings by stealth.
-
-	* eggtrayicon.h: add missing prototype.
-
-	* e-gui-utils.c (e_create_image_widget): remove unused pixbuf.
-
-	* e-dialog-utils.c (dialog_realized): fix cast.
-	(e_dialog_set_transient_for_xid): same.
-	(e_file_dialog_save): fix cases for build.
-
-	* e-categories-config.c
-	(e_categories_config_open_dialog_for_entry): cast & use right type
-	for text.
-	(icons_table[]): remove unused.
-
-	* e-account-list.c (e_account_list_remove_account_proxies): cast
-	to fix warning.
-
-2005-08-18  David Malcolm  <dmalcolm@redhat.com>
-
-	* e-plugin.c (ep_set_enabled): Fix compiler warning on early bailout
-
-2005-08-18  Tor Lillqvist  <tml@novell.com>
-
-	* e-iconv.c (e_iconv_init): Use g_get_charset() on Win32 to get
-	locale charset. Free return value from g_win32_getlocale().
-
-2005-08-10  Tor Lillqvist  <tml@novell.com>
-
-	* e-xml-utils.c (e_xml_get_child_by_name_by_lang): Use
-	g_win32_getlocale() to get locale on Win32. (setlocale() returns
-	strings like "Swedish_Finland.1252", we want the Unixish "sv_FI"
-	style.) Fix typo, use the lang parameter and not "lang" string
-	literal.
-
-	* Makefile.am: Use privsolib instead of privlib. On Unix they are
-	the same, on Win32 privsolibdir is the same as libdir.
-	(INCLUDES): Pass also EVOLUTION_SYSCONFDIR, EVOLUTION_DATADIR,
-	EVOLUTION_LIBDIR, EVOLUTION_LIBEXECDIR and EVOLUTION_SOUNDDIR so
-	that the Win32 run-time path lookup code in e-win32-reloc.c can
-	handle them, too.
-
-	* e-win32-reloc.c: Handle also the above, and the bare PREFIX.
-
-	* e-util-private.h: Ditto here. (PREFIX, SYSCONFDIR, DATADIR and
-	LIBDIR without the EVOLUTION_ prefix, as that is how they are to
-	be used, cf. gnome-program.h.) Also EVOLUTION_ETSPECDIR.
-
-2005-07-11 Vivek Jain <jvivek@novell.com>
-	
-	* e-config.c: (e_config_target_changed):
-	added a idle handler that calls ec_rebuild after callback operations
-	are completed.
-	**Fixes #307794
-	
-2005-07-10  Shreyas Srinivasan
-
-	* e-util/e-account.[ch]: Add structures to handle proxies.
-	* e-util/e-account-list.[ch]: Add functions to remove proxy
-	accounts and account's proxies.
-	
-2005-07-06  Not Zed  <NotZed@Ximian.com>
-
-	* e-import.c (e_import_status): added callback for importers to
-	report status.
-	(e_import_cancel): added function for driver to abort an import.
-	(eih_cancel): implemented for hook.
-
-2005-07-05  Not Zed  <NotZed@Ximian.com>
-
-	* e-import.c: cleaned up/finished api.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am (WIN32_BOOTSTRAP_LIBS): Use bootstrap library for
-	libemisdwidgets. Code here uses e_utf8_to_locale_string() from
-	libemiscwidgets which hasn't been built yet if building from
-	scratch.
-	(INCLUDES) Remove GAL_IMAGESDIR, unused leftover. Add the
-	definitions of EVOLUTION_GLADEDIR, EVOLUTION_HELPDIR,
-	EVOLUTION_ETSPECDIR, SEARCH_RULE_DIR and EVOLUTION_GALVIEWSDIR
-	(for e-win32-reloc.c). Remove undefined GNOME_INCLUDEDIR.
-	(libeutil_la_LDFLAGS, libeconduit_la_LDFLAGS): Use NO_UNDEFINED.
-	(libeutil_la_LIBADD, libeconduit_la_LIBADD): Link with necessary
-	libs.
-
-	* e-win32-reloc.c: Update now that it is here in evolution. Use _e
-	prefix instead of _gal. Add getters for more run-time paths.
-
-	* e-util-private.h: Corresponding changes.
-
-2005-06-08  Srinivasa Ragavan <sragavan@novell.com>
-	* e-cursor.[ch]: Added functions to show busy cursor.
-	* Makefile.am: Add the files
-
-2005-05-25  Not Zed  <NotZed@Ximian.com>
-
-	* e-plugin-mono.[ch]: Removed, these are now implemented as a
-	plugin.
-
-	* e-plugin.c (ep_load_plugin): separate out plugin xml loading
-	code from the loading loop.  If a plugin type doesn't exist, then
-	save it in a list for later checking.
-	(ep_load): call above to do the work.
-	(e_plugin_register_type): check the pending doc list, if any
-	plugins now have a type, load them.
-	(e_plugin_type_hook_get_type): a plugin hook for registering new
-	plugin types ('loaders') at runtime.
-
-2005-05-19  Not Zed  <NotZed@Ximian.com>
-
-	* e-import.[ch]: Initial, and un-finished work on importer plugin
-	hooks.
-
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: added e-error.[ch], removed e-error-tool, and added
-	e-system.error.xml
-
-2005-05-13  Not Zed  <NotZed@Ximian.com>
-
-	* e-popup.c (emph_popup_factory): if we have a factory method
-	supplied, call that as well.  More flexible popup building.
-	(emph_construct_menu): load factory def.
-
-2005-05-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-profile-event.c (e_profile_event_emit): undefine
-	e_profile_event_emit if we are compiled without profiling.  The
-	'abi' is not, nor was ever changed.
-
-	* e-profile-event.h: revert previous patch, the assumptions were
-	incorrect & the code misunderstood.
-
-2005-05-02  Rodney Dawes  <dobey@novell.com>
-
-	* e-profile-event.h (e_profile_event_emit): This method is a no-op if
-	we are building without ENABLE_PROFILE defined, so we don't need to
-	define a macro to no-op it, and change ABI at compile time
-	
-2005-04-28  Not Zed  <NotZed@Ximian.com>
-
-	* e-profile-event.[ch]: A profiling plugin hook.
-
-2005-04-27  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* e-config.c: (e_config_create_window):
-	We should set the title of the window.
-
-	Fixes #300477
-
-2005-03-14  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #73550 (related for config pages)
-
-	* e-config.c (ech_config_widget_factory): if we are disabled, then
-	noop.
-	(ech_config_factory, ech_commit, ech_abort): same.
-
-2005-03-01  Not Zed  <NotZed@Ximian.com>
-
-	* *.c: Remove/disable debug.
-
-2005-02-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* Makefile.am (eutilinclude_HEADERS)
-	(libeutil_la_SOURCES): Remove e-passwords from here, it now
-	lives in libedataserverui.
-
-	* e-passwords.[ch]: Removed.
-
-2005-02-10  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #61363 & mail/ChangeLog
-
-	* e-config.c (ec_rebuild): work properly if the page factory
-	returns NULL, so the code can selectivly turn off pages.
-	(ec_druid_next, ec_druid_prev): skip non-created pages.
-
-	* e-config.c (ec_rebuild): re-order notebook child properly.
-	Connect to destroy events so we update the widget-node widget
-	pointer properly for linked ui reconfigures.
-
-2005-02-17  Not Zed  <NotZed@Ximian.com>
-
-	* e-popup.c (ep_prune_tree, ep_build_tree, e_popup_create_menu):
-	completely rewritten.  Simpler and more robust.
-
-2005-02-16  Not Zed  <NotZed@Ximian.com>
-
-	* e-popup.c (e_popup_create_menu): do the visibility mask test
-	before sorting.  don't perform it on bar's or submenu's anymore,
-	calculate when not to show/create them.
-
-2005-02-14  Rodney Dawes  <dobey@novell.com>
-
-	* e-menu.c (emph_construct): If the plug-in is not enabled, do nothing
-
-2005-02-07  Not Zed  <NotZed@Ximian.com>
-
-	* e-popup.c (emph_construct_menu):
-	* e-menu.c (emph_construct_menu):
-	* e-config.c (emph_construct_menu): Don't let the 'id' field,
-	which identifies the target menu/whatever, to be NULL, otherwise
-	it gets added to all.
-
-2005-02-04  Rodney Dawes  <dobey@novell.com>
-
-	* e-passwords.c (ep_ask_password): Set the border widths for the
-	dialog containers to be HIG compliant
-	Fix the padding/spacing on the internal vbox to be HIG compliant
-
-2005-01-27  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* e-request.c: (e_request_string):add a11y description for the
-	entry.
-
-2005-01-26  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-config.c (ech_check): If the plugin isn't enabled, return TRUE
-	so that the suer doesn't get locked in one of the account druid
-	pages.
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #46404
-	
-	* Makefile.am: build new files
-
-	* e-print.[hc]: print related config and dialog routines
-
-2005-01-17  Rodrigo Moya <rodrigo@novell.com>
-
-	* e-url.[ch]:
-	* Makefile.am: removed e-url.[ch], which are now in libedataserver.
-
-2005-01-08  Not Zed  <NotZed@Ximian.com>
-
-	* e-url.c (e_url_shroud): dont' use '%.*s' for truncating string
-	output.
-
-2005-01-09  JP Rosevear  <jpr@novell.com>
-
-	* e-url.c (e_uri_new): fix parsing of query string
-
-2005-01-07  Rodrigo Moya <rodrigo@novell.com>
-
-	* e-categories-config.c (e_categories_config_open_dialog_for_entry):
-	set the dialog's parent.
-
-2005-01-07  Rodrigo Moya <rodrigo@novell.com>
-
-	* e-categories-config.c (e_categories_config_open_dialog_for_entry):
-	use the new ECategoriesDialog in libedataserverui.
-
-2005-01-06  Rodney Dawes  <dobey@novell.com>
-
-	* e-config.c (e_config_create_window): Add the GTK_DIALOG_NOSEPARATOR
-	flag, and set appropriate border widths around the main dialog vbox,
-	and action area, to be more HIG compliant
-
-2005-01-06  JP Rosevear  <jpr@novell.com>
-
-	* e-error-tool.c (main): use the base name only, so if a full path
-	is passed to us we still write out to the current directory, for
-	when builddir != srcdir
-	
-2005-01-04  Rodrigo Moya <rodrigo@novell.com>
-
-	* e-categories-config.[ch]: removed most of the API. The rest will
-	be removed as the GAL dependencies are sorted out.
-
-2004-12-22  Not Zed  <NotZed@Ximian.com>
-
-	* e-plugin.c: include config.h.
-
-2004-12-17  Not Zed  <NotZed@Ximian.com>
-
-	* e-popup.c (e_popup_add_items): add a translation domain to api.
-	(e_popup_create_menu): translate the label using the supplied
-	domain.
-	(emph_popup_factory): pass domain to popup_add_items.
-
-	* e-plugin.c (ep_construct): if we have a localedir set, then
-	bindtextdomain so gettext can find it.
-
-2004-12-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #30992
-	
-	* e-config.c (e_config_create_window): use cancel rather than
-	close button
-
-2004-12-21  JP Rosevear  <jpr@novell.com>
-	
-	* e-account.c: convert to G_DEFINE_TYPE
-
-	* e-account-list.c: ditto
-	
-2004-12-08  Not Zed  <NotZed@Ximian.com>
-
-	* e-plugin.c (e_plugin_load_plugins): kill warning if we can't
-	open the path.
-
-2004-12-06  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (ec_rebuild): set the table spacings to 6 for
-	generated tables.
-
-2004-11-22  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (ec_rebuild): if the table existed before and we have
-	no factory, destroy it always.
-
-2004-12-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (ec_rebuild): revert the patch from chenthill, this
-	wont work yet.
-
-2004-11-29  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* e-config.c: (ec_rebuild):add mnemonic for label.
-	* e-passwords.c: (ep_ask_password):add description for password dialog.
-
-2004-11-26  JP Rosevear  <jpr@novell.com>
-
-	* e-gui-utils.c (e_create_image_widget): get the image directly
-	from the icon factory
-
-	* e-config.c: insert debug defines so we can
-	turn spew on and off
-
-	* e-event.c: insert debug defines so we can turn spew on and off	
-
-	* e-menu.c: insert debug defines so we can turn spew on and off		
-	
-	* e-plugin.c: insert debug defines and set to off for now
-
-	* e-popup.c: insert debug defines so we can turn spew on and off
-	(e_popup_create_menu): get the image directly from the icon
-	factory
-
-2004-11-26  JP Rosevear  <jpr@novell.com>
-	
-	* e-icon-factory.h: add proto
-
-	* e-icon-factory.c (e_icon_factory_init): cast to kill warning
-	(e_icon_factory_get_image): new function to return a GtkImage
-	widget give an icon name and size
-
-2004-11-25  Chenthill Palanisamy <pchenthill@novell.com>
-
-	* e-config.c (ec_rebuild): Set the row and column spacings as
-	tweleve while creating the table to make it HIG compliant.
-       	
-2004-11-19  Not Zed  <NotZed@Ximian.com>
-
-	* e-plugin.c (ep_load): if the plugin fails to load just disable
-	it, don't unref it (it may be referenced elsewhere).
-
-2004-11-18  Not Zed  <NotZed@Ximian.com>
-
-	* e-plugin.c (epl_loadmodule): split out module loadng code.
-	(epl_construct): if we're enabled, and load-on-startup is set,
-	load the module right away.  Not to be abused!
-
-2004-11-16  Not Zed  <NotZed@Ximian.com>
-
-	* e-host-utils.[ch]: removed, code moved into
-	camel-net-utils.[ch].
-
-2004-11-15  Not Zed  <NotZed@Ximian.com>
-
-	* e-trie.[ch], e-memory.[ch], e-sexp.[ch], e-msgport.[ch]: Moved
-	to eds/libedataserver.
-
-	* e-path.[ch]: removed & deleted.
-
-2004-11-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-plugin.c (e_plugin_list_plugins): added helper api to list all
-	plugins.
-	(ep_construct): load authors into new list for them.
-	(e_plugin_register_type): setup disabled list.
-	(ep_construct): dont load the hooks if we're not enabled.
-	(e_plugin_enable): make this a virutal method.
-	(e_plugin_invoke): if we're disabled, noop.
-
-2004-11-01  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #68787
-
-	* e-account.c (xml_set_content): check the new val isn't null
-	before dereferencing it.
-	* e-account.c (xml_set_prop): same here.
-
-2004-10-28  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (ec_rebuild): revert the last change.
-
-2004-10-28  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (ec_rebuild): set the default row/col spacings of the
-	table.
-
-2004-10-20  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (ec_rebuild): check for empty trailing sections/pages
-	after we exit the main loop.
-
-	* e-plugin.c (e_plugin_get_type): make ~/.eplugins the default
-	eplugin location, not ~/.eplug.
-
-2004-10-18  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.h: fix some forward decls.
-
-2004-10-19  JP Rosevear  <jpr@novell.com>
-
-	* e-config.c, e-event.c, e-menu.c, e-plugin.c, e-plugin.h,
-	e-popup.c: convert to org.gnome hook names
-
-2004-10-07  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-passwords.c (ep_ask_password): Use "%s" as the formatter
-	argument and msg->prompt as a printf-style argument rather than
-	using it as the format string. Fixes bug #67622.
-
-2004-10-12  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (ech_check, ech_config_factory, emph_construct_menu):
-	setup a "check" handler, page-check/validation callback.
-
-	* e-popup.c (e_popup_new): new method to create a targetless popup
-	menu.
-
-2004-10-08  JP Rosevear  <jpr@novell.com>
-
-	* e-plugin.c (ep_load): fix typo
-
-2004-10-08  Not Zed  <NotZed@Ximian.com>
-
-	* e-plugin.c (ep_load): handle wrong root element properly.  From
-	David Trowbridge <David.Trowbridge@Colorado.edu>
-
-2004-10-07  Not Zed  <NotZed@Ximian.com>
-
-	* e-plugin.h: Fix the function pointer types!
-
-	* e-plugin.c (epl_invoke): noop if we're disabled, and do some
-	lifecycle stuff now, call e_plugin_lib_enable on the module if it
-	exists.
-
-2004-10-07  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (ec_rebuild): show the toplevel notebook if we
-	had to create one, always.
-
-	* e-menu.c (e_menu_add_items): initialise node->menu properly.
-
-	* e-plugin.c (ep_load): read/initialise a unique id for all
-	plugins and track them in a hashtable.
-	(ep_construct): refactor so we have more control over what
-	happens.  if the hook handling class isn't registered yet, just
-	note it and keep going.
-	(e_plugin_hook_new): remove this, its handled internally by above.
-
-2004-10-06  Not Zed  <NotZed@Ximian.com>
-
-	* e-popup.c (e_popup_create_menu): only take one mask parameter,
-	and implement EPopupItem->enable to do what the other mask did.
-	(ep_activate): if this is a toggle or radiobutton, set the active
-	state on the item->type.
-	(e_popup_create_menu): if a menu image starts with gtk-, then
-	assume it is a gtk stock image instead.
-
-2004-08-27  Not Zed  <NotZed@Ximian.com>
-
-	* e-passwords.c (e_passwords_ask_password): return cancelled if
-	we're in an offline state.
-
-2004-08-26  Rodrigo Moya <rodrigo@novell.com>
-
-	* eggtrayicon.[ch]: updated from libegg.
-
-2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* e-dialog-utils.c: (e_notice):
-	* e-passwords.c: (ep_ask_password):
-	Don't call gtk_dialog_set_has_separator on Gtk Message Dialog 
-	with GTK+ >= 2.4.0.
-
-2004-08-13  Rodrigo Moya <rodrigo@novell.com>
-
-	* e-categories-config.c: include gtkdialog.h rather than gnome-dialog.h.
-
-2004-08-12  Carlos Garnacho Parro  <carlosg@gnome.org>
-
-	* e-dialog-utils.c: Optionally use GtkFileChooser if compiled
-	against Gtk+ >= 2.4.0
-
-2004-08-10  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #61840, and others.
-
-	* e-passwords.c: Lots of changes.  The api is now fully
-	multi-thread safe, all calls are serialised internally, even
-	recursive main-loop calls.  Small api changes to the
-	ask_password call to add some new features required by the mailer
-	and to clean up some of the names.
-	(e_passwords_cancel): new procedure to cancel any outstanding
-	password requests, for when we need to go uninteractive.
-
-2004-08-09  Rodney Dawes  <dobey@novell.com>
-
-	* e-icon-factory.c (icon_foreach_remove): We must return TRUE here
-	so that things actually get removed from the list
-
-2004-08-07  ERDI Gergo  <cactus@cactus.rulez.org>
-
-	* e-account.h: Added new receipt_policy field to services
-
-2004-08-05  Rodrigo Moya <rodrigo@novell.com>
-
-	* e-icon-factory.c (e_icon_factory_init): connect to "changed"
-	signal on the GnomeIconTheme object.
-	(icon_theme_changed_cb): g_hash_table_foreach_remove all items in the
-	hash table.
-	(icon_foreach_remove): callback for removing hash table items.
-
-2004-08-05  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #62030
-
-	* e-icon-factory.c (load_icon): get the icon_key as a new argument
-	and use that in the call to icon_new().
-	(e_icon_factory_get_icon): pass icon_key to load_icon().
-	(e_icon_factory_get_icon_list): ditto.
-
-2004-08-01  JP Rosevear  <jpr@novell.com>
-
-	* e-pilot-util.c (e_pilot_get_sync_source): find the source with
-	the pilot-sync property
-	(e_pilot_set_sync_source): give the source the pilot-sync property
-	and make sure its the only one
-
-	* e-pilot-util.h: add prototypes
-
-	* Makefile.am (eutilincludedir): don't build pilot settings
-
-2004-07-20  Not Zed  <NotZed@Ximian.com>
-
-	* e-dialog-utils.c: include config.h.  See #61395.
-
-2004-07-12  Dan Winship  <danw@novell.com>
-
-	* e-mktemp.c (e_mktemp, e_mkdtemp): un-const the return values,
-	since they need to be freed
-	(d): turn off debugging
-	(expire_dir_rec): remove debug printfs
-
-2004-08-24  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: define EVOLUTION_PLUGINDIR
-
-	* e-plugin.c (e_plugin_get_type): add both a global and user
-	specifc eplug path as defaults
-	(e_plugin_load_plugins): just skip a directory if it can't be
-	opened
-
-2004-09-10  Not Zed  <NotZed@Ximian.com>
-
-	* e-popup.c (emph_construct_menu): duh, setup the hook pointer.
-
-	* e-menu.c (e_menu_add_items): pass pixmaps and ui files to this
-	function now.
-	(e_menu_add_pixmap): removed, covered by above.
-	(e_menu_add_ui): removed, covered by above.
-	(emph_construct_menu): setup the hook pointer properly.
-
-	* e-menu.h: moved the pixmap and ui file structures to be public,
-	removed hte hook equivalents.
-
-2004-09-09  Not Zed  <NotZed@Ximian.com>
-
-	* e-event.c (e_event_remove_items): implement a remove function.
-	(e_event_add_items): return a handle to pass to above.
-	(emph_event_handle): noop if we're disabled.
-
-	* e-popup.c (emph_popup_factory): noop if the
-	plugin is disabled.
-
-	* e-plugin.c (ep_init): setup an enabled bit for the plugin.
-	Preliminary work on being able to manage plugins.
-	(e_plugin_hook_enable): set hook enable state.
-	(e_plugin_enable): set plugin enable state.
-
-2004-09-07  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (ec_rebuild): pass the right old widget to the page
-	factory.
-	(ec_widget_destroy): unref the config and the target when done.
-	(e_config_create_widget): force the notebook to page 0, workaround
-	some other bug i don't understand.
-	(e_config_create_window): set dialog hint on druid.
-
-2004-09-06  Not Zed  <NotZed@Ximian.com>
-
-	* e-account.c (e_account_import): emit a changed event on the dest.
-	(e_account_set_from_xml): emit a changed event if we were.
-
-	* e-config.c (ec_rebuild): add a table item for some type-safety.
-	remove/alter the asserts so the code attemps to fail gracefully
-	rather than just fail.
-
-2004-09-01  Not Zed  <NotZed@Ximian.com>
-
-	* e-menu.[ch]:
-	* e-popup.[ch]:
-	* e-config.[ch]:
-	* e-event.[ch]: API syncrhonisation.  Item callbacks now get the
-	root object, the item, and user-supplied data.  Removed
-	now-redundant data and structures. Documentation updates.
-
-2004-08-30  Not Zed  <NotZed@Ximian.com>
-
-	* e-popup.c (emph_construct_item): just build a popupitem
-	directly, use user_data to pass the activate method name.
-
-	* e-popup.h: removed epopuphookitem.
-
-	* e-popup.c (emph_construct_item): dont set hook on hookitem
-	anymore, dont need to set user_data either.
-
-	* e-popup.h: no longer pass parent pointer in EPopupHookItem, its
-	handled by add_items's data now.
-
-	* e-popup.c (ep_finalise): re-arrange and call freefunc with the
-	new args.
-	(e_popup_create_menu): change the activate data so we can pass the
-	new api arguments.
-	(ep_activate): changes for api changes.
-	(emph_popup_factory): no longer takes target arg, taken from the
-	popup, pass the popuphook to the add_items call.
-	(emph_popup_activate): changed for new argument types.
-
-	* e-popup.h: removed popup from epopupitem.
-
-	* e-popup.c (e_popup_add_static_items): make private/rename to
-	ep_add_static_items.
-	(ep_add_static_items): dont pass target, it is set on the epopup
-	structure.
-	(e_popup_add_items): change the freefunc to be an EPopupItemsFunc
-	and add a user-data field, and track the parent epopup.
-
-	* e-popup.h: change the activatefunc to pass the target and data
-	supplied to add_items.
-
-2004-08-25  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (e_config_new): removed, this shouldn't be here for
-	an abstract class.
-	(*): Added doco.
-
-2004-08-24  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (emph_construct_item): translate the label text.
-
-	* e-popup.c (emph_construct_item): translate the label text.
-
-	* e-plugin.c (e_plugin_xml_prop_domain): helper to get a property
-	translated.
-	(ep_construct): translate the name and description based on the
-	new domain tag.  get the description as tag content not property.
-	(e_plugin_xml_content_domain): similar for xml node content.
-
-2004-08-24  Not Zed  <NotZed@Ximian.com>
-
-	* e-account.c (init): setup some defaults for the account.
-
-	* e-config.c (e_config_create_widget): remove target arg actually.
-	(ec_rebuild): add druid page start/end pages.  fixes.
-	(ec_druid_finish, ec_druid_cancel): handle finishing the druid.
-
-2004-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (ec_druid_prepare, ec_druid_prev, ec_druid_next):
-	handle druid navigation.
-
-2004-08-20  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (e_config_target_changed): add 'how' changed arg.
-	(e_config_create_widget): dont take target anymore, set that
-	separately.
-	(e_config_set_target): new virtual method to set the target.
-	(ec_set_target): implementation.
-
-2004-08-19  Not Zed  <NotZed@Ximian.com>
-
-	* e-account.c (e_account_set_bool): only emit changed if it did.
-
-2004-08-17  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (e_config_page_check): fix a past-o.
-	(e_config_target_changed): treat the returned page for a druid
-	page factory as a gnomedruidpagestandard, so get_page works, etc.
-
-2004-08-16  Not Zed  <NotZed@Ximian.com>
-
-	* e-event.[ch]: Added event hook and dispatch router.
-
-2004-08-13  Not Zed  <NotZed@Ximian.com>
-
-	* e-plugin.c (e_plugin_load_plugins): don't take a path, load all
-	paths set.
-	(e_plugin_add_load_path): add a load path to the search path.
-	(e_plugin_get_type): setup the initial load path from environment
-	or defaults.
-	(e_plugin_xml_int): helper to get a prop in int format.
-
-2004-08-11  Not Zed  <NotZed@Ximian.com>
-
-	* e-config.c (e_config_target_changed): handle DRUID root type.
-
-2004-08-05  Not Zed  <NotZed@Ximian.com>
-
-	* e-account.c (class_init): add a changed signal.
-	(e_account_set_string, e_account_set_int, e_account_set_bool):
-	emit changed signal if it did.
-
-	* e-config.c (e_config_add_page_check): add a page verification
-	function.  It will be called for the given page, or all pages, to
-	verify the page contains valid data.
-
-2004-07-29  Not Zed  <NotZed@Ximian.com>
-
-	* e-account.c (e_account_get_string, e_account_get_int) 
-	(e_account_get_bool, e_account_set_string, e_account_set_int) 
-	(e_account_set_bool): implement.  completely table driven.
-
-2004-07-02  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #60691 ]
-	
-	* e-iterator.h: rename the "delete" member to
-	"remove", to fix c++ build.
-
-	* e-iterator.c (e_iterator_delete): same.
-	(e_iterator_class_init): same.
-
-	* e-list-iterator.c (e_list_iterator_class_init): same.
-	(e_list_iterator_remove): same.
-
-2004-06-03  Dan Winship  <danw@novell.com>
-
-	* e-icon-factory.c (load_icon): If the icon_name is an abolute
-	path, just load it.
-	(e_icon_factory_get_icon): Update the docs to reflect that
-
-2004-06-01  Not Zed  <NotZed@Ximian.com>
-
-	* e-fsutils.c (e_fsutils_avail): use statvfs if available.  Should
-	make it actually work, if not portable.  This is for a bug but I
-	can't recall the number.
-
-2004-05-27  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am (dist-hook): Require e-error-tool
-
-2004-05-19  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-icon-factory.c: Lots of re-working action. We no longer load a
-	pixbuf for each and every available size when requesting the icon
-	for the first time, instead we simply load the requested icon of
-	the requested size and cache only that.
-	(e_icon_factory_get_icon): Always return a broken image icon if we
-	fail to load the requested icon.
-	(e_icon_factory_get_icon_list): Only bother with adding icons of
-	the sizes that are suggested by ghe gtk documentation for
-	gtk_window_set_icon_list rather than the sizes of the standard
-	icons (since it isn't the same list of sizes).
-	(load_icon): Fall back to EVOLUTION_ICONSDIR/WWxHH/icon_name if
-	the icon-theme lookup fails. Also now takes a 'scale' argument
-	which, if non-zero, allows us to look for images of the same name
-	with a larger size in order to scale them back down to what we
-	need.
-
-2004-05-19  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-gui-utils.c (e_icon_for_mime_type): We always have
-	GnomeIconTheme nowadays, get rid of the old unused code.
-	(e_create_image_widget): Use E_ICON_SIZE_DIALOG
-
-2004-05-17  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-icon-factory.h (E_ICON_SIZE_LIST/STATUS): New #define aliases
-	for common icon usage cases where it may not be obvious that they
-	are the same size as menu icons.
-
-2004-05-12  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-icon-factory.c (e_icon_factory_shutdown): New function to
-	clean up the cached icons.
-
-2004-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* e-error-tool.c: Tool to do i18n string extraction for error xml
-	files.
-
-2004-05-10  Not Zed  <NotZed@Ximian.com>
-
-	* e-fsutils.c (e_fsutils_usage): new file/function, get disk usage
-	of a path, in 1024 byte blocks.
-	(e_fsutils_avail): new file/function, get disk space available for
-	a given path, in 1024 byte blocks.
-
-	* e-meta.[ch]: Removed.  Poor idea badly executed, and no longer used.
-
-	* e-path.h: add a fixme about deprecation.
-
-2004-04-30  Not Zed  <NotZed@Ximian.com>
-
-	* e-lang-utils.[ch]: Removed.  This is covered by
-	gnome_i18n_get_language_list, which is more complete.
-
-2004-04-30  Dan Winship  <danw@ximian.com>
-
-	* e-icon-factory.c (load_icon): Make this work for non-stock icons
-	too.
-
-2004-04-22  Not Zed  <NotZed@Ximian.com>
-
-	* e-icon-factory.c (e_icon_factory_get_icon_list): make sure we
-	unlock if we fail to find an icon.
-
-2004-04-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-icon-factory.c: Remove the warnings about using E_ICON_SIZE
-	enums.
-
-2004-04-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-icon-factory.c (e_icon_factory_get_icon): Make
-	thread-safe. Fixes a crash I encountered this morning.
-	(e_icon_factory_get_icon_filename): Same.
-	(e_icon_factory_get_icon_list): Here too.
-
-2004-04-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-icon-factory.h: Add an enum for icon sizes (temporarily has
-	absolute pixel sizes assigned to it until I commit
-	e-icon-factory.c changes - but only after all other code has been
-	updated to use the enums).
-
-2004-04-16  Michael Terry  <mike@mterry.name>
-
-	* Makefile.am: Add e-icon-factory.[ch]
-	* e-gui-utils.c: Use the icon theme via EIconFactory
-	* e-icon-factory.[ch]: Move EIconFactory to e-util, and add icon theme
-	support to the object so evolution uses them
-
-2004-04-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-signature-list.c (gconf_signatures_changed): Don't add an
-	autogen signature if the new signature is the autogen signature.
-
-2004-04-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-host-utils.c (e_gethostbyname_r): Implemented a similar
-	workaround to the one I did for a gethostbyaddr_r() glibc bug
-	here. Glibc will apparently return success for addresses such as
-	"192..168.1.1" (note the double dot) and yet not have filled in
-	the hostent properly.
-
-2004-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Really fixes bug #56623
-
-	* e-signature-list.c (gconf_signatures_changed): If we've had to
-	"fix" any signatures by adding a uid, set the resave state on the
-	list (only cared about if this is at initial load time).
-	(e_signature_list_construct): If we've set any uids in
-	signatures_changed(), then save the signature list back out.
-
-2004-04-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-account.c (xml_set_identity): If we fail to set a sig_uid then
-	try to extract the old style signature id and assume the migration
-	code will fix us up (if not, nothing bad will happen anyway).
-
-	* e-signature-list.c (gconf_signatures_changed): If the autogen
-	signature isn't in the list (or isn't the first in the list), add
-	it to the head of the list.
-
-2004-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Probably fixes bug #56623 and others?
-
-	* e-signature-list.c (gconf_signatures_changed): Fixed to not use
-	free'd iter memory. Also reverse the new_sigs list before adding
-	them to the signature list (so they are in the same order they
-	appeared in the gconf key).
-
-2004-04-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-signature-list.c (gconf_signatures_changed): Fixed to not
-	ignore signatures without uids (e.g. signatures that were from
-	prior versions).
-
-2004-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-signature.c (e_signature_to_xml): Always set a format prop so
-	that 1.4 and older 1.5 versions won't strcmp() on a NULL value.
-
-2004-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-account.c: Reference signatures by their UID rather than by an
-	integer id. Also removed the need to have 2 signature settings (no
-	need for the "auto" signature boolean anymore).
-
-2004-03-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-signature.[c,h]: New class similar to EAccount but for
-	signatures.
-
-	* e-signature-list.[c,h]: New class similar to EAccountList only
-	for signatures.
-
-2004-03-31  Not Zed  <NotZed@Ximian.com>
-
-	* e-account-list.h: similar to below.
-
-	* e-account.h: define struct _EAccount* so you can properly forward
-	declare it.
-
-2004-03-18  Not Zed  <NotZed@Ximian.com>
-
-	* e-account.c: Added options for transport_url and source_url
-	permissions.
-
-2004-03-18  Not Zed  <NotZed@Ximian.com>
-
-	* e-account.c (e_account_writable, e_account_writable_option):
-	added interface to find out if various fields or server options
-	are writable.  to work around gconf limitations.
-
-2004-03-04  William Jon McCann  <mccann@jhu.edu>
-
-	* e-dialog-utils.c (e_notice, e_notice_with_xid, save_ok): 
-	* e-request.c (e_request_string): 
-	* e-passwords.c (e_passwords_ask_password):
-	Remove separator from dialogs per HIG.
-
-2004-03-04  Not Zed  <NotZed@Ximian.com>
-
-	* e-sexp.c: Added some debug stuff.
-
-2004-02-27  Not Zed  <NotZed@Ximian.com>
-
-	** See Bug #37329.
-
-	* e-mktemp.c (get_dir): setup a comjpile time option for storing
-	in the homedir, and also just use the uid as the key for a /tmp
-	dir option.
-	(e_mktemp_cleanup): removed entirely.
-	(e_mkstemp, e_mkdtemp, e_mktemp): dont save the file/dirname in a
-	list anymore.
-	(expire_dir_rec): expire old temp data from previous runs/old data
-	lying around.  Based on access time.
-	(get_dir): run an expirey every now and then.
-
-2004-02-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-gui-utils.c (e_icon_for_mime_type): Protect against feeding
-	gdk_pixbuf_new_from_file() a NULL path. Clears up some console
-	warning spewage.
-
-2004-02-19  Not Zed  <NotZed@Ximian.com>
-
-	* e-pilot-util.c: include string.h, fixes 64 bit crash.  From
-	David Mosberger.
-
-2004-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* e-html-utils.c (e_text_to_html_full): add callto:, h323:, and
-	webcal: schemes.
-
-2004-01-26  JP Rosevear <jpr@ximian.com>
-
-	* e-folder-map.c (e_folder_map_dir): use g_file_test instead of
-	stat and pass the type e_folder_map_dir when recursing
-
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* e-folder-map.c: turn off debugging
-
-2004-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* e-folder-map.c (e_folder_map_dir): use GDir/g_build_filename,
-	and g_file_test.
-	(e_folder_map_local_folders): same.
-
-2004-01-23  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: build new sources
-
-	* e-folder-map.[hc]: builds a list of 1.4 folder paths of a
-	certain type
-
-2004-01-20  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: don't build dead files
-
-	* e-xml-hash-utils.[hc]: kill, these were moved to e-d-s long ago
-
-2004-01-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-bconf-map.[c,h]: New source files for mapping bonobo-conf keys
-	to gconf keys. Moved out of shell/e-config-upgrade.c
-
-2004-01-13  Not Zed  <NotZed@Ximian.com>
-
-	* e-msgport.c (em_cache*): A time-based thread-safe in-memory
-	cache thing.  Called em_cache 'cause there's an e_cache in gal.
-
-2004-01-05  Not Zed  <NotZed@Ximian.com>
-
-	* e-memory.c (e_mempool_destroy): Fix from Zan Lynx
-	<zlynx@acm.org> to lock the memchunk before freeing the pool
-	header.
-
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: Remove hard coded disable deprecated flags
-
-2003-11-23  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am (INCLUDES): remove gtk deprecated flag
-
-2003-11-18  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: remove db3 library, if you really want it, get it
-	from e-d-s
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: don't build the e-source stuff anymore, its in
-	e-d-s now
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* test-source-list.c (on_idle_do_stuff): we only need the uid to
-	remove and peek at stuff
-
-	* e-source-list.h: update proto types
-
-	* e-source-list.c (e_source_list_peek_source_by_uid): allow peek
-	by uid only
-	(e_source_list_remove_source_by_uid): allow removal by uid only
-
-2003-11-07  Dan Winship  <danw@ximian.com>
-
-	* ename/*: Removed. No longer used by evolution except via
-	evolution-data-server.
-	
-	* Makefile.am (SUBDIRS): Remove ename
-
-2003-11-07  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: remove build sources from dist
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: make sure the marshal header and source are in the
-	source list
-
-2003-10-31  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-source.c (e_source_get_uri): Don't compress trailing slashes in
-	URI elements.
-
-2003-10-31  Not Zed  <NotZed@Ximian.com>
-
-	* e-account.c (e_account_(sg)et_from_xml): add encrypt_key id, and
-	change some of the names around to be more meaningful.
-
-2003-10-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-host-utils.c (e_gethostbyname_r): If the system defines
-	AI_ADDRCONFIG, set this flag on the hints.ai_flags member as well
-	so that we don't resolve a host to an IPv6 addr when the node
-	doesn't have any IPv6 source addresses.
-
-2003-10-24  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (libedb3util_la_LIBADD): add $(DB3_LDADD)
-
-2003-10-22  Dan Winship  <danw@ximian.com>
-
-	* e-bonobo-factory-util.[ch]: Gone; unused since 1.2
-
-	* e-proxy.[ch]: Gone; nothing in evo uses soup any more.
-
-	* Makefile.am (eutilinclude_HEADERS, libeutil_la_SOURCES): Remove
-	e-proxy.[ch]
-
-2003-10-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (pilot_compile) [! ENABLE_PILOT_CONDUITS]: Add
-	md5-utils.c so it compiles even if you have no Pilot support.
-
-2003-10-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-source-list.c (e_source_list_sync): use gconf_client_notify_remove
-	instead of g_source_remove for GConf notification IDs.
-	(impl_finalize): remove the GConf notification also here.
-
-2003-10-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-source-group.[ch] (e_source_group_peek_source_by_name): added
-	new function.
-
-2003-10-10  Not Zed  <NotZed@Ximian.com>
-
-	* e-account-list.c (e_account_list_find): add FIND_UID find type.
-
-2003-09-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-host-utils.c (e_gethostbyaddr_r): IPv6 implementation
-	rewritten to use getnameinfo() which is the proper function to use
-	in this case. Fixes bug #46006 the Right Way (tm).
-
-2003-09-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-host-utils.c (e_gethostbyaddr_r): Make sure that
-	res->ai_canonname is non-NULL and that it doesn't match the
-	numeric host address that we were trying to resolve. Fixes the
-	second half of bug #46006.
-
-2003-09-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-host-utils.c (e_gethostbyaddr_r): Work around a bug in glibc
-	2.3.2's gethostbyaddr_r() implementation.
-
-2003-09-15  Larry Ewing  <lewing@ximian.com>
-
-	* e-source.c (e_source_dump_to_xml_node): make sure declarations
-	precede the body.
-
-2003-09-11  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (noinst_LTLIBRARIES): Remove libeutil-static.la and
-	libeconduit-static.la
-
-	* ename/Makefile.am (noinst_LTLIBRARIES): Remove
-	libename-static.la
-
-2003-08-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* eggtrayicon.[ch]: Added for tray icon support. To be removed when
-	libgnomeui sports this functionality.
-
-	* Makefile.am: Include eggtrayicon.
-
-2003-08-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-mktemp.c (e_mktemp_cleanup): We need to unlink the full paths
-	in the tmpdirs, not just the base path.
-
-2003-08-20  Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
-	
-	* e-time-utils.c (parse_with_strptime): Fixes #43558 Appointment
-	Editor always gives time validation error for apptmnts in non
-	UTF-8/non ASCII locales.
-
-2003-08-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* test-source-list.c: No short letter for --key.
-
-2003-08-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-uid.c: #include <glib/gstrfuncs.h>
-
-	* test-source-list.c: Add options to display, set and unset the
-	color as well.
-
-	* e-source.c: New members has_color, color in struct
-	ESourcePrivate.
-	(e_source_update_from_xml_node): Parse a color property from the
-	XML node.  Protect from NULL name and relative_uri members as
-	well.
-	(e_source_dump_to_xml_node): Set a color property on the XML node.
-	(e_source_get_color): New.
-	(e_source_set_color): New.
-	(e_source_unset_color): New.
-	(e_source_new_from_xml_node): Use e_source_update_from_xml_node()
-	instead of getting the data from the XML yourself.
-
-2003-08-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	Add UIDs to ESource* items so we can distinguish renames from
-	removals/additions.
-
-	* test-source-list.c: Made --source and --group get UIDs instead
-	of names.
-	(on_idle_do_stuff): Updated behavior accordingly.
-	(dump_list): Print "(No items)" if there are no groups.
-	(dump_group): Print the UID of the group.
-	(dump_source): Print the UID of the source.
-
-	* e-source-list.c (load_from_gconf): Match with group UIDs instead
-	of group names.
-	(e_source_list_peek_source_by_uid): New.
-	(e_source_list_peek_source_by_name): Removed.
-	(e_source_list_peek_group_by_uid): New.
-	(e_source_list_peek_group_by_name): Removed.
-	(e_source_list_remove_group_by_uid): New.
-	(e_source_list_remove_group_by_name): Removed.
-	(e_source_list_remove_source_by_uid): New.
-	(e_source_list_remove_source_by_name): Removed.
-
-	* e-source-group.c: New member uid in struct ESourceGroupPrivate.
-	(impl_finalize): Free it.
-	(e_source_group_new): Set the uid member using e_uid_new().
-	(e_source_group_peek_source_by_uid): New.
-	(e_source_group_peek_source_by_name): Removed.
-	(e_source_group_add_source): Check that the UID is unique, instead
-	of the name.
-	(e_source_group_remove_source_by_uid): New.
-	(e_source_group_remove_source_by_name): Removed.
-	(e_source_group_update_from_xmldoc): Use the UID to figure out
-	which source has changed, instead of the name.
-	(e_source_group_uid_from_xmldoc): New.
-	(e_source_group_name_from_xmldoc): Removed.
-	(e_source_group_new_from_xmldoc): Set the UID in the new group
-	from the XML.
-	(e_source_group_to_xml): Set a UID property in the XML.
-
-	* e-source.c: New member uid in struct ESourcePrivate.
-	(e_source_new): Initialize using e_uid_new().
-	(impl_finalize): Free.
-	(e_source_peek_uid): New.
-	(e_source_new_from_xml_node): Set the UID from the XML node.
-	(e_source_name_from_xml_node): Removed.
-	(e_source_uid_from_xml_node): New.
-	(e_source_dump_to_xml_node): Set the "uid" property on the XML
-	node.
-
-	* e-account.c (e_account_gen_uid): Removed.
-	(e_account_new): Use e_uid_new() instead of e_account_gen_uid().
-
-	* e-uid.c (e_uid_new): New file, new function.
-
-2003-08-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	Fix up the semantics of "changed" signals on GConf changes.
-
-	* e-source-group.c (e_source_group_update_from_xmldoc): Added new
-	member ignore_source_changed in struct _ESourceGroupPrivate.
-	(e_source_group_update_from_xmldoc): Increment
-	ignore_source_changed before calling
-	e_source_update_from_xml_node(), decrement afterwards.
-	(source_changed_callback): Only emit "changed" if
-	ignore_source_changed is zero.
-	(e_source_group_update_from_xmldoc): Properly emit the "changed"
-	signal when the base_uri or the name change.
-
-	* e-source-list.c: Changed type of sync_idle_id from gboolean (!)
-	to int and added new member ignore_group_changed in struct
-	_ESourceListPrivate.
-	(load_from_gconf): Increment ignore_group_changed before calling
-	e_source_group_update_from_xmldoc() and decrement it afterwards.
-	(group_changed_callback): Only emit the signal if
-	ignore_group_changed is zero.
-
-	* e-source.c (e_source_update_from_xml_node): Removed arg
-	emit_signals.  Always emit signals.
-
-	* e-source-group.c (e_source_group_update_from_xmldoc): Removed
-	arg emit_signals.  Always emit signals.
-	(e_source_group_update_from_xml): Likewise.
-
-2003-08-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-source.c (e_source_set_group): Weak_unref the current group if
-	not NULL and properly handle the case where a NULL group is being
-	passed in.
-
-2003-08-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-source-group.c: New file.
-	* e-source-group.h: New file.
-	* e-source-list.h: New file.
-	* e-source-list.c: New file.
-	* e-source.c: New file.
-	* e-source.h: New file.
-	* test-source-list.c: New file to test the above.
-
-2003-08-11  Not Zed  <NotZed@Ximian.com>
-
-	* e-msgport.c (e_thread_put): check pthread_create return code
-	properly.
-	(e_mutex_lock): check pthread* return codes properly.
-	(e_mutex_unlock): Same here.
-	(e_mutex_cond_wait): and here.
-
-2003-08-05  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c (special_chars): add a flag for non-url chars
-	(controls, whitespace, ", and |)
-	(url_extract): Use that. When urlifying just a hostname, make sure
-	it really is a hostname, and not just something like "www.c".
-	(e_text_to_html_full): Deal with url_extract returning NULL in the
-	"www." case
-	(main): add a regression test, #ifdef E_HTML_UTILS_TEST
-
-2003-07-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-config-listener.c (add_key): just preload one level of GConf keys,
-	since preloading all makes the calendar startup slow.
-
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: Use EVO_MARSHAL_RULE
-
-	* e-component-listener.c (connection_listen_cb): Fix a non-ANSI
-	switch label.
-
-	* e-gui-utils.c: only include "art/empty.xpm" if
-	HAVE_LIBGNOMEUI_GNOME_ICON_LOOKUP_H isn't defined
-
-	* e-xml-hash-utils.c (e_xml_to_hash): Deconstify a non-const
-	variable to fix a warning.
-
-2003-07-03  JP Rosevear  <jpr@ximian.com>
- 
- 	* e-xml-hash-utils.c (foreach_save_func): encode the text
- 	(e_xml_from_hash): pass xmlDoc to foreach method
- 	(e_xmlhash_new): check for file existence
- 	(e_xmlhash_destroy): only destroy the hash if it exists
-	
-2003-07-01  Dan Winship  <danw@ximian.com>
-
-	* e-gui-utils.c (e_icon_for_mime_type): New function to return an
-	icon for a MIME type, using GnomeIconTheme if available or
-	gnome-vfs and gnome-mime-data if not.
-
-2003-06-19  Dan Winship  <danw@ximian.com>
-
-	* e-xml-hash-utils.c (e_xml_to_hash): don't leak an extra copy of
-	the values
-
-2003-06-14  Larry Ewing  <lewing@ximian.com>
-
-	* e-name-western.c (e_name_western_get_suffix_at_str_end): free
-	word before breaking out of the loop.
-
-2003-06-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-config-listener.c (add_key): use GCONF_CLIENT_PRELOAD_RECURSIVE
-	when adding watched directories to avoid GConfd round-trips.
-
-2003-06-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-trie.c (e_trie_free): Free the fail_states array.
-
-2003-05-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-meta.c (meta_load): Stat the file to make sure it exists
-	before trying to parse it using xmlParseFile().
-
diff --git a/e-util/ChangeLog.pre-1-4 b/e-util/ChangeLog.pre-1-4
deleted file mode 100644
index 3cbac0eade..0000000000
--- a/e-util/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,2649 +0,0 @@
-2003-05-29  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #43775
-
-	* e-time-utils.c (locale_supports_12_hour_format): use e_utf8_strftime
-	(e_time_format_date_and_time): ditto
-	(e_time_format_time): ditto
-
-2003-05-16  Dan Winship  <danw@ximian.com>
-
-	* e-proxy.c (e_proxy_init): Removing trailing / in key name passed
-	to gconf_client_notify_add to kill a warning. (Part of #43159)
-
-2003-05-16  Jeremy Katz  <katzj@redhat.com>
-
-	* e-sexp.c (term_eval_and): Use glib macros for pointer/int
-	conversion.
-
-2003-05-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes crash in #42212
-
-	* e-url.c (e_uri_new): check for 'uri_string' being NULL.
-
-2003-05-02  Not Zed  <NotZed@Ximian.com>
-
-	* e-request.c (e_request_string): remove the assert, if we dont
-	understand the response, assume it's a cancel.
-	GTK_RESPONSE_DELETE_EVENT wasn't handled [#42038].
-
-2003-04-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-request.c (e_request_string): Handle GTK_RESPONSE_NONE.
-	[#42038]
-
-2003-04-24  Chris Toshok  <toshok@ximian.com>
-
-	[ for bug #41211 ]
-	
-	* e-gui-utils.h (e_button_new_with_stock_icon): add prototype.
-
-	* e-gui-utils.c (e_button_new_with_stock_icon): new function,
-	allow us to create a custom labeled button with a stock icon.
-
-2003-04-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-host-utils.c: Added #include <netinet/in.h> for the
-	sockaddr_in6 typedef for at least MacOS X.
-
-2003-04-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-host-utils.c (e_gethostbyname_r): Keep our buf ptr aligned to
-	sizeof (char *). Should fix bug #41362.
-	(e_gethostbyaddr_r): Same.
-
-2003-04-18  Anna Marie Dirks  <anna@ximian.com>
-
-	* e-request.c (e_request_string): Added appropriate spacing/padding 
-	to the rename dialogs. Fixes bugs #41040, #41036, #41038
-
-2003-04-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-gtk-utils.c (e_gtk_button_new_with_icon): Remove debugging
-	message.
-
-2003-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-sexp.c: Finished an #if 0'd out port to GObject from an #if
-	0'd out GtkObject subclassing.
-
-2003-04-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-sexp.c (e_sexp_add_function)
-	(e_sexp_add_ifunction): Make sure any old symbol with the same name
-	as the one being added, is removed first.
-
-2003-04-14  Not Zed  <NotZed@Ximian.com>
-
-	* e-gtk-utils.c (e_gtk_button_new_with_icon): Utility function to
-	create a button with a stock icon.
-
-2003-04-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-host-utils.c (e_gethostbyaddr_r): Change the 'len' argument to
-	'addrlen' so that when IPv6 is enabled, our temp vriable (also
-	named len) does not cause confusion. Fixes bug #40979.
-
-2003-04-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-passwords.c (e_passwords_remember_password): Removed debugging
-	message that would spit out the actual password, albeit in encoded
-	form.
-
-2003-04-04  Dan Winship  <danw@ximian.com>
-
-	* e-account-list.c (gconf_accounts_changed): Don't start emitting
-	ACCOUNT_ADDED signals until we've added all of the new accounts to
-	our list. Otherwise if the signal handler calls
-	e_account_list_get_default_account() it will end up causing the
-	first account in the list to become the default. #40675
-
-2003-04-04  Chris Toshok  <toshok@ximian.com>
-
-	* ename/e-name-western.c (e_name_western_extract_middle): fix abr.
-	(e_name_western_get_suffix_at_str_end): same.
-
-2003-04-02  Not Zed  <NotZed@Ximian.com>
-
-	* e-passwords.c (e_passwords_forget_passwords): Delete all
-	Passwords-* sections.  Should make this work.
-
-2003-03-31  Chris Toshok  <toshok@ximian.com>
-
-	* ename/test-ename-western.c (do_name): print "" if the value is
-	NULL.
-	(main): add a couple of utf8 test cases (that still use western
-	orderings).
-
-	* ename/e-name-western.c (e_name_western_str_count_words):
-	utf8-ize this.
-	(e_name_western_cleanup_string): same.
-	(e_name_western_get_words_at_idx): same.
-	(e_name_western_get_one_prefix_at_str): same.
-	(e_name_western_get_prefix_at_str): same.
-	(e_name_western_extract_first): same.
-	(e_name_western_extract_middle): same.
-	(e_name_western_extract_nickname): same.
-	(e_name_western_extract_last): same.
-	(e_name_western_get_preceding_word): same.
-	(e_name_western_get_suffix_at_str_end): same.
-	(e_name_western_detect_backwards): same.
-	(e_name_western_reorder_asshole): same.
-	(FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION): same.
-	(e_name_western_fixup): same.
-	(e_name_western_parse): validate the string and truncate it if
-	need be.
-
-2003-03-27  JP Rosevear  <jpr@ximian.com>
-
-	* e-account-list.c (e_account_list_find): guard against NULL keys
-
-2003-03-25  Dan Winship  <danw@ximian.com>
-
-	* e-dialog-utils.c (e_notice): Move this here from gal. Use
-	e_dialog_set_transient_for so it DTRT for out-of-proc components.
-	(e_notice_with_xid): Like e_notice but with an X Window ID as the
-	parent window
-	(e_gnome_dialog_set_parent): Remove this, since it was marked
-	deprecated and only used in one place.
-	(e_file_dialog_save): Make this use GtkMessageDialog instead of
-	GnomeDialog
-	(e_dialog_set_transient_for_xid): #ifdef out gtk 2.2 api usage
-
-2003-03-25  Not Zed  <NotZed@Ximian.com>
-
-	* e-meta.c (meta_filename): fix a typo & some missing headers.
-
-2003-03-24  Dan Winship  <danw@ximian.com>
-
-	* e-dialog-utils.c (e_dialog_set_transient_for,
-	e_dialog_set_transient_for_xid): Rename, rewrite, make them
-	actually work.
-
-2003-03-25  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: Added e-meta.[ch] to libeutil
-
-	* e-meta.[ch]: simple api to implement meta-data for keyed
-	objects.
-
-2003-03-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-trie.c (e_trie_search): If the gunichar is 0xfffe, just skip
-	processing it. Maybe this will fix bug #39900.
-	(trie_utf8_getc): Removed unused labels to shutup the compiler.
-
-2003-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-sexp.h: Fix ESExpClass to never be an empty struct. Also make
-	ESExp optionally a subclass of GObject rather than GtkObject (not
-	that we'll probably ever make it so, but for completeness sake?).
-
-2003-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-trie.c (trie_utf8_getc): Don't use __inline__ as it is not
-	always defined.
-
-2003-03-13  Dan Winship  <danw@ximian.com>
-
-	* ename/e-address-western.c (e_address_western_parse): When
-	declaring a line to be part of "extended" because we don't know
-	what else to call it, keep the preceding "\n" so that the address
-	still looks the same when we reassemble the pieces later. Fixes
-	handling of non-US addresses
-
-2003-03-12  Dan Winship  <danw@ximian.com>
-
-	* e-xml-hash-utils.c (e_xml_to_hash): Update for a libxml2 change
-	that was making this code g_warn a lot
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-request.c (e_request_string): Make the entry activate the
-	default response in the dialog.
-
-2003-03-03  Rodney Dawes  <dobey@ximian.com>
-
-	* e-proxy.c: Use gnome2 proxy settings
-	
-2003-03-02  Rodney Dawes  <dobey@ximian.com>
-
-	* e-pilot-util.c: s/gnome-xml/libxml/
-	
-2003-02-27  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: include gnome-pilot cflags
-
-2003-02-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-account-list.c (gconf_accounts_changed): 'uid' should not be
-	const.
-
-2003-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* e-account-list.c (e_account_list_get_default): helper to get the
-	dfault account.
-	(e_account_list_set_default): helper to set the default account.
-	(e_account_list_find): Helper to find accounts based on differnet
-	key types.
-	(e_account_list_add): helper to add account + emit added event.
-	(e_account_list_change): helper to emit changed event.
-	(e_account_list_remove): herlper to remove account + emit changed event.
-
-2003-02-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-categories-config.c (e_categories_config_open_dialog_for_entry):
-	A result of 0 no longer indicates success; GTK_RESPONSE_OK does.
-
-2003-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* e-account-list.c (gconf_accounts_changed): fix memleak - free
-	uid.
-
-2003-02-11  Not Zed  <NotZed@Ximian.com>
-
-	* e-trie.c (trie_utf8_getc): Instead of simply ignoring bad chars,
-	return the sentinal invalid char 0xfffe, so that we properly track
-	the start of sequences.
-
-2003-02-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (libeutil_static_la_DEPENDENCIES): Make
-	libeutil-static.la depend on libeutil.la so that parallel
-	compilations work; building them at the same time confuses
-	libtool.
-	(e-util-marshal.h, e-util-marshal.c): Use different tmp files so
-	these rules can happen in parallel.
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (eutilincludedir, etc): define in terms of
-	privincludedir.
-
-	* ename/Makefile.am (libenameincludedir): Likewise
-
-	* e-account.c: Fix warnings
-	* e-account-list.c: Likewise
-	* e-config-listener.c: Likewise
-	* e-gui-utils.c: Likewise.
-	* e-lang-utils.c: Likewise
-	* e-msgport.c: Likewise
-	* e-passwords.c: Likewise
-
-	* e-categories-config.c
-	(e_categories_config_open_dialog_for_entry): Use g_object_get/_set
-	rather than gtk_
-
-	* e-url.c (e_uri_new): Use g_ascii_strdown instead of deprecated
-	g_strdown.
-
-2003-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-request.c (e_request_string): Port to GtkDialog.  Strdup the
-	text returned by GtkEntry after destroying the dialog, not before.
-	Use gtk_editable_select_region() instead of
-	gtk_entry_select_region().  Add a little bit of padding to make it
-	look less crampy and set a default width.
-
-	* e-dialog-utils.h (e_gnome_dialog_set_parent): Declare only if
-	GNOME_DISABLE_DEPRECATED is not #defined.
-	(e_gnome_warning_dialog_parented): Likewise.
-	(e_gnome_ok_cancel_dialog_parented): Likewise.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* e-pilot-settings.c (e_pilot_settings_new): ref/sink the pilot
-	settings to clear up that gtk warning.
-
-2003-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* e-pilot-map.c (e_pilot_map_read): g_file_exists -> g_file_test.
-	(e_pilot_map_write): don't use doc->root.
-
-2003-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* e-pilot-settings.[ch]: GObjectify this.
-
-2003-01-24  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-categories-config.c (initialize_categories_config): Enable
-	getting the categories master list from wombat.
-	(e_categories_config_open_dialog_for_entry): It's now a GtkDialog.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (eutilincludedir): Version using $(BASE_VERSION).
-	(econdincludedir): Likewise.
-	(edb3includedir): Likewise.
-	(imagesdir): Likewise.
-
-	* ename/Makefile.am: Install libename in $(privlibdir) and
-	$(includedir)/evolution-$(BASE_VERSION)/ename.
-
-2003-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-account-list.c: Changed signal names to use - instead of _
-	like the rest of Gtk2.
-
-	* e-account.c (e_account_import): New function that is basically
-	the old account_copy().
-
-2003-01-17  Dan Winship  <danw@ximian.com>
-
-	* e-xml-hash-utils.c: New, sort of from evolution-recurid-branch.
-
-2003-01-16  Dan Winship  <danw@ximian.com>
-
-	* e-account.c: New class, based on MailConfigAccount, for
-	describing an evolution (mail) account.
-
-	* e-account-list.c: New class for tracking the list of configured
-	accounts. (Also uses some code from mail-config.)
-
-	* e-list.c (e_list_construct, e_list_remove): New
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dialog-utils.c: Do not #include <e-bonobo-widget.h>.
-	(e_set_dialog_parent): Remove the BonoboWidget handling stuff (it
-	doesn't really work anyways).
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (eutilinclude_HEADERS): Add e-dialog-utils.h.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-gui-utils.c (e_create_image_widget): change this to use
-	GtkImage instead of GnomeCanvas.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Images are now in $(datadir)/evolution/images
-	instead of $(datadir)/images/evolution.
-
-2003-01-07  Dan Winship  <danw@ximian.com>
-
-	* e-config-listener.c (e_config_listener_remove_value): New.
-
-	* e-passwords.c (e_passwords_get_password): Don't look at the
-	passwords hash until calling e_passwords_init().
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c: Add this back: Connector needs it, and there's
-	no reason for addressbook and calendar to be using camel to get
-	this functionality.
-
-	* Makefile.am (libeutil_la_SOURCES): re-add e-html-utils
-
-2003-01-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	A bunch of fixes to make e-util build with -DG_DISABLE_DEPRECATED
-	and -DGTK_DISABLE_DEPRECATED.
-
-2003-01-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-gtk-utils.c (e_signal_connect_full_while_alive): Get to
-	compile.
-	(e_signal_connect_while_alive): Like.
-
-2002-12-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-gtk-utils.c (e_signal_connect_while_alive): New.
-	(e_signal_connect_full_while_alive): Renamed from
-	e_gtk_signal_connect_full_while_alive().
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-html-utils.[c,h]: Removed. Back to the fiery depths of hell
-	from whence ye came!
-
-2002-12-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-config-listener.[ch] (e_config_listener_remove_dir): new
-	function.
-
-2002-12-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-trie.c: New implementation of an Aho-Corasick trie.
-
-2002-12-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-passwords.h: track changes to api (e_passwords_init is gone,
-	and several functions take the component name as an arg.)
-
-	* e-passwords.c (e_passwords_init): make this static, and allow
-	multiple calls.  Also, it no longer takes the component name.
-	(e_passwords_shutdown): make this deal with the case where
-	e_passwords_init wasn't called (no hashtable), and it no longer
-	needs to free component_name.
-	(e_passwords_forget_passwords): call e_passwords_init.
-	(e_passwords_clear_component_passwords): take component_name as an
-	arg, and call e_passwords_init.
-	(password_path): take component_name as an arg.
-	(e_passwords_remember_password): same, and call e_passwords_init.
-	(e_passwords_forget_password): same.
-	(e_passwords_get_password): same.
-	(e_passwords_add_password): call e_passwords_init.
-	(e_passwords_ask_password): take component_name as an arg.
-
-2002-12-07  Not Zed  <NotZed@Ximian.com>
-
-	* e-msgport.c (e_mutex_cond_wait): Allow an e-mutex to be used
-	with standard condition variables.
-
-2002-12-06  Chris Toshok  <toshok@ximian.com>
-
-	* e-categories-master-list-wombat.c (ecmlw_load): change to a more
-	gconf-like path (with underscores, etc.)
-	(ecmlw_save): same.
-
-2002-11-26  Dan Winship  <danw@ximian.com>
-
-	* e-lang-utils.c (e_get_language_list): If the language is
-	something like "fr_FR", return both "fr_FR" and "fr" in the list.
-	Oaf doesn't consider "fr_FR" to match a "-fr" translation.
-
-2002-11-22  Not Zed  <NotZed@Ximian.com>
-
-	* e-msgport.c (EMsgPort): Added an optional nspr pipe field.
-	(e_msgport_new): Init nspr pipe to null.
-	(e_msgport_destroy): close prfiledesc's if they're open.
-	(e_msgport_prfd): get the prfiledesc to wait asynchronously on.
-	(e_msgport_put): Write notify to nspr pipe if it exists.
-	(e_msgport_wait): poll nspr pipe fd if it is set, and the pipe fd
-	isn't.
-	(e_msgport_get): skim off a notify byte on the pr pipe if set.
-	(): Include config.h, and nspr stuff if HAVE_NSS is set.
-
-2002-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-config-listener.c (e_config_listener_get_string_with_default):
-	Make sure we don't use a string value from a GConfValue that got
-	freed.
-
-2002-11-12  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am
-	(eutilinclude_HEADERS): add e-password.h
-	(libeutil_la_SOURCES): add e-password.c
-
-	* e-passwords.[ch]: port this to gnome2's gnome-config-private.
-
-2002-11-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-config-listener.c (add_key): g_strdup() the value in the case
-	of a string value.
-
-2002-11-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Re-add e-proxy.c to the build.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (eutilinclude_HEADERS): add e-categories-config.h
-	and e-categories-master-list-wombat.h
-	(libeutil_la_SOURCES): add e-categories-master-list-wombat.c
-
-	* e-categories-master-list-wombat.[ch]: port work.
-
-2002-11-07  JP Rosevear  <jpr@ximian.com>
-
-	* e-categories-config.c (e_categories_config_get_icon_for): pass
-	extra pixbuf param
-
-	* e-categories-config.h: use G_*_DECLS
-
-	* e-dialog-utils.c (save_ok): update g_file_test params
-
-	* Makefile.am: Compile some additional files
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* e-config-listener.c (e_config_listener_set_boolean): init err to
-	NULL so if there isn't an error we aren't left with an unitialized
-	GError.  Fixes crash.
-	(e_config_listener_set_float): same.
-	(e_config_listener_set_long): same.
-	(e_config_listener_set_string): same.
-
-2002-11-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-component-listener.[ch]: ported to GObject.
-
-	* Makefile.am: re-enabled e-component-listener.[ch]
-
-2002-11-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-config-listener.[ch] (e_config_listener_get_boolean,
-	e_config_listener_get_float, e_config_listener_get_long,
-	e_config_listener_get_string): new simpler functions, without
-	a default value.
-
-2002-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-config-listener.c (e_config_listener_get_float_with_default):
-	Removed unused variable.
-	(e_config_listener_get_long_with_default): Likewise.
-	(e_config_listener_get_string_with_default): Likewise.
-
-	* Makefile.am: Compile e-config-listener.[ch].
-
-2002-11-02  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am: add marshal building stuff, add e-util-marshal.c to
-	SOURCES, and add e-util-marshal.list to EXTRA_DIST.
-
-	* e-util-marshal.list: add marshallers for e-util.
-
-	* e-list.c: convert to GObject.
-
-	* e-list.h: convert to GObject.
-
-	* e-iterator.c: convert to GObject.
-
-	* e-iterator.h: convert to GObject.
-
-	* e-list-iterator.c: convert to GObject.
-
-	* e-list-iterator.h: convert to GObject.
-
-	* .cvsignore: ignore e-util-marshal.[ch]
-
-2002-11-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* ename/Makefile.am (INCLUDES): Removed -I$(includedir).
-
-	* ename/test-ename-western-gtk.c: #include
-	<libgnomeui/gnome-ui-init.h> instead of <libgnomeui/gnome-init.h>.
-	(create_window): Added GTK_SIGNAL_FUNC() cast.
-	(main): Use gnome_program_init().
-
-	* e-db3-utils.c: Do not #include <libgnome/gnome-defs.h>.
-
-	* e-request.c: Do not #include <libgnomeui/gnome-stock.h>.
-
-	* e-memory.c (e_memchunk_clean): Replace GSearchFunc with
-	GCompareFunc.
-
-	* e-iterator.c (e_iterator_class_init): GTK2-ified.
-	(ECI_CLASS): Likewise.
-
-	* e-html-utils.c: Do not #include <gal/unicode/gunicode.h>.
-
-	* e-gui-utils.c: Don't #include <libgnome/gnome-defs.h>.
-	(e_create_image_widget): Pass NULL to gdk_pixbuf_new_from_file()
-	for the error arg.
-
-	* e-corba-utils.h: #include <orbit/orbit.h> instead of
-	<orb/orbit.h>.
-
-	* Makefile.am: Removed bonobo-factory-util.c,
-	bonobo-factory-util.h, e-categories-master-list-wombat.h,
-	e-categories-master-list-wombat.c, e-dialog-utils.c,
-	e-dialog-utils.h, e-proxy.c e-proxy.h for now.
-
-2002-11-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-config-listener.[ch]: ported to GConf and GObject.
-
-2002-11-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-config-listener.[ch]:
-	* e-component-listener.[ch]: compilation fixes for GNOME 2 porting.
-
-2002-10-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #32764
-
-	* e-config-listener.c (add_key): store the value returned by
-	bonobo_event_source_client_add_listener, so that we can remove it
-	later, when freeing the key structure.
-	(free_key_hash): remove listener.
-	(e_config_listener_set_boolean):
-	(e_config_listener_set_float): 
-	(e_config_listener_set_long):
-	(e_config_listener_set_string): only set the cache values if there's
-	no exception.
-	(e_config_listener_destroy): remove all keys before unrefing the db
-	component.
-
-2002-10-23  Dan Winship  <danw@ximian.com>
-
-	* ename/e-name-western.c: Cast chars to unsigned char before
-	passing to ctype macros since they are not defined on negative
-	numbers. Fixes parsing problems with names with accented
-	characters on Solaris. (At least part of #32146)
-
-2002-09-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-component-listener.c (ping_component_callback): added a comment
-	about the fix for #30918.
-
-2002-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-component-listener.c (ping_component_callback): gtk_object_ref the
-	component listener before emitting the "component_died" signal, since
-	in most cases, the component listener will be destroyed in the
-	callbacks for that signal.
-
-2002-09-22  Dan Winship  <danw@ximian.com>
-
-	* e-config-listener.c: Fix some non-ANSI switch statements
-
-	* e-path.c: #include <sys/types.h> for OS X
-
-2002-09-11  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #27546 ]
-	* ename/e-name-western-tables.h
-	(e_name_western_complex_last_table): add "di" to
-	e_name_western_complex_last_table.
-
-2002-09-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-config-listener.c (e_config_listener_set_boolean,
-	e_config_listener_set_float, e_config_listener_set_long,
-	e_config_listener_set_string): update the local copy (if we've
-	got one) so that we don't return values if asked before getting
-	the change notification.
-
-2002-09-04  Dan Winship  <danw@ximian.com>
-
-	* e-time-utils.c (e_mktime_utc): New. Like mktime(3), but assumes
-	the input time is UTC.
-	(e_localtime_with_offset): New. Like localtime_r(3), but also
-	returns an offset from UTC.
-
-2002-08-29  Dan Winship  <danw@ximian.com>
-
-	* e-list.c (e_list_destroy): Don't call g_list_foreach with the
-	free func if the free func is NULL.
-
-2002-08-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-html-utils.c (e_text_to_html_full): Convert file: urls
-	too. Fixes bug #29557.
-
-	* e-proxy.[c,h] (e_proxy_init): New convenience function to
-	initialise the proxy settings for soup to use.
-
-2002-08-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-config-listener.c[ch] (e_config_listener_get_float_with_default,
-	  e_config_listener_set_boolean, e_config_listener_set_float): new
-	functions.
-	(property_change_cb, add_key): added support for FLOAT values.
-	(e_config_listener_set_string): free strings before returning.
-
-2002-08-26  Peter Williams  <peterw@ximian.com>
-
-	* e-dialog-utils.c (set_transient_for_gdk): If gdk_window_foreign_new
-	returned NULL, we're probably screwed, but try to avoid a segfault.
-	(Preemptive fix suggested by kmaraas).
-
-2002-08-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-config-listener.c (e_config_listener_get_string_with_default):
-	call g_strdup in the correct place, or we'll return the internal copy.
-
-2002-08-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-config-listener.c (e_config_listener_set_long): only set the key
-	if the value is different from what we've already read from the
-	database, to avoid extra change notifications.
-	(e_config_listener_set_string): likewise.
-
-2002-08-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-config-listener.[ch]: added "key_changed" signal to class.
-	(property_change_cb): emit "key_changed" signal.
-	(e_config_listener_set_long): new function.
-	(e_config_listener_get_long_with_default): new function.
-
-2002-08-22  Dan Winship  <danw@ximian.com>
-
-	* e-path.c (e_path_rmdir): Remove an e_path directory, and its
-	parent "subfolders" dir if it's now empty.
-
-2002-08-22  JP Rosevear  <jpr@ximian.com>
-
-	* e-time-utils.c (e_time_parse_date): if the year was two digits,
-	add the current century
-
-	Fixes # 17252
-	
-2002-08-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-config-listener.[ch]: new class for config database access and
-	monitoring.
-
-	* Makefile.am: added new files.
-
-2002-08-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-component-listener.[ch]: new class for controlling a component,
-	to detect when it dies.
-
-2002-08-01  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c (is_citation): Remove the logic that assumes
-	"Rupert> " is a citation, since it misfires more often than it
-	hits.
-
-2002-07-31  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c (is_addr_char, is_trailing_garbage): Don't use
-	"isprint(c)" to mean "c >= 32 && c < 128" since it doesn't in most
-	locales.
-	(is_domain_name_char): new macro for dns-valid characters
-	(email_address_extract): Use is_domain_name_char rather than
-	is_addr_char for the part after the @.
-
-2002-07-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-host-utils.c (e_gethostbyname_r): If the user has enabled IPv6
-	support, use getaddrinfo to resolve hostnames and then manually
-	fit the result into a struct hostent.
-	(e_gethostbyaddr_r): Same.
-
-2002-07-25  Not Zed  <NotZed@Ximian.com>
-
-	* e-msgport.c (e_dlist_length): Return the actual count, rather
-	than always 0!
-	
-2002-07-03  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am: Install libeutil, libeconduit, and libedb3util and
-	their headers.
-	
-2002-07-15  Not Zed  <NotZed@Ximian.com>
-
-	* e-sexp.c (term_eval_caststring): Cast to a string type.
-	(term_eval_castint): Cast to an int type.
-	(symbols[]): Add to symbol table.
-
-2002-07-09  Dan Winship  <danw@ximian.com>
-
-	* e-categories-config.c: #include <string.h>
-
-2002-07-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-categories-config.c (e_categories_config_get_icon_for): changed to
-	return a gboolean (TRUE if the icon is found, FALSE if not).
-
-2002-06-07  Not Zed  <NotZed@Ximian.com>
-
-	* e-dialog-utils.c (e_gnome_warning_dialog_parented):
-	(e_gnome_ok_cancel_dialog_parented): Use connect_while_alive, so
-	we're not called after we've quit.  See bug #15397.
-
-2002-06-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-msgport.c (e_msgport_wait): Protect against EINTR (irix?), see
-	bug #24086.
-
-2002-05-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-corba-utils.c (e_safe_corba_string_dup): New.
-
-2002-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* e-msgport.c (e_thread_destroy): Destroy our mutex too.
-	(e_thread_new): Add thread to a new list of all threads.
-	(e_thread_destroy): Remove thread from list of all threads.
-	(e_thread_busy): New function, returh true if we're busy somewhere
-	processing work.
-
-2002-04-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-passwords.c (e_passwords_get_password): Don't leak the base64
-	encoded password buffer.
-
-2002-04-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-host-utils.c (e_gethostbyaddr_r): New wrapper around
-	gethostbyaddr_r if the system has it, else a whole new
-	implementation.
-
-2002-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-sexp.c (parse_value): Handle parsing negative integers.
-
-2002-03-29  JP Rosevear  <jpr@ximian.com>
-
-	* e-dialog-utils.c (e_file_dialog_save): open a file selection
-	dialog with the given title and return the selected file name
-	(save_ok): if the ok button is clicked, make sure the file doesn't
-	already exist and if it does, see if the user wants to over write
-	it
-
-	* e-dialog-utils.h: new proto
-
-2002-03-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-lang-utils.c: New.
-	* e-lang-utils.h: New.
-
-2002-03-22  Dan Winship  <danw@ximian.com>
-
-	* e-request.c (e_request_string): Document the fact that this
-	takes two locale charset strings and one UTF8 string and returns a
-	UTF8 string. (Huh.)
-
-2002-03-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-mktemp.c: #include <string.h> for strcmp.
-
-2002-02-22  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c (e_text_to_html_full): Fix for if the buffer ends
-	with an email address (and no newline).
-
-2002-02-09  JP Rosevear  <jpr@ximian.com>
-
-	* e-pilot-settings.h: add row and column defines
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* ename/Makefile.am: Use E_NAME_CFLAGS and E_NAME_LIBS.
-
-	* Makefile.am: Use E_UTIL_CFLAGS and E_UTIL_LIBS.
-
-2002-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: compile new files
-
-	* e-pilot-settings.[hc]: beginnings of a general conduit
-	configuration gui
-
-2002-01-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* ename/e-name-western.c (e_name_western_word_is_suffix): Allow
-	for a period after suffixes.  Fixes Ximian bug #17012.
-
-2002-01-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-memory.c (e_memchunk_clean): Prune free'd nodes from our free
-	list otherwise we'll end up re-using free'd memory blocks and
-	that's not a Good Thing (tm).
-
-2002-01-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* md5-utils.h: Reverted.
-
-2002-01-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* md5-utils.h: Move the struct into md5-utils.c - this is a
-	kludgey hack around the fact that NSS also defines
-	MD5Context. Besides, this should be a private struct anyway.
-
-2002-01-02  JP Rosevear  <jpr@ximian.com>
-
-	* e-dialog-utils.c (e_gnome_dialog_set_parent): util function
-	moved from mail-callbacks, also destroys the dialog if the parent
-	is destroyed
-	(e_gnome_warning_dialog_parented): similarly
-	(e_gnome_ok_cancel_dialog_parented): ditto
-
-	* e-dialog-utils.h: new protos
-
-2001-12-17  JP Rosevear  <jpr@ximian.com>
-
-	* e-pilot-map.c (e_pilot_map_clear): clear all info from the map
-
-	* e-pilot-map.h: add proto
-
-2001-12-10  JP Rosevear  <jpr@ximian.com>
-
-	* e-pilot-util.c (e_pilot_utf8_to_pchar): use UTF-8 instead of
-	UTF8 as the source char set
-	(e_pilot_utf8_from_pchar): use UTF-8 instead of UTF8 as the
-	destination char set
-
-2001-11-20  Dan Winship  <danw@ximian.com>
-
-	* e-passwords.c (e_passwords_forget_password): Clear the password
-	in bonobo-conf as well. Fixes ximian 14893.
-
-2001-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (libeutil_la_LIBADD): Remove `-lc'.  It makes the
-	mailer do strange things when it calls `fork()', thus breaking
-	e.g. mail sending through sendmail.
-
-2001-11-13  JP Rosevear  <jpr@ximian.com>
- 
- 	* e-pilot-map.c (real_e_pilot_map_insert): only insert non-0 pids
- 	into the pid map
- 	(e_pilot_map_insert): remove and free old keys/values here -
- 	including possibly orphaned keys
- 	(e_pilot_map_remove_by_uid): only free things if they should have
- 	been found
-
-2001-11-13  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am (libeutil_la_LIBADD): Explicitly add -lc
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* e-time-utils.c (e_time_parse_date): added a 2nd format, with the
-	weekday and the date. We need this so we can try to parse DATE values
-	in the ECalendarTable.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dialog-utils.c (e_set_dialog_parent): Remove a g_warning.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* ename/e-name-western.c (e_name_western_fixup): Added French
-	conjunction.
-
-	* e-host-utils.c: Don't define gethost_mutex unless we need it.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* ename/e-name-western.c: Cleaned this up a bit.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* ename/e-name-western.c (e_name_western_fixup): Check for
-	compound first names here (X & Y).  Fixes Ximian bug #13859.
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* e-pilot-map.c (e_pilot_map_remove_by_pid): make sure to free the
-	keys as well
-	(e_pilot_map_remove_by_uid): ditto
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* e-pilot-map.h: update proto
-
-	* e-pilot-map.c (e_pilot_map_lookup_pid): touch the nodes if
-	indicated and found
-	(e_pilot_map_lookup_uid): ditto
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* e-pilot-map.c (real_e_pilot_map_insert): take an extra param on
-	whether to mark touched
-	(map_sax_start_element): use above
-	(e_pilot_map_insert): ditto
-	(e_pilot_map_write): pass in extra info to foreach call
-	(map_write_foreach): if we are in touched only mode, write out the
-	map only if its been touched
-
-	* e-pilot-map.h: add new member
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* e-pilot-map.c (map_sax_start_element): add archived records
-	with pilot id of 0
-	(map_write_foreach): use the uid map for writing
-	(e_pilot_map_write): write using the uid map
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* e-pilot-map.c (e_pilot_map_insert): free up old memory first
-	(e_pilot_map_destroy): free allocated memory when destroying
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-
-	* e-pilot-map.c (map_set_node_timet): plug leak
-
-2001-10-23  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c (e_text_to_html_full): Change " " to "&nbsp;" at
-	start of line.
-
-2001-10-22  Dan Winship  <danw@ximian.com>
-
-	* e-passwords.c (e_passwords_get_password): Pass a
-	CORBA_Environment to bonobo_config_get_string so it doesn't g_warn
-	on error. (Since the "error" is most likely just that the password
-	isn't cached.)
-	(e_passwords_remember_password, e_passwords_get_password,
-	e_passwords_add_password): Change "if (foo) { entire function; }"
-	to "if (!foo) return;"
-
-	* e-html-utils.c (special_chars): Don't allow single quote or
-	backtick in email addresses, or pipes following URLs.
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-	
-	* e-dbhash.c (e_dbhash_foreach_key): null out DBT memory prior to
-	usage (from Edd Dumbill <edd@usefulinc.com>)
-	
-2001-10-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dialog-utils.c (e_set_dialog_parent_from_xid): New.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* e-passwords.h: new parameter to e_passwords_init, and add
-	prototype for e_passwords_clear_component_passwords.
-
-	* e-passwords.c (e_passwords_init): copy off the component name.
-	(e_passwords_shutdown): free/NULL the component name.
-	(e_passwords_clear_component_passwords): new function.  remove the
-	subtree rooted at /Passwords/<ComponentName>.
-	(e_passwords_remember_password): use component_name when building
-	up the path.
-	(e_passwords_get_password): same.
-	(e_passwords_add_password): remove/free the currently stored
-	session password for this key if there is one, before adding the
-	new one.
-
-2001-10-11  Chris Toshok  <toshok@ximian.com>
-
-	* e-passwords.h: change prototype for e_passwords_get_password.
-
-	* e-passwords.c (e_passwords_get_password): remove 'const' from
-	return type - the return type is now allocated and must be freed
-	by the caller.
-	
-2001-10-11  Chris Toshok  <toshok@ximian.com>
-
-	* e-passwords.c (e_passwords_init): open the bonobo config db for
-	our passwords.
-	(e_passwords_shutdown): sync and unref the bonobo db, and clear
-	out the per session hash.
-	(e_passwords_forget_passwords): remove the bonobo config db
-	/Passwords path, and free up the session hash (but don't destroy
-	it).
-	(e_passwords_remember_password): remove the key/value from the
-	session hash, after inserting it into the bonobo db.
-	(e_passwords_get_password): look up a session password for the
-	uri, and if it's not there, consult the bonobo db.
-	(e_passwords_ask_password): quiet gcc's warnings, and only consult
-	the toggle button state if we actaully created it.
-
-2001-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-url.c (e_uri_to_string): don't add the host if it's null
-
-2001-10-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* ename/e-address-western.c (e_address_western_parse): Made this
-	refuse to parse more than 2047 characters of address.
-
-2001-10-04  Dan Winship  <danw@ximian.com>
-
-	* e-passwords.c (e_passwords_add_password): Make this dup the
-	strings it's passed.
-	(*) Add lots of docs.
-
-2001-10-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-url.c (e_uri_new): default protocol to file: if not specified
-
-2001-10-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-url.c (e_uri_copy): duplicate also the params member
-
-2001-10-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-url.[ch] (e_uri_copy, e_uri_to_string): new functions
-	
-2001-10-01  Rodrigo Moya <rodrigo@ximian.com>
-	
-	* e-url.[ch]: added basic URI management functions
-
-	* Makefile.am: added BONOBO flags to make it compile with latest
-	Bonobo, which installs headers in a version-based directory
-
-2001-10-01  Dan Winship  <danw@ximian.com>
-
-	* e-passwords.c (e_passwords_ask_password): New, copied/renamed
-	from mailer and gnome-libs.
-
-2001-09-30  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (libeutil_la_SOURCES): add e-passwords.[ch]
-
-2001-09-30  Chris Toshok  <toshok@ximian.com>
-
-	* e-passwords.c: copy/rename the mail specific password stuff
-	here.
-
-	* e-passwords.h: same.
-
-2001-09-28    <NotZed@Ximian.com>
-
-	* e-msgport.c (e_msgport_put): Write the pipe notification outside
-	the lock.  This way if the pipe fills up because of too many
-	outstanding request, the queue isn't deadlocked.  This only
-	happens wiht 4096 outstanding messages, so something is getting
-	VERY busy!  Fixes #11121.
-
-2001-09-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-categories-master-list-wombat.c (ecmlw_load, ecmlw_save): Make
-	the printouts here conditionally compiled out.
-
-2001-09-21    <NotZed@Ximian.com>
-
-	* e-msgport.c (e_thread_destroy): Instead of using
-	pthread_cancel() which seems to have numerous implementation
-	issues, send a special quit message to the subordinate thread.
-	(thread_dispatch): When it gets a quit message, well, quit!
-
-2001-09-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-gtk-utils.c (widget_realize_callback_for_backing_store): Use
-	->bin_window [instead of ->window] if the widget is a GtkLayout.
-
-2001-09-17  Damon Chaplin  <damon@ximian.com>
-
-	* e-time-utils.c (e_time_parse_date): only use 1 format, so we are
-	consistent everywhere. If we support multiple formats we have to
-	support that in e_time_parse_date_and_time() which means an explosion
-	of different formats. I don't think the alternatives are that useful,
-	anyway.
-	(e_time_parse_date_and_time): parse everything in one go, to avoid
-	i18n problems. Also only use '%p' if the locale has am/pm strings.
-	(e_time_parse_time): Only use '%p' if locale has am/pm strings.
-
-2001-09-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-gtk-utils.c (gtk_radio_button_get_nth_selected): Removed.
-	(gtk_radio_button_select_nth): Removed.
-	(e_make_widget_backing_stored): New.
-
-2001-09-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-mktemp.c (e_mktemp_cleanup): Make sure the dir pointer is
-	non-NULL before using it.
-
-2001-09-08  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c (e_text_to_html_full): Fix some broken calls to
-	check_size that could result in memory corruption displaying short
-	replies.
-
-2001-09-06  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c (e_text_to_html_full): Add E_TEXT_TO_HTML_CITE,
-	to prepend "> " to each line.
-
-2001-09-05  Dan Winship  <danw@ximian.com>
-
-	* e-mktemp.c (get_path): Fix the check for the case when mkdir()
-	returns EEXIST to check S_ISDIR on the right structure component.
-	Fixes bug #8775.
-
-2001-08-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-time-utils.c (e_time_parse_date_and_time): Added format for 
-	"7 PM" and equivalents.  Fixes bug #7456.
-	(e_time_parse_time): Likewise.
-
-2001-08-28  Not Zed  <NotZed@Ximian.com>
-
-	* e-categories-master-list-wombat.c (ecmlw_load): Dont call
-	g_print with a NULL string.  See bug #7396.
-
-2001-08-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-mktemp.c (get_path): Make more robust.
-
-2001-08-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Added e-mktemp.[c,h] to the build.
-
-	* e-mktemp.c (e_mktemp): A new wrapper around mktemp so that we
-	can keep track of temp files for later cleanup.
-	(e_mkstemp): Same but obviously for the mkstemp call.
-	(e_mkdtemp): And finally a mkdtemp wrapper.
-
-2001-08-24  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* Makefile.am (libeutil_la_SOURCES): Added e-unicode-i18n.c and
-	e-unicode-i18n.h.
-
-	* e-unicode-i18n.[ch]: New files with two extra functions
-	(e_utf8_gettext, e_utf8_dgettext) and U_() macro.
-	Should be used instead of _() if we need UTF-8 string.
-
-2001-08-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* e-request.c (e_request_string): Modified to accept and return
-	UTF-8 string.  It's currently used only in
-	shell/e-shortcuts-view.c and we need UTF-8 there.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* e-time-utils.c (e_time_parse_date): added comments to help
-	translators a bit.
-
-2001-08-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-categories-config.c (e_categories_config_get_icon_for): return
-	when there's no icon associated with the category
-
-	* e-categories-config.c: reworked to use the
-	ECategoriesMasterListWombat class. Also, load correctly images
-	(fixes #6794)
-
-2001-08-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-categories-master-list-wombat.c (ecmlw_destroy): Chain to the
-	destroy handler in the parent class!
-
-	* e-list-iterator.c (e_list_iterator_destroy): Likewise.  Sigh.
-
-	* e-list.c (e_list_destroy): Likewise.  Double sigh.
-
-2001-08-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dialog-utils.h: New.
-	* e-dialog-utils.c: New.
-
-2001-08-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-bonobo-factory-util.c
-	(e_bonobo_generic_factory_multi_display_new): New function to
-	create a factory that creates separate component instances for
-	different displays.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-list-iterator.c (e_list_iterator_next): Made it so that
-	e_list_iterator_next goes to the first element if it's set to
-	NULL.  This makes deleting the first element and then doing
-	e_list_iterator_next go to the new first element.  Did the analogy
-	for e_list_iterator_prev for completeness and consistency's sakes.
-	Fixes Ximian bug #6057.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-categories-master-list-wombat.c (ecmlw_load): Fixed the load
-	statement here by just using array_from_string.
-	(ecmlw_save): Removed the part where we save the icons and colors
-	since that's handled in the array_to_string function.  Fixes
-	Ximian bug #4451.
-
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* e-dbhash.c (string_to_dbt): memset everything to 0
-	(md5_to_dbt): ditto
-
-2001-07-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-categories-config.c (initialize_categories_config): use the 2
-	new category icons (16_category_suppliers.png and
-	16_category_time-and-expenses.png)
-
-2001-07-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-categories-config.c (initialize_categories_config): use the 2
-	new category icons
-
-	* Makefile.am: s/imagedir/imagesdir
-
-2001-07-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-categories-config.c (initialize_categories_config): generate
-	default configuration for icons-per-category the first time. And
-	use a global (for this file) Bonobo_ConfigDatabase
-
-2001-07-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-categories-config.c (e_categories_config_get_icon_for):
-	(e_categories_config_get_icon_file_for):
-	(e_categories_config_set_icon_file_for): use GdkPixbuf to load images
-
-2001-07-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-time-utils.c (parse_with_strptime): Generalized function for
-	trying a number of strptime() formats on a string.
-	(e_time_parse_time): Use parse_with_strptime().
-	(e_time_parse_date): New function, analogous to the previous one,
-	but uses a number of date formats.
-
-2001-07-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-time-utils.c (e_time_parse_date_and_time): If the string is
-	empty, clear the struct tm before returning.
-
-2001-07-12  Jon Trowbridge  <trow@ximian.com>
-
-	* e-html-utils.c: Added is_addr_char_no_pipes macro, which specifically
-	does not consider '|' ("pipe") to be a legal address character.
-	(email_address_extract): Use is_addr_char_no_pipes when looking for
-	e-mail addresses to turn into HTML links. (Bug #3940)
-
-2001-07-05  Not Zed  <NotZed@Ximian.com>
-
-	* e-memory.c: Added some malloc check stuff.
-
-2001-07-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-categories-master-list-wombat.c (ecmlw_load): load all icons
-	and colors for each category
-
-	(ecmlw_save): save all icons and categories associated with
-	each category
-
-	* e-categories-config.c: use BonoboConf to store/retrieve settings,
-	and use ECategoriesMasterListWombat when creating a ECategories
-	dialog widget
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (libeutil_la_SOURCES): Added
-	e-categories-master-list-wombat.c and
-	e-categories-master-list-wombat.h.
-	(INCLUDES): Added $(BONOBO_CONF_CFLAGS).
-
-	* e-categories-master-list-wombat.c,
-	e-categories-master-list-wombat.h: New class implementing a master
-	list that stores its state using bonobo-conf.
-
-2001-07-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-categories-config.[ch]: new file for a set of functions for
-	managing category-related (icons, colors) configuration
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-request.c: New.
-	* e-request.h: New.
-
-2001-06-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-sexp.c (term_eval_and): When ANDing two bools, don't use a
-	bitwise AND.
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: Split e-db3-utils and e-dbhash off into libedb3util
-	so eutil won't depend on db3.
-
-2001-06-15  Not Zed  <NotZed@Ximian.com>
-
-	* e-sexp.c (parse_values): REmove a silly hardcoded term limit,
-	oops forgot about that.
-
-2001-06-11  Damon Chaplin  <damon@ximian.com>
-
-	* e-time-utils.c (e_time_parse_date_and_time): skip any non-digits
-	while looking for dates and times. This should fix some translation
-	problems. Though there is still a problem with Japanese, where the
-	am/pm flag comes before the time so we will skip it incorrectly.
-
-2001-06-10  Damon Chaplin  <damon@ximian.com>
-
-	* e-time-utils.c (e_time_parse_date_and_time): 
-	(e_time_parse_time): got rid of '%n' at end of each format string
-	for strptime. I don't know how I managed to put them in there.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (INCLUDES): Added db3 cflags.
-
-	* e-dbhash.c: Made this use db3.
-
-	* e-db3-utils.c, e-db3-utils.h: New files with some helper
-	functions.
-
-2001-05-27  Dan Winship  <danw@ximian.com>
-
-	* e-gui-utils.c: Remove e_pixmaps_update (moved to libeshell) so
-	libeutil won't depend on bonobo.
-
-2001-05-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-host-utils.c (e_gethostbyname_r)
-	[HAVE_GETHOSTBYNAME_R && GETHOSTBYNAME_R_FIVE_ARGS]: Set `*herr'
-	to zero if the function returns a non-NULL pointer to the hostent.
-	According to the docs, a returned non-NULL hostent always means
-	"no error" no matter what the returned value of `herr' is.  [And
-	in fact, at least on libc 2.2.3, trying to resolve `localhost'
-	sets herr to `HOST_NOT_FOUND' even if the name is resolved
-	correctly and the returned hostent is non-NULL.]
-
-2001-05-16  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c (e_text_to_html_full): add
-	E_TEXT_TO_HTML_ESCAPE_8BIT to turn non-US-ASCII characters into
-	"?"s.
-
-2001-05-14  Jon Trowbridge  <trow@ximian.com>
-
-	* e-html-utils.c (is_citation): Check for bad utf8.
-
-2001-05-08  Dan Winship  <danw@ximian.com>
-
-	* e-path.c (e_path_find_folders): Walk a hierarchy using the
-	"/subfolders/" convention and call a callback for each folder
-	found.
-
-2001-05-01  Dan Winship  <danw@ximian.com>
-
-	* e-msgport.c (e_mutex_assert_locked): Debugging routine. (Only
-	works for recursive mutexes right now.)
-
-	* e-html-utils.c (e_text_to_html_full): Don't use g_utf8_next_char
-	on text that isn't valid UTF8, since it won't work (and might even
-	get into an infinite loop).
-
-2001-04-29  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c (email_address_extract): Make this smarter. Now
-	e_text_to_html_full calls it when it sees a '@', and
-	email_address_extract deals with scanning both forward and
-	backward to find the bounds of the email address. It's still
-	fooled by Message-IDs, but there's not a whole lot we can do
-	there...
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* e-host-utils.c (e_gethostbyname_r): Make the Solaris and
-	no-gethostbyname_r implementations behave more like the Linux one.
-	Document.
-
-	* Makefile.am (INCLUDES): Remove UNICODE_CFLAGS
-	(libeutil_la_LIBADD): Change UNICODE_LIBS to GAL_LIBS
-
-2001-04-26  Not Zed  <NotZed@Ximian.com>
-
-	* e-memory.c (e_poolv_get): Modified to match e_strv_get
-	behaviour.  Assert on bad cases, and return "" rather than NULL
-	for empty/unset strings.
-	(e_poolv_new): Simplify the mutex cases, only have a single mutex
-	for mempool and hashtable references.
-	(e_poolv_set): Simplify mutex code.  Fixed a #ifdef orde prob in
-	profile stuff.  Always copy string to our own memory when we add
-	it to the hash, even if we free it; I think this would have led to
-	dangling references otherwise.
-	(e_poolv_destroy): Renamed from poolv_free, for consistency with
-	the rest of the allocators here.
-	(e_poolv_set): Add optional refcounting code here, not currently
-	enabled/used, but should make proper string collection work
-	easily.
-	(e_poolv_destroy): Unrefcount the strings here.
-	(e_poolv_cpy): Add refcounting code here.
-
-	* e-memory.[ch]: Applied Jacob's patches <jacob@ximian.com> for
-	'e-poolv' type, added his name to the authors list.
-
-2001-04-24  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c (check_size): If the buffer is too small, making
-	it twice as big does not guarantee it will be big enough. "Duh".
-	Also, a bunch of the check_size calls don't seem to be taking
-	trailing NULs into account, so add in a +1 here.
-
-2001-04-24  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-gui-utils.c, e-memory, e-msgport.c, e-pilot-map, e-sexp.c:
-	Added #include <glib.h> and move corresponding local headers
-	to the top to catch missing includes in them. Tip from clahey.
-	
-2001-04-24  Chris Toshok  <toshok@ximian.com>
-
-	* e-host-utils.h: remove prototype for e_gethostbyname_init.
-
-	* e-host-utils.c (e_gethostbyname_r): don't dynamically allocate
-	anything - store everything in the buffer that's passed in.  Also,
-	stop using EMutex.  Switch to a static GMutex (so we can
-	initialize it without having e_gethostbyname_init).
-	(e_gethostbyname_init): removed.
-	
-2001-04-23  Jon Trowbridge  <trow@ximian.com>
-
-	* e-html-utils.c (e_text_to_html_full): Removed attempts to use
-	Radek's evil <DATA> hacks, which were just causing me
-	(and GtkHTML) grief.
-
-2001-04-23  Jon Trowbridge  <trow@ximian.com>
-
-	* e-host-utils.c: Include glib.h, so that the g_warning in
-	e_gethostbyname_r will be treated as a macro and not as an
-	unresolved symbol.
-
-2001-04-22  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (libeutil_la_SOURCES): add e-host-utils.[ch]
-
-	* e-host-utils.c: new file, with e_gethostbyname_r.
-
-	* e-host-utils.h: new file.
-
-2001-04-19  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c (is_citation): ">From" is not a citation unless
-	the previous or following line is a citation.
-	(e_text_to_html_full): Update for is_citation change. Also, when
-	marking citations, unmangle mbox From-mangling.
-	
-2001-04-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-sexp.c (e_sexp_parse): Start parsing the sexp with
-	parse_value(), not parse_list(), because we may have immediate
-	values (e.g. "#f") as the whole sexp.
-
-2001-04-08  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: Setup up the conduit library building better so the
-	files get disted
-
-2001-04-06  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-sexp.c (scanner_config): Added a question mark to the set of
-	valid characters for symbol names.
-	(parse_value): Fixed parsing of boolean values.
-	(parse_term_free): Added missing clause for ESEXP_TERM_BOOL.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* ename/test-ename-western-gtk.c: Fix headers.
-	
-2001-04-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-sexp.h (ESExpResultType): Added ESEXP_RES_TIME for time
-	values.
-	(ESExpResult): Added a "time_t value.time" field.
-	(ESExpTermType): Added ESEXP_TERM_TIME.
-	(ESExpTerm): Added a "time_t value.time" field.
-
-	* e-sexp.c (e_sexp_result_free): Deal with time values.  Also, be
-	more paranoid; added a default clause with g_assert_not_reached().
-	(term_eval_lt): Deal with time values.
-	(term_eval_gt): Likewise.
-	(term_eval_eq): Likewise.
-	(term_eval_plus): Likewise.
-	(term_eval_sub): Likewise.
-	(e_sexp_term_eval): Likewise.
-	(eval_dump_result): Likewise.
-	(parse_dump_term): Likewise.
-	(parse_term_free): Likewise.
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* e-gui-utils.h: new type EPixmap, which is used to cache pixmaps for
-	bonobo components. use e_pixmaps_update to load icons into ui
-	component.
-	* e-gui-utils.c: implementation of EPixmap cache, moved here from
-	mail/folder-browser-factory.c.
-
-2001-03-31  Jon Trowbridge  <trow@ximian.com>
-
-	* e-url.c (e_url_shroud): Check that first_colon < last_at,
-	to prevent horrible things from happening.  Removed spew.
-	(e_url_equal): Removed spew.
-
-2001-03-30  Jon Trowbridge  <trow@ximian.com>
-
-	* e-html-utils.c (e_text_to_html_full): Add support for converting
-	e-mail addresses to links.
-	(is_email_address): Added.  Identifies e-mail addresses.
-	(email_address_extract): Added.  Extracts a copy of the e-mail
-	address from the text.
-
-	* e-html-utils.h (E_TEXT_TO_HTML_CONVERT_ADDRESSES): Added.
-
-	* e-url.c (e_url_shroud): Added.  Copy a url, replacing
-	any plaintext passwords with a single *.
-	(e_url_equal): Compare two urls, taking into account that
-	they may or may not be shrouded.
-
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-corba-utils.h: Remove #include <glib.h>
-	* e-dialog-widgets.c: Shuffle some headers.
-	* e-dialog-widgets.h: Remove #include <libgnomeui/gnome-propertybox.h>
-	* e-gtk-utils.c: #include <gtk/gtksignal.h>
-	* e-gtk-utils.h: Replace #include <gtk/gtk.h>
-	* e-gui-utils.c: Replace #include <gnome.h>
-	* e-html-utils.c: Shuffle headers.
-	* e-iterator.c: Replace #include <gtk/gtk.h>
-	* e-iterator.h: Replace #include <gtk/gtk.h>
-	* e-list-iterator.c: Remove #include <gtk/gtk.h>
-	* e-list-iterator.h: Replace #include <gtk/gtk.h>
-	* e-list.c: Remove #include <gtk/gtk.h>
-	* e-list.h: Replace #include <gtk/gtk.h>
-	* e-memory.c: #include <string.h> and <stdlib.h>
-	* e-msgport.c: Move around some includes. s/%d/%ld/g in a printf()
-	call to fix a warning.
-	* e-pilot-map.c: #include <string.h>. Replace #include <gnome.h>
-	* e-pilot-util.c: Remove #include <gnome.h>
-	* e-sexp.c: Remove #include <glib.h>
-	* e-sexp.h: Replace #include <gtk/gtk.h>
-	* e-time-utils.c: #include <string.h>
-	* md5-utils.c: Shuffle headers.
-	* test-ename-western-gtk.c: Replace #include <gnome.h>
-	* test-ename-western.c: Same here.
-	
-2001-03-20  Radek Doulik  <rodo@ximian.com>
-
-	* e-html-utils.c (e_text_to_html_full): new function, extracted
-	from e_text_to_html, added color parameter
-
-2001-03-19  Radek Doulik  <rodo@ximian.com>
-
-	* e-html-utils.c (e_text_to_html): support mark citation
-
-	* e-html-utils.h (E_TEXT_TO_HTML_MARK_CITATION): added
-	E_TEXT_TO_HTML_MARK_CITATION
-
-2001-03-18  Damon Chaplin  <damon@ximian.com>
-
-	* e-time-utils.c (e_time_format_time): added function to format just
-	the time.
-
-2001-03-16  Dan Winship  <danw@ximian.com>
-
-	* e-path.c (e_path_to_physical): Fix a bug noticed by kmaraas
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c (url_extract): Fix a bit: [mailto:foo] shouldn't
-	grab the ']'
-
-2001-03-12  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: update cflag macros
-
-2001-03-07  Dan Winship  <danw@ximian.com>
-
-	* e-html-utils.c (url_extract): Fix an off-by-one in the "is this
-	for real?" check so that "http:// " won't get URLified
-
-2001-03-04  Damon Chaplin  <damon@ximian.com>
-
-	* e-time-utils.[hc]: new files to contain functions to parse and
-	format dates and times for various calendar widgets.
-
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* e-path.c (e_path_to_physical): New function to turn foo/bar into
-	foo/subfolders/bar. The inverse function doesn't exist yet because
-	I didn't need it. Also, if the shell were going to use this, we'd
-	need a few more tools...
-
-	* Makefile.am (libeutil_la_SOURCES): Add e-path.[ch]
-
-2001-03-01  Not Zed  <NotZed@Ximian.com>
-
-	* e-sexp.c (e_sexp_encode_string): Make it handle a NULL string as
-	an empty string.
-
-2001-02-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-msgport.c (e_thread_destroy): Wait a lot lot longer for
-	threads to finish.
-	: Turned off some of the debug.
-
-2001-02-08  Not Zed  <NotZed@Ximian.com>
-
-	* e-memory.c (EMemChunk): Changed to allocate raw blocks for the
-	data, and keep track of them with an array, this is so the native
-	malloc alignment is not lost at the allocation stage.
-
-2001-01-30  Not Zed  <NotZed@Ximian.com>
-
-	* e-msgport.c (e_thread_destroy): Turn on joining of cancelled threads.
-	(e_msgport_wait): Put a cleanup handler to clear the mp lock if it
-	happens in cond_wait, since it will be locked again.
-
-2001-01-29  Not Zed  <NotZed@Ximian.com>
-
-	* e-msgport.c (e_thread_put): If we have waiting threads, then
-	dont start a new one for the NEW case.
-	(thread_dispatch): For the NEW case, dont exit, just keep running,
-	waiting for a new message to come along.
-	(e_thread_destroy): When cleaning up NEW threads, cancel any
-	non-busy threads.
-
-2001-01-24  Not Zed  <NotZed@Ximian.com>
-
-	* e-sexp.h (ESExp): Add chunk allocators.
-
-	* e-sexp.c: Removed some redundant debug printfs.
-	(e_sexp_term_eval): Dont allocate result till we have it. so we
-	can have a fatal error, and not leak it.
-	(term_eval_plus): If we have to abort, free our arguments.
-	(term_eval_sub): Same.
-	(parse_new_term): Renamed to parse_term_new for consistency.
-	Fixed callers.
-	(e_sexp_result_new): Add the esexp as an argument.  Ouch, lots of
-	code to change for this.  Allocate blocks from an ememchunk.
-	Fixed all callers.
-	(e_sexp_result_free): Same as above, free blocks from the
-	ememchunk.  Fixed all callers.
-	(parse_term_new): 
-	(parse_term_free): Similarly, add the esexp to the argument, and
-	alloc/free from memchunks.  Fixed all local callers.
-	(e_sexp_init): Setup the memory chunk allocators.
-	(e_sexp_finalise): Destroy memchunk allocators.
-
-2001-01-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-sexp.c (e_sexp_parse): Setup error return and return error on
-	parse error.
-	(parse_list): Fail if we have a problem.
-	(parse_value): Here too.
-	(fatal_error): Fatal error handling function, jumps back to the
-	top caller.
-	(term_eval_and):
-	(e_sexp_term_eval): 
-	(term_eval_sub): 
-	(term_eval_plus): 
-	(term_eval_gt): 
-	(term_eval_lt): 
-	(term_eval_or):  Fail on error.
-	(e_sexp_term_eval): Added a comment about where this can be
-	called, which is only from inside e_sexp_eval().
-	(e_sexp_eval): Setup setjmp error handler.
-	(e_sexp_error): Error accessor function.
-
-	* e-sexp.h: Added a longjmp environment to the structure, and an
-	error return to parse.	
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* e-dbhash.c (md5_to_dbt): New function, can't use strlen on the md5
-	hash because it might have null chars in it.
-	(e_dbhash_add): use md5_to_dbt
-
-2001-01-19  JP Rosevear  <jpr@ximian.com>
-
-	* e-pilot-map.c (e_pilot_map_remove_by_pid): Remove an item by pid
-	(e_pilot_map_remove_by_uid): ditto for uid
-
-	* e-pilot-map.h: new protos
-
-2001-01-17  Jason Leach  <jasonleach@usa.net>
-
-	* e-gtk-utils.c (gtk_radio_button_get_nth_selected): New function,
-	name describes it well.
-	(gtk_radio_button_select_nth): New function.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-dialog-widgets.[ch]: Ximianified.
-
-2001-01-15  JP Roseveaer  <jpr@ximian.com>
-
-	* e-pilot-util.c (e_pilot_utf8_from_pchar): Dup the string passed
-	in, not the temporary string. d'oh.
-
-2001-01-04  Dan Winship  <danw@helixcode.com>
-
-	* e-msgport.c: #define E_THREAD_NONE as ((pthread_t)~0) and use
-	that instead of ~0 throughout. (pthread_t is a pointer type on my
-	system, so there are lots of warnings without the cast.)
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* Merge from camel-mt-branch.
-
-2000-12-20  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-util.c (e_pilot_utf8_to_pchar): Check for null strings
-	(e_pilot_utf8_from_pchar): ditto
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-util.c (e_pilot_utf8_to_pchar): Convert utf8 strings to
-	pilot character set
-	(e_pilot_utf8_from_pchar): vice versa
-
-	* Makefile.am: Conditionally build e-pilot-util.[hc] because
-	they depend on pilot-link stuff
-
-2000-12-23  Not Zed  <NotZed@HelixCode.com>
-
-	* e-msgport.c (e_dlist_length): Util function.
-	(e_thread_new): Another new thread primitive.  This one is a
-	re-usable 'server thread' thingy.
-
-2000-12-21  Not Zed  <NotZed@HelixCode.com>
-
-	* Makefile.am (libeutil_la_SOURCES): Added msgport stuff.
-
-	* e-msgport.[ch]: Some thread primitives.  e_dlist, a
-	double-linked list (ok, not a thread primitive, but used in ...),
-	e_msgport - an asynchronous, non-copying message passing
-	rendesvous port, and e_mutex, a portably configurable mutex.
-
-2000-12-19  Not Zed  <NotZed@HelixCode.com>
-
-	* e-sexp.c: Make the code compile without being a gtk object (the
-	old code can still be built as a gtk object if required).  Also
-	removed some dead code.
-	(e_sexp_ref): New function to ref if we're not a gkt object.
-	(e_sexp_unref): Same for unref.
-
-2000-12-13  Larry Ewing  <lewing@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): make sure we actually make
-	enough space for "&nbsp;".
-
-2000-12-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (e_dialog_editable_get): Updated
-	documentation comment.
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-corba-utils.h: New.
-
-	* e-corba-utils.c: New.
-	(e_safe_corba_string): New.
-
-2000-11-30  Not Zed  <NotZed@HelixCode.com>
-
-	* e-memory.c (e_strv_new): Fix typename of args (for all funcs).
-	(e_strv_set_ref): Assert the index is in range.
-	(e_strv_set_ref_free): "
-	(e_strv_set): "
-	(e_strv_get): "
-
-2000-11-29  Not Zed  <NotZed@HelixCode.com>
-
-	* e-sexp.c (term_eval_lt): Plug a memleak, need to free results
-	from term_eval().
-	(term_eval_gt): 
-	(term_eval_eq): 
-
-2000-11-27  Not Zed  <NotZed@HelixCode.com>
-
-	* e-memory.c (e_mempool_new): Added some locking to global data.
-	This should make the interfaces mt-safe, although each object is
-	only per-thread safe.
-
-2000-11-22  Not Zed  <NotZed@HelixCode.com>
-
-	* e-memory.c (e_mempool_alloc): If we dont get a big enough chunk
-	in the first node, give up.  Otherwise we spend too much time
-	searching.
-	(e_mempool_strdup): Doh, and allocate enough for the terminating
-	NUL at that.
-	(e_strv_set_ref_free): New function, set a reference to a string
-	that is then owned/free'd by the strv.
-	(e_strv_destroy): If there are any strings to destroy, free them
-	here.
-
-2000-11-21  Not Zed  <NotZed@HelixCode.com>
-
-	* e-memory.c (e_memchunk_alloc0): New function to allocate a
-	zero'd out chunk.
-	(e_mempool_strdup): New function to strdup into a mempool.
-
-2000-11-20  Not Zed  <NotZed@HelixCode.com>
-
-	* e-memory.[ch]: New routines for fast memory management and
-	compact string array storage.
-
-	* Makefile.am (libeutil_la_SOURCES): Added e-memory.[ch].
-
-2000-11-09  JP Rosevear  <jpr@helixcode.com>
-
-	* e-dbhash.h: oops thats func not *func
-
-	* e-dbhash.c (e_dbhash_foreach_key): Memset the data DBT to 0
-
-2000-11-07  JP Rosevear  <jpr@helixcode.com>
-
-	* Makefile.am: Build e-dbhash.[hc]
-
-	* e-dbhash.[hc]: New routines to manage a db database on disk that
-	contains md5 hashed data and indexed by uids.  Provides comparison
-	functions and such so the caller does not have to do the md5 bits.
-
-200-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-dialog-widgets.c: #include <string.h> to quench warning.
-	* e-sexp.c: #include <stdlib.h> for same reason.
-	
-2000-10-27    <jpr@helixcode.com>
-
-	* Makefile.am: build md5-utils
-
-	* md5-utils.c: Make part of util, get rid of camel stream util
-	function include string.h
-
-	* md5-utils.h: ditto
-	
-2000-10-27    <jpr@helixcode.com>
-
-	* e-pilot-map.c (e_pilot_map_lookup_uid): Return null if no
-	pnode was found.
-
-2000-10-27  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-map.c (map_sax_start_element): Get archive field while
-	parsing
-	(map_write_foreach): Write out archive field
-	(e_pilot_map_pid_is_archived): implement
-	(e_pilot_map_uid_is_archived): ditto
-	(e_pilot_map_insert): Insert new node structures
-	(e_pilot_map_lookup_pid): Take into account the list is now
-	a list of structures
-	(e_pilot_map_lookup_uid): ditto
-
-2000-10-26  Michael Meeks  <michael@helixcode.com>
-
-	* ename/e-address-western.c (e_address_western_is_postal): 
-	unsigned chars.
-
-	* ename/e-name-western.c (e_name_western_get_one_prefix_at_str):
-	cast to unsigned char.
-
-2000-10-25  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Deal properly with URLs at the
-	end of the buffer. (The old code would append a "&#0;" to the
-	text.)
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-map.c (e_pilot_map_lookup_pid): Lookup a pid by uid.
-	(e_pilot_map_lookup_uid): Lookup a uid by pid.
-	Now this is wrapped, we can store archive info internally
-
-	* e-pilot-map.h: New accessor prototypes
-	
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* ename/Makefile.am (INCLUDES): Remove unused GNOMELOCALEDIR
-	setting.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-map.c: Operate with EPilotMap structure so things are
-	abstract to the caller
-	(e_pilot_map_pid_is_archived): Infrastructure for marking records
-	as archived
-	(e_pilot_map_uid_is_archived): ditto
-
-	* e-pilot-map.h: Add more to public interface, including EPilotMap
-	structure
-	
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-map.c: Pilot map functions grabbed from existing conduits
-
-	* e-pilot-map.h (e_pilot_map_write): Header
-
-2000-10-18  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): If unicode_get_utf8 returns -1,
-	assume it was actually undeclared iso-8859-1 text.
-
-2000-10-17  Jesse Pavel  <jpavel@helixcode.com>
-
-	* ename/e-address-western.c: made the routines use the stardard
-	e_strstrcase instead of the included function that existed
-	earlier.
-
-2000-10-11  Iain Holmes  <iain@helixcode.com>
-
-	* ename/e-address-western.c (e_address_western_parse): g_strconcat
-	needs to be NULL terminated or it goes funny.
-
-Tue Sep 26 16:48:49 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS).
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: add ename as a SUBDIR
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-list-iterator.c, e-list.c, e-list.h: Made e_list a bit more
-	reentrant.  If a iterator gets its data pulled out from under it
-	while in a loop, it goes back one so that loops will be able to
-	continue.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed all the files moved to gal.
-
-	* e-dialog-widgets.c: Fixed the #include lines to deal properly
-	with gal.
-
-	* e-gui-utils.c, e-gui-utils.h: Removed all of the functionality
-	that was moved to gal.
-
-	* e-canvas-utils.c, e-canvas-utils.h, e-canvas-vbox.c,
-	e-canvas-vbox.h, e-canvas.c, e-canvas.h, e-cursors.c, e-cursors.h,
-	e-font.c, e-font.h, e-popup-menu.c, e-popup-menu.h, e-printable.c,
-	e-printable.h, e-unicode.c, e-unicode.h, e-util.c, e-util.h,
-	e-xml-utils.c, e-xml-utils.h: Moved to gal.
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-font.c: Fixed an uninitialized variable.
-
-2000-09-12  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.c (e_utf8_to_gtk_string_sized): Use underscores
-	for untranslatable characters
-	(e_utf8_from_gtk_string_sized): Ditto
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* e-font.c (e_font_from_gdk_font): Change this a bit so that if
-	you pass it a bold font, it puts that in font->bold and finds a
-	lighter font for font->font (if it can). This is for themes like
-	Metal where the default font is bold.
-	(find_variants): renamed from find_best_bold
-	
-2000-09-11  Dan Winship  <danw@helixcode.com>
-
-	* e-font.c (find_best_bold): Thou shalt leave space for the
-	trailing \0.
-
-	* e-util.c (e_strstrcase): The return value should not be
-	const. (Well, unless the input was, but you can't know that.)
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-unicode.c, e-unicode.h: Added e_utf8_gtk_editable_get_text and
-	e_utf8_gtk_editable_set_text.
-
-2000-09-11  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-font.c: Try to find real bold variant of X font, fall
-	to double stroke only if not found
-
-2000-09-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-gtk-utils.c: New.
-	(e_gtk_signal_connect_full_while_alive): New.
-
-	* e-gtk-utils.h: New.
-
-2000-09-08  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-font.c: Use experimental 16-bit font stuff for EFonts
-
-2000-09-08  Dan Winship  <danw@helixcode.com>
-
-	* e-popup-menu.h: remove consts from the EPopupMenu structure: the
-	caller may want to modify its own EPopupMenu before calling
-	e_popup_menu_run.
-
-2000-09-07  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-dialog-widgets.c (e_dialog_editable_get): Use UTF-8
-	(e_dialog_editable_set): Use UTF-8
-
-	* e-font.c (translate_encoding): More encodings
-	(e_gdk_font_encoding): Use experimental stuff
-
-	* e-unicode.* (e_utf8_gtk_editable_insert_text): New wrapper
-	
-2000-09-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-canvas.c (emit_event): Remove incorrect optimization.  Events
-	are read-only!
-
-2000-09-04  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.c: Added new font code, but comment it out now
-	* e-font.h, e-font.c: Test code for font analyzing
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h, e-unicode.c: New functions
-	e_utf8_gtk_clist_append, e_utf8_gtk_clist_set_text
-	e_unicode_init
-
-2000-08-31  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Use UTF-8
-
-	* e-unicode.h:
-	* e-unicode.c (g_unichar_to_utf8): glib 1.3 function
-	(gdk_keyval_to_unicode): gdk 1.3 function
-	(e_utf8_from_gdk_event_key): Use keyval, not string
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h: #define gnome_font_get_size and
-	gnome_font_get_width, and gnome_font_lookup_default,
-	if compiling with gnome-print 0.20
-
-2000-08-30  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (libeutil_la_LIBADD): make e-util depend on
-	libunicode
-
-	* e-popup-menu.c (make_item): Use GtkMenuItem rather than
-	GtkPixmapMenuItem for items with no pixmaps, so that if the whole
-	menu is pixmapless, you don't get a column of blank pixmaps.
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h:
-	* e-unicode.c (e_utf8_gtk_menu_item_new_with_label): New wrapper
-
-2000-08-23  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h:
-	* e-unicode.c (e_utf8_strstrcase): New function
-
-2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (e_dialog_editable_set): Constify.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h:
-	* e-unicode.c: e_utf8_gtk_editable_get_chars
-	e_utf8_gtk_entry_get_text
-	e_utf8_gtk_entry_set_text
-	e_utf8_to_gtk_string: New convenience functions
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h:
-	* e-unicode.c: Some convenience functions to deal with Gtk+ and UTF-8
-
-	* Makefile.am: Added e-unicode.h, e-unicode.c
-
-2000-08-21  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-font.h:
-	* e-font.c: Changed UTF-8 syntax from char-based to byte-based
-	
-2000-08-21  Peter Williams  <peterw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Fix a booboo in the tab
-	expansion code (didn't use the new value of 'out').
-
-2000-08-19  Lauris Kaplinski  lauris@helixcode.com
-
-	* e-font.h: #define e_font_height(f) to save some space
-	
-2000-08-19  Lauris Kaplinski  lauris@helixcode.com
-
-	* e-font.h:
-	* e-font.c: Thin wrapper around GdkFont to deal with UTF-8 directly
-	Also handles bold/italic styling
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* e-sexp.c (scanner_config): Add "-" to be an acceptable
-	first character for an operation -- yaaay subtraction!
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Fix the tab expansion
-	for when the length would exceed the ten characters that
-	we allocated.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* e-setup.[ch]: Remove. The shell tells the components where
-	the evolution homedir is now.
-	
-	* Makefile.am (libeutil_la_SOURCES): Remove e-setup.c
-
-	* e-html-utils.c (e_text_to_html): If converting both spaces and
-	newlines, then convert tabs too. The joys of pseudo-<PRE>.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-popup-menu.c: Fix the bug where it truncates the last item
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-popup-menu.c: Ooops.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added uncompiled e_read_uri function.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-popup-menu.c, e-popup-menu.h: Added a hide_mask argument to
-	the two popup menu functions.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-gui-utils.c, e-gui-utils.c: Added
-	e_container_change_tab_order.
-
-2000-07-27  Peter Williams  <peterw@helixcode.com>
-
-	* e-canvas.c (e_canvas_destroy): Chain the
-	destroy handler.
-	
-2000-07-25  Peter Williams  <peterw@helixcode.com>	
-	
-	* e-canvas.c (emit_event): Don't bother with 
-	dereferencing the event pointer.
-	(e_canvas_item_set_cursor): Reference our selection
-	item; print a debug message. Deref when destroying
-	(e_canvas_item_add_selection): Same.
-	(e_canvas_item_remove_selection): Same.
-	
-2000-07-25  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (libeutil_static_la_LDFLAGS): Build both libraries
-	(a typo didn't build libeutil.la, only -static.)
-
-2000-07-25  Seth Alves  <alves@hungry.com>
-
-	* Makefile.am (libeutil_static_la_LDFLAGS): build static version
-	of library for conduit to use
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added a bunch of e_marshal functions.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_strstrcase function.
-
-2000-07-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas-vbox.c: Removed some debugging printfs.
-	
-	* e-canvas.c (e_canvas_unrealize): Call parent unrealize method.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-sexp.c (eval_dump_result): `#if 0'ed out.
-
-	* e-popup-menu.h (e_popup_menu_create): New prototype.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c: Fix warnings.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-list.c, e-list.h: Added e_list_duplicate.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_strsplit to work around a bug in
-	g_strsplit.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-iterator.c, e-iterator.h, e-list-iterator.c,
-	e-list-iterator.h: Added last and insert functions.
-
-2000-07-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c: Added docstrings.  This file did not have
-	them at all.  EEEEEEK!
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* e-sexp.c (e_sexp_parse): Kill debugging message
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-iterator.c, e-iterator.h, e-list-iterator.c,
-	e-list-iterator.h, e-list.c, e-list.h: New list class with
-	iterators.
-
-	* e-canvas.c: Made it so that you don't get the same selection in
-	the selection list more than once.
-
-2000-07-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-gui-utils.h: #include <libgnomeui/gnome-messagebox.h>.  It's
-	needed to be able to pass an appropriate @type arg to
-	`e_notice()'.
-
-2000-06-29  Jody Goldberg <jgoldberg@home.com>
-
-	* e-canvas.c (e_canvas_init) : Init the InputContext members
-	(e_canvas_class_init) : Add a handler for unrealize.
-	(e_canvas_focus_in) : enable the input context.
-	(e_canvas_focus_out) : enable the input context.
-	(e_canvas_realize) : Create an input context.
-	(e_canvas_unrealize) : New function to release the input context.
-
-2000-06-28  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c (url_extract): add ")" to the set of characters
-	to back up over at the end of a potential URL.
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-dialog-widgets.c (get_toggle_value): Use `value_var', not
-	`value'.
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): `-I$(top_srcdir)' to fix compilation
-	with builddir != srcdir.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-canvas-vbox.c and e-canvas-vbox.h.
-
-	* e-canvas-vbox.c, e-canvas-vbox.h: New canvas object to act like
-	a vbox using the reflow system.
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c, e-canvas.h: Added a variable to keep track of the
-	cursor.  Set the cursor when selection_add is called.  Properly
-	unset the cursor at the right times.
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c: Grab the focus when setting the cursor.
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c, e-canvas.h: Built a system for doing selections
-	and/or a cursor in canvas.
-
-2000-06-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Changed the needed e_marshal functions.
-
-	* e-printable.c, e-printable.h: Added a quantize parameter to
-	e_printable_height.  Also, added a e_printable_will_fit function.
-	
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-printable.c and e-printable.h.
-
-	* e-printable.c, e-printable.h: This new class is a printing
-	context.  Other classes return an EPrintable which represents a
-	context for printing that object.
-
-	* e-util.c, e-util.h: Added
-	e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL and
-	e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c: Fixed e_marshal_INT__INT_INT_POINTER.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_marshal_INT__INT_INT_POINTER.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* e-util.c (g_int_compare): Duh! -1 != 1. :)
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-sexp.c (e_sexp_term_eval): g_return_val_if_fail to prevent a crash.
-
-2000-05-30  Not Zed  <NotZed@HelixCode.com>
-
-	* e-sexp.c (e_sexp_encode_bool): Utility function to build a bool
-	as part of an expression string.
-	(e_sexp_encode_string): Likewise for strings.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas-utils.c, e-canvas-utils.h: Added
-	e_canvas_item_show_area which makes sure that a particular area of
-	a given item is in the scroll area.
-
-2000-05-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (hook_radio): Use the exported function to
-	set the value.
-	(get_radio_value): Likewise.
-	(hook_option_menu): Likewise.
-	(get_option_menu_value): Likewise.
-	(hook_toggle): Likewise.
-	(get_toggle_value): Likewise.
-	(hook_spin_button): Likewise.
-	(get_spin_button_value): Likewise.
-	(hook_editable): Likewise.
-	(get_editable_value): Likewise.
-	(e_dialog_radio_set): Radio buttons are prepended to their parent
-	group's list, so we need to flip the index around when
-	getting/setting the value.
-	(e_dialog_radio_get): Likewise.
-
-2000-05-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (e_dialog_editable_set): Moved over from
-	event-editor-utils.c.
-	(e_dialog_editable_get): Likewise.
-	(e_dialog_toggle_set): Likewise.
-	(e_dialog_toggle_get): Likewise.
-	(e_dialog_spin_set): Likewise.
-	(e_dialog_spin_get_double): Likewise.
-	(e_dialog_spin_get_int): Likewise.
-	(e_dialog_option_menu_set): Likewise, and added a value map.
-	(e_dialog_option_menu_get): Likewise.
-	(e_dialog_dateedit_set): Likewise.
-	(e_dialog_dateedit_get): Likewise.
-	(e_dialog_radio_set): New function.
-	(e_dialog_radio_get): New function.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-paned.c, e-paned.h: Removed.
-
-2000-05-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (get_radio_value): Implemented.  Amazing that
-	one has to go through so much pain to get a stupid value from
-	GTK+.
-	(hook_option_menu): Implemented.  Same complaint.
-	(get_toggle_value): Implemented.
-	(get_spin_button_value): Implemented.
-	(get_entry_value): Implemented.
-	(e_dialog_widget_hook_value): Function to hook a widget to the
-	variable it will modify.
-	(e_dialog_get_values): Function to feed the variables from a
-	dialog's widgets.
-	(e_dialog_xml_widget_hook_value): Function to hook a widget from
-	a Glade file.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_write_file.
-
-2000-05-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.[ch]: New files with utilities for hooking up
-	widgets in Glade-generated dialogs.
-
-	* Makefile.am (libeutil_la_SOURCES): Added e-dialog-widgets.[ch].
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-gui-utils.c, e-gui-utils.h: Added e_container_foreach_leaf.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Add imagesdir support.
-
-	* e-gui-utils.c, e-gui-utils.h: Added e_create_image_widget for
-	glade use.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-xml-utils.c: xmlGetProp appears to return malloced memory.
-	Thus we must free it.
-
-2000-05-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-util.c (e_free_string_list): New function.
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_strdup_strip which returns a copy of
-	the string with the leading and trailing spaces removed.
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* e-sexp.c (e_sexp_finalise): Destroy the g_scanner when cleaning up.
-	(e_sexp_finalise): Free symbol table on finalise.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c: Remove reflow idle when being destroyed.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-html-utils.c: Got rid of some warnings.
-
-	* e-util.c, e-util.h: Added e_read_file which takes a filename and
-	returns a newly allocated string containing the contents of that
-	file.
-
-2000-05-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-util.h: #include <glib.h> and <gtk/gtktypeutils.h>.
-
-	* e-util.c (e_free_object_list): New utility function.
-
-2000-05-02  Damon Chaplin  <damon@helixcode.com>
-
-	* e-canvas.c (e_canvas_focus_in): 
-	(e_canvas_focus_out): set and reset the GTK_HAS_FOCUS flag. We now get
-	focus_out events correctly.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* e-sexp.c (e_sexp_finalise): Free the parse tree if we have one.
-	(e_sexp_parse): If we already have a parse tree, free it.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-05-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-xml-utils.c, e-xml-utils.h: Constified all the functions.
-
-2000-04-27  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Moved here from the mailer,
-	since it's of general use, and the composer needs it too.
-
-2000-04-24  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-popup-menu.c: New file.  Implements easy to use popup menus. 
-
-2000-04-24  Matt Loper  <matt@helixcode.com>
-
-	* e-paned.c: New file. Makes a GtkPaned with more than two
-	children.
-	* e-paned.h: same.
-
-	* Makefile.am: added e-paned.[ch].
-
-2000-04-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-xml-utils.c, e-xml-utils.h: Added
-	e_xml_get_child_by_name_by_lang.
-
-2000-04-16  Anders Carlsson  <andersca@gnu.org>
-
-      * e-canvas.c (e_canvas_class_init): Add realize.
-      (e_canvas_realize): Set the back pixmap to NULL to reduce flicker.
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-xml-utils.c: Fixing a warning.
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-xml-utils.c: Add g_return_if_fails.
-
-2000-04-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-cursors.c (e_cursor_get): Prevent next hacker to get bitten by this.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c: Added proper keyboard focus handling.
-
-2000-04-06  Matt Loper  <matt@helixcode.com>
-
-	* e-setup.c (e_setup_base_dir): Get/set Evolution's base directory
-	via gnome-config.
-	(mkdir_if_necessary): New function.
-	(e_setup_base_dir): Use mkdir_if_necessary().
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/e-sexp.h: Formatting cleanup.
-
-2000-03-07  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/Makefile.am (libeutil_la_SOURCES): s-sexp.h -> e-sexp.h.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-	
-	* e-util/e-canvas.c, e-util/e-canvas.h: Fixed some bugs here to
-	speed up reflow and to make it fail less often.
-
-2000-03-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util/e-canvas.c, e-util/e-canvas.h: Designed a new system for
-	doing hierarchical displays in the canvas.  Adds an extra idle
-	loop to the canvas system.
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util/e-xml-utils.c: Fixed e_xml_set_integer_prop_by_name.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util/e-xml-utils.c, e-util/e-xml-utils.h: Added
-	e_xml_set_integer_prop_by_name.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-	
-	* e-util/e-sexp.[ch]: Added.  moved from filter-sexp.[ch]
-
-	* e-util/Makefile.am (libeutil_a_SOURCES): Add e-sexp.
-	(noinst_LTLIBRARIES): Changed to a libtool library.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util/e-xml-utils.c, e-util/e-xml-utils.h: Added
-	e_xml_get_integer_prop_by_name.
-
-	* e-util/Makefile.am: Added e-util.c.
-
-	* e-util/e-util.h: Added e-util.c functions.
-
-	* e-util/e-util.c: New file for compare functions
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-	
-	* e-util/e-canvas-utils.h: Fixed the comment at the top and added
-	#ifndef __E_CANVAS_UTILS__.
-
-	* e-util/Makefile.am: Added e-xml-utils.c and
-	e-xml-utils.h.
-
-	* e-util/e-xml-utils.h, e-util/e-xml-utils.c: Added files for some
-	xml utilities.
-
-	* e-util/e-util.h: Added type EFocus which describes which
-	direction the focus will be coming from.
-
-2000-02-23  Dan Winship  <danw@helixcode.com>
-
-	* e-util/e-setup.c (e_setup_base_dir): Make ~/evolution mode 700
-	rather than mode 600 (and use the symbolic name rather than the
-	number).
-	
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-	
-	* e-util/Makefile.am: Add canvas utilities to libeutil.
-
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 9c09b9c6a2..a258c64f01 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -15,7 +15,6 @@ eutilinclude_HEADERS = 				\
 	e-alert.h				\
 	e-alert-activity.h			\
 	e-alert-dialog.h			\
-	e-bconf-map.h				\
 	e-binding.h				\
 	e-bit-array.h				\
 	e-categories-config.h			\
@@ -28,7 +27,6 @@ eutilinclude_HEADERS = 				\
 	e-extensible.h				\
 	e-extension.h				\
 	e-file-utils.h				\
-	e-folder-map.h				\
 	e-html-utils.h				\
 	e-icon-factory.h			\
 	e-import.h				\
@@ -38,6 +36,7 @@ eutilinclude_HEADERS = 				\
 	e-mktemp.h				\
 	e-module.h				\
 	e-non-intrusive-error-dialog.h		\
+	e-poolv.h				\
 	e-print.h				\
 	e-plugin.h				\
 	e-plugin-ui.h				\
@@ -96,7 +95,6 @@ libeutil_la_SOURCES =				\
 	e-alert.c				\
 	e-alert-activity.c			\
 	e-alert-dialog.c			\
-	e-bconf-map.c				\
 	e-binding.c				\
 	e-bit-array.c				\
 	e-categories-config.c			\
@@ -109,7 +107,6 @@ libeutil_la_SOURCES =				\
 	e-extensible.c				\
 	e-extension.c				\
 	e-file-utils.c				\
-	e-folder-map.c				\
 	e-html-utils.c				\
 	e-icon-factory.c			\
 	e-import.c				\
@@ -119,6 +116,7 @@ libeutil_la_SOURCES =				\
 	e-mktemp.c				\
 	e-module.c				\
 	e-non-intrusive-error-dialog.c		\
+	e-poolv.c				\
 	e-plugin.c				\
 	e-plugin-ui.c				\
 	e-plugin-util.c				\
@@ -208,7 +206,6 @@ errordir = $(privdatadir)/errors
 EXTRA_DIST =				\
 	e-system.error.xml		\
 	$(pilot_sources)		\
-	ChangeLog.pre-1-4		\
 	e-marshal.list
 
 BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA)
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index 39b5a5f778..6f96116c61 100644
--- a/e-util/e-alert-dialog.c
+++ b/e-util/e-alert-dialog.c
@@ -223,7 +223,7 @@ e_alert_dialog_constructed (GObject *obj)
 	gtk_label_set_selectable((GtkLabel *)w, TRUE);
 	gtk_label_set_line_wrap((GtkLabel *)w, TRUE);
 	gtk_label_set_markup((GtkLabel *)w, out->str);
-	GTK_WIDGET_UNSET_FLAGS (w, GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus (w, FALSE);
 	g_string_free(out, TRUE);
 	if (e_alert_get_scroll (alert)) {
 		gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *)scroll, w);
diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c
deleted file mode 100644
index d0bd526715..0000000000
--- a/e-util/e-bconf-map.c
+++ /dev/null
@@ -1,537 +0,0 @@
-/*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
-
-#include "e-bconf-map.h"
-
-#define d(x)
-
-static gchar hexnib[256] = {
-	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-	 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,-1,-1,-1,-1,-1,-1,
-	-1,10,11,12,13,14,15,16,-1,-1,-1,-1,-1,-1,-1,-1,
-	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-	-1,10,11,12,13,14,15,16,-1,-1,-1,-1,-1,-1,-1,-1,
-	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-};
-
-gchar *
-e_bconf_hex_decode (const gchar *val)
-{
-	const guchar *p;
-	gchar *o, *res;
-
-	o = res = g_malloc (strlen (val) / 2 + 1);
-	for (p = (const guchar *)val; (p[0] && p[1]); p += 2)
-		*o++ = (hexnib[p[0]] << 4) | hexnib[p[1]];
-	*o = 0;
-
-	return res;
-}
-
-gchar *
-e_bconf_url_decode (const gchar *val)
-{
-	const guchar *p = (const guchar *) val;
-	gchar *o, *res, c;
-
-	o = res = g_malloc (strlen (val) + 1);
-	while (*p) {
-		c = *p++;
-		if (c == '%'
-		    && hexnib[p[0]] != -1 && hexnib[p[1]] != -1) {
-			*o++ = (hexnib[p[0]] << 4) | hexnib[p[1]];
-			p+=2;
-		} else
-			*o++ = c;
-	}
-	*o = 0;
-
-	return res;
-}
-
-xmlNodePtr
-e_bconf_get_path (xmlDocPtr doc, const gchar *path)
-{
-	xmlNodePtr root;
-	gchar *val;
-	gint found;
-
-	root = doc->children;
-	if (strcmp ((gchar *)root->name, "bonobo-config") != 0) {
-		g_warning ("not bonobo-config xml file");
-		return NULL;
-	}
-
-	root = root->children;
-	while (root) {
-		if (!strcmp ((gchar *)root->name, "section")) {
-			val = (gchar *)xmlGetProp (root, (const guchar *)"path");
-			found = val && strcmp (val, path) == 0;
-			xmlFree (val);
-			if (found)
-				break;
-		}
-		root = root->next;
-	}
-
-	return root;
-}
-
-xmlNodePtr
-e_bconf_get_entry (xmlNodePtr root, const gchar *name)
-{
-	xmlNodePtr node = root->children;
-	gint found;
-	gchar *val;
-
-	while (node) {
-		if (!strcmp ((gchar *)node->name, "entry")) {
-			val = (gchar *)xmlGetProp (node, (const guchar *)"name");
-			found = val && strcmp (val, name) == 0;
-			xmlFree (val);
-			if (found)
-				break;
-		}
-		node = node->next;
-	}
-
-	return node;
-}
-
-gchar *
-e_bconf_get_value (xmlNodePtr root, const gchar *name)
-{
-	xmlNodePtr node = e_bconf_get_entry (root, name);
-	gchar *prop, *val = NULL;
-
-	if (node && (prop = (gchar *)xmlGetProp (node, (const guchar *)"value"))) {
-		val = g_strdup (prop);
-		xmlFree (prop);
-	}
-
-	return val;
-}
-
-gchar *
-e_bconf_get_bool (xmlNodePtr root, const gchar *name)
-{
-	gchar *val, *res;
-
-	if ((val = e_bconf_get_value (root, name))) {
-		res = g_strdup (val[0] == '1' ? "true" : "false");
-		g_free (val);
-	} else
-		res = NULL;
-
-	return res;
-}
-
-gchar *
-e_bconf_get_long (xmlNodePtr root, const gchar *name)
-{
-	gchar *val, *res;
-
-	if ((val = e_bconf_get_value (root, name))) {
-		res = g_strdup (val);
-		g_free (val);
-	} else
-		res = NULL;
-
-	return res;
-}
-
-gchar *
-e_bconf_get_string (xmlNodePtr root, const gchar *name)
-{
-	gchar *val, *res;
-
-	if ((val = e_bconf_get_value (root, name))) {
-		res = e_bconf_hex_decode (val);
-		g_free (val);
-	} else
-		res = NULL;
-
-	return res;
-}
-
-/* lookup functions */
-typedef gchar * (* bconf_lookup_func) (xmlNodePtr root, const gchar *name, e_bconf_map_t *nap);
-
-static gchar *
-bconf_lookup_bool (xmlNodePtr root, const gchar *name, e_bconf_map_t *map)
-{
-	return e_bconf_get_bool (root, name);
-}
-
-static gchar *
-bconf_lookup_long (xmlNodePtr root, const gchar *name, e_bconf_map_t *map)
-{
-	return e_bconf_get_long (root, name);
-}
-
-static gchar *
-bconf_lookup_string (xmlNodePtr root, const gchar *name, e_bconf_map_t *map)
-{
-	return e_bconf_get_string (root, name);
-}
-
-static gchar *
-bconf_lookup_enum (xmlNodePtr root, const gchar *name, e_bconf_map_t *map)
-{
-	gint index = 0, i;
-	gchar *val;
-
-	if ((val = e_bconf_get_value (root, name))) {
-		index = atoi (val);
-		g_free (val);
-	}
-
-	for (i = 0; map->child[i].from; i++) {
-		if (i == index)
-			return g_strdup (map->child[i].from);
-	}
-
-	return NULL;
-}
-
-static bconf_lookup_func lookup_table[] = {
-	bconf_lookup_bool, bconf_lookup_long, bconf_lookup_string, bconf_lookup_enum
-};
-
-static gchar *
-get_name (const gchar *in, gint index)
-{
-	GString *out = g_string_new ("");
-	gchar c, *res;
-
-	while ((c = *in++)) {
-		if (c == '%') {
-			c = *in++;
-			switch (c) {
-			case '%':
-				g_string_append_c (out, '%');
-				break;
-			case 'i':
-				g_string_append_printf (out, "%d", index);
-				break;
-			}
-		} else {
-			g_string_append_c (out, c);
-		}
-	}
-
-	res = out->str;
-	g_string_free (out, FALSE);
-
-	return res;
-}
-
-static void
-build_xml (xmlNodePtr root, e_bconf_map_t *map, gint index, xmlNodePtr source)
-{
-	gchar *name, *value;
-	xmlNodePtr node;
-
-	while (map->type != E_BCONF_MAP_END) {
-		if ((map->type & E_BCONF_MAP_MASK) == E_BCONF_MAP_CHILD) {
-			node = xmlNewChild (root, NULL, (guchar *)map->to, NULL);
-			build_xml (node, map->child, index, source);
-		} else {
-			name = get_name (map->from, index);
-			value = lookup_table[(map->type & E_BCONF_MAP_MASK) - 1] (source, name, map);
-
-			d(printf ("key '%s=%s' -> ", name, value));
-
-			if (map->type & E_BCONF_MAP_CONTENT) {
-				if (value && value[0])
-					xmlNewTextChild (root, NULL, (guchar *)map->to, (guchar *)value);
-			} else {
-				xmlSetProp (root, (guchar *)map->to, (guchar *)value);
-			}
-
-			g_free (value);
-			g_free (name);
-		}
-		map++;
-	}
-}
-
-gint
-e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map_t *map,
-			 const gchar *bconf_path, const gchar *gconf_path,
-			 const gchar *name, const gchar *idparam)
-{
-	xmlNodePtr source;
-	gint count = 0, i;
-	GSList *list, *l;
-	gchar *val;
-
-	source = e_bconf_get_path (config_xmldb, bconf_path);
-	if (source) {
-		list = NULL;
-		if ((val = e_bconf_get_value (source, "num"))) {
-			count = atoi (val);
-			g_free (val);
-		}
-
-		d(printf("Found %d blobs at %s\n", count, bconf_path));
-
-		for (i = 0; i < count; i++) {
-			xmlDocPtr doc;
-			xmlNodePtr root;
-			xmlChar *xmlbuf;
-			gint n;
-
-			doc = xmlNewDoc ((const guchar *)"1.0");
-			root = xmlNewDocNode (doc, NULL, (guchar *)name, NULL);
-			xmlDocSetRootElement (doc, root);
-
-			/* This could be set with a MAP_UID type ... */
-			if (idparam) {
-				gchar buf[16];
-
-				sprintf (buf, "%d", i);
-				xmlSetProp (root, (guchar *)idparam, (guchar *)buf);
-			}
-
-			build_xml (root, map, i, source);
-
-			xmlDocDumpMemory (doc, &xmlbuf, &n);
-			xmlFreeDoc (doc);
-
-			list = g_slist_append (list, xmlbuf);
-		}
-
-		gconf_client_set_list (gconf, gconf_path, GCONF_VALUE_STRING, list, NULL);
-
-		while (list) {
-			l = list->next;
-			xmlFree (list->data);
-			g_slist_free_1 (list);
-			list = l;
-		}
-	} else {
-		g_warning ("could not find '%s' in old config database, skipping", bconf_path);
-	}
-
-	return 0;
-}
-
-static gint gconf_type[] = { GCONF_VALUE_BOOL, GCONF_VALUE_BOOL, GCONF_VALUE_INT, GCONF_VALUE_STRING, GCONF_VALUE_STRING };
-
-gint
-e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *remap_list)
-{
-	gchar *path, *val, *tmp;
-	e_gconf_map_t *map;
-	xmlNodePtr source;
-	GSList *list, *l;
-	gchar buf[32];
-	gint i, j, k;
-
-	/* process all flat config */
-	for (i = 0; remap_list[i].root; i++) {
-		d(printf ("Path: %s\n", remap_list[i].root));
-		if (!(source = e_bconf_get_path (config_xmldb, remap_list[i].root)))
-			continue;
-
-		map = remap_list[i].map;
-		for (j = 0; map[j].from; j++) {
-			if (map[j].type & E_GCONF_MAP_LIST) {
-				/* collapse a multi-entry indexed field into a list */
-				list = NULL;
-				k = 0;
-				do {
-					path = get_name (map[j].from, k);
-					val = e_bconf_get_value (source, path);
-					d(printf ("finding path '%s' = '%s'\n", path, val));
-					g_free (path);
-					if (val) {
-						switch (map[j].type & E_GCONF_MAP_MASK) {
-						case E_GCONF_MAP_BOOL:
-						case E_GCONF_MAP_INT:
-							list = g_slist_append (list, GINT_TO_POINTER (atoi (val)));
-							break;
-						case E_GCONF_MAP_STRING:
-							d(printf (" -> '%s'\n", e_bconf_hex_decode (val)));
-							list = g_slist_append (list, e_bconf_hex_decode (val));
-							break;
-						}
-
-						g_free (val);
-						k++;
-					}
-				} while (val);
-
-				if (list) {
-					path = g_strdup_printf ("/apps/evolution/%s", map[j].to);
-					gconf_client_set_list (gconf, path, gconf_type[map[j].type & E_GCONF_MAP_MASK], list, NULL);
-					g_free (path);
-					if ((map[j].type & E_GCONF_MAP_MASK) == E_GCONF_MAP_STRING)
-						g_slist_foreach (list, (GFunc) g_free, NULL);
-					g_slist_free (list);
-				}
-
-				continue;
-			} else if (map[j].type == E_GCONF_MAP_ANYLIST) {
-				val = NULL;
-			} else {
-				if (!(val = e_bconf_get_value (source, map[j].from)))
-					continue;
-			}
-
-			d(printf (" %s = '%s' -> %s [%d]\n",
-				  map[j].from,
-				  val == NULL ? "(null)" : val,
-				  map[j].to,
-				  map[j].type));
-
-			path = g_strdup_printf ("/apps/evolution/%s", map[j].to);
-			switch (map[j].type) {
-			case E_GCONF_MAP_BOOL:
-				gconf_client_set_bool (gconf, path, atoi (val), NULL);
-				break;
-			case E_GCONF_MAP_BOOLNOT:
-				gconf_client_set_bool (gconf, path, !atoi (val), NULL);
-				break;
-			case E_GCONF_MAP_INT:
-				gconf_client_set_int (gconf, path, atoi (val), NULL);
-				break;
-			case E_GCONF_MAP_STRING:
-				tmp = e_bconf_hex_decode (val);
-				gconf_client_set_string (gconf, path, tmp, NULL);
-				g_free (tmp);
-				break;
-			case E_GCONF_MAP_SIMPLESTRING:
-				gconf_client_set_string (gconf, path, val, NULL);
-				break;
-			case E_GCONF_MAP_FLOAT:
-				gconf_client_set_float (gconf, path, strtod (val, NULL), NULL);
-				break;
-			case E_GCONF_MAP_STRLIST: {
-				gchar *v = e_bconf_hex_decode (val);
-				gchar **t = g_strsplit (v, " !<-->!", 8196);
-
-				list = NULL;
-				for (k = 0; t[k]; k++) {
-					list = g_slist_append (list, t[k]);
-					d(printf ("  [%d] = '%s'\n", k, t[k]));
-				}
-
-				gconf_client_set_list (gconf, path, GCONF_VALUE_STRING, list, NULL);
-				g_slist_free (list);
-				g_strfreev (t);
-				g_free (v);
-				break; }
-			case E_GCONF_MAP_ANYLIST: {
-				xmlNodePtr node = source->children;
-				list = NULL;
-
-				/* find the entry node */
-				while (node) {
-					if (!strcmp ((gchar *)node->name, "entry")) {
-						gint found;
-
-						if ((tmp = (gchar *)xmlGetProp (node, (const guchar *)"name"))) {
-							found = strcmp ((gchar *)tmp, map[j].from) == 0;
-							xmlFree (tmp);
-							if (found)
-								break;
-						}
-					}
-
-					node = node->next;
-				}
-
-				/* find the the any block */
-				if (node) {
-					node = node->children;
-					while (node) {
-						if (strcmp ((gchar *)node->name, "any") == 0)
-							break;
-						node = node->next;
-					}
-				}
-
-				/* skip to the value inside it */
-				if (node) {
-					node = node->children;
-					while (node) {
-						if (strcmp ((gchar *)node->name, "value") == 0)
-							break;
-						node = node->next;
-					}
-				}
-
-				if (node) {
-					node = node->children;
-					while (node) {
-						if (strcmp ((gchar *)node->name, "value") == 0)
-							list = g_slist_append (list, xmlNodeGetContent (node));
-						node = node->next;
-					}
-				}
-
-				/* & store */
-				if (list) {
-					gconf_client_set_list (gconf, path, GCONF_VALUE_STRING, list, NULL);
-					while (list) {
-						l = list->next;
-						xmlFree (list->data);
-						g_slist_free_1 (list);
-						list = l;
-					}
-				}
-
-				break; }
-			case E_GCONF_MAP_COLOUR:
-				sprintf (buf, "#%06x", atoi (val) & 0xffffff);
-				gconf_client_set_string (gconf, path, buf, NULL);
-				break;
-			}
-
-			/* FIXME: handle errors */
-			g_free (path);
-			g_free (val);
-		}
-	}
-
-	return 0;
-}
diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h
deleted file mode 100644
index 181533dde4..0000000000
--- a/e-util/e-bconf-map.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef __E_BCONF_MAP_H__
-#define __E_BCONF_MAP_H__
-
-#include <gconf/gconf-client.h>
-
-#include <libxml/tree.h>
-
-G_BEGIN_DECLS
-
-enum {
-	E_BCONF_MAP_END = 0,        /* end of table */
-	E_BCONF_MAP_BOOL,           /* bool -> prop of name 'to' value true or false */
-	E_BCONF_MAP_LONG,           /* long -> prop of name 'to' value a long */
-	E_BCONF_MAP_STRING,	    /* string -> prop of name 'to' */
-	E_BCONF_MAP_ENUM,	    /* long/bool -> prop of name 'to', with the value indexed into the child map table's from field */
-	E_BCONF_MAP_CHILD,	    /* a new child of name 'to' */
-	E_BCONF_MAP_MASK = 0x3f,
-	E_BCONF_MAP_CONTENT = 0x80  /* if set, create a new node of name 'to' instead of a property */
-};
-
-typedef struct _e_bconf_map {
-	const gchar *from;
-	const gchar *to;
-	gint type;
-	struct _e_bconf_map *child;
-} e_bconf_map_t;
-
-gchar *e_bconf_hex_decode (const gchar *val);
-gchar *e_bconf_url_decode (const gchar *val);
-
-xmlNodePtr e_bconf_get_path (xmlDocPtr doc, const gchar *path);
-xmlNodePtr e_bconf_get_entry (xmlNodePtr root, const gchar *name);
-
-gchar *e_bconf_get_value (xmlNodePtr root, const gchar *name);
-gchar *e_bconf_get_bool (xmlNodePtr root, const gchar *name);
-gchar *e_bconf_get_long (xmlNodePtr root, const gchar *name);
-gchar *e_bconf_get_string (xmlNodePtr root, const gchar *name);
-
-gint e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map_t *map,
-			     const gchar *bconf_path, const gchar *gconf_path,
-			     const gchar *name, const gchar *idparam);
-
-enum {
-	E_GCONF_MAP_BOOL,
-	E_GCONF_MAP_BOOLNOT,
-	E_GCONF_MAP_INT,
-	E_GCONF_MAP_STRING,
-	E_GCONF_MAP_SIMPLESTRING,   /* a non-encoded string */
-	E_GCONF_MAP_COLOUR,
-	E_GCONF_MAP_FLOAT,	    /* bloody floats, who uses floats ... idiots */
-	E_GCONF_MAP_STRLIST,	    /* strings separated to !<-->! -> gconf list */
-	E_GCONF_MAP_ANYLIST,	    /* corba sequence corba string -> gconf list */
-	E_GCONF_MAP_MASK = 0x7f,
-	E_GCONF_MAP_LIST = 0x80     /* from includes a %i field for the index of the key, to be converted to a list of type MAP_* */
-};
-
-typedef struct {
-	const gchar *from;
-	const gchar *to;
-	gint type;
-} e_gconf_map_t;
-
-typedef struct {
-	const gchar *root;
-	e_gconf_map_t *map;
-} e_gconf_map_list_t;
-
-gint e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *remap_list);
-
-G_END_DECLS
-
-#endif /* __E_BCONF_MAP_H__ */
diff --git a/e-util/e-charset.c b/e-util/e-charset.c
index d2b7a91eeb..59c023c13d 100644
--- a/e-util/e-charset.c
+++ b/e-util/e-charset.c
@@ -76,24 +76,32 @@ typedef struct {
  * not a lot of point in using, say, ISO-8859-3, if anything that can
  * read that can read UTF8 too.
  */
-/* To Translators: Character set "Logical Hebrew" */
 static ECharset charsets[] = {
 	{ "ISO-8859-6", E_CHARSET_ARABIC, NULL },
 	{ "ISO-8859-13", E_CHARSET_BALTIC, NULL },
 	{ "ISO-8859-4", E_CHARSET_BALTIC, NULL },
 	{ "ISO-8859-2", E_CHARSET_CENTRAL_EUROPEAN, NULL },
+	/* Translators: Character set "Chinese, Traditional" */
 	{ "Big5", E_CHARSET_CHINESE, N_("Traditional") },
+	/* Translators: Character set "Chinese, Traditional" */
 	{ "BIG5HKSCS", E_CHARSET_CHINESE, N_("Traditional") },
+	/* Translators: Character set "Chinese, Traditional" */
 	{ "EUC-TW", E_CHARSET_CHINESE, N_("Traditional") },
+	/* Translators: Character set "Chinese, Simplified" */
 	{ "GB18030", E_CHARSET_CHINESE, N_("Simplified") },
+	/* Translators: Character set "Chinese, Simplified" */
 	{ "GB2312", E_CHARSET_CHINESE, N_("Simplified") },
+	/* Translators: Character set "Chinese, Simplified" */
 	{ "HZ", E_CHARSET_CHINESE, N_("Simplified") },
+	/* Translators: Character set "Chinese, Simplified" */
 	{ "ISO-2022-CN", E_CHARSET_CHINESE, N_("Simplified") },
 	{ "KOI8-R", E_CHARSET_CYRILLIC, NULL },
 	{ "Windows-1251", E_CHARSET_CYRILLIC, NULL },
+	/* Translators: Character set "Cyrillic, Ukrainian" */
 	{ "KOI8-U", E_CHARSET_CYRILLIC, N_("Ukrainian") },
 	{ "ISO-8859-5", E_CHARSET_CYRILLIC, NULL },
 	{ "ISO-8859-7", E_CHARSET_GREEK, NULL },
+	/* Translators: Character set "Hebrew, Visual" */
 	{ "ISO-8859-8", E_CHARSET_HEBREW, N_("Visual") },
 	{ "ISO-2022-JP", E_CHARSET_JAPANESE, NULL },
 	{ "EUC-JP", E_CHARSET_JAPANESE, NULL },
diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c
index 0595d58add..37226d471a 100644
--- a/e-util/e-datetime-format.c
+++ b/e-util/e-datetime-format.c
@@ -206,10 +206,13 @@ format_relative_date (time_t tvalue, time_t ttoday, const struct tm *value, cons
 			else
 				res = g_strdup (_("Yesterday"));
 		} else {
-			if (future)
-				res = g_strdup_printf (_("%d days from now"), diff);
-			else
-				res = g_strdup_printf (_("%d days ago"), diff);
+			if (future) {
+				/* Translators: %d is replaced with a number of days. It's always greater than 1 */
+				res = g_strdup_printf (ngettext ("%d day from now", "%d days from now", diff), diff);
+			} else {
+				/* Translators: %d is replaced with a number of days. It's always greater than 1 */
+				res = g_strdup_printf (ngettext ("%d day ago", "%d days ago", diff), diff);
+			}
 		}
 	}
 
diff --git a/e-util/e-file-utils.c b/e-util/e-file-utils.c
index 571154733b..e647b8deb1 100644
--- a/e-util/e-file-utils.c
+++ b/e-util/e-file-utils.c
@@ -210,108 +210,3 @@ e_file_replace_contents_finish (GFile *file,
 	return TRUE;
 }
 
-/**
- * e_fsutils_usage:
- * @path: a file path
- *
- * Calculate the amount of disk space used by a given path.
- *
- * Return value: The number of 1024 byte blocks used by the
- * filesystem.
- **/
-glong e_fsutils_usage(const gchar *inpath)
-{
-	GDir *dir;
-	const gchar *d;
-	long size = 0;
-	GSList *paths;
-
-	/* iterative, depth-first scan, because i can ... */
-	paths = g_slist_prepend(NULL, g_strdup(inpath));
-
-	while (paths) {
-		gchar *path = paths->data;
-
-		paths = g_slist_remove_link(paths, paths);
-
-		dir = g_dir_open(path, 0, NULL);
-		if (dir == NULL) {
-			g_free(path);
-			goto fail;
-		}
-
-		while ((d = g_dir_read_name(dir))) {
-			gchar *full_path;
-			struct stat st;
-
-			full_path = g_build_filename(path, d, NULL);
-			if (g_stat(full_path, &st) == -1) {
-				g_free(full_path);
-				g_dir_close(dir);
-				g_free(path);
-				goto fail;
-			} else if (S_ISDIR(st.st_mode)) {
-				paths = g_slist_prepend(paths, full_path);
-				full_path = NULL;
-			} else if (S_ISREG(st.st_mode)) {
-				/* This is in 512 byte blocks.  st_blksize is page size on linux,
-				   on *BSD it might be significant. */
-#ifndef G_OS_WIN32
-				size += st.st_blocks/2;
-#endif
-			}
-
-			g_free(full_path);
-		}
-
-		g_dir_close(dir);
-		g_free(path);
-	}
-
-	return size;
-
-fail:
-	g_slist_foreach(paths, (GFunc)g_free, NULL);
-	g_slist_free(paths);
-
-	return -1;
-}
-
-/**
- * e_fsutils_avail:
- * @path: a file path
- *
- * Find the available disk space at the given path.
- *
- * Return value: -1 if it could not be determined, otherwise the
- * number of disk blocks, expressed as system-independent, 1024 byte
- * blocks.
- **/
-glong
-e_fsutils_avail(const gchar *path)
-{
-#if defined(HAVE_STATVFS)
-	struct statvfs stfs;
-
-	if (statvfs(path, &stfs) == -1)
-		return -1;
-
-	/* Assumes that frsize === power of 2 */
-	if (stfs.f_frsize >= 1024)
-		return stfs.f_bavail * (stfs.f_frsize / 1024);
-	else
-		return stfs.f_bavail / (1024 / stfs.f_frsize);
-#elif defined(HAVE_STATFS)
-	struct statfs stfs;
-
-	if (statfs(path, &stfs) == -1)
-		return -1;
-
-	/* For BSD this isn't clear, it may be dependent on f_bsize */
-	return stfs.f_bavail / 2;
-#else
-	errno = ENOSYS;
-	return -1;
-#endif
-}
-
diff --git a/e-util/e-file-utils.h b/e-util/e-file-utils.h
index 147b9b5b79..e1e8b29872 100644
--- a/e-util/e-file-utils.h
+++ b/e-util/e-file-utils.h
@@ -41,9 +41,6 @@ gboolean	e_file_replace_contents_finish	(GFile *file,
 						 gchar **new_etag,
 						 GError **error);
 
-glong		e_fsutils_usage			(const gchar *path);
-glong		e_fsutils_avail			(const gchar *path);
-
 G_END_DECLS
 
 #endif /* E_FILE_UTILS_H */
diff --git a/e-util/e-folder-map.c b/e-util/e-folder-map.c
deleted file mode 100644
index 7d775bed8a..0000000000
--- a/e-util/e-folder-map.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
-
-#include <libedataserver/e-xml-utils.h>
-
-#include "e-folder-map.h"
-
-#define d(x)
-
-static gboolean
-is_type_folder (const gchar *metadata, const gchar *search_type)
-{
-	xmlNodePtr node;
-	xmlDocPtr doc;
-	gchar *type;
-
-	doc = e_xml_parse_file (metadata);
-	if (!doc) {
-		g_warning ("Cannot parse '%s'", metadata);
-		return FALSE;
-	}
-
-	if (!(node = xmlDocGetRootElement (doc))) {
-		g_warning ("'%s' corrupt: document contains no root node", metadata);
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	if (!node->name || strcmp ((gchar *)node->name, "efolder") != 0) {
-		g_warning ("'%s' corrupt: root node is not 'efolder'", metadata);
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	node = node->children;
-	while (node != NULL) {
-		if (node->name && !strcmp ((gchar *)node->name, "type")) {
-			type = (gchar *)xmlNodeGetContent (node);
-			if (!strcmp (type, search_type)) {
-				xmlFreeDoc (doc);
-				xmlFree (type);
-
-				return TRUE;
-			}
-
-			xmlFree (type);
-
-			break;
-		}
-
-		node = node->next;
-	}
-
-	xmlFreeDoc (doc);
-
-	return FALSE;
-}
-
-static void
-e_folder_map_dir (const gchar *dirname, const gchar *type, GSList **dir_list)
-{
-	gchar *path;
-	const gchar *name;
-	GDir *dir;
-	GError *error = NULL;
-
-	path = g_build_filename (dirname, "folder-metadata.xml", NULL);
-	if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
-		g_free (path);
-		return;
-	}
-
-	if (!is_type_folder (path, type)) {
-		g_free (path);
-		goto try_subdirs;
-	}
-
-	d(g_message ("Found '%s'", dirname));
-	*dir_list = g_slist_prepend (*dir_list, g_strdup (dirname));
-
-	g_free (path);
-
- try_subdirs:
-
-	path = g_build_filename (dirname, "subfolders", NULL);
-	if (!g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-		g_free (path);
-		return;
-	}
-
-	if (!(dir = g_dir_open (path, 0, &error))) {
-		g_warning ("cannot open '%s': %s", path, error->message);
-		g_error_free (error);
-		g_free (path);
-		return;
-	}
-
-	while ((name = g_dir_read_name (dir))) {
-		gchar *full_path;
-
-		if (*name == '.')
-			continue;
-
-		full_path = g_build_filename (path, name, NULL);
-		if (!g_file_test (full_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-			g_free (full_path);
-			continue;
-		}
-
-		e_folder_map_dir (full_path, type, dir_list);
-		g_free (full_path);
-	}
-
-	g_dir_close (dir);
-
-	g_free (path);
-}
-
-GSList *
-e_folder_map_local_folders (const gchar *local_dir, const gchar *type)
-{
-	const gchar *name;
-	GDir *dir;
-	GSList *dir_list = NULL;
-	GError *error = NULL;
-
-	if (!(dir = g_dir_open (local_dir, 0, &error))) {
-		g_warning ("cannot open '%s': %s", local_dir, error->message);
-		g_error_free (error);
-		return NULL;
-	}
-
-	while ((name = g_dir_read_name (dir))) {
-		gchar *full_path;
-
-		if (*name == '.')
-			continue;
-
-		full_path = g_build_filename (local_dir, name, NULL);
-		d(g_message ("Looking in %s", full_path));
-		if (!g_file_test (full_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-			g_free (full_path);
-			continue;
-		}
-
-		e_folder_map_dir (full_path, type, &dir_list);
-
-		g_free (full_path);
-	}
-
-	g_dir_close (dir);
-
-	return dir_list;
-}
diff --git a/e-util/e-import.c b/e-util/e-import.c
index 4475344018..14485633c1 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -216,6 +216,32 @@ e_import_get_widget (EImport *import,
 }
 
 /**
+ * e_import_get_preview_widget:
+ * @import: an #EImport
+ * @target: Target of interest
+ * @im: Importer to get a preview widget of
+ *
+ * Gets a widget that the importer uses to preview data to be
+ * imported.  This widget should be packed into a container
+ * widget.  It should not be shown_all.
+ *
+ * Return value: NULL if the importer doesn't support preview.
+ **/
+GtkWidget *
+e_import_get_preview_widget (EImport *import,
+                     EImportTarget *target,
+                     EImportImporter *im)
+{
+	g_return_val_if_fail (im != NULL, NULL);
+	g_return_val_if_fail (target != NULL, NULL);
+
+	if (!im->get_preview)
+		return NULL;
+
+	return im->get_preview (import, target, im);
+}
+
+/**
  * e_import_complete:
  * @import: an #EImport
  * @target: Target just completed (unused currently)
diff --git a/e-util/e-import.h b/e-util/e-import.h
index affc364a4b..57bb79450d 100644
--- a/e-util/e-import.h
+++ b/e-util/e-import.h
@@ -78,6 +78,8 @@ enum _e_import_target_t {
  * @supported: Callback to see if this target is supported by the importer.
  * @get_widget: A widget factory for this importer, if it needs any extra information in the assistant.  It will update the target.
  * @import: Run the import.
+ * @cancel: Cancel the import.
+ * @get_preview: Callback to create a preview widget for just importing data.
  * @user_data: User data for the callbacks;
  *
  * Base importer description.
@@ -91,6 +93,7 @@ struct _EImportImporter {
 	EImportWidgetFunc get_widget;
 	EImportImportFunc import;
 	EImportImportFunc cancel;
+	EImportWidgetFunc get_preview;
 
 	gpointer user_data;
 
@@ -199,6 +202,9 @@ void		e_import_cancel			(EImport *import,
 GtkWidget *	e_import_get_widget		(EImport *import,
 						 EImportTarget *target,
 						 EImportImporter *importer);
+GtkWidget *	e_import_get_preview_widget	(EImport *import,
+						 EImportTarget *target,
+						 EImportImporter *im);
 void		e_import_status			(EImport *import,
 						 EImportTarget *target,
 						 const gchar *what,
diff --git a/e-util/e-logger.c b/e-util/e-logger.c
index dd151b6009..fa2d548b23 100644
--- a/e-util/e-logger.c
+++ b/e-util/e-logger.c
@@ -171,8 +171,8 @@ logger_class_init (ELoggerClass *class)
 		PROP_NAME,
 		g_param_spec_string (
 			"name",
-			_("Name"),
-			_("Name of the logger"),
+			"Name",
+			"Name of the logger",
 			"anonymous",
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY));
diff --git a/e-util/e-marshal.list b/e-util/e-marshal.list
index 823005bac8..ab270d2f34 100644
--- a/e-util/e-marshal.list
+++ b/e-util/e-marshal.list
@@ -20,10 +20,6 @@ INT:INT,INT,BOXED
 INT:INT,POINTER,INT,BOXED
 INT:OBJECT,BOXED
 INT:POINTER
-NONE:BOXED,STRING
-NONE:BOXED,STRING,INT
-NONE:BOXED,STRING,STRING
-NONE:BOXED,STRING,STRING,INT,STRING,STRING,STRING
 NONE:INT,INT
 NONE:INT,INT,BOXED
 NONE:INT,INT,OBJECT
@@ -41,6 +37,10 @@ NONE:LONG,LONG
 NONE:OBJECT,BOOLEAN
 NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
 NONE:OBJECT,OBJECT
+NONE:OBJECT,STRING
+NONE:OBJECT,STRING,INT
+NONE:OBJECT,STRING,STRING
+NONE:OBJECT,STRING,STRING,INT,STRING,STRING,STRING
 NONE:POINTER,INT
 NONE:POINTER,INT,INT,INT,INT
 NONE:POINTER,INT,OBJECT
diff --git a/e-util/e-module.c b/e-util/e-module.c
index b61f5e7bdb..17c048e2d3 100644
--- a/e-util/e-module.c
+++ b/e-util/e-module.c
@@ -191,8 +191,8 @@ module_class_init (EModuleClass *class)
 		PROP_FILENAME,
 		g_param_spec_string (
 			"filename",
-			_("Filename"),
-			_("The filename of the module"),
+			"Filename",
+			"The filename of the module",
 			NULL,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY));
diff --git a/e-util/e-plugin-util.c b/e-util/e-plugin-util.c
index c40d67650b..c49ec3691a 100644
--- a/e-util/e-plugin-util.c
+++ b/e-util/e-plugin-util.c
@@ -221,7 +221,7 @@ e_plugin_util_add_entry (GtkWidget *parent, const gchar *label, ESource *source,
 	}
 
 	if (GTK_IS_TABLE (parent))
-		row = GTK_TABLE (parent)->nrows;
+		g_object_get (parent, "n-rows", &row, NULL);
 
 	if (label) {
 		lbl = gtk_label_new_with_mnemonic (label);
@@ -279,6 +279,7 @@ e_plugin_util_add_check (GtkWidget *parent, const gchar *label, ESource *source,
 {
 	GtkWidget *check;
 	const gchar *value;
+	guint row;
 
 	g_return_val_if_fail (parent == NULL || GTK_IS_TABLE (parent) || GTK_IS_CONTAINER (parent), NULL);
 	g_return_val_if_fail (label != NULL, NULL);
@@ -303,7 +304,7 @@ e_plugin_util_add_check (GtkWidget *parent, const gchar *label, ESource *source,
 	gtk_widget_show (check);
 
 	if (parent && GTK_IS_TABLE (parent)) {
-		gint row = GTK_TABLE (parent)->nrows;
+		g_object_get (parent, "n-rows", &row, NULL);
 
 		gtk_table_attach (GTK_TABLE (parent), check, 1, 2, row , row + 1, GTK_FILL, 0, 0, 0);
 	} else if (parent) {
@@ -395,7 +396,7 @@ e_plugin_util_add_refresh (GtkWidget *parent, const gchar *label, ESource *sourc
 	g_return_val_if_fail (*source_property != 0, NULL);
 
 	if (parent)
-		row = GTK_TABLE (parent)->nrows;
+		g_object_get (parent, "n-rows", &row, NULL);
 
 	value = e_source_get_property (source, source_property);
 	if (!value) {
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 453fdea643..2b85f61c84 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -292,8 +292,8 @@ ep_class_init (EPluginClass *class)
 		EP_PROP_ENABLED,
 		g_param_spec_boolean (
 			"enabled",
-			_("Enabled"),
-			_("Whether the plugin is enabled"),
+			"Enabled",
+			"Whether the plugin is enabled",
 			TRUE,
 			G_PARAM_READWRITE));
 }
diff --git a/e-util/e-poolv.c b/e-util/e-poolv.c
new file mode 100644
index 0000000000..acd0a1a452
--- /dev/null
+++ b/e-util/e-poolv.c
@@ -0,0 +1,146 @@
+/*
+ * e-poolv.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include "e-poolv.h"
+
+#include <string.h>
+#include <camel/camel.h>
+
+struct _EPoolv {
+	guchar length;
+	gchar *s[1];
+};
+
+static GHashTable *poolv_pool;
+static CamelMemPool *poolv_mempool;
+
+G_LOCK_DEFINE_STATIC (poolv);
+
+/**
+ * e_poolv_new:
+ * @size: The number of elements in the poolv, maximum of 254 elements.
+ *
+ * Create a new #EPoolv: a string vector which shares a global string
+ * pool.  An #EPoolv can be used to work with arrays of strings which
+ * save memory by eliminating duplicated allocations of the same string.
+ *
+ * This is useful when you have a log of read-only strings that do not
+ * go away and are duplicated a lot, such as email headers.
+ *
+ * Returns: a new #EPoolv
+ **/
+EPoolv *
+e_poolv_new (guint size)
+{
+	EPoolv *poolv;
+
+	g_return_val_if_fail (size < 255, NULL);
+
+	poolv = g_malloc0 (sizeof (*poolv) + (size - 1) * sizeof (gchar *));
+	poolv->length = size;
+
+	G_LOCK (poolv);
+
+	if (!poolv_pool)
+		poolv_pool = g_hash_table_new (g_str_hash, g_str_equal);
+
+	if (!poolv_mempool)
+		poolv_mempool = camel_mempool_new (
+			32 * 1024, 512, CAMEL_MEMPOOL_ALIGN_BYTE);
+
+	G_UNLOCK (poolv);
+
+	return poolv;
+}
+
+/**
+ * e_poolv_set:
+ * @poolv: pooled string vector
+ * @index: index in vector of string
+ * @str: string to set
+ * @freeit: whether the caller is releasing its reference to the
+ * string
+ *
+ * Set a string vector reference.  If the caller will no longer be
+ * referencing the string, freeit should be TRUE.  Otherwise, this
+ * will duplicate the string if it is not found in the pool.
+ *
+ * Returns: @poolv
+ **/
+EPoolv *
+e_poolv_set (EPoolv *poolv, gint index, gchar *str, gint freeit)
+{
+	g_return_val_if_fail (poolv != NULL, NULL);
+	g_return_val_if_fail (index >= 0 && index < poolv->length, NULL);
+
+	if (!str) {
+		poolv->s[index] = NULL;
+		return poolv;
+	}
+
+	G_LOCK (poolv);
+
+	if ((poolv->s[index] = g_hash_table_lookup (poolv_pool, str)) != NULL) {
+	} else {
+		poolv->s[index] = camel_mempool_strdup (poolv_mempool, str);
+		g_hash_table_insert (poolv_pool, poolv->s[index], poolv->s[index]);
+	}
+
+	G_UNLOCK (poolv);
+
+	if (freeit)
+		g_free (str);
+
+	return poolv;
+}
+
+/**
+ * e_poolv_get:
+ * @poolv: pooled string vector
+ * @index: index in vector of string
+ *
+ * Retrieve a string by index.  This could possibly just be a macro.
+ *
+ * Since the pool is never freed, this string does not need to be
+ * duplicated, but should not be modified.
+ *
+ * Returns: string at that index.
+ **/
+const gchar *
+e_poolv_get (EPoolv *poolv, gint index)
+{
+	g_return_val_if_fail (poolv != NULL, NULL);
+	g_return_val_if_fail (index >= 0 && index < poolv->length, NULL);
+
+	return poolv->s[index] ? poolv->s[index] : "";
+}
+
+/**
+ * e_poolv_destroy:
+ * @poolv: pooled string vector to free
+ *
+ * Free a pooled string vector.  This doesn't free the strings from
+ * the vector, however.
+ **/
+void
+e_poolv_destroy (EPoolv *poolv)
+{
+	g_return_if_fail (poolv != NULL);
+
+	g_free (poolv);
+}
diff --git a/e-util/e-folder-map.h b/e-util/e-poolv.h
index 3f41838882..e3cfb31007 100644
--- a/e-util/e-folder-map.h
+++ b/e-util/e-poolv.h
@@ -1,4 +1,5 @@
 /*
+ * e-poolv.h
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -13,24 +14,28 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
- *
- * Authors:
- *		Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
  */
 
-#ifndef __E_FOLDER_MAP_H__
-#define __E_FOLDER_MAP_H__
+#ifndef E_POOLV_H
+#define E_POOLV_H
+
+/* This was moved out of libedataserver since only MessageList uses it. */
 
 #include <glib.h>
 
 G_BEGIN_DECLS
 
-GSList *	e_folder_map_local_folders	(const gchar *local_dir,
-						 const gchar *type);
+typedef struct _EPoolv EPoolv;
+
+EPoolv *	e_poolv_new			(guint size);
+EPoolv *	e_poolv_set			(EPoolv *poolv,
+						 gint index,
+						 gchar *str,
+						 gint freeit);
+const gchar *	e_poolv_get			(EPoolv *poolv,
+						 gint index);
+void		e_poolv_destroy			(EPoolv *poolv);
 
 G_END_DECLS
 
-#endif /* __E_FOLDER_MAP_H__ */
+#endif /* E_POOLV_H */
diff --git a/e-util/e-signature-utils.c b/e-util/e-signature-utils.c
index b28c0cb985..6a8258cb88 100644
--- a/e-util/e-signature-utils.c
+++ b/e-util/e-signature-utils.c
@@ -20,14 +20,9 @@
 #include "e-signature-utils.h"
 
 #include <errno.h>
+#include <camel/camel.h>
 #include <glib/gstdio.h>
 #include <gconf/gconf-client.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-mime-filter-tohtml.h>
 
 #ifndef G_OS_WIN32
 #include <sys/wait.h>
@@ -176,13 +171,13 @@ e_read_signature_file (ESignature *signature,
 	input_stream = camel_stream_fs_new_with_fd (fd);
 
 	if (!is_html && convert_to_html) {
-		CamelStreamFilter *filtered_stream;
+		CamelStream *filtered_stream;
 		CamelMimeFilter *filter;
 		gint32 flags;
 
 		filtered_stream =
-			camel_stream_filter_new_with_stream (input_stream);
-		camel_object_unref (input_stream);
+			camel_stream_filter_new (input_stream);
+		g_object_unref (input_stream);
 
 		flags =
 			CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT |
@@ -190,10 +185,11 @@ e_read_signature_file (ESignature *signature,
 			CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES |
 			CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES;
 		filter = camel_mime_filter_tohtml_new (flags, 0);
-		camel_stream_filter_add (filtered_stream, filter);
-		camel_object_unref (filter);
+		camel_stream_filter_add (
+			CAMEL_STREAM_FILTER (filtered_stream), filter);
+		g_object_unref (filter);
 
-		input_stream = (CamelStream *) filtered_stream;
+		input_stream = filtered_stream;
 	}
 
 	buffer = g_byte_array_new ();
@@ -201,8 +197,8 @@ e_read_signature_file (ESignature *signature,
 	camel_stream_mem_set_byte_array (
 		CAMEL_STREAM_MEM (output_stream), buffer);
 	camel_stream_write_to_stream (input_stream, output_stream);
-	camel_object_unref (output_stream);
-	camel_object_unref (input_stream);
+	g_object_unref (output_stream);
+	g_object_unref (input_stream);
 
 	/* Make sure the buffer is nul-terminated. */
 	length = (gsize) buffer->len;
@@ -295,9 +291,9 @@ e_run_signature_script (const gchar *filename)
 
 		input_stream = camel_stream_fs_new_with_fd (in_fds[0]);
 		camel_stream_write_to_stream (input_stream, output_stream);
-		camel_object_unref (input_stream);
+		g_object_unref (input_stream);
 
-		camel_object_unref (output_stream);
+		g_object_unref (output_stream);
 
 		/* Make sure the buffer is nul-terminated. */
 		length = (gsize) buffer->len;
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 870aeed58f..090b7e6b0e 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -73,8 +73,8 @@ e_text_event_processor_class_init (ETextEventProcessorClass *klass)
 
 	g_object_class_install_property (object_class, PROP_ALLOW_NEWLINES,
 					 g_param_spec_boolean ("allow_newlines",
-							       _( "Allow newlines" ),
-							       _( "Allow newlines" ),
+							       "Allow newlines",
+							       "Allow newlines",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c
index aa1281fc3b..7a8fe696a8 100644
--- a/e-util/e-unicode.c
+++ b/e-util/e-unicode.c
@@ -34,7 +34,7 @@
 #include <gtk/gtk.h>
 #include <libxml/xmlmemory.h>
 
-#include <camel/camel-iconv.h>
+#include <camel/camel.h>
 
 #include <glib/gi18n.h>
 #include "e-unicode.h"
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 72ccd7a9e2..3728489fa4 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -44,12 +44,11 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <camel/camel-url.h>
-
 #ifdef G_OS_WIN32
 #include <windows.h>
 #endif
 
+#include <camel/camel.h>
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-categories.h>
 #include <libedataserver/e-source-list.h>
@@ -80,6 +79,32 @@ e_get_user_data_dir (void)
 }
 
 /**
+ * e_get_gnome2_user_dir:
+ *
+ * Returns the base directory for user data, according to libgnome.
+ * The directory can be overridden by setting the GNOME22_USER_DIR
+ * environment variable.  The string is owned by Evolution and must
+ * not be modified or freed.
+ *
+ * Returns: base directory for GNOME user data
+ **/
+const gchar *
+e_get_gnome2_user_dir (void)
+{
+	static gchar *dirname = NULL;
+
+#ifndef G_OS_WIN32
+	if (G_UNLIKELY (dirname == NULL))
+		dirname = g_strdup (g_getenv ("GNOME22_USER_DIR"));
+#endif
+    if (dirname == NULL)
+		dirname = g_build_filename (
+			g_get_home_dir (), ".gnome2", NULL);
+
+	return dirname;
+}
+
+/**
  * e_get_accels_filename:
  *
  * Returns the name of the user data file containing custom keyboard
@@ -99,7 +124,7 @@ e_get_accels_filename (void)
 
 	if (G_UNLIKELY (filename == NULL))
 		filename = g_build_filename (
-			g_get_home_dir (), ".gnome2",
+			e_get_gnome2_user_dir (),
 			"accels", PACKAGE, NULL);
 
 	return filename;
@@ -1460,32 +1485,3 @@ e_util_set_source_combo_box_list (GtkWidget *source_combo_box,
 	g_object_unref (gconf_client);
 }
 
-static gpointer
-e_camel_object_copy (gpointer camel_object)
-{
-	if (CAMEL_IS_OBJECT (camel_object))
-		camel_object_ref (camel_object);
-
-	return camel_object;
-}
-
-static void
-e_camel_object_free (gpointer camel_object)
-{
-	if (CAMEL_IS_OBJECT (camel_object))
-		camel_object_unref (camel_object);
-}
-
-GType
-e_camel_object_get_type (void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY (type == 0))
-		type = g_boxed_type_register_static (
-			"ECamelObject",
-			(GBoxedCopyFunc) e_camel_object_copy,
-			(GBoxedFreeFunc) e_camel_object_free);
-
-	return type;
-}
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 887cc20ce2..6f7e56b07f 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -27,8 +27,6 @@
 #include <gtk/gtk.h>
 #include <limits.h>
 #include <gconf/gconf-client.h>
-#include <camel/camel-object.h>
-#include <cairo.h>
 
 #include <e-util/e-marshal.h>
 
@@ -49,6 +47,7 @@ typedef enum {
 typedef void (*ETypeFunc) (GType type, gpointer user_data);
 
 const gchar *	e_get_user_data_dir		(void);
+const gchar *	e_get_gnome2_user_dir		(void);
 const gchar *	e_get_accels_filename		(void);
 void		e_show_uri			(GtkWindow *parent,
 						 const gchar *uri);
@@ -142,11 +141,6 @@ GSList *	e_util_get_category_filter_options
 void		e_util_set_source_combo_box_list(GtkWidget *source_combo_box,
 						 const gchar *source_gconf_path);
 
-/* Camel uses its own object system, so we have to box
- * CamelObjects to safely use them as GObject properties. */
-#define E_TYPE_CAMEL_OBJECT (e_camel_object_get_type ())
-GType		e_camel_object_get_type		(void);
-
 G_END_DECLS
 
 #endif /* E_UTIL_H */
diff --git a/e-util/e-win32-defaults.c b/e-util/e-win32-defaults.c
index 8fb2bc3cb9..98187c0340 100644
--- a/e-util/e-win32-defaults.c
+++ b/e-util/e-win32-defaults.c
@@ -43,6 +43,251 @@ _e_win32_sanitize_path (gchar *path)
 	return path;
 }
 
+/*
+ * Addressbook Client registration
+ */
+
+static void
+_e_register_vcard_structure (HKEY hKey)
+{
+
+	LONG returnValue;
+	DWORD dwDisposition;
+	gchar *defaultIcon = NULL;
+	gchar *evolutionBinary = NULL;
+	gchar *vcardCommand = NULL;
+	BYTE editFlags[4] = { 0x02, 0x00, 0x00, 0x00 };
+
+	static HKEY tmp_subkey = (HKEY) INVALID_HANDLE_VALUE;
+	
+	if ((returnValue = RegCreateKeyExA (hKey, ".vcf", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &tmp_subkey, &dwDisposition)))
+		goto cleanup;
+
+	if ((returnValue = RegSetValueExA (tmp_subkey, NULL, 0, REG_SZ, (const BYTE *)"vcard_evo_auto_file", strlen ("vcard_evo_auto_file") + 1)))
+		goto cleanup;
+	if ((returnValue = RegSetValueExA (tmp_subkey, "Content Type", 0, REG_SZ, (const BYTE *)"text/x-vcard", strlen ("text/x-vcard") + 1)))
+		goto cleanup;
+	
+	RegFlushKey (tmp_subkey);
+	
+	RegCloseKey (tmp_subkey);
+	
+	if ((returnValue = RegCreateKeyExA (hKey, "MIME\\Database\\Content Type\\text/x-vcard", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &tmp_subkey, &dwDisposition)))
+		goto cleanup;
+
+	if ((returnValue = RegSetValueExA (tmp_subkey, "Extension", 0, REG_SZ, (const BYTE *)".vcf", strlen (".vcf") + 1)))
+		goto cleanup;
+	
+	RegFlushKey (tmp_subkey);
+	
+	RegCloseKey (tmp_subkey);
+	
+	if ((returnValue = RegCreateKeyExA (hKey, "vcard_evo_auto_file", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &tmp_subkey, &dwDisposition)))
+		goto cleanup;
+
+	if ((returnValue = RegSetValueExA (tmp_subkey, NULL, 0, REG_SZ, (const BYTE *)"vCard File", strlen ("vCard File") + 1)))
+		goto cleanup;
+	if ((returnValue = RegSetValueExA (tmp_subkey, "EditFlags", 0, REG_BINARY, editFlags, G_N_ELEMENTS (editFlags))))
+		goto cleanup;
+	
+	RegFlushKey (tmp_subkey);
+	
+	RegCloseKey (tmp_subkey);
+	
+	if ((returnValue = RegCreateKeyExA (hKey, "vcard_evo_auto_file\\DefaultIcon", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &tmp_subkey, &dwDisposition)))
+		goto cleanup;
+
+	evolutionBinary = _e_win32_sanitize_path (g_build_path (G_DIR_SEPARATOR_S, _e_get_bindir (), EVOBINARY, NULL));
+	defaultIcon = g_strconcat (evolutionBinary, ",0", NULL);
+
+	if ((returnValue = RegSetValueExA (tmp_subkey, NULL, 0, REG_SZ, (const BYTE *)defaultIcon, strlen (defaultIcon) + 1)))
+		goto cleanup;
+
+	
+	RegFlushKey (tmp_subkey);
+	
+	RegCloseKey (tmp_subkey);
+	
+	if ((returnValue = RegCreateKeyExA (hKey, "vcard_evo_auto_file\\shell\\open\\command", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &tmp_subkey, &dwDisposition)))
+		goto cleanup;
+
+	vcardCommand = g_strconcat("\"", evolutionBinary,  "\" --component=addressbook \%1", NULL);
+
+	if ((returnValue = RegSetValueExA (tmp_subkey, NULL, 0, REG_SZ, (const BYTE *)vcardCommand, strlen (vcardCommand) + 1)))
+		goto cleanup;
+	
+	RegFlushKey (tmp_subkey);
+	
+	RegCloseKey (tmp_subkey);
+	
+cleanup:
+	g_free (defaultIcon);
+	g_free (evolutionBinary);
+	g_free (vcardCommand);
+}
+
+static void
+_e_register_ldif_structure (HKEY hKey)
+{
+
+	LONG returnValue;
+	DWORD dwDisposition;
+	gchar *defaultIcon = NULL;
+	gchar *evolutionBinary = NULL;
+	gchar *vcardCommand = NULL;
+	BYTE editFlags[4] = { 0x02, 0x00, 0x00, 0x00 };
+
+	static HKEY tmp_subkey = (HKEY) INVALID_HANDLE_VALUE;
+	
+	if ((returnValue = RegCreateKeyExA (hKey, ".ldi", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &tmp_subkey, &dwDisposition)))
+		goto cleanup;
+
+	if ((returnValue = RegSetValueExA (tmp_subkey, NULL, 0, REG_SZ, (const BYTE *)"ldif_evo_auto_file", strlen ("ldif_evo_auto_file") + 1)))
+		goto cleanup;
+	if ((returnValue = RegSetValueExA (tmp_subkey, "Content Type", 0, REG_SZ, (const BYTE *)"text/x-ldif", strlen ("text/x-ldif") + 1)))
+		goto cleanup;
+	
+	RegFlushKey (tmp_subkey);
+	
+	RegCloseKey (tmp_subkey);
+	
+	if ((returnValue = RegCreateKeyExA (hKey, ".ldif", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &tmp_subkey, &dwDisposition)))
+		goto cleanup;
+
+	if ((returnValue = RegSetValueExA (tmp_subkey, NULL, 0, REG_SZ, (const BYTE *)"ldif_evo_auto_file", strlen ("ldif_evo_auto_file") + 1)))
+		goto cleanup;
+	if ((returnValue = RegSetValueExA (tmp_subkey, "Content Type", 0, REG_SZ, (const BYTE *)"text/x-ldif", strlen ("text/x-ldif") + 1)))
+		goto cleanup;
+	
+	RegFlushKey (tmp_subkey);
+	
+	RegCloseKey (tmp_subkey);
+	
+	if ((returnValue = RegCreateKeyExA (hKey, "MIME\\Database\\Content Type\\text/x-ldif", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &tmp_subkey, &dwDisposition)))
+		goto cleanup;
+
+	if ((returnValue = RegSetValueExA (tmp_subkey, "Extension", 0, REG_SZ, (const BYTE *)".ldi", strlen (".ldi") + 1)))
+		goto cleanup;
+	
+	RegFlushKey (tmp_subkey);
+	
+	RegCloseKey (tmp_subkey);
+	
+	if ((returnValue = RegCreateKeyExA (hKey, "ldif_evo_auto_file", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &tmp_subkey, &dwDisposition)))
+		goto cleanup;
+
+	if ((returnValue = RegSetValueExA (tmp_subkey, NULL, 0, REG_SZ, (const BYTE *)"LDIF File", strlen ("LDIF File") + 1)))
+		goto cleanup;
+	if ((returnValue = RegSetValueExA (tmp_subkey, "EditFlags", 0, REG_BINARY, editFlags, G_N_ELEMENTS (editFlags))))
+		goto cleanup;
+	
+	RegFlushKey (tmp_subkey);
+	
+	RegCloseKey (tmp_subkey);
+	
+	if ((returnValue = RegCreateKeyExA (hKey, "ldif_evo_auto_file\\DefaultIcon", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &tmp_subkey, &dwDisposition)))
+		goto cleanup;
+
+	evolutionBinary = _e_win32_sanitize_path (g_build_path (G_DIR_SEPARATOR_S, _e_get_bindir (), EVOBINARY, NULL));
+	defaultIcon = g_strconcat (evolutionBinary, ",0", NULL);
+
+	if ((returnValue = RegSetValueExA (tmp_subkey, NULL, 0, REG_SZ, (const BYTE *)defaultIcon, strlen (defaultIcon) + 1)))
+		goto cleanup;
+
+	
+	RegFlushKey (tmp_subkey);
+	
+	RegCloseKey (tmp_subkey);
+	
+	if ((returnValue = RegCreateKeyExA (hKey, "ldif_evo_auto_file\\shell\\open\\command", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &tmp_subkey, &dwDisposition)))
+		goto cleanup;
+
+	vcardCommand = g_strconcat("\"", evolutionBinary,  "\" --component=addressbook \%1", NULL);
+
+	if ((returnValue = RegSetValueExA (tmp_subkey, NULL, 0, REG_SZ, (const BYTE *)vcardCommand, strlen (vcardCommand) + 1)))
+		goto cleanup;
+	
+	RegFlushKey (tmp_subkey);
+	
+	RegCloseKey (tmp_subkey);
+	
+cleanup:
+	g_free (defaultIcon);
+	g_free (evolutionBinary);
+	g_free (vcardCommand);
+}
+
+static void
+_e_win32_register_addressbook_impl (gboolean system)
+{
+	LONG returnValue;
+	DWORD dwDisposition;
+	gchar *evolutionBinary = NULL;
+	gchar *openCommand = NULL;
+
+	static HKEY reg_key = (HKEY) INVALID_HANDLE_VALUE;
+	static HKEY reg_subkey = (HKEY) INVALID_HANDLE_VALUE;
+
+
+	if ((returnValue = RegCreateKeyExA (system ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER,
+		"Software\\Clients\\Contacts\\" CANONICALNAME, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &reg_key, &dwDisposition)))
+		goto cleanup;
+	
+	if ((returnValue = RegSetValueExA (reg_key, NULL, 0, REG_SZ, (const BYTE *)CANONICALNAME, strlen (CANONICALNAME) + 1)))
+		goto cleanup;
+	
+	RegFlushKey (reg_key);
+	
+	if ((returnValue = RegCreateKeyExA (reg_key, "shell\\open\\command", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &reg_subkey, &dwDisposition)))
+		goto cleanup;
+
+	evolutionBinary = _e_win32_sanitize_path (g_build_path (G_DIR_SEPARATOR_S, _e_get_bindir (), EVOBINARY, NULL));
+	openCommand = g_strconcat("\"", evolutionBinary, "\" --component=addressbook", NULL);
+	if ((returnValue = RegSetValueExA (reg_subkey, NULL, 0, REG_SZ, (const BYTE *)openCommand, strlen (openCommand) + 1)))
+		goto cleanup;
+	
+	RegFlushKey (reg_subkey);
+	
+	RegCloseKey (reg_subkey);
+
+	
+	if ((returnValue = RegCreateKeyExA (reg_key, "Protocols", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &reg_subkey, &dwDisposition)))
+		goto cleanup;
+
+	_e_register_vcard_structure (reg_subkey);
+	_e_register_ldif_structure (reg_subkey);
+
+	RegCloseKey (reg_subkey);
+	
+	RegCloseKey (reg_key);
+	
+	if ((returnValue = RegCreateKeyExA (system ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER,
+		"Software\\Classes", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &reg_key, &dwDisposition)))
+		return;
+	
+	_e_register_ldif_structure (reg_key);
+
+	RegFlushKey (reg_key);
+	
+	RegCloseKey (reg_key);
+	
+cleanup:
+	g_free (evolutionBinary);
+	g_free (openCommand);
+}
+
+void
+_e_win32_register_addressbook (void)
+{
+	_e_win32_register_addressbook_impl (TRUE);
+	_e_win32_register_addressbook_impl (FALSE);
+}
+
+
+/*
+ * Mail Client registration
+ */
+
 static void
 _e_register_mailto_structure (HKEY hKey)
 {
@@ -84,7 +329,7 @@ _e_register_mailto_structure (HKEY hKey)
 	evolutionBinary = _e_win32_sanitize_path (g_build_path (G_DIR_SEPARATOR_S, _e_get_bindir (), EVOBINARY, NULL));
 	mailtoCommand = g_strconcat("\"", evolutionBinary,  "\" --component=mail mailto:\%1", NULL);
 
-	if ((returnValue = RegSetValueExA (tmp_subkey, NULL, 0, REG_SZ, (const BYTE *)mailtoCommand, strlen(mailtoCommand) + 1)))
+	if ((returnValue = RegSetValueExA (tmp_subkey, NULL, 0, REG_SZ, (const BYTE *)mailtoCommand, strlen (mailtoCommand) + 1)))
 		goto cleanup;
 
 	
@@ -99,7 +344,7 @@ cleanup:
 }
 
 static void
-_e_win32_register_mailer_impl (WINBOOL system)
+_e_win32_register_mailer_impl (gboolean system)
 {
 	LONG returnValue;
 	DWORD i, dwDisposition;
@@ -119,7 +364,7 @@ _e_win32_register_mailer_impl (WINBOOL system)
 		"Software\\Clients\\Mail\\" CANONICALNAME, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &reg_key, &dwDisposition)))
 		goto cleanup;
 	
-	if ((returnValue = RegSetValueExA (reg_key, NULL, 0, REG_SZ, (const BYTE *)CANONICALNAME, strlen(CANONICALNAME) + 1)))
+	if ((returnValue = RegSetValueExA (reg_key, NULL, 0, REG_SZ, (const BYTE *)CANONICALNAME, strlen (CANONICALNAME) + 1)))
 		goto cleanup;
 	
 	dllPath = _e_win32_sanitize_path (g_build_path(G_DIR_SEPARATOR_S, _e_get_bindir (), EUTILDLL, NULL));
@@ -213,7 +458,7 @@ _e_win32_register_mailer (void)
 }
 
 static void
-_e_win32_set_default_mailer_impl (WINBOOL system)
+_e_win32_set_default_mailer_impl (gboolean system)
 {
 	LONG returnValue;
 	DWORD dwDisposition;
diff --git a/e-util/e-win32-defaults.h b/e-util/e-win32-defaults.h
index bebc84c47c..e976d7f414 100644
--- a/e-util/e-win32-defaults.h
+++ b/e-util/e-win32-defaults.h
@@ -31,6 +31,8 @@ void	_e_win32_register_mailer (void);
 void	_e_win32_set_default_mailer (void);
 void	_e_win32_unset_default_mailer (void);
 
+void	_e_win32_register_addressbook (void);
+
 G_END_DECLS
 
 #endif /* __E_WIN32_DEFAULTS__ */
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c
index d67a238080..e5d5a1998e 100644
--- a/e-util/gconf-bridge.c
+++ b/e-util/gconf-bridge.c
@@ -53,7 +53,8 @@ typedef struct {
                                 that have not received change notification
                                 yet. */
 
-	GConfValue *use_first_value; /* Not NULL when the object is a Widget and wasn't realized */
+        GConfValue *use_first_value; /* Not NULL when the object is a
+                                        Widget and wasn't realized. */
 
         GObject *object;
         GParamSpec *prop;
@@ -549,11 +550,7 @@ gconf_bridge_bind_property_full (GConfBridge *bridge,
         val = gconf_client_get (bridge->client, key, NULL);
         if (val) {
                 prop_binding_sync_pref_to_prop (binding, val);
-		#if GTK_CHECK_VERSION(2,19,7)
 		if (GTK_IS_WIDGET (object) && !gtk_widget_get_realized (GTK_WIDGET (object))) {
-		#else
-		if (GTK_IS_WIDGET (object) && !GTK_WIDGET_REALIZED (object)) {
-		#endif
 			binding->use_first_value = val;
 		} else {
 			gconf_value_free (val);
diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c
index 40a9f405cb..6ba72f4d29 100644
--- a/em-format/em-format-quote.c
+++ b/em-format/em-format-quote.c
@@ -27,14 +27,6 @@
 
 #include <string.h>
 
-#include <camel/camel-iconv.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-mime-filter-enriched.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-url.h>
-
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 
@@ -71,7 +63,7 @@ emfq_finalize (GObject *object)
 	EMFormatQuote *emfq =(EMFormatQuote *) object;
 
 	if (emfq->stream)
-		camel_object_unref(emfq->stream);
+		g_object_unref (emfq->stream);
 	g_free(emfq->credits);
 
 	/* Chain up to parent's finalize() method. */
@@ -140,7 +132,7 @@ em_format_quote_new (const gchar *credits,
 
 	emfq->credits = g_strdup (credits);
 	emfq->stream = stream;
-	camel_object_ref (stream);
+	g_object_ref (stream);
 	emfq->flags = flags;
 
 	return emfq;
@@ -169,10 +161,10 @@ emfq_format_clone(EMFormat *emf, CamelFolder *folder, const gchar *uid, CamelMim
 	g_object_unref (gconf);
 	handle = em_format_find_handler(emf, "x-evolution/message/prefix");
 	if (handle)
-		handle->handler(emf, emfq->stream, (CamelMimePart *)msg, handle);
+		handle->handler(emf, emfq->stream, (CamelMimePart *)msg, handle, FALSE);
 	handle = em_format_find_handler(emf, "x-evolution/message/rfc822");
 	if (handle)
-		handle->handler(emf, emfq->stream, (CamelMimePart *)msg, handle);
+		handle->handler(emf, emfq->stream, (CamelMimePart *)msg, handle, FALSE);
 
 	camel_stream_flush(emfq->stream);
 
@@ -442,18 +434,19 @@ emfq_format_message(EMFormat *emf, CamelStream *stream, CamelMimePart *part, con
 static void
 emfq_format_source(EMFormat *emf, CamelStream *stream, CamelMimePart *part)
 {
-	CamelStreamFilter *filtered_stream;
+	CamelStream *filtered_stream;
 	CamelMimeFilter *html_filter;
 
-	filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream);
+	filtered_stream = camel_stream_filter_new ((CamelStream *) stream);
 	html_filter = camel_mime_filter_tohtml_new (CAMEL_MIME_FILTER_TOHTML_CONVERT_NL
 						    | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES
 						    | CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT, 0);
-	camel_stream_filter_add(filtered_stream, html_filter);
-	camel_object_unref(html_filter);
+	camel_stream_filter_add (
+		CAMEL_STREAM_FILTER (filtered_stream), html_filter);
+	g_object_unref (html_filter);
 
 	em_format_format_text(emf, (CamelStream *)filtered_stream, (CamelDataWrapper *)part);
-	camel_object_unref(filtered_stream);
+	g_object_unref (filtered_stream);
 }
 
 static void
@@ -474,19 +467,14 @@ emfq_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part,
 
 		camel_stream_write_string(stream, "</font></td></tr></table>");
 
-		handle->handler(emf, stream, part, handle);
+		handle->handler(emf, stream, part, handle, FALSE);
 	}
 }
 
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-url.h>
-
 static void
 emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info)
 {
-	CamelStreamFilter *filtered_stream;
+	CamelStream *filtered_stream;
 	CamelMimeFilter *html_filter;
 	CamelMimeFilter *sig_strip;
 	CamelContentType *type;
@@ -505,27 +493,29 @@ emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, E
 	    && !g_ascii_strcasecmp(format, "flowed"))
 		flags |= CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED;
 
-	filtered_stream = camel_stream_filter_new_with_stream(stream);
+	filtered_stream = camel_stream_filter_new (stream);
 
 	if ((emfq->flags & EM_FORMAT_QUOTE_KEEP_SIG) == 0) {
 		sig_strip = em_stripsig_filter_new ();
-		camel_stream_filter_add (filtered_stream, sig_strip);
-		camel_object_unref (sig_strip);
+		camel_stream_filter_add (
+			CAMEL_STREAM_FILTER (filtered_stream), sig_strip);
+		g_object_unref (sig_strip);
 	}
 
 	html_filter = camel_mime_filter_tohtml_new(flags, rgb);
-	camel_stream_filter_add(filtered_stream, html_filter);
-	camel_object_unref(html_filter);
+	camel_stream_filter_add (
+		CAMEL_STREAM_FILTER (filtered_stream), html_filter);
+	g_object_unref (html_filter);
 
 	em_format_format_text((EMFormat *)emfq, (CamelStream *)filtered_stream, (CamelDataWrapper *)part);
 	camel_stream_flush((CamelStream *)filtered_stream);
-	camel_object_unref(filtered_stream);
+	g_object_unref (filtered_stream);
 }
 
 static void
 emfq_text_enriched(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info)
 {
-	CamelStreamFilter *filtered_stream;
+	CamelStream *filtered_stream;
 	CamelMimeFilter *enriched;
 	guint32 flags = 0;
 
@@ -537,13 +527,14 @@ emfq_text_enriched(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part
 	}
 
 	enriched = camel_mime_filter_enriched_new(flags);
-	filtered_stream = camel_stream_filter_new_with_stream (stream);
-	camel_stream_filter_add(filtered_stream, enriched);
-	camel_object_unref(enriched);
+	filtered_stream = camel_stream_filter_new (stream);
+	camel_stream_filter_add (
+		CAMEL_STREAM_FILTER (filtered_stream), enriched);
+	g_object_unref (enriched);
 
 	camel_stream_write_string(stream, "<br><hr><br>");
 	em_format_format_text((EMFormat *)emfq, (CamelStream *)filtered_stream, (CamelDataWrapper *)part);
-	camel_object_unref(filtered_stream);
+	g_object_unref (filtered_stream);
 }
 
 static void
diff --git a/em-format/em-format-quote.h b/em-format/em-format-quote.h
index afc3675461..100e59d0a8 100644
--- a/em-format/em-format-quote.h
+++ b/em-format/em-format-quote.h
@@ -23,7 +23,6 @@
 #ifndef EM_FORMAT_QUOTE_H
 #define EM_FORMAT_QUOTE_H
 
-#include <camel/camel-stream.h>
 #include "em-format.h"
 
 /* Standard GObject macros */
diff --git a/em-format/em-format.c b/em-format/em-format.c
index a2034b4b20..9c8e181642 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -31,23 +31,6 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-multipart-encrypted.h>
-#include <camel/camel-multipart-signed.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-gpg-context.h>
-#include <camel/camel-smime-context.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-null.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-mime-filter-windows.h>
-#include <camel/camel-mime-filter-pgp.h>
-
 #include "em-format.h"
 #include "e-util/e-util.h"
 #include "shell/e-shell.h"
@@ -93,7 +76,7 @@ emf_free_cache(struct _EMFormatCache *efc)
 	if (efc->valid)
 		camel_cipher_validity_free(efc->valid);
 	if (efc->secured)
-		camel_object_unref(efc->secured);
+		g_object_unref (efc->secured);
 	g_free(efc);
 }
 
@@ -115,7 +98,7 @@ emf_finalize (GObject *object)
 	EMFormat *emf = EM_FORMAT (object);
 
 	if (emf->session)
-		camel_object_unref (emf->session);
+		g_object_unref (emf->session);
 
 	g_hash_table_destroy (emf->inline_table);
 
@@ -189,7 +172,7 @@ emf_init (EMFormat *emf)
 	emf->session = e_shell_settings_get_pointer (shell_settings, "mail-session");
 	g_return_if_fail (emf->session != NULL);
 
-	camel_object_ref (emf->session);
+	g_object_ref (emf->session);
 }
 
 GType
@@ -417,7 +400,7 @@ em_format_add_puri (EMFormat *emf,
 	puri->part_id = g_strdup(emf->part_id->str);
 
 	if (part) {
-		camel_object_ref(part);
+		g_object_ref (part);
 		puri->part = part;
 	}
 
@@ -585,7 +568,7 @@ emf_clear_puri_node (GNode *node)
 		g_free(pn->cid);
 		g_free(pn->part_id);
 		if (pn->part)
-			camel_object_unref(pn->part);
+			g_object_unref (pn->part);
 		g_free(pn);
 	}
 
@@ -670,11 +653,7 @@ em_format_part_as(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const
 		if (handle != NULL
 		    && !em_format_is_attachment(emf, part)) {
 			d(printf("running handler for type '%s'\n", mime_type));
-			if (is_fallback)
-				camel_object_meta_set (part, "EMF-Fallback", "1");
-			handle->handler(emf, stream, part, handle);
-			if (is_fallback)
-				camel_object_meta_set (part, "EMF-Fallback",  NULL);
+			handle->handler(emf, stream, part, handle, is_fallback);
 			goto finish;
 		}
 		d(printf("this type is an attachment? '%s'\n", mime_type));
@@ -697,7 +676,7 @@ em_format_part(EMFormat *emf, CamelStream *stream, CamelMimePart *part)
 	gchar *mime_type;
 	CamelDataWrapper *dw;
 
-	dw = camel_medium_get_content_object((CamelMedium *)part);
+	dw = camel_medium_get_content ((CamelMedium *)part);
 	mime_type = camel_data_wrapper_get_mime_type(dw);
 	if (mime_type) {
 		camel_strdown(mime_type);
@@ -717,7 +696,7 @@ emf_clone_inlines(gpointer key, gpointer val, gpointer data)
 	if (emfc->valid)
 		new->valid = camel_cipher_validity_clone(emfc->valid);
 	if (emfc->secured)
-		camel_object_ref((new->secured = emfc->secured));
+		g_object_ref ((new->secured = emfc->secured));
 }
 
 static void
@@ -752,9 +731,9 @@ emf_format_clone(EMFormat *emf, CamelFolder *folder, const gchar *uid, CamelMime
 	/* what a mess */
 	if (folder != emf->folder) {
 		if (emf->folder)
-			camel_object_unref(emf->folder);
+			g_object_unref (emf->folder);
 		if (folder)
-			camel_object_ref(folder);
+			g_object_ref (folder);
 		emf->folder = folder;
 	}
 
@@ -765,9 +744,9 @@ emf_format_clone(EMFormat *emf, CamelFolder *folder, const gchar *uid, CamelMime
 
 	if (msg != emf->message) {
 		if (emf->message)
-			camel_object_unref(emf->message);
+			g_object_unref (emf->message);
 		if (msg)
-			camel_object_ref(msg);
+			g_object_ref (msg);
 		emf->message = msg;
 	}
 
@@ -1024,7 +1003,7 @@ void em_format_add_header(EMFormat *emf, const gchar *name, guint32 flags)
 gint em_format_is_attachment(EMFormat *emf, CamelMimePart *part)
 {
 	/*CamelContentType *ct = camel_mime_part_get_content_type(part);*/
-	CamelDataWrapper *dw = camel_medium_get_content_object((CamelMedium *)part);
+	CamelDataWrapper *dw = camel_medium_get_content ((CamelMedium *)part);
 
 	if (!dw)
 		return 0;
@@ -1205,7 +1184,7 @@ em_format_busy (EMFormat *emf)
 void
 em_format_format_content(EMFormat *emf, CamelStream *stream, CamelMimePart *part)
 {
-	CamelDataWrapper *dw = camel_medium_get_content_object((CamelMedium *)part);
+	CamelDataWrapper *dw = camel_medium_get_content ((CamelMedium *)part);
 
 	if (camel_content_type_is (dw->mime_type, "text", "*"))
 		em_format_format_text(emf, stream, (CamelDataWrapper *)part);
@@ -1224,8 +1203,8 @@ em_format_format_content(EMFormat *emf, CamelStream *stream, CamelMimePart *part
 void
 em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
 {
-	CamelStreamFilter *filter_stream;
-	CamelMimeFilterCharset *filter;
+	CamelStream *filter_stream;
+	CamelMimeFilter *filter;
 	const gchar *charset = NULL;
 	CamelMimeFilterWindows *windows = NULL;
 	CamelStream *mem_stream = NULL;
@@ -1246,15 +1225,17 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
 		 * before we move on... */
 
 		null = camel_stream_null_new();
-		filter_stream = camel_stream_filter_new_with_stream(null);
-		camel_object_unref(null);
+		filter_stream = camel_stream_filter_new (null);
+		g_object_unref (null);
 
 		windows = (CamelMimeFilterWindows *)camel_mime_filter_windows_new(charset);
-		camel_stream_filter_add(filter_stream, (CamelMimeFilter *)windows);
+		camel_stream_filter_add (
+			CAMEL_STREAM_FILTER (filter_stream),
+			CAMEL_MIME_FILTER (windows));
 
 		camel_data_wrapper_decode_to_stream(dw, (CamelStream *)filter_stream);
 		camel_stream_flush((CamelStream *)filter_stream);
-		camel_object_unref(filter_stream);
+		g_object_unref (filter_stream);
 
 		charset = camel_mime_filter_windows_real_charset (windows);
 	} else if (charset == NULL) {
@@ -1262,11 +1243,13 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
 	}
 
 	mem_stream = (CamelStream *)camel_stream_mem_new ();
-	filter_stream = camel_stream_filter_new_with_stream(mem_stream);
+	filter_stream = camel_stream_filter_new (mem_stream);
 
-	if ((filter = camel_mime_filter_charset_new_convert(charset, "UTF-8"))) {
-		camel_stream_filter_add(filter_stream, (CamelMimeFilter *) filter);
-		camel_object_unref(filter);
+	if ((filter = camel_mime_filter_charset_new (charset, "UTF-8"))) {
+		camel_stream_filter_add (
+			CAMEL_STREAM_FILTER (filter_stream),
+			CAMEL_MIME_FILTER (filter));
+		g_object_unref (filter);
 	}
 
 	max = -1;
@@ -1279,9 +1262,9 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
 	}
 	g_object_unref (gconf);
 
-	size = camel_data_wrapper_decode_to_stream(emf->mode == EM_FORMAT_SOURCE ? (CamelDataWrapper *)dw: camel_medium_get_content_object((CamelMedium *)dw), (CamelStream *)filter_stream);
+	size = camel_data_wrapper_decode_to_stream(emf->mode == EM_FORMAT_SOURCE ? (CamelDataWrapper *)dw: camel_medium_get_content ((CamelMedium *)dw), (CamelStream *)filter_stream);
 	camel_stream_flush((CamelStream *)filter_stream);
-	camel_object_unref(filter_stream);
+	g_object_unref (filter_stream);
 	camel_stream_reset (mem_stream);
 
 	if (max == -1 || size == -1 || size < (max * 1024) || emf->composer) {
@@ -1292,7 +1275,7 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
 	}
 
 	if (windows)
-		camel_object_unref(windows);
+		g_object_unref (windows);
 }
 
 /**
@@ -1347,7 +1330,11 @@ add_validity_found (EMFormat *emf, CamelCipherValidity *valid)
 
 #ifdef ENABLE_SMIME
 static void
-emf_application_xpkcs7mime(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
+emf_application_xpkcs7mime (EMFormat *emf,
+                            CamelStream *stream,
+                            CamelMimePart *part,
+                            const EMFormatHandler *info,
+                            gboolean is_fallback)
 {
 	CamelCipherContext *context;
 	CamelException *ex;
@@ -1378,23 +1365,27 @@ emf_application_xpkcs7mime(EMFormat *emf, CamelStream *stream, CamelMimePart *pa
 			emfc = emf_insert_cache(emf, emf->part_id->str);
 
 		emfc->valid = camel_cipher_validity_clone(valid);
-		camel_object_ref((emfc->secured = opart));
+		g_object_ref ((emfc->secured = opart));
 
 		add_validity_found (emf, valid);
 		em_format_format_secure(emf, stream, opart, valid);
 	}
 
-	camel_object_unref(opart);
-	camel_object_unref(context);
+	g_object_unref (opart);
+	g_object_unref (context);
 	camel_exception_free(ex);
 }
 #endif
 
 /* RFC 1740 */
 static void
-emf_multipart_appledouble(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
+emf_multipart_appledouble (EMFormat *emf,
+                           CamelStream *stream,
+                           CamelMimePart *part,
+                           const EMFormatHandler *info,
+                           gboolean is_fallback)
 {
-	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)part);
+	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part);
 	CamelMimePart *mime_part;
 	gint len;
 
@@ -1417,9 +1408,13 @@ emf_multipart_appledouble(EMFormat *emf, CamelStream *stream, CamelMimePart *par
 
 /* RFC ??? */
 static void
-emf_multipart_mixed(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
+emf_multipart_mixed (EMFormat *emf,
+                     CamelStream *stream,
+                     CamelMimePart *part,
+                     const EMFormatHandler *info,
+                     gboolean is_fallback)
 {
-	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)part);
+	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part);
 	gint i, nparts, len;
 
 	if (!CAMEL_IS_MULTIPART(mp)) {
@@ -1439,9 +1434,13 @@ emf_multipart_mixed(EMFormat *emf, CamelStream *stream, CamelMimePart *part, con
 
 /* RFC 1740 */
 static void
-emf_multipart_alternative(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
+emf_multipart_alternative (EMFormat *emf,
+                           CamelStream *stream,
+                           CamelMimePart *part,
+                           const EMFormatHandler *info,
+                           gboolean is_fallback)
 {
-	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)part);
+	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part);
 	gint i, nparts, bestid = 0;
 	CamelMimePart *best = NULL;
 
@@ -1486,11 +1485,15 @@ emf_multipart_alternative(EMFormat *emf, CamelStream *stream, CamelMimePart *par
 		em_format_part(emf, stream, best);
 		g_string_truncate(emf->part_id, len);
 	} else
-		emf_multipart_mixed(emf, stream, part, info);
+		emf_multipart_mixed(emf, stream, part, info, is_fallback);
 }
 
 static void
-emf_multipart_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
+emf_multipart_encrypted (EMFormat *emf,
+                         CamelStream *stream,
+                         CamelMimePart *part,
+                         const EMFormatHandler *info,
+                         gboolean is_fallback)
 {
 	CamelCipherContext *context;
 	CamelException *ex;
@@ -1507,7 +1510,7 @@ emf_multipart_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *part,
 		return;
 	}
 
-	mpe = (CamelMultipartEncrypted*)camel_medium_get_content_object((CamelMedium *)part);
+	mpe = (CamelMultipartEncrypted*)camel_medium_get_content ((CamelMedium *)part);
 	if (!CAMEL_IS_MULTIPART_ENCRYPTED(mpe)) {
 		em_format_format_error(emf, stream, _("Could not parse MIME message. Displaying as source."));
 		em_format_format_source(emf, stream, part);
@@ -1538,15 +1541,15 @@ emf_multipart_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *part,
 			emfc = emf_insert_cache(emf, emf->part_id->str);
 
 		emfc->valid = camel_cipher_validity_clone(valid);
-		camel_object_ref((emfc->secured = opart));
+		g_object_ref ((emfc->secured = opart));
 
 		add_validity_found (emf, valid);
 		em_format_format_secure(emf, stream, opart, valid);
 	}
 
 	/* TODO: Make sure when we finalize this part, it is zero'd out */
-	camel_object_unref(opart);
-	camel_object_unref(context);
+	g_object_unref (opart);
+	g_object_unref (context);
 	camel_exception_free(ex);
 }
 
@@ -1559,9 +1562,13 @@ emf_write_related(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri)
 
 /* RFC 2387 */
 static void
-emf_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
+emf_multipart_related (EMFormat *emf,
+                       CamelStream *stream,
+                       CamelMimePart *part,
+                       const EMFormatHandler *info,
+                       gboolean is_fallback)
 {
-	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)part);
+	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part);
 	CamelMimePart *body_part, *display_part = NULL;
 	CamelContentType *content_type;
 	const gchar *start;
@@ -1601,7 +1608,7 @@ emf_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, c
 	}
 
 	if (display_part == NULL) {
-		emf_multipart_mixed(emf, stream, part, info);
+		emf_multipart_mixed(emf, stream, part, info, is_fallback);
 		return;
 	}
 
@@ -1654,7 +1661,11 @@ emf_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, c
 }
 
 static void
-emf_multipart_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
+emf_multipart_signed (EMFormat *emf,
+                      CamelStream *stream,
+                      CamelMimePart *part,
+                      const EMFormatHandler *info,
+                      gboolean is_fallback)
 {
 	CamelMimePart *cpart;
 	CamelMultipartSigned *mps;
@@ -1668,7 +1679,7 @@ emf_multipart_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *part, co
 		return;
 	}
 
-	mps = (CamelMultipartSigned *)camel_medium_get_content_object((CamelMedium *)part);
+	mps = (CamelMultipartSigned *)camel_medium_get_content ((CamelMedium *)part);
 	if (!CAMEL_IS_MULTIPART_SIGNED(mps)
 	    || (cpart = camel_multipart_get_part((CamelMultipart *)mps, CAMEL_MULTIPART_SIGNED_CONTENT)) == NULL) {
 		em_format_format_error(emf, stream, _("Could not parse MIME message. Displaying as source."));
@@ -1712,14 +1723,14 @@ emf_multipart_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *part, co
 				emfc = emf_insert_cache(emf, emf->part_id->str);
 
 			emfc->valid = camel_cipher_validity_clone(valid);
-			camel_object_ref((emfc->secured = cpart));
+			g_object_ref ((emfc->secured = cpart));
 
 			add_validity_found (emf, valid);
 			em_format_format_secure(emf, stream, cpart, valid);
 		}
 
 		camel_exception_free(ex);
-		camel_object_unref(cipher);
+		g_object_unref (cipher);
 	}
 }
 
@@ -1728,7 +1739,8 @@ static void
 emf_application_mbox (EMFormat *emf,
                       CamelStream *stream,
                       CamelMimePart *mime_part,
-                      const EMFormatHandler *info)
+                      const EMFormatHandler *info,
+                      gboolean is_fallback)
 {
 	const EMFormatHandler *handle;
 	CamelMimeParser *parser;
@@ -1757,11 +1769,11 @@ emf_application_mbox (EMFormat *emf,
 
 	mem_stream = camel_stream_mem_new ();
 	camel_data_wrapper_decode_to_stream (
-		camel_medium_get_content_object (CAMEL_MEDIUM (mime_part)), mem_stream);
+		camel_medium_get_content (CAMEL_MEDIUM (mime_part)), mem_stream);
 	camel_seekable_stream_seek (
 		CAMEL_SEEKABLE_STREAM (mem_stream), 0, CAMEL_STREAM_SET);
 	camel_mime_parser_init_with_stream (parser, mem_stream);
-	camel_object_unref (mem_stream);
+	g_object_unref (mem_stream);
 
 	/* Extract messages from the mbox. */
 	state = camel_mime_parser_step (parser, NULL, NULL);
@@ -1772,14 +1784,14 @@ emf_application_mbox (EMFormat *emf,
 		mime_part = CAMEL_MIME_PART (message);
 
 		if (camel_mime_part_construct_from_parser (mime_part, parser) == -1) {
-			camel_object_unref (message);
+			g_object_unref (message);
 			break;
 		}
 
 		/* Render the message. */
-		handle->handler (emf, stream, mime_part, handle);
+		handle->handler (emf, stream, mime_part, handle, FALSE);
 
-		camel_object_unref (message);
+		g_object_unref (message);
 
 		/* Skip past CAMEL_MIME_PARSER_STATE_FROM_END. */
 		camel_mime_parser_step (parser, NULL, NULL);
@@ -1787,13 +1799,17 @@ emf_application_mbox (EMFormat *emf,
 		state = camel_mime_parser_step (parser, NULL, NULL);
 	}
 
-	camel_object_unref (parser);
+	g_object_unref (parser);
 }
 
 static void
-emf_message_rfc822(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
+emf_message_rfc822 (EMFormat *emf,
+                    CamelStream *stream,
+                    CamelMimePart *part,
+                    const EMFormatHandler *info,
+                    gboolean is_fallback)
 {
-	CamelDataWrapper *dw = camel_medium_get_content_object((CamelMedium *)part);
+	CamelDataWrapper *dw = camel_medium_get_content ((CamelMedium *)part);
 	const EMFormatHandler *handle;
 	gint len;
 
@@ -1807,13 +1823,17 @@ emf_message_rfc822(EMFormat *emf, CamelStream *stream, CamelMimePart *part, cons
 
 	handle = em_format_find_handler(emf, "x-evolution/message/rfc822");
 	if (handle)
-		handle->handler(emf, stream, (CamelMimePart *)dw, handle);
+		handle->handler(emf, stream, (CamelMimePart *)dw, handle, FALSE);
 
 	g_string_truncate(emf->part_id, len);
 }
 
 static void
-emf_message_deliverystatus(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
+emf_message_deliverystatus (EMFormat *emf,
+                            CamelStream *stream,
+                            CamelMimePart *part,
+                            const EMFormatHandler *info,
+                            gboolean is_fallback)
 {
 	em_format_format_text(emf, stream, (CamelDataWrapper *)part);
 }
@@ -1821,7 +1841,7 @@ emf_message_deliverystatus(EMFormat *emf, CamelStream *stream, CamelMimePart *pa
 static void
 emf_inlinepgp_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart, EMFormatHandler *info)
 {
-	CamelStreamFilter *filtered_stream;
+	CamelStream *filtered_stream;
 	CamelMimeFilterPgp *pgp_filter;
 	CamelContentType *content_type;
 	CamelCipherContext *cipher;
@@ -1850,24 +1870,26 @@ emf_inlinepgp_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart, E
 		em_format_format_source(emf, stream, ipart);
 		/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
 		camel_exception_free(ex);
-		camel_object_unref(cipher);
+		g_object_unref (cipher);
 		return;
 	}
 
 	/* Setup output stream */
 	ostream = camel_stream_mem_new();
-	filtered_stream = camel_stream_filter_new_with_stream(ostream);
+	filtered_stream = camel_stream_filter_new (ostream);
 
 	/* Add PGP header / footer filter */
 	pgp_filter = (CamelMimeFilterPgp *)camel_mime_filter_pgp_new();
-	camel_stream_filter_add(filtered_stream, (CamelMimeFilter *)pgp_filter);
-	camel_object_unref(pgp_filter);
+	camel_stream_filter_add (
+		CAMEL_STREAM_FILTER (filtered_stream),
+		CAMEL_MIME_FILTER (pgp_filter));
+	g_object_unref (pgp_filter);
 
 	/* Pass through the filters that have been setup */
-	dw = camel_medium_get_content_object((CamelMedium *)ipart);
+	dw = camel_medium_get_content ((CamelMedium *)ipart);
 	camel_data_wrapper_decode_to_stream(dw, (CamelStream *)filtered_stream);
 	camel_stream_flush((CamelStream *)filtered_stream);
-	camel_object_unref(filtered_stream);
+	g_object_unref (filtered_stream);
 
 	/* Create a new text/plain MIME part containing the signed content preserving the original part's Content-Type params */
 	content_type = camel_mime_part_get_content_type (ipart);
@@ -1888,7 +1910,7 @@ emf_inlinepgp_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart, E
 	g_free (type);
 
 	opart = camel_mime_part_new ();
-	camel_medium_set_content_object ((CamelMedium *) opart, dw);
+	camel_medium_set_content ((CamelMedium *) opart, dw);
 	camel_data_wrapper_set_mime_type_field ((CamelDataWrapper *) opart, dw->mime_type);
 
 	add_validity_found (emf, valid);
@@ -1896,10 +1918,10 @@ emf_inlinepgp_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart, E
 	em_format_format_secure(emf, stream, opart, valid);
 
 	/* Clean Up */
-	camel_object_unref(dw);
-	camel_object_unref(opart);
-	camel_object_unref(ostream);
-	camel_object_unref(cipher);
+	g_object_unref (dw);
+	g_object_unref (opart);
+	g_object_unref (ostream);
+	g_object_unref (cipher);
 	camel_exception_free(ex);
 }
 
@@ -1927,12 +1949,12 @@ emf_inlinepgp_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart
 		em_format_format_source(emf, stream, ipart);
 		/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
 		camel_exception_free(ex);
-		camel_object_unref(cipher);
-		camel_object_unref(opart);
+		g_object_unref (cipher);
+		g_object_unref (opart);
 		return;
 	}
 
-	dw = camel_medium_get_content_object ((CamelMedium *)opart);
+	dw = camel_medium_get_content ((CamelMedium *)opart);
 	mime_type = camel_data_wrapper_get_mime_type (dw);
 
 	/* this ensures to show the 'opart' as inlined, if possible */
@@ -1950,8 +1972,8 @@ emf_inlinepgp_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart
 	em_format_format_secure(emf, stream, opart, valid);
 
 	/* Clean Up */
-	camel_object_unref(opart);
-	camel_object_unref (cipher);
+	g_object_unref (opart);
+	g_object_unref (cipher);
 	camel_exception_free (ex);
 }
 
@@ -2013,20 +2035,28 @@ em_format_snoop_type (CamelMimePart *part)
 	if (filename != NULL)
 		name_type = e_util_guess_mime_type (filename, FALSE);
 
-	dw = camel_medium_get_content_object((CamelMedium *)part);
-	if (!camel_data_wrapper_is_offline(dw)) {
-		GByteArray *buffer = g_byte_array_new ();
-		CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new_with_byte_array(buffer);
+	dw = camel_medium_get_content ((CamelMedium *)part);
+	if (!camel_data_wrapper_is_offline (dw)) {
+		GByteArray *byte_array;
+		CamelStream *stream;
 
-		if (camel_data_wrapper_decode_to_stream(dw, (CamelStream *)mem) > 0) {
-			gchar *ct = g_content_type_guess (filename, buffer->data, buffer->len, NULL);
+		byte_array = g_byte_array_new ();
+		stream = camel_stream_mem_new_with_byte_array (byte_array);
 
-			if (ct)
-				magic_type = g_content_type_get_mime_type (ct);
+		if (camel_data_wrapper_decode_to_stream (dw, stream) > 0) {
+			gchar *content_type;
 
-			g_free (ct);
+			content_type = g_content_type_guess (
+				filename, byte_array->data,
+				byte_array->len, NULL);
+
+			if (content_type != NULL)
+				magic_type = g_content_type_get_mime_type (content_type);
+
+			g_free (content_type);
 		}
-		camel_object_unref(mem);
+
+		g_object_unref (stream);
 	}
 
 	d(printf("snooped part, magic_type '%s' name_type '%s'\n", magic_type, name_type));
diff --git a/em-format/em-format.h b/em-format/em-format.h
index 4d8beaa228..965ca20399 100644
--- a/em-format/em-format.h
+++ b/em-format/em-format.h
@@ -29,13 +29,7 @@
 #define EM_FORMAT_H
 
 #include <glib-object.h>
-#include <camel/camel-url.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-session.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-cipher-context.h>
+#include <camel/camel.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_FORMAT \
@@ -65,7 +59,7 @@ typedef struct _EMFormatPrivate EMFormatPrivate;
 typedef struct _EMFormatHandler EMFormatHandler;
 typedef struct _EMFormatHeader EMFormatHeader;
 
-typedef void (*EMFormatFunc) (EMFormat *md, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info);
+typedef void (*EMFormatFunc) (EMFormat *md, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info, gboolean is_fallback);
 
 typedef enum _em_format_mode_t {
 	EM_FORMAT_NORMAL,
diff --git a/em-format/em-stripsig-filter.c b/em-format/em-stripsig-filter.c
index 42d824778b..f2c08a8dc1 100644
--- a/em-format/em-stripsig-filter.c
+++ b/em-format/em-stripsig-filter.c
@@ -30,57 +30,17 @@
 
 #include "em-stripsig-filter.h"
 
-static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass);
-static void em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass);
-
-static void filter_filter (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
-			   gchar **out, gsize *outlen, gsize *outprespace);
-static void filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
-			     gchar **out, gsize *outlen, gsize *outprespace);
-static void filter_reset (CamelMimeFilter *filter);
-
-static CamelMimeFilterClass *parent_class = NULL;
-
-CamelType
-em_stripsig_filter_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (),
-					    "EMStripSigFilter",
-					    sizeof (EMStripSigFilter),
-					    sizeof (EMStripSigFilterClass),
-					    (CamelObjectClassInitFunc) em_stripsig_filter_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) em_stripsig_filter_init,
-					    NULL);
-	}
-
-	return type;
-}
-
-static void
-em_stripsig_filter_class_init (EMStripSigFilterClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-
-	parent_class = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));
-
-	filter_class->reset = filter_reset;
-	filter_class->filter = filter_filter;
-	filter_class->complete = filter_complete;
-}
+G_DEFINE_TYPE (EMStripSigFilter, em_stripsig_filter, CAMEL_TYPE_MIME_FILTER)
 
 static void
-em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass)
-{
-	filter->midline = FALSE;
-}
-
-static void
-strip_signature (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
-		 gchar **out, gsize *outlen, gsize *outprespace, gint flush)
+strip_signature (CamelMimeFilter *filter,
+                 const gchar *in,
+                 gsize len,
+                 gsize prespace,
+                 gchar **out,
+                 gsize *outlen,
+                 gsize *outprespace,
+                 gint flush)
 {
 	EMStripSigFilter *stripsig = (EMStripSigFilter *) filter;
 	register const gchar *inptr = in;
@@ -128,17 +88,29 @@ strip_signature (CamelMimeFilter *filter, const gchar *in, gsize len, gsize pres
 }
 
 static void
-filter_filter (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
-	       gchar **out, gsize *outlen, gsize *outprespace)
+filter_filter (CamelMimeFilter *filter,
+               const gchar *in,
+               gsize len,
+               gsize prespace,
+               gchar **out,
+               gsize *outlen,
+               gsize *outprespace)
 {
-	strip_signature (filter, in, len, prespace, out, outlen, outprespace, FALSE);
+	strip_signature (
+		filter, in, len, prespace, out, outlen, outprespace, FALSE);
 }
 
 static void
-filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
-		 gchar **out, gsize *outlen, gsize *outprespace)
+filter_complete (CamelMimeFilter *filter,
+                 const gchar *in,
+                 gsize len,
+                 gsize prespace,
+                 gchar **out,
+                 gsize *outlen,
+                 gsize *outprespace)
 {
-	strip_signature (filter, in, len, prespace, out, outlen, outprespace, TRUE);
+	strip_signature (
+		filter, in, len, prespace, out, outlen, outprespace, TRUE);
 }
 
 /* should this 'flush' outstanding state/data bytes? */
@@ -150,6 +122,22 @@ filter_reset (CamelMimeFilter *filter)
 	stripsig->midline = FALSE;
 }
 
+static void
+em_stripsig_filter_class_init (EMStripSigFilterClass *class)
+{
+	CamelMimeFilterClass *mime_filter_class;
+
+	mime_filter_class = CAMEL_MIME_FILTER_CLASS (class);
+	mime_filter_class->filter = filter_filter;
+	mime_filter_class->complete = filter_complete;
+	mime_filter_class->reset = filter_reset;
+}
+
+static void
+em_stripsig_filter_init (EMStripSigFilter *filter)
+{
+}
+
 /**
  * em_stripsig_filter_new:
  *
@@ -160,5 +148,5 @@ filter_reset (CamelMimeFilter *filter)
 CamelMimeFilter *
 em_stripsig_filter_new (void)
 {
-	return (CamelMimeFilter *) camel_object_new (EM_TYPE_STRIPSIG_FILTER);
+	return g_object_new (EM_TYPE_STRIPSIG_FILTER, NULL);
 }
diff --git a/em-format/em-stripsig-filter.h b/em-format/em-stripsig-filter.h
index 39493e5e88..f841727693 100644
--- a/em-format/em-stripsig-filter.h
+++ b/em-format/em-stripsig-filter.h
@@ -20,38 +20,49 @@
  *
  */
 
-#ifndef __EM_STRIPSIG_FILTER_H__
-#define __EM_STRIPSIG_FILTER_H__
+#ifndef EM_STRIPSIG_FILTER_H
+#define EM_STRIPSIG_FILTER_H
 
-#include <camel/camel-mime-filter.h>
+#include <camel/camel.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define EM_TYPE_STRIPSIG_FILTER \
+	(em_stripsig_filter_get_type ())
+#define EM_STRIPSIG_FILTER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), EM_TYPE_STRIPSIG_FILTER, EMStripSigFilter))
+#define EM_STRIPSIG_FILTER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), EM_TYPE_STRIPSIG_FILTER, EMStripSigFilterClass))
+#define EM_IS_STRIPSIG_FILTER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), EM_TYPE_STRIPSIG_FILTER))
+#define EM_IS_STRIPSIG_FILTER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), EM_TYPE_STRIPSIG_FILTER))
+#define EM_STRIPSIG_FILTER_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), EM_TYPE_STRIPSIG_FILTER, EMStripSigFilterClass))
 
-#define EM_TYPE_STRIPSIG_FILTER            (em_stripsig_filter_get_type ())
-#define EM_STRIPSIG_FILTER(obj)            (CAMEL_CHECK_CAST ((obj), EM_TYPE_STRIPSIG_FILTER, EMStripSigFilter))
-#define EM_STRIPSIG_FILTER_CLASS(klass)    (CAMEL_CHECK_CLASS_CAST ((klass), EM_TYPE_STRIPSIG_FILTER, EMStripSigFilterClass))
-#define EM_IS_STRIPSIG_FILTER(obj)         (CAMEL_CHECK_TYPE ((obj), EM_TYPE_STRIPSIG_FILTER))
-#define EM_IS_STRIPSIG_FILTER_CLASS(klass) (CAMEL_CHECK_CLASS_TYPE ((klass), EM_TYPE_STRIPSIG_FILTER))
-#define EM_STRIPSIG_FILTER_GET_CLASS(obj)  (CAMEL_CHECK_GET_CLASS ((obj), EM_TYPE_STRIPSIG_FILTER, EMStripSigFilterClass))
+G_BEGIN_DECLS
 
 typedef struct _EMStripSigFilter EMStripSigFilter;
 typedef struct _EMStripSigFilterClass EMStripSigFilterClass;
 
 struct _EMStripSigFilter {
-	CamelMimeFilter parent_object;
+	CamelMimeFilter parent;
 
 	guint32 midline:1;
 };
 
 struct _EMStripSigFilterClass {
 	CamelMimeFilterClass parent_class;
-
 };
 
-CamelType em_stripsig_filter_get_type (void);
-
-CamelMimeFilter *em_stripsig_filter_new (void);
+GType		em_stripsig_filter_get_type	(void);
+CamelMimeFilter *
+		em_stripsig_filter_new		(void);
 
 G_END_DECLS
 
-#endif /* __EM_STRIPSIG_FILTER_H__ */
+#endif /* EM_STRIPSIG_FILTER_H */
diff --git a/filter/ChangeLog b/filter/ChangeLog
deleted file mode 100644
index daf8946e76..0000000000
--- a/filter/ChangeLog
+++ /dev/null
@@ -1,984 +0,0 @@
-2009-04-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* filter-option.c: (combobox_changed), (get_widget):
-	Fix breakage of filter options.
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* filter.glade:
-	* filter-datespec.c:
-	* filter-rule.c:
-	* filter-option.c:
-	Remove deprecated Gtk+ symbols.
-
-2009-01-11  Tor Lillqvist  <tml@novell.com>
-
-	* filter-option.c (get_dynamic_options): Add cast to avoid
-	warning.
-
-2009-01-11  Tor Lillqvist  <tml@novell.com>
-
-	** Bug #567244
-
-	* filter-option.c (get_dynamic_options): For portability, use
-	<gmodule.h> API instead of <dlfcn.h> API.
-
-2009-01-08  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #567031
-
-	* rule-editor.c: (rule_editor_new): Hide also label of the combo.
-
-2009-01-08  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #339879
-
-	* filter-code.h: (filter_code_new):
-	* filter-code.c: (filter_code_new), (build_code):
-	* rule-context.c: (new_element):
-	Have two types of code expression, one "code", which adds also
-	a "match-all" into the expression, and a "rawcode" without it.
-
-2008-12-15  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #563669
-
-	* filter-int.c: (get_widget):
-	Use zero GtkSpinButton's PageSize, as Gtk+ requires.
-
-2008-12-10  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #563870
-
-	* Makefile.am:
-	* filter-label.h:
-	* filter-label.c: Drop, not used anywhere.
-	* filter-element.c:
-	* rule-context.c: Remove dropped include and code.
-
-	* filter-option.c: (get_dynamic_options), (xml_create), (get_widget):
-	Evaluate dynamic options even on create, to have them available for
-	saved searches even before the widget itself is shown.
-
-2008-12-09  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #563669
-
-	* filter.glade:
-	Use zero GtkSpinButton's PageSize, as Gtk+ requires.
-
-2008-12-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #332629
-
-	* filter-option.h: (struct _filter_option),
-	(struct _FilterOption), (filter_option_add):
-	* filter-option.c: (filter_option_init), (filter_option_finalise),
-	(filter_option_add), (xml_create), (get_widget), (clone):
-	Be able to define optionlist with dynamically created list of options.
-
-	* filter-label.c: (fill_options): Adapt.
-
-2008-10-17  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fix for bug #503898
-
-	* filter-rule.c: (get_widget): s/criteria/condition/
-
-2008-10-06  Lucian Langa <lucilanga@gnome.org>
-
-	** Fix for bug #554566
-
-	* rule-editor.c: (rule_editor_class_init), (rule_edit),
-	(rule_top), (rule_up), (rule_down), (rule_bottom),
-	(cursor_changed)
-	(update_selected_rule): new function to update
-	current selected rule
-
-2008-10-01  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* filter-rule.c:
-
-2008-09-29  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* rule-editor.c:
-
-2008-09-25  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* filter-element.c:
-	* filter-int.c:
-	* filter-int.h:
-
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* filter-datespec.c:
-
-2008-09-16  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* filter-option.c:
-	* filter-part.c:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* filter-code.c:
-	* filter-code.h:
-	* filter-colour.c:
-	* filter-colour.h:
-	* filter-datespec.h:
-	* filter-element.h:
-	* filter-file.c:
-	* filter-input.c:
-	* filter-input.h:
-	* filter-option.h:
-	* filter-part.h:
-	* filter-rule.h:
-	* rule-context.c:
-	* rule-editor.h:
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* filter-file.h:
-	* filter-label.c:
-	* filter-label.h:
-	* rule-context.h:
-
-2008-07-30  Takao Fujiwara  <takao.fujiwara@sun.com>
-
-	Reviewed by Srinivasa Ragavan <sragavan@novell.com>
-
-	** Fix for bug #545303
-
-	* filter-rule.c: (xml_decode): Add gettext in the xml string.
-
-2008-07-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #530388
-
-	* filter-label.c: (filter_label_init), (filter_label_finalise),
-	(fill_options), (filter_label_count), (filter_label_label),
-	(filter_label_index): Make 'cache_lock' a rec mutex.
-	* filter-label.c: (regen_label_options): Guard also regeneration
-	of each tracked item with the rec lock, thus noone will touch
-	'tracked_filters' GSList until we are fully done with it.
-
-2008-07-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #243201
-
-	* filter-rule.c: (xml_encode): Escape rule title so that can contain
-	also XML entities in the file.
-
-2008-06-16  Maciej Piechotka  <uzytkownik2@gmal.com>
-
-	** Fix for bug #526262
-
-	* filter-part.c: (xml_create):
-	* filter-part.c: (filter_part_xml_create):
-	Handle _title element in analogical way as title
-
-2008-06-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #382783
-
-	* filter-rule.c: (do_grab_focus_cb), (more_parts), (get_widget):
-	Grab focus of new rule part on adding and scroll to the bottom too.
-
-2008-06-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #201011
-
-	* filter-rule.h: (struct _FilterRule): New property 'enabled'
-	to be able to disable filter rules.
-	* filter-rule.c: (filter_rule_init), (rule_eq), (xml_encode),
-	(xml_decode), (rule_copy): Store/restore/use 'enabled' value.
-	* rule-editor.c: (add_editor_response), (rule_move), (set_source):
-	Set the 'enabled' column properly.
-	* rule-editor.c: (rule_able_toggled), (rule_editor_treeview_new):
-	Add column "Enabled" to the tree, but have it hidden by default, only
-	those whom supports it can show it.
-
-2008-06-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* filter-part.c: (main): gtk_window_set_policy ->
-	gtk_window_set_resizable + other cleanups.
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534360
-
-	* rule-editor.c:
-	* rule-editor.h:
-	Migrate from deprecated GtkObject symbols to GObject equivalents.
-
-2008-01-10  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #211353
-
-	* filter-option.h:
-	* filter-option.c: (filter_option_get_current),
-	(filter_option_remove_all): New functions to be able to refill options
-	even after initialization of the filter element.
-	* filter-label.c: Added support to notify changes on labels in runtime
-	and use actual labels.
-
-2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* filter-label.c: (filter_label_count), (filter_label_label),
-	(filter_label_index), (xml_create): Removing cyclic dependency caused 
-	by mail_config_get_labels.
-
-2007-12-14  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #211353
-
-	* filter-label.c: Use global label's setup, not its own copy.
-
-2007-12-07  Bob Mauchin  <zebob.m@pengzone.org>
-
-	** Fix for bug #438769
-
-	* filter-rule.c: (get_widget): Changed label from 'Search name' to 
-	'Rule name' in the add-new-message-filter dialog - i.e. 
-	edit -> message filters -> add
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* filter-datespec.c: (set_values):
-	* filter-rule.c: (filter_rule_get_type), (filter_rule_new),
-	(rule_copy):
-	* rule-editor.c: (editor_response), (rule_delete), (rule_move):
-
-	Warning fixes:
-	- NULL vs 0
-	- ANSIfication of declarations
-	- mixing code and declarations
-
-2007-10-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #323977
-
-	* filter-rule.c: (get_widget):
-	Use "Add Filter Criteria" instead of plain "Add" for button label.
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* filter-file.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #461195
-
-	* filter-marshal.list: Remove needless marshalers.
-	* filter-rule.c:
-	* filter-context.c: Use GObject's marshalers.
-
-2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #476231
-
-	* filter-file.c:
-	Remove non-USE_GTKFILECHOOSER code.
-	GtkFileChooser has been around since 2004.
-
-2007-09-12  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #473514
-
-	* filter-part.c: (filter_part_get_widget):
-	Allow expand and fill free space to FilterFile.
-	* filter-rule.c: (option_activate), (get_rule_part_widget):
-	Allow rule part fill space if requested.
-
-	* filter-file.c: (get_widget): Fixed runtime warning.
-
-2007-09-12  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #231178
-
-	* filter-label.c: (xml_create):
-	Removes underscores from titles.
-
-2007-09-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #471791 (Move away from asserts to g_ret*)
-
-	* filter-option.c: (filter_option_set_current),
-	(filter_option_add):
-	* filter-rule.c: (filter_rule_clone), (filter_rule_set_name),
-	(filter_rule_set_source), (filter_rule_validate), (filter_rule_eq),
-	(filter_rule_xml_encode), (filter_rule_xml_decode),
-	(filter_rule_copy), (filter_rule_add_part),
-	(filter_rule_remove_part), (filter_rule_replace_part),
-	(filter_rule_build_code), (filter_rule_emit_changed):
-	* rule-context.c: (rule_context_add_part_set),
-	(rule_context_add_rule_set), (rule_context_set_error),
-	(rule_context_load), (rule_context_save), (rule_context_revert),
-	(rule_context_find_part), (rule_context_create_part),
-	(rule_context_next_part), (rule_context_next_rule),
-	(rule_context_find_rule), (rule_context_add_part),
-	(rule_context_add_rule), (rule_context_add_rule_gui),
-	(rule_context_remove_rule), (rule_context_rank_rule),
-	(rule_context_get_rank_rule), (rule_context_find_rank_rule):
-	* rule-editor.c: (rule_move), (cursor_changed):
-
-2007-08-13  Ross Burton  <ross@openedhand.com>
-
-	* rule-context.c:
-	Remove unused include.
-
-2007-07-30  Andre Klapper  <a9016009@gmx.de>
-
-	* filter.glade:
-	remove "window1" string from translation
-
-2007-07-27  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fix for bug #457523.
-	
-	* filter-int.c: (format_sexp): use (- n) for negative values.
-	
-2007-06-15  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #263207
-
-	* filter-rule.c: (validate): No part is not valid.
-	* filter-rule.c: (less_parts): Can remove all parts.
-	* rule-editor.c: (dialog_rule_changed): New callback
-	for disabling OK button in dialog when rule isn't valid.
-	* rule-editor.c: (rule_add), (rule_edit):
-	Connecting dialog_rule_changed on "changed" signal of
-	actual rule.
-
-2007-06-04  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* rule-context.c: (new_element): Added a percentage 
-	element.
-	
-	Committing on behalf of Keshav Upadhyaya <ukeshav@novell.com>	
-
-2007-05-17  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	** Fixes bug #439118
-
-	* filter-code.c: (filter_code_init):
-	* filter-colour.c: (xml_encode), (xml_decode):
-	* filter-datespec.c: (xml_encode), (xml_decode):
-	* filter-element.c: (xml_create):
-	* filter-file.c: (filter_file_new_type_name), (xml_encode),
-	(xml_decode):
-	* filter-input.c: (filter_input_new_type_name), (xml_encode),
-	(xml_decode):
-	* filter-int.c: (xml_encode), (xml_decode):
-	* filter-option.c: (xml_create), (xml_encode), (xml_decode):
-	* filter-part.c: (filter_part_xml_create),
-	(filter_part_xml_encode), (filter_part_xml_decode):
-	* filter-rule.c: (xml_encode), (load_set), (xml_decode):
-	* rule-context.c: (load), (save), (revert): fix compilation warnings
-
-2007-05-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Patch from Trever Adams for bug #211058
-
-	* filter-datespec.c: (set_button), (get_values), (set_values),
-	(set_option_past_future), (button_clicked), (format_sexp):
-	* filter-datespec.h:
-	* filter.glade:
-
-2007-04-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #430559 from Vinod.
-
-	* filter-rule.c: (get_widget): Added mnemonics.
-
-2007-04-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #373116
-
-	* filter-colour.h:
-	Store color as a GdkColor instead of separate RGBA components.
-
-	* filter-colour.c (color_eq):
-	Use gdk_color_equal() to compare colors.
-
-	* filter-colour.c (xml_encode):
-	Encode color as a single property ("spec").
-
-	* filter-colour.c (xml_decode):
-	Read the color from a single property ("spec").
-	Provide a migration path for old XML files.
-
-	* filter-colour.c (get_widget):
-	Migrate from GnomeColorPicker to GtkColorButton.
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2007-02-04  Andre Klapper  <a9016009@gmx.de>
-
-	* filter-rule.c: (get_widget): Add mnemonic to "Find items".
-	Fixes bug #404242.
-
-2006-10-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* filter-file.c: (get_widget): Move a var into #ifndef #USE_FILECOOSER
-	to get rid of a warning. bug #332101.
-
-2006-09-25  Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #324882
-	* filter.glade: Alignment corrected for the date filtering rule.
-	
-2006-07-07  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** 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
-	* rule-editor.c: (rule_editor_add_undo), (rule_editor_play_undo),
-	(editor_response), (set_source): Move around some code to avoid
-	unneccesary prototypes.
-
-2006-01-25  Not Zed  <NotZed@Ximian.com>
-
-	 * filter-rule.[ch]: Added new thread-matching mode 'single' for
-	 messages not part of any conversation.
-	 Committed on behalf of Notzed - partha
-
-2005-12-20  Matthew Hall  <matt@castleinthesky.org>
-
-	* filter.glade; rule-editor.c: adding top/bottom buttons for
-	filter manager dialog. Fixes bug 205616.
-
-2005-12-20  Srinivasa Ragavan <sragavan@novell.comcom>
-
-	** Fixes bug #246225 
-	** Fixes bug #246227
-
-	* filter-rule.c: Added the UI suggestions for "Advanced search" and "Save search"
-	
-	Commiting patch from Arulanandan P <arulanandan@gmail.com>
-
-2005-12-17  Tor Lillqvist  <tml@novell.com>
-
-	* filter-file.c
-	* rule-context.c: Use libedataserver's e_xml_parse_file(). Use
-	gstdio wrappers. Use g_file_test().
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* filter-rule.c (get_widget): cast.
-
-2005-08-10  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use privsolib instead of privlib. On Unix they are
-	the same, on Win32 privsolibdir is the same as libdir. Use the
-	macro name EVOLUTION_GLADEDIR as in e-util/e-util-private.h
-	instead of FILTER_GLADEDIR, so that the Win32 run-time path lookup
-	mechanism works. Use NO_UNDEFINED. Link explicitly with the actual
-	libraries used.
-
-	* filter-datespec.c: No localtime_r() on Win32, but we can use
-	plain localtime() which is thread-safe in the Microsoft C library.
-
-	* filter-datespec.c
-	* rule-editor.c: Include e-util-private.h for Win32 path run-time
-	lookup. Use EVOLUTION_GLADEDIR instead of FILTER_GLADEDIR, and do
-	the filter.glade pathname construction at run-time so it works
-	even when EVOLUTION_GLADEDIR is a function call on Win32.
-
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* moved e-error to e-util
-
-	* Makefile.am: fix error i18n extraction
-
-2005-05-06  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* filter-rule.c : Remove markup from translatable string. Fixes #268390
-	Patch submitted by Priit Laes
-
-2005-02-17  Harry Lu  <harry.lu@sun.com>
-
-	Fix for 72676.
-
-	* rule-editor.c: (double_click): call gtk_tree_selection_get_selected
-	to see if there is a row selected.
-
-2005-02-09  Hans Petter Jansson  <hpj@novell.com>
-
-	* Makefile.am: Install shared libraries in privlibdir.
-
-2005-01-11  Not Zed  <NotZed@Ximian.com>
-
-	* filter-part.c (filter_part_expand_code): cast lenght specifiers
-	to int.
-
-2004-12-02  Diego Sevilla Ruiz  <dsevilla@dsevilla>
-
-	* filter.glade: Added label "Show filters for mail:".
-	
-	* filter-rule.c: Capitalize Ingoing and Outgoing labels.
-	Fixes #46229.
-	
-2004-11-29  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* filter-rule.c: (get_widget):add mnemonic widget in search box.
-
-2004-11-15  Not Zed  <NotZed@Ximian.com>
-
-	* *.c: Moved stuff from e-util to libedataserver.
-
-	* filter-system-flag.c: removed gal header.
-
-2004-07-29  Carlos Garnacho Parro  <carlosg@gnome.org>
-
-	* filter-file.c: added the "use_filechooser" property to the 
-	GnomeFileEntry
-
-2004-06-21  Jeffrey Stedfast  <fejj@novell.com>
-
-	* filter-input.c (xml_encode): encode entities. fixes bug #46677.
-
-2004-06-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-errors.xml.h: Re-added - THIS IS NOT TO BE REMOVED!!!!
-
-2004-06-17  Rodney Dawes  <dobey@novell.com>
-
-	* filter-errors.xml.h: Remove this generated file from CVS
-
-2004-06-17  Not Zed  <NotZed@Ximian.com>
-
-	** See #59885.
-
-	** Moved all of the mailer specific filter stuff into mail/*.
-
-	* filter-element.c (copy_value): implement for base types.
-
-	* filter-element.c (filter_element_copy_value): do this as a
-	virtual method.
-
-	* filter.glade: moved the vfolder stuff to mail/
-
-	* libfilter-i18n.h: removed, moved to mailer.
-
-	* filter-errors.xml: moved the vfolder/filtering errors to the
-	mail error file.
-
-	* Makefile.am (EXTRA_DIST): moved *types.xml to mail.
-	(INCLUDES): removed a bunch of mail dependencies.
-
-	* filter-*.[ch], vfolder-*.[ch]: Moved all mail related filter and
-	vfolder stuff to mail directory.
-
-	* score-*.[ch]: Removed all of it.
-
-	* vfolder-context.c (vfolder_new_element): and for vfolders.
-
-	* filter-context.c (filter_new_element): implement for filter
-	element types.
-
-	* rule-context.c (rc_new_element): replacement for old
-	filter_element_new_type_name.  only has the basics.
-
-	* filter-part.c (filter_part_xml_create): take a rule context
-	as an argument & and look up the element name off the context.
-
-	* rule-context.c (rule_context_new_element): new virtual method to
-	get an element for a given name.
-
-	* filter-element.c (filter_element_new_type_name): removed.
-
-2004-06-08  Not Zed  <NotZed@Ximian.com>
-
-	* filtertypes.xml: give the junk test a unique name. #59567.
-
-2004-05-27  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am (EXTRA_DIST): Add $(error_i18n)
-
-2004-05-26  Rodney Dawes  <dobey@novell.com>
-
-	* libfilter-i18n.h: Removed from CVS
-	Generated files don't belong in CVS
-
-2004-05-19  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: don't dist the error .h file
-
-2004-05-18  Not Zed  <NotZed@Ximian.com>
-
-	* vfolder-rule.c (source_add): fix for folder selector api change,
-	change the ok button to "Add".
-
-2004-05-12  Jeffrey Stedfast  <fejj@novell.com>
-
-	* vfolder-rule.c: Same.
-
-	* filter-folder.c: Added a #include to fix some compile warnings.
-
-2004-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* filter-rule.c (xml_decode): load threading option if threading
-	enabled.
-	(xml_encode): write out threading setting.
-	(rule_copy): copy threading option.
-	(rule_eq): compare threading.
-	(build_code): build the match-threads stuff if set.
-	(fr_grouping_changed): insead of the match_all match_any activate
-	clalbacks.
-	(fr_threading_changed): handle threading option menu
-
-	* rule-context.c (rule_context_init): set capabilities flags.
-
-	* vfolder-context.c (vfolder_context_init): set capabilities flags
-	to include threading.
-
-	* rule-context.h: added a capabilities flag, grouping and
-	threading capabilities.  Sort of a hack to workaround not being
-	able to put grouping or threading into rules.
-
-	* filter-rule.h: added an option for threading as well as
-	grouping.
-
-2004-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (%.xml.h): fix i18n file generation rules.
-
-	* filter-errors.xml: rename from xml.in and fix tags.
-
-	* filter-errors.xml.h: add for translators.
-
-2004-05-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* vfoldertypes.xml: Added the Junk status flag to the xml
-	definition so you can vfolder on that.
-
-2004-04-28  Not Zed  <NotZed@Ximian.com>
-
-	* filter-option.c (filter_option_add): fix a warning.
-
-	** Changed error messages to use EError.
-
-2004-03-31  Not Zed  <NotZed@Ximian.com>
-
-	* filter.glade: renamed filter_label to rule_label, and removed
-	the vfolder-editor and filter-editor windows.
-
-	* rule-editor.c (rule_editor_new): hide the source widget.
-
-	* vfolder-editor.c (vfolder_editor_new): hide the source widget.
-
-	* rule-editor.c (rule_editor_new): add a label argument.
-
-	* vfolder-editor.c (vfolder_editor_new): ditto below.
-
-	* filter-editor.c (filter_editor_new): dont add any label here.
-
-	* rule-editor.c (rule_editor_construct): Put the widget back in
-	the dialogue box here.  Add an argument for the area label.
-
-	** Revert Rodney's last patch.
-
-2004-03-30  Rodney Dawes  <dobey@ximian.com>
-
-	* filter-editor.c (filter_editor_new): Use the new "filter_editor"
-	that has been added to the glade file
-	* filter.glade: Remove an unused piece of UI definition and add a
-	new "filter_editor" that is the same as rule_editor, only for the
-	filter editor dialogs, and change "Filter Rules" to "Search Rules"
-	in the rule_editor
-	* rule-editor.c (rule_editor_new): Set the child widget of the editor
-	dialog appropriately
-
-2004-03-29  Rodney Dawes  <dobey@ximian.com>
-
-	* filter-filter.c (get_widget):
-	* filter-rule.c (get_widget): Fix packing of the hbox that contains
-	the actual input widgets to expand and fill
-
-2004-03-26  Not Zed  <NotZed@Ximian.com>
-
-	* filter-option.c (filter_option_add): return the added option.
-	(clone): make sure we set the current option properly on the new
-	copy.  See #56028.
-
-	* filtertypes.xml: s/pipe to shell command/pipe to program/
-	s/shell command/run program/, cleans up the UI a lot.
-
-2004-03-20  Danilo Å egan  <dsegan@gmx.net>
-
-	* filter-datespec.c (set_button): Use ngettext for handling plurals.
-	(timespans): Use C preprocessor hacks to make xgettext see real
-	ngettext messages (fixes part of #53464).
-
-2004-03-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-rule.c (rule_copy): Don't ref the newly cloned rule (fix
-	to previous patch).
-
-2004-03-14  Bill Zhu  <bill.zhu@sun.com>
-
-	* filter-rule.c (rule_copy): When copying a FilterPart of a rule, we
-	need copy the data of parts together but not only copy the pointer.
-
-2004-04-15  Rodney Dawes  <dobey@ximian.com>
-
-	* filter-datespec.c (validate):
-	(button_clicked): Hide the separators on these dialogs
-	* filter-editor.c (filter_editor_new): Re-pack the rule_editor widget
-	in here, and get rid of the GtkFrame-related code
-	* filter-file.c (validate): Hide the separators on these dialogs
-	* filter-filter.c (get_widget): Get rid of the GtkFrame, and relayout
-	the widgets to be HIG-compliant
-	* filter-folder.c (validate): Hide the separator on this dialog
-	* filter-input.c (validate): Hide the separator on this dialog
-	* filter-part.c (main): Hide the separator on this dialog
-	* filter-rule.c (validate): Hide the separator on this dialog
-	(get_widget): Get rid of the GtkFrame, and relayout the widgets to be
-	HIG-compliant
-	* filter.glade: Make the widget layouts here be HIG-compliant
-	* rule-context.c (new_rule_response):
-	(rule_context_add_rule_gui): Hide the separators on these dialogs
-	* rule-editor.c (rule_editor_new): Get rid of the GtkFrame-related code
-	(add_editor_response): Hide the dialog separator here
-	(rule_add): Hide the dialog separator here
-	(edit_editor_response): Hide the dialog separator here
-	(rule_edit): Hide the dialog separator here
-	(rule_editor_construct): Remove the rule_editor repacking code
-	Set the dialog vbox's border width to 12
-	Set the mnemonic for the filter label here
-	Hide the dialog separator on the filter editor dialog
-	* vfolder-editor.c (vfolder_editor_new): Re-pack the appropriate
-	editor widget in here
-	Get rid of the GtkFrame-related code
-	* vfolder-rule.c (validate): Hide the dialog separators here
-
-	Original patch from William Jon McCann
-
-2004-02-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (rule_delete): After setting the new selected
-	iter, call cursor_changed() so we can update state. Fixes bug
-	#54205.
-
-2004-02-20  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #54338.
-
-	* vfolder-rule.c: instead of overriding the filter-rule's 'source'
-	attribute for 'with sources', add a 'with' enum.
-	(xml_decode): handle loading old-format files, as well as new
-	ones, where the with is a prop on the sources xml.
-	(xml_encode): set 'with' on save.
-	(rule_copy): copy across with value.
-	(get_widget): just hook onto option menu changed, dont bother
-	setting up any per-item callbacks.
-	(select_source_with_changed): callback to monitor source 'with'
-	type.
-
-2004-02-17  Not Zed  <NotZed@Ximian.com>
-
-	* filter-int.c (int_clone): implement, since we dont store the
-	min/max values in the xml output, we lose it otherwise.  Bug
-	#54155.
-
-2004-02-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	* filter-input.c (filter_input_init): Default to an empty string
-	for the value.
-	(xml_decode): Remove old values before decoding the new ones.
-
-2004-02-03  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): add widgets/misc
-
-2004-01-20  Not Zed  <NotZed@Ximian.com>
-
-	* rule-context.c (revert): load from the just-loaded 'userdoc'
-	rather than rc->user.
-	(rule_context_finalise): remove user and system xmldoc files.
-	(load): make rc->system and rc->user locals systemdoc userdoc, and
-	free them immediately.
-
-2004-01-16  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #52467.
-
-	* vfolder-rule.c (vfr_folder_response): convert the uri to an
-	evolution uri, rather than a camel one, for storage.  And remove
-	double-calls to geT_selected_uri.
-	(format_source): treat uri as an evolution uri and convert to a
-	camel one to get something meaningful out of it.
-
-2004-01-15  Radek Doulik  <rodo@ximian.com>
-
-	* filtertypes.xml: s/spam/junk, added junk test rule, it must be
-	lost while porting to 1.5
-
-2003-08-20  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #47751.
-
-	* rule-editor.c (add_editor_response, edit_editor_response) 
-	(rule_edit, rule_add, rule_editor_construct, editor_response):
-	* rule-context.c (new_rule_response, rule_context_add_rule_gui): 
-	* filter-datespec.c (button_clicked): RESPONSE_REJECT/ACCEPT ->
-	RESPONSE_CANCEL/OK
-
-2003-12-23  JP Rosevear <jpr@ximian.com>
-
-	* vfolder-rule.c (source_add): call peek instead of get as the
-	function was renamed
-
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* */Makefile.am: Remove hard coded disable deprecated flags
-	
-2003-12-04  Radek Doulik  <rodo@ximian.com>
-
-	* filter-rule.h: added FILTER_SOURCE_JUNKTEST - perform only
-	junktest on incoming mail
-
-2003-11-26  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: turn on deprecated gtk stuff
-
-2003-11-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* vfolder-rule.c: #include "em-folder-tree.h"
-
-2003-11-17  Not Zed  <NotZed@Ximian.com>
-
-	* vfolder-rule.c (source_add): fix for folder selector api changes.
-	(vfr_folder_response): handle the dialog response.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* filter.glade: Remove Viewports around the treeviews, since they
-	already have a scrolled window around them and the viewports cause
-	a double bevel to appear.
-
-	* rule-editor.c (rule_editor_treeview_new): Make the scrolled
-	window have a GTK_SHADOW_IN shadow.
-	* vfolder-rule.c (vfolder_editor_sourcelist_new): Likewise
-
-2003-10-10  Not Zed  <NotZed@Ximian.com>
-
-	* filter-folder.c (folder_selected): change for
-	emfolderselectionbutton fixes.
-	(get_widget): same.
-
-2003-09-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* filter-folder.c (get_widget): Use an EMFolderSelectionButton.
-
-2003-09-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-int.c (get_widget): Listen to the "value-changed" signal
-	rather than the "changed" signal. Fixes bug #48166.
-
-2003-09-16  Jeremy Katz  <katzj@redhat.com>
-
-	* rule-context.c (rule_context_add_part_set): type should be a GType.
-	(rule_context_add_rule_set): Likewise.
-	* rule-context.h: Update prototypes.  Use GType instead of int for
-	type in _part_set_map and _rule_set_map.
-	
-2003-09-15  Not Zed  <NotZed@Ximian.com>
-
-	** See Natzilla task #47524
-
-	* filter-rule.h (FilterRule): add a system bit, for rules that
-	shouldn't be edited/saved.
-
-	* rule-context.c (load): check for ruleset maps in the system
-	file, and if they exist, load in as system rules.
-	(save): ignore system rules if they exist.
-
-	* searchtypes.xml: Added a search-specific types folder.  Also
-	contains system searches that cannot be deleted.
-
-2003-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* vfolder-rule.c (source_add): As a temporary measure, don't call
-	evolution_shell_client_user_select_folder() since this is not done
-	by the shell anymore.
-
-	* filter-folder.c (get_widget): Return NULL for now, since we
-	can't get the folder selector button from the shell anymore.
-
-2003-08-05  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #42636.
-	
-	* vfoldertypes.xml: Fix some of the subject rules, they were
-	missing matching ')'s.
-
-2003-08-01  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #47208.
-
-	* filter-code.c (build_code): wrap the expression in a match-all
-	so boolean expressions work properly for folder searches.
-
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: Use EVO_MARSHAL_RULE
-
-2003-06-13  Larry Ewing  <lewing@ximian.com>
-
-	* filter-source.c (filter_source_finalize): free current_url.
-
-2003-06-11  Mike Kestner  <mkestner@ximian.com>
-
-	* rule-context.c (load): stat the user file before parsing.
-
-2003-06-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes some leaks from bug #43883.
-
-	* filter-file.c (xml_decode): Free file->path and set it to
-	NULL before entering the loop to decode it. This way if the value
-	is already set we don't leak it. Set file->path = g_strdup (str ?
-	str : ""); and then xmlFree the str.
-
-2003-05-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-source.c (filter_source_get_sources): Same as below.
-
-	* filter-label.c (xml_create): Unref the gconf client when we're
-	finished with it.
diff --git a/filter/ChangeLog.pre-1-4 b/filter/ChangeLog.pre-1-4
deleted file mode 100644
index ece5ee7998..0000000000
--- a/filter/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,2967 +0,0 @@
-2003-05-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-colour.c (format_sexp): Format the colour string in a way
-	that gdk_color_parse() will handle. Apparently it no longer
-	handles rgb:<red>/<green>/<blue>? Fixes bug #42345.
-
-2003-04-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #41578.
-
-	* rule-editor.c (rule_move): Pass re->source instead of
-	re->current->source to rule_context_get_rank_rule(). Also updated
-	to pass re->source to rule_context_rank_rule().
-	(rule_editor_play_undo): Updated to pass re->source to
-	rule_context_rank_rule().
-
-	* rule-context.c (rule_context_rank_rule): Now takes a 'source'
-	argument rather than using rule->source (vfolder editor lists
-	rules of all sources, not just same-source rules).
-	(revert): Pass frule->source/part->source to
-	rule_context_rank_rule() - might not be right but should preserve
-	the prior behaviour at least.
-
-2003-04-18  Not Zed  <NotZed@Ximian.com>
-
-	* rule-editor.c (d): removed debug spew.
-
-	* addresses #41398
-	
-	* vfolder-rule.c (format_source): helper function to decode a url
-	into a more user-friendly format.
-	(source_add, get_widget): add the formatted data as another
-	column to the table.
-	(vfolder_editor_sourcelist_new): add another column to the table,
-	a formatted uri as well as the raw one.
-	(d): turned off debug vomit while i'm here.
-
-2003-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes for bugs: #41149, #41150, #41151, #41152, #41153, #41155,
-	#41156, #41205, and #41208.
-
-	* filter-filter.c (get_widget): Same as with filter-rule.
-
-	* filter-rule.c (get_widget): Changed border widths of frame
-	vboxes and other padding to comply with the HIG.
-
-	* rule-editor.c (rule_add): Change window border and padding
-	around the 'rules' widget to comply with the HIG.
-	(rule_edit): Same.
-	(rule_editor_construct): Same here as well.
-
-	* filter.glade: Many HIG compliance fixes.
-
-2003-03-28  Not Zed  <NotZed@Ximian.com>
-
-	* filter-datespec.c (button_clicked): cast warning.
-
-2003-03-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-file.c (xml_decode): Loop over child nodes here too in
-	order to not be affected by libxml2 crack.
-
-	* filter-source.c (xml_decode): Fixed to disreguard libxml2 crack.
-	(get_widget): Use strcmp instead of e_url_equal().
-
-2003-03-20  Dan Winship  <danw@ximian.com>
-
-	* filter-datespec.c (timespans, set_button): Change the strings in
-	the timespans array from "second" / "seconds" to "1 second ago" /
-	"%d seconds ago", etc, and update the code in set_button that uses
-	them. Fixes #36245, translation clash between the "second" here
-	and the one in the calendar (where it's used as "2nd").
-	(button_clicked): Fix this so we don't get stuck inside
-	gtk_dialog_run's main loop forever.
-
-2003-03-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (rule_editor_set_sensitive): Don't return here -
-	this is a void function.
-	(rule_editor_set_source): Same.
-
-2003-03-18  Not Zed  <NotZed@Ximian.com>
-
-	* rule-context.c (new_rule_response): use the same code as in
-	filter-rule to enforce unique names for all rules/vfolders.
-
-2003-03-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (rule_editor_construct): Set the default window
-	size to something reasonable (350x400?). Fixes bug #39808.
-
-	* vfolder-rule.c (source_remove): Fixed to work properly. Fixes
-	bug #39654.
-
-	* rule-editor.c (rule_editor_construct): Always add a Cancel
-	button here, but if !enable_undo - make the response id
-	GTK_RESPONSE_CANCEL rather than GTK_RESPONSE_REJECT (which does
-	undo). This mimics the behaviour that was done in the mail/ code
-	previously. Fixes bug #39809.
-
-2003-03-11  Not Zed  <NotZed@Ximian.com>
-
-	* rule-context.c (revert): go to the proper level of child node
-	before looking for rule sets, fix for #39165 to make 'cancel' work.
-
-2003-03-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes for bug #39170
-
-	* filter-element.c (filter_element_xml_create): Remove return
-	keyword.
-	(filter_element_build_code): Same.
-	(filter_element_format_sexp): Here too.
-
-2003-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* filter-source.c (filter_source_get_sources): Change to use
-	EAccountList, etc.
-
-2003-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* vfolder-rule.c (source_add): Get rid of the need for the
-	GTK_WIDGET_DESTROYED() check.
-
-2003-02-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-editor.c (filter_editor_new): Use g_object_new()
-	instead of gtk_type_new().
-
-	* vfolder-editor.c (vfolder_editor_new): Use g_object_new()
-	instead of gtk_type_new().
-
-	* score-editor.c (score_editor_new): Use g_object_new() instead of
-	gtk_type_new().
-
-	* rule-editor.c (rule_editor_new): Use g_object_new() instead of
-	gtk_type_new().
-	(rule_add): Use gtk_window_set_resizable() instead of the
-	deprecated gtk_window_set_policy().
-	(rule_edit): Same here.
-	(rule_editor_construct): Here too.
-
-	* rule-context.c (rule_context_add_rule_gui): Use
-	gtk_window_set_resizable() instead of the deprecated
-	gtk_window_set_policy().
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (gladedir): Defined in configure.in now
-	(filterdir): Define using privdatadir
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (gladedir): Version using $(BASE_VERSION).
-	(filterdir): Likewise.
-
-2003-01-15  Not Zed  <NotZed@Ximian.com>
-
-	* vfolder-rule.c (get_widget): dont re-use 'widget', its the
-	return value!
-
-2003-01-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-context.c (save): Back to using e_xml_save_file().
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* rule-editor.c (rule_add): Change dialog from OK/Cancel to
-	Cancel/OK to match HIG.
-	(rule_edit): Likewise.
-	(rule_editor_construct): Likewise.
-
-	* rule-context.c (rule_context_add_rule_gui): Change dialog from
-	OK/Cancel to Cancel/OK to match HIG.
-
-	* filter-datespec.c (button_clicked): Change dialog from OK/Cancel
-	to Cancel/OK to match HIG.
-
-2003-01-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (add_editor_response): Scroll to the newly added
-	row. Fixes bug #3725.
-	(rule_delete): Scroll to the selected row.
-	(rule_move): After moving the row, re-select it and then scroll to
-	make sure that it is still visible. Fixes bug #7800.
-
-2003-01-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixed to build with -DG_DISABLE_DEPRECATED and
-	-DGTK_DISABLE_DEPRECATED
-
-2002-12-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (cursor_changed): Use an easier method for getting
-	the iter.
-
-2002-12-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* vfolder-rule.c (vfolder_editor_sourcelist_new): New custom
-	function for creating the source_list widget.
-	(get_widget): Removed the source_list creation code.
-
-	* rule-editor.c (rule_editor_construct): Listen to row-activated
-	for double-click events. Also, removed the model creation code out
-	of here.
-	(rule_editor_treeview_new): Moved the treeview and model creation
-	code into here instead, and made the glade widgets into custom
-	widgets.
-
-2002-11-26  Not Zed  <NotZed@Ximian.com>
-
-	* vfolder-rule.c (get_widget): Add a textcellrenderer to display
-	the folders.
-	(get_widget): Remove FIXME which was wrong.
-
-	* filter-rule.c (filter_rule_validate): FILTER_RULE_CLASS ->
-	_GET_CLASS
-
-	* rule-context.c (rule_context_save): RULE_CONTEXT_CLASS ->
-	RULE_CONTEXT_GET_CLASS
-	(rule_context_revert): "
-
-	* *.[ch]: Ran fix.sh over all files.
-	
-	* rule-editor.c (rule_add): widget:set_parent ->
-	window:set_transient_for
-	(editor_response): renamed from editor_clicked, handle gtk dialog
-	response codes.
-	(rule_edit): connect to response rather than clicked.
-	(rule_editor_construct): Setup a text column in the tree view.
-	Not sure if this can be handled via glade.
-
-2002-11-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-label.c (xml_create): gconfify.
-
-2002-11-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c: Updated to use GtkTreeView.
-
-	* vfolder-rule.c: Same.
-
-2002-11-13  Not Zed  <NotZed@Ximian.com>
-
-	* rule-context.c (load): Get the root node properly.
-
-	* rule-editor.c (rule_add): cast g_object_weak_ref
-	(rule_edit): "
-
-	* all: xml2 node change - childs->children.  Also, ignore 'text'
-	nodes while scanning tree.
-
-	* rule-context.h: gnome-xml->libxml.
-
-	* filter-element.h: gnome-xml->libxml
-
-	* vfolder-rule.c (source_add): comment out gtk_destroyed check.
-
-	* filter-label.c: Added back some of the guts.  Might not work but
-	some of the code uses it :-/.  Gives u a fixed set of non-editable
-	labels.
-
-2002-11-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (rule_edit): Use weak_ref instead of connecting to
-	"destroy".
-	(rule_add): Same.
-
-2002-11-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* vfolder-rule.c (validate): Use a GtkDialog instead of a
-	GnomeDialog for reporting errors.
-
-	* rule-editor.c (rule_add): Use a GtkDialog instead of
-	GnomeDialog.
-	(rule_edit): Same.
-	(add_editor_response): Use a GtkMessageDialog for the error
-	reporting instead of a GnomeDialog.
-	(edit_editor_response): Same.
-
-	* rule-context.c (rule_context_add_rule_gui): Use a GtkDialog
-	instead of a GnomeDialog.
-
-	* filter-rule.c (validate): Use GtkDialog instead of GnomeDialog
-	here.
-
-	* filter-input.c (validate): Use GtkDialog instead of GnomeDialog
-	here.
-
-	* filter-folder.c (validate): Use GtkDialog instead of GnomeDialog
-	here.
-
-	* filter-file.c (validate): Use GtkDialog instead of GnomeDialog
-	here.
-
-	* rule-editor.c: Subclass GtkDialog instead of GnomeDialog.
-
-	* filter-datespec.c (validate): Use GtkDialog instead of
-	GnomeDialog.
-	(button_clicked): Same.
-
-2002-11-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-label.c (xml_create): Deleted most of the internals until
-	we devise a gconf schema and redesign how we want to do this. It
-	didn't work correctly for 1.2 anyway.
-
-	* filter.glade: Converted to the glade-2 format.
-
-2002-11-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-filter.c: Ported.
-
-	* filter-source.c (get_widget): Don't use e_utf8_to_gtk_string.
-
-	* filter-option.c (xml_create): Don't use e_utf8_xml1_decode.
-
-	* filter-input.c (xml_encode): Don't use e_utf8_xml1_encode.
-	(xml_decode): Don't use e_utf8_xml1_decode.
-	(entry_changed): Don't use e_utf8_gtk_entry_get_text.
-	(get_widget): Don't use e_utf8_gtk_entry_set_text.
-
-	* filter-file.c (xml_encode): Don't use e_utf8_xml1_encode shit.
-	(xml_decode): Don't use e_utf8_xml1_decode.
-	(entry_changed): Don't use e_utf8_gtk_entry_get_text.
-	(get_widget): Don't use e_utf8_gtk_entry_set_text.
-
-2002-11-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* vfolder-rule.c: Ported.
-
-	* vfolder-editor.c: Ported.
-
-	* vfolder-context.c: Ported.
-
-2002-11-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-rule.c: Ported.
-
-	* score-rule.c: Ported.
-
-	* score-editor.c: Ported. Again, thise code seems to be unused.
-
-	* score-context.c: Ported. Although it seems this code isn't
-	really used anywhere?
-
-2002-11-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-part.c: Ported.
-
-	* filter-editor.c: Also ported.
-
-	* rule-editor.c: Ported to gtk2 and removed unnecessary e_utf8 snot.
-
-2002-11-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-context.c: Ported this too.
-
-	* rule-context.c: Ported to glib2/GObject.
-
-2002-11-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-element.c: Ported to GObject.
-
-	* filter-input.c: Same.
-
-	* filter-code.c: This too.
-
-	* filter-colour.c: And this.
-
-	* filter-datespec.c: You guessed it.
-
-	* filter-file.c: And again...
-
-	* filter-folder.c: Wheee! This is fun...
-
-	* filter-int.c: Gee, I wonder...
-
-	* filter-label.c: Also ported.
-
-	* filter-option.c: Yep, this too.
-
-	* filter-source.c: And finally this one.
-
-2002-10-30  Dan Winship  <danw@ximian.com>
-
-	* rule-editor.c (rule_add): Adjust default rule editor size to
-	accomodate the menu widening caused by "Pipe Message to Shell
-	Command".
-
-2002-10-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: Removed the Run Once filter action.
-
-2002-09-30  Aaron Weber  <aaron@ximian.com>
-
-	* filter-folder.c (validate): adjust string on 149 to "You must
-	specify a folder.
-
-	* filter-datespec.c (get_best_span): adjust string on 174 from
-	"You have forgotten to choose a date" to "You must choose a date."
-
-2002-09-25  Dan Winship  <danw@ximian.com>
-
-	* filter-folder.c (get_widget): Use "mail/*" as the allowed folder
-	type.
-
-	* vfolder-rule.c (source_add): Likewise
-
-2002-09-22  Dan Winship  <danw@ximian.com>
-
-	* filter-context.c (filter_delete_uri): add empty statement after
-	label to make it ANSI.
-
-2002-09-19  Not Zed  <NotZed@Ximian.com>
-
-	* filtertypes.xml: Changed source account, use header-source
-	rather than (= (get-source) ...)
-
-2002-09-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: Add a Run Once action to run a command only
-	once rather than for each message that has that action applied.
-
-2002-08-08  Not Zed  <NotZed@Ximian.com>
-
-	* rule-editor.c (add_editor_clicked): Dont allow duplicate names.
-	(edit_editor_clicked): Same here.  For #24803.
-
-2002-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-context.c (save): Don't need to save temp/backup files
-	anymore, e_xml_save_file() now handles this for us (well, at least
-	the saving of temp files). I'm not sure we need a backup file
-	anymore now that we can depend on e_xml_save_file() to "Just Work"
-
-2002-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-context.c (save): Use e_xml_save_file().
-	(xml_doc_save): Removed this code and added it to gal so that
-	e-table and all other parts of evolution and so forth could use
-	it.
-
-2002-08-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-context.c (xml_doc_save): New internal function to replace
-	xmlSaveFile. Does proper error checking and so forth to ensure
-	that the resulting file does not ever get truncated.
-	(save): Cal xml_doc_save rather than xmlSaveFile. Fixes bug
-	#25980.
-
-2002-08-02  Not Zed  <NotZed@Ximian.com>
-
-	* filter.glade: Added a datespec editor window.
-
-	* filter-datespec.c (button_clicked): Rewritten to use glade.
-	Simplified all the code around it as a result, etc, and fixed bug
-	#21798.
-
-2002-08-01  Peter Williams  <peterw@ximian.com>
-
-	* filter-datespec.c (activate_specified): If the value was unset,
-	initialize it to now.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* filter-option.c (xml_create): Remove unused variable.
-
-2002-07-30  Peter Williams  <peterw@ximian.com>
-
-	* filter-rule.c (get_widget): Translate the rule name when filling
-	in the name entry.
-
-2002-07-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: Add xml to unset system flags.
-
-2002-07-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-int.c (xml_decode): Use fs->type in xmlGetProp since we
-	already free'd 'type'. Fixes bug #28113.
-
-	* filter-element.c: Removed the empty private struct.
-
-	* filter-int.c: Removed the empty private struct.
-
-2002-07-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-int.[c,h]: Use GtkType (I only changed this one because I
-	turned on debugging for a bit).
-
-	* filter-file.c (validate): Fix the strcmp logic a bit, I had it
-	the exact opposite of what I really wanted. Oops :-)
-
-2002-07-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-file.c (validate): Do some minimalistic validation of
-	command-lines (ie, make sure it isn't an empty string).
-
-	* filtertypes.xml: s/shell-exec/shell/ (for the action) and pass
-	"/bin/sh" "-c" as the first 2 arguments. For the shell-exec
-	*rule*, change the name to "pipe-message" and add the "/bin/sh"
-	"-c" arguments too.
-
-2002-07-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-label.c (xml_create): Use the U_() macro to get the UTF-8
-	translation.
-
-2002-07-15  Not Zed  <NotZed@Ximian.com>
-
-	* filter-score.[ch]: cvs remove.
-	
-	* filter-element.c: Remove reference to filter-score.h
-
-	* vfoldertypes.xml: Fix label vfolder rule as below, also add
-	score and size rules from filtertypes.xml.
-
-	* filtertypes.xml (score): Use (cast-int (user-tag "score")) to
-	get the value directly, rather than (get-score).
-	(label): Use (user-tag "label") to get the value directly, rather
-	than (get-label).  The label is now a string too.
-
-	* filter-label.c (filter_label_get_type): Make filter-label
-	inherit from filter-option.  Which makes more sense doesn't it
-	... surely.
-	(validate): Removed, optionlists are self-validating.
-	(xml_create): Initialise the list of options from our
-	configuration database.  If it isn't working, ignore it and set it
-	up anyway.
-	(filter_label_init): Override the xml type.
-	(filter_label_count): 
-	(filter_label_label): 
-	(filter_label_index): Some helper functions for external
-	interfaces.  All of the mail config/etc should use this.
-
-	* filter-option.c (free_option):
-	(xml_create): 
-	(clone): Made the "value" type in glib memory rather than xml
-	memory space.
-	(filter_option_add): Utility function to add a new option to the
-	list.
-	(clone): Use above function to simplify code.
-	(xml_create): Same here.
-	(xml_encode): Allow subclasses to override the type.
-
-2002-07-10  Not Zed  <NotZed@Ximian.com>
-
-	** fixes for #10781
-	
-	* filter-int.c (xml_encode): 
-	(xml_decode): Handle encoding/decoding with a type name, in a
-	manner compatible with the score/label elemtns.
-	(filter_int_new_type): New constructor to create a generic 'int'
-	type.
-
-	* filter-score.c: Removed.  Now relies on using a filter-int with
-	appropriate settings.
-
-	* filter-label.[ch]: Now inherits from filter-int.
-
-	* rule-context.c (rule_context_revert): New method to revert a
-	filter context back to a user-file's definition.
-	(revert): implementation.
-
-	* filter-rule.h: Added new virtual method _eq and wrapper, and
-	fixed all subclasses to implement it.
-
-	* filter-element.h: Added new virtual method _eq and wrapper.
-	Fixed all subclasses to implement it.
-
-2002-07-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: Make the sound type for (play-sound ) a "file"
-	type rather than "string" since users will want to use a filesel
-	to select it most likely. Fixes bug #26921.
-
-	* filter-file.c (validate): If the type is "file" check that it is
-	a valid file, otheriwse if it is a command-line just ignore it for
-	now.
-
-	* filter-element.c (filter_element_new_type_name): A filter type
-	of "file" should also use the filter-file object.
-
-2002-05-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* filter-rule.c (get_widget): Fix English grammar.
-
-2002-05-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* vfoldertypes.xml: Added a label definition.
-
-	* filtertypes.xml: Added a label definition.
-
-	* filter-label.c: New filter widget for labels.
-
-	* filter-element.c (filter_element_new_type_name): Add support for
-	the new label widget.
-
-	* filter-int.c (format_sexp): Fixed a memory leak.
-
-2002-05-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-file.c (get_widget): Set the path in the entry widget.
-
-	* Makefile.am: Add filter-file.[c,h] to the build.
-
-	* filtertypes.xml: Add a "Command" filter rule.
-
-	* filter-element.c (filter_element_new_type_name): Add support for
-	type "command" which uses the new FilterFile widget.
-
-	* filter-file.[c,h]: New filter widgets for choosing files and/or
-	command-line's (?). Not yet hooked up or anything, just for future
-	use.
-
-2002-05-08  Not Zed  <NotZed@Ximian.com>
-
-	* rule-context.c (rule_context_delete_uri): Changed to return a
-	GList *, a list of the names of the rules affected by the delete,
-	fixed all implementors.
-	(rule_context_rename_uri): Similarly for delete_uri, for
-	api consistency.
-	(rule_context_free_uri_list): Util function to free the return
-	from above.
-
-	* filter-context.c (filter_delete_uri): Actually implement it, fix
-	for #18826, and some related bugs.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Get rid of ibex stuff, we no longer use it.
-
-2002-04-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: The score "is" rule should have a value of "is"
-	and not "less-than".
-
-2002-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-rule.c (get_widget): Fixed a grammer mistake, or so
-	according to bug #23376. Whatever.
-
-2002-04-11  Russell Steinthal  <rms39@columbia.edu>
-
-	* filtertypes.xml: Fix "Follow Up" searches by generating a
-	boolean, rather than a string result (Fixes #23334)
-
-	* vfoldertypes.xml: Ditto
-
-2002-04-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (double_click): This needs to return a gboolean
-	(TRUE).
-	(rule_edit): Using gnome_dialog_set_parent instead of
-	gtk_widget_set_parent_window seems to fix bug #23226.
-
-2002-04-10  Not Zed  <NotZed@Ximian.com>
-
-	* filter-input.c (validate): Check that there is a value to
-	setup.  Fixes #15470.
-
-	* filtertypes.xml: Added closing ) for "not starts with" subject
-	rule.
-	Added closing ) for all the other broken rules too ...
-
-2002-04-04  Dan Winship  <danw@ximian.com>
-
-	* filter-folder.c: Remove the #ifndef SHELL part. Use an
-	EvolutionFolderSelectorButton. Remove FilterFolder->name since
-	it's no longer needed.
-
-	* filter-context.c (filter_rename_uri): Update for removal of
-	FilterFolder->name.
-
-	* filter-element.c (filter_element_copy_value): Likewise.
-
-	* vfolder-rule.c (source_add): Update for
-	evolution_shell_client_user_select_folder API change.
-
-2002-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (rule_edit): Set 're' as the parent window rather
-	than as the parent widget.
-	(add_editor_clicked): Only unref the editor if it is non-NULL.
-
-2002-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-source.c (filter_source_get_sources): Free account_name
-	so we don't leak. Also after getting the source uri, use camel-url
-	to hide unwanted stuff.
-	(xml_decode): Use xmlFree on the buffer returned from
-	xmlNodeGetContent rather than g_free, as I think they are
-	incompatable. Also use camel-url here to hide any params in the
-	decoded url (to make things compatable with what older versions
-	may have saved).
-
-2002-03-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: Added beep and play-sound actions.
-
-2002-02-26  Not Zed  <NotZed@Ximian.com>
-
-	* filter-filter.c (option_activate): Copy values across to new
-	part.
-
-	* filter-rule.c (option_activate): copy values across to new part,
-	if they are compatible.
-
-	* filter-element.c (filter_element_copy_value): New function to
-	copy values (where they can be) from one filter element to another.
-
-	* filter-part.c (filter_part_copy_values): New function to copy
-	values of a filter part.  #1359.
-
-2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* vfoldertypes.xml: 
-	* filtertypes.xml: Re-added contains and
-	not-contains. Also added filter/vfolder rules for
-	Flag-for-Followup.
-
-2002-02-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* vfoldertypes.xml: Same here.
-
-	* filtertypes.xml: For mlist matching, we only want "is" and "is
-	not" because that is all we really support anyway.
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Use LIBFILTER_CFLAGS.
-
-2002-01-26  Mikael Hallendal  <micke@codefactory.se>
-
-	* rule-editor.c (add_editor_clicked): check if re->edit != NULL
-	  before trying to unref it. Fixes a segfault when closing the 
-	  rule editor.
-
-2002-01-15  Not Zed  <NotZed@Ximian.com>
-
-	* filter-input.c (xml_decode): If we write "" to an xml file, we
-	read back NULL.  So if we read back NULL, convert it to "".
-	Sigh.  This makes a fix for #7801, although new gui may also be
-	required.
-
-2002-01-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-source.c (filter_source_get_sources): Get the account
-	name because that is the string we'd like to use for display.
-	(get_widget): Generate the account label the same as we do for the
-	composer's From optionmenu.
-	(filter_source_finalize): Free the account_name.
-	(clone): Pass along the account_name member to filter_add_source
-
-2002-01-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* vfoldertypes.xml: Make the date comparisons read the same as the
-	ones in filtertypes.xml
-
-2001-12-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: Add new action to execute a shell command.
-
-2001-12-09  Jon Trowbridge  <trow@ximian.com>
-
-	* vfoldertypes.xml: Add "Needs Reply" option to different status
-	types.
-
-	* filtertypes.xml: Add "Needs Reply" option to different status
-	types.
-
-2001-11-15  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* rule-editor.c (set_source): Removed U_.  Fixes #15415.
-
-2001-11-21  Not Zed  <NotZed@Ximian.com>
-
-	* rule-editor.c (rule_edit): Hook onto destroy event.
-	(edit_editor_destroyed): IF we get destroyed, fake a -1 click
-	event to clean up.
-	(rule_add): hook onto destroy of dialogue.
-	(add_editor_destroyed): Simulate -1 click event to clean up.  Fix
-	for #15745.
-
-2001-11-20  Not Zed  <NotZed@Ximian.com>
-
-	* vfolder-rule.c (source_add): Desensitise button while we're
-	running, and if we are destroyed, exit and do nothing when we're
-	done.  Fixes crash in #15498.
-
-	* filter-folder.c (button_clicked): Ref 'ff' around dialogue
-	showing incase we go away before it returns.  Also desensitise
-	button that invoked us while its being processed & remove
-	'is_active' hack.  Fixes similar problems to those in #15498.
-
-2001-11-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-rule.c (validate): Force the user to name the filter.
-
-	* vfolder-rule.c (validate): Force the user to name the vfolder.
-
-2001-10-29    <NotZed@Ximian.com>
-
-	* rule-editor.c: Some debug printf fixes for printf's that dont
-	like null %s's.
-	Fixed previous fix.
-	(rule_editor_play_undo): Need to ref rule since add doesn't.  This
-	doesn't crash anymore but doesn't seem to do everything right either.
-
-2001-10-28    <NotZed@Ximian.com>
-
-	* filter-context.c (filter_rename_uri): Implement, change any
-	folder uri's that have been renamed, to the new one.
-	(filter_delete_uri): Dont actually do any work (yet).
-
-	We could probably put rename_uri on every rule context/filter
-	part/filter element, and let their methods handle it, but for now
-	its easy enough just to handle the few cases that we have to
-	handle manually.
-
-	* rule-context.c (rule_context_delete_uri): Update a filter
-	context for a deleted uri, e.g. folder removed.
-	(rule_context_rename_uri): Update a filter context for a renamed
-	uri, e.g. 
-
-	* filter-folder.c (filter_folder_set_value): New function to set
-	the uri of a folder filter.
-
-	* rule-editor.c (rule_move): Add undo for move.
-	(rule_editor_add_undo): Add extra rank item.
-	(rule_editor_play_undo): handle rank case.
-	(rule_editor_finalise): Clean up any hanging over undo log.
-	(editor_clicked): Only enable 'undo' if we have
-	EVOLUTION_RULE_UNDO enabled.  Code still a bit flakey.
-	(rule_editor_construct): Only enable a cancel button if
-	EVOLUTION_RULE_UNDO is set.
-	(rule_editor_add_undo): Only add if undo enabled.
-	(rule_editor_add_undo): Fix enable undo logic.
-
-	* filter-rule.c (filter_rule_set_name): Emit a changed event if it
-	changes.
-	(filter_rule_set_source): Same.
-
-2001-10-26    <NotZed@Ximian.com>
-
-	* rule-context.c (rule_context_find_rank_rule): Find a rule at a
-	specific rank/source.
-
-	* rule-editor.c (add_editor_clicked): Log the added object.
-	(rule_editor_add_undo): New function to add an undo record to the
-	rule editor.
-	(edit_editor_clicked): Log the changed object.
-	(rule_delete): Add undo object.
-	(rule_editor_play_undo): Play an undo log back.
-
-2001-10-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (rule_add): Desensitize the parent dialog.
-	(rule_edit): Same.
-	(add_editor_clicked): Re-sensitize it.
-	(edit_editor_clicked): Same.
-
-2001-10-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c: Keep track of the current editor dialog window so
-	that on exit, we can close it too.
-	(rule_edit): Don't make the dialog modal and set it's parent
-	window as well as don't allow more than a single editor window to
-	be popped up.
-	(rule_add): Same.
-
-2001-10-24    <NotZed@Ximian.com>
-
-	* rule-context.c (rule_context_class_init): Add a changed signal.
-	Emits if the order changes or if you add or remove a rule.
-	(rule_context_rank_rule): Fix rank rule to properly rank based on
-	source, not merely on list position.
-	(rule_context_add_rule): Also emit changed signal.
-	(rule_context_remove_rule): Same.
-	(rule_context_rank_rule): Emit changed signal.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* rule-editor.c (set_source): Translate the rule names. (Bug
-	#13082)
-
-2001-10-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* filter-folder.c (button_clicked): Pass the toplevel to
-	`evolution_shell_client_user_select_folder()'.
-	* vfolder-rule.c (source_add): Likewise.
-
-2001-10-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-folder.c (button_clicked): Kludge to raise the filter
-	dialog when the folder-selection window is closed.
-
-2001-10-15    <NotZed@Ximian.com>
-
-	* filter-input.c (xml_decode): If we have no node content, dont
-	append any value or try to decode it.  Gets rid of a bunch of
-	annoying warnings.
-
-2001-10-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* vfolder-rule.c (validate): And again here.
-
-	* filter-folder.c (validate): Same.
-
-	* filter-datespec.c (validate): Take out the "Oops" part of the
-	warning.
-
-2001-10-04    <NotZed@Ximian.com>
-
-	* rule-context.c (save): "safe" save code, first save to .#name,
-	then rename to name if it worked, also create backups to name~.
-	Means filters/etc wont get reset/lost if disk fills up, although
-	relies on libxml failing properly.
-	(new_rule_clicked): Removed warning, we do now have changed
-	signals!
-
-2001-09-28    <NotZed@Ximian.com>
-
-	* vfolder-rule.c (vfolder_rule_add_source): Emit changed events
-	when we change it.
-	(vfolder_rule_remove_source): "
-
-2001-09-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (edit_editor_clicked): Set the item label to the
-	new rule name, not the old rule name. Fixes bug #11168.
-
-2001-09-27    <NotZed@Ximian.com>
-
-	* vfolder-rule.c (xml_decode): Use g_strdup for the uri, not the
-	xml memory.
-
-	* filter-driver.c, filter-message-search.c: Removed, again, how
-	did they come back???
-
-2001-09-13    <NotZed@Ximian.com>
-
-	* filter-filter.c (filter_filter_add_action):
-	(filter_filter_remove_action):
-	(filter_filter_replace_action): Emit changed events.
-
-	* filter-rule.c (filter_rule_xml_decode): Emiot a rule changed
-	event.
-	(filter_rule_copy): Emit a changed event.
-	(filter_rule_replace_part): "
-	(filter_rule_add_part): "
-	(filter_rule_remove_part): "
-	(filter_rule_xml_decode): Freeze around decoding, so we only emit
-	changed when done.
-	(filter_rule_emit_changed): New function to emit changed events if
-	not frozen.
-
-2001-09-13    <NotZed@Ximian.com>
-
-	* rule-context.c (rule_context_class_init): Added a 'rule_added'
-	and 'rule_removed' signal.
-	(rule_context_load): Set a (private) frozen flag while we're
-	loading.
-	(rule_context_add_rule): Emit a rule_added signal if we're not
-	frozen.
-	(rule_context_remove_rule): Emit a rule_removed signal if we're
-	not frozen.
-
-2001-09-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (rule_edit): Clone the current rule before editing
-	it so that changes can be undone.
-	(edit_editor_clicked): If the user hit OK, replace the original
-	rule with the new one.
-
-	* vfolder-rule.c (vfolder_rule_finalise): Free the sources list.
-	(rule_copy): Implemented.
-
-	* filter-filter.c (rule_copy): Implemented.
-
-	* filter-rule.c (filter_rule_copy): New convenience function to
-	copy one rule "into" another.
-	(rule_copy): Default implementation.
-	(filter_rule_clone): Use filter_rule_copy() internally to get rid
-	of the nastiness/slowness of xml encoding and then decoding.
-
-2001-09-12    <NotZed@Ximian.com>
-
-	* vfoldertypes.xml: Remove the match-all from the not
-	body-contains, so we can use the new vector not function.
-
-2001-09-10    <NotZed@Ximian.com>
-
-	* filter-score.c (format_sexp): Encode the score as an integer
-	string, not as a string of integers.  #5098.
-
-2001-09-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-datespec.c (button_clicked): Allow the dialog's title to
-	be translated.
-
-2001-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* filter-input.c: #include <sys/types.h> for regex_t on freebsd.
-
-2001-08-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter.glade: Added key accelerators.
-
-2001-08-14  Peter Williams  <peterw@ximian.com>
-
-	* filter-rule.c (xml_decode): Match either "title" or "_title" to
-	allow for translations of the title (provided in the default
-	files)
-
-2001-08-13  Peter Williams  <peterw@ximian.com>
-
-	* filter-datespec.c (make_span_editor): Add a gettext around our static
-	strings.
-	(format_time): New function. Convert a time_t to a gchar * (with i18n)
-	(describe_button): Use format_time instead of ctime.
-
-2001-08-10  Peter Williams  <peterw@ximian.com>
-
-	* rule-context.c (rule_context_add_rule_gui): Make this compile again.
-
-2001-08-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-context.c (rule_context_add_rule_gui): No need to
-	gtk_widget_show() the gnome dialog widget twice...
-
-	* vfolder-rule.c (get_widget): Unref the glade_xml gui object
-	before returning.
-
-2001-08-08  Radek Doulik  <rodo@ximian.com>
-
-	* filter-folder.c (button_clicked): don't mix g_free and xmlAlloc
-	(xml_decode): don't mix g_free and xmlAlloc
-
-	* filter-code.c (filter_code_init): use xmlStrdup instead of
-	g_strdup
-
-	* filter-input.c (filter_input_new_type_name): use xmlStrdup
-	instead of g_strdup
-	(filter_input_finalise): don't mix g_free and xmlAlloc
-
-	* filter-option.c (clone): use xmlStrdup instead of g_strdup
-	(free_option): don't mix g_free and xmlAlloc
-
-	* filter-source.c (clone): use xmlStrdup rather than g_strdup
-
-	* filter-element.c (filter_element_finalise): don't mix g_free and
-	xmlAlloc
-
-2001-08-07  Not Zed  <NotZed@Ximian.com>
-
-	* filter-rule.c (filter_rule_finalise): Properly free the list of
-	parts, and the private data.
-	(FilterRulePrivate): Remove unused 'parts' member.
-
-	* filter-option.c (free_option): For freeing options.
-	(filter_option_finalise): Free options list.
-
-	* filter-element.c (filter_element_finalise): free name.
-
-	* filter-input.c (filter_input_finalise): Free type and values
-	list.
-
-	* filter-context.c (filter_context_finalise): Free the actions.
-
-	* rule-context.c (rule_context_finalise): Remove the totally weird
-	arsed *_set_list free code.
-	(free_part_set): 
-	(free_rule_set): Use this to free stuff using g_list_foreach.
-	(rule_context_finalise): Free the error string.
-	(rule_context_finalise): Free the rules and parts.
-
-2001-08-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: Reverted my previous change, I fixed the filter
-	code to handle this the way danw said to handle it in bug #5886
-	now.
-
-2001-08-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: Removed the "is" and "is not" rules from the
-	xml file for address matching because users are easily confused.
-
-2001-08-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-rule.c (get_widget): Do an evil kludgy hack so that the
-	Rule Name entry widget gets focused when the filter editor is
-	shown.
-
-2001-08-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-rule.c: Wrap some debug printf's with d().
-
-	* rule-context.h: Removed prototype for rule_context_delete_rule()
-	since the function doesn't exist.
-
-2001-07-23  Jon Trowbridge  <trow@ximian.com>
-
-	* vfolder-rule.c (validate): Added a validate function
-	that checks to make sure that vfolders that have "specific
-	folders" as their source actually have a non-empty list of
-	source folders selected.  (Bug #4937)
-	(get_widget): If fr->source is NULL for some reason, bring
-	it into sync with the default in the option menu.
-
-2001-07-23  Peter Williams  <peterw@ximian.com>
-
-	* filter-datespec.c (make_span_editor): Change the butt-ugly
-	UI to a saner (and just as flexible) one. Instead of all those
-	spinbuttons, just have one and let the user select the time unit.
-	(omenu_item_activated): New function. When the user changes the
-	time unit, convert it from the old number. Pretty.
-	(adj_value_changed): This function is now simpler.
-	(set_adjustments): Also modified for new UI model.
-	(button_clicked): Set the selected_type before calling the callback.
-	(FilterDatespecPrivate): Members change a bit.
-	(filter_datespec_init): No longer need to allocation spinbuttons
-	(filter_datespec_finalise): No longer need to free spinbuttons.
-
-2001-07-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: Removed the "Forward To" filter action.
-
-2001-07-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-context.c (rule_context_get_rank_rule): Return -1 if we
-	don't find it? This is what most of the code expected but not what
-	we were returning on fail.
-
-2001-07-12  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* filter-datespec.c (stringify_agoness): Marked string for translation.
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: Users should not be able to filter on "Status
-	is Deleted" since we don't allow that in the filter driver code.
-
-2001-07-11  Jason Leach  <jleach@ximian.com>
-
-	* vfoldertypes.xml: Copied the "Attachments" rule part over from
-	filtertypes.xml, would be a powerful feature for vfolders (see all
-	the patches across all folders, or all the attachments you've sent,
-	without having to duplicate potentially big files, blah blah, bug
-	#1155).
-
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* vfoldertypes.xml: Put a match-all around the not-body-contains
-	to make it work per-message.
-
-	* filtertypes.xml: Same.
-
-2001-07-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-rule.c (get_widget): Set the focus on the title of the
-	filter rule.
-
-2001-07-09  Anna Marie Dirks  <anna@ximian.com>
-
-	* rule-context.c (rule_context_add_rule_gui): Increased the size
-	of the "Add Filter Rule" dialog to 600 x 400, so that no resizing
-	is necessary to use the dialog.
-
-2001-07-09  Jon Trowbridge  <trow@ximian.com>
-
-	* filter-source.c (filter_source_get_sources): Bonobo-conf-ified.
-	Removed /home/trow hard-wiring. :)
-	(xml_encode): Encode things properly.
-	(xml_decode): Decode things properly.
-	(get_widget): Ignore accounts w/o source URLs.
-	(clone): Set the ->name in our copy.
-
-2001-07-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (rule_delete): Select the most appropriate filter
-	rule.
-
-	* filtertypes.xml: Fix bug #4043: s/colour/color
-
-2001-07-03  Peter Williams  <peterw@ximian.com>
-
-	* filter-source.c (get_widget): Prevent crashing while we work
-	this out.
-
-	* filter-rule.c (get_widget): Don't try to gtk_widget_grab_default
-	with a widget that can't be the default. Altough it should be able
-	to....
-
-2001-07-02  Sam Creasey <sammy@oh.verio.com>
-
-	* filter-int.c: Added an integer type for filtering values.  used
-	for size.
-
-	* Makefile.am (SOURCES): added filter-int.c, filter-int.h
-
-	* filtertypes.xml: added a part entry for size based filters
-	
-2001-07-02  Anna Marie Dirks <anna@ximian.com> 
-
-	* filter-rule.c (get_widget): Changed "Add criterion" button to
-	have normal button relief in response to complaints of it not
-	appearing clickable.
-
-	* filter-filter.c: Changed "Add action" button to have normal
-	button relief in response to complaints of it not appearing
-	clickable.
-
-2001-06-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (rule_editor_construct): Set the filter-rule
-	dialog to be user-resizable.
-
-2001-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: Make "Move" the default action.
-
-2001-05-08  Not Zed  <NotZed@Ximian.com>
-
-	* filter-rule.c: Deleted Gediminas patch.
-
-2001-05-08  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* filter-rule.c (xml_decode): allow "_title" in user
-	rules. translate them and encode to utf8.
-	(get_rule_part_widget): do not call gettext on part->title. It is
-	always translated already.
-
-2001-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (rule_edit): Set the default size of the dialog to
-	600x400, which seems to be a nice size that fits all the widgets
-	into it.
-	(rule_add): Same.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): Remove UNICODE_CFLAGS
-
-2001-04-26  Not Zed  <NotZed@Ximian.com>
-
-	* filter-part.c (filter_part_xml_create): Blah blah fix for xml1
-	broken utf8 encoding, and use "g" memory for all allocations.
-	(filter_part_finalise): Free our data properly.
-
-2001-04-20  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* filter-rule.c: Pull up fix for translation of filter
-	direction drop down menu from the branch.
-	
-2001-04-18  Dan Winship  <danw@ximian.com>
-
-	* filter-colour.c, filter-datespec.c, filter-folder.c,
-	filter-input.c, filter-option.c, filter-rule.c, filter-score.c,
-	filter-source.c, score-rule.c (xml_decode): Plug memory leaks.
-
-	* rule-context.c (rule_context_finalise): Implement. Free stuff.
-
-	* filter-element.h: #include <gnome-xml/xmlmemory.h> here for xmlFree
-
-	* filter-filter.c, filter-part.c: Remove xmlmemory.h #include
-
-2001-04-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: s/Is/is/ and s/Is Not/is not/ to be more
-	consistant with the rest.
-
-2001-04-13  Jon Trowbridge  <trow@gnu.org>
-
-	* filtertypes.xml: Add XML specs for source account filtering.
-
-	* filter-element.c (filter_element_new_type_name): Recognize
-	type "source", construct a FilterSource.
-
-	* filter-source.c: Added.  A FilterElement for the account e-mail
-	comes from.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* filter-editor.c: Fix headers.
-	* filter-filter.c: Same here.
-	* filter-option.c: Same here.
-	* filter-part.c: Same here.
-	* filter-rule.c: Same here.
-	* rule-editor.c: Same here.
-	* score-editor.c: Same here.
-	* vfolder-editor.c: Same here.
-	* vfolder-rule.c: Same here.
-	
-2001-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-filter.c (option_activate): Set the newpart on the
-	container object.
-	(less_parts): Remove the rule tht the user wants to remove.
-	(attach_rule): Attach a new rule and it's remove button to the end
-	of the table.
-	(more_parts): Fix to resize the table and such.
-	(get_widget): Don't have a remove action button, we are putting
-	this next to the rule part now.
-	
-2001-03-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* *.*: Fix headers. Remove unneccesary ones and replace
-	with more finegrained ones where needed.
-	
-2001-03-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-datespec.c (validate): Oops, an unspecified date is '0',
-	not -1.
-
-2001-03-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-context.c (new_rule_clicked): Validate the rule before
-	closing.
-
-2001-03-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* rule-editor.c (rule_edit): Set the editor dialog modal rather
-	than setting the filter dialog insensitive. Also ref re->edit
-	since we unref it when the editor closes. This should fix bug
-	#1905.
-	(edit_editor_clicked): No need to set the filter dialog sensitive
-	again.
-	(rule_add): Set the add-rule dialog modal and don't set the filter
-	dialog insensitive.
-	(add_editor_clicked): No need to set the filter dialog sensitive
-	again.
-
-2001-03-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-option.c (build_code): Since we are now using
-	filter-option widgets in place of system-flag, we do not need a
-	"code" part so if there isn't a code part, don't build it.
-	(clone): Updated to allow NULL code parts.
-
-2001-03-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-element.c (filter_element_new_type_name): If the filter
-	type is a "system-flag", use the optionlist type as type
-	system-flag has been removed. This should allow backward
-	compatability.
-
-	* filter-editor.c (filter_editor_construct): Remove the menu that
-	is in the glade file because we want to replace it with our menu,
-	not append items to that menu.
-
-	* filtertypes.xml: Oops, missed the system-flag action-set.
-
-	* vfoldertypes.xml: Update "status" ruleset.
-
-2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Removed filter-url.[c,h] and
-	filter-system-flag.[c,h]
-
-	* filter-element.c (filter_element_new_type_name): Removed
-	references to the url-type and system-flag types.
-
-	* filtertypes.xml: Removed "source" type and fixed "status" to use
-	the optionmenu.
-
-	* filter-url.[c,h]: Removed.
-
-	* filter-system-flag.[c,h]: Removed (just use optionmenu).
-
-2001-03-15  Not Zed  <NotZed@Ximian.com>
-
-	* filter.glade: Changed the edit_filter to be a standalone window
-	rather than a widget, so we can get the rule editor part out
-	separately.  Same for vfolder editor, and new score, and basic rule
-	editors.
-
-	* score-editor.c (score_editor_new): Turned back on object
-	stuff, subclass rule-editor, and removed most of the code.
-
-	* filter-editor.c (filter_editor_new): Turned into an object,
-	subclass rule-editor, removed most of the code.  Now we accept the
-	source list during create, and plug that into the glade.
-
-	* vfolder-editor.c (vfolder_editor_new): Turned back on object
-	stuff, subclass rule-editor, and removed most of the code.
-
-	* Makefile.am (libfilter_la_SOURCES): Added rule-editor.[ch].
-
-	* filter-filter.c (validate): inherit the validate function and
-	also validate the actions part of a filterfilter.
-
-	* filter-rule.c (filter_rule_validate): New method so that filter
-	rules can validate themselves.
-	(validate): Default implementation, validates base rules.
-
-	* rule-editor.h: New generic rule editor, to be used for filter
-	editor/vfolder editor/score editor/saved searches editor.
-
-2001-03-15  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* filter-system-flag.c: translate status flag title.
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: Added an "Attachments" filter option where you
-	can filter messages that have (or do not have) attachments. This
-	does not allow you to filter based on the types of the
-	attachments.
-
-2001-03-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* vfolder-editor.c (double_click): Make sure we have something
-	selected first ;-)
-	
-	* filter-editor.c (double_click): And here too.
-
-2001-03-03  Not Zed  <NotZed@Ximian.com>
-
-	* filter.glade: Added option menu to vfolder editor.
-
-2001-03-02  Not Zed  <NotZed@Ximian.com>
-
-	* vfolder-rule.c (get_widget): Setup the data on the base source
-	opiton menu, and make hte option menu reflect the source.
-	(select_source_with): Set the source type for this
-	rule. e.g. these folders, "with ..."
-
-	* filter-editor.c: Removed the N_() stuff from the source_names
-	array, they must not be internationalised!!!
-
-2001-02-28  Not Zed  <NotZed@Ximian.com>
-
-	* filter-rule.c (filter_rule_clone): New function to clone rules.
-
-2001-02-23  Not Zed  <NotZed@Ximian.com>
-
-	* filtertypes.xml: Added mailing list matching rules.
-	renamed mailing list options to be more meaningful.
-
-	* vfoldertypes.xml: Added mailing list rules.
-	renamed mailing list options to be more meaningful.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* filter.glade.h: removed.
-	* filter.glade: do not donnt output to above one.
-	* Makefile.am: do not include filter.glade.h in EXTRA_DIST.
-
-2001-02-06  Dan Winship  <danw@ximian.com>
-
-	* filter-option.c (get_widget): Translate the option title.
-	(Noticed by Kjartan).
-
-2001-02-05  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* filter-code.c, filter-colour.c, filter-context.c,
-	filter-element.c, filter-input.c, filter-score.c,
-	filter-system-flag.c, filter-url.c: Add #include <config.h>
-	and mark some strings for translation.
-	
-2001-01-22  Not Zed  <NotZed@Ximian.com>
-
-	* filter-message-search.[ch]: Removed, now lives in
-	camel-filter-search.*
-
-	* Makefile.am (libfilter_la_SOURCES): Removed filter-driver.[ch]
-	and filter-message-search.[ch].
-
-	* filter-driver.[ch]: Removed.  now lives in camel-filter-driver.*
-
-2001-01-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-driver.c (filter_driver_filter_message): Set the delete
-	bit *before* copying to the default folder.
-
-2001-01-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-filter.c (less_parts): Er, don't set the button
-	insensitive if there is *1* action, set it insensitive if there
-	are less than or equal to *1* actions. Doh!
-	(more_parts): Only set the remove button sensitive if there is
-	more than 1 action.
-	(get_widget): Here too.
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* e-search-bar.[ch]: Moved ESearchBar to $(toplevel)/widgets/misc,
-	a more appropriate home.  Bug #1060.
-
-2001-01-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-driver.c (do_copy): Moved p->copied to the inner part of
-	the loop so that in the case of a folder not existing, it doesn't
-	think that the message was already copied to some place and thus
-	not save it to the Inbox.
-	(do_move): Same.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Changed Priority to Score.
-
-	* filter-option.c (get_widget): Attach to the "activate" signal -
-	this should now make it so that a filter-option will "remember"
-	what a user changed.
-
-	* filter-system-flag.c (get_widget): Don't reset fsf->value to the
-	first system flag, this should already be defaulted to the
-	appropriate flag. This should fix the problem of always defaulting
-	to the first menu option and thus "forgetting" the user's settings.
-
-2001-01-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-system-flag.c: comment out some of the system flags as we
-	don't want to use them.
-	(xml_encode): Update the printf
-	(get_widget): Use strcmp instead of g_strcasecmp.
-
-2001-01-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* filter-input.c (xml_encode): Encode utf8
-	(xml_decode): Decode utf8
-
-	* filter-option.c (xml_create): Decode utf8
-
-	* filter-part.c (filter_part_xml_create): Decode utf8
-
-	* filter_rule.c (xml_encode): Encode utf8
-	(xml_decode): Decode utf8
-	
-2001-01-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (do_flag): Set the 'dirty' flag - this should
-	fix the problem of flags not being set (or, more precisely,
-	synced).
-	(filter_driver_filter_message): Here too.
-
-2000-12-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-message-search.c (header_contains): Use
-	e_utf8_strstrcase() instead of just strstr().
-	(header_starts_with): Make sure that the header contents are
-	longer than the starts-with string.
-
-	* vfoldertypes.xml: Don't send \"Subject\" to body-contains.
-	Also added matches, starts-with, and ends-with xml stuff.
-
-2000-12-28  Dan Winship  <danw@helixcode.com>
-
-	* filter-message-search.c (handle_multipart, body_contains,
-	body_regex): Use CamelContentType rather than GMimeContentField.
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* Merge from camel-mt-branch.
-
-2000-12-21  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-message-search.c (filter_message_search): And here too.
-
-	* filter-driver.c (filter_driver_finalise): Kind of revert an
-	accidentally commited patch for e_sexp_unref.
-
-2000-12-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): Oops, slight
-	logic error. We want to copy the message to the default folder if
-	the message hasn't been Moved (which is the same as Copied &&
-	Deleted). This fixes bug #1007.
-
-	* filter-rule.c (more_parts): Make sure we have more than 1 part
-	before we sensitize the "remove" button.
-
-2000-12-20  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-message-search.c (filter_message_search): Oops, missed a
-	gtk unref of the now-no-longer gtk e_sexp.
-
-	* filter-driver.c: Remove mail_tool_lock stuff.
-	(filter_driver_finalise): unref e_sexp properly.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-search-bar.c (esb_pack_menubar): Fixed some warnings.
-
-2000-12-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-folder.c (button_clicked): Added a kludge, 'is_active'
-	which is a static variable that holds whether or not there is an
-	active shell folder dialog up or not.
-
-	* vfolder-editor.c (rule_delete): Autoselect the rule that ends up
-	in the same position (or the one above it if the list is shorter
-	than the position).
-
-2000-12-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-rule.c (get_widget): Don't highlight the title if it's
-	"Untitled" because switching widget focus doesn't cause this
-	selection to go away.
-
-2000-12-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* filter-editor.c: Mark some strings for translation.
-	
-2000-12-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-element.c (filter_element_new_type_name): Added support
-	for the system-flag type.
-
-	* Makefile.am: Added filter-system-flag.[c,h].
-
-	* filter-system-flag.[c,h]: New type for system flags.
-
-	* filtertypes.xml: Oops, looks like we were still using integers
-	as arguments to set-flag. Change over to using strings which are
-	safer and also change the name to set-system-flag.
-
-	* filter-driver.c (do_flag): Use strings instead of integers.
-	Instead of set-flag, the callback is now set-system-flag for less
-	confusion. Sorry Ettore, but you'll have to change your filters.
-
-	* filtertypes.xml: Added system-flags stuff.
-
-	* vfoldertypes.xml: And here too.
-
-	* filter-message-search.c (system_flag): New ESExp callback for
-	filtering on system flags.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): Use
-	camel_message_info_free() instead of freeing everything by hand -
-	is this a new function? I don't ever recall seeing this
-	before. Also use my new function,
-	camel_message_info_new_from_header - ahhh... this code is now so
-	beatiful. Okay, I'm done.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): Update to use
-	EStrv in appropriate places (wrapped with #ifdef DOESTRV for the
-	moment).
-
-2000-11-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Moved the regex filter rule around - we've
-	changed the format a bit.
-
-	* filter-option.c (option_activate): Removed.
-	(get_widget): Don't connect the activate signal.
-
-	* filter-folder.c (validate): Updated.
-
-	* filter-datespec.c (validate): Updated.
-
-	* filter-part.c (filter_part_validate): Updated.
-
-	* filter-input.c (validate): Check the filter-input type - if it's
-	of type "regex", then check for regex validity.
-
-	* filter-element.c (filter_element_validate): No longer takes a
-	gpointer argument.
-	(filter_element_new_type_name): Allow type "regex" and create a
-	new filter-input with type "regex".
-
-2000-11-24  Michael Meeks  <michael@helixcode.com>
-
-	* filter-message-search.c (get_full_header): impl.
-	(header_full_regex): use it.
-
-2000-11-23  Michael Meeks  <michael@helixcode.com>
-
-	* filter-message-search.c (header_full_regex): impl.
-
-2000-11-21  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* filter-message-search.c: took out some no longer needed
-	printfs.
-
-2000-11-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_folder): Sync here
-	instead.
-	(filter_driver_filter_mbox): And here too.
-	(filter_driver_finalise): Don't sync here afterall - it's more
-	preferable to sync right after processing.
-
-2000-11-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_finalise): Sync the
-	defaultfolder.
-	(filter_driver_filter_folder): Sync here instead.
-	(filter_driver_filter_mbox): And here too.
-
-2000-11-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-message-search.c (header_matches): Neglect any leading
-	whitespace in the header contents.
-	(header_starts_with): Same.
-	(header_ends_with): Same.
-	(header_soundex): Same.
-
-2000-11-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): If there is a
-	default folder and the message hasn't been deleted then... should
-	be: If there is a default folder and the message hasn't been
-	copied to another folder and the message hasn't been deleted...
-	(filter_driver_filter_message): Make it so that the FILTER_LOG_END
-	is only called if filtered were applied to the message so we don't
-	get huge gaps of whitespace in the log file.
-	(filter_driver_filter_message): 
-
-2000-11-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-search-bar.c: Made the underline show up properly in the main
-	menu bar.
-
-2000-11-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-search-bar.c: Switched from using gtk_menu_item_new_with_label
-	for the menu header to using gnome_stock_menu_item.
-
-2000-11-08  Anna Marie Dirks  <anna@helixcode.com>
-	* e-search-bar.c: Fixed two spacing problems: first, changed
-	the spacing around the end of the text-entry widget so that 
-	the text entry is always aligned with the beginning of the scrollbar;
-	second, trimmed down the space between the widgets in the search bar.
-
-
-2000-11-06  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (do_flag): you shouldn't use an integer to
-	set the flag.  You should use a string, and look it up, because
-	the flag bits might change.
-	(filter_driver_filter_message): Can som e one PLEASE STOP
-	INDENTING THE CODE.  Even if i have to come over the and
-	beat it into you.  YOU DONT INDENT CODE ONCE ITS BEEN CHECKED IN
-	TO CVS, otherwise you SCREW UP THE DIFF's.  Can't you please
-	please learn this?
-	(filter_driver_log): Fixes for api changes to mime_message.
-
-2000-11-05  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-message-search.c (get_sent_date): Fix for date change
-	api.  No longer need to encode/decode the date, after its been
-	encoded/ecoded already.
-	(get_received_date): Likewise.
-
-2000-11-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-search-bar.h: Fixed the argument comment.  Removed an old enum
-	that's not used here.
-
-2000-11-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-search-bar.c and e-search-bar.h.
-
-	* e-search-bar.c, e-search-bar.h: Moved this from
-	e-addressbook-search.
-
-2000-11-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_log): Fix for when 'desc' is
-	NULL.
-	(filter_driver_filter_message): Use a more user-friendly filter
-	name in the log file.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): Use
-	filter_driver_log() where appropriate.
-	(do_copy): Use the service url for the path rather than the
-	folder->full_name because that'll only get you a "/mbox" which is
-	entirely useless. Replace occurences of report_status with
-	filter_driver_log.
-	(do_move): Same.
-	(report_status): Don't use this for logging anymore, use only for
-	reporting the status back to the caller.
-	(filter_driver_log): Renamed from filter_driver_status_log. Now
-	ONLY handles file logging and is for INTERNAL USE ONLY.
-	(do_flag): Replace occurences of report_status with
-	filter_driver_log.
-	(do_score): Same.
-	(do_colour): Same.
-	(do_stop): Same.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-datespec.c (validate): Check to make sure the user has
-	entered a valid date.
-
-2000-10-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Updated to allow the user to select "sounds
-	like" or "does not sound like" (uses header-soundex).
-
-	* filter-message-search.c (header_matches): Oops. Should be using
-	!g_strncasecmp. This should fix it so this filter match works
-	right.
-	(header_starts_with): Same.
-	(header_ends_with): Same.
-	(header_soundex): New filter callback for soundex matching (yes,
-	it's probably a bloated feature but hey, it was fun to code)
-
-2000-10-31  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* filter-folder.c (validate): Override the default validate
-	function to only return TRUE if a folder has been selected.
-
-	* filter-editor.c (rule_add): Validate that all the rule parts and
-	action parts are correctly filled in.
-	(rule_edit): Same.
-
-2000-10-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Updated to add an action to set message flags.
-
-	* filter-driver.c (do_flag): New callback to set message info
-	flags.
-
-	* filter-element.c (filter_element_set_data): New convenience
-	function to set the data on a FilterElement.
-
-	* filter-url.c (get_widget): Set the sources list to point to the
-	FilterElement data.
-
-2000-10-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* filter-rule.c (get_widget): Do not pad around the Name hbox;
-	its parent already has spacing.  
-	Do not pad around the inframe's children; the inframe already has
-	spacing.
-
-2000-10-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-option.c (option_activate): If a regex option is
-	selected, change the FilterElement data to TRUE else set to FALSE.
-
-	* filter-rule.c (more_parts): Validate the previously entered
-	FilterPart before allowing the user to add a new FilterPart.
-
-	* filter-part.c (filter_part_validate): New convenience function
-	to validate an entire FilterPart expression.
-
-	* filter-input.c (validate): Validate the entry text if it
-	contains a regular expression.
-
-	* filter-element.[c,h]: New virtual function to validate the
-	contents of the FilterElement (useful for regex and sexp).
-	(filter_element_validate): You get the idea...	
-
-2000-10-30  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* filter-input.c: 
-	* filter-option.c: 
-	* filter-part.c: Pure formatting changes, no actual code
-	changes. Since I know I'm going to get flamed for this, I'm sorry
-	but I'll probably have to modify code in these files and it's
-	easier if the code is quickly readable by me.
-
-	* filter-rule.c (get_widget): Set the "remove" button insensitive
-	for <= 1 instead of == 1.
-
-2000-10-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): Copy the message
-	to the default folder if it wasn't marked as deleted.
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Added header-starts-with, header-ends-with, and
-	header-exists menu items.
-
-	* filter-message-search.c (header_starts_with): New callback to
-	match the beginnings of headers.
-	(header_ends_with): New callback to match the ends of headers.
-	(header_exists): New callback to determine if a header exists
-	which is useful when filtering out all those pesky bug-buddy
-	emails!
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Add header-matches expressions ("is" / "is not").
-
-	* filter-message-search.c (header_matches): New callback to match
-	headers exactly (aka strcmp rather than strstr).
-
-2000-10-27  Jacob "Ulysses" Berkman  <jacob@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_mbox): divide before
-	multiple so that we don't overflow.
-
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Fixed this to include EXTRA_GNOME_CFLAGS.
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (do_move): Don't mark as deleted here, otherwise
-	the message will have the DELETED flag set in the folder it's
-	being moved to.
-	(do_delete): Don't set the DELETED flag here either...we'll only
-	set it at the very end of the filtering process.
-	(filter_driver_filter_message): Set the DELETED flag after all
-	processing is completed.
-
-2000-10-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Readded Source url stuff.
-
-	* filter-element.c (filter_element_new_type_name): Added url stuff
-	back in.
-
-	* filter-url.[c,h]: Back from the dead...
-
-	* Makefile.am: Re-added filter-url.[c,h].
-
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Added option menu items to allow searching
-	based on regular expressions.
-
-	* filter-message-search.c (body_regex): New callback to match text
-	in the body using regex.
-	(body_contains): Modified to only match using strstr.
-	(header_regex): New callback to match headers using regex.
-	(header_contains): Modified to only match using strstr.
-
-2000-10-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Take out the reference to "Source".
-
-	* filter-element.c (filter_element_new_type_name): Remove
-	filter-url code.
-
-	* filter-url.[c,h]: What was I smoking? There's no good reason to
-	filter on source urls as there are other ways to get the same
-	effect. Thanks to both Zucchi and Miguel for helping me see this
-	:-)
-
-2000-10-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c: Fixed NULL in fprintf.
-
-2000-10-24  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (libfilter-i18n.h): Build a fake header file with
-	the titles from the xml files, for translation purposes.
-
-	* filter-rule.c (get_rule_part_widget): Call _() on the rule's
-	title.
-
-	* filter-option.c (get_widget): Call _() on the option's title.
-
-	* filter.glade: Turn on translatable strings.
-
-	* libfilter-i18n.h, filter.glade.h: Translatable string files.
-
-	* add #include <config.h> to a bunch of C files so that _()
-	actually does anything. Undo some UTF8 frobs since we're now
-	dealing in localized strings.
-
-2000-10-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-filter.c (less_parts): Set the remove button insensitive
-	if there is only 1 action left.
-	(more_parts): Set the remove button sensitive (since we now have 2
-	or more actions).
-	(get_widget): If there is only 1 action, disable the remove
-	button.
-
-	* filter-rule.c (xml_encode): If there is a defined source, don't
-	set it to "incoming", set it to whatever the source is!
-	(less_parts): Set the remove button insensitive if there is only 1
-	criterion left.
-	(more_parts): Set the remove button sensitive (since we now have 2
-	or more criterion).
-	(get_widget): If there is no name for the filter then set it to
-	"Untitled", highlight it, and grab the focus. If there is only 1
-	criterion, disable the remove button.
-
-	* filter-editor.c, vfolder-editor.c: GUI fixes here and there as
-	well as some consistancy fixes between them.
-
-	* filter-driver.c (filter_driver_filter_mbox): Updated to send the
-	source url to filter_driver_filter_message()
-	(filter_driver_filter_folder): Updated to send the source url of
-	the folder to filter_driver_filter_message()
-	(filter_driver_filter_message): Now takes a source_url argument
-	that represents the url of the folder the message is coming from
-	(so that we may filter based upon that information).
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter.glade: Fixed these widgets to resize properly.
-
-2000-10-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-editor.c: Remove the "demand" source from the list.
-
-	* filter.glade: Remove the "On Demand" option and replace it with
-	an "Outgoing" option.
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-editor.c, filter-filter.c, filter-folder.c,
-	filter-part.c, filter-rule.c, rule-context.c, score-editor.c,
-	vfolder-editor.c: Fixed these widgets to resize properly.
-
-2000-10-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: Added filter-url.[c,h].
-
-	* filter-message-search.c (get_source): New callback to get the
-	source url of the message being filtered.
-	(filter_message_search): Now takes a source argument.
-
-	* filter-element.c (filter_element_new_type_name): Added code to
-	handle URL types.
-
-	* filter-url.[c,h]: New filter object to handle URLs (ie in the
-	case of filtering on source url). FIXME: find a way to populate
-	the source combo box (including mail-config.h breaks the build in
-	the addressbook - how does including mail-tools.h not break the
-	build???)
-
-	* filtertypes.xml: Added the source filter type and added the
-	move-to action.
-
-	* filter-driver.c (do_move): New callback, a "Copy" action should
-	just copy the message to another location while a Move should both
-	copy the message to a new location and delete it from the source
-	location.
-	(do_delete): Set the deleted flag on the message info.
-	(filter_driver_filter_message): Now returns void as we don't care
-	if it was copied or not in the caller functions. Also check the
-	CamelMessageInfo being passed in - if the message has been marked
-	as deleted prior to being filtered, then return immediately as we
-	don't want to apply filter actions to deleted messages.
-
-2000-10-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_folder): Start fetching at
-	1, not 0.
-
-2000-10-11  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (filter_driver_filter_mbox): Report the
-	percentage of file complete for the filter.
-
-2000-10-10  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (filter_driver_run): Why on earth does this code
-	ref all these objects for?  This is not right at all.
-	(filter_driver_run): Changed source type to a string.
-	(filter_driver_run): REmove the very weird exception copying
-	stuff - just ref it instead.
-	(do_score): 
-	(do_colour): 
-	(do_stop): 
-	(do_copy): 
-	(mark_forward): 
-	(do_delete): Removed bogus 'terminated' testing.  This is NOT
-	NEEDED HERE.  It is tested after every rule/action, and
-	termination only makes sense at that point.
-	(filter_driver_filter_message): new funciton (renamed), filter
-	only a message.
-	(filter_driver_filter_mbox): Filter a whole mbox.
-	(filter_driver_run): If we aren't given an info, create a simple
-	one based on the message headers.
-	(filter_driver_filter_message): Renamed from filter_driver_run().
-	(filter_driver_set_status_func): Set the status callback function.
-	(filter_driver_set_default_folder): Set the default folder for
-	filtering.
-	(report_status): Internal function to report the status of a given
-	event.
-	(do_copy): Removed a pointless cache lookup - duh, we do it in
-	open_folder anyway (infact, we do it in camel too!!).
-	(filter_driver_filter_message): Removed pointless re-refing of
-	arguments.  Why would anyone think this could be any use at all?
-	(filter_driver_filter_folder): New function to filter a whole
-	folder.
-
-	* filter-editor.c (rule_add): api fixes.
-	(rule_edit): 
-	(rule_up): 
-	(rule_down): 
-	(set_sensitive): This didn't take into account the source, now it
-	does.
-	(select_source): Fix for api changes.  Changed the rather generic
-	'number' argument to be 'source', and a string.
-	(filter_editor_construct): Changed the 'number' to 'source', and
-	set the string appropriately.  Added a warning for one case where
-	the glade file is out of sync.
-
-	* score-editor.c (score_editor_construct): 
-	(rule_edit): 
-	(rule_delete): 
-	(rule_up): 
-	(rule_down): 
-	(set_sensitive): api fixes.
-
-	* vfolder-editor.c (set_sensitive): Api fixes.
-	(vfolder_editor_construct): 
-	(rule_edit): 
-	(vfolder_editor_construct): 
-
-	* rule-context.h (RCNextRuleFunc): Added a source argument.
-
-	* rule-context.c (rule_context_next_rule): Added source argument.
-	(rule_context_find_rule): Added source argument.
-	(rule_context_get_rank_rule): Added source argument.
-	(rule_context_get_rank_rule_with_source): Removed.
-	(save): Fixed for changes to RCNextRuleFunc prototype.
-
-	* filter-rule.h: Changed the source to be a string, removed the
-	filter_source_t type.
-
-	* filter-rule.c (filter_rule_set_source): New function to set the
-	source of a rule.  What idiot ran this code through indent?
-	(filter_rule_find_list): Added a source argument.
-	(filter_rule_next_list): Added a source argument.
-	(get_widget): Fixed the wording.  You dont remove search parts,
-	you can only remove the last one.  Why you even need to mention
-	they are search 'criteria' is beyond me.  Whoever added the
-	scrolled window needs to be shot, its the single most awful GUI
-	feature ever invented (ranks with the close button next to
-	maximise).
-	(xml_encode): Save source as a string (if present).
-	(xml_decode): Likewise for loading & fixed a small memleak.
-	(filter_rule_finalise): Free source.
-
-2000-10-06  Not Zed  <NotZed@HelixCode.com>
-
-	* rule-context.c (load): Remove the stupid on-demand cb shit.
-	(rule_context_load): And here too.
-
-2000-09-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Now takes an argument to
-	specify the log file (or NULL if logging is not to be performed).
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (gladedir, filterdir): Use $(datadir), not
-	$(prefix)/share.
-
-2000-09-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Modified to use more intuitive naming
-
-	* score-rule.c (xml_decode): Make sure the score is within our
-	range
-	(get_widget): Changed range to -3 to +3
-
-	* filter-score.c (get_widget): Changed range to -3 to +3
-	(xml_decode): Make sure the score is within our range
-
-	* filter-rule.c (get_widget): Rearranged widgets.
-
-	* filter-filter.c (get_widget): Rearranged widgets.
-
-	* filter-editor.c (filter_editor_construct): Updated to allow for
-	double-clicking on a rule to edit it.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-editor.c, filter-filter.c, filter-folder.c,
-	filter-input.c, filter-message-search.c, filter-option.c,
-	filter-rule.c, score-editor.c, vfolder-editor.c, vfolder-rule.c:
-	Fixed the #include lines to deal properly with gal.
-
-2000-09-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-message-search.c (body_contains): Modified to only match
-	text MIME parts in the message rather than the entire MIME message
-	(header_contains): Added regex matching
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* rule-context.c (d): 
-	* filter-datespec.c (d): Turn off debugging output.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c: We now use a "copied" variable to record
-	whether a message was marked as copied or not instead of trying to
-	"guess" by looking at the folders hash table as that won't work at
-	all anymore.
-	(do_copy): Renamed as this is more appropriate now that it
-	actually copies the message rather than marking it for copying
-	later. Also fixed a logic error which prevented a message from
-	being dumped into a folder if the fodler had been previously
-	opened.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): No longer takes a
-	self_destruct argument.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Don't freeze/thaw the
-	default inbox here, let the caller freeze/thaw it. Don't destroy
-	the folders hash table here, it's faster if we wait till the
-	filter-driver is destroyed.
-	(filter_driver_finalise): Destroy the folders hash table here
-	(filter_driver_init): Initialize the folders hash table here
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Changed "Header" to be "Message header" so it's
-	not quite as confusing (??)
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Updated to allow the user to specify arbitrary
-	headers.
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Fixed a logic error. Only
-	mark filtered as TRUE if it was successfully copied to another
-	folder, this means don't mark true if the default inbox is NULL.
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Erm, okay I misunderstood
-	what camel_folder_[un]hook_event() did - we don't even need this
-	crap in the filter driver so lets take it completely out and let
-	the caller handle this junk.
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Updated to not emit the
-	folder_changed signal when a message is appended to the default
-	mailbox - lets leave that up to the caller so we don't queue up a
-	bunch of these emits if the caller is downloading messages for
-	example.
-
-2000-09-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Added scoring xml stuffs
-	
-	* Makefile.am: added filter-score.[c,h]
-	
-	* filter-score.[c,h]: New functions to handle the "score" filter
-	type.
-	
-	* filter-element.c (filter_element_new_type_name): Added support
-	for "score" type.
-	
-	* filter-driver.c (do_score): New ESExp callback for filter
-	actions to set the score on a message.
-	
-	* filter-message-search.c (get_score): New ESExp callback for
-	getting the score tag as an integer value.
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Now takes a
-	CamelMessageInfo argument in preparation for handling scoring
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Modified to return a
-	boolean value specifying whether or not the message was filtered
-	into a folder other than the default. The default mailbox can now
-	also be specified as NULL if the message shouldn't be appended to
-	it in the case that it's not filtered into some other folder.
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Rewrote - this shouldn't
-	need to be an async function
-
-	* filter-message-search.c (match_all): Modified to look at the
-	boolean value being fed to it and just to return that instead of
-	always returning TRUE
-
-2000-09-07  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* filter-editor.c, filter-filter.c, filter-folder.c, filter-option.c:
-	* filter-rule.c, score-editor.c, vfolder-editor.c, vfolder-rule.c:
-	More UTF-8 wrapping
-
-2000-09-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Totally rewritten to filter
-	a single message at a time instead of filtering a folder.
-
-	* filter-message-search.c (filter_message_search): New convenience
-	function for searching a message.
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* filter-folder.c: Use e_utf8 wrappers
-
-	* filter-input.c: Use e_utf8 wrappers
-
-	* filter-rule.c: Use e_utf8 wrappers
-	
-2000-08-23  Dan Winship  <danw@helixcode.com>
-
-	* filter-datespec.c (cal_day_selected): Set seltime.tm_isdst to
-	-1, not daylight, because the current dst value is not relevant to
-	the selected date.
-
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (do_filter_mail): Unlink a new parameter, path_to_unlink,
-	if it is empty once the mail is filtered. Fixes a race in 
-	mail_tool_filter_contents_into.
-
-	* filter-driver.h: Update the prototype.
-
-2000-08-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* vfolder-editor.c (rule_add): Add translation marks and use stock
-	buttons.
-	(rule_edit): Likewise.
-
-	* score-editor.c (rule_add): Add translation marks and use stock
-	buttons.
-	(rule_edit): Likewise.
-
-	* rule-context.c (rule_context_add_rule_gui): Add translation
-	marks and use stock buttons.
-
-	* filter-part.c (main): Add translation marks and use
-	stock buttons.
-
-	* filter-folder.c (button_clicked): Add translation marks and use
-	stock buttons.
-
-	* filter-editor.c (rule_add): Add translation marks and use stock
-	buttons.
-	(rule_edit): Likewise.
-
-	* filter-rule.c (get_widget): Add translation marks.
-
-	* filter-filter.c (get_widget): Add translation marks.  Add
-	padding to make it look like the buttons in `filter-rule.c'.
-
-2000-08-17  Peter Williams  <peterw@helixcode.com>
-
-	Implement filtering on demand.
-
-	* rule-context.h: Add a new callback to rule_context_load
-	that allows the caller to hook on-demand rules into its UI.
-
-	* rule-context.c (rule_context_load): Changed to pass the
-	extra parameters to load().
-	(load): If the rule is successfully loaded, call the provided
-	callback so that the UI can be updated.
-
-	* filter-editor.c (rule_add): Set the source of the new filter.
-	(rule_edit): Use the new rule_context_get_rank_rule_with_source()
-	so that we don't get a bad index into the GtkList.
-	(rule_delete): Same as above.
-	(rule_up): Same as above.
-	(rule_down): Same as above.
-	(select_source): New function. When the user changes the 
-	dropdown list to select a new source type, repopulate the
-	list with rules of the appropriate type.
-	(filter_editor_construct): Code moved from here into
-	select_source(). Hook up all the elements of the source optionmenu
-	to callbacks to select_source().
-
-	* filter-rule.c (xml_encode): Save the rule's source type.
-	(xml_decode): Load it. Default to 'incoming' if unspecified.
-
-	* filter-rule.h: New enumeration, _filter_source_t, the
-	specifies the rule's source. Add it to struct _FilterRule.
-	
-	* filter-driver.c (filter_driver_run): Add a new input,
-	sourcetype, that specifies which rules to run (only ones
-	with the same source will be run). struct filter_mail_input_t
-	changed to accomodate.
-	(do_filter_mail): Skip rules if they're not the specified source.
-	If source and dest are the same, don't delete the messages or
-	copy unnecessarily.
-
-	* filter.glade: Make the optionmenu sensitive. Change "Outgoing"
-	to "On Demand" (outgoing should be added later).
-	
-2000-08-15  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* vfoldertype.xml, filtertypes.xml: Add entries defining the
-	date-based message filtering and vfoldering.
-
-	* filter-datespec.{c,h}: New files implementing the UI for
-	date-based filtering and vfoldering -- specifically, choosing
-	what to compare the message to.
-
-	* filter-element,c: Hook up to create a datespec filter if
-	that's what's called for.
-
-	* Makefile.am: Build the new -datespec files.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (EXTRA_DIST): remove blank.xpm and check.xpm which
-	no longer exist. Add filter.glade.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (describe_filter_mail): Use
-	mail_tool_get_folder_name here too. (Hm... this directory really
-	shouldn't depend on stuff in mail/, but it already did. We'll have
-	to sort this out later.)
-
-2000-08-11  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (do_filter_mail): Remove an '#if 0' that must
-	have been left in accidentally, so that messages which are copied
-	to other folders will not also be copied into the Inbox. Also,
-	#ifdef out the line that printfs the rule, because the rules are
-	often very large.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (do_colour): Use proper accessor function
-	instead of poking the structure.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-driver.c, filter-folder.c, rule-context.c,
-	vfolder-editor.c: Fixed some warnings.
-
-2000-08-10  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (do_filter_mail): Fix the infinite fetchmail.
-
-2000-08-10  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (filter_driver_run): Save the results of
-	searches till we're done.  So we dont have to go strduping strings
-	agian and again and again and again ...  Remove all the unecessary
-	strdups.
-	(do_colour): Implement.
-	(filter_driver_run): Change for append api change.
-	(free_key): Removed.
-
-2000-08-09  Not Zed  <NotZed@HelixCode.com>
-
-	* rule-context.c (rule_context_add_rule_gui): Helper function to
-	add a rule, but present a gui first, asking for confirmation/allow
-	editing.
-	(rule_context_add_rule_gui): Keep track of context so it isn't freed under us.
-
-	* filter-context.c (filter_context_create_action): Implement,
-	helper to aid filter generation.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (close_folder): Fix an accidental GTK unref
-	of a CamelObject.
-
-2000-08-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-folder.c (button_clicked): Use the base name of the
-	Evoluton URI for the button's label.
-	(get_widget): Likewise.
-
-2000-08-03  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (op_filter_mail): Conform to the new mail-threads
-	interface.
-
-2000-08-01  Not Zed  <NotZed@HelixCode.com>
-
-	* vfolder-editor.c (rule_add): Oops, create a vfolder_rule when we
-	add a new one.
-
-	* rule-context.c (load): If there are no user rules, dont bomb
-	out.
-
-2000-07-31  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-input.c (filter_input_set_value): Set value of a simple
-	type to a new string.
-
-	* filter-option.c (filter_option_set_current): New function to set
-	the current value of an option.
-
-	* filter-rule.c (filter_rule_find_list): New function to find a
-	rule in a list, by name.
-	(filter_rule_set_name): Let you set the name of a rule.
-
-	* rule-context.c (rule_context_find_rule): Find a rule by name.
-	(rule_context_create_part): Helper to find and clone a part by
-	name.
-
-	* filter-folder.c (button_clicked): Fix warning.
-
-	* filter.glade: Add new widgets for vfolder rule editor.
-	
-	* vfolder-context.c (vfolder_context_init): Changed to use vfolder
-	rule as the rule type.
-
-	* vfolder-rule.c: New class to encode extra information required
-	for vfolder rules.
-
-2000-07-30  Not Zed  <NotZed@HelixCode.com>
-
-	**  Almost a total rewrite of every file, except for filter-driver
-	which just had minor updates.
-
-	The rule format has changed.
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (do_delete, filter_driver_run): Update for
-	CamelFolder API changes. (delete_message and get_uids don't take
-	exceptions any more.)
-
-2000-07-21  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (cleanup_filter_mail): Use the exception
-	provided to us by the async manager instead of allocating
-	our own; use mail_tool_camel_lock_{up,down} around camel
-	operations.
-	(filter_driver_run): Make it return void.
-
-2000-07-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c: Update to make "async".
-
-2000-07-11  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c: Update for CamelFolder API changes
-
-2000-07-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Updated to reflect changes to
-	camel_folder_append_message ()
-
-2000-07-09  Dan Winship  <danw@helixcode.com>
-
-	* filter-xml.[ch]: add a "string" type
-
-	* filtertype.xml, vfoldertypes.xml: Use type="string" rather than
-	"folder" for subject/body matching.
-
-	* filter-arg-types.c: Update some strings for "text" input. Fix
-	some warnings (including one that pointed out a real bug).
-
-	* filter-arg.c, filter-druid.c, filter-format.c: fix warnings
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c: Update for camel_folder_search_by_expression
-	change (GList -> GPtrArray).
-
-	* vfoldertypes.xml: sync this to filtertypes.xml (to/cc thing)
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* remove some non-error case debugging messages.
-
-	* filtertypes.xml: Fix typos and update the "to-address" rule to
-	match To or Cc.
-	* vfoldertypes.xml: Fix typos.
-
-	* filter-driver.c (do_delete, do_copy, do_stop,
-	filter_driver_run): Add uids to the "processed" list only after
-	succesfully doing something with them. Fixes the problem where
-	copying a message to a folder that didn't exist would result in it
-	disapearing.
-
-2000-07-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-driver.c (filter_driver_new): Don't free the ruleset nor
-	the xmlDoc.  This will make us leak [I think], but at least
-	filters work.
-
-2000-07-02  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (open_folder): freeze the folder to avoid
-	multiple folder_changed's
-	(close_folder): and thaw it.
-	
-2000-07-02  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (filter_driver_new): kill
-	filter_driver_set_session and filter_driver_set_rules and instead
-	make filter_driver_new take the rules and a callback function it
-	can use to turn URIs into folders.
-	(open_folder): Use the callback function rather than calling camel
-	directly: some URIs need special handling to turn them into stores
-	and folders correctly, so let the mailer do that.
-
-2000-07-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-arg-types.c (arg_folder_edit_value): Only allow type
-	"mail" when selecting a folder for the filter.
-
-2000-07-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c: Updated to reflect changes made to 
-	camel-folder.
-
-2000-06-30  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* filter-xml.c (filter_load_optionset_file): Check for failure
-	when loading the filter doc.
-
-	* filter-driver.c (filter_driver_set_rules): Ditto.
-
-	* filter-editor.c (filter_editor_set_rule_files): Ditto.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-arg-types.c: Replaced `global_shell_interface' with
-	`global_shell_client'.
-	(arg_folder_edit_value): Use
-	`evolution_shell_client_user_select_folder()'.
-	(create_listener): Removed.
-	(impl_FolderSelectionListener_selected): Removed, together with
-	all the ::Listener stuff.
-
-2000-06-29  Arik Devens  <arik@helixcode.com>
-
-	* vfoldertypes.xml (ruleset type="match"): Changed Cc to CC to be
-	the same as the other CC rule. None of this works however, cause
-	the CC code is not hooked up to camel... oh well ;-(
-	
-2000-06-29  Arik Devens  <arik@helixcode.com>
-	
-	* vfoldertypes.xml (ruleset type="match"): Added a Cc rule to
-	vfolders. Works like To except on the Cc of a message ;-)
-	
-2000-06-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-arg-types.c (arg_string_edit_value): Changed "Filter name"
-	to "Option value" as "Filter name" made no sense in the dialog
-	(arg_address_edit_value): Same
-	(arg_folder_edit_value): What do we want to return??
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-xml.c (load_desc): Strdup content before assigning the
-	value.  Also, no need to check for NULL when g_strdup()ing as
-	g_strdup() returns NULL for a NULL arg.
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): `-I$(top_builddir)/shell' so that it
-	works with builddir != srcdir.  [We need to #include
-	"Evolution.h".]
-
-2000-06-27  Michael Zucchi  <zucchi@zedzone.mmc.com.au>
-
-	* Makefile.am (INCLUDES): Add the shell dir for includes (for
-	corba interfaces).
-
-	* filter-arg-types.c (impl_FolderSelectionListener_selected):
-	Listener for folder query.  Sigh.
-	(create_listener): Create the listener object for the folder
-	dialogue query.  Uses a global for linkage to the shell object,
-	via the mail component.
-	(arg_folder_edit_value): Call the folder selection dialogue to
-	edit the value, rather than a simple text widget.
-
-2000-06-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-editor.c: Added a #include <gnome-xml/parser.h> as this
-	was needed (since we used the xml parser...)
-	(druid_dialogue_clicked): Do we want to use struct filter_option
-	or do we instead want to use struct filter_optionrule as we had before?
-	Since the function we pass the data to expects filter_option, I suspect 
-	that that is what we want.
-
-	* filter-format.h (filter_description_html_write): Renamed from
-	description_html_write in order to match function name in
-	filter-format.c
-
-	* filter-druid.c (option_name_changed): Fixed a memory leak (Free'd
-	a filter description list).
-
-	* filter-arg-types.c (arg_folder_edit_values): Free'd GList data in
-	argin->values.
-
-	* filter-driver.c (filter_driver_set_rules): Added code to free an
-	xmlDoc and some other data.
-
-	* filter-arg.h: Add prototypes for filter_arg_write_html() and 
-	filter_arg_write_text();
-
-	* filter-arg-types.c: Lets see if we can't get rid of some of these 
-	warnings... (use some casts to make warnings go away)
-	(arg_address_edit_value): Lets make sure that ad exists before looking
-	at member data.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (do_delete, filter_driver_run): Update for Camel
-	flag handling changes.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (open_folder, close_folder): Update for
-	CamelFolder changes.
-
-2000-06-09  Jacob Berkman  <jacob@helixcode.com>
-
-	* filter-editor.c (add_or_edit): use stock pixmap buttons
-
-	* filter-druid.c (build_druid): remove the border on the notebook,
-	put the html widget in a scroll frame, and add some padding
-
-2000-06-06  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (open_folder): Update for folder
-	existence/creation changes.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-driver.c: Free the exception and the priv struct.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-arg-types.c (arg_address_edit_value): Search for ad in
-	arg->values instead of text since it's a list of
-	filter_arg_adresses.  Also, free the old value in the list.
-
-2000-05-30  Not Zed  <NotZed@HelixCode.com>
-
-	* filtertypes.xml: And here too.
-
-	* vfoldertypes.xml: Add body-contains and not-body-contains
-	types.
-
-2000-05-27  Not Zed  <NotZed@HelixCode.com>
-
-	* vfoldertypes.xml: New file - lists rules appropriate for
-	vfolders (no actions, etc).
-
-	* Makefile.am (EXTRA_DIST): Add vfoldertypes.xml
-
-	* filter-driver.c (filter_driver_expand_option): Made public from
-	expand_filter_option.
-	(filter_driver_rule_count): find out how many user rules are
-	defined.
-	(filter_driver_rule_get): Get a user rule by index.
-
-2000-05-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-druid.c: Don't pass an empty URL to `gtk_html_begin()'
-	anymore.
-
-	* filter-arg-types.c: Updated for the new GtkHTML API which uses
-	`GtkHTMLStream *' instead of `GtkHTMLStreamHandle'.
-	* filter-arg.c: Likewise.
-	* filter-arg.h: Likewise.
-	* filter-druid.c: Likewise.
-
-	* filter-format.c: Likewise.
-	* filter-format.h: Likewise.
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): update for
-	camel_folder_get_uids change
-
-2000-05-17  NotZed  <NotZed@HelixCode.com>
-
-	* filter-druid.c: Fix some html formatting.
-
-2000-05-16  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (filter_driver_run): Delete all processed
-	messages.  This is probably going to slow it down a bit.
-	(filter_driver_run): Close folders before destroying them *sigh*.
-	(open_folder): Actually open the folder. Doh.
-
-	* filtertypes.xml: Initial filter rules.
-
-	* filter-xml.c (filter_write_optionset): Save the description
-	also.
-	(write_description): Routine to save description - only saves 1
-	node of description.
-
-	* filter-arg.c (filter_arg_edit_clicked): Dont free edata here,
-	let the destroy do it(?)
-
-	* filter-editor.c (main): Simple driver program for testing, so i
-	can fix all this really broken code *sigh*
-
-2000-05-15  NotZed  <NotZed@HelixCode.com>
-
-	* filter-editor.c (filter_editor_set_rule_files): filename based
-	interface.
-	(filter_editor_save_rules): Interface to save the options to a
-	filename.
-
-	* filter-xml.[ch]: Bunch of cleanup.
-
-	* filter-xml.c (filter_*_file): New interfaces to read/write files
-	directly, rather than messing with xmldoc crap.
-
-	* Makefile.am: Removed filter-driver test program, now just part
-	of libfilter.
-
-	* filter-driver.c: Made an object, with an api and everything, can
-	apply a filter to a given mailbox.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-arg.h: Changed tree.h to gnome-xml/tree.h.
-
-	* Makefile.am: Added filter-arg-types.h, filter-arg.h,
-	filter-xml.h, filter-format.h, filter-druid.h, filter-editor.h.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (main): Fix for api.
-
-2000-04-30  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (start): Remove no-longer-necessary call to
-	camel_provider_register_as_module.
-
-2000-04-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Use `$(GTKHTML_CFLAGS)'.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c: Removed a bunch of crappy unrequired headers.
-
-	* Makefile.am (filter_driver_LDADD): Added libibex back again.
-
-2000-04-18  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c: remove unused camel-log.h include
-
-2000-04-12  Matt Loper  <matt@helixcode.com>
-
-	* filter-arg.c (filter_arg_edit_value): Return a value.
-
-2000-03-27  NotZed  <NotZed@HelixCode.com>
-
-	* filter-xml.c (tokenise_xmlfreeprop): Free a prop after
-	tokenising it.
-	(find_node_attr): Free the prop after using it.
-	(load_desc): Ditto.   I use free() because xmlFree() is nowhere to
-	be found.
-	(filter_load_optionset): Ditto.
-
-	* filter-arg-types.c (arg_address_values_add_xml): free() xml
-	stuff, plugs a leak.
-	(arg_folder_values_add_xml): Ditto.
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (main): Changed to use async search api.
-
-2000-03-04  NotZed  <NotZed@HelixCode.com>
-
-	* filter-druid.c (html_write_options): Output 'and' bits between
-	the rules.
-
-	* filter-driver.c (main): Actually implement filtering, at least,
-	from Inbox.  Copy messages to folder (in the same store only, so
-	far), delete, and stop processing are implemented, and the logic
-	to handle default processing.
-
-	* filter-xml.c (load_optionvalue): Fix up a bug where we lost the
-	name of the arg (ouch).
-	* filter-xml.c: Wrapped printf's in debug macros.
-
-2000-03-02  NotZed  <NotZed@HelixCode.com>
-
-	* filter-druid.c (object_destroy): Disconnect the list signal, so
-	we dont get spurious emits during destroy.
-	(arg_changed): Callback to update filter arg asynchronously.
-	(arg_link_clicked): Edit the value non-modally.
-
-	* filter-arg.c (filter_arg_edit_values_1): Changed to use
-	non-modal interface.
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: New file.
-
-	* Makefile: Removed.  I wonder why we are using plain Makefiles
-	instead of automake Makefiles at all.
-
-2000-02-29  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (main): Remove gui code, this will be actual
-	filtering code.
-
-	* Makefile: Added filter-editor to the library.
-
-	* filter-editor.c (main): Comment out, make it a proper library.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* filter-druid.c: Removed unused header.
-
-	* Makefile: Removed references to filter-sexp.[ch].
-
-	* filter-sexp.[ch]: Removed some unecessary includes.  Moved to
-	e-util.  Renamed callers.
-
-2000-02-24  NotZed  <NotZed@HelixCode.com>
-
-	* filter-xml.c (filter_description_free): 
-	(filter_load_ruleset_free): 
-	(filter_load_optionset_free): Functions for memory management.
-
-	* filter-arg.c (filter_arg_copy): Copy the values of one arg into
-	another.
-
-	* filter-editor.c: New widget, a dialogue which uses filter-druid
-	to present the various editing views.
-	(druid_dialogue_clicked): On finish, save the user's new filter
-	definition where it came from.
-
-	* filter-druid.c: Changed to just being a notebook with no tabs,
-	rather than a full druid (no next/prev/etc buttons).
-	(option_name_changed): Update the option's description as the user
-	enters it in.
-
-2000-02-22  NotZed  <NotZed@HelixCode.com>
-
-	* filter-xml.c (filter_clone_optionrule):
-	(filter_clone_optionrule_free): 
-	(filter_optionrule_new_from_rule): New utility functions for
-	working with the internal rule format.
-
-	* filter-arg.[ch]: Added new callbacks for editing a single value,
-	and a new editor which shows all items in a list, and allows you
-	to edit them via the single-edit method.  This needs some cleanup
-	for some unused/unusable virtual methods (edit_values,
-	write_html?).
-
-	* Makefile: Add the druid for build.
-
-	* filter-druid.c: A 'druid' widget for editing a single filter
-	rule.
-
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: New file.
-
-2000-02-18  NotZed  <NotZed@HelixCode.com>
-
-	* blank/check.xpm: Added forgotten files.
-
-	* Uh, more changes, lots, its still work in progress.
-
-2000-02-14  NotZed  <notzed@helixcode.com>
-
-	* Initial import.
-
diff --git a/filter/Makefile.am b/filter/Makefile.am
index 3d7a864053..c8c978025c 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -63,8 +63,7 @@ libfilter_la_LIBADD = 				\
 
 EXTRA_DIST =					\
 	$(ui_DATA)				\
-	filter.error.xml			\
-	ChangeLog.pre-1-4
+	filter.error.xml
 
 # basic rules.
 error_DATA = filter.error
diff --git a/filter/e-filter-datespec.c b/filter/e-filter-datespec.c
index 00aaad7e01..6ceb09450f 100644
--- a/filter/e-filter-datespec.c
+++ b/filter/e-filter-datespec.c
@@ -41,6 +41,9 @@
 #include "e-filter-part.h"
 
 #ifdef G_OS_WIN32
+#ifdef localtime_r
+#undef localtime_r
+#endif
 #define localtime_r(tp,tmp) memcpy(tmp,localtime(tp),sizeof(struct tm))
 #endif
 
diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c
index 08bf921507..2692972b16 100644
--- a/filter/e-filter-rule.c
+++ b/filter/e-filter-rule.c
@@ -255,13 +255,13 @@ more_parts (GtkWidget *button,
 	new = e_rule_context_next_part (data->context, NULL);
 	if (new) {
 		GtkWidget *w;
-		gint rows;
+		guint rows;
 
 		new = e_filter_part_clone (new);
 		e_filter_rule_add_part (data->rule, new);
 		w = get_rule_part_widget (data->context, new, data->rule);
 
-		rows = GTK_TABLE (data->parts)->nrows;
+		g_object_get (data->parts, "n-rows", &rows, NULL);
 		gtk_table_resize (GTK_TABLE (data->parts), rows + 1, 2);
 		attach_rule (w, data, new, rows);
 
diff --git a/filter/filter.ui b/filter/filter.ui
index 0c4d4855f9..b2e11f6fc1 100644
--- a/filter/filter.ui
+++ b/filter/filter.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="value">1</property>
@@ -526,6 +526,7 @@ a time relative to when filtering occurs.</property>
                       <object class="GtkComboBox" id="combobox_relative">
                         <property name="visible">True</property>
                         <property name="model">model3</property>
+                        <property name="active">0</property>
                         <child>
                           <object class="GtkCellRendererText" id="renderer3"/>
                           <attributes>
@@ -543,6 +544,7 @@ a time relative to when filtering occurs.</property>
                       <object class="GtkComboBox" id="combobox_past_future">
                         <property name="visible">True</property>
                         <property name="model">model4</property>
+                        <property name="active">0</property>
                         <child>
                           <object class="GtkCellRendererText" id="renderer4"/>
                           <attributes>
diff --git a/help/C/evolution.xml b/help/C/evolution.xml
index a343d84033..c048a592b3 100644
--- a/help/C/evolution.xml
+++ b/help/C/evolution.xml
@@ -6113,7 +6113,7 @@
      <mediaobject><imageobject><imagedata format="PNG" fileref="figures/groupwise_resend_retract.png"/></imageobject></mediaobject>
     </listitem>
    </orderedlist>
-   <para>An email is send to all the recipients to invite them to your updated event.</para>
+   <para>An email is sent to all the recipients to invite them to your updated event.</para>
   </section>
   
   
diff --git a/help/ChangeLog b/help/ChangeLog
deleted file mode 100644
index d18ae0e11a..0000000000
--- a/help/ChangeLog
+++ /dev/null
@@ -1,1450 +0,0 @@
-2009-04-03  Simos Xenitellis  <simos@gnome.org>
-
-	* el/el.po: Updated Greek translation by Fotis Tsamis.
-
-2009-03-25  Philip Withnall  <philip@tecnocode.co.uk>
-
-	* en_GB/en_GB.po: Updated British English translation by Jen Ockwell
-	<jenfraggleubuntu@gmail.com>.
-
-2009-03-24  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/figures/*.png. Added two screenshots.
-
-2009-03-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation.
-
-2009-03-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	* C/evolution.xml: Bump the version number.
-
-2009-03-16  Philip Withnall  <philip@tecnocode.co.uk>
-
-	* en_GB/en_GB.po: Updated British English translation.
-
-2009-03-16  Daniel Nylander <po@danielnylander.se>
-
-	* sv/sv.po: Updated Swedish translation.
-
-2009-03-15  Andre Klapper  <a9016009@gmx.de>
-
-	* cs/cs.po: Updated Czech translation by Jiri Eischmann.
-
-2009-03-11  Andre Klapper  <a9016009@gmx.de>
-
-	* de/de.po: Updated German translation.
-
-2009-03-11  Andre Klapper  <a9016009@gmx.de>
-
-	* de/de.po: Updated German translation.
-
-2009-03-11  Andre Klapper  <a9016009@gmx.de>
-
-	* cs/cs.po: Updated Czech translation by Jiri Eischmann.
-
-2009-03-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation.
-	* es/figures/*.png: Added screenshots.
-
-2009-03-10  Bharath Acharya  <abharath@novell.com>
-
-	* C/evolution.xml: Fixed the warning. Maybe we'll never miss
-	anything once we have the check provided by #574786
-
-2009-03-10  Philip Withnall  <philip@tecnocode.co.uk>
-
-	* en_GB/en_GB.po: Updated British English translation.
-
-2009-03-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation.
-	* es/figures/*.png: Added screenshots.
-
-2009-03-09  Bharath Acharya  <abharath@novell.com>
-
-	** Committed on behalf of PC Radhika <pradhika@novell.com>
-
-	* Makefile.am: Added 4 new images.
-
-2009-03-09  Andre Klapper  <a9016009@gmx.de>
-	
-	** Committed on behalf of PC Radhika <pradhika@novell.com>
-
-	* C/evolution.xml: Updated user documentation by Radhika after some 
-	review by hggdh and me.
-
-2009-03-08  David Planella  <david.planella@gmail.com>
-
-	Added Catalan translation of the Evolution quick reference
-
-	* quickref/Makefile.am: Added Catalan (ca) to the list of
-	subdirectories
-	* quickref/ca/Makefile.am: Created Makefile template
-	* quickref/ca/quickref.pdf: Created PDF output from the translation
-	* quickref/ca/quickref.tex: Created Catalan translation by David
-	Planella
-
-2009-03-02  Philip Withnall  <philip@tecnocode.co.uk>
-
-	* en_GB/en_GB.po: Updated British English translation.
-
-2009-02-17  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu/figures/: Added image in Basque language. Images are:
-		account_editor_a.png			addrs_book_a.png
-		attach_reminder_a.png.png		calendar.png
-		categories_a.png				collap_head_a.png
-		config-cal.png					config-mail.png
-		contact-editor.png				contact.png
-		contacts_mainwindow_a.png		delgt-add.png
-		evo_account_editor_a.png		evo_account_info_a.png
-		evo_add_rule_a.png				evo_adv_search_a.png
-		evo_allday_a.png				evo_attachreminder_plugin.png
-		evo_backup.png					evo_backup_prgsbar.png
-		evo_backup_warning.png			evo_blink.png
-		evo_cal_advsearch.png			evo_cal_a.png
-		evo_cal_callout_a.png			evo_calender_appointmnt.png
-		evo_cal_prop_a.png				evo_calstatus_a.png
-		evo_contacteditor_a.png			evo_crash_recovery.png
-		evo_custom_header.png			evo_debuglogs_a.png
-		evo_delegate_permission_a.png	evo_dialog-info.png
-		evo_dialog-warning.png			evo_edit_rule_a.png
-		evo_edit_search.png				evo_email_a.png
-		evo_flag_follow_up_a.png		evo_gwreceive_a.png
-		evo_gwreceiveedit_a.png			evo_gwreceiveoptedit_a.png
-		evo_gwstatustrack.png			evo_identity_a.png
-		evo_identityedit_a.png			evo_imapheader_a.png
-		evo_imapreceive_a.png			evo_import_asst_a.png
-		evo_junk_a.png					evo_label_a.png
-		evo_labels_a.png				evo_mail_a.png
-		evo_mail_callout_a.png			evo_maildirreceive_a.png
-		evo_mail_notifier.png			evo_mboxreceive_a.png
-		evo_memo_a.png					evo_mereceive_a.png
-		evo_message_filters_a.png		evo_mhreceive_a.png
-		evo_newmail.png					evo_newmess_a.png
-		evo_offline.png					evo_popreceive_a.png
-		evo_proxyadd_a.png				evo_receive_setup2_a.png
-		evo_receive_setup_a.png			evo_rmdrnotes_a.png
-		evo_rule_a.png					evo_select_add_folder.png
-		evo_select_folder.png			evo_send_option_a.png
-		evo_send_setup_a.png			evo_sendstatus_a.png
-		evo_shd_memo_a.png				evo_timezone_a.png
-		evo_usereceive_a.png			exchange-delegation.png
-		exchange-identity.png			exchange-receive-options.png
-		exchange-receive.png			exchg-identity.png
-		exchng-identity.png				exchng-rec-mail.png
-		exchng-rec-mails.png			exchng-rec-option.png
-		exchng-rec-options.png			exchng-settings.png
-		filter-new-fig.png				free_busy.png
-		full-1.png						full-2.png
-		full-3.png						full-4.png
-		full-5.png						full-6.png
-		full-7.png						google_cal_view.png
-		mail-druid-pic.png				mailer_preferences.png
-		mail-inbox.png					mail_mainwindow_a.png
-		mail-threaded.png				mainwindow-pic.png
-		minus.png						newmsg.png
-		plus.png						proxy-cal.png
-		proxy-login.png					quick_add_a.png
-		quick_reference.png				replymsg.png
-		schedule.png					Screenshot-Free-Busy.png
-		stock_search.png				sub-others-folder.png
-		sub-pub-fold.png				ver_view_a.png
-		vfolder-createrule-fig.png
-
-2009-02-16  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu/eu.po: Added Basque translation.
-	* Makefile.am: Added 'eu' to DOC_LINGUAS.
-
-2009-02-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Removed unused figures (bug #552695)
-
-2009-02-01  Petr Kovar  <pknbe@volny.cz>
-
-	* cs/cs.po: Updated Czech translation by Jiri Eischmann.
-
-2009-01-24  Andre Klapper  <a9016009@gmx.de>
-
-	* de/de.po: Updated German translation.
-
-2009-01-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation.
-
-2009-01-16  Johnny Jacob  <jjohnny@novell.com>
-	
-	** Committed on behalf of PC Radhika <pradhika@novell.com>
-	
-	* C/figures/account_editor_a.png:
-	* C/figures/attach_reminder_a.png:
-	* C/figures/evo_newmess_a.png:
-	* C/figures/google_cal_view.png: 
-	Updated screenshots.
-
-2009-01-11  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Sync two strings. Remove explicit mentioning
-	of some translators.
-
-2009-01-11  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Remove more redundancy; split up more strings.
-
-2009-01-11  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Remove redundancy; split up strings.
-	Fixes bug #567409.
-
-2009-01-11  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fix typos. Fixes bug #566572.
-
-2009-01-11  Andre Klapper  <a9016009@gmx.de>
-
-	* de/de.po: Updated German translation.
-
-2009-01-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	* quickref/evolution-logo.eps:
-	B & W version of our new logo to replace the old Ximian logo.
-
-	* quickref/*/quickref.pdf:
-	Regenerate the Quick Reference PDFs with the new logo.
-
-2009-01-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2009-01-05  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-	* es/figures/*.png: Added three screenshots
-
-2009-01-04  Andre Klapper  <a9016009@gmx.de>
-
-	* de/de.po: Updated German translation.
-
-2009-01-04  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2009-01-03  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Link sentence "You can also enable Magic 
-	spacebar" against the corresponding section. Fixes bug #550604.
-
-2009-01-03  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: s/and/or. Fixes bug #566233.
-
-2009-01-03  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fix wrong sentence. Fixes bug #566228.
-
-2009-01-03  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Add missing whitespace.
-
-2009-01-03  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Add warning that PGP Encrypt will not 
-	encrypt subject lines. Fixes bug #543580.
-
-2009-01-03  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Sync strings.
-	Fixes bug #566236, bug #566238.
-
-2009-01-03  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Sync strings.
-	Fixes bug #566234.
-
-2009-01-03  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fix grammatical errors.
-	Fixes bug #558492. Patch by Nanley Chery.
-
-2009-01-03  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fix non-sense split sentences.
-	Fixes bug #544340, bug #544339.
-
-2009-01-03  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fix typos. Bug #544335.
-	Patch by Philip Withnall.
-
-2009-01-02  Andre Klapper  <a9016009@gmx.de>
-
-	* de/figures: Added a few translated screenshots.
-
-2009-01-02  Andre Klapper  <a9016009@gmx.de>
-
-	* de/de.po: Update German translation.
-
-2009-01-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #546437
-
-	* C/evolution.xml:
-	Fix various typos and poor wording in chapters 1-4.
-
-2009-01-01  Andre Klapper  <a9016009@gmx.de>
-
-	* de/de.po: Update German translation.
-
-2009-01-01  Andre Klapper  <a9016009@gmx.de>
-
-	* quickref/Makefile.am:	
-	* quickref/cs/Makefile.am:
-	* quickref/cs/quickref.tex:
-	* quickref/cs/quickref.pdf:
-	Added Czech translation of quickref (already in last commit).
-
-2009-01-01  Andre Klapper  <a9016009@gmx.de>
-
-	* de/figures/account_editor_a.png:
-	* de/figures/calendar.png:
-	* de/figures/categories_a.png:
-	* de/figures/collap_head_a.png:
-	* de/figures/config-cal.png:
-	* de/figures/config-mail.png:
-	* de/figures/contact-editor.png:
-	* de/figures/contact.png:
-	* de/figures/contacts_mainwindow_a.png:
-	* de/figures/evo_account_editor_a.png:
-	* de/figures/evo_account_info_a.png:
-	* de/figures/evo_add_rule_a.png:
-	* de/figures/evo_adv_search_a.png:
-	* de/figures/evo_allday_a.png:
-	* de/figures/evo_cal_ prop_a.png:
-	* de/figures/evo_cal_a.png:
-	* de/figures/evo_cal_callout_a.png:
-	* de/figures/evo_calender_appointmnt.png:
-	* de/figures/evo_contacteditor_a.png:
-	* de/figures/evo_edit_rule_a.png:
-	* de/figures/evo_edit_search.png:
-	* de/figures/evo_email_a.png:
-	* de/figures/evo_flag_follow_up_a.png:
-	* de/figures/evo_gwreceiveedit_a.png:
-	* de/figures/evo_gwreceiveoptedit_a.png:
-	* de/figures/evo_identityedit_a.png:
-	* de/figures/evo_imapheader_a.png:
-	* de/figures/evo_import_asst_a.png:
-	* de/figures/evo_mail_a.png:
-	* de/figures/evo_mail_callout_a.png:
-	* de/figures/evo_mereceive_a.png:
-	* de/figures/evo_message_filters_a.png:
-	* de/figures/evo_newmess_a.png:
-	* de/figures/evo_proxyadd_a.png:
-	* de/figures/evo_receive_setup2_a.png:
-	* de/figures/evo_rmdrnotes_a.png:
-	* de/figures/evo_rule_a.png:
-	* de/figures/evo_select_add_folder.png:
-	* de/figures/evo_select_folder.png:
-	* de/figures/evo_shd_memo_a.png:
-	* de/figures/exchange-delegation.png:
-	* de/figures/exchange-identity.png:
-	* de/figures/exchange-receive-options.png:
-	* de/figures/exchange-receive.png:
-	* de/figures/exchg-identity.png:
-	* de/figures/exchng-identity.png:
-	* de/figures/exchng-rec-mail.png:
-	* de/figures/exchng-rec-mails.png:
-	* de/figures/exchng-rec-option.png:
-	* de/figures/exchng-rec-options.png:
-	* de/figures/filter-new-fig.png:
-	* de/figures/free_busy.png:
-	* de/figures/full-1.png:
-	* de/figures/full-2.png:
-	* de/figures/full-3.png:
-	* de/figures/full-4.png:
-	* de/figures/full-5.png:
-	* de/figures/full-6.png:
-	* de/figures/full-7.png:
-	* de/figures/mail_mainwindow_a.png:
-	* de/figures/mail-druid-pic.png:
-	* de/figures/mail-inbox.png:
-	* de/figures/mail-threaded.png:
-	* de/figures/mainwindow-pic.png:
-	* de/figures/minus.png:
-	* de/figures/newmsg.png:
-	* de/figures/plus.png:
-	* de/figures/proxy-cal.png:
-	* de/figures/proxy-login.png:
-	* de/figures/quick_add_a.png:
-	* de/figures/replymsg.png:
-	* de/figures/schedule.png:
-	* de/figures/Screenshot-Evolution-mailer-Preferences.png:
-	* de/figures/Screenshot-Free-Busy.png:
-	* de/figures/stock_search.png:
-	* de/figures/sub-others-folder.png:
-	* de/figures/sub-pub-fold.png:
-	* de/figures/ver_view_a.png:
-	* de/figures/vfolder-createrule-fig.png:
-	* es/figures/evo_blink.png:
-	* es/figures/evo_dialog-info.png:
-	* es/figures/evo_dialog-warning.png:
-	* es/figures/full-1.png:
-	* es/figures/full-2.png:
-	* es/figures/full-3.png:
-	* es/figures/full-4.png:
-	* es/figures/full-5.png:
-	* es/figures/full-6.png:
-	* es/figures/full-7.png:
-	* es/figures/minus.png:
-	* es/figures/plus.png:
-	* es/figures/stock_search.png:
-	* no/figures/full-1.png:
-	* no/figures/full-2.png:
-	* no/figures/full-3.png:
-	* no/figures/full-4.png:
-	* no/figures/full-5.png:
-	* no/figures/full-6.png:
-	* no/figures/full-7.png:
-	Remove unlovalized screenshots from SVN. Fixes bug #566206.
-
-2009-01-01  Andre Klapper  <a9016009@gmx.de>
-
-	* cs/cs.po: Updated Czech translation of manual by Jiri Eischmann.
-
-2008-11-15  Petr Kovar  <pknbe@volny.cz>
-
-	* cs/cs.po: Updated Czech translation of manual by Jiri Eischmann.
-
-2008-11-09  Petr Kovar  <pknbe@volny.cz>
-
-	* cs/cs.po: Updated Czech translation of manual by Jiri Eischmann.
-
-2008-10-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-09-29  Petr Kovar  <pknbe@volny.cz>
-
-	* cs.po: Updated Czech translation of manual by Jiri Eischmann.
-
-2008-09-23  Claude Paroz  <claude@2xlibre.net>
-
-	* fr/fr.po: Updated French translation.
-
-2008-09-20  Claude Paroz  <claude@2xlibre.net>
-
-	* fr/figures/*: One new figure added and one obsolete removed.
-
-2008-09-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #552911
-
-	* Makefile.am:
-	* C/figures/Screenshot-Evolution -mailer-Preferences.png:
-	* de/figures/Screenshot-Evolution -mailer-Preferences.png:
-	Do not use spaces in file names.
-
-2008-09-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/figures/*.png: Added new screenshots.
-
-2008-09-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-	* es/figures/*.png: Added new screenshots.
-
-2008-09-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-09-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-09-16  Bharath Acharya  <abharath@novell.com>
-
-	Patch from PC Radhika <pradhika@novell.com>
-
-	* C/evolution.xml: Updated doc changes for 2.24
-
-2008-08-22  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-08-21  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
-
-	* es/es.po: Updated Spanish translation
-
-2008-08-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-08-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-08-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	* C/evolution.xml:
-	Remove the bit about crash recovery.
-
-2008-08-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>                        
-
-	* es/es.po: Updated Spanish translation
-
-2008-08-13  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-08-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
-
-	* es/es.po: Updated Spanish translation
-
-2008-08-08  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-08-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-08-05  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-08-04  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fixes bug #544252
-
-	* quickref/C/quickref.tex: Use names consistent to the GUI for 
-	different components. 
-
-2008-08-03  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Make Claude happy (bug #544886 comment 4).
-
-2008-08-03  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Typo fixes and fix for bug #544886 on
-	behalf of Allan Day.
-
-2008-08-03  Andre Klapper  <a9016009@gmx.de>
-
-	* de/de.po: Update German translation.
-
-2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #545558
-
-	* C/evolution.xml:
-	Hula support is disabled by default now, so remove any
-	mention of it from the User Guide.
-
-2008-07-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	** This was preventing dblatex from working correctly.
-	   I use dblatex to generate a PDF for the website.
-
-	* xx/figures/attach_reminder_a.png:
-	Rename attach_reminder_a.png.png to attach_reminder_a.png.
-
-	* Makefile.am:
-	* xx/evolution.xml:
-	Update accordingly.
-
-2008-07-28  Claude Paroz  <claude@2xlibre.net>
-
-	* fr/fr.po: Updated French translation.
-
-2007-07-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #544958
-
-	* C/evolution.xml:
-	Use email, not e-mail (per documentation guidelines).
-
-2008-07-27  Claude Paroz  <claude@2xlibre.net>
-
-	* C/evolution.xml: Typos/Syntax improvements.
-	Fixes #544994.
-
-2008-07-27  Claude Paroz  <claude@2xlibre.net>
-
-	* fr/fr.po: Updated French translation.
-	* figures/evo_label_a.png: New screenshot.
-
-2008-07-25  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-07-24  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-07-23  Andre Klapper  <a9016009@gmx.de>
-
-	* de/de.po: Update German translation.
-
-2008-07-23  Andre Klapper  <a9016009@gmx.de>
-
-	* de/de.po: Update German translation.
-
-2008-07-22  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-07-21  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: s/a company environment/an organizational environment
-
-2008-07-21  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fix most of bug 543883. Patch by Allan Day.
-
-2008-07-21  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-07-21  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fix build break.
-
-2008-07-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Synchronized more strings, changed "mails" to "mail".
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Synchronized more strings.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Synchronized more strings.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Synchronized more strings, fixed some typos.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Synchronized more strings.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Synchronized more strings.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Synchronized more strings, fixed a typo.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Synchronized more strings, fixed a typo.
-
-2008-07-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fixed bug #477082.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fixed comments 201 to 317 of bug #438479.
-
-2008-07-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fixed comments 181 to 200 of bug #438479.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fixed comments 161 to 180 of bug #438479.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fixed comments 141 to 160 of bug #438479.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fixed comments 121 to 140 of bug #438479.
-	Use &z-3rdParty; instead of *.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fixed comments 81 to 120 of bug #438479.
-	Synced dialogue vs dialog. Fixed two duplicated IDs.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fixed comments 61 to 80 of bug #438479.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fixed comments 41 to 60 of bug #438479.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Fixed comments 21 to 40 of bug #438479.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Replace all "e-mail list" by "message list".
-	Fixed comments 1 to 20 of bug #438479.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Remove more wrong whitespaces.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* C/evolution.xml: Removed braindead whitespaces, fix duplicated
-	whitespaces, fix spellings.
-
-2008-07-05  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation 
-
-2008-06-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am:
-	Run xmllint on C/evolution.xml when building with "make check"
-	or "make distcheck".  Should hopefully prevent any more invalid
-	DocBook syntax from slipping into releases.
-
-	* C/evolution.xml:
-	Fix some issues that xmllint caught.
-
-2008-06-27 Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-06-22 Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-06-21  Petr Kovar  <pknbe@volny.cz>
-
-	* cs/cs.po: Updated Czech translation by Jiri Eischmann.
-
-2008-06-20 Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-06-08  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation.
-
-2008-06-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Re-fixes bug #437579
-
-	* C/evolution.xml: Fix "entity not defined" regressions.
-
-2008-05-23  Jorge Gonzalez  <jorgegonz@svn.gnome.org> 
-
-	* es/es.po: Updated Spansih translation.
-
-2008-05-21  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-04-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-04-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-04-13   Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-04-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
-
-	* es/es.po: Updated Spanish translation 
-
-2008-04-05  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* ru/ru.po: Updated Russian translation by Sergey Mironov <sergo@bk.ru>
-
-2008-04-05  Petr Kovar  <pknbe@volny.cz>
-
-	* cs/cs.po: Updated Czech translation by Jiri Eischmann.
-
-2008-04-02  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am (DOC_FIGURES): s/evo_label_a.PNG/evo_label_a.png
-	here, too.
-
-2008-04-01  Tor Lillqvist  <tml@novell.com>
-
-	* es/figures/evo_label_a.PNG: Remove this, it's a duplicate of
-	es/figures/evo_label_a.png.
-
-2008-03-26  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fixes Bug #524434. From PC Radhika <pradhika@novell.com>
-	
-	* C/evolution.xml: Fixed build break.
-
-2008-03-25  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fix for Bug #507372 from PC Radhika <pradhika@novell.com>
-	
-	* C/evolution.xml: Done language edits on newly 
-	added sections.
-	
-2008-03-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-03-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-	* es/figures/*.png: Added screenshots
-
-2008-03-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #476918
-
-	* C/evolution.xml: Fix a minor typo.
-
-2008-03-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/figures/*.png: Updated/added screenshots.
-
-2008-03-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #437539
-
-	* C/evolution.xml: Use DocBook tags instead of UTF-8 characters
-	for things like copyright and trademark symbols, quotes, etc.
-
-2008-03-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/figures/*.png: Updated/added screenshots.
-
-2008-03-10  Petr Kovar  <pknbe@volny.cz>
-
-	* cs/cs.po: Added Czech translation by Jiri Eischmann.
-	* cs/figures/evo_maildirreceive_a.png: Added screenshot by Jiri Eischmann.
-	* cs/figures/evo_backup_prgsbar.png: Ditto.
-	* cs/figures/evo_imapreceive_a.png: Ditto.
-	* cs/figures/evo_timezone_a.png: Ditto.
-	* cs/figures/evo_newmail.png: Ditto.
-	* cs/figures/evo_account_editor_a.png: Ditto.
-	* cs/figures/attach_reminder_a.png: Ditto.. png: Ditto.
-	* cs/figures/evo_import_asst_a.png: Ditto.
-	* cs/figures/evo_mail_callout_a.png: Ditto.
-	* cs/figures/evo_backup.png: Ditto.
-	* cs/figures/evo_mhreceive_a.png: Ditto.
-	* cs/figures/evo_attachreminder_plugin.png: Ditto.
-	* cs/figures/ver_view_a.png: Ditto.
-	* cs/figures/evo_crash_recovery.png
-	* cs/figures/evo_cal_callout_a.png: Ditto.
-	* cs/figures/evo_mail_a.png: Ditto.
-	* cs/figures/evo_offline.png: Ditto.
-	* cs/figures/evo_identity_a.png: Ditto.
-	* cs/figures/account_editor_a.png: Ditto.
-	* cs/figures/evo_backup_warning.png: Ditto.
-	* cs/figures/evo_usereceive_a.png: Ditto.
-	* cs/figures/contacts_mainwindow_a.png: Ditto.
-	* cs/figures/evo_popreceive_a.png: Ditto.
-	* cs/figures/evo_receive_setup_a.png: Ditto.
-	* cs/figures/evo_mereceive_a.png: Ditto.
-	* cs/figures/evo_mboxreceive_a.png: Ditto.
-	* cs/figures/evo_send_setup_a.png: Ditto.
-	* cs/figures/evo_gwreceive_a.png: Ditto.
-	* cs/figures/evo_newmess_a.png: Ditto.
-	* cs/figures/collap_head_a.png: Ditto.
-	* Makefile.am: Added cs to DOC_LINGUAS.
-
-2008-03-09  Daniel Nylander <po@danielnylander.se>
-
-	* sv/sv.po: Updated Swedish translation.
-
-2008-03-04  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-	* es/figures/*.png: Added Spanish screenshots
-
-2008-03-03  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-03-03  Andre Klapper  <a9016009@gmx.de>
-
-	* evolution/help/C/figures/evo_label_a.PNG:
-	svn move evolution/help/C/figures/evo_label_a.PNG 
-	evolution/help/C/figures/evo_label_a.png.
-
-2008-02-29  Claude Paroz  <claude@2xlibre.net>
-
-	* fr/fr.po: Updated French translation.
-	* fr/figures/*: Updated and added screenshots.
-
-2008-02-12  Wadim Dziedzic <wadimd@svn.gnome.org>
-
-	* help/quickref/pl/quickref.pdf:
-	* help/quickref/pl/quickref.tex:
-	* help/quickref/pl/Makefile.am:
-	* help/quickref/Makefile.am: Polish translation of quickref added.
-
-2008-02-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation.
-
-2008-02-08  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-02-08  Johnny Jacob  <jjohnny@novell.com>
-
-	Committed on behalf of PC Radhika <pradhika@novell.com>
-
-	** Fixes #511600, #511602
-	
-	* C/figures, Makefile.am : Added new figures.
-	
-	* C/evolution.xml : New features until Jan 2008 - 
-	google calender, crash detection, non intrusive error message, 
-	advanced conf option for Junk mails, magic space bar.
-	
-2008-02-04  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2008-02-04  Wouter Bolsterlee <wbolster@gnome.org>    
-
-	** Fix for bug #513285
-
-	* C/evolution.xml: Do not use entities.
-
-2008-02-01  Arangenl Angov <arangel@linux.net.mk>
-
-	* mk.po: Added partly translated mk.po.
-
-2008-01-23  Andre Klapper  <a9016009@gmx.de>
-
-	* de/figures/evo_gwreceive_a.png:
-	* de/figures/evo_identity_a.png:
-	* de/figures/evo_imapreceive_a.png:
-	* de/figures/evo_maildirreceive_a.png:
-	* de/figures/evo_mboxreceive_a.png:
-	* de/figures/evo_mhreceive_a.png:
-	* de/figures/evo_popreceive_a.png:
-	* de/figures/evo_receive_setup_a.png:
-	* de/figures/evo_send_setup_a.png:
-	* de/figures/evo_timezone_a.png:
-	* de/figures/evo_usereceive_a.png:
-	Added localized screenshots.
-
-2008-01-20  Yannig Marchegay <yannig@marchegay.org>
-
-	* oc.po: Updated Occitan translation.
-
-2008-01-06  Andre Klapper  <a9016009@gmx.de>
-
-	* de/de.po: Update German translation.
-
-2008-01-05  Andre Klapper  <a9016009@gmx.de>
-
-	* de/de.po: Update German translation.
-
-2007-12-25  Claude Paroz  <claude@2xlibre.net>
-
-	* fr/figures/*
-	* fr/fr.po: Merging modifications from gnome-2-20 branch.
-
-2007-12-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-        * es/es.po: Updated Spanish translation
-
-2007-12-15  Matthew Barnes  <mbarnes@redhat.com>
-
-	* C/evolution.xml:
-	Fix capitalization of "Switcher Appearance" menu (HIG 8.3.2).
-
-2007-12-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-        * es/es.po: Updated Spanish translation   
-
-2007-12-13  Matthew Barnes  <mbarnes@redhat.com>
-
-	* help/C/evolution.xml:
-	Fix all "entity not defined" warnings (#437579).
-
-2007-11-21  Yannig Marchegay <yannig@marchegay.org> 
-
-	* oc.po: Updated Occitan translation
-
-2007-10-28  Daniel Nylander <po@danielnylander.se>
-
-	* sv/sv.po: Updated Swedish translation.
-
-2007-09-16  Yannig Marchegay <yannig@marchegay.org>
-
-        * oc/oc.po: Updated Occitan translation
-
-2007-09-16  Daniel Nylander <po@danielnylander.se>
-
-	* sv/sv.po: Updated Swedish translation.
-
-2007-09-15  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* help/quickref/hu/quickref.pdf:
-	* help/quickref/hu/quickref.tex:
-	* help/quickref/hu/Makefile.am:
-	* help/quickref/Makefile.am: Hungarian translation of quickref added.
-
-2007-09-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2007-09-13  Johnny Jacob  <jjohnny@novell.com>
-
-	Committed on behalf of PC Radhika <pradhika@novell.com>
-
-	** Fixes #354699 #475198 #467364 #468309 #337616
-	
-	* C/evolution.xml : Updating docs.
-	
-2007-09-09  Luca Ferretti  <elle.uca@libero.it>
-
-	* quickref/Makefile.am: Added it to SUBDIRS.
-	* quickref/it/*: Added Italian translation
-
-2007-09-08  Claude Paroz  <claude@2xlibre.net>
-
-	* quickref/Makefile.am: Added fr to SUBDIRS.
-	* quickref/fr/*: Added French translation.
-
-2007-08-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2007-08-29  Claude Paroz  <claude@2xlibre.net>
-
-	* fr/fr.po: Updated French translation.
-
-2007-08-28  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2007-08-27  Johnny Jacob  <jjohnny@novell.com>
-
-	Committed on behalf of PC Radhika <pradhika@novell.com>
-
-	** Fixes #337616, #352346, #467364, #468309.
-	
-	* C/evolution.xml : 
-	
-2007-08-25  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2007-08-18  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2007-08-17  Claude Paroz  <claude@2xlibre.net>
-
-	* Makefile.am: Added fr to DOC_LINGUAS.
-	* fr/fr.po: Added French translation.
-	* fr/figures/*.png: Added French screenshots.
-
-2007-08-16  Johnny Jacob  <jjohnny@novell.com>
-
-	Committed on behalf of PC Radhika <pradhika@novell.com>
-
-	* C/evolution.xml : Fixed comments (typos) from bug #435942.
-	
-2007-08-13  Jorge Gonzalez <jorgegonz@svn.gnome.org> 
-
-	* es/es.po: Updated Spanish translation
-
-2007-08-11  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation  
-
-2007-08-10  Johnny Jacob  <jjohnny@novell.com>
-
-	Committed on behalf of PC Radhika <pradhika@novell.com>
-
-	* C/evolution.xml : Updated docs for 2.12
-	* C/figures/evo_cal_ prop_a.png : Removed.
-
-2007-08-09  Nikos Charonitakis <nikosx@gmail.com>
-
-	* el/el.po: Added Greek translation
-        * Makefile.am: Added Greek translation
-
-2007-08-05  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2007-08-03  Frederic Peters  <fpeters@0d.be>
-
-	reviewed by: Srinivasa Ragavan
-
-	* C/evolution.xml: add id attribute to top <book> element
-
-2007-08-02  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2007-07-31  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2007-07-30  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2007-07-30  Johnny Jacob  <jjohnny@novell.com>
-
-	Committed on behalf of PC Radhika <pradhika@novell.com>
-
-	* C/figures/* : Added new screenshots.
-	* C/evolution.xml : Updated docs for 2.11.6
-
-2007-07-23  Daniel Nylander <po@danielnylander.se>
-
-	* sv/figures/*: Added some screenshots.
-
-2007-07-21  Daniel Nylander <po@danielnylander.se>
-
-	* sv/figures/*: Added some screenshots.
-	* sv/sv.po: Updated Swedish translation.
-
-2007-07-05  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-        * es/es.po: Updated Spanish translation
-
-2007-07-03  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-        * es/es.po: Updated Spanish translation
-
-2007-06-30  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-        * es/es.po: Updated Spanish translation
-
-2007-06-27  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-        * es/es.po: Updated Spanish translation
-
-2007-06-24  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-        * es/es.po: Updated Spanish translation
-
-2007-06-21  Daniel Nylander <po@danielnylander.se>
-
-	* sv/figures/*: Updated screenshots.
-	* sv/sv.po: Updated Swedish translation.
-
-2007-06-20  Daniel Nylander <po@danielnylander.se>
-
-	* sv/figures/*: Added and updated a lot of screenshots.
-
-2007-06-15  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-        * es/es.po: Updated Spanish translation
-
-2007-06-07  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* quickref/pt/Makefile.am: Added for Portuguese
-	* quickref/pt/quickref.tex: Added Portuguese translation.
-	* quickref/pt/quickref.pdf: Added PDF conversion of trans.
-	* quickref/Makefile.am: Added Portuguese (pt) to subdirs.
-
-2007-06-03  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-        * es/es.po: Updated Spanish translation
-
-2007-05-29  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de/*: Added German translation by
-				  Andre Klapper <ak-47@gmx.net>
-	* Makefile.a: Added de
-
-2007-05-10  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-        * es/es.po: Updated Spanish translation
-
-2007-05-06  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es/es.po: Updated Spanish translation
-
-2007-05-02  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* Makefile.am:
-	* ru/ru.po: Added Russian translation by
-	Sergey Mironov <sergo@bk.ru>
-
-2007-04-25  Matthew Barnes  <mbarnes@redhat.com>
-
-	* C/evolution.xml: Fix a typo (<br />).
-
-2007-03-11  Daniel Nylander <po@danielnylander.se>
-
-	* sv/sv.po: Updated Swedish translation.
-
-2007-03-07  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* Makefile.am: Added new doc images to Makefile.am.
-
-2007-03-02  David Lodge <dave@cirt.net>
-
-	* en_GB/en_GB.po: Added English (British) translation
-	* Makefile.am: Added en_GB to DOC_LINGUAS
-
-2007-02-23  PC Radhika <pradhika@novell.com>
-
-	* C/evolution.xml: Updated documentation for Evolution 2.10.
-	  Added new images and updated few images.
-
-2007-01-20  Daniel Nylander <po@danielnylander.se>
-
-	* quickref/sv/quickref.pdf: Updated Swedish translation.
-	* quickref/sv/quickref.tex: Updated Swedish translation.
-
-2006-12-22  Daniel Nylander <po@danielnylander.se>
-
-	* sv/sv.po: Updated Swedish translation.
-	* sv/figures/*png: Added screenshots.
-	* Makefile.am: Added sv to DOC_LINGUAS
-
-2006-12-14  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es/es.po: Translation updated 
-
-2006-12-09  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es/es.po: Translation updated
-
-2006-12-07  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es/*.xml: removed old xml files
-	* es/.cvsignore: Added .cvsignore file
-	
-2006-12-07  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es/*.xml: Removed old XML files.
-	* es/es.po: Updated Spanish translation.
-
-2006-11-22  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* C/Makefile.am, C/evolution-C.omf: Removed left over files.
-	
-2006-11-22  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* evolution.omf.in: Added omf for Evolution.
-	
-2006-11-22  Francisco Javier F. Serrador  <serrador@openshine.com> 
-
-	* es/es.po: Updated Spanish translation.
-
-2006-11-22  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es/es.po: Added Spanish doc translation.
-
-2006-11-14  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* C/figures/evo_cal_callout_a.gif: Deleted 
-	* C/figures/evo_cal_callout_a.png: Added (as indicated in evolution.xml)
-
-2006-11-10  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* quickref/es/Makefile.am:
-	* quickref/es/quickref.tex:
-	* quickref/es/quickref.pdf:
-	* quickref/Makefile.am:
-
-	Added localized (spanish) quick reference card. 
-	
-2006-11-10  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es/es.po: Added initial revision for gnome-doc-tools.
-
-2006-10-14  Harish Krishnaswamy  <kharish@novell.com>
-
-	* C/evolution.xml: Documentation updates.
-	Committing on behalf of Radhika Nair <pradhika@novell.com>
-
-2006-09-04  Harish Krishnaswamy  <kharish@novell.com>
-
-	* C/evolution.xml: Documentation updates.
-	Committing on behalf of Radhika Nair <pradhika@novell.com>
-
-2006-09-04  Harish Krishnaswamy  <kharish@novell.com>
-
-	* C/evolution.xml: Update the doc for Evolution 2.8.
-	Committing on behalf of Radhika Nair <pradhika@novell.com>
-
-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>
-
- 	* C/evolution.xml: Updating the doc for 2.6 and fixing bugs which went
-	in by updating the doc for 2.6.
-
-2006-03-06  Srinivasa Ragavan <sragavan@novell.com>
-
-	* C/figures/Screenshot-Evolution -mailer-Preferences.png:
-	* C/figures/Screenshot-Free-Busy.png: Added two new images for the 2.6
-	documentation.
-
-2006-03-06  Srinivasa Ragavan <sragavan@novell.com>
-
-	* C/evolution.xml: Updating the doc for 2.6.
-
-2006-02-27  Andre Klapper  <a9016009@gmx.de>
- 	* quickref/C/quickref.tex: Fixing a typo and pdf.
-
-2006-02-27  Andre Klapper  <a9016009@gmx.de>
- 	* quickref/C/quickref.tex: Updating quickref and pdf.
- 	Fixes bug 316797.
-
-2006-01-19  Andre Klapper <a9016009@gmx.de>
-
-	* C/evolution-C.omf: changing start menu category and description.
-	Fixes bug 325763.
-
-2005-10-05  Harish Krishnaswamy  <kharish@novell.com>
-
-	* C/evolution.xml: Set id to index. Fixes #316297.
-
-2005-06-15  Andre Klapper  <a9016009@gmx.de>
- 	* quickref/C/quickref.tex: Updating and fixing several
- 	typos, wrong keyboard shortcuts and inconsistencies
- 	(fixes bug #268024)
-
-	committed on behalf of Andre since he does not have 
-	commit rights -partha
- 
-2005-08-29  Sankar P  <psankar@novell.com>
-
-	* C/evolution.xml: Committed on behalf of Jessica.  
-	Changes are made to the Proxy documentation.
-	
-2006-08-26  Harish Krishnaswamy <kharish@novell.com>
-
-	* C/evolution.xml: Update references to bugzilla
-	and related hyperlinks.
-	
-2006-08-26  Harish Krishnaswamy <kharish@novell.com>
-
-	* C/evolution.xml: Update documentation
-
-2005-03-06  JP Rosevear  <jpr@novell.com>
-
-	* C/evolution.xml: Update documentation
-
-2005-02-19  JP Rosevear  <jpr@novell.com>
-
-	Fixes #71554
-	
-	* C/evolution-2.2.xml: add id="index"
-
-2004-10-11  Rodney Dawes  <dobey@novell.com>
-
-	* C/Makefile.am: Add new images to figures
-	* C/figures/*.(png|eps): Update and add new images
-
-	* C/evolution.xml: Update to lastest version of docs
-
-2004-10-04  Rodney Dawes  <dobey@novell.com>
-
-	* C/Makefile.am: Add unversioned xml/omf to EXTRA_DIST
-
-2004-09-13  Rodney Dawes  <dobey@novell.com>
-
-	* xmldocs.make: Don't requires entities here
-
-	* C/Makefile.am: Add new figures to the list of images
-	Generate versioned xml/omf files based on $(BASE_VERSION)
-	Fix up CLEANFILES to include the stuff we generate
-
-	* C/POTFILES.in:
-	* C/apx-*.xml:
-	* C/config-*.xml:
-	* C/evolution-1.5-C.omf:
-	* C/evolution-1.5.xml:
-	* C/legal.xml:
-	* C/menuref.xml:
-	* C/preface.xml:
-	* C/topic.dat:
-	* C/usage-*.xml:
-	Remove all of these files from CVS
-
-	* C/evolution-C.omf:
-	* C/evolution.xml:
-	Add these files to replace the removed files above
-
-	* C/figure/*_a.(png|gif): Add new screenshots
-	
-2004-01-27  Aaron Weber <aaron@ximian.com>
-	* C/usage-mail-org.xml: spamfiltering
-	* C/usage-mail.xml: charsets and input methods.
-	* C/evolution-1.5.xml: assign copyright to Novell, add 2004.
-	* C/legal.xml: Novell/XImian switcheroo
-
-	
-2004-01-26  David Trowbridge <trowbrds@cs.colorado.edu>
- 
- 	* quick ref docs
-
-2004-01-09  Rodney Dawes  <dobey@ximian.com>
-
-	* C/Makefile.am (entities): Remove usage-exec-summary.xml
-
-2004-01-07 Aaron Weber <aaron@ximian.com>
-	*  help/C/Makefile.am: remove old graphic files
-	* help/C/evolution-1.5.xml  updated style notes, date, version
-	* help/C/apx-authors.xml: fix <application> usage
-	* help/C/apx-gloss.xml: fix <application> and <guibutton> usage
-	* help/C/config-prefs.xml:  same
-	* help/C/config-sync.xml:  same
-	* help/C/menuref.xml:  same
-	* help/C/usage-calendar.xml:  same
-	* help/C/usage-contact.xml:  same
-	* help/C/usage-exchange.xml:  same
-	* help/C/usage-mail-org.xml:  same
-	* help/C/usage-mail.xml:  same
-	* help/C/usage-print.xml:  same
-	* help/C/usage-sync.xml :  same
-	* help/C/usage-mainwindow.xml same, plus
-	* help/C/preface.xml same, plus removed Summary
-	* help/C/topic.dat Remove Summary
-	* help/C/usage-exec-summary.xml:  Remove summary
-	* help/C/figures/folder-bar.png: delete
-	* help/C/figures/summary.png: delete
-
-	
-2003-11-17  JP Rosevear <jpr@ximian.com>
-
-	* C/Makefile.am: Switch version to 1.5
-
diff --git a/help/ChangeLog.pre-1-4 b/help/ChangeLog.pre-1-4
deleted file mode 100644
index c983277068..0000000000
--- a/help/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,2072 +0,0 @@
-2003-05-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.xml: fix glossterms not to be inside
-	<guilabel>s. None of these should be inside <term>s anyway.
-	
-2003-05-02  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.xml: Filter-new-fig.png
-
-	* C/figures/filter-assist-fig.png: removed this figure image. Didn't need it and -new.
-	* C/figures/small_desktop.png: removed this figure image. Not sure why we had it.
-	* C/Makefile.am: remove filter-assist-fig.png, 
-
-2003-04-15  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exchange.xml: delegation
-
-2003-04-27  Rodney Dawes  <dobey@ximian.com>
-
-	* C/Makefile.am: Add figures/outline.png to $(figs)
-	
-2003-04-14  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.xml: Validation, mostly. Change in some ref names.
-
-2003-04-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.xml: can't vfolder on arbitrary folders.
-
-2003-04-08  Aaron Weber  <aaron@ximian.com>
-
-	* C/legal.xml: update trademark/copyright hoo-ha.
-
-2003-04-07  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.xml: add flag-for-followup instructions.
-
-2003-03-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): Ooops, add omf.make.
-
-2003-03-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/evolution-1.4-C.omf: Renamed from evolution-C.omf.
-	* C/evolution-1.4.xml: Renamed from evolution.xml.
-
-	* Makefile.am (SUBDIRS): Remove "no" for now.
-
-	* xmldocs.make: Updated to most recent version on GNOME CVS.
-
-	* C/Makefile.am (docname): Add version.
-	(omffile): Likewise.
-
-2003-03-19  Aaron Weber  <aaron@ximian.com>
-
-	* Makefile.am: s/sgml/xml/ (DOH)
-
-2003-02-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/preface.xml: add a couple "expert tips" that don't really go
-	anywhere else.
-	
-
-2003-02-18  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exchange.xml: replaced image, updated for 1.2 layout
-	(different order, mostly). Changed name of a section for better
-	clarity; this may cause filenames to differ in future builds.
-	
-	* C/figures/exchange-receive-options.png: updated image. 
-
-2003-02-04  Aaron Weber  <aaron@ximian.com>
-
-	* C/apx-authors.xml: thx to Baris, adjust phrasing in assorted
-	places. tiny fixes, basically.
-
-2003-01-30  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.xml: updates from Baris Cicek.
-
-2003-01-15  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.xml:  Change links from  ghelp links to internal apx-fdl or apx-gpl
-
-	* es/evolution.sgml: s/gnome-help/ghelp
-
-	* es/preface.sgml: s/gnome-help/ghelp
-
-2003-01-11  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.xml: "Send Later" feature changed for 1.2 and I
-	didn't notice. Shame on me.
-
-2002-12-16  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-sync.xml: spelling/typos
-
-	* C/usage-exchange.xml: spelling/typos
-
-	* C/usage-mail.xml: spelling/typos
-
-	* C/usage-mainwindow.xml: spelling/typos
-
-2002-12-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.xml: change directory server description.
-
-	* C/preface.xml: typo (bug 35362, "Resend" instead of "Redirect).
-	This whole section will need to be redone at some point.
-	
-2002-12-06  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.xml: add spam filtering help.
-
-2002-11-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.xml: fix typo as per bug 34152
-	
-	* C/legal.xml: redo tags for legalnotice ordering. open/close for
-	actual preface is in evolution.xml and the LEGAL entity
-	(legal.xml) is now part of the preface. the legalnotice tag itself
-	merely says "hey, go look at the preface, legal info is there due
-	to rendering issues."
-
-	* C/apx-gpl.xml: new file. GPL! 
-	
-	* C/Makefile.am: New file: apx-gpl.xml. Re-alphabetize the files
-	listed as entities, and make the \'s line up so it looks pretty.
-
-	* C/preface.xml: redo tags for legalnotice ordering. open/close
-	for actual preface is in evolution.xml and the LEGAL entity
-	(legal.xml) is now part of the preface.
-	
-	* C/evolution.xml: reorder, add GPL, put legalnotice inside
-	preface. Put actual <preface> tags in this file, so that the
-	preface could consist of sect1s which are the &LEGAL; and
-	&PREFACE; entities.
-
-2002-11-11  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.xml: fix bug 27336, which is about how the Search
-	Base option description is wrong.
-
-2002-11-04  Aaron Weber  <aaron@ximian.com>
-
-	* C/*.sgml: All sgml files replaced with xml files. XML files
-	validated. Two new XML files-- apx-fdl.xml and legal.xml
-
-	* C/evolution-C.omf: Altered to fit the GDP template. This may now
-	work with the GNOME 2.0 DTD, although I could be wrong.
-
-	* sgmldocs.make: removed and replaced with xmldocs.make. This will
-	break all translations until they are also ported to XML. I will
-	probably begin doing that tomorrow, since it's just markup and not
-	language stuff.
-
-	* C/Makefile.am: added two files
-
-2002-10-22  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: Edit-->Undelete, not Actions-->Undelete
-
-2002-10-16  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: no longer need to enter path.
-	
-
-2002-10-15  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exchange.sgml: Update supported/unsupported list.
-
-	* C/topic.dat: Change "What is Evolution" to "Introduction"
-
-	* C/usage-exchange.sgml: typo.
-
-	* C/menuref.sgml: update keycapss.
-
-	* C/usage-mainwindow.sgml: add note about command-line options.
-
-2002-10-11  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: add note about multiple repeated header
-	definitions as per 31291.
-
-2002-10-08  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exchange.sgml: fix 1.0/1.2 feature list discrepancies.
-
-	* C/preface.sgml: add info about man page and so forth.
-
-	* C/usage-mail.sgml: fix 30892, a cosmetic bug.
-
-2002-09-20  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: offline usage.
-
-	* C/usage-calendar.sgml: linked to wrong image.
-
-2002-09-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* C/evolution-C.omf: Make it validate.
-	* es/evolution-es.omf: Same here.
-	
-
-2002-09-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-sync.sgml: add item about permissions.
-
-	* C/usage-mail-org.sgml: add note about filter applications, tip
-	for easy filtering.
-
-	* C/usage-mail.sgml: encryption update
-
-2002-08-28  Aaron Weber  <aaron@ximian.com>
-
-	* C/preface.sgml: nav-by-letters
-
-2002-08-23  Aaron Weber  <aaron@ximian.com>
-
-	* C/preface.sgml: remove shortcuts that didn't actually get added
-	to the app.
-
-2002-08-22  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: change Exchange description
-
-	* C/config-prefs.sgml: add RDF note to newsfeed item.
-
-	* C/preface.sgml: update as per Christine's comments in
-	http://bugzilla.ximian.com/show_bug.cgi?id=29239
-
-2002-07-09  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail-org.sgml: Added note about set status filter action.
-
-2002-06-28  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exec-summary.sgml: change menu item links.
-
-2002-06-27  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-C.omf: apply patch from owen taylor
-
-2002-06-26  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-contact.sgml: remove the search-refining feature, which
-	isn't actually true, i think.
-	
-	* C/apx-authors.sgml: update slightly.
-
-	* C/apx-bugs.sgml: remove list of 1.1.x features.
-
-	* C/usage-mainwindow.sgml: minor tweaks
-
-2002-06-25  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.sgml: more improvem,ent.
-
-2002-06-24  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.sgml: overhaul. still need to improve examples.
-
-	* C/usage-mail.sgml: link to somewhere i have deleted.
-
-	* C/usage-contact.sgml: fix sharing section more
-
-2002-06-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-contact.sgml: some of this was shamefully inaccurate.
-
-	* C/preface.sgml: add original location.
-
-2002-06-04  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Added a tip mentioning that gpg can
-	automagically contact the server for keys without having to use a
-	console.
-
-2002-05-30  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Reworded the signature introduction
-	paragraph.  Started work on documenting the new signature editor.
-	I am kind of unsure of the full functionality, so I'm going to
-	wait a little bit on it.
-
-2002-05-30  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: links to conf.
-
-	* C/usage-mainwindow.sgml: updated for links to configuration.
-
-	* C/preface.sgml: added "What's new?" section with a few entries.
-
-	* C/evolution.sgml: Minor stylistic tweaks, updated version
-	numbers.
-
-	* C/Makefile.am: Removed evolution-faq.sgml and usage-notes.sgml,
-	and cvs removed them. These files are vestiges of the distant
-	past.
-
-2002-05-06  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: minor feature change in Evolution w/r/t Exchange calendars.
-
-	* C/usage-exchange.sgml: minor feature change in Evolution w/r/t Exchange calendars.
-
-	* C/usage-calendar.sgml: minor feature change in Evolution w/r/t Exchange calendars.
-
-	* C/usage-mainwindow.sgml: validation issue.
-
-2002-04-22  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: use gpg --import, as per bug 23113
-
-2002-04-01  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: remove png-variant DTD from comments.
-	change should affect nothing.
-
-2002-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/Makefile.am: Remove bogus EXTRA_DIST with sgmldocs.make.
-	Problem pointed out by Richard Boulton <richard@tartarus.org>.
-
-2002-03-27  JP Rosevear  <jpr@ximian.com>
-
-	* C/Makefile.am: end the line properly
-
-2002-03-27  Aaron Weber  <aaron@ximian.com>
-
-	* C/topic.dat: add from branch.
-	* C/figures/*: merge from branch
-	* C/usage-calendar.sgml: merge from branch
-	* C/usage-mail.sgml: merge from branch
-	* C/usage-mail-org.sgml: merge from branch
-	* C/Makefile.am: changes from other branch
-	* C/usage-print.sgml: merge from branch
-	* C/usage-exchange.sgml: merge from branch
-	* C/usage-mail.sgml: merge from evolution-1-0-branch branch.
-
-2002-03-25  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Added mention that 2048 maybe recommended by
-	some people.  Fixed a typo.
-
-2002-03-23  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-print.sgml: I fixed a typo which caused the
-	documentation to not build.
-
-2002-03-14  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail-org.sgml: Did some basic cleanup.
-
-	* C/usage-mail.sgml: Linked "expunge" to the glossary.
-	Made some basic grammar changes.
-	Reindented a whole lot of things.
-
-	* C/apx-gloss.sgml: Added Postscript as a glossary definition.
-
-	* C/usage-print.sgml: Changed the introduction of this.  Do users
-	really care about gnome-print?  Linked the Postscript line to the
-	glossary.
-
-	* C/usage-mail.sgml: Pulled warning about the HTML mail stuff.
-
-2002-03-12  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Replaced "png" with "PNG".  This shouldn't
-	break the SGML build and it's a slow start to the XML porting
-	process.  Included information about how to create an HTML
-	signature.
-
-2002-03-11  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Redid wording on a title, minute change.
-	Fix indenting.
-
-2002-02-10  Kevin Breit  <mrproper@ximian.com>
-
-	* C/evolution-C.omf: Removed "The" from title.
-
-2002-02-06  Aaron Weber  <aaron@ximian.com>
-
-	* C/Makefile.am: added
-	C/figures/schedule.png,exchange-identity.png exchange-receive.png,
-	exchange-receive-options.png
-
-	* C/usage-exchange.sgml: expanded note about active directory
-	server.  added screenshot for Free/Busy feature. Doubled the size
-	of the config instructions.
-
-	* C/figures/schedule.png: New file, screenshot for free/busy feature.
-
-	* C/evolution.sgml: added correct copyright years.
-
-	* C/usage-mail-org.sgml: warning about INBOX subfolder brokenness.
-
-2002-01-29  Kevin Breit  <mrproper@ximian.com>
-
-	* C/config-prefs.sgml: Started writing an LDAP config example
-
-2002-01-27  Kevin Breit  <mrproper@ximian.com>
-
-	* C/config-prefs.sgml: Added information regarding types of search scopes
-
-	* C/usage-contact.sgml: Fixed some linking brokenness
-
-	* C/apx-gloss.sgml: Added Search Base as an entry
-	Added Search Scope as an entry
-
-	* C/config-prefs.sgml: Fixed indenting, I guess.
-
-	* C/usage-contact.sgml: Rewrote LDAP introduction paragraph
-	Added information about setting up Evolution to use LDAP.  It's just a lazy xref.
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* sgmldocs.make: Use `-f' instead of `-e' so installation of
-	topic.dat works on non-GNU systems too.
-
-2002-01-17  Aaron Weber  <aaron@ximian.com>
-
-	* C/apx-gloss.sgml: typos.
-
-2002-01-15  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.sgml: Redo the whole options/account-creation
-	thing.
-
-	* C/usage-mainwindow.sgml: Redo the whole options/account-creation
-	thing.
-
-2002-01-07  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution.sgml: Touched this file but don't think I changed
-	it.
-
-	* C/usage-calendar.sgml: mention the full-advantage section and
-	the exchange features. Expand mention of "autopick" and general
-	polish on the appointment-scheduling and peer-to-peer groupware
-	functions. Also clarify palm-sync location information. All
-	features danw mentioned as critical are now docuemnted.
- 
-	* C/usage-exchange.sgml: Fix and expand as per Danw's notes about
-	Features that need to be documented.
-
-2002-01-04  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exchange.sgml: Revised list of supported/unsupported
-	features. Changed installation instructions.
-
-2001-12-21  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exchange.sgml: add notes about server/license
-	requirements, revise "your previous options" text to flow more
-	smoothly.
-
-2002-01-04  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Added a tip about reply-to specification stuff
-
-	* C/usage-calendar.sgml: Fixed brokenness
-
-2001-12-27  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-exchange.sgml: Small fix
-
-2001-12-24  Kevin Breit  <mrproper@ximian.com>
-
-	* C/apx-bugs.sgml: Updated indenting
-
-	* C/apx-authors.sgml: Updated my email address
-
-	* C/usage-print.sgml: Just, ya know, small change
-
-	* C/usage-exchange.sgml: Fixed wording, tags, and indenting
-
-2001-12-22  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mainwindow.sgml: Added information about importing mutt to Evolution.
-	Added a bit of info to the above.
-
-2001-12-20  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-exchange.sgml: Added a <sect1> that discusses features of Connector
-
-2001-12-18  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exchange.sgml: add notes about server requirements.
-
-	* C/topic.dat: Changed label of "Connecting to Exchange Servers"
-	
-2001-12-18  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mainwindow.sgml: Added information about importing KMail to Evolution.
-
-2001-12-14  Kevin Breit  <mrproper@ximian.com>
-
-	* C/apx-gloss.sgml: Slight glossary changes in wording
-
-	* C/usage-mail.sgml: Indenting changes, minor reorganization.
-
-2001-12-05  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-calendar.sgml: added "meeting-announce" note ("Simple
-	meeting announcements").
-
-	* C/config-prefs.sgml: Additional links to other portions of the
-	document.
-
-2001-11-30  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: Tiny error fix.
-
-2001-11-29  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Added more info about pretty emails.
-
-2001-11-28  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Added section about how to make your email pretty.  I'll add more each day or something.
-
-2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Workaround for Nautilus/Scrollkeeper bug that prevents our SGML
-	files to generate the docs properly; pointed out by Greg Leblanc.]
-
-	* C/evolution-C.omf: Point to index.html instead of
-	`evolution.sgml'.
-
-	* sgmldocs.make: Install the SGML files in evolution/sgml, and the
-	HTML files in evolution.
-
-2001-10-29  Aaron Weber  <aaron@ximian.com>
-
-	* C/apx-bugs.sgml: typos, redescribe 1.1 bugs. Re-validated.
-
-	* C/apx-authors.sgml: Added last few authors, a few more credits,
-	etc. Also changed contact info and URL for evolution.
-
-	* C/menuref.sgml: did we have only 1 item in the calendar?
-	yes. Also, s/Contact Manager/Addressbook/
-	
-	* C/usage-calendar.sgml: phrasing. UI. Spelling. Validation.
-
-	* C/Makefile.am: removed config-encryption and
-	usage-encryption. Stray files. Do not use, ship, etc. All
-	encryption info is in the mail docs.
-
-	* C/config-sync.sgml: call it the addressbook. added : for <terms>
-
-	* C/config-prefs.sgml: commented out empty section.
-
-	* C/figures/print-preview.png: ch. screenshot
-
-	* C/usage-contact.sgml: address book--> addressbook
-
-	* C/usage-mail-org.sgml: added "the note below" (duplicate of data
-	in mainwindow.sgml, but so is all the import information. The
-	import process is available in two places, we should document it
-	in two places. Also typos.  removed a commented-out section on
-	subscription management-- now in usage-mail and mainwindow.
-
-	* C/usage-mail.sgml: mdash correction.
-
-	* C/usage-mainwindow.sgml: replaced &mdash; with :
-
-	* C/apx-gloss.sgml: typo.
-
-	* C/preface.sgml: gnome-help-browser doesn't understand &mdash; 
-
-2001-10-28  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail-org.sgml: Added the iCalendar format to the list of imported types.  The .ics importing was added _last minute_.
-
-	* C/usage-calendar.sgml: Fixed stupid build bugs
-
-	* C/usage-mail.sgml: Fixed a boo-boo
-
-	* C/usage-exec-summary.sgml: Touchups, nothing here, run along
-
-2001-10-27  Kevin Breit  <mrproper@ximian.com>
-
-	* C/config-prefs.sgml: Rewrite of the calendar preferences.  I love how I'm having to rewrite this 48 hours before the freeze.  Why are we waiting this long?  It's beyond me, but oh well.  I'll continue writing and listening to The Doors.
-
-	* C/figures/calendar.png: Added labels
-
-	* C/figures/mail-inbox.png: Added labels and changed which image is used
-
-	* C/evolution.sgml: Bumped the version # to 1.0
-
-	* C/figures/summary.png: I played with the labels a bit
-
-2001-10-26  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-calendar.sgml: Lots of changes on recommendation from Damon Chaplin.  We love you Damon!
-
-	* C/usage-contact.sgml: One more FIXME...done
-
-	* C/config-prefs.sgml: Fixed a definition, one less FIXME to deal with.
-
-	* C/usage-mail-org.sgml: Moved importing information here.
-
-	* C/usage-mail.sgml: Moved importing information to -org.sgml
-
-	* C/usage-mail-org.sgml: Added a note
-
-	* C/usage-mainwindow.sgml: Added screenshot and labels of stuff for summary.
-
-2001-10-24  Kevin Breit  <mrproper@ximian.com>
-
-	* C/figures/mail-composer.png: I updated this becuase the screenshot was humerously _old_.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/topic.dat: s/usage-exec-summary.html/usage-summary.html.
-
-2001-10-22  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution.sgml: validation. SIlly me.
-
-2001-10-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: Many changes w/r/t IMAP and importation and encryption.
-
-	* C/usage-contact.sgml: A few changes, w/r/t import.
-
-	* C/usage-mainwindow.sgml: IMAP stuff.
-
-	* C/usage-exec-summary.sgml: More changes. Update to intro sect.
-	
-2001-10-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: Assorted fixes. Kevin, there's a FIXME for ya in here.
-
-	* C/preface.sgml: Added a few fixes.
-
-	* C/apx-bugs.sgml: Added a link to bugzilla, and a list of a few
-	1.1 features.
-
-2001-10-19  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Added in import dialogue documentation
-
-2001-10-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* C/usage-mail-org.sgml: Add a missing </orderedlist>
-	
-	* C/apx-authors.sgml: Fix my name.
-	
-2001-10-05  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: added example to filter bulk mail.
-
-2001-10-01  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: missing directory for figure file ref.
-
-2001-09-29  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Slightly improved encryption documentation.
-
-2001-09-26  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-sync.sgml: Polish, describe names of conduits.
-
-	* C/usage-sync.sgml: Minor changes.
-
-2001-09-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch for Automake 1.5 compatibility pointed out by Richard
-	Boulton <richard@tartarus.org>, as per #9258.]
-
-	* sgmldocs.make ($(docname).sgml): Indent the rule with a tab
-	instead of 8 spaces.
-
-2001-09-25  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: Added Right-click-bginfo a little.
-
-	* C/usage-mail-org.sgml: s/virtual folder/vFolder
-	also use of criterion/criteria.
-
-2001-09-24  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Fixed some brokenness
-2001-09-24  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Documented Insert -> Link a wee bit more
-
-2001-09-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Some grammar changes suggested by my girlfriend Amanda...props to Amanda!
-
-	* C/usage-calendar.sgml: Verfied to make sure it was accurate against the calendar in functionality.  Also added info about RSVP, scheduling appointments, and the like!  Finally did this.
-
-2001-09-20  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml:  move to DocBook 4.1
-
-	* C/usage-mail-org.sgml: move to DocBook 4.1
-	
-	* C/usage-mail.sgml: move to DocBook 4.1
-
-	* C/config-sync.sgml: move to DocBook 4.1
-
-	* C/apx-gloss.sgml: move to DocBook 4.1
-
-	* C/evolution.sgml: move to DocBook 4.1
-
-2001-09-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-calendar.sgml: more meetings-by-mail additions. Had no
-	idea this needed so much work.
-
-	* C/usage-mail.sgml: Added info about meetings-by-mail.
-	
-	* C/menuref.sgml: added F9 instructions.
-
-	* C/config-prefs.sgml: added info on how to connect to an arbitrary port.
-
-	* C/usage-mail.sgml: Revised gnome-vfs-http-proxy info.
-
-	* C/usage-exec-summary.sgml: added gnome-vfs-http-proxy
-	info. Almost the same as the stuff in usage-mail.
-
-	* C/usage-mail-org.sgml: removed regex item.
-
-2001-09-18  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Added a tip about the always encrypt button.
-
-2001-09-17  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: threaded mailview figure and img. added.
-
-	* C/usage-sync.sgml: Note about PalmOS 4 and Password Protection.
-
-	* C/figures/* (well, almost): New img.
-
-2001-09-15  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: linked to a now-obsolete section. changed link.
-
-	* C/config-prefs.sgml: Man, this needed so much more than style
-	revision-- the whole mail section had to be redone. Yech.
-
-	* C/usage-mail.sgml: moved "sharing mail" tip from config-prefs.
-
-	* C/config-prefs.sgml: style.
-
-2001-09-13  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-calendar.sgml: Add more info on tasks features.
-
-2001-09-11  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution.sgml: Validation issues.
-
-2001-09-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-contact.sgml: Contact lists.
-
-	* C/usage-mail.sgml: Contact Lists.
-
-	* C/menuref.sgml: Verified and Corrected.
-
-2001-09-10  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Verified that all functionality is in here, should be!
-
-2001-09-05  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: applied patch.
-
-2001-09-04  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution.sgml: Validation.
-
-	* C/usage-print.sgml: Add .ps information.
-
-	* C/usage-mail-org.sgml: Virtual Folder/vFolder, Ximian Evolution/Evolution.
-
-2001-09-04  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: Validate.
-	
-	* C/usage-mail.sgml: More html stuff.
-
-	* C/apx-authors.sgml: Credit kmarass.
-
-	* C/usage-contact.sgml: groups-of-contacts-management.
-
-	* C/usage-mainwindow.sgml: Add more info, "whatis" section,
-	"Ximian Evolution" and "vFolder."
-
-	* C/evolution.sgml: "Ximian Evolution" not "Evolution"
-
-	* C/preface.sgml: Moved "whatis" section to usage-mainwindow, as
-	per new-outline.
-
-	* C/usage-mail.sgml: Expand deletion info. Also composer work.
-
-2001-08-30  Aaron Weber  <aaron@ximian.com>
-
-	* C/apx-gloss.sgml: remove Spam, emoticon, haiku. Revise "Virus"
-
-2001-09-04  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-print.sgml: Added infoa about Windows not handling .ps
-
-2001-09-03  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Fixed brokenness
-
-	* C/usage-mainwindow.sgml: Added info on Exchange interaction
-
-2001-08-30  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exec-summary.sgml: revise for style. added info about calendar customizing.
-
-2001-08-29  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: Added info about NS importing.
-
-2001-08-29  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-exec-summary.sgml: Rewrote this file to be...more up to date.
-
-2001-08-28  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Renamed a xref to make it work.
-
-	* C/config-prefs.sgml: Updated for new LDAP UI.
-
-2001-08-24  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Added info about tables, rules, and images
-
-	* C/usage-calendar.sgml: Rename a few titles
-
-2001-08-22  Aaron Weber  <aaron@ximian.com>
-
-	* C/apx-gloss.sgml: public key.
-
-2001-08-22  Peter Williams  <peterw@ximian.com>
-
-	* sgmldocs.make: Oops, we need to take the basename too.
-
-2001-08-22  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: Removed NNTP docs. Improved IMAP docs. IMAP
-	still needs more work though.
-
-	* C/config-prefs.sgml: Removed NNTP docs.
-
-	* C/usage-mainwindow.sgml: s/todo/task list/, fix grammar/style.
-
-2001-08-22  Peter Williams  <peterw@ximian.com>
-
-	* sgmldocs.make (omf_timestamp): Put in a $(srcdir) here for when
-	srcdir != builddir.
-
-2001-08-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Add `sgmldocs.make' to `EXTRA_DIST'.
-
-2001-08-20  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exec-summary.sgml: Moved introductory/basic content to the
-	usage-mainwindow.sgml file. Rewrote intro.
-
-	* C/usage-contact.sgml: Moved introductory/basic content to the
-	usage-mainwindow.sgml file.Rewrote intro.
-
-	* C/usage-calendar.sgml: Moved introductory/basic content to the
-	usage-mainwindow.sgml file.Rewrote intro.
-
-	* C/usage-mail.sgml: Moved introductory/basic content to the
-	usage-mainwindow.sgml file.Rewrote intro.
-
-	* C/usage-mainwindow.sgml: Put summary-type info into
-	this file from other chapters.
-	
-	* C/topic.dat: New file. Help Menu info.
-
-2001-08-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Did more event -> appointment conversions.
-
-2001-08-18  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Renamed events to appointments (please
-	review for me as it was a simple regex replace).
-
-	* C/usage-mail.sgml: Removed "emoticon" and "root of all evil",
-	removed gargantuan, removed instances of "the the", changes
-	Virtual Folders to vFolders, renamed "Attachements and HTML Mail"
-	section, reworded "Embellish" to say "Enhance"
-
-2001-08-17  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exec-summary.sgml: s/My Evolution/Summary/
-
-	* C/preface.sgml: Moved "Quickref" stuff to Menuref file.
-
-	* C/usage-mainwindow.sgml: removed reference to faq.
-
-	* C/menuref.sgml: Gutted. Filled with "quickref" stuff.
-
-	* C/evolution.sgml: Removed FAQ. Re-added menuref. Menuref is now
-	the "quick reference" section.
-
-2001-08-17  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Wrote documentation about HTML templates.
-
-2001-08-16  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: minor edits. Added <tip> about bug 7428.
-
-2001-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* C/evolution-C.omf: Place it under <category="GNOME|Applications"/>
-
-2001-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* C/Makefile.am: Small fix to build.
-	* C/evolution-C.omf: Small fix. Remove an extra space.
-	* no/Makefile.am: Same here.
-	* no/evolution-no.omf: And here.
-	
-2001-08-15  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Updated one line about bullet points.
-
-2001-08-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no/*: Added beginnings of a Norwegian translation.
-	* sgmldocs.make: Forgot to add this. Kinda important.
-	* C/*.sgml: s/fig/figures/
-	* C/Makefile.am: Make it use the sgmldocs.make framework.
-	
-2001-08-14  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: Commented out menuref.
-	* C/usage-contact.sgml: Commented out menuref.
-	* C/evolution.sgml: commented out menuref.
-	* C/preface.sgml: commented out menuref.
-
-2001-08-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* C/apx-authors.sgml: Added missing ;'s after entities.
-	* C/evolution-C.omf: s/en/C in Language.
-	* C/usage-mail-org.sgml: Add missing ;.
-	* C/usage-mainwindow.sgml: Same here.
-	
-2001-08-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: Switched all images in entire document to
-	*not* use file extensions, so that they work properly with
-	db2ps. This doesn't completely fix the db2ps issues, but it's
-	apparently the right way to do this.
-
-2001-08-09  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.sgml: Made sharing tip an orderedlist.
-
-2001-08-08  Kevin Breit  <battery841@mediaone.net>
-
-	* C/config-prefs.sgml: Add information about sharing mailbox files.
-
-2001-08-03  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Add information about gathering actions.
-
-2001-08-02  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Added a <tip> for scrolling through mails.
-
-2001-07-30  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Fixed some breakage Aaron caused.
-
-2001-07-26  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: revised.
-
-	* C/usage-mail.sgml: revisions and stuff.
-
-2001-07-24  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Reworded a few questions.
-
-2001-07-23  Kevin Breit <battery841@mediaone.net>
-
-	* C/Makefile.am: Pulled instance of config-setupassist.sgml to make stuff build right.
-
-2001-07-23  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: validated.
-
-	* C/config-setupassist.sgml: Removed.
-
-	* C/evolution.sgml: removed config-setupassist.
-
-	* C/usage-exec-summary.sgml: Minor revisions.
-
-	* C/usage-contact.sgml:  Added 'format="png"' to all <image> tags
-	missing the attribute.
-
-	* C/usage-calendar.sgml: Added 'format="png"' to all <image> tags
-	missing the attribute.
-
-	* C/usage-mail.sgml: Added 'format="png"' to all <image> tags
-	missing the attribute.
-
-	* C/usage-mainwindow.sgml: Style. Merged info from preface. Added
-	'format="png"' to all <image> tags missing the attribute.
-
-	* C/preface.sgml: Style changes. Removed info that was duplicated
-	in mainwindow.sgml.
-
-2001-07-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mainwindow.sgml: Fixed the first time druid stuff a little more.
-	
-2001-07-16  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Sepllcheck.
-
-2001-07-15  Kevin Breit  <battery841@mediaone.net>
-
-	* C/config-sync.sgml: Updated slightly for new design.
-
-2001-07-13  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mainwindow.sgml: Added lots of good stuff with the first time druid.
-
-2001-07-12  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: TYPO fixing.
-
-2001-07-12  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Added "get bt for component-only crash" qandaentry.
-
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* */Makefile.am (dist-hook): Clean up make dist.
-
-2001-07-11  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution.sgml: validation on usage-mainwindow and usage-contact.	
-
-2001-07-11  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: More edits.
-
-	* C/usage-contact.sgml: Sick amounts of changes too!
-
-	* C/usage-mail-org.sgml: Heavy editing...touched almost everything.
-
-	* C/usage-exec-summary.sgml: Minor change.  There was only one change for this chapter, cuz I'm such a 'godly' writer...yeah.
-
-	* C/usage-mainwindow.sgml: A bit of editing.
-
-	* C/preface.sgml: Screwed with the examples and did some cleanup.
-
-2001-07-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: validation.
-
-2001-07-10  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Added <application> tags
-
-	* C/usage-mail-org.sgml: Added <application> tags
-
-	* C/config-prefs.sgml: Added <application> tags
-
-2001-07-09  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-exec-summary.sgml: Editing
-
-	* C/usage-mail.sgml: Editing
-
-	* C/usage-mail-org.sgml: Editing
-
-	* C/usage-calendar.sgml: Editing
-
-	* C/usage-contact.sgml: Editing
-
-	* C/usage-mail-org.sgml: Mention UNMATCHED
-
-	* C/usage-mail.sgml: Commented on trash being a vFolder
-
-2001-07-06  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Spell check
-
-	* C/usage-calendar.sgml: Spell check
-
-2001-07-05  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mainwindow.sgml: Added orderedlists.
-
-	* C/usage-exec-summary.sgml: Added orderedlists.
-
-	* C/usage-contact.sgml: Added orderedlists.
-
-	* C/usage-mail-org.sgml: Added orderedlists.
-
-2001-07-03  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Put in lots of orderedlists...more SGML, less
-	for the user to read.  They'll thank me in droves later.
-
-	* C/usage-exec-summary.sgml: Fixed build error
-
-2001-06-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* white-papers/mail/camel.sgml: Updated slightly.
-
-	* Camel-Classes: Updated.
-
-2001-07-02  Kevin Breit  <battery841@mediaone.net>
-
-	* C/apx-common-tasks.sgml: Created its own file.
-
-	* C/usage-mainwindow.sgml: You name it.
-
-	* C/preface.sgml: Pulled shortcuts from here into its own apx
-
-	* C/evolution.sgml: Reordered entities
-	
-2001-06-30  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Pulled organizing stuff, made its own file.
-
-2001-06-26  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Revised move/rename/copy questions, now
-	that these functions work.
-
-2001-06-25  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Now that bug-buddy works with our
-	bugzilla, update faq to reflect it.
-
-2001-06-25  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Put config-encryption in usage-mail.sgml.
-	config-encryption.sgml should be depreciated.
-
-	* C/usage-contact.sgml: Fixed typo
-
-	* C/usage-mail.sgml: Added info about mailing lists Elaborated on
-	mailing lists
-
-	* C/usage-exec-summary.sgml: Fixed a few typos
-
-	* C/preface.sgml: Added section for importing files
-
-	* C/usage-calendar.sgml: Removed some *'s that are causing
-	problems.
-
-2001-06-22  Kevin Breit  <battery841@mediaone.net>
-
-	* C/preface.sgml: Put in Contacts information in the quicktasks.
-
-	* C/usage-mail.sgml: Pulled some redundant information.
-
-2001-06-21  battery841  <battery841@mediaone.net>
-	
-	* C/preface.sgml, C/fig/mail-inbox.png, C/fig/mainwindow-pic.png,
-	C/usage-mail.sgml: Updated screenshots and redid layout for
-	graphics on pages.
-	
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-	
-	* C/usage-contact.sgml: Fixed .gif problem
-		
-	* C/usage-mail.sgml:
-	
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Specify the file format
-
-	* C/usage-contact.sgml, C/usage-mail.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-		
-	* C/usage-mail.sgml: Trying to fix the .gif problem
-
-	* C/fig/calendar.png, C/fig/contact.png, C/usage-calendar.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Redid graphics to add labels to them and
-		described the labels in text.
-
-	* C/config-encryption.sgml, C/evolution.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/evolution.sgml: Added config-encryption.sgml for building
-
-	* C/fig/calendar.png, C/fig/config-cal.png, C/fig/config-mail.png,
-	C/fig/filter-assist-fig.png, C/fig/filter-new-fig.png,
-	C/fig/mail-composer.png, C/fig/mail-druid-pic.png,
-	C/fig/mail-inbox.png, C/fig/print-dest.png,
-	C/fig/print-preview.png, C/fig/vfolder-createrule-fig.png:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/fig/*png: Updated graphics for newer UI.
-
-	* C/fig/full-1.png, C/fig/full-2.png, C/fig/full-3.png,
-	C/fig/full-4.png, C/fig/full-5.png, C/fig/full-6.png,
-	C/fig/full-7.png, C/fig/mainwindow-pic.png, C/usage-mail.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Redid graphics to add labels to them and
-	described in labels in text.  Looks good!
-
-	* C/usage-encryption.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/encryption.sgml: Added file
-
-	* C/preface.sgml:
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/ChangeLog: Moved my entires to doc/ChangeLog per request of
-	danw
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-contact.sgml: Fixed .gif problem
-
-	* C/usage-mail.sgml: Specify the file format
-	
-	* C/usage-mail.sgml: Trying to fix the .gif problem
-	
-	* C/usage-calendar.sgml: Redid graphics to add labels to them and
-	described the labels in text.
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/evolution.sgml: Added config-encryption.sgml for building
-
-	* C/fig/*png: Updated graphics for newer UI.
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Redid graphics to add labels to them and
-	described in labels in text.  Looks good!
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/encryption.sgml: Added file
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* ChangeLog: Moved my entires to doc/ChangeLog per request of danw
-	
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/config-setupassist.sgml: Updated for new UI.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-sync: Reworded a little bit for more descrip.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Documented categorizing an event.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Updated Bcc: example
-
-2001-06-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: A couple changes to Kevin's update.
-
-2001-06-19  Kevin Breit <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Basic edits
-	
-2001-06-19  Kevin Breit <battery841@mediaone.net>
-
-	* C/usage-exec-summary: Updated to say "My Evolution"
-
-2001-06-19  Kevin Breit <battery841@mediaone.net>
-
-	* C/apx-gloss.sgml: Added definition.
-
-	* C/usage-mainwindow.sgml: Routine updates.
-	
-2001-06-07  Duncan Mak  <duncan@lumox.simplemente.net>
-
-	* C/evolution-faq.sgml: Fixed a typo. Thanks to Greg Leblanc for
-	pointing this out.
-
-2001-05-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/evolution-faq.sgml: Re-indented.
-
-2001-05-18  Duncan Mak  <duncan@ximian.com>
-
-	* C/evolution-faq.sgml: Added two questions about importing
-	Outlook (text from Iain).  Fixed some tags and cleaned up a bit
-	here and there.
-
-2001-05-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/evolution-faq.sgml: Added a question about the permission
-	issues with /var/spool/mail.
-
-2001-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/Makefile.am (SGML_FILES): Renamed to `GUIDE_SGML_FILES'.
-	(EXTRA_DIST): Add `$(FAQ_SGML_FILES)'.
-	(all): Depend on `evolution-faq' too.
-	(evolution-faq): New.
-	(install-data-local): Depend on `evolution-faq' too.  Install the
-	FAQ into `$(evolution_helpdir)/evolution-faq' and the guide into
-	`$(evolution_helpdir)/evolution-guide'.
-
-	* C/evolution-faq.sgml: New.
-
-2001-04-23  Jon Trowbridge  <trow@ximian.com>
-
-	* C/Makefile.am (install-data-local): Changed dependency for
-	install-data-local from "evolution" to "evolution-guide".
-
-2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/Makefile.am (evolution-guide): Use `$(srcdir)' here.
-
-2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/Makefile.am (SGML_FILES): Add `evolution.sgml'.
-	(evolution-guide): Process `evolution.sgml', not
-	`evolution-guide.sgml'.
-	(dist-hook): s/evolution-guide/evolution/
-	(install-data-local): Likewise.
-
-2001-02-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-authors.sgml: s/helixcode/ximian (How I missed this page
-	on the first go-round I don't know).
-
-2001-03-14  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* C/Makefile.am: there's no apx-fdl.sgml and evolution-guide.sgml
-	anymore
-
-2001-02-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: IMAP subscriptions stuff.
-
-2001-02-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Advanced search/show all/save search stuff.
-
-	* C/evolution.sgml: This file replaces evolution-guide.sgml, for
-	Nautilus Readiness.
-
-	* C/apx-gloss.sgml: glossterm conduit.
-
-	* C/config-sync.sgml: Glossterm conduit.
-
-	* C/preface.sgml: Checked over for Keyboard-Shortcut and other
-	truthfulness.
-
-2001-02-15  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Validated. Verified. Markup fixed in
-	several individual files.
-
-	* C/apx-gpl.sgml: cvs-removed for GNOME 1.4 compliance.
-
-	* C/apx-fdl.sgml: cvs-removed for GNOME 1.4 compliance.
-
-2001-02-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-sync.sgml: Overhaul. Now accurate and truthful and
-	clear.
-
-	* C/usage-calendar.sgml: Minor Changes.
-
-2001-02-08  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Minor Changes.
-
-	* C/usage-mail.sgml: Minor Changes.
-
-2001-02-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Added section, but left blank til UI stabilizes.
-
-	* C/usage-exec-summary.sgml: A little functionality described.
-
-	* C/usage-mainwindow.sgml: Added tasks and Exec-summary.
-
-	* C/usage-calendar.sgml: Describe semi-autonomy of task pad.
-
-2001-02-06 Aaron Weber <aaron@ximian.com>
-
-	* C/usage-contact.sgml: s/contact manager/address book/ and
-	revised text.
-
-	* C/usage-exec-summary.sgml: New file. Describes Executive
-	Summary.
-	
-2001-01-19  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: More of Megan's revisions, and Field Chooser
-	functions in the Sort section.
-
-	* C/apx-gloss.sgml: added "ToolTip"
-
-2001-01-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: s/Helix Code/Ximian, and Megan's comments.
-
-	* C/usage-mainwindow.sgml: s/Helix Code/Ximian/, and Megan's
-	comments.
-
-	* C/evolution-guide.sgml: s/Helix Code/Ximian/
-
-2000-12-13  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Revisions as suggested by Dan.  Especially to
-	filter dialogs... which still need some renaming, IMHO.
-
-	* C/usage-mainwindow.sgml: Revisions as suggested by
-	Dan. Especially to the Folder Limits thing, which still upsets me
-	somehow.
-
-	* C/preface.sgml: Revisions as suggested by Dan.
-
-2000-11-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-setupassist.sgml: added some <glossterms>, added
-	linkends to existing glossterms.
-
-2000-11-28  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Changed intro to Config section. Now
-	defines what, exactly, "configurable" means.
-
-	* C/usage-print.sgml: Stylistic revisions.
-
-	* C/usage-calendar.sgml: Stylistic revisions.
-
-	* C/usage-contact.sgml: Stylistic revisions.
-
-2000-11-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Message heading Right-Click Menu.
-
-2000-11-03  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: The regexp example was quite wrong. Props to
-	Sasha.
-
-2000-11-02  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Style and spelling.
-
-2000-11-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed validation errors.
-
-	* C/apx-gloss.sgml: Fixed HTML, style stuff.
-
-	* C/usage-mail.sgml: Stylistic overhaul.
-
-	* C/usage-mainwindow.sgml: Fixed groups in shortcut bar, fixed
-	folder navigation tips.
-
-2000-10-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor stylistic revisions.
-
-2000-10-30  Aaron Weber  <aaron@helixcode.com>
-
-	* COPYING-DOCS: New file. This is the official place to put the
-	FDL now.
-	
-
-2000-11-01  Radek Doulik  <rodo@helixcode.com>
-
-	* Keybindings: added composer keybindings description
-
-2000-10-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Actions -> New Directory Server added.
-
-	* C/config-prefs.sgml: Actions -> New Directory Server added.
-
-	* C/usage-contact.sgml: Actions -> New Directory Server added.
-
-	* C/menuref.sgml: Added mail Settings->Manage Subscriptions menu.
-
-	* C/usage-mail.sgml: Subscriptions section added. Quite
-	incomplete, though.
-
-2000-10-11  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Re-checked validity of all files. Made
-	minor changes to menuref.sgml, usage-mail.sgml, usage-print.sgml
-	to bring up to spec.
-
-	* C/usage-mail.sgml: Redid Filter & Vfolder to match the new &
-	improved functionality.
-
-	* C/fig/*: Re-did remaining screenshots.
-
-2000-10-10  Aaron Weber  <aaron@helixcode.com>
-	
-	* C/usage-print.sgml: New file, describing printing and
-	print-preview.
-
-	* C/fig/print-preview.png: New file.
-
-	* C/fig/print-dest.png: New file.
-
-	* C/evolution-guide.sgml: Added usage-print entity.
-
-	* C/menuref.sgml: Fixed calendar menu stuff.
-
-	* C/usage-mail.sgml: No more "Actions" menu, other assorted
-	menu-related changes.
-
-2000-10-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ * replaced a whole bunch of screenshots.
-
-2000-10-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Described Search features.
-
-	* C/menuref.sgml: Contact Manager menus fixed.
-
-2000-10-04  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Fixed glossterms.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames, spellchecked.
-
-	* C/apx-gloss.sgml: Added "Inline," "VCard".
-
-	* C/usage-mainwindow.sgml: Fixed glossterms,
-	filenames. Spellchecked.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames. Spellchecked.
-
-	* C/evolution-guide.sgml: New Legalnotice. Removed FDL and GPL,
-	  which are now included as part of the gnome-help package.
-
-	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and
-	responded to clahey's suggestions-- notably, commented out the
-	"add to master list" category feature.
-
-	* C/usage-calendar.sgml: Spellcheck. Fixed wording, event overlap
-	description.
-	
-	* C/evolution-guide.sgml: Spellcheck. Commented out Notes
-	entities.
-
-	* C/usage-notes.sgml: Spellchecked, then decided to comment out
-	this file/chapter and all references to it, since it's unlikely to
-	be implemented any time soon.
-
-	* C/config-setupassist.sgml: Spellcheck. Other minor updates. May
-	  need more work in the near future.
-
-	* C/usage-sync.sgml: Now it's really short. And spelled correctly.
-
-2000-10-03  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Mostly spelling. Still needs major
-	alteration.
-
-	* C/menuref.sgml: s/Appintment/Appointment, fixed small errors,
-	ran spellcheck. Still needs lots of work, since many menus have
-	changed.
-
-	* C/apx-gloss.sgml: Added Virus, Protocol, fixed vFolder,
-	spellchecked.
-
-2000-09-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: Added sendmail and SMTP.
-
-2000-09-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Changed to reflect new menu layout.
-
-	* C/usage-mainwindow.sgml: Changed to reflect new menu
-	layout. Again.
-
-	* C/usage-contact.sgml: Stop and Display All features.
-
-2000-09-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Switched to the "official" FSF markup.
-	  I will have to make changes to the markup-- adding ids, etc, or
-	  switch to another version of the markup. Pending discussion by
-	  GDP.
-
-	* C/apx-authors.sgml: Changed Matt Loper's email address to
-	loper.org; added Jeff Stedfast and Peter Williams to authors list,
-	realphebetized.
-
-	* C/config-prefs.sgml: Revision to reflect current options
-	labelling.
-
-	* C/evolution-guide.sgml: Changes to part intros.
-
-	* C/preface.sgml: Spelling and menu fixes.  Will need more work
-	tomorrow.
-	
-2000-09-20  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed sig stuff here and in setupassist.
-
-	* C/config-sync.sgml: Fixed description of conduit usage.
-
-2000-09-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Spelling fixes, etc.
-
-2000-09-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* C/Makefile.am: Fixed to install the stylesheet-images as well.
-
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ New files: contact-editor.png, mail-composer.png,
-	filter-assist-fig.png, mail-inbox.png
-
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Redid "soft" intro stuff.
-
-	* C/evolution-guide.sgml: Accidentally broke docs, now valid.
-
-2000-09-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Editing, proofing.
-
-2000-09-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Grammar, links, screenshots.
-
-	* fig/* Re-took most screenshots.
-
-	* C/usage-mail.sgml: Filters, proofing.
-
-2000-09-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added coverage of news, clarified POP/IMAP
-	distinction (there's a theme to these four log entries here).
-
-	* C/usage-mail.sgml: Added coverage of news.
-
-	* C/config-setupassist.sgml: Revised mail sources content for
-	IMAP/POP stuff.
-
-	* C/apx-gloss.sgml: Added IMAP and POP.
-
-2000-08-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: Added regular expressions to glossary.
-	Explanation should be removed from other portions of the book now.
-
-	* C/usage-mainwindow.sgml: Revisions, minor.
-
-	* C/apx-menuref.sgml: Now named menuref.sgml, to reflect its new
-	status as a part.
-
-	* C/evolution-guide.sgml: Structural alterations: Menuref is now a
-	part, not an appendix.
-
-	* C/apx-menuref.sgml: Added contextual menus for mail.
-
-	* C/preface.sgml: Added "quickref and pointers" sections. Props to
-	  O'Reilly for the copy of Outlook in a Nutshell which gave me the
-	  idea.
-
-2000-08-30  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: Minor fixes.
-
-	* C/preface.sgml: Corrected grammar, added glossterms, described
-	menuref.
-
-2000-08-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Redid filter and vFolder assistant
-	descriptions.
-
-	* C/fig/filter-new-fig.png: Replaced with new assistant pic.
-
-	* C/fig/filter-assist-fig.png: New file, showing only assistant.
-
-	
-	* C/apx-menuref.sgml: Finished message composer and calendar
-	editor menus. Looked at Contact Editor menus and decided to
-	document those features after implementation.
-
-2000-08-24  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Message Composer File and Edit menus.
-
-2000-08-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Added editor sections.
-	
-	* C/evolution-guide.sgml: Included Menu Reference Appendix.
-
-2000-08-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Minor markup changes.
-
-	* C/apx-menuref.sgml: New File. Menu Reference. Still needs much
-	work, but not bad for an evening.
-
-2000-08-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Kevin's diff applied, with minor changes.
-
-2000-08-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Fixed bugs in validation. Went home to
-	sleep.
-
-	* C/usage-mainwindow.sgml: Redid menubar description.
-	
-
-	* C/config-prefs.sgml: Added coverage of folder config, requested
-	that feature be transferred to config section. Switched to
-	variablelist in "Other" config section.
-
-	* C/usage-mail.sgml: Added coverage of right-click on messages,
-	threaded-view.
-
-	* C/usage-mainwindow.sgml: Right-click on folder menu reinstated.
-
-2000-08-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added news server coverage.  Other config
-	proofing changes.
-	
-
-2000-08-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gpl.sgml: New file.  Contains contents of "COPYING", but
-	marked up (probably not very well, but valid) as docbook
-	(SGML).
-
-	* C/evolution-guide.sgml: Subtle change to the legal notice:
-	distinguished manual license from software license. Linked to
-	apx-gpl.sgml above.
-
-	* C/usage-calendar.sgml: I redid all the usage files.
-
-2000-07-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Added password remembering/forgetting
-	feature.
-
-	* C/config-prefs.sgml: Mostly moved to variablelists, a few
-	language changes.
-
-	* C/config-setupassist.sgml: Minor changes to formatting, wording.
-
-	* C/usage-notes.sgml: Changed trademark references, other minor
-	changes.
-
-	* C/usage-calendar.sgml: Minor fixes, added additional calendar
-	section, removed references to unimplemented features. Spellcheck,
-	prep for 0.3 release.
-	
-2000-07-19  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: lots of minor fixes to language. added
-	desc. of clahey's cool button-address thing.
-
-	* C/usage-mainwindow.sgml: fixed itemizedlists, ch. to shortcut
-	bar & folder descs, removed refs to trash.
-
-2000-07-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Altered category addition stuff, plus
-	suggestions from Kevin.
-
-	* C/apx-gloss.sgml: Added ldap and signature definitions (from
-	Kevin).
-
-	* C/usage-mail.sgml: Move to variablelists from itemizedlists.
-
-2000-07-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: moved to variablelists from itemizedlists
-	* C/usage-calendar.sgml: moved to variablelists from itemizedlists
-
-2000-06-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor fixes.
-
-	* C/usage-notes.sgml: New File for feature that is yet to come.
-	* C/evolution-guide.sgml: Added entity for notes chapter.
-	* C/usage-mainwindow.sgml: Un-commented references to notes section.
-	
-	* C/apx-authors.sgml: Removed dcm from author list.
-
-	* C/usage-calendar.sgml: Added to-do list features.
-
-2000-06-28  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: commented out future features; redid
-	contact editor stuff.
-
-	* C/apx-gloss.sgml: Removed "live doc" and added "minicard"
-
-2000-06-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/devel-action.sgml: Removed file.
-	* C/devel-script.sgml: Same.
-	* C/devel-component.sgml: Same.
-	* C/preface.sgml: Removed references to devel section.
-	* C/evolution-guide.sgml: Removed references to devel section.
-
-2000-06-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Made moderate to major stylistic updates
-	to this, apx-gloss.sgml, and to all files beginning with "usage,"
-	especially wrt HTML mail.
-	
-
-2000-06-15  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Category stuff improved.
-
-	* C/usage-calendar.sgml: Now covers how to add an event properly.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Added the devel directory.
-
-2000-06-28  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* C/Makefile.am (SGML_FILES): Don't depend on the newly-removed
-	devel-*.sgml files.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* C/.cvsignore: added evolution-guide and evolution-guide.junk
-	so we don't get the '? doc/C/evolution-guide' messages each time we
-	do a cvs update.
-
-2000-06-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.
-
-	* C/usage-mail.sgml: Improved filter and vfolder
-	description, and some minor changes from me and Kevin.
-
-2000-06-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: finished adding calendar prefs. screenshots.
-	* C/fig/config-cal.png: new file (screenshot for above)
-	* C/fig/config-mail.png: same
-	
-2000-06-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-calendar.sgml: Incorporated chgs from Kevin.
-	
-	* C/config-prefs.sgml: began total overhaul of structure and added
-	content reflecting new prefs items.  needs LOTS more work.
-
-	* C/usage-mail.sgml: changed some references to id's in the 
-	config-prefs section.	
-
-	* C/fig/config-mail.png: changed filename from config-prefs.png
-
-2000-06-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: filename was wrong, altered.
-
-	* C/usage-mail.sgml: improved filter instructions, vFolder
-	instructions.  still need work though.
-	
-
-	* C/usage-contact.sgml: added screenshot.
-
-	* C/usage-calendar.sgml: added screenshot.
-
-	* C/config-prefs.sgml: added screenshots, and now describes the
-	actual prefs dialogs.
-
-	* C/fig/config-camel.png: new (screenshot) file
-	* C/fig/filter-druid.png: same
-	* C/fig/vfolder-druid.png: same
-	* C/fig/calendar.png: same
-	* C/fig/contact.png: same
-	* C/fig/vfolder-createrule-fig.png: same
-	* C/fig/filter-new-fig.png: same
-	* C/fig/config-camel.png: same
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: recurse into the C directory
-
-	* C/Makefile.am: Rules to build and install the docs. Mostly
-	stolen from gnomecal. Only works if you have GDP stuff
-	(http://www.gnome.org/gdp/) set up on your machine, but won't make
-	the build fail if you don't.
-
-2000-05-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: incorporated kevins notes.
-	* C/usage-mainwindow.sgml: incorporated kevins notes.
-
-2000-05-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: added Kevin Breit to author and
-	copyright.
-
-	* C/apx-authors.sgml: Put app authors in a simplelist.
-
-	* C/usage-mail.sgml: Removed USAGE-SETUP insertion, added xref to send
-        users to config-setupassist chapter. This and the following changes 
-	take setup druid coverage out of usage 
-	section and put it in config section. 
-	* C/config-setupassist.sgml: Added mail druid coverage from
-	usage-setup.sgml.
-	* C/usage-setup.sgml: Removed file. contents in
-	config-setupassist.sgml.  
-	* C/evolution-guide.sgml: Removed
-	USAGE-SETUP entity (and file usage-setup.sgml.)
-
-	
-2000-05-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/mainwindow-pic.png: new file
-	* C/fig/mail-druid-pic.png: new file
-	* C/fig: New directory, for figure graphics.
-
-	* C/apx-gloss.sgml: new file. glossary. thx. to kevin from chicago.
-	
-	* C/usage-setup.sgml: More accurate description of druid, and
-	moved to mail section-- see usage-mail.sgml entry.  This is a new
-	location for this entity, and it may move more later.
-	
-
-	* C/usage-mainwindow.sgml: altered description of starting
-	evolution. added screenshot for main-window picture. 
-
-	* C/usage-mail.sgml: added screenshots, added coverage of setup
-	druid and put it into get-and-send section, which is probably not
-	where it should stay.  Also started filter druid coverage and
-	clarified examples, esp. in Bcc: section.
-
-	* C/usage-contact.sgml: Clarified examples.
-
-	* C/preface.sgml: rewording of "what is" and "about book" sections.
-
-	* C/evolution-guide.sgml: added glossary entity APX-GLOSS, altered
-	phrasing in part intros, changed order of Setup-assistant section.
-
-	* C/config-prefs.sgml: changed wording, removed ref. to re-running
-	setup assistant.
-
-2000-05-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: removed.	
-
-	* C/apx-authors.sgml: new file.
-	* C/apx-bugs.sgml: same.
-	* C/apx-fdl.sgml: same.
-	* C/config-prefs.sgml: same.
-	* C/config-setupassist.sgml: same.
-	* C/config-sync.sgml: same.
-	* C/devel-action.sgml: same.
-	* C/devel-component.sgml: same.
-	* C/devel-script.sgml: same.
-	* C/evolution-guide.sgml: same.
-	* C/preface.sgml: same.
-	* C/usage-calendar.sgml: same.
-	* C/usage-contact.sgml: same.
-	* C/usage-mail.sgml: same.
-	* C/usage-mainwindow.sgml: same.
-	* C/usage-setup.sgml: same.
-	* C/usage-sync.sgml: same.
-
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	* Camel-Classes: sync
-
-2000-04-16  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: new file (doc sgml)
-	
-	* C/ : New directory for doc sgml & graphics
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/e-table.sgml: Added Miguel to the author
-	list for ETable.
-
-2000-03-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/, white-papers/widgets/e-table.sgml: New
-	doc for the ETable widget.
-
-	* ChangeLog: Created a ChangeLog file for the docs file and
-	integrated the individual ChangeLogs.
-
-2000-03-01  Dan Winship  <danw@helixcode.com>
-
-	* ibex.sgml: Ibex white paper
-
-2000-02-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Sections for the calendar user agent and the
-	calendar client library.
-
-2000-02-29  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Reorg a bit more, make the <PRE> section narrower,
-	add more references to graphics (the graphics themselves are
-	still in beta), add a section on CamelStream.
-
-2000-02-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Section for the personal calendar server.
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: add Bertrand to authors, edit his additions
-
-2000-02-28  bertrand  <bertrand@helixcode.com>
-
-	* camel.sgml: add a blurb about camel offering
-	uniform interface. needs style and grammar corrections. 
-	Talk about virtual folders.
-	Talk about lightweight messages
-	Talk about IMAP. 
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Beginnings of a Camel white paper
-
-2000-02-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: New file for the Evolution calendaring white paper.
diff --git a/help/Makefile.am b/help/Makefile.am
index b7e1ac6d1f..956e94a038 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -42,7 +42,6 @@ DOC_FIGURES =  \
 	figures/evo_mboxreceive_a.png 		\
 	figures/evo_memo_a.png 			\
 	figures/evo_mhreceive_a.png 		\
-	figures/evo_mail_notifier.png		\
 	figures/evo_memo_a.png			\
 	figures/evo_newmess_a.png 		\
 	figures/evo_newmail.png			\
diff --git a/help/de/de.po b/help/de/de.po
index b95d9dd251..e336e378a7 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -28,7 +28,7 @@ msgstr ""
 "Project-Id-Version: manual_evolution\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-30 12:59+0000\n"
-"PO-Revision-Date: 2010-05-10 21:12+0200\n"
+"PO-Revision-Date: 2010-05-10 21:20+0200\n"
 "Last-Translator: Christian Kirbach <christian.kirbach@googlemail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
diff --git a/help/es/es.po b/help/es/es.po
index 15535ca7a6..3ba0adef5a 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -7,12 +7,13 @@
 # Francisco Javier F. Serrador <serrador@openshine.com>, 2005, 2006.
 # Jorge Gonzalez <jorgegonz@svn.gnome.org>, 2009.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2009, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-help.gnome-2-28\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 20:23+0000\n"
-"PO-Revision-Date: 2010-03-30 08:52+0200\n"
+"POT-Creation-Date: 2010-04-17 18:26+0000\n"
+"PO-Revision-Date: 2010-05-16 11:19+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -565,10 +566,10 @@ msgstr "Novell, Inc"
 msgid "2002-2009"
 msgstr "2002-2009"
 
-#: C/evolution.xml:29(revnumber) C/evolution.xml:88(productnumber)
-#| msgid "2.10"
-msgid "2.30"
-msgstr "2.30"
+#: C/evolution.xml:29(revnumber) C/evolution.xml:37(revnumber)
+#: C/evolution.xml:88(productnumber)
+msgid "2.28"
+msgstr "2.28"
 
 #: C/evolution.xml:30(date) C/evolution.xml:38(date)
 msgid "September 2009"
@@ -578,10 +579,6 @@ msgstr "Septiembre de 2009"
 msgid "Akhil Laddha"
 msgstr "Akhil Laddha"
 
-#: C/evolution.xml:37(revnumber)
-msgid "2.28"
-msgstr "2.28"
-
 #: C/evolution.xml:40(para) C/evolution.xml:48(para) C/evolution.xml:56(para)
 #: C/evolution.xml:72(para)
 msgid "Radhika PC"
@@ -624,9 +621,8 @@ msgid "October 5, 2006"
 msgstr "5 de octubre de 2006"
 
 #: C/evolution.xml:78(releaseinfo)
-#| msgid "This manual describes version 2.28 of Evolution"
-msgid "This manual describes version 2.30 of Evolution"
-msgstr "Este manual describe la versión 2.30 de Evolution"
+msgid "This manual describes version 2.28 of Evolution"
+msgstr "Este manual describe la versión 2.28 de Evolution"
 
 #: C/evolution.xml:82(para)
 msgid ""
@@ -646,26 +642,21 @@ msgid "February 2008"
 msgstr "Febrero de 2008"
 
 #: C/evolution.xml:90(title) C/evolution.xml:7883(para)
-#| msgid "Evolution 2.28 User Guide"
-msgid "Evolution 2.30 User Guide"
-msgstr "Guía de usuario de Evolution 2.30"
+msgid "Evolution 2.28 User Guide"
+msgstr "Guía de usuario de Evolution 2.28"
 
 #: C/evolution.xml:95(title)
 msgid "About This Guide"
 msgstr "Acerca de esta guía"
 
 #: C/evolution.xml:96(para)
-#| msgid ""
-#| "This guide describes how to use and manage <trademark>Evolution</"
-#| "trademark> 2.28 client software. This guide is intended for users and is "
-#| "divided into the following sections:"
 msgid ""
 "This guide describes how to use and manage <trademark>Evolution</trademark> "
-"2.30 client software. This guide is intended for users and is divided into "
+"2.28 client software. This guide is intended for users and is divided into "
 "the following sections:"
 msgstr ""
 "Esta guía describe cómo usar y gestionar el cliente de <trademark>Evolution</"
-"trademark> 2.30. Esta guía está dirigida a los usuarios y se divide en las "
+"trademark> 2.28. Esta guía está dirigida a los usuarios y se divide en las "
 "siguientes secciones:"
 
 #: C/evolution.xml:99(link) C/evolution.xml:160(title)
@@ -3628,7 +3619,7 @@ msgid ""
 "Expunge or press Ctrl+E."
 msgstr ""
 "Para borrar permanentemente todos los mensajes borrados en una carpeta, "
-"pulse Carpeta &gt; Compactar o pulse Ctrl+E."
+"pulse Carpeta &gt; Purgar o pulse Ctrl+E."
 
 #: C/evolution.xml:1508(para)
 msgid ""
@@ -12212,8 +12203,11 @@ msgstr ""
 "elemento original en el calendario del destinatario."
 
 #: C/evolution.xml:6116(para)
+#| msgid ""
+#| "An email is send to all the recipients to invite them to your updated "
+#| "event."
 msgid ""
-"An email is send to all the recipients to invite them to your updated event."
+"An email is sent to all the recipients to invite them to your updated event."
 msgstr ""
 "Se enviará un correo-e a todos los destinatarios, invitándoles a su "
 "acontecimiento actualizado."
@@ -13568,8 +13562,8 @@ msgid ""
 msgstr ""
 "Elija si desea borrar automáticamente los correos al salir de Evolution y "
 "con qué frecuencia, y también si desea confirmar la eliminación de los "
-"mensajes. Seleccione Confirmar antes de compactar una carpeta para confirmar "
-"la eliminación. Puede tener cuatro opciones diferentes para establecer la "
+"mensajes. Seleccione Confirmar antes de purgar una carpeta para confirmar la "
+"eliminación. Puede tener cuatro opciones diferentes para establecer la "
 "frecuencia para la eliminación: Cada vez, Una vez por día, Una vez por "
 "semana y Una vez por mes."
 
@@ -16166,7 +16160,7 @@ msgstr ""
 #: C/evolution.xml:0(None)
 msgid "translator-credits"
 msgstr ""
-"Jorge González <jorgegonz@svn.gnome.org>, 2007-2010\n"
+"Jorge González <jorgegonz@svn.gnome.org>, 2007-2009\n"
 "Francisco Javier F. Serrador <serrador@openshine.com>, 2005, 2006"
 
 #~ msgid ""
diff --git a/mail/ChangeLog b/mail/ChangeLog
deleted file mode 100644
index 90dceba510..0000000000
--- a/mail/ChangeLog
+++ /dev/null
@@ -1,17137 +0,0 @@
-2009-05-06  Jeff Cai <jeff.cai@sun.com>
-
-	** Fix for bug #524497
-	* em-composer-utils.c: (guess_account):
-	Change the order getting an account
-
-	The original order is:
-	1. The account in 'To' of the message.
-	2. The account of the message source.
-	3. The account of the folder source.
-
-	The new order is:
-	1. The account of the folder source.
-	2. The account of the message source.
-	3. The account in "To' of the message
-
-2009-04-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* em-filter-rule.c: (part_combobox_changed):
-	* em-filter-source-element.c: (source_changed):
-	Fix breakage of filter options.
-
-2009-04-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #579550
-
-	* mail-session.c: (main_get_filter_driver):
-	Do not mark messages recognized as junk Seen, to let user notice new
-	messages in a junk folder.
-
-2009-04-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #579635
-
-	* message-list.c: (regen_list_exec): Do not keep last junked messages
-	in a message list for folders not showing junks.
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #579306
-
-	* em-folder-utils.c: (em_folder_utils_delete_folder):
-	Do not free uninitialized variable.
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #563954
-
-	* message-list.c: (regen_list_exec): Sort UIDs before
-	using them to obtain proper order when without sorting.
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #552583
-
-	* mail-config.c: (mc_get_account_by), (get_source_url_string),
-	(get_transport_url_string), (mail_config_get_account_by_source_url),
-	(mail_config_get_account_by_transport_url):
-	Let the provider compare urls.
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* mail-config.glade:
-	* mail-dialogs.glade:
-	* em-composer-prefs.h:
-	* em-composer-prefs.c:
-	* em-subscribe-editor.c:
-	* em-filter-editor.c:
-	* em-filter-rule.c:
-	* em-filter-source-element.c:
-	* em-mailer-prefs.h:
-	* em-mailer-prefs.c:
-	* message-tag-followup.h:
-	* message-tag-followup.c:
-	Remove deprecated Gtk+ symbols.
-
-2009-04-15  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* mail/mail-ops.c: Corrected a typo error.
-
-2009-04-13  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #467659 (bnc)
-	* mail/mail-mt.c:
-	* mail/mail-ops.c: Set the description for send mail
-	operation.
-
-2009-04-13  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #471083 (bnc)
-	* mail/em-folder-utils.c:
-	* mail/mail-folder-cache.c:
-	* mail/mail-folder-cache.h: Do not allow deleting
-	system folders.
-
-2008-04-04  Tobias Mueller  <tobiasmue@gnome.org>
-
-	** Fix for bug #569765
-
-	* message-list.c: Don't keep the selected message in the message 
-	list if it is removed from the folder.
-	Patch by Matt McCutchen <matt@mattmccutchen.net>
-
-2009-04-02  Milan Crha  <mcrha@redhat.com>
-
-	* em-folder-tree.c: (em_folder_tree_get_selected_folder):
-	Do not ask for a folder when no folder selected.
-
-2009-03-31  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #576921
-
-	* mail/em-mailer-prefs.h: Remove needless GtkListStore objects.
-
-2009-03-28  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #576921
-
-	* mail/em-mailer-prefs.h: Remove needless GtkListStore objects.
-	* mail/em-mailer-prefs.c: Use dispose instead of finalize.
-	(em_mailer_prefs_dispose): Unref header_list_store.
-	(init_junk_tree), (init_label_tree): Returns gboolean value instead
-	of GtkListStore object. Unref GtkListStore right after
-	gtk_tree_view_set_model.
-
-2009-03-28  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #576845
-
-	* em-mailr-prefs.c: (init_junk_tree):
-	Call jh_tree_refill instead of label_tree_refill.
-
-2009-03-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #552583
-
-	* mail-config.c: (only_username), (mail_config_account_url_equal):
-	Compare only user names, without a domain part, if such exists.
-
-2009-03-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #504767
-
-	* em-folder-utils.h: (em_folder_utils_create_folder):
-	* em-folder-utils.c: (em_folder_utils_create_folder):
-	* em-folder-selector.c: (emfs_response):
-	Inherit modality from a parent's window, if any.
-	* em-folder-browser.c: (emfb_folder_create):
-	* em-folder-tree.c: (emft_popup_new_folder):
-	* mail-component.c: (create_item):
-	Propagate changes in function prototype.
-
-2009-03-08  David Planella  <david.planella@gmail.com>
-
-	Added Catalan translation of the Evolution welcome e-mail
-
-	* default/Makefile.am: Added Catalan (ca) to the list of
-	subdirectories
-	* default/ca/Inbox: Added Catalan translation by David Planella
-	* default/ca/Makefile.am: Created Makefile template
-
-2009-03-04  Milan Crha  <mcrha@redhat.com>
-
-	* mail-ops.c: (empty_trash_exec): Do not unref NULL object.
-
-2009-03-02  Matt McCutchen  <matt@mattmccutchen.net>
-
-	* evolution/mail/em-folder-view.c:
-	* evolution/mail/em-utils.c:
-	* evolution/mail/em-utils.h:
-	* evolution/mail/em-popup.c:
-	Revert evolution revision 37063 (workaround for bug 563867). 
-	
-	** Part of the fix for bug #549838
-
-2009-02-26  Andre Klapper  <a9016009@gmx.de>
-
-	* message-tag-followup-c:
-	Remove deprecated gtk_combo_set_case_sensitive() call as FALSE
-	IS already the default value for the case-sensitive property.
-
-2009-02-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572268
-
-	* em-subscribe-editor.c: (sub_fill_level):
-	Do not duplicate "Loading..." node when adding to existing node.
-
-2009-02-25  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #563212
-
-	* em-utils.c: (try_open_e_book_cb), (try_open_e_book),
-	(is_local), (em_utils_in_addressbook), (em_utils_contact_photo):
-	Ensure empty GError before filling it. Check if group is local based
-	on its base_uri. Adapt to new e_book_cancel behaviour.
-
-2009-02-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572543
-
-	* em-popup.c: (emp_standard_menu_factory):
-	Always look for alternative apps for application/octet-stream.
-
-2009-02-11  Andre Klapper  <a9016009@gmx.de>
-
-	* em-folder-browser.c:
-	* em-migrate.c:
-	Substitute some deprecated gtk+ functions.
-
-2009-02-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #569700
-
-	* em-format-html.c: (emfh_gethttp):
-	Stop reading from a network when operation was canceled.
-
-2009-02-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #333716
-
-	* em-format-html.c: (emfh_gethttp):
-	Do not store incomplete or broken files in a cache.
-
-2009-02-10  Milan Crha  <mcrha@redhat.com>
-
-	* em-format-html-display.c: (efhd_format_secure):
-	Format signature/encryption information nicer.
-
-2009-02-09  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #555888
-
-	* mail-config.glade:
-	* em-network-prefs.h: (struct _EMNetworkPrefs):
-	* em-network-prefs.c: (emnp_parse_ignore_hosts),
-	(emnp_load_sys_settings), (notify_proxy_type_changed),
-	(em_network_prefs_construct):
-	Do not overwrite user settings with system proxy settings.
-	Register signals at the end, when all widgets are read.
-	Hide socks settings, it is not used at the moment.
-
-	* em-utils.h: (em_utils_get_proxy_uri):
-	* em-utils.c: (em_utils_get_proxy_uri), (emu_proxy_setup):
-	* em-format-html.c: (emfh_gethttp):
-	Use proxy configurable within Evolution.
-
-2009-02-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #548623
-
-	* mail-config.glade:
-	* em-network-prefs.h:
-	* em-network-prefs.c: (emnp_set_sensitiveness),
-	(emnp_load_sys_settings), (notify_proxy_type_changed),
-	(em_network_prefs_construct), (emnp_set_markups):
-	No auto-proxy at the moment.
-
-2009-02-05  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #554458
-
-	* em-format.c: (em_format_describe_part):
-	Make content type from a mime type first.
-
-2009-02-04  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	** Fix for bug #568176
-	
-	* em-migrate.c: (em_migrate_setup_progress_dialog),
-	(em_migrate_close_progress_dialog), (em_migrate_set_folder_name),
-	(em_migrate_local_folders_1_4), (migrate_to_db):
-	Make the migration dialog look better.
-
-2009-02-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #569986
-
-	* mail/em-format-html-print.c: Handle printers while doing attachment
-	bar rendering.
-	* mail/em-format-html.c:
-	* mail/em-format.c:
-	* mail/em-format.h:
-
-2009-02-02  Matt McCutchen 2  <matt@mattmccutchen.net>
-
-	** Fix for bug #567935
-
-	* em-folder-tree.c (emft_popup_uvfolder): Don't use an uninitialized 
-	variable.
-
-2009-02-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-event.c:
-	* em-event.h:
-	* em-migrate.c:
-	Fix compiler warnings.
-
-2009-02-01  Johnny Jacob  <jjohnny@novell.com>
-
-	* em-event.h (struct _EMEventTargetFolderBrowser): Added.
-	* em-event.c (em_event_target_new_folder_browser): Added.
-	(EEventHookTargetMask emeh_folder_browser_masks): Added.
-	* em-folder-browser.c (emfb_init): New e-plugin Hook point.
-
-2009-01-30  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* message-list.c: (regen_list_exec): Fix compiler warnings
-
-2009-01-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-format-html-display.c: (efhd_update_bar),
-	(efhd_message_update_bar): Show attachment bar at all times. Seems
-	like the contents are missing at times.
-
-2009-01-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-format.c: (em_format_format_text): Handle empty messages well.
-
-2009-01-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #546637
-
-	* em-folder-view.c: (emfv_popup_source): Ensure uid for source view
-	also.
-
-2009-01-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #562449
-
-	* em-folder-view.c: (em_folder_view_mark_selected),
-	(emfv_delete_msg_response): Don't emit for vfolders.
-
-2009-01-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #567654
-
-	* message-list.c: (regen_list_exec): Don't free the reffable string.
-
-2009-01-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #561628
-
-	* em-format-html-print.c: (efhp_class_init):
-	Initialize 'parent_class' with its parent, not with itself.
-
-2009-01-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #204891
-
-	* filtertypes.xml:
-	* em-composer-utils.h: (em_utils_forward_message_raw):
-	* em-composer-utils.c: (emu_forward_raw_done),
-	(em_utils_forward_message_raw):
-	* mail-session.c: (ms_forward_to), (class_init):
-	Implement "forward-to" rule for message filters.
-
-2009-01-13  Felix Riemann  <friemann@svn.gnome.org>
-
-	** Fix for bug #563867
-
-	* em-folder-view.c (emp_uri_popup_link_copy):
-	* em-popup.c (emp_uri_popup_link_open):
-	* em-utils.c (em_utils_url_unescape_amp):
-	* em-utils.h:
-	Unescape "&amp;" when passing the link to browsers. 
-
-2009-01-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #566653
-
-	* mail-folder-cache.c: (folder_changed): Fix a leaked info
-
-2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-config.c:
-	* em-menu.c:
-	Remove unneeded #include <libgnome/gnome-url.h>
-
-	* em-folder-view.c (emfv_format_link_clicked):
-	* em-popup.c (emp_uri_popup_link_open):
-	Call e_show_uri() instead of gnome_url_show().
-
-2009-10-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-view.c:
-	* importers/mail-importer.c:
-	Remove unneeded #include <libgnome/gnome-util.h>.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-autofilter.c:
-	Remove unneeded #include <libgnomeui/gnome-app.h>.
-	Remove unneeded #include <libgnomeui/gnome-app-helper.h>.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #567280
-
-	* message-tag-followup.c:
-	Remove unneeded #include <libgnomeui/gnome-pixmap.h>.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #567285
-
-	* mail-autofilter.c:
-	Remove unneeded #include <libgnomeui/gnome-popup-menu.h>.
-
-2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>
-
-	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
-
-	* Fix for bug #566011
-
-	* mail-component.c (mail_component_class_init):
-	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h> and
-	add bindtextdomain().
-
-2009-01-08  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #565376
-
-	* vfoldertypes.xml:
-	* searchtypes.xml: Merge some search types together.
-	* em-vfolder-context.c: (vfolder_new_element): More elements.
-	* em-filter-folder-element.h: (struct _EMFilterFolderElement):
-	* em-filter-folder-element.c: (xml_encode), (xml_decode),
-	(folder_selected), (get_widget), (format_sexp):
-	Support storing folder uri in a camel's way.
-
-	* em-format-html-display.c: (efhd_use_component):
-	Compiler warning fix.
-
-2008-12-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #565857
-
-	* e-searching-tokenizer.c (searcher_next_token):
-	The HTMLTokenizer now expects a newly-allocated string from its
-	next_token() method, so duplicate the returned string.  This fixes
-	a memory leak whereby previously, some implementations of next_token()
-	did return a newly-allocated string, some did not.  Those that did
-	leaked those strings.
-
-2008-12-22  Sankar P  <psankar@novell.com>
-
-	** Part of fix for bug #559153
-
-	* em-migrate.c (update_progress_in_main_thread), (migrate_folders),
-	(count_folders), (migrate_folders_to_db_thread), (migrate_to_db),
-	(em_migrate):
-	Migration Improvements
-
-2008-12-22  Norman Wang  <zhichao.wang@sun.com>
-
-   ** Fix for bug #558337
-
-   * mail/em-subscribe-editor.c: Create a wrapper class MailMsgListNode of
-   _zsubscribe_msg message. The MailMsgListNode class is the subclass of
-   EDListNode class. So the _zsubscribe_msg can be added into the EDList.
-
-2008-12-16  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #552583
-
-	* mail-config.c: (mail_config_get_account_by_source_url),
-	(mail_config_get_account_by_transport_url): Do not leak.
-
-2008-12-15  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #564007
-
-	* em-format.c: (emf_inlinepgp_encrypted): Guess the decrypted
-	part mime type if not known from the decryptor, thus show the
-	content really inline, if possible.
-
-2008-12-15  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #563669
-
-	* em-account-editor.c: (emae_option_checkspin):
-	Use zero GtkSpinButton's PageSize, as Gtk+ requires.
-
-2008-12-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-format-html-display.c: Fix a impllicit warning
-
-2008-12-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #552583
-
-	* mail-config.c: (mail_config_get_account_by_transport_url): Free the
-	right url.
-
-2008-12-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for #546637
-
-	* message-list.c: (message_list_finalise), (regen_list_exec),
-	(regen_list_done): Don't loose uids.
-
-2008-12-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-
-	* em-format-html-display.c: (efhd_bonobo_unknown),
-	(efhd_find_handler), (efhd_bonobo_object),
-	(efhd_check_server_prop), (efhd_use_component),
-	(efhd_format_attachment): Restore the code for BONOBO components need
-	by the vcard inline viewer.
-
-2008-12-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-account-editor.c: (emae_option_checkspin):
-	* em-folder-tree.c: (emft_popup_uvfolder), (emft_popup): Add the
-	unread vfolder hack.
-
-2008-12-15  Lucian Langa  <lucilanga@gnome.org>
-
-	** Fixes bug #564519
-
-	* mail-send-recv.c: (build_dialog):
-	Count also deleted unsent messages when displaying SMTP server
-
-2008-12-13  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #564351 (patch by Tal Benavidor)
-
-	* em-icon-stream.c:
-	Fix single-header include issue for GdkPixbuf.
-
-2008-12-10  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #552357
-
-	* e-searching-tokenizer.c: (e_searching_tokenizer_begin):
-	Function prototype changed.
-
-2008-12-10  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #563870
-
-	* vfoldertypes.xml:
-	* filtertypes.xml:
-	* searchtypes.xml: Use dynamic filter option.
-	* message-list.c: Drop unused header include.
-
-2008-12-09  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #552583
-
-	* mail-config.c: (mail_config_get_account_by_source_url),
-	(mail_config_get_account_by_transport_url): Extending Sankar's fix
-	of account checking logic a bit, to be more consistent.
-
-2008-12-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #563369
-
-	* em-folder-properties.c: (emfp_dialog_got_folder_quota):
-	* em-folder-tree-model.c: (em_folder_tree_model_set_folder_info):
-	* mail-component.c: (view_changed): Translate "Templates" folder name.
-
-2008-12-09  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #563669
-
-	* mail-config.glade:
-	Use zero GtkSpinButton's PageSize, as Gtk+ requires.
-
-2008-12-08  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #337082
-
-	* em-folder-tree.c: (emft_tree_row_expanded): Do not set we finished
-	with loading until we are really done with it. The previous behavior
-	can cause duplicate nodes in tree for subscribed folders.
-
-2008-12-08  Sankar P  <psankar@novell.com>
-
-	** Fixes bug #552583
-
-	* mail/mail-config.c: (mail_config_get_account_by_source_url)
-	(mail_config_get_account_by_transport_url):
-	Fix the errors in the account checking logic.
-
-2008-12-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #552583
-
-	* mail-config.c (mail_config_get_account_by_source_url),
-	(mail_config_get_account_by_transport_url):
-	For the purpose of matching a URL to an EAccount, only compare
-	the protocol, user, host and port and disregard the rest.
-
-2008-11-23  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #552850
-
-	* evolution-mail.schemas.in:
-	Prefer the term "side bar" over "folder tree".
-
-2008-11-19  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #555276
-
-	* mail/mail-vfolder.c: Don't load vfolder as subfolder.
-
-2008-11-13  Bharath Acharya  <abharath@novell.com>
-
-	* em-folder-view.c: (emfv_setting_notify):
-	* em-format-html.c: (efh_format_headers): Do not display the default 
-	headers when all the headers are disabled in Mail preferences.
-
-2008-11-12  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #524377
-
-	* mail-config.glade:
-	* evolution-mail.schemas.in:
-	* em-composer-prefs.c: (em_composer_prefs_construct):
-	* mail-config.c: (gconf_outlook_filenames_changed), (mail_config_init):
-	Declare, be able to change and listen to changes on new key,
-	'/apps/evolution/mail/composer/outlook_filenames' to encode file names
-	header in camel based on the RFC 2047, instead of the correct RFC 2231.
-
-2008-11-07  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fix for bug #552583
-
-	* mail-config.c: (mail_config_get_account_by_source_url): 
-	Instead of preserving the authmech attribute in the two URLs 
-	being compared, strip the attributes out of both URLs and just do 
-	a simple string comparison.  We're just trying to match a URL to 
-	an account here.  The authentication method shouldn't be relevant.
-
-2008-11-07  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for BNC bug #437226
-
-	* em-format-html.c (efh_format_headers): Regression caused by r35319.
-	Check for the condition only after the while loop.
-	
-2008-11-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #559371
-
-	* em-composer-prefs.c (spell_language_save), (spell_setup):
-	Simplify the logic by using e_load_spell_languages() and
-	e_save_spell_languages().
-
-2008-11-04  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #386036
-
-	* vfoldertypes.xml:
-	* filtertypes.xml: Added new option "Sender or Recipients" which
-	filters on From/To/Cc/Bcc headers.
-
-2008-11-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #559042
-
-	* mail-config.glade:
-	Remove extra space in translated string.
-
-2008-11-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #557613
-
-	* em-utils.c (try_open_e_book):
-	Wait for try_open_e_book_cb() to run before freeing the EFlag.
-	It will run regardless of whether the EBook operation completes.
-
-2008-10-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #558726 (patch by Frederic van Starbmann)
-
-	* em-format-html.c (emfh_multipart_related_check):
-	Fix a potential format string crash.
-
-2008-10-31  Sankar P  <psankar@novell.com>
-
-	** Patch by Bharath Acharya <abharath@novell.com> 
-
-	* em-folder-tree.c (emft_popup):
-	Disable delete and rename on 
-	right click menu for the system folders 
-
-2008-10-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-send-recv.c:
-	* mail-send-recv.h:
-	Just some minor code polishing.
-
-2008-10-21  Sankar P  <psankar@novell.com>
-
-	* em-folder-view.c (emfv_spin):
-	Re-factor spinner usage	
-
-2008-10-20  Patrick Ohly  <Patrick.Ohly@gmx.de>
-
-	* mail-component.h: Fixed a build break.
-
-2008-10-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #438155
-
-	* message-list.h: (struct _MessageList):
-	* message-list.c: (message_list_init), (message_list_finalise),
-	(regen_list_done), (regen_list_free), (ml_regen_timeout),
-	(mail_regen_cancel): Guard access to the 'regen' list with a lock.
-
-2008-10-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #555276
-
-	* mail/mail-vfolder.c: Don't load a vfolder as a sub folder.
-
-2008-10-17  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #364542
-
-	* em-utils.c: (struct TryOpenEBookStruct), (try_open_e_book_cb),
-	(try_open_e_book), (em_utils_in_addressbook), (em_utils_contact_photo):
-	Stop when camel operation has been canceled. Also check for
-	cancellation when opening EBook, thus the UI (preview) will
-	not freeze with slow address books.
-
-2008-10-07  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #555203
-
-	* mail-session.c: (get_password): Use the url value in cases where the 
-	account goes NULL. Fixes the issue of Exchange not sending mails, 
-	because it does not have a valid transport url to use.
-
-2008-10-05  Sankar P  <psankar@novell.com>
-
-	** Fix for bug #554349
-
-	* mail/em-folder-browser.c:
-	Expand threads and select messages,
-	if user has given select-all.
-
-2008-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #554418
-
-	* em-utils.c: (em_utils_snoop_type):
-	* em-popup.c: (emp_standard_menu_factory):
-	Guess mime_type based on the filename only.
-
-2008-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #554458
-
-	* em-popup.c: (emp_standard_menu_factory):
-	Use content-type to call of g_app_info_get_all_for_type.
-
-2008-10-01  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* em-composer-utils.c:
-
-2008-09-30  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #545045
-
-	* mail-send-recv.c (build_dialog): Don't show SMTP in the
-	Send/Receive dialogue if there are no unsent mails.
-
-2008-09-30  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* mail-ops.c:
-
-2008-09-30  Sankar P  <psankar@novell.com>
-
-	* mail/message-list.c:
-	Remove unnecessary FIXME. 
-	normalized columns are for internal manipulation.
-
-2008-09-30  Sankar P  <psankar@novell.com>
-
-	** Committed on behalf of Hans Petter Jansson  <hpj@novell.com>
-
-	** Fix for bug #554107
-
-	* message-list.c (get_trimmed_subject), (ml_tree_value_at):
-	* message-list.etspec:
-	* message-list.h:
-	Add "Subject - Trimmed" column which enables to read 
-	mailing list mails in a better way.
-
-2008-09-29  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* mail-config.glade: Mark some forgotten strings for translation. Fixes bug #553067
-
-2008-09-29  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #530716
-
-	* mail-session.c: (user_message_response), (user_message_exec),
-	(user_message_response_free): Differentiate between response
-	with valid message pointer and with one already freed.
-
-2008-09-29  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #530691
-
-	* em-folder-utils.c: (emfu_delete_rec), (emfu_delete_done),
-	(emfu_delete_folders), (emfu_delete_response),
-	(em_folder_utils_delete_folder):
-	* mail-ops.h: (mail_remove_folder):
-	* mail-ops.c: (mail_remove_folder), (struct _remove_folder_msg),
-	(remove_folder_desc), (remove_folder_rec), (remove_folder_exec),
-	(remove_folder_done), (remove_folder_free):
-	Remove folders in its own thread, not in main thread.
-
-2008-09-29  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* em-filter-i18n.h:
-	* em-utils.c:
-	* importers/mail-importer.c:
-	* mail-config.c:
-	* message-list.c:
-
-2008-09-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #552583 (Suggested by Sebastian Keller)
-
-	* mail-session.c: (get_password):
-	Do not hide auth_mech from the URL.
-
-2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #552551
-
-	* em-folder-browser.c (emfb_search_search_activated): Add a NULL
-	check for search_word before calling strcmp.
-
-2008-09-25  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* mail-folder-cache.c:
-
-2008-09-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #313225
-
-	* message-list.c: (struct states_pixmaps), (ml_tree_value_at),
-	(message_list_create_extras): Show meeting icon in 'Attachment'
-	column on messages with '$has_cal' user flag set.
-
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* em-folder-browser.c:
-
-2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fixes bug #553479
-
-	* em-migrate.c (migrate_to_db):
-	* evolution-mail.schemas.in: String capitalisation improvements.
-
-2008-09-23  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #553273
-
-	* em-composer-utils.c: (em_utils_handle_receipt):
-	* em-folder-view.c: (emfv_delete_msg_response):
-	Always end e_error_run/e_error_new calls with NULL parameter.
-
-2008-09-22  Luca Ferretti  <elle.uca@libero.it>
-
-	* default/Makefile.am:
-	* default/it/Inbox:
-	* default/it/Makefile.am:
-	Added Italian translation for default email message.
-
-2008-09-22  Petr Kovar  <pknbe@volny.cz>
-
-	* default/cs/Inbox: Added Czech translation of default email
-	message by Jiri Eischmann.
-	* default/cs/Makefile.am: Ditto.
-	* default/Makefile.am: Ditto.
-
-2008-09-21  Wadim Dziedzic  <wdziedzic@aviary.pl>
-
-	* default/pl/Inbox: Updated Polish translation
-
-2008-09-19  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* default/lt/Inbox: Updated Lithuanian translation.
-
-2008-09-19  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* em-folder-tree-model.c:
-	* em-folder-tree.c:
-	* em-folder-view.c:
-	* em-format-html-display.c:
-	* em-format-html.c:
-	* em-migrate.c:
-	* mail-component.c:
-
-2008-09-17  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* default/hu/Makefile.am: Add this too
-
-2008-09-17  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* default/hu/Inbox: Default welcome mail translation added.
-	* default/Makefile.am: Added hu
-
-2008-09-16  Goran Rakić  <grakic@devbase.net>
-
-        * default/Makefile.am:
-        * default/sr/*, default/sr@latin/*: Added Serbian welcome message translation.
-
-2008-09-16  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* em-account-editor.c:
-	* em-account-prefs.c:
-	* em-format.c:
-	* em-message-browser.c:
-	* em-popup.c:
-	* em-subscribe-editor.c:
-	* importers/pine-importer.c:
-	* mail-mt.c:
-	* mail-send-recv.c:
-
-2008-09-16  Wouter Bolsterlee  <wbolster@svn.gnome.org>
-
-	* default/nl/Inbox: Updated Dutch translation by Tino Meinen.
-
-2008-09-16  Ilkka Tuohela <hile@iki.fi>
-
-	* default/fi/Inbox: Updated Finnish default mailbox.
-
-2008-09-16  Claude Paroz  <claude@2xlibre.net>
-
-	* default/fr/Inbox: Updated French translation.
-
-2008-09-15  Daniel Nylander <po@danielnylander.se>
-
-	* default/sv/Inbox: Updated Swedish translation.
-
-2008-06-22  Sankar P <psankar@novell.com>
-
-	* Committed on behalf of Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #539536
-
-	* em-format.c: (struct default_headers):
-	* em-format-html.c: (efh_format_headers):
-	* em-format-html.c: (default_headers):
-	Add "Face" header to default headers and allow it to be hidden.
-
-2008-09-14  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #504767
-
-	* em-folder-tree.c: (emft_expand_node):
-	Expand also parent nodes, if necessary.
-
-2008-09-14  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #551915
-
-	* em-junk-hook.c: (struct manage_error_idle_data), (free_mei),
-	(manage_error_idle), (manage_error):
-	Manage error on idle, to call gtk functions in the main thread.
-
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* em-icon-stream.c:
-	* em-mailer-prefs.c:
-	* em-mailer-prefs.h:
-	* em-network-prefs.c:
-	* em-network-prefs.h:
-	* importers/evolution-mbox-importer.c:
-
-2008-09-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #534039
-
-	* mail-vfolder.c: (vfolder_load_storage): Load store to mail component
-	first, to have all notifications registered in time of adding rules.
-	* mail-folder-cache.c: (real_flush_updates): Dropped unnecessary and
-	offending code causing infinite loops when deleting search folder.
-
-2008-09-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #493298
-
-	* em-format-html-display.c: (efhd_image): Do not try to access widget
-	of the pury when the operation has been cancelled.
-
-2008-11-03  Ashish Shrivastava  <shashish@novell.com>
-
-	** Support for Non-intrusive error in calendar.
-
-	* mail-component.c: Remove common code between
-	  mailer and calendar and moved to
-	  e-util/e-non-intrusive-error-dialog.c
-
-2008-09-08  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #328216
-
-	* mail-send-recv.h: (mail_autoreceive_init):
-	* mail-send-recv.c: (mail_autoreceive_init):
-	* mail-component.c: (mail_component_init): Pass 'session' as parameter
-	to the 'mail_autoreceive_init' to not create two MailComponents.
-	* mail-component.c: (impl_finalize): Do not free pointer twice.
-	* mail-component.c: (impl_finalize), (impl_quit): Call shutdown in time
-	of quit to shutdown camel, which will store changes in 'camel-cert.db'.
-
-2008-09-05  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail-folder-cache.c (real_flush_updates): Fix infinite loop on
-	deleting vfolders.
-
-2008-09-04  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* em-composer-prefs.c:
-	* em-event.c:
-	* em-folder-properties.c:
-	* em-folder-selection-button.c:
-	* em-vfolder-rule.c:
-	* em-vfolder-rule.h:
-	* mail-config.h:
-	* mail-session.c:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-searching-tokenizer.c:
-	* em-account-editor.h:
-	* em-composer-prefs.h:
-	* em-config.c:
-	* em-config.h:
-	* em-filter-context.c:
-	* em-filter-editor.c:
-	* em-filter-rule.c:
-	* em-filter-source-element.c:
-	* em-filter-source-element.h:
-	* em-folder-tree-model.h:
-	* em-folder-utils.c:
-	* em-folder-utils.h:
-	* em-folder-view.h:
-	* em-format-hook.c:
-	* em-format-html-print.h:
-	* em-format-quote.h:
-	* em-icon-stream.h:
-	* em-inline-filter.c:
-	* em-junk-hook.c:
-	* em-menu.c:
-	* em-migrate.h:
-	* em-stripsig-filter.h:
-	* em-sync-stream.c:
-	* em-utils.h:
-	* em-vfolder-editor.h:
-	* importers/elm-importer.c:
-	* mail-autofilter.c:
-	* mail-autofilter.h:
-	* mail-component-factory.c:
-	* mail-component.h:
-	* mail-config-factory.h:
-	* mail-crypto.c:
-	* mail-crypto.h:
-	* mail-folder-cache.h:
-	* mail-mt.h:
-	* mail-ops.h:
-	* mail-send-recv.h:
-	* mail-session.h:
-	* mail-signature-editor.c:
-	* mail-tools.c:
-	* mail-tools.h:
-	* mail-vfolder.c:
-	* mail-vfolder.h:
-	* message-list.h:
-
-2008-09-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-composer-utils.c (edit_message):
-	Don't mix declarations and code.
-
-2008-09-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #543135
-
-	* em-format-html-display.c: (efhd_format_optional):
-	Write error message to the right stream.
-	* message-list.c: (mail_regen_list), (regen_list_done): Do not try
-	to set information message to the message list when it's not visible.
-
-2008-09-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #534039
-
-	* mail-folder-cache.c: (real_flush_updates): Make sure search folder's
-	unread count will be tracked properly in a tree even before the folder
-	is opened in the UI. (The previous patch for this bug made this issue.)
-
-2008-09-01  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #549661
-
-	* em-folder-tree.c: (emft_drop_async__exec): Use
-	em_utils_selection_get_urilist() for DND_DROP_TYPE_TEXT_URI_LIST (and
-	not em_utils_selection_get_mailbox()).
-
-2008-08-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fix bug #544430
-
-	* em-folder-properties.c (emfp_get_folder_item):
-	Better formed translatable strings for quota usage.
-
-2008-08-30  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail/mail-component.c: Disable flag upsync. I need to implement it
-	more intelligently.
-
-2008-08-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #509647
-
-	* em-folder-utils.c: (emft_copy_folders__exec):
-	* mail-ops.c: (fetch_mail_exec), (send_queue_exec):
-	Do not expunge folder when something goes wrong.
-
-2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #534762
-
-	* evolution-mail.schemas.in:
-	* mail-config.glade: Change "addressbook" to "address book" in
-	translatable strings.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-searching-tokenizer.h:
-	* em-account-prefs.h:
-	* em-composer-utils.h:
-	* em-event.h:
-	* em-filter-context.h:
-	* em-filter-editor.h:
-	* em-filter-folder-element.c:
-	* em-filter-folder-element.h:
-	* em-filter-rule.h:
-	* em-folder-browser.h:
-	* em-folder-properties.h:
-	* em-folder-selection-button.h:
-	* em-folder-selection.c:
-	* em-folder-selection.h:
-	* em-folder-selector.c:
-	* em-folder-selector.h:
-	* em-folder-tree.h:
-	* em-format-hook.h:
-	* em-format-html-display.h:
-	* em-format-html-print.c:
-	* em-format-html.h:
-	* em-format-quote.c:
-	* em-format.h:
-	* em-html-stream.c:
-	* em-html-stream.h:
-	* em-inline-filter.h:
-	* em-junk-hook.h:
-	* em-menu.h:
-	* em-message-browser.h:
-	* em-popup.h:
-	* em-search-context.c:
-	* em-search-context.h:
-	* em-stripsig-filter.c:
-	* em-subscribe-editor.h:
-	* em-sync-stream.h:
-	* em-vfolder-context.c:
-	* em-vfolder-context.h:
-	* em-vfolder-editor.c:
-	* importers/mail-importer.h:
-	* mail-config-factory.c:
-	* mail-signature-editor.h:
-	* mail-types.h:
-	* message-tag-editor.c:
-	* message-tag-editor.h:
-	* message-tag-followup.c:
-	* message-tag-followup.h:
-
-2008-08-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #546926
-
-	* mail-session.c (mail_session_shutdown):
-	New function simply calls camel_shutdown().
-
-	* mail-component.c (impl_finalize):
-	Call mail_session_shutdown().
-
-2008-08-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #508732
-
-	* mail-component.c (impl_createView):
-	Add a "select_item" argument for crash recovery, which we forward
-	to EMFolderBrowser as a "suppress_message_selection" flag.
-
-	* em-folder-browser.c (emfb_set_folder):
-	Suppress automatic message selection if we are recovering from a
-	crash.
-
-2008-08-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #513363
-
-	* default/C/Inbox:
-	Remove the outdated "New Features" list, and well as the incorrect
-	"Evolution team" email address.
-
-2008-08-14  Sebastien Bacher  <seb128@ubuntu.com>
-
-	** Fix for bug #547805
-
-	* em-popup.c: (emp_standard_menu_factory): 
-	don't filter applications using g_app_info_should_show()
-
-2008-08-13  Moritz Mertinkat  <moritz@mertinkat.net>
-
-	* em-format-html.c: Added meaningful user agent for HTTP requests
-	used to load remote images. The original part (CamelHttpStream/1.0)
-	has been kept for backward compatibility.
-
-2008-08-12  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #519292
-
-	* message-list.c: (read_boolean_with_default),
-	(message_list_construct): Read 'thread_expand' and 'thread_latest'
-	safely with TRUE as default if key doesn't exist.
-
-2008-08-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #546892
-
-	* em-folder-browser.c:
-	* em-format-html-display.c:
-	* mail-send-recv.c:
-	* message-tag-followup.c:
-	Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image().
-
-	* mail-send-recv.c:
-	* message-tag-followup.c:
-	Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list().
-
-	* mail-mt.c:
-	e_activity_handler_cancelable_operation_started() no longer takes a
-	GdkPixbuf.  It was ignoring the pixbuf anyway ever since we added a
-	spinner icon.
-
-2008-08-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #519292
-
-	* message-list.c: (load_tree_expand_all): Drop function.
-	* message-list.c: (regen_list_done): Rather use desired expanded state
-	value when creating the tree instead of the default model's value for
-	this to have 'expand/collapse all' commands work better and quicker.
-
-2008-08-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #352695
-
-	* message-list.c: (struct _MessageListPrivate), (save_tree_state),
-	(load_tree_state), (on_model_row_changed), (message_list_init),
-	(message_list_construct), (struct _regen_list_msg), (regen_list_done),
-	(regen_list_free), (mail_regen_list): Be able to recognize whether
-	there has been any change on any row in a list and save expanded
-	state only in case there was any change. Also use in-memory storing
-	of the expanded state in case we do not want to rewrite full view
-	It's for searches only, and it's not stored between sessions.
-
-2008-08-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Part fix for bug #529743
-
-	* searchtypes.xml: Support Subject or Recipients contain search.
-
-2008-08-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail/message-list.c: Don't use uninitialized exception. It leads to
-	freeing uninitialized memory.
-
-2008-08-07  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #546788
-
-	* em-folder-view.c: "/commands/ViewNormal" isn't actually used. It is
-	probably a leftover from a previous way of setting the formatting
-	style. It can be removed. Related cleanups.
-
-2008-08-06  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #546668
-
-	* em-format-html.c: Drop a (pointless) define used only once.
-	* em-format-html-display.c: Drop one unused define.
-
-2008-08-07  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-format.c (emf_format_secure):
-	* em-format-html-display.c (efhd_xpkcs7mime_add_cert_table):
-	Use CamelDList instead of EDList.
-
-2008-08-06  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #249844
-
-	* em-event.h: (struct _EMEventTargetCustomIcon): Declare 'folder_name'
-	as const char * to let compiler happy; no copy of the pointer anyway.
-	* mail-component.c: (impl__get_userCreatableItems):
-	Do not let compiler claim.
-
-2008-08-05  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail/message-list.c: Fix a performance issue, where we can just go
-	by the presence than the exact count.
-
-2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-migrate.c (migrate_to_db):
-	* em-network-prefs.c (notify_proxy_type_changed),
-	(widget_entry_changed_cb):
-	* em-subscribe-editor.c (sub_fill_level), (sub_queue_fill_level),
-	(sub_row_expanded):
-	* mail-vfolder.c:
-	Use G_STRLOC or G_STRFUNC instead of deprecated
-	G_GNUC_PRETTY_FUNCTION.
-
-2008-08-04  Paul Bolle <pebolle@tiscali.nl>
-
-	** Fix for bug #543058
-
-	* em-folder-properties.c (emfp_dialog_got_folder_quota):
-	* mail-component.c (view_changed): Replace three occurrences of
-	INBOX in the GUI code with Inbox. INBOX is a written in all caps
-	because that is the way it is used in the IMAP protocol. There's
-	little reason to use it in the GUI. Inbox is properly capitalized and
-	can be localized too.
-
-2008-08-04  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Further fix for bug #539268
-
-	* em-format.c (em_format_describe_part): Do not append description 
-	if it is just an empty string.
-
-2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #249844
-
-	* em-folder-tree.c (render_display_name):
-	* mail-component.c (impl__get_userCreatableItems):
-	Use C_() macro instead of Q_() macro. 
-	Use fully qualified names for "New" submenu entries. 
-
-2008-08-04  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fixes bug #537088
-
-	* em-format-html.c: (efh_format_headers): Break out of the loop rather
-	that return from this function when running into an empty From: or
-	Sender: header.
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #514006
-
-	* apps-evolution-mail-notification.schemas.in:
-	Quote literal values.
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #544859
-
-	* evolution-mail.schemas.in:
-	Clarify description of "sync_interval" key.
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #545820
-
-	* mail-ops.c (save_messages_desc): Fix a typo. (Nicolas Kaiser)
-
-2008-07-31  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #545436
-
-	* mail/message-list.c: Check the info before accessing it.
-
-2008-07-30  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #500389
-
-	* em-account-editor.c: (emae_option_options_changed),
-	(emae_option_options), (emae_receive_options_extra_item):
-	New ability to define Options (ComboBox) in provider's options.
-
-2008-07-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail/em-folder-tree.c: Kill a compilation warning.
-
-2008-07-28  Lucian Langa  <lucilanga@gnome.org>
-
-	* mail/mail-config.glade:
-	Corrected string "Prompt on sending HTML.."
-
-2008-07-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #543532
-
-	* em-folder-tree-model.c: (em_folder_tree_model_remove_store_info):
-	Let free memory when we are done with it, not before.
-
-2008-07-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #256540
-
-	* mail-dialogs.glade: (message_security_dialog):
-	Do not use GtkNotebook with only one tab.
-
-2008-07-28  Lucian Langa  <lucilanga@gnome.org>
-
-	* mail/mail-config.glade:
-	** See bug #504417: Preferences windows
-	cut off
-
-2008-07-28 Jeff Cai <jeff.cai@sun.com> 
-
-	* em-migrate.c: (migrate_to_db):
-	* em-network-prefs.c: (notify_proxy_type_changed),
-	(widget_entry_changed_cb):
-    Use G_GNUC_PRETTY_FUNCTION instead of __PRETTY__FUNCTION
-
-2008-07-27  Lucian Langa <lucilanga@gnome.org>
-
-	* mail/em-event.h (struct _EMEventTargetCustomIcon):
-	* mail/em-event.c (em_event_target_new_custom_icon):
-	* mail/em-folder-tree.c (render_pixbuf):
-	** See bug #544969: Added the hook for folder
-	custom icon.
-
-2008-07-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #543411
-
-	* mail/em-folder-tree-model.c: Dont load known folders.
-	* mail/em-folder-tree.c: Move iter to the last entry.
-
-2008-07-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail/em-folder-browser.c: Make show unread/etc work well.
-
-2008-07-24  Sankar P  <psankar@novell.com>
-
-	* em-folder-browser.c (get_view_query):
-	Search by Labels.
-
-2008-07-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail/em-folder-browser.c: Revert Sankar's search hacks.
-
-2008-07-22  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #544022
-
-	* e-searching-tokenizer.c: (dump_trie):
-	Define function only when required. (Compiler warning cleanup.)
-
-2008-07-21  Tor Lillqvist  <tml@novell.com>
-
-	* em-migrate.c: Rearrange G_OS_WIN32 ifdefs a bit, as we need to
-	compile more of this file to support upgrade attempts from 2.12
-	and later.
-	(migrate_folders): Guard against camel_store_get_folder()
-	returning NULL, which happened at least for me. It was for a
-	partially broken GroupWise folder structure on disk, so that is a
-	case of garbage in--garbage out I guess, but it can't hurt to be
-	careful...
-
-2008-07-21  Bharath Acharya  <abharath@novell.com>
-
-	Fixed some compiler warnings for Templates specific hunk.
-
-	* em-composer-utils.c: (edit_message):
-
-2008-07-20  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #200147
-	Added basic Template support
-
-	* em-composer-utils.c (edit_message), (em_utils_edit_message): Modified 
-	to suit it better for plugins to use it. And added support for template 
-	placeholders to be replaced in the messages.
-	* em-composer-utils.h:
-	* em-folder-tree.c (is_special_local_folder):
-	* em-folder-utils.c (emfu_is_special_local_folder):
-	* em-folder-view.c (em_folder_view_open_selected):
-	* em-utils.c (em_utils_folder_is_templates):
-	* em-utils.h:
-	* mail-component.c:
-	* mail-component.h:
-
-2008-07-16  Sankar P  <psankar@novell.com>
-
-	Pushing disk summary changes from the madagascar branch
-
-	* em-folder-browser.c (get_view_query):
-	* em-folder-view.c (emfv_enable_menus):
-	* mail-ops.c (refresh_folder_exec):
-	* message-list.c (regen_list_exec):
-
-2008-07-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #269152
-
-	* em-format-quote.c: (emfq_format_header):
-	* em-format-html.c: (efh_format_headers):
-	Use X-MimeOLE as Mailer header when there's nothing better available.
-
-2008-07-09  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #228725
-
-	* message-list.c: (mail_regen_list): Update empty message on regen.
-
-2008-07-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #207802 (Patch suggested by Veerapuram Varadhan.)
-
-	* message-list.c: (struct search_child_struct), (search_child_cb),
-	(is_tree_widget_children), (ml_tree_drag_motion): Do not allow drop
-	messages to the same message list as is the source. Also do not
-	allow drop over message list if it doesn't have set a folder.
-
-2008-07-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #541365
-
-	* message-list.c: (message_list_get_uids), (message_list_get_selected):
-	Do not call 'camel_folder_sort_uids' when we do not have folder or uid.
-
-2008-07-02  Jeffrey Stedfast  <fejj@novell.com>
-
-	Sort the uids so that moving/copying messages preserves mailbox
-	ordering rather than jumbled randomness.
-
-	* message-list.c (message_list_get_uids): Sort the uids.
-	(message_list_get_selected): Same.
-
-2008-06-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #540160
-
-	* message-list.h: (struct _MessageList):
-	* message-list.c: (message_list_init), (on_cursor_activated_cmd),
-	(on_selection_changed_cmd): Remember whether we come from none/multi
-	select to single select and properly update the preview.
-	(Reverting patch for bug #337160 and doing that with other approach.)
-
-2008-06-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #537275
-
-	* em-html-stream.c: (emhs_cleanup): Close GtkHTMLStream on cancel.
-	* em-html-stream.c: (emhs_gtkhtml_destroy): Set the cancel.
-	* em-sync-stream.c: (emss_process_message):
-	Do not pass data to the child structure if we were canceled.
-
-2008-06-21  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #539268
-
-	* em-format.c: (em_format_describe_part): do not use both filename
-	and description if these are identical.
-
-2008-06-21  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #538741
-
-	* em-format-html.c: (efh_format_header):
-	Strip preceding tabs from Date headers too.
-
-2008-06-21  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #537725
-
-	* em-composer-utils.c (save_draft_done):
-	Set the autosaved flag so we don't get pestered with a save dialog
-	if the user then decides to close the composer window.
-
-2008-06-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #534039
-
-	* em-folder-tree-model.h: (em_folder_tree_model_signal_block):
-	* em-folder-tree-model.c: (em_folder_tree_model_signal_block):
-	Removed obsolete function.
-	* mail-vfolder.c: (vfolder_load_storage):
-	Add storage to the tree model when everything is loaded, thus
-	everything will be shown when enabling the Search Folders on demand.
-	Also ensure the Search Folders to be enabled next start.
-	* mail-vfolder.c: (mail_vfolder_add_uri), (mail_vfolder_delete_uri):
-	Track folders even when Search Folders disabled, to have them
-	known when enabling Search Folders on demand.
-
-2008-06-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #382783
-
-	* em-filter-rule.c: (do_grab_focus_cb), (more_parts), (get_widget):
-	Grab focus of new rule part on adding and scroll to the bottom too.
-
-2008-06-18  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #423395
-
-	* em-format-html.c: (efh_init), (efh_text_plain), (efh_text_enriched),
-	(efh_text_html), (efh_message_deliverystatus): Put the anchor where
-	the message body begins and let GtkHTML know the anchor name to place
-	the cursor there in caret mode on the first focus.
-
-2008-06-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #532472
-
-	* mail-config.c (mail_config_get_account_by_transport_url):
-	Strip the account URL (via CAMEL_URL_HIDE_ALL) before comparing
-	it to the already-stripped 'transport_url', to avoid unnecessary
-	password prompts.
-
-2008-06-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #467892
-
-	* message-list.h: (struct _MessageList), (message_list_ensure_message):
-	* message-list.c: (message_list_init), (message_list_finalise),
-	(message_list_ensure_message), (regen_list_exec), (regen_list_done):
-	Be able to set a message uid to keep in a list after regeneration.
-	* em-folder-view.c: (em_folder_view_open_selected):
-	Inherit search criteria and ensure keeping the selected message
-	in the view even it may not belong to the filter anymore.
-
-2008-06-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #337160
-
-	* message-list.c: (on_cursor_activated_cmd): Do not pretend the row
-	with a cursor is selected when it isn't. Also take care of multiselect.
-	* message-list.c: (on_selection_changed_cmd):
-	Do not pretend the row with a cursor is selected when it isn't.
-
-2008-06-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #538002
-
-	* em-folder-tree.c: (emft_drop_target): Do not allow dropping messages
-	on folders with CAMEL_FOLDER_NOSELECT flag set.
-
-2008-06-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #314467
-
-	* em-account-editor.c: (emae_url_set_hostport):
-	Reset port when setting host name without it.
-
-2008-06-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #535791
-
-	* mail-config.glade:
-	* em-composer-prefs.c: (em_composer_prefs_construct):
-	New UI option to let uset choose whether start typing at the bottom
-	of the document or not on replying.
-	* em-utils.h: (em_utils_message_to_html):
-	* em-utils.c: (em_utils_message_to_html):
-	* em-composer-utils.c: (forward_non_attached), (composer_set_body):
-	Take care of /apps/evolution/mail/composer/reply_start_bottom.
-
-2008-06-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #201011
-
-	* em-filter-editor.c: (em_filter_editor_construct):
-	Show Enabled column in the editor, because we support it here.
-	* mail-session.c: (main_get_filter_driver): Skip disabled rules.
-
-2008-06-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #536772
-
-	* em-folder-browser.c: (EMFolderViewEnable emfb_enable_map):
-	Disable Folder menu items consistently with a popup menu over folder.
-
-2008-06-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	* evolution-mail.schemas.in: Fix a typo.
-
-2008-06-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	* message-tag-followup.c:
-	Never undefine DISABLE_DEPRECATED macros in source code.
-	Yes, it will break the build if it's defined.  That's the point!
-
-2008-06-02  Jacob Brown  <jeblinux@gmail.com>
-
-	** Fix for bug #529464
-
-	* em-format-html-display.c: (efhd_format_optional): Do not use "handle"
-
-2008-06-02  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #535749
-
-	* message-list.c: (regen_list_exec): Use better condition whether
-	keep cursor_uid in the message list or not on regeneration.
-
-2008-06-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #531836
-
-	* em-folder-view.c:  Added bonobo accel key for Ctrl+D, Del to keep
-	working on deleted mails, but not the toolbar/menu
-
-2008-06-02  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #525966
-
-	* em-composer-utils.c: (composer_set_no_change):
-	New helper function to set composers state properly to "no change".
-	* em-composer-utils.c: (em_utils_compose_new_message),
-	(em_utils_compose_new_message_with_mailto), (em_utils_post_to_folder),
-	(em_utils_post_to_url), (edit_message), (forward_attached),
-	(forward_non_attached), (em_utils_redirect_message),
-	(em_utils_reply_to_message), (post_reply_to_message):
-	Use the above helper function.
-	* em-composer-utils.c: (reply_get_composer), (composer_set_body):
-	Do not drop undo in the editor multiple times, do that only once.
-
-2008-06-02  Lucian Langa  <lucilanga@gnome.org>
-
-	** Fix for bug #535689
-
-	* mail-send-recv.c: (build_dialog): Transmit
-	gd data to hook's event target data
-
-2008-06-02  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #534312
-
-	* em-composer-utils.c: (create_new_composer),
-	(em_utils_compose_new_message), (struct forward_attached_data),
-	(real_update_forwarded_flag), (update_forwarded_flags_cb),
-	(composer_destroy_fad_cb), (setup_forward_attached_callbacks),
-	(forward_attached), (forward_attached_cb), (em_utils_forward_attached),
-	(forward_non_attached), (forward_quoted), (em_utils_forward_message):
-	Set new CAMEL_MESSAGE_FORWARDED flag on forwarded messages.
-	* message-list.c: (ml_value_to_string), (message_list_create_extras),
-	(ml_tree_value_at), (create_composite_cell), (struct states_pixmaps):
-	Draw mail-forward icon on forwarded messages.
-
-2008-05-30  Lucian Langa  <lucilanga@gnome.org>
-
-	** Fix for bug #535670
-
-	* em-format-quote.c: (type_builtin_table):
-	Add x-evolution/evolution-feed-rss as internal mime
-	for evolution-rss artiles.
-	* em-format.c: (em_format_is_attachment): prevent
-	evolution-rss articles being formatted as attachments.
-
-2008-05-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #317755
-
-	* mail-send-recv.c: (refresh_folders_exec):
-	* mail-ops.c: (refresh_folder_desc):
-	Also sync with a server when refreshing folder.
-	* evolution-mail.schemas.in:
-	* mail-config.h: (mail_config_get_sync_timeout):
-	* mail-config.c: (mail_config_get_sync_timeout):
-	Use int value of /apps/evolution/mail/sync_interval where is set
-	how often propagate local changes to server.
-	* mail-component.c: (struct _MailComponentPrivate), (impl_dispose),
-	(mc_sync_store_done), (mc_sync_store), (call_mail_sync),
-	(mail_component_init): Upload local changes to server on some interval.
-	* mail-component.c: (impl_quit):
-	Do not quit until we are done with mail sync.
-
-2008-05-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #322553
-
-	* mail-config.h: (mail_config_scripts_disabled):
-	* mail-config.c: (struct MailConfig), (mail_config_init),
-	(mail_config_scripts_disabled): New helper function.
-	* em-composer-prefs.c: (sig_load_preview):
-	Write to html stream at least one character.
-	* em-composer-prefs.c: (em_composer_prefs_construct): Disable
-	signature's Add Script button when not approved running scripts.
-	* mail-config.c: (mail_config_get_gconf_client): Ensure init.
-	* mail-config.c: (mail_config_signature_run_script): Do not run
-	script when disabled in /desktop/gnome/lockdown/disable_command_line.
-
-2008-05-23  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534476
-
-	* em-utils.c (em_utils_snoop_type):
-	* em-popup.c (emp_standard_menu_factory):
-	Remove the special check for "winmail.dat".  GIO correctly
-	identifies it as "application/ms-tnef".
-
-2008-05-23  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail-mt.c: (mail_msg_check_error): Convert the the warning to a
-	message.
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-format-html.c (efh_message_external):
-	Fix a typo in checking for an empty 'mode' string.
-
-	* message-list.c (subtree_size):
-	Remove this function.  Looks like it hasn't been used in years.
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534360
-
-	* em-account-prefs.h:
-	* em-filter-editor.c:
-	* em-filter-editor.h:
-	* em-folder-selector.h:
-	* em-format-html-display.c:
-	* em-mailer-prefs.c:
-	* em-mailer-prefs.h:
-	* em-utils.c:
-	* em-vfolder-editor.c:
-	* em-vfolder-editor.h:
-	* em-vfolder-rule.c:
-	* mail-vfolder.c:
-	* meessage-tag-editor.h:
-	* message-list.h:
-	* message-tag-followup.h:
-	Migrate from deprecated GtkObject symbols to GObject equivalents.
-
-2008-05-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	* message-list.c (regen_list_done):
-	Use a bit more direct English when informing the user of no messages
-	in the currently selected folder.
-
-2008-05-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #533465, patch from Ritesh Khadgaray
-
-	* em-account-editor.c (emae_url_set_hostport):
-	Strip whitespace from user-entered hostname.
-
-2008-05-19  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail/em-folder-view.c: Make non junk learn work again.
-
-2008-05-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #514383
-
-	* mail.error.xml: Remove the "ask-mark-read" error.
-
-2008-05-14  Jeffrey Stedfast  <fejj@novell.com>
-
-	Needed so that IMAP4 can allow users to configure cache
-	expiration per-folder.
-
-	* em-folder-properties.c (emfp_get_folder_item): Add support for
-	CAMEL_ARG_INT and CAMEL_ARG_DBL.
-	(emfp_commit): Same.
-
-2008-05-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #463040, Patch by Milan Crha
-
-	* em-folder-browser.c (emfb_list_message_selectedi), (emfb_set_folder):
-	Forget former selected uid as soon as we know we moved to other.
-
-2008-05-09  Sankar P  <psankar@novell.com>
-
-	** Fix for bug #531519
-
-	* em-format-html-display.c: (efhd_message_update_bar):
-	Evolution crashes on print-preview.
-
-	** Committed on behalf of Srinivasa Ragavan <sragavan@novell.com>
-
-2008-05-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #424744
-
-	* em-composer-prefs.c:
-	* em-format-html.c:
-	* em-format-quote.c:
-	* em-mailer-prefs.c:
-	Use camel-iconv.c instead of e-iconv.h (now deprecated).
-
-2008-05-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-component.c (mail_component_show_logger):
-	Use the GtkCellRendererText's "markup" property for error messages.
-
-2008-05-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #531426
-
-	* em-format-html.c (efh_format_headers):
-	Display face header images at 48x48 instead of 64x64.
-	Patch from Roland Clobus.
-
-2008-05-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-component.c (mail_component_show_logger):
-	Fix up the Debug Logs window a bit:
-	- Add a Close button.
-	- Fix some spacing issues (HIG compliance).
-	- Just show the log level icon.  Add a tooltip for the icon showing
-	  a description of the log level (Error/Warning/Debug).  Also, avoid
-	  using e-icon-factory.  Set the GtkCellRendererPixbuf's "stock-id"
-	  and "stock-size" properties instead.
-	- Use GConfBridge to track the user's log level preference.
-
-2008-04-30  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #528288
-
-	* em-folder-browser.c: (emfb_init), (em_folder_browser_show_wide):
-	Ensure minimum size for preview and message list.
-	* em-folder-browser.c: (get_view_query):
-	Distinguish between no filter and custom filter.
-	* message-list.c: (regen_list_done):
-	Set info message to tree when no message shown in a list.
-
-2008-04-30  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #530245
-
-	* searchtypes.xml: Let searches work with labels again.
-
-2008-04-30  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #467892
-
-	* em-folder-view.c: (em_folder_view_open_selected):
-	Do not inherit search filters when opening messages in new window.
-	* message-list.c: (regen_list_exec):
-	If we are called from folder_changed even, then keep the actually
-	selected message so it will not disappear when user reads it and
-	it doesn't belong to actual filter anymore.
-
-2008-04-30  Shuai Liu  <shuai.liu@sun.com>
-
-	** Fix for bug #530672
-	Evolution crashes when viewing pgp-signed message
-
-	* em-format-html-display.c: Modify the array of smime_sign_colour 
-	from 4 to 5 to ensure the input by data-server is right
-
-2008-04-29  Milan Crha  <mcrha@redhat.com>
-
-	* em-utils.c: (em_utils_snoop_type):
-	Fixes compiler warning (unused variable).
-
-2008-04-29  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #511337
-
-	* em-format-html.h: (EMFormatHTMLState), (struct _EMFormatHTML):
-	* em-format-html.c: (efh_init), (efh_format_done),
-	(efh_format_timeout): Track state of the object to recognize
-	whether rendering new content or doing nothing.
-	* em-format-html-display.c: (efhd_can_process_attachment),
-	(efhd_attachment_show), (efhd_attachment_popup),
-	(efhd_attachment_image), (efhd_attachment_button):
-	Do nothing when EMFormatHTML object's state is RENDERING,
-	the puri object instance is not valid anyway.
-
-2008-04-28  Johan Euphrosine  <proppy@aminche.com>
-
-	** Fix for bug #529247
-
-	* em-format-html.h (struct _EMFormatHTML): Add header_colour.
-
-	* em-format-html-display.c (efhd_gtkhtml_realise): Use bg style
-	properties for body_colour, fg for header_colour, darken for
-	frame_colour, bg for content_colour.
-
-	* em-format-html.c (efh_init), (efh_format_exec), (efh_init),
-	(efh_text_plain), (efh_text_enriched), (efh_text_html),
-	(efh_message_deliverystatus): Use header_colour for text color of
-	the message header, body_colour for background color of the
-	message header, text_colour for text color of the message content,
-	base_colour for background color of the message content.
-
-2008-04-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail/em-utils.c: Avoid crash while detecting mime types.
-
-2008-04-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail/em-format-html.c: Fix the Mailer header display
-
-2008-04-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #273041
-
-	* mail.error.xml: (junk-check-error), (junk-report-error),
-	(junk-not-report-error): New error messages added.
-	* em-junk-hook.h: (struct _EMJunkHookTarget), (em_junk_error_quark):
-	* em-junk-hook.c: (manage_error), (em_junk_check_junk),
-	(em_junk_report_junk), (em_junk_report_non_junk):
-	Allow propagation of the error from the plugin in the hook target.
-
-2008-04-23  Milan Crha  <mcrha@redhat.com>
-
-	* em-format-html-display.c: (efhd_update_bar):
-	Compiler warning fix.
-
-2008-04-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #529375
-
-	* evolution-mail.schemas.in:
-	* mail-config.glade:
-	* em-utils.h: (em_utils_in_addressbook):
-	* em-utils.c: (em_utils_in_addressbook):
-	* em-format-html.c: (emfh_gethttp):
-	* mail-session.c: (lookup_addressbook):
-	* mail-config.h: (mail_config_get_lookup_book_local_only):
-	* mail-config.c: (struct MailConfig), (mail_config_init),
-	(mail_config_get_lookup_book_local_only):
-	* em-mailer-prefs.h: (struct _EMMailerPrefs):
-	* em-mailer-prefs.c: (junk_book_lookup_button_toggled),
-	(em_mailer_prefs_construct): Add new option
-	/apps/evolution/mail/junk/lookup_addressbook_local_only
-	to determine whether check for address in a local address book only.
-
-2008-04-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #529179
-
-	* em-folder-browser.c: (struct _EMFolderBrowserPrivate),
-	(labels_changed_idle_cb), (gconf_labels_changed), (emfb_destroy):
-	Rebuild search menu rather on idle, then immediately after the change
-	in gconf, because other parts may not have this change propagated yet.
-
-2008-04-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #458505
-
-	* mail-config.glade:
-	One space between "Sender" and "Photograph".
-
-2008-04-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #529462
-
-	* evolution-mail.schemas.in:
-	Fix wording of "custom_header" GConf key description.
-
-2008-04-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #494171
-
-	* mail-send-recv.c (build_dialog):
-	Make the "Send & Receive Mail" window dimensions persistent.
-
-	* evolution-mail.schemas.in:
-	Add keys for storing "Send & Receive Mail" window dimensions:
-		/apps/evolution/mail/send_recv_height
-		/apps/evolution/mail/send_recv_maximized
-		/apps/evolution/mail/send_recv_width
-	Note the "maximized" key is required by GConfBridge but is not
-	actually used since the window cannot be maximized.
-
-2008-04-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-composer-prefs.c:
-	gconf-bridge.h moved to e-util.
-
-2008-04-21  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #323402
-
-	* em-folder-tree.c: (folder_tree_new):
-	* evolution-mail.schemas.in: Be able to disable ellipsizing of folder
-	names with hidden option /apps/evolution/mail/display/no_folder_dots.
-
-2008-04-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #334444
-
-	* em-format-html-display.c: (efhd_attachment_button),
-	(efhd_update_bar), (efhd_message_update_bar),
-	(efhd_message_add_bar):
-	* em-format-html.c: (efh_format_exec):
-
-2008-04-17  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #526739
-
-	* Makefile.am:
-	* em-vfs-stream.h:
-	* em-vfs-stream.c: Removed from project, not used anywhere.
-	* em-menu.c:
-	* em-config.c: Do not include gnome-vfs.
-	* mail-ops.c: (save_messages_exec), (save_part_exec):
-	Changes related to Data Server change of CamelStreamVFS.
-	* em-format.c: (em_format_describe_part):
-	* em-format-html-display.c: (efhd_bonobo_object), (efhd_find_handler),
-	(efhd_use_component), (efhd_bonobo_unknown), (efhd_check_server_prop),
-	(efhd_format_attachment): Drop use of deprecated gnome-vfs functions.
-	* em-utils.c: (em_utils_snoop_type): Use gio to guess the mime_type.
-	* em-popup.c: (emp_apps_open_in), (emp_apps_popup_free),
-	(emp_standard_menu_factory): Use gio to fill popup and launch app.
-
-2008-04-16  Shuai Liu  <shuai.liu@sun.com>
-
-	** Fix for bug #528358
-
-	* em-utils.c: (em_utils_save_messages): Use message subject as default
-	filename when attempting to 'save message'. 
-
-2008-04-14  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #270406
-
-	* em-folder-properties.c: (struct _prop_data), (emfp_free),
-	(add_numbered_row), (emfp_get_folder_item),
-	(emfp_dialog_got_folder_quota), (emfp_dialog_got_folder):
-	Retrieve quota information for a folder and show it in a dialog.
-	* mail-ops.h: (mail_get_folder_quota):
-	* mail-ops.c: (struct _get_quota_msg), (get_quota_desc),
-	(get_quota_exec), (get_quota_done), (get_quota_free),
-	(MailMsgInfo get_quota_info), (mail_get_folder_quota):
-	New operation to get folder's quota information.
-
-2008-04-13  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-browser.c:
-	Add an icon for Folder->New.
-
-2008-04-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-config.glade:
-	Revert my previous change.  Glade was more destructive toward the
-	file than I realized.  But I think I fixed the core issue that was
-	causing Glade 3 to crash: there were two widgets named "omenuCharset".
-	Now the one in Composer Preferences is named "omenuCharset1".
-
-2008-04-10  Sankar P  <psankar@novell.com>
-
-	* em-composer-prefs.c: (em_composer_prefs_construct):
-	Change the name of the variable we look for in 
-	the glade file.
-
-	Also add some if conditions to avoid certain crash.
-
-	** See bug #527327
-
-2008-04-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-config.glade:
-	Loaded this file into Glade 3.5 and saved it.  Doing so appears
-	to have fixed whatever corruption was causing previous Glade 3
-	releases to choke on it.
-
-2008-04-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #523413
-
-	* em-composer-utils.c (save_draft_done):
-	Check the composer window's visibility to determine whether to
-	destroy the window.  See the corresponding composer/ChangeLog
-	entry to get the full story.
-
-	* em-composer-utils.c (em_utils_composer_save_draft_cb):
-	Remove the 'quit' parameter.
-
-2008-04-07  Takao Fujiwara  <takao.fujiwara@sun.com>
-
-	reviewed by: Milan Crha
-
-	** Fix for bug #408579
-
-	* mail.error.xml:
-	  Changed '&quot;' to '\"' to work with intltool.
-
-2008-04-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #335891
-
-	* em-composer-prefs.c (em_composer_prefs_construct):
-	Desensitize the signature editing interface if the "signatures"
-	GConf key is not writable.
-
-2008-04-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-composer-prefs.c:
-	Fix a corner case that I missed in my last commit.
-
-2008-04-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #526152, plus some tangential code cleanup.
-
-	* Makefile.am:
-	Remove all the IDL crud for GnomeSpell.
-
-	* em-composer-prefs.c:
-	* evolution-mail.schemas.in:
-	* mail-config.c:
-	Define our own GConf keys for active spell checking languages
-	and the underline color for misspelled words, instead of relying
-	on GnomeSpell's GConf keys.  The new keys are:
-	/apps/evolution/mail/composer/spell_color	(string)
-	/apps/evolution/mail/composer/spell_languages	(list of strings)
-
-	* em-composer-prefs.c:
-	* em-composer-prefs.h:
-	Cleanup the logic a bit to improve readability.
-
-	* mail-config.c:
-	Cleanup the GConf notification logic:
-	- We don't need the notification IDs for GConf keys we're watching.
-	- Minimize the repetition of GConf keys to reduce the risk of typos.
-	- Reduce the number of notification callback functions.
-
-	* Spell.idl:
-	Remove this file; we don't use GnomeSpell anymore.
-
-2008-04-04  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-format-quote.c (emfq_format_header): Same as below.
-
-	* em-format-html.c (efh_format_header): Need to unfold some
-	headers. Also simplified figuring out the label.
-	(efh_format_headers): Cleaned up some code.
-
-2008-04-02  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #264456
-
-	* mail-component.c: (view_changed):
-	Do not count deleted junk messages when doesn't show deleted messages.
-
-2008-04-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #350308
-
-	* em-format-html-display.c: (efhd_gtkhtml_realise): Make colors only
-	darker, not lighter. Use black in case someone has too dark theme.
-
-2008-04-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-composer-prefs (sig_edit_cb), (em_composer_prefs_new_signature):
-	Adapt to new Bonobo-less signature editor.
-
-	* mail-signature-editor.c:
-	* mail-signature-editor.h:
-	Rewrite the signature editor as a subclass of GtkhtmlEditor.
-	Eliminates Bonobo from the equation.
-
-	* em-composer-utils.c (composer_get_message),
-	(em_utils_composer_send_cb), (save_draft_done),
-	(em_utils_composer_save_draft_cb), (create_new_composer),
-	(em_utils_compose_new_message),
-	(em_utils_compose_new_message_with_mailto), (em_utils_post_to_folder),
-	(em_utils_post_to_url), (edit_message), (forward_attached),
-	(forward_non_attached), (reply_get_composer), (composer_set_body),
-	(em_utils_reply_to_message), (post_reply_to_message):
-	Adapt to new Bonobo-less composer.
-
-	* mail-component-factory.c:
-	Composer is no longer needs a Bonobo factory.
-
-	* mail-config.c:
-	Fix style pattern for EMsgComposer widgets.
-
-2008-04-02  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #271863
-
-	* mail-component.c: (view_changed):
-	Do not count deleted junked messages to total number of messages
-	with unchecked "Hide Deleted Messages" option.
-
-2008-04-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #525508, spotted by Thomas M.
-
-	* message-list.c (ml_tree_value_at):
-	Fix a leaking CamelURL in the COL_LOCATION case.
-
-2008-04-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #525510, patch from Thomas M.
-
-	* message-list.c (ml_tree_value_at):
-	Mark "On This Computer" for translation.
-
-2008-03-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-network-prefs.c (em_network_prefs_finalise),
-	(em_network_prefs_destroy), (emnp_parse_ignore_hosts):
-	Fix some unused variable warnings.
-
-2008-03-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #523271
-
-	* em-popup.c (emp_standard_menu_factory):
-	Lowercase the MIME type before passing it to
-	gnome_vfs_mime_get_all_applications().
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #522178
-
-	* mail-folder-cache.c: (folder_changed): Put back hack with
-	checking time of new message in the folder based with last
-	time of new mail as it was before patch in bug #492702.
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #519292
-
-	* message-list.h: (message_list_set_expand_all):
-	* message-list.c: (message_list_set_expand_all):
-	Remove unused confusing function.
-	* message-list.c: (regen_list_done):
-	Use numbers instead of gboolean value.
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #502826 (original patch by nickspoon0)
-
-	* mail-config.glade:
-	* em-composer-prefs.c: (attach_style_reply_new_order),
-	(attach_style_info_reply), (em_composer_prefs_construct):
-	Reword and reorder Reply Style items in the Preferences.
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #488175
-
-	* message-list.c: (ml_tree_value_at):
-	Colorize follow-up messages same as with due-by flag.
-
-2008-03-25  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	** Added configurable Proxy settings for Evolution.
-
-	* GNOME_Evolution_Mail.server.in.in:
-	* Makefile.am:
-	* em-network-prefs.c: (em_network_prefs_get_type),
-	(em_network_prefs_class_init), (em_network_prefs_init),
-	(em_network_prefs_finalise), (em_network_prefs_destroy),
-	(toggle_button_toggled), (toggle_button_init), (emnp_widget_glade),
-	(emnp_set_sensitiveness), (emnp_parse_ignore_hosts),
-	(emnp_load_sys_settings), (notify_proxy_type_changed),
-	(widget_entry_changed_cb), (emnp_free), (emnp_set_markups),
-	(em_network_prefs_construct), (em_network_prefs_new):
-	* em-network-prefs.h:
-	* mail-component-factory.c: (factory):
-	* mail-config-factory.c: (mail_config_control_factory_cb):
-	* mail-config.glade:
-
-2008-03-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #511978
-
-	* mail-config.glade: Resolve mnemonics clash on Junk tab.
-
-2008-03-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-view.h:
-	* em-message-browser.h:
-	* em-message-browser.c:
-	Code cleanup, no logic changes.
-
-2008-03-18  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #519154
-
-	* mail-component.c: (view_changed):
-	Do not localize folder name used in window title.
-
-2008-03-18  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #506359
-
-	* mail-component.c: (mail_component_show_logger):
-	Add Translators' comments.
-
-2008-03-17  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #514744
-
-	* em-folder-tree-model.c: (em_folder_tree_model_load_state):
-	Check also for proper root node and use default if not the right one.
-
-2008-03-13  Milan Crha  <mcrha@redhat.com>
-
-	* em-folder-tree.c:
-	* em-format-html.c: Fix an implicit function declaration.
-
-2008-03-13  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #515786
-
-	* em-migrate.c: (em_migrate), (em_update_sa_junk_setting_2_23):
-	Fix misspelled SpamAssassin word.
-
-2008-03-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #273177
-
-	* em-utils.h: (em_utils_add_vcard):
-	* em-utils.c: (emu_add_address_or_vcard),
-	(em_utils_add_address), (em_utils_add_vcard):
-	New function to add whole vCard to addressbook.
-	* em-popup.c: (emp_add_vcard), (emp_standard_menu_factory):
-	Add popup menu item to vcard attachments.
-
-2008-03-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes breakage caused by bug #513951
-
-	* mail-autofilter.c (filter_gui_add_from_message),
-	(mail_filter_rename_uri), (mail_filter_delete_uri):
-	* mail-tools.c (mail_tool_get_local_movemail_path):
-	* mail-vfolder.c (mail_vfolder_delete_uri), (mail_vfolder_rename_uri),
-	(store_folder_deleted), (store_folder_renamed),
-	(vfolder_load_storage), (vfolder_revert),
-	(em_vfolder_editor_response), (edit_rule_response),
-	(new_rule_clicked):
-	* em-folder-browser.c (emfb_search_search_activated):
-	* em-folder-tree.c (em_folder_tree_new):
-	* mail-ops.c (uid_cachename_hack), (empty_trash_exec):
-	* em-folder-view.c (emfv_setup_view_instance):
-	* em-utils.c (em_filter_editor_response), (em_utils_edit_filters):
-	* importers/mail-importer.c (import_folders_rec):
-	* mail-folder-cache.c (rename_folders):
-	* em-format-html.c (em_format_html_get_type):
-	* mail-session.c (main_get_filter_driver):
-	* mail-config.c (gconf_mime_types_changed), (uri_to_evname),
-	(mail_config_folder_to_cachename), (get_new_signature_filename):
-	Adapt to new meaning of mail_component_peek_base_directory().
-
-	* mail-component.c (mail_component_init):
-	Add back initialization of priv->base_directory.  Accidentally
-	removed it somehow in last commit.
-
-2008-03-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #513951
-
-	* mail-config.c (gconf_mime_types_changed):
-	Adapt to new meaning of xxx_component_peek_base_directory().
-
-	* mail-component.c:
-	Use e_get_user_data_dir() instead of constructing the full path.
-
-2008-03-06  Tobias Mueller  <muelli@auftrags-killer.org>
-
-	** Fix for bug #520745
-
-	* mail/em-format.c: Fix format-string vulnerability
-	Patch by Tor Lillqvist <tml@iki.fi>
-
-2008-03-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-tree.c (emft_drop_async__done):
-	Re-fix bug #351672 since my patch for bug #362638 accidentally
-	reverted the original solution.
-
-2008-03-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for BNC bug #282466
-
-	* em-icon-stream.c: (em_icon_stream_get_image),
-	(em_icon_stream_is_resized): Handle CIDs of broken cases too.
-
-2008-03-03  Changwoo Ryu  <cwryu@debian.org>
-
-	* default/Makefile.am:
-	* default/ko/*: Add Korean welcome message translation.
-
-2008-03-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* evolution-mail.schemas.in: Make Bogofilter the default junk plugin
-	in Evolution.
-
-2008-02-22  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #512776
-
-	* Changes below prevents deadlock on start or send/receive.
-	* mail-send-recv.c: (struct _refresh_folders_msg),
-	(refresh_folders_exec), (refresh_folders_free),
-	(receive_update_got_folderinfo): Do not look for active folders in
-	main thread, rather do it in other thread and free folder info later.
-	* mail-ops.h: (mail_get_folderinfo):
-	* mail-ops.c: (struct _get_folderinfo_msg), (get_folderinfo_done),
-	(get_folderinfo_free), (mail_get_folderinfo):
-	* mail-folder-cache.h: (mail_note_store):
-	* mail-folder-cache.c: (struct _update_data), (update_folders),
-	(mail_note_store):
-	* mail-component.c: (mc_add_store_done): 
-	The 'done' function returns if we can free folder info or not.
-
-2008-02-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for BNC #358697
-
-	* em-folder-browser.c: (emfb_set_folder): Make sure the default search
-	filter for sent/draft/outbox is "Recipients Contain"
-
-2008-02-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #469292
-
-	* em-format-quote.c: (emfq_format_clone): Add empty line only when top
-	posting is enabled.
-
-2008-02-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #516349
-
-	* em-format-quote.c: (emfq_format_message):
-	Do not force black text in quotation part of the message.
-
-2008-02-18  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #515744
-
-	* em-folder-view.c: (emfv_setup_view_instance):
-	* mail-component.c: (impl_finalize):
-	* message-list.c: (ml_tree_value_at):
-	Memory leak fix.
-
-2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #167638
-
-	* mail-component.c: (impl_quit): Upstreamed Fejj's OpenSUSE patch for
-	faster quitting.
-
-2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bnc #153807
-
-	* em-composer-utils.c: (em_utils_post_to_folder): Patch from OpenSUSE.
-
-2008-02-16  Aidan Delaney  <a.j.delaney@brighton.ac.uk>
-
-	** Fix for bug #516234
-
-	* em-popup.c: (emp_apps_open_in): Removed a stray printf() statement. 
-
-2008-02-15  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #515659
-
-	* em-format-html.c: (em_format_html_set_mark_citations):
-	Keep mark_citations and the CAMEL_MIME_FILTER_TOHTML_MARK_CITATION
-	flag (part of text_html_flags) in sync.
-
-2008-02-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #515054
-
-	* em-folder-view.c: (emfv_popup_mark_junk), (emfv_popup_mark_nojunk):
-	Also clear/set new CAMEL_MESSAGE_NOTJUNK flag.
-
-2008-02-10  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #411576
-
-	* evolution-mail.schemas.in: Add a key to decide if same fonts gotto
-	be used in message list in vertical view column.
-	* message-list.c: (create_composite_cell):
-
-2008-02-10  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #510642
-
-	* evolution-mail.schemas.in: Improved a schema-description. 
-	* mail-config.glade: Improved an error-message. 
-
-2008-02-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #509741
-
-	* mail-session.c (user_message_exec):
-	Use the number of dialog buttons as a heuristic for whether to
-	display a message in the status bar or immediately present the
-	dialog to the user.
-
-2008-01-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-send-recv.c:
-	Replace G_GNUC_FUNCTION (deprecated) with G_STRFUNC.
-
-2008-01-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #506948
-
-	* em-folder-view.c: (url_unescape_amp), (emp_uri_popup_link_copy):
-	Copy the unescaped url
-
-2008-01-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #504062
-
-	* message-list.c: (get_normalised_string): Store strings for addresses,
-	 instead of collate keys.
-	* message-list.etspec: Compare Subject as strings, not as collate.
-
-2008-01-28  Andre Klapper  <a9016009@gmx.de>
-
-	* em-filter-i18n.h: Added translator comments.
-	* message-tag-followup.c: Added translator comments. 
-
-2008-01-25  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fix for #467581.
-
-	* em-folder-browser.c : Don't cancel all threads for a vfolder
-	based search (all/account search). Introduced cameloperation for
-	this and cancel it on clear.
-	
-2008-01-24  Milan Crha  <mcrha@redhat.com>
-
-	** Partial fix for bug #395939
-
-	* em-format.c: (emf_inlinepgp_signed):
-	* em-format-html-display.c: (efhd_format_optional):
-	* em-folder-view.c: (emfv_destroy):
-	Memory leak fix.
-
-2008-01-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #402487
-
-	* em-folder-browser.c: (emfb_search_search_activated),
-	(generate_viewoption_menu): Memory leak fix.
-
-2008-01-24  Milan Crha  <mcrha@redhat.com>
-
-	** Part of bug #511488
-
-	* mail-vfolder.h:
-	* mail-vfolder.c: (vfolder_loaded): Function dropped.
-	* mail-vfolder.c: (vfolder_load_storage): Allow to call this function
-	more than once, but do load the storage only once.
-	* em-folder-utils.c: (emfu_popup_new_folder_response):
-	* mail-vfolder.c: (vfolder_edit), (vfolder_gui_add_rule),
-	(vfolder_gui_add_from_message), (vfolder_gui_add_from_address):
-	* em-folder-browser.c: (emfb_search_menu_activated):
-	* em-folder-view.c: (emp_uri_popup_vfolder_sender),
-	(emp_uri_popup_vfolder_recipient), (vfolder_type_current):
-	Ensure vfolder is running.
-
-2008-01-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #511488
-
-	* em-folder-tree-model.c: (em_folder_tree_model_signal_block):
-	* em-folder-tree-model.h: Function to block folder-created function.
-	* mail-vfolder.c: (vfolder_load_storage): Block the signal handler
-	when loading.
-
-2008-01-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #510779
-	** Fix for bug #504103
-
-	* em-mailer-prefs.c: (jh_tree_refill), (jh_add_cb), (jh_remove_cb),
-	(init_junk_tree), (custom_junk_button_toggled),
-	(em_mailer_prefs_construct): Added UI for the new junk preferences.
-	* em-mailer-prefs.h:
-	* evolution-mail.schemas.in: Add schema for junk header and address
-	lookup.
-	* mail-config.c: (gconf_jh_check_changed),
-	(gconf_lookup_book_changed), (gconf_jh_headers_changed),
-	(mail_config_init), (mail_config_reload_junk_headers),
-	(mail_config_get_lookup_book):
-	* mail-config.glade:
-	* mail-config.h:
-	* mail-session.c: (class_init), (lookup_addressbook),
-	(mail_session_init), (mail_session_set_junk_headers):
-	* mail-session.h:
-
-2008-01-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #405777
-
-	* em-folder-view.c: (emfv_setup_view_instance),
-	(emfv_setting_notify): Don't break abstraction. Call the right derived
-	class.
-
-2008-01-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* message-list.etspec: Revert the last cursor remove commit. It breaks
-	selections with CTRL. May be, cairofy the cursor.
-	
-2008-01-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* message-list.etspec: Remove the focus cursor on the message list.
-	The message list now has a nice cairo rendered row. This looks very
-	close to the GtkTreeView thing.
-
-2008-01-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-browser.c:
-	* message-list.c:
-	Change of heart; decided we like the old "emblem-important" 
-	icon better than "mail-mark-important" for the message list
-	and "Show" combo box.
-
-2008-01-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #509741
-
-	* mail-session.c (user_message_exec):
-	Fix a crash that occurs when prompted to accept a certificate.
-	This is just a quick temporary fix; Srini and I have a more
-	sophisticated solution in mind.
-
-2008-01-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #509697
-
-	* mail-vfolder.c: (vfolder_edit):
-	Ensure search folders are running before calling anything from this.
-
-2008-01-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* evolution-mail.schemas.in: Add missing punctuation.
-
-2008-01-14  Gert Kulyk  <gkulyk@yahoo.de>
-
-	** Fix for bug #350932
-
-	* mail-config.glade: Enable the use of scrollable tabs in the 
-	mail-preferences dialog. 
-
-2008-01-14  Martin Meyer  <elreydetodo@gmail.com>
-
-	** Fix for bug #496301
-
-	* evolution-mail.schemas.in: Made the long description of a couple of 
-	schemas more readable. 
-
-2008-01-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #488213
-
-	* em-icon-stream.c: (emis_fit):
-	* em-format-html-display.c: (efhd_attachment_button):
-	Use global function e_icon_factory_pixbuf_scale for scaling pixbufs.
-
-2008-01-10  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #507067
-
-	* em-format-html-display.c: (efhd_get_uri_puri):
-	Leak fix and enhanced behavior to return more than one URI separated
-	by new line character ('\n'), if possible.
-	* em-folder-view.c: (emfv_uri_popup_free): Free item itself too,
-	because since now we use new allocated items, not the static one.
-	* em-folder-view.c: (emfv_free_em_popup), (emfv_append_menu),
-	(emfv_format_popup_event): Merge menus for more URIs and for part too.
-
-2008-01-10  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #211353
-
-	* filtertypes.xml:
-	* vfoldertypes.xml:
-	* em-folder-view.c:
-	* em-folder-browser.c:
-	* em-mailer-prefs.h:
-	* em-mailer-prefs.c:
-	* mail-config.h:
-	* mail-config.c:
-	* mail-config.glade:
-	* message-list.c:
-	Label tags are now generated based on label name when creating, except
-	of first 5 labels. New menu option "New Label" in popup menu over
-	message list and editing of labels has been changed in Preferences.
-	Also renaming tab in Preferences for "Labels", not "Colors", and the
-	tab label too.
-	mail-config-label... functions was moved to e-util/e-util-labels.c/.h.
-	* message-list.etspec: Normalized columns has been moved by one
-	when label column has been added.
-
-2008-01-10  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Most of the errors are now non-intrusive 
-
-	* em-folder-utils.c: (emfu_copy_folder_selected),
-	(emfu_delete_response), (em_folder_utils_delete_folder):
-	* em-folder-view.c: (emfv_delete_msg_response):
-	* em-utils.c: (em_utils_edit_filters),
-	(em_utils_save_part_to_file), (em_utils_temp_save_part),
-	(error_response), (em_utils_show_error_silent),
-	(em_utils_show_info_silent):
-	* em-utils.h:
-	* mail-autofilter.c: (mail_filter_delete_uri):
-	* mail-component.c: (mail_component_show_logger):
-	* mail-mt.c: (mail_msg_free):
-	* mail-session.c: (do_user_message):
-	* mail-vfolder.c: (mail_vfolder_delete_uri), (vfolder_edit_rule):
-
-2008-01-10  Sankar P  <psankar@novell.com>
-
-	* em-format-html.c: (efh_format_headers):
-	Decode the right thingy. Fixes a regression in
-	decoding of face header introduced while migration of
-	camel_* functions to g_* functions.
-
-2008-01-08  Djihed Afifi <djihed@gmail.com>
-
-	** Fix for bug #309432
-
-	* em-format-html.c: Fix message headers for RTL languages.
-
-2008-01-08  Colin Leroy  <colin@colino.net>
-
-	** Fix for bug #499145
-
-	* mail/em-composer-utils.c: Follow RFC 3798 to send return receipts.
-
-2008-01-08  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #474118
-
-	* mail-ops.c: (prepare_offline_exec): Check for the right type of store
-	and invoke appropriate functions. 
-
-2008-01-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #300336
-
-	* mail-vfolder.h: (vfolder_loaded):
-	* mail-vfolder.c: (vfolder_loaded): New helper function.
-	* em-folder-utils.c: (emfu_popup_new_folder_response):
-	* mail-vfolder.c: (vfolder_gui_add_rule),
-	(vfolder_gui_add_from_message), (vfolder_gui_add_from_address):
-	* em-folder-browser.c: (emfb_search_menu_activated):
-	* em-folder-view.c: (emp_uri_popup_vfolder_sender),
-	(emp_uri_popup_vfolder_recipient), (vfolder_type_current):
-	Ensure vfolder is running.
-	* mail-component.c: (mc_startup): Do not start vfolder when
-	disabled by option '/apps/evolution/mail/display/enable_vfolders'.
-	* evolution-mail.schemas.in: Added schema for new option.
-	* mail-config.glade:
-	* em-mailer-prefs.h:
-	* em-mailer-prefs.c: Added checkbox for "Enable Search Folders" option.
-
-2008-01-06  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	** Fix bug #497914
-
-	* em-mailer-prefs.c: (emmp_header_is_valid):
-	backport changes from the copy/pasted code in imap-headers
-	plugin.
-
-2008-01-06  Michael Monreal  <michael.monreal@gmx.net>
-
-	** Fix for bug #492188
-
-	* em-folder-browser.c:
-	* em-folder-tree.c:
-	* em-folder-view.c:
-	* message-list.c:
-
-	Use the new Tangoized icons instead of deprecated icons from 
-	gnome-icon-theme.
-
-2008-01-02  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #317823
-
-	* em-format-html-display.c: (efhd_get_uri_puri):
-	New helper function to dig up uri or puri from the GtkHtml.
-	If the object is an image, then pass it as puri or uri, depends
-	on the source of the image.
-	* em-format-html-display.c: (efhd_html_button_press_event),
-	(em_format_html_display_popup_menu): Using new helper function.
-
-2008-01-02  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #364642
-
-	* em-composer-prefs.h: (struct _EMComposerPrefs):
-	* em-composer-prefs.c: (em_composer_prefs_construct):
-	* mail-config.glade:
-	* evolution-mail.schemas.in:
-	(/apps/evolution/mail/composer/request_receipt):
-	New option in Composer tab to preset Request Read Receipt in composer.
-
-2008-01-02  Andre Klapper  <a9016009@gmx.de>
-
-	* mail-config.glade:
-	add mnemonic_widget for default junk plugin. see bug #476264.
-
-2008-01-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-event.c: (eme_target_free):
-	* em-event.h:
-	* em-folder-tree-model.c: (em_folder_tree_model_get_folder_name):
-	* em-folder-tree-model.h:
-	* mail-folder-cache.c: (real_flush_updates): Send the folder name
-	along with the new mail event.
-
-2007-12-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #362638
-
-	* mail-mt.h:
-	Overhaul the message passing API:
-	- Define a MailMsg type as the base message struct.
-	- Define types for the various callback functions.
-	- Add a priority value to each message (not yet used).
-	- Add a reference count to each message.
-	- Define a MailMsgInfo type for the virtual function table.
-	- Record the size of message sub-types in MailMsgInfo.
-	- New/changed functions:
-	    mail_msg_new()   - Easier to use.
-	    mail_msg_ref()   - Increase reference count.
-	    mail_msg_unref() - Decrease reference count.
-	    mail_msg_main_loop_push()    }
-	    mail_msg_unordered_push()    } Submit MailMsgs to various
-	    mail_msg_fast_ordered_push() } message-processing threads.
-	    mail_msg_slow_ordered_push() }
-
-	* mail-mt.c (mail_msg_new):
-	Use GSlice for memory allocation.
-
-	* mail-mt.c (mail_msg_ref), (mail_msg_unref):
-	New functions increment/decrement a MailMsg's reference count.
-
-	* mail-mt.c (mail_cancel_hood_add), (mail_cancel_hook_remove):
-	Convert the 'cancel_hook_list' from an  EDList to a GHookList and
-	modify the API accordingly.
-
-	* mail-mt.c:
-	Use GThreadPools instead of EThreads.
-	Use GAsyncQueues instead of EMsgPorts.
-
-	* em-composer-utils.c:
-	* em-folder-browser.c:
-	* em-folder-properties.c:
-	* em-folder-tree.c:
-	* em-folder-utils.c:
-	* em-folder-view.c:
-	* em-format-html-print.c:
-	* em-format-html.c:
-	* em-subscribe-editor.c:
-	* em-sync-stream.c:
-	* importers/elm-importer.c:
-	* importers/mail-importer.c:
-	* importers/pine-importer.c:
-	* mail-component.c:
-	* mail-folder-cache.c:
-	* mail-mt.c:
-	* mail-ops.c:
-	* mail-ops.h:
-	* mail-send-recv.c:
-	* mail-session.c:
-	* mail-vfolder.c:
-	* message-list.c:
-	Use the new MailMsg API for messages.
-
-2007-12-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-mt.c (do_op_status): Fix another compiler warning.
-
-2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail-mt.c: (mail_msg_free), (mail_msg_check_error): Fix some compiler warnings.
-
-2007-12-14  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #211353
-
-	* message-list.etspec:
-	* message-list.h:
-	* message-list.c: Added new column to show labels.
-	* filtertypes.xml:
-	* vfoldertypes.xml:
-	Code for label filters/search folders has been changed.
-	* mail-config.glade:
-	* em-folder-view.c: (emfv_set_label), (emfv_unset_label),
-	(emfv_popup_label_clear), (emfv_popup_label_set),
-	(emfv_popup_labels_get_state_for_tag), (emfv_popup):
-	Labels popup submenu is now shown with checkboxes so one can set
-	more than one label to the message and unset only one label from
-	message. There has been added new function, because of this.
-	* mail-config.h:
-	* mail-config.c: New "interface" functions to work with labels.
-	* em-mailer-prefs.h:
-	* em-mailer-prefs.c: Editing labels in tree.
-	* em-folder-browser.c:
-	Labels in show menu reflect changes in preferences.
-
-
-2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #430369 
-
-	* mail-session.c: (mail_session_init): Init in the main gui thread.
-
-2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Non-intrusive errror reporting and basic logging support.
-
-	* em-folder-browser.c: (emfb_help_debug): Invoke the debug menu.
-	* evolution-mail.schemas.in: Schema for error timeout and level.
-	* mail-component.c: (mail_component_init), (render_pixbuf),
-	(render_level), (render_date), (append_logs), (spin_value_changed),
-	(mail_component_show_logger): Handle the lifecycle of the logger.
-	* mail-component.h: Api to show the logger.
-	* mail-config.c: (gconf_error_time_changed),
-	(gconf_error_level_changed), (mail_config_init),
-	(mail_config_get_error_timeout), (mail_config_get_error_level): Load
-	and get the error time and level.
-	* mail-config.h:
-	* mail-mt.c: (mail_msg_set_cancelable), (mail_msg_new),
-	(end_event_callback), (mail_msg_free), (mail_msg_check_error),
-	(operation_cancel), (do_op_status): Revamp the error handling.
-	* mail-mt.h:
-	* mail-ops.c: (send_queue_send), (mail_send_queue): Handle the send/receive 
-	case of error reporting separately.
-	* mail-send-recv.c: (free_send_info), (mail_send):
-
-2007-12-15  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-tree-model.c (emft_model_unread_count_changed),
-	(emfolder_tree_model_set_unread_count):
-	Fix recently introduced compiler warnings.
-
-2007-12-15  Milan Crha  <mcrha@redhat.com>
- 
- 	** Part of fix for bug #492702
- 
- 	* mail-config.h:
- 	* mail-config.glade:
- 	* evolution-mail.schemas.in:
- 	* mail-folder-cache.h:
- 	* mail-folder-cache.c:
- 	* em-mailer-prefs.h:
- 	* em-mailer-prefs.c: Moved bits of sound notification
- 	on new messages to mail-notification plugin.
- 	* em-migrate.c: (is_in_plugs_list),
- 	(em_update_message_notify_settings_2_21), (em_migrate):
- 	Migration code to move old options to new plugin options.
- 
-2007-12-14  Sankar P  <psankar@novell.com>
-
-	* em-folder-tree-model.c: (emft_model_unread_count_changed),
-	(em_folder_tree_model_init),
-	(em_folder_tree_model_set_unread_count):
-	* em-folder-tree.c: (em_folder_tree_construct):
-	Moving some code from tree to model where it belongs.
-	Fixes some CPU usage issue whenever (un)read count is updated.
-	Hopefully no regresssions.
-
-2007-12-13  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-send-recv.c:
-	Fix an implicit function declaration.
-
-2007-12-12  Alex "weej" Jones  <alex@weej.com>
-
-	** Fix for bug #503111
-
-	* mail-session.c: (mail_session_add_junk_plugin):
-	Suppress "Loading %s as the default junk plugin" message.
-
-2007-12-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #502318
-
-	* em-format-html-display.c: (struct _EMFormatHTMLDisplayPrivate),
-	(efhd_search_destroy), (em_format_html_get_search_dialog),
-	(em_format_html_display_search), (em_format_html_display_search_with),
-	(em_format_html_display_search_close), (efhd_complete):
-	Track search dialog activity rather based on flag than on widget
-	existence, because the pointer to that widget it still
-	there (non-NULL) even after destroy of that widget.
-
-2007-12-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #336074
-
-	* mail-send-recv.c: (get_folders):
-	Determine whether refresh folder from the store based on result of new
-	store's function 'camel_store_can_refresh_folder'.
-
-2007-12-10  Jeff Cai  <jeff.cai@sun.com>
-
-	* em-folder-view.c: (emfv_setting_notify):
-	If it is not FolderBrowser object, the pane size
-	signal is not sent.
-	Fix #501677
-
-2007-12-07  Alex Kloss  <alexkloss@att.net>
-
-	** Fix for bug #329706
-
-	* em-utils.c (em_utils_prompt_user):
-	Add mnemonic 'd' to 'Do not show...' checkbox
-	* mail.error.xml:
-	Remove redundant 'Send anyway' label
-	Reorder buttons to 'Send','Cancel' as per HIG
-
-2007-12-07  Akhil Laddha  <lakhil@novell.com>
-
-	** Fix for bug #475508
-
-	* em-folder-view.c:
-	Changed the string for search folder and filter creation from
-	message list to make it understandable.
-
-2007-12-07  Denis Washington <denisw@svn.gnome.org>
-
-	** Fix for bug #500561
-
-	* em-folder-browser.c: Added icon for mark all messages as read menu 
-	item.
-
-2007-12-06  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #263236
-
-	* em-folder-view.c: (emfv_delete_msg_response):
-	Look for "Do not ask me again" check in alignment, so
-	let it works properly.
-
-2007-12-05  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail-config.h: Fix a compiler warning.
-
-2007-12-05  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added a preference to disable Magic Spacebar.
-
-	* em-folder-browser.c: (html_scroll), (emfb_list_key_press): Check the cfg 
-	  before invoking Magic Spacebar
-	* em-mailer-prefs.c: (em_mailer_prefs_construct): Preference window handling
-	* em-mailer-prefs.h:
-	* evolution-mail.schemas.in:
-	* mail-config.c: (gconf_magic_spacebar_changed),
-	(mail_config_init), (mail_config_get_enable_magic_spacebar): Add it part of MC.
-	* mail-config.glade: 
-	* mail-config.h:
-
-2007-12-04  David Turner  <cillian64@googlemail.com>
-
-	** Fix for bug #347329
-
-	* em-folder-selector.c: (em_folder_selector_create_new):
-	Added a mnemonic to the 'Create' button of the 'New Folder' dialog
-
-2007-12-04  Alex Kloss  <alexkloss@att.net>
-
-	** Fix for bug #329578
-
-	* em-account-editor.c: (emae_receive_options_item):
-	Add mnemonic for "minutes" widget
-
-2007-12-04  David Turner  <cillian64@googlemail.com>
-
-	** Fix for bug #446029
-
-	* em-format-html-display.c: (em_format_html_get_search_dialog):
-	Fix for a mnemonic conflict in 'Find in Message' feature.
-
-2007-12-04  Alex Kloss  <alexkloss@att.net>
-
-	** Fix for bug #466503
-
-	* mail-config.glade: Fix for a mnemonic conflict in 
-	Preferences -> Mail Preferences -> Junk tab.
-
-2007-12-04  David Turner  <cillian64@googlemail.com>
-
-	** Part of fix for bug #466499
-
-	* em-account-editor.c: (emae_option_toggle):
-	Added support for mnemonics in config options from camel
-
-2007-12-04  David Turner  <cillian64@googlemail.com>
-
-	** Fix for bug #466497
-
-	* mail-config.glade: Changed some mnemonics to stop l being used
-	as a mnemonic key
-
-2007-12-04  David Turner  <cillian64@googlemail.com>
-
-	** Fix for bug #466241
-
-	* mail-config.glade: Added a mnemonic to "Authentication type"
-	in the recieving mail section of configuration
-
-2007-12-03  Denis Washington  <denisw@svn.gnome.org>
-
-	** Fix for bug #363644
-
-	* mail-send-recv.c:
-	Added a 6px padding around the scrolled window so that
-	it's border doesn't look like a separator on the bottom.
-
-2007-11-29  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #271551
-
-	* evolution-mail.schemas.in:
-	New key "/apps/evolution/mail/composer/current_folder".
-
-2007-11-28  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-session.c:
-	Fix an implicit function declaration caused by my last commit.
-
-2007-11-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #495123
-
-	* mail-session.c (mail_session_init):
-	Pass the CamelSession to the EAccountComboBox class (ugly hack).
-
-2007-11-26 Nicholas Miell <nmiell@gmail.com>
-
-	** Fix for bug #216485
-	Edit->Select thread menu fix and improvement.
-
-	* em-folder-browser.c: (emfb_edit_select_subthread): new function,
-	(emfb_enable_map, emfb_verbs) hook it up
-	* message-list.c: (select_thread): new function based on
-	thread_select_foreach, (thread_select_foreach): remove the logic
-	now in select_thread, (message_list_select_thread): use
-	select_thread, (subthread_select_foreach): new function,
-	(message_list_select_subthread): new function
-	* message-list.h: (message_list_select_subthread): add prototype
-
-2007-11-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #494414
-
-	* em-folder-selection-button.c: (set_contents): If used uri points
-	to an account, then prepend account's name to folder name.
-
-2007-11-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #494425
-
-	* em-utils.c: (get_unique_file_names):
-	New helper function to "assign" unique file name to each part.
-	* em-utils.c: (em_utils_save_parts): Use new helper function.
-
-2007-11-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #335931
-
-	* message-list.c: (struct _regen_list_msg): New member last_row.
-	* message-list.c: (regen_list_regen): Store last_row for later use.
-	* message-list.c: (regen_list_regened): Restore row based on last_row
-	when no uid was selected before.
-	* message-list.c: (mail_regen_list): Init new last_row member.
-	* em-folder-view.c: (emfv_select_next_message): New helper function
-	to select messages in list.
-	* em-folder-view.c: (emfv_popup_mark_junk), (emfv_popup_mark_nojunk),
-	(emfv_popup_delete): Using new helper function, so get same behavior.
-
-	* message-list.h: (struct _MessageList):
-	* message-list.c: (on_cursor_activated_cmd): Removed cursor_row member.
-
-2007-11-22  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #498551
-
-	* em-folder-tree.c: (emft_get_folder_info__got):
-	Remove placeholder node even for store if no children found.
-
-2007-11-22  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #256899 by Chaya
-
-	* mail-config.glade:
-	* em-account-prefs.h: (struct _EMAccountPrefs):
-	* em-account-prefs.c: (account_delete_clicked),
-	(account_able_clicked), (account_able_toggled),
-	(account_cursor_change), (em_account_prefs_construct):
-	Remove "Disable/Enable" button from Mail Accounts preferences.
-
-2007-11-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #480514
-
-	* em-folder-browser.c: (get_view_query),
-	(emfb_search_search_activated): Let work "Last 5 Days' Messages" and
-	"Recent messages" filters in Sent folder too.
-
-2007-11-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #493783
-
-	* em-format-html.c: (efh_format_timeout): Do not erase old content
-	when re-formatting same mail, so keep scroll position.
-
-2007-11-18  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	** Fix bug #495875
-
-	* em-folder-tree.c:
-	right click menu reordering
-
-2007-11-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-tree.c (em_folder_tree_get_selected_folder_info):
-	Call camel_folder_info_new() instead of g_new0().
-
-2007-11-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #263236
-
-	* mail.error.xml: Terminology cleanup.
-
-2007-11-12  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #263236
-
-	* mail.error.xml: New message "ask-delete-vfolder-msg".
-	* em-folder-view.c: (emfv_delete_msg_response),
-	(emfv_popup_delete): When deleting from vFolder, ask if really want
-	to and warn about deleting in a real folder too.
-	* evolution-mail.schemas.in: New option
-	"/apps/evolution/mail/prompts/delete_in_vfolder" to not ask again.
-
-2007-11-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-selector.h:
-	Fix some typos in the GObject macros.
-
-2007-11-06  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #492170
-
-	* em-migrate.c:
-	* evolution-mail.schemas.in:
-	* mail-config.c:
-	Replace the old color definitions with very similar colors from
-	the Tango color palette.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #343011
-	(restore collapse state of selected folder after start)
-
-	* em-folder-tree.c: (emft_maybe_expand_row): Do not expand subtree of
-	a node, only make it visible.
-	* em-folder-tree-model.h: (em_folder_tree_model_get_expanded_uri),
-	(em_folder_tree_model_set_expanded_uri):
-	* em-folder-tree-model.c: (em_folder_tree_model_get_expanded_uri),
-	(em_folder_tree_model_set_expanded_uri):
-	Same as ..._get/_set_expanded, but using 'uri', instead of 'key'.
-	* em-folder-tree-model.c: (emftm_uri_to_key): New helper function.
-	* mail-component.c: (impl_createView): Restore collapsed state after
-	selecting last selected folder, if necessary.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #488298
-
-	* em-folder-view.c: (EMFolderViewEnable emfv_enable_map[]):
-	Disable "MessageMarkAsNotJunk" if requested by context.
-	* mail-folder-cache.c: (update_1folder): Do not count junked
-	messages into "new" messages in drafts and out box.
-	* em-popup.c: (em_popup_target_new_select): Disable "MarkAsJunk"
-	and "MarnAsNotJunk" in drafts and out box.
-
-2007-11-05  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #492102
-
-	* em-folder-view.c: Use mail-mark-read icon.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	* em-folder-view.c: (emfv_message_reply): Leak fix.
-
-2007-11-05  Sankar P  <psankar@novell.com>
-
-	* em-folder-tree.c:
-	Change enum order. LAST should be the last.
-	Regression from #446035
-	
-	** Fix for bug #493646
-
-2007-10-31  Priit Laes  <plaes@svn.gnome.org>
-	
-	* em-format-html-display.c: Fix typo in documentation.
-	* em-message-browser.c: Ditto.
-
-2007-10-31  Priit Laes  <plaes@svn.gnome.org>
-
-	* mail-component.c: (view_changed): Fix the ordering of the string
-	components.
-
-2007-10-30  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #446035
-
-	* em-folder-tree.c: (render_pixbuf):
-	Use the folder-saved-search icon for vfolders.
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-searching-tokenizer.c: (build_trie), (searcher_new),
-	(output_token), (output_match), (merge_subpending),
-	(searcher_next_token):
-	* em-account-editor.c: (em_account_editor_new), (emae_load_text),
-	(emae_check_license), (emae_auto_detect), (smime_sign_key_select),
-	(smime_encrypt_key_select), (emae_service_url_path_changed),
-	(emae_ssl_changed), (emae_service_provider_changed),
-	(emae_refresh_providers), (emae_refresh_authtype),
-	(emae_setup_service), (emae_identity_page):
-	* em-composer-utils.c: (em_utils_send_receipt),
-	(generate_account_hash), (em_utils_camel_address_to_destination),
-	(reply_get_composer):
-	* em-config.c: (em_config_new):
-	* em-event.c: (em_event_peek):
-	* em-filter-rule.c: (get_widget):
-	* em-folder-browser.c: (generate_viewoption_menu),
-	(em_folder_browser_show_preview), (get_view_query),
-	(vfolder_setup_do), (emfb_search_search_activated),
-	(emfb_list_key_press), (emfb_list_built):
-	* em-folder-view.c: (em_folder_view_new),
-	(emfv_setup_view_instance), (emfv_popup_forward),
-	(emp_uri_popup_vfolder_sender), (emp_uri_popup_vfolder_recipient),
-	(emfv_enable_menus):
-	* em-format-hook.c:
-	* em-format-html-display.c: (efhd_attachment_optional):
-	* em-format-html.c: (em_format_html_new),
-	(em_format_html_add_pobject), (em_format_html_find_pobject),
-	(em_format_html_find_pobject_func), (efh_text_enriched),
-	(efh_multipart_related), (efh_format_address), (efh_format_header):
-	* em-icon-stream.h:
-	* em-inline-filter.c: (emif_add_part), (emif_scan):
-	* em-junk-hook.c: (emjh_construct_group):
-	* em-mailer-prefs.c: (junk_plugin_setup):
-	* em-menu.c: (em_menu_new), (em_menu_target_new_select):
-	* em-message-browser.c: (em_message_browser_new):
-	* em-popup.c: (em_popup_new), (em_popup_target_new_select):
-	* em-sync-stream.c:
-	* em-utils.c: (em_utils_save_part_to_file), (tag_editor_response),
-	(em_utils_read_messages_from_stream), (em_utils_get_proxy_uri),
-	(em_utils_in_addressbook):
-	* em-vfolder-rule.c: (validate):
-	* importers/elm-importer.c:
-	* importers/mail-importer.c: (import_mbox_import),
-	(import_folders_rec):
-	* importers/pine-importer.c:
-	* mail-component.c: (setline_done):
-	* mail-folder-cache.c: (flush_updates):
-	* mail-mt.c: (mail_msg_new), (checkmem), (mail_msg_check_error),
-	(mail_msg_cancel), (mail_msg_wait), (mail_msg_init),
-	(do_op_status):
-	* mail-send-recv.c: (receive_status), (receive_done),
-	(refresh_folders_get):
-	* mail-vfolder.c: (mail_vfolder_get_sources_local),
-	(mail_vfolder_get_sources_remote), (context_rule_added),
-	(store_folder_renamed):
-	* message-list.c: (e_mail_address_new), (e_mail_address_compare),
-	(get_normalised_string), (ml_search_forward), (ml_search_backward),
-	(ml_search_path), (message_list_select_uid),
-	(thread_select_foreach), (message_list_copy), (ml_duplicate_value),
-	(ml_free_value), (ml_initialize_value), (ml_value_is_empty),
-	(ml_value_to_string), (subtree_latest), (sanitize_recipients),
-	(ml_tree_value_at), (ml_tree_sort_value_at),
-	(message_list_init_images), (filter_date), (build_tree),
-	(build_flat_diff), (regen_list_regen):
-
-	Warning fixes:
-	- NULL vs. 0 vs FALSE
-	- ANSIfication of function declarations
-	- Remove unused bits
-	- use unsigned ints for 1-bit bitfields
-	- invalid pointer type
-	- mark a global var static
-	- mixing code and declarations
-
-2007-10-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #489027
-
-	* evolution-mail.schemas.in: New hidden option 'thread_latest' to fall
-	back to thread sorting like before 2007-05-17 (see below).
-	* message-list.c: (struct _MessageListPrivate),
-	(message_list_construct): New property 'thread_latest'.
-	* message-list.c: (ml_tree_sort_value_at): Sort based on this property.
-
-2007-10-24  Milan Crha <mcrha@redhat.com>
-
-	** Fix for bug #467364 by Christian Kintner
-
-	* evolution-mail.schemas.in: 
-	* mail-config.glade: Evolution uses "Emoticon" instead of "Smiley".
-
-2007-10-24  Andre Klapper <a9016009@gmx.de>
-
-	** Fix for bug #261165
-
-	* filtertypes.xml: added search on CC and BCC
-
-2007-10-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #271734
-
-	* mail-mt.c: (do_op_status): Show description of operation, if
-	available, instead of empty string and end activity properly, if
-	operation ended before/during activity start. 
-
-2007-10-15  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-view.c:
-	Fix broken icon for View -> Zoom -> Normal Size.
-
-2007-10-12  Michael Monreal <michael.monreal@gmail.com>
-
-	** New inbox/outbox/sent icons (bug #479257)
-
-	* mail/em-folder-tree.c, mail/mail-send-recv.c:
-	Change icon references.
-
-2007-10-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-format.c (em_format_add_puri):
-	Use G_GSIZE_FORMAT when printing a gsize/size_t to make compilers
-	on all arches happy.
-
-2007-10-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #323977
-
-	* em-filter-rule.c: (get_widget):
-	Use "Add Action" instead of plain "Add" for button label.
-
-2007-10-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #329823
-
-	* mail-component.h: (mail_indicate_new_mail):
-	* mail-component.c: (mail_indicate_new_mail),
-	(struct _MailComponentPrivate), (impl_dispose), (impl_createView):
-	New function to indicate new mails on sidebar's button and storing
-	component_view in priv struct for later use.
-	* em-folder-view.c: (emfv_list_done_message_selected):
-	* mail-folder-cache.c: (real_flush_updates):
-	Indicate changes like for plugins for new mails.
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* e-searching-tokenizer.c:
-	* em-folder-browser.c:
-	* em-format-html.c:
-	* em-format-view.c:
-	* em-format.c:
-	* em-mailer-prefs.c:
-	* em-mailer-prefs.h:
-	* mail-session.c:
-	* mail-session.h:
-	* mail-vfolder.c:
-	* message-list.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-10-09  Tobias Mueller  <muelli@auftrags-killer.org>
-
-	** Fix for bug #482575
-
-	* em-folder-view.c: Don't use "insert_image" icon.
-	Patch by Michael Monreal <infernux@web.de>
-
-2007-10-09  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #484635
-
-	* em-folder-tree-model.c: (em_folder_tree_model_remove_store_info): 
-	Destroy functions in GHashTables to simplify memory management already 
-	free the store info. So do no free it again in this function.
-
-2007-10-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #477045
-
-	* em-popup.c: (EPopupItem emp_standard_uri_popups[]): Use 'contact-new'
-	icon name rather than 'edit-add' for "Add to address book" item.
-
-2007-10-05  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #468736 
-
-	* em-folder-view.c: (em_folder_view_print):
-	* em-format.c: (merge_missing), (em_format_merge_handler):
-	* em-format.h:
-
-2007-10-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #477045
-
-	* em-folder-tree.c:
-	Use "document-properties" icon in pop-up menu.
-
-2007-10-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #473903
-
-	* mail-send-recv.c: (build_dialog), (receive_get_folder):
-	Fixes serious warnings, rest is because of this fix.
-	* em-event.c: (em_event_target_new_send_receive):
-	* em-event.h: (struct _EMEventTargetSendReceive),
-	(em_event_target_new_send_receive):
-	Changed structure member and function prototype to reflect fixes.
-
-2007-10-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #469657
-
-	* em-composer-prefs.c:
-	* em-folder-tree-model.c:
-	* em-format.c:
-	* em-format-html.c:
-	* em-migrate.c:
-	* em-subscribe-editor.c:
-	* mail-component.c:
-	* mail-send-recv.c:
-	* message-list.c:
-	* importers/elm-importer.c:
-	Use destroy functions in GHashTables to simplify memory management.
-
-2007-10-01  Sankar P  <psankar@novell.com>
-
-	* em-format-html.c: (efh_format_headers):
-	Display Face header value if contacts doesn't 
-	have any image associated with them.
-	Fixes bug mentioned in #481235 and not the 
-	enhnacement request.
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-account-editor.c:
-	* evolution-mail.schemas.in:
-	* mail-config.glade:
-	Use consistent terminology for mail messages (#480621).
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #477045
-
-	* em-format-html.c (efh_format_headers):
-	* em-migrate.c (upgrade_passwords_1_2):
-	Use GLib's Base64 API instead of Camel's.
-
-2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #461195
-
-	* mail-marshalers.list: Remove needless marshalers.
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #477045
-
-	* em-folder-tree.c:
-	* em-folder-view.c:
-	* em-popup.c:
-	* mail-component.c:
-	* mail-mt.c:
-	* mail-send-recv.c:
-	* message-list.c:
-	Use standard icon names where applicable.
-
-2007-09-21  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am:
-	Distribute README.async (#478704).
-
-	* importers/Makefile.am:
-	Remove references to evolution-outlook-importer.c and
-	netscape-importer.c; we haven't shipped them for over two years
-	(see ChangeLog entry for 2005-07-01).
-
-2007-09-21  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #411125
-
-	* message-list.etspec:
-	Uses 'compare="collate"' instead of 'compare="string"' to handle UTF
-	characters correctly.
-
-2007-09-17  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #472865
-
-	* em-composer-utils.c: (ask_confirm_for_unwanted_html_mail):
-	Show dialog only when there is any recipient, not always.
-
-2007-09-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #476040
-
-	* em-folder-browser.c:
-	* message-list.c:
-	Use "mail-attachment" icon instead of "stock_attach".
-
-2007-09-12  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #473514
-
-	* em-filter-rule.c: (option_activate), (get_rule_part_widget):
-	Allow rule part fill space if requested.
-
-2007-09-12  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #231178
-
-	* filtertypes.xml: Added 'label' filtertype to the list.
-
-2007-09-07  Johnny Jacob  <jjohnny@novell.com>
- 
-	** Partial Fix for #467581.
-	
- 	* mail-component.c : (enable_folder_tree) : Get the right URIs for
-	selected and current folders.
- 	
-2007-09-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #473903
-
-	* em-folder-utils.c: (new_folder_created_cb),
-	(emfu_popup_new_folder_response):
-	* em-folder-tree.c: (get_last_child),
-	(em_folder_tree_select_prev_path):
-	* em-composer-utils.c: (composer_get_message):
-	* em-format.c: (em_format_add_puri):
-	* em-mailer-prefs.c: (junk_plugin_changed), (junk_plugin_setup):
-	Fixes serious compiler warnings.
-
-2007-09-06  Andre Klapper  <a9016009@gmx.de>
-
-	* mail-config.c: (config_cache_labels):
-	Don't translate empty label names.
-	Fixes bug 363645. Thanks to Bastien Nocera.
-
-2007-09-06  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #304993 (Novell Bugzilla)
-
-	* em-folder-selector.c: (emfs_response): Do allow folder selection of
-	created folders.
-	* em-folder-utils.c: (new_folder_created_cb): Expand only if selection
-	is not asked for.
-
-2007-09-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-view:
-	Use modern icon names for "Junk" and "Not Junk".
-
-2007-08-31  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #377763
-
-	* em-icon-stream.c: (emis_fit): Do not scale under 1x1 pixel.
-
-2007-08-31  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Move away from g_assert to g_return* calls 
-
-	* em-account-editor.c: (emae_auto_detect), (emae_queue_widgets):
-	* em-filter-editor.c: (select_source):
-	* em-filter-rule.c: (xml_encode):
-	* em-folder-properties.c: (emfp_commit), (emfp_get_folder_item):
-	* em-folder-tree-model.c: (folder_renamed):
-	* em-folder-tree.c: (em_folder_tree_get_model_storeinfo):
-	* em-folder-utils.c: (emfu_popup_new_folder_response):
-	* em-folder-view.c: (emfv_setup_view_instance):
-	* em-format-html-display.c: (efhd_attachment_optional):
-	* em-format-html.c: (em_format_html_add_pobject),
-	(efh_format_timeout):
-	* em-format.c: (em_format_add_puri):
-	* em-migrate.c: (emm_setup_initial):
-	* em-sync-stream.c: (sync_op):
-	* em-utils.c: (em_uri_to_camel):
-	* em-vfolder-rule.c: (em_vfolder_rule_add_source),
-	(em_vfolder_rule_find_source), (em_vfolder_rule_remove_source),
-	(xml_encode):
-	* mail-component.c: (view_control_activate_cb), (setline_done),
-	(mail_component_get_folder), (mail_component_get_folder_uri):
-	* mail-config-factory.c: (mail_config_control_factory_cb):
-	* mail-config.c: (mail_config_get_accounts):
-	* mail-folder-cache.c: (mail_note_store_remove), (mail_note_store):
-	* mail-mt.c: (do_op_status):
-	* mail-ops.c: (mail_append_mail), (mail_transfer_messages):
-	* mail-send-recv.c: (free_send_data), (mail_send_receive),
-	(mail_receive_uri):
-	* mail-session.c: (alert_user):
-	* mail-tools.c: (mail_tool_uri_to_folder):
-	* mail-vfolder.c: (mail_vfolder_add_uri),
-	(mail_vfolder_delete_uri), (mail_vfolder_rename_uri),
-	(store_folder_renamed):
-	* message-list.c: (get_message_uid), (get_message_info),
-	(get_normalised_string), (ml_duplicate_value), (ml_free_value),
-	(ml_initialize_value), (ml_value_is_empty), (ml_value_to_string),
-	(subtree_unread), (subtree_size), (subtree_latest),
-	(ml_tree_value_at), (ml_tree_sort_value_at),
-	(ml_tree_set_value_at), (build_subtree), (add_node_diff),
-	(remove_node_diff), (build_subtree_diff), (ml_getselected_cb),
-	(message_list_thaw):
-
-2007-08-30  Gavin Scott <gavindscott@yahoo.com>
-
-	** Fixes bug #351672
-
-	* em-folder-tree.c: Remove unneeded gtk_drag_finish call
-	
-2007-08-28  Wadim Dziedzic  <wadimd@svn.gnome.org>
-
-	* default/Makefile.am: added Polish translation of welcome email
-	* default/pl: 
-
-2007-08-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-format-html.c: Fix a typo build break.
-
-2007-08-27  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fix for #467635.
-
-	* evolution-mail.schemas.in : Changed string.
-	
-2007-08-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #431459
-
-	* em-format-hook.c: (emfh_construct): Enable format plugins while
-	loading only.
-
-2007-08-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #364700
-
-	* em-junk-hook.c: (em_junk_init): Load/Enable junk plugins while
-	loading only.
-	* mail-session.c: (mail_session_add_junk_plugin):
-
-2007-08-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #256878 from Vincent Untz
-
-	* em-format-html-display.c: Set the string for valid signatures.
-	* em-format-html.c:
-
-2007-08-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #414420 by Ed Catmur
-
-	* em-folder-view.c: (struct _EMFolderViewPrivate),
-	(emfv_destroy), (emfv_popup_mark_unread), (mst_free),
-	(emfv_list_done_message_selected):
-	Fix crasher on repeated destroy.
-
-2007-08-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #385414 by makuchaku (Mayank)
-
-	* em-format-html.c: (efh_format_source):
-	Use ...PRESERVE_8BIT rather than ...ESCAPE_8BIT for message source.
-
-2007-08-24  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #464338
-
-	* em-folder-browser.c: (emfb_folder_create): Fetches the CamelFolderInfo
-	from the EMFolderTree.
-
-2007-08-24  Li Yuan  <li.yuan@sun.com>
-
-	* mail-config.glade:
-	Fix for #262682. Add labelled-by relation between labels and
-	entry.
-
-2007-08-23  Sankar P  <psankar@novell.com>
-
-	reviewed by: Andre Klapper <a9016009@gmx.de>
-
-	* Fix for bug #468869
-
-	* mail-config.glade:
-	Mark strings for Translation.
-
-2007-08-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #468303
-
-	* em-mailer-prefs.c: (junk_plugin_setup): Add strings for i18n.
-
-2007-08-21  Tobias Mueller  <tobiasmue@svn.gnome.org>
-
-	** Another fix for bug #467382
-
-	* em-folder-view.c: Changing position of emfb_enable_map to 
-	be able to compile with -pedantic
-
-2007-08-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #468734
-
-	* em-mailer-prefs.c: (label_color_set): color-set signal has no rgba
-	passed.
-
-2007-08-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-component.c (enable_folder_tree):
-	Alternate fix for bug #467599 (also bug #467883).
-
-2007-08-20  Tobias Mueller  <tobiasmue@svn.gnome.org>
-
-	** Fix for bug #467382
-
-	* em-folder-browser.c: Changing position of emfb_enable_map to 
-	be able to compile with -pedantic
-
-2007-08-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #367760
-
-	* em-utils.c: (em_filename_make_safe): Added '#' as non-safe character.
-	* em-utils.c: (em_utils_save_part): Using em_filename_make_safe and
-	creates filename similar to em_utils_save_parts.
-	* em-utils.c: (em_utils_save_parts): Using em_filename_make_safe.
-
-2007-08-20  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fix for bug #467599.
-		
-	* mail-component.c: (enable_folder_tree): No need to emit a
-	folder_selected signal when no folder is selected. Plugged a
-	memory leak.
-			
-2007-08-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #467165
-
-	* em-folder-tree.c: (emft_tree_user_event): If the event is null, it
-	may be a keyboard event. 
-
-2007-08-16  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #350539
-
-	* em-format-quote.c: (emfq_format_headers), (emfq_text_plain):
-	* em-format.c: (emf_multipart_alternative), (emf_inlinepgp_signed):
-	* em-popup.c: (emp_part_popup_set_background):
-	* em-format-html.c: (efh_text_plain), (efh_message_external),
-	(efh_format_headers):
-	Ensures non-NULL part.
-
-2007-08-16  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #467198
-
-	* mail-component.c: (enable_folder_tree): Initialize the camel
-	exception.
-
-2007-08-16  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fix for #364431.
-	
-	* em-subscribe-editor.c : (sub_editor_refresh) : Wait for thread
-	to finish before refreshing.
-	
-2007-08-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #466548
-
-	* em-composer-utils.c: (em_utils_composer_send_cb):
-	e_msg_composer_get_preferred_account can return NULL, so test for it.
-
-2007-08-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #352346
-
-	* em-migrate.c (em_update_accounts_2_11), (em_migrate):
-	Added function to change "spool" to "spooldir" for those
-	spools which points on directories.
-
-2007-08-13  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fix for #458498 from Lucky Wankhede <wlakke@novell.com>
-	
-	* evolution-mail.schemas.in : String fix.
-	
-2007-08-08  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-folder-browser.c: (emfb_set_folder): Use the gconf key to
-	unselect mail and preview.
-	* evolution-mail.schemas.in: Add a new gconf key to have a safe view
-	if the selected mail crashes.
-
-2007-08-07  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #464312
-
-	* em-folder-tree-model.c: (em_folder_tree_model_get_selected): If the
-	selected uri is empty string, let it be NULL.
-	* em-folder-tree.c: (emft_tree_selection_changed),
-	(em_folder_tree_select_prev_path): If nothing is selected, remove
-	message list and preview.
-	* em-folder-view.c: (emfv_set_folder): Don't dup NULL
-	* message-list.c: (message_list_set_folder): Don't dup NULL
-
-2007-08-07  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #419690
-
-	* message-list.c: (message_list_construct): FALSE isn't really equal 
-	to NULL.
-
-2007-08-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #463061
-
-	* em-mailer-prefs.c: (em_mailer_prefs_construct): Set the signal
-	handlers later than assigning values to radio groups.
-
-2007-08-02  Tobias Mueller <muelli@auftrags-killer.org>
-
-	* message-list.c: (regen_list_regened) Removed dead if 
-	statement, fixes bug #387312
-	
-2007-08-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for expanding newly created folders from Lucky
-
-	* em-folder-browser.c: (emfb_folder_create):
-	* em-folder-selector.c: (emfs_response),
-	(em_folder_selector_set_selected),
-	(em_folder_selector_set_selected_list):
-	* em-folder-tree.c: (em_folder_tree_set_selected_list),
-	(emft_popup_new_folder), (em_folder_tree_set_selected):
-	* em-folder-tree.h:
-	* em-folder-utils.c: (new_folder_created_cb),
-	(emfu_popup_new_folder_response), (em_folder_utils_create_folder):
-	* em-folder-utils.h:
-	* mail-component.c: (impl_createView), (create_item),
-	(create_local_item_cb), (impl_requestCreateItem):
-
-2007-07-31  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	* em-format-html.c (efh_format_headers): Do not show the
-	pretty-"on-behalf-of"-band for all messages that has Sender header
-	set, instead rely on the custom X-Evolution-Mail-From-Delegate
-	flag that will be added by each providers.
-	
-2007-07-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* em-format-html.c: (efh_format_headers): Marked 
-	a string for translation.
-	
-	Committing on behalf of Bharath Acharya <abharath@novell.com>	
-
-2007-07-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* em-format-html.c: (efh_format_headers): Displaying a message
-	to the recipient of the mail informing him about delegated mails.
-	The message is displayed for all mails containing the "Sender" field			       					 
-	Committing on behalf of Bharath Acharya <abharath@novell.com>	
-
-2007-07-29  Rob Bradford  <rob@robster.org.uk>
-
-	** Potential fix for: #453668
-
-	* mail-folder-cache.c: (folder_changed):
-	Deal with the fact that camel_folder_get_message_info can return NULL
-	and therefore don't try and dereference anything from that pointer.
-
-2007-07-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #459030
-
-	* em-format-html.c (efh_format_address): Workaround broken N_ strings.
-
-2007-07-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-folder-browser.c: (emfb_list_key_press): Fix a build break with
-	Magic spaebar.
-
-2007-07-24  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fix for bug #458894
-	
-	* em-account-prefs.c : (account_delete_clicked) : Test the
-	validity of Iter and select the row accordingly.
-
-2007-07-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #453544 from hggdh
-
-	* mail.error.xml:
-
-2007-07-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #428123 from Lucky
-
-	* mail-config.glade:
-
-2007-07-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #332112 from Lucky
-
-	* mail-send-recv.c: (receive_done):
-
-2007-07-29  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fix for bug #237989
-
-	* em-folder-browser.c : Adding more support for bkspace in magic
-	space bar feature.
-	* em-folder-tree.c (em_folder_tree_select_prev_path) :
-	Added. Select the previous folder.
-
-2007-07-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #458820 from Cosimo Cecchi
-
-	* em-mailer-prefs.c: (photo_toggle_changed),
-	(em_mailer_prefs_construct):
-
-2007-07-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-mailer-prefs.c: (em_mailer_prefs_construct): Fix a crash while
-	starting preferences window.
-
-2007-07-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #303937
-
-	* message-list.c: (ml_tree_drag_data_received):
-	Don't do anything when ml->folder is NULL.
-
-2007-07-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* em-utils.c: (em_utils_save_parts): Do not free const pointer.
-	Plugged memory leak.
-
-2007-07-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #273386
-
-	* em-format-html.c: (efh_format_timeout):
-	Clear preview and show text "Formatting message" at the beginning.
-
-	* em-format-html-display.c: (efhd_attachment_show):
-	Changed debug output to print also pointer address.
-	* em-format.c: (emf_clear_puri_node):
-	Added debug output to see which memory is going to be freed.
-	* em-format-html.c: (efh_url_requested), (efh_format_headers):
-	Warnings cleanup.
-
-2007-07-26  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of  Atos Origin Communication Systems 
-	<support-syscom@osorigin.com>
-	* em-composer-utils.c: (em_utils_send_receipt):
-	- Fixes malformed body part headers for a MDN
-	See bug #458275
-
-2007-07-26  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* em-folder-browser.c: (emfb_search_search_activated): Plugged memory
-	leak.
-
-2007-07-17  Sankar P  <psankar@novell.com>
-
-	* em-format-html.c: (efh_format_headers):
-	Decodes Face header and displays the image.
-
-2007-07-16  Sankar P  <psankar@novell.com>
-
-	* em-composer-prefs.c: (em_composer_prefs_construct):
-	* em-composer-prefs.h:
-	* mail-config.glade:
-	Provide support for keeping your signature on top
-	while replying.
-
-2007-07-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-format-html-display.c: (efhd_attachment_button): Take warning
-	softly instead of a crash.
-
-2007-07-09  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	reviewed by: Veerapuram Varadhan <vvaradhan@novell.com>
-
-	* em-composer-utils.c: (em_utils_send_receipt): Added some flags so that
-	the receipts work fine even if the account configured is not the default one.
-
-	Committing on behalf of	Bharath Acharya <abharath@novell.com>
-											     
-2007-07-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-view.c: (emfv_setup_view_instance)
-	Abort if ETable specification file fails to load.
-
-2007-06-22  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #307410
-
-	* em-utils.[ch]: (em_utils_clear_get_password_canceled_accounts_flag):
-	Added new function to clear previously set flag to default value.
-	* mail-session.c: (get_password): Storing and using new flag within
-	account's service structure.
-	* mail-component.c: (impl_sendAndReceive):
-	Always clear flag to default when user clicks UI component.
-
-2007-07-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #271864 from Hiroyuki Ikezoe
-
-	* mail-component.c: (view_changed):
-
-2007-07-09  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Fix for bug #347782 from hggdh
-
-	* em-format.c: (emf_multipart_encrypted),
-	(emf_inlinepgp_encrypted):
-
-2007-07-08  Johnny Jacob  <jjohnny@novell.com>
-
-	* em-composer-utils.c : Added composer.presendcheck event. Fixes
-	#334118.
-	
-2007-07-07  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #317281 from Michael P. Lepore 
-
-	* filtertypes.xml: Add support to search/filter/vfolders on flag
-	completion status
-	* searchtypes.xml:
-	* vfoldertypes.xml:
-
-2007-07-07  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #312370 from B S Srinidhi
-
-	* em-format-html.c: (emfh_gethttp):
-
-2007-07-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-format-html-print.c:
-	Use new gtk_html_print_operation_run() function in GtkHTML.
-
-2007-07-04  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Added the hook for plugging into Send/Receive dialog for the
-	Evolution RSS plugin.
-
-	* em-event.c: (em_event_target_new_send_receive):
-	* em-event.h:
-	* mail-send-recv.c: (build_dialog), (mail_send_receive):
-
-2007-07-03  simon.zheng  <simon.zheng@sun.com>
-
-	** Fix for bug #453294
-
-	* em-utils.c: (em_utils_save_parts): Convert filename encoding 
-	from UTF-8 to current locale before saving attachement.
-
-2007-07-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #449811
-
-	* em-folder-browser.c: (emfb_list_key_press): Magic space bar works
-	only under non-caret mode.
-
-2007-07-02  Wang Xin  <jedy.wang@sun.com>
-
-	Fixes #450820.
-
-	* em-format-quote.c: Add an empty new line at the beginning
-	of the mail body when relpying a mail.
-
-2007-06-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #352947
-
-	* em-account-editor.c: (smime_sign_key_select),
-	(smime_encrypt_key_select): EMAccountEditor isn't a GtkWidget.
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-	
-        ** Fix for bug #448223 from Gilles Dartiguelongue
-
-	* em-folder-browser.c: (generate_viewoption_menu):
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #445812 from Gilles Dartiguelongue
-
-	* em-folder-view.c: (emfv_on_url_cb):
-	* em-popup.c: (em_popup_target_new_uri):
-	* em-popup.h:
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #437935 from  Gilles Dartiguelongue  
-
-	* em-folder-tree-model.c: (em_folder_tree_model_is_type_inbox):
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #443659 from Vinod
-
-	* em-account-prefs.c: (account_able_clicked),
-	(account_able_toggled), (account_cursor_change):
-
-2007-06-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #330175
-	
-	* em-folder-view.c: (emfv_message_reply):
-	Added helper function html_contains_nonwhitespace which returns TRUE
-	if selected html text contains at least one non-space character.
-
-2007-06-16  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Add support for the Magic Space Bar.
-
-	* em-folder-browser.c: (html_scroll), (emfb_init),
-	(emfb_list_key_press):
-	* em-folder-tree.c: (emft_tree_user_event),
-	(em_folder_tree_select_next_path):
-	* em-folder-tree.h:
-
-2007-06-15  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-send-recv.c:
-	Use ellipsized GtkLabels instead of EClippedLabels (#447727).
-
-2007-06-13  Sankar P  <psankar@novell.com>
-
-	* em-folder-view.c:
-	Fixes build break by including missing headers.
-	See #442631
-
-2007-06-12  Bastien Nocera  <hadess@hadess.net>
-
-	* em-folder-view.c: (emfv_list_key_press):
-	Add support for the XF86Reply and XF86MailForward multimedia
-	keys (Closes: #442631)
-
-2007-06-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am:
-	Fix a minor typo spotted by Gilles Dartiguelongue (#386503).
-
-2007-06-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-view.c (emfv_on_url_cb):
-	Duplicate a translated string since we free it later.
-
-2007-06-05  Daniel Nylander <po@danielnylander.se>
-
-	* default/Makefile.am: Added sv to SUBDIRS
-
-2007-06-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-ops.h: Fix another implicit function declaration.
-
-2007-05-28  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	* em-folder-tree.c: (emft_popup_new_folder),
-	(em_folder_tree_get_selected_folder_info): Do not fetch
-	folder-info from backend - just use the data from the current
-	folder tree.
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
-
-	* Makefile.am:
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #438461 from Gilles Dartiguelongue  
-
-	* mail-config.glade:
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #443140 from Vinod
-
-	* mail.error.xml:
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #3355396 from Muktha  
-
-	* em-account-editor.c:
-	(em_account_editor_folder_selector_button_new):
-	* mail-config.glade:
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* evolution-mail.schemas.in.in: Default for photo to be false.
-
-2007-05-12  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	** Compilation warnings cleanup
-
-	* em-composer-utils.c: (composer_get_message):
-	* em-event.c: (em_event_target_new_composer):
-	* em-filter-folder-element.c: (xml_encode), (xml_decode):
-	* em-filter-rule.c: (xml_encode), (load_set), (xml_decode):
-	* em-filter-source-element.c: (xml_encode), (xml_decode), (clone):
-	* em-folder-browser.c: (emfb_search_config_search),
-	(emfb_folder_refresh):
-	* em-folder-tree-model.c: (em_folder_tree_model_load_state),
-	(find_xml_node), (em_folder_tree_model_get_expanded),
-	(em_folder_tree_model_set_expanded), (expand_foreach_r),
-	(em_folder_tree_model_expand_foreach),
-	(em_folder_tree_model_is_type_inbox),
-	(em_folder_tree_model_get_selected),
-	(em_folder_tree_model_set_selected):
-	* em-folder-tree.c: (tree_drag_data_get), (emft_drop_folder),
-	(emft_drop_async_desc):
-	* em-folder-view.c: (emfv_selection_get), (emfv_popup_delete),
-	(emfv_message_reply), (emfv_on_url_cb):
-	* em-format-hook.c: (emfh_construct_group), (emfh_construct):
-	* em-format-html-display.c: (em_format_html_get_search_dialog),
-	(efhd_html_link_clicked), (efhd_drag_data_get),
-	(efhd_bonobo_object), (efhd_optional_button_show),
-	(efhd_attachment_optional), (efhd_format_optional):
-	* em-format-html.c: (efh_url_requested), (efh_text_plain),
-	(efh_text_enriched), (efh_write_text_html),
-	(efh_message_deliverystatus), (efh_format_address),
-	(efh_format_header):
-	* em-format-quote.c: (emfq_format_address), (emfq_format_source),
-	(emfq_text_plain), (emfq_text_enriched), (emfq_text_html):
-	* em-format.c: (em_format_format_content), (em_format_format_text),
-	(emf_multipart_alternative), (emf_message_deliverystatus):
-	* em-icon-stream.c: (emis_sync_write):
-	* em-inline-filter.c: (emif_add_part), (emif_scan):
-	* em-junk-hook.c: (emjh_construct_group), (emjh_construct):
-	* em-mailer-prefs.c: (labels_changed), (emmp_header_add_header),
-	(junk_plugin_changed), (junk_plugin_setup),
-	(em_mailer_prefs_construct), (emmp_header_from_xmldoc),
-	(em_mailer_prefs_header_from_xml), (em_mailer_prefs_header_to_xml):
-	* em-mailer-prefs.h:
-	* em-migrate.c: (xml_find_node), (upgrade_xml_uris),
-	(upgrade_xml_uris_1_0), (load_accounts_1_0), (utf8_reencode),
-	(upgrade_xml_1_2_rec), (upgrade_passwords_1_2), (is_mail_folder),
-	(get_local_et_expanded), (get_local_store_uri),
-	(upgrade_vfolder_sources_1_4),
-	(em_migrate_folder_view_settings_1_4), (remove_system_searches),
-	(emm_setup_initial):
-	* em-utils.c: (em_utils_selection_get_mailbox),
-	(em_utils_selection_get_message), (em_utils_selection_set_uidlist),
-	(em_utils_selection_get_uidlist), (em_utils_selection_set_urilist),
-	(em_utils_selection_get_urilist), (em_utils_part_to_html),
-	(em_utils_message_to_html):
-	* em-utils.h:
-	* em-vfolder-rule.c: (xml_encode), (xml_decode),
-	(select_source_with_changed):
-	* importers/mail-importer.c: (import_mbox_import):
-	* mail-component.c: (impl_createView), (status_check):
-	* mail-config.c: (mail_config_signature_run_script):
-	* mail-session.c: (mail_session_add_junk_plugin):
-	* mail-signature-editor.c: (get_text), (menu_file_save_cb):
-	* mail-tools.c: (mail_tool_get_local_movemail_path),
-	(mail_tool_do_movemail):
-	* message-list.c: (address_compare), (get_normalised_string),
-	(message_list_setup_etree), (load_hide_state):
-	* message-list.h:
-
-2007-06-02  Ross Burton  <ross@openedhand.com>
-
-	* mail-send-recv.c:
-	Pass a CamelException when refreshing folders, removing the spew
-	of warnings (#439957).
-
-2007-06-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-utils.c: (em_utils_contact_photo): Removing few debug statements.
-
-2007-06-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Outlook style reply option for bug #415770 from gicmo
-
-	* em-composer-utils.c: (composer_set_body):
-	* mail-config.glade:
-	* mail-config.h:
-
-2007-06-01  Karl Relton  <karllinuxtest.relton@ntlworld.com>
-
-        ** Fix for bug #311512
-
-	* mail-folder-cache.c (folder_changed): Check the added uids for
-	messages which are not seen/deleted/junk and compare their
-	received date with the timestamp of the last new-mail notification
-	- if any are more recent than that, notify the user.
-
-2007-06-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Adds support for Contact Image in the preview pane
-
-	* em-folder-view.c: (emfv_message_selected_timeout),
-	(emfv_setting_notify):
-	* em-format-html.c: (efh_format_headers):
-	* em-format.c: (emf_init):
-	* em-format.h:
-	* em-mailer-prefs.c: (em_mailer_prefs_construct):
-	* em-mailer-prefs.h:
-	* em-utils.c: (em_utils_in_addressbook), (em_utils_contact_photo):
-	* em-utils.h:
-	* evolution-mail.schemas.in.in:
-	* mail-config.glade:
-
-2007-05-31  Daniel Nylander <po@danielnylander.se>
-
-	*default/sv : Added Swedish Welcome mail. 
-
-2007-05-31  Jeff Cai <jeff.cai@sun.com>
-	
-	* em-folder-view.c (emfv_message_selected_timeout) : 
-	use displayed_uid instead of selected_uid.
-	Fix #441992
-
-2007-05-28  Jules Colding  <colding@omesc.com>
-
-	* em-utils.c (em_utils_selection_set_urilist): Fix file leak
-	(em_utils_selection_get_urilist): Fix file leak
-
-	* importers/evolution-outlook-importer.c (import_outlook_import): Fix file leak
-
-	* importers/mail-importer.c (import_mbox_import): Impossible code branch commented
-
-	* importers/netscape-importer.c (netscape_import_filters): Fix file leak
-	(netscape_init_prefs): Fix file leak
-
-2007-05-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* evolution-mail.schemas.in.in: Make thread expand default to true.
-	The threads should be expanded by default. Bug in previous commit.
-
-2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-send-recv.c:
-	Revert the dialog_map() solution and use ellipsized labels.
-	Also, only the label column in the GtkTable should expand and fill,
-	and never show a horizontal scrollbar.  (#335241)
-
-2007-05-19  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #439512
-
-	* em-mailer-prefs.c: (junk_plugin_changed): Mark strings for
-	translation.
-
-2007-05-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Improved GMail like thread sorting. Even expanded threads are
-	promoted up the list.
-
-	* message-list.c: (ml_tree_sort_value_at),
-	(message_list_construct): Add a provision to sort mails based on the
-	lastest date of the thread with out substituting the value for
-	display. 
-
-2007-05-16  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added support to specify the default thread state for messages.
-
-	* evolution-mail.schemas.in.in:
-	* message-list.c: (message_list_construct):
-
-2007-05-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Improved options for offline support.
-
-	* em-folder-view.c: (prepare_offline), (emfv_prepare_offline): Adds
-	option for downloading for offline.
-	* evolution-mail.schemas.in.in:
-	* mail-component.c: (status_check): Adds a option for non-sync while
-	going offline.
-	* mail-ops.c: (prepare_offline_desc), (prepare_offline_do),
-	(prepare_offline_done), (prepare_offline_free),
-	(mail_store_prepare_offline):
-	* mail.error.xml:
-
-2007-05-13  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #334966 
-	* mail-component.c: (view_changed), (view_changed_cb),
-	(impl_createView), (impl_quit), (mail_component_init): When the quit
-	is happening, never try to set the title.
-
-2007-05-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #337616
-
-	* Makefile.am: Add $(schema_DATA) to DISTCLEANFILES.
-
-2007-05-11  Jules Colding  <colding@omesc.com>
-
-	* mail-config.c (mail_config_signature_run_script): file descriptor leaks fixed
-
-2007-05-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Add Tango icons to preference
-	window.
-
-2007-05-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added support for Refresh folder and Flush Outbox functions.
-
-	* em-folder-browser.c: (emfb_folder_refresh):
-	* em-folder-tree.c: (emft_popup_refresh_folder),
-	(emft_popup_flush_outbox), (emft_popup):
-	* em-popup.c: (em_popup_target_new_folder):
-	* em-popup.h:
-
-2007-05-03  Sankar P  <psankar@novell.com>
-
-	* em-folder-view.c: (emfv_activate):
-	Do not restrict "Edit as New Message" to 
-	Sent Folder alone.
-	Fixes #205728
-
-2007-05-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added code to improve the new mail hook to provide the number of
-	new mails received and if the folder is an INBOX.
-
-	* em-event.c: (em_event_target_new_folder):
-	* em-event.h:
-	* em-folder-tree-model.c: (em_folder_tree_model_is_type_inbox):
-	* em-folder-tree-model.h:
-	* mail-folder-cache.c: (real_flush_updates), (update_1folder):
-
-2007-04-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #426812
-
-	* em-format-html-print.c:
-	* em-format-html-print.h:
-	* em-folder-view.c:
-	* em-folder-view.h:
-	Refactor the printing infrastructure.
-
-2007-04-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-composer-prefs.c: (signature_key_press): Fix for bug #353662
-	from  Baris Cicek.
-
-2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #429422
-
-	* mail-tools.c (mail_tool_get_local_movemail_path):
-	* em-utils.c (em_utils_save_part_to_file):
-	* em-migrate.c (cp_r), (em_migrate_folder),
-	(em_migrate_pop_uid_caches_1_4), (em_migrate_folder_expand_state_1_4),
-	(em_migrate_folder_view_settings), (em_migrate_imap_cmeta_1_4),
-	(em_migrate_1_4), (emm_setup_initial), (em_migrate):
-	* em-folder-tree-model.c (em_folder_tree_model_save_state):
-	* mail-component.c (mail_component_init):
-	Use g_mkdir_with_parents() instead of e_util_mkdir_hier().
-
-	* mail-send-recv.c:
-	Some cosmetic refactoring.
-
-	* mail-send-recv.c (dialog_map):
-	Use gtk_widget_set_size_request() instead of gtk_widget_set_usize().
-
-	* mail-send-recv.c (build_dialog):
-	e_gtk_button_new_with_icon() is dead; just do it manually.
-
-	* em-format-html-display.c (efhd_bonobo_object):
-	* em-format-html.c (efh_init):
-	* message-list.c (message_list_init):
-	Use g_object_ref_sink() instead of gtk_object_sink().
-
-	* em-account-prefs.c (em_account_prefs_construct):
-	Use g_object_ref() instead of gtk_widget_ref().
-	Use g_object_unref() instead of gtk_widget_unref().
-
-	* em-folder-view.c (emfv_setup_view):
-	Use g_build_filename() instead of g_concat_dir_and_file().
-
-2007-04-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #423766
-
-	* em-format-html-display.c (attachments_save_all_clicked):
-	Call em_utils_save_part() if there's only one attachment to save.
-
-	* em-utils.c (em_utils_save_part):
-	Refactor to use gtk_dialog_run() instead of a "response" callback.
-
-	* em-utils.c (em_utils_save_parts):
-	Refactor to use gtk_dialog_run() instead of a "response" callback.
-	Use gtk_file_chooser_get_uri() to fetch the selected folder.
-
-2007-04-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-folder-view.c: (emfv_spin), (emfv_message_selected_timeout): Add
-	a progress spinner widget in the preview while fetching messages.
-
-2007-04-09  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fixes bug #343195 
-
-	* em-folder-properties.c: (emfp_dialog_got_folder): Get total number
-	of mails with CAMEL_FOLDER_TOTAL if the folder is junk folder.
-
-2007-04-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #383953
-
-	* em-folder-properties.c (emfp_get_folder_item):
-	Show unread messages before total messages.
-
-	* mail-component.c (view_changed):
-	Show unread or selected messages before total messages.
-
-2007-04-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	* message-list.c: More intelligent message selection.  (#332765)
-	Patch from Christof Krüger
-
-2007-04-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-session.c (main_system_beep): Unref 'session'.  (#424795)
-	Patch from Karl Relton
-
-2007-04-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-send-recv.c (refresh_folders_get):
-	Provide a CamelException to camel_folder_refresh_info().
-
-2007-04-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-tree.c (emft_model_row_changed):
-	Update parent rows when a child row changes.  (#352713)
-	Patch by René Stadler.
-
-2007-04-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-migrate.c: (emm_setup_initial): Fix for evolution on crashing
-	while setting up the first account.
-
-2007-04-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-event.h: Don't #include <composer/e-msg-composer.h> since we
-	don't install that file.  Doing so prevents third-party applications
-	like mail-notification from building. (#400241)
-
-2007-04-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Reworked the SPAM plugins with more UI options and support for
-	multiple plugins.
-
-	* em-folder-view.c:
-	* em-junk-hook.c: (emjh_construct_item), (emjh_construct):
-	* em-junk-hook.h:
-	* em-mailer-prefs.c: (junk_days_activate), (emmp_empty_junk_init),
-	(junk_plugin_changed), (junk_plugin_setup),
-	(create_combo_text_widget), (em_mailer_prefs_construct):
-	* em-mailer-prefs.h:
-	* evolution-mail.schemas.in.in:
-	* mail-component.c: (impl_createView), (mc_quit_delete),
-	(impl_quit):
-	* mail-config.glade:
-	* mail-session.c: (init), (mail_session_add_junk_plugin),
-	(mail_session_get_junk_plugins):
-	* mail-session.h:
-
-2007-04-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #411331
-
-	* em-folder-browser.c: (emfb_gui_folder_changed): Fix the message
-	selection.
-
-2007-04-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* evolution-mail.schemas.in.in:
-	Correctly capitalize SpamAssassin.  (#375577)
-	Patch from Priit Laes.
-
-2007-04-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-browser.c:
-	* em-folder-view.c:
-	* message-list.c:
-	Load "emblem-important" instead of deprecated
-	"stock_mail-priority-high" icon.  (#387619)
-	Patch from Rodney Dawes.
-
-2007-04-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #373117
-
-	* em-composer-prefs.c:
-	* em-composer-prefs.h:
-	* em-mailer-prefs.c:
-	* em-mailer-prefs.h:
-	* mail-config.glade:
-	Migrate from GnomeColorPicker to GtkColorButton.
-
-2007-03-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-format-html-display.c (icon_entry_changed_cb): Fix a typo.
-
-2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-utils.c:
-	* mail-config.c:
-	Evolution requires GLib 2.10 now; remove dead backward-compatibility
-	code for GLib < 2.8 (#418971).
-
-2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-account-editor.c:
-	* em-folder-view.c:
-	* em-format-html-display.c:
-	* em-format-html.c:
-	* em-format.h:
-	* em-mailer-prefs.c:
-	* em-vfolder-rule.c:
-	* mail-ops.c:
-	* mail-send-recv.c:
-	* message-list.c:
-	Fix "incompatible pointer type" warnings (#360619).
-
-2007-03-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-mailer-prefs.c:
-	* em-mailer-prefs.h:
-	* mail-config.glade:
-	Migrate from GnomeFontPicker to GtkFontButton (#373837).
-
-2007-03-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-folder-browser.c:
-	* em-format.c:
-	* em-popup.c:
-	Don't mix declarations and code (#405495).
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-	* em-migrate.c (emm_setup_initial): Use g_get_language_names()
-	instead of gnome_i18n_get_language_list().
-
-2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #360240
-
-	* em-vfolder-rule.c (select_source_with_changed), (get_widget):
-	* em-format-quote.c (emfq_format_source):
-	* mail-ops.c (save_messages_save):
-	* em-format.c (emf_init):
-	* em-format-html-display (em_format_html_get_search_dialog),
-	(em_format_html_display_seearch_with), (ehhd_resize),
-	(efhd_attachment_optional), (efhd_format_optional):
-	* em-folder-view.c (emfv_init):
-	* message-list.c (ml_tree_value_at):
-	Remove unused variables.
-
-2007-03-12  Harish Krishnaswamy <kharish@novell.com>
-
-	*default/C : Update Welcome mail. 
-
-2007-02-27  Simon Zheng  <simon.zheng@sun.com>
-
-	* Fixes #402727
-	
-	* em-folder-view.c: (em_folder_view_print),
-	Remove setting default response id because 
-	of print-preview button in print_unix_dialog
-	aren't set GTK_CAN_DEFAULT flag.
-
-2007-02-26  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of 
-	Raghavendran R <raghavguru7@gmail.com>
-
-	* Fixes #256382
-
-	* em-folder-view.c: (emfv_mail_next_unread),
-	(emfv_mail_previous_unread):
-	Mail grabs the focus when keyboard-shortcut 
-	to move to next (un)read mail is used.
-
-2007-02-23  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #356177
-
-	* mail-session.c: Remove an unused EMutex.
-
-2007-02-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #350253
-
-	* em-format-html-print.h:
-	Rename show_rupert field to show_icon.
-
-	* em-format-html-print.c (efh_format_headers):
-	Lookup the evolution icon by name.
-
-2007-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* em-folder-browser.c: (emfb_search_search_activated):
-	Add NULL check before calling strcmp(). Fixes a crash
-	reported in bug #382155.
-
-2007-02-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Print migration updates from Ebby Wiselyn
-
-	* em-folder-browser.c:
-	* em-folder-view.c: (emfv_print_response), (em_folder_view_print):
-	* em-format-html-print.c: (efhp_footer_cb), (emfhp_complete),
-	(mail_draw_page):
-
-2007-02-10  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* default/pt/Inbox: Updated welcome message to 2.8 version
-
-2007-02-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #400726
-
-	* em-format-html-print.c: #include <e-util.e-print.h>
-
-2007-02-07  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #359979, #384183
-
-	* em-camel-stream.c (sync_op):
-	* em-sync-stream.c (sync_op):
-	* mail-session.c (alert_user):
-	e_msgport_wait()'s behavior is now block-and-pop instead of
-	block-and-peek.
-
-2006-09-12  Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #353921
-
-	* em-format-html.c: (em_format_html_get_search_dialog): "Back"
-	and "Forward" buttons changed to "Previous" and "Next"
-	respectively.
-
-2007-01-24  Wang Xin <jedy.wang@sun.com>
-
-	* em-folder-browser.c: Fixes 397195.
-
-2007-01-22  Raghavendran R <raghavguru7@gmail.com>
-
-       * em-event.[c,h]: (em_event_target_new_composer):
-          Creates and returns an event target (composer).
-	
-2007-01-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** GtkPrint migration patch from Ebby Wiselyn.
-
-	* em-folder-view.c: (emfv_print_response), (em_folder_view_print):
-	* em-format-html-print.c: (efhp_finalise), (efhp_footer_cb),
-	(emfhp_complete), (mail_draw_page), (em_format_html_print_print),
-	(em_format_html_print_message), (em_format_html_print_raw_message):
-	* em-format-html-print.h:
-
-2007-01-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Downstream fix from OpenSUSE
-
-	* message-list.c: Fix for compiler warning.
-
-2006-01-08  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	** Fixes 346728, 268412
-	
-	* mail/em-subscribe-editor.c: (sub_fill_level): When a folderinfo
-	has no child but CAMEL_FOLDER_NOCHILDREN not set, create a place
-	holder node, such that, on-expanding it, folders will be loaded on
-	demand.  This saves quite-a-lot-of-memory and time when an account
-	has lots of public-folders - viz., exchange/IMAP
-	(sub_row_expanded): Check for the place-holder node and fire-up a
-	pending.
-	(sub_row_activated): Just expand and collapse the tree accordingly
-	- rest will be taken care by sub_row_expanded()
-	(sub_folderinfo_free): Once fillin is over, expand the node - iff
-	node is non-null.
-
-2006-12-22  Simon Zheng  <simon.zheng@sun.com>
-
-	* mail/em-account-editor.c: (emae_setup_service):
-	Fix the regression of bugzilla bug #352108.
-
-2006-12-21  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* mail/em-format-html-display.c: (efhd_image_unallocate),
-	(efhd_attachment_image):
-	
-	Disconnect handlers on image destroy. Fixes bug
-	#340165.
-
-2006-12-18  Sankar P  <psankar@novell.com>
-
-	* mail-send-recv.c: (get_folders):
-	Do not check for mails in all folders, for Exchange.
-	Will be more than useful when you have a lot of folders.
-
-2006-12-05  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-folder-browser.c: (generate_viewoption_menu): Added icon/image to
-	the quick search items.
-
-2006-12-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes bug #382431
-
-	* em-format.c: Fix implicit declaration of function
-	'mail_config_get_message_limit'.
-
-2006-12-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes bug #357970
-
-	* em-folder-browser.c:
-	* em-folder-view.c:
-	Don't call deprecated GLib / GDK functions.
-
-2006-12-03  Harish Krishnaswamy  <kharish@novell.com>
-
-	* mail-component.c: (mc_startup): Do not attempt to
-	prune GW proxies on startup as this handled by the plugin
-	now.
-
-2006-11-28 Daniel Gryniewicz <dang@gentoo.org>
-
-	** Fix for bug #349966
-
-	* em-utils.c: (emu_save_part_response), (em_utils_save_part),
-	(emu_save_parts_response), (em_utils_save_parts),
-	(emu_save_messages_response), (em_utils_save_messages):
-	* evolution-mail.schemas.in.in:
-
-2006-11-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* Fix for bug #337439 DoS attach with large emails
-
-	* em-format-html-display.c: (efhd_class_init),
-	(efhd_attachment_popup), (efhd_format_attachment),
-	(efhd_optional_button_show), (efhd_resize),
-	(efhd_attachment_optional), (efhd_format_optional):
-	* em-format-html.c: (efh_text_plain), (efh_text_enriched),
-	(efh_write_text_html), (efh_message_deliverystatus):
-	* em-format-quote.c: (emfq_format_source), (emfq_text_plain),
-	(emfq_text_enriched), (emfq_text_html):
-	* em-format.c: (emf_init), (em_format_format_content),
-	(em_format_format_text), (emf_message_deliverystatus):
-	* em-format.h:
-	* em-mailer-prefs.c: (mlimit_count_changed),
-	(em_mailer_prefs_construct):
-	* em-mailer-prefs.h:
-	* em-utils.c: (em_utils_part_to_html), (em_utils_message_to_html):
-	* evolution-mail.schemas.in.in:
-	* mail-config.c: (gconf_mlimit_size_changed),
-	(gconf_mlimit_changed), (mail_config_init),
-	(mail_config_get_address_count), (mail_config_get_message_limit):
-	* mail-config.glade:
-	* mail-config.h:
-
-2006-11-09  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* default/Makefile.am: Added "es" to SUBDIRS
-	
-2006-11-09  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* default/es/Inbox: Added Spanish welcome mail.
-	* default/es/Makefile.am: Added Makefile
-
-2006-11-09  Sankar P  <psankar@novell.com>
-
-	* em-folder-browser.c: (emfb_view_hide_selected):
-	* em-folder-view.c: (emfv_popup_delete):
-	* mail.error.xml:
-	Disable mail delete for proxy when there are not enough rights
-
-2006-10-16  Tor Lillqvist  <tml@novell.com>
-
-	Fix for #348212:
-
-	* mail-mt.h: On Win32 we don't want to use the mail_thread_queued
-	variable outside the libevolution-mail DLL, but instead access its
-	value through a getter function.
-
-	* mail-mt.c: Make mail_thread_queued static on Win32.
-	(mail_win32_get_mail_thread_queued): New function that returns the
-	value of mail_thread_queued.
-
-2006-10-16  Chris Heath  <chris@heathens.co.nz>
-
-	* mail-component.c (create_local_item_cb): Fix memory leak.
-	Fixes bug #360815.
-
-2005-10-16  Sankar P  <psankar@novell.com>
-
-	* mail-ops.c: (em_filter_folder_element_describe)
-	Changes the string displayed in the status bar.
-	Fixes #320615
-
-2006-10-16  Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #308276
-
-	* mail.error.xml : secondary for "vfolder-notunique" corrected.
-
-2006-10-16  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Fix for bug #333864 and bug #351374 
-
-	* em-format-html-display.c: (efhd_image_resized),
-	(efhd_image_unallocate), (efhd_attachment_image): Make sure that the
-	callback is removed when the puri is destroyed.
-
-2006-09-30  Harish Krishnaswamy  <kharish@novell.com>
-
-	* em-format-html-display.c: (em_format_html_get_search_dialog):
-	Do not mark empty strings for translation. Fixes #357422.
-	
-2006-09-29  Daniel Gryniewicz  <dang@gentoo.org>
-
-	* em-folder-view.c: ignore marked, empty selections when replying.
-	Fixes bug #354650. (committed by Andre Klapper)
-
-2006-09-29  Nick Sukharev  <nick@galaktika.ru>
-
-	* mail/em-format-html.c: UUEncoded calendars will be displayed as 
-	calendars, not as plain text. Fixes bug #352767.
-	(committed by Andre Klapper)
-
-2006-09-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #341932 Patch from Roozbeh Pournader
-	
-	* em-format-html.c: (efh_format_header): patch to enlarge
-	the buffer for printing date.
-
-2006-09-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes a lot of search issue.
-
-	* em-folder-browser.c: (emfb_init), (em_folder_browser_show_wide),
-	(vfolder_setup_desc), (emfb_search_search_activated),
-	(emfb_edit_cut), (emfb_edit_select_all), (emfb_set_folder):
-
-2006-09-28  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Pushing a downstream fix in SUSE.
-	
-	* message-list.c: (message_list_init), (message_list_destroy),
-	(folder_changed), (regen_list_regened): Fix to indicate object destroy 
-	* message-list.h: removed the old mechanism.
-
-2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes #351332
-
-	* em-folder-view.c:
-	* em-format-html-display.c:
-	Fix implicit function declarations.
-
-2006-09-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #353920
-
-	* em-folder-browser.c: (emfb_search_search_activated): Mark two
-	messages for translation which have not been marked by accident.
-
-2006-09-13  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #355294
-
-	* em-folder-view.c: (emfv_popup_delete): Set the cursor on delete.
-
-2006-09-09  Wouter Bolsterlee  <uws+gnome@xs4all.nl>
-
-	* default/nl/Inbox: Dutch welcome message updated by
-	Vincent van Adrighem and Wouter Bolsterlee.
-
-2006-09-04  Nickolay V. Shmyrev <nshmyrev@yandex.ru>
-
-	* mail-component.c: (impl_dispose)
-	(view_changed_timeout_remove) (view_changed_timeout):
-	Fixes a crash on exit-time issue. Resolves #334966
-	
-2006-08-29  Li Yuan <li.yuan@sun.com>
-
-	* em-folder-browser.c: (em_folder_browser_show_preview):
-	remove GNUC only macro.
-	Fix for #353344.
-
-2006-08-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #352982 and bug #336983
-	
-	* em-folder-view.c: (emfv_popup_delete), (emfv_select_all_text):
-	Fixes the issue of thread jumping on delete and enables COPY menu item
-	when clicking Select All Text.
-
-2006-08-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-format-html.c: (efh_format_address): Fix for a crash during
-	displaying camel address group.
-
-2006-08-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #353059
-
-	* em-folder-browser.c: (generate_viewoption_menu): Added translated
-	strings to search, which are already translated.
-
-2006-08-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #352980
-
-	* em-folder-view.c: (em_folder_view_get_popup_target): Disable deleted
-	for deleted message, and dont allow to workaround DEL key to move to
-	next message.
-
-2006-08-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #336983
-	
-	* em-folder-view.c: (emfv_init), (emfv_on_html_button_released_cb):
-	Enable/disable Edit->Copy on button release on html.
-
-2006-08-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #352695
-
-	* message-list.c: (regen_list_regened): Dont store the save state, if
-	the search is in place.
-
-2006-08-23  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-utils.c: Update the doc for em_utils_temp_save_part.
-
-2006-08-02  Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #347238
-
-	* em-utils.h : Added a boolean variable to determine the readonly mode
-	* em-utils.c (em_utils_temp_save_part) : Save in readonly mode or not.
-	* em-popup.c (emp_apps_open_in) : set Read only for "open in"
-	attachments.
-	* em-format-html-display.c (efhd_drag_data_get) : Set 644 for dnd
-	attachments.
-	* mail-ops.c (save_part_save): 	File permissions changed to 644 
-	while saving the attachment and drag and drop.
-
-2006-08-22  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Fix for bug #350337
-
-	* message-list.c: (ml_tree_value_at): Patch from Daniel Gryniewicz to
-	check the null string.
-
-2006-08-22  Andre Klapper  <a9016009@gmx.de>
-
-	* default/C/Inbox: Update the Welcome mail.
-
-2006-08-22  simon.zheng  <simon.zheng@sun.com>
-
-	** Fixes for bug #352108
-
-	* em-account-editor.c: (emae_service_url_path_changed),
-	(emae_path_changed),
-	(emae_setup_service):
-	Replace widget GnomeFileEntry by GtkFileButton.
-
-2006-08-21  Matthew Barnes  <mbarnes@redhat.com>
-  	 
-	* mail-send-recv.c:
-	Silence Camel exception warning at startup - fixes bug 352248.
-
-2006-08-21  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Fixes a lot of search issues including widget packing.
-
-	* em-folder-browser.c: (generate_viewoption_menu),
-	(viewoption_menu_generator), (emfb_realize), (emfb_init),
-	(em_folder_browser_show_preview), (emfb_search_search_activated),
-	(emfb_search_search_cleared), (emfb_list_key_press),
-	(emfb_list_message_selected), (emfb_set_search_folder):
-	* em-folder-view.c: (emfv_init), (emfv_message_search),
-	(em_folder_view_get_popup_target), (emfv_setting_notify):
-	* em-folder-view.h:
-	* em-message-browser.c: (emmb_init):
-
-2006-08-19  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #350884
-	
-	* message-list.c: (subtree_latest), (ml_tree_value_at): Sort thread
-	based on the date of last message received.
-
-2006-08-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* message-list.c: (create_composite_cell): Plug a leak.
-
-2006-08-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* em-format-html.c: (efh_url_requested): Plug a leak.
-
-2006-08-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-folder-browser.c: (em_folder_browser_get_wide),
-	(emfb_activate): Get the wide status from the priv struct when
-	available already instead of gconf.
-	* em-folder-browser.h: 
-	* em-folder-view.c: (emfv_setup_view_instance): Get the wide status
-	from the parent struct. It avoids a race, where it shows compressed
-	headers in classic view and vice versa.
-
-2006-08-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #348565
-
-	* em-format-html-display.c (efhd_bar_resize) (efhd_add_bar): Check 
-	the bar size, 	before setting the width. The width goes to zero, 
-	when switching from classic to vertical view and vice versa.
-
-2006-08-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #350411 #350476
-	
-	* em-mailer-prefs.c (notify_sound_changed): When prefs comes up,
-	nothing is set in FILE chooser, so it returns NULL and bypass it.
-	(em_mailer_prefs_construct): Get the file chooser widget before
-	setting radio active.
-
-2006-08-08  Harish Krishnaswamy  <kharish@novell.com>
-
-	* em-folder-tree.c: Add header glib/gi18n.h to provide the missing
-	symbol required by the previous commit. This was an ugly crasher
-	on the release tarball candidate.
-	
-2006-08-07  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* em-folder-tree.c (render_display_name): Marking vFolder names in
-	the folder tree localizable. Fixes bug #330915 (Roozbeh Pournader).
-
-2006-08-04  Johnny Jacob  <jjohnny@novell.com>
-
-	* em-format-html-display.c : Added mnemonic for "Fi_nd" and
-	"Fo_rward".
-	* em-folder-browser.c : (get_view_query) : Added query for
-	"messages masrked as important"
-	
-2006-08-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #335241
-
-	* mail-send-recv.c: (dialog_map), (build_dialog): Let the send receive
-	dialog grow to a fixed size, before we show the scroll bar. 
-
-2006-07-26  Alessandro Decina <alessandro@nnva.org>
-
-	** Fix for bug #348164
-	
-	* em-folder-browser.c: (emfb_class_init):
-	Remove the unused G_TYPE_STRING parameter from the
-	account_search_activated and account_search_cleared signals.
-
-	* mail-component.c: (disable_folder_tree), (enable_folder_tree):
-	Update the callbacks to match the new signature.
-
-2006-07-28  Sankar P  <psankar@novell.com>
-
-	* committed on behalf of Srinivasa Ragavan <sragavan@novell.com>
-	* 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
-
-	* mail-folder-cache.c: (ping_store_ping): Ping store only iff
-	store is online and connected.
-	
-2006-07-26  Arvind <sa.phoenix@gmail.com>
-
-	** Fix for bug #274276
-
-	* 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
-
-2006-07-11  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	** Fixes Bug # 324241
-
-	* mail/em-composer-prefs.c (em_composer_prefs_construct): Changed
-	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:
-	* mail-component.c: set the window title to reflect the
-	localized folder names
-
-2006-06-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #344338
-	
-	* em-folder-browser.c: (emfb_edit_select_all): grab focus after
-	Ctrl+A.
-
-2006-06-19  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #344580
-
-	* message-list.c: (create_composite_cell),
-	(composite_cell_set_strike_col), (message_list_set_folder): Strike out
-	deleted mails, if set to visible
-
-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>
-
-	* 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.
-
-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.
-
-2006-05-04  Jeffrey Stedfast  <fejj@novell.com>
-
-	* mail-component.c (mail_component_remove_store): Ref the store
-	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.
-
-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.
-	
-2006-04-20  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fix for bug #339052
-
-	* em-inline-filter.c (emif_add_part): Preserve all Content-Type
-	params so that they may be restored later.
-
-	* em-format.c (emf_inlinepgp_signed): Restore the original part's
-	Content-Type params otherwise we lose valuable information such as
-	charset or format=flowed or various other things.
-
-2006-04-18  Jeffrey Stedfast  <fejj@novell.com>
-
-	* mail.error.xml: Removed error id "camel-exception" as it was a
-	bogus error.
-
-2006-04-14  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-composer-utils.c (em_utils_handle_receipt): Fixed up the if
-	conditional so that 'account' wasn't ever dereferenced when
-	NULL. Fixes bug #324327.
-
-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.
-
-2006-04-05  Jeff Cai  <jeff.cai@sun.com>
-
-	Fixes bug #333987
-	
-	* 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.
-
-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>
-
-	* em-folder-view.c (emfv_setup_view_instance): Added code to set
-	the mail view column for sent folder.
-
-2006-03-12  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* default/de/Inbox: Updated German translation of default inbox.
-
-2006-03-06  Simon Zheng  <simon.zheng@sun.com>
-
-	Fixes bug #332140
-
-	* em-utils.c (em_utils_temp_save_part): Transfer filenames from
-	utf-8 to glib encoding before really saving files.
-
-2006-03-03  Andre Klapper  <a9016009@gmx.de>
-
-	* configure.in:
-
-	* mail/default/Makefile.am: added support for macedonian (mk)
-	welcome message
-
-2006-03-03  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* default/nl/Inbox: Tino Meinen updated the Dutch welcome message.
-
-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...
-
-2006-03-01  Ilkka Tuohela  <hile@iki.fi>
-
-	* default/Makefile.am: added "fi" to SUBDIRS
-	* default/fi/*: Added localized default mailbox for Finnish,
-
-2006-02-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #332832
-
-	* em-composer-utils.c (em_utils_compose_new_message_with_mailto):
-	Added code to raise the window when a composer is created due to
-	mailto: uri
-
-2006-03-01  Andre Klapper  <a9016009@gmx.de>
-
-	* default/C/Inbox: Update the Welcome mail.
-
-2006-02-27  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-format-html-display.c (efhd_xpkcs7mime_validity_clicked):
-	Make the verify/decrypt gpg diagnostic text selectable in the
-	security dialog that comes up when you click the button in a
-	message. Fixes bug #268414.
-
-2006-02-24  Sankar P  <psankar@novell.com>
-	
-	* em-account-editor.c (emae_check_complete, emae_identity_page):
-	Added code to handle the case if the account is marked as default.
-	Fixes #332034
-
-2006-02-21  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	** Fixes bug #329733
-
-	* em-folder-properties.c (emfp_dialog_got_folder): Fetch both
-	VISIBLE and DELETED count from the folder and adjust it according
-	before showing it in the properties dialog w.r.t user preferences.
-       
-2006-02-21  Tor Lillqvist  <tml@novell.com>
-
-	* em-composer-utils.c: Use the same Win32 macro for gmtime_r()
-	that guards against gmtime() returning NULL as elsewhere. gmtime()
-	is thread-safe on Win32.
-	(attribution_format): Check if camel returns
-	CAMEL_MESSAGE_DATE_CURRENT for Date:, try the date from Received:
-	then. If that doesn't work either, use current date.
-
-2006-02-20  Srinivasa Ragavan <sragavan@novell.com>
-
-	** Fixes bug #322160 and committed for PRSuman.
-
-	* em-utils.c: Added code to pass a variable to overwrite/ro mode.
-
-	* mail-ops.[ch]: Added code to take care of overwrite and set the file
-	mode.
-
-t2006-02-20  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	** Fixes bug 33139
-
-	* mail-vfolder.c: (mail_vfolder_shutdown):
-	assign 'vfolder_hash' to NULL after destroying.
-
-	Committed Patch on behalf of Joe Marcus Clarke (marcus@freebsd.org)
-
-2006-02-16  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #331215
-	
-	* em-folder-browser.c: (emfb_activate): Uncommented the code to set
-	the preview pane position.
-
-2006-02-15  Parthasarathi Susarla <sparthasarathi@novell.com>
-
-	* mail-mt.c (do_op_status): need to show the stauts message
-
-2006-02-15  Shi Pu <shi.pu@sun.com>
-
-	See bug ** 325967
-	
-	* em-account-editor.c (emae_service_url_changed): When username
-	entry value of "Sending Email" page/tab is not empty, check combo
-	box of authmech, to pick up the authmech information.
-
-2006-02-13  Karsten Bräckelmann  <guenther@rudersport.de>
- 
-	* em-account-editor.c: Fix the Account Editor / Security option to
-	finally be descriptive, rather than obscuring. Fixes the UI part
-	of bug #321797.
-
-2006-02-13  Rohini S  <srohini@novell.com>
-
-	** Fixes bug #221270.
-
-	* mail-send-recv.c (build_dialog): Removed white space before :
-	when displaying account information in Send/Receive dialog.
-
-2006-02-13  Andre Klapper <a9016009@gmx.de>
-
-	* mail-mt.c: uncommenting a string. Fixes bug 271734.
-
-2006-02-13  Sushma Rai  <rsushma@novell.com>
-
-	* mail/em-account-editor.c (emae_option_checkspin)
-	(emae_receive_options_extra_item): Creating the widget with 
-	"use_underline" property. Fixes #330504.
-
-2006-02-11  Andre Klapper <a9016009@gmx.de>
-
-	* mail-config.glade: changed string and added translator comments.
-	Fixes bug 256907.
-
-2006-02-11  Karsten BrÀckelmann  <guenther@rudersport.de>
-
-	* message-list.c (message_list_construct): 
-	* em-format-html-display.c (efhd_attachment_button, efhd_add_bar): 
-	* em-account-prefs.c (em_account_prefs_treeview_new): 
-	Change a11y names. Fixes part of bug #330723.
-
-2006-02-10  Karsten BrÀckelmann  <guenther@rudersport.de>
-
-	* em-utils.c (em_utils_edit_filters): Fix Filters dialog window
-	title to be HIG compliant. Fixes bug #330650.
-
-2006-02-09  Sushma Rai  <rsushma@novell.com>
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): Freeing font value 
-	string. See #309316.
-
-2006-02-08  Karsten BrÀckelmann  <guenther@rudersport.de>
-
-	* mail.error.xml: Fix typo and correct phrasing. Fixes bug #330387.
-
-2006-01-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* em-account-editor.h: s/int/guint/g for 1-bit bitfield.
-	* em-composer-utils.c: (em_utils_redirect_message): Remove cruft
-	* em-folder-tree.c: (emft_drop_target): use guint for 1-bit bitfield
-	and rename a variable with a name clash.
-	* em-folder-utils.c: (em_folder_utils_rename_folder): Rename var to
-	avoid name clashes.
-	* em-folder-view.c: guint for 1-bit bitfields.
-	* em-folder-view.h: Same as above.
-	* em-format-html-print.h: Again.
-	* em-format-html.c: (efh_text_html), (efh_multipart_related): Add comments
-	* em-format.c: (emf_multipart_alternative): Add comment about using var that
-	is passed in rather than a local variable.
-	* em-inline-filter.c: (emif_scan): Remove unused var. Mark code static.
-	* em-mailer-prefs.h: guint for 1-bit bitfields.
-	* em-migrate.c: (em_migrate_folder): mark a struct static. remove unused var
-	* em-subscribe-editor.c: guint for 1-bit bitfield
-	* em-utils.c: remove unused function
-	* em-vfolder-rule.c: mark array static
-	* importers/mail-importer.c: (decode_status): Remove unused code. Use guint
-	for 1-bit bitfield.
-	* mail-autofilter.c: (rule_from_message): rename a variable
-	* mail-component.c: guint for 1-bit bitfield
-	* mail-folder-cache.c: (update_1folder): remove unused code
-	* mail-mt.c: mark some structs static
-	* message-list.c: (message_list_select_uid), (ml_value_to_string),
-	(ml_tree_value_at), (find_next_undeleted), (build_tree),
-	(build_flat): Remove unused code and fix some format specifiers.
-
-2006-02-08  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	**Fixes #329586
-
-	* em-account-prefs.c:
-
-	* em-account-prefs.h: Changed the ODD behavior of Default button
-	by checking whether an account is default or not and disabling the
-	button when default account is in focus.
-
-	Committing to head on behalf of rajeev
-	
-2006-02-08  Claudio Saavedra  <csaavedra@alumnos.utalca.cl>
-
-	* em-account-prefs.c (em_account_prefs_construct): Reordering
-	construction of dialog to prevent critical warnings (#328325).
-
-2006-02-07  Andre Klapper <a9016009@gmx.de>
-	* mail.error.xml: fixing one typo.
-
-2006-02-06  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #328651
-	
-	* em-folder-view.c:
-	* em-format-html-display.c:
-	* evolution-mail.schemas.in.in:
-	* mail-config.c (config_cache_labels):
-
-2006-01-27  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-	
-	** Fixes bug #325786
-
-	* em-folder-browser.c: Added code to display a prompt before
-	marking All messages as Read.
-
-	* mail-error.xml: Added a new error message for marking all
-	message as read.
-
-2006-02-06  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	** Fixes #326147
-
-	* em-account-editor.c: (em_account-editor.c): Modify e_source to
-	reflect to the reverted changes.
-	
-2006-02-05  Karsten BrÀckelmann  <guenther@rudersport.de>
-
-	* importers/pine-importer.c (pine_getwidget): Correcting
-	"Addressbook" to properly read "Address Book".  Fixes bug #326256.
-
-2006-02-02  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* em-composer-utils.c (em_utils_handle_receipt): check if account
-	is null before accessing it
-
-2006-01-30  Harish Krishnaswamy  <kharish@novell.com>
-
-	* mail-config.glade: s/T_erminal/Fi_xed width/ for consistency with other
-	GNOME applications.
-
-2006-01-30  pavithran <pavithran@gmx.de>
-
-	** Fixes bug #316223
-
-	* em-utils.c (emu_save_parts_response): Added a confirmation
-	dialog for overwriting existing file during save all.
-
-2006-01-27  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	** Fixes #327000
-
-	* em-format-html-display.c: Added code to change cursor to notify
-	user on image fit to width
-
-2006-01-26  Oswald Rodrigues <ozzy_rodrigues@yahoo.com>
-
-	* em-popup.c: Corrected typo. changed Add to Addressbook to Add 
-	to Address Book. Fixes bug 326256.
-
-2006-01-23  Andre Klapper <a9016009@gmx.de>
-
-	* mail.error.xml: fixed a typo. Fixes bug 328306.
-
-2006-01-23  Ranjan Somani  <sranjan@novell.com>
-
-	** Fixes #326795
-
-	* em-message-browser.c: Pressing Esc key lets u close the window
-
-2006-01-20  Nancy Cai <nancy.cai@sun.com>
-	
-	** Fixes #326649
-
-	* em-account-prefs.c (mail_accounts_load): select the first row
-
-2006-01-23  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-format-html-display.c (efhd_attachment_bar_refresh),
-	(efhd_mnemonic_show_bar), (efhd_add_bar): Added Mnemonics for Save
-	/ Save All and for show/hide attachment bar.
-
-2006-01-19  Ranjan Somani  <sranjan@novell.com>
-
-	** Fixes #318785
-
-	* mail-config.glade: Resizing of Default n Enable button
- 
-	committing on behalf of Ranjan -partha
-	 
-2006-01-19  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	** See bug 324327
-
-	* em-composer-utils.c (em_utils_handle_receipt): account can be
-	null. Not necessary to send receipt when account is not enabled
-
-2006-01-16  Harish Krishnaswamy  <kharish@novell.com>
-
-	* mail-component.c (impl__get_userCreatableItems): remove shortcut
-	keys (UI Hackfest - See
-	http://go-evolution.org/Shortcut_Keys_Review).
-
-2006-01-16  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #326877
-
-	* em-folder-view.c (emfv_enable_menus): Reverting the patch to
-	hide junk/not junk toolbuttons in disabled state.
-
-2006-01-16  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #218570
-
-	* em-folder-browser.c (emfb_expand_all_threads),
-	(emfb_collapse_all_threads), (emfb_set_folder), (emfb_activate):
-	Added code to handle expande/collapse all and call e-tree for regen of
-	the list.
-	* message-list.c (load_tree_expand_all),
-	(message_list_set_threaded_expand_all),
-	(message_list_set_threaded_collapse_all),
-	(message_list_set_expand_all), (regen_list_regened): Added code to
-	conditionally check for expand/collapse all and save the state after
-	the operation.
-	* message-list.h: Added state variable for expand/collapse all of
-	threads.
-
-2006-01-12  Rohini S  <srohini@novell.com>
-
-	** Fixes bug #221270.
-
-	* mail-send-recv.c (format_url, build_dialog): Changed to display
-	account name in Send/Receive dialog.
-
-2006-01-16  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-format-html-display.c (em_format_html_display_new): Changed
-	event to scroll_event in rajeev's patch.
-
-2006-01-12  Rohini S  <srohini@novell.com>
-	
-	** Fixes bug #246257
-
-	* mail-dialogs.glade: Interchange of label and checkbox 
-	positions in Find message dialog
-
-	* em-format-html-display.c (efhd_update_matches),
-	(em_format_html_display_search): Hide Matches Label on dialog open
-	and Show Matches Label when required. Fixes bug 246257.
-
-2006-01-16  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Fixes bug #239929 (Committing Rajeev's patch)
-
-	* em-format-html-display.c (efhd_scroll_event),
-	(em_format_html_display_new): Adds handler to zoom-in/out on
-	control scroll.
-	
-2006-01-13  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-folder-browser.c (emfb_etree_unfreeze, emfb_list_built):
-
-	* message-list.c (message_list_setup_etree):
-
-	Fixes the scroll issue with the message list.
-
-2006-01-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* GNOME_Evolution_Mail.server.in.in:
-
-	Changes MailView accel from Control+F1 to Control+1.
-
-2006-01-10  Simon Zheng  <simon.zheng@sun.com>
-
-	* em-composer-utils.c:
-	* em-folder-tree-model.c (em_folder_tree_model_save_state):
-	* em-format-html.c:
-	* em-migrate.c (cp_r, em_migrate_folder),
-	(em_migrate_pop_uid_caches_1_4),
-	(em_migrate_folder_expand_state_1_4),
-	(em_migrate_folder_view_settings_1_4), 
-	(em_migrate_imap_cmeta_1_4),
-	(em_migrate_1_4, emm_setup_initial), 
-	(em_migrate):
-	* em-popup.c:
-	* em-utils.c (em_utils_save_part_to_file):
-	* mail-component.c (mail_component_init):
-	* mail-config.c:
-	* mail-folder-cache.c:
-	* mail-mt.c:
-	* mail-ops.c:
-	* 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_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>
-
-	* evolution/mail/mail-ops.c:
-
-	* evolution/mail/mail-send-recv.c:
-
-	* evolution/mail/mail-session.c: changing "cancelled" (British
-	English) to "canceled" (American English). Fixes bug 325334.
-
-2006-01-06  Simon Zheng <simon.zheng@sun.com>
-
-	* em-account-editor.c:
-	* em-account-prefs.c:
-	* em-composer-utils.c:
-	* em-folder-tree-model.h:
-	* em-migrate.c:
-	* em-subscribe-editor.c:
-	* em-utils.c:
-	* importers/netscape-importer.c:
-	* mail-config.c:
-	* mail-crypto.c:
-	* mail-ops.h:
-	* mail-send-recv.c:
-	* mail-vfolder.c:
-	use libedataserver/e-account-list.h instead of e-util/e-account-list.h.
-	use libedataserver/e-account.h instead of e-util/e-account.h.
-
-2006-01-04  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail-tools.c: Uncommented mail_tool_get_local_movemail_path for
-	non-win32 builds since it is used in non-win32 build.
-
-2006-01-04  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* em-composer-utils.c (em_utils_composer_send_cb): Use the
-	composer window as the parent window while showing the error
-	message.
-
-2006-01-02  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* mail.error.xml: Fix 313095, Add error identifier
-	ask-delete-proxy-accounts. 
-	
-2006-01-02  Harish Krishnaswamy  <kharish@novell.com>
-
-	* em-folder-view.c (emfv_setting_notify): Remove the first check
-	in the previous commit.  This is redundant as it is always
-	guaranteed that the component has been activated at this point.
-	And when not, it ought to crash :-).
-
-2006-01-02  Harish Krishnaswamy  <kharish@novell.com>
-
-	reviewed by: Parthasarathi <sparthasarathi@novell.com>
-
-	* em-folder-view.c (emfv_setting_notify): Set the properties on
-	the bonobo component only if it already has been activated. Fixes
-	#325375 (critical warning crasher).
-
-2006-01-01  Changwoo Ryu  <cwryu@debian.org>
-
-	* em-folder-properties.c (emfp_dialog_got_folder): translate
-	the labels of emfp_items.
-
-	* em-account-editor.c (em_account_editor_construct): translate
-	the labels of emae_{editor,druid}_items.
-	
-2006-01-01  Harish Krishnaswamy  <kharish@novell.com>
-
-
-	* em-utils.c (em_utils_prompt_user),
-	mail-config.glade, mail.error.xml:
-	s/don't/do not/ string changes. Fixes #325276.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* mail.error.xml: Fixing several typos and harmonizing
-	  capital/small letters. Partially fixes bug 306117.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* mail-session.c: changing "canceled" to "cancelled" to stay
-	  consistant to the rest.  Fixes bug 325116.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* evolution-mail.schemas.in.in: added quotes to literal values.
-	  Fixes bug 272772.
-
-2005-12-29  Andre Klapper <a9016009@gmx.de>
-
-	* em-folder-properties.c: removed wrong singular string.
-	  Fixes bug 311472.
-
-2005-12-22  Andre Klapper <a9016009@gmx.de>
-
-	* mail-config.glade: changed one duplicated mnemonic.
-	  Fixes bug 313801.
-
-2005-12-20  Andre Klapper <a9016009@gmx.de>
-
-	* mail-config.glade: changing file selector window title from
-	  "Execute command..." to "Select sound file". Fixes bug 324173.
-
-2005-12-19  Andre Klapper <a9016009@gmx.de>
-
-	* mail-config.glade: changed 3 HIG-violating mnemonics.
-	  Fixes bug 256913.
-
-2005-12-23  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #228040, #324677
-
-	* em-folder-view.c (emfv_popup_flag_completed),
-	(emfv_popup_flag_clear, emfv_enable_menus): Added menus for
-	complete and clear. Also added code to refresh preview on setting
-	flags. Also added code to hide junk/not-junk menu depending on
-	their sensitivity.
-
-	* em-utils.c (tag_editor_response, em_utils_flag_for_followup):
-	Added code to refresh preview.
-	
-2005-12-22  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* mail-component.[c,h]: Handle Network Disconnect
-	sent by the shell. Add function status_check which 
-	handles various Network states.
-	
-2005-12-21  Tor Lillqvist  <tml@novell.com>
-
-	* em-camel-stream.c (em_camel_stream_init)
-	* em-sync-stream.c (em_sync_stream_init): Use
-	g_io_channel_win32_new_socket() on Win32 instead of
-	g_io_channel_unix_new() to avoid confusion between file
-	descriptors and sockets (which can and do overlap!). We know that
-	e_msgport_fd() returns a socket on Win32.
-
-2005-12-21  Not Zed  <NotZed@Ximian.com>
- 
-	* mail-component.c (impl_createView, view_changed_cb): api
-	updates.
- 
-2004-12-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #60354.
-
-	* mail-component.c (view_changed_cb): set the shell window title
-	as well.
-	(impl_createView): renamed from createControls, just return a
-	EComponentView instead.
-
-	Committed on behalf of notzed - partha
-
-2005-12-21  Jeff Cai <jeff.cai@sun.com>
-
-	** See bug 324473
-
-	* em-account-editor.c (em_account_editor_construct): delete
-	reference to account editor to make sure be destroyed when it is
-	closed.
-
-2005-12-21  Sam Yang  <sam.yang@sun.com>
-
-	Fixes #324670
-
-	* em-folder-view.c (emfv_setting_notify): Respond to the change of
-	mail/display/paned_size in gconf.
-
-2005-12-20  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	Fixes #246256
-
-	* mail-dialogs.glade: Change "Case _Sensitive" to "Case _sensitive".
-	
-2005-12-20  Boby Wang <Boby.Wang@sun.com> 
-
-	** See bug 324319
-
-	* em-format-html-display.c (efhd_add_bar): Add the accessible name
-	of arrow button, and the attachment bar can be opened by gok.
-
-2005-12-20  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	** See bug 234008
-
-	* em-folder-tree-model.c:
-	* mail-folder-cache.c:
-	Make sure that the Draft folder highlights the number of messages in
-	it
-	
-2005-12-18  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use THREADS_CFLAGS and _LIBS. Don't need	CAMEL_LIBS.
-
-	* em-account-editor.c
-	* em-account-prefs.c
-	* em-filter-editor.c
-	* em-folder-browser.c
-	* em-folder-view.c
-	* em-format-html.c
-	* em-format-html-display.c
-	* em-mailer-prefs.c
-	* em-message-browser.c
-	* em-migrate.c
-	* em-subscribe-editor.c
-	* em-sync-stream.c
-	* em-utils.c
-	* em-vfolder-editor.c
-	* em-vfolder-rule.c
-	* mail-autofilter.c
-	* mail-component.c
-	* mail-config.c
-	* mail-folder-cache.c: Use gstdio wrappers. Construct pathnames of
-	glade, xml, etspec and png files at run-time. Use
-	g_filename_{to,from}_uri().
-
-	* em-folder-browser.c (emfb_init)
-	* em-folder-view.c (emfv_finalise)
-	* em-message-browser.c (emmb_init): As EMFolderView::ui_files now
-	always is a list of filenames constructed with g_build_filename(),
-	use g_free() on each list entry before calling g_slist_free() on
-	the list.
-
-	* em-folder-tree-model.c (em_folder_tree_model_load_state): Use
-	e_xml_parse_file().
-
-	* em-migrate.c: Bypass all the code for upgrading from 1.x on Win32.
-	(emm_setup_initial): Use GDir instead of dirent.
-
-	* em-sync-stream.c
-	* mail-folder-cache.c: Use pthread_equal() to compare pthread_t
-	values.
-
-	* em-vfs-stream.c: No EINPROGRESS or ELOOP on Win32.
-
-2005-12-17  Tor Lillqvist  <tml@novell.com>
-
-	* mail-mt.c: Add copyright blurb. Use separate flag field to
-	indicate whether a pthread_t field is valid or not. Use
-	e_util_pthread_id() in debugging output.
-
-	* mail-mt.c
-	* mail-session.c
-	* mail-vfolder.c: Include just <gtk/gtk.h> and not a handful of
-	individual gtk headers. Harmonize #include order and syntax. Use
-	pthread_equal() to compare pthread_t values.
-
-	(em_channel_setup): Call g_io_channel_win32_new_socket() on Win32
-	instead of g_io_channel_unix_new(). This avoids the occasional
-	"giowin32.c:1661: 12 is both a file descriptor and a socket, file
-	descriptor interpretation assumed." style warnings, which indicate
-	a real problem in this case.
-
-	* mail-ops.c: Use gstdio wrappers. Open file in binary mode.
-
-	* mail-signature-editor.c
-	* mail-tools.c
-	* mail-vfolder.c
-	* message-list.c
-	* message-tag-followup.c: Beautify #include order and syntax. Use
-	gstdio wrappers. Construct pathnames of files to be read at
-	run-time instead of using compile-time paths.
-
-	* mail-tools.c (mail_tool_get_local_movemail_path): Not used, put
-	in #if 0.
-
-	* importers/elm-importer.c
-	* importers/evolution-mbox-importer.c
-	* importers/evolution-outlook-importer.c
-	* importers/mail-importer.c
-	* importers/netscape-importer.c
-	* importers/pine-importer.c: Use GLib API when
-	applicable.
-
-2005-12-16  Sam Yang  <sam.yang@sun.com>
-
-	** Fixes bug #323867.
-
-	* em-folder-view.c (emfv_setting_notify): Respond to the change of
-	/apps/evolution/mail/display/show_deleted and thread_list in
-	gconf.
-
-2005-12-12  Karsten BrÀckelmann  <guenther@rudersport.de>
-
-	* em-folder-view.c: Mail Context Menu re-ordered correctly,
-	fixes bug #323140.
-
-2005-12-12  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* mail.error.xml: Fix #47857
-	
-2005-12-05  Shi Pu  <shi.pu@sun.com>
-
-	See bug ** 323253
-
-	* mail-send-recv.c (format_url): If url->host is NULL or it is
-	emtpy, don't print it out in send & receive dialog.
-
-2005-11-28  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-view.c (emfv_setting_notify): literal strings do not
-	need to be \0 terminated, they are already nul-terminated by
-	definition.
-
-2005-11-28  Sam Yang  <sam.yang@sun.com>
-
-	** See bug #322414
-
-	* em-folder-view.c (emfv_setting_notify): Respond to the change of
-	/apps/evolution/mail/display/show_preview in gconf.
-
-2005-11-25  Tor Lillqvist  <tml@novell.com>
-
-	* em-composer-prefs.c (sig_add_script_response): Use gstdio
-	wrappers.
-	(url_requested): Use g_filename_from_uri()
-	instead of just stripping off the "file:" prefix.
-	(em_composer_prefs_construct): Construct glade file pathname at
-	run-time for Win32 install-anywhere.
-
-2005-11-23  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	** See bug #315987
-
-	* em-composer-utils.c (em_utils_composer_send_cb): Send only if
-	account is enabled
-	(em_utils_composer_save_draft_cb): Save message to server folder
-	only if the account is enabled, else save it locally
-	(generate_account_hash): Add default account into the account hash
-	only if the account none of the account is enabled.
-	(guess_account): use only enabled account
-
-	* mail.error.xml: Add error message for send-no-account-enabled
-
-2005-11-11  Boby Wang <boby.wang@sun.com>
-
-	** See bug 321214.
-
-	* mail-config.glade: Focus on the Tools-> Settings-> Composer
-	Preferences -> Forward Style and Reply Style comboboxes.Comboboxes
-	are named after their current settings. Now the names were
-	corrected.
-
-2005-10-26  Vivek Jain <jvivek@novell.com>
-	
-	**See #313096
-
-	* em-junk-hook.c (emjh_construct) load the plugin only if it is
-	enabled.
-
-2005-10-22  Parthasarathi Susarla <sparthasarathi@novell.com>
-
-	* mail-config.c (mail_config_get_default_account): Return valid
-	transport, only if the account is enabled.
-
-2005-10-22  Parthasarathi Susarla <sparthasarathi@novell.com>
-
-	* em-composer-utils.c (create_new_composer): If the account
-	corresponding to the fromuri is not enabled.  Then load the
-	preferred account from the composer.
-
-2005-10-21  Jeff Cai <jeff.cai@sun.com>
-
-	Reverse previous patch because of bug 319376.	
-	* em-folder-view.h:
-
-2005-10-21  Jeff Cai <jeff.cai@sun.com>
-
-	* mail/em-folder-view.h: Change the declaration of flag
-	'preview_active' from one bit of int to one bit of guint because
-	it will be -1 on linux if being declared one bit of int.
-
-2005-10-19  Philip Van Hoof <pvanhoof@gnome.org>
-	
-	** See bug 318611
-
-	* mail/em-composer-utils.c: data hiding
-
-2005-10-19  Harish Krishnaswamy <kharish@novell.com>
-
-	* em-format-html-display.h: Include e-attachment-bar.h relative to
-	the top dir, so it stops borking the print-message plugin.
-
-2005-10-18  Srinivasa Ragavan <sragavan@novell.com>
-
-	* em-folder-browser.c (emfb_focus_search, emfb_tools_vfolders):
-	Make '/' to focus on search bar entry. Fixes bug #268027
-
-	* em-folder-view.c (emfv_enable_menus): Set the target widget.
-
-	* em-format-html-display.[ch] (em_format_html_display_get_bar):
-	Added a function to get the attachment bar.
-
-	* em-utils.c (em_utils_temp_save_attachments): Added function to
-	save parts of the attachments.
-
-2005-10-03  Srinivasa Ragavan <sragavan@novell.com>
-
-	* em-folder-view.c (emfv_ena) (emfv_popup_items): Mark visible
-	  with junk flags as well.
-
-	* em-popup.[ch] (em_popup_target_new_select): Set the flags for
-	  junk respectively.
-	
-2005-10-18  Sankar P  <psankar@novell.com>
-	
-	- Enhances Signature-Preferences. 
-	- Added shortcuts for common operations.
-		-- Delete on Del key
-		-- Edit on Dbl.Click
-	- Prevents adding duplicate and NULL signatures
-
-	* mail-signature-editor.c (menu_file_save_cb:
-	(mail_signature_editor, sig_name_changed):
-	(menu_file_save_close_cb, delete_event_cb):
-	(do_exit): Modified the functions for handling the above
-	scenarios.
-
-	* mail.error.xml: Added error strings for duplicate and NULL
-	signatures.
-
-	* em-composer-prefs.c (em_composer_prefs_construct):
-	(sig_delete_cb, sig_add_cb): Modified the functions so as to
-	handle the keyboard accelarators and to grab focus to the list on
-	deletion/insertion of signatures.
-
-	* em-composer-prefs.c (signature_key_press, sig_tree_event_cb):
-	Added new functions to handle the keypress events on the
-	signatures list tree.
-
-	Fixes #269749
-	
-2005-09-29  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	** See bug 317284
-	
-	* em-mailer-prefs.c (emmp_header_add_header): Check if its a valid
-	header and only then add it
-	
-2005-09-28  Tor Lillqvist  <tml@novell.com>
-
-	* em-composer-utils.c (reply_get_composer, get_reply_list):
-	(post_reply_to_message):
-
-	* em-folder-view.c (emfv_format_link_clicked):
-
-	* importers/netscape-importer.c (netscape_get_boolean): Use
-	g_ascii_str(n)casecmp() instead of str(n)casecmp(). We are
-	comparing to literal ASCII strings in these cases, so just
-	casefolding ASCII is enough. Also better for portability.
-
-	* em-format-html-display.c
-
-	* message-list.c: Define localtime_r() for Win32 using localtime()
-	(which is thread-safe in Microsoft's C library).
-
-	* mail-tools.c (mail_tool_do_movemail): Not implemented on Win32.
-
-2005-09-28  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	See bug ** 317329
-
-	* em-vfolder-rule.c (em_vfolder_rule_add_source): Do not add a
-	NULL uri.
-
-2005-09-26  S.Antony Vincent Pandian <santony@gmail.com>
-
-	Fixes #208647
-
-	* em-folder-tree.c: Have added a menu item Empty Trash in the
-	folder tree's context menu and also added its callback.
-
-2005-09-22  Carsten Guenther <carsten.guenther@scalix.com>
-
-	Fixes #316983
-
-	* em-composer-utils.c (em_utils_send_receipt):
-	Exchanged the FROM and TO fields so that a read
-	receipt actually goes to the sender of the original
-	message.
-
-2005-09-21  Sankar P  <psankar@novell.com>
-
-	* em-account-editor.c (emae_defaults_page): Added code to enable
-	the sent folder button for accounts with "None" set as the
-	Receiving Server type.  Fixes #315506
-
-2005-09-15  Sankar P  <psankar@novell.com>
-
-	* em-folder-tree-model.c (em_folder_tree_model_set_folder_info):
-
-	* em-folder-tree.c (render_pixbuf): Added enum and the code to
-	change the icon for sent items folder. Fixes #257321
-	
-2005-09-02  Harish Krishnaswamy  <kharish@novell.com>
-
-	* default/C/Inbox: Update the Welcome mail.
-
-2005-08-25  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #314440.
-
-	* em-format-html.c (efh_url_requested): check the content object's
-	mime type, not the container, when seeing if the data should be
-	written.
-	(efh_write_text_html): add some debug.
-
-	* em-format-html-display.c (efhd_html_button_press_event): fix
-	debug.
-
-2005-08-22  Srinivasa Ragavan <sragavan@novell.com>
-
-	* em-format-html-display.c (efhd_bar_resize): Dont call update.
-	Just set the width on the bar.
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* mail-tools.c (mail_tool_uri_to_folder): cast warning away.
-
-	* mail-folder-cache.c: include missing header for
-	e_filename_make_safe.
-
-	* em-junk-hook.h: Fix some header includes, fix the include guard
-	to use the right name.
-	(EMJunk): Ugh, this is an object, properly derive from it!  How
-	did this work?
-
-	* em-junk-hook.c (em_junk_check_junk): fix bool conversion.
-
-	* em-format-html-display.c (efhd_bar_popup_position): another
-	wraning, why this crap isn't in the attachment bar like i said it
-	should be, i'll never know.
-	(efhd_xpkcs7mime_viewcert_foad): only define if used.
-
-	* em-account-editor.c (emae_defaults_page): attempt to fix parentheses
-	(emae_security_page): fix conditional compilation warnings.
-
-2005-08-19  Not Zed  <NotZed@Ximian.com>
-
-	** See #312668.
-
-	* mail-component.c (setline_done, impl_setLineStatus): change the
-	camel-session online status before (if we're going online) or
-	after (if we're going offline) actually doing offline processing.
-
-2005-08-19  Not Zed  <NotZed@Ximian.com>
-
-	* em-format.c (emf_multipart_encrypted): put the s/mime message
-	back, awaiting string approval for a change otherwise.
-
-2005-08-18  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html-display.c (efhd_message_add_bar): dont add
-	attachment bar if it is disabled.
-	(efhd_attachment_button): dont add attachments if there is no bar.
-
-	* em-format.c (emf_inlinepgp_signed, emf_inlinepgp_encrypted): fix
-	the error messages for consistency.  We dont need to check
-	content-type, since we only get called with the right one.
-	(emf_multipart_encrypted): fix up wrong s/mime error.
-
-	* em-format-html.c (efh_inlinepgp_signed)
-	(efh_inlinepgp_encrypted): moved to em-format.c; otherwise this
-	will break replying, etc.
-
-	** See #271894.
-
-	* em-format.c (emf_multipart_encrypted): use the content object's
-	content-type to check types.
-
-2005-08-16  Not Zed  <NotZed@Ximian.com>
-
-	** See #312668.
-
-	* mail-component.c (impl_setLineStatus): new offline interface.
-	(setline_check, setline_done): and implementation.
-
-	* mail-offline-handler.[ch]: destroyed, burnt, dissolved in acid.
-
-2005-08-17  Srinivasa Ragavan <sragavan@novell.com>
-
-	* em-format-html-display.c 
-	(efhd_bar_save_selected): Fix a warning.
-	(efhd_bar_resize): Fix the bar size to match other widgets.
-	(efhd_bar_scroll_event): Fix scroll issue over bar. bug #312224.
-	(efhd_add_bar): Add a frame around the attachment bar. bug #312033
-
-2005-08-17  Kaushal Kumar  <kakumar@novell.com>
-
-	* em-composer-prefs.c (url_requested): Add the close call for fd.
-
-	See bug #307375.
-
-2005-08-15  Not Zed  <NotZed@Ximian.com>
-
-	** See #313440.
-
-	* Makefile.am (mailinclude_HEADERS): Include the idl generated
-	headers.
-
-2005-08-16  Srinivasa Ragavan <sragavan@novell.com>
-
-	* em-format-html-display.c (efhd_attachment_button): Sets the filename
-	in the attachment structure instead of the part
-	
-2005-08-15  Christian Kellner  <gicmo@gnome.org>
-
-	* mail-send-recv.c (get_folders): Honour the check_all flag for
-	the scalix provider.  Fixes bug #313582.
-
-2005-08-14  Rodney Dawes  <dobey@novell.com>
-
-	* em-folder-view.c (emfv_popup_items): Fix two mnemonic conflicts
-	in the context menus for the mailer
-
-2005-08-12  Vivek Jain <jvivek@novell.com>
-
-	* em-account-editor.c (emae_check_complete): first prepare the
-	page and then validate **Fixes #273842
-
-2005-08-11  Not Zed  <NotZed@Ximian.com>
-
-	** See #232499.
-
-	* mail-folder-cache.c (rename_folders): rename view meta-data
-	along with the folder.
-
-2005-08-11  Vivek Jain <jvivek@novell.com>
-	
-	* em-folder-tree-model.c (account_changed): check if the account
-	is enabled, before adding the store
-
-	** Fixes #313057
-	
-2005-08-11  Parthasarathi Susarla <sparthasarathi@novell.com>
-
-	* em-folder-view.c (emfv_enable_menus): return the target in any
-	case.  It will be an empty target and not NULL.
-
-	Fixes bug 312420
-
-2005-08-11  Srinivasa Ragavan <sragavan@novell.com>
-
-	* em-format-html-display.c (efhd_attachment_bar_refresh):
-	(efhd_bar_resize, efhd_add_bar): Fix to hide the attachment bar
-	when no attachments and to resize when the window is resized.
-
-2005-08-10  Not Zed  <NotZed@Ximian.com>
-
-	** See #271985.
-
-	* mail-config.c (mail_config_write_on_exit) 
-	(mail_config_get_account_by_source_url) 
-	(mail_config_get_account_by_transport_url) 
-	(mail_config_get_default_transport): 
-
-	* mail-component.c (load_accounts): check url for content before
-	using it.
-
-2005-08-09  Not Zed  <NotZed@Ximian.com>
-
-	** See #312715.
-
-	* em-folder-tree.c (emft_drop_folder_rec): removed.
-	(emft_drop_folder): call em_folder_utils_copy_folders to perform
-	the operation rather than: doing it sync when it shouldn't be, and
-	2; copying code redundantly.
-
-	* em-folder-utils.c (em_folder_utils_move_folder): remove this
-	redundant api.
-	(em_folder_utils_copy_folder): add delete flag.
-	(em_folder_utils_copy_folders): export this function.  fix strange
-	argument order.
-
-2005-08-10  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Link with all needed libraries. Use -no-undefined
-	on Win32. Work around annoying MSYS feature on Win32 when
-	installing the schemas: Echo the command to a temporary .bat file
-	and run it with cmd.exe...
-
-	* importers/Makefile.am: Use the bootstrap import library for
-	libevolution-mail.la on Win32 as libevolution-mail.la hasn't been
-	built yet when we come here. Use -no-undefined on Win32. Use
-	privsolib instead of privlib. (See ../ChangeLog.)
-
-2005-08-08  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #304938.
-
-	* mail-ops.c (mail_send_message): don't try to dereference the
-	transport if we don't have one.
-
-2005-08-04  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #300881.
-
-	* em-account-editor.c (emae_setup_signatures): don't add the
-	signature listener if we've already added it.
-
-2005-08-08  Vivek Jain <jvivek@novell.com>
-
-	* em-format.c (emf_multipart_appledouble): check part before using
-	it, else dump source
-
-2005-08-05  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #312397.
-
-	* em-format-quote.c (emfq_format_message): if we are rendering an
-	attached message, include the headers always and a marker for it.
-
-2005-08-07  Rodney Dawes  <dobey@novell.com>
-
-	* em-folder-browser.c (emfb_search_items):
-	* em-folder-tree-model.c (sort_cb, em_folder_tree_model_load_state):
-	* em-folder-tree.c (emft_drop_target):
-	* em-folder-view.c (emfv_popup_items, emfv_uri_popups):
-	* em-utils.c:
-	* em-vfolder-editor.c (em_vfolder_editor_new):
-	* em-vfolder-rule.c (em_vfolder_editor_sourcelist_new):
-	* mail-dialogs.glade:
-	* mail-vfolder.c (vfolder_setup_desc, vfolder_setup_do):
-	(vfolder_adduri_desc, vfolder_load_storage, vfolder_edit):
-	(vfolder_edit_rule, vfolder_gui_add_rule):
-	* mail.error.xml:
-	Change instances of "vfolder" that appear in the UI to use the term
-	"Search Folder" instead
-	Update some comments to use the term "Search Folder" instead of vfolder
-	
-2005-08-05  David Malcolm  <dmalcolm@redhat.com>
-
-	* em-account-editor.c (emae_option_checkspin): initialize local
-	variable "label".
-
-2005-08-04  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #273885.
-
-	* em-utils.c (em_utils_edit_filters): setup filter source names
-	properly translated.
-
-	* em-filter-editor.c (em_filter_editor_construct): take an array
-	of structs for the filter source so the incoming/outgoing is
-	properly translated.
-
-	** See bug #312397.
-
-	* em-format-quote.c (emfq_format_message): dont quote credits
-	here.
-	(emfq_format_message_prefix): new prefix handler for credits.
-	(emfq_format_clone): invoke the message prefix before anything
-	else.
-
-	** See bug #310840.
-
-	* em-icon-stream.c (em_icon_stream_get_image): check for /0
-	possibility.
-
-	** See bug #308512.
-
-	* em-account-editor.c (emae_authtype_changed): take into account
-	the writability of the password when sensitising remember
-	password.
-	(get_password): small hack to disable the save-password button
-	when appropriate.
-
-2005-08-05 Srinivasa Ragavan <sragavan@novell.com>
-
-	* em-format-html-display.c (efhd_init, efhd_complete):
-	(efhd_message_add_bar): Fixes the bug #312410.
-	
-2005-08-04  Srinivasa Ragavan <sragavan@novell.com>
-
-	* em-utls.c (emu_update_save_path): Killed a warning.
-
-2005-08-03  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-browser.c (emfb_set_folder): not here.
- 
-	* em-folder-view.c (emfv_set_folder): ref the folder here.
-
-2005-08-03  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (emfv_message_reply): try to fix #309647, only
-	act if the selection is actually active.
-
-2005-07-29  Arunprakash <arunp@novell.com>
-
-	* mail/em-folder-utils.c (em_folder_utils_delete_folder):
-	Allocated a new string to be used for the error dialog response to
-	avoid multiple frees.
-
-2005-08-01  Shakti Sen <shprasad@novell.com>
-
-	* em-composer-prefs.c: Included 'gtkentry.h' to resolve the
-	symbol 'GTK_ENTRY'.
-
-	Partly fixes bug #231968.
-
-2005-08-02  Srinivasa Ragavan <sragavan@novell.com>
-
-	* em-utils.c (emu_get_save_filesel, emu_save_part_response):
-	(emu_save_messages_response): Fixed a bug where the last path is
-	not preserved well.
-
-2005-08-01  Not Zed  <NotZed@Ximian.com>
-
-	* em-subscribe-editor.c (sub_fill_level): always process all nodes
-	we have, even if we have already seen the top result.
-
-2005-07-29  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #300607.
-
-	* mail-vfolder.c (store_folder_renamed_rec, store_folder_renamed):
-	rename all folders in the folder tree renamed.
-
-2005-07-29  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* mail-ops.c: Fix #311223. Include <camel/camel-multipart.h>
-	so that lazy binding does not fail on CAMEL_IS_MULTIPART.
-	
-2005-07-29  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* em-account-editor.c (emae_defaults_page): Fix #307538. Check if
-	the provider type exists  before senisitizing widgets.
-	
-2005-07-28  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #311440.
-
-	* em-utils.c (em_utils_in_addressbook): handle NULL address.
-	
-2005-07-28  Praveen Kumar <kpraveen@novell.com>
-
-	* em-account-editor.c (emae_check_complete) : Update the "Full Name" 
-	text entry with the detected real name of the user. Fixes bug 311778
-	
-2005-07-27  Srinivasa Ragavan <sragavan@novell.com>
-	
-	* mail-config.glade: Changed "Host" to "Server"
-
-2005-07-27  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (get_folders): hack to make it honour the
-	'refresh only inbox' imap/groupwise setting.
-
-2005-07-26  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: fix make distcheck issues.
-
-2005-07-25  Srinivasa Ragavan <sragavan@novell.com>
-
-	* em-format-html-display.c (efhd_init, efhd_finalise):
-	(efhd_attachment_image, efhd_attachment_button):
-	(efhd_format_attachment): Added code to create a attachment bar.
-
-	* em-format-html.c (efh_format_message) Added code to add bar at
-	the beginning of the message.
-
-	* em-popup.[ch] (em_popup_target_new_attachments)
-	(emp_part_popup_set_background)
-	(emp_standard_menu_factory): Added code to handle the popup menu
-	inside the attachment bar.
-
-	* em-utils.[ch] (em_utils_edit_filters, emu_get_save_filesel)
-	(em_utils_save_part, em_utils_save_messages): Added code to handle
-	save selected and save all options of the attachment bar.
-
-2005-07-21  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-browser.c: reverted dobey's busted view->hide* menu
-	stuff.
-
-	* em-account-editor.c (emae_option_entry): if we get a null
-	default, then set "" on the entry.
-	(emae_option_entry): set the default value on the url if it
-	doesn't exist already.
-
-2005-07-20  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (refresh_folders_desc, refresh_folders_get)
-	(refresh_folders_got, refresh_folders_free, get_folders)
-	(receive_update_got_folderinfo, receive_update_got_store): refresh
-	all the folders manually and directly.
-
-	* mail-folder-cache.c (setup_folder): propagate even -1 unread
-	counts, they get ignored later.
-
-	* em-composer-utils.c (emu_handle_receipt_message)
-	(em_utils_handle_receipt): use getmessagex too, so we can always
-	clear any error.
-
-	* em-folder-view.c (emfv_message_selected_timeout)
-	(emfv_list_done_message_selected): use getmessagex and do
-	something meaninful with the error.
-
-	* mail-ops.c (mail_get_messagex): added new get message which
-	returns an exception.
-
-2005-07-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-tools.c (mail_tool_uri_to_folder): dont get the service
-	connected, it will connect if it needs to.
-
-	* mail-ops.c (get_folderinfo_get): * em-folder-utils.c
-	(emft_copy_folders__copy)
-	(emfu_delete_folders): * em-folder-tree.c
-	(emft_get_folder_info__get): Always request subscribed folders, if
-	the backend doesn't implement it it will ignore it.
-
-2005-07-13  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (mail_autoreceive_init, auto_online): listen to
-	session online events, and if we are online, trigger an
-	auto-receive of all auto-check accounts.
-
-2005-07-11  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (auto_account_commit): force an update
-	immediately if we're setting up the timeout to start with.
-
-	* em-folder-tree-model.c (em_folder_tree_model_set_unread_count):
-	noop if the unread count < 0.
-	(em_folder_tree_model_set_folder_info): only set the unread count
-	if we actually have one.
-
-	* em-folder-tree.c (emft_tree_row_expanded): get the folder list
-	'fast'.
-
-	* mail-ops.c (get_folderinfo_get): get the folder list 'fast'.
-
-2005-07-19  Srinivasa Ragavan <sragavan@novell.com>
-
-	* em-folder-tree.c (emft_popup_move): calling the wrong api to
-	move a folder. Infact it was copying for move.
-
-2005-07-14  Vivek Jain <jvivek@novell.com>
-
-	* em-composer-utils.c: included missing header file
-	camel-multipart.h
-
-	**Fixes #310330
-
-2005-07-13  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): Free font name
-
-	* mail-config.c (config_write_style): Free font name and name of
-	  citation color.
-
-	* message-list.c (regen_list_regened, regen_list_free): Free
-	  search string. Thanks to Michael Zucchi for walking me through
-	  this one. My brain wasn't running on all it's cylinders...
-
-2005-07-10  Shreyas Srinivasan <sshreyas@novell.com>
-
-	* mail-config.[ch]: Add new functions to remove proxy accounts and
-	proxies created by the account.
-
-	* mail-compnent.c: Remove proxy accounts at startup
-
-	* mail.error.xml: Add warnings for proxy disable and removal of a
-	proxy when its parents are removed.
-
-	* em-account-prefs.c: Add checks not to display proxies and
-	handling of parent removal/ disabling.
-	
-2005-07-06  Vivek Jain <jvivek@novell.com>
-
-	* em-junk-filter.c: moved to plugins/sa-junk-plugin
-
-	* em-junk-filter.h: removed
-
-	* em-junk.plugin.[ch]: removed
-
-	* em-junk-hook.[ch]: added new files to have a new hook
-
-	* Makefile.am: updated to removed/add these files.
-
-	* mail-session.c (mail_session_init): assign NULL to junk_plugin,
-	remove included file "em-junk-filter.h"
-
-	* mail-component-factory.c (make_factory): register type for
-	EMJunkHook
-
-2005-07-05  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html-display.c (efhd_attachment_image): use the cache,
-	since we set it up.
-	(efhd_image): added a (private!) format handler for all the image
-	types so we intercept them and handle them directly.
-	(efhd_image_fit, efhd_image_unfit): replace the resize callback
-	with two much simpler ones.
-
-	* em-icon-stream.c (em_icon_stream_get_image): added 'fit to'
-	arguments.  Changed dramatically to get approximate fit-to image,
-	update cache, etc.
-	(em_icon_stream_is_resized): added 'fit to' arguments.  changed to
-	manipulate the cache properly.
-	(emis_fit): helper to fit an image to a size.
-	(em_icon_stream_new): added 'fit to' arguments rather than poking
-	structures.
-
-	* em-format-html-display.c (efhd_attachment_image): fixed a memory
-	leak, various style issues.  Removed all scaling code.
-	(efhd_attachment_popup): show menu's appropriately.  add back the
-	hide/show menu always.
-	(efhd_image_popup): fix formatting.
-
-	** Applied patch from Srini for scaling images to fit by default.
-
-2005-07-04  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	* mail-component.c (handleuri_got_folder): Added "forward"
-	command-line option.
-	
-2005-07-06  Not Zed  <NotZed@Ximian.com>
-
-	* importers/evolution-mbox-importer.c (mbox_getwidget): wrap the
-	widgets in another vbox so they display properly.
-
-	* importers/pine-importer.c (pine_getwidget): pack the 'mail'
-	widget.
-
-	* importers/pine-importer.c (pine_import):
-	importers/elm-importer.c (elm_import):
-	importers/evolution-mbox-importer.c (mbox_import): Dont create
-	widgets anymore, report progress through the EImport and handle
-	cancel.
-
-2005-07-01  Not Zed  <NotZed@Ximian.com>
-
-	* importers/Makefile.am: remove shell/importer link & take out
-	netscape & outlook temporarily.
-
-	* Makefile.am: Removed importer link.
-
-2005-06-24  Matt Brown  <matt@mattb.net.nz>
-
-	* em-inline-filter.c: implement extraction of inline
-	signed/encrypted pgp parts and package them into
-	x-inlinepgp-signed/x-inline-pgp-encrypted parts.
-
-	* em-format-html.c: Formatters to verify/decrypt and then display
-	the parts generated by the inline filter.
-
-2005-06-25  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #307398
-
-	* mail-session.c (alert_user): copy the prompt string, in 'no
-	cancel' mode we run asynchronously.
-	(free_user_message): & free it.
-
-2005-06-24  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (efh_url_requested): dont pass data gtkhtml
-	definitely can't handle, to gtkhtml.  This is no security patch,
-	but stops gtkhtml wasting time tying to render malicious mails or
-	other rubbish.
-
-2005-06-21 Brian Mury <b.mury@ieee.org>
-
-	** See bug #301466.
-
-	* filtertypes.xml, searchtypes.xml, vfoldertypes.xml: fix the
-	"match all" case to actually work.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Use SOEXT.
-
-2005-06-08  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (view_changed_cb): make this run a timeout so
-	we don't update too often and suck loads of cpu time.
-
-2005-06-07  Andre Klapper <9016009@gmx.de>
-
-	* mail.error.xml: Fixing typo (bug 306151)
-
-2005-06-02  Not Zed  <NotZed@Ximian.com>
-
-	* Evolution-Mail.idl: only let this be included once.
-
-	* mail-component.c (mail_component_class_init): Setup a test
-	function, and fix the bonobo init function so we're actually a
-	mailcomponent and not just an evolutioncomponent.
-	
-2005-06-02  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c: change this to sub-class evolution-component,
-	not bonobo-object.
-
-	* Evolution-Mail.idl: Made the mail component sub-class
-	Evolution.Component so it can add new interfaces for remote gui
-	mail operations.
-
-2005-05-31  Rodney Dawes  <dobey@novell.com>
-
-	* em-folder-browser.c (emfb_view_hide_read, emfb_view_show_selected):
-	(emfb_view_show_all): Update these methods to use the listener method
-	of access from bonobo as they are radio buttons now
-	(emfb_verbs): Comment out the verbs for the above methods, as they are
-	configured through add_listener now
-	(emfb_enable_map): s/ViewHideSelected/ViewShowSelected/
-	(emfb_activate): Add the listeners for the radio buttons for filtering
-	the message list for unread, selected, or all messages
-	
-2005-05-24  Rodney Dawes  <dobey@novell.com>
-
-	* em-folder-selector.c (folder_created_cb): Remove this unused method
-	(emfs_response): Remove unused variable declarations
-
-	* em-folder-view.c (emfv_popup_{load_images,selectall}): Remove
-	these unused methods
-	
-	* mail-component.c: Include em-folder-utils.h to fix warnings
-	
-2005-05-20  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (mail_component_peek_session): add helper for
-	plugins to get mail session.
-
-2005-05-19  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* mail.error.xml: Added a error message required for
-	marking messages as read in subfolders.
-
-2005-05-19  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html-print.c (em_format_html_print_raw_message): new
-	function to print a non-foldered message.  untested.
-
-2005-05-19  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-utils.h: fix rodney's name choices.  fix
-	multiple-inclusion.  fix forward references.  fix all callers.
-	add many fixme's for the busted api's.
-
-	* em-format-quote.c (emfq_format_clone): use pseudo mime type to
-	find message formatter.
-
-	* em-format-html-display.c (efhd_format_message): remove, it
-	didn't do anything.
-
-	* em-format-html.c (efh_format_message): make this a handler
-	callback.
-
-	* em-format.c (emf_message_rfc822): make this use the pseudo
-	mime-type x-evolution/message/rfc822 instead of the hardcoded
-	format_message callback.
-
-	* em-format-html-display.c (efhd_message_prefix): make this use a
-	pseudo-mime-type handler rather than hard-coded, so it can be
-	overridden by a plugin.
-
-2005-05-17  Radek Doulik  <rodo@novell.com>
-
-	* em-format-html.c: removed include of htmlengine.h which wasn't
-	needed
-
-	* em-format-html-display.c: use top level gtkhtml API instead of
-	lower level one
-
-	* em-folder-view.c (emfv_popup_selectall): use gtk_html_select_all
-	instead of calling html engine directly
-
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vfolder.h: 
-	* mail-autofilter.h: forward-reference structures
-
-	* *.h: Make installed headers includable from mail/
-
-	* Makefile.am (mailinclude_HEADERS): install various mail headers
-	as first cut at public plugin api.
-
-	* move e-error into e-util/
-
-2005-05-16  Srinivasa Ragavan <sragavan@novell.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Added tooltips
-		
-2005-05-13  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am: Add new em-folder-utils.[ch] abstraction
-
-	* em-folder-browser.c: Update for new menu layout
-	Add new methods to handle the actions that were previously only
-	available from the context menu when right-clicking on a folder
-
-	* em-folder-selector.c (emfs_response): Just call emfu_folder_create
-	if the user wants to create a new folder in the selector dialog
-	(em_folder_selector_get_selected_path): Clean up the code to fix a
-	couple potential crashes
-
-	* em-folder-tree.[ch]: Add methods to get pointers to a CamelFolder or
-	CamelFolderInfo object for the selected item in the tree
-	Add a method to get a pointer to an EMFolderTreeModelStoreInfo object
-	for the selected store in the tree
-	Move folder operations out into em-folder-utils.[ch] so that they
-	are abstracted from the tree and can be used by methods other than
-	the internal context menu
-
-	* em-folder-utils.[ch]: Move the folder operations code to here
-
-	* em-folder-view.c: Update for the new menu layout
-	Fix Mark as Read/Unread in the context menu to only show up in the list
-
-	* mail-component.c (create_item): Just call emfu_folder_create here
-	when the user requests to create a new folder from the New toolbar item
-
-2005-05-13  Shreyas Srinivasan	<sshreyas@novell.com>
-	
-	* Fixes bug #273868, #300113, #302831.
-	
-	* mail-offline-handler.c : Add check for Camel Offline
-	store to is_service_relevant.
-
-2005-04-21  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-composer-utils.c (post_reply_to_message): Use the real folder
-	and real uid (not the virtual if replying to a message in a
-	vfolder). Fixes bug #269129.
-
-2005-05-06  Vivek Jain <jvivek@novell.com>
-
-	* em-folder-view.c: EPopupItem emfv_popup_items[] replace Print
-	  with Print... Fixes #272242
-
-2005-05-07  Sankar P  <psankar@novell.com>
-	
-	* mail-ops.c (mail_send_message)
-	Added code to prevent copying of sent items, based on provider type
-
-	* em-account-editor.c (emae_defaults_page)
-	Added code to disable the Sent Folders button
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* mail.error.xml: renamed from mail-errors.xml, add i18n tags, fix
-	some whitespace issues.  Removed some unecessary translations.
-
-2005-05-06  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	* evolution-mail.schemas.in.in: Removed the schema 
-	/schemas/apps/evolution/mail/junk/sa/daemon_port
-	since its not used anymore.
-
-2005-05-06  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* mail/mail-errors.xml : Fixed a typo for #272786
-
-2005-05-05  Radek Doulik  <rodo@site>
-
-	* em-folder-view.c (em_folder_view_get_popup_target): use
-	gtk_html_command to ask if selection is active tto avoid using
-	selection API directly
-	(emfv_popup_copy_text): use gtkhtml API instead of engine API
-	(emfv_message_reply): use new gtk_html_get_selection_html function
-	to avoid using low level gtkhtml APIs
-
-2005-05-03  Radek Doulik  <rodo@site>
-
-	* em-format-html-display.c: removed include of htmlinterval.h as
-	it's not needed
-
-2005-04-28  Parthasarathi Susarla <sparthasarathi@novell.com>
-
-	* em-folder-view.c (emfv_set_folder): remove a call to
-	  refresh folder from here
-	* em-folder-browser.c (emfb_set_folder): call 
-	  mail_refresh_folder here
-	
-2005-04-28  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c: add some message list loading/profiling points,
-	"list".
-
-	* em-folder-view.c: add some message display/loading profiling
-	points, "goto".
-
-2005-04-12  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #273752
-
-	* em-folder-tree.c (emft_drop_folder_rec): handle NULL
-	"parent_name" - dropping to store node.
-
-2005-04-08  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-composer-utils.c (em_utils_send_receipt): Simplify the
-	scanning for '@' by using strchr().
-
-2005-04-08  Not Zed  <NotZed@Ximian.com>
-
-	* em-composer-utils.c (em_utils_ask_receipt): removed.
-	(em_utils_handle_receipt): asynchronously load message if none is
-	supplied.
-
-	* em-folder-view.c (emfv_set_seen): pass message in.
-
-	* em-composer-utils.c (em_utils_ask_receipt): strip leading lwsp
-	on the disposition address.
-	(em_utils_ask_receipt): added a comment about which rfc.
-	(em_utils_handle_receipt): merged ask_receipt into here.  Changed
-	api to take a message instead, so we don't have to load the
-	message every time.  Also only set receipt-handled if we have a
-	receipt requested in the first place.
-
-2005-04-05  ERDI Gergo  <cactus@cactus.rulez.org>
-
-	* mail-errors.xml: Added new dialog for receipt requests
-
-	* em-composer-utils.c (em_utils_guess_account): Made guess_account
-	public, to be callable from em-folder-view
-	(em_utils_send_receipt): New function to send an RFC
-	2298-compliant message delivery notification
-
-2005-04-05  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #74320
-
-	* em-format.c (em_format_part_as): if the snooped type is NULL,
-	fall back to application/octet-stream.
-
-2005-04-04  Rodney Dawes  <dobey@novell.com>
-
-	* em-folder-view.c (emfv_popup_items): Add Mark as Read/Unread back
-	to the context menu (#73192)
-	Fix the ordering values for some menu items in the context menu that
-	had duplicate order values
-
-2005-03-31  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #72935
-
-	* em-folder-view.c: always enable the stop button.
-
-2005-03-31  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #72518
-
-	* em-folder-tree.c (emft_popup_delete_folder): prompt for vfolder
-	case differently.
-
-2005-03-31  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (on_selection_changed_cmd): only noop if we only
-	have 1 message selected, otherwise we don't update the menu's.
-	Fixes a problem introduced by 64987's fix.
-
-2005-03-30  Li Yuan  <li.yuan@sun.com>
-
-	* em-account-prefs.c: (em_account_prefs_treeview_new):
-	add a11y name to Mail Accounts Table
-	* mail-config.glade:
-	add a11y name to tables in Mail Preferences page and 
-	Composer Preferences page.
-	Fixes #73914
-
-2005-03-16  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-format-html.c (efh_format_headers): Don't show multiple
-	"Mailer" headers even if multiple x-mailer/user-agent/whatever
-	headers exist. Fixes bug #70394.
-
-2005-03-16  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #73363
-
-	* em-folder-view.c (emfv_list_message_selected): insert a timeout
-	before loading the message.
-	(emfv_message_selected_timeout): handle the timeout, start loading
-	the message.
-	(emfv_set_folder, emfv_destroy): cleanups for above.
-
-2005-03-16  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #73559
-	
-	* em-filter-source-element.c
-	(em_filter_source_element_get_sources): check the url != "" and decoded
-	before using it.
-
-2005-03-16  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #71003, again.
-
-	* mail-component.c (impl_quit): fix sense of 'can quit' logic.
-
-2005-03-14  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #73550
-
-	* em-format-hook.c (emfh_format_format): if we are disabled, don't
-	invoke handler, try to invoke old handler if there was one.
-
-2005-03-10  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #73293
-
-	* message-list.c (main_folder_changed): emit a 'list built' signal
-	if we just modified it too.
-
-2005-03-10  Vivek Jain  <jvivek@novell.com>
-	
-	**fixes bug #73139
-	* em-folder-tree.c (render_pixbuf):change the shared-folder icon names 
-	to the names in gnome-icon-theme 
-
-2005-03-03  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #66592
-
-	* mail-tools.c (mail_tool_make_message_attachment): jus call
-	camel_medium_remove_header to remove the bcc header, don't need to
-	loop.
-
-	* mail-ops.c (mail_send_message): try to find the account by uid
-	first, fall back to name.
-
-	* em-composer-utils.c (composer_get_message): set
-	x-evolution-account by uid, not name.
-
-2005-03-02  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #66592
-
-	* em-composer-utils.c (got_post_folder): no longer needed.
-	(composer_get_message): remove 'post' and 'no_recipeints' args.
-
-	* mail-ops.c (mail_send_message): change for xev changes. Also
-	handle postto if set.
-
-	* mail-tools.c (mail_tool_remove_xevolution_headers) 
-	(mail_tool_restore_xevolution_headers): fix for api change.
-	(mail_tool_destroy_xevolution): remove.
-
-	* mail-tools.h: remove XEvolution, just use a struct _header_raw
-	for it.
-
-	* em-composer-utils.c (em_utils_composer_send_cb): don't post
-	message here, just queue it like any other outgoing mail.
-
-2005-03-02  Not Zed  <NotZed@Ximian.com>
-
-	** See "bug" 73100
-
-	* mail-dialogs.glade: empty out the license_top_label text, it is
-	always overwriten by the code.
-
-2005-03-01  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c: include atkutil.h
-	(message_list_construct): cast warning.
-
-	* mail-session.c (mail_session_set_interactive): remove unused
-	variable since we can no longer terminate password requests.
-
-	* mail-autofilter.c (em_vfolder_rule_from_address): properly
-	define in header.
-
-	* em-utils.c (emu_get_save_filesel): only define filename in the
-	!gtkfilechooser case.
-
-	* em-mailer-prefs.c (restore_labels_clicked): cast for warning.
-	(em_mailer_prefs_construct): same.
-
-	* em-format-html.c (efh_format_header): remove unused variable.
-
-	* em-account-editor.c (emae_widget_druid_glade): remove unused
-	variable.
-
-	* importers/mail-importer.h: forward-delcare struct
-	_MailComponent.
-
-	* *c: remove/disable various debug.
-
-2005-03-02  Harry Lu <harry.lu@sun.com>
-
-	Fix for 71733.
-
-	* mail-signature-editor.c: (mail_signature_editor): if is_new,
-	let name_entry get the focus.
-
-2005-02-28  JP Rosevear  <jpr@novell.com>
-
-	* em-utils.c (em_utils_configure_account): pass in accountDruid
-	config id
-
-	* em-account-prefs.c (account_add_clicked): pass in accountDruid
-	config id
-	(account_edit_clicked): pass in accountWizard config id
-	
-	* em-account-editor.h: update protos
-
-	* em-account-editor.c (em_account_editor_new_with_config_id):
-	create a new account editor with a specific config id
-	(em_account_editor_new): pass
-	(em_account_editor_construct): make this static and take the
-	config id as an arg
-
-2005-02-24  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #72609
-
-	* em-inline-filter.c (emif_scan): try to convert the filename
-	based on the incoming charset or the locale charset.  This will
-	make sure it is always valid.
-
-2005-02-28  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-browser.c: reverted Mengjie's patch for 72545.
-
-2005-02-27  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* default/de/Inbox: Added German translation of default inbox.
-
-2005-02-25  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* em-folder-browser.c (emfb_edit_select_all): make the 'select
-	all' work in all conditions.
-
-	Fixes #72545
-
-2005-02-24  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #68459
-
-	* em-composer-utils.c (get_reply_sender): check the followup-to
-	header before the newsgroups header.
-	(reply_get_composer, get_reply_sender, get_reply_all): change
-	post-to to be a CamelNNTPAddress not a string pointer.
-
-2005-02-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #71003
-
-	* mail-component.c (impl_quit): add a new state MC_QUIT_THREADS to
-	wait for all mail threads to finish before quitting.
-
-2005-02-23  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-format-html.c (efh_format_header): Don't use the pre-UTF-8
-	converted subject header string from the CamelMimeMessage object,
-	decode it ourselves using the the user's override charset. Fixes
-	bug #62109.
-
-2005-02-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #34153 and no doubt duplicates
-
-	* mail-component.c (impl_requestQuit): use the VISIBLE count not
-	the TOTAL count to check if there are unsent emails.
-
-2005-02-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #71528.
-
-	* em-migrate.c (remove_system_searches, em_migrate_1_4): remove
-	all 'system' searches when upgrading from pre 2.0.
-
-2005-02-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #71967
-
-	* em-account-editor.c (emae_receive_options_extra_item): make sure
-	we track the keep_on_server setting in the e-account, not just the
-	url (hack).
-
-2005-02-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* mail-session.c:
-	* mail-config.c: Include <libedataserverui/e-passwords.h>.
-
-2005-02-22  Not Zed  <NotZed@Ximian.com>
-
-	* em-account-editor.c (emae_send_page): fix argument order to
-	memset.
-	(emae_security_page): fix the non-have_nss case.
-
-2005-02-22  Marco Pesenti Gritti  <marco@gnome.org>
-
-	* mail/em-popup.c (emp_apps_open_in, emp_standard_menu_factory):
-	Use gnome-vfs API to launch external applications
-
-2005-02-22  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #40515
-
-	* mail-config.c (mail_config_signature_run_script): run the script
-	using /bin/sh -c, so arguments may be passed to the script.
-
-2005-02-22  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #68866
-
-	* em-format-quote.c (emfq_format_headers): line-feed after all
-	headers for blind people.
-
-2005-02-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #35219
-
-	* em-utils.c (em_utils_flag_for_followup_clear): clear the flag
-	tags rather than setting them to "".  Also change to using newer
-	messageinfo api.
-	(tag_editor_response, em_utils_flag_for_followup)
-	(em_utils_flag_for_followup_completed):	some cleanup/api stuff.
-
-2005-02-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #64987
-
-	* message-list.c (message_list_select_thread): select the paths
-	with one call.
-	(on_selection_changed_cmd): get the cursor_uid from the cursor.
-
-2005-02-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #72337
-
-	* mail-component.c (store_info_new, store_info_unref): refcount
-	the storeinfo's.
-	(mc_add_store_done): noop if removed.
-	(store_hash_free, mail_component_remove_store): mark storeinfo
-	removed.
-
-2005-02-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #70718
-
-	* em-folder-view.c (emfv_list_built): handle list_built events -
-	whenever the list changes.
-	(emfv_gui_folder_changed, emfv_folder_changed): removed, we want
-	to run off the viewed list, not the physical folder.
-
-2005-02-22  Rodney Dawes  <dobey@novell.com>
-
-	* em-account-editor.c (emae_security_page): The GladeXML object is
-	no longer a part of the private structure, and we need to reference
-	it directly as it is a local variable now
-
-2005-02-14  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #61363 & e-util/ChangeLog
-
-	* em-account-editor.c: All sorts of changes to make the ui more
-	dynamic, re-create all widgets when it needs a reconfigure.  A bit
-	slower and it flickers a bit.
-	
-	* em-account-editor.c (emae_setup_service): take xml file pointer.
-	(emae_send_page): create a new send page every time we need to,
-	don't re-use the old oneq.
-	(emae_setup_authtype): renamed to refresh_authtype.
-	(emae_setup_service): init authtype pointer.
-	(emae_needs_auth): use the auth_frame pointer directly.
-	(emae_refresh_providers): rename from setup_providers.
-
-2005-02-11  Not Zed  <NotZed@Ximian.com>
-
-	* em-account-editor.c (emae_setup_service): set needs_auth to NULL
-	if we don't, so it gets reset if the ui changes.
-
-2005-02-10  Not Zed  <NotZed@Ximian.com>
-
-	* em-account-editor.c (emae_setup_providers): don't include any
-	providers which are store and transport in the transport page.
-	(emae_send_page): show no send options page at all if the provider is
-	store and transport.
-	(emae_uri_changed): copy store url to transport if as above.
-
-2005-02-09  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #70795
-
-	* em-folder-view.c (em_folder_view_open_selected): set the search
-	on the browser to match the current view.
-
-	* message-list.c (mail_regen_list): save the search if no folder
-	set, incase the folder gets set later on.
-
-2005-02-18  Rodney Dawes  <dobey@novell.com>
-
-	* mail/em-folder-view.c (emfv_popup_copy_text): New method to copy
-	the selected text in the mail display, to the clipboard
-	(emfv_popup_items): Restructure this list for the new context menus
-	layout that we are moving to, to improve the UI
-	(emfv_popup): Add a third argument for whether we are on the mail
-	display or not, so that we can pop up the correct portion of the menus
-	Pass the on_display argument on to create the popup target
-	Only generate the label items if we are on the list and not the display
-	(emp_uri_popup_vfolder_{sender,recipient}): New methods to create
-	vfolders to and from mailto: addresses from the context menu
-	(emfv_enable_menus): Create the target here for clicking on the list
-	(em_folder_view_get_popup_target): Add a third argument so that we
-	can tell whether we are on the display or not
-	Set the appropriate flags on the target for whether we are on the
-	message display,, and whether or not there is selected text in it
-	(emfv_list_right_click): We aren't rigt-clicking on the display here
-	(emfv_popup_menu): We aren't right-clicking on the mail display here
-	(emfv_uri_popups): Add the submenu for creating a vfolder from mailto:
-	(emfv_format_popup_event): We are right-clickingo nt he display here
-
-	* mail/em-folder-view.h: Add the new flags we need for the mail
-	context menus popup target here
-	(em_folderiew_get_popup_target): Add the on_display argument
-
-	* mail/em-popup.c (emp_standard_uri_popups): Fix the label and mnemonic
-	for the Send New Message popup item for mailto: addresses
-
-	* mail/mail-autofilter.c (rule_from_address):
-	(em_vfolder_rule_from_address): New methods to create a vfolder based
-	on a CamelInternetAddress object that we get from the mailer
-
-	* mail/mail-vfolder.[ch] (vfolder_gui_add_from_address): New method to
-	create a vfolder rule based on the mailto: addresses
-
-	Fixes #23822
-
-2005-02-15  Radek Doulik  <rodo@novell.com>
-
-	* em-junk-filter.c: use camel_debug
-
-2005-02-10  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #72266
-
-	* em-folder-selection-button.c
-	(em_folder_selection_button_clicked): if the selector is already
-	up, just raise it.
-	(em_folder_selection_button_destroy): destroy the selector if it
-	is still up.
-
-2005-02-09  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #71429
-	
-	* em-folder-view.c (emfv_activate): setup the plugin menu's after
-	the main ones.
-
-2005-02-08  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #72228
-
-	* mail-ops.c (mail_send_message): fix this god-awful goto-loop
-	crap, and delete the message if it worked.
-	(mail_send_message): fix a major-leak with sent messages never
-	being unreffed.
-	(send_queue_send): don't get messages ourself.
-	(mail_send_message): dont lose the exception if we
-	can't even open the sent folder.
-
-2005-02-07  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #72209
-
-	* em-folder-tree.c (emft_popup_copy_folder_exclude): implement one
-	for copying/moving folders.
-
-	* em-folder-selection.c (em_select_folder): add an excluded func
-	argument, fix callers.
-
-	* em-folder-tree.c
-	(em_folder_tree_set_exclude_func): allow custom callback for
-	exclusion.
-	(emft_select_func): handle the custom excluded callback.
-
-2005-02-07  Harry Lu  <harry.lu@sun.com>
-
-	Fix for 72275.
-	* em-folder-view.c: (emfv_popup_menu): try to bring up menu for
-	preivew html object.  
-	(emfv_format_popup_event): handle event == NULL case.
-	* em-format-html-display.c: (em_format_html_display_popup_menu):
-	New function to popup context menu.
-	* em-format-html-display.h: add new function declaration.
-
-2005-02-04  Not Zed  <NotZed@Ximian.com>
-
-	* em-subscribe-editor.c (sub_folderinfo_get): reverted jeff's
-	patch for the subscribed hint.
-
-	** See bug #65329
-
-	* em-folder-properties.c (emfp_dialog_got_folder): translate
-	local-store special folders.
-
-	* mail-session.c (alert_user, do_user_message): if we aren't
-	waiting for cancel, then don't worry about waiting on the reply
-	port, otherwise we could block when we don't need to, if there is
-	another window already up.
-
-2005-02-03  Jeffrey Stedfast  <fejj@novell.com>
-
-	* message-list.c (message_list_set_folder): Use
-	g_hash_table_foreach_remove() instead so the keys don't point to
-	free'd values.
-	(normalised_free): Return TRUE.
-
-2005-02-02  Rodney Dawes  <dobey@novell.com>
-
-	* em-subscribe-editor.c (em_subscribe_editor_new): Use the
-	gtk_widget_ensure_style method instead of gtk_widget_realize when
-	setting the border widths of the dialog containers for HIG compliance
-
-	Fixes #68743
-
-2005-02-02  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fixes bug #70454
-
-	* em-subscribe-editor.c (sub_folderinfo_get): Request subscription
-	info (new flag).
-	(sub_fill_level): Fixed the FIXME here (imap4 now implements
-	CAMEL_FOLDER_SUBSCRIBED flag properly).
-
-2005-02-01  Rodney Dawes  <dobey@novell.com>
-
-	* em-folder-browser.c: Replace "_Virtual Folder" with "_vFolder" for
-	the search menu to create a vfolder from a search
-
-	* em-folder-tree-model.c (sort_cb): s/VFolders/vFolders/ for sorting
-	in the folder tree
-	(em_folder_tree_model_load_state): s/VFolders/vFolders/ in a comment
-
-	* em-folder-view.c: s/VFolder/vFolder/ for the popup menu
-
-	* em-vfolder-editor.c (em_vfolder_editor_new): Replace the string
-	"Virtual _Folders" with "v_Folders" for the label
-
-	* em-vfolder-rule.c (em_vfolder_editor_sourcelist_new): Repalce the
-	string "VFolder source" with "vFolder source"
-
-	* mail-errors.xml:
-	* mail-errors.xml.h: Replace "virtual folder" with "vFolder" in an
-	error string
-
-	* mail-vfolder.c (vfolder_setup_desc): s/vfolder/vFolder/
-	(vfolder_setup_do): s/vfolder/vFolder/
-	(vfolder_load_storage): s/VFolders/vFolders/
-	(vfolder_edit_rule): s/VFolder/vFolder/
-	(vfolder_gui_add_rule): s/VFolder/vFolder/
-
-	Fixes #68137
-		
-2005-02-01  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #65329.
-
-	* mail-component.c (view_changed_cb): translate special names on
-	the local store.
-
-	* em-folder-tree-model.c (sort_cb): use the type hint to sort for
-	inbox, not the name.
-	(emft_is_special_local_folder): removed.
-	(em_folder_tree_model_set_folder_info): special-case the
-	local-store case, handle translated names and the name hints.
-
-	* em-folder-tree.c (render_pixbuf): use the camel folderinfo
-	folder type to determine the icon, don't hardcode based on name.
-
-	** See bug #71310
-
-	* em-composer-prefs.c (sig_add_script_response): force a save of
-	the signatures as soon as they change.  Also save the script name
-	if we were just editing it, not just the signature name.
-
-	** See bug #71312.
-
-	* em-folder-view.c (em_folder_view_open_selected): if we're
-	looking at a vfolder, then look open the original folder if we need
-	to perform any edits.
-
-2005-01-31  Hans Petter Jansson  <hpj@novell.com>
-
-	* importers/mail-importer.h (mc): Remove unused global symbol.
-
-2005-01-28  Jeffrey Stedfast  <fejj@novell.com>
-
-	* message-list.c (message_list_set_folder): Reset the normalised
-	string sort table.
-
-2005-01-31  JP Rosevear  <jpr@novell.com>
-
-	Fixes #71937
-
-	* evolution-mail.schemas.in.in: fix spelling error
-
-	* mail-errors.xml: fix two spelling errors
-
-2005-01-31  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #67083
-
-	* em-format-html.c (efh_format_text_header): no-wrap the header line.
-
-	** See bug #69850
-	
-	* mail-autofilter.c (rule_from_message): dont crash if we're
-	missing the requested headers.
-
-	** See bug #71521.
-
-	* em-account-editor.c (emae_url_set_hostport): dont ever set a
-	NULL host.
-
-2005-01-28  Not Zed  <NotZed@Ximian.com>
-
-	* em-account-editor.c (emae_service_provider_changed): handle
-	'hide' bits, don't get/set values from the widgets at all.
-
-	* em-account-editor.c: put some tables back into the
-	druid and editor, since econfig supports tables now.
-
-	* em-account-editor.c (emae_service_provider_changed): handle
-	'hide' bits, don't get/set values from the widgets at all.
-
-	* em-account-editor.c: put some tables back into the
-	druid and editor, since econfig supports tables now.
-
-	* em-account-editor.c (emae_service_provider_changed): handle
-	'hide' bits, don't get/set values from the widgets at all.
-
-	* em-account-editor.c: put some tables back into the
-	druid and editor, since econfig supports tables now.
-
-	** See bug #71520.
-	
-	* em-account-prefs.c (account_edit_clicked): repeat the nasty hack
-	from account_edit, to refresh the list after edit.
-
-2005-01-27  Not Zed  <NotZed@Ximian.com>
-
-	* See bug #69815.
-	
-	* mail-component.c (impl_quit): shutdown vfolders as first step.
-
-	* mail-vfolder.c (vfolder_setup_do): if we're shutdown during
-	processing, just noop.
-	(vfolder_adduri_do): same.
-	(mail_vfolder_shutdown): set the shutdown flag.
-
-2005-01-27  Rodney Dawes  <dobey@novell.com>
-
-	* mail-config.glade: Fix the labels in the account druid to be
-	left aligned, and justified left
-	Fix the border and spacing for all the vboxes in the account druid
-	pages to be HIG compliant
-	Fix the account naming info label to be more concise
-
-	Fixes #68696
-
-2005-01-27  Rodney Dawes  <dobey@novell.com>
-
-	* mail-send-recv.c (build_dialog): Fix the dialog to have borders
-	that are HIG-compliant and fix up the spacing and padding of the
-	internal widgets to do the right thing to be HIG compliant
-
-2005-01-27  JP Rosevear  <jpr@novell.com>
-
-	* em-format-hook.c: add a d(x) debugging define and default to off
-
-2005-01-26  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	Fixes #71774 
-
-	* em-folder-tree.c (emft_popup_rename_folder): we should check
-	whether the 'new_name' is a NULL pointer to avoid Evolution
-	crashes.
-
-2005-01-25  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* em-mailer-prefs.c: (restore_labels_clicked),
-	(em_mailer_prefs_construct):
-	add a11y names for color pickers.
-
-2005-01-24  Hans Petter Jansson  <hpj@novell.com>
-
-	* Makefile.am (libevolution_mail_la_LIBADD): Pull in the contact
-	editors, so we can pass pointers to their creation functions to
-	ENameSelectorEntry.
-
-2005-01-24  JP Rosevear  <jpr@novell.com>
-
-	* searchtypes.xml: add back body contains
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #46287
-	
-	* mail-config.glade: remove enable/disable button
-
-	* em-composer-prefs.h: remove unused button
-
-	* em-composer-prefs.c (spell_language_toggled): handle the cell
-	being toggled
-	(spell_setup): enable/disable button is gone
-	(em_composer_prefs_construct): setup a listener for the toggle
-	cell
-
-2005-01-24  Radek Doulik  <rodo@ximian.com>
-
-	* em-popup.[ch]: removed EM_POPUP_SELECT_MARK_[NO]JUNK masks
-
-2005-01-20  Radek Doulik  <rodo@ximian.com>
-
-	* em-folder-view.c: patch from Chris Lahey, makes Mark as Junk/not
-	Junk items active on all messages, removes calls to
-	message_list_get_selected where not needed
-
-2005-01-24  Not Zed  <NotZed@Ximian.com>
-
-	* searchtypes.xml: changed for 69122.
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-	
-	Fixes #46404
-	
-	* em-folder-view.c (emfv_print_response): use the config in the
-	print data and free it
-	(em_folder_view_print): load the config from e_print and use the
-	dialog from e_print
-
-2005-01-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #60664.
-
-	* em-format-html-display.c (efhd_init, efhd_gtkhtml_style_set): if
-	the style changes, re-calculate the page colours, and redraw.
-
-2005-01-20  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-tree.c (emft_copy_folders__desc): Added a description
-	function for copying folders (so we don't get a "Working 0x..."
-	status message).
-
-	* mail-mt.c (do_op_status): Always g_free(what) since we always
-	strdup it.
-
-2005-01-20  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #55831.
-
-	* evolution-mail.schemas.in.in: added open_many prompt key.
-
-	* mail-errors.xml: added ask-open-many
-
-	* em-folder-view.c (em_folder_view_open_selected): put back the
-	'you're opening too many are you sure' thing.
-
-2005-01-19  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-properties.c (emfp_get_folder_item): Increment i each
-	time thru the loop or we lose widgets.
-
-2005-01-19  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #66943.
-
-	* em-composer-utils.c (save_draft_done): check if the
-	editor_engine is still there before trying to invoke a method on
-	it.
-	(em_utils_composer_save_draft_cb): grab resources before getting
-	the folder, so the composer doesn't go away.
-
-2005-01-18  Rodrigo Moya <rodrigo@novell.com>
-
-	* em-filter-source-element.c:
-	* mail-config.c: removed e-url.h include.
-
-2005-01-18  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #70768.
-
-	* em-folder-browser.c (emfb_mark_all_read): get the uid list from
-	the message-list (view) rather than folder (model).
-
-	* message-list.c (message_list_foreach): removed, no longer used.
-	(message_list_get_uids): new function replacing ml_foreach, get
-	visible uids's of messages.
-
-2005-01-18  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #71105.
-
-	* em-folder-tree.c (emft_popup_rename_folder): dont let a user
-	rename a folder to one including '/'.
-
-	* em-format-html.c (emfh_gethttp): kill old 'load http 0 now=0' debug.
-
-	** See bug #70563.
-
-	* em-utils.c (emu_set_proxy, emu_proxy_setup)
-	(em_utils_get_proxy_uri): make sure the init code is called from
-	main thread (gconf usage), and add locking for data consistency.
-
-2005-01-14  Not Zed  <NotZed@Ximian.com>
-
-	** Related to changes for #65178.
-
-	* mail-vfolder.c (mv_find_folder): changed from my_list_find, take
-	store arg and use camel_Store_Folder_uri_equal() instead of wrong
-	uri_cmp function.
-	(mail_vfolder_delete_uri): same.
-	(mail_vfolder_rename_uri): same.
-	(uri_is_ignore): take store arg, and same as above.  use the right
-	uri for checking sent folder.
-	(mail_vfolder_*): convert to storing uri's in camel form.
-
-2005-01-13  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #71029.
-
-	* em-account-editor.c (emae_option_toggle): revert menjie's patch
-	and do it using object args.
-
-2005-01-12  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #70990.
-
-	* em-account-editor.c (emae_service_url_changed): if the value is
-	"" then don't set it
-
-	** See bug #70018.
-
-	* mail-signature-editor.c (mail_signature_editor): use the right
-	version for the gtkhtml editor control.
-
-2005-01-11  Vivek Jain  <jvivek@novell.com>
-
-	* em-folder-tree.c (render_pixbuf): Added conditions to check for
-	shared folders to display different icon if it is a shard folder.	
-
-2005-01-07  Not Zed  <NotZed@Ximian.com>
-
-	* em-account-prefs.c (account_add_clicked): remove old code, setup
-	transient parent and weak ref for refresh.
-
-2005-01-06  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: install schemas properly
-
-2005-01-06  Jeffrey Stedfast  <fejj@novell.com>
-
-	* mail-folder-cache.c (mail_note_store): Handle the
-	CamelOfflineStore case just like the CamelDiscoStore case.
-
-	* mail-ops.c (prep_offline_do): Since we can't kill off
-	CamelDisco* (groupwise is using it), we have to handle both
-	CamelOfflineFolder and CamelDiscoFolder for now.
-	(set_offline_do): Same.
-
-2005-01-05  Not Zed  <NotZed@Ximian.com>
-
-	* em-menu.c: (emph_targets[]): Add the widget target, missed this.
-
-2005-01-05  Not Zed  <NotZed@Ximian.com>
-
-	* em-menu.c (em_menu_target_new_widget): add a semi-dummy target
-	for widget target.
-
-	* mail-component.c (handleuri_got_folder): handle the "reply"
-	parameter, if set.
-
-	* em-composer-utils.c (em_utils_reply_to_message): only ref the
-	source if supplied.
-	(reply_to_message): only unref the source if supplied.
-
-2004-12-28  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* em-folder-tree.c: (em_folder_tree_new_with_model):
-	add atk name for the treeview.
-
-2004-12-22  Not Zed  <NotZed@Ximian.com>
-
-	* em-account-editor.c (emae_needs_auth): moved to after
-	emae_authtype_changed to fix warning.
-
-2004-12-17  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html-display.c (efhd_attachment_popup): 
-
-	* message-list.c (ml_tree_drag_data_received): 
-
-	* em-folder-view.c (emfv_popup, emfv_format_popup_event): 
-
-	* em-folder-tree.c (tree_drag_data_received): api changes.
-	(emft_popup): 
-
-	* em-popup.c (emp_standard_menu_factory) 
-	(emp_standard_menu_factory): api changes.
-
-2004-12-21  Not Zed  <NotZed@Ximian.com>
-
-	* em-account-editor.c (emae_needs_auth): if we're turned on, then
-	record the current authtype setting on the widgets, if we're
-	turned off, clear the authmech setting.
-	(emae_setup_service): setup the needs auth after the authtype, and
-	get setting from url->authmech.
-	(emae_service_provider_changed): only clear the url->authmech if
-	we don't have the current one in our list.
-
-2004-12-20  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* default/Makefile.am: Added 'ja' and 'nl' to install.
-
-2004-12-14  Rodney Dawes  <dobey@novell.com>
-
-	* mail-account-gui.c: Remove this from CVS
-	
-	* mail-config.glade: Use em_account_editor_folder_selector_button_new
-	instead of mail_account_gui_folder_selector_button_new
-
-2004-12-14  JP Rosevear  <jpr@novell.com>
-
-	Fixes #68759
-	
-	* mail-account-gui.c (service_check_supported): fix typo in
-	routine name
-
-2004-12-08  Hans Petter Jansson  <hpj@novell.com>
-
-	* importers/pine-importer.c: Include <libebook/e-destination.h> from
-	evolution-data-server.
-
-2004-12-08  Rodney Dawes  <dobey@novell.com>
-
-	* em-folder-tree.c:
-	* mail-component.c (impl__get_userCreatableItems): 
-	Use stock_new-dir instead of stock_folder for "New Folder" creation
-
-2004-12-07  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* mail-config.glade: add mnemonic for buttons, labels, etc.
-	* mail-dialogs.glade:add mnemonic for buttons, labels, etc.
-	* message-tags.glade:add mnemonic for buttons, labels, etc.
-
-2004-12-08  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component-factory.c (make_factory): and put them here
-	instead so they're available even when the mailer isn't activated
-	yet.
-
-	* mail-component.c (mc_startup): remove plugin hook registrations.
-
-2004-11-22  Not Zed  <NotZed@Ximian.com>
-
-	* em-account-editor.c (emae_receive_options_extra_item): dont
-	track containee widgets anymore, they are automagically destroyed
-	by the container if required.
-
-2004-11-25  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c (em_junk_sa_test_spamd): do not call gconf here
-	as we may be called from worker thread
-	(em_junk_filter_get_plugin): read alternative spam[cd] binaries
-	paths here, use init lock to be sure no one is accessing spam[cd]
-	binaries paths
-
-	Fixes #69623
-
-2004-12-01  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* em-account-editor.c:according to the HIG, remove accelerators in 
-	the notebook tab labels 
-
-2004-12-01  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* em-account-editor.c: (emae_option_toggle),
-	(emae_receive_options_item):add mnemonic for buttons.
-	* em-format-html-display.c: (efhd_attachment_button):add atk name
-	for the popup button.
-	* mail-account-gui.c: (mail_account_gui_build_extra_conf):add 
-	access key for checkbox.
-	* message-list.c: (message_list_construct):add a atk name for the
-	message list.
-
-2004-11-22  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #69339.
-
-	* em-format-html.c (efh_format_do): after closing the base output
-	stream, re-loop if more jobs were queued.
-
-2004-11-19  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #69339.
-
-	* em-format-html.c (efh_format_do): close the stream/html after we're
-	finished, since the multipart/related stuff may write more content
-	for orphaned attachments.
-
-2004-11-23  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #69579.
-
-	* em-folder-properties.c (em_folder_properties_show): check to see
-	if the vfolder is the unmatched folder before letting the user try
-	to see its properties.
-
-2004-11-30  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #68958.
-
-	* em-folder-browser.c (emfb_list_built): if the pending selected
-	uid isn't in the folder (yet), don't clear it, just keep it
-	around.  Hook/unhook folder_changed events.
-	(emfb_folder_changed, emfb_gui_folder_changed): if a select_uid is
-	set, and the message is now available, then select it.
-
-2004-11-28	S.Ã?aÄ?lar Onur <caglar@uludag.org.tr>
-
-	** See bug #69446.
-
-	* evolution-2.0.2/mail/mail-account-gui.c (mail_account_gui_setup): 
-	some strcasecmp() calls changed with g_ascii_strcasecmp() for Turkish
-	character conversiton problems [ http://www.i18nguy.com/unicode/turkish-i18n.html ]
-
-2004-11-26  JP Rosevear  <jpr@novell.com>
-
-	* em-format.c: wrap printf's in debug defines
-
-2004-11-26  JP Rosevear  <jpr@novell.com>
-	
-	* em-format-html-display.c (efhd_xpkcs7mime_button): get image
-	widget directly from icon factory
-
-	* mail-send-recv.c (build_dialog): ditto
-	
-2004-10-12  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c: when starting new spamd, call it with
-	--socketpath parameter to use unix sockets instead of opening TCP
-	port. kill such started daemon in finalize callback which is
-	installed by atexit. also try to respawn spamd in case spamc
-	returns error, if respawning is too fast (8 restarts in last 5
-	minutes) fallback to spamassassin
-
-	* mail-component.c (impl_quit): call mail_session_quit
-
-	* mail-session.c (mail_session_init): call junk plugin init
-	(mail_session_quit): new method, called on evo exit
-
-2004-11-22  Joan Sanfeliu  <joan@fibranet.com>
-
-	* mail-config.glade : Evolution word spelled with an uppercase E
-
-	Fixes #61065
-
-2004-11-16  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am:
-	* importers/Makefile.am: Removed camel linking.
-
-2004-11-15  Not Zed  <NotZed@Ximian.com>
-
-	* *.c: Moved various things from e-util to libedataserver.
-
-	* GNOME_Evolution_Mail.server.in.in: remove the startup wizard stuff.
-
-	* mail-config-druid.[ch]:
-	* mail-account-editor.[ch]:
-	* mail-account-gui.[ch]: removed & deleted.
-
-	* mail-session.c (mail_session_init): and here too.
-	* em-migrate.c (em_migrate_1_4): init camel-provider library too.
-	(e_path_to_physical): copy from e-util/e-path.c.
-
-	* Makefile.am (libevolution_mail_la_LIBADD): link to new libcamel
-	provider too.
-
-2004-11-12  Not Zed  <NotZed@Ximian.com>
-
-	* filtertypes.xml:
-	* vfoldertypes.xml: 
-	* searchtypes.xml: Added 'match all' rules.
-
-	** Merge in notzed-messageinfo-branch.
-
-2004-11-11  Radek Doulik  <rodo@ximian.com>
-
-	* em-format-hook.c (emfh_enable): l = g_list_next (l); in inner
-	loop instead of g = g_list_next (l).. probably typo after c'n'p
-
-	* em-format.c (em_format_class_remove_handler): in case the old
-	handler doesn't exist, remove 'info' handler from type_handler
-	table
-
-2004-11-03  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (emfv_popup): Fix the popup id.
-	
-2004-11-03  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (emfv_list_done_message_selected): revert
-	jeff's last change - we do actually want to know when we couldn't
-	load a message.  the crash he was fixing was fixed elsewhere.
-	also fix the unref ordering stuff.
-
-	* em-format-html.c (efh_format_timeout): removed the fixme i
-	added.
-
-2004-11-01  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #67496.
-
-	* em-format-html.c (efh_text_html): use the base on the emformat
-	to calculate our absolute iframe uri.
-	(efh_multipart_related): same as emf_multipart_related.
-
-	* em-format.c (emf_multipart_related): remove content-location
-	handling, now done in format_part_as.
-	(em_format_part_as): track content-base (& absolute
-	content-location) of all parts here.
-
-2004-11-02  Not Zed  <NotZed@Ximian.com>
-
-	* em-event.c (eme_target_free, em_event_target_new_message):
-	handle NULL folder or message.
-
-2004-11-02  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-view.c (emfv_list_done_message_selected): Check for
-	NULL messages (happens if the message isn't available).
-
-2004-11-02  Radek Doulik  <rodo@ximian.com>
-
-	* em-format-html.c: replace 3 nested html tables used to create
-	this gray border around parts content with div block with border
-	style
-	use shorthand border: property
-
-2004-11-01  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-account-editor.c: Change the labels back to the same as they
-	were in 2.0
-
-2004-11-12  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (auto_account_finalised): fix the callback
-	signature.
-
-2004-11-11  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (mc_add_store):
-	(mc_add_store_done): Let the counters know about the junk/trash
-	folders that have already been opened.
-
-	* em-vfs-stream.[ch]: Added stream class to read/write gnome-vfs
-	data from camel.  NFI if this will work, depends on how
-	thread-safe gnome-vfs is.
-
-2004-11-08  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vfolder.c (uri_is_spethal): fix the special check for local
-	folders.
-
-2004-10-30  Not Zed  <NotZed@Ximian.com>
-
-	* */*.c, *.c: camel api changes.
-
-2004-10-28  Not Zed  <NotZed@Ximian.com>
-
-	* mail-folder-cache.c (real_flush_updates): 
-	* em-message-browser.c (em_message_browser_new): 
-	* em-mailer-prefs.c (em_mailer_prefs_construct): 
-	* em-format-html-display.c (efhd_attachment_popup): 
-	* em-folder-view.c (emfv_popup, emfv_list_done_message_selected) 
-	(emfv_format_popup_event): 
-	* em-folder-tree.c (emft_popup): 
-	* em-folder-properties.c (emfp_dialog_got_folder): 
-	* em-folder-browser.c (em_folder_browser_new): 
-	* em-composer-utils.c (em_utils_reply_to_message): 
-	* em-composer-prefs.c (em_composer_prefs_construct): 
-	* em-account-editor.c (em_account_editor_construct): added hook
-	docs, and cleaned up some of the hook point names.
-
-2004-10-22  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-tree.c: Give the Rename item a different path than the
-	Delete item.
-
-2004-10-22  Not Zed  <NotZed@Ximian.com>
-
-	* em-event.c (eme_target_free): duh, they're camel not gobjects.
-
-	* em-folder-view.c (emfv_list_done_message_selected): added a
-	message.reading event.
-
-2004-10-22  Nat Friedman  <nat@novell.com>
-
-	* em-event.c: Add a REPLY_ALL flag to the Message target.
-	* em-composer-utils.c (em_utils_reply_to_message): Set the
-	REPLY_ALL flag when appropriate.
-
-2004-10-21  Not Zed  <NotZed@Ximian.com>
-
-	* em-composer-utils.c (em_utils_reply_to_message): emit a
-	'message.replying' event with a message target.
-
-2004-10-21  Nat Friedman <nat@novell.com>
-
-	* em-event.c (em_event_target_new_message): new target type for
-	message-related events.
-
-2004-10-21  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (emfv_format_popup_event): put 'evolution' back
-	in the popup hook names.
-
-2004-10-19  JP Rosevear  <jpr@novell.com>
-
-	* em-account-editor.c, em-composer-prefs.c, em-config.c,
-	em-event.c, em-folder-browser.c, em-folder-properties.c,
-	em-folder-tree.c, em-folder-view.c, em-format-hook.c,
-	em-format-html-display.c, em-mailer-prefs.c, em-menu.c,
-	em-message-browser.c, em-popup.c, message-list.c: convert to
-	org.gnome hook names
-
-2004-10-19  JP Rosevear  <jpr@novell.com>
-	
-	* message-list.c: convert to G_DEFINE_TYPE
-
-2004-10-11  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #67014.
-
-	* mail-errors.xml: added "checking-service" error.
-
-	* em-account-editor.c (em_account_editor_construct): keep track of
-	the dialogue
-	(emae_editor_destroyed): , and clean up when destroyed.
-
-	* em-account-editor.c (emae_check_authtype)
-	(emae_check_authtype_response, emae_check_authtype_done): handle
-	checking authtype gui here.
-
-	* mail-config.c (check_service_describe, check_service_check) 
-	(check_response, mail_config_check_service): removed.
-
-	* mail-ops.c (mail_check_service): moved here from mail-config,
-	and modified to be a re-usable threaded function.
-
-2004-10-18  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #68006.
-
-	* em-folder-view.c (emfv_init): dont ref/sink the invisible.
-	(emfv_destroy): just destroy it here.
-
-2004-10-15  Not Zed  <NotZed@Ximian.com>
-
-	* em-composer-utils.c (create_new_composer):
-	(em_utils_compose_new_message, forward_non_attached): do noting if
-	the composer couldn't be created.  We get a popup from elsewhere
-	to let the user know.
-
-2004-10-14  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* mail-errors.xml : Remove Pango markup from groupwise 
-	account setup error message 
-
-2004-10-12  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html-display.c (efhd_find_handler): use builtin
-	handlers (and plugins) always overriding bonobo ones.
-
-2004-10-11  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #67408.
-
-	* em-folder-view.c (emfv_gui_folder_changed): noop if we were
-	destroyed.
-	(emfv_destroy): set destroyed bit.
-
-2004-10-11  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (mc_startup): register the formatter types
-	before registering the formatter hook.
-
-2004-10-08  JP Rosevear  <jpr@novell.com>
- 
-	* mail-account-gui.c (browse_clicked): use "Select a file"
-	
-2004-10-08  Harry Lu  <harry.lu@sun.com>
-
-	* em-folder-tree.c: (em_folder_tree_class_init), (real_popup_menu),
-	(emft_popup_menu), (emft_tree_button_press): implement popup_menu
-	so that popup menu can be shown with Shift+F10 on folder tree.
-	* em-folder-view.c: (emfv_popup), (emfv_list_key_press):
-	same as above.
-
-2004-10-07  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (mc_startup): dont init the base plugin system
-	here anymore, only register the hook types for mail hooks.
-
-2004-09-28  Not Zed  <NotZed@Ximian.com>
-
-	* em-composer-utils.c (forward_non_attached): put back in the
-	attachment attaching code.  Doesn't work for s/mime and pgp, but
-	why bother arguing about it.
-
-2004-10-06  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree.c (emft_get_folder_info__desc): fix busted cast.
-
-	* *.c: e-popup api changes.
-
-2004-10-06  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree.c (emft_tree_button_press): remove some debug
-	that made it in accidentally.
-
-2004-10-05  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree.c (emft_popup_copy_folder_selected): remove old
-	debug which no longer works.
-
-	** See bug #66991 (related to #64377).
-
-	* em-folder-tree.c (em_folder_tree_set_selected): if we get a NULL
-	uri or "", just clear the list.
-	(emft_tree_button_press): select the new path as well as move the
-	cursor there, otherwise emft_tree_user_event clears the selection.
-
-2004-09-30  David Malcolm  <dmalcolm@redhat.com>
-
-	* em-migrate.c (upgrade_passwords_1_2): fix uninitialised pointer.
-
-2004-09-27  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-account-editor.c: Changed the SSL option menu labels.
-
-2004-09-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #63521.
-
-	* mail-ops.c (fetch_mail_fetch): delete all the messages on the
-	server if we're not in keep on server mode and everything worked.
-	uncancel ourselves before saving the cache uid since it could be
-	cancelled otherwise.
-
-2004-09-24  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #66706.
-
-	* em-subscribe-editor.c: add a sequence number to EMSubscribe and
-	the subscribe_msg structures.  NOOP if the sequence has changed in
-	all callbacks.  up the sequence number when we refresh.
-
-2004-09-20  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #65329.
-
-	* em-folder-tree-model.c (emft_is_special_local_folder): added
-	helper for finding local folders for translation.
-	(em_folder_tree_model_set_folder_info): translate the special
-	local folder names.
-
-	* mail-component.c: mark standard folder names for translation.
-
-2004-09-23  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #65058 (again again).
-
-	* em-format-html.c (efh_text_html): calculate our location uri
-	ourselves (content id).
-
-	* em-format.c (em_format_add_puri): if we have no content-location
-	key, don't fallback to any container's location.
-
-2004-09-23  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree.c (emft_get_folder_info__desc): describe the
-	get-folder process.  This also makes it cancellable.
-
-	** See bug #64972.
-
-	* em-composer-utils.c (em_utils_reply_to_message): pass the folder
-	to guess_account.
-
-2004-09-03  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #65058.
-
-	* em-format-html.c (efh_image): use the content-id rather than
-	the uri for tracking our image reference.  Makes more
-	sense anyway, its guaranteed unique.
-
-2004-09-21  David Malcolm  <dmalcolm@redhat.com>
-
-	* em-folder-tree-model.c (em_folder_tree_model_set_selected): Fix
-	a typo setting the root node.
-
-2004-09-09  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-message-browser.c (emmb_set_message): Ignore the
-	emfv->mark_seen for deciding whether or not to mark the message as
-	seen. Fixes bug #65448.
-
-2004-09-09  Jeffrey Stedfast  <fejj@novell.com>
-
-	* mail-account-gui.c (mail_account_gui_new): If built with
-	gtkfilechooser support, we need to add a checkbox in the chooser
-	so that the user can select files or folders (allowing him to
-	choose - otherwise they won't be able to setup certain types of
-	accounts). Fixes bug #64974.
-
-2004-09-12  JP Rosevear  <jpr@novell.com>
-
-	Fixes #65703
-	
-	* em-popup.c: use proper stock icon name
-
-2004-09-08  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #60515.
-
-	* mail-account-gui.c (sig_fill_menu): connect to the activate
-	signal for the none item.
-
-2004-09-03  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #59717.
-
-	* mail-config.c (mail_config_check_service): Make the dialog
-	modal.  Not ideal but a problem with the way the function works,
-	it should be fully async instead.
-
-2004-09-01  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fix for bug #63377 and prevention of similar cases.
-
-	* em-format.c (emf_finalise): Free the default_charset.
-	(emf_format_clone): Clone the default_charset - this prevents the
-	particular crash described in bug #63377.
-
-	* em-utils.c (em_utils_message_to_html): If source is NULL, set
-	our own default charset (from the user's gconf key) on the
-	formatter to make sure there's always a source charset for
-	conversion to UTF-8.
-
-2004-08-30  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-tree.c (emft_popup_delete_folder): Set the store and
-	full_name info on the dialog.
-	(emft_popup_delete_response): Use the requisite data stored on the
-	dialog object rather than examining the selection again. Fixes bug
-	#62665.
-
-2004-08-30  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #64377.
-
-	* em-folder-selector.c (emfs_response): only set the uri if we
-	have one to set.
-
-	* em-folder-tree.c (em_folder_tree_finalize): Removed
-	cose using selected_path and selected_uri strings.
-	(emft_popup_new_folder): "
-	(emft_popup_copy_folder_selected): "
-	(emft_tree_selection_changed): 
-	(emft_tree_row_activated): ", free paths after use.
-
-	* em-folder-selector.c (emfs_create_name_changed): free
-	get_selected_uri return.
-	(emfs_create_name_activate): "
-	(em_folder_selector_get_selected_path): handle api change, store
-	the selected_path too.
-
-	* em-folder-tree.c (em_folder_tree_get_selected_uri):
-	de-constify,and get the selection directly from the tree.
-	(em_folder_tree_get_selected_path): same.
-
-2004-08-27  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #63456.
-
-	* message-list.c (main_folder_changed): noop if the async_event
-	pointer is NULL which can happen during destroy.
-
-2004-08-27  JP Rosevear  <jpr@novell.com>
-
-	* importers/mail-importer.c (import_folders_rec): utf8_filename
-	should be char * not char
-
-2004-08-27  Hans Petter Jansson  <hpj@ximian.com>
-
-	* em-utils.c (emu_can_save): Don't crash if we're passed a NULL
-	path. GtkFileChooser can return NULL filenames that get passed
-	to this function.
-
-2004-08-26  Christian Neumair  <chris@gnome-de.org>
-
-	* GNOME_Evolution_Mail.server.in.in:
-	Don't mark component menu accel for translation.
-
-2004-08-24  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fix for bug #63177
-
-	* em-folder-tree.c (emft_drop_async_drop): Check full_name == NULL
-	rather than full_name[0] since store's have NULL full_names, not
-	empty string (like they used to).
-	(emft_drop_folder): Same.
-	(tree_drag_data_received): Don't abort the drop if the user
-	dropped on a store, this is allowed (depending on the store).
-
-2004-08-25  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (store_info_new): only open the trash or junk
-	if they're vfolders here.  Some stores that implement their own
-	trash folders are unacceptably slow to open otherwise.
-
-2004-08-25  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* importers/evolution-mbox-importer.c (load_file_fn):
-
-	* importers/evolution-outlook-importer.c (load_file_fn):
-
-	* importers/mail-importer.c (import_folders_rec): Convert filename
-	to UTF-8 from local encoding before displaying it.
-
-2004-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree.c (em_folder_tree_set_selected): store the
-	select-uri on the view not in the thread message.
-	(emft_get_folder_info__free):
-	(emft_get_folder_info__got): select_uri removed.
-	(em_folder_tree_set_selected_list): don't set each selected
-	separately, do it as a list.
-	(emft_maybe_expand_row): if this is a selected row, select it too.
-	(emft_get_folder_info__got): do no pending set selection stuff
-	here.
-	(em_folder_tree_set_selected): just call set_selected_list with
-	one item.
-	(emft_expand_node): if this is a selected row, select it too.
-	(emft_get_folder_info__got): no longer need to track lost folders.
-	(emft_tree_row_activated): clear the pending select list.
-	(emft_tree_selection_changed): and here too.
-	(em_folder_tree_get_selected_uris): get the lost folders from the
-	un-applied selected ones now.  also fixes a list appending error.
-	(emft_tree_user_event): find out when the user hits a key or mouse
-	button to override any pending single-user select and don't
-	override the cursor setting either.
-	(emft_tree_row_expanded): set the 'load subdirs' false before we
-	load it, so we don't try to load it again if its still being
-	loaded.
-	(emft_get_folder_info__got): don't check the loaded flag here, it
-	should be set by the callee, also check the exception return.
-
-2004-08-13  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fix for bug #62812
-
-	* em-format-html-display.c (em_format_html_display_search): Set
-	the search_dialog to be transient for the parent window and make
-	sure to destroy the search_dialog when the parent gets destroyed.
-
-2004-08-21 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* mail-erros.xml: changed the groupwise account setup error
-	message
-
-2004-08-16  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #62963.
-
-	* message-list.c (build_tree, build_flat): define selected in
-	declaration block, not inline. Spotted by Vincent Noel
-	<vnoel@cox.net>
-
-2004-08-13  Not Zed  <NotZed@Ximian.com>
-
-	* em-utils.c (em_utils_message_to_html): don't include the
-	terminating NUL in the data length.
-	(em_utils_part_to_html): nor here.
-
-2004-08-12  Carlos Garnacho Parro  <carlosg@gnome.org>
-
-	* em-utils.c: Optionally use GtkFileChooser if compiled against
-	Gtk+ >= 2.4.0
-
-	* mail-config.glade: added the "use_filechooser" property to the
-	various GnomeFileEntries
-
-2004-08-10  Jeffrey Stedfast  <fejj@novell.com>
-
-	Partial fix for bug #62771
-
-	* em-format-quote.c (emfq_format_header): Same.
-
-	* em-format-html.c (efh_format_header): Decode the
-	X-Mailer/User-Agent headers.
-
-2004-08-10  Not Zed  <NotZed@Ximian.com>
-
-	* mail-session.c (get_password): just call
-	e_passwords_ask_password directly.
-	(pass_activate, pass_response, request_password, do_get_pass)
-	(do_free_pass, main_forget_password): no longer required as
-	e_password now handles the magic, and is thread safe.
-
-	* mail-config.c (mail_config_write_on_exit): epasswords api
-	change.
-
-2004-08-06  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-tree-model.c (em_folder_tree_model_get_selected):
-	Return NULL not FALSE on error.
-
-2004-06-08  Karsten BrÀckelmann  <guenther@rudersport.de>
-
-	* em-format-html-display.c (smime_encrypt_table[4]): minor typo,
-	uppercase 'the' corrected.
-
-2004-08-03  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-composer-utils.c (format_sender): If type="{Sender}" and name
-	is an empty string, use the addr. Fixes bug #62377
-
-2004-08-01  JP Rosevear  <jpr@novell.com>
-
-	* default/C/Inbox: Update to just call us "Evolution" and be more
-	accurate about the new features included
-
-2004-07-29  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* mail-errors.xml: add the error message needed for groupwise
-	account setup
-
-2004-07-28  Not Zed  <NotZed@Ximian.com>
-
-	** See #61958.
-
-	* mail-folder-cache.c (real_flush_updates): remove the soreinfo
-	lookup, it isn't used anywhere anymore.
-	(mail_note_folder): hook onto the events outside of the lock, and
-	don't pass the mfi pointer anymore.
-	(mail_note_store): hook onto the events outside of the lock.
-	(folder_changed, folder_finalised, folder_renamed): lookup the mfi
-	if needed, it is no longer passed to the callback.
-	(unset_folder_info): change unhook calls for new parameters.
-
-2004-07-28  Not Zed  <NotZed@Ximian.com>
-
-	** See #61940.
-
-	* em-composer-utils.c (composer_set_body): add emformat source arg.
-	(em_utils_reply_to_message): take source arg.  Fixed callers.
-
-	* em-utils.c (em_utils_message_to_html): take a source formatter
-	argument, so we can copy/honour settings from it.
-	(em_utils_part_to_html): similar.
-
-2004-07-27  Not Zed  <NotZed@Ximian.com>
-
-	** See #57972.
-
-	* message-list.c (search_func): removed.
-	(ml_search_path): new function to just search, not actually change
-	the cursor like e_tree_find does.
-	(message_list_can_select): new function, returns true if the
-	selection specified is possible without changing the selection.
-	(message_list_select): rewritten.
-	(select_path): helper to select a path in a way that 'works
-	reliably'.
-	(message_list_select_next_thread): rewritten to use the
-	table-adapter, so it properly handles arbitrary sorting.
-
-	* em-folder-view.c (em_folder_view_get_popup_target): setup
-	next/prev flags as appropriate.
-	(emfv_enable_map[]): setup next/prev flags.
-
-	* em-folder-view.h: added last and first message status bits to
-	folder view select mask.
-
-2004-07-23  Radek Doulik  <rodo@ximian.com>
-
-	* added len parameter to em_utils_part_to_html and
-	em_utils_message_to_html. it is used to return length of returned
-	buffer. we use that info later when setting composer body content.
-
-2004-07-22  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (impl_createControls): dont call
-	e_error_default parent here, we dont have access to the toplevel
-	yet.
-
-2004-07-23  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #61824.
-
-	* em-popup.c (emp_part_popup_reply_sender)
-	(emp_part_popup_reply_list, emp_part_popup_reply_all): use new
-	api.  We have no uid/folder to update here.
-
-	* em-folder-view.c (emfv_message_reply): use new api for replying
-	so we can supply the message content and have flags updated.
-
-	* em-composer-utils.c (em_utils_reply_to_message): added optional
-	folder and uid.
-	(em_utils_reply_to_message_by_uid): removed, use the other
-	interface instead.
-	(reply_to_message): just call reply_to_message if we get a message
-	to reply to.
-	(em_utils_reply_to_message): if no message supplied, load it via
-	the uid.
-
-2004-07-22  Not Zed  <NotZed@Ximian.com>
-
-	* em-utils.c (em_utils_part_to_html, em_utils_message_to_html):
-	set the session on the formatter.  See #61767.
-
-2004-07-22  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #61747.
-
-	* message-list.c (search_func): don't emit a message_selected here
-	(god knows why we did?).  Don't update cursor_uid either, just
-	clear it.
-	(message_list_select): select the path if we find it here, causing
-	the cascade of selection action.
-
-2004-07-19  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-migrate.c (em_migrate_folder): Free uri and name
-	strings. Fixes a leak.
-
-2004-07-13  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-view.c (emfv_message_reply): Chck that the selection
-	is active. Hopefully this will fix bug #61427.
-
-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
-
-2004-07-09  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-browser.c (emfb_folder_expunge): only call expunge if
-	the folder is set.
-	(emfb_enable_map[]): only enable expunge menu item if we have a
-	valid folder set.
-
-	** See bug #60900.
-
-	* em-format-html.c: convert the text_inline_parts hash to be keyed
-	off the partid.
-	(efh_free_inline_parts): -> efh_free_cache and fix to do it.
-
-	* em-format.c (emf_free_cache): make the inline table cache other
-	info too based on partid, this frees the structure.
-	(emf_clone_inlines): copy all of the cache data.
-	(em_format_is_inline): use the new data structure to determine
-	state.
-	(em_format_set_inline): same for setting.
-	(emf_multipart_signed): cache/lookup the cached part.
-	(emf_insert_cache): helper to add a cache entry.
-	(emf_multipart_encrypted): cache decrypted part.
-	(emf_application_xpkcs7mime): same.
-
-2004-07-08  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #60900 (related only).
-
-	* em-format-html-display.c (efhd_attachment_show): let set_inline
-	do the redraw itself if required.  kill some dead code.
-
-	* em-format.c (em_format_set_inline): trigger a redraw here like
-	the other em_format_set methods, if the state changed.
-
-	* em-format.c (emf_format_clone): free inline table keys & setup
-	string hash table.
-
-	* em-format-quote.c (emfq_format_attachment): 
-	* em-format-html-display.c (efhd_format_attachment): 
-	* em-format-html.c (efh_format_attachment): is_inline api changes.
-
-	* em-format-html-display.c (efhd_attachment_show): set_inline api
-	changes.
-
-	* em-format.c (em_format_is_inline): make this use the partid
-	rather than the part address as a key, which may change.
-	(emf_init): make the inline talbe a string hashtable.
-	(emf_finalise): free inline keys.
-	(emf_clone_inlines): copy the key string.
-
-2004-07-07  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fix for bug #61199.
-
-	* em-format-html.c (efh_format_address): Same.
-
-	* em-format-quote.c (emfq_format_address): Make sure 'real' isn't
-	NULL before using.
-
-2004-07-08  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* Makefile.am:
-	tarball should ship .schemas.in.in files, not generated files.
-
-2004-07-02  JP Rosevaer  <jpr@novell.com>
-
-	* Makefile.am (SUBDIRS): Revert previous error change
-
-2004-09-10  Not Zed  <NotZed@Ximian.com>
-
-	* em-*: various doco updates.
-
-	* em-format-quote.c (emfq_builtin_init): instead of removing the
-	type, just add an override noop.  Changed api's.
-
-2004-09-09  Not Zed  <NotZed@Ximian.com>
-
-	* em-format.c (em_format_class_remove_handler): Change this to use
-	the original structure only, not by type.
-
-	* em-format-hook.c (emfh_enable): implement hook enablation.
-
-2004-09-07  Not Zed  <NotZed@Ximian.com>
-
-	* em-account-editor.c (emae_setup_providers): set the provider
-	shown selected on the store as well.
-
-	* mail-config.glade: moved the druid 'help text' directly into the
-	glade file.
-
-	* em-account-editor.c (emae_check_complete): add pre-load for
-	management page options.
-
-	* em-utils.c (em_utils_configure_account): remove use of
-	mail-config-druid.
-
-	* em-account-editor.c (emae_remove_childen): removed.
-	(*): removed service->url, always get it from/set it to the
-	e-account so it doesn't have side-effects with plugins.
-
-	* mail-dialogs.glade: fix up the names of the various license
-	dialog fields.
-
-2004-09-06  Not Zed  <NotZed@Ximian.com>
-
-	* em-account-editor.c (emae_receive_options_extra_item): store the
-	config widgets in the item entry itself.
-	(emae_auto_detect): wasted a whole lot of time on this crap.
-
-	* em-account-prefs.c (account_able_clicked): removed some redundant logic.
-
-	* mail-send-recv.c (mail_autoreceive_setup): renamed to
-	mail_autoreceive_init and rewrote all the callbacks.  now it
-	listens to events on the accountlist directly and doesn't need
-	invoking manually.  It also runs relative to the account always,
-	rather than copying the uri.  Removed all callers except the mail
-	component one.
-
-	* em-account-editor.c (em_account_editor_provider_selector_new):
-	removed becaus eof below.
-	(em_account_editor_construct): copy the account to a working
-	object if supplied, else create a new one.
-
-	* mail-config.glade: make the provider selectors just use
-	em_account_editor_dropdown new for the dropdown menu.
-
-	* em-account-editor.c (prepare_signatures): removed, merged into
-	the identity page code.
-	(sig_fill_menu): removed.
-	(emae_setup_signatures): new function to setup signatures on a
-	gtkcombobox.
-	(clear_menu): removed.
-	(signature_changed): removed.
-	(emae_signature_changed): new function for changed.
-	(signature_removed): removed.
-	(emae_signature_removed): new function for removed.
-	(emae_signature_get_iter): helper for finding the right row for
-	this signature.
-	(signature_added): removed.
-	(emae_signature_added): new function for added.
-	(sig_activate): removed.
-	(emae_signaturetype_changed): new function to update the account
-	info immediately.
-	(sig_add_new_signature): renamed to emae_signature_new.
-	(select_account_signature): no longer needed, this happens in the
-	setup.
-
-	* mail-config.glade: changed the signature thing to a custom
-	widget (gtkcombobox).
-
-	* em-account-editor.c (em_account_editor_construct): updates for
-	api change, table sections require table items.
-	(emae_setup_service): handle host:port hostname syntax.
-	(emae_hostname_changed): and here too.
-	(emae_commit): fill this out, and implement it.
-
-2004-09-04  Not Zed  <NotZed@Ximian.com>
-
-	* *.c: include gnome i18.h if needed since camel-object.h was
-	fixed.
-
-	* em-format.c (em_format_class_add_handler): if a handler is
-	already set for type, link it in.
-
-	* em-format.h: added a link pointer to EMFormatHanlder, so that
-	overrides can also fallback.  remove applications member - not
-	used anymore.
-
-2004-09-01  Not Zed  <NotZed@Ximian.com>
-
-	* em-popup.h: added some docs.
-
-	* em-popup.c (emp_standard_menu_factory): 
-	* em-folder-tree.c (tree_drag_data_received): popup api changes.
-
-2004-08-31  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html-display.c (efhd_attachment_button_show): use a
-	wrapper for the button event since the popup event has changed
-	signature.
-
-2004-08-30  Not Zed  <NotZed@Ximian.com>
-
-	* em-popup.c (emp_standard_menu_factory): changed args.
-	(struct _open_in_item): removed, use user data instead.
-	(*): fix callbacks for new apis.
-	(emp_popup_open): Removed some dead popup callbacks never invoked.
-	(em_popup_target_new_attachments): new target type for attachment
-	bar in composer.
-
-	* em-folder-tree.c (emft_popup*): convert to new e-popup apis.
-
-	* em-folder-view.c: emfv_popup_*: convert to new e-poup callback
-	signatures.
-	(EMFV_MAP_CALLBACK): fix for e-popup callback change.
-	(EMFV_POPUP_AUTO_TYPE): same.
-	(emfv_popup): dont bother setting item callback data.
-	(emfv_popup_labels_free): api changes.
-	(emfv_popup_items_free): new free method.
-	(EMFVPopupItem): No longer needed.
-	(emfv_uri_popup_free): api changes.
-	(emfv_format_popup_event): new api's == simpler code.
-
-	* em-account-editor.c (emae_receive_options_extra_item): add a
-	hack for the label item, which is only used by connector to
-	override the hostname and username labels.
-
-2004-08-24  Not Zed  <NotZed@Ximian.com>
-
-	* em-account-editor.c (em_account_editor_construct): create the
-	window rather than the widget here.
-
-	* mail-config.glade: remove the extra_page from the druid, it is
-	autogenerated now.  renamed the "Receiving options" notebook page
-	to "Receiving Email" since it isn't hte options page.
-
-	* em-account-editor.c (emae_receive_options_page): no longer
-	needed, autogenerated.
-	(emae_receive_options_item): setup the auto-receive time values.
-	(emae_receive_page): don't setup the auto check time values here.
-
-	* mail-config.glade: Remove the Receiving Mail tab, it is now
-	completely auto-generated.
-
-2004-08-17  Not Zed  <NotZed@Ximian.com>
-
-	* em-event.[ch]: mail event dispatcher.
-
-	* mail-component.c (mc_startup): hook into events.
-
-	* mail-folder-cache.c (update_1folder): always set the uri field.
-	(real_flush_updates): emit a folder.changed:new event if we have new
-	mail.
-
-2004-08-13  Not Zed  <NotZed@Ximian.com>
-
-	* mail-config.glade: replaced ssl selector with custom widget
-	(gtkcombobox).  Giv the preferences, composer toplevel unique
-	names.
-
-2004-07-29  Not Zed  <NotZed@Ximian.com>
-
-	* mail-config.glade: replaced source and transport selector with
-	custom widget (gtkcombobox).
-
-	* em-account-editor.[ch]: copy over mail-account-gui.[ch] and
-	rename stuff.  Make a gobject.  Move most internals, internal.
-
-2004-07-28  Not Zed  <NotZed@Ximian.com>
-
-	* em-composer-prefs.c (em_composer_prefs_construct): get the
-	toplevel tab as the root.
-	(em_composer_prefs_construct): setup plugin metadata for composer
-	prefs.
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): setup plugin
-	metadata for mail preferences.
-
-	* em-config.c (em_config_target_new_prefs): new target for 'prefs'
-	mode, everything global via gconf.
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): get the gui from
-	the preferences_toplevel not the preferences_tab window which we
-	don't need.
-
-	* mail-config.glade: rename the preferences 'toplevel' to
-	preferences_toplevel so we can get it unparented.  And the
-	composer toplevel to composer_toplevel.
-
-	* em-folder-properties.c (em_folder_properties_show): remove test
-	code.
-
-	* em-format.h (struct _EMFormatPURI): add a free function
-	callback.
-
-	* em-format.c (emf_clear_puri_node): if the free function is set,
-	call it.
-
-2004-07-01  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am (BUILT_SOURCES): Remove $(error_i18n)
-	(CLEANFILES): Put $(error_i18n) in here
-
-2004-06-29  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree-model.c (folder_created_cb): call
-	folder_subscribed directly from the async function not
-	foldre_subscribed_cb, otherwise we run out of order.  Part of
-	#60775.
-
-	* em-vfolder-rule.c (source_add): setup exclusion for vfolder
-	sources, noselect folders.  Bug #60794.
-
-2004-06-23  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-selector.c (em_folder_selector_get_selected_path):
-	Don't prepend the path string with a '/'.
-
-	* em-folder-tree.c (em_folder_tree_create_folder): This takes a
-	full_name so update the argument to make that clear.
-	(emft_create_folder): Same and also don't strip a leading '/'
-
-2004-06-25  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree.c (folder_tree_new): set search column.  #60152.
-
-2004-06-24  Rodney Dawes  <dobey@novell.com>
-
-	* em-utils.c (em_utils_add_address): Add code to set the parent,
-	position, and type hint of the "Add address" dialog
-
-	Fixes #60030
-
-2004-06-23  Not Zed  <NotZed@Ximian.com>
-
-	** See #54030.
-
-	* e-searching-tokenizer.c (e_searching_tokenizer_match_count):
-	only return a count if we're using the primary search string.
-
-	* em-format-html-display.c (efhd_search_response): set the primary
-	search string to NULL instead of resetting it.
-	(efhd_update_search): dont noop if we have a null search text,
-	just set an empty search.
-
-	* e-searching-tokenizer.c (e_searching_tokenizer_reset): remove
-	this, revert jeff's fixes for 54030.  this is incomplete and so
-	doesn't work either (search text stays remembered and secondary
-	search text lost too).
-
-	** See #60523.
-
-	* em-folder-view.c (emfv_finalise): unhook the folder changed
-	before destroying the async thing, and move it all to destroy
-	event anyway.
-	(emfv_destroy): as above.
-
-2004-06-22  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-tree-model.c (sort_cb): Same as below.
-	(em_folder_tree_model_remove_folders): Same.
-
-	* em-folder-tree.c (emft_maybe_expand_row): As toshok discovered,
-	gtk_tree_model_get() strdup's string arguments, *sigh*, so we need
-	to free them.
-	(tree_drag_data_delete): Same.
-	(tree_drag_data_get): Same.
-	(tree_drag_data_received): Same.
-	(emft_drop_target): Same
-	(em_folder_tree_get_selected_uris): Same.
-	(get_selected_uris_path_iterate): Same.
-	(emft_update_model_expanded_state): Same.
-	(emft_tree_row_expanded): Same.
-	(emft_tree_row_activated): Same.
-	(emft_popup_delete_response): Same.
-	(emft_popup_delete_folder): Same.
-	(emft_popup_rename_folder): Same.
-	(emft_popup_properties): Same.
-	(emft_tree_button_press): Same.
-	(emft_tree_selection_changed): Same.
-
-2004-06-22  Chris Toshok  <toshok@ximian.com>
-
-	* em-folder-tree.c (render_pixbuf): gtk_tree_model_get on a string
-	field allocates the return value.  free path.
-
-2004-06-22  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-popup.c (emp_apps_open_in): If the app requires a terminal to
-	run, give it a bloody terminal (who uses vi in an xterm to view
-	attached text files? *sigh*). Fixes bug #51259.
-
-2004-06-21  Chris Toshok  <toshok@ximian.com>
-
-	* em-folder-tree.c (render_display_name): gtk_tree_model_get on a
-	string field allocates the return value.  free name.
-
-2004-06-21  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c (em_junk_sa_test_spamd): make sure we test for
-	-p and --port only and not for other options as --pidfile
-
-	Fixes #60260
-
-	(em_junk_sa_test_spamd): try to get spamd/spamc binaries from
-	gconf
-
-	Implements #59368
-
-2004-06-18  Not Zed  <NotZed@Ximian.com>
-
-	** See #31027.
-
-	* em-vfolder-editor.c (em_vfolder_editor_new): make sure we
-	construct the rule editor with a source of 'incoming', otherwise
-	newly created rules have no source in the current session.
-
-	* em-vfolder-rule.c (em_vfolder_rule_init): init the vfolder
-	source to 'incoming' always.
-
-	* mail-vfolder.c (uri_is_ignore): fix debug statement.
-
-	** See #60214.
-
-	* em-folder-view.c (em_folder_view_print): re-arrange code to make
-	the dialogue async.  We also now load the message every time
-	before printing.
-	(emfv_print_response): handle response to print.
-	
-	* em-format-html-print.c (em_format_html_print_message): new api
-	to print a specific uid on a specific folder.
-
-2004-06-18  Not Zed  <NotZed@Ximian.com>
-
-	* em-vfolder-rule.c (get_widget): use mail dialogs.glade.
-
-	* mail-dialogs.glade: move the vfolder-source window here from
-	mail-config.glade.
-
-	* Makefile.am (glade_DATA): fix the glade list.
-
-	* mail-license.glade, subscribe-dialog.glade, mail-security.glade,
-	* mail-search.glade: Merged into mail-dialogs.glade.  Should be
-	easier to manage.
-
-	* message-tag-followup.c (construct): use mail dialogs glade file.
-
-	* mail-account-gui.c (display_license): use mail dialogs glade file.
-
-	* em-subscribe-editor.c (em_subscribe_editor_new): use new glade
-	file.
-
-	* em-format-html-display.c (em_format_html_display_search): use
-	merged glade file.
-	(efhd_xpkcs7mime_validity_clicked): same.
-
-	* mail-dialogs.glade: merge various glade files into here.
-
-2004-06-17  Not Zed  <NotZed@Ximian.com>
-
-	** See #59885.
-
-	** Moved all of the mail specific filtering stuff from filter/* to
-	here.  Renamed appropriately into em* space, etc.
-
-	* em-filter-folder-element.c (emff_copy_value): implement for folders.
-
-	* em-vfolder-rule.c (get_widget): read the vfolder glade from
-	mail-config.glade.
-
-	* mail-config.glade: moved the vfolder source selector here.
-
-	* em-search-context.c: new mail search specific rule context.
-
-	* mail-component.c (setup_search_context): use the new
-	em_search_context.
-
-	* vfolder-rule.c (validate): change error to mail context.
-	
-	* filter-folder.c (validate): change error to mail context.
-
-	* Makefile.am (em-filter-i18n.h): added rule for i18n of mail
-	filter type stuff.
-	(libevolution_mail_la_SOURCES): added in the filter and vfolder
-	rule stuff specific to mail.
-
-	** See #59885.
-
-	* em-format-html-quote.[ch]: remove and remove from build, not
-	used.
-
-	* Makefile.am (libevolution_mail_la_LIBADD): add libeabutil and
-	evolutionsmime.
-
-	* mail-component-factory.c (factory): there is no mail_config
-	anymore.
-
-2004-06-16  Rodney Dawes  <dobey@novell.com>
-
-	* em-folder-properties.c: Include gtk[hv]box.h so we can use them
-	(emfp_dialog_got_folder): Fix the border widths and spacings for
-	the internal widgets and the dialog's vbox and action area to be
-	compliant with the HIG
-	Fix the general layout of the dialog to be HIG-compliant as well
-	Use ngettext for the row labels for number of messages
-	Add a cancel button, since we are not instant-apply
-	Align the message counts to the right
-	Part of this patch is from Christian Neumair <chris@gnome-de.org>
-
-	* mail-component.c (view_changed_cb): Fix a typo for the sent folder
-	send is not a pluralization of sent
-
-2004-06-16  JP Rosevear  <jpr@novell.com>
-
-	* em-composer-prefs.c (spell_set_ui): clear the error, don't free
-	it, so NULL is handled properly
-
-2004-06-16  Not Zed  <NotZed@Ximian.com>
-
-	* em-utils.c (em_utils_selection_get_urilist): handle comments in
-	the urilist.  Can't remember the rfc for it.
-
-	** See #56479.
-
-	* em-utils.c (em_utils_in_addressbook): use the main thread to
-	setup the addressbook list.
-	(em_utils_in_addressbook): only check against the "completion"
-	sources, not all of them.
-
-2004-06-15  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-browser.c (emfb_mail_stop): call mail_cancel_all to
-	implement the stop button.
-
-	* em-utils.c (emu_addr_sources_refresh): don't unref the group
-	list, otherwise the sources become broken now (?).
-	(em_utils_in_addressbook): add some locking.  add cancellation.
-	this is almost certainly going to cause issues.
-
-	* mail-mt.c (mail_cancel_hook_add, mail_cancel_hook_remove)
-	(mail_cancel_all): new functions to implement a global mailer stop
-	button.
-
-2004-06-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (save_part_save): This code no longer needs to do
-	charset conversion. Yay. Fixes bug #60225.
-
-	* em-utils.c (em_utils_save_part_to_file): Use the proper e-error
-	namespace.
-
-2004-06-15  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-tree.c (emft_popup_copy_folder_selected): frombase is
-	simply the select_path, since selected_path is now just the
-	full_name rather than the path. Fixes bug #60075.
-
-	* em-composer-utils.c (attribution_format): New function to format
-	an attribution string (won't crash if translators were sloppy with
-	their strftime/printf-style formatters). Also nice/extendable for
-	future feature enhancements such as user-customisable attribution
-	strings.
-	(composer_set_body): Use above function rather than using
-	e_strftime/etc ourselves.
-
-2004-06-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-view.c (emfv_init): Changed the second
-	gtk_selection_add_target() to use GDK_SELECTION_CLIPBOARD rather
-	than GDK_SELECTION_PRIMARY again. This should fix bug #60022.
-
-2004-06-14  Radek Doulik  <rodo@ximian.com>
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): the check button
-	label has now opposite meaning (after UI changes), call
-	toggle_button_init with 'not' parameter set to TRUE
-	(toggle_button_toggled_not): new helper function, sets negative
-	value to gconf bool key
-
-2004-06-14  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vfolder.c (rule_changed): don't check rule->source, its
-	irrelevent to vfolder sources, and clean up the logic a bit.
-	#59158.
-
-	* em-folder-tree.c (emft_popup_new_folder_response): destroy the
-	create dialogue if we're firing up the vfolder creation window.
-
-	* em-composer-utils.c (get_reply_all): if we removed all of the
-	addresses because they were 'us', add the first to
-	address back.  otherwise reply-to-all behaves strange.
-
-2004-06-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (em_folder_tree_set_selected): Free any old
-	select_uri string we may have.
-	(emft_tree_row_expanded): Remove the gross hack that was here.
-	(emft_get_folder_info__got): Check for priv->select_uri and try
-	selecting it (if we can't select it yet, it'll just be re-queued
-	for later).
-	(emft_tree_row_activated): Clear the select_uri if set, the user's
-	selection overrules any auto-selection.
-	(emft_tree_selection_changed): Same.
-
-2004-06-11  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree.c (emft_tree_button_press): rearrange the setting
-	up of the target flags, stores can have a null path.
-
-	* em-folder-selector.c (emfs_create_name_changed): use
-	get_selected_uri rather than path.  a valid uri may have a null
-	path now.
-	(emfs_create_name_activate): and here too.
-	(em_folder_selector_get_selected_path): check the uri is null for
-	a selected path, and then handle a null path.
-
-	* em-folder-tree-model.c (em_folder_tree_model_add_store): revert
-	previous change.  Stupid emftm.
-
-	* em-utils.c (em_uri_from_camel): handle a null path or fragment.
-
-	* em-folder-tree-model.c (em_folder_tree_model_add_store): set the
-	full name of the store to "".  Fixes #59925 and probably other
-	issues.  Related to the removal of folderinfo->path.
-
-2004-06-10  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fixes bug #58825. Ugh. Really Gross Hack (tm).
-
-	* em-folder-tree.c (emft_tree_row_expanded): If the store that we
-	are expanding matches the uri that we've been requested to select
-	(e.g. from before the store was added to the tree), then give the
-	uri to the get_folder_info_op.
-	(em_folder_tree_set_selected): If the store for the uri isn't in
-	the tree yet, save the uri for later.
-
-	* mail-component.c (folder_selected_cb): Set the selected state of
-	the folder-tree and save it.
-	(impl_createControls): Restore the selected state on the
-	folder-tree.
-
-	* em-folder-tree-model.c (em_folder_tree_model_set_selected): New
-	function to set the selected-uri saved state.
-	(em_folder_tree_model_get_selected): New function to get the
-	selected uri saved state.
-	(em_folder_tree_model_save_state): Renamed.
-
-	* em-folder-tree.c (emft_update_model_expanded_state): Don't let
-	path be NULL if the node is a store node (path == NULL for any
-	other case is a bug).
-	(emft_maybe_expand_row): Same.
-
-2004-06-10  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (message_list_set_selected): use new
-	etreeselectionmodel api to select paths in one call.  Fixes
-	#59546.
-
-	* em-folder-view.c (emfv_message_reply): check that we have
-	content selected, not just a selection, before trying to reply to
-	that content.  #59146.
-	(emfv_message_reply): strip call content-* headers (fixme), and
-	set transfer-encoding to 8bit.
-
-2004-06-08  Rodney Dawes  <dobey@ximian.com>
-
-	* mail-config.glade: Fix for SSL options appearing for sendmail
-
-2004-06-08  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-tree.c (em_folder_tree_set_selected): Scroll to the
-	selected folder if needed. Fixes bug #59609.
-
-	* em-folder-selector.c (em_folder_selector_construct): Make the
-	chooser non-modal. Fixes bug #53735.
-
-	* em-folder-tree.c (emft_tree_row_collapsed): Only change the
-	cursor if the currently selected folder is a subfolder of the
-	folder collapsed. Fixes bug #59801 without breaking bug #57665.
-	(emft_tree_test_collapse_row): Renamed from
-	emft_tree_collapse_row() to match the new signal we are connected
-	to.
-
-2004-06-07  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-tree-model.c (em_folder_tree_model_add_store): Set the
-	store's FULL_NAME to NULL here. Fixes the crash in bug #59713.
-
-2004-06-07  Dan Winship  <danw@novell.com>
-
-	* em-folder-view.c (emfv_popup_menu, emfv_message_pixmaps):
-	s/stock_save_as/stock_save-as/
-
-	* em-popup.c (emp_standard_select_popups,
-	emp_standard_object_popups): Likewise	
-
-2004-06-05  Christian Neumair  <chris@gnome-de.org>
-
-	* em-folder-tree.c: Shuffle usage of trailing "..." in menus according
-	to the HIG.
-
-2004-06-05  Christian Neumair  <chris@gnome-de.org>
-
-	* mail-component.c (view_changed_cb): Use ngettext for message count
-	information.
-
-2004-06-04  Radek Doulik  <rodo@ximian.com>
-
-	* default/C/Inbox (Content-Type): added size info to IMG tags so
-	that it loads the message smoother
-
-2004-06-03  William Jon McCann  <mccann@jhu.edu>
-
-	* mail-session.c (request_password): Don't pack entry and checkbox
-	widgets directly into the dialog vbox so that they line up
-	correctly with the action area buttons.
-
-2004-06-02  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (mc_add_local_store_done): put this back in,
-	local folders not being noted properly all the time.
-
-2004-06-01  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-composer-utils.c (forward_non_attached): Don't attach
-	anything ever. This is confusing way too many users who expect it
-	to attach all or nothing. Since Forward-Attached is what users
-	should be using to forward a message and all attachments, make
-	these not attach anything (which is what other mailers do
-	anyway). This wlso makes Forward-Quoted consistant with
-	Reply-Quoted which is a Good Thing (tm).
-
-2004-06-01  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-selector.c (em_folder_selector_get_selected_uri): set
-	the right path on the url.
-
-	* mail-signature-editor.c (load_signature): ugh, unlike camel
-	exceptions, you can't pass NULL to CORBA calls.
-	(mail_signature_editor): ditto.  See bug #58815.
-
-2004-05-28  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-tree.c (d): Disable debug here too - all this code has
-	been working fine.
-
-	* em-folder-selector.c (d): Disable debug spew here too (not that
-	this debug was ever seen since it never hit those conditions).
-
-	* mail-folder-cache.c (d): Disable debug here too.
-
-	* em-folder-tree-model.c: Disable debug spewage that we don't need
-	anymore. The amount of debug spewage on the console is getting to
-	be too much to find anything.
-
-	* em-folder-tree.c (emft_expand_node): Use p+1 as the full_name
-	rather than p. Fixes bug #59187.
-
-2004-05-27  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-tree.c (emft_get_folder_info__got): Instead of
-	removing the "Loading..." row for toplevel folder nodes on failure
-	(which indicates a failure conenct to the server, most likely),
-	collapse the store node so that if the user expands the store
-	node, it will automagically try connecting again. Fixes bug #57493.
-
-2004-05-27  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am (EXTRA_DIST): Add $(error_i18n)
-
-2004-05-26  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vfolder.c (vfolder_adduri_desc): initialise desc to NULL
-	before using it later on.  gcc doesn't warn on this if you're not
-	optimising.  Sigh.  Probably fix #59070, #59060, #58972 and
-	friends.
-
-	* importers/evolution-mbox-importer.c (create_control_fn): set the
-	default selection to inbox.
-
-	* importers/evolution-outlook-importer.c (folder_selected)
-	(create_control_fn): copied from mbox importer.  fixes a crash &
-	lets you choose the target folder.
-
-2004-05-25  Jeffrey Stedfast  <fejj@novell.com>
-
-	* mail-errors.xml: a few fixes.
-
-	* em-format-quote.c (emfq_text_plain): Only strip the signature if
-	we are in some wy modifying the content (we don't want to remove
-	the signature if we are editing the message as a new
-	message). Fixes bug #58826.
-
-2004-05-25  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (mc_add_local_store_done): removed, now
-	redundant.
-
-	* em-folder-tree.c (em_folder_tree_set_selected): fix for path changes.
-
-	* em-folder-tree-model.c (em_folder_tree_model_set_unread_count):
-	change to use full name rather than path name.
-
-	* em-folder-tree-model.h: renamed path_hash to full_hash.
-
-	* em-folder-tree-model.c (folder_subscribed): dont use
-	g_path_get_dirname here, it is os dependent, we want / always.
-	(full_hash_free): rename from path_hash free.
-
-	* em-folder-view.c (emfv_popup_menu[]): disable add sender to
-	addressbook bar if it is also disabled.  #58955.
-
-2004-05-24  Not Zed  <NotZed@Ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_build_extra_conf): don't
-	enable the widget based on its writability if it is a dependent
-	option which is now disable.
-	(setup_toggle): return whether the widget is sensitive too.
-	#57171.
-
-	* em-popup.c (em_popup_target_new_select): only enable add sender
-	if we also have 1 selected.  #56663.
-
-	* em-folder-view.c (emfv_enable_menus): remove some debug.
-
-	* em-format-html.c (efh_format_header): output commas between
-	newsgroups, and also append_printf.
-
-2004-05-24  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* mail-account-gui.c (mail_account_gui_build_extra_conf): added
-	empty handling for CAMEL_PROVIDER_CONF_HIDDEN
-	(extract_values): added handling for CAMEL_PROVIDER_CONF_HIDDEN
-
-2004-05-24  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree.c (em_folder_tree_set_selected): use set_cursor
-	instead of scroll_to_row.  See #58383.
-	(get_selected_uris_iterate): removed.
-	(em_folder_tree_get_selected_uris): use an interative call based
-	on gtk_tree_selection_get_selected_rows rather than
-	selected_foreach, as the gtk+ docs suggest.  was trying to fix a
-	bug but it seems gtktreeselection bug (shift-select rows using
-	keyboard only)
-
-	* message-list.c (regen_list_regened): pull the message from the
-	regen list before we check the list and pending uid.
-
-	* em-folder-view.c (emfv_enable_menus): remove the hack for
-	enabling select delete from here and put it in the right place.
-	(em_folder_view_get_popup_target): put it here so its consistent.
-
-2004-05-22  Not Zed  <NotZed@Ximian.com>
-
-	* mail-tools.c (mail_tool_uri_to_folder): put note_store back in.
-	Quick hack to fix the issue of folders being opened before we hook
-	onto folder_created.
-
-	* mail-folder-cache.c: remove 'name' from update struct, not used
-	anymore
-
-	** Another unread count bug, #58814.
-
-	* mail-vfolder.c (context_rule_added):
-	* mail-tools.c (mail_tool_uri_to_folder):
-	* mail-component.c (mc_add_local_store_done): don't call mail note
-	folder anymore, fix up headers.
-
-	* mail-folder-cache.c (store_folder_opened)
-	(mail_note_store_remove, mail_note_store): handle the new
-	store:folder_opened signal.  Don't need the mail_note_folder hack
-	anymore, mail_tool_uri_to_folder slowly does less.
-
-2004-05-21  Not Zed  <NotZed@Ximian.com>
-
-	* mail-mt.c (do_call): add marshaller for p_ppppp call.
-
-	* mail-session.c (get_password): fix for camel api changes.
-	(forget_password): same.
-
-	** See #58376.
-
-	* message-list.c (mail_regen_list): do some timeout foo so we
-	don't keep doing list regnerations if we're getting called too
-	often.  God knows what this will break.
-	(message_list_set_selected): removede bug printf.
-	(regen_list_free): move the message-list poking stuff into
-	regen_list_regened.
-	(message_list_set_folder): call mail_regen_cancel to cancel any
-	regen stuff.
-	(mail_regen_cancel): cancel/clear outstanding regenerations.
-	(message_list_destroy): do it here too.
-	(message_list_select_uid): also set the pending select uid if we
-	have a timeout pending.
-
-	* mail-component.c (impl_createControls): set the defualt parent
-	to the main folderview as soon as its created.
-
-	* em-folder-tree.c (emft_popup_copy_folder_selected): use
-	get_toplevel rather than get_ancestor.  seems the more reliable
-	one.  also we're always parented so we shoudl always find a
-	toplevel window.
-	(em_folder_tree_create_folder): same.
-	(emft_popup_delete_response): set error parent.
-	(emft_popup_delete_folder, emft_popup_rename_folder) 
-	(emft_popup_rename_folder, emft_popup_rename_folder): 
-
-	* em-migrate.c (update_passwords_1_2): finally put the 1.2
-	password upgrade patch in.  Untested.  #42721.
-
-2004-05-20  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fixes for bug #57305.
-
-	* mail-account-gui.c (sig_add_new_signature): Updated for changes
-	below.
-
-	* em-composer-prefs.c (em_composer_prefs_new_signature): No longer
-	takes a script argument (makes no sense to edit a script with an
-	HTML editor if we require that the script already exist before we
-	let the user add it anyway).
-	(sig_add_cb): Updated for above change.
-	(sig_add_script_response): Don't pop up an editor window for the
-	newly added script, the script has already been created! Instead
-	simply create a new ESignature object, set the sig->name, and add
-	it to the signature list.
-
-2004-05-20  Radek Doulik  <rodo@ximian.com>
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): remove "use
-	daemon" handling code
-
-	Fixes #56909
-
-2004-05-20  Not Zed  <NotZed@Ximian.com>
-
-	** See #58388.
-
-	* mail-mt.c (mail_msg_check_error): surpress any errors about
-	messages not found because of invalid uid's.  They're really just
-	internal errors.
-
-	** See #57583.
-
-	* message-list.c (build_tree): save/restore the selection when we
-	update.
-	(message_list_set_selected): util to set the selected messages
-	from a list of uids.
-	(build_flat): same.  I wonder if etree's unbroken enough to use it
-	more directly?
-
-	** See #58693.
-	
-	* mail-send-recv.c (mail_autoreceive_setup): add bounds checking
-	so sloppy ui work wont break it again.
-
-	* mail-config.glade: put the minimum for autocheck back to 1
-	minute.  Naughty jeff.
-
-2004-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* importers/pine-importer.c (import_contacts): use the new
-	e_book_new_* and e_book_open apis.
-
-	* em-utils.c (em_utils_in_addressbook): use the new e_book_new_*
-	and e_book_open apis.
-
-2004-05-19  Jeffrey Stedfast  <fejj@novell.com>
-
-	* message-tags.glade: Fixed the icon name to get the right one.
-
-	* message-list.c (message_list_init_images): Changed to load an
-	empty pixbuf manually rather than relying on the pixbuf returned
-	for "" from e_icon_factory_get_icon() since it has changed to
-	return a broken image icon.
-
-2004-05-19  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: don't dist the error .h file
-
-2004-05-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (send_queue_send): set seen when we set deleted.  ?
-	#56549.
-
-	* em-inline-filter.c (emif_add_part): if we end up with an
-	application/octet-stream part, pre-snoop it so we set the right
-	mime type to start with.  Fixes #58554.
-
-	* em-format.c (emf_snoop_part): removed, now in em-utils.
-
-	* em-utils.c (em_utils_snoop_type): rah rah, snoop a mime part's
-	type.
-
-	* em-format-html.c (efh_text_plain): Revert jeff's fix for #56290.
-	Ugh, we already have all the citation info in local data.  Removed
-	the need for gconf too.
-
-2004-05-19  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (efh_format_secure): make this match the efhd
-	stuff.
-
-	* em-format-html-display.c: removed stock_signature-nokey since it
-	doesn't exist in gnome-icon-theme.
-	(efhd_xpkcs7mime_button): if there is no signing, but encryption,
-	use its icon.  if there's no encryption too, use a broken icon
-	(?).
-
-2004-05-05  William Jon McCann  <mccann@jhu.edu>
-
-	* GNOME_Evolution_Mail.server.in.in: Add menu_label and
-	menu_accelerator.
-
-2004-05-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (mc_quit_sync): fixed up the empty trash on
-	exit thing, to update for all stores, not update the timestamp on
-	the first store synced.
-
-2004-05-18  Cantona Su <paradisetux@hotmail.com>
-
-	* em-format-html.c: Added header "X-Newsreader" for handle Outlook
-	Express as Mailer.
-	
-2004-05-18  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-browser.c (em_folder_browser_show_preview): don't
-	nomarkseen when we restore the message when we show the preview.
-	#58387.
-
-	* mail-folder-cache.c (folder_changed): no new message test if its
-	the drafts folder too.
-
-	* mail-vfolder.c (vfolder_adduri_desc): use a nicer, account-based
-	formatter for folder names.  Hmm, that was a good waste of time.
-	For #55412.
-
-	* em-folder-view.c (emfv_list_selection_change): Listen to the
-	tree selection change event directly & proxy out, so we can update
-	the status bar properly.  Blah.  For #58600.
-
-	** Quick fix for #57434
-
-	* em-format.c (emf_format_clone): fix the FIXME about cloning
-	headers shown.
-
-	* em-format-html.c (efh_format_headers): only show rupert if we're
-	showing rupert.
-
-	* em-format-html-print.c (efhp_init): default show_rupert to off.
-
-	* em-format-html.c (efh_init): default show_rupert to on.
-
-	* em-format-html.h: added show_rupert bit.
-
-	* mail-folder-cache.c (folder_changed): don't emit new mail if its
-	any vfolder, not just vtrash folder.  #56350.
-
-	* em-folder-view.c (emfv_list_done_message_selected): run
-	enable_menu's to make sure we're up to date.  #58352.
-
-	** crappy hacks for #58385.
-
-	* em-folder-selection-button.c
-	(em_folder_selection_button_clicked): leave Ok button for this
-	selection.
-
-	* em-folder-selection.c (em_select_folder): added oklabel here too.
-
-	* em-folder-selector.c (em_folder_selector_new)
-	(em_folder_selector_construct, em_folder_selector_create_new):
-	Added oklabel- text for ok label.
-	(em_folder_selector_create_new): Set the ok label to Create.
-
-	* em-message-browser.c (emmb_set_message): don't mark message seen
-	if user has disabled auto-mark seen feature.  #58629.
-
-	* em-format.c (em_format_part): if we have no content-type header,
-	then we get no mime-type set, so assume text/plain.  #58470.
-
-2004-05-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-mailer-prefs.c: #include <gtk/gtkliststore.h>. Fixes bug
-	#58407.
-
-2004-05-17  Not Zed  <NotZed@Ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_setup): put the None item
-	at the head of the providers list.
-	(mail_account_gui_setup): only set the transport default fallback
-	if it is not a STORE_AND_TRANSPORT type provider (since that was
-	just disabled).  #57939.
-
-	* message-list.c (on_selection_changed_cmd): only NOOP if we have
-	no selection and no uid, if we have a selection and no uid, then
-	always update.  Fixes #58267 without breaking the double-load
-	thing.
-
-	* em-folder-view.c (em_folder_view_open_selected): keep the hide
-	deleted status.  Makes #51082 work at last.
-
-	** Bug #6556.
-
-	* message-list.c (ml_drop_async_desc, ml_drop_async_drop)
-	(ml_drop_async_done, ml_drop_async_free, ml_drag_data_action)
-	(ml_drop_popup_copy, ml_drop_popup_move, ml_drop_popup_cancel)
-	(ml_tree_drag_data_received): implement async drop operations and
-	the ask drop option menu.
-
-2004-05-14  Not Zed  <NotZed@Ximian.com>
-
-	** Bug #6556.
-
-	* message-list.c (ml_selection_received_uidlist): removed, not
-	needed anymore.
-	(ml_selection_received): call get_uidlist to paste the selection.
-	(ml_tree_drag_data_received): same here.
-
-	* em-folder-tree.c (emft_drop_uid_list): removed, not needed
-	because of below change.
-
-	* em-utils.c (em_utils_selection_get_uidlist): actually do the
-	copy now, don't just decode the data.
-
-	* em-folder-tree.c (tree_drag_data_received): just copy the
-	selection data data itself, dont decode yet.
-	(emft_import_message_rfc822): removed, not needed, use em utils
-	stuff instead.
-	(emft_drop_message_rfc822): same.
-	(emft_drop_text_uri_list): same.
-	(emft_drop_async_free): simply free stuff.
-	(emft_drop_async_drop): call em_utils stuff where they exist to do
-	the drop.
-
-	* message-list.c (ml_tree_drag_data_get): send x-mailbox instead
-	of message/rfc822 for the mailbox.
-	(ml_tree_drag_data_received): handle drop of x-mailbox differently
-	to message/rfc822.
-	(ml_tree_drag_motion): implement so proper options are setup
-	whilst dragging.
-	(message_list_construct): seutp the drag src/dest types for
-	changes typs and with ASK action.
-
-	* em-utils.c (em_utils_read_messages_from_stream): dont unref the
-	stream when we get it.
-	(em_utils_selection_get_mailbox): add an argument to scan from or
-	not, for message/rfc822 vs x-mailbox drops.
-	(em_utils_read_messages_from_stream): Same.
-
-	* em-folder-tree.c (tree_drag_motion): default to move properly.
-
-	* message-list.c (ml_selection_received_uidlist): take a move flag.
-	(ml_tree_drag_data_received): handle move action.
-
-	* em-folder-tree.c (em_folder_tree_new_with_model): got sick of
-	this bloody warning.
-
-	* em-format.c (default_headers[]): just remove x-mailer from the
-	header list, if it isn't on by default.  This is the default list.
-	(em_format_default_headers): loop through everything.
-
-2004-05-14  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-popup.h: s/RESEND/EDIT/
-
-	* em-popup.c (em_popup_target_new_select): s/RESEND/EDIT/
-
-	* em-folder-view.c: s/RESEND/EDIT/
-	(emfv_popup_edit): Renamed from emfv_popup_resend. Part of the fix
-	for bug #58358 (The main fix was just a change to the ui file).
-
-	* mail-config.c (mail_config_init): Build the path to the gtkrc
-	filename and store it on the config struct so we don't have to
-	keep rebuilding it.
-	(config_write_style): Reuse config->gtkrc string instead of
-	constructing the path again.
-	(mail_config_write_on_exit): Free the gtkrc path.
-	(config_write_style): fflush the gtkrc file.
-
-	* em-popup.c (emp_popup_resend): Updated the #if 0'd code for the
-	API chanegs made to em_utils_edit_messages().
-
-	* em-folder-view.c (em_folder_view_open_selected): Pass TRUE as
-	the replace argument to em_utils_edit_messages() here.
-	(emfv_popup_resend): Pass FALSE here. Fixes bug #58357.
-
-	* em-composer-utils.c (em_utils_edit_messages): Now takes a
-	'replace' argument specifying whether or not the original message
-	should be deleted when the edited message is sent or saved.
-
-	* em-format-html.c (efh_format_secure): Same. Also changed the
-	"Valid signature, cannot verify sender" string to "Valid signature
-	but cannot verify sender" as I think it reads nicer.
-
-	* em-format-html-display.c (efhd_format_secure): Since signature
-	status is a tri-state, use 3 different colours too (yellow for
-	valid sig but unknown sender).
-
-2004-05-13  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-format.c (em_format_default_headers): Don't include the last
-	default_header when setting the default headers. If the user has
-	configured Evolution to display the Mailer header, then it will be
-	set in em-folder-view.c as appropriate when it checks the gconf
-	settings. Fixes bug #58217.
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): Default
-	"x-evolution-mailer" header to disabled.
-
-	* em-format-quote.c (emfq_text_plain): Add a stripsig
-	filter. Fixes bug #52767.
-
-	* em-stripsig-filter.[c,h]: New filter class to strip
-	signatures. Useful when generating forwards/replies.
-
-2004-05-13  Not Zed  <NotZed@Ximian.com>
-
-	* em-migrate.c (em_migrate_folder): move ignore case outside of
-	block.  Stupid c language.
-
-	* em-folder-view.c (emfv_format_popup_event): fix warning with
-	cast.
-
-	** See bug #58304.
-
-	* em-junk-filter.c (em_junk_sa_setting_notify): listen to sa
-	settings changes, update some globals.
-	(em_junk_filter_get_plugin): setup the gconf client here and
-	listen to changes.
-	(em_junk_sa_get_local_only, em_junk_sa_get_use_daemon) 
-	(em_junk_sa_get_daemon_port): removed, use globals instead.
-
-2004-05-13  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (emfv_message_reply): re-enabled the reply to
-	selection stuff.  I worked out how to make it work; I think.
-
-	* em-format-html-display.c (efhd_html_button_press_event): if we
-	aren't on a clickable object, do a null popup event instead.
-
-	* em-folder-view.c (emfv_format_popup_event): do the full popup if
-	we aren't on anything (not on a uri or part).  See #8414.
-
-	* GNOME_Evolution_Mail.server.in.in: added "email" to the
-	uri_schema's attribute.
-
-	* mail-component.c (impl_handleURI): handle email: uri's, specify
-	opening a message on a folder.
-	(handleuri_got_folder): open the message.  For some 1337 s3Kr3t
-	ha0x.
-
-2004-05-12  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #58302.
-
-	* em-composer-utils.c (em_utils_post_to_folder): 
-	* em-composer-utils.c (em_utils_compose_new_message_with_mailto):
-	poke the composer headers from account directly, don't call set
-	headers which overwrites stuff.
-
-2004-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (setup_search_context): enable threading option
-	type on the search bar.
-
-	* mail-errors.xml.h: add for translators.
-
-	* Makefile.am (%.xml.h): fix for xml i18n stuff.
-
-	* mail-errors.xml: moved from the .xml.in file.
-
-2004-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* em-utils.c (em_uri_from_camel): pass an exception to
-	provider_get, it relies on one.
-
-	* em-migrate.c (em_migrate_1_4): fix some error messages, and fail
-	with fatal errors properly.
-	(em_migrate_local_folders_1_4): EEP!  Who cares if this fails!
-	Well I do.  Setup exceptions and return codes.
-	(em_migrate_dir): and here too.  Sloppy!
-	(em_migrate_dir): change the code slightly, 1.4 would recurse all
-	folders, even if the parent folder doesn't have a
-	folder-metadata.xml.  Make sure we copy that mode.
-	(get_local_store_uri): Make it copy the 1.4 behaviour properly.
-	Any error -> use defaults.
-	(em_migrate_dir): lots of changes.
-	(mbox_build_filename): take the output string as an arg.
-	(cp): add an argument to overwrite/append or require a unique
-	empty file.
-	(cp_r): add mode arg here too.
-	(em_migrate_folder): split the folder copy stuff from em_migrate
-	dir entirely.  blah.
-	(em_upgrade_accounts_1_4): can't fail, remove return code, etc.
-	(em_upgrade_xml_1_4): removed this rather redundant odd api.
-	(upgrade_xml_uris): this can't fail, remove return codes etc.
-	(em_upgrade_xml_1_0): another oddly redundant function.
-	(em_migrate_pop_uid_caches_1_4): error messages, blah blah.
-	(em_migrate_folder_expand_state_1_4): no fatal states here.
-	(em_migrate_folder_view_settings_1_4): nor here.
-	(emm_setup_initial): do i18n 'better', using
-	gnome_i18n_get_language_list, rather than hacky code.
-
-2004-05-10  Not Zed  <NotZed@Ximian.com>
-
-	* mail-tools.c: remove e-meta.h, not used anymore.
-
-2004-05-11  Dan Winship  <danw@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Remove the mail folder
-	control factory
-
-	* mail-component-factory.c (factory): Remove support for the mail
-	folder control
-
-	* mail-component.c: Remove the property bag stuff
-	(mail_control_new): Gone
-
-2004-05-10  David Malcolm  <dmalcolm@redhat.com>
-
-	* em-subscribe-editor.c (sub_queue_fill_level): Fixed warning
-
-2004-05-10  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): Default the
-	Mailer header to enabled. Fixes bug #58217.
-
-2004-05-10  JP Rosevear  <jpr@ximian.com>
-
-	* mail-ops.c (mail_send_message): set header to just Evolution
-	(mail_append_mail): ditto
-
-	* em-message-browser.c (em_message_browser_window_new): set title
-	to just Evolution
-
-2004-05-10  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (emfv_activate): cleanup the view menus if they
-	were created.
-
-	* em-folder-view.h: added list_active bit, means the view is
-	showing the list and needs e.g. view menus.
-
-	* em-folder-view.c (emfv_setup_view_instance): was
-	create_view_instance.  Now also setup the menu's if we're showing the list.
-
-	* em-folder-browser.c (emfb_create_view_menus): removed.  moved
-	functionality into emfolderview.
-
-2004-05-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #57152.
-
-	* em-folder-tree.c (emft_get_folder_info__got): If we queried for
-	a recursive folder-info listing, then pass fully_loaded as TRUE to
-	set_folder_info().
-	(emft_get_folder_info__got): If we find that a folder doesn't have
-	children, set the expanded state to FALSE.
-
-	* em-folder-tree-model.c (em_folder_tree_model_set_folder_info):
-	Now takes a "fully_loaded" argument to hint to set_folder_info
-	whether or not folder-info's without child nodes can possibly have
-	children (eg. if fully_loaded is set and fi->child is NULL, then
-	'load' will be FALSE no matter what fi->flags contains).
-
-2004-05-07  Radek Doulik  <rodo@ximian.com>
-
-	* mail-config.c (config_write_style): set cite_color property of
-	gtkhtml widgets
-	(mail_config_init): add /apps/evolution/mail/display dir to gconf
-	client and watch for mark_citations and citation_colour changes
-
-	See bug #57587
-
-2004-05-07  Not Zed  <NotZed@Ximian.com>
-
-	* mail-account-editor.c: include missing header.
-
-	** See bug #57935.
-
-	* em-folder-view.c (emfv_set_message): add new arg, nomarkseen,
-	don't mark the selected message seen once its loaded.
-	(emfv_list_message_selected): clear the nomarkseen flag once we've
-	processed the selection.
-	(emfv_list_done_message_selected): handle the nomarkseen flag,
-	don't mark a message seen if it was explictly selected.
-
-	* em-folder-browser.c (emfb_list_built): use
-	em_folder_view_select_message rather than doing it via the
-	messagelist directly.
-
-	** Dunno why i bothered, but see bug #58090.
-
-	* importers/netscape-importer.c
-	(netscape_filter_parse_conditions): check for custom headers
-	properly.
-	(netscape_filter_flatfile_get_entry): put in some validate checks.
-	(netscape_filter_to_evol_filter): implement custom headers properly.
-	(ns_filter_condition_types): add missing "status" string.
-
-	** See #58017.
-
-	* message-list.c (mail_regen_list): use thread_queued, so we don't
-	regen out of order.
-
-	* em-folder-view.c (emfv_list_message_selected): use the queue
-	thread so we don't get messages out of order.
-
-	* mail-ops.c (mail_transfer_messages): use thread_queued_slow.
-	(mail_prep_offline): and here too.
-
-2004-05-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-component.c (folder_selected_cb): Check that the folder is
-	selectable using the new flags argument.
-
-	* em-folder-selector.c (folder_selected_cb): Updated for below
-	changes.
-
-	* em-folder-tree.c (emft_tree_selection_changed): Updated to pass
-	a flags argument to the folder_selected signal.
-	(emft_tree_row_activated): Same.
-
-2004-05-06  Radek Doulik  <rodo@ximian.com>
-
-	* em-composer-prefs.c (sig_selection_changed): reset the preview
-	if no signature is selected
-
-	Fixes #57167
-
-2004-05-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (emft_tree_row_collapsed): Select the row that
-	was just collapsed. Fixes bug #57665.
-
-	* mail-autofilter.c (rule_match_thread): Removed.
-	(rule_from_message): Removed the AUTO_THREAD bit.
-
-	* em-folder-view.c: Removed vFolder/Filter on Thread. These were
-	both broken.
-	(struct _filter_data): Removed a bunch of data members since most
-	of them weren't used.
-
-2004-05-05  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #57720.
-	
-	* em-folder-browser.c (emfb_create_view_menus): removed some stuff
-	done in create_view_instance in the superclass.
-
-	* em-folder-view.c (emfv_create_view_instance): moved here from
-	em-folder-browser, setup the view instance for the folder.
-	(emfv_set_folder): if the folder is set, create the view instance.
-
-	* em-folder-browser.c: moved the galview instance and menu
-	pointers to EMFolderView, since they're basically meta-data on the
-	messagelist @ to fix issues.
-
-	* em-folder-view.c (em_folder_view_open_selected): copy over the
-	threaded list value when the message browser is brought up.
-
-	** some clean up
-
-	* evolution-mail.schemas.in.in: removed xmailer_mask stuff.
-
-	* em-migrate.c (mail_display_map[]): Removed xmailer_mask stuff.
-
-	* em-folder-view.c (emfv_setting_notify): removed xmailer_mask stuff.
-
-	* em-format-html.c (em_format_html_set_xmailer_mask): removed.
-	This isn't used anymore.
-
-	** Fixes the double-draw on separate mail view.
-
-	* message-list.c (on_cursor_activated_cmd): noop if the cursor and
-	uid match for all cases (clearing uid).
-	(on_selection_changed_cmd): noop if the cursor and new selection
-	hasn't changed & fix a memleak.
-
-2004-05-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #55303, but ideally there would be a nicer way of
-	doing this - likely with some added ETree API but that's not
-	likely to happen anytime soon.
-
-	* em-folder-browser.c (scroll_idle_cb): Recall the saved scrollbar
-	position state and set it, then reconnect to the
-	message_list_scrolled signal.
-	(emfb_list_built): Calculate a default scrollbar position for
-	scroll_idle_cb to use if there's no saved state.
-	(emfb_set_folder): Disconnect from the message_list_scrolled
-	signal and the idle_scroll_id.
-	(emfb_list_scrolled): Save the scrollbar position state.
-	(emfb_destroy): Disconnect from list_scrolled_id and
-	idle_scroll_id.
-
-	Fix for bug #58004.
-
-	* mail-account-gui.c (display_license): Fixed to compile.
-	(select_account_signature): Activate the signature menu item.
-	(signature_added): Connect to the activate signal for each item.
-	(sig_changed): Removed.
-	(prepare_signatures): Don't bother connecting to the
-	"selection-done" signal, it doesn't seem to work the way we
-	expected it to work.
-
-2004-05-04  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* mail-account-gui.c (display_license): This now takes CamelProvider
-	as argument. Made the display message more generic. Removed the signal
-	connects for buttons and replaced those with proper gtk_reponses.
-	(mail_account_gui_check_for_license): Modified the gconf key for
-	licenses to be a string list.
-	* evolution-mail.schemas.in.in: Added the gconf schema entry for a 
-	string list to handle the component names whose licenses are accepted.
-	* mail-license.glade: Modified the display string and added the
-	appropriate gtk_response types for the buttons.
-	
-2004-05-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #57968
-
-	* message-list.c (message_list_set_folder): Save the tree/hide
-	state of the current folder before clearing the message-list.
-	(message_list_set_folder): Note that a new folder has just been
-	set (now needed by the regen code to tell whether or not it should
-	save the tree state before clearing the tree).
-	(message_list_destroy): Save the tree/hide state before destroying
-	the message-info's, not after.
-	(regen_list_regened): If the regen is being performed in response
-	to a message_list_set_folder, don't save the tree state before
-	clearing the tree or we'll clobber the real state with bogus data.
-
-2004-05-03  William Jon McCann  <mccann@jhu.edu>
-
-	* mail-account-gui.c: Add gtkdialog header to fix build.
-
-2004-05-03  Not Zed  <NotZed@Ximian.com>
-
-	* em-composer-utils.c (create_new_composer): take fromuri and
-	subject to set the basic headers/account.
-	(em_utils_compose_new_message)
-	(em_utils_compose_new_message_with_mailto, forward_attached)
-	(em_utils_forward_attached, forward_non_attached)
-	(em_utils_forward_inline, em_utils_forward_quoted)
-	(em_utils_forward_message, em_utils_forward_messages): Take the
-	from folder uri to set the from account if it can.  Fixed all
-	callers.  For #57964.
-
-	* mail-send-recv.c (receive_update_done): removed.
-
-	* em-mailer-prefs.h:
-	* message-tag-followup.h:
-	* mail-config-druid.h:
-	* mail-tools.h: clean up & use forward decls.  Fix users with
-	busted includes.
-
-	* em-composer-utils.c (em_utils_compose_new_message)
-	(em_utils_compose_new_message_with_mailto)
-	(em_utils_post_to_folder, em_utils_post_to_url)
-	(em_utils_edit_message, em_utils_edit_messages)
-	(em_utils_forward_attached, em_utils_forward_inline)
-	(em_utils_forward_quoted, em_utils_forward_message)
-	(em_utils_forward_messages, em_utils_redirect_message)
-	(em_utils_redirect_message_by_uid) :
-	(em_utils_reply_to_message, em_utils_reply_to_message_by_uid)
-	(em_utils_post_reply_to_message_by_uid): Moved these here from
-	em-utils.c.
-
-2004-04-30  Priit Laes  <amd@tt.ee>
-
-	* mail-config.glade: fix typo. #53466.
-
-	* evolution-mail.schemas.in.in: use American English instead of
-	British. #53466.
-
-2004-04-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #56645
-
-	* em-folder-tree.c (tree_drag_motion): If the row the cursor is
-	hovering over has children and is not expanded already, setup a
-	timer to auto-expand it if the user hovers there long enough.
-	(tree_autoexpand): Callback to expand the row.
-	(tree_drag_leave): Disconnect the timer.
-	(tree_drag_drop): Same.
-	(em_folder_tree_destroy): Same.
-
-2004-04-30  Enver ALTIN  <enver.altin@frontsite.com.tr>
-
-	* evolution-mail.schemas.in.in: Fixed a type-o.
-
-2004-04-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (message_list_set_folder): Properly initialise
-	the strikeout column for both types of folders (trash and not
-	trash). Completes the fix for bug #57304.
-
-2004-04-30  Not Zed  <NotZed@Ximian.com>
-
-	* em-utils.c (emu_can_save): fix the overwrite? question.  #57822.
-
-2004-04-29  Not Zed  <NotZed@Ximian.com>
-
-	* mail-errors.xml.in: change all the session-message-* things to
-	just be secondary, otherwise they look awful all big fonted.
-
-	* mail-session.c (error_type[]): forgot to prefix error type with
-	"mail:"
-
-	* em-account-prefs.c (account_delete_clicked): duh, use the right
-	error id.
-
-	* mail-send-recv.c (receive_update_got_store): call
-	mail_note_store rather than get_folder_info so that unread counts
-	are propagated to the ui too.
-
-	* mail-errors.xml.in: fix the password dialogue text.
-
-2004-04-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree-model.c (sort_cb): Sort the VFolders. Fixes bug
-	#56636.
-
-	* em-mailer-prefs.c (citation_color_set): We only want 8bits per
-	color. Fixes bug #57588.
-
-	* em-folder-tree-model.c (em_folder_tree_model_remove_store):
-	Duh. If the lookup of si fails, don't use si->display_name in the
-	warning message. Actually, don't bother with a warning message at
-	all, this is a perfectly valid situation. Fixes bug #57746.
-
-	* mail-ops.c (mail_send_message): Don't set the Date header here
-	anymore. It has either already been set (when written to the
-	Outbox) or will automagially be set to the current time if a Date
-	hasn't already been set when the transport sends it. Fixes bug
-	#57599.
-
-	* em-composer-prefs.c (sig_add_script_response): Use
-	g_shell_parse_argv() to get the actual script path and then check
-	that we can exec argv[0] rather than treating the entire
-	command-line as the signature script. Fixes bug #57305.
-
-2004-04-28  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (ml_selection_clear_event): return the right
-	type, related to #53839.
-
-	** Changed error messages to use EError.
-
-2004-04-27  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #57659.
-
-	* mail-ops.c (fix_unmatched_info): removed, done in camel now.
-
-	** See bug #57511.
-
-	* mail-config.glade: gave the whole smime frame (vbox) a name so
-	we can use it from code.
-
-	* mail-account-gui.c (mail_account_gui_new): get the smime_vbox
-	widget if we have no NSS, the name changed and the HIG patches
-	didn't fix it.
-
-2004-04-26  Radek Doulik  <rodo@ximian.com>
-
-	* em-format-html.c (efh_format_timeout): set gtk_html_begin's
-	flags to avoid scroll to top of the message and
-	reloading+flickering of images
-
-	* em-html-stream.c: added GtkHTMLBeginFlags flags field
-	(em_html_stream_set_flags): new helper function to set new flags
-	field
-	(emhs_sync_write): use gtk_html_begin_full with new flags field
-	(em_html_stream_new): zero flags field
-
-	Fixes #51654
-
-2004-04-23  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* mail/mail-license.glade: Glade file for displaying the license.
-
-2004-04-23  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (em_format_html_load_http): fix the check to
-	see if we've already loaded the images.  #57450.
-
-2004-04-23  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* mail-account-gui.c (mail_account_gui_source_complete): Added a 
-	check for HAS_LICENSE flag.
-	(mail_account_gui_check_for_license)(display_license)
-	(populate_text_entry)(check_button_state)(set_license_accepted)
-	(set_license_rejected): Implemented
-
-2004-04-22  Not Zed  <NotZed@Ximian.com>
-
-	* em-migrate.c (em_migrate_imap_cmeta_1_4): do the imap cmeta
-	files, it just does the sync offline stuff.  #56674.
-	(em_migrate_1_4): non-fatalise some of the options, call above.
-
-	* mail-component.c (view_changed_cb): display selected count
-	instead of unread if we have >1 selected.  Also don't do special
-	case drafts/sent/outbox stuff if folders are inbox or re-used.
-	(view_control_activate_cb): force check of autosaved messages as
-	soon as the mailer starts up (well, after a delay, this seems
-	wrong).  #57093.
-
-2004-04-21  Not Zed  <NotZed@Ximian.com>
-
-	* em-inline-filter.c (emif_scan): use a better test for non-full
-	lines.
-
-	* em-folder-browser.c (emfb_activate): dont desensitise
-	HideDeleted just 'cause we have no folder, it needs to depend on
-	Trash folder only.
-	(emfb_set_folder): set the hidedeleted sensitivity based on
-	whether we have a trash folder or not.  Fixed #57226.
-
-	* em-folder-view.c (emfv_class_init): use the right signal
-	callback for the changed signal.  Fixes #57246.
-
-	* mail-component.c (impl_createControls): fix for
-	e_user_creatable_items api changes.
-	(create_item): split out the code to create the item.
-	(create_local_item_cb): new callback for local item creation.
-	(impl_requestCreateItem): call create_item to do the work.
-
-2004-04-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-browser.c: Use E_ICON_SIZE_* enums for the menu icon
-	sizes.
-
-	* em-folder-view.c: Use E_ICON_SIZE_* enums for the menu/toolbar
-	icon sizes.
-
-	* message-tag-followup.c (construct): Same.
-
-	* message-list.c (message_list_init_images): Same.
-
-	* mail-send-recv.c (build_dialog): Same.
-
-	* mail-mt.c (do_op_status): Same.
-
-	* mail-config-druid.c (evolution_mail_config_wizard_new): Same.
-
-	* em-popup.c (em_popup_create_menu): Same.
-
-	* em-format-html-display.c (efhd_format_prefix): Same.
-
-	* em-format-html.c (efh_format_secure): Same as below.
-
-	* em-folder-tree.c (render_pixbuf): Don't use absolute icon sizes,
-	use the e-icon-factory enums.
-
-2004-04-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-composer-prefs.h: Removed variables that got re-added with
-	the icon-theme patch somehow.
-
-	* em-account-prefs.c: Don't bother keeping global references to
-	the enable_pixbuf anymore, since it's unnecessary.
-
-2004-04-19  Michael Terry  <mike@mterry.name>
-
-	* GNOME_Evolution_Mail.server.in.in:
-	* em-account-prefs.[ch]:
-	* em-composer-prefs.[ch]:
-	* em-folder-browser.c:
-	* em-folder-tree.c:
-	* em-folder-view.c:
-	* em-format-html-display.c:
-	* em-format-html.[ch]:
-	* em-popup.c:
-	* mail-component.c
-	* mail-config-druid.c:
-	* mail-config.glade:
-	* mail-mt.c:
-	* mail-send-recv.c:
-	* message-list.c:
-	* message-tag-followup.c:
-	* message-tags.glade: Update the mailer to use icon themes through the
-	EIconFactory object in e-util
-
-2004-04-16  David Malcolm  <dmalcolm@redhat.com>
-
-	* importers/netscape-importer.c (netscape_import_accounts):
-	Removed unused and uninitialised "url" local that gets g_free-ed
-
-2004-04-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (config_write_style): Change the message display
-	widget names to match the ones we are using in 1.5 (rather than
-	the ones from earlier versions). Fixes bug #57070.
-
-2004-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c: Added a new "message_list_scrolled" signal so
-	our users can listen to this event in order to update saved state.
-	(message_list_get_scrollbar_position): Simplified.
-	(message_list_set_scrollbar_position): Simplified.
-
-	* em-format.c: Don't complain about message errors ("Internal
-	Error: ..."), instead silently fall back to display the message as
-	source. Fixes bug #56876.
-
-2004-04-14  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (emfv_set_folder_uri): ugh, use the queued
-	thread to get the folder, otherwise we can get folders set on the
-	display out of order.
-
-	* message-list.c (message_list_set_search): if we set this while
-	frozen, save the search elsewhere.
-	(message_list_thaw): if we had a frozen-time search, use it when
-	we regenerate.
-
-	* em-folder-browser.c (emfb_set_folder): freeze/thaw the
-	messagelist around changes so we don't have multiple updates fire
-	off changing folders.
-	(emfb_activate): remove an unused variable i never used.
-
-	* message-list.c (message_list_freeze, message_list_thaw): lock
-	some updates to the ui, so you can do things like set folder and
-	search atomically.
-	(message_list_set_threaded, message_list_set_hidedeleted)
-	(message_list_set_search, message_list_hide_uids)
-	(message_list_hide_clear, message_list_set_folder): dont refresh
-	the list if we're frozen.
-
-	* mail-component.c (impl_createControls): remove debug comment.
-
-	** See #56641.
-
-	* em-format-html-display.c (efhd_format_secure): fix a small
-	memleak.
-	(efhd_bonobo_unknown, efhd_format_attachment): close the <object>
-	tag properly, and <br> it as well to make sure its separated.
-
-	* em-sync-stream.c: add some runtime and compile time stream
-	logging stuff.
-
-	** See bug #56149.
-
-	* em-folder-view.c (emfv_edit_cut): similar to below, use focus to
-	determine who we select from.
-	(emfv_edit_copy): ditto.
-
-	* message-list.c: Remove primary selection stuff.  It just annoys.
-
-	* em-folder-browser.c (emfb_edit_copy): use focus rather than
-	selection owner to determine who to copy from.
-	(emfb_edit_cut): similarly.
-
-	* em-format.c (emf_multipart_related): hmm, use the right pointer
-	when iterating the pending uri list.
-
-2004-04-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-component.c (impl_createControls): We don't actually want
-	to disallow clicking on \NoSelect folders. Fixes a bug campd has
-	been complaining to me about :-)
-
-	* mail-config.c (mail_config_signature_run_script): If we get an
-	empty charset string from gconf, don't try to use the result to
-	create a charset filter. Real fix for bug #51924.
-
-	* mail-config.glade: Removed crackrock usage of GtkFixed as
-	fillter. Also HIGified some other stuff.
-
-2004-04-13  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (emfv_set_folder): track the messagelist
-	hidedeleted value since it looks it up when we set the folder.
-
-	* em-folder-browser.c (emfb_hide_deleted): use new method below to
-	propagate change.
-	(emfb_activate): same.
-
-	* em-folder-view.c (em_folder_view_set_hide_deleted): accessor to
-	set the hide_deleted state, emits a view_changed event.
-
-	* mail-component.c (view_changed_cb): use VISIBLE rather than
-	TOTAL for the displayed total count.  Also deleted if we're not in
-	hide deleted mode.  And do spethal things with spethal folders,
-	etc.
-
-	* mail-ops.c (mail_refresh_folder): run this in the
-	thread_queued_slow, so it runs in sequence and after folder_sync.
-
-	* em-folder-view.c (emfv_set_folder): fire off a refresh_folder
-	once the folder is loaded.  Addresses #56871.
-
-	* em-format-html.c (efh_format_headers): use %% for %%.
-	(efh_format_done): reset load_http_now once we've done, should
-	fix #56338 finally.
-
-	* em-folder-view.c (emfv_init, emfv_finalise, emfv_activate):
-	revert dans' creatable items handler patch, moved to
-	mail-component instead (which deals with the actual menu's).
-
-	* mail-component.c (impl_createControls): setup a user creatable
-	items handler on the view widget.
-	(view_control_activate_cb): activate the user creatable items
-	handler on the view widget.
-
-	* em-folder-view.c (emfv_init): add a comment about jeff's last
-	fix.
-
-	* em-utils.c (forward_non_attached): Set attachments from
-	forwardee before we set the body, otherwise images wont resolve
-	properly.  Related to #56566.
-
-2004-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-view.c (emfv_init): Need to set the session on the
-	preview object. Fixes bug #56862.
-
-	* em-folder-tree.c (em_folder_tree_set_selected): Scroll to the
-	auto-selected folder. Fixes bug #56707.
-
-	* message-list.c (message_list_get_scrollbar_position): New
-	function.
-	(message_list_set_scrollbar_position): New function.
-
-	* em-utils.c (em_uri_to_camel): If the provider is unavailable,
-	return euri like the other fail cases. Fixes bug #56846.
-
-2004-04-10  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* evolution-mail.schemas.in.in.h: Correct typo s/hight/height/ at
-	"Subscribe dialog default hight"
-
-2004-04-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_init): Don't bother adding the
-	autogen sig here, e-signature-list.c handles this now.
-
-	* em-migrate.c (em_upgrade_accounts_1_4): Migrate the signature
-	uids. Fixes bug #56726.
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* importers/pine-importer.c (import_contact): use
-	e_destination_export_to_vcard_attribute instead of exporting to
-	xml, and use e_contact_set_attributes.
-
-	* em-utils.c (em_utils_camel_address_to_destination):
-	EABDestination -> EDestination.
-	(reply_get_composer): same
-	(post_reply_to_message): same.
-
-	* em-composer-utils.c (ask_confirm_for_unwanted_html_mail):
-	EABDestination -> EDestination.
-	(composer_get_message): same.
-
-2004-04-09  Radek Doulik  <rodo@ximian.com>
-
-	* em-format-html.c (efh_format_headers): add width=16 height=16 to
-	rupert's image so that it doesn't flicker/move
-
-2004-04-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-selection.c (em_select_folder): Set the excluded bits
-	on the folder-tree. Don't allow the user to xfer messages into
-	folders which are: NoSelect, Virtual, nor vTrash. Fixes bug
-	#56229.
-
-2004-04-09  Dan Winship  <danw@ximian.com>
-
-	* em-folder-view.c (emfv_init): Create an
-	EUserCreatableItemsHandler for the view.
-	(emfv_finalise): Unref it.
-	(emfv_activate): Activate it
-
-	* mail-component.c (impl__get_userCreatableItems): add
-	object/folder flags to the items
-
-2004-04-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (cp_r): Now takes a pattern argument to limit files
-	that get copied over (so we can limit imap cache to only the
-	summary files - makes it faster).
-
-	* mail-account-gui.c (mail_account_gui_build_extra_conf): Fixed up
-	a bit to look nicer and make it closer to HIG compliant.
-
-	* em-folder-tree.c (emft_drop_folder): We need to recursively copy
-	the dragged folder tree over to the drop location, not just the
-	parent folder. We also need to subscribe to the newly created
-	folder in some cases.
-
-2004-04-08  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (efh_format_headers): add the monkey button if
-	we're from evolution.  See #52977.
-	(emfh_gethttp): cast away a warning.
-
-	* mail-folder-cache.c:
-	(update_1folder): VJUNK_FOLDER's dont exist, they're VTRASH
-	folders now.
-
-	* em-folder-view.c: remove message_changed stuff from camel folder
-	stuff.
-
-	* mail-component.c (mail_component_init): don't setup the search
-	context here, wait till its requested.  Fixes #56672.
-
-2004-04-07  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (view_changed_cb): hook to update the info
-	label when the folderview changes.
-
-	* em-folder-view.c (emfv_class_init): added 2 signals 'loaded' and
-	'changed'.  For when a folder is set/cleared or when some state
-	changes.
-	(emfv_set_folder): emit LOADED signal when we set the folder.
-	(emfv_list_message_selected): emit changed event.
-	(emfv_gui_folder_changed): emit changed event.
-
-2004-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (emft_tree_button_press): Check that
-	emft_selection_get_selected() returns TRUE before we try to use
-	the iter. Fixes bug #56652.
-	(emft_popup_delete_response): Same idea here.
-	(emft_popup_delete_folder): Same.
-	(emft_popup_rename_folder): Same.
-	(emft_popup_properties): Same.
-
-	Fix for bug #56538
-
-	* em-folder-view.c (emfv_set_folder_uri): Don't set the preview
-	empty here.
-	(emfv_set_folder): If the folder is the same as the folder already
-	on the emfv, just return. Otherwise clear the preview and continue
-	setting the folder as normal.
-
-2004-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-account-prefs.c (em_account_prefs_apply): Removed.
-
-	* em-mailer-prefs.c (em_mailer_prefs_apply): Removed.
-
-	* em-composer-prefs.c (em_composer_prefs_apply): Removed.
-
-	* mail-config-factory.c (mail_config_control_factory_cb): No
-	longer need the Apply stuff.
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): Don't call a
-	function that doesn't exist anymore.
-
-2004-04-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): Changed to save
-	the settings in the signal callbacks.
-	(em_mailer_prefs_apply): Don't save the settings here.
-
-	* em-composer-prefs.c (em_composer_prefs_apply): Don't save the
-	settings here.
-	(em_composer_prefs_construct): Changed to save the settings in the
-	signal callbacks.
-
-2004-04-06  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree.c (emft_tree_row_expanded): ref the emfoldertree
-	in our thread message.
-	(em_folder_tree_set_selected): same.
-	(emft_get_folder_info__free): unref it.
-
-	* mail-folder-cache.c (ping_store): use thread_queued_slow not
-	thread_queued - we dont care when it runs.
-
-	* em-folder-view.c (emfv_set_folder_uri): use thread_new for
-	getting the folder, we do elsewhere, and it aids interactivity.
-
-2004-04-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (em_migrate_dir): Migrate the thread_list
-	setting. Fixes bug #56297.
-
-2004-04-05  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html-display.c (efhd_xpkcs7mime_button): if we have no
-	sign status, use signed-nokey, rather than no icon.
-	(efhd_xpkcs7mime_viewcert_clicked): show the certificate viewer
-	since certificate_viewer_show doesn't show it.
-	(efhd_xpkcs7mime_viewcert_foad): foad foad foad.  The api changed
-	and we need to foad it ourselves.
-
-	** See bug #52822.
-
-	* em-format-html-display.c (efhd_xpkcs7mime_add_cert_table): if we
-	can't find the cert, then desensitise the cert button.
-
-	** See bug # 56402.
-
-	* mail-folder-cache.c (update_folders): if we're cancelled, noop.
-	(mail_note_store_remove): mark the update data cancelled.
-
-	* mail-ops.c (add_special_info): removed, this is done in camel
-	now.
-	(fix_unmatched_info): renamed from add_unmatched_info.
-	(get_folderinfo_got): Removed the meaningless comment here.
-
-2004-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (cp_r): Revert my "fix" from yesterday. We can't
-	necessarily show progress (progress window may have been destroyed
-	already).
-
-	Fixes bug #53851
-
-	* em-folder-view.c (emfv_popup_move_cb): Save the uri as the
-	default for copy/move.
-	(emfv_popup_move): Use the default copy/move uri.
-	(emfv_popup_copy): Same.
-
-	* em-folder-selection.c (em_select_folder): Select the uri *after*
-	the dialog gets shown.
-
-2004-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #37416
-
-	* mail-folder-cache.c (update_1folder): Same as below. Also add
-	vJunk fodlers to the list of folders that we display the total
-	count for (as discussed on the mailing lists).
-
-	* em-folder-tree-model.c (em_folder_tree_model_set_folder_info):
-	Use 'total - deleted' as the count for Outbox rather than just the
-	total count.
-
-2004-04-02  Not Zed  <NotZed@Ximian.com>
-
-	* em-inline-filter.c: do a per-line validation of the uuencoded
-	stuff, based on the length byte.
-
-	** See bug #56338.
-
-	* em-format-html.c (emfh_gethttp): fix the fugly "load http if"
-	that doesn't work to be a fugly "load http if" that does work.
-	(efh_format_timeout): dont set load_http_now here, its only an
-	override now.
-
-2004-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (cp_r): Report progress. "Fixes" bug #56355.
-
-	* mail-account-gui.c (signature_changed): Set the updated
-	sig->name on the menu item.
-
-	* importers/netscape-importer.c (netscape_import_accounts):
-	Updated for signature API changes.
-
-	* mail-account-gui.c: Same.
-
-	* mail-signature-editor.c: Same.
-
-	* em-composer-prefs.c: Same.
-
-	* mail-config.c: Rewrote the signature stuff to use ESignatureList
-	instead. Much cleaner and less broken.
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): Always make the
-	Add/Remove Header buttons de-sensitised at the start. Fixes bug
-	#56284.
-
-2004-04-01  Eric Zhao  <eric.zhao@sun.com>
-
-	* mail-account-gui.c (transport_type_changed): Commented grabbing
-	focus on hostname edit, fix the focus issue of Account Assistant.
-
-2004-03-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format-html.c (efh_text_plain): Only do citation colouring if
-	the user has specified to do so and use the user's specified
-	colour when appropriate. Fixes bug #56290.
-
-	* em-subscribe-editor.c (em_subscribe_editor_new): Save/restore
-	the subscribe dialog's window size. Fixes bug #56230.
-
-2004-03-31  Not Zed  <NotZed@Ximian.com>
-
-	* mail.h: REMOVED!  And there was much rejoicing.
-
-	* *.[ch]: Cleaned up header inclusions and added plenty of forward
-	declarations.  Sped up complete re-compilation by upto 20%.
-	
-	** See bug #55950.
-
-	* em-utils.c (em_utils_in_addressbook): utility for checking if an
-	email address is in the addressbook.  I can't tell if it works
-	'cause it crashes eds.
-
-	* em-format-html.c (emfh_gethttp): handle addressbook checking.
-
-2004-03-30  Not Zed  <NotZed@Ximian.com>
-
-	* mail-config.h: clean up the headers and use some forward decl's
-	instead.
-
-	* em-format-html.c (em_format_html_set_load_http): change state to
-	an int 'style' instead.
-
-	* em-folder-view.c (emfv_setting_notify): set the format load http
-	option to the config value directly.
-
-	** See bug #56147.
-
-	* message-list.c (clear_info): set the node data to NULL when we
-	unref its data.
-	(ml_get_save_id): use a different test for the root node, and
-	return NULL if we don't have any data on the node (because we're
-	cleaing it).
-
-	** See bug #54962.
-
-	* em-folder-tree.c (emft_popup_new_folder_response): put back the
-	old hack to open the vfolder editor if you try to create a folder
-	under vfolders.
-
-	** See bug #55940.
-
-	* mail-autofilter.c (mail_filter_rename_uri): map the uri to an
-	email uri before passing to filter code.
-	(mail_filter_delete_uri): same here.
-
-2004-03-30  Radek Doulik  <rodo@ximian.com>
-
-	* mail-config.glade: add spellLiveToggled signal
-
-	* em-composer-prefs.c (em_composer_prefs_construct): fix typo,
-	call toggle_button_init on prefs->spell_check instead of againg on
-	prefs->auto_smileys
-	(spell_setup): connect spellLiveToggled signal
-
-	Fixes #55964
-
-2004-03-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (emft_create_folder__free): Free the
-	folder-info.
-
-	* em-folder-browser.c (emfb_activate): Instead of comparing
-	sstate[0] to '1', compare it against '0' like all the other code
-	does.
-
-2004-03-25  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* Makefile.am : remove local-config.glade from glade_DATA as it 
-	is removed from CVS 
-
-2004-03-25  Rodney Dawes  <dobey@ximian.com>
-
-	* em-composer-prefs.c (sig_edit_cb):
-	(sig_add_script_cb): Use gtk_window_present instead of doing a show
-	then raise, as this also puts the window on the current workspace
-	(em_composer_prefs_construct): Fix the border widths for the dialog
-	vbox and action area to be HIG-compliant, and realize the window
-	Remove the dialog separator
-	Use a box_pack_start, rather than box_pack_start_defaults which causes
-	some weird behaviour when changing the border widths
-	* em-subscribe-editor.c (em_subscribe_editor_new): Realize the dialog
-	and set the border widths for its vbox and action area to be compliant
-	with the HIG
-	* local-config.glade: Removed this file as it is no longer used
-	* mail-account-editor.c (construct): Realize the dialog, remove its
-	separator, and set the border widths for its vbox and action area to
-	be HIG-compliant
-	* mail-account-editor.c (source_type_changed):
-	(transport_type_changed): Fix the showing and hiding of the widgets
-	related to the SSL options
-	(mail_account_gui_new): Get the transport/source frames for the SSL
-	options, and hide them by default
-	Show the default folder buttons by default here
-	(mail_account_gui_setup): Only call _show not _show_all here, so we
-	don't mess up the shown/hidden state of things
-	* mail-account-gui.h: Add ssl_frame widget to the MailAccountGuiService
-	* mail-config.glade:
-	* mail-search.glade:
-	* mail-security.glade: HIG-compliance fixes for the glade dialogs
-	* message-tag-followup.c (construct): Don't set border_width on the
-	dialog itself
-	Remove the separator from the dialog
-	Set the border_widths for the dialog's vbox and action areas to be
-	compliant with the HIG
-	* message-tags.glade:
-	* subscribe-dialog.glade: HIG-compliance fixes for these dialogs
-
-	Original patch from Martyn Russell
-	
-2004-03-24  Danilo Å egan  <dsegan@gmx.net>
-
-	* mail-ops.c (get_messages_desc): Use ngettext for handling plural
-	forms (fixes bug #53464).
-
-2004-03-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format-html.c (emfh_gethttp): Use sizeof() to decide how big
-	buffer is so that in the future, if we change the length of
-	bufefr, things will Just Work (tm).
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): Fixed the key to
-	fetch the value from the correct location. It's
-	junk/check_incoming, not junk/sa/check_incoming. Fixes bug #55903.
-
-	* em-folder-tree-model.c (em_folder_tree_model_set_expanded):
-	Fixed some logic bugs.
-
-2004-03-23  Radek Doulik  <rodo@ximian.com>
-
-	* em-format-html-display.c (efhd_format_attachment): use
-	EM_FORMAT_HTML_VPAD
-
-	* em-format-html.h (EM_FORMAT_HTML_VPAD): added new define for
-	vertical padding
-
-	* em-format-html.c (efh_format_message): change padding table so
-	that it works OK with fixed gtkhtml
-
-2004-03-23  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html-display.c (efhd_attachment_popup): dont add the
-	show/hide menu items if we can't ever show it inline.
-	(efhd_attachment_button): disable the ">" button if we can't view
-	the content inline.  See #52086.
-
-	* em-format-quote.c (emfq_format_attachment): format inline(d)
-	parts automatically into the reply.  Part of #55702.
-
-	* em-utils.c (em_uri_from_camel): if we get an email uri passed in,
-	just pass it out again, without first going to camel to do it.
-
-2004-03-22  Not Zed  <NotZed@Ximian.com>
-
-	* em-format.c: 
-	* em-mailer-prefs.c: Add Newsgroups to the default header list.
-
-	* em-format-html.c (efh_format_header): handle the newsgroups
-	header, output news: url's.  For bug #??? i can't recall, i closed
-	it already!
-
-2004-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #54800.
-
-	* em-folder-tree.c (tree_drag_drop): Remove the autoscroll
-	timeout.
-	(tree_drag_leave): Remove the autoscroll timeout.
-	(tree_autoscroll): New autoscroll timeout callback - automagically
-	scrolls the treeview if appropriate.
-	(tree_drag_motion): Setup the autoscroll timeout.
-
-2004-03-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (mail_component_remove_store): ref the store
-	before running the async disconnect, otherwise we unref one too
-	many times.
-
-2004-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_setup): Don't set the
-	account source/transport types to disabled simply because the
-	provider is NULL (think of the "None" option).
-	(source_type_changed): Need to update widget sensitivity based on
-	locked'ness here.
-	(transport_type_changed): Same.
-
-	* em-utils.c (em_utils_add_address): rfc2047 decode the address
-	here before passing it off to the addressbook (which expects it to
-	be in human-readable form, not encoded). Fixes bug #55591.
-
-2004-03-18  Not Zed  <NotZed@Ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_new): save the source and
-	transport vbox's to enable/disable the whole lot easier.
-	(mail_account_gui_setup): enable above based on perms.
-	(mail_account_gui_build_extra_conf): also disable extra page, as
-	above.
-
-	* em-account-prefs.c (account_cursor_change): disable the whole
-	account editor if accounts are ro.
-
-2004-03-17  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (efh_message_deliverystatus): format as plain
-	text too.
-
-	* em-format.c (emf_message_deliverystatus): format delivery
-	status messages as plain text, rather than as messages.  since
-	they wont be CamelMimeMessages.  Maybe they should be silently
-	hidden.
-
-	* mail-offline-handler.c (store_go_online): split this, only call
-	add_store/note_store once we've actually set the store online.
-	(store_went_online): set the store up once we're fully online.
-	Works around a deadlock in #55618.
-
-	* em-account-prefs.c (account_cursor_change): disable
-	editing/adding/removing accounts etc if accounts aren't editable.
-	(em_account_prefs_construct): call above after setup.
-
-	* mail-component.c (mc_quit_sync): if we have empty on exit days,
-	check that.  keep track of the last empty on exit time.
-
-	* em-mailer-prefs.c (emmp_empty_trash_init): init the trash stuff
-	here.
-	(em_mailer_prefs_apply): save empty trash on exit frequency.
-
-2004-03-16  Not Zed  <NotZed@Ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_auto_detect_extra_conf):
-	check extra conf items are writable.
-	(mail_account_gui_build_extra_conf): same.
-	(setup_service): add gui arg, and do above for auth and ssl args.
-
-2004-03-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #55358.
-
-	* em-folder-tree.c (emft_expand_node): Changed to be the callback
-	function for em_folder_tree_model_expand_foreach().
-	(emft_maybe_expand_row): Renamed from emft_loading_row_cb(). We
-	now handle both "loading-row" an "loaded-row" signals. Also
-	updated for slight change in key generation.
-	(em_folder_tree_new_with_model): Connect to the "loaded-row"
-	signal.
-	(emft_update_model_expanded_state): Updated for slight change in
-	key generation.
-
-	* em-folder-tree-model.c (em_folder_tree_model_add_store): Emit
-	the "loaded-row" signal for the newly added store.
-	(em_folder_tree_model_set_folder_info): Emit "loaded-row" for the
-	row we've just set the info on (but only after we've added a child
-	node if there is one, so the signal handler can expand the newly
-	added row if appropriate).
-	(em_folder_tree_model_class_init): Setup the "loaded-row" signal.
-	(em_folder_tree_model_finalize): The tree-state is now an xml file
-	and not a binary file, so change the expanded free func.
-	(em_folder_tree_model_load_state): Load the expand-state xml
-	file. If one doesn't exist, setup some defaults.
-	(em_folder_tree_model_get_expanded): Scan the XML tree for the
-	node.
-	(em_folder_tree_model_set_expanded): Same.
-	(em_folder_tree_model_save_expanded): Save the expand-state xml
-	tree to disk.
-	(em_folder_tree_model_expand_foreach): New function to iterate
-	over all xml nodes and call the callback if the expand state is
-	"true".
-
-2004-03-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-component.c (impl_requestCreateItem): Don't focus the
-	name_entry widget here.
-
-	* em-folder-selector.c (em_folder_selector_create_new): Focus the
-	name_entry widget here rather than in mail-component.c
-
-	* em-folder-tree.c (emft_drop_async_desc): New function to return
-	a description of the async drop operation. Fixes bug #54808.
-
-2004-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-utils.c (reply_to_message): If the mail_get_message() async
-	op fails, it will still call us with a NULL message to check for
-	that. Fixes bug #55612.
-	(post_reply_to_message): Same.
-
-	* em-folder-tree.c (emft_copy_folders__copy): Use
-	camel_store_rename_folder() when appropriate (m->tostore ==
-	m->fromstore && m->delete)
-
-2004-03-15  Not Zed  <NotZed@Ximian.com>
-
-	* em-format.c (em_format_format_error): make this a varags
-	function, which then calls the virtual method to do the work.
-	(emf_multipart_appledouble, emf_multipart_mixed)
-	(emf_multipart_alternative, emf_multipart_related)
-	(emf_message_rfc822): print an error to explain why you're getting
-	source content displayed.
-	(em_format_format_secure): make this a function.  and if we're
-	done formatting a secure part, and we dont have a parent anymore,
-	null out the validity.  See #55541.
-
-2004-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-browser.c (emfb_search_search_activated): No-op if
-	emfv->folder is NULL (this means we are looking at a store folder?
-	or else the folder hasn't loaded yet). Fixes bug #55293.
-
-2004-03-11  Radek Doulik  <rodo@ximian.com>
-
-	* mail-ops.c: remove junk learning thread, it's handled in
-	camel-folder.c:folder_changed now
-
-	* em-folder-view.c (emfv_popup_mark_junk): use
-	em_folder_view_mark_selected, set junk, junk-learn and seen flags
-	(emfv_popup_mark_nojunk): similar, reset junk, set junk-learn flags
-
-2004-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_send_mail): Removed. No longer in use (hasn't
-	been since before 1.2).
-	(send_queue_send): Before enetring the main send loop, create a
-	temporary uid array containing ONLY the messages we will send
-	(ie. not any that have been marked deleted) so that we can more
-	accurately report the number of messages total that we are
-	sending. Also continue sending even if we encounter an exeption in
-	mail_send_message() (unless, of course, it is a
-	user-cancel). Merge any exceptions we get into the master
-	exception variable and ALWAYS sync/expunge the queue folder.
-
-2004-03-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-browser.c (emfb_set_folder): Reverted signal blocking
-	stuff. Doesn't work and is unneeded with the proper fix.
-
-	* em-format-html.c (efh_format_header): Fixed a bug where txt
-	wasn't being properly initialised in all cases for Date
-	headers. Also fixed the x-evolution-mailer code to simply use the
-	ehader->value that was passed in.
-	(efh_format_headers): Fixed to handle the special
-	X-Evolution-Mailer header.
-
-2004-03-11  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-browser.c (emfb_set_folder): a really gross hack,
-	disable all search handlers before setting the search and set hte
-	search manually rather than going through the callbacks.  Partial
-	fix for #55267, and ugly as it is.
-	(emfb_init): save the search signal id's.
-	(emfb_set_folder): ugh, properly set the defaults if the settings
-	haven't been stored on the folder, and properly move them upstream
-	to the bonobo menus.
-
-	* em-folder-tree-model.c (sort_cb): when we sort, handle not
-	having the node in the tree.  otherwise we always compare against
-	"" which puts it at the head of the branch, rather than the tail.
-	See #55428.
-
-	* em-folder-tree.c (tree_drag_motion): make dnd look funny for
-	joe.  #55246.
-
-	* mail-component.c: change stores hash to point to a structure, in
-	which we maintain the vtrash and vjunk folders for the entirety of
-	the session.  memory use be damned i guess.  #55417 and partially
-	#55391.	
-
-2004-03-11  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (efh_format_header): pass the raw header in
-	instead of name and value.
-	(efh_format_headers): if we have specific headers to show, iterate
-	over all headers and print out all matching ones, so duplicate
-	headers are properly displayed.  Related to #55298.
-
-	* em-folder-selector.c (em_folder_selector_construct): dont set
-	this to be modal.  otherwise you can't click on error popups. duh.
-
-2004-03-08  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-selection-button.c
-	(em_folder_selection_button_clicked): don't let the user select
-	virtual/vtrash folders or non-selectable folders.
-
-	* mail-component.c (impl_createControls): disable selection of
-	non-select rows.
-
-	* em-folder-selector.c (em_folder_selector_create_new): exclude
-	folders with noinferiors set.
-
-	* em-folder-tree.c (folder_tree_new): add folder tree arg, hook
-	onto the selection funciton for the tree selection.
-	(emft_select_func): selection override function.  allow certain
-	things to be excluded.
-	(em_folder_tree_set_excluded): api to set what is excluded from
-	the selectability.
-	(emft_tree_row_activated): call emft_select_func check to see if
-	this row is excluded before emitting an activated signal.
-
-	* em-folder-tree-model.c (em_folder_tree_model_set_folder_info):
-	save folder info->flags in the tree store.
-
-	* mail-folder-cache.c (create_folders): use tail recursion.
-	(get_folders): tail recurse.
-
-	* (*): Fixed for api changes in camel.
-
-2004-03-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #55298.
-
-	* em-format-html.c (efh_format_header): Now takes a default txt
-	argument (header value). For address/date headers, if this isn't
-	set, default back to the old behaviour of looking it up.
-	(efh_format_headers): If we are iterating thru the camel raw
-	headers, always pas the header value as the txt argument,
-	otherwise always pass NULL.
-
-2004-03-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format-html-display.c (efhd_xpkcs7mime_validity_clicked):
-	Removed an unused variable left over from an old attempted fix.
-
-	* em-folder-selector.c (emfs_response): Select the same folder in
-	the create-folder dialog as is selected in the parent selector
-	dialog. Fixes the rest of bug #53862.
-
-	Partial fix for bug #53862.
-
-	* em-folder-selector.c (emfs_response): Connect to the newly added
-	"folder-added" signal and save a created_uri string so that we can
-	be sure to only listen for the creation of the folder the user
-	created in *our* create-folder dilog (and not from some other
-	place).
-
-	* em-folder-tree-model.c (folder_subscribed): Emit a new
-	"folder-added" signal.
-
-	* mail-session.c (request_password): Focus the entry widget. Fixes
-	bug #55330.
-
-2004-03-10  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c (pipe_to_sa_with_error): call
-	camel_stream_close and close the fds[1]
-	(pipe_to_sa_with_error): do not call close, camel_stream_close
-	should be enough to be sure the fd was closed
-
-2004-03-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (emft_create_folder): New async function to
-	create a folder.
-	(em_folder_tree_create_folder): Partly moved into
-	emft_create_folder. Might be able to remove this code, but lewing
-	might be using it in Connector or something? Need to ask him...
-	(emft_popup_new_folder_response): Use emft_create_folder()
-	instead.
-
-2004-03-08  Radek Doulik  <rodo@ximian.com>
-
-	* mail-ops.c (mail_filter_junk): new method, filter folder with
-	FILTER_SOURCE_JUNKTEST type filter
-
-	* em-folder-view.c: added Filter Junk command and junk icons to
-	menus, added apply filters icon to popup menu
-	(emfv_popup_filter_junk): new helper method, calls
-	mail_filter_junk
-
-2004-03-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format-html-display.c (em_format_html_display_search): Don't
-	set our parent window as the efhd, ehfd isn't even a widget.
-
-	Fixes bug #54030
-
-	* em-format-html-display.c (efhd_search_response): Reset the
-	searching tokeniser on Cancel.
-
-	* e-searching-tokenizer.c (e_searching_tokenizer_reset): New
-	function to reset a search tokeniser.
-
-2004-03-05  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #55096.
-
-	* importers/evolution-mbox-importer.c (process_item_fn): hack,
-	unref when complete
-
-	* importers/evolution-outlook-importer.c (outlook_importer_new):
-	init status lock.
-	(process_item_fn): hack, unref ourselves when we're complete.  i
-	think the shell leaks the ref.
-
-2004-03-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-view.c (emfv_popup): If event == NULL, don't try to
-	use event->key.time
-
-	* em-migrate.c (upgrade_vfolder_sources_1_4): New function to
-	upgrade vfolder sources.
-	(em_upgrade_xml_1_4): If the doc is vfolders.xml, upgrade the
-	sources nodes.
-
-2004-03-03  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #53738.
-
-	* mail-ops.c (fetch_mail_fetch): if we've been cancelled, uncancel
-	so syncing can work.  and always sync the folder (with expunge if
-	deleting).
-
-	** See bug #54924.
-
-	* em-utils.c (em_utils_selection_set_urilist): Try to get the drop
-	filename from the message subject, or folder name.
-	(em_utils_empty_trash): kill warning.
-
-	** See bug #54121.
-
-	* mail-component.c (impl_requestCreateItem)
-	(emc_new_folder_response): Hack in a nastish implementation of
-	create folder for the new menu.
-	(impl__get_userCreatableItems): add 'new mail folder' to new
-	button.
-
-2004-03-03  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree-model.c (em_folder_tree_model_set_folder_info):
-	if we have the folder opened already, and its the outbox, then use
-	the total count instead of unread count.  Bit of hack, but copies
-	mail-folder-cache stuff.
-
-	* mail-component.c (mc_add_store): renamed from
-	mail_component_add_store, internal call.  Added a done callback.
-	(mc_add_local_store): renamed from mc_add_store, callback for
-	local store.
-	(mail_component_add_store): call mc_add_store to do the work.
-	(mc_add_local_store_done): ugh, the target of all this shit - note
-	all the default folders now they should be setup.
-
-	* mail-folder-cache.c (mail_note_folder): clean up the logic a
-	bit.  was gonna do osmething else but it didn't work.
-	
-2004-03-02  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (mail_send): if we're already sending, up the
-	again count to tell it we need to re-send again.
-	(receive_done): if we've been asked to run a send again while we
-	were already running it, run it again to make sure we didn't miss
-	any new messages.  See bug #46839.
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): update
-	check_incoming_imap changes for merge conflicts.
-	(settings_changed): i have no idea what these changes jeff did do,
-	but check_incoming_imap is no longer needed, so i've deleted most
-	of it.
-
-2004-02-27  Not Zed  <NotZed@Ximian.com>
-
-	* em-format.c (emf_multipart_encrypted, emf_multipart_signed): If
-	validation fails, display as multipart/mixed rather than unkown
-	attachment type, and make the error a little clearer that its an
-	error.  See #52939.
-
-2004-02-26  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (regen_list_regened): NOOP if the folder has
-	changed.
-
-	* mail-session.c (mail_session_check_junk_notify): remove
-	check_incoming_imap test.
-	(mail_session_init): "
-
-	* evolution-mail.schemas.in.in: Remove check_incoming_imap option.
-
-	* mail-config.glade: Remove check incoming imap checkbox.
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): remove
-	check_incoming_imap test.
-	(em_mailer_prefs_apply): "
-	(settings_changed): "
-
-2004-03-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (emft_tree_button_press): s/||/&&/. Fixes a
-	dumb bug I introduced yesterday.
-
-2004-03-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-selector.c (em_folder_selector_construct): Connect to
-	the folder-activated signal.
-	(folder_activated_cb): Call gtk_dialog_response() with
-	GTK_RESPONSE_OK. Fixes bug #54793.
-
-	* em-folder-tree.c (emft_tree_row_activated): New callback to emit
-	the "folder-activated" signal which is needed to fix bug #54793.
-	(emft_tree_button_press): Handle button1 double-clicks too (also
-	for bug #54793).
-	(emft_tree_button_press): On right-click, we also want to select
-	the folder the user right-clicked on. Fixes bug #54772.
-
-2004-02-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): Fixed some
-	console warnings from my last commit.
-
-	* em-folder-view.c (emfv_setting_notify): If
-	gconf_entry_get_value() returns NULL, then it means the key was
-	unset or something. Don't use g_return_if_fail() for that.
-
-	First of the lockdown fixes...
-
-	* em-composer-prefs.c (em_composer_prefs_construct): Same as
-	below.
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): Respect
-	locked-down keys by disabling their sensitivity to the user.
-	(settings_changed): Don't re-enable check_incoming_imap if the key
-	is locked.
-
-2004-02-26  Rodney Dawes  <dobey@ximian.com>
-
-	* em-format-html-display.c (efhd_attachment_button): Create the
-	arrows in these widgets as GTK_SHADOW_NONE, since the default arrow
-	type in GTK+ 2.x is flat triangle arrows, and shadow types are
-	generally ignored for arrows anyway, and so we don't look ugly with
-	themes that handle shadow types on arrows correctly
-
-2004-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #54352
-
-	* em-message-browser.c (emmb_class_init): Set update_message_style
-	to FALSE.
-
-	* em-folder-view.c (emfv_setting_notify): Only update message
-	display style if our subclass wants us to.
-	(emfv_class_init): Set update_message_style to TRUE.
-	(emfv_view_mode): Don't save the gconf key unless our class allows
-	us to.
-
-2004-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-utils.c (em_utils_folder_name_from_uri): Make sure url->path
-	is non-NULL before setting folder_name to url->path + 1. Could
-	possibly fix bug #54853.
-
-2004-02-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format-html-display.c (efhd_attachment_button): Protect
-	against using NULL pixbufs. Gets rid of a lot of console warning
-	spewage on my system.
-
-	* em-folder-view.c (emfv_list_key_press): Removed Delete/KP_Delete
-	from here. Now handled via the bonobo-ui menu accels. Fixes bug #53504.
-
-2004-02-25  Radek Doulik  <rodo@ximian.com>
-
-	* mail-session.c (main_get_filter_driver): set seen flag for junk
-	messages
-
-	* em-folder-view.c (emfv_popup_mark_junk): do not set DELETED
-
-2004-02-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (construct): Removed Apply button. As
-	discussed on IRC, UI doesn't feel we should have an Apply button
-	here.
-
-2004-02-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (construct): Need to listen for changes to
-	S/MIME options, the signature option menu, and any extra
-	provider-specific config options. Fixes bug #54036.
-
-	* em-folder-view.c (emfv_popup_mark_junk): Set the SEEN flag as
-	well.
-	(emfv_list_key_press): Removed the skip-to-next-message logic as
-	this was already being handled in emfv_popup_delete(). Fixes bug
-	#54471.
-	(emfv_enable_menus): Re-enable MessageDelete here. Fixes bug
-	#54770.
-
-	* em-utils.c (em_utils_folder_is_drafts): Use the new
-	camel_store_folder_uri_equal() function.
-	(em_utils_folder_is_sent): Same.
-
-2004-02-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #54057
-
-	* em-utils.c (em_utils_folder_is_sent): Use provider->url_equal()
-	rather than camel_store_uri_cmp() since that function did not do
-	anything close to what it claimed to do. Also use
-	em_uri_to_camel() here on the account sent_folder_uri.
-	(em_utils_folder_is_drafts): Same.
-
-2004-02-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-message-browser.c (emmb_list_message_selected): Protect
-	against NULL uids.
-	(emmb_set_message): Same.
-
-	* em-format-quote.c (emfq_format_message): Print the headers when
-	forwarding inline/quoted. Fixes bug #53916.
-
-	* em-folder-tree.c (tree_drag_motion): We want UID_LISTs to drop
-	with the MOVE action by default. Fixes a common complaint from
-	IRC.
-
-2004-02-23  Not Zed  <NotZed@Ximian.com>
-
-	* em-format.c (emf_multipart_signed): check mps->protocol != NULL
-	before dereferencing it.  See #54406.
-
-2004-02-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-view.c (emfv_list_key_press): Delete key should always
-	delete, never undelete (bug #53215). Also fixes a bug where
-	uids->len was being accessed after uids had been free'd.
-
-	Fix for bug #53997
-
-	* em-folder-view.c (emfv_list_message_selected): Ref the emfv
-	before spawning the async event.
-	(emfv_list_done_message_selected): Check emfv->preview !=
-	NULL. Also unref the emfv when done.
-
-2004-02-20  Dan Winship  <danw@ximian.com>
-
-	* mail-component.c (set_prop): Remove the debug message here.
-
-2004-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vfolder.c (mail_vfolder_add_uri): fix for vfolder-rule api
-	changes.
-
-	* mail-folder-cache.c (unset_folder_info, setup_folder)
-	(rename_folders): switch the sense of the no select checks.  TEST!
-
-2004-02-19  Chris Toshok  <toshok@ximian.com>
-
-	* em-format.c (emf_application_xpkcs7mime): wrap code with
-	ENABLE_SMIME instead of HAVE_NSS.
-	(emf_multipart_signed): same.
-	(type_builtin_table): same.
-
-2004-02-19  Rodney Dawes  <dobey@ximian.com>
-
-	* em-folder-tree.c (emft_save_state): Revert previous change, doh
-
-2004-02-19  Rodney Dawes  <dobey@ximian.com>
-
-	* em-folder-tree.c (emft_save_state): Don't set the timeout id to 0
-	and then immediately return FALSE, which tries to remove the timeout
-
-2004-02-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (get_receive_type): 
-	* mail-config.c (mail_config_get_account_by_source_url) 
-	(mail_config_get_account_by_transport_url): 
-	* mail-component.c (mail_component_load_store_by_uri): 
-	* mail-account-gui.c (mail_account_gui_setup) 
-	(mail_account_gui_save): 
-	* em-utils.c (em_utils_empty_trash, em_uri_from_camel): 
-	* em-folder-tree-model.c (account_changed):
-	* em-folder-selector.c (em_folder_selector_get_selected_uri): fix
-	camel provider api changes.
-
-2004-02-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-composer-prefs.c (sig_fill_list): Changed the name to not
-	imply we are working with a GtkCList widget (since we are using a
-	GtkTreeView).
-
-	* em-folder-tree.c (emft_tree_button_press): Pass flags to
-	em_popup_target_new_folder() instead of just an isstore arg.
-	(emft_tree_button_press): Fake the fi flags for vTrash/vJunk so
-	that em-popup.c can disable the delete flag for these.
-
-	* em-popup.c (em_popup_target_new_folder): Instead of taking an
-	isstore argument, take a flags argument so that our caller can
-	give us hints about the selected folder/store. Also fixed a logic
-	bug from my previous commit.
-
-2004-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (emft_tree_button_press): Updated for em-popup
-	API change (altho currently passes a dummy value).
-
-	* em-popup.c (em_popup_target_new_folder): Check for vTrash/vJunk
-	by checking the CAMEL_FOLDER_VIRTUAL info flags bit. (perhaps this
-	flag should be renamed to SPECIAL? VIRTUAL might not have been a
-	good name). Also changed to check flags & CAMEL_FOLDER_NOSELECT
-	rather than checking the uri string for a noselect param.
-
-	* mail-folder-cache.c (unset_folder_info): Instead of checking for
-	";noselect" in the uri, check for a CAMEL_FOLDER_NOSELECT flag on
-	mfi->flags.
-	(setup_folder): Copy the fi->flags to mfi->flags here.
-	(rename_folders): Same.
-	(setup_folder): Check fi->flags for CAMEL_FOLDER_NOSELECT here
-	instead.
-	(rename_folders): Same. Also gets rid of a FIXME.
-
-2004-02-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format-html-display.c (efhd_xpkcs7mime_validity_clicked):
-	Revert change from yesterday.
-	(efhd_xpkcs7mime_button): Use the icon from the table.
-
-2004-02-18  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #54492.
-	
-	* em-folder-tree.c (emft_popup_copy_folder_selected): check the
-	store flags, not the fragment presence to find out if we use the
-	fragment as the path.
-
-2004-02-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #54060 (except for the "don't let users copy/move
-	messages to Outbox" bit).
-
-	* em-folder-tree.c (emft_drop_target): Rearranged a little. We can
-	check for special dest folders right away. Also added a check for
-	the default local folders (Drafts/Inbox/Outbox/Sent) since we
-	don't want to be able to move them anywhere else (copying is ok).
-	(emft_popup_copy_folder_selected): Don't allow moving any of the
-	default local folders to be consistant with drag&drop changes.
-	(emft_popup_rename_folder): Don't allow the user to rename a
-	default local folder.
-	(emft_popup_delete_folder): Don't allow deletion of special local
-	folders.
-
-	* mail-component.c (mail_component_peek_local_store): New function
-	to peek the local store.
-
-2004-02-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format-html-display.c (efhd_xpkcs7mime_validity_clicked):
-	Display an alternate description based on the trust value if we
-	have a trust to work with.
-
-	* em-folder-browser.c (emfb_hide_deleted): Set the hide_deleted
-	bool on EMFolderView.
-
-	* em-folder-view.c (emfv_popup_delete): Fix Sarfraaz Ahmed's fix
-	to only jump to the previous message if hide_deleted is
-	set. Otherwise his fix gets extremely irritating.
-	(emfv_list_key_press): Same.
-
-2004-02-17  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #53914.
-
-	* em-utils.c (guess_account): do some extra checks, message
-	source, and source folder.
-	(guess_account_folder): helper to guess account based on folder.
-
-	** See bug #54200.
-
-	* em-popup.c (em_popup_target_new_select): add
-	EM_POPUP_SELECT_FOLDER - to find out if we have a folder at
-	all.  Handle getting a NULL folder passed in.
-
-	* em-folder-view.c (em_folder_view_get_popup_target): Added
-	EM_FOLDER_VIEW_SELECT_FOLDER - to detect when we dont have a
-	folder set on the emfolderview.
-
-	* em-folder-browser.c (emfb_mark_all_read): if we don't have a
-	folder, dont try and run.
-	(emfb_enable_map[]): Disable a bunch of stuff we have no
-	folder set.
-
-	* importers/pine-importer.c (import_contact): fix for the
-	weird-arsed e-contact list api.  and fix a small memleak.
-
-2004-02-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (emft_drop_folder): Make sure the drop-target
-	folder doesn't already contain a folder named identical to the one
-	we are dropping by using the new CAMEL_STORE_FOLDER_EXCL
-	flag. Fixes bug #53810.
-
-2004-02-13  Radek Doulik  <rodo@ximian.com>
-
-	* evolution-mail.schemas.in.in: added defaults for composer
-	width/height
-
-2004-02-13  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* em-folder-view.c (emfv_popup_delete): added the code to get
-	the previous mail in a list, if get_next_mail fails. This is a
-	fix for #54195
-	(emfv_list_key_press): Same as above
-
-2004-02-13  Not Zed  <NotZed@Ximian.com>
-
-	* importers/netscape-importer.c: use mail-importer to import the
-	mail tree, fix the account stuff to talk directly to mail config.
-	Added cancel button.  etc.  This is completely untested apart from
-	compiling with no warnings.
-
-	* importers/mail-importer.c (import_mbox_import): dont re-use the
-	exception for syncing.
-
-	* importers/evolution-outlook-importer.c: major reworking.  Some
-	platform fixes, runs in another thread, simpler/cleaner main loop.
-	This is completely untested apart from compiling with no warnings.
-
-	* importers/evolution-mbox-importer.c (support_format_fn): we dont
-	want to check the From_ line case insensitive!
-	(create_control_fn): implement this weird api.
-
-2004-02-12  Not Zed  <NotZed@Ximian.com>
-
-	* importers/elm-importer.c: rewrote all importing stuff.
-
-	* importers/mail-importer.c (mail_importer_import_folders_sync):
-	split out into a recursive function & entry.  Now handles mozilla
-	format stuff with a flag.
-	(import_mbox_import): made the cameloperation properly
-	save/restore multiple registrations.
-
-2004-02-12  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c (pipe_to_sa_with_error): use
-	g_find_program_in_path to avoid fork in case program is not
-	available
-
-2004-02-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-component.c (mail_control_new): Disable the
-	bonobo-ui-component statusbar when using the EMFolderBrowser
-	outside of the mail component. This prevents the Connector
-	component from having 2 status bars.
-
-	* em-popup.c: #include <libgnomevfs/gnome-vfs-mime.h>
-	(em_popup_create_menu): Wrap item->label with _() so
-	that the strings get translated properly.
-
-2004-02-11  Christian Neumair  <chris@gnome-de.org>
-
-	* em-folder-tree-model.c (sort_cb): "On this Computer" -> "On This
-	Computer".
-
-	* mail-component.c (mc_setup_local_store): Ditto.
-
-2004-02-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format-html-print.c: Same.
-
-	* em-junk-filter.c: #include <config.h>
-
-	* em-popup.c: Add license & config.h
-
-2004-02-11  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c (em_junk_sa_test_spamd): if spamc is not
-	available, try /usr/sbin/spamc
-
-2004-02-10  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c (em_junk_sa_test_spamd): try to check if system
-	wide spamd has --local parameter set according to our setting
-	(em_junk_sa_test_spamd): in case we were unable to start our own
-	spamd, try to run it from /usr/sbin before giving up
-
-2004-02-11  Not Zed  <NotZed@Ximian.com>
-
-	* importers/mail-importer.c (mail_importer_import_folders_sync):
-	call the right recursive function, oops.
-
-	* importers/mail-importer.h: don't include camel-operation.h, but
-	fix up the forward decl usage.
-
-2004-02-11  JP Rosevear <jpr@ximian.com>
-
-	* importers/mail-importer.h: include camel-operation.h
-
-2004-02-11  Not Zed  <NotZed@Ximian.com>
-
-	* importers/pine-importer.c: Basically rewrote this, the import
-	tasks run in another thread.  It tells you more about what's going
-	on, and its cancellable.
-	(pine_store_settings): changed the meaning of the settings
-	slightly, if set it means we've processed them already.
-
-	* mail-component-factory.c (factory): hook in importer factory
-	callback.
-
-2004-02-10  Not Zed  <NotZed@Ximian.com>
-
-	* importers/*-importer.c: removed module init, just provide a new
-	method.  Updates for api changes.
-
-	* Makefile.am: link mail importers in directly.
-
-	* mail-importer.c: changed to do stuff in-memory with linked
-	stuff, moved to importers/.
-
-	* importers/GNOME_Evolution_Mail_Importers.server.in.in: merge all
-	importer .server info's here, point them all to the mailer
-	factory.  Removed the others.
-
-	* importers/Makefile.am: remove Mailer.idl stuff.  Move all
-	importers to a single library.
-
-2004-02-09  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree.c (tree_drag_data_delete): merged in code from
-	em_folder_tree_model_drag_data_delete.
-	(tree_drag_data_get): similar.
-	(tree_drag_data_received): similar.
-	(drag_text_uri_list): removed, use em_utils_selection_set_urilist
-	in tree_drag_data_get instead.
-	(em_folder_tree_enable_drag_and_drop): merged in
-	em_folder_tree_model_set_drag_drop_types.
-	(tree_drag_motion): merge in drop_possible, handle qualifiers, and
-	return the right type.
-	(em_folder_tree_model_row_drop_target): rename to
-	emft_drop_target, and make private.  Beefed up substantially,
-	handles illogical drops, dropping on to special folders and
-	properly handling vfolder uri's (at least within the same tree
-	instance).
-
-	* em-folder-tree-model.c: Moved all of the DND stuff to
-	em-folder-tree, where it belongs, made it all static.  Should
-	allow for some sharing of code too.
-
-	* em-format-quote.c (emfq_format_message): just print the \n after
-	the credits in the same printf, rather than adding an else.  Add a
-	<br> too, otherwise it has no effect.
-
-2004-02-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format-html.c (efh_format_headers): Make private (only
-	EMFormatHTMLQuote used it and that class is no longer in use).
-	(efh_format_message): Updated for above change.
-
-	* em-format-quote.c (emfq_format_message): Always write a \n after
-	the credits line.
-
-	* em-subscribe-editor.c (sub_folderinfo_get): Set the NO_VIRTUAL
-	flag bit for get_folder_info(). Fixes bug #51887.
-
-2004-02-06  Radek Doulik  <rodo@ximian.com>
-
-	* em-folder-view.c (emfv_popup_mark_nojunk): move to the next
-	message after mark not junk as well
-
-	* em-junk-filter.c (em_junk_sa_test_spamd): split into
-	spamassassin and spamd tests
-	(em_junk_sa_is_available): test spamd only if spamd usage enabled
-	(pipe_to_sa_with_error): extended pipe_to_sa, last added parametr
-	specifies return value if an error occured
-	(em_junk_sa_check_junk): don't use /bin/sh -c when running
-	spamassassin, it's not needed and we need to avoid getting 126,127
-	exit codes from the shell
-	(em_junk_sa_check_junk): pass 0 rv_err to pipe_to_sa_with_error to
-	avoid false positives in case someone removes/uninstalls SA while
-	evolution runs
-
-2004-02-06  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #53258.
-
-	* em-format-html-display.c (efhd_find_handler): force any bonobo
-	handler types to always be inline, even attachments.
-
-	* em-format.c (em_format_is_inline): use handler flags for special
-	cases, removing all hard-coded types.
-
-	* em-format.h (EMFormatHandler): add a flags field, so far a flag
-	to set default inline viewing of the content.
-
-2004-02-06  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-properties.c: include string.h to kill warning.
-
-	** See bug #53627.
-	
-	* em-folder-view.c (emfv_popup_mark_junk): changed to work like
-	delete does, jumping to the next message if required, and marking
-	things immediately, then queuing up the junk marking job if
-	required.
-
-	* mail-ops.c (mail_mark_junk): ugh, this stuff totally can't go
-	accessing messagelist from another thread!!!!  Changed so this
-	code only does the junk reporting, not setting flags.  UGH!  It
-	should be doing this implictly on the folder when you set the
-	flags, or at least when you sync the folder!!!  Changed ot use the
-	queued thread.
-
-	* message-list.c (find_next_undeleted): changed to find
-	next-unhidden, i.e. junk as well as deleted, if we're in
-	hide-deleted mode.
-	(build_tree): always call find_next_undeleted if we have a cursor.
-	(build_flat): same.
-
-2004-02-05  Rodney Dawes  <dobey@ximian.com>
-
-	* em-message-browser.c (emmb_list_message_selected): Grab focus on
-	the HTML widget when we display
-
-	Fixes #52942
-
-2004-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-message-browser.c (emmb_list_message_selected): Set the new
-	title.
-	(em_message_browser_window_new): Connect to the message_selected
-	signal in the message-list widget. Fixes bug #52232.
-
-	* em-folder-tree-model.c (em_folder_tree_model_row_drop_target):
-	Now takes a GdkContext arg... will need this later when we want to
-	re-enable dnd of vfolders.
-
-	* em-folder-browser.c (emfb_set_folder): Always set the
-	search_state, even if it is NULL (NULL means default/unset state).
-
-	* em-folder-view.c (emfv_mail_next_flagged): Pass TRUE as
-	wraparound (to both be consistant with prev_flagged and to fix bug
-	#48681.
-
-2004-02-05  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree.c (emft_copy_folders__copy): sync the from folder
-	if we're going to delete it, otherwise we can't because its not
-	empty.  See #53815.
-
-2004-02-05  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree-model.c
-	(em_folder_tree_model_drag_data_received): hmm, another well
-	tested bit of code ... if you launch another thread you gotta copy
-	the selection since it wont hang around until we're done with it.
-	So copy/parse the selection data into appropriate structures.
-	(drop_folder): just take the async message as an argument, rather
-	than copying half of it to the stack.
-	(drop_text_uri_list, drop_uid_list): replace most args with the
-	thread message.
-	(drop_message_rfc822): removed, now trivial.
-	(emftm_drag_data_received_async__drop): change for changed args,
-	and fix a memleak.
-	(emftm_drag_data_received_async__free): fixed for changed
-	structure.
-
-	* em-folder-tree.c (em_folder_tree_create_folder): call abort
-	before we unref, aid debugging if we hit it.
-
-	* mail-vfolder.c (uri_is_spethal): check for vfolder/vtrash
-	folders.  Based on name check and store options.
-
-2004-02-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree-model.c (em_folder_tree_model_row_drop_target):
-	Don't allow dropping into a vfolder (store). Fixes bug #53757.
-
-2004-02-04  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #53683.
-
-	* mail-ops.c (mail_sync_store): new async op to call
-	CamelStore::sync.
-
-	* mail-component.c (impl_requestQuit): implement, check to see if
-	we can quit, or have open or unsent messages (and are in online
-	mode).
-	(impl_quit): implement.  Trigger off a sync of all open stores,
-	and return FALSE until its done.
-	(impl_upgradeFromVersion): fixed the signature to match the idl,
-	killed that warning at last.
-
-	** See bug #53832.
-
-	* em-folder-browser.c (emfb_folder_properties): only show this if
-	we have a uri set.  Strictly, the menu item shouldn't be
-	activated.
-
-	** See bug #53131.
-	
-	* em-folder-browser.c (em_folder_browser_show_preview): copy the
-	message list's cursor_uid before calling set_message, since it can
-	get freed during setting the message.
-
-2004-02-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (tree_drag_data_received): Modified
-	slightly. The model now calls gtk_drag_finish() for us when it is
-	done.
-
-	* em-folder-tree-model.c
-	(em_folder_tree_model_drag_data_received): Make this perform camel
-	operations in another thread so we don't block.
-	(em_folder_tree_model_drag_data_get): Updated args to be
-	consistant with drag_data_received.
-
-2004-02-03  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c: handle the sa prefs here, have own gconf
-	client with sa dir added
-
-	* mail-session.c: removed sa prefs
-
-2004-02-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #52941
-
-	* em-message-browser.c (em_message_browser_window_new): Set window
-	size based on previous size; load from gconf if necessary.
-	(window_size_allocate): Save window size changes.
-
-2004-02-02  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #53549.
-
-	* em-folder-selector.c: Fix handling a parent path of "/".
-
-	* mail-ops.c (mark_junk_mark): removed the really innacurate cut and
-	paste comment.  This has nothing to do with filter_folder.
-
-	** See bug #52994.
-
-	* em-folder-properties.c (em_folder_properties_show): redirect
-	vFolder uri's to the vFolder editor.
-
-	** See bug #53502.
-
-	* em-folder-browser.c (emfb_folder_properties): implement.
-
-	* em-folder-tree.c (emft_popup_properties): fixed for change
-	below.
-
-	* em-folder-properties.[ch]: Moved the folder properties window
-	from em-folder-tree.c to its own file.
-
-2004-02-02  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #53559.
-
-	* em-folder-tree.c (folder_tree_new): set CAN_FOCUS flag on the
-	folder tree content widget.
-
-	* em-folder-selector.c (em_folder_selector_construct): Don't wrap
-	the folder tree in a scrolled window.  Its already in one ????.
-	(em_folder_selector_construct): dont set can_focus on the folder
-	tree.
-
-2004-02-01  Bill Zhu <bill.zhu@sun.com>
-
-	Fixes for bug #53530
-
-	* em-utils.c (em_utils_redirect_message): Removed the duplicate 
-	adding of attachments
-
-2004-01-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes for bug #53348
-
-	* mail-account-gui.c (mail_account_gui_save): Only add the new
-	store to the mail-component if the mail-component doesn't already
-	know about it (ie. only if we are adding a new account).
-
-	* em-folder-tree-model.c (em_folder_tree_model_add_store): Hash
-	our store-info based on account here.
-	(em_folder_tree_model_init): Listen for
-	account_changed/account_removed signals.
-	(em_folder_tree_model_finalize): Disconnect above handlers.
-	(account_changed): Tear down the account store node and replace it
-	with the new store (assuming it belongs in the tree after the
-	changes).
-	(account_removed): Remove the account store from the tree.
-
-2004-01-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (emft_tree_row_expanded): Get recursive folder
-	listing (needed or folders that have as-of-yet-unloaded-subfolders
-	that contain unread mail will not be bolded). Fixes bug #51045.
-
-	Fix for bug #53195.
-
-	* em-folder-browser.c (emfb_set_folder): Restore search_state.
-	(emfb_search_search_activated): Save search_state.
-
-2004-01-30  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #53549, partial fix.
-
-	* em-folder-selector.c (emfs_create_name_activate): only emit the
-	ok response if the ok button would be active (i.e. entered a valid
-	path).
-
-	** See bug #52992.
-
-	* message-list.c (message_list_hide_clear): save the hide state
-	after its been cleared, so any popup windows inherit it.
-	(message_list_hide_uids): same.
-
-	** See bug #53123.
-
-	* em-folder-tree-model.c (drop_folder): changed to take store and
-	dest folder as arg, to handle the case of the parent folder being
-	"" properly.
-	(em_folder_tree_model_drag_data_received): special case dropping a
-	folder, and don't allow dropping to "" for any other types.
-
-2004-01-30  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #53558 (plus other fixes/cleanups)
-
-	* em-format.c (emf_format_secure): default implementation, handle
-	output of inner part, but dont output any sign/encrypt info.
-	(emf_multipart_signed, emf_multipart_encrypted): replaced with
-	implementations from em-format-html.c, which now call
-	em_format_format_secure to output guts.
-	(emf_class_init): hook-up virtual method format_secure.
-
-	* em-format.[ch]: add a virtual method for outputing secured
-	parts.  Moved all validity stuff from em-format-html.[ch] to here.
-
-	* mail-component.c (impl_createControls): set the session
-	interactive too.
-
-	* em-format-html-display.c: make smime stuff dependent on
-	HAVE_NSS.
-	(efhd_multipart_signed, efhd_application_xpkcs7mime): removed, now
-	handled by root class.
-	(efhd_output_secure): renamed to efhd_format_secure, and use
-	EMFormat::format_secure to kick off.
-	(efhd_class_init): setup format_secure virtual method.
-
-	* em-format-html.c (efh_multipart_encrypted): We need to handle
-	this here so we can properly keep track of the ciphervalidity
-	stuff.  Also do it directly using the context, not
-	multipartencrypted part.
-	(efh_multipart_signed): with unsupported signature format, format
-	as multipart/mixed, not as an attachment.
-	(efh_multipart_signed): make the smime stuff optional.
-	(efh_multipart_signed, efh_multipart_encrypted): Moved to
-	em-format.c.
-	(efh_application_xpkcs7mime): moved to em-format.c
-	(efh_output_secure): renamed to efh_format_secure, linked into
-	virtual method.  call parent class to do the validation foo then
-	output the info if needed.
-	(efh_format_message): fixed access to validity stuff to parent
-	object.
-	(efh_class_init): hook up format_secure virtual method.
-	(*): removed some now-unused headers.
-
-2004-01-29  Nicel KM  <mnicel@novell.com>
-
-	* mail-component.c: removed CAMEL_PROVIDER_IS_EXTERNAL check
-	* mail-account-gui.c: likewise
-	* mail-offline-handler.c: likewise	
-
-2004-01-29  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html-display.c (efhd_attachment_button): check the
-	snooped type for the icon/etc.
-	(efhd_format_attachment): save the snooped type in the
-	attach_puri.
-
-	* em-format-html.c (efh_text_plain): If we had a snooped type, use
-	that as the base type, rather than octet-stream, which will cause
-	an attachment in attachment loop.
-
-	* em-format.c (em_format_part_as): save the current snooped mime
-	type in a stack if we had any.
-
-2004-01-29  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #53320 and probably others
-
-	* message-list.c (message_list_set_folder): NULL out
-	message_list->folder when we clear it so it isn't left for another
-	free when we switch again.
-
-2004-01-29  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #52190.
-
-	* message-list.c: Added folder/folder uri to the data stored for
-	primary/secondary selection, uses a struct to store the data now.
-	This is needed so when you cut/copy messages, and paste them, it
-	doesn't end up 'pasting' the messages from the current folder, but
-	from the one where the copy/cut took place.
-	(clear_selection): helper to free data inside selection struct.
-
-2004-01-29  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #53506.
-
-	* mail-tools.c (mail_tools_folder_to_url): use a camelurl to do
-	this properly, and handle fragment folder-paths.
-
-	* em-composer-utils.c (em_utils_composer_send_cb): removed
-	outbox_folder local, not necessary.
-
-2004-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree-model.c (em_folder_tree_model_add_store): If the
-	store is already in the model, remove it and then re-add it. Fixes
-	bug #53422.
-
-2004-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	And thus completes the fixes for bug #52766.
-
-	* em-folder-tree.c (tree_drag_drop): Don't call
-	gtk_drag_get_data() manually here or we end up getting 2
-	drag-data-received callbacks which is Not Good (tm).
-
-	* em-folder-tree-model.c (drop_folder): Now takes a moved argument
-	to specify whether or not the contents were moved (the move
-	argument is just a hint).
-	(drop_uid_list): Same.
-	(em_folder_tree_model_drag_data_received): Updated for the above
-	api changes.
-
-2004-01-28  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #53179
-
-	* mail-tools.c (mail_tool_get_local_movemail_path): Fix the
-	movemail path.
-
-	* mail-component.c (load_accounts): hack alert!
-	* mail-send-recv.c (get_receive_type): hack alert!  hardcode mbox:
-	to be a movemail source.
-
-2004-01-28  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (setup_send_data): ref folder from
-	mail_component_get_folder.
-
-	* mail-ops.c (fetch_mail_fetch): ref the folder we get from
-	mail_component_get_folder since it doesn't ref it.
-
-2004-01-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (cp): Removed unneeded debug printfs.
-
-	* em-folder-tree.c (tree_drag_data_received): Use
-	gtk_tree_view_get_dest_row_at_pos() instead of
-	gtk_tree_view_get_path_at_pos() since this is what Nautilus
-	uses. Unfortunately, it still gives us back the wrong GtkTreePath
-	so it looks to me like Gtk+ is borked. Apparently you need the
-	latest and greatest gtk+-2.3.x cvs snapshot for this to work.
-
-	* em-migrate.c (em_migrate_imap_caches_1_4): Copy the imap cache
-	into the right place. Duh.
-
-2004-01-27  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #53084 and others.
-	
-	* em-migrate.c (em_migrate): remove the vfolder_revert hack.
-
-	* em-composer-utils.c (ask_confirm_for_only_bcc): removed unused
-	vars.
-
-	* mail-tools.c (mail_tool_get_local_inbox): removed, handled by
-	mail_component_get_folder now.
-
-	* mail-component.c (mail_component_*): Changed the api slightly.
-	Using NULL as the component argument automatically implies you
-	want the default component.
-	(em_uri_from_camel, em_uri_to_camel): moved to em-utils.[ch].  Ok
-	so it isn't namespaced right ... *shrug*.
-	(mail_component_get_local_inbox): removed.
-	(mail_component_get_folder): single entry point for getting
-	standard folders.  This is MT-Safe.
-	(mail_component_get_folder_uri): single entry point for getting
-	standard folder uri's.  This is MT-Safe.
-	(add_store): removed, moved to mail_component_add_store.
-	(mail_component_load_store_by_uri): call mail_component_add_store
-	directly rather than copying its code.
-	(default_*_folder*): Removed, use accessor methods instead, fixed
-	all callers.
-	(setup_local_store): renamed to mc_setup_local_store, use proper
-	url encoding too.  make run-once and thread-safe.
-	(MailComponentPrivate): Added a lock.
-	(mail_control_new): exported properly to kill warnings.
-	(mail_component_init): dont setup_local_store or add accounts
-	here.
-	(impl_createControls): setup local store/accounts here.
-	(mail_component_peek): dont setup vfolder storage here.
-	(mc_startup): internal function to startup stuff needed for gui
-	operation.
-	(setup_search_context): make run-once.
-	(mail_component_peek_search_context): call setup_search_context
-	incase it isn't setup yet.
-	(impl_upgradeFromVersion): remove the local store setup hack.
-
-2004-01-27  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree-model.c (folder_renamed): fix the parent-finding
-	logic.
-
-2004-01-23  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (mail_component_init): add the offline handler
-	interface to the component.
-	(store_go_online, go_online): removed, handled by the offline
-	handler.
-
-	* mail-offline-handler.c (store_go_online): add the store to the
-	tree model when we go online.
-
-2004-01-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes for bug #53251.
-
-	* mail-account-gui.c (mail_account_gui_new): Convert the account
-	drafts/sent folder uris to camel uris.
-	(mail_account_gui_save): Convert drafts/sent camel uris into
-	mailer uris when setting them on the account. Also, don't compare
-	against file: anymore since those uris don't exist anymore.
-
-	* em-migrate.c (em_upgrade_accounts_1_4): Update the drafts/sent
-	folder uris.
-
-2004-01-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (tree_drag_begin): Set priv->drag_row.
-
-2004-01-26 Aaron Weber <aaron@ximian.com>
-
-	* mail/default/C/Inbox: edited default message
-
-2004-01-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (emft_copy_folders__copy): Use FOLDER_INFO_FAST
-	bitflag here, since we don't care about unread counts when copying
-	folders around.
-	(emft_popup_delete_folders): Same.
-	(emft_tree_row_expanded): Don't use FOLDER_INFO_FAST here.
-
-2004-01-26  Radek Doulik  <rodo@ximian.com>
-
-	* mail-session.c (main_get_filter_driver): translate DEMAND to
-	INCOMING to get the right rules
-
-	* mail-ops.c (mail_filter_on_demand): use FILTER_SOURCE_DEMAND
-
-	Fixes #53266
-
-2004-01-25  Rodney Dawes  <dobey@ximian.com>
-
-	* em-folder-selector.c (em_folder_selector_create_new): Cast the
-	name entry to a GtkWidget to avoid a compiler warning
-	* em-folder-tree.c (emft_popup_new_folder): Grab focus on the name
-	entry when we show the dialog (#53089)
-
-	Fixes #53089
-
-2004-01-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree-model.c (em_folder_tree_model_get_type): Removed
-	the drag & drop interfaces, apparently these aren't good enough
-	for what we need. Gotta implement this all the Hard Way (tm).
-	(em_folder_tree_model_drag_data_received): Helper function called
-	by the drag_data_received signal callback in em-folder-tree.c
-	(em_folder_tree_model_row_drop_possible): Same idea.
-	(em_folder_tree_model_row_drop_target): Again.
-	(em_folder_tree_model_row_draggable): You get the idea...
-	(em_folder_tree_model_drag_data_get): And again.
-	(em_folder_tree_model_drag_data_delete): Same.
-	(em_folder_tree_model_set_drag_drop_types): Setup the drag & drop
-	types on the widget (since the target drag & drop types are now
-	internal to the model code rathr than the tree code).
-
-	* em-folder-tree.c (em_folder_tree_enable_drag_and_drop):
-	Rewritten. Connect to all the drag & drop signals and implemnent
-	them.
-
-2004-01-23  Larry Ewing  <lewing@ximian.com>
-
-	* mail-component-factory.c (factory): add the control id to the
-	factory.
-
-2004-01-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (upgrade_xml_uris_1_4): Handle where the file: url
-	is roken (ie, points to a location out of the evolution
-	namespace).
-
-2004-01-23  Rodney Dawes  <dobey@ximian.com>
-
-	* em-folder-selector.c: Set the mnemonic widget for "Folder _name:"
-
-	Fixes #53088
-
-2004-01-23  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c: use mail_session_get_sa_daemon_port
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): added
-	check_incoming_imap
-	(em_mailer_prefs_apply): ditto
-	(settings_changed): set check_incoming_imap sensitivity by
-	check_incoming state
-
-	* mail-session.c: add sa_daemon_port
-	(mail_session_init): init sa_daemon_port and check_junk_for_imap
-	(mail_session_check_junk_notify): watch for sa_daemon_port and
-	check_junk_for_imap
-	(mail_session_get_sa_daemon_port): new wrapper
-	(mail_session_set_sa_daemon_port): ditto
-
-2004-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-junk-filter.c (em_junk_sa_test_spamd): Oops, when calling
-	spamassassin rather than spamc, we need to invoke /bin/sh -c
-	since spamassassin is a shell script.
-	(em_junk_sa_check_junk): Same.
-
-	Fixes bug #53175.
-
-	* em-junk-filter.c (pipe_to_sa): Don't need an argc (we don't even
-	seem to use it??).
-	(em_junk_sa_test_spamd_running): Don't invoke /bin/sh.
-	(em_junk_sa_test_spamd): Simplified, also don't invoke /bin/sh.
-	(em_junk_sa_check_junk): Cleaned up/simplified. Also don't invoke
-	/bin/sh.
-	(em_junk_sa_report_junk): Same.
-	(em_junk_sa_report_notjunk): Same.
-	(em_junk_sa_commit_reports): Same.
-
-2004-01-22 Gary Ekker <gekker@novell.com>
-
-	** See bug #53051
-	
-	* em-subscribe-editor.c (subscribe_set_store): fix typo in label
-
-2004-01-22  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c (em_junk_sa_test_spamd): uncomment system wide
-	spamd test
-
-2004-01-20  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c: lock report calls by em_junk_sa_report_lock
-	mutex
-
-2004-01-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (em_migrate_1_4): Migrate the ETree expanded state
-	files as well as the GalView files.
-
-	* message-list.c: s/hide_save_state/save_hide_state/g and
-	s/hide_load_state/load_hide_state/g to be more consistant with the
-	other state saving function names.
-
-2004-01-21  Not Zed  <NotZed@Ximian.com>
-
-	* em-migrate.c (cp_r): use camel_mkdir(0777) rather than 0777 &
-	st.st_mode which isn't set anyway.
-	(cp): use simple 0666 for the mode open, and then chmod after.
-	(cp): check the return code of close, not just fsync.
-	(cp): dont use fd[0] and fd[1] when we really just want simple
-	variables, rename to readfd and writefd.
-
-	** See bug #53159.
-
-	* em-format.c (emf_message_rfc822): removed incorrect comment,
-	this is not a fallback.
-
-	* em-format-html.c (efh_text_plain): check the content-type of the
-	containee object, not the holder.
-
-	** See bug #52979.
-
-	* em-format-html.c: take out text/x-patch and put in text/* for a
-	text/plain fallback handler instead.
-
-	* em-format-html-display.c (efhd_find_handler): allow the bonobo
-	handlers to override the builtin ones.
-
-2004-01-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (em_migrate_imap_caches_1_4): New function to
-	migrate the imap cache.
-	(em_migrate_1_4): Migrate the IMAP cache. Fixes bug #52985.
-	(em_migrate_1_4): Copy over the searches.xml file. Fixes bug
-	#52980.
-
-	* mail-session.c (request_password): Changed the logic of the
-	visibility of the passwd text so that we hid ethe passwd if the
-	flags have the SECRET bit set.
-
-2004-01-20  Not Zed  <NotZed@Ximian.com>
-
-	** See Bug #52817.
-	
-	* mail-session.c (request_password, do_get_pass, get_password):
-	Fix for api changes to camel_session_get_password.
-	(request_password): if we have a STATIC password, don't show any
-	'remember' checkbox.
-
-2004-01-20  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (EMFolderView): Make displayed_uid public.
-
-	* em-folder-browser.c (em_folder_browser_show_preview): use
-	em_folder_view_set_message rather than message_list_select_uid.
-	When clearing, clear view->displayed_uid too.
-
-2004-01-20  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #52965.
-
-	* mail-component.c (mail_component_init): removed an epfixme, it
-	already is an object.
-	(impl_upgradeFromVersion): call mail_note_store after running the
-	upgrade for local folders.
-
-	* em-migrate.c (em_migrate): revert the vfolders.xml after we've
-	imported them.
-
-	* mail-vfolder.c (vfolder_revert): new api to re-load the vfolders
-	file.
-
-	** See bug #52885.
-
-	* em-folder-browser.c (emfb_create_view_menus): unref the view
-	instance/menu's rather than asserting, if they exist.
-	(emfb_set_folder): call create_view_menu's rather than
-	create_view_instance, so the view menu's are properly setup.
-	(emfb_set_folder): call superclass first.
-
-	** See bug #53028.
-
-	* message-list.c (on_selection_changed_cmd): emit the
-	cursor_activated if more than 1 item is selected also.
-
-2004-01-20  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #52990.
-
-	* mail-component.c (mail_component_init): re-enable auto-send-recv
-	setup.
-
-	** See bug #52989.
-
-	* message-list.c (hide_load_state): clear the hidden table if
-	setup, before loading.
-
-2004-01-19  Radek Doulik  <rodo@ximian.com>
-
-	* mail-config.c (MAIL_CONFIG_RC_DIR): path to gtkhtml's rc file
-	(config_write_style): use MAIL_CONFIG_RC_DIR
-	(mail_config_init): ditto
-
-	see http://bugzilla.ximian.com/show_bug.cgi?id=52969
-
-2004-01-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (add_vjunk_info, add_vtrash_info): removed this like
-	i asked radek to ages ago, just call the parent directly.
-	(add_vtrash_or_vjunk_info): renamed to something saner.
-	add_special_info.
-	(add_special_info): removed the 'unread count' parameter & return
-	the added info.
-
-	** See bug #52854.
-
-	* em-folder-tree.c (emft_tree_button_press): setup a FOLDER target
-	for the popup menu.
-
-	* em-popup.c (em_popup_target_free): implement free for
-	TARGET_FOLDER, changed the target options somewhat.
-	(em_popup_target_new_folder): implement folder selection target.
-	Total Hack(tm) alert.
-	(emp_standard_menu_factory): removed the stupid
-	g_assert_if_not_reached() call.
-
-	* message-list.c (message_list_destroy): NULL out the uid_nodemap
-	when we destroy it.
-
-2004-01-19  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-browser.c (emfb_folder_expunge): get the toplevel
-	widget here too, similar to bug 52161.
-
-	** See bug #52956
-
-	* em-composer-prefs.c (sig_edit_cb): The
-	fileentry_add_script_script widget is a GnomeFileEntry not a
-	GtkEntry.
-	(sig_add_script_response): use get_full_path rather than snooping
-	the gtkentry.  Also, don't close/quit the script dialogue on a bad
-	name.
-
-2004-01-19  Not Zed  <NotZed@Ximian.com>
-
-	* em-migrate.c (em_upgrade_pop_uid_caches_1_4): if we can't open
-	the pop3 cache dir, because it doesn't exist, it is not an error.
-
-	** See bug #52983.
-
-	* mail-component.c (em_uri_from_camel, em_uri_to_camel): Handle
-	vfolder: uri's properly.  And make sure local uri's are properly
-	encoded.
-	(mail_component_get_folder_from_evomail_uri)
-	(mail_component_evomail_uri_from_folder): removed, no longer used.
-	(em_uri_from_camel): don't leak the camelurl.
-	(d): disable debug
-
-	* mail-vfolder.c (vfolder_load_storage): move the vfolder storage
-	location to ~/.evolution/mail/vfolder rather than
-	~/.evolution/mail (this is currently unused anyway).
-	(uri_is_ignore): short-circuit exit if we find a match.
-	(mail_vfolder_add_uri): dont exit immediately if we have a vfolder
-	uri, but don't add it to local/remove either.
-	(mail_vfolder_delete_uri): remove any uri from the local/remote
-	source list while we're at it.
-
-2004-01-19  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (emfv_on_url_cb): properly decode the mailto
-	url rather than treating it as a simple string.
-
-	* em-format-html.c (efh_format_address): if we have a name part,
-	add it to the mailto part.  As per rfc2368.  So it isn't lost for
-	clicking/etc.
-
-2004-01-16  JP Rosevear <jpr@ximian.com>
-
-	* em-format-html-display.c (efhd_bonobo_object): pass in an
-	exception to use
-
-2004-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format-html.c (efh_format_address): Dump a struct
-	_camel_header_address to an html string.
-	(efh_format_header): Use efh_format_address() and set the
-	EM_FORMAT_HTML_HEADER_HTML bit on the flags so we don't re-convert
-	our html string into html.
-
-	* mail-vfolder.c (mail_vfolder_rename_uri): s/g_fre/g_free/
-
-	* em-utils.c (guess_account): Change 'tmp' to not be const - fixes
-	a compile warning.
-	(em_utils_expunge_folder): Cast parent to a GtkWindow.
-	(em_utils_empty_trash): Same.
-
-	* em-migrate.c (cp): Oops, still need to stat() the src file so we
-	can report what percentage of the file has been completed so far
-	and also so we don't quit copying until we've copied the whole
-	file.
-
-	* message-list.c (message_list_set_folder): Move
-	'message_list->folder = folder;' out of the uri compare if-block
-	and move it into the if-block that tests that folder != NULL.
-	(regen_list_regen): Abort if the regen folder is not the same as
-	the ml->folder.
-
-2004-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* mail-folder-cache.c (storeinfo_find_folder_info): change this to
-	check the store using the provider url_cmp and just lookup the
-	folder name directly.  folder_compare can't be used for uri's,
-	this stuff was so broken, my fault :(
-
-	** See bug #52467.
-
-	* em-folder-tree-model.c (sort_cb): handle null path (root?).
-
-	* mail-vfolder.c (mail_vfolder_add_uri): map uri to euri before
-	processing.
-	(rule_changed): map uri to camel uri before looking up.
-	(mail_vfolder_delete_uri): handle as euri internally.
-	(mail_vfolder_rename_uri): "
-
-	* mail-autofilter.c (vfolder_rule_from_message): map camel uri to
-	euri before setting as vfolder source.
-
-2004-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* default/C/Inbox: 
-	* default/C/Makefile.am: 
-	* default/Makefile.am: Startup files/folders.
-
-	* em-migrate.c (emm_setup_initial): initial implementation of
-	startup setup.
-
-	** See bug #52896.
-
-	* em-format-html-display.c (efhd_html_button_press_event): do this
-	based on get_object_at rather than get_point_at, so we get the
-	offset properly.
-
-2004-01-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vfolder.c: Make vfolder_store 'global'.
-
-	* em-folder-tree-model.c (sort_cb): Fix bug #12600 by not sorting
-	VFolders (ie. show them in the same order they appear in the
-	editor).
-
-	Fixes bug #52888
-	
-	* em-folder-tree-model.c (sort_cb): New sort function for the
-	folder-tree.
-	(em_folder_tree_model_init): Set the default sort func.
-	(em_folder_tree_model_new): Set the default sort column.
-
-	* em-folder-browser.c (emfb_list_built): Don't select the first
-	unread mesg in the case where no mesg was previously
-	selected. Fixes bug #52887 until we are able to add a user
-	preference (for 2.2?).
-
-	* em-migrate.c (cp): Only abort the copy if the dest folder both
-	exists and contains data. Fixes bug #52880.
-	(em_migrate): Abort if config.xmldb cannot be loaded. Fixes bug
-	#52886.
-
-2004-01-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* em-folder-browser.c: removed ForgetPasswords verb.
-	(emfb_forget_passwords): removed.
-
-2004-01-15  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #52891.
-
-	* em-format-html.c (em_format_html_get_type): protect against http
-	cache not being able to be created.
-
-	** See bug #52878.
-
-	* em-folder-view.c (emfv_finalise): unhook message_changed too.
-	(emfv_set_folder): hook/unhook message_changed too.
-	(emfv_message_changed): implement, proxy to folder_changed.
-
-2004-01-15  Not Zed  <NotZed@Ximian.com>
-
-	** See bugs #51609 and #43515.
-
-	* em-format-html-display.c (efhd_format_prefix): output flag for
-	followup details above the message.
-	(efhd_write_image): added to output icon data.
-
-	* em-format-html.c (efh_format_do): call format_prefix before
-	outputting the message in normal display mode.
-
-	* em-format.c (emf_format_prefix): method called to format data
-	before the first message output.  Default impl == noop.
-
-2004-01-14  Jeremy Katz  <katzj@redhat.com>
-
-	* evolution-mail.schemas.in.in: Add a description for 
-	/apps/evolution/mail/junk/sa/local_only.
-
-2004-01-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c: Split out the remapping code into
-	e-util/e-bconf-map.[c,h] to be shared among components.
-
-2004-01-13  Ross Burton  <ross@burtonini.com>
-
-	* em-folder-browser.c (emfb_empty_trash):
-	Pass the parent window, fixing a crasher.  Bug #52161.
-
-2004-01-14  Not Zed  <NotZed@Ximian.com>
-
-	** See bug 51660.
-	
-	* em-format-html-quote.c (efhq_multipart_related): setup part_id
-	appropriately.
-
-	* em-format-html-display.c (efhd_output_secure): use part_id in
-	classid, and add .signed to part_id for subpart.
-	(efhd_bonobo_unknown): use part_id in classid.
-	(efhd_format_attachment): use part_id in classid's.
-
-	* em-format-html.c (efh_multipart_related)
-	(emfh_multipart_related_check): setup part_id for each subpart.
-	(efh_output_secure): as above, and use the part_id for the
-	classid.
-	(em_format_html_add_pobject): use part_id for a generated classid.
-	(efh_text_plain): setup pseudo-parts into part_id.
-
-	* em-format.c (emf_format_clone): setup the part_id base, folder +
-	uid.
-	(emf_finalise): free the part_id gstring.
-	(emf_init): allocate the part_id gstring.
-	(em_format_add_puri): build the cid from the part_id rather than
-	an arbitrary number, so it is more persistent.  Also save the
-	part_id in the puri for multipart/related use.
-	(emf_multipart_mixed, emf_multipart_alternative)
-	(emf_multipart_appledouble, emf_multipart_encrypted)
-	(emf_multipart_related, emf_multipart_signed): Set the part_id for
-	each subpart.
-	(emf_clear_puri_node): free part_id.
-
-2004-01-13  Not Zed  <NotZed@Ximian.com>
-
-	** See bug 51660.
-
-	* em-format-html-print.c (em_format_html_print_print): dont take
-	message, get the message from the source formatter.
-
-	* em-format.c (emf_format_clone): Added folder and uid parameters,
-	changed camelmedium to a mimemessage.
-
-	* em-format-html-display.c (efhd_attachment_button): check the
-	icon image cache and if the image is there use it.
-
-	* em-icon-stream.c (em_icon_stream_get_image): api to lookup
-	finished images in cache.
-	(em_icon_stream_new): add a cache key arg.
-	(emis_sync_close): store the image in the cache once its
-	completed.
-
-2004-01-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (em_migrate): Handle upgrading from 1.0.x and 1.2.x
-	(code basically moved verbatim from e_config_upgrade).
-
-	* mail-component.c (impl_upgradeFromVersion): Move all the
-	major/minor/revision logic into em_migrate().
-
-2004-01-12  Meilof Veeningen  <meilof@wanadoo.nl>
-
-	* em-composer-utils.c: support for posting both to mail and to
-	(multiple) folders
-
-	* em-folder-browser.c: use em_utils_post_to_folder (works with NNTP)
-
-	* em-folder-selection-button.[ch]: added multiple selection mode
-
-	* em-folder-selector.[ch]: idem
-
-	* em-folder-tree.[ch]: added multiple selection mode, no longer show
-	disabled accounts
-
-	* em-utils.c: various changes to allow posting to (multiple) folders
-
-	* em-subscribe-editor.c: double-clicking a node in the editor updates
-	it directly
-
-	* mail-ops.c: for appending messages, set the "X-Mailer" header
-
-2004-01-12  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c (em_junk_sa_check_junk): use
-	mail_session_get_sa_use_daemon
-
-	* mail-session.c: added SA prefs
-	(mail_session_get_sa_local_only): new helper method
-	(mail_session_set_sa_local_only): ditto
-	(mail_session_get_sa_use_daemon): ditto
-	(mail_session_set_sa_use_daemon): ditto
-	(mail_session_check_junk_notify): fix the key comparison
-	(mail_session_init): add gconf dir so that we get notified
-
-	* mail-config.glade: added SA preferences
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): added more junk
-	prefs
-	(em_mailer_prefs_apply): ditto
-
-	* em-junk-filter.c: use preferences
-
-2004-01-12  Larry Ewing  <lewing@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: fix up the controls factory
-	location.
-
-	* mail-component.c (mail_control_new): add new interface for
-	getting a mail control with a folder_uri property bag.
-	(get_prop): pbag get method.
-	(set_prop): pbag set method.
-
-2004-01-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (cp): Don't O_TRUNC the dest file, instead use
-	O_EXCL and don't do anything if the dest file already exists (this
-	way we don't re-migrate an mbox or corrupt any summary/ibex/meta
-	files).
-
-2004-01-12  Not Zed  <NotZed@Ximian.com>
-
-	** See bug 52737.
-
-	* em-format-html.c (efh_text_plain): treat text/* as inline
-	content from the made-up multipart.
-
-2004-01-09  Not Zed  <NotZed@Ximian.com>
-
-	** See bug 52696.
-	
-	* mail-component.c (setup_search_context): move the searches to
-	~/.evolution/mail/searches.xml (migration?).
-	(setup_search_context): fix a merge error,
-	vfoldertypes.xml->searchtypes.xml since it includes the system
-	searches now.
-
-2004-01-09  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree.c (emft_popup_properties_got_folder): add total +
-	unread counts to properties page.
-
-	* em-utils.c (filter_editor_response):
-	* mail-vfolder.c (vfolder_editor_response): change for rule editor
-	changes, ACCEPT->OK.
-
-2004-01-09  Not Zed  <NotZed@Ximian.com>
-
-	* em-format.c (em_format_format_text): keep the windows charset
-	filter around until we're done since if we set it up we reference
-	its memory.  Causes warnings and breaks message display.
-
-	** See bug #52637.
-	
-	* em-inline-filter.c (em_inline_filter_new): added a content-type
-	paramter for the base content type.
-	(em_inline_filter_finalize): free base content type.
-	(emif_types[]): Added 'plain' parameter, indicates type needs
-	plain parameters set on content type.
-	(emif_add_part): inherit the full base type if it is set, for
-	plain parts.
-
-	* em-format-html.c (efh_text_plain): pass the part's content-type
-	to the inline filter.
-
-2004-01-08  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #50786
-	
-	* GNOME_Evolution_Mail.server.in.in: Remove :: from startup wizard
-	iid, and put the mail wizard into the right factory.
-
-	* mail-component.c (impl_requestCreateItem, impl_handleURI): 
-	* em-folder-browser.c (emfb_mail_compose): check we have an
-	account before trying to send mail.
-
-2004-01-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-component.c (mail_component_init): Don't migrate stuff here
-	anymore.
-
-	* mail-ops.c (uid_cachename_hack): Removed a hack that checked for
-	the really old uid cache location and make the uid cache live in a
-	better location (why have mail/pop/<account> and
-	mail/pop3/cache-<account>? simply put the cache file in
-	mail/pop/<account>/uid-cache).
-
-	* em-migrate.c (em_migrate_dir): When copying over mbox folders,
-	don't abort if we fail to copy over a summary file (big
-	whoop). Also, if indexing was turned on in the evolution 1.4
-	version of the folder, turn on indexing for that folder in the
-	migrated mbox folder as well.
-	(em_migrate_pop_uid_caches): Migrate the pop3 uid-cache
-	files. Fixes bug #52464.
-	(em_migrate): Call em_migrate_pop_uid_caches().
-
-	* em-format-html.c (efh_format_address): Removed.
-	(efh_format_header): Handle address formatting a little
-	differently to address dwmw's complaints. Also now handles other
-	headers such as Resent-* and Sender as well.
-
-2004-01-07  Radek Doulik  <rodo@ximian.com>
-
-	* em-message-browser.c (emmb_init): as below
-
-	* em-folder-browser.c (emfb_init): always show vertical scrollbar,
-	we do the same for message list and it avoids ugly flicker
-
-2004-01-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-message-browser.c (emmb_set_message): Protect against a NULL
-	message-info. Afaik, this can only happen if the message has since
-	been removed? Might be a larger problem here... Anyways, fixes the
-	crash in bug #52297.
-
-2004-01-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree-model.c (folder_renamed_cb): Clone the
-	CamelRenameInfo and ref the store before emitting the async event.
-	(folder_deleted_cb): Same idea but for CamelFolderInfo's.
-	(folder_created_cb): Here too.
-	(folder_subscribed_cb): Same.
-	(folder_unsubscribed_cb): And here.
-	(folder_renamed): Split out from folder_rename_cb(), free the
-	CamelRenameInfo and unref the store when done.
-	(folder_unsubscribed): Same idea.
-	(folder_subscribed): Same.
-
-2004-01-05  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c: add NULL at the end of argv for execvp (poited
-	out by Frank Solensky, thanks)
-
-2004-01-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-browser.c (emfb_list_message_selected): Check that the
-	folder isn't NULL (ie. no folder is selected). Fixes bug #52207.
-
-	* message-list.c (message_list_set_folder): Remove the
-	cursor-activated idle callback.
-
-	* mail-send-recv.c (build_dialog): Set the send/recv dialog to
-	non-modal. Fixes bug #50127.
-
-	* em-folder-tree-model.c (folder_subscribed_cb): If we aren't in
-	the main thread, proxy it over to the main thread.
-	(folder_unsubscribed_cb): Same.
-	(folder_created_cb): Here too.
-	(folder_deleted_cb): And here.
-	(folder_renamed_cb): Again here.
-
-	* em-folder-view.c (emfv_set_folder_uri): Pass mail_thread_queued
-	to mail_get_folder() instead of mail_thread_new so that we
-	eliminate a race when switching folders in the UI.
-
-2004-01-05  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #50996.
-
-	* em-format-html-display.c (efhd_find_handler): implement override
-	for unknown types, try bonobo handlers.
-	(efhd_bonobo_unknown): formathandler for bonobo objects.
-
-	* em-format.c (em_format_find_handler): make virtual, rename to
-	emf_find_handler.
-
-2004-01-04  ERDI Gergo  <cactus@cactus.rulez.org>
-
-	* em-folder-view.c (emfv_on_url_cb): Emit a hover-url signal when
-	the user mouses over a URL, ...
-	(emfv_hover_url_impl): ... and use BonoboUI to change the status
-	bar message...
-	(em_folder_view_set_statusbar): ... unless we are asked not to, ...
-
-	* mail-component.c (impl_createControls): ... like in the case of
-	the mail component, ...
-	(view_hover_url_cb): ... that uses the ActivityHandler to do the
-	same
-
-	Add these together, and #127536 is neatly solved.
-
-2004-01-04  David Woodhouse  <dwmw2@infradead.org>
-
-	* em-format-html-display.c: Mail warning grammar typo fix.
-
-2003-12-22  David Moore  <davmre@bellsouth.net>
-
-	* em-popup.c (emp_part_popup_set_background): Implemented; sets an 
-	image attachment as the GNOME wallpaper.
-
-	* em-utils.c (emu_save_part_done): Created a prototype at the top
-	of the file.
-	(em_utils_save_part_to_file): Added; save a message part to a
-	specified file on disk.
- 
-2003-12-18  Rodney Dawes  <dobey@ximian.com>
-
-	* em-message-browser.c (emmb_init): Merge in
-	evolution-mail-message-display.xml first, since it is the parent UI
-	XML, really fixes bug #49949
-
-2003-12-16  JP Rosevear  <jpr@ximian.com>
-
-	* em-format-html-display.c: #ifdef out certain code pieces if
-	s/mime isn't supported
-
-2003-12-14  JP Rosevear <jpr@ximian.com>
-
-	* em-folder-tree.c (emft_tree_row_collapsed): Fix erroneous
-	function call
-
-	Fixes #52120
-	
-2003-12-12  Not Zed  <NotZed@Ximian.com>
-
-	* mail-config.c (config_write_style): put the style in .evolution.
-
-	** See bug #52023.
-
-	* message-list.c (message_list_select_uid): noop if we've been
-	destroyed (foldre == NULL).
-
-	** See bug #52108.
-
-	* em-format.c (em_format_is_attachment): also recognise
-	application/pkcs7-mime for mailers who like to make up their own
-	standards.
-
-	* em-format-html.c (type_builtin_table[]): *
-	em-format-html-display.c (type_builtin_table[]): make recognise
-	application/pkcs7-mime too.
-
-2003-12-11  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (INCLUDES): get the build moving again.  add
-	CERT_UI_CFLAGS here for the time being.
-
-2003-12-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #1717.
-
-	* em-folder-browser.c (emfb_list_built): If we have a uid to
-	select, select that instead of selecting the first unread.
-	(emfb_set_folder): CamelObject::meta_get() actually returns a
-	strdup'd buffer, so we need to free it. Get the last selected uid
-	and set that up as the uid to select when the message-list
-	finishes building.
-	(emfb_list_message_selected): Save the selected uid.
-	(emfb_init): Connect to the message-list's message_selected signal
-	so that we can save selected state (don't want to do this in
-	EMFolderView or MessageList because we don't want the state to be
-	saved for the EMMessageBrowser).
-
-2003-12-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c: Shorten the namespace of some internal
-	functions to just emft.
-	(emft_popup_delete_rec): Don't delete the contents of a folder if
-	it is a vFolder. Fixes bug #52029.
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): Use newv() here
-	and pass an array of GTypes - makes it simpler to change the order
-	of columns later and/or add new columns if we need to. Also makes
-	the line shorter :-)
-
-2003-12-11  Grahame Bowland  <grahame@angrygoats.net>
-
-	* em-format-html.c (efh_format_header): display 
-	x-evolution-mailer pseudo header irrespective of 
-	xmailer_mask. This is now handled by a header 
-	configuration dialog.
-
-	* mail-config.glade: add tab to mail configuration 
-	dialog to allow custom headers to be specified for 
-	display.
-
-	* em-mailer-prefs.h: modify struct _EMMailerPrefs to 
-	add widgets for custom header tab. Add defines for custom 
-	header flags. Add struct EMMailerCustomHeader to describe
-	custom headers, and add function 
-	em_mailer_custom_headers_from_xml to allow XML from gconf 
-	key to be parsed into this structure.
-
-	* em-folder-view.c (emfv_setting_notify): catch changes to 
-	custom header gconf key and update mail view to correspond
-
-	* em-mailer-prefs.c (em_mailer_prefs_apply): save custom 
-	headers to gconf
-	(header_list_enabled_toggled): toggle clicked toggle column
-	(add_header): add header to custom header list if valid
-	(remove_header): remove selected custom header
-	(is_valid_header): return true if passed header is valid, 
-	otherwise false
-	(entry_header_changed):	call add_header_update_sensitivity
-	(em_mailer_prefs_construct): initialise header selection tab. 
-	Load gconf data for header selection dialog.
-	(em_mailer_custom_header_to_xml): load a header structure 
-	from XML document structure
-	(em_mailer_custom_header_from_xml): load a header 
-	structure from a string containing valid XML. if any failure, 
-	the header.name is set to NULL.
-	(header_list_row_selected): call 
-	remove_header_update_sensitivity
-	(remove_header_update_sensitivity): set the sensitivity of 
-	the remove button to FALSE if the list is empty or nothing 
-	is selected. Otherwise, set it to TRUE.
-	(add_header_update_sensitivity): set the sensitivity of the 
-	the add button to FALSE if the entry box is empty, contains 
-	a duplicate header, or contains an invalid header. Otherwise, 
-	set it to TRUE.
-
-	* evolution-mail.schemas.in.in: add mail/display/headers 
-
-2003-12-10  Larry Ewing  <lewing@ximian.com>
-
-	* em-format-html.c: add text/x-patch as a plain type.
-	(efh_text_enriched): add table around the enriched part so it
-	matches html and text modes.
-
-2003-12-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (em_migrate_dir): Modified to simply copy mbox
-	files from one place to another (and the summary files) rather
-	than going thru camel so as to bypass the need for parsing MIME.
-
-2003-12-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (get_local_store): Fixed a leak.
-
-	* mail-component.c (impl_upgradeFromVersion): Implemented.
-
-	* em-folder-tree.c (em_folder_tree_set_selected): Add INFO_FAST
-	here as we don't need it to get unread counts.
-	(tree_row_expanded): Here too.
-
-	* em-folder-tree-model.c (em_folder_tree_model_set_folder_info):
-	Check CAMEL_FOLDER_NOCHILDREN.
-
-2003-12-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #51045
-
-	* mail-folder-cache.c (real_flush_updates): Update the unread
-	count in the model if the folder got new mail.
-
-	* em-folder-selection.c (em_select_folder): Updated.
-
-	* em-folder-selection-button.c
-	(em_folder_selection_button_clicked): Updated.
-
-	* em-folder-tree-model.c (em_folder_tree_model_set_unread_count):
-	New function to update the unread count for a folder.
-
-	* mail-component.c (mail_component_peek_tree_model): Don't ref the
-	model. Also renamed s/get/peek/
-
-2003-12-10  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-tree.c (em_folder_tree_get_folder_info__got): check
-	m->fi != NULL before dereferencing it.
-
-2003-12-10  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html-display.c (efhd_multipart_signed):
-	* em-format-html.c (efh_multipart_signed): 
-	* em-format.c (emf_multipart_signed): treat
-	application/pkcs7-signature as application/x-pkcs-signature.
-	Stupud non-rfc-compliant mailers from apple.  Bug #51750.
-
-	* em-folder-selection.c (em_select_folder): rewritten to get rid
-	of hte old crap that should've been gotten rid of before.  Bug
-	#51602.
-	(em_folder_selection_run_dialog_uri): removed.
-	(em_folder_selection_run_dialog): removed.  this file is gutted
-	and should probably be removed.
-
-	* em-folder-selector.h: use a POSITIVE value for the response
-	value, gtk uses -ative ones.  Bug #51752.
-
-	* Makefile.am (INCLUDES): added smime/lib and smime/gui to
-	includes.
-
-	* em-folder-tree.c (emft_popup_rename_folder): removed unused 'why',
-	why not?
-
-	* em-format-html-display.c (efhd_xpkcs7mime_validity_clicked):
-	setup a table of buttons to view any certs we have.
-
-	* em-folder-browser.c (emfb_activate): separeate view_menu
-	unreffing from view_instance.  fixes a runtime warning.
-
-	** See bug #51718.
-
-	* mail-component.c (em_uri_to_camel): handle an e-uri which has an
-	account uid which isn't in user@host format.
-
-2003-12-09  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #51899.
-
-	* em-folder-tree-model.c (em_folder_tree_model_set_folder_info):
-	CAMEL_FOLDER_CHILDREN is only advisory, some servers don't give it
-	to you.
-
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: Remove hard coded disable deprecated flags
-	
-2003-12-05  Rodney Dawes  <dobey@ximian.com>
-
-	* em-folder-tree.c (render_display_name): Remove the extra || unread
-	check in the conditional in the g_object_set () call
-
-2003-12-05  Rodney Dawes  <dobey@ximian.com>
-
-	Fixes bug #51482
-	
-	* em-folder-tree.c (render_display_name): Don't hardcode colors
-	for the folder tree, instead use bold for unread, as in 1.4
-
-2003-12-05  Radek Doulik  <rodo@ximian.com>
-
-	* em-html-stream.c (emhs_sync_flush): use new gtk_html_flush
-	method instead of forcing processing of all gtk events
-
-2003-12-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree-model.c (em_folder_tree_model_remove_folders):
-	Make sure folder_path is non-NULL ("Loading..." nodes will have a
-	NULL path). Fixes bug #51731.
-
-2003-12-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (empty_trash_empty): Get the proper local folders
-	store uri (it's not file:/ anymore). Fixes bug #51618.
-
-2003-12-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #51605.
-
-	* em-folder-selector.c (emfs_response): Handle creating a new
-	folder (pop up a create-folder-selector dialog).
-
-	* em-folder-tree.c (emft_popup_new_folder_response): Moved all the
-	logic into em_folder_tree_create_folder().
-	(em_folder_tree_create_folder): New function to create a folder.
-
-2003-12-04  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c (pipe_to_sa): add new err_retval parameter,
-	which specifies which value to return if something went wrong
-	(like failed to exec, ...). update all calls by that. actual junk
-	check has err_retval = 0 to avoid marking false spam - non-zero
-	retval means junk.
-
-	* em-folder-view.c: set junk toolbar buttons pixmaps
-
-	* mail-session.c: monitor gconf key
-	/apps/evolution/mail/junk/check_incoming and keep session junk
-	flag uptodate
-
-	* em-mailer-prefs.c (em_mailer_prefs_construct): added junk
-	preferences
-
-2003-12-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (uri_to_evname): Updated to add use mail subdirs.
-	(mail_config_uri_renamed): Updated cachenames[]
-	(mail_config_folder_to_cachename): Fixed to use the correct path.
-
-	* em-folder-browser.c (emfb_create_view_menus): Updated the
-	galview path to point to the evo-1.5 location.
-	(emfb_set_folder): Update the galview view_instance.
-	(emfb_create_view_instance): Split out from
-	emfb_create_view_menus()
-	(emfb_create_view_menus): Reduced code, call
-	emfb_create_view_instance().
-
-	* em-folder-selector.c (emfs_create_name_activate): Emit the OK
-	response, not the CREATE_NEW response. Also,
-	g_signal_emit_by_name() does not take a GQuark detail argument, so
-	don't pass one. Fixes bug #51661.
-
-2003-12-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-view.c (emfv_set_folder): Sync the folder before
-	replacing it with the new folder.
-
-	* em-folder-tree.c (em_folder_tree_set_selected): Need to prepend
-	a "/" to path if the path is the url fragment. Also fixed to
-	select the store node if path == "/".
-	(emft_popup_rename_folder): Set oldpath and newpath to the proper
-	values. Fixes bug #51656.
-
-	* em-folder-selector.c (em_folder_selector_get_selected_uri):
-	Fixed a FIXME by using the CamelProvider url flags to determine if
-	the url used url->fragment or url->path as the folder path.
-	(em_folder_selector_get_selected_path): Don't allow path strings
-	to start with "//".
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* em-folder-tree.c (em_folder_tree_destroy): remove the source
-	before saving 
-
-2003-12-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (em_folder_tree_save_state): Set the
-	save_state_id to 0 or we will never get a chance to run again.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-vfolder.c: Do not #include "evolution-shell-component.h".
-
-	* Makefile.am (libevolution_mail_la_SOURCES): Don't compile
-	mail-importer.[ch] for now.
-
-	* mail-component-factory.c: Do not #include
-	<evolution-shell-client.h>.
-	* mail-config.c: Likewise.
-
-	* mail-vfolder.h: Do not #include <evolution-storage.h> or
-	<evolution-shell-component.h>.
-
-	* mail.h: Do not #include <evolution-storage.h>.
-
-	* mail-ops.h: Do not #include <evolution-storage.h>.
-	(mail_scan_subfolders): Remove prototype.
-	(mail_update_subfolders): Likewise.
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* em-folder-tree.c (em_folder_tree_destroy): save the state
-	immediately if there is a timeout set
-	(em_folder_tree_save_state): be true GSourceFunc and just return
-	FALSE to remove the source
-
-2003-12-03  Not Zed  <NotZed@Ximian.com>
-
-	* mail-autofilter.c (rule_match_thread): changed to setup the rule
-	part properly, it could never have worked.  Bug #51601.
-
-	* em-popup.c (emp_uri_popup_address_add): implement.
-
-	* em-folder-view.c (emfv_popup_add_sender): implement.
-	(emfv_add_sender_addressbook): hook up to above func.
-
-	* em-utils.c (em_utils_add_address): implementation to add an
-	email address to the addressbook.
-	(emu_add_address_cb): callback required for funny api.  Bug
-	#51321.
-
-2003-12-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree-model.c (drop_uid_list): Moved here.
-	(drop_folder): Moved here.
-	(import_message_rfc822): Moved here.
-	(drop_message_rfc822): Moved here.
-	(drop_text_uri_list): Moved here.
-	(model_drag_data_received): Moved the logic from em-folder-tree.c
-	into here.
-	(model_row_drop_possible): Same.
-	(model_row_draggable): Same.
-	(drag_text_uri_list): Moved here.
-	(model_drag_data_get): Moved logic here.
-	(model_drag_data_delete): Moved logic here.
-
-	* em-folder-tree.c (drag_data_get_cb): Pass the full_name to
-	camel_store_get_folder() rather than the path.
-	(drag_data_received_cb): Same.
-	(drop_uid_list): Removed.
-	(drop_folder): Removed.
-	(import_message_rfc822): Removed.
-	(drop_message_rfc822): Removed.
-	(drop_text_uri_list): Removed.
-	(drag_data_received_cb): Removed.
-	(row_drop_possible_cb): Removed.
-	(row_draggable_cb): Removed.
-	(drag_text_uri_list): Removed.
-	(drag_data_get_cb): Removed.
-	(drag_data_delete_cb): Removed.
-	(em_folder_tree_enable_drag_and_drop): Don't connect to any of the
-	drag & drop signals, they don't exist anymore.
-
-	* mail-component.c (impl_createControls): Enable drag-and-drop.
-
-	* em-folder-tree.c (em_folder_tree_new_with_model): Connect to the
-	loading row signal.
-	(loading_row_cb): Expand the path if needed.
-	(em_folder_tree_destroy): Disconnect from the loading-row signal.
-	(em_folder_tree_enable_drag_and_drop): New function to enable
-	drag-and-drop.
-	(em_folder_tree_new): Remove drag-and-drop setup code.
-
-	* em-folder-tree-model.c (em_folder_tree_model_class_init): Define
-	the loading-row signal.
-	(em_folder_tree_model_set_folder_info): emit the loading-row signal.
-
-2003-12-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (em_folder_tree_new): Fixed to pass the
-	evolution dir into em_folder_tree_model_new().
-	(model_save_state): Removed.
-	(em_folder_tree_save_state): Moved all the saving logic into
-	em_folder_tree_model_save_expanded().
-
-	* em-folder-tree-model.c (em_folder_tree_model_new): Load the
-	expanded state off disk.
-	(em_folder_tree_model_save_expanded): New function to save
-	expanded state.
-	(em_folder_tree_model_get_expanded): new function to get if a node
-	should be expanded.
-	(em_folder_tree_model_set_expanded): new function to set the
-	expanded state of a node.
-
-	* mail-component.c (mail_component_init): Pass the evo dir to
-	em_folder_tree_model_new() which now requires it.
-
-2003-12-02  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am: Version the schemas
-	* evolution-mail.schemas: Removed
-	* evolution-mail.schemas.in.in: Added
-
-2003-12-02  Not Zed  <NotZed@Ximian.com>
-
-	* mail-config-druid.c (mail_config_druid_new): moved the
-	gtk_widget_show_all to before we add the pages, otherwise it can
-	override per-page logic.  Bug #50790.
-
-	* message-list.c (message_list_create_extras): setup another image
-	(followup completed) to flag status list.
-	(states_pixmaps[]): added flag_for_followup_done.
-	(ml_tree_value_at): return 0,1 or 2 for completed icon.  also use
-	the real ints, these shouldn't have been true/false.  Bug #43514.
-
-	* evolution-mail.schemas: Added empty_trash prompt key.
-
-	* em-utils.c (em_utils_prompt_user): changed to take the gconf
-	'prompt again' key directly.  Fixed callers.
-	(em_utils_expunge_folder): prompt the user with an expunge
-	specific message.
-	(em_utils_empty_trash): have an empty-trash specific message for
-	prompting confirm.
-	(emu_confirm_expunge): removed, no longer needed.  Bug #38613.
-	(em_utils_expunge_folder): remove most line feeds, let the label
-	wrap them.
-	(em_utils_empty_trash): ditto.
-
-	* em-subscribe-editor.c (sub_folder_subscribed): update the ui
-	selection state after we're done.  maybe we should listen on the
-	model but this is easier.  Bug #50861.
-
-	* em-message-browser.c (emmb_activate): hook up our own verb list.
-	(emmb_message_verbs[], emmb_close): implement the close verb.
-	Bug #51558.
-
-	* em-format-html-display.c (efhd_attachment_popup): duh, actually
-	add the menu list we create.  Bug #49902.
-
-	* em-format.c (d): turn off debug, committed by accident.
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-mt.c (do_op_status): Use data->activity_id, not local
-	activity_id.
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-mt.c (struct _mail_msg_priv): Remove member "activity".
-	(mail_operation_status): Un-#if 0 the code.
-
-	* mail-component.c (struct _MailComponentPrivate): New member
-	activity_handler.
-	(mail_component_init): Initialize.
-	(impl_dispose): Unref.
-	(mail_component_peek_activity_handler): New.
-	(impl_createControls): Create an ETaskBar, attach it to the
-	ActivityHandler, and return it to the caller as the statusbar
-	control.
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-component.c (impl_createControls): Pass a label for the
-	status bar control for now.
-
-2003-12-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_signature_run_script): Use fcntl() to
-	set FD_CLOEXEC on each fd rather than close()ing it. Apparently
-	Linux's older pthread implementations use sockets and so this
-	fouls threading up. GO LINUX! GO!
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* GNOME_Evlution_Mail.server.in.in:
-	* em-account-prefs.c:
-	* em-composer-prefs.c:
-	* em-mailer-prefs.h:
-	* mail-component-factory.c:
-	* mail-config-factory.c:
-	* mail-font-prefs.h:
-	* importers/*.server.in.in:
-	* importers/elm-importer.c:
-	* importers/evolution-mbox-importer.c:
-	* importers/evolution-outlook-importer.c:
-	* importers/netscape-importer.c:
-	* importers/pine-importer.c: Use BASE_VERSION for repo_ids and OAFIIDs
-
-2003-12-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (em_folder_tree_get_folder_info__got): Updated
-	to call em_folder_tree_model_set_folder_info().
-	(folder_subscribed_cb): Removed.
-	(folder_unsubscribed_cb): Removed.
-	(folder_created_cb): Removed.
-	(folder_deleted_cb): Removed.
-	(folder_renamed_cb): Removed.
-
-	* em-folder-tree-model.c (em_folder_tree_store_set_folder_info):
-	New function to replace tree_store_set_folder_info() which had
-	been in em-folder-tree.c
-	(em_folder_tree_model_remove_uri): Made private.
-	(em_folder_tree_model_remove_store_info): Made private.
-	(em_folder_tree_model_remove_folders): New function to replace
-	remove_folders() from em-folder-tree.c
-	(em_folder_tree_model_new): No longer takes any args.
-
-	* em-folder-tree.c (em_folder_tree_new): Updated.
-
-	* mail-component.c (add_store): Add the store to the model rather
-	than the treeview.
-	(impl_createControls): create a new treeview based on the
-	already-instantiated model.
-	(mail_component_init): Create a new tree model.
-	(mail_component_remove_store): Remove the store from the model
-	directly.
-	(mail_component_get_tree_model): Updated.
-
-	* em-folder-tree.c (folder_unsubscribed_cb): Call
-	em_folder_tree_model_remove_folders() rather than the deprecated
-	internal remove_folders() function.
-	(folder_renamed_cb): Same.
-	(em_folder_tree_remove_store): Removed.
-	(em_folder_tree_add_store): Removed.
-	(remove_folders): Removed.
-
-2003-12-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-composer-utils.c (composer_get_message): rfc2047 encode the
-	Organization header value.
-
-	* em-folder-tree.c (em_folder_tree_get_folder_info__got): Make
-	sure our parent folder hasn't been unsubscribed or else we get a
-	segfault here if it has.
-
-03-11-28  Dave Camp  <dave@ximian.com>
-
-	* em-folder-tree.c (render_pixbuf): Set the pixbuf renderer
-	invisible for stores.
-
-2003-11-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_get_account_by_uid): New function.
-
-	* em-folder-tree.c (tree_store_set_folder_info): Expand the tree
-	node if the saved state tells us it was expanded the previous
-	session.
-	(em_folder_tree_load_state): Load the saved state.
-	(em_folder_tree_add_store): Conditionally expand the store node.
-	(em_folder_tree_new_with_model): Expand all the nodes that should
-	be expanded.
-
-2003-12-01  Radek Doulik  <rodo@ximian.com>
-
-	* em-folder-tree.c (render_pixbuf): use CAMEL_VTRASH_NAME,
-	CAMEL_VJUNK_NAME
-
-2003-11-28  Radek Doulik  <rodo@ximian.com>
-
-	* em-folder-tree.c (render_pixbuf): added junk icon to folder
-	icons
-
-2003-12-01  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-browser.c (emfb_edit_cut, emfb_edit_copy)
-	(emfb_edit_paste): override the em-folder-view impl, and handle
-	the search bar properly.  For #48746.
-
-	* mail-security.glade: added some padding to the security details
-	frames.
-
-	* em-format-html-display.c (efhd_xpkcs7mime_validity_clicked):
-	some cosmetic layout changes.
-
-2003-11-27  Charles Zhang  <charles.zhang@sun.com>
-
-	* mail-account-editor.c (construct): connect "changed" signal.
-	(mail_account_editor_changed): change signal handler.
-	Fixes bug #48998.
-
-2003-11-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-offline-handler.c: Remove all the syncFolder stuff since
-	it's not in the Component interface anymore.
-
-	* mail-mt.c: Remove declaration for global_shell_client.  #if 0
-	all the code that uses that.
-
-	* mail-component-factory.c: Remove declaration for
-	global_shell_client.
-
-	* mail-vfolder.c: Remove declaration for global_shell_client.
-
-2003-11-26  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: turn on deprecated Gtk stuff
-
-2003-11-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (em_folder_tree_save_state): New function to
-	save tree expanded state.
-	(em_folder_tree_queue_save_state): New function to queue saving of
-	the expanded state.
-	(em_folder_tree_construct): Connect to the row-collapsed signal.
-	(tree_row_collapsed): Queue a save-state.
-	(tree_row_expanded): Queue a save state.
-	(em_folder_tree_get_folder_info__got): Queue a save-state.
-
-2003-11-25  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (em_folder_view_print): set session on print
-	formatter for signatures to work.
-
-	* em-message-browser.c (emmb_destroy): kill warning.
-
-	* em-format-html.c (efh_output_secure): same as
-	efhd_output_secure, output the security bar, but for
-	printing/plain html.
-	(efh_application_xpkcs7mime): use output_secure.
-	(em_format_html_multipart_signed_sign): removed, output_secure
-	does what this did.
-
-	* em-format-html-display.c (smime_sign_table,
-	smime_encrypt_table): Added a short description for the mail
-	display.
-	(efhd_xpkcs7mime_button): only good/bad signature at this point,
-	if only encrypted, then display 'bad' icon.
-	(efhd_output_secure): output the security bar/button and handle
-	multi-level enveloping properly.
-	(efhd_application_xpkcs7mime): just call output_secure to do
-	the security bar.
-	(efhd_multipart_signed): same.
-	(efhd_signature_button): removed, no longer used.
-	(efhd_signature_check): removed, no longer used.
-
-2003-11-24  Radek Doulik  <rodo@ximian.com>
-
-	* em-format-html.c (efh_text_plain): use new colors
-	(efh_text_html): ditto
-
-	* em-format-html-display.c (efhd_gtkhtml_realise): set new colors
-	according to style
-
-	* em-format-html.c (efh_init): init new colors
-
-	* em-format-html.h: added frame and content colors
-
-	* em-format.c (emf_multipart_mixed): do not use horizonal rule,
-	attachment content is now inside simple frame
-
-	* em-format-html.c (efh_text_plain): add 6 points around text
-	plain content and frame it
-	(efh_text_html): frame text/html
-	(efh_format_do): fix body tag, set bgcolor
-	(em_format_html_format_headers): do not put headers into own
-	table, content body is framed now instead
-	(efh_format_message): update for headers/body changes
-
-	* em-format-html-display.c (efhd_format_attachment): put
-	additional vertical space around attachment button
-
-2003-11-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree-model.c (model_drag_data_received)
-	(model_row_drop_possible, model_row_draggable)
-	(model_drag_data_get, model_drag_data_delete): Swap the retval
-	varargs value to the last argument instead of the first.
-
-2003-11-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_uri_deleted): Removed call to
-	mail_tool_delete_meta_data(). Fixes bug #51236.
-
-	* mail-component.c (impl_handleURI): Implemented.
-	(mail_component_class_init): Overload the handleURI method.
-
-2003-11-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #51012.
-
-	* em-folder-tree.c (emft_popup_rename_folder): Fixed a FIXME to
-	not use the OS-specific g_path_*() stuff.
-	(em_folder_tree_set_selected): For the case where the tree has
-	already loaded enough subfolders to include the path we need to
-	select, exopand the nodes to that path as well. For the case that
-	the tree hasn't loaded enough of the folder nodes, load them and
-	then have the node selected/expanded to.
-
-2003-11-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-selector.c (emfs_create_name_activate): Emit the
-	response signal with the RESPONSE_NEW value.
-	(emfs_create_name_changed): Sanity check the entry text and set OK
-	sensitivity.
-	(folder_selected_cb): If there is an entry widget, then call
-	name_changed() to decide sensitivity, else set OK to be sensitive.
-
-	* em-utils.c (em_utils_selection_set_urilist): Same.
-
-	* em-format-html-display.c (efhd_drag_data_get): Same as below.
-
-	* em-folder-tree.c (drag_text_uri_list): Terminate each url of a
-	text/uri-list with a \r\n.
-
-2003-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Add an
-	"evolution:uri_schemas" attribute.
-
-2003-11-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (em_uri_to_camel): if we're setting the
-	fragment, strip leading /'s.
-
-	* mail-tools.c (mail_tool_get_meta_data)
-	(mail_tool_delete_meta_data, meta_data_key): old stuff killed.
-	(mail_tool_uri_to_folder): handle email: uri's specially.  this is
-	a bit of a hack, the filter callbacks should manage this itself
-	since filters are the only bits which use those uri's.
-
-2003-11-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (em_migrate_dir): Don't leak the message objects.
-
-	* em-folder-tree.c (em_copy_folders): Execute asynchronously by
-	queueing the copy in another thread.
-	(em_copy_folders__copy): Moved the original logic here.
-
-2003-11-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (tree_row_expanded): Queue the
-	camel_store_get_folder_info() call in another thread.
-	(em_folder_tree_get_folder_info__got): Moved all the logic of
-	tree_row_expanded here.
-
-2003-11-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (tree_row_expanded): Fixed to check fi->child
-	as well (since mbox does it right).
-	(emft_popup_new_folder_response): Fixed to subscribe to the
-	correct folder.
-	(emft_popup_delete_folders): Fixed to use the full_name rather
-	than the path.
-
-	* em-folder-selection-button.c (set_contents): Fixed to not
-	include leading '/' in the folder name in the label.
-
-	* em-folder-tree.c (emft_popup_new_folder_response): Implemented
-	error reporting via gtk dialogs.
-	(emft_popup_copy_folder_selected): Same.
-
-2003-11-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (emft_popup_new_folder_response): Use a
-	folder_name rather than a path as the name argument to
-	camel_store_create_folder(), fixes creation of IMAP folders.
-
-2003-11-17  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-selection-button.c (set_contents): handle an
-	unparsable url without crashing.
-
-	* mail-tools.c (mail_tool_get_local_inbox): thin wrapper on
-	mail_component_get_local_inbox.
-
-	* mail-component.c (mail_component_get_local_inbox): helper to get
-	the default local inbox.
-
-	* mail-ops.c (fetch_mail_fetch): if we can't get the inbox, make
-	sure we still unref the filter driver here by using hte same exit
-	code.  Fixes a crash.
-
-2003-11-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-tree.c (emft_popup_new_folder_response): We can't use
-	a uri to do a lookup of a store-info on the store_hash, we have to
-	get a CamelStore first.
-	(row_draggable_cb): validate the iter before using it.
-	(row_drop_possible_cb): Same.
-	(drag_data_received_cb): Here too.
-	(drag_data_get_cb): Same.
-	(drag_data_delete_cb): Again here.
-	(tree_store_set_folder_info): Recursively add nodes if fi->child
-	is non-NULL rather than adding a dummy node.
-	(folder_renamed_cb): Implemented.
-
-2003-11-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-mt.c (set_stop): Removed most of the code. This is
-	basically now a nop. Need to somehow get the uic and fix this.
-
-	* folder-browser-factory.[c,h]: Removed.
-
-	* mail-component.c (folder_selected_cb): Don't create a new view
-	anymore, simply set the new folder uri on the folder browser. This
-	makes the mailer use a lot less memory than in 1.x
-	(view_control_activate_cb): Moved here from
-	folder-browser-factory.c
-	(impl_createControls): Connect to the activate signal on the view
-	control.
-
-2003-11-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-selection.c (folder_selected_cb): Only set OK to
-	sensitive if the selected node is not a store node.
-
-	* em-folder-tree-model.c: Moved the store_hash and uri_hash from
-	EMFolderTreePrivate into here instead.
-
-	* em-folder-tree.c: Updated for above changes.
-
-2003-11-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-view.c (emfv_popup_move): Updated.
-	(emfv_popup_copy): Updated.
-
-	* em-folder-tree.c (emft_popup_copy): Updated.
-	(emft_popup_move): Updated.
-
-	* em-folder-selection.c (create_dialog): New convenience function
-	to construct the dialog contents for all three public functions.
-	(em_folder_selection_run_dialog): Now longer takes a caption arg.
-	(em_folder_selection_run_dialog_uri): Same.
-	(em_select_folder): Here too.
-
-2003-11-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-component.c (mail_component_get_tree_model): Use
-	em_folder_tree_get_model() since an emft is not a GtkTreeView.
-
-	* em-folder-tree.c (em_folder_tree_get_model): New function to get
-	the tree model.
-
-2003-11-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-selection.c: Rewritten to use EMFolderTRee.
-
-	* mail-vfolder.c (vfolder_load_storage): Updated for function name
-	changes in mail-component.c
-
-	* mail-offline-handler.c: Updated for function name changes in
-	mail-component.c
-
-	* mail-account-gui.c (add_new_store): Fixed to not use EStorage.
-	(mail_account_gui_save): Updated for function name changes.
-
-	* em-account-prefs.c (account_delete_clicked): Updated for
-	function name changes.
-	(account_able_clicked): Same.
-	(account_able_toggled): Same.
-
-	* mail-component.c: Renamed mail_component_*storage*() functions
-	to mail_component_*store*() since we are no longer dealing with
-	storages, but instead with CamelStore's.
-	(create_view_widget): If the user selects a store node, don't try
-	to open it as a folder.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-component.c (impl_sendAndReceive): New, implementation for
-	Evolution.Component.sendAndReceive.
-	(mail_component_class_init): Install.
-
-2003-11-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vfolder.c (context_rule_removed): Modified to not use
-	EStorage* functions. I don't even think it *needs* to remove the
-	folder from the mail-component, the mail-component should just
-	pick it up automagically via CamelStore events.
-
-	* em-folder-tree.[c,h]: New folder-tree widget that replaces the
-	shell's folder-tree widget.
-
-	* em-folder-tree-model.[c,h]: New source files subclassing
-	GtkTreeStore for handling the mess that is drag&drop.
-
-	* em-folder-selection-button.c: Ported to use EMFolderTree.
-
-	* em-folder-selection.c: Ported to use EMFolderTree.
-
-	* em-folder-selector.c: Ported to use EMFolderTree.
-
-	* mail-component.c: Ported to use EMFolderTree.
-
-	* mail-offline-handler.c (storage_go_online): Updated to not pass
-	a storage argument.
-
-	* mail-folder-cache.c: Removed storage stuff.
-
-	* mail-send-recv.c (receive_update_got_store): Don't do EStorage*
-	stuff anymore.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-component.c (impl__get_userCreatableItems): New,
-	implementation for the Component.userCreatableItems attribute.
-	(impl_requestCreateItem): New, implementation for the
-	Component.requestCreateItem() method.
-	(mail_component_class_init): Install.
-
-2003-11-13  Radek Doulik  <rodo@ximian.com>
-
-	* em-junk-filter.c (em_junk_sa_is_available): new helper function,
-	use it before any call to spamassassin, spamc and sa-learn
-	(em_junk_sa_test_spamd): first test if spamassassin is available
-	(em_junk_sa_test_spamd): rename em_junk_sa_spamd_tested to
-	em_junk_sa_tested, always set em_junk_sa_tested
-
-	* mail-folder-cache.c (folder_changed): don't call
-	CAMEL_IS_VJUNK_FOLDER, it was added by mistake
-
-2003-11-13  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (em_format_html_add_pobject): use malloc0 for
-	the pobject memory.
-
-2003-11-12  Not Zed  <NotZed@Ximian.com>
-
-	* mail-account-gui.c (smime_sign_key_select)
-	(smime_encrypt_key_select, smime_encrypt_key_selected)
-	(smime_sign_key_selected): implement the key selector popup using
-	e-cert-selector.
-
-2003-11-11  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (efh_application_xpkcs7mime): output icons of
-	the status.
-	(em_format_html_add_pobject): Changed to take a size specificier,
-	return the pobject, and re-ordered args to be more consistent with
-	puri stuff.
-	(em_format_html_remove_pobject): handle the free callback if set.
-
-	* em-format.c (emf_application_xpkcs7mime): moved this to
-	em-format-html since it needs to do icon stuff.
-
-	* mail-security.glade: new glade file for security related stuff.
-
-	* mail-config.glade: removed the message security dialogue, it
-	gets opened automatically by the config code :(
-
-2003-11-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Set an
-	"evolution:component_alias" property with a value of "mail".
-
-2003-11-10  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (em_format_html_multipart_signed_sign): changed
-	for cipher context api changes.
-	* em-format.c (emf_multipart_signed): ditto.
-
-2003-11-07  Not Zed  <NotZed@Ximian.com>
-
-	* mail-config.glade: added security_information_dialog (probably
-	temporarily in this file).
-
-	* em-format.c (em_format_is_attachment): also treat pkcs7-mime as
-	non-attachment.
-	(emf_application_xpkcs7mime): no longer need to worry about
-	scanning the part.
-
-2003-11-07  Dan Winship  <danw@ximian.com>
-
-	* message-list.c: Don't #include e-name-western.h, since the code
-	that uses it is commented out, and we want to remove the local
-	copy, but we don't want to make the mailer depend on the e-d-s
-	copy if it's not even going to be using it.
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: build the marshall files right at the beginning
-
-2003-11-11  Not Zed  <NotZed@Ximian.com>
-
-	* mail-security.glade: new glade file for security related stuff.
-
-	* mail-config.glade: removed the message security dialogue, it
-	gets opened automatically by the config code :(
-
-2003-11-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Set an
-	"evolution:component_alias" property with a value of "mail".
-
-2003-11-10  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (em_format_html_multipart_signed_sign): changed
-	for cipher context api changes.
-	* em-format.c (emf_multipart_signed): ditto.
-
-2003-11-07  Not Zed  <NotZed@Ximian.com>
-
-	* mail-config.glade: added security_information_dialog (probably
-	temporarily in this file).
-
-	* em-format.c (em_format_is_attachment): also treat pkcs7-mime as
-	non-attachment.
-	(emf_application_xpkcs7mime): no longer need to worry about
-	scanning the part.
-
-2003-11-07  Dan Winship  <danw@ximian.com>
-
-	* message-list.c: Don't #include e-name-western.h, since the code
-	that uses it is commented out, and we want to remove the local
-	copy, but we don't want to make the mailer depend on the e-d-s
-	copy if it's not even going to be using it.
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: Make sure the marshal files are listed above other
-	sources
-
-2003-11-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.c (em_migrate_filter_file): Call em_migrate_uri()
-	instead of em_uri_from_camel().
-	(em_migrate_uri): Special-case file: uri's by converting them into
-	email://local@local/ uri's since these folders will have been
-	migrated to the newer mbox tree structure.
-
-2003-11-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vfolder.c (mail_vfolder_delete_uri): User vfolder rules
-	should be in ${evolution_dir}/mail/vfolders.xml rather than
-	${evolution_dir}/vfolders.xml
-	(mail_vfolder_rename_uri): Same.
-	(store_folder_deleted): Here too.
-	(store_folder_renamed): And here.
-	(vfolder_load_storage): Again here.
-	(vfolder_editor_response): Same.
-	(edit_rule_response): And here.
-	(new_rule_clicked): Here too.
-
-	* mail-session.c (main_get_filter_driver): User filter rules
-	should be in ${evolution_dir}/mail/filters.xml rather than
-	${evolution_dir}/filters.xml
-
-	* mail-autofilter.c (filter_gui_add_from_message): Same.
-	(mail_filter_rename_uri): And here.
-	(mail_filter_delete_uri): Here too.
-
-	* em-utils.c (filter_editor_response): Again here.
-	(em_utils_edit_filters): Same.
-
-	* em-migrate.c (em_migrate_filter_file): Same (also for
-	vfolders.xml)
-
-2003-11-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-migrate.[c,h]: New source files to migrate from the old mail
-	directory to the new mail directory.
-
-	* mail-component.c (mail_component_init): Changed to use
-	~/.evolution and added code to migrate the old mail folders over
-	if ~/.evolution/mail does not yet exist.
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Use "evolution2:config_item"
-	properties for the config item instead of "evolution:config_item"
-	ones.
-
-2003-11-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-view.c: setup filter-on-thread and vfolder-on-thread.
-
-	* mail-autofilter.c (rule_from_message): handle AUTO_THREAD
-	(rule_match_thread): new function to setup a filter on a msgid
-
-2003-10-31  Not Zed  <NotZed@Ximian.com>
-
-	* mail-config.glade: Rearranged smime config slightly, and added
-	encrypt key preference.
-
-	* mail-account-gui.c (mail_account_gui_save,
-	mail_account_gui_new): enable smime always if have_nss.  Added new
-	options in glade file and handle changed names.
-	(smime_changed, smime_sign_key_select, smime_sign_key_clear)
-	(smime_encrypt_key_select, smime_encrypt_key_clear): Add a bunch
-	of mostly dummy UI behaviour management stuff.
-
-2003-10-30  Not Zed  <NotZed@Ximian.com>
-
-	* em-format.c (em_format_is_inline): show application/x-pkcs7-mime
-	inline always by default.
-
-2003-10-30  Not Zed  <NotZed@Ximian.com>
-
-	* em-format.c (emf_multipart_signed): handle
-	application/x-pkcs7-signature.
-
-2003-10-29  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (em_format_html_multipart_signed_sign): handle
-	application/x-pkcs7-signature.
-
-	* em-format.c (emf_application_xpkcs7mime): Handle
-	application/x-pkcs7-mime.
-
-2003-10-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-account-prefs.h: Changed the OAFIID.
-
-	* em-composer-prefs.h: Changed the OAFIID.
-
-	* em-mailer-prefs.h: Changed the OAFIID.
-
-	* GNOME_Evolution_Mail.server.in.in: Changed OAFIIDs for the prefs
-	controls.
-
-2003-10-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Nuked the MailConfig
-	interface stuff.
-
-	* Mailer.idl: Removed. None of the interfaces are needed/used
-	anymore.
-
-	* folder-info.[c,h]: Removed. The summary was the only thing that
-	needed/used this code and it has been nuked into oblivion, so
-	these interfaces are no longer needed.
-
-	* mail-config.c: Removed old crufty CORBA interface snot that is
-	no longer needed or used.
-
-2003-10-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Fixes bug #49816
-
-	* em-popup.c (emp_part_popup_reply_sender): No need to pass a
-	parent window arg anymore.
-	(emp_part_popup_reply_list): Same.
-	(emp_part_popup_reply_all): Here too.
-	(emp_part_popup_forward): Same.
-	(emp_uri_popup_address_send): Here too.
-
-	* em-folder-browser.c (emfb_mail_compose): No need to pass a
-	parent window arg anymore.
-	(emfb_mail_post): Same.
-
-	* em-folder-view.c (emfv_message_reply): Don't pass a parent
-	window argument anymore.
-	(emfv_popup_forward): Same.
-	(emfv_popup_resend): Same here.
-	(em_folder_view_open_selected): Same.
-	(emfv_message_forward_attached): Here too.
-	(emfv_message_forward_inline): And here.
-	(emfv_message_forward_quoted): Same.
-	(emfv_message_redirect): Here too.
-	(emfv_message_post_reply): And here.
-	(emfv_format_link_clicked): ANd finally here.
-
-	* em-utils.c (create_new_composer): Don't set_transient_for()
-	anymore.
-	(em_utils_compose_new_message): No longer takes a parent window
-	argument.
-	(em_utils_forward_attached): No longer takes a parent window arg.
-	(em_utils_forward_inline): Same.
-	(em_utils_forward_quoted): Same.
-	(em_utils_forward_message): Same.
-	(em_utils_forward_messages): Here too.
-	(redirect_get_composer): Don't set_transient_for() here either.
-	(em_utils_redirect_message): No longer takes a parent window arg.
-	(em_utils_redirect_message_by_uid): Same.
-	(reply_get_composer): Don't set_transient_for() here.
-	(em_utils_reply_to_message): No longer takes a parent window arg.
-	(em_utils_reply_to_message_by_uid): Same.
-	(post_reply_to_message): Don't set_transient_for() here.
-	(em_utils_post_reply_to_message_by_uid): No longer takes a parent
-	window arg.
-	(em_utils_compose_new_message_with_mailto): Don't
-	set_transient_for() here.
-	(em_utils_post_to_url): Same.
-	(em_utils_edit_message): No longer takes a parent window arg.
-	(em_utils_edit_messages): Same.
-
-2003-10-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-account-prefs.[c,h]: Re-Namespaced mail-accounts.c
-
-	* em-composer-prefs.[c,h]: Re-Namespaced mail-composer-prefs.c
-
-	* em-mailer-prefs.[c,h]: Re-Namespaced mail-preferences.c
-
-	* mail-accounts.[c,h]: Removed.
-
-	* mail-composer-prefs.[c,h]: Removed.
-
-	* mail-preferences.[c,h]: Removed.
-
-	* mail-account-editor.c: Updated.
-
-	* mail-account-gui.c: Updated.
-
-	* mail-config-factory.c: Updated.
-
-	* mail-component-factory.c: Updated.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Add an
-	"evolution:button_icon" attribute.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Add an
-	"evolution:button_sort_order" attribute.
-
-2003-10-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-component.c (parse_uid_list): Removed, use
-	em_utils_selection_get_uidlist() instead.
-	(drop_uid_list): Use em_utils_selection_get_uidlist() to parse the
-	x-uid-list selection data and use mail_tool_uri_to_folder()
-	directly since we have the uri (originally we expected the first
-	component of the selection data to be the e-storage-set-view
-	folder path rather than the uri).
-	(folder_receive_drop_cb): Call gtk_drag_finish() here.
-
-	* message-list.c: s/x-evolution-message/x-uid-list/
-
-	* em-utils.c: Same.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-component.c (impl_createControls): Use
-	e_storage_browser_peek_widget_scrolled() to retrieve the scrolled
-	window that the EStorageSetView is contained in.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Add an
-	"evolution:button_label" attribute to the Component for use in the
-	shell.
-
-2003-10-22  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (em_copy_folders): handle destination of ""
-	properly.
-	(emc_popup_copy_folder_selected): handle url->path properly, strip
-	leading /.
-	(em_copy_folders): if we just created a new folder on a
-	subscribable store, subscribe to it.
-	(em_copy_folders): handle nonselectable folders specially.
-
-2003-10-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-component.c (drag_text_uri_list, folder_dragged_cb)
-	(drop_uid_list, drop_folder, import_message_rfc822)
-	(drop_message_rfc822, drop_text_uri_list, folder_receive_drop_cb):
-	New functions to handle drag & drop to/from the folder tree.
-	(impl_createControls): Setup drag & drop support.
-
-	* em-format.c (emf_multipart_mixed): Put an <hr> between parts of
-	a multipart.
-
-2003-10-21  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (emc_popup_properties): implement.
-	(emc_popup_properties_got_folder): builds dynamic
-	folder-properties dialogue.
-	(emc_popup_properties_response): set the properties on the folder
-	on an ok response.
-	(emc_popup_properties_free): free the properties working data.
-
-	* mail-folder-cache.c (unset_folder_info): unhook from the right
-	function for message_changed.
-
-2003-10-20  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (emc_popup_new_folder): pass the right object
-	to set_selected().  Fixes a new real bug.  Undid reformatting.
-
-2003-10-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-component.c: General compile fixes.
-	(emc_popup_new_folder): Fixed to not shadow a parameter. Fixes a
-	real bug.
-
-	* mail-component.h: Added some prototypes.
-
-2003-10-13  Not Zed  <NotZed@Ximian.com>
-
-	* em-popup.c (em_popup_create_menu_once): only hookup target free
-	if we have a target set.
-
-	* mail-component.c (load_accounts): removed debug i accidentally
-	left in.
-	(emc_tree_right_click): handle right-click context menu, using an
-	EMPopup table.
-	(emc_popup_*): setup empty popup handlers.
-
-2003-10-13  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-selection.c (em_select_folder): asynchornous folder
-	selection call.
-	(emfs_folder_selected): callback for folder selected.
-
-	* em-folder-view.c (emfv_popup_move): implement.
-	(emfv_popup_copy): "
-	(emfv_popup_move_cb): async folder select callback to run it.
-
-2003-10-10  Not Zed  <NotZed@Ximian.com>
-
-	* mail-account-gui.c
-	(mail_account_gui_folder_selector_button_new): use
-	em_folder_selection_button.
-	(mail_account_gui_new): "
-	(folder_selected): "
-
-	* em-folder-selection-button.c: Make this use camel uri's rather
-	than camelfolders.
-	(set_selection): removed, redundant.
-	(impl_dispose): removed, not needed.
-
-	* em-folder-selection-button.h: change the selected signal not to
-	actually return the selection, which must get retrieved later.
-
-	* mail-component.c (em_uri_from_camel): create an evo mail uri
-	from a camel one.
-	(em_uri_to_camel): the reverse.
-
-	* mail-signature-editor.c (mail_signature_editor): up the version
-	of the gtkhtml editor.
-
-2003-10-09  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-selection-button.c (set_selection): always set
-	selected_folder, otherwise we don't unset it properly.
-
-	* em-folder-selection.c (em_folder_selection_run_dialog): fix a
-	small memleak.
-	(em_folder_selection_run_dialog_uri): do the same as run_dialog
-	but take, and return physical uri's.
-
-	* mail-component-factory.c (factory): removed some fixme's, and
-	re-hookedup the composer.
-
-2003-10-09  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* em-icon-stream.c (emis_sync_close): Use
-	gnome-thumbnail_scale_down_pixbuf if available, for better
-	performance.
-
-2003-10-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-view.c: Add a hide_mask to the
-	create-rule-from-message bars so that we don't segfault when we
-	right click with a multi-selection.
-
-2003-10-08  Chris Toshok  <toshok@ximian.com>
-
-	* em-utils.c (em_utils_camel_address_to_destination): EDestination
-	=> EABDestination, and e_destination => eab_destination.
-	(reply_get_composer): same.
-	(post_reply_to_message): same.
-
-	* em-composer-utils.c (ask_confirm_for_unwanted_html_mail)
-	EDestination => EABDestination, and e_destination =>
-	eab_destination.
-	(composer_get_message):same.
-
-2003-10-08  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (mail_component_peek): setup vfolders once we
-	hve the component, since its setup will call mail_component_peek,
-	fun recursion.
-
-2003-10-08  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (setup_local_folder): removed.
-	(setup_local_store): setup various needed globals properly.
-	(setup_account_storages): renamed to load_accounts.
-	(go_online): turn on interactivity as well as onlinedness.
-
-	* GNOME_Evolution_Mail.server.in.in: point the preferences pages
-	to the right factory.
-
-2003-10-07  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.[ch]: Fix copyrights.
-
-2003-10-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (identity_prepare): Fixed.
-
-	* mail-ops.c (fetch_mail_fetch): Always save the uid cache no
-	matter what.
-
-2003-10-03  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* mail-config-druid.c (identity_prepare), (config_wizard_new):
-	Convert real name to UTF-8 if needed.
-
-2003-10-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-browser.c (emfb_set_folder): Disable the selection of
-	the first unread message for now. This is actually annoying the
-	fuck out of me, Radek, and a few other people.
-
-2003-10-02  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (add_storage): Add the storage to the hash
-	after we've initialised it.
-	(mail_component_evomail_uri_from_folder): hardcode "local" account
-	pseudo-id for local folders.
-	(mail_component_get_folder_from_evomail_uri): handle the "local"
-	account case.
-
-2003-10-02  Not Zed  <NotZed@Ximian.com>
-
-	* mail-component.c (setup_local_store): use mbox:/path rather than
-	mbox:///path - the mbox code is 'wrong', but this is easier to
-	fix.  fixes local unread counts.  maybe the provider url-compare
-	should address this too.
-
-2003-10-02  Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
-
-	* mail-config-druid.c: Fix for 40917 "Backspace shouldn't
-	highlight the whole remaining string in Setup Assistant".
-	(identity_changed): Removed repeated focussing per keystroke.
-	functions
-	(source_changed): Same.
-	(transport_changed): Here too.
-	(management_changed): And here.
-	(identity_prepare): Removed the initial highlighting for Full
-	Name, also the unneeded intial grab_focus.
-
-2003-10-02  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (efh_format_timeout): zero out last_part if
-	we're clearing.  Uh, this fixes, but shouldn't, part of #49034.
-	The problem is the 'last part' logic is based on the address,
-	which can quite easily be repeated for different messages.
-
-	* em-folder-view.c (emfv_list_message_selected): reverted jeff's
-	patch for #48618, use a much simpler method.
-
-	* em-message-browser.c (emmb_destroy): hook onto destroy handler,
-	we need to destroy the messagelist ourselves, since we dont attach
-	it to any parent window.
-
-2003-10-01  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (efh_init): turn off blocking writes.
-	(efh_format_timeout): don't do a htmlbegin on the page yet, it'll
-	be handled by em-html-stream when it has data, to reduce flicker.
-	(efh_format_do): close the main gtkhtml stream as soon as we're
-	done writing the body.  any sub-jobs should be using frames etc.
-	(efh_text_plain): dont write a table around the text, try to
-	reduce flickering.  layout may be out now though.
-
-	* em-html-stream.c (emhs_sync_write): if we have no html_stream
-	yet, begin a new one.
-
-2003-09-30  Rodney Dawes  <dobey@ximian.com>
-
-	* em-format-html-print.c: Use "Sans Regular" instead of "Helvetica"
-	Fixes bug #47878
-	
-2003-09-30  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (efh_init): remove gconf stuff.
-	(em_format_html_set_xmailer_mask): new method to set the xmailer mask.
-
-	* em-folder-view.c (emfv_display_keys[]): Added charset key to
-	monitor/retrieve, and xmailer_mask.
-	(emfv_setting_notify): Monitor charset setting, pass onto the
-	formatter, as well as xmailer_mask.
-
-	* mail-preferences.c (mail_preferences_construct): use the new
-	charset key.
-	(mail_preferences_apply): use the new charset key.
-
-	* evolution-mail.schemas: Moved the mail/format/charset to
-	mail/display/charset.  1. it makes more sense, and 2. it makes
-	notification update easier in em-folder-view.c
-
-	* em-format.c (emf_init): remove the gconf charset stuff, for bug
-	#48791, and also actually fixes the fixme that jeff thought he
-	fixed.
-	(em_format_format_text): use default charset as fallback.
-	(em_format_set_default_charset): New method to set the default charset.
-	(gconf_charset_changed): removed.
-
-2003-09-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format.c (emf_init): Oops, put the arguments in the right order.
-
-2003-09-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-component.c: New member local_store in
-	MailComponentPrivate.
-	(impl_dispose): Unref.
-	(mail_component_load_storage_by_uri): Return the CamelStore.
-	(setup_local_folder): New.
-	(setup_local_store): New.
-	(mail_component_init): Call it.
-	(mail_component_peek_storage_set): New.
-	(mail_component_get_folder_from_evomail_uri): New.
-	(mail_component_evomail_uri_from_folder): New.
-
-	* em-folder-selection-button.c: New.
-	* em-folder-selection-button.h: New.
-
-	* em-folder-selection.c: New.
-	* em-folder-selection.h: New.
-
-	* em-marshal.list: Add NONE:POINTER.
-
-2003-09-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Allow any file: uri
-	to point to a sent or drafts folder.
-
-2003-09-25  Rodney Dawes  <dobey@ximian.com>
-
-	* mail-send-recv.c: Make the dialog more HIG-compliant by fixing
-	widget alignment/spacing issues, and removing separators
-
-2003-09-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-preferences.c (mail_preferences_construct): Same as below.
-
-	* mail-composer-prefs.c (mail_composer_prefs_construct): gconf can
-	return empty string if the charset has not been set, so if the
-	charset string is empty, default the charset to the user's locale
-	charset. Partial fix for bug #47638.
-
-2003-09-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-component.c (add_storage): Remove unused arg "uri".
-	(mail_component_add_store): Likewise.
-	(add_storage): Don't set the "Connecting..." node.
-	(mail_component_init): Set up local store at
-	~/.evolution/mail/local.
-
-	* evolution-mbox-upgrade.c (get_local_store): Remove a double
-	xmlFree() that was causing it to crash.
-
-
-2003-09-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-component.c (add_storage): Note the new store.
-
-	* mail-component-factory.c: Don't include "mail-callbacks.h"
-	anymore.
-
-	* em-format-html.c (em_format_html_get_type): Get the base
-	directory with mail_component_peek_base_directory().
-	* em-utils.c (filter_editor_response): Likewise.
-	(em_utils_edit_filters): Likewise.
-
-	* em-folder-browser.c (emfb_init): Get the search context through
-	mail_component_peek_search_context().
-
-2003-09-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mbox-upgrade.c (get_local_store): Don't xmlFree (name)
-	until after we've g_strdup'd it.
-	(em_migrate_dir): If the metadata file doesn't exist, don't even
-	bother trying subfolers (the shell just ignores them so we should
-	too).
-
-2003-09-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #48791 (and also fixes a FIXME)
-
-	* em-format.c (emf_init): Setup a gconf listener for changes to
-	the charset setting.
-	(gconf_charset_changed): Update the cached gconf charset value.
-	(emf_finalise): Free the EMFormatPrivate data, unref the gconf
-	client, disconnect the charset notify id, and free the cached
-	gconf charset value.
-	(em_format_format_text): Use the cached gconf charset value.
-
-2003-09-22  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #32996
-	
-	* mail-folder-cache.c (real_flush_updates): don't just pass TRUE
-	to the 'can work offline' parameter of new shell folder.
-
-	** See bug #39410
-	
-	* mail-ops.c (prep_offline_do): sync all messages, not just
-	unread or flagged ones.
-
-2003-09-22  Not Zed  <NotZed@Ximian.com>
-
-	* em-popup.c (emp_uri_popup_link_copy): removed, moved to
-	em-folder-view, for now, it has access to an invisible.
-
-	* em-folder-view.c (emfv_setting_notify): honour the load_http
-	setting, at least the all setting.
-	(emfv_format_popup_event): setup the popup menu item for copy link
-	location here.
-
-2003-09-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-preferences.c (mail_preferences_construct): Connect to
-	"value-changed" rather than "changed" for spin buttons.
-
-2003-09-21  Not Zed  <NotZed@Ximian.com>
-
-	* mail-session.c (ms_thread_msg_new): implement, we hook into the
-	mail progress reporting stuff by overriding the CamelOperation
-	member with one from a dummy mail_msg.
-	(ms_thread_msg_free): handle freeing.
-
-	* mail-mt.c (mail_msg_free): mute the camel-operaiton when we free
-	it so we no longer get updates.
-
-2003-09-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-message-browser.c (emmb_set_message): Set the window title to
-	be that of the message subject. Fixes bug #48617.
-
-2003-09-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #48618.
-
-	* em-folder-view.c (emfv_list_message_selected): See if we have
-	already loaded the message uid that has just been selected, if so
-	- don't bother re-loading it.
-	(emfv_list_done_message_selected): Update loaded_uid and
-	loading_uid.
-
-2003-09-18  Radek Doulik  <rodo@ximian.com>
-
-	* em-format-html.c (efh_init): use gtkhtml's blocking
-
-2003-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-inline-filter.c: updated for CamelTransferEncoding namespace
-	changes
-
-	* em-inline-filter.h: updated for CamelTransferEncoding namespace
-	changes
-
-	* mail-ops.c: updated for CamelTransferEncoding namespace changes
-
-2003-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c: updated for camel namespace changes
-
-	* em-folder-view.c: updated for camel namespace changes
-
-	* em-format-html-display.c: updated for camel namespace changes
-
-	* em-format-html-quote.c: updated for camel namespace changes
-
-	* em-format.c: updated for camel namespace changes
-
-	* em-popup.c: updated for camel namespace changes
-
-	* em-utils.c: updated for camel namespace changes
-
-	* mail-autofilter.c: updated for camel namespace changes
-
-	* mail-ops.c: updated for camel namespace changes
-
-	* mail-session.c: updated for camel namespace changes
-
-	* message-list.c: updated for camel namespace changes
-
-	* message-tag-followup.c: updated for camel namespace changes
-
-	* importers/evolution-mbox-importer.c: updated for camel namespace
-	changes
-
-2003-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-popup.c (emp_standard_menu_factory): Don't forget to
-	initialise/increment 'i' when using it as an object id in the
-	for-loop.
-
-	* em-format.c (em_format_format_text): Initialise charset to NULL
-	or it may be used uninitialised. Also include
-	gnome-vfs-mime-handlers.h for gnome_vfs_mime_type_get_description().
-
-	* Makefile.am: Added $(MARSHALL_GENERATED) to $(BUILT_SOURCES) so
-	that em-marshal.[c,h] were autogenerated.
-
-2003-09-17  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c, folder-browser.h, folder-browser-ui.c
-	folder-browser-ui.h, mail-callbacks.c, mail-callbacks.h
-	mail-display.c, mail-display.h, mail-display-stream.c
-	mail-display-stream.h, mail-format.c, mail-format.h
-	mail-identify.c, mail-search.c, mail-search.h message-browser.c,
-	message-browser.h, subscribe-dialog.c subscribe-dialog.h,
-	mail-font-prefs.c, mail-font-prefs.h: cvs removed.
-
-	* Makefile.am: Removed mail-font-prefs.[ch], hasn't been built for
-	ages.
-
-	* em-*.c: killed a bunch of printfs.
-
-	* em-format-html-display.c (efhd_html_button_press_event): update
-	for html object api chagnes.
-
-	** Merge in mail-refactor-2 branch.
-
-2003-09-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mbox-upgrade.c: New source file to migrate from the
-	old mbox structure to the new mbox structure.
-
-2003-09-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-folder-cache.c (mail_note_store): Allow NULL storage in
-	precondition.
-
-	* mail-component.c (mail_component_init): Remove debugging
-	message.
-
-2003-08-22  Not Zed  <NotZed@Ximian.com>
-
-	* mail-format.c (write_date): translate the local time format.
-
-2003-08-20  David Woodhouse  <dwmw2@infradead.org>
-
-	* mail-format.c (write_date): Use e_utf8_strftime() to generate
-	localised time; avoid gratuitous extra translation and array of
-	day names, and the autoconf magic which made Not Zed dislike the
-	inclusion of the timezone name.
-
-2003-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Rename
-	GNOME_Evolution_Mail_Component2 to
-	GNOME_Evolution_Mail_Component_2 and GNOME_Evolution_Mail_Factory2
-	to GNOME_Evolution_Mail_Factory_2.
-	* mail-component-factory.c: Update accordingly.
-
-2003-08-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (main_get_filter_driver): Removed the
-	new-mail-notification mess.
-
-	* mail-folder-cache.c (notify_idle_cb): New idle callback to alert
-	the user about new mail.
-	(notify_type_changed): New function to intercept user changes to
-	his/her notification settings changes.
-	(real_flush_updates): Initialise new mail notification if not yet
-	initialised and setup an idle callback if none is already set.
-	(update_1folder): Now takes an additional argument `new' which
-	states whether or not the fodler got any new mail so that we may
-	handle notify the user (if needed).
-	(folder_changed): Pass in the number of new messages received.
-
-2003-08-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Added a comment for
-	translators.
-
-2003-08-19  David Woodhouse  <dwmw2@infradead.org>
-
-	* mail-callbacks.c (mail_generate_reply): Add a timezone offset to
-	the attribution string.
-
-2003-08-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-format.c (write_date): Added translation for day and
-	localtime strings.  Also removed the tz_zone stuff, and just use
-	'localtime' always.
-
-2003-08-15  David Woodhouse  <dwmw2@infradead.org>
-
-	* mail-format.c (write_date): Show date in localtime too.
-
-2003-08-19  Harry Lu  <harry.lu@sun.com>
-
-	** For #45348
-
-	* mail-display.c (mail_display_render): Change "%P" to "%p" so 
-	that strftime() can work under solaris.
-
-2003-08-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_send_message): Don't abort at the first failure
-	after sending (filtering, appending to Sent, syncing). Instead,
-	keep a running tab of exceptions and then set a culmulative
-	exception at the end to report to our caller. Also, if we fail to
-	append to the account Sent folder, try again with the local Sent
-	folder. Fixes bug #46512.
-
-2003-08-13  Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
-	
-	* e-searching-tokenizer.c (searcher_next_token): Fix for 45818 (
-	i18n mail messages search only produces '[?]'). Now multibyte
-	character selection works correctly. But due to associated gtkhtml
-	bug, the find button functionallity for multibyte characters is
-	broken.
-
-2003-08-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-tools.h: Removed unused function prototype.
-
-2003-08-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (remove_timeout): Removed.
-	(register_timeout): Removed.
-
-2003-08-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-component.c (storage_go_online): Pass NULL for the
-	operation pointer to mail_note_store(), to sync with Michael's
-	changes.
-
-2003-08-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_multipart_encrypted): Updated for
-	CamelMimePart::content_type changes.
-
-	* mail-ops.c (save_part_save): Use
-	camel_data_wrapper_decode_to_stream() here.
-
-	* mail-display.c (drag_data_get_cb): Updated for
-	CamelMimePart::content_type changes.
-	(do_attachment_header): Same.
-
-2003-07-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_format_raw_message): Updated to pass FALSE
-	as the 'decode' param to
-	mail_format_data_wrapper_write_to_stream().
-	(mail_format_data_wrapper_write_to_stream): Now takes a boolean
-	arg telling whether to decode or not. Also reworked the charset
-	logic now that camel doesn't handle this for us any longer.
-	(mail_format_get_data_wrapper_text): Updated.
-	(handle_text_plain): Same.
-	(handle_text_enriched): Here too.
-
-	* mail-display.c (do_attachment_header): Call decode_to_stream
-	here instead of write_to_stream.
-	(do_external_viewer): Same.
-	(on_url_requested): Same. Also updated for
-	mail_format_data_wrapper_write_to_stream().
-	(try_part_urls): Call decode_to_stream.
-	(drag_data_get_cb): Same.
-
-2003-08-05  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #32732
-
-	* message-list.c (mail_regen_list): use thread_new.
-
-	* mail-local.c (reconfigure_response): use thread_new.
-
-	* mail-display.c (stream_write_or_redisplay_when_loaded): use
-	thread_new.
-
-	* mail-config.c (mail_config_check_service): use thread_new rather
-	than queue.
-
-	* mail-callbacks.c (view_msg): change to use mail_get_messages(),
-	fixes FIXME.
-	(do_view_messages): handle get_messages callback.
-	(do_view_message): removed.
-
-	* mail-ops.c (mail_get_folderinfo): Use a new thread thread
-	semantic.
-	(mail_save_part): "
-	(mail_store_set_offline): "
-	(mail_sync_folder): use queued_slow thread queue.
-	(mail_expunge_folder): "
-	(mail_empty_trash): "
-
-	** See bug #47224.  Hook onto clicked rather than button_pressed,
-	so that dnd works.
-	
-	* mail-display.c (inline_toggle): toggle a part inline.
-	(button_press): change back to only handle button clicked events,
-	renamed to inline_button_clicked.
-	(do_attachment_header): hook onto clicked rather than
-	button_press_event, and move key_press_event to
-	inline_button_pressed.
-	(do_signature): Same.
-	(inline_button_pressed): handle inline button key press event
-	explicitly.
-
-2003-07-29  Not Zed  <NotZed@Ximian.com>
-
-	* mail-folder-cache.c (mail_note_store): add a CamelOperation for
-	overriding status handler.
-
-	* mail-send-recv.c (receive_update_got_store): Pass our own cancel
-	handle to get_folderinfo and mail_note_store.
-	(mail_send_receive, mail_receive_uri): Same for get_store.
-
-	* mail-ops.c (mail_get_store, mail_get_folderinfo): Add a
-	CamelOperation argument, for overriding the status handler.  Fixed
-	most calles to pass NULL to use the default.
-
-2003-09-15  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-browser.c (emfb_activate): remove warning about folder
-	not being loaded yet - it basically never is.
-
-	* em-popup.c (emp_standard_menu_factory): dont setup any global
-	select menu's yet.  they're all handled by folderview atm.
-
-2003-09-11  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (efh_finalise, efh_format_timeout): Use a
-	proper hash free func, otherwise it dont work.
-
-2003-09-11  Not Zed  <NotZed@Ximian.com>
-
-	* em-inline-filter.[ch]: A new class which implements an inline
-	snooper via a mime filter, so it is fully streamable.  contents
-	merely passes through the filter.
-
-	* em-format-html.c (efh_finalise): free text substitute parts
-	table.
-	(efh_text_plain): transform a text part into a multipart, scanning
-	for inline data.  Keep the multipart around for redraws.
-	(efh_format_timeout): clear the text substitute parts table.
-
-2003-09-10  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html-display.c (efhd_init): hook onto realise so we
-	get the real theme-applied style.
-	(efhd_gtkhtml_realise): get the theme data for colour defaults.
-	Tweak the colour selection to make it work better with dark
-	themes.
-
-	* em-format-quote.c (emfq_format_source): we need to implement
-	this.
-	(emfq_format_error): we need not to call parent, it doesn't
-	implement it.
-
-	* message-list.c (message_list_select_uid): don't emit
-	changedhere, let it go through the table cursor change.
-
-	* em-folder-browser.c (em_folder_browser_show_preview): use
-	folderview.preview_active for this state.
-	(em_folder_browser_show_preview): clear the current message when
-	we turn off the message view, and load the current one when turn it on.
-
-	* em-folder-view.c (emfv_destroy): zero out preview + list.
-	(emfv_list_message_selected): check preview_active before doing
-	anything.
-	(emfv_edit_cut):
-	(emfv_edit_copy): only run if preview active.
-
-	* em-format-html.c (efh_format_do): output the proper html
-	headers, etc.
-
-2003-09-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Allow the user to
-	select any fodler for his/her Drafts and Sent folders. Fixes bug
-	#45412.
-
-2003-09-09  Not Zed  <NotZed@Ximian.com>
-
-	* em-utils.c (forward_non_attached): implement forward quoted.
-
-	* em-format-quote.[ch]: New class, em-format-html-quote wont cut
-	it.  Sigh.
-
-	* em-format-html-quote.c (efhq_base_init): move type init stuff
-	here.
-	(efhq_complete): remove, this is a signal.
-	(efhq_multipart_related): we need to override the base class, we
-	don't want to output any attachment html.
-
-	* em-format-html-print.c (efhp_base_init): move builtin type init
-	to here.
-
-	* em-format-html.c (efh_init): get xmailer mask from gconf (sigh).
-	(efh_format_header): inmplement most of xmailer mask thing.
-	rupert icon not done yet, probably needs to be done as part of
-	em-format-html-display, sigh.
-	(type_builtin_table[]): add image/svg to supported image formats.
-	(efhd_base_init): move type init to here.
-	(efh_text_enriched): write to the filtered_stream, not stream.
-
-	* em-format.c (em_format_format_text): oops, actually use any
-	supplied charset.
-	(emf_base_init): move hashtable init into base_init, so we get a
-	new copy for each derived class too.
-
-	* mail-send-recv.c (build_dialogue): use an eclippedlabel for
-	status.  Fixed all uses.
-
-2003-09-08  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.h (EMFormatHTML): added a simple_headers option,
-	only output headers in basic format.  Added hide_headers option,
-	to disable all header output.
-
-	* em-format-html-quote.c (efhq_format_message): blockquote the
-	contnet, thats how you cite it!
-	(efhq_init): turn on simple headers for html output.
-	(efhq_format_message): output headers and part directly, bypassing
-	parent format_message.
-	(efhq_format_message): implement hide_headers.
-
-	* em-format-html.c (efh_busy): implement busy.
-	(efh_format_message): implement simple_headers option.
-	(efh_format_text_header): implement simple_headers option.
-	(efh_format_message): move the header formatting stuff into
-	exported em_format_html_format_headers.
-	(efh_format_message): only output headers if not hidden.
-
-	* em-format.c (emf_busy): base implementation of a new virtual
-	method, returns TRUE if the object is still busy
-	rendering/downloading stuff.
-
-	* em-utils.c (em_utils_message_to_html): renamed from
-	em_utils_quote_message.  Also make sure the html conversion is
-	complete before getting the data.
-	(em_utils_part_to_html): similar, but for parts.
-	(composer_set_body): put in David Woodhouse's timezone in
-	attribution patch.
-	(composer_set_body): we want to quote the part (content), we don't
-	want message headers.
-	(em_utils_message_to_html): add a 'show headers' argument.
-
-	* folder-browser-factory.c (control_activate): removed.
-	(control_deactivate): removed.
-
-	* mail-identify.c: 
-	* folder-browser.[ch], folder-browser-ui.[ch]: 
-	* mail-callbacks.[ch], mail-search.[ch]:
-	* mail-display.[ch], mail-format.[ch], mail-display-stream.[ch]:
-	* message-browser.[ch]: Removed, fixed all users.
-
-	* component-factory.c (factory): change callbacks to em_utils
-	ones.
-	(configure_folder_popup): comment out some of the reconfigure
-	stuff.  Wont have it in 1.6?
-	(handle_external_uri_cb): use em_utils stuff.
-	(user_create_new_item_cb): "
-	(owner_unset_cb): "
-
-	* em-composer-utils.c (composer_send_cb): rename to
-	em_utils_composer_send_cb, and export, sigh, needed for factory.
-	(composer_save_draft_cb): Same.
-
-2003-09-05  Not Zed  <NotZed@Ximian.com>
-
-	* em-format.c (type_builtin_table[]): Add a fallback multipart/*
-	for other types (e.g. multipart/report)
-	(em_format_fallback_handler): fix some bad logic.
-
-	* em-folder-browser.c: track the pane size if the user changes it.
-	(emfb_set_folder): Added a bit of a mess that will select the
-	first unread message the first time you visit a folder.
-	(emfb_destroy): impelment.  clear up outstanding signal handlers.
-	(emfb_list_built): Select the first unread message.  this isn't
-	entirely reliable as yet, and not configurable at all.
-
-	* em-format-html-display.c (em_format_html_display_set_animate)
-	(em_format_html_display_set_caret_mode): guess? :)
-	(efhd_attachment_button): dont desensitise the button, just dont
-	hook onto it, otherwise it looks fugly.
-
-	* em-folder-view.c (emfv_list_done_message_selected): dont lookup
-	gconf values every time.  use g_timeout_add rather than
-	gtk_timeout, remove fixme's.
-	(emfv_setting_notify): listner for gconf changes, reflect
-	internally.
-	(emfv_setting_setup): setup listner for gconf, and read initial
-	settings.
-	(emfv_activate): use local copy of settings rather than snooping
-	gconf.
-	(emfv_caret_mode): propagate caret-mode to display
-
-	* em-format-html-quote.c (efhq_format_message): remove gconf
-	stuff, our parent already has citation colour.
-
-	* em-format-html.c (efh_format_timeout): remove gconf stuff.
-	(em_format_html_set_load_http, em_format_html_set_mark_citations):
-	set options on formatter, re-renders if required.
-	(type_builtin_table[]): text/* should go to text/plain, not
-	text/enriched.
-
-2003-09-04  Not Zed  <NotZed@Ximian.com>
-
-	* em-utils.c (confirm_expunge): rename it to emu_confirm_expunge
-	and remove leading whitespace before function.
-	(em_utils_expunge_folder): we want to expunge the folder, not
-	empty the trash.  Jeff didn't even run this once ...
-
-	* em-popup.c: Lots of new features, 'global' popup menu's on a
-	per-selection type, via factories, popup selections (targets), a
-	standard factory for many menu items.
-	(emp_apps_open_in): duh, fix uri using logic
-	(emp_standard_menu_factory): only add apps to app list if
-	!requires_terminal.
-
-	* em-format-html-display.c (efhd_open_in, efhd_popup_free_items):
-	moved to em-popup.c
-	(efhd_popup_save_attachment, efhd_popup_save_message) 
-	(efhd_popup_reply_sender, efhd_popup_reply_list) 
-	(efhd_popup_reply_all, efhd_popup_forward): (re)moved to em-popup.c
-	(efhd_attachment_popup): use enew popu stuff.
-	(efhd_attachment_button): Scale the icons for mime-type icons.
-
-	* em-folder-view.c (em_folder_view_disable_mask): removed
-	... moved to em-popup.
-	(em_folder_view_get_popup_target): new method, get the selection
-	target for the folder view.
-	(emfv_html_popup_saveas, emfv_html_popup_link_open)
-	(emfv_html_popup_link_copy, emfv_html_popup_address_send)
-	(emfv_html_popup_address_add, emfv_format_popup_free_items): moved
-	to em-popup.c
-	(emfv_format_popup_event): use new popup stuff.
-	(emfv_popup): use new popup stuff, but still just use all local
-	menu's.
-
-2003-09-03  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (emfv_format_popup_event): implement, a popup
-	menu for right-clicking on links and images.
-	(emfv_html_popup_link_copy): implement.
-	(emfv_init): setup an invisible for selection stuff.
-	(emfv_destroy): free invisible
-
-	* em-utils.c (em_utils_get_proxy_uri): utility to get the current
-	system proxy setting.
-	(emu_set_proxy): implementation.
-
-	* em-camel-stream.[ch]: removed.
-
-	* em-format-html.c (efh_url_requested, efh_format_timeout): use
-	em_html_stream rather than em_camel_stream.
-	(emfh_gethttp): set the system proxy on the new stream.
-	(emfh_multipart_related_check): use puri rather than purin inside
-	the loop - duh.
-	(emfh_multipart_related_check): removed 'unrelated part' warning,
-	they can be (and normally are) added by the callbacks.
-
-	* em-format-html.h (EMFormatHTMLJob): s/estream/stream/
-
-	* em-html-stream.[ch]: New subclass of emsyncstream, replacement
-	for em-camel-stream.
-
-2003-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-browser.c (emfb_folder_expunge): Call
-	em_utils_expunge_folder instead.
-
-	* em-utils.c (em_utils_expunge_folder): New function.
-	(confirm_expunge): Make private.
-
-2003-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-browser.c (emfb_folder_expunge): Confirm hat the user
-	wants to expunge.
-	(emfb_empty_trash): Implemented.
-
-	* em-utils.c (em_utils_prompt_user): Make public (used to be
-	e_question).
-	(em_utils_confirm_expunge): New function to confirm that the user
-	wants to expunge.
-	(em_utils_empty_trash): New function to empty all Trash folders.
-
-	* em-composer-utils.c: Get rid of e_question and use em-utils'
-	em_utils_prompt_user() function instead.
-
-	* em-format-html-quote.[c,h]: New formatter for quoting
-	replies/forwards/etc.
-
-	* em-utils.c (em_utils_quote_message): New function.
-	(composer_set_body): Use the new em_utils_quote_message()
-	function.
-	(em_utils_temp_save_part): Only g_free mfilename if it was
-	malloc'd.
-
-	* mail-tools.c (mail_tool_quote_message): Removed.
-	(mail_tool_forward_message): Removed.
-
-2003-09-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format.c (em_format_class_remove_handler): New function to
-	remove a mime-type handler from a class.
-
-	* em-format-html.c (efh_init): Set the CITATION bit for the
-	default html flags.
-
-	* em-format-html-display.c: Fixed some compiler warnings by adding
-	appropriate includes.
-	(efhd_multipart_signed): Don't write "inlined signature...".
-
-2003-09-03  Not Zed  <NotZed@Ximian.com>
-
-	* em-icon-stream.[ch]: New subclass of emsyncstream, write camel
-	stream one side, creates an icon on the other.
-
-	* em-sync-stream.[ch]: New file, an abstract class for creating
-	write-any-thread-act-gui-thread stuff.  'em-camel-stream' will
-	subclass this.
-
-	* em-format-html-display.c (efhd_attachment_button): setup a job
-	to write out an icon if the type is an image type, otherwise try
-	and get the icon directly.  no caching yet.  the system icons
-	aren't scaled properly either.
-	(efhd_write_icon_job): async job to write out image content.
-
-2003-09-02  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html.c (emfh_new_job): renamed to
-	em_format_html_job_new and made public.
-	(emfh_queue_job): renamed to em_format_html_job_queue, and made
-	public.
-
-	* em-format-html.h: Made EMFormatHTMLJob a public structure.
-
-2003-09-02  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.h (struct _EMFolderView): track the uicomponent
-	while we're activated.
-
-	* em-message-browser.c (em_message_browser_window_new): kill
-	warning.
-	(emmb_init, emmb_finalise): kill printf
-
-	* em-format-html.c (efh_format_header): Converted code from head
-	from David Woodhouse <dwmw2@infradead.org>'s timezone display
-	patch.
-	(efh_format_text_header): support new flag, HEADER_HTML - header
-	alredy in html format.
-
-	* em-format-html-print.c (em_format_html_print_print): only ref
-	print_config if != NULL.
-
-	* em-folder-browser.c (emfb_tree_key_press): handle
-	space/backspace in messagelist to scroll the message view.
-	(emfb_create_view_menus): setup view menu's, this should probably
-	live in message-list.
-	(emfb_init): setup the folderbrowser enable map into the list.
-	(emfb_enable_map): folder browser enable map
-
-	* em-utils.c (em_utils_adjustment_page): new helper to scroll an
-	adjustment up/down 1 page.
-
-	* em-folder-view.c (emfv_list_double_click): implement, open
-	window.
-	(emfv_list_key_press): implement keybinding overrides.  Enhance
-	delete key to undelete if everything is already deleted.
-	(emfv_build_enable_mask): separate out enable mask creation.
-	(emfv_popup): use above to get mask.
-	(emfv_enable_menus): enable/sensitize menus, use the same disable
-	mask system as used for the popups.
-	(emfv_destroy): change to use g_source_remove on seen_id.
-	(emfv_finalise): free up folders, clean up async event thing.
-	(emfv_init): setup an async event handler
-	(emfv_set_folder): handle hook/unhook of folder_changed events.
-	(emfv_folder_changed): proxy folder changed to main thread, ignore
-	the details of what changed.
-	(emfv_gui_folder_changed): update the menu's to reflect any folder
-	changes.
-	(emfv_build_disable_mask): added CAN_THREADED.
-	(em_folder_view_disable_mask): make public (rename from
-	emfv_build_disable_mask).
-	(emfv_enable_menus): changed to work on a list of arrays of
-	enablers, so they can be subclassed.
-	(emfv_init): add our enable map to the ui.
-	(em_folder_view_disable_mask): added support for can hidden (there
-	are hidden messages).
-
-2003-09-01  Not Zed  <NotZed@Ximian.com>
-
-	* em-popup.c: New, simple menu-merging popup menu implementation.
-	NOTE: should be temporary, but needs something that has similar
-	merging facilities.
-
-	* em-folder-view.c (emfv_popup*): added popup callbacks, implement
-	a popup menu, using em_popup.
-	(emfv_message_*): replaced a whole bunch of one-line, or simple
-	functions with macro's to map to the popup implementation.
-	(emfv_tools_vfolder*, emfv_tools_filter*): map to popup
-	equivalents.
-	(emfv_init): drop printf
-
-	* em-format-html-display.c (efhd_attachment_popup): use the
-	em_popup stuff to build a dynamic menu.
-
-	* em-utils.c (em_utils_temp_save_part): change assignment order ot
-	kill warning.
-	(emu_get_save_filesel): handle null/empty name by appending / to
-	the filename.
-
-2003-08-30  Not Zed  <NotZed@Ximian.com>
-
-	* mail-search.glade: forgot to add this yesterday.
-
-	* em-utils.h: don't include stuff we dont need to.
-
-	* em-folder-view.c (emfv_message_forward): just call
-	em_utils_forward_messages.
-	
-	* em-format-html-display.c (em_format_html_display_search):
-	removed unused.
-	(efhd_drag_data_get): cleanup, use em_utils_temp_save_part.
-	(efhd_attachment_popup): quick hack, setup a bunch more menu
-	items, for forwarding inline messages, hook up saving parts, and
-	messages, and hook up the 'open in' menu.
-	(efhd_open_in): implement.
-
-	* em-utils.c (em_utils_save_message): Renamed to
-	em_utils_save_part.
-	(em_utils_filesel_prompt): removed, it just makes things more
-	complex than having a single response handler.
-	(em_utils_save_part): move dialog stuff here, it also creates a
-	name based on the type of part its given.
-	(emu_get_save_filesel): new method to create a fileselector with
-	standard options.
-	(emu_save_part_response): handle file selector response for save
-	part.
-	(can_save): renamed to emu_can_save
-	(em_utils_save_messages): use get_save_filesel
-	(emu_can_save): handle the path="" case
-	(em_utils_save_part): Add a prompt argument.
-	(filesel_ok_cb): removed.
-	(emu_update_save_path): update the gconf save_dir setting.
-	(em_utils_forward_messages): helper to forward using default
-	style.
-	(forward_non_attached): remove uids argument.
-	(em_utils_forward_message): helper to forward a message using the
-	default forward style.
-	(forward_non_attached): removed folder argument.
-	(em_utils_temp_save_part): helper to save a part to a temporary
-	file, e.g. for dnd, app launch, etc.
-
-2003-08-29  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c: set 'outgoing' properly.
-
-	* em-folder-browser.c (emfb_tools_subscriptions): enforce a single
-	instance of the subscribe editor.
-	(emfb_subscribe_editor_destroy): clear subscribe editor handle.
-
-2003-08-29  Not Zed  <NotZed@Ximian.com>
-
-	* em-camel-stream.c (em_camel_stream_new): Added some optional
-	logging code.
-	(stream_close): and here.
-	(stream_write): and here.
-
-	* em-folder-browser.c (emfb_init): remove fixme about search bar,
-	its there now.  also fixme's about dnd/selection, they are handled
-	in lower-level widgets.
-	(em_folder_browser_show_preview): dont exit if show preview set,
-	but only if it hasn't changed.
-	(emfb_view_hide_selected, emfb_view_show_all) 
-	(emfb_view_hide_read): removed some spurious printfs.
-
-	* Makefile.am (glade_DATA): Added mail-search.glade.  FIXME:
-	should all glade files be merged into 1?
-
-	* em-format-html-display.c (efhd_format_clone): remove search
-	match count code from here - wont be finished rendering at this
-	point anyway.
-	(em_format_html_display_search): new api for running an
-	interactive search popup.
-	(efhd_update_matches, efhd_update_search)
-	(efhd_search_entry_activate, efhd_search_case_toggled)
-	(efhd_search_response): helpers/callbacks for search popup.
-	(efhd_class_init): hook into complete signal on EMFormat.
-	(efhd_complete): complete rendering handler, update match count.
-
-	* em-folder-view.c: removed fixme about api's - yes, do need two
-	set_folder api's.
-	(emfv_edit_cut, emfv_edit_copy): removed printfs
-	(emfv_edit_paste): removed commented call to html_paste, we never
-	want to do that.
-
-2003-08-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-view.c (emfv_message_mark_unread): If there is a
-	mark-as-read timeout handler registered, unregister it here.
-	(emfv_tools_filter_mlist): Implemented.
-	(emfv_tools_filter_recipient): Implemented.
-	(emfv_tools_filter_sender): Implemented.
-	(emfv_tools_filter_subject): Implemented.
-	(emfv_tools_vfolder_mlist): Implemented.
-	(emfv_tools_vfolder_recipient): Implemented.
-	(emfv_tools_vfolder_sender): Implemented.
-	(emfv_tools_vfolder_subject): Implemented.
-
-2003-08-28  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-browser.c (emfb_search_menu_activated)
-	(emfb_search_config_search, emfb_search_search_activated)
-	(emfb_search__query_changed): Implement search-bar callbacks.
-	(emfb_init): setup search bar.
-
-2003-08-28  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (emfv_message_reply): common reply code entry
-	point, also implement simple reply-to-highlighted text (currently
-	disabled).
-	(emfv_activate): disable resend message on non-sent folders.
-	(emfv_message_reply_all, emfv_message_reply_list)
-	(emfv_message_reply_sender): use message_reply for common code.
-	(em_folder_view_open_selected): in drafts or outbox, edit the
-	message instead.
-	(emfv_activate): force a sync on deactivate.
-
-	* em-utils.c (em_utils_selection_get_mailbox): get mailbox
-	(message/rfc822?) selection data.
-	(em_utils_read_messages_from_stream): helper to move stuff from a
-	mbox stream to a folder.
-	(em_utils_folder_is_drafts, em_utils_folder_is_sent)
-	(em_utils_folder_is_outbox): from folder browser helpers for
-	customising the user experience.
-
-	* message-list.c (message_list_construct): hook onto dnd stufd.
-	(ml_tree_drag_data_get): implement drag sending.
-	(ml_tree_drag_data_received): implement drag recieving.
-
-	* em-format-html-display.c (efhd_drag_data_get): implemented.
-	(efhd_drag_data_delete): implemented.
-	(efhd_attachment_button): setup dnd callbacks.
-
-2003-08-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-view.c (emfv_destroy): override the destroy method for
-	GtkObject - unregister the mark-as-seen timeout if one is
-	currently registered.
-	(emfv_list_done_message_selected): Add the mark-as-seen timeout
-	functionality here.
-	(emfv_format_link_clicked): Implemented.
-
-2003-08-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-utils.c (get_reply_list): Implemented.
-
-2003-08-27  Not Zed  <NotZed@Ximian.com>
-
-	* em-message-browser.c (emmb_activate): disable Edit->Paste menu
-	always.
-
-	* em-folder-browser.c (emfb_edit_paste): do a message-list paste,
-	not a html one.
-	(emfb_edit_cut, emfb_edit_copy, emfb_edit_paste): Moved to folder-view.
-
-	* message-list.c (message_list_paste): trigger a paste action.
-	(message_list_set_folder): added a uri argument, and save it
-	internally, fixed all callers.
-	(message_list_finalise): free the folder uri.
-
-	* em-utils.c (em_utils_selection_set_mailbox): New helper to set
-	the current selection as text in a berkely mailbox format.
-	(em_utils_write_messages): helper to write stuff to a stream in
-	mbox format.
-
-2003-08-27  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (on_selection_changed_cmd): own/deown the primary
-	selection when it changes.
-	(message_list_init): init private data and invisible for
-	selection.
-	(message_list_destroy): free invisible.
-	(message_list_finalise): free private data.
-	(get_selected_cb): removed.
-	(message_list_copy): new method to do copy and cut.  cut/copy to
-	the clipboard.
-	(ml_selection_clear_event): clear the right selection when
-	requested.
-	(message_list_has_primary_selection): helper to find out if the
-	message-list has the selection.  is there a gtk way for this?
-
-2003-08-26  Not Zed  <NotZed@Ximian.com>
-
-	* mail-local.c (mlf_meta_set, mlf_meta_get): proxy meta-data stuff
-	to subservient folder.
-
-2003-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* em-folder-view.c (emfv_init): init preview here always.
-
-2003-08-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-view.c (em_folder_view_print): Use
-	e_dialog_set_transient_for().
-	(emfv_message_delete): Fixed a FIXME.
-
-	* em-folder-browser.c (emfb_edit_cut): Implemented.
-	(emfb_edit_copy): Implemented.
-	(emfb_edit_paste): Implemented.
-
-	* em-format-html-display.c (em_format_html_display_cut): New function.
-	(em_format_html_display_copy): New.
-	(em_format_html_display_paste): New.
-
-2003-08-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-utils.c (em_utils_flag_for_followup): Use
-	e_dialog_set_transient_for().
-	(em_utils_filesel_prompt): Same.
-	(post_reply_to_message): Here too.
-	(em_utils_edit_filters): Same.
-	(create_new_composer): And here.
-	(em_utils_compose_new_message_with_mailto): Here too.
-	(em_utils_post_to_url): "
-	(redirect_get_composer): Same.
-	(reply_get_composer): Again...
-
-	* em-folder-browser.c (emfb_tools_filters): Implemented.
-
-	* em-utils.c (em_utils_edit_filters): New function to open the
-	filter editor dialog.
-
-2003-08-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-utils.c (em_utils_flag_for_followup): Implemented.
-	(em_utils_flag_for_followup_clear): Implemented.
-	(em_utils_flag_for_followup_completed): Implemented.
-
-	* em-folder-view.c (emfv_message_followup_flag): Implemented.
-	(emfv_message_followup_clear): Implemented.
-	(emfv_message_followup_completed): Implemented.
-
-2003-08-22  Not Zed  <NotZed@Ximian.com>
-
-	* em-camel-stream.c (em_camel_stream_new): now take the gtkhtml
-	too, and hook onto it's destroy so we don't try writing anymore
-	after its gone.
-	(stream_write, stream_flush, stream_close, emcs_gui_received):
-	NOOP if the gtkhtml has been destroyed.
-	(emcs_gtkhtml_destroy): null out the stream when the gtkhtml gets
-	destroyed, it is no longer valid.
-	(emcs_gui_received): dont try to soak all outstanding events, it
-	always runs synchronous anyway, just get one and exit.
-
-	* em-format-html.c (efh_gtkhtml_destroy): if the gtkhtml gets
-	destroyed, abort any pending timeouts/processing.
-	(efh_format_source): fixed implementation to write out all
-	headers.
-	(efh_multipart_related, emfh_multipart_related_check): separate
-	checking for unused parts into a separate job, which is run after
-	previous ones are executed.  keep track of visibility tree level
-	in job, etc.
-
-2003-08-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-browser.c (emfb_mail_compose): Implemented.
-	(emfb_mail_post): Implemented.
-
-	* em-utils.c (em_utils_compose_new_message): New function.
-	(em_utils_compose_new_message_with_mailto): New.
-	(em_utils_post_to_url): New.
-
-2003-08-21  Not Zed  <NotZed@Ximian.com>
-
-	* subscribe-dialog.glade: removed the text in the progress thing.
-	It never showed up anyway and caused weird resizing stuff when the
-	progress bar was active.
-
-	* em-subscribe-editor.c: Found the correct version of the new
-	subscribe code (on branch, duh!), and integrated it.
-	(sub_selection_changed): Sensitise buttons based on selection.
-
-	* em-format-html.c (efh_text_plain, efh_text_enriched)
-	(efh_write_text_html): Use format_text for text output.
-	(efh_write_image): use explicit image writer.
-	(emfh_gethttp): added some progress stuff.
-	(efh_format_do): maintain the accessible uri tree during jobs.
-	(efh_url_requested): store the current uri accessibility tree node
-	in the job, so it can be properly set for sub-jobs.
-	(emh_multipart_related): moved here, can't use super-class version
-	as it doesn't know about async jobs.
-	(type_buildin_table[]): Added image/jpg and image/jpeg for the
-	brokenmailers out there and to reduce the whinge.
-
-	* em-format.c (em_format_format_content): For text parts, perform
-	default charset/charset snooping/decoding.  No longer closes the
-	stream once complete.
-	(emf_write_related): close stream ourselves.
-
-2003-08-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-folder-view.c (emfv_message_forward): Implemented.
-	(emfv_message_forward_attached): Implemented.
-	(emfv_message_forward_inline): Implemented.
-	(emfv_message_forward_quoted): Implemented.
-	(emfv_message_redirect): Implemented.
-	(emfv_message_post_reply): Implemented.
-	(emfv_message_reply_all): Implemented.
-	(emfv_message_reply_list): Implemented.
-	(emfv_message_reply_sender): Implemented.
-	(emfv_message_resend): Implemented.
-	(emfv_message_saveas): Implemented.
-
-	* em-composer-utils.c: New source file containing all the composer
-	send/draft callback mess.
-
-	* em-utils.c (em_utils_uids_copy): New convenience function to
-	copy a list of uids.
-	(em_utils_uids_free): New convenience function to free a list of
-	uids.
-	(em_utils_save_message): New function to save a CamelMimeMessage
-	(prompts the user for a location to save).
-	(em_utils_save_messages): New function to save a list of messages
-	(given a folder and list of uids).
-	(em_utils_configure_account): Configure a new account...
-	(em_utils_check_user_can_send_mail): Make sure the user has a
-	transport setup.
-	(em_utils_edit_message): New function to edit a message object.
-	(em_utils_edit_messages): New function to open a composer to edit
-	each message.
-	(em_utils_forward_attached): New function to forward messages as
-	an attachment,
-	(em_utils_forward_inline): Forward a bunch of messages inline.
-	(em_utils_forward_quoted): Forward a bunch of messages quoted.
-	(em_utils_redirect_message): Redirect a message object.
-	(em_utils_redirect_message_by_uid): Redirect a message given a
-	folder and uid.
-	(em_utils_reply_to_message): Reply to a message object.
-	(em_utils_reply_to_message_by_uid): Reply to a message given a
-	folder and uid.
-	(em_utils_post_reply_to_message_by_uid): Post a reply to a message
-	given a folder and uid.
-
-	* mail-ops.c (filter_folder_free): Use em_utils_uids_free().
-	(transfer_messages_free): Same.
-	(get_messages_free): Here too.
-	(save_messages_free): Same.
-
-2003-08-20  Not Zed  <NotZed@Ximian.com>
-
-	* em-subscribe-editor.[ch]: new widget, a dialog for editing
-	subscriptions.
-
-	* em-format-html.c (efh_format_done): emit a complete when done.
-
-	* em-format.c (emf_class_init): Added a 'complete' signal, so that
-	printing knows when to print.
-
-	* em-format-html-print.c (em_format_html_print_print): Changed to
-	take the message and source formatter too.  Runs an async render
-	then prints.
-
-2003-08-19  Not Zed  <NotZed@Ximian.com>
-
-	* em-*.c: stacks more changes, added some bonobo menu setup, and
-	implemented the trivial functions.
-
-	* em-message-browser.[ch]: New message browser, inherits from
-	em-folder-view.  Basically works.
-	
-	* message-list.c (message_list_select_uid): if we're selecting
-	while still loading, setup a pending select.
-	(regen_list_free): Check for a pending select, and select the
-	message if we're now idle.
-
-	* em-folder-view.c (em_folder_view_set_message,
-	em_folder_view_set_folder): Make virtual macro's.
-	(emfv_control_activate): added hook to enable bonobo state when setup.
-
-	* em-format.c (emf_format_clone): base implementation, just clears
-	state data.
-
-	* em-format.h: change ::format to ::format_clone.  Make
-	em_format_format_clone a macro/virtual method.
-
-	* mail-mt.c (em_channel_setup): new function to setup i/o
-	channels, so we can control the recursive flag.  leave off for
-	now.
-	(mail_msg_init): setup MsgPort channels using above.
-
-	* em-format-html.c (efh_format): serialise/de-recursify formatting
-	via a timeout function.
-	(efh_format_timeout): keep polling to find out if cancellation is
-	complete, then kick off a new render.
-
-2003-08-18  Not Zed  <NotZed@Ximian.com>
-
-	* em-*.c: more updates, incl threaded formatting queue.
-
-2003-08-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format-html-display.c (em_format_html_display_zoom_in): New
-	method to zoom-in on the gtkhtml contents.
-	(em_format_html_display_zoom_out): Same but for zoom-out
-	(em_format_html_display_zoom_reset): You get the idea.
-
-2003-08-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (invert_selection): Use
-	message_list_invert_selection().
-	(select_thread): Use message_list_select_thread().
-	(select_all): Use message_list_select_all().
-
-	* message-list.c (message_list_select_all): New function.
-	(message_list_select_thread): New function.
-	(message_list_invert_selection): New function.
-
-2003-08-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c: Synced up with HEAD.
-
-	* component-factory.c:
-
-	* mail-folder-cache.[c,h]:
-
-	* mail-tools.h:
-
-	* mail-ops.[c,h]:
-
-	* mail-send-recv.c:
-
-	* mail-format.[c,h]:
-
-	* mail-display.c:
-
-	* mail-account-gui.c:
-
-	* mail-local.c:
-
-	* mail-offline-handler.c:
-
-	* subscribe-dialog.c:
-
-2003-08-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* em-format-html-display.c: Fixed some compiler warnings.
-
-	* em-format.c: Updated for new mime-parser changes made to HEAD.
-
-	* em-folder-view.c: Fixed some compiler warnings.
-
-	* em-format-html.c: Fixed some compiler warnings.
-
-2003-08-06  Not Zed  <NotZed@Ximian.com>
-
-	* em-format-html-display.c (efhd_format_attachment): Added bonobo
-	embeddables.
-
-2003-08-01 Harry Lu  <harry.lu@sun.com>
-
-	*Fix for bug #6951
-
-	* mail-display.c (launch_cb): Bypass the new added menu item.
-	(save_all_parts_cb): New function. Do the real save-all work.
-	(save_all_parts): New function. Get the directory to save to.
-	(save_all_cb): New function. The call-back function for the new 
-	added menu item.
-	(pixmap_press): Add the new menu item "Save All Attachment...".
-	(ptr_array_free_notify): A simple wrapper function to free the
-	pointer array.
-	(do_attachment_header): Save attachment pointer in an array for 
-	"Save All Attachment" use.
-
-2003-08-01  Yuedong Du  <yuedong.du@sun.com>
-
-	* message-browser.c (on_key_press): close mail message window
-	using 'ESC' key, fix bug #47087
-
-2003-07-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.c: Removed smime functions as they were stale.
-
-2003-07-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-browser.c (message_browser_new): Handle our own Delete
-	key presses. Fixes bug #45597.
-
-2003-07-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-callbacks.c (do_view_message): No need to pass a shell
-	argument to message_browser_new() anymore.
-
-	* message-browser.c (message_browser_new): Removed arg shell.  No
-	need to pass it to folder_browser_new() either.
-
-	* mail-component.c (create_view_callback): No need to pass a shell
-	arg to folder_browser_factory_new_control() anymore.
-
-	* folder-browser-factory.c (folder_browser_factory_new_control):
-	Removed arg shell; folder_browser_browser_new() doesn't need it
-	anymore.
-
-	* folder-browser.c (folder_browser_destroy): No need to unref
-	->shell anymore.
-	(folder_browser_new): Removed shell arg.
-	(folder_browser_gui_init): Removed a const qualifier that was not
-	supposed to be there.
-
-	* folder-browser.h: Removed member shell from struct
-	FolderBrowser.
-
-2003-07-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser.c (folder_browser_gui_init): Get the search
-	context through mail_component_peek_search_context(), since it's
-	no longer a global variable.
-	(folder_browser_gui_init): Cleaned up an extra unneeded if()
-	statement.
-
-	* mail-component.c: New member search_context in struct
-	MailComponentPrivate.
-	(mail_component_peek_search_context): New.
-	(setup_search_context): New function to initialize the
-	search_context, based on the old code in component-factory.c.
-	(mail_component_init): Call it here.
-	(impl_dispose): Unref the rule_context.
-
-	* mail-component-factory.c: Removed global variable
-	search_context.
-
-2003-07-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-component.c (browser_page_switched_callback): New callback
-	for the "page_switched" signal on EStorageBrowser; deactivate the
-	previous page, activate the new one.
-	(impl_createControls): Connect.
-
-2003-07-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-mt.c (do_op_status): Pass "evolution-mail" as the ID to
-	evolution_activity_client_new().  [This is just a temporary thing
-	to avoid the fact that we don't have component-factory.h anymore.
-	Eventually we'll just get rid of the activity client stuff.]
-
-	* mail-component-factory.c: Added to the build.  Also, finished
-	implementing and moving the factory over from component-factory.c.
-
-	* component-factory.c: Removed from the build.
-	* component-factory.h: Removed from the build.
-
-	* mail-component.c: Removed some debugging messages.
-
-2003-07-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* subscribe-dialog.c: Converted to use EStorages instead of
-	EvolutionStorages and the new MailComponent object.
-
-	* mail.h: Nuked a bunch of stuff.  This will go away when I am
-	done refactoring.
-
-	* mail-offline-handler.c: Use the new MailComponent object.
-
-	* mail-folder-cache.c, mail-folder-cache.h: Converted to use
-	EStorages instead of EvolutionStorages.
-
-	* mail-display.c: Use g_timeout and g_source functions instead of
-	gtk_timeout functions.
-
-	* mail-send-recv.c: Use g_timeout and g_source functions instead
-	of gtk_timeout functions.
-	(receive_update_got_store): Updated for the new mail_note_store().
-
-	* mail-session.c: Use g_timeout and g_source functions instead of
-	gtk_timeout functions.
-
-	* mail-config-factory.c (factory): Removed.
-
-	* folder-browser.c (folder_browser_destroy): Use GLib
-	timeout/source functions instead of the deprecated GTK ones.
-	(done_message_selected): Likewise.
-	(folder_browser_gui_init): Protect against fb->search being NULL.
-
-	* mail-account-gui.c (add_new_store): Use new MailComponent object
-	and EStorages instead of EvolutionStorages.
-	(mail_account_gui_save): Likewise.
-
-	* mail-accounts.c (account_delete_clicked): Use new MailComponent
-	object and EStorages instead of EvolutionStorages.
-	(account_able_clicked): Likewise.
-	(account_able_toggled): Likewise.
-
-	* mail-autofilter.c: Use mail_component_peek_base_directory()
-	instead of the evolution_dir global.
-	* mail-callbacks.c: Likewise.
-	* mail-config.c (uri_to_evname): Likewise.
-	(mail_config_get_signature_list): Likewise.
-	(delete_unused_signature_file): Likewise.
-	* mail-display.c (mail_display_class_init): Likewise.
-	* mail-importer.c (mail_importer_make_local_folder): Likewise.
-	* mail-local.c (mlf_getv): Likewise.
-	* mail-ops.c (uid_cachename_hack): Likewise.
-	* mail-summary.c (generate_folder_summaries): Likewise.
-	* mail-tools.c (mail_tool_get_local_inbox): Likewise.
-	(mail_tools_folder_to_url): Likewise.
-	* mail-vfolder.c (mail_vfolder_delete_uri): Likewise.
-	(mail_vfolder_rename_uri): Likewise.
-	(context_rule_removed): Likewise.
-	(store_folder_deleted): Likewise.
-	(store_folder_renamed): Likewise.
-	(vfolder_load_storage): Likewise.
-	(vfolder_editor_response): Likewise.
-	(edit_rule_response): Likewise.
-	(new_rule_clicked): Likewise.
-	(vfolder_gui_add_rule): Likewise.
-	* mail-session.c (main_get_filter_driver): Likewise.
-	(mail_session_forget_password): Likewise.
-	(mail_session_init): Get a base_directory arg.
-
-	* component-factory.c, component-factory.h: Disabled a bunch of
-	stuff to get it to compile in the new configuration.  These files
-	will eventually go away when I am done refactoring this.
-
-	* Makefile.am: Do not build importers, compile generate
-	skels/stubs for Evolution.
-
-	* GNOME_Evolution_Mail.server.in.in: Rename control factory to
-	OAFIID:GNOME_Evolution_Mail_Factory2.  Add new component
-	GNOME_Evolution_Mail_Component2.
-
-	* mail-component-factory.c: New file implementing the Bonobo
-	factory.
-
-	* mail-component.c, mail-component.h: New files implementing the
-	new mail component, using the new Evolution::Component IDL.
-
-2003-07-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_format_data_wrapper_write_to_stream): Revert
-	prior changes.
-
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c (message_list_drag_data_get): Fix type warnings
-	(folder_browser_toggle_caret_mode): Remove unused variable.
-
-	* folder-browser-ui.c (basename): remove unused function
-
-	* mail-account-gui.c (mail_account_gui_build_extra_conf): Fix
-	warnings
-
-	* mail-callbacks.c (empty_trash): Remove unused variable.
-
-	* mail-display.c: #include gal/widgets/e-gui-utils.h for
-	e_auto_kill_popup_menu_on_selection_done
-
-	* mail-importer.c: #include e-util/e-path.h for e_path_to_physical
-
-	* mail-session.c (main_play_sound): don't declare filename to be
-	const and then free it.
-
-	* mail-vfolder.c (vfolder_edit_rule, vfolder_gui_add_rule): Fix
-	casts
-
-	* message-list.c (build_flat_diff): Fix a typo in the
-	non-BROKEN_ETREE code
-
-2003-07-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_multipart_encrypted): We don't have
-	camel_pgp_mime_is_rfc2015_encrypted() anymore so just look at the
-	protocol for now.
-	(mail_format_data_wrapper_write_to_stream): Updated for the new
-	way camel handles content objects.
-
-2003-07-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* folder-browser.c (message_list_drag_data_received): Handle
-	invalid URIs, or more likely, the last empty element in a URI list
-	--- g_strsplit() will yield { "uri1", "", NULL }.  Fixes #46398.
-
-	* component-factory.c (destination_folder_handle_drop): Likewise.
-
-2003-07-15  Yuedong Du  <yuedong.du@sun.com>
-
-	* mail-config.c: (config_write_style), (mail_config_init): remove
-	the use of caret mode widget style.
-	* mail-display.c: (display_notify), (mail_display_new): use new
-	gtkhtml api to set caret mode.
-
-2003-07-11  Antonio Xu  <antonio.xu@sun.com>
-
-	* folder-browser-ui.c: Change the EditPaste mask to IS_0MESSAGE so
-	that it is always activatable. Fixes bug #46018.
-
-2003-07-04  Maxx Cao  <maxx.cao@sun.com>
-
-	** For bug #41839
-
-	* mail-display.c (do_attachment_header): Attachment buttons made
-	accessable with keyboard (focusable). "Inline" button is disabled
-	when attachment can't be viewed inline.
-	(do_signature): Signature button made accessable with keyboard
-	(focusable).
-	(button_press): Function changed to an event callback (originally
-	gtkbutton signal callback).
-	(popup_menu_placement_callback): Function added to place popup
-	menu (of attachment) beside button when activated by keyboard.
-
-2003-07-10  Yuedong Du  <yuedong.du@sun.com>
-
-	* evolution-mail.schemas: add a gconf key corresponding to newly 
-	introduced caret mode of gtkhtml widget.
-
-	* folder-browser-ui.c: new verb handling, corresponding the new menu
-	entry for the caret mode flag. 
-
-	* folder-browser.h: declaration of new verb handler to the menu entry 
-	that turn caret mode on/off. The function just set the new introduced
-	gconf key.
-
-	* folder-browser.c: ditto
-
-	* mail-config.c: lstione to the new gconf key, and when caret mode 
-	flag is set/unset,change the style of gtkhtml widget. see bug
-	#44607.
-
-2003-07-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.h: Removed camel-pgp-mime.h, it no longer exists.
-
-	* mail-format.c: Remove camel-pgp-mime.h
-
-2003-07-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Use
-	camel_strcase_hash/equal.
-
-	* upgrade-mailer.c: Updated to use the camel-file-utils version of
-	mkdir.
-
-2003-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-tools.c (mail_tool_forward_message): Strip the signature
-	from the body text. Fixes bug #45523. While we're here, also fix
-	the code to quote exactly the same way as the
-	mail_tool_quote_message() function.
-	(mail_tool_quote_message): The last arg should not be
-	'want_plain', because that arg is for whether or not the body
-	should be quoted.
-
-	* folder-browser.c (message_list_drag_data_get): Apply a
-	From-filter when dragging as a test/uri-list and
-	message/rfc822. Fixes bug #45617. Also free the uids ptrarray for
-	the text/uri-list case.
-
-2003-07-01  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (pixbuf_for_mime_type): Gone
-	(pixbuf_gen_idle): Use e_icon_for_mime_type instead.
-
-2003-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (filter_date): Use the newer utf8 versions of the
-	e_strftime*() functions since our format strings are all now in
-	UTF-8.
-
-	* mail-display.c (mail_display_render): Use the newer
-	e_utf8_strftime_fix_am_pm().
-
-	* mail-callbacks.c (mail_generate_reply): Use e_utf8_strftime(),
-	otherwise we can end up with invalid utf-8.
-
-2003-06-25  Radek Doulik  <rodo@ximian.com>
-
-	* mail-config.c (config_write_style): provide hardcoded default
-	(red) spell error color
-
-2003-06-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Might fix bug #45368 but I wouldn't bet on it.
-
-	* message-browser.c (message_browser_new): Record the signal id
-	for folder_loaded.
-	(message_browser_folder_loaded): disconnect by id rather than
-	searching for the handler. Save the id of the message_list_built
-	signal handler.
-	(message_browser_message_list_built): Disconnect the handler by
-	id.
-	(message_browser_destroy): Disconnect the signal handlers by id.
-
-2003-06-20  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #43887
-
-	* mail-format.c (mail_get_message_body): handle text/enriched and
-	text/richtext explictly, and dont treat them as text/plain.
-
-2003-06-23  Radek Doulik  <rodo@ximian.com>
-
-	* mail-config.c (config_write_style): add
-	EvolutionMailPrintHTMLWidget style assignment
-
-	* mail-callbacks.c (do_mail_print): set printing widget name
-
-2003-06-23  Dan Winship  <danw@ximian.com>
-
-	* message-list.c (on_selection_changed_cmd): Save the idle_id
-
-2003-06-23  Larry Ewing  <lewing@ximian.com>
-
-	* folder-browser.c (do_message_selected): make sure not to strcmp
-	a possibly NULL string.
-
-2003-06-19  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #45063
-
-	* folder-browser.c (do_message_selected): dont re-load if the same
-	message gets selected again as one we've already shown.  Etree
-	sends out selection changed events even when when it hasn't.
-
-2003-06-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (hide_save_state): Only save state if we have a
-	folder reference. Fixes some warnings about casting a NULL object
-	to a CamelFolder.
-
-2003-06-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (ml_tree_value_at): Don't display an unread icon
-	for a parent message status if it has unread children but has been
-	read itself. Instead, show that we have unread children by just
-	making the message test bold (which it was already doing, so
-	yay... this was easy). Fixes bug #42630.
-
-2003-06-16  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #44609
-
-	* mail-vfolder.c (vfolder_edit_rule): put the ok/cancel buttons in
-	the stupid gnome 2 order.
-
-	** See bug #33593
-
-	* message-list.c (on_selection_changed_cmd): also listedn to
-	selection changed events, since the etable api has changed.
-	(get_selected_cb): helper for above.
-	(message_list_construct): hook to selection change signal.
-
-	* mail-callbacks.c (composer_send_queued_cb): Unref the composer
-	to match the ref composer_send_cb();
-
-	** See bug #44519
-
-	* message-browser.c (message_browser_message_list_built): We want
-	to disconnect from the messagelist, not folderbrowser signal.
-
-2003-06-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (format_mime_part): We only really want to use
-	mail_identify_mime_part() if the content-type is
-	application/octet-stream - any other type (if it doesn't have a
-	handler) should just force the user to save to disk.
-	(handle_text_plain): Only pay attention to format=flowed if the
-	mime-type is text/plain (handle_text_plain is the generic text
-	handler, so we might be processing parts that are not really
-	text/plain, thus the format param may have different meaning for
-	those other textual types).
-
-2003-06-11  Larry Ewing  <lewing@ximian.com>
-
-	* mail-format.c (mail_lookup_handler): free the application list
-	if we are bailing.
-
-	* mail-send-recv.c (free_folder_info): free the info structure as
-	well.
-
-2003-06-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-tag-followup.c (get_week_start_day): Use mail-config's
-	gconf client.
-	(target_date_new): Same.
-
-	* message-list.c (message_list_set_folder): Use mail-config's
-	gconf client.
-	(mail_regen_list): Same.
-
-	* mail-tools.c (mail_tool_quote_message): Use mail-config's gconf
-	client.
-	(mail_tool_forward_message): Same.
-
-	* mail-session.c (main_get_filter_driver): Use mail-config's gconf
-	client.
-
-	* mail-preferences.c (mail_preferences_init): Use mail-config's
-	gconf client.
-	(mail_preferences_finalise): Don't unref the gconf client.
-
-	* mail-format.c (write_headers): Use mail-config's gconf client.
-	(mail_format_data_wrapper_write_to_stream): Same.
-	(handle_text_plain): And here.
-
-	* mail-display.c (save_data_cb): Use mail-config's gconf client.
-	(save_part): Same.
-	(on_url_requested): Here too.
-	(mail_text_write): And here.
-	(mail_display_init): And here.
-	(mail_display_destroy): Here too.
-	(mail_display_new): Again here.
-
-	* mail-composer-prefs.c (sig_add_cb): Use mail-config's gconf
-	client.
-	(mail_composer_prefs_construct): Same.
-
-	* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Use
-	mail-config's gconf client.
-	(ask_confirm_for_empty_subject): Same.
-	(ask_confirm_for_only_bcc): Here too.
-	(composer_get_message): And here.
-	(create_msg_composer): Again here.
-	(mail_generate_reply): Same.
-	(forward): And here.
-	(transfer_msg_done): "
-	(delete_msg): "
-	(confirm_expunge): "
-
-	* component-factory.c (owner_unset_cb): Use mail-config's gconf
-	client.
-
-	* folder-browser-ui.c (folder_browser_ui_add_message): Use the
-	mailer's gconf client.
-	(folder_browser_ui_add_list): Same.
-	(folder_browser_ui_add_global): Here too.
-
-	* folder-browser.c (save_cursor_pos): Use the mailer's gconf
-	client.
-	(folder_browser_set_message_preview): Same.
-	(folder_browser_toggle_preview): Here too.
-	(folder_browser_toggle_threads): And here.
-	(folder_browser_toggle_hide_deleted): Here as well.
-	(folder_browser_set_message_display_style): And here.
-	(fb_resize_cb): Here.
-	(paned_realised): And here.
-	(done_message_selected): And everywhere...
-
-	* mail-account-gui.c (sig_add_new_signature): Use the mailer gconf
-	client.
-
-	* mail-config.c (mail_config_get_gconf_client): New function to
-	return the global GConfClient used by the mailer.
-	(mail_config_write_on_exit): On exit, free our objects and such.
-	(mail_config_signature_run_script): Use config->gconf.
-
-2003-06-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (invert_selection): Get rid of the if-focused
-	code, that will always prevent the etree from getting the
-	selection inverted because the menu item will always have focus at
-	this time. Fix for bug #43972.
-
-2003-06-11  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #22542
-	
-	* component-factory.c (storage_create_folder): If we're creating a
-	folder on a vstore, popup a vFolder editor rather than failing.
-
-2003-06-05  Not Zed  <NotZed@Ximian.com>
-
-	** Part of #42691.
-	
-	* importers/Makefile.am (BUILT_SOURCES): added server_DATA.
-
-	* Makefile.am (%.server.in): create a proper implicit rule for
-	temporary .in file.
-
-2003-06-04  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #43974
-
-	* mail-tools.c (mail_tool_do_movemail): use a proper CamelURL to
-	decode the uri, not hacky strcmp stuff.
-
-	* mail-account-gui.c (extract_values): if we have an conf_entry,
-	ignore username, hostname, and path ones, as these are handled
-	implicitly in the url itself.  Came about because of the fix for
-	#42838.
-
-2003-06-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* mail-search.c (mail_search_construct): Put the buttons in HIG
-	order; don't replace the label of the stock Find button.  Also,
-	add Escape as a keybinding for the Close button (see why GTK+ is
-	on crack on b.g.o #74221 and #101293).
-
diff --git a/mail/ChangeLog.pre-1-4 b/mail/ChangeLog.pre-1-4
deleted file mode 100644
index 5933f09baa..0000000000
--- a/mail/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,24750 +0,0 @@
-2003-06-02  Not Zed  <NotZed@Ximian.com>
-
-	** This and jeffs patch for #43862.
-
-	* mail-folder-cache.c (store_online_cb): If the store is still
-	around, then flow on to a get folderinfo update, otherwise just
-	clear up.
-
-	* mail-ops.c (mail_store_set_offline): return the msgid of this so
-	it can be cancelled.
-
-2003-05-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-folder-cache.c (mail_note_store): If the session is
-	'online' and we are noting a CamelDiscoStore, make sure that it is
-	changed to online status and call mail_get_folderinfo().
-
-2003-05-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-local.c (load_metainfo): Stat the XML file before trying to
-	parse it to make sure it exists.
-
-2003-05-29  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (BUILT_SOURCES): added server_DATA (*.server) so
-	make clean works.  For #42691.
-
-2003-05-30  Radek Doulik  <rodo@ximian.com>
-
-	* mail-config.c (config_write_style): use %02x instead of %2x when
-	formatting color for rc file
-
-2003-05-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #43805.
-
-	* mail-session.c (session_system_beep): Proxy the gdk_beep() call
-	to the main thread.
-	(session_play_sound): Proxy the gnome_sound_play() call to the
-	main thread.
-
-2003-05-27  Not Zed  <NotZed@Ximian.com>
-
-	* message-tag-editor.c (message_tag_editor_init): set the default
-	open size to something reasonable.  For #43410.
-
-	* mail-signature-editor.c (d): turn off debugging.
-
-	* mail-config.c (mail_config_signature_add): save new signature in
-	signature list.  For #43688.
-
-2003-05-21  Radek Doulik  <rodo@ximian.com>
-
-	* mail-signature-editor.c (menu_file_save_cb): set signature html
-	flag even if it's newly signature, we don't set it in
-	format_html_cb as sig could be "live" (when it's not new one)
-
-2003-05-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-importer.c: Updated copyright years.
-
-	* mail-callbacks.c (ask_confirm_for_empty_subject): Fixed the
-	logic a bit - if the gconf key *isn't* set, we want to return
-	TRUE.
-
-	* mail-search.c (mail_search_finalise): We need to weak_unref()
-	the mail-display here. Fixes bug #43392.
-
-2003-05-21  Larry Ewing  <lewing@ximian.com>
-
-	* mail-config.glade: remove link hilighting option that isn't
-	attached to anything.
-
-2003-05-20  Larry Ewing  <lewing@ximian.com>
-
-	* mail-display.c: filter notification events to keep the redisplay
-	count down.
-
-	* mail-composer-prefs.c: remove references to gtkhtml property
-	manager.  Connect to missing settings.
-
-	* mail-preferences.c: remove references to gtkhtml property
-	manager.  Connect to missing settings.
-
-	* mail-config.glade: remove keybinding setting.
-
-	* mail-display.c (mail_display_destroy): remove notification.
-	(display_notify): set animate and redisplay.  We have to redisplay
-	because the citation color may have changed.
-
-	* evolution-mail.schemas: add composer and display gconf entries.
-	
-2003-05-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Only re-add the
-	store to the folder-tree if the account is enabled. Oops. Fixes
-	bug #43214.
-
-2003-05-20  Larry Ewing  <lewing@ximian.com>
-
-	* mail-config-factory.c: remove references to font prefs.
-
-	* component-factory.c: Remove stale refernces the the font prefs.
-	(make_factory): remove unused variables.
-
-	* mail-config.c (mail_config_init): add a notify callback to the
-	spelling color.
-	(config_write_style): rename and write out the spell color as
-	well.
-
-2003-05-20  Not Zed  <notzed@lostzed.mmc.com.au>
-
-	** See bug #43234
-	
-	* mail-display.c (mail_display_set_message): if we've been
-	destroyed, noop.
-
-2003-05-16  Dan Winship  <danw@ximian.com>
-
-	* mail-ops.c (mail_empty_trash): New async "empty trash" op.
-
-	* mail-callbacks.c (empty_trash): Use it rather than requiring
-	that mail_tool_get_vtrash() work without blocking. #43091
-
-2003-05-16  Radek Doulik  <rodo@ximian.com>
-
-	* mail-callbacks.c (footer_info_new): gnome_font_get_descender
-	returns negative value
-
-2003-05-17  Larry Ewing  <lewing@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: remove font prefs server from
-	the list.
-
-2003-05-17  Jeremy Katz  <katzj@redhat.com>
-
-	* mail-offline-handler.c: Add #include to fix warning.
-
-	* mail-mt.c (mail_msg_new): Use glib macros for pointer/int
-	conversions.
-	(mail_msg_free): Likewise.
-	(mail_msg_cancel): Likewise.
-	(mail_msg_wait): Likewise.
-	(mail_msg_active): Likewise.
-	* mail-session.c (main_register_timeout): Likewise.
-	(register_timeout): Likewise.
-	(main_remove_timeout): Likewise.
-	(remove_timeout): Likewise.
-	* message-list.c (ml_value_to_string): Likewise.
-	
-	* mail-identify.c: Add #include to fix warning.
-	
-	* mail-config.c (config_write_fonts): Don't pass extra arguments
-	to g_warning.
-	
-	* mail-callbacks.c: Add #include to fix warning.
-
-2003-05-15  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #42838.
-
-	* mail-account-gui.c (mail_account_gui_build_extra_conf): always
-	add the extra entry to the hash table, most paths wouldn't.
-
-2003-05-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c: Disabled some debugging messages.
-
-2003-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* mail-local.h: add proto
-
-	* mail-local.c (storage_listener_startup): don't listen for
-	destruction, because we have a ref and it'll never happen
-	(mail_local_storage_shutdown): release and unref the local storage
-
-	* mail-display.c (retrieve_shell_view_interface_from_control):
-	return a new copy every time
-	(set_status_message): release and unref the shell view
-
-	* folder-browser.c (folder_browser_destroy): guard for multiple
-	destroys
-
-	* folder-browser-factory.c (control_activate): release and unref
-	the shell view
-	(control_destroy_cb): just remove the control from the list
-	(folder_browser_factory_new_control): don't weak ref the folder
-	browser
-
-	* component-factory.c (owner_unset_cb): shutdown local storage
-
-2003-05-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (segv_redirect): Removed.
-	(make_factory): No need to set up the SIGSEGV redirect handler
-	here, since it's already done in the shell now, and it's in-proc.
-
-	* folder-browser-ui.c (folder_browser_ui_rm_all): Only do the
-	bonobo_ui_component() stuff if the component does have a
-	container.
-
-2003-05-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-session.c (mail_session_set_interactive): Set the
-	password_dialog pointer to NULL.  Prevents a crash that could
-	happen if the shell would quit with the password dialog still up.
-
-2003-05-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (mail_display_render): Make sure that we haven't
-	been destroyed before we start writing to the html engine. Fixes
-	bug #42333.
-
-2003-05-07  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #42456
-	
-	* mail-composer-prefs.c (spell_language_button_press): set the
-	enable/disable button to the right text when we toggle a column.
-	Added a fixme about the weird code in the whole routine.
-
-2003-05-07  Jeremy Katz  <katzj@redhat.com>
-
-	* evolution-mail.schemas
-	(/schemas/apps/evolution/mail/display/mime_types):  Correct
-	default for list.
-
-2003-05-06  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #42400
-
-	* mail-tools.c (meta_data_key): protect against getting an
-	unparsable uri.
-
-2003-05-05  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #42294.
-	
-	* mail-config.c (config_write_fonts): Also set the custom font
-	style for *BonoboPlug*GtkHTML.
-
-2003-05-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-session.c (request_password): Set OK as the default
-	response for the password_dialog.
-
-2003-04-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mark_as_unseen): To be consistant with the
-	message-list envelope toggle, undelete the message when we unmark
-	the Seen flag here as well. Fixes bug #42118.
-
-2003-04-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (ml_tree_value_at): Fixed to return the correct
-	values (swapped) in order to fix bug #42120.
-
-2003-04-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (regen_list_regened): Save the tree state before
-	we tear down the tree and then load it back again. yay. Fixes bug
-	#42170 and #40074.
-
-2003-04-30  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #41748
-	
-	* mail-send-recv.c (build_dialogue): make sure we dont add any
-	SEND_SEND types to the receive table.  When we add the SEND_SEND
-	type, key it on a fixed string SEND_URI_KEY.
-	(receive_done): if it is a SEND_SEND type, use SEND_URI_KEY to
-	remove it from the active list.
-	(mail_receive_uri): make sure we never add a SEND_SEND type to the
-	receive list.
-	(mail_send): key the send info on SEND_URI_KEY not transport url.
-
-2003-04-29  Jeremy Katz  <katzj@redhat.com>
-
-	* folder-browser-ui.c (fbui_sensitise_item): Don't just blindly
-	cast an int to gpointer, use the proper glib magic instead.
-	
-2003-04-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* importers/netscape-importer.c
-	(netscape_add_priority_workaround_filters): Updated for API change
-	in the filter code.
-
-2003-04-29  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #41972
-
-	* message-list.c (ml_tree_value_at): fix (void *) casts on trinary
-	ops.
-
-	* folder-browser.c (on_right_click): Store the label tag in the
-	label callback data, not the translated name.
-
-	* mail-config.c (label_defaults[]): Initialise with the tag
-	values.
-	(config_clear_labels): free tag field.
-	(config_cache_labels): setup the tag field based on the position
-	of the label name.
-	(mail_config_get_label_color_by_name): Lookup colour by the
-	untranslated TAG, not the translated/customisable tag.
-
-	* mail-config.h (MailConfigLabel): Add a tag field, we were using
-	the translated name as the label(!).
-
-2003-04-29  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (write_xmailer_header): Remove preceding whitespace
-
-2003-04-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-session.c (mail_session_forget_passwords): Forget all
-	passwords again.  [#41817]
-
-2003-04-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.glade: Made toplevel container widgets set a
-	border-width (including toplevel widgets within frames), set the
-	table/hbox/vbox spacings, set the spacing between an image and the
-	description text in hboxes to 12pts (as suggested by the HIG),
-	Changed Add/Delete buttons to the stock Add/Remove buttons, etc
-
-2003-04-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #41789
-
-	* mail-config.c (mail_config_init): Cache the allowable
-	mime-types.
-	(mail_config_get_allowable_mime_types): New public function to get
-	an array of allowable mime-types.
-
-	* mail-format.c (mail_lookup_handler): Only allow a
-	bonobo-component handler if the mime-type is something handled by
-	evolution or the user has specifically chosen that type as
-	available for viewing with a bonobo component in the gconf
-	database.
-	(mime_type_uses_evolution_component): New convenience function.
-	(mime_type_can_use_component): Checks gconf to see if the user has
-	allowed the mime-type to be viewed by a component.
-
-2003-04-24  Radek Doulik  <rodo@ximian.com>
-
-	* mail-display.c (html_button_press_event): as below
-	(update_active): as below
-
-	* folder-browser.c (html_button_press_event): update for changed
-	coordinates in gtk-2
-
-2003-04-23  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (get_receive_type): pass an exception to
-	get_provider, to silence some warnings/get a valid result.
-
-2003-04-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (composer_get_message): Only add the
-	Organization: header if it is non-empty. Fixes bug #41730.
-
-2003-04-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-composer-prefs.c (spell_set_ui): Protect against a NULL
-	strv result from parsing the language list string.
-
-2003-04-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes for bug #41142.
-
-	* mail-search.c (dialog_response_cb): Handle a GTK_RESPONSE_CLOSE
-	response.
-	(mail_search_construct): Changed the Cancel button into a Close
-	button.
-
-2003-04-18  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am:
-	* folder-browser-ui.c:
-	* mail-signature-editor.c:
-	* message-browser.c:
-	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ().
-	Fixes bug #21499.
-
-2003-04-17  Not Zed  <NotZed@Ximian.com>
-
-	* mail-signature-editor.c (menu_help): remove the help menu item
-	handling, as the help menu is removed.  Clean up of #38927.
-
-2003-04-16  Not Zed  <NotZed@Ximian.com>
-
-	* importers/Makefile.am (%.server.in): Remove COMPONENTDIR and set
-	BINDIR and VERSION instead.
-
-	* (importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in,
-	importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in,
-	importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in,
-	importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in,
-	importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in:) :
-	Convert the type back to exe, and point to the main evolution
-	executable.  Fixes #41164.
-
-2003-04-16  Jeremy Katz  <katzj@redhat.com>
-
-	* evolution-mail.schemas: schema keys can't be directories (#41419)
-
-2003-04-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (config_wizard_set_page): Fixed a logic
-	error that was the cause of bug #41389.
-
-2003-04-15  Not Zed  <NotZed@Ximian.com>
-
-	* For bug #41199.
-
-	* subscribe-dialog.glade: New interface from Anna.  Setup the
-	wigdet names and add a progress bar, and set the default opening
-	size to something reasonable.
-	
-	* subscribe-dialog.c (subscribe_dialog_construct): changes to
-	match the glade file chagnes.  remove the search stuff. hide the
-	progress bar by default.
-	(sc_activity_cb): show the progress bar when we're active, hide
-	it when inactive.  dont set any status.
-	(struct _SubscribeDialogPrivate): Remove the appbar.
-
-2003-04-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* mail-mt.c (mail_msg_check_error): Free the temporary error text.
-
-2003-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vfolder.c (vfolder_gui_add_rule): Set the correct border
-	width and vbox spacing to be HIG compliant. Fixes bug #41209.
-	(vfolder_edit_rule): Same here.
-
-	* local-config.glade: Updated to comply with the HIG. Fixes bug
-	#41244.
-
-2003-04-14  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (build_dialogue): create a stock cancel button
-	with a cancel all text.
-	(build_dialogue): Create stock-like cancel buttons with no
-	accelerators.  A workaround for #41043.
-
-	* message-list.c (ml_tree_value_at): if the node is the root node,
-	do nothing.  etable shouldn' really be searching the root node if
-	it isn't visible ...?  For #41190.
-
-2003-04-14  Larry Ewing  <lewing@ximian.com>
-
-	* evolution-mail.schemas: add proper defaults for the fonts
-	settings.
-
-2003-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #41243.
-
-	* message-tag-followup.c (construct): Change the window border
-	width and packing to comply with the HIG.
-
-	* message-tags.glade: Updated to comply with the HIG.
-
-2003-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (request_password): Add padding around the
-	entry/checkbox and change the border width of the dialog window to
-	comply with the HIG. Fixes bug #41004.
-
-2003-04-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-search.c (mail_search_construct): Change the action button
-	ordering and also change the padding to comply with the HIG. Fixes
-	bug #41046 and at least part of bug #41142 (except for the
-	s/Search/OK/ thing, which has not been agreed upon yet).
-
-	* mail-send-recv.c (build_dialogue): Change the padding to comply
-	with the GNOME HIG. Fixes bug #41001.
-
-2003-04-09  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #40921
-	
-	* subscribe-dialog.c (subscribe_dialog_finalise): add a finalise
-	funciton which actually free's resources.
-	(get_short_folderinfo_got): dont call activity callback implicitly
-	here, do it from the callers callback.
-	(subscribe_get_short_folderinfo): dont call activity callback
-	here.
-	(fe_got_children): check implicitly if we were cancelled.  also
-	add back the node sort, and also call the activity callback from
-	here instead of breaking layers of abstraction as above.
-	(folder_etree_cancel_all): new method, force a cancel of all ops,
-	but dont free anything.
-	(store_data_free): dont unref the widget anymore, not needed.
-	call cancel all on the ftree if its still active.
-	(sc_close_pressed): destroy the subscribe dialogue as well as the
-	app, it doesn't seem to get destroyed otherwise.
-	(sc_activity_cb): do nothing if we have been cancelled.
-	(subscribe_dialog_destroy): trigger a cancel of all outstanding
-	ops.  only free most data in the finalise method.
-	(subscribe_dialog_class_init): hook onto finalise.
-	(store_data_get_widget): dont ref the widget.
-
-	* mail-callbacks.c (manage_subscriptions): sink the dialog.
-
-2003-04-09  Larry Ewing  <lewing@ximian.com>
-
-	* mail-preferences.c 	(font_share_changed): set sensitivity of
-	font pickers based on share setting.
-	(mail_preferences_construct): initialize font prefs.
-	(mail_preferences_apply): set the font prefs.
-	(font_changed): add gnome-font-picker changed function.
-
-	* mail-preferences.h: add font pref widgets.
-
-	* mail-config.c (mail_config_init): add notify to on fonts dir.
-	(config_write_fonts): write out a gtkrc that overrides the gtkhtml
-	fonts settings based on the gconf keys.
-
-	* mail-config.glade: move display font setttings to mail prefs.
-	
-	* evolution-mail.schemas: add font settings.
-
-2003-04-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (do_view_message): Add a check for a NULL uid
-	here. Don't see how it can happen, but it seems to have for
-	Aaron. Anyways, this should fix bug #40904.
-
-2003-04-08  Dan Winship  <danw@ximian.com>
-
-	* mail-config.glade: Remove color specs from the druid so it will
-	use the theme colors
-
-	* importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in:
-	* importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in:
-	* importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in: 
-	Fix bad XML noticed by Not Zed
-	
-2003-04-08  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vfolder.c (vfolder_gui_add_rule): swap button order.  For
-	#40900.
-
-2003-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (ml_tree_value_at): For string columns, never
-	return NULL - always return "" if the value is empty. Fixes bug
-	#40728.
-
-	* mail-composer-prefs.c (sig_add_script_cb): Set the "script" data
-	on the GtkEntry to NULL.
-	(sig_add_script_response): If the "script" data on the GtkEntry
-	object is non-NULL, then we are editing an existing signature, so
-	just change the values in place and don't add it to the signature
-	db.
-	(sig_edit_cb): If sig->script is non-NULL, then we are editing a
-	script signature, so pop up the script dialog instead. Fixes bug
-	#38929.
-
-2003-04-07  Radek Doulik  <rodo@ximian.com>
-
-	* mail-composer-prefs.c (spell_load_values): use e_iconv_locale_language
-
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Clean up server names
-
-	* importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in:
-	Likewise, and fix evolution-mail location
-
-	* importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in:
-	Likewise
-
-	* importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in:
-	Likewise
-
-	* importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in:
-	Likewise
-
-	* importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in:
-	Likewise
-
-	* importers/Makefile.am (%.server.in): Fix this for evolution-mail
-	being a shlib.
-
-2003-04-03  Not Zed  <NotZed@Ximian.com>
-
-	** Bug 40536
-
-	* component-factory.c (send_receive_cb): run the warning dialogue
-	asynchronously.  Also, set the mail send/receive dialogue to
-	transient for parent.
-
-	* mail-send-recv.c (mail_send_receive): return the dialogue for
-	send/receive.
-
-2003-04-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/evolution-mbox-importer.c (load_file_fn):
-	* importers/evolution-outlook-importer.c (load_file_fn): added
-        "folder_type" parameter to EvolutionImporterLoadFileFn.
-
-	* importers/elm-importer.c (elm_import_file): pass empty string for
-	"folder_type" argument to GNOME_Evolution_Importer_loadFile.
-	* importers/pine-importer.c (pine_import_file): ditto.
-	* importers/netscape-importer.c (netscape_import_file): ditto.
-
-2003-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (save_part): Don't allow the 'prefix' argument to
-	make_safe_filename() be NULL. If we don't yet have a save_dir in
-	gconf, use $HOME, etc. Fixes bug #40608.
-
-2003-04-02  Not Zed  <NotZed@Ximian.com>
-
-	* mail-session.c (mail_session_forget_passwords): Only clear the
-	Mail passwords.
-
-	* component-factory.c (interactive_cb): Call
-	composer_check_autosave if we're going interactive, to check for
-	unsaved files.  Fixes #40300.
-
-2003-04-01  Not Zed  <NotZed@Ximian.com>
-
-	* mail-display.c (mail_display_redisplay): if we're called and the
-	idle handler is set, remove it, so we dont go and redisplay it
-	again.  Fixes #40522.
-
-2003-03-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (regen_list_regened): Save tree state and then
-	after building the new tree, re-load the tree state. Finishes the
-	fix for bug #40074.
-
-	* mail-session.c: Properly init message_list. Fixed a type-o that
-	initialized it to the password_list.
-
-2003-03-31  Not Zed  <NotZed@Ximian.com>
-
-	* mail-session.c (pass_response): need to check for config_service
-	!= NULL, not service != NULL before calling set_save_password.
-	Fix for #40472.
-
-2003-03-28  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser-ui.c: include e-meta.h
-
-	* folder-browser.c (on_right_click): remove unused var.
-
-2003-03-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* subscribe-dialog.c (fe_check_for_children): Declare a prototype
-	for this function prior to fe_got_children() so that
-	fe_got_children() can call us.
-
-2003-03-26  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (write_address): remove extra arg to
-	camel_url_encode
-
-2003-03-27  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_gui_init): dont set the paned
-	initial size here, but hook onto the realize signal.
-	(paned_realised): set the paned size once we're realised.  Fixes
-	#37084, its a bit of a hack, but it seems to work.
-
-2003-03-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #40074.
-
-	* folder-browser-factory.c (control_deactivate): Save message-list
-	state.
-
-	* message-list.c (message_list_save_state): Save the various
-	states.
-
-2003-03-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes for bug #39870
-
-	* message-browser.c (transfer_msg_done): Close the
-	message-browser. Since the message doesn't exist anymore, we
-	should close it.
-	(message_browser_delete): New callback to handle deletion in the
-	message-browser window.
-
-2003-03-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* subscribe-dialog.c (fe_got_children): If the CamelFolderInfo
-	node doesn't have \NoInferriors set, then check for
-	subfolders. Fixes bug #40314.
-
-2003-03-26  Not Zed  <NotZed@Ximian.com>
-
-	* mail-display.c (popup_window_destroy_cb): Undo jeff's patch
-	below for #40275, the destroy timeout is already removed in
-	popup_info_free.  Unref the widget 'w' when we're done with it.
-	(popup_info_free): Move everything in here to popup_window_destroy
-	and remove, since nothing else uses it.
-	(make_popup_window): Ref the widget so it doesn't go away before
-	we're finished with it.  Really fixes bug #40275/40188.
-
-2003-03-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (popup_window_destroy_cb): Remove the
-	timeout. Should fix bug #40275.
-
-	* subscribe-dialog.c: Remove search entry which never worked right
-	(and can't work as users expect anyway, since we don't do
-	namespace stripping). Fixes bug #40083.
-	(ftree_node_new): Ignore \NoSelect as far as marking it
-	"subscribable". Fixes bug #40124.
-
-2003-03-25  Dan Winship  <danw@ximian.com>
-
-	* mail-account-editor.c: Update for e_notice move
-	(apply_changes): Pass a parent_window to e_notice
-
-	* mail-account-gui.c: Update for e_notice move.
-	(mail_account_gui_save): Pass a parent_window to e_notice
-
-	* mail-callbacks.c: Update for e_notice move
-	* mail-local.c: Likewise
-	* mail-signature-editor.c: Likewise
-	* mail-vfolder.c: Likewise
-
-	* component-factory.c (interactive_cb): Update prototype
-
-2003-03-25  Not Zed  <NotZed@Ximian.com>
-
-	* mail-tools.c (meta_data_key): strdup the key before freeing the
-	url as it is probably pointing there.
-
-2003-03-25  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c (got_folder): remove a debug printf that
-	made it in a commit.
-
-	* folder-browser-ui.c (folder_browser_ui_add_global): Load
-	per-folder setting of show_preview from meta data.
-	(folder_browser_ui_add_list): Same, for thread_list.
-
-	* mail-tools.c (mail_tool_get_meta_data)
-	(mail_tool_delete_meta_data): helpers to lookup/delete meta data.
-
-	* mail-config.c (mail_config_uri_deleted): delete the meta-data
-	for the folder.
-
-	* folder-browser.c (folder_browser_reload): dont reload the uri if
-	we're in the process of loading it still.
-	(folder_browser_new): load the folder meta data before loading the
-	folder.
-	(folder_browser_toggle_preview):
-	(folder_browser_toggle_threads): save change to meta-data.
-	(got_folder): Load the metadata if we have a folder to set, and
-	the meta-data has changed from initislisation.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): pass
-	FALSE for e_destination_get_textrep's include_email arg.
-
-2003-03-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_format_data_wrapper_write_to_stream):
-	Default to the charset provied in the MimePart's Content-Type over
-	that of the user's mailer charset. Fixes bug #39204.
-
-2003-03-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-composer-prefs.c (spell_load_values): "en_us" should not be
-	translated. Fixes bug #40088.
-
-2003-03-21  Larry Ewing  <lewing@ximian.com>
-
-	* mail-display.c (pixbuf_gen_idle): remember to disconnect the
-	destroy handler if whenever the loader is shut down.
-
-2003-03-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (owner_set_cb): Change the message_destroy
-	callback to just gtk_widget_destroy. No need to have a callback
-	simply to call this function.
-	(warning_response): Removed (see above).
-
-	* mail-composer-prefs.c (sig_add_script_response): Don't forget to
-	add the signature to the signature list if it is a valid script.
-
-	* mail-config.c (mail_config_signature_unregister_client): Make
-	sure we can find the registered handler before trying to remove it
-	from the list.
-
-	* mail-session.c (do_user_message): Make the 5th argument to
-	gtk_message_dialog_new() "%s" and move the m->prompt to arg 6 so
-	that we are safe if the prompt string contains any %'s. Also
-	connect to the response signal for the user_msg dialog and set the
-	callback to gtk_widget_destroy so that the user can actually close
-	the dialog. We also need to g_object_weak_ref() the dialog so that
-	we can set the global message_dialog pointer back to NULL when it
-	gets destroyed. Fixes bug #40043.
-
-2003-03-20  Dan Winship  <danw@ximian.com>
-
-	* mail-ops.c (build_from): Remove this since there's a function in
-	CamelMimeMessage to do it now.
-	(save_messages_save): Use camel_mime_message_build_mbox_from.
-
-2003-03-21  Not Zed  <NotZed@Ximian.com>
-
-	** for mail part of bug #38461.
-	
-	* importers/evolution-outlook-importer.c (load_file_fn): dont pass
-	in create flag to uri_to_folder, the folder must already exist.
-
-	* importers/evolution-mbox-importer.c (folder_created_cb):
-	Removed, we now force the caller to create the destination folder
-	first.
-	(load_file_fn): Dont try and create a folder if it doesn't exist.
-	Also, use the uri directly as the destination uri, so we can
-	import into any folder.
-	(process_item_fn): If we dont have a folder, thats just an error,
-	return BAD_FILE.
-
-	* importers/netscape-importer.c (netscape_import_file): As below
-	for elm_import_file.
-	(import_next): similarly as for pine import_next.
-	(importer_cb): just record result.
-	(importer_timeout_fn): removed.
-
-	* importers/pine-importer.c (import_next): Similar to below for
-	the elm import_next.
-	(pine_import_file): As below for elm_import_file.
-	(importer_timeout_fn): removed.
-	(importer_cb): just record the result, and exit.
-	(import_next): change around to behave more like the elm importer,
-	cleaning up when we're done.
-
-	* importers/elm-importer.c (elm_import_file): Create the
-	destination folder ourselves, dont pass it onto the mbox importer.
-	Simplify logic, just do the import within a while loop, polling
-	the g main loop as necessary, remove need for idle callbacks and
-	other crap.
-	(import_next): If elm_import_file fails, then just go straight to
-	the next folder, stops it falling in a heap.
-	(import_item_idle): removed.
-	(importer_cb): just record result/exit.
-
-	* mail-importer.c (mail_importer_create_folder): removed.
-	(mail_importer_make_local_folder): new function to create a
-	local-only folder from a path.  It runs synchronously by using a
-	recursive main loop.
-	(folder_created_cb): callback for make_local_folder.
-
-2003-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (mail_config_druid_new): Revert ettore's
-	broken patch.
-
-	* mail-search-dialogue.c: Removed - nothing uses this.
-
-2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in:
-	Replace "evolution:menu-name" prop with "evolution:menu_name".
-	[#39692]
-	* importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in:
-	Likewise.
-
-2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-config-druid.c (mail_config_druid_new): Give the druid the
-	DIALOG hint.  [#39741 and friends.]
-
-2003-03-19  Radek Doulik  <rodo@ximian.com>
-
-	* mail-composer-prefs.c (spell_load_values): changed default
-	language to en_us instead of en
-	(spell_language_button_press): new handler, ported from 1.2
-	(spell_setup): use spell_language_enable and
-	spell_language_button_press
-
-2003-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (composer_get_message):
-	e_msg_composer_get_subject() now returns a const char *, so update
-	appropriately.
-
-2003-03-18  Larry Ewing  <lewing@ximian.com>
-
-	* mail-callbacks.c (do_mail_print): fix leak, cleanup variable
-	name, and call gtk_window_set_transient_for with a parent that is
-	actually a GtkWindow.
-	(mark_as_unseen): use g_source_remove.
-
-2003-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (mail_config_druid_new): Set the type hint
-	to DIALOG so that Metacity shows this window on top. Fixes bug
-	#39914.
-
-2003-03-18  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vfolder.c (new_rule_clicked): validate rule & rule is
-	unique.  Workaround for #39464.  Should this just use
-	rule_context_add_rule_gui??
-
-	* mail-search.c (mail_search_destroy): unhook from the html engine
-	signals here, before we redisplay the message.  Also make sure
-	this processing only happens once.  For #39759.
-	(mail_search_finalise): dont unhook from signals here.
-
-2003-03-12  Not Zed  <NotZed@Ximian.com>
-
-	* mail-callbacks.c (expunge_folder): use a hack to find out if the
-	message-list was focussed before we desensitise it.
-	(expunged_folder): If the message-list was focussed before,
-	re-grab the focus.  For bug #29564.
-
-2003-03-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-signature-editor.c (mail_signature_editor): Give the editor
-	the GDK_WINDOW_TYPE_HINT_DIALOG hint.  [#38926]
-
-2003-03-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (pixbuf_gen_idle): If we fail to load the pixbuf,
-	don't use it (stops some g_warnings).
-
-	Part of a fix for bug #39809
-
-	* mail-vfolder.c (vfolder_edit): Don't add the cancel button here.
-
-	* mail-callbacks.c (filter_edit): Don't add the cancel button here.
-
-2003-03-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (do_external_viewer): Lookup the handler for the
-	type. If we don't have a registered handler or if the registered
-	handler is not meant to be handled via a bonobo component, don't
-	use a bonobo component.
-
-	* mail-format.c (mail_lookup_handler): If we register a new
-	handler that is to be handled by a bonobo component, set
-	handler->is_bonobo to TRUE.
-
-2003-03-14  Dan Winship  <danw@ximian.com>
-
-	* component-factory.c (storage_connect, storage_connected): Update
-	for EvolutionStorage change
-
-2003-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-signature-editor.c (menu_file_save_cb): Rewritten to do the
-	same as the composer's build_message() code.
-
-2003-03-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (account_add_clicked): Use
-	gtk_window_set_transient_for() on the druid with the settings
-	dialog as the parent window.
-
-2003-03-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-signature-editor.c (do_exit): Remove the yes/no
-	buttons. Fixes bug #39382.
-
-	* mail-accounts.c (account_able_toggled): New callback function to
-	handle the checkbox getting toggled.
-	(mail_accounts_treeview_new): Save the toggle renderer so we can
-	later connect to it's toggled signal.
-	(mail_accounts_tab_construct): Connect to the toggle-cell's
-	toggled signal. Fixes bug #39325.
-
-2003-03-11  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vfolder.c (vfolder_editor_response): Fix the response code,
-	because some bastard changed the filter/* code and didn't fix the
-	callers.  Partial fix for #39165.
-
-2003-03-10  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (libevolution_mail_la_SOURCES): removed main.c from
-	the build.
-
-	* component-factory.c (component_factory_init): Remove, not used
-	anymore, causes linking problems some places.
-	(factory): Removed the debug printf.  Added a case for the
-	composer.  Part of fixing #39256.
-
-2003-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	All this snot just to fix bug #38925 and an attempt to fix bug
-	#38926 (but it seems no matter what I do, I can't work around the
-	bonoboness/modality/whatever of the shell's preferences dialog).
-
-	* mail-account-gui.c (sig_add_new_signature): Get the toplevel
-	parent GtkWindow and pass that along to
-	mail_composer_prefs_new_signature() so that window layering can be
-	done correctly.
-
-	* mail-composer-prefs.c (mail_composer_prefs_new_signature):
-	Simplify. We don't want to add the signature to the list until
-	after they have saved.
-	(sig_edit_cb): Pass FALSE as the is_new argument to
-	mail_signature_editor().
-	(sig_event_client): Listen for signatures being added.
-	(mail_composer_prefs_new_signature): Now takes a GtkWindow arg as
-	the first arg rather than a MailComposerPrefs arg since we don't
-	really need it to be a MailComposerPrefs object. We'd rather use
-	the first arg as the parent GtkWindow so that we can set
-	transience for the editor window.
-
-	* mail-signature-editor.c (mail_signature_editor): Now takes a
-	'parent' argument (so we can set transient_for()) and a 'is_new'
-	argument specifying whether the editor is editing a new signature
-	or not. If it is, when the user saves, it will be added to the
-	signature list. otherwise it won't.
-	(sig_name_changed): Only use the mail_config_signature_set_name()
-	interface if it is *not* a new signature.
-	(menu_file_save_cb): If is_new, then save the signature to the
-	config - otherwise do what we did before and set the modifications
-	to it and emit the CHANGED event.
-
-	* mail-config.c (mail_config_signature_new): Renamed from
-	mail_config_signature_add(). We no longer immediately add the
-	signature to the list of saved signatures.
-	(mail_config_signature_add): New function which adds the signature
-	and emits the SIG_ADDED event.
-
-2003-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (on_url_requested): If the part url is a text
-	part, use mail_format_data_wrapper_write_to_stream(). This should
-	fix bug #39204.
-
-	* mail-format.c (mail_format_data_wrapper_write_to_stream): Make public.
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-accounts.c (mail_accounts_treeview_new): Set the
-	shadow_type of the scrlled window to GTK_SHADOW_IN.
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-config.glade: Add some spacing to the buttons.  [#38227]
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/evolution-mbox-importer.c (IN): Use G_GNUC_FUNCTION
-	instead of __FUNCTION__.
-	(OUT): Likewise.
-	* importers/netscape-importer.c (netscape_import_file): Likewise.
-	* mail-send-recv.c (receive_done): Likewise.
-	* mail-summary.c (SUMMARY_OUT): Likewise.
-	(SUMMARY_IN): Likewise.
-	(folder_changed_cb): Likewise.
-	(message_changed_cb): Likewise.
-
-2003-03-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-factory.c: #include <string.h>
-
-	* e-searching-tokenizer.c (camel_utf8_getc): Don't use __inline__
-	as not all platforms/compilers support this keyword.
-	(g): Same.
-
-2003-03-06  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c (owner_unset_cb): remove debug printf.
-
-2003-03-05  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c (idle_quit): Removed old quit code.
-	(owner_unset_cb): Make this call synchronous.  Wont cover all
-	cases but should be ok most of the time.
-
-2003-03-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-search.c: Prototype some functions to shut the compiler up.
-
-	* mail-callbacks.c (composer_get_message): Go back to using
-	e_destination_get_address() but use the camel-address parser on
-	the strings to make sure they are non-empty. Fixes bug #37854.
-
-2003-03-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-signature-editor.c (menu_file_save_cb): Use 'filename' when
-	creating the uri rather than using the uninitialised 'uri'
-	variable to create itself. Fixes bug #38864.
-
-2003-03-03  Not Zed  <NotZed@Ximian.com>
-
-	* mail-session.c (do_user_message): Do the same as below for
-	request_password, so we dont leave a mainloop lying around.
-
-2003-03-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (request_password): Don't connect to the response
-	signal if we are in the main thread - instead just use the return
-	value from gtk_dialog_run and then call pass_response() with the
-	response value.
-
-2003-03-03  Not Zed  <NotZed@Ximian.com>
-
-	* subscribe-dialog.c (fe_got_children): Remove the
-	e_tree_memory_sort_node, currently it crashes inside gal, the root
-	node seems to get free'd under it.
-
-2003-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-preferences.c: Reverted back to using e-iconv
-
-	* mail-composer-preferences.c: Same.
-
-2003-02-26  Dan Winship  <danw@ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: add a repo_id and a priority
-	level to the startup wizard
-
-2003-02-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c: Reverted back to using e-iconv instead of
-	camel-iconv.
-
-2003-02-25  Dan Winship  <danw@ximian.com>
-
-	* mail-config-druid.c: Update for new EvolutionWizard interfaces.
-
-2003-02-25  Dan Winship  <danw@ximian.com>
-
-	* mail-config-druid.c: Redo this to not use the CORBA interfaces
-	in the local case (in preparation for redoing the CORBA
-	interfaces).
-	(mail_config_druid_new): Remove unused "shell" arg
-
-	* mail-account-gui.c (mail_account_gui_transport_complete): Don't
-	crash if there's no transport selected at all.
-	(mail_account_gui_new): Don't try to set cc_addrs/bcc_addrs if
-	they're NULL.
-
-	* mail-accounts.c (account_add_clicked): Don't need to pass shell
-	to mail_config_druid_new.
-
-	* mail-callbacks.c (configure_mail): Don't need to pass shell to
-	mail_config_druid_new.
-
-2003-02-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (request_password): Make sure m->config_service
-	is non-NULL before using m->config_service->save_passwd since PGP
-	stuff will not have a config_service. Fixes bug #38149.
-
-	* mail-account-gui.c (mail_account_gui_save):
-	s/e_account_list_changed/e_account_list_change - otherwise we get
-	an undefined symbol and we crash :-)
-
-	* mail-composer-prefs.c (mail_composer_prefs_new_signature): Don't
-	always append "[script]" to the signature name. Also cleaned up
-	some memory leakage.
-
-2003-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* mail-preferences.c (mail_preferences_apply): fix the g_snprintf
-	stuff.
-
-	* mail-config.c (mail_config_add_account): Use new
-	e_account_list_add.
-	(mail_config_remove_account): Use new e_account_list_remove.
-	(mail_config_set_default_account): Similarly for
-	e_account_list_set_default.
-	(mail_config_get_default_account): Same for
-	e_account_list_get_default.
-	(mail_config_get_account_by_name): Use e_account_list_find.
-
-	* mail-account-gui.c (mail_account_gui_save): use new
-	e_account_list_changed call instead of manual signalling.
-
-2003-02-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-local.c: Set the local provider description field to a
-	string rather than NULL to prevent a segfault on solaris. Fixes
-	bug #38418.
-
-2003-02-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (write_text_header): bitwise-or in
-	CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES to fix bug #38499.
-
-	* mail-search.c (mail_search_destroy): New overloaded virtual
-	method, does what dialog_destroy_cb was trying to do.
-	(mail_search_construct): Connect to the "response" signal rather
-	than "clicked" to correspond to the GtkDialog API
-	(instead og the old GnomeDialog API).
-	(dialog_response_cb): Changed the function name and made it check
-	button == GTK_RESPONSE_ACCEPT to search, any other button
-	closes. Fixes bug #37947.
-
-2003-02-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* component-factory.c (factory): Don't try to get a FontPrefs control.
-
-	* mail-config-factory.c (mail_config_control_factory_cb): Just return
-	NULL if a FontPrefs control was requested.
-
-	* mail-config.c (mail_config_get_default_account): If no accounts
-	are defined, don't try to set the default account.
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (libevolution_mail_la_LIBADD): Remove libebook's
-	dependencies.
-
-	* importers/Makefile.am (libevolution_pine_importer_la_LIBADD):
-	Likewise.
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_build_extra_conf): Use
-	tables instead of vboxes, so that groups of label/entry pairs (as
-	in Connector's config page) can line up nicely.
-
-	* mail-config.glade: Turn extra_vbox and extra_mailcheck_vbox into
-	tables.
-
-	* mail-config-druid.c (get_fn): s/extra_vbox/extra_table/
-
-	* Makefile.am (libevolution_mail_la_LIBADD):
-	s/libcomposer.a/libcomposer.la/
-
-2003-02-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mark_all_as_seen): Use
-	camel_folder_free_uids().
-
-	* mail-format.c (write_headers): Use
-	camel_charset_canonical_name() here instead of
-	e_iconv_charset_name().
-
-	* mail-preferences.c (mail_preferences_construct): Same as below.
-	(mail_preferences_apply): Again here.
-
-	* mail-composer-prefs.c (mail_composer_prefs_construct): Use
-	camel_charset_locale_name() here instead of
-	e_iconv_locale_charset().
-	(mail_composer_prefs_apply): Same.
-
-2003-02-20  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (libevolution_mail_la_LIBADD):
-	s/libemiscwidgets.a/libemiscwidgets.la/ and likewise for
-	libefilterbar
-
-2003-02-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mark_all_as_seen): Fixed a memory leak - make
-	sure to free all uids.
-
-	* mail-config.c (uri_to_key): Removed.
-	(lookup_signature): Removed.
-	(xml_get_int): Removed.
-	(xml_get_bool): Removed.
-	(mail_config_get_time_24hour): Removed.
-
-	* evolution-mail.schemas: s/long/int/g and change default_account
-	to be a string instead of an int.
-
-	* mail-config.c (mail_config_get_default_account): default_account
-	now uses the account uid, so change the code a bit to match uid
-	strings rather than use an index.
-	(mail_config_remove_account): Same here. simplifies the code a
-	bunch.
-	(mail_config_set_default_account): Here too.
-
-	* folder-browser-ui.c (folder_browser_ui_setup_view_menus): Update
-	the GalView path.
-
-2003-02-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (do_get_pass): Change the logic here
-	slightly. Instead of only reprompting the user if the cache is
-	empty, also reprompt the user if the backend is forcing a
-	reprompt.
-	(request_password): If we have a cached passwd string for the
-	account, fill-in the GtkEntry box with that value by
-	default. This, together with the camel changes, fixes the
-	"Evolution forgets my POP passwd if it gets a -ERR response during
-	the login phase" bug.
-
-2003-02-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-searching-tokenizer.c: #include <stdio.h>
-
-	* mail-config-factory.c: #include <string.h>
-
-	* mail-config-druid.c (identity_prepare): Use
-	gtk_editable_select_region() since gtk_entry_select_region() has
-	been deprecated.
-	(construct): Use gtk_window_set_resizable() instead of
-	gtk_window_set_policy().
-	(wizard_free): account_destroy() is no longer around, use
-	g_object_unref() instead. (how did this even compile before?)
-
-	* mail-account-gui.c (mail_account_gui_build_extra_conf): Use
-	gtk_label_set_text_with_mnemonic() instead of
-	gtk_label_parse_uline() as the latter has been deprecated.
-
-2003-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* importers/netscape-importer.c: Removed unused variables.
-
-	* importers/pine-importer.c: Removed unused variables.
-	(parse_address): Removed - it's unused and we have CamelAddress
-	available to us anyway.
-
-	* importers/elm-importer.c: Removed unused variables.
-
-	* importers/evolution-mbox-importer.c (load_file_fn): Removed an
-	unused variable.
-
-2003-02-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (construct): Use
-	gtk_window_set_resizable() instead of gtk_window_set_policy().
-
-	* mail-config.c: Fix a bunch of warnings.
-	(mail_config_signature_write): Removed.
-
-	* mail-callbacks.c: Removed unused variables.
-
-	* mail-accounts.c (mail_accounts_tab_class_init): Register a
-	destroy virtual method.
-	(mail_accounts_tab_destroy): Set mail_display->destroyed = TRUE.
-
-	* message-list.c (message_list_destroy): Set
-	mail_display->destroyed = TRUE. This is a workaround for the
-	GTK_OBJECT_DESTROYED() macro that we used to use before.
-
-	* mail-display.c (mail_display_destroy): Set
-	mail_display->destroyed = TRUE. This is a workaround for the
-	GTK_OBJECT_DESTROYED() macro that we used to use before.
-
-2003-02-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (build_tree): Use g_signal_emit() rather than
-	gtk_signal_emit().
-	(build_flat): Same here.
-
-	* mail-signature-editor.c: #include <string.h>
-
-	* mail-vfolder.c: #include <string.h>
-
-	* mail-session.c: #include <string.h>
-
-	* mail-search.c: #include <string.h>
-
-	* mail-mt.c: #include <string.h>
-
-	* mail-ops.c (save_part_save): Use strcasecmp() instead of
-	g_strcasecmp().
-
-	* mail-local.c: #include <string.h>
-	(reconfigure_folder_reconfigured): Use a GtkDialog instead of
-	gnome_error_dialog().
-
-	* mail-format.c (find_preferred_alternative): Use g_ascii_strdown
-	since g_strdown is deprecated.
-	(fake_mime_part_from_data): Removed, no longer used it seems.
-	(destroy_part): Also removed.
-
-	* mail-display.c (make_popup_window): Replace call to
-	gtk_window_set_polociy() with gtk_window_set_resizable() instead.
-	(popup_size_allocate_cb): Use gtk_window_set_position() with
-	GTK_WIN_POS_MOUSE instead of calculating the position to put it
-	in.
-
-2003-02-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/Makefile.am: Split the ORBit IDL compilation rules to
-	work properly with parallel makes.
-	(BUILT_SOURCES): Add this.
-	(CLEANFILES): Add this.
-
-	* Makefile.am: Split the ORBit IDL compilation rules to work
-	properly with parallel makes.
-	(BUILT_SOURCES): Add $(IDL_GENERATED) here.
-	(CLEANFILES): Remove from here.
-
-2003-02-10  Rodney Dawes  <dobey@ximian.com>
-
-	* importers/Makefile.am: Add LDFLAGS to ported libs
-	
-2003-02-10  Larry Ewing  <lewing@ximian.com>
-
-	* mail-display.c (save_url): look in the http cache for images
-	when saving
-	(image_save_as): remove random warning.
-	(do_external_viewer): remove unused variable.
-	(do_attachment_header): use g_ascii_strdown
-
-2003-02-07  Larry Ewing  <lewing@ximian.com>
-
-	* mail-display.c (save_data_cb): don't use random memory as a
-	gconf client.
-
-2003-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* importers/pine-importer.c (import_addressbook): track change to
-	e_book_load_uri type.
-
-2003-02-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser.c (on_right_click): Use
-	e_auto_kill_popup_menu_on_selection_done() instead of
-	e_auto_kill_popup_menu_on_hide().
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): add EVOLUTION_PRIVDATADIR. Fix
-	EVOLUTION_ICONSDIR
-
-	* component-factory.c (owner_set_cb): Use EVOLUTION_PRIVDATADIR
-	* mail-autofilter.c (filter_gui_add_from_message): Likewise
-	(mail_filter_rename_uri): Likewise
-	(mail_filter_delete_uri): Likewise
-	* mail-callbacks.c (filter_edit): Likewise.
-	* mail-search-dialogue.c (mail_search_dialogue_construct):
-	Likewise
-	* mail-session.c (main_get_filter_driver): Likewise
-	* mail-summary.c (generate_folder_summaries): Likewise
-	* mail-vfolder.c (vfolder_load_storage): Likewise
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: Remove *dir defs that are in configure.in now
-	(INCLUDES): clean up using new *dir variables
-	(libevolution_mail_la_LDFLAGS): remove -export-dynamic, add
-	-module
-
-	* main.c (main): s/PACKAGE/GETTEXT_PACKAGE/ in gettext init
-
-	* importers/Makefile.am (INCLUDES): change EVOLUTION_DATADIR to
-	EVOLUTION_PRIVDATADIR
-
-	* importers/netscape-importer.c (netscape_import_filters): use
-	EVOLUTION_PRIVDATADIR
-
-2003-02-06  Larry Ewing  <lewing@ximian.com>
-
-	* mail-session.c (pass_activate): add an activate handler to the
-	entry so that hitting return will return an OK response.
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* main.c (main): s/glade_gnome_init/glade_init/
-
-2003-02-05  Not Zed  <NotZed@Ximian.com>
-
-	* importers/netscape-importer.c: update from ../../importers/.
-	(main): Removed.
-	(mail_importer_module_init): Setup module init fn.
-	(factory_fn): api changes.
-	(is_dir_empty): deprecated changes, and clean up logic.
-	(importer_cb): pulse progress bar, use idle function for
-	processing next item.
-	(import_next): Remove link before recursing, also fix memleak, and
-	api changes.
-	(netscape_import_file): dont release importer.
-	(*): gconf'ify
-
-	* importers/elm-importer.c (elm_factory_fn): Track the
-	evolution_intelligent_importer, so we can unref it when done.
-	(*): gconf'ify.
-
-	* importers/pine-importer.c (parse_line): use gobject stuff rather
-	than gtkobject.
-	(import_addressfile): close down 'properly' when finished.
-	(importer_timeout_fn): Do most processing decisions here, either
-	from a timeout or idle function.  This prevents us getting 1 stack
-	frame per message and per folder.  Close down properly also.
-	(importer_cb): Add a timeout, ignore the callback, or add an idle
-	function to process the next item.
-	(pine_import_file): dont release the importer if we can't load it,
-	its released elsewhere, i think.
-	(import_addressfile): step the progress bar as we go.
-	(factory_fn): Track the evolution_intelligent_importer, so we can
-	unref when done.
-	(*): gconf'ify
-
-2003-01-31  Not Zed  <NotZed@Ximian.com>
-
-	* importers/elm-importer.c (elm_can_import): g_file_exists ->
-	lstat, and g_build_filename api changes.
-
-	* importers/pine-importer.c: moved from
-	../../importers/pine-importer.c
-	(factory_fn): oaf->bonobo_activation
-	(mail_importer_module_init): setup factory.
-	(main): Removed.
-	(*): REemove bonobo config stuff.
-	(factory_fn): destroy signal -> weak ref.
-	(pine_destroy_cb): Fix signature for weak ref notify.
-	(import_addressfile): use new glib filename stuff.
-	(import_addressbook): same.
-	(pine_can_import): and here.
-	(import_next): and here.
-	(scan_dir): and here
-	(pine_create_structure): And here.
-	(pine_can_import): g_file_exists -> lstat.
-	(importer_cb): If there are more items, use an idle handler to
-	drop back a few stack frames rather than recursing for each
-	message.
-	(import_next): unlink data from dir_list before recursing, and fix
-	leak.
-
-2003-01-30  Not Zed  <NotZed@Ximian.com>
-
-	* importers/elm-importer.c (elm_destroy_cb): Change for weak ref
-	setup.
-	(elm_factory_fn): destroy -> weak ref.
-
-2003-01-29  Not Zed  <NotZed@Ximian.com>
-
-	* importers/elm-importer.c (importer_cb): Pass processItem off to
-	an idle handler, so we dont blow our stacks.  Also update to use
-	progress_bar_pulse().
-	(import_item_idle): Get the next message here instead.
-	(import_next): Fix a glist leak.  Unlink the file before we import
-	it too.  And close the dialogue and clean up when we've run out of
-	folders to import.
-
-2003-01-17  Not Zed  <NotZed@Ximian.com>
-
-	* importers/elm-importer.c (elm_create_structure): use/free elmdir
-	rather than double-free maildir.
-
-2003-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* importers/elm-importer.c: update from ../importers/elm-importer.c
-
-2003-02-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (mail_regen_list): Get the thread_subject setting
-	here instead of in regen_list_regen since that function will be
-	called in another thread and we can't make corba calls in anything
-	but the main thread.
-	(regen_list_regen): Don't make CORBA calls here! (shame on me).
-
-	* mail-identify.c (mail_identify_mime_part): Just use
-	gnome_vfs_get_mime_type_from_name() so we can forget all the crap
-	I implemented before.
-
-2003-02-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (on_link_clicked): Pass in the *address* of the
-	GError to gnome_url_show(), otherwise bad things happen :-)
-
-2003-01-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_get_labels): New function to return a
-	cached list of labels.
-	(mail_config_get_label_color_by_name): New convenience function to
-	search the cached labels.
-	(mail_config_get_label_color_by_index): Same.
-	(mail_config_init): Cache the labels and also listen for changes
-	to them in the gconf db.
-	(config_cache_labels): Internal function to cache the labels.
-
-	* folder-browser.c (on_right_click): Fixed the label colours in
-	the menu by using the cached linked list of labels.
-
-	* mail-preferences.c (colorpicker_set_color): Now takes a string
-	argument allowing us to get rid of converting a string into an rgb
-	guint32 all over the place when trying to set defaults, since we
-	now store colors in gconf as strings.
-	(mail_preferences_construct): Use the cached labels (they are
-	already parsed for us).
-
-2003-01-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (storage_remove_folder): Change
-	strcmp(fi->path, path) to strcmp(fi->name, name) and now the
-	execution takes the right path. My patch base on Callie's patch
-	for bug #33525.
-
-	* mail-identify.c (mail_identify_mime_part): Fixed a #warning by
-	converting a local path into a file: uri before feeding it to
-	gnome-vfs.
-
-	* message-list.c (message_list_set_folder): Removed a FIXME that
-	I've decided is no longer needed.
-
-2003-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_add_account): Emit the account-added
-	event.
-	(mail_config_remove_account): Emit the account-removed event.
-
-	* mail-account-gui.c (mail_account_gui_save): Emit the changed
-	event on the account-list for the changed account.
-
-2003-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-ui.c (folder_browser_ui_add_global): Set the
-	paned_size here.
-
-	* folder-browser.c (folder_browser_gui_init): Don't bother
-	connecting to the hide-deleted, message-display-style, paned-size,
-	nor show-preview gconf notifications anymore, since we can just
-	set them when the view becomes active again in
-	folder-browser-ui.c. Cuts down on extra overhead.
-	(folder_browser_destroy): No need to disconnect from those
-	notifications anymore either.
-
-2003-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (iconsdir): Remove, this is now defined in
-	configure.in.
-
-2002-12-07 leon.zhang  <leon.zhang@sun.com>
-
-	* component-factory.c (user_create_new_item_cb):  transfer the 
-	current acount info, which will be regarded as the sender of 
-	new composer, to send_to_url().
-
-	* mail-callbacks.h (send_to_url): Add a new parameter for parent
-	folder uri.
-
-	* mail-callbacks.c (send_to_url): Create composer base on source
-	account info from parent folder physical uri.
-	(post_to_url): create composer based on current account from 
-	parent folder physical uri. 
-
-	* mail-display.c (on_link_clicked): Apply new format of function:
-	send_to_url.
-
-	Fixes bug #35123 #35289
-
-2003-01-24  Not Zed  <NotZed@Ximian.com>
-
-	* mail-local.c (non_equal): We do actually need to check they are
-	file url's, otherwise, all url's match.
-
-2003-01-23  Rodney Dawes  <dobey@ximian.com>
-
-	* folder-browser.c (fb_resize_cb): Use button_release instead of
-	size_allocate, and get the position from the Paned widget to prevent
-	calling CORBA all the time for GConf stuff
-	
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (componentdir): Removed definition; this is now
-	defined in configure.in.
-
-2003-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_get_thread_list): Removed.
-	(mail_config_set_thread_list): Removed.
-	(mail_config_uri_renamed): No longer needs to change threaded
-	state for each url either.
-	(mail_config_write_on_exit): Updated.
-
-	* folder-browser-ui.c (folder_browser_ui_add_list): Get the
-	threaded state via gconf.
-
-	* folder-browser.c (folder_browser_toggle_threads): Save the
-	threaded state.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser-ui.c (folder_browser_ui_setup_view_menus): Use
-	EVOLUTION_GALVIEWSDIR.
-
-	* message-browser.c (set_bonobo_ui): Get
-	evolution-mail-messagedisplay.xml from EVOLUTION_UIDIR.
-
-	* mail-signature-editor.c (mail_signature_editor): Get
-	evolution-signature-editor.xml from EVOLUTION_UIDIR.
-
-	* folder-browser-ui.c (ui_add): Get the evoluiton-mail* XML files
-	from EVOLUTION_UIDIR.
-
-	* Makefile.am (INCLUDES): Define EVOLUTION_GALVIEWSDIR; update
-	EVOLUTION_IMAGESDIR to include the $(BASE_VERSION).
-	(gladedir): Version using $(BASE_VERSION).
-	(etspecdir): Likewise.
-	(iconsdir): Likewise.
-	(buttonsdir): Likewise.
-	(etspecdir): Likewise.
-
-	* component-factory.c (owner_set_cb): Look for vfoldertypes.xml in
-	the new version-aware location.
-	* mail-summary.c (generate_folder_summaries): Likewise.
-	* mail-search-dialogue.c (mail_search_dialogue_construct): Likewise.
-	* mail-vfolder.c (vfolder_load_storage): Likewise.
-
-	* mail-autofilter.c (filter_gui_add_from_message): Look for
-	filtertypes.xml in the new version-aware location.
-	(mail_filter_rename_uri): Likewise.
-	(mail_filter_delete_uri): Likewise.
-	* mail-session.c (main_get_filter_driver): Likewise.
-	* mail-callbacks.c (filter_edit): Likewise.
-
-2003-01-22  Radek Doulik  <rodo@ximian.com>
-
-	* mail-callbacks.c (do_mail_print): put unrealized html widget
-	into top level widget (gtk window) before realizing it
-	destroy temporary widgets (w, html)
-
-2003-01-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_remove_account): Don't unref the
-	account object, e_list_remove() apparently handles this for us.
-
-	* mail-accounts.c (account_delete_clicked): Don't unref the
-	confirm dialog, it was already destroyed.
-
-2003-01-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.schemas: Default to hiding deleted
-	messages. Fixes bug #35929.
-
-	* mail-preferences.c (entry_changed): Removed.
-	(toggle_button_toggled): Removed.
-	(settings_changed): New callback that replaces the two above. No
-	need to have multiple callback functions when the signature is the
-	same.
-
-	* folder-browser.c (folder_browser_toggle_hide_deleted): Don't
-	!atoi (state) for the message_list_set_hidedeleted() call.
-
-2003-01-18  Larry Ewing  <lewing@ximian.com>
-
-	* mail-callbacks.c (save_msg_ok): e_question returns a boolean,
-	don't test for a specific value.
-
-	* mail-display.c (html_button_press_event): make the event
-	handlers return FALSE so that gtkhtml can process the events.
-	(on_link_clicked): call gnome_url_show with all its arguments so
-	that it actually does something.  Also pass news and nntp urls to
-	gnome_url_show so that they can be handled properly.
-
-2003-01-17  Larry Ewing  <lewing@ximian.com>
-
-	* mail-format.c (handle_text_enriched): wrap eriched entries with
-	a table so that they get proper indentation.
-
-2003-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (do_get_pass): Updated.
-	(request_password): Same.
-
-	* mail-send-recv.c (mail_send): Fixed to use EAccountService.
-
-	* mail-config-druid.c (make_account): Updated to use EAccount and
-	friends.
-
-	* mail-account-gui.c (service_check_supported): Updated to use
-	EAccountService.
-	(mail_account_gui_new): Ref the account passed in and also update
-	to use EAccount objects.
-	(save_service): Updated to use an EAccountService.
-	(add_new_store): Updated to use an EAccount.
-	(mail_account_gui_save): Updated to use EAccounts.
-	(setup_signatures): Updated because the new account->id->def_sig
-	is now an int and not a structure pointer.
-
-	* mail-account-editor.c (construct): Updated.
-	(mail_account_editor_new): Now takes an EAccount object as an
-	argument instead of a MailConfigAccount.
-
-	* mail-crypto.c (mail_crypto_get_pgp_cipher_context): Updated to
-	use EAccounts.
-
-	* subscribe-dialog.c (populate_store_foreach): Removed.
-	(populate_store_list): Can't use populate_store_foreach here
-	because of the change to EAccountList so do it manually.
-
-	* mail-vfolder.c (uri_is_ignore): Rewrote to use EAccountList and
-	EIterator and all that fun.
-
-	* mail-send-recv.c (build_dialogue): Updated to use EAccountList
-	and EAccount object stuff. *ugh*
-	(mail_send_receive): Here too.
-	(mail_autoreceive_setup): Same.
-
-	* mail-callbacks.c (check_send_configuration): Updated.
-	(composer_get_message): Updated.
-	(compose_msg): "
-	(list_add_addresses): "
-	(guess_me): "
-	(guess_me_from_accounts): Same.
-	(forward_get_composer): Here too.
-	(mail_generate_reply): Same.
-	(redirect_get_composer): "
-	(empty_trash): And finally here.
-
-	* mail-accounts.c (account_edit_clicked): Updated.
-	(account_delete_clicked): Same.
-	(account_default_clicked): Here too.
-	(account_able_clicked): "
-	(account_cursor_change): "
-	(mail_accounts_load): Again here.
-
-	* folder-browser.c (folder_browser_is_drafts): Updated to use
-	EAccountList and EAccount stuff.
-	(folder_browser_is_sent): Same.
-
-	* component-factory.c (mail_load_storages): Updated to use
-	EAccount and EAccountList stuff.
-	(owner_set_cb): Same.
-	(send_receive_cb): Here too.
-
-	* mail-config.c: Rewritten to use EAccount and EAccountList
-	objects.
-
-2003-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (get_fn): Connect to the toggled event on
-	the transport_needs_auth toggle button so if the user turns this
-	off after having deleted the username field, the Next button
-	becomes re-enabled. Fixes bug #36862.
-
-2003-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-composer-prefs.c (sig_fill_clist): Same as below.
-
-	* mail-account-gui.c (sig_fill_options):
-	mail_config_get_signature_list() now returns a GSList instead of a
-	GList.
-
-	* mail-config.c (signature_new_from_xml): New function to parse a
-	signature xml blob into a MailConfigSignature structure.
-	(config_read_signatures): Rewritten to use above function.
-	(signature_to_xml): New function to write a signature to xml.
-	(config_write_signatures_num): Removed.
-	(config_write_signature): Removed.
-	(config_write_signatures): Rewritten to use signature_to_xml and
-	gconf.
-
-2003-01-16  Dan Winship  <danw@ximian.com>
-
-	* mail-config.h (MailConfigAccount): Add a UID field (to match
-	EAccount), which never changes and can be used by gconf watchers
-	to distinguish an account rename from a deletion and creation.
-
-	* mail-config.c (account_copy): Create a new UID on the new
-	account.
-	(account_new_from_xml): Read the UID. (If it doesn't have one,
-	make one.)
-	(account_to_xml): Write the UID.
-
-	* mail-config-druid.c (make_account): add a UID to each account
-
-2003-01-15  Not Zed  <NotZed@Ximian.com>
-
-	* mail-accounts.c (account_able_clicked): Change the
-	enable/disable button when the state changes.
-
-2003-01-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-local.c (save_metainfo): Back to using e_xml_save_file().
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* message-tag-editor.c (message_tag_editor_init): Make dialog
-	Cancel/OK to match HIG.
-
-	* mail-signature-editor.c (do_exit): Make confirmation dialog
-	Discard/Cancel/Save to match the HIG.
-
-	* mail-composer-prefs.c (mail_composer_prefs_construct): Make
-	dialog Cancel/OK to match HIG.
-
-	* mail-account-editor.c (construct): Make the dialog
-	Apply/Close/OK to match HIG.
-
-2003-01-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Call
-	mail_config_save_accounts ().
-
-	* mail-config.c (mail_config_save_accounts): New function to save
-	accounts without having to re-load them.
-
-2003-01-14  Radek Doulik  <rodo@ximian.com>
-
-	* folder-browser.c (etree_key): use gtk_scrolled_window_*
-	functions for mail_display->scroll
-
-	* mail-display.c (mail_display_new): use gtk_scrolled_window_*
-	functions
-
-	* mail-display.h: use GtkScrolledWindow instead of EScrollFrame
-
-2003-01-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (pixmap_press): Change the user_data argument to
-	be of type gpointer instead of EScrollFrame, since, well, it's not
-	an EScrollFrame anymore.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (libevolution_mail_la_SOURCES): Add mail-format.h.
-	(EXTRA_DIST): Add $(schema_DATA).
-
-2003-01-14  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am: Make the component be unversioned as a shlib
-	
-2003-01-14  Rodney Dawes  <dobey@ximian.com>
-
-	* folder-browser.c: Use GtkPaned instead of EPaned
-	
-2003-01-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (account_new_from_xml): Perform some sanity
-	checking on the auto-check-timeout value.
-
-	* folder-browser.c (folder_browser_copy): Correctly create the
-	clipboard buffer by using a nul to delimit the uri and the list of
-	uids.
-
-	* folder-browser-ui.c (folder_browser_ui_add_message): Check the
-	state of message_style in gconf and set the menus accordingly.
-
-	* folder-browser.c (folder_browser_destroy): Remove listener for
-	message_style change notification.
-	(folder_browser_gui_init): Connect a listener for changes to
-	message_style.
-
-	* mail-config.c (account_to_xml): Save the auto-check timeout
-	value.
-	(account_new_from_xml): Load the auto-check-timeout value.
-
-2003-01-13  Dan Winship  <danw@ximian.com>
-
-	* folder-info.c: s/BonoboXObject/BonoboObject/
-
-	* mail-config.c: Likewise
-
-	* mail-offline-handler.c: Likewise
-
-2003-01-13  Not Zed  <NotZed@Ximian.com>
-
-	* mail-mt.c (mail_msg_check_error): hook onto destroy to remove
-	dialogue from active table.
-	(error_response): Just destroy on any response, dont unref either.
-
-2003-01-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_format_data_wrapper_write_to_stream):
-	g_strdup the md->charset otherwise we'll get memory corruption
-	later. This may be why non-usascii text is displaying incorrectly.
-
-2003-01-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-ui.c (folder_browser_ui_add_list): We also need
-	to call message_list_set_hidedeleted() here so that any
-	deactivated folder controls will change to the currently set state
-	when re-activated.
-	(folder_browser_ui_add_global): Same for show_preview.
-
-	* folder-browser.c (hide_deleted_changed): Don't call
-	message_list_set_hidedeleted() here.
-	(folder_browser_toggle_hide_deleted): Instead, call it here. This
-	way we get a faster "response time". Also, this will make it so
-	that not all folder controls will regen their message-list at the
-	same time.
-	(folder_browser_toggle_preview): Same idea as the hide-deleted
-	changes.
-	(show_preview_changed): See above.
-
-	* mail-config-druid.c (make_account): Default the new account to
-	enabled.
-	(wizard_finish_cb): Don't set enabled here.
-
-2003-01-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (hide_deleted_changed): New callback for when
-	the HideDeleted state changes.
-	(folder_browser_gui_init): Listen for changes to hide_deleted so
-	we can update the menu state.
-	(folder_browser_destroy): Remove the hide_deleted notify handler.
-	(folder_browser_toggle_hide_deleted): When saving the setting,
-	remember that it is !atoi (state) rather than atoi (state) because
-	show vs hide. yea.
-
-	* mail-session.c (main_get_filter_driver): notify-type is a int,
-	not a bool. Duh.
-
-2003-01-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (factory): Updated for function rename.
-
-	* mail-config-factory.c (mail_config_control_factory_cb):
-	Namespaced the function name.
-
-	* folder-browser-ui.c (folder_browser_ui_add_global): Don't add
-	the listener for show_preview here, it was moved into
-	folder-browser.c so we could detach the listener when the
-	folder-browser is destroyed. Also prevents a listener being added
-	multiple times (which was possible? before).
-
-	* folder-browser.c (folder_browser_destroy): Remove the gconf
-	notify handler for show_preview.
-	(show_preview_changed): Moved here from folder-browser-ui.c
-
-	* component-factory.c (storage_remove_folder): Fixed a situation
-	in which we could notify the shell listener twice.
-
-2003-01-10  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_gui_init): Save the paned_size
-	notify handle.
-	(folder_browser_destroy): Remove gconf notify handler.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* mail-config-druid.c (wizard_finish_cb): enable the account
-	before attempting to saving it.
-
-	* mail-accounts.c (account_delete_clicked): need to show the
-	buttons added to the dialog.
-
-2003-01-10  Not Zed  <NotZed@Ximian.com>
-
-	* mail-config.glade: Remove info.png from a couple of images, the
-	image is set via code at runtime.  Removes some annoying runtime
-	warnings.
-
-	* mail-send-recv.c (dialogue_response): dont unref the dialogue.
-	(dialog_destroy_cb): null out the send_recv_dialogue after destroy.
-	(build_dialogue): show the stop button
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* folder-info.c (evolution_folder_info_notify_ready): pass bag to
-	bonobo_pbclient_set_boolean.
-
-2003-01-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (owner_set_cb): Don't call
-	mail_config_register_factory() or
-	evolution_mail_config_wizard_init().
-
-2003-01-09  Not Zed  <NotZed@Ximian.com>
-
-	* mail-config-druid.c: Added druidpagestart1 to the pages list.
-	(construct): Change the limits on the page initialisation, and
-	widget_show_all on the page rather than the content.
-
-	* GNOME_Evolution_Mail.server.in.in: Make Mail a shlib component.
-
-	* folder-info.c (evolution_folder_info_factory_init): Removed.
-	(evolution_folder_info_factory_fn): renamed to evolution_folder_info_new().
-
-	*  mail-config-druid.c  (evolution_mail_config_wizard_factory_fn):
-	Renamed to evolution_mail_config_wizard_new().
-	(evolution_mail_config_wizard_init): Removed.
-
-	* mail-config-factory.c (mail_config_register_factory): Remove.
-	(config_control_factory_cb): make this public.
-
-	* Makefile.am: setup evolution-mail as a shared library.
-
-	* component-factory.c (make_factory): implement the bonobo-plugin
-	factory for shlib operation.  Also, preliminary work to setup mailer-specific 
-	(factory): Implement the factory which starts various components.
-
-	* mail-config.c (xml_get_prop): g_free->xmlFree
-	(account_to_xml): copy xml memory to glib memory when adding the 0
-	on the end of the string.
-	(accounts_save): Use slightly different logic with appending to
-	the tail of the list, we can't use the &node trick with gslists.
-	(accounts_changed): Same here.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Images are now in $(datadir)/evolution/images
-	instead of $(datadir)/images/evolution.
-
-2003-01-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-ui.c (folder_browser_ui_add_global): Call
-	folder_browser_set_message_preview().
-
-	* mail-config.c (mail_config_get_show_preview): Removed.
-	(mail_config_set_show_preview): Removed.
-
-	* folder-browser.c (folder_browser_toggle_preview): Simply set the
-	gconf show_preview setting and let the code in folder-browser-ui.c
-	detect it and update the UI.
-
-	* folder-browser-ui.c (folder_browser_ui_add_global): Listen for
-	changed events on the show_preview setting.
-
-	* mail-config.c (mail_config_set_default_account): Save the
-	setting via gconf.
-	(mail_config_add_account): Immediately save the list of accounts.
-	(mail_config_remove_account): Same.
-	(mail_config_signature_run_script): g_free the charset value and
-	use the composer's charset rather than the display charset.
-	(mail_config_get_default_account_num): Removed.
-
-2003-01-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (save_cursor_pos): Use gconf to get the paned
-	size.
-	(folder_browser_set_message_preview): Same.
-	(folder_browser_toggle_hide_deleted): Use gconf to set the
-	hide-deleted state.
-	(folder_browser_set_message_display_style): Same but for the
-	message_display_style.
-	(fb_resize_cb): Save the paned_size via gconf.
-	(paned_size_changed): Callback for when the paned_size gets
-	changed. Change the folder-browser's paned size to the new
-	setting.
-	(folder_browser_gui_init): Listen to changes to the paned_size and
-	also get the initial size from gconf.
-
-	* message-list.c (message_list_set_folder): Use gconf.
-	(regen_list_regen): Use gconf.
-
-	* message-browser.c (transfer_msg_done): Use gconf to get the
-	hide_deleted setting.
-
-	* mail-account-gui.c (sig_add_new_signature): Use gconf.
-
-	* folder-browser-ui.c (folder_browser_ui_add_list): Use gconf.
-
-	* folder-browser.c (save_cursor_pos): Use gconf.
-	(folder_browser_set_message_preview): Same.
-	(folder_browser_toggle_hide_deleted): Here too.
-	(folder_browser_set_message_display_style): And here.
-	(folder_browser_gui_init): Here too.
-	(done_message_selected): And here.
-
-	* mail-config.c (mail_config_get_thread_subject): Removed.
-	(mail_config_set_thread_subject): Removed.
-	(mail_config_get_empty_trash_on_exit): Removed.
-	(mail_config_set_empty_trash_on_exit): Removed.
-	(mail_config_get_last_filesel_dir): Removed.
-	(mail_config_set_last_filesel_dir): Removed.
-	(mail_config_get_hide_deleted): Removed.
-	(mail_config_set_hide_deleted): Removed.
-	(mail_config_get_paned_size): Removed.
-	(mail_config_set_paned_size): Removed.
-	(mail_config_get_send_html): Removed.
-	(mail_config_set_send_html): Removed.
-	(mail_config_get_confirm_unwanted_html): Removed.
-	(mail_config_set_confirm_unwanted_html): Removed.
-	(mail_config_get_citation_highlight): Removed.
-	(mail_config_set_citation_highlight): Removed.
-	(mail_config_get_citation_color): Removed.
-	(mail_config_set_citation_color): Removed.
-	(mail_config_get_do_seen_timeout): Removed.
-	(mail_config_set_do_seen_timeout): Removed.
-	(mail_config_get_mark_as_seen_timeout): Removed.
-	(mail_config_set_mark_as_seen_timeout): Removed.
-	(mail_config_get_prompt_empty_subject): Removed.
-	(mail_config_set_prompt_empty_subject): Removed.
-	(mail_config_get_prompt_only_bcc): Removed.
-	(mail_config_set_prompt_only_bcc): Removed.
-	(mail_config_get_confirm_expunge): Removed.
-	(mail_config_set_confirm_expunge): Removed.
-	(mail_config_get_confirm_goto_next_folder): Removed.
-	(mail_config_set_confirm_goto_next_folder): Removed.
-	(mail_config_get_goto_next_folder): Removed.
-	(mail_config_set_goto_next_folder): Removed.
-	(mail_config_get_http_mode): Removed.
-	(mail_config_set_http_mode): Removed.
-	(mail_config_get_default_forward_style): Removed.
-	(mail_config_set_default_forward_style): Removed.
-	(mail_config_get_default_reply_style): Removed.
-	(mail_config_set_default_reply_style): Removed.
-	(mail_config_get_message_display_style): Removed.
-	(mail_config_set_message_display_style): Removed.
-	(mail_config_get_default_charset): Removed.
-	(mail_config_set_default_charset): Removed.
-	(mail_config_get_x_mailer_display_style): Removed.
-	(mail_config_set_x_mailer_display_style): Removed.
-
-	* subscribe-dialog.c (populate_store_list): Use the list of
-	accounts. We can't get the list of sources anymore.
-	(populate_store_foreach): Updated.
-
-	* mail-callbacks.c (guess_me_from_accounts): Use account->enabled.
-	(mail_generate_reply): Same.
-	(empty_trash): Here too.
-
-	* mail-accounts.c (account_delete_clicked): Use account->enabled
-	rather than source->enabled.
-	(account_able_clicked): Same.
-	(account_cursor_change): Here too.
-	(mail_accounts_load): And here.
-
-	* component-factory.c (owner_unset_cb): Use gconf empty-on-exit
-	settings.
-	(mail_load_storages): Use account->enabled rather than
-	account->source->enabled. The struct changed.
-
-	* mail-composer-prefs.c (sig_add): Get the send_html pref from gconf.
-
-	* message-tag-followup.c (target_date_new): Use gconf.
-
-	* mail-config.c (mail_config_get_week_start_day): Removed.
-
-	* mail-tools.c (mail_tool_quote_message): Use gconf here too, but
-	we don't need to parse the colour - just use it as a raw string.
-	(mail_tool_forward_message): Use gconf.
-
-	* mail-format.c (mail_format_data_wrapper_write_to_stream): Use gconf.
-	(write_headers): Use gconf.
-	(handle_text_plain): Same.
-
-	* mail-display.c (mail_text_write): Updated to use gconf and parse
-	GdkColour strings.
-	(on_url_requested): Updated to use gconf.
-
-	* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Use gconf
-	rather than the old mail-config APIs which will be removed.
-	(ask_confirm_for_empty_subject): Same.
-	(ask_confirm_for_only_bcc): Here too.
-	(composer_get_message): And here.
-	(create_msg_composer): Same.
-	(transfer_msg_done): Again here.
-	(delete_msg): Here too.
-	(confirm_expunge): And finally here.
-
-	* mail-config.c (mail_config_write): Use gconf.
-	(mail_config_get_sources): Removed.
-
-	* mail-account-gui.c (mail_account_gui_save): No need to save
-	enabled-state anymore for a source.
-
-	* mail-config-druid.c (wizard_finish_cb): Instead of setting
-	account->source->enabled to TRUE, just set account->enabled to
-	TRUE. The structures changed a bit.
-
-	* mail-send-recv.c (mail_send_receive): Get the list of accounts
-	instead of sources, and pass them along to build_dialogue. I'm
-	trying to get rid of the mail_config_get_sources() api.
-	(mail_autoreceive_setup): Here too.
-
-	* mail-config.c (mail_config_get_filter_log): Removed.
-	(mail_config_set_filter_log): Removed.
-	(mail_config_get_filter_log_path): Removed.
-	(mail_config_set_filter_log_path): Removed.
-	(mail_config_get_new_mail_notify): Removed.
-	(mail_config_set_new_mail_notify): Removed.
-	(mail_config_get_new_mail_notify_sound_file): Removed.
-	(mail_config_set_new_mail_notify_sound_file): Removed.
-
-	* mail-session.c (main_get_filter_driver): Updated to use the
-	gconf settings.
-
-2003-01-07  Dan Winship  <danw@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_auto_detect_extra_conf,
-	mail_account_gui_build_extra_conf): Don't translate the conf
-	strings. Camel already did it.
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: remove idldir definition. (It's defined in
-	configure.in now)
-
-2003-01-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (composer_get_message): Use
-	e_destination_get_email() instead of e_destination_get_address()
-	when checking that we have a list of valid recipients to send the
-	message to because get_email() returns the addr-spec portion of
-	the address, which is what we care about. if that doesn't exist,
-	then the address is useless. This does all we can do mailer-side
-	for the recent "SMTP Problem" thread.
-
-2003-01-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c: Fixed some build issues.
-
-	* mail-search.c: Same.
-
-	* mail-callbacks.c (save_draft_done): Use
-	g_signal_handlers_disconnect_by_func().
-	(manage_subscriptions): Use a weak_ref instead of connecting to
-	the destroy event.
-
-2002-12-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	...And a whole bunch more build fixes.
-
-	* mail-vfolder.c (mail_vfolder_delete_uri): Don't use
-	g_string_sprintfa() anymore since it is apparently deprecated.
-
-	* mail-session.c (main_get_filter_driver): Don't use
-	g_string_sprintfa() anymore since it is apparently deprecated.
-
-	* mail-ops.c (build_from): Don't use g_string_sprintfa() anymore
-	since it is apparently deprecated.
-
-	* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Don't use
-	g_string_sprintfa() anymore since it is apparently deprecated.
-
-	* mail-autofilter.c: Don't use g_string_sprintfa() anymore since
-	it is apparently deprecated.
-
-	* folder-browser.c: Don't use g_string_sprintfa() anymore since it
-	is apparently deprecated.
-
-	* mail-search.c (mail_search_set_subject): Remove the unnecessary
-	g_strdup()'age as well as fix a possible buffer overrun.
-
-	* mail-local.c (mail_local_folder_construct): Use
-	g_path_get_basename().
-
-	* mail-config-druid.c (make_account): Don't use e_utf8_*
-	functions.
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c #define a STANDARD_ISSUE_TABLE_OPEN string used
-	for wrapping textual message parts to keep them being fully-left
-	justified.
-	(mail_format_raw_message): Wrap the content with a table so that
-	text isn't fully left-justified.
-	(write_hr): Use it here too.
-	(handle_text_plain): And finally here.
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (mail_error_printf): Use camel_text_to_html()
-	instead of e_text_to_html().
-	(mail_text_write): Write the content directly to gtkhtml through
-	an html stream filter.
-
-	* mail-format.c (attachment_header): Use camel_text_to_html()
-	instead of e_text_to_html().
-	(write_text_header): Same.
-	(write_address): Here too.
-	(mail_get_message_rfc822): And here.
-	(mail_get_message_body): And finally here.
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_text_plain): Re-implemented to use
-	streams. Also no need to check for html since
-	camel-mime-part-utils.c now does this for us and will re-tag the
-	mime-type as text/html thus the UI can be completely ignorant of
-	this process.
-	(handle_text_plain_flowed): Removed.
-	(write_one_text_plain_chunk): Removed.
-	(try_uudecoding): Removed.
-	(try_inline_binhex): Removed.
-	(handle_text_enriched): Re-implemented to use streams too.
-
-2002-12-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (write_text_header): Change the order of the args
-	to be consistant with other write functions.
-	(write_date): Same.
-	(write_field_row_begin): Here too.
-	(write_headers): Here too.
-	(write_one_text_plain_chunk): Don't strdup just to pass it to
-	mail_text_write() so that it can dup it yet again into html text
-	and dup it yet a 3rd time into a GByteArray. Instead just write it
-	to gtkhtml.
-	(handle_*): Fixed arguments to take a MailDisplayStream instead of
-	a GtkHTML widget and a GtkHMLStream.
-
-	* mail-display.c (mail_display_render): Create a MailDisplayStream
-	to pass to mail_format_mime_message() and
-	mail_format_raw_message().
-
-	* mail-display-stream.[c,h]: New stream to replace
-	mail-stream-gtkhtml.c
-
-	* mail-stream-gtkhtml.[c,h]: Removed.
-
-2002-12-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (check_send_configuration): Make sure the
-	folder-browser is not NULL or we'll crash.
-
-	* mail-preferences.c (mail_preferences_construct): Fix the colour
-	code to get a guint32 rgb correctly (I think - can't test because
-	the shell keeps crashing, yay).
-
-	* message-tag-followup.c (construct): Don't re-use cell renderers
-	- I'm not sure this is actually safe to do.
-
-	* mail-session.c: Get rid of unneeded CamelObject casts.
-	(user_message_response): Don't unref the dialog object after we've
-	destroyed it.
-
-	* mail-display.c (write_data_to_file): Don't unref the dialog
-	object after we've destroyed it.
-
-	* mail-callbacks.c: Same here.
-
-	* component-factory.c: Here too.
-
-	* message-tag-editor.c: Added MESSAGE_TAG_EDITOR_GET_CLASS macros.
-
-2002-12-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (mail_accounts_tab_construct): Setup
-	double-click here.
-
-2002-12-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (account_delete_clicked): Get rid of the ETable
-	#ifdef's - we won't ever be using ETable.
-	(account_default_clicked): Same.
-	(account_able_clicked): Here too.
-	(mail_accounts_load): And here.
-	(mail_accounts_treeview_new): Renamed from etable_new since we
-	won't ever be using an etable.
-	(mail_accounts_tab_construct): And finally here.
-
-2002-12-12  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (my_folder_browser_init): cast a-warning a-way.
-
-	* mail-composer-prefs.c (spell_setup): Terminate list_store_set
-	with -1.
-
-	* mail-accounts.c (mail_accounts_etable_new): clist -> gtktreeview
-	stuff.  Yes, this is not an etable.
-	(mail_accounts_tab_construct): Same.
-	(mail_accounts_load): Same.
-	(account_cursor_change): Same.
-	(account_able_clicked): And this.
-	(account_default_clicked): Same.
-	(account_delete_clicked): Guess?
-	(account_edit_clicked): And here too.
-
-2002-12-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_format_data_wrapper_write_to_stream): New
-	function to handle a lot of the filtering/etc that was done in
-	mail_format_get_data_wrapper_text(). This is the first step toward
-	getting rid of e-text-to-html crap and using my tohtml stream
-	filter instead.
-	(mail_format_get_data_wrapper_text): Use the new function.
-	(mail_format_raw_message): Use camel streams to write the content
-	to gtkhtml rather than using get_data_wrapper_text() and then
-	converting that to html and then writing it to the gtkhtml stream.
-
-2002-12-10  Not Zed  <NotZed@Ximian.com>
-
-	* mail-composer-prefs.c (mail_composer_prefs_construct): language
-	is a treeview now.  Not sure what to do with it yet, but get rid
-	of one warning anyway.
-	(mail_composer_prefs_construct): Same for sig_clist, but setup
-	model.
-	(sig_fill_clist): Change to use a gtktreeview instead of a clist.
-	(sig_selection_changed): New method to handle signature selection
-	changes with the new widgets.
-	(sig_delete): clist -> treeview.
-	(mail_composer_prefs_new_signature): Same.
-	(sig_edit): ditto.
-	(sig_current_sig): removed.
-	(sig_row_unselect): Removed.
-	(sig_row_select): Removed, now redundant.
-	(spell_select_lang): Removed, redundant.
-	(spell_set_ui_language): New implementation using list model more
-	effectively.
-	(spell_get_language_str): Same here.
-	(spell_set_ui_language): Removed this too, merged into
-	spell_set_ui, it was just wasting stack space.
-	(spell_language_selection_changed): renemd from
-	spell_language_select_row, converted to gtktreeview, etc.
-	(spell_language_unselect_row): Removed.
-	(spell_language_enable): Redone to use tree model.
-	(spell_language_button_press): Removed, i dont think this is
-	needed anymore.
-	(spell_setup): dont hook onto redundant signals.
-
-	* mail-config-factory.c (config_control_factory_cb): ignore
-	mail-font-prefs in a different way (so we dont assert)
-
-2002-12-09  Chris Toshok  <toshok@ximian.com>
-
-	* mail-session.c (pass_response): pass "Mail" to e_passwords_*.
-	(do_get_pass): same.
-	(main_forget_password): same.
-	(mail_session_get_password): same.
-	(mail_session_remember_password): same.
-	(mail_session_forget_password): same.
-
-	* mail-config.c (mail_config_write_on_exit): pass "Mail" to
-	e_passwords_*.
-
-	* main.c (main): e_passwords_init is gone.
-
-2002-12-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (guess_me_from_accounts): Use the same logic as
-	mail_generate_reply(). Fixes bug #34882
-
-	Fixes bug #34315
-
-	* component-factory.c (message_rfc822_dnd): Return TRUE if we
-	successfully handled all messages in the mbox stream, or FALSE
-	otherwise.
-	(destination_folder_handle_drop): For TEXT_URI_LIST, use the
-	retval from message_rfc822_dnd() rather than relying on an
-	exception, because one will not always necessarily be set. For
-	MESSAGE_RFC822, also use the retval from message_rfc822_dnd().
-
-2002-12-03  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_finalise/destroy): frobbed
-	around with these till it exits without crashing.
-
-	* message-list.c (message_list_destroy): made a destroy
-	handler again (was dispose).  Frobbed around with this and
-	finalise till it can destroy without crashing.
-
-	* message-browser.c (message_browser_new): ref/sink the
-	folderbrowser.
-
-2002-11-25  Radek Doulik  <rodo@ximian.com>
-
-	* mail-preferences.c (mail_preferences_construct): magic_check -->
-	magic_links_check
-
-2002-11-27  Not Zed  <NotZed@Ximian.com>
-
-	* message-tag-followup.c (construct): gnome_pixmap -> gtkimage.
-	(construct): gtk_clist -> gtk_tree_view, setup columns.  They dont
-	size well :-/
-	(message_tag_followup_append_message): Append using model, remove
-	clist stuff.
-	(construct): Show date edit (glade bugs?)
-
-	* folder-browser.c (folder_browser_class_init): gtk_marshal -> g_cclosure_marshal
-	(setup_popup_icons): gnome_pixmap -> gtk_image.
-	(on_right_click): gtk_pixmap -> gtk_image.
-
-	* mail-accounts.c (account_delete_clicked): removed #if 0'd out code.
-
-	* mail-send-recv.c (receive_done): remove FIXME and extra unref.
-
-	* mail-session.c (request_password): Removed #if 0'd out stuff.
-
-	* mail-vfolder.c (new_rule_clicked): proper cast for g_object_get_data.
-
-	* mail-local.c (reconfigure_response): cast for g_object_get_data.
-
-	* mail-account-editor.c (construct): GNOME_DIALOG -> GTK_DIALOG.
-
-	* *.[ch]: re-ran fix.sh for e_notice change
-	
-	* mail-callbacks.c (save_msg_ok): g_object_get_data +
-	gtk_object_remove_no_notify -> g_object_steal_data.
-	(find_socket): gtk_container_children ->
-	gtk_container_get_children
-	(edit_msg): gnome_*_dialog -> gtk_message_dialog.
-	(resent_msg): "
-	(search_msg): "
-	(confirm_goto_next_folder): gtkmessagedialogised (even if not
-	used).
-	(confirm_expunge): gtkmessagedialogised
-	(filter_edit): "
-	(do_mail_print): e_notice -> gtk_message_dialog.
-	(are_you_sure): removed e_gnome_ok_cancel_dialog crap, replaced
-	with a gtk dialog.
-	(are_you_sure): gtkmessagedialogised.
-	(edit_msg_internal): Dont free uids array, are_you_sure() free's
-	it.
-	(resend_msg): Same.
-	(check_send_configuration): Use e_notice for stuff.  Sigh, here we
-	go again ...!
-	(e_question): A utility function to ask a question, potentially
-	with 'dont ask again' as well.
-	(configure_mail): use e_question to save code.  Here we go again,
-	again ...
-	(ask_confirm_for_unwanted_html_mail): "
-	(ask_confirm_for_only_bcc): "
-	(ask_confirm_for_only_bcc): "
-	(composer_get_message): Use e_notice.
-	(composer_save_draft_cb): Use e_question
-	(edit_msg): use e_notice, & change to an ERROR.
-	(resend_msg): same.
-	(save_msg_ok): Properly initialise ret to OK, and use e_question,
-	and use access() to determine existance/write access rather than
-	stat, display an error if we can't write to a file that exists,
-	and print the filename in all dialogues.
-	(confirm_goto_next_folder): Use e_question.
-	(confirm_expunge): use e_question.
-	(filter_edit): Use e_notice.
-	(do_mail_print): use e_notice.
-
-2002-11-26  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vfolder.c (vfolder_gui_add_rule): clicked->response signal
-	for gtk dialogue.
-	(new_rule_clicked): Dont unref after destroy (duh, idiot again).
-	(edit_rule_response): Same here.
-	(mail_vfolder_delete_uri): Connect response signal to
-	gtk_widget_destroy directrly using g_signal_connect_swapped.
-	(close_dialogue): Removed, as no longer needed.
-
-	* message-list.c (get_normalised_string): Duh idiot, "un-fixed"
-	the memleak i added.
-
-	* mail-callbacks.c (composer_get_message): Set parent window in
-	message dialogue & DESTROY_WITH_PARENT flag.
-	(composer_save_draft_cb):
-	(configure_mail):
-	(check_send_configuration): Add DESTROY_WITH_PARENT flag to
-	gtk_message_dialog's
-	(local_configure_done): remove some unecessary/wrong casts.
-	(empty_trash_expunged_cb): "
-	(do_mail_print): use gtk_window_set_transient_for instead of
-	e_dialog_set_parent.
-
-2002-11-26  Not Zed  <NotZed@Ximian.com>
-
-	* mail-account-editor.c (mail_account_editor_new):
-	gtk_widget_set_parent_window -> gtk_window_set_transient_for.
-
-	* mail-callbacks.c (composer_send_queued_cb): dont unref composer.
-
-	* message-browser.c (message_browser_destroy): moved back from
-	finalise.
-
-2002-11-25  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (message_list_dispose): move saving tree state
-	here.
-	(message_list_finalise): And take it from here.
-
-	* mail-display.c (mail_display_destroy): @#$@# gtk.  changed this
-	around a bit.
-	(mail_display_init): Fix prototype, its a gobject.
-	(mail_display_init): ref/sink the invisible gtkobject.
-
-2002-11-22  Not Zed  <NotZed@Ximian.com>
-
-	* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): removed
-	e_messagebox, and use gtk_message_dialog directly.
-	(ask_confirm_for_empty_subject): and here.
-	(ask_confirm_for_only_bcc): And here too.
-	(msgbox_destroy_cb): Removed, since no longer needed.
-
-2002-11-15  Harry Lu  <harry.lu@sun.com>
-
-	* mail-display.c (write_data_to_file): Show file name when prompt
-	to user for overwrite. Fixes bug #34180.
-
-2002-11-21  Harry Lu  <harry.lu@sun.com>
-
-	* mail-display.c (do_attachment_header): Enable dragging of all
-	attachments. For bug #34327.
-
-2002-11-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-preferences.c (mail_preferences_construct): Since the
-	GSList returned from gconf needs to be free'd by us, we don't need
-	to strdup the values. Also make sure we don't leak the GSList
-	itself.
-	(mail_preferences_apply): Don't leak our GSList data.
-
-2002-08-30  Radek Doulik  <rodo@ximian.com>
-
-	* mail-display.c (mail_display_render): don't set margins for raw
-	message view
-
-	* mail-format.c (mail_format_raw_message): as below
-	(handle_text_plain_flowed): as below
-	(mail_format_raw_message): don't use data_urls
-
-	* mail-display.c (mail_text_write): put text in iframe, so it has
-	margins and should not be placed in table which changes wrapping
-	behavior
-
-2002-11-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-composer-prefs.c (mail_composer_prefs_construct): gconfify.
-	(mail_composer_prefs_apply): gconfify this also.
-
-	* mail-preferences.c (mail_preferences_construct):
-	gconf_client_get_string() probably returns an allocated buffer.
-
-2002-11-20  Not Zed  <NotZed@Ximian.com>
-
-	* importers/Makefile.am (%.server.in): provide a proper implicit
-	rule for building .server.in from .server.in.in.  The other one
-	just copied the first target to all destinations(!).
-
-	* importers/evolution-outlook-importer.c (outlook_factory_fn):
-	destroy -> weak ref.
-
-2002-11-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-preferences.c (mail_preferences_apply): Save the settings
-	via gconf.
-	(mail_preferences_construct): Load the values from gconf.
-
-2002-11-19  Radek Doulik  <rodo@ximian.com>
-
-	* mail-composer-prefs.c (sig_load_preview): use
-	gtk_html_begin_content to specify utf-8
-
-2002-11-19  Not Zed  <NotZed@Ximian.com>
-
-	* importers/evolution-mbox-importer.c (mail_importer_module_init):
-	fix warning message, outlook->mbox.
-
-	* importers/Makefile.am: fix serverdir to point to
-	$libdir/bonobo/servers.
-
-	* mail-callbacks.c (addrbook_sender): add type to
-	bonobo_widget_set_property.
-
-	* mail-vfolder.c (vfolder_editor_response): dont unref after destroy.
-
-	* mail-session.c (pass_response): dont unref aftrer destroy.
-
-	* mail-local.c (reconfigure_response): dont unref after destroy.
-
-	* mail-display.c (launch_cb): dont unref after destroy.
-	(launch_cb): "
-	(drag_data_get_cb): "
-	(html_button_press_event): add type to bonobo_widget::set_property
-
-	* mail-config.c (mail_config_check_service): dont unref after
-	destroy.
-
-	* component-factory.c (send_receive_cb): dont unref after destroy.
-	(request_quit): "
-
-	* mail-signature-editor.c (mail_signature_editor): Use version 3.0
-	of gtkhtml editor interfaces.
-	(do_exit): dont unref after destroy.
-	(format_html_cb): Add type to bonobo_widget::set_property.
-
-2002-11-18  Radek Doulik  <rodo@ximian.com>
-
-	* mail-composer-prefs.c (spell_setup_check_options): check
-	exception state and take care when exception raised
-
-2002-11-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (mail_accounts_load): Specify the default
-	account. Also, don't need to use e_utf8_to_gtk_string() here.
-
-2002-11-18  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (evolution_mail_LDADD): Added back
-	libevolution-importer stuff.
-	(SUBDIRS): Added back importers.
-
-	* importers/evolution-mbox-importer.c (load_file_fn): build the
-	uri without deprecated funcs.
-	(load_file_fn): dont free/alloc a camel_exception for no obvious
-	purpose.
-	(mbox_factory_fn): use weak_ref rather than destroy.
-	(importer_destroy_cb): fix signature for weak ref notify.
-	(mbox_factory_fn): add cid param.
-
-	* importers/*.[ch]: ran fix script over everything.
-
-	* importers/*.server.in.in: Added bonobo activation files.  Moved
-	evolution-mail to @LIBEXEC@ as below.
-	
-	* importers/Makefile.am: oaf->bonobo activation stuff.
-
-	* importers/evolution-outlook-importer.c (outlook_factory_fn): Add
-	component id to callback.
-
-2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Add rules to substitute @LIBEXEC@ in
-	GNOME_Evolution_Mail.server.in.in and install evolution-mail in
-	$(libexecdir) instead of $(bindir).
-
-	* GNOME_Evolution_Mail.server.in.in: Replaced evolution-mail with
-	@LIBEXECDIR@/evolution-mail.
-
-2002-11-15  Rodney Dawes  <dobey@ximian.com>
-
-	* component-factory.c: Use bonobo_main_quit instead of gtk
-	
-2002-11-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-composer-prefs.c (sig_edit): Correctly spell Advanced.
-
-2002-11-15  Not Zed  <NotZed@Ximian.com>
-
-	* mail-summary.c (create_summary_view): weak notify -> ref.
-
-	* mail-send-recv.c (build_dialogue): weak notify -> ref.
-
-	* mail-accounts.c (account_edit_clicked): weak notify -> ref, i
-	presume this is what jeff meant, 'cause it dont compile otherwise.
-
-2002-11-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (account_edit_clicked): Use g_object_weak_ref
-	rather than connecting to destroy.
-	(account_add_clicked): Same.
-
-	* mail-callbacks.c (addrbook_sender): Make this use
-	g_object_weak_notify also.
-	(subscribe_dialog_destroy): Add NULL guards here since I think we
-	really do want to connect to the "destroy" signal in the function
-	that connects us to that signal.
-
-	* mail-config-factory.c (config_control_factory_cb): Same.
-
-	* mail-display.c (save_part): Here too.
-	(make_popup_window): And here.
-
-	* mail-send-recv.c (build_dialogue): Same here.
-
-	* mail-summary.c (create_summary_view): Use g_object_weak_notify
-	instead of connecting to the destroy signal.
-
-2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (owner_set_cb): Want a (GWeakNotify) cast
-	here, not (GWeakNotify *).
-
-	* subscribe-dialog.c (fete_init): g_object_set() instead of
-	gtk_object_set().
-	(populate_store_list): Likewise.
-	(menu_item_selected): g_object_get_data() instead of
-	gtk_object_get_data().
-
-	* message-list.c (message_list_create_extras): g_object_set()
-	instead of gtk_object_set().
-
-	* message-browser.c (message_browser_message_list_built):
-	g_object_get_data() instead of gtk_object_get_data().
-
-	* mail-vfolder.c (edit_rule_response): g_object_get_data() instead
-	of gtk_object_get_data().
-
-	* mail-summary.c (generate_folder_summaries): g_object_unref() the
-	context instead of gtk_object_destroy().
-
-	* mail-local.c (reconfigure_response): g_object_get_data() instead
-	of gtk_object_get_data().
-
-	* mail-display.c (pixbuf_gen_idle): g_object_unref() the GdkPixbuf
-	loader instead of gtk_object_destroy().
-	(pixbuf_gen_idle): Likewise.
-	(embeddable_destroy_cb): Likewise.
-
-	* mail-config-druid.c (mail_config_druid_destroy): No need to
-	gtk_object_destroy() the GladeXML object.
-	(construct): g_object_set() instead of gtk_object_set().
-
-	* folder-browser.c (folder_browser_gui_init): g_object_get_data()
-	instead of gtk_object_get_data().
-
-2002-11-14  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c (create_view): shell client objref.
-	(mail_add_storage): "
-	(mail_remove_storage): "
-
-2002-11-13  Joe Shaw  <joe@ximian.com>
-
-	* Makefile.am: Remove a couple backslashes that were causing
-	automake to complain, even though they were on lines that were
-	-commented out-.  Sigh.
-
-2002-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-info.c (evolution_folder_info_factory_fn): Use
-	g_object_new() instead of gtk_type_new().
-	* folder-browser.c (folder_browser_new): Likewise.
-	* mail-account-gui.c
-	(mail_account_gui_folder_selector_button_new): Likewise.
-	* mail-font-prefs.c (mail_font_prefs_new): Likewise.
-
-2002-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-format.c: Do not #include <libgnome/gnome-defs.h>.
-	* mail-importer.c: Likewise.
-	* mail-mt.c: Likewise.
-	* mail-ops.c: Likewise.
-	* mail-search-dialogue.c: Likewise.
-	* mail-session.c: Likewise.
-	* mail-vfolder.c: Likewise.
-	* message-tag-followup.c: Likewise.
-	* main.c: Likewise, and <libgnomeui/gnome-init.h>.
-
-	* mail-callbacks.c: Do not #include <libgnome/gnome-paper.h>.
-	(do_mail_print): Remove the GnomePaper local variable.
-
-2002-11-13  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c (owner_set_cb): destroy->weak ref.
-	(owner_set_cb): shell client changes.
-
-	* mail-signature-editor.c (mail_signature_editor): bonobo api changes.
-
-	* mail-local.c (save_metainfo): go back to using xmlSaveFile.
-
-	* Makefile.am: Removed libevolution-importer from mail.
-
-2002-11-13  Not Zed  <NotZed@Ximian.com>
-
-	* GNOME_Evolution_Mail.server.in.in: Added to cvs.  Currently
-	contains no configurable stuff, but maybe it will one day.
-
-	* Makefile.am (server_DATA): change oaf stuff to server stuff for
-	bonobo activation.
-
-	* mail-preferences.c (mail_preferences_apply): handle const entry text.
-
-	* mail-composer-prefs.c (url_requested): Fixed typo.
-	(mail_composer_prefs_construct): gnomepixmap->gtkimage.
-
-	* mail-callbacks.c (configure_mail): destroy dialogue before dealing
-	with response.
-	(mail_generate_reply): Fix a typo.
-	(popup_listener_cb): fix prototype.
-	(tag_editor_response): Handle gtk dialog response.
-	(flag_for_followup): Change gnome dialog to gtk dialog stuff.
-	(tag_editor_destroy_cb): 
-	(tag_editor_cancel): 
-	(tag_editor_ok): Removed, handled in _response().
-	(filter_editor_response): renamed from _clicked, handle gtk
-	dialogue signal.
-	(filter_editor_destroy): Removed.
-	(footer_info_new): gnome font api changes.
-	(do_mail_print): port to gnome print 2.
-
-	* mail-autofilter.c (mail_filter_delete_uri): message_dialog uses
-	a specific button enum, not the stock ones.
-
-	* mail-accounts.c (mail_accounts_tab_get_type): gobjectify.
-	(account_delete_clicked): gdkdialogise.
-
-	* mail-account-gui.c (mail_account_gui_setup): Hack around font
-	metric determination code.
-
-	* mail-account-editor.c (mail_account_editor_get_type):
-	gobjectise.
-	(mail_account_editor_new): ""
-
-	* folder-info.c (evolution_folder_info_notify_ready): use pbclient
-	interface.
-
-	* folder-browser-factory.c (control_destroy_cb): fix a typo.
-	(folder_browser_factory_new_control): More typos.
-
-	* folder-browser.c (on_right_click): cast around const warning.
-	(context_menu_position_func): fix for api change.
-
-	* e-searching-tokenizer.c (e_searching_tokenizer_finalise):
-	Changed from destroy since it only frees memory.
-	(e_searching_tokenizer_get_type): glibify.
-
-	* component-factory.c (request_quit): gtkdialogise.
-	(send_receive_cb): "
-	(create_component): gdk_pixbuf api.
-	(component_factory_init): bonobo activation stuff.
-	(warning_response): renamed from warning_clicked.
-	(owner_set_cb): gtkdialogise.
-
-2002-11-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Added files I've ported.
-
-	* mail-config.c: Remove gnome-defs.h, this header no longer exists
-	in GNOME2.
-
-2002-11-13  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: Commented out stuff that doesn't build yet.  Also
-	fixed idl build rule.  importers still not built.
-
-	* main.c (main): bonobactivationise.  remove push visual/colormap.
-	(main): no longer activate activation, let bonobo_init do it.
-
-	* mail-signature-editor.c (menu_help): Change help api.
-
-	* mail-session.c (user_message_destroy_noreply): removed.  Not
-	used?
-
-	* mail-local.c (load_metainfo): xml root->children.
-
-	* mail-format.c (g_string_append_len): Removed, it exists now.
-
-2002-11-12  Not Zed  <NotZed@Ximian.com>
-
-	* subscribe-dialog.c: gnome2ised, use gtkdialog.
-	(subscribe_get_global_extras): use a weak ref rather than destroy
-	signal.
-
-	* message-tag-followup.c: gnome2ised.
-
-	* message-tag-editor.c: gnome2ised & converted to gtkdialog.
-
-	* message-list.c: gnome2ised.
-	(message_list_finalise): From destroy method.  maybe should be
-	destroy still.
-
-	* message-browser.c: port to gnome2
-	(message_browser_finalise): renamed from destroy method.
-
-	* mail-stream-gtkhtml.c: removed redundant
-	camel_class_get_global_classfuncs() call.
-
-	* mail-signature-editor.c: gtkdialogised, & bonobo api changes.
-	
-
-	* mail-search-dialogue.c: gtkdialogised.
-
-	* mail-folder-cache.c: cleaned up camel ref/hook casts.
-
-	* mail-composer-prefs.c (mail_composer_prefs_get_type): convert to
-	gtype.
-
-	* mail-font-prefs.c (mail_font_prefs_destroy): from finalise.
-
-	* mail-config.c: s/bonobo_config/e_config_listener/ Added
-	/apps/Evolution prefix to the evolution keys.  Changed to use
-	e_config_listener, etc.
-	(mail_config_init): remove bonobo_config stuff.
-	(mail_config_check_service): gtk dialogise.
-	(check_response): from check_cancelled.
-
-	* mail-config-druid.c (mail_config_druid_destroy): renamed from
-	_finalize, turned into destroy handler.
-	(construct): set type to toplevel, GTK_WINDOW_DIALOG no longer
-	exists.
-
-	* mail-config-factory.c (mail_config_register_factory): bonobo api
-	changes.
-
-	* mail-crypto.c (mail_crypto_get_pgp_cipher_context): cleaned up
-	unref casts.
-
-	* mail-display.c (write_data_to_file): gnome->gtkdialog.
-	(on_link_clicked): use ascii_str*cmp on url.
-	(save_part): g_path stuff.
-	(launch_cb): gtk dialog.
-	(pixmap_press): de-oafify.
-	(pixbuf_for_mime_type): gnome-vfs api changes.
-	(do_attachment_header): Change the pixmap to a gtkimage.
-	(do_signature): "
-	(pixbuf_gen_idle): "
-	(do_attachment_header): ascii_str*cmp
-	(do_attachment_header): gnome pixmap->gtkimage.
-	(mail_display_destroy): protect against gtk mentalness.
-	(html_button_press_event): ascii_str*cmp
-	(drag_data_get_cb): added comment for translators of filename.
-
-	* mail-format.c (component_supports): de-oafise.
-	(is_anonymous): ascii_strncmp
-	(attachment_header): remove utf8<>locale stuff, and gnomevfs api
-	changes.
-	(format_mime_part): fix g_strdown call.
-	(write_field_row_begin): kill utf8->gtk stuff.
-	(write_address): "
-	(default_header_index): ascii_strcasecmp
-	(handle_text_plain): "
-	(handle_text_enriched): "
-	(handle_multipart_encrypted): remove utf/gtk stuff.
-	(handle_message_external_body): ascii_str*cmp
-
-	* mail-identify.c (mail_identify_mime_part):
-	(identify_by_magic): gnome vfs api changes.
-
-	* mail-importer.c: Converted.
-
-	* mail-local.c (load_metainfo): xml childs -> children.
-	(mls_get_folder): g_strerror.
-	(mls_delete_folder): g_strerror.
-	(reconfigure_got_folder): Gnome->GtkDialog
-	(reconfigure_response): from reconfigure_clicked.
-
-	* mail-mt.c (mail_msg_check_error): gnome -> gtk dialog
-	(error_response): renmae from error_gone.  destroy widget on any
-	response.
-
-	* mail-offline-handler.c (impl_finalise): renamed from
-	impl_destroy since thats what it should be anyway.
-
-	* mail-ops.c: removed utf8 widget conversion & camel_object_un/ref
-	casts.
-
-	* mail-preferences.c (mail_preferences_get_type): glib2'ised.
-
-	* mail-search.c (mail_search_finalise): renmaed from destroy &
-	properly chain.
-	(mail_search_get_type): glib2 & make gtkdialog parent.
-	(entry_run_search): run search when entry activated.  not sure if
-	gtkdialog has anohter way to do this on an arbitrary widget.
-
-	* mail-send-recv.c (dialogue_response): renamed from clicked.  Use
-	gtkdialog.
-
-	* mail-session.c (request_password_deleted): removed, redundant.
-	(pass_response): rename from pass_got, changed for gtkdialog.
-	(user_message_destroy): Removed, redundant.
-	(user_message_response): Renamed from user_message_clicked.
-
-2002-11-11  Not Zed  <NotZed@Ximian.com>
-
-	* mail-stream-gtkhtml.c (mail_stream_gtkhtml_class_init): dont use
-	get_global_classfuncs, just get the type
-
-	* mail-tools.c: converted gnome2 api's.
-
-	* mail-vfolder.c (vfolder_editor_response): clicked->response.
-	(vfolder_editor_destroy): Removed.
-	(vfolder_edit): gtk dialog api
-	(edit_rule_response): clicked->response.
-	(vfolder_edit_rule): gnomedialog->gtkdialog.
-	(vfolder_gui_add_rule): "
-	(new_rule_clicked): clicked->response
-
-2002-11-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c: Half way ported. I'll finish the rest later.
-
-	* mail-autofilter.c: Ported.
-
-	* mail-account-gui.c: Ported.
-
-	* mail-account-editor.c: Ported.
-
-	* folder-browser-ui.c: Ported.
-
-	* folder-browser-factory.c: Ported.
-
-	* folder-browser.c: Ported.
-
-	* e-searching-tokenizer.c: Roughly ported.
-
-2002-11-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* *.glade: Converted to libglade-2's format.
-
-2002-11-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-composer-prefs.c: Ported.
-
-2002-10-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (folder_browser_query_changed): No longer need
-	to check for a CLEAR_ID.
-
-2002-10-28  Larry Ewing  <lewing@ximian.com>
-
-	* mail-format.c (handle_multipart_mixed): instead of bailing with
-	an assertion dump the body.
-
-2002-10-27  Larry Ewing  <lewing@ximian.com>
-
-	* mail-display.c (fetch_next): don't queue the action until we've
-	added ourselves to the active list, because the fetch_done
-	callback can fire immediately and we'll end up queueing something
-	that has already been destroyed.
-
-2002-10-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Update the upgrade script to handle the new url format introduced
-	with NotZed's most recent commits.
-
-	* upgrade-mailer.c (mailer_upgrade): Save an encoded version of
-	the namespace too, for use later.
-	(si_free): Free the encoded namespace too.
-	(imap_url_upgrade): Use the encoded namespace when creating the
-	new url.
-	(shortcuts_upgrade_xml_file): Upgrade the default: urls. Fixes bug
-	#32127.
-
-2002-10-25  Not Zed  <NotZed@Ximian.com>
-
-	* mail-config.c (mail_config_uri_renamed): Always strdup the new
-	key in the threaded/preview hash/always free the working copy.
-	For #32799.
-
-2002-10-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (write_data_to_file): Use the mode 0666 when
-	creating a new file and let the user's umask handle permissions.
-
-	* folder-browser.c (message_list_drag_data_get): When using open()
-	with the O_CREAT flag, we need to pass a mode argument. Also use
-	O_EXCL.
-
-2002-10-24  Not Zed  <NotZed@Ximian.com>
-
-	* subscribe-dialog.c (fe_got_children): Use a hashtable to only
-	insert nodes we dont have already, rather than relying on the
-	scanning logic.  Also, only re-sort this tree level once done
-	rather than on each insert.
-	(folder_etree_init): Setup hash to track nodes setup.
-	(folder_etree_clear_tree): Reset hash.
-	(fe_destroy): Free hash.
-
-2002-10-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (folder_browser_query_changed): Only perform
-	the search if it is either a clear or advanced search.
-
-2002-10-22  Mike Kestner  <mkestner@ximian.com>
-
-	* mail-callbacks.c (transfer_msg): pass fb->uri to the folder
-	selection dialog so the current folder is selected on display.
-	"fixes" 15966.
-
-2002-10-21  Dan Winship  <danw@ximian.com>
-
-	* upgrade-mailer.c (mailer_upgrade): Fix the transport URL on any
-	Exchange accounts. Fixes #30209, which is to say that it fixes
-	#28490 correctly.
-
-2002-10-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-tools.c (mail_tool_quote_message): Strip the signature from
-	the body-text. Fixes bug #5529.
-
-2002-10-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_multipart_signed): Don't need to pass a
-	path to camel_gpg_context_new () anymore.
-	(mail_get_message_body): Same here.
-	(handle_multipart_encrypted): Use camel_gpg_context_new () instead
-	of mail_crypto_get_pgp_cipher_context ().
-
-	* mail-preferences.c (mail_preferences_construct): There's no
-	security tab anymore.
-	(mail_preferences_apply): No need to save any pgp config data,
-	there's nothing to configure!
-
-	* mail-crypto.c (mail_crypto_get_pgp_cipher_context): Updated to
-	not pass a pgp path into camel_gpg_context_new ().
-
-	* mail-config.c (mail_config_clear): No need to free a pgp_path
-	variable anymore, we don't need one.
-	(config_read): Don't read in a pgp-path or pgp-type anymore.
-	(mail_config_write_on_exit): Don't save a pgp-path or pgp-type
-	anymore, we don't use them.
-	(pgpopen): Removed.
-	(pgpclose): Removed.
-	(mail_config_pgp_type_detect_from_path): Removed.
-	(auto_detect_pgp_variables): Removed.
-	(mail_config_get_pgp_type): Removed.
-	(mail_config_set_pgp_type): Removed.
-	(mail_config_get_pgp_path): Removed.
-	(mail_config_set_pgp_path): Removed.
-
-2002-10-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): If mode == REPLY_LIST
-	and the mlist is "" (we only checked NULL before), change the mode
-	to REPLY_ALL so that we don't accidently reply to the user's
-	address. Fixes bug #28735
-
-2002-10-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): If we are trying to
-	reply to a list, first check that we can by getting the mlist
-	token (makes it easier to fix the mem leak). If not, then change
-	the mode to REPLY_ALL. If we can reply to list, the make sure we
-	free the CamelMessageInfo when we're done so we don't leak.
-
-2002-10-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (main_get_filter_driver): Add the new-mail-notify
-	rule to the filter driver before adding the user defined filter
-	rules so that we can be sure that the new-mail-notify rule gets
-	invoked. Fixes bug #32328.
-
-	* mail-composer-prefs.c (mail_composer_prefs_new_signature): Make
-	sure that name[0] cannot ever be NULL. Should maybe fix bug
-	#32230.
-
-2002-10-15  Dan Winship  <danw@ximian.com>
-
-	* upgrade-mailer.c (shortcuts_upgrade_xml_file): Change the type
-	in LDAP shortcuts from "ldap-contacts" to "contacts/ldap". Rewrite
-	this to use libxml since that was easier than trying to make the
-	old code do both kinds of changes at once.
-
-2002-10-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (management_prepare): Only set an account
-	name if one doesn't already exist. Also use the
-	e_utf8_gtk_entry_get/set_text functions since account names are
-	supposed to be in UTF8. Fixes bug #31891.
-
-2002-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (main_folder_changed): Don't do anything if the
-	message_list is NULL (this means the FolderBrowser has been
-	destroyed). Fixes bug #32002.
-
-2002-10-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (storage_remove_folder): The CamelFolderInfo
-	that we get back has nodes for all parent folders, so do not
-	delete all folders that have nodes in the returned tree. Instead,
-	descend into the tree until we find the folder we want to delete
-	and start deleting from there.
-
-2002-10-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-signature-editor.c (mail_signature_editor): Mark a string
-	for translation, fixes bug #31942. Thanks to kmaraas@gnome.org for
-	this patch.
-
-	* mail-offline-handler.h: Don't #include config.h here. Fixes bug
-	#31941.
-
-2002-10-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-composer-prefs.c (spell_load_values): Don't mark "en" for
-	translation. Fixes bug #31788.
-
-	* mail-config.glade: Removed a "xxxxxxxxxxx" string so that
-	translators don't need to translate it. It was only a filler
-	string. Fixes bug #31789.
-
-2002-10-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Don't default 'me' to
-	the source account until after we've tried to detect the account
-	based on recipients. When adding accounts to the account hash, if
-	any accounts have identical email addresses, the ones that are
-	enabled take precedence over ones that aren't. This will hopefully
-	make everyone happy with reply account picking. Fixes bug #31693.
-
-2002-10-01  Larry Ewing  <lewing@ximian.com>
-
-	* mail-display.c (drag_data_get_cb): add support for dragging the
-	content type directly.
-	(do_attachment_header): add the target for the mime type to the
-	drag source.
-	(drag_data_get_cb): silence warning.
-
-2002-10-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (get_fn): Connect to the changed signal for
-	the reply_to entry box. Fixes bugs #31553 and #31554.
-
-	* mail-composer-prefs.c (spell_setup): Only setup the languages if
-	the language_seq is not CORBA_OBJECT_NIL. Fixes bug #31559
-	(presumably at least).
-
-	* mail-account-gui.c (mail_account_gui_new): Use
-	e_utf8_gtk_entry_set_text for the email address and reply-to
-	fields. Fixes bug #31555.
-
-	* mail-format.c (mail_get_message_body): Handle a
-	multipart/encrypted part. Fixes bug #31547.
-
-	* upgrade-mailer.c: Shut up some compiler warnings.
-
-	* importers/evolution-mbox-importer.c (process_item_fn): Use the
-	camel_message_info_new/free functions rather than g_new0 and
-	g_free. Also, if we fail to parse a message make sure we don't
-	later try to use that message object.
-	(get_info_from_mozilla): Use camel_message_info_new and strtoul
-	instead of string_to_int.
-
-2002-09-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* subscribe-dialog.c (fe_node_to_shell_path): Removed (useless).
-
-2002-10-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #24732]
-
-	* importers/evolution-mbox-importer.c (process_item_fn): Set
-	deleted to FALSE when not having Mozilla status headers.  Before
-	it was being left uninitialized and so there was a pretty good
-	chance that its value would be nonzero and hence the message would
-	not be imported...
-
-2002-10-01  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (on_cursor_activated): cursor activated on
-	etable is required to know when the selection changes on a single
-	row, update selection changed info with this signal too.  Sounds
-	like an etable bug to me, but this fixes #29808.
-	(folder_browser_gui_init): Hook onto above signal.
-
-2002-09-30  Aaron Weber  <aaron@ximian.com>
-
-	* mail-signature-editor.c (mail_signature_editor): change
-	string to "Enter a name for this signature" on line 372.
-
-	* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): change
-	HTML-mail warning on 255
-
-	* component-factory.c (component_factory_init): change
-	"Evolution's foo" to "the Evolution foo" in string on 1078
-
-2002-09-30  Not Zed  <NotZed@Ximian.com>
-
-	* mail-session.c (request_password): translate prompt from utf8 to
-	gtk widget.  #31365.
-
-2002-09-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-searching-tokenizer.c: #include <stdlib.h> for alloca
-	(searcher_next_token): Changed slightly to make sure that m is not
-	NULL before dereferencing it. Also initialise m to NULL so that it
-	can't be used uninitialised (NULL is a safe initialised value
-	here).
-	(build_trie): Same, but for n.
-
-2002-09-26  Dan Winship  <danw@ximian.com>
-
-	* mail-config.c (impl_GNOME_Evolution_MailConfig_addAccount,
-	impl_GNOME_Evolution_MailConfig_removeAccount): Set a timeout to
-	call mail_config_write() in 2 seconds. Otherwise changes made by
-	this interface would not be saved to disk unless the user also
-	changed some other preference.
-	(mail_config_write_on_exit): If there's a config_write_timeout
-	pending, call mail_config_write() too.
-
-2002-09-25  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (mail_display_render): Add a margin around the
-	"flag for followup" table so it lines up with everything else.
-	Also, don't add "at your earliest convenience" after the flag if
-	there's no date set, since that doesn't make any sense for half of
-	the flags. ("For Your Information at your earliest convenience").
-
-2002-09-25  Dan Winship  <danw@ximian.com>
-
-	* component-factory.c (folder_types): add "mail/public". Leave
-	"vtrash" as it is rather than renaming it to "mail/vtrash",
-	because we want it to behave differently from normal mail folders
-	more often than we want it to behave the same.
-	(type_is_mail, type_is_vtrash): utility funcs
-	(create_view, create_folder, remove_folder, xfer_folder,
-	populate_folder_context_menu, unpopulate_folder_context_menu,
-	destination_folder_handle_drop, storage_create_folder): Use
-	type_is_mail/type_is_vtrash.
-	(create_component): Register "New Post" with "mail/public" instead
-	of "mail" so it becomes the default New icon for it. (29024)
-
-	* mail-callbacks.c (transfer_msg): Use "mail/*" for allowed type.
-
-	* message-browser.c (transfer_msg): Likewise.
-
-	* mail-account-gui.c (mail_account_gui_new): Use "mail/*" instead
-	of "mail" here for sent/drafts allowed type. (?)
-
-2002-09-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* upgrade-mailer.c (imap_url_upgrade): NULL-check si->folders
-	before passing it into find_folder so we don't crash. Fixes bug
-	#30915.
-
-2002-09-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-ui.c: Allow users to delete already deleted
-	messages, fixes bug #30827.
-
-2002-09-24  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_query_changed): Always do a
-	search if the query changed.  For #31060 & #29625.
-
-2002-09-23  Radek Doulik  <rodo@ximian.com>
-
-	* mail-config.c (mail_config_signature_run_script): pass name of
-	the script as 1st parameter
-
-	* mail-composer-prefs.c (sig_add_script_add): fix entry's glade
-	name
-
-2002-09-23  Dan Winship  <danw@ximian.com>
-
-	* mail-signature-editor.c (exit_dialog_cb): Fix non-ANSI switch
-	statement.
-
-	* mail-account-gui.c (mail_account_gui_auto_detect_extra_conf):
-	Likewise.
-
-	* mail-composer-prefs.c (spell_load_values): add some dummy
-	typedefs to avoid empty macro arguments, which have undefined
-	behavior.
-
-	* mail-importer.c: #include <sys/types.h> for OS X
-
-2002-09-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (save_part_save): Use 0666 as the create mode so that
-	the user's umask is used to it's fullest.
-
-2002-09-23  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (idldir, idl_DATA): add these and install Mailer.idl
-
-2002-09-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-preferences.c (mail_preferences_construct): Connect signal
-	handlers to the GtkHTML preferences so that when the widgets
-	change we can update the OK/Apply buttons. Also removed the
-	omenuShortcutsType widget reference since this was not being used?
-	Fixes bug #30731.
-
-2002-09-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (do_edit_messages): Unset the changed bit on
-	the composer and also drop any undo operations (since we loaded
-	the message into the composer). Fixes bug #30580.
-
-2002-09-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-session.c (main_get_filter_driver): Fix for filter driver
-	api change.
-
-2002-09-18  Not Zed  <NotZed@Ximian.com>
-
-	* mail-config-druid.c (wizard_back_cb): If going back from a page
-	past our end (i.e. the final page), jump to the last page we know
-	of.  For #29293.
-
-	* component-factory.c (notify_listener_exception): helper to map a
-	camel excpeiton to a listener result.
-	(storage_create_folder): Use above to return more meaningful error.
-	(storage_remove_folder): "
-	(storage_xfer_folder): ".  For #28209.
-
-2002-09-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (mail_display_render): Use e_strftime_fix_am_pm
-	here which fixes locale issues as well as working around systems
-	that don't support %P (afaik).
-
-	* mail-ops.c (prep_offline_do): Cache important messages too.
-
-	* mail-composer-prefs.c (d): Disable debugging printf's
-
-	* mail-ops.c: fixed a comment
-
-2002-09-13  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c (fb_resize_cb): If the vpaned isn't realized,
-	don't call mail_config_set_paned_size. Fixes a problem with the
-	saved pane size being repeatedly lost (#29933)
-
-2002-09-13  Dan Winship  <danw@ximian.com>
-
-	* Mailer.idl: rename this from "Mail.idl" so that the generated .h
-	file won't overwrite "mail.h" on Mac OS X. Remove some
-	never-implemented IDL and add MailConfig_removeAccount.
-
-	* Makefile.am: Update for IDL rename
-
-	* mail-config.c: #include Mailer.h, not Mail.h
-	(impl_GNOME_Evolution_MailConfig_removeAccount): Implement.
-
-	* folder-info.c: #include Mailer.h, not Mail.h
-
-	* message-list.c: Remove Mail.h include.
-
-2002-09-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* main.c (main): Ignore SIGXFSZ to fix bug #30269.
-
-	* upgrade-mailer.c (cache_upgrade_and_free): The new callback
-	function for the g_hash_table_foreach which both upgrades the
-	cache for that store and then free's the struct _storeinfo
-	afterwards.
-	(cache_upgrade): Upgrade a cached folder by moving the old cache
-	folder into the appropriate new location.
-
-2002-09-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (folder_browser_query_changed): Only abort if
-	the user selected ADVANCED_SEARCH, not the other way around. Any
-	other menu item and we are supposed to perform an actual
-	search. Fixes bug #30183.
-
-	* mail-display.c (pixbuf_for_mime_type): check the new gnome-vfs
-	icon_filename key. If that fails, fall back to checking
-	icon-filename. Also don't leak the fm_icon string and rearranged
-	some code.
-
-2002-09-11  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c (configure_folder_popup): Handle file uri's
-	too.
-
-	* mail-callbacks.c (configure_folder): clear message list before
-	calling configure folder.
-	(local_configure_done): completion callback to reset message list
-	when done.
-
-	* mail-local.c (mail_local_reconfigure_folder): changed args to
-	accept uri, and done callback.
-	(reconfigure_got_folder): moved code to callback which presents
-	the configure uri once we have the folder.
-
-2002-09-10  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c: Handle file: as well as vfolder: uri's.
-	Pass both to the normal configure_folder callback.  For #20849.
-
-	* folder-browser.c (got_folder): If we already have a folder, make
-	sure we unref/unhook from it.  Fixes a crash on exit.
-
-	* message-list.c (message_list_hide_clear): clear thread tree
-	cache if set.
-	(message_list_set_search): Same.  For bug #28834.
-
-2002-09-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-ui.c (folder_browser_ui_scan_selection): Make
-	sure that fb->message_list is non-NULL before checking
-	fb->message_list->threaded? I guess this'll fix bug #29965.
-
-	* mail-callbacks.c (composer_save_draft_cb): NULL-check the ccd
-	before reffing it.
-	(composer_send_cb): Same.
-
-	* upgrade-mailer.c (shortcuts_upgrade_xml_file): Don't look for an
-	end quote, instead look for </item> to terminate the uri.
-	(shortcuts_upgrade_uri): Hex decode the imap folder name after
-	we've constructed the final version of it.
-
-2002-09-08  Dan Winship  <danw@ximian.com>
-
-	* upgrade-mailer.c (exchange_url_upgrade): Don't modify the URL if
-	the path doesn't start with "exchange". (Means it's already a 1.2
-	URL.)
-	(shortcuts_upgrade_uri): Need to hex-decode exchange URLs here too.
-	(shortcuts_upgrade_xml_file): Fix an off-by-one error here (twice)
-	so it actually works instead of always claiming shortcuts.xml
-	doesn't need to be upgraded.
-	(mailer_upgrade): Check the size of the accounts hash rather than
-	imap_sources since we have work to do if the user has an exchange
-	account but no imap accounts.
-
-2002-09-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* upgrade-mailer.c (upgrade): Sync the database after upgrading
-	mailer stuff.
-	(imap_url_upgrade): Since we need 'p' if we fail to find the
-	folder, don't g_free it until later.
-	(hex_encode): Don't forget to increment inptr after hex encoding a
-	character.
-	(exchange_url_upgrade): Apprently exchange uri's are rebelious and
-	do not want to be hex encoded like every other url, so hex decode
-	the folder names here before concatenating them onto the base url.
-
-2002-09-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	All this snot is to fix bug #29930. What I think was happening was
-	that the composer's destroy callback got fired off before the
-	async callback did.
-
-	* mail-callbacks.c (ccd_new): New convenience function to malloc a
-	new ccd.
-	(ccd_ref): ccd is now ref_counted (it needs to be) so we now have
-	this.
-	(ccd_unref): And we need this now too of course.
-	(composer_destroy_cb): composer's new destroy callback function -
-	unref's the ccd.
-	(composer_send_queued_cb): unref the ccd.
-	(composer_send_cb): ref the ccd here.
-	(save_draft_done): unref the ccd.
-	(composer_save_draft_cb): ref the ccd.
-
-2002-09-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* upgrade-mailer.c (imap_url_upgrade): Hex decode the folder names
-	when searching for them in the memory buffer, and re-hex encode
-	them when combining them with the rst of the URL.
-	(mailer_upgrade): Instead of reading in the storeinfo file as raw
-	binary data, use the camel-file-utils to correctly parse it.
-
-2002-09-05  Anna Marie Dirks  <anna@ximian.com>
-
-	* GNOME_Evolution_Mail.oaf.in: Changed the descriptions of the 
-	fonts, mail, accounts and composer pages of the settings dialog to be
-	hopefully more descriptive and less confusing.
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* upgrade-mailer.c (upgrade): Return FALSE here.
-	(get_base_url): Add a cast.
-
-	* component-factory.c (storage_xfer_folder): Removed unused
-	variables.
-
-	* Makefile.am: Rename upgrade-mailer to evolution-mail-upgrade.
-
-2002-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Add upgrade-mailer.c to the build.
-
-	* upgrade-mailer.c: New program to upgrade configuration files
-	from 1.0 to 1.2.
-
-2002-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Made sure
-	account->id->address is not NULL before adding it to the hash
-	table. This is to prevent bug #29877 from crashing, although it is
-	still an invalid error condition.
-
-2002-09-04  Dan Winship  <danw@ximian.com>
-
-	* folder-info.c (get_prop): Remove the "Get!" printf.
-	(set_prop): Likewise for "Set!"
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Remove unused
-	variable.
-
-	* component-factory.c (unpopulate_folder_context_menu): New.
-	(create_component): Pass it to evolution_shell_component_new().
-
-2002-09-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (mark_as_seen_cb):
-	(mark_as_unseen_cb):
-	(mark_as_important_cb):
-	(mark_as_unimportant_cb): New callback functions that wrap the
-	mail-callbacks versions of mark_as_<whatever>. Thanks to Owen
-	Taylor for this fix.
-
-2002-09-04  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c (storage_xfer_folder): Dont translate / to
-	dir_sep anymore, we always use /.
-
-2002-08-29  Peter Williams  <peterw@ximian.com>
-
-	* folder-browser-ui.c: Add HAS_FLAGS to a few miscellaneous commands
-	that don't use IS_xMESSAGE.
-
-2002-08-28  Dan Winship  <danw@ximian.com>
-
-	* GNOME_Evolution_Mail.oaf.in: Add an
-	evolution:shell_component_launch_order and rename
-	evolution:shell_component_icon.
-
-2002-08-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (make_safe_filename): Fix some broken logic here,
-	`p = strrchr (path, '/') + 1` will *never* be NULL!! If the
-	strrchr returns NULL, then that expression will evaluate to 0x1!!
-
-	* main.c (main): We now always need to init gconf for our later
-	call to e_proxy_init() which initialises the proxy settings for
-	soup to use.
-
-2002-08-28  Peter Williams  <peterw@ximian.com>
-
-	* folder-browser-ui.c (default_ui_nodes): Add some new flags for
-	sensitizing nodes based on the flags of the currently selected
-	messages.
-	(folder_browser_ui_add_message): Reset the sensitivity cache when
-	we re-add UI items.
-	(folder_browser_ui_add_list): Same.
-	(folder_browser_ui_add_global): Same.
-	(fbui_sensitise_item): Only cache the sensitivity in the hash
-	table if we actually change it.
-	(folder_browser_ui_scan_selection): New function, getting the bulk
-	of the contents of folder_browser_ui_set_selection_state.  Now
-	with code to iterate over the currently selected messages and
-	check their flags so we can sensitize based on them.
-	(folder_browser_ui_set_selection_state): Now just set the
-	selection state if necessary and pass off to _scan_selection. Don't
-	skip of we're trying to go from SELSTATE_SINGLE to SELSTATE_SINGLE,
-	eg, as the flags of the selected messages may have changed.
-
-	* folder-browser-ui.h: Prototype folder_browser_ui_scan_selection.
-	
-	* folder-browser.c (main_folder_changed): Call
-	folder_browser_ui_scan_selection as the flags on a selected
-	message may have just changed.
-
-2002-08-28  Peter Williams  <peterw@ximian.com>
-
-	* mail-format.c (component_supports): Also check that the component
-	has PersistStream.
-	(mail_lookup_handler): Get a list of all components and go with the
-	first matching one.
-
-2002-08-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (regen_list_regen): Pass
-	mail_config_get_thread_subject() as the third argument to
-	camel_folder_thread_messages_new().
-
-	* mail-config.c (config_read): Read in the thread_by_subject
-	config option.
-	(mail_config_write_on_exit): Save the thread_by_subject config
-	option.
-	(mail_config_get_thread_subject): New function to get the
-	thread_subject value.
-	(mail_config_set_thread_subject): New function to set the
-	thread_subject value.
-
-2002-08-27  Radek Doulik  <rodo@ximian.com>
-
-	* mail-signature-editor.c: removed tip frame
-
-2002-08-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes for bug #4480
-
-	* folder-browser-factory.c (control_activate): Call
-	folder_browser_reload() instead of refreshing the folder
-	ourselves.
-
-	* folder-browser.c (folder_browser_reload): New convenience
-	function. If the folder-browser's folder is already loaded,
-	refresh the contents, otherwise if the folder has not been loaded
-	- try loading the folder again (it may have failed to open last
-	time for some reason?).
-
-2002-08-27  Peter Williams  <peterw@ximian.com>
-
-	* mail-format.c (handle_text_plain_flowed): Fix bug #29493.
-
-2002-08-26  Peter Williams  <peterw@ximian.com>
-
-	* mail-callbacks.c (toggle_flags): Logic change for when untoggling
-	a message from deleted-dom.
-
-2002-08-26  Peter Williams  <peterw@ximian.com>
-
-	* mail-ops.c (transfer_messages_transfer): Enforce the mailer policy
-	that deleted messages are marked as seen. Fixes 29448. This could
-	go in camel_folder_transfer_messages_to, but I don't think we
-	necessarily want to enforce that policy for Camel in general.
-
-2002-08-23  Peter Williams  <peterw@ximian.com>
-
-	Address most of bug #4940. Fails on the last page of the add account
-	dialog as called from the prefs dialog due to EvolutionWizard being
-	weird.
-	
-	* mail-config-druid.c (goto_next_page): New function, little
-	wrapper around wizard_next_cb. Also potential place to work around
-	EvolutionWizard weirdness in the future.
-	(identity_activate_cb): New function, calls goto_next_page if
-	identity page is complete.
-	(source_activate_cb): Analogous.
-	(transport_activate_cb): Analogous.
-	(management_activate_cb): Analogous.
-	(get_fn): Hook up the activate signals of the various GtkEntries
-	to the correct callbacks above.
-	(management_check): Return the result of the check so that
-	management_activate_cb can use it.
-
-2002-08-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-tools.c (mail_tool_restore_xevolution_headers): Reset the
-	X-Evolution-PostTo header.
-	(mail_tool_remove_xevolution_headers): Remove the
-	X-Evolution-PostTo header.
-
-2002-08-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-folder-cache.c (ping_store): Spawn a new thread to ping the
-	server but only if it is connected.
-	(ping_cb): This needs to return TRUE so the timeout keeps getting
-	called.
-
-2002-08-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (class_init): Don't bother overloading the
-	timeout virtual methods since they don't exist anymore.
-
-	* mail-folder-cache.c (mail_note_store): Register a ping timeout
-	callback to ping each store to keep the connections alive.
-
-2002-08-20  Radek Doulik  <rodo@ximian.com>
-
-	* mail-callbacks.c (do_mail_print): be sure that widget is
-	realized so that e_utf8_from_gtk_string works properly
-	(footer_print_cb): save/restore
-
-2002-08-20  Mike Kestner  <mkestner@ximian.com>
-
-	* folder-browser-ui.c (folder_browser_ui_setup_view_menus): guard
-	against the view_instance disappearing during earlier CORBA work.
-
-2002-08-20  Peter Williams  <peterw@ximian.com>
-
-	* message-list.c (search_func): Once we hit the target node,
-	update the cursor_uid if it's set. Fixes #29085.
-
-2002-08-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-preferences.c (mail_preferences_apply): Fix a
-	copy/paste-o. Use the pgp_path GnomeFileEntry widget rather than
-	the notify_sound_file GnomeFileEntry widget for the pgp path stuff
-	:-)
-
-2002-08-19  Dan Winship  <danw@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_setup): source_type_changed
-	may try to change the transport optionmenu (incorrectly in this
-	case), so don't call gtk_option_menu_set_history on it until after
-	emitting "activate" on the source type menuitem.
-	(mail_account_gui_save): Fix the saving of STORE_AND_TRANSPORT
-	transports and add a comment so it doesn't get mistakenly unfixed
-	again.
-
-2002-08-09  Peter Williams  <peterw@ximian.com>
-
-	* subscribe-dialog.c: Change this into a GnomeApp so we get a
-	statusbar and the dialog is a little more comprehensible.
-
-	* subscribe-dialog.c: (struct _FolderETree): Add members for
-	tracking activity callback information.
-	(get_short_folderinfo_got): Notify the activity callback.
-	(subscribe_get_short_folderinfo): Here too.
-	(folder_etree_init): Initialize the activity level to 0.
-	(folder_etree_construct): Take new parameters of our activity
-	callback and user_data.
-	(folder_etree_new): Here too.
-	(store_data_get_widget): Take the parameters here and pass them
-	on.
-	(sc_close_pressed): New callback for when close button is pressed.
-	(sc_activity_timeout): New timeout to move the activity bar when
-	folders are being scanned.
-	(sc_activity_cb): If activity_level > 0, start the progressbar
-	moving and set the status.
-	(menu_item_selected): Pass the callback to store_data_get_widget.
-	(subscribe_dialog_construct): Load some more widgets and adapt to
-	some changes in the XML. Also connect the close button signal and
-	initialize the progress bar's settings.
-
-	* mail-callbacks.c (manage_subscriptions): Don't call 
-	gnome_dialog_set_close on it anymore since it's no longer a gnome 
-	dialog.
-
-2002-08-14  Dan Winship  <danw@ximian.com>
-
-	* mail-config.glade: Add a "don't sign meeting requests" option to
-	the security pane, since some versions of Outlook won't recognize
-	pgp-signed meeting requests. Sigh.
-
-	* mail-config.c (account_copy, config_read, mail_config_write):
-	Handle pgp_no_imip_sign.
-
-	* mail-account-gui.c (mail_account_gui_new,
-	mail_account_gui_save): Setup/save "don't sign meeting requests"
-	button.
-
-2002-08-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (forward_message): Removed an unused variable.
-
-	* mail-account-editor.c (construct): Set the focus on the Account
-	Name entry widget. Fixes bug #10350.
-
-2002-08-12  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (on_url_requested): Replace no-longer-existent
-	e_book_query_address_locally with e_book_query_address_default.
-
-2002-08-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (forward_message): Use mail_get_messages()
-	instead of mail_get_message().
-	(do_forward_non_attached): Fixed to work as a callback from
-	mail_get_messages().
-	(do_edit_messages): Only set the drafts_folder and drafts_uid if
-	the folder-browser is a drafts folder. Fixes bug #28863.
-
-2002-08-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (save_draft_done): If the ccd is NULL, create a
-	new ccd, disconnect the old signal handlers, and then reconnect
-	the signal handlers using the non-NULL ccd as the user_data.
-	(composer_send_queued_cb): Same, but only if the queue append
-	operation failed.
-
-2002-08-09  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (composer_send_queued_cb, save_draft_done):
-	Handle the fact that ccd may be NULL (if the composer was created
-	via CORBA). Quick temporary fix for sending meeting requests.
-
-2002-08-09  Peter Williams  <peterw@ximian.com>
-
-	* mail-config.c (mail_config_uri_renamed): When a URI is changed,
-	try to copy over threaded view settings, preview pane shown
-	settings, headers, hide state, tree expansion, and GAL view files.
-	(uri_to_evname): New utility function.
-
-2002-08-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Instead of comparing
-	old/new CamelStore objects, just compare their account urls since
-	changing params would still result in the same CamelStore
-	object. Fixes bug #18539.
-
-	* mail-callbacks.c (delete_msg): Don't check permanent_flags for
-	the CAMEL_MESSAGE_DELETED bit here, if we are gonna check to see
-	if the folder supports the permanent flag then there are better
-	places to check this. Besides, it was the cause for bug #28038.
-
-2002-08-08  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_toggle_threads): Force a
-	refresh of the menu sensitivity when the thread state changes.
-
-2002-08-07  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser-ui.c: Added EditSelectThread to only enable
-	threaded mode if threaded is on.  For #19941.  Added some macro's
-	to simplify the table.
-	(folder_browser_ui_set_selection_state): Implement IS_THREADED
-	mask.
-
-2002-08-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (composer_send_queued_cb): Delete the Draft
-	item that this was edited from if that is the case as well as
-	setting any replied flags if we need to. Fixes bug #18171.
-	(save_draft_done): Not only delete the previously saved draft, but
-	also set any PostSendData on the message being replied to or
-	whatever. Fixes bug #20224.
-	(compose_msg): Create an empty callback data struct which is now a
-	MUST.
-	(mail_reply): Fill in the new post_send_data info and also move
-	the creation of the post_send_data to AFTER the creation of the
-	composer widget so we don't leak on fail.
-	(forward_get_composer): Pass an empty post_send_data structure as
-	the user_data to the signal callbacks.
-	(send_to_url): Same.
-	(post_to_url): Here too.
-	(redirect_get_composer): And here.
-	(do_edit_messages): We no longer use the evil kludge of setting
-	data on the composer object to denote the drafts_uid etc, this is
-	now part of the post_send_data struct.
-
-2002-08-07  Peter Williams  <peterw@ximian.com>
-
-	* component-factory.c (request_quit): If outbox_folder is NULL,
-	don't try and get its message count (this should never happen, but
-	has.)
-
-2002-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-local.c (save_metainfo): No need to save a temporary file
-	first anymore since I updated e_xml_save_file() to do this for us.
-
-2002-08-07  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser-ui.c: Enable the view type menu's always.  See
-	#20901.
-
-	* message-tag-followup.c (target_date_new): Set the week start day
-	from the calendar prefs, do same for 24 hour format.  See #23423.
-
-	* mail-config.c (config_read): Added week_start_day from
-	Calendar/Display config.  Also time_24hour format.
-	(mail_config_get_week_start_day): 
-	(mail_config_get_time_24hour): And read-only accessors.
-
-2002-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-local.c (save_metainfo): Save to a temporary file first
-	using e_xml_save_file rather than xmlSaveFile, if the save
-	completes successfully then rename it to the real filename. Make
-	sure that errno is saved.
-	(mls_get_folder): save_metainfo doesn't return -1 on fail, it
-	returns FALSE.
-
-2002-08-06  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_search_menu_activated): Set the
-	rule name to include the search string, for #10979.
-
-	* message-list.c (message_list_hidden): Only count hidden messages
-	which are in the folder.  Should probably maintain hidden table
-	better.  For #4334.
-	
-	* mail-ops.c (filter_folder_filter): Unref the driver before
-	returning to main thread, so any closing operations are handled
-	async (as in fetch_mail_fetch()), for #28072.
-	(fetch_mail_fetch): Check driver != NULL, if folder_filter freed
-	it already.
-
-	** fixes for #24605.
-	
-	* mail-vfolder.c (vfolder_gui_add_from_mlist): Removed.
-
-	* folder-browser.c (filter_type_uid,vfolder_type_uid): Changed to
-	accept args directly.  Fixed callers.
-	(filter_mlist_uid,vfolder_mlist_uid): Use filter_type_uid instead
-	of mlist variant.
-	(vfolder_type_current): new function to handle setup of vfolders
-	from the main menu.  It now uses the vfolder_type_uid function the
-	same as the popup.
-	(vfolder_subject, vfolder_sender, vfolder_recipient,
-	vfolder_mlist): Changed to use vfolder_type_current.
-	(filter_type_current): Similar for filters.
-	(filter_subject, filter_sender, filter_recipient,
-	filter_mlist): Changed to use filter_type_current.
-
-	* mail-autofilter.c (rule_from_message): Handle AUTO_MLIST type.
-	(rule_from_mlist): 
-	(vfolder_rule_from_mlist): 
-	(filter_rule_from_mlist): Removed.
-	(filter_gui_add_from_mlist): Removed.
-
-	* mail-autofilter.h: Added AUTO_MLIST type.
-
-2002-08-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-mt.c (mail_msg_check_error): If we are not in interactive
-	mode, don't display error dialogs.
-
-	* component-factory.c (interactive_cb): Updated to use the new
-	function mail_session_set_interactive().
-	(owner_unset_cb): Same here.
-
-	* mail-session.c (mail_session_set_interactive): Renamed from
-	mail_session_enable_interaction().
-	(mail_session_get_interactive): New function to get the
-	interactive state.
-
-2002-08-01  Peter Williams  <peterw@ximian.com>
-
-	* mail-offline-handler.c (struct _sync_info): Add a GHashTable pointer
-	so we can remove the info once the operation is done.
-	(sync_done): Remove the info from the hash table.
-	(impl_syncFolder): Save the table to which the info was added.
-
-2002-08-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (user_create_new_item_cb): Updated to call
-	post_to_url if the id is "post".
-
-	* mail-callbacks.c (post_to_url): New function so that we don't
-	need a FolderBrowser to post a new message.
-	(post_message): Call post_to_url since they shared so much code.
-
-2002-08-05  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (mail_reply): Only reply to all or reply to
-	list, set CAMEL_MESSAGE_ANSWERED_ALL too.
-
-2002-08-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-tag-followup.c (construct): Set the default flag to
-	Follow-Up.
-
-	* mail-display.c (mail_display_render): Updated to use the new
-	Follow-Up tags. Instead of storing a string containing the
-	follow-up tag value, we now have to store the CamelMessageInfo.
-	(mail_display_destroy): Unref the folder and the message-info.
-
-	* folder-browser.c (followup_tag_complete): No longer needed.
-	(on_right_clicked): Use the individual follow-up tags to decide
-	whether or not to enable something.
-
-	* message-list.c (ml_tree_value_at): Update to use the new
-	Follow-Up tags.
-
-	* mail-callbacks.c (flag_for_followup): Update to use the new
-	MessageTagEditor API.
-	(tag_editor_ok): Update this too.
-	(flag_followup_completed): Updated this too.
-	(flag_followup_clear): Set all the follow-up tag values to "".
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (create_component): Use
-	"post-message-16.png" as the icon for the "New Message Post" item.
-
-2002-08-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): If we are editing an
-	account, then get the CamelStore associated with the old account
-	info and save it in a struct that we will pass along as user_data
-	to mail_get_store() for the new account url.
-	(add_new_store): If the old account and new account stores are
-	identical, then don't remove the old store from the folder
-	tree. If they are not the same, then remove the old store and add
-	the new store to the folder tree.
-
-2002-07-31  Peter Williams  <peterw@ximian.com>
-
-	* mail-folder-cache.c: Add another bitfield "unsub"
-	(real_flush_updates): If unsubscribing, manually remove the folder
-	from the shell.
-	(unset_folder_info): Add another parameter which is used to set
-	the unsub member.
-	(store_folder_unsubscribed): Pass true for @unsub.
-	(unset_folder_info_hash): Pass false for @unsub.
-
-	* subscribe-dialog.c (fe_done_subscribing): Don't notify the shell
-	here. The folder cache does it now, and it was broken to make the
-	CORBA call in another thread anyway.
-
-2002-08-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (setup_mime_tables): Don't setup a handler for
-	multipart/digest.
-	(handle_multipart_digest): Removed.
-
-2002-07-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Removed folder-browser-window from the build.
-
-	* folder-browser-window.[c,h]: Removed.
-
-	* mail-callbacks.c (view_digest): Removed.
-
-	* mail-display.c (mail_display_digest_clicked): Removed.
-	(on_link_clicked): Don't handle digest: urls anymore.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (create_component): Put "New Mail Message"
-	before "New Message Post" instead of vice versa.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (create_component): Pass "mail" as
-	@folder_type to
-	evolution_shell_component_add_user_creatable_item().
-
-2002-07-31  Not Zed  <NotZed@Ximian.com>
-
-	* mail-display.c: Added global cameldatacache for managing remote
-	image cache.
-	(fetch_remote): Lookup data in cache first, use that if available,
-	or setup a new cache item.
-	(fetch_data): Write any retrieved data to cache as well as html
-	stream.
-	(fetch_free): Unref cache stream.
-	(fetch_done): 
-	(fetch_cancel): If failed/cancelled, remove cache items so they
-	dont foul the result.  Probably need a header in cache items to
-	guarantee this, but this is ok for now.
-	(mail_display_class_init): Setup cache structure.  Also ensure
-	globals are initialised at-most once.
-
-2002-07-30  Radek Doulik  <rodo@ximian.com>
-
-	* mail-config.c (mail_config_signature_set_name): save signature
-	here to remember the changed name
-
-2002-07-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (write_date): Use camel_medium_get_header to get
-	the date header rather than getting the time_t and converting it
-	into a string.
-
-2002-07-29  Not Zed  <NotZed@Ximian.com>
-
-	* mail-display.c (mail_display_init): setup private data.
-	(mail_display_destroy): cancel any outstanding fetches, and free
-	private data.
-	(mail_display_set_message): Cancel any outstanding fetches.
-	(fetch_cancelled): 
-	(fetch_next): 
-	(fetch_remote): 
-	(fetch_data): 
-	(fetch_free): 
-	(fetch_cancel): 
-	(fetch_done): Implement, used to use soup to download remote
-	images.
-	(load_http): Removed.
-	(on_url_requested): When requesting a http* url, use the
-	fetch_remote call above.
-
-	* mail-display.h (struct _MailDisplay): Added priv(ate) member.
-
-2002-07-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-session.c (request_password): Left-align the check button's
-	label.
-
-2002-07-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_new): Get the "Reset
-	Defaults" folders button and connect to the clicked signal.
-	(default_folders_clicked): Set the default uris on for the Drafts
-	and Sent folders.
-
-2002-07-26  Peter Williams  <peterw@ximian.com>
-
-	* mail-offline-handler.c (storage_go_online): Call mail_note_store
-	to get the folders to be updated and new ones to be inserted into
-	the tree.
-
-2002-07-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-session.c (request_password): Add an accelerator for the
-	"Remember this password" checkbox.
-
-2002-07-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_execute_shell_command): No real need for this
-	to be an async function sync we are going to call
-	gnome_execute_async anyway.
-
-	* component-factory.c (create_component): Add a new menu item for
-	posting to the New toolbar button thing.
-	(destination_folder_handle_drop): Don't use a NULL exception when
-	we already have one to use anyway.
-	(got_folder): Move the *fp = folder; to before the check to make
-	sure folder != NULL, this makes it so that if getting a folder
-	fails at least have have a known value to look out for (NULL)
-	rather than some random garbage.
-
-2002-07-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (create_label): Make the gtk label line-wrap
-	instead of us forcing \n's in the label, that was just
-	wrong. Fixes bug #10320.
-
-	* mail-callbacks.c (composer_send_cb): Make sure that the url
-	isn't an empty string and also make sure to free it when we're
-	done with it. Also check that we got the folder - if it is NULL,
-	then just abort.
-
-2002-07-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_folder_to_safe_url): Use
-	mail_tools_folder_to_url().
-
-	* mail-tools.c (mail_tools_folder_to_url): New convenience
-	function to take a CamelFolder and return the URL associated with
-	it.
-
-	* mail-callbacks.c (composer_get_message): Pass in a 'post'
-	argument so we know whether or not we can ignore a NULL set of
-	recipients.
-	(composer_send_cb): Default send->send to TRUE unless we are in
-	Post-To mode, in which case set send->send to FALSE (since we'll
-	have nothing to send). Also, if we are in Post-To mode, append to
-	the folder the user wants to post to rather than appending to
-	Outbox.
-	(composer_send_queued_cb): Only queue a send thread if send->send
-	is TRUE (ie, the composer was not in Post mode - if it was in Post
-	mode, then the message post has already been saved in the correct
-	folder so there is nothing to do).
-	(post_message): New function to create an empty composer widget in
-	Post mode.
-	(post_reply): New function that calls mail_reply with the new mode
-	of REPLY_POST.
-	(mail_generate_reply): If the mode is REPLY_POST, create a Post
-	composer widget otherwise create a normal composer widget.
-
-2002-07-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_execute_shell_command): Update to take argc and
-	argv arguments since this is the new definition for the
-	CamelFilterDriverShellFunc.
-
-	* mail-session.c (main_get_filter_driver): Updated for the renamed
-	function.
-
-	* mail-display.c (link_open_in_browser): Make sure that the
-	html->pointer_url is non-NULL. Should fix bug #28159 (this seems
-	to be the only questionable way for a NULL url to be passed into
-	on_link_clicked).
-
-2002-07-24  Peter Williams  <peterw@ximian.com>
-
-	* mail-callbacks.c (do_mail_fetch_and_print): Check for whether
-	current_message is NULL as well as preview_shown (if we tried to
-	load the message and failed, as may happen in offline mode.)
-	(done_message_selected): Only print if we actually got the message.
-
-	* folder-browser.c (folder_browser_query_changed): New function,
-	use this on the query_changed signal. Don't run the search if
-	they only changed the dropdown.
-
-2002-07-23  Peter Williams  <peterw@ximian.com>
-
-	* mail-ops.c (get_store_get): Call camel_session_get_service
-	instead of camel_session_get_store, as _get_store calls
-	_get_service_connected which is not what we want to do on startup.
-	(set_offline_do): Rework the logic here. It was failing when
-	trying to go online with a disco store that couldn't work offline.
-
-	* mail-folder-cache.c (mail_note_store): If we're using an offline
-	(well, non-online) disco store that cannot work offline, don't get
-	the folderinfo as that will fail.
-
-2002-07-24  Radek Doulik  <rodo@ximian.com>
-
-	* mail-composer-prefs.c (sig_add): use
-	mail_config_get_send_html for html format flag
-
-	* mail-account-gui.c (sig_add_new_signature): use
-	mail_config_get_send_html for html format flag
-
-2002-07-24  Not Zed  <NotZed@Ximian.com>
-
-	* mail-folder-cache.c (real_flush_updates): Propagate name changes
-	or removes to the mail config.  #15951.  Doesn't enitrely work for
-	local folders, because they are never renamed only removed and
-	added thanks to the shell's api.
-
-	* mail-config.c (mail_config_uri_renamed): If a store folder is
-	renamed, this checks for any config that needs updating, so far
-	sent and drafts folders.
-	(mail_config_uri_deleted): Same, for deleted folders.
-
-2002-07-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_multipart_encrypted): Commit a fix that I
-	thought I committed a while ago:
-
-	* mail-format.c (handle_multipart_encrypted): Pass the correct
-	pointer into camel_multipart_encrypted_decrypt().
-
-	* mail-ops.c (mail_send_message): Rework the logic a bit. If we
-	find an account, use that to set the sent_folder_uri and the
-	transport_url, otherwise use the X-Evolution-Transport and
-	X-Evolution-Fcc headers.
-
-2002-07-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-tag-followup.c (message_tag_followup_decode): Don't pass
-	the length of the tag name into strncmp, instead use the length up
-	to the first ':' in the value string.
-
-2002-07-22  Peter Williams  <peterw@ximian.com>
-
-	* folder-browser.c (folder_browser_gui_init): Also perform a search
-	on the query_changed signal, which is what gets emitted when the 
-	Search menu is used.
-
-2002-07-24  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c (owner_set_cb): Initialise the standard
-	uri's before doing anything else.
-
-	* mail-vfolder.c (uri_is_ignore): Return true if the uri is any
-	sent, drafts or outbox folder uri.
-	(mail_vfolder_add_uri): Dont automagically add any
-	sent/outbox/drafts folder with "local" or "remote" etc rules, only
-	add sent folders if explictly listed as folder rules.  Maintain
-	the remote/local folders list accordingly.
-	(vfolder_adduri_do): dont check against sent_folder, drafts_folder
-	or outbox_folder, this is checked by above code.  For #14863.
-
-	* mail-display.c (drag_data_delete_cb): use uri_list before we set
-	"uri-list" to NULL, which will automagically free it for us, so
-	dont free it either.  Found with vagrind.
-
-2002-07-23  Not Zed  <NotZed@Ximian.com>
-
-	* message-browser.c (message_browser_destroy): Disconnect from
-	folderbroser signals when we unref it, so we dont get signals
-	later on if someone else has a ref on it (causing crash).
-
-2002-07-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_signature_run_script): Check to make
-	sure the script output is valid UTF-8, if not then attempt to
-	convert it into UTF-8. Fixes bug #28086.
-
-2002-07-22  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (regen_list_regened): Remove the assert, and
-	always copy over the threadtree which represents the current view,
-	unreffing the old one if set.  For #28021.  Haven't tested this a
-	lot, but i guess it cant be worse than what is there.
-
-	* mail-vfolder.c (store_folder_renamed): When renaming, use
-	full_name to set the folder, not name, so the path is preserved.
-
-2002-07-20  Larry Ewing  <lewing@ximian.com>
-
-	* mail-format.c (mail_get_message_body): recognize urls in plain
-	text reply quoting logic (bug #27908).
-
-2002-07-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-callbacks.c: Try including gtkhtml/gtkhtml.h instead.  Test
-	really is a 4 letter word obviously.
-
-2002-07-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-folder-cache.c: Removed bogus static pre-declaration.
-
-	* e-searching-tokenizer.c (e_searching_tokenizer_end): Removed
-	unused variables.
-
-	* mail-callbacks.c: #include <gtkhtml.h>.
-
-	* folder-info.h (evolution_folder_info_get_type): Add prototype.
-
-2002-07-18  Peter Williams  <peterw@ximian.com>
-
-	* mail-format.c (handle_multipart_digest): Change the HTML to
-	make this a little prettier.
-
-	* folder-browser-window.c (folder_browser_window_new): Load the
-	messagedisplay XML file as a base for the UI, so that things
-	appear. Don't add the global UI items as they don't make sense
-	here.
-	(fb_window_close): New function, used to ... close the window,
-	suprisingly.
-
-2002-07-18  Not Zed  <NotZed@Ximian.com>
-
-	* main.c (main): Put the mcheck stuff back in, which was removed
-	without a changelog entry.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am: Reference the new libefilterbar.a.
-
-2002-07-17  Radek Doulik  <rodo@ximian.com>
-
-	* mail-callbacks.c (save_draft_done): use "saved" gtkhtml command
-
-2002-07-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (add_storage): Oops, Don't comment out the
-	mail_note_store call.
-
-2002-07-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (account_able_clicked): Re-enable some #if 0'd code.
-
-	* mail-vfolder.c (vfolder_load_storage): Updated to not pass TRUE
-	for an auto_connect argument since that argument no longer exists.
-
-	* mail-account-gui.c (add_new_store): Updated to not pass an
-	auto_connect argument.
-
-	* component-factory.c (add_storage): Don't ever auto-connect here.
-	(mail_add_storage): No longer takes an auto_connect argument.
-	(mail_load_storages): Only load the account storages that are
-	enabled.
-
-2002-07-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (composer_send_cb): Pass 'info' into
-	mail_append_mail(), seems I created the info but forgot to pass it
-	in.
-	(composer_send_queued_cb): If the message is successfully queued,
-	we destroy the composer, otherwise we unref it. Don't ever destroy
-	and then unref it.
-
-2002-07-15  Radek Doulik  <rodo@ximian.com>
-
-	* mail-callbacks.c: use new save_header_state flag
-
-2002-07-15  Peter Williams  <peterw@ximian.com>
-
-	* mail-offline-handler.c (service_is_relevant): Account for the
-	case that when a disco store is "online" but actually offline and
-	we're going online, we should actually connect it.
-
-	* component-factory.c (mail_load_storages): Always set
-	auto_connect to FALSE, same reason as below.
-
-	* mail-session.c (mail_session_init): Initialize our session to
-	not be online, since the shell will tell us to go online if we
-	need to.
-
-2002-07-10  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am (importerdir): Define this in terms of the new
-	privlibdir, again resulting in a new directory name.
-
-	* importers/Makefile.am (importersdir): Here too.
-
-2002-07-15  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (ml_tree_value_at): Lookup the label colour based
-	on the label token, not an integer.
-
-	* folder-browser.c (on_right_click): Lookup the label name from
-	the filter type.  Sigh, a bunch of other code should do similar
-	but i'm going to leave it as integers.
-	(set_msg_label): Set the label directly.
-
-	* mail-vfolder.c (vfolder_editor_clicked): Set the vfolder_editor
-	variable to null before we close the dialogue, otherwise the close
-	destroys it and reverts the file.
-
-	* component-factory.c (populate_folder_context_menu): Oops,
-	accidentally checked in some unfinished, unworking code.
-	Reverted.
-
-2002-07-10  Not Zed  <NotZed@Ximian.com>
-
-	** fixes for #10781
-
-	* mail-callbacks.c (filter_edit): Add back a cancel button.  We
-	dont need to do anything special to 'undo' here, as the rules are
-	loaded every time they're used.
-
-	* mail-vfolder.c (vfolder_editor_clicked): If ok wans't clicked,
-	revert the ruleset.
-	(vfolder_editor_destroy): Fake a button of -1 if we get destroyed
-	with no click.
-	(context_rule_removed): Unref the folder after we delete it.  If
-	we're the last ref to the folder, unrefing it means it no longer
-	exist,s which means no delte processing occurs ...
-
-2002-07-04  Not Zed  <NotZed@Ximian.com>
-
-	* mail-accounts.c (news_add_destroyed): Pass teh autoconnect flag,
-	whcih shoudlnt' exist anyeway.
-
-2002-07-03  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c (populate_folder_context_menu): If this is a
-	file url, look up its component, if we have it, then use the
-	mail-callback reconfigure call.
-
-	* folder-browser-factory.c (folder_browser_factory_get_browser):
-	Util to get the folder browser from a uri.
-
-2002-07-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (pixmap_press): Rename "Save to disk..." to "Save
-	Attachment..."
-
-2002-07-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-ui.c: Modified to use a single list of UI node
-	elements with an enable-mask rather than split into groups. This
-	allows much more control and easier modification to get the
-	desired enable/disable effects.
-
-	* mail-display.c (mail_display_set_message): If we unref'd a
-	current_message, clear the datalist. Don't bother connecting to
-	the message's finalise signal because something else may own a ref
-	to the original message when we replace it with a new one.
-	(mail_display_destroy): Only clear the datalist if we have a
-	current_message, otherwise it's safe to assume that it is already
-	cleared.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am (INCLUDES): Add -I flags to get the ebook headers.
-
-2002-07-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* subscribe-dialog.c (recursive_add_folder): Pass zero as
-	@sorting_priority to evolution_storage_new_folder().
-
-	* mail-folder-cache.c (real_flush_updates): Pass zero as
-	@sorting_priority to evolution_storage_new_folder().
-
-2002-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* subscribe-dialog.c (recursive_add_folder): Pass NULL for
-	@custom_icon_name to evolution_storage_new_folder().
-
-	* mail-folder-cache.c (real_flush_updates): Pass NULL for
-	@custom_icon_name to evolution_storage_new_folder().
-
-2002-07-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (redirect): Don't ever use the mail-display's
-	current_message, this can cause problems.
-
-	* mail-ops.c (get_message_free): Unref the gotten message. All of
-	the callers seemed to think that they didn't have to unref the
-	message.
-
-	* mail-display.c (mail_display_set_message): Now refs the message.
-	(mail_display_destroy): Unref the current_message if we still have
-	ownership of it.
-
-2002-07-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (composer_send_queued_cb): Only queue a send
-	operation if we are in Online mode, otherwise don't bother wasting
-	our time.
-
-2002-07-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* main.c (main): No longer need to pass a postpone_cb function
-	into the composer factory_init.
-
-	* mail-send-recv.c (get_receive_type): If the provider is a
-	transport, return SEND_SEND.
-
-	* mail-config.c (mail_config_get_default_transport): If the
-	default account doesn't have a transport, find the first account
-	that does.
-
-	* mail-callbacks.c (append_mail_cleanup): Don't bother freeing the
-	appended_uid here.
-	(composer_send_internal): New helper function that does all the
-	similar work that composer_send_cb and composer_postpone_cb did.
-	(composer_send_cb): Append the message to Outbox and in the async
-	callback, queue a message send operation.
-	(composer_postpone_cb): Removed.
-	(composer_send_queued_cb): The new async callback for
-	composer_send_cb(). If the append is successful, queue a message
-	send operation and destroy the composer otherwise re-show the
-	composer.
-	(save_draft_done): g_strdup the appended uid.
-	(compose_msg): Don't connect to the postpone signal anymore as it
-	no longer exists.
-	(send_to_url): Same.
-	(mail_reply): Here too.
-	(forward_get_composer): And here.
-	(redirect_get_composer): Again here.
-	(do_edit_messages): And finally here.
-
-	* mail-ops.c (append_mail_free): Free the appended uid.
-
-2002-07-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor-news.[c,h]: Removed.
-
-	* mail-accounts.c: Removed special-case code for NNTP support.
-
-	* mail-account-gui.c (mail_account_gui_setup): Allow configuration
-	of both mail and news accounts.
-
-	* component-factory.c (mail_load_storages): No longer need the
-	is-account argument.
-
-	* subscribe-dialog.c (populate_store_list): Don't special-case
-	news accounts anymore.
-
-	* mail-config.c (mail_config_get_default_news): Removed.
-	(mail_config_get_news): Removed.
-	(mail_config_add_news): Removed.
-	(mail_config_remove_news): Removed.
-
-2002-07-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vfolder.c (vfolder_load_storage): Pass TRUE as the
-	auto_connect argument to mail_load_storage_from_uri().
-
-	* mail-account-gui.c (add_new_store): Pass FALSE as the
-	auto_connect value to mail_load_storage_from_uri().
-
-	* mail-format.c (handle_multipart_encrypted): Pass the correct
-	pointer into camel_multipart_encrypted_decrypt().
-
-	* component-factory.c (mail_add_storage): Now takes an
-	auto-connect argument which it passes along to add_storage().
-	(mail_load_storage_from_uri): Same.
-	(add_storage): Only call mail_note_store() if we plan on
-	auto-connecting.
-
-2002-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (on_right_click): Increase the size of the
-	escapped mlist buffer, we can't assume that there can only ever be
-	a single '_' in the mlist name afaik.
-	(filter_type_uid): Ugh, we need to copy the fdata->source here.
-
-	Fixes bug #27263.
-
-	* folder-browser.c (filter_subject): Decide the filter source type
-	based on the folder we are in (Sent/Outbox folders use
-	FILTER_SOURCE_OUTGOING).
-	(filter_sender): Same.
-	(filter_recipient): Here too.
-	(filter_mlist): And here.
-	(on_right_click): Set the fdata->source.
-	(filter_type_got_message): Pass fdata->source into
-	filter_gui_add_from_message().
-	(filter_mlist_uid): Same.
-
-	* mail-autofilter.c (filter_gui_add_from_message): Now takes a
-	source argument so that we don't always add incoming rules.
-	(filter_gui_add_from_mlist): Same.
-
-	* mail-tools.c (mail_tool_make_message_attachment): Remove Bcc
-	headers too. Fixes bug #27302.
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser.c (folder_browser_gui_init): Don't connect
-	folder_browser_search_do_search to "query_changed" since we don't
-	want the search to happen unless the user clicks "Find Now", for
-	consistency.
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (create_component): Pass a tooltip to
-	evolution_shell_component_add_user_creatable_item.
-
-2002-07-02  Sean Atkinson  <sean@cantab.net>
-
-	* mail-preferences.c: remove dependency on removed file
-	camel/camel-pgp-context.h
-
-2002-07-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_multipart_related): Make sure that cid is
-	non-NULL.
-
-2002-07-01  Not Zed  <NotZed@Ximian.com>
-
-	* mail-folder-cache.c (folder_deleted): Removed.  The
-	folder's deleted event isn't needed since we're listening to the
-	store's folder_deleted signal.  Also, the code was wrong, it
-	cleared the folder without disconnecting events, etc.  See #16486,
-	and probably others.
-	(mail_note_folder): Dont hook onto deleted anymore.
-	(unset_folder_info): Or unhook from it.
-
-2002-06-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (mail_load_storages): Don't skip over
-	disabled accounts - put them in the folder tree too.
-
-2002-06-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #27055.
-
-	* mail-accounts.c (account_add_finished): Unref the main accounts
-	widget.
-	(account_add_clicked): Ref the main accounts widget.
-	(account_edit_finished): Unref the main accounts widget.
-	(account_edit_clicked): Ref the main accounts widget.
-
-2002-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (storage_remove_folder): Recursively delete
-	any subfolders.
-
-2002-06-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (config_read): Don't allow the pgp type to be
-	anything except NONE or GPG.
-
-	* mail-preferences.c (mail_preferences_apply): Don't allow someone
-	to use anything other than GnuPG.
-
-	* mail-crypto.c (mail_crypto_get_pgp_cipher_context): No need to
-	handle pgp5 or pgp6 types anymore since we are no longer
-	supporting them. Ding dong the witch is dead!
-
-	* mail-format.c (handle_multipart_encrypted): Rewritten to use
-	camel_multipart_encrypted_decrypt.
-
-	* mail-crypto.c (mail_crypto_pgp_mime_part_verify): Removed.
-	(mail_crypto_pgp_mime_part_encrypt): Removed.
-	(mail_crypto_pgp_mime_part_decrypt): Are we seeing a trend yet?
-
-2002-06-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (on_url_requested): Also handle https urls.
-
-	* component-factory.c (mail_add_storage): Some compiler warning
-	fixes.
-
-	* mail-crypto.c (mail_crypto_pgp_mime_part_sign): Removed.
-	(mail_crypto_get_pgp_cipher_context): New convenience function to
-	construct a pgp cipher context.
-	(mail_crypto_pgp_mime_part_verify): Use the new
-	get_pgp_cipher_context function.
-	(mail_crypto_pgp_mime_part_encrypt): Same.
-	(mail_crypto_pgp_mime_part_decrypt): Here too.
-
-	* mail-account-gui.c (mail_account_gui_new): Initialise the
-	pgp_always_trust checkbox.
-	(mail_account_gui_save): Get whether or not to always_trust the
-	user's pgp keys.
-
-	* mail-config.c (account_copy): Copy over the pgp_always_trust
-	option.
-	(config_read): Read in the always_trust option.
-	(mail_config_write): Save the always_trust option.
-
-2002-06-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.c (mail_crypto_pgp_mime_part_verify): If the pgp
-	type is gpg, then use the gpg context.
-	(mail_crypto_pgp_mime_part_sign): Same.
-	(mail_crypto_pgp_mime_part_encrypt): Same.
-	(mail_crypto_pgp_mime_part_decrypt): Same.
-
-	* mail-format.c (handle_multipart_signed): Use the new gpg cipher
-	context.
-
-2002-06-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (message_list_change_first_visible_parent): New
-	convenience function to find the first parent node that is visible
-	and emit a changed signal on it.
-	(main_folder_changed): If a message changed, call
-	change_first_visible_parent() in case we are in a collapsed thread
-	so that our first visible parent gets updated as well. Fixes bug
-	#26263.
-
-	* component-factory.c (storage_remove_folder): Simplify the error
-	checking.
-
-2002-06-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (get_normalised_string): New convenience function
-	to get a cached normalised string.
-	(subject_compare): Removed, as we strip Re:'s when normalising the
-	subject strings now.
-	(ml_tree_value_at): Added support for the normalised columns (used
-	for a sorting optimisation).
-	(message_list_init): Initialise normalised_hash.
-	(message_list_destroy): Destroy normalised_hash.
-	(message_list_create_extras): Removed subject_compare.
-	(main_folder_changed): De-cache normalised strings for any removed
-	uids.
-
-2002-06-17  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (regen_list_regen): If we dont support searching,
-	dont try to.
-
-2002-06-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (regen_list_regen): Move m->complete = TRUE; to
-	within the cancel-check block, this way complete only ever gets
-	set to TRUE if we weren't cancelled. I assume this is how it was
-	supposed to work.
-
-2002-06-11  Not Zed  <NotZed@Ximian.com>
-
-	* folder-info.c (do_get_info): If we dont get a folder, dont try
-	and get details off it.  Should get rid of most of those annoying
-	summary warnings, but not the cause of them.
-
-2002-06-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (account_able_clicked): Comment out the code to
-	add/remove the store to the folder-tree when it gets
-	enabled/disabled.
-
-	* mail-callbacks.c (mail_generate_reply): If we are doing
-	Reply-to-All, do not include any of the user's email accounts in
-	the To: field. If, after this, the To: field is empty - then
-	promote the first recipient in the Cc: list to the To: field.
-
-2002-06-07  Radek Doulik  <rodo@ximian.com>
-
-	* mail-config.c (mail_config_write_account_sig): call
-	mail_config_init to be sure we have the db, save auto_signature as
-	well
-
-	* mail-composer-prefs.c (sig_add_script_cancel): hook this to
-	cancel button in signature script dialog
-
-	* mail-signature-editor.c (mail_signature_editor): fix some typos,
-	set label usize to 500, -2
-	(menu_help): added help link to Help menu
-
-2002-06-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): If this account is
-	not a completely new account (ie, it is an edited account), then
-	remove any trace of it from the shell storages. If the new account
-	belongs in the folder-tree, add it to the list of storages.
-
-	* component-factory.c (mail_add_storage): New function to add a
-	single storage.
-
-2002-06-06  Radek Doulik  <rodo@ximian.com>
-
-	* mail-composer-prefs.c (mail_composer_prefs_construct): disable
-	edit and delete when there are no signatures defined
-
-2002-06-06  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (mail_regen_list): Keep track of the regeneration
-	request in a list.
-	(regen_list_free): Remove the request from the regenreation list.
-	(message_list_set_folder): If there are any outstanding
-	regneration requests, cancel them.
-	(regen_list_regened): If we were cancelled, do nothing.
-	(regen_list_regen): If we were cancelled, shortcut processing.
-	This is all for #23571.
-
-	* message-list.c (regen_list_regen): Change the way we calculate
-	the hide deleted messages and tree view options.  Do it based on a
-	search and uid's rather than a summary.
-	(regen_list_regened): Handle changes to tree storage.
-	(mail_regen_list): The tree is now stored between updates, so we
-	can update the tree structure incrementally.  This blows out
-	memory use some however.  We need an etree that uses this as its
-	model directly?
-	(message_list_destroy): Free the thread tree.
-	(message_list_set_folder): Clear the thread tree when changing
-	folder.
-
-2002-06-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_get_message_rfc822): Don't forget to free
-	the date string buffer.
-
-2002-06-05  Radek Doulik  <rodo@ximian.com>
-
-	* mail-composer-prefs.c (sig_fill_clist): use gtk string instead
-	of utf8 one
-
-2002-06-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	The following changes take a great leap toward fixing bug #1042.
-
-	* mail-display.c (mail_display_push_content_location): New
-	function to push a Content-Location value onto the MailDisplay.
-	(mail_display_get_content_location): Gets the current
-	Content-Location CamelURL value.
-	(mail_display_pop_content_location): Pop the Content-Location off
-	the stack.
-
-	* mail-format.c (get_location): Do URL merging if the
-	Content-Location isn't a full URL. If the Content-Location doesn't
-	exist, pretend the URL is actually the Content-Location URL of our
-	parent multipart (assuming it exists). If that doesn't exist, then
-	yes - return NULL.
-	(handle_multipart_related): Push the Content-Location header value
-	of the multipart/related so that we can do URL merging in
-	get_location() as we process each of the subparts. When we're
-	done, pop it back off the stack.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.etspec: Added priorities.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* folder-browser-ui.c (folder_browser_ui_setup_view_menus): Set
-	the title of our GalViewCollection.
-
-2002-06-04  Not Zed  <NotZed@Ximian.com>
-
-	* mail-accounts.c (mail_accounts_tab_construct): Duh, we want to
-	set the news_edit/delete buttons for the news page, not overwrite
-	the mail ones!  That would've saved a bit of angst ...
-
-	* mail-config-druid.c (extra_prepare): dont call build_extra_conf,
-	otherwise it blows away any settings with defaults.
-
-2002-06-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Write the signature
-	after the account has been added.
-	(sig_new_html): Don't write the signatures at this time.
-	(sig_new_text): Same.
-
-2002-06-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (account_delete_clicked): Correctly get the
-	GtkWindow ancestor of the prefs widget.
-
-2002-06-03  Not Zed  <NotZed@Ximian.com>
-
-	* mail-callbacks.c (composer_get_message): Changed to check
-	everything from the composer before the message is requested.
-	Otherwise we could end up signing/encrypting it twice, etc.
-
-	* mail-format.c (handle_multipart_signed): removed some dead wood.
-
-2002-06-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (request_quit): Prompt the user to see if he
-	really wants to quit when there are queued messages in the Outbox.
-
-2002-06-01  Not Zed  <NotZed@Ximian.com>
-
-	* mail-local.c (mlf_getv): Implement, return a text description of
-	the localfolder.
-
-	* message-list.c (ml_duplicate_value): 
-	(ml_free_value): 
-	(ml_initialize_value): 
-	(ml_value_is_empty): 
-	(ml_value_to_string): 
-	(ml_tree_value_at): Implement COL_LOCATION, original location of
-	message (useful for vfolder).
-
-2002-06-02  Larry Ewing  <lewing@ximian.com>
-
-	* mail-tools.c (mail_tool_quote_message): make these citations as
-	well.
-
-	* mail-format.c (handle_text_plain_flowed): make these blockquotes
-	into citations.
-
-2002-05-31  Not Zed  <NotZed@Ximian.com>
-
-	* mail-format.c (handle_multipart_signed): Changed to handle new
-	multipart-signed type.
-
-2002-05-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-send-recv.c (mail_send_receive): Noop if we are in offline
-	mode.
-
-	* component-factory.c (mail_remove_storage): If the store is not
-	in the storage hash, then it must not have ever been added. Fixes
-	bug #25456.
-
-	* mail-callbacks.c (view_msg): Oops, create a message-browser
-	window here, not a folder-browser-window window.
-
-2002-05-29  Radek Doulik  <rodo@ximian.com>
-
-	* mail-composer-prefs.c: moved spell checking options to separate
-	page, updated UI by Anna's design
-
-	* mail-accounts.c (mail_accounts_load): use _ instead of U_ for
-	clist
-	(mail_accounts_tab_construct): justify marks column to right
-
-2002-05-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-window.c (folder_browser_window_new): Revert a
-	failed idea.
-
-2002-05-24  Radek Doulik  <rodo@ximian.com>
-
-	* mail-composer-prefs.c (mail_composer_prefs_construct): ops,
-	revert array size
-
-2002-05-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): If we can't find the
-	mailing list address in the recipients list, just Reply-to-All
-	instead.
-
-2002-05-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-window.c (folder_browser_window_new): Set the ui
-	to be the evolution-mail-global.xml file thingy. Still broken but
-	oh well. I give up. bonobo-ui sucks.
-
-	* message-browser.c (set_bonobo_ui): Fixed to not crash.
-
-2002-05-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-window.c (folder_browser_window_new): If the
-	folder-browser has a parent, reparent it.
-
-	* message-browser.[c,h]: Revert back to the old broken
-	implementation since that's what users want. They're not happy
-	unless it's broken.
-
-2002-05-23  Radek Doulik  <rodo@ximian.com>
-
-	* mail-composer-prefs.c: be more careful about language_str{_orig}
-	(mail_composer_prefs_construct): add auto smiley check button
-
-2002-05-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (sig_fill_options): Only clear the text/html
-	signature menus if they are non-NULL.
-
-	* mail-composer-prefs.c (spell_save_values): Use a new macro,
-	STR_EQUAL, to tell if the 2 values are equal or not rather than
-	using strcmp since one or both strings could be NULL.
-
-2002-05-21  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_config_search): Split the
-	search word up for a body search and add it to the tokeniser to
-	highlight.
-
-2002-05-18  Not Zed  <NotZed@Ximian.com>
-
-	* e-searching-tokenizer.c
-	(e_searching_tokenizer_add_primary_search_string):
-	(e_searching_tokenizer_add_secondary_search_string): New functions
-	to add additional search strings one at a time.  Maybe it should
-	just split the word itself?
-	(all): Basically, entirely rewritten.  Now implements the
-	Aho-Corasick multiple pattern search algorithm and handles
-	multiple search strings and only ever has to decode any utf8
-	character once, etc etc.
-
-2002-05-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_get_message_body): Only get the contents of
-	a mime part if it is marked as "inline". Fixes bug #7527.
-
-	* mail-display.c (mail_display_render): Fixed the "Overdue:"
-	string to not contain any HTML tags.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* subscribe-dialog.c (recursive_add_folder): Pass TRUE for
-	@sync_offline to evolution_storage_new_folder().
-
-	* mail-folder-cache.c (real_flush_updates): Pass TRUE for 
-	@sync_offline to evolution_storage_new_folder().
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-callbacks.c (composer_sent_cb): Always unref the composer
-	[even when we are destroying it], otherwise we leak it and we get
-	the nasty bug where you can't quit.
-
-2002-05-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (ml_tree_value_at): Check for a label tag when
-	doing a lookup on the COLOR column.
-
-	* mail-config.c (mail_config_get_label_color_string): Return the
-	colour in string format.
-
-	* folder-browser.c (set_msg_label): Replaces colourise_msg and
-	sets the "label" tag rather than the "colour" tag.
-
-	* mail-preferences.c (mail_preferences_apply): Call
-	mail_config_write() so that the settings get synced to disk.
-
-2002-05-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (request_quit): New.
-	(create_component): Pass it as the @request_quit_fn to
-	evolution_shell_component_new().
-
-2002-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (create_component): Pass NULL as
-	@request_quit_fn.
-
-2002-05-15  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (prep_offline_do): 
-	(prep_offline_done): 
-	(prep_offline_free): 
-	(mail_prep_offline): Implement prep_offline for an individual
-	folder.
-	(set_offline_do): Only call disco_store_set_status or disconnect
-	for the store, dont do any offline prep stuff.
-
-	* mail-offline-handler.c: Applied patch from Ettore to hook in
-	extra offline interfaces.
-	(impl_destroy): Dont free listener here anymore, its removed, but
-	free sync table.
-	(mail_offline_handler_init): Same for setup.
-	(impl_syncFolder): Implement.
-	(sync_done): handles finalising synchronisation of 1 folder.
-	(sync_status): progress reporting, camel side.
-	(sync_timeout): progress reporting, gmainloop side.
-	(impl_cancelSyncFolder): Implement.
-	(impl_goOffline, storage_go_offline, went_offline): Dont copy the
-	listener to our struct - its an argument, not a member, so give
-	each thread its own copy.
-
-2002-05-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (ml_tree_value_at): Instead of g_assert()ing that
-	the msg_info is not NULL, if it is NULL just return NULL. This
-	fixes a crash when ETree requests the value at a root node (I
-	don't understand why it needs to do that??).
-
-2002-05-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-info.h: Added.
-
-2002-05-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* component-factory.c: Added #include "folder-info.h".
-
-	* folder-browser-window.c (folder_browser_window_new),
-	mail-account-editor.c (apply_changes), mail-account-gui.c
-	(mail_account_gui_save), message-tag-editor.c: Removed some unused
-	variables.
-
-	* folder-info.c: Added #include "folder-info.h".  Removed static
-	declaration of evolution_folder_info_get_type.
-
-	* folder-info.c (destroy), mail-callbacks.c
-	(confirm_goto_next_folder, find_current_folder,
-	find_next_folder_r, find_next_folder,
-	do_evil_kludgy_goto_next_folder_hack), mail-composer-prefs.c
-	(sig_name_changed): Commented out these unused functions.
-
-	* mail-config.c (add_new_storage): Removed this unused function.
-
-	* mail-local.c (mlf_init): Fix the declaration of this function to
-	match the required signature.
-
-2002-05-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.etspec: Added search="string" where appropriate.
-
-2002-05-13  Dan Winship  <danw@ximian.com>
-
-	* (various places): Update for camel_folder_append_message /
-	camel_folder_transfer_messages_to API change.
-
-	* mail-ops.c (mail_append_mail): Pass the appended_uid to the
-	callback.
-
-	* mail-callbacks.c (composer_save_draft_cb, save_draft_done,
-	do_edit_messages): Take advantage of the append_message change to
-	keep track of the UID of the saved draft so that we can delete the
-	old copy of the draft each time we save a new one. Remove the
-	FIXME suggesting we should do that, since we're doing it now. :)
-
-2002-05-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (do_view_message): Update for the new
-	message-browser api.
-
-	* message-browser.c (message_browser_new): A brand new
-	implementation that just shows the message, none of that next/prev
-	crap that always caused problems anyway.
-
-	* mail-config.c (mail_config_add_account): Don't add any shortcuts
-	here.
-	(mail_config_remove_account): And don't remove them here. This
-	code has never worked properly.
-
-	* mail-ops.c (save_part_save): Use the exception enum names rather
-	than '1' since it makes the code clearer.
-
-2002-05-10  Dan Winship  <danw@ximian.com>
-
-	* mail-ops.c (transfer_messages_transfer): Simplify. Use
-	transfer_messages_to instead of picking between copy and move.
-	Remove vtrash special-casing since it's all in
-	camel-vtrash-folder.c now. Remove duplicate source == dest check.
-
-	* mail-local.c (mail_local_folder_reconfigure): Use
-	transfer_messages_to instead of copy_messages_to.
-
-2002-05-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Make sure that even
-	if the new source url is NULL, that we preserve the enabledness of
-	the source.
-
-2002-05-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (add_storage): Pass %FALSE as
-	@has_shared_folders to evolution_storage_new().
-
-2002-05-09  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: dist Spell.idl
-
-2002-05-08  Radek Doulik  <rodo@ximian.com>
-
-	* mail-composer-prefs.c: implemented (c'n'p-ed and updated) spell
-	checking settings
-
-2002-05-08  Iain Holmes <iain@ximian.com>
-
-	* component-factory.c (owner_set_cb): Tell the folder info listeners 
-	that they're ready.
-
-	* folder-info.c: Add a property bag to the CORBAObject.
-	(do_get_info): Remove a load of cruft. Add some error checks.
-	(do_free_info): Unref the listener.
-	(destroy): Unref the propertybag.
-	(set_prop): Set the property.
-	(get_prop): Get the property.
-	(evolution_folder_info_factory_fn): Create a propertybag.
-	(evolution_folder_info_notify_ready): Notify all the listeners that
-	the folder info is ready for querying.
-
-2002-05-08  Not Zed  <NotZed@Ximian.com>
-
-	* mail-autofilter.c (mail_filter_rename_uri): Changed for
-	rule_context_rename_uri api changes.
-	(mail_filter_delete_uri): Same.  Also, popup a dialogue similar to
-	vfolder deleted dialogue to notify the user something has
-	changed.  Partial fix for #18826.
-
-2002-05-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (filter_folder_free): Flush the filter log to make
-	Tuomas happy :-)
-
-	* mail-session.c (mail_session_flush_filter_log): New convenience
-	function to flush the session's filter log file.
-
-	* mail-callbacks.c (mail_reply): Set the Seen flag as well since
-	it's safe to assume that if the user has replied to an email
-	message that he has read it. Not always true, but usually ;-)
-
-	* folder-browser.c (on_right_click): If we are in a
-	Sent/Drafts/Outbox folder, don't show the "Add Sender to
-	Addressbook" menu item.
-
-2002-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c (idle_quit): Check all threads are idle as
-	well, using new e_thread_busy call.  Should fix #22553?  Also
-	sleep a little bit, to let the other threads run.
-
-2002-05-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (sig_new_text): Update the code to actually
-	work.
-	(sig_new_html): Same.
-
-	* mail-composer-prefs.c (mail_composer_prefs_new_signature): Allow
-	'prefs' to be NULL.
-
-	* folder-browser.c (on_right_click): Fix the filter_menu static
-	array to use the E_POPUP_MENU_CC macros since we plan on using
-	custom closures for this.
-	(on_right_click): Fixed so that you can "Edit as New" for any Sent
-	folder and not just the local Sent folder.
-
-2002-05-01  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.h (FOLDER_BROWSER_IS_DESTROYED): Also check
-	folder!=NULL.  Fixes race where folder isn't setup yet, and
-	neither is bonobo menu status (because its delayed), and we get a
-	menu event before we're setup yet.  For bug #21939.
-
-2002-04-30  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (delete_msg): If the folder's permanent_flags
-	don't include CAMEL_MESSAGE_DELETED, don't do anything. (In
-	particular, don't move the cursor.)
-
-2002-04-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-tag-followup.c (message_tag_followup_append_message):
-	Convert UTF-8 to gtkstrings since we are using a clist and not an
-	E-widget that takes UTF-8.
-
-	* mail-display.c (mail_display_add_url): If the data-urls is NULL,
-	add a data-urls hash to the datalist. This finishes up bug #90.
-
-	* mail-account-gui.c (save_service): Strip leading/trailing
-	whitespace from the username because users sometimes accidently
-	add extra spaces here and there. Fixes bug #24009 (along with a
-	number of other "bugs").
-	(mail_account_gui_auto_detect_extra_conf): Use a CamelURL instead
-	of a GHashTable *settings. Also parse out the port # from the
-	hostname.
-
-2002-04-29  Larry Ewing  <lewing@ximian.com>
-
-	* mail-composer-prefs.c (mail_composer_prefs_construct): clean up
-	propmanager initialization code.
-
-	* mail-preferences.c (mail_preferences_construct): small clean
-	ups to propmanager code.
-
-	* mail-config-factory.c (config_control_factory_cb): handle
-	requests for the font manager control.
-
-	* mail-config.glade: add fonts tabs and reorder composer options
-	to match the new dialogs from anna.
-
-	* GNOME_Evolution_Mail.oaf.in: add font manager control definition.
-
-	* mail-composer-prefs.c (mail_composer_prefs_construct): hook to
-	the gtkhtml propmanager.
-	(mail_composer_prefs_apply): apply propmanager changes.
-	(mail_composer_prefs_finalise): unref the propmanager.
-
-	* mail-composer-prefs.h: add propmanager member.
-	
-	* mail-font-prefs.c: initialize gui properly.
-	
-	* mail-preferences.c (mail_preferences_construct): hook to
-	gtkhtml's propmanager.
-	(mail_preferences_apply): apply propmanager changes.
-	(mail_preferences_finalise): unref the propmanager.
-
-	* mail-preferences.h: add propmanager member.
-
-	* Makefile.am (evolution_mail_SOURCES): add mail-font-prefs.[ch]
-	to the build.
-
-	* mail-tools.c (mail_tool_quote_message): use the html reply logic
-	even for plain parts so that we can test out the new gtkhtml cite logic.
-
-	* importers/evolution-mbox-importer.c (process_item_fn): add const
-	to silence warning.
-
-	* mail-display.c: add gtkhtml.h include so to pick up the
-	object_relative prototype.
-
-2002-04-26  Larry Ewing  <lewing@ximian.com>
-
-	* mail-font-prefs.c: Add the font config dialog.
-
-	* mail-font-prefs.h: add font config dialog headers.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Don't link with libibex anymore, it's been
-	deprecated.
-
-	* mail-callbacks.c (next_unread_msg): Do away with the
-	goto-next-folder stuff, it's very annoying.
-
-	* mail-config-druid.c (extra_prepare): After building the extra
-	config options into a Gtk form, auto-detect any values that we can
-	and populate them by calling
-	mail_account_gui_auto_detect_extra_conf.
-
-	* mail-account-gui.c (mail_account_gui_auto_detect_extra_conf):
-	New function to auto-detect the extra config options for a source.
-
-2002-04-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_build_extra_conf): Allow
-	providers to override text entry boxes too.
-	(source_type_changed): Remove the logic to decide upon default
-	paths, these paths can now be set by the provider.
-
-2002-04-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (label_menu): Update to use
-	E_POPUP_MENU_PIXMAP_WIDGET_ITEM_CC so that our callback gets
-	called without per-item closure rather than being called with NULL
-	and causing a segfault.
-
-	* mail-account-gui.c (mail_account_gui_build_extra_conf): Set the
-	default Username label and handle the new
-	CAMEL_PROVIDER_CONF_LABEL enum allowing the provider to setup a
-	label.
-
-2002-04-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c: Added back the checkmark icon for enabled
-	accounts.
-	(account_able_clicked): Don't reload the accounts list, that was
-	just lame.
-
-2002-04-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (mail_display_render): Plug-in Anna's html for
-	the flag-for-followup stuff. Finishes up bug #90.
-
-2002-04-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (folder_browser_finalise): Free the
-	loading/pending/new/loaded_uid string buffers.
-
-	* mail-config.c (config_read_signature): Free some temporary path
-	buffers.
-
-	* mail-display.c (stream_write_or_redisplay_when_loaded): Ref the
-	html object here, this is an async handler so it's possible for
-	our caller (or someone else) to unref the html object before we
-	finish.
-	(load_content_free): Unref the async handler's ref of the html
-	object here.
-	(mail_display_new): Ref the html widget here so that we can be
-	sure that so long as the mail-display is "alive", so is the html
-	object. See bug #22328 for details. Basically, the message-browser
-	is being closed before the message gets loaded and so the html
-	object was being destroyed but the mail-display was still alive.
-	(mail_display_destroy): Unref the html object when the
-	mail-display is destroyed.
-
-2002-04-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* mail-config.glade: Added yet more accelerators for the new config
-	dialog--this time for the composer pages
-
-2002-04-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* mail-config.glade: Added a bunch of accelerators for the new config
-	dialog
-
-2002-04-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (redirect_get_composer): Removed all
-	Delivered-To headers before redirecting. Fixes bug #23635.
-
-2002-04-18  Radek Doulik  <rodo@ximian.com>
-
-	* mail-callbacks.c (do_mail_print): use default paper name in case
-	of wrong translation
-
-2002-04-15  Not Zed  <NotZed@Ximian.com>
-
-	* mail-identify.c (mail_identify_mime_part): Turn off the code
-	which downloads the part if we can't identify it.  See discussion
-	in #11778.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* folder-browser.c, mail-display.c: Updated these to match the new
-	EPopupMenu.
-
-2002-04-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_multipart_signed): Handle broken
-	multipart/signed parts such as where the signature part is not the
-	last part (as it should be). Fixes bug #23583.
-
-	* folder-browser.c (message_list_drag_data_get): Free the temp
-	GByteArrays.
-
-2002-04-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-local.c (mail_local_folder_construct): Just use g_basename.
-	(mlf_finalize): Free the real_path.
-
-	* folder-browser.c (on_right_click): Unref the GdkGC so we don't
-	leak it.
-
-2002-04-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-tools.c (mail_tool_destroy_xevolution): Free the format
-	string.
-
-	* mail-config.c (config_write_signature): Don't leak the path
-	strings here.
-
-	* mail-signature-editor.c (menu_file_save_cb): Free the dirname
-	string.
-
-	* mail-config-factory.c (config_control_factory_cb): Ref the prefs
-	widget here since we unref in the destroy callback. Caught this
-	thanks to purify.
-
-2002-04-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c: Build fixes for --enable-nntp.
-
-2002-04-13  Christophe Merlet  <redfox@eikonex.org>
-
-	* mail-config.glade: Little typo. s/IS0/ISO/
-
-2002-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-composer-prefs.c (mail_composer_prefs_construct): Make it
-	so that unchecking the "Enable Advanced Options" in the signature
-	tab disables the advanced settings and vise versa.
-
-	* mail-accounts.c (mail_accounts_tab_construct): Setup News
-	preferences too if it is enabled.
-
-	* mail-account-gui.c (mail_account_gui_new): Set the text of the
-	reply-to.
-	(mail_account_gui_save): Get the reply-to text here.
-	(mail_account_gui_identity_complete): If there is text in the
-	reply-to widget make sure it's valid.
-
-	* mail-config.c (identity_copy): Copy the reply-to.
-	(config_read): Read in the reply-to for all the accounts.
-	(mail_config_write): Save the reply-to.
-	(impl_GNOME_Evolution_MailConfig_addAccount): Get the reply-to.
-	(identity_destroy): Free the reply-to.
-
-2002-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.etspec: s/Sent/Date. This fixes bug #11159.
-
-2002-04-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (confirm_expunge): Set the 'No' button as the
-	default.
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* mail-config.c (config_read, mail_config_write,
-	mail_config_get_x_mailer_display_style,
-	mail_config_set_x_mailer_display_style): Handle the X-Mailer
-	display style. (There is currently no GUI for configuring this.)
-
-	* mail-format.c (write_headers, write_xmailer_header): Show
-	X-Mailer/User-Agent (and Rupert's stamp of approval) as
-	appropriate.
-	
-2002-04-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (setup_service): Kludge around the brokeness
-	that is GtkOptionMenu just like we kludge around it for the
-	authtype option menu.
-
-2002-04-09  Dan Winship  <danw@ximian.com>
-
-	* component-factory.c (create_view): Add view_info arg, but don't
-	do anything with it.
-
-2002-04-08  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (receive_update_got_folderinfo): Argh!
-	get_folder_info owns and frees its *OWN* folder info, it shouldn't
-	be free'd here!  See mail-ops.c:get_folderinfo_free.
-	This should fix #17259 and friends.
-
-2002-04-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-signature-editor.c (menu_file_save_cb): Simplify a bit and
-	write to a temp file first and then rename() it to the real
-	filename. This protects against losing data if the drive is full
-	too. Also use a real mode, not 0, so that we can actually
-	save/read the content ;-)
-
-	* GNOME_Evolution_Mail.oaf.in: Re-added the config wizard
-	interfaces. Ettore accidently removed them thinking they were
-	duplicates of the new mail-config interfaces.
-
-	* mail-config.glade: Remove the OK, Apply, Cancel buttons from the
-	keyboard shortcut tab in the composer_prefs dialog.
-
-	* mail-account-gui.c: No need to check gui->source before using
-	gui->source->url, since gui->source *has* to exist.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* GNOME_Evolution_Mail.oaf.in: add config_item:type
-
-2002-04-04  Dan Winship  <danw@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_new): Make the drafts and
-	sent folder buttons be EvolutionFolderSelectorButtons. Remove the
-	code to deal with drafts_folder_name and sent_folder_name, since
-	they were only used to construct the button and aren't needed now.
-	(mail_account_gui_save): Remove drafts/sent name references.
-	(mail_account_gui_destroy): Likewise
-	(folder_selected): Handle the "selected" signal on the folder
-	selector button by updating the URI in the MailAccountGui.
-	(mail_account_gui_folder_selector_button_new): Glade custom widget
-	constructor.
-
-	* mail-callbacks.c (transfer_msg): Update for
-	evolution_shell_client_user_select_folder change.
-
-	* message-browser.c (transfer_msg): Likewise. (Sigh. Why is this
-	cut+pasted?)
-
-	* mail-config.glade: Make the drafts/sent folder buttons custom
-	widgets.
-
-	* mail-config.c (account_copy): Remove drafts/sent folder name
-	handling.
-	(account_destroy): Likewise.
-	(config_read): Likewise.
-	(mail_config_write): Likewise.
-
-	* Mail.idl (MailConfig:Account): remove drafts_folder_name and
-	sent_folder_name.
-
-2002-04-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-tag-followup.c (construct): Set the window title/icon
-	here instead.
-
-	* message-tag-editor.c (message_tag_editor_init): Don't set the
-	title or window icon here, this is a generic class.
-
-	* mail-format.c (handle_multipart_signed): Replace
-	get_url_for_icon with the new mail_display_get_url_for_icon
-	function.
-	(handle_multipart_digest): Here too.
-	(get_cid): Use mail_display_add_url instead.
-	(get_location): Same.
-	(handle_text_enriched): Here too.
-	(handle_multipart_signed): And here.
-
-	* message-tag-followup.c (message_tag_followup_i18n_name): Use the
-	U_() macro, not the _() macro as it is what we really want.
-
-	* mail-ops.c (mail_send_message): Don't cast the message into a
-	CamelMedium before sending anymore.
-
-	* mail-callbacks.c (expunge_folder): Set the followup argument to
-	NULL here.
-	(done_message_selected): Get the followup value here and pass it
-	to the mail-display here.
-	(do_mail_fetch_and_print): Again with the NULL followup here.
-
-	* folder-browser.c (folder_browser_set_message_preview): Update to
-	pass in NULL as the followup since we are setting the message to
-	NULL here.
-	(done_message_selected): Get and set the appropriate followup
-	value here.
-	(do_message_selected): Update to pass in NULL as the followup
-	since we are setting the message to NULL here.
-
-	* mail-display.c (mail_display_set_message): Now takes a followup
-	tag value.
-	(mail_display_init): Set md->followup to NULL.
-	(mail_display_destroy): Free md->followup.
-	(mail_display_add_url): New: replaces the static add_url function
-	originally in mail-format.c
-	(mail_display_get_url_for_icon): New: replaces get_url_for_icon
-	which was originally in mail-format.c
-
-2002-04-03  Dan Winship  <danw@ximian.com>
-
-	* mail-account-gui.c: Changes to allow combined store/transport
-	providers (like exchange and nntp). You can only select the
-	transport if the account is also using that provider for the
-	source.
-	(source_type_changed): If changing away from a combined
-	store/transport type, disable that provider on the transport page.
-	If change to a combined store/transport type, enable and select
-	that provider on the transport page.
-	(mail_account_gui_setup): Do some additional bookkeeping here to
-	make the above stuff work.
-	(transport_type_changed): If the provider is a combined
-	store/transport type, pretend it doesn't need any additional URL
-	configuration.
-	(mail_account_gui_transport_complete): if the transport provider
-	is also a store provider, then as long as it matches the source
-	for the account, it's considered complete.
-	(mail_account_gui_save): If the selected transport is a combined
-	store/transport provider, use the source page's information to
-	fill in the transport url.
-
-	* mail-local.c (mail_local_provider_init): Don't set up
-	service_cache.
-
-2002-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (do_edit_messages): Pass the UID of the message
-	being edited to the save-draft signal handler.
-	(composer_save_draft_cb): Pass the old draft uid to our async
-	append_message function and let the append_message callback worry
-	about deleting the old draft message on success.
-	(save_draft_done): Delete the old draft message if we successfully
-	appended the new draft message.
-
-2002-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-ui.c: Removed an unused pixmap from
-	Tools/Settings to avoid a big nasty bonobo warning.
-
-	* mail-composer-prefs.c (mail_composer_prefs_construct):
-	Re-Implemented the signature editor stuff (mostly just copy/paste
-	from Radeks original code).
-
-	* mail-signature-editor.c (mail_signature_editor): Use the right
-	oafiid for the html editor control.
-
-2002-04-01  Dan Winship  <danw@ximian.com>
-
-	* importers/Makefile.am (liboutlook_la_LDFLAGS,
-	libmbox_la_LDFLAGS): Use -avoid-version -module. (From Max Horn
-	<max@quendi.de>)
-
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Mail.oaf.in: Added priorities for all the
-	configuration pages [evolution:config_item:priority].
-
-2002-03-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-preferences.c (colorpicker_get_color): Don't shift the r, g
-	and b values here either.
-
-	* mail-composer-prefs.c (colorpicker_get_color): Don't shift the
-	r, g, b values.
-
-	* mail-preferences.c (mail_preferences_construct): Restore the
-	labels & colours options from the grave.
-	(mail_preferences_apply): Save these labels & colours options.
-
-2002-03-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-composer-prefs.c (mail_composer_prefs_construct): Same
-	here.
-
-	* mail-preferences.c (mail_preferences_construct): Do some gtk
-	hackery action so we can detect if a option menu has changed.
-
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Mail.oaf.in: Cleaned up a bunch [removing
-	duplicates ;-)], set up icons for all the configuration pages.
-
-2002-03-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c: Use a GtkCList instead of an ETable, for some
-	reason the etable was getting into some infinite resize loop or
-	something. I probably did something wrong but I can't figure out
-	what so I'm using a clist for now.
-	(account_cursor_change): Make sure that event is non-NULL here.
-
-2002-03-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-accounts.c (mail_accounts_tab_construct): Use
-	gtk_container_add() to put the toplevel in the parent widget,
-	instead of just gtk_widget_set_parent().
-	* mail-preferences.c (mail_preferences_construct): Likewise.
-	* mail-composer-prefs.c (mail_composer_prefs_construct): Likewise.
-
-2002-03-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Updated to respect the
-	new mail-config options for default reply style that NotZed had
-	started to implement before there was a gui.
-
-2002-03-27  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (do_attachment_header): unset GTK_CAN_FOCUS on
-	the button so that it can't grab focus when you click it.
-	(do_signature): Likewise on the signature button. #3904
-
-2002-03-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Sync with yet-another-mail-config branch.
-
-	* mail-composer-prefs.c: Updated to get the right widgets and
-	whatnot. Also updated to tell the evolution-config-control that
-	stuff has changed.
-
-	* mail-preferences.c: Updated to get the right widgets and
-	whatnot. Also updated to tell the evolution-config-control that
-	stuff has changed.
-
-	* mail-accounts.etspec: New file needed by mail-accounts.c
-
-2002-03-26  Not Zed  <NotZed@Ximian.com>
-
-	* mail-callbacks.c (addrbook_sender): Changed to get the address
-	from the messageinfo of the current selected message rather than
-	from the current_message.
-	(requeue_mail_reply): Only re-queue if we got a message, could
-	potentially cause an infinite loop trying to get a message it
-	can't.
-	(reply_to_sender, reply_to_list, reply_to_all): Always pass NULL
-	as the msg to mail_replay, this forces mail_reply to always load
-	the message anew.  Fixes FIXME's and popup behaviour.  Basically
-	this and stuff below fixes #8542.  Its probably not the nicest
-	way, but it works.
-	(mark_as_important): Use the flags properly, we can set all flags
-	to any combination of on or off as we want, so we just need to
-	call set_flags once, thats why its set flags and not set_option.
-	(toggle_flags): Fixed the logic here also, so we dont have to call
-	set_message_flags more than once, and also implement a true toggle
-	for any number of simultaneous flags (whilst simplifying code).
-
-	* mail-vfolder.c (vfolder_gui_add_from_mlist): Removed the 'msg'
-	parameter, its not used, fixed callers.
-
-	* folder-browser.c (on_right_click): Lookup the mlist from
-	messageinfo, and change the 'no selected' logic slightly, fixes
-	most of #8542.
-	(filter_data_free): Free filter data struct.
-	(vfolder_type_got_message): Actually create vfolder once we have
-	the message we need to use for it.  Code could probably be changed
-	to use messageinfo instead.
-	(vfolder_type_uid): Lookup a message based on uid, and use that to
-	create a vfolder based on type.
-	(vfolder_subject_uid, vfolder_sender_uid, vfolder_receipient_uid,
-	vfolder_mlist_uid): Callbacks for the popup menu, used to create
-	rules based on the uid rather than the message, which it loads as
-	required.
-	(filter_type_got_message, filter_*_uid): Similar to vfolder
-	stuff above.
-	(filter_menu[]): Changed callbacks to popup specific ones, not
-	folderbrowser specific ones used by bonobo.
-	(on_right_click): Initialise callback data for the filter submenu
-	so it can look up messages for callback implementation.
-
-	* local-config.glade: New version from anna, with fixed widget
-	names.
-
-2002-03-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser.c: Reorder folder_browser_search_menu_items
-	according to #16246.
-
-2002-03-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-send-recv.c: Remove member current_folder from struct
-	_send_data.
-	(build_dialogue): Remove arg @current_folder.
-	(mail_send_receive): Likewise.
-	(free_send_data): No need to refresh the current folder here.
-	[Well, hopefully, at least.]
-
-	* component-factory.c (send_receive_callback): New.
-	(create_component): Connect.
-
-	* mail-callbacks.c (send_receive_mail): Removed.
-
-	* folder-browser-ui.c: Remove "MailGetSend" verb.
-
-2002-03-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* GNOME_Evolution_Mail.oaf.in: Add info about the new config
-	controls.
-
-	* mail-config-factory.c: New file to handle the creation/etc of
-	the config controls.
-
-	* mail-accounts.c:
-
-	* mail-preferences.c:
-
-	* mail-composer-prefs.c: No longer handle their own bonobo control
-	creation.
-
-2002-03-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (sig_new_text): Temporarily #if 0 this
-	function out.
-	(sig_new_html): Same.
-
-	* mail-config.c (config_read): Read in the default reply style
-	setting.
-	(mail_config_write_on_exit): Same the default reply style.
-	(mail_config_get_default_reply_style): New function to get the
-	default reply style.
-	(mail_config_set_default_reply_style): New function to set the
-	default reply style.
-
-	* folder-browser-ui.c: There is no longer a Tools/Mail Settings
-	menu item.
-
-	* mail-account-gui.c: Updated the widget types for the
-	MailAccountsDialog->MailAccountsTab change.
-
-	* mail_account_editor.c: Same.
-
-	* mail-callbacks.c (providers_config): Removed.
-
-	* mail-composer-prefs.c: New file that implements the composer
-	preferences tab of anna's new config design.
-
-2002-03-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c: Reimplemented. This time we only have to worry
-	about accounts. Also this now implements Annas config gui changes.
-
-	* mail-preferences.c: Implements the mailer's Preferences tab in
-	Anna's new config GUI.
-
-2002-03-19  Larry Ewing  <lewing@ximian.com>
-
-	* mail-display.c: add missing NULL closure data to popup menu
-	initialization.
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (evolution_mail_LDADD): s/libversit.la/libversit.a/
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (main): Report a message before entering bonobo_main() to
-	simplify debugging.
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser.c: Remove E_FILTERBAR_RESET menu entry.
-
-2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (on_right_click): Draw colour rectangles for
-	each of the colour items and set a closure on each.
-	(colourise_msg): colourise the message, yo.
-
-2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (colour_msg): New callback to set a colour on a
-	message.
-
-	* folder-browser.c (on_right_click): Setup our popup icons and
-	stuff. Also add a submenu for Labels.
-
-	* mail-display.c (pixmap_press): Sync up with the new EPopupMenu
-	API. Note: This code can probably now be fixed to use per-item
-	closures - yay!
-
-	* mail-accounts.c (construct): Connect to the label GtkEntry's and
-	GnomeColorPickers and also to the Restore Defaults button.
-
-	* mail-config.c (mail_config_get_label_name): New function to get
-	a label's name.
-	(mail_config_set_label_name): New function to set the label name.
-	(mail_config_get_label_color): New function to get the label
-	color.
-	(mail_config_set_label_color): New function to set the label
-	color.
-	(config_read): Read in the config options for the labels and their
-	colors.
-	(mail_config_write_on_exit): Save the label options.
-
-2002-03-15  Larry Ewing  <lewing@ximian.com>
-
-	* mail-display.c: expand the relative urls of the object at the
-	point so that relative images can be saved correctly.
-
-	* folder-browser.c: add a closing quote in a comment.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser-factory.c (control_activate): Set the UI
-	component on the search bar.
-
-2002-03-14  Dan Winship  <danw@ximian.com>
-
-	* component-factory.c (folder_types): Remove "mailstorage", since
-	it's not needed any more.
-	(storage_activate): Gone, although some of it is moved to
-	storage_connect.
-	(create_view): Remove mailstorage code.
-	(add_storage): Connect to the storage's open_folder signal.
-	Instead of creating a "mailstorage" folder, call
-	evolution_storage_has_subfolders to let the shell know we haven't
-	finished filling it in yet.
-	(storage_connect): Handler for the storage's asyncOpenFolder
-	signal. Call mail_note_store() to try to connect.
-	(storage_connected): Callback for above. If the connection attempt
-	failed, call evolution_storage_has_subfolders again to make the
-	shell re-close the storage.
-
-	* mail-folder-cache.c (update_folders): Remove a piece of
-	mailstorage legacy code from here.
-
-2002-03-14  Radek Doulik  <rodo@ximian.com>
-
-	* mail-config.c (get_new_signature_filename): create new signature
-	file
-	(delete_unused_signature_file): be more careful about signature
-	file path before unlinking
-
-2002-03-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (next_thread): Implemented.
-
-	* message-list.c (message_list_select_next_thread): New function
-	to select the next thread.
-
-2002-03-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-window.c (folder_browser_window_new): Set a
-	default size of the window, so we don't get this itty-bitty window
-	the size of a quarter on the screen when it first gets shown.
-
-2002-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (on_link_clicked): Handle digest: urls.
-
-	* mail-format.c (setup_mime_tables): Add a handler for
-	multipart/digest.
-	(handle_multipart_digest): Handle multipart/digest parts.
-
-2002-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (folder_browser_set_folder): Set the folder on
-	a folder-browser object.
-
-	* folder-browser-window.c (folder_browser_window_new): Simple
-	window to display a folder-browser.
-
-	* mail-callbacks.c (view_digest): New callback to open a
-	folder-browser-window with a digest folder.
-
-2002-03-08  Radek Doulik  <rodo@ximian.com>
-
-	* mail-signature-editor.c (menu_file_save_cb): truncate stream
-	before saving
-
-	* mail-config.c (mail_config_signature_set_html): new function
-
-	* mail-accounts.c (sig_event_client): watch for HTML changed event
-
-	* mail-signature-editor.c: added HTML check menu item to Format
-	menu
-
-2002-03-08  Dan Winship  <danw@ximian.com>
-
-	* mail-config-druid.c (management_prepare): Rewrite this to not
-	use stpcpy, which isn't portable.
-
-2002-03-08  Radek Doulik  <rodo@ximian.com>
-
-	* mail-accounts.c (sig_event_client): handle name changed event
-	(sig_load_preview): don't run script before each reload
-	(sig_script_activate): run script only if script entry is
-	activated
-
-	* mail-signature-editor.c (mail_signature_editor): added signature
-	name entry
-
-2002-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (management_changed): Re-focus the account
-	name entry widget.
-	(identity_prepare): If a name is not set, try and get the user's
-	full name for them and set the text on the entry widget.
-	(management_prepare): If the account name is already taken,
-	generate a unique one by appending " (%d)".
-
-2002-03-07  Radek Doulik  <rodo@ximian.com>
-
-	* mail-account-gui.c (sig_new_html): make edit button sensitive
-	after new signature is created
-	(sig_new_text): ditto
-
-2002-03-07  Anna Marie Dirks  <anna@ximian.com>
-
-	* folder-browser.c: Made all the acclerators in the context menu
-	on a message work. (There are 22 different menu items here, so
-	picking a unique accelerator for each label was tricky, and some
-	of the choices I made are different from the ones I would have
-	made if there weren't so many stinking menu items.)
-
-2002-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (config_import_old_signatures): Don't use an
-	uninitialized 'id'.
-
-2002-03-07  Radek Doulik  <rodo@ximian.com>
-
-	* mail-signature-editor.c: notify accounts dialog about signature
-	content change
-
-	* mail-accounts.c (run_script): run script only if file regular
-	file exists and has x flag
-
-	* mail-signature-editor.c (mail_signature_editor): set initial
-	focus to editor
-	(do_exit): use hasUndo to avoid question dialog when content is
-	unchanged
-
-2002-03-07  Dan Winship  <danw@ximian.com>
-
-	* component-factory.c (add_storage): Update for storage changes:
-	explicitly create a root folder.
-
-2002-03-06  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (mail_display_render): Fix the "don't scroll back
-	to the top of the HTML widget when opening an attachment" hack
-	again by moving it here from mail_display_redisplay(). (It has to
-	happen after the gtk_html_begin.)
-	(mail_display_redisplay): Pass reset_scroll arg to
-	mail_display_render.
-
-	* mail-callbacks.c (do_mail_print): Pass reset_scroll (TRUE) to
-	mail_display_render.
-
-2002-03-05  Dan Winship  <danw@ximian.com>
-
-	* folder-browser-ui.c: Don't try to set pixmap for
-	/Toolbar/MailCompose, since it doesn't exist any more.
-
-2002-03-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (save_service): "use_ssl" can now be 3
-	options, modify the code to handle this.
-	(setup_service): Toggle the correct ssl option.
-	(source_type_changed): Show/hide the ssl hbox container widget.
-	(transport_type_changed): Same.
-
-2002-03-05  Dan Winship  <danw@ximian.com>
-
-	* mail-folder-cache.c (mail_note_store): Pull up assertion change
-	from evolution-1-0-branch to allow external storages.
-
-2002-03-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (mail_unselect): If the clicked column was
-	column 0, enable/disable it.
-	(mail_select): Same.
-
-	* mail-display.c (load_http): Added more debugging code to help
-	figure out why a certain image isn't loading - looks like
-	gnome-vfs is getting a premature EOF?
-
-	* folder-browser.c (my_folder_browser_init): Connect to the
-	focus-in/out events on the message-list so that we can disable the
-	EditInvertSelection and EditSelectThread menu items when the
-	message-list is not in focus.
-
-	* folder-browser-ui.c (folder_browser_ui_message_list_unfocus):
-	New function to de-sensitize some items if the message-list is not
-	in focus.
-	(folder_browser_ui_message_list_focus): New function to sensitize
-	some items if the message-list is not in focus.
-
-	* mail-callbacks.c (invert_selection): Only invert the selection
-	of the message-list if it is the widget in focus.
-
-	* message-list.c (message_list_select): Do not explicitly grab the
-	focus here.
-
-2002-03-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #19303.]
-
-	* mail-ops.c (mail_send_message): Set X-Mailer to say "Ximian
-	Evolution", not just "Evolution".
-
-2002-03-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (forward_message): Forward all selected
-	messages. Fixes bug #21190.
-
-2002-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_text_html): Get the Content-Base if the
-	header exists and use gtk_html_set_base to set this base url.
-
-	* mail-display.c (on_link_clicked): No longer need to calculate
-	the full url. This is now handled by GtkHTML.
-	(on_set_base): Removed.
-	(on_url_requested): No longer need to calculate the full url.
-	(mail_display_initialize_gtkhtml): Don't connect to the set_base
-	signal anymore. We don't care.
-
-	* mail-display.h: No longer need base_url (it was broken anyway).
-
-2002-02-26  Not Zed  <NotZed@Ximian.com>
-
-	* mail-display.c (on_url_requested): If a related part is
-	requested, remove it from the related undisplayed list.
-
-	* mail-format.c (handle_multipart_related): Check if related parts
-	are displayed, if not, remove them.  For #2741.
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* folder-browser.c (folder_browser_search_do_search): rename
-	folder_browser_search_query_changed to this.
-	(folder_browser_gui_init): hook both query_changed and
-	search_activated up to folder_browser_search_do_search, preserving
-	current behavior.
-
-2002-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (on_message_list_built): Removed, this wasn't
-	working as intended and seemed to break other features.
-
-2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (create_component): Add an icon for the "New
-	message" user creatable item.
-
-2002-02-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (on_message_list_built): Connect to our own
-	message_list_built signal. Focus the list and select the first
-	unread message (or frst message depending). Fixes bug #3900.
-
-2002-02-20  Anna Marie Dirks  <anna@ximian.com>
-
-	* message-tag-editor.c (message_tag_editor_init): Gave the editor 
-	window a title and an icon.
-
-2002-02-20  Anna Marie Dirks  <anna@ximian.com>
-
-	* message-tags.glade: Changed the policy for table2 so that it 
-	does not expand/fill. This was necessary to allow the message list 
-	as much growing room as possible. (And besides, there's no reason for
-	table2 to expand/fill; its child widgets can't change size. 
-
-2002-02-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (confirm_goto_next_folder): Prompt the user to
-	find out if he/she wants to go to the next folder with unread mail
-	in it.
-	(find_current_folder): Find a given CamelFolderInfo node based on
-	a given uri.
-	(find_next_folder_r): Recursively look for a CamelFOlderInfo node
-	which has unread messages.
-	(find_next_folder): Given a currently selected CamelFolderInfo
-	node, look for the next node containing unread messages.
-	(do_evil_kludgy_goto_next_folder_hack): Find the currently
-	selected folder and then find the very next folder after it that
-	contains unread messages and then select it via a CORBA call to
-	the shell.
-	(next_unread_msg): If we fail to find an unread message in the
-	message-list, prompt the user to find out if we should jump to the
-	next fodler containing unread messages. If so, call
-	do_evil_kludgy_goto_next_folder_hack().
-
-	* message-list.c (message_list_select): Return a boolean value
-	based on whether the call was successfull or not.
-
-	* mail-config.c (mail_config_get_confirm_goto_next_folder):
-	(mail_config_set_confirm_goto_next_folder):
-	(mail_config_get_goto_next_folder):
-	(mail_config_set_goto_next_folder): All new functions, yay.
-	(config_read): Read in the confirm_goto_next_folder and
-	goto_next_folder config options.
-	(mail_config_write_on_exit): Same the options here.
-
-2002-02-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (basename_from_uri): Ack, strip off the
-	leading '/' char and also only translate if it is a local uri,
-	imap folders and other external folders will be named by the user
-	so no need to translate those.
-
-	* mail-display.c (do_attachment_header): Don't display a
-	down-arrow if the attachment is undisplayable. Fixes bug #6919.
-	(launch_cb): Some programs are buggy when it comes to parsing
-	file: uris, so make sure we do file://%s. Fixes bug #20456.
-
-2002-02-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (basename_from_uri): Replacement for using
-	g_basename and also translates the basename string to fix bug
-	#7160.
-	(mail_account_gui_save): Use basename_from_uri().
-	(folder_picker_clicked): Here too.
-
-	* mail-callbacks.c (mail_generate_reply): Default the from-account
-	to the source account. If that fails, then guess the from-account
-	based on the recipients. Fixes bug #20479.
-
-2002-02-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (drag_data_get_cb): Implement.
-	(drag_data_delete_cb): Implement.
-	(do_attachment_header): Setup Drag & Drop. This implements
-	bugzilla bug #1066.
-
-	* folder-browser-ui.c: Set the followup icon to use the new flag
-	icon rather than the exclamation mark icon.
-
-	* mail-callbacks.c (flag_for_followup): Append the selected
-	messages to the clist in the followp editor.
-
-	* message-list.c: Include the new flag-for-followup icon.
-
-	* message-tag-followup.c (message_tag_followup_append_message):
-	New method to add a message to the message-list.
-	(construct): Get the message_list widget and load the flag icon
-	pixmap.
-
-2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-tag-followup.c (set_widget_values): Fixed a bug.
-
-	* mail-callbacks.c (flag_for_followup): If only 1 message is
-	selected and it happens to already be marked for follow-up, set
-	the value of the flag on the editor so the settings are restored.
-
-	* folder-browser-ui.c: Set the pixmaps on MarkAsRead, MarkAsUnread
-	and MarkAsImportant bonobo verbs. Also connect to
-	flag-for-followup verb.
-	(folder_browser_ui_set_selection_state): Added MessageFollowUpFlag
-	verb to the array of verb strings.
-
-	* folder-browser.c: Set key accelerators on the follow-up
-	right-click menu items to match Outlook.
-
-2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (create_msg_composer): No longer need to call
-	e_msg_composer_show_sig_file(). This gets handled auto-magically
-	by a signal emition when the default From address chooser gets
-	created.
-	(do_forward_non_attached): No longer need to call it here either
-	because e_msg_composer_set_body_text() now makes sure to re-show
-	the signature.
-
-2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (do_forward_non_attached): Show the signature.
-
-2002-02-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (ml_tree_value_at): Get followup-up message-list
-	values. Also highlight the message in red if the due-by date is
-	past due (this is what Outlook does).
-	(ml_duplicate_value): Handle follow-up columns.
-	(ml_free_value): Same.
-	(ml_initialize_value): Here too.
-	(ml_value_is_empty): And here.
-	(ml_value_to_string): And finally here.
-
-	* message-tag-followup.c (message_tag_followup_i18n_name): New
-	convenience function.
-
-2002-02-11  Radek Doulik  <rodo@ximian.com>
-
-	* mail-callbacks.c (create_msg_composer): unset changed, drop
-	editor undo
-	(mail_generate_reply): drop editor undo
-	(do_forward_non_attached): ditto
-	(do_forward_attach): ditto
-	(do_redirect): ditto
-
-2002-02-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (followup_tag_complete): Implemented.
-	(on_right_click): Do better enabling/hiding of unwanted
-	flag-for-followup options.
-
-2002-02-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-tag-followup.c (set_widget_values): Set the correct
-	drop-down menu item.
-	(message_tag_followup_encode): Return NULL if the type is NONE.
-	(clear_clicked): Set the drop-down menu to None.
-	(type_changed): Hide the None menu item.
-	(construct): Create a None menu item and set it as the default.
-
-2002-02-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-tag-followup.[c,h]: New flag-for-followup tag editor
-	dialog.
-
-	* mail-callbacks.c (flag_for_followup): New callback that pops up
-	a flag-for-followup editor dialog.
-	(flag_followup_completed): Marks all flag-for-followup'd messages
-	as 'complete'.
-	(flag_followup_clear): Clears all flag-for-followup tags from the
-	selected messages.
-
-	* message-tags.glade: glade file for tag editors.
-
-2002-02-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-tag-editor.[c,h]: Base class for a message tag editor.
-
-	* folder-browser.c (on_right_click): Setup the hide/enable masks
-	for "Flag for Follow-up"
-
-	* mail-callbacks.c (confirm_expunge): Instead of hiding deleted
-	messages and then expunging, disable the use of the message-list
-	completely during the expunge operation.
-	(expunged_folder): Re-enable the use of the message-list widget
-	here.
-
-2002-02-07  Radek Doulik  <rodo@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): call set_body later to
-	allow ignored words to be sent to gtkhtml control ahead
-
-2002-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* component-factory.c (create_component): remove "New" from user
-	creatable menu item
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* folder-browser.c, folder-browser.h, folder-browser-ui.c,
-	folder-browser-ui.h
-	(folder_browser_ui_setup_view_menus,
-	folder_browser_ui_discard_view_menus): Changed this to use the new
-	GalViewMenus stuff.  Made these exported functions.
-
-	* mail-callbacks.c, message-browser.c: Changed these to not pass
-	the now removed row parameter to message_list_select.
-
-	* mail-config.c, mail-config.h (mail_config_folder_to_safe_url):
-	Refactored this out of mail_config_folder_to_cachename.
-
-	* message-list.c, message-list.h (message_list_select): Removed
-	the row argument.  Changed this to use the new function in ETree
-	for finding the next cursor row that matches a test.
-	(message_list_construct): Handle a failed construction of the
-	ETree here.
-	(message_list_setup_etree, save_tree_state): Don't load or save
-	the header state.  folder-browser-ui.c deals with this now.
-
-2002-02-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_new): Rearranged the #if
-	checks so that we don't ever try to access any smime widgets
-	(since they are now being destroyed) if smime isn't enabled.
-	(mail_account_gui_save): Same here.
-
-	* message-list.c: Removed references to NEEDS_REPLY.
-
-	* mail-callbacks.c (mark_as_needing_reply): Removed.
-	(mark_as_not_needing_reply): Removed.
-	(toggle_need_reply): Removed.
-
-	* folder-browser.c (on_right_click): Remove CAN_MARK_NEEDS_REPLY
-	stuff, this is going to be implemented in an entirely different
-	way.
-
-	* mail-format.c (handle_text_plain): Look for DOCTYPE XML comments
-	too to decide if the message content is really HTML.
-
-2002-02-06  Not Zed  <NotZed@Ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Dont double-free the
-	text body data.
-
-2002-01-31  Not Zed  <NotZed@Ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Add attachments after
-	we've seen if the composer object is valid.
-	(mail_generate_reply): Support new flag REPLY_NO_QUOTE - if set,
-	then dont quote any of the message in the reply.
-
-2002-02-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_new): Destroy the S/MIME
-	frame if not available, instead of just graying it out.  [I would
-	just hide it, but it looks like there is a show_all somewhere so
-	that doesn't work.]
-
-2002-02-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-config.glade: Some touchups from me and Anna.
-
-2002-01-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (composer_get_message): Don't bother setting
-	the auto-cc/bcc recipients here. I'm moving the code to add them
-	in the GUI in the composer so they will already be in the
-	recipient list by this point.
-
-2002-01-31  Radek Doulik  <rodo@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): ignore spell checking of
-	words in addresses, move set_body_text after all ignored words are
-	set so we don't have to spell check whole document again
-	(mail_ignore_address): helper function
-	(mail_ignore): ditto
-
-2002-01-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (mail_edit): Pass the parent window to
-	mail_account_editor_new().
-
-	* mail-account-editor.c (mail_account_editor_new): Set the parent
-	window here because construct() inadvertantly
-	gtk_widget_show_all's the editor.
-
-	* mail-account-gui.c (mail_account_gui_save): Use g_basename()
-	rather than strrchr for '/' especially since the strrchr code
-	wasn't doing any NULL checks.
-
-2002-01-30  Radek Doulik  <rodo@ximian.com>
-
-	* mail-format.c (handle_text_plain_flowed): print quoted text in
-	italic
-
-2002-01-30  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c (create_component): re-enable popup menu.
-	(populate_folder_context_menu): If we're on a vfolder, and its not
-	UNMATCHED, create a change properties item, and set it up
-	approriately.
-	(change_prop_popup): Callback to edit the vfolder rule.  For
-	#3358.
-
-2002-01-29  Dave West  <kat@unleashed.org>
-
-	* mail-callbacks.c (create_msg_composer): Changed the function
-	signature so that we can pass in whom we want to compose as.
-	Should fix bug #10391.
-	(compose_msg): Get the current profile account and pass it along
-	to create_msg_composer.
-	(send_to_url): Pass in a NULL profile account to cause
-	create_msg_composer to use the default account.
-
-2002-01-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_send_message): Make X-Evolution-Account take
-	priority over X-Evolution-Transport. Should we just get rid of
-	X-Evolution-Transport? Anyways, this ought to fix a number of
-	complaints.
-
-	* mail-accounts.c (construct): Don't pass NULL text to
-	gtk_entry_set_text. Maybe this will fix bug #18971.
-
-2002-01-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (redirect): New function that implements the
-	Redirect feature.
-
-	* mail-ops.c (mail_send_message): If we are redirecting a message,
-	get the Resent-* recipients otherwise get the normal To/Cc/Bcc
-	recipients and use them in the CamelTransport::send_to() method.
-
-	* mail-session.c (main_get_filter_driver): Set the beep_func to
-	the beep_cb, not the play_sound_func. Oops ;-)
-
-	* folder-browser-ui.c: Add Redirect bonobo verb thingy here.
-	(folder_browser_ui_set_selection_state): Add MessageRedirect to
-	the proper string arrays.
-
-2002-01-29  Radek Doulik  <rodo@ximian.com>
-
-	* mail-callbacks.c (do_mail_print): initialize line to 0 to make
-	everybody happy ;-)
-	ops, set local_font to NULL
-	(do_mail_print): get rid of static global variables, as they are
-	not thread safe (thanks to clahey for pointing this out)
-	(footer_info_free): unref footer font
-
-2002-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (composer_get_message): Don't bother checking
-	for invalid recipients anymore. If a recipient is invalid, the
-	transport error message will specify that now.
-
-2002-01-28  Radek Doulik  <rodo@ximian.com>
-
-	* mail-callbacks.c (do_mail_print): print footer
-	(footer_print_cb): print page number and number of pages
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/Makefile.am: Use IMPORTERS_CFLAGS. 
-
-2002-01-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (delete_event_cb): We need to return a value
-	here. I think FALSE is fine (I hope).
-
-	* mail-display.c (save_data_cb): Save the pathname.
-	(save_part): Use the new mail_config cruft to get the last used
-	save pathname.
-
-	* mail-config.c (config_read): Read in last_filesel_dir string.
-	(mail_config_write_on_exit): Save the last_filesel_dir setting.
-	(mail_config_get_last_filesel_dir): New
-	(mail_config_set_last_filesel_dir): New
-
-	* component-factory.c (destination_folder_handle_motion): Do some
-	NULL checking on the url before using it.
-	(destination_folder_handle_drop): Make sure the uri is non-NULL
-	before freeing.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: s/MAILER_CFLAGS/EVOLUTION_MAIL_CFLAGS/,
-	s/MAILER_LIBS/EVOLUTION_MAIL_LIBS/.
-
-2002-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (session_system_beep): This wrapper for gdk_beep().
-
-	* mail-account-gui.c (is_email): Don't bother trying to see if the
-	domain looks like a FQDN.
-
-	* mail-callbacks.c (select_all): If the mail-display is in focus,
-	then select-all in the mail display rather than the
-	message-list. Fixes bug #19126.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (create_component): Pass a NULL icon to
-	`evolution_shell_component_add_user_creatable_item()'.
-
-2002-01-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Implements bug #15692
-
-	* folder-browser.c (html_button_press_event): New callback that
-	checks to make sure that the mouse isn't over a link or image in
-	the html view and then calls the on_right_click handler after
-	getting the appropriate args.
-	(my_folder_browser_init): Connect to the button_press_event here.
-
-2002-01-23  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): Define CAMEL_PROVIDERDIR to be the
-	configure.in-defined camel_providerdir. (Was supposed to have been
-	committed a month ago... oops.)
-
-2002-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_filter_folder): Now takes a boolean notify
-	argument. If this is *not* set, then remove the sound-notify
-	filter rule that mail-session adds. Kinda kludgy, but good enough
-	for the moment.
-
-	* mail-callbacks.c (guess_me): Simplified.
-
-2002-01-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_text_plain): If the first "token" in the
-	body is "<html>", then treat this as a text/html part rather than
-	a text/plain part. Fixes bug #16817.
-
-	* component-factory.c (destination_folder_handle_drop): Removed
-	some unused variables.
-
-2002-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (try_uudecoding): Update to match new uudecode
-	interface (ie, no longer need a uulen state variable).
-
-2002-01-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (on_set_base): New callback to handle the
-	set_base signal.
-	(on_url_requested): If the base_url is set, prepend it to the data
-	url (we don't want to do this for cid urls or part urls tho).
-	(mail_display_init): Initialize md->base_url to NULL.
-	(mail_display_destroy): Free the base_url.
-	(mail_display_initialize_gtkhtml): Connect to the set_base signal.
-	(on_link_clicked): If the base_url is set, prepend it to the url
-	string passed to us from gtkhtml.
-
-2002-01-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (do_edit_messages): Don't remove any
-	X-Evolution* headers here, the composer already knows to ignore
-	these. Besides, it needs to know the X-Evolution-Format header.
-
-2002-01-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (composer_save_draft_cb): Do proper refcounting
-	on the draft folder.
-
-	* message-list.c (message_list_select): When performing a
-	wraparound, check to see if the first (or last depending on
-	direction) message fits the selection criteria before telling
-	etable to find the next/previous matching node.
-
-	* mail-account-gui.c (mail_account_gui_new): When connecting to
-	the transport username changed event, pass the gui->transport not
-	the gui->source.
-
-2002-01-08  Iain Holmes  <iain@ximian.com>
-
-	* importers/evolution-mbox-importer.c (string_to_int): Takes a hex
-	string and converts it to an int.
-	(get_info_from_mozilla): Creates a CamelMessageInfo structure from
-	the X-Mozilla-Status header.
-	(process_item_fn): Check for the X-Mozilla-Status header and if it
-	is present call get_info_from_mozilla. If get_info_from_mozilla
-	returns that the message was marked as deleted but never expunged
-	it isn't imported.
-
-	* importers/mozilla-status-headers.h: Stuff Evolution cares about
-	from the mozilla header.
-
-2002-01-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_set_new_mail_notify_sound_file): Renamed.
-	(mail_config_get_new_mail_notify_sound_file): Renamed.
-
-	* mail-accounts.c (notify_radio_toggled): Replace EXEC with
-	PLAY_SOUND.
-	(construct): renamed the exec_command stuff to play_sound.
-
-	* main.c (main): Init and shutdown gnome_sound.
-
-	* mail-ops.c (fetch_mail_fetch): Don't do any new-mail
-	notification here.
-	(filter_folder_filter): call camel_filter_driver_flush.
-
-	* mail-session.c (main_get_filter_driver): Set the filter-driver
-	exec_func here instead.
-
-	* mail-ops.c (mail_fetch_mail): Don't set the filter-driver
-	exec_func here.
-
-2002-01-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (composer_get_message): Add an Organization
-	header.
-
-2002-01-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (list_add_addresses): Simplified. Also no
-	longer needs an "ignore_addr" argument as far as I can tell so
-	that has been removed.
-	(mail_generate_reply): Don't pass an ignore_addr argument to
-	list_add_addresses and also change to use g_strcase_hash and
-	g_strcase_equal since addresses are not case snesitive
-	(mostly). Also, Reply-To can contain multiple addresses, so handle
-	this case too.
-
-2002-01-02  JP Rosevear  <jpr@ximian.com>
-
-	* mail-callbacks.c: remove e_gnome_dialog util functions and use
-	e-util ones instead
-
-2001-12-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	The idea here is that if we consistantly name the movemail file
-	between Send&Receive sessions that if the user cancells the
-	"download" of a mbox spool that the next Send&Receive will not
-	"lose" mail that didn't finish the previous session. Fixes bug
-	#17759. Well, mostly. If you have 200 messages and cancel after
-	the first 100, say, then the next time you hit Send&Receive, it
-	will start over from 1 so you'll end up duplicating the first 100
-	messages, but at least you won't "lose" mail.
-
-	* mail-tools.c (mail_tool_get_local_movemail_path): Now a static
-	internal function, takes a char *uri argument and no longer
-	generates movemail.%d filenames... they are now based on the uri
-	provided.
-	(mail_tool_do_movemail): Pass along the source_uri.
-
-2001-12-20  Jon Trowbridge  <trow@ximian.com>
-
-	* message-list.c (on_click): Makes the auto-undelete behavior when
-	changing message flags a bit more sane. (Fixes #17634)
-
-2001-12-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes #17377, Evolution doesn't work on multi-depth displays.]
-
-	* main.c (main): Push GdkRGB visual and colormap.
-
-2001-12-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (composer_get_message): Add the auto-cc/bcc
-	recipients here. The problem with setting them in the composer is
-	that what if the user changes which account he wants to use? We'd
-	either have to clear the cc/bcc lists *or* we'd have to leave them
-	alone. Either way is bad. We can't just clear the entries because
-	the user may have added addresses since the composer was
-	opened. We don't want to leave any old auto-cc/bcc addresses there
-	because that isn't desirable either. So we give up and add them
-	here after the user has already hit the send button.
-
-	* mail-config.c (account_copy): Update to copy the always-[b]cc
-	options.
-	(account_destroy): Update to destroy the above options.
-	(config_read): Update to read in those values.
-	(mail_config_write): Save those options.
-
-	* mail-account-gui.c (mail_account_gui_new): Setup Always Cc/Bcc
-	widgets.
-	(mail_account_gui_save): Get the user-entered values for the
-	always-cc/bcc stuff.
-
-2001-12-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (setup_service): If the provider is NULL,
-	don't do anything.
-
-	* mail-accounts.c (construct): Oops, no wonder the exec command
-	thing never stuck around... I wasn't getting the right widget from
-	libglade. Also connect to the GtkEntry's changed event since a
-	GnomeFileEntry doesn't have that signal in its ancestry.
-
-2001-12-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (filter_folder_free): Argh, don't notify about new
-	mail here.
-	(fetch_mail_fetch): Notify about new mail here instead.
-
-	* mail-accounts.c (construct): Setup the new-mail-notification
-	widgets.
-	(notify_command_changed): Update the command-line for new mail
-	notification.
-	(notify_radio_toggled): Update the new-mail-notification type.
-
-	* mail-ops.c (filter_folder_free): See if we got any new mail and
-	"sound the alarm" if we did.
-
-2001-12-17  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-format.c (handle_text_plain_flowed): Set citation color to
-	black when we are printing.
-
-	* mail-format.c (attachment_header): Avoid embedding <object> tags
-	when we are printing.
-	(handle_multipart_signed): Don't do the click-for-info signature
-	stuff when we are printing.
-	(handle_via_bonobo): Don't embed an <object> tag if we are
-	printing.
-
-	* folder-browser.c: Changed context_menu[] array so that we can
-	print when the preview pane is closed.
-
-2001-12-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_fetch_mail): Set the filter driver's shell-exec
-	callback.
-
-2001-12-12  Jeffrey Stedfast  <fejJ@ximian.com>
-
-	* mail-config.c (mail_config_check_service): Connect to the
-	destroy signal on the popup dialog.
-
-2001-12-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_text_plain): Make sure i != num_specials
-	after we check for any special text markers. Fixes bug #12265.
-
-2001-12-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (compose_msg): Connect to the save-draft signal.
-	(send_to_url): Here too.
-	(mail_reply): And here...
-	(forward_get_composer): Same.
-	(do_edit_messages): And finally here.
-
-	* mail-format.c (try_inline_pgp):
-	(try_inline_pgp_sig): Start reiplementing The Right Way and not
-	danw's fucking half-assed kludge that doesn't work.
-
-2001-12-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_set_new_mail_notification_command):
-	set the new-mail-notify command.
-	(mail_config_get_new_mail_notification_command): get the
-	new-mail-notify command.
-	(mail_config_set_new_mail_notification): set the
-	new-mail-notification action.
-	(mail_config_get_new_mail_notification): get the
-	new-mail-notification action.
-	(mail_config_write_on_exit): save the new-mail-notification
-	settings.
-	(config_read): Read in the new-mail-notification settings.
-
-	* mail-ops.c (mail_execute_shell_command): New function to execute
-	a shell command async. Will be used for playing sounds on new mail
-	or whatever.
-
-2001-12-11  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-identify.c (mail_identify_mime_part): Fixed for
-	mail_content_loaded's new signature.
-
-	* mail-format.c (attachment_header): Don't convert URLs, etc. if
-	we are printing.
-	(write_address): Don't convert addresses to mailto: links if we
-	are printing.
-	(write_one_text_plain_chunk): Add a printing flag, that we pass
-	along to mail_text_write.
-	(handle_text_plain): Pass our printing flag to
-	write_one_text_plain_chunk.
-	(mail_get_message_rfc822): Don't unneccesarily convert URLs.
-	(mail_content_loaded): Add a GtkHTML parameter.
-
-	* mail-display.c (mail_display_initialize_gtkhtml): Added.  Breaks
-	all of the signal hookups out of mail_display_new.
-	(mail_display_new): Call mail_display_initialize_gtkhtml.
-	(mail_text_write): Don't convert URLs, etc., if we are printing.
-	Lots of other changes to pass around GtkHTML/GtkHTMLStream objects.
-
-	* mail-callbacks.c (do_mail_print): Call
-	mail_display_initialize_gtkhtml on our GtkHTML object.
-
-	* folder-browser.c (update_status_bar): Make the status bar more
-	useful when you have a large number of hidden messages.
-
-	* message-list.etspec: Add ETable magic for our new "Needs Reply"
-	column.  (The next few entries are for bug #90)
-
-	* message-list.h: Add COL_NEED_REPLY.
-
-	* message-list.c: Move mail_need_reply_xpm to the end of
-	states_pixmaps.
-	(ml_duplicate_value): Handle COL_NEED_REPLY.
-	(ml_free_value): Handle COL_NEED_REPLY.
-	(ml_initialize_value): Handle COL_NEED_REPLY.
-	(ml_value_is_empty): Handle COL_NEED_REPLY.  Added
-	needs_reply_map[] array.
-	(ml_value_to_string): Handle COL_NEED_REPLY.
-	(ml_tree_value_at): Fix magic numbers, undoing my changes from the
-	otehr day.  Add handler for COL_NEED_REPLY.
-	(message_list_create_extras): Attach icons for COL_NEED_REPLY.
-	(on_click): Undo my previous changes to display need-reply status
-	in COL_MESSAGE_STATUS.  Add handing for COL_NEED_REPLY.
-
-	* mail.h: Change mail_format_mime_message, mail_format_raw_message
-	and the MailMimeHandlerFn typedef to take GtkHTML and
-	GtkHTMLStream args, as per our changes in mail-format.c.
-
-	* mail-format.c: Giant refactoring.  Remove the assumption
-	throughout that we will always want to render into the GtkHTML
-	object contained in the MailDisplay.  Instead, always pass in the
-	GtkHTML and GtkHTMLStream that we want to write to.  Also, ignore
-	theme work-arounds if the printing flag is set.  (This and what
-	follows fixes bug #82)
-
-	* mail-display.h: Remove GtkHTMLStream *stream from MailDisplay.
-	We don't need it anymore.
-
-	* mail-display.c (mail_display_render): Added.  Breaks the code
-	that renders the message into the GtkHTML object out of
-	mail_display_redisplay.
-	(mail_display_redisplay): Call mail_display_render.
-	(mail_display_init): Remove reference to ->stream.
-	(mail_display_new): Remove reference to ->stream.
-
-	* mail-callbacks.c (do_mail_print): Create a new GtkHTML to render
-	our printed version into (via the new function
-	mail_display_render.  Set the MailDisplay's printing flag to TRUE
-	before we render, and set it back to FALSE afterwards.
-	(do_mail_fetch_and_print): If the preview pane isn't open when we
-	try to print, fetch the message before printing.
-	(print_msg): Call do_mail_fetch_and_print.
-	(print_preview_msg): Call do_mail_fetch_and_print.
-
-	* folder-browser-ui.c: Remove "PrintMessage" and
-	"PrintPreviewMessage" from message_pane_enables... these now work
-	when the preview pane is closed.  Disable printing if multiple
-	messages are selected.
-
-2001-12-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (filter_folder_filter): Don't expunge when we sync
-	anymore, this fixes bug #4472.
-
-2001-12-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-autofilter.c (rule_from_message): Make sure that the
-	message subject is non-NULL beforetrying to base a vfolder rule
-	off it. Fixes bug #16284.
-
-2001-12-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (construct): Connect to the dialog's "destroy"
-	event and close any druids/editors that may be open when that
-	signal is caught. Fixes bug #16501.
-
-	* mail-vfolder.c (vfolder_edit): Set the window title to "Virtual
-	Folders". Fixes bug #16695.
-
-2001-12-05  Radek Doulik  <rodo@ximian.com>
-
-	* mail-callbacks.c (do_mail_print): set paper size to
-	_("US-Letter"), use gtk_html_print_set_master
-
-2001-12-08  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (on_object_requested): Don't just assume all of
-	the GtkHTMLEmbedded's fields are filled in, since HTML messages
-	may have <object>s in them that we're not expecting.
-
-2001-12-07  Dan Winship  <danw@ximian.com>
-
-	* mail-send-recv.c (mail_send_receive): Add a "current_folder"
-	arg.
-	(build_dialogue): Remember the current_folder
-	(free_send_data): If current_folder is set, refresh it so it's
-	guaranteed to be synced with the folder tree. Fixes #14770.
-
-	* mail-callbacks.c (send_receive_mail): Pass current_folder to
-	mail_send_receive().
-
-2001-12-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (stream_write_or_redisplay_when_loaded): Check
-	that the mail-display hasn't been destroyed.
-	(mail_display_redisplay): Same here.
-
-2001-12-07  Dan Winship  <danw@ximian.com>
-
-	* mail-send-recv.c (receive_update_got_store): If updating a store
-	that we don't have an associated storage for, just request a
-	folder tree and then free it. (For the Connector)
-
-	* mail-callbacks.h: Add missing part of Jeff's 12-03 patch so this
-	actually compiles.
-
-2001-12-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_send_message): s/PREVIEW_RELEASE/VERSION_COMMENT
-
-2001-12-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_send_message): Don't append "(Preview Version)"
-	at the end of the version string. Use the PREVIEW_RELEASE #define
-	instead.
-
-2001-12-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-ui.c: Setup the UI for the AddSenderToAddressbook
-	ui verb thingy.
-
-	* mail-callbacks.c (add_sender_to_addrbook): New bonobo-ui
-	callback that adds a sender to the addressbook.
-
-2001-12-04  Jon Trowbridge  <trow@ximian.com>
-
-	* folder-browser-ui.c (folder_browser_ui_set_selection_state):
-	Allow 'n' and 'p' to work when multiple messages are selected.
-	Fixes #12062.
-
-2001-11-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (save_msg_ok): If the path exists, make sure
-	it's a regular file (or we can't possibly save to it). Fix for
-	#14127.
-
-2001-11-28  Jeffrey Stedfast  <fejj@ximian.com>
-	
-	* message-list.c (message_list_select): Cleaned up the code.
-
-	* mail-callbacks.c (previous_unread_msg): Pass wraparound as TRUE.
-
-2001-11-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (pgpopen): Fix the boolean check to be && and not
-	||.
-
-2001-11-20  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser-ui.c: Disable search if no message
-	loaded/viewed.  Also for #14348.
-
-	* folder-browser.c: Disable "Add sender to addressbook" if we dont
-	have a message loaded (it wont work).  For #14348.
-
-2001-11-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (load_content_loaded): Make sure the mail-display
-	object is still "alive" before accessing any of it's data.
-
-2001-11-14  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* mail-autofilter.c (rule_match_recipients, rule_from_message,
-	rule_from_mlist): s/_/U_/ (filter_rule_set_name requires UTF-8 string)
-
-2001-11-14  Dan Winship  <danw@ximian.com>
-
-	* main.c (segv_redirect): Instead of doing pthread_exit() after
-	redirecting the SEGV, try to lock a mutex we know is already
-	locked. This will hopefully help debug a bunch of bugs where the
-	crashed thread seems to be missing from the bug-buddy report.
-
-2001-11-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (pass_got): Call e_passwords_remember_password()
-	for account passwords if the user set the "remember password"
-	checkbox.
-
-2001-11-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vfolder.c (vfolder_load_storage): Add a NULL check for
-	rule->name.
-	(mail_vfolder_add_uri): Same here.
-
-2001-11-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (forward_message): If we already have the
-	message loaded in the mail-display, don't bother re-loading. This
-	happens to fix bug #14848.
-
-2001-11-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-tools.c (mail_tools_x_evolution_message_parse): Was
-	x_evolution_message_parse from folder-browser.c. A space char is
-	no longer used to separate the folder URI and the first uid,
-	instead this is now done with a nul-char so update to parse the
-	newer/better format.
-
-	* component-factory.c (destination_folder_handle_drop): Update to
-	parse the new/better format.
-
-	* folder-browser.c (x_evolution_message_parse): Moved to
-	mail-tools.c
-	(message_list_drag_data_get): Instead of placing a space char
-	after the folder URI, instead use a nul-char.
-
-2001-11-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (pgp_path_changed): Call
-	mail_config_pgp_type_detect_from_path() instead of doing our own
-	lame auto-detection that didn't even work ;-)
-
-	* mail-config.c (auto_detect_pgp_variables): Execute the pgp
-	binary and look at it's version string if we have a version string
-	to compare to.
-	(mail_config_pgp_type_detect_from_path): New function that takes a
-	pgp path and attempts to figure out what pgp version it is.
-
-2001-11-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (try_inline_pgp): Add a "x-inline-pgp-hack=true"
-	paramter to the multipart's content-type.
-
-2001-11-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (construct): Don't make the account editor
-	modal either.
-
-	* mail-accounts.c (mail_add): Use the new global account druid
-	variable so that we can avoid having more than a single druid at a
-	time. If a druid already exists, bring it to the top.
-	(mail_edit): Same idea only for the account editor this time.
-	(mail_editor_destroyed): Set the global editor to NULL.
-	(mail_add_finished): Set the global druid to NULL.
-	(mail_delete): Don't allow any deletes if an account editor is
-	opened (we don't want to be able to delete the account we are
-	editing...)
-	(news_edit): Same thing for the news editor.
-	(news_editor_destroyed): Set the news editor to NULL.
-	(news_add): And again for the news add.
-
-	* mail-account-gui.c (service_check_supported): Updated to pass a
-	GtkWindow argument to mail_config_check_service().
-
-	* mail-config.c (mail_config_check_service): Now takes a GtkWindow
-	argument so we can set our parent window. Also, don't make this
-	dialog modal either.
-
-	* mail-config-druid.c (construct): Don't make this druid modal.
-
-2001-11-05    <NotZed@Ximian.com>
-
-	* message-browser.c (set_bonobo_ui): Override the Move/Copy
-	handlers setup by the folder_browser_ui code, and use our own,
-	because we need to pass it a live window which we can't.
-	(transfer_msg): Our own version of mail-callbacks.c:transfer_msg,
-	so we can properly pass the parent to the user_select_folder.
-	(transfer_msg_done): Also copy this so we can pass it diff args.
-	All fix #13919.
-
-	* mail-callbacks.c (transfer_msg): Set physical/uri to NULL before
-	calling, because althought he shell client api call is supposed to
-	null these out, it doesn't with its stupid assertion checks on
-	entry.  Also free physical to plug a memleak.  Bugs exposed by
-	#13919.
-
-2001-11-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.h (mail_html_write): Renamed from
-	mail_html_write_string.
-
-	* mail-display.c (mail_text_write): Don't bother with varargs
-	since nothing used them, we were only passing strings anyway...
-	(mail_error_printf): Renamed from mail_error_write, this makes
-	more sense.
-	(mail_html_write): Removed.
-
-	* mail-format.c: Updated to use gtk_html_stream_printf directly
-	and s/mail_html_write_string/mail_html_write.
-	(mail_lookup_handler): Don't use %.*s here either...
-	(handle_text_enriched): Same.
-	(write_one_text_plain_chunk): And finally here (also update for
-	new mail_text_write api).
-	(handle_multipart_signed): Update for new mail_text_write api.
-	(format_mime_part): Update for new mail_error_text/printf name
-	change.
-	(handle_multipart_encrypted): Same.
-
-	* mail-tools.c (mail_tool_generate_forward_subject): Same as
-	mail_generate_reply.
-
-	* mail-callbacks.c (mail_generate_reply): Don't use %.*s in any
-	*printf* functions.
-
-2001-11-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c (ml_tree_value_at): Use GINT_TO_POINTER here for
-	platforms where simply casting an int to void * won't work.
-	(build_flat_diff, main_folder_changed): Call
-	e_tree_model_pre_change here.
-
-2001-11-02    <NotZed@Ximian.com>
-
-	* message-browser.c (message_browser_message_list_built):
-	Disconnect from the message_list_built function so we dont do it
-	every time the list is rebuilt.
-
-	* mail-callbacks.c (composer_send_cb): Disable autosave when we're
-	sending mail.
-	(composer_sent_cb): Re-enable autosave.
-
-	* folder-browser-ui.c (fbui_sensitize_timeout): Make sure we reset
-	any data we're using on the folderbrowser before doing anything
-	'cause things could vanish while we're doing it, and also
-	ref/unref the folderbrowser so it doesn't vanish while w'ere
-	working.
-
-	* folder-browser.c (folder_browser_set_ui_component): If we are
-	changing the ui comp, remove any pending timeouts.  For #13719.
-
-2001-11-01  Larry Ewing  <lewing@ximian.com>
-
-	* folder-browser.c (folder_browser_copy): fix cut & paste from the
-	message body.
-
-2001-11-01  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (handle_multipart_signed): Write out the url
-	before callind add_url since add_url may free it. Fixes #13839.
-	Remove debug printf.
-
-	* mail-display.c (on_object_requested): Remove debug printf.
-
-2001-10-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (list_add_addresses): Don't use a
-	case-sensitive comparison.
-
-2001-10-31  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (try_inline_pgp_sig): Make this work again.
-
-2001-10-30  Larry Ewing  <lewing@ximian.com>
-
-	* mail-account-gui.c (delete_event_cb): add delete_event_handler.
-	(menu_file_save_close_cb): add save and close command.
-	(launch_signature_editor): initial the editor as having changed
-	and attach the delete event handler.
-
-2001-10-30    <NotZed@Ximian.com>
-
-	* message-browser.c (d): Turn it off.
-
-	* mail-mt.c: Added exception strings to some of the op logging.
-	
-	* mail-format.c (elide_quotes): Remove, uh, what was this for, its
-	not used anywhere?  Also loops the instant it had a ", good one
-	trow! :)
-	(write_address): Remove name_arg/email_arg, these aren't used
-	anywhere.
-
-	* mail-mt.c (mail_msg_received): If we have a cancellation setup,
-	destroy it immediately, to save fd's.
-	(mail_msg_cancel): Check cancel != NULL.
-	(mail_msg_free): Same.
-
-	* folder-info.c: Comment out the Folder: and you've got mail
-	prints.
-
-	* mail-config-druid.c (wizard_next_cb): If we have a next
-	function, honour if it tells us its going to set the page, and
-	dont set it, otherwise, set it to the next page, unless we're at
-	the end of our pages, and let the wizard do it itself.
-	(wizard_back_cb): Same for going back.  Rest of fix for #12127,
-	see e-shell-startup-wizard for the rest.
-	(next_func): If we're not on the last page, tell the druid we're
-	gonna handle the next button, so we can sync properly with it,
-	needed for above changes.
-	(back_func): Similarly for going back past page 0.
-	(wizard_listener_event): We want to set the page to the actual one
-	asked for not, pagenum-1.
-
-	* mail-local.c (mls_rename_folder): Oops, dont use the url storage
-	path to offset the folder name we're renaming/opening, etc.
-
-	* subscribe-dialog.c (fe_cancel_op_foreach): Argh!!! Dont free the
-	async op data here, the async op is still running and will access
-	it!  Just try to cancel it and mark it as cancelled (id == -1)
-	(fe_done_subscribing): Only remove outselves from the hash table
-	if we're not cancelled.  The handle should always be set here,
-	since this code runs in the gui thread.
-
-	* message-list.c (on_cursor_activated_idle): If nothing
-	selected/cursor not activated, then select no message.
-
-	* mail-folder-cache.c (update_1folder): Make the trash count
-	optional on EVOLUTION_COUNT_TRASH, becuase some lusers are just
-	too stupid to understand what its for.
-
-	* component-factory.c (storage_xfer_folder): Return slightly
-	better error codes for copying folders, since its not implemented
-	yet.
-
-	* mail-vfolder.c, mail-local.c, mail-folder-cache.c,
-	message-list.c component-factory.c, mail-ops.c,
-	subscribe-dialog.c, mail-session.c: d() out some debug printfs,
-	w() out some warnings.
-
-	* folder-browser-ui.c (folder_browser_ui_add_message): Fix typo,
-	Resent->Resend.
-
-2001-10-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (transfer_messages_transfer): Don't warn the user if
-	the source and destination folders are the same.
-
-2001-10-29  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (handle_multipart_signed): add some debug spew re
-	13839.
-
-	* mail-display.c (on_object_requested): here too
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-searching-tokenizer.c (search_info_set_match_size_increase):
-	Fixed a warning by #if 0ing out this function.
-
-	* folder-browser.c, folder-browser.h (on_selection_changed):
-	Update status bar in an idle call.  Fixes Ximian bug #13929.
-
-	* mail-folder-cache.c (folder_renamed, store_folder_renamed):
-	Fixed some warnings here.
-
-2001-10-29  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c (folder_browser_copy): Fix the focus check.
-	It's not fb->message_list that has focus, it's one of its
-	children. #13616.
-
-2001-10-29    <NotZed@Ximian.com>
-
-	* mail-folder-cache.c (store_folder_renamed): Sort the folder
-	updates first, since we dont seem to get them in the right order,
-	or infact in any tree representation whatsoever when using IMAP
-	...? get_folder_info bugs?
-
-	Unrelated note to self, the subscribe dialogue may interfere with
-	the folder cache.
-	
-	* mail-vfolder.c (rule_changed): Copy the folder's full_name
-	before trying to use it to rename.
-	(vfolder_edit_rule): Set 'orig' to be a reference of the original
-	rule.
-	(edit_rule_clicked): Dont lookup orig by name, copy it over
-	instead.
-
-	* folder-browser.c (got_folder): oops, emit signal before
-	unreffing object, incase we got killded during getting folder.
-	(got_folder): Reset get_id.
-	(folder_browser_new): Set get_id of the get_folder task.
-	(folder_browser_init): Init get_id.
-	(folder_browser_destroy): IF we have outstanding 'get folder' op,
-	cancel it.
-
-2001-10-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Call
-	mail_autoreceive_setup() instead of
-	mail_autoreceive_setup_account() since that code was completely
-	broken anyway.
-
-	* mail-send-recv.c (mail_autoreceive_setup_account): Removed. 
-
-	* mail-callbacks.c (transfer_msg_done): Move the message-list
-	cursor to the next message.
-	(transfer_msg): If we are moving messages, then pass
-	transfer_msg_done() to mail_transfer_messages() so when it
-	finishes it can move the cursor to the next undeleted message.
-
-	* mail-format.c (try_inline_pgp): Check that the special PGP lines
-	begin and end with \n so as to avoid matching against quoted PGP
-	lines.
-
-2001-10-28    <NotZed@Ximian.com>
-
-	* mail-callbacks.c (mark_all_as_seen): fb = user_data, not fb =
-	fb!, fixes 13844.
-
-	* mail-local.c (mlf_rename): add the folder name to the path when
-	passing down to the subordinate folder.
-
-	* folder-browser-ui.c (fbui_sensitize_timeout): Remove uic, kill
-	dumb warning.
-
-	* mail-autofilter.c (mail_filter_rename_uri): Implement function
-	for filters to keep track of uri's being renamed.
-	(mail_filter_delete_uri): Similarly for deleting uri's.  Note that
-	these functions are just noops though.
-
-2001-10-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c: Deactivate the Print right-click menu option
-	if the message isn't loaded. Fixes bug #10346.
-
-2001-10-28    <NotZed@Ximian.com>
-
-	* mail-vfolder.c (mail_vfolder_rename_uri): Implemented.
-	(mail_vfolder_rename_uri): We do want to check renamed uri's from
-	vstores.
-	(mail_vfolder_delete_uri): Same.
-	(store_folder_renamed): Fix the folder hash at the same time.
-
-	* mail-folder-cache.c (real_flush_updates): Pass the rename event
-	to vfolder rename uri.
-	(real_flush_updates): Also rename and delete uri's from filters.
-
-	* mail-local.c (mail_local_folder_reconfigure): Change the store
-	path to be same as parent + mbox to be full path.
-	(mls_delete_folder): Change store path to be parent path, and mbox
-	to be full path.
-	(mail_local_folder_reconfigure): Fix a leak of tmpname.
-	(mls_delete_folder): Unref the store when done.
-	(mls_rename_folder): Fix implementation, shell already created
-	destination folder, so we can't just rename :(
-
-	* component-factory.c (xfer_folder): Only do a rename if we have
-	remove set, cleaned up logic a bit.
-	(idle_quit): Put the components still active check last last of
-	all.
-	(storage_create_folder): IF we have a fragment, use that as part
-	part for parent.
-	(xfer_folder): Manually call rename code, since the shell will do
-	a remove/add later on, AND there's no way we can determine the new
-	path from the crock of an api we have to work with.
-
-2001-10-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_format_get_data_wrapper_text): Allow the
-	user to shoot him/herself in the foot when overriding message
-	charsets. Permanantly fixes bug #921.
-
-2001-10-26  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c (etree_key): Work around something that we
-	think is a GtkHTML bug, where sometimes the adjustments have
-	slightly bogus values and scrolling ends up working backwards.
-	(Ximian 4939)
-
-	* mail-display.c (do_signature, do_attachment_header): Set the
-	icon to be 24x24 here so that (assuming it's not a thumbnail), no
-	resizes will have to be queued later. (There's still a bug with
-	the text to the left of the button being drawn twice for some
-	reason though.)
-
-	* mail-callbacks.c (delete_msg): Fix a bug here that makes
-	deleting multiple messages cause a gratuitous message body fetch.
-	(Ximian 12355)
-
-2001-10-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (providers_config): Set the GdkWindow of the
-	FolderBrowser, not the GtkWindow...
-
-2001-10-26    <NotZed@Ximian.com>
-
-	* mail-local.c (mlf_set_folder): Changed to open the source store
-	from '/', so we can do renames across directories.  Of course,
-	this doesn't quite work with different filesystems, but we'll
-	assume this isn't a problem we're going to have.
-	(mail_local_folder_get_type): Setup parent_class.
-	(mlf_rename): Implement folder rename call, rename internal data.
-
-	Is this a security issue?  Well, not really, no more than anything
-	else.
-
-	* mail-folder-cache.c (mail_note_store): Listen to rename event.
-	(store_folder_renamed): Function to handle it, empty.
-	(mail_note_store_remove): Unhook from rename event.
-	(mail_note_folder): Hook onto renamed event.
-	(unset_folder_info): Unhook from renamed event.
-	(folder_finalised): Lock around update.
-	(folder_deleted): Lock around update.
-	(real_flush_updates): If we have a path to remove remove it.
-	(rename_folders): Scan folderinfo's, if we can find ones renamed,
-	rename them, otherwise add them.
-
-	* component-factory.c (owner_unset_cb): Use a timeout not an idle
-	handler.
-	(storage_xfer_folder): Implementation of xfer_folder signal
-	handler, so we can rename imap/vfolders/etc.
-
-	* component-factory.c (owner_unset_cb): Use a timeout not an idle
-	handler.
-
-	* mail-callbacks.c (providers_config): Only set the parent window.
-
-	* mail-accounts.c (mail_edit): Set the parent on the account editor.
-
-2001-10-25    <NotZed@Ximian.com>
-
-	* openpgp-utils.c (openpgp_verify): s/iconv/e_iconv/.
-
-2001-10-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (send_mail_free): Don't forget to unref the filter
-	driver here.
-
-2001-10-25    <NotZed@Ximian.com>
-
-	* folder-browser-ui.c (fbui_sensitize_timeout): So apparently the
-	uicomp can just 'vanish' while we're using it.  Joy.  Take care of
-	that case here, fixes #13482.
-	(fbui_sensitise_item): Check here too just for kicks.
-
-	* mail-folder-cache.c (store_finalised): If we can't destroy our
-	async event, then queue another one to do it.
-	(store_finalised_finish): And handle it here, until we can, then
-	free it.
-	(mail_note_store): Queue an async event to get folderinfo, dont
-	use mail_get_folderinfo.
-	(update_folders_get): thread-async event to retrieve the
-	folderinfo, and build it, then queues gui-async event to update
-	the gui.
-	(add_unmatched_info): Taken from mail-ops, adds unmatched if
-	required.
-	(add_vtrash_info): From mail-ops, add trash if required.
-	(update_folders): Thread async event to update gui.
-	(mail_note_store): Ref the store and storage when created.
-	(update_1folder): Changed to assume we have info_lock, and store
-	updates in an updates list.
-	(setup_folder): Same.
-	(folder_changed): Changed to call update_1folder directly.
-	(real_folder_changed): Removed.
-	(mail_note_folder): Changed to call update_1folder directly.
-	(real_note_folder): Removed.
-	(store_folder_subscribed): Call setup_folder directly.
-	(real_folder_created): Removed.
-	(real_flush_update): Function that actually does the updates in
-	the gui thread.
-	(mail_note_store): Go back to using mail_get_folderinfo.
-	(update_folders): Fixed upf ro changed api's.
-	(unset_folder_info): Changed to queue pending updates.
-	(real_folder_deleted): Removed.
-	(store_folder_unsubscribed): Do the removal work directly.
-	(mail_note_store): Dont link to finalised event of store - we now
-	ref it.
-	(mail_note_store_remove): If we have any pending updates, clear
-	them out.  Also cancel any pending folderinfo retrieve operations.
-	(update_folders): Remove our update from the storeinfo list, if it
-	still exists.
-	(update_1folder): Make 'sent folder shows all counts' optional via
-	an environmental variable EVOLUTION_COUNT_SENT for all those
-	bloody whinging lusers out there.
-	(mail_note_store_remove): Unref the storage when done.
-
-	* mail-mt.c (mail_async_event_emit): If we're in main and have a
-	gui task, set it to run via an idle function.
-	(idle_async_event): Wrapper for calling do_async_event from idle
-	function, and freeing the message when done.
-	(idle_async_event): Call mail_msg_free not free on the finished
-	message.
-
-	* component-factory.c (mail_remove_storage): Destroy the storage
-	async.
-	(store_disconnect): This does the work.
-	(free_storage): Un-note the store when we remove it, so the store
-	noting code can unref things properly.
-	(idle_quit): Return false when done, dont loop.
-
-2001-10-24    <NotZed@Ximian.com>
-
-	* component-factory.c (owner_set_cb): Setup an async_event
-	handler.
-	(idle_quit): Try to destroy the async_event, or keep dropping out
-	if it can't (deadlock).
-
-	* mail-mt.c (do_async_event): Set the threadid of the thread we're
-	running in so we know its running/which thread its in.
-	(mail_async_event_emit): Added new argument 'type' which is the
-	type of thread to execute against, gui or another one.  Fixed all
-	callers.
-	(mail_async_event_destroy): Return -1 if this operation will fail
-	(deadlock possibility).  If we're in the thread of the task
-	we're going to wait for, then return a failure (since we will
-	deadlock).
-	(mail_async_event_emit): Changed to use MailAsyncFunc type as the
-	function type, which just takes 3 void args, change args to suit.
-
-	* mail-folder-cache.c (mail_note_store): Record the pending update
-	events in a pending list.  We should really be able to use an
-	async event for this, but that doesn't return to the gui loop when
-	done :-/
-	(update_folders): Remove from pending update when done.
-
-2001-10-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-send-recv.c (get_receive_type): Check for a NULL provider.
-	(build_dialogue): Check for invalid source urls.
-	(mail_receive_uri): Same.
-
-2001-10-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): No longer need to pass a
-	settext argument.
-	(do_forward_non_attached): Same.
-
-	* mail-format.c (mail_get_message_body): Fix to not always return
-	NULL for html parts, doh!.
-
-2001-10-24    <NotZed@Ximian.com>
-
-	* folder-browser-ui.c (ui_add): 
-	(fbui_sensitize_timeout): Same.
-
-	* folder-browser-factory.c (control_activate): Comment out freeze/thaw.
-	(control_deactivate): 
-
-2001-10-24  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-search.c (mail_search_construct): Fixed some weird casting
-	crack that got in here somehow, removed superfluous box-packing
-	that was generating a gtk warning.
-
-2001-10-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (owner_unset_cb): Unref the global
-	search_context.
-	(owner_set_cb): create the global search_context.
-
-	* folder-browser.c (folder_browser_gui_init): Pass along the
-	global search_context to the e_filter_bar_new call.
-
-2001-10-24    <NotZed@Ximian.com>
-
-	* message-browser.c (message_browser_message_loaded): Call
-	ui_message_loaded when we are.
-
-	* folder-browser-factory.c (control_activate): Freeze/thaw around
-	all updates.
-	(control_deactivate): Freeze/thaw around all updates.
-
-	* folder-browser.c (folder_browser_init): Setup a hashtable to
-	keep track of *our* sensitise state, so we can optimise pushes to
-	bonobo.
-	(folder_browser_finalise): Free hash here.
-	(folder_browser_set_message_preview): Call a ui_message_loaded,
-	even though it isn't, so it updates sensitivities right.
-	(done_message_selected): Call ui_message_loaded when it really is,
-	rather than the very fucked up idea of reversing the loaded_uid
-	check.
-
-	* folder-browser-ui.c (folder_browser_ui_set_selection_state):
-	Dont enable the message-enabled options if the message display is
-	hidden, e.g. print, view headers, etc.
-	(folder_browser_ui_rm_all): Forget sensitise state.
-	(fbui_sensitise_item): Sensitise items via a current-state table,
-	so we dont have to do bonobo calls every time.
-	(folder_browser_setup_property_menu): Call sensitise_item.
-	(folder_browser_ui_add_message): 
-	(folder_browser_ui_add_global): Leave current set_prop "sensitive"
-	for the stop button, so it doesn't get lost by the stuff in
-	mail-mt.c
-	(fbui_real_sensitize_items): Removed.
-	(fbui_sensitize_timeout): Cleaned up, use sensitise_item to do
-	work.
-	(folder_browser_ui_message_loaded): Setup sensitive based on
-	preview_shown too.
-	(folder_browser_ui_set_selection_state): And here too.
-
-2001-10-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (service_check_supported): Don't allow an
-	auth-type to be set when saving the service.
-	(mail_account_gui_new): Initialize the source and transport
-	provider_type's here so we don't forget to do it when it matters.
-	(mail_account_gui_setup): Don't bother setting the provider_type's
-	here, they are already set in mail_account_gui_new() now.
-
-2001-10-23    <NotZed@Ximian.com>
-
-	* mail-display.c (mail_display_destroy): Remove the idle_id when
-	we're destroyed so the idle func doesn't run on an invalid object.
-
-	* message-list.c (regen_list_regened): Dont do anything if we're
-	destroyed #13021.
-
-	* mail-mt.c (mail_user_message): 
-	(mail_get_password): Removed, all functionality moved to
-	mail-session.
-
-	* mail-config.c (mail_config_write_on_exit): Check
-	threaded/preview hash is null before using it, its setup on demand
-	so itmight nto be initialised here.
-
-	* mail-session.c (request_password): Remove password_current
-	stuff.
-	(alert_user): Redont, similar to get_pass.  Do things as async as
-	possible, and dont even wait for a response if we're not asking
-	for the cancel button (this may or may not be right behaviour -
-	need to check).  mail_user_message() code replaced from the stuff
-	in mail-mt.c
-	(MailSession): Added a lock field.
-	(init): Setup lock.
-	(finalise): fRee lock.
-	(register_timeout): Redone.  We now allocate our own 'timeoutid's,
-	and <> to the real things asynchronously.  Use async_event's so we
-	can make sure we have no outstanding ones after shutdown.
-	(mail_session_enable_interaction): If interaction has been
-	disabled, and we have either a message-box open, or a password
-	request open and/or any pending message boxes/passwords, blow 'em
-	away.
-	(main_register_timeout): If we have pending remove of this same
-	timeout, dont do anything.
-	(timeout_timeout): Properly honour the result, remove the timout
-	if it returns false.
-	(do_user_message): Setup the message_destroy_id when we setup the
-	destroy handler so it doesn't get called twice.
-
-2001-10-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (reply_to_sender): Make sure the fb and it's
-	message-list exist.
-	(reply_to_list): same.
-	(reply_to_all): And here...
-	(forward_message): Here too.
-	(forward_attached): Again here.
-	(transfer_msg): Here too.
-	(apply_filters): Same.
-	(select_all): Yet again here...
-	(select_thread): And here.
-	(invert_selection): Same.
-	(flag_messages): Here too.
-	(mark_as_unseen): and here...
-	(mark_all_as_seen): ...
-	(zoom_in): 
-	(zoom_out): 
-	(zoom_reset): 
-	(search_msg): 
-	(load_images): 
-	(save_msg): 
-	(next_msg): 
-	(next_flagged_msg): 
-	(next_unread_msg): 
-	(previous_msg): 
-	(previous_unread_msg): 
-	(expunge_folder): 
-	(configure_folder): 
-	(empty_trash): 
-
-2001-10-23    <NotZed@Ximian.com>
-
-	* mail-mt.c: Added missing errno.h
-	(mail_msg_new): Fix the logic a bit, dont try to open the log file
-	unless logging is actually requested.
-	(mail_enable_stop, mail_disable_stop, do_set_busy,
-	mail_operation_statys): Dont bother propagating events if
-	global_shell_client isn't up yet.
-
-2001-10-23  Dan Winship  <danw@ximian.com>
-
-	* mail-mt.c (mail_msg_new): If the fopen() fails (eg, because
-	evolution-mail was started by oafd with PWD=/), don't try to use
-	the NULL file handle.
-
-2001-10-23    <NotZed@Ximian.com>
-
-	* mail-session.c (get_password): Completely re-done.  We now hae a
-	completely async dialogue when requested from antoehr thread, and
-	dont use gtk_main() if we can avoid it (which is normally the
-	case).  This stuff is only partially finished, and will mena the
-	removal of the same from mail-mt.c, and the mail_user_message()
-	code will be moved here and changed to work in a similar way.
-
-	* mail-callbacks.c (empty_trash): Dont try and connect to remote
-	stores just to get the trash.  Also, always run empty trash async,
-	and make sure we unref the trash.
-	(empty_trash): Hmm, dont unref the trash, causes a problem on
-	exit, i suspect something else is doing funky unrefs on it.
-
-	* mail-tools.c (mail_tool_get_trash): Pass a 'connect' arg, tell
-	it whether it should tryand connect or not to the parent service,
-	if it isn't already connected.
-
-	* component-factory.c (owner_unset_cb): Dont try wait_all here,
-	could potentially deadlock.
-	(idle_quit): Keep returning TRUE if we have outstanding
-	processing.  Note that this may busy-wait during exit processign
-	with busy tasks :(
-	(idle_quit): Keep calling ourselves till we no longer get called
-	(i.e. gtk_main really quits).
-
-	* mail-mt.c (mail_msg_active): New function, returns TRUE if
-	events are still active/outstanding.
-	(do_op_status): @$@$#@@!#@!!  didn't unlock the mail_msg_lock if
-	data->activity was NULL and we had no global_shell_client anymore!
-	Also shortcut processing if this is going to be the case.
-	(mail_msg_init): Setup a temporary other gui_port for redoing with
-	new semantics password, user message and progress reporting.
-	(mail_get_password): #ifdef'd out all this code temporarily, till
-	it gets fully moved to mail-session.c
-
-2001-10-22    <NotZed@Ximian.com>
-
-	* component-factory.c (owner_set_cb): Dont call enable_interaction
-	here.
-	(interactive_cb): But here instead, let the shell tell us when its
-	ok to go interactive.
-
-2001-10-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (write_one_text_plain_chunk): Oops, revert my
-	change to this function.  
-
-	* mail-display.h (mail_html_write_string): New fun macro.
-
-	* mail-format.c (write_one_text_plain_chunk): Use gtk_html_write
-	instead of mail_html_write so we avoid strdup'ing the text.
-	(handle_text_plain_flowed): Use the mail_html_write_string macro.
-	(handle_message_rfc822): Here too.
-	(mail_format_raw_message): We can do it here also...
-	(attachment_header): We can do it a little bit here...
-	(write_address): A microscopic bit here...
-	(write_hr): same.
-
-2001-10-22  Anna Marie Dirks  <anna@ximian.com>
-
-	* mail-config.glade: Added several new accelerators to the edit account
-	dialog, and fixed the focus targets on all existing accelerators. I 
-	was hoping that since the widgets used in the account editor are also 
-	used in the first-time start-up druid and them mail-config druid, 
-	that this would fix all accelerator problems for those druids as well,
-	but there is something wrong with Bonobo which is preventing
-	the druids from responding to their accelerators. Sigh. Anyway,
-	most accelerators in the edit account dialog work correctly 
-	now, though there are few (such as _Full Name) which fail to
-	do anything. I don't know why. 
-
-2001-10-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-stream-gtkhtml.c (mail_stream_gtkhtml_new): New class that
-	wraps writing to a GtkHTML stream so that we don't have to write
-	to an intermediate GByteArray.
-
-	* mail-display.c (on_url_requested): Use the new Camel->GtkHTML
-	stream - this means we don't have to chew up nearly as much
-	memory...yay!
-	(try_part_urls): Here too.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-mt.c (do_op_status): Don't free `clientid' as it's
-	uninitialized.
-
-2001-10-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.etspec (Score): disable this column.  Fixes Ximian
-	bug #12381.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-mt.c: #include "component-factory.h".
-	(do_op_status): Pass the component ID instead of the msg ID.
-
-	* component-factory.h (COMPONENT_ID): #define here instead of
-	`component-factory.c'.
-	(SUMMARY_FACTORY_ID): Likewise.
-
-2001-10-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (format_mime_part): Don't wrap error text with
-	<blockquote>, this is done inside mail_error_write.
-	(handle_multipart_encrypted): If we get an exception trying to
-	decrypt the mime part, display an error rather than trying to
-	treat it as multipart/mixed.
-
-	* mail-callbacks.c (empty_trash): Confirm expunge.
-
-	* folder-browser.c (folder_browser_destroy): Move the folder sync
-	code along with a few other things from folder_browser_finalise()
-	into here instead.
-	(folder_browser_finalise): Moved some cleanup functions into
-	destroy.
-
-2001-10-22  Dan Winship  <danw@ximian.com>
-
-	PGP verification UI changes to make it not HTML spoofable.
-
-	* mail-format.c (handle_application_pgp): Remove this unused
-	hack.
-	(mail_format_mime_message): Initialize a fourth hash table, used
-	to keep track of fake MIME parts.
-	(mail_part_set_default_displayed_inline): New routine to set the
-	default disposition of a part (doesn't change it if the user has
-	already overridden it).
-	(format_mime_part): Wrap a blockquote around the error text (moved
-	here from mail_error_write since it doesn't apply in other cases).
-	(write_hr): Write a <hr> with appropriate padding between MIME
-	parts.
-	(write_one_text_plain_chunk): Write some plain text with
-	appropriate margins.
-	(handle_text_plain): Use write_one_text_plain_chunk. Update for
-	inline specials handler API change.
-	(fake_mime_part_from_data): Use the "fake_parts" hash to avoid
-	recreating the same fake parts again if the message is
-	redisplayed. Lets you toggle the shown/hiddenness of uudecode
-	parts, and do the new pgp verification thing for inline pgp
-	signatures.
-	(try_inline_pgp): Don't do any actual PGP handling here: Just
-	rewrite as a multipart/encrypted.
-	(try_inline_pgp_sig): Likewise, just do a multipart/signed (with
-	the x-inline-pgp-hack parameter set).
-	(try_uudecoding, try_inline_binhex): Update for API changes.
-	(handle_multipart_signed): Exciting and new. Use <object> to
-	create a button which the user must click to do the
-	verification. Change the formatting of the gpg output text a bit.
-
-	* mail-display.c (on_link_clicked): Remove x-evolution-decode-pgp
-	hack, which is no longer used.
-	(pixbuf_gen_idle): Add a hack for the PGP verification button.
-	(do_attachment_header, do_external_viewer): Split out of
-	on_object_requeested for clarity.
-	(do_signature): New routine to do the PGP verification button.
-	(on_object_requested): Now just dispatches to
-	do_attachment_header, do_external_viewer, or do_signature.
-	(mail_error_write): Don't do <blockquote> here. Fixed the problem
-	that was trying to fix elsewhere.
-
-2001-10-22  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (transfer_msg): Fix these functions so they
-	don't crash evolution-mail. Too bad it still crashes in the
-	shell.
-
-2001-10-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (on_url_requested): Use
-	mail_format_get_data_wrapper_text for text parts so we get free
-	charset conversion.
-
-	* mail-format.c (mail_format_get_data_wrapper_text): Renamed from
-	get_data_wrapper_text and now returns a GByteArray.
-	(handle_text_plain): Updated to use the new get_data_wrapper_text.
-	(handle_application_pgp): Same. Wow...also fixed a mem leak and
-	made a bit more efficient by doing so.
-	(handle_text_enriched): Here too. Also use string->len instead of
-	strlen (string->str).
-	(mail_format_raw_message): Same.
-
-2001-10-22    <NotZed@Ximian.com>
-
-	* mail-callbacks.c (mark_all_as_seen): Instead of select_all()
-	then using the tree's selected nodes to iterate, just do it on the
-	folder which keeps the current selection.  Fixes #3658.
-
-2001-10-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c: Call the new move/copy_msg_cb's
-
-	* mail-callbacks.c (move_msg_cb): Renamed from move_msg.
-	(copy_msg_cb): Renamed from copy_msg.
-	(move_msg): The bonobo-ui-component callback.
-	(copy_msg): Same.
-
-2001-10-21    <NotZed@Ximian.com>
-
-	* mail-vfolder.c (mail_vfolder_shutdown): Clear variables once
-	done, for debugging.
-	(mail_vfolder_add_uri, mail_vfolder_delete_uri): Dont do anything
-	if we're shutdown (context == NULL).
-
-	* component-factory.c (idle_quit): Move mail_vfolder_shutdown
-	here, it should be one of the last things shutdown.
-
-	* mail-format.c (handle_text_plain): Dont use (if (!p++), and then
-	check p!= later, since its now 1, oops.  Fixes #13106, thought it
-	was a start of uuencoded stuff!
-
-	* folder-browser.c (on_right_click): Escape _'s before adding them
-	to menu from mailing list name, also remove some dead code that
-	someone forgot to remove when refactoring.  #11307.
-	(folder_browser_is_drafts): Use the store's uri_cmp function to
-	compare to the drafts uri's.
-	(folder_browser_is_sent): Same.  Slight cleanup for #11351.
-
-2001-10-21  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Update for
-	e_msg_composer_add_messages_attachments arg change.
-	(do_forward_non_attached): Likewise.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-display.c (mail_display_new): Don't leak our
-	ESearchingTokenizer.
-
-2001-10-20  Larry Ewing  <lewing@ximian.com>
-
-	* folder-browser-ui.c: hook up zoom functions.
-
-	* mail-callbacks.h: add prototypes.
-
-	* mail-callbacks.c (zoom_in): added.
-	(zoom_out): added.
-	(zoom_reset): added.
-
-2001-10-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (transfer_msg): Allow copy/move to/from vTrash
-	folders as well.
-
-	* component-factory.c (destination_folder_handle_drop): Properly
-	handle local vTrash folders.
-
-2001-10-19    <NotZed@Ximian.com>
-
-	* mail-account-gui.c (build_auth_menu): Dont translate camel strings.
-	(mail_account_gui_setup): "
-
-2001-10-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (destination_folder_handle_motion): Get
-	@folder_type here too [to match the changes in the
-	EvolutionShellComponentDnd interface].  Also, remove a debugging
-	message.
-	(destination_folder_handle_drop): Likewise.
-
-2001-10-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Update to reflect API
-	changes to e_msg_composer_add_message_attachments().
-	(do_forward_non_attached): Same.
-	(providers_config): Oops, pass a GdkWindow instead of a GtkWindow.
-
-2001-10-19    <NotZed@Ximian.com>
-
-	* mail-folder-cache.c (store_finalised): Free folders_uri.
-	(real_folder_deleted): If folder is deleted, remove it from the
-	hashtables.
-
-2001-10-18    <NotZed@Ximian.com>
-
-	* subscribe-dialog.c (get_short_folderinfo_get): Remove the
-	register/unregister, they're already done above us.
-
-	* mail-vfolder.c (vfolder_adduri): Added remove flag - its not
-	adduri, its removeuri, its less typing than creating a removeuri.
-	(vfolder_adduri_do): Implement the remove flag.
-	(mail_vfolder_remove_uri): Changed to mail_vfolder_delte_uri, to
-	indicate its actually been deleted.
-	(mail_vfolder_add_uri): Added remove flag.
-	(rule_changed): When adding existing folders to a new rule, strdup
-	the list data.
-	(mail_vfolder_delete_uri): Dont do any work to remove the actual
-	folder from the vfolder (we'd have to look it up first), let the
-	vfolder remove it itself.  Just update the rules.
-
-	* mail-folder-cache.c (store_finalised): Unhook from all events
-	when done.
-	(mail_note_store_remove): Remove a store from being noted.
-	(free_folder_info): Also if we have a folder, unhook all events.
-	Also remove the uri from vfolders.
-	(mail_note_folder): Remove warning about adding folders to stores
-	that aren't added yet - we might actually be removing the store.
-
-	* component-factory.c (mail_remove_storage): Call
-	mail_note_store_remove when we remove the storage.
-
-2001-10-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (providers_config): Don't make the mail
-	settings dialog modal.
-
-2001-10-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-account-gui.c (folder_picker_clicked): Pass the toplevel to
-	`evolution_shell_client_user_select_folder()'.
-	* mail-callbacks.c (transfer_msg): Likewise.
-
-2001-10-18    <NotZed@Ximian.com>
-
-	* mail-send-recv.c (build_dialogue): call setup_send_data *after*
-	we've setup the global dialogue thingy.
-	(mail_send_receive): Instead of using static local to check for
-	re-running of dialogue, use a global, setup by build_dialogue.
-	These fix #12335.
-	(mail_send_receive): Dont assert dialogue is realized, it might
-	still be being built, so only show if it is realized.
-
-2001-10-18  Dan Winship  <danw@ximian.com>
-
-	* mail-mt.c (mail_call_main): Use G_VA_COPY to make this compile
-	on ppc again.
-	(do_call): Here too.	
-
-2001-10-17    <NotZed@Ximian.com>
-
-	* mail-folder-cache.c (store_folder_subscribed): Clone the
-	folderinfo before passing to async event.
-	(real_folder_created): Free when done.
-	(store_folder_unsubscribed): 
-	(real_folder_deleted): And same here.
-
-	* mail-ops.c (mail_expunge_folder): Use the queued thread for
-	expunging folders.
-
-2001-10-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_send_message): No longer need to copy the
-	description now that camel-exceptions have been fixed.
-
-	* subscribe-dialog.h (subscribe_dialog_show): Helper macro.
-
-	* subscribe-dialog.c (subscribe_dialog_run_and_close): Removed.
-
-	* mail-callbacks.c (check_send_configuration): Don't use
-	gnome_dialog_run_and_close() here, we can easily get away with
-	just using a gtk_widget_show().
-	(providers_config): Don't use a gnome_dialog_run_and_close() here
-	either. No longer need to use e_gnome_dialog utils.
-	(manage_subscriptions): Don't run_and_close().
-
-2001-10-17    <NotZed@Ximian.com>
-
-	* mail-callbacks.c (empty_trash): Only empty trash on enabled
-	accounts, fixes #12821.
-
-2001-10-17  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (write_default_header): Make Reply-To bold too
-	since no one ever figures out why it's not currently.
-
-2001-10-17  Iain Holmes  <iain@ximian.com>
-	
-	* importers/evolution-mbox-importer.c: Fix the typo.
-
-2001-10-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (uid_cachename_hack): Lets put the UID cache in
-	~/evolution/mail/pop3 as this makes more sense than ~/mail/config
-	does. Perform checking to see what flavor cache-path the user is
-	on and compensate.
-
-	* message-list.c (on_cursor_activated_idle): Check that the
-	cursor_uid is non-NULL before emitting a "message_selected"
-	signal. Fixes bug #6015.
-
-2001-10-16  Jon Trowbridge  <trow@ximian.com>
-
-	* e-searching-tokenizer.c (e_searching_tokenizer_begin): Always
-	explicitly clear out the SearchInfo.
-
-2001-10-16    <NotZed@Ximian.com>
-
-	* mail-folder-cache.c: Added an async_event handler to store_info.
-	(mail_note_store): Setup async event handler here.
-	(store_finalised): Flush out async events here.
-	(folder_changed): Use async event handler to emit event.
-	(mail_note_folder): Chagned, do most of the work in the calling
-	context, only do the corba stuff in main.
-	(store_folder_subscribed): Use async event, and do more work locally.
-	(store_folder_unsubscribed): Same.
-	(store_folder_deleted): Call store_folder_unsubscribed if we have
-	to do any work.
-	(store_folder_created): Call store_folder_subscribed if we have to
-	do any work.
-	(store_folder_unsubscribed): Ref store while busy.
-	(real_folder_deleted): And unref here.
-	(store_folder_subscribed): Reg store while busy.
-	(real_folder_created): Unref here.
-	(mail_note_folder): Ref folder while busy.
-	(real_note_folder): And unref here.
-	(mail_note_folder): Hook onto folder_deleted event.
-	(folder_deleted): Just mark this folder as no longer available.
-	
-	* mail-session.c (register_timeout): Use mail_call_main instead of
-	proxy_event.
-	(remove_timeout): Same here.
-
-	* folder-browser.c (folder_changed): use the new mail_async_event
-	stuff.
-	(folder_changed_main): Remove old async event handling stuff.
-	(FOLDER_BROWSER_LOCK/UNLOCK): Removed.
-	(FolderBrowserPrivate): Removed too, sigh.
-	(folder_browser_set_message_preview): Return do nothing if we're
-	destroyed (message_list == NULL).
-	(folder_browser_search_query_changed): "
-	(folder_browser_toggle_preview): "
-	(folder_browser_toggle_threads): "
-	(folder_browser_toggle_hide_deleted): "
-	(folder_browser_set_message_display_style): "
-	(folder_browser_charset_changed): "   All for #12613.
-
-	* mail-mt.c (mail_async_event_new, mail_async_event_emit,
-	mail_async_event_destroy): New functions to handle async events.
-	(mail_proxy_event, mail_proxy_event_id): Removed old functions for
-	async events.
-	(do_call): Add suport for MAIL_CALL_p_pp.
-	(mail_msg_free): Use mail_async_event instead of proxy_event.
-
-	* message-list.c (message_changed): Promote the message_changed to
-	a folder_changed and use main_folder_changed to process it.
-	(main_message_changed): Remove.d
-	(message_list_init): Setup async event handler.
-	(message_list_destroy): Remove async handler.
-	(folder_changed): Use async hanler to emit event in main loop.
-	(message_changed): Same.
-
-	* mail-mt.c (mail_proxy_event_id): New function to return the id
-	of the currently executing proxied event.
-
-	* folder-browser.h: Added private field.
-
-	* folder-browser.c (folder_changed): Keep track of tasks
-	outstanding in the tasks list, locked access.
-	(FOLDER_BROWSER_LOCK, UNLOCK): Macros to lock the folder browser
-	for poking about in diff threads.
-	(folder_browser_finalise): Wait for any outstanding takss to
-	finish before cleaning ourself up.
-	(folder_browser_destroy): Move the seen_id handling to finalise,
-	also add a loading_id handling code.
-	(main_folder_changed): Remove our running task when done.
-
-2001-10-15  Larry Ewing  <lewing@ximian.com>
-
-	* mail-display.c (mail_error_write): don't write strings longer
-	than they actually are.
-
-2001-10-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (folder_browser_destroy): Remove the mark_seen
-	timeout.
-
-2001-10-15  Larry Ewing  <lewing@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): don't apply the body
-	text in replys since we will just replace it anyway.
-
-2001-10-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (owner_unset_cb): Call
-	mail_vfolder_shutdown.
-
-	* mail-vfolder.c (mail_vfolder_shutdown): Unref all of our
-	VFolders.
-
-	* mail-folder-cache.c (real_note_folder): Remember to unref the
-	folder before returning if we have already noted this folder.
-
-2001-10-15    <NotZed@Ximian.com>
-
-	* mail-session.c (get_password): Proxy get-password call to main
-	thread.
-	(forget_password): same for forget_password.
-	(get_filter_driver): and same for get_filter_driver, since it uses
-	gtk objects.
-
-	* mail-mt.c (mail_call_main): new generic interface for calling
-	stuff/proxying in the gui thread.
-
-2001-10-14  Jon Trowbridge  <trow@ximian.com>
-
-	* e-searching-tokenizer.c (e_searching_tokenizer_clone): Share
-	more state between the parent and its clones, so that our multiple
-	tokenizers don't get out of sync when we are rendering frames and
-	iframes. (Bug #11638)
-
-2001-10-13  Jon Trowbridge  <trow@ximian.com>
-
-	* e-searching-tokenizer.c (search_info_compare): Bad hacker!
-	Don't implicitly assume that utf8 characters are one byte in size!
-	(Bug #9520)
-	(e_searching_tokenizer_begin): As long as I'm touching those code:
-	don't increase the size of search matches.  I'll fix the colors
-	later. (part of bug #11589)
-
-2001-10-13  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (create_msg_composer): Don't emit a gtk warning
-	if the composer creation fails.
-
-2001-10-12  Dan Winship  <danw@ximian.com>
-
-	* message-list.c, message-list.h, message-list.etspec: Revert the
-	change to remove the Score column until Chris can fix ETable so
-	it's possible to remove a column without breaking everyone's
-	exisiting settings.
-
-2001-10-12  Iain Holmes  <iain@ximian.com>
-
-	* importers/evolution-mbox-importer.c (load_file_fn): Don't ever create
-	the folder here. Wait until the shell has created it. Otherwise we get
-	loads of race conditions where the mailer can create a subfolder before
-	the shell has registered the parent.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* main.c (main): call e_passwords_init and e_passwords_shutdown.
-
-	* mail-session.h: add prototypes for
-	mail_session_{get,add}_password.
-
-	* mail-session.c (init): empty this out - we use e_passwords
-	instead of a local hashtable.
-	(get_password): use e_passwords_get_password and
-	e_passwords_add_password.
-	(forget_password): use e_passwords_forget_password.
-	(mail_session_remember_password): use
-	e_passwords_remember_password.
-	(mail_session_forget_password): use e_passwords_forget_password.
-	(mail_session_get_password): new function, use
-	e_passwords_get_password.
-	(mail_session_add_password): same, use e_passwords_add_password.
-	(mail_session_forget_passwords): use e_passwords_forget_passwords.
-
-	* mail-config.c (mail_config_write_on_exit): fix this up so it
-	works as desired with the e_passwords stuff.
-
-2001-10-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (mail_error_write): Convert URLS so we can get
-	clickable links.
-
-	* message-list.c: Removed score stuff.
-
-2001-10-12  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-display.c (html_button_press_event): Store our listener id.
-	(popup_info_free): Disconnect our listener when we free the popup.
-	(Bug #11040)
-
-2001-10-11  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-callbacks.c (addrbook_sender): Listen for "destroy" events
-	from the control, so that we don't leave stray windows laying
-	around. (Bug #9101)
-
-2001-10-11    <NotZed@Ximian.com>
-
-	* local-config.glade: Added a checkbox for body indexing.
-
-	* mail-local.c (mail_local_reconfigure_folder): Get index_body
-	widget.
-	(mail_local_folder_reconfigure): Add an 'index_body' argument &
-	implement.  Dont do anything if nothing changed.
-
-	* openpgp-utils.c (openpgp_verify): Use e_iconv_open.
-
-2001-10-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (do_forward_non_attached): Attach the message
-	attachments. Fixes bug #5439.
-
-2001-10-11  Dan Winship  <danw@ximian.com>
-
-	* mail-folder-cache.c (update_1folder): No longer need to pass
-	folder display name to storage update_folder methods.
-	(setup_folder, free_folder_info): Meaning we no longer need to
-	keep track of it.
-
-	* evolution-outlook-importer.[ch], evolution-mbox-importer.[ch]:
-	These copies are cruft. The real ones are in importers/.
-
-2001-10-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (free_storage): Make sure the
-	service/storage are non-NULL.
-
-	* mail-callbacks.c (e_gnome_dialog_parent_destroyed): Call
-	gtk_main_quit.
-	(send_receive_mail): Don't use e_gnome stuff since this doesn't
-	need to be run using gnome_dialog_run_and_close().
-	(composer_send_cb): Same.
-	(edit_msg): Here too.
-	(resend_msg): And here.
-	(search_msg): Same.
-	(filter_edit): Here too.
-	(filter_edit): Don't use e_gnome_dialog_set_parent() because we
-	don't do gnome_dialog_run_and_close on this dialog.
-	(e_gnome_error_dialog_parented): Removed.
-	(e_gnome_ok_dialog_parented): Removed.
-
-2001-10-10  Dan Winship  <danw@ximian.com>
-
-	* mail-config.c (new_source_created): Fix up the logic here.
-
-2001-10-10  Larry Ewing  <lewing@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): use new function to copy
-	the attachments from the source message.  This still isn't perfect
-	but it should avoid the problems with headers being transfered.
-	This makes images in replies work again.
-
-	* mail-display.c (save_url): copy the data.  We can't ref the byte
-	array and we can't free it so we have to copy it.
-
-2001-10-10    <NotZed@Ximian.com>
-
-	* mail-ops.c (transfer_messages_transfer): IF the source and
-	destination folders are the same, do nothing.  Oh, and return an
-	error, otherwise the shell goes and removes it anyway.  Fixes a
-	rather serious bug with dnd of folders onto their current
-	location.
-
-2001-10-09  Larry Ewing  <lewing@ximian.com>
-
-	* mail-display.c (save_part): ref the part.
-	(save_destroy_cb): new function to unref the part when we have
-	closed the dialog.
-	(save_url): fake a mime part so that we can save data urls without
-	extra effort.  This is less sucky than it seems since it handles
-	filenames and ref counting with minimal fuss.
-
-2001-10-09    <NotZed@Ximian.com>
-
-	* component-factory.c (owner_unset_cb): Disconnect from all the
-	signals we were listening to, so we dont try and do shit twice on
-	exit (one on unset_cb, one on destroy).
-	(create_component): Setup the signal handlers using a table, so
-	they're easier to disconnect on finish.
-
-	* mail-folder-cache.c (folder_changed): Ref folder so it hangs
-	around till we're done with it.
-	(real_folder_changed): Unref folder when we are done with it.
-	Should fix #11981.
-
-2001-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (done_message_selected): Make sure the
-	mail-display is non-NULL.
-
-2001-10-09    <NotZed@Ximian.com>
-
-	* mail-local.c (mlf_search_by_uids): Implement.
-
-2001-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-ui.c (folder_browser_ui_add_message): Create a
-	chaqrset picker submenu in the View menu.
-
-	* mail-format.c (mail_format_raw_message): Pass the mail-display
-	to get_data_wrapper_text.
-	(get_data_wrapper_text): Use the user's override charset if one is
-	provided, otherwise user the user's default charset.
-	(handle_text_plain): Pass along the mail-display to
-	get_data_wrapper_text.
-	(handle_application_pgp): Same.
-	(handle_text_enriched): Here too.
-	(mail_get_message_body): Pass NULL as the mail-display to
-	get_data_wrapper_text since we don't have access to a
-	mail-display.
-
-	* mail-display.c (mail_display_set_charset): New function to set a
-	charset on the maildisplay. Once set, the message is redisplayed
-	using the new charset.
-	(mail_display_destroy): Free the charset.
-
-	* folder-browser.c (folder_browser_charset_changed): New callback
-	for when a user overrides the message charset.
-
-2001-10-09  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (e_gnome_dialog_set_parent): Use
-	gtk_signal_connect_while_alive here so
-	e_gnome_dialog_parent_destroyed doesn't get called on an
-	already-destroyed dialog.
-
-	* mail-config-druid.c (*_prepare): Record which page we're
-	currently in.
-	(*_changed): Only update the druid buttons if we're the current
-	page. Fixes a problem that could make it impossible to get beyond
-	the first page of the setup wizard.
-
-	* mail-callbacks.c (mail_generate_reply): Revert the change to use
-	e_msg_composer_new_with_message. That has unwanted side effects.
-	(This commit re-breaks replying to HTML messages with inline
-	images.)
-
-2001-10-08  Dan Winship  <danw@ximian.com>
-
-	* mail-local.c (mlf_set_folder, mlf_unset_folder): Update for
-	folder_flags.
-
-	* folder-browser-ui.c (folder_browser_ui_add_list): Check
-	CAMEL_FOLDER_IS_TRASH flag rather than checking
-	CAMEL_IS_VTRASH_FOLDER.
-
-	* folder-browser.c (folder_browser_toggle_hide_deleted): Likewise
-
-	* message-list.c (message_list_set_folder): Likewise.
-	(message_list_set_hidedeleted): Remove redundant trash check.
-
-2001-10-08  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-format.c (write_default_header): Write out the Bcc: header
-	when applicable.  Fixes bug #5823.
-
-2001-10-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (attachment_header): Convert the htmlinfo into
-	utf8. Fixes bug #11966.
-
-2001-10-08  Dan Winship  <danw@ximian.com>
-
-	* component-factory.c (create_view): For mailstorage folders,
-	connect to the control's "activate" signal, and don't try to
-	connect to the store.
-	(storage_activate): Instead, do it here, so if the connection
-	fails, or the user cancels, or whatever else, he can try again
-	later.
-
-2001-10-07  Dan Winship  <danw@ximian.com>
-
-	* mail-tools.c (mail_tool_do_movemail): Remove #ifndef
-	MOVEMAIL_PATH code, since the setting of that variable has been
-	meaningless for a while now, and the rest of the code DTRT whether
-	that code executes or not.
-
-2001-10-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-mt.c (pass_got): Fix a merge-conflict leftover.
-
-2001-10-05    <NotZed@Ximian.com>
-
-	* folder-browser.c: reformatted the menu tables so they're a bit
-	more bloody readable.
-
-	* mail-folder-cache.c (mail_note_store): Hook into
-	subscribed/unsubscribed events.  Only 'add/remove' folders from
-	the add/removed events if we aren't subscribed, otherwise use the
-	subscribed events.  Rest of fix for #11831
-
-2001-10-05  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-config.glade: Add toggle button to config menu to turn the
-	"confirm sending unwanted HTML" dialog on/off. (Bug 10794)
-	
-	* mail-accounts.c (construct): Make said toggle button actually
-	work.
-
-2001-10-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (e_gnome_dialog_set_parent): New convenience
-	function that not only sets the gnome-dialog's parent window but
-	also makes sure that the gnome-dialog closes when it's parent
-	closes.
-	(e_gnome_warning_dialog_parented): New conmvenience wrapper around
-	the libgnomeui version that also does the same thing as
-	e_gnome_dialog_set_parent.
-	(e_gnome_error_dialog_parented): Same.
-	(e_gnome_ok_dialog_parented): And again...
-	(e_gnome_ok_cancel_dialog_parented): And once again.
-
-2001-10-05  Larry Ewing  <lewing@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): use
-	e_msg_composer_new_with_message rather than e_msg_composer_new.
-	This way we bring in all the attachment of the message we are
-	replying to.
-
-2001-10-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c (message_list_setup_etree): Turn on
-	"uniform_row_height" argument.
-
-2001-10-04    <NotZed@Ximian.com>
-
-	* folder-browser.c (update_status_bar): Show "nn sent" as total in
-	sent folder, rather than just 'total'.
-
-	* mail-folder-cache.c (update_1folder): Also show total message
-	count for sent_folder.
-
-	* folder-browser-ui.c (folder_browser_setup_property_menu): Do a
-	better job of setting up the name.  Also de-sensitise when we
-	can't configure the folder.
-
-2001-10-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (providers_config): Set the parent window as
-	the fb. This fixes bug #11723.
-	(filter_edit): Do the same thing here too and also to the warning
-	dialog.
-	(edit_msg): Set the parent on the warning dialog.
-	(resend_msg): And here.
-	(search_msg): Here too.
-	(confirm_expunge): Set the parent window on the dialog here too.
-	(save_msg_ok): Same here.
-
-	* mail-accounts.c (images_radio_toggled): Ignore the signal if the
-	radio button is not "on". This fixes bug #10532 because the on/off
-	signals don't always come in the off->on order.
-
-	* mail-ops.c (mail_send_message): Reduced some redundancy.
-
-2001-10-04  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (write_address): Fix so that an email address with
-	no name is once again just "foo@bar.com", not "<foo@bar.com>".
-
-2001-10-04  Iain Holmes  <iain@ximian.com>
-
-	* importers/evolution-mbox-importer.c (load_file_fn): Only pass
-	CAMEL_STORE_FOLDER_CREATE when the shell will be creating the 
-	folder.
-
-2001-10-04    <NotZed@Ximian.com>
-
-	* mail-callbacks.c (configure_folder): If we're accessing a
-	vfolder uri, then popup the vfolder editor instead of trying the
-	mail local one.
-
-	* mail-vfolder.c (vfolder_edit_rule): Edit a vfolder by name.
-
-2001-10-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Added some more NULL
-	checks.
-
-2001-10-04    <NotZed@Ximian.com>
-
-	* component-factory.c (storage_remove_folder): Do the url
-	fragment/path -> folder name hack.  Removing vfolders from shell
-	works now?
-
-2001-10-03    <NotZed@Ximian.com>
-
-	* mail-send-recv.c (build_dialogue): Only build destination data
-	if we have destination != NULL.  Fixes crash of bug #10835.
-
-	* folder-browser.c (folder_browser_config_search): Set 'to' ->
-	'recipient' data for search object.  #6199.
-
-	* mail-local.c (local_storage_new_folder_cb): Handle vtrash case,
-	emit 'folder_created' event for the folder-cache to work, etc.
-
-2001-10-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_write_authenticity): Don't use the wax-seal
-	icons for the pgp stuff anymore, use Jimmac's new icons instead.
-
-2001-10-03    <NotZed@Ximian.com>
-
-	* mail-folder-cache.c (folder_changed): Dont wait for event to
-	finish before returning.  This could however mean we process it
-	after things have vanished below us?  Fixes another case of ctrl-d
-	deadlock.
-
-	* folder-browser.c (update_status_bar): If we have hide deleted
-	set, then dont count deleted messages in the 'total' messages
-	count.  Fixes #6591.
-
-	* mail-ops.c (add_vtrash_info): If we have a fragment, override
-	that, rather than the path.  Fixes #5251.
-	(remove_folder_get): Freeze/thaw around deleting all messages in
-	folder.
-
-2001-10-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/Makefile.am: add $BONOBO_GNOME_CFLAGS to make it work
-	with latest Bonobo
-
-2001-10-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (transfer_msg): Pass an empty flags argument to
-	mail_transfer_messages - destination folder should already be
-	created by this point.
-
-	* folder-browser.c (message_list_drag_data_received): Pass an
-	empty flags argument to mail_transfer_messages.
-	(selection_received): Same.
-
-	* component-factory.c (xfer_folder): Pass the CREATE flag to
-	mail_transfer_messages() so that the dest folder gets created.
-	(destination_folder_handle_drop): Update for mail-ops API change.
-
-	* mail-ops.c (mail_transfer_messages): Now takes a dest_flags
-	argument that it passes along to mail_tool_uri_to_folder when
-	opening the destination folder.
-
-2001-10-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vfolder.c (vfolder_setup_do): Pass an empty flags argument
-	to mail_tool_uri_to_folder.
-	(vfolder_adduri_do): Same.
-
-	* mail-session.c (get_folder): Pass an empty flags argument to
-	mail_tool_uri_to_folder.
-
-	* mail-send-recv.c (receive_get_folder): Pass an empty flags
-	argument to mail_tool_uri_to_folder.
-
-	* mail-ops.c (get_folder_get): Pass the flags to
-	mail_tool_uri_to_folder.
-	(mail_get_folder): Now takes a flags argument.
-	(remove_folder_get): Pass an empty flags argument to
-	mail_tool_uri_to_folder.
-	(mail_send_message): Pass an empty argument flag to
-	mail_tool_uri_to_folder.
-	(transfer_messages_transfer): Same. Destination folder should
-	already be created by this time.
-
-	* folder-info.c (do_get_info): Pass an empty flags argument to
-	mail_tool_uri_to_folder.
-
-	* importers/evolution-mbox-importer.c (folder_created_cb): Pass
-	the CREATE flag here too.
-	(load_file_fn): And here.
-	(load_file_fn): And here too.
-
-	* importers/evolution-outlook-importer.c (load_file_fn): Pass the
-	CREATE flag to mail_tool_uri_to_folder.
-
-	* folder-browser.c (folder_browser_new): Pass an empty flags
-	argument.
-	(x_evolution_message_parse): Pass an empty flags argument to
-	mail_tool_uri_to_folder.
-
-	* component-factory.c (create_folder): Pass a CREATE flag to
-	mail_get_folder here too.
-	(owner_set_cb): And here.
-	(xfer_folder): Shouldn't need the CREATE flag here, so not passing
-	any flags.
-	(destination_folder_handle_drop): Same.
-
-	* mail-local.c (mail_local_store_add_folder): Pass a CREATE flag
-	to mail_get_folder.
-	(reconfigure_folder_reconfigure): Pass an empty flags argument to
-	mail_tool_uri_to_folder.
-
-	* mail-tools.c (mail_tool_uri_to_folder): Take a flags argument.
-	(mail_tool_get_local_inbox): Pass an empty flags argument to
-	mail_tool_uri_to_folder.
-
-2001-10-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-account-gui.c (launch_signature_editor): Use
-	`bonobo_ui_component_new_default()', not
-	`bonobo_ui_component_new()'.
-
-2001-10-01  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-display.c (on_url_requested): Make sure we aren't dealing
-	with a pathological message w/o a From: header.
-	(ebook_callback): Properly check that the address we queried
-	matches the address on the current message. (Bug #10038)
-
-2001-10-01  Iain Holmes  <iain@ximian.com>
-
-	* component-factory.c (component_factory_init): Check for errors.
-	
-	* mail.h: Change prototype for evolution_folder_info_factory_init.
-
-	* folder-info.c (evolution_folder_info_factory_init): Return TRUE
-	or FALSE.
-
-	* mail-config.c (evolution_mail_config_factory_init): Return TRUE or
-	FALSE.
-
-	* mail-config.h: Change prototype for above.
-
-2001-10-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vfolder.c (mail_vfolder_remove_uri): replace my_list_find()
-	== NULL with my_list_find() != NULL.
-
-2001-10-01  Dan Winship  <danw@ximian.com>
-
-	* component-factory.c (mail_load_storage_by_uri): create storages
-	for providers that are STORAGE and aren't EXTERNAL, rather than
-	"(STORAGE and REMOTE) or spool, maildir, or vfolder".
-	(mail_remove_storage_by_uri): Use the same rule here (which makes
-	it possible now to remove maildir and spool stores now, which
-	weren't properly special-cased before). Remove some CamelException
-	misuse.
-
-	* mail-config.c (new_source_created): Fix up the broken INBOX-
-	shortcut-generating assumption a little by only assuming that if
-	you call camel_store_get_inbox(), that its full_name is the same
-	as its path. (This happens to always be true for inboxes now, and
-	will be always true by definition at some point in the future.)
-	Now maildir stores get working Inbox shortcuts.
-
-	* mail-send-recv.c (get_receive_type): If PROVIDER_IS_STORAGE
-	then use SEND_UPDATE, if not, use SEND_RECEIVE.
-
-	* mail-local.c (local_provider): The local provider is EXTERNAL.
-	(The shell creates it.)
-	(mail_local_reconfigure_folder): Allow reconfiguring between
-	IS_LOCAL providers.
-
-	* mail-accounts.c (news_delete): Don't need to check the provider
-	flags here... we know nntp is a STORAGE.
-
-2001-10-01  Dan Winship  <danw@ximian.com>
-
-	* mail-local.c (mail_local_reconfigure_folder): Don't use
-	mail_tool_get_folder_name here since that function only existed to
-	be clever in a certain case that this is not.
-	(reconfigure_folder_free): Remove the dialog from the hash table
-	here so that it gets removed in the successfully-reconfigured case
-	too. Don't unref folder_out if it never got set.
-	(reconfigure_clicked): Remove the hash table code from here; it's
-	in reconfigure_folder_free now.
-
-	* mail-tools.c (mail_tool_get_folder_name): No longer used by
-	anything.
-	(mail_tool_get_folder_from_urlname): Also not used anywhere.
-
-2001-10-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-tools.c (mail_tool_uri_to_folder): Don't pass the CREATE
-	flag, we shouldn't ever need this...
-
-2001-10-01  Larry Ewing  <lewing@ximian.com>
-
-	* mail-identify.c (mail_identify_mime_part): if gnome-vfs returns
-	application/octet-stream with the magic check, use the filename
-	check instead since it at least has a chance of being useful.
-
-2001-09-28  Dan Winship  <danw@ximian.com>
-
-	* folder-browser-ui.c (fbui_sensitize_timeout): wrap a
-	bonobo_ui_component_freeze/thaw around all of the set_props so
-	they all update at once.
-
-2001-09-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (construct): Don't create checkboxes for global
-	Threaded or Preview options as they are now removed.
-
-2001-09-28    <NotZed@Ximian.com>
-
-	* component-factory.c (owner_set_cb): Setup vfolder storage before
-	all others.
-
-	* mail-local.c (mail_local_store_remove_folder): Emit
-	folder_deleted event.
-	(remove_find_path): Fix, compare against path, not full_name.
-
-	* mail-tools.c (mail_tool_uri_to_folder): Dont
-	vfolder_register_source anymore.
-
-	* mail-vfolder.c (rule_changed): Changed to access
-	mail_fodler_cahce to find out if the folder exist yet before
-	trying to open them, also use the cache as a cache so we dont have
-	to open the folder if its already been opened.
-	(vfolder_register_source, register_source): Removed.
-	(source_finalise): Removed,
-	(check_source): Removed.  All handled through diff mechanism.
-	(mail_vfolder_add_uri): New function, records uri's of available
-	folders, and adds them to any active vfolders if required.
-	(mail_vfolder_remove_uri): New function, removes a uri from
-	available folders, and checks any rules to see fi they need
-	updating.
-	(vfolder_adduri): New async function to add a uri to all vfolders
-	that need it.
-	(store_folder_deleted): oops!  free user, not rule!!
-
-	* mail-folder-cache.c: Add uri->folderinfo hashtable, and the
-	store from which they come into the store info struct.
-	Add uri to the folder_info.
-	(setup_folder): Store the uri in the folderinfo.
-	(setup_folder): And the uri in the folder_uri hashtable.
-	(mail_note_store): Store the store in the storeinfo, and setup the
-	folders_uri hashtable via the store's hash functions.
-	(setup_folder): Call mail_vfolder_add_uri to note this newly setup
-	folder uri.
-	(store_folder_deleted): Proxy call to main thread.
-	(real_folder_deleted): And tell the vfolder to remove this uri
-	from its folder list.
-	(setup_folder): Dont call vfolder_add_uri if noselect is set on
-	the uri.
-
-2001-09-27    <NotZed@Ximian.com>
-
-	* mail-vfolder.c: Removed vfolder_info struct, vfolder_storage.
-	Neither used anymore.
-
-2001-09-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_get_account_by_transport_url): Use
-	Camel to compare the urls rather than using e_url_equal which does
-	all sorts of funky shit that may not work in every case.
-
-2001-09-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-local.c (mail_local_provider_init): Setup the url_hash and
-	url_equal functions for the local provider.
-
-	* mail-account-gui.c (mail_account_gui_save): Add code here to
-	check to make sure that the Drafts and Sent folders are pointing
-	to valid urls. This is kinda nasty and only really solves the case
-	where the user changes, say, his imap server or
-	something. Unfortunately we still have the problem where if
-	account A's sent/drafts folders point to account B's store and the
-	user changes the url for account B.
-
-	* mail-config.c (mail_config_get_account_by_source_url): Use Camel
-	to compare the urls rather than using e_url_equal which does all
-	sorts of funky shit that may not work in every case.
-
-2001-09-28  Dan Winship  <danw@ximian.com>
-
-	* mail-mt.c (pass_got): Don't call
-	mail_config_service_set_save_passwd if we didn't find a service.
-
-2001-09-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-config.c (add_shortcut_entry): Just add the shortcut to the
-	first group.
-
-2001-09-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-ui.c (folder_browser_ui_add_list): Call
-	folder_browser_toggle_threads() here after setting the value. This
-	should fix bug #6415 and if it doesn't, then this whole deal is
-	just a lost cause.
-
-	* mail-mt.h: Added mail_msg_cleanup() prototype.
-
-2001-09-28  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (get_data_wrapper_text): Deal with
-	camel_mime_filter_charset_new_convert returning NULL. (Every other
-	call to it does, and something's wrong with iconv on the Sun right
-	now so it keeps failing.)
-
-2001-09-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-mt.c (do_user_message): Always make the Cancel button the
-	last one.
-
-2001-09-27    <NotZed@Ximian.com>
-
-	* mail-folder-cache.c (real_note_folder): No such event finalized!
-	Its finalize.
-	(mail_note_store): "
-
-	Fixed dan's comment a bit, info != NULL for folder_created, info==
-	NULL for changed.
-	
-2001-09-26    <NotZed@Ximian.com>
-
-	* mail-local.c (mlf_set_message_flags): Proxy the
-	set_message_flags call too.  Doesn't fix the 'local folder counts
-	dont update' problem, but its more correct.
-
-2001-09-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (mail_session_remember_password): Perform a
-	NULL-check. Hopefully fixes bug #7874.
-
-2001-09-27  Dan Winship  <danw@ximian.com>
-
-	* mail-offline-handler.c (service_is_relevant): A service needs to
-	be disconnected if it's remote, not already offline, and either
-	connected OR connecting.
-	(storage_go_offline): Don't put non-relevant stores offline. (Eg,
-	don't force an IMAP store which you hadn't already connected to to
-	connect and sync.)
-	(storage_go_online): Likewise, don't "reconnect" stores that
-	weren't connected before.
-
-	* mail-ops.c (set_offline_desc): Fix the message to say
-	"reconnecting" instead of "disconnecting" when appropriate.
-	(mail_store_set_offline): If offline is TRUE, call
-	camel_service_cancel_connect on the store. (We do this here
-	because we don't want the cancel_connect request to get queued up
-	behind a hanging connection attempt.)
-
-2001-09-26  Anna Marie Dirks  <anna@ximian.com>
-
-	* mail-config.glade: Added a "Description:" label and moved 
-	the source_description and transport_description labels to
-	a more appropriate place. 
-
-2001-09-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c (mlfe_callback): Check for the root node here.
-	Fixes Ximian bug #11029.
-
-2001-09-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-mt.c (do_get_pass): Change the wording of the password
-	dialog if we are getting a pgp passphrase so that users don't
-	misinterpret it to mean saving the passphrase forever.
-
-2001-09-26  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-callbacks.c (composer_get_message): strdup our "This
-	message contains invalid recipients" string, since it gets freed
-	later.  And then don't leak the message string.  (Bug #10877)
-
-	* mail-format.c (write_address): Use camel_address_format,
-	not camel_address_encode.
-
-	* mail-display.c (html_button_press_event): Decode our URL before
-	extracting the address to pop up contact info.
-
-	* mail-format.c (write_address): When writing out a mailto: link,
-	make sure we construct a valid URL w/ correct encoding.  Make sure
-	our address is properly quoted, if necessary.
-
-2001-09-26  Dan Winship  <danw@ximian.com>
-
-	* mail-folder-cache.c: Add a big comment explaining unread message
-	counts so no one can mess them up again in the future. :-)
-	(update_1folder): If info->unread_message_count is -1, don't do
-	anything.
-
-	* component-factory.c (component_factory_init): warn and exit if
-	oaf_active_server_register returns OAF_REG_ALREADY_ACTIVE.
-
-2001-09-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (config_read): Oops, translate the fake account
-	name to UTF-8.
-
-2001-09-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c (message_list_foreach): Use
-	e_tree_selected_path_foreach instead of
-	e_tree_selected_row_foreach here.
-
-2001-09-27  Michael Meeks  <michael@ximian.com>
-
-	* mail-config.c (mail_config_init): report the
-	exception on failure and abort quickly instead of hitting
-	a strange assert later.
-
-2001-09-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (decode_pgp): Update to not send the
-	remember-passphrase option to the context, it doesn't need it
-	anymore.
-	(try_inline_pgp_sig): Same.
-
-	* mail-accounts.c (construct): The remember-passphrase option is
-	no longer there. This can now be set on the passphrase prompt
-	dialog.
-	(construct): Add confirm expunge options.
-
-	* mail-config.c (config_read): We no longer read-in the
-	remember-passphrase state because we no longer need it.
-	(mail_config_write_on_exit): We no longer save it either.
-	(mail_config_get_remember_pgp_passphrase): Removed.
-	(mail_config_set_remember_pgp_passphrase): Removed.
-
-	* mail-crypto.c (mail_crypto_pgp_mime_part_sign): No longer do we
-	need to send the remember passphrase state to the pgp context.
-	(mail_crypto_pgp_mime_part_verify): Same.
-	(mail_crypto_pgp_mime_part_encrypt): Here too.
-	(mail_crypto_pgp_mime_part_decrypt): And here.
-
-2001-09-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch for Automake 1.5 compatibility pointed out by Richard
-	Boulton <richard@tartarus.org>, as per #9258.]
-
-	* Makefile.am (CLEANFILES): Assign directly, not with `+='.
-
-2001-09-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-folder-cache.c (update_1folder): The folder-info needs to
-	take priority over the folder because of the way IMAP works (which
-	is that it doesn't actually update the folders until you SELECT
-	them and so when you do get_folder_info(), it doesn't actually
-	SELECT the folders, it just STATUS's them).
-
-2001-09-25    <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_destroy): Deal with destroy vs
-	finalise semantics.  Only destroy widgets here.
-	(folder_browser_finalise): object finalise function, actually
-	unref/free all other objects here.
-	(folder_browser_class_init): Init the finalise hook.
-	(got_folder): Check if message_list == NULL -> we've been
-	destroyed before the thread got a chance to finish loading the
-	folder.
-	(folder_browser_is_drafts): Dont use a g_return_if_fail to return
-	in what could be a valid state of the object.
-	(folder_browser_is_sent): Likewise.
-	(folder_browser_copy): Do nothing if message_list == NULL.
-
-	* main.c (main): call  mail_msg_cleanup() before leaving threads.
-
-	* component-factory.c (owner_unset_cb): Wait for all outstanding
-	operations to finish before setting up to quit.
-	(idle_quit): Wait for all outstanding ops to finish before
-	cleanup.
-	(unref_standard_folders): NULL out the standard folder before
-	unreffing it.
-
-	* mail-mt.c (mail_msg_wait_all): New function to wait for all
-	outstanding thread operations.
-	(mail_msg_cleanup): Destroy the io channels before we're
-	finished.  Also wait for all outstanding threads first.  Made
-	public.
-	(mail_msg_init): Dont call mail_msg_cleanup atexit automatically.
-
-
-2001-09-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (get_data_wrapper_text): If the data wrapper
-	contains raw text, treat the contents as if they were in the
-	user's default charset and convert them to UTF-8.
-
-	* component-factory.c (owner_set_cb): Throw up a warning dialog if
-	we suspect the config database is corrupt.
-
-	* mail-config.c (config_read): If the account name is NULL, then
-	we have a corrupt config database most likely - so generate a fake
-	account name and set the corrupt but to TRUE.
-	(mail_config_is_corrupt): New function to find out if the config
-	is suspected of being corrupted.
-
-2001-09-25  Iain Holmes  <iain@ximian.com>
-
-	* mail-config.c (impl_GNOME_Evolution_MailConfig_addAccount):
-	Check if the transport is NULL.
-
-2001-09-25  Iain Holmes  <iain@ximian.com>
-
-	* mail-display.c (link_menu): Remove the Save Link as (FIXME)
-	item.
-
-2001-09-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-mt.c (pass_got): Only cache the password for the service if
-	it has an entry in the account database. Fixes bug #10875.
-
-2001-09-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c (filter_date): Use e_strftime_fix_am_pm instead
-	of strftime.
-
-2001-09-24    <NotZed@Ximian.com>
-
-	* mail-local.c (mls_get_folder): Removed unused variables.
-
-	* component-factory.c (storage_create_folder): Remove unused
-	variable.
-
-	* mail-format.c (write_default_header): Used to write a header
-	that we know about/normally print.  Use a static header table to
-	index these.
-	(write_header): removed.
-	(default_header_index): Return the index of the default header.
-	(write_headers): Changed the way it writes headers a bit.  Use
-	write_default_header or write_text_header directly.  Also try and
-	use the header charset as a fallback if the header can't be
-	decoded using the locale charset.
-
-2001-09-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-mt.c (pass_got): Always cache POP and IMAP passwords, even
-	if the user didn't tell us to. Fixes bug #10569.
-
-2001-09-21    <NotZed@Ximian.com>
-
-	* mail-mt.c (mail_msg_check_error): If we have an operation that
-	failed before, dont show the dialogue for the the new error.  Also
-	use gtk_widget_show rather than invoking another main loop.  Fix
-	for lazy people who like to leave their mailers running and go
-	home.
-
-2001-09-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_send_message): Use the mail-tools convenience
-	functions to remove and restore the X-Evolution headers.
-	(mail_update_subfolders): Removed.
-
-2001-09-21    <NotZed@Ximian.com>
-
-	* mail-callbacks.c (mail_storage_create_folder, folder_created,
-	create_folders):  All made redundant by new mail-folder-cache
-	code.
-	(delete_folders, folder_deleted): Uh, code that isn't used
-	anywhere.  Removed.
-
-	* component-factory.c (storage_create_folder): Dont call
-	folder_created, let the folder_created event handle the update.
-
-	* mail-local.c (mail_local_store_add_folder): Use url path as
-	full_name, not shell path.
-	(mail_local_folder_construct): Remove path argument, and use the
-	full_name instead.
-	(mls_get_folder): Dont lookup folderinfo in cache.  Like duh the
-	shell hasn't told me its there yet, smaaaart.
-
-	* mail-folder-cache.c (mail_note_store): Take a new argument
-	'done' that can callback when complete.  Fixed callers
-	appropriately.
-
-	* mail-ops.c (mail_update_subfolders): Removed.  Isn't used
-	anymore.
-	(mail_scan_subfolders): Remove, no longer used.
-
-	* mail-send-recv.c (receive_update_got_store): Remove call to
-	mail_update_subfolders.
-
-2001-09-20    <NotZed@Ximian.com>
-
-	* mail-vfolder.c (check_source): Dont let drafts/outbox/sent be
-	added via a generic 'all local folders' rule.
-
-	* component-factory.c (got_folder): trigger a folder changed
-	event, so the folderinfocache stuff has a chance to see if this is
-	the outbox_folder or not.
-
-	* mail-folder-cache.c (update_1folder): If we have -1 unread
-	count, pass that as 0 to the shell so it doesn't go bolding.
-	(setup_folder): Same.
-
-2001-09-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Only add the account
-	if it doesn't already exist in the config db.
-
-	* mail-config.c (mail_config_find_account): New convenience
-	function.
-
-	* mail-config-druid.c (wizard_finish_cb): Do not add the account
-	here as this is taken care of in mail_account_gui_save() since it
-	has to be able to set the default account.
-
-	* mail-config.c (mail_config_set_default_account): Don't allow the
-	index to become invalid.
-
-	* mail-account-gui.c (mail_account_gui_save): Add the account
-	before setting it as the default.
-
-2001-09-20    <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_set_shell_view): Update the
-	status bar here, assuming we've just been activated.
-
-	* mail-ops.c (add_vtrash_info): Scan whole list, rather than
-	missing the last one.  Also dont assume its always the last,
-	otherwise we could lose following folders.
-
-2001-09-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-tools.c (mail_tool_uri_to_folder): Don't "note" the folder
-	if we failed to get it.
-
-2001-09-20  Iain Holmes  <iain@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_new): Set the sensitivity
-	of the edit buttons correctly.
-
-2001-09-20    <NotZed@Ximian.com>
-
-	* mail-vfolder.c (vfolder_register_source): Lock around
-	hashtable/list manipulation.  Also dont try scan vfolder_hash if
-	it hasn't been setup yet.
-	(source_finalise): Lock around list access.
-	(rule_changed): Lock around hash access.
-	(context_rule_added): Lock around hash access.
-	(context_rule_removed): "
-	(rule_changed): Lock around list access.
-	(all): d(x) out debug printfs
-
-	* mail-local.c (storage_listener_startup): Fix for api change.
-	(local_storage_new_folder_cb): Dont skip over leading / in path.
-	(local_storage_removed_folder_cb): ditto.
-
-	* mail-folder-cache.c (create_folders): No longer pass prefix
-	between recursive calls - we have the path in the folderinfo.
-	(setup_folder): No longer take path arg, we get it from
-	folderinfo.
-	(mail_note_folder): No longer take path arg, we use
-	folder->full_name to key the folder table.
-	(mail_note_store): Consolidate note_store interface, pass storage
-	or corba_storage to it.
-	(mail_note_local_store): Removed.
-	(update_1folder): If its a vtrash folder, or the outbox_folder,
-	and we have a folder, then make the 'count' the total message
-	count, not unread messages count.
-
-2001-09-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-local.c (mail_local_store_add_folder): Set the folder info
-	path.
-
-2001-09-20    <NotZed@Ximian.com>
-
-	* mail-tools.c (mail_tool_uri_to_folder): Register vfolder sources
-	here.
-	
-	* folder-browser.c (got_folder): Dont register vfolder sources
-	here.
-
-	* mail-ops.c (mail_get_folder): Add thread parameter.  Fix callers.
-	(add_unmatched_info): Scan for unmatched name and re-title.
-
-	* mail-vfolder.c (vfolder_setup): Use the 'slow' queue for setting
-	up vfolders.
-
-	* mail-mt.c (mail_msg_init): Limit the maximum number of threads
-	on the 'new' thread to 10.
-	(mail_msg_init): Create a new queue 'slow' for doing slow
-	operations.
-
-2001-09-20  Iain Holmes  <iain@ximian.com>
-
-	* mail-display.c (mail_error_write): Add a <blockquote> to make
-	the error message look better.
-
-2001-09-20    <NotZed@Ximian.com>
-
-	* mail-tools.c (mail_tool_uri_to_folder): Dont special case file:
-	url's anymore.
-
-	* mail-local.c: Add real_path to MailLocalFolder.
-	(mail_local_folder_construct): Added path argument, setup
-	full_name == path, and real_path == full_name.
-	(mls_get_folder): First lookup folderinfo to confirm this folder
-	exists, then use that to properly construct the folder paths.
-	(mail_local_folder_reconfigure): Use real_path not full_name to
-	create the store uri.
-	(mlf_set_folder): Use real_path not folder_name to get real uri
-	path.
-
-2001-09-19    <NotZed@Ximian.com>
-
-	* mail-folder-cache.c (setup_store): Use the wrong spelling of
-	finalised for the event hook.
-	(real_note_folder): Use the wrong spelling of finalised for the
-	event hook.
-	(free_folder_info): Free the full_name parameter.
-	(setup_folder): 
-	(real_note_folder): Key the folderinfo table on full_name, not
-	path.
-
-2001-09-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (save_messages_save): Convert all textual parts to
-	8bit before saving. Fixes bug #10388.
-
-	* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Oops,
-	don't free memory that we don't own.
-
-2001-09-20  Dan Winship  <danw@ximian.com>
-
-	* mail-config.c (evolution_mail_config_factory_init): No need to
-	have g_warnings here. If it's done properly, therapeutically,
-	there's no danger involved.
-
-2001-09-19  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Truncate extremely long
-	subjects. (inspired by bug #9158)
-
-	* mail-tools.c (mail_tool_generate_forward_subject): Truncate
-	extremely long subjects. (bug #9158)
-
-2001-09-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-send-recv.c (receive_update_got_store): Here too.
-
-	* component-factory.c (create_view): Call mail_note_store()
-	instead of mail_scan_subfolders() here so that these folders get
-	hooked up with the unread count code.
-
-2001-09-12  Iain Holmes  <iain@ximian.com>
-
-	* importers/evolution-mbox-importer.c (load_file_fn): Fix memory
-	leak.
-
-2001-09-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Convert
-	the names to the locale charset.
-
-2001-09-19  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (create_folders): Pass the actual unread
-	message count, not just whether or not it's > 0. Fixes ximian
-	9089.
-
-2001-09-19    <NotZed@Ximian.com>
-
-	* component-factory.c: Added missing header.
-
-	* mail-local.c (mail_local_store_add_folder): Async load the
-	folder we just added, so it can update the folder counts in the
-	display.  We just discard the folder afterwards?
-
-	* mail-ops.c (mail_get_folder): Use the queued thread to get
-	folders.
-
-	* General cleanup of mail debug printfs.
-	
-	* mail-folder-cache.[ch]: Completely rewritten.  Removed all calls
-	to the old code everywhere they were used.  Nuff said.
-
-	* folder-browser.h: Add shell_view to folder_browser & api to set
-	it.
-
-	* folder-browser-factory.c (control_activate): Set the shell-view
-	on the folder_browser.
-	(control_deactivate): And clear it here.
-
-	* folder-browser.c (folder_browser_destroy): Unhook from changed
-	events on the folder before giving it away.
-	(got_folder): Hook onto the folder-changed events.
-	(folder_changed): Event hook proxy for folder_changed events
-	(main_folder_changed): And the main code version.
-	(update_status_bar): And the one that actually does the work.
-	(on_selection_changed): Also call update_status_bar() to update
-	the selection count.
-	(folder_browser_set_shell_view): Implement function to set the
-	shell_view on the folder_browser.
-	(folder_browser_destroy): Release the shell_view here too.
-
-	* mail-tools.c (mail_tool_uri_to_folder): Dont 'note' the new
-	folder if its from a file: url, this is handled by hte local store
-	(yeeruughck).
-
-	* mail-local.c (mls_init): 
-	(free_info): 
-	(mls_finalise): Setup init/finalise funcs for the folderinfo hash.
-	(local_storage_removed_folder_cb): re-enable.
-
-2001-09-18    <NotZed@Ximian.com>
-
-	* mail-local.c (MailLocalStore): Add a hash table to store
-	uri<>folderinfo data.
-	(mail_local_store_add_folder): Add a new folderinfo to our hash.
-	(mail_local_store_remove_folder): Remove a folder by uri.
-	(storage_listener_startup): Add this store to those monitored by
-	the folder tree.
-
-2001-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-mt.c (do_get_pass): Make the title translatable, and also
-	use the account name when possible. Sorta fixes bug #6277.
-
-2001-09-17    <NotZed@Ximian.com>
-
-	* mail-send-recv.c (get_receive_type): Function to get the real
-	receive tpe for ag iven url.  IMAP/SPOOL/MAILDIR types just update
-	their info, dont download.
-	(build_dialogue): 
-	(mail_receive_uri): Use function above to get the right receive
-	type.
-
-2001-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-tools.c (mail_tool_remove_xevolution_headers): Oops, forgot
-	about X-Evolution-Format.
-	(mail_tool_restore_xevolution_headers): Same.
-
-2001-09-18  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c (folder_browser_set_uri): Merged into
-	folder_browser_new: nothing ever changes the URI of an existing
-	folder browser any more.
-	(folder_browser_new): Make this take a uri argument and do the
-	work folder_browser_set_uri used to do, except that we set fb->uri
-	right away, so that if the folder browser's control is activated
-	before got_folder() gets called, then folder_browser_ui_add_list()
-	will have access to the correct uri for purposes of setting
-	ViewThreaded, etc. Fixes #4913.
-	(got_folder): Don't set fb->uri here since it will already have
-	been set. Don't call message_list_set_threaded, since it should be
-	a noop now (and if it's not, it would make the message list not
-	match the menu item).
-
-	* folder-browser-ui.c (folder_browser_ui_add_list): Remove some
-	code that was failing to work around the problems above.
-
-	* message-browser.c (message_browser_new): Pass uri to
-	folder_browser_new, remove call to set_uri.
-
-	* folder-browser-factory.c (folder_browser_factory_new_control):
-	Likewise. Also fix a s/destroy/unref/ in an error cleanup.
-
-2001-09-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (get_password): Pass a 'cache-me' argument to
-	mail_get_password.
-
-	* mail-mt.c (pass_got): Make less confusing...
-	(mail_get_password): Now takes an argument 'cache' that allows our
-	caller to determine if the user wanted to cache his/her password
-	or not.
-	(pass_got): Set the cache option.
-
-2001-09-18  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (mail_format_raw_message): Call
-	mail_content_loaded here rather than blocking if the message data
-	isn't available.
-
-2001-09-17    <NotZed@Ximian.com>
-
-	* mail-ops.c (mail_get_folderinfo): Get folderinfo 1 at a time
-	rather than all at once.
-
-2001-09-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (storage_remove_folder): Unsubscribe from
-	the folder before deleting it. Also, use the url's path instead of
-	the shell's path since IMAP doesn't necessarily have to use "/" as
-	the dir sep.
-
-	* mail-ops.c (remove_folder_get): If the store supports
-	subscriptions, make sure to unsubscribe from the folder before
-	deleting it.
-
-2001-09-17    <NotZed@Ximian.com>
-
-	* mail-local.c (storage_listener_startup): Setup global
-	corba_storage variable.
-	(mls_get_folder): Set 'update lstorage' on the newly opened
-	folder.
-
-2001-09-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (invisible_selection_get_callback): Do nothing if
-	the selection is NULL? Maybe this is the cause of bug #6817.
-
-	* mail-config.c (mail_config_folder_to_cachename): Go back to
-	generating the cachename ourselves, but continue doing it the way
-	the dfault implementation of camel_folder_get_uri worked.
-
-2001-09-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c (ml_get_node_by_id): Made save_id const here.
-
-2001-09-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (pixbuf_gen_idle): Don;t destroy the pixbuf
-	loader, unref it instead.
-
-	* mail-config.c (mail_config_folder_to_cachename): Use
-	camel_folder_get_uri().
-
-2001-09-15    <NotZed@Ximian.com>
-
-	* mail-vfolder.c: Major rewrite of most of the guts, handle
-	changes based on signals and events, etc.  Use the main storage
-	handling code that imap uses, etc.
-
-	* mail-tools.c (mail_tool_uri_to_folder): Dont special case
-	vfolder: anymore.
-
-	* component-factory.c (owner_set_cb): use vfolder_load_storage(),
-	new function to setup vfolder storage, after interaction has been
-	enabled only.  This might need some tweaking ...
-	(storage_remove_folder): Removed all the folder lookup stuff.
-	Just delete the folder based on the path passed in.  There should
-	be no reason this wouldn't work, right?
-
-2001-09-14    <NotZed@Ximian.com>
-
-	* mail-ops.c (get_folderinfo_get): Only add vtrash folder info, if
-	store supports vtrash.
-
-	* component-factory.c (mail_load_storage_by_uri): Let 'vfolder'
-	stores show up too.
-
-2001-09-13    <NotZed@Ximian.com>
-
-	* mail-vfolder.c (vfolder_uri_to_folder): Open a vfolder then set
-	its expression, since name?query open method is removed.
-
-2001-09-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* subscribe-dialog.c (fe_root_value_at): Return the cached value
-	of camel_service_get_name so that we don't leak memory.
-	(fe_real_value_at): Don't strdup the node's name.
-	(folder_etree_construct): Set the service_name.
-	(fe_destroy): Free the service_name.
-
-	* mail-ops.c (add_vtrash_info): Free the temporary path variable
-	here.
-
-	* subscribe-dialog.c (store_data_new): Added a refcount variable
-	so set the refcount to 1.
-	(sd_got_store): Unref the store-data.
-	(store_data_async_get_store): Ref the store-data.
-	(store_data_ref): New function.
-	(store_data_unref): New function.
-	(subscribe_dialog_destroy): Instead of freeing the store-data
-	here, unref it instead. We may just have an async function
-	running. Set the callback function to NULL so that when the
-	(remaining) async functions finish, they become no-ops.
-
-	* mail-send-recv.c (build_dialogue): Revert my bar_destroy code
-	and replace it with dialog_destroy instead.
-
-	* mail-ops.c (mail_send_message): Append a message to any
-	exception we get appending to any folders after having sent the
-	message successfully saying that the message was sent successfully
-	so the user doesn't misinterpret the error.
-
-2001-09-13  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-callbacks.c (composer_get_message): Fixed double-freeing of
-	EDestination vector when sending html mail to people who don't
-	necessarily want it.  Fixes bug #9848.
-
-2001-09-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* subscribe-dialog.c (get_short_folderinfo_desc):
-	(get_short_folderinfo_get):
-	(get_short_folderinfo_got):
-	(get_short_folderinfo_free):
-	(subscribe_get_short_folderinfo): Modified to take a FolderETree
-	instead of a CamelStore (since the CamelStore is inside the
-	FolderETree anyway) so that we could ref the ETree to prevent a
-	race condition. Should fix bug #9827.
-
-	* mail-format.c (try_inline_pgp_sig): Make sure that the
-	charset_filter is non-NULL before using it since iconv may fail.
-
-2001-09-13  Larry Ewing  <lewing@ximian.com>
-
-	* mail-tools.c (mail_tool_quote_message): free the credits string.
-
-2001-09-12    <NotZed@Ximian.com>
-
-	* mail-vfolder.c (vfolder_remove_cb): Fixed the remove callback
-	prototype, and return the result properly using the listener.
-	(vfolder_uri_to_folder): Always use the same store uri, so we dont
-	create a new store for each folder.
-
-2001-09-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_write_on_exit): Save transport
-	passwords too. This fixes bug #3020.
-
-2001-09-11  Dan Winship  <danw@ximian.com>
-
-	* mail-folder-cache.c (mail_folder_cache_note_folderinfo): Don't
-	set the folderinfo's unread count to 0 when camel reports -1,
-	since that may overwrite a valid unread count from before.
-	(get_folder_info): Do it here instead when first creating a new
-	folderinfo structure.
-	Should fix bug #1756.
-
-2001-09-11  Larry Ewing  <lewing@ximian.com>
-
-	* mail-account-gui.c (menu_file_save_cb): call menu_file_save_error
-	when there is an exception while saving.
-	(menu_file_save_error): pop up a dialog telling the user the file
-	has not been saved. 
-
-2001-09-10    <NotZed@Ximian.com>
-
-	* mail-local.c (mail_local_reconfigure_folder): Dynamically create
-	the folder type list from camel.
-	(reconfigure_clicked): And change code to handle changes.
-
-2001-09-10    <NotZed@Ximian.com>
-
-        * merged mail_local patch from peterw.  Many changes.
-
-2001-09-10  Iain Holmes  <iain@ximian.com>
-
-	* mail-config.c (impl_GNOME_Evolution_MailConfig_addAccount): Add a
-	none account if the url is empty.
-
-2001-09-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Don't use
-	new_with_sig_file, that function no longer exists.
-	(forward_get_composer): Same here.
-
-2001-09-10  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* mail-config.c
-	(add_shortcut_entry): Marked string for translation.
-	(new_source_created): Ditto.
-
-	* mail-send-recv.c
-	(format_url): Marked strings for translation.
-	(build_dialogue): Ditto.
-
-2001-09-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_new): Hide the S/MIME frame
-	if we don't support S/MIME.
-
-	* mail-send-recv.c (build_dialogue): Attach to the destroy event
-	for each progressbar using bar_destroyed as the callback.
-	(bar_destroyed): New callback to unregister the timeout and set
-	the send-info's bar member to NULL so we don't try to update a
-	destroyed progressbar.
-
-	* mail-callbacks.c (mail_generate_reply): Pass along the right
-	string, this fixes bug #9518.
-
-	* mail-account-gui.c (save_service): Don't save the authmech if
-	the username doesn't exist. Fixes bug #9474.
-
-	* mail-callbacks.c (do_edit_messages): Remove some mailer-set
-	headers. Fixes bug #9462.
-
-2001-09-10  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (composer_get_message): Fix obvious dumb
-	mistake in previous commit that made it *always* complain you had
-	invalid recipients.
-
-2001-09-09  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-callbacks.c (composer_get_message): Complain if we are
-	trying to send to invalid recipients. (Bug #8875)
-
-2001-09-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (evolution_mail_config_wizard_factory_fn):
-	We need to initialize all of the struct fields or else god knows
-	what will happen later when we try to use 'em. Also set a destroy
-	function for the MailConfigWizard so we don't leak it.
-
-2001-09-08  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Added.
-	Shows a (hopefully) informative dialog warning you that some
-	recipients might not want HTML mail (who are listed), and gives
-	the option to cancel sending.  (FIXME: The wording of this dialog
-	could use some work.)
-	(composer_get_message): Check if we are sending HTML to someone
-	who might not want it, and raise the dialog if we are.  Use our
-	new destination-vector based api when talking to the composer.
-	Touch our destinations here, boosting their use scores.  This is
-	the right place for this to happen --- closer to the end of the
-	sending process, where incorrect/artificial use score inflation is
-	less likely to occur.
-	
-	* mail-config.c (config_read): Added
-	/Mail/Format/confirm_unwanted_html key.  This flag determines
-	whether or not we want to see the warning dialog when we send HTML
-	mail to contacts who don't want it.  Default is TRUE.
-	(mail_config_write_on_exit): Write out the confirm_unwanted_html
-	key.
-	(mail_config_get_confirm_unwanted_html): Added.
-	(mail_config_set_confirm_unwanted_html): Added.
-
-2001-09-08  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (mail_display_destroy): Unref the invisible,
-	don't just destroy it.
-
-2001-09-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_write_authenticity): Give the full path of
-	the wax-seal icons.
-	(try_inline_pgp_sig): Convert the charset from UTF-8 to whatever
-	charset it should be. Now takes a CamelMimePart argument as well.
-	(try_uudecoding): Now takes a part argument as well.
-	(try_inline_pgp): Here too.
-	(try_binhex): And finally here.
-	(handle_text_plain): Pass along the mime part to the try_*
-	functions.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* component-factory.c (notify_listener): new function, to notify
-	the bonobo listener in remove_folder/create_folder.
-	(storage_create_folder): match EvolutionStorage create_folder
-	signal's signature.
-	(storage_remove_folder): match EvolutionStorage remove_folder
-	signal's signature.
-
-2001-09-06  Dan Winship  <danw@ximian.com>
-
-	Fix a bunch of replying/forwarding-related formatting bugs.
-
-	2749 - Message text not included in reply, but html attachment is
-	4294 - "forward inline" should quote the same headers as the
-	       normal mail display
-	6100 - Reply to a forwarded email displays email headers
-	7255 - Replying to HTML message
-	7527 - replying to forwarded message w/ attachments does the wrong
-	       thing
-	
-	* mail-format.c (mail_get_message_rfc822): New function to get
-	message headers and body together, for inline forwards, or replies
-	containing attached messages.
-	(mail_get_message_body): Redo this to always return HTML, but keep
-	the "want_plain" flag, to decide whether to return HTML that looks
-	like HTML or HTML that looks like plain text. Use
-	mail_get_message_rfc822 to handle attached message/rfc822 parts.
-	Don't include the text of vcard or icalendar attachments. Don't
-	fail to include text parts just because we found an HTML part.
-	(Since we're always returning HTML now, this doesn't cause
-	problems any more.)
-
-	* mail-tools.c (mail_tool_quote_message): Simplify greatly.
-	mail_get_message_body always returns HTML now, and we let it take
-	care of prepending "> "s too. We then let GtkHTML deal with
-	converting the HTML to plain text if the user wants to reply in
-	plain text.
-	(mail_tool_forward_message): Simplify this a ton too: parts of it
-	are moved into mail_get_message_rfc822 and parts are now
-	unnecessary.
-
-	* mail-callbacks.c (do_forward_non_attached): Call
-	mail_tool_forward_message here always, and let it do the "> "
-	quoting in the "quoted" case, so that we get the headers too when
-	forwarding quoted. Related to bug #4294.
-
-2001-09-05  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (launch_cb): the "command" of a
-	GnomeVFSMimeApplication can include arguments as well. Deal with
-	that. Fixes support for CodeWeavers' CrossOver Plugin.
-
-2001-09-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_remove_account): Adjust the
-	default_account index correctly.
-
-2001-09-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_get_accounts): Added a g_assert to
-	make sure that config wasn't NULL. This is meant to help debug bug
-	#4911 and friends.
-
-	* component-factory.c (owner_set_cb): Do not mail_config_init()
-	here as we've already called this in main() in main.c.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #958, ShellComponents should not be created by factories, for
-	the mailer case.]
-
-	* GNOME_Evolution_Mail.oaf.in: Remove the
-	GNOME_Evolution_Mail_ShellComponentFactory.
-
-	* component-factory.c: Changed to not use a factory.
-	(COMPONENT_FACTORY_ID): Removed.
-	(COMPONENT_ID): New.
-	(idle_quit): Don't unref the component_factory.
-	(create_component): Renamed from `component_fn'.  Take no args.
-	(component_factory_init): Create the component with
-	`create_component' and register it on OAF.
-
-2001-09-06  Radek Doulik  <rodo@ximian.com>
-
-	* everywhere updated for new mail_content_loaded definition
-	(prototype)
-
-2001-09-05  Radek Doulik  <rodo@ximian.com>
-
-	* mail-display.c (mail_display_redisplay): increase
-	redisplay_counter
-	(try_part_urls): new helper function
-	(try_data_urls): ditto
-	(load_content_loaded): if it has stream handle available and if
-	it's still valid, it writes to this stream instead of
-	redisplaying, uses try_part_urls and try_data_urls
-
-	* mail-display.h: added redisplay_counter to MailDisplay, I use
-	it in load_content_loaded to be sure that there wasn't any
-	redisplay and that remembered handle is still valid
-
-	* mail-display.c (on_url_requested): don't end stream with error
-	if part is not loaded yet
-	(on_url_requested): don't end stream in cases when we are going to
-	load image using http
-	(stream_write_or_redisplay_when_loaded): new helper function,
-	which is extracted from mail_display_redisplay_when_loaded. it's
-	extended to handle gtkhtml stream writting
-	(mail_display_redisplay_when_loaded): use
-	stream_write_or_redisplay_when_loaded
-	(mail_display_stream_write_when_loaded): new function, uses
-	stream_write_or_redisplay_when_loaded
-	struct _load_content_msg: added handle, url and redisplay_counter
-	fields
-
-	* mail-format.c (mail_content_loaded): added redisplay, url and
-	handle parameter for case when we are loading image content and
-	want it write to stream instead of redisplaying
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* message-browser.c (message_browser_new): s/Evolution/Ximian
-	Evolution/.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #7542, "Crash Afer Closing".]
-
-	* component-factory.c (owner_unset_cb): NULL the
-	global_shell_client as the first thing here.  Otherwise we might
-	get into a slight race that causes the shell to crash.  [Still, of
-	course the shell shouldn't crash, but I haven't been able to track
-	that down yet.]
-
-2001-09-04  Zbigniew Chyla  <cyba@gnome.pl>
-
-	Fixes #7251
-
-	* mail-ops.c (add_vtrash_info): Mark "Trash" with U_(), not _().
-
-2001-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (fetch_mail_fetch): Unref the source folder here
-	because it might be a POP folder. We do this because on store
-	finalize, we now try to disconnect cleanly which means that we may
-	block.
-
-	* mail-send-recv.c (build_dialogue): Fix capitalization. Fixes bug
-	#7486.
-
-2001-09-04  Peter Williams  <peterw@ximian.com>
-
-	* mail-local.c (mlf_init): Remove accidentally left-in "choke on
-	this" preprocessor thingie.
-	(mail_local_folder_reconfigure): Instead of creating our own local
-	exception, just assert that ex != NULL.
-	(*): Staticize everything that can be and remove some obnoxious
-	prototypes.
-
-2001-08-31  Peter Williams  <peterw@ximian.com>
-
-	* mail-local.c (mail_local_reconfigure_folder): Use (NULL, NULL)
-	as the arguments to g_hash_table_new instead of g_direct_foo.
-	Instead of checking the URI, check MAIL_IS_LOCAL_FOLDER (fb->folder)
-	to check whether we can reconfigure the folder. Instead of
-	gnome_dialog_run_and_close, use gnome_dialog_run...
-	(reconfigure_clicked): And deal with removing the hash table
-	elements here.
-	(local_storage_new_folder_cb): Set the folder's name to the
-	displayName to i18nize correctly (after shell patch is applied).
-
-2001-08-30  Peter Williams  <peterw@ximian.com>
-
-	* mail-local.c: Rewrite as a more complete CamelStore.
-	
-	* component-factory.c (create_folder): We can now chuck out most
-	of this function and just call mail_get_folder.
-	(xfer_folder_done): If we succeeded in moving the messages, now
-	delete the source folder as we should be.
-	(xfer_folder): In order to do so, create a new xfer_folder_data
-	struct that records the value of 'remove_source' Fix a leak by
-	unreffing the source folder.
-
-	* mail-ops.[ch]: We no longer need the mail_new_folder operation.
-	
-	* folder-browser.[ch]: Don't need the 'reconfigure' member 
-	anymore, because the loaded folder's URL doesn't change.
-	(do_message_selected): Don't check it
-	(on_right_click): Same.
-	(folder_browser_set_uri): Same.
-	(got_folder): Same.
-	
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* mail-vfolder.c (vfolder_create_storage): Marked string for
-	translation (with U_).
-
-2001-08-28  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* message-list.c (e_mail_address_compare): Use g_utf8_collate
-	instead of g_strcasecmp for comparing names.
-	(subject_compare): Replaced g_strcasecmp, isspace, var++ with
-	UTF-8 counterparts.
-
-2001-08-30  Iain Holmes  <iain@ximian.com>
-
-	* importer/evolution-mbox-importer.c (load_file_fn): Check if it's
-	a folder, if so, create a folder.
-	(process_item_fn): If it was a folder created, just finish up
-	importing
-
-2001-08-29  Iain Holmes  <iain@ximian.com>
-
-	* importers/evolution-mbox-importer.c: Turn off debugging, remove
-	spewage.
-	(process_item_fn): Notify the importer if the folder isn't opened
-	or created yet.
-	(load_file_fn): Allow the function to continue if the folder is
-	being created.
-
-2001-08-30  Peter Williams  <peterw@ximian.com>
-
-	Due to the introduction of mail_folder_cache_remove(), we can no
-	longer assume that mail_folder_info's always exist, so we need to
-	robustify a lot of this.
-	
-	* mail-folder-cache.c (folder_browser_destroyed): New
-	function. Called when the folder browser is destroyed -- analogous
-	to camel_folder_finalized.
-	(mail_folder_cache_note_fb): Hook it up here.
-	(struct _mail_folder_info): Add a member, mail_info_id, that
-	records the get_mail operation's id, so that we can cancel it if
-	we need to.
-	(get_folder_info): Initialize it here.
-	(get_mail_info_reply): Clear it here.
-	(mail_folder_cache_remove_folder): If necessary, cancel it here.
-	(mail_folder_cache_note_folder): Check it here before starting a
-	new operation, just in case.
-	(update_message_counts_main): Take a URI instead of a
-	mail_folder_info *, in case the MFI has gotten destroyed.
-	(update_message_counts): Take a quark of the URI instead of a
-	mail_folder_info *, for the same reason. We use a quark instead of
-	an allocated gchar * because figuring out when to free the string
-	gets tricky. Then go from quark -> URI string -> MFI. Return if
-	the folder is no longer valid, because this indicates that the MFI
-	was removed before this signal got called. Pass a string to
-	update_message_counts_main instead of an MFI.
-	(camel_folder_finalized): Don't bother unhooking the signals here.
-	Same change as above, but don't bother checking for a valid folder
-	because we're about to make it invalid anyway.
-	(message_list_built): Analogous to the above, except with the
-	FolderBrowser instead of the CamelFolder.
-	(selection_changed): As above.
-	(folder_browser_destroyed): As above.
-	(struct get_mail_info_msg): Instead of taking a mail_folder_info
-	*, take a URI, for reasons explained above.
-	(get_mail_info_receive): Go from URI -> MFI before doing anything.
-	(get_mail_info_reply): Same.
-	(get_mail_info_destroy): Free the URI.
-	(get_mail_info): Take a URI and return the message id so that it
-	can be cancelled if necessary.
-	(mail_folder_cache_remove_folder): Disconnect from signals and
-	events before removing.
-	(mail_folder_cache_note_folder): Use a GQuark instead of the
-	mail_folder_info * as the user_data.
-	(mail_folder_cache_note_fb): Same.
-	(mail_folder_cache_note_folderinfo): Little formatting change.
-
-2001-08-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-browser.c (message_browser_message_loaded): Fixed a
-	memory leak.
-	(message_browser_new): Added a comment as to why , after
-	reparenting, we do not unref the mail_display.
-	(message_browser_destroy): Don't call gtk_widget_destroy() on the
-	message_list here.
-
-2001-08-30  Peter Williams  <peterw@ximian.com>
-
-	* mail-ops.c (remove_folder_get): Instead of removing the folder
-	from the folder cache here...
-	(remove_folder_got): ... do it here, in the main thread.
-
-2001-08-29  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-callbacks.c (composer_get_message): When calling
-	e_msg_composer_get_message, pass in TRUE for the 'sending' arg.
-	(Part of the fix for bug #8332)
-
-2001-08-29  Peter Williams  <peterw@ximian.com>
-
-	* folder-browser-ui.c: Fix the pixmap for /commands/MessageUndelete.
-
-	* component-factory.c (owner_set_cb): Toss in a call to 
-	mail_config_init () cause it might contribute to solving 
-	bug 4911, and it won't hurt.
-
-2001-08-28  Peter Williams  <peterw@ximian.com>
-
-	* component-factory.c (owner_unset_cb): Disable interaction once
-	the shell has quit.
-	(create_view): Instead of 
-	folder_browser_factory_new_control ("", corba_shell) when looking
-	at a mailstorage folder, use create_noselect_control().
-
-2001-08-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-local.c: Match the studlyCapsification of
-	shell/Evolution*.idl.
-
-	* mail-config-druid.h: Change type of `event_source' from
-	`Bonobo_EventSource *' to `Bonobo_EventSource'.
-
-	* mail-accounts.c (mail_delete): Remove unused local variable
-	`label'.
-
-	* folder-info.c (do_get_info): `#if 0' unused variables.
-
-2001-08-27  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Check if we are trying
-	to reply to a message with no From: field, and try to do something
-	graceful in that case. (Bug #7028)
-
-	* mail-display.c (ebook_callback): Add paranoid checks for the
-	case of a message with a From: field. (Also maybe bug #7028)
-
-2001-08-27  Iain Holmes  <iain@ximian.com>
-
-	* mail-config-druid.c (druid_finish): Free the list and hash table.
-	(druid_cancel): Free the list and hash table.
-
-2001-08-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_new): Set the source and
-	transport description labels.
-	(transport_type_changed): Set the transport description label.
-	(source_type_changed): Set the source description label.
-
-	* mail-tools.c (mail_tool_make_message_attachment): Remove
-	X-Evolution* headers.
-	(mail_tool_remove_xevolution_headers): New function to convenience
-	removing the X-Evolution headers.
-	(mail_tool_restore_xevolution_headers): New convenience function
-	to restore the X-Evolution headers.
-	(mail_tool_destroy_xevolution): New function to cleanup the
-	structure.
-	(mail_tool_forward_message): Remove and restore the X-Evolution
-	headers here too.
-
-2001-08-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-send-recv.c (receive_update_got_store): If the store is not
-	connected, scan it's subfolders first.
-
-	* mail-ops.c (report_status): Call va_end() so LinuxPPC doesn't
-	have a caniption.
-
-2001-08-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (launch_cb): Use the new e_mkdtemp function.
-
-	* folder-browser.c (message_list_drag_data_get): Use the new
-	e_mkdtemp function.
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #8024, Empty strings marked for translation.]
-
-	* component-factory.c: Don't mark empty strings for translation.
-	Rather, give descriptions and display names to types "mailstorage"
-	and "vtrash".
-
-2001-08-24  Peter Williams  <peterw@ximian.com>
-
-	* mail-ops.c (remove_folder_get): Save the folder's full_name,
-	unref it, and *then* unref the store, so that the folder has been
-	closed before it gets deleted.
-
-2001-08-24  Peter Williams  <peterw@ximian.com>
-
-	* mail-config.c (add_shortcut_entry): Instead of using the length
-	of the shortcuts list as the index for the shortcut, use -1, which
-	means "last".
-
-	* mail-config-druid.c (druid_finish): Remove the account adding
-	stuff since that happens in wizard_finish now.
-
-	* mail-config.c (add_new_storage): New function. Add a
-	MailConfigAccount to the shell as a storage.
-	(maybe_add_shortcut): Renamed to new_source_created.
-	(new_source_created): Call add_new_storage here.
-
-	* component-factory.c (mail_remove_storage_by_uri): Don't warn if
-	the storage isn't remote... no point in making the caller do extra
-	work.
-
-2001-08-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_set_thread_list): Don't let the uri
-	be an empty string (how the fuck is this even happening in the
-	first place??).
-	(mail_config_get_thread_list): Same.
-	(mail_config_set_show_preview): And here.
-	(mail_config_get_show_preview): And finally here.
-
-2001-08-23  Larry Ewing  <lewing@ximian.com>
-
-	* mail-search.c (mail_search_construct): attach to the destroy
-	handler to reset the tokenizer.
-	(dialog_destroy_cb): reset the tokenizer here so that destroying
-	the dialog with the window manager still clears the hilighted
-	items.
-
-2001-08-23  Peter Williams  <peterw@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Eek, let the user create
-	new accounts if old_account == NULL.
-
-2001-08-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (destination_folder_handle_drop): Check to
-	make sure we actually have drag data.
-
-	* folder-browser.c (message_list_drag_data_received): Check to
-	make sure we have valid data.
-
-2001-08-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* Revert fix for Ximian bug #6995.
-
-2001-08-23  Peter Williams  <peterw@ximian.com>
-
-	* mail-folder-cache.c (maybe_update): Record the timeout_id so we
-	can cancel it if the mail_folder_info is later freed. Also obviates
-	the use of the _UPDATE_QUEUED flag.
-	(mail_folder_cache_remove_folder): Cancel the timeout if we need to.
-	Lock around the hash table operations. Free mfi itself. Add debugging
-	spew.
-	(get_folder_info): Initialiae the timeout_id to 0.
-
-2001-08-22  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-callbacks.c (ask_confirm_for_only_bcc): Provide alternative
-	text for this dialog for the case when a message has only Bcc
-	recipients because of a hidden contact list's addresses being
-	moved from To/Cc to Bcc.
-	(composer_get_message): Try to detect when our message has only
-	Bcc recipients because of moving addresses around due to a hidden
-	contact list, and show the dialog with the revised wording in this
-	case.
-
-2001-08-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (create_view): Don't blindly make all vtrash
-	folder types have a uri of vtrash:file:/, instead only make it use
-	vtrash:file:/ if it's a file: uri, else use physical_uri.
-
-2001-08-22  jacob berkman  <jacob@ximian.com>
-
-	* mail-display.c: rework how the e-card-popup thing has its life
-	managed.  we now hide the window on the Hide event and destroy it
-	on the Destroy event emitted from its event source
-	
-2001-08-22  Peter Williams  <peterw@ximian.com>
-
-	* mail-send-recv.c (set_send_status): We don't need to escape this
-	for printf'ing.
-
-2001-08-22  Peter Williams  <peterw@ximian.com>
-
-	Prevent the user from creating two accounts with the same name.
-	
-	* mail-config.c (impl_GNOME_Evolution_MailConfig_addAccount):
-	Abort if the account has the same name as another account.
-
-	* mail-account-gui.c (mail_account_gui_save): Don't let the user
-	save if the account has the same name as another account.
-
-	* mail-config-druid.c (management_check): Disable the next button
-	if the account name is the same as a preexisting account.
-	(construct): The only part of 'pages' that was being used was the
-	name. 'wizard_pages' now has the callbacks, while 'pages' is just
-	an array of char *'s.
-	(wizard_finish_cb): Save the account first because that's the
-	right way, and try to honor mail_account_gui_save's return value.
-	
-	* mail-config.glade: Add a label noting that you're not allowed to
-	create two accounts with the same name.
-	
-2001-08-22  Peter Williams  <peterw@ximian.com>
-
-	* folder-browser-ui.c (fbui_sensitize_timeout): Check for NULL uic
-	here as well.
-	(fbui_sensitize_items): Up the timeout interval to 110 ms.
-
-2001-08-21  Peter Williams  <peterw@ximian.com>
-
-	* mail-account-editor.c (apply_changes): Honor the return value of
-	mail_account_gui_save.
-
-	* mail-ops.c (sync_folder_desc): Say which folder is getting
-	saved.
-
-2001-08-21  Dan Winship  <danw@ximian.com>
-
-	* mail-identify.c (mail_identify_mime_part): Don't trust gnome-vfs
-	when it says "text/plain" if gnome_vfs_mime_type_from_name says
-	something different. Fixes a problem with recognizing icalendar
-	attachments labeled "application/octet-stream". Also, don't bother
-	asking gnome-vfs about winmail.dat attachments, since it will
-	often claim that they're MPEGs due to some mis-magic.
-
-2001-08-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (mail_session_forget_password): zero-ize the
-	password before freeing.
-	(forget_password): Same.
-
-2001-08-21  Peter Williams  <peterw@ximian.com>
-
-	* message-list.c (message_list_set_folder): Don't sink the extras
-	since _set_folder can get called more than once (on reconfigure.)
-	(message_list_destroy): So just unref the extras here.
-
-	* mail-send-recv.c (build_dialogue): Treat the spool provider like
-	IMAP: update instead of performing an explicit receive.
-
-2001-08-21  Peter Williams  <peterw@ximian.com>
-
-	* folder-browser-ui.c (fbui_sensitize_items): Rename to
-	fbui_real_sensitize_items. Now we queue a change and set up a
-	timeout, making sure weed out redundant changes, fixing flicker.
-	(fbui_sensitize_timeout): New function. The timeout.
-	(fbui_real_sensitize_items): Semi-new function. Rename of old
-	fbui_sensitize_items.
-	(folder_browser_ui_set_selection_state): Pass the FB instead of
-	only the UIC to sensitize_items.
-	(folder_browser_ui_message_loaded): Same.
-
-	* folder-browser.c (folder_browser_destroy): Kill the new timeout
-	if it is registered.
-
-	* folder-browser.h: Add some members to FolderBrowser for keeping
-	track of the queue of changes.
-
-2001-08-20  Iain Holmes  <iain@ximian.com>
-
-	* mail-config.druid: Fix the jumping around.
-
-2001-08-20  Peter Williams  <peterw@ximian.com>
-
-	* mail-ops.c (remove_folder_get): Fix double-unref of the store.
-
-2001-08-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (create_folder): Modify the url and set the
-	protocol to mbox rather than hacking it and prepending mbox: to
-	the uri.
-
-	* mail-local.c (get_folder): Don't prepend the folder_name with
-	the store's path because the hash key is folder_name, not
-	/folder_name.
-
-2001-08-20  Iain Holmes  <iain@ximian.com>
-
-	* mail-config-druid.c: Change some of the text labels.
-	(create_label): Make a label instead of a GtkHTML widget.
-
-2001-08-18  Iain Holmes  <iain@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_setup): Stop hiding the source
-	and transport frames.
-
-2001-08-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser-ui.c (folder_browser_setup_property_menu):
-	Updated as ChangeFolderProperties is now in the
-	ComponentPlaceholder.
-
-2001-08-20  Peter Williams  <peterw@ximian.com>
-
-	* mail-accounts.c (mail_able): Whoops, make sure that the account
-	has a source before removing it or what-have-you.
-
-	* subscribe-dialog.c: Add a few comments.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* folder-browser-ui.c: use new small trash icon for Delete command.
-
-2001-08-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-ops.c (sync_folder_desc): s/Synchronising/Synchronizing/.
-
-2001-08-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (storage_create_folder):
-	camel_folder_create_folder can now return a heirachial tree so
-	subscribe to down the tree.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* folder-browser-ui.c: use new Cut/Copy/Paste icons.
-
-2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c: Update the folder list to include a display
-	name and a description.
-
-2001-08-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-mt.c (do_op_status): Allow the activity to be NULL if there
-	isn't a global_shell_client so that we don't try and report status
-	updates when the shell is destroyed.
-
-	* mail-config.c (add_shortcut_entry): Return if there isn't a
-	global_shell_client.
-
-	* component-factory.c (owner_set_cb): set the global_shell_client
-	here and connect to the destroy signal.
-
-	* mail-vfolder.c (vfolder_create_storage): Use an extern
-	global_shell_client.
-
-2001-08-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* mail-callbacks.c (delete_msg): Made delete make the cursor go
-	backwards if the user is sorting by descending date.  Fixes Ximian
-	bug #6995.  (Reverted.)
-
-2001-08-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Note: The following changes were based on Zbigniew Chyla's fixes.
-
-	* mail-callbacks.c (mail_generate_reply): Convert the date string
-	to UTF-8.
-	(do_forward_non_attached): Same here.
-
-2001-08-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* folder-info.c: Added missing #include <config.h>. (applied by Damon)
-
-2001-08-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (config_read): Change the default values for
-	"always-sign" to false.
-
-	* mail-callbacks.c (open_msg): if the folder is Outbox, let the
-	user edit the message(s) too I guess.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser-ui.c: Hook the new `delete-message.png' up.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* mail-display.c (pixmap_press): stop signal emission so the GtkButton
-	class method doesn't mess up the popup menu. Hopefully fixes bug #1828.
-
-2001-08-17  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* mail-search.c (mail_search_construct): Put _() instead of N_()
-	around of the "Search" string, gnome_dialog_constructv doesn't
-	translate button names.
-
-2001-08-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_write_authenticity): We want wax-seal.png
-	instead, since I added the png files to cvs and renamed it to
-	wax-seal.png.
-
-2001-08-17  Iain Holmes  <iain@ximian.com>
-
-	* importers/evolution-mbox-importer.c (load_file_fn): Fix
-	warnings.
-
-2001-08-17  JP Rosevear  <jpr@ximian.com>
-
-	* component-factory.c (owner_set_cb): don't init the config here
-
-	* main.c (main): init the config here
-	
-2001-08-17  JP Rosevear  <jpr@ximian.com>
-
-	* mail-config-druid.c: remove dead structure
-
-2001-08-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_write): Save the always-sign options
-	for pgp and smime.
-	(config_read): Read in the always-save options for pgp and smime.
-
-2001-08-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.etspec: Made the default values for column
-	expansions here more reasonable.
-
-2001-08-16  Iain Holmes  <iain@ximian.com>
-
-	* GNOME_Evolution_Mail.oaf.in: Add the Wizard stuff.
-
-	* component-factory.c (component_fn): Init the Wizard factory.
-	(mail_load_storages): Check service isn't NULL before it's been 
-	dereferenced.
-
-	* mail-account-gui.c (mail_account_gui_setup): Only show the top level
-	widget is it's not NULL.
-	Change the gtk_widget_set_usizes to gtk_widget_hides.
-
-	* mail-config-druid.c: Rewrite to use the EvolutionWizard stuff.
-
-	* mail-config-druid.h: Add stuff to the MailConfigDruid struct.
-
-	* mail-config.c (mail_config_get_default_account): Init the config if
-	it's not been inited.
-
-2001-08-16  Jason Leach  <jleach@ximian.com>
-
-	* mail-tools.c (mail_tool_quote_message): Only starting cutting
-	the signature out when we match "-- \n", so "--\n" in the middle
-	of a mail won't omit the rest for a quoted reply.  Bug #7454.
-
-2001-08-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (confirm_expunge): Respect the user's desire to
-	be prompted to confirm that he wants to expunge the blasted
-	folder. Also, don't set the usize - that's just an evil hack and
-	you may find it will cut off text once the label has been
-	translated.
-	(create_msg_composer): In order for the security options to be
-	checked when composing a new message, we must set the from account
-	explicitly even though the composer hdrs sets the default from
-	account and emits the signal because at that stage the composer
-	hasn't yet connected to the signals and thus the bonobo menu items
-	don't get set.
-
-	* mail-config.c (mail_config_set_confirm_expunge): New.
-	(mail_config_get_confirm_expunge): New.
-
-2001-08-16  Peter Williams  <peterw@ximian.com>
-
-	* subscribe-dialog.c (fe_got_children): Sort the nodes here...
-	(fe_sort_folder): ... using this function.
-
-	* folder-browser-ui.c (folder_browser_ui_message_loaded): Check
-	for uic == NULL. I'm not sure how this could happen, but...
-
-2001-08-16  Peter Williams  <peterw@ximian.com>
-
-	* folder-browser-ui.c (folder_browser_ui_set_selection_state):
-	Disable "Search Message" when more or less than exactly one
-	message is selected.
-
-	* subscribe-dialog.c (fe_done_subscribing): Instead of hackfully
-	getting the path, use a CamelURL so that escaping is
-	handled. Silly me. -- See below --
-	(fe_node_to_shell_path): Use node->name and node->full_name to
-	generate the the shell path of this item. Don't need to escape the
-	URL, and handle cases when dir_sep != '/'
-	(fe_done_subscribing): Use fe_node_to_shell_path instead of the
-	CamelURL.  Third time's the charm...  * folder-browser-ui.c
-	(folder_browser_ui_set_selection_state): Disable "Search Message"
-	when more or less than exactly one message is selected.
-
-	* subscribe-dialog.c (fe_done_subscribing): Instead of hackfully
-	getting the path, use a CamelURL so that escaping is
-	handled. Silly me. -- See below --
-	(fe_node_to_shell_path): Use node->name and node->full_name to
-	generate the the shell path of this item. Don't need to escape the
-	URL, and handle cases when dir_sep != '/'
-	(fe_done_subscribing): Use fe_node_to_shell_path instead of the
-	CamelURL.  Third time's the charm...
-
-2001-08-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (save_part): Remember the filename is in utf8, so
-	use the e_utf8 functions to set the filename in the file selection
-	dialog.
-
-2001-08-15  Peter Williams  <peterw@ximian.com>
-
-	* message-list.c (on_cursor_activated_idle): Always remove the
-	idle and return FALSE, instead of returning TRUE if more than one
-	message is selected.
-
-2001-08-15  Jason Leach  <jleach@ximian.com>
-
-	* mail-tools.c (mail_tool_quote_message): Stop building the quote
-	after a sigdash, hence, omitting the signature from a
-	reply/forward.  Bug #5529.
-
-2001-08-15  Anna Marie Dirks <anna@ximian.com>
-
-	* mail-callbacks.c (expunge-folders): Re-added, at Ettore's
-	request, the confirm-expunge dialog. 
-
-2001-08-15  Jason Leach  <jleach@ximian.com>
-
-	* message-list.c (message_list_init): Use ALWAYS for scroll frame
-	policy because ETable acts lame with AUTOMATIC.  Bug #6925.
-	
-2001-08-16  Not Zed  <NotZed@Ximian.com>
-
-	* mail-callbacks.c (expunge_folder): Don't confirm expunge.
-
-2001-08-15  Not Zed  <NotZed@Ximian.com>
-
-	* mail-local.c (register_folder_register): Remove operation
-	registration/etc.  Handled by mail-mt.c
-
-	* message-list.c (regen_list_regen): Remove camel operation
-	registration/etc.
-
-2001-08-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (load_accounts): Convert the UTF-8 account name
-	string into a gtk-string before using it in the GtkCList.
-
-2001-08-14  Peter Williams  <peterw@ximian.com>
-
-	* mail-callbacks.c (previous_unread_msg): Make previous unread
-	wrap around too.
-
-	* mail-accounts.c (load_accounts): If the account is enabled,
-	set a checkmark pixmap instead of a strange plus sign.
-	(mail_accounts_dialog_init): Load the pixmap here.
-	(mail_accounts_dialog_finalise): Free it here.
-
-	* mail-accounts.h: Prototype it here.
-
-2001-08-14  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c (message_list_drag_data_get): Fix the fix for
-	#6722.
-
-	* mail-ops.c (save_messages_save): Likewise.
-	(save_part_save): Deal with the possibility that
-	camel_mime_filter_charset_new_convert will return NULL (bad
-	charset name). Fixes #6611.
-
-2001-08-13  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-search.c (mail_search_construct): Disable the "search
-	forward/backward" option in the search dialog.  Why?  Well, it
-	doesn't work properly (bug #4869), and the reason it doesn't work
-	is because of some scary stuff deep inside of gtkhtml that I don't
-	understand at all.  So since I'm paranoid, and since the GUI
-	freeze is tomorrow, and since it isn't really an important feature
-	at all, I'm #if 0-ing it out.  If the gtkhtml stuff gets sorted
-	out, we can slip it back in for 1.1.
-
-2001-08-13  Peter Williams  <peterw@ximian.com>
-
-	* component-factory.c (user_create_new_item_cb): New function,
-	handle "user creatable items".
-	(component_fn): Tell the shell that we're capable of creating
-	mail messages.
-
-2001-08-13  Jason Leach  <jleach@ximian.com>
-
-	* mail-local.c (get_folder): Fix this so it can actually get
-	folders from the hash of folders on the local store (it was
-	looking up plain @folder_name, which is typically "mbox", instead
-	of the full URI, /home/jleach/evolution/local/Foo/mbox).
-
-	* component-factory.c (do_remove_folder): Rename to
-	remove_folder_done, more fitting for it's purpose.
-	(do_xfer_folder): Similar name change.
-	(do_create_folder): Similar name change.
-	(remove_folder): Don't notifyResult for the component here, we
-	will notify with our result in remove_folder_done.
-	(xfer_folder): Ditto.
-
-	* mail-vfolder.c (vfolder_refresh): Create new folders with unread
-	counts of "0" instead of #FALSE (which just happens to be #defined
-	as zero).
-
-2001-08-13  Peter Williams  <peterw@ximian.com>
-
-	* mail-send-recv.c (mail_autoreceive_setup): Break most of the
-	functionality into a separate function.
-	(autoreceive_setup_list): Rename of mail_autoreceive_setup that is
-	passed a list of accounts.
-	(mail_autoreceive_setup_account): New function. Set up a single
-	account using autoreceive_setup_account.
-
-	* mail-send-receive.h: Prototype mail_autoreceive_setup_account.
-
-	* mail-account-gui.c (mail_account_gui_save): Instead of setting
-	up all accounts, set up only this source with the new
-	mail_autoreceive_setup_account.
-
-	* mail-config-druid.c (druid_finish): ... which means we can call
-	mail_config_add_account() after the MailConfigAccount has been
-	created by mail_account_gui_save() because we no longer need the
-	account to be in the list for mail_autoreceive_setup()
-
-	* mail-config.c (mail_config_add_account): ... which means we can
-	possibly add a shortcut to the account's sources's Inbox here.
-	(maybe_add_shortcut): New function. If the store is a storage, add
-	a shortcut to its inbox. Hope that /INBOX exists.
-	(add_shortcut_entry): New function. Creates a shortcut if it doesn't
-	yet exist.
-
-2001-08-13  Peter Williams  <peterw@ximian.com>
-
-	* mail-account-gui.c (service_complete): Take account of the fact that
-	service->path may be NULL (if service is a transport.)
-
-	* mail-config-druid.c (druid_finish): Bleah, bugfix in case the
-	account has no source.
-
-2001-08-13  Anna Marie Dirks <anna@ximian.com>
-	
-	* mail-config.glade: Changed all instances of "Wizard" and "Druid"
-	to "Assistant".
-
-	* mail-config-druid.c: Ditto.
-	
-2001-08-13  Anna Marie Dirks <anna@ximian.com>
-
-	* mail-accounts.c: Changed the title of the Mail Settings
-	dialog from "Evolution Account Manager" to "Mail Settings" .
-	
-2001-08-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (get_message_uid): Do some g_assert()
-	action. Make sure that the node passed in is non-NULL and also
-	make sure that the CamelMessageInfo gotten from the ETree is
-	non-NULL.
-	(get_message_info): Same here.
-
-	* mail-callbacks.c (expunge_folder): Confirm that the user really
-	wants to expunge.
-	(save_msg_ok): Set the parent window here.
-
-2001-08-13  Peter Williams  <peterw@ximian.com>
-
-	* mail-config.c (remove_account_shortcuts): Remove the shortcuts
-	corresponding to an account (they all point to 
-	evolution:/accountname/..)
-	(mail_config_remove_account): When deleting the account, remove
-	its shortcuts.
-
-2001-08-10  Peter Williams  <peterw@ximian.com>
-
-	* mail-config-druid.c (druid_finish): Whoa, fatal typo. Sorry.
-
-2001-08-13  Jason Leach  <jleach@ximian.com>
-
-	* mail-local.c (init_trash): Tell folder cache the path for our
-	Trash is /Trash, because that's what Shell needs to hear for
-	updating folders.
-
-2001-08-11  Jason Leach  <jleach@ximian.com>
-
-	* mail-offline-handler.c (impl_goOnline): Set the session as
-	online so auto mail checking (and the composer) will be doing the
-	right things when you go online.  Bug #6343 and #4601.
-
-	* folder-browser.c: Make the right click "Resend..." into "Edit as
-	New Message...", bug #6838.
-
-	* mail-accounts.h: Remove unecessary #include <camel.h>
-
-	* mail.h: Removed a prototype for a non-existant
-	mail_view_create().
-
-2001-08-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (build_auth_menu): Fix bug #4523 for good.
-	(save_service): If service->authitem is NULL, then the user tried
-	to enable authentication but the provider doesn't actually support
-	it.
-
-2001-08-10  Jon Trowbridge  <trow@ximian.com>
-
-	* folder-browser.c: Set our ESearchBarItems subitems to NULL.
-
-2001-08-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (transfer_msg): Prepend the uri with evolution:
-	to fix bug #6916.
-
-2001-08-10  Jason Leach  <jleach@ximian.com>
-
-	* folder-browser.c: Make the context menu for the Sent folder have
-	"Resend..." instead of "Resend", to clarify that it will bring up
-	a dialog needing your input rather than just blindly sending the
-	message again.  Also give it the 'e' accelerator.  Bug #6838.
-
-	* mail-callbacks.c (next_unread_msg): Since 'N' keypresses go
-	through here now, use wrap-around selecting.
-	(previous_unread_msg): Same for 'P' here.
-
-	* message-list.c (on_cursor_activated_idle): Stop this idle timer
-	when we have multiple items selected, this keeps it from loading
-	and then marking the last item in your selection list as read.
-	Bug #4693.
-
-2001-08-10  Peter Williams  <peterw@ximian.com>
-
-	* mail-accounts.c (mail_delete): Don't remove the account from the
-	tree if it's not enabled.
-
-2001-08-10  Jason Leach  <jleach@ximian.com>
-
-	* mail-ops.c (remove_folder_get): Remove all the messages from a
-	folder that's being deleted before actually doing the
-	camel_store_delete_folder, so it won't leave behind an mbox file
-	that's going to prevent the actual directory from being deleted,
-	and strange effects like new folders with the same name being made
-	in it's place.  Bug #5618.
-
-	* mail-folder-cache.c (mail_folder_cache_remove_folder): New
-	function, a way to get something out of the folder cache, like
-	folders being deleted.  Bug #6878.
-
-2001-08-10  Peter Williams  <peterw@ximian.com>
-
-	* mail-accounts.c (news_add_destroyed): Whoops, compile fix.
-
-2001-08-10  Jason Leach  <jleach@ximian.com>
-
-	* mail-callbacks.c (mark_as_unseen): If marking messages as
-	unread, remove the automatic mark-as-read timer.  Bug #4153.
-
-2001-08-08  Peter Williams  <peterw@ximian.com>
-
-	* component-factory.c (mail_load_storages): Don't load the storage
-	if it isn't enabled.
-	(mail_remove_storage_by_uri): New function. Goes through the
-	gymnastics of getting a CamelStore from the URI and calling 
-	mail_remove_storage. Copied from mail_delete().
-	(mail_load_storage_by_uri): Break out the storage-loading part of
-	mail_load_storages into a single function.
-	(mail_load_storages): Just call mail_load_storage_by_uri several
-	times.
-
-	* mail.h: Prototype our new _by_uri functions.
-
-	* mail-accounts.c (news_add_destroyed): Instead of hacking around
-	mail_load_storages, call mail_load_storage_by_uri.
-	(mail_delete): Move this chunk of code into 
-	mail_remove_storage_by_uri.
-	(mail_able): Add or remove the storage as necessary, with our
-	new _by_uri functions.
-
-	* mail-config-druid.c (druid_finish): See news_add_destroyed above.
-
-2001-08-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_get_show_preview): Free dbkey if we
-	don't use it.
-
-	* folder-browser.c (on_right_click): Added a comment about leaking
-	memory here, but we seem to not even use the 2 strings we
-	strdup...is this code still under construction?
-
-	* mail-ops.c (mail_send_message): Free the sent_folder_uri at the
-	bottom of the function (ironically enough we were freeing it if we
-	encountered an error but never free'd it on success :-)
-	(get_folderinfo_got): Fixed a memory leak...this one would have
-	gone away once we got rid of the debug g_warning though.
-
-2001-08-10  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (mail_transfer_messages): Dont want it to keep on
-	running if it got bad arguments, want it to bloody well crash.
-	(mail_append_mail): Same here.
-
-2001-08-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (mlfe_callback): Added a g_assert_not_reached() -
-	I'm hoping this will help us track down the "can't delete message
-	sometimes" (ie bug #6637 and friends) bugs that users have been
-	reporting. If herein lies the problem, then we can expect some
-	crashes and some good backtraces, hopefully.
-
-2001-08-09  Peter Williams  <peterw@ximian.com>
-
-	* folder-browser.c (on_key_press): The bonobo menu items now
-	handle 'n' and 'p'.
-	(on_key_press): 'q' as well.
-
-	* message-list.c (message_list_select): Fix inline documentation.
-
-2001-08-09  Anna Marie Dirks <anna@ximian.com>
-
-	Fixes bug #6918
-	
-	* folder-browser.c: Changed the "Store search as vFolder" menu
-	item to "Create vFolder from Search".
-
-2001-08-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fixes bug #6722
-
-	* mail-ops.c (save_messages_save): Don't set the default perms
-	here, let the user's umask deal with permissions.
-
-	* folder-browser.c (message_list_drag_data_get): Don't set any
-	default perms.
-
-2001-08-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Save the pgp and
-	smime always-sign options.
-
-	* mail-config.c (account_copy): Copy the always-sign options over
-	too.
-
-2001-08-08  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (send_mail_send): Dont double-register this
-	operation, mail-mt will do it for us.
-	(get_folderinfo_get):  "
-	(get_folder_get): "
-	(get_store_get): "
-	(create_folder_get): "
-	(remove_folder_get): "
-	(sync_folder_sync): "
-	(get_message_get): "
-
-	* message-list.c (message_list_setup_etree): Free the etstate
-	object after we're done using it.
-
-2001-08-08  Peter Williams  <peterw@ximian.com>
-
-	* subscribe-dialog.c (sc_selection_changed): New function. Set the
-	sensitivity of the subscribe buttons based on whether any folders
-	are selected.
-	(menu_item_selected): If getting the widget for the first time,
-	hook up sc_selection_changed.
-
-2001-08-08  Peter Williams  <peterw@ximian.com>
-
-	* mail-ops.c (mail_update_subfolders): Change this gtk_object_ref
-	on the storage to a bonobo_object_ref.
-
-	* component-factory.c (mail_lookup_storage): And here.
-
-	* mail-vfolder.c (mail_vfolder_get_vfolder_storage): And here.
-
-2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* message-browser.c (set_bonobo_ui): Remove the "Customize
-	Toolbar" thing.
-
-2001-08-07  Not Zed  <NotZed@Ximian.com>
-
-	* mail-config.c (mail_config_get_thread_list): Free the dbkey if
-	we found the config option.
-
-	* mail-send-recv.c (build_dialogue): Free the pretty_url after
-	we've used it.
-	(free_send_info): Free the 'what' string.
-	(receive_done): Use free_send_info to make sure we free
-	everything.
-
-	* mail-ops.c (send_queue_free): Unref the filter driver when done.
-	(send_queue_send): Unref the driver here too, force any long
-	taking operations to run in our thread.
-
-2001-08-07  Peter Williams  <peterw@ximian.com>
-
-	* Revert Jeff's changes to subscribe-dialog.[ch]. It's not a widget,
-	it's an object from which you can obtain a widget.
-
-2001-08-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (manage_subscriptions): Hide the app->window.
-	(do_mail_print): Set the parent of the gnome-dialog to be the
-	folder-browser so that when evolution is closed, the print dialog
-	gets destroyed. Should fix bug #4781.
-
-	* subscribe-dialog.c (subscribe_dialog_new): This should return a
-	GtkWidget not a GtkObject.
-
-	* mail-session.c (get_filter_driver): Update to use user's logging
-	preferences.
-
-	* mail-accounts.c (filter_log_toggled): New.
-	(filter_log_path_changed): New.
-	(construct): Get and attach signals to the filter logging option
-	widgets.
-
-	* mail-config.c (config_read): Read in filter logging options.
-	(mail_config_write_on_exit): Save filter logging options.
-	(mail_config_set_filter_log_path): Implemented.
-	(mail_config_get_filter_log_path): Implemented.
-	(mail_config_set_filter_log): Implemented.
-	(mail_config_get_filter_log): Implemented.
-
-2001-08-07  Peter Williams  <peterw@ximian.com>
-
-	* subscribe-dialog.c (folder_etree_construct): Move
-	fe_create_root_node farther down, so we can check for its children
-	without problems.
-
-	* mail-callbacks.c (folder_created): Use bonobo_object_unref on
-	the storage since it's a bonobo object.
-	(mail_storage_create_folder): Same.
-	(folder_deleted): Same.
-
-	* mail-send-recv.c (receive_update_got_store): Same.
-
-	* mail-ops.c (do_update_subfolders): Same.
-
-	* subscribe-dialog.c (fe_destroy): Unref the e_storage since
-	lookup_store gives us a ref.
-
-2001-08-07  Peter Williams  <peterw@ximian.com>
-
-	* subscribe-dialog.c (folder_etree_construct): Move
-	fe_create_root_node farther down, so we can check for its children
-	without problems.
-	(storage_tree_path): Removed, this was broken.
-	(subscribe_get_short_folderinfo): Use the queued thread instead of
-	the new thread.
-	(subscribe_do_subscribe_folder): Same.
-	(ftree_node_new_root): Don't create the path anymore; it was
-	broken and there's a better way to get it now.
-	(fe_got_children): Remove some debugging output.
-	(fe_check_for_children): Here too.
-	(fe_done_subscribing): Get the path from the URI instead of the
-	ftree_node.
-	(_SubscribeDialogPrivate): Add all of our useful widgets as
-	members.
-	(sc_refresh_pressed): Don't clear the search... that makes no
-	sense now.
-	(sc_search_activated): Don't set the filter radio button as active
-	now; we use sensitivity instead.
-	(sc_all_toggled): Make the search entry insensitive.
-	(sc_filter_toggled): Make the search entry sensitive.
-	(kill_default_view): New function. Gets rid of the default view
-	stuff and makes all the widgetry sensitive.
-	(menu_item_selected): Check if we moved off of the default view
-	and, if so, call kill_default_view().
-	(subscribe_dialog_construct): Initialize our new private widget
-	members, and by default insensitize most of the buttons because
-	they make no sense in the default view.
-
-2001-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.glade: Added key accelerators to a bunch of the
-	config options and moved the Bcc and empty-subject checkboxes to
-	the composer tab where they belong.
-
-	* mail-callbacks.c (providers_config): Raise the dialog if it
-	exists already.
-	(manage_subscriptions): Raise the dialog if it already exists.
-	(main_select_first_unread): Removed (we haven't needed this code
-	in ages).
-	(select_first_unread): Same.
-	(save_msg_ok): If the path is empty, just return.
-
-	* mail-local.c (mail_local_reconfigure_folder): Raise the dialog
-	if it already exists.
-
-2001-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (expunge_folder): Set the message-display
-	message to NULL if we can't get an info too.
-
-2001-08-06  Jason Leach  <jleach@ximian.com>
-
-	* mail-callbacks.c (create_folders): Make vtrash folders on other
-	storages with a "vtrash" type, so they get the little trashcan
-	icon.
-
-2001-08-06  Peter Williams  <peterw@ximian.com>
-
-	* subscribe-dialog.[ch]: Reimplement to be asynchronous and pretty,
-	with progressive folder loading and all sorts of wonderful
-	improvements.
-	
-	* mail-callbacks.c (manage_subscriptions): Change to reflect API
-	update.
-
-	* Makefile.am (etspec_DATA): Add subscribe-dialog.etspec.
-	(glade_DATA): And the glade file.
-
-	* subscribe-dialog.etspec: New file, break out the specification
-	from inside the subscribe-dialog.c
-
-	* subscribe-dialog.glade: Update this, actually use it now.
-	
-2001-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (empty_trash): Yuck. Special case whether or
-	not we want to expunge all the trash folders syncronously or
-	asyncronously based on whether or not we are doing Empty-On-Exit
-	or emptying trash by user request respectively.
-
-2001-08-06  Jason Leach  <jleach@ximian.com>
-
-	* mail-folder-cache.c (make_folder_name): Removed this function,
-	it's not needed anymore.
-	(mail_folder_cache_note_folderinfo): Initialize mfi->unread to 0
-	always, so the shell won't get sent a random int for vtrash or
-	potentially other folders.
-
-	* message-list.c (message_list_select): Fix a minor glitch with
-	how it started a backwards wraparound at the 2nd to last message,
-	skipping the very last message.
-
-2001-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.glade: s/character set/character encoding
-
-2001-08-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* message-browser.c (message_browser_message_loaded): Make the
-	title of the window "subject - Message" instead of just "subject".
-	Also, display "(No subject)" if the subject is NULL.
-
-	[Fix #6399, 8-bit characters are not displayed in window title.]
-
-	* message-browser.c (message_browser_message_loaded): Convert the
-	subject from UTF-8 to GTK.
-
-2001-08-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Revert the previous changes, there seems to be something wrong
-	with it.]
-
-	* component-factory.c (component_factory_init): Back to using
-	`bonobo_generic_factory_new()'.
-	(component_fn): Updated accordingly.
-
-2001-08-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (component_factory_init): Use
-	`e_bonobo_generic_factory_multi_display_new()' instead of just
-	`bonobo_generic_factory_new()'.
-	(component_fn): Added @component_id arg.
-
-2001-08-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_part_is_inline): Add yet another
-	special-case hack for application/pgp.
-
-2001-08-04  Jason Leach  <jleach@ximian.com>
-
-	* message-list.c (message_list_select): Add a @wraparound
-	argument, so the 'n' and 'p' keypresses (or anything else that
-	wants to) can wrap around to find the next unread.
-
-	* folder-browser.c (on_key_press): Tell it to wrap around here.
-	
-	* mail-callbacks.c (delete_msg): Don't wrap around here (or the
-	other callbacks in this file).
-
-2001-08-03  Jason Leach  <jleach@ximian.com>
-	
-	* mail-folder-cache.c (update_idle): Updates for EvolutionStorage
-	API changes.
-
-	* mail-importer.c (mail_importer_create_folder): Ditto.
-
-	* mail-local.c: Same here.
-
-2001-08-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (build_auth_menu): Try to restore the choice
-	the user had chosen before hitting the "Check Supported Types"
-	button.
-
-	* mail-format.c (write_headers): Removed a no-longer-needed
-	g_warning.
-
-2001-08-03  Not Zed  <NotZed@Ximian.com>
-
-	* mail-session.c (get_password): return the source url for
-	popb4smtp auth request.
-
-2001-08-02  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-ops.c (filter_folder_describe): Added.  Provide
-	description for filter_folder_op.
-	(fetch_mail_describe): Added.  Provide description for
-	fetch_mail_op.
-
-	* message-list.c (regen_list_describe): Added.  Provide
-	description for regen_list_op.
-
-	* mail-config.c (check_service_describe): Added.  Provide
-	description for check_service_op.
-
-	* folder-info.c (do_describe_info): Added.  Provide description
-	for get_info_op.
-
-2001-08-02  Larry Ewing  <lewing@ximian.com>
-
-	* mail-send-recv.c (format_url): handle null paths in the dialog
-	so that we avoid printing NULL strings
-
-2001-08-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (filter_edit): Raise the filter-editor window
-	if it's already created.
-
-	* folder-browser.c (message_list_drag_data_received): I obviously
-	can't spell recieved, er, received...uh, yea.
-
-2001-08-02  Jason Leach  <jleach@ximian.com>
-
-	* mail-config.glade: Set history_id's for the sig and html sig
-	gnome file entry boxes so it can persist history, also add titles
-	to the dialogs that popup when you click the "Browse..." button.
-	Bug #5595.
-
-2001-08-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vfolder.c (vfolder_create_storage): Connect to the
-	folder_remove signal on the storage.
-	(vfolder_remove): New function to remove a vfolder.
-	(vfolder_edit): Raise the window if it already exists.
-
-2001-08-02  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (INCLUDES): Add EVOLUTION_BUTTONSDIR to get to some
-	different icons.
-
-	* mail-ops.c (mail_sync_folder): Queue the folder sync operation,
-	rather than running it in parallel.
-
-	* mail-send-recv.c: applies anna's patch for prettier send-recv
-	dialogue.
-	(parse_url): Renamed to format_url, fixed callers.
-	(format_url): Use camel_url_free instead of g_free, also handle
-	case where we have no host (use path instead).
-	(build_dialogue): Cleaned up some whitespace.
-	(build_dialogue): Create the label directly with the right text,
-	dont set any text in the progress bar, and save the label into the
-	info struct for later updating.
-	(struct _send_info): Added 'status' the label with the status
-	string.
-	(operation_status_timeout):
-	(receive_done): 
-	(receive_cancel): Set the status label, not the progress format
-	text.
-	(hide_send_info): NULL out status too.
-	(mail_receive_uri): Init status.
-	(free_folder_info): Initiate a folder sync here, so we can ...
-	(free_send_data): ... Remove the awful hack of iterating through
-	bonobo controls to sync all open folders.
-	(free_send_data): Initiate a sync of the inbox too.
-	(build_dialogue): Remove set_alignment on the icon, its not a
-	gtkmisc object.
-
-2001-08-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (folder_browser_copy): Do the Right Thing (tm)
-	if the message list is not the widget in focus (which is to copy
-	the text selected in the html viewer instead). Fixes bug #5868.
-
-2001-08-01  Jason Leach  <jleach@ximian.com>
-
-	* folder-browser-ui.c: Use the new Save As and Message Search
-	icons from Jakub.
-
-	* mail-callbacks.c (delete_msg): Don't move cursors around when
-	deleting last message and Hide Deleted Messages isn't enabled.
-	Bug #5928.
-
-2001-07-31  Anna Marie Dirks <anna@ximian.com>
-	
-	* mail-mt.c (do_get_pass): Changed the title of this dialog
-	to "Enter Password". 
-	
-2001-07-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-mt.c (do_get_pass): We are not guarenteed to have a
-	non-NULL service (ie. PGP) thus check for it.
-	(pass_got): And again here.
-	(mail_get_password): And of course here too.
-
-	* mail-format.c (decode_pgp): When writing out a CamelException to
-	the HTML stream, be sure to translate it first.
-	(handle_message_external_body): Convert to UTF8 here too - I know
-	this function is basically a dead end right now but eventually we
-	will want to do something. I mostly did this because param values
-	are UTF8 encoded so we should avoid mixing and matching UTF with
-	non UTF8.
-	(format_mime_part): Avoid writing non-UTF8 to the HTML stream.
-
-	* mail-tools.c (mail_tool_make_message_attachment): Convert
-	translated strings to UTF8 here too.
-	(mail_tool_forward_message): Here too.
-
-2001-07-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* mail-format.c (attachment_header, write_address, decode_pgp,
-	mail_write_authenticity):
-	Convert translated strings to UTF8 before calling mail_html_write.
-
-	I modified the patch slightly and cleaned up bits of code around
-	it as well. For example, we probably want to avoid having HTML
-	tags in the strings to be translated. -- fejj
-
-2001-07-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_new): Restore old security
-	settings from the saved configuration. Fixes bug #5710.
-
-2001-07-30  Not Zed  <NotZed@Ximian.com>
-
-	* mail-session.c (do_register_timeout): Actually add the timeout,
-	this time in the gtk thread.
-	(do_remove_timeout): And same for remove.
-	(register_timeout):
-	(remove_timeout): Proxy the gtk calls to the main thread, and
-	wait for them to execute synchronously.
-	(register_timeout): Instead of return with fail for a too small
-	timeout, just increase the timeout.
-
-2001-07-27  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* component-factory.c (populate_folder_context_menu): Added (unused)
-	table with strings intended to be translated (i18n tools can't extract
-	strings from XML data inside .c file).
-
-2001-07-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-mt.c (focus_on_entry): Don't need this anymore.
-	(do_get_pass): Since we already have the entry widget, no need to
-	do the nasty focus_on_entry hack.
-
-2001-07-26  Peter Williams  <peterw@ximian.com>
-
-	* mail-mt.c (do_get_pass): Figure out whether we're getting the
-	password for the source or the transport, and get the toggle
-	button accordingly.
-	(pass_got): Same.
-
-	* mail-config.c (mail_config_get_account_by_transport_url): New
-	function.  Cut + paste + search + replace of _by_source_url.
-
-	* mail-config.h: Prototype here.
-
-2001-07-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (message_list_drag_data_get): If we don't have
-	any messages selected, break out. This fixes bug #5612.
-
-	* component-factory.c (xfer_folder): Fixed a strstr (url,
-	"noselect=yes") brokenness.
-	(destination_folder_handle_motion): Same.
-	(destination_folder_handle_drop): And again here.
-
-	* mail-format.c (handle_application_pgp): Implemented.
-	(setup_mime_tables): Setup the application/pgp handler to use
-	handle_application_pgp instead of handle_text_plain.
-	(handle_text_plain): Remove special-case hacks for application/pgp
-	types.
-
-	* mail-config.glade: beautification.
-
-2001-07-26  Peter Williams  <peterw@ximian.com>
-
-	* mail-mt.c (do_get_pass): Use magic to make the password
-	remembering checkbutton come after the entry, visually.
-
-2001-07-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (write_headers): Respect Gtk theme colors for the
-	fonts and calculate a new table gbcolor based on gtk theme
-	preferences.
-
-	* mail-config.glade: Label the enabled field.
-
-2001-07-26  Peter Williams  <peterw@ximian.com>
-
-	* message-list.etspec: Make the date column smaller and the
-	subject column larger, relatively.
-
-	* mail-folder-cache.c (make_folder_status): Don't display "0
-	hidden".
-
-	* folder-browser.c (on_key_press): Make 'q' a toggle, not one-way.
-
-	* message-list.etspec: Rename "Date" column to "Sent".
-
-2001-07-25  Anna Marie Dirks <anna@ximian.com> 
-
-	* mail-config.glade: fixed a mis-spelling of "Fashion" in the mail
-	accounts window. (See bug 5433)
-
-2001-07-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-session.c (make_key): Don't make the key url:item if we
-	have the url, just make it url. This fixes bug #5339.
-	(mail_session_set_password): Removed.
-
-2001-07-25  Peter Williams  <peterw@ximian.com>
-
-	* folder-browser.c (etree_key): Make it so Enter always opens the
-	message in another window.
-
-2001-07-25  Peter Williams  <peterw@ximian.com>
-
-	* mail-mt.c (mail_get_password): Now take a CamelService parameter
-	(as passed by Camel). Allows us to have a "remember password"
-	checkbox that is set correctly and whose settings can be
-	propagated back to the proper MailConfigService.
-	(do_get_pass): Add a checkbutton allowing the user to change
-	whether the password is remembered or not.
-	(pass_got): Apply the setting of the "remember password"
-	checkbutton (if not cancelled.)
-
-	* mail-mt.h: Update the prototype here.
-
-	* mail-config.c (mail_config_service_set_save_passwd): New
-	function, pretty bland.
-
-	* mail-config.h: Prototype our bland new function. (Get it? It's a
-	pun!)
-
-	* mail-session.c (get_password): Pass the service as well.
-
-2001-07-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (build_auth_menu): Now takes a
-	check_supported gboolean argument saying whether or not to disable
-	non-supported authtypes.
-	(source_type_changed): Update for build_auth_menu.
-	(transport_type_changed): Same.
-	(service_check_supported): Pass in TRUE for the disable
-	non-supported authtypes to build_auth_menu and also disable
-	check-supported button and the authtype menu if we get a NULL
-	supported auth list.
-
-	* mail-callbacks.c (mail_generate_reply): Initialize `me' to NULL.
-	(forward_attached): If we are only forwarding a single message,
-	pass the message along as the callback data, else pass NULL.
-	(do_forward_attach): Updated for changes to
-	forward_get_composer().
-	(do_forward_non_attached): Same.
-	(forward_get_composer): Try to guess which account to forward the
-	message from if the message passed in is non-NULL.
-
-2001-07-24  Peter Williams  <peterw@ximian.com>
-
-	* mail-config.c (mail_config_write): Um, write the HTML signature
-	settings in the right place. Whoops.
-
-2001-07-24  Jason Leach  <jleach@ximian.com>
-
-	* mail-callbacks.c (delete_msg): If we're deleting the last
-	message, select the previous, not next, which actually selects
-	nothing.  Fixes #5323.
-
-2001-07-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (save_part_save): Pass the O_TRUNC flag to open so
-	that we don't leave trailing garbage at the end of the file if the
-	new file content is shorter than the old file content.
-
-	* component-factory.c (create_view): Fix for bug #5174.
-
-2001-07-24  Jason Leach  <jleach@ximian.com>
-
-	* mail-config.c (config_read): Match the prefix for the
-	"remember_passphrase" setting with where it's being saved to
-	(/Mail/Prompts), so the setting gets loaded correctly.  Fixes
-	#5351.
-
-2001-07-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_text_plain): check_specials if this is an
-	application/pgp type as well.
-
-	* mail-ops.c (add_vtrash_info): When dumping the CamelURL to a
-	string, hide all the params.
-
-2001-07-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (guess_me): Do a case-insensitive comparison.
-	(mail_generate_reply): Only resort to the source account's
-	identity if we can't find out which identity to use based on the
-	recipients of the message first.
-
-	* mail-config.c (mail_config_get_default_account): Make sure to
-	return the 0th account if we don't have a default. We don't want
-	to return NULL.
-
-	* mail-callbacks.c (empty_trash): Use mail_tool_get_trash for the
-	remote store trash folders.
-
-	* mail-tools.c (mail_tool_get_trash): New convenience function.
-
-2001-07-24  Jason Leach  <jleach@ximian.com>
-
-	* mail-config.c (config_read): get_boolean_with_default for the
-	"Mark as read" timeout, not get_long_with_default.  Fixes #5176.
-
-2001-07-24  Peter Williams  <peterw@ximian.com>
-
-	* mail-folder-cache.c (make_folder_name): Don't display "(0 unsent)" if
-	the outbox is empty.
-
-	* mail-local.c (init_trash): Set up the local trash in the folder
-	cache.
-
-	* mail-folder-cache.c (update_idle): Make the error reporting a little
-	but more descriptive.
-
-2001-07-24  Peter Williams  <peterw@ximian.com>
-
-	* mail-config.glade: Add new label widgets with a message that SSL
-	isn't supported.
-	
-	* mail-account-gui.h: Add a new member to the Transport GUI struct
-	for the 'SSL is not supported' message.
-	
-	* mail-account-gui.c (source_type_changed): Change logic to display
-	a message stating that SSL isn't supported if SSL isn't supported.
-	(transport_type_changed): Same.
-	(mail_account_gui_new): Also load the labels for the the no-SSL
-	message.
-
-	* mail-accounts.c (construct): Fix typo.
-
-2001-07-24  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c (create_folder): Dont call notifyResult here
-	if we've just launched a thread to do the work, it calls it
-	itself.  This apparently breaks the importers, but thats a
-	different issue.
-
-2001-07-23  Not Zed  <NotZed@Ximian.com>
-
-	* mail-mt.c (mail_msgport_replied): Go back to calling
-	mail_msg_free here.
-	(mail_msg_destroy): Remove the operation unregistration stuff.
-	(mail_msg_received): And put it here, so we unregister as soon as
-	the async part of the operation is complete.  I thought about this
-	and we should be doing this anyway so we register/unregister
-	always in the same thread, although the camel_operation api
-	doesn't enforce it, this *is* what it expects.
-
-	* message-list.c (regen_list_regen): re-add reporting to
-	rebuilding the message list.  Basically fixes #4931
-
-2001-07-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-search.c (toggled_fwd_cb): Oops. Uncomment this code since
-	Trow fixed GtkHTML to actually have this function now.
-
-	* mail-config.glade: Fixed the "Read" to be Read in the glade file
-	per menesis' request.
-
-	* mail-accounts.c (construct): Give the dialog a Close button
-	instead of an OK button.
-	(prompt_bcc_only_toggled): New.
-	(threaded_list_toggled): New.
-	(show_preview_toggled): New.
-	(construct): Add code for the bcc-only-prompt, threaded-list, and
-	show-preview checkboxes.
-
-	* mail-ops.c (transfer_messages_transfer): If the source and
-	destination folders are the same, just mark the uids as undeleted
-	(in case they were marked as deleted before).
-
-2001-07-23  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-search.c (begin_cb): Carefully check for NULL everywhere,
-	and do the right thing if the message we are currently looking at
-	gets expunged. (Bug #4870)
-
-2001-07-23  Jason Leach  <jleach@ximian.com>
-
-	[Bug #5225: No UI way to mark as unimportant]
-	
-	* folder-browser.c (on_right_click): Do the necessary stuff to
-	show or hide the correct "Mark Important" or "Mark as Unimportant"
-	menu items depending on the status of messages that are selected.
-
-	* folder-browser-ui.c: Add the MarkAsUnimportant verb here.
-
-	* mail-callbacks.c (mark_as_unimportant): Simple function that's
-	the callback for these new menu items.
-
-2001-07-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (remove_folder): Updated to get a @type
-	argument.  Return an error if the type isn't "mail".
-	(xfer_folder): Likewise.
-
-2001-07-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c: Make types "mailstorage" and "vtrash"
-	non-user-creatable.
-
-2001-07-20  Jason Leach  <jleach@ximian.com>
-
-	* mail-summary.c (generate_html_summary): Change this back to the
-	"evolution:/local/Inbox" URI.
-
-2001-07-20  Peter Williams  <peterw@ximian.com>
-
-	* component-factory.c (storage_remove_folder): Don't let the user
-	remove vtrash folders.
-
-2001-07-20  Peter Williams  <peterw@ximian.com>
-
-	* mail-mt.c (mail_msgport_replied): Fix DanW's fix. Pass the right
-	arguments to mail_msg_destroy.
-
-	* component-factory.c (component_fn): Don't populate the context
-	menu; our only action didn't even work.
-	(populate_folder_context_menu): Removed. ChangeFolderProperties
-	needs a FolderBrowser which we don't have. It didn't even work
-	before.
-
-	* mail-local.c (mail_local_reconfigure_folder): Bring the creation
-	of the hash table to the beginning to prevent warnings. Complain
-	if the mailbox is non-local.
-	
-2001-07-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (filter_folder_filter): Don't expunge the source
-	folder if we have a cache.
-
-2001-07-20  Dan Winship  <danw@ximian.com>
-
-	* mail-mt.c (mail_msgport_replied): Use mail_msg_destroy rather
-	than mail_msg_free, so the cancellation operation gets
-	unregistered and doesn't leak two file descriptors.
-
-2001-07-19  Jason Leach  <jleach@ximian.com>
-
-	* mail-summary.c (generate_html_summary): Update this
-	evolution:/local/ URI to evolution:/Local Folders/ to go along
-	with today's shell changes.
-
-2001-07-19  Jason Leach  <jleach@ximian.com>
-
-	* mail-display.c: Fix #4605: "Save Image as" should be "Save Image
-	as...".
-
-2001-07-19  Jason Leach  <jleach@ximian.com>
-
-	* mail-display.c (mail_display_new): Set the vertical scrolling
-	policy for the mail display to AUTOMATIC, only get a scrollbar if
-	the e-mail is longer than one frame.
-
-	* folder-browser.c (my_folder_browser_init): We were setting the
-	policy twice (and to two different things).  Removed this one.
-
-	* message-list.c (message_list_init): Set the policy for the
-	message list scroll frame to be horizontal=NEVER,
-	vertical=AUTOMATIC (scrollbar only if you have >1 page of
-	messages).
-
-2001-07-19  Peter Williams  <peterw@ximian.com>
-
-	Track the NoSelect changes in Camel.
-	
-	* mail-callbacks.c (create_folders): We don't need to check if
-	the URL is NULL or not anymore.
-
-	* component-factory.c (create_noselect_control): New
-	function. Create a dummy control for folders that can't contain
-	messages (ie \NoSelect)
-	(create_view): If the URI says the folder is noselect, make a
-	dummy control. FIXME: still should merge in the global UI
-	elements.
-	(xfer_folder): Don't allow the operation if the destination is
-	NoSelect.
-	(destination_folder_handle_motion): Ditto.
-	(destination_folder_handle_drop): Ditto.
-
-2001-07-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-local.c (reconfigure_folder_reconfigure): remvoed
-	register/start/end etc code.
-
-	* mail-ops.c (get_messages_desc): Add the count here.
-	(get_messages_get): Remove the register/start code, its handled
-	above us.
-	(save_messages_desc): Added count.
-	(save_messages_save): Removed register/start/end code.
-
-	* mail-mt.c (mail_msg_received, mail_msg_destroy): Changed to use
-	camel_operation rather than mail_status.
-	(mail_msgport_received, mail_msgport_replied): Turn of the
-	mail_status stuff, we dont need to report on stuff running in the
-	gui thread right?
-	(retrieve_shell_view_interface_from_control, set_view_data,
-	mail_statusf,  mail_status, mail_status_end, mail_status_start,
-	status_timeout, do_del_status, set_status_op): removed now
-	redundant stuff.
-	(mail_msg_free): Removed reference to timeout_id.
-
-2001-07-18  Not Zed  <NotZed@Ximian.com>
-
-	* mail-local.c (reconfigure_folder_reconfigure): Changed to use
-	camel_operation rathre than mail_status.
-	(reconfigure_folder_describe): re-enabled this function.
-
-	* mail-ops.c (get_messages_get): Changed to use camel-progress for
-	status reporting.
-	(save_messages_save): Likewise.
-
-2001-07-17  Not Zed  <NotZed@Ximian.com>
-
-	* mail-mt.c (struct _mail_msg_priv, destroy_objects, mail_msg_new,
-	mail_msg_free, do_op_status): Changed to use an EvolutionActivityClient for
-	progress.
-
-2001-07-18  Jason Leach  <jleach@ximian.com>
-
-	* mail-tools.h (mail_tool_get_local_inbox_url): Remove this
-	prototype for a function that was removed long ago.
-	(mail_tool_get_local_movemail_url): Ditto.
-
-2001-07-18  Jason Leach  <jleach@ximian.com>
-
-	[Simplifying how default account is stored and used internally,
-	fixes possabilities of having multiple default accounts and things
-	like deleting the current default account]
-	
-	* mail-account-gui.c (mail_account_gui_new): Update for new way of
-	finding out the default account.
-	(mail_account_gui_save): Ditto.
-
-	* mail-accounts.c (load_accounts): Ditto.
-
-	* mail-config-druid.c (make_default_account): Ditto.
-	
-	* mail-config.c: Added an int MailConfig::default_account, to be
-	used instead of a 'default_account' boolean on each mail account.
-	(mail_config_set_default_account_num): New function, facilitates
-	things. 
-
-	* Mail.idl: removed the Account::default_account boolean.
-
-2001-07-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-tools.c (mail_tool_generate_forward_subject): Do what was
-	suggested in #4596.
-
-2001-07-18  Peter Williams  <peterw@ximian.com>
-
-	* mail-accounts.c (construct): Add GTK_WIDGET to the charset
-	picker. Reportedly prevent a craash for someone... ?
-
-	* mail-config.glade: Typo fix.
-	Later: And actually fix the typo.
-
-2001-07-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (mail_delete): Setup the auto-receive here
-	instead.
-
-	* mail-config.c (mail_config_remove_account): Don't setup the
-	auto-recv here.
-
-2001-07-17  Iain Holmes  <iain@ximian.com>
-
-	* mail-accounts.c (mail_able): Reset the auto receive.
-
-	* mail-config.h (mail_config_remove_account): Reset the autoreceive.
-
-2001-07-17  Jason Leach  <jleach@ximian.com>
-
-	* mail-account-gui.c (source_type_changed): Fix for last change:
-	hide the entire widget, not just the entry.
-
-2001-07-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (message_list_drag_data_recieved): Fix to
-	correctly handle text/uri-lists that contain more than a single
-	url.
-
-	* component-factory.c (destination_folder_handle_drop): Fix to
-	correctly handle text/uri-lists that contain more than a single
-	url.
-
-2001-07-17  Jason Leach  <jleach@ximian.com>
-
-	* mail-config.glade: Make the Path: entry into a GnomeFileEntry so
-	you get a nice "Browse..." button that pops up a file selector to
-	locate your mbox files.  Bug #3501.
-
-2001-07-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_part_toggle_displayed): Cleaned up a bit.
-	(handle_multipart_encrypted): Replace the encrypted part with the
-	decrypted part.
-
-2001-07-17  Iain Holmes  <iain@ximian.com>
-
-	* mail-accounts.c (mail_delete): Make a nicer dialog.
-
-2001-07-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-local.c (init_trash): Use CAMEL_VTRASH_NAME.
-
-	* mail-ops.c (add_vtrash_info): Use CAMEL_VTRASH_NAME.
-
-	* folder-browser.c: turned off some debugging
-
-2001-07-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (transfer_msg): Disallow vtrash for now...
-
-	* mail-ops.c (add_vtrash_info): Use g_strcasecmp() when looking
-	for a Trash folder - it may be lowercase or something funky.
-	(transfer_messages_transfer): Special-case vtrash folders.
-
-	* mail-local.c (init_trash): No need to specify the vfolder
-	expression here. This code was moved into camel-vtrash-folder.c
-	ages ago.
-
-	* component-factory.c: Let VTrash folders accept/export the same
-	dnd types as normal folders.
-
-2001-07-16  Peter Williams  <peterw@ximian.com>
-
-	* mail-folder-cache.c (outbox_folder): prototype outbox_folder so
-	we can check if a folder is it.
-	(make_folder_name): If the folder is the outbox, display the count
-	of total messages as "unsent".
-	(make_folder_status): If the folder is the outbox, display
-	"unsent" instead of "total"
-
-2001-07-16  Peter Williams  <peterw@ximian.com>
-
-	* mail-display.c (mail_display_redisplay): Use our own
-	display_style member instead of the global setting.
-	(mail_display_init): Initialize display_style.
-
-	* mail-display.h: Include "mail-config.h" and add a display_style
-	member.
-
-	* mail-format.c (write_headers): Look at the MailDisplay's
-	display_style instead of using the full_headers data.
-
-	* folder-browser.c (folder_browser_set_message_display_style): Set
-	the MailDisplay's display style as well as the global display
-	style.
-	(my_folder_browser_init): Don't save preference changes by
-	default. (This is only observered wrt. the message display style
-	but should apply to other items.)
-
-	* folder-browser-factory.c (folder_browser_factory_new_control):
-	Set this FB to save the preferences set in it.
-
-	* folder-browser-ui.c (folder_browser_ui_add_message): Read our
-	display's state instead of the global setting.
-
-2001-07-16  Peter Williams  <peterw@ximian.com>
-
-	* mail-folder-cache.c (mail_folder_cache_set_folder_browser): DUH.
-	No need to update every folder if we set the folder browser to
-	NULL.
-
-2001-07-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Call
-	mail_autoreceive_setup() so that any changes to the list of
-	accounts will be respected the next time mail is checked.
-
-2001-07-13  Peter Williams  <peterw@ximian.com>
-
-	* mail-callbacks.c (expunge_folder): Segfault prevention here if
-	no uid is currently loaded.
-
-	* mail-vfolder.c (unlist_vfolder): New function. If a vfolder in
-	our list gets finalized, NULL out info->folder (Is it wrong if
-	this happens?) Also, locking issues?
-	(vfolder_uri_to_folder): Hook up to the finalize event here.
-
-2001-07-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (filter_folder_filter): Updated to reflect changes in
-	the filter API by passing in the provided uid cache to
-	camel_filter_driver_filter_folder.
-	(mail_filter_folder): Set the cache to NULL.
-	(mail_fetch_mail): Set the cache to NULL.
-	(fetch_mail_fetch): If a cache exists for this folder, set
-	it. When we are finished filtering the incoming messages, the
-	logic changes a bit. We now save the cache if keep_on_server is
-	set *or* if there was an exception this way if the user's download
-	gets interrupted, he won't have to download all the messages
-	again.
-	(fetch_mail_fetch): Oh yea, and just so if we get an exception
-	with `delete' turned on, the next time the user checks mail and an
-	exception *doesn't* occur, it will go back and mark all the
-	messages for deletion.
-
-2001-07-12  Iain Holmes  <iain@ximian.com>
-
-	* importers/evolution-mbox-importer.c (load_file_fn): Check that
-	the folder does exist before trying to import it.
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (expunge_folder): Force-hide all deleted
-	messages before expunging.
-	(expunged_folder): Restore the user's "hide deleted messages"
-	preference.
-
-2001-07-12  Jason Leach  <jleach@ximian.com>
-
-	* mail-callbacks.c (expunge_folder): Only blank the mail display
-	if the message being viewed is one of those to be expunged.  Bug
-	#4030.
-
-2001-07-12  Jason Leach  <jleach@ximian.com>
-
-	* mail-config.c (config_read): Should be saving the
-	'identity_html_signature' and 'identity_has_html_signature" keys
-	in the /Mail/Accounts prefix (with the rest of the per-account
-	stuff, not on it's own)
-
-2001-07-11  JP Rosevear  <jpr@ximian.com>
-
-	* mail-display.c (get_embedded_for_component): no longer need to
-	set a my address property
-
-2001-07-10  Federico Mena Quintero  <federico@ximian.com>
-
-	* mail-display.c (link_copy_location): Set the CLIPBOARD selection
-	as well as the primary selection so that Edit/Paste will work in
-	other programs (e.g. Netscape).
-	(mail_display_new): Add the target for the CLIPBOARD selection.
-
-2001-07-10  Jason Leach  <jleach@ximian.com>
-
-	[Bug #4305: Make the automatic mark-as-read timer optional]
-
-	* mail-config.glade: Necessary changes to make the Mark as "Read"
-	label a toggle button instead.
-	
-	* mail-accounts.c (construct): Connect to the "toggled" on our new
-	toggle.
-	(timeout_toggled): New callback, called from above.
-
-	* mail-config.c (mail_config_get_do_seen_timeout): New.
-	(mail_config_set_do_seen_timeout): New.
-	(mail_config_write_on_exit): Save the preference here.
-	(config_read): Load it here.
-
-2001-07-10  JP Rosevear  <jpr@ximian.com>
-
-	* folder-browser.c: Cosmetic patch - replace our defines with the
-	e-popup ones
-
-	* Makefile.am: Typo
-
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* mail-format.c (attachment_header): Took the logic of whether or
-	not to make the attachment header out of the actual function.
-	(mail_part_is_displayed_inline): Return if the part is being
-	displayed inline (regardless of whether it is actually inline).
-	(mail_part_toggle_displayed): Toggle whether it's displayed inline
-	or not.
-	(get_inline_flags): Determine whether the part is displayed inline
-	and whether it is actually inline.
-	(mail_format_mime_message): Initialize the attachment_status hash
-	table.
-
-	* mail-display.c (inline_cb): Instead of modifying the
-	CamelMimePart, use mail_part_toggle_displayed
-	(button_press): As above.
-	(pixmap_press): Use mail_part_is_displayed_inline instead of
-	mail_part_is_inline. Get the MailDisplay from the popup to do
-	this.
-
-	* mail.h: Add prototypes.
-
-2001-07-10  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: extra dist the news files
-
-2001-07-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_write_on_exit): Use
-	bonobo_config_set_string_wrapper.
-	(mail_config_write): Same.
-	(bonobo_config_set_string_wrapper): Macro wrapping
-	bonobo_config_set_string that passes "" as the val if the val is
-	NULL.
-
-	* mail-callbacks.c (mail_generate_reply): Make sure that the
-	reply-to addr i non-NULL before trying to add it to the hash
-	table.
-
-2001-07-09  JP Rosevear  <jpr@ximian.com>
-
-	* mail-account-gui.c (get_focused_widget): fix typo so it compiles
-
-2001-07-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (setup_mime_tables): Handle application/pgp using
-	the text/plain handler.
-
-	* mail-account-gui.c (get_focused_widget): New function to
-	determine which widget is focused.
-
-	* mail-account-editor.c (apply_changes): Not only flip to the
-	notebook page that wasn't finished, but also grab the focus of the
-	incomplete widget.
-
-	* mail-config-druid.c (source_changed): Grab the focus of the
-	incomplete widget.
-	(transport_prepare): And here.
-	(identity_changed): Here too.
-
-	* mail-account-gui.c (mail_account_gui_identity_complete): Take an
-	incomplete argument so we can set which widget is incomplete and
-	then the caller can focus it or whatever.
-	(service_complete): Same.
-	(mail_account_gui_transport_complete): And again here.
-	(mail_account_gui_management_complete): And here too.
-
-2001-07-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (decode_pgp): Update to pass in the `remember'
-	argument when creating a new pgp context.
-	(try_inline_pgp_sig): And here...
-
-	* mail-crypto.c (mail_crypto_pgp_mime_part_sign): Update to pass
-	in the `remember' argument when creating a new pgp context.
-	(mail_crypto_pgp_mime_part_verify): Same.
-	(mail_crypto_pgp_mime_part_encrypt): And here...
-	(mail_crypto_pgp_mime_part_decrypt): And finally here.
-
-	* mail-config.c (mail_config_get_remember_pgp_passphrase): New.
-	(mail_config_set_remember_pgp_passphrase): New.
-	(config_read): Read in the "remember passphrase" value.
-	(mail_config_write_on_exit): Save the remember-passphrase value.
-
-	* mail-accounts.c (construct): Allow the user to set "Remember PGP
-	Passphrase".
-	(remember_pgp_passphrase_toggled): Set the toggle state.
-
-2001-07-09  Peter Williams  <peterw@ximian.com>
-
-	* mail-ops.c (get_folderinfo_got): Check for an exception and
-	print it.  Call done anyway.
-	(do_update_subfolders): Check for NULL info.
-
-2001-07-09  Peter Williams  <peterw@ximian.com>
-
-	* mail-config.c (mail_config_write): Some NULL protection for our
-	strings: pgp_key, html_signature, smime_key. Probably we should do
-	this for all strings. Either that or change Bonobo Config.
-
-	* message-list.c (message_list_init): Explicitly initialize search
-	to NULL.  Bug 3951 might to be due to a problem wrt this, and it
-	can't hurt.
-
-2001-07-09  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (save_part): g_strdup the result of
-	g_get_home_dir since this variable will get free'd later.
-
-	* mail-format.c (mail_lookup_handler): Use
-	gnome_vfs_mime_get_short_list_applications rather than
-	gnome_vfs_mime_get_default_application.
-
-	* mail-display.c (pixmap_press): Construct the EPopupMenu array on
-	the fly, based on the number of applications available to open the
-	MIME type.
-	(launch_cb): Figure out which menu item was clicked, and invoke
-	the appropriate application. Ugh, messy, because of the EPopupMenu
-	interface. Probably should get rewritten some day. Also, make this
-	handle apps with expects_uris set too.
-
-2001-07-09  Peter Williams  <peterw@ximian.com>
-
-	* mail-config.c (mail_config_write): Change html_signature stuff
-	over to bonobo-config -- someone forgot to do this.
-
-	* mail-folder-cache.c (dm): Gave up and got rid of dm. Just
-	replaced it with d(g_message()) and set G_LOG_DOMAIN.
-
-2001-07-09  Peter Williams  <peterw@ximian.com>
-
-	* mail-folder-cache.c (mail_folder_cache_set_update_shellview):
-	Deleted
-	(as opposed to #if 0)
-	(get_folder_info): Changed to assume it has the folder lock.
-	(make_folder_name): Same.
-	(make_folder_status): Same.
-	(update_idle): Don't unlock around the make_folder_ functions.
-	(*): Changed behavior wrt. get_folder_info. Lock before calling,
-	but also move preconditions before -- get_folder_info can only
-	return NULL if uri is NULL. Also add preconditions for other
-	arguments where necessary.
-
-2001-07-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c (on_cursor_activated_cmd): Check for new_uid !=
-	NULL here before strcmping.
-
-2001-07-07  Dan Winship  <danw@ximian.com>
-
-	* main.c (main): Only install the segv_redirect handler if SEGV's
-	handler is not currently SIG_DFL. Otherwise you get an infinite
-	SEGV loop if you run with GNOME_DISABLE_CRASH_DIALOG.
-
-2001-07-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c (message_list_select): Made this handle being
-	given a row that's outside the range better.
-
-2001-07-06  Jason Leach  <jleach@ximian.com>
-
-	[Fix bug #1100, default account is stored strangely]
-	
-	* mail-config.c (mail_config_get_default_account_num): New
-	function, returns the integer of the position of the default
-	account, used to save which account is the default to the config
-	db.
-	(mail_config_write): Save the default account number here in
-	"/Mail/Accounts/default_account".
-	(config_read): Load in which is the default here.
-
-2001-07-06  Larry Ewing  <lewing@ximian.com>
-
-	* mail-callbacks.c (composer_send_cb): add a NULL check since that
-	is a valid return.
-
-2001-07-06  Peter Williams  <peterw@ximian.com>
-
-	* mail-format.c (format_mime_part): Prevent infinite recursion when
-	viewing attachments that we can't / shouldn't display but are some
-	form of plaintext. Cf bug #2234
-
-2001-07-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (folder_browser_copy): Freeze and Thaw the
-	folder.
-
-2001-07-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (folder_browser_copy): Mark the messages as
-	Seen also.
-	(folder_browser_class_init): Create an atom type for
-	X-Evolution-Message selection type.
-	(my_folder_browser_init): Add our multiple selection types, one of
-	which is the default string type.
-
-	* component-factory.c (destination_folder_handle_drop): Update to
-	use the new X-Evolution-Message type format.
-
-	* folder-browser.c (selection_get): Convert the
-	X-Evolution-Message clipboard type to whatever format the target
-	wants.
-	(message_list_drag_data_get): Update because the
-	X-Evolution-Message type changed.
-	(folder_browser_copy): Same.
-	(x_evolution_message_parse): And here too.
-
-2001-07-06  Peter Williams  <peterw@ximian.com>
-
-	* mail-callbacks.c (composer_postpone_cb): Don't free the psd here --
-	it will be freed on the "destroy" signal.
-
-	* mail-folder-cache.c (maybe_update): Instead of an idle, use a very
-	short timeout in hopes of reducing the number of redundant updates.
-
-	* mail-tools.c (mail_tool_uri_to_folder): Only note the folder in the
-	cache if we successfully got it.
-
-2001-07-06  Jason Leach  <jleach@ximian.com>
-
-	* mail-callbacks.c (delete_msg): Select the very next message
-	after deleting, not the next undeleted (it can make things jump
-	around in annoying ways if you are deleting many messages), bug #4032.
-
-	* folder-browser.c: Forgot to commit the "Mark as Important" right
-	click menu item.
-
-	* message-list.c (message_list_set_folder): Setup the strikeout
-	column here (after we've gotten the folder) so we can disable
-	strikeouts for vtrash folders, part of bug #2224.
-
-2001-07-06  Dan Winship  <danw@ximian.com>
-
-	* mail-folder-cache.c (mail_folder_cache_set_folder_browser): Fix
-	obvious bug in previous bugfix: Pass "fb" to check_for_fb_match()
-	so only the selected folder gets updated, instead of "all folders
-	that haven't yet been selected".
-
-2001-07-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (populate_folder_context_menu): New function
-	to populate the right-click menu for mail folders.
-	(component_fn): Pass it to `evolution_shell_component_new()'.
-
-2001-07-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (construct): Add a checkbox for prompting when
-	sending a message with an empty subject.
-
-	* mail-ops.c (mail_send_message): If filtering fails, return right
-	away.
-
-	* mail-config.c (mail_config_set_show_preview): Okay, apparently I
-	was wrong. Oh well.
-	(mail_config_set_thread_list): Fix this one too.
-
-2001-07-05  Peter Williams  <peterw@ximian.com>
-
-	* mail-vfolder.c (vfolder_uri_to_folder): Add mail folder cache
-	hookups.
-
-	* Makefile.am: Remove the ridiculuous relic known as
-	test-mail. Clean up a bit.
-
-	* mail-vfolder.c (vfolder_uri_to_folder): Add mail folder cache
-	hookups.
-
-2001-07-05  Peter Williams  <peterw@ximian.com>
-
-	* mail-folder-cache.c (mail_folder_cache_set_folder_browser):
-	Clear the shell view label if mailer loses focus.
-
-	* mail-ops.c (do_update_subfolders_rec): Check for NULL url before
-	calling folder cache functions.
-
-2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* folder-browser-ui.c (message_pixcache): set icon for
-	ApplyFilters command.
-
-2001-07-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_set_show_preview): Revert Sam's
-	changes.
-
-	Note: Uhm, g_hash_table_lookup_extended gives us a pointer to the
-	original value which we can just change to update the hash table
-	without the need to re-insert - it's already there!! Also, you
-	don't want to g_hash_table_insert the new value with the same key
-	without at least first removing the existing bucket. And, you
-	certainly don't want to g_free() the key after you insert it -
-	eek!!
-
-2001-07-03  Sam Creasey <sammy@oh.verio.com>
-
-	* mail-config.c (mail_config_set_show_preview): Replace value in
-	config->preview_hash when it already exists.  Old code never
-	re-inserted into the hash, just assigned to val -- it's an int
-	here, not a real pointer.
-
-2001-07-03  Joe Shaw  <joe@ximian.com>
-
-	* mail-callbacks.c (expunge_folder): Unset the message being displayed
-	when expunging. This makes expunged messages not show in the preview
-	pane when they're not there anymore. Fixes #3591.
-
-2001-07-03  Joe Shaw  <joe@ximian.com>
-
-	* mail-callbacks.c (mail_reply): If msg is NULL, fetch the message
-	and requeue a mail_reply call. Fixes bug #3816.
-	(requeue_mail_reply): Callback from mail_get_message().
-
-2001-07-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_get_show_preview): Use a better
-	GHashTable technique that will hopefully solve some bugs and also
-	use _with_default bonobo-config call.
-	(mail_config_set_show_preview): No sense in removing the entry
-	from the hash table and then re-inserting it. Just reset the
-	value.
-	(mail_config_get_thread_list): Use the same logic.
-	(mail_config_set_thread_list): And again here.
-
-2001-07-03  Peter Williams  <peterw@ximian.com>
-
-	* mail-folder-cache.c (make_folder_name, make_folder_status):
-	Split make_string into these.
-	(update_idle): Use (name and status) instead of (wide and thin)
-	for the text.
-
-2001-07-03  Jason Leach  <jleach@ximian.com>
-
-	* folder-browser-ui.c: "Mark as Important" menu thingy here.
-
-2001-07-03  Peter Williams  <peterw@ximian.com>
-
-	* folder-browser.c (message_list_drag_data_get): Compile fixes.
-	#include errno.h and gnome-dialog-utils.h. s/dirname/tmpdir/
-
-2001-07-03  Peter Williams  <peterw@ximian.com>
-
-	Prevent folders from appearing to have -1 new messages. Prevent
-	nonactive folders from updating the title bar. Make the title bar
-	update when switching to an already-opened folder.
-	
-	* mail-folder-cache.c (update_message_counts): Ignore the value
-	for 'unread' if it is -1.
-	(get_mail_info_receive): Same
-	(mail_folder_cache_note_folderinfo): Same.
-	(get_folder_info): Initialize 'fb' to NULL.
-	(mail_folder_info): Add 'fb' member.
-	(mail_folder_cache_note_fb): Change note_message_list to this.
-	(update_idle): Only update the ShellView if the active folder
-	browser is the same as the one that the MFI references.
-	(mail_folder_cache_set_folder_browser): New function. Use it to
-	set the active folder browser. NULL is okay.
-	(check_for_fb_match): Called from the above. If the MFI has the
-	new folder browser as its view, queue an update.
-
-	* mail-folder-cache.h: Fix prototypes.
-
-	* mail-callbacks.c (create_folders): Check if fi->url is nonnull.
-
-	* folder-browser.c (got_folder): Change to use note_fb instead of
-	note_messge_list.
-
-	* folder-browser-factory.c (control_activate): Set the folder
-	browser
-	(control_deactivate): Clear it here.
-	(fb_get_svi): Kill some inappropriately cut-n-pasted code.
-
-2001-07-03  Dan Winship  <danw@ximian.com>
-
-	* mail-config.glade: Rename some of the widgets in the news config
-	to not conflict with the mail config stuff, so the mail config
-	druid will work again.
-
-2001-07-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (message_list_drag_data_get): Use mkdtemp if we
-	have it, else use mktemp but make the code safer than it was
-	previously.
-
-	* mail-display.c (launch_cb): Free the template string if the
-	tempdir failed to be created.
-
-	* folder-browser.c (message_list_drag_data_get): Hide the URL
-	passwd, auth, and params.
-	(folder_browser_copy): Same.
-
-2001-07-03  Dan Winship  <danw@ximian.com>
-
-	* mail-ops.c (filter_folder_filter): Don't pass a dirty exception
-	to camel_folder_sync. Fixes an IMAP filtering crash.
-
-2001-07-02  Sam Creasey  <sammy@oh.verio.com>
-
-     	* mail-account-editor-news.c: Added an MailAccountEditorNews, for
-       	NNTP configuratuion.  Based on MailAccountEditor, but stripped.
-
-       	* Makefile.am: added mail-account-editor-news.c and
-       	mail-account-editor-news.h to SOURCES if ENABLE_NNTP is defined.
-	
-       	* mail-accounts.c (load_news): Moved this function, and fixed some
-       	slight brokenness.
-       	(news_edit): Added functional code using MailAccountEditorNews
-       	(news_add): Added functional code using news_edit after
-       	allocation.
-
-	* mail-config.glade: news_editor_window widget added.  Used by
-       	MailAccountEditorNews.
-
-        * mail-display.c (save_data_cb): Store the pathname used when
-        saving messages so that the next save box will default to the
-        previous path.
-
-        * message-browser.c (message_browser_new): add signal handler for
-        size_allocate on the message browser.  Thus new windows are size
-        as they were last allocated.
-        (message_browser_size_allocate_cb): handler to store allocations.
- 
-        * message-list.c (message_list_setup_etree): connect to the
-        info_changed signals for the state of the message_list->tree.
-        Save the folder state to disk, so that when additional
-        message_lists are created, they are consistant.   e.g. the next
-        buttons do the same thing in the browser, and in the message
-        viewer after changing sorting options.
-
-        * subscribe-dialog.c (build_tree): freeze sc->folder model while
-        building the tree.  Not doing so takes a very long time over 40000
-        newsgroups.
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (construct): Setup the Empty Trash On Exit
-	widgets.
-
-	* mail-config.c (config_read): Option to emtpy trash on exit.
-	(mail_config_write_on_exit): Same.
-	(mail_config_set_empty_trash_on_exit): Set the option.
-	(mail_config_get_empty_trash_on_exit): Get the option.
-
-	* component-factory.c (owner_unset_cb): Empty the trash folders if
-	the user set the "empty trash on exit" option.
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (transfer_msg): Updated for the
-	mail_transfer_messages API.
-
-	* folder-browser.c (message_list_drag_data_recieved): Update for
-	the mail_transfer_messages API.
-	(selection_received): Same.
-
-	* mail-ops.c (mail_transfer_messages): Renamed from
-	mail_do_transfer_messages and also added a callback/data arguments
-	since we need it component_factory::xfer_folder.
-
-	* component-factory.c (xfer_folder): Use mail_transfer_messages
-	instead.
-	(destination_folder_handle_drop): Update to pass in a NULL
-	callback arg and a NULL data argument to mail_transfer_messages.
-
-2001-07-02  Larry Ewing  <lewing@ximian.com>
-
-	* mail-display.c (save_part): move the saving logic out of save_cb
-	so that we can reuse it for the image saving code.
-	(save_cb): call save_part.
-	(save_url): new function to resolve an save an html url.
-	(image_save_as): save function for images and.  Add it to the
-	link_menu, and add MASK_URL and MASK_SRC to the structure so that
-	we cans show the proper menus.
-	(html_button_press_event): call get_src as well to find external
-	urls references.  Add popup masking.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* README.async: Add a warning about how wrong this document is.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* mail-folder-cache.h: New file. Protoypes for the Mail Folder
-	Cache, which provides a place for all the disparate pieces of the
-	mailer to save bits of information about a folder. Centralizes the
-	information display code.
-
-	* mail-folder-cache.c: New file. Implements the Mail Folder Cache.
-	
-	* Makefile.am (evolution_mail_SOURCES): Add the
-	mail-folder-cache.{c,h}
-
-	* folder-browser-factory.c (fb_get_svi): Copy of that absurdly
-	long-named function in mail-display.c that gets the
-	GNOME_Evolution_ShellView.
-	(control_activate): Set the ShellView for the folder cache.
-
-	* folder-browser.c (got_folder): Tell the folder browser about
-	this folder.
-
-	* mail-callbacks.c (create_folders): Tell the folder cache about
-	the new folders.
-
-	* mail-local.c (reconfigure_folder_reconfigure): Don't unhook our
-	events as we no longer hook them up.
-	(register_folder_registered): Tell the folder cache about this
-	folder's place in the local storage.
-	(register_folder_register): No longer hook events; the Folder
-	Cache will do this.
-	(local_folder_changed, local_folder_changed_proxy): Move to
-	mail-folder-cache.c
-	(free_local_folder): No longer unhook events.
-
-	* mail-ops.c (do_update_subfolders_rec): Instead of setting the
-	folder status ourselves, inform the Folder Cache about the
-	changes.
-
-	* mail-tools.c (mail_tool_uri_to_folder): Replace danw's cache
-	with the new Mail Folder Cache.
-	(cache_folder, etc): removed.
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c: #include widgets/misc/e-charset-picker.h since
-	it was moved there from libgal.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* importers/evolution-mbox-importer.c (mbox_factory_fn): Kill
-	irritating "Returning" g_warning.
-
-2001-07-02  Dan Winship  <danw@ximian.com>
-
-	* mail-session.c (get_filter_driver): Implement this, based on
-	code that used to be in mail-ops.c
-
-	* mail-ops.c (mail_load_filter_context, setup_filter_driver):
-	Moved into MailSession::get_filter_driver.
-	(filter_get_folder): Moved to mail-session.c
-	(mail_filter_folder, mail_filter_on_demand, mail_fetch_mail,
-	mail_send_mail, mail_send_queue): Remove FilterContext args, use
-	camel_session_get_filter_driver.
-
-	* mail-send-recv.c (mail_send_receive, mail_receive_uri):
-	Remove FilterContexts
-
-2001-07-01  Chris Toshok  <toshok@ximian.com>
-
-	* subscribe-dialog.c (subscribe_dialog_gui_init): the FolderSearch
-	control is in a different dockitem now.
-
-2001-07-01  Dan Winship  <danw@ximian.com>
-
-	* mail-tools.c (update_unread_count): Ref the folder before
-	proxying the event, in case there's only one reference to it and
-	it gets unreffed before the other end of the event handler runs.
-	(update_unread_count_main): And unref it when we're done.
-	(mail_tool_uri_to_folder): Only hold the lock around the hash
-	table operations, not the entire function. Holding the lock the
-	whole time can cause deadlock when resolving vfolders, and the
-	CamelSession and CamelStore locks ensure that multiple threads
-	calling this function will end up with the same CamelFolder object
-	at the end anyway, so we just need to lock and re-check the cache
-	at the end before adding the folder to the cache.
-
-2001-06-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser-ui.c: Get MailNext/MailPrevious to use
-	next-message.png and previous-message.png, respectively.  Also
-	change Print to use print.png.
-
-2001-06-30  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-display.c (make_popup_window): Changed to return the
-	created window.
-	(find_socket): Added.  Copied from e-shell-view.c.  The fact
-	that I'm copying this bit of code all over isn't cool.
-	(html_button_press_event): Properly destroy the popup window when
-	the widget inside the control is destroyed.
-
-	* mail-callbacks.c (addrbook_sender): Added.  Implements
-	the "Add sender to addressbook" right-click. (Bug #3645)
-	(find_socket): Added.  Copied from e-shell-view.c.
-
-	* folder-browser.c: Added "Add sender to addressbook" to
-	context_menu[].
-
-	* mail-display.c: (handle_embedded_address_object): Removed.
-	(on_object_requested): Removed handling for embedded address
-	objects.  (Which was obsolete crap.)
-
-2001-06-29  Larry Ewing  <lewing@ximian.com>
-
-	* mail-display.c (html_button_press_event): remove redundant
-	logic.
-
-	* mail-callbacks.c (create_msg_composer): make sure we show the
-	sig file.
-
-2001-06-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-factory.c (control_deactivate): Turn folder
-	syncing back on here so that IMAP folders will sync without
-	needing to hit Send & Receive.
-
-	* mail-callbacks.c (ask_confirm_for_only_bcc): Throw up the
-	confirmation dialog.
-	(composer_get_message): If the user only specified Bcc recipients,
-	prompt him/her to make sure we should continue and risk the server
-	adding an Apparently-To header.
-
-	* mail-config.c (config_read): Read in config option for prompting
-	when only Bcc recipients are specified.
-	(mail_config_write_on_exit): Save the option.
-	(mail_config_get_prompt_only_bcc): New.
-	(mail_config_set_prompt_only_bcc): New.
-
-2001-06-29  Dan Winship  <danw@ximian.com>
-
-	* mail-account-gui.c (build_auth_menu): Take two authtypes lists,
-	"all", and "supported", and make the unsupported authtypes grayed
-	out in the menu rather than missing.
-	(source_type_changed, transport_type_changed,
-	service_check_supported): Update build_auth_menu calls.
-
-2001-06-29  Radek Doulik  <rodo@ximian.com>
-
-	* mail-account-gui.c (menu_file_save_cb): implemented plain saving
-
-2001-06-28  Radek Doulik  <rodo@ximian.com>
-
-	* mail-account-gui.c (load_signature): implemented plain load
-	(load_signature): use e_msg_composer_get_signature_html
-
-2001-06-28  Peter Williams  <peterw@ximian.com>
-
-	* mail-ops.c (mail_send_message): Revert fejj's Bcc header removal;
-	this unsets the BCC recipients and so doesn't send to the Bcc'd
-	people at all.
-
-2001-06-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-send-recv.c (free_send_data): The e_iterator_get() returns
-	a gconstpointer and we need a non-const BonoboControl so cast it.
-
-	* mail-account-gui.c (mail_account_gui_new):
-	gui->check_html_signature is GtkToggleButton not a GtkCheckButton.
-
-	* folder-info.c: Added some #include's to supress warnings.
-
-2001-06-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-display.c: Fix case of labels in the `link_menu' so that it
-	is consistent with that of the other menus in Evolution
-	[i.e. "Copy Link Location" instead of "Copy Location" etc.].
-
-2001-06-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-display.c (invisible_selection_get_callback): New, signal
-	handler for "selection_get" on the GtkInvisible widget we use for
-	selections.
-	(invisible_selection_clear_event_callback): New, signal handler
-	for "selection_clear_event" on the same invisible widget.
-	(mail_display_init): Initialize the `selection' and `invisible'
-	members.  Also, explicitly initialize all the other fields as
-	well.
-	(mail_display_destroy): Free `selection'.  Destroy `invisible'.
-	(link_copy_location): Re-implemented to just make the mail display
-	become the owner of the primary selection.
-	(on_selection_get): Remove `#if 0'ed code.
-	(mail_display_new): Remove the `#if 0'ed code that would connect
-	selection stuff to the HTML widget.
-	(mail_display_new): Connect the signals and add the targets to the
-	invisible widget.
-
-	* mail-display.h: New members `selection' and `GtkInvisible' in
-	`MailDisplay'.
-
-2001-06-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_write_on_exit): Don't bother trying
-	to save the passwd if the url is NULL.
-
-	* folder-browser.c (vfolder_mlist): Strip the mlist name to fix
-	bug #3732.
-
-	* component-factory.c (destination_folder_handle_drop): Since we
-	have an exception variable, we might as well use it when getting
-	folders too.
-
-	* folder-browser.c (message_list_drag_data_recieved): Call
-	gtk_drag_finish.
-
-2001-06-28  Dan Winship  <danw@ximian.com>
-
-	* mail-tools.c (mail_tool_uri_to_folder): After finding a folder,
-	attach to its "folder_changed" and "message_changed" signals.
-	(update_unread_count, update_unread_count_main): Moved here from
-	folder-browser but basically unchanged. Doing this here lets us
-	get folder tree updates for folders that have had messages
-	moved/copied/filtered into them, but which don't yet have a view
-	associated with them.
-
-	* folder-browser.c (update_unread_count, update_unread_count_main,
-	etc): Moved to mail-tools.c
-
-2001-06-28  Radek Doulik  <rodo@ximian.com>
-
-	* mail-config.c: use new fields everywhere
-
-	* mail-config.h: as below
-
-	* Mail.idl: added html_signature and has_html_signature
-
-2001-06-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (component_fn): Register for the "mailto"
-	schema.
-	(handle_external_uri_cb): Callback for the "handle_external_uri"
-	signal.
-	(component_fn): Connect it.
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (component_fn): Pass NULL as the
-	@external_uri_schemas argument to
-	`evolution_shell_component_new()'.
-
-2001-06-27  Peter Williams  <peterw@ximian.com>
-
-	* folder-browser-ui.c: Uncomment EditSelectThread. Yaay!
-
-	* mail-callbacks.c (select_thread): New function. Self-explanatory
-	name. Implementation is a little hairy.
-
-	* mail-callbacks.h: Prototype it here.
-
-	* mail-callbacks.c (invert_selection): Here too.
-	(select_all): Here too.
-
-	* subscribe-dialog.c (subscribe_select_all): Update to use new
-	ETree accessors.
-	(subscribe_invert_selection): Here too.
-
-2001-06-27  jacob berkman  <jacob@ximian.com>
-
-	* folder-browser.c (save_cursor_pos): work around an e-tree bug
-
-2001-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c: Fixed Cut/Copy/Paste to work - it turns out I
-	couldn't share a single GtkInvisible between all the
-	FolderBrowser's after all.
-
-2001-06-27  Peter Williams  <peterw@ximian.com>
-
-	* folder-browser-factory.c (control_deactivate): Change to use
-	more reality-based API below.
-	Include folder-browser-ui.h too.
-	(control_activate): Remove now-unused 'int state'.
-
-	* folder-browser-ui.h: Changed prototypes to match changes below.
-
-	* folder-browser-ui.c (folder_browser_ui_rm_message): Commented out
-	to reflect reality of how this stuff works (you can't actually remove
-	the pieces).
-	(folder_browser_ui_rm_global): Same.
-	(folder_browser_ui_rm_list): Left because here we add the view menus.
-	(folder_browser_ui_add_list): ... which were moved here.
-	(folder_browser_ui_rm_all): New function, does the job of old ui_rm()
-
-2001-06-26  Peter Williams  <peterw@ximian.com>
-
-	* folder-browser-ui.c: New file derived from
-	folder-browser-factory.c.  Contains the Bonobo UI code, split into
-	three groups as described in ui/ChangeLog. Also contains the
-	GalView stuff and the hookups into the Bonobo UI stuff.
-
-	* folder-browser-factory.c: Move most of the UI stuff to
-	folder-browser-ui.c.
-	(control_activate): Add all three kinds of UI element to this
-	folderbrowser.
-	(control_deactivate): Remove all three kinds.
-
-	* folder-browser-ui.h: New file. Prototypes functions to add UI
-	elements to a FolderBrowser.
-
-	* Makefile.am: Add folder-browser-ui.{c,h}
-	
-	* message-browser.c (PARENT_TYPE): Change to BONOBO_TYPE_WINDOW
-	(message_browser_destroy): Chain to parent destroy function.
-	(set_bonobo_ui): New function. Add the 'message' functions from
-	the folder browser to our UI.
-	(message_browser_close): BonoboVerbify this.
-	
-	* message-browser.h: Convert to BonoboWindow.
-
-2001-06-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (my_folder_browser_init): Helps if I spell
-	"received" correctly.
-
-	* mail-config.c (mail_config_set_thread_list): If the value is
-	already in the hash table, first remove it before setting the new
-	value so we don't leak.
-	(mail_config_set_show_preview): Same.
-
-2001-06-26  Dan Winship  <danw@ximian.com>
-
-	* mail-mt.c (op_status_timeout): Don't pop up a progress dialog to
-	say "I already finished this a while ago".
-
-	* component-factory.c (storage_create_folder): Pass the path
-	prefix to folder_created so it can add it to the folder tree in
-	the right place.
-
-	* mail-callbacks.c (folder_created): Take a path prefix.
-
-2001-06-26  jacob berkman  <jacob@ximian.com>
-
-	* mail-config.c (mail_config_get_show_preview): make ettore stop
-	complaining so i can get back to work
-
-2001-06-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (message_rfc822_dnd): No longer returns a
-	gboolean and also takes a CamelException.
-	(destination_folder_handle_drop): Do better error checking.
-
-	* folder-browser.c (my_folder_browser_init): Connect to the
-	tree-drag-data-recieved signal.
-	(message_list_drag_data_recieved): New function that handles the
-	recieving end of the DnD event.
-	(x_evolution_message_parse): New convenience function to parse the
-	x-evolution-message type so that the cut/paste and DnD code can
-	share it.
-	(selection_received): Use x_evolution_message_parse().
-
-	* mail-config.c (config_read): Read in the default show_preview
-	value.
-	(mail_config_write_on_exit): Save the default show_preview value
-	as well as saving the individual settings for each URI that has
-	been changed.
-
-2001-06-25  Joe Shaw  <joe@ximian.com>
-
-	* folder-browser.c (invisible_destroyed): Check to make sure that
-	clipboard_selection is non-NULL before we g_byte_array_free() it.
-
-2001-06-25  jacob berkman  <jacob@ximian.com>
-
-	* mail-send-recv.c (free_send_data): sync folders after we've
-	gotten mail
-
-	* folder-browser-factory.c (control_activate): set the ui
-	component on the folder browser
-	(control_activate): update the view preview item
-	(control_deactivate): don't sync the folder here
-	(control_deactivate): unset the ui component of the folder browser
-
-	* mail-callbacks.c (toggle_flags): stuff from jleach to add an
-	importance keybinding
-	(mark_as_important): ditto
-	(toggle_as_important): again
-
-	* mail-config.c (mail_config_get_show_preview):
-	(mail_config_set_show_preview): basically a copy of
-	get_thread_list() but for the preview pane
-
-	* folder-browser.c (folder_browser_destroy): unref the our ui
-	component
-	(folder_browser_set_ui_component): new function for setting the ui
-	component
-	(save_cursor_pos):
-	(set_cursor_pos): try to show the selected row when the preview
-	pane is shown
-	(folder_browser_set_message_preview): implement
-	(folder_browser_toggle_preview): toggle the preview (duh)
-	(on_key_press): add keybindings for marking as important (!), and
-	hiding the preview pane (q)
-	(etree_key): clean up a little bit, and make enter either show the
-	preview pane or open the message
-	(fb_resize_cb): only save the paned size if the preview is alread
-	shown
-	(folder_browser_gui_init): pass ourselves to fb_resize_cb
-	(on_message_selected): only add the timeout if the preview is
-	shown
-
-2001-06-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (folder_browser_destroy): Unref the invisible
-	window that we use for slections.
-	(folder_browser_class_init): Init the clipboard_atam type.
-	(selection_get): New
-	(selection_clear_event): New
-	(selection_received): New
-	(folder_browser_copy): New function to copy the message-list
-	selection.
-	(folder_browser_cut): New function to cut the message-list
-	selection.
-	(folder_browser_paste): New function to paste the message-list
-	selection.
-	(my_folder_browser_init): Initialize `invisible` if it's NULL else
-	ref it - also set some signals on it.
-
-	* folder-browser-factory.c: Added verbs for cut/copy/paste.
-
-2001-06-23  Jason Leach  <jleach@ximian.com>
-
-	* mail-local.c (local_storage_removed_folder_cb): Fixes here for
-	removing folders.
-
-	* mail-ops.c (remove_folder_get): Some fixes in here too.	
-
-2001-06-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (config_read): Duh, we saved the charset as
-	"default_charset", not "charset" - no wonder the correct charset
-	menu item was never being set.
-
-2001-06-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_send_message): Temporarily remove the Bcc
-	header before sending the message.
-
-2001-06-21  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-display.c (html_button_press_event): Remove empty "name"
-	property setting from the popup control.
-
-2001-06-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (composer_get_message): Allow the message to be
-	sent even if there are no To recipients but only as long as there
-	are other recipients defined.
-
-2001-06-21  Jason Leach  <jleach@ximian.com>
-
-	* component-factory.c (mail_remove_storage): Deregister the
-	storage from the shell so it will get removed from the folder
-	tree.
-
-2001-06-20  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* folder-browser.c: More than one accel key is a tad
-	confusing.
-	
-2001-06-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c: #include "folder-browser-factory.h"
-
-	* component-factory.c (mail_remove_storage): New function to
-	remove an EvolutionStorage.
-
-	* mail-accounts.c (mail_delete): Remove the storage from the
-	folder-tree.
-	(news_delete): Same.
-
-2001-06-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (destination_folder_handle_drop): Accept
-	text/uri-list mime types - this allows us to drag messages from
-	Nautilus into an Evolution folder.
-
-	* folder-browser.c (message_list_drag_data_get): Do cleanup and
-	better error handling.
-
-2001-06-19  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-tools.c (mail_tool_do_movemail): Properly clean up the
-	movemail files when no mail was received.
-
-2001-06-19  Radek Doulik  <rodo@ximian.com>
-
-	* mail-format.c (write_field_row_begin): add column with &nbsp;
-	between header name and value
-	(write_field_row_begin): hmm, use just bold &nbsp; as it looks
-	better
-
-2001-06-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (destination_folder_handle_drop): Use a nice
-	switch statement and use the new enum values.
-
-	* mail-callbacks.c (list_add_addresses): Now takes a hash table of
-	already-used-recipients so that we don't get duplicates.
-	(mail_generate_reply): Pass in a rcpt_hash argument to
-	list_add_addresses(). These changes fix bug #1639.
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (evolution_mail_LDADD): Remove DB3_LDADD
-
-2001-06-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c: Change the drop-type "x-evolution-dnd" to
-	"x-evolution-message" since we want to be able to DnD more than
-	one data type ;-)
-
-	* folder-browser.c: Change supported DnD drop types to disclude
-	URI_LIST as that seems to crash Nautilus and seems overly
-	complicated. Since I am going to be supporting message/rfc822,
-	hopefully Nautilus can handle that or else maybe something like
-	text/plain.
-	(message_list_drag_data_get): Remove the code for URI_LIST.
-
-2001-06-14  Not Zed  <NotZed@Ximian.com>
-
-	* mail-tools.c (mail_tool_uri_to_folder): If we have a fragment in
-	the url, use that as the folder name, and not the path component.
-
-2001-06-13  Not Zed  <NotZed@Ximian.com>
-
-	* component-factory.c (mail_load_storages): Added temp hack to let
-	spool providers show up in the list.
-
-2001-06-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (my_folder_browser_init): Allow user's to
-	"copy" drag & drop rather than just "move".
-
-2001-06-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (destination_folder_handle_drop): Implemented.
-
-	* message-list.c (message_list_construct): Don't connect to the
-	DnD signals here.
-	(message_list_drag_data_get): Removed.
-	(add_uid): Removed.
-
-	* folder-browser.c (my_folder_browser_init): Connect to DnD signals.
-	(message_list_drag_data_get): Implemented.
-
-2001-06-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_send_message): Fixed misuse of an uninitialized
-	variable.
-
-	* component-factory.c (destination_folder_handle_drop): Implemented.
-
-	* mail.h: Added prototype for evolution_folder_info_factory_init.
-
-	* mail-ops.c (mail_do_transfer_messages): Now takes a const char*
-	as the dest_uri. This works better all around since we strdup'd
-	the string anyway.
-
-2001-06-15  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (mail_format_mime_message): We can't output
-	"<html>" and "</html>" here because it gets called recursively to
-	display message/rfc822 subparts.
-	(mail_format_raw_message): Add padding to match the formatted
-	display.
-
-	* mail-display.c (mail_display_redisplay): Move rodo's html header
-	changes from mail_format_mime_message to here.
-
-2001-06-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c (got_folder): Updated to reflect changes to
-	mail_config_[g,s]et_thread_list().
-	(folder_browser_toggle_threads): Same.
-
-	* folder-browser-factory.c (control_activate): Updated to reflect
-	changes to mail_config_[g,s]et_thread_list().
-
-	* mail-config.c (mail_config_write_on_exit): Do cleanup when we're
-	done.
-	(mail_config_set_thread_list): Send in a URI so we can save the
-	state on a per-folder basis.
-	(mail_config_get_thread_list): Send in a URI so we can retrieve
-	the state on a per-folder basis.
-
-	* component-factory.c: Setup the accepted_dnd_types. Also added
-	skeleton code for DnD.
-
-2001-06-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-factory.c: Add Reply-to-List bonobo verbs.
-
-	* folder-browser.c: Add Reply-to-List menu items.
-
-	* mail-callbacks.c (mail_reply): Use an enum for specifying the
-	reply mode, becaus enow we can reply-to-list.
-	(reply_to_list): Implement.
-	(reply_to_sender): Use REPLY_SENDER.
-	(reply_to_all): Use REPLY_ALL.
-	(mail_generate_reply): Handle the different modes.
-
-2001-06-12  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: Remove folder-info.h until iain checks it in
-
-2001-06-12  Not Zed  <NotZed@Ximian.com>
-
-	* mail-account-gui.c (source_type_changed): Setup default spool
-	location same as for mbox mail retrieval.
-
-2001-06-08  Dan Winship  <danw@ximian.com>
-
-	* folder-browser-factory.c: fix some commands to match the ui file
-	again.
-
-2001-06-07  Iain Holmes  <iain@ximian.com>
-
-	* GNOME_Evolution_Mail.oaf.in: Add server info for FolderInfo
-	Remove server info for the Summary server
-
-	* Mail.idl: Add a FolderInfo interface to retreive information about
-	a mail folder.
-
-	* Makefile.am: Remove the executive summary stuff. Add the folder-info
-	files.
-
-	* component-factory.c: Remove the mail-summary.h include.
-	Remove summary_factory.
-	(summary_fn): Remove.
-	(component_factory_init): Remove the summary_factory creation.
-	Initialise the info_factory.
-
-2001-06-08  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-ops.c (mail_send_message): Reattach X-Evolution-Account
-	information to the message after sending it.  This way it can
-	be used to set the identity properly if we later Resend the
-	message.
-
-	* mail-tools.c (mail_tool_get_local_movemail_path): If you had
-	multiple accounts that used mboxes, and if you received mail in N
-	of those accounts, you would get N copies of each of your e-mail
-	messages.  This is because everything was being dumped into one
-	big file by movemail, and the filters would run on that file N
-	times.  To work around this, each mbox account now gets its own
-	distinct temporary movemail file.
-
-2001-06-07  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-ops.c (fetch_mail_fetch): Pass the original source URI
-	to camel_filter_driver_filter_mbox.
-	(mail_send_message): Pass NULL as the orginal source URI
-	to camel_filter_driver_filter_message.
-
-2001-06-06  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-account-gui.c (source_type_changed): Check that the chain
-	of deferences in gui->account->source->url is safe.  This was
-	causing a segfault when adding a new account if any of the
-	existing accounts had their sources set to "None".
-	(i.e. gui->account->source == NULL)
-
-	* mail-accounts.c (load_accounts): Check that account->source !=
-	NULL before dereferencing it.
-	(load_accounts): The selection is cleared when the account clist
-	is rebuilt (say after a call to add), but no unselect event is
-	emitted.  Yes, the clist is evil.  We work around this by
-	explictly calling mail_unselect, our unselect signal handler.
-	(Otherwise, the edit and delete buttons remain sensitive and
-	accounts_row != 0, but the user can't see which row the dialog
-	thinks is selected.)
-	(load_news): Check the account->source != NULL before
-	dereferencing it.
-	(mail_unselect): If an insensitive button in a button box has the
-	focus, and if you hit tab, there is a segfault deep inside of gtk.
-	This is probably a gtk bug.  We work around it by having the add
-	button (which is always sensitive) grab the focus on an unselect.
-
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	(Fix bug #3211: Should undelete when flagging a delete message as
-	 important)
-	
-	* message-list.c (on_click): When flagging a message as important,
-	check to see if it's flagged as deleted, if so, undelete it.
-
-	(Fix bug #314: Display URLs in statusbar on mouseover)
-	
-	* mail-display.c (html_on_url): New function, callback for
-	GtkHTML's "on_url" signal.
-
-2001-06-05  Radek Doulik  <rodo@ximian.com>
-
-	* mail-format.c: make HTML and plain mails to have the same
-	boundary
-
-2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (evolution_mail_LDADD): Move `$(DB3_LDADD)' before
-	libeutil.
-
-2001-06-01  Federico Mena Quintero  <federico@ximian.com>
-
-	* folder-browser.h (FolderBrowser): Added fields for the
-	GalViewMenus and GalViewCollection, since we need to keep them
-	around while the component is active.
-
-	* folder-browser-factory.c (folder_browser_setup_view_menus): Plug
-	leaks; unref the spec and factory.  Set the view collection and
-	the view menus on the FolderBrowser object.
-	(folder_browser_discard_view_menus): New function.
-	(control_deactivate): Discard the menus.
-
-	* folder-browser.c (folder_browser_destroy): Destroy the view
-	collection and the view menus.
-
-2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (evolution_mail_LDADD): Add `$(DB3_LDADD)'.
-
-2001-06-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_save): Save the pgp and
-	smime settings.
-	(mail_account_gui_new): Setup the pgp and s/mime page (but disable
-	the s/mime frame if we are not compiled with s/mime support).
-
-	* mail-config.c (account_copy): Updated to save extra pgp and
-	smime options.
-	(account_destroy): Free draft/sent folder info and also the new
-	pgp/smime keys.
-	(config_read): Read in the pgp and s/mime config options.
-	(mail_config_write): Save the account pgp and smime options.
-
-2001-06-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (source_type_changed): Call
-	build_extra_conf() here too. This is when we REALLY want to call
-	it anyway, not on switch-page because then we'd lose any data on
-	the Receive Options page if we never switch to that page before
-	applying the changes.
-
-	* mail-account-editor.c (construct): Don't connect to the
-	switch-page event, instead just call build_extra_conf() here with
-	the source->url.
-
-2001-06-01  Dan Winship  <danw@ximian.com>
-
-	* mail-config.c (config_read): Fix dumb misuse of g_get_charset.
-
-2001-05-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_multipart_signed): Removed the code to
-	check for the validity of an S/MIME part. Stuff works differently
-	now.
-
-	* mail-crypto.c: Rewrote how the S/MIME stuff is going to work.
-
-2001-05-30  Dan Winship  <danw@ximian.com>
-
-	* mail-config.glade: Rename the "PGP" page back to "Other" and add
-	a "default charset" option menu.
-
-	* mail-config.c (config_read, mail_config_write_on_exit,
-	mail_config_get_default_charset, mail_config_set_default_charset):
-	Handle "default charset".
-
-	* mail-accounts.c (construct): Fill in the "default_charset" menu
-	with an e_charset_picker menu.
-	(charset_menu_deactivate): Update the default charset.
-
-2001-05-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (list_add_addresses): Take another argument to
-	ignore a certain address.
-	(mail_generate_reply): Ignore references to the reply-to address
-	when constructing the Cc list.
-
-2001-05-29  Jason Leach  <jleach@ximian.com>
-
-	* message-browser.c (message_browser_new): one-line fix for bug
-	#2536: File->Close in message viewer doesn't work.
-	(message_browser_new): Also replaced like 4 lines of code with a
-	one-liner featuring gnome_app_create_toolbar_with_data().
-
-2001-05-28  Jason Leach  <jleach@ximian.com>
-
-	* mail-local.c (load_metainfo): Don't need to check if (foo!=NULL)
-	before doing an xmlFreeDoc().
-
-2001-05-28  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (write_text_header): Fix a bug that could cause a
-	crash on messages with an empty subject. Oops.
-
-2001-05-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c: Removed the etable spec string.
-	(message_list_construct): Load the etable spec from a file.
-
-	* folder-browser-factory.c: Load the etable spec from the file,
-	not a string.
-
-	* Makefile.am: Add message-list.etspec to be installed.
-
-	* message-list.etspec: New file containing the ETable file
-	specification.
-
-	* mail-config.h: Prototype evolution_mail_config_get_type.
-
-2001-05-27  Dan Winship  <danw@ximian.com>
-
-	* folder-browser-factory.c: #include
-	"evolution-shell-component-utils.h" rather than "e-gui-utils.h"
-	for e_pixmaps_update.
-
-	* subscribe-dialog.c: Likewise.
-
-2001-05-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (try_inline_pgp_sig): Fix to work properly.
-	(handle_multipart_signed): Fixed a bug that caused some
-	multipart/signed messages to be handled by the multipart_mixed
-	handler.
-
-2001-05-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-factory.c: Added callbacks for Next/Previous
-	Unread and Next/Previous Flagged message.
-
-	* mail-callbacks.c (previous_flagged_msg): Implemented.
-	(next_flagged_msg): Implemented.
-
-2001-05-26  Dan Winship  <danw@ximian.com>
-
-	* mail-ops.c (mail_send_message, transfer_messages_transfer,
-	set_offline_do): When unreffing a folder we got ourselves (as
-	opposed to one passed in by the caller), sync before unreffing,
-	since we might be holding the only reference to it.
-	(mail_refresh_folder): New op, like mail_sync_folder, but does a
-	camel_folder_refresh_info instead.
-
-	* folder-browser-factory.c (control_activate): Call
-	mail_refresh_folder, not mail_sync_folder. (The goal is to see new
-	messages: sync used to work with imap because imap_sync was
-	broken, but it doesn't work for that any more.)
-
-2001-05-25  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am: Reference libeshell.la instead of libeshell.a.
-
-2001-05-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-factory.c (control_activate): Disable Resend on
-	non-Sent folder FolderBrowsers. Thanks to Wayne Davis for this
-	patch.
-
-	* component-factory.c (xfer_folder): This code should be correct
-	now. Still waiting on the shell to do it's job of creating the
-	metadata xml file in the destination folder though.
-
-2001-05-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (message_list_select_uid): g_strdup the uid into
-	the ml->cursor_uid.
-
-	* message-browser.c (message_browser_forward_msg): Use the default
-	forward style.
-
-2001-05-24  Dan Winship  <danw@ximian.com>
-
-	* mail-identify.c (mail_identify_mime_part): If the message data
-	is online, sniff the data for a MIME type first, and use the
-	filename second. Makes it more reliable, and deals with the
-	specific case of "application/octet-stream; name=foo.vcf" which
-	gnome-vfs will identify as vcalendar, but which can also be a
-	vcard.
-
-2001-05-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (try_inline_pgp_sig): Only write the message up to
-	(but not including) the attached signature block.
-
-2001-05-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (composer_postpone_cb): Don't free the
-	folder-info here, instead have mail_append_mail() call our new
-	function, append_mail_cleanup() which'll free the
-	folder-info. This fixes the problem of send-later segfaulting.
-
-	* message-list.c (message_list_set_folder): Make the message-list
-	respect the "hide deleted messages" setting. Fixes bug #2248.
-
-	* component-factory.c (xfer_folder): New function that the shell
-	component calls to copy/move a folder.
-	(component_fn): Set the xfer_folder_fn argument.
-
-	* mail-ops.c (mail_remove_folder): New async function to remove a
-	folder. God knows if it does what the ShellComponent needs or not
-	yet.
-	(mail_xfer_folder): Yet another yummy async function to move or
-	copy a folder to a new location.
-
-	* component-factory.c (storage_remove_folder): New function for
-	removing folders.
-	(remove_folder): New function that the shell component calls to
-	delete a folder.
-	(component_fn): Set the remove_folder_fn argument.
-
-2001-05-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_write_on_exit): Save the
-	message-display style.
-	(config_read): Read the message-display style.
-
-2001-05-22  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (on_url_requested): If http mode is
-	HTTP_SOMETIMES, use e_book_query_address_locally to check the From
-	address and load images if it's found.
-
-	* mail-config.c (config_read): Default http_mode to
-	MAIL_CONFIG_HTTP_SOMETIMES. Fix typo to make default forward style
-	actually work.
-
-2001-05-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Use MAILER_CFLAGS and MAILER_LIBS.
-
-	* message-browser.c (message_browser_folder_loaded): Instead of
-	calling message_list_select_uid() here, instead connect to the
-	"message_list_loaded" signal since the message-list is not built
-	yet at this point.
-	(message_browser_message_list_built): Call
-	message_list_select_uid() here instead.
-
-	* message-list.c: Lets have a new signal, MESSAGE_LIST_BUILT, that
-	gets emitted when the message-list has finished being built by one
-	of the built_*() functions.
-	(message_list_class_init): Setup the signal stuff.
-	(regen_list_regened): Emit the signal here (should this perhaps be
-	moved into each of the build_*() functions instead?).
-
-2001-05-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* mail-local.c: Mark a string for translation.
-	
-2001-05-18  Jon Trowbridge  <trow@ximian.com>
-
-	* Makefile.am (evolution_mail_LDADD): Added libebook.la (which is
-	now required by the composer.)
-
-2001-05-17  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (composer_postpone_cb): mark Outbox messages as
-	read.
-
-2001-05-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_write_authenticity): New convenience
-	function for all signature verification functions to use to
-	display whether or not the signed part was authentic.
-	(try_inline_pgp_sig): Use mail_write_authentic().
-	(handle_multipart_signed): Add code to handle S/MIME
-	multipart/signed parts and also use mail_write_authenticity().
-
-2001-05-17  Dan Winship  <danw@ximian.com>
-
-	* mail-config.glade: add new icons from jimmac.
-
-2001-05-16  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (mail_format_raw_message): add
-	E_TEXT_TO_HTML_ESCAPE_8BIT to the flags
-
-2001-05-16  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c (folder_browser_is_drafts,
-	folder_browser_is_sent, folder_browser_is_outbox): Functions to
-	determine if a folderbrowser is one of the drafts, sent, or outbox
-	folders.
-	(got_folder): Pass TRUE for the "outgoing" flag to
-	message_list_set_folder if this is a Sent, Drafts, or Outbox
-	folder.
-
-	* message-list.c (message_list_set_folder): Take a flag saying
-	whether or not the folder is an "outgoing" folder.
-	(message_list_setup_etree): Ditto. Use that rather than a
-	hardcoded list of foldernames for deciding whether to swap From
-	and To in the default layout.
-
-	* mail-config.c (mail_config_folder_to_cachename): Make IMAP
-	folders have unique cachenames rather than only one per store, so
-	that IMAP Sent and Drafts folders don't get forced into having the
-	same layout as the INBOX.
-
-	* mail-callbacks.c: (is_sent_folder, is_drafts_folder): Gone.
-	Replaced with simpler folder_browser_is_* routines.
-	(edit_msg, resend_msg, open_msg): Use folder_browser_is_*
-	routines.
-
-	* mail-local.c (reconfigure_clicked): Update call to
-	message_list_set_folder.
-
-2001-05-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.c (mail_crypto_is_smime_v3_signed): Removed (this
-	now exists in camel/camel-smime.c).
-	(mail_crypto_is_pkcs7_mime): Same.
-	(mail_crypto_smime_part_sign): new
-	(mail_crypto_smime_part_verify): new
-	(mail_crypto_smime_part_encrypt): new
-	(mail_crypto_smime_part_decrypt): new
-	(mail_crypto_pgp_mime_part_sign): Added code to set an exception
-	if the context fails to be created.
-	(mail_crypto_pgp_mime_part_verify): And here...
-	(mail_crypto_pgp_mime_part_encrypt): Same.
-	(mail_crypto_pgp_mime_part_decrypt): And here too.
-
-2001-05-16  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (mail_display_redisplay): Deal with full-header
-	mode in addition to source mode
-
-	* mail-format.c (write_field_row_begin): Add WRITE_NOCOLUMNS flag
-	to write the header in a single table cell rather than two. Output
-	the second columns's "<td>" when not in NOCOLUMNS mode. Don't
-	include the ":" in the passed-in header name.
-	(write_date, write_address): Update for write_field_row_begin
-	changes.
-	(write_text_field): Genericified and updated from write_subject.
-	(write_headers): Deal with both normal and full-header mode.
-
-2001-05-15  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (on_url_requested): Load http images if the user
-	has force-loaded images too.
-	(mail_display_redisplay): Update for normal/headers/source changes.
-	(mail_display_load_images): New. Force HTTP image loading for the
-	current message.
-
-	* mail-config.c (mail_config_get_message_display_style,
-	mail_config_set_message_display_style): Updated and renamed from
-	mail_config_{get,set}_view_source
-
-	* mail-callbacks.c (load_images): New.
-
-	* folder-browser.c (folder_browser_set_message_display_style):
-	Renamed and updated from folder_browser_toggle_view_source.
-
-	* folder-browser-factory.c (verbs): Add ViewLoadImages.
-	(control_activate): Update for normal/headers/source change to
-	radio group.
-
-2001-05-15  Dan Winship  <danw@ximian.com>
-
-	* folder-browser-factory.c (verbs): Update for changes in
-	evolution-mail.xml (many commands were renamed to better match the
-	current menu layout).
-	(pixcache): Refer to commands via their paths in /commands/
-	rather than hardcoding their menu paths.
-
-2001-05-14  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-search.c (mail_search_construct): Put frame around dialog
-	vbox, put mail subject in that frame's label.  (Patch by Duncan.)
-	(mail_search_set_subject): Break out subject-setting code.
-	Truncate long subjects with ellipses.
-
-2001-05-14  Duncan Mak  <duncan@ximian.com>
-
-	* mail-search.c (mail_search_construct): set the dialog's
-	window_icon to jimmac's new find_message.xpm.
-
-2001-05-13  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Make the LDADD line longer so it actually compiles
-	everything correctly.
-
-2001-05-14  Dan Winship  <danw@ximian.com>
-
-	* mail-config.glade: Split "Other" page into three pages, Display,
-	Composer, and PGP. Add HTML image stuff on the Display page and
-	default forward style on the Composer page.
-
-	* mail-config.c (mail_config_get_default_forward_style,
-	mail_config_set_default_forward_style): User-specified default
-	style for forwarding messages.
-	(config_read, mail_config_write_on_exit): Deal with forward style.
-
-	* mail-accounts.c: Handle HTML image display options and default
-	forward style.
-
-	* mail-callbacks.c (forward): New. Forward in the user-selected
-	default style.
-	(forward_inline, forward_quoted): Simplify these some. Remove the
-	fallback to forward attached when forwarding multiple messages: it
-	should just forward the multiple messages inline or quoted in
-	those cases. (Which it doesn't yet, but that's a bug.)
-
-	* folder-browser.c (context_menu): Remove "Forward inline" and
-	make "Forward" call forward() rather than forward_attached().
-
-	* folder-browser-factory.c: Update command/menu/toolbar/pixmap
-	gunk for the "MessageForwardAttached" vs "MessageForward" split.
-
-	* mail-session.c (mail_session_get_type): 
-	* mail-format.c (format_mime_part): 
-	* mail-account-gui.c (setup_service): Fix warnings.
-
-	* mail-mlist-magic.c: Remove this... it's not used any more.
-
-	* folder-browser.c: 
-	* message-browser.c: Remove references to mail-mlist-magic.h
-
-2001-05-14  Jon Trowbridge  <trow@ximian.com>
-
-	* folder-browser.c (folder_browser_config_search): Use secondary
-	searches here, so that we control the interference between the two
-	bits of searching UI.
-
-2001-05-13  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-search.c (mail_search_construct): Destroy the MailSearch
-	dialog if the underlying MailDisplay is destroyed.  I don't like
-	the way that label in the dialog with the message subject in it
-	looks, so I've #ifdef-ed it out for now.  Center the Matches
-	label --- it makes the dialog look more balanced, I think.
-	(dialog_clicked_cb): Changed to reflect adjusted
-	ESearchingTokenizer API, using primary searches.
-	(toggled_case_cb): Use the primary search API.
-
-	* e-searching-tokenizer.c: Make searching routines utf8-friendly.
-	Rationalize how the match begin/end markup is handled; allow for
-	begin/end markup that varies by search.  Add concept of primary and
-	secondary matching, to disentangle possible interactions between
-	search-bar searches and search-dialog searches.
-
-2001-05-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-local.c (mail_local_storage_shutdown): Get rid of this - we
-	don't need it.
-
-	* component-factory.c (owner_unset_cb): Don't unref the LocalStore
-	- we don't own a ref on it!!
-
-2001-05-12  Duncan Mak  <duncan@ximian.com>
-
-	* mail-search.c (begin_cb): Updates the subject on refresh and
-	sets subject to "Untitled Message" if subject is NULL.
-	(mail_search_construct): Moved msg_subject to its own GtkLabel,
-	sets subject to "Untitled Message" if subject is NULL. Give focus
-	to entry by default. Made <enter> in entry run
-	dialog_clicked_cb by setting gnome_dialog_editable_enters.
-
-2001-05-12  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* folder-browser-factory.c: load pixmaps for MessageCopy and
-	MessageForwardAttached. Thanks Wayne Davis <wfdavis@seas.upenn.edu>
-	for a patch.
-
-2001-05-11  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (load_http): callback to use GNOME-VFS to load
-	http data.
-	(on_url_requested): Handle http: URLs that refer to either MIME
-	parts or web data.
-	(mail_display_redisplay_when_loaded): Moved out of
-	mail_content_loaded and made more generic.
-
-	* mail-format.c (add_url): Handle two different kinds of URLs
-	(URLs that point to CamelMimeParts and URLs that point to
-	GByteArrays).
-	(mail_content_loaded): Use mail_display_redisplay_when_loaded.
-	(format_mime_part): Renamed from "call_handler_function". Also,
-	record Content-Location if the part has one. (This is not yet 100%
-	correct: it doesn't deal with relative URLs at all.)
-	(handle_text_html): Use Content-Location URL rather than
-	Content-ID, when available (will help deal with relative URLs once
-	GtkHTML supports that better).
-	(etc): Update for changes.
-
-	* mail-config.c (mail_config_get_http_mode,
-	mail_config_set_http_mode): get/set HTTP image downloading mode.
-	(config_read, mail_config_write_on_exit): save/load that data.
-
-2001-05-11  JP Rosevear  <jpr@ximian.com>
-
-	* mail-importer.h: add proto
-
-	* mail-importer.c (mail_importer_uninit): release and unref the
-	local storage
-
-	* mail-local.c (mail_local_store_finalize): use
-	bonobo_object_release_unref rather than doing Bonobo_Unknow_unref
-	and a corba release
-	(register_folder_registered): "sink" the local_store ref to
-	prevent circular ref
-	(mail_local_storage_shutdown): unref the local store
-
-	* mail-local.h: new proto
-
-	* component-factory.c (owner_unset_cb): uninit the importer and
-	shutdown the local storage
-
-2001-05-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-local.c (mail_local_reconfigure_folder): Set a title on the
-	window "Reconfigure %s" where %s is the folder name. Also, don't
-	allow more than one of these type windows to be opened per folder.
-
-	* mail-tools.c (mail_tool_get_folder_name): Fix Danw's kludge to
-	actually work :-)
-
-2001-05-11  Martha Burke  <martha@ximian.com>
-
-	* gui/Makefile.am: sanitize LD_ADDS and CFLAGS so the libtool
-        lines are shorter (fixes problem on solaries due to sed)
-
-2001-05-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vfolder.c (vfolder_edit): Don't allow multiple copies of
-	this to be run at a time.
-
-	* mail-callbacks.c (providers_config): Don't allow multiple copies
-	of this to be run at a time.
-	(manage_subscriptions): Same, but this was a tad more kludgy since
-	we don't gnome_dialog_run_and_close() this one. I had to make the
-	widget a semi-global variable. yuck :\
-	(filter_edit): Same.
-
-2001-05-11  Jon Trowbridge  <trow@ximian.com>
-
-	* e-searching-tokenizer.c (e_searching_tokenizer_new): 
-	Remove a snippet of debugging code I left in by mistake.
-
-2001-05-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (forward_inlined): If the cursor_uid is NULL,
-	then we can't forward anything so just return.
-	(forward_quoted): Same.
-
-2001-05-10  Jon Trowbridge  <trow@ximian.com>
-
-	* folder-browser.c (folder_browser_config_search): Use the
-	ESearchingTokenizer to highlight search matches for folder-level
-	searches.  Still mildly broken, but it works for the simple cases.
-
-	* mail-display.c (mail_display_new): Use our ESearchingTokenizer
-	for the mail display GtkHTML widget.
-
-	* mail-search.c (dialog_clicked_cb): Use the ESearchingTokenizer to
-	highlight search matches.
-	(mail_search_construct): Add a match count to the search dialog.
-
-	* e-searching-tokenizer.c
-	(e_searching_tokenizer_set_search_string): Added.  A custom HTML
-	tokenizer that does highlighting of search strings.
-
-	* mail-config.c: No, we don't want to include
-	bonobo-running-context.h... just bonobo-context.h.
-
-2001-05-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c: Fix some compiler warnings by including the
-	correct bonobo headers and by using the correct bonobo types.
-	(config_read): Some fixes so that we can never have an empty
-	string as a URL.
-
-2001-05-10  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c (on_key_press): Don't advance to the next
-	undeleted message after "Delete"...
-
-	* mail-callbacks.c (delete_msg): ...instead, do it here, whether
-	the user used Delete, Alt+D, or the toolbar. (But only if they
-	only deleted a single message.)
-
-	* message-list.c (message_list_select): Don't clear the display on
-	failure.
-	(build_tree): Clear the display when the currently-selected
-	message stops existing and we don't have an obvious message to
-	select instead of it. (Eg, when deleting the last message with
-	"hide deleted messages" set, or expunging while a deleted message
-	is selected.)
-
-2001-05-09  Dan Winship  <danw@ximian.com>
-
-	* mail-offline-handler.c: New file, started by Ettore, finished by
-	me, to implement the GNOME_Evolution_Offline interface.
-
-	* Makefile.am (evolution_mail_SOURCES): Add
-	mail-offline-handler.[ch]
-
-	* mail-ops.c (mail_store_set_offline): Set a store online or
-	offline.
-
-	* mail-send-recv.c (auto_timeout): Don't run auto-check-for-mail
-	while the session is offline.
-
-	* component-factory.c (component_fn): Set up offline handler.
-
-2001-05-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* importers/evolution-mbox-importer.c (load_file_fn): Made a const
-	char * here.
-
-2001-05-08  Iain Holmes  <iain@ximian.com>
-
-	* mail-config.[ch]: Moved all references to the Bonobo stuff into the .c file
-
-2001-05-08  Iain Holmes  <iain@ximian.com>
-
-	* mail-callbacks.c (filter_edit): Set the title of the dialog.
-
-	* GNOME_Evolution_Mail.oaf.in: Add a reference for the MailConfig
-	interface stuff.
-
-	* Mail.idl: Add the MailConfig interface, and a MailFilter interface.
-
-	* component-factory.c (component_factory_init): Call 
-	evolution_mail_config_factory_init.
-
-	* mail-account-gui.c (setup_service): Just return if url == NULL,
-	don't crash.
-
-	* mail-config.c: #include bonobo-object.h, #include Mail.h and define
-	the Config factory IID.
-	Implement the MailConfig interface with a BonoboObject.
-	(impl_GNOME_Evolution_MailConfig_addAccount): Convert the CORBA struct
-	into the correct MailConfig structures and add the account.
-	(evolution_mail_config_class_init): Initialise the class.
-	(evolution_mail_config_init): This function is intentionally left blank.
-
-	(evolution_mail_config_factory_fn): Create an EvolutionMailConfig object
-	and return it.
-	(evolution_mail_config_factory_init): Set up the bonobo factory.
-
-	* mail-config.h: #include bonobo-xobject.h and Mail.h
-	Declare the object structures.
-
-	* importers/Makefile.am: Remove the intelligent importers.
-
-	* importers/evolution-mbox-importer.c (folder_created_cb): Callback
-	from when the folder is created. Opens the folder and unrefs the 
-	listener.
-	(load_file_fn): Create the folder if it doesn't exist.
-	
-2001-05-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-tools.c (mail_tool_forward_message): Convert the Subject
-	header to HTML and also make sure that the Subject, To, and From
-	header values are non-NULL before feeding them into
-	e_text_to_html().
-
-	* mail-callbacks.c (edit_msg_internal): Free the UIDs if the user
-	decides to not go through with editing all the messages he
-	selected.
-	(resend_msg): If the user attempts to resend more than 10
-	messages, make sure he really means it.
-	(do_resend_messages): Richard Zach feels that "Resend" should open
-	the message(s) in a composer since he might want to edit at least
-	the recipients (maybe he needs to resend because the message
-	bounced the first time) and Ettore wants pretty much the same
-	thing. This makes "Resend" basically the same as "Edit" but for
-	previously sent messages, whereas "Edit" is only for Drafts.
-
-2001-05-08  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* mail-search.c: convert search entry to utf8.
-	
-	* mail-local.c: d() debugging message.
-
-	* mail-send-recv.c: replace " ..." with "..."
-
-	* Makefile.am: removed EVOLUTION_VERSION.
-
-2001-05-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c: s/HAVE_NSS/HAVE_SSL for the SSL checkbox
-	stuff.
-
-2001-05-07  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c (my_folder_browser_init): Connect to
-	key_press_event on the GtkHTML widget.
-	(etree_key): Only handle space/backspace here, pass the rest off
-	to on_key_press.
-	(on_key_press): Handle Delete/N/P/Menu in either MessageList or
-	MailDisplay.
-
-	* message-list.c (message_list_select): Grab focus if we don't
-	have it.
-
-2001-05-03  Dan Winship  <danw@ximian.com>
-
-	* message-list.c: #include <camel/camel-file-utils.h>
-
-	* mail-ops.c (get_folderinfo_get): 
-	* subscribe-dialog.c (build_tree): Update for
-	camel_store_get_folder_info prototype change.
-
-	* mail-format.c (handle_text_plain_flowed): Improve more on the
-	fix from the other day: the first level of indentation adds blank
-	lines, but further levels don't...
-
-2001-04-30  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c (folder_browser_destroy): Unhook event handlers
-	before syncing the folder, since the folder browser will have been
-	destroyed by the time the sync thread completes and calls the
-	signal handlers.
-
-2001-04-29  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (handle_text_plain_flowed): Mojo this a bit so
-	that "\n\n>" gets translated to "<br><blockquote>" rather than
-	"<br><br><blockquote>", since the transition to blockquote mode
-	creates a blank line itself. Makes Mozilla-generated flowed
-	replies look better.
-
-2001-04-27  Dan Winship  <danw@ximian.com>
-
-	* mail-session.c: Renamed from session.c and made to be a subclass
-	of CamelSession.
-
-	* mail-mt.c (mail_user_message): Renamed from mail_get_accept and
-	made more general-purpose, to implement the new
-	camel_session_alert_user.
-
-2001-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* main.c (main): No need to camel_shutdown() anymore...
-
-	* mail-callbacks.c (next_msg): Don't filter on Seen status.
-	(previous_msg): Same.
-	(next_unread_msg): New function that does what the old callback
-	next_msg callback did (only better named).
-	(previous_unread_msg): Same.
-
-	* message-list.c (hide_load_state): Updated to use camel-file-util
-	routines.
-	(hide_save_1): Same.
-	(hide_save_state): And here too.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): Remove UNICODE_CFLAGS
-
-	* mail-format.c (handle_text_plain_flowed): Use <font color=...>
-	to mark citations rather than italicizing them, which has never
-	looked very nice. Now this is more consistent with the non-flowed
-	case.
-
-2001-04-26  Jon Trowbridge  <trow@ximian.com>
-
-	* folder-browser-factory.c: Added "MessageSearch" verb.
-
-	* mail-callbacks.c (search_msg): Added search callback.
-	(are_you_sure): Added some casts to fix compiler warnings.
-
-	* mail-search.c: Added.  A simple search-in-message widget,
-	that uses GtkHTML's searching capabilities.
-
-2001-04-25  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (are_you_sure): New foot-shooting-prevention
-	helper function.
-	(edit_msg_internal, view_msg): If the user has more than 10
-	messages selected, ask before opening them all in separate
-	windows, to protect against misclicks/typos after "select all"
-	(which we've had at least two reports of now).
-
-2001-04-25  Radek Doulik  <rodo@ximian.com>
-
-	* mail-tools.c (mail_tool_quote_message): set object data directly
-	in HTML source
-
-	* mail-callbacks.c (mail_generate_reply): remove \n from citation
-	(mail_generate_reply): don't use e_msg_composer_mark_text_orig
-
-2001-04-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c: Added a new signal, "message_loaded" that gets
-	emitted when the message has been loaded and set on the
-	mail_display.
-	(folder_browser_class_init): Define the "message_loaded" signal
-	stuff.
-	(done_message_selected): Emit the "message_loaded" signal here.
-
-	* message-browser.c (message_browser_next_msg): Do our own
-	message-list manipulation. We want the next message, not the next
-	unread message.
-	(message_browser_prev_msg): Same here but for previous.
-	(message_browser_new): Connect to the folder browser's
-	"message_loaded" signal.
-	(message_browser_folder_loaded): Don't connect to the
-	message-list's "message_selected" signal.
-	(message_browser_message_loaded): Nw callback which replaces the
-	old message_browser_message_selected callback's functionality.
-
-2001-04-24  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c: Add accelerators to the context menu.
-	(on_right_click): Use e_tree_get_cell_geometry and a
-	GtkMenuPositionFunc when responding to a Menu-key press so we can
-	line the menu up with the selected row rather than the cursor.
-
-	* message-browser.c: include <gal/util/e-util.h> for E_MAKE_TYPE.
-
-2001-04-23  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-display.c (html_button_press_event): Check for mailto:
-	links, and pop up our mail address menu when we find one.
-	(make_popup_window): The main piece of code (ignoring a zillion
-	little callbacks) to pop up our windows with reasonable semantics
-	for having them close automatically.
-	(mail_text_write): Enable converting addresses to mailto links
-	in message bodies.
-
-	* mail-format.c (write_address): Simplify code, removing Radek's
-	<DATA> hacks.  Write out addresses as mailto: links.
-
-2001-04-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (do_view_message): Use the message-browser
-	widget rather than the mail-view window.
-
-	* mail-view.c: Removed.
-
-	* folder-browser.c: Added a folder_loaded signal.
-
-	* message-browser.[c,h]: New window to solve all our message
-	browsing needs. This replaces mail-view.c.
-
-	* message-list.c (message_list_select_uid): New function needed by
-	the new message-browser window.
-
-2001-04-23  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (save_msg): Append a "/" to the result of
-	g_get_home_dir so gets the default dir it was supposed to.
-
-2001-04-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_send_message): Lets do proper refcounting on
-	the sent-folder. Also, g_strdup() the sent_folder_uri since we
-	later free it. If we don't, then we get lovely corrupt memory.
-
-	* mail-crypto.c (mail_crypto_pgp_mime_part_sign): Make sure we
-	have a context before we try and use it.
-
-2001-04-22  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* folder-browser.c, mail-autofilter.c, mail-callbacks.c,
-	mail-ops.c, mail-summary.c, mail-vfolder.c: use system =
-	EVOLUTION_DATADIR "/file" instead of g_strdup_printf. Rename
-	userrules to user (and system) to be consistent.
-
-	* mail-send-recv.c: set window icon to send-receive.xpm
-
-2001-04-21  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* mail-summary.c: translate "Mail summary".
-
-2001-04-20  Dan Winship  <danw@ximian.com>
-
-	* mail-config-druid.c (make_default_account): Convert the result
-	of g_get_real_name() from the locale charset to UTF8. Noted by
-	Petter Sundlöf (NOT "Petter Sundl_" :)
-
-2001-04-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_set_pgp_type): Use a CamelPgpType.
-	(mail_config_get_pgp_type): Return a CamelPgpType.
-	(auto_detect_pgp_variables): auto-detect the user's pgp settings.
-
-2001-04-20  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (handle_text_plain): Fix a dumb thinko in my 04-11
-	patch.
-
-2001-04-20  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* mail-ops.c: (send_mail_desc): Convert subject from utf8
-	before passing it on.
-
-2001-04-20  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* mail-display.c: #if 0'd out my not-working selection code
-
-2001-04-19  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (mail_format_raw_message): Make this more raw:
-	don't do URLs and citations.
-
-2001-04-18  Dan Winship  <danw@ximian.com>
-
-	* session.c (request_callback): Don't need to dup the string: the
-	relevant gnome-dialog routine already does.
-
-	* message-list.c (message_list_destroy): Free the uid_nodemap.
-	(hide_save_state): Free the filename when we're done.
-
-2001-04-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (is_sent_folder): Implemented.
-	(resend_msg): Use is_sent_folder().
-
-2001-04-17  Dan Winship  <danw@ximian.com>
-
-	* mail-mt.c (mail_msg_check_error): Fix a memory leak.
-
-2001-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/Makefile.am (INCLUDES): Add `$(EXTRA_GNOME_CFLAGS)'
-	here.
-
-2001-04-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mark_all_as_seen): Mark the messages as seen,
-	not unseen.
-	(is_drafts_folder): New function to attempt to determine if a
-	folder is a drafts folder.
-	(open_msg): Use is_drafts_folder().
-	(edit_msg): And here.
-	(edit_msg_internal): New function that doesn't do the drafts
-	checking and is only to be used internally. This should save us
-	from having to doubly-check a folder to see if it's a drafts
-	folder when doing an Open on the message.
-	(open_msg): Call edit_msg_internal once we've established that the
-	folder is a drafts folder.
-
-2001-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.c (mail_crypto_pgp_mime_part_verify): Only use
-	non-NULL contexts.
-	(mail_crypto_pgp_mime_part_encrypt): Same.
-	(mail_crypto_pgp_mime_part_decrypt): And here too.
-
-	* mail-format.c (try_inline_pgp_sig): Make sure to not use the
-	context if it is NULL.
-	(decode_pgp): Same.
-
-	* folder-browser-factory.c: Added stuff for filtering/vfoldering
-	on mailinglists.
-
-2001-04-13  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (evolution_mail_LDADD): Remove some redundant LIBS
-	variables... purify complained that the command line was too
-	long. :-}
-
-	* mail-account-gui.c: Plug leaks.
-
-	* mail-display.c (on_url_requested): close the html stream on
-	error too.
-
-	* mail-ops.c (fetch_mail_fetch): Move a line around that probably
-	doesn't affect anything, but it's correct.
-
-	* session.c (auth_callback): Plug leak.
-
-	* mail-send-recv.c (receive_status): Initialize "now".
-
-2001-04-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c (on_cursor_activated_cmd): Only activate the
-	message if the cursor has moved.
-
-2001-04-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c (e_mail_address_new): Updated this function to be
-	a correct full ordering.
-	(ml_has_get_node_by_id, ml_get_node_by_id): Implemented these
-	functions.
-	(find_next_undeleted): Changed this to find next sorted undeleted
-	message.  Also, changed it so that if the current message is not
-	deleted, it returns NULL.
-	(build_tree, build_flat): Changed these to only set the cursor if
-	the cursor is changed.
-
-	* subscribe-dialog.c: Changed this to pass NULL, NULL for
-	has_get_node_by_id and get_node_by_id.
-
-2001-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* session.c (auth_callback): If the service is NULL, just use the
-	item as the key.
-
-	* mail-crypto.c (mail_crypto_pgp_mime_part_sign): Use the
-	CamelCipherHash enum.
-	(mail_crypto_pgp_mime_part_verify): Use a CamelCipherValidity.
-
-	* mail-format.c (try_inline_pgp_sig): Updated to use
-	CamelCipherValidity instead of CamelPgpValidity.
-	(handle_multipart_signed): Same.
-
-2001-04-12  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c (do_message_selected, on_message_selected):
-	Don't printf NULL
-
-	* mail-format.c (mail_part_is_inline): Don't leak memory.
-
-2001-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (pgp_path_changed): Updated for changes to PGP
-	code.
-
-	* component-factory.c (owner_set_cb): Don't init openpgp anymore
-	because we don't need it.
-
-	* mail-crypto.c: Simply wrap the camel-pgp-mime functions (also
-	renamed the functions to be prefixed with mail_crypto).
-
-	* mail-format.c (handle_multipart_signed): Update to use
-	camel_pgp_mime_is_rfc2015_signed() and other camel-pgp-mime
-	functions.
-	(handle_multipart_encrypted): Same but for rfc2015_encrypted.
-	(decode_pgp): Updated to use camel-pgp-context
-	(try_inline_pgp): Updated to use camel-pgp-context's.
-	(try_inline_pgp_sig): Same.
-
-2001-04-11  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (handle_text_plain): Only look for special
-	pseudo-multipart-isms (binhex, uucode, old pgp, etc) if the MIME
-	type is really text/plain. Otherwise, since there's no handler for
-	applciation/mac-binhex40, it gets sent to mail-identify.c, which
-	thinks it's text/plain because it starts with English words, and
-	so it gets sent back to the text/plain handler, which finds an
-	embedded binhex part...
-
-	* mail-callbacks.c (do_view_message): mark messages as seen when
-	opening then in a separate window.
-
-2001-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* openpgp-utils.c (openpgp_encrypt): Don't g_free the recipient
-	array members here because we free them in the caller.
-
-2001-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.c (pgp_mime_part_verify): Huh, somehow I forgot to
-	apply the from filter when verifying signed parts. Oh well,
-	probably not all that common. Fixed now though.
-
-2001-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (save_msg): Use the homedir as the default
-	filename.
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c (save_tree_state, message_list_setup_etree): Save
-	the expanded state using the ETree built in expanded state code.
-
-2001-04-05  Not Zed  <NotZed@Ximian.com>
-
-	* Merge from evolution-0-10 to evolution-0-10-merge-0 into head.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* mail-account-gui.c: Add prototype for service_changed().
-	* message-list.h: Remove #include <gal/e-table/e-tree-simple.h>
-	since it doesn't get installed.
-	
-2001-04-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* mail-config-druid.c (create_html): set content type to utf8.
-	* mail-config.c (mail_config_check_service): fix warning.
-	* mail-display.c (link_open_in_browser): just call on_link_clicked().
-	(link_menu): Open link works.
-	(link_copy_location): claim selection.
-	(on_selection_get): new function, selection handler.
-	(mail_display_new): connect to selection_get. FIXME: does not work.
-
-2001-04-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* component-factory.c: use big trash icon, stolen from mc.
-
-2001-04-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* openpgp-utils.c (openpgp_encrypt): Add --no-tty argument to gpg.
-
-2001-04-03  Dan Winship  <danw@ximian.com>
-
-	* folder-browser-factory.c (control_activate): Sync the folder on
-	activate.
-
-	* session.c (mail_session_remember_password): Use the same
-	URL-transforming rules we use when hashing the password so this
-	actually works.
-
-2001-04-02  Iain Holmes  <iain@ximian.com>
-
-	* importers/elm-importer.c (elm_can_import): Call is_kmail to check for 
-	KMail files.
-	(is_kmail): Checks if the given directory is a KMail directory.
-
-2001-04-02  Iain Holmes  <iain@ximian.com>
-
-	* importers/elm-importer.c (elm_can_import): Check for some MH files
-	to make sure that the dir really is an Elm dir.
-
-2001-04-02  Dan Winship  <danw@ximian.com>
-
-	* mail-account-gui.c: Add a "provider_type" arg to
-	MailAccountGuiService.
-	(transport_needs_auth_toggled): Call service_changed if enabling
-	the auth pane so the status of the "Check supported types" button
-	will be correct.
-	(service_check_supported): Use gsvc->provider_type, not
-	CAMEL_PROVIDER_STORE.
-	(mail_account_gui_new): Pass the transport as the user_data to the
-	"changed" signal on transport.hostname, not the store.
-	(mail_account_gui_setup): Set up provider_type fields
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* component-factory.c: changed vtrash icon to trash. doh
-	* folder-browser-factory.c: pixmap cache got moved from here to
-	e-util/e-gui-utils.c. Changed pixmap paths according to file renames.
-	Added icons for print, get mail, etc., changed get mail icon as Jacub
-	suggested.
-	* subscribe-dialog.c: also use new pixmap cache.
-
-2001-03-30  Dan Winship  <danw@ximian.com>
-
-	* mail-config.c (check_service_check): Register for cancellation.
-	(mail_config_check_service): Pop up a modal dialog with a message
-	and a "Cancel" button for the duration of the check.
-
-2001-03-30  Iain Holmes  <iain@ximian.com>
-
-	* importers/evolution-mbox-importer.c (load_file_fn): Check if
-	foldername is \0.
-
-	* importers/evolution-outlook-importer.c (load_file_fn): Ditto.
-
-2001-03-30  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-display.c (mail_text_write): Add (commented-out)
-	E_TEXT_TO_HTML_CONVERT_ADDRESSES.
-
-	* mail-config.c (mail_config_get_account_by_source_url): 
-	Call e_url_equal to compare URLs.
-
-2001-03-30  Dan Winship  <danw@ximian.com>
-
-	* component-factory.c (debug_cb): If the EvolutionShellComponent
-	emits a "debug" signal, turn on camel_verbose_debug.
-
-2001-03-30  Radek Doulik  <rodo@ximian.com>
-
-	* mail-display.c (mail_display_redisplay): reset last_active
-
-2001-03-29  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-callbacks.c: Added #include <time.h> to get things
-	to compile.
-
-	* mail-callbacks.c (mail_generate_reply): Look at the
-	X-Evolution-Source header, and try to find a corresponding
-	account.  If this works, send the mail from this account.
-	If not, use the default account.
-
-	* mail-ops.c (send_queue_send): Strip out the X-Evolution-Source
-	header before sending.
-
-	* mail-config.c (mail_config_get_account_by_source_url): Added.
-	Look up accounts by source URL.
-
-2001-03-29  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (call_handler_function): if called with a
-	multipart that's really a 0-part, spew an error and display as
-	source.
-
-	* message-list.c: #include <camel/camel-vtrash-folder.h>
-
-	* mail-callbacks.c: #include <libgnome/gnome-paper.h>
-	for the gnome-print stuff.
-
-	* mail-display.c (pixmap_press): Ignore "funky" button clicks
-	(like scroll wheel scrolls)
-
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* *.*: Cleaned up #includes. Remove unneccesary includes of
-	<gnome.h>, <gtk/gtk.h>, <bonobo.h> and replaced with more
-	fine grained headers where needed. Also marked a bunch of
-	strings for translations and added some missing prototypes.
-	
-2001-03-29  Dan Winship  <danw@ximian.com>
-
-	* mail-account-editor.c (switch_page): Fix this so the "Receiving
-	Options" page gets filled in again.
-
-	* mail-send-recv.c (receive_get_folder): Doh! This was storing
-	"struct _folder_info"s in the cache and then trying to read them
-	back as CamelFolders. Fixicate. Fixes the "crash with 2 POP
-	accounts" bug.
-
-	* session.c (auth_callback): Update call to camel_url_to_string.
-	(Don't include the params in the password hash table key.)
-
-	* mail-config.c (mail_config_folder_to_cachename): Call
-	camel_url_to_string with HIDE_PASSWORD and HIDE_PARAMS so that
-	changing URL params doesn't change the cachename.
-
-	* mail-ops.c (add_vtrash_info): 
-	* mail-local.c (reconfigure_folder_reconfigure):
-	* mail-account-gui.c (save_service): Update calls to
-	camel_url_to_string.
-
-2001-04-03  Dan Winship  <danw@ximian.com>
-	
-	* folder-browser-factory.c (control_activate): Sync the folder on
-	activate.
-
-	* session.c (mail_session_remember_password): Use the same
-	URL-transforming rules we use when hashing the password so this
-	actually works.
-
-2001-04-03  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (mail_send_message): Strip header content before using it.
-
-2001-04-02  Iain Holmes  <iain@ximian.com>
-
-	* importers/elm-importer.c (elm_can_import): Calls is_kmail to
-	check for kmail files.
-	(is_kmail): Checks if the given directory is a KMail directory.
-
-2001-04-02  Dan Winship  <danw@ximian.com>
-
-	* mail-account-gui.c: Add a "provider_type" arg to
-	MailAccountGuiService.
-	(transport_needs_auth_toggled): Call service_changed if enabling
-	the auth pane so the status of the "Check supported types" button
-	will be correct.
-	(service_check_supported): Use gsvc->provider_type, not
-	CAMEL_PROVIDER_STORE.
-	(mail_account_gui_new): Pass the transport as the user_data to the
-	"changed" signal on transport.hostname, not the store.
-	(mail_account_gui_setup): Set up provider_type fields
-
-2001-04-02  Iain Holmes  <iain@ximian.com>
-
-	* importers/elm-importer.c (elm_can_import): Check for some MH files
-	to make sure that the dir really is an Elm dir.
-
-2001-03-30  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_toggle_hide_deleted): New
-	function to listen for hide_deleted changes.
-	(folder_browser_toggle_hide_deleted): Only svae the hide-deleted
-	state if we are not setting a trash folder.
-
-	* folder-browser-factory.c (control_activate): Set the
-	hide_deleted flag appropriately/setup the menu's appropriately.
-	(control_activate): Workaround to Force setting of options by
-	bypassing bonobo notification, since it doesn't properly handle
-	changed components.
-
-	* mail-config.c (mail_config_get_hide_deleted): 
-	(mail_config_set_hide_deleted): New functions for
-	accessing/setting the hide deleted state.
-	(mail_config_write_on_exit): 
-	(config_read): Save/load the hide_deleted flag.
-
-	* message-list.c (main_folder_changed): Oops, remember to copy
-	over all the rest of the changes too if we removed some.
-	(find_next_undeleted): Find the first undeleted message below us.
-	This of course does not follow sorting conventions, but thats
-	etree.  Have to ask chris if there is a way to make it work like
-	that.
-	(message_list_set_hidedeleted): Check we dont set hide_delete on a
-	vtrash.
-	(build_tree): If the message has vanished, try and get the next
-	undeleted message set, etc, if it still exists.  The set_cursor()
-	function seems very broken but i'm sure e-lahey will get to it
-	soon.
-	(build_flat): Similarly for above.
-
-2001-03-30  Dan Winship  <danw@ximian.com>
-
-	* mail-config.c (check_service_check): Register for cancellation.
-	(mail_config_check_service): Pop up a modal dialog with a message
-	and a "Cancel" button for the duration of the check.
-
-	* component-factory.c (debug_cb): If the EvolutionShellComponent
-	emits a "debug" signal, turn on camel_verbose_debug.
-
-2001-03-30  Radek Doulik  <rodo@ximian.com>
-
-	* mail-display.c (mail_display_redisplay): reset last_active
-
-2001-03-29  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (call_handler_function): if called with a
-	multipart that's really a 0-part, spew an error and display as
-	source.
-
-	* mail-display.c (pixmap_press): Ignore "funky" button clicks
-	(like scroll wheel scrolls)
-
-2001-03-29  Dan Winship  <danw@ximian.com>
-
-	* mail-account-editor.c (switch_page): Fix this so the "Receiving
-	Options" page gets filled in again.
-
-	* mail-send-recv.c (receive_get_folder): Doh! This was storing
-	"struct _folder_info"s in the cache and then trying to read them
-	back as CamelFolders. Fixicate. Fixes the "crash with 2 POP
-	accounts" bug.
-
-	* session.c (auth_callback): Update call to camel_url_to_string.
-	(Don't include the params in the password hash table key.)
-
-	* mail-config.c (mail_config_folder_to_cachename): Call
-	camel_url_to_string with HIDE_PASSWORD and HIDE_PARAMS so that
-	changing URL params doesn't change the cachename.
-
-	* mail-ops.c (add_vtrash_info): 
-	* mail-local.c (reconfigure_folder_reconfigure):
-	* mail-account-gui.c (save_service): Update calls to
-	camel_url_to_string.
-
-2001-03-29  Not Zed  <NotZed@Ximian.com>
-
-	* mail-local.c (init_trash): Create a vtrash folder, not a vee folder.
-
-	* folder-browser-factory.c (control_activate): Hook in the hide
-	deleted thingy.
-	Removed MessageHideDeleted menu stuff.
-
-	* message-list.c (message_list_set_hidedeleted): New function, to
-	set if we should hide deleted messages automatically/always.
-	(regen_list_regen): If we have hide deleted messages turned on,
-	then hide them.
-	(main_message_changed): Promote to a folder_changed event with a
-	change list, folder_changed has the optimisations to handle this
-	appropriately.
-	(main_folder_changed): IF we get changes events for
-	deleted/undeleted stuff, change to added/removed events, rebuild
-	if necessary.
-	(message_list_set_folder): Setup the default hidedeleted state to
-	be to hide everything unless it is in a vtrash folder.
-
-2001-03-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-gui.c (setup_service): Move the
-	gtk_toggle_button_set_active outside the if.
-
-2001-03-28  Dan Winship  <danw@ximian.com>
-
-	* mail-account-gui.c (mail_account_gui_new): Set up the
-	sent/drafts folder buttons.
-	(folder_picker_clicked): Pop up the folder selector when sent or
-	drafts is clicked.
-	(mail_account_gui_save): Save the sent/drafts folders.
-
-	* mail-config.c (account_copy): copy sent/drafts info
-	(config_read): read sent/drafts info
-	(mail_config_write): write sent/drafts info
-
-	* mail-callbacks.c (composer_send_cb, composer_postpone_cb):
-	split out some common code here (and fix inconsistencies). Always
-	set headers on the message giving the account name, transport,
-	and sent folder to use.
-
-	* mail-ops.c (mail_send_message): If the message has an
-	X-Evolution-Account header, use the transport/sent folder info for
-	that account (assuming it still exists). Otherwise, if it has
-	X-Evolution-Transport and/or X-Evolution-Fcc, use those. If not,
-	use the default transport and sent folder.
-	FIXME: Falls back silently to the default sent folder if it can't
-	open the account-specific one...
-	(send_queue_send): remove the X-Evolution-Transport, etc
-	processing here, as it gets done by mail_send_message now.
-	FIXME: We only sync the default sent folder.
-	
-	* component-factory.c (owner_set_cb): While setting up the
-	standard folders, also record their URIs.
-
-2001-03-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (switch_page): Lets do some NULL checking
-	here. First, make sure the gsrc isn't NULL and also make sure that
-	account->source isn't NULL either.
-
-	* mail-account-gui.c (mail_account_gui_setup): If there isn't a
-	source_proto, make sure we select "None" as the source type.
-
-2001-03-27  Dan Winship  <danw@ximian.com>
-
-	* mail-config-druid.c (construct): set the initial druid button
-	state after doing the mail_account_gui_setup, since that may
-	invoke signal handlers that will change it.
-
-	* mail-account-gui.c (mail_account_gui_new): Fill in signature and
-	organization too.
-	(mail_account_gui_save): Preserve the "enabled" flag on the source.
-	(save_service): Don't look at authtype if the widget is
-	insensitive. (Fixes the "smtp://;auth=PLAINservername" bug.)
-
-2001-03-27  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (receive_done): Use gnome-dialog-close instead
-	of object_unref, for some reason it doesn't like being unref'd
-	with a refcount of 1, _who knows_.  Gets rid of that refcount
-	warning on get mail.
-
-2001-03-27  Dan Winship  <danw@ximian.com>
-
-	* mail-config.glade: Probably the very last new config dialog
-	ever. (Ha ha). From Anna, based on a story by me.
-
-	* mail-account-gui.c: New code for the new mail-config.glade. This
-	abstracts out all of the common code between the account editor
-	and the druid. It also handles the spiffy new provider-specific
-	config stuff.
-
-	FIXME: The code to check if a service is ok or not is no longer
-	there... waiting until the online/offline stuff from the shell
-	appears.
-
-	* mail-account-editor.c, mail-config-druid.c: These are much
-	smaller now, since most of the interesting bits moved to
-	mail-account-gui.c
-
-	* mail-accounts.c: Add an enabled/disabled column/button to
-	replace the checkbox that used to be in the editor, because it
-	really makes more sense to have it out here. This looks ugly.
-	Probably ought to ETable it...
-	(load_accounts): Fill in the enabled column.
-	(mail_select, mail_unselect): toggle the sensitivity and name of
-	the Enable/Disable button appropriately
-	(mail_able): Handle the enable/disable button.
-
-	* mail-config.c: Remove reply-to from MailConfigIdentity since it
-	didn't belong there (and wasn't being saved anyway).
-	(mail_config_check_service): Simplify this a bit. This really
-	needs to pop up a dialog with a "connecting..." message and a
-	cancel button.
-
-	* mail-ops.c (uid_cachename_hack): Kludge, copied+modified from
-	mail_config_folder_to_cachename to deal with the different
-	behavior of the URL code now. Will go away when the keep-on-server
-	code moves.
-	(get_folderinfo_get): Only pass "subscribed_only" to
-	camel_store_get_folder_info if the store supports subscriptions...
-	
-	* mail-local.c (local_provider): Update this to reflect the
-	CamelProvider structure change
-
-2001-03-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (transfer_msg): Add "vtrash" as an allowed mail
-	folder type.
-
-	* mail-ops.c (transfer_messages_transfer): Updated to reflect
-	changes made to the move/copy API in camel-folder.c
-	(add_vtrash_info): Use /Trash as the path instead of Trash.
-
-	* mail-local.c (reconfigure_folder_reconfigure): Updated this too.
-
-2001-03-20  Not Zed  <NotZed@Ximian.com>
-
-	* mail-local.c (init_trash): Fixed vfolder_new api.
-
-2001-03-26  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (get_cid): Make fake content-id URLs be guaranteed
-	unique: the old way (with %p on the CamelMimePart *) would
-	generate duplicates if memory was freed and re-allocated the right
-	way.
-
-	* mail-display.c (pixbuf_gen_idle, etc): Make the thumbnail cache
-	global rather than per-MailDisplay, since content-ids ought to be
-	globally unique. Also, don't leak content-id strings when the
-	pixbuf generation fails, and remove pixbufs from the cache after 5
-	minutes.
-
-	* component-factory.c (mail_load_storages): Simplify a bit using
-	camel_session_get_provider.
-
-	* mail-callbacks.c (empty_trash): Ditto, and fix up use of
-	CamelException.
-
-2001-03-26  Radek Doulik  <rodo@ximian.com>
-
-	* mail-format.c (write_address): clear name and email data after
-	each address
-
-2001-03-25  Dan Winship  <danw@ximian.com>
-
-	* component-factory.c (unref_standard_folders): Fix a bug in this
-	that probably would have been noticed sooner if ETree hadn't always
-	made the mailer crash before you got here. :-)
-
-2001-03-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (transport_auth_type_changed): Allow the
-	authtype to be NULL.
-	(transport_auth_init): If the provider allows authtypes but
-	doesn't *need* one, create a "None" menu item that the user can
-	choose. This should fix the bug people have been seeing recently
-	since dan removed the no_authtype authmech from the smtp provider.
-
-2001-03-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* openpgp-utils.c (openpgp_verify): Default to iso-8859-1 as the
-	user's charset here if it is undefined. This is a better choice
-	than us-ascii.
-
-2001-03-23  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-display.c (handle_embedded_address_object): #ifdef away
-	some code I don't quite want to delete yet.
-	(html_button_press_event): Remove some of Radek's placeholder
-	code, replace it with code to create my AddressPopup bonobo
-	control.
-
-	* mail-format.c: Remove some obsolete code that if #ifdef-ed out
-	a while ago.
-
-	* mail-ops.c (send_queue_send): Strip out the X-Evolution-Identity
-	header when sending.
-
-2001-03-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c: Turned on BROKEN_ETREE.
-
-2001-03-22  Iain Holmes  <iain@ximian.com>
-
-	* importers/evolution-outlook-importer.c: Update for new IDL.
-
-	* importers/evolution-mbox-importer.c: Update for new IDL.
-
-	* importers/Makefile.am: Build the elm importer.
-
-2001-03-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (mail_double_click): New callback to handle a
-	double-click event in the account clist.
-	(construct): Setup the double-click event for the account list.
-
-2001-03-22  Radek Doulik  <rodo@ximian.com>
-
-	* mail-display.c (mail_display_new): connect to button_press_event
-	and iframe_created events of GtkHTML widget
-	(html_button_press_event): new signal handler, runs popup on
-	address fields and on links, later we should add popups for images
-	and maybe some more? any ideas?
-	(html_iframe_created): new signal handler, takes care of
-	connecting to button_press_event of all iframes : plus bunch of
-	empty methods for popup menu items - to be implemented
-	(html_motion_notify_event): new handler, highlights addresses by
-	underline
-	(html_enter_notify_event): take care of enter event
-	(update_active): helper function, extracted from
-	html_motion_notify_event
-	(update_active): move to absolute coordinates
-	(html_button_press_event): ditto
-
-	* mail-format.c (write_address): revert back to raw HTML text,
-	store name and email to Text objects, workaround gtkhtml tables
-	bug (to be fixed soon ;-)
-
-2001-03-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser-factory.c (update_pixmaps): Don't return if
-	loading one image fails.
-
-2001-03-21  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (handle_multipart_related): Fix a bug in (illegal)
-	0-part messages
-
-	* mail-config-druid.c (incoming_check, incoming_type_changed,
-	transport_check, transport_type_changed): * mail-account-editor.c
-	(transport_type_changed, source_check): Use the new URL part
-	macros
-
-	* mail-config.c (check_service_check): Use provider authtype list
-	if not connecting.
-
-2001-03-20  Miguel de Icaza  <miguel@ximian.com>
-
-	* folder-browser-factory.c: Added new icons.
-
-2001-03-18  Miguel de Icaza  <miguel@ximian.com>
-
-	* folder-browser-factory.c: Remove duplicated verb.
-
-2001-03-20  Iain Holmes  <iain@ximian.com>
-
-	* importers/evolution-mbox-importer.c (process_item_fn): Step the
-	parser so that it will import more than one message.
-
-2001-03-20  JP Rosevear  <jpr@ximian.com>
-
-	* importers/Makefile.am: extra dist the oaf files
-
-2001-03-20  Radek Doulik  <rodo@ximian.com>
-
-	* mail-tools.c (mail_tool_quote_message): set color in html
-	citation
-
-	* mail-config.c: added citation highlighting configuration
-
-	* mail-tools.c (mail_tool_quote_message): use citation
-	highlighting
-
-	* mail-display.c (mail_text_write): use citation highlighting
-
-2001-03-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* folder-browser.c (etree_key): Made this check if the control
-	mask is set.
-
-2001-03-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c (remove_node_diff, build_flat_diff): Remove the
-	node before freeing the data it points to.
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* Merged e-tree-rework-branch:
-
-2001-03-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c: Added has_save_id and get_save_id methods.
-
-	* subscribe-dialog.c: Added arguments for
-	e_tree_memory_callbacks_new of get_save_id and has_save_id to
-	NULL.
-
-2001-03-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c: Added a call to
-	e_tree_memory_set_expanded_default to TRUE.  Removed all calls to
-	set_expanded on nodes while the tree is frozen since this fails
-	miserably now.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c (message_list_get_layout): Turned off draw-grid.
-
-2001-03-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* folder-browser-factory.c, folder-browser.c, message-list.c,
-	message-list.h, subscribe-dialog.c, subscribe-dialog.h,
-	mail-callbacks.c: Converted these all to use ETree instead of
-	ETable.
-
-End of branch
-
-2001-03-19  Iain Holmes  <iain@ximian.com>
-
-	* importers/pine-importer.c: Pine intelligent mail importer.
-	
-	* importer/elm-importer.c: Elm imtelligent mail importer.
-
-	* importer/GNOME_Evolution_Mail_(Pine|Elm)_Intelligent_Importer.oaf.in:
-	Pine and Elm oafinfo files.
-
-	* importer/netscape-importer.c (maybe_replace_name): Replace some invalid
-	names with valid ones (Trash -> Netscape-Trash). Change some netscape names
-	to Evolution names (Unsent Messages -> Outbox).
-	(scan_dir): Use less variables.
-	(netscape_import_file): Simplify.
-
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c: Removed gnome.h and ctype.h
-	(send_queue_send): Don't remove the X-Evolution header here.
-	(mail_send_message): Remove it here instead (so we only have to
-	remove it in one place - no matter if you send a single message or
-	send_queue.
-
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (write_headers): Write the date header.
-
-	* component-factory.c (owner_unset_cb): Call
-	unref_standard_folders() here instead.
-
-	* folder-browser-factory.c: Add Resend Message menu item.
-
-	* folder-browser.c (on_right_click): Add resend to the right-click
-	menu.
-
-	* mail-callbacks.c (composer_sent_cb): Unref the message.
-	(composer_postpone_cb): Unref the message here too.
-	(resend_msg): New callback to allow resending of messages in the
-	Sent folder.
-
-2001-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (unref_standard_folders): unref the standard
-	folders.
-	(owner_set_cb): Use g_atexit() to call unref_standard_folders()
-	when evolution-mail exits. This should solve the problem where
-	these folders are not synced when evolution-mail closes (because
-	they still had refs on them on close).
-
-2001-03-17  Not Zed  <NotZed@Ximian.com>
-
-	* mail-mt.c (mail_msg_free): Move the proxy event outside the lock
-	(otherwise we always deadlock).
-
-	* mail-local.c (reconfigure_clicked): Clear the message list
-	during update inside the folder thingy.  This is a hell mess, need
-	to move the gui stuff to mail-callbacks and make this reconfigure
-	thing a more generic func.
-
-	* message-list.c (ml_value_to_string): Cleanup the logic to use
-	lookup tables.
-	(sort_uid_to_rows): Removed due to rewrite below.
-	(build_flat_diff): Changes for node/summary/etc changes.  Also do
-	changed nodes too.
-	(clear_tree): Free the info reference for nodes in our hashtable.
-	(build_subtree): Ref the info reference in our hash/tree node.
-	(on_click): Dont free message info, since we just got our ref to
-	it.
-	(remove_node_diff): Free messageinfo off node.
-	(build_flat): Ref messageinfo.
-	(message_list_set_folder): Allow a NULL folder to be set -
-	i.e. clear the view.
-	(message_list_set_folder): Emit a no message sleeted signal.
-	(build_tree): Change cursor keeping stuff to work with new info.
-	
-	Turned off BROKEN_ETREE - well maybe it'll work.  Check for
-	duplicate messages displayed, etc.
-
-2001-03-16  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.h: Added uid_nodemap; mapping of uid's to e-tree
-	nodes.
-
-	* message-list.c (build_flat): Changed to take a summary argument,
-	and to store node in node map, etc, and store info's in e-tree.
-	(build_subtree): Changed to store node in node map, and to store
-	info's in tree directly.
-	(ml_tree_value_at): Changed to get info directly from tree node,
-	removed allocated return value logic.
-	(ml_tree_value_at): Removed all "fake node" handling, no fake
-	nodes should ever exist.
-	(id_is_uid, id_is_subject, id_uid, id_subject): Removed macro's no
-	longer used.
-	(new_id_from_uid, new_id_from_subject): Removed no longer used.
-	(get_message_uid):
-	(get_message_info): Treat tree node data as messageinfo.
-	(message_list_select): Dont free the messageinfo, as its part of
-	our data, not retrieved from folder.
-	(message_list_drag_data_get): ditto.
-	(subtree_unread): Treat tree node data as messageinfo.
-	(subtree_size): ditto.
-	(subtree_earliest): ditto.
-	(clear_tree): Reset uid_nodemap on clear.
-	(save_node_state): tree nodes == messageinfo's.
-	(add_node_diff): ditto.
-	(remove_node_diff): ditto.
-	(main_folder_changed): use uid_nodemap to lookup changed nodes.
-	(main_message_changed): ditto.
-
-2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.c (pgp_mime_part_sign_prepare_part): New function to
-	prepare the mime part and any subparts for pgp signing.
-	(pgp_mime_part_sign_restore_part): New convenience function to
-	undo the prepare_part.
-	(pgp_mime_part_sign): Don't assume the part passed in is a leaf
-	part, we could very easily get a multipart (and in fact were which
-	is why people have been having unexpected results when signing
-	messages with attachments) and set the encoding as if it were a
-	leaf part. Use our 2 new convenience functions to set the
-	encoding(s) instead.
-
-2001-03-15  Miguel de Icaza  <miguel@ximian.com>
-
-	* folder-browser-factory.c (folder_browser_setup_view_menus): Fix
-	memory leak.
-
-2001-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (apply_changes): We don't care about SSL,
-	yea baby...
-	(apply_changes): Don't care about SSL, no baby...
-	(construct): Yea, I said we don't care 'bout SSL, baby
-	(construct): That's exactly what I said, uh huh...
-	(transport_auth_type_changed): Set the sensitivity of the
-	user/passwd entries.
-	(transport_type_changed): If the hostname hasn't been set yet,
-	just use "localhost" as it doesn't really matter, since all we
-	need is a valid URL object.
-
-	* mail-config.c: We no longer need `use_ssl' for sources and
-	transports.
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (mail_display_redisplay): Remove a stray
-	camel_object_ref that was causing messages to never be finalized
-	if they got redisplayed (because of attachments, delayed-loading
-	IMAP parts, etc)
-
-2001-03-15  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c: Added edit item to search-bar menu.
-
-	* mail-callbacks.c (filter_edit): Changed for filter_editor_new()
-	api addition/change.
-
-	* mail-vfolder.c (vfolder_edit): Use vfolder_editor_new intead.
-
-2001-03-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* session.c (mail_session_init): Tell camel to init NSS.
-	(mail_session_accept_dialog): Doh! NULL terminate the list of
-	buttons and show the label.
-
-	* mail-mt.c (do_get_accept): Same.
-
-2001-03-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/Makefile.am (INCLUDES): Add `-I$(top_builddir)/shell'
-	and `-I$(top_srcdir)'.
-
-2001-03-13  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (on_url_requested): Call gtk_html_end() on the
-	stream so things happen. Fixes a problem with some inline images
-	(just very small ones maybe?)
-
-	* importers/.cvsignore: create
-
-2001-03-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* session.c (mail_session_init): Call camel_init with the
-	evolution directory passed in. Also, abort if camel cannot be
-	initialized.
-
-	* main.c (main): Shutdown camel.
-
-2001-03-04  Michael Meeks  <michael@ximian.com>
-
-	* folder-browser-factory.c (free_pixmaps): impl.
-	(update_pixmaps): accelerate with cache.
-
-2001-03-13  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Removed the importers and created a subdirectory
-	for them to live happily as plugins.
-
-	* mail-importer.c (mail_importer_create_folder): Modified the
-	function to take a BonoboListener for the callback.
-	(get_importer_list): Get a list of importer plugins.
-	(free_importer_list): Free the list of plugins.
-	(mail_importer_init): Initalise the list of plugins.
-	(main_importer_uninit): Unload the modules.
-
-	* GNOME_Evolution_Mail.oaf.in: Remove the oaf_server entries for
-	the importers.
-
-	* importers/*: Copy the importers in here.
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_write): Make the transport save
-	whether or not it's supposed to use SSL as well.
-	(config_read): Read in whether or not we should remember the
-	transport password (for those that support SASL).
-	(mail_config_write): Save whether or not to save transport
-	passwords (needed for SASL enabled transports).
-
-	* mail-ops.c (add_vtrash_info): Instead of always creating a new
-	vTrash folder, if the store already has a Trash folder, replace it
-	with the vTrash. Also, name the folder "Trash" instead of "vTrash"
-	and i18nify the name.
-
-2001-03-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.h: Added protection.
-
-	* folder-browser-factory.c: Add ActionsEmptyTrash. By the way -
-	should we rename the bonobo verbs now that our menu structure has
-	changed?
-
-	* mail-callbacks.c (empty_trash): New callback to empty ALL of the
-	trash folders.
-
-2001-03-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (send_queue_send): Remove our X-Evolution header
-	before we send. Also don't send messages that are marked for
-	deletion.
-
-2001-03-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-mt.c (mail_get_accept): New async function that will be
-	used for SSL certs later.
-
-	* session.c (auth_callback): Changed to return a gpointer value.
-	(mail_session_accept_dialog): New function to handle the new
-	_ACCEPT authenticator mode.
-
-2001-03-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-factory.c: Set the Forward->Quoted callback.
-	Also set the forward->Attachment callback.
-
-	* mail-view.c (view_forward_msg): Specify FORWARD_ATTACHED.
-
-	* mail-callbacks.c (forward_attached): Don't call
-	forward_messages() anymore...never really needed to. Just handle
-	it directly.
-	(forward_inlined): Specify FORWARD_INLINE as the flag argument.
-	(forward_quoted): New function sorta like forward_inlined except
-	this forwards the message quoted.
-
-	* mail-tools.c (mail_tool_forward_message): New function to
-	prepare a message to be forwarded.
-
-2001-03-08  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-format.c (write_field_row_begin): Added.  Table row HTML
-	broken out into its own function.
-	(write_subject): Added.  Emits the proper HTML for the subject
-	line.
-	(write_field_to_stream): #ifdef-ed out of existence.
-	(write_address): Take a CamelInternetAddress and spit out an
-	<object> tag with the appropriate <param>s.
-
-	* mail-display.c (on_object_requested): Check for an "address"
-	object.  If found, call...
-	(handle_embedded_address_object): ...this function, which creates
-	an AddressWidget bonobo control and passes in the necessary info.
-	I never really realized just quite how much GtkHTML kicks ass
-	until I figured out how to make this work.
-
-2001-03-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vtrash.[c,h]: Removed from cvs
-
-	* Makefile.am: Removed mail-vtrash.[c,h]
-	
-	* main.c: Don't #include "mail-vtrash" anymore.
-
-	* component-factory.c: Add "vtrash" as a folder type we support.
-	(create_view): Kludgy-kludge around the vtrash type.
-	(owner_set_cb): Don't create the vTrash folder here anymore...	
-
-	* folder-browser.c (on_double_click): Call open_msg here so that
-	it does the Right Thing (tm).
-
-2001-03-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-local.c (mail_local_store_class_init): Override the default
-	init_trash() with the our custom one (since MailLocalStore doesn't
-	let the CamelStore keep a hash of opened folders and instead
-	keepts track of them itself).
-	(init_trash): custom implementation of the init_trash method for
-	MailLocalStores
-	(get_folder): i18nize.
-	(register_folder_registered): Don't add the folder to the vtrash
-	here.
-
-2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* component-factory.c (component_fn): Specify a NULL
-	`EvolutionShellComponentGetDndSelectionFn'.
-
-2001-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-autofilter.c (filter_rule_from_message): Add an action-part
-	widget.
-	(filter_rule_from_mlist): Same here. This should get rid of the
-	problem where people go to create a rule based on a message and
-	forget to fill-in the action part.
-
-2001-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.c (mail_crypto_is_smime_v3_signed): New function to
-	decide if a mime part is an S/MIME v3 signed part.
-	(mail_crypto_is_pkcs7_mime): New function to decide if a mime part
-	is an application/pkcs7-mime part (or an application/octet-stream
-	part with application/pkcs7-mime data).
-
-	* mail-account-editor.c (source_auth_init): Move the signal
-	emittion to after the set_menu call so that it actually works.
-	(transport_type_changed): Updated to manipulate the user/passwd
-	fields for the transport.
-	(construct): Updated to init the user/passwd fields for the
-	transport.
-	(transport_auth_init): Renamed. Also fill in the user/passwd
-	fields if available.
-
-2001-03-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (construct): Disable the NNTP code if NNTP is
-	not enabled. This prevents some runtime warnings...
-
-	* mail-config-druid.c: Updated to have a transport auth page.
-
-2001-03-01  Miguel de Icaza  <miguel@ximian.com>
-
-	* folder-browser.c (on_right_click):  Move the context menus to
-	the toplevel code;  Use enumerations for the various bitfield
-	constants. 
-
-	Add support for hiding items that are not required (read/unread
-	and delete/undelete). 
-
-	This requires my previous patch, as it assumes "Open" does the
-	right thing instead of having two operations: Open and Edit. 
-	
-2001-02-28  Miguel de Icaza  <miguel@ximian.com>
-
-	* folder-browser.c (on_right_click): Removed draft folders op
-	here, since open_msg now does the right thing (edit or view).
-
-	* folder-browser-factory.c (update_pixmaps): Removed MessageEdit
-	from here.
-
-	* mail-callbacks.c (open_msg): New function, does the "right
-	thing" to a message (either, edit or open).
-
-	* folder-browser-factory.c: Register new command here.
-	(update_pixmaps): Rename keys that have been shuffled around.
-	(update_pixmaps): Rename to match new updates on xml file.
-
-	Rename MessageOpenNewWindow to MessageOpen.  Change action from
-	"view_message" to "open_message".
-
-	* mail-callbacks.c (mark_all_as_seen): New command.  Marks all
-	messages as seen.
-
-2001-03-06  Dan Winship  <danw@ximian.com>
-
-	* mail-ops.c (get_folderinfo_got): If the folderinfo has no URL
-	(ie, can't contain messages), don't add it as a vtrash source.
-
-2001-03-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c: Don't access the `active` data member of a
-	GtkToggleButton directly - bad programming, shame on me.
-
-	* mail-account-editor.c: Same here.
-
-	* mail-accounts.c: And here too.
-
-	* mail-callbacks.c (empty_subject_destroyed): And finally here.
-
-	* mail-crypto.c (pgp_mime_part_sign): Correcty set the mime type
-	for the multipart. Hmmm, still doesn't wrap correctly. NotZed?
-	Ideas?
-	(pgp_mime_part_encrypt): Here too.
-
-2001-03-03  Not Zed  <NotZed@Ximian.com>
-
-	* mail-tools.c: Remove very old camel lock stuff.
-
-	* mail-local.c (register_folder_registered): Add the local folder
-	as a potential vfolder source.
-
-	* folder-browser.c (got_folder): When we have a new folder,
-	register it as a potential vfolder source.
-
-	* mail-vfolder.c: Added the source rule to the vfolder_info.
-	(vfolder_refresh): Store the rule in the vfolder info, etc.
-	(vfolder_register_source): Function to register a newly opened
-	folder with us.
-	(vfolder_uri_to_folder): Save the folder in the vfolder_info too.
-	(source_finalise): Handle clenaup when the folder dies.
-
-2001-03-02  Not Zed  <NotZed@Ximian.com>
-
-	* mail-mt.c (set_stop): Check the container is not NIL before
-	trying to set thje prop.
-
-2001-03-01  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_search_menu_activated): Fixes
-	for changes to search bar.
-	(search_save): Removed.
-	(search_full): Removed.
-	(search_full_clicked): Removed.
-	(folder_browser_search_option_items[]): Removed.
-	(folder_browser_search_query_changed): Changed for search bar
-	changes.
-	(folder_browser_clear_search): Removed.
-
-	* mail-vfolder.c (vfolder_clone_rule): New function to clone a
-	filter/search rule into a matching vfolder rule.
-
-	* mail-send-recv.c (mail_receive_uri): Setup a timeout for status
-	updates.
-	(build_dialogue): Setup timeout id for status updates.
-	(operation_status_timeout): New function to set the status via a
-	timeout.
-	(receive_done): Remove the timeout handler if we need to.
-	(operation_status): 
-	(receive_status): Just update the info, and let the timeout
-	handler update the gui.
-	(do_free_status): 
-	(do_show_status): Removed gui thread status message processing.
-
-2001-02-28  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_config_search): New function to
-	configure the FilterRule for the search mechanism.
-
-2001-02-27  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_gui_init): Setup the search bar
-	as a filterbar.
-	(got_folder): Set the whole search bar sensitive or not based on
-	the search capability of the folder.
-
-	* folder-browser.h: Changed to use efilterbar instead of esearchbar.
-
-2001-02-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (configure_mail): Return TRUE if the user
-	configured his/her settings, else return FALSE.
-	(check_send_configuration): If configure_mail() returns TRUE, then
-	continue otherwise quit.
-	(send_receive_mail): Same.
-
-2001-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Set a "References"
-	header no matter what if we are able to get a Message-Id. Fixes
-	bug #1583.
-
-	* mail-accounts.c (mail_delete): Confirm that the user REALLY
-	wants to delete this account.
-	(news_delete): Same.
-
-	* mail-ops.c (mail_send_message): Changed the product string -
-	will change it to use User-Agent once I get the RFC/DRUMS draft or
-	whatever. Until then I'll stick with X-Mailer.
-
-2001-02-26  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (delete_msg): Mark deleted messages as "seen"
-	as well so they don't count towards the unread count.
-
-	* mail-view.c (view_delete_msg): ditto
-
-2001-02-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (owner_set_cb): Re-add the
-	mail_vtrash_create() hack back in for LocalStores since there's no
-	better way to register a vTrash folder on the Local Storage yet.
-
-	* mail-local.c (register_folder_registered): Add folders to the
-	vTrash folder here since the LocalStore does not let the parent
-	CamelStore class keep it's own hash of the folders.
-
-2001-02-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* session.c (mail_session_forget_password): New function to force
-	the removal of a given password.
-
-	* openpgp-utils.c (openpgp_decrypt): On failure, forget the
-	passphrase.
-	(openpgp_encrypt): Here too. (cleaned this up a bit too)
-	(openpgp_clearsign): And here.
-	(openpgp_sign): Again...
-
-	* mail-callbacks.c (composer_postpone_cb): Abort if the message is
-	NULL (which is valid if an error occured).
-	(composer_send_cb): Same.
-
-2001-02-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c: Toss the mail_tool_camel_lock* stuff.
-	* mail-ops.c: Same.
-	* mail-summary.c: Here too.
-	
-	* mail-tools.c (mail_tool_uri_to_folder_noex): Blown away!
-	(mail_tool_filter_get_folder_func): *kapoosh*
-	(mail_tool_camel_lock_up): Same.
-	(mail_tool_camel_lock_down): Same.
-	(mail_tool_set_uid_flags): Don't need this rubbish anymore either.
-
-2001-02-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (mail_load_storages): No longer need to
-	construct the vTrash here.
-	(owner_set_cb): Don't make the vTrash for the local store here.
-
-	* mail-ops.c (add_vtrash_info): New function to add a vTrash
-	folder info to a pre-constructed CamelFolderInfo for use in the
-	get_folder_info async function.
-
-2001-02-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* main.c (main): No longer need to do a vtrash_cleanup() (it also
-	doesn't exist anymore).
-
-	* component-factory.c (mail_load_storages): Updated to use the new
-	vtrash code.
-	(owner_set_cb): Same.
-
-	* mail-tools.c (mail_tool_uri_to_folder): Update to handle the
-	"vtrash:" url prefix so that we can extract the REAL uri and know
-	to get the trash folder.
-
-	* mail-vtrash.c (mail_vtrash_add): Add the vTrash folder to the
-	EvolutionStorage.
-	(mail_vtrash_create): Get the store based on the uri (async) and
-	then call mail_trash_add.
-	(vtrash_cleanup): Removed.
-	(vtrash_uri_to_folder): Removed.
-	(vtrash_create): Replaced by mail_vtrash_create()
-
-2001-02-23  Iain Holmes  <iain@ximian.com>
-
-	* component-factory.c (owner_set_cb): Init the importer here.
-
-	* mail-importer.[ch] (mail_importer_create_folder): Add a function
-	that creates new folders in the shell.
-	(mail_importer_init): Take in an EvolutionShellClient, and get the
-	local_storage corba_object from it.
-
-2001-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vtrash.c (create_trash_vfolder): Come up with a unique
-	store uri for each vtrash (using %p and the CamelStore we're gonna
-	place it on).
-	(get_trash_get): Pass in the store so we can use it for %p.
-
-2001-02-23  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vfolder.c (vfolder_gui_add_from_mlist): Rule to add mlist
-	vfolder.
-
-	* mail-autofilter.c (filter_gui_add_for_mailing_list): Removed.
-	(rule_from_mlist): Build a generic match rule from an mlist.
-	(vfolder_rule_from_mlist): Setup the vfolder rule for an mlist.
-	(filter_rule_from_mlist): Setup a filter rule fro an mlist.
-	(filter_gui_add_from_mlist): GUI thingy to do the work.
-
-	* folder-browser.c (on_right_click): Added vfolder on mailing list
-	to filter menu.
-	(on_right_click): Use header_raw_check_mailign_list instead of
-	mlist magic to get the mailing list name.
-	(filter_mlist): Changed to use new add_from_mlist() call.
-	(vfolder_mlist): New function for vfolder from mlist.
-
-	* mail-send-recv.c (build_dialogue): Only allow downloading if the
-	source is enabled at this time.
-	(mail_autoreceive_setup): Check for enabled sources before setting
-	up autodownload.
-
-2001-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (construct): Construct the PGP Path
-	GnomeFileEntry widget.
-	(pgp_path_changed): Try to auto-detect which PGP type the binary
-	file is based on the basename (yuck).
-
-2001-02-23  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (create_folder_get): Make op cancellable/report
-	internals.
-	(get_folder_get): 
-	(sync_folder_sync): 
-	(get_folderinfo_get): Make op cancellable/report internals.
-
-	* mail-vtrash.c (get_trash_get): Setup the operation registration,
-	and create a pseudo "start/stop" operation.
-	(get_trash_free): Free store if we have it.
-	(get_trash_got): Move vtrash add into here, so we execute in the
-	right thread.
-
-	* component-factory.c (owner_set_cb): Make trash creation async.
-
-	* mail-local.c (register_folder_desc): A description of what we're
-	doing.
-
-	* mail-mt.c (mail_msg_new): Set status callback to operation_new.
-	(mail_operation_status): Operation status function, proxy messages
-	to main thread, and attempt to present a meaningful ui experience
-	for operations.
-
-2001-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* openpgp-utils.c (openpgp_verify): Fixed memory corruption bug.
-
-	* mail-format.c (try_inline_pgp_sig): Check to make sure the
-	validity isn't NULL.
-	(handle_multipart_signed): Check for NULL validities.
-
-2001-02-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-tools.c (mail_tool_uri_to_folder): Protect against NULL
-	uri's.
-
-	* mail-vtrash.c: Do mutex locking on the global hash table - this
-	should clear up some segfaults ;-)
-
-	* mail-config-druid.c (druid_finish): Set the 'enabled' member of
-	the source to TRUE if the URL exists else set to FALSE.
-	(incoming_type_changed): If the provider chosen is "None" then
-	gray-out the auto-check widgets and the check-settings, otherwise
-	sensitize them.
-
-	* mail-account-editor.c (construct): Added a few more settings.
-	(apply_changes): Save the new settings.
-
-	* mail-config.c (service_copy): Updated.
-	(config_read): Read in whether or not the account is enabled.
-	(mail_config_write): Save if the account is enabled or not.
-
-2001-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_send_message): Updated to reflect changes to
-	the filter-driver code.
-
-2001-02-22  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (CAMEL_OBJS_EXTRA): Removed, no longer link with
-	libcamelvee.
-	(evolution_mail_LDADD): Ditto.
-
-	* mail-vtrash.c: Moved camel-vee-store header ot camel levle.
-
-	* mail-tools.c: Moved camel-vee-folder header to camel.
-
-	* mail-local.c (local_storage_new_folder_cb): started hack for
-	progress reporting, which is currently to the console.
-
-	* mail-mt.c (set_stop): Set the stop button sensitivity.
-	(mail_msg_received): enable/disable stop button while we're
-	processing stuff in another thread.
-
-	* message-list.c (ml_tree_value_at): If our uid entry vanishes
-	before w'ere ready, then make a fake.
-
-2001-02-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.c (pgp_mime_part_verify): Changed to use
-	PgpValidity.
-
-	* openpgp-utils.c (openpgp_verify): Return a PgpValidity and set
-	the description as UTF-8 for later use in mail-format.c when
-	writing to GtkHTML.
-
-	* mail-format.c (try_inline_pgp_sig): Updated to use the new
-	PgpValidity code.
-	(handle_multipart_signed): Updated.
-
-2001-02-21  Not Zed  <NotZed@Ximian.com>
-
-	* mail-callbacks.c (composer_postpone_cb): Fix for api changes to
-	append_mail.
-
-	* Makefile.am (evolution_mail_SOURCES): Removed mail-threads.[ch].
-
-	* mail-threads.[ch]: Removed.
-
-	* subscribe-dialog.c (subscribe_do_get_store): Chagned to use new
-	thread stuff.  This is really getting boring.
-	(subscribe_do_subscribe_folder): Changed to use new thread stuff.
-	Last one at last, phew.
-
-	* session.c (register_callback): Changed to use new thread stuff.
-	YUCK.  I dropped some functionality, now the timeout callback
-	return is ignored, so basically it keeps running till finished.
-
-	* mail-ops.c (mail_operation_run): Removed, no longer used/needed.
-	(mail_do_append_mail): Changed to use new thread stuff.
-	(mail_do_transfer_messages): ditto.
-
-	* mail-local.c (local_storage_new_folder_cb): Use new thread
-	stuff, also only run synchronous for this operation.
-	(mail_local_reconfigure_folder): 
-	(reconfigure_clicked): Changed to use new mail thread stuff.
-
-	* mail-config.c (mail_config_check_service): Changed to use new
-	thread stuff.
-
-2001-02-20  Dan Winship  <danw@ximian.com>
-
-	* mail-vtrash.c (get_trash_get): Pass NULL, not "/" for @top.
-
-	* mail-callbacks.c (create_folders): Make this work with
-	CamelStores where the separator character isn't /. folder_created
-	and folder_deleted are still broken.
-
-2001-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vtrash.c: Include the camel-vee-store.h header from the
-	uninstalled copy.
-
-2001-02-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (mail_load_storages): Create vTrash folders
-	for all remote stores as well.
-
-2001-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vtrash.c (create_trash_vfolder): Add the auto-update flag
-	to the folder open flags.
-
-2001-02-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vfolder.c (mail_vfolder_get_vfolder_storage): New handy
-	dandy function to ref and return the vfolder storage (will
-	probably be disavowed once I figure out how to get the vTrash
-	folder to show up in the EvolutionLocalStorage).
-
-	* main.c (main): Call vtrash_cleanup().
-
-	* mail-vtrash.c: New file.
-	(vtrash_uri_to_folder): vtrash: URI handler
-	(vtrash_create): Replacement async vtrash function for the old one
-	in mail-ops.c
-	(vtrash_cleanup): Cleanup code - unrefs the cached vtrash folders
-	and free's the hashtable.
-
-	* Makefile.am: Added mail-vtrash.[c,h].
-
-	* mail-tools.c (mail_tool_uri_to_folder): If we have a vtrash:
-	URI, call the vtrash URI handler function rather than continuing
-	on. Yes, I know this is a hack and it needs to be fixed.
-
-	* mail-ops.c (mail_do_setup_trash): Removed.
-	(mail_trash_get): Removed.
-
-	* component-factory.c (owner_set_cb): Create the vTrash folder for
-	the LocalStore here.
-
-	* mail-local.c (get_folder_info): Implement.
-
-2001-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (fetch_mail_fetch): Unref the driver here, in the
-	subthread, so we dont block the gui while it sync's all the
-	folders.
-	(fetch_mail_fetched): Rewmoved above code from here.
-
-2001-02-16  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (receive_status): Dont do the thaw/freeze set here.
-	(update_folders): "
-
-	* mail-vfolder.c (vfolder_refresh): Setup the virtual
-	'unmatched' folder by default.
-	(vfolder_uri_to_folder): HAndle UNMATCHED folder specially, it has
-	no explicit sources.
-
-2001-02-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-send-recv.c (receive_get_folder): Not sure it makes any
-	difference, but lets ref the folder while the hash table is locked
-	rather than after we unlock it.
-
-2001-02-16  Jeffrey Stedfast  <fejj@ximian.com>
-	
-	* main.c: * component-factory.c: Reverse the changes I made
-	yesterday.
-
-2001-02-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* main.c (main): Have the mail-config and openpgp initialize here
-	instead.
-
-	* component-factory.c (owner_set_cb): No need to have mail-config
-	and openpgp init here.
-
-2001-02-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (do_scan_subfolders): Use mail_storage_create_folder
-
-	* mail-callbacks.c (mail_storage_create_folder): Convenience
-	function so we can keep all the evolution_storage_add_new_folder()
-	code in one place as much as possible.
-
-	* subscribe-dialog.c (recursive_add_folder): Use 'name' rather
-	than the no-description bs since that's what all the other places
-	do.
-
-	* mail-callbacks.c (folder_created): New callback to handle the
-	"folder_created" signal - handles CamelFolderInfo's recursively.
-	(folder_deleted): Same but for "folder_deleted".
-
-	* component-factory.c (storage_create_folder): Instead of doing
-	the evolution_storage_new_folder() stuff by hand, pass it off to
-	the new callback: folder_created(). At some point this will be
-	unecessary as we'll attach this callback to the "folder_created"
-	signal.
-
-2001-02-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c: Wrapped the address compare functions in a
-	#ifdef
-	(address_compare): #ifdef the use of the smart address sorting
-	code and provide a #else for using g_strcasecmp().
-
-2001-02-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* openpgp-utils.c (openpgp_verify): Add the --no-tty flag.
-
-2001-02-14  Dan Winship  <danw@ximian.com>
-
-	* mail-mlist-magic.c: Rewrite explanatory comments to use normal
-	regexps rather than procmail weirdness. 
-	(check_sender): match "foo-owner" as well as "owner-foo".
-	(check_list_post): (New) Check for "List-Post: <mailto:..."
-	(mail_mlist_magic_detect_list): Iterate through an array of
-	function pointers rather than calling each checker explicitly.
-
-	* component-factory.c (add_storage): Connect to the
-	"create_folder" signal on the storage.
-	(storage_create_folder): Do folder creation.
-
-2001-02-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (owner_set_cb): Setup the Trash folder.
-
-	* mail-ops.c (create_trash_vfolder): Do better error handling.
-	(populate_folder_urls): Oops, helps to strdup the url into the
-	array if we plan on freeing the data.
-	(mail_get_trash): New async function that may eventually replace
-	mail_do_setup_trash().
-	(do_setup_trash): Do better error handling.
-
-	* mail-local.c (mail_local_store_class_init): Override
-	get_folder_info.
-	(get_folder_info): Implement.
-
-2001-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* mail-local.c (do_reconfigure_folder): Fix some uninitialized
-	variables.
-
-2001-02-12  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (build_tree): if doing a full update, save the
-	cursor pos and restore it afterwards.
-	(on_cursor_activated_cmd): Copy the current_uid to a new string.
-	I dont know why this is required, but it is.
-	(message_list_destroy): Free the cursor_uid as we're done with it.
-	(build_flat): IF the current uid disappeared from the list, then
-	unset the message.
-	(build_tree): Likewise.
-
-2001-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_write): Clean out the cruft in the
-	Accounts section before writing the current accounts out to the
-	config file.
-
-	* mail-account-editor.c (construct): Strip the leading "/" from
-	the Namespace/Path entry if the provider doesn't require absolute
-	pathnames.
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* Makefile.am: xml-i18n-tools setup.
-	* GNOME_Evolution_Mail.oaf.in: Mark strings for translation.
-	
-2001-02-11  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.[ch]: Re-add non-static forward_messages.
-	mail-view.c needs it.
-
-2001-02-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (forward_inlined): Don't leak memory.
-	(forward_messages): change doinline to be a gboolean argument.
-
-2001-02-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (list_add_addresses): Check the full list of
-	IDs instead of just the default id and if we find an address
-	matching one of the user's ids, then save it.
-	(mail_generate_reply): Try to guess which account to use based
-	upon the list of To and Cc addresses and pass that as the 'From'
-	address to e_msg_composer_set_headers().
-	(forward_get_composer): Updated to reflect changes to
-	e-msg-composer.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt> 
-
-	* mail-config.glade.h: removed, xml-i18n-extract's the strings itself.
-	* *.glade: do not output_translatable_strings 
-	* Makefile.am: removed *.glade.h from EXTRA_DIST. 
-
-2001-02-09  Dan Winship  <danw@ximian.com>
-
-	* mail-local.c: Updates for CamelStore changes, small memory leak
-	fixes.
-	(lookup_folder): Removed (and moved into the reconfigure code)
-	since this method no longer exists in CamelStore.
-	(do_reconfigure_folder, etc): Update the info in the
-	MailLocalStore after reconfiguring.
-	(mail_local_lookup_folder): Removed
-
-	* local-config.glade: fix padding of the label_format
-
-	* message-list.c (ml_tree_value_at): Don't keep message infos
-	reffed across calls, since this can cause badness after a
-	reconfigure. Instead, just strdup the needed values and free those
-	on the next call.
-
-	* mail-tools.c (mail_tool_get_root_of_store): Unused, remove.
-	(mail_tool_get_inbox): use camel_store_get_inbox.
-
-	* evolution-outlook-importer.c (load_file_fn): 
-	* evolution-mbox-importer.c (load_file_fn): Use
-	mail_tool_get_local_inbox() instead of mail_importer_get_folder()
-
-	* mail-importer.c (mail_importer_get_folder): Removed
-
-2001-02-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): New location for this
-	function.
-
-	* mail-format.c: Removed mail_generate_reply as it's ONLY ever
-	used in mail-callbacks.c.
-
-	* mail-ops.c (fetch_mail_fetch): Reworked some keep-mail-on-server
-	logic so that we ALWAYS look for a cached array of UIDs that we
-	may have downloaded previously so as not to download them again
-	even if we will be deleting them off the server. This fixes bug
-	#1344.
-
-2001-02-09  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (filter_folder_free): only free driver, if set.
-	(fetch_mail_fetched): Unref the driver here, so it can cleanup
-	before we call the 'done' callback.
-
-	* component-factory.c (owner_set_cb): Add setup for mail
-	autoreceive stuff.
-
-	* mail-send-recv.c (free_info_data): Free the send info's from teh
-	active hash, not the running list.
-	(receive_done): As we finish downloads, remove them and clean them
-	up, and also close the window.
-	(mail_autoreceive_setup): New function to setup & maintain
-	automatic download stuff.
-
-2001-02-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (construct): Set the sensitivity of the spin
-	button based on the state of the checkbox.
-
-	* mail-config.c (config_read): Properly do defaults here.
-	(mail_config_write): Removed some of the settings being saved
-	here.
-	(mail_config_write_on_exit): Save those settings here instead.
-
-2001-02-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (on_object_requested): Cast the CamelMedium to a
-	CamelMimePart before performing actions on it as if it were a
-	CamelMimePart.
-
-	* mail-config-druid.c (druid_finish): Save the auto-check settings.
-	(construct): Initialize auto-check widgets.
-	(mail_config_druid_get_auto_check): New function
-	(mail_config_druid_get_auto_check_minutes): New functions
-
-	* mail-config.c (config_read): Read in whether or not to check
-	every x minutes.
-	(mail_config_write): Save auto-check config data and SSL.
-
-2001-02-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-autofilter.c (rule_add_subject): Use "contains" because the
-	subject might be broken into subparts and using the "is" rule will
-	then fail ;-)
-
-2001-02-08  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (mail_send_receive):
-	(mail_receive_uri):  Init active_downloads hash if it hasn't been yet.
-
-2001-02-07  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (operation_status): Handle internal camel status return.
-	(receive_done): Remove active download when done.
-	(mail_receive_uri): Initiate download of a single source, with no gui.
-	(build_dialogue): Mark any new items as real active downloads.
-	(do_show_status): Make the progress bar optional.
-
-2001-02-06  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c: camel_cancel->camel_operation.
-
-	* mail-ops.old.c: camel_cancel->camel_operation.
-
-	* mail-ops.c: camel_cancel->camel_operation.
-
-	* mail-mt.c: camel_cancel->camel_operation. 
-
-	* mail-callbacks.c (stop_threads): camel_cancel->camel_operation.
-
-	* mail-mt.h: CamelCancel->CamelOperation.
-
-2001-02-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-mt.c (set_view_data): Check current_message for NULL - this
-	fixes a bug running under SunOS (not a major deal tho as it's in a
-	debug printf).
-
-2001-02-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_write_on_exit): Oops, save the
-	seen_timeout variable.
-
-2001-02-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (evolution_mail_LDADD): Added libmenus.la.
-
-	* folder-browser-factory.c (control_activate): Added GalView menus
-	here.
-
-	* message-list.c, message-list.h (message_list_get_layout): Made
-	message_list_get_layout export.
-
-2001-02-06  Iain Holmes  <iain@ximian.com>
-
-	* mail-display.c (pixbuf_gen_idle): Set the size of the icon to 24x24
-	always.
-	(button_press): Function to toggle the disposition of an attachment.
-	(on_object_requested): New way to indicate functions on attachments.
-	
-	* message-list.c (hide_load_state): Free the olduid.
-
-2001-02-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (set_defaults): Updated to checkfor
-	"(none)".
-
-	* mail-account-editor.c (entry_changed): Make sure the email
-	address is valid.
-
-	* mail-config-druid.c (identity_check): Check to make sure we have
-	a valid email address.
-	(is_email): New function to check a string to see if it's a valid
-	email address.
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mbox-importer.c: We are now going to use a file
-	descriptor and a CamelMimeParser rather than a FILE pointer.
-	(load_file_fn): Open the file descriptor and initialize the
-	CamelMimeParser.
-	(importer_destroy_cb): Unref the mime parser.
-	(support_format_fn): Use an fd and use a case-insensitive
-	comparison as well as elimate a buffer overrun.
-	(process_item_fn): Process 1 CamelMimeMessage per invocation so as
-	to not lock up Iain's GUI and to work similar to the way Iain
-	originally coded it.
-
-2001-02-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-mbox-importer.c, evolution-mbox-importer.h: Moved
-	bonobo includes from the .c to the .h.  Include
-	evolution-mbox-importer.h in evolution-mbox-importer.c.
-
-	* evolution-outlook-importer.c, evolution-outlook-importer.h:
-	Moved bonobo includes from the .c to the .h.  Include
-	evolution-outlook-importer.h in evolution-outlook-importer.c.
-
-	* mail-callbacks.c: Include mail-send-recv.h.
-
-	* mail-local.c (mail_local_lookup_folder): Cast local_store to
-	CAMEL_STORE.
-
-	* mail-mt.c (mail_msg_cleanup): Make this function static.
-
-	* mail-send-recv.c, mail-send-recv.h: Created mail_send_recv.h.
-	Included it in mail-send-recv.c.  Added a #include
-	<libgnomeui/gnome-window-icon.h>.
-	(mail_send_receive): Added a cast.
-
-	* mail-summary.c (new_folder_cb, removed_folder_cb,
-	create_summary_view): Cast the source func in calling g_idle_add.
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (try_inline_pgp_sig): New function to handle
-	inline pgp-signatures.
-
-	* mail-config-druid.c (construct): Keep track of the CheckSettings
-	check boxes.
-	(transport_next): Connect if the user says so.
-	(incoming_next): Same. Also, don't jump to the next page if
-	test-settings fails.
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (incoming_next): Updated to not connect when
-	getting a list of authtypes.
-	(transport_next): No longer connects - again, this is
-	useless. Read the apply_changes argument for the reason why.
-
-	* mail-account-editor.c (apply_changes): Updated. Set the
-	'connect' argument to FALSE for now, this basically means that the
-	call is worthless tho so it may be best to either get rid of the
-	checks altogether or else make it connect.
-	(source_auth_init): Don't connect here, it's just plain annoying.
-	(transport_construct_authmenu): Same here.
-
-	* mail-config.c (mail_config_check_service): Now takes a connect
-	argument.
-
-2001-02-03  Michael Meeks  <michael@helixcode.com>
-
-	* mail-local.c (load_metainfo): Fix dodgy libxml allocation
-	pollution, and potential faults on NULL attributes.
-
-2001-02-02  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (mail_send_receive): Cleaned up so we dont add
-	an unecessary level of indenting.
-
-	* message-list.c (ml_tree_value_at): For collapsed tree nodes,
-	scan the collapses nodes for the unread and status information.
-	Since we dont really have fake nodes anymore.
-
-2001-01-30  Ian Campbell  <ijc25@cam.ac.uk>
- 
- 	* message-list.c: Add support for new icons for being
- 	read/unread for fake root messages on threads.
- 
-2001-01-30  Iain Holmes  <iain@ximian.com>
-
-	* mail-send-recv.c (mail_send_receive): Only allow one send and
-	receive to be running at once.
-	(build_dialogue): Set the icon for the window.
-
-	* evolution-mbox-importer.c (support_format_fn): Only compare the first
-	5 bytes of the signature.
-
-2001-01-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* folder-browser.c: Fix typo.
-	
-2001-01-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-importer.c (mail_importer_add_line): Cast the
-	camel_stream_mem_new() to a CamelStreamMem.
-
-2001-01-29  JP Rosevear  <jpr@ximian.com>
-
-	* main.c: Return efence ifdefs to 0 for solaris build
-
-2001-01-29  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (tree_equal): Debug function to compare the tree
-	we think we have, after an incremental update.
-	(build_tree): Check the tree after we've built it.
-	(build_tree): Oops, turn on BROKEN_ETREE again.
-
-	* mail-mt.c (mail_get_password): If we are being called from the
-	main gui thread, then just call the dialogue directly.  Ideally we
-	dont want this anyway but lets handle the case nicely.
-	(mail_get_password): Try locking around the password request, to
-	single-queue any password requests.
-	(mail_msg_init): Push an exit handler to clean it up on completion.
-
-	* mail-send-recv.c (receive_update_got_store): New function called
-	when the store has been retrieved asynchronously.
-	(mail_send_receive): Get the store asynchronously.  This was
-	causing problems where the password dialogue would try and be
-	called from the main thread via a message.
-
-	* mail-ops.c (mail_get_store): New function to get a store
-	(a)synchronously.  More or less taken from subscribe-dialog, which
-	i will remove later.
-	(mail_scan_subfolders): Try running the scan subfolder thing
-	asynchronously, to help startup time.  Not sure if this will work,
-	but presumably the shell can handle the folders appearing later
-	ok.
-
-2001-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (set_defaults): Turns out that I was wrong
-	about the g_get_real_name mem leak, god damn glib for not
-	following the const char* standard.
-
-2001-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (management_prepare): Use UTF-8.
-	(set_defaults): Use UTF-8 and also fixed a memory leak by freeing
-	the string returned by g_get_real_name().
-	(mail_config_druid_get_account_name): Use UTF-8.
-	(mail_config_druid_get_full_name): Same.
-	(mail_config_druid_get_email_address): Same.
-	(mail_config_druid_get_organization): Same.
-
-	* mail-account-editor.c (apply_changes): Save UTF-8 strings rather
-	than gtk strings.
-	(construct): Use the UTF-8 convenience functions to set the gtk
-	entries for the ID fields.
-
-2001-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-vfolder.c (vfolder_gui_add_rule): Make the OK button the
-	default one.
-
-	* mail-search-dialogue.c (mail_search_dialogue_init): Use stock
-	buttons for OK and Cancel.  Make the OK button the default one.
-
-2001-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-vfolder.c (vfolder_gui_add_rule): Set a default size for
-	the window so that more rules are visible.
-
-	* mail-search-dialogue.c (mail_search_dialogue_construct): Set a
-	default size for the window so that more rules are visible.
-
-2001-01-28  Not Zed  <NotZed@Ximian.com>
-
-	* mail-display.c (write_data_to_file): Changed to use
-	mail_save_part to save the data in another thread.
-	(save_data_cb): Hide the fileselector once we have a button press,
-	and are saving stuff.
-
-	* mail-ops.c (mail_save_part): New function to save a part content
-	asynchronously.
-
-2001-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser.c (etable_key): Don't handle home and end keys
-	since %ETable deals with them now.
-
-2001-01-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (address_compare): Protect against NULL address
-	pointers.
-	(subject_compare): Same but for subject pointers.
-
-2001-01-27  Iain Holmes  <iain@ximian.com>
-
-	* mail-summary.c (create_summary_view): Applied patch from John R Sheets
-	to fix some warnings.
-	(idle_check): Fixed the prototype to fix some warnngs as well.
-
-2001-01-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-display.c (get_embedded_for_component): Try a control
-	first, instead of an embeddable.
-
-2001-01-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* subscribe-dialog.c (populate_store_foreach): Check for a NULL
-	service->url as we obviously can't subscribe to folders on a
-	non-existant mail source :-)
-	(subscribe_do_get_store): Check for a NULL url here too, not that
-	we should need it anymore (due to the above fix) but it doesn't
-	hurt. Also, should we wait on the thread? Probably doesn't matter.
-
-2001-01-26  Iain Holmes  <iain@ximian.com>
-
-	* evolution-outlook-importer.c (load_file_fn): Replace fsetpos with
-	fseek and use a long instead of fpos_t.
-	(process_item_fn): Same.
-
-	* mail-importer.h: Add a frozen item to tell when the folder is frozen.
-
-	* evolution-mbox-importer.c (process_item_fn): Fix the blank message.
-	Set the frozen element.
-	(importer_destroy_cb): Thaw the folder if frozen.
-
-2001-01-26  Dan Winship  <danw@ximian.com>
-
-	* mail-identify.c (mail_identify_mime_part): Fix an uninitialized
-	variable use.
-
-2001-01-26  Jason Leach  <jasonleach@usa.net>
-
-	(Fixing an old FIXME)
-	
-	* component-factory.c (create_vfolder_storage): removing
-	create_vfolder_storage, replacing call to it with
-	vfolder_create_storage.
-
-2001-01-26  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (build_tree): Define BROKEN_ETREE again, till we
-	get this stuff fixed better.
-
-2001-01-25  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c: Moved teh "sender contains" item to the end of
-	the list, so the gui doesn't suddenly change on everyone.  Fixed
-	the sender-contains search string to be a valid s-exp (ha, didn't
-	test it even once eh ettore?!)
-	(search_save): Dont have the sender contains as the default case
-	(which well, never gets called anyway), oops i guess i should've
-	reviewed the patch a little more.
-
-2001-01-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser.c: Add a missing parenthesis to the "from
-	contains" rule.  Also make it the last item instead of the first
-	one.
-
-2001-01-25  Iain Holmes  <iain@ximian.com>
-
-	* component-factory.c (component_factory_init): Init the mail
-	mail importers.
-
-	* mail-local.[ch] (mail_local_lookup_folder): retrieve the local
-	folder given by the name.
-
-	* mail-importer.[ch]: Basic functions for all importers to use.
-
-	* evolution-mbox-importer.[ch]: Mbox importer.
-
-2001-01-25  Jeffrey Stedfast  <fejj@ximian.com>
-	The following fixes seem to clear up the problem of new mail not
-	being shown in the Inbox and/or other folders where mail had been
-	delivered.
-
-	* mail-send-recv.c (build_dialogue): Freeze the inbox.
-	(receive_get_folder): Freeze folders before dumping them into the
-	hash table.
-	(free_folder_info): Thaw the folder.
-	(free_info_data): Thaw the Inbox.
-
-2001-01-25  Jason Leach  <jasonleach@usa.net>
-
-	(Don't prompt about unsaved changes for replies/forwards that have
-	 not actually been modified)
-	
-	* mail-callbacks.c (do_forward_inline): Unset the has_changed for
-	the message composer.
-	(do_forward_attach): Same here.
-	(mail_reply): And here.
-
-2001-01-25  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (mail_content_loaded): Check if a message part's
-	content is available, and if it's not, queue a thread that will
-	load it and then queue an idle-handler redisplay of the message.
-	(call_handler_function): Call mail_content_loaded() on the part
-	and don't try to display it if it's currently offline.
-	(get_data_wrapper_text): Simplify a bit
-
-	* mail-display.c (mail_display_queue_redisplay): rename and make
-	non-static.
-	(mail_display_redisplay): Use a "new and improved" way of
-	preserving the GtkHTML scroll location. ("new and improved" is
-	code for "gross and hackish", but there should be a real interface
-	for this eventually.)
-	(on_url_requested): Use mail_content_loaded() and don't write out
-	offline cid: URLs
-
-	* mail-identify.c (mail_identify_mime_part): Use
-	mail_content_loaded and don't try to identify the data if it's
-	offline.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Made the message list pay attention to the
-	"cursor_activated" signal instead of the "cursor_change" signal.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser-factory.c (update_pixmaps): Set the print icon
-	for various other items.
-	(set_pixmap): Be a bit more verbose in the warning message if the
-	icon isn't found [i.e. report the name of the file too].
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser-factory.c (update_pixmaps): Set the pixmaps for
-	the "/menu/Folder/FolderConfig" and "/menu/Settings/SetMailConfig"
-	items.
-	(set_pixmap): Don't prepend the "buttons" prefix.
-	(update_pixmaps): Update accordingly.
-
-2001-01-24  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (search_string[]): Fix the subject match
-	expression, which was missing a closing ).
-
-	* mail-send-recv.c (do_show_status): Escape any % signs in the
-	string before setting the format string.
-
-2001-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.glade: Added a 3rd page to the account editor to
-	allow users to set their HTML sending preference and also allow
-	them to change their message status timeout.
-
-	* mail-accounts.c (construct): Added handlers for the send-html
-	checkbox and for the mark-message-as timeout spinbutton.
-
-2001-01-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (apply_changes): Save the source and
-	transport changes whether the user can connect to the host or not.
-
-2001-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Applied patch from Tuomas Kuosmanen <tigert@ximian.com>]
-
-	* folder-browser.c: Added enum value `ESB_SENDER_CONTAINS' as well
-	as a "Sender contains" item to the search menu.  Also add a
-	corresponding "(match-all)" rule to the `search_string' array.
-	(search_save): Handle `ESB_SENDER_CONTAINS' here.
-
-2001-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Mail.oafinfo: Fixed the repo_ids so that they
-	use the right syntax.
-
-2001-01-23  Dan Winship  <danw@ximian.com>
-
-	* folder-browser-factory.c: 
-	* mail-callbacks.c (send_receive_mail): Fix spelling.
-
-2001-01-24  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (fetch_mail_fetch): Set the default folder when
-	copying to mbox.  This is a quick fix, i might need to do a slight
-	redesign to clean it up.
-
-2001-01-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-send-recv.c (build_dialogue): Make sure the source->url is
-	not NULL (which is perfectly valid).
-	(mail_send_receive): Where oh where should my prototype be?
-	(receive_get_folder): Make sure to ref the folder before you add
-	it to the hash table.
-
-	* openpgp-utils.c:
-	* mail-crypto.c: A few minor tweaks.
-
-2001-01-23  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (build_tree): Try turning off the BROKEN_ETREE
-	thing.  It seems to work ok (better?) now, but if its still broken
-	i'll remove it again for the next release.
-
-2001-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (set_defaults): Automagically fill in the
-	user's default transport if he/she has setup previous accounts.
-
-	* mail-format.c (handle_multipart_signed): Just wrote a temp way
-	of reporting success/fail of PGP/MIME signature verification
-	status.
-
-2001-01-22  Iain Holmes  <iain@ximian.com>
-
-	* evolution-outlook-importer.c: Outlook Express 4 .mbx importer.
-
-	* component-factory.c (component_factory_init): initialise the
-	outlook importer.
-
-	* GNOME_Evolution_Mail.oafinfo: Add the details for the Outlook
-	importer.
-
-2001-01-22  Dan Winship  <danw@ximian.com>
-
-	* mail-mt.[ch]: make mail_gui_thread non-static.
-
-	* main.c (main): Set up signal handler for SEGV, BUS, FPE
-	(segv_redirect): if a gnome-segv'ing signal is received in
-	a thread other than mail_gui_thread, re-deliver it to that
-	thread to work around a problem with the gnome segv handler.
-
-2001-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_multipart_signed): Fixed to display
-	subparts (other than the signature part) and started to write a
-	pretty way to show if the signature verified or not.
-
-2001-01-23  Not Zed  <NotZed@Ximian.com>
-
-	* mail-crypto.c (pgp_mime_part_verify): Fix a double-free problem.
-
-2001-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (incoming_type_changed): Oops, danw didn't
-	know 'provider' could be NULL :-)
-
-2001-01-22  Dan Winship  <danw@ximian.com>
-
-	* mail-config-druid.c (incoming_type_changed): Change "Path:"
-	label to "Namespace:" for IMAP. Use $MAILDIR rather than $MAIL for
-	Maildir. If $MAIL isn't set, guess.
-
-	* component-factory.c (mail_hash_storage): Function to add a
-	store/storage mapping.
-	(add_storage): Use it.
-
-	* mail-vfolder.c (vfolder_uri_to_folder): Use the vfolder name
-	rather than the string "mbox" (which wasn't ever used for
-	anything) in the vfolder URL. (Combined with the CamelVeeFolder
-	change, this makes camel_folder_get_name() return a pretty name
-	for vfolders now.) Call mail_hash_storage() to record the
-	CamelVeeStore/vfolder_storage mapping. (Ideally, there'd only be a
-	single CamelVeeStore... this is just a quick hack.)
-
-	vfolders now display their unread count once you've looked at them
-	once.
-
-2001-01-22  Dan Winship  <danw@ximian.com>
-
-	* mail-tools.h: s/filter-driver.h/camel-filter-driver.h/ and
-	update first arg of mail_too_filter_get_folder_func
-
-	* mail-tools.c (mail_tool_filter_get_folder_func): Update first
-	arg to CamelFilterDriver *
-
-	* mail-send-recv.c (receive_status): 
-	* mail-ops.c (send_queue_send): s/FILTER/CAMEL_FILTER/
-
-	* mail-callbacks.c: Remove filter-driver.h include
-
-	* mail-accounts.c: Put the news functions inside #ifdef
-	ENABLE_NNTP to prevent warnings about unused statis functions.
-
-	* subscribe-dialog.c (subscribe_folders, unsubscribe_folders,
-	subscribe_refresh_list): Update prototype to match BONOBO_UI_VERB. 
-	(populate_store_list): add a de-constifying cast
-
-2001-01-22  Not Zed  <NotZed@Ximian.com>
-
-	* .cvsignore: Added temp profiling files.
-
-	* component-factory.c (owner_set_cb): remove a warning with
-	conditional news compilation.
-
-	* mail-ops.h: Cleaned up the header list.
-	
-2001-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.c (mail_crypto_is_rfc2015_signed): Helps if I spell
-	stuff correctly so it can pass the tests ;-)
-
-2001-01-22  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser-factory.c: Replace the old get_send mail with the
-	new one (button).
-
-	* mail-ops.c (set_x_mailer): 
-	(mail_load_evolution_rule_context): 
-	(mail_do_fetch_mail): 
-	(mail_do_filter_ondemand): 
-	(mail_send_mail_old): 
-	(mail_do_send_queue): All removed, (for) now lives in mail-send-recv.c.
-	(load_context): 
-	(setup_filter_driver): 
-	(filter_get_folder): 
-	(mail_filter_folder): 
-	(mail_fetch_mail): 
-	(mail_update_subfolders): 
-	(mail_send_mail): 
-	(mail_send_queue): New equivalents of all these fundtions, moved
-	from mail-send-recv.c ...
-	(mail_filter_on_demand): Moved here too.
-	(mail_load_filter_context): Export this.
-
-	* mail-callbacks.c (apply_filters): Use the new
-	mail_filter_on_demand() call.
-	(send_receieve_mail): Use mail_send_receive to do the work.  Add a
-	little error handling here that used to be elsewhere.
-	(send_queued_mail): Removed.
-	(fetch_mail): Removed.
-	(select_first_unread): #ifdef'd this out.  Not sure if this still
-	makes sense, but it doesn't get run right now anyway.
-	(composer_postpone_cb): Fix the setting of message flags.  You
-	dont need to get them first, ever.
-
-	* mail-send-recv.c (mail_send_message): Dont use
-	mail_tool_send_via_transport anymore (it does nothing useful).
-
-	* mail-tools.c (mail_tool_camel_lock_up): Turned into a noop.
-	(mail_tool_camel_lock_down): And here too.
-	(mail_tool_move_folder_contents): Removed from the code (hasn't
-	bene used for ages).
-	(mail_tool_send_via_transport): Removed, it doesn't save anything.
-
-2001-01-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (owner_set_cb): Initialize OpenPGP.
-
-	* openpgp-utils.c (openpgp_init): No longer takes a passphrase
-	callback, we'll just use the mail-session one. Makes life simpler.
-	(pgp_get_passphrase): Use mail_session_request_dialog().
-
-	* mail-ops.c (do_send_queue): Remove the X-Evolution header before
-	we send.
-
-	* mail-crypto.c (pgp_mime_part_sign): Don't forget to unref the
-	filters.
-	(pgp_mime_part_verify): Same.
-	(pgp_mime_part_encrypt): Same.
-	(pgp_mime_part_decrypt): Take NotZed's advice and use
-	camel_stream_mem_new_with_buffer instead of writing to a new
-	stream_mem. Also use camel_data_wrapper_construct_from_stream
-	instead of creating a parser and using that.
-
-2001-01-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.c: Updated header comment and fixed some ref/unref
-	count problems in the various functions. Also fixed some other
-	little things.
-	(pgp_mime_part_encrypt): Do some canonical CRLF action before
-	encrypting.
-	(pgp_mime_part_sign): Make sure we are the owners of the byte
-	array.
-	(pgp_mime_part_verify): Same.
-	(pgp_mime_part_encrypt): Same.
-	(pgp_mime_part_decrypt): Same.
-
-2001-01-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (message_list_get_layout): Added
-	draw-focus="true" and selection-mode="browse" attributes to the
-	ETableSpecification.
-	(message_list_construct): Removed setting the "draw_focus"
-	argument since it doesn't exist any more.
-
-2001-01-21  Not Zed  <NotZed@Ximian.com>
-
-	* mail-mt.c (mail_msg_new): Init a cancel field in the message.
-	(mail_msg_free): Free it.
-	(mail_msg_cancel): New function to attempt to cancel an operation
-	by id.  Impelementation functions can still be uncancellable by
-	not registering for cancellation, etc, or do it themselves as
-	well.
-
-	* mail-send-recv.c (fetch_mail_filter_folder): set folder_uid's
-	properly, so we can save it later.
-	(filter_folder_filter): Renamed from fetch_mail_filter_folder,
-	since its going to be used for all filtering.
-	(mail_fetch_mail): Changed from mail_filter_mail.
-	(mail_filter_folder): New function, replaces
-	mail_do_filter_ondemand functionality.
-	(mail_filter_on_demand): New function, actually replaces
-	mail_do_filter_ondemand.
-	(receive_get_folder): Added an exception arg.
-	(mail_send_message): New function to just send a message.
-	(send_mail_send): Use mail_send_message.
-	(send_queue_send): New send qeue code, use mail_send_message, and
-	clean up some stuff.
-	(mail_send_receive): Changed from mail_receive.
-	(build_dialogue): Setup the sending data, as well.
-	(mail_update_subfolders): New function to update folder info.
-	(send_mail_send): hook into cancellation if we want.
-
-2001-01-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (do_send_queue): Strip leading space from the
-	transport url gotten from the message.
-
-2001-01-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_generate_reply): If the name is empty
-	string, use the address.
-
-2001-01-19  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (pixmap_press): Update for e_popup_menu_run
-	change.
-
-	* folder-browser.c (etable_key): On GDK_Menu (the menu key on
-	105-key keyboards), pop up the right-click menu.
-	(on_right_click): update for e_popup_menu_run change.
-	
-	* subscribe-dialog.c (recursive_add_folder): New function to add a
-	folder and any parents of it that don't yet exist. Fixes bugzilla
-	#1028.
-
-2001-01-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c: New swanky send/recieve thingy, well it so far
-	only receives (pop/mbox).  Ignore all the warnings for now, and
-	the ugly 'button' to run it.
-
-2001-01-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-factory.c: Added the next/previous toolbar
-	buttons.
-
-	* mail-callbacks.c (next_msg): New callback so we can have a next
-	toolbar button.
-	(previous_msg): Same but for previous.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (construct): Anna's dialog now supports
-	SSL so we can get rid of the ssl-support checks. Also work around
-	the fact that Anna's dialog doesn't have an optionmenu for the
-	transport type, it's a label instead.
-	(transport_type_init): Cast the transport_type widget to a
-	GtkOptionMenu where appropriate as the widget that stores it is
-	now generic.
-	(apply_changes): Modify code to work with anna's dialog...*sigh*
-	(ok_clicked): Alert the user that one or more servers failed to
-	validate and allow him to continue anyway.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_set_pgp_path): New config function to
-	set the path to the pgp binary.
-	(mail_config_get_pgp_path): Gee I wonder...
-	(mail_config_set_pgp_type): This one sets the type (ie PGP5, PGP2,
-	or GnuPG - see openpgp-utils.h for values)
-	(mail_config_get_pgp_type): Der.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (construct): Handle NULL source and, while
-	we're at it, transport URLs. Apparently camel_url_new() and/or
-	camel-url_free() don't handle NULL input well.
-
-	* mail-accounts.c (load_accounts): Handle NULL source URLs.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (construct): Oops. "url && url->host"
-	doesn't do much without the '?' and ':' ;-)
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-ops.c (set_x_mailer): New function.
-	(send_mail_send): Use it.
-	(do_send_queue): Use it.
-
-2001-01-17  Martin Norbäck  <d95mback@dtek.chalmers.se>
-
-	* openpgp-utils.c (pgp_get_passphrase): Changed the word entry
-	to enter, which is the correct word to use.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (ask_confirm_for_empty_subject): Update to use
-	EMessageBox and to record if the user doesn't want to ever see
-	this dialog again.
-
-	* mail-config.c (mail_config_get_prompt_empty_subject): New config
-	function.
-	(mail_config_set_prompt_empty_subject): Another new one.
-
-2001-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (apply_changes): Modify to be able to
-	handle a NULL source_url.
-	(source_auth_init): Allow for a NULL source url.
-	(source_check): Same.
-
-	* mail-config.c (mail_config_write): Allow for NULL source
-	URLs. And while we're at it, NULL transport URLs as well. Might as
-	well save the use_ssl variable too.
-	(config_read): Same.
-
-	* mail-config-druid.c (druid_finish): Modify to allow a NULL
-	source url.
-	(incoming_next): Modify to check for a NULL source and jump to the
-	transport page if one is encountered (this means the user decided
-	not to config a source).
-	(incoming_type_changed): Modify to set all widgets insensitive if
-	the user selected the "None" source menu item (aka NULL provider).
-	(incoming_check): Modify to allow the user to go to the next page
-	when he/she has chosen "None" for their source type.
-	(mail_config_druid_get_source_url): Return NULL if the provider is
-	NULL.
-	(mail_config_druid_get_transport_url): Same.
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (on_object_requested): Don't do thumbnails for
-	offline images
-
-2001-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (save_msg_ok): If the user hits "No", then
-	don't destroy the filesel window.
-
-	* mail-ops.c (save_messages_save): Open with mode 0666 as danw
-	suggests.
-
-2001-01-16  Chris Toshok  <toshok@helixcode.com>
-
-	* component-factory.c (owner_set_cb): only load the news storage
-	if ENABLE_NNTP.
-
-	* mail-accounts.c (construct): if !ENABLE_NNTP, remove the news
-	page from the dialog.
-
-2001-01-16  Radek Doulik  <rodo@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): use
-	e_msg_composer_mark_text_orig
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	* mail-ops.c (send_mail_send, do_send_queue): Update the X-Mailer
-	header to use the string specified by configure.
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* subscribe-dialog.c: removed unecessary #inlcude "e-title-bar.h"
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* openpgp-utils.c (pgp_get_passphrase): Fix a string causing
-	translation problems.  Bug #1147.
-
-2001-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (mail_do_fetch_mail): Setup a cancellation handle.
-	(do_fetch_mail): REgister for cancellation here.
-	(cleanup_fetch_mail): And unregister for cancellation here.
-	(mail_get_message): Add a cancel handle.
-	(get_message_get): Register/deregister for cancel.
-	(get_message_free): & clean up.
-
-	* mail-mt.c (mail_msg_received): Removed debuggng.
-
-	* mail-callbacks.c (stop_threads): Callback for stopping.
-
-	* folder-browser-factory.c: Add a stop button verb thingy.
-	(control_activate): Disable the stop button by default.
-
-2001-01-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c, message-list.h: Change from using filters for
-	date and size to using e_cell_date and e_cell_size.  Moved a bunch
-	of includes from the message-list.h to the message-list.c.
-
-2001-01-15  Miguel de Icaza  <miguel@ximian.com>
-
-	* mail-callbacks.c (configure_mail): Set the default button to
-	`Yes' here. 
-
-2001-01-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (source_auth_init): If the preferred
-	authmech isn't found, default to the first one in the list.
-	(transport_construct_authmenu): This function already did the
-	above but I made it simpler.
-	(apply_changes): A number of cleanups.
-
-2001-01-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (druid_finish): Fixed mail_load_storages to
-	make a mini GSList of the account, not the account->source. Oops.
-
-	* mail-accounts.c (news_delete): Updated to use the remove_news()
-	function.
-
-	* mail-config.c (mail_config_remove_news): New convenience
-	function for removing news accounts.
-	(mail_config_remove_account): Pretty much the same thing.
-
-	* mail-ops.c (do_send_queue): Get the X-Evolution-Transport URL
-	and use that if it exists, else fall back on the default
-	transport.
-
-	* mail-callbacks.c (composer_postpone_cb): Set an
-	X-Evolution-Transport header.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Removed GPG_* variables.
-
-	* component-factory.c (mail_load_storages): Now takes a
-	'is_account_data' variable to specify whether the sources is a
-	list of accounts of a list of services. Basically, the only time
-	you should pass in FALSE is when you are setting up NNTP storages.
-	(add_storage): Now takes a 'name' argument that specifies the name
-	to use in the storage.
-	(owner_set_cb): Updated to pass TRUE for accounts and FALSE for
-	news servers into mail_load_storages.
-
-2001-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Changed filter_date and filter_size to match the
-	changes in gal.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.glade: Anna's dialogs.
-
-	* mail-config.c (mail_config_get_account_by_address):
-	Removed. Danw and I decided on setting a X-Evolution-Transport
-	header on messages going to the Outbox so we can later guess which
-	transport to use when sending it.
-
-	* mail-account-editor.c (apply_changes): Update to some day be
-	able to support SSL.
-	(construct): Update for Anna's dialogs...
-
-	* subscribe-dialog.c (populate_store_list): Updated to reflect
-	past changes to the mail-config API.
-
-2001-01-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (composer_send_cb): Get the account by using
-	the new e_msg_composer_get_preferred_account() function. Also
-	check to make sure everything is configured (in case they deleted
-	their accounts while composing mail?).
-
-	* mail-config.c (mail_config_get_account_by_address): New
-	convenience function.
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (component_fn): Pass NULL as the
-	@copy_folder_fn arg to `evolution_shell_component_new()'.
-
-	* folder-browser.c (on_right_click): Removed hide menu.  It
-	belongs to the view menu now.
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* message-list.c: Add strings for localization
-
-	* folder-browser.c: Rename "Save" to "Store search as vFolder".
-
-2001-01-11  Miguel de Icaza  <miguel@gnu.org>
-
-	* mail-display.c (on_object_requested): Unref the property bag
-	when we are done with it.
-	(get_embedded_for_component): Moved the code to request the
-	embeddable/control to a separate function.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_get_account_by_name): New convenience
-	function that I will need later when I redo the composer From
-	field.
-
-	* mail-display.c (on_object_requested): Update to reflect past
-	changes to the mail-config API.
-
-	* session.c (mail_session_set_password): strdup() the key.
-
-	* mail-config-druid.c (construct): We don't want to be able to set
-	the reply-to in the config druid.
-	(druid_finish): Don't set a reply-to anymore.
-	(mail_config_druid_finalise): Don't unref the providers.
-
-	* mail-config.glade: Took out the Reply-To field in the druid.
-
-2001-01-11  Miguel de Icaza  <miguel@gnu.org>
-
-	* mail-config-druid.c (incoming_type_changed): Guess the default
-	MAIL value for MBOX and Maildir files.
-
-	* mail-callbacks.c (configure_mail): Force finalization of the
-	function before returning fixing the FIXME that was there.
-
-2001-01-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c (transport_next): If the service_check
-	fails, pop-up a warning dialog letting the user know he or she may
-	have problems and then let them continue on with their lives.
-	(incoming_next): Same (+ jump them over the auth page to the
-	transport page).
-
-	* mail-account-editor.c (apply_changes): Eek! Don't destroy the
-	account if the connection fails, duh. This is what is causing the
-	segfaults.
-
-2001-01-11  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c (got_folder): Connect to folder_changed as well
-	as message_changed for updating unread count
-
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* GNOME_Evolution_Mail.oafinfo: Add Bonobo/ItemContainer as the
-	set of supported interfaces in GNOME_Evolution_Mail_Composer
-	component.
-
-2001-01-11  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (write_field_to_stream): Translate the header name
-	to UTF8.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (configure_mail): New function that explains to
-	the user why he can't do the action he requested and then procedes
-	to ask if he'd like to configure his accounts now.
-	(check_send_configuration): If the user doesn't have configured
-	accounts, don't let him continue and call configure_mail().
-	(fetch_mail): Same.
-	(send_queued_mail): Same.
-	(send_receieve_mail): Same.
-
-	* mail-config.c (mail_config_write): Don't save a "is_configured"
-	variable. Instead we'll just check to see if we have accounts - if
-	yes, then configured == TRUE.
-	(mail_config_is_configured): return accounts != NULL.
-	(mail_config_get_default_account): Mark the first account as the
-	default if none are marked.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-account-editor.c (source_auth_type_changed): Set the
-	sensitivity of the Password label too.
-
-	* mail-config-druid.c (transport_back): New callback to handle
-	when the user hits the "back" button when on the transport
-	page. This is needed to handle the case where we don't want to
-	show the user the auth page (due to there being no auth choices).
-	(incoming_next): If we are going to skip over the auth page, set
-	the 'have_auth_page' variable to FALSE.
-	(construct): Initialize the have_auth_page to TRUE.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c (incoming_type_changed): Grab the focus of
-	the first widget that is sensitive.
-	(transport_type_changed): Same.
-	(identity_prepare): Grab the focus of the name entry.
-
-	* mail-callbacks.c (send_queued_mail): Prevent Federico's segfault.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c (auth_type_changed): Clear the password
-	entry if it's not allowed.
-	(transport_type_changed): Clear the hostname if it is not allowed
-	by the provider type.
-
-	* mail-account-editor.c (transport_type_changed): If the hostname
-	is allowed, clear it.
-
-	* mail-config-druid.c (incoming_type_changed): Clear the contents
-	of the entry boxes that are not to be used.
-	(mail_config_druid_get_source_url): If the text in the entry is
-	emptry string, don't set it' contents in the url.
-
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* mail-callbacks.c (print_msg): Fix proto.
-	(print_preview_msg): Fix proto.
-
-	* subscribe-dialog.c: Remove more UNSAFE macros.
-
-2001-01-09  Jason Leach  <jasonleach@usa.net>
-
-	* mail-display.c (pixmap_press): Bugfix for #1077: scrollwheel
-	doesn't work while hovering over an attachment icon.
-
-2001-01-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.glade: Moved to mail-config.glade
-
-	* mail-accounts.c (construct): Updated to use mail-config.glade.
-
-	* mail-account-editor.c (construct): Updated to use
-	mail-config.glade.
-
-	* mail-config-druid.c (construct): Updated to use
-	mail-config.glade.
-
-	* mail.h: Added the new mail config headers.
-
-2001-01-09  Dan Winship  <danw@helixcode.com>
-
-	* mail-local.c (local_folder_changed_proxy): Change
-	mail_op_forward_event to mail_proxy_event.
-
-2001-01-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (save_messages_save): Let the system umask determine
-	the permissions of this file.
-
-	* mail-config-druid.c (incoming_type_changed): Gray out the
-	appropriate labels too.
-	(auth_type_changed): And here.
-	(transport_type_changed): Here too...
-
-	* mail-account-editor.c (source_check): Gray out the appropriate
-	labels too.
-	(transport_type_changed): And here too.
-
-2001-01-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-account-editor.c: For all optionmenu's, set the appropriate
-	'history'.
-	(keep_mail_check): Set the keep-on-server checkbutton sensitivity
-	based on whether or not the store is a storage or not.
-	(construct): Call keep_mail_check().
-
-	* mail-config-druid.c (incoming_type_changed): Set the
-	keep-on-server checkbutton sensitivity based on whether or not the
-	store is a storage or not.
-
-	* mail-accounts.c (construct): Make sure the dialog isn't a
-	scrunched little thingy.
-
-2001-01-09  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (evolution_mail_LDFLAGS): Add -export-dynamic, so
-	libglade can resolve evolution-mail symbols.
-
-2001-01-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c: Updated.
-	(decode_pgp): Get rid of #ifdef PGP_PROGRAM's and handle
-	appropriately.
-	(handle_multipart_signed): Same.
-	(handle_multipart_encrypted): Same.
-
-	* Makefile.am: Added openpgp-utils.[c,h] to the build.
-	
-	* openpgp-utils.c: New source file containing all of the pgp
-	interface code.
-
-	* mail-crypto.c: Removed all of the openpgp funtions as they are
-	being moved to a new file.
-	(mail_crypto_is_rfc2015_signed): Renamed.
-	(mail_crypto_is_rfc2015_encrypted): Renamed.
-
-2001-01-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* session.c (mail_session_set_password): New function to set the
-	password for a given url.
-	
-	* mail-config-druid.c (druid_finish): Don't save the password in
-	the source url, instead insert it into the save-password hash.
-	(mail_config_druid_get_source_url): Check to make sure the
-	authmech isn't "", if it is then don't set the authmech.
-
-	* mail-account-editor.c (apply_changes): Don't save the password
-	in the source url, instead insert it into the save-password
-	hash. Also check to make sure we don't set an empty string as the
-	authmech for the source or transport.
-	
-	* mail-accounts.c (mail_default): After reloading the accounts,
-	reselect the previously selected account.
-	(mail_delete): Same.
-
-	* mail-config-druid.c (druid_cancel): Fixed segfault bug.
-
-2001-01-09  Radek Doulik  <rodo@helixcode.com>
-
-	* mail-format.c (write_headers): remove </center><p>
-	(handle_text_plain): add <font size=\"-3\">&nbsp</font><br> before
-	msg text
-	(handle_text_plain_flowed): ditto
-
-2001-01-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-accounts.c (mail_default): Write the config data and reload
-	the accounts list so the "default" tag is relocated.
-	(mail_delete): Write the config data here too.
-
-2001-01-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: 
-	* component-factory.c: 
-	* folder-browser-factory.c:
-	* folder-browser.c: 
-	* mail-accounts.[c,h]:
-	* mail-account-editor.[c,h]:
-	* mail-callbacks.c: 
-	* mail-config.[c,h]: 
-	* mail-config-druid.[c,h]:
-	* mail-config-druid.glade:
-	* mail-display.c: 
-	* mail-format.c: 
-	* mail-tools.c: Brand spankin' new config druid, editor, 
-	and manager.
-
-2001-01-08  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c: Add an #include <errno.h>
-
-2001-01-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: 
-	* component-factory.c: 
-	* folder-browser-factory.c:
-	* folder-browser.c: 
-	* mail-callbacks.c: 
-	* mail-config.[c,h]: 
-	* mail-display.c: 
-	* mail-format.c: 
-	* mail-tools.c: Reverted mail-config changes temporarily until 
-	I get it working correctly.
-
-2001-01-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c: More lovely fixes...
-
-	* mail-callbacks.c: Don't segfault if a default account doesn't
-	exist.
-
-2001-01-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c: A bunch of fixes.
-
-	* mail-accounts.c: More fixes...
-
-	* mail-account-editor.c (construct): Reparent the notebook to the
-	editor->vbox and set the resize policy.
-
-2001-01-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (providers_config): Use a
-	gnome_dialog_run_and_close().
-
-	* mail-accounts.c (construct): Reparent the notebook to the
-	dialog->vbox not to the dialog itself. Also set the resize policy
-	to allow the user to stretch it.
-
-2001-01-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-tools.c (mail_tool_quote_message): Updated to reflect
-	changes to the mail-config API.
-
-	* mail-display.c (redisplay): Updated to reflect changes to the
-	mail-config API.
-
-	* mail-callbacks.c (providers_config): Use the new account dialog.
-
-	* mail-config-druid.c (druid_finish): Load the new storage into
-	the shell.
-	(mail_config_druid_new): Take a shell argument.
-
-	* mail-format.c (mail_generate_reply): Updated to reflect changes
-	to the mail-config API.
-
-	* mail-config-druid.c: Fixed this to build.
-
-	* mail-callbacks.c (check_send_configuration): Updated to reflect
-	changes to the mail-config API.
-	(create_msg_composer): Same.
-	(forward_get_composer): Same.
-	(send_queued_mail): Same.
-	(composer_send_cb): Same.
-
-	* mail-account-editor.c: Updated to build cleanly.  *
-	mail-config-druid.c: Same.  * mail-accounts.c: Same.
-
-	* folder-browser-factory.c (control_activate): Updated for API
-	changes in mail-config.
-
-	* folder-browser.c (done_message_selected): Updated for API
-	changed in mail-config.
-	(folder_browser_gui_init): Same.
-	(got_folder): Same.
-
-	* component-factory.c (owner_set_cb): After using the sources
-	list, free it as it is no longer a const GSList as with the older
-	mail-config code.
-
-	* mail-config.c: Totally rewritten.
-
-2001-01-07  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* mail-accounts.c (mail_edit): Implemented.
-
-	* mail-account-editor.c (apply_clicked): Implemented.
-	(ok_clicked): Implemented.
-	(cancel_clicked): Implemented.
-	(source_auth_type_changed): Implemented.
-	(source_auth_init): Implemented.
-	(transport_construct_authmenu): Implemented.
-	(transport_type_changed): Updated to change regenerate the auth
-	option menu.
-	(construct): Attached callbacks to OK, Apply and Cancel buttons.
-
-	* mail-account-editor.c (source_auth_init): Use the new
-	mail_config_check_service().
-
-	* mail-config-druid.c: Remove check_service() as it will be moved
-	into mail-config.
-
-2001-01-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (message_list_select): Made it so that going to
-	the next or previous message in the list will at least move one
-	message, even if the current message matches the query.  This
-	makes 'n' go to the next unread message, even if the current
-	message is unread.
-
-2001-01-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-account-editor.c: Coded a bunch of the methods.
-
-2001-01-04  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (idle_check): Check if the HTML for the current
-	summary has been created, and if not then keep trying until it
-	has.
-	(new_folder_cb)
-	(removed_folder_cb)
-	(create_summary_view): Use the idle_check function to generate the
-	summary.
-	(create_summary_view): Don't set the HTML here. Set it via the
-	pipe.
-
-2001-01-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-account-editor.[c,h]: New source files to provide an
-	account editor widget.
-
-	* mail-config-druid.c (auth_type_changed): Set the authproto on
-	the druid so we can look it up later.
-
-2001-01-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-accounts.c (mail_add): Since the druid now handles adding
-	the new account to the config, we'll just connect to the destroy
-	event and show the druid.
-	(mail_add_finished): Just reload the account list here.
-
-	* mail-config-druid.c (druid_finish): New callback to handle the
-	"finish" signal. On second thought, it seems it would be best for
-	the finish callback to be here rather than in mail-accounts.c.
-
-	* mail-accounts.[c,h]: Added. Contains source for the Account manager
-	window. And just like mail-config-druid.c, it's not yet complete.
-
-	* mail-config-druid.c (mail_config_druid_get_incoming_keep_mail):
-	Renamed from _delete_mail
-	(mail_config_druid_get_transport_url): New convenience function
-	that replaces the get_hostname, get_protocol, etc.
-	(mail_config_druid_get_source_url): Same.
-
-	* mail-config-druid.glade: Changed "Delete mail from server" to
-	"Keep mail on server" as this has a more positive ring to it. Both
-	I and Aaron agree this is the better phrase.
-
-2001-01-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c: Fixed a few 'Oops'es.
-
-	* mail-config-druid.glade: Added a "Default" button for marking an
-	account as the default.
-
-2001-01-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.glade: Updated. What else can I say?
-
-2001-01-04  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (got_folder): Connect to "message_changed" on
-	the folder if it's on a remote storage.
-	(update_unread_count): Update the folder unread count / highlight
-	in the shell when the unread message count changes
-
-2001-01-04  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-ops.c (mail_do_send_mail): Removed old implementation.
-
-	* folder-browser.c (do_message_selected): If we haven't got a real
-	uid, then clear the display instead.
-
-	* message-list.c (message_list_drag_data_get): Use new save
-	message function, and also wait for it to finish before
-	continuing.
-	(folder_changed): 
-	(message_changed): Use mail_proxy_event instead of
-	mail_do_forward.
-	(mail_regen_list): New iplementation to replace the old.
-	: remove <gnome.h> from headers.  Dont define timeit by default.
-	(main_folder_changed): 
-	(message_list_set_folder): 
-	(message_list_set_threaded): 
-	(message_list_set_search): 
-	(message_list_hide_add): 
-	(message_list_hide_uids): 
-	(message_list_hide_clear): Use mail_regen_list instead of
-	mail_do_regenerate_messagelist.
-	(mail_do_regenerate_messagelist): Removed the old stuff.  No
-	functionality changed yet, just using different thread stuff.
-
-	* mail-callbacks.c (save_msg_ok): Use new save message function.
-
-	* component-factory.c (create_view):
-	(add_storage): Use mail_scan_subfolders to build the folder info.
-	(create_folder): Use new implementation with our own callback.
-	(owner_set_cb): Changed b ack to use mail_get_folder, but now wait
-	for it to finish.  This will let any gui still run, but also gives
-	us the required synchronous operation.
-	(got_folder): Callback for when the folder has been opened.
-
-	* mail-ops.c (mail_get_folderinfo): New function to just get the
-	folder info in another thread.
-	(mail_scan_subfolders): New scan subfolder implementation that
-	uses mail_get_folderinfo.
-	(mail_do_scan_subfolders): Removed old implementation.
-	(mail_create_folder): Nerw implementation to create a folder, only.
-	(mail_do_create_folder): Removed old implementation.
-	(mail_save_messages): New implementation, fixes a couple of minor
-	problems, and now provides a return so it can be waited on.  Also
-	check that the writes worked, etc.
-	(mail_do_save_messages): Remove previous implementation.
-	(mail_do_flag_messages): Removed, nothing uses it.
-	(mail_do_flag_messages): Removed, nothing uses it anymore.
-	(mail_get_folder): REturn the operation id, so callers can wait
-	for it.
-	(sync_folder_desc): 
-	(expunge_folder_desc): Add describe functions so we know what its
-	doing.
-	(mail_send_mail): More generic implementation of sending mail.
-
-	* mail-mt.c (mail_msg_new): Lock around seq increment.  And insert
-	each new message into a hash table of active messages.
-	(mail_msg_init): Init the active message table.
-	(mail_msg_free): Remove the message from the active message table.
-	(mail_msg_wait): New function, waits for a message to be
-	processed, by id.
-	(mail_msg_check_error): Dont display the error if it is a
-	user-cancelled operation.
-	(mail_proxy_event): new implementation of mail_op_forward_event.
-	Only real difference is it uses the new	thread stuff, and you can
-	wait for it to finish if you want.
-	(mail_proxy_event): If we're already in the main thread, just call
-	the function.
-
-2001-01-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c: New source file that implements
-	mail-config-druid. Note: this is not yet complete.
-
-2001-01-03  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-view.c (view_forward_msg): Call
-	mail-callbacks.c:forward_messages(), so the behaviour is the same
-	as from the folder browser.
-
-	* mail-callbacks.c (forward_messages): New function to forward
-	messages, attached or not.
-	(forward_inlined): Changed to use new forward-messages
-	implementation.
-	(forward_attached): Likewise.
-	(do_forward_attach): Callback for forwarding as attachment, once
-	we have built it.
-	(do_forward_inline): Likewise, for inline, once we have retrieved
-	the message.
-	(forward_message): Removed.
-
-	* mail-ops.c (mail_build_attachment): New function to build an
-	attachment of messages.
-	(mail_do_attach_message): Removed, functionality superceeded by
-	above.
-	(mail_do_forward_message): Removed.  Likewise.
-	(mail_create_folder): Started work on an alternative
-	implementation of create_folder, but not sure about it yet.
-
-	* mail-tools.c (mail_tool_generate_forward_subject): Remove locking.
-	(mail_tool_make_message_attachment): Free the description when done.
-
-2001-01-03  Radek Doulik  <rodo@helixcode.com>
-
-	* mail-format.c (write_headers): add font color setting for table,
-	changed border behavior
-
-	* mail-display.c (redisplay): don't set body bg and text color
-
-2001-01-02  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-callbacks.c (view_msg): Fix for mail_get_message change,
-	use queue thread.
-
-	* folder-browser.c (done_message_selected): Fix mail_Get_message
-	calls, use new thread.
-	(do_message_selected): "
-
-	* mail-ops.c (mail_get_message): Add a thread argument so callers
-	can specify which queue it executes on.
-
-	* mail-mt.c (mail_msg_free): Fix a free order problem.
-	(mail_msg_destroy): Call mail_msg_free to do the work.
-	(mail_msgport_replied): "
-	(mail_msgport_replied): Check/display errors if we get them.
-	(mail_msgport_received): If we have a describe function, say what
-	we're doing, also set busy/unbusy.
-	(mail_msgport_replied): Clear busy when we get a reply.
-	(mail_get_password): Unset busy.
-	(mail_msg_received): Set busy as we go.
-	(mail_msg_destroy): Unset busy when done.
-	(mail_status): Blah blah, new status interface, the other wans't
-	workable with the way the shell api works.
-
-2000-12-29  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (do_message_selected): If we are reconfiguring,
-	just keep polling till we are done (yeah kinda shitty, but easy).
-	(folder_browser_set_uri): Clear reconfigure flag here.  ick.
-	(got_folder): And here too.
-	(on_right_click): Remove locking.
-	(hide_sender): and here too.
-	(hide_subject): And here.
-	(on_right_click): If we are in reconfigure, then the whole menu is disabled.
-
-	* mail-mt.c (status_busy_timeout): Clear the status_busy_timeout_id.
-
-	* mail-local.c (local_storage_new_folder_cb): Made getting folders
-	completely synchronous.  The shell expects it, and it was only
-	synchronous before by a sideeffect.
-	(do_reconfigure_folder): Remove locking stuff.
-	(do_reconfigure_folder): Use our own much simpler copying routine
-	than that stupid move_folder_contents thing.
-	(update_progress): Use mail_status_message() instead.
-	(do_reconfigure_folder): Set the reconfigure flag during
-	reconfigure & set busy flag.
-	(cleanup_reconfigure_folder): clear busy flag.
-
-	* mail-tools.c (mail_tool_uri_to_folder): Remove the tool_lock
-	stuff.
-	(mail_tool_uri_to_folder_noex): Clear exception on exit.
-	(mail_tool_move_folder_contents): Get rid of this really stupid
-	function that is only used in one place.
-
-	* component-factory.c (owner_set_cb): Use direct calls to get the
-	folders, as this code must run synchronous.  Remove the event wait
-	stuff.
-
-	* mail-callbacks.c (edit_msg): Call mail_get_messages, and create
-	the composers ourself.
-	(do_edit_messages): get_messages callback, create the composers
-	and connect to signals we need.
-	(view_msg): Dont call do_view_messages, just call
-	mail_get_messge for each to get them in parallel.
-	(do_view_message): view a single message.
-
-	* mail-ops.c (mail_edit_messages): Just use mail_get_messages
-	for this operation.  Removed the other async operation stuff.
-	Changed my mind, just removed entirely.
-	(mail_do_view_messages): Removed.
-	(mail_do_setup_folder): Removed.
-	(mail_do_scan_subfolders): Make this run synchronously, as every
-	caller expects it to (even if they didn't realise).
-
-2000-12-28  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-callbacks.c (send_queued_mail): Dont expunge the folder
-	here, but in send_queue, otherwise it might execute out of order.
-	(expunge_folder): Remove the talbe prechange stuff, and infact
-	references to the message_list folder, as we have our own folder.
-	Also, dont allow expunge if we're already expunging.
-	(expunged_folder): Clkear the expunging flag if we're finished.
-
-	* folder-browser-factory.c (control_deactivate): Likewise here.
-	Hrm, i thought this function required a callback, silly me.
-
-	* mail-tools.c (mail_tool_make_message_attachment): Remov e
-	locking.
-
-	* folder-browser.c (on_message_selected): Use a timeout handler so
-	we dont select immediately.
-	(folder_browser_set_uri): Changed to use mail_get_folder.
-	(got_folder): New callback called when get_folder is finished.
-	(folder_browser_destroy): Use new sync interface.
-
-	* mail-ops.c (mail_get_message): New function to asynchrounously
-	get a message.
-	: #define out mail_tool_camel_lock stuff entirely.
-	(mail_get_folder): New function to asynchrounously get a folder.
-	(mail_do_load_folder): Removed, replaced by more generic function
-	above.
-	(mail_do_display_message): Removed, replaced by the more generic
-	funciton get_message.
-	(mail_get_messages): New function to get a list of messages
-	asynchronously.
-	(mail_sync_folder): New interface to sync a folder async.
-	(mail_expunge_folder): New interface for expunging folder, with
-	callback.
-	(do_send_queue): Remove lock stuff, and expunge if (and only if)
-	successful, also sync the sent folder while we're at it.
-
-	* session.c (mail_session_request_dialog): Changed to use new
-	mail_get_password call.
-
-	* mail-mt.[ch]: New threading/interthread messaging framework.
-
-	* main.c (main): Init the message/thread system.
-
-2001-01-02  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (mail_part_is_inline): 
-	(find_preferred_alternative): 
-	* mail-display.c (launch_cb): Use header_content_type_simple, not
-	header_content_type_format.
-
-2000-12-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-crypto.c (mail_crypto_openpgp_verify): Implemented.
-
-2000-12-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (mail_do_setup_trash): New function similar to
-	mail_do_setup_folder() except that this creates the Trash VFolder
-	(special-case).
-
-2000-12-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_send_mail): Don't free info inside the last
-	if-statement, if sent_folder doesn't exist we'll have a memory
-	leak. Instead free it afterward.
-
-2000-12-29  Dan Winship  <danw@helixcode.com>
-
-	* mail-crypto.c: Oops. Update this for CamelContentType stuff too.
-
-2000-12-28  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (mail_part_is_inline, mail_get_message_body): Use
-	CamelContentType, and use header_content_type_is instead of doing
-	it by hand.
-	
-	(handle_text_plain): 
-	(handle_multipart_related): 
-	(find_preferred_alternative): 
-	(handle_message_external_body): Use CamelContentType and
-	header_content_type_* functions instead of GMimeContentField.
-
-	* mail-display.c (write_data_to_file, launch_cb): Use
-	CamelContentType and header_content_type_* functions instead of
-	GMimeContentField.
-
-2000-12-26  Iain Holmes  <iain@helixcode.com>
-
-	* mail-display.c (mail_display_init): Initialise the thumbnail cache.
-	(mail_display_destroy): Free the cache.
-	(pixbuf_gen_idle): Check the cache for a pixbuf, add the pixbuf to the
-	cache if it's not there.
-
-2000-12-26  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (create_summary_view): Create a shared 
-	BonoboEventSource object and use it for all the objects that
-	aggregate Bonobo::EventSource.
-
-2000-12-27  Dan Winship  <danw@helixcode.com>
-
-	* subscribe-dialog.c (setup_subscribe_folder): Use info->name, not
-	input->full_name. Fixes #1029 in bugzilla.helixcode.com.
-	({setup,do,cleanup}_subscribe_folder): Update previous fix: Jeff
-	had changed it to use ->full_name instead of ->name because that's
-	what camel_store_subscribe_folder needed. So we need to have
-	*both* names available, one for Camel, one for the shell.
-
-2000-12-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (filter_date): Changed this to format times in 12
-	hour time instead of 24 hour time.
-
-2000-12-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (filter_date): Changed this to do different
-	formatting of dates within the last week.
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* Merge from camel-mt-branch.
-
-2000-12-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (filter_date): Changed this to do different
-	formatting of dates based on the current time.
-
-2000-12-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (message_list_get_layout): Added titles to the
-	pixbuf columns.
-
-2000-12-21  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c: Added code to detect and regenerate the summary
-	when a new vfolder is created or removed.
-
-	* mail-vfolder.c: Export the vfolder_storage variable, so that
-	the summary can add a listener to it.
-
-2000-12-05  Iain Holmes  <iain@helixcode.com>
-
-	* component-factory.c (factory_destroy): Wait till all views have
-	gone and then destroy both factories.
-
-2000-12-21  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (pixbuf_for_mime_type): Deal with the possibility
-	that we have an icon-filename listed for a MIME type, but the icon
-	file doesn't actually exist. Also, if gnome-unknown.png can't be
-	found, fall back. Might fix a crash people have been reporting...
-
-2000-12-18  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-format.c (handle_multipart_encrypted): for now #ifdef
-	PGP_PROGRAM falling back to handle_multipart_mixed.
-	(handle_multipart_signed): same.
-
-2000-12-18  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (hide_save_state): Unlock camel when done to
-	prevent a hang later.
-
-2000-12-18  Miguel de Icaza  <miguel@helixcode.com>
-
-	* mail-tools.c (mail_tool_move_folder_contents): Only update
-	display every 2 seconds.
-
-	* mail-ops.c (do_view_messages): Only update display every 2 seconds.
-
-2000-12-23  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.h (MessageList): Add a specific hide data lock.
-
-	* message-list.c (message_list_drag_data_get): Do not use
-	cursor_uid, but get all currentlys elected messages directly off
-	the message-list.
-	(message_list_destroy): Removed mail_tool_camel_lock stuff.
-	(on_click): "
-	(message_list_hide_add, message_list_hide_uids, hide_load_state,
-	hide_save_state, message_list_hide_clear): ", but use a specfic
-	lock for the hide data.
-	(do_regenerate_messagelist): remove mail_tool_camel_lock stuff,
-	add hide_lock where required.
-	(message_list_init): Setup the hide_lock.
-	(message_list_destroy): Free the hide_lock.
-
-2000-12-22  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-ops.c (mail_do_sync_folder): Run sync in different thread
-	each time.  Just a quick litlte hack to check multithreading.
-	There are now few operations that single-queue.  Need to work out
-	a way to make the allocation of threads & resources easier, so we
-	dont get overwhelmed with threads, but we dont block when we dont
-	have to, either.
-
-	* message-list.c (main_folder_changed): If we have only changed
-	events, then process them directly.
-	(mail_do_regenerate_messagelist): Run regenerate in a new thread
-	each time, another quick hack to check mutlithreading.
-
-	* mail-view.c (view_delete_msg): Call camel folder set message
-	flags directly.  mail_do_set_message_flags() is now completely
-	unused.
-
-	* folder-browser.c (mark_msg_seen): Call camel folder
-	set_message_flags directly.
-
-	* mail-callbacks.c (flag_messages): New function, that just sets
-	flags of all selected messages, without all that messy thread
-	stuff (setting flags is	in-memory).
-	(mark_as_seen): Use flag_messages().
-	(mark_as_unseen): "
-	(undelete_msg): "
-	(delete_msg): "
-
-2000-12-20  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_select): Free messageinfo lookups.
-	(message_list_drag_data_get): "
-	(subtree_unread): "
-	(subtree_size): "
-	(subtree_earliest): "
-	(ml_tree_value_at): "  Also, keep the message info around in a
-	static variable, and ref'd, so that any internal references we
-	have to it dont vanish while we're not looking.  This has a couple
-	of problems ... esp since we never unref the last access, although
-	camel-folder-summary wont check this when its unref'd, so we're
-	'safe'.
-	(save_node_state): free messageinfo lookups.
-	(on_click): "
-	(get_message_info): deconstify return.
-
-	* mail-tools.c (mail_tool_move_folder_contents): Free messageinfo
-	lookups.
-
-	* mail-ops.c (do_filter_ondemand): Free messageinfo lookups.
-	(do_flag_messages): "
-	(do_fetch_mail): Remove mail_tool_lock stuff.
-	(mail_operation_run): Quick hack to run an operation
-	asynchrounously, in a brand-new thread.
-
-	* folder-browser.c (on_right_click): Free messageinfo lookups.
-
-2000-12-16  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (build_tree): Always use the slow (full-update)
-	version of the tree update code, to get around a bug(?) in etree.
-	(build_flat): Likewise.
-
-2000-12-15  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-display.c (write_data_to_file): Dont blindly convert all
-	parts to utf8, e.g. image/jpg.  We only convert text/* parts, and
-	only then if required.
-
-2000-12-14  Not Zed  <NotZed@HelixCode.com>
-
-	* component-factory.c (create_view): cast over a warning.
-
-	* folder-browser-factory.c: Add verbs for hide functions.
-
-	* message-list.c (message_list_hide_clear):
-	(message_list_hide_uids): 
-	(message_list_hide_add): Some api renaming.
-	(message_list_hide_add): Allow ML_HIDE_SAME to be passed to mean
-	not to change the upper/lower range at all.
-	(hide_save_state): Save the state of the hide list to stable
-	storage.
-	(hide_load_state): Load the state of hte hide list.
-	(message_list_set_folder): Load/save the state of the folder if it
-	is changed/set.
-	(message_list_destroy): Save the state of the folder hide list
-	when done.
-	(save_tree_state): If we wrote out an empty state file, simply
-	remove it instead.
-
-	* folder-browser.c (on_right_click): Add some hide menus.
-	(hide_read): Hide read messages.
-	(hide_deleted): Hide deleted messages.
-	(hide_selected): Hide selected/current message.
-	(hide_none): Show all hidden messages.
-	(on_right_click): Lock around accesses to the message (inside
-	mlist_detect_magic).
-	(on_right_click): Free the mailing list name.
-
-2000-12-13  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (on_right_click): Add camel locking since we
-	call it directly.  Whoever heard of a lock you 'down' to unlock?
-
-	* message-list.c (mail_do_regenerate_messagelist): Added hide
-	expression, messages to hide.  Fixed all callers.
-	(do_regenerate_messagelist): IF we have a hide expression, search
-	and remove those from the uid list.  If we have a hide range,
-	apply that afterwards.
-	(cleanup_regenerate_messagelist): Handle freeing the hide uid
-	temporary data, if required.
-	(message_list_destroy): Free hide data, also lock around all camel
-	object stuff.
-	(message_list_length): New function to get the number of messages
-	avaialble to be hidden by range.
-	(message_list_set_hide): Set the hide expression and range.
-	Issue: Should hiding be remembered?
-	(message_list_unhide_all): Turn off all hiding.
-	(message_list_hide_uids): Hide a list of uid's.
-
-2000-12-15  Dan Winship  <danw@helixcode.com>
-
-	* subscribe-dialog.c (folder_toggle_cb): Update this for the new
-	signal handler prototype. Fixes the crash on double-click.
-
-2000-12-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (handle_multipart_signed): New callback to handle
-	multipart/signed parts.
-	(decode_pgp): Update to account for the cipherlen argument needed
-	for openpgp_decrypt.
-	(is_rfc2015): Removed as we now have a better version in
-	mail-crypto.
-	(handle_multipart_encrypted): Updated to use the PGP/MIME utility
-	functions.
-
-	* mail-crypto.c (mail_crypto_openpgp_decrypt): Don't check
-	(!*plaintext) as it could be a binary stream. Now also takes a
-	cipherlen argument.
-	(mail_crypto_openpgp_sign): New function.
-	(pgp_mime_part_sign): New function to replace a mime part with the
-	pgp signed equivalent.
-	(pgp_mime_part_encrypt): New function to replace a mime part with
-	the pgp encrypted equivalent.
-	(pgp_mime_part_decrypt): New function to decrypt a pgp encrypted
-	mime part (like from pgp_mime_part_encrypt) and replace it.
-	(is_rfc2015_signed): New function to determine if a mime part is
-	an rfc2015 signed part.
-	(is_rfc2015_encrypted): New function to determine if a mime part
-	is an rfc2015 encrypted part.
-	(mail_crypto_openpgp_verify): New openpgp function to verify a
-	signature.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-threads.c (update_active_views): Unref the iterator when
-	we're done with it.
-
-2000-12-14  Larry Ewing  <lewing@helixcode.com>
-
-	* mail-display.c (mail_display_new): call
-	gtk_html_set_default_content_type to make gkthtml default to utf-8
-	when parsing.  This requires gtkhtml >= the released 0.8.
-
-2000-12-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-threads.c (read_msg): Call `ui_set_busy()' before
-	`ui_set_message()' so that we are sure that the
-	set_busy/unset_busy calls always happen in order.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser.c (my_folder_browser_init): Made the vertical
-	scrollbar always be there.
-
-	* message-list.c (message_list_get_layout): Changed the minimum
-	width of some of the pixmap column headers.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* component-factory.c (create_view): Added a cast.
-
-	* mail-summary.c: Added #include "mail-summary.h".  Commented out
-	folder_free, summary_free, and view_destroy_cb since they're not
-	used.
-	(do_changed): Added a cast.
-	(create_summary_view): Changed some types so that casting would be
-	easier.
-
-	* session.c (mail_session_remember_password): Added a cast.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* mail-summary.h: Fix to use the right .h instead of the
-	deprecated one.
-
-2000-12-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (forward_message): Attach a signature when
-	forwarding, fixes bug #826.
-
-2000-12-11  Dan Winship  <danw@helixcode.com>
-
-	* session.c (mail_session_enable_interaction): New function to
-	tell the code that it's ok (or not) to interact with the user when
-	trying to authenticate to a service. Starts out turned off.
-	(mail_session_request_dialog): If interaction is disabled, fail if
-	the password isn't in the cache.
-
-	* component-factory.c (owner_set_cb): Call
-	mail_session_enable_interaction() after everything else. (This
-	means that the IMAP password dialog will no longer pop up [under
-	the splash screen] at startup.)
-
-2000-12-11  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c (create_view): Deal with "mailstorage" type
-	views (top-level mail storages) by trying to fill the storage's
-	folder tree again if we failed before.
-	(add_storage): Create new storages with a URI and type
-	"mailstorage".
-
-	* mail-ops.c (cleanup_scan_subfolders): On success, mark the
-	storage as having been loaded, so create_view won't try again.
-
-2000-12-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (decode_pgp): Updated to reflect arguments to the
-	openpgp functions - now also takes an outlen argument.
-	(try_inline_pgp): Updated.
-	(handle_multipart_encrypted): Updated here too.
-
-	* mail-crypto.c (crypto_exec_with_passwd): Updated to handle
-	binary streams and such.
-	(mail_crypto_openpgp_encrypt): Always initialize the passwd_fds
-	even if we don't plan on signing. Added an 'inlen' to specify the
-	length of the input data (as it could be binary). Also added a
-	'userid' argument for cases when we want to sign as well as
-	encrypt.
-	(mail_crypto_openpgp_decrypt): Updated to take an outlen argument
-	in case the ciphertext is encrypted binary data.
-	(mail_crypto_openpgp_clearsign): Added a 'hash' and 'detach'
-	arguments. 'hash' allows the program to specify the preferred hash
-	function (which will come in handy when generating
-	PGP/MIME). 'detach' allows the program to specify whether it wants
-	a detached signature or the entire signed text.
-
-2000-12-11  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c: Remove the never-once-used BonoboObject stuff
-	and make MessageList be a GtkWidget instead. Also, keep track of
-	the ETable directly rather than repeatedly calling
-	e_table_scrolled_get_table.
-
-	* folder-browser.c (folder_browser_destroy): Use gtk methods
-	rather than bonobo methods to destroy the message list.
-	(on_right_click, on_double_click): These are being attached to the
-	ETable directly now, so fix the first argument (which isn't being
-	used anyway, but...). Ignore double-clicks on "active" columns
-	(the ones where clicking does something beyond "select"), fixing
-	bug #811, which is what got me started on this to begin with...
-	(folder_browser_gui_init): simplify now that MessageList itself is
-	a widget. Also use message_list->table rather than
-	e_table_scrolled_get_table.
-
-	* mail-local.c (mail_local_reconfigure_folder): Add "mail_" to
-	the beginning of this function name to match its prototype and the
-	other vague namespace conventions in the mailer.
-
-	* mail-callbacks.c (select_all, invert_selection): Use ml->table.
-	(configure_folder): s/local_reconfigure_folder/mail_&/
-	
-	* mail-ops.c (do_flag_messages): clean up the cleanup a bit
-
-	* mail-tools.c (mail_tool_quote_message): Remove an unused
-	variable.
-
-2000-12-11  Not Zed  <NotZed@HelixCode.com>
-
-	* local-config.glade: reordered the options and added maildir,
-	mbox, maildir, mh, in that order.
-
-	* mail-local.c (reconfigure_clicked): Added maildir, re-ordered to
-	match the changed xml file too.
-	(do_reconfigure_folder): WHoever 'threaded' this code forgot to
-	check that folder_browser functions shouldn't be called here.
-	(cleanup_reconfigure_folder): Call it here instead.
-	(lookup_folder): Blah blah, we have to lookup the folder and
-	verify its still the same format, joy.  Becaause someone thought
-	it would be wise to make the code 5x more complicated for no
-	reason, and totally break 'mail reconfigure' in the process. i'm
-	really happy about that one.
-	(cleanup_register_folder): Uh, yeah, so like, the
-	local_store->folders hashtable is supposed to point to like,
-	LocalFolders, not CamelFolders.
-	(free_local_folder): Free the localfolder struct properly.
-	(free_folder): Call above to free data properly.
-	(get_folder): Fix for fixing folders hashtable.
-	(local_storage_removed_folder_cb): Same here.
-	(local_storage_new_folder_cb): Ref the local_store when putting it
-	in the local_folder.
-	(cleanup_register_folder): Properly free the local_folder if the
-	op failed.
-	(free_local_folder): Unhook events also.
-	(d): Oops, left debug turned on.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (message_list_init): Change the "drawfocus"
-	argument on e_table_scrolled_get_table(etable) instead of on
-	etable (etable is an ETableScrolled.)
-
-2000-12-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (save_msg_ok): Check to see if the file already
-	exists, if it does prompt the user to for permission to overwrite
-	the file.
-	(forward_message): g_strdup the cursor_uid if there is only a
-	single message to be forwarded or we'll segfault later.
-
-	* mail-ops.c (do_save_messages): Rewrote yet again. I'm back to
-	almost an identical implementation as the first time I wrote this
-	except now we write the From line which I had forgotten last
-	time. This means that we no longer have to unlink the .ev-summary
-	file created and we also use fewer resources (no need to create a
-	CamelMboxFolder object).
-
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* folder-browser.c (on_double_click): the e-table double-click
-	signal now has extra params
-
-2000-12-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (add_storage): Pass `NULL' as the
-	@toplevel_node_handler_id arg in `evolution_storage_new()'.
-	FIXME: We should be passing the ID of the mail component here.
-	* mail-vfolder.c (vfolder_create_storage): Likewise.
-
-2000-12-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (message_list_get_layout): Set the "Size" field
-	to sort using integer comparison instead of string.
-	(filter_size): New function to transform a integer size into a
-	more readable form.
-	(ml_value_to_string): Use filter_size.
-	(ml_value_is_empty): COL_SIZE is no longer a string, so handle
-	this as an integer.
-	(ml_initialize_value): Here too.
-	(ml_free_value): And here.
-	(ml_duplicate_value): And here too.
-	(message_list_create_extras): Setup the size etable cell.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser.c: Connect to signals on the ETable instead of
-	the ETableScrolled.
-
-	* subscribe-dialog.c: Used the e_table_scrolled_get_table function
-	instead of accessing the variable directly.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Connect to signals on the ETable instead of the
-	ETableScrolled.
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Got rid of code referencing the ETableScrolled
-	proxy functions.  Changed the call to e_table_set_cursor_row to
-	send a model row instead of a view row.
-
-2000-12-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (forward_message): Only do a
-	message_list_foreach if we plan on attaching messages, otherwise
-	just use ml->cursor_uid.
-
-	* mail-ops.c (cleanup_forward_messages): If attaching multiple
-	forwarded message, wrap them in a multipart/digest otherwise just
-	attach the single message as a message/rfc822.
-
-2000-12-07  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (on_object_requested): Make the iTip hack spew a
-	g_warning and not crash if you have no identity configured. To be
-	revisited.
-
-	* mail-callbacks.c: (various)
-	* folder-browser.c (filter_mlist): 
-	* mail-autofilter.c (filter_gui_add_from_message): 
-	* mail-vfolder.c (vfolder_gui_add_from_message): Add some
-	g_return_if_fail()s to protect from crashes until the code to
-	enable/disable commands based on how many messages are selected is
-	done.
-
-2000-12-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-vfolder.c (vfolder_gui_add_rule): Make the vfolder editor
-	resize correctly. Fixes bug #835.
-
-2000-12-06  Dan Winship  <danw@helixcode.com>
-
-	Fix up shutdown so that things that should be destroyed get
-	destroyed. Among other things, this fixes the bug where IMAP
-	stores weren't disconnected at shutdown.
-
-	* mail-threads.c (update_active_views): Update for
-	folder_browser_factory_get_control_list change to EList.
-
-	* folder-browser-factory.c: Turn control_list into an EList so
-	that we can safely remove items from it while it's being iterated
-	(which will happen as FolderBrowsers are destroyed at shutdown
-	while the thread code is trying to update the status bars).
-	(control_destroy_cb): Just destroy the folder_browser.
-	(browser_destroy_cb): New callback for FolderBrowser destroy.
-	Remove the control from control_list here instead of
-	control_destroy_cb, because the controls don't seem to get
-	destroyed reliably...
-
-	* component-factory.c: Clean up stuff.
-	(factory_destroy): Get rid of this.
-	(owner_unset_cb): Schedule an idle handler to quit.
-	(idle_quit): Wait for all of the FolderBrowsers to be destroyed
-	and then destroy the storages and quit.
-
-	* mail-summary.h (create_summary_view): Fix prototype
-
-2000-12-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (mail_config_folder_to_cachename): Use
-	e_filename_make_safe (which used to be e_str_make_safe).
-
-	* mail-display.c (make_safe_filename): And here.
-
-	* message-list.c (message_list_drag_data_get): Here too.
-
-2000-12-06  Dan Winship  <danw@helixcode.com>
-
-	* mail-local.c (cleanup_register_folder): Run the folder_changed
-	code on message_changed as well, so the unread message counts
-	update as messages are read.
-
-	* folder-browser.c: Remove bits of filter-on-demand and toolbar
-	bug workaround cruft that don't do anything useful any more.
-
-	* mail-ops.c (cleanup_load_folder): unref the ref we added in
-	setup_load_folder.
-
-2000-12-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-display.c (write_data_to_file): Use a charset filter to
-	make sure the data is written out in the charset it was meant to
-	be in instead of UTF-8.
-
-	* mail-format.c (mail_format_raw_message): Don't use the raw
-	message body as the format argument, use "%s" instead. If the raw
-	message contains %'s then it will segfault otherwise.
-
-2000-12-04  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c (service_page_item_new): Fix a typo so that
-	toggling the "remember password" checkbox will activate the "OK"
-	button if it was inactive.
-
-2000-12-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-vfolder.c (vfolder_create_storage): Updated the call to
-	`evolution_storage_new()': pass NULL for @toplevel_node_uri.
-
-	* component-factory.c (add_storage): Updated the call to
-	`evolution_storage_new()': pass NULL for @toplevel_node_uri.
-
-2000-12-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* subscribe-dialog.c (setup_subscribe_folder): Use info->full_name
-	rather than info->name so that we get the namespace part of the
-	folder path as well.
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c: Updated to define verbs
-	"MessageForwardInlined" and "MessageForwardAttached" instead of
-	"MessageForwardInline" and "MessageForwardAttach".
-
-	* folder-browser.c (on_right_click): Make forwarding as an
-	attachment the default.
-
-	* mail-callbacks.c (forward_inlined): Renamed from `forward_msg'.
-	(forward_attached): Renamed from `forward_attach'.
-	* mail-callbacks.h: Updated accordingly.
-
-2000-12-01  Dan Winship  <danw@helixcode.com>
-
-	* session.c (mail_session_remember_password): Writes out passwords
-	(to .gnome_private) in our patented proprietary "Best Awesome
-	Super Encryption 64" ("BASE64") format which could not possibly
-	ever be cracked by even the most cryptographically knowledgeable
-	five-year-olds.
-	(mail_session_init): Load remembered passwords at startup.
-	(mail_session_forget_passwords): Erase them from disk as well as
-	memory.
-
-	* mail-config.c: Add "remember_password" field to
-	MailConfigService.
-	(mail_config_write_on_exit): Call mail_session_remember_password
-	for services with "remember_password" set.
-	* mail-config-gui.c: Add "remember password" checkbox to the
-	dialogs, and make it appear and disappear as appropriate.
-
-	* component-factory.c (mail_load_storages): Unref the store
-	regardless of whether or not we're using it, so we don't leak
-	references to non-storage stores.
-
-2000-12-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (e_mail_address_new): Perform better
-	error-handling.
-
-2000-12-01  Radek Doulik  <rodo@helixcode.com>
-
-	* mail-ops.c (mail_op_report_status): use mail_op_set_message_plain
-
-	* mail-threads.c (mail_op_set_message_plain): plain version of
-	mail_op_set_message, doesn't use printf, passes message untouched,
-	use set_message
-	(mail_op_set_message): set_message
-	(set_message): helper function
-	
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (cleanup_fetch_mail): Don't display a dialog, instead
-	inform the user that there was no new mail by setting a status
-	message.
-
-	* message-list.c (message_list_drag_data_get): Use the new
-	e_str_make_safe function.
-
-	* mail-display.c (make_safe_filename): And here.
-
-	* mail-config.c (mail_config_folder_to_cachename): Here too.
-
-2000-11-30  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-ops.c (cleanup_load_folder): Set threaded view before
-	setting the folder (cleanup some flash ons tartup).
-
-	* message-list.c (message_list_init): Initialise a mempool for uid
-	string storage.
-	(new_id_from_uid): Added messagelist arg, allocate strings from
-	uid_pool.
-	(new_id_from_subject): Same.  Fixed all callers.
-	(remove_node_diff): Dont free uid here.
-	(build_flat_diff): Nor here.
-	(clear_tree): Flush the mempool, rather than freeing the id's
-	directly.
-	(free_tree_ids): Removed, no longer required.
-	(free_tree_ids): Likewise.
-	(message_list_init): Dont connect to the table destroy signal
-	anymore to free the uid table.
-	(message_list_destroy): Free the uid pool here.
-	(*): Use accessors for messageid stuff.
-	(content_is_attachment): Removed, no longer required.
-	(ml_tree_value_at): Get the attachment flag directly from the
-	summary.
-	(ml_tree_value_at): For 'fake' nodes, try and do something better
-	than "?" for from, to, and size.
-	(subtree_size): New function, add up the total size of a subtree.
-	(subtree_earliest): Get the earliest date from a subtree.
-	(ml_tree_value_at): Return earliest date sent/received for fake
-	nodes.
-	(ml_tree_value_at): Return something to mark a fake subject line
-	as a fake subject, although i dont know, i guess this buggers up
-	sorting ...
-	(subtree_size): Check the info node is still there.
-	(subtree_earliest): Same here.
-	(subtree_unread): And here.  The info node might vanish if the
-	folder has changed/is changing and we try and redraw stuff while
-	its doing it.
-	(message_list_drag_data_get): Use accessors.
-
-2000-11-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (message_list_drag_data_get): Implement.
-	(message_list_init): Connect the d&d signal.
-
-	* mail-ops.c (do_save_messages): Use camel a bit more to help us
-	out. Don't create the file ourselves, treat it as a CamelFolder so
-	we don't have to worry about formatting.
-
-2000-11-29  Dan Winship  <danw@helixcode.com>
-
-	* main.c (main): Remove no-longer-needed e_unicode_init.
-
-	* mail-tools.c (mail_tool_quote_message): Fix the allocation here
-	(again) and put a comment explaining it. (Fixes a crash when
-	replying.)
-
-2000-11-28  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c (owner_set_cb): Wait until after setting up
-	the local storage to find the Drafts/Outbox/Sent folders.
-
-	* mail-ops.c (do_setup_folder): Use the file: store rather than
-	mbox:.
-
-2000-11-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Added the SaveAs bonobo menu verb
-	thingy.
-
-	* mail-callbacks.c (save_msg): New callback for saving messages.
-	(save_msg_ok): 
-
-	* folder-browser.c (on_right_click): Add a Save As menu item.
-
-	* mail-ops.c (cleanup_save_messages): Save all emails to the path
-	given.
-
-2000-11-28  Dan Winship  <danw@helixcode.com>
-
-	* mail-local.c (cleanup_register_folder): Fix the initial unread
-	counts after the last patch.
-
-2000-11-27  Dan Winship  <danw@helixcode.com>
-
-	* mail-local.c (local_folder_changed): This needs to run from the
-	main thread, not the camel thread, so add a proxy signal handler
-	to call mail_op_forward_event. Fixes hangs (eg bugzilla #909).
-
-2000-11-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-display.c: Removed some unecessary debugging printf's
-
-2000-11-27  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-druid.glade: Revert the new druid for now, until the
-	corresponding code is done, so that the druid will work again.
-
-2000-11-21  Iain Holmes  <iain@helixcode.com>
-
-	* mail-config-gui.c (mail_config): Don't use the "delete-event"
-	signal.
-
-2000-11-21  Iain Holmes  <iain@helixcode.com>
-
-	* mail-display.c (pixbuf_for_mime_type): free fm_icon.
-
-	* component-factory (summary_fn): Remove the configure param.
-	(factory_destroy): Made into a generic function so that the
-	summary_factory can be ref-counted as well as the normal
-	factory.
-
-2000-11-21  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: add GPGME_CFLAGS and GPGME_LIBS
-
-2000-11-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (mail_config_view_source): New function to return
-	if user wants to view message source.
-	(mail_config_set_view_source): New function to set whether the
-	view wants to view source.
-
-	* mail-ops.c (mail_do_view_message_sources): Removed. We're not
-	gonna view-source this way anymore.
-
-	* folder-browser-factory.c: Removed the ViewSource bonobo verb
-	from the Message menu.
-	(control_activate): Added ViewSource.
-
-	* folder-browser.c (on_right_click): Removed Message menu item to
-	view message source.
-	(folder_browser_toggle_view_source): New callback to set whether
-	or not the MailDisplay shows the raw message or the pretty-ified
-	message.
-
-	* mail-callbacks.c: Removed view_source.
-
-	* mail-display.c (redisplay): If toggle_raw is set then display
-	the raw message else display the pretty formatted message.
-	(mail_display_redisplay): New function to force the redisplay of a
-	message.
-
-	* mail-format.c (mail_format_raw_message): New function to
-	write the raw message data.
-
-2000-11-21  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-vfolder.c (vfolder_uri_to_folder): IF we dont find a
-	source, clear the exception and ignore it silently.  for e.g. if
-	the user reconfigured their mailboxes and one of them no longer
-	exists.
-	
-2000-11-21  Radek Doulik  <rodo@helixcode.com>
-
-	* mail-display.c: #include <gtkhtml/gtkhtml-embedded.h>
-
-2000-11-21  Not Zed  <NotZed@HelixCode.com>
-
-	* message-thread.[ch]: Removed.  No longer serves a purpose.
-	
-	* Makefile.am (evolution_mail_SOURCES): Removed message-thread.[ch].
-
-	* message-list.c (build_subtree):
-	(node_equal): 
-	(add_node_diff): 
-	(build_subtree_diff): 
-	(do_regenerate_messagelist):
-	(cleanup_regenerate_messagelist): Changed to use camel-folder-thread.
-	(message_list_set_folder): If we get set a new folder, unhook any
-	events before unrefing the folder too (the folder is never reset
-	currently, but this would cause problems).
-	(subtree_unread): Check for uid null, wont crash, but its a bug.
-	(ml_tree_value_at): If the uid is null, then fake an obviously bad
-	line.
-	(build_subtree): Yeah well, we can't like freeze/thaw here,
-	because this is called recursive, and freeze/thaw isn't
-	recursive, like pre model and post model change was.
-	(build_tree): Maybe we can try it here, although i dont think
-	it'll help much.
-	(build_flat): And this is also a tree.  yes a tree.
-	(build_tree): Added changes arg.  If set, then try the 'diff'
-	approach, unless the tree is already empty.
-	(message_list_set_threaded): Dont clear the tree here.
-	(message_list_set_search): Or here.
-
-2000-11-20  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (save_node_state): Save out the md5 hash of the
-	messageid as hex, since thats all we have for those nodes.
-	(build_subtree): Expand the messageid to a hex string first, then
-	check it.
-	(add_node_diff): And the same here.
-
-	* message-thread.c (thread_messages): Changed for changes to
-	messageid/references items.
-	(id_hash, id_equal): New functions to hash on the binary message id hash.
-	(thread_messages): removed some more no longer used dead code.
-
-2000-11-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (e_mail_address_compare): New comparison function
-	that will replace address_compare if/when we ever go to save the
-	preparsed addresses in the ETable rather than parsing them each
-	time. Also fixed it so that we should get better sorting when
-	addresses don't contain name parts (I was checking for NULL but
-	not '\0').
-	(address_compare): Use e_mail_address_compare.
-
-2000-11-19  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (update_changed_folders): Instead of making the CORBA
-	call in the dispatch thread, store the new display names and have
-	cleanup_fetch_mail make the CORBA calls. Fixes deadlocks.
-	(cleanup_fech_mail): Loop through the update_infos and make the
-	CORBA calls.
-	(setup_fetch_mail): Clear some new data items.
-
-2000-11-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Use the new quote_message
-	function and make it start with "On %s, %s wrote:" since people
-	seem to want that.
-
-	* mail-ops.c (cleanup_forward_messages): Use the new quote_message
-	function.
-
-	* mail-tools.c (mail_tool_quote_message): New convenience function
-	to quote a message body (since both the reply and forward code do
-	similar quoting)
-
-2000-11-17  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_destroy): Before we destroy
-	ourselves, unhook ourselves from the folder update events.  Should
-	fix a common crash on exit case.
-
-2000-11-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Added the MessageViewSource bonobo
-	menu verb.
-
-	* mail-ops.c (mail_do_save_messages): New async function to save
-	messages as individual files in a given path.
-
-2000-11-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Added a new Forward as Attachment
-	bonobo menu item verb.
-
-	* mail-view.c (view_forward_msg): Updated to reflect changes to
-	mail_do_forward_message(). It now forwards the message without
-	attaching it - is this what we want?
-
-	* mail-ops.c (mail_do_view_message_sources): New async function to
-	display message source dialog windows.
-	(setup_forward_messages): If we were asked not to forward the
-	message(s) as attachment(s) and the user chose more than a single
-	message, then default to making each message an attachment.
-	(cleanup_forward_messages): If we aren't forwarding the message as
-	an attachment, then quote the text and set the composer's body
-	with it.
-
-	* mail-callbacks.c (view_source): New callback to view the message
-	source of all messages that are currently selected.
-	(forward_attach): New callback to forward a message as an
-	attachment (forward_msg is now for forwarding a message without it
-	being an attachment).
-	(forward_message): Convenience function for forwarding messages.
-
-2000-11-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* subscribe-dialog.c (subscribe_do_subscribe_folder): Take a
-	'subscribe' argument so that this can function as a subscribe AND
-	unsibscribe method.
-	(describe_subscribe_folder): Updated.
-	(do_subscribe_folder): Updated.
-	(cleanup_subscribe_folder): Updated.
-	(subscribe_folder_info): Pass along a TRUE as the 'subscribe'
-	param.
-	(unsubscribe_folder_info): Pass along a FALSE as the 'subscribe'
-	param.
-
-2000-11-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Removed some e_table_model calls and replaced
-	them with e_tree_model calls.
-
-2000-11-12  Dan Winship  <danw@helixcode.com>
-
-	* mail-local.c (mail_do_register_folder): Do this the normal way
-	rather than calling mail_operation_wait_for_finish. There was some
-	reason for it originally, but it no longer applies. This makes
-	adding new folders from the folder selection dialog no longer
-	hang.
-
-2000-11-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_filter_ondemand): Sync the source folder.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* evolution-mail.oafinfo:
-	* mail-threads.c: (retrieve_shell_view_interface_from_control):
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-11-10  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am ($(EVOLUTION_MAIL_CORBA_GENERATED)): sort include order.
-
-2000-11-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* subscribe-dialog.glade[.h]: New glade file for possibly using to
-	create the subscribe dialog.
-
-2000-11-08  Radek Doulik  <rodo@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): likewise
-
-	* mail-callbacks.c (create_msg_composer): added send_html arg to
-	e_msg_composer_new_with_sig_file call
-
-2000-11-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-search-dialogue.c (mail_search_dialogue_construct): Allow
-	rule part to expand when the user resizes the dialog.
-
-2000-11-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (search_save): Don't handle custom searching
-	anymore... we don't want this.
-	(search_full): Same.
-	(folder_browser_search_menu_activated): Set the search entry
-	widget sensitive.
-	(folder_browser_search_query_changed): Same.
-
-2000-11-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (search_full_clicked): Updated to use the
-	ESearchBar object rather than the previously used search widgets.
-	(search_full): Same.
-	(search_save): Same. Also use enums to make it a little easier to
-	read now that we have to have enums anyway.
-	(folder_browser_search_menu_activated): New ESearchBar menu
-	callback.
-	(folder_browser_search_query_changed): New ESearchBar query
-	callback. Replaces search_set()
-	(folder_browser_clear_search): Updated to use the ESearchBar
-	object rather than the previously used search widgets.
-	(folder_browser_gui_init): Don't hand construct a search widget,
-	use the new ESearchBar convenience widget.
-
-	* mail-ops.c (cleanup_load_folder): Updated to reflect changes to
-	FolderBrowser.
-
-2000-11-07	Jesse Pavel   <jpavel@helixcode.com>
-
-	* mail-display.c (pixmap_press): modified some of the EPopupMenu
-	structures to account for differences in the popup menu API (as
-	informed by Jeff. 
-	(on_object_requested): passed the user's default email address
-	to the iTip control.
-
-2000-11-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add the composer dirs.
-
-2000-11-07  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-display.c (on_object_requested): God, I sure wish people
-	would listen when i'm saying i'm changing and API. I mean
-	I even mailed everyone and everything.  Can't see any changelog
-	either.
-	
-2000-11-06  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-autofilter.c (rule_from_message): Updates for api changes.
-
-	* mail-tools.c (mail_tool_generate_forward_subject): Fixed for api
-	changes.  Sigh, whoever wrote the multithread code of the mailer,
-	had little idea.  You can't just lock for getting a const value,
-	until you are finished with it, cause the owner still owns it.
-	Fixed this too.  Yuck, what a horrid forwarding format, can we
-	change this, or make it configurable?  The mail headers show who
-	forwarded it, we dont need to duplicate it in that UGLY subject.
-
-	* mail-format.c (write_field_to_stream): Removed some jeffness.
-	dont g_strdup stuff we dont need to, and remove the
-	value_is_encoded thing since we can get the unencoded address
-	now.
-	(write_address): New function to write an address field.
-	(write_headers): Uses write_address to write addresses, cleaner,
-	fixed the god-awful unreadable indenting too.
-	(handle_text_plain): Use a 'smarter' printf format, so we dont
-	need to allocate and copy substrings unecessarily (esp since
-	they're about to be allocated any copied another few times
-	anyway *sigh*).
-	(write_field_to_stream): Commented out the isprint check, which
-	afaik serves no purpose.
-	(list_add_addresses): New function to build a list of
-	display-ready addresses.  Although I think the composer then uses
-	these as internet-ready addresses.  It should probably take a list
-	of CamelAddress's if thats what it wants.
-	(mail_generate_reply): Cleaned up the address list creation stuff
-	a heap, and fixes for camel api changes.  Also fixed a small
-	memory leak as a side effect (fulladdr wasn't freed if it was the
-	same as the sender).
-
-	* mail-display.c (on_object_requested): Changed for interface
-	changes to the from address.  I think passing the encoded
-	(internet version) of the address is right here.
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (on_right_click): Move filter stuff into a
-	submenu of the popup menu.
-
-2000-11-06	Jesse Pavel   <jpavel@helixcode.com>
-
-	* mail-display.c: used Camel to parse the full address before
-	passing the email address to my iTip control.
-
-2000-11-06  Dan Winship  <danw@helixcode.com>
-
-	First draft of folder tree unread message indication for /local
-	mail folders.
-	
-	* mail-local.c: Add a new CamelStore subclass, MailLocalStore,
-	which attaches to an Evolution_LocalStorage on one side and
-	CamelSession on the other, and keeps track of local folders. Some
-	of this code was previously in mail-local-storage.c, which no
-	longer exists.
-	(local_reconfigure_folder, etc): Various mail_op-related cleanups,
-	and wrap d() around a bunch of printfs.
-
-	* mail-tools.c (mail_tool_get_local_inbox_url,
-	mail_tool_get_local_movemail_url): Removed
-	(mail_tool_get_local_inbox): Simplified.
-	(mail_tool_do_movemail): Remove unused dest_url variable.
-	(mail_tool_uri_to_folder): Simplify. Now down to two cases
-	(vfolder, and everything else).
-
-	* component-factory.c (owner_set_cb): Pass evolution_dir to
-	mail_local_storage_startup.
-
-	* Makefile.am (evolution_mail_SOURCES): Remove
-	mail-local-storage.[ch]
-
-	* mail-summary.c: Remove mail-local-storage.h include
-
-2000-11-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* mail-autofilter.c: Fix up #include <config.h>
-	* mail-crypto.c: Same here.
-	* mail-search-dialog.c: Here too.
-	* main.c: Fix indentation of #ifdef
-	* message-thread.c: Fix include.
-	
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (delete_msg): Don't invert the flag.
-	(undelete_msg): Same (when multiple messages are selected).
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Updated to have the same menu items as
-	the new right-click menu - eventually these 2 menus should be the
-	same.
-
-	* folder-browser.c (on_right_click): Now correctly handles the
-	case of multiple selection.
-
-	* mail-callbacks.c (enumerate_msg): Make public so it can be used
-	in other source files (it's a useful function!)
-
-2000-11-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (on_right_click): Added an "Undelete" option to
-	the right-click menu and also set a mask so it was only selectable
-	if the message is marked as deleted. Also set a mask for "Mark as
-	Read" and "Mark as Unread".
-
-	* mail-callbacks.c (undelete_msg): New callback to undelete
-	messages.
-
-2000-11-03  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (cleanup_regenerate_messagelist): don't free the
-	MessageList search when it's being reused
-
-2000-11-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-local.c (mail_local_map_uri): Don't show the passwd in the
-	url string.
-	(mail_tool_local_uri_to_folder): Same.
-	(do_reconfigure_folder): Same.
-
-2000-11-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: Added new header files.
-	
-	* component-factory.c (owner_set_cb):
-	s/session_init/mail_session_init
-
-	* session.c: Renamed public functions to mail_session_*.
-	FIXME: Rename session.c to mail-session.c
-
-	* folder-browser-factory.c: #include "mail-callbacks.h", #include
-	"mail-session.h" and replace forget_passwords with
-	mail_session_forget_passwords
-
-	* mail.h: Move session prototypes to mail-session.h, Move
-	mail-crypto prototypes to mail-crypto.h, Move mail-callback
-	prototypes to mail-callbacks.h
-
-	* mail-session.h: New header file containing public prototypes
-	for session.c
-
-	* mail-format.c: #include "mail-crypto.h"
-
-	* mail-view.c: 
-	* folder-browser.c: #include "mail-callbacks.h"
-
-	* mail-crypto.h: New header file containing public prototypes
-	for mail-crypto.c
-
-	* mail-callbacks.h: New header file containing public prototypes
-	for mail-callbacks.c
-
-	* message-list.c (message_list_get_layout): Set useful defaults.
-	(message_list_setup_etable): Don't set the Outbox defaults on a
-	folder just because it doesn't have a corresponding saved file.
-
-2000-11-03  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c (service_page_item_new): url_flags are now on
-	CamelProvider, not CamelService
-
-	* main.c: 
-	* subscribe-dialog.c: 
-	* mail-threads.c: Kill warnings
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Clean the idl-generated files properly.
-
-2000-11-03  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-view.c: Added mail-display.h.
-
-	* mail-autofilter.c: Removed unecessary headers.  Who ran indent
-	over this code?  Sigh.
-
-	* mail-ops.c (display_message_input_s): Added messagedisplay.
-	(mail_do_display_message): Added messagedisplay arg.
-	(mail_do_display_message): Dont bother doing another thread when
-	we know we dont have a uid.
-	(): Added folder-browser.h to headers.  Sigh.
-
-	* folder-browser-factory.c (control_activate): Setup the
-	viewthreaded callback to the folder_browser function.
-
-	* folder-browser.c (my_folder_browser_init): Connect to
-	right_click of etable of the messagelist here.
-	(on_right_click): Changed for argument changes.
-	(folder_browser_toggle_threads): Changed to take a fb, and to set
-	threaded mode on the messagelist.
-	(my_folder_browser_init): Connect also to the double_click signal.
-	(my_folder_browser_init): Connect to the message_selected signal
-	of the message_list.
-	(on_message_selected): Signal handler for message selected.
-	(my_folder_browser_init): Fix for change to message_list_new().
-
-	* message-list.h: Dont include folder-browser.h.
-	(message_list_toggle_threads): Moved into folder-browser.h.
-	(struct _MessageList): Removed folderbrowser.
-
-	* mail.h: Dont include folder-browser.h here either, but
-	mail-types.h instead.
-	Moved prototypes moved into folder-browser.c into
-	folder-browser.h. (vfolder_*, filter_*).
-
-	* mail-display.h: Dont include folder-browser.h here, but
-	mail-types.h and specific camel headers.
-
-	* message-thread.c (sort_node): Invert the sort order logic so the
-	list is sorted in mailbox order, not reverse mailbox order.
-
-	* message-list.c (free_tree_ids): Fix a merge foo.
-	(remove_node_diff): Removed unused row argument.  Fixed
-	callers/prototype.
-	(clear_tree): pre_change on the removal of the root node.
-	(build_flat): Only perform pre_change if we are rebuilding the
-	whole lot.  For incremental change let etable do its thing.
-	(build_tree): Likewise for building the tree view.  If making
-	incremental updates, do them as we build it.
-	(vfolder_subject):
-	(vfolder_sender):
-	(vfolder_recipient):
-	(filter_subject):
-	(filter_sender):
-	(filter_recipient):
-	(filter_mlist):
-	(on_right_click): Moved to folder-browser.c, where they belong.
-	(message_list_init): Dont connect to right_click anymore.
-	(message_list_toggle_threads): Moved to folder-browser.c, renamed.
-	(on_double_click): Moved to folder-browser.c
-	(on_click): Set the flags directly, rather than in anothre thread,
-	which is just not necessary.
-	(message_list_class_init): Added a new signal 'message_selected',
-	to indicate when a message was selected.
-	(on_cursor_change_idle): Emit a signal, rather than directly
-	triggering the display update.
-	(select_row): Removed, no longer used.
-	(idle_select_row): And this too.
-	(select_msg): Removed as well.
-	(message_list_select): Emit a signal, rather
-	thandisplaying/clearing the mail-display directly.
-	(mark_msg_seen): Moved to folder-browser.c
-	(message_list_new): Removed folderbrowser argument.
-
-2000-11-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (on_right_click): Sync with message
-	menu. Addresses bugzilla bug #778.
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Turn on draw grid for the main ETable (this may
-	not be working in ETable itself.)
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-threads.c (mail_op_set_message): fmt argument should be
-	const.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	Make "Get Mail" even more functional on IMAP (scans all folders),
-	and do a first cut at folder tree highlighting (for IMAP/news
-	only).
-
-	* mail-ops.c (do_fetch_mail): For imap (sigh, we *still* shouldn't
-	be hardcoding that), rescan the store's folder tree, rescan each
-	changed folder for new messages, and update the shell folder tree.
-	(do_scan_subfolders): Update for component-factory.c changes, and
-	set folder display names and highlights appropriately when
-	building the storage.
-
-	* component-factory.c (add_storage): Make this static (was
-	mail_add_new_storage). Use camel_service_get_name for the name
-	rather than url->host. (Among other things, this lets you use a
-	single machine as both an IMAP server and a news server.)
-	(mail_lookup_storage): Hash storages based on their CamelStore
-	rather than the URL.
-	(factory_destroy): Disconnect each of the CamelStores in the
-	storages_hash.
-
-	* subscribe-dialog.c (cleanup_subscribe_folder): 
-	* mail-vfolder.c (vfolder_refresh): Pass "highlighted" flag to
-	evolution_storage_new_folder 
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (mail_op_report_status): Don't call the default
-	logging function.
-	(do_fetch_mail): Set the logfile and don't pass the logfile to
-	filter_driver_set_status_func - it's purpose has been altered.
-	(do_filter_ondemand): Same.
-
-2000-11-02  Not Zed  <NotZed@HelixCode.com>
-
-        ** Merged in camel-incremental-branch.
-
-	* mail-format.c (mail_get_message_body): Jeff!  Sigh.
-	We should definetly not be strduping the
-	content, it has already been copied and duplicated.  Look at
-	get_data_wrapper_text.
-
-2000-11-01  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.h: add fields search_entry and search_top.
-
-	* subscribe-dialog.c: add mail-ops.c style async operations for
-	getting the store (to remove deadlock in the case where a auth
-	dialog is dismissed at startup and then the subscribe dialog is
-	brought up), and subscribing/unsubscribing to folders.  One case
-	remains, that is getting the list of all folders.
-	(subscribe_search): flesh out this function
-	(build_tree): use the search_top field so we can search for
-	groups/folders.
-	(subscribe_dialog_destroy): free search_top.
-	(subscribe_dialog_construct): init search_top.
-
-2000-10-30  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (generate_folder_summaries): Fix spelling :)
-	Set folder->uri to NULL for the Inbox.
-
-2000-10-26  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (generate_html_summary): Add view:// uris to 
-	switch the display to that folder.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Hmmm, someone can't spell Filder,
-	er...I mean Filter ;-)
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-autofilter.c (rule_from_message): If the name is NULL or
-	empty, then set the title to "Mail from <address>". Closes
-	bugzilla bug #777. Also when filtering on Subject, set the file
-	name to "Subject is <subject>" rather than just "<subject>" - I
-	think this is a bit more user-friendly.
-	(strip_re): Use unsigned char when passing to is<type>()
-	functions from ctype.h.
-	(rule_add_subject): Use the "is" rule instead of "contains".
-
-2000-11-01	Jesse Pavel   <jpavel@helixcode.com>
-
-	* mail-display.c: added property bag support for Bonobo
-	controls, support which helps only the iTip control, currently.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (pixbuf_gen_idle): Lots of fixes and
-	simplifications. Should get rid of the "missing icon" problem.
-	There is still a problem with some images failing to get
-	thumbnails, even though they display correctly.
-	(pixbuf_for_mime_type): New function to try really hard to get the
-	right icon for a MIME type, including looking in mc and nautilus's
-	pixmap directories.
-	(on_object_requested): Always use pixbuf_gen_idle, even for
-	non-image types, to prevent code duplication.
-
-2000-10-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_get_message_body): Shouldn't we be
-	strdup'ing the content? This seems to fix the memory corruption
-	problems.
-	(mail_generate_reply): Make sure that the last char in the
-	generated reply text is '\0' (when body text doesn't end with a
-	\n, a random char will appear otherwise).
-
-2000-10-31  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c (do_test_service): Update for
-	camel_service_disconnect change.
-
-2000-10-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-autofilter.c (filter_gui_add_for_mailing_list): Match "is"
-	rather than "contains" now that we have the "is"-rule.
-
-2000-10-30  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c (config_do_query_authtypes): Redo this so that
-	it works for all pages, not just the first page. (Now that this is
-	finally working again, I expect Anna to finish her redesign in the
-	next 15 minutes.)
-	(service_page_item_new): Fix up the sizing of the Auth line to
-	look more like everything else.
-
-2000-10-29  Dan Winship  <danw@helixcode.com>
-
-	* mail-tools.c (mail_tool_uri_to_folder): Simplify this a lot by
-	making IMAP and NNTP use the same code, now that the IMAP
-	namespace doesn't need special magic handling.
-
-	* message-list.c (mail_do_regenerate_messagelist): Don't try to
-	regenerate the message list if there is no folder. (The Bonobo UI
-	code will call this as the callback for the "Threaded View"
-	command.)
-
-	* mail-ops.c (do_fetch_mail): Sync the folder before refreshing so
-	we don't lose flag settings.
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (composer_send_cb): Check to make sure that the
-	recipient list is neither NULL nor a 0-length list of addresses
-	and pop up a dialog letting the user know why we are not allowing
-	him/her to send the message.
-
-2000-10-26  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (write_data_to_file): Don't destroy a dialog
-	after run_and_close'ing it.
-
-2000-10-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (composer_send_cb): Check for the TO recipient
-	list being NULL and don't send.
-
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_send_mail): Don't forget to unref the
-	FilterDriver.
-
-	* mail-callbacks.c (apply_filters): New callback for applying
-	on-demand filters. (removed the old on-demand filters callback).
-
-	* mail-ops.c (do_filter_ondemand): Rewrote to apply "incoming"
-	filters to all selected messages.
-	(mail_do_filter_ondemand): No longer takes a FilterContext
-	argument or a destination folder argument (why did we ever need
-	this last one??) but now takes a uids argument.
-
-	* folder-browser-factory.c: Add a MessageApplyFilters menu item.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.[ch]: Updated for the new ExecutiveSummary code.
-
-	* Makefile.am: Added the summary files and the evolution-services CFLAGS
-	and LIB stuff.
-
-	* component-factory.c: Re-enabled the summary stuff.
-
-2000-10-25  Dan Winship  <danw@helixcode.com>
-
-	* main.c (main): Pass send/postpone signal handler functions to
-	evolution_composer_factory_init.
-
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* subscribe-dialog.c (subscribe_select_all): Implemented.
-	(subscribe_invert_selection): (was unselect_all) Implemented.
-
-2000-10-25  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c: Add a "flagged" column, based on the Camel
-	"flagged" flag, for assigning an arbitrary "hey, I care about
-	this" flag to a message.
-	(ml_tree_set_value_at): Remove
-	(ml_tree_is_cell_editable): No, it's not.
-	(on_click): Handle the read/unread and flagged fields via the
-	click handler. Among other things, this makes it not select
-	a message when you change its read status.
-
-2000-10-24  Dan Winship  <danw@helixcode.com>
-
-	* subscribe-dialog.c (folder_info_subscribed,
-	subscribe_folder_info, unsubscribe_folder_info): Don't prepend "/"
-	to the folder's full_name. Deal with hierarchy in the
-	EvolutionStorage tree better.
-	(storage_tree_path): Helper function to build a storage path from
-	a CamelFolderInfo.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* *: Add some missing _()s and N_()s.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR.
-
-2000-10-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_send_mail): Apply outgoing filters to the
-	message.
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Fixed a possible error in row numberings.  This
-	needs to be changed quite a bit anyway, but this should make
-	things slightly nicer in some cases.
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser.c: Made the top of the folder browser a little
-	prettier.
-
-	* mail-display.c, mail-vfolder.c: Made more dialogs resizable.
-
-2000-10-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-autofilter.c (filter_gui_add_from_message): Don't forget to
-	set the rule source! (eg "incoming", "demand", or "outgoing")
-
-2000-10-22  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* message-list.c (message_list_init): Always display the vertical
-	scrollbar.
-
-	* mail-display.c (mail_display_new): Always display the vertical
-	scrollbar.
-
-2000-10-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.h: #include <camel/camel-folder.h>
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* mail.h: s/BonoboUIHandler/BonoboUIComponent/
-
-	* mail-callbacks.c (run_filter_ondemand): ditto.
-
-	* session.c (forget_passwords): ditto.
-
-2000-10-20  Dan Winship  <danw@helixcode.com>
-
-	* evolution-mail.oafinfo: Declare composer factory.
-
-	* main.c (main): Initialize it
-
-2000-10-19  Chris Toshok  <toshok@helixcode.com>
-
-	* message-list.c (nuke_uids): e-tree-model is now opaque.  use the
-	accessor to get the root node.
-
-2000-10-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c: #include "mail-vfolder.h"
-	(vfolder_edit_vfolders): Don't call the dummy vfolder_edit
-	function.
-
-	* folder-browser-factory.c: s/VFolderEdit/SetVFolder
-
-2000-10-19  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c: (do_fetch_mail): For an imap store, just refresh the
-	INBOX.
-
-	* folder-browser-factory.c (control_deactivate): Don't sync
-	non-existent folders.
-	* message-list.c (nuke_uids): Don't traverse non-existent trees.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (glade_messages): New.
-	(EXTRA_DIST): Add `$(glade_messages)'.
-
-2000-10-19  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c: Clean up some old #if 0 code.
-
-2000-10-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Get the MailConfigIdentity
-	*before* we create a new composer object so that we can set the
-	signature file.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser-factory.c (register_ondemand): kill.
-	(create_ondemand_hooks): die.
-	(control_activate): remove hook.
-
-	* test-mail.c (create_container): kill old UI handler.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Fixed some column widths.
-
-2000-11-02  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (get_message_info): Call get_message_uid to get
-	the uid, save some duplicated code.
-	(folder_changed): Handle the case of a NULL changes input.
-
-	* message-thread.c (thread_messages): Removed pointless
-	variable/assignment 'container'.
-	(thread_messages): Try and cope with duplicate message id's.
-
-2000-11-01  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-callbacks.c (main_select_first_unread): Changed to use 0 as
-	the first row to select a message.
-
-	* mail-ops.h (mail_do_regenerate_messagelist): Removed from
-	header.  This function is no longer public since it is really an
-	internal message-list function.
-
-	* folder-browser.c (search_full_clicked): Call the set_search()
-	function, rather than messagelist_rebuild, which is going private.
-	(search_set): Same here.
-	(folder_browser_clear_search): And here.
-	(etable_key): Call message_list_select() instead of
-	message_list_home and message_list_end.  Removing some odd code
-	duplication.
-
-	* message-thread.c (do_thread_messages): Moved the mail lock to
-	here, rather than locking for each message lookup (which is
-	useless anyway).  This is still not correct either, as the tree
-	references folder data ... but a bit better than it was.
-	(thread_messages): Removed the mail tool lock stuff, lock in
-	higher functions.
-
-	* message-list.h: Added a threaded indicator to the message list
-	itself.
-	(threaded_view): removed a mystery variable.
-
-	* message-list.c (do_regenerate_messagelist): Made the code a
-	little more readable.
-	(build_tree): Fixed argument to be a thread_messages struct, not a
-	container.
-	(cleanup_regenerate_messagelist): Free changeinfo.
-	(mail_do_regenerate_messagelist): If we are adding changes to a
-	flat view, we dont need to goto the other thread at all, so
-	process immediately.
-	(message_list_toggle_threads): Clear the tree if we're changing
-	the view mode.
-	(message_list_toggle_threads): And reset the rowmap, since it is no
-	longer valid.
-	(build_tree): If we are building into an already empty tree, just
-	build into that (probably irrelevant optimisation).
-	(build_subtree): Build hte subtree in the same order as we got it,
-	not inverted order.
-	(message_list_set_threaded): New function to select the threaded
-	view/flat view.
-	(mail_do_regenerate_messagelist): Removed references to
-	mail_config, get it from the ml->threaded var instead.
-	(message_list_destroy): No longer free the key data for the
-	uid_rowmap.
-	(new_id_from_uid): Convert a uid string into an id string.
-	(new_id_from_subject): Likewise for subject strings.
-	 'id' strings replace the 'uid:' and 'subject:' stuff with
-	 accessors and macros and use less memory and is more readable.
-	(id_is_uid): macro to check if an id string is a uid.
-	(id_uid): Returns the uid part of a uid id string.
-	(id_subject): Returns the uid part of a subject id string.
-	(build_subtree): Use the new id functions, and dont duplicate the
-	uid in the uid rowmap, but just reference it from the tree node.
-	(node_equal): Use new id functions.
-	(add_node_diff): And here too.
-	(remove_node_diff): And here.  Also remove the uid from the
-	rowmap, and dont free it anymore.
-	(get_message_info): And here.
-	(get_message_uid): And here.
-	(subtree_unread): And here.
-	(ml_tree_value_at):  "
-	(ml_tree_set_value_at): Noted a memory leak.  do_flag_messages()
-	doesn't free the contents of the uid array, just the uid array
-	(well that i can tell, teh code has more problems anyway).
-	(ml_tree_set_value_at): And fix the id accessors.
-	(save_node_state):  " 
-	(build_flat): Use id macros/functions.  Dont alloc memory for hash
-	key.
-	(build_flat_diff): Use id macros.
-	(build_flat_diff): Remove the hash table entry before freeing its
-	key data (in the node).
-	(free_key): Removed.  Keys are no longer alloc'd.
-	(clear_tree): When we clear the tree, also clear the uid_rowmap,
-	as it is no longer valid (or contains allocated keys!).
-	(free_tree_ids): Renamed from nuke_uids.
-	(free_ids_cb): Renamed from nuke_uids_cb.
-	(free_tree_ids): Changed arg to be a ETreeModel directly.
-	(ml_tree_value_at): Map id to subject using the right macro.
-	(free_tree_ids): Check we have any nodes to traverse first.
-	(build_flat): Insert to row -1 to append the nodes (faster).
-	(remove_node_diff): Only remove the uid rowmap entry if it is
-	referencing this node (i.e. the key string is the same key string,
-	not just a matching key string).
-	(add_node_diff): Remove the uid rowmap entry before inserting a
-	new one to force the key to be replaced.  This is required as the
-	tree may temporarily contain duplicate messages during the
-	rebuilding phase.
-	(message_list_set_search): New function, set the search string.
-	Only redo the search if it has changed, etc.
-	(mail_do_regenerate_messagelist): Made static.  There is no need
-	for external code to call this.
-	(message_list_set_folder): NOP if the new folder is the same.
-	(message_list_set_folder): Clear the tree before rebuilding it.
-	(message_list_select): Ok, this wins the award for 'most bizarre
-	interface'.  Changed the start row to mean the end of the list if
-	we supply -1, rather than the start of the list.  Also fixed the
-	endpoints (it would never select message 0 if searching
-	backwards).
-	(idle_select_row): Changed start row to 0 from -1.
-	(message_list_end): Removed.
-	(message_list_home): Removed.
-	(go_to_message): Removed.  message_list_select can do this.
-	(message_list_select): Check that direction is one of the valid
-	ones, otherwise we could be thrown for loops.
-
-2000-10-31  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (node_equal): Compares an etree node with a
-	message-thread node to see if they point to the same object.
-	(add_node_diff): Adds a new thread node to the etree.
-	(remove_node_diff): Removed an etree node, freeing any additional
-	data.
-	(build_subtree_diff): Takes an existing etree definition, and a
-	new thread definition and makes the etree match, using as few
-	operations as possible.
-	(do_regenerate_messagelist): No longer free/clear the uid/rowmap
-	here.
-	(regenerate_messagelist_input_t): Added a tree field - are we
-	building a tree view?
-	(regnerate_messagelist_data_t): Added a tree field, if we built a
-	tree result.  Added a changes parameter, for building diff's after
-	search/etc.
-	(mail_do_regenerate_messagelist): Setup the tree indicator.
-	(build_flat_diff): Apply a changeset to a message list.
-	(build_flat): Added a changes argument, if present, use
-	build_flat_diff() to build the list.
-	(do_regenerate_messagelist): If we are generating a threaded view,
-	build the threaded list here, rather in another separate
-	invocation.
-	(cleanup_regenerate_messagelist): Call build_tree directly on the
-	threaded list.
-	(message_list_init): Init the uid_rowmap hash table here instead
-	of somewhere odd.
-	(message_list_destroy): Assume uid_rowmap exists.
-	(do_regenerate_messagelist): Remove the code here that is messing
-	with the message list data (search/uid_rowmap).  We're in a
-	different thread boys ...
-
-2000-10-26  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (cleanup_regenerate_messagelist): Fixed some
-	logic to make more sense (gboolean)!pointer replaced with
-	(pointer != NULL).
-	(build_tree): Put the tree pre/post change stuff in here, where it
-	should be.
-	(build_flat): Same here.
-	(cleanup_regenerate_messagelist): Remove model_changed stuff here.
-	(setup_regenerate_messagelist): Remove pre_change stuff here.
-
-2000-10-20  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (main_folder_changed): Perform incremental update
-	of the display for flat view.
-	(ml_tree_value_at): Spit out a mroe meaningful warning when we
-	can't find the uid in our tree, in the folder.
-
-	* message-thread.c (thread_messages): Made public.
-	(thread_messages_free): Made public.
-	(thread_messages): Now we also return a struct _thread_messages,
-	which is passed to other functions.
-	(container_free): Renamed from thread_messages_free.
-	(thread_messages_free): Take a thread_messages argument.
-	(thread_messages_add): New function to add a list of uid's to the
-	thread list.
-	(thread_messages_remove): Likewise, for removing them.
-	(cleanup_thread_messages): Change for struct changes.
-	(do_thread_messages): Likewise.
-
-2000-10-19  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-tools.c (mail_tool_do_movemail): removed unused var
-
-	* folder-browser.c (search_full_clicked): Fix for api changes,
-	such as it can be called an api, its mroe an utter mess infact.
-	(search_set): Same.
-	(search_set): And here.
-	(folder_browser_clear_search): And here.
-
-	* message-list.c (folder_changed): Copy and forward the changeinfo
-	list to the mian thread.
-	(main_folder_changed): Free the changeinfo. Todo: something smart
-	with this information.
-	(struct regenerate_messagelist_input_s): Added a changes field.
-	(mail_do_regenerate_messagelist): Added a change list argument.
-	(message_list_set_folder): Fix for mail_do_regenreate_messagelist
-	api.
-	(message_list_toggle_threads): Same.
-
-2000-10-18  Iain Holmes  <iain@helixcode.com>
-
-	* mail-config-gui.c (mail_config): Make all the CLists have passive
-	titles.
-	(identity_dialog): Make the default button the "OK" button, and set
-	the dialog to close on pressing return on the entryboxes.
-
-2000-10-17  Iain Holmes  <iain@helixcode.com>
-
-	* mail-config-gui.c (service_page_item_new): Disable the optionmenu
-	because it is empty.
-	(service_page_item_auth_fill): Enable the optionmenu as there's stuff
-	in it now.
-
-	* mail-callbacks.c (reply_to_sender): Call check_send_configuration
-	when we have the FolderBrowser because if it is done in mail_reply
-	(with passing NULL) it will only be able to continue if the mailer
-	has already been configured.
-	(reply_to_all): Same.
-
-2000-10-18  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (folder_browser_gui_init): No, we REALLY dont
-	want to perform an immediate search as the keys are pressed.
-
-	* mail-display.c (on_object_requested): Kill a minor warning with
-	a cast.
-
-	* mail-config.c: Include mising ctype.h to kill a warning.
-
-	* message-thread.c (main): Fixed the test case for api changes.
-
-	* message-list.c (message_list_drag_data_get): Set some flags to
-	get_folder().  I dont even think this will work because
-	mail_tool_get_folder doesn't handle file url's.
-
-	* mail-vfolder.c (vfolder_uri_to_folder): Pass appropriate flags.
-
-	* mail-ops.c (do_setup_folder): Pass appropriate flags.  Hmm,
-	whats the difference between setup and create.  *shrug*
-	(do_create_folder): Pass appropriate flags to get_folder.  Needs a
-	way to specify the index flag.
-
-	* mail-tools.c (mail_tool_get_folder_from_urlname): Changed create
-	to flags argument.
-	(mail_tool_get_local_inbox_url): Add an index argument.
-	(mail_tool_get_local_inbox): honour index flag.
-	(mail_tool_get_inbox): Changed for api change.
-	(mail_tool_uri_to_folder): Fixed calls to store_get_folder();
-
-	* mail-local.c (load_metainfo): Added an indexed field to the metainfo.
-	(save_metainfo): And save it too.
-	(do_reconfigure_folder): Honour index flag when creating the new
-	folder.  Do not open the old folder with an index at all.
-	(mail_local_map_uri): Add an index argument - tells if the mbox is
-	indexed.
-	(mail_tool_local_uri_to_folder): Create & pass flags properly.
-	(#include gnome.h): Dont include all of gnome, just what we use,
-	and explicity include xml-memory, so we get xmlFree().
-
-2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (search_full_clicked): Un #if 0'd out
-	(search_full): Same.
-	(folder_browser_gui_init): Connect search_full and search_activate.
-	(search_set): Uncomment search_full()
-
-	* Makefile.am: Re-add `mail-search-dialogue.h' and
-	`mail-search-dialogue.c'.
-
-2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Decode recipient names so
-	that they display nicely in the To and Cc fields.
-	(write_field_to_stream): Now takes another argument
-	'value_is_encoded' so that we know if we should decode that string
-	before proceding onward. Since the message subject is already
-	decoded before it's passed in, we don't want to decode it again
-	(wasted cpu time and/or any 8bit chars will be assumed to be
-	latin1 encoded and thus the decoded value will be corrupt).
-
-2000-10-16  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-config-gui.c (service_page_get_url): only set the url->user
-	field if the user string is non-NULL and not empty.
-
-2000-10-16  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_setup_etable): Uh, fixed jeff's
-	wrong fix for setting the speficiation (the function changed to
-	set_state(), as can be seen in the e_table-scrolled_load_state()
-	call only 2 lines above).
-
-2000-10-13  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_setup_etable): oops, chose the
-	wrong thing to cut out after a merge conflict.
-
-2000-10-15  Chris Toshok  <toshok@helixcode.com>
-
-	* message-list.c (subtree_unread): ETreePath != GNode now, use
-	accessors.
-	(ml_tree_value_at): same.
-	(save_node_state): same.
-	(save_tree_state): same.
-	(nuke_uids_cb): convert to e_tree_model_node_traverse required
-	type.
-	(nuke_uids): g_node_traverse -> e_tree_model_node_traverse.
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-mail.oafinfo: Add "evolution:shell-component-icon"
-	attribute.
-
-2000-10-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (message_list_setup_etable): Don't free the
-	service name.
-
-2000-10-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): sync & expunge the source folder
-	after filtering.
-
-2000-10-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (message_list_setup_etable): Create the 'spec'
-	and 'extras' arguments and call e_table_scrolled_new() rather than
-	set_specification as that function no longer (?) exists. 
-
-	Also started to add drag & drop functionality to something like
-	Nautilus (but #if 0'd it out until I had time to finish it and
-	till after 0.6).
-
-2000-10-12  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_setup_etable): Duh, fix the test
-	for the folder name, strstr != strcmp is it.
-
-2000-10-10  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (folder_to_cachename): Removed, changed callers
-	to use mail_config_folder_to_cachename instead.
-
-	* mail-config.c (mail_config_folder_to_cachename): New utility
-	function to get a cache name for a folder.
-
-	* mail-tools.c (mail_tool_do_movemail): Changed to return the path
-	to the mbox, rather than opening a folder of it.
-
-	* mail-ops.c (mail_incorporate_messages): Dont bother making the
-	pseudo messageinfo, filder_driver_filter_message will do it for
-	us.
-	(report_status): Callback to report status of filtering operation.
-	(do_fetch_mail): Changed significantly - for the api changes to
-	the filtering system.  Also now incorporates a mailbox file
-	directly, without having to import it into a camel folder first.
-	(mail_incorporate_messages): Removed entirely, no longer needed.
-
-	* mail-vfolder.c (vfolder_refresh): Fix for context api changes.
-	(vfolder_uri_to_folder): Likewise.
-
-	* folder-browser-factory.c (create_ondemand_hooks): Changed for
-	api changes.  Also only adds demand filters to the menu (fixed a
-	small logic bug).
-
-2000-10-11  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (folder_etree_value_at): special case for
-	folders with NULL urls (which aren't selected/subscribeable).
-	(unsubscribe_folder_info): can't (un)subscribe from folders with
-	non-NULL urls.
-	(subscribe_folder_info): same.
-
-2000-10-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Replace To with From except in Drafts, Outbox,
-	or Sent boxes.  Make Subject column pay attention to text
-	attributes like bold and strikethrough.
-
-2000-10-12  Iain Holmes  <iain@helixcode.com>
-
-	* component-factory.c: Disable the executive summary.
-
-2000-10-11  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (FOLDER_ETABLE_SPEC): set expansion to 0.0,
-	minimum-width to 16, and resizable to false for the subscribed
-	column.
-	(folder_info_subscribed): new function so we can do the correct
-	path munging.
-	(subscribe_folder_info): only add the folder to the storage if
-	there wasn't an exception subscribing it.
-	(unsubscribe_folder_info): same, but unsubscribing.
-	(folder_etree_value_at): use folder_info_subscribed.
-	(folder_toggle_cb): same.
-	(unsubscribe_folder_foreach): same.
-	(subscribe_folder_foreach): same.
-	(subscribe_dialog_gui_init): set the bold column on the text cell,
-	and add the subscribed pixbuf.
-
-2000-10-11 Anna Marie Dirks   <anna@helixcode.com>
-	* mail-threads.c: Changed the password-getting dialog so that the
-	text entry has focus. 
-
-2000-10-11  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (STORE_ETABLE_SPEC): change cell type to
-	"string" since we're not including it in the extras.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h, subscribe-dialog.c: Changed
-	these to use the proper form for the column element.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h, subscribe-dialog.c: Updated
-	these to the new ETable style of specifications.
-
-2000-10-11  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (subscribe_dialog_gui_init): convert to the
-	new gal e-table stuff.
-	(html_size_req):
-	(html_new):
-	(put_html): #if 0 out the html functions since description stuff
-	isn't used and we don't want the warnings.
-
-2000-10-11  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (subscribe_dialog_gui_init): remove the html
-	description stuff for now.
-
-2000-10-10  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (folder_toggle_cb): umm.. duh :) only
-	subscribe if it's not subscribed, and vice versa.
-	(subscribe_folder_foreach): make sure to call
-	e_tree_model_node_changed.
-	(unsubscribe_folder_foreach): make sure to call
-	e_tree_model_node_changed.
-
-2000-10-10  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-ops.c (setup_scan_subfolders): add a ref to input->storage
-	here so that the ref/unref pattern more closely matches other
-	mail-ops.  also, this keeps the storage from being freed when we
-	hit the unref in cleanup_scan_subfolders, which is important
-	because we maintain a reference to it in the storage_hash in
-	component-factory.c
-
-	* subscribe-dialog.h: add storage field.
-
-	* subscribe-dialog.c (subscribe_folder_info): new function,
-	subscribe to a folder given it's CamelFolderInfo, and add it to
-	the shell - we're generating a path from the name of the folder
-	which is bad.
-	(unsubscribe_folder_info): same (except we unsubscribe and remove
-	from the shell).
-	(storage_selected_cb): unref the currently selected storage.
-	(subscribe_dialog_destroy): unref the currently selected storage.
-	(subscribe_dialog_construct): sc->storage = NULL.
-
-	* component-factory.c (mail_lookup_storage): new function, to look
-	up a EvolutionStorage corresponding to a CamelService.  we ref the
-	EvolutionStorage before passing it back.
-	(mail_add_new_storage): insert the storage into storages_hash if
-	result is EVOLUTION_STORAGE_OK.
-
-	* mail.h: add prototype for mail_lookup_storage.
-
-2000-10-10  Larry Ewing  <lewing@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): make sure we dup the return
-	value of get_reply_to or get_from when building the recipient list. 
-
-2000-10-10  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (generate_html_summary): Removed the <li> from the
-	HTML.
- 
-2000-10-10  Cody Russell  <bratsche@gnome.org>
-
-	* mail-threads.c: Added #include <errno.h>
-
-2000-10-09  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c: Removed the extra arguments to rule_context_load.
-
-2000-10-09  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c, subscribe-dialog.h: use our own etable to
-	display the stores, and get them from the mail-config api.  put
-	#if 0'ed code in place to add/remove the folders from the shell
-	when they're subscribed/unsusbcribed.  also, react to double
-	clicks in the folder etable by toggling subscription status.
-
-2000-10-08  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (create_summary_view): Updated to use new icon code.
-
-2000-10-08  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (generate_html_summary): Generic function to 
-	recreate the HTML of the summary. Checks all the folder summaries.
-	(generate_folder_summarys): Create a summary of all the vfolders
-	and the Inbox.
-	(create_summary_view): Generate the folder summarys before the
-	HTML.
-
-2000-10-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser.c: Don't #include "mail-search-dialogue.h" as
-	it's missing from the repository.
-	(search_full_clicked): Temporarily `#if 0'ed out.
-	(search_full): Likewise.
-	(folder_browser_gui_init): Don't connect `search_full'.
-	(create_option_menu): Don't connect `search_menu_deactivate'.
-	(folder_browser_gui_init): Don't connect `search_activate'.
-	(search_set): Don't do `search_full()'.
-	(folder_browser_gui_init): Likewise.
-
-	* Makefile.am (evolution_mail_SOURCES): Remove
-	`mail-search-dialogue.h' and `mail-search-dialogue.c' as NotZed
-	forgot to put them into CVS.
-
-2000-10-06  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-search-dialogue.c: New widget, full search dialogue for
-	mail.
-
-	* folder-browser.c (search_set): If we click on custom search, run
-	the full search dialogue.
-	(folder_browser_gui_init): Add a button to perform a full search.
-	(search_full): Bring up the mail search dialogue asynchronously.
-	(search_full_clicked): Handle search options.
-	(folder_browser_destroy): Free the saved rule if there is one
-	there.
-	(search_options[]): Added a custom option option - brings up the
-	full search dialogue.
-	(search_set): Disable the search entry if we are doing a full
-	search.
-
-	* mail-vfolder.c (vfolder_create_storage): Yay, finally
-	depeterised this stuff.
-	(vfolder_uri_to_folder): Removed an irrelevant comment.
-
-	* mail-callbacks.c (filter_edit): And here.
-
-	* mail-ops.c (do_fetch_mail): And here too.
-
-	* mail-autofilter.c (filter_gui_add_from_message): Fixed call to
-	context_load.
-	(filter_gui_add_for_mailing_list): And here too.
-
-	* folder-browser-factory.c (create_ondemand_hooks): Remove that
-	ondemand callback snot.
-
-2000-10-05  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_init_etable): Build the etable once
-	we know what folder we are going to use.
-	(save_header_state): Save the header spec to a cache file.
-	(message_list_destroy): Save the header spec.
-	(message_list_setup_etable): Setup the etable spec for this
-	folder, from a saved version if one exists, or to suit the folder
-	type (sent/received).
-	(message_list_set_folder): Setup the etable here once we have a folder.
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* message-list.c (message_list_toggle_threads): re-write.
-
-	* folder-browser-factory.c (control_activate): update paths, need
-	CVS HEAD bonobo, use a listener not a verb.
-
-2000-10-08  Miguel de Icaza  <miguel@helixcode.com>
-
-	* mail-ops.c (mail_incorporate_messages): Tag string for translation
-	(do_flag_messages): ditto.
-
-	* mail-threads.c (pipe_write): Repeates writes on EINTRS.
-	(pipe_read): Repeats reads on EINTRS.
-	(mail_operation_queue): Use pipe_write
-	(mail_op_set_percentage): ditto.
-	(mail_op_hide_progressbar): ditto.
-	(mail_op_show_progressbar): ditto.
-	(mail_op_set_message): ditto.
-	(mail_op_get_password): ditto.
-	(mail_op_error): ditto.
-	(mail_op_forward_event): ditto.
-	(mail_operations_terminate): ditto.
-	(dispatch): use pipe_read.
-	(dispatch): use pipe_write
-	(dispatch): ditto.
-
-	* mail-ops.c (mail_incorporate_messages): Only show message being
-	incorporated every 2 seconds, to avoid a bunch of CORBA round trips.
-	(do_transfer_messages): ditto.
-	(do_forward_messages): ditto.
-
-2000-10-07  Miguel de Icaza  <miguel@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Move the functionality to
-	incorporate messages into mail_incorporate_messages.
-	(mail_load_evolution_rule_context): New function.  Move the
-	functionality for loading the context rules to its own function.
-
-2000-10-06  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c: Fix the locking up of the mail by only calling
-	camel functions from the camel thread, and ORBit functions from
-	the GTK thread. Watch for the message-changed signal again.
-
-	* component-factory.c (summary_fn, component_factory_init):
-	Re-enabled it, cos I think it works again.
-
-	* mail-display.h: Remove the pb_cache.
-
-	* Makefile.am: Readd the mail-summary.[ch] files and add the
-	evolution-services library to the link.
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-ops.c (do_scan_subfolders): set the @subscribed_only
-	parameter to TRUE, since the subscribe UI is the only interface
-	that should show unsubscribed groups.
-
-2000-10-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (do_scan_subfolders): Add missing @subscribed_only
-	parameter in the call to `camel_store_get_folder_info()'.  [FALSE,
-	I hope that's right.]
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (write_field_to_stream): Decode the header before
-	writing it to the header box.
-
-	* mail-callbacks.c (send_receieve_mail): fetch mail before
-	sending, this is a temp fix for POP-before-SMTP authentication.
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* component-factory.c (summary_fn, component_factory_init):
-	Disable summary stuff, it appears to be badly broken.
-
-	* Makefile.am (evolution_mail_SOURCES): add mail-summary.[ch]
-
-	* subscribe-dialog.c (update_pixmaps): upd.
-	(set_pixmap): upd.
-	(subscribe_dialog_gui_init): upd.
-	remove redundant and annoying forward definitions.
-
-	* folder-browser-factory.c (control_deactivate): upd.
-	(control_activate_cb): upd.
-	(control_activate): upd.
-	(set_pixmap): upd.
-	(update_pixmaps): upd.
-	(register_ondemand): upd.
-	(create_ondemand_hooks): upd.
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (address_compare): Use CamelInternetAddress
-	instead of my quick hack (aka InternetAddress).
-
-2000-10-05  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c: Don't watch for the message-changed signal.
-
-2000-10-05  Iain Holmes  <iain@helixcode.com>
-
-	* component-factory.c (component_factory_init): Setup the summary
-	factory as well.
-	(summary_fn): New function to create the ExecutiveSummaryComponent.
-
-	* mail-summary.c: Create the view, and update it when something 
-	changes.
-
-2000-10-04  Iain Holmes  <iain@helixcode.com>
-
-	* mail-display.c (on_object_requested): Removed the pixbuf cache
-	as it would return the pixbufs in the reverse order every so often
-	and generally get all confused.
-
-2000-10-04  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_deactivate): Add back the
-	"sync folder on leave" hack that got lost in the UIHandler merge.
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Instead of UnSelectAll, we want
-	InvertSelection.
-
-	* mail-callbacks.c (select_all): Finished this function.
-	(invert_selection): Finished. (was unselect_all - but that's not
-	what we really wanted as it'd be pointless. invert_selection is a
-	much more useful callback :-)
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-tools.c (mail_tool_get_root_of_store): remove news specific
-	check.
-	(mail_tool_uri_to_folder): news: -> nntp:
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* mail-ops.c (do_filter_ondemand): Don't expunge the source
-	mailbox on completion.
-
-2000-10-04  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (do_scan_subfolders): Don't try to add_folders if
-	get_folder_info returned NULL.
-
-2000-10-04  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_init_header): Fix the attachment
-	icon width.
-	(content_is_attachment): Perform some simple tests to see if the
-	message contains an attachment.
-	(build_subtree): Kill a pointless warning.
-
-2000-10-04  Miguel de Icaza  <miguel@helixcode.com>
-
-	* mail-callbacks.c (delete_msg): Added a comment to a piece of
-	code that I was trying to "fix" just to find that the strange
-	behaviour here that was about to be fixed, was actually a fix to
-	the problem I was trying to fix.
-
-	So put the original comments from Dan, and will hope that someone
-	with more knowledge about this can figure why the delete key wont
-	delete messages and select the next unread message.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (subscribe_dialog_destroy): destroy our
-	tree_model and remove the root node.  also, release_unref our
-	control and view, and unref the listener.
-
-	* mail-tools.c (mail_tool_uri_to_folder): news url's contain host
-	names too, now.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c, subscribe-dialog.h: add a
-	storage-set-view-listener, and add a little printf saying what
-	storage was selected.
-	
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (subscribe_dialog_gui_init): get
-	Evolution::StorageSetView interface on our storage set view
-	control, and set "show_folders" to FALSE.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (INCLUDES): add -I$(top_srcdir)/widgets/misc
-
-	* subscribe-dialog.c (subscribe_dialog_gui_init): change the
-	window title to Manage Subscriptions, bold subscribed folders, and
-	add a title bar ala the evolution shell (but without the close
-	button).
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.h: add fields for the storage set
-	Bonobo_Control and Evolution_StorageSetView interfaces.
-
-	* subscribe-dialog.c (subscribe_dialog_gui_init): create the uih
-	as early as possible, and add the storage set view to the left
-	side of the hpaned.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser-factory.c (set_pixmap): upd.
-	(control_activate): upd.
-
-2000-10-02  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c: Remove "Port" entry from source dialog. We'll
-	use "host:port" like Netscape and other programs do.
-	(service_page_get_url): If host ends in ":###", use that as port.
-	(service_page_set_url): If URL contains a port, append it to the
-	hostname, separated by a colon.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (evolution_mail_SOURCES): subscribe-control.[ch] ->
-	subscribe_dialog.[ch]
-
-	* mail-callbacks.c (manage_subscriptions): subscribe_control ->
-	subscribe_dialog.  Also, pass the shell to subscribe_dialog_new.
-
-	* mail-types.h: SubscribeControl -> SubscribeDialog.
-
-	* subscribe-dialog.c, subscribe-dialog.h: rename from
-	subscribe-control.[ch].
-
-	* subscribe-dialog.c (subscribe_dialog_construct): pass
-	Evolution_Shell in.
-	(subscribe_dialog_new): takes Evolution_Shell argument now.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* message-list.c (message_list_init_renderers): remove the 2 tree
-	pixbufs, so adjust the offsets to the score pixbufs.  also, pass
-	NULL for the open/closed pixbufs to the tree cell renderer.
-
-2000-10-02  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (mail_do_scan_subfolders, etc): Update for
-	CamelFolderInfo changes.
-
-	* message-list.c (message_list_destroy): Don't save_tree_state if
-	there's no folder associated with the MessageList.
-
-	* folder-browser.c (folder_browser_set_uri): Only call
-	mail_do_load_folder if the URI is not "".
-
-2000-10-02  Iain Holmes  <iain@helixcode.com>
-
-	* mail-display.[ch]: Add a cache for the pixbufs, hashed on CID,
-	so that we only have to make a thumbnail once.
-
-2000-10-01  Iain Holmes  <iain@helixcode.com>
-
-	* mail-display.c: Generate the thumbnails on an idle function so
-	that the user interface isn't locked. Checks in case the widget it
-	will use to display the image isn't destroyed.
-
-2000-10-01  Iain Holmes  <iain@helixcode.com>
-
-	* mail-display.c (on_object_requested): If the attachment is an
-	image display a thumbnail of it, instead of the generic image
-	icon.
-
-2000-09-29  Miguel de Icaza  <miguel@helixcode.com>
-
-	* folder-browser-factory.c: Add print preview verb here.
-
-	* mail-callbacks.c (do_mail_print): Handle printing here, the
-	complete engine.
-	(mail_print_preview_msg): new. does print previewing.
-	(mail_print_msg): does printing of the message.
-
-2000-09-29  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-control-factory.c, subscribe-control-factory.h: nuked.
-	
-	* subscribe-control.c, subscribe-control.h: lots of changes.  we
-	now pop up a dialog, and will have a storage set view on our left
-	side, like the shell does.
-
-	* mail.h: add prototype for manage_subscriptions.
-
-	* mail-callbacks.c (manage_subscriptions): new function, pops up
-	the subscribe dialog.
-
-	* folder-browser-factory.c: add the verb for managing
-	subscriptions.
-
-	* Makefile.am (evolution_mail_SOURCES): add subscribe-control.[ch]
-	again.
-
-2000-09-28  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-control.h (subscribe_search): added prototype.
-
-	* subscribe-control.c (subscribe_search): new function.
-
-	* subscribe-control-factory.c (make_folder_search_widget): new
-	function, to add search widget to toolbar.
-	(control_activate): create the search widget and add it to the
-	toolbar.
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_send_queue): Messages should be appended to Sent
-	as Seen.
-	(do_send_mail): Same.
-
-2000-09-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: Don't compile `subscribe-control' for now.  It
-	needs to be converted to the new UI handler code in Bonobo; it
-	doesn't compile right now.
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-control.c (subscribe_refresh_list): new function.
-
-	* subscribe-control.h (subscribe_refresh_list): new prototype.
-
-	* subscribe-control-factory.c (update_pixmaps): add RefreshList
-	pixmap.  also, add it to the verbs list.
-	
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-types.h: add SubscribeControl typedef.
-
-	* Makefile.am (evolution_mail_SOURCES): add the subscribe stuff.
-
-	* subscribe-control-factory.h * subscribe-control-factory.c *
-	subscribe-control.c: * subscribe-control.h: Mostly mocked up
-	subscribe ui.
-
-2000-09-27  Jeffrey Stedfast  <fejj@helixcode.com>
-	Note: We need a configuration option to specify whether to log
-	filtering actions or not.
-
-	* mail-ops.c (do_filter_ondemand): Updated to pass a log file
-	pointer to filter_driver_run.
-	(do_fetch_mail): Same.
-	(mail_do_fetch_mail): Fixed a compiler warning.
-
-2000-09-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (composer_postpone_cb): Fix it so that "send
-	later" will still mark a message as being replied, forwarded,
-	whatever. Closes bug #568 on bugzilla.
-
-2000-09-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_filter_ondemand): If the message has been
-	deleted, don't try filtering it - skip to the next message.  Fixes
-	bugzilla bug #639.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Shuffling (un)select all menu items to
-	the Edit menu.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Added new menu items
-	
-	* mail-callbacks.c (mark_as_seen): New callback to mark all
-	selected messages as Seen.
-	(mark_as_unseen): New callback to mark all selected messages as
-	Unseen.
-	(select_all): New callback to select all messages (not yet
-	finished)
-	(unselect_all): New callback to unselect all messages (not yet
-	finished)
-
-2000-09-25  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (folder_to_cachename): Function to convert a
-	folder name/path to a filename for per-folder data.
-	(save_tree_state):
-	(load_tree_state):
-	(free_tree_state): For loading/saving the state of the expansion
-	of nodes in the tree.
-	(message_list_destroy): Save the tree state when done.
-	(save_node_state): Changed logic, we save when the node should be
-	closed on startup.  i.e. any new nodes with children automatically
-	default to being open.
-	(subtree_unread): Check for unread messages in a subtree.  So
-	false messages (for tree roots) are properly displayed.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (address_compare): Updated to use Nat's
-	ENameWestern parser.
-
-	* Makefile.am: link against e-util/ename/libename.la
-
-2000-09-25  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c: CamelException is not for compile-time errors.
-	Replace lots of argument checks in setup_ functions with
-	g_return_if_fails in the public functions. Also remove some
-	prototypes that weren't needed because they were for static
-	functions that are defined before they're used.
-
-2000-09-23  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser-factory.c (set_pixmap): upd.
-	(control_activate): upd.
-
-2000-09-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* message-list.c (internet_address_new_from_string): Skip spaces
-	at the beginning of the string first before doing anything else.
-	The code that follows doesn't like the first character of the
-	string to be a space.
-
-2000-09-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (address_compare): New comparison function for
-	email addresses.
-	(subject_compare): New comparison function for message subjects.
-	(message_list_init_header): Updated to use the new compare funcs.
-
-2000-09-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Fixed some memory
-	leakage. Call free_recipients() so we don't leak memory.
-
-2000-09-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_scan_subfolders): Use the folder's full_name so
-	recursive directory structures display correctly ;-)
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (do_scan_subfolders): Update for CamelFolder changes
-	(subfolder_names -> subfolder_info).
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* mail-callbacks.c (create_msg_composer, compose_msg, send_to_url,
-	mail_reply, forward_msg): * mail-format.c (mail_generate_reply): *
-	mail-ops.c (cleanup_edit_messages):
-
-	* mail-view.c (view_forward_msg): Deal with NULL composer.
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* main.c (main): Call gnome_vfs_init() since the composer now does
-	file operations (to get the MIME type of attachments).
-
-2000-09-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c: Removed COL_ONLINE_STATUS because we don't want
-	that. Renamed COL_PRIORITY to COL_SCORE and set it up to sort-of
-	work, I'm not really sure which renderer I should use.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* component-factory.c, folder-browser-factory.c, folder-browser.c,
-	mail-callbacks.c, mail-config-gui.c, mail-display.c,
-	mail-display.h, main.c, message-list.c, message-list.h: Fixed the
-	#include lines to deal properly with gal.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am (INCLUDES): add datadir
-
-	* folder-browser-factory.c (control_activate): use it.
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	* mail-callbacks.c (transfer_msg): Revert **Temp fix** from below
-	since the relevant shell bug has been fixed now.
-
-	* mail-ops.c (do_fetch_mail): Fix the sense of the "keep on
-	server" check so we're not doing this backwards. Don't
-	get_message_flags, because POP doesn't support it and it's
-	pointless anyway since we're setting deleted, not toggling it.
-	call camel_folder_sync with expunge=TRUE so that the deletions are
-	actually recorded.
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	This bug was so much fun to fix the first time that I decided to
-	fix it again.
-
-	2000-07-11  Dan Winship  <danw@helixcode.com>
-
-		* mail-ops.c (real_send_mail): Set the post_send_data flag
-		rather than toggling it. (Maybe we'll need more control
-		over it later, but for now, the only flag we set is
-		"replied", and we want that set, not toggled.)
-
-2000-09-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (transfer_msg): **Temp fix** Send "" as the
-	default folder to select as anything else seems to cause a
-	segfault in shell's user_get_folder().
-	(check_configured): A spoon full of 'line wrapping' makes the
-	medicine go down, the medicine go dowwwwn...
-
-2000-09-14  Iain Holmes  <terrorist@gegl.org>
-
-	* mail-callbacks.c (check_configured): Ask if you want to 
-	configure the mail client if it isn't configured already.
-	(check_send_configuration): Remove the error box if mail isn't
-	configured.
-	(send_queued_mail): Same.
-
-2000-09-14  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (setup_append_mail): camel_folder_append is perfectly
-	happy to take a NULL info.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser-factory.c: move fn to bonobo.
-	(set_pixmap): update.
-	(control_deactivate): add bonobo_ui_handler_unset_container
-
-2000-09-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-config-gui.h: Changed the include here because it caused
-	make distcheck to fail for me.  I changed it from <Evolution.h> to
-	"shell/Evolution.h".  This seems to have fixed things.
-
-2000-09-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Only use the cache if the user plans
-	to keep_on_server.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser-factory.c (control_deactivate): kill
-	warning. (control_activate): set threaded toggle state,
-	add freeze / thaw.
-	(set_pixmap, fill_toolbar, update_pixmaps): update.
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser-factory.c: Fixed a warning (Missing include
-	file.)
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	($(EVOLUTION_MAIL_CORBA_GENERATED)): Add space after `-I'.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: Remove `ui.xml' stuff.
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* mail-local-storage.c (mail_local_storage_startup): set
-	folder_tree before adding the listener, since that will eventually
-	invoke callbacks that will look at it.
-
-	* folder-browser-factory.c (control_deactivate): sync the folder
-	on deactivate.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* message-list.c (on_right_click): Also display the name of the
-	mailing list in the "Filter on Mailing List" item for additional
-	Coolness factor.
-
-	* mail-autofilter.c (filter_gui_add_for_mailing_list): Create the
-	rule with `filter_filter_new()' so that it also has an action
-	part.
-
-	* mail-mlist-magic.c (get_header): Use the right header name to
-	retrieve the header.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* message-list.c (on_right_click): Grey out the mailing list
-	filter item if `mail_mlist_magic_detect_list()' returns NULL on
-	this message [i.e., if we cannot figure out a mailing list for
-	this message].
-	(filter_mlist): Good boys don't use F words.
-
-	* mail-mlist-magic.c (check_sender): Work safely if
-	`header_name_return' or `header_value_return' are NULL.
-	(check_x_been_there): Likewise.
-	(check_delivered_to): Likewise.
-	(check_x_mailing_list): Likewise.
-	(check_x_loop): Likewise.
-	(get_header): Use the right header name to retrieve the header.
-
-	* message-list.c (on_right_click): Mark strings for translation.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c: Use the latest, shiny, amazing TigerT
-	art for the toolbar.
-
-	* component-factory.c: #include "mail-local-storage.h".
-	(owner_set_cb): Removed unused variable.
-
-	* message-list.c (filter_sender): Made static.
-	(filter_recipient): Likewise.
-	(filter_subject): Likewise.
-	(vfolder_recipient): Likewise.
-	(vfolder_sender): Likewise.
-	(vfolder_subject): Likewise.
-
-	* mail.h (vfolder_subject): Removed prototype [WTF was this doing
-	here?!?!].
-	(vfolder_sender): Likewise.
-	(vfolder_recipient): Likewise.
-	(filter_subject): Likewise.
-	(filter_sender): Likewise.
-	(filter_recipient): Likewise.
-
-	* message-list.c: Added a new "Filter on mailing list" menu item.
-	(filter_mlist): Callback for this menu item.  Use
-	`filter_gui_add_for_mailing_list' to pop up the filter dialog with
-	the appropriate rule.
-
-	* mail-autofilter.c (filter_gui_add_for_mailing_list): New.
-
-	* message-thread.c (dump_tree): Removed unused variable.
-
-	* mail-mlist-magic.c: New.
-	* mail-mlist-magic.h: New.
-
-	* mail-autofilter.c (rule_match_recipients): Mark strings for
-	translation.
-	(rule_from_message): Likewise.
-	(filter_gui_add_from_message): Likewise.
-
-2000-09-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Was trying to unhook an event from
-	the wrong folder - oops.
-
-2000-09-12  Not Zed  <NotZed@HelixCode.com>
-
-	* message-thread.c: Reverted to version 1.15.
-	(remove_node): Ok, if a node has a parent, remove it from the
-	parent list, otherwise remove it from the (supplied) root list.
-	(group_root_set): When we merge children, free the lost node.
-	(thread_messages_free): Remove the return, run as is.
-	(prune_empty): Plugged another small leak.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (run_filter_ondemand): Updated to use the new
-	mail_do_filter_ondemand.
-
-	* mail-ops.c (do_fetch_mail): Update to use the new
-	filter_driver_run args.
-	(do_filter_ondemand): Updated to use the new filter_driver_run
-	args.
-	(mail_do_filter_ondemand): Take a FilterContext as a argument
-	instead of a driver as we need to destroy the filter inside the
-	do_filter_ondemand function and things'd get messy.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Don't have the filter driver
-	self_destruct.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): If we're fetching from an mbox
-	formatted file then we need to do some special-casing.
-
-2000-09-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (owner_set_cb): Call
-	`mail_local_storage_startup()' to set up handling of the local
-	storage.
-
-	* mail-local-storage.c: New.
-	* mail-local-storage.h: New.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-display.c: Fixed some warnings.
-
-2000-09-11  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c, mail-format.c: Another big rewrite of this
-	stuff. Now all (well, most) attachments get a small icon with a
-	description and a (non-obvious) right-click pop-up menu with
-	options to save, open in an external program, or show/hide inline.
-
-	TODO: antialias the icon, add more options to the pop-up for
-	certain MIME types, add an icon to the headers, fix PGP to work
-	like everything else, fix message/external-body to work again,
-	add some icon caching action, etc, etc.
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Use the CamelUIDCache so that we
-	only retrieve *new* messages and also send notes to the status bar
-	telling it which message we're downloading so that Ettore can
-	sleep at night ;-)
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Updated to not send hook/unhook data
-	to filter_driver_run as it no longer takes those args.
-	(do_filter_ondemand): Same. Also wrap filtering in freeze/thaw to
-	prevent signals from being queued up
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Freeze the default folder before
-	filtering and thaw it afterward to prevent a ton of
-	"folder_changed" signals from being queued.
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser.c, mail-config-gui.c, mail-ops.c: Fixed some
-	warnings.
-
-	* message-list.c: Added base ETableModel functions.
-
-2000-09-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Updated to pass a CamelMessageInfo
-	to filter_driver_run
-	(do_filter_ondemand): Same.
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_filter_ondemand): Updated to check the boolean
-	return code from filter_driver_run to find out whether or not the
-	message was filtered so that it can decide whether or not to
-	delete the message from the source folder or not.
-
-2000-09-07 Jesse Pavel <jpavel@helixcode.com>
-
-	* mail-format.c (mail_generate_reply) Changed the behavior of
-	Reply-to-All so that the sender's address does not appear in
-	the cc: list.
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Updated to pass an exception to
-	filter_driver_run and also check the exception before deleting the
-	message from the source folder.
-	(do_filter_ondemand): Updated to pass an exception to
-	filter_driver_run
-
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* session.c (session_init): Pass a storage dir to
-	camel_session_new now.
-
-	* main.c (main): Can't call session_init here now, because it
-	requires evolution_dir to be set.
-
-	* component-factory.c (owner_set_cb): call session_init here.
-
-	* mail-ops.c (do_fetch_mail): Fix previous fix. (Free the uids,
-	just do it correctly.)
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Don't free uids, let the camel
-	folder do that when it gets finalized
-
-2000-09-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (mail_do_filter_ondemand): New async function to
-	filter messages on demand.
-	(do_fetch_mail): Updated to filter 1 message at a time using the
-	new filter-driver code
-	
-	* mail-callbacks.c (composer_postpone_cb): Send NULL as the
-	message info.
-	(run_filter_ondemand): Use mail_do_filter_ondemand instead of
-	filter_driver_run
-	
-	* mail-tools.c: Removed mail_tool_filter_contents_into and
-	mail_tool_fetch_mail_into_searchable as they have now been
-	deprecated.
-
-2000-09-06  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (clear_tree): set the data to NULL for the tree
-	root, so nuke_uids won't try to free anything.
-
-2000-09-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser.c (folder_browser_new): @shell made const.
-	`CORBA_Object_duplicate()' it before storing it.
-	(folder_browser_destroy): Free the shell object with
-	`CORBA_Object_release()', not `CORBA_free()'.
-
-	* folder-browser-factory.c (folder_browser_factory_new_control):
-	@shell made const.
-
-2000-09-05  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (make_safe_filename): 
-	* mail-format.c (handle_mystery): 
-	* mail-identify.c (mail_identify_mime_part):
-	camel_mime_part_get_filename now deals with both
-	Content-Disposition and Content-Type.
-
-2000-09-05  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (cleanup_load_folder): Check for NULL folder.
-	(mail_do_setup_folder): Copy the 'name' parameter so that
-	we can free it.
-
-	* message-list.c (nuke_uids): Depth '-1' means "unlimited", not 0.
-
-2000-09-05  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c (owner_set_cb): Re-rename "Sent".
-
-	* folder-browser.c (fb_resize_cb): Remove the "+ 90" here since it
-	seems to break things for me, and it's not commented anyway and
-	there's no excuse for adding 90 to a number with no explanation.
-
-2000-09-05  Peter Williams  <peterw@helixcode.com>
-
-	* folder-browser.c (folder_browser_destroy): Don't free the shell;
-	it's not ours.
-
-2000-09-05  Dan Winship  <danw@helixcode.com>
-
-	* mail-tools.c (mail_tool_move_folder_contents): only call
-	camel_folder_get_message_info if the folder has
-	summary_capability. Don't hack up a fake CamelMessageInfo:
-	append_message will take NULL.
-
-	* mail-ops.c: Replace mail_do_setup_draftbox,
-	mail_do_setup_outbox, and mail_do_setup_sentbox with
-	mail_do_setup_folder.
-	(do_send_mail, do_send_queue): s/sentbox_folder/sent_folder/
-
-	* component-factory.c (owner_set_cb): Use mail_do_setup_folder,
-	rename sentbox_folder to sent_folder, and call
-	mail_operation_wait_for_finish after the setup_folder calls in
-	case anything needs to use the _folder variables.
-	
-2000-09-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Applied Jesse's patch that
-	will append a signature to the replied message text
-
-	* folder-browser-factory.c: Changed "Send & Receieve" back to "Get
-	Mail" temporarily so that the toolbar buttons don't all get
-	stretched to some weird proportion
-
-2000-09-03  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config.c (mail_config_add_news): Copy the passed in item
-	before adding
-	(mail_config_add_source): ditto
-	(mail_config_add_identity): ditto
-
-	* mail-config-gui.c (mail_config): We don't actually need a notebook
-	pointer.
-	(identities_edit_clicked): Don't explicitly destroy, we are using
-	gtk_clist_set_data_full now
-	(sources_edit_clicked): ditto
-	(news_edit_clicked): ditto
-	(mail_config): Use gtk_clist_set_row_data_full to kill leaks
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Change the "Get Mail" toolbar button
-	to become "Send & Receieve"
-
-	* mail-callbacks.c (send_queued_mail): New callback function for
-	sending queued mail
-	(send_receieve_mail): New callback for Send & Receieve that
-	basically just calls send_queued_mail and then fetch_mail
-
-	* mail-ops.c (cleanup_send_mail): Mod to be able to handle a NULL
-	composer window
-	(setup_send_mail): Modified to handle a NULL composer widget
-	(mail_do_send_queue): New convenience async function to send all
-	messages in a folder (aka all messages in a queue)
-
-2000-09-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-tools.c (mail_tool_move_folder_contents): Since POP3
-	doesn't implement get_message_info, we need to check for info to
-	be NULL. In this case, we need to make our own info structure to
-	pass to append_message and then remember to free it
-	afterward. Should we even bother with get_message_info? And if so,
-	should we then implement get_message_info for POP3?
-
-2000-09-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser.c (etable_key): Make the `Home' key to move to
-	the beginning of the list and `End' to the end of it, using
-	`message_list_home()' and `message_list_end()'.
-
-	* message-list.c (message_list_home): New.
-	(message_list_end): New.
-
-	* folder-browser.c (folder_browser_new): Don't ref the shell here.
-	(folder_browser_destroy): Don't unref the shell.  Instead,
-	`CORBA_free()' the object reference.
-
-	* folder-browser-factory.c (control_activate): Bind "Open in New
-	Window" to `Ctrl-O'.
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* mail-config-gui.c: Use e_utf8 wrappers
-
-	* main.c (main): Do e_unicode_init, so we are not confusing
-	libunicode
-
-2000-09-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser.c: Removed a warning.
-
-2000-09-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (compose_msg): Attach a callback to the
-	postpone signal
-	(send_to_url): Same
-	(mail_reply): Same
-	(forward_msg): Same
-	(composer_postpone_cb): Callback function for the postpone signal
-
-	* mail-ops.c (mail_do_setup_outbox): New convenience function to
-	load the Outbox folder
-	(mail_do_setup_sentbox): Same, but for Sentbox.
-	(do_send_mail): Now saves messages in Sentbox if sent successfully
-	(mail_do_append_mail): New convenience async function for
-	appending messages to a folder
-	
-	* component-factory.c: Added outbox_folder and sent_folder
-	(owner_set_cb): Call our new convenience functions to load Outbox
-	and Sentbox
-
-2000-09-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (cleanup_scan_subfolders): Update for the extra arg
-	needed by `evolution_storage_new_folder()'.
-	* mail-vfolder.c (vfolder_refresh): Likewise.
-
-2000-08-31  Peter Williams  <peterw@helixcode.com>
-
-	* folder-browser.c (folder_browser_new): Don't ref the shell:
-	causes a race upon exit.
-	(folder_browser_destroy): Don't unref it.
-
-	* mail-config-gui.c (service_page_item_new): Add a checkbutton
-	"use default port" to make life simple.
-	(service_page_get_url): Honor use_default_port.
-	(service_page_set_url): Set use_default_port based on the input
-	URL.
-	(toggle_port): New function, sets the sensitivity of the
-	port entry based on "use default port"
-
-	(config_do_query_authtypes): Make this asynchronous, as it
-	may involve connecting to a server.
-	(service_page_detect): Call the async auth querier.
-	(service_page_item_new): Put the authentication stuff in if
-	the url_flags have URL_ALLOW_AUTH. Call the async auth querier
-	to get the info.
-	
-2000-08-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-view.c (mail_view_create): Make the HTML widget grab the
-	focus.
-
-2000-08-30  Peter Williams  <peterw@helixcode.com>
-
-	* mail-config-gui.c (do_test_service): Explicitly connect to
-	the service again.
-
-	* component-factory.c (mail_load_storages): Now that 
-	camel_service_get_provider exists, use it to make this function
-	much simpler.
-
-2000-08-29  Peter Williams  <peterw@helixcode.com>
-
-	* folder-browser.c (folder_browser_new): Ref the Evolution_Shell.
-	Is this correct, or is it a circular reference?
-	
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (mail_do_send_mail): Update this and related
-	functions to no longer take a From address. (The composer deals
-	with it itself now.)
-	(do_send_mail): Add the Evolution version back to the X-Mailer
-	header (this change got lost in the thread migration).
-
-	* mail-callbacks.c (composer_send_cb): Don't re-fetch the From
-	address. It's set by the composer now. Don't free the
-	post_send_data from here.
-	(mail_reply): Attach to the composer's destroy signal to free the
-	psd. (The current code would free it more than once if an error
-	occurred while trying to send the first time.)
-
-2000-08-28  Peter Williams  <peterw@helixcode.com>
-
-	* mail-config-gui.c (mail_config_apply_clicked): Add new news sources,
-	not only stores.
-
-2000-08-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (composer_send_cb): Free the from address when
-	we're done with it. Also, e_msg_composer_hdrs_get_from returns
-	alloc'd memory so don't strdup it.
-
-2000-08-28  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (do_transfer_messages): Add status messages.
-	(do_flag_messages): Same.
-	(do_scan_subfolders): Same.
-	(do_forward_messages): Same.
-	(do_view_messages): Same.
-
-2000-08-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-view.c (mail_view_create): Use `gnome_app_set_toolbar()'
-	the easy way instead of doing things manually with `GnomeDock' and
-	`gnome_app_add_toolbar()'.
-	(MINIMUM_WIDTH): New #define.
-	(MINIMUM_HEIGHT): New #define.
-	(view_size_allocate_cb): New, callback for the "size_allocate"
-	signal of the mail view.  It saves the last allocation in a static
-	`last_allocation' variable.
-	(mail_view_create): Connect it.
-	(set_default_size): New function.  Set the default width/height to
-	the last allocation width/height; if the width/height is less than
-	the `MINIUM_WIDTH' or `MINIMUM_HEIGHT', use that value instead.
-
-	* mail-tools.c (mail_tool_move_folder_contents): Show `i + 1', not
-	`i', so that we correctlly start counting from one instead of zero.
-
-2000-08-28  Peter Williams  <peterw@helixcode.com>
-
-	* *.c: s,mail_dialog_run,gnome_dialog_run,g.
-
-	* main.c (main): Since only the main thread is dealing with GTK+,
-	free the GDK threads mutex and never worry about locking again.
-
-2000-08-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-crypto.c (mail_crypto_openpgp_encrypt): Fix to prevent
-	possible buffer overflows and a logic fix.
-
-2000-08-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-crypto.c (mail_crypto_openpgp_clearsign): New crypto
-	function to clearsign plaintext
-
-2000-08-27  Ariel Rios  <ariel@arcavia.com>
-
-	* folder-browser-factory.c (control_activate): Added bonobo menu
-	handler for mark_all_deleted function.
-
-	* mail.h: (mark_all_deleted): Added prototype.
-
-	* mail-callbacks.c (mark_all_deleted): Added callback for marking
-	all displayed messages in a folder as deleted.
-
-2000-08-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-view.c (mail_view_create): Use
-	`gtk_window_set_default_size' on the toplevel instead of
-	`gtk_widget_set_usize()', and make the default size smaller.
-
-2000-08-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-crypto.c: Fixed an uninitialized variable.
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* evolution-mail.gnorba: Kill
-
-	* Makefile.am: Remove gnorba related stuff
-
-2000-08-25  Peter Williams  <peterw@helixcode.com>
-
-	* mail-config-gui.c (service_page_item_new): If the service wants
-	a host, also let the user specify a port.
-	(MailDialogServicePageItem): Add members for the port GtkEntry and
-	the default port.
-	(service_page_get_url): Translate the port in the entry back into
-	the CamelURL.
-	(service_page_set_url): Read in the port from the URL or use
-	the default.
-
-2000-08-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-crypto.c (mail_crypto_openpgp_encrypt): Implemented PGP 2.x
-	encryption. We only need to get the passphrase if we plan to sign
-	the text, otherwise we don't need to worry about getting the
-	passphrase.
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* folder-browser.c: Use e_utf8 wrappers
-
-	* mail-config-gui.c: Use e_utf8 wrappers
-
-2000-08-24  Peter Williams  <peterw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Add all the
-	functions from message-list.c's popup menu to the main
-	menu as well
-
-	* message-list.c (vfolder_subject): These functions become
-	public.
-
-	* mail-callbacks.c (mark_all_seen): Don't call camel_folder_get_uids
-	here. IMAP, for example, will try to communicate with the IMAP
-	server during that call.
-
-	* mail-ops.c (cleanup_fetch_mail): Tell the user
-	which URL has no new mail, as they may be checking
-	more than one source.
-	(mail_do_flag_all_messages): New function. Flags all of
-	the messages in a folder. Something of a hack. This merely
-	extends the flag_messages operation; it doesn't implement
-	a new one.
-	(do_flag_messages et al): Fetch the uids if we need to;
-	use camel_folder_free_uids if necessary, etc.
-	
-	* mail-tools.c (mail_tool_move_folder_contents): Add
-	messages to tell the user what's going on.
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser-factory.c: Fixed some warnings in the uihandler
-	code.
-
-2000-08-24  Peter Williams  <peterw@helixcode.com>
-
-	* component-factory.c (mail_load_storages): New function.
-	Loads a list of URI's as mail storages, and inserts them
-	into the shell's folder tree if appropriate (really, only
-	puts them into the folder tree.)
-	(mail_add_new_storage): Insert a storage into the folder
-	tree. Not always appropriate (eg, /var/spool/mail/user is
-	a storage that shouldn't be in the folder tree.)
-	(create_view): Generate the Evolution_Shell and pass it
-	to folder_browser_factor_new_control so that its member
-	'shell' can be set.
-	(owner_set_cb): Instead of create_news_storage and
-	creating the imap storages, load the news storages and
-	mail storages via mail_load_storages().
-
-	* folder-browser-factory.c (control_activate): Change to
-	use providers_config again instead of mail_config. Pass
-	the folderbrowser so that the config code knows where
-	to insert the new storages if any are created. Pass
-	forget_passwords the folderbriwser, too, for good luck.
-	(folder_browser_factory_new_control): Take a new parameter,
-	the Evolution_Shell that we belong to. The field in
-	FolderBrowser has been there but was never getting set by
-	anything, and we need this to be able to insert new storages
-	into the shell's folder list.
-
-	* folder-browser.c (folder_browser_new): Accept the
-	new Evolution_Shell parameter. Set it. (Should we 
-	ref it or something?)
-
-	* mail-config-gui.c (struct MailDruidDialog): Store an
-	Evolution_Shell. With this we can insert the stores into 
-	the shell's folder list.
-	(struct MailDialog): Same.
-	(service_page_item_changed): Close a leak.
-	(identity_dialog): Unswitch the Add/Edit identity titles.
-	(news_dialog): Analogous to above.
-	(mail_druid_finish): Add the new mail source to the shell
-	view.
-	(mail_config_druid): Take a new Evolution_Shell parameter
-	for later use.
-	(mail_config_apply_clicked): Add all the mail sources to
-	the shell view.
-	(mail_config): Take a new Evolution_Shell parameter.
-
-	* mail-callbacks.c (check_configured): Accept a FolderBrowser
-	so that we know where to put the new storages if any are
-	created. Almost all the callbacks are passed a FB * anyway
-	so this isn't a big deal.
-	(check_send_configuration): Make sure that we're configured
-	enough to be able to send mail. composer_send_cb() used to
-	do this, but it would need a FolderBrowser *, and there are
-	too many entry points to composer_send_cb to make this
-	feasible.
-	(fetch_mail): Pass the extra parm to check_configured().
-	(free_psd): Move so that composer_send_cb can call this
-	directly.
-	(composer_send_cb): Don't check for proper configuration
-	here -- it is the caller's responsiblity to call
-	check_send_configuration(). Call free_psd() directly.
-	(compose_msg): Call check_send_configuration().
-	(send_to_url): Same. This is called from mail-display.c,
-	though, and cannot reasonably be passed a FB. So: we can't
-	start up the config dialog directly; the user must do it
-	manually. Oh well.
-	(mail_reply): Same as above.
-	(forward_msg): Same as compose_msg().
-	(edit_msg): Same as above.
-	(providers_config): Reenable so that we can pass mail_config
-	its FolderBrowser.
-	
-	* mail-display.c (write_data_to_file): Use the much more
-	straightforward run_and_close to retrieve the user's answer,
-	instead of the reply callback stuff.
-
-	* mail-threads.c (mail_dialog_run): New wrapper for 
-	gnome_dialog_run that will take care of the GDK lock correctly.
-	Far far more complicated than it should be.
-	(mail_dialog_run_and_close): Analogous to above.
-	(read_msg): Set inside_read_msg and unset it for the benefit
-	of the two above functions. Don't bracket ourselves in 
-	GDK_THREADS_ENTER/_LEAVE anymore.
-	(mail_operation_queue): Use mail_dialog_run_and_close.
-	(show_error): As above.
-	(get_password): As above.
-	
-	* mail-display.c (write_data_to_file): This has the only
-	exception to the rule that "use mail_dialog_run(_and_close)
-	instead of the gnome equivalent always." Not quite sure why
-	it doesn't work here (the file selection window?).
-
-	* mail-config-gui.c (identity_dialog): Change to
-	mail_dialog_run_and_close.
-	(source_dialog): Same as above.
-	(news_dialog): Same as above.
-	(cleanup_test_service): Same as above.
-	(mail_config): Change to mail_dialog_run().
-
-	* session.c (mail_request_dialog): Change to 
-	mail_dialog_run_and_close.
-
-	* mail-tools.c (mail_tool_uri_to_folder_noex): As above.
-
-	* mail-ops.c (cleanup_fetch_mail): As above.
-
-	* mail-local.c (local_reconfigure_folder): As above.
-
-	* mail-callbacks.c (check_send_configuration): As above.
-	(ask_confirm_for_empty_subject): As above.
-	(edit_msg): As above.
-	(filter_edit): As above.
-
-2000-08-23  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Reformat a bit,
-	make "Folder" appear before "Message", fill in the Message menu
-	more.
-
-2000-08-23  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (describe_fetch_mail): Don't use the camel calls
-	to describe the operation.
-
-2000-08-22  Peter Williams  <peterw@helixcode.com>
-
-	* mail-tools.c (mail_tool_get_folder_from_urlname): Don't connect 
-	to the service explicitly.
-	(mail_tool_send_via_transport): Don't connect to the transport
-	explicitly.
-	(mail_tool_get_root_of_store): Same.
-
-	* mail-config-gui.c (do_test_service): Just try camel_session_get_service,
-	which will now connect for us.
-
-	* message-thread.h: Add a note about *next being the first member
-	of struct _container... if it isn't, everything goes Very Wrong.
-
-	* message-thread.c (free_container): Extra debug print.
-	(remove_node): Handle the case of empty containers holding the child
-	that we're interested in.
-	(thread_messages_free): Extra debug print.
-
-2000-08-20  Jeremy Wise  <jwise@pathwaynet.com>
-	* folder-browser.c: (fb_resize_cb) Added function to monitor resize
-	of the e_paned in the main view.
-
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* mail-tools.c (mail_tool_filter_contents_into): Fix a race. filter_driver_run is an
-	async operation so it won't even be started by the time we sync the folders and check
-	for the movemailbox to be emtpy. Thus the empty check for the movemail would fail
-	99% of the time.
-
-	* mail-callbacks.c (run_filter_ondemand): Pass he new argument to the ever-mushrooming
-	filter_driver_run.
-
-2000-08-17  Peter Williams  <peterw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Fix menu item names.
-	(register_ondemand): Put the ondemand hooks into the new folder menu.
-
-2000-08-17  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-vfolder.c (vfolder_gui_add_rule): Use stock OK/Cancel
-	buttons and add i18n support.
-
-	* folder-browser-factory.c (control_activate): Changed menu item
-	label from "Mark all messages seen" to "Mark All Messages as
-	Read".  Changed capitalization of some other menu items.
-	(control_activate): Put the message- and folder- related menu
-	items in new "Message" and "Folder" subtrees which are created in
-	the `<Component Placeholder>' item created by the shell.
-	(control_deactivate): Updated accordingly.
-	(control_activate): Put the filter and vfolder editors, the mail
-	configuration and the "forget password" command into the
-	"settings" menu.
-	(control_deactivate): Updated accordingly.
-
-	* mail-config-gui.c (transport_page_new): Add translation mark.
-	(service_page_new): Show the menu items before appending them.
-	(service_page_item_new): Use `GTK_FILL' for the "Detect supported
-	types..." button.
-
-	* local-config.glade: Change the apply button into an ok button.
-
-2000-08-17  Peter Williams  <peterw@helixcode.com>
-
-	Implement filtering on demand.
-	
-	* folder-browser-factory.c (register_ondemand): New function. Callback
-	to put the filter-on-demand filters into the bonobo UIH;
-	(create_ondemand_hooks): New function. Read in our on-demand filters 
-	and hook them into the UI.
-	(remove_ondemand_hooks): New function. Remove the hooks when done with
-	them.
-	(control_activate): Call create_ondemand_hooks()
-	(control_deactivate): Call remove_ondemand_hooks();
-
-	* mail-callbacks.c (run_filter_ondemand): New function. Callback
-	for running a filter on demand.
-	(filter_edit): Pass NULLs as the new arguments to rule_context_load.
-	
-	* mail.h: Prototype run_filter_ondemand();
-
-	* folder-browser.c (oc_destroy): New function. Iterator to destroy
-	an fb_ondemand_closure.
-	(folder_browser_destroy): Free the data associated with the ondemand
-	menu items.
-	(my_folder_browser_init): Clear the filter_ variables.
-
-	* folder-browser.h: Two new members of FolderBrowser: filter_menu_paths,
-	a list of fb_ondemand_closures so that the menu items can be freed and
-	removed; and filter_context, a permanently loaded FilterContext for
-	running the ondemand filters. Prototype the new fb_ondemand_closure
-	structure.
-
-	* mail-autofilter.c (filter_gui_add_from_message): Pass NULLs as the
-	new parameters to rule_context_load (we don't need to hook up ondemand
-	menu items...)
-
-	* mail-tools.c (mail_tool_filter_get_folder_func): Rename from 
-	get_folder_func() and make public so mail-callbacks.c:run_filter_ondemand()
-	can use it too.
-	(mail_tool_filter_contents_into): Use the new name of get_folder_func.
-	Pass NULLs as the extra arguments to rule_context_load. Pass the
-	extra source type to filter_driver_run (only use INCOMING).
-
-	* mail-tools.h: Publicly prototype mail_tool_filter_get_folder_func()
-
-	* mail-vfolder.c (vfolder_create_storage): Pass NULLs as the extra 
-	arguments to rule_context_load.
-
-	* message-list.c (message_list_init): Free our strdup'd uids when
-	the table model gets destroyed.
-	(nuke_uids): New function. Walk the tree nodes to free the uids.
-	(nuke_uids_cb): New callback for nuke_uids();
-
-
-2000-08-16  Richard Hult  <rhult@hem.passagen.se>
- 
- 	* mail-ops.c (cleanup_display_message): Use a configurable timeout.
- 
- 	* mail-config.c (mail_config_set_mark_as_seen_timeout): New function
- 	for the settable mark-as-seen timeout.
- 	(mail_config_mark_as_seen_timeout): Likewise.
- 	(mail_config_write): Write the timeout setting.
- 	(config_read): Read timeout setting.
- 
- 	* mail-config-gui.c (mail_config): Add option for the settable
- 	mark-as-seen timeout.
- 	(mail_config_apply_clicked): Likewise.
- 	(timeout_changed): New function for the timeout setting.
-	
-2000-08-16  Peter Williams  <peterw@helixcode.com>
-
-	* message-thread.c (walk_containers): More (default disabled)
-	mem debugging here. Fix the big leaks.
-
-	* mail-format.c (get_url_for_icon): Copy the url_path so that
-	it can't get freed under us.
-
-	* mail-threads.c (mail_operation_queue): Fix a leak.
-
-	* mail-ops.c (mail_do_display_message): Fix another leak.
-
-	* message-list.c (message_list_destroy): Remove the seen_id timeout
-	if necessary.
-
-	* mail-local.c (mail_tool_local_uri_to_folder): Fix a leak.
-
-	* session.c (auth_callback): Fix a leak. Almost seems as if
-	I've been using Purify...
-
-
-2000-08-15  Peter Williams  <peterw@helixcode.com>
-
-	* message-thread.c (alloc_container): Add support for debugging
-	container allocations -- currently disabled. Make sure that
-	the g_strfreev works.
-
-	* message-list.c (main_message_changed): Address bug #496 --
-	possible race when forwading a message_changed event.
-
-	* mail-threads.c (dispatch): Close the dispatch thread's half of
-	pipes when about to exit.
-	(mail_operations_terminate): Close the main thread's half of the
-	pipes when about to exit.
-	(all): Add i18n support.
-	
-	* mail-tools.c (all): Add i18n support.
-
-	* mail-ops.c (transfer_messages): Generalize move_messages into
-	transfer_messages so that we can copy too.
-	(all): Add i18n supprt where appropriate.
-
-	* mail-ops.h: Prototype the new mail_do_transfer_messages.
-
-	* folder-browser-factory.c: Add a UI hook for copy_msg.
-
-	* mail-callbacks.c (transfer_msg): Generalize move so that it supports
-	copy as well, and add a callback 'copy_msg'.
-
-	* message-list.c (on_right_click): Add a right-click hook for Copy Message.
-
-	* session.c (mail_request_dialog): Don't deadlock when in main thread.
-	
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* mail-threads.c (show_error): Fix the error dialogs.
-	(read_msg): Re-enable them.
-
-	* mail-ops.c (do_scan_subfolders): Silence a compile warning.
-
-2000-08-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-crypto.c (mail_crypto_openpgp_encrypt): Added support for
-	encrypting via PGP 5.0
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (cleanup_create_folder): Release the listener object
-	with `CORBA_Object_release()', not `CORBA_free()'.
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (main): Set the signal handlers for `SIGSEGV' and
-	`SIGBUS' to the default ones.
-
-2000-08-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (mail_config_write): Set config->configured to
-	TRUE
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-config-gui.c (mail_config_druid): Don't
-	`GDK_THREADS_ENTER()'/`GDK_THREADS_LEAVE()'.
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-threads.c (update_active_views): Just iterate through all
-	the controls, not just the active ones.
-
-	* folder-browser-factory.c: Don't keep track of active controls.
-	Rather, keep track of all of them.
-	(folder_browser_factory_get_active_control_list): Removed.
-	(folder_browser_factory_get_control_list): New.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (evolution_mail_SOURCES): add mail-local.h
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-threads.c (read_msg): For now, don't do anything about
-	errors.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (add_url): Fix some freed-memory references
-
-	* mail-threads.c (get_password): Don't free the prompt. It
-	doesn't belong to you.
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (mail_do_create_folder): Duplicate the listener
-	object.
-	(cleanup_create_folder): Free the listener.
-
-2000-08-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-threads.c (get_password): Don't wrap the gnome_dialog_run
-	in GDK_THREADS_ENTER/LEAVE
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c (control_destroy_cb): Remove the
-	control from the active control list, if it's there.
-
-	* mail.h (folder_browser_factory_new_control): Removed prototype.
-	(folder_browser_factory_init): Removed prototype.
-
-	* folder-browser-factory.h: New.
-
-	* folder-browser-factory.c: New static variable `active_controls',
-	list of the currently active controls.
-	(control_activate): Add the control to it.
-	(control_deactivate): Remove the control from it.
-	(folder_browser_factory_get_active_control_list): New.
-
-	* mail-threads.c (mail_operations_get_status): New function.
-
-	* folder-browser.c (folder_browser_gui_init): Add i18n support for
-	the labels.
-
-	[The following is actually from a patch by Peter Williams
-	<peterw@helixcode.com>.]
-
-	* Removed types `PERCENTAGE', `HIDE_PBAR', `SHOW_PBAR'.  New
-	struct `block_info_s'.  Removed all the code to create and destroy
-	the progress window.
-
-2000-08-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* component-factory.c (create_news_storage): Updated to reflect
-	changes to mail_do_scan_subfolders
-	(create_imap_storage): Same.
-
-	* mail-ops.c (mail_do_scan_subfolders): No longer takes an
-	add_INBOX argument
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (do_scan_subfolders): Lose a reference to the store
-	on purpose. To be fixed later.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c (create_imap_storage): Take the source as a
-	command-line argument rather than fetching it from mail-config.
-	(owner_set_cb): Call create_imap_storage on each configured IMAP
-	store.
-
-	* mail-format.c (decode_pgp): Redo this so that the lock icon
-	remains active after a failed decryption so you can click on it
-	and try again.
-	(try_inline_pgp, handle_multipart_encrypted): Put a border around
-	the decrypted data.
-
-	* message-list.c (cleanup_regenerate_messagelist): Don't clear the
-	tree here. If two "folder_changed"s arrive in close succession,
-	then one possible ordering of events is
-	cleanup_regenerate_messagelist, cleanup_regenerate_messagelist,
-	cleanup_thread_messages, cleanup_thread_messages. Which would
-	result in the message list being filled in twice without being
-	cleared in between. So don't clear it until the rebuilding
-	function itself is called.
-	(clear_tree): New function to empty out the ETreeModel in the
-	message list.
-	(build_tree): Change to simpler interface. Call clear_tree.
-	(build_subtree): Does most of the work of the old build_tree
-	(build_flat): Remove unused arg. Call clear_tree.
-
-	* message-thread.c (cleanup_thread_messages): Update for
-	build_tree interface change.
-
-	* mail-ops.c (do_send_mail): Don't leak the transport.
-
-	* mail-tools.c (mail_tool_get_folder_from_urlname): Don't ref the
-	store returned from camel_session_get_store. It's already reffed.
-	(mail_tool_get_root_of_store): Ditto.
-	(mail_tool_send_via_transport): Remove some commented-out code and
-	fix it to not leave the transport connected if sending fails.
-
-	* mail-callbacks.c (delete_msg): Toggling a flag is an
-	"instantaneous" operation, so if we're only doing one, just do it
-	and return, rather than queueing it for the other thread. This
-	makes the "Delete" key work correctly (move to the next message)
-	again.
-
-	* mail-identify.c: Remove workaround for gnome-vfs 0.2 bug.
-
-	* mail-format.c (lookup_handler): Remove workaround for function
-	introduced between gnome-vfs 0.2 and 0.3, since we depend on 0.3
-	now.
-
-2000-08-12  Michael Meeks  <michael@helixcode.com>
-
-	* main.c (main): kill using_oaf assertion.
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am: Make it so that test-mail links
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Move menu items
-	that affect a single message together, ditto with ones that
-	affect multiple messages, put a separator in.
-
-2000-08-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-format.c, mail-tools.h, message-list.c: Fixed a warning.
-
-2000-08-11  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c, mail-format.c: Redo this again. Get rid of
-	struct mail_format_data and move most of that info into
-	MailDisplay itself, and pass the MailDisplay around. Add a GData**
-	to MailDisplay, and put the urls hash table into that. Also add
-	the ability to redisplay the currently-displayed message (with the
-	same GData**), and add a "show_pgp" datum to it that controls
-	whether or not to decrypt PGP messages, and redo the PGP stuff
-	(again) to take that into account. Now you don't get the annoying
-	PGP password dialog box without any warning.
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* mail-config-gui.c (service_acceptable): Make verify-service
-	an asynchronous operation.
-
-	* Makefile.am (noinst_PROGRAMS): Don't build test-thread
-	while mail-threads.c is in flux.
-
-	* mail-threads.c (mail_operation_queue): Make the error
-	and query dialogs modal.
-
-	* mail-local.c (update_progress): Don't use the
-	temporarily-disabled mail_op_set_percentage().
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-config.c (mail_config_get_default_news): use config->news
-	instead of config->sources.
-
-2000-08-11  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (destroy_part): Update this for CamelObject
-	(try_inline_pgp): Deal with decrypting here rather than trying to
-	pawn the data off to handle_multipart_encrypted, since it most
-	likely won't be correct (won't have the proper MIME headers inside
-	the encrypted part).
-	(handle_multipart_encrypted): Add code from Nathan Thompson-Amato
-	to re-MIME-parse the decrypted data after decrypting.
-
-	* mail-crypto.c (mail_crypto_openpgp_{de,en}crypt): Get the
-	password here rather than having it passed in. Remove some dead
-	code.
-
-	* session.c (mail_request_dialog): Allow this to work in either a
-	sync or an async context.
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* mail-tools.c (mail_tool_fetch_mail_into_searchable): Don't
-	do the imap check here... it's a silly place.
-
-	* mail-ops.c (do_fetch_mail): Do the imap check here.
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config-gui.c (service_page_new): Work around
-	gtk option menu bug.
-	(service_page_item_auth_fill): ditto
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* mail-threads.c (read_msg): Fix the new FORWARD_EVENT handler
-	(didn't free msg, didn't write newline in the debug)
-
-	* mail-local.c (local_reconfigure_folder): Make the dialog
-	modal.
-
-	* mail-callbacks.c (select_first_unread): Fix some warnings.
-
-	* mail-threads.c (mail_op_forward_event): New function that
-	writes a FORWARD_EVENT signal to the compipe, to allow Camel
-	events to be handled in the main thread.
-	(read_msg): Handle a FORWARD_EVENT.
-
-	* mail-callbacks.c (select_first_unread): Forward the
-	event into the main thread to prevent the GTK calls in the
-	dispatcher thread. 
-	(main_select_first_unread): New name of old select_first_unread.
-
-	* message-list.c (folder_changed): Same as above.
-	(main_folder_changed): Same as above.
-	(message_changed): Same as above.
-	(main_message_changed): Same as above.
-
-	* mail-format.c (free_byte_array): Note about using
-	mail_op_forward_event. (cmm_destroyed): Same.
-
-2000-08-11  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_list_select): If the caller passes "-1"
-	for the model row, translate that to view row 0.
-
-	* message-list.c (idle_select_row): 
-	* mail-callbacks.c (select_first_unread): Use new
-	message_list_select kludge^H^H^H^H^H^Hfeature
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config-gui.c (source_dialog): Allow the window
-	to be growable
-
-	* mail-config.c: use void in empty declarations
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* mail-config.c (mail_config_get_news): Change () to (void)
-	if a function takes no arguments.
-	
-	* mail-config.h: Prototype mail_config_get_{sources,news}x
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config-gui.c (identity_dialog): iddialog, not sdialog
-	(news_edit_clicked): Kill leftover c-p crud
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config-gui.c (news_edit_clicked): Check nrow, not srow.
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config-gui.c (service_acceptable): Use camel_object_unref
-	instead of gtk_object_unref
-	(mail_druid_finish): Use new config accessors
-	(mail_config_druid): No need to call config functions
-	(news_add_clicked): Increments maxnrow, not maxsrow
-	(mail_config_apply_clicked): Use new config accessors
-	(mail_config): ditto
-
-	* component-factory.c (create_imap_storage): Use new
-	config accessors
-	(create_news_storage): ditto
-
-	* mail-config.glade: Set news clist name correctly
-
-	* mail-config.c (config_read): Rename from mail_config_read and
-	made private - no one should need to do a read manually.
-	(mail_config_set_send_html): New accessor
-	(mail_config_add_identity): ditto
-	(mail_config_get_sources): ditto
-	(mail_config_add_source): ditto
-	(mail_config_get_default_news): ditto
-	(mail_config_get_news): ditto
-	(mail_config_add_news): ditto
-
-	* mail-config.h: Prototype new accessors.  Config struct is now
-	in mail-config.c and hidden from the world.
-
-2000-08-11  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (describe_fetch_mail): Use camel_service_get_name
-	rather than showing the URL to the user.
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (do_refile_messages): Freeze the folders while moving.
-	(do_flag_messages): Same.
-	
-	* mail-threads.c (get_password_clicked): Fix the case when the
-	user /doesn't/ use escape to cancel the dialog :-/
-	(show_error_clicked): Same.
-
-2000-08-11  Dan Winship  <danw@helixcode.com>
-
-	* mail-tools.c (mail_tool_get_folder_name): Add a function to
-	return a useful name for a folder (not just "mbox" or "mh" for
-	any local folder.)
-
-	* mail-ops.c: Use mail_tool_get_folder_name rather than
-	folder->full_name when printing folder names.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-tools.c (mail_tool_get_local_inbox_url): Properly handle
-	different local file formats.  The folder isn't always mbox.
-	(mail_tool_do_movemail): Movemail always uses an mbox format
-	however.
-	(mail_tool_get_local_movemail_url): What is the mbox url, it is
-	always the same type, mbox.
-	(mail_tool_fetch_mail_into_searchable): Same here.
-
-	* mail-local.c (mail_local_map_uri): Map a local uri to the real uri.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser-factory.c, message-list.c, message-thread.c,
-	session.c: Fixed some warnings.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* session.c (session_init): Don't call e_setup_base_dir. It was
-	wrong and it doesn't exist any more.
-
-	* component-factory.c (owner_set_cb): Update for changed
-	prototype, and record the evolution_homedir. Move call to
-	mail_config_init here from session.c so it happens after
-	evolution_dir is initialized.
-
-	* mail.h: define "extern char *evolution_dir;" (formerly in
-	e-util/e-setup.h)
-
-	* component-factory.c, mail-callbacks.c, mail-config-gui.c,
-	mail-config.c, mail-display.c, mail-format.c, mail-ops.c,
-	mail-tools.c, session.c: Remove "e-util/e-setup.h" include.
-
-2000-08-10  Peter Williams  <peterw@helixcode.com>
-
-	* test-thread.c (queue_ops): Use mail_operations_terminate() to
-	close the other thread nicely.
-
-	* mail-threads.c (get_password_deleted): Handle the "close" event
-	as a cancel.
-	(show_error): Same.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* mail-tools.c (mail_tool_get_folder_from_urlname): Add a
-	"gboolean create" argument to pass to camel_store_get_folder.
-
-	* mail-ops.c (do_create_folder, do_setup_draftbox): 
-	* mail-local.c (mail_tool_local_uri_to_folder): 
-	* mail-vfolder.c (vfolder_uri_to_folder): Add create flag to
-	mail_tool_get_folder_from_urlname calls.
-
-2000-08-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (composer_send_cb): Fix compile warning by
-	casting the object to a CamelObject
-
-2000-08-10  Peter Williams  <peterw@helixcode.com>
-
-	* mail-tools.c (mail_tool_filter_contents_into): Delete the source
-	folder if told to and if it's empty
-	(mail_tool_get_local_movemail_path): New function.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* mail-callbacks.c (reply_to_all): Fix a bug in the async changes.
-	(This was identical to reply_to_sender.)
-
-2000-08-10  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-local.c (do_local_reconfigure_folder): Update for
-	append_message api change.
-
-	* message-list.c (message_list_regenerate): Change for search api
-	change.
-	(ml_tree_value_at): Add a colour column, based on the colour
-	assigned in the summary.
-	(message_list_init_renderers): Init colour column.
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* mail-display.c (part_for_url): Remove a gtk_object_get_data
-
-2000-08-09  Cody Russell  <bratsche@gnome.org>
-
-	* folder-browser-factory.c, mail-view.c: Make the toolbars
-	honor the user's gnomecc settings for detachable toolbars.
-
-2000-08-09  Jeffrey Stedfast  <fejj@helixcode.com>
-  
-	* mail-ops.c (composer_send_cb): Get the from address set in the
-	composer, if that fails ONLY THEN get the default from mail config
-
-	* mail-config.c (mail_config_get_identities): New convenience
-	function for getting a list of the configured identities
-
-2000-08-09  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (on_object_requested): Support controls as well
-	as embeddables.
-
-2000-08-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-view.c (mail_view_create): Changed to only take a
-	FolderBrowser argument
-
-	* mail-ops.c (real_view_msg): Create a new FolderBrowser for each
-	message being opened in a new window. Also set the
-	message_list->cursor_uid and mail_display->current_message to the
-	appropriate values.
-	(real_view_msg): Updated to reflect changes in the mail_view_create
-
-	* message-list.c (on_right_click): Nicify a little, add in a menu
-	separator between VFolder and Filter stuff.
-
-	* mail-ops.c (real_view_msg): Set the UID of the message that is
-  	being displayed
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Use
-	`GNOME_STOCK_MENU_*' things instead of `GNOME_STOCK_PIXMAP_*'
-	things, that are too big and look bad.
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* mail-view.c (mail_view_create): Save the top window so that on_close
-	can find it [with set_data].
-	(on_close): Recover the top window.
-	
-	* mail-threads.c (read_msg): Destroy the window instead of hiding it.
-
-2000-08-09  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-autofilter.c (filter_gui_add_from_message): Helper function
-	to add with confirm.
-	(rule_match_recipients): Dont set real name if its empty for the
-	filter name.
-	(rule_match_subject): was cutting ] off mailing list names.
-
-	* message-list.c (on_right_click): Added menu to install
-	vfolders/filters from message.
-
-2000-08-09  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-autofilter.c: New file to hold auto filter/vfolder stuff.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-display.c, mail-format.c, mail-ops.c: Fixed some warnings.
-
-	* message-list.c: Fix the call to e_popup_menu_run to match the
-	new signature.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Create a "print
-	message" menu item.
-
-2000-08-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (message_list_init): Attached a double_click
-	signal handler
-	(on_double_click): Our lovely new double_click callback. Will
-	display the current selected message in a new window
-
-2000-08-08  Jeremy Wise  <jwise@pathwaynet.com>
-	* mail-config.[ch], folder-browser.c: Added configuration work to
-	save the size of the vpaned widget.  It will be functional when the
-	e_paned widget emits a "resized" signal
-
-2000-08-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.h: Added void as an argument to functions not
-	needing any parameters to avoid compile warnings.
-
-2000-08-08  Jeremy Wise  <jwise@pathwaynet.com>
-	* mail-config.[ch], main.c, folder-browser-factory.c: State of the
-	threaded list toggle is now saved via gnome_config
-
-2000-08-08  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c (service_page_item_new): Attach a signal
-	handler to call the "changed" function when the user clicks the
-	"keep on server" checkbox.
-	
-2000-08-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (view_msg): New convenience function with params of a
-	normal Gtk callback function. We also now create a new
-	FolderBrowser object so that the message-view window isn't tied to
-	the display in the main window
-	(view_message): Now calls view_msg (this function is a bonobo
-	callback and can't be used with gtk widgets)
-	(edit_msg): Same idea as view_msg()
-	(edit_message): Again, same as view_message()
-
-	* message-list.c (on_right_click): Callback for creating an
-	e-popup-menu
-	(message_list_init): Added a right_click event to trigger a pop-up
-	menu to be displayed
-
-2000-08-08  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c: Add "Don't delete messages from server"
-	button to remote SOURCEs that aren't STORAGEs (ie, POP).
-	(provider_list): Only list SOURCEs. (ie, not mh)
-
-	* mail-config.c: Save/load "keep_on_server" flag.
-
-	* mail-ops.c (fetch_remote_mail): New function, split out of
-	real_fetch_mail. Deals with copying mail from a remote server into
-	a temporary mbox, possibly using a CamelUIDCache to leave the
-	messages on the server.
-
-	* mail-crypto.c, mail-format.c, message-thread.c: Fix some
-	compiler warnings.
-
-	* mail-format.c (mail_generate_reply): Fix up format of addresses.
-	(write_headers): Use CamelAddress functions to simplify this.
-
-2000-08-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-view.c: Lets get rid of the last separator in the toolbar
-	until we add n/p
-
-2000-08-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-threads.c (queue_window_delete_event_cb): Callback for
-	"delete_event", just doing nothing.
-	(create_queue_window): Connect it to the "delete_event" signal of
-	the progress dialog.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* mail-threads.c (remove_next_pending): Sanity check for
-	job queue, which seems to have some issues.
-	(read_msg): Make sure that the next operation isn't started
-	before the last one is cleaned up.
-
-	* mail-callbacks.c (fetch_mail): Fix erroneous free.
-
-	* mail-config-gui.c (mail_config_druid): Wrap the gtk_main call.
-
-	* mail-ops.c (do_flag_messages): Allow specification of whether
-	to set the flags unconditionally or toggle their current state.
-
-	* message-list.c (ml_tree_set_value_at): Toggle the seen status;
-	don't set it unconditionally.
-
-	* mail-callbacks.c (delete_msg): Toggle the deletion status;
-	don't set it unconditionally.
-
-	* mail-tools.c (mail_tool_do_movemail): Fix for undeclared tmpfd.
-
-	* mail-local.c (local_reconfigure_folder): Big rewrite; make into
-	an asynchronous operation. Use some mail tools to make life easy.
-
-2000-08-08  Dan Winship  <danw@helixcode.com>
-
-	* main.c (main): Move mail_config_init after session_init, since
-	it depends on evolution_dir being set.
-
-2000-08-08  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-ops.c (check_configured): Use config accessors
-	(fetch_mail): ditto
-	(composer_send_cb): ditto
-	(create_msg_composer): ditto
-
-	* mail-config-gui.h: Update API
-
-	* mail-config.h: Update API
-
-	* mail-config.c: Add accessor functions
-	(mail_config_is_configured): accessor function
-	(mail_config_get_default_identity): ditto
-	(mail_config_get_default_source): ditto
-	(mail_config_get_transport): ditto
-	(mail_config_send_html): ditto
-	(identity_copy): Make public
-	(identity_destroy): ditto
-	(identity_destroy_each): ditto
-	(service_copy): ditto
-	(service_destroy): ditto
-	(service_destroy_each): ditto
-	(mail_config_init): Rename from init_config and make public
-	(mail_config_clear): Rename from clear_config and make public
-	(mail_config_read): Rename from read_config and make public
-	(mail_config_write): Reanme from write_config and make public
-
-	* main.c (main): Call mail_config_init.
-
-	* mail.h: Include mail-config-gui.h
-
-	* mail-config-gui.c: Move config gui stuff here.
-	(source_dialog): Kill memory leak from debug leftovers.
-	Make sure returned source is NULL by default
-
-2000-08-07  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-local.c (local_reconfigure_folder): Redone to show a
-	dialogue first, and show progress of whats happening as its done.
-
-	* Makefile.am (glade_DATA): Added local-config.glade, for mailbox
-	reconfig dialogue.
-
-2000-08-04  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (mail_uri_to_folder): Use local_uri_to_folder()
-	for local uri's (file://).
-
-	* mail-local.c (local_uri_to_folder): Handle looking up folder
-	storage type before opening the store/folder.
-	(local_reconfigure_folder): Function to reconfigure the format of
-	a local mailbox into another storage format.
-
-	* Makefile.am (evolution_mail_SOURCES): Added mail-local.c and
-	missing mail-vfolder.h.
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: Added mail-view.c
-	
-	* folder-browser-factory.c (control_activate): Adda menu item for
-	viewing the message
-
-	* mail-view.c: New file containing methods for viewing messages in
-	separate windows
-
-	* mail-ops.c (view_message): New callback for viewing messages in
-	a new window.
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* component-factory.c (real_create_generic_storage): New function
-	to replace real_create_imap_storage and real_create_news_storage
-	(create_imap_storage): Updated.
-	(create_news_storage): Updated.
-
-2000-08-07  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (cleanup_edit_messages): New operation: edit_messages
-	For continuing draft messages.
-	(attach_messages): Fix accidental 0 datasize.
-	(do_setup_draftbox): New operation: setup_draftbox. Soooo hacky.
-
-	* mail-callbacks.c: Move fejj's edit message to the async home.
-
-	* component-factory.c (owner_set_cb): Use mail_do_setup_draftbox.
-
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-display.c:
-	* component-factory.c: s/strncasecmp/g_strncasecmp
-
-	* mail-format.c (write_headers): Get rid of kludge around subject
-	beginning with spaces.
-	(mail_generate_reply): Get rid of kludge around subject beginning
-	with spaces and also use g_strncasecmp instead of strncasecmp for
-	portability
-
-	* mail-ops.c (forward_msg): Get rid of kludges around subject
-	beginning with spaces.
-
-2000-08-07  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_list_select): Clarify that the input row
-	is a model row, and swap it to a view row when finding the
-	next/previous row.
-	(idle_select_row): Select view row 0, not model row 0.
-
-	* mail-ops.c (select_first_unread): Start from view row 0, not
-	model row 0.
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_get_message_body): Renamed from reply_body()
-	so other functions can use it
-	(mail_generate_reply): Updated to reflect function name changes
-
-	* mail-ops.c (real_edit_msg): Attach a callback to the send signal
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): New menu item under
-	Actions to allow editing of messages.
-
-	* mail-ops.c (edit_message): New function for editing messages.
-
-	* component-factory.c (owner_set_cb): Create a global reference to
-	the Drafts mbox folder for the Composer to use
-
-2000-08-06  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config.c (ndialog_page_undone): Desensitize ok button
-	(sdialog_page_undone): ditto
-	(iddialog_page_undone): ditto
-	(news_page_new): Typo - news, not mail
-	(transport_page_new): Typo - transport, not source
-	(identity_dialog): Set undone callback
-	(source_dialog): ditto
-	(news_dialog): ditto
-	(mail_druid_identity_undone): Desensitize next button and
-	mark done flag as false
-	(mail_druid_source_undone): ditto
-	(mail_druid_transport_undone): ditto
-	(mail_druid_identity_done): Mark done flag as true
-	(mail_druid_source_done): ditto
-	(mail_druid_transport_done): ditto
-	(mail_druid_prepare): Use done flag to set next button 
-	sensitivity, fixes #467
-
-2000-08-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-crypto.c (mail_crypto_openpgp_encrypt): Added support for
-	encrypting with GnuPG.  Support for PGP5 and PGP2 are still in
-	progress.
-
-2000-08-05  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Remove bonobo 0.15
-	vs 0.15-and-a-half ifdef, since we require post-0.16 now.
-
-2000-08-04  Dan Winship  <danw@helixcode.com>
-
-	* mail-threads.c (mail_operation_wait_for_finish): Don't use
-	"while (gtk_events_pending ()) gtk_main_iteration ();" inside
-	another tight loop, because it makes the thread spin rather than
-	blocking and waiting like it should.
-
-2000-08-04  Peter Williams  <peterw@helixcode.com>
-
-	* message-thread.c (do_thread_messages): Uninitialized variable
-	fix.
-
-	* mail-threads.c (read_msg): Small leak fix.
-
-	* component-factory.c (owner_unset_cb): Use mail_operations_
-	terminate() instead of wait_for_finish().
-
-	* mail-threads.c (mail_operation_queue): Centralize the clur
-	handling functions; fix a race condition where the dispatcher
-	would overwrite the closure before the main thread could
-	free the old one.
-	(mail_operations_terminate): New function, wait for ops to
-	finished and kill the other thread.
-	(dispatch): changes to die when terminate is called (abort
-	on NULL spec).
-
-	* mail-ops.c (cleanup_display_message): Fix improper handling
-	of displaying a NULL message (which means clear the message
-	display).
-
-2000-08-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* message-list.c (message_list_regenerate): Free the GPtrArray
-	correctly instead of using `g_strfreev()'.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): release the ui_handler
-	after set_container.
-
-2000-08-03  Michael Meeks  <michael@helixcode.com>
-
-	* mail-config.c (identity_page_new): only whack the sig in if the
-	file exists.
-
-	* component-factory.c (factory_fn): count running instances,
-	attach destroy signal (factory_destroy): add. 
-
-	* main.c (main): pass orb around.
-
-2000-08-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (composer_send_cb): Yay, no more compiler warnings
-
-	* mail-config.c: set config = NULL
-	(provider_list) Eek! Initialize news to NULL!  Also, use
-	g_slist_prepend() for "performance" gains ;-)
-	(init_config): Set the config member data to NULL just to be on
-	the safe side
-	(clear_config): Don't bother freeing slist data if the slist is
-	NULL
-
-2000-08-03  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (op_forward_messages): Use the new dynamic
-	operation naming.
-
-	* message-thread.c (describe_thread_messages): Ditto.
-
-	* message-list.c (describe_regenerate_messagelist): Ditto.
-
-	* mail-threads.c (get_password_clicked): Dynamic generation
-	of descriptive text for mail operations. "Opening a folder" ->
-	"Opening INBOX". Supported only so far, will be implemented
-	quickly.
-	g_strdup() the old_message when changing the queue_window_label's
-	text.
-
-	* main.c (main): One more gconf reference to take out...
-
-	* mail-ops.c (composer_send_cb): Check for an identity before
-	sending.
-	
-2000-08-03  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config.glade: Increase window size slightly, rename
-	"Transport" to "Mail Transport"
-
-	* mail-config.c (init_config): Remove gconf references
-	(clear_config): ditto
-	(read_config): ditto
-	(write_config): ditto
-	(mail_config): Null provider lists before filling them
-	(mail_config_druid): ditto
-	(identity_page_new): Increase spacing of vbox
-	(service_page_new): ditto
-
-	* Makefile.am: Remove gconf references. 
-
-2000-08-02  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (service_page_item_new): Make the "test settings"
-	button FILL rather than SHRINK so it doesn't end up oddly-placed.
-
-	* mail-config-druid.glade: Make the icon background dark blue
-	like the surrounding area.
-
-2000-08-02  Peter Williams  <peterw@helixcode.com>
-
-	* component-factory.c (owner_unset_cb): Wait for async operations
-	to finish before exiting.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-ops.c, message-list.c: Emit "model_pre_change" where
-	appropriate.
-
-2000-08-02  Peter Williams  <peterw@helixcode.com>
-
-	* mail-config.h: #ifdef _MAIL_CONFIG_H protect the header.
-
-2000-08-01  Peter Williams  <peterw@helixcode.com>
-
-	* mail-threads.c: Implement Solaris threads. Attempt
-	to join to the thread upon exit -- hopefully prevents
-	all those nasty zombie processes from popping up :-(
-
-2000-08-01  Dan Winship  <danw@helixcode.com>
-
-	* mail-crypto.c: New code to spawn off GPG/PGP to do stuff.
-	Currently only deals with decryption. From Nathan Thompson-Amato
-	<ndt@jps.net>, with bunches of changes from me.
-
-	* session.c (mail_request_dialog): Expose the password dialog to
-	the rest of the app (for use by the GPG/PGP code).
-
-	* mail-format.c (handle_text_plain): Handle special inline data
-	types. (Currently uuencoding, BinHex, and PGP encryption.) This is
-	not the best way to deal with it, but it works for now.
-	(try_inline_pgp): Convert an inline PGP-encrypted message into a
-	multipart/encrypted part.
-	(try_inline_binhex): Convert an inline BinHex attachment into an
-	application/mac-binhex40 part (which we currently don't deal
-	with...)
-	(try_uudecoding): Convert a uuencoded attachment to an
-	application/octet-stream part.
-	(handle_multipart_encrypted): Deal with RFC2015 MIME-encoded PGP
-	encrypted messages. (From ndt.)
-
-	* mail-display.c (mail_text_write, mail_error_write): New utility
-	functions.
-
-	* Makefile.am (evolution_mail_SOURCES): add mail-crypto.c
-
-2000-07-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* component-factory.c, folder-browser.c: Fixed some warnings.
-
-	* message-list.c: Made the icon column non sortable.
-
-2000-07-31  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (service_page_set_url): Fix a NULL-pointer strcmp
-	noticed by peterw.
-
-2000-07-31  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-vfolder.h: Header for vfolder functions.
-
-	* folder-browser.c (mail_uri_to_folder): Use new scheme to open
-	vfolders.
-	(search_save): New button/function to save a search as a vfolder.
-
-	* mail-vfolder.c (vfolder_edit): Made asynchronous.
-	(vfolder_uri_to_folder): New function for loading vfolders and
-	setting up their source folders.
-	(vfolder_refresh): Change shell vfolder uri's to indirect
-	references rather than the real vfolder uri.
-	(vfolder_gui_add_rule): Add a rule with user confirmation.
-	(vfolder_create_part): Get a new part by name, for creating rules
-	in code.
-
-	* message-thread.c (thread_messages): Check for uid lookup
-	failure, which indicates an error in the folder or calling code.
-
-2000-07-29  Not Zed  <NotZed@HelixCode.com>
-
-	* component-factory.c (create_view): Remove hack to pass the
-	storage around.
-
-	* folder-browser-factory.c (control_activate): Changed to call
-	renamed vfolder editor.
-
-	* mail-ops.c (vfolder_edit_vfolders): renamed from vfolder_edit,
-	call new edit function.
-	(vfolder_editor_clicked): Removed.
-	(filter_druid_clicked):
-	(filter_edit): Updated for api change.
-	(real_fetch_mail): Fixed up for api change and fucked up indent.
-	(filter_get_folder): callback for filter driver.
-
-	* mail-vfolder.c: New file to manage virtual folders.
-
-2000-07-29  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Use new mail config stuff
-
-	* component-factory.c (create_imap_storage): Use new mail config
-	stuff
-	(create_news_storage): ditto
-
-	* evolution-mail.schemas: Gconf schema for evolution mail
-
-	* mail-config-druid.glade: Gladification of config druid
-
-	* mail-config.h: New header with config structs.
-
-	* mail-config.c: Rewrite of GUI configuration tools to use 
-	new config structs.  Stores multiple identities and sources now.
-	Still only uses the first one found.
-	(mail_config_fetch): Returns MailConfig struct to caller
-	for configuration queries.
-	(mail_config): Renamed function to show mail config dialog.
-	(mail_config_druid): Renamed function to show mail config druid.
-
-	* mail-ops.c (create_msg_composer): Use 
-	e_msg_composer_new_with_sig_file and new config stuff
-	(check_configured): Use new config stuff
-	(fetch_mail): ditto
-	(composer_send_cb): ditto
-
-2000-07-28  Cody Russell  <bratsche@gnome.org>
-        * mail-ops.c, mail.h: Added mark_all_seen(), to mark every
-        message in the list with CAMEL_MESSAGE_SEEN.
-
-        * folder-browser-factory.c: Added "Actions/Mark all seen".
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Lets fix Dan's kludge the Right Way (tm)
-	(set_service_url): Only strip off the leading "/" from the 
-	url->path if url->host is NULL
-	(get_service_url): Only prepend a leading "/" to the path if the
-	host is NULL
-
-2000-07-27  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (get_service_url): toss in a kludge to deal with
-	the IMAP vs mbox path problem for now.
-
-2000-07-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h: Removed counting of selected
-	messages.
-
-2000-07-26  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Don't create the tmp_mbox before
-	calling movemail, because the external movemail requires it to not
-	exist. Contrariwise, delete it in the cleanup code if it's empty.
-	Update for camel_movemail interface change. Do the "No new
-	messages" dialog in the mbox case as well as the remote mail
-	issue.
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c: s/struct refile_data/struct move_data
-	(real_move_msg): Renamed from real_refile_msg()
-	(move_msg): Renamed from refile_msg()
-
-	* folder-browser-factory.c: Changed Refile to Move.
-
-2000-07-26  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (lookup_handler): Update for OAF and for external
-	apps as well as components.
-	(handle_via_external): Handler to set up for data that can be
-	displayed by an external application.
-
-	* mail-display.c (on_link_clicked, etc): Refactor the save_data()
-	code and add launch_external() as a handler for
-	x-evolution-external URLs.
-	(embeddable_destroy_cb): Remove this, since it seems like it's all
-	wrong.
-	(on_object_requested): Update for OAF, and fix some bugs.
-
-2000-07-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (get_service_url): Always prepend a leading "/" to
-	the url->path.
-	(set_service_url): Added more error checking and also strip the
-	leading '/' from the url->path
-	(create_identity_page): Set the signature file to the one specified in
-	the identity record, else set the default path to ~/.sugnature
-
-2000-07-25  Michael Meeks  <michael@helixcode.com>
-
-	* mail-config.c (create_identity_page): set default signature to
-	~/.signature
-
-2000-07-25  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (reply): Check for the case of fb->mail_display->
-	current_message = NULL, which shouldn't happen, but has happened
-	to me.
-
-2000-07-25  Dan Winship  <danw@helixcode.com>
-
-	* message-thread.c (group_root_set): Don't group together messages
-	with the same non-Re: subject and no References/In-Reply-To. More
-	often than not, they're unrelated. (eg, "[No subject]".)
-	(thread_messages): Handle messages with no Message-Id. "This
-	shouldn't happen", but it does sometimes, and it's not much code
-	to make it just work.
-
-2000-07-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-config.c (create_service_page): Call
-	`gtk_option_menu_set_menu()' as the last thing, as `GtkOptionMenu'
-	is fscking broken.  Also, `gtk_widget_show()' the individual menu
-	items.
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (mark_msg_seen, ml_tree_set_value_at,
-	message_list_regenerate): Update for CamelFolder API changes.
-	(Certain functions no longer take a CamelException.)
-
-	* mail-ops.c (real_fetch_mail, real_send_mail, real_delete_msg):
-	ditto
-
-	* component-factory.c (real_create_imap_storage,
-	real_create_news_storage): ditto
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c, folder-browser-factory.c, test-mail.c:
-	Remove GOAD support.
-
-	* main.c: Remove GOAD support.
-	(main): More "guess the build mistake" fun, this time for the
-	failure to initialize Bonobo case.
-
-2000-07-24  Peter Williams  <peterw@helixcode.com>
-
-	* mail-tools.c (mail_tool_set_uid_flags): Change
-	function to faithfully pass parameters to
-	camel_folder_set_message_flags; this function is
-	somewhat useless now. Other files synced with
-	API change.
-
-	* mail-ops.c (op_display_message): Change "display
-	a message" into "retrieve a messsage" in the
-	description of mail_op_display_message.
-
-	* mail-threads.c (display_timeout): New function.
-	Only display the progress dialog if the operation
-	takes more than a second to perform.
-	(hide_queue_window): New function. Hide the queue
-	window as an idle function... I'm thinking maybe
-	the problem with hiding it was due to us not
-	being in a GTK event sequence? Perhaps it's only
-	the timeout, which was not being cancelled, which
-	is now.
-	
-	* message-list.c (get_message_uid): New function,
-	copy of get_message_info, except gets only the
-	UID, as that's all that most functions want, and
-	we avoid a Camel call.
-
-2000-07-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (create_message_composer): New.
-	(compose_msg): Use it.
-	(send_to_url): Likewise.
-	(forward_msg): Likewise.
-
-	* folder-browser-factory.c (control_activate): Use `_()' instead
-	of `N_()'.
-
-2000-07-21  Peter Williams  <peterw@helixcode.com>
-
-	* message-thread.c (setup_thread_messages): New
-	operation: thread_messages, simple wrapper around
-	thread_messages () and thread_messages_free();
-
-	* message-list.c (cleanup_regenerate_messagelist): 
-	Use new thread_messages operation instead of just
-	calling ... thread_messages :-)
-
-	* folder-browser.c (folder_browser_destroy): Use new
-	sync_folder operation instead of calling camel_folder_sync
-	directly.
-
-	* component-factory.c (create_folder): Changed to use
-	new create_folder operation.
-
-	* mail-ops.c (mail_do_create_folder): New operation: create
-	folder. New operation: sync folder.
-
-	* mail-format.c (cmm_destroyed): Remove the url hashtable from
-	the larger hashtable when it gets destroyed.
-
-	* mail-callbacks.c (fetch_mail): Pass a hook function and data
-	down the chain to pick up the folder_changed and change the view.
-
-	* mail-ops.c: Rename from mail-ops-new.c now that it's a little more
-	solid. 
-	(fetch_mail): Add new options to hook and unhook an event while the
-	filter driver runs. A hack, but all of the operations are to some
-	extent.
-	(cleanup_fetch_mail): Unref the destination folder if not NULL.
-	* mail-tools.c (mail_tool_filter_contents_into): Intermediate the
-	event hook/unhook hack here.
-
-2000-07-20  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops-new.c (setup_send_mail): Fix silly forgetting-to-ref
-	problem on some sends (when not replying). Note the early exit
-	path with a big comment.
-	
-	* message-list.c (message_list_set_folder): Don't call
-	folder_changed, call mail_do_regenerate_messagelist, as
-	the GDK_THREADS_ENTER in the former can deadlock us!
-
-	* folder-browser.c (folder_browser_set_uri): Ah, screw it.
-	Make 'load folder' asynchronous and pretend that it always
-	succeeds.
-
-	* mail-ops-new.c (mail_do_load_folder): New operation, loads
-	a folder into a FolderBrowser.
-	
-	* mail-threads.c (read_msg): Check if the exception is
-	a user cancel; don't complain if it is.
-	(mail_operation_queue): Same.
-	(dispatch_func): Same.
-
-2000-07-20  Peter Williams  <peterw@helixcode.com>
-	
-	* mail-ops-new.c (cleanup_send_mail): Fix evil mistaken
-	unref.
-
-	* test-thread.c: Fit the new mail_operation_spec prototype.
-
-	* mail-callbacks.c (composer_send_cb): Hide the composer upon
-	start of send operation.
-
-	* folder-browser.c: #include "mail-ops-new.h"
-
-	* mail-threads.h: Change text fields of mail_operation_spec to
-	provide two forms of the name.
-
-	* mail-threads.c: Use appropriate new string fields.
-	(dispatch_func): Hide the progressbar by default.
-	
-	* message-list.c (op_regenerate_messagelist): Fix the datasize from
-	0 -> sizeof (regenerate_messagelist_data_t). Add the new gerund and
-	infinitive strings.
-	(do_regenerate_messagelist): Include some code that fell between the
-	cracks.
-
-	* mail-ops-new.c (op_scan_subfolders): Same datasize fix for 
-	scan_subfolders.
-	(op_forward_message): Same.	
-	(all): Add new gerund and inifinitive strings for mail_operation_spec.
-	(cleanup_send_mail): Destroy the composer on success; re-show it on
-	error. I'm so clever!
-	
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (factory_fn): Updated for the new
-	`evolution_shell_component_new()' arg.
-
-2000-07-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-thread.c (thread_messages): What if message info is NULL?
-
-2000-07-17  Peter Williams  <peterw@helixcode.com>
-
-	* component-factory.c (real_create_{imap,news}_storage): Instead of
-	directly calling evolution_storage_new_folder, queue up a list of
-	folders to register so that we don't do our CORBA in The Other Thread.
-	(create_{imap,news}_storage): Changes ancillary to the above.
-	(add_new_mailbox): New function to queue up a folder
-	(cleanup_create_info): New function to dequeue the folders and free mem.
-
-	* test-thread.c: s,ENABLE_BROKEN_THREADS,USE_BROKEN_THREADS -- oops
-
-	* mail-format.c: (mail_lookup_url_table): New function to get the url
-	table associated with a CamelMimeMessage because we can no longer 
-	gtk_object_get_data on it.
-
-	* mail-display.c: replace 'gtk_object_get_data( message, "urls" )'
-	with 'mail_lookup_url_table( message )'
-
-2000-07-16  Jeffrey Stedfast <fejj@helixcode.com>
-
-	* folder-browser.c, component-factory.c: Initial code to support
-	IMAP folders that don't use "/" as a directory separator.
-
-2000-07-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (set_x_mailer_header): New helper function to set the
-	`X-Mailer:' header to to `Evolution <version> [Developer
-	Preview]".
-	(real_send_mail): Call it.
-
-2000-07-14  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* message-list.c (message_list_set_folder): Ported to CamelObject:
-	GTK_OBJECT->CAMEL_OBJECT; gtk_signal_connect->camel_object_hook_event;
-	GDK_THREADS_ENTER/LEAVE around "changed" event hooks.
-
-	* folder-browser.c (folder_browser_destroy): likewise.
-	(mail_uri_to_folder): likewise.
-	(folder_browser_load_folder): likewise.
-	
-2000-07-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (evolution_mail_LDADD): Add `GCONF_LIBS'.
-
-2000-07-14  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (write_headers): put a <p> at the end of the
-	header table. (I think there used to be whitespace after it, but
-	then some gtkhtml change got rid of it...)
-	(handle_text_plain): Don't do this <PRE>. Instead, CONVERT_NL and
-	CONVERT_SPACES and wrap it in <TT>. Now if the sender didn't
-	include any newlines, it will be wrapped to the width of the
-	window instead of extending off into infinity.
-
-2000-07-13  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_list_destroy): Only unref the folder if
-	it's been set.
-
-	* folder-browser.c (folder_browser_destroy): Only sync the folder
-	if it's been set.
-
-2000-07-13  Jonathan Blandford  <jrb@redhat.com>
-
-	* mail-config.c (create_transport):
-	s/CAMEL_SERVICE_NEED_HOST/CAMEL_SERVICE_URL_NEED_HOST.
-
-2000-07-13  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (add_row): Add a "gboolean required" argument, and
-	set its value on the entry.
-	(create_source, create_transport): Create rows for URL elements if
-	the URL ALLOWs them. Mark them required if it NEEDs them.
-	(service_note_doneness): Only require the required fields to be
-	filled in.
-
-	Now the IMAP config page allows the user to enter a path, but
-	doesn't require it.
-	
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Back to the old way to avoid
-	g_warnings, yay. Also fix append to send a flags argument (0)
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-config.c (providers_config_new): fix some cut & paste bung.
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-	
-	* mail-format.c (setup_function_table): add "message/news" to the
-	mime_function_table using the same handler as message/rfc822.
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-config.glade*: add news server tab to dialog.
-
-	* mail-config.c (on_NewsServerConfigDialogButton_clicked): new function.
-	(on_clistNewsServers_select_row): new function.
-	(on_cmdNewsServersAdd_clicked): new function.
-	(on_cmdNewsServersEdit_clicked): new function.
-	(on_cmdNewsServersDelete_clicked): new function.
-	(providers_config_new): mirror the source tab's code to fill in
-	the news server tab.
-	(write_config): save out the news server.
-	(create_news_server_config_dialog): new function.
-	(create_news_server_page): new function.
-
-2000-07-12  Peter Williams  <peterw@helixcode.com>
-
-	* mail-display.c (save_data): Change from evolution_dir to
-	g_get_home_dir() for default location of save file.
-
-2000-07-11  Dan Winship  <danw@helixcode.com>
-
-	* Update for CamelFolder API changes
-
-2000-07-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Changed to use 
-	camel_folder_move_message_to () rather than get_message () and then
-	append_message (). This also makes it so we don't have to worry about
-	fetching message flags to pass to the new append_message () method.
-
-	* folder-browser.c (folder_browser_load_folder): Disable
-	Search capability menu/entry if folder doesn't support it.
-
-	* message-list.c (message_list_regenerate): Don't perform
-	a search if the folder doesn't support it.
-
-2000-07-11  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (real_send_mail): Set the post_send_data flag rather
-	than toggling it. (Maybe we'll need more control over it later,
-	but for now, the only flag we set is "replied", and we want
-	that set, not toggled.)
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Work with both
-	current and 0.15 bonobo
-
-	* kill more debugging messages
-
-	* mail-ops.c (real_fetch_mail): Don't multiply free dest_url.
-
-	* message-list.c (message_list_select): Update
-	message_list_select_next to do either next or previous.
-
-	* folder-browser.c (etable_key): Make 'n' and 'p' do next and
-	previous unread message.
-
-	* mail-ops.c (select_first_unread): Update.
-	(real_fetch_mail): clean up a bit.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (forward_msg): Initialize `fwd_subj' to NULL if
-	`from' is NULL.
-
-2000-07-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Fixed broken POP fetching
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c: Removed variable `browsers'.
-	(create_view): Don't update it.
-	(owner_unset_cb): Don't sync the folders here anymore, because at
-	this point the folder browser is dead already so we cannot get a
-	valid list of folders from it anymore.
-
-	* folder-browser.c (folder_browser_destroy): Sync the associated
-	mailbox first.
-
-2000-07-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h: Switched from ETable to
-	ETableScrolled.
-
-2000-07-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Fixed movemail so that it too would
-	deliver to Inbox.
-
-2000-07-09  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (get_message_info): Don't g_warn if the user
-	selects a fake tree parent.
-	(message_list_select_next): Ignore fake rows
-	(build_tree): Store the "root_subject" for fake rows
-	(ml_tree_value_at): Display the correct subject for fake rows.
-	(on_cursor_change_cmd): Update for the other changes and set
-	cursor_uid to NULL when the cursor is on a fake row.
-
-	* mail-ops.c (reply): Don't try to reply when no (real) message is
-	selected.
-	(forward_msg): Ditto.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Remove setting of dnd_code since that's handled
-	internally to ETable.
-
-2000-07-08  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (etable_key): Fix up the pageup/pagedown
-	increment a bit.
-
-	* folder-browser-factory.c (control_activate): Add a "Threaded
-	Message List" item to the "View" menu.
-
-	* message-list.c (message_list_toggle_threads): Handler for that.
-	(build_flat): New function to build a "flat" message list using
-	the tree model.
-	(message_list_regenerate): Build tree or flat message list
-	depending on the global setting.
-
-	* message-thread.c (get_root_subject): fix a "Re:" parsing bug
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Always dump incoming messages to
-	Inbox (assuming not filtered to another location).
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Move the
-	"Expunge" item to the "Action" menu.
-	(control_deactivate): Accordingly.
-
-2000-07-08  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (forward_msg): Deal with having multiple selected
-	messages.
-
-	* mail-format.c (mail_generate_forward): Removed. (Integrated into
-	forward_msg)
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (build_tree): Small fix to stop uid data from
-	being set on a message-list tree node when it didn't correspond
-	to an actual message.
-
-2000-07-08  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (get_message_info): Fix Jeff's FIXME: This does
-	get called with out-of-range data sometimes, so we do need the
-	check. Use e_table_model_row_count to get the actual right answer.
-
-2000-07-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (get_message_info): This wasn't quite right, it
-	will now work but still isn't perfect. See FIXME comment.
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* message-thread.c (remove_node): Add another argument "clast"
-	pointing to the container before the current one in the list,
-	which it can update if that turns out to be the one that it
-	removed.
-	(group_root_set): Update for remove_node change, and remove both
-	nodes in the "subjects are common" case. Fixes a bug that would
-	cause the message list to be truncated if this rule was invoked.
-
-	(sort_node): sort the tree by the original order of the messages
-	in the folder rather than by date.
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c: Lots of changes. Store uids as node data on the
-	tree nodes and use those rather than rows where possible. (The
-	concept of "row" is just getting too complicated.) Get rid of the
-	summary_table, because given a uid we can call
-	camel_folder_get_message_info, which makes more sense than keeping
-	a separate uid->row hash table ourselves.
-
-	(get_message_info): update
-	(get_message_row): removed
-	(ml_col_cound, ml_row_count, ml_value_at, ml_set_value_at,
-	ml_cell_is_editable, ml_duplicate_value, ml_free_value,
-	ml_initialize_value, ml_value_is_empty, ml_value_to_string):
-	Removed. We always use the tree model now.
-	(message_list_init): Remove the non-tree code.
-	(build_tree): store uids in the tree rather than row numbers,
-	and build the message_list->uid_rowmap to map from uids to rows
-	when needed.
-	(message_list_regenerate): Renamed from _set_search, since it's
-	used to redraw in non-search cases too.
-	(message_changed): Use the uid_rowmap to get a model row number.
-
-	* message-thread.c (thread_messages): Change the interface on this
-	to work with the new MessageList.
-
-	* folder-browser.c (search_set, folder_browser_clear_search): 
-	s/message_list_set_search/message_list_regenerate/
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (get_message_info): Handle a row number of -1
-	properly.
-
-2000-07-06  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (get_message_info): Map tree model row numbers to
-	summary row numbers.
-	(ml_tree_value_at, ml_tree_set_value_at,
-	ml_tree_is_cell_editable): So don't do that here.
-
-2000-07-06  JP Rosevear  <jpr@arcavia.com>
-
-	* mail-config.glade*: Glade files for the configuration dialog.
-	
-	* mail-config.c (providers_config_new): Build the dialog with
-	glade.
-
-2000-07-06  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c, folder-browser.c, mail-ops.c,
-	message-list.c: fix warnings.
-
-	* main.c (main): gtkhtmllib_init is no more. Call gconf_init
-	directly instead.
-
-	* message-list.c (message_list_select_next): New function to
-	select the first message on or after the given row that meets
-	certain flag criteria.
-
-	* mail-ops.c (real_fetch_mail): call message_list_select_next to
-	select first unread message in current folder if it changes.
-	(real_delete_msg): Remove the code to move the etable cursor. It
-	only makes sense really if you deleted the message with the
-	keyboard, so do it from etable_key.
-
-	* folder-browser.c (etable_key): call message_list_select_next to
-	select next non-deleted message after Delete.
-
-	* mail-identify.c: Add a workaround for a small gnome-vfs 0.2 bug
-	so we don't need to require CVS gnome-vfs.
-
-2000-07-06  Not Zed  <NotZed@HelixCode.com>
-
-	* message-thread.c (sort_thread): sort messages based on date for
-	the initial sort order.
-	(thread_messages_free): Implement.
-
-	* message-list.c (message_list_init_header): Setup the subject
-	renderer to a tree in tree mode.
-	(on_cursor_change_cmd): For a tree model, map the view row to the
-	data row.
-	(build_tree): Builds the tree data structure of all messages.
-	(message_list_set_search): For a tree model, build the tree here.
-	(ml_tree_icon_at): Icon callback, returns nothing.
-	(ml_tree_value_at):
-	(ml_tree_set_value_at): 
-	(ml_tree_is_cell_editable): Maps tree node to data row, and calls
-	the equivalent table callback
-	(message_list_init_renderers): Setup the tree renderer if needed.
-	(message_list_init): set the root node invisible afterall.
-	(message_list_set_search): Clear the old tree before putting in a
-	new one.
-
-	* message-list.h: Add a tree renderer to render list, and
-	tree_view indicator.
-
-	* message-thread.[ch]: Code for message threading. 
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* mail-identify.c (mail_identify_mime_part): Oops. My gnome-vfs
-	was out-of-date. Update for changed function name.
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* mail-identify.c (mail_identify_mime_part): Use the gnomevfs
-	sniff buffer interface to try to identify the MIME type when
-	everything else fails.
-
-	* mail-display.c (on_object_requested):
-	* mail-format.c (lookup_handler, handle_undisplayable,
-	handle_audio): s/gnome_mime/gnome_vfs_mime/
-
-	* Makefile.am: Add gnomevfs stuff
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (create_folder): Get rid of a compiler
-	warning by making sure `folder' is always initialized to some
-	value for any code path.
-
-2000-07-03  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (select_msg): call mail_display_set_message with
-	NULL if the message we tried to select doesn't exist (probably
-	meaning we tried to selecte the first message and the folder is
-	empty.)
-
-	* mail-display.c (mail_display_set_message): deal with NULL as an
-	input (meaning "undisplay previous message and display nothing").
-
-2000-07-02  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Remove hack to redisplay the
-	inbox, since folder_changed signals will now be emitted
-	appropriately.
-
-	* component-factory.c (create_vfolder_storage): Fix
-	filter_driver_new invocation.
-
-	* Makefile.am (bin_PROGRAMS): test-mail and test-thread should be
-	noinst.
-
-	* mail-ops.c (real_fetch_mail): 
-	(vfolder_editor_clicked): 
-	* component-factory.c (create_vfolder_storage):
-	Pass mail_uri_to_folder and rules to filter_driver_new.
-
-2000-07-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser.c (mail_uri_to_folder): Fix double freeing of the
-	local exception `ex'.
-
-2000-07-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (refile_msg): Only allow type "mail" in the folder
-	selection dialog.
-
-2000-07-01  Dan Winship  <danw@helixcode.com>
-
-	* pixmaps.h, pixmaps/*.xpm: Removed. These aren't being used any
-	more. (The real pixmaps are in ../art.)
-
-2000-07-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (get_message_info):
-	(select_msg): Updated to reflect camel-folder changes.
-
-	* mail-ops.c (real_fetch_mail): Modified to reflect camel-folder
-	changes.
-
-2000-06-30  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (print_msg): Use gnome-print to do a print preview.
-
-	* folder-browser-factory.c: Hook up "Print" button.
-
-	* message-list.c (message_list_foreach): New function, a wrapper
-	around e_table_selected_row_foreach, which calls the callback
-	function with UIDs rather than row numbers.
-
-	* folder-browser-factory.c: Remove never-used "Find" button from
-	the toolbar and replace it with "Refile". (We need a better icon
-	for this...). Hook up "Refile" to "refile_msg".
-
-	* mail-ops.c (refile_msg): Call the shell's user_select_folder
-	routine, and then use message_list_foreach and real_refile_msg to
-	do the work.
-	(delete_msg): Update to use message_list_foreach.
-
-	* folder-browser.c (mail_uri_to_folder): new function, extracted
-	from folder_browser_load_folder, to turn a URI into a folder.
-	(folder_browser_load_folder): Use it.
-
-2000-06-30  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* component-factory.c (create_news_storage, create_imap_storage):
-	Fixed to use new EvolutionShellClient proxy thingamajiggie.
-
-2000-06-30  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (on_row_selection): use the ETable row_selection
-	signal to track how many rows are selected. Eventually we will use
-	this info to disable toolbar buttons when you have too few/too
-	many messages selected, but the current toolbar widget doesn't
-	allow that.
-
-	* message-list.h, message-list.c, mail-ops.c: Change selected_row
-	and selected_uid fields of MessageList to cursor_row and
-	cursor_uid to be more correct according to the new ETable
-	interfaces.
-
-2000-06-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c: Eeek.  Fix typo: add missing star in the
-	declaration of `global_shell_client'.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c: Replace `global_shell_interface' with
-	`global_shell_client'.
-
-2000-06-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (delete_msg): Clean up compile warnings
-	(real_fetch_mail): Fetching from IMAP should do nothing
-
-2000-06-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-ops.c: Handle multiple deletes (change by Peter Williams.)
-
-2000-06-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Changed "Send" to "Compose" to
-	avoid user confusion. Compose is a little more intuitive.
-	Also changed the pixmap to MAIL_NEW instead of MAIL_SND
-
-	* mail-ops.c (compose_msg): Renamed to avoid confusion
-
-2000-06-29  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c (create_imap_storage, create_news_storage):
-	remove some code incorrectly copied and pasted from
-	create_vfolder_storage which caused vfolder creation to stop
-	working.
-
-2000-06-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, mail-ops.c: Changed the name of
-	e_table_select_row to e_table_set_cursor_row.
-
-2000-06-29  Peter Williams  <peterw@helixcode.com>
-
-	* message-list.c (message_list_init): Set the dnd_code of the
-	ETableHeader to something so that Solaris sprintf doesn't die
-	on a NULL string.
-
-	* mail-config.c (providers_config_new): Check for a null "transport"
-	string (not all OS' handle NULL strings well *cough* Solaris)
-
-2000-06-28  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (mail_generate_forward): add default subjects
-
-	* component-factory.c (create_folder): Refuse to create folders
-	not of type "mail", and correctly create an empty "mbox" folder
-	for new folders in /local.
-
-	* main.c (init_corba): Call od_assert_using_oaf() or
-	od_assert_using_goad() as appropriate to make sure people didn't
-	somehow trick the build system.
-
-2000-06-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c: Added prototype for filter_date to make
-	it build cleanly
-
-2000-06-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Made dates display grouping information
-	properly.
-
-2000-06-27  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* message-list.c (mark_msg_seen): Need to return a value
-	on error.
-
-	* main.c (main): Don't start threads or enter threads if
-	there's no threading! Sigh.
-
-	* test-thread.c: Don't compile if no threads.
-
-	* session.c: Work without broken threads.
-
-	* message-list.c (filter_date): Solve the ctime_r problem the
-	correct way, with the magic of autoconf.
-
-2000-06-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Work around mismatched ctime_r functions.  This
-	will be fixed.
-
-2000-06-27  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* mail-threads.c: Don't compile this if we don't have
-	threads enabled. This should maybe be on the Makefile.am
-	level.
-
-2000-06-27  Michael Zucchi  <zucchi@zedzone.mmc.com.au>
-
-	* component-factory.c (owner_set_cb): Put in a gross hack to
-	export the shell reference elsewhere.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Added a value_to_string handler.
-
-2000-06-26  Peter Williams  <peterw@helixcode.com>
-
-	* component-factory.c, mail-ops.c: #ifdef the threads stuff so
-	that if USE_BROKEN_THREADS is not defined we just call the functions
-	in the main thread.
-
-	* mail-threads.h: Don't declare funcs if USE_BROKEN_THREADS not
-	defined.
-
-	* mail-threads.c: Put the query and message boxes on top so that
-	you can see them.
-
-2000-06-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (error_dialog): va_start() returns void, don't
-	assign it's retval to a variable.
-
-2000-06-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (main): Call `GDK_THREADS_ENTER()' and
-	`GDK_THREADS_LEAVE()' around the main loop as in the examples from
-	the GTK+ FAQ.
-
-	* mail-threads.c (DEBUG): New macro for debugging.
-	(read_msg): Use it.
-
-2000-06-25  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am: Clean up the various _LIBS and _CFLAGS
-	to work with simpler THREADS_LIBS and THREADS_CFLAGS scheme.
-
-2000-06-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Improved the
-	code to separate the imap namespace from the folder name.
-
-2000-06-23  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* component-factory.c: Include e-util/e-setup.h for the
-	prototype of evolution_dir; prototype create_news_storage.
-	(real_create_imap_storage, real_create_news_storage): New
-	functions moving the camel stuff into the async callback.
-	(create_imap_storage, create_news_storage): Chopped in
-	half to move camel stuff as above.
-
-	* mail-ops.c: Include "mail-threads.h" for threading protos.
-	(real_fetch_mail, real_send_mail, real_expunge_folder): 
-	New functions moving the camel stuff into the async callback.
-	(async_mail_exception_dialog): A version of mail_exception_dialog
-	to be called from the async handlers (just calls mail_op_error())
-	(fetch_mail, expunge_folder, composer_send_cb): Cut in half to
-	move camel stuff as above.
-	(cleanup_send_mail): Clean up after the async real_send_mail
-	with the gtk_object_destroys et al.
-
-	* mail-threads.c: Instead of hiding the progress bar, make it
-	zip back and forth constantly.
-	(progress_timeout): New func. Timeout called to make the pbar
-	shimmy.
-	(timeout_toggle): New func. Turn on and off the shimmy effect.
-	(check_cond): New func. Make sure that the GCond for modal
-	operation is initialized before mail_op_{error,get_password}.
-	(show_error_clicked, read_msg, get_password_clicked): Move
-	over to timeout_toggle.
-	(mail_op_error,mail_op_get_password): Add check_cond() call.
-
-	* main.c: (main) Call g_thread_init.
-
-	* session.c: Change auth_callback stuff over to assume that it's
-	being called async. Note: no real good way to tell if this is
-	the case or not.
-	(request_callback): ifdef'ed out
-	(evolution_auth_callback): Use mail_op_get_password.
-	
-2000-06-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Now should
-	correctly get the selected folder from the given URL.
-
-2000-06-22  Chris Toshok  <toshok@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): add handling for
-	loading "news:" folders.
-
-	* component-factory.c (create_news_storage): add a root for news
-	source.
-	(owner_set_cb): call create_news_storage.
-
-2000-06-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Updated to
-	prepend url-> path if it exists for that imap store.
-
-	* component-factory.c (create_imap_storage): Modified to not
-	prepend a hard-coded namespace.
-
-2000-06-22  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-ops.c (fetch_mail_cleanup): new function, passed as arg to
-	mail_operation_try.
-	(fetch_mail): add cleanup func arg.
-
-2000-06-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Changed ml_value_at to return "" instead of NULL
-	in some cases.
-
-2000-06-22  Peter Williams  <peterw@curious-george.helixcode.com>
-	* Makefile.am: Add GNOME_EXTRA_LIBS so that we get libgthread
-	in our LIBS for evolution-mail.
-	
-	* mail-threads.c: Make the dialog boxes for error and
-	question non-modal. They're modal relative to the dispatch
-	thread, but before they would also eg lock up the toolbar
-	buttons (while the menus, managed by another process, were
-	active -- a weird effect).
-	
-2000-06-22  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* mail-threads.[ch]: Extra argument to mail_operation_try:
-	'cleanup', a function to be called in the main thread after
-	the dispatcher thread exits. gtk_object_destroy's et al may
-	attempt to unmap windows so we can't do them in the dispatcher
-	thread :-(
-
-	* test-thread.c: Updated with demo of new argument working.
-
-2000-06-22  Peter Williams  <peterw@helixcode.com>
-
-	* test-thread.c (op_5): New tests for the get_password
-	hook.
-
-	* mail-threads.[ch]: New hook, mail_op_get_password, for
-	getting a user response from an async operation. The operation
-	blocks while waiting for the response. A big whole mutex 
-	condition threading blocking dealie to make sure that it 
-	works.
-
-	Also the error hook creates a dialog again, which also needs
-	to block its caller while we wait for the user to press ok.
-
-2000-06-22  Peter Williams  <peterw@helixcode.com>
-
-	* mail-threads.c (various functions): Prettify the UI
-	so that the progress bar doesn't become all huge 'n stuff.
-	(mail_operation_try): Now save the operation's description,
-	so that we can display it later as the default message.
-	(read_msg): When the operation starts set the label to its
-	UI-friendly name.
-	(dispatch_func): Free the saved prettyname.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Removed an erroneous comment.
-
-2000-06-21  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (create_transport_page): Make this not crash if
-	you don't have a transport configured.
-	
-	* message-list.c: Update received date to work like sent date.
-
-2000-06-21  Peter Williams  <peterw@helixcode.com>
-
-	* mail-thread.{c,h}: New files -- a simple API for executing
-	the major mail ops (fetch_mail etc) asynchronously, allowing
-	the operations to send messages and update a progress bar.
-
-	* test-thread.{c,h}: Tests the mail-thread API.
-
-	* Makefile.am: add mail-thread.[ch] to evolution_mail_SOURCES
-	and declare the test_thread noinst_PROGRAM.
-
-2000-06-21  Peter Williams  <peterw@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Include "e-setup.h" to
-	get the prototype for evolution_dir.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* component-factory.c (create_imap_storage): Oops. Should
-	have checked for a NULL sources.
-
-2000-06-20  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (mark_msg_seen): Quick hack to prevent a NULL
-	pointer dereference. Things need to be cleaned up a bit more here
-	though.
-
-	* mail-sources.c: Oops. This should have been removed a long time
-	ago.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Working on getting 
-	this to work :)
-
-	* component-factory.c (create_imap_storage): Should now correctly
-	construct the folder path allowing the selection of a folder.
-
-2000-06-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Declare `evolution_dir'.
-	Ugly, ugly, ugly, but I am not sure where it should go instead.
-
-2000-06-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (ask_confirm_for_empty_subject): New function to ask
-	confirmation for an empty subject line.
-	(composer_send_cb): Use it if the subject is empty and only send
-	the message if the user confirms.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* component-factory.c (create_imap_storage): Now creates the IMAP
-	storage (listing subfolders and such)
-
-2000-06-19  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (find_preferred_alternative): add an option to
-	prefer text/plain.
-	(reply_body): add an option to prefer text/plain
-	(mail_generate_reply): Check the mail sending preferences, and
-	generate a text/plain reply if the user prefers to send plain text
-	(and we have a text/plain part to generate a reply from).
-
-2000-06-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (providers_config_new): Should now correctly display
-	the Transport page (made it set the optionmenu correctly, before it
-	would only set SMTP).
-	(create_transport_page): Updated to set the page info to sendmail/smtp
-	based on the url.
-	(create_service_page): Had to add some code to set data on some objects
-	so I could grab the objects I needed to modify in the above function.
-
-2000-06-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): started to add
-	code to load an IMAP folder.
-	
-	* component-factory.c: Started to add a create_imap_storage 
-	method so that we can eventually have our IMAP store displayed 
-	in the tree view.
-	(create_vfolder_storage): Renamed from
-	create_test_storage().
-	(owner_set_cb): Updated.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_list_set_folder): Prevent double-freeing
-	action on summary_table and uid_rowmap.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (ml_set_value_at): Implement clicking on the
-	envelope icon to set read/unread. Based on a patch by clahey.
-	(select_msg): keep the timeout id for the "seen" flagging in the
-	message_list structure, so ml_set_value_at can clear it so it
-	doesn't re-mark a message seen after you click it unseen.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (get_message_row): new function to do a uid to
-	row mapping.
-	(mark_msg_seen, select_msg, message_changed,
-	message_list_set_folder): Update for Camel flag changes.
-	(on_cursor_change_cmd): Rename "row_to_select" to "selected_row",
-	and keep a "selected_uid" as well.
-
-	* mail-ops.c (composer_send_cb): Update for Camel flag changes,
-	and fix some memory-handling bugs. (Free the post_send_data when
-	the composer is destroyed, not when the user clicks "send", which
-	could happen never, or more than once.)
-	(delete_msg): Update for Camel flag changes, and fix the "holding
-	down the delete key skips some messages" bug.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (fetch_mail): 
-	* component-factory.c (owner_unset_cb): 
-	* message-list.c (message_list_set_folder): Update for CamelFolder
-	changes.
-
-	* folder-browser.c (folder_browser_clear_search): New function to
-	revert back to non-searching mode.
-
-	* mail-ops.c (fetch_mail): Use folder_browser_clear_search.
-
-	* mail-display.c (on_url_requested): if the document requests an
-	unknown URL, it's not an error; just ignore the URL.
-
-	* mail-ops.c (fetch_mail): If there's no new mail, tell the user.
-
-2000-06-14  Radek Doulik  <rodo@helixcode.com>
-
-	* main.c (main): call gtkhtmllib_init here
-
-2000-06-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (on_SourceConfigDialogButton_clicked): Make sure source
-	is always pointing to something, so a blank is not written to the config file
-	on close.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (SHELL_OBJS): Removed.
-	(evolution_mail_LDADD): Use `libeshell.a'.  Also use
-	`top_builddir' consistently.
-
-2000-06-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Got rid of sources_max_row and identities_max_row
-	as they are not really needed (just use clist->rows)
-	(on_cmdSourcesEdit_clicked): Modified to make 'source'
-	point to the data being edited.
-	(on_cmdSourcesAdd_clicked): Adds a new clist item and selects it so the
-	editor knows where to stick the data when it's done.
-
-2000-06-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* message-list.c: Removed the ETableModel thaw handler.
-
-2000-06-12  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (folder_browser_set_uri): Return the result of
-	folder_browser_load_folder.
-	(get_prop, set_prop, folder_browser_properties_init): Remove. No
-	longer needed.
-
-	* folder-browser-factory.c (folder_browser_factory_new_control):
-	Add a "uri" argument, return NULL if setting it fails.
-	(folder_browser_factory_new_control): Remove property bag stuff.
-	(folder_browser_factory_init, folder_browser_factory): Remove
-	this, since we're using the component factory now.
-
-	* component-factory.c (create_view): Update for
-	folder_browser_factory_new_control change and return NOTFOUND as
-	appropriate.
-
-	* main.c (main): Don't call folder_browser_factory_init.
-
-	* mail-format.c (mail_generate_reply): Fix the subject generation
-	so we don't get "Re:  Re:". This is working around something that
-	may later be declared a misfeature in Camel.
-
-2000-06-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (create_folder): New stub implementation for
-	the folder creation function in the EvolutionShellComponent we
-	expose [it simply returns success all the time].
-	(factory_fn): Pass this function to `evolution_shell_component_new'.
-
-2000-06-09  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (folder_browser_new): Add a serial number to
-	FolderBrowser.
-
-	* folder-browser-factory.c (control_activate, control_deactivate):
-	Include fb serial number in the name of the Bonobo toolbar to
-	prevent problems with disappearing toolbars. This is a kludge and
-	should go away.
-
-
-	* mail-ops.c (expunge_folder): display error from
-	camel_folder_expunge if there is one.
-
-	* message-list.c (select_row): install an idle function to
-	select the row rather than doing it directly. Ugh. What a
-	kludge, but at least it works now.
-
-	* session.c (evolution_auth_callback): Update for
-	CamelAuthCallback changes. (Uncache passwords when asked to.)
-
-	* mail-ops.c (fetch_mail): close and expunge the source folder
-	after copying it to a local folder.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (create_view): Updated to match the changes
-	to the definition of `EvolutionShellComponentCreateFn'.  If @type
-	is not "mail", return an "unsupported type" error.
-	(factory_fn): Pass NULL for the `remove_folder' and
-	`create_folder' functions.
-
-2000-06-09  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c: Redo things a bit so that whitespace-only
-	text parts aren't displayed. (In particular, so that
-	whitespace-only subparts of multipart/mixed aren't displayed as
-	separate (empty) parts.)
-
-2000-06-06  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (fetch_mail): 
-	* folder-browser.c (folder_browser_load_folder): Update for folder
-	creation/existence changes.
-
-	* message-list.c (message_list_set_folder): Remove the code to
-	create the folder if it doesn't exist, since we don't want to do
-	that.
-
-2000-06-05  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (composer_send_cb): Leave the composer window around
-	if the message doesn't get sent.
-
-2000-06-05  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser.c (etable_key): Allow "GDK_KP_Delete", a keypad
-	delete key, to delete a message.
-
-2000-06-05  Dan Winship  <danw@helixcode.com>
-
-	* session.c (evolution_auth_callback): Remember passwords between
-	calls.
-	(forget_passwords): Callback for "Forget Passwords" menu item.
-
-	* folder-browser-factory.c (control_activate): 
-	(control_deactivate): Add "Forget Passwords" menu item.
-
-	* mail.h, mail-ops.c: fix some function prototypes
-
-	* folder-browser.c (etable_key): Add "Delete" = delete message.
-
-	* mail-format.c (mail_generate_forward): Update for new composer
-	attachment interface.
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (providers_config_new): Added a new notebook
-	page that allowed for mail format (text/plain or 
-	multipart/alternative)
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (filter_date): If the date in the summary is 0,
-	output "?".
-
-	* component-factory.c (create_view): keep a GList of folder
-	browsers created
-	(owner_unset_cb): Go through the list and close each folder before
-	exiting so they sync their summary state, etc to disk.
-
-	* mail-ops.c (fetch_mail): Use camel_service_connect, not
-	connect_with_url, since we already passed the URL into
-	camel_session_get_store.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Use camel_folder_free_summary instead of
-	g_ptr_array_free.  Unref the folder when we're done with it.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* session.c: Revert removal of e_setup_base_dir.
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (my_folder_browser_init): Connect to ETable's
-	key_press signal.
-	(etable_key): scroll mail on space/backspace.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Made sent column as wide as from column.
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (on_cmdSourcesAdd_clicked): Changed identity_row
-	to source_row as this is a Sources clist we are dealing with and
-	not an identity clist
-	(on_cmdSourcesEdit_clicked): same
-	(on_cmdSourcesDelete_clicked): again, same
-	(on_cmdSourcesEdit_clicked): Source editor now fills in data from
-	the clist
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c: Add a date column.	
-	(COL_SENT_WIDTH_MIN): Make this wider.
-	(ml_value_at): return the sent date (as a time_t) for COL_SENT.
-	(Fix COL_TO too while I'm here.) 
-	(ml_duplicate_value, ml_free_value, ml_initialize_value,
-	ml_value_is_empty): COL_SENT is numeric now.
-	(message_list_init_renderers): Create a date renderer (using
-	text_filter to translate the time_t into a string).
-	(message_list_init_header): Use render_date for COL_SENT.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* session.c: Don't call e_setup_base_dir.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (mail_generate_forward): Fix forwarding to work
-	for people other than me. :) [Although apparently it doesn't
-	really.]
-
-	* mail-ops.c (delete_msg): Add a quick hack to move the selection
-	down a row when you delete a message.
-
-	* mail-format.c (handle_message_rfc822): use <blockquote> rather
-	than <center><table border=1 width=95%> to frame the embedded
-	message. If <pre> text in the subtable won't fit in the 95% width,
-	GtkHTML will write past the border of the table (and
-	<blockquote><table border=1> causes creeping updates so it's not
-	usable for now).
-	
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (message_list_init): Turn off the grid in our
-	ETable.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (write_headers): Oops. This needs to take a
-	message argument because we might be writing headers for an
-	embedded message/rfc822 subpart rather than the root document.
-
-2000-06-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Config dialogs are completed.
-	(service_acceptable): Fixed a segfault caused by duplicate 
-	camel_exception_free()
-	(providers_config_new): Identity and Source clists are now filled in
-	when the dialog is created as well as the Transport page
-
-	* folder-browser-factory.c: Renamed Tool/ menu items
-	Vfolder was changed to Virtual Folder and
-	Configure Camel Providers was changed to Mail Configuration
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (evolution_mail_LDADD): Link with
-	`libemiscwidgets.a'.
-
-	* mail-display.c (mail_display_new): Use an EScrollFrame instead
-	of a GtkScrolledWindow.
-	(mail_display_set_message): Likewise.
-
-	* mail-display.h: Replace the GtkScrolledWindow with an
-	EScrollFrame.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c (owner_unset_cb): Quit when the shell exits.
-	This is a kludge, but a pretty necessary one until the refcounting
-	bugs that keep the component from exiting properly are fixed.
-
-2000-05-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Partially implemented the source
-	configuration, seems to segfault due to a destroyed
-	gnome dialog being destroyed again in the method
-	on_SourceConfigDialogButton_clicked()
-
-2000-05-31  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (free_url, handle_text_enriched,
-	get_url_for_icon): Fix up memory management of x-evolution-data
-	URLs so the URLs and/or their data don't get freed while there are
-	still references to them.
-
-	* message-list.c (message_list_init_header): redo the (unused)
-	online status column to no longer refer to pixmaps that no longer
-	exist.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Put the toolbar
-	into a frame to make it look like standard GNOME toolbars.  Also,
-	set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not do
-	evil things when its moved to the left or the right of the window.
-
-2000-05-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Configuration dialog now allows 
-	adding/editing/deleting of Identities (which leaves
-	adding/editing/deleting of sources left to implement).
-	The data is also saved when the dialog is exited via 
-	the OK button.
-
-2000-05-31  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (mail_format_mime_message): Initialize the "urls"
-	hash table stored on the message and store cid and other URLs
-	there rather than as object data on the message.
-	(get_cid): rewrite this a bunch
-	(handle_text_enriched): move the code from write_iframe_string()
-	into here, since it's the only place that actually needs it.
-	(handle_text_html): simplify this a lot. We can use a cid: URL
-	here rather than x-evolution-data.
-	(get_url_for_icon): New routine to return URLs for icons, and
-	cache the results, so we don't have to keep re-reading the icon
-	files (and so we can't be spoofed into reading non-icon files).
-	(handle_mystery, handle_audio): use get_url_for_icon.
-
-	* mail-display.c (save_data): move the CamelMimePart filename
-	extracting code from get_cid to here.
-	(on_link_clicked, on_object_requested): Update for cid: changes.
-	(on_url_requested): Kill off the kludgy, exploitable x-gnome-icon
-	URL schema, update cid and x-evolution-data to match
-	mail-format.c.
-
-	It should now be easier to implement RFC 2557 (Content-Location,
-	etc), but that RFC still pretty much sucks.
-
-2000-05-30  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c: Redo this back to the old way: a single GtkHTML
-	with various things inline in it. (Gets rid of flicker, simplifies
-	some scrolling, selecting, and printing issues.)
-	(handle_text_enriched, handle_text_html): Use <iframe>s for these,
-	to protect the rest of the document from their possibily invalid
-	HTML.
-	(handle_via_bonobo): Use (new-and-improved) <object> tags for
-	this, moving most of the work back into mail-display.c
-
-	* mail-display.c (on_object_requested): Move the Bonobo embedding
-	code back here again (reorganized a bit).
-	(on_url_requested): add x-evolution-data handler, for iframe
-	bodies.
-	(mail_html_new, mail_html_end): removed
-	(mail_display_set_message, mail_display_new): Update for NWO.
-
-2000-05-30  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (search_set): Properly encode the search string.
-
-2000-05-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail.h: Added a prototype for providers_config_new() which
-	is the constructor for the configuration dialog window
-
-	* mail-config.c: Added set_service_url() which is basically
-	the reverse of get_service_url().
-	Implemented on_cmdCamelServicesOK_clicked() - The configuration
-	window will now remember the Sendmail/SMTP data that the user
-	had entered in the previous session.
-	Removed on_cmdCamelServicesApply_clicked() - No need for this.
-
-2000-05-30  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_changed): call
-	e_table_model_row_changed, not e_table_model_changed so we do less
-	work, and don't lose the current selection.
-	(select_msg): Set up a timer to mark the displayed message as
-	"seen" if it's selected for longer than 1.5 seconds (a number
-	pulled out of Matt's butt).
-	(ml_value_at): Use the MESSAGE_STATUS column for read/unread as
-	well as deleted.
-
-	* message-list.c: use the "new" tigert pixmaps rather than the
-	older ones. Includes a "replied to" icon (which is used now), but
-	no "deleted" icon (although we have the strikeout renderer for
-	that now).
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h: Added bold for unread messages.
-
-2000-05-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail.h: Added a prototype for providers_config()
-	which is the callback for a new menu item that
-	will construct a configuration dialog for the camel
-	providers and identities and display it
-
-	* mail-config.c: Added some code to construct the 
-	new providers dialog and a bunch of callbacks (most 
-	of which are not yet useful)
-
-	* mail-ops.c: Added the code for the providers_confi()
-	callback
-
-	* folder-browser-factory.c: Added the 
-	"Tools/Camel Providers Configuration ..." menu item
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Switched to using "cursor_change" signal instead
-	of "row_selection" for switching messages.  Select the first row
-	(still doesn't work because of ETable.)  Adapt to some small
-	ETable changes.  Set drawfocus to FALSE.
-
-2000-05-29  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Hardcode the
-	vfolder source to just the inbox (so at least it returns
-	something).
-
-	* component-factory.c (create_test_storage): Create a vfolder dir
-	first, and put the folders in that.
-	(create_test_storage): Create the storage as VFolders, not
-	"storage_name" :)
-
-2000-05-28  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (error_dialog): helper function since we need to
-	set "modal" on the dialogs returned by gnome_error_dialog to make
-	them work when popped up from the modal Druid.
-	(service_acceptable): New function to check if the info entered on
-	a store/transport page actually checks out.
-	(mail_config_druid): Connect to the "next" signal on the store and
-	transport pages and don't let the user continue if the data is
-	bad and "check this before continuing" is checked. Also, only
-	display sources/transports in the "mail" domain. (Ie, not
-	"vfolder".)
-
-	* mail-format.c (write_recipients_to_stream): Use `foo@bar' rather
-	than `<foo@bar>' for recipient with no name.
-
-	* mail-ops.c (fetch_mail): don't put up an error message if the
-	user cancels the password dialog.
-
-2000-05-27  Not Zed  <NotZed@HelixCode.com>
-
-	* Makefile.am (SHELL_OBJS): Include mail storage so we can
-	initialise folders.
-
-	* component-factory.c (create_test_storage): Parses vfolder
-	defintions and adds them to the storage.  Definetly needs more
-	work.
-
-	* folder-browser-factory.c (control_activate): Add the VFolder
-	druid menu item.
-	(control_deactivate): And remove it.
-
-	* mail-ops.c (vfolder_editor_clicked): For editing vfolder
-	definitions (rather like filters, oddly enough :).  Tries to
-	update the shell but it doesn't seem to work properly - requires a
-	mail component restart to take effect.
-
-	* folder-browser.c (folder_browser_load_folder): Handle vfolder:
-	urls' appropriately and map to camel.  Still needs a way to tell
-	the vfolder what folders to search! (all vfolders come up empty!).
-
-2000-05-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h: Added a COL_DELETED and made it
-	the strikeout column for both text renderers.
-
-2000-05-27  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c: Various improvements:
-
-	(call_handler_function, etc): Add a "mime_type" argument to the
-	handlers, so that if a part is tagged as
-	"application/octet-stream", and we figure out that it's really
-	something else, the handler we call can know what that something
-	else is.
-
-	(handle_text_enriched): Small fixes to make this not do
-	text/enriched-specific syntax in text/richtext or vice versa.
-
-	(handle_mystery): Allow for mystery data that can't even be saved
-	to disk. (ie, unrecognized external-body). Let the caller specify
-	the URL to use.
-
-	(handle_message_external_body): New function to deal with
-	message/external-body parts. Generates URLs for anon-ftp,
-	local-file, and URL access-types, and a more-useful-than-before
-	descriptive message for other types.
-
-	(handle_audio, handle_undisplayable): Use gnome_mime_get_value to
-	try to get a description of the MIME type to display to the user
-	rather than the raw form. (This will only work if the user has
-	recent gnome-vfs installed. [If they don't, it works just like
-	it used to.])
-
-2000-05-26  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (handle_text_html): Fix a bug (security/stability)
-	in its usage of mail_html_write.
-
-	* mail-ops.c (composer_send_cb, reply): set CAMEL_MESSAGE_ANSWERED
-	on a message after a successful reply.
-
-	* message-list.c (folder_changed): free the summary with
-	camel_folder_free_summary rather than g_ptr_array_free.
-
-	* mail-format.c (handle_via_bonobo): Update for PersistStream
-	changes
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (main): Initialize the component factory.
-
-	* Makefile.am (evolution_mail_LDADD): Link with
-	`evolution-shell-component.o' from the shell directory.
-
-	* evolution-mail.oafinfo: Updated with the
-	Evolution::ShellComponent OAFIID.
-
-	* evolution-mail.gnorba: Updated with the
-	Evolution::ShellComponent GOAD ID.
-
-	* folder-browser-factory.c (folder_browser_factory_new_control):
-	New function; code moved out from `folder_browser_factory'.
-	(folder_browser_factory): Use it.
-
-	* component-factory.c: New.
-	* component-factory.h: New.
-
-2000-05-24  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (composer_send_cb): connect to and disconnect from
-	the transport.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added libepaned.a.
-	
-	* folder-browser.c: Switched from GtkPaned to EPaned.
-
-2000-05-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: Don't link to `evolution-service-repository.o'
-	anymore.
-
-	* folder-browser-factory.c: Don't use crufty service-repository
-	anymore.
-
-2000-05-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* message-list.c (get_message_info): Made static.
-	(ml_initialize_value): Return NULL to placate compiler.
-
-	* folder-browser.c (folder_browser_gui_init): Add cast.
-
-	* mail-display.c (mail_html_new): Don't pass an empty URL to
-	`gtk_html_begin()' anymore.
-
-	* mail-config.c (put_html): Don't pass an empty URL to
-	`gtk_html_begin()' anymore.
-
-	* mail-display.h: Updated for the new GtkHTML API that uses
-	`GtkHTMLStream *' instead of `GtkHTMLStreamHandle'.
-	* mail-display.c: Likewise.
-	* mail-config.c: Likewise.
-	* mail-format.c: Likewise.
-
-2000-05-19  NotZed  <NotZed@HelixCode.com>
-
-	* mail-format.c: Fixes for stream stuff.
-
-	* mail-display.c (save_data_cb): Remove exception stuff on streams.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Added initialize_value and value_is_empty
-	callbacks.
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_factory): Remove
-	development_warning (moved to shell)
-
-	* message-list.c (select_msg): Update for camel_folder_get_uids
-	(folder_changed, message_list_set_folder): Update for
-	camel_folder_get_summary
-
-	* mail-ops.c (fetch_mail): Update for camel_folder_get_uids
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* mail-component.c: This seems to be cruft. Nuke it.
-
-	* mail-display.c (save_data_cb, save_data, on_url_requested):
-	* mail-format.c (handle_text_plain_flowed, handle_text_html):
-	Use camel_data_wrapper_write_to_stream rather than
-	camel_data_wrapper_get_output_stream.
-
-2000-05-16  NotZed  <NotZed@HelixCode.com>
-
-	* mail-ops.c (filter_edit): Function to bring up the filter editor.
-	(filter_druid_clicked): Save/close dialogue.
-	(fetch_mail): Apply filters to incoming mail ... *hold breath*
-	If we are coming from a non-indexed/searchable/etc source, then
-	copy it to an mbox first.  When copying mail from an mbox source,
-	dont remove it aftewards, open it for append, so partially
-	filtered mail isn't lost.
-
-	* Makefile.am (evolution_mail_LDADD): Added libfilter.
-	(INCLUDES): Add EVOLUTION_DATADIR, and fix matt's brokeneditor(tm)
-	for putting spaces instead of tabs in.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-format.c: Removed usage of bonobo_object_destroy.
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Updated to work with new ETable resizing.
-
-2000-05-12  NotZed  <NotZed@HelixCode.com>
-
-	* mail-ops.c (fetch_mail): Use 6 X's to mkstemp, as required by
-	the man page, just a temp fix, this should probably change to a
-	known filename.
-
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Now that we depend
-	on current gnome-libs we can make the toolbar detachable again.
-
-2000-05-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): Left-justify the
-	message.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): Made this dialog
-	have fewer buttons.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): New development
-	warning text from Nat.
-
-2000-05-10  Larry Ewing  <lewing@helixcode.com>
-
-	* mail-config.c (html_new): only set the default background color
-	if style is not NULL.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed folder-browser-factory.h since it doesn't
-	exist.  Added mail-display.h, mail-types.h, pixmaps.h.
-
-2000-05-09  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Remove "File->mail"
-	menuitem.
-
-	* mail-config.c (mail_config_druid): Fill in "blah blah blah".
-
-2000-05-09  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): make this a
-	little less kludgy. Use gnome_error_dialog rather than printf on
-	errors.
-
-	* mail-ops.c (fetch_mail): Fix to work with the new shell stuff...
-	sorta. Will need more fixing later when the new shell framework is
-	more done.
-
-	* mail-config.c (finish): Call gnome_config_sync so the data
-	actually gets written.
-
-2000-05-08  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (save_data_cb):
-	(on_url_requested): Update for CamelStream CamelException changes.
-
-	* mail-format.c: Pass NULL for a CamelException in a bunch of
-	places... the user will see that the data is not being displayed,
-	and there's not a lot we can do, and none of these things should
-	be failing anyway. Maybe fix this later.
-
-2000-05-07  NotZed  <NotZed@HelixCode.com>
-
-	* message-list.c (ml_value_at): Size moved to message info, rather
-	than content info structure.
-
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (select_msg): unref the message after displaying
-	it.
-
-	* mail-format.c (get_data_wrapper_text):
-	(handle_text_plain_flowed): 
-	(handle_via_bonobo): Replace camel_stream_close calls.
-
-2000-05-07  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser-factory.c: Changed a toolbar button from saying
-	"New mail" (which suggests you might be composing new mail) to
-	"Get mail".
-
-2000-05-06  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_factory): Don't
-	hardcode "inbox" here.
-
-	* folder-browser.c (folder_browser_set_uri): Don't hardcode
-	"inbox" here either.
-	(folder_browser_load_folder): Create a new store according to the
-	folder browser's URI, and load the mbox file from that store.
-	Parts of this are temporary.
-
-	* session.c, mail.h: There is no longer a global store, just a
-	global session.
-
-	* mail-config.c, mail-ops.c: Update for default_session -> session
-	change. fetch_mail is currently broken.
-
-2000-05-06  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c: New code to configure identity, mail source, and
-	mail transport.
-	(mail_config_druid): A druid using the config widgets. (Only
-	allows configuration of a single identity, source, and transport.)
-
-	* mail-ops.c (check_configured): New function to make sure the
-	user has configured stuff, and call the	druid if not.
-	(fetch_mail, send_msg, send_to_url, reply, forward_msg): Call
-	check_configured
-	(composer_send_cb): Make this pass the message to a CamelTransport
-	rather than just printing it to stdout.
-
-	* folder-browser-factory.c (development_warning): Add a warning
-	about sending mail, since you can do that now.
-
-2000-05-06  Chris Toshok  <toshok@HelixCode.com>
-
-	* .cvsignore: ignore evolution-mail.pure
-
-	* Makefile.am: add support for building evolution-mail.pure
-
-2000-05-06  Dan Winship  <danw@helixcode.com>
-
-	* mail.h: consolidate mail-format.h, mail-identify.h, mail-ops.h,
-	main.h and session.h into this new file. There's no reason to have
-	a .h for every .c.
-
-2000-05-05  Anders Carlsson  <andersca@gnu.org>
-
-	* test-mail.c (create_container): Use the OAFIID when using an 
-	OAF-enabled build of bonobo.
-
-2000-05-04  NotZed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_set_folder): Get the whole message
-	summary right away.
-	(folder_changed): And if we change too.
-	(ml_row_count): Use the match count or summary table length as the
-	row count.
-	(get_message_info): Use array references to lookup message summary
-	info.  For the search result list, use the summary_search_cache to
-	cache the info lookup.
-	(message_list_init): Allocate the summary search cache.
-	(message_list_destroy): Free the summary search cache and the
-	summary table, if there is one to free.
-	(message_list_set_search): Save the match count, and clear the
-	summary search cache for reuse.
-	(folder_changed): Re-retrieve the summary list if the folder has
-	changed.
-	(message_list_set_folder): Retrieve the summary list when opening
-	the folder.
-
-2000-05-03  Jason Leach  <leach@wam.umd.edu>
-
-	* Makefile.am (evolution_mail_LDADD): s/-lunicode/$(UNICODE_LIBS)/
-	in the LDADD section.
-
-2000-05-03  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (write_recipients_to_stream, write_headers): Make
-	the "Cc:" field optional again. (Before, we could check if
-	camel_mime_message_get_recipients returned NULL, but now we need
-	to actually look into the returned CamelInternetAddress object.)
-
-2000-05-03  Larry Ewing  <lewing@helixcode.com>
-
-	* folder-browser.c (folder_browser_gui_init): comment out the
-	changed signal for now.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-05-02  Larry Ewing  <lewing@helixcode.com>
-
-	* message-list.c (message_list_set_search): only free search if it
-	is not NULL.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (folder_browser_gui_init): Connect the changed
-	signal to search, so it searched immediately?
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* pixmaps.h: Added envelope-deleted state.
-
-	* folder-browser-factory.c: Setup callback for actual delete op.
-	(control_activate): Setup a tool menu item to expnge deleted
-	messages.
-
-	* mail-ops.c (delete_msg): Toggle the delete flag on a message.
-	(expunge_folder): New function to expunge deleted messages from
-	the current folder.
-
-	* folder-browser.c (folder_browser_gui_init): A hackish little
-	quick-search entry.
-	(search_activate): Perform a quick-search on the folder subject
-	only.
-	(folder_browser_gui_init): Add an option meny to the search line.	
-	(create_option_menu): Build the option menu from a table.
-	(search_set): Build a search from another string whent he option
-	menu or text item is changed.  5 search options are defined so
-	far.
-
-	* message-list.c (get_message_info): If there is an active search,
-	then get the data from that ... use this instead of
-	_get_message_info().
-	(ml_row_count): If we have an active search, get the info from its
-	result.
-	(select_msg): Changed to use get_message_info, so searches work.
-	(ml_value_at): And same here.
-	(message_list_init_renderers): Added a 3rd state to message_status
-	= deleted.
-	(ml_value_at): Show the message state as deleted, if it is marked
-	for deletion.
-	(folder_changed): When the folder changes, update the display.
-	(message_list_set_folder): Connect to the folder_changed event
-	here.
-	(message_changed): Callback to update the display when the message
-	changes.
-	(select_msg): And connect to the message_changed signal so we know
-	when it cahgnes.
-	(message_list_set_search): Save the search string.
-	(folder_changed): If the folder changes, re-run the search,
-	otherwise we may end up with invalid entries in the display.
-
-	* mail-display.c: Include missing errno.h.
-
-2000-04-30  Dan Winship  <danw@helixcode.com>
-
-	* session.c (session_providers_init): This is no longer necessary.
-
-	* mail-ops.c (fetch_mail): Remove kludge to load remote provider,
-	as camel can do it by itself now.
-
-2000-04-29  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (on_link_clicked): Handle clicks on "cid" URLs by
-	popping up a "Save Attachment" dialog.
-
-	* mail-format.c (get_cid): if the part has a Content-Disposition
-	with a filename specified, record (a sanitized version of) that on
-	the wrapper when creating the cid reference, so the "save
-	attachment" code can use it later.
-	(handle_mystery): fix a bug in the cid generation here.
-
-2000-04-29  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (lookup_handler, etc): Improve the builtin vs
-	bonobo selection code.
-	(handle_mystery): Include name and Content-Description in the
-	"mystery data" info, when available
-	(handle_unknown_type): Call mail_identify_mime_part before
-	giving up.
-	(handle_undisplayable): Split out of handle_unknown_type now
-	that handle_unknown_type can try alternate viewers.
-	(handle_via_bonobo): Fall back to handle_undisplayable if the
-	bonobo control fails.
-
-	* mail-identify.c (mail_identify_mime_part): New function to
-	attempt to identify a MIME part that we can't identify based on
-	Content-Type alone.
-
-	* mail-display.c (on_url_requested): redo the mystery data icon
-	display stuff less kludgily.
-
-2000-04-28  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (write_recipients_to_stream, write_headers,
-	mail_generate_reply): Update (minimally) for Camel recipient
-	changes.
-
-2000-04-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (init_bonobo): Don't call `init_corba()' and don't get
-	any args.
-	(init_corba) [!USING_OAF]: Fix args.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c: New macro `CONTROL_FACTORY_ID', which
-	is #defined to a different value according to whether we are
-	`USING_OAF' or not.
-	(folder_browser_factory_init): Use `CONTROL_FACTORY_ID'.
-
-	* test-mail.c
-	(init_corba): New helper function, implemented differently
-	according to `USING_OAF'.
-	(main): Use `init_corba()'.
-
-	* main.c
-	(init_corba): New helper function, implemented differently
-	according to `USING_OAF'.
-	(init_bonobo): Use `init_corba()'.
-
-	* Makefile.am: Install OAF stuff if `USING_OAF'.  Add
-	`-I$(datadir)/idl' to the `orbit-idl' command-line so that we can
-	use Bonobo IDL files installed under our prefix as well.  Also,
-	use `$(ORBIT_IDL)' instead of hardcoded `orbit-idl'.
-
-	* evolution-mail.oafinfo: New file.
-
-2000-04-27  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c: Move text_to_html to e-util.
-
-	* mail-ops.c (send_to_url): New routine. Thin wrapper for
-	e_msg_composer_new_from_url.
-
-	* mail-display.c (on_link_clicked): print a warning for news or
-	nntp URLs (which we'll deal with some day), and call send_to_url
-	for mailto URLs.
-
-	* mail-format.c (text_to_html): Improve URL conversion code.
-	Recognize https, recognize "www\..*" without a prefixed "http://".
-	Properly escape &, <, >, etc in URL strings. Don't be fooled by
-	"mailto:", "http://", etc with no following data.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (text_to_html): Reorganize a bit and add a new
-	flag, TEXT_TO_HTML_CONVERT_URLS to recognize and wrap URLs
-	in text.
-
-	* mail-display.c (mail_html_new): Add link_clicked signal handler.
-	(on_link_clicked): Use gnome_url_show to launch a browser.
-
-	* mail-format.c: update for CamelStream changes. Update for
-	CamelMimeBodyPart -> CamelMimePart
-
-2000-04-25  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c, mail-format.c: Redo large chunks of this. The
-	mail display now consists of a vbox in a scrolled window, in which
-	we put multiple GtkHTML objects. This means broken HTML in one
-	part can't corrupt other parts. The headers now scroll with the
-	body. Unrecognized attachments look prettier, but still don't do
-	anything, and will probably be changed later. We can also now
-	display nested message/rfc822 parts and multipart/alternatives
-	with multipart subparts. Oh, and text/{richtext,enriched}, since
-	we had all these ancient sample messages that use it and the lack
-	of support annoyed me. :)
-
-	Bonobo embeddables are broken right now, but I don't think that's
-	my fault.
-
-	* mail-format.c (reply_body): Fix some bugs that crept into reply
-	generation. This needs a lot more work to deal correctly with
-	complicated bodies.
-	(setup_function_table): pass unknown text subtypes to
-	handle_text_plain.
-	(handle_multipart_appledouble): new handler. Just ignores the
-	first (application/applefile) part and tries to display the
-	second part. Since the second part is usually
-	application/octet-stream, this doesn't work very well still
-	usually.
-	(reply_body): Make this deal better with multiparts.
-
-	* mail-format.c, mail-display.c: Now that we're not limited to
-	a single GtkHTML for the display, there's no reason to embed
-	Bonobo objects for unrecognized content-types in GtkHTML rather
-	than embedded them into the vbox directly. So do that.
-
-	Meanwhile, fix up the handler-selection code so that we can
-	declare which built-in handlers are more desirable than external
-	handlers and which are less. (Of course, eventually we'll want
-	this to be customizable.) Add some cleverness to
-	handle_multipart_alternative as well so it doesn't accept an
-	alternative which we can display generically over one we can
-	display specifically.
-
-	* mail-format.c (text_to_html): add a convert_space_hack flag,
-	which turns N spaces into N-1 &nbsp;s and a space.
-	(handle_text_plain): Check for "format=flowed" in the
-	Content-Type.
-	(handle_text_plain_flowed): Spinoff of handle_text_plain to deal
-	with RFC 2646 flowed text. (All the examples I can find of it
-	are generated by Eudora, but it's a pretty cool idea that ought
-	to be used more widely.)
-
-2000-04-23  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c: rename "send" to "send_msg", to avoid
-	name clash with the tcp function. Connect the "forward" button.
-
-	* mail-ops.c: rename "send" to "send_msg", to avoid name clash
-	with the tcp function. Add forward_msg function.
-
-	* mail-format.c (mail_generate_forward): support function for
-	forward_msg. Pretty much a big kludge right now, pending the
-	attachment/attachment-bar changes.
-
-2000-04-22  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (on_url_requested): Change cid expectations to
-	match current camel reality.
-
-	* main.c (main): call glade_gnome_init, for composer.
-
-	* folder-browser-factory.c: move msg_composer_cb and
-	msg_composer_send_cb to mail-ops. Attach send, reply, and "reply
-	to all" buttons.
-
-	* mail-ops.c (composer_send_cb, send): moved from
-	folder-browser-factory.c.
-	(reply_to_sender, reply_to_all): new functions to do replies.
-
-	* mail-format.c (text_to_html): Add an "add_pre" flag, to make
-	it wrap the output in <pre></pre>.
-	(mail_generate_reply): New function to create a composer and build
-	a reply in it.
-
-2000-04-21  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (on_url_requested): deal with cid: URLs.
-	(find_cid): helper routine for above. (This could be much better.)
-	(mail_display_init): connect url_requested signal
-
-	* mail-format.c (handle_multipart_related): Make this work.
-
-	* mail-display.c (mail_display_set_message): ref the message we
-	display, since we're going to unref it when we remove it. Fixes a
-	bug that showed up with the new camel code, but it's not obvious
-	if it's due to a bug or a feature in the new code.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am (evolution_mail_LDADD): Add libibex.la to link.
-
-	* message-list.h: Removed folder summary.
-
-	* message-list.c: Dont include folder-summary anymore.
-	(select_msg): Changed to use folder, not summary in
-	summary_get_message_info().  God this code is grotty.
-	(ml_value_at): Ditto.
-	(ml_value_at): Changed to use new interface.  Hmm, this returns a
-	static variable, that seems wrong.
-	(message_list_set_folder): Remove folder summary.
-	(ml_row_count): Oops, remove some debug i put there.
-
-2000-04-20  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c: update for bonobo change, and remove a
-	now-unused variable.
-
-2000-04-17  Chris Toshok  <toshok@helixcode.com>
-
-	* message-list.c (on_row_selection_idle): new function, actually
-	calls select_msg.
-	(on_row_selection_cmd): register an idle instead of calling
-	select_msg directly.  this fixes the lag before the row is
-	selected - selection is instantaneous now, with message loading
-	happening afterward.
-
-	* message-list.h: add row_to_select and an idle_id to the message
-	list to make the select_msg call happen in an idle func.
-
-	* message-list.c (message_list_init_renderers): no more
-	e_cell_set_editable.  this info always comes from the model.
-
-2000-04-14  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.[ch]: Moved from camel/camel-formatter, and changed
-	slightly. (More to come.)
-
-	* html-stream.[ch]: No longer necessary. mail-format uses
-	GtkHTMLStreamHandles directly.
-
-	* mail-display.[ch]: update for new message formatting code.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): use
-	gnome_app_fill_toolbar_with_data, so we get the beautiful gnome
-	toolbar.
-
-2000-04-14  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): Fix up the
-	warning message a bit.
-	(folder_browser_factory): Make the warning bypassable.
-
-2000-04-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* main.c (main): Call e_cursors_init.
-
-2000-04-10  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (fetch_mail): use camel_movemail when fetching mail
-	from an mbox store. This leaves behind temp files for now,
-	because CamelMboxFolder::delete is too confused to use, and NotZed
-	is rewriting CamelMboxFolder, so I'm not going to bother to try to
-	fix it.
-
-	* mail-ops.c: Add some #includes for the non-HAVE_MKSTEMP case
-
-2000-04-09  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser.c (folder_browser_new): set folder_browser->uri
-	to NULL, so that we know when to free it.
-
-2000-04-07  Miguel de Icaza  <miguel@gnu.org>
-
-	* message-list.c (states_pixmaps): Add more beautiful art from
-	Miggue, the Diego Rivera of the next millenium.
-	(message_list_init_header): Use the beautiful art.
-
-	* pixmaps: Miguel rediscovers the "transparent" concept.
-
-2000-04-07  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser.c (folder_browser_destroy): Unref the shell
-	interface that we have a handle to.
-
-	* folder-browser-factory.c (control_destroy_cb): New function;
-	destroys a folder-browser when its control is destroyed.
-	(folder_browser_factory): Hook up to the above.
-
-2000-04-07  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c: new file, for toolbar/menu callbacks
-	(fetch_mail): fetch mail. Doesn't do mbox locking. Many kludges.
-
-	* folder-browser-factory.c (control_activate): use new fetch_mail
-	function as the callback for the "New mail" icon. Rename check_cb
-	to random_cb.
-
-	* Makefile.am: don't build test-sources since the version in
-	CVS doesn't do much and once I've fixed it it won't be a separate
-	program. Add mail-ops.[ch].
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* message-list.c: Stick pixmaps here.
-
-	* mail-display.c (embeddable_destroy_cb): Replaced C++ comments
-	with C comments.
-
-	* message-list.c (load_internal_images): New function, loads images.
-	(message_list_init_renderers): Load images, fix previous attempt
-	at loading images. 
-
-	* Makefile.am (dist-hook): Added distribution of pixmaps.
-
-	* pixmaps: New directory, used to hold the XPMs we ship with. 
-
-	* pixmaps/envelope-closed.xpm, pixmaps/envelope-open.xpm: Tigert's
-	envelopes incorporated.
-
-2000-03-31  Miguel de Icaza  <miguel@gnu.org>
-
-	* message-list.c (ml_value_at): Fix miss-used variable. 
-
-2000-04-01  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser.c (folder_browser_properties_init): update to
-	new property  (folder_browser_property_changed): kill.
-	(get_prop, set_prop): do the donkey work + make properly RW.
-
-2000-03-31  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_set_shell):
-	* folder-browser.c (folder_browser_new):
-	* message-list.c (on_row_selection_cmd, select_msg,
-	message_list_init, message_list_set_folder):
-
-	remove debugging printf()s that no longer seem useful
-
-2000-03-29  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): build a toolbar.
-	(control_deactivate): and hide it.
-
-2000-03-27  Chris Toshok <toshok@helixcode.com>
-	* mail-display.c: quiet warnings when building in ../po
-
-2000-03-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* folder-browser-factory.c (folder_browser_set_shell): Memory leak
-	fix. 
-
-2000-03-25  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (select_msg, ml_value_at): update for summary
-	changes. Hey, neat, it really does make it more efficient.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* .cvsignore: Updated .cvsignore.
-
-2000-03-21  Matt Loper  <matt@helixcode.com>
-
-	* mail-display.c: Minor cleanup & commenting.
-
-	* folder-browser-factory.c: Minor cleanup & warning elimination.
-
-2000-03-21  bertrand  <bertrand@helixcode.com>
-
-	* message-list.c (ml_value_at): display message size
-
-2000-03-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Properly ref & sink the table and header models.
-
-2000-03-14  Dan Winship  <danw@helixcode.com>
-
-	* mail-sources.c: First cut at a mail source selection wizard.
-	Basically a rigged demo at this point. Doesn't use camel to get
-	its information, and is not yet complete or integrated with the
-	mail component. Did I mention that the code is ugly?
-
-2000-03-13  bertrand  <bertrand@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_set_shell): 
-	for testing and demonstration purpose, immediately 
-	register a fake service.
-
-2000-03-12  bertrand  <bertrand@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_factory_init): 
-	name change.
-	(control_activate_cb): when the control is activated, 
-	it merges its own UI with the remote UIHandler.
-	(control_add_menu): sample menu merging.
-	(folder_browser_factory): connect the control "activate" signal.
-
-	* evolution-mail.gnorba: 
-	name changes
-
-	* folder-browser.h: added a reference to an 
-	Evolution::Shell object. 
-
-	* folder-browser-factory.c (folder_browser_set_shell): 
-	(folder_browser_control_add_service_repository_interface): 
-	(folder_browser_factory): the folder-browser control now
-	implements the Evolution/ServiceRepository interface.
-
-2000-03-07  bertrand  <bertrand@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): 
-	added a warning so that the user knows that this 
-	version may crash his mails.
-
-2000-03-05  bertrand  <bertrand@helixcode.com>
-
-	* message-list.h: include a referrence to the parent 
-	folder browser.
-
-	* message-list.c (ml_value_at): use the message summary 
-	from the 
-
-	* html-stream.c (html_stream_close): when the stream 
-	is closed, set the html stream to NULL
-	(html_stream_write): don't write anything if the 
-	html handle does not exist. 
-	(html_stream_reset): implemented. close the current 
-	html handle and begins a new html parser. 
-
-	* session.c (session_store_new): use static exception
-	here. 
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Added a prototype message listing.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Set up the column headers properly.
-
-	* folder-browser.c: Show the folder_browser widget.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Define ml_duplicate_value and ml_free_value
-	correctly.
-	
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Use g_int_compare and g_str_compare as we should
-	be instead of g_int_equal and g_str_equal.
-	
-2000-03-04  bertrand  <bertrand@helixcode.com>
-
-	* test-mail.c (main): replace the bonobo-active/gtk-main
-	by bonobo-main.
-	Include Gnorba headers.
-	(main): don't call the container creation routine 
-	before we entered the main loop. Use idle for that.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Change this to use the ETable widget itself
-	instead of building it from all the parts.
-
-2000-03-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Ref the table columns since we unref them at the
-	end.
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add `$(top_srcdir)'.  Also, the
-	`top_srcdir' includes must come first everything else to avoid
-	including installed headers instead of our fresh ones.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am (evolution_mail_LDADD): Fixed references to eutil.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Changed to match new e_table_simple interface.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_list_set_folder): update for CamelFolder
-	changes
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Changed this to not use the "x" and "y"
-	arguments to e-table-item.
-
-2000-02-23  Matt Loper  <matt@helixcode.com>
-
-	* message-list.c (message_list_set_folder): Check 'desc'riptions
-	of exceptions.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* message-list.c (message_list_set_folder): 
-	fix to show a sample correct implementation. 
-
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: added -lunicode to evolution_mail_LDADD.
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* session.c (session_store_new): Pass a CamelAuthCallback
-	(evolution_auth_callback) to camel_session_new.
-	
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* session.c (session_store_new): Update session_store_new to
-	deal with the fact that camel_session_get_store takes a
-	CamelException now. Doesn't actually do anything with the
-	exception yet, because nothing else does yet either.
-
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: added test-mail.
-
-2000-02-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* folder-browser.c (folder_browser_load_folder): New routine,
-	loads a camel folder.
-	(folder_browser_set_uri): redo.
-
-	* session.c: new file.  Implements SessionStores to keep track of
-	a Session/Store tuple.  
-
-2000-02-13  Matt Loper  <matt@helixcode.com>
-
-	* html-stream.c (html_stream_new): Second param of gtk_html_begin
-	should be "", not NULL.
-	(html_stream_new): gtk_html_parse() is deprecated, so the call was
-	removed.
-
-	* html-stream.h: HTMLStreamClass's parent changed to
-	CamelStreamClass, not CamelStream.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Add the e-text directory to the includes list.
-
-	* message-list.c: Change the call to e_cell_text_new, since
-	there's an added argument.
-
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added libetext as libetable depends on it.
-
-2000-02-08  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* Makefile.am: Changed the order of the compilation so the CORBA stuff
-	was made before it was needed.
-
-2000-01-19  Miguel de Icaza  <miguel@gnu.org>
-
-	* Started work on the mail display engine.
-
-	* html-stream.c, html-stream.h: New files, they are CamelStreams
-	used to write to the GtkHTML widget. 
-
diff --git a/mail/Makefile.am b/mail/Makefile.am
index ef4dcaa340..1b8ed95e2b 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -197,7 +197,6 @@ ui_DATA = mail-config.ui mail-dialogs.ui
 etspec_DATA = message-list.etspec
 
 EXTRA_DIST = 				\
-	ChangeLog.pre-1-4		\
 	README.async			\
 	mail.error.xml			\
 	$(ui_DATA)			\
diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index aa5abd09fb..c791b5fba3 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -292,11 +292,7 @@ mail_attachment_bar_size_request (GtkWidget *widget,
 	 *     get a sizable gap between the headers and body when this
 	 *     widget is invisible.  Once we finally move to WebKit,
 	 *     remove this. */
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_visible (widget)) {
-#else
-	if (!GTK_WIDGET_VISIBLE (widget)) {
-#endif
 		requisition->width = 0;
 		requisition->height = 0;
 		return;
@@ -519,7 +515,7 @@ mail_attachment_bar_init (EMailAttachmentBar *bar)
 	container = widget;
 
 	widget = e_attachment_icon_view_new ();
-	GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus (widget, TRUE);
 	gtk_icon_view_set_model (GTK_ICON_VIEW (widget), bar->priv->model);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	bar->priv->icon_view = g_object_ref (widget);
@@ -536,7 +532,7 @@ mail_attachment_bar_init (EMailAttachmentBar *bar)
 	container = widget;
 
 	widget = e_attachment_tree_view_new ();
-	GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus (widget, TRUE);
 	gtk_tree_view_set_model (GTK_TREE_VIEW (widget), bar->priv->model);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	bar->priv->tree_view = g_object_ref (widget);
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index bac1beefdf..7f62c466ad 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -25,10 +25,9 @@
 #include <string.h>
 #include "e-mail-backend.h"
 
-#include <camel/camel.h>
-
 #include "e-util/e-account-utils.h"
 #include "e-util/e-alert-dialog.h"
+#include "e-util/e-binding.h"
 
 #include "misc/e-account-combo-box.h"
 
@@ -82,17 +81,6 @@ mail_backend_store_operation_done_cb (CamelStore *store,
 	g_object_unref (E_ACTIVITY (user_data));
 }
 
-static void
-mail_backend_notify_online_cb (EShell *shell,
-                               GParamSpec *pspec,
-                               EMailBackend *backend)
-{
-	gboolean online;
-
-	online = e_shell_get_online (shell);
-	camel_session_set_online (session, online);
-}
-
 /* Helper for mail_backend_prepare_for_offline_cb() */
 static void
 mail_store_prepare_for_offline_cb (CamelService *service,
@@ -122,7 +110,7 @@ mail_backend_prepare_for_offline_cb (EShell *shell,
 
 	if (!synchronize) {
 		mail_cancel_all ();
-		camel_session_set_network_state (session, FALSE);
+		camel_session_set_network_available (session, FALSE);
 	}
 
 	e_mail_store_foreach (
@@ -276,7 +264,6 @@ mail_backend_quit_requested_cb (EShell *shell,
 {
 	CamelFolder *folder;
 	GtkWindow *window;
-	guint32 unsent;
 	gint response;
 
 	window = e_shell_get_active_window (shell);
@@ -296,11 +283,7 @@ mail_backend_quit_requested_cb (EShell *shell,
 	if (folder == NULL)
 		return;
 
-	if (camel_object_get (
-		folder, NULL, CAMEL_FOLDER_VISIBLE, &unsent, 0) != 0)
-		return;
-
-	if (unsent == 0)
+	if (folder->summary->visible_count == 0)
 		return;
 
 	response = e_alert_run_dialog_for_args (
@@ -387,26 +370,19 @@ mail_backend_constructed (GObject *object)
 	EShellBackend *shell_backend;
 	MailFolderCache *folder_cache;
 	const gchar *data_dir;
-	gboolean online;
 
 	shell_backend = E_SHELL_BACKEND (object);
 	shell = e_shell_backend_get_shell (shell_backend);
 
 	/* This also initializes Camel, so it needs to happen early. */
-	mail_session_init ();
+	mail_session_start ();
 
-	online = e_shell_get_online (shell);
-	camel_session_set_online (CAMEL_SESSION (session), online);
+	e_binding_new (shell, "online", session, "online");
 	e_account_combo_box_set_session (session);  /* XXX Don't ask... */
 
 	folder_cache = mail_folder_cache_get_default ();
 
 	g_signal_connect (
-		shell, "notify::online",
-		G_CALLBACK (mail_backend_notify_online_cb),
-		shell_backend);
-
-	g_signal_connect (
 		shell, "prepare-for-offline",
 		G_CALLBACK (mail_backend_prepare_for_offline_cb),
 		shell_backend);
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index cd7ecd32fd..ca582ccd35 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -23,7 +23,6 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <camel/camel-folder.h>
 
 #include "e-util/e-util.h"
 #include "e-util/e-plugin-ui.h"
@@ -258,12 +257,9 @@ mail_browser_message_selected_cb (EMailBrowser *browser,
 	if (info == NULL)
 		return;
 
-	/* XXX The string here was added after the 2.30.0 release, so
-	 *     it's not marked for translation.  But it IS marked for
-	 *     translation in 2.31. */
 	title = camel_message_info_subject (info);
 	if (title == NULL || *title == '\0')
-		title = "(No Subject)";
+		title = _("(No Subject)");
 
 	gtk_window_set_title (GTK_WINDOW (browser), title);
 	gtk_widget_grab_focus (
@@ -768,7 +764,7 @@ mail_browser_class_init (EMailBrowserClass *class)
 		PROP_FOCUS_TRACKER,
 		g_param_spec_object (
 			"focus-tracker",
-			_("Focus Tracker"),
+			"Focus Tracker",
 			NULL,
 			E_TYPE_FOCUS_TRACKER,
 			G_PARAM_READABLE));
@@ -778,8 +774,8 @@ mail_browser_class_init (EMailBrowserClass *class)
 		PROP_SHELL_BACKEND,
 		g_param_spec_object (
 			"shell-backend",
-			_("Shell Module"),
-			_("The mail shell backend"),
+			"Shell Module",
+			"The mail shell backend",
 			E_TYPE_SHELL_BACKEND,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY));
@@ -789,8 +785,8 @@ mail_browser_class_init (EMailBrowserClass *class)
 		PROP_SHOW_DELETED,
 		g_param_spec_boolean (
 			"show-deleted",
-			_("Show Deleted"),
-			_("Show deleted messages"),
+			"Show Deleted",
+			"Show deleted messages",
 			FALSE,
 			G_PARAM_READWRITE));
 }
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index 6b317b6b5b..6930e210aa 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -22,7 +22,7 @@
 #include "e-mail-label-list-store.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-utf8.h>
+#include <camel/camel.h>
 #include "e-util/gconf-bridge.h"
 
 #define E_MAIL_LABEL_LIST_STORE_GET_PRIVATE(obj) \
diff --git a/mail/e-mail-local.c b/mail/e-mail-local.c
index 0944c7da95..002865cd33 100644
--- a/mail/e-mail-local.c
+++ b/mail/e-mail-local.c
@@ -93,7 +93,7 @@ e_mail_local_init (const gchar *data_dir)
 
 	camel_url_free (url);
 
-	camel_object_ref (service);
+	g_object_ref (service);
 	local_store = CAMEL_STORE (service);
 
 	return;
diff --git a/mail/e-mail-local.h b/mail/e-mail-local.h
index b8dda29857..b5b7e8ab8c 100644
--- a/mail/e-mail-local.h
+++ b/mail/e-mail-local.h
@@ -23,8 +23,7 @@
 #define E_MAIL_LOCAL_H
 
 #include <glib.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 
 G_BEGIN_DECLS
 
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 34728929c2..7f59d16a48 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -41,12 +41,6 @@
 
 #include <gconf/gconf-client.h>
 
-#include <camel/camel.h>
-#include <camel/camel-store.h>
-#include <camel/camel-session.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-disco-folder.h>
-
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
@@ -57,7 +51,6 @@
 #include <e-util/e-xml-utils.h>
 
 #include "e-util/e-account-utils.h"
-#include "e-util/e-bconf-map.h"
 #include "e-util/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-plugin.h"
@@ -72,976 +65,18 @@
 
 #define d(x) x
 
-#ifndef G_OS_WIN32
-/* No versions previous to 2.8 or thereabouts have been available on
- * Windows, so don't bother with upgrade support from earlier versions
- * on Win32. Do try to support upgrades from 2.12 and later to the
- * current version.
- */
-
-/* upgrade helper functions */
-static xmlDocPtr
-emm_load_xml (const gchar *dirname, const gchar *filename)
-{
-	xmlDocPtr doc;
-	struct stat st;
-	gchar *path;
-
-	path = g_strdup_printf ("%s/%s", dirname, filename);
-	if (stat (path, &st) == -1 || !(doc = xmlParseFile (path))) {
-		g_free (path);
-		return NULL;
-	}
-
-	g_free (path);
-
-	return doc;
-}
-
-static gint
-emm_save_xml (xmlDocPtr doc, const gchar *dirname, const gchar *filename)
-{
-	gchar *path;
-	gint retval;
-
-	path = g_strdup_printf ("%s/%s", dirname, filename);
-	retval = e_xml_save_file (path, doc);
-	g_free (path);
-
-	return retval;
-}
-
-static xmlNodePtr
-xml_find_node (xmlNodePtr parent, const gchar *name)
-{
-	xmlNodePtr node;
-
-	node = parent->children;
-	while (node != NULL) {
-		if (node->name && !strcmp ((gchar *)node->name, name))
-			return node;
-
-		node = node->next;
-	}
-
-	return NULL;
-}
-
-static void
-upgrade_xml_uris (xmlDocPtr doc, gchar * (* upgrade_uri) (const gchar *uri))
-{
-	xmlNodePtr root, node;
-	gchar *uri, *new;
-
-	if (!doc || !(root = xmlDocGetRootElement (doc)))
-		return;
-
-	if (!root->name || strcmp ((gchar *)root->name, "filteroptions") != 0) {
-		/* root node is not <filteroptions>, nothing to upgrade */
-		return;
-	}
-
-	if (!(node = xml_find_node (root, "ruleset"))) {
-		/* no ruleset node, nothing to upgrade */
-		return;
-	}
-
-	node = node->children;
-	while (node != NULL) {
-		if (node->name && !strcmp ((gchar *)node->name, "rule")) {
-			xmlNodePtr actionset, part, val, n;
-
-			if ((actionset = xml_find_node (node, "actionset"))) {
-				/* filters.xml */
-				part = actionset->children;
-				while (part != NULL) {
-					if (part->name && !strcmp ((gchar *)part->name, "part")) {
-						val = part->children;
-						while (val != NULL) {
-							if (val->name && !strcmp ((gchar *)val->name, "value")) {
-								gchar *type;
-
-								type = (gchar *)xmlGetProp (val, (const guchar *)"type");
-								if (type && !strcmp ((gchar *)type, "folder")) {
-									if ((n = xml_find_node (val, "folder"))) {
-										uri = (gchar *)xmlGetProp (n, (const guchar *)"uri");
-										new = upgrade_uri (uri);
-										xmlFree (uri);
-
-										xmlSetProp (n, (const guchar *)"uri", (guchar *)new);
-										g_free (new);
-									}
-								}
-
-								xmlFree (type);
-							}
-
-							val = val->next;
-						}
-					}
-
-					part = part->next;
-				}
-			} else if ((actionset = xml_find_node (node, "sources"))) {
-				/* vfolders.xml */
-				n = actionset->children;
-				while (n != NULL) {
-					if (n->name && !strcmp ((gchar *)n->name, "folder")) {
-						uri = (gchar *)xmlGetProp (n, (const guchar *)"uri");
-						new = upgrade_uri (uri);
-						xmlFree (uri);
-
-						xmlSetProp (n, (const guchar *)"uri", (guchar *)new);
-						g_free (new);
-					}
-
-					n = n->next;
-				}
-			}
-		}
-
-		node = node->next;
-	}
-}
-
-/* 1.0 upgrade functions & data */
-
-/* as much info as we have on a given account */
-struct _account_info_1_0 {
-	gchar *name;
-	gchar *uri;
-	gchar *base_uri;
-	union {
-		struct {
-			/* for imap */
-			gchar *namespace;
-			gchar *namespace_full;
-			guint32 capabilities;
-			GHashTable *folders;
-			gchar dir_sep;
-		} imap;
-	} u;
-};
-
-struct _imap_folder_info_1_0 {
-	gchar *folder;
-	/* encoded?  decoded?  canonicalised? */
-	gchar dir_sep;
-};
-
 struct _migrate_state_info {
 	gchar *label_name;
 	gdouble progress;
 };
-static gboolean update_states_in_main_thread (const struct
-		_migrate_state_info *info);
-
-static GHashTable *accounts_1_0 = NULL;
-static GHashTable *accounts_name_1_0 = NULL;
-
-static void
-imap_folder_info_1_0_free (struct _imap_folder_info_1_0 *fi)
-{
-	g_free(fi->folder);
-	g_free(fi);
-}
-
-static void
-account_info_1_0_free (struct _account_info_1_0 *ai)
-{
-	g_free(ai->name);
-	g_free(ai->uri);
-	g_free(ai->base_uri);
-	g_free(ai->u.imap.namespace);
-	g_free(ai->u.imap.namespace_full);
-	g_hash_table_destroy(ai->u.imap.folders);
-	g_free(ai);
-}
-
-static gchar *
-get_base_uri(const gchar *val)
-{
-	const gchar *tmp;
-
-	tmp = strchr(val, ':');
-	if (tmp) {
-		tmp++;
-		if (strncmp(tmp, "//", 2) == 0)
-			tmp += 2;
-		tmp = strchr(tmp, '/');
-	}
-
-	if (tmp)
-		return g_strndup(val, tmp-val);
-	else
-		return g_strdup(val);
-}
-
-static gchar *
-upgrade_xml_uris_1_0 (const gchar *uri)
-{
-	gchar *out = NULL;
-
-	/* upgrades camel uri's */
-	if (strncmp (uri, "imap:", 5) == 0) {
-		gchar *base_uri, dir_sep, *folder, *p;
-		struct _account_info_1_0 *ai;
-
-		/* add namespace, canonicalise dir_sep to / */
-		base_uri = get_base_uri (uri);
-		ai = g_hash_table_lookup (accounts_1_0, base_uri);
-
-		if (ai == NULL) {
-			g_free (base_uri);
-			return NULL;
-		}
-
-		dir_sep = ai->u.imap.dir_sep;
-		if (dir_sep == 0) {
-			/* no dir_sep listed, try get it from the namespace, if set */
-			if (ai->u.imap.namespace != NULL) {
-				p = ai->u.imap.namespace;
-				while ((dir_sep = *p++)) {
-					if (dir_sep < '0'
-					    || (dir_sep > '9' && dir_sep < 'A')
-					    || (dir_sep > 'Z' && dir_sep < 'a')
-					    || (dir_sep > 'z')) {
-						break;
-					}
-					p++;
-				}
-			}
-
-			/* give up ... */
-			if (dir_sep == 0) {
-				g_free (base_uri);
-				return NULL;
-			}
-		}
-
-		folder = g_strdup (uri + strlen (base_uri) + 1);
-
-		/* Add the namespace before the mailbox name, unless the mailbox is INBOX */
-		if (ai->u.imap.namespace && strcmp ((gchar *)folder, "INBOX") != 0)
-			out = g_strdup_printf ("%s/%s/%s", base_uri, ai->u.imap.namespace, folder);
-		else
-			out = g_strdup_printf ("%s/%s", base_uri, folder);
-
-		p = out;
-		while (*p) {
-			if (*p == dir_sep)
-				*p = '/';
-			p++;
-		}
-
-		g_free (folder);
-		g_free (base_uri);
-	} else if (strncmp (uri, "exchange:", 9) == 0) {
-		gchar *base_uri, *folder, *p;
-
-		/*  exchange://user@host/exchange/ * -> exchange://user@host/personal/ * */
-		/*  Any url encoding (%xx) in the folder name is also removed */
-		base_uri = get_base_uri (uri);
-		uri += strlen (base_uri) + 1;
-		if (strncmp (uri, "exchange/", 9) == 0) {
-			folder = e_bconf_url_decode (uri + 9);
-			p = strchr (folder, '/');
-			out = g_strdup_printf ("%s/personal%s", base_uri, p ? p : "/");
-			g_free (folder);
-		}
-	} else if (strncmp (uri, "exchanget:", 10) == 0) {
-		/* these should be converted in the accounts table when it is loaded */
-		g_warning ("exchanget: uri not converted: '%s'", uri);
-	}
-
-	return out;
-}
-
-static gchar *
-parse_lsub (const gchar *lsub, gchar *dir_sep)
-{
-	static gint comp;
-	static regex_t pat;
-	regmatch_t match[3];
-	const gchar *m = "^\\* LSUB \\([^)]*\\) \"?([^\" ]+)\"? \"?(.*)\"?$";
-
-	if (!comp) {
-		if (regcomp (&pat, m, REG_EXTENDED|REG_ICASE) == -1) {
-			g_warning ("reg comp '%s' failed: %s", m, g_strerror (errno));
-			return NULL;
-		}
-		comp = 1;
-	}
-
-	if (regexec (&pat, lsub, 3, match, 0) == 0) {
-		if (match[1].rm_so != -1 && match[2].rm_so != -1) {
-			if (dir_sep)
-				*dir_sep = (match[1].rm_eo - match[1].rm_so == 1) ? lsub[match[1].rm_so] : 0;
-			return g_strndup (lsub + match[2].rm_so, match[2].rm_eo - match[2].rm_so);
-		}
-	}
-
-	return NULL;
-}
-
-static gboolean
-read_imap_storeinfo (struct _account_info_1_0 *si)
-{
-	FILE *storeinfo;
-	guint32 tmp;
-	gchar *buf, *folder, dir_sep, *path, *name, *p;
-	struct _imap_folder_info_1_0 *fi;
-
-	si->u.imap.folders = g_hash_table_new_full (
-		g_str_hash, g_str_equal,
-		(GDestroyNotify) NULL,
-		(GDestroyNotify) imap_folder_info_1_0_free);
-
-	/* get details from uri first */
-	name = strstr (si->uri, ";override_namespace");
-	if (name) {
-		name = strstr (si->uri, ";namespace=");
-		if (name) {
-			gchar *end;
-
-			name += strlen (";namespace=");
-			if (*name == '\"') {
-				name++;
-				end = strchr (name, '\"');
-			} else {
-				end = strchr (name, ';');
-			}
-
-			if (end) {
-				/* try get the dir_sep from the namespace */
-				si->u.imap.namespace = g_strndup (name, end-name);
-
-				p = si->u.imap.namespace;
-				while ((dir_sep = *p++)) {
-					if (dir_sep < '0'
-					    || (dir_sep > '9' && dir_sep < 'A')
-					    || (dir_sep > 'Z' && dir_sep < 'a')
-					    || (dir_sep > 'z')) {
-						si->u.imap.dir_sep = dir_sep;
-						break;
-					}
-					p++;
-				}
-			}
-		}
-	}
-
-	/* now load storeinfo if it exists */
-	path = g_build_filename (g_get_home_dir (), "evolution", "mail", "imap", si->base_uri + 7, "storeinfo", NULL);
-	storeinfo = fopen (path, "r");
-	g_free (path);
-	if (storeinfo == NULL) {
-		g_warning ("could not find imap store info '%s'", path);
-		return FALSE;
-	}
-
-	/* ignore version */
-	camel_file_util_decode_uint32 (storeinfo, &tmp);
-	camel_file_util_decode_uint32 (storeinfo, &si->u.imap.capabilities);
-	g_free (si->u.imap.namespace);
-	camel_file_util_decode_string (storeinfo, &si->u.imap.namespace);
-	camel_file_util_decode_uint32 (storeinfo, &tmp);
-	si->u.imap.dir_sep = tmp;
-	/* strip trailing dir_sep or / */
-	if (si->u.imap.namespace
-	    && (si->u.imap.namespace[strlen (si->u.imap.namespace) - 1] == si->u.imap.dir_sep
-		|| si->u.imap.namespace[strlen (si->u.imap.namespace) - 1] == '/')) {
-		si->u.imap.namespace[strlen (si->u.imap.namespace) - 1] = 0;
-	}
-
-	d(printf ("namespace '%s' dir_sep '%c'\n", si->u.imap.namespace, si->u.imap.dir_sep ? si->u.imap.dir_sep : '?'));
-
-	while (camel_file_util_decode_string (storeinfo, &buf) == 0) {
-		folder = parse_lsub (buf, &dir_sep);
-		if (folder) {
-			fi = g_new0 (struct _imap_folder_info_1_0, 1);
-			fi->folder = folder;
-			fi->dir_sep = dir_sep;
-#if d(!)0
-			printf (" add folder '%s' ", folder);
-			if (dir_sep)
-				printf ("'%c'\n", dir_sep);
-			else
-				printf ("NIL\n");
-#endif
-			g_hash_table_insert (si->u.imap.folders, fi->folder, fi);
-		} else {
-			g_warning ("Could not parse LIST result '%s'\n", buf);
-		}
-	}
-
-	fclose (storeinfo);
-
-	return TRUE;
-}
-
-static gboolean
-load_accounts_1_0 (xmlDocPtr doc)
-{
-	xmlNodePtr source;
-	gchar *val, *tmp;
-	gint count = 0, i;
-	gchar key[32];
-
-	if (!(source = e_bconf_get_path (doc, "/Mail/Accounts")))
-		return TRUE;
-
-	if ((val = e_bconf_get_value (source, "num"))) {
-		count = atoi (val);
-		xmlFree (val);
-	}
-
-	/* load account upgrade info for each account */
-	for (i = 0; i < count; i++) {
-		struct _account_info_1_0 *ai;
-		gchar *rawuri;
-
-		sprintf (key, "source_url_%d", i);
-		if (!(rawuri = e_bconf_get_value (source, key)))
-			continue;
-
-		ai = g_malloc0 (sizeof (struct _account_info_1_0));
-		ai->uri = e_bconf_hex_decode (rawuri);
-		ai->base_uri = get_base_uri (ai->uri);
-		sprintf (key, "account_name_%d", i);
-		ai->name = e_bconf_get_string (source, key);
-
-		d(printf("load account '%s'\n", ai->uri));
-
-		if (!strncmp (ai->uri, "imap:", 5)) {
-			read_imap_storeinfo (ai);
-		} else if (!strncmp (ai->uri, "exchange:", 9)) {
-			xmlNodePtr node;
-
-			d(printf (" upgrade exchange account\n"));
-			/* small hack, poke the source_url into the transport_url for exchanget: transports
-			   - this will be picked up later in the conversion */
-			sprintf (key, "transport_url_%d", i);
-			node = e_bconf_get_entry (source, key);
-			if (node && (val = (gchar *)xmlGetProp (node, (const guchar *)"value"))) {
-				tmp = e_bconf_hex_decode (val);
-				xmlFree (val);
-				if (strncmp (tmp, "exchanget:", 10) == 0)
-					xmlSetProp (node, (const guchar *)"value", (guchar *)rawuri);
-				g_free (tmp);
-			} else {
-				d(printf (" couldn't find transport uri?\n"));
-			}
-		}
-		xmlFree (rawuri);
-
-		g_hash_table_insert (accounts_1_0, ai->base_uri, ai);
-		if (ai->name)
-			g_hash_table_insert (accounts_name_1_0, ai->name, ai);
-	}
-
-	return TRUE;
-}
-
-static gboolean
-em_migrate_1_0 (const gchar *data_dir, xmlDocPtr config_xmldb, xmlDocPtr filters, xmlDocPtr vfolders, GError **error)
-{
-	accounts_1_0 = g_hash_table_new_full (
-		g_str_hash, g_str_equal,
-		(GDestroyNotify) NULL,
-		(GDestroyNotify) account_info_1_0_free);
-	accounts_name_1_0 = g_hash_table_new (g_str_hash, g_str_equal);
-	load_accounts_1_0 (config_xmldb);
-
-	upgrade_xml_uris(filters, upgrade_xml_uris_1_0);
-	upgrade_xml_uris(vfolders, upgrade_xml_uris_1_0);
-
-	g_hash_table_destroy (accounts_1_0);
-	g_hash_table_destroy (accounts_name_1_0);
-
-	return TRUE;
-}
-
-/* 1.2 upgrade functions */
-static gboolean
-is_xml1encoded (const gchar *txt)
-{
-	const guchar *p;
-	gint isxml1 = FALSE;
-	gint is8bit = FALSE;
-
-	p = (const guchar *)txt;
-	while (*p) {
-		if (p[0] == '\\' && p[1] == 'U' && p[2] == '+'
-		    && isxdigit (p[3]) && isxdigit (p[4]) && isxdigit (p[5]) && isxdigit (p[6])
-		    && p[7] == '\\') {
-			isxml1 = TRUE;
-			p+=7;
-		} else if (p[0] >= 0x80)
-			is8bit = TRUE;
-		p++;
-	}
-
-	/* check for invalid utf8 that needs cleaning */
-	if (is8bit && !isxml1)
-		isxml1 = !g_utf8_validate (txt, -1, NULL);
-
-	return isxml1;
-}
-
-static gchar *
-decode_xml1 (const gchar *txt)
-{
-	GString *out = g_string_new ("");
-	const guchar *p;
-	gchar *res;
-
-	/* convert:
-	   \U+XXXX\ -> utf8
-	   8 bit characters -> utf8 (iso-8859-1) */
-
-	p = (const guchar *) txt;
-	while (*p) {
-		if (p[0] > 0x80
-		    || (p[0] == '\\' && p[1] == 'U' && p[2] == '+'
-			&& isxdigit (p[3]) && isxdigit (p[4]) && isxdigit (p[5]) && isxdigit (p[6])
-			&& p[7] == '\\')) {
-			gchar utf8[8];
-			gunichar u;
-
-			if (p[0] == '\\') {
-				memcpy (utf8, p + 3, 4);
-				utf8[4] = 0;
-				u = strtoul (utf8, NULL, 16);
-				p+=7;
-			} else
-				u = p[0];
-			utf8[g_unichar_to_utf8 (u, utf8)] = 0;
-			g_string_append (out, utf8);
-		} else {
-			g_string_append_c (out, *p);
-		}
-		p++;
-	}
-
-	res = out->str;
-	g_string_free (out, FALSE);
-
-	return res;
-}
-
-static gchar *
-utf8_reencode (const gchar *txt)
-{
-	GString *out = g_string_new ("");
-	gchar *p;
-	gchar *res;
-
-	/* convert:
-        libxml1  8 bit utf8 converted to xml entities byte-by-byte chars -> utf8 */
-
-	p =  (gchar *)txt;
-
-	while (*p) {
-		g_string_append_c (out, (gchar)g_utf8_get_char ((const gchar *)p));
-		p = (gchar *)g_utf8_next_char (p);
-	}
-
-	res = out->str;
-	if (g_utf8_validate (res, -1, NULL)) {
-		g_string_free (out, FALSE);
-		return res;
-	} else {
-		g_string_free (out, TRUE);
-		return g_strdup (txt);
-	}
-}
-
-static gboolean
-upgrade_xml_1_2_rec (xmlNodePtr node)
-{
-	const gchar *value_tags[] = { "string", "address", "regex", "file", "command", NULL };
-	const gchar *rule_tags[] = { "title", NULL };
-	const gchar *item_props[] = { "name", NULL };
-	struct {
-		const gchar *name;
-		const gchar **tags;
-		const gchar **props;
-	} tags[] = {
-		{ "value", value_tags, NULL },
-		{ "rule", rule_tags, NULL },
-		{ "item", NULL, item_props },
-		{ 0 },
-	};
-	xmlNodePtr work;
-	gint i,j;
-	gchar *txt, *tmp;
-
-	/* upgrades the content of a node, if the node has a specific parent/node name */
-
-	for (i = 0; tags[i].name; i++) {
-		if (!strcmp ((gchar *)node->name, tags[i].name)) {
-			if (tags[i].tags != NULL) {
-				work = node->children;
-				while (work) {
-					for (j = 0; tags[i].tags[j]; j++) {
-						if (!strcmp ((gchar *)work->name, tags[i].tags[j])) {
-							txt = (gchar *)xmlNodeGetContent (work);
-							if (is_xml1encoded (txt)) {
-								tmp = decode_xml1 (txt);
-								d(printf ("upgrading xml node %s/%s '%s' -> '%s'\n",
-									  tags[i].name, tags[i].tags[j], txt, tmp));
-								xmlNodeSetContent (work, (guchar *)tmp);
-								g_free (tmp);
-							}
-							xmlFree (txt);
-						}
-					}
-					work = work->next;
-				}
-				break;
-			}
-
-			if (tags[i].props != NULL) {
-				for (j = 0; tags[i].props[j]; j++) {
-					txt = (gchar *)xmlGetProp (node, (guchar *)tags[i].props[j]);
-					tmp = utf8_reencode (txt);
-					d(printf ("upgrading xml property %s on node %s '%s' -> '%s'\n",
-						  tags[i].props[j], tags[i].name, txt, tmp));
-					xmlSetProp (node, (const guchar *)tags[i].props[j], (guchar *)tmp);
-					g_free (tmp);
-					xmlFree (txt);
-				}
-			}
-		}
-	}
-
-	node = node->children;
-	while (node) {
-		upgrade_xml_1_2_rec (node);
-		node = node->next;
-	}
-
-	return TRUE;
-}
-
-static gboolean
-em_upgrade_xml_1_2 (xmlDocPtr doc)
-{
-	xmlNodePtr root;
-
-	if (!doc || !(root = xmlDocGetRootElement (doc)))
-		return TRUE;
-
-	return upgrade_xml_1_2_rec (root);
-}
-
-/* ********************************************************************** */
-/*  Tables for converting flat bonobo conf -> gconf xml blob		  */
-/* ********************************************************************** */
-
-/* Mail/Accounts/ * */
-static e_bconf_map_t cc_map[] = {
-	{ "account_always_cc_%i", "always", E_BCONF_MAP_BOOL },
-	{ "account_always_cc_addrs_%i", "recipients", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ NULL },
-};
-
-static e_bconf_map_t bcc_map[] = {
-	{ "account_always_cc_%i", "always", E_BCONF_MAP_BOOL },
-	{ "account_always_bcc_addrs_%i", "recipients", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ NULL },
-};
 
-static e_bconf_map_t pgp_map[] = {
-	{ "account_pgp_encrypt_to_self_%i", "encrypt-to-self", E_BCONF_MAP_BOOL },
-	{ "account_pgp_always_trust_%i", "always-trust", E_BCONF_MAP_BOOL },
-	{ "account_pgp_always_sign_%i", "always-sign", E_BCONF_MAP_BOOL },
-	{ "account_pgp_no_imip_sign_%i", "no-imip-sign", E_BCONF_MAP_BOOL },
-	{ "account_pgp_key_%i", "key-id", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ NULL },
-};
-
-static e_bconf_map_t smime_map[] = {
-	{ "account_smime_encrypt_to_self_%i", "encrypt-to-self", E_BCONF_MAP_BOOL },
-	{ "account_smime_always_sign_%i", "always-sign", E_BCONF_MAP_BOOL },
-	{ "account_smime_key_%i", "key-id", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ NULL },
-};
-
-static e_bconf_map_t identity_sig_map[] = {
-	{ "identity_autogenerated_signature_%i", "auto", E_BCONF_MAP_BOOL },
-	{ "identity_def_signature_%i", "default", E_BCONF_MAP_LONG },
-	{ NULL },
-};
-
-static e_bconf_map_t identity_map[] = {
-	{ "identity_name_%i", "name", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ "identity_address_%i", "addr-spec", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ "identity_reply_to_%i", "reply-to", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ "identity_organization_%i", "organization", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ NULL, "signature", E_BCONF_MAP_CHILD, identity_sig_map },
-	{ NULL },
-};
-
-static e_bconf_map_t source_map[] = {
-	{ "source_save_passwd_%i", "save-passwd", E_BCONF_MAP_BOOL },
-	{ "source_keep_on_server_%i", "keep-on-server", E_BCONF_MAP_BOOL },
-	{ "source_auto_check_%i", "auto-check", E_BCONF_MAP_BOOL },
-	{ "source_auto_check_time_%i", "auto-check-timeout", E_BCONF_MAP_LONG },
-	{ "source_url_%i", "url", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ NULL },
-};
-
-static e_bconf_map_t transport_map[] = {
-	{ "transport_save_passwd_%i", "save-passwd", E_BCONF_MAP_BOOL },
-	{ "transport_url_%i", "url", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ NULL },
-};
-
-static e_bconf_map_t account_map[] = {
-	{ "account_name_%i", "name", E_BCONF_MAP_STRING },
-	{ "source_enabled_%i", "enabled", E_BCONF_MAP_BOOL },
-	{ NULL, "identity", E_BCONF_MAP_CHILD, identity_map },
-	{ NULL, "source", E_BCONF_MAP_CHILD, source_map },
-	{ NULL, "transport", E_BCONF_MAP_CHILD, transport_map },
-	{ "account_drafts_folder_uri_%i", "drafts-folder", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ "account_sent_folder_uri_%i", "sent-folder", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ NULL, "auto-cc", E_BCONF_MAP_CHILD, cc_map },
-	{ NULL, "auto-bcc", E_BCONF_MAP_CHILD, bcc_map },
-	{ NULL, "pgp", E_BCONF_MAP_CHILD, pgp_map },
-	{ NULL, "smime", E_BCONF_MAP_CHILD, smime_map },
-	{ NULL },
-};
-
-/* /Mail/Signatures/ * */
-static e_bconf_map_t signature_format_map[] = {
-	{ "text/plain", },
-	{ "text/html", },
-	{ NULL }
-};
-
-static e_bconf_map_t signature_map[] = {
-	{ "name_%i", "name", E_BCONF_MAP_STRING },
-	{ "html_%i", "format", E_BCONF_MAP_ENUM, signature_format_map },
-	{ "filename_%i", "filename", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ "script_%i", "script", E_BCONF_MAP_STRING|E_BCONF_MAP_CONTENT },
-	{ NULL },
-};
-
-/* ********************************************************************** */
-/*  Tables for bonobo conf -> gconf conversion				  */
-/* ********************************************************************** */
-
-static e_gconf_map_t mail_accounts_map[] = {
-	/* /Mail/Accounts - most entries are processed via the xml blob routine */
-	/* This also works because the initial uid mapping is 1:1 with the list order */
-	{ "default_account", "mail/default_account", E_GCONF_MAP_SIMPLESTRING },
-	{ 0 },
-};
-
-static e_gconf_map_t mail_display_map[] = {
-	/* /Mail/Display */
-	{ "side_bar_search", "mail/display/side_bar_search", E_GCONF_MAP_BOOL },
-	{ "thread_subject", "mail/display/thread_subject", E_GCONF_MAP_BOOL },
-	{ "hide_deleted", "mail/display/show_deleted", E_GCONF_MAP_BOOLNOT },
-	{ "paned_size", "mail/display/paned_size", E_GCONF_MAP_INT },
-	{ "seen_timeout", "mail/display/mark_seen_timeout", E_GCONF_MAP_INT },
-	{ "do_seen_timeout", "mail/display/mark_seen", E_GCONF_MAP_BOOL },
-	{ "http_images", "mail/display/load_http_images", E_GCONF_MAP_INT },
-	{ "citation_highlight", "mail/display/mark_citations", E_GCONF_MAP_BOOL },
-	{ "citation_color", "mail/display/citation_colour", E_GCONF_MAP_COLOUR },
-	{ 0 },
-};
-
-static e_gconf_map_t mail_format_map[] = {
-	/* /Mail/Format */
-	{ "message_display_style", "mail/display/message_style", E_GCONF_MAP_INT },
-	{ "send_html", "mail/composer/send_html", E_GCONF_MAP_BOOL },
-	{ "default_reply_style", "mail/format/reply_style", E_GCONF_MAP_INT },
-	{ "default_forward_style", "mail/format/forward_style", E_GCONF_MAP_INT },
-	{ "default_charset", "mail/composer/charset", E_GCONF_MAP_STRING },
-	{ "confirm_unwanted_html", "mail/prompts/unwanted_html", E_GCONF_MAP_BOOL },
-	{ 0 },
-};
-
-static e_gconf_map_t mail_trash_map[] = {
-	/* /Mail/Trash */
-	{ "empty_on_exit", "mail/trash/empty_on_exit", E_GCONF_MAP_BOOL },
-	{ 0 },
-};
-
-static e_gconf_map_t mail_prompts_map[] = {
-	/* /Mail/Prompts */
-	{ "confirm_expunge", "mail/prompts/expunge", E_GCONF_MAP_BOOL },
-	{ "empty_subject", "mail/prompts/empty_subject", E_GCONF_MAP_BOOL },
-	{ "only_bcc", "mail/prompts/only_bcc", E_GCONF_MAP_BOOL },
-	{ 0 }
-};
-
-static e_gconf_map_t mail_filters_map[] = {
-	/* /Mail/Filters */
-	{ "log", "mail/filters/log", E_GCONF_MAP_BOOL },
-	{ "log_path", "mail/filters/logfile", E_GCONF_MAP_STRING },
-	{ 0 }
-};
-
-static e_gconf_map_t mail_notify_map[] = {
-	/* /Mail/Notify */
-	{ "new_mail_notification", "mail/notify/type", E_GCONF_MAP_INT },
-	{ "new_mail_notification_sound_file", "mail/notify/sound", E_GCONF_MAP_STRING },
-	{ 0 }
-};
-
-static e_gconf_map_t mail_filesel_map[] = {
-	/* /Mail/Filesel */
-	{ "last_filesel_dir", "mail/save_dir", E_GCONF_MAP_STRING },
-	{ 0 }
-};
-
-static e_gconf_map_t mail_composer_map[] = {
-	/* /Mail/Composer */
-	{ "ViewFrom", "mail/composer/view/From", E_GCONF_MAP_BOOL },
-	{ "ViewReplyTo", "mail/composer/view/ReplyTo", E_GCONF_MAP_BOOL },
-	{ "ViewCC", "mail/composer/view/Cc", E_GCONF_MAP_BOOL },
-	{ "ViewBCC", "mail/composer/view/Bcc", E_GCONF_MAP_BOOL },
-	{ "ViewSubject", "mail/composer/view/Subject", E_GCONF_MAP_BOOL },
-	{ 0 },
-};
-
-/* ********************************************************************** */
-
-static e_gconf_map_t importer_elm_map[] = {
-	/* /Importer/Elm */
-	{ "mail", "importer/elm/mail", E_GCONF_MAP_BOOL },
-	{ "mail-imported", "importer/elm/mail-imported", E_GCONF_MAP_BOOL },
-	{ 0 },
-};
-
-static e_gconf_map_t importer_pine_map[] = {
-	/* /Importer/Pine */
-	{ "mail", "importer/elm/mail", E_GCONF_MAP_BOOL },
-	{ "address", "importer/elm/address", E_GCONF_MAP_BOOL },
-	{ 0 },
-};
-
-static e_gconf_map_t importer_netscape_map[] = {
-	/* /Importer/Netscape */
-	{ "mail", "importer/netscape/mail", E_GCONF_MAP_BOOL },
-	{ "settings", "importer/netscape/settings", E_GCONF_MAP_BOOL },
-	{ "filters", "importer/netscape/filters", E_GCONF_MAP_BOOL },
-	{ 0 },
-};
-
-/* ********************************************************************** */
-
-static e_gconf_map_list_t gconf_remap_list[] = {
-	{ "/Mail/Accounts", mail_accounts_map },
-	{ "/Mail/Display", mail_display_map },
-	{ "/Mail/Format", mail_format_map },
-	{ "/Mail/Trash", mail_trash_map },
-	{ "/Mail/Prompts", mail_prompts_map },
-	{ "/Mail/Filters", mail_filters_map },
-	{ "/Mail/Notify", mail_notify_map },
-	{ "/Mail/Filesel", mail_filesel_map },
-	{ "/Mail/Composer", mail_composer_map },
-
-	{ "/Importer/Elm", importer_elm_map },
-	{ "/Importer/Pine", importer_pine_map },
-	{ "/Importer/Netscape", importer_netscape_map },
-
-	{ 0 },
-};
-
-static struct {
-	const gchar *label;
-	const gchar *colour;
-} label_default[5] = {
-	{ N_("Important"), "#EF2929" },  /* red */
-	{ N_("Work"),      "#F57900" },  /* orange */
-	{ N_("Personal"),  "#4E9A06" },  /* green */
-	{ N_("To Do"),     "#3465A4" },  /* blue */
-	{ N_("Later"),     "#75507B" }   /* purple */
-};
-
-/* remaps mail config from bconf to gconf */
 static gboolean
-bconf_import(GConfClient *gconf, xmlDocPtr config_xmldb)
-{
-	xmlNodePtr source;
-	gchar labx[16], colx[16];
-	gchar *val, *lab, *col;
-	GSList *list, *l;
-	gint i;
-
-	e_bconf_import(gconf, config_xmldb, gconf_remap_list);
-
-	/* Labels:
-	   label string + label colour as integer
-	   -> label string:# colour as hex */
-	source = e_bconf_get_path(config_xmldb, "/Mail/Labels");
-	if (source) {
-		list = NULL;
-		for (i = 0; i < 5; i++) {
-			sprintf(labx, "label_%d", i);
-			sprintf(colx, "color_%d", i);
-			lab = e_bconf_get_string(source, labx);
-			if ((col = e_bconf_get_value(source, colx))) {
-				sprintf(colx, "#%06x", atoi(col) & 0xffffff);
-				g_free(col);
-			} else
-				strcpy(colx, label_default[i].colour);
-
-			val = g_strdup_printf("%s:%s", lab ? lab : label_default[i].label, colx);
-			list = g_slist_append(list, val);
-			g_free(lab);
-		}
-
-		gconf_client_set_list(gconf, "/apps/evolution/mail/labels", GCONF_VALUE_STRING, list, NULL);
-		while (list) {
-			l = list->next;
-			g_free(list->data);
-			g_slist_free_1(list);
-			list = l;
-		}
-	} else {
-		g_warning("could not find /Mail/Labels in old config database, skipping");
-	}
-
-	/* Accounts: The flat bonobo-config structure is remapped to a list of xml blobs.  Upgrades as necessary */
-	e_bconf_import_xml_blob(gconf, config_xmldb, account_map, "/Mail/Accounts",
-				"/apps/evolution/mail/accounts", "account", "uid");
-
-	/* Same for signatures */
-	e_bconf_import_xml_blob(gconf, config_xmldb, signature_map, "/Mail/Signatures",
-				"/apps/evolution/mail/signatures", "signature", NULL);
-
-	return TRUE;
-}
-
-static gboolean
-em_migrate_1_2(const gchar *data_dir, xmlDocPtr config_xmldb, xmlDocPtr filters, xmlDocPtr vfolders, GError **error)
-{
-	GConfClient *gconf;
-
-	gconf = gconf_client_get_default();
-	bconf_import(gconf, config_xmldb);
-	g_object_unref(gconf);
-
-	em_upgrade_xml_1_2(filters);
-	em_upgrade_xml_1_2(vfolders);
-
-	return TRUE;
-}
-
-#endif	/* !G_OS_WIN32 */
+update_states_in_main_thread (const struct _migrate_state_info *info);
 
 /* 1.4 upgrade functions */
 
-#define EM_MIGRATE_SESSION_TYPE     (em_migrate_session_get_type ())
-#define EM_MIGRATE_SESSION(obj)     (CAMEL_CHECK_CAST((obj), EM_MIGRATE_SESSION_TYPE, EMMigrateSession))
-#define EM_MIGRATE_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), EM_MIGRATE_SESSION_TYPE, EMMigrateSessionClass))
-#define EM_MIGRATE_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), EM_MIGRATE_SESSION_TYPE))
+#define EM_TYPE_MIGRATE_SESSION \
+	(em_migrate_session_get_type ())
 
 typedef struct _EMMigrateSession {
 	CamelSession parent_object;
@@ -1055,33 +90,20 @@ typedef struct _EMMigrateSessionClass {
 
 } EMMigrateSessionClass;
 
-static CamelType em_migrate_session_get_type (void);
+GType em_migrate_session_get_type (void);
+
+G_DEFINE_TYPE (EMMigrateSession, em_migrate_session, CAMEL_TYPE_SESSION)
+
 static CamelSession *em_migrate_session_new (const gchar *path);
 
 static void
-class_init (EMMigrateSessionClass *klass)
+em_migrate_session_class_init (EMMigrateSessionClass *class)
 {
-	;
 }
 
-static CamelType
-em_migrate_session_get_type (void)
+static void
+em_migrate_session_init (EMMigrateSession *session)
 {
-	static CamelType type = CAMEL_INVALID_TYPE;
-
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (
-			camel_session_get_type (),
-			"EMMigrateSession",
-			sizeof (EMMigrateSession),
-			sizeof (EMMigrateSessionClass),
-			(CamelObjectClassInitFunc) class_init,
-			NULL,
-			NULL,
-			NULL);
-	}
-
-	return type;
 }
 
 static CamelSession *
@@ -1089,8 +111,7 @@ em_migrate_session_new (const gchar *path)
 {
 	CamelSession *session;
 
-	session = CAMEL_SESSION (camel_object_new (EM_MIGRATE_SESSION_TYPE));
-
+	session = g_object_new (EM_TYPE_MIGRATE_SESSION, NULL);
 	camel_session_construct (session, path);
 
 	return session;
@@ -1199,162 +220,6 @@ em_migrate_set_progress (double percent)
 		gtk_main_iteration ();
 }
 
-#ifndef G_OS_WIN32
-
-static gboolean
-is_mail_folder (const gchar *metadata)
-{
-	xmlNodePtr node;
-	xmlDocPtr doc;
-	gchar *type;
-
-	if (!(doc = xmlParseFile (metadata))) {
-		g_warning ("Cannot parse '%s'", metadata);
-		return FALSE;
-	}
-
-	if (!(node = xmlDocGetRootElement (doc))) {
-		g_warning ("'%s' corrupt: document contains no root node", metadata);
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	if (!node->name || strcmp ((gchar *)node->name, "efolder") != 0) {
-		g_warning ("'%s' corrupt: root node is not 'efolder'", metadata);
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	node = node->children;
-	while (node != NULL) {
-		if (node->name && !strcmp ((gchar *)node->name, "type")) {
-			type = (gchar *)xmlNodeGetContent (node);
-			if (!strcmp ((gchar *)type, "mail")) {
-				xmlFreeDoc (doc);
-				xmlFree (type);
-
-				return TRUE;
-			}
-
-			xmlFree (type);
-
-			break;
-		}
-
-		node = node->next;
-	}
-
-	xmlFreeDoc (doc);
-
-	return FALSE;
-}
-
-static gboolean
-get_local_et_expanded (const gchar *dirname)
-{
-	xmlNodePtr node;
-	xmlDocPtr doc;
-	struct stat st;
-	gchar *buf, *p;
-	gint thread_list;
-
-	buf = g_strdup_printf ("%s/evolution/config/file:%s", g_get_home_dir (), dirname);
-	p = buf + strlen (g_get_home_dir ()) + strlen ("/evolution/config/file:");
-	e_filename_make_safe (p);
-
-	if (stat (buf, &st) == -1) {
-		g_free (buf);
-		return FALSE;
-	}
-
-	if (!(doc = xmlParseFile (buf))) {
-		g_free (buf);
-		return FALSE;
-	}
-
-	g_free (buf);
-
-	if (!(node = xmlDocGetRootElement (doc)) || strcmp ((gchar *)node->name, "expanded_state") != 0) {
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	if (!(buf = (gchar *)xmlGetProp (node, (const guchar *)"default"))) {
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	thread_list = strcmp (buf, "0") == 0 ? 0 : 1;
-	xmlFree (buf);
-
-	xmlFreeDoc (doc);
-
-	return thread_list;
-}
-
-static gchar *
-get_local_store_uri (const gchar *dirname, gchar **namep, gint *indexp)
-{
-	gchar *name, *protocol, *metadata, *tmp;
-	gint index;
-	struct stat st;
-	xmlNodePtr node;
-	xmlDocPtr doc;
-
-	metadata = g_build_filename(dirname, "local-metadata.xml", NULL);
-
-	/* in 1.4, any errors are treated as defaults, this function cannot fail */
-
-	/* defaults */
-	name = (gchar *) "mbox";
-	protocol = (gchar *) "mbox";
-	index = TRUE;
-
-	if (stat (metadata, &st) == -1 || !S_ISREG (st.st_mode))
-		goto nofile;
-
-	doc = xmlParseFile(metadata);
-	if (doc == NULL)
-		goto nofile;
-
-	node = doc->children;
-	if (strcmp((gchar *)node->name, "folderinfo"))
-		goto dodefault;
-
-	for (node = node->children; node; node = node->next) {
-		if (node->name && !strcmp ((gchar *)node->name, "folder")) {
-			tmp = (gchar *)xmlGetProp (node, (const guchar *)"type");
-			if (tmp) {
-				protocol = g_alloca(strlen(tmp)+1);
-				strcpy(protocol, tmp);
-				xmlFree(tmp);
-			}
-			tmp = (gchar *)xmlGetProp (node, (const guchar *)"name");
-			if (tmp) {
-				name = g_alloca(strlen(tmp)+1);
-				strcpy(name, tmp);
-				xmlFree(tmp);
-			}
-			tmp = (gchar *)xmlGetProp (node, (const guchar *)"index");
-			if (tmp) {
-				index = atoi(tmp);
-				xmlFree(tmp);
-			}
-		}
-	}
-dodefault:
-	xmlFreeDoc (doc);
-nofile:
-	g_free(metadata);
-
-	*namep = g_strdup(name);
-	*indexp = index;
-
-	return g_strdup_printf("%s:%s", protocol, dirname);
-}
-
-#endif	/* !G_OS_WIN32 */
-
 enum {
 	CP_UNIQUE = 0,
 	CP_OVERWRITE,
@@ -1449,1163 +314,9 @@ cp (const gchar *src, const gchar *dest, gboolean show_progress, gint mode)
 
 #ifndef G_OS_WIN32
 
-static gboolean
-cp_r (const gchar *src, const gchar *dest, const gchar *pattern, gint mode)
-{
-	GString *srcpath, *destpath;
-	struct dirent *dent;
-	gsize slen, dlen;
-	struct stat st;
-	DIR *dir;
-
-	if (g_mkdir_with_parents (dest, 0700) == -1)
-		return FALSE;
-
-	if (!(dir = opendir (src)))
-		return FALSE;
-
-	srcpath = g_string_new (src);
-	g_string_append_c (srcpath, '/');
-	slen = srcpath->len;
-
-	destpath = g_string_new (dest);
-	g_string_append_c (destpath, '/');
-	dlen = destpath->len;
-
-	while ((dent = readdir (dir))) {
-		if (!strcmp (dent->d_name, ".") || !strcmp (dent->d_name, ".."))
-			continue;
-
-		g_string_truncate (srcpath, slen);
-		g_string_truncate (destpath, dlen);
-
-		g_string_append (srcpath, dent->d_name);
-		g_string_append (destpath, dent->d_name);
-
-		if (stat (srcpath->str, &st) == -1)
-			continue;
-
-		if (S_ISDIR (st.st_mode)) {
-			cp_r (srcpath->str, destpath->str, pattern, mode);
-		} else if (!pattern || !strcmp (dent->d_name, pattern)) {
-			cp (srcpath->str, destpath->str, FALSE, mode);
-		}
-	}
-
-	closedir (dir);
-
-	g_string_free (destpath, TRUE);
-	g_string_free (srcpath, TRUE);
-
-	return TRUE;
-}
-
-static void
-mbox_build_filename (GString *path, const gchar *toplevel_dir, const gchar *full_name)
-{
-	const gchar *start, *inptr = full_name;
-	gint subdirs = 0;
-
-	while (*inptr != '\0') {
-		if (*inptr == '/')
-			subdirs++;
-		inptr++;
-	}
-
-	g_string_assign(path, toplevel_dir);
-	g_string_append_c (path, '/');
-
-	inptr = full_name;
-	while (*inptr != '\0') {
-		start = inptr;
-		while (*inptr != '/' && *inptr != '\0')
-			inptr++;
-
-		g_string_append_len (path, start, inptr - start);
-
-		if (*inptr == '/') {
-			g_string_append (path, ".sbd/");
-			inptr++;
-
-			/* strip extranaeous '/'s */
-			while (*inptr == '/')
-				inptr++;
-		}
-	}
-}
-
-static gboolean
-em_migrate_folder(EMMigrateSession *session, const gchar *dirname, const gchar *full_name, GError **error)
-{
-	CamelFolder *old_folder = NULL, *new_folder = NULL;
-	CamelStore *local_store = NULL;
-	CamelException ex;
-	gchar *name, *uri;
-	GPtrArray *uids;
-	struct stat st;
-	gboolean thread_list;
-	gint index, i;
-	GString *src, *dest;
-	gboolean success = FALSE;
-	struct _migrate_state_info * info;
-
-	camel_exception_init (&ex);
-
-	src = g_string_new("");
-
-	g_string_printf(src, "%s/folder-metadata.xml", dirname);
-	if (stat (src->str, &st) == -1
-	    || !S_ISREG (st.st_mode)
-	    || !is_mail_folder(src->str)) {
-		/* Not an evolution mail folder */
-		g_string_free(src, TRUE);
-		return TRUE;
-	}
-
-	dest = g_string_new("");
-	uri = get_local_store_uri(dirname, &name, &index);
-	info = g_malloc (sizeof(struct _migrate_state_info));
-	info->label_name = g_strdup (full_name);
-	info->progress = 0.0;
-	g_idle_add ((GSourceFunc) update_states_in_main_thread, info);
-
-	thread_list = get_local_et_expanded (dirname);
-
-	/* Manually copy local mbox files, its much faster */
-	if (!strncmp (uri, "mbox:", 5)) {
-		static const gchar *meta_ext[] = { ".summary", ".ibex.index", ".ibex.index.data" };
-		gsize slen, dlen;
-		FILE *fp;
-		gchar *p;
-		gint mode;
-
-		g_string_printf (src, "%s/%s", uri + 5, name);
-		mbox_build_filename (dest, ((CamelService *)session->store)->url->path, full_name);
-		p = strrchr (dest->str, '/');
-		*p = '\0';
-
-		slen = src->len;
-		dlen = dest->len;
-
-		if (g_mkdir_with_parents (dest->str, 0700) == -1 && errno != EEXIST) {
-			g_set_error (
-				error, E_SHELL_MIGRATE_ERROR,
-				E_SHELL_MIGRATE_ERROR_FAILED,
-				_("Unable to create new folder '%s': %s"),
-				dest->str, g_strerror (errno));
-			goto fatal;
-		}
-
-		*p = '/';
-		mode = CP_UNIQUE;
-	retry_copy:
-		if (!cp (src->str, dest->str, TRUE, mode)) {
-			if (errno == EEXIST) {
-				gint save = errno;
-
-				switch (e_alert_run_dialog_for_args (e_shell_get_active_window (NULL), "mail:ask-migrate-existing", src->str, dest->str, NULL)) {
-				case GTK_RESPONSE_ACCEPT:
-					mode = CP_OVERWRITE;
-					goto retry_copy;
-				case GTK_RESPONSE_OK:
-					mode = CP_APPEND;
-					goto retry_copy;
-				case GTK_RESPONSE_REJECT:
-					goto ignore;
-				}
-
-				errno = save;
-			}
-			g_set_error (
-				error, E_SHELL_MIGRATE_ERROR,
-				E_SHELL_MIGRATE_ERROR_FAILED,
-				_("Unable to copy folder '%s' to '%s': %s"),
-				src->str, dest->str, g_strerror (errno));
-			goto fatal;
-		}
-	ignore:
-
-		/* create a .cmeta file specifying to index and/or thread the folder */
-		g_string_truncate (dest, dlen);
-		g_string_append (dest, ".cmeta");
-		if ((fp = fopen (dest->str, "w")) != NULL) {
-			gint fd = fileno (fp);
-
-			/* write the magic string */
-			if (fwrite ("CLMD", 4, 1, fp) != 1)
-				goto cmeta_err;
-
-			/* write the version (1) */
-			if (camel_file_util_encode_uint32 (fp, 1) == -1)
-				goto cmeta_err;
-
-			/* write the meta count */
-			if (camel_file_util_encode_uint32 (fp, thread_list ? 1 : 0) == -1)
-				goto cmeta_err;
-
-			if (!thread_list) {
-				if (camel_file_util_encode_string (fp, "evolution:thread_list") == -1)
-					goto cmeta_err;
-
-				if (camel_file_util_encode_string (fp, !thread_list ? "1" : "0") == -1)
-					goto cmeta_err;
-			}
-
-			/* write the prop count (only prop is the index prop) */
-			if (camel_file_util_encode_uint32 (fp, 1) == -1)
-				goto cmeta_err;
-
-			/* write the index prop tag (== CAMEL_FOLDER_ARG_LAST|CAMEL_ARG_BOO) */
-			if (camel_file_util_encode_uint32 (fp, CAMEL_FOLDER_ARG_LAST|CAMEL_ARG_BOO) == -1)
-				goto cmeta_err;
-
-			/* write the index prop value */
-			if (camel_file_util_encode_uint32 (fp, 1) == -1)
-				goto cmeta_err;
-
-			fflush (fp);
-
-			if (fsync (fd) == -1) {
-			cmeta_err:
-				fclose (fp);
-				unlink (dest->str);
-			} else {
-				fclose (fp);
-			}
-		}
-
-		/* copy over the metadata files */
-		for (i = 0; i < G_N_ELEMENTS (meta_ext); i++) {
-			g_string_truncate (src, slen);
-			g_string_truncate (dest, dlen);
-
-			g_string_append (src, meta_ext[i]);
-			g_string_append (dest, meta_ext[i]);
-			cp (src->str, dest->str, FALSE, CP_OVERWRITE);
-		}
-	} else {
-		guint32 flags = CAMEL_STORE_FOLDER_CREATE;
-
-		if (!(local_store = camel_session_get_store ((CamelSession *) session, uri, &ex))
-		    || !(old_folder = camel_store_get_folder (local_store, name, 0, &ex)))
-			goto fatal;
-
-		flags |= (index ? CAMEL_STORE_FOLDER_BODY_INDEX : 0);
-		if (!(new_folder = camel_store_get_folder (session->store, full_name, flags, &ex)))
-			goto fatal;
-
-		if (!thread_list) {
-			camel_object_meta_set (new_folder, "evolution:thread_list", !thread_list ? "1" : "0");
-			camel_object_state_write (new_folder);
-		}
-
-		uids = camel_folder_get_uids (old_folder);
-		for (i = 0; i < uids->len; i++) {
-			CamelMimeMessage *message;
-			CamelMessageInfo *info;
-
-			if (!(info = camel_folder_get_message_info (old_folder, uids->pdata[i])))
-				continue;
-
-			if (!(message = camel_folder_get_message (old_folder, uids->pdata[i], &ex))) {
-				camel_folder_free_message_info (old_folder, info);
-				camel_folder_free_uids (old_folder, uids);
-				goto fatal;
-			}
-
-			camel_folder_append_message (new_folder, message, info, NULL, &ex);
-			camel_folder_free_message_info (old_folder, info);
-			camel_object_unref (message);
-
-			if (camel_exception_is_set (&ex))
-				break;
-
-			em_migrate_set_progress (((double) i + 1) / ((double) uids->len));
-		}
-
-		camel_folder_free_uids (old_folder, uids);
-
-		if (camel_exception_is_set (&ex))
-			goto fatal;
-	}
-	success = TRUE;
-fatal:
-	g_free (uri);
-	g_free (name);
-	g_string_free(src, TRUE);
-	g_string_free(dest, TRUE);
-	if (local_store)
-		camel_object_unref(local_store);
-	if (old_folder)
-		camel_object_unref(old_folder);
-	if (new_folder)
-		camel_object_unref(new_folder);
-
-	if (camel_exception_is_set (&ex)) {
-		g_set_error (
-			error, E_SHELL_MIGRATE_ERROR,
-			E_SHELL_MIGRATE_ERROR_FAILED,
-			"%s", camel_exception_get_description (&ex));
-		camel_exception_clear (&ex);
-	}
-
-	return success;
-}
-
-static gboolean
-em_migrate_dir (EMMigrateSession *session, const gchar *dirname, const gchar *full_name, GError **error)
-{
-	gchar *path;
-	DIR *dir;
-	struct stat st;
-	struct dirent *dent;
-	gboolean success = TRUE;
-
-	if (!em_migrate_folder(session, dirname, full_name, error))
-		return FALSE;
-
-	/* no subfolders, not readable, don't care */
-	path = g_strdup_printf ("%s/subfolders", dirname);
-	if (stat (path, &st) == -1 || !S_ISDIR (st.st_mode)) {
-		g_free (path);
-		return TRUE;
-	}
-
-	if (!(dir = opendir (path))) {
-		g_free (path);
-		return TRUE;
-	}
-
-	while (success && (dent = readdir (dir))) {
-		gchar *full_path;
-		gchar *name;
-
-		if (dent->d_name[0] == '.')
-			continue;
-
-		full_path = g_strdup_printf ("%s/%s", path, dent->d_name);
-		if (stat (full_path, &st) == -1 || !S_ISDIR (st.st_mode)) {
-			g_free (full_path);
-			continue;
-		}
-
-		name = g_strdup_printf ("%s/%s", full_name, dent->d_name);
-		success = em_migrate_dir (session, full_path, name, error);
-		g_free (full_path);
-		g_free (name);
-	}
-
-	closedir (dir);
-
-	g_free (path);
-
-	return success;
-}
-
-static gboolean
-em_migrate_local_folders_1_4 (EMMigrateSession *session, GError **error)
-{
-	struct dirent *dent;
-	struct stat st;
-	DIR *dir;
-	gboolean success = TRUE;
-
-	if (!(dir = opendir (session->srcdir))) {
-		g_set_error (
-			error, E_SHELL_MIGRATE_ERROR,
-			E_SHELL_MIGRATE_ERROR_FAILED,
-			_("Unable to scan for existing mailboxes at "
-			  "'%s': %s"), session->srcdir, g_strerror (errno));
-		return FALSE;
-	}
-
-	em_migrate_setup_progress_dialog (
-		_("Migrating Folders"),
-		_("The location and hierarchy of the Evolution mailbox "
-		  "folders has changed since Evolution 1.x.\n\nPlease be "
-		  "patient while Evolution migrates your folders..."));
-
-	while (success && (dent = readdir (dir))) {
-		gchar *full_path;
-
-		if (dent->d_name[0] == '.')
-			continue;
-
-		full_path = g_strdup_printf ("%s/%s", session->srcdir, dent->d_name);
-		if (stat (full_path, &st) == -1 || !S_ISDIR (st.st_mode)) {
-			g_free (full_path);
-			continue;
-		}
-
-		success = em_migrate_dir (session, full_path, dent->d_name, error);
-		g_free (full_path);
-	}
-
-	closedir (dir);
-
-	em_migrate_close_progress_dialog ();
-
-	return success;
-}
-
-static gchar *
-upgrade_xml_uris_1_4 (const gchar *uri)
-{
-	gchar *path, *prefix, *p;
-	CamelURL *url;
-
-	if (!strncmp (uri, "file:", 5)) {
-		url = camel_url_new (uri, NULL);
-		camel_url_set_protocol (url, "email");
-		camel_url_set_user (url, "local");
-		camel_url_set_host (url, "local");
-
-		prefix = g_build_filename (g_get_home_dir (), "evolution", "local", NULL);
-		if (strncmp (url->path, prefix, strlen (prefix)) != 0) {
-			/* uri is busticated - user probably copied from another user's home directory */
-			camel_url_free (url);
-			g_free (prefix);
-
-			return g_strdup (uri);
-		}
-		path = g_strdup (url->path + strlen (prefix));
-		g_free (prefix);
-
-		/* modify the path in-place */
-		p = path + strlen (path) - 12;
-		while (p > path) {
-			if (!strncmp (p, "/subfolders/", 12))
-				memmove (p, p + 11, strlen (p + 11) + 1);
-
-			p--;
-		}
-
-		camel_url_set_path (url, path);
-		g_free (path);
-
-		path = camel_url_to_string (url, 0);
-		camel_url_free (url);
-
-		return path;
-	} else {
-		return em_uri_from_camel (uri);
-	}
-}
-
-static void
-upgrade_vfolder_sources_1_4 (xmlDocPtr doc)
-{
-	xmlNodePtr root, node;
-
-	if (!doc || !(root = xmlDocGetRootElement (doc)))
-		return;
-
-	if (!root->name || strcmp ((gchar *)root->name, "filteroptions") != 0) {
-		/* root node is not <filteroptions>, nothing to upgrade */
-		return;
-	}
-
-	if (!(node = xml_find_node (root, "ruleset"))) {
-		/* no ruleset node, nothing to upgrade */
-		return;
-	}
-
-	node = node->children;
-	while (node != NULL) {
-		if (node->name && !strcmp ((gchar *)node->name, "rule")) {
-			xmlNodePtr sources;
-			gchar *src;
-
-			if (!(src = (gchar *)xmlGetProp (node, (const guchar *)"source")))
-				src = (gchar *)xmlStrdup ((const guchar *)"local");  /* default to all local folders? */
-
-			xmlSetProp (node, (const guchar *)"source", (const guchar *)"incoming");
-
-			if (!(sources = xml_find_node (node, "sources")))
-				sources = xmlNewChild (node, NULL, (const guchar *)"sources", NULL);
-
-			xmlSetProp (sources, (const guchar *)"with", (guchar *)src);
-			xmlFree (src);
-		}
-
-		node = node->next;
-	}
-}
-
-static gchar *
-get_nth_sig (gint id)
-{
-	ESignatureList *list;
-	ESignature *sig;
-	EIterator *iter;
-	gchar *uid = NULL;
-	gint i = 0;
-
-	list = e_get_signature_list ();
-	iter = e_list_get_iterator ((EList *) list);
-
-	while (e_iterator_is_valid (iter) && i < id) {
-		e_iterator_next (iter);
-		i++;
-	}
-
-	if (i == id && e_iterator_is_valid (iter)) {
-		sig = (ESignature *) e_iterator_get (iter);
-		uid = g_strdup (e_signature_get_uid (sig));
-	}
-
-	g_object_unref (iter);
-
-	return uid;
-}
-
-static void
-em_upgrade_accounts_1_4 (void)
-{
-	EAccountList *accounts;
-	EIterator *iter;
-
-	if (!(accounts = e_get_account_list ()))
-		return;
-
-	iter = e_list_get_iterator ((EList *) accounts);
-	while (e_iterator_is_valid (iter)) {
-		EAccount *account = (EAccount *) e_iterator_get (iter);
-		gchar *url;
-
-		if (account->drafts_folder_uri) {
-			url = upgrade_xml_uris_1_4 (account->drafts_folder_uri);
-			g_free (account->drafts_folder_uri);
-			account->drafts_folder_uri = url;
-		}
-
-		if (account->sent_folder_uri) {
-			url = upgrade_xml_uris_1_4 (account->sent_folder_uri);
-			g_free (account->sent_folder_uri);
-			account->sent_folder_uri = url;
-		}
-
-		if (account->id->sig_uid && !strncmp (account->id->sig_uid, "::", 2)) {
-			gint sig_id;
-
-			sig_id = strtol (account->id->sig_uid + 2, NULL, 10);
-			g_free (account->id->sig_uid);
-			account->id->sig_uid = get_nth_sig (sig_id);
-		}
-
-		e_iterator_next (iter);
-	}
-
-	g_object_unref (iter);
-
-	e_account_list_save (accounts);
-}
-
-static gboolean
-em_migrate_pop_uid_caches_1_4 (const gchar *data_dir, GError **error)
-{
-	GString *oldpath, *newpath;
-	struct dirent *dent;
-	gsize olen, nlen;
-	gchar *cache_dir;
-	DIR *dir;
-	gboolean success = TRUE;
-
-	/* Sigh, too many unique strings to translate, for cases which shouldn't ever happen */
-
-	/* open the old cache dir */
-	cache_dir = g_build_filename (g_get_home_dir (), "evolution", "mail", "pop3", NULL);
-	if (!(dir = opendir (cache_dir))) {
-		if (errno == ENOENT) {
-			g_free(cache_dir);
-			return TRUE;
-		}
-
-		g_set_error (
-			error, E_SHELL_MIGRATE_ERROR,
-			E_SHELL_MIGRATE_ERROR_FAILED,
-			_("Unable to open old POP keep-on-server data "
-			  "'%s': %s"), cache_dir, g_strerror (errno));
-		g_free (cache_dir);
-		return FALSE;
-	}
-
-	oldpath = g_string_new (cache_dir);
-	g_string_append_c (oldpath, '/');
-	olen = oldpath->len;
-	g_free (cache_dir);
-
-	cache_dir = g_build_filename (data_dir, "pop", NULL);
-	if (g_mkdir_with_parents (cache_dir, 0700) == -1) {
-		g_set_error (
-			error, E_SHELL_MIGRATE_ERROR,
-			E_SHELL_MIGRATE_ERROR_FAILED,
-			_("Unable to create POP3 keep-on-server data "
-			  "directory '%s': %s"), cache_dir,
-			g_strerror (errno));
-		g_string_free (oldpath, TRUE);
-		g_free (cache_dir);
-		closedir (dir);
-		return FALSE;
-	}
-
-	newpath = g_string_new (cache_dir);
-	g_string_append_c (newpath, '/');
-	nlen = newpath->len;
-	g_free (cache_dir);
-
-	while (success && (dent = readdir (dir))) {
-		if (strncmp (dent->d_name, "cache-pop:__", 12) != 0)
-			continue;
-
-		g_string_truncate (oldpath, olen);
-		g_string_truncate (newpath, nlen);
-
-		g_string_append (oldpath, dent->d_name);
-		g_string_append (newpath, dent->d_name + 12);
-
-		/* strip the trailing '_' */
-		g_string_truncate (newpath, newpath->len - 1);
-
-		if (g_mkdir_with_parents (newpath->str, 0700) == -1
-		    || !cp(oldpath->str, (g_string_append(newpath, "/uid-cache"))->str, FALSE, CP_UNIQUE)) {
-			g_set_error (
-				error, E_SHELL_MIGRATE_ERROR,
-				E_SHELL_MIGRATE_ERROR_FAILED,
-				_("Unable to copy POP3 keep-on-server data "
-				  "'%s': %s"), oldpath->str,
-				g_strerror (errno));
-			success = FALSE;
-		}
-
-	}
-
-	g_string_free (oldpath, TRUE);
-	g_string_free (newpath, TRUE);
-
-	closedir (dir);
-
-	return success;
-}
-
-static gboolean
-em_migrate_imap_caches_1_4 (const gchar *data_dir, GError **error)
-{
-	gchar *src, *dest;
-	struct stat st;
-
-	src = g_build_filename (g_get_home_dir (), "evolution", "mail", "imap", NULL);
-	if (stat (src, &st) == -1 || !S_ISDIR (st.st_mode)) {
-		g_free (src);
-		return TRUE;
-	}
-
-	dest = g_build_filename (data_dir, "imap", NULL);
-
-	/* we don't care if this fails, it's only a cache... */
-	cp_r (src, dest, "summary", CP_OVERWRITE);
-
-	g_free (dest);
-	g_free (src);
-
-	return TRUE;
-}
-
-static gboolean
-em_migrate_folder_expand_state_1_4 (const gchar *data_dir, GError **error)
-{
-	GString *srcpath, *destpath;
-	gsize slen, dlen, rlen;
-	gchar *evo14_mbox_root;
-	struct dirent *dent;
-	struct stat st;
-	DIR *dir;
-
-	srcpath = g_string_new (g_get_home_dir ());
-	g_string_append (srcpath, "/evolution/config");
-	if (stat (srcpath->str, &st) == -1 || !S_ISDIR (st.st_mode)) {
-		g_string_free (srcpath, TRUE);
-		return TRUE;
-	}
-
-	destpath = g_string_new (data_dir);
-	g_string_append (destpath, "/config");
-	if (g_mkdir_with_parents (destpath->str, 0700) == -1 || !(dir = opendir (srcpath->str))) {
-		g_string_free (destpath, TRUE);
-		g_string_free (srcpath, TRUE);
-		return TRUE;
-	}
-
-	g_string_append (srcpath, "/et-expanded-");
-	slen = srcpath->len;
-	g_string_append (destpath, "/et-expanded-");
-	dlen = destpath->len;
-
-	evo14_mbox_root = g_build_filename (g_get_home_dir (), "evolution", "local", NULL);
-	e_filename_make_safe (evo14_mbox_root);
-	rlen = strlen (evo14_mbox_root);
-	evo14_mbox_root = g_realloc (evo14_mbox_root, rlen + 2);
-	evo14_mbox_root[rlen++] = '_';
-	evo14_mbox_root[rlen] = '\0';
-
-	while ((dent = readdir (dir))) {
-		gchar *full_name, *inptr, *buf = NULL;
-		const gchar *filename;
-		GString *new;
-
-		if (strncmp (dent->d_name, "et-expanded-", 12) != 0)
-			continue;
-
-		if (!strncmp (dent->d_name + 12, "file:", 5)) {
-			/* need to munge the filename */
-			inptr = dent->d_name + 17;
-
-			if (!strncmp (inptr, evo14_mbox_root, rlen)) {
-				/* this should always be the case afaik... */
-				inptr += rlen;
-				new = g_string_new ("mbox:");
-				g_string_append_printf (new, "%s/local#", data_dir);
-
-				full_name = g_strdup (inptr);
-				inptr = full_name + strlen (full_name) - 12;
-				while (inptr > full_name) {
-					if (!strncmp (inptr, "_subfolders_", 12))
-						memmove (inptr, inptr + 11, strlen (inptr + 11) + 1);
-
-					inptr--;
-				}
-
-				g_string_append (new, full_name);
-				g_free (full_name);
-
-				filename = buf = new->str;
-				g_string_free (new, FALSE);
-				e_filename_make_safe (buf);
-			} else {
-				/* but just in case... */
-				filename = dent->d_name + 12;
-			}
-		} else {
-			/* no munging needed */
-			filename = dent->d_name + 12;
-		}
-
-		g_string_append (srcpath, dent->d_name + 12);
-		g_string_append (destpath, filename);
-		g_free (buf);
-
-		cp (srcpath->str, destpath->str, FALSE, CP_UNIQUE);
-
-		g_string_truncate (srcpath, slen);
-		g_string_truncate (destpath, dlen);
-	}
-
-	closedir (dir);
-
-	g_free (evo14_mbox_root);
-	g_string_free (destpath, TRUE);
-	g_string_free (srcpath, TRUE);
-
-	return TRUE;
-}
-
-static gboolean
-em_migrate_folder_view_settings_1_4 (const gchar *data_dir, GError **error)
-{
-	GString *srcpath, *destpath;
-	gsize slen, dlen, rlen;
-	gchar *evo14_mbox_root;
-	struct dirent *dent;
-	struct stat st;
-	DIR *dir;
-
-	srcpath = g_string_new (g_get_home_dir ());
-	g_string_append (srcpath, "/evolution/views/mail");
-	if (stat (srcpath->str, &st) == -1 || !S_ISDIR (st.st_mode)) {
-		g_string_free (srcpath, TRUE);
-		return TRUE;
-	}
-
-	destpath = g_string_new (data_dir);
-	g_string_append (destpath, "/views");
-	if (g_mkdir_with_parents (destpath->str, 0700) == -1 || !(dir = opendir (srcpath->str))) {
-		g_string_free (destpath, TRUE);
-		g_string_free (srcpath, TRUE);
-		return TRUE;
-	}
-
-	g_string_append_c (srcpath, '/');
-	slen = srcpath->len;
-	g_string_append_c (destpath, '/');
-	dlen = destpath->len;
-
-	evo14_mbox_root = g_build_filename (g_get_home_dir (), "evolution", "local", NULL);
-	e_filename_make_safe (evo14_mbox_root);
-	rlen = strlen (evo14_mbox_root);
-	evo14_mbox_root = g_realloc (evo14_mbox_root, rlen + 2);
-	evo14_mbox_root[rlen++] = '_';
-	evo14_mbox_root[rlen] = '\0';
-
-	while ((dent = readdir (dir))) {
-		gchar *full_name, *inptr, *buf = NULL;
-		const gchar *filename, *ext;
-		gsize prelen = 0;
-		GString *new;
-
-		if (dent->d_name[0] == '.')
-			continue;
-
-		if (!(ext = strrchr (dent->d_name, '.')))
-			continue;
-
-		if (!strcmp (ext, ".galview") || !strcmp ((gchar *)dent->d_name, "galview.xml")) {
-			/* just copy the file */
-			filename = dent->d_name;
-			goto copy;
-		} else if (strcmp (ext, ".xml") != 0) {
-			continue;
-		}
-
-		if (!strncmp ((const gchar *)dent->d_name, "current_view-", 13)) {
-			prelen = 13;
-		} else if (!strncmp ((const gchar *)dent->d_name, "custom_view-", 12)) {
-			prelen = 12;
-		} else {
-			/* huh? wtf is this file? */
-			continue;
-		}
-
-		if (!strncmp (dent->d_name + prelen, "file:", 5)) {
-			/* need to munge the filename */
-			inptr = dent->d_name + prelen + 5;
-
-			if (!strncmp (inptr, evo14_mbox_root, rlen)) {
-				/* this should always be the case afaik... */
-				inptr += rlen;
-				new = g_string_new ("mbox:");
-				g_string_append_printf (new, "%s/local#", data_dir);
-
-				full_name = g_strdup (inptr);
-				inptr = full_name + strlen (full_name) - 12;
-				while (inptr > full_name) {
-					if (!strncmp (inptr, "_subfolders_", 12))
-						memmove (inptr, inptr + 11, strlen (inptr + 11) + 1);
-
-					inptr--;
-				}
-
-				g_string_append (new, full_name);
-				g_free (full_name);
-
-				filename = buf = new->str;
-				g_string_free (new, FALSE);
-				e_filename_make_safe (buf);
-			} else {
-				/* but just in case... */
-				filename = dent->d_name + prelen;
-			}
-		} else {
-			/* no munging needed */
-			filename = dent->d_name + prelen;
-		}
-
-	copy:
-		g_string_append (srcpath, dent->d_name);
-		if (prelen > 0)
-			g_string_append_len (destpath, dent->d_name, prelen);
-		g_string_append (destpath, filename);
-		g_free (buf);
-
-		cp (srcpath->str, destpath->str, FALSE, CP_UNIQUE);
-
-		g_string_truncate (srcpath, slen);
-		g_string_truncate (destpath, dlen);
-	}
-
-	closedir (dir);
-
-	g_free (evo14_mbox_root);
-	g_string_free (destpath, TRUE);
-	g_string_free (srcpath, TRUE);
-
-	return TRUE;
-}
-
 #define SUBFOLDER_DIR_NAME     "subfolders"
 #define SUBFOLDER_DIR_NAME_LEN 10
 
-static gchar *
-e_path_to_physical (const gchar *prefix, const gchar *vpath)
-{
-	const gchar *p, *newp;
-	gchar *dp;
-	gchar *ppath;
-	gint ppath_len;
-	gint prefix_len;
-
-	while (*vpath == '/')
-		vpath++;
-	if (!prefix)
-		prefix = "";
-
-	/* Calculate the length of the real path. */
-	ppath_len = strlen (vpath);
-	ppath_len++;	/* For the ending zero.  */
-
-	prefix_len = strlen (prefix);
-	ppath_len += prefix_len;
-	ppath_len++;	/* For the separating slash.  */
-
-	/* Take account of the fact that we need to translate every
-	 * separator into 'subfolders/'.
-	 */
-	p = vpath;
-	while (1) {
-		newp = strchr (p, '/');
-		if (newp == NULL)
-			break;
-
-		ppath_len += SUBFOLDER_DIR_NAME_LEN;
-		ppath_len++; /* For the separating slash.  */
-
-		/* Skip consecutive slashes.  */
-		while (*newp == '/')
-			newp++;
-
-		p = newp;
-	};
-
-	ppath = g_malloc (ppath_len);
-	dp = ppath;
-
-	memcpy (dp, prefix, prefix_len);
-	dp += prefix_len;
-	*(dp++) = '/';
-
-	/* Copy the mangled path.  */
-	p = vpath;
-	while (1) {
-		newp = strchr (p, '/');
-		if (newp == NULL) {
-			strcpy (dp, p);
-			break;
-		}
-
-		memcpy (dp, p, newp - p + 1); /* '+ 1' to copy the slash too.  */
-		dp += newp - p + 1;
-
-		memcpy (dp, SUBFOLDER_DIR_NAME, SUBFOLDER_DIR_NAME_LEN);
-		dp += SUBFOLDER_DIR_NAME_LEN;
-
-		*(dp++) = '/';
-
-		/* Skip consecutive slashes.  */
-		while (*newp == '/')
-			newp++;
-
-		p = newp;
-	}
-
-	return ppath;
-}
-
-static gboolean
-em_migrate_imap_cmeta_1_4(const gchar *data_dir, GError **error)
-{
-	GConfClient *gconf;
-	GSList *paths, *p;
-	EAccountList *accounts;
-	const EAccount *account;
-
-	if (!(accounts = e_get_account_list ()))
-		return TRUE;
-
-	gconf = gconf_client_get_default();
-	paths = gconf_client_get_list(gconf, "/apps/evolution/shell/offline/folder_paths", GCONF_VALUE_STRING, NULL);
-	for (p = paths;p;p = g_slist_next(p)) {
-		gchar *name, *path;
-
-		name = p->data;
-		if (*name)
-			name++;
-		path = strchr(name, '/');
-		if (path) {
-			*path++ = 0;
-			account = e_account_list_find(accounts, E_ACCOUNT_FIND_NAME, name);
-			if (account && !strncmp(account->source->url, "imap:", 5)) {
-				CamelURL *url = camel_url_new(account->source->url, NULL);
-
-				if (url) {
-					gchar *dir, *base;
-
-					base = g_strdup_printf("%s/imap/%s@%s/folders",
-							       data_dir,
-							       url->user?url->user:"",
-							       url->host?url->host:"");
-
-					dir = e_path_to_physical(base, path);
-					if (g_mkdir_with_parents(dir, 0700) == 0) {
-						gchar *cmeta;
-						FILE *fp;
-
-						cmeta = g_build_filename(dir, "cmeta", NULL);
-						fp = fopen(cmeta, "w");
-						if (fp) {
-							/* header/version */
-							fwrite("CLMD", 4, 1, fp);
-							camel_file_util_encode_uint32(fp, 1);
-							/* meta count, do we have any metadata? */
-							camel_file_util_encode_uint32(fp, 0);
-							/* prop count */
-							camel_file_util_encode_uint32(fp, 1);
-							/* sync offline property */
-							camel_file_util_encode_uint32(fp, CAMEL_DISCO_FOLDER_OFFLINE_SYNC);
-							camel_file_util_encode_uint32(fp, 1);
-							fclose(fp);
-						} else {
-							g_warning("couldn't create imap folder cmeta file '%s'", cmeta);
-						}
-						g_free(cmeta);
-					} else {
-						g_warning("couldn't create imap folder directory '%s'", dir);
-					}
-					g_free(dir);
-					g_free(base);
-					camel_url_free(url);
-				}
-			} else
-				g_warning("can't find offline folder '%s' '%s'", name, path);
-		}
-		g_free(p->data);
-	}
-	g_slist_free(paths);
-	g_object_unref(gconf);
-
-	/* we couldn't care less if this doesn't work */
-
-	return TRUE;
-}
-
-static void
-remove_system_searches(xmlDocPtr searches)
-{
-	xmlNodePtr node;
-
-	/* in pre 2.0, system searches were stored in the user
-	 * searches.xml file with the source set to 'demand'.  In 2.0+
-	 * the system searches are stored in the system
-	 * searchtypes.xml file instead */
-
-	node = xmlDocGetRootElement(searches);
-	if (!node->name || strcmp((gchar *)node->name, "filteroptions"))
-		return;
-
-	if (!(node = xml_find_node(node, "ruleset")))
-		return;
-
-	node = node->children;
-	while (node != NULL) {
-		xmlNodePtr nnode = node->next;
-
-		if (node->name && !strcmp ((gchar *)node->name, "rule")) {
-			gchar *src;
-
-			src = (gchar *)xmlGetProp(node, (guchar *)"source");
-			if (src && !strcmp((gchar *)src, "demand")) {
-				xmlUnlinkNode(node);
-				xmlFreeNodeList(node);
-			}
-			xmlFree (src);
-		}
-
-		node = nnode;
-	}
-}
-
-static gboolean
-em_migrate_1_4 (const gchar *data_dir, xmlDocPtr filters, xmlDocPtr vfolders, GError **error)
-{
-	EMMigrateSession *session;
-	CamelException lex;
-	struct stat st;
-	gchar *path;
-	xmlDocPtr searches;
-
-	camel_init (data_dir, TRUE);
-	camel_provider_init();
-	session = (EMMigrateSession *) em_migrate_session_new (data_dir);
-
-	session->srcdir = g_build_filename (g_get_home_dir (), "evolution", "local", NULL);
-
-	path = g_strdup_printf ("mbox:%s/.evolution/mail/local", g_get_home_dir ());
-	if (stat (path + 5, &st) == -1) {
-		if (errno != ENOENT || g_mkdir_with_parents (path + 5, 0700) == -1) {
-			g_set_error (
-				error, E_SHELL_MIGRATE_ERROR,
-				E_SHELL_MIGRATE_ERROR_FAILED,
-				_("Failed to create local mail storage "
-				  "'%s': %s"), path + 5, g_strerror (errno));
-			g_free (session->srcdir);
-			camel_object_unref (session);
-			g_free (path);
-			return FALSE;
-		}
-	}
-
-	camel_exception_init (&lex);
-	if (!(session->store = camel_session_get_store ((CamelSession *) session, path, &lex))) {
-		g_set_error (
-			error, E_SHELL_MIGRATE_ERROR,
-			E_SHELL_MIGRATE_ERROR_FAILED,
-			_("Failed to create local mail storage '%s': %s"),
-			path, lex.desc);
-		g_free (session->srcdir);
-		camel_object_unref (session);
-		camel_exception_clear (&lex);
-		g_free (path);
-		return FALSE;
-	}
-	g_free (path);
-
-	if (!em_migrate_local_folders_1_4 (session, error))
-		return FALSE;
-
-	camel_object_unref (session->store);
-	g_free (session->srcdir);
-
-	camel_object_unref (session);
-
-	em_upgrade_accounts_1_4();
-
-	upgrade_xml_uris(filters, upgrade_xml_uris_1_4);
-	upgrade_vfolder_sources_1_4(vfolders);
-	upgrade_xml_uris(vfolders, upgrade_xml_uris_1_4);
-
-	path = g_build_filename(g_get_home_dir(), "evolution", NULL);
-	searches = emm_load_xml(path, "searches.xml");
-	g_free(path);
-	if (searches) {
-		remove_system_searches(searches);
-		emm_save_xml(searches, data_dir, "searches.xml");
-		xmlFreeDoc(searches);
-	}
-
-	if (!em_migrate_pop_uid_caches_1_4 (data_dir, error))
-		return FALSE;
-
-	/* these are non-fatal */
-	em_migrate_imap_caches_1_4 (data_dir, error);
-	g_clear_error (error);
-	em_migrate_folder_expand_state_1_4 (data_dir, error);
-	g_clear_error (error);
-	em_migrate_folder_view_settings_1_4 (data_dir, error);
-	g_clear_error (error);
-	em_migrate_imap_cmeta_1_4 (data_dir, error);
-	g_clear_error (error);
-
-	return TRUE;
-}
-
 static void
 em_update_accounts_2_11 (void)
 {
@@ -3018,7 +729,6 @@ e_mail_migrate (EShellBackend *shell_backend,
 {
 	struct stat st;
 	const gchar *data_dir;
-	gchar *path;
 
 	/* make sure ~/.evolution/mail exists */
 	data_dir = e_shell_backend_get_data_dir (shell_backend);
@@ -3036,67 +746,6 @@ e_mail_migrate (EShellBackend *shell_backend,
 	if (major == 0)
 		return emm_setup_initial (data_dir);
 
-	if (major == 1 && minor < 5) {
-#ifndef G_OS_WIN32
-		xmlDocPtr config_xmldb = NULL, filters, vfolders;
-
-		path = g_build_filename (g_get_home_dir (), "evolution", NULL);
-		if (minor <= 2 && !(config_xmldb = emm_load_xml (path, "config.xmldb"))) {
-			g_set_error (
-				error, E_SHELL_MIGRATE_ERROR,
-				E_SHELL_MIGRATE_ERROR_FAILED,
-				_("Unable to read settings from previous "
-				  "Evolution install, 'evolution/config.xmldb' "
-				  "does not exist or is corrupt."));
-			return FALSE;
-		}
-		filters = emm_load_xml (path, "filters.xml");
-		vfolders = emm_load_xml (path, "vfolders.xml");
-
-		if (minor == 0) {
-			if (!em_migrate_1_0 (data_dir, config_xmldb, filters, vfolders, error)) {
-				xmlFreeDoc (config_xmldb);
-				xmlFreeDoc (filters);
-				xmlFreeDoc (vfolders);
-				return FALSE;
-			}
-		}
-
-		if (minor <= 2) {
-			if (!em_migrate_1_2 (data_dir, config_xmldb, filters, vfolders, error)) {
-				xmlFreeDoc (config_xmldb);
-				xmlFreeDoc (filters);
-				xmlFreeDoc (vfolders);
-				return FALSE;
-			}
-
-			xmlFreeDoc (config_xmldb);
-		}
-
-		if (minor <= 4) {
-			if (!em_migrate_1_4 (data_dir, filters, vfolders, error)) {
-				xmlFreeDoc (filters);
-				xmlFreeDoc (vfolders);
-				return FALSE;
-			}
-		}
-
-		if (filters) {
-			emm_save_xml (filters, path, "filters.xml");
-			xmlFreeDoc (filters);
-		}
-
-		if (vfolders) {
-			emm_save_xml (vfolders, path, "vfolders.xml");
-			xmlFreeDoc (vfolders);
-		}
-
-		g_free (path);
-#else
-		g_error ("Upgrading from ancient versions not supported on Windows");
-#endif
-	}
-
 	if (major < 2 || (major == 2 && minor < 12)) {
 #ifndef G_OS_WIN32
 		em_update_accounts_2_11 ();
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 12d87d97c8..3282af34af 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -26,9 +26,7 @@
 #include <glib/gi18n.h>
 #include <libxml/tree.h>
 #include <gtkhtml/gtkhtml.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vee-store.h>
+#include <camel/camel.h>
 
 #include "e-util/e-alert-dialog.h"
 #include "filter/e-filter-rule.h"
@@ -68,6 +66,7 @@ e_mail_reader_confirm_delete (EMailReader *reader)
 	EShellBackend *shell_backend;
 	EShellSettings *shell_settings;
 	CamelFolder *folder;
+	CamelStore *parent_store;
 	GtkWidget *check_button;
 	GtkWidget *content_area;
 	GtkWidget *dialog;
@@ -90,7 +89,9 @@ e_mail_reader_confirm_delete (EMailReader *reader)
 	prompt_delete_in_vfolder = e_shell_settings_get_boolean (
 		shell_settings, "mail-prompt-delete-in-vfolder");
 
-	if (!CAMEL_IS_VEE_STORE (folder->parent_store))
+	parent_store = camel_folder_get_parent_store (folder);
+
+	if (!CAMEL_IS_VEE_STORE (parent_store))
 		return TRUE;
 
 	if (!prompt_delete_in_vfolder)
@@ -98,7 +99,7 @@ e_mail_reader_confirm_delete (EMailReader *reader)
 
 	dialog = e_alert_dialog_new_for_args (
 		window, "mail:ask-delete-vfolder-msg",
-		folder->full_name, NULL);
+		camel_folder_get_full_name (folder), NULL);
 
 	/* XXX e-error should provide a widget layout and API suitable
 	 *     for packing additional widgets to the right of the alert
@@ -251,6 +252,7 @@ e_mail_reader_open_selected (EMailReader *reader)
 		}
 
 		g_free (real_folder_uri);
+		camel_folder_free_message_info (folder, info);
 	}
 
 	for (ii = 0; ii < views->len; ii++) {
@@ -669,7 +671,7 @@ e_mail_reader_header_free (EMailReaderHeader *header)
 }
 
 static void
-headers_changed_cb (GConfClient *gconf,
+headers_changed_cb (GConfClient *client,
                     guint cnxn_id,
                     GConfEntry *entry,
                     EMailReader *reader)
@@ -678,7 +680,7 @@ headers_changed_cb (GConfClient *gconf,
 	EMFormatHTMLDisplay *emfhd;
 	GSList *header_config_list, *p;
 
-	g_return_if_fail (gconf != NULL);
+	g_return_if_fail (client != NULL);
 	g_return_if_fail (reader != NULL);
 
 	emfhd = e_mail_reader_get_html_display (reader);
@@ -689,7 +691,7 @@ headers_changed_cb (GConfClient *gconf,
 	g_return_if_fail (emf != NULL);
 
 	header_config_list = gconf_client_get_list (
-		gconf, "/apps/evolution/mail/display/headers",
+		client, "/apps/evolution/mail/display/headers",
 		GCONF_VALUE_STRING, NULL);
 	em_format_clear_headers (emf);
 	for (p = header_config_list; p; p = g_slist_next(p)) {
@@ -718,16 +720,16 @@ headers_changed_cb (GConfClient *gconf,
 static void
 remove_header_notify_cb (gpointer data)
 {
-	GConfClient *gconf = mail_config_get_gconf_client ();
+	GConfClient *client = mail_config_get_gconf_client ();
 	guint notify_id;
 
-	g_return_if_fail (gconf != NULL);
+	g_return_if_fail (client != NULL);
 
 	notify_id = GPOINTER_TO_INT (data);
 	g_return_if_fail (notify_id != 0);
 
-	gconf_client_notify_remove (gconf, notify_id);
-	gconf_client_remove_dir (gconf, "/apps/evolution/mail/display", NULL);
+	gconf_client_notify_remove (client, notify_id);
+	gconf_client_remove_dir (client, "/apps/evolution/mail/display", NULL);
 }
 
 /**
@@ -740,19 +742,20 @@ remove_header_notify_cb (gpointer data)
 void
 e_mail_reader_connect_headers (EMailReader *reader)
 {
-	GConfClient *gconf = mail_config_get_gconf_client ();
+	GConfClient *client = mail_config_get_gconf_client ();
 	guint notify_id;
 
 	gconf_client_add_dir (
-		gconf, "/apps/evolution/mail/display",
+		client, "/apps/evolution/mail/display",
 		GCONF_CLIENT_PRELOAD_NONE, NULL);
 	notify_id = gconf_client_notify_add (
-		gconf, "/apps/evolution/mail/display/headers",
+		client, "/apps/evolution/mail/display/headers",
 		(GConfClientNotifyFunc) headers_changed_cb,
 		reader, NULL, NULL);
+
 	g_object_set_data_full (
 		G_OBJECT (reader), "reader-header-notify-id",
 		GINT_TO_POINTER (notify_id), remove_header_notify_cb);
 
-	headers_changed_cb (gconf, 0, NULL, reader);
+	headers_changed_cb (client, 0, NULL, reader);
 }
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 20448cc57f..4b02d69623 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -145,6 +145,8 @@ action_mail_add_sender_cb (GtkAction *action,
 	e_shell_event (shell, "contact-quick-add-email", (gpointer) address);
 	emu_remove_from_mail_cache_1 (address);
 exit:
+	if (info)
+		camel_folder_free_message_info (folder, info);
 	em_utils_uids_free (uids);
 }
 
@@ -179,7 +181,7 @@ action_add_to_address_book_cb (GtkAction *action,
 
 	cia = camel_internet_address_new ();
 	if (camel_address_decode (CAMEL_ADDRESS (cia), curl->path) < 0) {
-		camel_object_unref (cia);
+		g_object_unref (cia);
 		goto exit;
 	}
 
@@ -191,7 +193,7 @@ action_add_to_address_book_cb (GtkAction *action,
 	e_shell_event (shell, "contact-quick-add-email", email);
 	emu_remove_from_mail_cache_1 (curl->path);
 
-	camel_object_unref (cia);
+	g_object_unref (cia);
 	g_free (email);
 
 exit:
@@ -864,7 +866,7 @@ action_mail_save_as_cb (GtkAction *action,
 
 		if (subject)
 			suggestion = g_strconcat (subject, ".mbox", NULL);
-		camel_message_info_free (info);
+		camel_folder_free_message_info (folder, info);
 	}
 
 	if (!suggestion) {
@@ -1086,7 +1088,7 @@ action_search_folder_recipient_cb (GtkAction *action,
 		inet_addr = camel_internet_address_new ();
 		camel_address_decode (CAMEL_ADDRESS (inet_addr), curl->path);
 		vfolder_gui_add_from_address (inet_addr, AUTO_TO, folder_uri);
-		camel_object_unref (inet_addr);
+		g_object_unref (inet_addr);
 	}
 
 	camel_url_free (curl);
@@ -1124,7 +1126,7 @@ action_search_folder_sender_cb (GtkAction *action,
 		inet_addr = camel_internet_address_new ();
 		camel_address_decode (CAMEL_ADDRESS (inet_addr), curl->path);
 		vfolder_gui_add_from_address (inet_addr, AUTO_FROM, folder_uri);
-		camel_object_unref (inet_addr);
+		g_object_unref (inet_addr);
 	}
 
 	camel_url_free (curl);
@@ -1905,12 +1907,15 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader)
 	GtkWidget *message_list;
 	EWebView *web_view;
 	CamelFolder *folder;
+	CamelStore *parent_store;
 	const gchar *cursor_uid;
 	const gchar *format_uid;
 
 	priv = E_MAIL_READER_GET_PRIVATE (reader);
 
 	folder = e_mail_reader_get_folder (reader);
+	parent_store = camel_folder_get_parent_store (folder);
+
 	html_display = e_mail_reader_get_html_display (reader);
 	message_list = e_mail_reader_get_message_list (reader);
 
@@ -1928,11 +1933,7 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader)
 
 		widget = GTK_WIDGET (EM_FORMAT_HTML (html_display)->html);
 
-#if GTK_CHECK_VERSION(2,19,7)
 		html_display_visible = gtk_widget_get_mapped (widget);
-#else
-		html_display_visible = GTK_WIDGET_MAPPED (widget);
-#endif
 		selected_uid_changed = g_strcmp0 (cursor_uid, format_uid);
 
 		if (html_display_visible && selected_uid_changed) {
@@ -1946,7 +1947,7 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader)
 			e_web_view_load_string (web_view, string);
 			g_free (string);
 
-			store_async = folder->parent_store->flags & CAMEL_STORE_ASYNC;
+			store_async = parent_store->flags & CAMEL_STORE_ASYNC;
 
 			if (store_async)
 				disp_func = mail_msg_unordered_push;
@@ -1980,11 +1981,13 @@ mail_reader_message_selected_cb (EMailReader *reader,
 	MessageList *message_list;
 	gboolean store_async;
 	CamelFolder *folder;
+	CamelStore *parent_store;
 
 	priv = E_MAIL_READER_GET_PRIVATE (reader);
 
 	folder = e_mail_reader_get_folder (reader);
-	store_async = folder->parent_store->flags & CAMEL_STORE_ASYNC;
+	parent_store = camel_folder_get_parent_store (folder);
+	store_async = parent_store->flags & CAMEL_STORE_ASYNC;
 
 	/* Cancel previous message retrieval if the store is not async. */
 	if (!store_async && priv->retrieving_message_operation_id > 0)
@@ -2304,7 +2307,7 @@ mail_reader_update_actions (EMailReader *reader)
 		selection_has_not_junk_messages &&
 		!(state & E_MAIL_READER_FOLDER_IS_JUNK);
 	action = e_mail_reader_get_action (reader, action_name);
-	gtk_action_set_sensitive (action, sensitive);
+	gtk_action_set_sensitive (action, sensitive && !(state & E_MAIL_READER_FOLDER_IS_JUNK));
 
 	action_name = "mail-mark-not-junk";
 	sensitive = selection_has_junk_messages;
@@ -2747,7 +2750,7 @@ e_mail_reader_check_state (EMailReader *reader)
 	uids = e_mail_reader_get_selected_uids (reader);
 
 	if (folder != NULL) {
-		store = CAMEL_STORE (folder->parent_store);
+		store = camel_folder_get_parent_store (folder);
 		store_supports_vjunk = (store->flags & CAMEL_STORE_VJUNK);
 		is_junk_folder = (folder->folder_flags & CAMEL_FOLDER_IS_JUNK) != 0;
 	}
@@ -2831,6 +2834,8 @@ e_mail_reader_check_state (EMailReader *reader)
 
 		string = camel_message_info_mlist (info);
 		is_mailing_list &= (string != NULL && *string != '\0');
+
+		camel_folder_free_message_info (folder, info);
 	}
 
 	if (em_utils_check_user_can_send_mail ())
diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h
index b724d6e19b..0b8f30d825 100644
--- a/mail/e-mail-reader.h
+++ b/mail/e-mail-reader.h
@@ -28,7 +28,7 @@
  *     a GtkWidget pointer which almost always has to be type casted. */
 
 #include <gtk/gtk.h>
-#include <camel/camel-folder.h>
+#include <camel/camel.h>
 #include <mail/em-format-html-display.h>
 #include <shell/e-shell-backend.h>
 
diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index f088b9f805..3418404e06 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -22,9 +22,7 @@
 #include "e-mail-store.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
 
@@ -76,7 +74,7 @@ store_info_new (CamelStore *store,
 	store_info = g_slice_new0 (StoreInfo);
 	store_info->ref_count = 1;
 
-	camel_object_ref (store);
+	g_object_ref (store);
 	store_info->store = store;
 
 	if (display_name == NULL)
@@ -115,14 +113,14 @@ store_info_unref (StoreInfo *store_info)
 	if (g_atomic_int_exchange_and_add (&store_info->ref_count, -1) > 1)
 		return;
 
-	camel_object_unref (store_info->store);
+	g_object_unref (store_info->store);
 	g_free (store_info->display_name);
 
 	if (store_info->vtrash != NULL)
-		camel_object_unref (store_info->vtrash);
+		g_object_unref (store_info->vtrash);
 
 	if (store_info->vjunk != NULL)
-		camel_object_unref (store_info->vjunk);
+		g_object_unref (store_info->vjunk);
 
 	g_slice_free (StoreInfo, store_info);
 }
@@ -329,7 +327,7 @@ e_mail_store_add_by_uri (const gchar *uri,
 
 	e_mail_store_add (CAMEL_STORE (service), display_name);
 
-	camel_object_unref (service);
+	g_object_unref (service);
 
 	return CAMEL_STORE (service);
 
@@ -348,7 +346,7 @@ static void
 mail_store_remove_cb (CamelStore *store)
 {
 	camel_service_disconnect (CAMEL_SERVICE (store), TRUE, NULL);
-	camel_object_unref (store);
+	g_object_unref (store);
 }
 
 void
@@ -368,7 +366,7 @@ e_mail_store_remove (CamelStore *store)
 	if (g_hash_table_lookup (store_table, store) == NULL)
 		return;
 
-	camel_object_ref (store);
+	g_object_ref (store);
 
 	g_hash_table_remove (store_table, store);
 	mail_folder_cache_note_store_remove (mail_folder_cache_get_default (), store);
@@ -404,7 +402,7 @@ e_mail_store_remove_by_uri (const gchar *uri)
 
 	e_mail_store_remove (CAMEL_STORE (service));
 
-	camel_object_unref (service);
+	g_object_unref (service);
 }
 
 void
diff --git a/mail/e-mail-store.h b/mail/e-mail-store.h
index bfd1ab47c8..7d42fc3647 100644
--- a/mail/e-mail-store.h
+++ b/mail/e-mail-store.h
@@ -23,7 +23,7 @@
 #define E_MAIL_STORE_H
 
 #include <glib.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 
 G_BEGIN_DECLS
 
diff --git a/mail/e-mail-tag-editor.h b/mail/e-mail-tag-editor.h
index b28674cff6..fe2365c903 100644
--- a/mail/e-mail-tag-editor.h
+++ b/mail/e-mail-tag-editor.h
@@ -25,8 +25,7 @@
 #define E_MAIL_TAG_EDITOR_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-summary.h>
+#include <camel/camel.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_TAG_EDITOR \
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 2ceb77dbec..49f4356a5b 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2484,7 +2484,7 @@ emae_receive_options_item (EConfig *ec, EConfigItem *item, GtkWidget *parent, Gt
 {
 	EMAccountEditor *emae = data;
 	GtkWidget *w, *box, *spin;
-	gint row;
+	guint row;
 
 	if (emae->priv->source.provider == NULL
 	    || emae->priv->source.provider->extra_conf == NULL)
@@ -2510,7 +2510,7 @@ emae_receive_options_item (EConfig *ec, EConfigItem *item, GtkWidget *parent, Gt
 	}
 
 	/* We have to add the automatic mail check item with the rest of the receive options */
-	row = ((GtkTable *)parent)->nrows;
+	g_object_get (parent, "n-rows", &row, NULL);
 
 	box = gtk_hbox_new (FALSE, 4);
 	w = gtk_check_button_new_with_mnemonic (_("Check for _new messages every"));
@@ -2542,7 +2542,8 @@ emae_receive_options_extra_item (EConfig *ec, EConfigItem *eitem, GtkWidget *par
 	GtkWidget *depw;
 	GSList *depl = NULL, *n;
 	EMAccountEditorService *service = &emae->priv->source;
-	gint row, i;
+	gint i;
+	guint row;
 	GHashTable *extra;
 	CamelURL *url;
 
@@ -2570,7 +2571,7 @@ section:
 	url = emae_account_url (emae, emae_service_info[service->type].account_uri_key);
 	item->extra_table = g_hash_table_new (g_str_hash, g_str_equal);
 	extra = g_hash_table_new (g_str_hash, g_str_equal);
-	row = ((GtkTable *)parent)->nrows;
+	g_object_get (parent, "n-rows", &row, NULL);
 
 	for (;entries[i].type != CAMEL_PROVIDER_CONF_END && entries[i].type != CAMEL_PROVIDER_CONF_SECTION_END;i++) {
 		if (entries[i].depname) {
@@ -2776,6 +2777,65 @@ emae_defaults_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	return w;
 }
 
+static void
+emae_account_hash_algo_combo_changed_cb (GtkComboBox *combobox, EMAccountEditor *emae)
+{
+	EAccount *account;
+	gpointer data;
+	const gchar *text = NULL;
+
+	account = em_account_editor_get_modified_account (emae);
+	data = g_object_get_data (G_OBJECT (combobox), "account-item");
+
+	switch (gtk_combo_box_get_active (combobox)) {
+	case 1: text = "sha1";
+		break;
+	case 2: text = "sha256";
+		break;
+	case 3:
+		text = "sha384";
+		break;
+	case 4:
+		text = "sha512";
+		break;
+	}
+
+	e_account_set_string (account, GPOINTER_TO_INT (data), text);
+}
+
+static GtkComboBox *
+emae_account_hash_algo_combo (EMAccountEditor *emae, const gchar *name, gint item, GtkBuilder *builder)
+{
+	EAccount *account;
+	GtkComboBox *combobox;
+	const gchar *text;
+	gint index = 0;
+
+	account = em_account_editor_get_modified_account (emae);
+	combobox = GTK_COMBO_BOX (e_builder_get_widget (builder, name));
+	g_return_val_if_fail (combobox != NULL, NULL);
+
+	text = e_account_get_string (account, item);
+	if (text) {
+		if (g_ascii_strcasecmp (text, "sha1") == 0)
+			index = 1;
+		else if (g_ascii_strcasecmp (text, "sha256") == 0)
+			index = 2;
+		else if (g_ascii_strcasecmp (text, "sha384") == 0)
+			index = 3;
+		else if (g_ascii_strcasecmp (text, "sha512") == 0)
+			index = 4;
+	}
+
+	gtk_combo_box_set_active (combobox, index);
+
+	g_object_set_data (G_OBJECT (combobox), "account-item", GINT_TO_POINTER (item));
+	g_signal_connect (combobox, "changed", G_CALLBACK (emae_account_hash_algo_combo_changed_cb), emae);
+	gtk_widget_set_sensitive (GTK_WIDGET (combobox), e_account_writable (account, item));
+
+	return combobox;
+}
+
 static GtkWidget *
 emae_security_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
@@ -2794,6 +2854,7 @@ emae_security_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 
 	/* Security */
 	emae_account_entry (emae, "pgp_key", E_ACCOUNT_PGP_KEY, builder);
+	emae_account_hash_algo_combo (emae, "pgp_hash_algo", E_ACCOUNT_PGP_HASH_ALGORITHM, builder);
 	emae_account_toggle (emae, "pgp_encrypt_to_self", E_ACCOUNT_PGP_ENCRYPT_TO_SELF, builder);
 	emae_account_toggle (emae, "pgp_always_sign", E_ACCOUNT_PGP_ALWAYS_SIGN, builder);
 	emae_account_toggle (emae, "pgp_no_imip_sign", E_ACCOUNT_PGP_NO_IMIP_SIGN, builder);
@@ -2807,6 +2868,7 @@ emae_security_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	g_signal_connect (priv->smime_sign_key_select, "clicked", G_CALLBACK(smime_sign_key_select), emae);
 	g_signal_connect (priv->smime_sign_key_clear, "clicked", G_CALLBACK(smime_sign_key_clear), emae);
 
+	emae_account_hash_algo_combo (emae, "smime_hash_algo", E_ACCOUNT_SMIME_HASH_ALGORITHM, builder);
 	priv->smime_sign_default = emae_account_toggle (emae, "smime_sign_default", E_ACCOUNT_SMIME_SIGN_DEFAULT, builder);
 
 	priv->smime_encrypt_key = emae_account_entry (emae, "smime_encrypt_key", E_ACCOUNT_SMIME_ENCRYPT_KEY, builder);
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 25e1761eb4..514885c28b 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -59,18 +59,10 @@
 #include "em-format-quote.h"
 #include "em-event.h"
 
-#include <camel/camel-folder.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-nntp-address.h>
-#include <camel/camel-vee-folder.h>
-
 #ifdef G_OS_WIN32
-/* Undef the similar macro from pthread.h, it doesn't check if
- * gmtime() returns NULL.
- */
+#ifdef gmtime_r
 #undef gmtime_r
+#endif
 
 /* The gmtime() in Microsoft's C library is MT-safe */
 #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0)
@@ -113,10 +105,10 @@ emcs_set_drafts_info (struct emcs_t *emcs,
 	g_return_if_fail (drafts_uid != NULL);
 
 	if (emcs->drafts_folder != NULL)
-		camel_object_unref (emcs->drafts_folder);
+		g_object_unref (emcs->drafts_folder);
 	g_free (emcs->drafts_uid);
 
-	camel_object_ref (drafts_folder);
+	g_object_ref (drafts_folder);
 	emcs->drafts_folder = drafts_folder;
 	emcs->drafts_uid = g_strdup (drafts_uid);
 }
@@ -133,10 +125,10 @@ emcs_set_folder_info (struct emcs_t *emcs,
 	g_return_if_fail (uid != NULL);
 
 	if (emcs->folder != NULL)
-		camel_object_unref (emcs->folder);
+		g_object_unref (emcs->folder);
 	g_free (emcs->uid);
 
-	camel_object_ref (folder);
+	g_object_ref (folder);
 	emcs->folder = folder;
 	emcs->uid = g_strdup (uid);
 	emcs->flags = flags;
@@ -147,11 +139,11 @@ static void
 free_emcs (struct emcs_t *emcs)
 {
 	if (emcs->drafts_folder != NULL)
-		camel_object_unref (emcs->drafts_folder);
+		g_object_unref (emcs->drafts_folder);
 	g_free (emcs->drafts_uid);
 
 	if (emcs->folder != NULL)
-		camel_object_unref (emcs->folder);
+		g_object_unref (emcs->folder);
 	g_free (emcs->uid);
 
 	g_free (emcs);
@@ -241,7 +233,7 @@ composer_send_queued_cb (CamelFolder *folder, CamelMimeMessage *msg, CamelMessag
 			camel_folder_set_message_flags (emcs->drafts_folder, emcs->drafts_uid,
 							CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN,
 							CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
-			camel_object_unref (emcs->drafts_folder);
+			g_object_unref (emcs->drafts_folder);
 			emcs->drafts_folder = NULL;
 			g_free (emcs->drafts_uid);
 			emcs->drafts_uid = NULL;
@@ -251,7 +243,7 @@ composer_send_queued_cb (CamelFolder *folder, CamelMimeMessage *msg, CamelMessag
 			/* set any replied flags etc */
 			camel_folder_set_message_flags (emcs->folder, emcs->uid, emcs->flags, emcs->set);
 			camel_folder_set_message_user_flag (emcs->folder, emcs->uid, "receipt-handled", TRUE);
-			camel_object_unref (emcs->folder);
+			g_object_unref (emcs->folder);
 			emcs->folder = NULL;
 			g_free (emcs->uid);
 			emcs->uid = NULL;
@@ -259,7 +251,7 @@ composer_send_queued_cb (CamelFolder *folder, CamelMimeMessage *msg, CamelMessag
 
 		gtk_widget_destroy (GTK_WIDGET (send->composer));
 
-		if (send->send && camel_session_is_online (session)) {
+		if (send->send && camel_session_get_online (session)) {
 			/* queue a message send */
 			mail_send ();
 		}
@@ -394,7 +386,7 @@ composer_get_message (EMsgComposer *composer, gboolean save_html_object_data)
 		e_destination_freev (recipients_bcc);
 	}
 
-	camel_object_unref (cia);
+	g_object_unref (cia);
 
 	post_to_header = e_composer_header_table_get_header (table, E_COMPOSER_HEADER_POST_TO);
 	if (e_composer_header_get_visible (post_to_header)) {
@@ -529,7 +521,7 @@ em_utils_composer_send_cb (EMsgComposer *composer)
 		return;
 
 	folder = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
-	camel_object_ref (folder);
+	g_object_ref (folder);
 
 	/* mail the message */
 	e_msg_composer_set_mail_sent (composer, TRUE);
@@ -549,8 +541,8 @@ em_utils_composer_send_cb (EMsgComposer *composer)
 	mail_append_mail (
 		folder, message, info, composer_send_queued_cb, send);
 
-	camel_object_unref (folder);
-	camel_object_unref (message);
+	g_object_unref (folder);
+	g_object_unref (message);
 }
 
 struct _save_draft_info {
@@ -585,8 +577,6 @@ save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *i
 	if (!ok)
 		goto done;
 
-	composer_set_no_change (sdi->composer, FALSE, FALSE);
-
 	if ((emcs = sdi->emcs) == NULL)
 		emcs = emcs_new ();
 
@@ -595,7 +585,7 @@ save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *i
 		camel_folder_set_message_flags (emcs->drafts_folder, emcs->drafts_uid,
 						CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN,
 						CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
-		camel_object_unref (emcs->drafts_folder);
+		g_object_unref (emcs->drafts_folder);
 		emcs->drafts_folder = NULL;
 		g_free (emcs->drafts_uid);
 		emcs->drafts_uid = NULL;
@@ -604,14 +594,14 @@ save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *i
 	if (emcs->folder) {
 		/* set the replied flags etc */
 		camel_folder_set_message_flags (emcs->folder, emcs->uid, emcs->flags, emcs->set);
-		camel_object_unref (emcs->folder);
+		g_object_unref (emcs->folder);
 		emcs->folder = NULL;
 		g_free (emcs->uid);
 		emcs->uid = NULL;
 	}
 
 	if (appended_uid) {
-		camel_object_ref (folder);
+		g_object_ref (folder);
 		emcs->drafts_folder = folder;
 		emcs->drafts_uid = g_strdup (appended_uid);
 	}
@@ -634,7 +624,7 @@ save_draft_folder (gchar *uri, CamelFolder *folder, gpointer data)
 
 	if (folder) {
 		*save = folder;
-		camel_object_ref (folder);
+		g_object_ref (folder);
 	}
 }
 
@@ -680,7 +670,7 @@ em_utils_composer_save_draft_cb (EMsgComposer *composer)
 		if (!folder || !account->enabled) {
 			if (e_alert_run_dialog_for_args ((GtkWindow *)composer, "mail:ask-default-drafts", NULL) != GTK_RESPONSE_YES) {
 				g_object_unref(composer);
-				camel_object_unref(msg);
+				g_object_unref (msg);
 				if (sdi->emcs)
 					emcs_unref(sdi->emcs);
 				g_free(sdi);
@@ -688,19 +678,19 @@ em_utils_composer_save_draft_cb (EMsgComposer *composer)
 			}
 
 			folder = local_drafts_folder;
-			camel_object_ref (local_drafts_folder);
+			g_object_ref (local_drafts_folder);
 		}
 	} else {
 		folder = local_drafts_folder;
-		camel_object_ref (folder);
+		g_object_ref (folder);
 	}
 
 	info = camel_message_info_new(NULL);
 	camel_message_info_set_flags(info, CAMEL_MESSAGE_DRAFT | CAMEL_MESSAGE_SEEN, ~0);
 
 	mail_append_mail (folder, msg, info, save_draft_done, sdi);
-	camel_object_unref (folder);
-	camel_object_unref (msg);
+	g_object_unref (folder);
+	g_object_unref (msg);
 }
 
 static void
@@ -794,8 +784,7 @@ em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri
 
 	composer_set_no_change (composer, TRUE, url == NULL);
 
-	gtk_widget_show ((GtkWidget *) composer);
-	gdk_window_raise (((GtkWidget *) composer)->window);
+	gtk_window_present (GTK_WINDOW (composer));
 
 	return composer;
 }
@@ -851,7 +840,7 @@ replace_variables (GSList *clues, CamelMimeMessage *message, gchar **pstr)
 			}
 
 			if (!count1) {
-				const CamelInternetAddress *to;
+				CamelInternetAddress *to;
 				const gchar *name, *addr;
 
 				to = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
@@ -905,10 +894,11 @@ traverse_parts (GSList *clues, CamelMimeMessage *message, CamelDataWrapper *cont
 	} else if (CAMEL_IS_MIME_PART (content)) {
 		CamelMimePart *part = CAMEL_MIME_PART (content);
 		CamelContentType *type;
-		CamelStream *mem;
+		CamelStream *stream;
+		GByteArray *byte_array;
 		gchar *str;
 
-		content = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+		content = camel_medium_get_content (CAMEL_MEDIUM (part));
 		if (!content)
 			return;
 
@@ -921,17 +911,18 @@ traverse_parts (GSList *clues, CamelMimeMessage *message, CamelDataWrapper *cont
 		if (!camel_content_type_is (type, "text", "*"))
 			return;
 
-		mem = camel_stream_mem_new ();
-		camel_data_wrapper_decode_to_stream (content, mem);
+		byte_array = g_byte_array_new ();
+		stream = camel_stream_mem_new_with_byte_array (byte_array);
+		camel_data_wrapper_decode_to_stream (content, stream);
 
-		str = g_strndup ((const gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
-		camel_object_unref (mem);
+		str = g_strndup ((gchar *) byte_array->data, byte_array->len);
+		g_object_unref (stream);
 
 		if (replace_variables (clues, message, &str)) {
-			mem = camel_stream_mem_new_with_buffer (str, strlen (str));
-			camel_stream_reset (mem);
-			camel_data_wrapper_construct_from_stream (content, mem);
-			camel_object_unref (mem);
+			stream = camel_stream_mem_new_with_buffer (str, strlen (str));
+			camel_stream_reset (stream);
+			camel_data_wrapper_construct_from_stream (content, stream);
+			g_object_unref (stream);
 		}
 
 		g_free (str);
@@ -955,7 +946,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 		clue_list = gconf_client_get_list ( gconf, GCONF_KEY_TEMPLATE_PLACEHOLDERS, GCONF_VALUE_STRING, NULL );
 		g_object_unref (gconf);
 
-		traverse_parts (clue_list, message, camel_medium_get_content_object (CAMEL_MEDIUM (message)));
+		traverse_parts (clue_list, message, camel_medium_get_content (CAMEL_MEDIUM (message)));
 
 		g_slist_foreach (clue_list, (GFunc) g_free, NULL);
 		g_slist_free (clue_list);
@@ -970,7 +961,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 		emcs_set_drafts_info (emcs, drafts, uid);
 	}
 
-	composer_set_no_change (composer, TRUE, FALSE);
+	composer_set_no_change (composer, TRUE, TRUE);
 
 	gtk_widget_show (GTK_WIDGET (composer));
 
@@ -1090,7 +1081,7 @@ composer_destroy_fad_cb (gpointer user_data, GObject *deadbeef)
 	struct forward_attached_data *fad = (struct forward_attached_data*) user_data;
 
 	if (fad) {
-		camel_object_unref (fad->folder);
+		g_object_unref (fad->folder);
 		em_utils_uids_free (fad->uids);
 		g_free (fad);
 	}
@@ -1104,7 +1095,7 @@ setup_forward_attached_callbacks (EMsgComposer *composer, CamelFolder *folder, G
 	if (!composer || !folder || !uids || !uids->len)
 		return;
 
-	camel_object_ref (folder);
+	g_object_ref (folder);
 
 	fad = g_new0 (struct forward_attached_data, 1);
 	fad->folder = folder;
@@ -1205,7 +1196,7 @@ forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
 			composer = create_new_composer (subject, fromuri);
 
 			if (composer) {
-				if (CAMEL_IS_MULTIPART(camel_medium_get_content_object((CamelMedium *)message)))
+				if (CAMEL_IS_MULTIPART(camel_medium_get_content ((CamelMedium *)message)))
 					e_msg_composer_add_message_attachments(composer, message, FALSE);
 
 				e_msg_composer_set_body_text (composer, text, len);
@@ -1310,7 +1301,7 @@ em_utils_forward_message (CamelMimeMessage *message, const gchar *fromuri)
 		subject = mail_tool_generate_forward_subject (message);
 
 		composer = forward_attached (NULL, NULL, messages, part, subject, fromuri);
-		camel_object_unref (part);
+		g_object_unref (part);
 		g_free (subject);
 		break;
 	case MAIL_CONFIG_FORWARD_INLINE:
@@ -1448,23 +1439,23 @@ em_utils_handle_receipt (CamelFolder *folder, const gchar *uid, CamelMimeMessage
 		return;
 
 	if (camel_message_info_user_flag(info, "receipt-handled")) {
-		camel_message_info_free(info);
+		camel_folder_free_message_info (folder, info);
 		return;
 	}
 
 	if (msg == NULL) {
 		mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_msg_unordered_push);
-		camel_message_info_free(info);
+		camel_folder_free_message_info (folder, info);
 		return;
 	}
 
 	if ((addr = camel_medium_get_header((CamelMedium *)msg, "Disposition-Notification-To")) == NULL) {
-		camel_message_info_free(info);
+		camel_folder_free_message_info (folder, info);
 		return;
 	}
 
 	camel_message_info_set_user_flag(info, "receipt-handled", TRUE);
-	camel_message_info_free(info);
+	camel_folder_free_message_info (folder, info);
 
 	account = em_utils_guess_account_with_recipients (msg, folder);
 
@@ -1551,14 +1542,14 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message)
 			     _("Your message to %s about \"%s\" on %s has been read."),
 			     self_address, message_subject, message_date);
 	camel_data_wrapper_construct_from_stream (receipt_text, stream);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (part), receipt_text);
+	camel_medium_set_content (CAMEL_MEDIUM (part), receipt_text);
 	camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE);
-	camel_object_unref (receipt_text);
+	g_object_unref (receipt_text);
 	camel_multipart_add_part (body, part);
-	camel_object_unref (part);
+	g_object_unref (part);
 
 	/* Create the machine-readable receipt */
 	receipt_data = camel_data_wrapper_new ();
@@ -1579,21 +1570,21 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message)
 			     "Disposition: manual-action/MDN-sent-manually; displayed\n",
 			     ua, recipient, message_id);
 	camel_data_wrapper_construct_from_stream (receipt_data, stream);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	g_free (ua);
 	g_free (recipient);
 	g_free (fake_msgid);
 
-	camel_medium_set_content_object (CAMEL_MEDIUM (part), receipt_data);
+	camel_medium_set_content (CAMEL_MEDIUM (part), receipt_data);
 	camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_7BIT);
-	camel_object_unref (receipt_data);
+	g_object_unref (receipt_data);
 	camel_multipart_add_part (body, part);
-	camel_object_unref (part);
+	g_object_unref (part);
 
 	/* Finish creating the message */
-	camel_medium_set_content_object (CAMEL_MEDIUM (receipt), CAMEL_DATA_WRAPPER (body));
-	camel_object_unref (body);
+	camel_medium_set_content (CAMEL_MEDIUM (receipt), CAMEL_DATA_WRAPPER (body));
+	g_object_unref (body);
 
 	/* Translators: %s is the subject of the email message */
 	receipt_subject = g_strdup_printf (_("Delivery Notification for: \"%s\""), message_subject);
@@ -1603,12 +1594,12 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message)
 	addr = camel_internet_address_new ();
 	camel_address_decode (CAMEL_ADDRESS (addr), self_address);
 	camel_mime_message_set_from (receipt, addr);
-	camel_object_unref (addr);
+	g_object_unref (addr);
 
 	addr = camel_internet_address_new ();
 	camel_address_decode (CAMEL_ADDRESS (addr), receipt_address);
 	camel_mime_message_set_recipients (receipt, CAMEL_RECIPIENT_TYPE_TO, addr);
-	camel_object_unref (addr);
+	g_object_unref (addr);
 
 	camel_medium_set_header (CAMEL_MEDIUM (receipt), "Return-Path", "<>");
 	camel_medium_set_header (CAMEL_MEDIUM (receipt), "X-Evolution-Account", account->uid);
@@ -1707,7 +1698,12 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account,
 		gchar *post;
 
 		if (folder) {
-			store_url = camel_url_to_string (CAMEL_SERVICE (folder->parent_store)->url, CAMEL_URL_HIDE_ALL);
+			CamelStore *parent_store;
+
+			parent_store = camel_folder_get_parent_store (folder);
+			store_url = camel_url_to_string (
+				CAMEL_SERVICE (parent_store)->url,
+				CAMEL_URL_HIDE_ALL);
 			if (store_url[strlen (store_url) - 1] == '/')
 				store_url[strlen (store_url)-1] = '\0';
 		}
@@ -1744,7 +1740,7 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account,
 static void
 get_reply_sender (CamelMimeMessage *message, CamelInternetAddress *to, CamelNNTPAddress *postto)
 {
-	const CamelInternetAddress *reply_to;
+	CamelInternetAddress *reply_to;
 	const gchar *name, *addr, *posthdr;
 	gint i;
 
@@ -1813,7 +1809,7 @@ get_reply_list (CamelMimeMessage *message, CamelInternetAddress *to)
 }
 
 static void
-concat_unique_addrs (CamelInternetAddress *dest, const CamelInternetAddress *src, GHashTable *rcpt_hash)
+concat_unique_addrs (CamelInternetAddress *dest, CamelInternetAddress *src, GHashTable *rcpt_hash)
 {
 	const gchar *name, *addr;
 	gint i;
@@ -1829,7 +1825,7 @@ concat_unique_addrs (CamelInternetAddress *dest, const CamelInternetAddress *src
 static void
 get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, CamelInternetAddress *cc, CamelNNTPAddress *postto)
 {
-	const CamelInternetAddress *reply_to, *to_addrs, *cc_addrs;
+	CamelInternetAddress *reply_to, *to_addrs, *cc_addrs;
 	const gchar *name, *addr, *posthdr;
 	GHashTable *rcpt_hash;
 	gint i;
@@ -1913,7 +1909,7 @@ typedef void (* AttribFormatter) (GString *str, const gchar *attr, CamelMimeMess
 static void
 format_sender (GString *str, const gchar *attr, CamelMimeMessage *message)
 {
-	const CamelInternetAddress *sender;
+	CamelInternetAddress *sender;
 	const gchar *name, *addr = NULL;
 
 	sender = camel_mime_message_get_from (message);
@@ -2108,7 +2104,7 @@ composer_set_body (EMsgComposer *composer, CamelMimeMessage *message, EMFormat *
 		/* attach the original message as an attachment */
 		part = mail_tool_make_message_attachment (message);
 		e_msg_composer_attach (composer, part);
-		camel_object_unref (part);
+		g_object_unref (part);
 		break;
 	case MAIL_CONFIG_REPLY_OUTLOOK:
 		text = em_utils_message_to_html (message, _("-----Original Message-----"), EM_FORMAT_QUOTE_HEADERS, &len, source, start_bottom ? "<BR>" : NULL, &validity_found);
@@ -2250,9 +2246,9 @@ em_utils_reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessag
 	e_msg_composer_add_message_attachments (composer, message, TRUE);
 
 	if (postto)
-		camel_object_unref(postto);
-	camel_object_unref(to);
-	camel_object_unref(cc);
+		g_object_unref (postto);
+	g_object_unref (to);
+	g_object_unref (cc);
 
 	composer_set_body (composer, message, source);
 
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index 92e7e182f4..1eb0d1bd30 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -24,9 +24,6 @@
 #ifndef __EM_COMPOSER_UTILS_H__
 #define __EM_COMPOSER_UTILS_H__
 
-#include <glib.h>
-#include <camel/camel-nntp-address.h>
-
 #include <em-format/em-format.h>
 #include <composer/e-msg-composer.h>
 
diff --git a/mail/em-config.c b/mail/em-config.c
index 4b1e835627..4e9d52ce61 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -33,17 +33,6 @@
 #include "em-utils.h"
 #include "em-composer-utils.h"
 
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-url.h>
-
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vtrash-folder.h>
-
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
@@ -104,7 +93,7 @@ emp_target_free(EConfig *ep, EConfigTarget *t)
 		EMConfigTargetFolder *s = (EMConfigTargetFolder *)t;
 
 		g_free(s->uri);
-		camel_object_unref(s->folder);
+		g_object_unref (s->folder);
 		break; }
 	case EM_CONFIG_TARGET_PREFS: {
 		EMConfigTargetPrefs *s = (EMConfigTargetPrefs *)t;
@@ -195,7 +184,7 @@ em_config_target_new_folder(EMConfig *emp, CamelFolder *folder, const gchar *uri
 
 	t->uri = g_strdup(uri);
 	t->folder = folder;
-	camel_object_ref(folder);
+	g_object_ref (folder);
 
 	return t;
 }
diff --git a/mail/em-config.h b/mail/em-config.h
index 62e74bea51..003498d2f6 100644
--- a/mail/em-config.h
+++ b/mail/em-config.h
@@ -23,9 +23,8 @@
 #ifndef __EM_CONFIG_H__
 #define __EM_CONFIG_H__
 
-#include <glib-object.h>
+#include <camel/camel.h>
 #include <gconf/gconf-client.h>
-#include <camel/camel-folder.h>
 #include <libedataserver/e-account.h>
 
 #include "e-util/e-config.h"
diff --git a/mail/em-event.c b/mail/em-event.c
index 7cb4c19a1e..a84eb92264 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -32,17 +32,6 @@
 #include "em-event.h"
 #include "composer/e-msg-composer.h"
 
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-url.h>
-
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vtrash-folder.h>
-
 static GObjectClass *eme_parent;
 static EMEvent *em_event;
 
@@ -74,9 +63,9 @@ eme_target_free(EEvent *ep, EEventTarget *t)
 		EMEventTargetMessage *s = (EMEventTargetMessage *)t;
 
 		if (s->folder)
-			camel_object_unref(s->folder);
+			g_object_unref (s->folder);
 		if (s->message)
-			camel_object_unref(s->message);
+			g_object_unref (s->message);
 		g_free(s->uid);
 		if (s->composer)
 			g_object_unref (s->composer);
@@ -173,10 +162,10 @@ em_event_target_new_message(EMEvent *eme, CamelFolder *folder, CamelMimeMessage
 	t->uid = g_strdup (uid);
 	t->folder = folder;
 	if (folder)
-		camel_object_ref(folder);
+		g_object_ref (folder);
 	t->message = message;
 	if (message)
-		camel_object_ref(message);
+		g_object_ref (message);
 	t->target.mask = ~flags;
 	if (composer)
 		t->composer = g_object_ref(G_OBJECT(composer));
diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c
index 3b80e0da77..f4584c65b1 100644
--- a/mail/em-filter-folder-element.c
+++ b/mail/em-filter-folder-element.c
@@ -230,6 +230,7 @@ xml_decode(EFilterElement *fe, xmlNodePtr node)
 static void
 folder_selected(EMFolderSelectionButton *button, EMFilterFolderElement *ff)
 {
+	GtkWidget *toplevel;
 	const gchar *uri;
 
 	uri = em_folder_selection_button_get_selection(button);
@@ -240,7 +241,8 @@ folder_selected(EMFolderSelectionButton *button, EMFilterFolderElement *ff)
 	else
 		ff->uri = uri != NULL ? em_uri_from_camel (uri) : NULL;
 
-	gdk_window_raise(GTK_WIDGET(gtk_widget_get_ancestor(GTK_WIDGET(button), GTK_TYPE_WINDOW))->window);
+	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
+	gtk_window_present (GTK_WINDOW (toplevel));
 }
 
 static GtkWidget *
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 41a6ba6640..b8ae4d66d7 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -480,13 +480,13 @@ more_parts(GtkWidget *button, struct _rule_data *data)
 	new = em_filter_context_next_action((EMFilterContext *)data->f, NULL);
 	if (new) {
 		GtkWidget *w;
-		guint16 rows;
+		guint rows;
 
 		new = e_filter_part_clone(new);
 		em_filter_rule_add_action((EMFilterRule *)data->fr, new);
 		w = get_rule_part_widget(data->f, new, data->fr);
 
-		rows = GTK_TABLE(data->parts)->nrows;
+		g_object_get (data->parts, "n-rows", &rows, NULL);
 		gtk_table_resize(GTK_TABLE(data->parts), rows + 1, 2);
 		attach_rule(w, data, new, rows);
 
@@ -503,9 +503,12 @@ more_parts(GtkWidget *button, struct _rule_data *data)
 			GtkAdjustment *adjustment;
 
 			adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (w));
-			if (adjustment)
-				gtk_adjustment_set_value (adjustment, adjustment->upper);
+			if (adjustment) {
+				gdouble upper;
 
+				upper = gtk_adjustment_get_upper (adjustment);
+				gtk_adjustment_set_value (adjustment, upper);
+			}
 		}
 	}
 }
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index d080076725..bf185ce60f 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -30,9 +30,9 @@
 #include "em-filter-source-element.h"
 
 #include <gtk/gtk.h>
+#include <camel/camel.h>
 #include <libedataserver/e-sexp.h>
 #include <libedataserver/e-account-list.h>
-#include <camel/camel-url.h>
 
 #include "filter/e-filter-part.h"
 
@@ -44,7 +44,7 @@ static gint source_eq(EFilterElement *fe, EFilterElement *cm);
 static void xml_create(EFilterElement *fe, xmlNodePtr node);
 static xmlNodePtr xml_encode(EFilterElement *fe);
 static gint xml_decode(EFilterElement *fe, xmlNodePtr node);
-static EFilterElement *clone(EFilterElement *fe);
+static EFilterElement *filter_clone(EFilterElement *fe);
 static GtkWidget *get_widget(EFilterElement *fe);
 static void build_code(EFilterElement *fe, GString *out, EFilterPart *ff);
 static void format_sexp(EFilterElement *, GString *);
@@ -106,7 +106,7 @@ em_filter_source_element_class_init(EMFilterSourceElementClass *klass)
 	fe_class->xml_create = xml_create;
 	fe_class->xml_encode = xml_encode;
 	fe_class->xml_decode = xml_decode;
-	fe_class->clone = clone;
+	fe_class->clone = filter_clone;
 	fe_class->get_widget = get_widget;
 	fe_class->build_code = build_code;
 	fe_class->format_sexp = format_sexp;
@@ -212,7 +212,7 @@ xml_decode(EFilterElement *fe, xmlNodePtr node)
 }
 
 static EFilterElement *
-clone(EFilterElement *fe)
+filter_clone(EFilterElement *fe)
 {
 	EMFilterSourceElement *fs = (EMFilterSourceElement *)fe;
 	EMFilterSourceElement *cpy = em_filter_source_element_new();
diff --git a/mail/em-folder-browser.c.dead b/mail/em-folder-browser.c.dead
deleted file mode 100644
index 8156c4fd32..0000000000
--- a/mail/em-folder-browser.c.dead
+++ /dev/null
@@ -1,1089 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Michael Zucchi <notzed@ximian.com>
- *      Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <string.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <gconf/gconf-client.h>
-
-#ifdef G_OS_WIN32
-/* Work around 'DATADIR' and 'interface' lossage in <windows.h> */
-#define DATADIR crap_DATADIR
-#include <windows.h>
-#undef DATADIR
-#undef interface
-#endif
-
-#include "mail-mt.h"
-#include "mail-ops.h"
-#include "mail-tools.h"
-#include "mail-config.h"
-
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-icon-factory.h>
-
-#include <camel/camel-stream.h>
-#include <camel/camel-url.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-operation.h>
-
-/* for efilterbar stuff */
-#include <libedataserver/e-sexp.h>
-#include "mail-vfolder.h"
-#include "em-vfolder-rule.h"
-#include "em-folder-tree.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-util.h"
-#include "e-util/e-error.h"
-#include "e-util/e-util-private.h"
-#include "e-util/e-util-labels.h"
-#include "e-mail-search-bar.h"
-#include "em-utils.h"
-#include "em-composer-utils.h"
-#include "em-format-html-display.h"
-#include "em-format-html-print.h"
-#include "em-folder-browser.h"
-#include "em-folder-properties.h"
-#include "em-folder-utils.h"
-#include "em-subscribe-editor.h"
-#include "em-menu.h"
-#include "em-event.h"
-#include "message-list.h"
-
-#include "mail-component.h"
-#include "mail-ops.h"
-
-#include "evolution-shell-component-utils.h" /* Pixmap stuff, sigh */
-
-#include <gtkhtml/gtkhtml.h>
-
-extern CamelSession *session;
-CamelStore *vfolder_store; /* the 1 static vfolder store */
-
-#define d(x)
-
-struct _EMFolderBrowserPrivate {
-	GtkWidget *preview;	/* container for message display */
-	GtkWidget *scroll;
-	GtkWidget *search_bar;
-
-	GtkWidget *subscribe_editor;
-
-	guint search_menu_activated_id;
-	guint search_activated_id;
-
-	double default_scroll_position;
-	guint idle_scroll_id;
-	guint list_scrolled_id;
-
-	guint vpane_resize_id;
-	guint list_built_id;	/* hook onto list-built for delayed 'select first unread' stuff */
-
-	gchar *select_uid;
-	guint folder_changed_id;
-
-	guint show_wide:1;
-	guint suppress_message_selection:1;
-	gboolean scope_restricted;
-
-	EMMenu *menu;		/* toplevel menu manager */
-
-	guint labels_change_notify_id; /* mail_config's notify id */
-	guint labels_change_idle_id; /* rebuild menu on idle, when all know about a change */
-};
-
-typedef struct EMFBSearchBarItem {
-	ESearchBarItem search;
-	const gchar *image;
-} EMFBSearchBarItem;
-
-static void emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint state);
-static void emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri);
-static void emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri);
-
-/* FilterBar stuff ... */
-static void emfb_search_config_search(EFilterBar *efb, FilterRule *rule, gint id, const gchar *query, gpointer data);
-static void emfb_search_menu_activated(ESearchBar *esb, gint id, EMFolderBrowser *emfb);
-static void emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb);
-static void emfb_search_search_cleared(ESearchBar *esb);
-
-static void emfb_list_message_selected (MessageList *ml, const gchar *uid, EMFolderBrowser *emfb);
-
-static void emfb_expand_all_threads(BonoboUIComponent *uid, gpointer data, const gchar *path);
-
-static const EMFolderViewEnable emfb_enable_map[] = {
-	{ "EditInvertSelection", EM_POPUP_SELECT_FOLDER },
-	{ "EditSelectAll", EM_POPUP_SELECT_FOLDER },
-	{ "EditSelectThread", EM_FOLDER_VIEW_SELECT_THREADED },
-	{ "EditSelectSubthread", EM_FOLDER_VIEW_SELECT_THREADED },
-	{ "FolderExpunge", EM_POPUP_SELECT_FOLDER },
-	{ "FolderCopy", EM_POPUP_SELECT_FOLDER },
-	{ "FolderMove", EM_POPUP_SELECT_FOLDER },
-	{ "FolderDelete", EM_POPUP_SELECT_FOLDER },
-	{ "FolderRename", EM_POPUP_SELECT_FOLDER },
-	{ "FolderRefresh", EM_POPUP_SELECT_FOLDER },
-	{ "ChangeFolderProperties", EM_POPUP_SELECT_FOLDER },
-	{ "MessageMarkAllAsRead", EM_POPUP_SELECT_FOLDER },
-	{ "ViewHideSelected", EM_POPUP_SELECT_MANY },
-	{ "ViewThreadsCollapseAll", EM_FOLDER_VIEW_SELECT_THREADED},
-	{ "ViewThreadsExpandAll", EM_FOLDER_VIEW_SELECT_THREADED},
-	{ NULL },
-};
-
-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 },
-	E_FILTERBAR_SAVE,
-	E_FILTERBAR_EDIT,
-	{ NULL, 0, 0 },
-	{ (gchar *) 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_MESSAGES_MARKED_AS_IMPORTANT,
-	VIEW_CUSTOMIZE
-};
-
-/* label IDs are set above this number */
-#define VIEW_ITEMS_MASK 63
-
-static ESearchBarItem emfb_search_scope_items[] = {
-	E_FILTERBAR_CURRENT_FOLDER,
-	E_FILTERBAR_CURRENT_ACCOUNT,
-	E_FILTERBAR_ALL_ACCOUNTS,
-	{ NULL, -1, 0 }
-};
-
-static EMFolderViewClass *emfb_parent;
-
-//static void
-//html_scroll (GtkHTML *html,
-//	GtkOrientation orientation,
-//	GtkScrollType  scroll_type,
-//	gfloat         position,
-//	EMFolderBrowser *emfb)
-//
-//{
-//	if (html->binding_handled || orientation != GTK_ORIENTATION_VERTICAL || !mail_config_get_enable_magic_spacebar ())
-//		return;
-//
-//	if (scroll_type == GTK_SCROLL_PAGE_FORWARD) {
-//		gtk_widget_grab_focus ((GtkWidget *)((EMFolderView *) emfb)->list);
-//		message_list_select(((EMFolderView *) emfb)->list, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_SEEN);
-//	} else if (scroll_type == GTK_SCROLL_PAGE_BACKWARD) {
-//		gtk_widget_grab_focus ((GtkWidget *)((EMFolderView *) emfb)->list);
-//		message_list_select(((EMFolderView *) emfb)->list, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_SEEN);
-//	}
-//}
-
-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 *html;
-
-	EMEvent *eme;
-	EMEventTargetFolderBrowser *target;
-
-	p = emfb->priv = g_malloc0(sizeof(struct _EMFolderBrowserPrivate));
-
-	emfb->view.preview_active = TRUE;
-	emfb->view.list_active = TRUE;
-
-//	g_signal_connect_after (((EMFormatHTML *)(emfb->view.preview))->html, "scroll", G_CALLBACK (html_scroll), emfb);
-
-//	g_slist_foreach (emfb->view.ui_files, free_one_ui_file, NULL);
-//	g_slist_free(emfb->view.ui_files);
-
-//	emfb->view.ui_files = g_slist_append(NULL,
-//					     g_build_filename (EVOLUTION_UIDIR,
-//							       "evolution-mail-global.xml",
-//							       NULL));
-//	emfb->view.ui_files = g_slist_append(emfb->view.ui_files,
-//					     g_build_filename (EVOLUTION_UIDIR,
-//							       "evolution-mail-list.xml",
-//							       NULL));
-//	emfb->view.ui_files = g_slist_append(emfb->view.ui_files,
-//					     g_build_filename (EVOLUTION_UIDIR,
-//							       "evolution-mail-message.xml",
-//							       NULL));
-
-	emfb->view.enable_map = g_slist_prepend(emfb->view.enable_map, (gpointer)emfb_enable_map);
-
-//	if (search_context) {
-//		const gchar *systemrules = g_object_get_data (G_OBJECT (search_context), "system");
-//		const gchar *userrules = g_object_get_data (G_OBJECT (search_context), "user");
-//		EFilterBar *efb;
-//		GConfClient *gconf;
-//
-//		emfb->search = e_filter_bar_new(search_context, systemrules, userrules, emfb_search_config_search, emfb);
-//		efb = (EFilterBar *)emfb->search;
-//		efb->account_search_vf = NULL;
-//		efb->all_account_search_vf = NULL;
-//		efb->account_search_cancel = NULL;
-//		e_search_bar_set_menu ((ESearchBar *)emfb->search, emfb_search_items);
-//		e_search_bar_set_scopeoption ((ESearchBar *)emfb->search, emfb_search_scope_items);
-//		e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, FALSE);
-//		emfb->priv->scope_restricted = TRUE;
-//		g_signal_connect(emfb, "realize", G_CALLBACK(emfb_realize), NULL);
-//		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);
-//		p->search_activated_id = g_signal_connect(emfb->search, "search_activated", G_CALLBACK(emfb_search_search_activated), emfb);
-//		g_signal_connect(emfb->search, "search_cleared", G_CALLBACK(emfb_search_search_cleared), NULL);
-//
-//		gtk_box_pack_start((GtkBox *)emfb, (GtkWidget *)emfb->search, FALSE, TRUE, 0);
-//
-//		gconf = mail_config_get_gconf_client ();
-//		emfb->priv->labels_change_notify_id = gconf_client_notify_add (gconf, E_UTIL_LABELS_GCONF_KEY, gconf_labels_changed, emfb, NULL, NULL);
-//	}
-//
-//	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();
-//
-//	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);
-//
-//	gtk_widget_show(emfb->vpane);
-//
-//	gtk_box_pack_start_defaults((GtkBox *)emfb, emfb->vpane);
-//
-//	gtk_paned_pack1 (GTK_PANED (emfb->vpane), GTK_WIDGET (emfb->view.list), FALSE, FALSE);
-//	gtk_widget_show((GtkWidget *)emfb->view.list);
-//
-//	/* currently: just use a scrolledwindow for preview widget */
-//	p->scroll = gtk_scrolled_window_new(NULL, NULL);
-//	gtk_scrolled_window_set_policy((GtkScrolledWindow *)p->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-//	gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)p->scroll, GTK_SHADOW_IN);
-//	gtk_widget_show(p->scroll);
-//
-//	p->preview = gtk_vbox_new (FALSE, 6);
-//	gtk_container_add((GtkContainer *)p->scroll, (GtkWidget *)emfb->view.preview->formathtml.html);
-//	gtk_widget_show((GtkWidget *)emfb->view.preview->formathtml.html);
-//	gtk_box_pack_start ((GtkBox *)p->preview, p->scroll, TRUE, TRUE, 0);
-//	gtk_box_pack_start ((GtkBox *)p->preview, em_format_html_get_search_dialog (emfb->view.preview), FALSE, FALSE, 0);
-//	gtk_paned_pack2 (GTK_PANED (emfb->vpane), p->preview, TRUE, FALSE);
-//	gtk_widget_show(p->preview);
-
-	g_signal_connect_swapped (
-		p->search_bar, "changed",
-		G_CALLBACK (em_format_redraw), emfb->view.preview);
-
-	/** @HookPoint-EMFolderBrower: Folder Browser
-	 * @Id: emfb.created
-	 * @Class: org.gnome.evolution.mail.events:1.0
-	 * @Target: EMFolderBrowser
-	 */
-
-	eme = em_event_peek();
-	target = em_event_target_new_folder_browser (eme, emfb);
-
-	e_event_emit((EEvent *)eme, "emfb.created", (EEventTarget *)target);
-
-	g_signal_connect (((EMFolderView *) emfb)->list, "message_selected", G_CALLBACK (emfb_list_message_selected), emfb);
-
-}
-
-static void
-emfb_destroy(GtkObject *o)
-{
-	EMFolderBrowser *emfb = (EMFolderBrowser *)o;
-
-	if (emfb->priv->list_built_id) {
-		g_signal_handler_disconnect(((EMFolderView *)emfb)->list, emfb->priv->list_built_id);
-		emfb->priv->list_built_id = 0;
-	}
-
-	if (emfb->priv->list_scrolled_id) {
-		g_signal_handler_disconnect (((EMFolderView *) emfb)->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 && emfb->priv->folder_changed_id)
-//		camel_object_remove_event(emfb->view.folder, emfb->priv->folder_changed_id);
-
-	if (emfb->priv->labels_change_notify_id) {
-		GConfClient *gconf = mail_config_get_gconf_client ();
-
-		if (gconf)
-			gconf_client_notify_remove (gconf, emfb->priv->labels_change_notify_id);
-
-		emfb->priv->labels_change_notify_id = 0;
-	}
-
-	if (emfb->priv->labels_change_idle_id) {
-		g_source_remove (emfb->priv->labels_change_idle_id);
-
-		emfb->priv->labels_change_idle_id = 0;
-	}
-
-	((GtkObjectClass *)emfb_parent)->destroy(o);
-}
-
-void em_folder_browser_show_preview(EMFolderBrowser *emfb, gboolean state)
-{
-	if ((emfb->view.preview_active ^ state) == 0
-	    || emfb->view.list == NULL) {
-		if (state && emfb->priv->scope_restricted && emfb->view.list->cursor_uid && *(emfb->view.list->cursor_uid)) {
-			emfb->priv->scope_restricted = FALSE;
-		}
-
-		return;
-	}
-
-	emfb->view.preview_active = state;
-
-	if (state) {
-		GConfClient *gconf = mail_config_get_gconf_client ();
-		gint 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);
-
-		/*y = save_cursor_pos (emfb);*/
-		gtk_paned_set_position (GTK_PANED (emfb->vpane), paned_size);
-		gtk_widget_show (GTK_WIDGET (emfb->priv->preview));
-
-		if (emfb->view.list->cursor_uid) {
-			gchar *uid = g_alloca(strlen(emfb->view.list->cursor_uid)+1);
-
-			emfb->priv->scope_restricted = FALSE;
-			strcpy(uid, emfb->view.list->cursor_uid);
-			em_folder_view_set_message(&emfb->view, uid, FALSE);
-		}
-
-		/* need to load/show the current message? */
-		/*do_message_selected (emfb);*/
-		/*set_cursor_pos (emfb, y);*/
-	} else {
-		em_format_format((EMFormat *)emfb->view.preview, NULL, NULL, NULL);
-
-		g_free(emfb->view.displayed_uid);
-		emfb->view.displayed_uid = NULL;
-
-		gtk_widget_hide(emfb->priv->preview);
-		emfb->priv->scope_restricted = TRUE;
-		/*
-		mail_display_set_message (emfb->mail_display, NULL, NULL, NULL);
-		emfb_ui_message_loaded (emfb);*/
-	}
-
-	/* FIXME: need to update menu's to reflect ui changes */
-}
-
-gboolean em_folder_browser_get_wide (EMFolderBrowser *emfb)
-{
-	return emfb->priv->show_wide;
-}
-
-/* ********************************************************************** */
-
-/* FIXME: Need to separate system rules from user ones */
-/* FIXME: Ugh! */
-
-static void
-emfb_search_menu_activated(ESearchBar *esb, gint id, EMFolderBrowser *emfb)
-{
-	EFilterBar *efb = (EFilterBar *)esb;
-
-	d(printf("menu activated\n"));
-
-	switch (id) {
-	case ESB_SAVE:
-		d(printf("Save vfolder\n"));
-		if (efb->current_query) {
-			FilterRule *rule;
-			gchar *name, *text;
-
-			/* ensures vfolder is running */
-			vfolder_load_storage ();
-
-			rule = vfolder_clone_rule (efb->current_query);
-			text = e_search_bar_get_text(esb);
-			name = g_strdup_printf("%s %s", rule->name, (text&&text[0])?text:"''");
-			g_free (text);
-			filter_rule_set_name(rule, name);
-			g_free (name);
-
-			filter_rule_set_source(rule, FILTER_SOURCE_INCOMING);
-			em_vfolder_rule_add_source((EMVFolderRule *)rule, emfb->view.folder_uri);
-			vfolder_gui_add_rule((EMVFolderRule *)rule);
-		}
-		break;
-	}
-}
-
-struct _setup_msg {
-	MailMsg base;
-
-	CamelFolder *folder;
-	CamelOperation *cancel;
-	GList *sources_uri;
-	GList *sources_folder;
-};
-
-static gchar *
-vfolder_setup_desc(struct _setup_msg *m)
-{
-	return g_strdup(_("Searching"));
-}
-
-static void
-vfolder_setup_exec(struct _setup_msg *m)
-{
-	GList *l, *list = NULL;
-	CamelFolder *folder;
-
-	if (m->cancel)
-		camel_operation_register (m->cancel);
-
-	d(printf("Setting up Search Folder: %s\n", m->folder->full_name));
-
-	l = m->sources_uri;
-	while (l) {
-		d(printf(" Adding uri: %s\n", (gchar *)l->data));
-		folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex);
-		if (folder) {
-			list = g_list_append(list, folder);
-		} else {
-			g_warning("Could not open vfolder source: %s", (gchar *)l->data);
-			camel_exception_clear(&m->base.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 _setup_msg *m)
-{
-}
-
-static void
-vfolder_setup_free (struct _setup_msg *m)
-{
-	GList *l;
-
-	camel_object_unref(m->folder);
-
-	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 MailMsgInfo vfolder_setup_info = {
-	sizeof (struct _setup_msg),
-	(MailMsgDescFunc) vfolder_setup_desc,
-	(MailMsgExecFunc) vfolder_setup_exec,
-	(MailMsgDoneFunc) vfolder_setup_done,
-	(MailMsgFreeFunc) vfolder_setup_free
-};
-
-/* sources_uri should be camel uri's */
-static gint
-vfolder_setup (CamelFolder *folder, GList *sources_uri, GList *sources_folder, CamelOperation *cancel)
-{
-	struct _setup_msg *m;
-	gint id;
-
-	m = mail_msg_new(&vfolder_setup_info);
-	m->folder = folder;
-	camel_object_ref(folder);
-	m->sources_uri = sources_uri;
-	m->sources_folder = sources_folder;
-
-	if (cancel) {
-		m->cancel = cancel;
-	}
-
-	id = m->base.seq;
-	mail_msg_slow_ordered_push (m);
-
-	return id;
-}
-
-static void
-emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb)
-{
-	EMFolderView *emfv = (EMFolderView *) emfb;
-	EFilterBar *efb = (EFilterBar *)esb;
-	const gchar *view_sexp;
-	gchar *search_state = NULL, *folder_uri=NULL;
-	gchar *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 ();
-
-	if (emfv->list == NULL || emfv->folder == NULL)
-		return;
-
-	id = e_search_bar_get_search_scope (esb);
-
-	switch (id) {
-	    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)) {
-			    if (efb->account_search_vf) {
-				    camel_object_unref (efb->account_search_vf);
-				    efb->account_search_vf = NULL;
-				    if (efb->account_search_cancel) {
-					    camel_operation_cancel (efb->account_search_cancel);
-					    camel_operation_unref (efb->account_search_cancel);
-					    efb->account_search_cancel = NULL;
-				    }
-			    }
-			    g_signal_emit (emfb, folder_browser_signals [ACCOUNT_SEARCH_CLEARED], 0);
-			    gtk_widget_set_sensitive (esb->scopeoption, TRUE);
-			    g_free (word);
-			    word = NULL;
-			    break;
-		    }
-
-		    g_free (word);
-		    word = NULL;
-		    g_object_get (esb, "query", &search_word, NULL);
-		    if (search_word && efb->account_search_vf && !strcmp (search_word, ((CamelVeeFolder *) efb->account_search_vf)->expression) ) {
-			    break;
-		    }
-		    gtk_widget_set_sensitive (esb->scopeoption, FALSE);
-
-		    /* Disable the folder tree */
-		    g_signal_emit (emfb, folder_browser_signals [ACCOUNT_SEARCH_ACTIVATED], 0);
-
-		    if (!efb->account_search_vf) {
-			    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/vfolder", mail_component_peek_base_directory (mail_component_peek ()));
-			    vfolder_store = camel_session_get_store (session, storeuri, NULL);
-			    efb->account_search_vf = (CamelVeeFolder *)camel_vee_folder_new (vfolder_store,_("Account Search"),CAMEL_STORE_VEE_FOLDER_AUTO);
-
-			    /* Set the search expression  */
-			    camel_vee_folder_set_expression (efb->account_search_vf, search_word);
-
-			    efb->account_search_cancel = camel_operation_new (NULL, NULL);
-			    vfolder_setup ((CamelFolder *)efb->account_search_vf, NULL, folder_list_account, efb->account_search_cancel);
-
-			    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_free (folder_uri);
-			    g_free (storeuri);
-		    } else {
-			    /* cancel previous filling first, if under way */
-			    if (efb->account_search_cancel) {
-				    camel_operation_cancel (efb->account_search_cancel);
-				    camel_operation_unref (efb->account_search_cancel);
-				    efb->account_search_cancel = NULL;
-			    }
-
-			    /* Reuse the existing search folder */
-			    camel_vee_folder_set_expression((CamelVeeFolder *)efb->account_search_vf, search_word);
-		    }
-
-		    break;
-
-	    case E_FILTERBAR_ALL_ACCOUNTS_ID:
-		    word = e_search_bar_get_text (esb);
-		    if (!(word && *word)) {
-			    if (efb->all_account_search_vf) {
-				    camel_object_unref (efb->all_account_search_vf);
-				    efb->all_account_search_vf=NULL;
-				    if (efb->account_search_cancel) {
-					    camel_operation_cancel (efb->account_search_cancel);
-					    camel_operation_unref (efb->account_search_cancel);
-					    efb->account_search_cancel = NULL;
-				    }
-			    }
-			    g_signal_emit (emfb, folder_browser_signals [ACCOUNT_SEARCH_CLEARED], 0);
-			    gtk_widget_set_sensitive (esb->scopeoption, TRUE);
-			    g_free (word);
-			    word = NULL;
-			    break;
-		    }
-
-		    g_free (word);
-		    word = NULL;
-
-		    g_object_get (esb, "query", &search_word, NULL);
-
-		    if (search_word && efb->all_account_search_vf && !strcmp (search_word, ((CamelVeeFolder *) efb->all_account_search_vf)->expression) )  {
-			    /* No real search apart from the existing one */
-			    break;
-		    }
-
-		    gtk_widget_set_sensitive (esb->scopeoption, FALSE);
-		    g_signal_emit (emfb, folder_browser_signals [ACCOUNT_SEARCH_ACTIVATED], 0);
-
-		    if (!efb->all_account_search_vf) {
-			    /* Create a camel vee folder */
-			    storeuri = g_strdup_printf("vfolder:%s/vfolder", mail_component_peek_base_directory (mail_component_peek ()));
-			    vfolder_store = camel_session_get_store (session, storeuri, NULL);
-			    efb->all_account_search_vf = (CamelVeeFolder *)camel_vee_folder_new (vfolder_store,_("All Account Search"),CAMEL_STORE_VEE_FOLDER_AUTO);
-
-			    /* Set sexp  */
-
-			    /* 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 gchar *)l->data, 0,ex);
-				    if (folder)
-					    folder_list = g_list_append(folder_list, folder);
-				    else {
-					    g_warning("Could not open vfolder source: %s", (gchar *)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 gchar *)l->data, 0,ex);
-				    if (folder)
-					    folder_list = g_list_append(folder_list, folder);
-				    else {
-					    g_warning("Could not open vfolder source: %s", (gchar *)l->data);
-					    camel_exception_clear(ex);
-				    }
-				    l = l->next;
-			    }
-
-			    camel_vee_folder_set_expression (efb->all_account_search_vf, search_word);
-
-			    efb->account_search_cancel = camel_operation_new (NULL, NULL);
-			    vfolder_setup ((CamelFolder *)efb->all_account_search_vf, NULL, folder_list, efb->account_search_cancel);
-
-			    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_free (folder_uri);
-			    g_free (storeuri);
-		    } else {
-			    /* cancel previous filling first, if under way */
-			    if (efb->account_search_cancel) {
-				    camel_operation_cancel (efb->account_search_cancel);
-				    camel_operation_unref (efb->account_search_cancel);
-				    efb->account_search_cancel = NULL;
-			    }
-
-			    /* Reuse the existing search folder */
-			    camel_vee_folder_set_expression((CamelVeeFolder *)efb->all_account_search_vf, search_word);
-		    }
-
-		    break;
-	}
-	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);
-	g_free (search_state);
-
-	if (search_word) {
-		g_free (search_word);
-		search_word = NULL;
-	}
-
-	/* Merge the view and search expresion*/
-	view_sexp = get_view_query (esb, emfv->folder, emfv->folder_uri);
-	g_object_get (esb, "query", &search_word, NULL);
-
-	word = search_word;
-
-	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);
-
-	g_free (word);
-	g_free (search_word);
-
-	camel_exception_free (ex);
-}
-
-static void
-emfb_search_search_cleared(ESearchBar *esb)
-{
-	/* FIXME: It should just cancel search.*/
-	mail_cancel_all();
-}
-
-/* ********************************************************************** */
-
-static void
-emfb_list_message_selected (MessageList *ml, const gchar *uid, EMFolderBrowser *emfb)
-{
-	EMFolderView *emfv = (EMFolderView *) emfb;
-
-	if (emfv->folder == NULL)
-		return;
-
-	if (uid && *uid && emfb->priv->scope_restricted && emfb->view.preview_active) {
-		emfb->priv->scope_restricted = FALSE;
-	} else if ( !(uid && *uid) && !emfb->priv->scope_restricted) {
-		emfb->priv->scope_restricted = TRUE;
-	}
-
-	camel_object_meta_set (emfv->folder, "evolution:selected_uid", uid);
-	camel_object_state_write (emfv->folder);
-	g_free (emfb->priv->select_uid);
-	emfb->priv->select_uid = NULL;
-}
-
-/* ********************************************************************** */
-
-static void
-emfb_focus_search(BonoboUIComponent *uid, gpointer data, const gchar *path)
-{
-	EMFolderBrowser *emfb = data;
-
-	gtk_widget_grab_focus (((ESearchBar *)emfb->search)->entry);
-}
-
-static void
-emfb_help_debug (BonoboUIComponent *uid, gpointer data, const gchar *path)
-{
-	mail_component_show_logger ((GtkWidget *) data);
-}
-
-static BonoboUIVerb emfb_verbs[] = {
-	BONOBO_UI_UNSAFE_VERB ("HelpDebug", emfb_help_debug),
-
-	BONOBO_UI_UNSAFE_VERB ("FocusSearch", emfb_focus_search),
-
-	/* ViewPreview is a toggle */
-
-	BONOBO_UI_VERB_END
-};
-
-//static gboolean
-//emfb_select_all_daemon (MessageList *ml)
-//{
-//		message_list_select_all(ml);
-//		gtk_widget_grab_focus ((GtkWidget *)ml);
-//		return FALSE;
-//}
-
-//static void
-//emfb_hide_deleted(BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data)
-//{
-//	GConfClient *gconf;
-//	EMFolderView *emfv = data;
-//
-//	if (type != Bonobo_UIComponent_STATE_CHANGED)
-//		return;
-//
-//	gconf = mail_config_get_gconf_client ();
-//	gconf_client_set_bool(gconf, "/apps/evolution/mail/display/show_deleted", state[0] == '0', NULL);
-//	em_folder_view_set_hide_deleted(emfv, state[0] != '0');
-//}
-
-static void
-emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri)
-{
-	EMFolderBrowser *emfb = (EMFolderBrowser *) emfv;
-	gchar *state;
-
-	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 */
-	state = "<ETableState>"
-		"<column source=\"0\"/> <column source=\"3\"/> <column source=\"1\"/>"
-		"<column source=\"14\"/> <column source=\"5\"/>"
-		"<column source=\"7\"/> <column source=\"13\"/> "
-		"<grouping><leaf column=\"7\" ascending=\"false\"/> </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 gchar *uri)
-{
-	EMFolderBrowser *emfb = (EMFolderBrowser *) emfv;
-	struct _EMFolderBrowserPrivate *p = emfb->priv;
-	gboolean different_folder;
-
-//	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 && emfb->priv->folder_changed_id) {
-//		camel_object_remove_event(emfb->view.folder, emfb->priv->folder_changed_id);
-//		emfb->priv->folder_changed_id = 0;
-//	}
-//
-//	different_folder =
-//		emfb->view.folder != NULL &&
-//		folder != emfb->view.folder;
-//
-//	emfb_parent->set_folder(emfv, folder, uri);
-
-	/* This is required since we get activated the first time
-	   before the folder is open and need to override the
-	   defaults */
-	if (folder) {
-		gchar *sstate;
-		gint state;
-		gboolean safe;
-		GConfClient *gconf = mail_config_get_gconf_client();
-
-		safe = gconf_client_get_bool (gconf, "/apps/evolution/mail/display/safe_list", NULL);
-		if (safe) {
-			if (camel_object_meta_set(emfv->folder, "evolution:show_preview", "0") &&
-			    camel_object_meta_set(emfv->folder, "evolution:selected_uid", NULL)) {
-				camel_object_state_write(emfv->folder);
-				g_free (emfb->priv->select_uid);
-				emfb->priv->select_uid = NULL;
-			}
-			gconf_client_set_bool (gconf, "/apps/evolution/mail/display/safe_list", FALSE, NULL);
-		}
-
-//		mail_refresh_folder(folder, NULL, NULL);
-//
-//		emfb->priv->folder_changed_id = camel_object_hook_event(folder, "folder_changed",
-//									(CamelObjectEventHookFunc)emfb_folder_changed, emfb);
-//
-//		/* FIXME: this mostly copied from activate() */
-//		if ((sstate = camel_object_meta_get(folder, "evolution:show_preview"))) {
-//			state = sstate[0] != '0';
-//			g_free(sstate);
-//		} else
-//			state = gconf_client_get_bool(gconf, "/apps/evolution/mail/display/show_preview", NULL);
-//		em_folder_browser_show_preview(emfb, state);
-//		if (emfv->uic)
-//			bonobo_ui_component_set_prop(emfv->uic, "/commands/ViewPreview", "state", state?"1":"0", NULL);
-//
-//		if ((sstate = camel_object_meta_get(folder, "evolution:thread_list"))) {
-//			state = sstate[0] != '0';
-//			g_free(sstate);
-//		} else
-//			state = gconf_client_get_bool(gconf, "/apps/evolution/mail/display/thread_list", NULL);
-//		message_list_set_threaded(emfv->list, state);
-//		if (emfv->uic) {
-//			bonobo_ui_component_set_prop(emfv->uic, "/commands/ViewThreaded", "state", state?"1":"0", NULL);
-//			bonobo_ui_component_set_prop(emfv->uic, "/commands/ViewThreadsCollapseAll", "sensitive", state?"1":"0", NULL);
-//			bonobo_ui_component_set_prop(emfv->uic, "/commands/ViewThreadsExpandAll", "sensitive", state?"1":"0", NULL);
-//		}
-
-		if (emfv->uic) {
-			state = (folder->folder_flags & CAMEL_FOLDER_IS_TRASH) == 0;
-			bonobo_ui_component_set_prop(emfv->uic, "/commands/HideDeleted", "sensitive", state?"1":"0", NULL);
-		}
-
-		/* Fixme */
-		sstate = camel_object_meta_get(folder, "evolution:search_state");
-		if (sstate) {
-			g_object_set(emfb->search, "state", sstate, NULL);
-			g_free(sstate);
-		} else {
-			gboolean outgoing;
-			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);
-
-			e_search_bar_set_text ((ESearchBar *)emfb->search, "");
-
-			if (outgoing) {
-				e_search_bar_set_item_id ((ESearchBar *)emfb->search, 1);
-				((ESearchBar *)emfb->search)->block_search = TRUE;
-				e_search_bar_set_item_menu ((ESearchBar *)emfb->search, 1);
-				((ESearchBar *)emfb->search)->block_search = FALSE;
-
-			} else {
-				e_search_bar_set_item_id ((ESearchBar *)emfb->search, 0);
-				((ESearchBar *)emfb->search)->block_search = TRUE;
-				e_search_bar_set_item_menu ((ESearchBar *)emfb->search, 0);
-				((ESearchBar *)emfb->search)->block_search = FALSE;
-
-			}
-			e_search_bar_paint ((ESearchBar *)emfb->search);
-		}
-
-//		/* This function gets triggered several times at startup,
-//		 * so we don't want to reset the message suppression state
-//		 * unless we're actually switching to a different folder. */
-//		if (different_folder)
-//			p->suppress_message_selection = FALSE;
-//
-//		if (!p->suppress_message_selection)
-//			sstate = camel_object_meta_get (
-//				folder, "evolution:selected_uid");
-//		else
-//			sstate = NULL;
-//
-//		g_free (p->select_uid);
-//		p->select_uid = sstate;
-//
-//		if (emfv->list->cursor_uid == NULL && emfb->priv->list_built_id == 0)
-//			p->list_built_id = g_signal_connect(emfv->list, "message_list_built", G_CALLBACK (emfb_list_built), emfv);
-//	}
-//
-//	message_list_thaw(emfv->list);
-}
-
-static void
-emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint act)
-{
-	if (act) {
-		GConfClient *gconf;
-		gboolean state;
-		gchar *sstate;
-		EMFolderBrowser *emfb = (EMFolderBrowser *) emfv;
-
-		/* Stop button */
-		state = mail_msg_active((guint)-1);
-		bonobo_ui_component_set_prop(uic, "/commands/MailStop", "sensitive", state?"1":"0", NULL);
-
-//		/* HideDeleted */
-//		state = !gconf_client_get_bool(gconf, "/apps/evolution/mail/display/show_deleted", NULL);
-//		if (emfv->folder && (emfv->folder->folder_flags & CAMEL_FOLDER_IS_TRASH)) {
-//			state = FALSE;
-//			bonobo_ui_component_set_prop(uic, "/commands/HideDeleted", "sensitive", "0", NULL);
-//		} else
-//			bonobo_ui_component_set_prop(uic, "/commands/HideDeleted", "sensitive", "1", NULL);
-//		bonobo_ui_component_set_prop(uic, "/commands/HideDeleted", "state", state ? "1" : "0", NULL);
-//		bonobo_ui_component_add_listener(uic, "HideDeleted", emfb_hide_deleted, emfv);
-//		em_folder_view_set_hide_deleted(emfv, state); /* <- not sure if this optimal, but it'll do */
-	}
-}
-
-void
-em_folder_browser_suppress_message_selection (EMFolderBrowser *emfb)
-{
-	emfb->priv->suppress_message_selection = TRUE;
-}
diff --git a/mail/em-folder-browser.h.dead b/mail/em-folder-browser.h.dead
deleted file mode 100644
index 966d3a3c13..0000000000
--- a/mail/em-folder-browser.h.dead
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef _EM_FOLDER_BROWSER_H
-#define _EM_FOLDER_BROWSER_H
-
-#include "mail/em-folder-view.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EMFolderBrowser EMFolderBrowser;
-typedef struct _EMFolderBrowserClass EMFolderBrowserClass;
-
-struct _EMFolderBrowser {
-	EMFolderView view;
-
-	struct _EMFolderBrowserPrivate *priv;
-
-	GtkWidget *vpane;
-	struct _EFilterBar *search;
-};
-
-struct _EMFolderBrowserClass {
-	EMFolderViewClass parent_class;
-
-	/* Signals*/
-	void (*account_search_activated) (EMFolderBrowser *emfb);
-	void (*account_search_cleared) (EMFolderBrowser *emfb);
-};
-
-GType em_folder_browser_get_type(void);
-
-GtkWidget *em_folder_browser_new(void);
-
-void em_folder_browser_show_preview(EMFolderBrowser *emfv, gboolean state);
-void em_folder_browser_show_wide(EMFolderBrowser *emfv, gboolean state);
-gboolean em_folder_browser_get_wide(EMFolderBrowser *emfv);
-void em_folder_browser_suppress_message_selection(EMFolderBrowser *emfb);
-
-G_END_DECLS
-
-#endif /* ! _EM_FOLDER_BROWSER_H */
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 7b7957149c..529472b47a 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -27,14 +27,11 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include <gconf/gconf-client.h>
 
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-vee-folder.h>
-#include <glib/gi18n.h>
+#include <e-util/e-binding.h>
 
 #include "em-folder-properties.h"
 #include "em-config.h"
@@ -47,11 +44,6 @@
 
 struct _prop_data {
 	gpointer object;
-	CamelArgV *argv;
-	GtkWidget **widgets;
-
-	GSList *properties;
-	gchar *name;
 	gint total;
 	gint unread;
 	EMConfig *config;
@@ -70,56 +62,14 @@ emfp_dialog_response (GtkWidget *dialog, gint response, struct _prop_data *prop_
 }
 
 static void
-emfp_commit(EConfig *ec, GSList *items, gpointer data)
-{
-	struct _prop_data *prop_data = data;
-	CamelArgV *argv = prop_data->argv;
-	gint i;
-
-	for (i = 0; i < argv->argc; i++) {
-		CamelArg *arg = &argv->argv[i];
-
-		switch (arg->tag & CAMEL_ARG_TYPE) {
-		case CAMEL_ARG_BOO:
-			arg->ca_int = gtk_toggle_button_get_active ((GtkToggleButton *) prop_data->widgets[i]);
-			break;
-		case CAMEL_ARG_STR:
-			g_free (arg->ca_str);
-			arg->ca_str = (gchar *) gtk_entry_get_text ((GtkEntry *) prop_data->widgets[i]);
-			break;
-		case CAMEL_ARG_INT:
-			arg->ca_int = gtk_spin_button_get_value_as_int ((GtkSpinButton *) prop_data->widgets[i]);
-			break;
-		case CAMEL_ARG_DBL:
-			arg->ca_double = gtk_spin_button_get_value ((GtkSpinButton *) prop_data->widgets[i]);
-			break;
-		default:
-			g_warning ("This shouldn't be reached\n");
-			break;
-		}
-	}
-
-	camel_object_setv (prop_data->object, NULL, argv);
-}
-
-static void
 emfp_free(EConfig *ec, GSList *items, gpointer data)
 {
 	struct _prop_data *prop_data = data;
-	gint i;
 
 	g_slist_free(items);
 
-	for (i = 0; i < prop_data->argv->argc; i++) {
-		if ((prop_data->argv->argv[i].tag & CAMEL_ARG_TYPE) == CAMEL_ARG_STR)
-			g_free (prop_data->argv->argv[i].ca_str);
-	}
-
-	camel_object_free (prop_data->object, CAMEL_FOLDER_PROPERTIES, prop_data->properties);
-	camel_object_free (prop_data->object, CAMEL_FOLDER_NAME, prop_data->name);
-
-	camel_object_unref (prop_data->object);
-	g_free (prop_data->argv);
+	camel_object_state_write (prop_data->object);
+	g_object_unref (prop_data->object);
 
 	camel_folder_quota_info_free (prop_data->quota);
 
@@ -156,15 +106,17 @@ add_numbered_row (GtkTable *table, gint row, const gchar *description, const gch
 static GtkWidget *
 emfp_get_folder_item(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
-	GtkWidget *w, *table, *label;
+	GObjectClass *class;
+	GParamSpec **properties;
+	GtkWidget *widget, *table;
 	struct _prop_data *prop_data = data;
-	gint row = 0, i;
-	GSList *l;
+	guint ii, n_properties;
+	gint row = 0;
 
 	if (old)
 		return old;
 
-	table = gtk_table_new (g_slist_length (prop_data->properties) + 2, 2, FALSE);
+	table = gtk_table_new (2, 2, FALSE);
 	gtk_table_set_row_spacings ((GtkTable *) table, 6);
 	gtk_table_set_col_spacings ((GtkTable *) table, 12);
 	gtk_widget_show (table);
@@ -205,74 +157,39 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidge
 		}
 	}
 
-	/* setup the ui with the values retrieved */
-	l = prop_data->properties;
-	i = 0;
-	while (l) {
-		CamelProperty *prop = l->data;
-
-		switch (prop->tag & CAMEL_ARG_TYPE) {
-		case CAMEL_ARG_BOO:
-			w = gtk_check_button_new_with_label (prop->description);
-			gtk_toggle_button_set_active ((GtkToggleButton *) w, prop_data->argv->argv[i].ca_int != 0);
-			gtk_widget_show (w);
-			gtk_table_attach ((GtkTable *) table, w, 0, 2, row, row + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
-			prop_data->widgets[i] = w;
-			break;
-		case CAMEL_ARG_STR:
-			label = gtk_label_new (prop->description);
-			gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
-			gtk_widget_show (label);
-			gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
-
-			w = gtk_entry_new ();
-			gtk_widget_show (w);
-			if (prop_data->argv->argv[i].ca_str) {
-				gtk_entry_set_text ((GtkEntry *) w, prop_data->argv->argv[i].ca_str);
-				camel_object_free (prop_data->object, prop_data->argv->argv[i].tag, prop_data->argv->argv[i].ca_str);
-				prop_data->argv->argv[i].ca_str = NULL;
-			}
-			gtk_table_attach ((GtkTable *) table, w, 1, 2, row, row + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
-			prop_data->widgets[i] = w;
-			break;
-		case CAMEL_ARG_INT:
-			label = gtk_label_new (prop->description);
-			gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
-			gtk_widget_show (label);
-			gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
-
-			w = gtk_spin_button_new_with_range (G_MININT, G_MAXINT, 1.0);
-			gtk_spin_button_set_value ((GtkSpinButton *) w, (double) prop_data->argv->argv[i].ca_int);
-			gtk_spin_button_set_numeric ((GtkSpinButton *) w, TRUE);
-			gtk_spin_button_set_digits ((GtkSpinButton *) w, 0);
-			gtk_widget_show (w);
-			gtk_table_attach ((GtkTable *) table, w, 1, 2, row, row + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
-			prop_data->widgets[i] = w;
-			break;
-		case CAMEL_ARG_DBL:
-			label = gtk_label_new (prop->description);
-			gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
-			gtk_widget_show (label);
-			gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
-
-			w = gtk_spin_button_new_with_range (G_MININT, G_MAXINT, 1.0);
-			gtk_spin_button_set_value ((GtkSpinButton *) w, prop_data->argv->argv[i].ca_double);
-			gtk_spin_button_set_numeric ((GtkSpinButton *) w, TRUE);
-			gtk_spin_button_set_digits ((GtkSpinButton *) w, 2);
-			gtk_widget_show (w);
-			gtk_table_attach ((GtkTable *) table, w, 1, 2, row, row + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
-			prop_data->widgets[i] = w;
-			break;
-		default:
-			g_warning ("This shouldn't be reached\n");
-			break;
+	class = G_OBJECT_GET_CLASS (prop_data->object);
+	properties = g_object_class_list_properties (class, &n_properties);
+
+	for (ii = 0; ii < n_properties; ii++) {
+		const gchar *blurb;
+
+		if ((properties[ii]->flags & CAMEL_PARAM_PERSISTENT) == 0)
+			continue;
+
+		blurb = g_param_spec_get_blurb (properties[ii]);
+
+		switch (properties[ii]->value_type) {
+			case G_TYPE_BOOLEAN:
+				widget = gtk_check_button_new_with_label (blurb);
+				e_mutual_binding_new (
+					prop_data->object,
+					properties[ii]->name,
+					widget, "active");
+				gtk_widget_show (widget);
+				gtk_table_attach (
+					GTK_TABLE (table), widget,
+					0, 2, row, row + 1,
+					GTK_FILL | GTK_EXPAND, 0, 0, 0);
+				row++;
+				break;
+			default:
+				g_warn_if_reached ();
+				break;
 		}
-
-		row++;
-		l = l->next;
-		i++;
 	}
 
+	g_free (properties);
+
 	return table;
 }
 
@@ -293,41 +210,41 @@ emfp_dialog_got_folder_quota (CamelFolder *folder,
                               gpointer data)
 {
 	GtkWidget *dialog, *w;
+	GtkWidget *content_area;
 	struct _prop_data *prop_data;
 	GSList *l;
-	gint32 count, i,deleted;
+	gint32 i,deleted;
 	EMConfig *ec;
 	EMConfigTargetFolder *target;
 	EShellWindow *shell_window;
 	EShellView *shell_view;
-	CamelArgGetV *arggetv;
-	CamelArgV *argv;
 	CamelStore *local_store;
+	CamelStore *parent_store;
 	gboolean hide_deleted;
 	GConfClient *gconf;
-	CamelStore *store;
+	const gchar *name;
 
 	if (folder == NULL)
 		return;
 
-	store = folder->parent_store;
-
 	shell_view = E_SHELL_VIEW (data);
 	shell_window = e_shell_view_get_shell_window (shell_view);
 
 	local_store = e_mail_local_get_store ();
+	parent_store = camel_folder_get_parent_store (folder);
 
 	prop_data = g_malloc0 (sizeof (*prop_data));
-	prop_data->object = folder;
-	camel_object_ref (folder);
+	prop_data->object = g_object_ref (folder);
 	prop_data->quota = camel_folder_quota_info_clone (quota);
 
 	/*
 	  Get number of VISIBLE and DELETED messages, instead of TOTAL messages.  VISIBLE+DELETED
 	   gives the correct count that matches the label below the Send & Receive button
 	*/
-	camel_object_get (folder, NULL, CAMEL_FOLDER_PROPERTIES, &prop_data->properties, CAMEL_FOLDER_NAME, &prop_data->name,
-			  CAMEL_FOLDER_VISIBLE, &prop_data->total, CAMEL_FOLDER_UNREAD, &prop_data->unread, CAMEL_FOLDER_DELETED, &deleted, NULL);
+	name = camel_folder_get_name (folder);
+	prop_data->total = folder->summary->visible_count;
+	prop_data->unread = folder->summary->unread_count;
+	deleted = folder->summary->deleted_count;
 
 	gconf = mail_config_get_gconf_client ();
 	hide_deleted = !gconf_client_get_bool(gconf, "/apps/evolution/mail/display/show_deleted", NULL);
@@ -335,7 +252,7 @@ emfp_dialog_got_folder_quota (CamelFolder *folder,
 	/*
 	   Do the calculation only for those accounts that support VTRASHes
 	 */
-	if (store->flags & CAMEL_STORE_VTRASH) {
+	if (parent_store->flags & CAMEL_STORE_VTRASH) {
 		if (CAMEL_IS_VTRASH_FOLDER(folder))
 			prop_data->total += deleted;
 		else if (!hide_deleted && deleted > 0)
@@ -345,17 +262,16 @@ emfp_dialog_got_folder_quota (CamelFolder *folder,
 	/*
 	 * If the ffolder is junk folder, get total number of mails.
 	 */
-	if (store->flags & CAMEL_STORE_VJUNK) {
-		camel_object_get (folder, NULL, CAMEL_FOLDER_TOTAL, &prop_data->total, NULL);
-	}
-
-	if (store == local_store
-	    && (!strcmp(prop_data->name, "Drafts")
-		|| !strcmp(prop_data->name, "Templates")
-		|| !strcmp(prop_data->name, "Inbox")
-		|| !strcmp(prop_data->name, "Outbox")
-		|| !strcmp(prop_data->name, "Sent"))) {
-		emfp_items[EMFP_FOLDER_SECTION].label = _(prop_data->name);
+	if (parent_store->flags & CAMEL_STORE_VJUNK)
+		prop_data->total = camel_folder_summary_count (folder->summary);
+
+	if (parent_store == local_store
+	    && (!strcmp (name, "Drafts")
+		|| !strcmp (name, "Templates")
+		|| !strcmp (name, "Inbox")
+		|| !strcmp (name, "Outbox")
+		|| !strcmp (name, "Sent"))) {
+		emfp_items[EMFP_FOLDER_SECTION].label = gettext (name);
 		if (!emfp_items_translated) {
 			for (i = 0; i < G_N_ELEMENTS (emfp_items); i++) {
 				if (emfp_items[i].label)
@@ -363,46 +279,21 @@ emfp_dialog_got_folder_quota (CamelFolder *folder,
 			}
 			emfp_items_translated = TRUE;
 		}
-	} else if (!strcmp(prop_data->name, "INBOX"))
+	} else if (!strcmp (name, "INBOX"))
 		emfp_items[EMFP_FOLDER_SECTION].label = _("Inbox");
 	else
-		emfp_items[EMFP_FOLDER_SECTION].label = prop_data->name;
-
-	count = g_slist_length (prop_data->properties);
-
-	prop_data->widgets = g_malloc0 (sizeof (prop_data->widgets[0]) * count);
-
-	/* build an arggetv/argv to retrieve/store the results */
-	argv = g_malloc0 (sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0]));
-	argv->argc = count;
-	arggetv = g_malloc0 (sizeof (*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof (arggetv->argv[0]));
-	arggetv->argc = count;
-
-	i = 0;
-	l = prop_data->properties;
-	while (l) {
-		CamelProperty *prop = l->data;
-
-		argv->argv[i].tag = prop->tag;
-		arggetv->argv[i].tag = prop->tag;
-		arggetv->argv[i].ca_ptr = &argv->argv[i].ca_ptr;
-
-		l = l->next;
-		i++;
-	}
-
-	camel_object_getv (prop_data->object, NULL, arggetv);
-	g_free (arggetv);
-	prop_data->argv = argv;
+		emfp_items[EMFP_FOLDER_SECTION].label = (gchar *) name;
 
 	dialog = gtk_dialog_new_with_buttons (
 		_("Folder Properties"), GTK_WINDOW (shell_window),
 		GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
-		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-		GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+		GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);
 	gtk_window_set_default_size ((GtkWindow *) dialog, 192, 160);
+
 	gtk_widget_ensure_style (dialog);
-	gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *) dialog)->vbox, 12);
+
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_container_set_border_width (GTK_CONTAINER (content_area), 12);
 
 	/** @HookPoint-EMConfig: Folder Properties Window
 	 * @Id: org.gnome.evolution.mail.folderConfig
@@ -417,13 +308,13 @@ emfp_dialog_got_folder_quota (CamelFolder *folder,
 	l = NULL;
 	for (i = 0; i < G_N_ELEMENTS (emfp_items); i++)
 		l = g_slist_prepend(l, &emfp_items[i]);
-	e_config_add_items((EConfig *)ec, l, emfp_commit, NULL, emfp_free, prop_data);
+	e_config_add_items((EConfig *)ec, l, NULL, NULL, emfp_free, prop_data);
 
 	target = em_config_target_new_folder(ec, folder, folder_uri);
 	e_config_set_target((EConfig *)ec, (EConfigTarget *)target);
 	w = e_config_create_widget((EConfig *)ec);
 
-	gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, w, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (content_area), w, TRUE, TRUE, 0);
 
 	/* we do 'apply on ok' ... since instant apply may apply some very long running tasks */
 
diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h
index 330be151a3..d0809357e8 100644
--- a/mail/em-folder-properties.h
+++ b/mail/em-folder-properties.h
@@ -24,7 +24,7 @@
 #ifndef __EM_FOLDER_PROPERTIES_H__
 #define __EM_FOLDER_PROPERTIES_H__
 
-#include <camel/camel-folder.h>
+#include <camel/camel.h>
 #include <shell/e-shell-view.h>
 
 G_BEGIN_DECLS
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 1a9123a34a..089daf4d44 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -25,10 +25,6 @@
 #include <glib/gi18n.h>
 #include <e-util/e-util.h>
 
-#include <camel/camel-url.h>
-#include <camel/camel-store.h>
-#include <camel/camel-session.h>
-
 #include "em-folder-tree.h"
 #include "em-folder-selector.h"
 #include "em-folder-utils.h"
@@ -135,7 +131,7 @@ emfs_create_name_changed (GtkEntry *entry, EMFolderSelector *emfs)
 	const gchar *text = NULL;
 	gboolean active;
 
-	if (emfs->name_entry->text_length > 0)
+	if (gtk_entry_get_text_length (emfs->name_entry) > 0)
 		text = gtk_entry_get_text (emfs->name_entry);
 
 	path = em_folder_tree_get_selected_uri(emfs->emft);
@@ -163,14 +159,16 @@ folder_activated_cb (EMFolderTree *emft, const gchar *path, const gchar *uri, EM
 void
 em_folder_selector_construct (EMFolderSelector *emfs, EMFolderTree *emft, guint32 flags, const gchar *title, const gchar *text, const gchar *oklabel)
 {
+	GtkWidget *container;
 	GtkWidget *widget;
 
 	gtk_window_set_default_size (GTK_WINDOW (emfs), 350, 300);
 	gtk_window_set_title (GTK_WINDOW (emfs), title);
 	gtk_container_set_border_width (GTK_CONTAINER (emfs), 6);
 
-	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (emfs)->vbox), 6);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (emfs)->vbox), 6);
+	container = gtk_dialog_get_content_area (GTK_DIALOG (emfs));
+	gtk_box_set_spacing (GTK_BOX (container), 6);
+	gtk_container_set_border_width (GTK_CONTAINER (container), 6);
 
 	emfs->flags = flags;
 	if (flags & EM_FOLDER_SELECTOR_CAN_CREATE) {
@@ -190,8 +188,7 @@ em_folder_selector_construct (EMFolderSelector *emfs, EMFolderTree *emft, guint3
 		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (
 		GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
-	gtk_box_pack_end (
-		GTK_BOX (GTK_DIALOG (emfs)->vbox), widget, TRUE, TRUE, 6);
+	gtk_box_pack_end (GTK_BOX (container), widget, TRUE, TRUE, 6);
 	gtk_widget_show (widget);
 
 	emfs->emft = emft;
@@ -206,7 +203,7 @@ em_folder_selector_construct (EMFolderSelector *emfs, EMFolderTree *emft, guint3
 		gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_LEFT);
 		gtk_widget_show (widget);
 
-		gtk_box_pack_end (GTK_BOX (GTK_DIALOG (emfs)->vbox), widget, FALSE, TRUE, 6);
+		gtk_box_pack_end (GTK_BOX (container), widget, FALSE, TRUE, 6);
 	}
 
 	gtk_widget_grab_focus ((GtkWidget *) emfs->emft);
@@ -233,7 +230,7 @@ em_folder_selector_new (GtkWindow *parent,
 static void
 emfs_create_name_activate (GtkEntry *entry, EMFolderSelector *emfs)
 {
-	if (emfs->name_entry->text_length > 0) {
+	if (gtk_entry_get_text_length (emfs->name_entry) > 0) {
 		gchar *path;
 		const gchar *text;
 
@@ -255,6 +252,7 @@ em_folder_selector_create_new (GtkWindow *parent,
 {
 	EMFolderSelector *emfs;
 	GtkWidget *hbox, *w;
+	GtkWidget *container;
 
 	/* remove the CREATE flag if it is there since that's the
 	 * whole purpose of this dialog */
@@ -276,7 +274,8 @@ em_folder_selector_create_new (GtkWindow *parent,
 	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) emfs->name_entry, TRUE, FALSE, 6);
 	gtk_widget_show_all (hbox);
 
-	gtk_box_pack_start ((GtkBox *) ((GtkDialog *) emfs)->vbox, hbox, FALSE, TRUE, 0);
+	container = gtk_dialog_get_content_area (GTK_DIALOG (emfs));
+	gtk_box_pack_start (GTK_BOX (container), hbox, FALSE, TRUE, 0);
 
 	gtk_widget_grab_focus ((GtkWidget *) emfs->name_entry);
 
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 222c1cebd7..37552bb555 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -35,10 +35,6 @@
 
 #include <glib/gi18n.h>
 
-#include <camel/camel-file-utils.h>
-
-#include "e-mail-store.h"
-
 #include "mail-config.h"
 #include "mail-session.h"
 #include "mail-tools.h"
@@ -52,10 +48,8 @@
 #include "em-folder-utils.h"
 #include "em-event.h"
 
-#include <camel/camel-folder.h>
-#include <camel/camel-vee-store.h>
-
 #include "e-mail-local.h"
+#include "e-mail-store.h"
 #include "shell/e-shell.h"
 
 #define d(x)
@@ -106,14 +100,14 @@ static guint signals[LAST_SIGNAL];
 static void
 store_info_free (EMFolderTreeModelStoreInfo *si)
 {
-	camel_object_remove_event (si->store, si->created_id);
-	camel_object_remove_event (si->store, si->deleted_id);
-	camel_object_remove_event (si->store, si->renamed_id);
-	camel_object_remove_event (si->store, si->subscribed_id);
-	camel_object_remove_event (si->store, si->unsubscribed_id);
+	g_signal_handler_disconnect (si->store, si->created_id);
+	g_signal_handler_disconnect (si->store, si->deleted_id);
+	g_signal_handler_disconnect (si->store, si->renamed_id);
+	g_signal_handler_disconnect (si->store, si->subscribed_id);
+	g_signal_handler_disconnect (si->store, si->unsubscribed_id);
 
 	g_free (si->display_name);
-	camel_object_unref (si->store);
+	g_object_unref (si->store);
 	gtk_tree_row_reference_free (si->row);
 	g_hash_table_destroy (si->full_hash);
 	g_free (si);
@@ -243,7 +237,7 @@ account_changed_cb (EAccountList *accounts,
 	}
 
 	em_folder_tree_model_add_store (model, store, account->name);
-	camel_object_unref (store);
+	g_object_unref (store);
 }
 
 static void
@@ -693,7 +687,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
 			unread = total > 0 ? total : 0;
 		}
 
-		camel_object_unref(folder);
+		g_object_unref (folder);
 	}
 
 	/* TODO Maybe this should be handled by mail_get_folderinfo
@@ -875,7 +869,7 @@ folder_subscribed (CamelStore *store,
 	g_signal_emit (model, signals[FOLDER_ADDED], 0, fi->full_name, fi->uri);
 
 done:
-	camel_object_unref (store);
+	g_object_unref (store);
 	camel_folder_info_free (fi);
 }
 
@@ -886,7 +880,7 @@ folder_subscribed_cb (CamelStore *store,
 {
 	CamelFolderInfo *fi;
 
-	camel_object_ref (store);
+	g_object_ref (store);
 	fi = camel_folder_info_clone (event_data);
 
 	mail_async_event_emit (
@@ -919,7 +913,7 @@ folder_unsubscribed (CamelStore *store,
 	em_folder_tree_model_remove_folders (model, si, &iter);
 
 done:
-	camel_object_unref (store);
+	g_object_unref (store);
 	camel_folder_info_free (fi);
 }
 
@@ -930,7 +924,7 @@ folder_unsubscribed_cb (CamelStore *store,
 {
 	CamelFolderInfo *fi;
 
-	camel_object_ref (store);
+	g_object_ref (store);
 	fi = camel_folder_info_clone (event_data);
 
 	mail_async_event_emit (
@@ -950,7 +944,7 @@ folder_created_cb (CamelStore *store,
 	if (camel_store_supports_subscriptions (store))
 		return;
 
-	camel_object_ref (store);
+	g_object_ref (store);
 	fi = camel_folder_info_clone (event_data);
 
 	mail_async_event_emit (
@@ -970,7 +964,7 @@ folder_deleted_cb (CamelStore *store,
 	if (camel_store_supports_subscriptions (store))
 		return;
 
-	camel_object_ref (store);
+	g_object_ref (store);
 	fi = camel_folder_info_clone (event_data);
 
 	mail_async_event_emit (
@@ -978,9 +972,14 @@ folder_deleted_cb (CamelStore *store,
 		folder_unsubscribed_cb, store, fi, model);
 }
 
+typedef struct {
+	gchar *old_base;
+	CamelFolderInfo *new;
+} RenameInfo;
+
 static void
 folder_renamed (CamelStore *store,
-                CamelRenameInfo *info,
+                RenameInfo *info,
                 EMFolderTreeModel *model)
 {
 	EMFolderTreeModelStoreInfo *si;
@@ -1003,7 +1002,7 @@ folder_renamed (CamelStore *store,
 
 	em_folder_tree_model_remove_folders (model, si, &iter);
 
-	parent = g_strdup(info->new->full_name);
+	parent = g_strdup (info->new->full_name);
 	p = strrchr(parent, '/');
 	if (p)
 		*p = 0;
@@ -1026,7 +1025,7 @@ folder_renamed (CamelStore *store,
 	em_folder_tree_model_set_folder_info (model, &iter, si, info->new, TRUE);
 
 done:
-	camel_object_unref (store);
+	g_object_unref (store);
 
 	g_free (info->old_base);
 	camel_folder_info_free (info->new);
@@ -1035,16 +1034,17 @@ done:
 
 static void
 folder_renamed_cb (CamelStore *store,
-                   gpointer event_data,
+                   const gchar *old_name,
+                   CamelFolderInfo *info,
                    EMFolderTreeModel *model)
 {
-	CamelRenameInfo *rinfo, *info = event_data;
+	RenameInfo *rinfo;
 
-	camel_object_ref (store);
+	g_object_ref (store);
 
-	rinfo = g_new0 (CamelRenameInfo, 1);
-	rinfo->old_base = g_strdup (info->old_base);
-	rinfo->new = camel_folder_info_clone (info->new);
+	rinfo = g_new0 (RenameInfo, 1);
+	rinfo->old_base = g_strdup (old_name);
+	rinfo->new = camel_folder_info_clone (info);
 
 	mail_async_event_emit (
 		mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc)
@@ -1095,7 +1095,7 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model,
 
 	si = g_new (EMFolderTreeModelStoreInfo, 1);
 	si->display_name = g_strdup (display_name);
-	camel_object_ref (store);
+	g_object_ref (store);
 	si->store = store;
 	si->account = account;
 	si->row = gtk_tree_row_reference_copy (reference);
@@ -1127,21 +1127,21 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model,
 		-1);
 
 	/* listen to store events */
-	si->created_id = camel_object_hook_event (
-		store, "folder_created",
-		(CamelObjectEventHookFunc) folder_created_cb, model);
-	si->deleted_id = camel_object_hook_event (
-		store, "folder_deleted",
-		(CamelObjectEventHookFunc) folder_deleted_cb, model);
-	si->renamed_id = camel_object_hook_event (
+	si->created_id = g_signal_connect (
+		store, "folder-created",
+		G_CALLBACK (folder_created_cb), model);
+	si->deleted_id = g_signal_connect (
+		store, "folder-deleted",
+		G_CALLBACK (folder_deleted_cb), model);
+	si->renamed_id = g_signal_connect (
 		store, "folder_renamed",
-		(CamelObjectEventHookFunc) folder_renamed_cb, model);
-	si->subscribed_id = camel_object_hook_event (
+		G_CALLBACK (folder_renamed_cb), model);
+	si->subscribed_id = g_signal_connect (
 		store, "folder_subscribed",
-		(CamelObjectEventHookFunc) folder_subscribed_cb, model);
-	si->unsubscribed_id = camel_object_hook_event (
+		G_CALLBACK (folder_subscribed_cb), model);
+	si->unsubscribed_id = g_signal_connect (
 		store, "folder_unsubscribed",
-		(CamelObjectEventHookFunc) folder_unsubscribed_cb, model);
+		G_CALLBACK (folder_unsubscribed_cb), model);
 
 	g_signal_emit (model, signals[LOADED_ROW], 0, path, &root);
 	gtk_tree_path_free (path);
diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index e0a73e03b8..82775ae6bf 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -24,7 +24,7 @@
 #define EM_FOLDER_TREE_MODEL_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 #include <libedataserver/e-account-list.h>
 
 /* Standard GObject macros */
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 371d764d74..219e355cd5 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -39,15 +39,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-stream-fs.h>
-
 #include "e-util/e-account-utils.h"
 #include "e-util/e-mktemp.h"
 #include "e-util/e-icon-factory.h"
@@ -326,7 +317,7 @@ folder_tree_get_folder_info__free (struct _EMFolderTreeGetFolderInfo *m)
 
 	gtk_tree_row_reference_free (m->root);
 	g_object_unref(m->folder_tree);
-	camel_object_unref (m->store);
+	g_object_unref (m->store);
 	g_free (m->top);
 }
 
@@ -350,7 +341,7 @@ folder_tree_free_select_uri (struct _selected_uri *u)
 {
 	g_free (u->uri);
 	if (u->store)
-		camel_object_unref (u->store);
+		g_object_unref (u->store);
 	g_free (u->key);
 	g_free (u->path);
 	g_free (u);
@@ -460,12 +451,12 @@ folder_tree_expand_node (const gchar *key,
 		if (!(store = vfolder_store))
 			return;
 
-		camel_object_ref (store);
+		g_object_ref (store);
 	} else if (!strcmp (uid, "local")) {
 		if (!(store = e_mail_local_get_store ()))
 			return;
 
-		camel_object_ref (store);
+		g_object_ref (store);
 	} else {
 		return;
 	}
@@ -473,11 +464,11 @@ folder_tree_expand_node (const gchar *key,
 	si = em_folder_tree_model_lookup_store_info (
 		EM_FOLDER_TREE_MODEL (model), store);
 	if (si == NULL) {
-		camel_object_unref (store);
+		g_object_unref (store);
 		return;
 	}
 
-	camel_object_unref (store);
+	g_object_unref (store);
 
 	if (p != NULL) {
 		if (!(row = g_hash_table_lookup (si->full_hash, p + 1)))
@@ -932,7 +923,7 @@ folder_tree_row_expanded (GtkTreeView *tree_view,
 
 	msg = mail_msg_new (&get_folder_info_info);
 	msg->root = gtk_tree_row_reference_new (model, path);
-	camel_object_ref (store);
+	g_object_ref (store);
 	msg->store = store;
 	msg->folder_tree = g_object_ref (tree_view);
 	msg->top = full_name;
@@ -1162,7 +1153,9 @@ folder_tree_new (EMFolderTree *folder_tree)
 
 	/* FIXME Gross hack */
 	tree = GTK_WIDGET (folder_tree);
-	GTK_WIDGET_SET_FLAGS(tree, GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus (tree, TRUE);
+
+	folder_tree->priv->selectable = NULL;
 
 	folder_tree->priv->selectable = NULL;
 
@@ -1515,7 +1508,7 @@ tree_drag_data_get(GtkWidget *widget, GdkDragContext *context, GtkSelectionData
 
 			em_utils_selection_set_urilist(selection, folder, uids);
 			camel_folder_free_uids(folder, uids);
-			camel_object_unref(folder);
+			g_object_unref (folder);
 		}
 		break;
 	default:
@@ -1554,25 +1547,39 @@ struct _DragDataReceivedAsync {
 static void
 folder_tree_drop_folder(struct _DragDataReceivedAsync *m)
 {
-	CamelFolder *src;
+	CamelFolder *folder;
+	CamelStore *parent_store;
+	const gchar *full_name;
+	const guchar *data;
 
-	d(printf(" * Drop folder '%s' onto '%s'\n", m->selection->data, m->full_name));
+	data = gtk_selection_data_get_data (m->selection);
 
-	if (!(src = mail_tool_uri_to_folder((gchar *)m->selection->data, 0, &m->base.ex)))
+	d(printf(" * Drop folder '%s' onto '%s'\n", data, m->full_name));
+
+	if (!(folder = mail_tool_uri_to_folder((gchar *)data, 0, &m->base.ex)))
 		return;
 
-	em_folder_utils_copy_folders(src->parent_store, src->full_name, m->store, m->full_name?m->full_name:"", m->move);
-	camel_object_unref(src);
+	full_name = camel_folder_get_full_name (folder);
+	parent_store = camel_folder_get_parent_store (folder);
+
+	em_folder_utils_copy_folders (
+		parent_store, full_name, m->store,
+		m->full_name ? m->full_name : "", m->move);
+
+	g_object_unref (folder);
 }
 
 static gchar *
 folder_tree_drop_async__desc (struct _DragDataReceivedAsync *m)
 {
 	CamelURL *url;
+	const guchar *data;
 	gchar *buf;
 
+	data = gtk_selection_data_get_data (m->selection);
+
 	if (m->info == DND_DROP_TYPE_FOLDER) {
-		url = camel_url_new ((gchar *)m->selection->data, NULL);
+		url = camel_url_new ((gchar *)data, NULL);
 
 		if (m->move)
 			buf = g_strdup_printf (_("Moving folder %s"), url->fragment ? url->fragment : url->path + 1);
@@ -1620,7 +1627,7 @@ folder_tree_drop_async__exec (struct _DragDataReceivedAsync *m)
 		default:
 			abort();
 		}
-		camel_object_unref(folder);
+		g_object_unref (folder);
 	}
 }
 
@@ -1628,11 +1635,9 @@ static void
 folder_tree_drop_async__free (struct _DragDataReceivedAsync *m)
 {
 	g_object_unref(m->context);
-	camel_object_unref(m->store);
+	g_object_unref (m->store);
 	g_free(m->full_name);
-
-	g_free(m->selection->data);
-	g_free(m->selection);
+	gtk_selection_data_free (m->selection);
 }
 
 static MailMsgInfo folder_tree_drop_async_info = {
@@ -1670,7 +1675,12 @@ tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, gint x, gint
 		return;
 
 	/* this means we are receiving no data */
-	if (!selection->data || selection->length == -1) {
+	if (gtk_selection_data_get_data (selection) == NULL) {
+		gtk_drag_finish(context, FALSE, FALSE, GDK_CURRENT_TIME);
+		return;
+	}
+
+	if (gtk_selection_data_get_length (selection) == -1) {
 		gtk_drag_finish(context, FALSE, FALSE, GDK_CURRENT_TIME);
 		return;
 	}
@@ -1696,16 +1706,13 @@ tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, gint x, gint
 	m->context = context;
 	g_object_ref(context);
 	m->store = store;
-	camel_object_ref(store);
+	g_object_ref (store);
 	m->full_name = full_name;
 	m->action = context->action;
 	m->info = info;
 
 	/* need to copy, goes away once we exit */
-	m->selection = g_malloc0(sizeof(*m->selection));
-	m->selection->data = g_malloc(selection->length);
-	memcpy(m->selection->data, selection->data, selection->length);
-	m->selection->length = selection->length;
+	m->selection = gtk_selection_data_copy (selection);
 
 	tree_drag_data_action(m);
 }
@@ -2020,12 +2027,14 @@ tree_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time, EMFolde
 static gboolean
 tree_autoscroll (EMFolderTree *folder_tree)
 {
-	GtkAdjustment *vadjustment;
+	GtkAdjustment *adjustment;
 	GtkTreeView *tree_view;
 	GdkRectangle rect;
 	GdkWindow *window;
 	gint offset, y;
-	gfloat value;
+	gdouble page_size;
+	gdouble upper;
+	gdouble value;
 
 	/* get the y pointer position relative to the treeview */
 	tree_view = GTK_TREE_VIEW (folder_tree);
@@ -2045,10 +2054,14 @@ tree_autoscroll (EMFolderTree *folder_tree)
 			return TRUE;
 	}
 
-	vadjustment = gtk_tree_view_get_vadjustment (tree_view);
+	adjustment = gtk_tree_view_get_vadjustment (tree_view);
+
+	page_size = gtk_adjustment_get_value (adjustment);
+	upper = gtk_adjustment_get_value (adjustment);
+	value = gtk_adjustment_get_value (adjustment);
 
-	value = CLAMP (vadjustment->value + offset, 0.0, vadjustment->upper - vadjustment->page_size);
-	gtk_adjustment_set_value (vadjustment, value);
+	value = CLAMP (value + offset, 0.0, upper - page_size);
+	gtk_adjustment_set_value (adjustment, value);
 
 	return TRUE;
 }
diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h
index b1583df99f..0da27d3926 100644
--- a/mail/em-folder-tree.h
+++ b/mail/em-folder-tree.h
@@ -25,7 +25,7 @@
 #define EM_FOLDER_TREE_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 #include <mail/em-folder-tree-model.h>
 
 /* Standard GObject macros */
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index aee37d7d16..ab810bfa30 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -39,13 +39,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gi18n.h>
 
-#include <camel/camel-session.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-stream-fs.h>
-
 #include "e-util/e-mktemp.h"
 
 #include "e-util/e-alert-dialog.h"
@@ -165,7 +158,7 @@ emft_copy_folders__exec (struct _EMCopyFolders *m)
 						goto exception;
 
 					if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &m->base.ex))) {
-						camel_object_unref (fromfolder);
+						g_object_unref (fromfolder);
 						goto exception;
 					}
 
@@ -176,8 +169,8 @@ emft_copy_folders__exec (struct _EMCopyFolders *m)
 					if (m->delete && !camel_exception_is_set (&m->base.ex))
 						camel_folder_sync(fromfolder, TRUE, NULL);
 
-					camel_object_unref (fromfolder);
-					camel_object_unref (tofolder);
+					g_object_unref (fromfolder);
+					g_object_unref (tofolder);
 				}
 			}
 
@@ -188,7 +181,7 @@ emft_copy_folders__exec (struct _EMCopyFolders *m)
 
 			/* subscribe to the new folder if appropriate */
 			if (camel_store_supports_subscriptions (m->tostore)
-			    && !camel_store_folder_subscribed (m->tostore, toname->str))
+			    && !camel_store_folder_is_subscribed (m->tostore, toname->str))
 				camel_store_subscribe_folder (m->tostore, toname->str, NULL);
 
 			info = info->next;
@@ -224,8 +217,8 @@ emft_copy_folders__exec (struct _EMCopyFolders *m)
 static void
 emft_copy_folders__free (struct _EMCopyFolders *m)
 {
-	camel_object_unref (m->fromstore);
-	camel_object_unref (m->tostore);
+	g_object_unref (m->fromstore);
+	g_object_unref (m->tostore);
 
 	g_free (m->frombase);
 	g_free (m->tobase);
@@ -246,9 +239,9 @@ em_folder_utils_copy_folders(CamelStore *fromstore, const gchar *frombase, Camel
 	gint seq;
 
 	m = mail_msg_new (&copy_folders_info);
-	camel_object_ref (fromstore);
+	g_object_ref (fromstore);
 	m->fromstore = fromstore;
-	camel_object_ref (tostore);
+	g_object_ref (tostore);
 	m->tostore = tostore;
 	m->frombase = g_strdup (frombase);
 	m->tobase = g_strdup (tobase);
@@ -319,9 +312,9 @@ emfu_copy_folder_selected (const gchar *uri, gpointer data)
 	camel_url_free (url);
 fail:
 	if (fromstore)
-		camel_object_unref(fromstore);
+		g_object_unref (fromstore);
 	if (tostore)
-		camel_object_unref(tostore);
+		g_object_unref (tostore);
 	camel_exception_clear (&ex);
 	g_free (cfd);
 }
@@ -410,8 +403,10 @@ emfu_delete_done (CamelFolder *folder, gboolean removed, CamelException *ex, gpo
 		GtkWidget *w;
 
 		w = e_alert_dialog_new_for_args (
-			e_shell_get_active_window (NULL), "mail:no-delete-folder",
-			folder->full_name, camel_exception_get_description (ex), NULL);
+			e_shell_get_active_window (NULL),
+			"mail:no-delete-folder",
+			camel_folder_get_full_name (folder),
+			camel_exception_get_description (ex), NULL);
 		em_utils_show_error_silent (w);
 		camel_exception_clear (ex);
 	}
@@ -438,40 +433,47 @@ void
 em_folder_utils_delete_folder (CamelFolder *folder)
 {
 	CamelStore *local_store;
+	CamelStore *parent_store;
 	GtkWindow *parent = e_shell_get_active_window (NULL);
 	GtkWidget *dialog;
+	const gchar *full_name;
 	gint flags = 0;
 
+	full_name = camel_folder_get_full_name (folder);
+	parent_store = camel_folder_get_parent_store (folder);
+
 	local_store = e_mail_local_get_store ();
 
-	if (folder->parent_store == local_store && emfu_is_special_local_folder (folder->full_name)) {
+	if (parent_store == local_store && emfu_is_special_local_folder (full_name)) {
 		dialog = e_alert_dialog_new_for_args (
 			parent, "mail:no-delete-special-folder",
-			folder->full_name, NULL);
+			full_name, NULL);
 		em_utils_show_error_silent (dialog);
 		return;
 	}
 
 	if (mail_folder_cache_get_folder_info_flags (mail_folder_cache_get_default (), folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM))
 	{
-		e_alert_run_dialog_for_args (parent,"mail:no-delete-special-folder", folder->name, NULL);
+		e_alert_run_dialog_for_args (
+			parent,"mail:no-delete-special-folder",
+			camel_folder_get_name (folder), NULL);
 		return;
 	}
 
-	camel_object_ref (folder);
+	g_object_ref (folder);
 
 	if (mail_folder_cache_get_folder_info_flags (mail_folder_cache_get_default (), folder, &flags) && (flags & CAMEL_FOLDER_CHILDREN)) {
 		dialog = e_alert_dialog_new_for_args (parent,
-			     (folder->parent_store && CAMEL_IS_VEE_STORE(folder->parent_store))?"mail:ask-delete-vfolder":"mail:ask-delete-folder",
-			     folder->full_name, NULL);
+			     (parent_store && CAMEL_IS_VEE_STORE(parent_store))?"mail:ask-delete-vfolder":"mail:ask-delete-folder",
+			     full_name, NULL);
 	}
 	else {
 		dialog = e_alert_dialog_new_for_args (parent,
-			     (folder->parent_store && CAMEL_IS_VEE_STORE(folder->parent_store))?"mail:ask-delete-vfolder-nochild":"mail:ask-delete-folder-nochild",
-			     folder->full_name, NULL);
+			     (parent_store && CAMEL_IS_VEE_STORE(parent_store))?"mail:ask-delete-vfolder-nochild":"mail:ask-delete-folder-nochild",
+			     full_name, NULL);
 	}
 
-	g_object_set_data_full ((GObject *) dialog, "folder", folder, camel_object_unref);
+	g_object_set_data_full ((GObject *) dialog, "folder", folder, g_object_unref);
 	g_signal_connect (dialog, "response", G_CALLBACK (emfu_delete_response), NULL);
 	gtk_widget_show (dialog);
 }
@@ -529,7 +531,7 @@ static void
 emfu_create_folder__free (struct _EMCreateFolder *m)
 {
 	camel_store_free_folder_info (m->store, m->fi);
-	camel_object_unref (m->store);
+	g_object_unref (m->store);
 	g_free (m->full_name);
 	g_free (m->parent);
 	g_free (m->name);
@@ -561,7 +563,7 @@ emfu_create_folder_real (CamelStore *store, const gchar *full_name, void (* done
 	}
 
 	m = mail_msg_new (&create_folder_info);
-	camel_object_ref (store);
+	g_object_ref (store);
 	m->store = store;
 	m->full_name = g_strdup (full_name);
 	m->parent = g_strdup (parent);
@@ -625,7 +627,7 @@ emfu_popup_new_folder_response (EMFolderSelector *emfs, gint response, gpointer
 	si = em_folder_tree_model_lookup_store_info (
 		EM_FOLDER_TREE_MODEL (model), store);
 	if (si == NULL) {
-		camel_object_unref (store);
+		g_object_unref (store);
 		g_return_if_reached();
 	}
 
@@ -651,7 +653,7 @@ emfu_popup_new_folder_response (EMFolderSelector *emfs, gint response, gpointer
 		emfu_create_folder_real (si->store, path, new_folder_created_cb, emcftd);
 	}
 
-	camel_object_unref (store);
+	g_object_unref (store);
 	camel_exception_clear (&ex);
 }
 
diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h
index ec150f3066..ec5882d1aa 100644
--- a/mail/em-folder-utils.h
+++ b/mail/em-folder-utils.h
@@ -25,8 +25,7 @@
 #define EM_FOLDER_UTILS_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 #include <mail/em-folder-tree.h>
 
 G_BEGIN_DECLS
diff --git a/mail/em-folder-view.c.dead b/mail/em-folder-view.c.dead
deleted file mode 100644
index 3f76572f18..0000000000
--- a/mail/em-folder-view.c.dead
+++ /dev/null
@@ -1,1014 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <gdk/gdkkeysyms.h>
-
-#ifdef G_OS_WIN32
-/* Work around 'DATADIR' and 'interface' lossage in <windows.h> */
-#define DATADIR crap_DATADIR
-#include <windows.h>
-#undef DATADIR
-#undef interface
-#endif
-
-#include <gconf/gconf-client.h>
-
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-mime-filter-enriched.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-url.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-disco-store.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-vee-store.h>
-
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-embedded.h>
-#include <gtkhtml/gtkhtml-stream.h>
-
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-msgport.h>
-
-#include "menus/gal-view-etable.h"
-#include "menus/gal-view-factory-etable.h"
-#include "menus/gal-view-instance.h"
-
-#include "misc/e-charset-picker.h"
-#include <misc/e-spinner.h>
-
-#include "e-util/e-error.h"
-#include "e-util/e-dialog-utils.h"
-#include "e-util/e-icon-factory.h"
-#include "e-util/e-print.h"
-#include "e-util/e-profile-event.h"
-#include "e-util/e-util-private.h"
-#include "e-util/e-util-labels.h"
-#include "shell/e-shell.h"
-
-#include "filter/filter-rule.h"
-
-#include "em-format-html-display.h"
-#include "em-format-html-print.h"
-#include "em-folder-selection.h"
-#include "em-folder-view.h"
-#include "em-folder-browser.h"
-#include "em-mailer-prefs.h"
-#include "em-folder-browser.h"
-#include "message-list.h"
-#include "em-utils.h"
-#include "em-composer-utils.h"
-#include "em-menu.h"
-#include "em-event.h"
-#include "e-mail-shell-backend.h"
-
-#include "mail-mt.h"
-#include "mail-ops.h"
-#include "mail-config.h"
-#include "mail-autofilter.h"
-#include "mail-vfolder.h"
-#include "mail-tools.h"
-
-#ifdef HAVE_XFREE
-#include <X11/XF86keysym.h>
-#endif
-
-/* this is added to emfv->enable_map in :init() */
-static const EMFolderViewEnable emfv_enable_map[] = {
-	{ "EditCut",                  EM_POPUP_SELECT_MANY },
-	{ "EditCopy",                 EM_FOLDER_VIEW_SELECT_SELECTION },
-	{ "EditPaste",                EM_POPUP_SELECT_FOLDER },
-//	{ "SelectAllText",            EM_POPUP_SELECT_ONE },
-
-	/* FIXME: should these be single-selection? */
-	{ "MailNext",                 EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_NEXT_MSG },
-//	{ "MailNextFlagged",          EM_POPUP_SELECT_MANY },
-//	{ "MailNextUnread",           EM_POPUP_SELECT_MANY },
-//	{ "MailNextThread",           EM_POPUP_SELECT_MANY },
-	{ "MailPrevious",             EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_PREV_MSG },
-//	{ "MailPreviousFlagged",      EM_POPUP_SELECT_MANY },
-//	{ "MailPreviousUnread",       EM_POPUP_SELECT_MANY },
-
-	{ "AddSenderToAddressbook",   EM_POPUP_SELECT_ADD_SENDER },
-
-//	{ "MessageApplyFilters",      EM_POPUP_SELECT_MANY },
-//	{ "MessageFilterJunk",        EM_POPUP_SELECT_MANY },
-//	{ "MessageCopy",              EM_POPUP_SELECT_MANY },
-//	{ "MessageDelete",            EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_DELETE },
-//	{ "MessageDeleteKey",         EM_POPUP_SELECT_MANY},
-//	{ "MessageForward",           EM_POPUP_SELECT_MANY },
-//	{ "MessageForwardAttached",   EM_POPUP_SELECT_MANY },
-//	{ "MessageForwardInline",     EM_POPUP_SELECT_ONE },
-//	{ "MessageForwardQuoted",     EM_POPUP_SELECT_ONE },
-//	{ "MessageRedirect",          EM_POPUP_SELECT_ONE },
-//	{ "MessageMarkAsRead",        EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_MARK_READ },
-//	{ "MessageMarkAsUnRead",      EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_MARK_UNREAD },
-//	{ "MessageMarkAsImportant",   EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_MARK_IMPORTANT },
-//	{ "MessageMarkAsUnimportant", EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_MARK_UNIMPORTANT },
-//	{ "MessageMarkAsJunk",        EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_JUNK },
-//	{ "MessageMarkAsNotJunk",     EM_POPUP_SELECT_MANY},
-	{ "MessageFollowUpFlag",      EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_FLAG_FOLLOWUP },
-	{ "MessageFollowUpComplete",  EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_FLAG_COMPLETED },
-	{ "MessageFollowUpClear",     EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_FLAG_CLEAR },
-//	{ "MessageMove",              EM_POPUP_SELECT_MANY },
-//	{ "MessageOpen",              EM_POPUP_SELECT_MANY },
-//	{ "MessageReplyAll",          EM_POPUP_SELECT_ONE },
-//	{ "MessageReplyList",         EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST },
-//	{ "MessageReplySender",       EM_POPUP_SELECT_ONE },
-//	{ "MessageEdit",              EM_POPUP_SELECT_ONE },
-//	{ "MessageSaveAs",            EM_POPUP_SELECT_MANY },
-	{ "MessageSearch",            EM_POPUP_SELECT_ONE| EM_FOLDER_VIEW_PREVIEW_PRESENT },
-//	{ "MessageUndelete",          EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_UNDELETE },
-//	{ "PrintMessage",             EM_POPUP_SELECT_ONE },
-//	{ "PrintPreviewMessage",      EM_POPUP_SELECT_ONE },
-
-//	{ "TextZoomIn",		      EM_POPUP_SELECT_ONE },
-//	{ "TextZoomOut",	      EM_POPUP_SELECT_ONE },
-//	{ "TextZoomReset",	      EM_POPUP_SELECT_ONE },
-
-	{ "ToolsFilterMailingList",   EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST},
-	{ "ToolsFilterRecipient",     EM_POPUP_SELECT_ONE },
-	{ "ToolsFilterSender",        EM_POPUP_SELECT_ONE },
-	{ "ToolsFilterSubject",       EM_POPUP_SELECT_ONE },
-	{ "ToolsVFolderMailingList",  EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST},
-	{ "ToolsVFolderRecipient",    EM_POPUP_SELECT_ONE },
-	{ "ToolsVFolderSender",       EM_POPUP_SELECT_ONE },
-	{ "ToolsVFolderSubject",      EM_POPUP_SELECT_ONE },
-
-//	{ "ViewLoadImages",	      EM_POPUP_SELECT_ONE },
-//	{ "ViewSource",               EM_POPUP_SELECT_ONE },
-
-//	/* always enabled */
-//	{ "MailStop", 0 },
-
-	{ NULL },
-};
-
-struct _EMFolderViewPrivate {
-	guint setting_notify_id;
-	guint selected_id;
-	guint nomarkseen:1;
-	guint destroyed:1;
-
-	GtkWidget *invisible;
-	gchar *selection_uri;
-
-	gchar *selected_uid;
-};
-
-static GtkVBoxClass *emfv_parent;
-
-enum {
-	EMFV_ON_URL,
-	EMFV_LOADED,
-	EMFV_CHANGED,
-	LAST_SIGNAL
-};
-
-extern CamelSession *session;
-
-static guint signals[LAST_SIGNAL];
-
-static void
-emfv_init(GObject *o)
-{
-	EMFolderView *emfv = (EMFolderView *)o;
-	struct _EMFolderViewPrivate *p;
-
-//	gtk_box_set_homogeneous (GTK_BOX (emfv), FALSE);
-//
-//	p = emfv->priv = g_malloc0(sizeof(struct _EMFolderViewPrivate));
-//
-//	emfv->statusbar_active = TRUE;
-//	emfv->list_active = FALSE;
-//
-//	emfv->ui_files = g_slist_append(NULL,
-//					g_build_filename (EVOLUTION_UIDIR,
-//							  "evolution-mail-message.xml",
-//							  NULL));
-//
-//	emfv->ui_app_name = "evolution-mail";
-
-	emfv->enable_map = g_slist_prepend(NULL, (gpointer)emfv_enable_map);
-
-//	emfv->list = (MessageList *)message_list_new();
-//	g_signal_connect(emfv->list, "message_selected", G_CALLBACK(emfv_list_message_selected), emfv);
-//	g_signal_connect(emfv->list, "message_list_built", G_CALLBACK(emfv_list_built), emfv);
-//
-//	/* FIXME: should this hang off message-list instead? */
-//	g_signal_connect(emfv->list->tree, "right_click", G_CALLBACK(emfv_list_right_click), emfv);
-//	g_signal_connect(emfv->list->tree, "double_click", G_CALLBACK(emfv_list_double_click), emfv);
-//	g_signal_connect(emfv->list->tree, "key_press", G_CALLBACK(emfv_list_key_press), emfv);
-//	g_signal_connect(emfv->list->tree, "selection_change", G_CALLBACK(emfv_list_selection_change), emfv);
-//
-//	emfv->preview = (EMFormatHTMLDisplay *)em_format_html_display_new();
-//	/* FIXME: set_session should NOT be called here.  Should it be a constructor attribute? */
-//	em_format_set_session ((EMFormat *) emfv->preview, session);
-//	g_signal_connect(emfv->preview, "link_clicked", G_CALLBACK(emfv_format_link_clicked), emfv);
-	g_signal_connect(emfv->preview, "popup_event", G_CALLBACK(emfv_format_popup_event), emfv);
-//	g_signal_connect (emfv->preview, "on_url", G_CALLBACK (emfv_on_url_cb), emfv);
-//	g_signal_connect (((EMFormatHTML *)emfv->preview)->html, "button-release-event", G_CALLBACK (emfv_on_html_button_released_cb), emfv);
-//#ifdef ENABLE_PROFILING
-//	g_signal_connect(emfv->preview, "complete", G_CALLBACK (emfv_format_complete), emfv);
-//#endif
-//	p->invisible = gtk_invisible_new();
-//	g_signal_connect(p->invisible, "selection_get", G_CALLBACK(emfv_selection_get), emfv);
-//	g_signal_connect(p->invisible, "selection_clear_event", G_CALLBACK(emfv_selection_clear_event), emfv);
-//	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);
-
-	emfv->async = mail_async_event_new();
-}
-
-static void
-emfv_class_init(GObjectClass *klass)
-{
-	klass->finalize = emfv_finalise;
-
-	((GtkObjectClass *) klass)->destroy = emfv_destroy;
-
-	((GtkWidgetClass *) klass)->popup_menu = emfv_popup_menu;
-
-	((EMFolderViewClass *) klass)->update_message_style = TRUE;
-
-	((EMFolderViewClass *)klass)->set_folder = emfv_set_folder;
-	((EMFolderViewClass *)klass)->set_folder_uri = emfv_set_folder_uri;
-	((EMFolderViewClass *)klass)->set_message = emfv_set_message;
-	((EMFolderViewClass *)klass)->activate = emfv_activate;
-
-//	((EMFolderViewClass *)klass)->on_url = emfv_on_url;
-
-	signals[EMFV_ON_URL] = g_signal_new ("on-url",
-					     G_OBJECT_CLASS_TYPE (klass),
-					     G_SIGNAL_RUN_LAST,
-					     G_STRUCT_OFFSET (EMFolderViewClass, on_url),
-					     NULL, NULL,
-					     e_marshal_VOID__STRING_STRING,
-					     G_TYPE_NONE,
-					     2, G_TYPE_STRING, G_TYPE_STRING);
-
-	signals[EMFV_LOADED] = g_signal_new("loaded",
-					    G_OBJECT_CLASS_TYPE(klass),
-					    G_SIGNAL_RUN_LAST,
-					    G_STRUCT_OFFSET(EMFolderViewClass, loaded),
-					    NULL, NULL,
-					    g_cclosure_marshal_VOID__VOID,
-					    G_TYPE_NONE,
-					    0);
-
-	signals[EMFV_CHANGED] = g_signal_new("changed",
-					     G_OBJECT_CLASS_TYPE(klass),
-					     G_SIGNAL_RUN_LAST,
-					     G_STRUCT_OFFSET(EMFolderViewClass, changed),
-					     NULL, NULL,
-					     g_cclosure_marshal_VOID__VOID,
-					     G_TYPE_NONE,
-					     0);
-}
-
-//static void
-//emfv_selection_get(GtkWidget *widget, GtkSelectionData *data, guint info, guint time_stamp, EMFolderView *emfv)
-//{
-//	struct _EMFolderViewPrivate *p = emfv->priv;
-//
-//	if (p->selection_uri == NULL)
-//		return;
-//
-//	gtk_selection_data_set(data, data->target, 8, (guchar *)p->selection_uri, strlen(p->selection_uri));
-//}
-
-//static void
-//emfv_selection_clear_event(GtkWidget *widget, GdkEventSelection *event, EMFolderView *emfv)
-//{
-//#if 0 /* do i care? */
-//	struct _EMFolderViewPrivate *p = emfv->priv;
-//
-//	g_free(p->selection_uri);
-//	p->selection_uri = NULL;
-//#endif
-//}
-
-/* ********************************************************************** */
-
-/* Popup menu
-   In many cases these are the functions called by the bonobo callbacks too */
-
-/* ********************************************************************** */
-
-/* Bonobo menu's */
-
-/* a lot of stuff maps directly to the popup menu equivalent */
-#define EMFV_MAP_CALLBACK(from, to)				\
-static void							\
-from(BonoboUIComponent *uid, gpointer data, const gchar *path)	\
-{								\
-	to(NULL, NULL, data);					\
-}
-
-static void
-emfv_edit_cut(BonoboUIComponent *uid, gpointer data, const gchar *path)
-{
-	EMFolderView *emfv = data;
-
-	if (GTK_WIDGET_HAS_FOCUS(emfv->preview->formathtml.html))
-		em_format_html_display_cut(emfv->preview);
-	else
-		message_list_copy(emfv->list, TRUE);
-}
-
-static void
-emfv_edit_copy(BonoboUIComponent *uid, gpointer data, const gchar *path)
-{
-	EMFolderView *emfv = data;
-
-	if (GTK_WIDGET_HAS_FOCUS(emfv->preview->formathtml.html))
-		em_format_html_display_copy(emfv->preview);
-	else
-		message_list_copy(emfv->list, FALSE);
-}
-
-static void
-emfv_edit_paste(BonoboUIComponent *uid, gpointer data, const gchar *path)
-{
-	EMFolderView *emfv = data;
-
-	message_list_paste(emfv->list);
-}
-
-//static void
-//emp_uri_popup_vfolder_sender(EPopup *ep, EPopupItem *pitem, gpointer data)
-//{
-//	EMFolderView *emfv = data;
-//	EMPopupTargetURI *t = (EMPopupTargetURI *)ep->target;
-//	CamelURL *url;
-//	CamelInternetAddress *addr;
-//
-//	url = camel_url_new(t->uri, NULL);
-//	if (url == NULL) {
-//		g_warning("cannot parse url '%s'", t->uri);
-//		return;
-//	}
-//
-//	if (url->path && url->path[0]) {
-//		/* ensures vfolder is running */
-//		vfolder_load_storage ();
-//
-//		addr = camel_internet_address_new ();
-//		camel_address_decode (CAMEL_ADDRESS (addr), url->path);
-//		vfolder_gui_add_from_address (addr, AUTO_FROM, emfv->folder_uri);
-//		camel_object_unref (addr);
-//	}
-//
-//	camel_url_free(url);
-//
-//}
-
-//static void
-//emp_uri_popup_vfolder_recipient(EPopup *ep, EPopupItem *pitem, gpointer data)
-//{
-//	EMFolderView *emfv = data;
-//	EMPopupTargetURI *t = (EMPopupTargetURI *)ep->target;
-//	CamelURL *url;
-//	CamelInternetAddress *addr;
-//
-//	url = camel_url_new(t->uri, NULL);
-//	if (url == NULL) {
-//		g_warning("cannot parse url '%s'", t->uri);
-//		return;
-//	}
-//
-//	if (url->path && url->path[0]) {
-//		/* ensures vfolder is running */
-//		vfolder_load_storage ();
-//
-//		addr = camel_internet_address_new ();
-//		camel_address_decode (CAMEL_ADDRESS (addr), url->path);
-//		vfolder_gui_add_from_address (addr, AUTO_TO, emfv->folder_uri);
-//		camel_object_unref (addr);
-//	}
-//
-//	camel_url_free(url);
-//}
-
-/* ********************************************************************** */
-
-static BonoboUIVerb emfv_message_verbs[] = {
-	BONOBO_UI_UNSAFE_VERB ("EditCut", emfv_edit_cut),
-	BONOBO_UI_UNSAFE_VERB ("EditCopy", emfv_edit_copy),
-	BONOBO_UI_UNSAFE_VERB ("EditPaste", emfv_edit_paste),
-
-//	BONOBO_UI_UNSAFE_VERB ("SelectAllText", emfv_select_all_text),
-
-//	BONOBO_UI_UNSAFE_VERB ("MessageDelete", emfv_message_delete),
-//	BONOBO_UI_UNSAFE_VERB ("MessageDeleteKey", emfv_message_delete),
-//	BONOBO_UI_UNSAFE_VERB ("MessageOpen", emfv_message_open),
-//	BONOBO_UI_UNSAFE_VERB ("MessageSearch", emfv_message_search),
-
-//	BONOBO_UI_UNSAFE_VERB ("ViewSource", emfv_message_source),
-
-	BONOBO_UI_VERB_END
-};
-
-static void
-emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint act)
-{
-
-	if (act) {
-		em_format_mode_t style;
-		gboolean state;
-		GSList *l;
-
-		emfv->uic = uic;
-
-		for (l = emfv->ui_files;l;l = l->next)
-			bonobo_ui_util_set_ui(uic, PREFIX, (gchar *)l->data, emfv->ui_app_name, NULL);
-
-		bonobo_ui_component_add_verb_list_with_data(uic, emfv_message_verbs, emfv);
-		/* must do plugin menu's after main ones because of bonobo bustedness */
-		if (emfv->menu)
-			e_menu_activate((EMenu *)emfv->menu, uic, act);
-
-//		state = emfv->preview->caret_mode;
-//		bonobo_ui_component_set_prop(uic, "/commands/CaretMode", "state", state?"1":"0", NULL);
-//		bonobo_ui_component_add_listener(uic, "CaretMode", emfv_caret_mode, emfv);
-
-//		style = ((EMFormat *)emfv->preview)->mode?EM_FORMAT_ALLHEADERS:EM_FORMAT_NORMAL;
-//		if (style)
-//			bonobo_ui_component_set_prop(uic, "/commands/ViewFullHeaders", "state", "1", NULL);
-//		bonobo_ui_component_add_listener(uic, "ViewFullHeaders", emfv_view_mode, emfv);
-//		em_format_set_mode((EMFormat *)emfv->preview, style);
-
-		if (emfv->folder)
-			bonobo_ui_component_set_prop(uic, "/commands/MessageEdit", "sensitive", "0", NULL);
-
-//		/* default charset used in mail view */
-//		e_charset_picker_bonobo_ui_populate (uic, "/menu/View", _("Default"), emfv_charset_changed, emfv);
-
-		emfv_enable_menus(emfv);
-		if (emfv->statusbar_active)
-			bonobo_ui_component_set_translate (uic, "/", "<status><item name=\"main\"/></status>", NULL);
-
-		/* We need to set this up to get the right view options for the message-list, even if we're not showing it */
-		if (emfv->folder)
-			emfv_setup_view_instance(emfv);
-	} else {
-		const BonoboUIVerb *v;
-
-		if (emfv->menu)
-			e_menu_activate((EMenu *)emfv->menu, uic, act);
-
-		/* TODO: Should this just rm /? */
-		for (v = &emfv_message_verbs[0]; v->cname; v++)
-			bonobo_ui_component_remove_verb(uic, v->cname);
-
-		if (emfv->folder)
-			mail_sync_folder(emfv->folder, NULL, NULL);
-
-		emfv->uic = NULL;
-	}
-}
-
-EMPopupTargetSelect *
-em_folder_view_get_popup_target(EMFolderView *emfv, EMPopup *emp, gint on_display)
-{
-	EMPopupTargetSelect *t;
-
-	t = em_popup_target_new_select(emp, emfv->folder, emfv->folder_uri, message_list_get_selected(emfv->list));
-	t->target.widget = (GtkWidget *)emfv;
-
-	if (emfv->list->threaded)
-		t->target.mask &= ~EM_FOLDER_VIEW_SELECT_THREADED;
-
-	if (message_list_hidden(emfv->list) != 0)
-		t->target.mask &= ~EM_FOLDER_VIEW_SELECT_HIDDEN;
-
-	if (message_list_can_select(emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0))
-		t->target.mask &= ~EM_FOLDER_VIEW_SELECT_NEXT_MSG;
-
-	if (message_list_can_select(emfv->list, MESSAGE_LIST_SELECT_PREVIOUS, 0, 0))
-		t->target.mask &= ~EM_FOLDER_VIEW_SELECT_PREV_MSG;
-
-	if (on_display)
-		t->target.mask &= ~EM_FOLDER_VIEW_SELECT_DISPLAY;
-	else
-		t->target.mask &= ~EM_FOLDER_VIEW_SELECT_LISTONLY;
-
-	if (gtk_html_command (((EMFormatHTML *)emfv->preview)->html, "is-selection-active"))
-		t->target.mask &= ~EM_FOLDER_VIEW_SELECT_SELECTION;
-	else
-		t->target.mask &= ~EM_FOLDER_VIEW_SELECT_NOSELECTION;
-
-	if (emfv->preview_active)
-		t->target.mask &= ~EM_FOLDER_VIEW_PREVIEW_PRESENT;
-
-	/* See bug 352980 */
-	/* See bug #54770 */
-	/* if (!emfv->hide_deleted)
-		t->target.mask &= ~EM_POPUP_SELECT_DELETE;*/
-
-	return t;
-}
-
-void
-em_folder_view_set_hide_deleted(EMFolderView *emfv, gboolean status)
-{
-	if (emfv->folder && (emfv->folder->folder_flags & CAMEL_FOLDER_IS_TRASH))
-		status = FALSE;
-
-	emfv->hide_deleted = status;
-
-	if (emfv->folder) {
-		message_list_set_hidedeleted(emfv->list, status);
-		g_signal_emit(emfv, signals[EMFV_CHANGED], 0);
-	}
-}
-
-/* ********************************************************************** */
-
-struct mst_t {
-	EMFolderView *emfv;
-	gchar *uid;
-};
-
-static void
-mst_free (struct mst_t *mst)
-{
-	mst->emfv->list->seen_id = 0;
-
-	g_free (mst->uid);
-	g_free (mst);
-}
-
-static gint
-do_mark_seen (gpointer user_data)
-{
-	struct mst_t *mst = user_data;
-	EMFolderView *emfv = mst->emfv;
-	MessageList *list = emfv->list;
-
-	if (mst->uid && list->cursor_uid && !strcmp (mst->uid, list->cursor_uid))
-		emfv_set_seen (emfv, mst->uid);
-
-	return FALSE;
-}
-
-static void
-emfv_list_done_message_selected(CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data, CamelException *ex)
-{
-	EMFolderView *emfv = data;
-	EMEvent *eme;
-	EMEventTargetMessage *target;
-	EShell *shell;
-
-	if (emfv->preview == NULL) {
-		emfv->priv->nomarkseen = FALSE;
-		emfv_enable_menus(emfv);
-		g_object_unref (emfv);
-		return;
-
-	}
-
-	e_profile_event_emit("goto.loaded", emfv->displayed_uid, 0);
-
-	shell = e_shell_backend_get_shell (mail_shell_backend);
-	e_shell_event (shell, "mail-icon", "evolution-mail");
-
-	/** @Event: message.reading
-	 * @Title: Viewing a message
-	 * @Target: EMEventTargetMessage
-	 *
-	 * message.reading is emitted whenever a user views a message.
-	 */
-	/* TODO: do we emit a message.reading with no message when we're looking at nothing or don't care? */
-	eme = em_event_peek();
-	target = em_event_target_new_message(eme, folder, msg, uid, 0, NULL);
-	e_event_emit((EEvent *)eme, "message.reading", (EEventTarget *)target);
-
-	em_format_format((EMFormat *)emfv->preview, folder, uid, msg);
-
-	if (emfv->list->seen_id)
-		g_source_remove(emfv->list->seen_id);
-
-	if (msg && emfv->mark_seen && !emfv->priv->nomarkseen) {
-		if (emfv->mark_seen_timeout > 0) {
-			struct mst_t *mst;
-
-			mst = g_new (struct mst_t, 1);
-			mst->emfv = emfv;
-			mst->uid = g_strdup (uid);
-
-			emfv->list->seen_id = g_timeout_add_full(G_PRIORITY_DEFAULT_IDLE, emfv->mark_seen_timeout,
-								 (GSourceFunc)do_mark_seen, mst, (GDestroyNotify)mst_free);
-		} else {
-			emfv_set_seen (emfv, uid);
-		}
-	} else if (camel_exception_is_set(ex)) {
-		GtkHTMLStream *hstream = gtk_html_begin(((EMFormatHTML *)emfv->preview)->html);
-
-		/* Display the error inline rather than popping up an annoying box.
-		   We also clear the exception, this stops the box popping up */
-
-		gtk_html_stream_printf(hstream, "<h2>%s</h2><p>%s</p>",
-				       _("Unable to retrieve message"),
-				       ex->desc);
-		gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK);
-		camel_exception_clear(ex);
-	}
-
-	emfv->priv->nomarkseen = FALSE;
-	emfv_enable_menus(emfv);
-	g_object_unref (emfv);
-}
-
-static gboolean
-emfv_message_selected_timeout(gpointer data)
-{
-	EMFolderView *emfv = data;
-
-	if (emfv->priv->selected_uid) {
-		if (emfv->displayed_uid == NULL || strcmp(emfv->displayed_uid, emfv->priv->selected_uid) != 0) {
-			/*GtkHTMLStream *hstream;*/
-
-			g_free(emfv->displayed_uid);
-			emfv->displayed_uid = emfv->priv->selected_uid;
-			emfv->priv->selected_uid = NULL;
-			g_object_ref (emfv);
-			/* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */
-			e_profile_event_emit("goto.load", emfv->displayed_uid, 0);
-			mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_msg_fast_ordered_push);
-		} else {
-			e_profile_event_emit("goto.empty", "", 0);
-			g_free(emfv->priv->selected_uid);
-			emfv->priv->selected_uid = NULL;
-		}
-	} else {
-		e_profile_event_emit("goto.empty", "", 0);
-		g_free(emfv->displayed_uid);
-		emfv->displayed_uid = NULL;
-		em_format_format((EMFormat *)emfv->preview, NULL, NULL, NULL);
-		emfv->priv->nomarkseen = FALSE;
-	}
-
-	emfv->priv->selected_id = 0;
-
-	return FALSE;
-}
-
-static gboolean
-emfv_popup_menu (GtkWidget *widget)
-{
-	gboolean ret = FALSE;
-	EMFolderView *emfv = (EMFolderView *)widget;
-
-	/* Try to bring up menu for preview html object.
-	   Currently we cannot directly connect to html's "popup_menu" signal
-	   since it doesn't work.
-	*/
-
-	if (GTK_WIDGET_HAS_FOCUS (emfv->preview->formathtml.html))
-		ret = em_format_html_display_popup_menu (emfv->preview);
-
-	if (!ret)
-		emfv_popup (emfv, NULL, FALSE);
-
-	return TRUE;
-}
-
-//static void
-//emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, gpointer data)
-//{
-//	EMFolderView *emfv = data;
-//	struct _EMFolderViewPrivate *p = emfv->priv;
-//
-//	g_free(p->selection_uri);
-//	p->selection_uri = em_utils_url_unescape_amp(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 EPopupItem emfv_uri_popups[] = {
-//	{ E_POPUP_ITEM, (gchar *) "00.uri.15", (gchar *) N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, (gchar *) "edit-copy", EM_POPUP_URI_NOT_MAILTO },
-
-//	{ E_POPUP_SUBMENU, (gchar *) "99.uri.00", (gchar *) N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO },
-//	{ E_POPUP_ITEM, (gchar *) "99.uri.00/00.10", (gchar *) N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO },
-//	{ E_POPUP_ITEM, (gchar *) "99.uri.00/00.00", (gchar *) N_("_To this Address"), emp_uri_popup_vfolder_recipient, NULL, NULL, EM_POPUP_URI_MAILTO },
-};
-
-static void
-emfv_uri_popup_free(EPopup *ep, GSList *list, gpointer data)
-{
-	while (list) {
-		GSList *n = list->next;
-		struct _EPopupItem *item = list->data;
-
-		g_free(item->user_data);
-		item->user_data = NULL;
-		g_free (item);
-		g_slist_free_1(list);
-
-		list = n;
-	}
-}
-
-static void
-emfv_free_em_popup (gpointer emp)
-{
-	EPopup *ep = (EPopup *)emp;
-
-	if (!ep)
-		return;
-
-	if (ep->target) {
-		/* without this the next unref on ep does nothing */
-		e_popup_target_free (ep, ep->target);
-		ep->target = NULL;
-	}
-
-	g_object_unref (ep);
-}
-
-static GtkMenu *
-emfv_append_menu (EMPopup *des_emp, GtkMenu *des_menu, EMPopup *src_emp, GtkMenu *src_menu)
-{
-	GtkWidget *separator;
-	GList *children, *p;
-	gchar *name;
-
-	if (!src_menu)
-		return des_menu;
-
-	if (!des_menu)
-		return src_menu;
-
-	separator = gtk_separator_menu_item_new ();
-	gtk_widget_show (separator);
-	gtk_menu_shell_append (GTK_MENU_SHELL (des_menu), separator);
-
-	children = gtk_container_get_children (GTK_CONTAINER (src_menu));
-	for (p = children; p; p = p->next) {
-		g_object_ref (p->data);
-		gtk_container_remove (GTK_CONTAINER (src_menu), p->data);
-		gtk_menu_shell_append (GTK_MENU_SHELL (des_menu), p->data);
-		g_object_unref (p->data);
-	}
-
-	g_list_free (children);
-	gtk_widget_destroy (GTK_WIDGET (src_menu));
-
-	/* free src_emp together with des_emp; name contains unique identifier */
-	name = g_strdup_printf ("emp_%p", (gpointer) src_emp);
-	g_object_set_data_full (G_OBJECT (des_emp), name, src_emp, emfv_free_em_popup);
-	g_free (name);
-
-	return des_menu;
-}
-
-static gint
-emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const gchar *uri, CamelMimePart *part, EMFolderView *emfv)
-{
-	GtkMenu *menu = NULL;
-	EMPopup *main_emp = NULL;
-
-	if (uri == NULL && part == NULL) {
-		/* So we don't try and popup with nothing selected - rather odd result! */
-		GPtrArray *uids = message_list_get_selected(emfv->list);
-		gint doit = uids->len > 0;
-
-		message_list_free_uids(emfv->list, uids);
-		if (doit)
-			emfv_popup(emfv, (GdkEvent *)event, TRUE);
-		return doit;
-	}
-
-	/* FIXME: this maybe should just fit on em-html-display, it has access to the
-	   snooped part type */
-
-	/** @HookPoint-EMPopup: Inline URI Context Menu
-	 * @Id: org.gnome.evolution.mail.folderview.popup
-	 * @Class: org.gnome.evolution.mail.popup:1.0
-	 * @Target: EMPopupTargetURI
-	 *
-	 * This is the context menu shown when clicking on inline URIs,
-	 * including addresses or normal HTML links that are displayed inside
-	 * the message view.
-	 */
-
-	/** @HookPoint-EMPopup: Inline Object Context Menu
-	 * @Id: org.gnome.evolution.mail.folderview.popup
-	 * @Class: org.gnome.evolution.mail.popup:1.0
-	 * @Target: EMPopupTargetPart
-	 *
-	 * This is the context menu shown when clicking on inline
-	 * content such as a picture.
-	 */
-
-	if (uri) {
-		gboolean have_more_uris = strchr (uri, '\n') != NULL;
-		const gchar *act, *next;
-
-		for (act = uri; act; act = next) {
-			gchar *u;
-			next = strchr (act, '\n');
-			if (next) {
-				u = g_strndup (act, next - act);
-				next++;
-			} else
-				u = g_strdup (act);
-
-			if (u && *u) {
-				GSList *menus = NULL;
-				gint i;
-				EMPopupTargetURI *t;
-				EMPopup *emp;
-				EPopupTarget *target;
-				GtkMenu *mymenu;
-
-				emp = em_popup_new ("org.gnome.evolution.mail.folderview.popup");
-				t = em_popup_target_new_uri(emp, u);
-				target = (EPopupTarget *)t;
-
-				for (i = 0; i < sizeof (emfv_uri_popups)/sizeof (emfv_uri_popups[0]); i++) {
-					EPopupItem *itm = g_malloc0 (sizeof (EPopupItem));
-
-					memcpy (itm, &emfv_uri_popups[i], sizeof (EPopupItem));
-					itm->user_data = g_strdup (t->uri);
-					menus = g_slist_prepend (menus, itm);
-				}
-				e_popup_add_items ((EPopup *)emp, menus, NULL, emfv_uri_popup_free, emfv);
-				mymenu = e_popup_create_menu_once ((EPopup *)emp, target, 0);
-
-				if (have_more_uris) {
-					GtkWidget *item;
-
-					if (strlen (u) > 100) {
-						GString *str;
-						gchar *c;
-
-						/* the url should be in the form of http://a.b.c/... and we want to
-						   see where the image comes from, so skip first 10 characters and
-						   find the first '/' there */
-						c = strchr (u + 10, '/');
-						if (!c)
-							str = g_string_new_len (u, 40);
-						else
-							str = g_string_new_len (u, MAX (c - u + 1, 40));
-
-						g_string_append (str, "...");
-						g_string_append (str, u + strlen (u) - 40);
-
-						item = gtk_menu_item_new_with_label (str->str);
-
-						g_string_free (str, TRUE);
-					} else
-						item = gtk_menu_item_new_with_label (u);
-
-					gtk_widget_set_sensitive (item, FALSE);
-					gtk_widget_show (item);
-					gtk_menu_shell_insert (GTK_MENU_SHELL (mymenu), item, 0);
-				}
-
-				menu = emfv_append_menu (main_emp, menu, emp, mymenu);
-				if (!main_emp)
-					main_emp = emp;
-			}
-
-			g_free (u);
-		}
-	}
-
-	if (part) {
-		EMPopup *emp;
-		EPopupTarget *target;
-
-		emp = em_popup_new ("org.gnome.evolution.mail.folderview.popup");
-		target = (EPopupTarget *)em_popup_target_new_part(emp, part, NULL);
-
-		menu = emfv_append_menu (main_emp, menu, emp, e_popup_create_menu_once ((EPopup *)emp, target, 0));
-		if (!main_emp)
-			main_emp = emp;
-	}
-
-	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, event->time);
-
-	return TRUE;
-}
-
-static void
-emfv_set_seen(EMFolderView *emfv, const gchar *uid)
-{
-	guint32 old_flags = camel_folder_get_message_flags(emfv->folder, uid);
-
-	/* If we're setting the SEEN flag on a message, handle receipt requests */
-	if (!(old_flags & CAMEL_MESSAGE_SEEN))
-		em_utils_handle_receipt(emfv->folder, uid, (CamelMimeMessage *)((EMFormat *)emfv->preview)->message);
-
-	camel_folder_set_message_flags(emfv->folder, uid, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
-}
-
-/* keep these two tables in sync */
-enum {
-	EMFV_CHARSET = 1,
-	EMFV_HEADERS,
-	EMFV_SHOW_DELETED,
-	EMFV_SETTINGS		/* last, for loop count */
-};
-
-/* IF these get too long, update key field */
-static const gchar * const emfv_display_keys[] = {
-	"charset",
-	"headers",
-	"show_deleted",
-};
-
-static GHashTable *emfv_setting_key;
-
-static void
-emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFolderView *emfv)
-{
-	GConfValue *value;
-	gchar *tkey;
-
-	g_return_if_fail (gconf_entry_get_key (entry) != NULL);
-
-	if (!(value = gconf_entry_get_value (entry)))
-		return;
-
-	tkey = strrchr(entry->key, '/');
-	g_return_if_fail (tkey != NULL);
-
-	switch (GPOINTER_TO_INT(g_hash_table_lookup(emfv_setting_key, tkey+1))) {
-	case EMFV_CHARSET:
-		em_format_set_default_charset((EMFormat *)emfv->preview, gconf_value_get_string (value));
-		break;
-	case EMFV_HEADERS: {
-		GSList *header_config_list, *p;
-		EMFormat *emf = (EMFormat *)emfv->preview;
-
-		header_config_list = gconf_client_get_list(gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, NULL);
-		em_format_clear_headers((EMFormat *)emfv->preview);
-		p = header_config_list;
-		while (p) {
-			EMMailerPrefsHeader *h;
-			gchar *xml = (gchar *)p->data;
-
-			h = em_mailer_prefs_header_from_xml(xml);
-			if (h && h->enabled) {
-				em_format_add_header(emf, h->name, EM_FORMAT_HEADER_BOLD);
-			}
-			em_mailer_prefs_header_free(h);
-			p = g_slist_next(p);
-		}
-		g_slist_foreach(header_config_list, (GFunc) g_free, NULL);
-		g_slist_free(header_config_list);
-		/* force a redraw */
-		if (emf->message)
-			em_format_redraw(emf);
-		break; }
-	case EMFV_SHOW_DELETED: {
-		gboolean state;
-
-		state = gconf_value_get_bool (value);
-		em_folder_view_set_hide_deleted (emfv, !state);
-		/* Set the prop only if the component has already been
-		 * activated. */
-		if (emfv->uic)
-			bonobo_ui_component_set_prop (emfv->uic, "/commands/HideDeleted", "state", state ? "0" : "1", NULL);
-		break; }
-	}
-}
diff --git a/mail/em-folder-view.h.dead b/mail/em-folder-view.h.dead
deleted file mode 100644
index 2c276914c0..0000000000
--- a/mail/em-folder-view.h.dead
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef EM_FOLDER_VIEW_H
-#define EM_FOLDER_VIEW_H
-
-#include <gtk/gtk.h>
-#include <bonobo/bonobo-ui-component.h>
-
-#include "mail/em-format-html-display.h"
-#include "mail/em-menu.h"
-#include "mail/em-popup.h"
-#include "mail/mail-mt.h"
-#include "mail/message-list.h"
-
-/* Standard GObject macros */
-#define EM_TYPE_FOLDER_VIEW \
-	(em_folder_view_get_type ())
-#define EM_FOLDER_VIEW(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), EM_TYPE_FOLDER_VIEW, EMFolderView))
-#define EM_FOLDER_VIEW_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), EM_TYPE_FOLDER_VIEW, EMFolderViewClass))
-#define EM_IS_FOLDER_VIEW(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), EM_TYPE_FOLDER_VIEW))
-#define EM_IS_FOLDER_VIEW_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), EM_TYPE_FOLDER_VIEW))
-#define EM_FOLDER_VIEW_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), EM_TYPE_FOLDER_VIEW, EMFolderViewClass))
-
-G_BEGIN_DECLS
-
-typedef struct _EMFolderView EMFolderView;
-typedef struct _EMFolderViewClass EMFolderViewClass;
-
-typedef struct _EMFolderViewEnable EMFolderViewEnable;
-
-enum {
-	EM_FOLDER_VIEW_SELECT_THREADED = EM_POPUP_SELECT_LAST,
-	EM_FOLDER_VIEW_SELECT_HIDDEN = EM_POPUP_SELECT_LAST<<1,
-	EM_FOLDER_VIEW_SELECT_NEXT_MSG = EM_POPUP_SELECT_LAST<<2,
-	EM_FOLDER_VIEW_SELECT_PREV_MSG = EM_POPUP_SELECT_LAST<<3,
-	EM_FOLDER_VIEW_SELECT_LISTONLY = EM_POPUP_SELECT_LAST<<4,
-	EM_FOLDER_VIEW_SELECT_DISPLAY = EM_POPUP_SELECT_LAST<<5,
-	EM_FOLDER_VIEW_SELECT_SELECTION = EM_POPUP_SELECT_LAST<<6,
-	EM_FOLDER_VIEW_SELECT_NOSELECTION = EM_POPUP_SELECT_LAST<<7,
-	EM_FOLDER_VIEW_PREVIEW_PRESENT = EM_POPUP_SELECT_LAST<<8,
-	EM_FOLDER_VIEW_SELECT_LAST = EM_POPUP_SELECT_LAST<<9
-};
-
-struct _EMFolderViewEnable {
-	const gchar *name;	/* bonobo name, relative to /commands/ */
-	guint32 mask;		/* disable mask, see EM_FOLDER_VIEW_CAN* flags */
-};
-
-struct _EMFolderView {
-	GtkVBox parent;
-
-	struct _EMFolderViewPrivate *priv;
-
-	MessageList *list;
-
-	EMFormatHTMLDisplay *preview;
-
-	CamelFolder *folder;
-	gchar *folder_uri;
-
-	gchar *displayed_uid;	/* only used to stop re-loads, don't use it to represent any selection state */
-
-	/* used to load ui from base activate implementation */
-	GSList *ui_files;	/* const gchar * list, TODO: should this be on class? */
-	const gchar *ui_app_name;
-
-	/* used to manage some menus, particularly plugins */
-	EMMenu *menu;
-
-	/* for proxying jobs to main or other threads */
-	MailAsyncEvent *async;
-
-	BonoboUIComponent *uic;	/* if we're active, this will be set */
-	GSList *enable_map;	/* bonobo menu enable map, entries are 0-terminated EMFolderViewEnable arryas
-				   TODO: should this be on class? */
-
-	gint mark_seen_timeout;	/* local copy of gconf stuff */
-	guint mark_seen:1;
-	guint preview_active:1;	/* is preview being used */
-	guint statusbar_active:1; /* should we manage the statusbar messages ourselves? */
-	guint hide_deleted:1;
-	guint list_active:1;	/* we actually showing the list? */
-};
-
-struct _EMFolderViewClass {
-	GtkVBoxClass parent_class;
-
-	/* behaviour definition */
-	guint update_message_style:1;
-
-	/* if used as a control, used to activate/deactivate custom menu's */
-	void (*activate)(EMFolderView *, BonoboUIComponent *uic, gint state);
-
-	void (*set_folder_uri)(EMFolderView *emfv, const gchar *uri);
-	void (*set_folder)(EMFolderView *emfv, CamelFolder *folder, const gchar *uri);
-	void (*set_message)(EMFolderView *emfv, const gchar *uid, gint nomarkseen);
-
-	void (*show_search_bar)(EMFolderView *emfv);
-
-	/* Signals */
-	void (*on_url)(EMFolderView *emfv, const gchar *uri, const gchar *nice_uri);
-
-	void (*loaded)(EMFolderView *emfv);
-	void (*changed)(EMFolderView *emfv);
-};
-
-GType em_folder_view_get_type(void);
-
-GtkWidget *em_folder_view_new(void);
-
-#define em_folder_view_activate(emfv, uic, state) EM_FOLDER_VIEW_GET_CLASS (emfv)->activate((emfv), (uic), (state))
-#define em_folder_view_set_folder(emfv, folder, uri) EM_FOLDER_VIEW_GET_CLASS (emfv)->set_folder((emfv), (folder), (uri))
-#define em_folder_view_set_folder_uri(emfv, uri) EM_FOLDER_VIEW_GET_CLASS (emfv)->set_folder_uri((emfv), (uri))
-#define em_folder_view_set_message(emfv, uid, nomarkseen) EM_FOLDER_VIEW_GET_CLASS (emfv)->set_message((emfv), (uid), (nomarkseen))
-
-void em_folder_view_select_next_message(EMFolderView *emfv, gint count, gboolean always_can_previous);
-void em_folder_view_message_reply(EMFolderView *emfv, gint mode);
-
-EMPopupTargetSelect *em_folder_view_get_popup_target(EMFolderView *emfv, EMPopup *emp, gint on_display);
-
-gint em_folder_view_mark_selected(EMFolderView *emfv, guint32 mask, guint32 set);
-gint em_folder_view_open_selected(EMFolderView *emfv);
-
-gint em_folder_view_print(EMFolderView *emfv, GtkPrintOperationAction action);
-
-/* this could be on message-list */
-guint32 em_folder_view_disable_mask(EMFolderView *emfv);
-
-void em_folder_view_set_statusbar(EMFolderView *emfv, gboolean statusbar);
-void em_folder_view_set_hide_deleted(EMFolderView *emfv, gboolean status);
-void em_folder_view_setup_view_instance (EMFolderView *emfv);
-void em_folder_view_show_search_bar (EMFolderView *emfv);
-
-G_END_DECLS
-
-#endif /* EM_FOLDER_VIEW_H */
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index 78c46d99b4..cab253f24a 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -66,7 +66,8 @@ static void
 emfh_format_format (EMFormat *md,
                     CamelStream *stream,
                     CamelMimePart *part,
-                    const EMFormatHandler *info)
+                    const EMFormatHandler *info,
+                    gboolean is_fallback)
 {
 	struct _EMFormatHookItem *item = (EMFormatHookItem *)info;
 
@@ -77,7 +78,7 @@ emfh_format_format (EMFormat *md,
 
 		e_plugin_invoke(item->hook->hook.plugin, item->format, &target);
 	} else if (info->old) {
-		info->old->handler(md, stream, part, info->old);
+		info->old->handler(md, stream, part, info->old, FALSE);
 	}
 }
 
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 14a74af12d..422d5d23cc 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -43,19 +43,6 @@
 
 #include <glib/gi18n.h>
 
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-cipher-context.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-operation.h>
-
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 
@@ -463,7 +450,7 @@ efhd_format_attachment (EMFormat *emf,
 		EM_FORMAT_HTML_VPAD);
 
 	if (handle && info->shown)
-		handle->handler (emf, stream, part, handle);
+		handle->handler (emf, stream, part, handle, FALSE);
 
 	g_free (classid);
 }
@@ -476,11 +463,12 @@ efhd_format_optional (EMFormat *emf,
 {
 	gchar *classid, *html;
 	struct _attach_puri *info;
-	CamelStream *stream;
+	CamelStream *stream = NULL;
 
-	if (CAMEL_IS_STREAM_FILTER (fstream) && ((CamelStreamFilter *) fstream)->source)
-		stream = ((CamelStreamFilter *) fstream)->source;
-	else
+	if (CAMEL_IS_STREAM_FILTER (fstream))
+		stream = camel_stream_filter_get_source (
+			CAMEL_STREAM_FILTER (fstream));
+	if (stream == NULL)
 		stream = fstream;
 
 	classid = g_strdup_printf ("optional%s", emf->part_id->str);
@@ -689,7 +677,7 @@ efhd_builtin_init(EMFormatHTMLDisplayClass *efhc)
 static void
 efhd_write_image(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri)
 {
-	CamelDataWrapper *dw = camel_medium_get_content_object((CamelMedium *)puri->part);
+	CamelDataWrapper *dw = camel_medium_get_content ((CamelMedium *)puri->part);
 
 	/* TODO: identical to efh_write_image */
 	d(printf("writing image '%s'\n", puri->cid));
@@ -726,7 +714,7 @@ efhd_message_prefix(EMFormat *emf, CamelStream *stream, CamelMimePart *part, EMF
 			camel_stream_printf(stream, "<td align=\"left\"><img src=\"%s\"></td>", classid);
 			(void)em_format_add_puri(emf, sizeof(EMFormatPURI), classid, iconpart, efhd_write_image);
 			g_free(classid);
-			camel_object_unref(iconpart);
+			g_object_unref (iconpart);
 		}
 	}
 
@@ -877,7 +865,7 @@ efhd_attachment_frame (EMFormat *emf,
 
 	if (info->shown)
 		info->handle->handler (
-			emf, stream, info->puri.part, info->handle);
+			emf, stream, info->puri.part, info->handle, FALSE);
 
 	camel_stream_close (stream);
 }
@@ -887,13 +875,15 @@ efhd_bar_resize (EMFormatHTML *efh,
                  GtkAllocation *event)
 {
 	EMFormatHTMLDisplayPrivate *priv;
+	GtkAllocation allocation;
 	GtkWidget *widget;
 	gint width;
 
 	priv = EM_FORMAT_HTML_DISPLAY_GET_PRIVATE (efh);
 
 	widget = GTK_WIDGET (efh->html);
-	width = widget->allocation.width - 12;
+	gtk_widget_get_allocation (widget, &allocation);
+	width = allocation.width - 12;
 
 	if (width > 0) {
 		widget = priv->attachment_view;
@@ -953,11 +943,7 @@ efhd_optional_button_show (GtkWidget *widget, GtkWidget *w)
 {
 	GtkWidget *label = g_object_get_data (G_OBJECT (widget), "text-label");
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_get_visible (w)) {
-#else
-	if (GTK_WIDGET_VISIBLE (w)) {
-#endif
 		gtk_widget_hide (w);
 		gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("View _Unformatted"));
 	} else {
@@ -969,7 +955,10 @@ efhd_optional_button_show (GtkWidget *widget, GtkWidget *w)
 static void
 efhd_resize (GtkWidget *w, GtkAllocation *event, EMFormatHTML *efh)
 {
-	gtk_widget_set_size_request (w, ((GtkWidget *)efh->html)->allocation.width-48, 250);
+	GtkAllocation allocation;
+
+	gtk_widget_get_allocation (GTK_WIDGET (efh->html), &allocation);
+	gtk_widget_set_size_request (w, allocation.width - 48, 250);
 }
 
 /* optional render attachment button callback */
@@ -980,7 +969,9 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
 	GtkWidget *hbox, *vbox, *button, *mainbox, *scroll, *label, *img;
 	AtkObject *a11y;
 	GtkWidget *view;
+	GtkAllocation allocation;
 	GtkTextBuffer *buffer;
+	GByteArray *byte_array;
 
 	/* FIXME: handle default shown case */
 	d(printf("adding attachment button/content for optional rendering\n"));
@@ -1008,7 +999,7 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
 		g_signal_connect(G_OBJECT (button), "clicked", G_CALLBACK(efhd_optional_button_show), scroll);
 	else {
 		gtk_widget_set_sensitive(button, FALSE);
-		GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
+		gtk_widget_set_can_focus (button, FALSE);
 	}
 
 	vbox = gtk_vbox_new (FALSE, 0);
@@ -1038,8 +1029,10 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
 	gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
 	gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW (view));
-	gtk_text_buffer_set_text (buffer, (gchar *)info->mstream->buffer->data, info->mstream->buffer->len);
-	camel_object_unref(info->mstream);
+	byte_array = camel_stream_mem_get_byte_array (info->mstream);
+	gtk_text_buffer_set_text (
+		buffer, (gchar *) byte_array->data, byte_array->len);
+	g_object_unref (info->mstream);
 	info->mstream = NULL;
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
 					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -1048,7 +1041,8 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
 	gtk_box_pack_start(GTK_BOX (vbox), scroll, TRUE, TRUE, 6);
 	gtk_widget_show (GTK_WIDGET(view));
 
-	gtk_widget_set_size_request (scroll, (GTK_WIDGET (efh->html))->allocation.width - 48, 250);
+	gtk_widget_get_allocation (GTK_WIDGET (efh->html), &allocation);
+	gtk_widget_set_size_request (scroll, allocation.width - 48, 250);
 	g_signal_connect (scroll, "size_allocate", G_CALLBACK(efhd_resize), efh);
 	gtk_widget_show (scroll);
 
diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c
index fb9b1a74a5..954254552c 100644
--- a/mail/em-format-html-print.c
+++ b/mail/em-format-html-print.c
@@ -26,10 +26,10 @@
 #endif
 
 #include <string.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gtkhtml/gtkhtml.h>
 
-#include <camel/camel-i18n.h>
 #include "mail-ops.h"
 #include "mail-mt.h"
 #include "em-format-html-print.h"
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index db03a6a9d0..b88ba2802d 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -54,25 +54,6 @@
 
 #include <glib/gi18n.h>
 
-#include <camel/camel-iconv.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-mime-filter-enriched.h>
-#include <camel/camel-mime-filter-basic.h>
-#include <camel/camel-gpg-context.h>
-#include <camel/camel-cipher-context.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-url.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-http-stream.h>
-#include <camel/camel-data-cache.h>
-#include <camel/camel-file-utils.h>
-
 #include "mail-config.h"
 #include "mail-mt.h"
 
@@ -208,7 +189,7 @@ efh_format_exec (struct _format_msg *m)
 		if (handle != NULL)
 			handle->handler (
 				format, (CamelStream *) m->estream,
-				(CamelMimePart *) m->message, handle);
+				(CamelMimePart *) m->message, handle, FALSE);
 
 		mime_type = "x-evolution/message/rfc822";
 		handle = em_format_find_handler (format, mime_type);
@@ -216,7 +197,7 @@ efh_format_exec (struct _format_msg *m)
 		if (handle != NULL)
 			handle->handler (
 				format, (CamelStream *) m->estream,
-				(CamelMimePart *) m->message, handle);
+				(CamelMimePart *) m->message, handle, FALSE);
 	}
 
 	camel_stream_flush((CamelStream *)m->estream);
@@ -246,7 +227,7 @@ efh_format_exec (struct _format_msg *m)
 			format->base = base;
 
 			/* clean up the job */
-			camel_object_unref(job->stream);
+			g_object_unref (job->stream);
 			if (job->base)
 				camel_url_free(job->base);
 			g_free(job);
@@ -261,7 +242,7 @@ efh_format_exec (struct _format_msg *m)
 			d(printf("out of jobs, closing root stream\n"));
 			camel_stream_write_string((CamelStream *)m->estream, "</body>\n</html>\n");
 			camel_stream_close((CamelStream *)m->estream);
-			camel_object_unref(m->estream);
+			g_object_unref (m->estream);
 			m->estream = NULL;
 		}
 
@@ -290,13 +271,13 @@ efh_format_free (struct _format_msg *m)
 	g_object_unref(m->format);
 	if (m->estream) {
 		camel_stream_close((CamelStream *)m->estream);
-		camel_object_unref(m->estream);
+		g_object_unref (m->estream);
 	}
 	if (m->folder)
-		camel_object_unref(m->folder);
+		g_object_unref (m->folder);
 	g_free(m->uid);
 	if (m->message)
-		camel_object_unref(m->message);
+		g_object_unref (m->message);
 	if (m->format_source)
 		g_object_unref(m->format_source);
 }
@@ -386,7 +367,7 @@ static void
 efh_free_cache(struct _EMFormatHTMLCache *efhc)
 {
 	if (efhc->textmp)
-		camel_object_unref(efhc->textmp);
+		g_object_unref (efhc->textmp);
 	g_free(efhc);
 }
 
@@ -641,10 +622,10 @@ efh_format_clone (EMFormat *emf,
 		g_object_ref (emfsource);
 
 	if (folder != NULL)
-		camel_object_ref (folder);
+		g_object_ref (folder);
 
 	if (msg != NULL)
-		camel_object_ref (msg);
+		g_object_ref (msg);
 
 	m = mail_msg_new (&efh_format_info);
 	m->format = g_object_ref (emf);
@@ -686,22 +667,23 @@ efh_format_source (EMFormat *emf,
                    CamelStream *stream,
                    CamelMimePart *part)
 {
-	CamelStreamFilter *filtered_stream;
+	CamelStream *filtered_stream;
 	CamelMimeFilter *filter;
 	CamelDataWrapper *dw = (CamelDataWrapper *) part;
 
-	filtered_stream = camel_stream_filter_new_with_stream (stream);
+	filtered_stream = camel_stream_filter_new (stream);
 
 	filter = camel_mime_filter_tohtml_new (
 		CAMEL_MIME_FILTER_TOHTML_CONVERT_NL |
 		CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES |
 		CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT, 0);
-	camel_stream_filter_add (filtered_stream, filter);
-	camel_object_unref (filter);
+	camel_stream_filter_add (
+		CAMEL_STREAM_FILTER (filtered_stream), filter);
+	g_object_unref (filter);
 
 	camel_stream_write_string (stream, "<table><tr><td><tt>");
 	em_format_format_text (emf, (CamelStream *) filtered_stream, dw);
-	camel_object_unref (filtered_stream);
+	g_object_unref (filtered_stream);
 
 	camel_stream_write_string(stream, "</tt></td></tr></table>");
 }
@@ -738,7 +720,7 @@ efh_format_attachment (EMFormat *emf,
 	camel_stream_write_string (stream, "</font></td></tr><tr></table>");
 
 	if (handle && em_format_is_inline (emf, emf->part_id->str, part, handle))
-		handle->handler (emf, stream, part, handle);
+		handle->handler (emf, stream, part, handle, FALSE);
 }
 
 static gboolean
@@ -900,7 +882,7 @@ efh_class_init (EMFormatHTMLClass *class)
 	/* cache expiry - 2 hour access, 1 day max */
 	pathname = g_build_filename (
 		e_get_user_data_dir (), "cache", NULL);
-	emfh_http_cache = camel_data_cache_new (pathname, 0, NULL);
+	emfh_http_cache = camel_data_cache_new (pathname, NULL);
 	if (emfh_http_cache) {
 		camel_data_cache_set_expire_age(emfh_http_cache, 24*60*60);
 		camel_data_cache_set_expire_access(emfh_http_cache, 2*60*60);
@@ -1205,12 +1187,12 @@ em_format_html_file_part(EMFormatHTML *efh, const gchar *mime_type, const gchar
 
 	dw = camel_data_wrapper_new();
 	camel_data_wrapper_construct_from_stream(dw, stream);
-	camel_object_unref(stream);
+	g_object_unref (stream);
 	if (mime_type)
 		camel_data_wrapper_set_mime_type(dw, mime_type);
 	part = camel_mime_part_new();
-	camel_medium_set_content_object((CamelMedium *)part, dw);
-	camel_object_unref(dw);
+	camel_medium_set_content ((CamelMedium *)part, dw);
+	g_object_unref (dw);
 	basename = g_path_get_basename (filename);
 	camel_mime_part_set_filename(part, basename);
 	g_free (basename);
@@ -1446,10 +1428,10 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, gint cancelled)
 		/* do not store broken files in a cache */
 		if (n != 0)
 			camel_data_cache_remove(emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL);
-		camel_object_unref(costream);
+		g_object_unref (costream);
 	}
 
-	camel_object_unref(instream);
+	g_object_unref (instream);
 done:
 	camel_operation_end(NULL);
 badurl:
@@ -1468,7 +1450,7 @@ efh_url_requested(GtkHTML *html, const gchar *url, GtkHTMLStream *handle, EMForm
 
 	puri = em_format_find_visible_puri((EMFormat *)efh, url);
 	if (puri) {
-		CamelDataWrapper *dw = camel_medium_get_content_object((CamelMedium *)puri->part);
+		CamelDataWrapper *dw = camel_medium_get_content ((CamelMedium *)puri->part);
 		CamelContentType *ct = dw?dw->mime_type:NULL;
 
 		/* GtkHTML only handles text and images.
@@ -1543,7 +1525,6 @@ efh_object_requested(GtkHTML *html, GtkHTMLEmbedded *eb, EMFormatHTML *efh)
 
 /* ********************************************************************** */
 #include "em-inline-filter.h"
-#include <camel/camel-stream-null.h>
 
 /* FIXME: This is duplicated in em-format-html-display, should be exported or in security module */
 static const struct {
@@ -1605,7 +1586,7 @@ efh_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel
 		iconpart = em_format_html_file_part((EMFormatHTML *)emf, "image/png", iconpath);
 		if (iconpart) {
 			(void)em_format_add_puri(emf, sizeof(EMFormatPURI), classid, iconpart, efh_write_image);
-			camel_object_unref(iconpart);
+			g_object_unref (iconpart);
 		}
 		g_free (iconpath);
 		g_free(classid);
@@ -1635,9 +1616,13 @@ efh_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel
 }
 
 static void
-efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info)
+efh_text_plain (EMFormatHTML *efh,
+                CamelStream *stream,
+                CamelMimePart *part,
+                const EMFormatHandler *info,
+                gboolean is_fallback)
 {
-	CamelStreamFilter *filtered_stream;
+	CamelStream *filtered_stream;
 	CamelMimeFilter *html_filter;
 	CamelMultipart *mp;
 	CamelDataWrapper *dw;
@@ -1646,17 +1631,11 @@ efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFo
 	guint32 flags;
 	guint32 rgb;
 	gint i, count, len;
-	gchar *meta;
-	gboolean is_fallback;
 	struct _EMFormatHTMLCache *efhc;
 
 	flags = efh->text_html_flags;
 
-	meta = camel_object_meta_get (part, "EMF-Fallback");
-	is_fallback = meta != NULL;
-	g_free (meta);
-
-	dw = camel_medium_get_content_object((CamelMedium *)part);
+	dw = camel_medium_get_content ((CamelMedium *)part);
 
 	/* Check for RFC 2646 flowed text. */
 	if (camel_content_type_is(dw->mime_type, "text", "plain")
@@ -1690,29 +1669,32 @@ efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFo
 		}
 
 		null = camel_stream_null_new();
-		filtered_stream = camel_stream_filter_new_with_stream(null);
-		camel_object_unref(null);
+		filtered_stream = camel_stream_filter_new (null);
+		g_object_unref (null);
 		inline_filter = em_inline_filter_new(camel_mime_part_get_encoding(part), ct);
-		camel_stream_filter_add(filtered_stream, (CamelMimeFilter *)inline_filter);
+		camel_stream_filter_add (
+			CAMEL_STREAM_FILTER (filtered_stream),
+			CAMEL_MIME_FILTER (inline_filter));
 		camel_data_wrapper_decode_to_stream (dw, (CamelStream *)filtered_stream);
 		camel_stream_close((CamelStream *)filtered_stream);
-		camel_object_unref(filtered_stream);
+		g_object_unref (filtered_stream);
 
 		mp = em_inline_filter_get_multipart(inline_filter);
 		if (efhc == NULL)
 			efhc = efh_insert_cache(efh, ((EMFormat *)efh)->part_id->str);
 		efhc->textmp = mp;
 
-		camel_object_unref(inline_filter);
+		g_object_unref (inline_filter);
 		camel_content_type_unref(ct);
 	}
 
 	rgb = e_color_to_value (
 		&efh->priv->colors[EM_FORMAT_HTML_COLOR_CITATION]);
-	filtered_stream = camel_stream_filter_new_with_stream(stream);
+	filtered_stream = camel_stream_filter_new (stream);
 	html_filter = camel_mime_filter_tohtml_new(flags, rgb);
-	camel_stream_filter_add(filtered_stream, html_filter);
-	camel_object_unref(html_filter);
+	camel_stream_filter_add (
+		CAMEL_STREAM_FILTER (filtered_stream), html_filter);
+	g_object_unref (html_filter);
 
 	/* We handle our made-up multipart here, so we don't recursively call ourselves */
 
@@ -1749,13 +1731,13 @@ efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFo
 		}
 	}
 
-	camel_object_unref(filtered_stream);
+	g_object_unref (filtered_stream);
 }
 
 static void
 efh_text_enriched(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info)
 {
-	CamelStreamFilter *filtered_stream;
+	CamelStream *filtered_stream;
 	CamelMimeFilter *enriched;
 	guint32 flags = 0;
 
@@ -1767,9 +1749,10 @@ efh_text_enriched(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, E
 	}
 
 	enriched = camel_mime_filter_enriched_new(flags);
-	filtered_stream = camel_stream_filter_new_with_stream (stream);
-	camel_stream_filter_add(filtered_stream, enriched);
-	camel_object_unref(enriched);
+	filtered_stream = camel_stream_filter_new (stream);
+	camel_stream_filter_add (
+		CAMEL_STREAM_FILTER (filtered_stream), enriched);
+	g_object_unref (enriched);
 
 	camel_stream_printf (
 		stream, "<div style=\"border: solid #%06x 1px; background-color: #%06x; padding: 10px; color: #%06x;\">\n" EFH_MESSAGE_START,
@@ -1785,7 +1768,7 @@ efh_text_enriched(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, E
 
 	em_format_format_text((EMFormat *)efh, (CamelStream *)filtered_stream, (CamelDataWrapper *)part);
 
-	camel_object_unref(filtered_stream);
+	g_object_unref (filtered_stream);
 	camel_stream_write_string(stream, "</div>");
 }
 
@@ -1800,10 +1783,10 @@ efh_write_text_html(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri)
 	fd = dup(STDOUT_FILENO);
 	out = camel_stream_fs_new_with_fd(fd);
 	printf("writing text content to frame '%s'\n", puri->cid);
-	dw = camel_medium_get_content_object(puri->part);
+	dw = camel_medium_get_content (puri->part);
 	if (dw)
 		camel_data_wrapper_write_to_stream(dw, out);
-	camel_object_unref(out);
+	g_object_unref (out);
 #endif
 	em_format_format_text(emf, stream, (CamelDataWrapper *)puri->part);
 }
@@ -1957,7 +1940,7 @@ fail:
 static void
 efh_message_deliverystatus(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info)
 {
-	CamelStreamFilter *filtered_stream;
+	CamelStream *filtered_stream;
 	CamelMimeFilter *html_filter;
 	guint32 rgb = 0x737373;
 
@@ -1974,10 +1957,11 @@ efh_message_deliverystatus(EMFormatHTML *efh, CamelStream *stream, CamelMimePart
 			&efh->priv->colors[
 			EM_FORMAT_HTML_COLOR_TEXT]));
 
-	filtered_stream = camel_stream_filter_new_with_stream(stream);
+	filtered_stream = camel_stream_filter_new (stream);
 	html_filter = camel_mime_filter_tohtml_new(efh->text_html_flags, rgb);
-	camel_stream_filter_add(filtered_stream, html_filter);
-	camel_object_unref(html_filter);
+	camel_stream_filter_add (
+		CAMEL_STREAM_FILTER (filtered_stream), html_filter);
+	g_object_unref (html_filter);
 
 	camel_stream_write_string(stream, "<tt>\n" EFH_MESSAGE_START);
 	em_format_format_text((EMFormat *)efh, (CamelStream *)filtered_stream, (CamelDataWrapper *)part);
@@ -2040,7 +2024,7 @@ emfh_multipart_related_check(struct _EMFormatHTMLJob *job, gint cancelled)
 static void
 efh_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
 {
-	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)part);
+	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part);
 	CamelMimePart *body_part, *display_part = NULL;
 	CamelContentType *content_type;
 	const gchar *start;
@@ -2107,7 +2091,7 @@ efh_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, c
 	/* queue a job to check for un-referenced parts to add as attachments */
 	job = em_format_html_job_new((EMFormatHTML *)emf, emfh_multipart_related_check, NULL);
 	job->stream = stream;
-	camel_object_ref(stream);
+	g_object_ref (stream);
 	em_format_html_job_queue((EMFormatHTML *)emf, job);
 
 	em_format_pull_level(emf);
@@ -2116,7 +2100,7 @@ efh_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, c
 static void
 efh_write_image(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri)
 {
-	CamelDataWrapper *dw = camel_medium_get_content_object((CamelMedium *)puri->part);
+	CamelDataWrapper *dw = camel_medium_get_content ((CamelMedium *)puri->part);
 
 	d(printf("writing image '%s'\n", puri->cid));
 	camel_data_wrapper_decode_to_stream(dw, stream);
@@ -2603,16 +2587,20 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 	}
 
 	if (header_sender && header_from && mail_from_delegate) {
+		gchar *bold_sender, *bold_from;
 		camel_stream_printf(stream, "<tr><td><table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>");
 		if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
 			camel_stream_printf (stream, "<td align=\"right\" width=\"100%%\">");
 		else
 			camel_stream_printf (stream, "<td align=\"left\" width=\"100%%\">");
+		bold_sender = g_strconcat ("<b>", header_sender, "</b>", NULL);
+		bold_from = g_strconcat ("<b>", header_from, "</b>", NULL);
 		/* To translators: This message suggests to the receipients that the sender of the mail is
-		   different from the one listed in From field.
-		*/
-		camel_stream_printf(stream, _("This message was sent by <b>%s</b> on behalf of <b>%s</b>"), header_sender, header_from);
+		   different from the one listed in From field. */
+		camel_stream_printf(stream, _("This message was sent by %s on behalf of %s"), bold_sender, bold_from);
 		camel_stream_printf(stream, "</td></tr></table></td></tr>");
+		g_free (bold_sender);
+		g_free (bold_from);
 	}
 
 	g_free (header_sender);
@@ -2721,11 +2709,11 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 					classid);
 				em_format_add_puri(emf, sizeof(EMFormatPURI), classid,
 					photopart, efh_write_image);
-				camel_object_unref(photopart);
+				g_object_unref (photopart);
 
 				g_free(classid);
 			}
-			camel_object_unref(cia);
+			g_object_unref (cia);
 		}
 
 		if (!contact_has_photo && face_decoded) {
@@ -2737,7 +2725,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 			classid = g_strdup_printf("icon:///em-format-html/face/photo/header");
 			camel_stream_printf(stream, "<td align=\"right\" valign=\"top\"><img width=48 src=\"%s\"></td>", classid);
 			em_format_add_puri(emf, sizeof(EMFormatPURI), classid, part, efh_write_image);
-			camel_object_unref(part);
+			g_object_unref (part);
 		}
 
 		if (have_icon && efh->show_icon) {
@@ -2760,7 +2748,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 
 			if (iconpart) {
 				em_format_add_puri(emf, sizeof(EMFormatPURI), classid, iconpart, efh_write_image);
-				camel_object_unref(iconpart);
+				g_object_unref (iconpart);
 			}
 			g_free(classid);
 		}
@@ -2788,7 +2776,7 @@ efh_format_message(EMFormat *emf, CamelStream *stream, CamelMimePart *part, cons
 
 	handle = em_format_find_handler(emf, "x-evolution/message/post-header");
 	if (handle)
-		handle->handler(emf, stream, part, handle);
+		handle->handler(emf, stream, part, handle, FALSE);
 
 	camel_stream_printf(stream, EM_FORMAT_HTML_VPAD);
 	em_format_part(emf, stream, part);
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index bac45d8ecc..26a6671cea 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -30,10 +30,6 @@
 
 #include <em-format/em-format.h>
 #include <mail/mail-config.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-url.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-embedded.h>
 
diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c
index cc3c795d32..d86e2a3cb4 100644
--- a/mail/em-html-stream.c
+++ b/mail/em-html-stream.c
@@ -32,10 +32,10 @@
 
 #define d(x)
 
-static EMSyncStreamClass *parent_class = NULL;
+G_DEFINE_TYPE (EMHTMLStream, em_html_stream, EM_TYPE_SYNC_STREAM)
 
 static void
-emhs_cleanup (EMHTMLStream *emhs)
+html_stream_cleanup (EMHTMLStream *emhs)
 {
 	if (emhs->sync.cancel && emhs->html_stream)
 		gtk_html_stream_close (
@@ -49,17 +49,28 @@ emhs_cleanup (EMHTMLStream *emhs)
 }
 
 static void
-emhs_gtkhtml_destroy (GtkHTML *html,
-                      EMHTMLStream *emhs)
+html_stream_gtkhtml_destroy (GtkHTML *html,
+                             EMHTMLStream *emhs)
 {
 	emhs->sync.cancel = TRUE;
-	emhs_cleanup (emhs);
+	html_stream_cleanup (emhs);
+}
+
+static void
+html_stream_dispose (GObject *object)
+{
+	EMHTMLStream *emhs = EM_HTML_STREAM (object);
+
+	if (emhs->html_stream) {
+		/* set 'in finalise' flag */
+		camel_stream_close (CAMEL_STREAM (emhs));
+	}
 }
 
 static gssize
-emhs_sync_write (CamelStream *stream,
-                 const gchar *buffer,
-                 gsize n)
+html_stream_sync_write (CamelStream *stream,
+                        const gchar *buffer,
+                        gsize n)
 {
 	EMHTMLStream *emhs = EM_HTML_STREAM (stream);
 
@@ -76,7 +87,7 @@ emhs_sync_write (CamelStream *stream,
 }
 
 static gint
-emhs_sync_flush(CamelStream *stream)
+html_stream_sync_flush (CamelStream *stream)
 {
 	EMHTMLStream *emhs = (EMHTMLStream *)stream;
 
@@ -89,7 +100,7 @@ emhs_sync_flush(CamelStream *stream)
 }
 
 static gint
-emhs_sync_close (CamelStream *stream)
+html_stream_sync_close (CamelStream *stream)
 {
 	EMHTMLStream *emhs = (EMHTMLStream *)stream;
 
@@ -97,7 +108,7 @@ emhs_sync_close (CamelStream *stream)
 		return -1;
 
 	gtk_html_stream_close (emhs->html_stream, GTK_HTML_STREAM_OK);
-	emhs_cleanup (emhs);
+	html_stream_cleanup (emhs);
 
 	return 0;
 }
@@ -105,14 +116,16 @@ emhs_sync_close (CamelStream *stream)
 static void
 em_html_stream_class_init (EMHTMLStreamClass *class)
 {
+	GObjectClass *object_class;
 	EMSyncStreamClass *sync_stream_class;
 
-	parent_class = (EMSyncStreamClass *)em_sync_stream_get_type();
+	object_class = G_OBJECT_CLASS (class);
+	object_class->dispose = html_stream_dispose;
 
 	sync_stream_class = EM_SYNC_STREAM_CLASS (class);
-	sync_stream_class->sync_write = emhs_sync_write;
-	sync_stream_class->sync_flush = emhs_sync_flush;
-	sync_stream_class->sync_close = emhs_sync_close;
+	sync_stream_class->sync_write = html_stream_sync_write;
+	sync_stream_class->sync_flush = html_stream_sync_flush;
+	sync_stream_class->sync_close = html_stream_sync_close;
 }
 
 static void
@@ -120,35 +133,6 @@ em_html_stream_init (EMHTMLStream *emhs)
 {
 }
 
-static void
-em_html_stream_finalize (EMHTMLStream *emhs)
-{
-	if (emhs->html_stream) {
-		/* set 'in finalise' flag */
-		camel_stream_close (CAMEL_STREAM (emhs));
-	}
-}
-
-CamelType
-em_html_stream_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-
-	if (G_UNLIKELY (type == CAMEL_INVALID_TYPE)) {
-		type = camel_type_register (
-			em_sync_stream_get_type(),
-			"EMHTMLStream",
-			sizeof (EMHTMLStream),
-			sizeof (EMHTMLStreamClass),
-			(CamelObjectClassInitFunc) em_html_stream_class_init,
-			NULL,
-			(CamelObjectInitFunc) em_html_stream_init,
-			(CamelObjectFinalizeFunc) em_html_stream_finalize);
-	}
-
-	return type;
-}
-
 /* TODO: Could pass NULL for html_stream, and do a gtk_html_begin
    on first data -> less flashing */
 CamelStream *
@@ -159,13 +143,13 @@ em_html_stream_new (GtkHTML *html,
 
 	g_return_val_if_fail (GTK_IS_HTML (html), NULL);
 
-	new = EM_HTML_STREAM (camel_object_new (EM_HTML_STREAM_TYPE));
+	new = g_object_new (EM_TYPE_HTML_STREAM, NULL);
 	new->html_stream = html_stream;
 	new->html = g_object_ref (html);
 	new->flags = 0;
 	new->destroy_id = g_signal_connect (
 		html, "destroy",
-		G_CALLBACK (emhs_gtkhtml_destroy), new);
+		G_CALLBACK (html_stream_gtkhtml_destroy), new);
 
 	em_sync_stream_set_buffer_size (&new->sync, 8192);
 
diff --git a/mail/em-html-stream.h b/mail/em-html-stream.h
index 7bf79470dd..24d32f76d8 100644
--- a/mail/em-html-stream.h
+++ b/mail/em-html-stream.h
@@ -28,17 +28,24 @@
 #include <gtkhtml/gtkhtml-stream.h>
 #include <mail/em-sync-stream.h>
 
-#define EM_HTML_STREAM_TYPE \
+/* Standard GObject macros */
+#define EM_TYPE_HTML_STREAM \
 	(em_html_stream_get_type ())
 #define EM_HTML_STREAM(obj) \
-	(CAMEL_CHECK_CAST \
-	((obj), EM_HTML_STREAM_TYPE, EMHTMLStream))
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), EM_TYPE_HTML_STREAM, EMHTMLStream))
 #define EM_HTML_STREAM_CLASS(cls) \
-	(CAMEL_CHECK_CLASS_CAST \
-	((cls), EM_HTML_STREAM_TYPE, EMHTMLStreamClass))
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), EM_TYPE_HTML_STREAM, EMHTMLStreamClass))
 #define EM_IS_HTML_STREAM(obj) \
-	(CAMEL_CHECK_TYPE \
-	((obj), EM_HTML_STREAM_TYPE))
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), EM_TYPE_HTML_STREAM))
+#define EM_IS_HTML_STREAM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), EM_TYPE_HTML_STREAM))
+#define EM_HTML_STREAM_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), EM_TYPE_HTML_STREAM, EMHTMLStreamClass))
 
 G_BEGIN_DECLS
 
@@ -59,7 +66,7 @@ struct _EMHTMLStreamClass {
 
 };
 
-CamelType	em_html_stream_get_type		(void);
+GType		em_html_stream_get_type		(void);
 CamelStream *	em_html_stream_new		(GtkHTML *html,
 						 GtkHTMLStream *html_stream);
 void		em_html_stream_set_flags	(EMHTMLStream *emhs,
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 4d3ac946f4..c142ca28b1 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -27,76 +27,13 @@
 #include <string.h>
 
 #include "em-inline-filter.h"
-#include <camel/camel-mime-part.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-filter-basic.h>
-#include <camel/camel-stream-filter.h>
 
 #include "em-utils.h"
 #include "em-format/em-format.h"
 
 #define d(x)
 
-static void em_inline_filter_class_init (EMInlineFilterClass *klass);
-static void em_inline_filter_init (CamelObject *object);
-static void em_inline_filter_finalize (CamelObject *object);
-
-static void emif_filter(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace);
-static void emif_complete(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace);
-static void emif_reset(CamelMimeFilter *f);
-
-static CamelMimeFilterClass *parent_class = NULL;
-
-CamelType
-em_inline_filter_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-
-	if (type == CAMEL_INVALID_TYPE) {
-		parent_class = (CamelMimeFilterClass *)camel_mime_filter_get_type();
-
-		type = camel_type_register(camel_mime_filter_get_type(),
-					   "EMInlineFilter",
-					   sizeof (EMInlineFilter),
-					   sizeof (EMInlineFilterClass),
-					   (CamelObjectClassInitFunc) em_inline_filter_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) em_inline_filter_init,
-					   (CamelObjectFinalizeFunc) em_inline_filter_finalize);
-	}
-
-	return type;
-}
-
-static void
-em_inline_filter_class_init (EMInlineFilterClass *klass)
-{
-	((CamelMimeFilterClass *)klass)->filter = emif_filter;
-	((CamelMimeFilterClass *)klass)->complete = emif_complete;
-	((CamelMimeFilterClass *)klass)->reset = emif_reset;
-}
-
-static void
-em_inline_filter_init (CamelObject *object)
-{
-	EMInlineFilter *emif = (EMInlineFilter *)object;
-
-	emif->data = g_byte_array_new();
-}
-
-static void
-em_inline_filter_finalize (CamelObject *object)
-{
-	EMInlineFilter *emif = (EMInlineFilter *)object;
-
-	if (emif->base_type)
-		camel_content_type_unref(emif->base_type);
-
-	emif_reset((CamelMimeFilter *)emif);
-	g_byte_array_free(emif->data, TRUE);
-	g_free(emif->filename);
-}
+G_DEFINE_TYPE (EMInlineFilter, em_inline_filter, CAMEL_TYPE_MIME_FILTER)
 
 enum {
 	EMIF_PLAIN,
@@ -122,7 +59,7 @@ static const struct {
 };
 
 static void
-emif_add_part(EMInlineFilter *emif, const gchar *data, gint len)
+inline_filter_add_part(EMInlineFilter *emif, const gchar *data, gint len)
 {
 	CamelTransferEncoding encoding;
 	CamelContentType *content_type;
@@ -148,21 +85,21 @@ emif_add_part(EMInlineFilter *emif, const gchar *data, gint len)
 
 	dw = camel_data_wrapper_new();
 	if (encoding == emif->base_encoding && (encoding == CAMEL_TRANSFER_ENCODING_BASE64 || encoding == CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE)) {
-		CamelMimeFilterBasic *enc_filter = camel_mime_filter_basic_new_type (encoding == CAMEL_TRANSFER_ENCODING_BASE64 ? CAMEL_MIME_FILTER_BASIC_BASE64_ENC : CAMEL_MIME_FILTER_BASIC_QP_ENC);
-		CamelStreamFilter *filter_stream;
+		CamelMimeFilter *enc_filter = camel_mime_filter_basic_new (encoding == CAMEL_TRANSFER_ENCODING_BASE64 ? CAMEL_MIME_FILTER_BASIC_BASE64_ENC : CAMEL_MIME_FILTER_BASIC_QP_ENC);
+		CamelStream *filter_stream;
 
-		filter_stream = camel_stream_filter_new_with_stream (mem);
-		camel_stream_filter_add (filter_stream, CAMEL_MIME_FILTER (enc_filter));
+		filter_stream = camel_stream_filter_new (mem);
+		camel_stream_filter_add (CAMEL_STREAM_FILTER (filter_stream), enc_filter);
 
 		/* properly encode content */
-		camel_data_wrapper_construct_from_stream (dw, CAMEL_STREAM (filter_stream));
+		camel_data_wrapper_construct_from_stream (dw, filter_stream);
 
-		camel_object_unref (enc_filter);
-		camel_object_unref (filter_stream);
+		g_object_unref (enc_filter);
+		g_object_unref (filter_stream);
 	} else {
 		camel_data_wrapper_construct_from_stream (dw, mem);
 	}
-	camel_object_unref(mem);
+	g_object_unref (mem);
 
 	if (emif_types[emif->state].plain && emif->base_type) {
 		camel_content_type_ref (emif->base_type);
@@ -184,9 +121,9 @@ emif_add_part(EMInlineFilter *emif, const gchar *data, gint len)
 	dw->encoding = encoding;
 
 	part = camel_mime_part_new();
-	camel_medium_set_content_object((CamelMedium *)part, dw);
+	camel_medium_set_content ((CamelMedium *)part, dw);
 	camel_mime_part_set_encoding(part, encoding);
-	camel_object_unref(dw);
+	g_object_unref (dw);
 
 	if (emif->filename)
 		camel_mime_part_set_filename(part, emif->filename);
@@ -208,7 +145,7 @@ emif_add_part(EMInlineFilter *emif, const gchar *data, gint len)
 }
 
 static gint
-emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
+inline_filter_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 {
 	EMInlineFilter *emif = (EMInlineFilter *)f;
 	gchar *inptr = in, *inend = in+len;
@@ -253,7 +190,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 				if (i >= rest_len || start[i++] != ' ')
 					break;
 
-				emif_add_part(emif, data_start, start-data_start);
+				inline_filter_add_part(emif, data_start, start-data_start);
 
 				name = g_strndup(start+i, inptr-start-i-1);
 				emif->filename = camel_header_decode_string(name, emif->base_type?camel_content_type_param(emif->base_type, "charset"):NULL);
@@ -262,22 +199,22 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 				emif->state = EMIF_UUENC;
 			} else if (rest_len >= 45 && strncmp (start, "(This file must be converted with BinHex 4.0)", 45) == 0) {
 				restore_inptr ();
-				emif_add_part(emif, data_start, start-data_start);
+				inline_filter_add_part(emif, data_start, start-data_start);
 				data_start = start;
 				emif->state = EMIF_BINHEX;
 			} else if (rest_len >= 11 && strncmp (start, "%!PS-Adobe-", 11) == 0) {
 				restore_inptr ();
-				emif_add_part(emif, data_start, start-data_start);
+				inline_filter_add_part(emif, data_start, start-data_start);
 				data_start = start;
 				emif->state = EMIF_POSTSCRIPT;
 			} else if (rest_len >= 34 && strncmp (start, "-----BEGIN PGP SIGNED MESSAGE-----", 34) == 0) {
 				restore_inptr ();
-				emif_add_part(emif, data_start, start-data_start);
+				inline_filter_add_part(emif, data_start, start-data_start);
 				data_start = start;
 				emif->state = EMIF_PGPSIGNED;
 			} else if (rest_len >= 27 && strncmp (start, "-----BEGIN PGP MESSAGE-----", 27) == 0) {
 				restore_inptr ();
-				emif_add_part(emif, data_start, start-data_start);
+				inline_filter_add_part(emif, data_start, start-data_start);
 				data_start = start;
 				emif->state = EMIF_PGPENCRYPTED;
 			}
@@ -286,7 +223,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 		case EMIF_UUENC:
 			if (rest_len >= 3 && strncmp (start, "end", 3) == 0) {
 				restore_inptr ();
-				emif_add_part(emif, data_start, inptr-data_start);
+				inline_filter_add_part(emif, data_start, inptr-data_start);
 				data_start = inptr;
 				emif->state = EMIF_PLAIN;
 			} else {
@@ -302,7 +239,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 				linelen *= 3;
 				if (!(len == linelen || len == linelen-1 || len == linelen-2)) {
 					restore_inptr ();
-					emif_add_part(emif, data_start, start-data_start);
+					inline_filter_add_part(emif, data_start, start-data_start);
 					data_start = start;
 					inptr = start;
 					emif->state = EMIF_PLAIN;
@@ -313,7 +250,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 		case EMIF_BINHEX:
 			if (inptr > (start+1) && inptr[-2] == ':') {
 				restore_inptr ();
-				emif_add_part(emif, data_start, inptr-data_start);
+				inline_filter_add_part(emif, data_start, inptr-data_start);
 				data_start = inptr;
 				emif->state = EMIF_PLAIN;
 			}
@@ -321,7 +258,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 		case EMIF_POSTSCRIPT:
 			if (rest_len >= 5 && strncmp (start, "%%EOF", 5) == 0) {
 				restore_inptr ();
-				emif_add_part(emif, data_start, inptr-data_start);
+				inline_filter_add_part(emif, data_start, inptr-data_start);
 				data_start = inptr;
 				emif->state = EMIF_PLAIN;
 			}
@@ -329,7 +266,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 		case EMIF_PGPSIGNED:
 			if (rest_len >= 27 && strncmp (start, "-----END PGP SIGNATURE-----", 27) == 0) {
 				restore_inptr ();
-				emif_add_part(emif, data_start, inptr-data_start);
+				inline_filter_add_part(emif, data_start, inptr-data_start);
 				data_start = inptr;
 				emif->state = EMIF_PLAIN;
 			}
@@ -337,7 +274,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 		case EMIF_PGPENCRYPTED:
 			if (rest_len >= 25 && strncmp (start, "-----END PGP MESSAGE-----", 25) == 0) {
 				restore_inptr ();
-				emif_add_part(emif, data_start, inptr-data_start);
+				inline_filter_add_part(emif, data_start, inptr-data_start);
 				data_start = inptr;
 				emif->state = EMIF_PLAIN;
 			}
@@ -353,7 +290,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 		/* always stop as plain, especially when not read those tags fully */
 		emif->state = EMIF_PLAIN;
 
-		emif_add_part(emif, data_start, inend-data_start);
+		inline_filter_add_part(emif, data_start, inend-data_start);
 	} else {
 		g_byte_array_append(emif->data, (guchar *)data_start, inend-data_start);
 	}
@@ -362,9 +299,31 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 }
 
 static void
-emif_filter(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
+inline_filter_finalize (GObject *object)
+{
+	EMInlineFilter *emif = EM_INLINE_FILTER (object);
+
+	if (emif->base_type)
+		camel_content_type_unref(emif->base_type);
+
+	camel_mime_filter_reset (CAMEL_MIME_FILTER (object));
+	g_byte_array_free(emif->data, TRUE);
+	g_free(emif->filename);
+
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (em_inline_filter_parent_class)->finalize (object);
+}
+
+static void
+inline_filter_filter (CamelMimeFilter *filter,
+                      const gchar *in,
+                      gsize len,
+                      gsize prespace,
+                      gchar **out,
+                      gsize *outlen,
+                      gsize *outprespace)
 {
-	emif_scan(f, (gchar *)in, len, FALSE);
+	inline_filter_scan (filter, (gchar *)in, len, FALSE);
 
 	*out = (gchar *)in;
 	*outlen = len;
@@ -372,9 +331,15 @@ emif_filter(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gcha
 }
 
 static void
-emif_complete(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
+inline_filter_complete (CamelMimeFilter *filter,
+                        const gchar *in,
+                        gsize len,
+                        gsize prespace,
+                        gchar **out,
+                        gsize *outlen,
+                        gsize *outprespace)
 {
-	emif_scan(f, (gchar *)in, len, TRUE);
+	inline_filter_scan (filter, (gchar *)in, len, TRUE);
 
 	*out = (gchar *)in;
 	*outlen = len;
@@ -382,16 +347,16 @@ emif_complete(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gc
 }
 
 static void
-emif_reset(CamelMimeFilter *f)
+inline_filter_reset (CamelMimeFilter *filter)
 {
-	EMInlineFilter *emif = (EMInlineFilter *)f;
+	EMInlineFilter *emif = EM_INLINE_FILTER (filter);
 	GSList *l;
 
 	l = emif->parts;
 	while (l) {
 		GSList *n = l->next;
 
-		camel_object_unref(l->data);
+		g_object_unref (l->data);
 		g_slist_free_1(l);
 
 		l = n;
@@ -400,6 +365,27 @@ emif_reset(CamelMimeFilter *f)
 	g_byte_array_set_size(emif->data, 0);
 }
 
+static void
+em_inline_filter_class_init (EMInlineFilterClass *class)
+{
+	GObjectClass *object_class;
+	CamelMimeFilterClass *mime_filter_class;
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->finalize = inline_filter_finalize;
+
+	mime_filter_class = CAMEL_MIME_FILTER_CLASS (class);
+	mime_filter_class->filter = inline_filter_filter;
+	mime_filter_class->complete = inline_filter_complete;
+	mime_filter_class->reset = inline_filter_reset;
+}
+
+static void
+em_inline_filter_init (EMInlineFilter *emif)
+{
+	emif->data = g_byte_array_new();
+}
+
 /**
  * em_inline_filter_new:
  * @base_encoding: The base transfer-encoding of the
@@ -418,7 +404,7 @@ em_inline_filter_new(CamelTransferEncoding base_encoding, CamelContentType *base
 {
 	EMInlineFilter *emif;
 
-	emif = (EMInlineFilter *)camel_object_new(em_inline_filter_get_type());
+	emif = g_object_new (EM_TYPE_INLINE_FILTER, NULL);
 	emif->base_encoding = base_encoding;
 	if (base_type) {
 		emif->base_type = base_type;
diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h
index ac1779f8f0..8ee90a6640 100644
--- a/mail/em-inline-filter.h
+++ b/mail/em-inline-filter.h
@@ -24,18 +24,33 @@
 #ifndef EM_INLINE_FILTER_H
 #define EM_INLINE_FILTER_H
 
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-multipart.h>
+#include <camel/camel.h>
 
-#define EM_INLINE_FILTER_TYPE     (em_inline_filter_get_type ())
-#define EM_INLINE_FILTER(obj)     (CAMEL_CHECK_CAST((obj), EM_INLINE_FILTER_TYPE, EMInlineFilter))
-#define EM_INLINE_FILTER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), EM_INLINE_FILTER_TYPE, EMInlineFilterClass))
-#define EM_IS_INLINE_FILTER(o)    (CAMEL_CHECK_TYPE((o), EM_INLINE_FILTER_TYPE))
+/* Standard GObject macros */
+#define EM_TYPE_INLINE_FILTER \
+	(em_inline_filter_get_type ())
+#define EM_INLINE_FILTER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), EM_TYPE_INLINE_FILTER, EMInlineFilter))
+#define EM_INLINE_FILTER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), EM_TYPE_INLINE_FILTER, EMInlineFilterClass))
+#define EM_IS_INLINE_FILTER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), EM_TYPE_INLINE_FILTER))
+#define EM_IS_INLINE_FILTER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), EM_TYPE_INLINE_FILTER))
+#define EM_INLINE_FILTER_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), EM_TYPE_INLINE_FILTER, EMInlineFilterClass))
 
 G_BEGIN_DECLS
 
-typedef struct _EMInlineFilter {
+typedef struct _EMInlineFilter EMInlineFilter;
+typedef struct _EMInlineFilterClass EMInlineFilterClass;
+
+struct _EMInlineFilter {
 	CamelMimeFilter filter;
 
 	gint state;
@@ -46,15 +61,16 @@ typedef struct _EMInlineFilter {
 	GByteArray *data;
 	gchar *filename;
 	GSList *parts;
-} EMInlineFilter;
+};
 
-typedef struct _EMInlineFilterClass {
+struct _EMInlineFilterClass {
 	CamelMimeFilterClass filter_class;
-} EMInlineFilterClass;
+};
 
-CamelType    em_inline_filter_get_type(void);
-EMInlineFilter *em_inline_filter_new(CamelTransferEncoding base_encoding, CamelContentType *type);
-CamelMultipart *em_inline_filter_get_multipart(EMInlineFilter *emif);
+GType		em_inline_filter_get_type	(void);
+EMInlineFilter *em_inline_filter_new		(CamelTransferEncoding base_encoding,
+						 CamelContentType *type);
+CamelMultipart *em_inline_filter_get_multipart	(EMInlineFilter *emif);
 
 G_END_DECLS
 
diff --git a/mail/em-junk.h b/mail/em-junk.h
index 79493caf2f..978f5ece7d 100644
--- a/mail/em-junk.h
+++ b/mail/em-junk.h
@@ -25,9 +25,8 @@
 #ifndef EM_JUNK_H
 #define EM_JUNK_H
 
+#include <camel/camel.h>
 #include <e-util/e-plugin.h>
-#include <camel/camel-junk-plugin.h>
-#include <camel/camel-mime-message.h>
 
 #define EM_JUNK_ERROR (em_junk_error_quark ())
 
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 4211fdac05..8152974f32 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -30,14 +30,12 @@
 #include "mail-ops.h"
 #include "mail-mt.h"
 /*#include "mail-folder-cache.h"*/
-#include "camel/camel-exception.h"
-#include "camel/camel-store.h"
-#include "camel/camel-session.h"
 
 #include "e-util/e-util.h"
 #include "e-util/e-account-utils.h"
 #include "e-util/e-util-private.h"
 
+#include "em-folder-utils.h"
 #include "em-subscribe-editor.h"
 
 #include "mail-config.h"
@@ -46,6 +44,15 @@
 
 #define d(x)
 
+enum {
+	COL_SUBSCRIBED = 0, /* G_TYPE_BOOLEAN */
+	COL_NAME,           /* G_TYPE_STRING  */
+	COL_INFO_NODE,      /* G_TYPE_POINTER */
+	COL_CAN_SELECT,     /* G_TYPE_BOOLEAN */
+	COL_ICON_NAME,      /* G_TYPE_STRING  */
+	N_COLUMNS
+};
+
 typedef struct _EMSubscribeEditor EMSubscribeEditor;
 struct _EMSubscribeEditor {
 	GQueue stores;
@@ -53,6 +60,9 @@ struct _EMSubscribeEditor {
 	gint busy;
 	guint busy_id;
 
+	gboolean is_filtering; /* whether filtering is active */
+	guint refilter_id;     /* source ID of a refilter action, after change in the filter edit */
+
 	struct _EMSubscribe *current; /* the current one, if any */
 
 	GtkDialog *dialog;
@@ -60,6 +70,10 @@ struct _EMSubscribeEditor {
 	GtkWidget *combobox;
 	GtkWidget *none_selected; /* 'please select a xxx' message */
 	GtkWidget *progress;
+	GtkWidget *filter_entry; /* when not empty, then it's filtering */
+	GtkWidget *expand_button;
+	GtkWidget *collapse_button;
+	GtkWidget *refresh_button;
 };
 
 typedef struct _EMSubscribe EMSubscribe;
@@ -78,13 +92,16 @@ struct _EMSubscribe {
 
 	GtkWidget *widget;	/* widget to show for this store */
 	GtkTreeView *tree;	/* tree, if we have it */
+	GtkTreeModel *tree_store; /* a tree store, used when not filtering */
+	GtkTreeModel *list_store; /* list store, used when filtering */
+	GSList *all_selectable; /* list of selectable info's, stored in the tree_store, in reverse order */
+
+	GSList *tree_expanded_paths; /* list of expanded paths in the tree model */
 
 	/* list of all returns from get_folder_info, accessed by other structures */
 	GSList *info_list;
 
-	/* pending LISTs, EMSubscribeNode's */
 	gint pending_id;
-	GQueue pending;
 
 	/* queue of pending UN/SUBSCRIBEs, EMsg's */
 	gint subscribe_id;
@@ -111,6 +128,80 @@ static void sub_editor_busy(EMSubscribeEditor *se, gint dir);
 static gint sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node);
 static void sub_selection_changed(GtkTreeSelection *selection, EMSubscribe *sub);
 
+static gboolean
+test_contains (const gchar *where, const gchar *what)
+{
+	gunichar c;
+	const gchar *at = what;
+
+	if (!what || !where)
+		return TRUE;
+
+	while (c = g_utf8_get_char_validated (where, -1), c != 0 && c != (gunichar) -1 && c != (gunichar) -2) {
+		if (g_utf8_get_char (at) == g_unichar_tolower (c)) {
+			at = g_utf8_next_char (at);
+			if (!at || !*at)
+				return TRUE;
+		} else {
+			at = what;
+		}
+		where = g_utf8_next_char (where);
+	}
+
+	return FALSE;
+}
+
+static void
+update_filtering_column (EMSubscribeEditor *se, struct _EMSubscribe *sub)
+{
+	gchar *text;
+	GtkTreeIter iter;
+	GtkTreeModel *list_store;
+	GSList *l;
+
+	g_return_if_fail (se != NULL);
+	g_return_if_fail (sub != NULL);
+	g_return_if_fail (g_utf8_validate (gtk_entry_get_text (GTK_ENTRY (se->filter_entry)), -1, NULL));
+
+	if (!sub->tree)
+		return;
+
+	if (gtk_tree_view_get_model (sub->tree) == sub->list_store)
+		gtk_tree_view_set_model (sub->tree, NULL);
+
+	text = g_utf8_strdown (gtk_entry_get_text (GTK_ENTRY (se->filter_entry)), -1);
+	list_store = sub->list_store;
+
+	gtk_list_store_clear (GTK_LIST_STORE (list_store));
+	for (l = sub->all_selectable; l; l = l->next) {
+		EMSubscribeNode *node = l->data;
+		gboolean bl;
+
+		if (!node || !node->path || !node->info)
+			continue;
+
+		bl = (!text || !*text || (node && node->info && node->info->full_name && test_contains (node->info->full_name, text)));
+		if (!bl)
+			continue;
+
+		gtk_list_store_prepend ((GtkListStore *)list_store, &iter);
+		gtk_list_store_set (GTK_LIST_STORE (list_store), &iter,
+			COL_SUBSCRIBED, (node->info->flags & CAMEL_FOLDER_SUBSCRIBED) != 0,
+			COL_NAME, node->info->full_name,
+			COL_INFO_NODE, node,
+			COL_CAN_SELECT, TRUE,
+			COL_ICON_NAME, em_folder_utils_get_icon_name (node->info->flags),
+			-1);
+	}
+
+	g_free (text);
+
+	if (!gtk_tree_view_get_model (sub->tree)) {
+		gtk_tree_view_set_model (sub->tree, sub->list_store);
+		gtk_tree_view_set_search_column (sub->tree, COL_NAME);
+	}
+}
+
 static void
 sub_node_free(EMSubscribeNode *node)
 {
@@ -136,8 +227,15 @@ sub_unref(EMSubscribe *sub)
 		d(printf("subscribe object finalised\n"));
 		/* we dont have to delete the "subscribe" task list, as it must be empty,
 		   otherwise we wouldn't be unreffed (intentional circular reference) */
+		if (sub->tree_store)
+			g_object_unref (sub->tree_store);
+		if (sub->list_store)
+			g_object_unref (sub->list_store);
 		if (sub->folders)
 			g_hash_table_destroy(sub->folders);
+		g_slist_free (sub->all_selectable);
+		g_slist_foreach (sub->tree_expanded_paths, (GFunc) gtk_tree_path_free, NULL);
+		g_slist_free (sub->tree_expanded_paths);
 		l = sub->info_list;
 		while (l) {
 			GSList *n = l->next;
@@ -147,7 +245,7 @@ sub_unref(EMSubscribe *sub)
 			l = n;
 		}
 		if (sub->store)
-			camel_object_unref(sub->store);
+			g_object_unref (sub->store);
 		g_free(sub->store_uri);
 		g_free(sub);
 	}
@@ -195,13 +293,14 @@ sub_folder_done (struct _zsubscribe_msg *m)
 	}
 
 	/* make sure the tree view matches the correct state */
-	model = gtk_tree_view_get_model(m->sub->tree);
+	/* all actions are done on tree store, synced to list store */
+	model = m->sub->tree_store;
 	if (gtk_tree_model_get_iter_from_string(model, &iter, m->path)) {
 		issub = (m->node->info->flags & CAMEL_FOLDER_SUBSCRIBED) != 0;
-		gtk_tree_model_get(model, &iter, 0, &subscribed, 2, &node, -1);
-		if (node == m->node)
-			gtk_tree_store_set((GtkTreeStore *)model, &iter, 0, issub, -1);
-		else {
+		gtk_tree_model_get(model, &iter, COL_SUBSCRIBED, &subscribed, COL_INFO_NODE, &node, -1);
+		if (node == m->node) {
+			gtk_tree_store_set ((GtkTreeStore *)model, &iter, COL_SUBSCRIBED, issub, -1);
+		} else {
 			d(printf("node mismatch, or subscribe state changed failed\n"));
 		}
 	}
@@ -267,14 +366,15 @@ sub_subscribe_folder (EMSubscribe *sub, EMSubscribeNode *node, gint state, const
 
 /* ********************************************************************** */
 static void
-sub_fill_level(EMSubscribe *sub, CamelFolderInfo *info,  GtkTreeIter *parent, gint pending)
+sub_fill_levels (EMSubscribe *sub, CamelFolderInfo *info, GtkTreeIter *parent)
 {
 	CamelFolderInfo *fi;
 	GtkTreeStore *treestore;
 	GtkTreeIter iter;
 	EMSubscribeNode *node;
 
-	treestore = (GtkTreeStore *)gtk_tree_view_get_model(sub->tree);
+	treestore = (GtkTreeStore *) sub->tree_store;
+	g_return_if_fail (treestore != NULL);
 
 	/* first, fill a level up */
 	fi = info;
@@ -288,12 +388,25 @@ sub_fill_level(EMSubscribe *sub, CamelFolderInfo *info,  GtkTreeIter *parent, gi
 			node = g_malloc0(sizeof(*node));
 			node->info = fi;
 			state = (fi->flags & CAMEL_FOLDER_SUBSCRIBED) != 0;
-			gtk_tree_store_set(treestore, &iter, 0, state, 1, fi->name, 2, node, -1);
+			gtk_tree_store_set (treestore, &iter,
+				COL_SUBSCRIBED, state,
+				COL_NAME, fi->name,
+				COL_INFO_NODE, node,
+				COL_CAN_SELECT, (fi->flags & CAMEL_FOLDER_NOSELECT) == 0,
+				COL_ICON_NAME, em_folder_utils_get_icon_name (fi->flags),
+				-1);
+			if ((fi->flags & CAMEL_FOLDER_NOSELECT) == 0)
+				sub->all_selectable = g_slist_prepend (sub->all_selectable, node);
+			if (state) {
+				GtkTreePath *path = gtk_tree_model_get_path ((GtkTreeModel *)treestore, &iter);
+				gtk_tree_view_expand_to_path (sub->tree, path);
+				gtk_tree_path_free (path);
+			}
 			if ((fi->flags & CAMEL_FOLDER_NOINFERIORS) == 0)
 				node->path = gtk_tree_model_get_path((GtkTreeModel *)treestore, &iter);
 			g_hash_table_insert(sub->folders, fi->full_name, node);
 		} else if (node->path) {
-			gtk_tree_model_get_iter(gtk_tree_view_get_model(sub->tree), &iter, node->path);
+			gtk_tree_model_get_iter (GTK_TREE_MODEL (treestore), &iter, node->path);
 			known = TRUE;
 		}
 
@@ -306,18 +419,9 @@ sub_fill_level(EMSubscribe *sub, CamelFolderInfo *info,  GtkTreeIter *parent, gi
 			/* save time, if we have any children alread, dont re-scan */
 			if (fi->child) {
 				d(printf("scanning child '%s'\n", fi->child->full_name));
-				sub_fill_level(sub, fi->child, &iter, FALSE);
+				sub_fill_levels (sub, fi->child, &iter);
 			} else if (!(fi->flags & CAMEL_FOLDER_NOCHILDREN)) {
-				GtkTreeIter new_iter;
 				d(printf("flags: CAMEL_FOLDER_NOCHILDREN is not set '%s', known:%d\n", fi->full_name, known?1:0));
-				if (!known) {
-					gtk_tree_store_append(treestore, &new_iter, &iter);
-					gtk_tree_store_set(treestore, &new_iter, 0, 0, 1, "Loading...", 2, NULL, -1);
-				}
-			}
-			else {
-				if (pending)
-					g_queue_push_tail (&sub->pending, node);
 			}
 		} else {
 			d(printf("%s:%s: fi->flags & CAMEL_FOLDER_NOINFERIORS=%d\t node->path=[%p]\n",
@@ -344,21 +448,17 @@ struct _emse_folderinfo_msg {
 static void
 sub_folderinfo_exec (struct _emse_folderinfo_msg *m)
 {
-	gchar *pub_full_name=NULL;
-
 	if (m->seq == m->sub->seq) {
-		camel_operation_register(m->base.cancel);
-		m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name,
-						      CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL | CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST, &m->base.ex);
-		camel_operation_unregister(m->base.cancel);
+		camel_operation_register (m->base.cancel);
+		/* get the full folder tree for search ability */
+		m->info = camel_store_get_folder_info (m->sub->store, NULL, CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL | CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST | CAMEL_STORE_FOLDER_INFO_RECURSIVE, &m->base.ex);
+		camel_operation_unregister (m->base.cancel);
 	}
 }
 
 static void
 sub_folderinfo_done (struct _emse_folderinfo_msg *m)
 {
-	EMSubscribeNode *node;
-
 	m->sub->pending_id = -1;
 	if (m->sub->cancel || m->seq != m->sub->seq)
 		return;
@@ -372,17 +472,15 @@ sub_folderinfo_done (struct _emse_folderinfo_msg *m)
 		if (m->node) {
 			GtkTreeIter iter;
 
-			gtk_tree_model_get_iter(gtk_tree_view_get_model(m->sub->tree), &iter, m->node->path);
-			sub_fill_level(m->sub, m->info, &iter, FALSE);
+			gtk_tree_model_get_iter (m->sub->tree_store, &iter, m->node->path);
+			sub_fill_levels (m->sub, m->info, &iter);
 		} else {
-			sub_fill_level(m->sub, m->info, NULL, TRUE);
+			sub_fill_levels (m->sub, m->info, NULL);
 		}
-	}
 
-	/* check for more to do */
-	node = g_queue_pop_head (&m->sub->pending);
-	if (node)
-		sub_queue_fill_level(m->sub, node);
+		if (m->sub->editor->is_filtering)
+			update_filtering_column (m->sub->editor, m->sub);
+	}
 }
 
 static void
@@ -436,6 +534,21 @@ sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node)
 	return id;
 }
 
+static void
+update_buttons_sesitivity (EMSubscribeEditor *se)
+{
+	gboolean is_tree_model;
+
+	if (!se)
+		return;
+
+	is_tree_model = se->current && se->current->tree && !se->is_filtering;
+
+	gtk_widget_set_sensitive (se->expand_button, is_tree_model);
+	gtk_widget_set_sensitive (se->collapse_button, is_tree_model);
+	gtk_widget_set_sensitive (se->refresh_button, se->current && se->current->tree);
+}
+
 /* ********************************************************************** */
 
 /* (un) subscribes the current selection */
@@ -451,10 +564,26 @@ sub_subscribe_toggled(GtkCellRendererToggle *render, const gchar *spath, EMSubsc
 	d(printf("subscribe toggled?\n"));
 
 	if (gtk_tree_model_get_iter_from_string(model, &iter, spath)) {
-		gtk_tree_model_get(model, &iter, 0, &subscribed, 2, &node, -1);
+		gchar *free_path;
+
+		gtk_tree_model_get(model, &iter, COL_SUBSCRIBED, &subscribed, COL_INFO_NODE, &node, -1);
+		g_return_if_fail (node != NULL);
 		subscribed = !subscribed;
 		d(printf("new state is %s\n", subscribed?"subscribed":"not subscribed"));
-		gtk_tree_store_set((GtkTreeStore *)model, &iter, 0, subscribed, -1);
+		if (GTK_IS_TREE_STORE (model)) {
+			gtk_tree_store_set ((GtkTreeStore *)model, &iter, COL_SUBSCRIBED, subscribed, -1);
+		} else {
+			/* it's a list store, convert spath to tree path and update tree store value */
+			gtk_list_store_set (GTK_LIST_STORE (model), &iter, COL_SUBSCRIBED, subscribed, -1);
+			if (gtk_tree_model_get_iter (sub->tree_store, &iter, node->path)) {
+				gtk_tree_store_set ((GtkTreeStore *)sub->tree_store, &iter, COL_SUBSCRIBED, subscribed, -1);
+			}
+			free_path = gtk_tree_path_to_string (node->path);
+			if (subscribed)
+				sub->tree_expanded_paths = g_slist_prepend (sub->tree_expanded_paths, gtk_tree_path_copy (node->path));
+			spath = free_path;
+		}
+
 		sub_subscribe_folder(sub, node, subscribed, spath);
 	}
 }
@@ -465,7 +594,7 @@ static void sub_do_changed(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *
 	EMSubscribeNode *node;
 	gboolean subscribed;
 
-	gtk_tree_model_get(model, iter, 0, &subscribed, 2, &node, -1);
+	gtk_tree_model_get(model, iter, COL_SUBSCRIBED, &subscribed, COL_INFO_NODE, &node, -1);
 
 	if (subscribed)
 		sub->selected_subscribed_count++;
@@ -491,52 +620,6 @@ static void sub_row_activated(GtkTreeView *tree, GtkTreePath *path, GtkTreeViewC
 }
 
 static void
-sub_row_expanded(GtkTreeView *tree, GtkTreeIter *iter, GtkTreePath *path, EMSubscribe *sub)
-{
-	EMSubscribeNode *node;
-	GtkTreeIter child;
-	GtkTreeModel *model = (GtkTreeModel *)gtk_tree_view_get_model(tree);
-	gchar *row_name;
-
-	gtk_tree_model_get(model, iter, 1, &row_name, -1);
-	d(printf("%s:%s: row-expanded '%s'\n", G_STRLOC, G_STRFUNC,
-		 row_name?row_name:"<root>"));
-
-	/* Do we really need to fetch the children for this row? */
-	if (gtk_tree_model_iter_n_children(model, iter) > 1) {
-		gtk_tree_model_get(model, iter, 2, &node, -1);
-		if (node->path) {
-			/* Mark it as already-processed path */
-			gtk_tree_path_free(node->path);
-			node->path=NULL;
-		}
-		return;
-	} else {
-		gtk_tree_model_iter_children(model, &child, iter);
-		gtk_tree_model_get(model, &child, 2, &node, -1);
-		if (!node) {
-			/* This is the place holder node, delete it and fire-up a pending */
-			gtk_tree_store_remove((GtkTreeStore *)model, &child);
-			gtk_tree_model_get(model, iter, 2, &node, -1);
-		} else {
-			gtk_tree_model_get(model, iter, 2, &node, -1);
-			if (node->path) {
-				/* Mark it as already-processed path */
-				gtk_tree_path_free(node->path);
-				node->path=NULL;
-			}
-			return;
-		}
-	}
-
-	g_queue_push_head (&sub->pending, node);
-
-	if (sub->pending_id == -1
-	    && (node = g_queue_pop_tail (&sub->pending)) != NULL)
-		sub_queue_fill_level(sub, node);
-}
-
-static void
 sub_destroy(GtkWidget *w, EMSubscribe *sub)
 {
 	struct _zsubscribe_msg *m;
@@ -571,7 +654,6 @@ subscribe_new(EMSubscribeEditor *se, const gchar *uri)
 	sub->editor = se;
 	sub->ref_count = 1;
 	sub->pending_id = -1;
-	g_queue_init (&sub->pending);
 	sub->subscribe_id = -1;
 	g_queue_init (&sub->subscribe);
 	sub->store_id = -1;
@@ -593,19 +675,37 @@ subscribe_set_store(EMSubscribe *sub, CamelStore *store)
 		gtk_widget_show(sub->widget);
 	} else {
 		GtkTreeSelection *selection;
+		GtkTreeViewColumn *column;
 		GtkCellRenderer *renderer;
-		GtkTreeStore *model;
 
+		sub->all_selectable = NULL;
+		sub->tree_expanded_paths = NULL;
 		sub->store = store;
-		camel_object_ref(store);
+		g_object_ref (store);
 		sub->folders = g_hash_table_new_full (
 			g_str_hash, g_str_equal,
 			(GDestroyNotify) NULL,
 			(GDestroyNotify) sub_node_free);
 
-		model = gtk_tree_store_new (3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER);
-		sub->tree = (GtkTreeView *) gtk_tree_view_new_with_model ((GtkTreeModel *) model);
-		g_object_unref (model);
+		sub->tree_store = (GtkTreeModel *) gtk_tree_store_new (N_COLUMNS,
+			G_TYPE_BOOLEAN, /* COL_SUBSCRIBED */
+			G_TYPE_STRING,  /* COL_NAME       */
+			G_TYPE_POINTER, /* COL_INFO_NODE  */
+			G_TYPE_BOOLEAN, /* COL_CAN_SELECT */
+			G_TYPE_STRING   /* COL_ICON_NAME  */
+		);
+		g_object_ref_sink (sub->tree_store);
+
+		sub->list_store = (GtkTreeModel *) gtk_list_store_new (N_COLUMNS,
+			G_TYPE_BOOLEAN, /* COL_SUBSCRIBED */
+			G_TYPE_STRING,  /* COL_NAME       */
+			G_TYPE_POINTER, /* COL_INFO_NODE  */
+			G_TYPE_BOOLEAN, /* COL_CAN_SELECT */
+			G_TYPE_STRING   /* COL_ICON_NAME  */
+		);
+		g_object_ref_sink (sub->list_store);
+
+		sub->tree = (GtkTreeView *) gtk_tree_view_new_with_model (sub->editor->is_filtering ? sub->list_store : sub->tree_store);
 		gtk_widget_show ((GtkWidget *)sub->tree);
 
 		sub->widget = gtk_scrolled_window_new (NULL, NULL);
@@ -616,18 +716,31 @@ subscribe_set_store(EMSubscribe *sub, CamelStore *store)
 
 		renderer = gtk_cell_renderer_toggle_new ();
 		g_object_set(renderer, "activatable", TRUE, NULL);
-		gtk_tree_view_insert_column_with_attributes (sub->tree, -1, _("Subscribed"), renderer, "active", 0, NULL);
+		gtk_tree_view_insert_column_with_attributes (sub->tree, -1, _("Subscribed"), renderer, "active", COL_SUBSCRIBED, "visible", COL_CAN_SELECT, NULL);
 		g_signal_connect(renderer, "toggled", G_CALLBACK(sub_subscribe_toggled), sub);
 
+		column = gtk_tree_view_column_new ();
+		gtk_tree_view_column_set_title (column, _("Folder"));
+		gtk_tree_view_append_column (sub->tree, column);
+
+		renderer = gtk_cell_renderer_pixbuf_new ();
+		gtk_tree_view_column_pack_start (column, renderer, FALSE);
+		gtk_tree_view_column_add_attribute (
+			column, renderer, "icon-name", COL_ICON_NAME);
+
 		renderer = gtk_cell_renderer_text_new ();
-		gtk_tree_view_insert_column_with_attributes (sub->tree, -1, _("Folder"), renderer, "text", 1, NULL);
+		gtk_tree_view_column_pack_start (column, renderer, TRUE);
+		gtk_tree_view_column_add_attribute (
+			column, renderer, "text", COL_NAME);
 		gtk_tree_view_set_expander_column(sub->tree, gtk_tree_view_get_column(sub->tree, 1));
 
 		selection = gtk_tree_view_get_selection (sub->tree);
 		gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
 		gtk_tree_view_set_headers_visible (sub->tree, FALSE);
 
-		g_signal_connect(sub->tree, "row-expanded", G_CALLBACK(sub_row_expanded), sub);
+		gtk_tree_view_set_search_column (sub->tree, COL_NAME);
+		gtk_tree_view_set_enable_search (sub->tree, TRUE);
+
 		g_signal_connect(sub->tree, "row-activated", G_CALLBACK(sub_row_activated), sub);
 		g_signal_connect(sub->tree, "destroy", G_CALLBACK(sub_destroy), sub);
 
@@ -635,6 +748,8 @@ subscribe_set_store(EMSubscribe *sub, CamelStore *store)
 		g_signal_connect(selection, "changed", G_CALLBACK(sub_selection_changed), sub);
 
 		sub_queue_fill_level(sub, NULL);
+
+		update_buttons_sesitivity (sub->editor);
 	}
 
 	gtk_box_pack_start((GtkBox *)sub->editor->vbox, sub->widget, TRUE, TRUE, 0);
@@ -647,6 +762,9 @@ sub_editor_destroy(GtkWidget *w, EMSubscribeEditor *se)
 	d(printf("editor destroyed, freeing editor\n"));
 	if (se->busy_id)
 		g_source_remove(se->busy_id);
+	if (se->refilter_id != 0)
+		g_source_remove (se->refilter_id);
+	se->refilter_id = 0;
 
 	g_free(se);
 }
@@ -675,9 +793,15 @@ sub_editor_refresh(GtkWidget *w, EMSubscribeEditor *se)
 		mail_msg_wait(sub->pending_id);
 	}
 
-	gtk_tree_store_clear((GtkTreeStore *)gtk_tree_view_get_model(sub->tree));
+	g_slist_free (sub->all_selectable);
+	sub->all_selectable = NULL;
 
-	g_queue_init (&sub->pending);
+	g_slist_foreach (sub->tree_expanded_paths, (GFunc) gtk_tree_path_free, NULL);
+	g_slist_free (sub->tree_expanded_paths);
+	sub->tree_expanded_paths = NULL;
+
+	gtk_tree_store_clear ((GtkTreeStore *)sub->tree_store);
+	gtk_list_store_clear ((GtkListStore *)sub->list_store);
 
 	if (sub->folders)
 		g_hash_table_destroy(sub->folders);
@@ -717,11 +841,9 @@ sub_editor_combobox_changed (GtkWidget *w, EMSubscribeEditor *se)
 
 	d(printf("combobox changed\n"));
 
-	i = 1;
+	i = 0;
 	n = gtk_combo_box_get_active (GTK_COMBO_BOX (se->combobox));
-	if (n == 0) {
-		gtk_widget_show (se->none_selected);
-	} else {
+	if (n != -1) {
 		GtkTreeIter iter;
 		GtkTreeModel *model;
 
@@ -729,14 +851,27 @@ sub_editor_combobox_changed (GtkWidget *w, EMSubscribeEditor *se)
 
 		model = gtk_combo_box_get_model (GTK_COMBO_BOX (se->combobox));
 		if (gtk_tree_model_get_iter_first (model, &iter)) {
-			/* hide the first item */
-			gtk_list_store_set (
-				GTK_LIST_STORE (model), &iter,
-				1, FALSE,
-				-1);
+			gboolean is_account = TRUE;
+
+			gtk_tree_model_get (model, &iter, 1, &is_account, -1);
+
+			if (!is_account && n > 0) {
+				/* the first node it not an account node, it's the notice
+				   about "select account please", thus remove it completely */
+				gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+				n--;
+			} else if (!is_account) {
+				gtk_widget_show (se->none_selected);
+				i++;
+			}
 		}
 	}
 
+	if (se->refilter_id != 0) {
+		g_source_remove (se->refilter_id);
+		se->refilter_id = 0;
+	}
+
 	se->current = NULL;
 	link = g_queue_peek_head_link (&se->stores);
 	while (link != NULL) {
@@ -758,6 +893,11 @@ sub_editor_combobox_changed (GtkWidget *w, EMSubscribeEditor *se)
 
 		link = g_list_next (link);
 	}
+
+	update_buttons_sesitivity (se);
+
+	if (se->current && se->is_filtering)
+		update_filtering_column (se, se->current);
 }
 
 static gboolean sub_editor_timeout(EMSubscribeEditor *se)
@@ -803,6 +943,137 @@ window_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 	g_object_unref (gconf);
 }
 
+static void
+store_expanded_rows_cb (GtkTreeView *tree_view, GtkTreePath *path, gpointer data)
+{
+	GSList **slist = data;
+
+	g_return_if_fail (path != NULL);
+	g_return_if_fail (data != NULL);
+
+	*slist = g_slist_prepend (*slist, gtk_tree_path_copy (path));
+}
+
+static void
+expand_to_path_cb (GtkTreePath *path, GtkTreeView *tree_view)
+{
+	g_return_if_fail (path != NULL);
+	g_return_if_fail (tree_view != NULL);
+
+	gtk_tree_view_expand_to_path (tree_view, path);
+}
+
+static void
+change_filtering_models (EMSubscribeEditor *se, gboolean turn_on)
+{
+	GList *link;
+
+	link = g_queue_peek_head_link (&se->stores);
+	while (link != NULL) {
+		struct _EMSubscribe *sub = link->data;
+
+		if (sub->widget && sub->tree) {
+			if (turn_on) {
+				g_slist_foreach (sub->tree_expanded_paths, (GFunc) gtk_tree_path_free, NULL);
+				g_slist_free (sub->tree_expanded_paths);
+				sub->tree_expanded_paths = NULL;
+
+				gtk_tree_view_map_expanded_rows (sub->tree, store_expanded_rows_cb, &sub->tree_expanded_paths);
+
+				gtk_list_store_clear (GTK_LIST_STORE (sub->list_store));
+				gtk_tree_view_set_model (sub->tree, sub->list_store);
+			} else {
+				gtk_tree_view_set_model (sub->tree, sub->tree_store);
+
+				g_slist_foreach (sub->tree_expanded_paths, (GFunc) expand_to_path_cb, sub->tree);
+				g_slist_foreach (sub->tree_expanded_paths, (GFunc) gtk_tree_path_free, NULL);
+				g_slist_free (sub->tree_expanded_paths);
+				sub->tree_expanded_paths = NULL;
+			}
+
+			gtk_tree_view_set_search_column (sub->tree, COL_NAME);
+		}
+
+		link = g_list_next (link);
+	}
+
+	update_buttons_sesitivity (se);
+}
+
+static gboolean
+update_filter_on_timeout_cb (gpointer data)
+{
+	EMSubscribeEditor *se = data;
+
+	g_return_val_if_fail (se != NULL, FALSE);
+
+	se->refilter_id = 0;
+	if (se->current) {
+		/* update filtering options */
+		update_filtering_column (se, se->current);
+	}
+
+	return FALSE;
+}
+
+static void
+clear_filter_cb (GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, EMSubscribeEditor *se)
+{
+	g_return_if_fail (entry != NULL);
+
+	gtk_entry_set_text (entry, "");
+}
+
+static void
+filter_changed_cb (GtkEntry *entry, EMSubscribeEditor *se)
+{
+	const gchar *text;
+	gboolean was_filtering;
+
+	g_return_if_fail (entry != NULL);
+	g_return_if_fail (se != NULL);
+
+	text = gtk_entry_get_text (entry);
+	was_filtering = se->is_filtering;
+	se->is_filtering = text && *text;
+	gtk_entry_set_icon_sensitive (GTK_ENTRY (se->filter_entry), GTK_ENTRY_ICON_SECONDARY, se->is_filtering);
+
+	if (se->refilter_id != 0) {
+		g_source_remove (se->refilter_id);
+		se->refilter_id = 0;
+	}
+
+	if ((was_filtering && !se->is_filtering) || (!was_filtering && se->is_filtering)) {
+		/* turn on/off filtering - change models */
+		change_filtering_models (se, se->is_filtering);
+	}
+
+	if (se->is_filtering && se->current)
+		se->refilter_id = g_timeout_add (333, update_filter_on_timeout_cb, se);
+}
+
+static void
+expand_all_cb (GtkButton *button, EMSubscribeEditor *se)
+{
+	g_return_if_fail (se != NULL);
+	g_return_if_fail (!se->is_filtering);
+	g_return_if_fail (se->current != NULL);
+	g_return_if_fail (se->current->tree != NULL);
+
+	gtk_tree_view_expand_all (se->current->tree);
+}
+
+static void
+collapse_all_cb (GtkButton *button, EMSubscribeEditor *se)
+{
+	g_return_if_fail (se != NULL);
+	g_return_if_fail (!se->is_filtering);
+	g_return_if_fail (se->current != NULL);
+	g_return_if_fail (se->current->tree != NULL);
+
+	gtk_tree_view_collapse_all (se->current->tree);
+}
+
 GtkWidget *
 em_subscribe_editor_new(void)
 {
@@ -811,6 +1082,7 @@ em_subscribe_editor_new(void)
 	EIterator *iter;
 	GtkBuilder *builder;
 	GtkWidget *w;
+	GtkWidget *container;
 	GtkCellRenderer *cell;
 	GtkListStore *store;
 	GtkTreeIter gtiter;
@@ -826,8 +1098,12 @@ em_subscribe_editor_new(void)
 	g_signal_connect(se->dialog, "destroy", G_CALLBACK(sub_editor_destroy), se);
 
 	gtk_widget_ensure_style ((GtkWidget *)se->dialog);
-	gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *)se->dialog)->action_area, 12);
-	gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *)se->dialog)->vbox, 0);
+
+	container = gtk_dialog_get_action_area (GTK_DIALOG (se->dialog));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 12);
+
+	container = gtk_dialog_get_content_area (GTK_DIALOG (se->dialog));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 0);
 
 	se->vbox = e_builder_get_widget(builder, "tree_box");
 
@@ -844,11 +1120,22 @@ em_subscribe_editor_new(void)
 	se->progress = e_builder_get_widget(builder, "progress_bar");
 	gtk_widget_hide(se->progress);
 
-	w = e_builder_get_widget(builder, "close_button");
-	g_signal_connect(w, "clicked", G_CALLBACK(sub_editor_close), se);
+	se->filter_entry = e_builder_get_widget (builder, "filter_entry");
+	gtk_entry_set_icon_sensitive (GTK_ENTRY (se->filter_entry), GTK_ENTRY_ICON_SECONDARY, FALSE);
+	g_signal_connect (se->filter_entry, "icon-press", G_CALLBACK (clear_filter_cb), se);
+	g_signal_connect (se->filter_entry, "changed", G_CALLBACK (filter_changed_cb), se);
 
-	w = e_builder_get_widget(builder, "refresh_button");
-	g_signal_connect(w, "clicked", G_CALLBACK(sub_editor_refresh), se);
+	se->expand_button = e_builder_get_widget (builder, "expand_button");
+	g_signal_connect (se->expand_button, "clicked", G_CALLBACK (expand_all_cb), se);
+
+	se->collapse_button = e_builder_get_widget (builder, "collapse_button");
+	g_signal_connect (se->collapse_button, "clicked", G_CALLBACK (collapse_all_cb), se);
+
+	se->refresh_button = e_builder_get_widget (builder, "refresh_button");
+	g_signal_connect (se->refresh_button, "clicked", G_CALLBACK (sub_editor_refresh), se);
+
+	w = e_builder_get_widget (builder, "close_button");
+	g_signal_connect (w, "clicked", G_CALLBACK (sub_editor_close), se);
 
 	/* setup stores combobox */
 	se->combobox = e_builder_get_widget (builder, "store_combobox");
@@ -862,14 +1149,13 @@ em_subscribe_editor_new(void)
 	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (se->combobox), cell, TRUE);
 	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (se->combobox), cell,
                                   "text", 0,
-                                  "visible", 1,
                                   NULL);
 
 	gtk_list_store_append (store, &gtiter);
 	gtk_list_store_set (
 		store, &gtiter,
 		0, _("No server has been selected"),
-		1, TRUE,
+		1, FALSE,
 		-1);
 
 	accounts = e_get_account_list ();
@@ -924,5 +1210,7 @@ em_subscribe_editor_new(void)
 	gtk_window_set_default_size ((GtkWindow *) se->dialog, window_size.width, window_size.height);
 	g_signal_connect (se->dialog, "size-allocate", G_CALLBACK (window_size_allocate), NULL);
 
+	update_buttons_sesitivity (se);
+
 	return GTK_WIDGET (se->dialog);
 }
diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c
index 982a56c90a..d0dd6e7853 100644
--- a/mail/em-sync-stream.c
+++ b/mail/em-sync-stream.c
@@ -29,13 +29,10 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <camel/camel-object.h>
 #include <libedataserver/e-flag.h>
 
 #include "mail-mt.h"
 
-#define EMSS_CLASS(x) ((EMSyncStreamClass *)(((CamelObject *)(x))->klass))
-
 enum _write_msg_t {
 	EMSS_WRITE,
 	EMSS_FLUSH,
@@ -52,10 +49,10 @@ struct _write_msg {
 	gsize len;
 };
 
-static CamelStreamClass *parent_class = NULL;
+G_DEFINE_TYPE (EMSyncStream, em_sync_stream, CAMEL_TYPE_STREAM)
 
 static gboolean
-emss_process_message (struct _write_msg *msg)
+sync_stream_process_message (struct _write_msg *msg)
 {
 	struct _EMSyncStream *emss = msg->emss;
 
@@ -68,7 +65,7 @@ emss_process_message (struct _write_msg *msg)
 
 	/* Force out any pending data before doing anything else. */
 	if (emss->buffer != NULL && emss->buffer->len > 0) {
-		EMSS_CLASS (emss)->sync_write (
+		EM_SYNC_STREAM_GET_CLASS (emss)->sync_write (
 			CAMEL_STREAM (emss), emss->buffer->str,
 			emss->buffer->len);
 		g_string_set_size (emss->buffer, 0);
@@ -76,15 +73,15 @@ emss_process_message (struct _write_msg *msg)
 
 	switch (msg->op) {
 		case EMSS_WRITE:
-			EMSS_CLASS (emss)->sync_write (
+			EM_SYNC_STREAM_GET_CLASS (emss)->sync_write (
 				CAMEL_STREAM (emss), msg->string, msg->len);
 			break;
 		case EMSS_FLUSH:
-			EMSS_CLASS (emss)->sync_flush (
+			EM_SYNC_STREAM_GET_CLASS (emss)->sync_flush (
 				CAMEL_STREAM (emss));
 			break;
 		case EMSS_CLOSE:
-			EMSS_CLASS (emss)->sync_close (
+			EM_SYNC_STREAM_GET_CLASS (emss)->sync_close (
 				CAMEL_STREAM (emss));
 			break;
 	}
@@ -96,7 +93,7 @@ emss_process_message (struct _write_msg *msg)
 }
 
 static void
-emss_sync_op (EMSyncStream *emss, enum _write_msg_t op,
+sync_stream_sync_op (EMSyncStream *emss, enum _write_msg_t op,
 	      const gchar *string, gsize len)
 {
 	struct _write_msg msg;
@@ -107,20 +104,31 @@ emss_sync_op (EMSyncStream *emss, enum _write_msg_t op,
 	msg.string = string;
 	msg.len = len;
 
-	camel_object_ref (emss);
+	g_object_ref (emss);
 
 	if (emss->idle_id)
 		g_source_remove (emss->idle_id);
-	emss->idle_id = g_idle_add ((GSourceFunc) emss_process_message, &msg);
+	emss->idle_id = g_idle_add ((GSourceFunc) sync_stream_process_message, &msg);
 
 	e_flag_wait (msg.done);
 	e_flag_free (msg.done);
 
-	camel_object_unref (emss);
+	g_object_unref (emss);
+}
+
+static void
+sync_stream_finalize (GObject *object)
+{
+	EMSyncStream *emss = EM_SYNC_STREAM (object);
+
+	if (emss->buffer != NULL)
+		g_string_free (emss->buffer, TRUE);
+	if (emss->idle_id)
+		g_source_remove (emss->idle_id);
 }
 
 static gssize
-emss_stream_write (CamelStream *stream, const gchar *string, gsize len)
+sync_stream_write (CamelStream *stream, const gchar *string, gsize len)
 {
 	EMSyncStream *emss = EM_SYNC_STREAM (stream);
 
@@ -128,21 +136,21 @@ emss_stream_write (CamelStream *stream, const gchar *string, gsize len)
 		return -1;
 
 	if (mail_in_main_thread ()) {
-		EMSS_CLASS (emss)->sync_write (stream, string, len);
+		EM_SYNC_STREAM_GET_CLASS (emss)->sync_write (stream, string, len);
 	} else if (emss->buffer != NULL) {
 		if (len < (emss->buffer->allocated_len - emss->buffer->len))
 			g_string_append_len (emss->buffer, string, len);
 		else
-			emss_sync_op (emss, EMSS_WRITE, string, len);
+			sync_stream_sync_op (emss, EMSS_WRITE, string, len);
 	} else {
-		emss_sync_op(emss, EMSS_WRITE, string, len);
+		sync_stream_sync_op(emss, EMSS_WRITE, string, len);
 	}
 
 	return (gssize) len;
 }
 
 static gint
-emss_stream_flush (CamelStream *stream)
+sync_stream_flush (CamelStream *stream)
 {
 	EMSyncStream *emss = EM_SYNC_STREAM (stream);
 
@@ -150,15 +158,15 @@ emss_stream_flush (CamelStream *stream)
 		return -1;
 
 	if (mail_in_main_thread ())
-		return EMSS_CLASS (emss)->sync_flush (stream);
+		return EM_SYNC_STREAM_GET_CLASS (emss)->sync_flush (stream);
 	else
-		emss_sync_op (emss, EMSS_FLUSH, NULL, 0);
+		sync_stream_sync_op (emss, EMSS_FLUSH, NULL, 0);
 
 	return 0;
 }
 
 static gint
-emss_stream_close (CamelStream *stream)
+sync_stream_close (CamelStream *stream)
 {
 	EMSyncStream *emss = EM_SYNC_STREAM (stream);
 
@@ -168,9 +176,9 @@ emss_stream_close (CamelStream *stream)
 	emss->idle_id = 0;
 
 	if (mail_in_main_thread ())
-		return EMSS_CLASS (emss)->sync_close (stream);
+		return EM_SYNC_STREAM_GET_CLASS (emss)->sync_close (stream);
 	else
-		emss_sync_op (emss, EMSS_CLOSE, NULL, 0);
+		sync_stream_sync_op (emss, EMSS_CLOSE, NULL, 0);
 
 	return 0;
 }
@@ -178,41 +186,21 @@ emss_stream_close (CamelStream *stream)
 static void
 em_sync_stream_class_init (EMSyncStreamClass *class)
 {
-	CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (class);
+	GObjectClass *object_class;
+	CamelStreamClass *stream_class;
 
-	parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE;
+	object_class = G_OBJECT_CLASS (class);
+	object_class->finalize = sync_stream_finalize;
 
-	stream_class->write = emss_stream_write;
-	stream_class->flush = emss_stream_flush;
-	stream_class->close = emss_stream_close;
+	stream_class = CAMEL_STREAM_CLASS (class);
+	stream_class->write = sync_stream_write;
+	stream_class->flush = sync_stream_flush;
+	stream_class->close = sync_stream_close;
 }
 
 static void
-em_sync_stream_finalize (EMSyncStream *emss)
-{
-	if (emss->buffer != NULL)
-		g_string_free (emss->buffer, TRUE);
-	if (emss->idle_id)
-		g_source_remove (emss->idle_id);
-}
-
-CamelType
-em_sync_stream_get_type (void)
+em_sync_stream_init (EMSyncStream *emss)
 {
-	static CamelType type = CAMEL_INVALID_TYPE;
-
-	if (G_UNLIKELY (type == CAMEL_INVALID_TYPE))
-		type = camel_type_register (
-			CAMEL_STREAM_TYPE,
-			"EMSyncStream",
-			sizeof (EMSyncStream),
-			sizeof (EMSyncStreamClass),
-			(CamelObjectClassInitFunc) em_sync_stream_class_init,
-			NULL,
-			(CamelObjectInitFunc) NULL,
-			(CamelObjectFinalizeFunc) em_sync_stream_finalize);
-
-	return type;
 }
 
 void
diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h
index 3d74a02a35..593079021e 100644
--- a/mail/em-sync-stream.h
+++ b/mail/em-sync-stream.h
@@ -31,18 +31,26 @@ requests are always handled in the main gui thread in the correct order.
 #define EM_SYNC_STREAM_H
 
 #include <glib.h>
-#include <camel/camel-stream.h>
+#include <camel/camel.h>
 
-#define EM_SYNC_STREAM_TYPE \
+/* Standard GObject macros */
+#define EM_TYPE_SYNC_STREAM \
 	(em_sync_stream_get_type ())
 #define EM_SYNC_STREAM(obj) \
-	(CAMEL_CHECK_CAST \
-	((obj), EM_SYNC_STREAM_TYPE, EMSyncStream))
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), EM_TYPE_SYNC_STREAM, EMSyncStream))
 #define EM_SYNC_STREAM_CLASS(cls) \
-	(CAMEL_CHECK_CLASS_CAST \
-	((cls), EM_SYNC_STREAM_TYPE, EMSyncStreamClass))
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), EM_TYPE_SYNC_STREAM, EMSyncStreamClass))
 #define EM_IS_SYNC_STREAM(obj) \
-	(CAMEL_CHECK_TYPE ((obj), EM_SYNC_STREAM_TYPE))
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), EM_TYPE_SYNC_STREAM))
+#define EM_IS_SYNC_STREAM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), EM_TYPE_SYNC_STREAM))
+#define EM_SYNC_STREAM_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), EM_TYPE_SYNC_STREAM, EMSyncStreamClass))
 
 G_BEGIN_DECLS
 
@@ -66,7 +74,7 @@ struct _EMSyncStreamClass {
 	gint		(*sync_flush)		(CamelStream *stream);
 };
 
-CamelType	em_sync_stream_get_type		(void);
+GType		em_sync_stream_get_type		(void);
 void		em_sync_stream_set_buffer_size	(EMSyncStream *stream,
 						 gsize size);
 
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 340ec58e64..ed6cef3779 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -42,11 +42,6 @@
 #undef interface
 #endif
 
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-url-scanner.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-string-utils.h>
-
 #include <libebook/e-book.h>
 
 #include "em-filter-editor.h"
@@ -103,7 +98,14 @@ em_utils_ask_open_many (GtkWindow *parent,
 	if (how_many < TOO_MANY)
 		return TRUE;
 
-	string = g_strdup_printf ("%d", how_many);
+	string = g_strdup_printf (
+		ngettext (
+			/* Translators: This message is shown only for ten or more messages to be opened.
+			   The %d is replaced with the actual count of messages. If you need a '%' in your text,
+			   then write it doubled, like '%%'. */
+			"Are you sure you want to open %d messages at once?",
+			"Are you sure you want to open %d messages at once?", how_many),
+		how_many);
 	proceed = em_utils_prompt_user (
 		parent, "/apps/evolution/mail/prompts/open_many",
 		"mail:ask-open-many", string, NULL);
@@ -129,6 +131,7 @@ gboolean
 em_utils_prompt_user(GtkWindow *parent, const gchar *promptkey, const gchar *tag, ...)
 {
 	GtkWidget *mbox, *check = NULL;
+	GtkWidget *container;
 	va_list ap;
 	gint button;
 	GConfClient *gconf = mail_config_get_gconf_client();
@@ -146,9 +149,10 @@ em_utils_prompt_user(GtkWindow *parent, const gchar *promptkey, const gchar *tag
 	g_object_unref (alert);
 
 	if (promptkey) {
-		check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again."));
+		check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again"));
 		gtk_container_set_border_width((GtkContainer *)check, 12);
-		gtk_box_pack_start ((GtkBox *)((GtkDialog *) mbox)->vbox, check, TRUE, TRUE, 0);
+		container = gtk_dialog_get_content_area (GTK_DIALOG (mbox));
+		gtk_box_pack_start (GTK_BOX (container), check, TRUE, TRUE, 0);
 		gtk_widget_show (check);
 	}
 
@@ -277,7 +281,7 @@ em_utils_edit_filters (GtkWidget *parent)
 	EMFilterContext *fc;
 
 	if (filter_editor) {
-		gdk_window_raise (GTK_WIDGET (filter_editor)->window);
+		gtk_window_present (GTK_WINDOW (filter_editor));
 		return;
 	}
 
@@ -405,7 +409,7 @@ em_utils_flag_for_followup (EMailReader *reader,
 			camel_message_info_from (info),
 			camel_message_info_subject (info));
 
-		camel_message_info_free(info);
+		camel_folder_free_message_info (folder, info);
 	}
 
 	/* special-case... */
@@ -419,7 +423,7 @@ em_utils_flag_for_followup (EMailReader *reader,
 			if (tags)
 				e_mail_tag_editor_set_tag_list (
 					E_MAIL_TAG_EDITOR (editor), tags);
-			camel_message_info_free (info);
+			camel_folder_free_message_info (folder, info);
 		}
 	}
 
@@ -444,7 +448,7 @@ em_utils_flag_for_followup (EMailReader *reader,
 			camel_message_info_set_user_tag (
 				info, iter->name, iter->value);
 
-		camel_message_info_free (info);
+		camel_folder_free_message_info (folder, info);
 	}
 
 	camel_folder_thaw (folder);
@@ -486,7 +490,7 @@ em_utils_flag_for_followup_clear (GtkWindow *parent, CamelFolder *folder, GPtrAr
 			camel_message_info_set_user_tag(mi, "follow-up", NULL);
 			camel_message_info_set_user_tag(mi, "due-by", NULL);
 			camel_message_info_set_user_tag(mi, "completed-on", NULL);
-			camel_message_info_free(mi);
+			camel_folder_free_message_info (folder, mi);
 		}
 	}
 	camel_folder_thaw (folder);
@@ -525,7 +529,7 @@ em_utils_flag_for_followup_completed (GtkWindow *parent, CamelFolder *folder, GP
 			tag = camel_message_info_user_tag(mi, "follow-up");
 			if (tag && tag[0])
 				camel_message_info_set_user_tag(mi, "completed-on", now);
-			camel_message_info_free(mi);
+			camel_folder_free_message_info (folder, mi);
 		}
 	}
 	camel_folder_thaw (folder);
@@ -535,23 +539,20 @@ em_utils_flag_for_followup_completed (GtkWindow *parent, CamelFolder *folder, GP
 	em_utils_uids_free (uids);
 }
 
-#include "camel/camel-stream-mem.h"
-#include "camel/camel-stream-filter.h"
-#include "camel/camel-mime-filter-from.h"
-
 /* This kind of sucks, because for various reasons most callers need to run synchronously
    in the gui thread, however this could take a long, blocking time, to run */
 static gint
 em_utils_write_messages_to_stream(CamelFolder *folder, GPtrArray *uids, CamelStream *stream)
 {
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilterFrom *from_filter;
+	CamelStream *filtered_stream;
+	CamelMimeFilter *from_filter;
 	gint i, res = 0;
 
 	from_filter = camel_mime_filter_from_new();
-	filtered_stream = camel_stream_filter_new_with_stream(stream);
-	camel_stream_filter_add(filtered_stream, (CamelMimeFilter *)from_filter);
-	camel_object_unref(from_filter);
+	filtered_stream = camel_stream_filter_new (stream);
+	camel_stream_filter_add (
+		CAMEL_STREAM_FILTER (filtered_stream), from_filter);
+	g_object_unref (from_filter);
 
 	for (i=0; i<uids->len; i++) {
 		CamelMimeMessage *message;
@@ -573,13 +574,13 @@ em_utils_write_messages_to_stream(CamelFolder *folder, GPtrArray *uids, CamelStr
 			res = -1;
 
 		g_free(from);
-		camel_object_unref(message);
+		g_object_unref (message);
 
 		if (res == -1)
 			break;
 	}
 
-	camel_object_unref(filtered_stream);
+	g_object_unref (filtered_stream);
 
 	return res;
 }
@@ -602,12 +603,12 @@ em_utils_read_messages_from_stream(CamelFolder *folder, CamelStream *stream)
 		/* NB: de-from filter, once written */
 		msg = camel_mime_message_new();
 		if (camel_mime_part_construct_from_parser((CamelMimePart *)msg, mp) == -1) {
-			camel_object_unref(msg);
+			g_object_unref (msg);
 			break;
 		}
 
 		camel_folder_append_message(folder, msg, NULL, NULL, ex);
-		camel_object_unref(msg);
+		g_object_unref (msg);
 
 		if (camel_exception_is_set (ex))
 			break;
@@ -615,7 +616,7 @@ em_utils_read_messages_from_stream(CamelFolder *folder, CamelStream *stream)
 		camel_mime_parser_step(mp, NULL, NULL);
 	}
 
-	camel_object_unref(mp);
+	g_object_unref (mp);
 	if (!camel_exception_is_set(ex))
 		res = 0;
 	camel_exception_free(ex);
@@ -634,22 +635,30 @@ em_utils_read_messages_from_stream(CamelFolder *folder, CamelStream *stream)
  * Warning: This could block the ui for an extended period.
  **/
 void
-em_utils_selection_set_mailbox(GtkSelectionData *data, CamelFolder *folder, GPtrArray *uids)
+em_utils_selection_set_mailbox (GtkSelectionData *data,
+                                CamelFolder *folder,
+                                GPtrArray *uids)
 {
+	GByteArray *byte_array;
 	CamelStream *stream;
+	GdkAtom target;
+
+	target = gtk_selection_data_get_target (data);
+
+	byte_array = g_byte_array_new ();
+	stream = camel_stream_mem_new_with_byte_array (byte_array);
 
-	stream = camel_stream_mem_new();
-	if (em_utils_write_messages_to_stream(folder, uids, stream) == 0)
-		gtk_selection_data_set(data, data->target, 8,
-				       ((CamelStreamMem *)stream)->buffer->data,
-				       ((CamelStreamMem *)stream)->buffer->len);
+	if (em_utils_write_messages_to_stream (folder, uids, stream) == 0)
+		gtk_selection_data_set(
+			data, target, 8,
+			byte_array->data, byte_array->len);
 
-	camel_object_unref(stream);
+	g_object_unref (stream);
 }
 
 /**
  * em_utils_selection_get_mailbox:
- * @data: selection data
+ * @selection_data: selection data
  * @folder:
  *
  * Receive a mailbox selection/dnd
@@ -658,50 +667,64 @@ em_utils_selection_set_mailbox(GtkSelectionData *data, CamelFolder *folder, GPtr
  * FIXME: Exceptions?
  **/
 void
-em_utils_selection_get_mailbox(GtkSelectionData *data, CamelFolder *folder)
+em_utils_selection_get_mailbox (GtkSelectionData *selection_data,
+                                CamelFolder *folder)
 {
 	CamelStream *stream;
+	const guchar *data;
+	gint length;
+
+	data = gtk_selection_data_get_data (selection_data);
+	length = gtk_selection_data_get_length (selection_data);
 
-	if (data->data == NULL || data->length == -1)
+	if (data == NULL || length == -1)
 		return;
 
 	/* TODO: a stream mem with read-only access to existing data? */
 	/* NB: Although copying would let us run this async ... which it should */
-	stream = (CamelStream *)camel_stream_mem_new_with_buffer((gchar *)data->data, data->length);
+	stream = (CamelStream *)
+		camel_stream_mem_new_with_buffer ((gchar *) data, length);
 	em_utils_read_messages_from_stream(folder, stream);
-	camel_object_unref(stream);
+	g_object_unref (stream);
 }
 
 /**
  * em_utils_selection_get_message:
- * @data:
+ * @selection_data:
  * @folder:
  *
  * get a message/rfc822 data.
  **/
 void
-em_utils_selection_get_message(GtkSelectionData *data, CamelFolder *folder)
+em_utils_selection_get_message (GtkSelectionData *selection_data,
+                                CamelFolder *folder)
 {
 	CamelStream *stream;
 	CamelException *ex;
 	CamelMimeMessage *msg;
+	const guchar *data;
+	gint length;
+
+	data = gtk_selection_data_get_data (selection_data);
+	length = gtk_selection_data_get_length (selection_data);
 
-	if (data->data == NULL || data->length == -1)
+	if (data == NULL || length == -1)
 		return;
 
 	ex = camel_exception_new();
-	stream = (CamelStream *)camel_stream_mem_new_with_buffer((gchar *)data->data, data->length);
+	stream = (CamelStream *)
+		camel_stream_mem_new_with_buffer ((gchar *)data, length);
 	msg = camel_mime_message_new();
 	if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)msg, stream) == 0)
 		camel_folder_append_message(folder, msg, NULL, NULL, ex);
-	camel_object_unref(msg);
-	camel_object_unref(stream);
+	g_object_unref (msg);
+	g_object_unref (stream);
 	camel_exception_free(ex);
 }
 
 /**
  * em_utils_selection_set_uidlist:
- * @data: selection data
+ * @selection_data: selection data
  * @uri:
  * @uids:
  *
@@ -710,9 +733,12 @@ em_utils_selection_get_message(GtkSelectionData *data, CamelFolder *folder)
  * FIXME: be nice if this could take a folder argument rather than uri
  **/
 void
-em_utils_selection_set_uidlist(GtkSelectionData *data, const gchar *uri, GPtrArray *uids)
+em_utils_selection_set_uidlist (GtkSelectionData *selection_data,
+                                const gchar *uri,
+                                GPtrArray *uids)
 {
 	GByteArray *array = g_byte_array_new();
+	GdkAtom target;
 	gint i;
 
 	/* format: "uri\0uid1\0uid2\0uid3\0...\0uidn\0" */
@@ -722,7 +748,9 @@ em_utils_selection_set_uidlist(GtkSelectionData *data, const gchar *uri, GPtrArr
 	for (i=0; i<uids->len; i++)
 		g_byte_array_append(array, uids->pdata[i], strlen(uids->pdata[i])+1);
 
-	gtk_selection_data_set(data, data->target, 8, array->data, array->len);
+	target = gtk_selection_data_get_target (selection_data);
+	gtk_selection_data_set (
+		selection_data, target, 8, array->data, array->len);
 	g_byte_array_free(array, TRUE);
 }
 
@@ -736,27 +764,37 @@ em_utils_selection_set_uidlist(GtkSelectionData *data, const gchar *uri, GPtrArr
  * Warning: Could take some time to run.
  **/
 void
-em_utils_selection_get_uidlist(GtkSelectionData *data, CamelFolder *dest, gint move, CamelException *ex)
+em_utils_selection_get_uidlist (GtkSelectionData *selection_data,
+                                CamelFolder *dest,
+                                gint move,
+                                CamelException *ex)
 {
 	/* format: "uri\0uid1\0uid2\0uid3\0...\0uidn" */
 	gchar *inptr, *inend;
 	GPtrArray *uids;
 	CamelFolder *folder;
+	const guchar *data;
+	gint length;
+
+	g_return_if_fail (selection_data != NULL);
 
-	if (data == NULL || data->data == NULL || data->length == -1)
+	data = gtk_selection_data_get_data (selection_data);
+	length = gtk_selection_data_get_length (selection_data);
+
+	if (data == NULL || length == -1)
 		return;
 
 	uids = g_ptr_array_new();
 
-	inptr = (gchar *)data->data;
-	inend = (gchar *)(data->data + data->length);
+	inptr = (gchar *) data;
+	inend = (gchar *) (data + length);
 	while (inptr < inend) {
 		gchar *start = inptr;
 
 		while (inptr < inend && *inptr)
 			inptr++;
 
-		if (start > (gchar *)data->data)
+		if (start > (gchar *) data)
 			g_ptr_array_add(uids, g_strndup(start, inptr-start));
 
 		inptr++;
@@ -767,10 +805,10 @@ em_utils_selection_get_uidlist(GtkSelectionData *data, CamelFolder *dest, gint m
 		return;
 	}
 
-	folder = mail_tool_uri_to_folder((gchar *)data->data, 0, ex);
+	folder = mail_tool_uri_to_folder((gchar *) data, 0, ex);
 	if (folder) {
 		camel_folder_transfer_messages_to(folder, uids, dest, NULL, move, ex);
-		camel_object_unref(folder);
+		g_object_unref (folder);
 	}
 
 	em_utils_uids_free(uids);
@@ -804,14 +842,16 @@ em_utils_selection_set_urilist(GtkSelectionData *data, CamelFolder *folder, GPtr
 		info = camel_folder_get_message_info(folder, uids->pdata[0]);
 		if (info) {
 			file = g_strdup(camel_message_info_subject(info));
-			camel_folder_free_message_info(folder, info);
+			camel_folder_free_message_info (folder, info);
 		}
 	}
 
 	/* TODO: Handle conflicts? */
 	if (file == NULL) {
 		/* Drop filename for messages from a mailbox */
-		file = g_strdup_printf(_("Messages from %s"), folder->name);
+		file = g_strdup_printf (
+			_("Messages from %s"),
+			camel_folder_get_name (folder));
 	}
 
 	e_filename_make_safe(file);
@@ -833,12 +873,14 @@ em_utils_selection_set_urilist(GtkSelectionData *data, CamelFolder *folder, GPtr
 		if (em_utils_write_messages_to_stream(folder, uids, fstream) == 0) {
 			/* terminate with \r\n to be compliant with the spec */
 			gchar *uri_crlf = g_strconcat(uri, "\r\n", NULL);
+			GdkAtom target;
 
-			gtk_selection_data_set(data, data->target, 8, (guchar *)uri_crlf, strlen(uri_crlf));
+			target = gtk_selection_data_get_target (data);
+			gtk_selection_data_set(data, target, 8, (guchar *)uri_crlf, strlen(uri_crlf));
 			g_free(uri_crlf);
 		}
 
-		camel_object_unref(fstream);
+		g_object_unref (fstream);
 	} else
 		close(fd);
 
@@ -856,17 +898,23 @@ em_utils_selection_set_urilist(GtkSelectionData *data, CamelFolder *folder, GPtr
  * automatically cleaned up when the application quits.
  **/
 void
-em_utils_selection_get_urilist(GtkSelectionData *data, CamelFolder *folder)
+em_utils_selection_get_urilist (GtkSelectionData *selection_data,
+                                CamelFolder *folder)
 {
 	CamelStream *stream;
 	CamelURL *url;
 	gint fd, i, res = 0;
 	gchar *tmp, **uris;
+	const guchar *data;
+	gint length;
 
 	d(printf(" * drop uri list\n"));
 
-	tmp = g_strndup((gchar *)data->data, data->length);
-	uris = g_strsplit(tmp, "\n", 0);
+	data = gtk_selection_data_get_data (selection_data);
+	length = gtk_selection_data_get_length (selection_data);
+
+	tmp = g_strndup ((gchar *) data, length);
+	uris = g_strsplit (tmp, "\n", 0);
 	g_free(tmp);
 	for (i=0;res == 0 && uris[i];i++) {
 		g_strstrip(uris[i]);
@@ -882,7 +930,7 @@ em_utils_selection_get_urilist(GtkSelectionData *data, CamelFolder *folder)
 			stream = camel_stream_fs_new_with_fd(fd);
 			if (stream) {
 				res = em_utils_read_messages_from_stream(folder, stream);
-				camel_object_unref(stream);
+				g_object_unref (stream);
 			} else
 				close(fd);
 		}
@@ -967,6 +1015,7 @@ gboolean
 em_utils_folder_is_templates (CamelFolder *folder, const gchar *uri)
 {
 	CamelFolder *local_templates_folder;
+	CamelStore *parent_store;
 	EAccountList *accounts;
 	EAccount *account;
 	EIterator *iter;
@@ -982,6 +1031,8 @@ em_utils_folder_is_templates (CamelFolder *folder, const gchar *uri)
 	if (folder == NULL || uri == NULL)
 		return FALSE;
 
+	parent_store = camel_folder_get_parent_store (folder);
+
 	accounts = e_get_account_list ();
 	iter = e_list_get_iterator ((EList *)accounts);
 	while (e_iterator_is_valid (iter)) {
@@ -989,7 +1040,7 @@ em_utils_folder_is_templates (CamelFolder *folder, const gchar *uri)
 
 		if (account->templates_folder_uri) {
 			templates_uri = em_uri_to_camel (account->templates_folder_uri);
-			if (camel_store_folder_uri_equal (folder->parent_store, templates_uri, uri)) {
+			if (camel_store_folder_uri_equal (parent_store, templates_uri, uri)) {
 				g_free (templates_uri);
 				is = TRUE;
 				break;
@@ -1018,6 +1069,7 @@ gboolean
 em_utils_folder_is_drafts(CamelFolder *folder, const gchar *uri)
 {
 	CamelFolder *local_drafts_folder;
+	CamelStore *parent_store;
 	EAccountList *accounts;
 	EAccount *account;
 	EIterator *iter;
@@ -1033,6 +1085,8 @@ em_utils_folder_is_drafts(CamelFolder *folder, const gchar *uri)
 	if (folder == NULL || uri == NULL)
 		return FALSE;
 
+	parent_store = camel_folder_get_parent_store (folder);
+
 	accounts = e_get_account_list ();
 	iter = e_list_get_iterator((EList *)accounts);
 	while (e_iterator_is_valid(iter)) {
@@ -1040,7 +1094,7 @@ em_utils_folder_is_drafts(CamelFolder *folder, const gchar *uri)
 
 		if (account->drafts_folder_uri) {
 			drafts_uri = em_uri_to_camel (account->drafts_folder_uri);
-			if (camel_store_folder_uri_equal (folder->parent_store, drafts_uri, uri)) {
+			if (camel_store_folder_uri_equal (parent_store, drafts_uri, uri)) {
 				g_free (drafts_uri);
 				is = TRUE;
 				break;
@@ -1069,6 +1123,7 @@ gboolean
 em_utils_folder_is_sent(CamelFolder *folder, const gchar *uri)
 {
 	CamelFolder *local_sent_folder;
+	CamelStore *parent_store;
 	EAccountList *accounts;
 	EAccount *account;
 	EIterator *iter;
@@ -1083,6 +1138,8 @@ em_utils_folder_is_sent(CamelFolder *folder, const gchar *uri)
 	if (folder == NULL || uri == NULL)
 		return FALSE;
 
+	parent_store = camel_folder_get_parent_store (folder);
+
 	accounts = e_get_account_list ();
 	iter = e_list_get_iterator((EList *)accounts);
 	while (e_iterator_is_valid(iter)) {
@@ -1090,7 +1147,7 @@ em_utils_folder_is_sent(CamelFolder *folder, const gchar *uri)
 
 		if (account->sent_folder_uri) {
 			sent_uri = em_uri_to_camel (account->sent_folder_uri);
-			if (camel_store_folder_uri_equal (folder->parent_store, sent_uri, uri)) {
+			if (camel_store_folder_uri_equal (parent_store, sent_uri, uri)) {
 				g_free (sent_uri);
 				is = TRUE;
 				break;
@@ -1133,7 +1190,7 @@ em_utils_folder_is_outbox(CamelFolder *folder, const gchar *uri)
 		return FALSE;
 
 	return camel_store_folder_uri_equal (
-		local_outbox_folder->parent_store,
+		camel_folder_get_parent_store (local_outbox_folder),
 		local_outbox_folder_uri, uri);
 }
 
@@ -1232,7 +1289,7 @@ em_utils_message_to_html (CamelMimeMessage *message, const gchar *credits, guint
 		camel_stream_write ((CamelStream*)mem, append, strlen (append));
 
 	camel_stream_write((CamelStream *)mem, "", 1);
-	camel_object_unref(mem);
+	g_object_unref (mem);
 
 	text = (gchar *)buf->data;
 	if (len)
@@ -1254,14 +1311,17 @@ em_utils_message_to_html (CamelMimeMessage *message, const gchar *credits, guint
 void
 em_utils_expunge_folder (GtkWidget *parent, CamelFolder *folder)
 {
-	gchar *name;
+	const gchar *description;
 
-	camel_object_get(folder, NULL, CAMEL_OBJECT_DESCRIPTION, &name, 0);
+	description = camel_folder_get_description (folder);
 
-	if (!em_utils_prompt_user ((GtkWindow *) parent, "/apps/evolution/mail/prompts/expunge", "mail:ask-expunge", name, NULL))
+	if (!em_utils_prompt_user (
+		GTK_WINDOW (parent),
+		"/apps/evolution/mail/prompts/expunge",
+		"mail:ask-expunge", description, NULL))
 		return;
 
-	mail_expunge_folder(folder, NULL, NULL);
+	mail_expunge_folder (folder, NULL, NULL);
 }
 
 /**
@@ -1937,7 +1997,7 @@ emu_remove_from_mail_cache (const GSList *addresses)
 		}
 	}
 
-	camel_object_unref (cia);
+	g_object_unref (cia);
 }
 
 void
@@ -2093,10 +2153,12 @@ static EAccount *
 guess_account_from_folder (CamelFolder *folder)
 {
 	CamelService *service;
+	CamelStore *parent_store;
 	EAccount *account;
 	gchar *source_url;
 
-	service = CAMEL_SERVICE (folder->parent_store);
+	parent_store = camel_folder_get_parent_store (folder);
+	service = CAMEL_SERVICE (parent_store);
 
 	source_url = camel_url_to_string (service->url, CAMEL_URL_HIDE_ALL);
 	account = mail_config_get_account_by_source_url (source_url);
@@ -2200,7 +2262,7 @@ em_utils_guess_account_with_recipients (CamelMimeMessage *message,
 	EAccountList *account_list;
 	GHashTable *recipients;
 	EIterator *iter;
-	const CamelInternetAddress *addr;
+	CamelInternetAddress *addr;
 	const gchar *type;
 	const gchar *key;
 
diff --git a/mail/em-utils.h b/mail/em-utils.h
index 1bbde206ff..1fde390d72 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -25,12 +25,7 @@
 
 #include <gtk/gtk.h>
 #include <sys/types.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-stream.h>
+#include <camel/camel.h>
 
 #include <mail/e-mail-reader.h>
 #include <mail/em-folder-tree.h>
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index d151c47f53..e32d319eac 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -30,7 +30,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "camel/camel-url.h"
 #include "em-vfolder-context.h"
 #include "em-vfolder-rule.h"
 #include "mail/e-mail-store.h"
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 294cf75f9a..ad1dfdc27a 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -695,9 +695,9 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>Allows Evolution to display text part of limited size</short>
+         <short>Display only message texts not exceeding certain size</short>
          <long>
-         Enable to render message text part of limited size.
+         Enable to display only message texts not exceeding size defined in 'message_text_part_limit' key.
          </long>
       </locale>
     </schema>
@@ -709,10 +709,11 @@
       <type>int</type>
       <default>4096</default>
       <locale name="C">
-         <short>Text message part limit</short>
+         <short>Message text limit for display</short>
          <long>
-         This decides the max size of the text part that can be formatted under
-         Evolution. The default is 4MB / 4096 KB and is specified in terms of KB.
+         This decides the max size of the message text that will be displayed under
+         Evolution, specified in terms of KB. The default is 4096 (4MB). This value
+         is used only when 'force_message_limit' key is activated.
          </long>
       </locale>
     </schema>
@@ -1058,9 +1059,9 @@
       <type>int</type>
       <default>0</default>
       <locale name="C">
-         <short>Last time empty trash was run</short>
+         <short>Last time Empty Trash was run</short>
          <long>
-        The last time empty trash was run, in days since the epoch.
+        The last time Empty Trash was run, in days since January 1st, 1970 (Epoch).
          </long>
       </locale>
     </schema>
@@ -1179,9 +1180,9 @@
       <type>int</type>
       <default>0</default>
       <locale name="C">
-         <short>Last time empty junk was run</short>
+         <short>Last time Empty Junk was run</short>
          <long>
-        The last time empty junk was run, in days since the epoch.
+        The last time Empty Junk was run, in days since January 1st, 1970 (Epoch).
          </long>
       </locale>
     </schema>
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 65e099b461..4592de8eb5 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -27,6 +27,7 @@ libevolution_mail_importers_la_LIBADD =				\
 	$(top_builddir)/filter/libfilter.la			\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/shell/libeshell.la			\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(IMPORTERS_LIBS)
 
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index e18da4535d..937bfa50de 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -38,8 +38,6 @@
 
 #include <gconf/gconf-client.h>
 
-#include <camel/camel-operation.h>
-
 #include "mail-importer.h"
 
 #include "mail/mail-mt.h"
@@ -359,6 +357,7 @@ static EImportImporter elm_importer = {
 	elm_getwidget,
 	elm_import,
 	elm_cancel,
+	NULL, /* get_preview */
 };
 
 EImportImporter *
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 2cd8c9864f..dc419dc89e 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -33,13 +33,12 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
+#include <errno.h>
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <camel/camel-exception.h>
-
 #include "shell/e-shell.h"
 #include "shell/e-shell-window.h"
 #include "shell/e-shell-view.h"
@@ -55,6 +54,7 @@
 #include "mail-importer.h"
 
 #include "e-util/e-import.h"
+#include "misc/e-web-view-preview.h"
 
 typedef struct {
 	EImport *import;
@@ -81,6 +81,7 @@ mbox_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	GtkWindow *window;
 	GtkWidget *hbox, *w;
+	GtkLabel *label;
 	gchar *select_uri = NULL;
 
 	/* preselect the folder selected in a mail view */
@@ -112,11 +113,14 @@ mbox_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 
 	hbox = gtk_hbox_new(FALSE, 0);
 
-	w = gtk_label_new(_("Destination folder:"));
+	w = gtk_label_new_with_mnemonic (_("_Destination folder:"));
 	gtk_box_pack_start((GtkBox *)hbox, w, FALSE, TRUE, 6);
 
+	label = GTK_LABEL (w);
+
 	w = em_folder_selection_button_new(
 		_("Select folder"), _("Select folder to import into"));
+	gtk_label_set_mnemonic_widget (label, w);
 	em_folder_selection_button_set_selection ((EMFolderSelectionButton *)w, select_uri);
 	folder_selected (EM_FOLDER_SELECTION_BUTTON (w), (EImportTargetURI *)target);
 	g_signal_connect (w, "selected", G_CALLBACK(folder_selected), target);
@@ -245,6 +249,153 @@ mbox_cancel(EImport *ei, EImportTarget *target, EImportImporter *im)
 		camel_operation_cancel(importer->cancel);
 }
 
+static MboxImporterCreatePreviewFunc create_preview_func = NULL;
+static MboxImporterFillPreviewFunc fill_preview_func = NULL;
+
+void
+mbox_importer_set_preview_funcs (MboxImporterCreatePreviewFunc create_func, MboxImporterFillPreviewFunc fill_func)
+{
+	create_preview_func = create_func;
+	fill_preview_func = fill_func;
+}
+
+static void
+preview_selection_changed_cb (GtkTreeSelection *selection, EWebViewPreview *preview)
+{
+	GtkTreeIter iter;
+	GtkTreeModel *model = NULL;
+	gboolean found = FALSE;
+
+	g_return_if_fail (selection != NULL);
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (fill_preview_func != NULL);
+
+	if (gtk_tree_selection_get_selected (selection, &model, &iter) && model) {
+		CamelMimeMessage *msg = NULL;
+
+		gtk_tree_model_get (model, &iter, 2, &msg, -1);
+
+		if (msg) {
+			found = TRUE;
+			fill_preview_func (G_OBJECT (preview), msg);
+			g_object_unref (msg);
+		}
+	}
+
+	if (!found) {
+		e_web_view_preview_begin_update (preview);
+		e_web_view_preview_end_update (preview);
+	}
+}
+
+static GtkWidget *
+mbox_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+{
+	GtkWidget *preview = NULL;
+	EImportTargetURI *s = (EImportTargetURI *)target;
+	gchar *filename;
+	gint fd;
+	CamelMimeParser *mp;
+	GtkListStore *store = NULL;
+	GtkTreeIter iter;
+	GtkWidget *preview_widget = NULL;
+
+	if (!create_preview_func || !fill_preview_func)
+		return NULL;
+
+	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
+	if (!filename) {
+		g_message (G_STRLOC ": Couldn't get filename from URI '%s'", s->uri_src);
+		return NULL;
+	}
+
+	fd = g_open (filename, O_RDONLY|O_BINARY, 0);
+	if (fd == -1) {
+		g_warning ("Cannot find source file to import '%s': %s", filename, g_strerror (errno));
+		g_free (filename);
+		return NULL;
+	}
+
+	g_free (filename);
+
+	mp = camel_mime_parser_new();
+	camel_mime_parser_scan_from (mp, TRUE);
+	if (camel_mime_parser_init_with_fd (mp, fd) == -1) {
+		g_object_unref (mp);
+		return NULL;
+	}
+
+	while (camel_mime_parser_step (mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM) {
+		CamelMimeMessage *msg;
+		gchar *from;
+
+		msg = camel_mime_message_new();
+		if (camel_mime_part_construct_from_parser ((CamelMimePart *)msg, mp) == -1) {
+			g_object_unref (msg);
+			break;
+		}
+
+		if (!store)
+			store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, CAMEL_TYPE_MIME_MESSAGE);
+
+		from = NULL;
+		if (camel_mime_message_get_from (msg))
+			from = camel_address_encode (CAMEL_ADDRESS (camel_mime_message_get_from (msg)));
+
+		gtk_list_store_append (store, &iter);
+		gtk_list_store_set (store, &iter,
+			0, camel_mime_message_get_subject (msg) ? camel_mime_message_get_subject (msg) : "",
+			1, from ? from : "",
+			2, msg,
+			-1);
+
+		g_object_unref (msg);
+		g_free (from);
+
+		camel_mime_parser_step (mp, NULL, NULL);
+	}
+
+	if (store) {
+		GtkTreeView *tree_view;
+		GtkTreeSelection *selection;
+
+		preview = e_web_view_preview_new ();
+		gtk_widget_show (preview);
+
+		tree_view = e_web_view_preview_get_tree_view (E_WEB_VIEW_PREVIEW (preview));
+		g_return_val_if_fail (tree_view != NULL, NULL);
+
+		gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (store));
+		g_object_unref (store);
+
+		/* Translators: Column header for a message subject */
+		gtk_tree_view_insert_column_with_attributes (tree_view, -1, C_("mboxImp", "Subject"),
+			gtk_cell_renderer_text_new (), "text", 0, NULL);
+
+		/* Translators: Column header for a message From address */
+		gtk_tree_view_insert_column_with_attributes (tree_view, -1, C_("mboxImp", "From"),
+			gtk_cell_renderer_text_new (), "text", 1, NULL);
+
+		if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) > 1)
+			e_web_view_preview_show_tree_view (E_WEB_VIEW_PREVIEW (preview));
+
+		create_preview_func (G_OBJECT (preview), &preview_widget);
+		g_return_val_if_fail (preview_widget != NULL, NULL);
+
+		e_web_view_preview_set_preview (E_WEB_VIEW_PREVIEW (preview), preview_widget);
+		gtk_widget_show (preview_widget);
+
+		selection = gtk_tree_view_get_selection (tree_view);
+		g_return_val_if_fail (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter), NULL);
+		gtk_tree_selection_select_iter (selection, &iter);
+		g_signal_connect (selection, "changed", G_CALLBACK (preview_selection_changed_cb), preview);
+
+		preview_selection_changed_cb (selection, E_WEB_VIEW_PREVIEW (preview));
+	}
+
+	return preview;
+}
+
 static EImportImporter mbox_importer = {
 	E_IMPORT_TARGET_URI,
 	0,
@@ -252,6 +403,7 @@ static EImportImporter mbox_importer = {
 	mbox_getwidget,
 	mbox_import,
 	mbox_cancel,
+	mbox_get_preview,
 };
 
 EImportImporter *
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index f61ce2658b..35abd8365f 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -35,14 +35,7 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
-
 #include <glib/gi18n.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-mime-parser.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-stream-mem.h>
 
 #include "e-util/e-util-private.h"
 #include "shell/e-shell-backend.h"
@@ -152,7 +145,9 @@ import_mbox_exec (struct _import_mbox_msg *m)
 		if (m->cancel)
 			oldcancel = camel_operation_register(m->cancel);
 
-		camel_operation_start(NULL, _("Importing '%s'"), folder->full_name);
+		camel_operation_start (
+			NULL, _("Importing '%s'"),
+			camel_folder_get_full_name (folder));
 		camel_folder_freeze(folder);
 		while (camel_mime_parser_step(mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM) {
 			CamelMimeMessage *msg;
@@ -167,7 +162,7 @@ import_mbox_exec (struct _import_mbox_msg *m)
 			msg = camel_mime_message_new();
 			if (camel_mime_part_construct_from_parser((CamelMimePart *)msg, mp) == -1) {
 				/* set exception? */
-				camel_object_unref(msg);
+				g_object_unref (msg);
 				break;
 			}
 
@@ -186,7 +181,7 @@ import_mbox_exec (struct _import_mbox_msg *m)
 			camel_message_info_set_flags(info, flags, ~0);
 			camel_folder_append_message(folder, msg, info, NULL, &m->base.ex);
 			camel_message_info_free(info);
-			camel_object_unref(msg);
+			g_object_unref (msg);
 
 			if (camel_exception_is_set(&m->base.ex))
 				break;
@@ -200,11 +195,11 @@ import_mbox_exec (struct _import_mbox_msg *m)
 		if (m->cancel)
 			camel_operation_register(oldcancel);
 	fail2:
-		camel_object_unref(mp);
+		g_object_unref (mp);
 	}
 fail1:
 	camel_folder_sync(folder, FALSE, NULL);
-	camel_object_unref(folder);
+	g_object_unref (folder);
 }
 
 static void
diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h
index 7758c0e563..15de575f8b 100644
--- a/mail/importers/mail-importer.h
+++ b/mail/importers/mail-importer.h
@@ -25,10 +25,17 @@
 #define __MAIL_IMPORTER_H__
 
 #include <e-util/e-import.h>
-#include <camel/camel-folder.h>
+#include <camel/camel.h>
 
 EImportImporter *mbox_importer_peek(void);
 
+typedef void (*MboxImporterCreatePreviewFunc)(GObject *preview, GtkWidget **preview_widget);
+typedef void (*MboxImporterFillPreviewFunc)(GObject *preview, CamelMimeMessage *msg);
+
+/* 'create_func' is a function to create a view. 'fill_func' is to fill view with a preview of a message 'msg'
+   (mail importer cannot link to em-format-html-display directly) */
+void mbox_importer_set_preview_funcs (MboxImporterCreatePreviewFunc create_func, MboxImporterFillPreviewFunc fill_func);
+
 EImportImporter *elm_importer_peek(void);
 EImportImporter *pine_importer_peek(void);
 
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index 873fc93c46..ed3b62e0b1 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -41,8 +41,6 @@
 #include <libebook/e-book.h>
 #include <libebook/e-destination.h>
 
-#include <camel/camel-operation.h>
-
 #include "mail-importer.h"
 
 #include "mail/mail-mt.h"
@@ -412,6 +410,7 @@ static EImportImporter pine_importer = {
 	pine_getwidget,
 	pine_import,
 	pine_cancel,
+	NULL, /* get_preview */
 };
 
 EImportImporter *
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index 8117bfca6a..f2422ce217 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -47,9 +47,6 @@
 #include "filter/e-filter-option.h"
 #include "filter/e-filter-input.h"
 
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
-
 #define d(x)
 
 static void
@@ -262,7 +259,7 @@ rule_from_message (EFilterRule *rule, ERuleContext *context, CamelMimeMessage *m
 	}
 	/* should parse the from address into an internet address? */
 	if (flags & AUTO_FROM) {
-		const CamelInternetAddress *from;
+		CamelInternetAddress *from;
 		gint i;
 		const gchar *name, *address;
 		gchar *namestr;
@@ -424,18 +421,39 @@ mail_filter_delete_uri(CamelStore *store, const gchar *uri)
 	if (deleted) {
 		GtkWidget *dialog;
 		GString *s;
+		guint s_count;
+		gchar *info;
 		GList *l;
 
 		s = g_string_new("");
-		l = deleted;
-		while (l) {
-			g_string_append_printf (s, "    %s\n", (gchar *)l->data);
-			l = l->next;
+		s_count = 0;
+		for (l = deleted; l; l = l->next) {
+			const gchar *name = (const gchar *)l->data;
+
+			if (s_count == 0) {
+				g_string_append (s, name);
+			} else {
+				if (s_count == 1) {
+					g_string_prepend (s, "    ");
+					g_string_append (s, "\n");
+				}
+				g_string_append_printf (s, "    %s\n", name);
+			}
+			s_count++;
 		}
 
-		dialog = e_alert_dialog_new_for_args (e_shell_get_active_window (NULL), "mail:filter-updated", s->str, euri, NULL);
-		g_string_free(s, TRUE);
+		info = g_strdup_printf (ngettext (
+			/* Translators: The first %s is name of the affected filter rule(s),
+			   the second %s is uri of the removed folder. For more than one filter
+			   rule is each of them on a separate line, with four spaces in front
+			   of its name, without quotes. */
+			"The filter rule \"%s\" has been updated, because it used just removed folder\n\"%s\".",
+			"The following filter rules\n%s have been updated, because they used just removed folder\n\"%s\".",
+			s_count), s->str, euri);
+		dialog = e_alert_dialog_new_for_args (e_shell_get_active_window (NULL), "mail:filter-updated", info, NULL);
 		em_utils_show_info_silent (dialog);
+		g_string_free (s, TRUE);
+		g_free (info);
 
 		d(printf("Folder delete/rename '%s' changed filters, resaving\n", euri));
 		if (e_rule_context_save ((ERuleContext *) fc, user) == -1)
diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
index fb474ab04d..2d14120e71 100644
--- a/mail/mail-autofilter.h
+++ b/mail/mail-autofilter.h
@@ -24,7 +24,7 @@
 #ifndef _MAIL_AUTOFILTER_H
 #define _MAIL_AUTOFILTER_H
 
-#include <camel/camel-mime-message.h>
+#include <camel/camel.h>
 
 #include <filter/e-filter-rule.h>
 #include <mail/em-filter-context.h>
diff --git a/mail/mail-component.c.dead b/mail/mail-component.c.dead
deleted file mode 100644
index 46c48b5516..0000000000
--- a/mail/mail-component.c.dead
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Ettore Perazzoli <ettore@ximian.com>
- *	    Michael Zucchi <notzed@ximian.com>
- *	    Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <libedataserver/e-data-server-util.h>
-#include "em-utils.h"
-#include "em-composer-utils.h"
-#include "em-format/em-format.h"
-#include "em-folder-tree.h"
-#include "em-folder-browser.h"
-#include "em-message-browser.h"
-#include "em-folder-selector.h"
-#include "em-folder-selection.h"
-#include "em-folder-utils.h"
-#include "em-migrate.h"
-
-#include "misc/e-info-label.h"
-#include "e-util/e-util.h"
-#include "e-util/e-error.h"
-#include "e-util/e-util-private.h"
-#include "e-util/e-logger.h"
-#include "e-util/gconf-bridge.h"
-
-#include "em-search-context.h"
-#include "mail-config.h"
-#include "mail-component.h"
-#include "mail-folder-cache.h"
-#include "mail-vfolder.h"
-#include "mail-mt.h"
-#include "mail-ops.h"
-#include "mail-tools.h"
-#include "mail-send-recv.h"
-#include "mail-session.h"
-#include "message-list.h"
-
-#include "e-activity-handler.h"
-#include "shell/e-user-creatable-items-handler.h"
-#include "shell/e-component-view.h"
-
-#include "composer/e-msg-composer.h"
-
-#include "e-task-bar.h"
-
-#include <gtk/gtk.h>
-
-#include <e-util/e-mktemp.h>
-#include <Evolution.h>
-
-#include <table/e-tree.h>
-#include <table/e-tree-memory.h>
-#include <glib/gi18n-lib.h>
-
-#include <camel/camel-file-utils.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-disco-store.h>
-#include <camel/camel-offline-store.h>
-
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-widget.h>
-
-#include "e-util/e-non-intrusive-error-dialog.h"
-
-#include "e-attachment-handler-mail.h"
-
-#define MAILER_ERROR_LEVEL_KEY "/apps/evolution/mail/display/error_level"
-#define MAILER_ERROR_TIME_OUT_KEY "/apps/evolution/mail/display/error_timeout"
-
-#define d(x)
-
-struct _MailComponentPrivate {
-	GMutex *lock;
-
-	/* states/data used during shutdown */
-	enum { MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
-	gint quit_count;
-	gint quit_expunge;	/* expunge on quit this time around? */
-
-	gchar *base_directory;
-
-	EMFolderTreeModel *model;
-
-	EActivityHandler *activity_handler;
-
-	MailAsyncEvent *async_event;
-	GHashTable *store_hash; /* stores store_info objects by store */
-
-	RuleContext *search_context;
-
-	gchar *context_path;	/* current path for right-click menu */
-
-	CamelStore *local_store;
-	ELogger *logger;
-
-	EComponentView *component_view;
-
-	guint mail_sync_id; /* timeout id for sync call on the stores */
-	guint mail_sync_in_progress; /* is greater than 0 if still waiting to finish sync on some store */
-};
-
-/* GObject methods.  */
-
-static void
-impl_finalize (GObject *object)
-{
-	MailComponentPrivate *priv = MAIL_COMPONENT (object)->priv;
-
-	g_free (priv->base_directory);
-
-	g_hash_table_destroy (priv->store_hash);
-
-	if (mail_async_event_destroy (priv->async_event) == -1) {
-		g_warning("Cannot destroy async event: would deadlock");
-		g_warning(" system may be unstable at exit");
-	}
-
-	g_free (priv->context_path);
-	g_mutex_free(priv->lock);
-	g_object_unref (priv->model);
-	g_object_unref (priv->logger);
-	g_free (priv);
-
-	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-view_on_url (GObject *emitter, const gchar *url, const gchar *nice_url, MailComponent *mail_component)
-{
-	MailComponentPrivate *priv = mail_component->priv;
-
-	e_activity_handler_set_message (priv->activity_handler, nice_url);
-}
-
-static void
-disable_folder_tree (gpointer *emfb, GtkWidget *widget)
-{
-	gtk_widget_set_sensitive (widget, FALSE);
-}
-
-static void
-enable_folder_tree (GtkWidget *emfb, GtkWidget *emft)
-{
-	EMFolderView *emfv = (EMFolderView *) emfb;
-	CamelURL *selected_curl, *current_curl;
-	CamelFolder *selected_folder;
-	gchar *uri;
-
-	/* Get the currently displayed folder. */
-	uri = mail_tools_folder_to_url (emfv->list->folder);
-	current_curl = uri ? camel_url_new (uri, NULL) : NULL;
-	g_free (uri);
-
-	/* Get the selected folder in the folder tree. */
-	selected_folder = em_folder_tree_get_selected_folder(EM_FOLDER_TREE (emft));
-	if (selected_folder)
-		uri = mail_tools_folder_to_url (selected_folder);
-	else
-		uri = NULL;
-
-	selected_curl = uri ? camel_url_new (uri, NULL) : NULL;
-
-	if (current_curl && selected_curl && !camel_url_equal (selected_curl, current_curl)) {
-
-		g_signal_emit_by_name (
-			emft, "folder-selected", emft, uri,
-			selected_folder->full_name, uri, selected_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
-impl_createView (PortableServer_Servant servant,
-		 GNOME_Evolution_ShellView parent,
-		 CORBA_boolean select_item,
-		 CORBA_Environment *ev)
-{
-	MailComponent *mail_component = MAIL_COMPONENT (bonobo_object_from_servant (servant));
-	MailComponentPrivate *priv = mail_component->priv;
-	EComponentView *component_view;
-	GtkWidget *tree_widget, *vbox, *info;
-	GtkWidget *view_widget;
-	GtkWidget *statusbar_widget;
-	gchar *uri;
-
-	mail_session_set_interactive(TRUE);
-	mc_startup(mail_component);
-
-	view_widget = em_folder_browser_new ();
-
-	if (!select_item)
-		em_folder_browser_suppress_message_selection (
-			(EMFolderBrowser *) view_widget);
-
-//	tree_widget = (GtkWidget *) em_folder_tree_new_with_model (priv->model);
-//	em_folder_tree_set_excluded ((EMFolderTree *) tree_widget, 0);
-//	em_folder_tree_enable_drag_and_drop ((EMFolderTree *) tree_widget);
-
-//	if ((uri = em_folder_tree_model_get_selected (priv->model))) {
-//		gboolean expanded;
-//
-//		expanded = em_folder_tree_model_get_expanded_uri (priv->model, uri);
-//		em_folder_tree_set_selected ((EMFolderTree *) tree_widget, uri, FALSE);
-//		em_folder_view_set_folder_uri ((EMFolderView *) view_widget, uri);
-//
-//		if (!expanded)
-//			em_folder_tree_model_set_expanded_uri (priv->model, uri, expanded);
-//
-//		g_free (uri);
-//	}
-
-	em_format_set_session ((EMFormat *) ((EMFolderView *) view_widget)->preview, session);
-
-	g_signal_connect (view_widget, "on-url", G_CALLBACK (view_on_url), mail_component);
-	em_folder_view_set_statusbar ((EMFolderView*)view_widget, FALSE);
-
-//	statusbar_widget = e_task_bar_new ();
-//	e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (statusbar_widget));
-
-	gtk_widget_show (tree_widget);
-	gtk_widget_show (view_widget);
-	gtk_widget_show (statusbar_widget);
-
-//	vbox = gtk_vbox_new(FALSE, 0);
-//	info = e_info_label_new("evolution-mail");
-//	e_info_label_set_info((EInfoLabel *)info, _("Mail"), "");
-//	gtk_box_pack_start((GtkBox *)vbox, info, FALSE, TRUE, 0);
-//	gtk_box_pack_start((GtkBox *)vbox, tree_widget, TRUE, TRUE, 0);
-
-	gtk_widget_show(info);
-	gtk_widget_show(vbox);
-
-//	component_view = e_component_view_new(parent, "mail", vbox, view_widget, statusbar_widget);
-//
-//	g_object_set_data((GObject *)component_view, "info-label", info);
-//
-//	g_object_set_data_full((GObject *)view_widget, "e-creatable-items-handler",
-//			       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);
-
-	g_object_set_data((GObject*)info, "folderview", view_widget);
-	g_object_set_data((GObject*)view_widget, "foldertree", tree_widget);
-
-	priv->component_view = component_view;
-
-	return BONOBO_OBJREF(component_view);
-}
-
-/* Initialization.  */
-
-static void
-mail_component_class_init (MailComponentClass *class)
-{
-	POA_GNOME_Evolution_Component__epv *epv = &((EvolutionComponentClass *)class)->epv;
-	POA_GNOME_Evolution_MailComponent__epv *mepv = &class->epv;
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-
-	parent_class = g_type_class_peek_parent (class);
-
-	object_class->finalize = impl_finalize;
-
-	epv->createView          = impl_createView;
-//	epv->quit = impl_quit;
-//	epv->_get_userCreatableItems = impl__get_userCreatableItems;
-//	epv->requestCreateItem       = impl_requestCreateItem;
-//	epv->handleURI               = impl_handleURI;
-//	epv->sendAndReceive          = impl_sendAndReceive;
-//	epv->upgradeFromVersion      = impl_upgradeFromVersion;
-//	epv->setLineStatus	     = impl_setLineStatus;
-
-//	mepv->test = impl_mail_test;
-}
-
-//static void
-//store_hash_free (struct _store_info *si)
-//{
-//	si->removed = 1;
-//	store_info_unref(si);
-//}
-
-static void
-mail_component_init (MailComponent *component)
-{
-	MailComponentPrivate *priv;
-
-	priv = g_new0 (MailComponentPrivate, 1);
-	component->priv = priv;
-
-	priv->lock = g_mutex_new();
-	priv->quit_state = -1;
-
-//	/* FIXME This is used as both a filename and URI path throughout
-//	 *       the mail code.  Need to clean this up; maybe provide a
-//	 *       mail_component_get_base_uri() function. */
-//	priv->base_directory = g_build_filename (e_get_user_data_dir (), "mail", NULL);
-//#ifdef G_OS_WIN32
-//	{
-//		gchar *p = priv->base_directory;
-//		while ((p = strchr(p, '\\')))
-//			*p++ = '/';
-//	}
-//#endif
-
-//	if (g_mkdir_with_parents (e_get_user_data_dir (), 0777) == -1 && errno != EEXIST)
-//		abort ();
-
-//	priv->model = em_folder_tree_model_new (e_get_user_data_dir ());
-	priv->logger = e_logger_create ("mail");
-	priv->activity_handler = e_activity_handler_new ();
-	e_activity_handler_set_logger (priv->activity_handler, priv->logger);
-	e_activity_handler_set_error_flush_time (priv->activity_handler, mail_config_get_error_timeout ()*1000);
-
-//	mail_session_init (e_get_user_data_dir ());
-
-//	priv->async_event = mail_async_event_new();
-//	priv->store_hash = g_hash_table_new_full (
-//		NULL, NULL,
-//		(GDestroyNotify) NULL,
-//		(GDestroyNotify) store_hash_free);
-
-//	mail_autoreceive_init (session);
-
-//	priv->mail_sync_in_progress = 0;
-//	if (g_getenv("CAMEL_FLUSH_CHANGES"))
-//		priv->mail_sync_id = g_timeout_add_seconds (mail_config_get_sync_timeout (), call_mail_sync, component);
-//	else
-//		priv->mail_sync_id = 0;
-}
-
-void
-mail_component_show_logger (gpointer top)
-{
-	MailComponent *mc = mail_component_peek ();
-	ELogger *logger = mc->priv->logger;
-
-	eni_show_logger(logger, top, MAILER_ERROR_TIME_OUT_KEY, MAILER_ERROR_LEVEL_KEY);
-}
diff --git a/mail/mail-component.h.dead b/mail/mail-component.h.dead
deleted file mode 100644
index f69a3c2cff..0000000000
--- a/mail/mail-component.h.dead
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Michael Zucchi <notzed@ximian.com>
- *		Jeffrey Stedfast <fejj@ximian.com>
- *		Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef _MAIL_COMPONENT_H_
-#define _MAIL_COMPONENT_H_
-
-#include <bonobo/bonobo-object.h>
-#include "shell/evolution-component.h"
-#include "mail/Evolution-Mail.h"
-#include "mail/em-folder-tree-model.h"
-#include "filter/rule-context.h"
-#include "misc/e-activity-handler.h"
-
-#define MAIL_TYPE_COMPONENT			(mail_component_get_type ())
-#define MAIL_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), MAIL_TYPE_COMPONENT, MailComponent))
-#define MAIL_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), MAIL_TYPE_COMPONENT, MailComponentClass))
-#define MAIL_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), MAIL_TYPE_COMPONENT))
-#define MAIL_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), MAIL_TYPE_COMPONENT))
-
-typedef struct _MailComponent        MailComponent;
-typedef struct _MailComponentPrivate MailComponentPrivate;
-typedef struct _MailComponentClass   MailComponentClass;
-
-enum _mail_component_folder_t {
-	MAIL_COMPONENT_FOLDER_INBOX = 0,
-	MAIL_COMPONENT_FOLDER_DRAFTS,
-	MAIL_COMPONENT_FOLDER_OUTBOX,
-	MAIL_COMPONENT_FOLDER_SENT,
-	MAIL_COMPONENT_FOLDER_TEMPLATES,
-	MAIL_COMPONENT_FOLDER_LOCAL_INBOX
-};
-
-struct _MailComponent {
-	EvolutionComponent parent;
-
-	MailComponentPrivate *priv;
-};
-
-struct _MailComponentClass {
-	EvolutionComponentClass parent_class;
-
-	POA_GNOME_Evolution_MailComponent__epv epv;
-};
-
-GType  mail_component_get_type  (void);
-
-MailComponent *mail_component_peek  (void);
-
-/* NOTE: Using NULL as the component implies using the default component */
-const gchar       *mail_component_peek_base_directory    (MailComponent *component);
-RuleContext      *mail_component_peek_search_context    (MailComponent *component);
-EActivityHandler *mail_component_peek_activity_handler  (MailComponent *component);
-
-void        mail_component_add_store            (MailComponent *component,
-						 CamelStore    *store,
-						 const gchar    *name);
-CamelStore *mail_component_load_store_by_uri    (MailComponent *component,
-						 const gchar    *uri,
-						 const gchar    *name);
-
-void        mail_component_remove_store         (MailComponent *component,
-						 CamelStore    *store);
-void        mail_component_remove_store_by_uri  (MailComponent *component,
-						 const gchar    *uri);
-
-gint          mail_component_get_store_count  (MailComponent *component);
-void         mail_component_stores_foreach   (MailComponent *component,
-					      GHFunc         func,
-					      void          *data);
-
-void mail_component_remove_folder (MailComponent *component, CamelStore *store, const gchar *path);
-
-EMFolderTreeModel *mail_component_peek_tree_model (MailComponent *component);
-
-CamelStore *mail_component_peek_local_store (MailComponent *mc);
-CamelFolder *mail_component_get_folder(MailComponent *mc, enum _mail_component_folder_t id);
-const gchar *mail_component_get_folder_uri(MailComponent *mc, enum _mail_component_folder_t id);
-
-gint status_check (GNOME_Evolution_ShellState shell_state);
-
-void mail_indicate_new_mail (gboolean have_new_mail);
-void mail_component_show_logger (gpointer);
-void mail_component_show_status_bar (gboolean show);
-
-#endif /* _MAIL_COMPONENT_H_ */
diff --git a/mail/mail-config.h b/mail/mail-config.h
index dc55403d93..65dd861940 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -24,7 +24,7 @@
 #define MAIL_CONFIG_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-provider.h>
+#include <camel/camel.h>
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
 
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 8f8935bd0e..4afa6019b3 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -95,6 +95,29 @@
       </row>
     </data>
   </object>
+  <object class="GtkListStore" id="hash_algo_model">
+    <columns>
+      <!-- column-name Hash Algo Name -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Default</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">SHA1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">SHA256</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">SHA384</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">SHA512</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkVBox" id="vboxIdentityBorder">
     <property name="visible">True</property>
     <property name="border_width">12</property>
@@ -2174,6 +2197,46 @@ For example: "Work" or "Personal"</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
+                     <child>
+                      <object class="GtkHBox" id="hbox4">
+                        <property name="visible">True</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkLabel" id="pgp_hash_algo_label">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Si_gning algorithm:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">pgp_hash_algo</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkComboBox" id="pgp_hash_algo">
+                            <property name="visible">True</property>
+                            <property name="model">hash_algo_model</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="pgp_hash_algo_renderer"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkCheckButton" id="pgp_always_sign">
                         <property name="label" translatable="yes">Al_ways sign outgoing messages when using this account</property>
@@ -2186,7 +2249,7 @@ For example: "Work" or "Personal"</property>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
@@ -2202,7 +2265,7 @@ For example: "Work" or "Personal"</property>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">2</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
@@ -2217,7 +2280,7 @@ For example: "Work" or "Personal"</property>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">3</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                   </object>
@@ -2276,7 +2339,7 @@ For example: "Work" or "Personal"</property>
             <child>
               <object class="GtkTable" id="smime_table">
                 <property name="visible">True</property>
-                <property name="n_rows">6</property>
+                <property name="n_rows">7</property>
                 <property name="n_columns">3</property>
                 <property name="column_spacing">12</property>
                 <property name="row_spacing">6</property>
@@ -2301,8 +2364,8 @@ For example: "Work" or "Personal"</property>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">5</property>
-                    <property name="bottom_attach">6</property>
+                    <property name="top_attach">6</property>
+                    <property name="bottom_attach">7</property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
@@ -2317,8 +2380,8 @@ For example: "Work" or "Personal"</property>
                   </object>
                   <packing>
                     <property name="right_attach">3</property>
-                    <property name="top_attach">4</property>
-                    <property name="bottom_attach">5</property>
+                    <property name="top_attach">5</property>
+                    <property name="bottom_attach">6</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
@@ -2334,8 +2397,8 @@ For example: "Work" or "Personal"</property>
                   </object>
                   <packing>
                     <property name="right_attach">3</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
@@ -2361,8 +2424,8 @@ For example: "Work" or "Personal"</property>
                   </object>
                   <packing>
                     <property name="right_attach">3</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options">GTK_FILL</property>
                     <property name="y_padding">6</property>
@@ -2377,8 +2440,8 @@ For example: "Work" or "Personal"</property>
                     <property name="mnemonic_widget">smime_encrypt_key</property>
                   </object>
                   <packing>
-                    <property name="top_attach">5</property>
-                    <property name="bottom_attach">6</property>
+                    <property name="top_attach">6</property>
+                    <property name="bottom_attach">7</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
@@ -2502,8 +2565,8 @@ For example: "Work" or "Personal"</property>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="right_attach">3</property>
-                    <property name="top_attach">5</property>
-                    <property name="bottom_attach">6</property>
+                    <property name="top_attach">6</property>
+                    <property name="bottom_attach">7</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
@@ -2618,6 +2681,49 @@ For example: "Work" or "Personal"</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkLabel" id="smime_hash_algo_label">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Signing _algorithm:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">smime_hash_algo</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkAlignment" id="smime_hash_algo_alignment">
+                    <property name="visible">True</property>
+                    <property name="left_padding">0</property>
+                    <property name="xalign">0.0</property>
+                    <property name="xscale">0.0</property>
+                    <child>
+                      <object class="GtkComboBox" id="smime_hash_algo">
+                        <property name="visible">True</property>
+                        <property name="model">hash_algo_model</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="smime_hash_algo_renderer"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -2928,7 +3034,7 @@ For example: "Work" or "Personal"</property>
                             <property name="spacing">4</property>
                             <child>
                               <object class="GtkCheckButton" id="mlimit_checkbutton">
-                                <property name="label" translatable="yes">Do not format messages when text si_ze exceeds</property>
+                                <property name="label" translatable="yes">Do not display messages when text si_ze exceeds</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -2976,7 +3082,7 @@ For example: "Work" or "Personal"</property>
                             <property name="visible">True</property>
                             <child>
                               <object class="GtkCheckButton" id="address_checkbox">
-                                <property name="label" translatable="yes">_Shrink To / Cc / Bcc headers to </property>
+                                <property name="label" translatable="yes" comments="Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number">_Shrink To / Cc / Bcc headers to </property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -3006,7 +3112,7 @@ For example: "Work" or "Personal"</property>
                             <child>
                               <object class="GtkLabel" id="label584">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">addresses</property>
+                                <property name="label" translatable="yes" comments="Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number">addresses</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -3667,7 +3773,7 @@ For example: "Work" or "Personal"</property>
           <object class="GtkLabel" id="label524">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Displayed Message _Headers</property>
+            <property name="label" translatable="yes">Displayed Message Headers</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">txtHeaders</property>
             <attributes>
@@ -4358,7 +4464,7 @@ For example: "Work" or "Personal"</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Reply style:</property>
                                 <property name="use_underline">True</property>
-                                <property name="justify">center</property>
+                                <property name="justify">left</property>
                               </object>
                               <packing>
                                 <property name="top_attach">1</property>
@@ -4436,7 +4542,7 @@ For example: "Work" or "Personal"</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Forward style:</property>
                                 <property name="use_underline">True</property>
-                                <property name="justify">center</property>
+                                <property name="justify">left</property>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -4486,12 +4592,38 @@ For example: "Work" or "Personal"</property>
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">8</property>
                                 <child>
-                                  <object class="GtkLabel" id="label588">
+                                  <object class="GtkHBox" id="hbox242">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.47999998927116394</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Top Posting Option&lt;/b&gt; (Not Recommended)</property>
-                                    <property name="use_markup">True</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label588">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="yalign">0.47999998927116394</property>
+                                        <property name="label" translatable="yes" comments="Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding">Top Posting Option</property>
+                                        <attributes>
+                                          <attribute name="weight" value="bold"/>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label589">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="yalign">0.47999998927116394</property>
+                                        <property name="label" translatable="yes" comments="Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage">(Not Recommended)</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
diff --git a/mail/mail-dialogs.ui b/mail/mail-dialogs.ui
index b4651aa152..fa7eda0a21 100644
--- a/mail/mail-dialogs.ui
+++ b/mail/mail-dialogs.ui
@@ -202,19 +202,26 @@
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkTable" id="top_items_table">
                 <property name="visible">True</property>
-                <property name="spacing">12</property>
+                <property name="n_rows">2</property>
+                <property name="n_columns">3</property>
+                <property name="column_spacing">12</property>
+                <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">S_erver:</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="right_attach">1</property>
+                    <property name="top_attach">0</property>
+                    <property name="bottom_attach">1</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -222,9 +229,12 @@
                     <property name="visible">True</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">0</property>
+                    <property name="bottom_attach">1</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -233,10 +243,40 @@
                     <property name="pulse_step">0.10000000149</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">0</property>
+                    <property name="bottom_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="filterlabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">S_how only items containing:</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="right_attach">1</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="filter_entry">
+                    <property name="visible">True</property>
+                    <property name="secondary_icon_stock">gtk-clear</property>
+                    <property name="secondary_icon_activatable">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="y_options"></property>
                   </packing>
                 </child>
               </object>
@@ -268,6 +308,36 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
+              <object class="GtkButton" id="expand_button">
+                <property name="label" translatable="yes">E_xpand all</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="collapse_button">
+                <property name="label" translatable="yes">Collapse _all</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkButton" id="refresh_button">
                 <property name="label">gtk-refresh</property>
                 <property name="visible">True</property>
@@ -279,7 +349,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
@@ -294,7 +364,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">3</property>
               </packing>
             </child>
           </object>
@@ -690,7 +760,7 @@ Please select a follow up action from the "Flag" menu.</property>
         <child>
           <object class="GtkLabel" id="label14">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">    </property>
+            <property name="label" translatable="no">    </property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index b1a332d4f4..a9726ea0db 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -32,26 +32,14 @@
 #include "config.h"
 #endif
 
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "folder tree"
-
 #include <string.h>
 #include <time.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <glib-object.h>
 #include <glib/gstdio.h>
 
-#include <glib/gi18n.h>
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-disco-store.h>
-
 #include <libedataserver/e-data-server-util.h>
 #include "e-util/e-marshal.h"
 #include "e-util/e-util.h"
@@ -70,13 +58,11 @@
 
 /* This code is a mess, there is no reason it should be so complicated. */
 
-G_DEFINE_TYPE (MailFolderCache, mail_folder_cache, G_TYPE_OBJECT)
-
-#define FOLDER_CACHE_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), MAIL_TYPE_FOLDER_CACHE, MailFolderCachePrivate))
+#define MAIL_FOLDER_CACHE_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), MAIL_TYPE_FOLDER_CACHE, MailFolderCachePrivate))
 
-struct _MailFolderCachePrivate
-{
+struct _MailFolderCachePrivate {
 	/* source id for the ping timeout callback */
 	guint ping_id;
 	/* Store to storeinfo table, active stores */
@@ -92,8 +78,7 @@ struct _MailFolderCachePrivate
 	gint count_trash;
 };
 
-enum
-{
+enum {
 	FOLDER_AVAILABLE,
 	FOLDER_UNAVAILABLE,
 	FOLDER_DELETED,
@@ -112,8 +97,9 @@ struct _folder_info {
 	gchar *uri;		/* uri of folder */
 
 	guint32 flags;
+	gboolean has_children;
 
-	CamelFolder *folder;	/* if known */
+	gpointer folder;	/* if known (weak pointer) */
 };
 
 /* pending list of updates */
@@ -148,11 +134,7 @@ struct _store_info {
 	GQueue folderinfo_updates;
 };
 
-static void folder_changed(CamelObject *o, gpointer event_data, gpointer user_data);
-static void folder_renamed(CamelObject *o, gpointer event_data, gpointer user_data);
-static void folder_finalised(CamelObject *o, gpointer event_data, gpointer user_data);
-
-static gboolean ping_cb (gpointer user_data);
+G_DEFINE_TYPE (MailFolderCache, mail_folder_cache, G_TYPE_OBJECT)
 
 static void
 free_update(struct _folder_update *up)
@@ -160,7 +142,7 @@ free_update(struct _folder_update *up)
 	g_free (up->full_name);
 	g_free (up->uri);
 	if (up->store)
-		camel_object_unref(up->store);
+		g_object_unref (up->store);
 	g_free (up->oldfull);
 	g_free (up->olduri);
 	g_free (up->msg_uid);
@@ -212,7 +194,7 @@ real_flush_updates (gpointer o, gpointer event_data, gpointer data)
 
 			if (folder) {
 				mail_folder_cache_note_folder (self, folder);
-				camel_object_unref (folder);
+				g_object_unref (folder);
 			}
 		}
 
@@ -234,45 +216,6 @@ flush_updates (MailFolderCache *self)
 			self, NULL, NULL);
 }
 
-static void
-unset_folder_info(MailFolderCache *self, struct _folder_info *mfi, gint delete, gint unsub)
-{
-	struct _folder_update *up;
-
-	d(printf("unset folderinfo '%s'\n", mfi->uri));
-
-	if (mfi->folder) {
-		CamelFolder *folder = mfi->folder;
-
-		camel_object_unhook_event(folder, "folder_changed", folder_changed, self);
-		camel_object_unhook_event(folder, "renamed", folder_renamed, self);
-		camel_object_unhook_event(folder, "finalize", folder_finalised, self);
-	}
-
-	if ((mfi->flags & CAMEL_FOLDER_NOSELECT) == 0) {
-		up = g_malloc0(sizeof(*up));
-
-		up->remove = TRUE;
-		up->delete = delete;
-		up->unsub = unsub;
-		up->store = mfi->store_info->store;
-		up->full_name = g_strdup (mfi->full_name);
-		camel_object_ref(up->store);
-		up->uri = g_strdup(mfi->uri);
-
-		g_queue_push_head (&self->priv->updates, up);
-		flush_updates(self);
-	}
-}
-
-static void
-free_folder_info(struct _folder_info *mfi)
-{
-	g_free(mfi->full_name);
-	g_free(mfi->uri);
-	g_free(mfi);
-}
-
 /* This is how unread counts work (and don't work):
  *
  * camel_folder_unread_message_count() only gives a correct answer if
@@ -320,7 +263,7 @@ update_1folder(MailFolderCache *self, struct _folder_info *mfi, gint new, const
 				if ((deleted = camel_folder_get_deleted_message_count (folder)) > 0)
 					unread -= deleted;
 
-				camel_object_get (folder, NULL, CAMEL_FOLDER_JUNKED, &junked, NULL);
+				junked = folder->summary->junk_count;
 				if (junked > 0)
 					unread -= junked;
 
@@ -344,86 +287,36 @@ update_1folder(MailFolderCache *self, struct _folder_info *mfi, gint new, const
 	up->full_name = g_strdup(mfi->full_name);
 	up->unread = unread;
 	up->new = new;
-	up->store = mfi->store_info->store;
+	up->store = g_object_ref (mfi->store_info->store);
 	up->uri = g_strdup(mfi->uri);
 	up->msg_uid = g_strdup (msg_uid);
 	up->msg_sender = g_strdup (msg_sender);
 	up->msg_subject = g_strdup (msg_subject);
-	camel_object_ref(up->store);
 	g_queue_push_head (&self->priv->updates, up);
 	flush_updates(self);
 }
 
 static void
-setup_folder(MailFolderCache *self, CamelFolderInfo *fi, struct _store_info *si)
-{
-	struct _folder_info *mfi;
-	struct _folder_update *up;
-
-	mfi = g_hash_table_lookup(si->folders, fi->full_name);
-	if (mfi) {
-		update_1folder (self, mfi, 0, NULL, NULL, NULL, fi);
-	} else {
-		d(printf("Adding new folder: %s (%s)\n", fi->full_name, fi->uri));
-		mfi = g_malloc0(sizeof(*mfi));
-		mfi->full_name = g_strdup(fi->full_name);
-		mfi->uri = g_strdup(fi->uri);
-		mfi->store_info = si;
-		mfi->flags = fi->flags;
-
-		g_hash_table_insert(si->folders, mfi->full_name, mfi);
-		g_hash_table_insert(si->folders_uri, mfi->uri, mfi);
-
-		up = g_malloc0(sizeof(*up));
-		up->full_name = g_strdup(mfi->full_name);
-		up->uri = g_strdup(fi->uri);
-		up->unread = fi->unread;
-		up->store = si->store;
-		camel_object_ref(up->store);
-
-		if ((fi->flags & CAMEL_FOLDER_NOSELECT) == 0)
-			up->add = TRUE;
-
-		g_queue_push_head (&self->priv->updates, up);
-		flush_updates(self);
-	}
-}
-
-static void
-create_folders(MailFolderCache *self, CamelFolderInfo *fi, struct _store_info *si)
-{
-	d(printf("Setup new folder: %s\n  %s\n", fi->uri, fi->full_name));
-
-	while (fi) {
-		setup_folder(self, fi, si);
-
-		if (fi->child)
-			create_folders(self, fi->child, si);
-
-		fi = fi->next;
-	}
-}
-
-static void
-folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
+folder_changed_cb (CamelFolder *folder,
+                   CamelFolderChangeInfo *changes,
+                   MailFolderCache *self)
 {
 	static time_t last_newmail = 0;
-	CamelFolderChangeInfo *changes = event_data;
-	CamelFolder *folder = (CamelFolder *)o;
 	CamelFolder *local_drafts;
 	CamelFolder *local_outbox;
 	CamelFolder *local_sent;
-	CamelStore *store = folder->parent_store;
+	CamelStore *parent_store;
 	CamelMessageInfo *info;
 	struct _store_info *si;
 	struct _folder_info *mfi;
+	const gchar *full_name;
 	gint new = 0;
 	gint i;
 	guint32 flags;
 	gchar *uid = NULL, *sender = NULL, *subject = NULL;
-	MailFolderCache *self = (MailFolderCache*) user_data;
 
-	d(printf("folder '%s' changed\n", folder->full_name));
+	full_name = camel_folder_get_full_name (folder);
+	parent_store = camel_folder_get_parent_store (folder);
 
 	local_drafts = e_mail_local_get_folder (E_MAIL_FOLDER_DRAFTS);
 	local_outbox = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
@@ -459,7 +352,7 @@ folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
 						subject = NULL;
 					}
 				}
-				camel_message_info_free (info);
+				camel_folder_free_message_info (folder, info);
 			}
 		}
 	}
@@ -469,8 +362,8 @@ folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
 
 	g_mutex_lock (self->priv->stores_mutex);
 	if (self->priv->stores != NULL
-	    && (si = g_hash_table_lookup(self->priv->stores, store)) != NULL
-	    && (mfi = g_hash_table_lookup(si->folders, folder->full_name)) != NULL
+	    && (si = g_hash_table_lookup(self->priv->stores, parent_store)) != NULL
+	    && (mfi = g_hash_table_lookup(si->folders, full_name)) != NULL
 	    && mfi->folder == folder) {
 		update_1folder (self, mfi, new, uid, sender, subject, NULL);
 	}
@@ -482,143 +375,159 @@ folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
 }
 
 static void
-folder_finalised(CamelObject *o, gpointer event_data, gpointer user_data)
+unset_folder_info(MailFolderCache *self, struct _folder_info *mfi, gint delete, gint unsub)
 {
-	CamelFolder *folder = (CamelFolder *)o;
-	CamelStore *store = folder->parent_store;
-	struct _store_info *si;
-	struct _folder_info *mfi;
-	MailFolderCache *self = (MailFolderCache*) user_data;
+	struct _folder_update *up;
 
-	d(printf("Folder finalised '%s'!\n", ((CamelFolder *)o)->full_name));
-	g_mutex_lock (self->priv->stores_mutex);
-	if (self->priv->stores != NULL
-	    && (si = g_hash_table_lookup(self->priv->stores, store)) != NULL
-	    && (mfi = g_hash_table_lookup(si->folders, folder->full_name)) != NULL
-	    && mfi->folder == folder) {
-		mfi->folder = NULL;
+	d(printf("unset folderinfo '%s'\n", mfi->uri));
+
+	if (mfi->folder) {
+		CamelFolder *folder = mfi->folder;
+
+		g_signal_handlers_disconnect_by_func (
+			folder, folder_changed_cb, self);
+
+		g_object_remove_weak_pointer (
+			G_OBJECT (mfi->folder), &mfi->folder);
+	}
+
+	if ((mfi->flags & CAMEL_FOLDER_NOSELECT) == 0) {
+		up = g_malloc0(sizeof(*up));
+
+		up->remove = TRUE;
+		up->delete = delete;
+		up->unsub = unsub;
+		up->store = g_object_ref (mfi->store_info->store);
+		up->full_name = g_strdup (mfi->full_name);
+		up->uri = g_strdup(mfi->uri);
+
+		g_queue_push_head (&self->priv->updates, up);
+		flush_updates(self);
 	}
-	g_mutex_unlock (self->priv->stores_mutex);
 }
 
 static void
-folder_renamed(CamelObject *o, gpointer event_data, gpointer user_data)
+free_folder_info(struct _folder_info *mfi)
 {
-	CamelFolder *folder = (CamelFolder *)o;
-	gchar *old = event_data;
-
-	d(printf("Folder renamed from '%s' to '%s'\n", old, folder->full_name));
-
-	old = old;
-	folder = folder;
-	/* Dont do anything, do it from the store rename event? */
+	g_free(mfi->full_name);
+	g_free(mfi->uri);
+	g_free(mfi);
 }
 
-/**
- * mail_folder_cache_note_folder:
- *
- * When a folder has been opened, notify it for watching.  The folder must have
- * already been created on the store (which has already been noted) before the
- * folder can be opened
- */
-void mail_folder_cache_note_folder(MailFolderCache *self, CamelFolder *folder)
+static void
+setup_folder(MailFolderCache *self, CamelFolderInfo *fi, struct _store_info *si)
 {
-	CamelStore *store = folder->parent_store;
-	struct _store_info *si;
 	struct _folder_info *mfi;
+	struct _folder_update *up;
+
+	mfi = g_hash_table_lookup(si->folders, fi->full_name);
+	if (mfi) {
+		update_1folder (self, mfi, 0, NULL, NULL, NULL, fi);
+	} else {
+		d(printf("Adding new folder: %s (%s)\n", fi->full_name, fi->uri));
+		mfi = g_malloc0(sizeof(*mfi));
+		mfi->full_name = g_strdup(fi->full_name);
+		mfi->uri = g_strdup(fi->uri);
+		mfi->store_info = si;
+		mfi->flags = fi->flags;
+		mfi->has_children = fi->child != NULL;
 
-	d(printf("noting folder '%s'\n", folder->full_name));
+		g_hash_table_insert(si->folders, mfi->full_name, mfi);
+		g_hash_table_insert(si->folders_uri, mfi->uri, mfi);
 
-	g_mutex_lock (self->priv->stores_mutex);
-	if (self->priv->stores == NULL
-	    || (si = g_hash_table_lookup(self->priv->stores, store)) == NULL
-	    || (mfi = g_hash_table_lookup(si->folders, folder->full_name)) == NULL) {
-		w(g_warning("Noting folder before store initialised"));
-		g_mutex_unlock (self->priv->stores_mutex);
-		return;
-	}
+		up = g_malloc0(sizeof(*up));
+		up->full_name = g_strdup(mfi->full_name);
+		up->uri = g_strdup(fi->uri);
+		up->unread = fi->unread;
+		up->store = g_object_ref (si->store);
 
-	/* dont do anything if we already have this */
-	if (mfi->folder == folder) {
-		g_mutex_unlock (self->priv->stores_mutex);
-		return;
+		if ((fi->flags & CAMEL_FOLDER_NOSELECT) == 0)
+			up->add = TRUE;
+
+		g_queue_push_head (&self->priv->updates, up);
+		flush_updates(self);
 	}
+}
 
-	mfi->folder = folder;
+static void
+create_folders(MailFolderCache *self, CamelFolderInfo *fi, struct _store_info *si)
+{
+	d(printf("Setup new folder: %s\n  %s\n", fi->uri, fi->full_name));
 
-	update_1folder (self, mfi, 0, NULL, NULL, NULL, NULL);
+	while (fi) {
+		setup_folder(self, fi, si);
 
-	g_mutex_unlock (self->priv->stores_mutex);
+		if (fi->child)
+			create_folders(self, fi->child, si);
 
-	camel_object_hook_event(folder, "folder_changed", folder_changed, self);
-	camel_object_hook_event(folder, "renamed", folder_renamed, self);
-	camel_object_hook_event(folder, "finalize", folder_finalised, self);
+		fi = fi->next;
+	}
 }
 
 static void
-store_folder_subscribed(CamelObject *o, gpointer event_data, gpointer data)
+store_folder_subscribed_cb (CamelStore *store,
+                            CamelFolderInfo *info,
+                            MailFolderCache *self)
 {
 	struct _store_info *si;
-	CamelFolderInfo *fi = event_data;
-	MailFolderCache *self = (MailFolderCache*) data;
-
-	d(printf("Store folder subscribed '%s' store '%s' \n", fi->full_name, camel_url_to_string(((CamelService *)o)->url, 0)));
 
 	g_mutex_lock (self->priv->stores_mutex);
-	si = g_hash_table_lookup(self->priv->stores, o);
+	si = g_hash_table_lookup (self->priv->stores, store);
 	if (si)
-		setup_folder(self, fi, si);
+		setup_folder (self, info, si);
 	g_mutex_unlock (self->priv->stores_mutex);
 }
 
 static void
-store_folder_created(CamelObject *o, gpointer event_data, gpointer data)
+store_folder_created_cb (CamelStore *store,
+                         CamelFolderInfo *info,
+                         MailFolderCache *cache)
 {
-	/* we only want created events to do more work if we dont support subscriptions */
-	if (!camel_store_supports_subscriptions(CAMEL_STORE(o)))
-		store_folder_subscribed(o, event_data, data);
+	/* We only want created events to do more work
+	 * if we dont support subscriptions. */
+	if (!camel_store_supports_subscriptions (store))
+		store_folder_subscribed_cb (store, info, cache);
 }
 
 static void
-store_folder_opened(CamelObject *o, gpointer event_data, gpointer data)
+store_folder_opened_cb (CamelStore *store,
+                        CamelFolder *folder,
+                        MailFolderCache *self)
 {
-	CamelFolder *folder = event_data;
-	MailFolderCache *self = (MailFolderCache*) data;
-
-	mail_folder_cache_note_folder(self, folder);
+	mail_folder_cache_note_folder (self, folder);
 }
 
 static void
-store_folder_unsubscribed(CamelObject *o, gpointer event_data, gpointer data)
+store_folder_unsubscribed_cb (CamelStore *store,
+                              CamelFolderInfo *info,
+                              MailFolderCache *self)
 {
 	struct _store_info *si;
-	CamelFolderInfo *fi = event_data;
 	struct _folder_info *mfi;
-	CamelStore *store = (CamelStore *)o;
-	MailFolderCache *self = (MailFolderCache*) data;
-
-	d(printf("Store Folder deleted: %s\n", fi->full_name));
 
 	g_mutex_lock (self->priv->stores_mutex);
-	si = g_hash_table_lookup(self->priv->stores, store);
+	si = g_hash_table_lookup (self->priv->stores, store);
 	if (si) {
-		mfi = g_hash_table_lookup(si->folders, fi->full_name);
+		mfi = g_hash_table_lookup(si->folders, info->full_name);
 		if (mfi) {
-			g_hash_table_remove(si->folders, mfi->full_name);
-			g_hash_table_remove(si->folders_uri, mfi->uri);
-			unset_folder_info(self, mfi, TRUE, TRUE);
-			free_folder_info(mfi);
+			g_hash_table_remove (si->folders, mfi->full_name);
+			g_hash_table_remove (si->folders_uri, mfi->uri);
+			unset_folder_info (self, mfi, TRUE, TRUE);
+			free_folder_info (mfi);
 		}
 	}
 	g_mutex_unlock (self->priv->stores_mutex);
 }
 
 static void
-store_folder_deleted(CamelObject *o, gpointer event_data, gpointer data)
+store_folder_deleted_cb (CamelStore *store,
+                         CamelFolderInfo *info,
+                         MailFolderCache *self)
 {
-	/* we only want deleted events to do more work if we dont support subscriptions */
-	if (!camel_store_supports_subscriptions(CAMEL_STORE(o)))
-		store_folder_unsubscribed(o, event_data, data);
+	/* We only want deleted events to do more work
+	 * if we dont support subscriptions. */
+	if (!camel_store_supports_subscriptions (store))
+		store_folder_unsubscribed_cb (store, info, self);
 }
 
 static gchar *
@@ -670,6 +579,7 @@ rename_folders(MailFolderCache *self, struct _store_info *si, const gchar *oldba
 		mfi->full_name = g_strdup(fi->full_name);
 		mfi->uri = g_strdup(fi->uri);
 		mfi->flags = fi->flags;
+		mfi->has_children = fi->child != NULL;
 
 		g_hash_table_insert(si->folders, mfi->full_name, mfi);
 		g_hash_table_insert(si->folders_uri, mfi->uri, mfi);
@@ -681,6 +591,7 @@ rename_folders(MailFolderCache *self, struct _store_info *si, const gchar *oldba
 		mfi->uri = g_strdup(fi->uri);
 		mfi->store_info = si;
 		mfi->flags = fi->flags;
+		mfi->has_children = fi->child != NULL;
 
 		g_hash_table_insert(si->folders, mfi->full_name, mfi);
 		g_hash_table_insert(si->folders_uri, mfi->uri, mfi);
@@ -689,8 +600,7 @@ rename_folders(MailFolderCache *self, struct _store_info *si, const gchar *oldba
 	up->full_name = g_strdup(mfi->full_name);
 	up->uri = g_strdup(mfi->uri);
 	up->unread = fi->unread==-1?0:fi->unread;
-	up->store = si->store;
-	camel_object_ref(up->store);
+	up->store = g_object_ref (si->store);
 
 	if ((fi->flags & CAMEL_FOLDER_NOSELECT) == 0)
 		up->add = TRUE;
@@ -749,14 +659,12 @@ folder_cmp(gconstpointer ap, gconstpointer bp)
 }
 
 static void
-store_folder_renamed(CamelObject *o, gpointer event_data, gpointer data)
+store_folder_renamed_cb (CamelStore *store,
+                         const gchar *old_name,
+                         CamelFolderInfo *info,
+                         MailFolderCache *self)
 {
-	CamelStore *store = (CamelStore *)o;
-	CamelRenameInfo *info = event_data;
 	struct _store_info *si;
-	MailFolderCache *self = (MailFolderCache*) data;
-
-	d(printf("Folder renamed: oldbase = '%s' new->full = '%s'\n", info->old_base, info->new->full_name));
 
 	g_mutex_lock (self->priv->stores_mutex);
 	si = g_hash_table_lookup(self->priv->stores, store);
@@ -767,12 +675,12 @@ store_folder_renamed(CamelObject *o, gpointer event_data, gpointer data)
 
 		/* Ok, so for some reason the folderinfo we have comes in all messed up from
 		   imap, should find out why ... this makes it workable */
-		get_folders(info->new, folders);
+		get_folders(info, folders);
 		qsort(folders->pdata, folders->len, sizeof(folders->pdata[0]), folder_cmp);
 
 		top = folders->pdata[0];
 		for (i=0;i<folders->len;i++) {
-			rename_folders(self, si, info->old_base, top->full_name, folders->pdata[i]);
+			rename_folders(self, si, old_name, top->full_name, folders->pdata[i]);
 		}
 
 		g_ptr_array_free(folders, TRUE);
@@ -803,58 +711,6 @@ free_folder_info_hash(gchar *path, struct _folder_info *mfi, gpointer data)
 	free_folder_info(mfi);
 }
 
-/**
- * mail_folder_cache_note_store_remove:
- *
- * Notify the cache that the specified @store can be removed from the cache
- */
-void
-mail_folder_cache_note_store_remove(MailFolderCache *self, CamelStore *store)
-{
-	struct _store_info *si;
-
-	g_return_if_fail (CAMEL_IS_STORE(store));
-
-	if (self->priv->stores == NULL)
-		return;
-
-	d(printf("store removed!!\n"));
-	g_mutex_lock (self->priv->stores_mutex);
-	si = g_hash_table_lookup(self->priv->stores, store);
-	if (si) {
-		GList *link;
-		g_hash_table_remove(self->priv->stores, store);
-
-		camel_object_unhook_event(store, "folder_opened", store_folder_opened, self);
-		camel_object_unhook_event(store, "folder_created", store_folder_created, self);
-		camel_object_unhook_event(store, "folder_deleted", store_folder_deleted, self);
-		camel_object_unhook_event(store, "folder_renamed", store_folder_renamed, self);
-		camel_object_unhook_event(store, "folder_subscribed", store_folder_subscribed, self);
-		camel_object_unhook_event(store, "folder_unsubscribed", store_folder_unsubscribed, self);
-		g_hash_table_foreach(si->folders, (GHFunc)unset_folder_info_hash, self);
-
-		link = g_queue_peek_head_link (&si->folderinfo_updates);
-
-		while (link != NULL) {
-			struct _update_data *ud = link->data;
-
-			d(printf("Cancelling outstanding folderinfo update %d\n", ud->id));
-			mail_msg_cancel(ud->id);
-			ud->cancel = 1;
-
-			link = g_list_next (link);
-		}
-
-		camel_object_unref(si->store);
-		g_hash_table_foreach(si->folders, (GHFunc)free_folder_info_hash, NULL);
-		g_hash_table_destroy(si->folders);
-		g_hash_table_destroy(si->folders_uri);
-		g_free(si);
-	}
-
-	g_mutex_unlock (self->priv->stores_mutex);
-}
-
 static gboolean
 update_folders(CamelStore *store, CamelFolderInfo *fi, gpointer data)
 {
@@ -885,16 +741,16 @@ update_folders(CamelStore *store, CamelFolderInfo *fi, gpointer data)
 
 struct _ping_store_msg {
 	MailMsg base;
-
 	CamelStore *store;
 };
 
 static gchar *
 ping_store_desc (struct _ping_store_msg *m)
 {
-	gchar *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE);
+	gchar *service_name;
 	gchar *msg;
 
+	service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE);
 	msg = g_strdup_printf (_("Pinging %s"), service_name);
 	g_free (service_name);
 
@@ -921,7 +777,7 @@ ping_store_exec (struct _ping_store_msg *m)
 static void
 ping_store_free (struct _ping_store_msg *m)
 {
-	camel_object_unref (m->store);
+	g_object_unref (m->store);
 }
 
 static MailMsgInfo ping_store_info = {
@@ -933,28 +789,25 @@ static MailMsgInfo ping_store_info = {
 };
 
 static void
-ping_store (gpointer key, gpointer val, gpointer user_data)
+ping_store (CamelStore *store)
 {
-	CamelStore *store = (CamelStore *) key;
 	struct _ping_store_msg *m;
 
 	if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED)
 		return;
 
 	m = mail_msg_new (&ping_store_info);
-	m->store = store;
-	camel_object_ref (store);
+	m->store = g_object_ref (store);
 
 	mail_msg_slow_ordered_push (m);
 }
 
 static gboolean
-ping_cb (gpointer user_data)
+ping_cb (MailFolderCache *self)
 {
-	MailFolderCache *self = (MailFolderCache*) user_data;
 	g_mutex_lock (self->priv->stores_mutex);
 
-	g_hash_table_foreach (self->priv->stores, ping_store, NULL);
+	g_hash_table_foreach (self->priv->stores, (GHFunc) ping_store, NULL);
 
 	g_mutex_unlock (self->priv->stores_mutex);
 
@@ -980,84 +833,6 @@ store_online_cb (CamelStore *store, gpointer data)
 	g_mutex_unlock (ud->cache->priv->stores_mutex);
 }
 
-/**
- * mail_folder_cache_note_store:
- *
- * Add a store whose folders should appear in the shell The folders are scanned
- * from the store, and/or added at runtime via the folder_created event.  The
- * @done function returns if we can free folder info.
- */
-void
-mail_folder_cache_note_store(MailFolderCache *self, CamelStore *store, CamelOperation *op,
-			     NoteDoneFunc done, gpointer data)
-{
-	struct _store_info *si;
-	struct _update_data *ud;
-	gint hook = 0;
-
-	g_return_if_fail (CAMEL_IS_STORE(store));
-	g_return_if_fail (mail_in_main_thread());
-
-	g_mutex_lock (self->priv->stores_mutex);
-
-	si = g_hash_table_lookup(self->priv->stores, store);
-	if (si == NULL) {
-		d(printf("Noting a new store: %p: %s\n", store, camel_url_to_string(((CamelService *)store)->url, 0)));
-
-		si = g_malloc0(sizeof(*si));
-		si->folders = g_hash_table_new(g_str_hash, g_str_equal);
-		si->folders_uri = g_hash_table_new(CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(store))->hash_folder_name,
-						   CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(store))->compare_folder_name);
-		si->store = store;
-		camel_object_ref((CamelObject *)store);
-		g_hash_table_insert(self->priv->stores, store, si);
-		g_queue_init (&si->folderinfo_updates);
-		hook = TRUE;
-	}
-
-	ud = g_malloc(sizeof(*ud));
-	ud->done = done;
-	ud->data = data;
-	ud->cancel = 0;
-	ud->cache = self;
-
-	/* We might get a race when setting up a store, such that it is still left in offline mode,
-	   after we've gone online.  This catches and fixes it up when the shell opens us */
-	if (CAMEL_IS_DISCO_STORE (store)) {
-		if (camel_session_is_online (session)
-		    && camel_disco_store_status (CAMEL_DISCO_STORE (store)) == CAMEL_DISCO_STORE_OFFLINE) {
-			/* Note: we use the 'id' here, even though its not the right id, its still ok */
-			ud->id = mail_store_set_offline (store, FALSE, store_online_cb, ud);
-		} else {
-			goto normal_setup;
-		}
-	} else if (CAMEL_IS_OFFLINE_STORE (store)) {
-		if (camel_session_is_online (session) && CAMEL_OFFLINE_STORE (store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) {
-			/* Note: we use the 'id' here, even though its not the right id, its still ok */
-			ud->id = mail_store_set_offline (store, FALSE, store_online_cb, ud);
-		} else {
-			goto normal_setup;
-		}
-	} else {
-	normal_setup:
-		ud->id = mail_get_folderinfo (store, op, update_folders, ud);
-	}
-
-	g_queue_push_tail (&si->folderinfo_updates, ud);
-
-	g_mutex_unlock (self->priv->stores_mutex);
-
-	/* there is potential for race here, but it is safe as we check for the store anyway */
-	if (hook) {
-		camel_object_hook_event(store, "folder_opened", store_folder_opened, self);
-		camel_object_hook_event(store, "folder_created", store_folder_created, self);
-		camel_object_hook_event(store, "folder_deleted", store_folder_deleted, self);
-		camel_object_hook_event(store, "folder_renamed", store_folder_renamed, self);
-		camel_object_hook_event(store, "folder_subscribed", store_folder_subscribed, self);
-		camel_object_hook_event(store, "folder_unsubscribed", store_folder_unsubscribed, self);
-	}
-}
-
 struct _find_info {
 	const gchar *uri;
 	struct _folder_info *fi;
@@ -1065,7 +840,10 @@ struct _find_info {
 };
 
 /* look up on each storeinfo using proper hash function for that stores uri's */
-static void storeinfo_find_folder_info(CamelStore *store, struct _store_info *si, struct _find_info *fi)
+static void
+storeinfo_find_folder_info (CamelStore *store,
+                            struct _store_info *si,
+                            struct _find_info *fi)
 {
 	if (fi->fi == NULL) {
 		if (((CamelService *)store)->provider->url_equal(fi->url, ((CamelService *)store)->url)) {
@@ -1078,77 +856,11 @@ static void storeinfo_find_folder_info(CamelStore *store, struct _store_info *si
 	}
 }
 
-/**
- * mail_folder_cache_get_folder_from_uri:
- *
- * Gets the #CamelFolder for the supplied @uri.
- *
- * Return value: TRUE if the uri is available, folderp is set to a reffed folder if
- * the folder has also already been opened
- */
-gboolean
-mail_folder_cache_get_folder_from_uri(MailFolderCache *self, const gchar *uri, CamelFolder **folderp)
-{
-	struct _find_info fi = { uri, NULL, NULL };
-
-	if (self->priv->stores == NULL)
-		return FALSE;
-
-	fi.url = camel_url_new(uri, NULL);
-
-	g_mutex_lock (self->priv->stores_mutex);
-	g_hash_table_foreach(self->priv->stores, (GHFunc)storeinfo_find_folder_info, &fi);
-	if (folderp) {
-		if (fi.fi && fi.fi->folder) {
-			*folderp = fi.fi->folder;
-			camel_object_ref(*folderp);
-		} else {
-			*folderp = NULL;
-		}
-	}
-	g_mutex_unlock (self->priv->stores_mutex);
-
-	camel_url_free(fi.url);
-
-	return fi.fi != NULL;
-}
-
-gboolean
-mail_folder_cache_get_folder_info_flags (MailFolderCache *self, CamelFolder *folder, gint *flags)
-{
-	gchar *uri = mail_tools_folder_to_url (folder);
-	struct _find_info fi = { uri, NULL, NULL };
-
-	if (self->priv->stores == NULL)
-		return FALSE;
-
-	fi.url = camel_url_new (uri, NULL);
-
-	g_mutex_lock (self->priv->stores_mutex);
-	g_hash_table_foreach(self->priv->stores, (GHFunc)storeinfo_find_folder_info, &fi);
-	if (flags) {
-		if (fi.fi) {
-			*flags = fi.fi->flags;
-		}
-	}
-	g_mutex_unlock (self->priv->stores_mutex);
-
-	camel_url_free(fi.url);
-	g_free (uri);
-
-	return fi.fi != NULL;
-}
-
-static void
-mail_folder_cache_dispose (GObject *object)
-{
-	G_OBJECT_CLASS (mail_folder_cache_parent_class)->dispose (object);
-}
-
 static void
 mail_folder_cache_finalize (GObject *object)
 {
 	MailFolderCache *cache = (MailFolderCache*) object;
+
 	g_hash_table_destroy (cache->priv->stores);
 	g_mutex_free (cache->priv->stores_mutex);
 
@@ -1162,17 +874,18 @@ mail_folder_cache_finalize (GObject *object)
 		cache->priv->update_id = 0;
 	}
 
+	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (mail_folder_cache_parent_class)->finalize (object);
 }
 
 static void
-mail_folder_cache_class_init (MailFolderCacheClass *klass)
+mail_folder_cache_class_init (MailFolderCacheClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class;
 
-	g_type_class_add_private (klass, sizeof (MailFolderCachePrivate));
+	g_type_class_add_private (class, sizeof (MailFolderCachePrivate));
 
-	object_class->dispose = mail_folder_cache_dispose;
+	object_class = G_OBJECT_CLASS (class);
 	object_class->finalize = mail_folder_cache_finalize;
 
 	/**
@@ -1188,9 +901,9 @@ mail_folder_cache_class_init (MailFolderCacheClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      0, /* struct offset */
 			      NULL, NULL, /* accumulator */
-			      e_marshal_VOID__BOXED_STRING,
+			      e_marshal_VOID__OBJECT_STRING,
 			      G_TYPE_NONE, 2,
-			      E_TYPE_CAMEL_OBJECT, G_TYPE_STRING);
+			      CAMEL_TYPE_OBJECT, G_TYPE_STRING);
 
 	/**
 	 * MailFolderCache::folder-unavailable
@@ -1207,9 +920,9 @@ mail_folder_cache_class_init (MailFolderCacheClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      0, /* struct offset */
 			      NULL, NULL, /* accumulator */
-			      e_marshal_VOID__BOXED_STRING,
+			      e_marshal_VOID__OBJECT_STRING,
 			      G_TYPE_NONE, 2,
-			      E_TYPE_CAMEL_OBJECT, G_TYPE_STRING);
+			      CAMEL_TYPE_OBJECT, G_TYPE_STRING);
 
 	/**
 	 * MailFolderCache::folder-deleted
@@ -1224,9 +937,9 @@ mail_folder_cache_class_init (MailFolderCacheClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      0, /* struct offset */
 			      NULL, NULL, /* accumulator */
-			      e_marshal_VOID__BOXED_STRING,
+			      e_marshal_VOID__OBJECT_STRING,
 			      G_TYPE_NONE, 2,
-			      E_TYPE_CAMEL_OBJECT, G_TYPE_STRING);
+			      CAMEL_TYPE_OBJECT, G_TYPE_STRING);
 
 	/**
 	 * MailFolderCache::folder-renamed
@@ -1242,9 +955,9 @@ mail_folder_cache_class_init (MailFolderCacheClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      0, /* struct offset */
 			      NULL, NULL, /* accumulator */
-			      e_marshal_VOID__BOXED_STRING_STRING,
+			      e_marshal_VOID__OBJECT_STRING_STRING,
 			      G_TYPE_NONE, 3,
-			      E_TYPE_CAMEL_OBJECT, G_TYPE_STRING, G_TYPE_STRING);
+			      CAMEL_TYPE_OBJECT, G_TYPE_STRING, G_TYPE_STRING);
 
 	/**
 	 * MailFolderCache::folder-unread-updated
@@ -1260,9 +973,9 @@ mail_folder_cache_class_init (MailFolderCacheClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      0, /* struct offset */
 			      NULL, NULL, /* accumulator */
-			      e_marshal_VOID__BOXED_STRING_INT,
+			      e_marshal_VOID__OBJECT_STRING_INT,
 			      G_TYPE_NONE, 3,
-			      E_TYPE_CAMEL_OBJECT, G_TYPE_STRING, G_TYPE_INT);
+			      CAMEL_TYPE_OBJECT, G_TYPE_STRING, G_TYPE_INT);
 
 	/**
 	 * MailFolderCache::folder-changed
@@ -1283,9 +996,9 @@ mail_folder_cache_class_init (MailFolderCacheClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      0, /* struct offset */
 			      NULL, NULL, /* accumulator */
-			      e_marshal_VOID__BOXED_STRING_STRING_INT_STRING_STRING_STRING,
+			      e_marshal_VOID__OBJECT_STRING_STRING_INT_STRING_STRING_STRING,
 			      G_TYPE_NONE, 7,
-			      E_TYPE_CAMEL_OBJECT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT,
+			      CAMEL_TYPE_OBJECT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT,
 			      G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 }
 
@@ -1295,7 +1008,7 @@ mail_folder_cache_init (MailFolderCache *self)
 	const gchar *buf;
 	guint timeout;
 
-	self->priv = FOLDER_CACHE_PRIVATE (self);
+	self->priv = MAIL_FOLDER_CACHE_GET_PRIVATE (self);
 
 	/* initialize values */
 	self->priv->stores = g_hash_table_new(NULL, NULL);
@@ -1308,19 +1021,8 @@ mail_folder_cache_init (MailFolderCache *self)
 
 	buf = getenv ("EVOLUTION_PING_TIMEOUT");
 	timeout = buf ? strtoul (buf, NULL, 10) : 600;
-	self->priv->ping_id = g_timeout_add_seconds (timeout, ping_cb, self);
-}
-
-/**
- * mail_folder_cache_new:
- *
- * You probably don't want to use this. Use mail_folder_cache_get_default()
- * instead
- */
-MailFolderCache *
-mail_folder_cache_new (void)
-{
-	return g_object_new (MAIL_TYPE_FOLDER_CACHE, NULL);
+	self->priv->ping_id = g_timeout_add_seconds (
+		timeout, (GSourceFunc) ping_cb, self);
 }
 
 static MailFolderCache *default_cache = NULL;
@@ -1341,3 +1043,294 @@ mail_folder_cache_get_default (void)
 
 	return default_cache;
 }
+
+/**
+ * mail_folder_cache_note_store:
+ *
+ * Add a store whose folders should appear in the shell The folders are scanned
+ * from the store, and/or added at runtime via the folder_created event.  The
+ * @done function returns if we can free folder info.
+ */
+void
+mail_folder_cache_note_store (MailFolderCache *self,
+                              CamelStore *store,
+                              CamelOperation *op,
+                              NoteDoneFunc done,
+                              gpointer data)
+{
+	struct _store_info *si;
+	struct _update_data *ud;
+	gint hook = 0;
+
+	g_return_if_fail (CAMEL_IS_STORE(store));
+	g_return_if_fail (mail_in_main_thread());
+
+	g_mutex_lock (self->priv->stores_mutex);
+
+	si = g_hash_table_lookup (self->priv->stores, store);
+	if (si == NULL) {
+		d(printf("Noting a new store: %p: %s\n", store, camel_url_to_string(((CamelService *)store)->url, 0)));
+
+		si = g_malloc0(sizeof(*si));
+		si->folders = g_hash_table_new(g_str_hash, g_str_equal);
+		si->folders_uri = g_hash_table_new(CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(store))->hash_folder_name,
+						   CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(store))->compare_folder_name);
+		si->store = g_object_ref (store);
+		g_hash_table_insert(self->priv->stores, store, si);
+		g_queue_init (&si->folderinfo_updates);
+		hook = TRUE;
+	}
+
+	ud = g_malloc(sizeof(*ud));
+	ud->done = done;
+	ud->data = data;
+	ud->cancel = 0;
+	ud->cache = self;
+
+	/* We might get a race when setting up a store, such that it is still left in offline mode,
+	   after we've gone online.  This catches and fixes it up when the shell opens us */
+	if (CAMEL_IS_DISCO_STORE (store)) {
+		if (camel_session_get_online (session)
+		    && camel_disco_store_status (CAMEL_DISCO_STORE (store)) == CAMEL_DISCO_STORE_OFFLINE) {
+			/* Note: we use the 'id' here, even though its not the right id, its still ok */
+			ud->id = mail_store_set_offline (store, FALSE, store_online_cb, ud);
+		} else {
+			goto normal_setup;
+		}
+	} else if (CAMEL_IS_OFFLINE_STORE (store)) {
+		if (camel_session_get_online (session) && CAMEL_OFFLINE_STORE (store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) {
+			/* Note: we use the 'id' here, even though its not the right id, its still ok */
+			ud->id = mail_store_set_offline (store, FALSE, store_online_cb, ud);
+		} else {
+			goto normal_setup;
+		}
+	} else {
+	normal_setup:
+		ud->id = mail_get_folderinfo (store, op, update_folders, ud);
+	}
+
+	g_queue_push_tail (&si->folderinfo_updates, ud);
+
+	g_mutex_unlock (self->priv->stores_mutex);
+
+	/* there is potential for race here, but it is safe as we check for the store anyway */
+	if (hook) {
+		g_signal_connect (
+			store, "folder-opened",
+			G_CALLBACK (store_folder_opened_cb), self);
+		g_signal_connect (
+			store, "folder-created",
+			G_CALLBACK (store_folder_created_cb), self);
+		g_signal_connect (
+			store, "folder-deleted",
+			G_CALLBACK (store_folder_deleted_cb), self);
+		g_signal_connect (
+			store, "folder-renamed",
+			G_CALLBACK (store_folder_renamed_cb), self);
+		g_signal_connect (
+			store, "folder-subscribed",
+			G_CALLBACK (store_folder_subscribed_cb), self);
+		g_signal_connect (
+			store, "folder-unsubscribed",
+			G_CALLBACK (store_folder_unsubscribed_cb), self);
+	}
+}
+
+/**
+ * mail_folder_cache_note_store_remove:
+ *
+ * Notify the cache that the specified @store can be removed from the cache
+ */
+void
+mail_folder_cache_note_store_remove (MailFolderCache *self,
+                                     CamelStore *store)
+{
+	struct _store_info *si;
+
+	g_return_if_fail (CAMEL_IS_STORE(store));
+
+	if (self->priv->stores == NULL)
+		return;
+
+	d(printf("store removed!!\n"));
+	g_mutex_lock (self->priv->stores_mutex);
+	si = g_hash_table_lookup (self->priv->stores, store);
+	if (si) {
+		GList *link;
+
+		g_hash_table_remove(self->priv->stores, store);
+
+		g_signal_handlers_disconnect_matched (
+			store, G_SIGNAL_MATCH_DATA,
+			0, 0, NULL, NULL, self);
+
+		g_hash_table_foreach (
+			si->folders, (GHFunc)
+			unset_folder_info_hash, self);
+
+		link = g_queue_peek_head_link (&si->folderinfo_updates);
+
+		while (link != NULL) {
+			struct _update_data *ud = link->data;
+
+			d(printf("Cancelling outstanding folderinfo update %d\n", ud->id));
+			mail_msg_cancel(ud->id);
+			ud->cancel = 1;
+
+			link = g_list_next (link);
+		}
+
+		g_object_unref (si->store);
+		g_hash_table_foreach(si->folders, (GHFunc)free_folder_info_hash, NULL);
+		g_hash_table_destroy(si->folders);
+		g_hash_table_destroy(si->folders_uri);
+		g_free(si);
+	}
+
+	g_mutex_unlock (self->priv->stores_mutex);
+}
+
+/**
+ * mail_folder_cache_note_folder:
+ *
+ * When a folder has been opened, notify it for watching.  The folder must have
+ * already been created on the store (which has already been noted) before the
+ * folder can be opened
+ */
+void
+mail_folder_cache_note_folder (MailFolderCache *self,
+                               CamelFolder *folder)
+{
+	CamelStore *parent_store;
+	struct _store_info *si;
+	struct _folder_info *mfi;
+	const gchar *full_name;
+
+	full_name = camel_folder_get_full_name (folder);
+	parent_store = camel_folder_get_parent_store (folder);
+
+	g_mutex_lock (self->priv->stores_mutex);
+	if (self->priv->stores == NULL
+	    || (si = g_hash_table_lookup(self->priv->stores, parent_store)) == NULL
+	    || (mfi = g_hash_table_lookup(si->folders, full_name)) == NULL) {
+		w(g_warning("Noting folder before store initialised"));
+		g_mutex_unlock (self->priv->stores_mutex);
+		return;
+	}
+
+	/* dont do anything if we already have this */
+	if (mfi->folder == folder) {
+		g_mutex_unlock (self->priv->stores_mutex);
+		return;
+	}
+
+	mfi->folder = folder;
+
+	g_object_add_weak_pointer (G_OBJECT (folder), &mfi->folder);
+
+	update_1folder (self, mfi, 0, NULL, NULL, NULL, NULL);
+
+	g_mutex_unlock (self->priv->stores_mutex);
+
+	g_signal_connect (
+		folder, "changed",
+		G_CALLBACK (folder_changed_cb), self);
+}
+
+/**
+ * mail_folder_cache_get_folder_from_uri:
+ *
+ * Gets the #CamelFolder for the supplied @uri.
+ *
+ * Returns: %TRUE if the URI is available, folderp is set to a reffed
+ *          folder if the folder has also already been opened
+ */
+gboolean
+mail_folder_cache_get_folder_from_uri (MailFolderCache *self,
+                                       const gchar *uri,
+                                       CamelFolder **folderp)
+{
+	struct _find_info fi = { uri, NULL, NULL };
+
+	if (self->priv->stores == NULL)
+		return FALSE;
+
+	fi.url = camel_url_new (uri, NULL);
+
+	g_mutex_lock (self->priv->stores_mutex);
+	g_hash_table_foreach (
+		self->priv->stores, (GHFunc)
+		storeinfo_find_folder_info, &fi);
+	if (folderp) {
+		if (fi.fi && fi.fi->folder)
+			*folderp = g_object_ref (fi.fi->folder);
+		else
+			*folderp = NULL;
+	}
+	g_mutex_unlock (self->priv->stores_mutex);
+
+	camel_url_free (fi.url);
+
+	return fi.fi != NULL;
+}
+
+gboolean
+mail_folder_cache_get_folder_info_flags (MailFolderCache *self,
+                                         CamelFolder *folder,
+                                         gint *flags)
+{
+	gchar *uri = mail_tools_folder_to_url (folder);
+	struct _find_info fi = { uri, NULL, NULL };
+
+	if (self->priv->stores == NULL)
+		return FALSE;
+
+	fi.url = camel_url_new (uri, NULL);
+
+	g_mutex_lock (self->priv->stores_mutex);
+	g_hash_table_foreach (
+		self->priv->stores, (GHFunc)
+		storeinfo_find_folder_info, &fi);
+	if (flags) {
+		if (fi.fi)
+			*flags = fi.fi->flags;
+		else
+			*flags = 0;
+	}
+	g_mutex_unlock (self->priv->stores_mutex);
+
+	camel_url_free (fi.url);
+	g_free (uri);
+
+	return fi.fi != NULL;
+}
+
+/* Returns whether folder 'folder' has children based on folder_info->child property.
+   If not found returns FALSE and sets 'found' to FALSE, if not NULL. */
+gboolean
+mail_folder_cache_get_folder_has_children (MailFolderCache *self, CamelFolder *folder, gboolean *found)
+{
+	gchar *uri = mail_tools_folder_to_url (folder);
+	struct _find_info fi = { uri, NULL, NULL };
+
+	g_return_val_if_fail (self != NULL, FALSE);
+	g_return_val_if_fail (folder != NULL, FALSE);
+
+	if (self->priv->stores == NULL)
+		return FALSE;
+
+	fi.url = camel_url_new (uri, NULL);
+
+	g_mutex_lock (self->priv->stores_mutex);
+	g_hash_table_foreach (
+		self->priv->stores, (GHFunc)
+		storeinfo_find_folder_info, &fi);
+	if (found)
+		*found = fi.fi != NULL;
+	g_mutex_unlock (self->priv->stores_mutex);
+
+	camel_url_free (fi.url);
+	g_free (uri);
+
+	return fi.fi != NULL && fi.fi->has_children;
+}
diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h
index dd3a108d03..d2c09d834a 100644
--- a/mail/mail-folder-cache.h
+++ b/mail/mail-folder-cache.h
@@ -23,61 +23,86 @@
  *
  */
 
-#ifndef _MAIL_FOLDER_CACHE_H
-#define _MAIL_FOLDER_CACHE_H
+#ifndef MAIL_FOLDER_CACHE_H
+#define MAIL_FOLDER_CACHE_H
 
-#include <glib-object.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define MAIL_TYPE_FOLDER_CACHE \
+	(mail_folder_cache_get_type ())
+#define MAIL_FOLDER_CACHE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), MAIL_TYPE_FOLDER_CACHE, MailFolderCache))
+#define MAIL_FOLDER_CACHE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), MAIL_TYPE_FOLDER_CACHE, MailFolderCacheClass))
+#define MAIL_IS_FOLDER_CACHE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), MAIL_TYPE_FOLDER_CACHE))
+#define MAIL_IS_FOLDER_CACHE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), MAIL_TYPE_FOLDER_CACHE))
+#define MAIL_FOLDER_CACHE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), MAIL_TYPE_FOLDER_CACHE, MailFolderCacheClass))
 
-#define MAIL_TYPE_FOLDER_CACHE            mail_folder_cache_get_type()
-#define MAIL_FOLDER_CACHE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MAIL_TYPE_FOLDER_CACHE, MailFolderCache))
-#define MAIL_FOLDER_CACHE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MAIL_TYPE_FOLDER_CACHE, MailFolderCacheClass))
-#define MAIL_IS_FOLDER_CACHE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MAIL_TYPE_FOLDER_CACHE))
-#define MAIL_IS_FOLDER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MAIL_TYPE_FOLDER_CACHE))
-#define MAIL_FOLDER_CACHE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MAIL_TYPE_FOLDER_CACHE, MailFolderCacheClass))
+G_BEGIN_DECLS
 
 typedef struct _MailFolderCache MailFolderCache;
 typedef struct _MailFolderCacheClass MailFolderCacheClass;
 typedef struct _MailFolderCachePrivate MailFolderCachePrivate;
 
 /**
+ * NoteDoneFunc:
+ *
+ * The signature of a function to be registered as a callback for
+ * mail_folder_cache_note_store()
+ */
+typedef gboolean (*NoteDoneFunc)(CamelStore *store, CamelFolderInfo *info, gpointer data);
+
+/**
  * MailFolderCache:
  *
  * Contains only private data that should be read and manipulated using the
  * functions below.
  */
-struct _MailFolderCache
-{
+struct _MailFolderCache {
 	GObject parent;
-
 	MailFolderCachePrivate *priv;
 };
 
-struct _MailFolderCacheClass
-{
+struct _MailFolderCacheClass {
 	GObjectClass parent_class;
 };
 
-GType mail_folder_cache_get_type (void) G_GNUC_CONST;
+GType		mail_folder_cache_get_type	(void) G_GNUC_CONST;
+MailFolderCache *
+		mail_folder_cache_get_default	(void);
+void		mail_folder_cache_note_store	(MailFolderCache *self,
+						 CamelStore *store,
+						 CamelOperation *op,
+						 NoteDoneFunc done,
+						 gpointer data);
+void		mail_folder_cache_note_store_remove
+						(MailFolderCache *self,
+						 CamelStore *store);
+void		mail_folder_cache_note_folder	(MailFolderCache *self,
+						 CamelFolder *folder);
+gboolean	mail_folder_cache_get_folder_from_uri
+						(MailFolderCache *self,
+						 const gchar *uri,
+						 CamelFolder **folderp);
+gboolean	mail_folder_cache_get_folder_info_flags
+						(MailFolderCache *self,
+						 CamelFolder *folder,
+						 gint *flags);
 
-MailFolderCache *mail_folder_cache_new (void);
-
-MailFolderCache *mail_folder_cache_get_default (void);
-
-/**
- * NoteDoneFunc:
- *
- * The signature of a function to be registered as a callback for
- * mail_folder_cache_note_store()
- */
-typedef gboolean (*NoteDoneFunc)(CamelStore *store, CamelFolderInfo *info, gpointer data);
-void mail_folder_cache_note_store (MailFolderCache *self, CamelStore *store, CamelOperation *op, NoteDoneFunc done, gpointer data);
-void mail_folder_cache_note_store_remove (MailFolderCache *self, CamelStore *store);
-void mail_folder_cache_note_folder (MailFolderCache *self, CamelFolder *folder);
-gboolean mail_folder_cache_get_folder_from_uri (MailFolderCache *self, const gchar *uri, CamelFolder **folderp);
-gboolean mail_folder_cache_get_folder_info_flags (MailFolderCache *self, CamelFolder *folder, gint *flags);
+gboolean	mail_folder_cache_get_folder_has_children
+						(MailFolderCache *self,
+						 CamelFolder *folder,
+						 gboolean *found);
 
 G_END_DECLS
-#endif
+
+#endif /* MAIL_FOLDER_CACHE_H */
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 5f656c9ec9..de59213ce5 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -27,9 +27,6 @@
 
 #include <libedataserver/e-flag.h>
 
-#include <camel/camel-object.h>
-#include <camel/camel-operation.h>
-
 #include "shell/e-shell.h"
 #include "e-util/e-alert-activity.h"
 #include "e-util/e-alert-dialog.h"
diff --git a/mail/mail-mt.h b/mail/mail-mt.h
index 2e8828c5b2..5cfbf2abe1 100644
--- a/mail/mail-mt.h
+++ b/mail/mail-mt.h
@@ -23,8 +23,7 @@
 #ifndef _MAIL_MT
 #define _MAIL_MT
 
-#include "camel/camel-exception.h"
-#include "camel/camel-operation.h"
+#include <camel/camel.h>
 
 typedef struct _MailMsg MailMsg;
 typedef struct _MailMsgInfo MailMsgInfo;
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 7cbb91bede..128cb28c9c 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -33,17 +33,6 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 
-#include <camel/camel-disco-folder.h>
-#include <camel/camel-disco-store.h>
-#include <camel/camel-mime-filter-from.h>
-#include <camel/camel-offline-folder.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-vfs.h>
-#include <camel/camel-transport.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vee-store.h>
-
 #include <libedataserver/e-data-server-util.h>
 #include "e-util/e-account-utils.h"
 
@@ -142,7 +131,7 @@ em_filter_folder_element_exec (struct _filter_mail_msg *m)
 
 	/* this may thaw/unref source folders, do it here so we dont do it in the main thread
 	   see also fetch_mail_fetch() below */
-	camel_object_unref(m->driver);
+	g_object_unref (m->driver);
 	m->driver = NULL;
 
 	if (m->cancel)
@@ -158,7 +147,7 @@ static void
 em_filter_folder_element_free (struct _filter_mail_msg *m)
 {
 	if (m->source_folder)
-		camel_object_unref (m->source_folder);
+		g_object_unref (m->source_folder);
 
 	if (m->source_uids)
 		em_utils_uids_free (m->source_uids);
@@ -167,10 +156,10 @@ em_filter_folder_element_free (struct _filter_mail_msg *m)
 		camel_operation_unref (m->cancel);
 
 	if (m->destination)
-		camel_object_unref (m->destination);
+		g_object_unref (m->destination);
 
 	if (m->driver)
-		camel_object_unref (m->driver);
+		g_object_unref (m->driver);
 
 	mail_session_flush_filter_log ();
 }
@@ -192,7 +181,7 @@ mail_filter_folder (CamelFolder *source_folder, GPtrArray *uids,
 
 	m = mail_msg_new (&em_filter_folder_element_info);
 	m->source_folder = source_folder;
-	camel_object_ref (source_folder);
+	g_object_ref (source_folder);
 	m->source_uids = uids;
 	m->cache = NULL;
 	m->delete = FALSE;
@@ -266,7 +255,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m)
 	fm->destination = e_mail_local_get_folder (E_MAIL_FOLDER_LOCAL_INBOX);
 	if (fm->destination == NULL)
 		goto fail;
-	camel_object_ref (fm->destination);
+	g_object_ref (fm->destination);
 
 	/* FIXME: this should support keep_on_server too, which would then perform a spool
 	   access thingy, right?  problem is matching raw messages to uid's etc. */
@@ -290,9 +279,11 @@ fetch_mail_exec (struct _fetch_mail_msg *m)
 			/* this handles 'keep on server' stuff, if we have any new uid's to copy
 			   across, we need to copy them to a new array 'cause of the way fetch_mail_free works */
 			CamelUIDCache *cache = NULL;
+			CamelStore *parent_store;
 			gchar *cachename;
 
-			cachename = uid_cachename_hack (folder->parent_store);
+			parent_store = camel_folder_get_parent_store (folder);
+			cachename = uid_cachename_hack (parent_store);
 			cache = camel_uid_cache_new (cachename);
 			g_free (cachename);
 
@@ -342,7 +333,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m)
 			/* we unref the source folder here since we
 			   may now block in finalize (we try to
 			   disconnect cleanly) */
-			camel_object_unref (fm->source_folder);
+			g_object_unref (fm->source_folder);
 			fm->source_folder = NULL;
 		}
 	}
@@ -354,7 +345,7 @@ fail:
 	   folders and whatnot) before we are really done */
 	/* should this be cancellable too? (i.e. above unregister above) */
 	if (fm->driver) {
-		camel_object_unref (fm->driver);
+		g_object_unref (fm->driver);
 		fm->driver = NULL;
 	}
 }
@@ -564,7 +555,7 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u
 		folder = mail_tool_uri_to_folder(uri, 0, NULL);
 		if (folder) {
 			camel_folder_append_message(folder, message, info, NULL, NULL);
-			camel_object_unref(folder);
+			g_object_unref (folder);
 			folder = NULL;
 		}
 		g_free(uri);
@@ -603,7 +594,7 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u
 
 		if (!folder) {
 			folder = e_mail_local_get_folder (E_MAIL_FOLDER_SENT);
-			camel_object_ref(folder);
+			g_object_ref (folder);
 		}
 
 		camel_folder_append_message (folder, message, info, NULL, ex);
@@ -616,16 +607,17 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u
 			sent_folder = e_mail_local_get_folder (E_MAIL_FOLDER_SENT);
 
 			if (folder != sent_folder) {
-				const gchar *name;
+				const gchar *description;
 
-				camel_object_get (folder, NULL, CAMEL_OBJECT_DESCRIPTION, (gchar **) &name, 0);
+				description = camel_folder_get_description (folder);
 				if (err->len)
 					g_string_append(err, "\n\n");
-				g_string_append_printf (err, _("Failed to append to %s: %s\n"
-							"Appending to local 'Sent' folder instead."),
-						name, camel_exception_get_description (ex));
-				camel_object_ref (sent_folder);
-				camel_object_unref (folder);
+				g_string_append_printf (
+					err, _("Failed to append to %s: %s\n"
+					"Appending to local 'Sent' folder instead."),
+					description, camel_exception_get_description (ex));
+				g_object_ref (sent_folder);
+				g_object_unref (folder);
 				folder = sent_folder;
 
 				camel_exception_clear (ex);
@@ -657,19 +649,19 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u
 exit:
 	if (folder) {
 		camel_folder_sync(folder, FALSE, NULL);
-		camel_object_unref(folder);
+		g_object_unref (folder);
 	}
 	if (info)
 		camel_message_info_free(info);
-	camel_object_unref(recipients);
-	camel_object_unref(from);
+	g_object_unref (recipients);
+	g_object_unref (from);
 	if (xport)
-		camel_object_unref(xport);
+		g_object_unref (xport);
 	g_free(sent_folder_uri);
 	g_free(transport_url);
 	camel_header_raw_clear(&xev);
 	g_string_free(err, TRUE);
-	camel_object_unref(message);
+	g_object_unref (message);
 
 	return;
 }
@@ -793,7 +785,7 @@ send_queue_exec (struct _send_queue_msg *m)
 		report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Complete."));
 
 	if (m->driver) {
-		camel_object_unref (m->driver);
+		g_object_unref (m->driver);
 		m->driver = NULL;
 	}
 
@@ -837,8 +829,8 @@ static void
 send_queue_free (struct _send_queue_msg *m)
 {
 	if (m->driver)
-		camel_object_unref(m->driver);
-	camel_object_unref(m->queue);
+		g_object_unref (m->driver);
+	g_object_unref (m->queue);
 	g_free(m->destination);
 	if (m->cancel)
 		camel_operation_unref(m->cancel);
@@ -864,7 +856,7 @@ mail_send_queue(CamelFolder *queue, const gchar *destination,
 
 	m = mail_msg_new(&send_queue_info);
 	m->queue = queue;
-	camel_object_ref(queue);
+	g_object_ref (queue);
 	m->destination = g_strdup(destination);
 	if (cancel) {
 		m->cancel = cancel;
@@ -922,8 +914,8 @@ append_mail_done (struct _append_msg *m)
 static void
 append_mail_free (struct _append_msg *m)
 {
-	camel_object_unref(m->message);
-	camel_object_unref(m->folder);
+	g_object_unref (m->message);
+	g_object_unref (m->folder);
 	g_free (m->appended_uid);
 }
 
@@ -950,9 +942,9 @@ mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageIn
 
 	m = mail_msg_new (&append_mail_info);
 	m->folder = folder;
-	camel_object_ref(folder);
+	g_object_ref (folder);
 	m->message = message;
-	camel_object_ref(message);
+	g_object_ref (message);
 	m->info = info;
 
 	m->done = done;
@@ -994,7 +986,7 @@ transfer_messages_exec (struct _transfer_msg *m)
 		return;
 
 	if (dest == m->source) {
-		camel_object_unref(dest);
+		g_object_unref (dest);
 		/* no-op */
 		return;
 	}
@@ -1017,7 +1009,7 @@ transfer_messages_exec (struct _transfer_msg *m)
 	camel_folder_thaw (m->source);
 	camel_folder_thaw (dest);
 	camel_folder_sync (dest, FALSE, NULL);
-	camel_object_unref (dest);
+	g_object_unref (dest);
 }
 
 static void
@@ -1030,7 +1022,7 @@ transfer_messages_done (struct _transfer_msg *m)
 static void
 transfer_messages_free (struct _transfer_msg *m)
 {
-	camel_object_unref (m->source);
+	g_object_unref (m->source);
 	g_free (m->dest_uri);
 	em_utils_uids_free (m->uids);
 }
@@ -1059,7 +1051,7 @@ mail_transfer_messages (CamelFolder *source, GPtrArray *uids,
 
 	m = mail_msg_new(&transfer_messages_info);
 	m->source = source;
-	camel_object_ref (source);
+	g_object_ref (source);
 	m->uids = uids;
 	m->delete = delete_from_source;
 	m->dest_uri = g_strdup (dest_uri);
@@ -1124,7 +1116,7 @@ get_folderinfo_free (struct _get_folderinfo_msg *m)
 {
 	if (m->info && m->can_clear)
 		camel_store_free_folder_info(m->store, m->info);
-	camel_object_unref(m->store);
+	g_object_unref (m->store);
 }
 
 static MailMsgInfo get_folderinfo_info = {
@@ -1148,7 +1140,7 @@ mail_get_folderinfo (CamelStore *store, CamelOperation *op, gboolean (*done)(Cam
 		camel_operation_ref(op);
 	}
 	m->store = store;
-	camel_object_ref(store);
+	g_object_ref (store);
 	m->done = done;
 	m->data = data;
 	id = m->base.seq;
@@ -1190,11 +1182,11 @@ do_build_attachment (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
 		for (i=0;i<messages->len;i++) {
 			part = mail_tool_make_message_attachment(messages->pdata[i]);
 			camel_multipart_add_part(multipart, part);
-			camel_object_unref(part);
+			g_object_unref (part);
 		}
 		part = camel_mime_part_new();
-		camel_medium_set_content_object(CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER(multipart));
-		camel_object_unref(multipart);
+		camel_medium_set_content (CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER(multipart));
+		g_object_unref (multipart);
 
 		camel_mime_part_set_description(part, _("Forwarded messages"));
 	}
@@ -1202,7 +1194,7 @@ do_build_attachment (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
 	subject = mail_tool_generate_forward_subject(messages->pdata[0]);
 	d->done(folder, messages, part, subject, d->data);
 	g_free(subject);
-	camel_object_unref(part);
+	g_object_unref (part);
 
 	g_free(d);
 }
@@ -1258,7 +1250,7 @@ get_folder_free (struct _get_folder_msg *m)
 {
 	g_free (m->uri);
 	if (m->folder)
-		camel_object_unref (m->folder);
+		g_object_unref (m->folder);
 }
 
 static MailMsgInfo get_folder_info = {
@@ -1323,7 +1315,7 @@ static void
 get_quota_free (struct _get_quota_msg *m)
 {
 	if (m->folder)
-		camel_object_unref (m->folder);
+		g_object_unref (m->folder);
 	if (m->quota)
 		camel_folder_quota_info_free (m->quota);
 	g_free (m->folder_uri);
@@ -1354,7 +1346,7 @@ mail_get_folder_quota (CamelFolder *folder,
 	m->data = data;
 	m->done = done;
 
-	camel_object_ref (m->folder);
+	g_object_ref (m->folder);
 
 	id = m->base.seq;
 	dispatch (m);
@@ -1400,7 +1392,7 @@ get_store_free (struct _get_store_msg *m)
 {
 	g_free (m->uri);
 	if (m->store)
-		camel_object_unref (m->store);
+		g_object_unref (m->store);
 }
 
 static MailMsgInfo get_store_info = {
@@ -1497,19 +1489,21 @@ remove_folder_rec (CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
 static void
 remove_folder_exec (struct _remove_folder_msg *m)
 {
-	CamelStore *store;
 	CamelFolderInfo *fi;
+	CamelStore *parent_store;
+	const gchar *full_name;
 
 	m->removed = FALSE;
 
-	store = m->folder->parent_store;
+	full_name = camel_folder_get_full_name (m->folder);
+	parent_store = camel_folder_get_parent_store (m->folder);
 
-	fi = camel_store_get_folder_info (store, m->folder->full_name, CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, &m->base.ex);
+	fi = camel_store_get_folder_info (parent_store, full_name, CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, &m->base.ex);
 	if (camel_exception_is_set (&m->base.ex))
 		return;
 
-	remove_folder_rec (store, fi, &m->base.ex);
-	camel_store_free_folder_info (store, fi);
+	remove_folder_rec (parent_store, fi, &m->base.ex);
+	camel_store_free_folder_info (parent_store, fi);
 
 	m->removed = !camel_exception_is_set (&m->base.ex);
 }
@@ -1524,7 +1518,7 @@ remove_folder_done (struct _remove_folder_msg *m)
 static void
 remove_folder_free (struct _remove_folder_msg *m)
 {
-	camel_object_unref (m->folder);
+	g_object_unref (m->folder);
 }
 
 static MailMsgInfo remove_folder_info = {
@@ -1544,7 +1538,7 @@ mail_remove_folder (CamelFolder *folder, void (*done) (CamelFolder *folder, gboo
 
 	m = mail_msg_new (&remove_folder_info);
 	m->folder = folder;
-	camel_object_ref (folder);
+	g_object_ref (folder);
 	m->data = data;
 	m->done = done;
 
@@ -1584,7 +1578,7 @@ sync_folder_done (struct _sync_folder_msg *m)
 static void
 sync_folder_free (struct _sync_folder_msg *m)
 {
-	camel_object_unref((CamelObject *)m->folder);
+	g_object_unref ((CamelObject *)m->folder);
 }
 
 static MailMsgInfo sync_folder_info = {
@@ -1602,7 +1596,7 @@ mail_sync_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, gpointe
 
 	m = mail_msg_new(&sync_folder_info);
 	m->folder = folder;
-	camel_object_ref(folder);
+	g_object_ref (folder);
 	m->data = data;
 	m->done = done;
 
@@ -1651,7 +1645,7 @@ sync_store_done (struct _sync_store_msg *m)
 static void
 sync_store_free (struct _sync_store_msg *m)
 {
-	camel_object_unref(m->store);
+	g_object_unref (m->store);
 }
 
 static MailMsgInfo sync_store_info = {
@@ -1670,7 +1664,7 @@ mail_sync_store(CamelStore *store, gint expunge, void (*done) (CamelStore *store
 	m = mail_msg_new(&sync_store_info);
 	m->store = store;
 	m->expunge = expunge;
-	camel_object_ref(store);
+	g_object_ref (store);
 	m->data = data;
 	m->done = done;
 
@@ -1710,7 +1704,7 @@ mail_refresh_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, gpoi
 
 	m = mail_msg_new(&refresh_folder_info);
 	m->folder = folder;
-	camel_object_ref(folder);
+	g_object_ref (folder);
 	m->data = data;
 	m->done = done;
 
@@ -1747,7 +1741,7 @@ mail_expunge_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, gpoi
 
 	m = mail_msg_new(&expunge_folder_info);
 	m->folder = folder;
-	camel_object_ref(folder);
+	g_object_ref (folder);
 	m->data = data;
 	m->done = done;
 
@@ -1789,7 +1783,7 @@ empty_trash_exec (struct _empty_trash_msg *m)
 
 	if (trash) {
 		camel_folder_expunge (trash, &m->base.ex);
-		camel_object_unref (trash);
+		g_object_unref (trash);
 	}
 }
 
@@ -1869,11 +1863,11 @@ static void
 get_message_free (struct _get_message_msg *m)
 {
 	g_free (m->uid);
-	camel_object_unref (m->folder);
+	g_object_unref (m->folder);
 	camel_operation_unref (m->cancel);
 
 	if (m->message)
-		camel_object_unref (m->message);
+		g_object_unref (m->message);
 }
 
 static MailMsgInfo get_message_info = {
@@ -1894,7 +1888,7 @@ mail_get_message(CamelFolder *folder, const gchar *uid, void (*done) (CamelFolde
 
 	m = mail_msg_new(&get_message_info);
 	m->folder = folder;
-	camel_object_ref(folder);
+	g_object_ref (folder);
 	m->uid = g_strdup(uid);
 	m->data = data;
 	m->done = (void (*) (CamelFolder *, const gchar *, CamelMimeMessage *, gpointer )) done;
@@ -1936,7 +1930,7 @@ mail_get_messagex(CamelFolder *folder, const gchar *uid, void (*done) (CamelFold
 
 	m = mail_msg_new(&get_messagex_info);
 	m->folder = folder;
-	camel_object_ref(folder);
+	g_object_ref (folder);
 	m->uid = g_strdup(uid);
 	m->data = data;
 	m->done = (void (*) (CamelFolder *, const gchar *, CamelMimeMessage *, gpointer )) done;
@@ -2002,10 +1996,10 @@ get_messages_free (struct _get_messages_msg *m)
 	em_utils_uids_free (m->uids);
 	for (i=0;i<m->messages->len;i++) {
 		if (m->messages->pdata[i])
-			camel_object_unref(m->messages->pdata[i]);
+			g_object_unref (m->messages->pdata[i]);
 	}
 	g_ptr_array_free(m->messages, TRUE);
-	camel_object_unref(m->folder);
+	g_object_unref (m->folder);
 }
 
 static MailMsgInfo get_messages_info = {
@@ -2026,7 +2020,7 @@ mail_get_messages(CamelFolder *folder, GPtrArray *uids,
 
 	m = mail_msg_new(&get_messages_info);
 	m->folder = folder;
-	camel_object_ref(folder);
+	g_object_ref (folder);
 	m->uids = uids;
 	m->messages = g_ptr_array_new();
 	m->data = data;
@@ -2064,7 +2058,7 @@ save_prepare_part (CamelMimePart *mime_part)
 	CamelDataWrapper *wrapper;
 	gint parts, i;
 
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+	wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 	if (!wrapper)
 		return;
 
@@ -2093,8 +2087,8 @@ save_prepare_part (CamelMimePart *mime_part)
 static void
 save_messages_exec (struct _save_messages_msg *m)
 {
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilterFrom *from_filter;
+	CamelStream *filtered_stream;
+	CamelMimeFilter *from_filter;
 	CamelStream *stream;
 	gint i;
 	gchar *from, *path;
@@ -2106,9 +2100,10 @@ save_messages_exec (struct _save_messages_msg *m)
 
 	stream = camel_stream_vfs_new_with_uri (path, CAMEL_STREAM_VFS_CREATE);
 	from_filter = camel_mime_filter_from_new();
-	filtered_stream = camel_stream_filter_new_with_stream(stream);
-	camel_stream_filter_add(filtered_stream, (CamelMimeFilter *)from_filter);
-	camel_object_unref(from_filter);
+	filtered_stream = camel_stream_filter_new (stream);
+	camel_stream_filter_add (
+		CAMEL_STREAM_FILTER (filtered_stream), from_filter);
+	g_object_unref (from_filter);
 
 	if (path != m->path)
 		g_free (path);
@@ -2135,15 +2130,15 @@ save_messages_exec (struct _save_messages_msg *m)
 			camel_exception_setv(&m->base.ex, CAMEL_EXCEPTION_SYSTEM,
 					     _("Error saving messages to: %s:\n %s"), m->path, g_strerror(errno));
 			g_free(from);
-			camel_object_unref((CamelObject *)message);
+			g_object_unref ((CamelObject *)message);
 			break;
 		}
 		g_free(from);
-		camel_object_unref(message);
+		g_object_unref (message);
 	}
 
-	camel_object_unref(filtered_stream);
-	camel_object_unref(stream);
+	g_object_unref (filtered_stream);
+	g_object_unref (stream);
 }
 
 static void
@@ -2157,7 +2152,7 @@ static void
 save_messages_free (struct _save_messages_msg *m)
 {
 	em_utils_uids_free (m->uids);
-	camel_object_unref(m->folder);
+	g_object_unref (m->folder);
 	g_free(m->path);
 }
 
@@ -2178,7 +2173,7 @@ mail_save_messages(CamelFolder *folder, GPtrArray *uids, const gchar *path,
 
 	m = mail_msg_new(&save_messages_info);
 	m->folder = folder;
-	camel_object_ref(folder);
+	g_object_ref (folder);
 	m->uids = uids;
 	m->path = g_strdup(path);
 	m->data = data;
@@ -2241,7 +2236,7 @@ save_part_exec (struct _save_part_msg *m)
 	if (path != m->path)
 		g_free (path);
 
-	content = camel_medium_get_content_object (CAMEL_MEDIUM (m->part));
+	content = camel_medium_get_content (CAMEL_MEDIUM (m->part));
 
 	if (camel_data_wrapper_decode_to_stream (content, stream) == -1
 	    || camel_stream_flush (stream) == -1)
@@ -2249,7 +2244,7 @@ save_part_exec (struct _save_part_msg *m)
 				      _("Could not write data: %s"),
 				      g_strerror (errno));
 
-	camel_object_unref (stream);
+	g_object_unref (stream);
 }
 
 static void
@@ -2262,7 +2257,7 @@ save_part_done (struct _save_part_msg *m)
 static void
 save_part_free (struct _save_part_msg *m)
 {
-	camel_object_unref (m->part);
+	g_object_unref (m->part);
 	g_free (m->path);
 }
 
@@ -2282,7 +2277,7 @@ mail_save_part (CamelMimePart *part, const gchar *path,
 	gint id;
 	m = mail_msg_new (&save_part_info);
 	m->part = part;
-	camel_object_ref (part);
+	g_object_ref (part);
 	m->path = g_strdup (path);
 	m->data = data;
 	m->done = done;
@@ -2325,7 +2320,7 @@ prep_offline_exec (struct _prep_offline_msg *m)
 		/* prepare_for_offline should do this? */
 		/* of course it should all be atomic, but ... */
 		camel_folder_sync(folder, FALSE, NULL);
-		camel_object_unref(folder);
+		g_object_unref (folder);
 	}
 
 	if (m->cancel)
@@ -2441,7 +2436,7 @@ set_offline_done (struct _set_offline_msg *m)
 static void
 set_offline_free (struct _set_offline_msg *m)
 {
-	camel_object_unref(m->store);
+	g_object_unref (m->store);
 }
 
 static MailMsgInfo set_offline_info = {
@@ -2468,7 +2463,7 @@ mail_store_set_offline (CamelStore *store, gboolean offline,
 
 	m = mail_msg_new(&set_offline_info);
 	m->store = store;
-	camel_object_ref(store);
+	g_object_ref (store);
 	m->offline = offline;
 	m->data = data;
 	m->done = done;
@@ -2515,7 +2510,7 @@ prepare_offline_done (struct _set_offline_msg *m)
 static void
 prepare_offline_free (struct _set_offline_msg *m)
 {
-	camel_object_unref (m->store);
+	g_object_unref (m->store);
 }
 
 static MailMsgInfo prepare_offline_info = {
@@ -2538,7 +2533,7 @@ mail_store_prepare_offline (CamelStore *store)
 
 	m = mail_msg_new(&prepare_offline_info);
 	m->store = store;
-	camel_object_ref(store);
+	g_object_ref (store);
 	m->data = NULL;
 	m->done = NULL;
 
@@ -2588,7 +2583,7 @@ check_service_exec (struct _check_msg *m)
 	}
 
 	m->authtypes = camel_service_query_auth_types(service, &m->base.ex);
-	camel_object_unref(service);
+	g_object_unref (service);
 }
 
 static void
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index 843ada5d54..506de4ce80 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -26,15 +26,10 @@
 
 G_BEGIN_DECLS
 
-#include "mail-mt.h"
-
-#include "camel/camel-store.h"
-#include "camel/camel-folder.h"
-#include "camel/camel-filter-driver.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-operation.h"
+#include <camel/camel.h>
+#include <libedataserver/e-account.h>
 
-#include "libedataserver/e-account.h"
+#include "mail-mt.h"
 
 void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info,
 		       void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, gint ok,
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index d66f2ab508..149b11d4e8 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -31,11 +31,6 @@
 
 #include "libedataserver/e-account-list.h"
 
-#include "camel/camel-filter-driver.h"
-#include "camel/camel-folder.h"
-#include "camel/camel-operation.h"
-#include "camel/camel-store.h"
-
 #include "shell/e-shell.h"
 #include "e-util/e-account-utils.h"
 #include "e-util/gconf-bridge.h"
@@ -137,7 +132,7 @@ free_folder_info(struct _folder_info *info)
 {
 	/*camel_folder_thaw (info->folder);	*/
 	mail_sync_folder(info->folder, NULL, NULL);
-	camel_object_unref(info->folder);
+	g_object_unref (info->folder);
 	g_free(info->uri);
 	g_free(info);
 }
@@ -169,7 +164,7 @@ setup_send_data(void)
 			(GDestroyNotify) free_folder_info);
 		data->inbox = e_mail_local_get_folder (
 			E_MAIL_FOLDER_LOCAL_INBOX);
-		camel_object_ref(data->inbox);
+		g_object_ref (data->inbox);
 		data->active = g_hash_table_new_full (
 			g_str_hash, g_str_equal,
 			(GDestroyNotify) NULL,
@@ -203,7 +198,7 @@ free_send_data(void)
 	if (data->inbox) {
 		mail_sync_folder(data->inbox, NULL, NULL);
 		/*camel_folder_thaw (data->inbox);		*/
-		camel_object_unref(data->inbox);
+		g_object_unref (data->inbox);
 	}
 
 	g_list_free(data->infos);
@@ -414,6 +409,7 @@ build_dialog (GtkWindow *parent,
 	gint row, num_sources;
 	GList *list = NULL;
 	struct _send_data *data;
+	GtkWidget *container;
         GtkWidget *send_icon;
 	GtkWidget *recv_icon;
 	GtkWidget *scrolled_window;
@@ -438,8 +434,12 @@ build_dialog (GtkWindow *parent,
 		GTK_WINDOW (send_recv_dialog));
 
 	gtk_widget_ensure_style ((GtkWidget *)gd);
-	gtk_container_set_border_width ((GtkContainer *)gd->vbox, 0);
-	gtk_container_set_border_width ((GtkContainer *)gd->action_area, 6);
+
+	container = gtk_dialog_get_action_area (gd);
+	gtk_container_set_border_width (GTK_CONTAINER (container), 6);
+
+	container = gtk_dialog_get_content_area (gd);
+	gtk_container_set_border_width (GTK_CONTAINER (container), 0);
 
 	cancel_button = gtk_button_new_with_mnemonic (_("Cancel _All"));
 	gtk_button_set_image (
@@ -482,10 +482,11 @@ build_dialog (GtkWindow *parent,
 		GTK_SCROLLED_WINDOW (scrolled_window),
 		GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 
+	container = gtk_dialog_get_content_area (gd);
 	gtk_scrolled_window_add_with_viewport (
 		GTK_SCROLLED_WINDOW (scrolled_window), table);
 	gtk_box_pack_start (
-		GTK_BOX (gd->vbox), scrolled_window, TRUE, TRUE, 0);
+		GTK_BOX (container), scrolled_window, TRUE, TRUE, 0);
 	gtk_widget_show (scrolled_window);
 
 	/* must bet setup after send_recv_dialog as it may re-trigger send-recv button */
@@ -802,7 +803,7 @@ receive_get_folder(CamelFilterDriver *d, const gchar *uri, gpointer data, CamelE
 	oldinfo = g_hash_table_lookup(info->data->folders, uri);
 	g_mutex_unlock(info->data->lock);
 	if (oldinfo) {
-		camel_object_ref(oldinfo->folder);
+		g_object_ref (oldinfo->folder);
 		return oldinfo->folder;
 	}
 	folder = mail_tool_uri_to_folder (uri, 0, ex);
@@ -815,7 +816,7 @@ receive_get_folder(CamelFilterDriver *d, const gchar *uri, gpointer data, CamelE
 
 	if (g_hash_table_lookup_extended (info->data->folders, uri, &oldkey, &oldinfoptr)) {
 		oldinfo = (struct _folder_info *) oldinfoptr;
-		camel_object_unref(oldinfo->folder);
+		g_object_unref (oldinfo->folder);
 		oldinfo->folder = folder;
 	} else {
 		/*camel_folder_freeze (folder);		*/
@@ -825,7 +826,7 @@ receive_get_folder(CamelFilterDriver *d, const gchar *uri, gpointer data, CamelE
 		g_hash_table_insert(info->data->folders, oldinfo->uri, oldinfo);
 	}
 
-	camel_object_ref (folder);
+	g_object_ref (folder);
 
 	g_mutex_unlock(info->data->lock);
 
@@ -889,7 +890,7 @@ refresh_folders_exec (struct _refresh_folders_msg *m)
 			camel_exception_clear(&ex);
 			camel_folder_refresh_info(folder, &ex);
 			camel_exception_clear(&ex);
-			camel_object_unref(folder);
+			g_object_unref (folder);
 		} else if (camel_exception_is_set(&ex)) {
 			g_warning ("Failed to refresh folders: %s", camel_exception_get_description (&ex));
 			camel_exception_clear (&ex);
@@ -916,7 +917,7 @@ refresh_folders_free (struct _refresh_folders_msg *m)
 	g_ptr_array_free(m->folders, TRUE);
 
 	camel_store_free_folder_info (m->store, m->finfo);
-	camel_object_unref(m->store);
+	g_object_unref (m->store);
 }
 
 static MailMsgInfo refresh_folders_info = {
@@ -937,7 +938,7 @@ receive_update_got_folderinfo(CamelStore *store, CamelFolderInfo *info, gpointer
 
 		m = mail_msg_new(&refresh_folders_info);
 		m->store = store;
-		camel_object_ref(store);
+		g_object_ref (store);
 		m->folders = folders;
 		m->info = sinfo;
 		m->finfo = info;
@@ -977,18 +978,13 @@ mail_send_receive (GtkWindow *parent)
 	GList *scan;
 
 	if (send_recv_dialog != NULL) {
-#if GTK_CHECK_VERSION(2,19,7)
 		if (parent != NULL && gtk_widget_get_realized (send_recv_dialog)) {
-#else
-		if (parent != NULL && GTK_WIDGET_REALIZED (send_recv_dialog)) {
-#endif
-			gdk_window_show (send_recv_dialog->window);
-			gdk_window_raise (send_recv_dialog->window);
+			gtk_window_present (GTK_WINDOW (send_recv_dialog));
 		}
 		return send_recv_dialog;
 	}
 
-	if (!camel_session_is_online (session))
+	if (!camel_session_get_online (session))
 		return send_recv_dialog;
 
 	account = e_get_default_account ();
@@ -1047,7 +1043,7 @@ auto_timeout(gpointer data)
 {
 	struct _auto_data *info = data;
 
-	if (camel_session_is_online (session)) {
+	if (camel_session_get_online (session)) {
 		const gchar *uri;
 		gboolean keep_on_server;
 
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index 2155a96191..db144e2385 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -24,7 +24,7 @@
 #define MAIL_SEND_RECV_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-session.h>
+#include <camel/camel.h>
 #include <shell/e-shell-backend.h>
 
 G_BEGIN_DECLS
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 86f6fa180e..efbe42b03c 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -30,6 +30,7 @@
 #include <string.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
 #include <gtk/gtk.h>
@@ -43,10 +44,6 @@
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-flag.h>
 
-#include <camel/camel.h>	/* FIXME: this is where camel_init is defined, it shouldn't include everything else */
-#include <camel/camel-filter-driver.h>
-#include <camel/camel-i18n.h>
-
 #include "e-util/e-util.h"
 #include "e-util/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
@@ -67,12 +64,13 @@
 CamelSession *session;
 static gint session_check_junk_notify_id = -1;
 
-#define MAIL_SESSION_TYPE     (mail_session_get_type ())
-#define MAIL_SESSION(obj)     (CAMEL_CHECK_CAST((obj), MAIL_SESSION_TYPE, MailSession))
-#define MAIL_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), MAIL_SESSION_TYPE, MailSessionClass))
-#define MAIL_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), MAIL_SESSION_TYPE))
+#define MAIL_TYPE_SESSION \
+	(mail_session_get_type ())
+
+typedef struct _MailSession MailSession;
+typedef struct _MailSessionClass MailSessionClass;
 
-typedef struct _MailSession {
+struct _MailSession {
 	CamelSession parent_object;
 
 	gboolean interactive;
@@ -80,19 +78,17 @@ typedef struct _MailSession {
 	GList *junk_plugins;
 
 	MailAsyncEvent *async;
-} MailSession;
+};
 
-typedef struct _MailSessionClass {
+struct _MailSessionClass {
 	CamelSessionClass parent_class;
+};
 
-} MailSessionClass;
-
-static CamelSessionClass *ms_parent_class;
 static gchar *mail_data_dir;
 static gchar *mail_config_dir;
 
 static gchar *get_password(CamelSession *session, CamelService *service, const gchar *domain, const gchar *prompt, const gchar *item, guint32 flags, CamelException *ex);
-static void forget_password(CamelSession *session, CamelService *service, const gchar *domain, const gchar *item, CamelException *ex);
+static gboolean forget_password(CamelSession *session, CamelService *service, const gchar *domain, const gchar *item, CamelException *ex);
 static gboolean alert_user(CamelSession *session, CamelSessionAlertType type, const gchar *prompt, gboolean cancel);
 static CamelFilterDriver *get_filter_driver(CamelSession *session, const gchar *type, CamelException *ex);
 static gboolean lookup_addressbook(CamelSession *session, const gchar *name);
@@ -102,16 +98,15 @@ static gpointer ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *
 static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m);
 static void ms_forward_to (CamelSession *session, CamelFolder *folder, CamelMimeMessage *message, const gchar *address, CamelException *ex);
 
-static void
-init (MailSession *session)
-{
-	session->async = mail_async_event_new();
-	session->junk_plugins = NULL;
-}
+GType mail_session_get_type (void);
+
+G_DEFINE_TYPE (MailSession, mail_session, CAMEL_TYPE_SESSION)
 
 static void
-finalise (MailSession *session)
+mail_session_finalize (GObject *object)
 {
+	MailSession *session = (MailSession *) object;
+
 	if (session_check_junk_notify_id != -1)
 		gconf_client_notify_remove (mail_config_get_gconf_client (), session_check_junk_notify_id);
 
@@ -119,44 +114,37 @@ finalise (MailSession *session)
 
 	g_free (mail_data_dir);
 	g_free (mail_config_dir);
+
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (mail_session_parent_class)->finalize (object);
 }
 
 static void
-class_init (MailSessionClass *mail_session_class)
-{
-	CamelSessionClass *camel_session_class = CAMEL_SESSION_CLASS (mail_session_class);
-
-	/* virtual method override */
-	camel_session_class->get_password = get_password;
-	camel_session_class->forget_password = forget_password;
-	camel_session_class->alert_user = alert_user;
-	camel_session_class->get_filter_driver = get_filter_driver;
-	camel_session_class->lookup_addressbook = lookup_addressbook;
-	camel_session_class->thread_msg_new = ms_thread_msg_new;
-	camel_session_class->thread_msg_free = ms_thread_msg_free;
-	camel_session_class->thread_status = ms_thread_status;
-	camel_session_class->forward_to = ms_forward_to;
-}
-
-static CamelType
-mail_session_get_type (void)
-{
-	static CamelType mail_session_type = CAMEL_INVALID_TYPE;
-
-	if (mail_session_type == CAMEL_INVALID_TYPE) {
-		ms_parent_class = (CamelSessionClass *)camel_session_get_type();
-		mail_session_type = camel_type_register (
-			camel_session_get_type (),
-			"MailSession",
-			sizeof (MailSession),
-			sizeof (MailSessionClass),
-			(CamelObjectClassInitFunc) class_init,
-			NULL,
-			(CamelObjectInitFunc) init,
-			(CamelObjectFinalizeFunc) finalise);
-	}
+mail_session_class_init (MailSessionClass *class)
+{
+	GObjectClass *object_class;
+	CamelSessionClass *session_class;
 
-	return mail_session_type;
+	object_class = G_OBJECT_CLASS (class);
+	object_class->finalize = mail_session_finalize;
+
+	session_class = CAMEL_SESSION_CLASS (class);
+	session_class->get_password = get_password;
+	session_class->forget_password = forget_password;
+	session_class->alert_user = alert_user;
+	session_class->get_filter_driver = get_filter_driver;
+	session_class->lookup_addressbook = lookup_addressbook;
+	session_class->thread_msg_new = ms_thread_msg_new;
+	session_class->thread_msg_free = ms_thread_msg_free;
+	session_class->thread_status = ms_thread_status;
+	session_class->forward_to = ms_forward_to;
+}
+
+static void
+mail_session_init (MailSession *session)
+{
+	session->async = mail_async_event_new();
+	session->junk_plugins = NULL;
 }
 
 static gchar *
@@ -271,13 +259,19 @@ get_password (CamelSession *session, CamelService *service, const gchar *domain,
 	return ret;
 }
 
-static void
-forget_password (CamelSession *session, CamelService *service, const gchar *domain, const gchar *item, CamelException *ex)
+static gboolean
+forget_password (CamelSession *session,
+                 CamelService *service,
+                 const gchar *domain,
+                 const gchar *item,
+                 CamelException *ex)
 {
 	gchar *key = make_key (service, item);
 
 	e_passwords_forget_password (domain?domain:"Mail", key);
 	g_free (key);
+
+	return TRUE;
 }
 
 /* ********************************************************************** */
@@ -421,7 +415,7 @@ lookup_addressbook(CamelSession *session, const gchar *name)
 	addr = camel_internet_address_new ();
 	camel_address_decode ((CamelAddress *)addr, name);
 	ret = em_utils_in_addressbook (addr, mail_config_get_lookup_book_local_only ());
-	camel_object_unref (addr);
+	g_object_unref (addr);
 
 	return ret;
 }
@@ -478,7 +472,7 @@ main_play_sound (CamelFilterDriver *driver, gchar *filename, gpointer user_data)
 		gdk_beep ();
 
 	g_free (filename);
-	camel_object_unref (session);
+	g_object_unref (session);
 }
 
 static void
@@ -486,7 +480,7 @@ session_play_sound (CamelFilterDriver *driver, const gchar *filename, gpointer u
 {
 	MailSession *ms = (MailSession *) session;
 
-	camel_object_ref (session);
+	g_object_ref (session);
 
 	mail_async_event_emit (ms->async, MAIL_ASYNC_GUI, (MailAsyncFunc) main_play_sound,
 			       driver, g_strdup (filename), user_data);
@@ -496,7 +490,7 @@ static void
 main_system_beep (CamelFilterDriver *driver, gpointer user_data)
 {
 	gdk_beep ();
-	camel_object_unref (session);
+	g_object_unref (session);
 }
 
 static void
@@ -504,7 +498,7 @@ session_system_beep (CamelFilterDriver *driver, gpointer user_data)
 {
 	MailSession *ms = (MailSession *) session;
 
-	camel_object_ref (session);
+	g_object_ref (session);
 
 	mail_async_event_emit (ms->async, MAIL_ASYNC_GUI, (MailAsyncFunc) main_system_beep,
 			       driver, user_data, NULL);
@@ -555,7 +549,7 @@ main_get_filter_driver (CamelSession *session, const gchar *type, CamelException
 	camel_filter_driver_set_system_beep_func (driver, session_system_beep, NULL);
 
 	if ((!strcmp (type, E_FILTER_SOURCE_INCOMING) || !strcmp (type, E_FILTER_SOURCE_JUNKTEST))
-	    && camel_session_check_junk (session)) {
+	    && camel_session_get_check_junk (session)) {
 		/* implicit junk check as 1st rule */
 		camel_filter_driver_add_rule (driver, "Junk check", "(junk-test)", "(begin (set-system-flag \"junk\"))");
 	}
@@ -606,7 +600,11 @@ static MailMsgInfo ms_thread_info_dummy = { sizeof (MailMsg) };
 
 static gpointer ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, guint size)
 {
-	CamelSessionThreadMsg *msg = ms_parent_class->thread_msg_new(session, ops, size);
+	CamelSessionThreadMsg *msg;
+	CamelSessionClass *session_class;
+
+	session_class = CAMEL_SESSION_CLASS (mail_session_parent_class);
+	msg = session_class->thread_msg_new (session, ops, size);
 
 	/* We create a dummy mail_msg, and then copy its cancellation port over to ours, so
 	   we get cancellation and progress in common with hte existing mail code, for free */
@@ -622,13 +620,19 @@ static gpointer ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *
 	return msg;
 }
 
-static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m)
+static void
+ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m)
 {
+	CamelSessionClass *session_class;
+
+	session_class = CAMEL_SESSION_CLASS (mail_session_parent_class);
+
 	mail_msg_unref(m->data);
-	ms_parent_class->thread_msg_free(session, m);
+	session_class->thread_msg_free(session, m);
 }
 
-static void ms_thread_status(CamelSession *session, CamelSessionThreadMsg *msg, const gchar *text, gint pc)
+static void
+ms_thread_status(CamelSession *session, CamelSessionThreadMsg *msg, const gchar *text, gint pc)
 {
 	/* This should never be called since we bypass it in alloc! */
 	printf("Thread status '%s' %d%%\n", text, pc);
@@ -677,7 +681,7 @@ ms_forward_to (CamelSession *session, CamelFolder *folder, CamelMimeMessage *mes
 	camel_data_wrapper_write_to_stream ((CamelDataWrapper *)message, mem);
 	camel_seekable_stream_seek (CAMEL_SEEKABLE_STREAM (mem), 0, CAMEL_STREAM_SET);
 	camel_data_wrapper_construct_from_stream ((CamelDataWrapper *)forward, mem);
-	camel_object_unref (mem);
+	g_object_unref (mem);
 
 	/* clear previous recipients */
 	camel_mime_message_set_recipients (forward, CAMEL_RECIPIENT_TYPE_TO, NULL);
@@ -702,13 +706,13 @@ ms_forward_to (CamelSession *session, CamelFolder *folder, CamelMimeMessage *mes
 	addr = camel_internet_address_new ();
 	camel_internet_address_add (addr, account->id->name, account->id->address);
 	camel_mime_message_set_from (forward, addr);
-	camel_object_unref (addr);
+	g_object_unref (addr);
 
 	/* to */
 	addr = camel_internet_address_new ();
 	camel_address_decode (CAMEL_ADDRESS (addr), address);
 	camel_mime_message_set_recipients (forward, CAMEL_RECIPIENT_TYPE_TO, addr);
-	camel_object_unref (addr);
+	g_object_unref (addr);
 
 	/* subject */
 	subject = mail_tool_generate_forward_subject (message);
@@ -794,7 +798,7 @@ mail_session_check_junk_notify (GConfClient *gconf, guint id, GConfEntry *entry,
 }
 
 void
-mail_session_init (void)
+mail_session_start (void)
 {
 	GConfClient *gconf;
 
@@ -803,7 +807,7 @@ mail_session_init (void)
 
 	camel_provider_init();
 
-	session = CAMEL_SESSION (camel_object_new (MAIL_SESSION_TYPE));
+	session = g_object_new (MAIL_TYPE_SESSION, NULL);
 	e_account_writable(NULL, E_ACCOUNT_SOURCE_SAVE_PASSWD); /* Init the EAccount Setup */
 
 	camel_session_construct (session, mail_session_get_data_dir ());
diff --git a/mail/mail-session.h b/mail/mail-session.h
index ff3ee490a1..4984a5822c 100644
--- a/mail/mail-session.h
+++ b/mail/mail-session.h
@@ -24,11 +24,11 @@
 #define MAIL_SESSION_H
 
 #include <glib.h>
-#include <camel/camel-session.h>
+#include <camel/camel.h>
 
 G_BEGIN_DECLS
 
-void mail_session_init (void);
+void mail_session_start (void);
 void mail_session_shutdown (void);
 gchar *mail_session_request_dialog (const gchar *prompt, gboolean secret,
 				   const gchar *key, gboolean async);
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index f006b1b963..e9470c9a63 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -36,10 +36,6 @@
 
 #include <glib/gi18n.h>
 
-#include <camel/camel-store.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-movemail.h>
-
 #include "em-utils.h"
 #include "mail-folder-cache.h"
 #include "mail-session.h"
@@ -58,7 +54,7 @@ mail_tool_get_inbox (const gchar *url, CamelException *ex)
 		return NULL;
 
 	folder = camel_store_get_inbox (store, ex);
-	camel_object_unref (store);
+	g_object_unref (store);
 
 	return folder;
 }
@@ -96,7 +92,7 @@ mail_tool_get_trash (const gchar *url, gint connect, CamelException *ex)
 	else
 		trash = NULL;
 
-	camel_object_unref (store);
+	g_object_unref (store);
 
 	return trash;
 }
@@ -270,8 +266,8 @@ mail_tool_make_message_attachment (CamelMimeMessage *message)
 	part = camel_mime_part_new ();
 	camel_mime_part_set_disposition (part, "inline");
 	camel_mime_part_set_description (part, desc);
-	camel_medium_set_content_object (CAMEL_MEDIUM (part),
-					 CAMEL_DATA_WRAPPER (message));
+	camel_medium_set_content (
+		CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER (message));
 	camel_mime_part_set_content_type (part, "message/rfc822");
 	g_free (desc);
 
@@ -332,7 +328,7 @@ mail_tool_uri_to_folder (const gchar *uri, guint32 flags, CamelException *ex)
 				folder = camel_store_get_junk (store, ex);
 		} else
 			folder = camel_store_get_folder (store, name, flags, ex);
-		camel_object_unref (store);
+		g_object_unref (store);
 	}
 
 	if (folder)
@@ -389,18 +385,23 @@ mail_tools_x_evolution_message_parse (gchar *in, guint inlen, GPtrArray **uids)
 gchar *
 mail_tools_folder_to_url (CamelFolder *folder)
 {
+	CamelStore *parent_store;
+	const gchar *full_name;
 	CamelURL *url;
 	gchar *out;
 
 	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
 
-	url = camel_url_copy(((CamelService *)folder->parent_store)->url);
-	if (((CamelService *)folder->parent_store)->provider->url_flags  & CAMEL_URL_FRAGMENT_IS_PATH) {
-		camel_url_set_fragment(url, folder->full_name);
+	full_name = camel_folder_get_full_name (folder);
+	parent_store = camel_folder_get_parent_store (folder);
+
+	url = camel_url_copy(((CamelService *)parent_store)->url);
+	if (((CamelService *)parent_store)->provider->url_flags  & CAMEL_URL_FRAGMENT_IS_PATH) {
+		camel_url_set_fragment(url, full_name);
 	} else {
-		gchar *name = g_alloca(strlen(folder->full_name)+2);
+		gchar *name = g_alloca(strlen(full_name)+2);
 
-		sprintf(name, "/%s", folder->full_name);
+		sprintf(name, "/%s", full_name);
 		camel_url_set_path(url, name);
 	}
 
diff --git a/mail/mail-tools.h b/mail/mail-tools.h
index ceb3ce8fb0..544c3601b6 100644
--- a/mail/mail-tools.h
+++ b/mail/mail-tools.h
@@ -24,8 +24,7 @@
 #define MAIL_TOOLS_H
 
 #include <glib.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-message.h>
+#include <camel/camel.h>
 
 /* Get the "inbox" for a url (uses global session) */
 CamelFolder *mail_tool_get_inbox (const gchar *url, CamelException *ex);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 8999a1dd15..3e9199aebe 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -27,9 +27,6 @@
 
 #include <glib/gi18n.h>
 
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-vtrash-folder.h>
 #include <libedataserver/e-account-list.h>
 
 #include "e-util/e-alert-dialog.h"
@@ -66,7 +63,7 @@ static GList *source_folders_local;	/* list of source folder uri's - local ones
 static GHashTable *vfolder_hash;
 /* This is a slightly hacky solution to shutting down, we poll this variable in various
    loops, and just quit processing if it is set. */
-static volatile gint shutdown;		/* are we shutting down? */
+static volatile gint vfolder_shutdown;	/* are we shutting down? */
 
 static void rule_changed(EFilterRule *rule, CamelFolder *folder);
 
@@ -84,7 +81,9 @@ struct _setup_msg {
 static gchar *
 vfolder_setup_desc (struct _setup_msg *m)
 {
-	return g_strdup_printf(_("Setting up Search Folder: %s"), m->folder->full_name);
+	return g_strdup_printf (
+		_("Setting up Search Folder: %s"),
+		camel_folder_get_full_name (m->folder));
 }
 
 static void
@@ -93,12 +92,10 @@ vfolder_setup_exec (struct _setup_msg *m)
 	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 && !shutdown) {
+	while (l && !vfolder_shutdown) {
 		d(printf(" Adding uri: %s\n", (gchar *)l->data));
 
 		folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex);
@@ -112,19 +109,18 @@ vfolder_setup_exec (struct _setup_msg *m)
 	}
 
 	l = m->sources_folder;
-	while (l && !shutdown) {
-		d(printf(" Adding folder: %s\n", ((CamelFolder *)l->data)->full_name));
-		camel_object_ref(l->data);
+	while (l && !vfolder_shutdown) {
+		g_object_ref (l->data);
 		list = g_list_append(list, l->data);
 		l = l->next;
 	}
 
-	if (!shutdown)
+	if (!vfolder_shutdown)
 		camel_vee_folder_set_folders((CamelVeeFolder *)m->folder, list);
 
 	l = list;
 	while (l) {
-		camel_object_unref(l->data);
+		g_object_unref (l->data);
 		l = l->next;
 	}
 	g_list_free(list);
@@ -140,7 +136,7 @@ vfolder_setup_free (struct _setup_msg *m)
 {
 	GList *l;
 
-	camel_object_unref(m->folder);
+	g_object_unref (m->folder);
 	g_free(m->query);
 
 	l = m->sources_uri;
@@ -152,7 +148,7 @@ vfolder_setup_free (struct _setup_msg *m)
 
 	l = m->sources_folder;
 	while (l) {
-		camel_object_unref(l->data);
+		g_object_unref (l->data);
 		l = l->next;
 	}
 	g_list_free(m->sources_folder);
@@ -175,7 +171,7 @@ vfolder_setup(CamelFolder *folder, const gchar *query, GList *sources_uri, GList
 
 	m = mail_msg_new(&vfolder_setup_info);
 	m->folder = folder;
-	camel_object_ref(folder);
+	g_object_ref (folder);
 	m->query = g_strdup(query);
 	m->sources_uri = sources_uri;
 	m->sources_folder = sources_folder;
@@ -247,7 +243,7 @@ vfolder_adduri_exec (struct _adduri_msg *m)
 	GList *l;
 	CamelFolder *folder = NULL;
 
-	if (shutdown)
+	if (vfolder_shutdown)
 		return;
 
 	d(printf("%s uri to vfolder: %s\n", m->remove?"Removing":"Adding", m->uri));
@@ -266,14 +262,14 @@ vfolder_adduri_exec (struct _adduri_msg *m)
 
 	if (folder != NULL) {
 		l = m->folders;
-		while (l && !shutdown) {
+		while (l && !vfolder_shutdown) {
 			if (m->remove)
 				camel_vee_folder_remove_folder((CamelVeeFolder *)l->data, folder);
 			else
 				camel_vee_folder_add_folder((CamelVeeFolder *)l->data, folder);
 			l = l->next;
 		}
-		camel_object_unref(folder);
+		g_object_unref (folder);
 	}
 }
 
@@ -285,7 +281,7 @@ vfolder_adduri_done(struct _adduri_msg *m)
 static void
 vfolder_adduri_free (struct _adduri_msg *m)
 {
-	g_list_foreach(m->folders, (GFunc)camel_object_unref, NULL);
+	g_list_foreach(m->folders, (GFunc)g_object_unref, NULL);
 	g_list_free(m->folders);
 	g_free(m->uri);
 }
@@ -526,7 +522,7 @@ mail_vfolder_add_uri(CamelStore *store, const gchar *curi, gint remove)
 				g_warning ("vf is NULL for %s\n", rule->name);
 				continue;
 			}
-			camel_object_ref(vf);
+			g_object_ref (vf);
 			folders = g_list_prepend(folders, vf);
 		}
 	}
@@ -594,6 +590,7 @@ mail_vfolder_delete_uri(CamelStore *store, const gchar *curi)
 	const gchar *source;
 	CamelVeeFolder *vf;
 	GString *changed;
+	guint changed_count;
 	gchar *uri;
 	GList *link;
 
@@ -606,6 +603,7 @@ mail_vfolder_delete_uri(CamelStore *store, const gchar *curi)
 
 	g_return_if_fail (mail_in_main_thread());
 
+	changed_count = 0;
 	changed = g_string_new ("");
 
 	G_LOCK (vfolder);
@@ -638,7 +636,16 @@ mail_vfolder_delete_uri(CamelStore *store, const gchar *curi)
 								      0, NULL, rule_changed, vf);
 				em_vfolder_rule_remove_source ((EMVFolderRule *)rule, source);
 				g_signal_connect (rule, "changed", G_CALLBACK(rule_changed), vf);
-				g_string_append_printf (changed, "    %s\n", rule->name);
+				if (changed_count == 0) {
+					g_string_append (changed, rule->name);
+				} else {
+					if (changed_count == 1) {
+						g_string_prepend (changed, "    ");
+						g_string_append (changed, "\n");
+					}
+					g_string_append_printf (changed, "    %s\n", rule->name);
+				}
+				changed_count++;
 				source = NULL;
 			}
 			g_free(csource);
@@ -658,13 +665,22 @@ done:
 
 	G_UNLOCK (vfolder);
 
-	if (changed->str[0]) {
+	if (changed_count > 0) {
 		GtkWidget *dialog;
 		const gchar *data_dir;
-		gchar *user;
-
-		dialog = e_alert_dialog_new_for_args (e_shell_get_active_window (NULL), "mail:vfolder-updated", changed->str, uri, NULL);
+		gchar *user, *info;
+
+		info = g_strdup_printf (ngettext (
+			/* Translators: The first %s is name of the affected search folder(s),
+			   the second %s is uri of the removed folder. For more than one search
+			   folder is each of them on a separate line, with four spaces in front
+			   of its name, without quotes. */
+			"The Search Folder \"%s\" has been updated, because it used just removed folder\n\"%s\".",
+			"The following Search Folders\n%s have been updated, because they used just removed folder\n\"%s\".",
+			changed_count), changed->str, uri);
+		dialog = e_alert_dialog_new_for_args (e_shell_get_active_window (NULL), "mail:vfolder-updated", info, NULL);
 		em_utils_show_info_silent (dialog);
+		g_free (info);
 
 		data_dir = mail_session_get_data_dir ();
 		user = g_build_filename (data_dir, "vfolders.xml", NULL);
@@ -790,9 +806,12 @@ rule_changed(EFilterRule *rule, CamelFolder *folder)
 {
 	GList *sources_uri = NULL, *sources_folder = NULL;
 	GString *query;
+	const gchar *full_name;
+
+	full_name = camel_folder_get_full_name (folder);
 
 	/* if the folder has changed name, then add it, then remove the old manually */
-	if (strcmp(folder->full_name, rule->name) != 0) {
+	if (strcmp (full_name, rule->name) != 0) {
 		gchar *oldname;
 
 		gpointer key;
@@ -800,18 +819,17 @@ rule_changed(EFilterRule *rule, CamelFolder *folder)
 
 		G_LOCK (vfolder);
 		d(printf("Changing folder name in hash table to '%s'\n", rule->name));
-		if (g_hash_table_lookup_extended (vfolder_hash, folder->full_name, &key, &oldfolder)) {
+		if (g_hash_table_lookup_extended (vfolder_hash, full_name, &key, &oldfolder)) {
 			g_hash_table_remove (vfolder_hash, key);
 			g_free (key);
 			g_hash_table_insert (vfolder_hash, g_strdup(rule->name), folder);
 			G_UNLOCK (vfolder);
 		} else {
 			G_UNLOCK (vfolder);
-			g_warning("couldn't find a vfolder rule in our table? %s", folder->full_name);
+			g_warning("couldn't find a vfolder rule in our table? %s", full_name);
 		}
 
-		/* TODO: make the folder->full_name var thread accessible */
-		oldname = g_strdup(folder->full_name);
+		oldname = g_strdup (full_name);
 		camel_store_rename_folder(vfolder_store, oldname, rule->name, NULL);
 		g_free(oldname);
 	}
@@ -873,24 +891,13 @@ static void context_rule_removed(ERuleContext *ctx, EFilterRule *rule)
 	camel_store_delete_folder(vfolder_store, rule->name, NULL);
 	/* this must be unref'd after its deleted */
 	if (folder)
-		camel_object_unref ((CamelFolder *) folder);
-}
-
-static void
-store_folder_created(CamelObject *o, gpointer event_data, gpointer data)
-{
-	CamelStore *store = (CamelStore *)o;
-	CamelFolderInfo *info = event_data;
-
-	store = store;
-	info = info;
+		g_object_unref ((CamelFolder *) folder);
 }
 
 static void
-store_folder_deleted(CamelObject *o, gpointer event_data, gpointer data)
+store_folder_deleted_cb (CamelStore *store,
+                         CamelFolderInfo *info)
 {
-	CamelStore *store = (CamelStore *)o;
-	CamelFolderInfo *info = event_data;
 	EFilterRule *rule;
 	gchar *user;
 
@@ -925,9 +932,10 @@ store_folder_deleted(CamelObject *o, gpointer event_data, gpointer data)
 }
 
 static void
-store_folder_renamed(CamelObject *o, gpointer event_data, gpointer data)
+store_folder_renamed_cb (CamelStore *store,
+                         const gchar *old_name,
+                         CamelFolderInfo *info)
 {
-	CamelRenameInfo *info = event_data;
 	EFilterRule *rule;
 	gchar *user;
 
@@ -935,19 +943,19 @@ store_folder_renamed(CamelObject *o, gpointer event_data, gpointer data)
 
 	/* This should be more-or-less thread-safe */
 
-	d(printf("Folder renamed to '%s' from '%s'\n", info->new->full_name, info->old_base));
+	d(printf("Folder renamed to '%s' from '%s'\n", info->full_name, old_name));
 
 	/* Folder is already renamed? */
 	G_LOCK (vfolder);
-	d(printf("Changing folder name in hash table to '%s'\n", info->new->full_name));
-	if (g_hash_table_lookup_extended (vfolder_hash, info->old_base, &key, &folder)) {
+	d(printf("Changing folder name in hash table to '%s'\n", info->full_name));
+	if (g_hash_table_lookup_extended (vfolder_hash, old_name, &key, &folder)) {
 		const gchar *data_dir;
 
 		g_hash_table_remove (vfolder_hash, key);
 		g_free (key);
-		g_hash_table_insert (vfolder_hash, g_strdup(info->new->full_name), folder);
+		g_hash_table_insert (vfolder_hash, g_strdup(info->full_name), folder);
 
-		rule = e_rule_context_find_rule((ERuleContext *)context, info->old_base, NULL);
+		rule = e_rule_context_find_rule((ERuleContext *)context, old_name, NULL);
 		if (!rule) {
 			G_UNLOCK (vfolder);
 			g_warning ("Rule shouldn't be NULL\n");
@@ -956,7 +964,7 @@ store_folder_renamed(CamelObject *o, gpointer event_data, gpointer data)
 
 		g_signal_handlers_disconnect_matched(rule, G_SIGNAL_MATCH_FUNC|G_SIGNAL_MATCH_DATA, 0,
 						     0, NULL, rule_changed, folder);
-		e_filter_rule_set_name(rule, info->new->full_name);
+		e_filter_rule_set_name(rule, info->full_name);
 		g_signal_connect(rule, "changed", G_CALLBACK(rule_changed), folder);
 
 		data_dir = mail_session_get_data_dir ();
@@ -967,7 +975,7 @@ store_folder_renamed(CamelObject *o, gpointer event_data, gpointer data)
 		G_UNLOCK (vfolder);
 	} else {
 		G_UNLOCK (vfolder);
-		g_warning("couldn't find a vfolder rule in our table? %s", info->new->full_name);
+		g_warning("couldn't find a vfolder rule in our table? %s", info->full_name);
 	}
 }
 
@@ -1006,6 +1014,7 @@ vfolder_load_storage(void)
 	EFilterRule *rule;
 	gchar *xmlfile;
 	GConfClient *gconf;
+	CamelException ex;
 
 	G_LOCK (vfolder_hash);
 
@@ -1019,21 +1028,26 @@ vfolder_load_storage(void)
 
 	G_UNLOCK (vfolder_hash);
 
+	camel_exception_init (&ex);
+
 	/* first, create the vfolder store, and set it up */
 	data_dir = mail_session_get_data_dir ();
 	storeuri = g_strdup_printf("vfolder:%s/vfolder", data_dir);
-	vfolder_store = camel_session_get_store(session, storeuri, NULL);
+	vfolder_store = camel_session_get_store(session, storeuri, &ex);
 	if (vfolder_store == NULL) {
 		g_warning("Cannot open vfolder store - no vfolders available");
 		return;
 	}
 
-	camel_object_hook_event(vfolder_store, "folder_created",
-				(CamelObjectEventHookFunc)store_folder_created, NULL);
-	camel_object_hook_event(vfolder_store, "folder_deleted",
-				(CamelObjectEventHookFunc)store_folder_deleted, NULL);
-	camel_object_hook_event(vfolder_store, "folder_renamed",
-				(CamelObjectEventHookFunc)store_folder_renamed, NULL);
+	camel_exception_clear (&ex);
+
+	g_signal_connect (
+		vfolder_store, "folder-deleted",
+		G_CALLBACK (store_folder_deleted_cb), NULL);
+
+	g_signal_connect (
+		vfolder_store, "folder-renamed",
+		G_CALLBACK (store_folder_renamed_cb), NULL);
 
 	d(printf("got store '%s' = %p\n", storeuri, vfolder_store));
 
@@ -1158,6 +1172,7 @@ vfolder_edit_rule(const gchar *uri)
 {
 	GtkWidget *w;
 	GtkDialog *gd;
+	GtkWidget *container;
 	EFilterRule *rule, *newrule;
 	CamelURL *url;
 
@@ -1169,19 +1184,21 @@ vfolder_edit_rule(const gchar *uri)
 
 		w = e_filter_rule_get_widget((EFilterRule *)newrule, (ERuleContext *)context);
 
-		gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("Edit Search Folder"), NULL,
-							      GTK_DIALOG_DESTROY_WITH_PARENT,
-							      GTK_STOCK_CANCEL,
-							      GTK_RESPONSE_CANCEL,
-							      GTK_STOCK_OK,
-							      GTK_RESPONSE_OK,
-							      NULL);
+		gd = (GtkDialog *)gtk_dialog_new_with_buttons(
+			_("Edit Search Folder"), NULL,
+			GTK_DIALOG_DESTROY_WITH_PARENT,
+			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+			GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+
 		gtk_container_set_border_width (GTK_CONTAINER (gd), 6);
-		gtk_box_set_spacing ((GtkBox *) gd->vbox, 6);
+
+		container = gtk_dialog_get_content_area (gd);
+		gtk_box_set_spacing (GTK_BOX (container), 6);
+
 		gtk_dialog_set_default_response(gd, GTK_RESPONSE_OK);
 		g_object_set(gd, "allow_shrink", FALSE, "allow_grow", TRUE, NULL);
 		gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500);
-		gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
+		gtk_box_pack_start (GTK_BOX (container), w, TRUE, TRUE, 0);
 		gtk_widget_show((GtkWidget *)gd);
 		g_object_set_data_full(G_OBJECT(gd), "rule", newrule, (GDestroyNotify)g_object_unref);
 		g_object_set_data_full(G_OBJECT(gd), "orig", rule, (GDestroyNotify)g_object_unref);
@@ -1265,26 +1282,29 @@ vfolder_gui_add_rule(EMVFolderRule *rule)
 {
 	GtkWidget *w;
 	GtkDialog *gd;
+	GtkWidget *container;
 
 	/* this should be done before we call this function */
 	vfolder_load_storage ();
 
 	w = e_filter_rule_get_widget((EFilterRule *)rule, (ERuleContext *)context);
 
-	gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("New Search Folder"),
-						      NULL,
-						      GTK_DIALOG_DESTROY_WITH_PARENT,
-						      GTK_STOCK_CANCEL,
-						      GTK_RESPONSE_CANCEL,
-						      GTK_STOCK_OK,
-						      GTK_RESPONSE_OK,
-						      NULL);
+	gd = (GtkDialog *)gtk_dialog_new_with_buttons (
+		_("New Search Folder"),
+		NULL,
+		GTK_DIALOG_DESTROY_WITH_PARENT,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+
 	gtk_dialog_set_default_response(gd, GTK_RESPONSE_OK);
 	gtk_container_set_border_width (GTK_CONTAINER (gd), 6);
-	gtk_box_set_spacing ((GtkBox *) gd->vbox, 6);
+
+	container = gtk_dialog_get_content_area (gd);
+	gtk_box_set_spacing (GTK_BOX (container), 6);
+
 	g_object_set(gd, "allow_shrink", FALSE, "allow_grow", TRUE, NULL);
 	gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500);
-	gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX (container), w, TRUE, TRUE, 0);
 	gtk_widget_show((GtkWidget *)gd);
 	g_object_set_data_full(G_OBJECT(gd), "rule", rule, (GDestroyNotify)g_object_unref);
 	g_signal_connect(rule, "changed", G_CALLBACK (new_rule_changed_cb), gd);
@@ -1327,7 +1347,7 @@ vfolder_foreach_cb (gpointer key, gpointer data, gpointer user_data)
 	CamelFolder *folder = CAMEL_FOLDER (data);
 
 	if (folder)
-		camel_object_unref(folder);
+		g_object_unref (folder);
 
 	g_free (key);
 }
@@ -1335,7 +1355,7 @@ vfolder_foreach_cb (gpointer key, gpointer data, gpointer user_data)
 void
 mail_vfolder_shutdown (void)
 {
-	shutdown = 1;
+	vfolder_shutdown = 1;
 
 	if (vfolder_hash) {
 		g_hash_table_foreach (vfolder_hash, vfolder_foreach_cb, NULL);
@@ -1344,7 +1364,7 @@ mail_vfolder_shutdown (void)
 	}
 
 	if (vfolder_store) {
-		camel_object_unref (vfolder_store);
+		g_object_unref (vfolder_store);
 		vfolder_store = NULL;
 	}
 
diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h
index a70cdd8757..84b6a41151 100644
--- a/mail/mail-vfolder.h
+++ b/mail/mail-vfolder.h
@@ -22,8 +22,7 @@
 #ifndef _MAIL_VFOLDER_H
 #define _MAIL_VFOLDER_H
 
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
+#include <camel/camel.h>
 
 #include <filter/e-filter-part.h>
 #include <filter/e-filter-rule.h>
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index ef1b5dac94..e2ffd243aa 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -85,7 +85,7 @@ Many email systems add an Apparently-To header to messages that only have BCC re
   </error>
 
   <error id="ask-open-many" type="warning" default="GTK_RESPONSE_CANCEL">
-    <_primary>Are you sure you want to open {0} messages at once?</_primary>
+    <primary>{0}</primary>
     <_secondary xml:space="preserve">Opening too many messages at once may take a long time.</_secondary>
     <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Open Messages" response="GTK_RESPONSE_YES"/>
@@ -99,6 +99,9 @@ Many email systems add an Apparently-To header to messages that only have BCC re
   </error>
 
   <error id="async-error" type="error">
+    <!-- Translators: the {0} is replaced with an operation name, which failed.
+         It can be basically anything run asynchronously, like "Fetching Mail",
+	 "Sending message" and others, mostly from mail-ops.c file. -->
     <_primary>Error while {0}.</_primary>
     <secondary>{1}</secondary>
   </error>
@@ -162,7 +165,7 @@ Many email systems add an Apparently-To header to messages that only have BCC re
 
   <error id="no-create-tmp-path" type="error">
     <_primary>Cannot create temporary save directory.</_primary>
-    <_secondary xml:space="preserve">Because "{1}".</_secondary>
+    <secondary xml:space="preserve">{1}.</secondary>
   </error>
 
   <error id="no-write-path-exists" type="error">
@@ -177,7 +180,7 @@ Many email systems add an Apparently-To header to messages that only have BCC re
 
   <error id="no-delete-folder" type="error">
     <_primary>Cannot delete folder "{0}".</_primary>
-    <_secondary xml:space="preserve">Because "{1}".</_secondary>
+    <secondary xml:space="preserve">{1}.</secondary>
   </error>
 
   <error id="no-delete-special-folder" type="error">
@@ -192,7 +195,7 @@ Many email systems add an Apparently-To header to messages that only have BCC re
 
   <error id="ask-delete-folder" type="question" default="GTK_RESPONSE_CANCEL">
     <_primary>Really delete folder "{0}" and all of its subfolders?</_primary>
-    <_secondary xml:space="preserve">If you delete the folder, all of its contents and its subfolders contents will be deleted permanently.</_secondary>
+    <_secondary xml:space="preserve">If you delete the folder, all of its contents and its subfolders' contents will be deleted permanently.</_secondary>
     <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
   </error>
@@ -231,7 +234,7 @@ Do you really want to do this?</_secondary>
 
   <error id="no-rename-folder" type="error">
     <_primary>Cannot rename "{0}" to "{1}".</_primary>
-    <_secondary xml:space="preserve">Because "{2}".</_secondary>
+    <secondary xml:space="preserve">{2}.</secondary>
   </error>
 
   <error id="no-move-folder-nostore" type="error">
@@ -256,7 +259,7 @@ Do you really want to do this?</_secondary>
 
   <error id="no-create-folder-nostore" type="error">
     <_primary>Cannot create folder "{0}".</_primary>
-    <_secondary xml:space="preserve">Cannot open source "{1}"</_secondary>
+    <_secondary xml:space="preserve">Cannot open source "{1}".</_secondary>
   </error>
 
   <error id="account-incomplete" type="error">
@@ -293,7 +296,7 @@ all proxy information will be deleted permanently.</_secondary>
 
   <error id="no-save-signature" type="error">
     <_primary>Could not save signature file.</_primary>
-    <_secondary xml:space="preserve">Because "{0}".</_secondary>
+    <secondary xml:space="preserve">{0}.</secondary>
   </error>
 
   <error id="signature-notscript" type="error">
@@ -322,20 +325,12 @@ go to the Search Folder editor to add it explicitly, if required.</_secondary>
 
   <error id="vfolder-updated" type="info">
     <_primary>Search Folders automatically updated.</_primary>
-    <_secondary xml:space="preserve">The following Search Folder(s):
-{0}
-Used the now removed folder:
-    "{1}"
-And have been updated.</_secondary>
+    <secondary xml:space="preserve">{0}</secondary>
   </error>
 
   <error id="filter-updated" type="info">
     <_primary>Mail filters automatically updated.</_primary>
-    <_secondary xml:space="preserve">The following filter rule(s):
-{0}
-Used the now removed folder:
-    "{1}"
-And have been updated.</_secondary>
+    <secondary xml:space="preserve">{0}</secondary>
   </error>
 
   <error id="no-folder" type="error">
@@ -397,6 +392,13 @@ You can choose to ignore this folder, overwrite or append its contents, or quit.
 
   <error id="ask-mark-all-read" type="question" default="GTK_RESPONSE_NO">
     <_primary>Do you want to mark all messages as read?</_primary>
+    <_secondary xml:space="preserve">This will mark all messages as read in the selected folder.</_secondary>
+    <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
+    <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
+  </error>
+
+  <error id="ask-mark-all-read-sub" type="question" default="GTK_RESPONSE_NO">
+    <_primary>Do you want to mark all messages as read?</_primary>
     <_secondary xml:space="preserve">This will mark all messages as read in the selected folder and its subfolders.</_secondary>
     <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
     <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
@@ -423,18 +425,18 @@ You can choose to ignore this folder, overwrite or append its contents, or quit.
   </error>
 
   <error id="junk-check-error" type="error">
-    <_primary>Check Junk Failed</_primary>
-    <_secondary xml:space="preserve">{0}</_secondary>
+    <_primary>"Check Junk" Failed</_primary>
+    <secondary xml:space="preserve">{0}</secondary>
   </error>
 
   <error id="junk-report-error" type="error">
-    <_primary>Report Junk Failed</_primary>
-    <_secondary xml:space="preserve">{0}</_secondary>
+    <_primary>"Report Junk" Failed</_primary>
+    <secondary xml:space="preserve">{0}</secondary>
   </error>
 
   <error id="junk-not-report-error" type="error">
-    <_primary>Report Not Junk Failed</_primary>
-    <_secondary xml:space="preserve">{0}</_secondary>
+    <_primary>"Report Not Junk" Failed</_primary>
+    <secondary xml:space="preserve">{0}</secondary>
   </error>
 </error-list>
 
diff --git a/mail/message-list.c b/mail/message-list.c
index c7361087b8..466d4c5777 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -36,17 +36,8 @@
 
 #include <gconf/gconf-client.h>
 
-#include <camel/camel-exception.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-thread.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-string-utils.h>
-
-#include <libedataserver/e-memory.h>
-
 #include "e-util/e-icon-factory.h"
+#include "e-util/e-poolv.h"
 #include "e-util/e-profile-event.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-util.h"
@@ -84,12 +75,15 @@
 #endif
 
 #ifdef G_OS_WIN32
-/* Undefine the similar macro from <pthread.h>,it doesn't check if
- * localtime() returns NULL.
- */
+#ifdef gmtime_r
+#undef gmtime_r
+#endif
+#ifdef localtime_r
 #undef localtime_r
+#endif
 
-/* The localtime() in Microsoft's C library is MT-safe */
+/* The gmtime() and localtime() in Microsoft's C library are MT-safe */
+#define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0)
 #define localtime_r(tp,tmp) (localtime(tp)?(*(tmp)=*localtime(tp),(tmp)):0)
 #endif
 
@@ -207,11 +201,6 @@ static gint on_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent
 static gchar *filter_date (time_t date);
 static gchar *filter_size (gint size);
 
-static void folder_changed (CamelObject *o, gpointer event_data, gpointer user_data);
-
-static void save_hide_state(MessageList *ml);
-static void load_hide_state(MessageList *ml);
-
 /* note: @changes is owned/freed by the caller */
 /*static void mail_do_regenerate_messagelist (MessageList *list, const gchar *search, const gchar *hideexpr, CamelFolderChangeInfo *changes);*/
 static void mail_regen_list(MessageList *ml, const gchar *search, const gchar *hideexpr, CamelFolderChangeInfo *changes);
@@ -219,6 +208,10 @@ static void mail_regen_cancel(MessageList *ml);
 
 static void clear_info(gchar *key, ETreePath *node, MessageList *ml);
 
+static void	folder_changed			(CamelFolder *folder,
+						 CamelFolderChangeInfo *info,
+						 MessageList *ml);
+
 enum {
 	MESSAGE_SELECTED,
 	MESSAGE_LIST_BUILT,
@@ -273,7 +266,7 @@ e_mail_address_new (const gchar *address)
 
 	cia = camel_internet_address_new ();
 	if (camel_address_unformat (CAMEL_ADDRESS (cia), address) == -1) {
-		camel_object_unref (cia);
+		g_object_unref (cia);
 		return NULL;
 	}
 	camel_internet_address_get (cia, 0, &name, &addr);
@@ -286,7 +279,7 @@ e_mail_address_new (const gchar *address)
 		new->wname = NULL;
 	}
 
-	camel_object_unref (cia);
+	g_object_unref (cia);
 
 	return new;
 }
@@ -509,7 +502,7 @@ clear_selection(MessageList *ml, struct _MLSelection *selection)
 		selection->uids = NULL;
 	}
 	if (selection->folder) {
-		camel_object_unref(selection->folder);
+		g_object_unref (selection->folder);
 		selection->folder = NULL;
 	}
 	g_free(selection->folder_uri);
@@ -893,7 +886,7 @@ message_list_copy(MessageList *ml, gboolean cut)
 
 		p->clipboard.uids = uids;
 		p->clipboard.folder = ml->folder;
-		camel_object_ref(p->clipboard.folder);
+		g_object_ref (p->clipboard.folder);
 		p->clipboard.folder_uri = g_strdup(ml->folder_uri);
 		gtk_selection_owner_set(p->invisible, GDK_SELECTION_CLIPBOARD, gtk_get_current_event_time());
 	} else {
@@ -1973,7 +1966,6 @@ void
 message_list_save_state (MessageList *ml)
 {
 	save_tree_state (ml);
-	save_hide_state (ml);
 }
 
 static void
@@ -1982,6 +1974,7 @@ message_list_setup_etree (MessageList *message_list, gboolean outgoing)
 	/* build the spec based on the folder, and possibly from a saved file */
 	/* otherwise, leave default */
 	if (message_list->folder) {
+		CamelStore *parent_store;
 		gchar *path;
 		gchar *name;
 		gint data = 1;
@@ -1992,7 +1985,8 @@ message_list_setup_etree (MessageList *message_list, gboolean outgoing)
 
 		g_object_set (message_list, "uniform_row_height", TRUE, NULL);
 
-		name = camel_service_get_name (CAMEL_SERVICE (message_list->folder->parent_store), TRUE);
+		parent_store = camel_folder_get_parent_store (message_list->folder);
+		name = camel_service_get_name (CAMEL_SERVICE (parent_store), TRUE);
 		d(printf ("folder name is '%s'\n", name));
 
 		path = mail_config_folder_to_cachename (message_list->folder, "et-expanded-");
@@ -2040,14 +2034,22 @@ ml_selection_clear_event(GtkWidget *widget, GdkEventSelection *event, MessageLis
 }
 
 static void
-ml_selection_received(GtkWidget *widget, GtkSelectionData *data, guint time, MessageList *ml)
+ml_selection_received (GtkWidget *widget,
+                       GtkSelectionData *selection_data,
+                       guint time,
+                       MessageList *ml)
 {
-	if (data->target != gdk_atom_intern ("x-uid-list", FALSE)) {
+	GdkAtom target;
+
+	target = gtk_selection_data_get_target (selection_data);
+
+	if (target != gdk_atom_intern ("x-uid-list", FALSE)) {
 		d(printf("Unknown selection received by message-list\n"));
 		return;
 	}
 
-	em_utils_selection_get_uidlist(data, ml->folder, FALSE, NULL);
+	em_utils_selection_get_uidlist (
+		selection_data, ml->folder, FALSE, NULL);
 }
 
 static void
@@ -2096,10 +2098,14 @@ struct _drop_msg {
 static gchar *
 ml_drop_async_desc (struct _drop_msg *m)
 {
+	const gchar *full_name;
+
+	full_name = camel_folder_get_full_name (m->folder);
+
 	if (m->move)
-		return g_strdup_printf(_("Moving messages into folder %s"), m->folder->full_name);
+		return g_strdup_printf(_("Moving messages into folder %s"), full_name);
 	else
-		return g_strdup_printf(_("Copying messages into folder %s"), m->folder->full_name);
+		return g_strdup_printf(_("Copying messages into folder %s"), full_name);
 }
 
 static void
@@ -2138,11 +2144,9 @@ ml_drop_async_done (struct _drop_msg *m)
 static void
 ml_drop_async_free (struct _drop_msg *m)
 {
-	g_object_unref(m->context);
-	camel_object_unref(m->folder);
-
-	g_free(m->selection->data);
-	g_free(m->selection);
+	g_object_unref (m->context);
+	g_object_unref (m->folder);
+	gtk_selection_data_free (m->selection);
 }
 
 static MailMsgInfo ml_drop_async_info = {
@@ -2161,30 +2165,39 @@ ml_drop_action(struct _drop_msg *m)
 }
 
 static void
-ml_tree_drag_data_received (ETree *tree, gint row, ETreePath path, gint col,
-			    GdkDragContext *context, gint x, gint y,
-			    GtkSelectionData *data, guint info,
-			    guint time, MessageList *ml)
+ml_tree_drag_data_received (ETree *tree,
+                            gint row,
+                            ETreePath path,
+                            gint col,
+                            GdkDragContext *context,
+                            gint x,
+                            gint y,
+                            GtkSelectionData *selection_data,
+                            guint info,
+                            guint time,
+                            MessageList *ml)
 {
 	struct _drop_msg *m;
 
-	/* this means we are receiving no data */
-	if (!ml->folder || data->data == NULL || data->length == -1)
+	if (ml->folder == NULL)
+		return;
+
+	if (gtk_selection_data_get_data (selection_data) == NULL)
+		return;
+
+	if (gtk_selection_data_get_length (selection_data) == -1)
 		return;
 
 	m = mail_msg_new(&ml_drop_async_info);
 	m->context = context;
 	g_object_ref(context);
 	m->folder = ml->folder;
-	camel_object_ref(m->folder);
+	g_object_ref (m->folder);
 	m->action = context->action;
 	m->info = info;
 
 	/* need to copy, goes away once we exit */
-	m->selection = g_malloc0(sizeof(*m->selection));
-	m->selection->data = g_malloc(data->length);
-	memcpy(m->selection->data, data->data, data->length);
-	m->selection->length = data->length;
+	m->selection = gtk_selection_data_copy (selection_data);
 
 	ml_drop_action(m);
 }
@@ -2306,16 +2319,9 @@ message_list_init (MessageList *message_list)
 		(GDestroyNotify) NULL,
 		(GDestroyNotify) e_poolv_destroy);
 
-	message_list->hidden = NULL;
-	message_list->hidden_pool = NULL;
-	message_list->hide_before = ML_HIDE_NONE_START;
-	message_list->hide_after = ML_HIDE_NONE_END;
-
 	message_list->search = NULL;
 	message_list->ensure_uid = NULL;
 
-	message_list->hide_lock = g_mutex_new();
-
 	message_list->uid_nodemap = g_hash_table_new (g_str_hash, g_str_equal);
 	message_list->async_event = mail_async_event_new();
 
@@ -2370,8 +2376,9 @@ message_list_destroy(GtkObject *object)
 			message_list->uid_nodemap = NULL;
 		}
 
-		camel_object_unhook_event(message_list->folder, "folder_changed", folder_changed, message_list);
-		camel_object_unref (message_list->folder);
+		g_signal_handlers_disconnect_by_func (
+			message_list->folder, folder_changed, message_list);
+		g_object_unref (message_list->folder);
 		message_list->folder = NULL;
 	}
 
@@ -2492,19 +2499,11 @@ message_list_finalize (GObject *object)
 	if (message_list->thread_tree)
 		camel_folder_thread_messages_unref(message_list->thread_tree);
 
-	if (message_list->hidden) {
-		g_hash_table_destroy(message_list->hidden);
-		e_mempool_destroy(message_list->hidden_pool);
-		message_list->hidden = NULL;
-		message_list->hidden_pool = NULL;
-	}
-
 	g_free(message_list->search);
 	g_free(message_list->ensure_uid);
 	g_free(message_list->frozen_search);
 	g_free(message_list->cursor_uid);
 
-	g_mutex_free(message_list->hide_lock);
 	g_mutex_free (message_list->regen_lock);
 
 	g_free(message_list->folder_uri);
@@ -2576,8 +2575,8 @@ message_list_class_init (MessageListClass *class)
 		PROP_SHELL_BACKEND,
 		g_param_spec_object (
 			"shell-backend",
-			_("Shell Backend"),
-			_("The mail shell backend"),
+			"Shell Backend",
+			"The mail shell backend",
 			E_TYPE_SHELL_BACKEND,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY));
@@ -3534,22 +3533,25 @@ main_folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
 }
 
 static void
-folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
+folder_changed (CamelFolder *folder,
+                CamelFolderChangeInfo *info,
+                MessageList *ml)
 {
 	CamelFolderChangeInfo *changes;
-	MessageList *ml = MESSAGE_LIST (user_data);
 
 	if (ml->priv->destroyed)
 		return;
 
-	if (event_data) {
+	if (info != NULL) {
 		changes = camel_folder_change_info_new();
-		camel_folder_change_info_cat(changes, (CamelFolderChangeInfo *)event_data);
+		camel_folder_change_info_cat (changes, info);
 	} else {
 		changes = NULL;
 	}
 
-	mail_async_event_emit(ml->async_event, MAIL_ASYNC_GUI, (MailAsyncFunc)main_folder_changed, o, changes, user_data);
+	mail_async_event_emit (
+		ml->async_event, MAIL_ASYNC_GUI, (MailAsyncFunc)
+		main_folder_changed, folder, changes, ml);
 }
 
 /**
@@ -3590,7 +3592,6 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const g
 
 	if (message_list->folder != NULL) {
 		save_tree_state (message_list);
-		save_hide_state (message_list);
 	}
 
 	e_tree_memory_freeze(E_TREE_MEMORY(etm));
@@ -3604,9 +3605,9 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const g
 	}
 
 	if (message_list->folder) {
-		camel_object_unhook_event((CamelObject *)message_list->folder, "folder_changed",
-					  folder_changed, message_list);
-		camel_object_unref (message_list->folder);
+		g_signal_handlers_disconnect_by_func (
+			message_list->folder, folder_changed, message_list);
+		g_object_unref (message_list->folder);
 		message_list->folder = NULL;
 	}
 
@@ -3630,7 +3631,7 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const g
 		gint strikeout_col = -1;
 		ECell *cell;
 
-		camel_object_ref (folder);
+		g_object_ref (folder);
 		message_list->folder = folder;
 		message_list->just_set_folder = TRUE;
 
@@ -3656,14 +3657,15 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const g
 		/* Build the etree suitable for this folder */
 		message_list_setup_etree (message_list, outgoing);
 
-		camel_object_hook_event (folder, "folder_changed", folder_changed, message_list);
+		g_signal_connect (
+			folder, "changed",
+			G_CALLBACK (folder_changed), message_list);
 
 		gconf = mail_config_get_gconf_client ();
 		hide_deleted = !gconf_client_get_bool (gconf, "/apps/evolution/mail/display/show_deleted", NULL);
 		message_list->hidedeleted = hide_deleted && !(folder->folder_flags & CAMEL_FOLDER_IS_TRASH);
 		message_list->hidejunk = folder_store_supports_vjunk_folder (message_list->folder) && !(folder->folder_flags & CAMEL_FOLDER_IS_JUNK) && !(folder->folder_flags & CAMEL_FOLDER_IS_TRASH);
 
-		load_hide_state (message_list);
 		if (message_list->frozen == 0)
 			mail_regen_list (message_list, message_list->search, NULL, NULL);
 	}
@@ -4005,229 +4007,6 @@ message_list_ensure_message (MessageList *ml, const gchar *uid)
 	ml->ensure_uid = g_strdup (uid);
 }
 
-/* returns the number of messages displayable *after* expression hiding has taken place */
-guint
-message_list_length (MessageList *ml)
-{
-	return ml->hide_unhidden;
-}
-
-struct _glibsuxcrap {
-	guint count;
-	CamelFolder *folder;
-};
-
-static void
-glib_crapback(gpointer key, gpointer data, gpointer x)
-{
-	struct _glibsuxcrap *y = x;
-	CamelMessageInfo *mi;
-
-	if (y->count)
-		return;
-
-	mi = camel_folder_get_message_info(y->folder, key);
-	if (mi) {
-		y->count++;
-		camel_folder_free_message_info(y->folder, mi);
-	}
-}
-
-/* returns 0 or 1 depending if there are hidden messages */
-guint
-message_list_hidden(MessageList *ml)
-{
-	guint hidden = 0;
-
-	MESSAGE_LIST_LOCK (ml, hide_lock);
-	if (ml->hidden && ml->folder) {
-		/* this is a hack, should probably just maintain the hidden table better */
-		struct _glibsuxcrap x = { 0, ml->folder };
-		g_hash_table_foreach(ml->hidden, glib_crapback, &x);
-		hidden = x.count;
-	}
-	MESSAGE_LIST_UNLOCK (ml, hide_lock);
-
-	return hidden;
-}
-
-/* add a new expression to hide, or set the range.
-   @expr: A new search expression - all matching messages will be hidden.  May be %NULL.
-   @lower: Use ML_HIDE_NONE_START to specify no messages hidden from the start of the list.
-   @upper: Use ML_HIDE_NONE_END to specify no message hidden from the end of the list.
-
-   For either @upper or @lower, use ML_HIDE_SAME, to keep the previously set hide range.
-   If either range is negative, then the range is taken from the end of the available list
-   of messages, once other hiding has been performed.  Use message_list_length() to find out
-   how many messages are available for hiding.
-
-   Example: hide_add(ml, NULL, -100, ML_HIDE_NONE_END) -> hide all but the last (most recent)
-   100 messages.
-*/
-void
-message_list_hide_add (MessageList *ml, const gchar *expr, guint lower, guint upper)
-{
-	MESSAGE_LIST_LOCK (ml, hide_lock);
-
-	if (lower != ML_HIDE_SAME)
-		ml->hide_before = lower;
-	if (upper != ML_HIDE_SAME)
-		ml->hide_after = upper;
-
-	MESSAGE_LIST_UNLOCK (ml, hide_lock);
-
-	mail_regen_list (ml, ml->search, expr, NULL);
-}
-
-/* hide specific uid's */
-void
-message_list_hide_uids (MessageList *ml, GPtrArray *uids)
-{
-	gint i;
-	gchar *uid;
-
-	/* first see if we need to do any work, if so, then do it all at once */
-	for (i = 0; i < uids->len; i++) {
-		if (g_hash_table_lookup (ml->uid_nodemap, uids->pdata[i])) {
-			MESSAGE_LIST_LOCK (ml, hide_lock);
-			if (ml->hidden == NULL) {
-				ml->hidden = g_hash_table_new (g_str_hash, g_str_equal);
-				ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE);
-			}
-
-			uid =  e_mempool_strdup (ml->hidden_pool, uids->pdata[i]);
-			g_hash_table_insert (ml->hidden, uid, uid);
-			for (; i < uids->len; i++) {
-				if (g_hash_table_lookup (ml->uid_nodemap, uids->pdata[i])) {
-					uid =  e_mempool_strdup (ml->hidden_pool, uids->pdata[i]);
-					g_hash_table_insert (ml->hidden, uid, uid);
-				}
-			}
-			MESSAGE_LIST_UNLOCK (ml, hide_lock);
-			/* save this here incase the user pops up another window, so they are consistent */
-			save_hide_state(ml);
-			if (ml->frozen == 0)
-				mail_regen_list (ml, ml->search, NULL, NULL);
-			break;
-		}
-	}
-}
-
-/* no longer hide any messages */
-void
-message_list_hide_clear (MessageList *ml)
-{
-	MESSAGE_LIST_LOCK (ml, hide_lock);
-	if (ml->hidden) {
-		g_hash_table_destroy (ml->hidden);
-		e_mempool_destroy (ml->hidden_pool);
-		ml->hidden = NULL;
-		ml->hidden_pool = NULL;
-	}
-	ml->hide_before = ML_HIDE_NONE_START;
-	ml->hide_after = ML_HIDE_NONE_END;
-	MESSAGE_LIST_UNLOCK (ml, hide_lock);
-
-	if (ml->thread_tree) {
-		camel_folder_thread_messages_unref(ml->thread_tree);
-		ml->thread_tree = NULL;
-	}
-
-	/* save this here incase the user pops up another window, so they are consistent */
-	save_hide_state(ml);
-	if (ml->frozen == 0)
-		mail_regen_list (ml, ml->search, NULL, NULL);
-}
-
-#define HIDE_STATE_VERSION (1)
-
-/* version 1 file is:
-   uintf	1
-   uintf	hide_before
-   uintf	hide_after
-   string*	uids
-*/
-
-static void
-load_hide_state (MessageList *ml)
-{
-	gchar *filename;
-	FILE *in;
-	gint32 version, lower, upper;
-
-	MESSAGE_LIST_LOCK(ml, hide_lock);
-	if (ml->hidden) {
-		g_hash_table_destroy (ml->hidden);
-		e_mempool_destroy (ml->hidden_pool);
-		ml->hidden = NULL;
-		ml->hidden_pool = NULL;
-	}
-	ml->hide_before = ML_HIDE_NONE_START;
-	ml->hide_after = ML_HIDE_NONE_END;
-
-	filename = mail_config_folder_to_cachename(ml->folder, "hidestate-");
-	in = g_fopen(filename, "rb");
-	if (in) {
-		camel_file_util_decode_fixed_int32 (in, &version);
-		if (version == HIDE_STATE_VERSION) {
-			ml->hidden = g_hash_table_new(g_str_hash, g_str_equal);
-			ml->hidden_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE);
-			camel_file_util_decode_fixed_int32 (in, &lower);
-			ml->hide_before = lower;
-			camel_file_util_decode_fixed_int32 (in, &upper);
-			ml->hide_after = upper;
-			while (!feof(in)) {
-				gchar *olduid, *uid;
-
-				if (camel_file_util_decode_string (in, &olduid) != -1) {
-					uid =  e_mempool_strdup(ml->hidden_pool, olduid);
-					g_free (olduid);
-					g_hash_table_insert(ml->hidden, uid, uid);
-				}
-			}
-		}
-		fclose(in);
-	}
-	g_free(filename);
-
-	MESSAGE_LIST_UNLOCK(ml, hide_lock);
-}
-
-static void
-hide_save_1 (gchar *uid, gchar *keydata, FILE *out)
-{
-	camel_file_util_encode_string (out, uid);
-}
-
-/* save the hide state.  Note that messages are hidden by uid, if the uid's change, then
-   this will become invalid, but is easy to reset in the ui */
-static void
-save_hide_state (MessageList *ml)
-{
-	gchar *filename;
-	FILE *out;
-
-	if (ml->folder == NULL)
-		return;
-
-	MESSAGE_LIST_LOCK(ml, hide_lock);
-
-	filename = mail_config_folder_to_cachename(ml->folder, "hidestate-");
-	if (ml->hidden == NULL && ml->hide_before == ML_HIDE_NONE_START && ml->hide_after == ML_HIDE_NONE_END) {
-		g_unlink(filename);
-	} else if ((out = g_fopen (filename, "wb"))) {
-		camel_file_util_encode_fixed_int32 (out, HIDE_STATE_VERSION);
-		camel_file_util_encode_fixed_int32 (out, ml->hide_before);
-		camel_file_util_encode_fixed_int32 (out, ml->hide_after);
-		if (ml->hidden)
-			g_hash_table_foreach(ml->hidden, (GHFunc)hide_save_1, out);
-		fclose(out);
-	}
-	g_free (filename);
-
-	MESSAGE_LIST_UNLOCK(ml, hide_lock);
-}
-
 struct sort_column_data {
 	ETableCol *col;
 	gboolean ascending;
@@ -4369,8 +4148,7 @@ ml_sort_uids_by_tree (MessageList *ml, GPtrArray *uids)
 		g_ptr_array_add (sort_data.sort_columns, data);
 	}
 
-	if (uids->len - camel_folder_summary_cache_size (ml->folder->summary) > 50)
-		camel_folder_summary_reload_from_db (ml->folder->summary, NULL);
+	camel_folder_summary_prepare_fetch_all (ml->folder->summary, NULL);
 
 	for (i = 0; i < uids->len; i++) {
 		gchar *uid;
@@ -4437,7 +4215,7 @@ regen_list_desc (struct _regen_list_msg *m)
 static void
 regen_list_exec (struct _regen_list_msg *m)
 {
-	GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL;
+	GPtrArray *uids, *searchuids = NULL;
 	CamelMessageInfo *info;
 	ETreePath cursor;
 	ETree *tree;
@@ -4530,122 +4308,33 @@ regen_list_exec (struct _regen_list_msg *m)
 	if (camel_exception_is_set (&m->base.ex))
 		return;
 
-	/* perform hiding */
-	if (m->hideexpr && camel_folder_has_search_capability(m->folder)) {
-		uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &m->base.ex);
-		/* well, lets not abort just because this faileld ... */
-		camel_exception_clear (&m->base.ex);
-
-		if (uidnew) {
-			MESSAGE_LIST_LOCK(m->ml, hide_lock);
-
-			if (m->ml->hidden == NULL) {
-				m->ml->hidden = g_hash_table_new (g_str_hash, g_str_equal);
-				m->ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE);
-			}
-
-			for (i = 0; i < uidnew->len; i++) {
-				if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == NULL) {
-					gchar *uid = e_mempool_strdup (m->ml->hidden_pool, uidnew->pdata[i]);
-					g_hash_table_insert (m->ml->hidden, uid, uid);
-				}
-			}
-
-			MESSAGE_LIST_UNLOCK(m->ml, hide_lock);
-
-			camel_folder_search_free (m->ml->folder, uidnew);
-		}
-	}
-
-	MESSAGE_LIST_LOCK(m->ml, hide_lock);
-
-	m->ml->hide_unhidden = uids->len;
-
-	/* what semantics do we want from hide_before, hide_after?
-	   probably <0 means measure from the end of the list */
-
-	/* perform uid hiding */
-	if (m->ml->hidden || m->ml->hide_before != ML_HIDE_NONE_START || m->ml->hide_after != ML_HIDE_NONE_END) {
-		gint start, end;
-		uidnew = g_ptr_array_new ();
-
-		/* first, hide matches */
-		if (m->ml->hidden) {
-			gint subtr = 0;
-
-			for (i = 0; i < uids->len; i++) {
-				if (g_hash_table_lookup (m->ml->hidden, uids->pdata[i]) == NULL)
-					g_ptr_array_add (uidnew, uids->pdata[i]);
-				else if (m->last_row >= 0) {
-					/* if we are going to hide message above last selected row, then we should
-					   decrease our last row number, to put cursor on a proper place. */
-					ETreePath node = g_hash_table_lookup (m->ml->uid_nodemap, (const gchar *) uids->pdata[i]);
-
-					if (node && m->last_row > e_tree_table_adapter_row_of_node (e_tree_get_table_adapter (tree), node))
-						subtr ++;
-				}
-			}
-
-			m->last_row -= subtr;
-		}
-
-		/* then calculate the subrange visible and chop it out */
-		m->ml->hide_unhidden = uidnew->len;
-
-		if (m->ml->hide_before != ML_HIDE_NONE_START || m->ml->hide_after != ML_HIDE_NONE_END) {
-			GPtrArray *uid2 = g_ptr_array_new ();
-
-			start = m->ml->hide_before;
-			if (start < 0)
-				start += m->ml->hide_unhidden;
-			end = m->ml->hide_after;
-			if (end < 0)
-				end += m->ml->hide_unhidden;
-
-			start = MAX(start, 0);
-			end = MIN(end, uidnew->len);
-			for (i = start; i < end; i++) {
-				g_ptr_array_add (uid2, uidnew->pdata[i]);
-			}
-
-			g_ptr_array_free (uidnew, TRUE);
-			uidnew = uid2;
-		}
-		showuids = uidnew;
-	} else {
-		uidnew = NULL;
-		showuids = uids;
-	}
-
-	MESSAGE_LIST_UNLOCK(m->ml, hide_lock);
-
 	e_profile_event_emit("list.threaduids", m->folder->full_name, 0);
 
-	/* camel_folder_summary_reload_from_db (m->folder->summary, NULL); */
+	/* camel_folder_summary_prepare_fetch_all (m->folder->summary, NULL); */
 	if (!camel_operation_cancel_check(m->base.cancel)) {
 		/* update/build a new tree */
 		if (m->dotree) {
-			ml_sort_uids_by_tree (m->ml, showuids);
+			ml_sort_uids_by_tree (m->ml, uids);
 
 			if (m->tree)
-				camel_folder_thread_messages_apply (m->tree, showuids);
+				camel_folder_thread_messages_apply (m->tree, uids);
 			else
-				m->tree = camel_folder_thread_messages_new (m->folder, showuids, m->thread_subject);
+				m->tree = camel_folder_thread_messages_new (m->folder, uids, m->thread_subject);
 		} else {
-			camel_folder_sort_uids (m->ml->folder, showuids);
+			CamelException ex;
+
+			camel_folder_sort_uids (m->ml->folder, uids);
 			m->summary = g_ptr_array_new ();
-			if (showuids->len > camel_folder_summary_cache_size (m->folder->summary) ) {
-				CamelException ex;
-				camel_exception_init (&ex);
-				camel_folder_summary_reload_from_db (m->folder->summary, &ex);
-				if (camel_exception_is_set (&ex)) {
-					g_warning ("Exception while reloading: %s\n", camel_exception_get_description (&ex));
-					camel_exception_clear (&ex);
-				}
 
+			camel_exception_init (&ex);
+			camel_folder_summary_prepare_fetch_all (m->folder->summary, &ex);
+			if (camel_exception_is_set (&ex)) {
+				g_warning ("Exception while reloading: %s\n", camel_exception_get_description (&ex));
+				camel_exception_clear (&ex);
 			}
-			for (i = 0; i < showuids->len; i++) {
-				info = camel_folder_get_message_info (m->folder, showuids->pdata[i]);
+
+			for (i = 0; i < uids->len; i++) {
+				info = camel_folder_get_message_info (m->folder, uids->pdata[i]);
 				if (info)
 					g_ptr_array_add(m->summary, info);
 			}
@@ -4654,9 +4343,6 @@ regen_list_exec (struct _regen_list_msg *m)
 		m->complete = TRUE;
 	}
 
-	if (uidnew)
-		g_ptr_array_free (uidnew, TRUE);
-
 	if (searchuids)
 		camel_folder_search_free (m->folder, searchuids);
 	else
@@ -4752,17 +4438,11 @@ regen_list_done (struct _regen_list_msg *m)
 		}
 	}
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_get_visible (GTK_WIDGET (m->ml))) {
-#else
-	if (GTK_WIDGET_VISIBLE (GTK_WIDGET (m->ml))) {
-#endif
-		if (message_list_length (m->ml) <= 0) {
+		if (e_tree_row_count (E_TREE (m->ml)) <= 0) {
 			/* space is used to indicate no search too */
 			if (m->ml->search && *m->ml->search && strcmp (m->ml->search, " ") != 0)
 				e_tree_set_info_message (tree, _("No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."));
-			else if (m->ml->hidden)
-				e_tree_set_info_message (tree, _("There are only hidden messages in this folder. Use View->Show Hidden Messages to show them."));
 			else
 				e_tree_set_info_message (tree, _("There are no messages in this folder."));
 		} else
@@ -4794,7 +4474,7 @@ regen_list_free (struct _regen_list_msg *m)
 	g_free (m->search);
 	g_free (m->hideexpr);
 
-	camel_object_unref (m->folder);
+	g_object_unref (m->folder);
 
 	if (m->changes)
 		camel_folder_change_info_free (m->changes);
@@ -4908,8 +4588,7 @@ mail_regen_list (MessageList *ml, const gchar *search, const gchar *hideexpr, Ca
 	m->hidedel = ml->hidedeleted;
 	m->hidejunk = ml->hidejunk;
 	m->thread_subject = gconf_client_get_bool (gconf, "/apps/evolution/mail/display/thread_subject", NULL);
-	m->folder = ml->folder;
-	camel_object_ref(m->folder);
+	m->folder = g_object_ref (ml->folder);
 	m->last_row = -1;
 	m->expand_state = NULL;
 
@@ -4921,12 +4600,8 @@ mail_regen_list (MessageList *ml, const gchar *search, const gchar *hideexpr, Ca
 		camel_folder_thread_messages_ref(m->tree);
 	}
 
-	if (message_list_length (ml) <= 0) {
-#if GTK_CHECK_VERSION(2,19,7)
+	if (e_tree_row_count (E_TREE (ml)) <= 0) {
 		if (gtk_widget_get_visible (GTK_WIDGET (ml))) {
-#else
-		if (GTK_WIDGET_VISIBLE (GTK_WIDGET (ml))) {
-#endif
 			/* there is some info why the message list is empty, let it be something useful */
 			gchar *txt = g_strconcat (_("Generating message list"), "..." , NULL);
 
diff --git a/mail/message-list.h b/mail/message-list.h
index 4b7e4da1dc..0b46e8ecd7 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -24,11 +24,9 @@
 #define _MESSAGE_LIST_H_
 
 #include <gtk/gtk.h>
-#include <camel/camel-folder-thread.h>
+#include <camel/camel.h>
 
 #include <table/e-tree.h>
-
-#include <camel/camel-folder.h>
 #include <shell/e-shell-backend.h>
 
 G_BEGIN_DECLS
@@ -79,11 +77,6 @@ enum {
 #define MESSAGE_LIST_COLUMN_IS_ACTIVE(col) (col == COL_MESSAGE_STATUS || \
 					    col == COL_FLAGGED)
 
-#define ML_HIDE_NONE_START (0)
-#define ML_HIDE_NONE_END (2147483647)
-/* dont change */
-#define ML_HIDE_SAME (2147483646)
-
 typedef struct _MessageList MessageList;
 typedef struct _MessageListClass MessageListClass;
 typedef struct _MessageListPrivate MessageListPrivate;
@@ -106,13 +99,6 @@ struct _MessageList {
 
 	GHashTable *normalised_hash;
 
-	/* UID's to hide.  Keys in the mempool */
-	/* IMPORTANT: You MUST have obtained the hide lock, to operate on this data */
-	GHashTable	 *hidden;
-	struct _EMemPool *hidden_pool;
-	gint hide_unhidden;           /* total length, before hiding */
-	gint hide_before, hide_after; /* hide ranges of messages */
-
 	/* Current search string, or %NULL */
 	gchar *search;
 
@@ -147,9 +133,6 @@ struct _MessageList {
 	/* Row-selection and seen-marking timers */
 	guint idle_id, seen_id;
 
-	/* locks */
-	GMutex *hide_lock;	/* for any 'hide' info above */
-
 	/* list of outstanding regeneration requests */
 	GList *regen;
 	GMutex *regen_lock; /* when writing to the regen, guard with this lock too */
@@ -217,16 +200,7 @@ void		message_list_invert_selection	(MessageList *message_list);
 void		message_list_copy		(MessageList *message_list,
 						 gboolean cut);
 void		message_list_paste		(MessageList *message_list);
-guint		message_list_length		(MessageList *message_list);
 guint		message_list_count		(MessageList *message_list);
-guint		message_list_hidden		(MessageList *message_list);
-void		message_list_hide_add		(MessageList *message_list,
-						 const gchar *expr,
-						 guint lower,
-						 guint upper);
-void		message_list_hide_uids		(MessageList *message_list,
-						 GPtrArray *uids);
-void		message_list_hide_clear		(MessageList *message_list);
 void		message_list_set_threaded	(MessageList *message_list,
 						 gboolean threaded);
 void		message_list_set_threaded_expand_all
diff --git a/maint/Makefile.am b/maint/Makefile.am
new file mode 100644
index 0000000000..950be7cadd
--- /dev/null
+++ b/maint/Makefile.am
@@ -0,0 +1,25 @@
+### Process this file with automake to produce Makefile.in
+
+gladecatalog_DATA = evolution.xml
+gladecatalogdir = `$(PKG_CONFIG) --variable=catalogdir gladeui-1.0`
+
+gladeevolution_LTLIBRARIES = libgladeevolution.la
+gladeevolutiondir = `$(PKG_CONFIG) --variable=moduledir gladeui-1.0`
+
+libgladeevolution_la_SOURCES =
+
+libgladeevolution_la_LDFLAGS = \
+	-module -avoid-version
+
+libgladeevolution_la_LIBADD = \
+	$(top_srcdir)/mail/libevolution-mail.la \
+	$(top_srcdir)/calendar/gui/libevolution-calendar.la \
+	$(top_builddir)/widgets/misc/libemiscwidgets.la \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(EVOLUTION_MAIL_LIBS) \
+	$(GNOME_PLATFORM_LIBS)
+
+EXTRA_DIST = \
+	$(gladecatalog_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/maint/evolution.xml b/maint/evolution.xml
new file mode 100644
index 0000000000..cefe8467f5
--- /dev/null
+++ b/maint/evolution.xml
@@ -0,0 +1,47 @@
+<glade-catalog name="evolution" library="gladeevolution" depends="gtk+" book="evolution">
+
+  <glade-widget-classes>
+
+    <glade-widget-class name="EDateEdit" generic-name="date-edit" title="Date Edit">
+      <property id="allow-no-date-set"/>
+      <property id="set-none"/>
+      <property id="show-date"/>
+      <property id="show-time"/>
+      <property id="show-week-numbers"/>
+      <property id="twodigit-year-can-future"/>
+      <property id="use-24-hour-format"/>
+      <property id="week-start-day"/>
+    </glade-widget-class>
+
+    <glade-widget-class name="EImageChooser" generic-name="image-chooser" title="Image Chooser">
+      <property id="icon-name"/>
+    </glade-widget-class>
+
+    <glade-widget-class name="EMFolderSelectionButton" generic-name="folder-selection-button" title="Folder Selection Button">
+      <property id="caption"/>
+      <property id="multiselect"/>
+      <property id="title"/>
+    </glade-widget-class>
+
+    <glade-widget-class name="ESourceComboBox" generic-name="source-combo-box" title="Source Combo Box">
+      <property id="source-list"/>
+    </glade-widget-class>
+
+    <glade-widget-class name="ETimezoneEntry" generic-name="timezone-entry" title="Timezone Entry">
+      <property id="timezone"/>
+    </glade-widget-class>
+
+    <glade-widget-class name="EUrlEntry" generic-name="url-entry" title="URL Entry"/>
+
+  </glade-widget-classes>
+
+  <glade-widget-group name="evolution-widgets" title="Evolution">
+    <glade-widget-class-ref name="EDateEdit"/>
+    <glade-widget-class-ref name="EImageChooser"/>
+    <glade-widget-class-ref name="EMFolderSelectionButton"/>
+    <glade-widget-class-ref name="ESourceComboBox"/>
+    <glade-widget-class-ref name="ETimezoneEntry"/>
+    <glade-widget-class-ref name="EUrlEntry"/>
+  </glade-widget-group>
+
+</glade-catalog>
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 4c0c38dcbb..f42e3000a7 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -22,6 +22,7 @@ SUBDIRS = \
 	addressbook \
 	calendar \
 	mail \
+	mailto-handler \
 	plugin-lib \
 	$(MONO_DIR) \
 	$(PYTHON_DIR) \
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
index 9c53f411d5..7d398f855d 100644
--- a/modules/addressbook/addressbook-config.c
+++ b/modules/addressbook/addressbook-config.c
@@ -299,10 +299,15 @@ static gint
 addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap,
 			    const gchar **attrs, LDAPMessage **resp)
 {
+	GtkAdjustment *adjustment;
+	GtkRange *range;
 	gint ldap_error;
 	struct timeval timeout;
 
-	timeout.tv_sec = (gint) gtk_adjustment_get_value (GTK_RANGE(dialog->timeout_scale)->adjustment);
+	range = GTK_RANGE (dialog->timeout_scale);
+	adjustment = gtk_range_get_adjustment (range);
+
+	timeout.tv_sec = (gint) gtk_adjustment_get_value (adjustment);
 	timeout.tv_usec = 0;
 
 	ldap_error = ldap_search_ext_s (ldap,
@@ -376,6 +381,7 @@ query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog)
 	GtkTreeSelection *selection;
 	GtkTreeModel *model;
 	GtkWidget *dialog;
+	GtkWidget *container;
 	GtkWidget *supported_bases_table;
 	GtkBuilder *builder;
 	GtkTreeIter iter;
@@ -389,8 +395,12 @@ query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog)
 	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
 	gtk_widget_ensure_style (dialog);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 12);
+
+	container = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 12);
+
+	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_container_set_border_width (GTK_CONTAINER (container), 0);
 
 	supported_bases_table = e_builder_get_widget (builder, "supported-bases-table");
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (supported_bases_table));
@@ -589,7 +599,7 @@ eabc_general_use_in_cal (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkW
 	if (old)
 		return old;
 
-	use_in_cal_setting = gtk_check_button_new_with_mnemonic (_("Use in _Birthday & Anniversaries calendar"));
+	use_in_cal_setting = gtk_check_button_new_with_mnemonic (_("U_se in Birthday & Anniversaries calendar"));
 	gtk_widget_show (use_in_cal_setting);
 	gtk_container_add (GTK_CONTAINER (parent), use_in_cal_setting);
 
@@ -918,9 +928,13 @@ eabc_details_search(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 static void
 timeout_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
 {
+	GtkAdjustment *adjustment;
+	GtkRange *range;
 	gchar *timeout;
 
-	timeout = g_strdup_printf("%f", gtk_adjustment_get_value(((GtkRange *)sdialog->timeout_scale)->adjustment));
+	range = GTK_RANGE (sdialog->timeout_scale);
+	adjustment = gtk_range_get_adjustment (range);
+	timeout = g_strdup_printf("%f", gtk_adjustment_get_value (adjustment));
 	e_source_set_property(sdialog->source, "timeout", timeout);
 	g_free(timeout);
 }
@@ -947,6 +961,8 @@ static GtkWidget *
 eabc_details_limit(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	AddressbookSourceDialog *sdialog = data;
+	GtkAdjustment *adjustment;
+	GtkRange *range;
 	GtkWidget *w;
 	const gchar *tmp;
 	GtkBuilder *builder;
@@ -961,9 +977,13 @@ eabc_details_limit(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	gtk_box_pack_start((GtkBox *)parent, w, FALSE, FALSE, 0);
 
 	sdialog->timeout_scale = e_builder_get_widget (builder, "timeout-scale");
+	range = GTK_RANGE (sdialog->timeout_scale);
+	adjustment = gtk_range_get_adjustment (range);
 	tmp = e_source_get_property(sdialog->source, "timeout");
-	gtk_adjustment_set_value(((GtkRange *)sdialog->timeout_scale)->adjustment, tmp?g_strtod(tmp, NULL):3.0);
-	g_signal_connect (GTK_RANGE(sdialog->timeout_scale)->adjustment, "value_changed", G_CALLBACK (timeout_changed_cb), sdialog);
+	gtk_adjustment_set_value (adjustment, tmp?g_strtod(tmp, NULL):3.0);
+	g_signal_connect (
+		adjustment, "value_changed",
+		G_CALLBACK (timeout_changed_cb), sdialog);
 
 	sdialog->limit_spinbutton = e_builder_get_widget (builder, "download-limit-spinbutton");
 	tmp = e_source_get_property(sdialog->source, "limit");
diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index 6b51427be1..99a8b9b8ae 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -156,7 +156,7 @@ autocompletion_config_new (EShell *shell)
 	gtk_box_pack_start (GTK_BOX (itembox), widget, TRUE, TRUE, 0);
 	e_datetime_format_add_setup_widget (
 		widget, 0, "addressbook", "table",
-		DTFormatKindDateTime, _("Table column:"));
+		DTFormatKindDateTime, _("_Table column:"));
 	gtk_widget_show (widget);
 
 	itembox = add_section (vbox, _("Autocompletion"), TRUE);
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index 74dbbfcf7f..d0340f7974 100644
--- a/modules/addressbook/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
@@ -594,8 +594,8 @@ book_shell_backend_class_init (EBookShellBackendClass *class)
 		PROP_SOURCE_LIST,
 		g_param_spec_object (
 			"source-list",
-			_("Source List"),
-			_("The registry of address books"),
+			"Source List",
+			"The registry of address books",
 			E_TYPE_SOURCE_LIST,
 			G_PARAM_READABLE));
 }
diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c
index 9642627844..4a48677d13 100644
--- a/modules/addressbook/e-book-shell-content.c
+++ b/modules/addressbook/e-book-shell-content.c
@@ -189,6 +189,7 @@ book_shell_content_constructed (GObject *object)
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 	EShellContent *shell_content;
+	EShellTaskbar *shell_taskbar;
 	GConfBridge *bridge;
 	GtkWidget *container;
 	GtkWidget *widget;
@@ -202,6 +203,7 @@ book_shell_content_constructed (GObject *object)
 	shell_content = E_SHELL_CONTENT (object);
 	shell_view = e_shell_content_get_shell_view (shell_content);
 	shell_window = e_shell_view_get_shell_window (shell_view);
+	shell_taskbar = e_shell_view_get_shell_taskbar (shell_view);
 	shell = e_shell_window_get_shell (shell_window);
 
 	container = GTK_WIDGET (object);
@@ -233,6 +235,11 @@ book_shell_content_constructed (GObject *object)
 		widget, "send-message",
 		G_CALLBACK (book_shell_content_send_message_cb), object);
 
+	g_signal_connect_swapped (
+		widget, "status-message",
+		G_CALLBACK (e_shell_taskbar_set_message),
+		shell_taskbar);
+
 	widget = e_preview_pane_new (E_WEB_VIEW (widget));
 	gtk_paned_pack2 (GTK_PANED (container), widget, FALSE, FALSE);
 	priv->preview_pane = g_object_ref (widget);
@@ -361,8 +368,8 @@ book_shell_content_class_init (EBookShellContentClass *class)
 		PROP_CURRENT_VIEW,
 		g_param_spec_object (
 			"current-view",
-			_("Current View"),
-			_("The currently selected address book view"),
+			"Current View",
+			"The currently selected address book view",
 			E_TYPE_ADDRESSBOOK_VIEW,
 			G_PARAM_READWRITE));
 
@@ -371,8 +378,8 @@ book_shell_content_class_init (EBookShellContentClass *class)
 		PROP_PREVIEW_CONTACT,
 		g_param_spec_object (
 			"preview-contact",
-			_("Previewed Contact"),
-			_("The contact being shown in the preview pane"),
+			"Previewed Contact",
+			"The contact being shown in the preview pane",
 			E_TYPE_CONTACT,
 			G_PARAM_READWRITE));
 
@@ -381,8 +388,8 @@ book_shell_content_class_init (EBookShellContentClass *class)
 		PROP_PREVIEW_VISIBLE,
 		g_param_spec_boolean (
 			"preview-visible",
-			_("Preview is Visible"),
-			_("Whether the preview pane is visible"),
+			"Preview is Visible",
+			"Whether the preview pane is visible",
 			TRUE,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));
diff --git a/modules/addressbook/e-book-shell-migrate.c b/modules/addressbook/e-book-shell-migrate.c
index 55246ce047..5cc22a50d6 100644
--- a/modules/addressbook/e-book-shell-migrate.c
+++ b/modules/addressbook/e-book-shell-migrate.c
@@ -45,7 +45,6 @@
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-xml-utils.h"
-#include "e-util/e-folder-map.h"
 
 #include "e-book-shell-migrate.h"
 
@@ -67,378 +66,6 @@ typedef struct {
 	GtkWidget *progress;
 } MigrationContext;
 
-static void
-setup_progress_dialog (MigrationContext *context)
-{
-	GtkWidget *vbox, *hbox;
-
-	context->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title (GTK_WINDOW (context->window), _("Migrating..."));
-	gtk_window_set_modal (GTK_WINDOW (context->window), TRUE);
-	gtk_container_set_border_width (GTK_CONTAINER (context->window), 6);
-
-	vbox = gtk_vbox_new (FALSE, 6);
-	gtk_widget_show (vbox);
-	gtk_container_add (GTK_CONTAINER (context->window), vbox);
-
-	context->label = gtk_label_new ("");
-	gtk_label_set_line_wrap (GTK_LABEL (context->label), TRUE);
-	gtk_widget_show (context->label);
-	gtk_box_pack_start (GTK_BOX (vbox), context->label, TRUE, TRUE, 0);
-
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-
-	context->folder_label = gtk_label_new ("");
-	gtk_widget_show (context->folder_label);
-	gtk_box_pack_start (GTK_BOX (hbox), context->folder_label, TRUE, TRUE, 0);
-
-	context->progress = gtk_progress_bar_new ();
-	gtk_widget_show (context->progress);
-	gtk_box_pack_start (GTK_BOX (hbox), context->progress, TRUE, TRUE, 0);
-
-	gtk_widget_show (context->window);
-}
-
-static void
-dialog_close (MigrationContext *context)
-{
-	gtk_widget_destroy (context->window);
-}
-
-static void
-dialog_set_label (MigrationContext *context, const gchar *str)
-{
-	gtk_label_set_text (GTK_LABEL (context->label), str);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-#ifdef SLOW_MIGRATION
-	sleep (1);
-#endif
-}
-
-static void
-dialog_set_folder_name (MigrationContext *context, const gchar *folder_name)
-{
-	gchar *text;
-
-	text = g_strdup_printf (_("Migrating '%s':"), folder_name);
-	gtk_label_set_text (GTK_LABEL (context->folder_label), text);
-	g_free (text);
-
-	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (context->progress), 0.0);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-#ifdef SLOW_MIGRATION
-	sleep (1);
-#endif
-}
-
-static void
-dialog_set_progress (MigrationContext *context, double percent)
-{
-	gchar text[5];
-
-	snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f));
-
-	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (context->progress), percent);
-	gtk_progress_bar_set_text (GTK_PROGRESS_BAR (context->progress), text);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-#ifdef SLOW_MIGRATION
-	sleep (1);
-#endif
-}
-
-static gboolean
-check_for_conflict (ESourceGroup *group, gchar *name)
-{
-	GSList *sources;
-	GSList *s;
-
-	sources = e_source_group_peek_sources (group);
-
-	for (s = sources; s; s = s->next) {
-		ESource *source = E_SOURCE (s->data);
-
-		if (!strcmp (e_source_peek_name (source), name))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gchar *
-get_source_name (ESourceGroup *group, const gchar *path)
-{
-#ifndef G_OS_WIN32
-	gchar **p = g_strsplit (path, "/", 0);
-#else
-	gchar **p = g_strsplit_set (path, "\\/", 0);
-#endif
-	gint i, j, starting_index;
-	gint num_elements;
-	gboolean conflict;
-	GString *s = g_string_new ("");
-
-	for (i = 0; p[i]; i ++);
-
-	num_elements = i;
-	i--;
-
-	/* p[i] is now the last path element */
-
-	/* check if it conflicts */
-	starting_index = i;
-	do {
-		g_string_assign (s, "");
-		for (j = starting_index; j < num_elements; j += 2) {
-			if (j != starting_index)
-				g_string_append_c (s, '_');
-			g_string_append (s, p[j]);
-		}
-
-		conflict = check_for_conflict (group, s->str);
-
-		/* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */
-		if (conflict)
-			starting_index -= 2;
-
-		/* we always break out if we can't go any further,
-		   regardless of whether or not we conflict. */
-		if (starting_index < 0)
-			break;
-
-	} while (conflict);
-
-	g_strfreev (p);
-
-	return g_string_free (s, FALSE);
-}
-
-static void
-migrate_contacts (MigrationContext *context, EBook *old_book, EBook *new_book)
-{
-	EBookQuery *query = e_book_query_any_field_contains ("");
-	GList *l, *contacts;
-	gint num_added = 0;
-	gint num_contacts;
-
-	/* both books are loaded, start the actual migration */
-	e_book_get_contacts (old_book, query, &contacts, NULL);
-	e_book_query_unref (query);
-
-	num_contacts = g_list_length (contacts);
-	for (l = contacts; l; l = l->next) {
-		EContact *contact = l->data;
-		GError *e = NULL;
-		GList *attrs, *attr;
-
-		/* do some last minute massaging of the contact's attributes */
-
-		attrs = e_vcard_get_attributes (E_VCARD (contact));
-		for (attr = attrs; attr;) {
-			EVCardAttribute *a = attr->data;
-
-			/* evo 1.4 used the non-standard X-EVOLUTION-OFFICE attribute,
-			   evo 1.5 uses the third element in the ORG list attribute. */
-			if (!strcmp ("X-EVOLUTION-OFFICE", e_vcard_attribute_get_name (a))) {
-				GList *v = e_vcard_attribute_get_values (a);
-				GList *next_attr;
-
-				if (v && v->data)
-					e_contact_set (contact, E_CONTACT_OFFICE, v->data);
-
-				next_attr = attr->next;
-				e_vcard_remove_attribute (E_VCARD (contact), a);
-				attr = next_attr;
-			}
-			/* evo 1.4 didn't put TYPE=VOICE in for phone numbers.
-			   evo 1.5 does.
-
-			   so we search through the attribute params for
-			   either TYPE=VOICE or TYPE=FAX.  If we find
-			   either we do nothing.  If we find neither, we
-			   add TYPE=VOICE.
-			*/
-			else if (!strcmp ("TEL", e_vcard_attribute_get_name (a))) {
-				GList *params, *param;
-				gboolean found = FALSE;
-
-				params = e_vcard_attribute_get_params (a);
-				for (param = params; param; param = param->next) {
-					EVCardAttributeParam *p = param->data;
-					if (!strcmp (EVC_TYPE, e_vcard_attribute_param_get_name (p))) {
-						GList *v = e_vcard_attribute_param_get_values (p);
-						while (v && v->data) {
-							if (!strcmp ("VOICE", v->data)
-							    || !strcmp ("FAX", v->data)) {
-								found = TRUE;
-								break;
-							}
-							v = v->next;
-						}
-					}
-				}
-
-				if (!found)
-					e_vcard_attribute_add_param_with_value (a,
-										e_vcard_attribute_param_new (EVC_TYPE),
-										"VOICE");
-				attr = attr->next;
-			}
-			/* Replace "POSTAL" (1.4) addresses with "OTHER" (1.5) */
-			else if (!strcmp ("ADR", e_vcard_attribute_get_name (a))) {
-				GList *params, *param;
-				gboolean found = FALSE;
-				EVCardAttributeParam *p;
-
-				params = e_vcard_attribute_get_params (a);
-				for (param = params; param; param = param->next) {
-					p = param->data;
-					if (!strcmp (EVC_TYPE, e_vcard_attribute_param_get_name (p))) {
-						GList *v = e_vcard_attribute_param_get_values (p);
-						while (v && v->data ) {
-							if (!strcmp ("POSTAL", v->data)) {
-								found = TRUE;
-								break;
-							}
-							v = v->next;
-						}
-						if (found)
-							break;
-					}
-				}
-
-				if (found) {
-					e_vcard_attribute_param_remove_values (p);
-					e_vcard_attribute_param_add_value (p, "OTHER");
-				}
-
-				attr = attr->next;
-			}
-			/* this is kinda gross.  The new vcard parser
-			   needs ';'s to be escaped by \'s.  but the
-			   1.4 vcard generator would put unescaped xml
-			   (including entities like &gt;) in the value
-			   of attributes, so we need to go through and
-			   escape those ';'s. */
-			else if (!strcmp ("EMAIL", e_vcard_attribute_get_name (a))) {
-				GList *params;
-				GList *v = e_vcard_attribute_get_values (a);
-
-				/* Add TYPE=OTHER if there is no type set */
-				params = e_vcard_attribute_get_params (a);
-				if (!params)
-					e_vcard_attribute_add_param_with_value (a,
-							e_vcard_attribute_param_new (EVC_TYPE),
-							"OTHER");
-
-				if (v && v->data) {
-					if (!strncmp ((gchar *)v->data, "<?xml", 5)) {
-						/* k, this is the nasty part.  we glomb all the
-						   value strings back together again (if there is
-						   more than one), then work our magic */
-						GString *str = g_string_new ("");
-						while (v) {
-							g_string_append (str, v->data);
-							if (v->next)
-								g_string_append_c (str, ';');
-							v = v->next;
-						}
-
-						e_vcard_attribute_remove_values (a);
-						e_vcard_attribute_add_value (a, str->str);
-						g_string_free (str, TRUE);
-					}
-				}
-
-				attr = attr->next;
-			}
-			else {
-				attr = attr->next;
-			}
-		}
-
-		if (!e_book_add_contact (new_book,
-					 contact,
-					 &e))
-			g_warning ("contact add failed: '%s'", e->message);
-
-		num_added ++;
-
-		dialog_set_progress (context, (double)num_added / num_contacts);
-	}
-
-	g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-	g_list_free (contacts);
-}
-
-static void
-migrate_contact_folder_to_source (MigrationContext *context, gchar *old_path, ESource *new_source)
-{
-	gchar *old_uri = g_filename_to_uri (old_path, NULL, NULL);
-	GError *e = NULL;
-
-	EBook *old_book = NULL, *new_book = NULL;
-	ESource *old_source;
-	ESourceGroup *group;
-
-	group = e_source_group_new ("", old_uri);
-	old_source = e_source_new ("", "");
-	e_source_group_add_source (group, old_source, -1);
-
-	dialog_set_folder_name (context, e_source_peek_name (new_source));
-
-	old_book = e_book_new (old_source, &e);
-	if (!old_book
-	    || !e_book_open (old_book, TRUE, &e)) {
-		g_warning ("failed to load source book for migration: '%s'", e->message);
-		goto finish;
-	}
-
-	new_book = e_book_new (new_source, &e);
-	if (!new_book
-	    || !e_book_open (new_book, FALSE, &e)) {
-		g_warning ("failed to load destination book for migration: '%s'", e->message);
-		goto finish;
-	}
-
-	migrate_contacts (context, old_book, new_book);
-
- finish:
-	g_object_unref (old_source);
-	g_object_unref (group);
-	if (old_book)
-		g_object_unref (old_book);
-	if (new_book)
-		g_object_unref (new_book);
-	g_free (old_uri);
-}
-
-static void
-migrate_contact_folder (MigrationContext *context, gchar *old_path, ESourceGroup *dest_group, gchar *source_name)
-{
-	ESource *new_source;
-
-	new_source = e_source_new (source_name, source_name);
-	e_source_set_relative_uri (new_source, e_source_peek_uid (new_source));
-	e_source_group_add_source (dest_group, new_source, -1);
-
-	g_hash_table_insert (context->folder_uid_map, g_strdup (old_path), g_strdup (e_source_peek_uid (new_source)));
-
-	migrate_contact_folder_to_source (context, old_path, new_source);
-
-	g_object_unref (new_source);
-}
-
 #define LDAP_BASE_URI "ldap://"
 #define PERSONAL_RELATIVE_URI "system"
 
@@ -524,562 +151,6 @@ create_groups (MigrationContext *context,
 	g_free (base_uri);
 }
 
-static gboolean
-migrate_local_folders (MigrationContext *context, ESourceGroup *on_this_computer, ESource *personal_source)
-{
-	gchar *old_path = NULL;
-	GSList *dirs, *l;
-	gchar *local_contact_folder = NULL;
-
-	old_path = g_strdup_printf ("%s/evolution/local", g_get_home_dir ());
-
-	dirs = e_folder_map_local_folders (old_path, "contacts");
-
-	/* migrate the local addressbook first, to local/system */
-	local_contact_folder = g_build_filename (g_get_home_dir (),
-						 "evolution", "local", "Contacts",
-						 NULL);
-
-	for (l = dirs; l; l = l->next) {
-		gchar *source_name;
-		/* we handle the system folder differently */
-		if (personal_source && !strcmp ((gchar *)l->data, local_contact_folder)) {
-			g_hash_table_insert (context->folder_uid_map, g_strdup (l->data), g_strdup (e_source_peek_uid (personal_source)));
-			migrate_contact_folder_to_source (context, local_contact_folder, personal_source);
-			continue;
-		}
-
-		source_name = get_source_name (on_this_computer, (gchar *)l->data);
-		migrate_contact_folder (context, l->data, on_this_computer, source_name);
-		g_free (source_name);
-	}
-
-	g_slist_foreach (dirs, (GFunc)g_free, NULL);
-	g_slist_free (dirs);
-	g_free (local_contact_folder);
-	g_free (old_path);
-
-	return TRUE;
-}
-
-static gchar *
-get_string_child (xmlNode *node,
-		  const gchar *name)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	gchar *retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return NULL;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the empty string */
-		return g_strdup("");
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = g_strdup ((gchar *) xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-
-static gint
-get_integer_child (xmlNode *node,
-		   const gchar *name,
-		   gint defval)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	gint retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return defval;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the default */
-		return defval;
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = atoi ((gchar *)xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-
-static gboolean
-migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers)
-{
-	gchar *sources_xml = g_strdup_printf ("%s/evolution/addressbook-sources.xml",
-					     g_get_home_dir ());
-
-	printf ("trying to migrate from %s\n", sources_xml);
-
-	if (g_file_test (sources_xml, G_FILE_TEST_EXISTS)) {
-		xmlDoc  *doc = xmlParseFile (sources_xml);
-		xmlNode *root;
-		xmlNode *child;
-		gint num_contactservers;
-		gint servernum;
-
-		if (!doc)
-			return FALSE;
-
-		root = xmlDocGetRootElement (doc);
-		if (root == NULL || strcmp ((const gchar *)root->name, "addressbooks") != 0) {
-			xmlFreeDoc (doc);
-			return FALSE;
-		}
-
-		/* count the number of servers, so we can give progress */
-		num_contactservers = 0;
-		for (child = root->children; child; child = child->next) {
-			if (!strcmp ((const gchar *)child->name, "contactserver")) {
-				num_contactservers++;
-			}
-		}
-		printf ("found %d contact servers to migrate\n", num_contactservers);
-
-		dialog_set_folder_name (context, _("LDAP Servers"));
-
-		servernum = 0;
-		for (child = root->children; child; child = child->next) {
-			if (!strcmp ((const gchar *)child->name, "contactserver")) {
-				gchar *port, *host, *rootdn, *scope, *authmethod, *ssl;
-				gchar *emailaddr, *binddn, *limitstr;
-				gint limit;
-				gchar *name, *description;
-				GString *uri = g_string_new ("");
-				ESource *source;
-
-				name        = get_string_child (child, "name");
-				description = get_string_child (child, "description");
-				port        = get_string_child (child, "port");
-				host        = get_string_child (child, "host");
-				rootdn      = get_string_child (child, "rootdn");
-				scope       = get_string_child (child, "scope");
-				authmethod  = get_string_child (child, "authmethod");
-				ssl         = get_string_child (child, "ssl");
-				emailaddr   = get_string_child (child, "emailaddr");
-				binddn      = get_string_child (child, "binddn");
-				limit       = get_integer_child (child, "limit", 100);
-				limitstr    = g_strdup_printf ("%d", limit);
-
-				g_string_append_printf (uri,
-							"%s:%s/%s?"/*trigraph prevention*/"?%s",
-							host, port, rootdn, scope);
-
-				source = e_source_new (name, uri->str);
-				e_source_set_property (source, "description", description);
-				e_source_set_property (source, "limit", limitstr);
-				e_source_set_property (source, "ssl", ssl);
-				e_source_set_property (source, "auth", authmethod);
-				if (emailaddr)
-					e_source_set_property (source, "email_addr", emailaddr);
-				if (binddn)
-					e_source_set_property (source, "binddn", binddn);
-
-				e_source_group_add_source (on_ldap_servers, source, -1);
-
-				g_string_free (uri, TRUE);
-				g_free (port);
-				g_free (host);
-				g_free (rootdn);
-				g_free (scope);
-				g_free (authmethod);
-				g_free (ssl);
-				g_free (emailaddr);
-				g_free (binddn);
-				g_free (limitstr);
-				g_free (name);
-				g_free (description);
-
-				servernum++;
-				dialog_set_progress (context, (double)servernum/num_contactservers);
-			}
-		}
-
-		xmlFreeDoc (doc);
-	}
-
-	g_free (sources_xml);
-
-	return TRUE;
-}
-
-static ESource*
-get_source_by_name (ESourceList *source_list, const gchar *name)
-{
-	GSList *groups;
-	GSList *g;
-
-	groups = e_source_list_peek_groups (source_list);
-	if (!groups)
-		return NULL;
-
-	for (g = groups; g; g = g->next) {
-		GSList *sources;
-		GSList *s;
-		ESourceGroup *group = E_SOURCE_GROUP (g->data);
-
-		sources = e_source_group_peek_sources (group);
-		if (!sources)
-			continue;
-
-		for (s = sources; s; s = s->next) {
-			ESource *source = E_SOURCE (s->data);
-			const gchar *source_name = e_source_peek_name (source);
-
-			if (!strcmp (name, source_name))
-				return source;
-		}
-	}
-
-	return NULL;
-}
-
-static gboolean
-migrate_completion_folders (MigrationContext *context)
-{
-	GConfClient *client;
-	const gchar *key;
-	gchar *uris_xml;
-
-	printf ("trying to migrate completion folders\n");
-
-	client = gconf_client_get_default ();
-	key = "/apps/evolution/addressbook/completion/uris";
-	uris_xml = gconf_client_get_string (client, key, NULL);
-	g_object_unref (client);
-
-	if (uris_xml) {
-		xmlDoc  *doc = xmlParseMemory (uris_xml, strlen (uris_xml));
-		xmlNode *root;
-		xmlNode *child;
-
-		if (!doc)
-			return FALSE;
-
-		dialog_set_folder_name (context, _("Autocompletion Settings"));
-
-		root = xmlDocGetRootElement (doc);
-		if (root == NULL || strcmp ((const gchar *)root->name, "EvolutionFolderList") != 0) {
-			xmlFreeDoc (doc);
-			return FALSE;
-		}
-
-		for (child = root->children; child; child = child->next) {
-			if (!strcmp ((const gchar *)child->name, "folder")) {
-				gchar *physical_uri = e_xml_get_string_prop_by_name (child, (const guchar *)"physical-uri");
-				ESource *source = NULL;
-
-				/* if the physical uri is file://...
-				   we look it up in our folder_uid_map
-				   hashtable.  If it's a folder we
-				   converted over, we should get back
-				   a uid we can search for.
-
-				   if the physical_uri is anything
-				   else, we strip off the args
-				   (anything after;) before searching
-				   for the uri. */
-
-				if (!strncmp (physical_uri, "file://", 7)) {
-					gchar *filename = g_filename_from_uri (physical_uri, NULL, NULL);
-					gchar *uid = NULL;
-
-					if (filename)
-						uid  = g_hash_table_lookup (context->folder_uid_map,
-									    filename);
-					g_free (filename);
-					if (uid)
-						source = e_source_list_peek_source_by_uid (context->source_list, uid);
-				}
-				else {
-					gchar *name = e_xml_get_string_prop_by_name (child, (const guchar *)"display-name");
-
-					source = get_source_by_name (context->source_list, name);
-
-					g_free (name);
-				}
-
-				if (source) {
-					e_source_set_property (source, "completion", "true");
-				}
-				else {
-					g_warning ("found completion folder with uri '%s' that "
-						   "doesn't correspond to anything we migrated.", physical_uri);
-				}
-
-				g_free (physical_uri);
-			}
-		}
-
-		g_free (uris_xml);
-	}
-	else {
-		g_message ("no completion folder settings to migrate");
-	}
-
-	return TRUE;
-}
-
-static void
-migrate_contact_lists_for_local_folders (MigrationContext *context, ESourceGroup *on_this_computer)
-{
-	GSList *sources, *s;
-
-	sources = e_source_group_peek_sources (on_this_computer);
-	for (s = sources; s; s = s->next) {
-		ESource *source = s->data;
-		EBook *book;
-		EBookQuery *query;
-		GList *l, *contacts;
-		gint num_contacts, num_converted;
-
-		dialog_set_folder_name (context, e_source_peek_name (source));
-
-		book = e_book_new (source, NULL);
-		if (!book
-		    || !e_book_open (book, TRUE, NULL)) {
-			gchar *uri = e_source_get_uri (source);
-			g_warning ("failed to migrate contact lists for source %s", uri);
-			g_free (uri);
-			continue;
-		}
-
-		query = e_book_query_any_field_contains ("");
-		e_book_get_contacts (book, query, &contacts, NULL);
-		e_book_query_unref (query);
-
-		num_converted = 0;
-		num_contacts = g_list_length (contacts);
-		for (l = contacts; l; l = l->next) {
-			EContact *contact = l->data;
-			GError *e = NULL;
-			GList *attrs, *attr;
-			gboolean converted = FALSE;
-
-			attrs = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
-			for (attr = attrs; attr; attr = attr->next) {
-				EVCardAttribute *a = attr->data;
-				GList *v = e_vcard_attribute_get_values (a);
-
-				if (v && v->data) {
-					if (!strncmp ((gchar *)v->data, "<?xml", 5)) {
-						EDestination *dest = e_destination_import ((gchar *)v->data);
-
-						e_destination_export_to_vcard_attribute (dest, a);
-
-						g_object_unref (dest);
-
-						converted = TRUE;
-					}
-				}
-			}
-
-			if (converted) {
-				e_contact_set_attributes (contact, E_CONTACT_EMAIL, attrs);
-
-				if (!e_book_commit_contact (book,
-							    contact,
-							    &e))
-					g_warning ("contact commit failed: '%s'", e->message);
-			}
-
-			num_converted ++;
-
-			dialog_set_progress (context, (double)num_converted / num_contacts);
-		}
-
-		g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-		g_list_free (contacts);
-
-		g_object_unref (book);
-	}
-}
-
-static void
-migrate_company_phone_for_local_folders (MigrationContext *context, ESourceGroup *on_this_computer)
-{
-	GSList *sources, *s;
-
-	sources = e_source_group_peek_sources (on_this_computer);
-	for (s = sources; s; s = s->next) {
-		ESource *source = s->data;
-		EBook *book;
-		EBookQuery *query;
-		GList *l, *contacts;
-		gint num_contacts, num_converted;
-
-		dialog_set_folder_name (context, e_source_peek_name (source));
-
-		book = e_book_new (source, NULL);
-		if (!book
-		    || !e_book_open (book, TRUE, NULL)) {
-			gchar *uri = e_source_get_uri (source);
-			g_warning ("failed to migrate company phone numbers for source %s", uri);
-			g_free (uri);
-			continue;
-		}
-
-		query = e_book_query_any_field_contains ("");
-		e_book_get_contacts (book, query, &contacts, NULL);
-		e_book_query_unref (query);
-
-		num_converted = 0;
-		num_contacts = g_list_length (contacts);
-		for (l = contacts; l; l = l->next) {
-			EContact *contact = l->data;
-			GError *e = NULL;
-			GList *attrs, *attr;
-			gboolean converted = FALSE;
-			gint num_work_voice = 0;
-
-			attrs = e_vcard_get_attributes (E_VCARD (contact));
-			for (attr = attrs; attr;) {
-				EVCardAttribute *a = attr->data;
-				GList *next_attr = attr->next;
-
-				if (!strcmp ("TEL", e_vcard_attribute_get_name (a))) {
-					GList *params, *param;
-					gboolean found_voice = FALSE;
-					gboolean found_work = FALSE;
-
-					params = e_vcard_attribute_get_params (a);
-					for (param = params; param; param = param->next) {
-						EVCardAttributeParam *p = param->data;
-						if (!strcmp (EVC_TYPE, e_vcard_attribute_param_get_name (p))) {
-							GList *v = e_vcard_attribute_param_get_values (p);
-							while (v && v->data) {
-								if (!strcmp ("VOICE", v->data))
-									found_voice = TRUE;
-								else if (!strcmp ("WORK", v->data))
-									found_work = TRUE;
-								v = v->next;
-							}
-						}
-
-						if (found_work && found_voice)
-							num_work_voice++;
-
-						if (num_work_voice == 3) {
-							GList *v = e_vcard_attribute_get_values (a);
-
-							if (v && v->data)
-								e_contact_set (contact, E_CONTACT_PHONE_COMPANY, v->data);
-
-							e_vcard_remove_attribute (E_VCARD (contact), a);
-
-							converted = TRUE;
-							break;
-						}
-					}
-				}
-
-				attr = next_attr;
-
-				if (converted)
-					break;
-			}
-
-			if (converted) {
-				if (!e_book_commit_contact (book,
-							    contact,
-							    &e))
-					g_warning ("contact commit failed: '%s'", e->message);
-			}
-
-			num_converted ++;
-
-			dialog_set_progress (context, (double)num_converted / num_contacts);
-		}
-
-		g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-		g_list_free (contacts);
-
-		g_object_unref (book);
-	}
-}
-
-static void
-migrate_pilot_data (const gchar *old_path, const gchar *new_path)
-{
-	const gchar *dent;
-	const gchar *ext;
-	gchar *filename;
-	GDir *dir;
-
-	if (!(dir = g_dir_open (old_path, 0, NULL)))
-		return;
-
-	while ((dent = g_dir_read_name (dir))) {
-		if ((!strncmp (dent, "pilot-map-", 10) &&
-		     ((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) ||
-		    (!strncmp (dent, "pilot-sync-evolution-addressbook-", 33) &&
-		     ((ext = strrchr (dent, '.')) && !strcmp (ext, ".db")))) {
-			/* src and dest file formats are identical for both map and changelog files */
-			guchar inbuf[4096];
-			gsize nread, nwritten;
-			gint fd0, fd1;
-			gssize n;
-
-			filename = g_build_filename (old_path, dent, NULL);
-			if ((fd0 = g_open (filename, O_RDONLY | O_BINARY, 0)) == -1) {
-				g_free (filename);
-				continue;
-			}
-
-			g_free (filename);
-			filename = g_build_filename (new_path, dent, NULL);
-			if ((fd1 = g_open (filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666)) == -1) {
-				g_free (filename);
-				close (fd0);
-				continue;
-			}
-
-			do {
-				do {
-					n = read (fd0, inbuf, sizeof (inbuf));
-				} while (n == -1 && errno == EINTR);
-
-				if (n < 1)
-					break;
-
-				nread = n;
-				nwritten = 0;
-				do {
-					do {
-						n = write (fd1, inbuf + nwritten, nread - nwritten);
-					} while (n == -1 && errno == EINTR);
-
-					if (n > 0)
-						nwritten += n;
-				} while (nwritten < nread && n != -1);
-
-				if (n == -1)
-					break;
-			} while (1);
-
-			if (n != -1)
-				n = fsync (fd1);
-
-			if (n == -1) {
-				g_warning ("Failed to migrate %s: %s", dent, g_strerror (errno));
-				g_unlink (filename);
-			}
-
-			close (fd0);
-			close (fd1);
-			g_free (filename);
-		}
-	}
-
-	g_dir_close (dir);
-}
-
 static MigrationContext *
 migration_context_new (const gchar *data_dir)
 {
@@ -1121,7 +192,6 @@ e_book_shell_backend_migrate (EShellBackend *shell_backend,
 	ESourceGroup *on_ldap_servers;
 	ESource *personal_source;
 	MigrationContext *context;
-	gboolean need_dialog = FALSE;
 	const gchar *data_dir;
 
 	g_return_val_if_fail (E_IS_SHELL_BACKEND (shell_backend), FALSE);
@@ -1134,87 +204,6 @@ e_book_shell_backend_migrate (EShellBackend *shell_backend,
 	   groups/sources. */
 	create_groups (context, &on_this_computer, &on_ldap_servers, &personal_source);
 
-	/* figure out if we need the dialog displayed */
-	if (major == 1
-	    /* we only need the most recent upgrade point here.
-	       further decomposition will happen below. */
-	    && (minor < 5 || (minor == 5 && micro <= 10)))
-		need_dialog = TRUE;
-
-	if (need_dialog)
-		setup_progress_dialog (context);
-
-	if (major == 1) {
-
-		if (minor < 5 || (minor == 5 && micro <= 2)) {
-			/* initialize our dialog */
-			dialog_set_label (context,
-					  _("The location and hierarchy of the Evolution contact "
-					    "folders has changed since Evolution 1.x.\n\nPlease be "
-					    "patient while Evolution migrates your folders..."));
-
-			if (on_this_computer)
-				migrate_local_folders (context, on_this_computer, personal_source);
-			if (on_ldap_servers)
-				migrate_ldap_servers (context, on_ldap_servers);
-
-			migrate_completion_folders (context);
-		}
-
-		if (minor < 5 || (minor == 5 && micro <= 7)) {
-			dialog_set_label (context,
-					  _("The format of mailing list contacts has changed.\n\n"
-					    "Please be patient while Evolution migrates your "
-					    "folders..."));
-
-			migrate_contact_lists_for_local_folders (context, on_this_computer);
-		}
-
-		if (minor < 5 || (minor == 5 && micro <= 8)) {
-			dialog_set_label (context,
-					  _("The way Evolution stores some phone numbers has changed.\n\n"
-					    "Please be patient while Evolution migrates your "
-					    "folders..."));
-
-			migrate_company_phone_for_local_folders (context, on_this_computer);
-		}
-
-		if (minor < 5 || (minor == 5 && micro <= 10)) {
-			gchar *old_path, *new_path;
-
-			dialog_set_label (context, _("Evolution's Palm Sync changelog and map files have changed.\n\n"
-						     "Please be patient while Evolution migrates your Pilot Sync data..."));
-
-			old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Contacts", NULL);
-			new_path = g_build_filename (data_dir, "local", "system", NULL);
-			migrate_pilot_data (old_path, new_path);
-			g_free (new_path);
-			g_free (old_path);
-		}
-
-		/* we only need to do this next step if people ran
-		   older versions of 1.5.  We need to clear out the
-		   absolute URI's that were assigned to ESources
-		   during one phase of development, as they take
-		   precedent over relative uris (but aren't updated
-		   when editing an ESource). */
-		if (minor == 5 && micro <= 11) {
-			GSList *g;
-			for (g = e_source_list_peek_groups (context->source_list); g; g = g->next) {
-				ESourceGroup *group = g->data;
-				GSList *s;
-
-				for (s = e_source_group_peek_sources (group); s; s = s->next) {
-					ESource *source = s->data;
-					e_source_set_absolute_uri (source, NULL);
-				}
-			}
-		}
-	}
-
-	if (need_dialog)
-		dialog_close (context);
-
 	if (on_this_computer)
 		g_object_unref (on_this_computer);
 	if (on_ldap_servers)
diff --git a/modules/addressbook/e-book-shell-sidebar.c b/modules/addressbook/e-book-shell-sidebar.c
index 24a0997173..5ff6c2902c 100644
--- a/modules/addressbook/e-book-shell-sidebar.c
+++ b/modules/addressbook/e-book-shell-sidebar.c
@@ -178,8 +178,8 @@ book_shell_sidebar_class_init (EBookShellSidebarClass *class)
 		PROP_SELECTOR,
 		g_param_spec_object (
 			"selector",
-			_("Source Selector Widget"),
-			_("This widget displays groups of address books"),
+			"Source Selector Widget",
+			"This widget displays groups of address books",
 			E_TYPE_SOURCE_SELECTOR,
 			G_PARAM_READABLE));
 }
diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index 0e4b58ffb2..6bb9d7036b 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -259,6 +259,7 @@ action_address_book_save_as_cb (GtkAction *action,
 
 	string = eab_suggest_filename (list);
 	file = e_shell_run_save_dialog (
+		/* Translators: This is a save dialog title */
 		shell, _("Save as vCard"), string,
 		"*.vcf:text/x-vcard,text/directory", NULL, NULL);
 	g_free (string);
@@ -536,6 +537,7 @@ action_contact_save_as_cb (GtkAction *action,
 
 	string = eab_suggest_filename (list);
 	file = e_shell_run_save_dialog (
+		/* Translators: This is a save dialog title */
 		shell, _("Save as vCard"), string,
 		"*.vcf:text/x-vcard,text/directory", NULL, NULL);
 	g_free (string);
@@ -808,6 +810,7 @@ static EPopupActionEntry contact_popup_entries[] = {
 	  "address-book-rename" },
 
 	{ "address-book-popup-save-as",
+	  /* Translators: This is an action label */
 	  N_("_Save as vCard..."),
 	  "address-book-save-as" },
 
@@ -953,7 +956,8 @@ static GtkActionEntry lockdown_save_to_disk_entries[] = {
 
 	{ "contact-save-as",
 	  GTK_STOCK_SAVE_AS,
-	  N_("Save as vCard..."),
+	  /* Translators: This is an action label */
+	  N_("_Save as vCard..."),
 	  NULL,
 	  N_("Save selected contacts as a vCard"),
 	  G_CALLBACK (action_contact_save_as_cb) }
diff --git a/modules/addressbook/e-book-shell-view.c b/modules/addressbook/e-book-shell-view.c
index 3ecea2c49f..e7b1c7b0b0 100644
--- a/modules/addressbook/e-book-shell-view.c
+++ b/modules/addressbook/e-book-shell-view.c
@@ -299,6 +299,10 @@ book_shell_view_update_actions (EShellView *shell_view)
 	any_contacts_selected =
 		(single_contact_selected || multiple_contacts_selected);
 
+	action = ACTION (ADDRESS_BOOK_MOVE);
+	sensitive = source_is_editable;
+	gtk_action_set_sensitive (action, sensitive);
+
 	action = ACTION (ADDRESS_BOOK_DELETE);
 	sensitive = can_delete_primary_source;
 	gtk_action_set_sensitive (action, sensitive);
diff --git a/modules/addressbook/eab-composer-util.c b/modules/addressbook/eab-composer-util.c
index a54f5fbf7d..968a6b3c06 100644
--- a/modules/addressbook/eab-composer-util.c
+++ b/modules/addressbook/eab-composer-util.c
@@ -150,7 +150,7 @@ eab_send_as_attachment (GList *destinations)
 	camel_mime_part_set_disposition (attachment, "attachment");
 
 	e_msg_composer_attach (composer, attachment);
-	camel_object_unref (attachment);
+	g_object_unref (attachment);
 
 	if (destinations->next != NULL)
 		e_composer_header_table_set_subject (
diff --git a/modules/addressbook/ldap-config.ui b/modules/addressbook/ldap-config.ui
index c76031deb8..a82e4689d0 100644
--- a/modules/addressbook/ldap-config.ui
+++ b/modules/addressbook/ldap-config.ui
@@ -38,13 +38,13 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">389</col>
+        <col id="0" translatable="no">389</col>
       </row>
       <row>
-        <col id="0" translatable="yes">636</col>
+        <col id="0" translatable="no">636</col>
       </row>
       <row>
-        <col id="0" translatable="yes">3268</col>
+        <col id="0" translatable="no">3268</col>
       </row>
     </data>
   </object>
@@ -568,7 +568,7 @@
         <child>
           <object class="GtkLabel" id="label575">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">1</property>
+            <property name="label" translatable="yes" comments="Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option">1</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -590,7 +590,7 @@
         <child>
           <object class="GtkLabel" id="label576">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">5</property>
+            <property name="label" translatable="yes" comments="Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option">5</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -610,7 +610,7 @@
       <object class="GtkLabel" id="label574">
         <property name="visible">True</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">minutes</property>
+        <property name="label" translatable="yes" comments="Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option">minutes</property>
       </object>
       <packing>
         <property name="left_attach">2</property>
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index bbabb6cfb2..0beb1285fa 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -7,6 +7,7 @@ libevolution_module_calendar_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
+	$(CAMEL_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
index b532af85e5..ce88a18267 100644
--- a/modules/calendar/e-cal-attachment-handler.c
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -24,7 +24,7 @@
 #include <glib/gi18n.h>
 #include <libical/ical.h>
 #include <libecal/e-cal.h>
-#include <camel/camel-stream-mem.h>
+#include <camel/camel.h>
 #include <libedataserverui/e-source-selector.h>
 
 #include "calendar/common/authentication.h"
@@ -79,9 +79,9 @@ attachment_handler_get_component (EAttachment *attachment)
 	buffer = g_byte_array_new ();
 	stream = camel_stream_mem_new ();
 	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), buffer);
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+	wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 	camel_data_wrapper_decode_to_stream (wrapper, stream);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	component = e_cal_util_parse_ics_string ((gchar *) buffer->data);
 
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index 278190eefa..e1f682357c 100644
--- a/modules/calendar/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
@@ -783,8 +783,8 @@ cal_shell_backend_class_init (ECalShellBackendClass *class)
 		PROP_SOURCE_LIST,
 		g_param_spec_object (
 			"source-list",
-			_("Source List"),
-			_("The registry of calendars"),
+			"Source List",
+			"The registry of calendars",
 			E_TYPE_SOURCE_LIST,
 			G_PARAM_READABLE));
 }
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 99fb717c90..a51a072f66 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -200,11 +200,15 @@ e_cal_shell_content_save_state (ECalShellContent *cal_shell_content)
 
 	priv = E_CAL_SHELL_CONTENT_GET_PRIVATE (cal_shell_content);
 
-	if (priv->task_table)
-		cal_shell_content_save_table_state (E_SHELL_CONTENT (cal_shell_content), E_TABLE (priv->task_table));
+	if (priv->task_table != NULL)
+		cal_shell_content_save_table_state (
+			E_SHELL_CONTENT (cal_shell_content),
+			E_TABLE (priv->task_table));
 
 	if (priv->memo_table != NULL)
-		cal_shell_content_save_table_state (E_SHELL_CONTENT (cal_shell_content), E_TABLE (priv->memo_table));
+		cal_shell_content_save_table_state (
+			E_SHELL_CONTENT (cal_shell_content),
+			E_TABLE (priv->memo_table));
 }
 
 static void
diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c
index f307522a9b..c7511f69f8 100644
--- a/modules/calendar/e-cal-shell-migrate.c
+++ b/modules/calendar/e-cal-shell-migrate.c
@@ -36,8 +36,6 @@
 #include <libedataserver/e-source-list.h>
 #include <libedataserver/e-xml-hash-utils.h>
 
-#include "e-util/e-bconf-map.h"
-#include "e-util/e-folder-map.h"
 #include "e-util/e-util-private.h"
 #include "calendar/gui/calendar-config.h"
 #include "calendar/gui/calendar-config-keys.h"
@@ -49,427 +47,6 @@
 #define BAD_CONTACTS_BASE_URI "contact://"
 #define PERSONAL_RELATIVE_URI "system"
 
-static e_gconf_map_t calendar_display_map[] = {
-	/* /Calendar/Display */
-	{ "Timezone", "calendar/display/timezone", E_GCONF_MAP_STRING },
-	{ "Use24HourFormat", "calendar/display/use_24hour_format", E_GCONF_MAP_BOOL },
-	{ "WeekStartDay", "calendar/display/week_start_day", E_GCONF_MAP_INT },
-	{ "DayStartHour", "calendar/display/day_start_hour", E_GCONF_MAP_INT },
-	{ "DayStartMinute", "calendar/display/day_start_minute", E_GCONF_MAP_INT },
-	{ "DayEndHour", "calendar/display/day_end_hour", E_GCONF_MAP_INT },
-	{ "DayEndMinute", "calendar/display/day_end_minute", E_GCONF_MAP_INT },
-	{ "TimeDivisions", "calendar/display/time_divisions", E_GCONF_MAP_INT },
-	{ "View", "calendar/display/default_view", E_GCONF_MAP_INT },
-	{ "HPanePosition", "calendar/display/hpane_position", E_GCONF_MAP_FLOAT },
-	{ "VPanePosition", "calendar/display/vpane_position", E_GCONF_MAP_FLOAT },
-	{ "MonthHPanePosition", "calendar/display/month_hpane_position", E_GCONF_MAP_FLOAT },
-	{ "MonthVPanePosition", "calendar/display/month_vpane_position", E_GCONF_MAP_FLOAT },
-	{ "CompressWeekend", "calendar/display/compress_weekend", E_GCONF_MAP_BOOL },
-	{ "ShowEventEndTime", "calendar/display/show_event_end", E_GCONF_MAP_BOOL },
-	{ "WorkingDays", "calendar/display/working_days", E_GCONF_MAP_INT },
-	{ NULL },
-};
-
-static e_gconf_map_t calendar_other_map[] = {
-	/* /Calendar/Other */
-	{ "ConfirmDelete", "calendar/prompts/confirm_delete", E_GCONF_MAP_BOOL },
-	{ "ConfirmExpunge", "calendar/prompts/confirm_purge", E_GCONF_MAP_BOOL },
-	{ "UseDefaultReminder", "calendar/other/use_default_reminder", E_GCONF_MAP_BOOL },
-	{ "DefaultReminderInterval", "calendar/other/default_reminder_interval", E_GCONF_MAP_INT },
-	{ "DefaultReminderUnits", "calendar/other/default_reminder_units", E_GCONF_MAP_STRING },
-	{ NULL },
-};
-
-static e_gconf_map_t calendar_datenavigator_map[] = {
-	/* /Calendar/DateNavigator */
-	{ "ShowWeekNumbers", "calendar/display/show_week_numbers", E_GCONF_MAP_BOOL },
-	{ NULL },
-};
-
-static e_gconf_map_t calendar_alarmnotify_map[] = {
-	/* /Calendar/AlarmNotify */
-	{ "LastNotificationTime", "calendar/notify/last_notification_time", E_GCONF_MAP_INT },
-	{ "CalendarToLoad%i", "calendar/notify/calendars", E_GCONF_MAP_STRING|E_GCONF_MAP_LIST },
-	{ "BlessedProgram%i", "calendar/notify/programs", E_GCONF_MAP_STRING|E_GCONF_MAP_LIST },
-	{ NULL },
-};
-
-static e_gconf_map_list_t calendar_remap_list[] = {
-
-	{ "/Calendar/Display", calendar_display_map },
-	{ "/Calendar/Other/Map", calendar_other_map },
-	{ "/Calendar/DateNavigator", calendar_datenavigator_map },
-	{ "/Calendar/AlarmNotify", calendar_alarmnotify_map },
-
-	{ NULL },
-};
-
-static GtkWidget *window;
-static GtkLabel *label;
-static GtkProgressBar *progress;
-
-#ifndef G_OS_WIN32
-
-/* No previous versions have been available on Win32, so don't
- * bother with upgrade support from 1.x on Win32.
- */
-
-static void
-setup_progress_dialog (void)
-{
-	GtkWidget *vbox, *hbox, *w;
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title ((GtkWindow *) window, _("Migrating..."));
-	gtk_window_set_modal ((GtkWindow *) window, TRUE);
-	gtk_container_set_border_width ((GtkContainer *) window, 6);
-
-	vbox = gtk_vbox_new (FALSE, 6);
-	gtk_widget_show (vbox);
-	gtk_container_add ((GtkContainer *) window, vbox);
-
-	w = gtk_label_new (_("The location and hierarchy of the Evolution calendar "
-			     "folders has changed since Evolution 1.x.\n\nPlease be "
-			     "patient while Evolution migrates your folders..."));
-
-	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
-	gtk_widget_show (w);
-	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0);
-
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0);
-
-	label = (GtkLabel *) gtk_label_new ("");
-	gtk_widget_show ((GtkWidget *) label);
-	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0);
-
-	progress = (GtkProgressBar *) gtk_progress_bar_new ();
-	gtk_widget_show ((GtkWidget *) progress);
-	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0);
-
-	gtk_widget_show (window);
-}
-
-static void
-dialog_close (void)
-{
-	gtk_widget_destroy ((GtkWidget *) window);
-}
-
-static void
-dialog_set_folder_name (const gchar *folder_name)
-{
-	gchar *text;
-
-	text = g_strdup_printf (_("Migrating '%s':"), folder_name);
-	gtk_label_set_text (label, text);
-	g_free (text);
-
-	gtk_progress_bar_set_fraction (progress, 0.0);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static void
-dialog_set_progress (double percent)
-{
-	gchar text[5];
-
-	snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f));
-
-	gtk_progress_bar_set_fraction (progress, percent);
-	gtk_progress_bar_set_text (progress, text);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static gboolean
-check_for_conflict (ESourceGroup *group, gchar *name)
-{
-	GSList *sources;
-	GSList *s;
-
-	sources = e_source_group_peek_sources (group);
-
-	for (s = sources; s; s = s->next) {
-		ESource *source = E_SOURCE (s->data);
-
-		if (!strcmp (e_source_peek_name (source), name))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gchar *
-get_source_name (ESourceGroup *group, const gchar *path)
-{
-	gchar **p = g_strsplit (path, "/", 0);
-	gint i, j, starting_index;
-	gint num_elements;
-	gboolean conflict;
-	GString *s = g_string_new (NULL);
-
-	for (i = 0; p[i]; i ++);
-
-	num_elements = i;
-	i--;
-
-	/* p[i] is now the last path element */
-
-	/* check if it conflicts */
-	starting_index = i;
-	do {
-		for (j = starting_index; j < num_elements; j += 2) {
-			if (j != starting_index)
-				g_string_append_c (s, '_');
-			g_string_append (s, p[j]);
-		}
-
-		conflict = check_for_conflict (group, s->str);
-
-		/* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */
-		if (conflict)
-			starting_index -= 2;
-
-		/* we always break out if we can't go any further,
-		   regardless of whether or not we conflict. */
-		if (starting_index < 0)
-			break;
-
-	} while (conflict);
-	g_strfreev (p);
-
-	return g_string_free (s, FALSE);
-}
-
-static gboolean
-migrate_ical (ECal *old_ecal, ECal *new_ecal)
-{
-	GList *l, *objects;
-	gint num_added = 0;
-	gint num_objects;
-	gboolean retval = TRUE;
-
-	/* both ecals are loaded, start the actual migration */
-	if (!e_cal_get_object_list (old_ecal, "#t", &objects, NULL))
-		return FALSE;
-
-	num_objects = g_list_length (objects);
-	for (l = objects; l; l = l->next) {
-		icalcomponent *ical_comp = l->data;
-		GError *error = NULL;
-
-		if (!e_cal_create_object (new_ecal, ical_comp, NULL, &error)) {
-			g_warning ("Migration of object failed: %s", error->message);
-			retval = FALSE;
-		}
-
-		g_clear_error (&error);
-
-		num_added ++;
-		dialog_set_progress ((double)num_added / num_objects);
-	}
-
-	g_list_foreach (objects, (GFunc) icalcomponent_free, NULL);
-	g_list_free (objects);
-
-	return retval;
-}
-
-static gboolean
-migrate_ical_folder_to_source (gchar *old_path, ESource *new_source, ECalSourceType type)
-{
-	ECal *old_ecal = NULL, *new_ecal = NULL;
-	ESource *old_source;
-	ESourceGroup *group;
-	gchar *old_uri = g_strdup_printf ("file://%s", old_path);
-	GError *error = NULL;
-	gboolean retval = FALSE;
-
-	group = e_source_group_new ("", old_uri);
-	old_source = e_source_new ("", "");
-	e_source_group_add_source (group, old_source, -1);
-
-	dialog_set_folder_name (e_source_peek_name (new_source));
-
-	if (!(old_ecal = e_cal_new (old_source, type))) {
-		g_warning ("could not find a backend for '%s'", e_source_get_uri (old_source));
-		goto finish;
-	}
-	if (!e_cal_open (old_ecal, FALSE, &error)) {
-		g_warning ("failed to load source ecal for migration: '%s' (%s)", error->message,
-			   e_source_get_uri (old_source));
-		goto finish;
-	}
-
-	if (!(new_ecal = e_cal_new (new_source, type))) {
-		g_warning ("could not find a backend for '%s'", e_source_get_uri (new_source));
-		goto finish;
-	}
-	if (!e_cal_open (new_ecal, FALSE, &error)) {
-		g_warning ("failed to load destination ecal for migration: '%s' (%s)", error->message,
-			   e_source_get_uri (new_source));
-		goto finish;
-	}
-
-	retval = migrate_ical (old_ecal, new_ecal);
-
-finish:
-	g_clear_error (&error);
-	if (old_ecal)
-		g_object_unref (old_ecal);
-	g_object_unref (group);
-	if (new_ecal)
-		g_object_unref (new_ecal);
-	g_free (old_uri);
-
-	return retval;
-}
-
-static gboolean
-migrate_ical_folder (gchar *old_path, ESourceGroup *dest_group, gchar *source_name, ECalSourceType type)
-{
-	ESource *new_source;
-	gboolean retval;
-
-	new_source = e_source_new (source_name, source_name);
-	e_source_set_relative_uri (new_source, e_source_peek_uid (new_source));
-	e_source_group_add_source (dest_group, new_source, -1);
-
-	retval = migrate_ical_folder_to_source (old_path, new_source, type);
-
-	g_object_unref (new_source);
-
-	return retval;
-}
-
-#endif	/* !G_OS_WIN32 */
-
-#ifndef G_OS_WIN32
-
-static void
-migrate_pilot_db_key (const gchar *key, gpointer user_data)
-{
-	EXmlHash *xmlhash = user_data;
-
-	e_xmlhash_add (xmlhash, key, "");
-}
-
-static void
-migrate_pilot_data (const gchar *component, const gchar *conduit, const gchar *old_path, const gchar *new_path)
-{
-	gchar *changelog, *map;
-	const gchar *dent;
-	const gchar *ext;
-	gchar *filename;
-	GDir *dir;
-
-	if (!(dir = g_dir_open (old_path, 0, NULL)))
-		return;
-
-	map = g_alloca (12 + strlen (conduit));
-	sprintf (map, "pilot-map-%s-", conduit);
-
-	changelog = g_alloca (24 + strlen (conduit));
-	sprintf (changelog, "pilot-sync-evolution-%s-", conduit);
-
-	while ((dent = g_dir_read_name (dir))) {
-		if (!strncmp (dent, map, strlen (map)) &&
-		    ((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) {
-			/* pilot map file - src and dest file formats are identical */
-			guchar inbuf[4096];
-			gsize nread, nwritten;
-			gint fd0, fd1;
-			gssize n;
-
-			filename = g_build_filename (old_path, dent, NULL);
-			if ((fd0 = g_open (filename, O_RDONLY|O_BINARY, 0)) == -1) {
-				g_free (filename);
-				continue;
-			}
-
-			g_free (filename);
-			filename = g_build_filename (new_path, dent, NULL);
-			if ((fd1 = g_open (filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666)) == -1) {
-				g_free (filename);
-				close (fd0);
-				continue;
-			}
-
-			do {
-				do {
-					n = read (fd0, inbuf, sizeof (inbuf));
-				} while (n == -1 && errno == EINTR);
-
-				if (n < 1)
-					break;
-
-				nread = n;
-				nwritten = 0;
-				do {
-					do {
-						n = write (fd1, inbuf + nwritten, nread - nwritten);
-					} while (n == -1 && errno == EINTR);
-
-					if (n > 0)
-						nwritten += n;
-				} while (nwritten < nread && n != -1);
-
-				if (n == -1)
-					break;
-			} while (1);
-
-			if (n != -1)
-				n = fsync (fd1);
-
-			if (n == -1) {
-				g_warning ("Failed to migrate %s: %s", dent, strerror (errno));
-				g_unlink (filename);
-			}
-
-			close (fd0);
-			close (fd1);
-			g_free (filename);
-		} else if (!strncmp (dent, changelog, strlen (changelog)) &&
-			   ((ext = strrchr (dent, '.')) && !strcmp (ext, ".db"))) {
-			/* src and dest formats differ, src format is db3 while dest format is xml */
-			EXmlHash *xmlhash;
-			EDbHash *dbhash;
-			struct stat st;
-
-			filename = g_build_filename (old_path, dent, NULL);
-			if (g_stat (filename, &st) == -1) {
-				g_free (filename);
-				continue;
-			}
-
-			dbhash = e_dbhash_new (filename);
-			g_free (filename);
-
-			filename = g_strdup_printf ("%s/%s.ics-%s", new_path, component, dent);
-			if (g_stat (filename, &st) != -1)
-				g_unlink (filename);
-			xmlhash = e_xmlhash_new (filename);
-			g_free (filename);
-
-			e_dbhash_foreach_key (dbhash, migrate_pilot_db_key, xmlhash);
-
-			e_dbhash_destroy (dbhash);
-
-			e_xmlhash_write (xmlhash);
-			e_xmlhash_destroy (xmlhash);
-		}
-	}
-
-	g_dir_close (dir);
-}
-
-#endif
-
 static ESourceGroup *
 create_calendar_contact_source (ESourceList *source_list)
 {
@@ -624,7 +201,6 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend,
 	ESourceList *source_list;
 	ECalEvent *ece;
 	ECalEventTargetBackend *target;
-	gboolean retval = FALSE;
 
 	g_object_get (shell_backend, "source-list", &source_list, NULL);
 
@@ -635,133 +211,6 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend,
 		shell_backend, source_list, &on_this_computer,
 		&personal_source, &on_the_web, &contacts);
 
-#ifndef G_OS_WIN32
-	if (major == 1) {
-		xmlDocPtr config_doc = NULL;
-		gchar *conf_file;
-		struct stat st;
-
-		conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL);
-		if (lstat (conf_file, &st) == 0 && S_ISREG (st.st_mode))
-			config_doc = xmlParseFile (conf_file);
-		g_free (conf_file);
-
-		if (config_doc && minor <= 2) {
-			GConfClient *gconf;
-			gint res = 0;
-
-			/* move bonobo config to gconf */
-			gconf = gconf_client_get_default ();
-
-			res = e_bconf_import (gconf, config_doc, calendar_remap_list);
-
-			g_object_unref (gconf);
-
-			xmlFreeDoc(config_doc);
-
-			if (res != 0) {
-				/* FIXME: set proper domain/code */
-				g_set_error(error, 0, 0, _("Unable to migrate old settings from evolution/config.xmldb"));
-				goto fail;
-			}
-		}
-
-		if (minor <= 4) {
-			GSList *migration_dirs, *l;
-			gchar *path, *local_cal_folder;
-
-			setup_progress_dialog ();
-
-			path = g_build_filename (g_get_home_dir (), "evolution", "local", NULL);
-			migration_dirs = e_folder_map_local_folders (path, "calendar");
-			local_cal_folder = g_build_filename (path, "Calendar", NULL);
-			g_free (path);
-
-			if (personal_source)
-				migrate_ical_folder_to_source (local_cal_folder, personal_source, E_CAL_SOURCE_TYPE_EVENT);
-
-			for (l = migration_dirs; l; l = l->next) {
-				gchar *source_name;
-
-				if (personal_source && !strcmp ((gchar *)l->data, local_cal_folder))
-					continue;
-
-				source_name = get_source_name (on_this_computer, (gchar *)l->data);
-
-				if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_EVENT)) {
-					/* FIXME: domain/code */
-					g_set_error(error, 0, 0, _("Unable to migrate calendar '%s'"), source_name);
-					g_free(source_name);
-					goto fail;
-				}
-
-				g_free (source_name);
-			}
-
-			g_free (local_cal_folder);
-
-			dialog_close ();
-		}
-
-		if (minor <= 4 || (minor == 5 && micro < 5)) {
-			GConfClient *gconf;
-			GConfValue *gconf_val;
-			gint i;
-			const gchar *keys[] = {
-				CALENDAR_CONFIG_HPANE_POS,
-				CALENDAR_CONFIG_VPANE_POS,
-				CALENDAR_CONFIG_MONTH_HPANE_POS,
-				CALENDAR_CONFIG_MONTH_VPANE_POS,
-				NULL
-			};
-
-			gconf = gconf_client_get_default ();
-
-			for (i = 0; keys[i]; i++) {
-				gconf_val = gconf_client_get (gconf, keys[i], NULL);
-				if (gconf_val) {
-					if (gconf_val->type != GCONF_VALUE_INT)
-						gconf_client_unset (gconf, keys[i], NULL);
-					gconf_value_free (gconf_val);
-				}
-			}
-
-			g_object_unref (gconf);
-		}
-
-		if (minor < 5 || (minor == 5 && micro <= 10)) {
-			gchar *old_path, *new_path;
-
-			old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Calendar", NULL);
-			new_path = g_build_filename (e_shell_backend_get_data_dir (shell_backend),
-						     "local", "system", NULL);
-			migrate_pilot_data ("calendar", "calendar", old_path, new_path);
-			g_free (new_path);
-			g_free (old_path);
-		}
-
-		/* we only need to do this next step if people ran
-		   older versions of 1.5.  We need to clear out the
-		   absolute URI's that were assigned to ESources
-		   during one phase of development, as they take
-		   precedent over relative uris (but aren't updated
-		   when editing an ESource). */
-		if (minor == 5 && micro <= 11) {
-			GSList *g;
-			for (g = e_source_list_peek_groups (source_list); g; g = g->next) {
-				ESourceGroup *group = g->data;
-				GSList *s;
-
-				for (s = e_source_group_peek_sources (group); s; s = s->next) {
-					ESource *source = s->data;
-					e_source_set_absolute_uri (source, NULL);
-				}
-			}
-		}
-
-	}
-#endif	/* !G_OS_WIN32 */
-
 	e_source_list_sync (source_list, NULL);
 
 	/** @Event: component.migration
@@ -778,8 +227,6 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend,
 	target = e_cal_event_target_new_module (ece, shell_backend, source_list, 0);
 	e_event_emit ((EEvent *) ece, "module.migration", (EEventTarget *) target);
 
-	retval = TRUE;
-fail:
 	if (on_this_computer)
 		g_object_unref (on_this_computer);
 	if (on_the_web)
@@ -789,6 +236,6 @@ fail:
 	if (personal_source)
 		g_object_unref (personal_source);
 
-	return retval;
+	return TRUE;
 }
 
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index 4545c88c3a..9491d3fee2 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -278,9 +278,15 @@ static void
 cal_shell_sidebar_set_default (ECalShellSidebar *cal_shell_sidebar,
                                ESource *source)
 {
+	EShellView *shell_view;
+	EShellContent *shell_content;
+	EShellSidebar *shell_sidebar;
+	ECalShellContent *cal_shell_content;
 	ECalSourceType source_type;
 	GHashTable *client_table;
+	ECalModel *model;
 	ECal *client;
+	icaltimezone *timezone;
 	const gchar *uid;
 
 	source_type = E_CAL_SOURCE_TYPE_EVENT;
@@ -305,7 +311,17 @@ cal_shell_sidebar_set_default (ECalShellSidebar *cal_shell_sidebar,
 		G_CALLBACK (cal_shell_sidebar_default_opened_cb),
 		cal_shell_sidebar);
 
-	e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_cal_shell_content_get_model (E_CAL_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (cal_shell_sidebar)))))), NULL);
+	/* FIXME Sidebar should not be accessing the EShellContent.
+	 *       This probably needs to be moved to ECalShellView. */
+	shell_sidebar = E_SHELL_SIDEBAR (cal_shell_sidebar);
+	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
+	shell_content = e_shell_view_get_shell_content (shell_view);
+
+	cal_shell_content = E_CAL_SHELL_CONTENT (shell_content);
+	model = e_cal_shell_content_get_model (cal_shell_content);
+	timezone = e_cal_model_get_timezone (model);
+
+	e_cal_set_default_timezone (client, timezone, NULL);
 	e_cal_open_async (client, FALSE);
 }
 
@@ -771,8 +787,8 @@ cal_shell_sidebar_class_init (ECalShellSidebarClass *class)
 		PROP_DATE_NAVIGATOR,
 		g_param_spec_object (
 			"date-navigator",
-			_("Date Navigator Widget"),
-			_("This widget displays a miniature calendar"),
+			"Date Navigator Widget",
+			"This widget displays a miniature calendar",
 			E_TYPE_CALENDAR,
 			G_PARAM_READABLE));
 
@@ -781,8 +797,8 @@ cal_shell_sidebar_class_init (ECalShellSidebarClass *class)
 		PROP_DEFAULT_CLIENT,
 		g_param_spec_object (
 			"default-client",
-			_("Default Calendar Client"),
-			_("Default client for calendar operations"),
+			"Default Calendar Client",
+			"Default client for calendar operations",
 			E_TYPE_CAL,
 			G_PARAM_READABLE));
 
@@ -791,8 +807,8 @@ cal_shell_sidebar_class_init (ECalShellSidebarClass *class)
 		PROP_SELECTOR,
 		g_param_spec_object (
 			"selector",
-			_("Source Selector Widget"),
-			_("This widget displays groups of calendars"),
+			"Source Selector Widget",
+			"This widget displays groups of calendars",
 			E_TYPE_SOURCE_SELECTOR,
 			G_PARAM_READABLE));
 
@@ -926,11 +942,17 @@ void
 e_cal_shell_sidebar_add_source (ECalShellSidebar *cal_shell_sidebar,
                                 ESource *source)
 {
+	EShellView *shell_view;
+	EShellContent *shell_content;
+	EShellSidebar *shell_sidebar;
+	ECalShellContent *cal_shell_content;
 	ECalSourceType source_type;
 	ESourceSelector *selector;
 	GHashTable *client_table;
+	ECalModel *model;
 	ECal *default_client;
 	ECal *client;
+	icaltimezone *timezone;
 	const gchar *uid;
 	const gchar *uri;
 	gchar *message;
@@ -989,7 +1011,17 @@ e_cal_shell_sidebar_add_source (ECalShellSidebar *cal_shell_sidebar,
 		G_CALLBACK (cal_shell_sidebar_client_opened_cb),
 		cal_shell_sidebar);
 
-	e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_cal_shell_content_get_model (E_CAL_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (cal_shell_sidebar)))))), NULL);
+	/* FIXME Sidebar should not be accessing the EShellContent.
+	 *       This probably needs to be moved to ECalShellView. */
+	shell_sidebar = E_SHELL_SIDEBAR (cal_shell_sidebar);
+	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
+	shell_content = e_shell_view_get_shell_content (shell_view);
+
+	cal_shell_content = E_CAL_SHELL_CONTENT (shell_content);
+	model = e_cal_shell_content_get_model (cal_shell_content);
+	timezone = e_cal_model_get_timezone (model);
+
+	e_cal_set_default_timezone (client, timezone, NULL);
 	e_cal_open_async (client, FALSE);
 }
 
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index 9510f066ef..19812751d8 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -512,7 +512,7 @@ action_event_copy_cb (GtkAction *action,
 	if (selected->data) {
 		ECalendarViewEvent *event = selected->data;
 
-		if (event && event->comp_data && event->comp_data->client)
+		if (is_comp_data_valid (event) && event->comp_data->client)
 			source_source = e_cal_get_source (event->comp_data->client);
 	}
 
@@ -577,6 +577,10 @@ action_event_delegate_cb (GtkAction *action,
 	g_return_if_fail (g_list_length (selected) == 1);
 
 	event = selected->data;
+
+	if (!is_comp_data_valid (event))
+		return;
+
 	client = event->comp_data->client;
 	clone = icalcomponent_new_clone (event->comp_data->icalcomp);
 
@@ -707,6 +711,10 @@ action_event_forward_cb (GtkAction *action,
 	g_return_if_fail (g_list_length (selected) == 1);
 
 	event = selected->data;
+
+	if (!is_comp_data_valid (event))
+		return;
+
 	client = event->comp_data->client;
 	icalcomp = event->comp_data->icalcomp;
 
@@ -774,7 +782,7 @@ action_event_move_cb (GtkAction *action,
 	if (selected->data) {
 		ECalendarViewEvent *event = selected->data;
 
-		if (event && event->comp_data && event->comp_data->client)
+		if (is_comp_data_valid (event) && event->comp_data->client)
 			source_source = e_cal_get_source (event->comp_data->client);
 	}
 
@@ -863,6 +871,10 @@ action_event_occurrence_movable_cb (GtkAction *action,
 	g_return_if_fail (g_list_length (selected) == 1);
 
 	event = selected->data;
+
+	if (!is_comp_data_valid (event))
+		return;
+
 	client = event->comp_data->client;
 	icalcomp = event->comp_data->icalcomp;
 
@@ -961,6 +973,10 @@ action_event_print_cb (GtkAction *action,
 	g_return_if_fail (g_list_length (selected) == 1);
 
 	event = selected->data;
+
+	if (!is_comp_data_valid (event))
+		return;
+
 	client = event->comp_data->client;
 	icalcomp = event->comp_data->icalcomp;
 
@@ -1000,6 +1016,10 @@ action_event_reply_cb (GtkAction *action,
 	g_return_if_fail (g_list_length (selected) == 1);
 
 	event = selected->data;
+
+	if (!is_comp_data_valid (event))
+		return;
+
 	client = event->comp_data->client;
 	icalcomp = event->comp_data->icalcomp;
 
@@ -1040,6 +1060,10 @@ action_event_reply_all_cb (GtkAction *action,
 	g_return_if_fail (g_list_length (selected) == 1);
 
 	event = selected->data;
+
+	if (!is_comp_data_valid (event))
+		return;
+
 	client = event->comp_data->client;
 	icalcomp = event->comp_data->icalcomp;
 
@@ -1090,6 +1114,10 @@ action_event_save_as_cb (GtkAction *action,
 	g_return_if_fail (g_list_length (selected) == 1);
 
 	event = selected->data;
+
+	if (!is_comp_data_valid (event))
+		return;
+
 	client = event->comp_data->client;
 	icalcomp = event->comp_data->icalcomp;
 
@@ -1148,6 +1176,10 @@ edit_event_as (ECalShellView *cal_shell_view, gboolean as_meeting)
 	g_return_if_fail (g_list_length (selected) == 1);
 
 	event = selected->data;
+
+	if (!is_comp_data_valid (event))
+		return;
+
 	client = event->comp_data->client;
 	icalcomp = event->comp_data->icalcomp;
 
@@ -1216,6 +1248,26 @@ quit_calendar_cb (GtkAction *action,
 }
 
 static void
+quit_calendar_cb (GtkAction *action,
+                          ECalShellView *cal_shell_view)
+{
+	EShellView *shell_view;
+	EShellWindow *shell_window;
+	GdkEvent *event;
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	/* Synthesize a delete_event on this window. */
+	event = gdk_event_new (GDK_DELETE);
+	event->any.window = g_object_ref (gtk_widget_get_window (GTK_WIDGET (shell_window)));
+	event->any.send_event = TRUE;
+	gtk_main_do_event (event);
+	gdk_event_free (event);
+
+}
+
+static void
 action_event_schedule_appointment_cb (GtkAction *action,
                           ECalShellView *cal_shell_view)
 {
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 43b8ae61cd..11b6ec243d 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -690,6 +690,10 @@ e_cal_shell_view_private_dispose (ECalShellView *cal_shell_view)
 	if (priv->cal_shell_content)
 		e_cal_shell_content_save_state (priv->cal_shell_content);
 
+	/* Calling calendar's save state from here, because it is too late in its dispose */
+	if (priv->cal_shell_content)
+		e_cal_shell_content_save_state (priv->cal_shell_content);
+
 	DISPOSE (priv->cal_shell_backend);
 	DISPOSE (priv->cal_shell_content);
 	DISPOSE (priv->cal_shell_sidebar);
@@ -834,6 +838,9 @@ e_cal_shell_view_transfer_item_to (ECalShellView *cal_shell_view,
 	g_return_if_fail (event != NULL);
 	g_return_if_fail (E_IS_CAL (destination_client));
 
+	if (!is_comp_data_valid (event))
+		return;
+
 	icalcomp_event = event->comp_data->icalcomp;
 	uid = icalcomponent_get_uid (icalcomp_event);
 
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index c4f52de83a..218bd7d4da 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -341,7 +341,7 @@ cal_shell_view_update_actions (EShellView *shell_view)
 		gboolean user_org = FALSE;
 		gboolean read_only = TRUE;
 
-		if (!event || !event->comp_data)
+		if (!is_comp_data_valid (event))
 			continue;
 
 		client = event->comp_data->client;
@@ -497,6 +497,10 @@ cal_shell_view_class_init (ECalShellViewClass *class,
 	shell_view_class->new_shell_sidebar = e_cal_shell_sidebar_new;
 	shell_view_class->execute_search = cal_shell_view_execute_search;
 	shell_view_class->update_actions = cal_shell_view_update_actions;
+
+	if (e_shell_get_express_mode(e_shell_get_default()))
+		shell_view_class->construct_searchbar = NULL;
+
 }
 
 static void
diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c
index b0635b6e38..a51a5fc98e 100644
--- a/modules/calendar/e-memo-shell-backend.c
+++ b/modules/calendar/e-memo-shell-backend.c
@@ -584,8 +584,8 @@ memo_shell_backend_class_init (EMemoShellBackendClass *class)
 		PROP_SOURCE_LIST,
 		g_param_spec_object (
 			"source-list",
-			_("Source List"),
-			_("The registry of memo lists"),
+			"Source List",
+			"The registry of memo lists",
 			E_TYPE_SOURCE_LIST,
 			G_PARAM_READABLE));
 }
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c
index d56a6105d1..279f063035 100644
--- a/modules/calendar/e-memo-shell-content.c
+++ b/modules/calendar/e-memo-shell-content.c
@@ -604,8 +604,8 @@ memo_shell_content_class_init (EMemoShellContentClass *class)
 		PROP_MODEL,
 		g_param_spec_object (
 			"model",
-			_("Model"),
-			_("The memo table model"),
+			"Model",
+			"The memo table model",
 			E_TYPE_CAL_MODEL,
 			G_PARAM_READABLE));
 
@@ -614,8 +614,8 @@ memo_shell_content_class_init (EMemoShellContentClass *class)
 		PROP_PREVIEW_VISIBLE,
 		g_param_spec_boolean (
 			"preview-visible",
-			_("Preview is Visible"),
-			_("Whether the preview pane is visible"),
+			"Preview is Visible",
+			"Whether the preview pane is visible",
 			TRUE,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));
diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c
index 3c52672063..771a889845 100644
--- a/modules/calendar/e-memo-shell-migrate.c
+++ b/modules/calendar/e-memo-shell-migrate.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
 #include <libedataserver/e-source.h>
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index 3e14f6a9c0..416759213e 100644
--- a/modules/calendar/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
@@ -272,9 +272,15 @@ static void
 memo_shell_sidebar_set_default (EMemoShellSidebar *memo_shell_sidebar,
                                 ESource *source)
 {
+	EShellView *shell_view;
+	EShellContent *shell_content;
+	EShellSidebar *shell_sidebar;
+	EMemoShellContent *memo_shell_content;
 	ECalSourceType source_type;
 	GHashTable *client_table;
+	ECalModel *model;
 	ECal *client;
+	icaltimezone *timezone;
 	const gchar *uid;
 
 	source_type = E_CAL_SOURCE_TYPE_JOURNAL;
@@ -299,7 +305,17 @@ memo_shell_sidebar_set_default (EMemoShellSidebar *memo_shell_sidebar,
 		G_CALLBACK (memo_shell_sidebar_default_opened_cb),
 		memo_shell_sidebar);
 
-	e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_memo_shell_content_get_memo_model (E_MEMO_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (memo_shell_sidebar)))))), NULL);
+	/* FIXME Sidebar should not be accessing the EShellContent.
+	 *       This probably needs to be moved to EMemoShellView. */
+	shell_sidebar = E_SHELL_SIDEBAR (memo_shell_sidebar);
+	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
+	shell_content = e_shell_view_get_shell_content (shell_view);
+
+	memo_shell_content = E_MEMO_SHELL_CONTENT (shell_content);
+	model = e_memo_shell_content_get_memo_model (memo_shell_content);
+	timezone = e_cal_model_get_timezone (model);
+
+	e_cal_set_default_timezone (client, timezone, NULL);
 	e_cal_open_async (client, FALSE);
 }
 
@@ -676,8 +692,8 @@ memo_shell_sidebar_class_init (EMemoShellSidebarClass *class)
 		PROP_DEFAULT_CLIENT,
 		g_param_spec_object (
 			"default-client",
-			_("Default Memo Client"),
-			_("Default client for memo operations"),
+			"Default Memo Client",
+			"Default client for memo operations",
 			E_TYPE_CAL,
 			G_PARAM_READABLE));
 
@@ -686,8 +702,8 @@ memo_shell_sidebar_class_init (EMemoShellSidebarClass *class)
 		PROP_SELECTOR,
 		g_param_spec_object (
 			"selector",
-			_("Source Selector Widget"),
-			_("This widget displays groups of memo lists"),
+			"Source Selector Widget",
+			"This widget displays groups of memo lists",
 			E_TYPE_SOURCE_SELECTOR,
 			G_PARAM_READABLE));
 
@@ -813,11 +829,17 @@ void
 e_memo_shell_sidebar_add_source (EMemoShellSidebar *memo_shell_sidebar,
                                  ESource *source)
 {
+	EShellView *shell_view;
+	EShellContent *shell_content;
+	EShellSidebar *shell_sidebar;
+	EMemoShellContent *memo_shell_content;
 	ECalSourceType source_type;
 	ESourceSelector *selector;
 	GHashTable *client_table;
+	ECalModel *model;
 	ECal *default_client;
 	ECal *client;
+	icaltimezone *timezone;
 	const gchar *uid;
 	const gchar *uri;
 	gchar *message;
@@ -876,7 +898,17 @@ e_memo_shell_sidebar_add_source (EMemoShellSidebar *memo_shell_sidebar,
 		G_CALLBACK (memo_shell_sidebar_client_opened_cb),
 		memo_shell_sidebar);
 
-	e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_memo_shell_content_get_memo_model (E_MEMO_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (memo_shell_sidebar)))))), NULL);
+	/* FIXME Sidebar should not be accessing the EShellContent.
+	 *       This probably needs to be moved to EMemoShellView. */
+	shell_sidebar = E_SHELL_SIDEBAR (memo_shell_sidebar);
+	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
+	shell_content = e_shell_view_get_shell_content (shell_view);
+
+	memo_shell_content = E_MEMO_SHELL_CONTENT (shell_content);
+	model = e_memo_shell_content_get_memo_model (memo_shell_content);
+	timezone = e_cal_model_get_timezone (model);
+
+	e_cal_set_default_timezone (client, timezone, NULL);
 	e_cal_open_async (client, FALSE);
 }
 
diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c
index e428c9413e..c5f0a9927a 100644
--- a/modules/calendar/e-task-shell-backend.c
+++ b/modules/calendar/e-task-shell-backend.c
@@ -594,8 +594,8 @@ task_shell_backend_class_init (ETaskShellBackendClass *class)
 		PROP_SOURCE_LIST,
 		g_param_spec_object (
 			"source-list",
-			_("Source List"),
-			_("The registry of task lists"),
+			"Source List",
+			"The registry of task lists",
 			E_TYPE_SOURCE_LIST,
 			G_PARAM_READABLE));
 }
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index 910b4da48e..fdbfa758a4 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -626,8 +626,8 @@ task_shell_content_class_init (ETaskShellContentClass *class)
 		PROP_MODEL,
 		g_param_spec_object (
 			"model",
-			_("Model"),
-			_("The task table model"),
+			"Model",
+			"The task table model",
 			E_TYPE_CAL_MODEL,
 			G_PARAM_READABLE));
 
@@ -636,8 +636,8 @@ task_shell_content_class_init (ETaskShellContentClass *class)
 		PROP_PREVIEW_VISIBLE,
 		g_param_spec_boolean (
 			"preview-visible",
-			_("Preview is Visible"),
-			_("Whether the preview pane is visible"),
+			"Preview is Visible",
+			"Whether the preview pane is visible",
 			TRUE,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));
diff --git a/modules/calendar/e-task-shell-migrate.c b/modules/calendar/e-task-shell-migrate.c
index 3c3210b472..9fe9870c73 100644
--- a/modules/calendar/e-task-shell-migrate.c
+++ b/modules/calendar/e-task-shell-migrate.c
@@ -37,8 +37,6 @@
 #include <libedataserver/e-xml-hash-utils.h>
 #include <libedataserver/e-xml-utils.h>
 
-#include "e-util/e-bconf-map.h"
-#include "e-util/e-folder-map.h"
 #include "e-util/e-util-private.h"
 #include "calendar/gui/calendar-config.h"
 #include "calendar/gui/calendar-config-keys.h"
@@ -47,396 +45,6 @@
 #define WEBCAL_BASE_URI "webcal://"
 #define PERSONAL_RELATIVE_URI "system"
 
-static e_gconf_map_t calendar_tasks_map[] = {
-	/* /Calendar/Tasks */
-	{ "HideCompletedTasks", "calendar/tasks/hide_completed", E_GCONF_MAP_BOOL },
-	{ "HideCompletedTasksUnits", "calendar/tasks/hide_completed_units", E_GCONF_MAP_STRING },
-	{ "HideCompletedTasksValue", "calendar/tasks/hide_completed_value", E_GCONF_MAP_INT },
-	{ NULL },
-};
-
-static e_gconf_map_t calendar_tasks_colours_map[] = {
-	/* /Calendar/Tasks/Colors */
-	{ "TasksDueToday", "calendar/tasks/colors/due_today", E_GCONF_MAP_STRING },
-	{ "TasksOverDue", "calendar/tasks/colors/overdue", E_GCONF_MAP_STRING },
-	{ "TasksDueToday", "calendar/tasks/colors/due_today", E_GCONF_MAP_STRING },
-	{ NULL },
-};
-
-static e_gconf_map_list_t task_remap_list[] = {
-
-	{ "/Calendar/Tasks", calendar_tasks_map },
-	{ "/Calendar/Tasks/Colors", calendar_tasks_colours_map },
-
-	{ NULL },
-};
-
-static GtkWidget *window;
-static GtkLabel *label;
-static GtkProgressBar *progress;
-
-#ifndef G_OS_WIN32
-
-/* No previous versions have been available on Win32, so don't
- * bother with upgrade support from 1.x on Win32.
- */
-
-static void
-setup_progress_dialog (void)
-{
-	GtkWidget *vbox, *hbox, *w;
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title ((GtkWindow *) window, _("Migrating..."));
-	gtk_window_set_modal ((GtkWindow *) window, TRUE);
-	gtk_container_set_border_width ((GtkContainer *) window, 6);
-
-	vbox = gtk_vbox_new (FALSE, 6);
-	gtk_widget_show (vbox);
-	gtk_container_add ((GtkContainer *) window, vbox);
-
-	w = gtk_label_new (_("The location and hierarchy of the Evolution task "
-			     "folders has changed since Evolution 1.x.\n\nPlease be "
-			     "patient while Evolution migrates your folders..."));
-
-	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
-	gtk_widget_show (w);
-	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0);
-
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0);
-
-	label = (GtkLabel *) gtk_label_new ("");
-	gtk_widget_show ((GtkWidget *) label);
-	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0);
-
-	progress = (GtkProgressBar *) gtk_progress_bar_new ();
-	gtk_widget_show ((GtkWidget *) progress);
-	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0);
-
-	gtk_widget_show (window);
-}
-
-static void
-dialog_close (void)
-{
-	gtk_widget_destroy ((GtkWidget *) window);
-}
-
-static void
-dialog_set_folder_name (const gchar *folder_name)
-{
-	gchar *text;
-
-	text = g_strdup_printf (_("Migrating '%s':"), folder_name);
-	gtk_label_set_text (label, text);
-	g_free (text);
-
-	gtk_progress_bar_set_fraction (progress, 0.0);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static void
-dialog_set_progress (double percent)
-{
-	gchar text[5];
-
-	snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f));
-
-	gtk_progress_bar_set_fraction (progress, percent);
-	gtk_progress_bar_set_text (progress, text);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static gboolean
-check_for_conflict (ESourceGroup *group, gchar *name)
-{
-	GSList *sources;
-	GSList *s;
-
-	sources = e_source_group_peek_sources (group);
-
-	for (s = sources; s; s = s->next) {
-		ESource *source = E_SOURCE (s->data);
-
-		if (!strcmp (e_source_peek_name (source), name))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gchar *
-get_source_name (ESourceGroup *group, const gchar *path)
-{
-	gchar **p = g_strsplit (path, "/", 0);
-	gint i, j, starting_index;
-	gint num_elements;
-	gboolean conflict;
-	GString *s = g_string_new (NULL);
-
-	for (i = 0; p[i]; i ++);
-
-	num_elements = i;
-	i--;
-
-	/* p[i] is now the last path element */
-
-	/* check if it conflicts */
-	starting_index = i;
-	do {
-		for (j = starting_index; j < num_elements; j += 2) {
-			if (j != starting_index)
-				g_string_append_c (s, '_');
-			g_string_append (s, p[j]);
-		}
-
-		conflict = check_for_conflict (group, s->str);
-
-		/* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */
-		if (conflict)
-			starting_index -= 2;
-
-		/* we always break out if we can't go any further,
-		   regardless of whether or not we conflict. */
-		if (starting_index < 0)
-			break;
-
-	} while (conflict);
-	g_strfreev (p);
-
-	return g_string_free (s, FALSE);
-}
-
-static gboolean
-migrate_ical (ECal *old_ecal, ECal *new_ecal)
-{
-	GList *l, *objects;
-	gint num_added = 0;
-	gint num_objects;
-	gboolean retval = TRUE;
-
-	/* both ecals are loaded, start the actual migration */
-	if (!e_cal_get_object_list (old_ecal, "#t", &objects, NULL))
-		return FALSE;
-
-	num_objects = g_list_length (objects);
-	for (l = objects; l; l = l->next) {
-		icalcomponent *ical_comp = l->data;
-		GError *error = NULL;
-
-		if (!e_cal_create_object (new_ecal, ical_comp, NULL, &error)) {
-			g_warning ("Migration of object failed: %s", error->message);
-			retval = FALSE;
-		}
-
-		g_clear_error (&error);
-
-		num_added ++;
-		dialog_set_progress ((double)num_added / num_objects);
-	}
-
-	g_list_foreach (objects, (GFunc) icalcomponent_free, NULL);
-	g_list_free (objects);
-
-	return retval;
-}
-
-static gboolean
-migrate_ical_folder_to_source (gchar *old_path, ESource *new_source, ECalSourceType type)
-{
-	ECal *old_ecal = NULL, *new_ecal = NULL;
-	ESource *old_source;
-	ESourceGroup *group;
-	gchar *old_uri = g_strdup_printf ("file://%s", old_path);
-	GError *error = NULL;
-	gboolean retval = FALSE;
-
-	group = e_source_group_new ("", old_uri);
-	old_source = e_source_new ("", "");
-	e_source_group_add_source (group, old_source, -1);
-
-	dialog_set_folder_name (e_source_peek_name (new_source));
-
-	if (!(old_ecal = e_cal_new (old_source, type))) {
-		g_warning ("could not find a backend for '%s'", e_source_get_uri (old_source));
-		goto finish;
-	}
-	if (!e_cal_open (old_ecal, FALSE, &error)) {
-		g_warning ("failed to load source ecal for migration: '%s' (%s)", error->message,
-			   e_source_get_uri (old_source));
-		goto finish;
-	}
-
-	if (!(new_ecal = e_cal_new (new_source, type))) {
-		g_warning ("could not find a backend for '%s'", e_source_get_uri (new_source));
-		goto finish;
-	}
-	if (!e_cal_open (new_ecal, FALSE, &error)) {
-		g_warning ("failed to load destination ecal for migration: '%s' (%s)", error->message,
-			   e_source_get_uri (new_source));
-		goto finish;
-	}
-
-	retval = migrate_ical (old_ecal, new_ecal);
-
-finish:
-	g_clear_error (&error);
-	if (old_ecal)
-		g_object_unref (old_ecal);
-	g_object_unref (group);
-	if (new_ecal)
-		g_object_unref (new_ecal);
-	g_free (old_uri);
-
-	return retval;
-}
-
-static gboolean
-migrate_ical_folder (gchar *old_path, ESourceGroup *dest_group, gchar *source_name, ECalSourceType type)
-{
-	ESource *new_source;
-	gboolean retval;
-
-	new_source = e_source_new (source_name, source_name);
-	e_source_set_relative_uri (new_source, e_source_peek_uid (new_source));
-	e_source_group_add_source (dest_group, new_source, -1);
-
-	retval = migrate_ical_folder_to_source (old_path, new_source, type);
-
-	g_object_unref (new_source);
-
-	return retval;
-}
-
-#endif	/* !G_OS_WIN32 */
-
-#ifndef G_OS_WIN32
-
-static void
-migrate_pilot_db_key (const gchar *key, gpointer user_data)
-{
-	EXmlHash *xmlhash = user_data;
-
-	e_xmlhash_add (xmlhash, key, "");
-}
-
-static void
-migrate_pilot_data (const gchar *component, const gchar *conduit, const gchar *old_path, const gchar *new_path)
-{
-	gchar *changelog, *map;
-	const gchar *dent;
-	const gchar *ext;
-	gchar *filename;
-	GDir *dir;
-
-	if (!(dir = g_dir_open (old_path, 0, NULL)))
-		return;
-
-	map = g_alloca (12 + strlen (conduit));
-	sprintf (map, "pilot-map-%s-", conduit);
-
-	changelog = g_alloca (24 + strlen (conduit));
-	sprintf (changelog, "pilot-sync-evolution-%s-", conduit);
-
-	while ((dent = g_dir_read_name (dir))) {
-		if (!strncmp (dent, map, strlen (map)) &&
-		    ((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) {
-			/* pilot map file - src and dest file formats are identical */
-			guchar inbuf[4096];
-			gsize nread, nwritten;
-			gint fd0, fd1;
-			gssize n;
-
-			filename = g_build_filename (old_path, dent, NULL);
-			if ((fd0 = g_open (filename, O_RDONLY|O_BINARY, 0)) == -1) {
-				g_free (filename);
-				continue;
-			}
-
-			g_free (filename);
-			filename = g_build_filename (new_path, dent, NULL);
-			if ((fd1 = g_open (filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666)) == -1) {
-				g_free (filename);
-				close (fd0);
-				continue;
-			}
-
-			do {
-				do {
-					n = read (fd0, inbuf, sizeof (inbuf));
-				} while (n == -1 && errno == EINTR);
-
-				if (n < 1)
-					break;
-
-				nread = n;
-				nwritten = 0;
-				do {
-					do {
-						n = write (fd1, inbuf + nwritten, nread - nwritten);
-					} while (n == -1 && errno == EINTR);
-
-					if (n > 0)
-						nwritten += n;
-				} while (nwritten < nread && n != -1);
-
-				if (n == -1)
-					break;
-			} while (1);
-
-			if (n != -1)
-				n = fsync (fd1);
-
-			if (n == -1) {
-				g_warning ("Failed to migrate %s: %s", dent, strerror (errno));
-				g_unlink (filename);
-			}
-
-			close (fd0);
-			close (fd1);
-			g_free (filename);
-		} else if (!strncmp (dent, changelog, strlen (changelog)) &&
-			   ((ext = strrchr (dent, '.')) && !strcmp (ext, ".db"))) {
-			/* src and dest formats differ, src format is db3 while dest format is xml */
-			EXmlHash *xmlhash;
-			EDbHash *dbhash;
-			struct stat st;
-
-			filename = g_build_filename (old_path, dent, NULL);
-			if (g_stat (filename, &st) == -1) {
-				g_free (filename);
-				continue;
-			}
-
-			dbhash = e_dbhash_new (filename);
-			g_free (filename);
-
-			filename = g_strdup_printf ("%s/%s.ics-%s", new_path, component, dent);
-			if (g_stat (filename, &st) != -1)
-				g_unlink (filename);
-			xmlhash = e_xmlhash_new (filename);
-			g_free (filename);
-
-			e_dbhash_foreach_key (dbhash, migrate_pilot_db_key, xmlhash);
-
-			e_dbhash_destroy (dbhash);
-
-			e_xmlhash_write (xmlhash);
-			e_xmlhash_destroy (xmlhash);
-		}
-	}
-
-	g_dir_close (dir);
-}
-
-#endif
-
 static void
 create_task_sources (EShellBackend *shell_backend,
 		     ESourceList *source_list,
@@ -553,7 +161,6 @@ e_task_shell_backend_migrate (EShellBackend *shell_backend,
 	ESourceGroup *on_the_web = NULL;
 	ESource *personal_source = NULL;
 	ESourceList *source_list;
-	gboolean retval = FALSE;
 
 	g_object_get (shell_backend, "source-list", &source_list, NULL);
 
@@ -564,106 +171,8 @@ e_task_shell_backend_migrate (EShellBackend *shell_backend,
 		shell_backend, source_list, &on_this_computer,
 		&on_the_web, &personal_source);
 
-#ifndef G_OS_WIN32
-	if (major == 1) {
-		xmlDocPtr config_doc = NULL;
-		gchar *conf_file;
-
-		conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL);
-		if (g_file_test (conf_file, G_FILE_TEST_IS_REGULAR))
-			config_doc = e_xml_parse_file (conf_file);
-		g_free (conf_file);
-
-		if (config_doc && minor <= 2) {
-			GConfClient *gconf;
-			gint res = 0;
-
-			/* move bonobo config to gconf */
-			gconf = gconf_client_get_default ();
-
-			res = e_bconf_import (gconf, config_doc, task_remap_list);
-
-			g_object_unref (gconf);
-
-			xmlFreeDoc(config_doc);
-
-			if (res != 0) {
-				g_set_error(error, 0, 0, _("Unable to migrate old settings from evolution/config.xmldb"));
-				goto fail;
-			}
-		}
-
-		if (minor <= 4) {
-			GSList *migration_dirs, *l;
-			gchar *path, *local_task_folder;
-
-			setup_progress_dialog ();
-
-			path = g_build_filename (g_get_home_dir (), "evolution", "local", NULL);
-			migration_dirs = e_folder_map_local_folders (path, "tasks");
-			local_task_folder = g_build_filename (path, "Tasks", NULL);
-			g_free (path);
-
-			if (personal_source)
-				migrate_ical_folder_to_source (local_task_folder, personal_source, E_CAL_SOURCE_TYPE_TODO);
-
-			for (l = migration_dirs; l; l = l->next) {
-				gchar *source_name;
-
-				if (personal_source && !strcmp ((gchar *)l->data, local_task_folder))
-					continue;
-
-				source_name = get_source_name (on_this_computer, (gchar *)l->data);
-
-				if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_TODO)) {
-					/* FIXME: domain/code */
-					g_set_error(error, 0, 0, _("Unable to migrate tasks '%s'"), source_name);
-					g_free(source_name);
-					goto fail;
-				}
-
-				g_free (source_name);
-			}
-
-			g_free (local_task_folder);
-
-			dialog_close ();
-		}
-
-		if (minor < 5 || (minor == 5 && micro <= 10)) {
-			gchar *old_path, *new_path;
-
-			old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Tasks", NULL);
-			new_path = g_build_filename (e_shell_backend_get_data_dir (shell_backend),
-						     "local", "system", NULL);
-			migrate_pilot_data ("tasks", "todo", old_path, new_path);
-			g_free (new_path);
-			g_free (old_path);
-		}
-
-		/* we only need to do this next step if people ran
-		   older versions of 1.5.  We need to clear out the
-		   absolute URI's that were assigned to ESources
-		   during one phase of development, as they take
-		   precedent over relative uris (but aren't updated
-		   when editing an ESource). */
-		if (minor == 5 && micro <= 11) {
-			GSList *g;
-			for (g = e_source_list_peek_groups (source_list); g; g = g->next) {
-				ESourceGroup *group = g->data;
-				GSList *s;
-
-				for (s = e_source_group_peek_sources (group); s; s = s->next) {
-					ESource *source = s->data;
-					e_source_set_absolute_uri (source, NULL);
-				}
-			}
-		}
-	}
-#endif	/* !G_OS_WIN32 */
 	e_source_list_sync (source_list, NULL);
-	retval = TRUE;
-fail:
+
 	if (on_this_computer)
 		g_object_unref (on_this_computer);
 	if (on_the_web)
@@ -671,5 +180,5 @@ fail:
 	if (personal_source)
 		g_object_unref (personal_source);
 
-        return retval;
+	return TRUE;
 }
diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c
index 87127ba634..07eb43bdbf 100644
--- a/modules/calendar/e-task-shell-sidebar.c
+++ b/modules/calendar/e-task-shell-sidebar.c
@@ -272,9 +272,15 @@ static void
 task_shell_sidebar_set_default (ETaskShellSidebar *task_shell_sidebar,
                                 ESource *source)
 {
+	EShellView *shell_view;
+	EShellContent *shell_content;
+	EShellSidebar *shell_sidebar;
+	ETaskShellContent *task_shell_content;
 	ECalSourceType source_type;
 	GHashTable *client_table;
+	ECalModel *model;
 	ECal *client;
+	icaltimezone *timezone;
 	const gchar *uid;
 
 	source_type = E_CAL_SOURCE_TYPE_TODO;
@@ -299,7 +305,17 @@ task_shell_sidebar_set_default (ETaskShellSidebar *task_shell_sidebar,
 		G_CALLBACK (task_shell_sidebar_default_opened_cb),
 		task_shell_sidebar);
 
-	e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_task_shell_content_get_task_model (E_TASK_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (task_shell_sidebar)))))), NULL);
+	/* FIXME Sidebar should not be accessing the EShellContent.
+	 *       This probably needs to be moved to ETaskShellView. */
+	shell_sidebar = E_SHELL_SIDEBAR (task_shell_sidebar);
+	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
+	shell_content = e_shell_view_get_shell_content (shell_view);
+
+	task_shell_content = E_TASK_SHELL_CONTENT (shell_content);
+	model = e_task_shell_content_get_task_model (task_shell_content);
+	timezone = e_cal_model_get_timezone (model);
+
+	e_cal_set_default_timezone (client, timezone, NULL);
 	e_cal_open_async (client, FALSE);
 }
 
@@ -676,8 +692,8 @@ task_shell_sidebar_class_init (ETaskShellSidebarClass *class)
 		PROP_DEFAULT_CLIENT,
 		g_param_spec_object (
 			"default-client",
-			_("Default Task Client"),
-			_("Default client for task operations"),
+			"Default Task Client",
+			"Default client for task operations",
 			E_TYPE_CAL,
 			G_PARAM_READABLE));
 
@@ -686,8 +702,8 @@ task_shell_sidebar_class_init (ETaskShellSidebarClass *class)
 		PROP_SELECTOR,
 		g_param_spec_object (
 			"selector",
-			_("Source Selector Widget"),
-			_("This widget displays groups of task lists"),
+			"Source Selector Widget",
+			"This widget displays groups of task lists",
 			E_TYPE_SOURCE_SELECTOR,
 			G_PARAM_READABLE));
 
@@ -813,11 +829,17 @@ void
 e_task_shell_sidebar_add_source (ETaskShellSidebar *task_shell_sidebar,
                                  ESource *source)
 {
+	EShellView *shell_view;
+	EShellContent *shell_content;
+	EShellSidebar *shell_sidebar;
+	ETaskShellContent *task_shell_content;
 	ECalSourceType source_type;
 	ESourceSelector *selector;
 	GHashTable *client_table;
+	ECalModel *model;
 	ECal *default_client;
 	ECal *client;
+	icaltimezone *timezone;
 	const gchar *uid;
 	const gchar *uri;
 	gchar *message;
@@ -876,7 +898,17 @@ e_task_shell_sidebar_add_source (ETaskShellSidebar *task_shell_sidebar,
 		G_CALLBACK (task_shell_sidebar_client_opened_cb),
 		task_shell_sidebar);
 
-	e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_task_shell_content_get_task_model (E_TASK_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (task_shell_sidebar)))))), NULL);
+	/* FIXME Sidebar should not be accessing the EShellContent.
+	 *       This probably needs to be moved to ETaskShellView. */
+	shell_sidebar = E_SHELL_SIDEBAR (task_shell_sidebar);
+	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
+	shell_content = e_shell_view_get_shell_content (shell_view);
+
+	task_shell_content = E_TASK_SHELL_CONTENT (shell_content);
+	model = e_task_shell_content_get_task_model (task_shell_content);
+	timezone = e_cal_model_get_timezone (model);
+
+	e_cal_set_default_timezone (client, timezone, NULL);
 	e_cal_open_async (client, FALSE);
 }
 
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index 310200d6a7..5372299956 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -541,6 +541,7 @@ action_task_purge_cb (GtkAction *action,
 {
 	EShellView *shell_view;
 	EShellWindow *shell_window;
+	GtkWidget *content_area;
 	GtkWidget *dialog;
 	GtkWidget *widget;
 	gboolean active;
@@ -565,9 +566,9 @@ action_task_purge_cb (GtkAction *action,
 
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_NO);
 
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 	widget = gtk_check_button_new_with_label (_("Do not ask me again"));
-	gtk_box_pack_start (
-		GTK_BOX (GTK_DIALOG (dialog)->vbox), widget, TRUE, TRUE, 6);
+	gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 6);
 	gtk_widget_show (widget);
 
 	response = gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 166522a827..55de059d12 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -22,8 +22,6 @@
 #include "e-mail-attachment-handler.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-stream-mem.h>
 
 #include "e-util/e-alert-dialog.h"
 #include "mail/em-composer-utils.h"
@@ -71,7 +69,7 @@ mail_attachment_handler_forward (GtkAction *action,
 
 	attachment = E_ATTACHMENT (selected->data);
 	mime_part = e_attachment_get_mime_part (attachment);
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+	wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 
 	em_utils_forward_message (CAMEL_MIME_MESSAGE (wrapper), NULL);
 
@@ -93,7 +91,7 @@ mail_attachment_handler_reply_all (GtkAction *action,
 
 	attachment = E_ATTACHMENT (selected->data);
 	mime_part = e_attachment_get_mime_part (attachment);
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+	wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 
 	em_utils_reply_to_message (
 		NULL, NULL, CAMEL_MIME_MESSAGE (wrapper),
@@ -117,7 +115,7 @@ mail_attachment_handler_reply_sender (GtkAction *action,
 
 	attachment = E_ATTACHMENT (selected->data);
 	mime_part = e_attachment_get_mime_part (attachment);
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+	wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 
 	em_utils_reply_to_message (
 		NULL, NULL, CAMEL_MIME_MESSAGE (wrapper),
@@ -207,8 +205,8 @@ mail_attachment_handler_message_rfc822 (EAttachmentView *view,
 	success = TRUE;
 
 exit:
-	camel_object_unref (message);
-	camel_object_unref (stream);
+	g_object_unref (message);
+	g_object_unref (stream);
 
 	gtk_drag_finish (drag_context, success, FALSE, time);
 }
@@ -296,7 +294,7 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
 			e_attachment_load_handle_error, parent);
 		g_object_unref (attachment);
 
-		camel_object_unref (message);
+		g_object_unref (message);
 		goto exit;
 	}
 
@@ -311,25 +309,25 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
 		message = camel_folder_get_message (
 			folder, uids->pdata[ii], &ex);
 		if (message == NULL) {
-			camel_object_unref (multipart);
+			g_object_unref (multipart);
 			goto exit;
 		}
 
 		mime_part = camel_mime_part_new ();
 		wrapper = CAMEL_DATA_WRAPPER (message);
 		camel_mime_part_set_disposition (mime_part, "inline");
-		camel_medium_set_content_object (
+		camel_medium_set_content (
 			CAMEL_MEDIUM (mime_part), wrapper);
 		camel_mime_part_set_content_type (mime_part, "message/rfc822");
 		camel_multipart_add_part (multipart, mime_part);
-		camel_object_unref (mime_part);
+		g_object_unref (mime_part);
 
-		camel_object_unref (message);
+		g_object_unref (message);
 	}
 
 	mime_part = camel_mime_part_new ();
 	wrapper = CAMEL_DATA_WRAPPER (multipart);
-	camel_medium_set_content_object (CAMEL_MEDIUM (mime_part), wrapper);
+	camel_medium_set_content (CAMEL_MEDIUM (mime_part), wrapper);
 
 	/* Translators: This is only for multiple messages. */
 	description = g_strdup_printf (_("%d attached messages"), uids->len);
@@ -344,36 +342,26 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
 		e_attachment_load_handle_error, parent);
 	g_object_unref (attachment);
 
-	camel_object_unref (mime_part);
-	camel_object_unref (multipart);
+	g_object_unref (mime_part);
+	g_object_unref (multipart);
 
 exit:
 	if (camel_exception_is_set (&ex)) {
-		gchar *folder_name;
+		const gchar *folder_name = data;
 
 		if (folder != NULL)
-			camel_object_get (
-				folder, NULL, CAMEL_FOLDER_NAME,
-				&folder_name, NULL);
-		else
-			folder_name = g_strdup (data);
+			folder_name = camel_folder_get_name (folder);
 
 		e_alert_run_dialog_for_args (
 			parent, "mail-composer:attach-nomessages",
 			folder_name, camel_exception_get_description (&ex),
 			NULL);
 
-		if (folder != NULL)
-			camel_object_free (
-				folder, CAMEL_FOLDER_NAME, folder_name);
-		else
-			g_free (folder_name);
-
 		camel_exception_clear (&ex);
 	}
 
 	if (folder != NULL)
-		camel_object_unref (folder);
+		g_object_unref (folder);
 
 	g_ptr_array_free (uids, TRUE);
 
@@ -401,7 +389,7 @@ mail_attachment_handler_update_actions (EAttachmentView *view)
 	if (!CAMEL_IS_MIME_PART (mime_part))
 		goto exit;
 
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+	wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 
 	visible = CAMEL_IS_MIME_MESSAGE (wrapper);
 
diff --git a/modules/mail/e-mail-junk-hook.c b/modules/mail/e-mail-junk-hook.c
index f17290f99d..ae87df1b30 100644
--- a/modules/mail/e-mail-junk-hook.c
+++ b/modules/mail/e-mail-junk-hook.c
@@ -22,7 +22,6 @@
 #include "e-mail-junk-hook.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-junk-plugin.h>
 
 #include "e-util/e-alert-dialog.h"
 #include "shell/e-shell.h"
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index b3eb0a97c1..5c16a34b21 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -22,10 +22,6 @@
 #include "e-mail-shell-backend.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-disco-store.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-session.h>
-#include <camel/camel-url.h>
 
 #include "e-util/e-account-utils.h"
 #include "e-util/e-binding.h"
@@ -35,6 +31,7 @@
 #include "shell/e-shell-window.h"
 #include "composer/e-msg-composer.h"
 #include "widgets/misc/e-preferences-window.h"
+#include "widgets/misc/e-web-view.h"
 
 #include "e-mail-shell-settings.h"
 #include "e-mail-shell-sidebar.h"
@@ -74,6 +71,9 @@ struct _EMailShellBackendPrivate {
 static gpointer parent_class;
 static GType mail_shell_backend_type;
 
+static void mbox_create_preview_cb (GObject *preview, GtkWidget **preview_widget);
+static void mbox_fill_preview_cb (GObject *preview, CamelMimeMessage *msg);
+
 static void
 mail_shell_backend_init_importers (void)
 {
@@ -84,6 +84,7 @@ mail_shell_backend_init_importers (void)
 
 	importer = mbox_importer_peek ();
 	e_import_class_add_importer (import_class, importer, NULL, NULL);
+	mbox_importer_set_preview_funcs (mbox_create_preview_cb, mbox_fill_preview_cb);
 
 	importer = elm_importer_peek ();
 	e_import_class_add_importer (import_class, importer, NULL, NULL);
@@ -774,3 +775,31 @@ e_mail_labels_get_filter_options (void)
 
 	return g_slist_reverse (list);
 }
+
+/* utility functions for mbox importer */
+static void
+mbox_create_preview_cb (GObject *preview, GtkWidget **preview_widget)
+{
+	EMFormatHTMLDisplay *format;
+
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (preview_widget != NULL);
+
+	format = em_format_html_display_new ();
+	g_object_set_data_full (preview, "mbox-imp-formatter", format, g_object_unref);
+	*preview_widget = GTK_WIDGET (EM_FORMAT_HTML (format)->html);
+}
+
+static void
+mbox_fill_preview_cb (GObject *preview, CamelMimeMessage *msg)
+{
+	EMFormatHTMLDisplay *format;
+
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (msg != NULL);
+
+	format = g_object_get_data (preview, "mbox-imp-formatter");
+	g_return_if_fail (format != NULL);
+
+	em_format_format (EM_FORMAT (format), NULL, NULL, msg);
+}
diff --git a/modules/mail/e-mail-shell-backend.h b/modules/mail/e-mail-shell-backend.h
index 36f4064e68..031efab150 100644
--- a/modules/mail/e-mail-shell-backend.h
+++ b/modules/mail/e-mail-shell-backend.h
@@ -24,8 +24,6 @@
 
 #include <mail/e-mail-backend.h>
 
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
 #include <e-util/e-signature-list.h>
 #include <libedataserver/e-account-list.h>
 
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index aa2718dcec..ecd592f32b 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -22,7 +22,6 @@
 #include "e-mail-shell-content.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-store.h>
 #include <libedataserver/e-data-server-util.h>
 
 #include "e-util/e-util-private.h"
@@ -452,10 +451,6 @@ mail_shell_content_constructed (GObject *object)
 	key = "/apps/evolution/mail/display/paned_size";
 	gconf_bridge_bind_property (bridge, key, object, "vposition");
 
-	object = G_OBJECT (shell_content);
-	key = "/apps/evolution/mail/display/show_deleted";
-	gconf_bridge_bind_property (bridge, key, object, "show-deleted");
-
 	/* Message list customizations. */
 
 	reader = E_MAIL_READER (shell_content);
@@ -688,8 +683,8 @@ mail_shell_content_class_init (EMailShellContentClass *class)
 		PROP_GROUP_BY_THREADS,
 		g_param_spec_boolean (
 			"group-by-threads",
-			_("Group by Threads"),
-			_("Whether to group messages by threads"),
+			"Group by Threads",
+			"Whether to group messages by threads",
 			FALSE,
 			G_PARAM_READWRITE));
 
@@ -698,8 +693,8 @@ mail_shell_content_class_init (EMailShellContentClass *class)
 		PROP_PREVIEW_VISIBLE,
 		g_param_spec_boolean (
 			"preview-visible",
-			_("Preview is Visible"),
-			_("Whether the preview pane is visible"),
+			"Preview is Visible",
+			"Whether the preview pane is visible",
 			TRUE,
 			G_PARAM_READWRITE));
 
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index 48fd042d58..7303aeea5b 100644
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@ -58,7 +58,7 @@ e_mail_shell_settings_init (EShell *shell)
 			NULL,
 			G_PARAM_READWRITE));
 
-	camel_object_ref (session);
+	g_object_ref (session);
 	e_shell_settings_set_pointer (
 		shell_settings, "mail-session", session);
 
diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c
index 9b3c2fedd0..ac736a0a67 100644
--- a/modules/mail/e-mail-shell-sidebar.c
+++ b/modules/mail/e-mail-shell-sidebar.c
@@ -196,11 +196,7 @@ guess_screen_width (EMailShellSidebar *sidebar)
 		GdkRectangle rect;
 
 		toplevel = gtk_widget_get_toplevel (widget);
-#if GTK_CHECK_VERSION(2,19,7)
 		if (toplevel && gtk_widget_get_realized (toplevel))
-#else
-		if (toplevel && GTK_WIDGET_REALIZED (toplevel))
-#endif
 			monitor = gdk_screen_get_monitor_at_window (
 				screen, gtk_widget_get_window (toplevel));
 		else {
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index f534c2a276..3ba34e68c0 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include "mail/mail-folder-cache.h"
 #include "e-mail-shell-view-private.h"
 
 static void
@@ -232,7 +233,10 @@ action_mail_folder_mark_all_as_read_cb (GtkAction *action,
 	g_return_if_fail (folder != NULL);
 
 	key = "/apps/evolution/mail/prompts/mark_all_read";
-	prompt = "mail:ask-mark-all-read";
+	if (mail_folder_cache_get_folder_has_children (mail_folder_cache_get_default (), folder, NULL))
+		prompt = "mail:ask-mark-all-read-sub";
+	else
+		prompt = "mail:ask-mark-all-read";
 
 	if (!em_utils_prompt_user (parent, key, prompt, NULL))
 		return;
@@ -410,53 +414,6 @@ action_mail_global_expunge_cb (GtkAction *action,
 }
 
 static void
-action_mail_hide_deleted_cb (GtkToggleAction *action,
-                             EMailShellView *mail_shell_view)
-{
-	GtkWidget *message_list;
-	EMailReader *reader;
-	gboolean active;
-
-	reader = E_MAIL_READER (mail_shell_view->priv->mail_shell_content);
-	message_list = e_mail_reader_get_message_list (reader);
-
-	active = gtk_toggle_action_get_active (action);
-	message_list_set_hidedeleted (MESSAGE_LIST (message_list), active);
-}
-
-static void
-action_mail_hide_read_cb (GtkAction *action,
-                          EMailShellView *mail_shell_view)
-{
-	GtkWidget *message_list;
-	EMailReader *reader;
-
-	reader = E_MAIL_READER (mail_shell_view->priv->mail_shell_content);
-	message_list = e_mail_reader_get_message_list (reader);
-
-	message_list_hide_add (
-		MESSAGE_LIST (message_list),
-		"(match-all (system-flag \"seen\"))",
-		ML_HIDE_SAME, ML_HIDE_SAME);
-}
-
-static void
-action_mail_hide_selected_cb (GtkAction *action,
-                              EMailShellView *mail_shell_view)
-{
-	GtkWidget *message_list;
-	EMailReader *reader;
-	GPtrArray *uids;
-
-	reader = E_MAIL_READER (mail_shell_view->priv->mail_shell_content);
-	message_list = e_mail_reader_get_message_list (reader);
-	uids = e_mail_reader_get_selected_uids (reader);
-
-	message_list_hide_uids (MESSAGE_LIST (message_list), uids);
-	em_utils_uids_free (uids);
-}
-
-static void
 action_mail_label_cb (GtkToggleAction *action,
                       EMailShellView *mail_shell_view)
 {
@@ -611,16 +568,18 @@ action_mail_label_none_cb (GtkAction *action,
 }
 
 static void
-action_mail_show_hidden_cb (GtkAction *action,
-                            EMailShellView *mail_shell_view)
+action_mail_show_deleted_cb (GtkToggleAction *action,
+                             EMailShellView *mail_shell_view)
 {
 	GtkWidget *message_list;
 	EMailReader *reader;
+	gboolean active;
 
 	reader = E_MAIL_READER (mail_shell_view->priv->mail_shell_content);
 	message_list = e_mail_reader_get_message_list (reader);
 
-	message_list_hide_clear (MESSAGE_LIST (message_list));
+	active = gtk_toggle_action_get_active (action);
+	message_list_set_hidedeleted (MESSAGE_LIST (message_list), !active);
 }
 
 static void
@@ -996,27 +955,6 @@ static GtkActionEntry mail_entries[] = {
 	  NULL,  /* XXX Add a tooltip! */
 	  G_CALLBACK (action_mail_label_none_cb) },
 
-	{ "mail-hide-read",
-	  NULL,
-	  N_("Hide _Read Messages"),
-	  NULL,
-	  N_("Temporarily hide all messages that have already been read"),
-	  G_CALLBACK (action_mail_hide_read_cb) },
-
-	{ "mail-hide-selected",
-	  NULL,
-	  N_("Hide S_elected Messages"),
-	  NULL,
-	  N_("Temporarily hide the selected messages"),
-	  G_CALLBACK (action_mail_hide_selected_cb) },
-
-	{ "mail-show-hidden",
-	  NULL,
-	  N_("Show Hidde_n Messages"),
-	  NULL,
-	  N_("Show messages that have been temporarily hidden"),
-	  G_CALLBACK (action_mail_show_hidden_cb) },
-
 	{ "mail-smart-backward",
 	  NULL,
 	  NULL,  /* No menu item; key press only */
@@ -1146,15 +1084,6 @@ static EPopupActionEntry mail_popup_entries[] = {
 
 static GtkToggleActionEntry mail_toggle_entries[] = {
 
-	{ "mail-hide-deleted",
-	  NULL,
-	  N_("Hide _Deleted Messages"),
-	  NULL,
-	  N_("Hide deleted messages rather than displaying "
-	     "them with a line through them"),
-	  G_CALLBACK (action_mail_hide_deleted_cb),
-	  TRUE },
-
 	{ "mail-preview",
 	  NULL,
 	  N_("Show Message _Preview"),
@@ -1163,6 +1092,14 @@ static GtkToggleActionEntry mail_toggle_entries[] = {
 	  NULL,  /* Handled by property bindings */
 	  TRUE },
 
+	{ "mail-show-deleted",
+	  NULL,
+	  N_("Show _Deleted Messages"),
+	  NULL,
+	  N_("Show deleted messages with a line through them"),
+	  G_CALLBACK (action_mail_show_deleted_cb),
+	  FALSE },
+
 	{ "mail-threads-group-by",
 	  NULL,
 	  N_("_Group By Threads"),
@@ -1404,6 +1341,10 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view)
 
 	bridge = gconf_bridge_get ();
 
+	object = G_OBJECT (ACTION (MAIL_SHOW_DELETED));
+	key = "/apps/evolution/mail/display/show_deleted";
+	gconf_bridge_bind_property (bridge, key, object, "active");
+
 	object = G_OBJECT (ACTION (MAIL_VIEW_VERTICAL));
 	key = "/apps/evolution/mail/display/layout";
 	gconf_bridge_bind_property (bridge, key, object, "current-value");
@@ -1442,11 +1383,9 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view)
 		ACTION (MAIL_PREVIEW), "active",
 		ACTION (MAIL_VIEW_VERTICAL), "sensitive");
 
-	/* XXX The boolean sense of the GConf key is the inverse of
-	 *     the menu item, so we have to maintain two properties. */
-	e_mutual_binding_new_with_negation (
-		mail_shell_content, "show-deleted",
-		ACTION (MAIL_HIDE_DELETED), "active");
+	e_mutual_binding_new (
+		ACTION (MAIL_SHOW_DELETED), "active",
+		mail_shell_content, "show-deleted");
 
 	/* Keep the sensitivity of "Create Search Folder from Search"
 	 * in sync with "Save Search" so that its only selectable when
diff --git a/modules/mail/e-mail-shell-view-actions.h b/modules/mail/e-mail-shell-view-actions.h
index addd67452b..cc7552e27c 100644
--- a/modules/mail/e-mail-shell-view-actions.h
+++ b/modules/mail/e-mail-shell-view-actions.h
@@ -99,12 +99,6 @@
 	E_SHELL_WINDOW_ACTION ((window), "mail-forward-inline")
 #define E_SHELL_WINDOW_ACTION_MAIL_FORWARD_QUOTED(window) \
 	E_SHELL_WINDOW_ACTION ((window), "mail-forward-quoted")
-#define E_SHELL_WINDOW_ACTION_MAIL_HIDE_DELETED(window) \
-	E_SHELL_WINDOW_ACTION ((window), "mail-hide-deleted")
-#define E_SHELL_WINDOW_ACTION_MAIL_HIDE_READ(window) \
-	E_SHELL_WINDOW_ACTION ((window), "mail-hide-read")
-#define E_SHELL_WINDOW_ACTION_MAIL_HIDE_SELECTED(window) \
-	E_SHELL_WINDOW_ACTION ((window), "mail-hide-selected")
 #define E_SHELL_WINDOW_ACTION_MAIL_LABEL_NEW(window) \
 	E_SHELL_WINDOW_ACTION ((window), "mail-label-new")
 #define E_SHELL_WINDOW_ACTION_MAIL_LABEL_NONE(window) \
@@ -173,8 +167,8 @@
 	E_SHELL_WINDOW_ACTION ((window), "mail-select-all")
 #define E_SHELL_WINDOW_ACTION_MAIL_SHOW_ALL_HEADERS(window) \
 	E_SHELL_WINDOW_ACTION ((window), "mail-show-all-headers")
-#define E_SHELL_WINDOW_ACTION_MAIL_SHOW_HIDDEN(window) \
-	E_SHELL_WINDOW_ACTION ((window), "mail-show-hidden")
+#define E_SHELL_WINDOW_ACTION_MAIL_SHOW_DELETED(window) \
+	E_SHELL_WINDOW_ACTION ((window), "mail-show-deleted")
 #define E_SHELL_WINDOW_ACTION_MAIL_SHOW_SOURCE(window) \
 	E_SHELL_WINDOW_ACTION ((window), "mail-show-source")
 #define E_SHELL_WINDOW_ACTION_MAIL_SMART_BACKWARD(window) \
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index 2cc46da1b7..8a45c4b853 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -257,19 +257,6 @@ mail_shell_view_reader_changed_cb (EMailShellView *mail_shell_view,
 }
 
 static void
-mail_shell_view_reader_status_message_cb (EMailShellView *mail_shell_view,
-                                          const gchar *status_message)
-{
-	EShellView *shell_view;
-	EShellTaskbar *shell_taskbar;
-
-	shell_view = E_SHELL_VIEW (mail_shell_view);
-	shell_taskbar = e_shell_view_get_shell_taskbar (shell_view);
-
-	e_shell_taskbar_set_message (shell_taskbar, status_message);
-}
-
-static void
 mail_shell_view_scroll_cb (EMailShellView *mail_shell_view,
                            GtkOrientation orientation,
                            GtkScrollType scroll_type,
@@ -426,6 +413,7 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view)
 	EShellContent *shell_content;
 	EShellSettings *shell_settings;
 	EShellSidebar *shell_sidebar;
+	EShellTaskbar *shell_taskbar;
 	EShellWindow *shell_window;
 	EShellSearchbar *searchbar;
 	EMFormatHTMLDisplay *html_display;
@@ -447,6 +435,7 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view)
 	shell_backend = e_shell_view_get_shell_backend (shell_view);
 	shell_content = e_shell_view_get_shell_content (shell_view);
 	shell_sidebar = e_shell_view_get_shell_sidebar (shell_view);
+	shell_taskbar = e_shell_view_get_shell_taskbar (shell_view);
 	shell_window = e_shell_view_get_shell_window (shell_view);
 
 	ui_manager = e_shell_window_get_ui_manager (shell_window);
@@ -574,8 +563,8 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view)
 
 	g_signal_connect_swapped (
 		web_view, "status-message",
-		G_CALLBACK (mail_shell_view_reader_status_message_cb),
-		mail_shell_view);
+		G_CALLBACK (e_shell_taskbar_set_message),
+		shell_taskbar);
 
 	/* Need to keep the handler ID so we can disconnect it in
 	 * dispose().  The shell outlives us and we don't want it
@@ -636,12 +625,12 @@ e_mail_shell_view_private_dispose (EMailShellView *mail_shell_view)
 		DISPOSE (priv->search_rules[ii]);
 
 	if (priv->search_account_all != NULL) {
-		camel_object_unref (priv->search_account_all);
+		g_object_unref (priv->search_account_all);
 		priv->search_account_all = NULL;
 	}
 
 	if (priv->search_account_current != NULL) {
-		camel_object_unref (priv->search_account_current);
+		g_object_unref (priv->search_account_current);
 		priv->search_account_current = NULL;
 	}
 
@@ -832,12 +821,13 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view)
 	EShellView *shell_view;
 	EMailReader *reader;
 	CamelStore *local_store;
+	CamelStore *parent_store;
 	CamelFolder *folder;
 	GPtrArray *uids;
 	GString *buffer;
 	const gchar *display_name;
+	const gchar *folder_name;
 	const gchar *folder_uri;
-	gchar *folder_name;
 	gchar *title;
 	guint32 num_deleted;
 	guint32 num_junked;
@@ -874,15 +864,14 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view)
 		return;
 	}
 
-	camel_object_get (
-		folder, NULL,
-		CAMEL_FOLDER_NAME, &folder_name,
-		CAMEL_FOLDER_DELETED, &num_deleted,
-		CAMEL_FOLDER_JUNKED, &num_junked,
-		CAMEL_FOLDER_JUNKED_NOT_DELETED, &num_junked_not_deleted,
-		CAMEL_FOLDER_UNREAD, &num_unread,
-		CAMEL_FOLDER_VISIBLE, &num_visible,
-		NULL);
+	folder_name = camel_folder_get_name (folder);
+	parent_store = camel_folder_get_parent_store (folder);
+
+	num_deleted = folder->summary->deleted_count;
+	num_junked = folder->summary->junk_count;
+	num_junked_not_deleted = folder->summary->junk_not_deleted_count;
+	num_unread = folder->summary->unread_count;
+	num_visible = folder->summary->visible_count;
 
 	buffer = g_string_sized_new (256);
 	uids = e_mail_reader_get_selected_uids (reader);
@@ -953,7 +942,7 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view)
 	em_utils_uids_free (uids);
 
 	/* Choose a suitable folder name for displaying. */
-	if (folder->parent_store == local_store && (
+	if (parent_store == local_store && (
 		strcmp (folder_name, "Drafts") == 0 ||
 		strcmp (folder_name, "Inbox") == 0 ||
 		strcmp (folder_name, "Outbox") == 0 ||
@@ -970,6 +959,5 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view)
 	e_shell_view_set_title (shell_view, title);
 	g_free (title);
 
-	camel_object_free (folder, CAMEL_FOLDER_NAME, folder_name);
 	g_string_free (buffer, TRUE);
 }
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index de237aff96..a8a86c5054 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -26,12 +26,6 @@
 
 #include <glib/gi18n.h>
 #include <gtkhtml/gtkhtml.h>
-#include <camel/camel-disco-store.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-operation.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-vtrash-folder.h>
 #include <camel/camel-search-private.h>  /* for camel_search_word */
 
 #include "e-util/e-util.h"
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index c3429859f7..e69ae55220 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -62,12 +62,12 @@ search_results_exec (SearchResultsMsg *msg)
 	camel_operation_register (msg->cancel);
 
 	copied_list = g_list_copy (msg->folder_list);
-	g_list_foreach (copied_list, (GFunc) camel_object_ref, NULL);
+	g_list_foreach (copied_list, (GFunc) g_object_ref, NULL);
 
 	camel_vee_folder_set_folders (
 		CAMEL_VEE_FOLDER (msg->folder), copied_list);
 
-	g_list_foreach (copied_list, (GFunc) camel_object_unref, NULL);
+	g_list_foreach (copied_list, (GFunc) g_object_unref, NULL);
 	g_list_free (copied_list);
 }
 
@@ -79,9 +79,9 @@ search_results_done (SearchResultsMsg *msg)
 static void
 search_results_free (SearchResultsMsg *msg)
 {
-	camel_object_unref (msg->folder);
+	g_object_unref (msg->folder);
 
-	g_list_foreach (msg->folder_list, (GFunc) camel_object_unref, NULL);
+	g_list_foreach (msg->folder_list, (GFunc) g_object_unref, NULL);
 	g_list_free (msg->folder_list);
 }
 
@@ -101,7 +101,7 @@ mail_shell_view_setup_search_results_folder (CamelFolder *folder,
 	SearchResultsMsg *msg;
 	gint id;
 
-	camel_object_ref (folder);
+	g_object_ref (folder);
 
 	msg = mail_msg_new (&search_results_setup_info);
 	msg->folder = folder;
@@ -487,7 +487,7 @@ all_accounts:
 	text = e_shell_searchbar_get_search_text (searchbar);
 	if (text == NULL || *text == '\0') {
 		if (priv->search_account_all != NULL) {
-			camel_object_unref (priv->search_account_all);
+			g_object_unref (priv->search_account_all);
 			priv->search_account_all = NULL;
 		}
 
@@ -614,7 +614,7 @@ current_account:
 	text = e_shell_searchbar_get_search_text (searchbar);
 	if (text == NULL || *text == '\0') {
 		if (priv->search_account_current != NULL) {
-			camel_object_unref (priv->search_account_current);
+			g_object_unref (priv->search_account_current);
 			priv->search_account_current = NULL;
 		}
 
@@ -664,7 +664,7 @@ current_account:
 
 	/* Create a new search folder. */
 
-	store = folder->parent_store;
+	store = camel_folder_get_parent_store (folder);
 	list = NULL;  /* list of CamelFolders */
 
 	if (store->folders != NULL) {
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index df1cdeef27..0ac397fc72 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -30,8 +30,6 @@
 #include <config.h>
 #endif
 
-#include <camel/camel-url.h>
-
 #include <glib/gi18n.h>
 
 #include "e-util/e-alert-dialog.h"
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 49f2fda5b6..7c0f39ea31 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -38,8 +38,6 @@
 #include "composer/e-msg-composer.h"
 #include "shell/e-shell-utils.h"
 
-#include <camel/camel-iconv.h>
-
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index a885c72744..11795a92d8 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -30,7 +30,6 @@
 #include "em-mailer-prefs.h"
 #include "em-format/em-format.h"
 
-#include <camel/camel-iconv.h>
 #include <gtkhtml/gtkhtml-properties.h>
 #include <libxml/tree.h>
 
@@ -219,8 +218,15 @@ jh_add_cb (GtkWidget *widget, gpointer user_data)
 {
 	EMMailerPrefs *prefs = (EMMailerPrefs *) user_data;
 	GtkWidget *dialog, *l1, *l2, *entry1, *entry2, *vbox, *hbox;
+	GtkWidget *content_area;
 	gint response;
-	dialog = gtk_dialog_new_with_buttons (_("Add Custom Junk Header"), (GtkWindow *)gtk_widget_get_toplevel (widget), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
+
+	dialog = gtk_dialog_new_with_buttons (
+		_("Add Custom Junk Header"),
+		(GtkWindow *) gtk_widget_get_toplevel (widget),
+		GTK_DIALOG_DESTROY_WITH_PARENT,
+		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
 
 	vbox = gtk_vbox_new (FALSE, 6);
 	hbox = gtk_hbox_new (FALSE, 0);
@@ -238,7 +244,8 @@ jh_add_cb (GtkWidget *widget, gpointer user_data)
 	gtk_box_pack_start ((GtkBox *)vbox, hbox, FALSE, FALSE, 6);
 
 	gtk_widget_show_all (vbox);
-	gtk_container_add ((GtkContainer *)((GtkDialog *)dialog)->vbox, vbox);
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_container_add (GTK_CONTAINER (content_area), vbox);
 	response = gtk_dialog_run ((GtkDialog *)dialog);
 	if (response == GTK_RESPONSE_ACCEPT) {
 		const gchar *name = gtk_entry_get_text ((GtkEntry *)entry1);
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index 6b419d0c2e..85a0a82ca3 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -283,12 +283,16 @@ emnp_free(EConfig *ec, GSList *items, gpointer data)
 static void
 emnp_set_markups (EMNetworkPrefs *prefs)
 {
-	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->sys_proxy)->child), TRUE);
-	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->no_proxy)->child), TRUE);
-	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->manual_proxy)->child), TRUE);
-#if 0
-	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->auto_proxy)->child), TRUE);
-#endif
+	GtkWidget *child;
+
+	child = gtk_bin_get_child (GTK_BIN (prefs->sys_proxy));
+	gtk_label_set_use_markup (GTK_LABEL (child), TRUE);
+
+	child = gtk_bin_get_child (GTK_BIN (prefs->no_proxy));
+	gtk_label_set_use_markup (GTK_LABEL (child), TRUE);
+
+	child = gtk_bin_get_child (GTK_BIN (prefs->manual_proxy));
+	gtk_label_set_use_markup (GTK_LABEL (child), TRUE);
 }
 
 static void
diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am
new file mode 100644
index 0000000000..8e61f34693
--- /dev/null
+++ b/modules/mailto-handler/Makefile.am
@@ -0,0 +1,54 @@
+module_LTLIBRARIES = libevolution-module-mailto-handler.la
+
+libevolution_module_mailto_handler_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)						\
+	-I$(top_srcdir)						\
+	-DG_LOG_DOMAIN=\"evolution-mailto-handler\"		\
+	$(GNOME_PLATFORM_CFLAGS)
+
+libevolution_module_mailto_handler_la_SOURCES =			\
+	evolution-mailto-handler.c
+
+libevolution_module_mailto_handler_la_LIBADD =			\
+	$(top_builddir)/e-util/libeutil.la			\
+	$(top_builddir)/shell/libeshell.la			\
+	$(GNOME_PLATFORM_LIBS)
+
+libevolution_module_mailto_handler_la_LDFLAGS =			\
+	-module -avoid-version $(NO_UNDEFINED)
+
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+
+@INTLTOOL_SCHEMAS_RULE@
+
+if GCONF_SCHEMAS_INSTALL
+
+if OS_WIN32
+install-data-local:
+	if test -z "$(DESTDIR)" ; then							\
+		for p in $(schema_DATA) ; do						\
+			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE);	\
+			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat;	\
+			cmd /c _temp.bat; 						\
+			rm _temp.bat;							\
+		done									\
+	fi
+else
+install-data-local:
+	if test -z "$(DESTDIR)" ; then							\
+		for p in $(schema_DATA) ; do						\
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) 		\
+				$(GCONFTOOL) --makefile-install-rule $$p;		\
+		done									\
+	fi
+endif
+
+endif
+
+EXTRA_DIST = $(schema_in_files)
+
+DISTCLEANFILES = $(schema_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in b/modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in
index cdcaf7892a..cdcaf7892a 100644
--- a/plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in
+++ b/modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in
diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
new file mode 100644
index 0000000000..076f2e0686
--- /dev/null
+++ b/modules/mailto-handler/evolution-mailto-handler.c
@@ -0,0 +1,274 @@
+/*
+ * evolution-mailto-handler.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include <config.h>
+#include <glib/gi18n-lib.h>
+
+#include <shell/e-shell.h>
+#include <e-util/e-binding.h>
+#include <e-util/e-extension.h>
+
+/* Standard GObject macros */
+#define E_TYPE_MAILTO_HANDLER \
+	(e_mailto_handler_get_type ())
+#define E_MAILTO_HANDLER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_MAILTO_HANDLER, EMailtoHandler))
+
+#define MAILTO_COMMAND \
+	"evolution --component=mail %s"
+
+typedef struct _EMailtoHandler EMailtoHandler;
+typedef struct _EMailtoHandlerClass EMailtoHandlerClass;
+
+struct _EMailtoHandler {
+	EExtension parent;
+};
+
+struct _EMailtoHandlerClass {
+	EExtensionClass parent_class;
+};
+
+/* Module Entry Points */
+void e_module_load (GTypeModule *type_module);
+void e_module_unload (GTypeModule *type_module);
+
+/* Forward Declarations */
+GType e_mailto_handler_get_type (void);
+
+G_DEFINE_DYNAMIC_TYPE (EMailtoHandler, e_mailto_handler, E_TYPE_EXTENSION)
+
+static EShell *
+mailto_handler_get_shell (EMailtoHandler *extension)
+{
+	EExtensible *extensible;
+
+	extensible = e_extension_get_extensible (E_EXTENSION (extension));
+
+	return E_SHELL (extensible);
+}
+
+static gboolean
+mailto_handler_is_evolution (const gchar *mailto_command)
+{
+	gint argc;
+	gchar **argv;
+	gchar *basename;
+	gboolean is_evolution;
+
+	if (mailto_command == NULL)
+		return FALSE;
+
+	/* Tokenize the mailto command. */
+	if (!g_shell_parse_argv (mailto_command, &argc, &argv, NULL))
+		return FALSE;
+
+	g_return_val_if_fail (argc > 0, FALSE);
+
+	/* Check the basename of the first token. */
+	basename = g_path_get_basename (argv[0]);
+	is_evolution = g_str_has_prefix (basename, "evolution");
+	g_free (basename);
+
+	g_strfreev (argv);
+
+	return is_evolution;
+}
+
+static gboolean
+mailto_handler_prompt (EMailtoHandler *extension)
+{
+	EShell *shell;
+	EShellSettings *shell_settings;
+	GtkWidget *container;
+	GtkWidget *dialog;
+	GtkWidget *widget;
+	const gchar *text;
+	gchar *markup;
+	gint response;
+
+	shell = mailto_handler_get_shell (extension);
+	shell_settings = e_shell_get_shell_settings (shell);
+
+	dialog = gtk_dialog_new_with_buttons (
+		"", NULL, 0,
+		GTK_STOCK_NO, GTK_RESPONSE_NO,
+		GTK_STOCK_YES, GTK_RESPONSE_YES,
+		NULL);
+
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
+	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+
+	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
+	widget = gtk_hbox_new (FALSE, 12);
+	gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
+	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+	gtk_widget_show (widget);
+
+	container = widget;
+
+	widget = gtk_image_new_from_stock (
+		GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	gtk_widget_show (widget);
+
+	widget = gtk_vbox_new (FALSE, 12);
+	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+	gtk_widget_show (widget);
+
+	container = widget;
+
+	text = _("Do you want to make Evolution your default email client?");
+	markup = g_markup_printf_escaped ("<b>%s</b>", text);
+	widget = gtk_label_new (NULL);
+	gtk_label_set_markup (GTK_LABEL (widget), markup);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	gtk_widget_show (widget);
+	g_free (markup);
+
+	text = _("_Do not show this message again");
+	widget = gtk_check_button_new_with_mnemonic (text);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 12);
+	gtk_widget_show (widget);
+
+	e_mutual_binding_new_with_negation (
+		shell_settings, "mailto-handler-check",
+		widget, "active");
+
+	/* Direct input focus away from the checkbox. */
+	widget = gtk_dialog_get_widget_for_response (
+		GTK_DIALOG (dialog), GTK_RESPONSE_YES);
+	gtk_widget_grab_focus (widget);
+
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+	gtk_widget_destroy (dialog);
+
+	return (response == GTK_RESPONSE_YES);
+}
+
+static void
+mailto_handler_check (EMailtoHandler *extension)
+{
+	EShell *shell;
+	EShellSettings *shell_settings;
+	gboolean check_mailto_handler = TRUE;
+	gchar *mailto_command = NULL;
+
+	shell = mailto_handler_get_shell (extension);
+	shell_settings = e_shell_get_shell_settings (shell);
+
+	g_object_get (
+		shell_settings,
+		"mailto-handler-command", &mailto_command,
+		"mailto-handler-check", &check_mailto_handler,
+		NULL);
+
+	/* Should we check the "mailto" URI handler? */
+	if (!check_mailto_handler)
+		goto exit;
+
+	/* Is Evolution already handling "mailto" URIs? */
+	if (mailto_handler_is_evolution (mailto_command))
+		goto exit;
+
+	/* Does the user want Evolution to handle them? */
+	if (!mailto_handler_prompt (extension))
+		goto exit;
+
+	/* Configure Evolution to be the "mailto" URI handler. */
+
+	g_object_set (
+		shell_settings,
+		"mailto-handler-command", MAILTO_COMMAND,
+		"mailto-handler-enabled", TRUE,
+		"mailto-handler-needs-terminal", FALSE,
+		NULL);
+
+exit:
+	g_free (mailto_command);
+}
+
+static void
+mailto_handler_constructed (GObject *object)
+{
+	EShell *shell;
+	EShellSettings *shell_settings;
+	EMailtoHandler *extension;
+
+	extension = E_MAILTO_HANDLER (object);
+
+	shell = mailto_handler_get_shell (extension);
+	shell_settings = e_shell_get_shell_settings (shell);
+
+	e_shell_settings_install_property_for_key (
+		"mailto-handler-check",
+		"/apps/evolution/mail/prompts/checkdefault");
+
+	e_shell_settings_install_property_for_key (
+		"mailto-handler-command",
+		"/desktop/gnome/url-handlers/mailto/command");
+
+	e_shell_settings_install_property_for_key (
+		"mailto-handler-enabled",
+		"/desktop/gnome/url-handlers/mailto/enabled");
+
+	e_shell_settings_install_property_for_key (
+		"mailto-handler-needs-terminal",
+		"/desktop/gnome/url-handlers/mailto/needs_terminal");
+
+	g_signal_connect_swapped (
+		shell, "event::ready-to-start",
+		G_CALLBACK (mailto_handler_check), extension);
+}
+
+static void
+e_mailto_handler_class_init (EMailtoHandlerClass *class)
+{
+	GObjectClass *object_class;
+	EExtensionClass *extension_class;
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->constructed = mailto_handler_constructed;
+
+	extension_class = E_EXTENSION_CLASS (class);
+	extension_class->extensible_type = E_TYPE_SHELL;
+}
+
+static void
+e_mailto_handler_class_finalize (EMailtoHandlerClass *class)
+{
+}
+
+static void
+e_mailto_handler_init (EMailtoHandler *extension)
+{
+}
+
+G_MODULE_EXPORT void
+e_module_load (GTypeModule *type_module)
+{
+	e_mailto_handler_register_type (type_module);
+}
+
+G_MODULE_EXPORT void
+e_module_unload (GTypeModule *type_module)
+{
+}
diff --git a/modules/plugin-mono/Camel.cs b/modules/plugin-mono/Camel.cs
index 4ad80e7012..c415498c02 100644
--- a/modules/plugin-mono/Camel.cs
+++ b/modules/plugin-mono/Camel.cs
@@ -261,69 +261,7 @@ namespace Camel {
 			remove { removeEvent("finalize", ref finalise_id, value); }
 		}
 
-		public event MetaChangedEvent MetaChanged {
-			add { addEvent("meta_changed", ref meta_changed_id, (CamelEventFunc)metaChangedHook, value); }
-			remove { removeEvent("meta_changed", ref meta_changed_id, value); }
-		}
-
-		[DllImport("camel-1.2")] static extern IntPtr camel_object_get_ptr(IntPtr raw, ref CamelException ex, int tag);
 		[DllImport("camel-1.2")] static extern void camel_object_free(IntPtr raw, int tag, IntPtr val);
-		[DllImport("camel-1.2")] static extern int camel_object_get_int(IntPtr raw, ref CamelException ex, int tag);
-
-		// maybe we want an indexer class to get properties?
-		// e.g. name = folder.properties[Folder.Tag.NAME]
-		public String getString(int type) {
-			String s;
-			IntPtr o;
-			CamelException ex = new CamelException();
-
-			o = camel_object_get_ptr(cobject, ref ex, type);
-			if (ex.id != 0)
-				throw new Camel.Exception(ex);
-
-			s = Marshal.PtrToStringAuto(o);
-			camel_object_free(cobject, type, o);
-
-			return s;
-		}
-
-		public Camel.Object getObject(int type) {
-			IntPtr o;
-			Camel.Object co;
-			CamelException ex = new CamelException();
-
-			o = camel_object_get_ptr(cobject, ref ex, type);
-			if (ex.id != 0)
-				throw new Camel.Exception(ex);
-
-			co = fromCamel(o);
-			camel_object_free(cobject, type, o);
-
-			return co;
-		}
-
-		public int getInt(int type) {
-			int r;
-			CamelException ex = new CamelException();
-
-			r = camel_object_get_int(cobject, ref ex, type);
-			if (ex.id != 0)
-				throw new Camel.Exception(ex);
-
-			return r;
-		}
-
-		// meta-data
-		[DllImport("camel-1.2")] static extern String camel_object_meta_get(IntPtr raw, string name);
-		[DllImport("camel-1.2")] static extern bool camel_object_meta_set(IntPtr raw, string name, string value);
-
-		public String metaGet(String name) {
-			return camel_object_meta_get(cobject, name);
-		}
-
-		public bool metaSet(String name, String value) {
-			return camel_object_meta_set(cobject, name, value);
-		}
 	}
 
 	public class Provider {
diff --git a/modules/plugin-mono/e-plugin-mono.c b/modules/plugin-mono/e-plugin-mono.c
index f1fe76ff49..eb4b60cf97 100644
--- a/modules/plugin-mono/e-plugin-mono.c
+++ b/modules/plugin-mono/e-plugin-mono.c
@@ -121,6 +121,11 @@ plugin_mono_invoke (EPlugin *plugin,
 	plugin_mono = E_PLUGIN_MONO (plugin);
 	priv = plugin_mono->priv;
 
+	if (!domain) {
+		mono_config_parse (NULL);
+		domain = mono_jit_init (plugin_mono->location);
+	}
+	
 	/* We need to do this every time since we may
 	 * be called from any thread for some uses. */
 	mono_thread_attach (domain);
@@ -258,7 +263,4 @@ e_plugin_mono_register_type (GTypeModule *type_module)
 	plugin_mono_type = g_type_module_register_type (
 		type_module, E_TYPE_PLUGIN,
 		"EPluginMono", &type_info, 0);
-
-	domain = mono_jit_init ("Evolution");
-	mono_thread_attach (domain);
 }
diff --git a/modules/plugin-python/Makefile.am b/modules/plugin-python/Makefile.am
index 4aaf14a7b2..6bc2dcf91c 100644
--- a/modules/plugin-python/Makefile.am
+++ b/modules/plugin-python/Makefile.am
@@ -13,7 +13,7 @@ libevolution_module_plugin_python_la_SOURCES =			\
 	e-plugin-python.h
 
 libevolution_module_plugin_python_la_LIBADD =			\
-	-lpthread -ldl -lutil -lm				\
+	-ldl -lutil -lm						\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(E_UTIL_LIBS)						\
 	$(PY_LIBS)
diff --git a/plugins/addressbook-file/ChangeLog b/plugins/addressbook-file/ChangeLog
deleted file mode 100644
index f9b08a85f3..0000000000
--- a/plugins/addressbook-file/ChangeLog
+++ /dev/null
@@ -1,59 +0,0 @@
-2008-09-04  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* addressbook-file.c:
-
-2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #545568
-
-	* org-gnome-addressbook-file.eplug.xml:
-	Add "system_plugin=true" so it's not shown in the Plugin Manager.
-	This plugin is not designed to be disabled by the user.
-
-2006-02-28  Christian Kellner  <gicmo@gnome.org>
-
-	* addressbook-file.c: fixing a leak.
-
-2005-12-25  Funda Wang  <fundawang@linux.net.cn>
-
-	* Makefile.am: Mark this plugin as translatable (bug#301149).
-
-2005-12-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: Fix make-clean issues.
-
-2005-12-07  Funda Wang  <fundawang@linux.net.cn>
-
-	* org-gnome-addressbook-file.eplug.in: i18nlized.
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* addressbook-file.c (e_book_file_dummy): fix relative_uri type,
-	don't include every header in the world we dont' need.  And it
-	sure has hell seems to do something for a 'dummy' function.
-
-2005-06-27  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: There is no EVOLUTION_CFLAGS. Use
-	NO_UNDEFINED. Link with EVOLUTION_ADDRESSBOOK_LIBS.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* org-gnome-addressbook-file.eplug.in: Use SOEXT.
-
-2005-02-28  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* addressbook-file.c (e_book_file_dummy) :
-	don't set the relative uri if already present.
-	Also change the typo in the prototype s/calendar/book
-	part of fix for #73152
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-addressbook-file.eplug.in: Added author and description.
-
-2005-01-21 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* initial commit 
diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c
index 2168d324cc..0adcf9a701 100644
--- a/plugins/addressbook-file/addressbook-file.c
+++ b/plugins/addressbook-file/addressbook-file.c
@@ -25,6 +25,14 @@
 #include <libedataserver/e-source.h>
 #include <string.h>
 
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
+
 GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
 
 GtkWidget *
diff --git a/plugins/attachment-reminder/ChangeLog b/plugins/attachment-reminder/ChangeLog
deleted file mode 100644
index 53db95fe62..0000000000
--- a/plugins/attachment-reminder/ChangeLog
+++ /dev/null
@@ -1,196 +0,0 @@
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* attachment-reminder.c:
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Have a check for OS_WIN32 and handle the schema data 
-	differently. make install error on win32.
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
-	dlls on Windows.
-
-2008-06-04  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fixes Bug #208943.
-	
-	* org-gnome-attachment-reminder.error.xml: Added 
-	"Add attachment" button.
-	
-	* attachment-reminder.c (ask_for_missing_attachment): activate 
-	composer's "attach" action on "Add attachment".
-	
-2008-05-23  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fixes Bug 496476.
-	
-	* attachment-reminder.glade: Removed GtkTables and added simple HBoxes
-	
-	* attachment-reminder.c (e_plugin_lib_get_configure_widget): Let the
-	configure widget expand.
-
-2008-05-22  Johnny Jacob  <jjohnny@novell.com>
-	
-	** Fixes Bug #529995
-	
-	* attachment-reminder.c (ask_for_missing_attachment): Disable the plugin.
-
-	* apps-evolution-attachment-reminder.schemas.in: Removed GConf key.
-
-	* attachment-reminder.c (toggle_cb): Removed.
-	(e_plugin_lib_get_configure_widget): Remove "Remind missing attachments"
-	check button.
-	(org_gnome_evolution_attachment_reminder): Removed Gconf key 
-	for enable/disable .
-
-2008-05-22  Johnny Jacob  <jjohnny@novell.com>
-	
-	* attachment-reminder.c (strip_text_msg): Wrong condition check
-
-2008-05-20  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fixes Bug #473198
-	
-	* attachment-reminder.c (strip_text_msg): Ignore signature.
-
-2008-04-07  Ambuj Chitranshi  <ambuj_1075@yahoo.co.in>
-
-	** Fix for bug #484793
-
-	* org-gnome-attachment-reminder.error.xml:
-	String change: "Continue Editing" -> "Edit Message"
-
-2008-02-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* attachment-reminder.c (org_gnome_evolution_attachment_reminder):
-	Fix a compiler warning.
-
-2008-01-24  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fixes bug #503327 & #503678
-	
-	* attachment-reminder.c (strip_text_msg): Memory leak Fix.
-	(org_gnome_evolution_attachment_reminder): Free	GByteArray.
-	NULL terminate string.
-	
-2008-01-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* apps-evolution-attachment-reminder.schemas.in: Add
-	missing punctuation.
-
-2007-12-15  Johnny Jacob  <jjohnny@novell.com>
-
-	** Cleanup of attachment reminder over Milan Crha's work.
-	
-	* attachment-reminder.c (check_for_attachment_clues): Unref gconf_client.
-	(commit_changes): reuse ui->gconf.
-	(e_plugin_lib_get_configure_widget): Remove unnecessary 
-	gconf_client_get_default ()
-
-2007-12-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #502312
-
-	* attachment-reminder.c: A little cleanup of configuration part of
-	the plugin to not use global variables and free memory properly.
-
-2007-12-05  Sankar P  <psankar@novell.com>
-
-	* attachment-reminder.c: (e_plugin_lib_get_configure_widget):
-	Move preferences to the configure tab.
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* attachment-reminder.c: (check_for_attachment_clues),
-	(clue_check_isempty): Don't mix code and declarations. Also
-	remove a c++ comment.
-
-2007-09-06  B S Srinidhi  <srinidhi.bs@gmail.com>
-
-	** Fix for bug #468366
-
-	* attachment-reminder.c: Avoid empty keywords getting added and
-	other small fixes and improvements.
-
-2007-08-21  Andre Klapper  <a9016009@gmx.de>
-
-	* org-gnome-attachment-reminder.error.xml:  Marked strings for
-	translation
-
-2007-08-20  Johnny Jacob  <jjohnny@novell.com>	
-
-	** Fix for 468159 from Gilles Dartiguelongue
-	<gdartigu@svn.gnome.org>
-	
-	* apps-evolution-attachment-reminder.schemas.in.in : Renamed to
-	apps-evolution-attachment-reminder.schemas.in
-
-	* Makefile.am : Removed usage of BASE_VERSION
-	
-2007-08-03  Johnny Jacob  <jjohnny@novell.com>
-
-	* org-gnome-attachment-reminder.errors.xml: Renamed to
-	org-gnome-attachment-reminder.error.xml
-	
-	* org-gnome-attachment-reminder.error.xml:  Marked strings for
-	translation
-	
-	* Makefile.am : Fixed translation rules.
-	
-2007-08-03  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #460821
-
-	* attachment-reminder.c: (strip_text_msg): The second argument of
-	g_utf8_strdown() expects the length of string in bytes or -1.
-
-2007-07-30  Andre Klapper  <a9016009@gmx.de>
-
-	* attachment-reminder.glade:
-	remove "window1" string from translation
-
-2007-07-26  Sankar P  <psankar@novell.com>
-
-	* attachment-reminder.c: (e_plugin_lib_configure),
-	(org_gnome_attachment_reminder_config_option):
-	* attachment-reminder.glade:
-	Configure attachment-reminder plugin within the plugin-manager.
-
-2007-07-26  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* attachment-reminder.c: Plugged memory leak and the second argument
-	of g_utf8_strdown() should be in bytes.
-
-2007-07-17  Sankar P  <psankar@novell.com>
-
-	* org-gnome-attachment-reminder.errors.xml:
-	Changed the string "Cancel" to "Continue Editing"
-
-2007-07-10  Sankar P  <psankar@novell.com>
-
-	* org-gnome-attachment-reminder.errors.xml:
-	Fixed Marking for Translation bugs
-
-2007-07-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* Makefile.am: Fix for build break from Johnny.
-
-2007-07-09  Johnny Jacob <jjohnny@novell.com>
-
-	* attachment-remidner.glade : Added mnemonics.
-	* attachment-reminder.c : Fixed warnings.
-	* org-gnome-attachment-reminder.errors.xml : Added new strings.
-	
-2007-07-09  Johnny Jacob <jjohnny@novell.com>
-
-	** Added attachment Reminder plugins
-	* apps-evolution-attachment-reminder.schemas.in.in:
-	* org-gnome-evolution-attachment-reminder.eplug.xml:
-	* attachment-reminder.c:                             
-	* Makefile.am:
-	* attachment-reminder.glade:                         
-	* org-gnome-attachment-reminder.errors.xml:
diff --git a/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in b/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
index c75bc34247..e86ebf665d 100644
--- a/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
+++ b/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
@@ -17,7 +17,7 @@
 	       in a message body</short>
          <long>
 	       List of clues for the attachment reminder plugin to look for
-	       in a message body.
+	       in a message body
          </long>
       </locale>
     </schema>
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index ee17785fbd..19decd6cbf 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -30,14 +30,6 @@
 #include <e-util/e-config.h>
 #include <mail/em-config.h>
 #include <mail/em-event.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
 
 #include <e-util/e-alert-dialog.h>
 #include <e-util/e-plugin.h>
@@ -120,14 +112,17 @@ ask_for_missing_attachment (EPlugin *ep, GtkWindow *window)
 {
 	GtkWidget *check = NULL;
 	GtkDialog *dialog = NULL;
+	GtkWidget *content_area;
 	gint response;
 
-	dialog = (GtkDialog*)e_alert_dialog_new_for_args(window, "org.gnome.evolution.plugins.attachment_reminder:attachment-reminder", NULL);
+	dialog = (GtkDialog*) e_alert_dialog_new_for_args (
+		window, "org.gnome.evolution.plugins.attachment_reminder:attachment-reminder", NULL);
 
 	/*Check buttons*/
 	check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again."));
 	gtk_container_set_border_width((GtkContainer *)check, 12);
-	gtk_box_pack_start ((GtkBox *)dialog->vbox, check, TRUE, TRUE, 0);
+	content_area = gtk_dialog_get_content_area (dialog);
+	gtk_box_pack_start (GTK_BOX (content_area), check, TRUE, TRUE, 0);
 	gtk_widget_show (check);
 
 	response = gtk_dialog_run ((GtkDialog *) dialog);
@@ -490,17 +485,17 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	clue_add = gtk_button_new_from_stock ("gtk-add");
 	gtk_widget_show (clue_add);
 	gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_add);
-	GTK_WIDGET_SET_FLAGS (clue_add, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default (clue_add, TRUE);
 
 	clue_edit = gtk_button_new_from_stock ("gtk-edit");
 	gtk_widget_show (clue_edit);
 	gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_edit);
-	GTK_WIDGET_SET_FLAGS (clue_edit, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default (clue_edit, TRUE);
 
 	clue_remove = gtk_button_new_from_stock ("gtk-remove");
 	gtk_widget_show (clue_remove);
 	gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_remove);
-	GTK_WIDGET_SET_FLAGS (clue_remove, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default (clue_remove, TRUE);
 
 	ui->gconf = gconf_client_get_default ();
 
diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog
deleted file mode 100644
index 374d489fbe..0000000000
--- a/plugins/audio-inline/ChangeLog
+++ /dev/null
@@ -1,102 +0,0 @@
-2009-02-11  Andre Klapper  <a9016009@gmx.de>
-
-	* audio-inline.c:
-	Substitute some deprecated gtk+ functions.
-
-2008-10-03  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* audio-inline.c:
-
-2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fixes bug #553479
-
-	* org-gnome-audio-inline.eplug.xml: String capitalisation
-	improvements.
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
-	dlls on Windows.
-
-2008-04-21  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes #528793, solution by Reece Hart
-	
-	* org-gnome-audio-inline.eplug.xml:
-	Add inline disposition for "audio/microsoft-wav" MIME types.
-
-2007-09-05  Frederic Crozat  <fcrozat@mandriva.com>
-
-	* audio-inline.c:
-	* org-gnome-audio-inline.eplug.xml:
-	Port plugin to gstreamer 0.10 and handle additional mimetypes
-	(bug #329629).
-
-2007-08-16  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #350539
-
-	* audio-inline.c: (org_gnome_audio_inline_play_clicked):
-	Ensures non-NULL part.
-
-2006-01-09  Kjartan Maraas <kmaraas@gnome.org>
-
-	* audio-inline.c: (org_gnome_audio_inline_add_button):
-	s/volatile static/static volatile/g. Remove unused var.
-
-2005-12-18  Tor Lillqvist  <tml@novell.com>
-
-	* audio-inline.c: Use g_ascii_strcasecmp() instead of
-	strcasecmp(), especially as we are comparing to plain ASCII
-	strings.
-
-2005-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: add cleanfiles and built_sources.
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: 
-	* org-gnome-audio-inline.eplug.xml: s/.in/.xml/ & i18n.
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-audio-inline.eplug.in: Added a . to the end of description.
-
-2004-11-26  JP Rosevear  <jpr@novell.com>
-
-	* audio-inline.c (org_gnome_audio_inline_add_button): get image
-	from icon factory directly
-
-2004-11-11  Radek Doulik  <rodo@ximian.com>
-
-	* org-gnome-audio-inline.eplug.in: fixed author and description
-
-2004-11-01  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: dist .eplug.in file
-
-2004-10-25  Radek Doulik  <rodo@ximian.com>
-
-	* audio-inline.c: removed unused enum declaration
-	(org_gnome_audio_inline_play_clicked): added cast to &argv to
-	quiet compiler
-	handle more mime types
-
-	* org-gnome-audio-inline.eplug.in: handle application/x-ogg mime
-	type
-	handle more mime types
-
-	* audio-inline.c: handle application/x-ogg mime type
-
-	* org-gnome-audio-inline.eplug.in: handle audio/x-mp3 mime type
-
-	* audio-inline.c: (org_gnome_audio_inline_play_clicked): handle
-	audio/x-mp3 mime type
-
-2004-10-25  Radek Doulik  <rodo@ximian.com>
-
-	* audio-inline.c: imported audio inline plugin
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index 9de5512e0f..983bf12438 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -27,10 +27,6 @@
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
 #include "e-util/e-mktemp.h"
-#include "camel/camel-medium.h"
-#include "camel/camel-mime-part.h"
-#include "camel/camel-stream.h"
-#include "camel/camel-stream-fs.h"
 #include "mail/em-format-hook.h"
 #include "mail/em-format-html.h"
 #include "gtkhtml/gtkhtml-embedded.h"
@@ -38,6 +34,14 @@
 
 #define d(x)
 
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
+
 void org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t);
 
 static volatile gint org_gnome_audio_class_id_counter = 0;
@@ -78,7 +82,7 @@ org_gnome_audio_inline_pobject_free (EMFormatHTMLPObject *o)
 	}
 
 	if (po->part) {
-		camel_object_unref (po->part);
+		g_object_unref (po->part);
 		po->part = NULL;
 	}
 	if (po->filename) {
@@ -205,10 +209,10 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob
 		d(printf ("audio inline formatter: write to temp file %s\n", po->filename));
 
 		stream = camel_stream_fs_new_with_name (po->filename, O_RDWR | O_CREAT | O_TRUNC, 0600);
-		data = camel_medium_get_content_object (CAMEL_MEDIUM (po->part));
+		data = camel_medium_get_content (CAMEL_MEDIUM (po->part));
 		camel_data_wrapper_decode_to_stream (data, stream);
 		camel_stream_flush (stream);
-		camel_object_unref (stream);
+		g_object_unref (stream);
 
 		d(printf ("audio inline formatter: init gst playbin\n"));
 
@@ -297,7 +301,7 @@ org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t)
 
 	pobj = (struct _org_gnome_audio_inline_pobject *) em_format_html_add_pobject ((EMFormatHTML *) t->format, sizeof(*pobj), classid,
 										      t->part, org_gnome_audio_inline_button_panel);
-	camel_object_ref (t->part);
+	g_object_ref (t->part);
 	pobj->part = t->part;
 	pobj->filename = NULL;
 	pobj->playbin = NULL;
diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog
deleted file mode 100644
index 7413e0e564..0000000000
--- a/plugins/backup-restore/ChangeLog
+++ /dev/null
@@ -1,182 +0,0 @@
-2009-01-30  Milan Crha  <mcrha@redhat.com>
-
-	*  backup-restore.c: (sanity_check): Removed dangling '*/'.
-
-2009-01-28  Tor Lillqvist  <tml@novell.com>
-
-	Make it compile on Windows, by Fridrich Strbra. (Just compile;
-	little chance of it actually doing anything sensible on Windows at
-	this point...)
-
-	* Makefile.am: Use -no-undefined on Windows. Link with libeutil.
-
-	* backup.c: Remove unused <sys/wait.h>.
-
-	* backup-restore.c: Check HAVE_SYS_WAIT_H.
-	
-2009-01-21  Milan Crha  <mcrha@redhat.com>
-
-	* Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* backup-restore.c:
-	* backup.c:
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
-	dlls on Windows.
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #543754
-
-	* org-gnome-backup-restore.error.xml:
-	Reword "insufficient-permissions" error message.
-
-2008-07-03  Roger Zauner  <roger@eskimo.com>
-
-	** Fix for bug #540400
-
-	* backup.c: (backup): Make Evolution Backup follow symbolic links.
-
-2008-07-01  Milan Crha <mcrha@redhat.com>
-
-	** Fix for bug #540274
-
-	* Makefile.am: Link with libraries we require now.
-	* backup.c: (rc), (s): Exchange $HOME with g_get_home_dir in commands.
-	* backup.c: (ensure_locals), (fix_account_folder_uri), (restore):
-	After restore walk through all account, addressbook, calendar, task
-	and memo sources and fix the base uri if required. (One should be able
-	to import also into different user than one where the backup was done.)
-
-2008-06-30  Milan Crha <mcrha@redhat.com>
-
-	** Fix for bug #536488
-
-	* backup.c: (backup), (restore): Remove '~/.evolution/.running'
-	file before backup/after restore, thus Evolution will not claim
-	next start it was closed incorrectly.
-
-2008-06-30  Tobias Mueller  <muelli@auftrags-killer.org>
-
-	** Fix for bug #540516
-
-	* backup.c (backup), (restore), (check): Sanitize user input while 
-	accepting path/filename of the backup. 
-
-2008-06-20  Milan Crha <mcrha@redhat.com>
-
-	* backup.c: (main): Use Evolution icon for the window.
-
-2008-06-19  Milan Crha <mcrha@redhat.com>
-
-	** Fix for bug #478469
-
-	* backup.c: (main):
-	Changed the progress dialog to be more HIG compliant.
-
-2008-05-20  Sankar P  <psankar@novell.com>
-
-	* backup-restore.c: (epbr_perform_pre_backup_checks),
-	(org_gnome_backup_restore_backup):
-	* org-gnome-backup-restore.error.xml:
-	Indicate error if backup folder chosen lacks permissions.
-
-	** Fixes bug #534012
-
-2008-02-25  Jeff Cai<jeff.cai@sun.com>
-
-	* backup.c: (backup), (restore):
-	Because Solaris tar doesn't respect '-z' option, use gzip&tar to
-	finish the silimar function.
-
-2008-02-20  Jeff Cai<jeff.cai@sun.com>
-
-	** Fix for bug #516648
-
-	* backup.c: (backup), (restore):
-	Use $HOME instead of "~"
-
-2008-01-06  Christian Krause  <chkr@plauener.de>
-
-	* backup.c: (backup), (restore), (check), (main): Initialize static 
-	variables before use, not-NULL checks for filename before
-	backup/restore/check operations. 
-
-2007-08-07  Johnny Jacob  <jjohnny@novell.com>
-	
-	* Committed on behalf of Anand V M   <avmuttagi@gmail.com>
-	
-	** Fix for bug #458508
-
-	* backup-restore-plugin: string issues resolved.
-
-2007-08-23  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* backup-restore.c: (org_gnome_backup_restore_restore): Popup the
-	right warning
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* backup.c: Remove BASE_VERSION from the binary
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #428328 from Ghislain MARY
-
-	* backup.c: (main): Use GOptions from popt
-
-2007-04-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Reworked Backup/Restore plugin. It comes in File menu for
-	backup/restore. It also provides a option to restore, while setting up
-	a new account. Option added to show GUI progress for backup/restore.
-
-	* Makefile.am: Added error file to build.
-	* backup-restore.c: (backup), (restore), (sanity_check),
-	(dialog_prompt_user), (org_gnome_backup_restore_backup),
-	(org_gnome_backup_restore_restore), (check_toggled),
-	(restore_wizard), (file_changed), (backup_restore_page),
-	(backup_restore_commit), (backup_restore_abort):
-	* backup.c: (backup), (restore), (check), (pbar_update),
-	(thread_start), (idle_cb), (dlg_response), (main):
-	* org-gnome-backup-restore.eplug.xml:
-	* org-gnome-backup-restore.error.xml:
-	* org-gnome-backup-restore.xml:
-
-2007-04-02  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
-
-	* org-gnome-backup-restore.eplug.xml:
-	Cleanup. 
-	Fixes part of #301149
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2005-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: setup built_sources & cleanfiles.
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (plugin_DATA): 
-	* org-gnome-backup-restore.eplug.xml: s/.in/.xml & i18n.
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-backup-restore.eplug.in: Added author and fixed description.
-
-2004-12-16  JP Rosevear  <jpr@novell.com>
-
-	* Imported backup/restore plugin
-
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 5286605f66..87feab7a25 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -51,6 +51,14 @@ typedef enum _br_flags {
 	BR_START = 1<<1
 }br_flags;
 
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
+
 static void
 backup (const gchar *filename, gboolean restart)
 {
@@ -350,14 +358,14 @@ static GtkActionEntry entries[] = {
 
 	{ "settings-backup",
 	  NULL,
-	  N_("_Backup Settings..."),
+	  N_("_Backup Evolution Settings..."),
 	  NULL,
 	  N_("Backup Evolution data and settings to an archive file"),
 	  G_CALLBACK (action_settings_backup_cb) },
 
 	{ "settings-restore",
 	  NULL,
-	  N_("R_estore Settings..."),
+	  N_("R_estore Evolution Settings..."),
 	  NULL,
 	  N_("Restore Evolution data and settings from an archive file"),
 	  G_CALLBACK (action_settings_restore_cb) }
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index dcaaa7e4fe..3c2fe90a6d 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -252,7 +252,7 @@ restore (const gchar *filename)
 	run_cmd (EVOLUTION " --quit");
 
 	CANCEL (complete);
-	txt = _("Backup current Evolution data");
+	txt = _("Back up current Evolution data");
 	run_cmd ("mv " EVOLUTION_DIR " " EVOLUTION_DIR_BACKUP);
 	run_cmd ("mv $HOME/.camel_certs ~/.camel_certs_old");
 
@@ -443,6 +443,8 @@ main (gint argc, gchar **argv)
 
 	if (gui_arg && !check_op) {
 		GtkWidget *widget, *container;
+		GtkWidget *action_area;
+		GtkWidget *content_area;
 		const gchar *txt, *txt2;
 		gchar *str = NULL;
 		gchar *markup;
@@ -460,13 +462,16 @@ main (gint argc, gchar **argv)
 		gtk_dialog_set_has_separator (GTK_DIALOG (progress_dialog), FALSE);
 		gtk_container_set_border_width (GTK_CONTAINER (progress_dialog), 12);
 
+		action_area = gtk_dialog_get_action_area (
+			GTK_DIALOG (progress_dialog));
+		content_area = gtk_dialog_get_content_area (
+			GTK_DIALOG (progress_dialog));
+
 		/* Override GtkDialog defaults */
-		widget = GTK_DIALOG (progress_dialog)->vbox;
-		gtk_box_set_spacing (GTK_BOX (widget), 12);
-		gtk_container_set_border_width (GTK_CONTAINER (widget), 0);
-		widget = GTK_DIALOG (progress_dialog)->action_area;
-		gtk_box_set_spacing (GTK_BOX (widget), 12);
-		gtk_container_set_border_width (GTK_CONTAINER (widget), 0);
+		gtk_box_set_spacing (GTK_BOX (content_area), 12);
+		gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
+		gtk_box_set_spacing (GTK_BOX (action_area), 12);
+		gtk_container_set_border_width (GTK_CONTAINER (action_area), 0);
 
 		if (oper && file)
 			str = g_strdup_printf(oper, file);
@@ -476,7 +481,8 @@ main (gint argc, gchar **argv)
 		gtk_table_set_row_spacings (GTK_TABLE (container), 12);
 		gtk_widget_show (container);
 
-		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (progress_dialog)->vbox), container, FALSE, TRUE, 0);
+		gtk_box_pack_start (
+			GTK_BOX (content_area), container, FALSE, TRUE, 0);
 
 		widget = gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_DIALOG);
 		gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0);
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
deleted file mode 100644
index f7b0b27e30..0000000000
--- a/plugins/bbdb/ChangeLog
+++ /dev/null
@@ -1,347 +0,0 @@
-2008-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #553527
-
-	* bbdb.c: (struct todo_struct), (free_todo_struct), (bbdb_do_in_thread),
-	(bbdb_do_thread), (bbdb_handle_reply): Do the EBook work in a separate
-	thread to have better performance on reply with slow address books.
-
-2008-09-29  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #497928
-
-	* bbdb.c: (source_changed_cb), (gaim_source_changed_cb):
-	Set URI to empty string when user deletes previously selected source.
-
-2008-09-19  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* bbdb.c:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gaimbuddies.c:
-
-2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #534762
-
-	* bbdb.c: (bbdb_page_factory):
-	* org-gnome-evolution-bbdb.eplug.xml: Change "addressbook" to
-	"address book" in translatable strings.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* bbdb.h:
-	* test-evobuddy.c:
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
-	dlls on Windows.
-
-2008-08-07  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fixes bug #546785
-
-	* bbdb.c: (e_plugin_lib_enable): The bbdb plugin is noisy when
-	enabled:
-	    "BBDB spinning up..."
-	Make this plugin just as polite as google-account-setup.
-
-2008-07-28  Lucian Langa  <lucilanga@gnome.org>
-
-	** See bug #504417
-
-	* bbdb.c: - Preferences window cut off
-
-2008-01-10  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #496402
-
-	* gaimbuddies.c: (parse_buddy_group), (get_all_blocked),
-	(bbdb_get_gaim_buddy_list), (free_gaim_body), (free_buddy_list),
-	(parse_buddy_group): Do not synchronize blocked bodies from pidgin.
-
-2008-01-02  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #502914
-
-	* bbdb.c: (enable_toggled_cb): Do not write NULL into gconf.
-
-2007-12-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #391062
-
-	* bbdb.c: (bbdb_open_addressbook): Dont add contacts, if it is enabled
-	to do so.
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* bbdb.c: (bbdb_check_gaim_enabled), (source_changed_cb):
-	ANSIfication of function declaration.
-
-2007-10-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #417999
-
-	* bbdb.c:
-	* gaimbuddies.c:
-	Use ESourceComboBox instead of ESourceOptionMenu (deprecated).
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* bbdb.c:
-	* gaimbuddies.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* bbdb.c (bbdb_page_factory):
-	Use consistent terminology for mail messages (#480621).
-
-2007-08-24  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #440807
-
-	* bbdb.c: (bbdb_page_factory):
-	* gaimbuddies.c: (bbdb_sync_buddy_list_check),
-	(bbdb_get_gaim_buddy_list), (get_buddy_icon_from_setting),
-	(parse_contact):
-	Sync now with Pidgin IM [previously Gaim IM].
-
-2007-08-06  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Diego Escalante Urrelo
-	<diegoe@gnome.org>
-
-	* bbdb.c: (bbdb_timeout), (bbdb_open_addressbook):
-	* gaimbuddies.c: (bbdb_sync_buddy_list_check):
-	"Synchronize now" should work even if periodic checking 
-	is not enabled.
-	Fixes bug #377309
-
-2007-06-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #334140
-
-	* bbdb.c: (bbdb_do_it): Strip '\"' out of name part, if exists.
-
-2007-06-07  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* gaimbuddies.c: (get_node_text), (parse_contact): more compilation
-	warnings cleanup, completes bug #437584 fixes
-
-2007-05-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #414195 from Loïc Minier
-
-	* Makefile.am:
-
-2007-05-11  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* gaimbuddies.c: (bbdb_sync_buddy_list_check),
-	(bbdb_get_gaim_buddy_list), (get_node_text), (parse_contact),
-	(parse_buddy_group): add casts to clear compilation warnings,
-	Fixes part of bug #437584
-
-2007-04-02  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
-
-	* org-gnome-evolution-bbdb.eplug.xml:
-	Cleanup. 
-	Fixes part of #301149
-
-2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gaimbuddies.c:
-	Fix "incompatible pointer type" warnings (#360619).
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2006-08-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gaimbuddies.c: (bbdb_sync_buddy_list_check): Don't leak
-	the file path here.
-
-2006-08-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* bbdb.c: (bbdb_open_addressbook),
-	(create_addressbook_option_menu): Plug a couple leaks.
-
-2006-08-03  Devashish Sharma  <sdevashish@novell.com>
-
-	* bbdb.c: Gaim and automatic contacts were not seen until
-	evolution is restarted. 
-	Fix for Bug #346180, 349371, 346353
-
-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
-	not marked. Fixes bug #347312.
-
-2006-02-14  Andre Klapper <a9016009@gmx.de>
-
-	* bbdb.c (bbdb_page_factory): Another typo fix from gfree to g_free.	
-
-2006-02-14  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	* bbdb.c (bbdb_page_factory): A typo fix from gfree to g_free.
-	
-2006-02-12  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* bbdb.c (bbdb_page_factory): 
-	Removing unnecessary markup in translateable string.
-	Fixes part of bug #272789.
-
-2006-01-23  Devashish Sharma <sdevashish@novell.com>
-
-	* bbdb.c :
-	* gaimbuddies.c : 
-	Added provision for having the gaimbuddies synced to a separate
-	addressbook. Earlier it used the same addressbook as used for
-	Automatic Contacts.
-
-2006-01-19  Andre Klapper <a9016009@gmx.de>
-
-	* org-gnome-evolution-bbdb.eplug.xml:
-	changed "mails" to "mail" or "messages". Fixes bug 325569.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* org-gnome-evolution-bbdb.eplug.xml:  Fixing several typos and 
-	  harmonizing capital/small letters. Partially fixes bug 306117.
-
-2005-09-13  Sushma Rai  <rsushma@novell.com>
-
-	* bbdb.c (bbdb_do_it): If the contact has only e-mail id and not name,
-	extract the name from e-mail id and add it to the address book.
-	Fixes #303286.
-
-2005-07-28  Vivek Jain  <jvivek@novell.com>
-	
-	* bbdb.c:(bbdb_handle_reply):check for NULL
-	before using the address.
-	**Fixes bugs like #274544
-
-2005-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: setup cleanfiles/built_sources
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: 
-	* org-gnome-evolution-bbdb.eplug.xml: s/.in/.xml/ & i18n.
-
-2005-04-07  Sushma Rai  <rsushma@novell.com>
-
-	* bbdb.c (bbdb_handle_reply): Check for camel_internet_address_get()
-	return value and initialize name and e-mail variables inside the loop. 
-	(bbdb_do_it): Check for query being NULL. Fixes #74366.
-	Free list of contacts before returning, on finding multiple contacts 
-	with the same name.
-
-2005-04-05  Not Zed  <NotZed@Ximian.com>
-
-	* bbdb.c (bbdb_handle_reply): noop if we can't open the book/we're
-	disabled.
-
-2005-02-07  JP Rosevear  <jpr@novell.com>
-
-	* org-gnome-evolution-bbdb.eplug.in: specify id
-
-2005-01-31   Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* gaimbuddies.c (bbdb_sync_buddy_list) : initialize 
-	GError* to NULL 
-	Fixes #71512 
-	
-	* bbdb.c (bbdb_open_addressbook) : ditto 
-		
-2005-01-22  Nat Friedman  <nat@novell.com>
-
-	* gaimbuddies.c (im_list_contains_buddy): Check the buddy account
-	name, not alias.  Duh.
-	(free_contact_list): Removed.
-
-2005-01-13  Nat Friedman  <nat@novell.com>
-
-	* gaimbuddies.c (bbdb_sync_buddy_list_check): Remove some debug
-	printfs.
-	(bbdb_sync_buddy_list): Do not query for the IM name, which is
-	slow.  Instead, query by alias and only commit the contact if we
-	have changes for it.
-	(bbdb_merge_buddy_to_contact): Return a boolean indicating whether
-	we dirtied the contact or not.
-
-2005-01-08  Nat Friedman  <nat@novell.com>
-
-	* org-gnome-evolution-bbdb.eplug.in: Reformatted the description.
-
-2004-11-03  Nat Friedman  <nat@novell.com>
-
-	* org-gnome-evolution-bbdb.eplug.in: Add description and author
-	fields.  Change name.
-
-2004-11-01  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: dist .eplug.in file
-
-2004-11-01  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: list bbdb.h as a source so it gets disted
-
-2004-10-27  Nat Friedman  <nat@novell.com>
-
-	* bbdb.c (bbdb_page_factory): Use _with_mnemonic for the button.
-
-	* Makefile.am: Don't build the test program by default.
-
-2004-10-25  Nat Friedman  <nat@novell.com>
-
-	* bbdb.c (e_plugin_lib_enable): Sync the Gaim buddy list.  Set a
-	timer to check for Gaim buddy list chnages to sync.
-	(bbdb_do_it): Free some memory we were leaking before.
-	(bbdb_open_addressbook): New function for Gaim buddy list support.
-	(bbdb_check_gaim_enabled): Likewise.
-	(enable_gaim_toggled_cb): Likewise.
-	(synchronize_button_clicked_cb): Likewise.
-	(bbdb_page_factory): Added UI for Gaim buddy list sync support.
-
-	* gaimbuddies.c: New file, contains routines to synchronize IM
-	information and buddy icons from a Gaim buddy list.
-
-	* bbdb.h: New file, contains shared macros and prototypes. 
-
-	* test-evobuddy.c (main): New function, tests a gaim buddy list
-	sync.
-
-2004-10-23  Nat Friedman  <nat@novell.com>
-
-	* bbdb.c (bbdb_do_it): Change assertions to if statements, so as
-	not to issue warnings in the case of routine failures (name
-	is NULL). Don't add an email to a contact if the appropriate
-	contact is ambiguous.
-
-2004-10-22  Nat Friedman  <nat@novell.com>
-
-	* Initial checkin.
-
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index e3666f94de..545fd6842d 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -34,7 +34,6 @@
 #include <e-util/e-config.h>
 #include <mail/em-config.h>
 #include <mail/em-event.h>
-#include <camel/camel-mime-message.h>
 #include <composer/e-msg-composer.h>
 
 #include "bbdb.h"
@@ -682,7 +681,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 
 	/* Create a new notebook page */
 	page = gtk_vbox_new (FALSE, 0);
-	GTK_CONTAINER (page)->border_width = 12;
+	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 	tab_label = gtk_label_new (_("Automatic Contacts"));
 	gtk_notebook_append_page (GTK_NOTEBOOK (hook_data->parent), page, tab_label);
 
@@ -695,7 +694,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	str = g_strdup_printf ("<span weight=\"bold\">%s</span>", _("Automatic Contacts"));
 	gtk_label_set_markup (GTK_LABEL (frame_label), str);
 	g_free (str);
-	GTK_MISC (frame_label)->xalign = 0.0;
+	gtk_misc_set_alignment (GTK_MISC (frame_label), 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0);
 
 	/* Indent/padding */
@@ -731,7 +730,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	str = g_strdup_printf ("<span weight=\"bold\">%s</span>", _("Instant Messaging Contacts"));
 	gtk_label_set_markup (GTK_LABEL (frame_label), str);
 	g_free (str);
-	GTK_MISC (frame_label)->xalign = 0.0;
+	gtk_misc_set_alignment (GTK_MISC (frame_label), 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0);
 
 	/* Indent/padding */
@@ -743,7 +742,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0);
 
 	/* Enable Gaim Checkbox */
-	check_gaim = gtk_check_button_new_with_mnemonic (_("Synchronize contact info and images from Pidgin buddy list"));
+	check_gaim = gtk_check_button_new_with_mnemonic (_("_Synchronize contact info and images from Pidgin buddy list"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_gaim), gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_GAIM, NULL));
 	g_signal_connect (GTK_TOGGLE_BUTTON (check_gaim), "toggled", G_CALLBACK (enable_gaim_toggled_cb), stuff);
 	gtk_box_pack_start (GTK_BOX (inner_vbox), check_gaim, FALSE, FALSE, 0);
diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog
deleted file mode 100644
index b24ac0db6c..0000000000
--- a/plugins/bogo-junk-plugin/ChangeLog
+++ /dev/null
@@ -1,123 +0,0 @@
-2009-01-28  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use -no-undefined on Windows. Link with libeutil.
-
-	* bf-junk-filter.c: Tentative port to Windows even though this
-	plugin isn't even compiled on Windows for now. Just for
-	completeness.
-
-2008-12-15  srinivasa ragavan  <sragavan@novell.com>
-
-	* makefile.am:
-	* bf-junk-filter.c: (init_db), (pipe_to_bogofilter): init the
-	bogofilter if it wasn't. say that evolution's welcome message is not
-	junk.
-
-2008-10-14  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* bf-junk-filter.c:
-
-2008-04-29  Milan Crha  <mcrha@redhat.com>
-
-	* bf-junk-filter.c: (pipe_to_bogofilter):
-	Report errors properly. Thanks to Reid Thompson whom found it.
-
-2008-04-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #273041
-
-	* bf-junk-filter.c: (pipe_to_bogofilter), (em_junk_bf_check_junk),
-	(em_junk_bf_report_junk), (em_junk_bf_report_non_junk):
-	Propagate possible errors to the UI.
-
-2008-03-19  Sankar P  <psankar@novell.com>
-
-	** Fix for bug #519304
-
-	* org-gnome-bogo-junk-plugin.eplug.xml:
-	Mark plugin name for translation.
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* bf-junk-filter.c:
-	Use consistent terminology for mail messages (#480621).
-
-2007-09-07  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #473903
-
-	* bf-junk-filter.c: (em_junk_bf_validate_binary): Changing function
-	prototype to fit what is expected in 'invoke', returns value based on it.
-
-2007-08-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* bf-junk-filter.c: (e_plugin_lib_enable): Avoid re-entrancy in
-	enable
-
-2007-08-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #468294
-
-	* org-gnome-bogo-junk-plugin.eplug.xml: Add a few strings for
-	translation.
-
-2007-08-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #468303
-
-	* org-gnome-bogo-junk-plugin.eplug.xml: Enable strings for i18n.
-
-2007-07-26  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* bf-junk-filter.c: (convert_unicode_cb): Plugged memory leak.
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
-	
-	* Makefile.am:
-
-2007-05-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #337616
-
-	* Makefile.am: Add $(schema_DATA) to DISTCLEANFILES.
-
-	* org-gnome-bogo-junk-plugin.eplug.in: Rename as *.eplug.xml.
-
-2007-05-11  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* bf-junk-filter.c: add prototypes to clean compilation warnings
-	Fixes part of bug #437584
-
-2007-04-23  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am: Distribute bogo-junk-plugin.schemas.in.in.  (#432616)
-
-2007-04-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* Makefile.am: Committing the right Makefile.am
-
-2007-04-03  Srinivasa Ragavan <sragavan@novell.com>
-
-	** Added bogofilter part of Evolution source.
-
-2006-02-19  Mikhail Zabaluev <mhz@altlinux.org>
-
-* configure.ac: Switched to evolution-plugin-2.6 for plugin configuration.
-Bumped version to 0.2.0.
-
-* org-altlinux-bf-junk-plugin.eplug.in: Templatized the plugin manifesto,
-with plugin install directory substituted.
-* configure.ac: Added org-altlinux-bf-junk-plugin.eplug to AC_CONFIG_FILES.
-* Makefile.am: Added org-altlinux-bf-junk-plugin.eplug.in to EXTRA_DIST.
-
-* README: Added bug reference to the initial ham training problem.
-
-2005-11-22  Mikhail Zabaluev <mhz@altlinux.org>
-
-* README: Added reference to Spam Trainer.
-
-* README: Reflect on the fix for bug #313096 that made it to Evolution 2.5.2.
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 4190eebe86..6cc2e80d4d 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -45,11 +45,6 @@
 #include <e-util/e-plugin.h>
 #include "mail/em-config.h"
 #include <mail/em-junk.h>
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-mime-parser.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-debug.h>
 #include <gconf/gconf-client.h>
 #include "shell/e-shell.h"
 
@@ -100,10 +95,10 @@ init_db (void)
 
 	camel_mime_parser_init_with_stream (parser, stream);
 	camel_mime_parser_scan_from (parser, FALSE);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	camel_mime_part_construct_from_parser ((CamelMimePart *) msg, parser);
-	camel_object_unref (parser);
+	g_object_unref (parser);
 
 	d(fprintf (stderr, "Initing the bogofilter DB with Welcome message\n"));
 
@@ -112,7 +107,7 @@ init_db (void)
 	}
 
 	pipe_to_bogofilter (msg, argv, NULL);
-	camel_object_unref (msg);
+	g_object_unref (msg);
 
 }
 
@@ -172,7 +167,7 @@ retry:
 	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (msg), stream);
 	camel_stream_flush (stream);
 	camel_stream_close (stream);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 #ifndef G_OS_WIN32
 	waitres = waitpid (child_pid, &status, 0);
@@ -391,7 +386,9 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac
 {
 	EShell *shell;
 	GtkWidget *check;
-	guint i = ((GtkTable *)data->parent)->nrows;
+	guint n_rows;
+
+	g_object_get (data->parent, "n-rows", &n_rows, NULL);
 
 	if (data->old)
                 return data->old;
@@ -400,7 +397,9 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_bf_unicode);
 	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), (gpointer) "/apps/evolution/mail/junk/bogofilter/unicode");
-	gtk_table_attach((GtkTable *)data->parent, check, 0, 1, i, i+1, 0, 0, 0, 0);
+	gtk_table_attach (
+		GTK_TABLE (data->parent), check,
+		0, 1, n_rows, n_rows+1, 0, 0, 0, 0);
 
 	shell = e_shell_get_default ();
 	if (e_shell_get_express_mode (shell))
diff --git a/plugins/caldav/ChangeLog b/plugins/caldav/ChangeLog
deleted file mode 100644
index 9a9bae7398..0000000000
--- a/plugins/caldav/ChangeLog
+++ /dev/null
@@ -1,124 +0,0 @@
-2009-04-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #578335
-
-	* caldav-source.c: (user_changed), (location_changed):
-	Revert part of bug #562990, as EPassword requires username
-	as part of an URL to store passwords properly to a keyring.
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #569652
-
-	* caldav-source.c: (ensure_caldav_source_group):
-	Use new ESourceList API (simplifies code).
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* caldav-source.c: Remove deprecated Gtk+ symbols.
-
-2009-02-26  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #572950
-
-	* Makefile.am:
-	Fix ordering of -I compiler directives.  Patch by Daniel Macks.
-
-2008-12-08  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #562990
-
-	* caldav-source.c: (user_changed), (oge_caldav): Use 'username'
-	property of the ESource to read/write user name, not the uri.
-
-2008-11-28  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #503662
-
-	* caldav-source.c: (user_changed):
-	Set NULL properly to protect against using already freed memory.
-
-2008-11-28  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #359745
-
-	* caldav-source.c: (ensure_caldav_source_group),
-	(e_plugin_lib_enable): Ensure source group for VTODO and VJOURNAL too.
-	* caldav-source.c: (set_refresh_time), (get_refresh_minutes),
-	(spin_changed), (option_changed), (oge_caldav):
-	Be able to change refresh time for the CalDAV sources.
-	* org-gnome-evolution-caldav.eplug.xml:
-	Show CalDAV options under all the other standard options.
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* caldav-source.c:
-
-2008-08-07  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fixes bug #546785
-
-	* caldav-source.c: (e_plugin_lib_enable): The caldav plugin is noisy
-	when enabled:
-	    "CalDAV Eplugin starting up ..."
-	Make this plugin just as polite as google-account-setup.
-
-2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #545568
-
-	* org-gnome-caldav.eplug.xml:
-	Add "system_plugin=true" so it's not shown in the Plugin Manager.
-	This plugin is not designed to be disabled by the user.
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* caldav-source.c: (ensure_caldav_source_group):
-	ANSIfication of function declaration.
-
-2007-05-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #337616
-
-	* Makefile.am: Add "eplug" file to CLEANFILES.
-
-2006-08-28  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* org-gnome-evolution-caldav.eplug.xml: Mark name and
-	description for translation.
-	Makefile.am: Rename the above from .in to .xml
-
-2006-06-15  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED.
-
-	* org-gnome-evolution-caldav.eplug.in: Use SOEXT.
-
-2006-03-28  Jeff Cai  <jeff.cai@sun.com>
-
-	** Fixes #333881
-	* caldav-source.c: (oge_caldav):
-	Set an empty string instead of null for a TEXT entry.
-
-2006-02-22  Irene.Huang <Irene.Huang@sun.com>
-
-	Fixes bug #328252
-
-	* Makefile.am: Add $(EVOLUTION_CALENDAR_LIBS)
-	to liborg_gnome_evolution_caldav_la_LIBADD.
-
-2006-01-16  Harish Krishnaswamy <kharish@novell.com>
-
-	* Makefile.am : Integrate with eplugin make 
-	scripts and add a ChangeLog file for the eplugin.
-	
-2006-01-16  Harish Krishnaswamy <kharish@novell.com>
-
-	* caldav*:  'Import' the CalDAV eplugin 
-	implementation into evolution. Please
-	refer evolution-caldav module in cvs.gnome.org for
-	prior Change history.
diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c
index ff19ff0c38..8b2d1ae0e4 100644
--- a/plugins/caldav/caldav-browse-server.c
+++ b/plugins/caldav/caldav-browse-server.c
@@ -39,7 +39,6 @@
 #include <libedataserverui/e-passwords.h>
 
 #include <e-util/e-dialog-utils.h>
-#include <widgets/misc/e-spinner.h>
 
 #include "caldav-browse-server.h"
 
@@ -789,6 +788,7 @@ soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gbool
 
 	if (!password || !*password || retrying) {
 		gchar *pass, *prompt, *add = NULL;
+		gchar *bold_user, *bold_host;
 
 		if (retrying && msg && msg->reason_phrase) {
 			add = g_strdup_printf (_("Previous attempt failed: %s"), msg->reason_phrase);
@@ -796,7 +796,11 @@ soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gbool
 			add = g_strdup_printf (_("Previous attempt failed with code %d"), msg->status_code);
 		}
 
-		prompt = g_strdup_printf (_("Enter password for user <b>%s</b> on server <b>%s</b>"), username, soup_auth_get_host (auth));
+		bold_user = g_strconcat ("<b>", username, "</b>", NULL);
+		bold_host = g_strconcat ("<b>", soup_auth_get_host (auth), "</b>", NULL);
+		prompt = g_strdup_printf (_("Enter password for user %s on server %s"), bold_user, bold_host);
+		g_free (bold_user);
+		g_free (bold_host);
 		if (add) {
 			gchar *tmp;
 
@@ -1180,7 +1184,8 @@ init_dialog (GtkDialog *dialog, GtkWidget **new_url_entry, const gchar *url, con
 
 	info_box = gtk_hbox_new (FALSE, 2);
 
-	spinner = e_spinner_new_spinning_small_shown ();
+	spinner = gtk_spinner_new ();
+	gtk_spinner_start (GTK_SPINNER (spinner));
 	gtk_box_pack_start (GTK_BOX (info_box), spinner, FALSE, FALSE, 0);
 	g_object_set_data (G_OBJECT (dialog), "caldav-spinner", spinner);
 
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index 5691fdde45..a3129af3a4 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.c
@@ -185,6 +185,7 @@ oge_caldav  (EPlugin                    *epl,
 	SoupURI      *suri;
 	GtkWidget    *parent, *location, *ssl, *user, *browse_cal;
 	gchar        *uri, *username;
+	guint         n_rows;
 
 	source = t->source;
 
@@ -214,25 +215,38 @@ oge_caldav  (EPlugin                    *epl,
 
 	location = e_plugin_util_add_entry (parent, _("_URL:"), NULL, NULL);
 	gtk_entry_set_text (GTK_ENTRY (location), uri);
-	g_signal_connect (G_OBJECT (location), "changed", G_CALLBACK (location_changed_cb), source);
+
+	g_signal_connect (
+		location, "changed",
+		G_CALLBACK (location_changed_cb), source);
 
 	ssl = e_plugin_util_add_check (parent, _("Use _SSL"), source, "ssl", "1", "0");
 
 	user = e_plugin_util_add_entry (parent, _("User_name:"), NULL, NULL);
 	gtk_entry_set_text (GTK_ENTRY (user), username ? username : "");
-	g_signal_connect (G_OBJECT (user), "changed", G_CALLBACK (user_changed_cb), source);
+
+	g_signal_connect (
+		user, "changed",
+		G_CALLBACK (user_changed_cb), source);
 
         g_free (uri);
 	g_free (username);
 
 	browse_cal = gtk_button_new_with_mnemonic (_("Brows_e server for a calendar"));
 	gtk_widget_show (browse_cal);
-	gtk_table_attach (GTK_TABLE (parent), browse_cal, 1, 2, GTK_TABLE (parent)->nrows, GTK_TABLE (parent)->nrows + 1, GTK_FILL, 0, 0, 0);
+	g_object_get (parent, "n-rows", &n_rows, NULL);
+	gtk_table_attach (
+		GTK_TABLE (parent), browse_cal, 1, 2,
+		n_rows, n_rows + 1, GTK_FILL, 0, 0, 0);
 
 	g_object_set_data (G_OBJECT (browse_cal), "caldav-url", location);
 	g_object_set_data (G_OBJECT (browse_cal), "caldav-username", user);
 	g_object_set_data (G_OBJECT (browse_cal), "caldav-ssl", ssl);
-	g_signal_connect  (G_OBJECT (browse_cal), "clicked", G_CALLBACK (browse_cal_clicked_cb), GINT_TO_POINTER (t->source_type));
+
+	g_signal_connect  (
+		browse_cal, "clicked",
+		G_CALLBACK (browse_cal_clicked_cb),
+		GINT_TO_POINTER (t->source_type));
 
 	e_plugin_util_add_refresh (parent, _("Re_fresh:"), source, "refresh");
 
diff --git a/plugins/calendar-file/ChangeLog b/plugins/calendar-file/ChangeLog
deleted file mode 100644
index 66be2b91b2..0000000000
--- a/plugins/calendar-file/ChangeLog
+++ /dev/null
@@ -1,60 +0,0 @@
-2008-09-04  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* calendar-file.c:
-
-2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #545568
-
-	* org-gnome-calendar-file.eplug.xml:
-	Add "system_plugin=true" so it's not shown in the Plugin Manager.
-	This plugin is not designed to be disabled by the user.
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2006-02-28  Christian Kellner  <gicmo@gnome.org>
-
-	* calendar-file.c: fixing a leak.
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* calendar-file.c (e_calendar_file_dummy): fix relative_uri type.
-
-2005-06-27  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: There is no EVOLUTION_CFLAGS. Use
-	NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* org-gnome-calendar-file.eplug.xml: Use SOEXT.
-
-2005-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: add built_sources/cleanfiles
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: 
-	* org-gnome-calendar-file.eplug.xml: s/.in/.xml/ & i18n.
-
-2005-02-28  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* calendar-file.c (e_calendar_file_dummy) :
-	don't set the relative uri if already present.
-                                                                                
-        part of fix for #73152
-	
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* calendar-file.c: Added author and description.
-
-2005-01-06  JP Rosevear  <jpr@novell.com>
-
-	* Initial import of file properties plugin.
diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index e82feaa11a..7bacfb44a6 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.c
@@ -27,6 +27,14 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
+
 static void
 location_changed (GtkFileChooserButton *widget, ESource *source)
 {
@@ -95,6 +103,7 @@ e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data)
 	ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target;
 	ESource *source = t->source;
 	const gchar *relative_uri, *value;
+	guint n_rows;
 	GtkWidget *w1, *w2, *box1, *box2, *mainbox, *maincheck;
 
 	if (!e_plugin_util_is_source_proto (source, "file"))
@@ -107,7 +116,11 @@ e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data)
 	e_source_set_relative_uri (source, e_source_peek_uid (source));
 
 	mainbox = gtk_vbox_new (FALSE, 2);
-	gtk_table_attach (GTK_TABLE (data->parent), mainbox, 1, 2, GTK_TABLE (data->parent)->nrows, GTK_TABLE (data->parent)->nrows + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+	g_object_get (data->parent, "n-rows", &n_rows, NULL);
+	gtk_table_attach (
+		GTK_TABLE (data->parent), mainbox,
+		1, 2, n_rows, n_rows + 1,
+		GTK_EXPAND | GTK_FILL, 0, 0, 0);
 
 	maincheck = gtk_check_button_new_with_mnemonic (_("_Customize options"));
 	gtk_box_pack_start ((GtkBox *)mainbox, maincheck, TRUE, TRUE, 2);
diff --git a/plugins/calendar-http/ChangeLog b/plugins/calendar-http/ChangeLog
deleted file mode 100644
index 7ceb72ae76..0000000000
--- a/plugins/calendar-http/ChangeLog
+++ /dev/null
@@ -1,103 +0,0 @@
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* calendar-http.c: Remove deprecated Gtk+ symbols.
-
-2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #545568
-
-	* org-gnome-calendar-http.eplug.xml:
-	Add "system_plugin=true" so it's not shown in the Plugin Manager.
-	This plugin is not designed to be disabled by the user.
-
-2008-03-31  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #346555
-
-	* calendar-http.c: (e_calendar_http_refresh):
-	Fixed a mnemonic conflict. 
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* calendar-http.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-07-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #268162
-
-	* org-gnome-calendar-http.eplug.xml:
-	Added new entry for username.
-	* calendar-http.c: (e_calendar_http_auth):
-	Creates and setup entry for username.
-	* calendar-http.c: (username_changed):
-	New callback when user changes username entry content.
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2006-01-16  Tony Tsui  <tsui.tony@gmail.com>
-
-	Fixes #267402
-	* plugins/calendar-http/calendar-http.c
-	* plugins/calendar-http/org-gnome-calendar-http.eplug.xml:
-	Add support for accessing web calendars over HTTPS.
-
-2005-06-27  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: There is no EVOLUTION_CFLAGS. Use
-	NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* org-gnome-calendar-http.eplug.xml: Use SOEXT.
-
-2005-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: added built_sources/cleanfiles
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am:
-	* org-gnome-calendar-http.eplug.xml: s/.in/.xml/ & i18n.
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-calendar-http.eplug.in: Added author and description.
-
-2005-01-06  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: include top_srcdir
-
-2004-12-28  David Trowbridge <David.Trowbridge@Colorado.edu>
-
-	* calendar-http.c (e_calendar_http_check): s/strcmp/strncmp.
-
-	* org-gnome-calendar-http.eplug.in: fixed order of menus.
-
-2004-11-12  Diego Sevilla Ruiz  <dsevilla@ditec.um.es>
-
-	* calendar-http.c (e_calendar_http_check): Accept protocol-less
-	URIs. Fixes #68264.
-	(e_calendar_http_check): Fixed a memory leak.
-	(e_calendar_http_refresh): Another mem. leak fix.
-	(e_calendar_http_url): Fixed another more memory leak.
-
-2004-11-09  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am: Add EXTRA_DIST variable for the eplug.in file
-
-2004-11-04  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: duh, add this to cvs, remove Makefile.
-
-2004-11-04  David Trowbridge <David.Trowbridge@Colorado.edu>
-
-	* Initial import of webcal properties plugin.
diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c
index 1137d0617e..658f93d0e0 100644
--- a/plugins/calendar-http/calendar-http.c
+++ b/plugins/calendar-http/calendar-http.c
@@ -34,6 +34,14 @@ gboolean   e_calendar_http_check (EPlugin *epl, EConfigHookPageCheckData *data);
 GtkWidget * e_calendar_http_secure (EPlugin *epl, EConfigHookItemFactoryData *data);
 GtkWidget *e_calendar_http_auth (EPlugin *epl, EConfigHookItemFactoryData *data);
 
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
+
 static void
 url_changed (GtkEntry *entry, ESource *source)
 {
diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog
deleted file mode 100644
index 8aa7f8990c..0000000000
--- a/plugins/calendar-weather/ChangeLog
+++ /dev/null
@@ -1,140 +0,0 @@
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* calendar-weather.c: Remove deprecated Gtk+ symbols.
-
-2008-12-10  Suman Manjunath  <msuman@novell.com>
-
-	* Makefile.am: Don't try to specify LIBGWEATHER_(CFLAGS|LIBS), they
-	will be provided by configure.in.
-
-2008-12-03  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #352287
-
-	* Makefile.am: Compile and link with libgweather.
-	* calendar-weather.c: (e_plugin_lib_enable), (selection_changed),
-	(find_location_func), (find_location), (treeview_clicked),
-	(create_source_selector), (build_location_path),
-	(location_clicked), (e_calendar_weather_location):
-	Use libgweather for weather calendar.
-
-2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #545568
-
-	* org-gnome-calendar-weather.eplug.xml:
-	Add "system_plugin=true" so it's not shown in the Plugin Manager.
-	This plugin is not designed to be disabled by the user.
-
-2008-03-31  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #346555
-
-	* calendar-weather.c: (e_calendar_weather_refresh):
-	Fixed a mnemonic conflict. 
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* calendar-weather.c: (load_locations), (treeview_clicked):
-	ANSIfication of function declaration.
-
-2007-05-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	* calendar-weather.c (e_calendar_weather_location):
-	Remove check for obsolete GTK+ version (#424562).
-
-2007-05-11  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* calendar-weather.c: (e_plugin_lib_enable), (parse_subtree),
-	(location_clicked), (e_calendar_weather_location),
-	(e_calendar_weather_refresh), (set_units),
-	(e_calendar_weather_units): fix casts in strcmp,
-	fixes part of bug #437584.
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2005-07-13  Tor Lillqvist  <tml@novell.com>
-
-	* calendar-weather.c (e_calendar_weather_migrate): Don't return a
-	value from a void funtion.
-
-2005-06-27  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: There is no EVOLUTION_CFLAGS. Use
-	NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* org-gnome-calendar-weather.eplug.xml: Use SOEXT.
-
-2005-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: added built_sources/cleanfiles
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am:
-
-	* org-gnome-calendar-weather.eplug.xml: s/.in/.xml/ & i18n.
-
-2005-03-22  David Trowbridge  <trowbrds@cs.colorado.edu>
-
-	* Makefile.am: Use $(weatherdatadir) rather than $(weatherdir), get
-	rid of an incorrect comment
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-calendar-weather.eplug.in: Add a . to the end of description.
-
-2005-02-02  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am (INCLUDES): Use $(weatherdir) instead of duplicating the
-	define for it below
-	(weatherdir): Fix to use the correct versioned directory
-
-2005-01-26  David Trowbridge <trowbrds@cs.colorado.edu>
-
-	* org-gnome-calendar-weather.eplug.in: fix typo
-
-2005-01-25  Rodrigo Moya <rodrigo@novell.com>
-
-	* calendar-weather.c (e_plugin_lib_enable): set all new categories to
-	not searchable.
-
-2005-01-12  David Trowbridge <trowbrds@cs.colorado.edu>
-
-	* calendar-weather.c (e_calendar_weather_units): fix spelling
-
-2005-01-12  David Trowbridge <trowbrds@cs.colorado.edu>
-
-	* calendar-weather.c, org-gnome-calendar-weather.eplug.in: use
-	a single setting for metric/imperial rather than separate
-	temperature and snowfall settings
-
-2005-01-10  Rodrigo Moya <rodrigo@novell.com>
-
-	* calendar-weather.c (create_source_selected): use HIG-compliant
-	button order.
-
-2005-01-07  Rodrigo Moya <rodrigo@novell.com>
-
-	* Makefile.am: define EDS's datadir, needed to get to the
-	Locations.xml file.
-
-	* calendar-weather.c (load_locations): use EDS's datadir for the
-	Locations.xml file full path.
-
-2005-01-07  Rodrigo Moya <rodrigo@novell.com>
-
-	* Makefile.am: define weatherdatadir here, no need to use e-d-s's one,
-	use evolution's instead.
-
-2005-01-06  David Trowbridge <trowbrds@cs.colorado.edu>
-
-	* Initial import of weather properties plugin
diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c
index 50c698da28..61180b7153 100644
--- a/plugins/calendar-weather/calendar-weather.c
+++ b/plugins/calendar-weather/calendar-weather.c
@@ -208,6 +208,7 @@ static GtkDialog *
 create_source_selector (ESource *source)
 {
 	GtkWidget *dialog, *treeview, *scrolledwindow;
+	GtkWidget *content_area;
 	GtkCellRenderer *text;
 	GtkTreeSelection *selection;
 	gchar *uri_text;
@@ -256,9 +257,10 @@ create_source_selector (ESource *source)
 	text = gtk_cell_renderer_text_new ();
 	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview), -1, "location", text, "text", 0, NULL);
 
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), scrolledwindow);
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_container_add (GTK_CONTAINER (content_area), scrolledwindow);
 	gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow), 6);
-	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 6);
+	gtk_box_set_spacing (GTK_BOX (content_area), 6);
 
 	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 420, 340);
@@ -334,7 +336,7 @@ GtkWidget *
 e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	GtkWidget *button, *parent, *text, *label;
-	gint row;
+	guint row;
 	ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target;
 	ESource *source = t->source;
 	SoupURI *suri;
@@ -351,7 +353,7 @@ e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	parent = data->parent;
 
-	row = ((GtkTable*)parent)->nrows;
+	g_object_get (parent, "n-rows", &row, NULL);
 
 	label = gtk_label_new_with_mnemonic (_("_Location:"));
 	gtk_widget_show (label);
@@ -432,7 +434,7 @@ GtkWidget *
 e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	GtkWidget *combobox, *parent, *label;
-	gint row;
+	guint row;
 	ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target;
 	ESource *source = t->source;
 
@@ -441,7 +443,7 @@ e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	parent = data->parent;
 
-	row = ((GtkTable*)parent)->nrows;
+	g_object_get (parent, "n-rows", &row, NULL);
 
 	label = gtk_label_new_with_mnemonic (_("_Units:"));
 	gtk_widget_show (label);
diff --git a/plugins/default-mailer/ChangeLog b/plugins/default-mailer/ChangeLog
deleted file mode 100644
index 5fe56f0817..0000000000
--- a/plugins/default-mailer/ChangeLog
+++ /dev/null
@@ -1,123 +0,0 @@
-2008-09-25  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* default-mailer.c:
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Have a check for OS_WIN32 and handle the schema data 
-	differently. make install error on win32.
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
-	dlls on Windows.
-
-2007-08-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am: Fix a distcheck error.
-
-2007-07-26  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* default-mailer.c: (org_gnome_default_mailer_check_default): Plugged
-	memory leak.
-
-2007-07-01  Srinivasa Ragavan  <sragavan@novell.com>
-
-        ** Fix for bug #448970
-
-	* default-mailer.c: (org_gnome_default_mailer_check_default):
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
-
-	* Makefile.am:
-
-2007-05-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #337616
-
-	* Makefile.am: Add $(schema_DATA) to DISTCLEANFILES.
-
-2007-04-02  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
-
-	* org-gnome-default-mailer.eplug.xml:
-	Cleanup. 
-	Fixes part of #301149
-
-2006-08-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #350823
-	
-	* default-mailer.c: (evolution_is_default_mailer),
-	(org_gnome_default_mailer_check_default): Patch from Matthew Barnes
-	to make it robust as well as invokes the right component.
-
-2006-02-27  Srinivasa Ragavan <sragavan@novell.com>
-
-	* default-mailer.c (org_gnome_default_mailer_check_default): Used 
-	gconf_value_free to free a GConfValue instead of a g_free.
-
-2005-12-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: Fix make-clean issues. 
-
-2005-06-23  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: Changed the way the i18n stuff and xml building is
-	done for the 'new way'.
-
-	* default-mailer.c: fixed e-error header move and removed some
-	other unecessary includes.
-
-2005-03-24  Jonathan Dieter  <jdieter99@gmx.net>
-	* default-mailer.c: removed code to put a checkbox in the
-	configuration menu, changed procedure names to avoid
-	namespace pollution.
-
-	* org-gnome-default-mailer.eplug.in: removed definitions
-	to put a checkbox in the configuration menu.
-
-	* apps-evolution-mail-prompts-checkdefault.schema.in.in:
-	schema for GConf key /apps/evolution/mail/prompts/checkdefault.
-
-	* Makefile.am: added steps to build GConf schema.
-
-2005-03-17  Jonathan Dieter  <jdieter99@gmx.net>
-
-	* default-mailer.c: renamed from default-mail-client-check.c
-	Renamed modules to fit new name and cleaned up code.  Fixed
-	small memory leak.
-
-	* org-gnome-default-mailer.xml: renamed from
-	org-gnome-default-mail-client-check.xml.
-
-	* org-gnome-default-mailer.eplug.in: renamed from
-	org-gnome-default-mail-client-check.eplug.in.
-
-	* Makefile.am: Fixed references to fit new file names.
-
-2005-03-15  Jonathan Dieter  <jdieter99@gmx.net>
-
-	* default-mail-client-check.c (check_default_mail_client):
-	Removed gtk_message_dialog() call and replaced with 
-	e_error().
-	
-	* Makefile.am: added necessary steps to build xml.
-	
-	* org-gnome-default-mail-client-check.xml: define the
-	message box that shows up on startup.
-
-2005-03-07  Jonathan Dieter  <jdieter99@gmx.net>
-
-	* default-mail-client-check.c: Plugin implementation.
-
-	* org-gnome-default-mail-client-check.eplug.in: define the
-	default mail client check plugin.
-
-	* Makefile.am: build the default mail client check plugin.
-
diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am
deleted file mode 100644
index b4132fd8eb..0000000000
--- a/plugins/default-mailer/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-@EVO_PLUGIN_RULE@
-
-error_DATA = org-gnome-default-mailer.error
-errordir = $(privdatadir)/errors
-
-plugin_DATA        = org-gnome-default-mailer.eplug 
-
-plugin_LTLIBRARIES = liborg-gnome-default-mailer.la
-
-liborg_gnome_default_mailer_la_CPPFLAGS =		\
-	$(AM_CPPFLAGS)					\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/widgets				\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
-
-liborg_gnome_default_mailer_la_SOURCES = default-mailer.c
-liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_default_mailer_la_LIBADD =	\
-	$(top_builddir)/mail/libevolution-mail.la	\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
-
-schemadir       = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in
-schema_DATA     = $(schema_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-
-if OS_WIN32
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE);	\
-			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat;	\
-			cmd /c _temp.bat; 						\
-			rm _temp.bat;							\
-		done									\
-	fi
-else
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) 		\
-				$(GCONFTOOL) --makefile-install-rule $$p;		\
-		done									\
-	fi
-endif
-
-endif
-
-EXTRA_DIST =					\
-	org-gnome-default-mailer.eplug.xml	\
-	org-gnome-default-mailer.error.xml	\
-	$(schema_in_files)
-
-BUILT_SOURCES = org-gnome-default-mailer.eplug	\
-	org-gnome-default-mailer.error
-
-CLEANFILES = $(BUILT_SOURCES)
-
-DISTCLEANFILES = $(schema_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/plugins/default-mailer/default-mailer.c b/plugins/default-mailer/default-mailer.c
deleted file mode 100644
index 93c100631b..0000000000
--- a/plugins/default-mailer/default-mailer.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Jonathan Dieter <jdieter99@gmx.net>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright 2005 Jonathan Dieter
- *
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <gconf/gconf-client.h>
-
-#include <mail/em-utils.h>
-#include <shell/es-event.h>
-
-#define GCONF_KEY_CHECKDEFAULT   "/apps/evolution/mail/prompts/checkdefault"
-#define GCONF_KEY_MAILTO_ENABLED "/desktop/gnome/url-handlers/mailto/enabled"
-#define GCONF_KEY_MAILTO_COMMAND "/desktop/gnome/url-handlers/mailto/command"
-#define EVOLUTION_MAILTO_COMMAND "evolution --component=mail %s"
-
-void org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target);
-
-static gboolean
-evolution_is_default_mailer (const gchar *mailto_command)
-{
-        gint argc;
-        gchar **argv;
-        gchar *basename;
-        gboolean is_default;
-
-        if (mailto_command == NULL)
-                return FALSE;
-
-        /* tokenize the mailto command */
-        if (!g_shell_parse_argv (mailto_command, &argc, &argv, NULL))
-                return FALSE;
-
-        g_assert (argc > 0);
-
-        /* check the basename of the first token */
-        basename = g_path_get_basename (argv[0]);
-        is_default = g_str_has_prefix (basename, "evolution");
-        g_free (basename);
-
-        g_strfreev (argv);
-
-        return is_default;
-}
-
-void
-org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target)
-{
-	GConfClient *client;
-	gchar       *mailer;
-	GConfValue  *is_key;
-
-	client = gconf_client_get_default ();
-
-	/* See whether the check default mailer key has already been set */
-	is_key = gconf_client_get(client, GCONF_KEY_CHECKDEFAULT, NULL);
-	if (!is_key)
-		gconf_client_set_bool(client, GCONF_KEY_CHECKDEFAULT, TRUE, NULL);
-	else
-		gconf_value_free (is_key);
-
-	/* Check whether we're supposed to check whether or not we are the default mailer */
-	if (gconf_client_get_bool(client, GCONF_KEY_CHECKDEFAULT, NULL)) {
-		mailer  = gconf_client_get_string(client, GCONF_KEY_MAILTO_COMMAND, NULL);
-
-		/* Check whether we are the default mailer */
-		if (!evolution_is_default_mailer (mailer)) {
-			/* Ask whether we should be the default mailer */
-			if (em_utils_prompt_user(NULL, GCONF_KEY_CHECKDEFAULT, "org.gnome.default.mailer:check-default", NULL)) {
-				gconf_client_set_bool(client, GCONF_KEY_MAILTO_ENABLED, TRUE, NULL);
-				gconf_client_set_string(client, GCONF_KEY_MAILTO_COMMAND, EVOLUTION_MAILTO_COMMAND, NULL);
-			}
-		}
-
-		g_free(mailer);
-	}
-
-	g_object_unref (client);
-}
diff --git a/plugins/default-mailer/org-gnome-default-mailer.eplug.xml b/plugins/default-mailer/org-gnome-default-mailer.eplug.xml
deleted file mode 100644
index 44c5febedf..0000000000
--- a/plugins/default-mailer/org-gnome-default-mailer.eplug.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<e-plugin-list>
-	<e-plugin
-	id="org.gnome.evolution.default.mailer" 
-	type="shlib" 
-	_name="Default Mail Client" 
-	location="@PLUGINDIR@/liborg-gnome-default-mailer@SOEXT@">
-
-		<_description>Check whether Evolution is the default mail client on startup.</_description>
-		<author name="Jonathan Dieter" email="jdieter99@gmx.net"/>
-
-		<hook class="org.gnome.evolution.shell.events:1.0">
-			<event
-				id="upgrade.done"
-				handle="org_gnome_default_mailer_check_default"
-				target="upgrade"
-			/>
-		</hook>
-	</e-plugin>
-</e-plugin-list>
diff --git a/plugins/default-mailer/org-gnome-default-mailer.error.xml b/plugins/default-mailer/org-gnome-default-mailer.error.xml
deleted file mode 100644
index 03e2e8262d..0000000000
--- a/plugins/default-mailer/org-gnome-default-mailer.error.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<error-list domain="org.gnome.default.mailer">
-
- <error id="check-default" type="question" default="GTK_RESPONSE_YES">
-  <_secondary>Do you want to make Evolution your default e-mail client?</_secondary>
-  <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
-  <button stock="gtk-no"  response="GTK_RESPONSE_NO"/>
- </error>
-
-</error-list>
diff --git a/plugins/default-source/ChangeLog b/plugins/default-source/ChangeLog
deleted file mode 100644
index cb0075e36b..0000000000
--- a/plugins/default-source/ChangeLog
+++ /dev/null
@@ -1,80 +0,0 @@
-2008-09-04  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* default-source.c:
-
-2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #534762
-
-	* org-gnome-default-source.eplug.xml: Change "addressbook" to
-	"address book" in translatable strings.
-
-2008-04-21  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #448863
-
-	* default-source.c: (org_gnome_default_book),
-	(get_calendar_option_caption), (org_gnome_default_cal):
-	Use better description of the option based on source type.
-
-2007-09-10  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #330223
-
-	* default-source.c: (commit_default_calendar):
-	Added type E_CAL_SOURCE_TYPE_JOURNAL to other types.
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2006-10-21  Priit Laes  <amd@store20.com>
-
-	* org-gnome-default-source.eplug.xml: Fix typo. Fixes #363999.
-
-2006-02-11  Andre Klapper <a9016009@gmx.de>
-
-	* default-source.c: adding mnemonic. Fixes bug 328151.
-
-2005-12-25  Funda Wang  <fundawang@linux.net.cn>
-
-	* Makefile.am: Mark this plugin as translatable (bug#301149).
-
-2005-12-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: Fix make-clean issues.
-
-2005-12-07  Funda Wang  <fundawang@linux.net.cn>
-
-	* org-gnome-default-source.eplug.in: i18nlized.
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* default-source.c: forward declare exported func.
-
-2005-08-10  Tor Lillqvist  <tml@novell.com>
-
-	* org-gnome-default-source.eplug.in: Use SOEXT.
-
-2005-06-27  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: There is no EVOLUTION_CFLAGS. Use
-	NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS and
-	EVOLUTION_ADDRESSBOOK_LIBS.
-
-2005-05-06  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* default-source.c: (org_gnome_default_book): Removed the extra
-	space in "Mark  as default folder".
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-default-source.eplug.in: Added author and description.
-
-2005-01-21 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* initil commit 
diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c
index db8423aec6..a938239808 100644
--- a/plugins/default-source/default-source.c
+++ b/plugins/default-source/default-source.c
@@ -37,6 +37,14 @@ GtkWidget *org_gnome_autocomplete_book (EPlugin *epl, EConfigHookItemFactoryData
 void commit_default_calendar (EPlugin *epl, EConfigTarget *target);
 void commit_default_book (EPlugin *epl, EConfigTarget *target);
 
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
+
 void
 commit_default_calendar (EPlugin *epl, EConfigTarget *target)
 {
diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog
deleted file mode 100644
index f826eddd86..0000000000
--- a/plugins/email-custom-header/ChangeLog
+++ /dev/null
@@ -1,127 +0,0 @@
-2009-02-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572399
-
-	* email-custom-header.c: (header_foreach_check_isempty):
-	Do not read from invalid iterator after call of row changed.
-
-2009-02-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fixes part of bug #564229
-
-	* email-custom-header.c: (e_plugin_lib_get_configure_widget):
-	Do not use uninitialized variable.
-
-2009-02-02  Takao Fujiwara  <takao.fujiwara@sun.com>
-
-	Reviewed by Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #567568
-
-	* apps_evolution_email_custom_header.schemas.in:
-	Remove translatable <default> tag.
-	* email-custom-header.c (epech_setup_widgets):
-	Added gettext for the default custom header.
-
-2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>
-
-	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fix for bug #567129
-
-	* apps_evolution_email_custom_header.schemas.in:
-	Add <default> tag in C locale to localize the value.
-	* email-custom-header.c (epech_setup_widgets):
-	Add gettext.
-
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* email-custom-header.c:
-	* email-custom-header.h:
-
-2008-09-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* email-custom-header.c:
-	Don't mix declarations and code.
-
-2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	* gui/contact-editor/e-contact-editor.c:
-	Use e_display_help() for displaying help.
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Have a check for OS_WIN32 and handle the schema data 
-	differently. make install error on win32.
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Added necessary libraries to link to. Build break while 
-	compiling on Windows.
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #543755
-
-	* apps_evolution_email_custom_header.schemas.in: Fix typo.
-
-2008-07-22  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #544022
-
-	* email-custom-header.c: Compiler warning cleanup.
-
-2008-06-25  Ashish Shrivastava  <shashish@novell.com>
-	* email-custom-header.glade:  Marked strings for
-	translation.
-	remove "window1" string from translation.
-
-2008-06-24  Ashish Shrivastava  <shashish@novell.com>
-
-	* email-custom-header.c: (e_plugin_lib_get_configure_widget),
-	(org_gnome_email_custom_header_config_option):
-	Added Support for configuring gconf values.
-	* email-custom-header.glade: 
-	Configure email-custom-header plugin within the plugin-manager.
-	* org-gnome-email-custom-header.eplug.xml: Add hook class
-	for Configure tab.
-	* Makefile.am: Add new file.(email-custom-header.glade).
-
-2008-06-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am:
-	Distribute the Glade file.
-
-2008-06-02  Ashish Shrivastava  <shashish@novell.com>
-
-	** Fixes bug #536183
-
-	* email-custom-header.c:
-	* org-gnome-email-custom-header.glade:
-	Change email custom header's dialog to non-modal.
-	Remove un-used tab from dialog
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	* email-custom-header.c (action_email_custom_header_cb):
-	Remove unused 'editor' variable.
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534360
-
-	* email-custom-header.h:
-	Migrate from deprecated GtkObject symbols to GObject equivalents.
-
-2008-05-19  Ashish Shrivastava  <shashish@novell.com>
-
-	* org-gnome-email-custom-header.eplug.xml:
-	* org-gnome-email-custom-header.glade:
-	* apps_evolution_email_custom_header.schemas.in:
-	* Makefile.am:
-	* email-custom-header.c:
-	* email-custom-header.h:
-	** Initial set of files. Implements Custom header support.
-	** Added custom header plugin.
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 84452b28a9..6b94c721f3 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -534,8 +534,9 @@ destroy_compo_data (gpointer data)
 static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *composer)
 
 {
-	GtkUIManager  *ui_manager;
-	GtkWidget     *menuitem;
+	GtkUIManager *ui_manager;
+	GtkWidget *menuitem;
+	GdkWindow *window;
 	CustomHeaderOptionsDialog *dialog = NULL;
 	EmailCustomHeaderWindow *new_email_custom_header_window = NULL;
 
@@ -544,14 +545,15 @@ static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *comp
 
 	new_email_custom_header_window = g_object_get_data ((GObject *) composer, "compowindow");
 
-	if (epech_check_existing_composer_window(new_email_custom_header_window,menuitem->window) == 0) {
+	window = gtk_widget_get_window (menuitem);
+	if (epech_check_existing_composer_window(new_email_custom_header_window,window) == 0) {
 		dialog = new_email_custom_header_window->epech_dialog;
 	} else {
 		dialog = epech_dialog_new ();
 		if (dialog) {
                         EmailCustomHeaderWindow *new_email_custom_header_window;
                         new_email_custom_header_window = g_new0(EmailCustomHeaderWindow, 1);
-                        new_email_custom_header_window->epech_window =  menuitem->window;
+                        new_email_custom_header_window->epech_window = window;
                         new_email_custom_header_window->epech_dialog = dialog;
                         g_object_set_data_full ((GObject *) composer, "compowindow", new_email_custom_header_window, destroy_compo_data);
 		}
@@ -924,17 +926,17 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	header_add = gtk_button_new_from_stock ("gtk-add");
 	gtk_widget_show (header_add);
 	gtk_container_add (GTK_CONTAINER (vbuttonbox1), header_add);
-	GTK_WIDGET_SET_FLAGS (header_add, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default (header_add, TRUE);
 
 	header_edit = gtk_button_new_from_stock ("gtk-edit");
 	gtk_widget_show (header_edit);
 	gtk_container_add (GTK_CONTAINER (vbuttonbox1), header_edit);
-	GTK_WIDGET_SET_FLAGS (header_edit, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default (header_edit, TRUE);
 
 	header_remove = gtk_button_new_from_stock ("gtk-remove");
 	gtk_widget_show (header_remove);
 	gtk_container_add (GTK_CONTAINER (vbuttonbox1), header_remove);
-	GTK_WIDGET_SET_FLAGS (header_remove, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default (header_remove, TRUE);
 
 	cd->gconf = gconf_client_get_default ();
 
diff --git a/plugins/external-editor/ChangeLog b/plugins/external-editor/ChangeLog
deleted file mode 100644
index 55ead0195b..0000000000
--- a/plugins/external-editor/ChangeLog
+++ /dev/null
@@ -1,101 +0,0 @@
-2009-04-28  Holger Macht  <holger@homac.de>
-
-	** Fix for bug #567145
-
-	External Editor rewrite.
-	* composer/evolution-composer.ui:
-	* plugins/external-editor/Makefile.am:
-	* plugins/external-editor/apps-evolution-external-editor.schemas.in
-	:
-	* plugins/external-editor/external-editor.c:
-	* plugins/external-editor/org-gnome-external-editor.eplug.xml:
-	* plugins/external-editor/org-gnome-external-editor.error.xml:
-
-2009-04-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #561188
-
-	* external-editor.c: (show_error), (read_file),
-	(async_external_editor), (show_composer_dialog):
-	Do more things in main thread.
-	* Makefile.am:
-	* org-gnome-external-editor-errors.xml: Renamed to:
-	* org-gnome-external-editor.error.xml: Create .error file properly.
-
-2009-01-28  Tor Lillqvist  <tml@novell.com>
-
-	Windows port by Fridrich Strba.
-
-	* Makefile.am: Use -no-undefined and link with more libraries on
-	Windows.
-
-	* external-editor.c: Check HAVE_SYS_WAIT_H.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* external-editor.c:
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #517151
-
-	* org-gnome-external-editor.xml:
-	Give a mnemonic to "Composer in External Editor".
-
-2008-04-17  Sankar P  <psankar@novell.com>
-
-	* Makefile.am:
-	Added new files deleted files not needed.
-
-	* external-editor.c: (convert_to_camel_internet_address),
-	(ee_editor_command_changed), (e_plugin_lib_get_configure_widget),
-	(async_external_editor), (show_composer_dialog),
-	(org_gnome_external_editor):
-	Leak fixes, Temporary files, Bug fixes and so on.
-
-	* org-gnome-external-editor-errors.xml:
-	Modified error file for staying aligned with other plugins
-
-	* apps-evolution-external-editor.schemas.in:
-	Added new file for default schema
-
-	* org-gnome-external-editor.error.xml:
-	Removed in favor of the other errors file.
-
-	** Fix for bug #517168
-
-2008-02-18  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #515744
-
-	* external-editor.c: (convert_to_camel_internet_address),
-	(org_gnome_external_editor): Memory leak fix.
-
-2007-12-04  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Denis Washington <denisw@svn.gnome.org>
-
-	** Fix for bug #496298
-	* org-gnome-external-editor.eplug.xml:
-	* org-gnome-external-editor.xml:
-	Change mails to messages.
-
-2007-10-25  Sankar P  <psankar@novell.com>
-
-	* Makefile.am:
-	* org-gnome-external-editor.eplug.xml:
-	* org-gnome-external-editor.xml:
-	* org-gnome-external-editor.error.xml:
-	* external-editor.c:
-
-	- Initial files for the plugin. 
-
-	- This plugin allows you to use an external editor 
-	as the composer.
-
-	- I've tested this gvim and it works fine. 
-
-	- Needs a lot of more work before this 
-	moves out of experimental state.
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index 60d37800f4..11db7db3a2 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -31,7 +31,6 @@
 #include <mail/mail-config.h>
 #include <e-util/e-alert-dialog.h>
 #include <e-msg-composer.h>
-#include <camel/camel-mime-filter-tohtml.h>
 
 #include <glib/gi18n-lib.h>
 #include <glib-object.h>
@@ -65,6 +64,14 @@ static gboolean key_press_cb(GtkWidget * widget, GdkEventKey * event, EMsgCompos
 /* used to track when the external editor is active */
 static GThread *editor_thread;
 
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
+
 void
 ee_editor_command_changed (GtkWidget *textbox)
 {
diff --git a/plugins/face/ChangeLog b/plugins/face/ChangeLog
deleted file mode 100644
index 7737ac777e..0000000000
--- a/plugins/face/ChangeLog
+++ /dev/null
@@ -1,77 +0,0 @@
-2009-04-27  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #561188
-
-	* Makefile.am:
-	* org-gnome-face.errors.xml: Renamed to:
-	* org-gnome-face.error.xml: Create .error file properly.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* face.c:
-
-2008-05-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #525241 (EPluginUI)
-
-	* Makefile.am:
-	* org-gnome-face-ui.xml:
-	Remove org-gnome-face-ui.xml (obsolete).
-
-	* face.c (e_plugin_ui_init):
-	Initialization callback for EPluginUI.  Adds a "face" action to
-	the EMsgComposer instance's "composer" action group.
-
-	* org-gnome-face.eplug.xml:
-	Replace the "bonobomenu" hook definition with a new one for
-	EPluginUI.  Include the UI definition inline.
-
-2008-03-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #513951
-
-	* face.c (org_gnome_composer_face):
-	Use e_get_user_data_dir() instead of constructing the full path.
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* face.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* org-gnome-face-eplug.xml:
-	Use consistent terminology for mail messages (#480621).
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #474000
-
-	* face.c:
-	Use GLib's Base64 API instead of Camel's.
-
-2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #476231
-
-	* face.c:
-	Remove non-USE_GTKFILECHOOSER code.
-	GtkFileChooser has been around since 2004.
-
-2007-07-18  Sankar P  <psankar@novell.com>
-
-	* face.c: (org_gnome_composer_face):
-	Remove unused variables. 
-
-2007-07-17  Sankar P  <psankar@novell.com>
-
-	* org-gnome-face.eplug.xml:
-	* org-gnome-face-ui.xml:
-	* org-gnome-face.errors.xml:
-	* Makefile.am:
-	* face.c:
-	Initial set of files. Implements Face header support.
diff --git a/plugins/face/face.c b/plugins/face/face.c
index 478f7888c6..468b9273c9 100644
--- a/plugins/face/face.c
+++ b/plugins/face/face.c
@@ -397,12 +397,19 @@ action_toggle_face_cb (GtkToggleAction *action, EMsgComposer *composer)
 
 /* ----------------------------------------------------------------- */
 
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
 gboolean e_plugin_ui_init (GtkUIManager *ui_manager, EMsgComposer *composer);
 GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl);
 void face_handle_send (EPlugin *ep, EMEventTargetComposer *target);
 
 /* ----------------------------------------------------------------- */
 
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
+
 gboolean
 e_plugin_ui_init (GtkUIManager *ui_manager,
 		  EMsgComposer *composer)
diff --git a/plugins/google-account-setup/ChangeLog b/plugins/google-account-setup/ChangeLog
deleted file mode 100644
index 43513257b7..0000000000
--- a/plugins/google-account-setup/ChangeLog
+++ /dev/null
@@ -1,170 +0,0 @@
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #569652
-
-	* google-contacts-source.h: (manage_google_group):
-	* google-contacts-source.c: (manage_google_group):
-	Removed.
-
-	* google-contacts-source.c: (ensure_google_contacts_source_group),
-	(remove_google_contacts_source_group):
-	* google-source.c: (ensure_google_source_group):
-	Use new ESourceList API (simplifies code).
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* google-source.c: Remove deprecated Gtk+ symbols.
-
-2009-04-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #574248
-
-	* google-contacts-source.c: (plugin_google_contacts):
-	* google-source.c: (plugin_google):
-	Compare base URI case insensitively.
-
-2009-04-07  Tobias Mueller  <tobiasmue@gnome.org>
-
-	** Fixes bug #578034
-
-	* google-source.c (claim_error):
-	Call gtk_message_dialog_new with a proper format string.
-
-2009-02-26  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #572950
-
-	* Makefile.am:
-	Fix ordering of -I compiler directives.  Patch by Daniel Macks.
-
-2009-02-25  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #559719
-
-	* google-contacts-source.c: (struct ui_data), (destroy_ui_data),
-	(plugin_google_contacts): Use it's own/unique name for the property
-	on the 'epl' and free the widget only if it wasn't freed yet.
-
-2009-01-29  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #539467
-
-	* google-contacts-source.h: (manage_google_group):
-	* google-contacts-source.c: (manage_google_group),
-	(ensure_google_contacts_source_group),
-	(remove_google_contacts_source_group):
-	* google-source.c: (ensure_google_source_group):
-	Find group by its base uri, not by a localized name.
-
-2008-11-07  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fix for bug #559518
-
-	* google-source.c: (retrieve_list_clicked),
-	(retrieve_list_sensitize), (plugin_google): Desensitizes the button 
-	when the username field is blank.
-
-2008-11-06  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #557726
-
-	* google-contacts-source.c: (destroy_ui_data),
-	(plugin_google_contacts): Destroy the widgets created by this group.
-
-2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fixes bug #553479
-
-	* org-gnome-evolution-google.eplug.xml: String capitalisation
-	improvements.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* google-source.c:
-
-2008-08-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #525555
-
-	* google-source.c: (print_uri_noproto): Removed.
-	* google-source.c: (user_changed): Do not leak.
-	* google-source.c: (plugin_google): Get username from source, not URL.
-
-2008-08-14  Jörgen Scheibengruber  <mfcn@gmx.de>
-
-	* google-contacts-source.c (on_ssl_cb_toggled),
-	(seconds_to_interval), (interval_to_seconds),
-	(on_interval_sb_value_changed), (on_interval_combo_changed),
-	(plugin_google_contacts):
-
-	Add ssl toggle; synch UI for refreshin with the google calendar plugin
-
-2008-08-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #535745
-
-	* google-source.c: (sanitize_user_mail), (construct_default_uri),
-	(is_default_uri), (init_combo_values), (user_changed),
-	(cal_combo_changed), (claim_error), (retrieve_list_clicked),
-	(plugin_google): New widgets and functionality to retrieve list
-	of subscribed calendars from the Google account and let user choose
-	which one would be shown.
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #544860
-
-	* google-contacts-source.c (plugin_google_contacts):
-	Add translator comments for split "update every" sentence.
-
-2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #545568
-
-	* org-gnome-evolution-google.eplug.xml:
-	Add "system_plugin=true" so it's not shown in the Plugin Manager.
-	This plugin is not designed to be disabled by the user.
-
-2008-05-24  Jörgen Scheibengruber  <mfcn@gmx.de>
-
-	* Makefile.am:
-	* google-contacts-source.c (ensure_google_contacts_source_group),
-	(remove_google_contacts_source_group), (on_username_entry_changed),
-	(on_update_cb_toggled), (on_interval_sb_value_changed),
-	(plugin_google_contacts):
-	* google-contacts-source.h:
-	* google-source.c (e_plugin_lib_enable):
-	* org-gnome-evolution-google.eplug.xml:
-	Added a UI for the addressbook part
-
-2008-03-31  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #346555
-
-	* google-source.c: (plugin_google): 
-	Fixed a mnemonic conflict. 
-
-2008-01-25  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am (liborg_gnome_evolution_google_la_LIBADD): Fix typo:
-	s/EVOLUTION_CALENDAR_LIB1S/EVOLUTION_CALENDAR_LIBS/.
-
-2007-12-23  Nyall Dawson <nyall@zombiepigs.net>
-
-	** Fix for bug #503954
-
-	* google-source.c: (is_email), (user_changed): Accept custom domain 
-	names while setting up account.
-
-2007-10-30  Sankar P  <psankar@novell.com>
-
-	* ChangeLog:
-	Every plugin should have a ChangeLog. Added.
-
-	* google-source.c: 
-	Commented an unused function. 
-	Marked Debug statements conditional.
diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am
index 07f41510e4..ed3ab93d5d 100644
--- a/plugins/google-account-setup/Makefile.am
+++ b/plugins/google-account-setup/Makefile.am
@@ -12,7 +12,8 @@ liborg_gnome_evolution_google_la_CPPFLAGS = 		\
 	-DCALDAV_UIDIR=\""$(uidir)"\"			\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
+	$(GDATA_CFLAGS)
 
 liborg_gnome_evolution_google_la_SOURCES =        \
 	google-source.c \
@@ -24,7 +25,8 @@ liborg_gnome_evolution_google_la_LIBADD = 			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(EVOLUTION_CALENDAR_LIBS)				\
 	$(EPLUGIN_LIBS)						\
-	$(GNOME_PLATFORM_LIBS)
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GDATA_LIBS)
 
 liborg_gnome_evolution_google_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c
index d7554ebe10..289a939dec 100644
--- a/plugins/google-account-setup/google-contacts-source.c
+++ b/plugins/google-account-setup/google-contacts-source.c
@@ -231,6 +231,7 @@ plugin_google_contacts (EPlugin *epl,
 	const gchar *refresh_interval_str;
 	guint refresh_interval;
 	const gchar *use_ssl_str;
+	gchar *buff;
 	gboolean use_ssl;
 	GtkWidget *parent;
 	GtkWidget *vbox;
@@ -270,7 +271,9 @@ plugin_google_contacts (EPlugin *epl,
 	gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0);
 
 	section = gtk_label_new (NULL);
-	gtk_label_set_markup (GTK_LABEL (section), _("<b>Server</b>"));
+	buff = g_strconcat ("<b>", _("Server"), "</b>", NULL);
+	gtk_label_set_markup (GTK_LABEL (section), buff);
+	g_free (buff);
 	gtk_misc_set_alignment (GTK_MISC (section), 0.0, 0.0);
 	gtk_box_pack_start (GTK_BOX (vbox2), section, FALSE, FALSE, 0);
 
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index 26b80f0ec8..2f6dfdc12e 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -16,6 +16,7 @@
  *
  * Authors:
  *		Ebby Wiselyn <ebbywiselyn@gmail.com>
+ *		Philip Withnall <philip@tecnocode.co.uk>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
@@ -46,9 +47,7 @@
 #include <libedataserverui/e-cell-renderer-color.h>
 #include <libedataserverui/e-passwords.h>
 
-#include <google/libgdata/gdata-service-iface.h>
-#include <google/libgdata/gdata-feed.h>
-#include <google/libgdata-google/gdata-google-service.h>
+#include <gdata/gdata.h>
 
 #include "google-contacts-source.h"
 
@@ -408,7 +407,7 @@ update_proxy_settings (GDataService *service, const gchar *uri)
 		proxy_uri = e_proxy_peek_uri_for (proxy, uri);
 	}
 
-	gdata_service_set_proxy (service, proxy_uri);
+	gdata_service_set_proxy_uri (service, proxy_uri);
 	g_object_unref (proxy);
 }
 
@@ -416,11 +415,10 @@ static void
 retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
 {
 	ESource *source;
-	GDataGoogleService *service;
+	GDataCalendarService *service;
 	GDataFeed *feed;
 	gchar *user, *password, *tmp;
-	const gchar *username, *ssl;
-	gchar *get_subscribed_url;
+	const gchar *username;
 	GError *error = NULL;
 	GtkWindow *parent;
 
@@ -447,20 +445,26 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
 		return;
 	}
 
-	service = gdata_google_service_new ("cl", "evolution-client-0.0.1");
-	gdata_service_set_credentials (GDATA_SERVICE (service), user, password);
+	service = gdata_calendar_service_new ("evolution-client-0.1.0");
+	if (!gdata_service_authenticate (GDATA_SERVICE (service), user, password, NULL, &error)) {
+		/* Error! */
+		claim_error (parent, error->message);
+		g_error_free (error);
+		g_free (password);
+		g_free (user);
+		g_object_unref (service);
+		return;
+	}
+
 	/* privacy... maybe... */
 	memset (password, 0, strlen (password));
 	g_free (password);
 
-	ssl = e_source_get_property (source, "ssl");
-	get_subscribed_url = g_strconcat ((!ssl || g_str_equal (ssl, "1")) ? "https" : "http", URL_GET_SUBSCRIBED_CALENDARS, NULL);
-	update_proxy_settings (GDATA_SERVICE (service), get_subscribed_url);
-	feed = gdata_service_get_feed (GDATA_SERVICE (service), get_subscribed_url, &error);
-	g_free (get_subscribed_url);
+	update_proxy_settings (GDATA_SERVICE (service), URL_GET_SUBSCRIBED_CALENDARS);
+	feed = gdata_calendar_service_query_all_calendars (service, NULL, NULL, NULL, NULL, &error);
 
 	if (feed) {
-		GSList *l;
+		GList *l;
 		gchar *old_selected = NULL;
 		gint idx, active = -1, default_idx = -1;
 		GtkListStore *store = GTK_LIST_STORE (gtk_combo_box_get_model (combo));
@@ -472,31 +476,27 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
 		gtk_list_store_clear (store);
 
 		for (l = gdata_feed_get_entries (feed), idx = 1; l != NULL; l = l->next) {
-			const gchar *uri, *title, *color, *access;
-			GSList *links;
-			GDataEntry *entry = (GDataEntry *) l->data;
+			const gchar *uri, *title, *access;
+			GDataLink *link;
+			GDataColor color;
+			GDataEntry *entry = GDATA_ENTRY (l->data);
 
 			if (!entry || !GDATA_IS_ENTRY (entry))
 				continue;
 
 			/* skip hidden entries */
-			if (gdata_entry_get_custom (entry, "hidden") && g_ascii_strcasecmp (gdata_entry_get_custom (entry, "hidden"), "true") == 0)
+			if (gdata_calendar_calendar_is_hidden (GDATA_CALENDAR_CALENDAR (entry)))
 				continue;
 
-			uri = NULL;
-			for (links = gdata_entry_get_links (entry); links && !uri; links = links->next) {
-				GDataEntryLink *link = (GDataEntryLink *)links->data;
-
-				if (!link || !link->href || !link->rel)
-					continue;
-
-				if (g_ascii_strcasecmp (link->rel, "alternate") == 0)
-					uri = link->href;
-			}
+			/* Find the alternate link; skip the entry if one doesn't exist */
+			link = gdata_entry_look_up_link (entry, GDATA_LINK_ALTERNATE);
+			if (!link)
+				continue;
 
+			uri = gdata_link_get_uri (link);
 			title = gdata_entry_get_title (entry);
-			color = gdata_entry_get_custom (entry, "color");
-			access = gdata_entry_get_custom (entry, "accesslevel");
+			gdata_calendar_calendar_get_color (GDATA_CALENDAR_CALENDAR (entry), &color);
+			access = gdata_calendar_calendar_get_access_level (GDATA_CALENDAR_CALENDAR (entry));
 
 			if (uri && title) {
 				GdkColor gdkcolor;
@@ -504,8 +504,11 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
 				if (old_selected && g_str_equal (old_selected, uri))
 					active = idx;
 
-				if (color)
-					gdk_color_parse (color, &gdkcolor);
+				/* Convert the GDataColor to a GdkColor */
+				gdkcolor.pixel = 0;
+				gdkcolor.red = color.red * 256;
+				gdkcolor.green = color.green * 256;
+				gdkcolor.blue = color.blue * 256;
 
 				if (default_idx == -1 && is_default_uri (uri, user)) {
 					/* have the default uri always NULL and first in the combo */
@@ -517,7 +520,7 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
 				}
 
 				gtk_list_store_set (store, &iter,
-					COL_COLOR, color ? &gdkcolor : NULL,
+					COL_COLOR, &gdkcolor,
 					COL_TITLE, title,
 					COL_URL_PATH, uri,
 					COL_READ_ONLY, access && !g_str_equal (access, "owner") && !g_str_equal (access, "contributor"),
@@ -583,7 +586,7 @@ plugin_google  (EPlugin                    *epl,
 	GtkWidget    *combo;
 	gchar         *uri;
 	const gchar   *username;
-	gint           row;
+	guint            row;
 	GtkCellRenderer *renderer;
 	GtkListStore *store;
 
@@ -626,7 +629,7 @@ plugin_google  (EPlugin                    *epl,
 
 	e_plugin_util_add_refresh (parent, _("Re_fresh:"), source, "refresh");
 
-	row = GTK_TABLE (parent)->nrows;
+	g_object_get (parent, "n-rows", &row, NULL);
 
 	label = gtk_label_new_with_mnemonic (_("Cal_endar:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -663,7 +666,7 @@ plugin_google  (EPlugin                    *epl,
 	hbox = gtk_hbox_new (FALSE, 6);
 
 	gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
-	label = gtk_button_new_with_mnemonic (_("Retrieve _list"));
+	label = gtk_button_new_with_mnemonic (_("Retrieve _List"));
 	g_signal_connect (label, "clicked", G_CALLBACK (retrieve_list_clicked), combo);
 	g_signal_connect (user, "changed", G_CALLBACK (retrieve_list_sensitize), label);
 	g_object_set_data (G_OBJECT (label), "ESource", source);
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
deleted file mode 100644
index 085b62155c..0000000000
--- a/plugins/groupwise-features/ChangeLog
+++ /dev/null
@@ -1,1181 +0,0 @@
-2009-04-27  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #561188
-
-	* Makefile.am:
-	* org-gnome-proxy-login-errors.xml: Renamed to:
-	* org-gnome-proxy-login.error.xml:
-	* org-gnome-mail-retract-errors.xml: Renamed to:
-	* org-gnome-mail-retract.error.xml:
-	* org-gnome-shared-folder.errors.xml: Renamed to:
-	* org-gnome-shared-folder.error.xml:
-	* org-gnome-proxy-errors.xml: Renamed to:
-	* org-gnome-proxy.error.xml:
-	Create .error files properly.
-
-2009-01-21  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #541209
-
-	** Adapt to the new APIs from upstream libical. Changes made include
-	using the "_r" counterpart for the following APIs:
-	+ icalproperty_as_ical_string ()
-	+ icalvalue_as_ical_string ()
-	+ icalcomponent_as_ical_string ()
-	+ icalparameter_as_ical_string ()
-	+ icaldurationtype_as_ical_string ()
-	+ icalenum_reqstat_code ()
-	+ icallangbind_property_eval_string ()
-	+ icallangbind_quote_as_ical ()
-	+ icalmime_text_end_part ()
-	+ icalperiodtype_as_ical_string ()
-	+ icalproperty_enum_to_string ()
-	+ icalproperty_get_parameter_as_string ()
-	+ icalproperty_get_value_as_string ()
-	+ icalproperty_get_property_name ()
-	+ icalrecurrencetype_as_string ()
-	+ icaltime_as_ical_string ()
-	+ icalreqstattype_as_string ()
-	+ icalvalue_binary_as_ical_string ()
-	+ icalvalue_int_as_ical_string ()
-	+ icalvalue_utcoffset_as_ical_string ()
-	+ icalvalue_string_as_ical_string ()
-	+ icalvalue_recur_as_ical_string ()
-	+ icalvalue_text_as_ical_string ()
-	+ icalvalue_attach_as_ical_string ()
-	+ icalvalue_duration_as_ical_string ()
-	+ icalvalue_date_as_ical_string ()
-	+ icalvalue_datetime_as_ical_string ()
-	+ icalvalue_float_as_ical_string ()
-	+ icalvalue_geo_as_ical_string ()
-	+ icalvalue_datetimeperiod_as_ical_string ()
-	+ icalvalue_period_as_ical_string ()
-	+ icalvalue_trigger_as_ical_string ()
-	+ icalvalue_as_ical_string ()
-
-	* send-options.c (put_options_in_source):
-
-2009-01-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #567744
-
-	* proxy-login-dialog.glade:
-	* proxy-listing.glade:
-	Comment attribute in property tag should be plural.
-	e.g. <property comments="...">
-
-2008-12-29  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug bnc #435694
-
-	* mail-retract.c: (org_gnome_retract_message): Since we now add a bar,
-	lets set the popup items right.
-
-2008-11-20  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug bnc #446286
-
-	* status-track.c: (track_status): Remove the header check as we do a 
-	e_gw_connection_get_item for tracking the status.
-
-2008-11-04  Sankar P  <psankar@novell.com>
-
-	** Fix for bug bnc #434968
-
-	* plugins/groupwise-features/proxy-login.c:
-	Show correct icon for the proxy login dialog
-
-2008-10-17  Matthew Barnes  <mbarnes@redhat.com>
-
-	* send-options.c (org_gnome_send-options):
-	Don't mix declarations and statements.
-
-2008-10-03  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* proxy-login.c:
-
-2008-10-01  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	*  send-options.c: Mark two forgotten strings for translation. Fixes bug #553070
-
-2008-10-01  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* org-gnome-proxy-errors.xml:
-	* org-gnome-proxy-login-errors.xml:
-	* proxy.c:
-	* proxy-listing.glade:
-	* proxy-login-dialog.glade:
-	Add translator comment to the occurrences of the Proxy term. Fixes bug #554297
-
-2008-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #511947
-
-	* proxy-login.c: (proxy_login_get_cnc):
-	Pass in optional parent for password dialog.
-	* proxy-login.c: (proxy_soap_login), (proxy_login_update_tree),
-	(org_gnome_proxy_account_login): Adapt to the above change and check
-	for NULL values to prevent runtime warnings.
-
-2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #553148
-
-	* org-gnome-compose-send-options.xml:
-	* org-gnome-groupwise-features.eplug.xml: Standardise "GroupWise"
-	usage in translatable strings.
-
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* proxy.c:
-
-2008-09-22  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fixes bug #552851
-
-	* org-gnome-shared-folder.errors.xml:
-	Add translator comments to the accept/decline strings, and improve
-	some other strings in the file.
-
-2008-09-19  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* install-shared.c:
-	* junk-settings.c:
-	* share-folder.c:
-	* status-track.c:
-
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* send-options.c:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* addressbook-groupwise.c:
-	* junk-mail-settings.c:
-	* mail-retract.c:
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* junk-settings.h:
-	* mail-send-options.c:
-	* mail-send-options.h:
-	* process-meeting.c:
-	* proxy-login.h:
-	* proxy.h:
-	* share-folder-common.c:
-	* share-folder.h:
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #544861
-
-	* org-gnome-proxy-login-errors.xml:
-	Reword "invalid-user" error message.
-
-2008-07-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #543756
-
-	* org-gnome-shared-folder.errors.xml:
-	* process-meeting.c: (process_meeting):
-	Make question better translatable.
-
-2008-06-20  Sankar P  <psankar@novell.com>
-
-	* mail-retract.c (retract_mail_settings):
-	Multiple open dialogs is an usability issue
-	and a potential HIG violation. 
-	Thanks to Akhil for pointing out.
-
-2008-06-20  Sankar P  <psankar@novell.com>
-
-	* mail-retract.c (retract_mail_settings):
-	Check if cnc is valid before using it.
-	Fixes a crash.
-
-2008-06-19  Sankar P  <psankar@novell.com>
-
-	* mail-retract.c (retract_mail_settings):
-	Ask the user if he really wants to retract mails.
-	Re-arrange the menus a little for grouping related things.
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534360
-
-	* proxy.h:
-	* proxy-login.h:
-	Migrate from deprecated GtkObject symbols to GObject equivalents.
-
-2008-04-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #529855
-
-	* org-gnome-shared-folder.errors.xml: (recurrence):
-	Use proper label element name, these are localized by default.
-
-2008-04-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-send-options.c (org_gnome_composer_send_options):
-	Adapt to streamlined EMsgComposer API.
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #511957
-
-	* org-gnome-proxy-login-errors.xml:
-	* org-gnome-shared-folder.errors.xml:
-	* org-gnome-proxy-errors.xml:
-	* org-gnome-mail-retract-errors.xml:
-	Mark messages for translation.
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #511956
-
-	* share-folder.c: (notification_clicked): Mark text for translation.
-	* properties.glade: Make dialog nicer.
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #511953
-
-	* share-folder.c: (notification_clicked): Create dialog properly.
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #511950
-
-	* properties.glade: Do not force button/label sizes.
-
-2008-03-25  Sankar P  <psankar@novell.com>
-
-	* proxy.c: (org_gnome_proxy):
-	We are using some g_object_set on EAccount. 
-	We should also avoid double-free later. So reffing. 
-
-2008-03-18  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #511952
-
-	* share-folder.c: (share_folder_construct):
-	* proxy.c: (proxy_add_account): Marking text for translation.
-
-2008-02-18  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #515744
-
-	* send-options.c: (get_source):
-	* share-folder-common.c: (get_container_id):
-	* install-shared.c: (install_folder_response):
-	Memory leak fix.
-
-2008-01-28  Andre Klapper  <a9016009@gmx.de>
-
-	* proxy-add-dialog.glade: string "Read" needs gettext context, 
-	translator comments.  
-
-2008-01-24  Milan Crha  <mcrha@redhat.com>
-
-	** Part of bug #511488
-
-	* share-folder-common.c: (users_dialog_response): The logic to check
-	if vfolder is running has been changed, so reflect it here too.
-
-2008-01-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #300336
-
-	* share-folder-common.c: (users_dialog_response):
-	Ensure vfolder is running.
-
-2007-12-06  Alex Kloss  <alexkloss@att.net>
-
-	** Fix for bug #347328
-
-	* properties.glade:
-	Fix mnemonic clash over 'c', add mnemonic for 'Name' entry
-	* share-folder.c: (share_folder_construct):
-	Connect name_selector_entry and its label
-
-2007-11-12  indu  <indu_ait@yahoo.co.in>
-
-	** Fix for bug #458515
-	*  status-track.c: (recipient->undelivered_date): 
-	string corrected
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* junk-mail-settings.c: (junk_mail_settings),
-	(org_gnome_junk_settings):
-	* send-options.c: (send_options_finalize), (get_source):
-	* status-track.c: (track_status), (org_gnome_track_status):
-	Warning fixes:
-	- mixing code and declarations
-	- ANSIfication of function declaration
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #477045
-
-	* share-folder-common.c:
-	Use standard icon names where applicable.
-
-2007-08-17  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fix for bug #458715.
-	
-	* proxy.c : (proxy_page_changed_cb) : Do not include "<All User
-	Access>" in the list. And use g_malloc0.
-	
-2007-08-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #466548
-
-	* mail-send-options.c: (org_gnome_composer_send_options):
-	e_msg_composer_get_preferred_account can return NULL, so test for it.
-
-2007-08-13  Sankar P  <psankar@novell.com>
-
-	** Fix for bug #330968
-
-	* proxy.c: (proxy_page_changed_cb):
-	Fixes a crash on account-editor.
-	Proxy Preferences Crash Fix.
-
-2007-08-10  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #327977
-
-	* proxy.c: (proxy_get_cnc): Added parent_window parameter
-	and uses it in call of e_passwords_ask_password.
-	* proxy.c: (proxy_commit), (proxy_page_changed_cb):
-	Calls proxy_get_cnc, passing in parent window handle.
-	* send-options.c: (get_cnc): Added parent_window parameter
-	and uses it in call of e_passwords_ask_password.
-	* send-options.c: (e_sendoptions_clicked_cb):
-	Calls get_cnc, passing in parent window handle.
-
-2007-08-03  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #462010
-
-	* proxy.c: (proxy_update_tree_view):
-	* proxy-login.c: (proxy_login_update_tree): Plugged memory leak.
-
-2007-07-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #410287 from Lucky
-
-	* status-track.c: (track_status):
-
-2007-05-11  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* mail-send-options.c: (org_gnome_composer_send_options):
-	Fixes typo and casts, fixes part of bug #437584
-
-2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #429422
-
-	* status-track.c (track_status):
-	Use gtk_widget_set_size_request() instead of gtk_widget_set_usize().
-
-2007-03-30  Sankar P  <psankar@novell.com>
-
-	* status-track.c: (format_date), (track_status):
-	Rewritten GroupWise Status Tracking
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2007-02-05  Sankar P  <psankar@novell.com>
-
-	* junk-settings.c:
-	Include missing header file
-
-2007-01-27  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-	* install-shared.c: (org_gnome_popup_wizard):
-	don't split sentences. Fixes bug #401288.
-
-2007-01-27  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* install-shared.c: (org_gnome_popup_wizard):
-	* junk-settings.c: (junk_settings_construct):
-	* share-folder.c: (share_folder_construct):
-	* status-track.c: (track_status):
-	mark strings as translatable. See bug #399381 for details.
-
-2007-01-25  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* send-options.c: (get_cnc): Fix a crash when setting up
-	a GroupWise account. Closes bug #330969. Patch from
-	Parthasarathi Susarla.
-
-2007-01-18  Raghavendran <raghavguru7@gmail.com>
-	
-	* org-gnome-groupwise-features.xml: 
-	* mail-send-options.c :
-	Added code for implementing Send options via
-	a data hook .
-2006-11-17  Harish Krishnaswamy  <kharish@novell.com>
-
-	* proxy-login.c: (proxy_login_get_cnc): Remove
-	an extraneous initialization that leaks a CamelUrl on
-	each invocation.
-
-2006-10-16  Chris Heath  <chris@heathens.co.nz>
-
-	* mail-send-options.c (org_gnome_compose_send_options):
-	Fix memory leak.  Fixes bug #360815.
-
-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-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) 
-	(proxy_login_get_cnc):
-	Takes care of non SSL accounts too.
-	Fixes #332948
-
-2006-02-21  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* proxy.c: Fix more brokenness. doh check if its the proxy
-	page. Need whack on the head for sucky reckless commit. 
-
-2006-02-16  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* proxy.c: Initialize connection only when the proxy tab is 
-	clicked. 
-	
-2006-02-08  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	** See bug 326348
-	* share-folder-common.c:(refresh_folder_tree)
-	check if its a valid accoune before creating folder
-
-2006-01-27  Andre Klapper <a9016009@gmx.de>
-	* proxy-listing.glade:
-	removed string "dialog1" from translation. Fixes bug 306118.
-
-2006-01-18  Vivek Jain <jvivek@novell.com>
- 	
- 	* status-track.c : (add_detail): decode the date
- 	to local time **Fixes #314755
- 	also fixed some styling issues.
-
-	Committed on behalf of Vivek - partha
-
-2006-01-06  Simon Zheng <simon.zheng@sun.com>
-
-	* junk-mail-settings.c:
-	* mail-send-options.c:
-	* proxy-login.c:
-	* proxy.c:
-	* proxy.h:
-	* send-options.c:
-	use libedataserver/e-account-list.h instead of e-util/e-account-list.h.
-	use libedataserver/e-account.h instead of e-util/e-account.h.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* evolution/plugins/groupwise-features/properties.glade:
- 	 Fixing several typos and harmonizing
-	 capital/small letters. Partially fixes bug 306117.
-
-2005-12-17  Tor Lillqvist  <tml@novell.com>
-
-	* junk-settings.c
-	* proxy-login.c
-	* proxy.c
-	* share-folder.c: Construct glade file name at run-time.
-
-	* process-meeting.c (find_attendee): Use g_ascii_strcasecmp()
-	instead of g_strcasecmp().
-
-2005-12-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: Fix make-clean issues.
-
-2005-12-05  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* proxy.c: initialize CamelException.
-
-	Fixes bug #314576
-
-2005-11-10  Harish Krishnaswamy  <kharish@novell.com>
-
-	* mail-send-options.c: (org_gnome_compose_send_options):
-	Function signature specifies a void return. So, do not 
-	return NULL.
-	
-2005-10-20  Sankar P  <psankar@novell.com>
-
-	* proxy-login.c (org_gnome_proxy_account_login) (proxy_login_get_cnc): 
-	When the user forgets-password explicitly, the subsequent proxy-login requests 
-	are made with a NULL password leading to unexpected behavior.
-	Fixes #312467
-
-	* proxy-login.c (proxy_login_update_tree) (proxy_login_get_cnc):
-	Added the missing unrefs for the connection object.
-
-2005-10-19  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* proxy.c (org_gnome_proxy): Dont try to connect when the account is
-	offline. Also connect to the server only when the proxy tab is clicked.
-	* Fixes #314297, #314345
-
-2005-10-14  Vivek Jain <jvivek@novell.com>
-	
-	* proxy.c :(proxy_get_cnc)
-	"use_ssl" should be Null checked before comparing it with any value. 
-	its NULL when evo is not compiled with ssl support and caused crash.
-
-2005-10-07  Vivek Jain <jvivek@novell.com>
-
-	* share-folder.c : (remove_clicked)
-	when we reach to the last item in the list, de-sensitize the remove
-	button.
-	
-2005-10-05  Vivek Jain <jvivek@novell.com>
-	
-	* share-folder.c : (display_container) moved code for comparing id's
-	to the getcontainer list part, we break if we find the matched.
-	also check for null before comparing, free the values
-	**Fixes #317906
-
-2005-09-30  Vivek Jain <jvivek@novell.com>
-	
-	* shared-folder-common.c: (org_gnome_create_option)
-	 			: (org_gnome_shared_folder_factory)
-	* install-shared.c 	: (org_gnome_popup_wizard)
-	enable shared-folder functionalilty, remove env check 
-
-2005-09-28  Sankar P  <psankar@novell.com>
-
-	*  proxy.c (proxy_dialog_store_widgets_data):
-	Added code to handle the extra blank email that will be returned 
-	from the ENameSelector, while auto-completion.
-	Fixes #317400
-	
-2005-09-27  Vivek Jain <jvivek@novell.com>
-	
-	* install-shared.c: (accept_clicked): 
-	 we have to connect "response" to (install_folder_response)
-	 to make it work
-	 don't destroy druid right now, wait till folder selector
-	 dialog dies, make folder selector dialog modal
-
-2005-08-25  Sankar P  <psankar@novell.com>
-
-	*  proxy.c: (proxy_dialog_finalize):
-	Replaced g_object_unref with g_free since priv was created using g_new.
-	Fixes #312309
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* proxy-login.c (proxy_get_password): return the right type.
-	(proxy_soap_login): fix pointer cast.
-	(proxy_login_add_new_store): fix pointer cast.
-	(proxy_login_setup_tree_view): fix callback cast.
-	(org_gnome_proxy_account_login): fix prototype to match use.
-
-	* junk-settings.c (user_selected): fix calling.
-	(junk_settings_construct): more stupid casts.
-
-	* junk-mail-settings.c (junk_mail_settings): casts.
-
-	* install-shared.c (install_folder_response): constify item_id.
-	(install_folder_response): remove unused.
-	(org_gnome_popup_wizard): fixed numerous problems with this,
-	over-copying data around, not referencing information properly,
-	freeing potentially unset variables, etc etc.
-	(accept_free): add a free function.
-
-	* share-folder.c (notification_clicked): fix a multitude of busted
-	casts.
-	(user_selected): fix broken calling conventions, busted style.
-	(share_folder_construct): fix more busted/missing casts.
-
-	* share-folder-common.c: add missing header.
-
-2005-08-22  vivek jain <jvivek@novell.com>
-	
-	** see previous commit 
-	 changed variable name to 
-	 groupwise_shared_folder
-
-2005-08-22  Vivek Jain <jvivek@novell.com>
-	
-	* shared-folder-common.c: (org_gnome_create_option)
-	 			: (org_gnome_shared_folder_factory)
-	* install-shared.c 	: (org_gnome_popup_wizard)
-	disable shared-folder functionalilty temporarily, (server doesn't show
-	mails in it)
-	export SHARED_FOLDER if you want to have it
-
-2005-08-11  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	* proxy.c:
-	(proxy_commit) : Check "prd" for NULL, ALWAYS.
-	
-2005-08-10  Sankar P  <psankar@novell.com>
-
-	* proxy.c :  
-	(proxy_dialog_store_widgets_data)
-	(proxy_commit) : Changed the way in which the EDIT and DELETED flags
-	are handled so that any proxy can be deleted without closing account-editor.
-	Fixes #312313
-	
-2005-08-10  Sankar P  <psankar@novell.com>
-
-	* proxy.c : 
-	Moved the GList to maintain the list of proxies, 
-	into the proxyDialog structure.
-	Fixes #312352, #312309
-
-	* proxy.h :
-	Added free_proxy_list declaration to avoid compiler warning
-	
-2005-08-10  Vivek Jain <jvivek@novell.com>
-	
-	* share-folder-common.c:(org_gnome_shared_folder_factory)
-	always use full name for the folder
-	**Fixes #311555
-
-2005-08-06  Sankar P  <psankar@novell.com>
-
-	* proxy.c: (proxy_dialog_store_widgets_data)
-	Disabling giving proxy rights to self.
-	Fixes #312365
-
-2005-07-29  Vivek Jain <jvivek@novell.com>
-	
-	* status-track.c: (track_status):
-	adjust row counts while calling add_detail
-	so that it doesn't overlap the entries.
-	**Fixes #302817
-
-2005-07-29  Vivek Jain <jvivek@novell.com>
-
-	* org-gnome-groupwise-features.eplug.xml:
-	for status strack  removed "Item" tag entries, included a factory method
-
-	* status-track.c :  (org_gnome_track_status): converted to 
-	 factory method to add the item, moved most of its code to
-	new function (track_status), which is a callback for the click
-	 **Fixes #311721
-
-2005-07-27  Sankar P  <psankar@novell.com>
-
-	* org-gnome-groupwise-features.eplug.xml: Added the hook for
-	the proxy-login feature, since it was removed by mistake.
-	
-2005-07-23  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* Makefile.am: Added the new file process-meeting.c
-	and widgets/misc to include headers.
-	* org-gnome-groupwise-features.eplug.xml: Added the
-	hook for processing meetings.
-	* org-gnome-shared-folder.errors.xml: Added the message
-	for asking for error 
-
-2005-07-22  Vivek Jain <jvivek@novell.com>
-	
-	* share-folder.c : Put back the fix I committed on 
-	2005-03-31, not sure when it got reverted.
-	**Fixes #311217
-
-2005-07-20  Shreyas Srinivasan <sshreyas@novell.com>
-
-	* proxy.c: Fix #310710. Make code little smart. Stop
-	adding tabs continously. Still does not reuse structures
-	on multiple invocations though.
-	
-2005-07-20  Vivek Jain <jvivek@novell.com>
-	
-	* mail-send-options.c: connect to sod-signal and get the input data in
-	the callback "feed_input_data"
-	** Fixes #310854
-
-2005-07-20  Sankar P  <psankar@novell.com>
-
-	* Consolidated the proxy and proxy-login plugins into the 
-	groupwise-features plugins and merged the ChangeLogs and copied the 
-	following files from their old plugins directories.
-
-	* proxy.[ch]
-	* proxy-login.[ch]
-	* org-gnome-proxy-errors.xml
-	* org-gnome-proxy-login-errors.xml
-	* proxy-login-dialog.glade
-	* proxy-listing.glade
-	* proxy-add-dialog.glade
-
-2005-07-19  Vivek Jain <jvivek@novell.com>
-
-	* junk-mail-settings.c: Marked strings for translation
-
-2005-07-15  Sankar P  <psankar@novell.com>
-
-	* proxy-login.h: Removed the permissions from the structure, 
-	since it is no longer needed.
-
-2005-07-15  Sankar P  <psankar@novell.com>
-
-	* proxy-login.c: Put permissions on the store instead of the
-	global structure as it gets unref before store_add.
-	
-2005-07-14  Not Zed  <NotZed@Ximian.com>
-
-	* proxy-login.c (proxy_login_add_new_store): fixed the store
-	permission names.
-
-2005-07-14  Vivek Jain  <jvivek@novell.com>
-	
-	* proxy.c: (proxy_commit),(proxy_abort):
-	 NULL checks before we do anything else here (quite likely to be NULL)
-	**Fixes #310347
-
-2005-07-13  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am (LIBADD): Link with libeutil. Link with
-	libevolution-mail on Win32 only. (Have I understood correctly that
-	it isn't considered a good idea on Unix to link plugins at
-	link-time with libevolution-mail?)
-
-	* org-gnome-proxy-login.eplug.xml: Use SOEXT.
-
-2005-07-13  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am (LIBADD): Link with libeutil.
-
-
-2005-07-13  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am (NO_UNDEFINED_REQUIRED_LIBS): As the code does use
-	functions from libevolution-mail, link with it. But OK, let's do
-	it (at build time) only on Win32, then.
-
-2005-07-12  Sankar P  <psankar@novell.com>
-
-	* Makefile.am :
-	Added CLEANFILES element and glade and error files to EXTRA_DIST.
-
-2005-07-12  Sankar P  <psankar@novell.com>
-
-	* Makefile.am :
-	Added missed header files to the SOURCES.
-	
-2005-07-12  Sankar P  <psankar@novell.com>
-
-	* Makefile.am :
-	Added org-gnome-proxy-errors.xml file to the EXTRA_DIST and 
-	added CLEANFILES. 
-
-2005-07-12  Sankar P  <psankar@novell.com>
-
-	* Makefile.am :
-	Added missed header files to the SOURCES.
-
-2005-07-12  Vivek Jain <jvivek@novell.com>
-	
-	transferred ChangeLog entry here
-	(2005-07-10  Shreyas Srinivasan <sshreyas@novell.com>)
-	* plugins/groupwise-features/*: Remove the
-	camel-groupwise-listener code as it runs in a different plugin.
-
-2005-07-11  Sankar P  <psankar@novell.com>
-
-	* proxy.c : (org_gnome_proxy)
-	Made changes so that the proxy list will be loaded only when the 
-	account edited is enabled. So a new connection need not be created,
-	when an account is edited and a connection is not present.
-	Fixes #309999
-
-2005-07-11  Sankar P  <psankar@novell.com>
-
-	* proxy.c : 
-	(proxy_edit_account) : Added code to hide the contacts button
-	while editing proxy access rights for a proxy.
-	Fixes #309992
-
-2005-07-11  Sankar P  <psankar@novell.com>
-	
-	* proxy.c :
-	Included <string.h> header to avoid the compiler warnings.
-
-2005-07-07  Frederic Crozat  <fcrozat@mandriva.com>
-
-	* send-options.c: Add missing header.
-
-2005-07-07  Vivek Jain <jvivek@novell.com>
-	
-	* org-gnome-groupwise-features.eplug.xml:
-	 have one more hookitem in folderview.popup
-	 for displaying junk mail settings
-	 
-	 added four more files
-	 * junk-mail-settings.c
-	 * junk-settings.c
-	 * junk-settings.h
-	 * junk-settings.glade
-	* Makefile.am : updated to add these files 
-
-2005-06-27  Sushma Rai  <rsushma@novell.com>
-
-	* org-gnome-groupwise-features.eplug.xml:
-	Not loading on start-up and not linking to libevolution-mail.
-
-2005-06-27  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
-
-2005-06-25  Harish Krishnaswamy <kharish@novell.com>
-
-	* Makefile.am: Reverting previous commit. Do not remove
-	$(EVOLUTION_MAIL_LIBS) from LIBADD. The addressbook dependency
-	is not required atm.
-
-2005-06-25  Sushma Rai  <rsushma@novell.com>
-
-	* Makefile.am: Linking to libevolution-mail and libevolution-addressbook
-
-2005-06-24  Sushma Rai  <rsushma@novell.com>
-
-	* org-gnome-groupwise-features.eplug.xml: Set load-on-startup.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* org-gnome-groupwise-features.eplug.xml: Use SOEXT.
-
-2005-05-24 Vivek Jain <jvivek@novell.com>
-	
-	* org-gnome-groupwise-features.eplug.xml:
-	 removed "Item" tag entries, included a factory method
-	 
-	 * shared-folder-common.c: changed callback (org_gnome_create_option)
-	 to a factory method, check uri before adding the option to the menu.
-	 New folder dialog now comes in another callback (create_shared_folder)
-	 also added a function to free the item list.
-
-2005-05-23 Vivek Jain <jvivek@novell.com>
-
-	Created a plugin "groupwise-features" which is a consolidation of 
-	following existing plugins
-	* groupwise-account-setup
-	* addressbook-groupwise
-	* shared-folder
-	* groupwise-send-options
-	* groupwise-status-tracking
-	* send-options
-
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* camel-gw-listener.c: moved e-error to e-util.
-
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* share-folder-common.c: moved e-error to e-util
-
-	* Makefile.am: error filename changes.
-
-2005-05-06  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #273063
-	* org-gnome-shared-folder-errors.xml:
-	* org-gnome-shared-folder-errors.xml.h:Removed the unwanted
-	tabs and new line characters.
-
-2005-05-06  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* properties.glade : Fixed a typo #273064
-
-2005-05-05  Srinivasa Ragavan <sragavan@novell.com>
-
-	* properties.glade : Fixed a typo 272538
-	
-2005-03-31  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* share-folder-common.c:(create_folder):
-	  check the store state, can create a shared 
-	  folder only in online mode
-	  Fixes bug 74002
-
-2005-03-31  Vivek Jain <jvivek@novell.com>
-	
-	**Fixes #74002
-	* share-folder-common.c : 
-	(get_cnc): return cnc as NULL if evoluiton is in offline.
-	(create_folder): return -1 if in offline
-
-2005-03-31  Vivek Jain <jvivek@novell.com>
-	
-	**Fixes #73787 (bugzilla innerweb.novell)
-	* share-folder.c : 
-	(add_right_clicked)
-	(edit_right_clicked)
-	(delete_right_clicked) : use path passed in the callback to get the
-	current iterator
-	also including some NULL checks
-
-2005-03-28  Vivek Jain <jvivek@novell.com>
-	
-	**Fixes #73198
-	* share-folder-common.c : 
-	(org_gnome_shared_folder_factory):
-	(create_folder__created) : pass the full name in get_conatiner_id
-	(get_container_id) : break the full name and start looking for the
-	name from the top most parent. This will give proper container id
-	even in the case of the duplicate names at different hierarchies
-
-
-2005-03-18 Vivek Jain <jvivek@novell.com>
-		
-	* send-options.h: 
-	* send-options.c: (org_gnome_compose_send_options): replace
-	X_RETURN_NOTIFY_DECLINE with X_RETURN_NOTIFY_DELETE
-
-2005-03-18  Vivek Jain <jvivek@novell.com>
-	
-	**Fixes #73473
-	* send-options.c :(org_gnome_compose_send_options)
-	 user proper entry to calculate the date of reply requested
-
-2005-03-10  Vivek Jain <jvivek@novell.com>
-	
-	**Fixes #73201
-	* share-folder-common.c : (org_gnome_shared_folder_factory)
-	 use full_name given by CamelFolder to get the selected folder name
-
-
-2005-03-09  Sankar P <psankar@novell.com>
-
-	* send-options.c: (org_gnome_compose_send_options)
-		Updated code to add priority to the appropriate header
-		Fixes the problem of Priority not set in outgoing mails 
-
-2005-03-07  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* camel-gw-listner.c (add_addressbook_sources) :
-	don't free container list here. It is chaced in 
-	connection and will be frred later. 
-
-	Fixes #72807 
-	
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-	* org-gnome-shared-folder.eplug.in: Added Groupwise to name.
-	Fixed description and added author.
-	Added xml tag.
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-gw-account-setup.eplug.in: Added author and fixed
-	description.
-
-2005-02-23  JP Rosevear  <jpr@novell.com>
-
-	* org-gnome-gw-account-setup.eplug.in: add account wizard item
-
-
-2005-02-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* camel-gw-listener.c: Include <libedataserverui/e-passwords.h>.
-	
-2005-02-17  Vivek Jain <jvivek@novell.com>
-	
-	* share-folder-common.c : (get_cnc):
-	 
-	 use ssl when "always" and "whenever possible" is enabled
-	 changed "soap_ssl" to "use_ssl"		
-	 use the default port "7191" instead of "7181"	 
-
-	2005-02-16  Not Zed  <NotZed@Ximian.com>
-
-	* groupwise-account-setup.c (org_gnome_gw_account_setup): return
-	NULL, not an invisible, so it doesn't interfere with account
-	editor.
-	
-2005-02-16  Not Zed  <NotZed@Ximian.com>
-
-	* groupwise-account-setup.c (org_gnome_gw_account_setup): return
-	NULL, not an invisible, so it doesn't interfere with account
-	editor.
-
-2005-02-03  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* send-options.c: (add_day_to_time), (send_options_commit),
-	(org_gnome_compose_send_options):Added functions to destroy
-	the dialog when the composer is destroyed to solve the crash.
-	Removed the return statement so that the send options gets
-	added to the composer headers. Made modification in setting
-	the values for some headers.
-	Changing the file name from Changelog to ChangeLog.
-
-2005-01-28 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* camel-gw-listner.c (get_address_book_names_from_server) 
-	: Remove leading "%s" in the message. Similar to
-	#36137 
-
-	* camel-gw-listener.c (add_esource) 
-	(modify_esource) (add_addressbook_sources) : 
-	Don't set offline_sync value taken from camel url 
-	instead set "1" or "0" depending upon offline is enabled 
-	or not
-
-2005-01-24  Vivek Jain <jvivek@novell.com>
-	
-	* properties.glade : changed the layout of the widgets
-	* share-folder.[ch]: removed the checkbuttons for display of rights
-			  : removed new_list, update_list and remove_list
-			    added  users_list
-	* share-folder.c   : removed function (update_list_update)
-	(share_folder_construct) : added gtk_cell_renderer_toggle for
-	displaying rights
-	added one structure SharedUsers to have a single list instead of three
-	different lists. Made corresponding changes in all functions.
-	* share-folder-common.c : (new_folder_response): use
-	gtk_widget_reparent to pack the widget
-	added two files
-	* org-gnome-shared-folder-errors.xml
-	* org-gnome-shared-folder-errors.xml.h : to display error message
-	* Makefile.am : included error data
-
-2005-01-21  Sivaiah Nallagatla <snallagtla@novell.com>
-
-	* org-gnome-gw-account-setup.eplug.in : changed
-	the item type from "item" to "item_table". avoids 
-	some debug spew on the console 
-
-2005-01-20  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* camel-gw-listener.c: (add_calendar_tasks_sources): 
-	Assiged value to URL.
-
-2005-01-19  Vivek Jain <jvivek@novell.com>
-	*install-shared.c
-	(org_gnome_popup_wizard): fixed a crash, caused by g_free
-	(install_folder_response): free the memory	
-
-2005-01-18  Vivek Jain <jvivek@novell.com>
-	*install-shared.c
-	(org_gnome_popup_wizard): removed unnecessary stuff for the display of
-	wizard
-
-2005-01-18  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	*install-shared.c
-	 (org_gnome_popup_wizard): displays the message without the
-	 mime headers
-
-2005-01-17 Vivek Jain <jvivek@novell.com> 
-	
-	*install-shared.c : (org_gnome_popup_wizard): included a condition
-	(null check) to fix a crash
-	* shared-folder-common.c :(org_gnome_shared_folder_factory): some
-	condition checks to avoid the possible crashes
-	(get_container_id): included code to return top level container id if
-	folder name is passed as null
-
-2005-01-15  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* camel-gw-listner.c : use url->host instead of reading "poa"
-	parameter everywhere. use "use_ssl" param instead of soap_ssl
-	We not longer have separate settings for soap as we use soap for mail
-	now 
-
-
-2005-01-13 Vivek Jain <jvivek@novell.com> 
-	
-	* share-folder.c :changed the function find_node to return user node
-	corresponding to the mail address given.
-	(add_clicked): added a condition so that user can't share folder to itself.
-	(user_selected): modified to display proper rights when owner is selected.
-	* share-folder-common.c : calling share_folder with a cnc in it.
-
-2005-01-10 Vivek Jain <jvivek@novell.com> Included 
-
-	* install-shared.c : opens up a wizard on reading a shared folder
-	notification and installs shared folder at the recepient end.
-	* share-folder-common.c : added 
-	(refresh_folder_tree) : to refresh the folder tree when a folder is shared or
-	a shared folder is created so that different icons are displayed
-	(get_cnc): to get a connection 
-	(get_container_id):to get the container id of the folder user selects
-	* share-folder.c : minor changes to fix the crash
-	* Makefile.am : including install-shared.c in sources
-	* org-gnome-shared-folder.eplug.in : added a plugin to the e-plugin list for
-	the message-read event
-
-2004-12-17  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* camel-gw-listner.c (add_esource) : read "soap_ssl" from 
-	the camel url instead of "use_ssl"
-
-2004-12-15 Vivek Jain <jvivek@novell.com>
-
-	Added (Create a shared folder) functionality in the plugin
-	* org-gnome-shared-folder.eplug.in : added a plugin in the plugin list
-	* share-folder-common.c : included functions to create a shared folder
-
-2004-12-15  Vivek Jain <jvivek@novell.com>
-
-	* shared-folder-common.c : (org_gnome_shared_folder_factory)
-	* shared-folder.c : some whitespace changes, typecasting widgets,
-	in (on_add_clicked) removed assigning the rights portion
diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c
index b9385ab390..17d904b549 100644
--- a/plugins/groupwise-features/camel-gw-listener.c
+++ b/plugins/groupwise-features/camel-gw-listener.c
@@ -26,7 +26,8 @@
 
 #include "camel-gw-listener.h"
 #include <string.h>
-#include  <camel/camel-i18n.h>
+#include <glib/gi18n.h>
+#include <camel/camel.h>
 #include <e-gw-connection.h>
 #include <libedataserverui/e-passwords.h>
 #include "e-util/e-alert-dialog.h"
diff --git a/plugins/groupwise-features/camel-gw-listener.h b/plugins/groupwise-features/camel-gw-listener.h
index 1c4cedbe5a..cc545def61 100644
--- a/plugins/groupwise-features/camel-gw-listener.h
+++ b/plugins/groupwise-features/camel-gw-listener.h
@@ -27,7 +27,6 @@
 #include <libedataserver/e-account-list.h>
 #include<libedataserver/e-source.h>
 #include<libedataserver/e-source-list.h>
-#include <camel/camel-url.h>
 
 G_BEGIN_DECLS
 
diff --git a/plugins/groupwise-features/gw-ui.c b/plugins/groupwise-features/gw-ui.c
index c1146ff4d1..41529b5d41 100644
--- a/plugins/groupwise-features/gw-ui.c
+++ b/plugins/groupwise-features/gw-ui.c
@@ -384,7 +384,7 @@ update_cal_entries_cb (EShellView *shell_view, gpointer user_data)
 			ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data;
 			const gchar *uri;
 
-			uri = event->comp_data ? e_cal_get_uri (event->comp_data->client) : NULL;
+			uri = is_comp_data_valid (event) ? e_cal_get_uri (event->comp_data->client) : NULL;
 
 			if (uri && g_ascii_strncasecmp (uri, "groupwise://", 12) == 0) {
 				visible = e_cal_util_component_has_attendee (event->comp_data->icalcomp);
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index b570d6486d..d2addbf095 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -33,17 +33,9 @@
 #include <shell/e-shell.h>
 #include <mail/em-config.h>
 #include <mail/em-event.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-session.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-multipart.h>
 #include <mail/em-folder-tree.h>
 #include <mail/mail-config.h>
 #include <mail/em-folder-selector.h>
-#include <camel/camel-medium.h>
 #include <e-gw-connection.h>
 #include <share-folder.h>
 
@@ -138,7 +130,7 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 				}
 
 				em_folder_tree_model_add_store (model, store, account->name);
-				camel_object_unref (store);
+				g_object_unref (store);
 			}
 		}
 
@@ -153,7 +145,7 @@ accept_free(gpointer data)
 {
 	struct AcceptData *accept_data = data;
 
-	camel_object_unref(accept_data->msg);
+	g_object_unref (accept_data->msg);
 	g_free(accept_data);
 }
 
@@ -177,7 +169,7 @@ apply_clicked (GtkAssistant *assistant, CamelMimeMessage *msg)
 	em_folder_selector_set_selected ((EMFolderSelector *) dialog, uri);
 	g_free(uri);
 	accept_data->msg = msg;
-	camel_object_ref(msg);
+	g_object_ref (msg);
 	accept_data->model = EM_FOLDER_TREE_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (folder_tree)));
 	g_object_set_data_full((GObject *)dialog, "accept-data", accept_data, accept_free);
 	g_signal_connect (dialog, "response", G_CALLBACK (install_folder_response), accept_data);
@@ -190,12 +182,13 @@ apply_clicked (GtkAssistant *assistant, CamelMimeMessage *msg)
 void
 org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 {
-	const CamelInternetAddress *from_addr = NULL;
+	CamelInternetAddress *from_addr = NULL;
 	const gchar *name;
 	const gchar *email;
 	CamelMimeMessage *msg = (CamelMimeMessage *) target->message;
-	CamelStreamMem *content;
+	CamelStream *stream;
 	CamelDataWrapper *dw;
+	GByteArray *byte_array;
 	gchar *start_message;
 
 	if (!msg)
@@ -204,18 +197,19 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 	if (((gchar *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL
 	    || (from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message)) == NULL
 	    || !camel_internet_address_get(from_addr, 0, &name, &email)
-	    || (dw = camel_medium_get_content_object (CAMEL_MEDIUM (msg))) == NULL) {
+	    || (dw = camel_medium_get_content (CAMEL_MEDIUM (msg))) == NULL) {
 		return;
 	} else {
 		if (CAMEL_IS_MULTIPART (dw)) {
-			dw = camel_medium_get_content_object((CamelMedium *)camel_multipart_get_part((CamelMultipart *)dw, 0));
+			dw = camel_medium_get_content ((CamelMedium *)camel_multipart_get_part((CamelMultipart *)dw, 0));
 			if (dw == NULL)
 				return;
 		}
 
-		content = (CamelStreamMem *)camel_stream_mem_new();
-		camel_data_wrapper_write_to_stream(dw, (CamelStream *)content);
-		camel_stream_write((CamelStream *)content, "", 1);
+		byte_array = g_byte_array_new ();
+		stream = camel_stream_mem_new_with_byte_array (byte_array);
+		camel_data_wrapper_write_to_stream (dw, stream);
+		camel_stream_write (stream, "", 1);
 
 		from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message);
 		if (from_addr && camel_internet_address_get(from_addr, 0, &name, &email)) {
@@ -226,7 +220,7 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 							   "Message from '%s'\n\n\n"
 							   "%s\n\n\n"
 							   "Click 'Apply' to install the shared folder\n\n"),
-							   name, name, content->buffer->data);
+							   name, name, byte_array->data);
 
 			page = gtk_label_new (start_message);
 			gtk_label_set_line_wrap (GTK_LABEL (page), TRUE);
@@ -241,8 +235,8 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 			gtk_window_set_title (GTK_WINDOW (assistant), _("Shared Folder Installation"));
 			gtk_window_set_position (GTK_WINDOW (assistant) , GTK_WIN_POS_CENTER_ALWAYS);
 
-			camel_object_ref (msg);
-			g_object_set_data_full((GObject *)page, "msg", msg, camel_object_unref);
+			g_object_ref (msg);
+			g_object_set_data_full((GObject *)page, "msg", msg, g_object_unref);
 
 			g_signal_connect (assistant, "apply", G_CALLBACK (apply_clicked), msg);
 
@@ -252,7 +246,7 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 		} else
 			g_warning ("Could not get the sender name");
 
-		camel_object_unref(content);
+		g_object_unref (stream);
 	}
 }
 
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index b868e28c5a..6e72b67320 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -62,6 +62,7 @@ void
 gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view)
 {
 	GtkWidget *dialog ,*w, *notebook, *box;
+	GtkWidget *content_area;
 	JunkSettings *junk_tab;
 	gint page_count =0;
 	EGwConnection *cnc;
@@ -76,7 +77,7 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view)
 	folder = e_mail_reader_get_folder (reader);
 	g_return_if_fail (folder != NULL);
 
-	cnc = get_cnc (folder->parent_store);
+	cnc = get_cnc (camel_folder_get_parent_store (folder));
 
 	dialog =  gtk_dialog_new_with_buttons (_("Junk Settings"),
 			NULL,
@@ -86,9 +87,10 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view)
 			GTK_STOCK_OK,
 			GTK_RESPONSE_ACCEPT,
 			NULL);
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 	gtk_window_set_default_size ((GtkWindow *) dialog, 292, 260);
 	gtk_widget_ensure_style (dialog);
-	gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *) dialog)->vbox, 12);
+	gtk_container_set_border_width (GTK_CONTAINER (content_area), 12);
 	box = gtk_vbox_new (FALSE, 6);
 	w = gtk_label_new ("");
 	msg = g_strdup_printf("<b>%s</b>", _("Junk Mail Settings"));
@@ -105,12 +107,12 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view)
 		notebook = gtk_notebook_new ();
 		gtk_notebook_append_page ((GtkNotebook *)notebook, box, NULL);
 		gtk_box_pack_start (
-			(GtkBox *) ((GtkDialog *) dialog)->vbox,
-			notebook, TRUE, TRUE, 0);
+			GTK_BOX (content_area), notebook, TRUE, TRUE, 0);
 	}
 
 	if (page_count == 0)
-		gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, box, TRUE, TRUE, 0);
+		gtk_box_pack_start (
+			GTK_BOX (content_area), box, TRUE, TRUE, 0);
 
 	g_signal_connect (dialog, "response", G_CALLBACK (junk_dialog_response), junk_tab);
 	gtk_widget_show_all (dialog);
diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h
index d4b59ae480..2e67b8cc8c 100644
--- a/plugins/groupwise-features/junk-settings.h
+++ b/plugins/groupwise-features/junk-settings.h
@@ -25,7 +25,6 @@
 #define __JUNK_SETTINGS_H__
 
 #include <gtk/gtk.h>
-#include <camel/camel-store.h>
 #include <e-gw-connection.h>
 
 #define _JUNK_SETTINGS_TYPE	      (junk_settings_get_type ())
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index 3de31b6838..466da1cb23 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -26,8 +26,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <e-gw-connection.h>
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
 
 #include <e-util/e-alert-dialog.h>
 
@@ -65,29 +63,35 @@ gw_retract_mail_cb (GtkAction *action, EShellView *shell_view)
 {
 	EGwConnection *cnc;
 	CamelFolder *folder;
-	CamelStore *store;
+	CamelStore *parent_store;
 	gchar *id = NULL;
 	GtkWidget *confirm_dialog, *confirm_warning;
+	GtkWidget *content_area;
 	gint n;
 
 	g_return_if_fail (get_selected_info (shell_view, &folder, &id));
 	g_return_if_fail (folder != NULL);
 
-	store = folder->parent_store;
+	parent_store = camel_folder_get_parent_store (folder);
 
-	cnc = get_cnc (store);
+	cnc = get_cnc (parent_store);
 
 	if (cnc && E_IS_GW_CONNECTION(cnc)) {
-		confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), GTK_WINDOW (e_shell_view_get_shell_window (shell_view)),
-				GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-				GTK_STOCK_YES, GTK_RESPONSE_YES,
-				GTK_STOCK_NO, GTK_RESPONSE_NO, NULL);
+		confirm_dialog = gtk_dialog_new_with_buttons (
+			_("Message Retract"),
+			GTK_WINDOW (e_shell_view_get_shell_window (shell_view)),
+			GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+			GTK_STOCK_YES, GTK_RESPONSE_YES,
+			GTK_STOCK_NO, GTK_RESPONSE_NO, NULL);
+
+		content_area = gtk_dialog_get_content_area (
+			GTK_DIALOG (confirm_dialog));
 
 		confirm_warning = gtk_label_new (_("Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this?"));
 		gtk_label_set_line_wrap (GTK_LABEL (confirm_warning), TRUE);
 		gtk_label_set_selectable (GTK_LABEL (confirm_warning), TRUE);
 
-		gtk_container_add (GTK_CONTAINER ((GTK_DIALOG(confirm_dialog))->vbox), confirm_warning);
+		gtk_container_add (GTK_CONTAINER (content_area), confirm_warning);
 		gtk_widget_set_size_request (confirm_dialog, 400, 100);
 		gtk_widget_show_all (confirm_dialog);
 
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 5a2b55c2c9..3eb8d59424 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -144,13 +144,19 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 	selected = e_calendar_view_get_selected_events (cal_view);
 	if (selected) {
 		ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data;
-		ECalComponent *comp = e_cal_component_new ();
-		ReceiveData *r_data = g_new0 (ReceiveData, 1);
+		ECalComponent *comp;
+		ReceiveData *r_data;
 		gboolean recurring = FALSE;
 		GThread *thread = NULL;
 		GError *error = NULL;
 		gchar *address = NULL;
 
+		if (!is_comp_data_valid (event))
+			return;
+
+		comp = e_cal_component_new ();
+		r_data = g_new0 (ReceiveData, 1);
+
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 		address = itip_get_comp_attendee (comp, event->comp_data->client);
 
@@ -373,7 +379,7 @@ gw_resend_meeting_cb (GtkAction *action, EShellView *shell_view)
 	selected = e_calendar_view_get_selected_events (cal_view);
 	if (selected) {
 		ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data;
-		ECalComponent *comp = e_cal_component_new ();
+		ECalComponent *comp;
 		ECalComponent *new_comp = NULL;
 		gboolean recurring = FALSE;
 		CalObjModType mod = CALOBJ_MOD_THIS;
@@ -383,6 +389,10 @@ gw_resend_meeting_cb (GtkAction *action, EShellView *shell_view)
 		/* inserting the boolean to share the code between resend and retract */
 		gboolean resend = TRUE;
 
+		if (!is_comp_data_valid (event))
+			return;
+
+		comp = e_cal_component_new ();
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 		if (e_cal_component_has_recurrences (comp) || e_cal_component_is_instance (comp))
 			recurring = TRUE;
diff --git a/plugins/groupwise-features/properties.ui b/plugins/groupwise-features/properties.ui
index ca39309ff4..941c9a5ae8 100644
--- a/plugins/groupwise-features/properties.ui
+++ b/plugins/groupwise-features/properties.ui
@@ -167,7 +167,7 @@
                                     <child>
                                       <object class="GtkLabel" id="users">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">&lt;b&gt;Users:&lt;/b&gt;</property>
+                                        <property name="label" translatable="yes">Users:</property>
                                         <property name="use_underline">False</property>
                                         <property name="use_markup">True</property>
                                         <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -177,6 +177,9 @@
                                         <property name="yalign">0.5</property>
                                         <property name="xpad">0</property>
                                         <property name="ypad">0</property>
+                                        <attributes>
+                                            <attribute name="weight" value="bold"/>
+                                        </attributes>
                                       </object>
                                       <packing>
                                         <property name="padding">6</property>
diff --git a/plugins/groupwise-features/proxy-login-dialog.ui b/plugins/groupwise-features/proxy-login-dialog.ui
index a18acf988d..a8c33317ca 100644
--- a/plugins/groupwise-features/proxy-login-dialog.ui
+++ b/plugins/groupwise-features/proxy-login-dialog.ui
@@ -155,7 +155,7 @@
             <child type="label">
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Account Name&lt;/b&gt;</property>
+                <property name="label" translatable="yes">Account Name</property>
                 <property name="use_underline">False</property>
                 <property name="use_markup">True</property>
                 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -169,6 +169,9 @@
                 <property name="width_chars">-1</property>
                 <property name="single_line_mode">False</property>
                 <property name="angle">0</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
             </child>
           </object>
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index f85bc2b946..6fd97d99aa 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -34,8 +34,6 @@
 #include <mail/mail-config.h>
 #include <mail/em-folder-selector.h>
 #include <mail/em-account-editor.h>
-#include <camel/camel-url.h>
-#include <camel/camel-store.h>
 #include <mail/mail-ops.h>
 #include <libedataserver/e-account.h>
 #include <e-util/e-util.h>
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 6654844bb7..1507e08af0 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -45,8 +45,6 @@
 #include <libedataserver/e-account-list.h>
 #include <e-util/e-icon-factory.h>
 
-#include <camel/camel-url.h>
-#include <camel/camel-offline-store.h>
 #include <libedataserverui/e-passwords.h>
 #include <libedataserverui/e-name-selector.h>
 #include <proxy.h>
@@ -700,7 +698,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 		}
 
 		/*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*/
-		gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new("Proxy"));
+		gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new (C_("GW", "Proxy")));
 		g_signal_connect ((GtkNotebook *)(data->parent), "switch-page", G_CALLBACK (proxy_page_changed_cb), account);
 		pag_num = gtk_notebook_page_num ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog);
 		g_object_set_data ((GObject *) account, "proxy_tab_num", GINT_TO_POINTER (pag_num));
@@ -718,7 +716,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 		}
 	}
 
-	camel_object_unref (store);
+	g_object_unref (store);
 	camel_exception_clear (&ex);
 	return NULL;
 }
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index 6e75f9153e..e20be7353b 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -33,7 +33,6 @@
 #include <misc/e-send-options.h>
 #include <mail/em-config.h>
 #include <e-gw-connection.h>
-#include <camel/camel-url.h>
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-source-list.h>
 #include <libedataserverui/e-passwords.h>
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 992664f863..91758da535 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -38,11 +38,6 @@
 #include <mail/mail-vfolder.h>
 #include <mail/em-vfolder-rule.h>
 #include <filter/e-filter-rule.h>
-#include <camel/camel-store.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-folder.h>
 #include <e-gw-container.h>
 #include <e-gw-connection.h>
 #include <shell/e-shell-sidebar.h>
@@ -91,19 +86,21 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store)
 	if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
 		return;
 	em_folder_tree_model_add_store (model, store, account->name);
-	/* camel_object_unref (store); */
+	/* g_object_unref (store); */
 }
 
 void
 shared_folder_commit (EPlugin *ep, EConfigTarget *tget)
 {
 	EMConfigTargetFolder *target =  (EMConfigTargetFolder *)tget->config->target;
-	CamelFolder *folder = target->folder;
-	CamelStore *store = folder->parent_store;
+	CamelStore *parent_store;
 	EMFolderTreeModel *model = NULL; /*mail_component_peek_tree_model (mail_component_peek ())*/;
+
+	parent_store = camel_folder_get_parent_store (target->folder);
+
 	if (common) {
 		share_folder (common);
-		refresh_folder_tree (model, store);
+		refresh_folder_tree (model, parent_store);
 		g_object_run_dispose ((GObject *)common);
 		common = NULL;
 	}
@@ -176,7 +173,7 @@ static void
 create_folder_free (struct _EMCreateFolder *m)
 {
 	camel_store_free_folder_info (m->store, m->fi);
-	camel_object_unref (m->store);
+	g_object_unref (m->store);
 	g_free (m->full_name);
 	g_free (m->parent);
 	g_free (m->name);
@@ -222,7 +219,7 @@ create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct
 	}
 
 	m = mail_msg_new (&create_folder_info);
-	camel_object_ref (store);
+	g_object_ref (store);
 	m->store = store;
 	m->full_name = g_strdup (full_name);
 	m->parent = g_strdup (parent);
@@ -264,7 +261,7 @@ users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi)
 
 	if (!(si = em_folder_tree_model_lookup_store_info (ssi->model, store))) {
 		g_assert_not_reached ();
-		camel_object_unref (store);
+		g_object_unref (store);
 		return;
 	}
 
@@ -284,13 +281,14 @@ users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi)
 		create_folder (si->store, path, new_folder_created_cb, ssi);
 
 	}
-	camel_object_unref (store);
+	g_object_unref (store);
 }
 
 static void
 new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *model)
 {
 	GtkWidget *users_dialog;
+	GtkWidget *content_area;
 	GtkWidget *w;
 	struct ShareInfo *ssi;
 	const gchar *uri;
@@ -317,18 +315,19 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m
 			_("Users"), NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
 	w = gtk_label_new_with_mnemonic (_("Enter the users and set permissions"));
 	gtk_widget_show(w);
-	gtk_box_pack_start(GTK_BOX (GTK_DIALOG (users_dialog)->vbox), (GtkWidget *) w, TRUE, TRUE, 6);
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (users_dialog));
+	gtk_box_pack_start(GTK_BOX (content_area), (GtkWidget *) w, TRUE, TRUE, 6);
 	ssi->sf = share_folder_new (cnc, NULL);
 	gtk_widget_set_sensitive (GTK_WIDGET ((ssi->sf)->table), TRUE);
 	ssi->model = model;
 	ssi->emfs = emfs;
-	gtk_widget_reparent (GTK_WIDGET ((ssi->sf)->table), GTK_DIALOG (users_dialog)->vbox);
+	gtk_widget_reparent (GTK_WIDGET ((ssi->sf)->table), content_area);
 	gtk_widget_hide((GtkWidget*) emfs);
 	gtk_window_resize (GTK_WINDOW (users_dialog), 350, 300);
 	gtk_widget_show(users_dialog);
 	g_signal_connect (users_dialog, "response", G_CALLBACK (users_dialog_response), ssi);
 
-	camel_object_unref (store);
+	g_object_unref (store);
 	return;
 
 }
@@ -373,7 +372,7 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d
 	EMConfigTargetFolder *target=  (EMConfigTargetFolder *)hook_data->config->target;
 	CamelFolder *folder = target->folder;
 
-	folder_name = g_strdup (folder->full_name);
+	folder_name = g_strdup (camel_folder_get_full_name (folder));
 	folderuri = g_strdup(target->uri);
 	if (folderuri && folder_name)
 		account = g_strrstr(folderuri, "groupwise");
@@ -399,8 +398,10 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d
 	}
 
 	if (account) {
-		CamelStore *store = folder->parent_store;
-		cnc = get_cnc (store);
+		CamelStore *parent_store;
+
+		parent_store = camel_folder_get_parent_store (folder);
+		cnc = get_cnc (parent_store);
 
 		if (E_IS_GW_CONNECTION (cnc))
 			id = get_container_id (cnc, folder_name);
diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h
index 138266ccef..4df979d4ef 100644
--- a/plugins/groupwise-features/share-folder.h
+++ b/plugins/groupwise-features/share-folder.h
@@ -25,7 +25,7 @@
 #define __SHARE_FOLDER_H__
 
 #include <gtk/gtk.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 #include <e-gw-connection.h>
 #include <libedataserverui/e-name-selector.h>
 
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index d8cddd03fe..83ecf6c1bf 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -32,11 +32,6 @@
 #include <time.h>
 #include <gtk/gtk.h>
 
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-message.h>
-
 #include <mail/e-mail-reader.h>
 #include <mail/em-utils.h>
 #include <mail/message-list.h>
@@ -93,12 +88,13 @@ gw_track_message_status_cb (GtkAction *action,
 	CamelMimeMessage *msg = NULL;
 	CamelFolder *folder = NULL;
 	gchar *selected_uid = NULL;
-	const CamelInternetAddress *from;
+	CamelInternetAddress *from;
 	const gchar *namep, *addp;
 
 	GtkDialog *d;
 	GtkTable *table;
 	GtkWidget *widget;
+	GtkWidget *content_area;
 	GtkScrolledWindow *win;
 	GtkVBox *vbox;
 
@@ -122,12 +118,13 @@ gw_track_message_status_cb (GtkAction *action,
 
 	/* Create the dialog */
 	d = (GtkDialog *) gtk_dialog_new ();
+	content_area = gtk_dialog_get_content_area (d);
 	gtk_dialog_add_button (d, GTK_STOCK_OK, GTK_RESPONSE_OK);
 	gtk_window_set_title (GTK_WINDOW (d), _("Message Status"));
 
 	table = (GtkTable *) gtk_table_new (1, 2, FALSE);
 	win = (GtkScrolledWindow *) gtk_scrolled_window_new (NULL, NULL);
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG(d)->vbox), GTK_WIDGET (win));
+	gtk_container_add (GTK_CONTAINER (content_area), GTK_WIDGET (win));
 	vbox = (GtkVBox *) gtk_vbox_new (FALSE, 12);
 	gtk_scrolled_window_add_with_viewport (win, GTK_WIDGET(vbox));
 	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (table), FALSE, TRUE, 0);
@@ -187,7 +184,7 @@ gw_track_message_status_cb (GtkAction *action,
 	gtk_table_set_col_spacings (table ,12);
 	gtk_table_set_row_spacings (table, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (table), FALSE, TRUE, 0);
-	cnc = get_cnc (folder->parent_store);
+	cnc = get_cnc (camel_folder_get_parent_store (folder));
 
 	if (E_IS_GW_CONNECTION(cnc)) {
 		GSList *recipient_list;
diff --git a/plugins/hula-account-setup/ChangeLog b/plugins/hula-account-setup/ChangeLog
deleted file mode 100644
index 99def86394..0000000000
--- a/plugins/hula-account-setup/ChangeLog
+++ /dev/null
@@ -1,64 +0,0 @@
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* camel-hula-listener.c:
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* camel-hula-listener.h:
-	* hula-account-setup.c:
-
-2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #545568
-
-	* org-gnome-hula-account-setup.eplug.xml:
-	Add "system_plugin=true" so it's not shown in the Plugin Manager.
-	This plugin is not designed to be disabled by the user.
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* camel-hula-listener.c: (camel_hula_listener_new):
-	ANSIfication of function declaration.
-
-2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
-
-	* camel-hula-listener.c (remove_esource), (modify_esource):
-	Don't assume the relative URI is non-NULL (#427232).
-
-2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	* camel-hula-listener.c: (finalize)
-	Chain up to parent's finalize() method.
-
-2006-01-09  Kjartan Maraas <kmaraas@gnome.org>
-
-	* camel-hula-listener.c: (is_hula_caldav_account), (add_esource),
-	(modify_esource), (account_added), (account_removed),
-	(account_changed): Try to fix caldav and normal account setup. This
-	definitely needs review.
-
-2006-01-06  Simon Zheng <simon.zheng@sun.com>
-
-	* camel-hula-listener.c:
-	* camel-hula-listener.h:
-	use libedataserver/e-account-list.h instead of e-util/e-account-list.h.
-	use libedataserver/e-account.h instead of e-util/e-account.h.
-
-2005-12-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: Fix make-clean issues.
-
-2005-12-07  Funda Wang  <fundawang@linux.net.cn>
-
-	* org-gnome-evolution-hula-account-setup.eplug.xml: i18nlized.
-
-2005-11-14  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am, camel-hula-listener.[ch], hula-account-setup.c,
-	org-gnome-evolution-hula-account-setup.eplug.xml: Hula Account
-	setup - initial commits.
-
diff --git a/plugins/hula-account-setup/Makefile.am b/plugins/hula-account-setup/Makefile.am
deleted file mode 100644
index 8997f5b48e..0000000000
--- a/plugins/hula-account-setup/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-@EVO_PLUGIN_RULE@
-
-plugin_DATA =  org-gnome-evolution-hula-account-setup.eplug
-
-plugin_LTLIBRARIES = liborg-gnome-evolution-hula-account-setup.la 
-
-liborg_gnome_evolution_hula_account_setup_la_CPPFLAGS =	\
-	$(AM_CPPFLAGS)					\
-	-I$(top_srcdir)					\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	-DEVOLUTION_UIDIR=\""$(uidir)"\"
-
-liborg_gnome_evolution_hula_account_setup_la_SOURCES = \
-			camel-hula-listener.c	\
-			camel-hula-listener.h	\
-			hula-account-setup.c
-
-liborg_gnome_evolution_hula_account_setup_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-
-liborg_gnome_evolution_hula_account_setup_la_LIBADD=			\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/filter/libfilter.la			\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
-
-EXTRA_DIST = org-gnome-evolution-hula-account-setup.eplug.xml
-
-BUILT_SOURCES = $(plugin_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
--include $(top_srcdir)/git.mk
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
deleted file mode 100644
index 3b1c3bfb43..0000000000
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Harish Krishnaswamy <kharish@novell.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <camel/camel-i18n.h>
-#include <libedataserverui/e-passwords.h>
-#include <libedataserver/e-account.h>
-#include "camel-hula-listener.h"
-
-static	GList *hula_accounts = NULL;
-
-struct _CamelHulaListenerPrivate {
-	GConfClient *gconf_client;
-	/* we get notification about mail account changes form this object */
-	EAccountList *account_list;
-};
-
-struct _HulaAccountInfo {
-	gchar *uid;
-	gchar *name;
-	gchar *source_url;
-};
-
-typedef struct _HulaAccountInfo HulaAccountInfo;
-
-#define HULA_CALDAV_URI_PREFIX "caldav://"
-#define HULA_CALDAV_PREFIX_LENGTH 9
-#define HULA_URI_PREFIX "hula://"
-#define HULA_PREFIX_LENGTH 7
-#define PARENT_TYPE G_TYPE_OBJECT
-
-static GObjectClass *parent_class = NULL;
-
-static void dispose (GObject *object);
-static void finalize (GObject *object);
-
-static void
-camel_hula_listener_class_init (CamelHulaListenerClass *class)
-{
-	GObjectClass *object_class;
-
-	parent_class =  g_type_class_ref (PARENT_TYPE);
-	object_class = G_OBJECT_CLASS (class);
-
-	/* virtual method override */
-	object_class->dispose = dispose;
-	object_class->finalize = finalize;
-}
-
-static void
-camel_hula_listener_init (CamelHulaListener *config_listener,  CamelHulaListenerClass *class)
-{
-	config_listener->priv = g_new0 (CamelHulaListenerPrivate, 1);
-}
-
-static void
-dispose (GObject *object)
-{
-	CamelHulaListener *config_listener = CAMEL_HULA_LISTENER (object);
-
-	g_object_unref (config_listener->priv->gconf_client);
-	g_object_unref (config_listener->priv->account_list);
-
-	G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-finalize (GObject *object)
-{
-	CamelHulaListener *config_listener = CAMEL_HULA_LISTENER (object);
-	GList *list;
-	HulaAccountInfo *info;
-
-	if (config_listener->priv) {
-		g_free (config_listener->priv);
-	}
-
-	for ( list = g_list_first (hula_accounts); list; list = g_list_next (list) ) {
-
-		info = (HulaAccountInfo *) (list->data);
-
-		if (info) {
-
-			g_free (info->uid);
-			g_free (info->name);
-			g_free (info->source_url);
-			g_free (info);
-		}
-	}
-
-	g_list_free (hula_accounts);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-/*determines whehter the passed in account is hula or not by looking at source url */
-
-static gboolean
-is_hula_account (EAccount *account)
-{
-	if (account->source->url != NULL) {
-		return (strncmp (account->source->url,  HULA_URI_PREFIX, HULA_PREFIX_LENGTH ) == 0);
-	} else {
-		return FALSE;
-	}
-}
-
-static gboolean
-is_hula_caldav_account (EAccount *account)
-{
-        if (account->source->url != NULL) {
-                return (strncmp (account->source->url,  HULA_CALDAV_URI_PREFIX, HULA_CALDAV_PREFIX_LENGTH ) == 0);
-        } else {
-                return FALSE;
-        }
-}
-
-/* looks up for an existing hula account info in the hula_accounts list based on uid */
-
-static HulaAccountInfo*
-lookup_account_info (const gchar *key)
-{
-	GList *list;
-        HulaAccountInfo *info;
-	gint found = 0;
-
-        if (!key)
-                return NULL;
-
-	info = NULL;
-
-        for (list = g_list_first (hula_accounts);  list;  list = g_list_next (list)) {
-                info = (HulaAccountInfo *) (list->data);
-                found = (strcmp (info->uid, key) == 0);
-		if (found)
-			break;
-	}
-	if (found)
-		return info;
-	return NULL;
-}
-
-#define CALENDAR_SOURCES "/apps/evolution/calendar/sources"
-#define SELECTED_CALENDARS "/apps/evolution/calendar/display/selected_calendars"
-
-static void
-add_esource (const gchar *conf_key, const gchar *group_name,  const gchar *source_name, CamelURL *url)
-{
-	ESourceList *source_list;
-	ESourceGroup *group;
-	ESource *source;
-        GConfClient *client;
-	GSList *ids, *temp;
-	gboolean result;
-	const gchar *source_selection_key;
-	gchar *relative_uri;
-	const gchar *cal_port = "8081";
-	/* const gchar *use_ssl = ""; */
-	/* offline_sync to come soon */
-
-	/* TODO use_ssl = camel_url_get_param (url, "use_ssl"); */
-
-	client = gconf_client_get_default();
-	if (!client) {
-		g_message ("could not get a valid gconf client\n");
-		return;
-	}
-	source_list = e_source_list_new_for_gconf (client, conf_key);
-
-	group = e_source_group_new (group_name, HULA_CALDAV_URI_PREFIX);
-	result = e_source_list_add_group (source_list, group, -1);
-
-	if (result == FALSE) {
-		g_warning ("Could not add Hula source group!");
-	} else {
-		e_source_list_sync (source_list, NULL);
-	}
-
-	/* caldav://localhost:8081/dav/kharish/calendar/Personal */
-
-	relative_uri = g_strdup_printf ("%s@%s:%s/dav/%s/calendar/Personal", url->user, url->host, cal_port, url->user);
-	g_message ("Relative uri is %s\n", relative_uri);
-
-	source = e_source_new (source_name, relative_uri);
-	/* e_source_set_property (source, "port", camel_url_get_param (url,
-	 * "port"));
-	e_source_set_property (source, "auth-domain", "Hula");
-	e_source_set_property (source, "use_ssl", use_ssl); */
-	e_source_group_add_source (group, source, -1);
-	e_source_list_sync (source_list, NULL);
-
-	if (!strcmp (conf_key, CALENDAR_SOURCES))
-		source_selection_key = SELECTED_CALENDARS;
-	else source_selection_key = NULL;
-	if (source_selection_key) {
-		ids = gconf_client_get_list (client, source_selection_key , GCONF_VALUE_STRING, NULL);
-		ids = g_slist_append (ids, g_strdup (e_source_peek_uid (source)));
-		gconf_client_set_list (client,  source_selection_key, GCONF_VALUE_STRING, ids, NULL);
-		temp  = ids;
-		for (; temp != NULL; temp = g_slist_next (temp))
-			g_free (temp->data);
-		g_slist_free (ids);
-	}
-
-	g_object_unref (source);
-	g_object_unref (group);
-	g_object_unref (source_list);
-	g_object_unref (client);
-	g_free (relative_uri);
-}
-
-static void
-remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_name, const gchar * relative_uri)
-{
-	ESourceList *list;
-        GSList *groups;
-	gboolean found_group;
-	GConfClient* client;
-	GSList *ids;
-	GSList *node_tobe_deleted;
-	const gchar *source_selection_key;
-
-        client = gconf_client_get_default();
-        list = e_source_list_new_for_gconf (client, conf_key);
-	groups = e_source_list_peek_groups (list);
-
-	found_group = FALSE;
-
-	for (; groups != NULL && !found_group; groups = g_slist_next (groups)) {
-		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
-
-		if (strcmp (e_source_group_peek_name (group), group_name) == 0 &&
-		   strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX ) == 0) {
-			GSList *sources = e_source_group_peek_sources (group);
-
-			for (; sources != NULL; sources = g_slist_next (sources)) {
-				ESource *source = E_SOURCE (sources->data);
-				const gchar *source_relative_uri;
-
-				source_relative_uri = e_source_peek_relative_uri (source);
-				if (source_relative_uri == NULL)
-					continue;
-				if (strcmp (source_relative_uri, relative_uri) == 0) {
-
-					if (!strcmp (conf_key, CALENDAR_SOURCES))
-						source_selection_key = SELECTED_CALENDARS;
-					else source_selection_key = NULL;
-					if (source_selection_key) {
-						ids = gconf_client_get_list (client, source_selection_key ,
-									     GCONF_VALUE_STRING, NULL);
-						node_tobe_deleted = g_slist_find_custom (ids, e_source_peek_uid (source), (GCompareFunc) strcmp);
-						if (node_tobe_deleted) {
-							g_free (node_tobe_deleted->data);
-							ids = g_slist_delete_link (ids, node_tobe_deleted);
-						}
-						gconf_client_set_list (client,  source_selection_key,
-								       GCONF_VALUE_STRING, ids, NULL);
-
-					}
-					e_source_list_remove_group (list, group);
-					e_source_list_sync (list, NULL);
-					found_group = TRUE;
-					break;
-
-				}
-			}
-
-		}
-
-	}
-
-	g_object_unref (list);
-	g_object_unref (client);
-
-}
-
-/* looks for e-source with the same info as old_account_info and changes its values to the values passed in */
-
-static void
-modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const gchar * new_group_name, CamelURL *new_url)
-{
-	ESourceList *list;
-        GSList *groups;
-	gchar *old_relative_uri;
-	CamelURL *url;
-	gboolean found_group;
-	GConfClient* client;
-
-	url = camel_url_new (old_account_info->source_url, NULL);
-	if (!url->host || strlen (url->host) ==0)
-		return;
-
-	old_relative_uri = g_strdup_printf ("%s@%s:%d/dav/%s/calendar/Personal", url->user, url->host, url->port, url->user);
-	client = gconf_client_get_default ();
-        list = e_source_list_new_for_gconf (client, conf_key);
-	groups = e_source_list_peek_groups (list);
-
-	found_group = FALSE;
-
-	for (; groups != NULL &&  !found_group; groups = g_slist_next (groups)) {
-
-		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
-
-		if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 &&
-		    strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX) == 0) {
-			GSList *sources = e_source_group_peek_sources (group);
-
-			for (; sources != NULL; sources = g_slist_next (sources)) {
-				ESource *source = E_SOURCE (sources->data);
-				const gchar *source_relative_uri;
-
-				source_relative_uri = e_source_peek_relative_uri (source);
-				if (source_relative_uri == NULL)
-					continue;
-				if (strcmp (source_relative_uri, old_relative_uri) == 0) {
-					gchar *new_relative_uri;
-
-					new_relative_uri = g_strdup_printf ("%s@%s:%d/dav/%s/calendar/Personal", new_url->user, new_url->host, new_url->port, new_url->user);
-					e_source_group_set_name (group, new_group_name);
-					e_source_set_relative_uri (source, new_relative_uri);
-					e_source_set_property (source, "username", new_url->user);
-					e_source_set_property (source, "port", camel_url_get_param (new_url,"port"));
-					e_source_set_property (source, "use_ssl",  camel_url_get_param (url, "use_ssl"));
-					e_source_list_sync (list, NULL);
-					found_group = TRUE;
-					g_free (new_relative_uri);
-					break;
-				}
-			}
-		}
-	}
-
-	g_object_unref (list);
-	g_object_unref (client);
-	camel_url_free (url);
-	g_free (old_relative_uri);
-
-}
-/* add sources for calendar if the account added is HULA account
-   adds the new account info to  HULA accounts list */
-
-static void
-add_calendar_sources (HulaAccountInfo *info)
-{
-	CamelURL *url;
-
-	url = camel_url_new (info->source_url, NULL);
-	add_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), url);
-
-	camel_url_free (url);
-
-}
-
-/* removes calendar  sources if the account removed is HULA account
-   removes the the account info from HULA_account list */
-
-static void
-remove_calendar_sources (HulaAccountInfo *info)
-{
-	CamelURL *url;
-	gchar *relative_uri;
-	const gchar *address;
-	const gchar *caldav_port;
-
-	url = camel_url_new (info->source_url, NULL);
-
-	address = url->host;
-	if (!address || strlen (address) ==0)
-		return;
-
-	caldav_port = camel_url_get_param (url, "caldav_port");
-	if (!caldav_port || strlen (caldav_port) == 0)
-		caldav_port = "8081";
-
-	relative_uri = g_strdup_printf ("%s@%s:%s/dav/%s/calendar/Personal", url->user, url->host, caldav_port, url->user);
-	remove_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), relative_uri);
-	camel_url_free (url);
-	g_free (relative_uri);
-
-}
-
-static void
-account_added (EAccountList *account_listener, EAccount *account)
-{
-
-	HulaAccountInfo *info;
-	EAccount *parent;
-
-	if (!is_hula_account (account) || !is_hula_caldav_account (account))
-		return;
-
-	info = g_new0 (HulaAccountInfo, 1);
-	info->uid = g_strdup (account->uid);
-	info->name = g_strdup (account->name);
-	info->source_url = g_strdup (account->source->url);
-	if (account->parent_uid) {
-		parent = (EAccount *)e_account_list_find (account_listener, E_ACCOUNT_FIND_UID, account->parent_uid);
-
-		if (!parent)
-			return;
-
-	} else
-		add_calendar_sources (info);
-
-	hula_accounts = g_list_append (hula_accounts, info);
-}
-
-static void
-account_removed (EAccountList *account_listener, EAccount *account)
-{
-	HulaAccountInfo *info;
-
-	if (!is_hula_account (account) || !is_hula_caldav_account (account))
-		return;
-
-	info = lookup_account_info (account->uid);
-	if (info == NULL)
-		return;
-
-	remove_calendar_sources (info);
-	hula_accounts = g_list_remove (hula_accounts, info);
-	g_free (info->uid);
-	g_free (info->name);
-	g_free (info->source_url);
-        g_free (info);
-}
-
-static void
-account_changed (EAccountList *account_listener, EAccount *account)
-{
-	gboolean is_hula;
-	CamelURL *old_url, *new_url;
-	const gchar *old_caldav_port, *new_caldav_port;
-	HulaAccountInfo *existing_account_info;
-	const gchar *old_use_ssl, *new_use_ssl;
-	const gchar *old_address, *new_address;
-
-	is_hula = is_hula_account (account);
-	if (is_hula == FALSE)
-		is_hula = is_hula_caldav_account (account);
-
-	existing_account_info = lookup_account_info (account->uid);
-
-	if (existing_account_info == NULL && is_hula) {
-
-		if (!account->enabled)
-			return;
-
-		/* some account of other type is changed to hula */
-		account_added (account_listener, account);
-
-	} else if (existing_account_info != NULL && !is_hula) {
-
-		/* hula account is changed to some other type */
-		remove_calendar_sources (existing_account_info);
-		hula_accounts = g_list_remove (hula_accounts, existing_account_info);
-		g_free (existing_account_info->uid);
-		g_free (existing_account_info->name);
-		g_free (existing_account_info->source_url);
-		g_free (existing_account_info);
-
-	} else if (existing_account_info != NULL && is_hula) {
-
-		if (!account->enabled) {
-			account_removed (account_listener, account);
-			return;
-		}
-
-		/* some info of hula account is changed. update the sources with new info if required */
-		old_url = camel_url_new (existing_account_info->source_url, NULL);
-		old_address = old_url->host;
-		old_caldav_port = camel_url_get_param (old_url, "caldav_port");
-		old_use_ssl = camel_url_get_param (old_url, "use_ssl");
-		new_url = camel_url_new (account->source->url, NULL);
-		new_address = new_url->host;
-
-		if (!new_address || strlen (new_address) ==0)
-			return;
-
-		new_caldav_port = camel_url_get_param (new_url, "caldav_port");
-
-		if (!new_caldav_port || strlen (new_caldav_port) == 0)
-			new_caldav_port = "8081";
-
-		new_use_ssl = camel_url_get_param (new_url, "use_ssl");
-
-		if ((old_address && strcmp (old_address, new_address))
-		   ||  (old_caldav_port && strcmp (old_caldav_port, new_caldav_port))
-		   ||  strcmp (old_url->user, new_url->user)
-		   || strcmp (old_use_ssl, new_use_ssl)) {
-
-			account_removed (account_listener, account);
-			account_added (account_listener, account);
-		} else if (strcmp (existing_account_info->name, account->name)) {
-
-			modify_esource ("/apps/evolution/calendar/sources", existing_account_info, account->name, new_url);
-
-		}
-
-		g_free (existing_account_info->name);
-		g_free (existing_account_info->source_url);
-		existing_account_info->name = g_strdup (account->name);
-		existing_account_info->source_url = g_strdup (account->source->url);
-		camel_url_free (old_url);
-		camel_url_free (new_url);
-	}
-}
-
-static void
-camel_hula_listener_construct (CamelHulaListener *config_listener)
-{
-	EIterator *iter;
-	EAccount *account;
-	HulaAccountInfo *info;
-
-	config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client);
-
-	for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ); e_iterator_is_valid (iter); e_iterator_next (iter) ) {
-
-		account = E_ACCOUNT (e_iterator_get (iter));
-
-		if ( is_hula_account (account) && account->enabled) {
-
-			info = g_new0 (HulaAccountInfo, 1);
-			info->uid = g_strdup (account->uid);
-			info->name = g_strdup (account->name);
-			info->source_url = g_strdup (account->source->url);
-			hula_accounts = g_list_append (hula_accounts, info);
-
-		}
-
-	}
-	g_signal_connect (config_listener->priv->account_list, "account_added", G_CALLBACK (account_added), NULL);
-	g_signal_connect (config_listener->priv->account_list, "account_changed", G_CALLBACK (account_changed), NULL);
-	g_signal_connect (config_listener->priv->account_list, "account_removed", G_CALLBACK (account_removed), NULL);
-}
-
-GType
-camel_hula_listener_get_type (void)
-{
-	static GType camel_hula_listener_type  = 0;
-
-	if (!camel_hula_listener_type) {
-		static GTypeInfo info = {
-                        sizeof (CamelHulaListenerClass),
-                        (GBaseInitFunc) NULL,
-                        (GBaseFinalizeFunc) NULL,
-                        (GClassInitFunc) camel_hula_listener_class_init,
-                        NULL, NULL,
-                        sizeof (CamelHulaListener),
-                        0,
-                        (GInstanceInitFunc) camel_hula_listener_init
-                };
-		camel_hula_listener_type = g_type_register_static (PARENT_TYPE, "CamelHulaListener", &info, 0);
-	}
-
-	return camel_hula_listener_type;
-}
-
-CamelHulaListener*
-camel_hula_listener_new (void)
-{
-	CamelHulaListener *config_listener;
-
-	config_listener = g_object_new (CAMEL_TYPE_HULA_LISTENER, NULL);
-	config_listener->priv->gconf_client = gconf_client_get_default();
-
-	camel_hula_listener_construct (config_listener);
-
-	return config_listener;
-}
diff --git a/plugins/hula-account-setup/camel-hula-listener.h b/plugins/hula-account-setup/camel-hula-listener.h
deleted file mode 100644
index 97c1b33919..0000000000
--- a/plugins/hula-account-setup/camel-hula-listener.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Harish Krishnaswamy <kharish@novell.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef CAMEL_HULA_LISTENER_H
-#define CAMEL_HULA_LISTENER_H
-
-#include <libedataserver/e-account-list.h>
-#include<libedataserver/e-source.h>
-#include<libedataserver/e-source-list.h>
-#include <camel/camel-url.h>
-
-G_BEGIN_DECLS
-
-#define CAMEL_TYPE_HULA_LISTENER            (camel_hula_listener_get_type ())
-#define CAMEL_HULA_LISTENER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAMEL_TYPE_HULA_LISTENER, CamelHulaListener))
-#define CAMEL_HULA_LISTENER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_HULA_LISTENER,  CamelHULAListenerClass))
-#define CAMEL_IS_HULALISTENER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAMEL_TYPE_HULA_LISTENER))
-#define CAMEL_IS_HULA_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CAMEL_TYPE_HULA_LISTENER))
-
-typedef struct _CamelHulaListener CamelHulaListener;
-typedef struct _CamelHulaListenerClass CamelHulaListenerClass;
-typedef struct _CamelHulaListenerPrivate CamelHulaListenerPrivate;
-
-struct _CamelHulaListener {
-       GObject parent;
-
-       CamelHulaListenerPrivate *priv;
-};
-
-struct _CamelHulaListenerClass {
-       GObjectClass parent_class;
-};
-
-GType              camel_hula_listener_get_type (void);
-CamelHulaListener *camel_hula_listener_new (void);
-
-G_END_DECLS
-
-#endif
diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c
deleted file mode 100644
index 34427f3b71..0000000000
--- a/plugins/hula-account-setup/hula-account-setup.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Harish Krishnaswamy <kharish@novell.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include "camel-hula-listener.h"
-#include <gtk/gtk.h>
-#include "mail/em-config.h"
-
-static CamelHulaListener *config_listener = NULL;
-
-gint e_plugin_lib_enable (EPlugin *ep, gint enable);
-GtkWidget* org_gnome_evolution_hula_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
-
-static void
-free_hula_listener ( void )
-{
-	g_object_unref (config_listener);
-}
-
-gint
-e_plugin_lib_enable (EPlugin *ep, gint enable)
-{
-	if (!config_listener) {
-		config_listener = camel_hula_listener_new ();
-		g_atexit ( free_hula_listener );
-	}
-
-	return 0;
-}
-
-GtkWidget *
-org_gnome_evolution_hula_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
-{
-	if (data->old)
-		return data->old;
-	return NULL;
-}
diff --git a/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml b/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml
deleted file mode 100644
index e90ce650cb..0000000000
--- a/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<e-plugin-list>
-  <e-plugin id="org.gnome.evolution.plugin.hula-account-setup" type="shlib" _name="Hula Support"
-    location="@PLUGINDIR@/liborg-gnome-evolution-hula-account-setup@SOEXT@" load-on-startup="true" system_plugin="true">
-    <author name="Harish Krishnaswamy" email="kharish@novell.com"/>
-    <_description>Add Hula support to Evolution.</_description>
-    
-    <hook class="org.gnome.evolution.mail.config:1.0">
-      <group target="account" id="org.gnome.evolution.mail.config.accountAssistant">
-	<item type="item_table" path="20.receive_options/30.soapport/50.dummy" factory="org_gnome_evolution_hula_account_setup"/>
-      </group>
-    </hook>
-   <hook class="org.gnome.evolution.mail.config:1.0">
-      <group target="account" id="org.gnome.evolution.mail.config.accountEditor">
-	<item type="item_table" path="20.receive_options/30.soapport/50.dummy" factory="org_gnome_evolution_hula_account_setup"/>
-      </group>
-    </hook>
-
-    <hook class="org.gnome.evolution.mail.config:1.0">
-      <group target="account" id="org.gnome.evolution.mail.config.accountWizard">
-	<item type="item_table" path="20.receive_options/30.soapport/50.dummy" factory="org_gnome_evolution_hula_account_setup"/>
-      </group>
-    </hook>	
-    
-  </e-plugin>
-</e-plugin-list>
diff --git a/plugins/image-inline/image-inline.c b/plugins/image-inline/image-inline.c
index 5ea1070afb..21688dbf94 100644
--- a/plugins/image-inline/image-inline.c
+++ b/plugins/image-inline/image-inline.c
@@ -26,9 +26,6 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-stream-mem.h>
 #include <gtkhtml/gtkhtml-embedded.h>
 #include <gtkimageview/gtkimagescrollwin.h>
 
@@ -235,6 +232,7 @@ size_allocate_cb (GtkHTMLEmbedded *embedded,
                   GtkAllocation *allocation,
                   ImageInlinePObject *image_object)
 {
+	GtkAllocation image_allocation;
 	GtkWidget *widget;
 	gint pixbuf_width;
 	gint pixbuf_height;
@@ -243,7 +241,8 @@ size_allocate_cb (GtkHTMLEmbedded *embedded,
 	gdouble zoom = 1.0;
 
 	widget = GTK_WIDGET (image_object->object.format->html);
-	widget_width = widget->allocation.width - 12;
+	gtk_widget_get_allocation (widget, &image_allocation);
+	widget_width = image_allocation.width - 12;
 
 	pixbuf_width = gdk_pixbuf_get_width (image_object->pixbuf);
 	pixbuf_height = gdk_pixbuf_get_height (image_object->pixbuf);
@@ -310,7 +309,7 @@ org_gnome_image_inline_pobject_free (EMFormatHTMLPObject *object)
 	image_object = (ImageInlinePObject *) object;
 
 	if (image_object->mime_part != NULL) {
-		camel_object_unref (image_object->mime_part);
+		g_object_unref (image_object->mime_part);
 		image_object->mime_part = NULL;
 	}
 
@@ -360,7 +359,7 @@ org_gnome_image_inline_decode (ImageInlinePObject *image_object)
 
 	/* Stream takes ownership of the byte array. */
 	stream = camel_stream_mem_new_with_byte_array (array);
-	data_wrapper = camel_medium_get_content_object (medium);
+	data_wrapper = camel_medium_get_content (medium);
 	camel_data_wrapper_decode_to_stream (data_wrapper, stream);
 
 	/* Don't trust the content type in the MIME part.  It could
@@ -390,7 +389,7 @@ org_gnome_image_inline_decode (ImageInlinePObject *image_object)
 	}
 
 exit:
-	camel_object_unref (stream);
+	g_object_unref (stream);
 	g_object_unref (loader);
 }
 
@@ -459,7 +458,7 @@ org_gnome_image_inline_format (gpointer ep, EMFormatHookTarget *target)
 			classid, target->part,
 			org_gnome_image_inline_embed);
 
-	camel_object_ref (target->part);
+	g_object_ref (target->part);
 	image_object->mime_part = target->part;
 
 	image_object->object.free = org_gnome_image_inline_pobject_free;
diff --git a/plugins/imap-features/ChangeLog b/plugins/imap-features/ChangeLog
deleted file mode 100644
index 647f059f22..0000000000
--- a/plugins/imap-features/ChangeLog
+++ /dev/null
@@ -1,80 +0,0 @@
-2008-10-03  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* imap-headers.c:
-
-2008-01-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* imap-headers.c: (imap_headers_commit), (org_gnome_imap_headers):
-	Such a useful IMAP plugin. But doesn't detect USE_IMAP for GW users.
-	Fixed it.
-
-2007-12-02  Tobias Mueller  <tobiasmue@svn.gnome.org>
-	* imap-headers.glade:
-	Make it selectable, fixes bug 401523, patch by
-	Lucky Wankhede <wlakke@novell.com>
-	
-2007-11-08  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	* imap-headers.c: (imap_headers_abort), (imap_headers_commit),
-	(epif_header_is_valid), (epif_add_sensitivity), (epif_add_header),
-	(epif_remove_header_clicked), (epif_fetch_all_headers_toggled),
-	(epif_entry_changed), (org_gnome_imap_headers):
-	* imap-headers.glade:
-	Remove useless GtkVBox,
-	remove the useless popup to have an inline header entry field,
-	concentrate all UI elements in a structure, added a prefix to
-	relevant functions.
-
-2007-07-30  Andre Klapper  <a9016009@gmx.de>
-
-	* imap-headers.glade:
-	remove "window1" string from translation
-
-2007-07-20  Johnny Jacob  <jjohnny@novell.com>
-
-	* imap-headers.c : (org_gnome_imap_headers) : 
-	GtkTreeView should have a model.
-	Fixes #445248
-	
-2007-07-09  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* imap-headers.c: (add_header_clicked), (remove_header_clicked),
-	(org_gnome_imap_headers):
-	* imap-headers.glade:
-	HIGify. Disable the Delete button when there are no headers.
-	See bug #437892
-
-2007-05-14  Sankar P  <psankar@novell.com>
-
-	** Committed on behalf of Xiurong Simon Zheng <simon.zheng@sun.com>   
-
-	* imap-headers.c:
-	Evolution crashes when clicking "Edit" button
-	Fixes #425506 
-
-2007-01-30  Sankar P  <psankar@novell.com>
-
-	* imap-headers.c: (imap_headers_commit):
-	Fixes a memory leak and a scenario where,
-	some IMAP servers doesnt return headers if 
-	the string contains more than one consecutive 
-	embedded spaces in the HEADER.
-
-2007-01-27  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* imap-headers.c: (org_gnome_imap_headers):
-	mark strings as translatable. See bug #399381 for details.
-
-2007-01-22  Sankar P  <psankar@novell.com>
-
-	* ChangeLog
-	* imap-headers.c
-	* imap-headers.glade
-	* Makefile.am
-	* org-gnome-imap-features.eplug.xml:
-
-	Initial list of files for the imap-features plugin
diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c
index df567aa020..910986e592 100644
--- a/plugins/imap-features/imap-headers.c
+++ b/plugins/imap-features/imap-headers.c
@@ -34,9 +34,6 @@
 #include <e-util/e-util.h>
 #include <e-util/e-account-utils.h>
 
-#include <camel/camel-url.h>
-#include <camel/camel-exception.h>
-
 #include <glib/gi18n.h>
 
 typedef struct _epif_data EPImapFeaturesData;
@@ -62,6 +59,13 @@ static EPImapFeaturesData *ui = NULL;
 void imap_headers_abort (EPlugin *efp, EConfigHookItemFactoryData *data);
 void imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data);
 GtkWidget * org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data);
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
 
 void
 imap_headers_abort (EPlugin *efp, EConfigHookItemFactoryData *data)
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
deleted file mode 100644
index 2d07d56a14..0000000000
--- a/plugins/itip-formatter/ChangeLog
+++ /dev/null
@@ -1,1121 +0,0 @@
-2009-02-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #571721
-
-	* itip-view.c: (itip_view_init): Added translators comment.
-
-2009-02-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #548787
-
-	* itip-view.c (set_info_items), (itip_view_init),
-	(itip_view_set_source_list): Enable CnP for all the text info present
-	in calendar related messages.
-
-2009-01-21  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #541209
-
-	** Adapt to the new APIs from upstream libical. Changes made include
-	using the "_r" counterpart for the following APIs:
-	+ icalproperty_as_ical_string ()
-	+ icalvalue_as_ical_string ()
-	+ icalcomponent_as_ical_string ()
-	+ icalparameter_as_ical_string ()
-	+ icaldurationtype_as_ical_string ()
-	+ icalenum_reqstat_code ()
-	+ icallangbind_property_eval_string ()
-	+ icallangbind_quote_as_ical ()
-	+ icalmime_text_end_part ()
-	+ icalperiodtype_as_ical_string ()
-	+ icalproperty_enum_to_string ()
-	+ icalproperty_get_parameter_as_string ()
-	+ icalproperty_get_value_as_string ()
-	+ icalproperty_get_property_name ()
-	+ icalrecurrencetype_as_string ()
-	+ icaltime_as_ical_string ()
-	+ icalreqstattype_as_string ()
-	+ icalvalue_binary_as_ical_string ()
-	+ icalvalue_int_as_ical_string ()
-	+ icalvalue_utcoffset_as_ical_string ()
-	+ icalvalue_string_as_ical_string ()
-	+ icalvalue_recur_as_ical_string ()
-	+ icalvalue_text_as_ical_string ()
-	+ icalvalue_attach_as_ical_string ()
-	+ icalvalue_duration_as_ical_string ()
-	+ icalvalue_date_as_ical_string ()
-	+ icalvalue_datetime_as_ical_string ()
-	+ icalvalue_float_as_ical_string ()
-	+ icalvalue_geo_as_ical_string ()
-	+ icalvalue_datetimeperiod_as_ical_string ()
-	+ icalvalue_period_as_ical_string ()
-	+ icalvalue_trigger_as_ical_string ()
-	+ icalvalue_as_ical_string ()
-
-	* itip-formatter.c (find_attendee), (find_to_address),
-	(find_from_address), (update_item):
-
-2009-01-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #225712
-
-	* itip-view.h:
-	* itip-view.c: (itip_view_set_show_keep_alarm_check),
-	(itip_view_get_keep_alarm_check_state),
-	(itip_view_set_show_inherit_alarm_check),
-	(itip_view_get_inherit_alarm_check_state): New functions to new
-	options to either inherit reminder from the incoming event or to
-	preserve users reminders in already existing event in the calendar.
-	* itip-view.c: (struct _ItipViewPrivate), (alarm_check_toggled_cb),
-	(itip_view_init): Properly initialize new option's members.
-	* itip-formatter.c: (find_cal_opened_cb), (update_item),
-	(send_comp_to_attendee), (update_attendee_status), (send_item),
-	(extract_itip_data), (view_response_cb), (format_itip_object):
-	Setup new options based on the actual data.
-
-2008-11-28  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #561467
-
-	* itip-formatter.c (update_x), (update_attendee_status): Copy
-	required X-* properties . This might be needed for special cases
-	in certain backends.
-
-2008-11-06  Patrick Ohly  <patrick.ohly@gmx.de>
-
-	** Fix for bug #541121
-
-	* itip-formatter.c: don't allow sending a response to meeting
-	invitation replies
-
-2008-10-20  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #514989
-
-	* itip-view.c: (format_date_and_time_x):
-	Calculate tomorrow from current time, not from the date to convert.
-
-2008-10-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #550441
-
-	* itip-formatter.c: (view_response_cb): Ignore if summary not there.
-
-2008-10-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #550441
-
-	* itip-formatter.c: (view_response_cb):
-	Use the proper functions to traverse messages in a folder's summary.
-
-2008-10-10  Patrick Ohly  <patrick.ohly@gmx.de>
-
-	** #541121: improved itip formatter: allow replying to forwarded
-	and already imported invitations; honor RVSP flag in invitation
-	
-	* itip-formatter.c: the whole logic for "reply to organize" was
-	improved.
-
-	If an organizer exists, replying is enabled. Sending a reply is
-	enabled by default if the event looks like a meeting (= has
-	attendees).  The wish of the organizer to not get replies is
-	checked (previous Evolution releases ignored it); in this case the
-	default is to not send a reply. In all cases the user can override
-	the default.
-
-2008-10-08  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* itip-formatter.c:
-
-2008-10-03  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* itip-view.c:
-
-2008-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #519491
-
-	* itip-view.c: (ensure_utf8), (itip_view_set_organizer),
-	(itip_view_set_organizer_sentby), (itip_view_set_attendee),
-	(itip_view_set_attendee_sentby), (itip_view_set_proxy),
-	(itip_view_set_delegator), (itip_view_set_summary),
-	(itip_view_set_location), (itip_view_set_status),
-	(itip_view_set_comment), (itip_view_set_description),
-	(itip_view_add_upper_info_item), (itip_view_add_lower_info_item):
-	Convert texts to valid UTF-8 texts before passing them to Gtk+
-	functions which requires that.
-
-2008-09-24  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #313225
-
-	* itip-formatter.c: (format_itip): Set the user flag '$has_cal'
-	on the message when formatting a calendar attachment.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* itip-view.h:
-
-2008-08-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #546892
-
-	* itip-view.c:
-	Prefer gtk_image_new_from_icon_name() or e_icon_factory_get_image().
-
-2008-07-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #491176
-
-	* itip-view.c: (itip_view_init): Word-wrap the summary if necessary;
-	expand also value-labels in the table, thus the text will be aligned
-	on the left; align action buttons on the left too.
-
-2008-07-17  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* itip-formatter.c: (view_response_cb): Added some 
-	FIXME's for code cleanup.						
-
-2008-07-16  Sankar P  <psankar@novell.com>
-
-	Pushing disk summary changes from the madagascar branch
-
-	* itip-formatter.c (view_response_cb):
-
-2008-05-29  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #535459
-
-	* itip-formatter.c: (extract_itip_data):
-	Do not use component when sanity check fails.
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534360
-
-	* itip-view.c:
-	Migrate from deprecated GtkObject symbols to GObject equivalents.
-
-2008-04-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-        ** Fixes #338330 (bnc)
-           Internet Based Calendar Events Are Declined By Evolution/GroupWise
-
-	* itip-formatter.c: (view_response_cb):
-
-2008-04-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for BNC bug #382687
-
-	* plugins/itip-formatter/itip-formatter.c: Don't download contents in
-	main thread, which causes deadlock
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #523541
-
-	* itip-formatter.c: (find_server):
-	Do not leak memory returned by e_cal_component_get_recurid_as_string.
-
-2008-02-25  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* itip-formatter.c: (find_server), (update_attendee_status): Free
-	the memory returned by e_cal_component_get_recurid_as_string.								     
-
-2008-02-25  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes#516408
-	* itip-formatter.c (find_attendee), (find_to_address),
-	(find_from_address), (update_item): Free the memory returned 
-	by libical.
-
-2008-02-20  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Follow up on bug #517072
-
-	* itip-view.c: (set_calendar_sender_text), (set_tasklist_sender_text),
-	(set_journal_sender_text): Properly escape text here too.
-
-2008-02-19  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #517072
-
-	* itip-view.c: (set_summary_text):
-	Properly escape summary text.
-
-2008-02-18  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #515744
-
-	* itip-formatter.c: (idle_open_cb): Memory Leak fix.
-
-2008-02-05  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Rewrite of itip-formatter bits. It was written around carrying
-	EMFormatHTMLPobject. But that would be freed just after the formatter
-	thread ends. So all the time, it was working on dead pointer. Now I
-	have made EMFormatPURI and carried it around well. It might need a
-	good review though.
-
-	** Fix for bug #468427
-	Fixes a lot of crashes around itip-formatter.
-
-	* itip-formatter.c: (find_to_address), (find_from_address),
-	(get_real_item), (adjust_item), (set_buttons_sensitive),
-	(cal_opened_cb), (start_calendar_server),
-	(start_calendar_server_by_uid), (source_selected_cb),
-	(find_cal_opened_cb), (find_server), (update_item),
-	(remove_delegate), (update_attendee_status), (send_item),
-	(set_itip_error), (extract_itip_data), (idle_open_cb),
-	(view_response_cb), (format_itip_object), (puri_free),
-	(format_itip), (itip_attachment_frame):
-
-2008-01-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #475781
-
-	* itip-formatter.c: (format_itip_object):
-	Fix memory leaks around ECalComponentDateTime.
-
-2007-12-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #362638
-
-	* itip-formatter.c:
-	Use the new MailMsg API for messages.
-
-2007-12-04  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #220846
-
-	* itip-view.h:
-	* itip-view.c: (itip_view_set_show_free_time_check),
-	(itip_view_get_free_time_check_state), (struct _ItipViewPrivate),
-	(itip_view_init):
-	* itip-formatter.c: (view_response_cb), (format_itip_object):
-	New option to accept meeting request as free time.
-
-2007-11-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #458237
-
-	* itip-formatter.c: (start_calendar_server), (source_selected_cb):
-	Check for non-NULL source before using it to prevent a crash.
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* itip-view.c: (itip_view_get_source_list), (itip_view_get_source),
-	(itip_view_get_rsvp_comment): Fix NULL vs FALSE warnings.
-
-2007-10-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #417999
-
-	* itip-view.c:
-	Use ESourceComboBox instead of ESourceOptionMenu (deprecated).
-
-2007-10-04  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #331578
-
-	* itip-formatter.c: (struct _opencal_msg), (open_calendar_desc),
-	(open_calendar_do), (open_calendar_done), (open_calendar_free),
-	(struct _mail_msg_op open_calendar_op):
-	New functions and structures to run command line in other thread.
-	* itip-formatter.c: (idle_open_cb):
-	Run command line in other thread rather than in main thread.
-
-2007-10-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #346146
-
-	* itip-view.h: (enum ItipViewMode): Added ITIP_VIEW_MODE_HIDE_ALL.
-	* itip-view.c: (set_buttons): Don't add buttons when in this mode.
-	* itip-formatter.c: (in_proper_folder): New helper function.
-	* itip-formatter.c: (format_itip_object): Check if the mail is in
-	proper folder and allow response in this case, otherwise only show
-	info from calendar and don't check in local calendar for anything.
-
-2007-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #428402
-
-	* itip-formatter.c: (extract_itip_data): First move to next component, then
-	remove last alarm and then free that last component.
-
-2007-09-07  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #273417
-	* itip-formatter.c: (idle_open_cb): Removed the base version
-	while invoking evolution calendar.					    
-
-2007-08-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #329746
-
-	* itip-formatter.c: (send_item), (format_itip_object):
-	Marked strings to localize and renamed 'Journal' to 'Memo'.
-	* itip-formatter.c: (find_cal_opened_cb):
-	Renamed 'Journal' to 'Memo'.
-
-2007-08-21  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #301835 (BNC)
-
-	* itip-formatter.c: (find_from_address):
-	Fixed crash when no SENTBY parameter present.
-
-2007-08-06  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #460326
-
-	* itip-formatter.c: (extract_itip_data): If the vcalendar isn't there
-	don't crash but report invalid.
-
-2007-07-20  Claude Paroz  <claude@2xlibre.net>
-
-	* itip-view.c: (set_tasklist_sender_text): Added omitted %s formatter.
-
-2007-07-09  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* itip-formatter.c: (format_itip_object): Fixed a build break.
-
-2007-07-09  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	reviewed by: Veerapuram Varadhan <vvaradhan@novell.com>
-
-	* itip-formatter.c: (find_attendee), (find_attendee_if_sentby):
-	Finds the address of the account owner in the attendees list.		
-	(find_to_address), (find_from_address): Establishes the current 
-	account id.
-	(extract_itip_data), (view_response_cb), (format_itip_object), 
-	(pitip_free): Sets the corresponding itip-view components.
-	* itip-view.h:
-	* itip-view.c: (set_calendar_sender_text),
-	(set_tasklist_sender_text), (set_journal_sender_text),
-	(itip_view_destroy), (itip_view_set_organizer_sentby),
-	(itip_view_get_organizer_sentby), (itip_view_set_attendee_sentby),
-	(itip_view_get_attendee_sentby), (itip_view_set_proxy),
-	(itip_view_get_proxy): Sets the message appropriately in the itip-view.
-
-	Committing on behalf of Suman Manjunath <msuman@novell.com>
-
-2006-09-14  Andre Klapper  <a9016009@gmx.de>
-
-	* itip-view.c: fix some bad mnemonics, mark string for 
-	translation. Fixes bug #439186.
-
-2007-06-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* itip-formatter.c: Fix a compilation warning.  (#437584)
-	Patch from Gilles Dartiguelongue.
-
-2007-05-11  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* itip-view.c: (set_one_button): Fixes casts,
-	fixes part of bug #437584.
-
-2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #429422
-
-	* itip-view.c (set_one_button):
-	e_gtk_button_new_with_icon() is dead; just do it manually.
-
-	* itip-view.c (itip_view_class_init):
-	Use g_cclosure_marshal_VOID__INT instead of gtk_marshal_NONE__INT.
-
-2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* itip-formatter.c:
-	Fix "incompatible pointer type" warnings (#360619).
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2007-02-09  Sankar P  <psankar@novell.com>
-
-	* itip-formatter.c: (update_item), (view_response_cb):
-	Deletes all instances of a recurrence appointment as soon as the 
-	invitation is accepted/declined adn applied-to-all.
-	Fixes #312301
-
-2006-09-14  Andre Klapper  <a9016009@gmx.de>
-
-	* itip-view.c: correct display of time. Fixes bug #343686.
-
-2006-08-23  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #347248
-
-	* itip-formatter.c: (update_item): Update the
-	em_utils_temp_save_part to use readwrite mode.
-
-2006-08-23  Matthew Barnes  <mbarnes@redhat.com>
-  	 
-	* itip-formatter.c:
-	fix an uninitialized GError - fixes bug 352423.
-
-2006-08-23  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #350395 by Øystein Gisnås
-	
-	* itip-view.c: (format_date_and_time_x): The patch adds some extra 
-	checks to avoid the crash.
-
-2006-08-18  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #328268
-	* itip-formatter.c: (start_calendar_server): Check
-	for the presence of ecal before connecting the signal.						 
-
-2006-08-11  Harish Krishnaswamy  <kharish@novell.com>
-
-	* itip-formatter.c: (send_comp_to_attendee):
-	Add missing argument in the call to itip_send_comp.
-
-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>
-
-	* 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-09  Chris Heath <chris@heathens.co.nz>
-
-	* itip-view.c (itip_view_destroy): Fix memory leak.
-	Fixes bug #335423.
-
-2006-05-31  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #340296
-	* itip-formatter.c: (cal_opened_cb), (start_calendar_server),
-	(find_cal_opened_cb): Set the default timezone before the calendar
-	is opened.
-	(find_server), (format_itip_object): If the mail account has the associated
-	calendar, then do not open all the calendars. Open the current calendar
-	and other calendars marked for conflict search.
-
-2006-02-14  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	* itip-formatter.c (itip_formatter_page_factory): A typo fix from
-	gfree to g_free.
-	
-2006-02-12  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* itip-formatter.c (itip_formatter_page_factory):
-	Removing unnecessary markup in translateable string.
-	Fixes part of bug #272789.
-
-2006-02-11  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* itip-formatter.c (itip_formatter_page_factory): 
-	Change a11y names. Fixes part of bug #330723.
-
-2006-01-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* itip-formatter.c: (find_cal_opened_cb), (message_foreach_part),
-	(update_attendee_status), (view_response_cb), (check_is_instance),
-	(format_itip_object): Add some comments and remove unused code.
-	* itip-view.c: (itip_view_class_init), (recur_toggled_cb),
-	(itip_view_add_upper_info_item_printf),
-	(itip_view_add_lower_info_item_printf): Remove more cruft.
-
-2006-01-10  Simon Zheng  <simon.zheng@sun.com>
-
-	* itip-view.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>
-
-	* evolution/plugins/itip-formatter/itip-formatter.c:
-	* evolution/plugins/itip-formatter/itip-view.c:
-	changing "cancelled" (British English)
-	to "canceled" (American English). Fixes bug 325334.
-
-2006-01-06  Simon Zheng <simon.zheng@sun.com>
-
-	* itip-formatter.c:
-	* itip-view.c:
-	use libedataserver/e-account-list.h instead of e-util/e-account-list.h.
-	use libedataserver/e-account.h instead of e-util/e-account.h.
-
-2006-01-02  Harish Krishnaswamy  <kharish@novell.com>
-
-	* itip-formatter.c: (source_selected_cb):
-	Check for static capability only if the ecal
-	already exists. Fixes another critical warning
-	crasher.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* itip-formatter.c: added a missing word. Fixes bug 325128.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* itip-formatter.c, itip-view.c: Marked missing strings translatable.
-	  Fixes bug 313554 in CVS HEAD.
-
-2005-12-17  Tor Lillqvist  <tml@novell.com>
-
-	* itip-formatter.c: Use g_ascii_strcasecmp() instead of
-	g_strcasecmp().
-
-2005-11-24  Tor Lillqvist  <tml@novell.com>
-
-	* itip-view.c: Drop extra inclusion of e-util/e-time-utils.h,
-	which is going away anyway.
-
-2005-11-07  Dinesh Layek  <ldinesh@novell.com>
-
-	Fixes #308752
-	* itip-formatter.c: (itip_formatter_page_factory): changed the label 
-	"Meetings and Tasks" as "Calendar and Tasks"
-
-2005-09-12  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #315345
-	* itip-view.c: (format_date_and_time_x): Send the 
-	month as it as without subtracting one.
-
-2005-08-29  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #313534
-	* itip-formatter.c: (cal_opened_cb), (find_cal_opened_cb):
-	Moved the code to display recur check box to cal_opened_cb.
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* itip-view.c: add missing headers.
-
-2005-08-21  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* itip-formatter.c: 
-	(update_attendee_status): removed the unwanted brackets.
-	(format_itip_object): Applied the patch from
-	Christian Kellner <Christian.Kellner@scalix.com> which
-	fixes a memory leak and make deference of url
-	much simpler.
-
-2005-08-20  Carsten Guenther <carsten.guenther@scalix.com>
-
-	* itip-formatter.c: (cal_opened_cb, final_cal_opened_cb):
-	Put back in warning messages about calendar not being opened.
-
-2005-08-18  Carsten Guenther <carsten.guenther@scalix.com>
-
-	* itip-formatter.c: (update_attendee_status): NULL-terminate
-	calls to e_error_run; fixed typos in if-statement; some code
-	cleanup.
-	(cal_opened_cb, final_cal_opened_cb): Removed unnecessary
-	message about not being able to open the calendar.
-
-2005-08-11  Dinesh Layek  <LDinesh@novell.com>
-
-	Fixes #305627
-	* itip-formatter.c: (format_itip_object): set the source calendar
-	of an appointment from the url information of CamelFolder.
-
-2005-08-09  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #307841
-	* itip-formatter.c: (view_response_cb): Check
-	if the transparency is set and if not set it as
-	Opaque.
-
-2005-07-27  Vivek Jain  <jvivek@novell.com>
-	
-	* itip-formatter.c : (update_item) 
-	applied patch submitted by <tommi.komulainen@iki.fi>
-	do not send "cid:" to get the part.
-	check part for NULL before using it.
-	(message_foreach_part): do nothing if part is NULL
-	saves crash.
-	**Fixes #272632
-
-2005-07-20  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* itip-formatter.c: (format_itip_object): Fixed a memory
-	leak and a crash when start date does is not present.
-
-2005-07-19  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* itip-formatter.c: 
-	(source_selected_cb), (find_cal_opened_cb): Check if 
-	the component is a recurring and show the recurring check box.
-	(view_response_cb): Set the MOD-TYPE property while accepting
-	all instances.
-	(check_is_instance): Checks if its a recurring event.
-	(format_itip_object):
-	(find_server): Set the recurrence id.
-
-2005-07-11  Harish Krishnaswamy  <kharish@novell.com>
-
-	* itip-formatter.c (source_selected_cb), 
-	(find_cal_opened_cb), (extract_itip_data): enable the
-	'Apply to all instances' option for gw recurrence instances.
-	(view_response_cb): embed X-GW-RECUR-INSTANCE-MOD-TYPE property in the
-	component to indicate whether the accept/decline status applies
-	to the instance or the entire group.
-	* itip-view.[ch]: (set_buttons), (recur_toggled_cb), (itip_view_init),
-	(itip_view_get_recur_check_state), (itip_view_set_show_recur_check):
-	utility methods to manipulate the recur_check widget.
-
-2005-06-27  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
-
-2005-06-20  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* itip-formatter.c: (find_my_address), (set_attendee),
-	(send_comp_to_attendee), (remove_delegate),
-	(update_attendee_status), (extract_itip_data),
-	(format_itip_object): Set the delegator address. If the 
-	organizer refuses to add the new delegate, send a cancel
-	method to the delegate and request to the attendee.
-	* itip-view.h:
-	* itip-view.c: (set_calendar_sender_text), (itip_view_init),
-	(itip_view_get_show_rsvp), (itip_view_set_update),
-	(itip_view_get_update), (itip_view_set_show_update),
-	(itip_view_get_show_update): Added functions to show an
-	option to send updates to attendees.
-	* org-gnome-itip-formatter.error.xml: Added the error
-	message to add a new delegate.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* org-gnome-itip-formatter.eplug.xml: Use SOEXT.
-
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* itip-formatter.c: moved e-error to e-util
-
-2005-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: setup cleanfiles & fix extra_dist
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* org-gnome-itip-formatter.error.xml: s/-errors.xml/.error.xml/
-
-	* Makefile.am: 
-	* org-gnome-itip-formatter.eplug.xml: s/.in/.xml/ & i18n.
-
-2005-04-08  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #74265
-	* itip-view.c (format_date_and_time_x): In time_days_in_month
-	the  months are indexed from 0, so subtract one from the month
-	argument and send it.
-
-2005-04-07  JP Rosevear  <jpr@novell.com>
-
-	Fixes #74291
-	
-	* itip-view.c (itip_view_init): remove comment to re-enable
-	description display
-
-2005-03-31  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #73844
- 	
- 	* itip-formatter.c (extract_itip_data): make sure we check the
- 	kind of the correct item
-	
-2005-03-30  Li Yuan  <li.yuan@sun.com>
-
-	* itip-formatter.c: (itip_formatter_page_factory):
-	add a11y name to Conflict Search Table
-	Fixes #73914
-
-2005-03-11  JP Rosevear  <jpr@novell.com>
-
-	* itip-formatter.c (extract_itip_data): set the type appropriately
-	so that assigned tasks can be handled
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-itip-formatter.eplug.in: Added author and description.
-	s/bbdb/itip/
-	Added xml tag.
-
-2005-02-07  JP Rosevear  <jpr@novell.com>
-
-	* org-gnome-itip-formatter.eplug.in: specify id for config page
-
-2005-03-03  Rodney Dawes  <dobey@novell.com>
-
-	* itip-view.c (itip_view_init): Set the spacing for ourself to 12
-	to be HIG compliant as we are a GtkHBox derivative
-	Align the icon at 0.5 in the X direction to be HIG compliant
-	Set the spacing between table rows/columns to be HIG compliant
-	Fix the spacing/padding for all the boxes and packing calls to be
-	HIG compliant
-
-	Fixes #41235
-	
-2005-02-02  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	reviewed by Harish Krishnaswamy <kharish@novell.com>
-
-	Fixes #71460
-	* itip-formatter.c: (view_response_cb): If the my_address
-	is not set. Set it from the backend.
-
-2005-01-27  JP Rosevear  <jpr@novell.com>
-
-	* itip-view.c (format_date_and_time_x): make tomorrow and this
-	week strings work properly
-
-2005-01-27  JP Rosevear  <jpr@novell.com>
-	
-	* itip-formatter.c (find_cal_opened_cb): remove debug test
-
-442005-01-27  JP Rosevear  <jpr@novell.com>
-
-	* itip-formatter.c: add some debugging spew
-
-2005-01-27  Rodrigo Moya <rodrigo@novell.com>
-
-	* itip-formatter.c (update_attendee_status): deal with the itip
-	message having an individual instance.
-
-2005-01-26  JP Rosevear  <jpr@novell.com>
-
-	Fixes #71485
-	
-	* itip-formatter.c (update_attendee_status): fix message paste-o
-
-	* itip-view.c (format_date_and_time_x): improve translator
-	comments
-
-2005-01-25  JP Rosevear  <jpr@novell.com>
-
-	* itip-formatter.c (pitip_free): actually destroy the client
-	hashes so the signals get cleaned up
-	(format_itip): create a proper unique classid for the pobject
-
-2005-01-14  JP Rosevear  <jpr@novell.com>
-
-	* itip-formatter.c (extract_itip_data): use
-	camel_data_wrapper_decode_to_stream instead of
-	camel_data_wrapper_write_to_stream 
-	
-2005-01-14  JP Rosevear  <jpr@novell.com>
-
-	* itip-formatter.c (format_itip_object): handle UTC dtstart/dtend
-	properly
-
-2005-01-11  JP Rosevear  <jpr@novell.com>
-
-	Fixes #29985
-	
-	* itip-formatter.c (view_response_cb): set the message flags to
-	answered if we send successfully
-
-2005-01-11  Harish Krishnaswamy  <kharish@novell.com>
-
-	* itip-formatter.c (update_item): Fixed a compiler warning. 
-
-2005-01-10  JP Rosevear  <jpr@novell.com>
-
-	* itip-formatter.c (update_item): set to the new items, duh
-	
-2005-01-10  JP Rosevear  <jpr@novell.com>
-
-	* itip-formatter.c (update_item): compare pointers instead of
-	content id
-
-2005-01-10  JP Rosevear  <jpr@novell.com>	
-
-	* itip-formatter.c (update_item): first crack at saving
-	attachments for the backend
-	(extract_itip_data): tell the user what to do for more than one
-	attachment
-
-2005-01-09  JP Rosevear  <jpr@novell.com>
-
-	* itip-view.h: remove error mode
-
-	* itip-formatter.c (set_itip_error): show error information to the
-	user
-	(extract_itip_data): use above
-	(format_itip_object): no more "error" mode
-
-2005-01-09  JP Rosevear  <jpr@novell.com>
-	
-	* itip-view.c (itip_view_set_delegator): accessor
-	(itip_view_get_delegator): ditto
-
-	* itip-view.h: new protos
-
-	* itip-formatter.c (extract_itip_data): put delegate sections back
-	in and handle default reminder
-	(format_itip_object): set the delegator for requests, find the
-	delegator calendar if necessary
-
-2005-01-09  JP Rosevear  <jpr@novell.com>
-	
-	* itip-formatter.c (idle_open_cb): launch an evolution window
-	pointing at the calendar date of the appointment
-	(view_response_cb): use it
-
-2005-01-09  JP Rosevear  <jpr@novell.com>	
-
-	* itip-formatter.c (find_cal_opened_cb): only check for conflicts
-	if the source has the conflict property
-	(initialize_selection): select the "conflict" sources in the
-	selector
-	(source_selection_changed): update the source properties
-	(itip_formatter_page_factory): include the source selector for
-	selecting conflict checking calendars
-
-2005-01-08  Harish Krishnaswamy  <kharish@novell.com>
-
-	* itip-formatter.c: (send_item), (view_response_cb):
-	update itip_send_comp calls with the new prototype.
-
-2005-01-07  JP Rosevear  <jpr@novell.com>
-
-	* itip-view.h: new protos
-
-	* itip-view.c (set_tasklist_sender_text): task sender messages
-	(set_calendar_sender_text): calendar sender messages
-	(set_sender_text): select above as appropriate
-	(itip_view_set_item_type): accessor
-	(itip_view_get_item_type): ditto
-
-	* itip-formatter.c (find_cal_opened_cb): messages for
-	meetings/tasks/journals
-	(send_item): ditto
-	(format_itip_object): ditto
-	(itip_formatter_page_factory): change page title
-
-2005-01-07  JP Rosevear  <jpr@novell.com>	
-
-	* itip-formatter.c (view_response_cb): ensure there is only one
-	attendee in the RSVP even if the user is duplicated
-
-2005-01-07  JP Rosevear  <jpr@novell.com>
-	
-	* itip-view.h: protos
-
-	* itip-view.c (rsvp_toggled_cb): set comment sensitivity
-	(itip_view_init): add comment entry
-	(itip_view_set_rsvp): make comment entry sensitive when rsvp is
-	(itip_view_set_rsvp_comment): accessor
-	(itip_view_get_rsvp_comment): ditto
-	
-	* itip-formatter.c (find_cal_opened_cb): set error message if we
-	can't find the item
-	(view_response_cb): add comment if the user sets one
-
-2005-01-07  JP Rosevear  <jpr@novell.com>
-	
-	* itip-view.h: add protos
-
-	* itip-view.c (set_sender_text): update descriptions better
-	(set_status_text): show/hide status
-	(set_comment_text): show/hide comment
-	(set_buttons): update buttons for add an refresh
-	(itip_view_destroy): free comment/status
-	(itip_view_init): add status/comment widgets
-	(itip_view_set_status): accessor
-	(itip_view_get_status): ditto
-	(itip_view_set_comment): ditto
-	(itip_view_get_comment): ditto
-
-	* itip-formatter.c (find_cal_opened_cb): make sure rsvp is off for
-	publish
-	(format_itip_object): decline counter is sent by an organizer; set
-	status and comment when appropriate
-
-2005-01-05  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am: Dist the errors data properly, and add the .eplug
-	output file to BUILT_SOURCES
-
-2005-01-03  Rodney Dawes  <dobey@novell.com>
-
-	* itip-formatter.c (format_itip_object): Don't do set_usize ()
-	on the container
-
-2005-01-03  JP Rosevear  <jpr@novell.com>
-
-	* itip-formatter.c (format_itip_object): load accounts
-
-2005-01-03  JP Rosevear  <jpr@novell.com>
-	
-	* org-gnome-itip-formatter-errors.xml: remove unused message
-
-	* itip-formatter.c (update_item): use info item, not e-error
-	
-2005-01-03  JP Rosevear  <jpr@novell.com>
-
-	* itip-formatter.c (view_response_cb): implement cancel
-	(update_item): add cancel info item
-
-2005-01-03  JP Rosevear  <jpr@novell.com>
-	
-	* itip-view.c (itip_view_add_upper_info_item_printf): utility
-	routine to make it easier to add info items
-	(itip_view_add_lower_info_item_printf): ditto
-
-	* itip-view.h: new protos
-
-	* itip-formatter.c: use new printf routines everyhwere it makes
-	sense
-	
-2005-01-03  JP Rosevear  <jpr@novell.com>
-	
-	* itip-formatter.c (find_cal_opened_cb): move the adjust item work
-	here when we actually have the calendar
-	(pitip_free): implement a free function
-	(find_cal_opened_cb): check the methods instead of the show
-	selector member
-	(find_cal_opened_cb): default to true for the rsvp setting
-
-2005-01-03  JP Rosevear  <jpr@novell.com>
-	
-	* itip-view.h: add response enums
-
-	* itip-view.c (set_buttons): fiddle with button names and response enums
-
-	* itip-formatter.c (find_server): don't include our uid in the
-	conflicts search
-	(update_attendee_status): update the status of the attendee and
-	save it out
-	(adjust_item): get relevant properties for items that might
-	contain them if sent from an attendee
-	(get_real_item): get the actual, current item
-	(send_item): send the item
-	(view_response_cb): handle REPLY and REFRESH requests
-	(format_itip_object): adjust the item if necessary and set the
-	attendee for reply/refresh; prevent crash if no description
-	(pitip_free): skeleton free function
-	(format_itip): load delete message setting
-	(delete_toggled_cb): set delete message setting based on toggle
-	(itip_formatter_page_factory): make the delete message check box
-	work
-
-	* Makefile.am: install e-error messages
-
-2005-01-03  JP Rosevear  <jpr@novell.com>
-	
-	* itip-view.h: new protos, signal
-
-	* itip-view.c (set_info_items): be more generic so both upper and
-	lower setting can use it
-	(set_upper_info_items): set the upper info items
-	(set_lower_info_items): ditto for lower items
-	(itip_view_destroy): clear both sets of info items
-	(itip_view_class_init): add source selected signalo
-	(itip_view_init): add separate upper and lower info item areas and
-	a detail area
-	(itip_view_add_upper_info_item): add upper info item
-	(itip_view_remove_upper_info_item): remove a singal upper area
-	info item
-	(itip_view_clear_upper_info_items): clear them all
-	(itip_view_add_lower_info_item): as above
-	(itip_view_remove_lower_info_item): ditto
-	(itip_view_clear_lower_info_items): ditto
-	(source_selected_cb): emit the source selected signal when the
-	source in the option menu changes
-	(itip_view_set_source_list): take a source list and create an
-	e-source-option-menu if its non-null
-	(itip_view_get_source_list): get source list
-	(itip_view_set_source): set a specific source in the source option
-	menu
-	(itip_view_get_source): obtain that source
-	(itip_view_set_rsvp): get the rsvp status
-	(itip_view_get_rsvp): set it
-	(itip_view_set_show_rsvp): set visibility of rsvp check box
-	(itip_view_get_show_rsvp): get the visibility of rsvp check box
-	(itip_view_set_buttons_sensitive): set button sensitivity
-	(itip_view_get_buttons_sensitive): get button sensitivity
-
-	* itip-formatter.c (find_my_address): find the user's address in
-	the list of attendees
-	(set_buttons_sensitive): set the action buttons sensitivity
-	appropriately
-	(cal_opened_cb): use above
-	(start_calendar_server): ditto
-	(start_calendar_server_by_uid): de-sensitize buttons to start
-	(source_selected_cb): ditto
-	(find_cal_opened_cb): check for conflicting appointments; set
-	informative info area items
-	(find_server): create the sexp for determining conflicts
-	(update_item): oset informative info area items
-	(view_response_cb): implement some of the responses, start on
-	implementing rsvp
-	(format_itip_object): load the source lists properly
-
-2004-12-29  JP Rosevear  <jpr@novell.com>
-
-	* itip-view.h: new protos
-
-	* itip-view.c (format_date_and_time_x): don't draw the leading
-	zero in 12hr clock mode for the hour
-	(set_sender_text): make intro statements closer to the UI design
-	(set_description_text): display description
-	(set_info_items): show info items, messages with icons
-	(set_progress_text): show progress text item (for
-	loading/searching calendars)
-	(set_one_button): add a response button
-	(set_buttons): set response buttons based on mode
-	(itip_view_destroy): clear info items
-	(itip_view_class_init): add response signal
-	(itip_view_init): new areas for description, info items, buttons
-	(itip_view_set_description): accessor
-	(itip_view_get_description): ditto
-	(itip_view_add_info_item): add an info item to the display
-	(itip_view_clear_info_items): clear all items
-	(itip_view_set_progress): set the progress message
-
-	* itip-formatter.c: move over calendar loading, searching code,
-	set more itip view properties
-
-	* org-gnome-itip-formatter.eplug.in: add a config page item,
-	doesn't do much right now
-
-2004-12-22  JP Rosevear  <jpr@novell.com>
-
-	* Initial checkin of new itip formatter 
-
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 526af07b1a..c2e38464ec 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -29,17 +29,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-service.h>
-#include <camel/camel-store.h>
-#include <camel/camel-db.h>
 #include <libecal/e-cal.h>
 #include <libecal/e-cal-time-util.h>
 #include <libedataserverui/e-source-selector.h>
@@ -144,6 +133,7 @@ struct _itip_puri {
 void format_itip (EPlugin *ep, EMFormatHookTarget *target);
 GtkWidget *itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
 static void itip_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri);
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
 
 typedef struct {
 	struct _itip_puri *puri;
@@ -159,6 +149,12 @@ typedef void (* FormatItipOpenFunc) (ECal *ecal, ECalendarStatus status, gpointe
 
 static gboolean check_is_instance (icalcomponent *icalcomp);
 
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
+
 static icalproperty *
 find_attendee (icalcomponent *ical_comp, const gchar *address)
 {
@@ -820,6 +816,7 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp)
 	GSList *groups, *l, *sources_conflict = NULL, *all_sources = NULL;
 	const gchar *uid;
 	gchar *rid = NULL;
+	CamelStore *parent_store;
 	CamelURL *url;
 	gchar *uri;
 	ESource *source = NULL, *current_source = NULL;
@@ -827,8 +824,10 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp)
 	e_cal_component_get_uid (comp, &uid);
 	rid = e_cal_component_get_recurid_as_string (comp);
 
-        url = CAMEL_SERVICE (pitip->folder->parent_store)->url;
-        uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
+	parent_store = camel_folder_get_parent_store (pitip->folder);
+
+	url = CAMEL_SERVICE (parent_store)->url;
+	uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
 
 	itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), FALSE);
 
@@ -988,7 +987,7 @@ message_foreach_part (CamelMimePart *part, GSList **part_list)
 
 	*part_list = g_slist_append (*part_list, part);
 
-	containee = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	containee = camel_medium_get_content (CAMEL_MEDIUM (part));
 
 	if (containee == NULL)
 		return;
@@ -1985,8 +1984,10 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 				tag = camel_message_info_user_tag (mi, "recurrence-key");
 				camel_message_info_free (mi);
 				if (tag) {
-					gint i = 0, count;
+					CamelStore *parent_store;
 					GSList *list = NULL;
+					const gchar *full_name;
+					gint i = 0, count;
 
 					count = camel_folder_summary_count (pitip->folder->summary);
 					for (i = 0; i < count; i++) {
@@ -2005,7 +2006,10 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 						}
 						camel_message_info_free (mi);
 					}
-					camel_db_delete_uids (pitip->folder->parent_store->cdb_w, pitip->folder->full_name, list, NULL);
+
+					full_name = camel_folder_get_full_name (pitip->folder);
+					parent_store = camel_folder_get_parent_store (pitip->folder);
+					camel_db_delete_uids (parent_store->cdb_w, full_name, list, NULL);
 					g_slist_free (list);
 				}
 			} else {
@@ -2013,7 +2017,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 				camel_folder_summary_remove_uid(pitip->folder->summary, pitip->uid);
 				camel_folder_change_info_remove_uid (changes, pitip->uid);
 			}
-			camel_object_trigger_event (pitip->folder, "folder_changed", changes);
+			camel_folder_changed (pitip->folder, changes);
 			camel_folder_change_info_free (changes);
 		}
 	}
@@ -2535,7 +2539,8 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
 	gchar *classid;
 	struct _itip_puri *puri;
 	CamelDataWrapper *content;
-	CamelStream *mem;
+	CamelStream *stream;
+	GByteArray *byte_array;
 
 	classid = g_strdup_printf("itip:///%s", ((EMFormat *) target->format)->part_id->str);
 
@@ -2560,15 +2565,19 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
 	g_object_unref (gconf);
 
 	/* This is non-gui thread. Download the part for using in the main thread */
-	content = camel_medium_get_content_object ((CamelMedium *) target->part);
-	mem = camel_stream_mem_new ();
-	camel_data_wrapper_decode_to_stream (content, mem);
+	content = camel_medium_get_content ((CamelMedium *) target->part);
 
-	if (((CamelStreamMem *) mem)->buffer->len == 0)
+	byte_array = g_byte_array_new ();
+	stream = camel_stream_mem_new_with_byte_array (byte_array);
+	camel_data_wrapper_decode_to_stream (content, stream);
+
+	if (byte_array->len == 0)
 		puri->vcalendar = NULL;
 	else
-		puri->vcalendar = g_strndup ((gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
-	camel_object_unref (mem);
+		puri->vcalendar = g_strndup (
+			(gchar *) byte_array->data, byte_array->len);
+
+	g_object_unref (stream);
 
 	camel_stream_printf (target->stream, "<table border=0 width=\"100%%\" cellpadding=3><tr>");
 	camel_stream_printf (target->stream, "<td valign=top><object classid=\"%s\"></object></td><td width=100%% valign=top>", classid);
@@ -2653,7 +2662,7 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 
 	/* Create a new notebook page */
 	page = gtk_vbox_new (FALSE, 0);
-	GTK_CONTAINER (page)->border_width = 12;
+	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 	tab_label = gtk_label_new (_("Calendar and Tasks"));
 	gtk_notebook_append_page (GTK_NOTEBOOK (hook_data->parent), page, tab_label);
 
@@ -2666,7 +2675,7 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	str = g_strdup_printf ("<span weight=\"bold\">%s</span>", _("General"));
 	gtk_label_set_markup (GTK_LABEL (frame_label), str);
 	g_free (str);
-	GTK_MISC (frame_label)->xalign = 0.0;
+	gtk_misc_set_alignment (GTK_MISC (frame_label), 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0);
 
 	/* Indent/padding */
@@ -2692,7 +2701,7 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	str = g_strdup_printf ("<span weight=\"bold\">%s</span>", _("Conflict Search"));
 	gtk_label_set_markup (GTK_LABEL (frame_label), str);
 	g_free (str);
-	GTK_MISC (frame_label)->xalign = 0.0;
+	gtk_misc_set_alignment (GTK_MISC (frame_label), 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0);
 
 	/* Indent/padding */
@@ -2741,7 +2750,7 @@ itip_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri)
 	struct _itip_puri *info = (struct _itip_puri *)puri;
 
 	d(printf("writing to frame content, handler is '%s'\n", info->handle->mime_type));
-	info->handle->handler(emf, stream, info->puri.part, info->handle);
+	info->handle->handler(emf, stream, info->puri.part, info->handle, FALSE);
 	camel_stream_close(stream);
 }
 
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index f4368dde3f..6ade3cabe3 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -27,10 +27,6 @@
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-message.h>
 #include <libedataserver/e-time-utils.h>
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserverui/e-source-combo-box.h>
@@ -337,6 +333,22 @@ format_date_and_time_x		(struct tm	*date_tm,
 		buffer[0] = '\0';
 }
 
+static gchar *
+dupe_first_bold (const gchar *format, const gchar *first, const gchar *second)
+{
+	gchar *f, *s, *res;
+
+	f = g_markup_printf_escaped ("<b>%s</b>", first ? first : "");
+	s = g_markup_escape_text (second ? second : "", -1);
+
+	res = g_strdup_printf (format, f, s);
+
+	g_free (f);
+	g_free (s);
+
+	return res;
+}
+
 static void
 set_calendar_sender_text (ItipView *view)
 {
@@ -352,64 +364,64 @@ set_calendar_sender_text (ItipView *view)
 
 	/* The current account ID (i.e. the delegatee) is receiving a copy of the request/response. Here we ask the delegatee to respond/accept on behalf of the delegator. */
 	if (priv->organizer && priv->proxy)
-		on_behalf_of = g_markup_printf_escaped (_("Please respond on behalf of <b>%s</b>"), priv->proxy);
+		on_behalf_of = dupe_first_bold (_("Please respond on behalf of %s"), priv->proxy, NULL);
 	else if (priv->attendee && priv->proxy)
-		on_behalf_of = g_markup_printf_escaped (_("Received on behalf of <b>%s</b>"), priv->proxy);
+		on_behalf_of = dupe_first_bold (_("Received on behalf of %s"), priv->proxy, NULL);
 
 	switch (priv->mode) {
 	case ITIP_VIEW_MODE_PUBLISH:
 		if (priv->organizer_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s has published the following meeting information:"), organizer, priv->organizer_sentby);
+			sender = dupe_first_bold (_("%s through %s has published the following meeting information:"), organizer, priv->organizer_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> has published the following meeting information:"), organizer);
+			sender = dupe_first_bold (_("%s has published the following meeting information:"), organizer, NULL);
 		break;
 	case ITIP_VIEW_MODE_REQUEST:
 		/* FIXME is the delegator stuff handled correctly here? */
 		if (priv->delegator) {
-			sender = g_markup_printf_escaped (_("<b>%s</b> has delegated the following meeting to you:"), priv->delegator);
+			sender = dupe_first_bold (_("%s has delegated the following meeting to you:"), priv->delegator, NULL);
 		} else {
 			if (priv->organizer_sentby)
-				sender = g_markup_printf_escaped (_("<b>%s</b> through %s requests your presence at the following meeting:"), organizer, priv->organizer_sentby);
+				sender = dupe_first_bold (_("%s through %s requests your presence at the following meeting:"), organizer, priv->organizer_sentby);
 			else
-				sender = g_markup_printf_escaped (_("<b>%s</b> requests your presence at the following meeting:"), organizer);
+				sender = dupe_first_bold (_("%s requests your presence at the following meeting:"), organizer, NULL);
 		}
 		break;
 	case ITIP_VIEW_MODE_ADD:
 		/* FIXME What text for this? */
 		if (priv->organizer_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s wishes to add to an existing meeting:"), organizer, priv->organizer_sentby);
+			sender = dupe_first_bold (_("%s through %s wishes to add to an existing meeting:"), organizer, priv->organizer_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> wishes to add to an existing meeting:"), organizer);
+			sender = dupe_first_bold (_("%s wishes to add to an existing meeting:"), organizer, NULL);
 		break;
 	case ITIP_VIEW_MODE_REFRESH:
 		if (priv->attendee_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s wishes to receive the latest information for the following meeting:"), attendee, priv->attendee_sentby);
+			sender = dupe_first_bold (_("%s through %s wishes to receive the latest information for the following meeting:"), attendee, priv->attendee_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> wishes to receive the latest information for the following meeting:"), attendee);
+			sender = dupe_first_bold (_("%s wishes to receive the latest information for the following meeting:"), attendee, NULL);
 		break;
 	case ITIP_VIEW_MODE_REPLY:
 		if (priv->attendee_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s has sent back the following meeting response:"), attendee, priv->attendee_sentby);
+			sender = dupe_first_bold (_("%s through %s has sent back the following meeting response:"), attendee, priv->attendee_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> has sent back the following meeting response:"), attendee);
+			sender = dupe_first_bold (_("%s has sent back the following meeting response:"), attendee, NULL);
 		break;
 	case ITIP_VIEW_MODE_CANCEL:
 		if (priv->organizer_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s has canceled the following meeting:"), organizer, priv->organizer_sentby);
+			sender = dupe_first_bold (_("%s through %s has canceled the following meeting:"), organizer, priv->organizer_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> has canceled the following meeting."), organizer);
+			sender = dupe_first_bold (_("%s has canceled the following meeting."), organizer, NULL);
 		break;
 	case ITIP_VIEW_MODE_COUNTER:
 		if (priv->attendee_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s has proposed the following meeting changes."), attendee, priv->attendee_sentby);
+			sender = dupe_first_bold (_("%s through %s has proposed the following meeting changes."), attendee, priv->attendee_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> has proposed the following meeting changes."), attendee);
+			sender = dupe_first_bold (_("%s has proposed the following meeting changes."), attendee, NULL);
 		break;
 	case ITIP_VIEW_MODE_DECLINECOUNTER:
 		if (priv->organizer_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s has declined the following meeting changes:"), organizer, priv->organizer_sentby);
+			sender = dupe_first_bold (_("%s through %s has declined the following meeting changes:"), organizer, priv->organizer_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> has declined the following meeting changes."), organizer);
+			sender = dupe_first_bold (_("%s has declined the following meeting changes."), organizer, NULL);
 		break;
 	default:
 		break;
@@ -440,64 +452,64 @@ set_tasklist_sender_text (ItipView *view)
 
 	/* The current account ID (i.e. the delegatee) is receiving a copy of the request/response. Here we ask the delegatee to respond/accept on behalf of the delegator. */
 	if (priv->organizer && priv->proxy)
-		on_behalf_of = g_markup_printf_escaped (_("Please respond on behalf of <b>%s</b>"), priv->proxy);
+		on_behalf_of = dupe_first_bold (_("Please respond on behalf of %s"), priv->proxy, NULL);
 	else if (priv->attendee && priv->proxy)
-		on_behalf_of = g_markup_printf_escaped (_("Received on behalf of <b>%s</b>"), priv->proxy);
+		on_behalf_of = dupe_first_bold (_("Received on behalf of %s"), priv->proxy, NULL);
 
 	switch (priv->mode) {
 	case ITIP_VIEW_MODE_PUBLISH:
 		if (priv->organizer_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s has published the following task:"), organizer, priv->organizer_sentby);
+			sender = dupe_first_bold (_("%s through %s has published the following task:"), organizer, priv->organizer_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> has published the following task:"), organizer);
+			sender = dupe_first_bold (_("%s has published the following task:"), organizer, NULL);
 		break;
 	case ITIP_VIEW_MODE_REQUEST:
 		/* FIXME is the delegator stuff handled correctly here? */
 		if (priv->delegator) {
-			sender = g_markup_printf_escaped (_("<b>%s</b> requests the assignment of %s to the following task:"), organizer, priv->delegator);
+			sender = dupe_first_bold (_("%s requests the assignment of %s to the following task:"), organizer, priv->delegator);
 		} else {
 			if (priv->organizer_sentby)
-				sender = g_markup_printf_escaped (_("<b>%s</b> through %s has assigned you a task:"), organizer, priv->organizer_sentby);
+				sender = dupe_first_bold (_("%s through %s has assigned you a task:"), organizer, priv->organizer_sentby);
 			else
-				sender = g_markup_printf_escaped (_("<b>%s</b> has assigned you a task:"), organizer);
+				sender = dupe_first_bold (_("%s has assigned you a task:"), organizer, NULL);
 		}
 		break;
 	case ITIP_VIEW_MODE_ADD:
 		/* FIXME What text for this? */
 		if (priv->organizer_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s wishes to add to an existing task:"), organizer, priv->organizer_sentby);
+			sender = dupe_first_bold (_("%s through %s wishes to add to an existing task:"), organizer, priv->organizer_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> wishes to add to an existing task:"), organizer);
+			sender = dupe_first_bold (_("%s wishes to add to an existing task:"), organizer, NULL);
 		break;
 	case ITIP_VIEW_MODE_REFRESH:
 		if (priv->attendee_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"), attendee, priv->attendee_sentby);
+			sender = dupe_first_bold (_("%s through %s wishes to receive the latest information for the following assigned task:"), attendee, priv->attendee_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> wishes to receive the latest information for the following assigned task:"), attendee);
+			sender = dupe_first_bold (_("%s wishes to receive the latest information for the following assigned task:"), attendee, NULL);
 		break;
 	case ITIP_VIEW_MODE_REPLY:
 		if (priv->attendee_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s has sent back the following assigned task response:"), attendee, priv->attendee_sentby);
+			sender = dupe_first_bold (_("%s through %s has sent back the following assigned task response:"), attendee, priv->attendee_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> has sent back the following assigned task response:"), attendee);
+			sender = dupe_first_bold (_("%s has sent back the following assigned task response:"), attendee, NULL);
 		break;
 	case ITIP_VIEW_MODE_CANCEL:
 		if (priv->organizer_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s has canceled the following assigned task:"), organizer, priv->organizer_sentby);
+			sender = dupe_first_bold (_("%s through %s has canceled the following assigned task:"), organizer, priv->organizer_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> has canceled the following assigned task:"), organizer);
+			sender = dupe_first_bold (_("%s has canceled the following assigned task:"), organizer, NULL);
 		break;
 	case ITIP_VIEW_MODE_COUNTER:
 		if (priv->attendee_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s has proposed the following task assignment changes:"), attendee, priv->attendee_sentby);
+			sender = dupe_first_bold (_("%s through %s has proposed the following task assignment changes:"), attendee, priv->attendee_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> has proposed the following task assignment changes:"), attendee);
+			sender = dupe_first_bold (_("%s has proposed the following task assignment changes:"), attendee, NULL);
 		break;
 	case ITIP_VIEW_MODE_DECLINECOUNTER:
 		if (priv->organizer_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s has declined the following assigned task:"), organizer, priv->organizer_sentby);
+			sender = dupe_first_bold (_("%s through %s has declined the following assigned task:"), organizer, priv->organizer_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> has declined the following assigned task:"), organizer);
+			sender = dupe_first_bold (_("%s has declined the following assigned task:"), organizer, NULL);
 		break;
 	default:
 		break;
@@ -527,29 +539,29 @@ set_journal_sender_text (ItipView *view)
 
 	/* The current account ID (i.e. the delegatee) is receiving a copy of the request/response. Here we ask the delegatee to respond/accept on behalf of the delegator. */
 	if (priv->organizer && priv->proxy)
-		on_behalf_of = g_markup_printf_escaped (_("Please respond on behalf of <b>%s</b>"), priv->proxy);
+		on_behalf_of = dupe_first_bold (_("Please respond on behalf of %s"), priv->proxy, NULL);
 	else if (priv->attendee && priv->proxy)
-		on_behalf_of = g_markup_printf_escaped (_("Received on behalf of <b>%s</b>"), priv->proxy);
+		on_behalf_of = dupe_first_bold (_("Received on behalf of %s"), priv->proxy, NULL);
 
 	switch (priv->mode) {
 	case ITIP_VIEW_MODE_PUBLISH:
 		if (priv->organizer_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s has published the following memo:"), organizer, priv->organizer_sentby);
+			sender = dupe_first_bold (_("%s through %s has published the following memo:"), organizer, priv->organizer_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> has published the following memo:"), organizer);
+			sender = dupe_first_bold (_("%s has published the following memo:"), organizer, NULL);
 		break;
 	case ITIP_VIEW_MODE_ADD:
 		/* FIXME What text for this? */
 		if (priv->organizer_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s wishes to add to an existing memo:"), organizer, priv->organizer_sentby);
+			sender = dupe_first_bold (_("%s through %s wishes to add to an existing memo:"), organizer, priv->organizer_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> wishes to add to an existing memo:"), organizer);
+			sender = dupe_first_bold (_("%s wishes to add to an existing memo:"), organizer, NULL);
 		break;
 	case ITIP_VIEW_MODE_CANCEL:
 		if (priv->organizer_sentby)
-			sender = g_markup_printf_escaped (_("<b>%s</b> through %s has canceled the following shared memo:"), organizer, priv->organizer_sentby);
+			sender = dupe_first_bold (_("%s through %s has canceled the following shared memo:"), organizer, priv->organizer_sentby);
 		else
-			sender = g_markup_printf_escaped (_("<b>%s</b> has canceled the following shared memo:"), organizer);
+			sender = dupe_first_bold (_("%s has canceled the following shared memo:"), organizer, NULL);
 		break;
 	default:
 		break;
@@ -835,19 +847,19 @@ set_buttons (ItipView *view)
 		/* 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);
+		set_one_button (view, _("A_ccept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
 		break;
 	case ITIP_VIEW_MODE_REQUEST:
 		set_one_button (view, is_recur_set ? _("_Decline all") : _("_Decline"), GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE);
 		set_one_button (view, is_recur_set ? _("_Tentative all") : _("_Tentative"), GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE);
-		set_one_button (view, is_recur_set ? _("_Accept all") : _("_Accept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
+		set_one_button (view, is_recur_set ? _("A_ccept all") : _("A_ccept"), 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, _("_Accept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
+		set_one_button (view, _("A_ccept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
 		break;
 	case ITIP_VIEW_MODE_REFRESH:
 		/* FIXME Is this really the right button? */
@@ -863,12 +875,12 @@ set_buttons (ItipView *view)
 	case ITIP_VIEW_MODE_COUNTER:
 		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);
+		set_one_button (view, _("A_ccept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
 		break;
 	case ITIP_VIEW_MODE_DECLINECOUNTER:
 		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);
+		set_one_button (view, _("A_ccept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
 		break;
 	default:
 		break;
@@ -970,11 +982,7 @@ alarm_check_toggled_cb (GtkWidget *check1, GtkWidget *check2)
 	g_return_if_fail (check1 != NULL);
 	g_return_if_fail (check2 != NULL);
 
-#if GTK_CHECK_VERSION(2,19,7)
 	gtk_widget_set_sensitive (check2, !(gtk_widget_get_visible (check1) && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check1))));
-#else
-	gtk_widget_set_sensitive (check2, !(GTK_WIDGET_VISIBLE (check1) && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check1))));
-#endif
 }
 
 static void
diff --git a/plugins/itip-formatter/org-gnome-itip-formatter.error.xml b/plugins/itip-formatter/org-gnome-itip-formatter.error.xml
index 1a47eda38c..e5d84c67af 100644
--- a/plugins/itip-formatter/org-gnome-itip-formatter.error.xml
+++ b/plugins/itip-formatter/org-gnome-itip-formatter.error.xml
@@ -2,14 +2,16 @@
 <error-list domain="org.gnome.itip-formatter">
 
  <error id="add-unknown-attendee" type="question">
-  <_primary>This response is not from a current attendee.  Add the sender as an attendee?</_primary>
+  <_primary>This response is not from a current attendee. Add the sender as an attendee?</_primary>
+  <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
+  <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
  </error>
  
  <error id="add-delegate" type="question">
   <_primary>This meeting has been delegated</_primary>
-  <_secondary>&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?</_secondary>
-  <button _label="Yes" response="GTK_RESPONSE_YES"/>
-  <button _label="No" response="GTK_RESPONSE_NO"/>
+  <_secondary>'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?</_secondary>
+  <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
+  <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
  </error>
 
 </error-list>
diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog
deleted file mode 100644
index f14ef84080..0000000000
--- a/plugins/mail-notification/ChangeLog
+++ /dev/null
@@ -1,217 +0,0 @@
-2009-02-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #572348
-
-	* mail-notification.c (new_notify_status):
-	Call gtk_status_icon_set_tooltip_text() instead of
-	gtk_status_icon_set_tooltip() (decprecated).
-
-2009-01-28  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use -no-undefined and link with more libraries on
-	Windows.
-
-2008-11-19  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail-notification.c: Fix compilation error.
-
-2008-11-19  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for BNC bug #434320
-
-	* plugins/mail-notification/mail-notification.c: When the popup is
-	clicked close the status icon.
-
-2008-09-16  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* mail-notification.c:
-
-2008-09-15  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #514299
-
-	* mail-notification.c: (new_notify_status):
-	Connect to signals only once, when creating new status icon.
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Have a check for OS_WIN32 and handle the schema data 
-	differently. make install error on win32.
-
-2008-08-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #546892
-
-	* mail-notification.c:
-	Prefer gtk_status_icon_set_from_icon_name() over
-	gtk_status_icon_set_from_pixbuf().
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #514006
-
-	* apps-evolution-mail-notification.schemas.in:
-	Quote literal values.
-
-2008-08-01  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #353927
-
-	* mail-notification.c: (icon_activated), (stop_blinking_cb),
-	(new_notify_status): Do not blink the icon more than 15 seconds.
-
-2008-07-22  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #544022
-
-	* Makefile.am:
-	* mail-notification.c: (send_dbus_message): Do not redefine
-	DBUS_VERSION define, it's supplied by dbus itself.
-
-2008-07-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #543134
-
-	* mail-notification.c: (get_cfg_widget), (do_properties),
-	(popup_menu_status), (new_notify_status),
-	(e_plugin_lib_get_configure_widget):
-	Show popup menu when right-click over the status icon.
-
-2008-01-28  Johnny Jacob  <jjohnny@novell.com>
-
-	* mail-notification.c (new_notify_status): Adding proper 
-	comments for strings.
-
-2008-01-28  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fixes Bug #511226.
-	
-	* apps-evolution-mail-notification.schemas.in: String fixes.
-
-2008-01-21  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fixes 504567.
-	
-	* mail-notification.c (new_notify_status): Add ngettext support for 
-	strings.
-
-2008-01-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #492702
-
-	* Makefile.am:
-	* mail-notification.c: (org_gnome_mail_new_notify),
-	(org_gnome_mail_read_notify), (e_plugin_lib_enable),
-	(e_plugin_lib_get_configure_widget): Make the dbus portion of the
-	plugin conditional if it is there.
-
-2008-01-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail-notification.c: (new_notify_status): Show the actual displayed
-	folder name rather than the decoded/handled one from uri.
-
-2007-12-17  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #504030
-
-	* mail-notification.c: (new_notify_sound):
-	Do not play sound on every new mail arrival in a row.
-
-2007-12-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #492702
-
-	* apps-evolution-mail-notification.schemas.in:
-	* mail-notification.c:
-	* org-gnome-mail-notification.eplug.xml:
-	New-mail-notification plugin and sound notification has been merged
-	to this plugin, with couple of options in plugins Configuration tab.
-
-2007-10-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mail-notification.c:
-	Put the notification_callback() declaration inside a
-	#ifdef HAVE_LIBNOTIFY block to avoid a potential compiler warning.
-
-2007-08-03  Johnny Jacob  <jjohnny@novell.com>
-	
-	** Fix for bug #458822 from Anand V M <avmuttagi@gmail.com>
-
-	*  org-gnome-mail-notification.eplug.xml: Description string Fix.
-	
-2007-08-03  Anand V M     <avmuttagi@gmail.com>
-	
-	** Fix for bug #458822
-	
-	*  org-gnome-mail-notification.eplug.xml:Replacement of wrong
-	string in mail-notification plugin with the correct string.
-
-	(Committed by Johnny <jjohnny@novell.com>)
-
-2007-07-20  Claude Paroz  <claude@2xlibre.net>
-
-	* mail-notification.c: (org_gnome_mail_new_notify): Fixed syntax of
-	ngettext.
-
-2007-07-05  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for byug #452900 from Cosimo Cecchi
-
-	* mail-notification.c: (org_gnome_mail_read_notify),
-	(icon_activated), (notification_callback),
-	(org_gnome_mail_new_notify):
-
-2007-06-07  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* mail-notification.c: (org_gnome_mail_new_notify):
-	fix a printf warning
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
-
-	* Makefile.am:
-
-2007-05-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am: Fix a couple distcheck errors.
-
-2007-05-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #439316
-
-	* mail-notification.c: (org_gnome_mail_new_notify): Fixes translation
-	issues and some fixes around broken gtk.
-
-2007-05-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #439146 and #438711 from Ross Burton and Daniel Gryniewicz
-
-	* Makefile.am:
-	* apps-evolution-mail-notification.schemas.in.in: Schema to control
-	blink and notification.
-	* mail-notification.c: (org_gnome_mail_read_notify),
-	(org_gnome_mail_new_notify): More cleanups
-
-2007-05-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail-notification.c: (org_gnome_mail_new_notify): Build error.
-
-2007-05-07  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail-notification.c: Fix for a build error.
-
-2007-05-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail-notification.c: (org_gnome_mail_new_notify): Make libnotify
-	notifications conditional.
-
-2006-08-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Initial commit for Mail notification plugin.
-
-	* mail-notification.c: 
-	* Makefile.am:
-	* org-gnome-mail-notification.eplug.xml:
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 72e3881b23..e6dd1a267d 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -39,8 +39,6 @@
 
 #include <time.h>
 
-#include <camel/camel-folder.h>
-
 #include <e-util/e-binding.h>
 #include <e-util/e-config.h>
 #include <e-util/gconf-bridge.h>
@@ -219,7 +217,10 @@ static void
 read_notify_dbus (EMEventTargetMessage *t)
 {
 	if (bus != NULL)
-		send_dbus_message ("MessageReading", t->folder->name, 0, NULL, NULL, NULL);
+		send_dbus_message (
+			"MessageReading",
+			camel_folder_get_name (t->folder),
+			0, NULL, NULL, NULL);
 }
 
 static void
@@ -335,6 +336,7 @@ static void
 do_properties (GtkMenuItem *item, gpointer user_data)
 {
 	GtkWidget *cfg, *dialog, *vbox, *label, *hbox;
+	GtkWidget *content_area;
 	gchar *text;
 
 	cfg = get_cfg_widget ();
@@ -369,8 +371,10 @@ do_properties (GtkMenuItem *item, gpointer user_data)
 		GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 		NULL);
 
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
+	gtk_container_add (GTK_CONTAINER (content_area), vbox);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
 	gtk_widget_set_size_request (dialog, 400, -1);
 	g_signal_connect_swapped (
diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog
deleted file mode 100644
index d2d10d1f93..0000000000
--- a/plugins/mail-to-task/ChangeLog
+++ /dev/null
@@ -1,241 +0,0 @@
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #342296
-
-	* org-gnome-mail-to-task.eplug.xml:
-	* org-gnome-mail-to-task.xml:
-	* mail-to-task.c: (set_attendees), (set_organizer), (do_report_error),
-	(report_error_idle), (do_mail_to_event), (mail_to_event),
-	(org_gnome_mail_to_event), (org_gnome_mail_to_event_menu),
-	(org_gnome_mail_to_meeting), (org_gnome_mail_to_meeting_menu),
-	(org_gnome_mail_to_task), (org_gnome_mail_to_task_menu),
-	(org_gnome_mail_to_memo), (org_gnome_mail_to_memo_menu):
-	Extended to be able to save mail to event, meeting, task or memo.
-
-2009-03-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #576696
-
-	* mail-to-task.c: (set_attendees): Set mandatory properties.
-
-2009-01-28  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Remove a trailing space after the line continuation
-	backslash.
-
-2009-01-21  Milan Crha  <mcrha@redhat.com>
-
-	* Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS.
-
-2008-10-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #558726 (patch by Frederic van Starbmann)
-
-	* mail-to-task.c (do_mail_to_task):
-	Fix a potential format string crash.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* mail-to-task.c:
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
-	dlls on Windows.
-
-2008-06-18  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #318089
-
-	* mail-to-task.c: (convert_to_task): Ask for destination source only
-	when have more than one writable source defined.
-
-2007-11-23  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #353807
-
-	* mail-to-task.c: (do_mail_to_task): Notice user if any error occur
-	during opening calendar, calendar is readonly or when add fails.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #334675
-
-	* mail-to-task.c: (do_mail_to_task), (text_contains_nonwhitespace),
-	(get_selected_text), (convert_to_task), (org_gnome_mail_to_task),
-	(org_gnome_mail_to_task_menu):
-	When selected only one message, then try to use selected text in
-	preview as description, instead of whole message body.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #353779
-
-	* org-gnome-mail-to-task.eplug.xml:
-	Allow convert more than one mail to task with one click.
-
-2007-09-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #473903
-
-	* mail-to-task.c: (set_attachments):
-	Fixes serious compiler warning.
-
-2007-08-16  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #350539
-
-	* mail-to-task.c: (set_description):
-	Ensures non-NULL mime_part.
-
-2007-04-02  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
-
-	* org-gnome-mail-to-task.eplug.xml:
-	Cleanup. 
-	Fixes part of #301149
-
-2006-07-31  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #310489
-	* mail-to-task.c: 
-	(set_attendees): 
-	(set_organizer): Appended the mailto field
-	to the  email values.
-	(do_mail_to_task):Set the ICAL_X parameter
-	so that no mail is sent to the recipients.			 
-
-2006-06-06  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	Fixes #332605.
-	* mail-to-task.c: 
-	(set_description): Multipart message handling.
-	(set_attachments): New function.
-	Set attachment files to a task.
-	(clean_name): New function.
-	from plugins/save-attachments/save-attachments.c.
-
-2006-03-04  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #330974, 333688.
-	* mail-to-task.c: 
-	(set_description): Check if the params are present,
-	before accessing the value. Fixes a crash.
-	(convert_to_task): Set the authentication function
-	while creating the ECal.
-
-2006-02-01  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* Makefile.am: Reverting the commit made by 
-	Kjartan Maraas  <kmaraas@gnome.org> so that
-	the file org-gnome-mail-to-task.xml is include in the 
-	dist.
-
-2006-01-16  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: Enumerate files for BUILT_SOURCES macro
-	as plugin_DATA now includes static files from the source
-	tree.
-
-2006-01-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #323011
-
-	* Makefile.am: Added org-gnome-mail-to-task.xml to build
-	* mail-to-task.c (convert_to_task), (org_gnome_mail_to_task),
-	(org_gnome_mail_to_task_menu): Added Code to handle menu.
-	* org-gnome-mail-to-task.eplug.xml: Added plug to show Convert to Task
-	menu item under Message menu.
-	* org-gnome-mail-to-task.xml: Added UI files for menu item.
-
-2005-12-21  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Committing for Hiroyuki Ikezoe <poincare@ikezoe.net>
-
-	Fixes #274433
-	* mail-to-task.c: (set_description): Convert the string to utf8.
-
-2005-10-11  Mubeen Jukaku  <jmubeen@novell.com>
-
-	* mail-to-task.c (set_attendees): Re-implemented this funciton.
-	(add_attendee_cb): Removed this callback because of above change.
-
-	Fixes bug #301081
-
-2005-10-03  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #315752
-	* mail-to-task.c:  Created a new structure AsyncData to
-	store information passed to thread.
-	(do_mail_to_task): get the required contents from AsyncData and
-       free it at the end.	
-	(copy_uids): Duplicate the uids from t->uids.
-	(org_gnome_mail_to_task): duplicated the t->uid and run
-	do_mail_to_task as a thread.
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* mail-to-task.c (add_attendee_cb): use the right type for attendees.
-
-2005-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: added built_sources/cleanfiles
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: 
-	* org-gnome-mail-to-task.eplug.xml: s/.in/.xml/ & i18n.
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-mail-to-task.eplug.in: Shortened the name of the
-	plugin and added a . to the end of the description.
-
-2005-01-14  Rodrigo Moya <rodrigo@novell.com>
-
-	* mail-to-task.c (set_description): new function to correctly
-	retrieve the body of the message.
-	(do_mail_to_task): call set_description.
-
-2004-11-04  Rodrigo Moya <rodrigo@novell.com>
-
-	* org-gnome-mail-to-task.eplug.in: fixed description and added
-	author's info, to display correctly on the plugin manager.
-
-2004-11-03  Not Zed  <NotZed@Ximian.com>
-
-	* org-gnome-mail-to-task.eplug.in: revert rodrigo's last fix, it should
-	actually work now, i hope.
-
-2004-11-01  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: dist .eplugin.in file
-
-2004-10-29  Rodrigo Moya <rodrigo@novell.com>
-
-	* org-gnome-mail-to-task.eplug.in: fix folder view popup id again.
-
-2004-10-28  Not Zed  <NotZed@Ximian.com>
-
-	* org-gnome-mail-to-task.eplug.in: fix folder view popup id.
-
-2004-10-21  Rodrigo Moya <rodrigo@novell.com>
-
-	* mail-to-task.c (set_attendees, set_organizer): new functions.
-	(do_mail_to_task): set attendees and organizer on the task from the
-	recipients in the mail message.
-
-	* org-gnome-mail-to-task.eplug.in: use correct icon.
-
-2004-10-21  Rodrigo Moya <rodrigo@novell.com>
-
-	* org-gnome-mail-to-task.eplug.in: fixed to make the plugin show
-	up in the correct place.
-
-2004-10-21  Rodrigo Moya <rodrigo@novell.com>
-
-	* mail-to-task.c: implemented plugin for converting selected
-	mails to tasks.
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 17bc6a995b..f2e3f98435 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -38,14 +38,6 @@
 #include <libedataserver/e-account.h>
 #include <libedataserverui/e-source-selector-dialog.h>
 
-#include <camel/camel-folder.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-utf8.h>
-
 #include <mail/e-mail-browser.h>
 #include <mail/em-utils.h>
 #include <mail/em-format-html.h>
@@ -79,7 +71,7 @@ set_attendees (ECalComponent *comp, CamelMimeMessage *message, const gchar *orga
 {
 	GSList *attendees = NULL, *to_free = NULL;
 	ECalComponentAttendee *ca;
-	const CamelInternetAddress *from = NULL, *to, *cc, *bcc, *arr[4];
+	CamelInternetAddress *from = NULL, *to, *cc, *bcc, *arr[4];
 	gint len, i, j;
 
 	if (message->reply_to)
@@ -149,7 +141,7 @@ prepend_from (CamelMimeMessage *message, gchar **text)
 {
 	gchar *res, *tmp, *addr = NULL;
 	const gchar *name = NULL, *eml = NULL;
-	const CamelInternetAddress *from = NULL;
+	CamelInternetAddress *from = NULL;
 
 	g_return_val_if_fail (message != NULL, NULL);
 	g_return_val_if_fail (text != NULL, NULL);
@@ -179,16 +171,17 @@ static void
 set_description (ECalComponent *comp, CamelMimeMessage *message)
 {
 	CamelDataWrapper *content;
-	CamelStream *mem;
+	CamelStream *stream;
 	CamelContentType *type;
 	CamelMimePart *mime_part = CAMEL_MIME_PART (message);
 	ECalComponentText text;
+	GByteArray *byte_array;
 	GSList sl;
 	gchar *str, *convert_str = NULL;
 	gsize bytes_read, bytes_written;
 	gint count = 2;
 
-	content = camel_medium_get_content_object ((CamelMedium *) message);
+	content = camel_medium_get_content ((CamelMedium *) message);
 	if (!content)
 		return;
 
@@ -197,7 +190,7 @@ set_description (ECalComponent *comp, CamelMimeMessage *message)
 	 */
 	while (CAMEL_IS_MULTIPART (content) && count > 0) {
 		mime_part = camel_multipart_get_part (CAMEL_MULTIPART (content), 0);
-		content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+		content = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 		count--;
 	}
 
@@ -208,11 +201,11 @@ set_description (ECalComponent *comp, CamelMimeMessage *message)
 	if (!camel_content_type_is (type, "text", "plain"))
 		return;
 
-	mem = camel_stream_mem_new ();
-	camel_data_wrapper_decode_to_stream (content, mem);
-
-	str = g_strndup ((const gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
-	camel_object_unref (mem);
+	byte_array = g_byte_array_new ();
+	stream = camel_stream_mem_new_with_byte_array (byte_array);
+	camel_data_wrapper_decode_to_stream (content, stream);
+	str = g_strndup ((gchar *) byte_array->data, byte_array->len);
+	g_object_unref (stream);
 
 	/* convert to UTF-8 string */
 	if (str && content->mime_type->params && content->mime_type->params->value) {
@@ -320,7 +313,7 @@ set_attachments (ECal *client, ECalComponent *comp, CamelMimeMessage *message)
 		gboolean done;
 	} status;
 
-	content = camel_medium_get_content_object ((CamelMedium *) message);
+	content = camel_medium_get_content ((CamelMedium *) message);
 	if (!content || !CAMEL_IS_MULTIPART (content))
 		return;
 
diff --git a/plugins/mailing-list-actions/ChangeLog b/plugins/mailing-list-actions/ChangeLog
deleted file mode 100644
index 4c665ed4b6..0000000000
--- a/plugins/mailing-list-actions/ChangeLog
+++ /dev/null
@@ -1,142 +0,0 @@
-2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mailing-list-actions.c (emla_list_action_do):
-	Call e_show_uri() instead of gnome_url_show().
-
-2008-12-08  Jennifer Newman  <jennifer.newman@tufts.edu>
-
-	** Fix for bug #549964
-
-	* org-gnome-mailing-list-actions.error.xml: Fix for an erroneous string
-
-2008-09-04  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* mailing-list-actions.c:
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
-	dlls on Windows.
-
-2008-06-02  Jacob Brown  <jeblinux@gmail.com>
-
-	** Fix for bug #529464
-
-	* org-gnome-mailing-list-actions.error.xml: Do not use "handle"
-
-2008-04-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mailing-list-actions.c (emla_list_action_do):
-	Adapt to streamlined EMsgComposer API.
-
-2007-12-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	* mailing-list-actions.c:
-	Use the new MailMsg API for messages.
-
-2007-04-02  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
-
-	* org-gnome-mailing-list-actions.eplug.xml:
-	Cleanup. 
-	Fixes part of #301149
-
-2006-08-23  Matthew Barnes  <mbarnes@redhat.com>
-  	 
-	* mailing-list-actions.c:
-	fix an uninitialized GError - fixes bug 352423.
-	committed by Andre Klapper
-
-2006-07-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	* org-gnome-mailing-list-actions.xml: Fixing header capitalization
-	in menu. Fixes bug #323952. (Committed by Andre Klapper)
-
-2005-10-19  Philip Van Hoof <pvanhoof@gnome.org>
-	composer/e-msg-composer-select-file.c,
-	composer/e-msg-composer.c, composer/e-msg-composer.h,
-	composer/evolution-composer.c, composer/listener.c,
-	mail/em-composer-utils.c,
-	plugins/mailing-list-actions/mailing-list-actions.c:
-	data hiding
-						
-2005-10-18  Srinivasa Ragavan <sragavan@novell.com>
-
-	* org-gnome-mailing-list-actions.eplug.xml: Changed visible to
-	enabled. Fixes the bug #314899
-
-2005-08-08  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #312621.
-
-	* mailing-list-actions.c (emla_list_action_do): noop if msg =
-	NULL.
-
-2005-08-02  Not Zed  <NotZed@Ximian.com>
-
-	* mailing-list-actions.c (emla_list_action_do): allocate enough
-	space for the url.  May be related to #304461.
-
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* mailing-list-actions.c: moved e-error to e-util
-
-2005-05-13  Rodney Dawes  <dobey@novell.com>
-
-	* org-gnome-mailing-list-actions.xml: Update for the new menu layout
-
-2005-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (CLEANFILES): setup cleanfiles.
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* org-gnome-mailing-list-actions.error.xml:
-	s/-errors.xml/.error.xml/ & i18n tags.
-
-	* Makefile.am:
-	* org-gnome-mailing-list-actions.eplug.xml: s/.in/.xml/, & i18n.
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-mailing-list-actions.eplug.in: Fixed description and
-	added author. 
-	Removed 'plugin' from the name.
-
-2004-11-24  JP Rosevear  <jpr@novell.com>
-
-	* mailing-list-actions.c: make sure GETTEXT_PACKAGE is defined
-
-2004-11-04  Meilof Veeningen  <meilof@wanadoo.nl>
-
-	* org-gnome-mailing-list-actions.eplug.in: Added author tag, fixed
-	description, removed "plugin" from name, changed position of item
-	in popup menu, using "enable" rather than "visible" for bonobo menus
-
-	* org-gnome-mailing-list-actions.xml: Now place menus in
-	MailMessageActions placeholder; moved label to <commands> section
-
-	* org-gnome-mailing-list-actions-errors.xml: fixed button order:
-	"Cancel" now leftmost button; added e-mail address to send confirm
-	dialog
-
-	* mailing-list-actions.c: account guessing now first based on message;
-	added e-mail address to send confirm dialog
-
-2004-11-09  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am: Add org-gnome-mailing-list-actions.xml to EXTRA_DIST
-
-2004-11-09  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am: Add the eplug.in file to EXTRA_DIST
-
-2004-11-05  JP Rosevear  <jpr@novell.com>
-
-	* mailing-list-actions.c: include <config.h> for GETTEXT_PACKAGE
-
-	Added mailing list actions plugin from Meilof Veeningen <meilof@wanadoo.nl>
-
diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c
index 699ec1efd9..33101db8cd 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.c
@@ -30,10 +30,6 @@
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 
-#include "camel/camel-multipart.h"
-#include "camel/camel-mime-part.h"
-#include "camel/camel-exception.h"
-#include "camel/camel-folder.h"
 #include "composer/e-msg-composer.h"
 #include "mail/e-mail-browser.h"
 #include "mail/e-mail-reader.h"
@@ -93,6 +89,13 @@ gboolean	mail_browser_init		(GtkUIManager *ui_manager,
 						 EMailBrowser *browser);
 gboolean	mail_shell_view_init		(GtkUIManager *ui_manager,
 						 EShellView *shell_view);
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
 
 typedef struct {
 	EMailReader *reader;
diff --git a/plugins/mark-all-read/ChangeLog b/plugins/mark-all-read/ChangeLog
deleted file mode 100644
index c3d927f105..0000000000
--- a/plugins/mark-all-read/ChangeLog
+++ /dev/null
@@ -1,98 +0,0 @@
-2008-09-02  Paul Bolle <pebolle@tiscali.nl>
-
-	** Fixes bug #550415
-
-	* mark-all-read.c (mar_got_folder): Do not leak an CamelFolderInfo.
-	Slightly change handling of CamelException.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* mark-all-read.c:
-
-2008-08-07  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #530402
-
-	* mark-all-read.c (prompt_user):
-	Improve dialog wording, and don't use a window title (HIG).
-
-2008-05-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #514383
-
-	* mark-all-read.c: Add a Cancel button.
-
-2007-12-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #362638
-
-	* mark-all-read.c:
-	Use the new MailMsg API for messages.
-
-2007-11-18  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	** Fix bug #495875
-
-	* org-gnome-mark-all-read.eplug.xml:
-	right click menu reordering
-
-2007-11-05  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #492102
-
-	* org-gnome-mark-all-read.eplug.xml: Use mail-mark-read icon.
-
-2007-05-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #325965 from Ilkka Tuohela
-
-	* mark-all-read.c: (mar_got_folder):
-
-2007-04-02  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
-
-	* org-gnome-mark-all-read.eplug.xml:
-	Cleanup. 
-	Fixes part of #301149
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2006-07-04  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* org-gnome-mark-all-read.eplug.xml: Using proper header
-	capitalization for the menu entry. Fixes bug #318755.
-
-2005-12-25  Funda Wang  <fundawang@linux.net.cn>
-
-	* Makefile.am: Mark this plugin as translatable (bug#301149).
-
-2005-12-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: Fix make-clean issues.
-
-2005-12-07  Funda Wang  <fundawang@linux.net.cn>
-
-	* org-gnome-mark-all-read.eplug.in: i18nlized.
-
-2005-06-27  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* org-gnome-mark-all-read.eplug.in: Use SOEXT.
-
-2005-05-19 Chenthill Palanisamy <pchenthill@novell.com>
-
-	* MakeFile.am:
-	* org-gnome-send-options.eplug.in: Plugin file to add
-          the Mark all Messages read menu item.
-  	* send-options.c: Contains methods to mark messages as read.	
-
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index 24bc48521a..f22b2276f0 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -30,9 +30,9 @@
 #include <glib/gi18n.h>
 #include <e-util/e-plugin-ui.h>
 #include <mail/em-folder-tree.h>
+#include <mail/em-utils.h>
 #include <mail/mail-ops.h>
 #include <mail/mail-mt.h>
-#include <camel/camel-vee-folder.h>
 
 #include <shell/e-shell-sidebar.h>
 #include <shell/e-shell-view.h>
@@ -46,6 +46,13 @@
 
 gboolean	e_plugin_ui_init		(GtkUIManager *ui_manager,
 						 EShellView *shell_view);
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
 
 static void
 button_clicked_cb (GtkButton *button,
@@ -71,7 +78,7 @@ box_mapped_cb (GtkWidget *box,
 }
 
 static gint
-prompt_user (void)
+prompt_user (gboolean has_subfolders)
 {
 	GtkWidget *container;
 	GtkWidget *dialog;
@@ -83,15 +90,21 @@ prompt_user (void)
 	gchar *markup;
 	gint response;
 
+	if (!has_subfolders) {
+		return em_utils_prompt_user (e_shell_get_active_window (e_shell_get_default ()), NULL, "mail:ask-mark-all-read", NULL) ?
+			GTK_RESPONSE_NO : GTK_RESPONSE_CANCEL;
+	}
+
 	dialog = gtk_dialog_new ();
-	gtk_widget_hide (GTK_DIALOG (dialog)->action_area);
+	widget = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+	gtk_widget_hide (widget);
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_window_set_title (GTK_WINDOW (dialog), "");
 	g_signal_connect (
 		dialog, "map",
 		G_CALLBACK (gtk_widget_queue_resize), NULL);
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
-	vbox = GTK_DIALOG (dialog)->vbox;
+	vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
 	/* Table */
 	widget = gtk_table_new (3, 2, FALSE);
@@ -341,8 +354,9 @@ mar_got_folder (gchar *folder_uri,
                 gpointer data)
 {
 	CamelFolderInfo *folder_info;
-	CamelStore *store;
+	CamelStore *parent_store;
 	CamelException ex;
+	const gchar *full_name;
 	gint response;
 
 	/* FIXME we have to disable the menu item */
@@ -351,9 +365,11 @@ mar_got_folder (gchar *folder_uri,
 
 	camel_exception_init (&ex);
 
-	store = folder->parent_store;
+	full_name = camel_folder_get_full_name (folder);
+	parent_store = camel_folder_get_parent_store (folder);
+
 	folder_info = camel_store_get_folder_info (
-		store, folder->full_name,
+		parent_store, full_name,
 		CAMEL_STORE_FOLDER_INFO_RECURSIVE |
 		CAMEL_STORE_FOLDER_INFO_FAST, &ex);
 
@@ -361,17 +377,17 @@ mar_got_folder (gchar *folder_uri,
 		goto exit;
 
 	if (scan_folder_tree_for_unread (folder_uri) > 1)
-		response = prompt_user ();
+		response = prompt_user (folder_info->child != NULL);
 	else
 		response = GTK_RESPONSE_NO;
 
 	if (response == GTK_RESPONSE_NO)
 		mark_all_as_read (folder);
 	else if (response == GTK_RESPONSE_YES)
-		mar_all_sub_folders (store, folder_info, &ex);
+		mar_all_sub_folders (parent_store, folder_info, &ex);
 
 exit:
-	camel_store_free_folder_info (store, folder_info);
+	camel_store_free_folder_info (parent_store, folder_info);
 }
 
 static void
diff --git a/plugins/plugin-manager/ChangeLog b/plugins/plugin-manager/ChangeLog
deleted file mode 100644
index 45dd1105d6..0000000000
--- a/plugins/plugin-manager/ChangeLog
+++ /dev/null
@@ -1,184 +0,0 @@
-2008-10-31  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #558726 (patch by Frederic van Starbmann)
-
-	* plugin-manager.c (eppm_enable_toggled):
-	Fix a potential format string crash.
-
-2008-09-04  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* plugin-manager.c:
-
-2008-06-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #530069
-
-	* plugin-manager.c:
-	Don't show the configuration tab unless the selected plugin
-	actually has configuration options (excluding options that get
-	crammed into the Preferences dialog).
-
-2008-05-23  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fixes Bug 496476.
-	
-	* plugin-manager.c (org_gnome_plugin_manager_manage): Let the 
-	plugin configure widget expand.
-
-2008-03-20  Sankar P  <psankar@novell.com>
-
-	* org-gnome-plugin-manager.eplug.xml:
-	Use "true" instead of "yes"
-
-2008-03-19  Sankar P  <psankar@novell.com>
-
-	** Fix for bug #496839
-
-	* org-gnome-plugin-manager.eplug.xml:
-	* plugin-manager.c: (org_gnome_plugin_manager_manage):
-	- Do not show all plugins in plugin-manager. 
-	Hide the core system plugins.
-
-2008-01-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #502303
-
-	* plugin-manager.c: (eppm_response):
-	Always destroy dialog and unset global variable.
-	* plugin-manager.c: (org_gnome_plugin_manager_manage):
-	Use G_TYPE_POINTER instead of GTK_TYPE_WIDGET in a list store
-	to get rid of reference counting troubles on configuration
-	widgets of plugins. Remember created dialog for future use.
-
-2008-02-01  Andre Klapper  <a9016009@gmx.de>
-
-	* plugin-manager.c: (org_gnome_plugin_manager_manage):
-	fix spelling.
-
-2007-12-04  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #500210
-
-	* plugin-manager.c: Changed coding-style to be more accurate to other
-	sources, but the main change was to show configuration options of the
-	plugin into extra tab, instead of new popup under 'Configure' button.
-
-2007-11-19  Sankar P  <psankar@novell.com>
-
-	** Fix for bug #498173
-
-	* plugin-manager.c: (eppm_response):
-	e_plugin_configure should be called only
-	when user clicks on Configure button.
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* plugin-manager.c: (org_gnome_plugin_manager_manage):
-	Don't mix code and declarations.
-
-2007-10-26  Sankar P  <psankar@novell.com>
-
-	* plugin-manager.c: (eppm_selection_changed):
-	Ssssshhhhhhhh the compiler warning.
-
-2007-10-26  Sankar P  <psankar@novell.com>
-
-	** Fix for bug #461272
-
-	* plugin-manager.c: (eppm_selection_changed),
-	(org_gnome_plugin_manager_manage):
-	Configure button should not be enabled for all.
-	configure button needs a hot-key.
-
-2007-07-26  Sankar P  <psankar@novell.com>
-
-	* plugin-manager.c: (eppm_response),
-	(org_gnome_plugin_manager_manage), (e_plugin_lib_configure):
-	Plugins should be configurable within the plugin-manager itself.
-	Fixes Preferences dialog bloating.
-	See bug #459522
-
-2007-05-11  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
-
-	* plugin-manager.c: (eppm_show_plugin), (eppm_selection_changed),
-	(eppm_enable_toggled), (eppm_free),
-	(org_gnome_plugin_manager_manage):
-	Sort the list of plugins based on name so that it is easy to use
-
-2006-01-25  Rajeev ramanathan  <rajeevramanathan_2004@yahoo.co.in>
-
-	** Fixes Bug #314913
-	
-	* plugin-manager.c : Removed id, path displayed in UI 
-
-2006-01-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* plugin-manager.c: (eppm_enable_toggled): Remove unused var.
-
-2006-01-13  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #326265
-	
-	* org-gnome-plugin-manager.xml: Added mnemonics to Plugin menu item.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* evolution/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml:
- 	 Fixing several typos and harmonizing
-	 capital/small letters. Partially fixes bug 306117.
-
-2005-12-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: Fix make-clean issues.
-
-2005-08-03  Li Yuan  <li.yuan@sun.com>
-
-	* plugin-manager.c: (org_gnome_plugin_manager_manage):
-	Add a11y name to Plugin Table.
-
-2005-07-21  Not Zed  <NotZed@Ximian.com>
-
-	* org-gnome-plugin-manager.xml: Remove the tools menu which
-	someone was too lazy to remove.
-
-2005-06-27  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* org-gnome-plugin-manager.eplug.xml: Use SOEXT.
-
-2005-05-13  Rodney Dawes  <dobey@novell.com>
-
-	* org-gnome-plugin-manager.xml: Update for new menu layout
-
-2005-05-13  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am: Add a backslash line separator to EXTRA_DIST
-
-2005-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: added built_sources/cleanfiles
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am:
-	* org-gnome-plugin-manager.eplug.xml: s/.in/.xml/ & i18n.
-
-2004-11-09  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am: Add the xml file to EXTRA_DIST
-
-2004-11-03  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: extra_dist the .eplug.in file.
-
-2004-10-20  Not Zed  <NotZed@Ximian.com>
-
-	* implemented a plugin manager plugin.
-
diff --git a/plugins/prefer-plain/ChangeLog b/plugins/prefer-plain/ChangeLog
deleted file mode 100644
index 18e1b74300..0000000000
--- a/plugins/prefer-plain/ChangeLog
+++ /dev/null
@@ -1,136 +0,0 @@
-2009-01-14  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #567687
-
-	* prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative):
-	Force text/html part only when choosing between text/plain and it.
-
-2008-09-09  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #551492
-
-	* prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative):
-	Initialize variable before using it.
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* prefer-plain.c:
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
-	dlls on Windows.
-
-2008-05-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #532384
-
-	* prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative):
-	Choose the text/html part in normal mode only if the alrenative
-	multipart contains also a text/plain part.
-
-2008-04-17  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #451976
-
-	* prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative): Try
-	to find text/html part in multipart/alternative when in normal mode.
-
-2007-10-26  Kjartan Maraas <kmaraas@gnome.org>
-
-	* prefer-plain.c: (e_plugin_lib_enable):
-	Fix NULL vs. 0.
-
-2007-10-30  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #487922
-	(Sometimes evolution does not recognize attachments)
-
-	* prefer-plain.c: (export_as_attachments): New helper function to
-	export message parts as attachments. This will traverse whole
-	hierarchy of message's parts in multipart message.
-	* prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative):
-	Use this function to export other parts as attachments.
-
-2007-09-05  Sankar P  <psankar@novell.com>
-
-	* prefer-plain.c: (e_plugin_lib_enable):
-	Fixes an invalid return type issue.
-
-2007-08-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #431459
-
-	* prefer-plain.c: (e_plugin_lib_enable): Avoid reentrancy.
-
-2007-08-16  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #350539
-
-	* prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative):
-	Ensures non-NULL part.
-
-2007-08-05  Johnny Jacob  <jjohnny@novell.com> 
-
-	* Committed on behalf of Anand V M  <avmuttagi@gmail.com>
-	
-	** Fix for bug #428125
-	
-	* prefer-plain.c: Added mnemonic for "Plain Text Mode" in
-	preferences
-
-2007-04-02  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
-
-	* org-gnome-prefer-plain.eplug.xml:
-	Cleanup. 
-	Fixes part of #301149
-
-2006-08-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* prefer-plain.c: (e_plugin_lib_enable): Don't leak the key.
-
-2006-01-19  Andre Klapper <a9016009@gmx.de>
-
-	* org-gnome-prefer-plain.eplug.xml
-	changed "mails" to "emails". Fixes bug 325569.
-
-2005-05-17  Not Zed  <NotZed@Ximian.com>
-
-	* org-gnome-prefer-plain.eplug.xml: make it clear this is a demonstration only.
-
-2005-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: fix built_sources/cleanfiles.
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: 
-	* org-gnome-prefer-plain.eplug.xml: s/.in/.xml/, fix i18n tags.
-
-2005-02-13  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-prefer-plain.eplug.in: Added author and moved the
-	description to it's own tag.
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-prefer-plain.eplug.in: Removed plugin from the name.
-	Added a . to the end of the description.
-
-2004-11-01  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: dist .eplug.in file
-
-2004-10-21  Not Zed  <NotZed@Ximian.com>
-
-	* prefer-plain.c (e_plugin_lib_enable): setup the right plugin
-	init function.
-
-2004-10-20  Not Zed  <NotZed@Ximian.com>
-
-	* Imported prefer-plain plugin.
-
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index bd77e83a55..f4d5c168be 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -30,9 +30,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <camel/camel-multipart.h>
-#include <camel/camel-mime-part.h>
-
 #include <em-format/em-format.h>
 #include <mail/em-config.h>
 #include <mail/em-format-hook.h>
@@ -83,7 +80,7 @@ org_gnome_prefer_plain_text_html (gpointer ep, EMFormatHookTarget *t)
 	if (epp_mode != EPP_TEXT
 	    || strstr (t->format->part_id->str, ".alternative-prefer-plain.") != NULL
 	    || em_format_is_inline (t->format, t->format->part_id->str, t->part, &(t->item->handler)))
-		t->item->handler.old->handler (t->format, t->stream, t->part, t->item->handler.old);
+		t->item->handler.old->handler (t->format, t->stream, t->part, t->item->handler.old, FALSE);
 	else if (epp_show_suppressed)
 		make_part_attachment (t->format, t->stream, t->part, -1);
 }
@@ -102,7 +99,7 @@ export_as_attachments (CamelMultipart *mp, EMFormat *format, CamelStream *stream
 		part = camel_multipart_get_part (mp, i);
 
 		if (part != except) {
-			CamelMultipart *multipart = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)part);
+			CamelMultipart *multipart = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part);
 
 			if (CAMEL_IS_MULTIPART (multipart)) {
 				export_as_attachments (multipart, format, stream, except);
@@ -116,7 +113,7 @@ export_as_attachments (CamelMultipart *mp, EMFormat *format, CamelStream *stream
 void
 org_gnome_prefer_plain_multipart_alternative(gpointer ep, EMFormatHookTarget *t)
 {
-	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)t->part);
+	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)t->part);
 	CamelMimePart *part, *display_part = NULL;
 	gint i, nparts, partidlen, displayid = 0;
 
@@ -161,7 +158,7 @@ org_gnome_prefer_plain_multipart_alternative(gpointer ep, EMFormatHookTarget *t)
 			em_format_part_as (t->format, t->stream, display_part, "text/html");
 			g_string_truncate (t->format->part_id, partidlen);
 		} else {
-			t->item->handler.old->handler (t->format, t->stream, t->part, t->item->handler.old);
+			t->item->handler.old->handler (t->format, t->stream, t->part, t->item->handler.old, FALSE);
 		}
 		return;
 	} else if (!CAMEL_IS_MULTIPART(mp)) {
@@ -241,7 +238,7 @@ org_gnome_prefer_plain_config_mode(struct _EPlugin *epl, struct _EConfigHookItem
 	GtkCellRenderer *cell;
 	GtkListStore *store;
 	GtkWidget *dropdown_label, *info, *check;
-	gint i;
+	guint i;
 	GtkTreeIter iter;
 
 	if (data->old)
@@ -280,7 +277,7 @@ org_gnome_prefer_plain_config_mode(struct _EPlugin *epl, struct _EConfigHookItem
 
 	g_signal_connect (dropdown, "changed", G_CALLBACK(epp_mode_changed), info);
 
-	i = ((GtkTable *)data->parent)->nrows;
+	g_object_get (data->parent, "n-rows", &i, NULL);
 	gtk_table_attach((GtkTable *)data->parent, check, 0, 2, i, i + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 	gtk_table_attach((GtkTable *)data->parent, dropdown_label, 0, 1, i + 1, i + 2, 0, 0, 0, 0);
 	gtk_table_attach((GtkTable *)data->parent, (GtkWidget *)dropdown, 1, 2, i + 1, i + 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
diff --git a/plugins/profiler/ChangeLog b/plugins/profiler/ChangeLog
deleted file mode 100644
index 16b77d5ba6..0000000000
--- a/plugins/profiler/ChangeLog
+++ /dev/null
@@ -1,30 +0,0 @@
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* profiler.c:
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* profiler.c: Add missing includes.
-
-2007-04-02  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
-
-	* org-gnome-evolution-profiler.eplug.xml:
-	Cleanup. 
-	Fixes part of #301149
-
-2005-12-25  Funda Wang  <fundawang@linux.net.cn>
-
-	* Makefile.am: Mark this plugin as translatable (bug#301149).
-
-2005-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: fix built_sources/cleanfiles.
-
-2005-04-26  Not Zed  <NotZed@Ximian.com>
-
-	* A profiler plugin.
-
diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c
index e3ecd07a9e..1a50b6e740 100644
--- a/plugins/profiler/profiler.c
+++ b/plugins/profiler/profiler.c
@@ -34,6 +34,14 @@
 
 void org_gnome_evolution_profiler_event (EPlugin *ep, EProfileEventTarget *t);
 
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
+
 void
 org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t)
 {
diff --git a/plugins/pst-import/ChangeLog b/plugins/pst-import/ChangeLog
deleted file mode 100644
index 0f031b508d..0000000000
--- a/plugins/pst-import/ChangeLog
+++ /dev/null
@@ -1,22 +0,0 @@
-2009-01-28  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: On Windows use -no-undefined and link with all
-	required libraries. (Just throw in a bunch of libraries without
-	cherry-picking. Having "superfluous" ones just slows down the
-	linking a bit, but doesn't hurt at run-time.)
-
-	Use LIBPST_CFLAGS.
-
-	* pst-importer.c: Include <libpst/define.h> before the other
-	libpst headers. Otherwise we get compilation errors on Windows,
-	sigh.
-
-2009-01-15  Bharath Acharya  <abharath@novell.com>
-
-	Basic functionality implemented by 
-	Chris Halls <chris.halls@credativ.co.uk>
-
-	** Added PST-Import plugin
-	* Makefile.am:
-	* org-gnome-pst.eplug.xml:
-	* pst-importer.c: 
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 68c8a19264..0c6c89b5b9 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -22,7 +22,8 @@ liborg_gnome_pst_import_la_CPPFLAGS =			\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(EVOLUTION_CFLAGS)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(LIBPST_CFLAGS)
+	$(LIBPST_CFLAGS)				\
+	$(CAMEL_CFLAGS)
 
 liborg_gnome_pst_import_la_SOURCES = pst-importer.c
 
@@ -35,7 +36,8 @@ liborg_gnome_pst_import_la_LIBADD =			\
 	$(EVOLUTION_CALENDAR_LIBS)			\
 	$(EVOLUTION_MAIL_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)				\
-	$(LIBPST_LIBS)
+	$(LIBPST_LIBS)					\
+	$(CAMEL_LIBS)
 
 EXTRA_DIST = org-gnome-pst-import.eplug.xml
 
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index fa0b61e993..84706b783e 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -52,16 +52,6 @@
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserverui/e-source-selector-dialog.h>
 
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-file-utils.h>
-
 #include <mail/e-mail-local.h>
 #include <mail/mail-mt.h>
 #include <mail/mail-tools.h>
@@ -70,6 +60,13 @@
 #include <libpst/libpst.h>
 #include <libpst/timeconv.h>
 
+#ifdef WIN32
+#ifdef gmtime_r
+#undef gmtime_r
+#endif
+#define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0)
+#endif
+
 typedef struct _PstImporter PstImporter;
 
 gint pst_init (pst_file *pst, gchar *filename);
@@ -469,24 +466,24 @@ pst_import_file (PstImporter *m)
 
 	g_free (filename);
 
-	camel_operation_progress_count (NULL, 1);
+	camel_operation_progress (NULL, 1);
 
 	if ((item = pst_parse_item (&m->pst, m->pst.d_head, NULL)) == NULL) {
 		pst_error_msg ("Could not get root record");
 		return;
 	}
 
-	camel_operation_progress_count (NULL, 2);
+	camel_operation_progress (NULL, 2);
 
 	if ((d_ptr = pst_getTopOfFolders (&m->pst, item)) == NULL) {
 		pst_error_msg ("Top of folders record not found. Cannot continue");
 		return;
 	}
 
-	camel_operation_progress_count (NULL, 3);
+	camel_operation_progress (NULL, 3);
 	pst_import_folders (m, d_ptr);
 
-	camel_operation_progress_count (NULL, 4);
+	camel_operation_progress (NULL, 4);
 
 	camel_operation_end (NULL);
 
@@ -671,7 +668,7 @@ pst_process_folder (PstImporter *m, pst_item *item)
 	m->folder_uri = uri;
 
 	if (m->folder) {
-		camel_object_unref (m->folder);
+		g_object_unref (m->folder);
 		m->folder = NULL;
 	}
 
@@ -708,7 +705,7 @@ pst_create_folder (PstImporter *m)
 			*pos = '\0';
 
 			folder = mail_tool_uri_to_folder (dest, CAMEL_STORE_FOLDER_CREATE, &m->base.ex);
-			camel_object_unref(folder);
+			g_object_unref (folder);
 			*pos = '/';
 		}
 	}
@@ -716,7 +713,7 @@ pst_create_folder (PstImporter *m)
 	g_free (dest);
 
 	if (m->folder) {
-		camel_object_unref (m->folder);
+		g_object_unref (m->folder);
 	}
 
 	m->folder = mail_tool_uri_to_folder (m->folder_uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex);
@@ -808,7 +805,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 	}
 
 	camel_mime_message_set_from (msg, addr);
-	camel_object_unref (addr);
+	g_object_unref (addr);
 
 	if (item->email->sent_date != NULL) {
 		camel_mime_message_set_date (msg, pst_fileTimeToUnixTime (item->email->sent_date), 0);
@@ -836,7 +833,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 			if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->sentto_address.str) > 0)
 				camel_mime_message_set_recipients (msg, "To", addr);
 
-			camel_object_unref (addr);
+			g_object_unref (addr);
 		}
 
 		if (item->email->cc_address.str != NULL) {
@@ -845,7 +842,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 			if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->cc_address.str) > 0)
 				camel_mime_message_set_recipients (msg, "CC", addr);
 
-			camel_object_unref (addr);
+			g_object_unref (addr);
 		}
 	}
 
@@ -876,7 +873,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 		part = camel_mime_part_new ();
 		camel_mime_part_set_content (part, item->body.str, strlen (item->body.str), "text/plain");
 		camel_multipart_add_part (mp, part);
-		camel_object_unref (part);
+		g_object_unref (part);
 	}
 
 	if (item->email->htmlbody.str != NULL) {
@@ -884,21 +881,21 @@ pst_process_email (PstImporter *m, pst_item *item)
 		part = camel_mime_part_new ();
 		camel_mime_part_set_content (part, item->email->htmlbody.str, strlen (item->email->htmlbody.str), "text/html");
 		camel_multipart_add_part (mp, part);
-		camel_object_unref (part);
+		g_object_unref (part);
 	}
 
 	for (attach = item->attach; attach; attach = attach->next) {
 		if (attach->data.data || attach->i_id) {
 			part = attachment_to_part(m, attach);
 			camel_multipart_add_part (mp, part);
-			camel_object_unref (part);
+			g_object_unref (part);
 		}
 	}
 
 	/*camel_mime_message_dump (msg, TRUE);*/
 
 	if (item->email->htmlbody.str || item->attach) {
-		camel_medium_set_content_object (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (mp));
+		camel_medium_set_content (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (mp));
 	} else if (item->body.str) {
 		camel_mime_part_set_content (CAMEL_MIME_PART (msg), item->body.str, strlen (item->body.str), "text/plain");
 	} else {
@@ -921,7 +918,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 
 	camel_folder_append_message (m->folder, msg, info, NULL, &m->ex);
 	camel_message_info_free (info);
-	camel_object_unref (msg);
+	g_object_unref (msg);
 
 	camel_folder_sync (m->folder, FALSE, NULL);
 	camel_folder_thaw (m->folder);
@@ -1241,24 +1238,24 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta
 			continue;
 		}
 
-		content = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+		content = camel_medium_get_content (CAMEL_MEDIUM (part));
 
 		if (camel_data_wrapper_decode_to_stream (content, stream) == -1
 			|| camel_stream_flush (stream) == -1)
 		{
 			g_warning ("Could not write attachment to %s: %s", path, g_strerror (errno));
-			camel_object_unref (stream);
+			g_object_unref (stream);
 			attach = attach->next;
 			continue;
 		}
 
-		camel_object_unref (stream);
+		g_object_unref (stream);
 
 		uri = g_filename_to_uri (path, NULL, NULL);
 		list = g_slist_append (list, g_strdup (uri));
 		g_free (uri);
 
-		camel_object_unref (part);
+		g_object_unref (part);
 		g_free (path);
 
 		attach = attach->next;
diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog
deleted file mode 100644
index 15ae0b036d..0000000000
--- a/plugins/publish-calendar/ChangeLog
+++ /dev/null
@@ -1,316 +0,0 @@
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #340783
-
-	* publish-format-fb.h: (publish_calendar_as_fb):
-	* publish-format-fb.c: (write_calendar), (publish_calendar_as_fb):
-	* publish-format-ical.h: (publish_calendar_as_ical):
-	* publish-format-ical.c: (write_calendar), (publish_calendar_as_ical):
-	* publish-calendar.c: (publish), (publish_no_succ_info),
-	(publish_uri_async), (publish_online), (mount_ready_cb),
-	(mount_first), (add_timeout), (add_offset_timeout),
-	(online_state_changed), (publish_urls), (action_publish),
-	(error_queue_show_idle), (error_queue_add):
-	Show error or success to user in a UI.
-
-2009-01-21  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #541209
-
-	** Adapt to the new APIs from upstream libical. Changes made include
-	using the "_r" counterpart for the following APIs:
-	+ icalproperty_as_ical_string ()
-	+ icalvalue_as_ical_string ()
-	+ icalcomponent_as_ical_string ()
-	+ icalparameter_as_ical_string ()
-	+ icaldurationtype_as_ical_string ()
-	+ icalenum_reqstat_code ()
-	+ icallangbind_property_eval_string ()
-	+ icallangbind_quote_as_ical ()
-	+ icalmime_text_end_part ()
-	+ icalperiodtype_as_ical_string ()
-	+ icalproperty_enum_to_string ()
-	+ icalproperty_get_parameter_as_string ()
-	+ icalproperty_get_value_as_string ()
-	+ icalproperty_get_property_name ()
-	+ icalrecurrencetype_as_string ()
-	+ icaltime_as_ical_string ()
-	+ icalreqstattype_as_string ()
-	+ icalvalue_binary_as_ical_string ()
-	+ icalvalue_int_as_ical_string ()
-	+ icalvalue_utcoffset_as_ical_string ()
-	+ icalvalue_string_as_ical_string ()
-	+ icalvalue_recur_as_ical_string ()
-	+ icalvalue_text_as_ical_string ()
-	+ icalvalue_attach_as_ical_string ()
-	+ icalvalue_duration_as_ical_string ()
-	+ icalvalue_date_as_ical_string ()
-	+ icalvalue_datetime_as_ical_string ()
-	+ icalvalue_float_as_ical_string ()
-	+ icalvalue_geo_as_ical_string ()
-	+ icalvalue_datetimeperiod_as_ical_string ()
-	+ icalvalue_period_as_ical_string ()
-	+ icalvalue_trigger_as_ical_string ()
-	+ icalvalue_as_ical_string ()
-
-	* publish-format-fb.c (write_calendar):
-	* publish-format-ical.c (write_calendar):
-
-2008-12-16  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #359010
-
-	* url-editor-dialog.c: (url_editor_dialog_new):
-	Set title of the window based on the parameter/action.
-
-2008-10-03  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* publish-calendar.c:
-	* url-editor-dialog.c:
-
-2008-09-26  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #553461 and bug #553389
-
-	* publish-calendar.c (url_remove_clicked):
-	* publish-calendar.glade:
-	* url-editor-dialog.c (create_uri), (check_input),
-	(publish_service_changed), (set_from_uri):
-	* url-editor-dialog.h: Rename the "SSH" option to "Secure FTP (SSH)"
-	and update the code accordingly. Also, change a related string to use
-	better terminology.
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* publish-format-fb.c:
-	* publish-format-ical.c:
-	* publish-location.c:
-	* publish-location.h:
-	* url-editor-dialog.h:
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* publish-format-fb.h:
-	* publish-format-ical.h:
-
-2008-04-17  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #526739
-
-	* publish-format-fb.h: (publish_calendar_as_fb):
-	* publish-format-fb.c: (write_calendar), (publish_calendar_as_fb):
-	* publish-format-ical.h: (publish_calendar_as_ical):
-	* publish-format-ical.c: (write_calendar), (publish_calendar_as_ical):
-	Use gio GOutputStream instead of gnome-vfs handle.
-	* url-editor-dialog.c: (create_uri): Use glib function to escape URI.
-	* publish-location.c: (migrateURI): Use EUri to parse URI.
-	* publish-calendar.c: (publish_online), (unmount_done_cb),
-	(struct mnt_struct), (mount_ready_cb), (ask_password), (ask_question),
-	(mount_first), (publish):
-	Use gio instead of gnome-vfs for opening (remote) files.
-
-2007-12-14  Tobias Mueller  <tobiasmue@svn.gnome.org>
-	Patch by <nickspoon0@gmail.com>
-	
-	** Fixes bug 502188
-	
-	* publish-calendar.c: initialize "remember" variable to
-	FALSE.
-
-2007-09-27  Pedro Villavicencio Garrido  <pvillavi@gnome.org>
-
-	* url-editor-dialog.c: (url_editor_dialog_construct):
-	use EVOLUTION_GLADEDIR instead of EVOLUTION_PLUGINDIR.
-	
-	Fixes #480804.
-
-2007-09-10  Andre Klapper  <a9016009@gmx.de>
-
-	* publish-calendar.c: (publish):
-	fix chen's string freeze break.
-
-2007-09-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #274047 (bnc)
-	* Makefile.am: Inserted glade_data.
-	* publish-calendar.c: (publish_calendar_locations): Pick
-	the glade file from install area.							    
-
-2007-09-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #277159 (bnc)
-	* url-editor-dialog.c: (frequency_changed_cb),
-	(url_editor_dialog_construct): Listen to the changes made
-	in publish frequency.				       
-
-2007-09-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #274048 (bnc)
-	* publish-calendar.c: (publish): Prompt for a password
-	if required.					 
-
-2007-07-30  Andre Klapper  <a9016009@gmx.de>
-
-	* publish-calendar.glade:
-	remove "window1" string from translation
-
-2007-06-07  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* publish-location.c: (migrateURI), (e_publish_uri_from_xml),
-	(e_publish_uri_to_xml): more compilation warnings cleanup,
-	completes bug #437584 fixes
-
-2007-05-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am: Add "eplug" file to CLEANFILES.
-
-2007-05-11  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* url-editor-dialog.c: (set_from_uri): fixes casts in strcmp,
-	fixes part of bug #437584
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2007-02-20  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #238093 (bnc)
-	* publish-format-ical.c: (insert_tz_comps), (append_tz_to_comp),
-	(write_calendar): Add the timezone information while
-	publishing the calendars.
-
-2007-02-19  Sankar P  <psankar@novell.com>
-
-	* url-editor-dialog.c: (set_from_uri):
-	Fixes some string to int conversion.
-
-2006-08-02  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #343991
-	* publish-calendar.c: (publish_uris_set_timeout): Iterate
-	the list when the uri is NULL.
-
-2006-07-31  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #329740
-	* publish-format-fb.c: (write_calendar): Pass the email id
-	of the user for getting the free busy information.
-
-2006-07-31  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #347973
-	* url-editor-dialog.c: (set_from_uri): Parse the uri 
-	using EUri.
-
-2006-02-09  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	Fixes #328389
-	* publish-calendar.c: Disabled Enabled button for Enabled Url.
-
-2006-02-12  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* publish-calendar.glade: Change mnemonic for Port.
-	Fixes bug #329757.
-
-2006-01-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #328413
-	* publish-calendar.glade: Set the text invisible for the
-	password field.
-
-2006-01-27  Kjartan Maraas <kmaraas@gnome.org>
-
-	* publish-format-fb.c: Add missing include.
-
-2006-01-27  Andre Klapper <a9016009@gmx.de>
-	* publish-calendar.glade:
-	removed string "dialog1" from translation. Fixes bug 306118.
-
-2006-01-23  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #328224, 328408, 328389
-	* publish-calendar.c: (publish_uri_async), (url_add_clicked),
-	(url_edit_clicked), ,
-	(publish_uris_set_timeout), (e_plugin_lib_enable): Publish 
-	the calendar in a seperate thread so that the gui remains 
-	responsive.
-	(publish_calendar_locations): Clear the items gtk store.
-	* publish-location.c: (migrateURI), (e_publish_uri_from_xml):
-	If the uri is NULL return back.
-
-2006-01-11  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #325926
-	* org-gnome-publish-calendar.eplug.xml: Use the target and hook id
-	of calendar instead of shell.
-
-2006-01-04  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use EVOLUTION_PLUGINDIR as the macro name for the
-	plugindir, to match what is redefined for Win32 in
-	e-util/e-util-private.h
-
-	* publish-calendar.c (publish_calendar_locations)
-	* url-editor-dialog.c (url_editor_dialog_construct): Construct
-	glade file pathname at run-time.
-
-2005-12-25  Funda Wang  <fundawang@linux.net.cn>
-
-	* Makefile.am: Mark this plugin as translatable (bug#301149).
-
-2005-12-22  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use -no-undefined on Windows. Link with used
-	libraries.
-
-	* org-gnome-publish-calendar.eplug.in: Use SOEXT.
-
-2005-12-20  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* Makefile.am: Added the org-gnome-publish-calendar.xml
-	file to extra dist.
-
-2005-12-19  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Committing for: David Trowbridge <trowbrds cs colorado edu>
-
-	* Makefile.am:
-	* org-gnome-publish-calendar.eplug.in:
-	* org-gnome-publish-calendar.xml:
-	* publish-calendar.c: (publish), (add_timeout), (update_timestamp),
-	(add_offset_timeout), (url_list_changed),
-	(url_list_enable_toggled), (selection_changed), (url_add_clicked),
-	(url_edit_clicked), (url_list_double_click), (url_remove_clicked),
-	(url_enable_clicked), (online_state_changed),
-	(publish_calendar_locations), (publish_urls), (action_publish),
-	(e_plugin_lib_enable):
-	* publish-calendar.glade:
-	* publish-format-fb.c: (write_calendar), (publish_calendar_as_fb):
-	* publish-format-fb.h:
-	* publish-format-ical.c: (write_calendar),
-	(publish_calendar_as_ical):
-	* publish-format-ical.h:
-	* publish-location.c: (migrateURI), (e_publish_uri_from_xml),
-	(e_publish_uri_to_xml):
-	* publish-location.h:
-	* url-editor-dialog.c: (create_uri), (check_input),
-	(source_selection_changed), (publish_service_changed),
-	(type_selector_changed), (server_entry_changed),
-	(file_entry_changed), (port_entry_changed),
-	(username_entry_changed), (password_entry_changed),
-	(remember_pw_toggled), (set_from_uri),
-	(url_editor_dialog_construct), (url_editor_dialog_new),
-	(url_editor_dialog_dispose), (url_editor_dialog_class_init),
-	(url_editor_dialog_init), (url_editor_dialog_get_type),
-	(url_editor_dialog_run):
-	* url-editor-dialog.h: Committing the intial patch.
-
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index 37910d8f47..1211726b4b 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -116,11 +116,7 @@ check_input (UrlEditorDialog *dialog)
 		gtk_widget_hide (dialog->fb_duration_combo);
 	}
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_get_sensitive (dialog->events_selector)) {
-#else
-	if (GTK_WIDGET_IS_SENSITIVE (dialog->events_selector)) {
-#endif
 		sources = e_source_selector_get_selection (E_SOURCE_SELECTOR (dialog->events_selector));
 		n += g_slist_length (sources);
 	}
@@ -332,6 +328,7 @@ static gboolean
 url_editor_dialog_construct (UrlEditorDialog *dialog)
 {
 	GtkWidget *toplevel;
+	GtkWidget *content_area;
 	GConfClient *gconf;
 	GtkSizeGroup *group;
 	EPublishUri *uri;
@@ -376,8 +373,9 @@ url_editor_dialog_construct (UrlEditorDialog *dialog)
 
 	uri = dialog->uri;
 
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 	toplevel = e_builder_get_widget (dialog->builder, "publishing toplevel");
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), toplevel);
+	gtk_container_add (GTK_CONTAINER (content_area), toplevel);
 
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog
deleted file mode 100644
index 46f51c7003..0000000000
--- a/plugins/sa-junk-plugin/ChangeLog
+++ /dev/null
@@ -1,154 +0,0 @@
-2008-12-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #560420 (patch by hp@syntomax.com)
-
-	* em-junk-filter.c (pipe_to_sa_full):
-	spamc and spamassassin use error codes >= 64 to denote execution
-	errors.  Positive error codes < 64 means the message was identified
-	as spam.
-
-2008-09-29  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* em-junk-filter.c:
-
-2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #551121
-
-	* em-junk-filter.c (pipe_to_sa_full), (em_junk_sa_respawn_spamd):
-	* org-gnome-sa-junk-plugin.eplug.xml: Standardise use of
-	"SpamAssassin" vs. "spamassassin" or "Spamassassin".
-
-2008-09-12  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #505016
-
-	* em-junk-filter.c: (em_junk_sa_check_junk):
-	Check for NULL to prevent crash when error occurred.
-
-2008-04-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #273041
-
-	* em-junk-filter.c: (em_junk_sa_commit_reports),
-	(em_junk_sa_validate_binary): Fix function prototype.
-	* em-junk-filter.c: (pipe_to_sa_full), (em_junk_sa_test_spamd_running),
-	(em_junk_sa_test_spamassassin),	(pipe_to_sa), (em_junk_sa_run_spamd),
-	(em_junk_sa_test_spamd), (em_junk_sa_is_available),
-	(em_junk_sa_check_junk), (get_spamassassin_version),
-	(em_junk_sa_report_junk), (em_junk_sa_report_non_junk):
-	Propagate possible errors to the UI.
-
-2008-03-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #515786
-
-	* org-gnome-sa-junk-plugin.eplug.xml:
-	* em-junk-filter.c: (org_gnome_sa_use_remote_tests):
-	Fix misspelled SpamAssassin word.
-
-2007-11-26  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #499644
-
-	* em-junk-filter.c (user_remote_tests_cb),
-	(org_gnome_sa_use_remote_tests):
-	The behavior of the "Include remote tests" check button was swapped
-	with respect to its state.  Probably why SpamAssassin seemed slow.
-
-2007-09-07  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #473903
-
-	* em-junk-filter.c: (em_junk_sa_validate_binary): Changing function
-	prototype to fit what is expected in 'invoke', returns value based on it.
-
-2007-08-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #468303
-
-	* org-gnome-sa-junk-plugin.eplug.xml: Add strings for i18n.
-
-2007-05-11  Jules Colding  <colding@omesc.com>
-
-	* em-junk-filter.c (pipe_to_sa_full): File descriptor leaks fixed.
-	Fixes bug #437664.
-
-2007-05-11  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* em-junk-filter.c: (pipe_to_sa_full), (em_junk_sa_check_junk),
-	(org_gnome_sa_use_remote_tests): Fix casts and prototypes,
-	fixes part of bug #437584.
-
-2007-04-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Added few more plugin callbacks and moved the UI options from core
-	mail to plugin.
-
-	* em-junk-filter.c: (em_junk_sa_validate_binary),
-	(use_remote_tests_cb), (org_gnome_sa_use_remote_tests):
-	* org-gnome-sa-junk-plugin.eplug.xml:
-
-2007-04-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* em-junk-filter.c (em_junk_sa_get_name):
-	* org-gnome-sa-junk-plugin.eplug.xml:
-	Correctly capitalize SpamAssassin.  (#375577)
-	Patch from Priit Laes.
-
-2006-08-22  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* em-junk-filter.c: (em_junk_sa_init): #if 0 out unused function and
-	plug a leak.
-
-2006-01-09  Kjartan Maraas <kmaraas@gnome.org>
-
-	* em-junk-filter.c: (em_junk_sa_run_spamd): Remove unused var.
-
-2006-01-11  Andre Klapper <a9016009@gmx.de>
-	* org-gnome-sa-junk-plugin.eplug.xml: Changing strings to be more precise.
-	Fixes bug 325132.
-
-2005-01-04  Shi Pu  <shi.pu@sun.com>
-
-	See bug **  325210
-
-	* em-junk-filter.c:
-	(get_spamassassin_version): gets the spamassassin version which evolution used
-	(em_junk_sa_report_junk),
-	(em_junk_sa_report_non_junk),
-	(em_junk_sa_commit_reports): judge spamassassin version to decide
-	which sync option should be used
-
-2005-10-06  Vivek Jain <jvivek@novell.com>
-	
-	** See Bug #268852
-	* em-junk-filter.c : (em_junk_sa_run_spamd)
-	allow max one chid to be spawned for 
-	spamd. 
-
-2005-10-03  Vivek Jain <jvivek@novell.com>
-
-	* em-junk-filter.c: added (e_plugin_lib_enable)
-	calls init here to initialize all settings
-	**Fixes #317792
-	unref GConfClient in finalize
-	
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* em-junk-filter.c (em_junk_sa_report_non_junk): pre-define.
-
-2005-07-06  Vivek Jain <jvivek@novell.com>
-	
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
-
-2005-07-06  Vivek Jain <jvivek@novell.com>
-
-	 sa-junk-plugin : plugin that uses spam assasin for junk mail
-	 handling
-	 moved em-junk-filter.c from mail/ to here and modified it to listen
-	 to the callbacks from the plugin.
-	 
-
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index c8c53c6169..537831a07e 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -34,18 +34,12 @@
 #include <signal.h>
 #include <time.h>
 
-#include <camel/camel-mime-message.h>
-#include <camel/camel-debug.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-i18n.h>
 #include <mail/em-junk.h>
 #include <mail/em-utils.h>
 #include <e-util/e-mktemp.h>
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include "mail/em-config.h"
 #include "shell/e-shell.h"
 
@@ -195,7 +189,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gin
 		camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (msg), stream);
 		camel_stream_flush (stream);
 		camel_stream_close (stream);
-		camel_object_unref (stream);
+		g_object_unref (stream);
 	} else if (in) {
 		camel_write (fds[1], in, strlen (in));
 		close (fds[1]);
@@ -210,7 +204,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gin
 		camel_stream_mem_set_byte_array (memstream, output_buffer);
 
 		camel_stream_write_to_stream (stream, (CamelStream *) memstream);
-		camel_object_unref (stream);
+		g_object_unref (stream);
 		g_byte_array_append (output_buffer, (guchar *)"", 1);
 
 		d(printf ("child process output: %s len: %d\n", output_buffer->data, output_buffer->len));
@@ -930,7 +924,9 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact
 	EShell *shell;
 	GtkWidget *check, *vbox, *label;
 	gchar *text = g_strdup_printf ("    <small>%s</small>", _("This will make SpamAssassin more reliable, but slower"));
-	guint i = ((GtkTable *)data->parent)->nrows;
+	guint n_rows;
+
+	g_object_get (data->parent, "n-rows", &n_rows, NULL);
 
 	if (data->old)
                 return data->old;
@@ -945,7 +941,9 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !em_junk_sa_local_only);
 	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), (gpointer) "/apps/evolution/mail/junk/sa/local_only");
-	gtk_table_attach((GtkTable *)data->parent, vbox, 0, 1, i, i+1, 0, 0, 0, 0);
+	gtk_table_attach (
+		GTK_TABLE (data->parent), vbox,
+		0, 1, n_rows, n_rows+1, 0, 0, 0, 0);
 
 	shell = e_shell_get_default ();
 	if (e_shell_get_express_mode (shell))
diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog
deleted file mode 100644
index 28e5ad77e1..0000000000
--- a/plugins/save-calendar/ChangeLog
+++ /dev/null
@@ -1,293 +0,0 @@
-2009-01-21  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #541209
-
-	** Adapt to the new APIs from upstream libical. Changes made include
-	using the "_r" counterpart for the following APIs:
-	+ icalproperty_as_ical_string ()
-	+ icalvalue_as_ical_string ()
-	+ icalcomponent_as_ical_string ()
-	+ icalparameter_as_ical_string ()
-	+ icaldurationtype_as_ical_string ()
-	+ icalenum_reqstat_code ()
-	+ icallangbind_property_eval_string ()
-	+ icallangbind_quote_as_ical ()
-	+ icalmime_text_end_part ()
-	+ icalperiodtype_as_ical_string ()
-	+ icalproperty_enum_to_string ()
-	+ icalproperty_get_parameter_as_string ()
-	+ icalproperty_get_value_as_string ()
-	+ icalproperty_get_property_name ()
-	+ icalrecurrencetype_as_string ()
-	+ icaltime_as_ical_string ()
-	+ icalreqstattype_as_string ()
-	+ icalvalue_binary_as_ical_string ()
-	+ icalvalue_int_as_ical_string ()
-	+ icalvalue_utcoffset_as_ical_string ()
-	+ icalvalue_string_as_ical_string ()
-	+ icalvalue_recur_as_ical_string ()
-	+ icalvalue_text_as_ical_string ()
-	+ icalvalue_attach_as_ical_string ()
-	+ icalvalue_duration_as_ical_string ()
-	+ icalvalue_date_as_ical_string ()
-	+ icalvalue_datetime_as_ical_string ()
-	+ icalvalue_float_as_ical_string ()
-	+ icalvalue_geo_as_ical_string ()
-	+ icalvalue_datetimeperiod_as_ical_string ()
-	+ icalvalue_period_as_ical_string ()
-	+ icalvalue_trigger_as_ical_string ()
-	+ icalvalue_as_ical_string ()
-
-	* ical-format.c (do_save_calendar_ical):
-
-2008-09-16  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* csv-format.c:
-	* ical-format.c:
-	* rdf-format.c:
-
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* save-calendar.c:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* format-handler.h:
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
-	dlls on Windows.
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	* csv-format.c (do_save_calendar_csv):
-	* rdf-format.c (do_save_calendar_rdf):
-	Remove pointless address check of a local variable.
-
-2008-04-17  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #526739
-
-	* ical-format.c: (do_save_calendar_ical):
-	* csv-format.c: (do_save_calendar_csv):
-	* rdf-format.c: (do_save_calendar_rdf):
-	Use gio GOutpuStream instead of gnome-vfs handle.
-	* format-handler.h: (open_for_writing):
-	* save-calendar.c: (open_for_writing): New helper function.
-
-2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* ical-format.c: (do_save_calendar_ical): Patch from OpenSUSE
-
-2008-01-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #475781
-
-	* csv-format.c: (do_save_calendar_csv):
-	* rdf-format.c: (do_save_calendar_rdf):
-	Fix memory leaks around ECalComponentDateTime.
-
-2007-11-11  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	** Fix bug #495872
-
-	* org-gnome-save-calendar.eplug.xml:
-	* save-calendar.c: (org_gnome_save_memos):
-	add memo support
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #477045
-
-	* org-gnome-save-calendar.eplug.xml:
-	Use standard icon names where applicable.
-
-2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #476231
-
-	* csv-format.c:
-	* ical-format.c:
-	* rdf-format.c:
-	* save-calendar.c:
-	Remove non-USE_GTKFILECHOOSER code.
-	GtkFileChooser has been around since 2004.
-
-2007-06-07  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* rdf-format.c: (add_nummeric_to_rdf), (add_time_to_rdf),
-	(add_string_to_rdf), (do_save_calendar_rdf):
-	more compilation warnings cleanup, completes bug #437584 fixes
-
-2007-04-02  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
-	
-	* org-gnome-save-calendar.eplug.xml:
-	Cleanup. 
-	Fixes part of #301149
-
-2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* save-calendar.c:
-	Fix "incompatible pointer type" warnings (#360619).
-
-2007-02-20  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #238093 (bnc)
-	* ical-format.c: (insert_tz_comps), (append_tz_to_comp),
-	(do_save_calendar_ical): Add the timezone information while
-	exporting the calendars.				 
-
-2006-08-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* rdf-format.c: (add_time_to_rdf): Plug a leak.
-
-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
-	file already exists.
-
-	** Fixes bug #329345
-
-2006-02-13  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* org-gnome-save-calendar.eplug.xml:
-	Fix mnemonics to be consistent. Fixes bug #330934.
-
-2006-01-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* csv-format.c: (string_needsquotes):
-	* save-calendar.c: (ask_destination_and_save): Fix confusion
-	between = and ==. Silences the compiler, but someone has to check
-	if this really is correct.
-
-2006-01-10  Simon Zheng  <simon.zheng@sun.com>
-
-	* csv-format.c:
-	* rdf-format.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.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* csv-format.c: fixed two strings for consistency.
-        Fixes bug 325127 and partially bug 325125.
-	
-2005-11-11  Dinesh Layek  <LDinesh@novell.com>
-
-	* save-calendar.c (ask_destination_and_save): append the file_extension 
-	if the user does not provide it.
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* ical-format.c: include missing header.
-
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* csv-format.c: moved e-error to e-util
-
-2005-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: setup built_sources/cleanfiles
-
-2005-03-02  Philip Van Hoof  <pvanhoof@gnome.org>
-
-	* rdf-format.c: Fixes for Bug #73099 and Bug #73098
-	* csv-format.c: Changed malloc to g_malloc and char to gchar
-	* csv-format.c: Fixes for Bug #73099 and Bug #73098
-	
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: 
-	* org-gnome-save-calendar.eplug.xml: s/.in/.xml/ & fix i18n.
-
-2005-03-22  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #73541
-	* csv-format.c: (do_save_calendar_csv):
-	* ical-format.c: (do_save_calendar_ical):
-	* rdf-format.c: (do_save_calendar_rdf): Changed the 
-	cal e_cal_new to auth_new_from_source, so that the 
-	ecal has the auth function in it.
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-save-calendar.eplug.in: Fixed description and added
-	author. 
-	Shortened name of plugin.
-	Added xml tag.
-
-2005-02-21  Rodrigo Moya <rodrigo@novell.com>
-
-	Fixes #71527
-
-	* ical-format.c (display_error_message): changed to get a simple
-	string instead of a GError.
-	(do_save_calendar_ical): use GNOME-VFS for saving the file.
-
-2005-01-05  JP Rosevear  <jpr@novell.com>
-
-	* save-calendar.c (ask_destination_and_save): fix build for non
-	gtk file chooser case
-
-2005-01-04  Philip Van Hoof  <pvanhoof@gnome.org>
-
-	* csv-format.c, rdf-format.c: Use standard error messages
-
-2004-12-27  Philip Van Hoof  <pvanhoof@gnome.org>
-
-	* csv-format.c, rdf-format.c: Warning when overwriting file
-
-2004-12-22  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: list format-handler.h as a source so it dists
-
-2004-12-20  Philip Van Hoof  <pvanhoof@gnome.org>
-
-	* Makefile.am: Code splitup, each format has it's own c-file
-	* csv-format.c: Added. Code splitup
-	* format-handler.h: Added. Code splitup
-	* ical-format.c: Added. Code splitup
-	* rdf-format.c: Added. Support for RDF files. Code splitup
- 	* save-calendar.c: Support for RDF files. Code splitup
-
-2004-11-30  Philip Van Hoof  <pvanhoof@gnome.org>
-
-	* save-calendar.c: Support for CSV files
-
-2004-11-01  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: dist .eplug.in file
-
-2004-10-21  Rodrigo Moya <rodrigo@novell.com>
-
-	* save-calendar.c (do_save_calendar): get error information in
-	e_cal_* calls, and display errors to the user.
-
-2004-10-21  JP Rosevear  <jpr@novell.com>
-
-	* save-calendar.c (do_save_calendar): compile if not using file
-	chooser
-
-2004-10-21  Rodrigo Moya <rodrigo@novell.com>
-
-	* org-gnome-save-calendar.eplug.in: better menu items.
-
-2004-10-21  Rodrigo Moya <rodrigo@novell.com>
-
-	* save-calendar.c: new plugin for saving a calendar to disk.
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index c8901b2d87..b7872a68d4 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -34,6 +34,7 @@
 #include <libedataserverui/e-source-selector.h>
 #include <libecal/e-cal.h>
 #include <e-util/e-alert-dialog.h>
+#include <e-util/e-plugin.h>
 #include <string.h>
 
 #include <shell/e-shell-sidebar.h>
@@ -50,6 +51,14 @@ gboolean	memo_list_save_as_init		(GtkUIManager *ui_manager,
 gboolean	task_list_save_as_init		(GtkUIManager *ui_manager,
 						 EShellView *shell_view);
 
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
+
 enum {  /* GtkComboBox enum */
 	DEST_NAME_COLUMN,
 	DEST_HANDLER,
diff --git a/plugins/startup-wizard/ChangeLog b/plugins/startup-wizard/ChangeLog
deleted file mode 100644
index 4ac3bcfce9..0000000000
--- a/plugins/startup-wizard/ChangeLog
+++ /dev/null
@@ -1,105 +0,0 @@
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #381132
-
-	* org-gnome-evolution-startup-wizard.eplug.xml:
-	* startup-wizard.c: (startup_wizard_timezone_page),
-	(startup_wizard_commit), (startup_wizard_abort):
-	Do not setup timezone, set a system timezone instead.
-
-2009-01-21  Milan Crha  <mcrha@redhat.com>
-
-	* Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS.
-
-2008-09-19  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* startup-wizard.c:
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #529460
-
-	* org-gnome-evolution-startup-wizard.eplug.xml:
-	Change "Startup Wizard" to "Setup Assistant".  Also make the
-	plugin description less lame.
-
-2008-06-02  Jacob Brown  <jeblinux@gmail.com>
-
-	** Fix for bug #529464
-
-	* org-gnome-evolution-startup-wizard.eplug.xml: Do not use "handle"
-
-2007-08-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am: Fix a distcheck error.
-
-2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #360240
-
-	* startup-wizard.c (startup_wizard_timezone_page):
-	Remove unused variable.
-
-2007-01-27  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* startup-wizard.c: (startup_wizard_timezone_page),
-	(startup_wizard_importer_page):
-	mark strings as translatable. See bug #399381 for details.
-
-2006-06-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* startup-wizard.c: (startup_wizard_timezone_page): Pass the default
-	timezone as NULL, so that it picks up from the local timezone.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* evolution/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml:
- 	 Fixing several typos and harmonizing
-	 capital/small letters. Partially fixes bug 306117.
-
-2005-07-13 Harish Krishnaswamy <kharish@novell.com>
-
-	* Makefile.am : remove the reference to 
-	shell/importer/libevolution-importer.la
-	
-2005-07-13  Not Zed  <NotZed@Ximian.com>
-
-	* startup-wizard.c (startup_wizard_importer_page)
-	(startup_wizard_commit): re-write the importer stuff to use the
-	eplugin stuff.
-
-2005-07-12  Not Zed  <NotZed@Ximian.com>
-
-	* startup-wizard.c: removed all the importer stuff.  fixed the
-	copyright.
-
-2005-07-06  Frederic Crozat  <fcrozat@mandriva.com>
-
-	* startup-wizard.c: (startup_wizard_delete), (startup_wizard):
-	Exit evolution when closing wizard using window manager
-	control ; don't set hint or wmclass, it is too late, window is already
-	realized.
-
-2005-06-27  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* org-gnome-evolution-startup-wizard.eplug.xml: Use SOEXT.
-
-2005-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: added built_sources/cleanfiles
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: 
-	* org-gnome-evolution-startup-wizard.eplug.xml: s/.in/.xml/ & i18n.
-
-2005-02-21  JP Rosevear  <jpr@novell.com>
-
-	* startup-wizard.c: A plugin the does the startup wizard
-
diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c
index f6e5dcc34e..904e630487 100644
--- a/plugins/startup-wizard/startup-wizard.c
+++ b/plugins/startup-wizard/startup-wizard.c
@@ -34,6 +34,7 @@
 
 #include "capplet/settings/mail-capplet-shell.h"
 
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
 void startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target);
 GtkWidget *startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
 gboolean startup_wizard_check (EPlugin *ep, EConfigHookPageCheckData *check_data);
@@ -46,6 +47,12 @@ static EImportImporter *import_importer;
 static GtkWidget *import_dialog, *import_progress, *import_label;
 static GSList *import_iterator, *import_importers;
 
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
+
 G_GNUC_NORETURN static void
 startup_wizard_terminate (void) {
 	gtk_main_quit ();
@@ -237,6 +244,7 @@ startup_wizard_commit (EPlugin *ep, EMConfigTargetAccount *target)
 {
 	EShell *shell;
 	EShellSettings *shell_settings;
+	GtkWidget *content_area;
 	gchar *location;
 
 	shell = e_shell_get_default ();
@@ -254,15 +262,27 @@ startup_wizard_commit (EPlugin *ep, EMConfigTargetAccount *target)
 		import_iterator = import_importers;
 		import_importer = import_iterator->data;
 
-		import_dialog = e_alert_dialog_new_for_args (e_shell_get_active_window (shell), "shell:importing", _("Importing data."), NULL);
-		g_signal_connect(import_dialog, "response", G_CALLBACK(import_dialog_response), NULL);
+		import_dialog = e_alert_dialog_new_for_args (
+			e_shell_get_active_window (shell),
+			"shell:importing", _("Importing data."), NULL);
+		content_area = gtk_dialog_get_content_area (
+			GTK_DIALOG (import_dialog));
+		g_signal_connect (
+			import_dialog, "response",
+			G_CALLBACK (import_dialog_response), NULL);
 		import_label = gtk_label_new(_("Please wait"));
 		import_progress = gtk_progress_bar_new();
-		gtk_box_pack_start(GTK_BOX(((GtkDialog *)import_dialog)->vbox), import_label, FALSE, FALSE, 0);
-		gtk_box_pack_start(GTK_BOX(((GtkDialog *)import_dialog)->vbox), import_progress, FALSE, FALSE, 0);
+		gtk_box_pack_start (
+			GTK_BOX (content_area),
+			import_label, FALSE, FALSE, 0);
+		gtk_box_pack_start (
+			GTK_BOX (content_area),
+			import_progress, FALSE, FALSE, 0);
 		gtk_widget_show_all(import_dialog);
 
-		e_import_import(import, (EImportTarget *)import_target, import_importer, import_status, import_done, NULL);
+		e_import_import (
+			import, (EImportTarget *) import_target,
+			import_importer, import_status, import_done, NULL);
 	} else {
 		gtk_main_quit();
 	}
diff --git a/plugins/subject-thread/ChangeLog b/plugins/subject-thread/ChangeLog
deleted file mode 100644
index dbf730b10b..0000000000
--- a/plugins/subject-thread/ChangeLog
+++ /dev/null
@@ -1,68 +0,0 @@
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* subject-thread.c:
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
-	dlls on Windows.
-
-2007-07-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #428123 from Lucky
-
-	* subject-thread.c: (org_gnome_subject_thread_factory):
-
-2007-04-02  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
-
-	* org-gnome-subject-thread.eplug.xml:
-	Cleanup. 
-	Fixes part of #301149
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2005-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: setup built_sources/cleanfiles
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: 
-
-	* org-gnome-subject-thread.eplug.xml: s/.in/.xml/ & i18n.
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-subject-thread.eplug.in: Added xml tag. 
-	Fixed description and added author. 
-
-2005-02-07  JP Rosevear  <jpr@novell.com>
-
-	* org-gnome-subject-thread.eplug.in: specify id
-
-2004-11-01  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: dist .eplug.in file
-
-2004-10-20  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (INCLUDES): removed camel from include path,
-	everything should include camel/foo.
-
-2004-10-20  JP Rosevear  <jpr@novell.com>
-
-	* subject-thread.c: implement 
-
-	* org-gnome-subject-thread.eplug.in: define the
-	subject-thread plugin
-
-	* Makefile.am: build the subject thread plugin
-
diff --git a/plugins/subject-thread/subject-thread.c b/plugins/subject-thread/subject-thread.c
index 6c008c71ae..26012d3461 100644
--- a/plugins/subject-thread/subject-thread.c
+++ b/plugins/subject-thread/subject-thread.c
@@ -36,6 +36,13 @@
 #define GCONF_KEY "/apps/evolution/mail/display/thread_subject"
 
 GtkWidget *org_gnome_subject_thread_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
 
 static void
 toggled_cb (GtkWidget *widget, EConfig *config)
diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog
deleted file mode 100644
index 789f58de0b..0000000000
--- a/plugins/templates/ChangeLog
+++ /dev/null
@@ -1,49 +0,0 @@
-2008-10-15  Bharath Acharya  <abharath@novell.com>
-
-	** Fix for bug #556284
-
-	* templates.c: (reply_with_template), (org_gnome_templates_popup),
-	(action_template_cb): Fixes for fetching the store using 
-	mail_component_peek_local_store. Fixes the right-click crash issues 
-	caused on OS_WIN32 by Templates plugin.
-
-2008-09-15  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* plugins/templates/templates.c:
-
-2008-09-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* templates.c:
-	Don't mix declarations and code.
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Have a check for OS_WIN32 and handle the schema data 
-	differently. make install error on win32.
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
-	dlls on Windows.
-
-2008-07-21  Johnny Jacob  <jjohnny@novell.com>
-
-	* templates.c: Remove unused header files.
-
-	* Makefile.am (INCLUDES): Allow includes from top_builddir.
-
-2008-07-18  Bharath Acharya  <abharath@novell.com>
-
-	** Fixes Bug #200147
-
-	Basic functionality implemented by Diego Escalante Urrelo 
-	<diegoe@gnome.org> Everyone owes him a big mug of Beer for that.
-
-	** Added Templates plugin
-	* Makefile.am:
-	* apps-evolution-template-placeholders.schemas.in:
-	* org-gnome-templates.eplug.xml:
-	* templates.c: 
-	* templates.glade:
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index b88e26d29d..74e167a9fe 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -30,10 +30,6 @@
 #include <gconf/gconf-client.h>
 
 #include <e-util/e-config.h>
-#include <camel/camel-url.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-string-utils.h>
 
 #include <mail/e-mail-local.h>
 #include <mail/e-mail-reader.h>
@@ -389,17 +385,17 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	clue_add = gtk_button_new_from_stock ("gtk-add");
 	gtk_widget_show (clue_add);
 	gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_add);
-	GTK_WIDGET_SET_FLAGS (clue_add, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default (clue_add, TRUE);
 
 	clue_edit = gtk_button_new_from_stock ("gtk-edit");
 	gtk_widget_show (clue_edit);
 	gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_edit);
-	GTK_WIDGET_SET_FLAGS (clue_edit, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default (clue_edit, TRUE);
 
 	clue_remove = gtk_button_new_from_stock ("gtk-remove");
 	gtk_widget_show (clue_remove);
 	gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_remove);
-	GTK_WIDGET_SET_FLAGS (clue_remove, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default (clue_remove, TRUE);
 
 	ui->gconf = gconf_client_get_default ();
 
@@ -490,7 +486,7 @@ create_new_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *mes
 	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (template), mem);
 	camel_stream_reset (mem);
 	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (new), mem);
-	camel_object_unref (mem);
+	g_object_unref (mem);
 
 	/* Add the headers from the message we are replying to, so CC and that
 	 * stuff is preserved. */
@@ -518,7 +514,7 @@ create_new_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *mes
 	/* Create the composer */
 	em_utils_edit_message (new, folder);
 
-	camel_object_unref(new);
+	g_object_unref (new);
 }
 
 static void
@@ -558,22 +554,24 @@ build_template_menus_recurse (GtkUIManager *ui_manager,
 		GPtrArray *uids;
 		GtkAction *action;
 		const gchar *action_label;
+		const gchar *folder_name;
 		gchar *action_name;
 		gchar *path;
 		guint ii;
 
 		folder = camel_store_get_folder (
 			store, folder_info->full_name, 0, NULL);
+		folder_name = camel_folder_get_name (folder);
 
 		action_name = g_strdup_printf (
 			"templates-menu-%d", *action_count);
 		*action_count = *action_count + 1;
 
 		/* To avoid having a Templates dir, we ignore the top level */
-		if (g_str_has_suffix (folder->name, "Templates"))
+		if (g_str_has_suffix (folder_name, "Templates"))
 			action_label = _("Templates");
 		else
-			action_label = folder->name;
+			action_label = folder_name;
 
 		action = gtk_action_new (
 			action_name, action_label, NULL, NULL);
@@ -609,7 +607,7 @@ build_template_menus_recurse (GtkUIManager *ui_manager,
 				continue;
 
 			template = camel_folder_get_message (folder, uid, NULL);
-			camel_object_ref (template);
+			g_object_ref (template);
 
 			action_label =
 				camel_mime_message_get_subject (template);
@@ -624,7 +622,7 @@ build_template_menus_recurse (GtkUIManager *ui_manager,
 				action_name, action_label, NULL, NULL);
 
 			muid = camel_pstring_strdup (message_uid);
-			camel_object_ref (message_folder);
+			g_object_ref (message_folder);
 
 			g_object_set_data_full (
 				G_OBJECT (action), "message_uid", (gpointer) muid,
@@ -632,11 +630,11 @@ build_template_menus_recurse (GtkUIManager *ui_manager,
 
 			g_object_set_data_full (
 				G_OBJECT (action), "message_folder", message_folder,
-				(GDestroyNotify) camel_object_unref);
+				(GDestroyNotify) g_object_unref);
 
 			g_object_set_data_full (
 				G_OBJECT (action), "template", template,
-				(GDestroyNotify) camel_object_unref);
+				(GDestroyNotify) g_object_unref);
 
 			g_signal_connect (
 				action, "activate",
@@ -704,6 +702,7 @@ update_actions_cb (EShellView *shell_view)
 	CamelStore *store;
 	EMailReader *reader;
 	GPtrArray *uids;
+	const gchar *full_name;
 	guint action_count = 0;
 	guint merge_id;
 	gpointer data;
@@ -734,9 +733,10 @@ update_actions_cb (EShellView *shell_view)
 
 	store = e_mail_local_get_store ();
 	templates_folder = e_mail_local_get_folder (E_MAIL_FOLDER_TEMPLATES);
+	full_name = camel_folder_get_full_name (templates_folder);
 
 	folder_info = camel_store_get_folder_info (
-		store, templates_folder->full_name,
+		store, full_name,
 		CAMEL_STORE_FOLDER_INFO_RECURSIVE |
 		CAMEL_STORE_FOLDER_INFO_FAST, NULL);
 
diff --git a/plugins/tnef-attachments/ChangeLog b/plugins/tnef-attachments/ChangeLog
deleted file mode 100644
index b90faf0bf8..0000000000
--- a/plugins/tnef-attachments/ChangeLog
+++ /dev/null
@@ -1,74 +0,0 @@
-2009-01-28  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use -no-undefined and link with more libraries on
-	Windows.
-
-	* tnef-plugin.c: Remove unused <sys/wait.h>.
-
-2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fixes bug #553479
-
-	* org-gnome-tnef-attachments.eplug.xml: String capitalisation
-	improvements.
-
-2008-09-03  Sankar P  <psankar@novell.com>
-
-	* plugins/tnef-attachments/tnef-plugin.c:
-	Assign copyrights to Randall Hand.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* tnef-plugin.c:
-
-2008-03-31  Frederic Crozat  <fcrozat@mandriva.com>
-
-	** Fix for bug #501885
-
-	* Makefile.am: Specify locale directory correctly.
-
-2008-03-17  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #519421
-
-	* Makefile.am:
-	* tnef-plugin.c: Also allow <libytnef/tnef.h> header file.
-
-2008-02-07  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #514736
-
-	* org-gnome-tnef-attachments.eplug.xml: Added 'application/ms-tnef' 
-	MIME type for TNEF attachment decoding. 
-
-2008-02-07  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #514771
-
-	* tnef-plugin.c: (saveVCalendar): Fixed a crasher while decoding 
-	TNEF attachments. 
-
-2007-08-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* tnef-plugin.c: (e_plugin_lib_enable): Avoid reentrancy in enable.
-
-2007-07-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* org-gnome-tnef-attachments.eplug.xml:	Fixed bugs where the .so wasn't 
-	reffered rightly.
-
-2007-07-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Cleanups from Lucky Wankhede 
-
-	* org-gnome-tnef-attachments.eplug.xml:
-	* tnef-plugin.c: (org_gnome_format_tnef), (processTnef),
-	(saveVCard), (printRrule), (saveVCalendar), (saveVTask),
-	(fprintProperty), (fprintUserProp):
-
-2007-06-07 Lucky Wankhede <wlakke@novell.com>
-	* New implementation for tnef
-	* For reading "winmail.dat" kind of attachements
-	* using libytnef
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index 074ec635fb..8bb5341998 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -40,12 +40,6 @@
 #include <libytnef/ytnef.h>
 #endif
 
-#include <camel/camel-mime-part.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-fs.h>
-
 #include <em-format/em-format.h>
 #include <mail/em-format-hook.h>
 #include <mail/em-utils.h>
@@ -95,15 +89,15 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
 	out = camel_stream_fs_new_with_name(name, O_RDWR|O_CREAT, 0666);
 	if (out == NULL)
 	    goto fail;
-	content = camel_medium_get_content_object((CamelMedium *)t->part);
+	content = camel_medium_get_content ((CamelMedium *)t->part);
 	if (content == NULL)
 		goto fail;
 	if (camel_data_wrapper_decode_to_stream(content, out) == -1
 	    || camel_stream_close(out) == -1) {
-		camel_object_unref(out);
+		g_object_unref (out);
 		goto fail;
 	}
-	camel_object_unref(out);
+	g_object_unref (out);
 
 	/* Extracting the winmail.dat */
         TNEFInitialize(&tnef);
@@ -126,7 +120,7 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
 	camel_data_wrapper_set_mime_type((CamelDataWrapper *)mp, "multipart/mixed");
 	camel_multipart_set_boundary(mp, NULL);
 
-	camel_medium_set_content_object((CamelMedium *)mainpart, (CamelDataWrapper *)mp);
+	camel_medium_set_content ((CamelMedium *)mainpart, (CamelDataWrapper *)mp);
 
 	while ((d = readdir(dir))) {
 		CamelMimePart *part;
@@ -145,13 +139,13 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
 		stream = camel_stream_fs_new_with_name(path, O_RDONLY, 0);
 		content = camel_data_wrapper_new();
 		camel_data_wrapper_construct_from_stream(content, stream);
-		camel_object_unref(stream);
+		g_object_unref (stream);
 
 		part = camel_mime_part_new();
 		camel_mime_part_set_encoding(part, CAMEL_TRANSFER_ENCODING_BINARY);
 
-		camel_medium_set_content_object((CamelMedium *)part, content);
-		camel_object_unref(content);
+		camel_medium_set_content ((CamelMedium *)part, content);
+		g_object_unref (content);
 
 		type = em_format_snoop_type(part);
 		if (type)
@@ -162,7 +156,7 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
 		g_free(path);
 
 		camel_multipart_add_part(mp, part);
-		camel_object_unref(part);
+		g_object_unref (part);
 	}
 
 	closedir(dir);
@@ -173,17 +167,17 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
 	if (camel_multipart_get_number(mp) > 0)
 		em_format_part_as(t->format, t->stream, mainpart, "multipart/mixed");
 	else if (t->item->handler.old)
-	    t->item->handler.old->handler(t->format, t->stream, t->part, t->item->handler.old);
+	    t->item->handler.old->handler(t->format, t->stream, t->part, t->item->handler.old, FALSE);
 
 	g_string_truncate(t->format->part_id, len);
 
-	camel_object_unref(mp);
-	camel_object_unref(mainpart);
+	g_object_unref (mp);
+	g_object_unref (mainpart);
 
 	goto ok;
  fail:
 	if (t->item->handler.old)
-	    t->item->handler.old->handler(t->format, t->stream, t->part, t->item->handler.old);
+	    t->item->handler.old->handler(t->format, t->stream, t->part, t->item->handler.old, FALSE);
  ok:
 	g_free(name);
 	g_free(tmpdir);
@@ -333,10 +327,10 @@ void processTnef(TNEFStruct *tnef, const gchar *tmpdir) {
                 /* Ok, it's not an embedded stream, so now we */
 		/* process it. */
                 if ((filename = MAPIFindProperty(&(p->MAPI),
-                                        PROP_TAG(30,0x3707)))
+                                        PROP_TAG(PT_STRING8, PR_ATTACH_LONG_FILENAME)))
                         == MAPI_UNDEFINED) {
                     if ((filename = MAPIFindProperty(&(p->MAPI),
-                                        PROP_TAG(30,0x3001)))
+                                        PROP_TAG(PT_STRING8, PR_DISPLAY_NAME)))
                             == MAPI_UNDEFINED) {
                         filename = &(p->Title);
                     }
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index 0aafc8c82d..0b7756211f 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -24,9 +24,6 @@
 #include <glib/gi18n-lib.h>
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-stream-mem.h>
 #include <gtkhtml/gtkhtml-embedded.h>
 
 #include "addressbook/gui/merging/eab-contact-merging.h"
@@ -52,6 +49,13 @@ static gint org_gnome_vcard_inline_classid;
 
 /* Forward Declarations */
 void org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target);
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+	return 0;
+}
 
 static void
 org_gnome_vcard_inline_pobject_free (EMFormatHTMLPObject *object)
@@ -94,7 +98,7 @@ org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object,
 
 	/* Stream takes ownership of the byte array. */
 	stream = camel_stream_mem_new_with_byte_array (array);
-	data_wrapper = camel_medium_get_content_object (medium);
+	data_wrapper = camel_medium_get_content (medium);
 	camel_data_wrapper_decode_to_stream (data_wrapper, stream);
 
 	/* because the result is not NULL-terminated */
@@ -104,8 +108,8 @@ org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object,
 	contact_list = eab_contact_list_from_string (string);
 	vcard_object->contact_list = contact_list;
 
-	camel_object_unref (mime_part);
-	camel_object_unref (stream);
+	g_object_unref (mime_part);
+	g_object_unref (stream);
 }
 
 static void
@@ -280,7 +284,7 @@ org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target)
 			classid, target->part,
 			org_gnome_vcard_inline_embed);
 
-	camel_object_ref (target->part);
+	g_object_ref (target->part);
 
 	vcard_object->object.free = org_gnome_vcard_inline_pobject_free;
 	org_gnome_vcard_inline_decode (vcard_object, target->part);
diff --git a/plugins/webdav-account-setup/ChangeLog b/plugins/webdav-account-setup/ChangeLog
deleted file mode 100644
index ce72e9c671..0000000000
--- a/plugins/webdav-account-setup/ChangeLog
+++ /dev/null
@@ -1,55 +0,0 @@
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #569652
-
-	* webdav-contacts-source.c: (find_webdav_group): Removed.
-	* webdav-contacts-source.c: (ensure_webdav_contacts_source_group),
-	(remove_webdav_contacts_source_group):
-	Use new ESourceList API (simplifies code).
-
-2009-02-26  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #572950
-
-	* Makefile.am:
-	Fix ordering of -I compiler directives.  Patch by Daniel Macks.
-
-2009-02-25  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #559719
-
-	* webdav-contacts-source.c: (destroy_ui_data),
-	(plugin_webdav_contacts): Use it's own/unique name for the property
-	on the 'epl' and free the widget only if it wasn't freed yet.
-
-2009-01-29  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #539467
-
-	* webdav-contacts-source.c: (find_webdav_group),
-	(ensure_webdav_contacts_source_group),
-	(remove_webdav_contacts_source_group):
-	Find group by its base uri, not by a localized name.
-
-2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fixes bug #553479
-
-	* webdav-contacts-source.c (plugin_webdav_contacts):
-	String capitalisation improvements.
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am:	Added necessary libraries to link to. Build break while 
-	compiling on Windows. Added a ChangeLog file for webdav-account-setup 
-	plugin.
-
-2008-08-04  Matthias Braun <matze@braunis.de>
-
-	** Fix for bug #544051
-
-	** Added WebDAV plugin
-	* Makefile.am:
-	* org-gnome-evolution-webdav.eplug.xml:
-	* webdav-contacts-source.c:
-	WebDAV backend for addressbook - GUI plugin for account setup.
diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c
index 9f35d0bd54..8d822e6c9e 100644
--- a/plugins/webdav-account-setup/webdav-contacts-source.c
+++ b/plugins/webdav-account-setup/webdav-contacts-source.c
@@ -212,6 +212,7 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data)
 	GtkWidget    *label;
 
 	ui_data      *uidata;
+	gchar        *buff;
 
 	source = t->source;
 
@@ -232,7 +233,9 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0);
 
 	section = gtk_label_new(NULL);
-	gtk_label_set_markup(GTK_LABEL(section), _("<b>Server</b>"));
+	buff = g_strconcat ("<b>", _("Server"), "</b>", NULL);
+	gtk_label_set_markup(GTK_LABEL(section), buff);
+	g_free (buff);
 	gtk_misc_set_alignment(GTK_MISC(section), 0.0, 0.0);
 	gtk_box_pack_start(GTK_BOX(vbox2), section, FALSE, FALSE, 0);
 
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index f87dff2d85..0000000000
--- a/po/ChangeLog
+++ /dev/null
@@ -1,11610 +0,0 @@
-2010-04-17  Funda Wang  <fundawang@gmail.com>
-
-	* zh_CN.po: Updated zh_CN translation.
-
-2010-02-21  Nils-Christoph Fiedler <fiedler@medienkompanie.de>
-
-	* nds.po: Added LowGerman Translation
-	* LINGUAS: Added LowGerman Translation
-
-2009-06-04  Manoj Kumar Giri <mgiri@redhat.com>
-
-	* or.po: Updated Oriya Translation
-
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #340783
-
-	* POTFILES.in: Added plugins/publish-calendar/publish-format-fb.c
-	and plugins/publish-calendar/publish-format-ical.c there.
-
-2009-04-15  Gil Forcada  <gforcada@gnome.org>
-
-	* ca.po: Fixed bug #574842.
-
-2009-04-14  Khaled Hosny <khaledhosny@eglug.org>
-
-	* ar.po: Don't translate gconf key values, fixes #569507.
-
-2009-04-13  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2009-04-12  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2009-04-10 Baris Cicek <baris@teamforce.name.tr>
-
-	* tr.po: Updated Turkish translation
-	
-2009-04-10  Goran Rakic  <grakic@devbase.net>
-
-	* sr.po, sr@latin.po: Updated Serbian translation (by Miloš Popović).
-
-2009-04-09  Shankar Prasad  <svenkate@redhat.com>
-
-        * kn.po: Updated Kannada translation
-
-2009-04-07  Philip Withnall  <philip@tecnocode.co.uk>
-
-	* en_GB.po: Fix for British English date formats by Bruce Cowan
-	<bcowan@fastmail.co.uk>.
-
-2009-04-04  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-03-30  Manioj Kumar Giri  <mgiri@redhat.com>
-
-	* or.po: Updated Oriya Translation
-
-2009-03-27  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Mattias Põldaru
-
-2009-03-25  Shankar Prasad  <svenkate@redhat.com>
-
-        * kn.po: Updated few correction to Kannada translations.
-
-2009-03-22  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-03-21  Claude Paroz  <claude@2xlibre.net>
-
-	* fr.po: Typo fixed in French translation.
-
-2009-03-21  Takeshi AIHANA <takeshi.aihana@gmail.com>
-
-	* ja.po: Fixed wrong translation.
-
-2009-03-19  Manoj Kumar Giri  <mgiri@redhat.com>
-
-	* or.po: Updated Oriya Translation.
-
-2009-03-18  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic translation by Osama Khalid.
-
-2009-03-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2009-03-16  Baris Cicek <baris@teamforce.name.tr>
-
-	* tr.po: Updated Turkish translation.
-
-2009-03-16  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2009-03-16  Amitakhya Phukan <amitakhya@svn.gnome.org>
-
-	* as.po: Updated Assamese translations.
-
-2009-03-16  Ankitkumar Patel  <ankit@redhat.com>
-
-	* gu.po: Updated Gujarati Translations.
-
-2009-03-16  Manoj Kumar Giri  <mgiri@redhat.com>
-
-	* or.po: Updated Oriya Translation.
-
-2009-03-16  Manoj Kumar Giri  <mgiri@redhat.com>
-
-	* or.po: Updated Oriya Translation.
-
-2009-03-16  Dwayne Bailey  <dwayne@translate.org.za>
-
-	* af.po: Fix msgfmt errors
-
-2009-03-15  Andre Klapper  <a9016009@gmx.de>
-
-	* af.po: Added Afrikaans translation by Friedel Wolff.
-	Fixes bug #575466.
-	* LINGUAS: Added af.
-
-2009-03-15  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2009-03-15  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, fix #574975.
-
-2009-03-15  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* ru.po: Updated Russian translation by Yuriy Penkin.
-
-2009-03-15  Ani Peter  <apeter@redhat.com>
-
-	* ml.po: Updated Malayalam Translations
-
-2009-03-15  Rajesh Ranjan  <rajeshkajha@yahoo.com>
-
-	* mai.po: added Maithili translation.
-	* LINGUAS: Added Maithili (mai) to the list of Languages.
-
-2009-03-15  Sandeep Shedmake  <sshedmak@redhat.com>
-
-	* mr.po: Updated Marathi Translations.
-
-2009-03-15  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated Greek Translation by Jennie Petoumenou.
-
-2009-03-14  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2009-03-14  Manoj Kumar Giri  <mgiri@redhat.com>
-
-	* or.po: Updated Oriya Translation.
-
-2009-03-14  Andre Klapper  <a9016009@gmx.de>
-
-	* cs.po: Updated Czech translation by Jiri Eischmann.
-
-2009-03-14  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Priit Laes
-
-2009-03-14  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2009-03-14  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-	
-2009-03-14  Claude Paroz  <claude@2xlibre.net>
-
-	* fr.po: Fixed bug #567745.
-
-2009-03-13  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	 * gl.po: Updated Galician translation
-
-2009-03-13  Manoj Kumar Giri  <mgiri@redhat.com>
-
-	* or.po: Updated Oriya Translation.
-
-2009-03-13  I. Felix <ifelix@redhat.com>
-
-	* ta.po:  Tamil Translation updated
-
-2009-03-13  Rajesh Ranjan <rranjan@redhat.com>
-
-	* hi.po: Updated Hindi Translation.
-
-2009-03-13  Ani Peter  <apeter@redhat.com>
-
-	* ml.po: Updated Malayalam Translations
-
-2009-03-12  Wadim Dziedzic  <wdziedzic@aviary.pl>
-
-	* pl.po: Updated Polish translation and fixed bug #569514
-
-2009-03-13  Rajesh Ranjan <rranjan@redhat.com>
-
-	* hi.po: Updated Hindi Translation.
-
-2009-03-13  Runa Bhattacharjee  <runab@redhat.com>
-
-	* bn_IN.po: Updated partial Bengali India translation
-
-2009-03-12  Manoj Kumar Giri  <mgiri@redhat.com>
-
-	* or.po: Updated Oriya Translation
-
-2009-03-11  Goran Rakic  <grakic@devbase.net>
-
-	* sr.po, sr@latin.po: Updated Serbian translation wrt #574841.
-
-2009-03-11  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2009-03-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-03-10  Ankitkumar Patel  <ankit@redhat.com>
-
-	* gu.po: Updated Gujarati Translations.
-
-2009-03-10  Rajesh Ranjan <rranjan@redhat.com>
-
-	* hi.po: Updated Hindi Translation.
-	
-2009-03-09  Manoj Kumar Giri  <mgiri@redhat.com>
-
-	* or.po: Updated Oriya Translation
-
-2009-03-09  Wouter Bolsterlee  <wbolster@svn.gnome.org>
-
-	* nl.po: Updated Dutch translation by Tino Meinen.
-
-2009-03-08  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated Greek Translation by Jennie Petoumenou.
-
-2009-03-08  Philip Withnall  <philip@tecnocode.co.uk>
-
-	* en_GB.po: Updated British English translation.
-
-2009-03-08  Takeshi AIHANA <takeshi.aihana@gmail.com>
-
-	* ja.po: Fixed wrong translations.
-
-2009-03-08  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2009-03-07  Mișu Moldovan <dumol@gnome.ro>
-
-	* ro.po: Updated Romanian translation by Adi Roiban
-
-2009-03-05  Krishnababu K <kkrothap@redhat.com>
-
-	* te.po: Updated Telugu Translation.
-
-2009-03-05  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2009-03-04  Manoj Kumar Giri  <mgiri@redhat.com>
-
-	* or.po: Updated Oriya Translation.
-
-2009-03-03  Milo Casagrande  <milo@ubuntu.com>
-
-	* it.po: Updated Italian translation
-
-2009-03-03  Gil Forcada  <gforcada@gnome.org>
-
-	* ca.po: Minor fix to Catalan translation.
-
-2009-03-03  Shankar Prasad  <svenkate@redhat.com>
-
-	* kn.po: Updated Kannada translations.
-
-2009-03-03  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2009-03-02  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2009-03-02  Manoj Kumar Giri  <mgiri@redhat.com>
-
-	* or.po: Updated Oriya Translation.
-
-2009-03-02  Sweta Kothari  <swkothar@redhat.com>
-
-	* gu.po: Committed Gujarati Translation.
-
-2009-03-01  Wouter Bolsterlee  <wbolster@svn.gnome.org>
-
-	* nl.po: Updated Dutch translation by Wouter Bolsterlee.
-
-2009-03-01  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2009-03-01  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Mattias Põldaru
-
-2009-03-01  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2009-03-01  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2009-02-23  Philip Withnall  <philip@tecnocode.co.uk>
-
-	* en_GB.po: Updated British English translation.
-
-2009-02-23  Gil Forcada  <gforcada@gnome.org>
-
-	* ca.po: Updated Catalan translation by David Planella.
-
-2009-02-20  Claude Paroz  <claude@2xlibre.net>
-
-	* fr.po: Updated French translation by Bruno Brouard and Claude Paroz.
-
-2009-02-20  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2009-02-19  Ihar Hrachyshka <booxter@lacinka.org>
-
-	* be@latin.po: Updated Belarusian Latin translation by Ihar
-	Hrachyshka.
-
-2009-02-18  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2009-02-18  Ihar Hrachyshka <booxter@lacinka.org>
-
-	* be@latin.po: Updated Belarusian Latin translation by Ihar
-	Hrachyshka.
-
-2009-02-18  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2009-02-17  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).
-
-2009-02-17  Takeshi AIHANA <takeshi.aihana@gmail.com>
-
-	* ja.po: Updated Japanese translation.
-
-2009-02-16  Simos Xenitellis  <simos@gnome.org>
-
-	* el.po: Updated Greek translation (Marios Zindilis),
-	closes bug 571886, bug 569519.
-
-2009-02-16  Sweta Kothari  <swkothar@redhat.com>
-
-	* gu.po: Committed Gujarati Translation.
-
-2009-02-15 Kenneth Nielsen <k.nielsen81@gmail.com>
-
-	* da.po: Updated Danish translation by Kenneth Nielsen
-
-2009-02-15  Petr Kovar  <pknbe@volny.cz>
-
-	* cs.po: Updated Czech translation by Jiri Eischmann.
-
-2009-02-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-02-14  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2009-02-12  Sweta Kothari  <swkothar@redhat.com>
-
-	* gu.po: Committed Gujarati Translation.
-
-2009-02-12  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2009-02-11  Jonh Wendell  <jwendell@gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation by Andre Gondim.
-
-2009-02-10  Ilkka Tuohela <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2009-02-09  Gil Forcada  <gforcada@gnome.org>
-
-	* ca.po: Updated Catalan translation by David Planella.
-
-2009-02-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2009-02-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-02-06    Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po    Updated Vietnamese translation
-
-2009-02-05  Sweta Kothari  <swkothar@redhat.com>
-
-	* gu.po: Committed Gujarati Translation.
-
-2009-02-04  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).
-
-2009-02-03  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-01-31  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2009-01-31  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2009-01-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-01-30  Nguyễn Thái Ng�c Duy <pclouds@gmail.com>
-
-	* vi.po: Don't translate the gconf keys, #569508
-
-2009-01-30  Ilkka Tuohela <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2009-01-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Don't translate the gconf keys. Closes
-	bug #569528
-
-2009-01-29  Jonh Wendell  <jwendell@gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2009-01-29  Ilkka Tuohela <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2009-01-29  Bharath Acharya  <abharath@novell.com>
-
-	* POTFILES.in: Added plugins/pst-import/pst-importer.c
-
-2009-01-29  Raivis Dejus  <orvils@gmail.com>
-
-	* lv.po: Updated latvian translation Bug 569534
-
-2009-01-29  I. Felix <ifelix@redhat.com>
-
-	* ta.po:  Bug fix for #569517.
-
-2009-01-29  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Bug fix for #569526.
-
-2009-01-28  Goran Rakić  <grakic@devbase.net>
-
-	* sr.po, sr@latin.po: Updated Serbian Translations (by Miloš Popović).
-
-2009-01-29  Funda Wang  <fundawang@gmail.com>
-
-	* zh_CN.po: Updated zh_CN translation.
-
-2009-01-28  Ilkka Tuohela <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2009-01-24  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2009-01-24  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2009-01-23  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2009-01-22  Wadim Dziedzic  <wdziedzic@aviary.pl>
-
-	* pl.po: Fixed bug 567778 in Polish translation
-
-2009-01-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-01-19  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translaion.
-
-2009-01-18 Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* ru.po: Updated Russian translation.
-
-2009-01-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-01-16  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, fix #566570.
-
-2009-01-16  Gil Forcada  <gforcada@gnome.org>
-
-	* ca.po: Updated Catalan translation by David Planella.
-
-2009-01-15  Bharath Acharya  <abharath@novell.com>
-
-	* POTFILES.in: Added plugins/pst-import/org-gnome-pst-import.eplug.xml
-
-2009-01-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-01-14  Wadim Dziedzic  <wdziedzic@aviary.pl>
-
-	* pl.po: Updated Polish translation
-
-2009-01-12  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2009-01-11  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-01-11  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2009-01-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-01-07  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-01-05  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2009-01-04  Raivis Dejus  <orvils@gmail.com>
-
-	* lv.po: Updated latvian translation
-
-2009-01-02  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2009-01-01  Yannig Marchegay  <yannig@marchegay.org>
-
-	* oc.po: Updated Occitan translation
-
-2009-01-01  Andre Klapper  <a9016009@gmx.de>
-
-	* POTFILES.in: Fix my last commit so l10n.gnome.org is happy.
-
-2008-12-30  Andre Klapper  <a9016009@gmx.de>
-
-	* POTFILES.in: add missing file (cf. bug #359010)
-
-2008-12-28  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Updated Slovak translation.
-
-2008-12-21  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
-
-	* pt_BR.po: Fixed terminology in the Brazilian Portuguese translation.
-
-2008-12-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2008-12-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2008-12-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Remove deleted file.
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-12-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* POTFILES.in: Add e-utils/*intrusive*.[ch]
-
-2008-12-13  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
-
-	* pt_BR.po: Merged from branch gnome-2-24 minor fixes to the Brazilian
-	Portuguese translation.
-
-2008-12-09  Ilkka Tuohela <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2008-11-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2008-11-16  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* ru.po: Updated Russian translation.
-
-2008-11-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2008-11-09  Petr Kovar  <pknbe@volny.cz>
-
-	* cs.po: Fixed Czech translation by Jiri Eischmann,
-	thanks to Kamil Paral.
-
-2008-11-08  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-11-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* POTFILES.in: Added addressbook/gui/component/autocompletion-config.c
-
-2008-11-03 Maxim Dziumanenko <dziumanenko@gmail.com>
-
-	* uk.po: Update Ukrainian translation.
-
-2008-11-03  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
-
-	* pt_BR.po: Merged Brazilian Portuguese translation from branch
-	gnome-2-24. Fixes capitalization, verb tense in descriptions, some
-	terminology errors, double spaces and random errors. Improves
-	access keys.
-
-2008-11-02  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2008-10-30 Kenneth Nielsen <k.nielsen81@gmail.com>
-
-	* da.po: Updated Danish translation by Kenneth Nielsen
-
-2008-10-25  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-10-24  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-10-24  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2008-10-23  Gil Forcada  <gforcada@gnome.org>
-
-	* LINGUAS: Added ast.
-	* ast.po: Added Asturian translation on behalf of Mikel González.
-
-2008-10-23  Philipp Kerling  <k.philipp@gmail.com>
-
-	** Fixes bug #557563
-
-	* de.po: Updated German translation (patch by Ronny Standke).
-
-2008-10-19  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2008-10-17  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Updated Slovak translation.
-
-2008-10-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-10-13  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #556191
-
-	* POTFILES.in: Remove org-gnome-mark-calendar-offline.eplug.xml
-
-2008-10-11  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
-
-	* pt_BR.po: Fixed typo in the Brazilian Portuguese translation.
-
-2008-10-11  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
-
-	* pt_BR.po: Merged from branch gnome-2-24.
-
-2008-10-11  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
-
-	* pt_BR.po: Fixed terminology in the Brazilian Portuguese translation.
-
-2008-10-11  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Updated Slovak translation.
-
-2008-10-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation, fixes bug #554832
-
-2008-10-04  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation.
-
-2008-10-04  Ilkka Tuohela <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2008-10-03  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Updated Slovak translation.
-
-2008-10-01 Og Maciel <ogmaciel@gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation by Og Maciel.
-
-2008-10-01  Robert-André Mauchin  <zebob.m@pengzone.org>
-
-	* fr.po: French translation update. Fixed #554548
-	thanks to Hanka Zalska from Sun.
-
-2008-10-01  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-09-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-09-30  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2008-09-30  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2008-09-29  Wouter Bolsterlee  <wbolster@svn.gnome.org>
-
-	* nl.po: Updated Dutch translation by Wouter Bolsterlee.
-
-2008-09-28  Goran Rakić  <grakic@devbase.net>
-
-	* sr.po, sr@latin.po: Updated Serbian Translations.
-
-2008-09-22  Praveen Arimbrathodiyil <pravi.a@gmail.com>
-
-	* ml.po: Malayalam translation updated by Hari Vishnu.
-
-2008-09-22  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-09-22  Runa Bhattacharjee  <runab@redhat.com>
-
-	* bn_IN.po: Updated Bengali India Translation
-
-2008-09-21  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* ru.po: Updated Russian translation.
-
-2008-09-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-09-21  Wadim Dziedzic  <wdziedzic@aviary.pl>
-
-	* pl.po: Updated Polish translation
-
-2008-09-21  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by OsamaKhalid.
-
-2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-	* hi.po: Updated Hindi Translation.
-
-2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-	* hi.po: Updated Hindi Translation.
-
-2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-	* hi.po: Updated Hindi Translation.
-
-2008-09-21  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2008-09-20 Kenneth Nielsen <k.nielsen81@gmail.com>
-
-	* da.po: Updated Danish translation by Kenneth Nielsen
-
-2008-09-20  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2008-09-20  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation by Fabrício Godoy,
-	Vladimir Melo and Leonardo Ferreira Fontenelle.
-
-2008-09-20  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian Translation.
-
-2008-09-20  Goran Rakić  <grakic@devbase.net>
-
-	* sr.po, sr@latin.po: Updated Serbian translation (by Igor Nestorović).
-
-2008-09-19  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2008-09-19  Simos Xenitellis  <simos@gnome.org>
-
-	* el.po: Updated Greek translation by Pierros Papadeas.
-
-2008-09-19  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated missing translations of msgctx strings.
-
-2008-09-19  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2008-09-18  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2008-09-18  I. Felix <ifelix@redhat.com>
-
-	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
-
-2008-09-18 Inaki Larrañaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2008-09-18  Ilkka Tuohela <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2008-09-18  Shankar Prasad  <svenkate@redhat.com>
-
-	* kn.po: Updated Kannada translation
-
-2008-09-18  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-
-2008-09-18  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Usama Akkad.
-
-2008-09-17  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Usama Akkad.
-
-2008-09-17  Petr Kovar  <pknbe@volny.cz>
-
-	* cs.po: Updated Czech translation by Jiri Eischmann.
-
-2008-09-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-09-17  Shankar Prasad  <svenkate@redhat.com>
-
-	* kn.po: Updated Kannada translation
-
-2008-09-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-09-16  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2008-09-16  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-09-15  Gil Forcada  <gforcada@gnome.org>
-
-	* ca.po: Updated Catalan translation by David Planella.
-
-2008-09-15  Petr Kovar  <pknbe@volny.cz>
-
-	* cs.po: Updated Czech translation by Jiri Eischmann.
-
-2008-09-15  Wouter Bolsterlee  <wbolster@svn.gnome.org>
-
-	* nl.po: Updated Dutch translation by Tino Meinen.
-
-2008-09-15  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Abou Manal.
-
-2008-09-15  Shankar Prasad  <svenkate@redhat.com>
-
-	* kn.po: Updated Kannada translation
-
-2008-09-14  Ilkka Tuohela <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2008-09-14  Sandeep Shedmake  <sshedmak@redhat.com>
-
-	* mr.po: Updated Marathi translations.
-
-2008-09-13  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2008-09-12  Baris Cicek  <baris@teamforce.name.tr>
-
-	* tr.po: Updated Turkish translation.
-
-2008-09-12  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2008-09-12  Philip Withnall  <philip@tecnocode.co.uk>
-
-	* en_GB.po: Updated British English translation.
-
-2008-09-12  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Fixed Portuguese terminology.
-
-2008-09-12  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2008-09-11  Runa Bhattacharjee  <runab@redhat.com>
-
-	* bn_IN.po: Updated Bengali India Translation
-
-2008-09-11  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2008-09-11  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-	* hi.po: Updated Hindi Translation.
-
-2008-09-11  Robert Sedak  <robert.sedak@sk.t-com.hr>
-
-	* hr.po: Updated Croatian translation.
-
-2008-09-11  Gil Forcada  <gforcada@gnme.org>
-
-	* ca.po: Updated Catalan translation by David Planella.
-
-2008-09-10  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Yavor Doganov <yavor@gnu.org>
-
-2008-09-10  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2008-09-09  Krishnababu K  <kkrothap@redhat.com>
-
-	* te.po: Updated Telugu Translation.
-
-2008-09-09  Pema Geyleg  <pema.geyleg@gmail.com>
-
-	* dz.po: Updated Dzongkha Translation
-
-2008-09-09  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2008-09-08  Robert Sedak  <robert.sedak@sk.t-com.hr>
-
-	* hr.po: Updated Croatian translation.
-
-2008-09-08  I. Felix <ifelix@redhat.com>
-
-	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
-
-2008-09-07  Robert Sedak  <robert.sedak@sk.t-com.hr>
-
-	* hr.po: Updated Croatian translation.
-
-2008-09-07  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2008-09-07  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2008-09-07  Funda Wang  <fundawang@gmail.com>
-
-	* zh_CN.po: Updated zh_CN translation.
-
-2008-09-07  Philip Withnall  <philip@tecnocode.co.uk>
-
-	* en_GB.po: Updated British English translation.
-
-2008-09-06  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2008-09-06  Claude Paroz  <claude@2xlibre.net>
-
-	* fr.po: Updated French translation.
-
-2008-09-05  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2008-09-05  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2008-09-05  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2008-09-03  Philip Withnall  <philip@tecnocode.co.uk>
-
-	* en_GB.po: Updated British English translation.
-
-2008-08-31  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-08-31  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-08-31  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation
-
-2008-08-31  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translaion by Mark Krapivner.
-
-2008-08-30  Claude Paroz  <claude@2xlibre.net>
-
-	* fr.po: Updated French translation by Yannick Tailliez and Bruno Brouard.
-
-2008-08-30  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2008-08-30  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation
-
-2008-08-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-08-30  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2008-08-29  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-08-29  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-08-28  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, fix #545473.
-
-2008-08-27  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-08-27  Ilkka Tuohela <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2008-08-25  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2008-08-25  Goran Rakic  <grakic@devbase.net>
-
-	* LINGUAS, sr@latin.po, sr@Latn.po: Conversion from sr@Latn to sr@latin.
-
-2008-08-25  Goran Rakić  <grakic@devbase.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation
-
-2008-08-22  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-08-22  Shankar Prasad  <svenkate@redhat.com>
-
-	* kn.po: Updated Kannada translation
-
-2008-08-22  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-
-2008-08-22  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2008-08-22  Åsmund Skjæveland  <aasmunds@ulrik.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2008-08-21  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2008-08-21  Åsmund Skjæveland  <aasmunds@ulrik.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2008-08-21  Shankar Prasad  <svenkate@redhat.com>
-
-	* kn.po: Updated Kannada translation
-
-2008-08-18  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2008-08-18  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translaion.
-
-2008-08-18  Shankar Prasad  <svenkate@redhat.com>
-
-	* kn.po: Updated Kannada translation
-
-2008-08-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-08-17  Takeshi AIHANA <takeshi.aihana@gmail.com>
-
-	* ja.po: Updated Japanese translation.
-
-2008-08-16  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-08-15  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation
-
-2008-08-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-08-15  Milan Crha  <mcrha@redhat.com>
-
-	* POTFILES.in: Added e-util/e-util.c there.
-
-2008-08-14  Shankar Prasad  <svenkate@redhat.com>
-
-	* kn.po: Updated Kannada Translation.
-
-2008-08-13  Ilkka Tuohela <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2008-08-13  Shankar Prasad  <svenkate@redhat.com>
-
-	* kn.po: Updated Kannada Translation.
-
-2008-08-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-08-12  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation
-
-2008-08-12  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation
-
-2008-08-12  Ilkka Tuohela <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2008-08-11  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2008-08-11  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation
-
-2008-08-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-
-2008-08-08  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-08-07  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-08-07  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation
-
-2008-08-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-08-06  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Abou Manal.
-
-2008-08-05: Sweta Kothari  <swkothar@redhat.com>
-
-	* gu.po: Committed Gujarati Translation.
-
-2008-08-04  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation
-
-2008-08-03  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2008-08-02  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation
-
-2008-08-01  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation
-
-2008-08-01  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation
-
-2008-07-31  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation by Frco. Javier Rial Rodríguez.
-
-2008-07-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-07-29  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2008-07-29  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Abou Manal.
-
-2008-07-27  Petr Kovar  <pknbe@volny.cz>
-
-	* cs.po: Fixed Czech translation.
-
-2008-07-24  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
-
-	* pt_BR.po: Terminology fixes by Fabrício Godoy.
-
-2008-06-24  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-07-24  Claude Paroz  <claude@2xlibre.net>
-
-	* fr.po: Updated French translation by Bruno Brouard and Claude Paroz.
-
-2008-07-23  Gil Forcada  <gforcada@gnome.org>
-
-	* ps.po: Added Pashto translation by Zabeeh Khan.
-	* LINGUAS: Added ps.
-
-2008-07-23  Petr Kovar  <pknbe@volny.cz>
-
-	* cs.po: Fixed Czech translation, thanks for noticing
-	to Pavel Sefranek.
-
-2008-07-21  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-07-21  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2008-07-21  Johnny Jacob  <jjohnny@novell.com>
-
-	* POTFILES.in: Fixed a typo.
-
-2008-07-21  J0hnny Jacob <jjohnny@novell.com>
-
-	* POTFILES.in: Updated file lsit.
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	* POTFILES.in: Updated file list.
-
-2008-07-20  Bharath Acharya  <abharath@novell.com>
-
-	* POTFILES.in:
-	Updated file-list for templates plugin.
-
-	** See bug #200147
-
-2008-07-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-07-19  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2008-07-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-07-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-07-05  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-07-04  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-07-02  Yannig Marchegay <yannig@marchegay.org>
-
-	* oc.po: Updated Occitan translation.
-
-2008-07-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-06-29  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
-
-	* pt_BR.po: Another "foreport" of Brazilian Portuguese translation.
-	Updated the translation and improved some accelerators keys.
-
-2008-06-28  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
-
-	* pt_BR.po: "Foreported" fixes from the gnome-2-22 branch; credits to
-	Vladimir Melo and myself.
-
-2008-06-28 Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-06-27 Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-06-27  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-06-27  Timo Jyrinki  <timo.jyrinki@iki.fi>
-
-	* fi.po: Fixes to existing translations and some new translations.
-
-2008-06-24  Johnny Jacob  <jjohnny@novell.com>
-
-	* POTFILES.in: Added python plugin files.
-
-2008-06-21  Petr Kovar  <pknbe@volny.cz>
-
-	* cs.po: Fixed Czech translation (bug #517967), thanks
-	to Lucas Lommer.
-
-2008-06-21  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-06-15  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* ru.po: Updated Russian translation by Anatol Kamynin.
-
-2008-06-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-06-11  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Abou Manal.
-
-2008-06-10  Andre Klapper  <a9016009@gmx.de>
-
-	* POTFILES.in: Added missing file.
-
-2008-06-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-06-07  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-06-05  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translaion.
-
-2008-06-02  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2008-06-01  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2008-05-31  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2008-05-23  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation, fixes bug #535014
-
-2008-05-25  Philip Withnall  <pwithnall@svn.gnome.org>
-
-	* en_GB.po: Updated British English translation.
-
-2008-05-25  Philip Withnall  <pwithnall@svn.gnome.org>
-
-	* en_GB.po: Updated British English translation.
-
-2008-05-25  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2008-05-25  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-05-24  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2008-05-24  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-05-23  Nikos Charonitakis  <nikosx@gmail.com>
-
-	* el.po: Fixed a typo.
-
-2008-05-23  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-05-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Fix this up.
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-05-20  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2008-05-19  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Abou Manal.
-
-2008-05-18  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2008-05-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Remove obsolete file.
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-05-13  Gil Forcada  <gforcada@gnome.org>
-
-	* ca.po: Fixed a minor typo.
-
-2008-05-13  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Reinout van Schouwen.
-
-2008-05-08  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2008-05-08  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translaion.
-
-2008-05-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-05-05  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translaion.
-
-2008-04-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-04-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-04-29  Yannig Marchegay <yannig@marchegay.org>
-
-	* oc.po: Updated Occitan translation.
-
-2008-04-27  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-04-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-04-22  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Cater for some files that were moved.
-	* nb.po: Updated translation.
-
-2008-04-21  Bastien Nocera  <hadess@hadess.net>
-
-	* en_GB.po: _Trash -> Wastebaske_t
-
-2008-04-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-04-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-04-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Add missing file.
-
-2008-04-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-04-17  Sankar P  <psankar@novell.com>
-
-	* POTFILES.in:
-	Updated file-list for external-editor plugin.
-
-	** See bug #517168
-
-2008-04-16  Stanislav Brabec  <sbrabec@hammer.suse.cz>
-
-	* cs.po: Typo fix.
-
-2008-04-14  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
-
-	* pt_BR.po: Merged from branch gnome-2-22 (where it got fixes).
-
-2008-04-13  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-04-12  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translaion by Mark Krapivner.
-
-2008-04-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-04-09  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translaion.
-
-2008-04-08  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translaion.
-
-2008-04-07  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation, fixed bug #525068
-
-2008-04-07  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-04-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-04-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* POTFILES.in: Update file list for new composer.
-
-2008-03-31  Philipp Kerling  <k.philipp@gmail.com>
-
-	* de.po: Updated German translation.
-
-2008-03-31  Philipp Kerling  <k.philipp@gmail.com>
-
-	* de.po: Bugfix in German translation by Dominik Sandjaja
-
-2008-03-28  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #511957
-
-	* POTFILES.in:
-	Added plugins/groupwise-features/org-gnome-mail-retract-errors.xml.
-
-2008-03-25  Philip Withnall  <pwithnall@svn.gnome.org>
-
-	* en_GB.po: Updated British English translation.
-
-2008-03-25  Simos Xenitellis  <simos@gnome.org>
-
-	* el.po: Updated Greek translation.
-
-2008-03-25  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-03-23  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-03-21 Kenneth Nielsen <k.nielsen81@gmail.com>
-
-	* da.po: Updated Danish translation by Kenneth Nielsen
-
-2008-03-21  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2008-03-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-03-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-03-14  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: add line breaks to some strings (bug #515826,
-	patch by Milan Crha).
-	sync translations of "Send options" (bug #507411).
-	add 3 missing accelerators to translation strings.
-
-2008-03-13  Åsmund Skjæveland  <aasmunds@ulrik.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2008-03-12  Sunil Mohan Adapa  <sunilmohan@fsf.org.in>
-
-	* te.po: Updated Telugu traslation done by
-	Krishna Babu K <kkrothap@redhat.com>.
-
-2008-03-11  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Yavor Doganov <yavor@gnu.org>
-
-2008-03-10  Rahul Bhalerao <b.rahul.pm@gmail.com>
-
-	* mr.po: Updated Marathi Translation by Sandeep Shedmake.
-
-2008-03-10  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-03-10  Runa Bhattacharjee <runab@fedoraproject.org>
-
-	* bn_IN.po: Updated Bengali India Translation
-
-2008-03-10  Petr Kovar  <pknbe@volny.cz>
-
-	* cs.po: Fixed Czech translation by Jiri Eischmann.
-
-2008-03-09  Vasiliy Faronov <qvvx@yandex.ru>
-
-	* ru.po: Updated Russian translation.
-
-2008-03-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-
-2008-03-09 Maxim Dziumanenko <dziumanenko@gmail.com>
-
-	* uk.po: Update Ukrainian translation.
-
-2008-03-08  Kenneth Nielsen  <k.nielsen81@gmail.com>
-
-	* da.po: Updated Danish translation
-
-2008-03-08  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated Greek translation
-
-2008-03-08  Guntupalli Karunakar  <karunakar@indlinux.org>
-
-	* hi.po: Fix plurals.
-
-2008-03-08  Runa Bhattacharjee <runab@fedoraproject.org>
-
-	* bn_IN.po: Corrected errors in plural forms
-
-2008-03-07  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Updated French translation by Bruno Brouard.
-
-2008-03-07  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2008-03-07  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2008-03-06  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-03-06  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2008-03-06  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Fixed French translation.
-
-2008-03-06  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated
-
-2008-03-05  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Update Italian translation.
-
-2008-03-05  Åsmund Skjæveland  <aasmunds@ulrik.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2008-03-04  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2008-03-04  Takeshi AIHANA <takeshi.aihana@gmail.com>
-
-	* ja.po: Fixed wrong translations.
-
-2008-03-03  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2008-03-03  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-03-03  Rahul Bhalerao <b.rahul.pm@gmail.com>
-
-	* mr.po: Updated Marathi translations from Sandeep Shedmake.
-
-2008-03-03  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2008-03-03  Åsmund Skjæveland  <aasmunds@ulrik.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2008-03-03  Ihar Hrachyshka <booxter@lacinka.org>
-
-	* be@latin.po: Updated Belarusian Latin translation.
-
-2008-03-02  Ihar Hrachyshka <booxter@lacinka.org>
-
-	* be@latin.po: Added Belarusian Latin translation by AleÅ› Navicki.
-	* LINGUAS: Added be@latin.
-
-2008-03-03  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2008-03-02  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2008-02-29  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-02-29  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2008-02-28  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2008-02-28  Petr Kovar  <pknbe@volny.cz>
-
-	* cs.po: Updated Czech translation by Jiri Eischmann.
-
-2008-02-27  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Updated French translation by Robert-André Mauchin and
-	Stéphane Raimbault.
-
-2008-02-25  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
-
-	* pt_BR.po: Brazilian Portuguese translation by Washington Lins.
-
-2008-02-24  Takeshi AIHANA <takeshi.aihana@gmail.com>
-
-	* ja.po: Updated Japanese translation.
-
-2008-02-24  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-02-23  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2008-02-23  Priit Laes  <plaes at svn dot gnome dot org>
-
-	* et.po: Translation updated by Ivar Smolin
-
-2008-02-23  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Abou Manal.
-
-2008-02-22  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Reinout van Schouwen.
-
-2008-02-21 Arangel Angov <arangel@linux.net.mk>
-
-	* mk.po: Updated Macedonian translation.
-
-2008-02-21  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2008-02-19  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2008-02-18  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2008-02-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translaiton, fixed typo thanks to Ignacio
-	Casal Quinteiro.
-
-2008-02-19  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2008-02-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-02-18  Nguyễn Thái Ng�c Duy <pclouds@gmail.com>
-
-	* vi.po: Updated Vietnamese translation
-
-2008-02-17  Wadim Dziedzic  <wadimd@svn.gnome.org>
-
-	* pl.po: Updated polish translation
-
-2008-02-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-02-17  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Djihed Afifi.
-
-2008-02-17  David Lodge <dave@cirt.net>
-
-	* en_GB.po: Updated British English translation
-
-2008-02-16  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2008-02-16  Wadim Dziedzic  <wadimd@svn.gnome.org>
-
-	* pl.po: Updated Polish translation
-
-2008-02-16  Baris Cicek <baris@teamforce.name.tr>
-
-	* tr.po: Updated Turkish translation.
-
-2008-02-16  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2008-02-15  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2008-02-14  Gil Forcada  <gforcada@gnome.org>
-
-	* ca.po: Updated Catalan translation by David Planella.
-
-2008-02-14  Pawan Chitrakar <chautari@gmail.com>
-
-	* ne.po: Updated Nepali Translation.
-
-2008-02-14  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2008-02-13  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2008-02-13  Yannig Marchegay <yannig@marchegay.org>
-
-	* oc.po: Updated Occitan translation.
-
-2008-02-13  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2008-02-13  Ilkka Tuohela <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2008-02-13  Nikos Charonitakis  <nikosx@gmail.com>
-
-	* el.po: Updated Greek translation.
-
-2008-02-13  Gil Forcada  <gforcada@gnome.org>
-
-	* ca.po: Impressive lifting to Catalan translation by David Planella.
-
-2008-02-11 Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2008-02-11  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-02-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-02-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-02-10  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2008-02-08  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2008-02-08  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Updated French translation by Stéphane Raimbault and
-	Claude Paroz.
-
-2008-02-05  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2008-02-05  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-
-2008-02-03  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2008-02-02  Yannig Marchegay <yannig@marchegay.org>
-
-	* oc.po: Updated Occitan translation.
-
-2008-02-02  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-02-01  Runa Bhattacharjee <runabh@gmail.com>
-
-	* kn.po: Updated Kannada Translations by Shankar Prasad.
-
-2008-01-31  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Djihed Afifi.
-
-2008-01-31  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2008-01-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-01-29  Rahul Bhalerao <b.rahul.pm@gmail.com>
-
-	* mr.po: Updated Marathi translations by Sandeep Shedmake.
-
-2008-01-29  Jonh Wendell  <jwendell@gnome.org>
-
-	* pt_BR.po: Brazilian Portuguese translation updated by Washington Lins.
-
-2008-01-29  Danishka Navin <danishka@gmail.com>
-
-	* si.po: Updated Sinhala translation.
-
-2008-01-28  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-01-28  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2008-01-27  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-01-26  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2008-01-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-01-25  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2008-01-24  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation
-
-2008-01-23  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-01-22  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2008-01-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-01-21  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2008-01-19  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translaion.
-
-2008-01-18  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2008-01-17  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translaion.
-
-2008-01-16  Rahul Bhalerao <b.rahul.pm@gmail.com>
-
-	* mr.po: Updated Marathi translations given by Sandeep Shedmake.
-
-2008-01-16  Runa Bhattacharjee <runabh@gmail.com>
-
-	* kn.po: Submitting Updated Kannada Translations by Shankar Prasad.
-
-2008-01-15  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2008-01-15  Runa Bhattacharjee <runabh@gmail.com>
-
-	* kn.po: Added Kannada Translation by Shankar Prasad.
-	* LINGUAS: Added Kannada (kn) to the list of languages.
-
-2008-01-15  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2008-01-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-01-14  Amitakhya Phukan <amitakhya@svn.gnome.org>
-
-	* as.po: Updated Assamese translations.
-
-2008-01-14  Amitakhya Phukan <amitakhya@svn.gnome.org>
-
-	* as.po: Updated Assamese translations.
-
-2008-01-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2008-01-14  Amitakhya Phukan <amitakhya@svn.gnome.org>
-
-	* as.po: Updated Assamese translations.
-
-2008-01-11  Espen Stefansen  <espens@svn.gnome.org>
-
-	* nb.po: Updated Norwegian Bokmål translation.
-
-2008-01-11  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-01-10  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Import updated Italian translation from gnome-2-20 branch
-
-2008-01-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2008-01-11  Changwoo Ryu  <cwryu@debian.org>
-
-	** Part of fix for bug #508282
-
-	* POTFILES.in: Add new file shell/e-shell-view.c
-
-2008-01-10  Milan Crha  <mcrha@redhat.com>
-
-	* POTFILES.in: Added new file e-util/e-util-labels.c
-
-2008-01-09  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2008-01-09  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* POTFILES.in: Remove new-mail-notify's files.
-
-2008-01-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2008-01-05  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2008-01-04  Erdal Ronahi  <erdal.ronahi@gmail.com>
-
-	* ku.po: Updated Kurdish translation
-
-2008-01-05  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2008-01-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Update Norwegian bokmål translation.
-
-2008-01-03  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-12-31  Yannig Marchegay <yannig@marchegay.org>
-
-	* oc.po: Updated Occitan translation.
-
-2007-12-31  Wadim Dziedzic  <wadimd@svn.gnome.org>
-
-	* pl.po: Updated polish translation
-
-2007-12-29  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-12-26  Seán de Búrca  <sdeburca@svn.gnome.org>
-
-	* ga.po: Updated Irish translation.
-
-2007-12-28  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Djihed Afifi.
-
-2007-12-24  Seán de Búrca  <sdeburca@svn.gnome.org>
-
-	* ga.po: Updated Irish translation.
-
-2007-12-24  Wadim Dziedzic  <wadimd@svn.gnome.org>
-
-	* pl.po: Unified polish date format strings
-
-2007-12-20  Seán de Búrca  <sdeburca@svn.gnome.org>
-
-	* ga.po: Updated Irish translation.
-
-2007-12-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-12-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-12-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-12-17  Danishka Navin <danishka@gmail.com>
-
-	* si.po: Updated Sinhala translation.
-
-2007-12-16  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-12-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-12-16  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
-
-	* pt_BR.po: Plugin descriptions translated in the present tense,
-	thanks to Rodrigo Flores.
-
-2007-12-15  Matthew Barnes  <mbarnes@redhat.com>
-
-	* POTFILES.in:
-	Remove the mail-remote files for good this time.
-
-2007-12-15  Seán de Búrca  <sdeburca@svn.gnome.org>
-
-	* ga.po: Updated Irish translation.
-
-2007-12-15  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-12-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-12-11  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated Greek translation
-
-2007-12-11  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2007-12-10  Matej Urban�i�  <mateju@svn.gnome.org>
-
-	* sl.po: Updated Slovenian Translation.
-
-2007-12-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-12-08  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2007-12-08  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Add missing files from mail-remote.
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-12-08  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
-
-	* pt_BR.po: Wrong translation of "delete" fixed by Rodrigo Flores.
-
-2007-12-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-12-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-12-04  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2007-12-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* POTFILES.in: Add new files, remove dead ones.
-
-2007-11-28  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2007-11-28  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2007-11-27  Matej Urban�i�  <mateju@svn.gnome.org>
-
-	* sl.po: Updated Slovenian translation.
-
-2007-11-21  Yannig Marchegay <yannig@marchegay.org>
-
-	* oc.po: Updated Occitan translation
-
-2007-11-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-11-20  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-11-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-11-15  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Fixed bug 422993. Thanks to Hanka Zalska.
-
-2007-11-14  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-11-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-11-14  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2007-11-13  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Fixed invalid translation. Thanks to Matej Krizan.
-
-2007-11-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-11-12  Matej Urban�i�  <mateju@svn.gnome.org>
-
-	* sl.po: Updated Slovenian translation.
-
-2007-11-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-11-11  Gilles Dartiguelongue  <gdartigug@svn.gnome.org>
-
-	* mk.po, mn.po, ga.po: remove executable property
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #344516
-
-	* he.po: Updated translation of date format for formatting.
-
-2007-11-04  Ignacio Casal Quinteiro <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2007-11-03  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
-
-	* pt_BR.po: More coherence in Brazilian Portuguese translation, thanks
-	to Washington Lins.
-
-2007-11-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* POTFILES.in: Remove files for mail-remote plugin.
-
-2007-11-01  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-11-01  Gil Forcada  <gforcada@svn.gnome.org>
-
-	* ca.po: Some fixes to Catalan translation by David Planella.
-
-2007-10-31  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Remove e-entry.c here.
-
-2007-10-27  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-10-26  Matthew Barnes  <mbarnes@redhat.com>
-
-	* POTFILES.in:
-	Add files for external-editor and google-account-setup plugins.
-
-2007-10-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2007-10-25  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2007-10-24  Matej Urban�i�  <mateju@svn.gnome.org>
-
-	* sl.po: Updated Slovenian translation.
-
-2007-10-23  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Anas Husseini.
-
-2007-10-22  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-10-22  Gil Forcada  <gforcada@svn.gnome.org>
-
-	* ca.po: Updated Catalan translation by David Planella.
-
-2007-10-21  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Anas Husseini.
-
-2007-10-15  Matej Urban�i�  <mateju@svn.gnome.org>
-
-	* sl.po: Updated Slovenian translation.
-
-2007-10-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-10-15  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Yavor Doganov <yavor@gnu.org>
-
-2007-10-15  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Translation update by Ivar Smolin.
-
-2007-10-12  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2007-10-10  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Fixed some errors.
-
-2007-10-07  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Translation update by Ivar Smolin.
-
-2007-09-30  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation.
-
-2007-09-30  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Merged French translation from gnome-2-20.
-
-2007-09-30  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* POTFILES.in: Move GNOME_Evolution_Test.server.in.in and
-	evolution-test-component.c in test directory (not done by
-	revno 34235).
-
-2007-09-27  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #479716
-
-	* POTFILES.in: get rid of e-table-config-no-group.glade.
-
-2007-09-17  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Few typos fixed.
-
-2007-09-17  Amitakhya Phukan <amitakhya@svn.gnome.org>
-
-	* as.po: Updated assamese translations.
-
-2007-09-17  Amitakhya Phukan <amitakhya@svn.gnome.org>
-
-	* as.po: Updated assamese translations.
-
-2007-09-17  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2007-09-17 Maxim Dziumanenko <dziumanenko@gmail.com>
-
-	* uk.po: Update Ukrainian translation.
-
-2007-09-16  Yannig Marchegay <yannig@marchegay.org>
-
-	* oc/oc.po: Updated Occitan translation
-
-2007-09-15  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* ru.po: Updated Russian translation.
-
-2007-09-15  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated
-
-2007-09-14  Iestyn Pryce  <dylunio@gmail.com>
-
-	* cy.po: Fix typo in date format string
-
-2007-09-13  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Ahmad Farghal.
-
-2007-09-12  Jamil Ahmed  <itsjamil@gmail.com>
-
-	* bn.po: Updated Bengali Translation.
-
-2007-09-12  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, fix #475660.
-
-2007-09-12  Danishka Navin <snavin@svn.gnome.org>
-
-	* si.po:  Sinhala Translation updated by Danishka Navin
-
-2007-09-11  Goran Rakić  <grakic@devbase.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation (by Igor Nestorović).
-
-2007-09-11  Ani Peter  <peter.ani@gmail.com>
-
-	* ml.po:  Updated Malayalam translation
-
-2007-09-11  Amitakhya Phukan <amitakhya@svn.gnome.org>
-
-	* as.po: Updated Assamese translations.
-
-2007-09-11  Amitakhya Phukan <amitakhya@svn.gnome.org>
-
-	* as.po: Updated Assamese translations.
-
-2007-09-11  Amitakhya Phukan <amitakhya@svn.gnome.org>
-
-	* as.po: Updated Assamese translations.
-
-2007-09-11  Amitakhya Phukan <amitakhya@svn.gnome.org>
-
-	* LINGUAS: Added as to LINGUAS file.
-	* as.po: Updated Assamese translations.
-
-2007-09-10  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation: fixes for
-	lots of typos (bug #475578)
-
-2007-09-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-09-10  Kenneth Nielsen  <k.nielsen81@gmail.com>
-
-	* da.po: Updated Danish translation
-
-2007-09-10  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-09-10  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2007-09-10  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2007-09-09  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2007-09-08  Inaki Larranaga Murgoitio  <dooteo@zundan.com>
-
-	* eu.po: Fixed some typos in Basque translation.
-
-2007-09-07  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2007-09-07  Ani Peter <peter.ani@gmail.com>
-
-	* ml.po: Updated Malayalam Translation
-
-2007-09-06  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Updated Estonian translation.
-
-2007-09-06  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, fix #474050.
-
-2007-09-05  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2007-09-04  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2007-09-04  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Updated French translation by Stéphane Raimbault and
-	Claude Paroz.
-
-2007-09-04  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: ...and adding myself to translator-credits.
-
-2007-09-04  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: fixing wrong email address.
-
-2007-09-04  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2007-09-03  Runa Bhattacharjee <runabh@gmail.com>
-
-	* bn_IN.po: Updated Bengali India Translation.
-
-2007-09-03  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Estonian translation updates by Ivar Smolin
-
-2007-09-02  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-	* ChangeLog: Fix newlines in Clytie's recent entry.
-
-2007-09-02  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2007-09-02  Funda Wang  <fundawang@gmail.com>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2007-09-02  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2007-08-31  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-08-30  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Estonian translation updates by Ivar Smolin
-
-2007-08-30  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation
-	(fix for bug #471749)
-
-2007-08-30  Takeshi AIHANA <takeshi.aihana@gmail.com>
-
-	* ja.po: Updated Japanese translation.
-
-2007-08-29  Raphael Higino  <raphaelh@svn.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation
-	by Washington Lins <washington-lins@uol.com.br>.
-
-2007-08-29  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2007-08-29  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2007-08-29  I. Felix <ifelix@svn.gnome.org>
-
-	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
-
-2007-08-29  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-08-28  Wadim Dziedzic  <wadimd@svn.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2007-08-28  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-08-28  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-08-28  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-08-28  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Estonian translation updates by Ivar Smolin <okul@linux.ee>
-
-2007-08-28  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Estonian translation updates by Ivar Smolin <okul@linux.ee>
-
-2007-08-27  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2007-08-27  Wadim Dziedzic  <wadimd@svn.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2007-08-25  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-08-24  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2007-08-24  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-08-23  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
-
-	* pt_BR.po: Brazilian Portuguese translation by Washington Lins
-	<washington-lins@uol.com.br> and Raul Pereira
-	<contato@raulpereira.com>.
-
-2007-08-23  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Estonian translation updates by Ivar Smolin <okul@linux.ee>
-
-2007-08-23  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2007-08-23  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-08-22  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-08-21  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2007-08-21  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Updated German translation.
-
-2007-08-21  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Estonian translation updates by Ivar Smolin <okul@linux.ee>
-
-2007-08-20  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Reflect rename in a plugin.
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-08-20  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-08-20  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Updated French translation.
-
-2007-08-19  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2007-08-19  Takeshi AIHANA <takeshi.aihana@gmail.com>
-
-	* ja.po: Updated Japanese translation.
-
-2007-08-18  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-08-17  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Reinout van Schouwen.
-
-2007-08-17  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2007-08-17  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, by
-	Andre Klapper <ak-47@gmx.net>
-
-2007-08-17  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2007-08-16  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2007-08-16  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Estonian translation updates by Ivar Smolin <okul@linux.ee>
-
-2007-08-16  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Estonian translation update by Ivar Smolin.
-
-2007-08-16  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2007-08-15  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Updated Czech translation, fix #460052.
-
-2007-08-15  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, fix #438941.
-
-2007-08-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-08-14  I. Felix <ifelix@svn.gnome.org>
-
-	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
-
-2007-08-14  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2007-08-13  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-08-13  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-08-13  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2007-08-12  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Updated French translation by Claude Paroz and
-	Stéphane Raimbault.
-
-2007-08-12  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-08-12  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, by
-	Andre Klapper <ak-47@gmx.net>
-
-2007-08-12  Johnny Jacob  <jjohnny@novell.com>
-
-	* POTFILES.in : Added new file for translation.
-
-2007-08-11  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-08-11  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-08-11  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2007-08-11  Takeshi AIHANA <takeshi.aihana@gmail.com>
-
-	* ja.po: Updated Japanese translation.
-
-2007-08-10  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-08-10  I. Felix <ifelix@svn.gnome.org>
-
-	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
-
-2007-08-10  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2007-08-09  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-08-07  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2007-08-06  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-08-06  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2007-08-05  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-08-04 Kostas Papadimas <pkst@gnome.org>
-
-	* el.po Updated Greek Translation
-
-2007-08-04  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2007-08-03  Danishka Navin <snavin@svn.gnome.org>
-
-	* si.po:  Sinhala Translation updated by Danishka Navin
-
-
-2007-08-01  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-08-01  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-08-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-08-01  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2007-07-30  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-07-30  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-07-30  Inaki Larranaga Murgoitio  <dooteo@zundan.com>
-
-	* eu.po: Updated Basque translation.
-
-2007-07-30  I. Felix <ifelix@svn.gnome.org>
-
-	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
-
-2007-07-29  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-07-29  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-07-28  Andre Klapper  <a9016009@gmx.de>
-
-	* POTFILES.in: add two missing files.
-
-2007-07-27  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-07-24  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fixes 459251
-
-	* POTFILES.in : Added new files with translatable strings.
-
-2007-07-23  Matic Žgur  <mr.zgur@gmail.com>
-
-	* sl.po: Updated Slovenian translation.
-
-2007-07-23  Sunil Mohan Adapa  <sunil@atc.tcs.com>
-
-	* te.po: Updated Telugu translation done by
-	Bharat Kumar <bharatfsf@gmail.com>.
-
-2007-07-23  Claude Paroz <claude@2xlibre.net>
-
-	* fr.po: Corrected translation. Fixes bug #459282.
-
-2007-07-21  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Updated French translation by Myriam Malga, Claude Paroz
-	and Stéphane Raimbault.
-
-2007-07-21  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-07-21  Danilo Å egan  <danilo@gnome.org>
-
-	* sr.po, sr@Latn.po: Bugfixes.
-
-2007-07-20  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2007-07-20  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2007-06-17  Raivis Dejus  <orvils@gmail.com>
-
-	* lv.po: Updated Latvian Translation.
-
-2007-06-18  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation. Fixes bug #457959.
-
-2007-07-17  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-06-17  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2007-07-16  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-07-15  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Estonian translation update by Ivar Smolin.
-
-2007-07-13  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Estonian translation update by Ivar Smolin.
-
-2007-07-12  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation by Eunju Kim.
-
-2007-07-10  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2007-07-10  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-07-09  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2007-07-09  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #387844
-	* zh_HK.po:
-	* zh_TW.po: Updated the msgstr for date format
-	at e-dateedit.c 1444
-
-	Committing on behalf of Makuchaku <mayank.gnu@gmail.com>
-
-
-2007-07-07  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-07-02  Nguyễn Thái Ng�c Duy <pclouds@gmail.com>
-
-	* vi.po: Updated Vietnamese translation.
-
-2007-07-01  Nguyễn Thái Ng�c Duy <pclouds@gmail.com>
-
-	* vi.po: Updated Vietnamese translation.
-
-2007-06-28  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Estonian translation update by Ivar Smolin.
-
-2007-06-26  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2007-06-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-06-22  Guilherme de S. Pastore  <gpastore@gnome.org>
-
-	* pt_BR.po: updated Brazilian Portuguese translation.
-
-2007-06-22  I. Felix <ifelix@svn.gnome.org>
-
-	* si.po:  Sinhala Translation updated by Danishka Navin
-	* LINGUAS: Added Sinhala (si) to The List of Languages.
-
-2007-06-21  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-06-21  Funda Wang  <fundawang@gmail.com>
-
-	* zh_CN.po: Updated Simplified Chinese translation
-
-2007-06-20  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-06-20  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Estonian translation update by Ivar Smolin.
-
-2007-06-19  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-06-19  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-06-17  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Estonian translation update by Ivar Smolin.
-
-2007-06-17  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-06-15  Matthew Barnes  <mbarnes@redhat.com>
-
-	* POTFILES.in: Remove e-clipped-label.c
-
-2007-06-15  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-06-13  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-06-13 Pema Geyleg <pema.geyleg@gmail.com>
-
-	* dz.po: Updated dzongkha translation.
-
-2007-06-13  Andre Klapper  <a9016009@gmx.de>
-
-	* POTFILES.in: add missing files. Fixes bug #444548.
-
-2007-06-11  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-06-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-06-05  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for version removal from Installed files from Gilles Dartiguelongue
-
-	* POTFILES.in:
-
-2007-06-02  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-06-02  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2007-05-30  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Updated Estonian translation by Ivar Smolin <okul@linux.ee>.
-
-2007-05-30  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #440741
-
-	* POTFILES.in: Added apps-evolution-mail-notification.schemas.in.in to
-	the translation.
-
-2007-05-29  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2007-05-28  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-05-27  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-	* POTFILES.in: Added missing file.
-
-2007-05-25  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Merged French translation from gnome-2-18.
-
-2007-05-23  Rhys Jones  <rhys@sucs.org>
-
-	* cy.po: Updated Welsh translation.
-
-2007-05-23  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, fix #440493.
-
-2007-05-23  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, fix #440566.
-
-2007-05-22  Yair Hershkoviz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translation.
-
-2007-05-22  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-05-22  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Updated Czech translation
-
-2007-05-22  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Updated Estonian translation by Ivar Smolin <okul@linux.ee>.
-
-2007-05-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	* POTFILES.in:
-	* POTFILES.skip:
-	Move files that have translations but are not shipped to
-	POTFILES.skip.  Patch from Philip Withnall.  (#436985)
-
-2007-05-17  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Updated Estonian translation by Ivar Smolin <okul@linux.ee>.
-
-2007-05-16  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-05-15  David Lodge <dave@cirt.net>
-
-	* en_GB.po: Updated British English translation
-
-2007-05-15  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-05-14  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-	* POTFILES.in: Added missing files.
-
-2006-05-14  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translation.
-
-2007-05-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #337616
-
-	* POTFILES.in: Don't translate files we no longer ship.
-
-2007-05-12  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-05-09  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translation.
-
-2007-05-08  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translation.
-
-2007-05-04  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Fixed a bug in Czech translation.
-
-2007-05-03  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2007-04-29  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
-
-	* pt_BR.po: Fixed typo in Brazilian Portuguese translatin. Closes bug
-	#432702, by Washington Lins <washington-lins@uol.com.br>.
-
-2007-04-28  Matthew Barnes  <mbarnes@redhat.com>
-
-	* en_CA.po: Do not swap month and day in attribution format.
-	Committed on behalf of Adam Weinberger.  (#434019)
-
-2007-04-25  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* oc.po: Added Occitan translation from
-	Yannig MARCHEGAY <yannig@marchegay.org>.
-	* LINGUAS: Added "oc" (Occitan).
-
-2007-04-25  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2007-04-23  Jorge Gonzalez <jorgegonz@svn.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2007-04-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-04-22  David Lodge <dave@cirt.net>
-
-	* en_GB.po: Updated British English translation
-
-2007-04-22  Yair Hershkovitz <yairh@gmail.com>
-
-	* he.po: Updated Hebrew translation
-
-2007-04-21  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-	* POTFILES.in: Added missing files.
-
-2007-04-16  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-	* POTFILES.in: Added missing files.
-
-2007-04-14  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Djihed Afifi.
-
-2007-04-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* POTFILES.in: Add bogofilter files part of translation.
-
-2007-04-02  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Fixed a Czech typo.
-
-2007-04-02  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Czech update.
-
-2007-04-02  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Czech update.
-
-2007-03-30  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Czech update.
-
-2007-03-28  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Fixed an error in Portuguese translation.
-
-2007-03-27  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Fixed bug #421241.
-
-2007-03-27  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Fixed some Czech strings.
-
-2007-03-17  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2006-03-13 Kostas Papadimas <pkst@gnome.org>
-
-	* el.po Updated Greek Translation
-
-2007-03-13  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2007-03-12  Goran Rakić  <grakic@devbase.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation, by
-	Igor Nestorović <jung@one.ekof.bg.ac.yu>
-
-2007-03-12  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Updated Czech translation
-
-2007-03-12  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, by
-	Christian Kintner <mail@christian-kintner.de>
-
-2007-03-12  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2007-03-11  Takeshi AIHANA <takeshi.aihana@gmail.com>
-
-	* ja.po: Updated Japanese translation.
-
-2007-03-10  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation. again
-
-2007-03-10  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation
-
-2007-03-10  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2007-03-09  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Updated Czech translation.
-
-2007-03-09  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2007-03-09  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2007-03-09  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-03-09  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2007-03-08  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Updated Czech translation.
-
-2007-03-07  Josep Puigdemont i Casamajó  <josep.puigdemont@gmail.com>
-
-	* ca.po: Updated Catalan translation.
-
-2007-03-07  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2007-03-05  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-03-05 Maxim Dziumanenko <dziumanenko@gmail.com>
-
-	* uk.po: Update Ukrainian translation.
-
-2007-03-04  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2007-03-04  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).
-
-2007-03-03  Artur Flinta  <aflinta@svn.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2007-03-03  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2007-03-03  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2007-03-02  David Lodge <dave@cirt.net>
-
-	* en_GB.po: Updated English (British) translation
-
-2007-03-01  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2007-02-28  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Updated French translation by Jonathan Ernst.
-
-2007-02-28  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Djihed Afifi.
-
-2007-02-28  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-02-28  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation by Washington
-	Lins <washington-lins@uol.com.br>.
-
-2007-02-27  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-02-27  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2007-02-27  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2007-02-27  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2007-02-26  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2007-02-25  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Updated Estonian translation by Ivar Smolin <okul@linux.ee>.
-
-2007-02-25  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2007-02-24  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2007-02-24  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation
-
-2007-02-24  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-02-23  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2007-02-23  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2007-02-22  Jordi Mas <jmas@softcatala.org>
-
-	* ca.po: Updated Catalan translation by Xavier Conde Rueda. Fixes
-	by Jordi Mas and David Planella.
-
-2007-02-22  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-02-22  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2007-02-22  Abel Cheung  <abelcheung@gmail.com>
-
-	* zh_CN.po: Updated simplified Chinese translation on behalf of
-	Funda Wang.
-
-2007-02-22  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2007-02-20  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2007-02-20  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Updated French translation.
-
-2007-02-19  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-02-19  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2007-02-19  Nguyễn Thái Ng�c Duy  <pclouds@gmail.com>
-
-	* vi.po: Updated Vietnamese translation.
-
-2007-02-18  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Updated Estonian translation by Ivar Smolin <okul@linux.ee>.
-
-2007-02-18  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2007-02-17  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation by Washington
-	Lins <washington-lins@uol.com.br>.
-
-2007-02-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-02-16  David Lodge <dave@cirt.net>
-
-	* en_GB.po: Updated English (British) translation
-
-2007-02-16  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Djihed Afifi.
-
-2007-02-15  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2007-02-15  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2007-02-14  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-02-14  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-02-13  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2007-02-12  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-02-11  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Khaled Hosny.
-
-2007-02-11  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2007-02-10  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Updated French translation by Stéphane Raimbault,
-	Robert-André Mauchin and Stéphane Raimbault.
-
-2007-02-10  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2007-02-10  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2007-02-9  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Ahmad Farghal.
-
-2007-02-09  David Lodge <dave@cirt.net>
-
-	* en_GB.po: Updated English (British) translation
-
-2007-02-8  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Ahmad Farghal.
-
-2007-02-08  Pema Geyleg  <pema.geyleg@gmail.com>
-
-	* dz.po: Updated Dzongkha Translation.
-
-2007-02-08  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2007-02-06  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-02-05  David Lodge <dave@cirt.net>
-
-	* en_GB.po: Updated English (British) translation. Fixed bug 402715
-
-2007-02-04  Andre Klapper  <a9016009@gmx.de>
-
-	* de.po: Fixed Evolution translation bug #404226.
-
-2007-02-01  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).
-
-2007-01-31  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Updated Estonian translation by Ivar Smolin <okul@linux.ee>.
-
-2007-01-31  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-01-30  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2007-01-30  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Updated Estonian translation by Ivar Smolin <okul@linux.ee>.
-
-2007-01-30  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2007-01-30  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-01-29  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).
-
-
-2007-01-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-01-27  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-	* POTFILES.in: Added missing files.
-
-2007-01-27  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Updated Estonian translation by Ivar Smolin <okul@linux.ee>.
-
-2007-01-27  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* POTFILES.in:
-	mark strings as translatable. See bug #399381 for details.
-
-2007-01-24  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Updated Estonian translation by Ivar Smolin <okul@linux.ee>.
-
-2007-01-24  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-01-23  David Lodge <dave@cirt.net>
-
-	* en_GB.po: Updated English (British) translation
-
-2007-01-23  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-	* POTFILES.in: Added missing files.
-
-2007-01-10  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-01-09  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2007-01-06  Priit Laes  <plaes@svn.gnome.org>
-
-	* et.po: Updated Estonian translation by Ivar Smolin.
-
-2007-01-05  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-03  Jordi Mas <jmas@softcatala.org>, Bernat Tallaferro
-	<bernat.tallaferro@gmail.com>
-
-	* ca.po: Catalan translation fixes
-
-2007-01-3  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation by Ahmad Farghal.
-
-2007-01-02  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2006-12-28  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2006-12-28  David Lodge <dave@cirt.net>
-
-	* en_GB.po: Updated English (British) translation
-
-2006-12-28  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation.
-
-2006-12-28  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation.
-
-2006-12-27  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation.
-
-2006-12-26  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation.
-
-2006-12-26  Danilo Å egan  <danilo@gnome.org>
-
-	* sr.po, sr@Latn.po: Fix bug #355974, updated.
-
-2006-12-24  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation.
-
-2006-12-22  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation.
-
-2006-12-18  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2006-12-18  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic Translation.
-
-2006-12-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2006-12-14  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-12-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2006-12-09  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-12-08  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, fix #358310.
-
-2006-12-06  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Fixes bug #355772.
-
-2006-12-02  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-11-27  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Fixed bug #373453.
-
-2006-11-27  Jakub Friedl  <jfriedl@suse.cz>
-
-	* cs.po: Fixed bug #356884.
-
-2006-11-19  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-11-17  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* nb.po: Fixed a typo, bug #376337.
-
-2006-11-16  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-11-16  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-11-15  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-11-14  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-11-14  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-11-12  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-11-11  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-11-10  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-11-08  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-11-06  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation and fixed #370232.
-
-2006-11-04  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2006-11-02  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-11-01  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-10-28  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-10-26  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-10-24  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-10-24  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-10-22  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation.
-
-2006-10-21  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2006-10-20  Pawan Chitrakar  <pchitrakar@gmail.com>
-
-	* ne.po: Updated Nepali Translation
-
-2006-10-20  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2006-10-19  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-10-19  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-10-19  Josep Puigdemont i Casamajó  <josep.puigdemont@gmail.com>
-
-	* ca.po: Updated Catalan translation.
-
-2006-10-18  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-10-16  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-10-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Add two files here.
-	* nb.po: Update the translation.
-
-2006-10-15  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-10-15  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2006-10-15  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-10-15  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-10-15  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-10-14  Johan Dahlin  <jdahlin@async.com.br>
-
-	* sv.po: Updated swedish translation
-
-2006-10-15  Satoru SATOH <ss@gnome.gr.jp>
-
-	* ja.po: Fixed plurals-related problem.
-
-2006-10-14  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-10-13  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2006-10-11  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2006-10-09  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2006-10-09  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-10-09  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation from
-	Cyprien Le Pannérer <cyprien@placenet.org>.
-
-2006-10-08  Jordi Mas <jmas@softcatala.org>
-
-	* ca.po: Catalan translation fixes
-
-2006-10-05  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-10-05  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-10-04  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-10-04  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2006-10-04  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-10-04  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-10-03  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2006-10-03  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-10-03  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-10-03  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-10-02  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-10-01  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-09-30  Francisco Javier Fernandez Serrador  <cyphra@beauty.tecknolabs.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-09-30  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2006-09-29  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2006-09-29  Pema Geyleg  <pgeyleg@gmail.com>
-
-	* dz.po: Updated Dzongkha Translation.
-
-2006-09-27  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-09-25  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2006-09-24  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2006-09-24  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* ru.po: Updated Russian translation.
-
-2006-09-23  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2006-09-23  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2006-09-23  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-09-23  Wouter Bolsterlee  <wbolster@gnome.org>
-
-	* nl.po: Translation updated by Wouter Bolsterlee.
-
-2006-09-21  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2006-09-21  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2006-09-20  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation from
-	Cyprien Le Pannérer <cyprien@placenet.org>.
-
-2006-09-20  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-09-20  Pawan Chitrakar  <pchitrakar@gmail.com>
-
-	* ne.po: Updated Nepali Translation
-
-2006-09-20  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-09-20  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-09-19  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-09-18  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-09-18  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-09-17  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2006-09-17  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation
-
-2006-09-17  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-09-16  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-09-16  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-09-16  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2006-09-16  David Lodge <dave@cirt.net>
-
-	* en_GB.po: Updated English (British) translation
-
-2006-09-16  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-09-15  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2006-09-15  Wouter Bolsterlee  <wbolster@gnome.org>
-
-	* nl.po: Translation updated by Wouter Bolsterlee.
-
-2006-09-15  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-09-15  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-09-14  Vladimer Sichinava  <vlsichinava@gmail.com>
-
-	* ka.po: Updated Georgian translation.
-
-2006-09-13  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-09-12  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-09-11 Kostas Papadimas <pkst@gnome.org>
-
-	* el.po Updated Greek Translation
-
-2006-09-10  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-09-10  David Lodge <dave@cirt.net>
-
-	* en_GB.po: Updated English (British) translation.
-
-2006-09-09  Jamil Ahmed  <jamil@bengalinux.org>
-
-	* bn.po: Updated Bengali Translation from bn_IN
-
-2006-09-07  Pema Geyleg  <pgeyleg@gmail.com>
-
-	* dz.po: Updated Dzongkha Translation
-
-2006-09-06  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-09-05  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2006-09-04  Alessio Frusciante  <algol@firenze.linux.it>
-
-	* it.po: Fixed a bug in translation (#338403).
-
-2006-09-04  Danilo Å egan  <danilo@gnome.org>
-
-	* sr.po, sr@Latn.po: Updated by Igor Miletić.
-
-2006-09-04  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-	* hi.po: Updated Hindi Translation.
-
-2006-09-04 Ani Peter <peter.ani@gmail.com>
-
-	* ml.po: Updated Malayalam translation
-
-2006-09-04  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-09-04  Abel Cheung  <abel@oaka.org>
-
-	* zh_HK.po: Updated Chinese (Hong Kong) translation.
-	* zh_TW.po: Updated Chinese (Taiwan) translation.
-
-2006-09-04  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-09-03  Josep Puigdemont i Casamajó  <josep.puigdemont@gmail.com>
-
-	* ca.po: Updated Catalan translation.
-
-2006-09-03  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-09-03 Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-09-03  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-09-02  Ani Peter  <peter.ani@gmail.com>
-
-	* ml.po: Updated Malayalam translation
-
-2006-09-02  Ani Peter <peter.ani@gmail.com>
-
-	* ml.po: Updated Malayalam translation
-
-2006-09-02  Inaki Larranaga  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2006-09-02 Kostas Papadimas <pkst@gnome.org>
-
-	* el.po Updated Greek Translation
-
-2006-09-02  Ani Peter  <peter.ani@gmail.com>
-
-	* ml.po: Updated Malayalam translation
-
-2006-08-31  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-	* hi.po: Updated Hindi Translation.
-
-2006-09-01  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2006-08-31  Ani Peter  <peter.ani@gmail.com>
-
-	* ml.po: Updated Malayalam translation
-
-2006-08-31  Runa Bhattacharjee <runabh@gmail.com>
-
-	* bn_IN.po: Updated Bengali India Translation.
-
-2006-08-31  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-	* hi.po: Updated Hindi Translation.
-
-2006-08-31  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated Greek translation.
-
-2006-08-31  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2006-08-31  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2006-08-30  Runa Bhattacharjee <runabh@gmail.com>
-
-	* bn_IN.po: Updated Bengali India Translation (partial).
-
-2006-08-30  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation from
-	Robert-André Mauchin <zebob.m@gmail.com>.
-
-2006-08-30  I. Felix  <ifelix25@gmail.com>
-
-	* ta.po: Translation updated.
-
-2006-08-29  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2006-08-29  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2006-08-29  I. Felix  <ifelix25@gmail.com>
-
-	* ta.po: Updated Tamil translation.
-
-
-2006-08-28  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-	* hi.po: Updated Hindi Translation.
-
-2006-08-28  F. Priyadharshini  <priyafelix@gmail.com>
-
-	* ta.po: Updated Tamil translation.
-
-2006-08-27  Baris Cicek <baris@teamforce.name.tr>
-
-	* tr.po: Updated Turkish Translation
-
-2006-08-27  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation. Mark nplurals=2 although we have no
-	plural forms, as it makes translation of some messages better.
-
-2006-08-27  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-08-27  Ani Peter <peter.ani@gmail.com>
-
-	* ml.po:Updated Malayalam translation
-
-2006-08-26  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, fix #306003.
-
-2006-08-25  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, fix #352366.
-
-2006-08-25  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-	* hi.po: Updated Hindi Translation.
-
-2006-08-25  Raivis Dejus  <orvils@gmail.com>
-
-	* lv.po: Updated Latvian translation.
-
-2006-08-25  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-08-25  Ani Peter <peter.ani@gmail.com>
-
-	* ml.po: Updated Malayalam translation
-
-2006-08-25  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-08-25  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-08-24  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-08-24  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-08-24  Stanislav Brabec  <sbrabec@suse.cz>
-
-	* cs.po: Word form fix.
-
-2006-08-24  Ani Peter <peter.ani@gmail.com>
-
-	* ml.po: Updated Malayalam translation
-
-2006-08-24  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-08-24  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-	* hi.po: Updated Hindi Translation.
-
-2006-08-23  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2006-08-23  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2006-08-23  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-08-22  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2006-08-21  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2006-08-21  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2006-08-20  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, by
-	Christian Kintner <mail@christian-kintner.de>
-
-2006-08-20  Wouter Bolsterlee  <uws+gnome@xs4all.nl>
-
-	* nl.po: Translation updated by Wouter Bolsterlee.
-
-2006-08-20  Daniel Nylander <po@danielnylander.se>
-
-	*  sv.po: Updated Swedish translation.
-
-2006-08-20  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation, by
-	Christian Kintner <mail@christian-kintner.de>
-
-2006-08-19  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-08-19  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-08-19  Satoru SATOH <ss@gnome.gr.jp>
-
-	* ja.po: Updated Japanese Translation.
-
-2006-08-18  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-08-18  Matic Žgur  <mr.zgur@gmail.com>
-
-	* sl.po: Updated Slovenian translation.
-
-2006-08-18  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2006-08-18  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-08-18  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-08-18  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-08-17  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Updated Oriya Translation.
-
-2006-08-17  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-
-	* or.po: Added and Updated Oriya Translation.
-	* LINGUAS: Added Oriya (or) to The List of Languages.
-
-2006-08-16  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Small fix of Lithuanian translation.
-
-2006-08-16  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-08-16  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2006-08-16  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2006-08-16  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2006-08-14  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-08-14  Ahmad Riza H Nst  <rizahnst@eriagempita.co.id>
-
-	* id.po: Updated.
-
-2006-08-13  Rahul Bhalerao  <b.rahul.pm@gmail.com>
-
-	* mr.po: Updated Marathi Translations
-
-2006-08-12  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-08-12  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2006-08-12  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-08-12  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-08-11  Rahul Bhalerao  <b.rahul.pm@gmail.com>
-
-	* mr.po: Updated Marathi translation
-
-2006-08-11  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2006-08-11  Ani Peter <peter.ani@gmail.com>
-
-	* ml.po: Updated Malayalam translation
-
-2006-08-10  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-08-10  Ani Peter <peter.ani@gmail.com>
-
-	*ml.po: Updated Malayalam translation
-
-2006-08-10  Josep Puigdemont i Casamajó  <josep.puigdemont@gmail.com>
-
-	* ca.po: Updated Catalan translation by
-	Xavier Conde Rueda <xavi.conde@gmail.com>
-
-2006-08-10  Maxim Dziumanenko <dziumanenko@gmail.com>
-
-	* uk.po: Update Ukrainian translation.
-
-2006-08-10  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-08-10  Guntupalli Karunakar  <karunakar@freedomink.org>
-
-	* dz.po: Updated Dzongkha translation by
-	Dzongkhalinux team, DIT
-
-2006-08-09  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-08-09  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2006-08-09  Rahul Bhalerao  <b.rahul.pm@gmail.com>
-
-	* mr.po: Updated Marathi translation.
-
-2006-08-09  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2006-08-09  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2006-08-09  Rahul Bhalerao  <b.rahul.pm@gmail.com>
-
-	* mr.po: Updated Marathi translation
-
-2006-08-09  Rahul Bhalerao  <b.rahul.pm@gmail.com>
-
-	* mr.po: Updated Marathi translation
-
-2006-08-09  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-	Includes fix for translation bug 350386
-
-2006-08-08  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2006-08-08  Rahul Bhalerao  <b.rahul.pm@gmail.com>
-
-	* mr.po: Updated Marathi translation.
-
-2006-08-08  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-08-08  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2006-08-07  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-08-07  Rahul Bhalerao  <b.rahul.pm@gmail.com>
-
-	* mr.po: Added a new file for Marathi
-	* LINGUAS: Added a corrosponding entry for Marathi(mr) in LINGUAS file
-
-2006-08-07  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-08-07  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2006-08-07  Inaki Larranaga  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2006-08-07  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-08-06  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-08-06  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2006-08-05  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2006-08-05  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-08-05  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-08-04  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-08-04  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2006-08-04  Jordi Mas <jmas@softcatala.org>
-
-	* ca.po: Catalan translation update
-
-2006-08-03  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-08-02  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2006-08-02  Maxim Dziumanenko <dziumanenko@gmail.com>
-
-	* uk.po: Update Ukrainian translation.
-
-2006-08-01  Jovan Naumovski  <jovan@lugola.net>
-
-	* mk.po: Updated/fixed Macedonian translation.
-
-2006-07-30  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>
-
-	* zh_TW.po: Added Traditional Chinese translation(Taiwan).
-	* zh_HK.po: Added Traditional Chinese translation(Hong Kong).
-
-2006-07-27  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-07-27  Ilkka Tuohela  <hile@iki.fi>
-
-	* 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>
-
-	* 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>
-
-	* es.po: Updated Spanish translation.
-
-2006-07-17  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2006-07-17  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2006-07-17  Hendrik Richter  <hendrikr@gnome.org>
-
-	* 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>
-
-	* 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.
-
-2006-06-20  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-06-20  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-06-19  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-06-19  I. Felix  <ifelix25@gmail.com>
-
-	* ta.po: Updated Tamil translation.
-
-2006-06-16  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2006-06-15  Daniel Nylander  <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2006-06-15  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2006-06-15  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-06-14  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-06-13  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-06-12  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-06-08  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-06-07  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-06-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2006-06-05  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-06-04  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-06-04  Funda Wang  <fundawang@linux.net.cn>
-
-	* POTFILES.in: Removed obsolete files.
-
-2006-05-31  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-05-30  Pema Geyleg  <pema.geyleg@gmail.com>
-
-	* dz.po: Updated Dzongkha translation.
-
-2006-05-29  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-05-29  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-05-28  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2006-05-27  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2006-05-27  Pema Geyleg  <pema.geyleg@gmail.com>
-
-	* dz.po: Updated Dzongkha translation.
-
-2006-05-26  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-05-26  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-05-25  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-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-21  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-05-20  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2006-05-19  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-05-18  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-05-18  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2006-05-18  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2006-05-18  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-05-15  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-05-15  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-05-11  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-05-08  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-05-08  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2006-05-07  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-05-05  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-05-02  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-05-02  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-05-01  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2006-04-30  Lukas Novotny  <lukasnov@cvs.gnome.org>
-
-	* cs.po: Updated Czech translation.
-
-2006-04-30  Kjartan Maraas <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation
-
-2006-04-26  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2006-04-25  Jordi Mas <jmas@softcatala.org>
-
-	* ca.po: Small Catalan translation update
-
-2006-04-24  Rhys Jones  <rhys@sucs.org>
-
-	* cy.po: Updated Welsh translation.
-
-2006-04-24  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-04-23  Lukas Novotny  <lukasnov@cvs.gnome.org>
-
-	* cs.po: Updated Czech translation.
-
-2006-04-23  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-04-21  David Lodge  <dave@cirt.net>
-
-	* en_GB.po: Translation updated by David Lodge.
-
-2006-04-21  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2006-04-21  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2006-04-20  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-04-20  Josep Puigdemont Casamajó  <josep.puigdemont@gmail.com>
-
-	* ca.po: Updated Catalan translation with gnome-2-14 branch updates.
-
-2006-04-18  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2006-04-18  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-04-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Update this.
-	* no.po: Remove this.
-
-2006-04-17  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-04-17  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-04-14  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2006-04-10  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finish translation.
-
-2006-04-10  Roozbeh Pournader  <roozbeh@farsiweb.info>
-
-	* fa.po: Remove "%OC" from translations, as it only works with
-	Sharif Linux's modified glibc (patch by Elnaz Sarbar).
-
-2006-04-09  Lukas Novotny  <lukasnov@cvs.gnome.org>
-
-	* cs.po: Updated Czech translation.
-
-2006-04-08  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation (merged from gnome-2-14 branch).
-
-2006-04-05  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-04-05  Inaki Larranaga  <dooteo@euskalgnu.org>
-
-	* eu.po: Fixed some typos.
-
-2006-04-04  Roozbeh Pournader  <roozbeh@farsiweb.info>
-
-	* fa.po: Updated Persian translation by Elnaz Sarbar and Meelad
-	Zakaria.
-
-2006-03-30  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-03-29  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-03-28  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-03-25  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-03-23  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-03-22  Tommi Vainikainen  <thv@iki.fi>
-
-	* dz.po: Added Dzongkha translation from Pema Geyleg.
-
-2006-03-21  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-03-21  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Hungarian translation updated.
-
-2006-03-18  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-03-18  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-03-17  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-03-13  Vladimer Sichinava  <alinux@siena.linux.it>
-
-	* ka.po: Updated Catalan translation.
-
-2006-03-13  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation.
-
-2006-03-11  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-03-11  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation
-
-2006-03-11  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by
-	Gil Forcada <gilforcada@guifi.net>.
-
-2006-03-10  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2006-03-10  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Rostislav Raykov <zbrox@i-space.org>
-
-2006-03-10  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Replaced wrong spaces caused by copy/paste inside gtranslator.
-
-2006-03-10  Vladimer Sichinava  <vlsichinava@gmail.com>
-
-	* ka.po: Updated Georgian translation by
-	Alexander Didebulidze <didebuli@in.tum.de>.
-
-2006-03-10  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation
-
-2006-03-09  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-03-08  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: Updated Swedish translation.
-
-2006-03-08  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2006-03-06  Rajesh Ranjan <rranjan@redhat.com>
-
-	* hi.po: Updated Hindi Translation.
-
-2006-03-07  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-03-06  Maxim Dziumanenko <mvd@mylinux.ua>
-
-	* uk.po: Updated Ukrainian translation.
-
-2006-03-06  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Fixed Russian translation
-
-2006-03-06  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Updated German translation.
-
-2006-03-05  Ole Laursen  <olau@hardworking.dk>
-
-	* da.po: Fixed some strings and partial update of Danish
-	translation.
-
-2006-03-05  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2006-03-05  Benoît Dejean  <benoit@placenet.org>
-
-	* fr.po: Updated French translation.
-
-2006-03-05  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-03-03  Lukas Novotny  <lukasnov@cvs.gnome.org>
-
-	* cs.po: Updated Czech translation.
-
-2006-03-03  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2006-03-03  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-03-03  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-03-01  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2006-03-01  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-02-28  Takeshi AIHANA <takeshi.aihana@gmail.com>
-
-	* ja.po: Updated Japanese translation.
-
-2006-02-28  Luca Ferretti  <elle.uca@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2006-02-01  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-02-28  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-02-28  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-
-2006-02-27  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-02-27  Inaki Larranaga  <dooteo@euskalgnu.org>
-
-	* eu.po: Fixed some typos
-
-2006-02-27  Rhys Jones  <rhys@sucs.org>
-
-	* cy.po: Updated Welsh translation.
-
-2006-02-27  Inaki Larranaga  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2006-02-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2006-02-25  Takeshi AIHaNA <takeshi.aihana@gmail.com>
-
-	* ja.po: Updated Japanese translation.
-
-2006-02-25 Kostas Papadimas <pkst@gnome.org>
-
-	* el.po Updated Greek Translation
-
-2006-02-24 Kostas Papadimas <pkst@gnome.org>
-
-	* el.po Updated Greek Translation
-
-2006-02-24  Jordi Mas <jmas@softcatala.org>
-
-	* ca.po: Small Catalan translation update
-
-2006-02-24  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-02-23  Clytie Siddall <clytie@riverland.net.au>
-
-	* ka.po: Added Georgian translation by Alexander Didebulidze <didebuli@in.tum.de>.
-
-2006-02-22  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-02-22  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-02-21  Slobodan D. Sredojevic  <slobo@akrep.be>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation
-
-2006-02-21  Jordi Mas <jmas@softcatala.org>
-
-	* ca.po: Catalan translation update
-
-2006-02-21  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-02-01  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-02-20  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation by Lukas Novotny.
-
-2006-02-19  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-02-19  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-
-2006-02-18  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2006-02-17  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2006-02-17 Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated Greek Translation
-
-2006-02-17  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-02-15  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2006-02-15  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2006-02-15  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-02-14  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-02-14  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-02-14  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-02-14  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-02-13  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2006-02-13  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-02-13  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-02-13  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2006-02-01  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-02-12  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-02-12  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-02-11  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-02-11  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2006-02-11  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-02-11  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-02-11  Rhys Jones  <rhys@sucs.org>
-
-	* cy.po: Updated Welsh translation.
-
-2006-02-11  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-02-11  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-02-10  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-02-10  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2006-02-10  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-02-10  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-02-09  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-02-09  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-02-09  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2006-02-08  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-02-08  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-02-07  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-02-07  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-02-07  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-02-07  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-02-07  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-02-06  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-02-06  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-02-06  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-02-06  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2006-02-06  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2006-02-06  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-02-06  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-02-06  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-
-2006-02-06  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-02-05  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-02-04  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-02-04  Josep Puigdemont i Casamajó  <josep.puigdemont@gmail.com>
-
-	* ca.po: Updated Catalan translation by
-	Xavier Conde <xavi.conde@gmail.com> and Jordi Mas <jmas@softcatala.org>
-
-2006-02-04  Lukas Novotny  <lukasnov@cvs.gnome.org>
-
-	* cs.po: Updated Czech translation.
-
-2006-02-02  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2006-02-02  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2006-02-01  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-02-01  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-02-01  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-02-01  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-31  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2006-01-31  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-01-31  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-01-31  Slobodan D. Sredojevic  <slobo@akrep.be>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation
-
-2006-01-31  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* POTFILES.in: Removed a non-existing file.
-	* th.po: Updated Thai translation.
-
-2006-01-31  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2006-01-30  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2006-01-30  Lukas Novotny  <lukasnov@cvs.gnome.org>
-
-	* cs.po: Updated Czech translation.
-
-2006-01-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Remove non-existing file and add a few missing ones.
-	* nb.po: Update Norwegian bokmål translation.
-	* no.po: Same.
-
-2006-01-30  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-30  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-01-30  Harish Krishnaswamy  <kharish@novell.com>
-
-	* POTFILES.in: Added missing file calendar/gui/review.c.
-
-2006-01-30  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2006-01-29  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2006-01-28  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-01-28  Adam Weinberger  <adamw@gnome.org>
-
-	* POTFILES.in: Added missing file.
-	* en_CA.po: Updated Canadian English translation.
-
-2006-01-28  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-01-28  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-27  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-01-27  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-27  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-01-27  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-
-2006-01-26  Evandro Fernandes Giovanini <evandrofg@ig.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2006-01-26  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-01-26  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2006-01-26  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-25  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2006-01-25  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation
-
-2006-01-25 Kostas Papadimas <pkst@gnome.org>
-
-	* el.po Updated Greek Translation
-
-2006-01-25  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-01-25  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-24  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-01-24  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-01-24  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-01-24  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-24  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-01-23  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-01-23  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-01-23  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-01-23  Kjartan Maraas <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2006-01-23  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-01-22  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2006-01-22  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2006-01-22  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2006-01-22  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-21  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-01-21  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po:Updated Spanish translation.
-
-2006-01-21  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2006-01-21  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-	* zh_HK.po: Added Traditional Chinese translation(Hong Kong).
-
-2006-01-20  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-01-20  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-01-20  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-01-19  Adam Weinberger  <adamw@gnome.org>
-
-	* POTFILES.in: Added missing file.
-	* en_CA.po: Updated Canadian English translation.
-
-2006-01-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated translation.
-
-2006-01-19  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-01-18  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2006-01-18  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2006-01-18  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-01-18  Slobodan D. Sredojevic  <slobo@akrep.be>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation
-
-2006-01-17  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-01-17  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-16  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-01-16  Adam Weinberger  <adamw@gnome.org>
-
-	* POTFILES.in: Added missing files.
-	* en_CA.po: Updated Canadian English translation.
-
-2006-01-16  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-01-16  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-15  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2006-01-15  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-15  Takeshi AIHANA <takeshi.aihana@gmail.com>
-
-	* ja.po: Updated Japanese translation.
-
-2006-01-14  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-14  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-01-13  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-12  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2006-01-12  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-01-12  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-01-11  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2006-01-11  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-01-11  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-10  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2006-01-09  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2006-01-09  Harish Krishnaswamy  <kharish@novell.com>
-
-	* zh_TW.po: Updated Chinese Translation by
-	Zhe Su <zsu@novell.com>
-
-2006-01-09  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-01-09  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-01-09  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2006-01-09  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2006-01-08  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2006-01-07  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-01-07  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-01-06  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-01-06  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-01-05  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2006-01-05  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2006-01-05  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2006-01-05  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2006-01-04  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2006-01-04  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2005-01-04  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-01-03  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2005-01-03  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-01-02  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2006-01-02  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-01-02  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2006-01-01  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-01-02  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Remove non-existant file.
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same
-
-2006-01-01  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2006-01-01  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2006-01-01  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-12-31  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-12-31  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2005-12-30  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-12-30  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-12-30  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-12-28  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-12-27  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2005-12-27  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-12-26  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-12-26  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-12-26  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2005-12-25  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-12-25  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-12-25  Funda Wang  <fundawang@linux.net.cn>
-
-	* POTFILES.in: Mark various plugins as  translatable (bug#301149).
-
-2005-12-25  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-12-23  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-12-23 Kostas Papadimas <pkst@gnome.org>
-
-	*el.po Updated Greek Translation
-
-2005-12-23  Adam Weinberger  <adamw@gnome.org>
-
-	* POTFILES.in: Added missing files.
-	* en_CA.po: Updated Canadian English translation.
-
-2005-12-22  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation (twice).
-
-2005-12-21  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2005-12-21  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-12-20  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-12-20  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2005-12-10  Ales Nyakhaychyk  <nab@mail.by>
-
-	* be.po: Updated Belarusian translaion.
-
-2005-12-19  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2005-12-18  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-12-18  Funda Wang  <fundawang@linux.net.cn>
-
-	* POTFILES.in: Removed obsolete files.
-
-2005-12-18  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2005-12-16  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2005-12-15  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2005-12-15  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-12-15  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2005-12-14  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-12-13  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2005-12-12  Abel Cheung  <maddog@linuxhall.org>
-
-	* zh_TW.po: Fix mnemonic key
-
-2005-12-11  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2005-12-10  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-12-09  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-12-08  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2005-12-02  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-12-06  Ales Nyakhaychyk  <nab@mail.by>
-
-	* be.po: Updated Belarusian translation by Vital Khilko.
-
-2005-12-05  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-12-03  Adam Weinberger  <adamw@gnome.org>
-
-	* POTFILES.in: Added missing file.
-	* en_CA.po: Updated Canadian English translation.
-
-2005-12-02  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-12-01  Ales Nyakhaychyk  <nab@mail.by>
-
-	* be.po: Updated Belarusian translation by Vital Khilko.
-
-2005-11-28  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2005-11-27  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2005-11-27  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation (QA)
-
-2005-11-27  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-11-25  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-11-25  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2005-11-25  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-11-24  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-11-24  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician translation.
-
-2005-11-24  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-11-23  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-11-23  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-11-21  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-11-21  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-11-20  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2005-11-18  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-11-17  Adam Weinberger  <adamw@gnome.org>
-
-	* POTFILES.in: Add a half dozen missing files.
-	* en_CA.po: Updated Canadian English translation.
-
-2005-11-17  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-11-17  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-11-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2005-11-14  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2005-11-14  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-11-14  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Rostislav Raykov <zbrox@i-space.org>
-
-2005-11-13  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-11-10  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-11-09  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-11-07  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-11-07  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-110-03  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation
-
-2005-11-01  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-11-01  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-11-1  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2005-10-27  Erdal Ronahi  <erdal.ronahi@gmail.com>
-
-	* ku.po: Added Kurdish translation.
-
-2005-10-23  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-10-23  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-10-22  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated SPanish translation.
-
-2005-10-21  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-10-19  Adam Weinberger  <adamw@gnome.org>
-
-	* POTFILES.in: Added a number of missing files.
-	* en_CA.po: Updated Canadian English translation.
-
-2005-10-19  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-10-17  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2005-10-17  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-10-17  Runa Bhattacharjee  <runa@bengalinux.org>
-
-	* bn.po: Added Bengali (bn) Translation.
-
-2005-10-16  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-10-15  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2005-10-14  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-10-13  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-09-30  Adam Weinberger  <adamw@gnome.org>
-
-	* POTFILES.in: Added missing file.
-	* en_CA.po: Updated Canadian English translation.
-
-2005-09-29  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* ru.po: Updated Russian translation.
-
-2005-09-29  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Reverted unauthorized changes made by
-	user 'kloczek'. Also updated the translation.
-
-2005-09-13  Roozbeh Pournader  <roozbeh@farsiweb.info>
-
-	* fa.po: Updated Persian translation by Elnaz Sarbar
-	<elnaz@farsiweb.info> and Meelad Zakaria <meelad@farsiweb.info>.
-
-2005-09-12  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation.
-
-2005-09-08  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Fixed a typo in Finnish translation
-
-2005-09-07  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation.
-
-2005-09-04  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Minor fixes & updates in Thai translation.
-
-2005-09-04  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation, again.
-
-2005-09-04  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation.
-
-2005-09-03  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation.
-
-2005-09-03  Baris Cicek <baris@teamforce.name.tr>
-
-	* tr.po: Updated Turkish Translation
-
-2005-09-03  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation from
-	Vincent Untz <vuntz@gnome.org> and
-	Stéphane Raimbault <stephane.raimbault@free.fr>.
-
-2005-09-02  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation.
-
-2005-09-01  Rhys Jones  <rhys@sucs.org>
-
-	* cy.po: Updated Welsh translation.
-
-2005-08-31  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation.
-
-2005-08-31  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2005-08-31  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2005-08-31  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2005-08-31  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation.
-
-2005-08-30  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2005-08-30  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2005-08-29  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2005-08-29  Alessio Frusciante  <algol@firenze.linux.it>
-
-	* it.po: Updated Italian translation by
-	Luca Ferretti <elle.uca@infinito.it>.
-
-2005-08-29  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation.
-
-2005-08-28  Sigurd Gartmann  <sigurdga@europe.yahoo-inc.com>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2005-08-28  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2005-08-28  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation.
-
-2005-08-27  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2005-08-27  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po Updated Greek Translation
-
-2005-08-27  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-08-26  Mohammad DAMT  <mdamt@gnome.org>
-
-	* id.po: Updated Indonesian translation.
-
-2005-08-26  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation.
-
-2005-08-26  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2005-08-26  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2005-08-26  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional chinese translation.
-
-2005-08-25 Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2005-08-25  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation.
-
-2005-08-25  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-08-24  Mohammad DAMT  <mdamt@gnome.org>
-
-	* id.po: Updated Indonesian translation.
-
-2005-08-24  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-08-24  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2005-08-24  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-08-23  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Hungarian translation updated.
-
-2005-23-08  Ankit Patel <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2005-03-23  Maxim Dziumanenko <mvd@mylinux.ua>
-
-	* uk.po: Updated Ukrainian translation.
-
-2005-08-22  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-
-	* ru.po: Updated Russian translation.
-
-2005-08-22  Mohammad DAMT  <mdamt@gnome.org>
-
-	* id.po: Updated Indonesian translation
-
-2005-08-22  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-22  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2005-08-23  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-08-22  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2005-08-22  Danilo Å egan  <danilo@gnome.org>
-
-	* sr.po, sr@Latn.po: Updated by Igor Nestorović.
-
-2005-08-22  Danilo Å egan  <danilo@gnome.org>
-
-	* POTFILES.in: Removed shell/e-shell-offline-handler.c,
-	calendar/gui/calendar-offline-handler.c.
-
-2005-08-22  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-08-22  Mohammad DAMT  <mdamt@gnome.org>
-
-	* POTFILES.in: reverted (accidentally updated by my previous check in)
-
-2005-08-22  Mohammad DAMT  <mdamt@gnome.org>
-
-	* id.po: Updated Indonesian translation.
-
-2005-08-21  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-21  Nickolay V. Shmyrev <nshmyrev@yandex.ru>
-
-	* ru.po: Updated Russian translation.
-
-2005-08-21  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po Updated Greek Translation
-
-2005-08-21  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-08-21  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-21  Sigurd Gartmann  <sigurdga@europe.yahoo-inc.com>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2005-08-20  Josep Puigdemont i Casamajó  <josep.puigdemont@gmail.com>
-
-	* ca.po: Updated Catalan translation by
-	Xavier Conde Rueda <xavi.conde@gmail.com>
-
-2005-08-20  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* POTFILES.in: Removed missing files. See bug #312668.
-	* de.po: Updated German translation.
-
-2005-08-20  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: UPdated Spanish translation.
-
-2005-08-19  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2005-08-18  Mohammad DAMT  <mdamt@gnome.org>
-
-	* id.po: Updated Indonesian translation
-
-2005-08-18  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-08-18  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-08-17  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-08-16  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-16  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-08-16  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-16  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2005-08-16  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2005-08-16  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-08-15  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-15  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2005-08-15  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Hungarian translation updated.
-
-2005-08-15  Žygimantas Beru�ka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-08-15  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-15  Terance Sola  <terance@lyse.net>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2005-08-14  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-14  Josep Puigdemont  <josep.puigdemont@gmail.com>
-
-	* ca.po: Updated Catalan translation by Xavi Conde Rueda.
-
-2005-08-14  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2005-08-14  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Updated German translation.
-
-2005-08-14  Terance Sola  <terance@lyse.net>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2005-08-14  Terance Sola  <terance@lyse.net>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2005-08-14  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-08-14  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-13  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-08-13  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-13  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po Updated Greek Translation
-
-2005-08-13  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-08-12  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-08-12  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-08-12  Terance Sola  <terance@lyse.net>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2005-08-12  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2005-08-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same
-
-2005-08-11  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2005-08-11  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-08-10  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Rostislav Raykov <zbrox@i-space.org>
-
-2005-08-10  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2005-08-10  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-08-10  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po Updated Greek Translation
-
-2005-08-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same
-
-2005-08-09  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2005-08-09  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-08-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-08-09  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Minor revisions.
-
-2005-08-09  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Added Thai translation by
-	Supranee Thirawatthanasuk <supranee@opentle.org>.
-
-2005-08-08  Rhys Jones  <rhys@sucs.org>
-
-	* cy.po: Updated Welsh translation.
-
-2005-08-08  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-08  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2005-08-08  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-08-08  Kostas Papadimas <pkst@gnome.org>
-
-	*el.po Updated Greek Translation
-
-2005-08-08  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-08-08  Ankit Patel <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2005-08-07  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2005-08-07  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-08-06  Rhys Jones  <rhys@sucs.org>
-
-	* cy.po: Updated Welsh translation with changes from gnome-2-10 branch.
-
-2005-08-06  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2005-08-06  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-06  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-08-06  Ankit Patel <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2005-08-06  Terance Sola  <terance@lyse.net>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2005-08-06  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2005-08-05  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-08-05  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-05  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-08-05  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-08-05  Ankit Patel <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2005-08-04  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-08-04  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-08-04  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-08-04  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2005-08-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same
-
-2005-08-04  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-08-04  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2005-08-04  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-08-04  Sunil Mohan Adapa <sunil@atc.tcs.co.in>
-
-	* te.po: Added Telugu translations done by
-	Prajasakti Localisation Team
-	<localisation@prajasakti.com>
-
-2005-08-04  Ankit Patel <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2005-08-04  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-08-04  Terance Sola  <terance@lyse.net>
-
-	* nb.po: Updated Norwegian Bokmål translation.
-	* no.po: Same.
-
-2005-08-03  Adam Weinberger  <adamw@gnome.org>
-
-	* POTFILES.in: Added missing files.
-	* en_CA.po: Updated Canadian English translation.
-
-2005-08-02  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-08-01  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Updated Slovak translation.
-
-2005-07-31  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Bulk updates to Finnish translation
-	for new gnome.fi website.
-
-2005-07-29  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2005-07-29  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Partially updated German translation.
-
-2005-07-28  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2005-07-28  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2005-07-28  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Bulk change to some Finnish translations.
-
-2005-07-28  Ankit Patel <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2005-07-28  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-28  Nikos Charonitakis  <charosn@her.foerthnet.gr>
-
-	* el.po: Updated Greek translation.
-
-2005-07-27  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2005-07-27  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-07-27  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-07-27  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Rostislav Raykov <zbrox@i-space.org>
-
-2005-07-27  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-26  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-07-26  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-07-25  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-07-25  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation
-
-2005-07-24  Ilkka Tuohela  <hile@iki.fi>
-
-	fi.po: Updated Finnish translation.
-
-2005-07-24  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same
-
-2005-07-24  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2005-07-24  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-07-23  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-07-23  Adam Weinberger  <adamw@gnome.org>
-
-	* POTFILES.in, POTFILES.skip: Added many files, sorted.
-	* en_CA.po: Updated Canadian English translation.
-
-2005-07-23  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-07-23  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2005-07-23  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-07-23  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-07-23  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-22  Shakti Sen <shprasad@novell.com>
-
-	* POTFILES.in :
-	added plugins/exchange-operations/org-gnome-exchange-*-subscription.xml
-	files.
-
-2005-07-22  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-07-22  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-07-22  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2005-07-21  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Updated Slovak translation.
-
-2005-07-21  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-07-21  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-21  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2005-07-20  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-20  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-07-20  Sankar P <psankar@novell.com>
-
-	* POTFILES.in : Changed the path of the files that
-	are moved due to the consolidation of proxy features' plugins
-	into the groupwise-features plugin.
-
-2005-07-20  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-07-20  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-19  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-19  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-19  Vivek Jain <jvivek@novell.com>
-
-	* POTFILES.in : added plugins/groupwise-features/junk-mail
-	files
-
-2005-07-19  Nikos Charonitakis  <charosn@her.forthnet.gr>
-
-	* el.po: Updated Greek translation.
-
-2005-07-18  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-18  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-07-18  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-07-18  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-17  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2005-07-17  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-07-17  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-07-16  Danilo Å egan  <danilo@gnome.org>
-
-	* sr.po, sr@Latn.po: Updated by Igor Nestorović.
-
-2005-07-16  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-07-16  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* POTFILES.in : Added missing exchange files.
-
-2005-07-15  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	*plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
-	: Add file for translation.
-
-2005-07-14  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-13  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Updated Slovak translation.
-
-2005-07-13  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2005-07-13  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-07-13  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-07-12  Vivek Jain <jvivek@novell.com>
-
-	(put the changelog entry here
-	2005-07-10  Shreyas Srinivasan <sshreyas@novell.com>)
-
-	* POTFILES.in: Add files which need to be translated.
-
-2005-07-11  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Updated Slovak translation.
-
-2005-07-11  Guilherme de S. Pastore  <gpastore@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation by
-	Afonso Celso Medina, with some fixes by myself.
-
-2005-07-11  Danilo Å egan  <danilo@gnome.org>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation by Igor
-	Nestorović.
-
-2005-07-11  Vivek Jain <jvivek@novell.com>
-
-	* POTFILES.in : relocated camel-gw-listener.c
-
-2005-07-11  Sankar P <psankar@novell.com>
-
-	* POTFILES.in : Added the proxy.c file to the list.
-
-2005-07-10  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-07-09  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-07-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-07-08  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-07-08  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-07-07  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-07-07  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-07-07  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-07-07 Vivek Jain <jvivek@novell.com>
-
-	* POTFILES.in : updated with the changed location of
-	em-junk-filter.c
-
-2005-07-07  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Rostislav Raykov <zbrox@i-space.org>
-
-2005-07-07  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-06  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-05  Nikos Charonitakis  <charosn@her.forthnet.gr>
-
-	* el.po: Updated Greek translation.
-
-2005-07-04  Hendrik Richter  <hendi@gnome-de.org>
-
-	* de.po: Updated German translation.
-
-2005-07-04  Hendrik Richter  <hendi@gnome-de.org>
-
-	* de.po: Fixed German translation by
-	Jens Seidel <jensseidel@users.sf.net>.
-
-2005-07-04  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-02  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-07-02  Terance Sola  <terance@lyse.net>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2005-07-02  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-07-01  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-	* zh_TW.po: Updated Traditional Chinese translation.
-
-2005-07-01  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-06-28  Kaushal Kumar  <kakumar@novell.com>
-
-	* POTFILES.in: Added the remaining relevant gal files.
-
-	* POTFILES.skip: Added the gal files which need to be skipped.
-
-2005-07-06  Not Zed  <NotZed@Ximian.com>
-
-	* POTFILES.in: removed addressbook importer .server files, added
-	addressbook importer .c files.
-	remove mail & calendar importer .server file
-
-2005-07-01  Not Zed  <NotZed@Ximian.com>
-
-	* POTFILES.in: move import.glade to shell/ and remove
-	intelligent.c
-
-2005-06-27  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-06-27  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* POTFILES.in : Added the new exchange plugin files.
-	* POTFILES.skip : Updated the old files here.
-
-2005-06-26  Ilkka Tuohela <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-06-22  Abel Cheung  <maddog@linuxhall.org>
-
-	* zh_TW.po: Fix language team reference.
-
-2005-06-23  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-06-22  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-06-22  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-06-21  Not Zed  <NotZed@Ximian.com>
-
-	* en_AU.po, is.po, he.po, wa.po: Fix breaks from last commit.
-
-	* POTFILES.in: added all the new gal widgets & a couple of other
-	missing files.  re-sorted properly (it wasn't).  *.po: merged in
-	gal strings and updated (many strings no longer exist).
-
-2005-06-19  Guilherme de S. Pastore  <gpastore@cvs.gnome.org>
-
-	* pt_BR.po: Fixed tiny problem in Brazilian Portuguese
-	translation, only noticeable through usage (context).
-
-2005-06-18  Rhys Jones  <rhys@sucs.org>
-
-	* cy.po: Partially updated Welsh translation.
-
-2005-06-17  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Updated Slovak translation.
-
-2005-06-17  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2005-06-17  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-06-16  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2005-06-16  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-06-15  Hendrik Richter  <hendi@gnome-de.org>
-
-	* de.po: Updated German translation.
-
-2005-06-15  Hendrik Richter  <hendi@gnome-de.org>
-
-	* de.po: Fixed German Translation by
-	Andre Klapper <a9016009@gmx.de>
-
-2005-06-12  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2005-06-10  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2005-06-09  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-06-08  Terance Sola  <terance@lyse.net>
-
-	* nb.po: Updated
-	* no.po: Updated
-
-2005-06-08  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-06-08  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-06-08  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2005-06-07  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2005-06-07  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-06-06  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2005-06-05  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-06-05  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-06-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same
-
-2005-06-01  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-06-01  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-05-31  Hendrik Richter  <hendi@gnome-de.org>
-
-	* de.po: Updated German translation.
-
-2005-05-29  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2005-05-29  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-05-28  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-05-28  Abel Cheung  <maddog@linuxhall.org>
-
-	* POTFILES.in:
-	plugins/groupwise-features/org-gnome-shared-folder.error.xml ->
-	plugins/groupwise-features/org-gnome-shared-folder.errors.xml
-	widgets/misc/e-error.c -> e-util/e-error.c
-
-2005-05-27  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>,
-	Yavor Doganov <yavor@doganov.org>,
-	Ivelina Karcheva <anima@mail.bg>
-
-2005-05-23  Vivek Jain  <jvivek@novell.com>
-
-	* POTFILES.in: replaced shared-folder/
-	send-options/ groupwise-send-options/
-	groupwise-account-setup/ with groupwise-features/
-	added plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
-
-2005-05-21  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
-2005-05-19  Vivek Jain  <jvivek@novell.com>
-
-	* POTFILES.in: Added
-	plugins/print-message/org-gnome-print-message.eplug.xml
-
-2005-05-19  Kostas Papadimas <pkst@gnome.org>
-
-	*el.po Updated Greek Translation
-
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* POTFILES.in: moved widgets/misc/e-system-errors to
-	e-util/e-system.error.  Moved shell error file.
-	Moved calendar error file. filter error file.
-
-2005-05-15  Roozbeh Pournader  <roozbeh@farsiweb.info>
-
-	* fa.po: Updated Persian translation by
-	Hamed Malek <hamed@farsiweb.info>.
-
-2005-05-15  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Rostislav Raykov <zbrox@i-space.org>
-
-2005-05-11  Kostas Papadimas <pkst@gnome.org>
-
-	*el.po Updated Greek Translation
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* POTFILES.in: handle renamed error files.
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* POTFILES.in: updates for plugins.
-
-2005-05-05  Pawan Chitrakar  <pawan@nplinux.org>
-
-	* ne.po: Updated Nepali Translation
-
-2005-05-03  Roozbeh Pournader  <roozbeh@farsiweb.info>
-
-	* fa.po: Updated Persian translation by Meelad Zakaria
-	<meelad@farsiweb.info> and myself.
-
-2005-05-02  Roozbeh Pournader  <roozbeh@farsiweb.info>
-
-	* fa.po: Updated Persian translation by Meelad Zakaria
-	<meelad@farsiweb.info> and myself.
-
-2005-04-30  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-04-29  JP Rosevear  <jpr@novell.com>
-
-	* POTFILES.in: remove dead files
-
-2005-04-28 Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated Greek translation.
-
-2005-04-24  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-04-20  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-04-18  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2005-04-15  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-04-09  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2005-04-08  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-04-07  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation.
-
-2005-04-06  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-04-06  Nikos Charonitakis  <charosn@her.forthnet.gr>
-
-	* el.po: Updated Greek translation.
-
-2005-04-06  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2005-04-05  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2005-04-05  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Updated German translation.
-
-2005-04-04  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2005-04-02  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-03-31  Steve Murphy  <murf@e-tools.com>
-
-	* rw.po: Added Kinyarwanda translation.
-
-2005-03-31  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-03-31  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2005-03-30  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-03-29  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Hungarian translation updated.
-
-2005-03-29  Adi Attar  <aattar@cvs.gnome.org>
-
-	* xh.po: Added Xhosa translation.
-
-2005-03-27  Ahmad Riza H Nst  <ari@160c.afraid.org>
-
-	* id.po: Added Indonesian Translation.
-
-2005-03-27  Pawan chitrakar  <pawan@nplinux.org>
-
-	* ne.po: Update Nepali translation by Ganesh Ghimire
-
-2005-03-26  Josep Puigdemont  <josep@imatge-sintetica.com>
-
-	* ca.po: Updated Catalan translation.
-
-2005-03-26  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2005-03-26  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-03-24  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2005-03-22  Christian Rose  <menthos@menthos.com>
-
-	* POTFILES.in: Added missing file entry.
-	* sv.po: Updated Swedish translation.
-
-2005-03-22  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Updated German translation.
-
-2005-03-21  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-03-16  Pawan Chitrakar  <pawan@nplinux.org>
-
-	* ne.po: Added Nepali Translation
-
-2005-03-15  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-03-15  Guilherme de S. Pastore  <gpastore@cvs.gnome.org>
-
-	* pt_BR.po: Fixed a grammar problem with the "Error while"
-	message on the Brazilian Portuguese translation.
-
-2005-03-15  Stanislav Brabec  <sbrabec@suse.cz>
-
-	* cs.po: Fixed plural cases.
-
-2005-03-11  Baris Cicek <baris@teamforce.name.tr>
-
-	* tr.po: Updated Turkish Translation
-
-2005-03-10  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2005-03-09  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2005-03-07  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Iassen Pramatarov <turin@fsa-bg.org>
-
-2005-03-05  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2005-03-04  Laszlo Dvornik  <dvornik@gnome.hu>
-
-	* hu.po: Hungarian translation updated by Gabor Kelemen.
-
-2005-03-04  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-03-02  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2005-03-01  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2005-02-28  Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation
-	by Luca Ferretti <elle.uca@infinito.it>
-
-2005-03-01  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-02-28  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2005-02-29  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated Greek translation.
-
-2005-02-27  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2005-02-27  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-02-27  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2005-02-27  Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation
-	by Luca Ferretti <elle.uca@infinito.it>
-
-2005-02-27  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2005-02-24  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2005-02-23  JP Rosevear  <jpr@novell.com>
-
-	* POTFILES.in: e-passwords moved to e-d-s
-
-2005-02-23  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by
-	Josep Puigdemont <josep@imatge-sintetica.com>.
-
-2005-02-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Update
-	* no.po: Update
-
-2005-02-23  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2005-02-23  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-02-23  Ankit Patel <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2005-02-22  Nikos Charonitakis  <charosn@her.forthnet.gr>
-
-	* el.po: Updated Greek translation.
-
-2005-02-22  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2005-02-22  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2005-02-22  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2005-02-22  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-02-22  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2005-02-21  Maxim Dziumanenko <mvd@mylinux.com.ua>
-
-	* uk.po: Updated Ukrainian translation.
-
-2005-02-21  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2005-02-21  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2005-02-21  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2005-02-21  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2005-02-21  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Updated German translation.
-
-2005-02-21  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-02-21 Ankit Patel <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2005-02-20  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2005-02-20  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by
-	Xavi Conde <xaviconde@eresmas.com>.
-
-2005-02-20  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation from
-	Vincent Carriere <carriere_vincent@yahoo.fr>.
-
-2005-02-20  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-02-20  Miloslav Trma�  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2005-02-19  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2005-02-19  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-02-19  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated Greek translation.
-
-2005-02-18  Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation by Luca
-	Ferretti <elle.uca@infinito.it>
-
-2005-02-16  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2005-02-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Typo
-	* no.po: Fix typo
-
-2005-02-15  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2005-02-15  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2005-02-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Fix typo and update
-	* no.po: Same
-
-2005-02-14  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2005-02-14  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2005-02-14  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-02-14  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2005-02-14  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2005-02-13  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2005-02-13  David Lodge <dave@cirt.net>
-
-	* en_GB.po: Updated British translation.
-
-2005-02-12  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Updated German translation.
-
-2005-02-12  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2005-02-12  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2005-02-12  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2005-02-11  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-02-10  Christian Rose  <menthos@menthos.com>
-
-	* POTFILES.in: Sorted and added missing file entry.
-
-2005-02-10  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-02-10  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2005-02-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Update
-	* no.po: Update
-
-2005-02-10  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-02-10  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-02-10  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-02-09  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated  Greek translation.
-
-2005-02-08  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-02-08  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-02-07  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-02-07  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-02-07  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-02-07  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-02-06  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-02-06  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2005-02-05  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Updated German translation.
-
-2005-02-05  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanih translation.
-
-2005-02-05  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-02-04  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated  Greek translation.
-
-2005-02-02  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-02-01  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-02-01  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated  Russian translation
-
-2005-02-01  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated  Greek translation.
-
-2005-02-01  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-01-31  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-01-31  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-01-31 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2005-01-31  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-01-30  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Updated Slovak translation.
-
-2005-01-30  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-01-29  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-01-28  JP Rosevear  <jpr@novell.com>
-
-	Fixes #71930
-
-	* POTFILES.in: add missing e-error files
-
-2005-01-28  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2005-01-28  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-01-27  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-01-27  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-01-27  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2005-01-27  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Update
-	* no.po: Update
-
-2005-01-27  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2005-01-27  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Updated German translation.
-
-2005-01-26  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-01-26  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-01-25  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2005-01-25  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2005-01-25  Hendrik Richter  <hendrik@gnome-de.org>
-
-	* de.po: Updated German translation.
-
-2005-01-24  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-01-24  Hendrik Richter  <hendrik@gnome-de.org>
-
-	* de.po: Updated German translation.
-
-2005-01-24 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2005-01-23  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Updated German translation.
-
-2005-01-23  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Jo Vermeulen.
-
-2005-01-21  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-01-18  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Update
-	* no.po: Update
-
-2005-01-20  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2005-01-20  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Updated German translation.
-
-2005-01-19  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Updated German translation.
-
-2005-01-19  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-01-19  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* de.po: Partially updated German translation.
-
-2005-01-18  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-01-17  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-01-17  Nikos Charonitakis  <charosn@her.forthnet.gr>
-
-	* el.po: Updated Greek translation.
-
-2005-01-15  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-01-15  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2005-01-14  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-01-14 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: updated italian translation
-
-2005-01-13 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: updated italian translation
-
-2005-01-12  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2005-01-11  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2005-01-11  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-01-10  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2005-01-10  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2005-01-10  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2005-01-10  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-01-10  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-01-10  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-01-08  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Yet again updated Lithuanian translation.
-
-2005-01-08  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-01-08  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2005-01-08  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2005-01-07  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2005-01-07  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2005-01-05  Rodney Dawes  <dobey@novell.com>
-
-	* POTFILES.in: Remove mail-errors.xml (the .h belongs here, not the
-	straight .xml currently)
-
-2005-01-04  JP Rosevear  <jpr@novell.com>
-
-	* POTFILES.in: remove dead files
-
-2004-12-30  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	myself
-
-2004-12-29  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2004-12-20  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2004-12-18  JP Rosevear  <jpr@novell.com>
-
-	Fixes #68841
-
-	* pt_BR.po: fix markup in translated message
-
-2004-12-18  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2004-12-15  Rodney Dawes  <dobey@novellcom>
-
-	* POTFILES.in: Remove mail-account-gui.c
-
-2004-12-14  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation.
-
-2004-12-11  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-12-10  Rodney Dawes  <dobey@novell.com>
-
-	* POTFILES.in: Back out additional change to use shell-errors.xml.in
-
-2004-12-10  Rodney Dawes  <dobey@novell.com>
-
-	* POTFILES.in: Remove e-destination.c
-
-2004-12-09  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Rostislav Raykov <zbrox@i-space.org>
-
-2004-12-09  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2004-12-06  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2004-12-05  Baris Cicek <baris@teamforce.name.tr>
-
-	* tr.po: Fixed a typo in Turkish Translation
-
-2004-12-04  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2004-12-03  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* POTFILES.in:
-	Removed mail/mail-account-editor.c
-	Removed mail/mail-config-druid.c
-	They are no longer available.
-	* da.po: Updated Danish translation.
-
-2004-12-01  Dafydd Harries  <daf@muse.19inch.net>
-
-	* cy.po: Copied from the gnome-2-8 branch.
-
-2004-11-30  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Lode Vermeiren.
-
-2004-11-26  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2004-11-25  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2004-11-25  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2004-11-23  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Again updated Lithuanian translation. More to come soon.
-
-2004-11-23  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2004-11-21  Hendrik Richter  <hendrik@gnome-de.org>
-
-	* de.po: Merged German translation from gnome-2-8.
-
-2004-11-21  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2004-11-19  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2004-11-17  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Michel Klijmij.
-
-2004-11-15  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation.
-
-2004-11-13  Meelad Zakaria  <meelad@bamdad.org>
-
-	* fa.po: Updated Persian translation.
-
-2004-11-10  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2004-11-10  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation.
-
-2004-11-07  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2004-11-06  Sebastien Bacher  <seb128@debian.org>
-
-	* fr.po: Fix in the French translation.
-
-2004-11-04  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Fixed Czech translation (thanks to
-	Juraj Kubelka <Juraj.Kubelka@email.cz>).
-
-2004-10-26  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated translator-credits.
-
-2004-10-22  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2004-10-20  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2004-10-19  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2004-10-17  Nikos Charonitakis  <charosn@her.forthnet.gr>
-
-	* el.po: Updated Greek translation.
-
-2004-10-15  Hasbullah Bin Pit  <sebol@my-penguin.org>
-
-	* ms.po: Updated Malay translation.
-
-2004-10-15  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir Petkov <vpetkov@i-space.org>
-
-2004-10-12  Meelad Zakaria  <meelad@bamdad.org>
-
-	* fa.po: Updated Persian translation.
-
-2004-10-12  Hasbullah Bin Pit  <sebol@my-penguin.org>
-
-	* ms.po: Updated Malay translation.
-
-2004-10-12  Roozbeh Pournader  <roozbeh@farsiweb.info>
-
-	* fa.po: Updated Persian translation by Meelad Zakaria
-	<meelad@bamdad.org>.
-
-2004-10-12  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2004-10-12  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2004-10-10  Nikos Charonitakis  <charosn@her.forthnet.gr>
-
-	* el.po: Updated Greek translation.
-
-2004-10-09  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-10-08  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-10-07  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2004-10-06  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by
-	Xavier Conde Rueda <xaviconde@eresmas.com>.
-
-2004-10-06  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2004-10-05  Roozbeh Pournader  <roozbeh@farsiweb.info>
-
-	* fa.po: Updated Persian translation by Meelad Zakaria
-	<meelad@bamdad.org>.
-
-2004-10-05  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Michel Klijmij.
-
-2004-10-04  Roozbeh Pournader  <roozbeh@farsiweb.info>
-
-	* fa.po: Updated Persian translation by Meelad Zakaria
-	<meelad@bamdad.org>.
-
-2004-10-02  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2004-10-02  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-10-1  Mugurel Tudor  <mugurelu@go.ro>
-
-	* ro.po: Updated Romanian translation
-
-2004-09-30  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: updated italian translation.
-
-2004-09-30  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2004-09-30  Sebastien Bacher  <seb128@debian.org>
-
-	* fr.po: Fix in the French translation.
-
-2004-09-29  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-09-29  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: italian translation, locale and hotkey trim
-
-2004-09-28  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2004-09-27  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Reinout van Schouwen.
-
-2004-09-26  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2004-09-26  Roozbeh Pournader  <roozbeh@farsiweb.info>
-
-	* fa.po: Updated Persian translation by Meelad Zakaria
-	<meelad@bamdad.org>.
-
-2004-09-24  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-09-24  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation.
-
-2004-09-23  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: updated italian translation.
-
-2004-09-23  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-09-22  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation from
-	Craig Jeffares <cjeffares@novell.com>.
-
-2004-09-22  Craig Jeffares  <cjeffares@novell.com>
-
-	* it.po & zh_TW.po: Updated Italian & Chinese Trad translation.
-
-2004-09-21  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-09-21  Roozbeh Pournader  <roozbeh@sharif.edu>
-
-	* fa.po: Updated Persian translation by Meelad Zakaria
-	<meelad@bamdad.org>.
-
-2004-09-18  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2004-09-19  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2004-09-14  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2004-09-13  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2004-09-13  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated (unfinished).
-
-2004-09-12  Mugurel Tudor  <mugurelu@go.ro>
-
-	* ro.po: Updated Romanian translation
-
-2004-09-12  Hasbullah Bin Pit <sebol@my-penguin.org>
-
-	* ms.po: Updated Malay Translation.
-
-2004-09-11  Mugurel Tudor  <mugurelu@go.ro>
-
-	* ro.po: Updated Romanian translation
-
-2004-09-10  Akagic Amila  <bono@linux.org.ba>
-
-	* bs.po: Added Bosnian translation.
-
-2004-09-10  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-09-10  Raphael Higino  <raphaelh@cvs.gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2004-09-09  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated (unfinished).
-
-2004-09-09  Nikos Charonitakis  <charosn@her.forthnet.gr>
-
-	* el.po: Updated Greek translation.
-
-2004-09-09  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2004-09-08  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2004-09-07  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2004-09-06  David Lodge <dave@cirt.net>
-
-	* en_GB.po: Updated British translation.
-
-2004-09-06  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation.
-
-2004-09-06  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-09-05  Åsmund Skjæveland <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation:
-	Merged translations from gnome-2-8 branch.
-
-2004-09-04  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation.
-
-2004-09-03  JP Rosevear  <jpr@novell.com>
-
-	Fixes #65030
-
-	* en_GB.po: Correct typo
-
-2004-09-03  Baris Cicek <baris@teamforce.name.tr>
-
-	* tr.po: Updated Turkish Translation
-
-2004-09-02  Martin Willemoes Hansen  <mwh@sysrq.dk>
-
-	* da.po: Updated Danish translation
-
-2004-09-02  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation
-
-2004-09-01  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2004-09-01  Guntupalli Karunakar  <karunakar@freedomink.org>
-
-	* hi.po: Updated Hindi translation by
-	Rajesh Ranjan <rranjan@redhat.com>
-
-2004-08-30  Åsmund Skjæveland <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation:
-	Merged translations from gnome-2-8 branch.
-
-2004-08-28  Ales Nyakhaychyk  <nab@mail.by>
-
-	* be.po: Updated Belarusian translation.
-
-2004-08-29  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-08-28  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-08-28  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-08-28  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-08-28  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-08-26  Gustavo Maciel Dias Vieira  <gustavo@sagui.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation done by
-	Gustavo Maciel Dias Vieira <gustavo@sagui.org>.
-
-2004-08-26  Nikos Charonitakis  <charosn@her.forthnet.gr>
-
-	* el.po: Updated Greek translation.
-
-2004-08-26  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation from Sebastien
-	Bacher <seb128@debian.org>.
-
-2004-08-25  Hasbullah Bin Pit <sebol@imy-penguin.org>
-
-	* ms.po: Updated Malay Translation.
-
-2004-08-25  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-08-24  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-08-23  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2004-08-23  Nikos Charonitakis  <charosn@her.forthnet.gr>
-
-	* el.po: Updated Greek translation.
-
-2004-08-23  Stanislav Brabec  <sbrabec@suse.cz>
-
-	* cs.po: Typo fix.
-
-2004-08-23  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2004-08-23  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2004-08-23  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2004-08-22  Christian Neumair  <chris@gnome-de.org>
-
-	* de.po: Updated German translation.
-
-2004-08-22  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Update
-	* no.po: Update
-
-2004-08-22  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-08-22  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-08-22  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2004-08-20  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2004-08-20  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-08-19  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanih translation.
-
-2004-08-19  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-08-19  Maxim Dziumanenko <mvd@mylinux.com.ua>
-
-	* uk.po: Updated Ukrainian translation.
-
-2004-08-18  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Typo fix.
-
-2004-08-18  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Add this.
-
-2004-08-18  Åsmund Skjæveland <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2004-08-18  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-08-18  Laszlo Dvornik  <dvornik@gnome.hu>
-
-	* hu.po: Updated Hungarian translation by Gabor Kelemen.
-
-2004-08-18  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-08-18  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-08-17  Nikos Charonitakis  <charosn@her.forthnet.gr>
-
-	* elpo:  Updated Greek translation.
-
-2004-08-17  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-08-17  Ankit Patel <ankit@redhat.com>
-
-	* gu.po: Updated Final Gujarati Translation.
-
-2004-08-15  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-08-15  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation
-
-2004-08-15  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2004-08-14  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation
-
-2004-08-14  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-08-14  Ilkka Tuohela  <hile@iki.fi
-
-	* fi.po: Updated Finnish translation
-
-2004-08-14  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-08-14  Žygimantas Beru�ka  <uid0@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2004-08-13  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-08-13  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-08-13  Tommi Vainikainen  <thv@iki.fi>
-
-	* fi.po: Unified some fields in po headers for Finnish team.
-
-2004-08-13  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-08-13  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-08-12  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2004-08-12  Åsmund Skjæveland <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2004-08-12  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-08-11  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation from Dan Korostelev <dan@ats.energo.ru>
-
-2004-08-11  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-08-11  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-08-11  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-08-10  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-08-10  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2004-08-10  Laszlo Dvornik  <dvornik@gnome.hu>
-
-	* hu.po: Updated Hungarian translation by Gabor Kelemen.
-
-2004-08-09  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-08-09  Ankit Patel <ankit@redhat.com>
-
-	* gu.po: Updated Gujarati translation.
-
-2004-08-09  Amanpreet Singh Alam  <aalam@redhat.com>
-
-	* pa.po: Updated Panjabi translation.
-
-2004-08-08  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2004-08-07  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-08-07  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-08-06  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-08-06  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-08-06  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2004-08-05  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-08-05  Åsmund Skjæveland <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2004-08-05  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-08-04  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-08-03  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-08-03  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-08-03  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2004-08-03  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-08-02  JP Rosevear  <jpr@novell.com>
-
-	* POTFILES.in: move e-pilot-settings.c
-
-2004-08-02  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-08-02  Adam Weinberger  <adamw@gnome.org>
-
-	* POTFILES.in: Removed e-util/e-pilot-settings.c
-
-2004-08-02  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-07-31  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by
-	Xavier Conde Rueda <xaviconde@eresmas.com>.
-
-2004-07-31  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-07-31  Laszlo Dvornik  <dvornik@gnome.hu>
-
-	* hu.po: Updated Hungarian translation.
-
-2004-07-29  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation from
-	Sebastien Bacher <seb128@debian.org>.
-
-2004-07-29  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-07-28  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-07-28  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2004-07-28  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2004-07-28  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-07-27  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-07-26  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2004-07-26  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-07-25  Gil Osher  <dolfin@rpg.org.il>
-
-	* he.po: Added Hebrew translation.
-
-2004-07-23  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-07-23  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2004-07-23  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-07-22  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated.
-
-2004-07-21  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-07-20  Gustavo Maciel Dias Vieira <gustavo@sagui.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation done by
-	Gustavo Maciel Dias Vieira <gustavo@sagui.org>.
-
-2004-07-20  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-07-18  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-07-18  Laszlo Dvornik  <dvornik@gnome.hu>
-
-	* hu.po: Updated Hungarian translation by Gabor Kelemen.
-
-2004-07-16  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-07-16  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir "Kaladan" Petkov <vpetkov@i-space.org>
-
-2004-07-14  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-07-15  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-07-14  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-07-13  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2004-07-13  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: updated Russian translation
-
-2004-07-13  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-07-12  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: updated Russian translation
-
-2004-07-10  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-07-10  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-07-10  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-07-08  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2004-07-08  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated.
-
-2004-07-07  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-07-07  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-07-06  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-07-05  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2004-07-04  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-07-03  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Translation updated.
-
-2004-07-02  Christian Neumair  <chris@gnome-de.org>
-
-	* de.po: Updated German translation.
-
-2004-07-02  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian translation.
-
-2004-07-02  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated.
-
-2004-07-02  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Added links to bug reports.
-
-2004-07-01  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2004-06-30  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-06-29  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Translation updated.
-
-2004-06-29  Christian Rose  <menthos@menthos.com>
-
-	* POTFILES.in: Removed non-existing .h files, added missing files,
-	sorted the whole thing.
-
-2004-06-28  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Update this.
-	* no.po: Update this too.
-
-2004-06-25  Rodney Dawes  <dobey@novell.com>
-
-	* POTFILES.in: Update for removed files
-
-2004-06-24  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* wa.po: Updated Walloon file
-
-2004-06-23  Rodney Dawes  <dobey@novell.com>
-
-	* POTFILES.in: Update for removed files
-
-2004-06-20  Arafat Medini  <lumina@silverpen.de>
-
-	* ar.po: Added Arabic translation.
-
-2004-06-19  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-06-18  Jeffrey Stedfast  <fejj@novell.com>
-
-	* POTFILES.in: Added error.xml.h files
-
-2004-06-18  Not Zed  <NotZed@Ximian.com>
-
-	* POTFILES.in: fix up for mail glade ifle changes.
-
-2004-06-18  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-06-17  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-06-17  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-06-17  Metin Amiroff  <metin@karegen.com>
-
-	* az.po: Translation updated by Mətin �mirov.
-
-2004-06-17  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-06-17  Not Zed  <NotZed@Ximian.com>
-
-	* POTFILES.in: moved the filter files around.
-
-2004-06-17  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-06-16  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2004-06-16  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-06-16  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-06-15  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-06-15  Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation with correction of %%+05d.
-
-2004-06-15  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation with correction of %%+05d.
-
-2004-06-14  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-06-14  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-06-13  Metin Amiroff  <metin@karegen.com>
-
-	* az.po: Translation updated by Mətin �mirov.
-
-2004-06-13  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated  Greek translation.
-
-2004-06-13  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-06-12  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-06-12  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-06-10  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-	* POTFILES.in: Correct path error.
-
-2004-06-10  Rodney Dawes  <dobey@novell.com>
-
-	* POTFILES.in: Update for removed files
-
-2004-06-08  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated.
-
-2004-06-08  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-06-07  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-06-06  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-06-05  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by
-	Xavier Conde Rueda <xaviconde@eresmas.com>.
-
-2004-06-05  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-06-05  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-06-04  Andras Timar  <timar@gnome.hu>
-
-	* hu.po: Updated Hungarian translation.
-
-2004-06-03  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated.
-
-2004-05-28  JP Rosevear  <jpr@novell.com>
-
-	* POTFILES.in: remove about box
-
-2004-05-27  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-05-26  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* POTFILES.in: Updated.
-	* fr.po: Updated French translation.
-
-2004-05-26  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2004-05-25  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-05-25  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated.
-
-2004-05-25  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-05-25  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Vladimir "Kaladan" Petkov <vpetkov@i-space.org>
-
-2004-05-25  Joop Stakenborg  <pg4i@xs4all.nl>
-
-	* nl.po: fixed attribution to not cause crash.  See #58882.
-
-2004-05-24  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-05-23  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated.
-
-2004-05-23  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-05-22  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation
-
-2004-05-22  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-05-22  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2004-05-22  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-05-22  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated.
-
-2004-05-21  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-05-20  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-05-19  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-05-19  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by
-	Xavier Conde Rueda <xaviconde@eresmas.com>.
-
-2004-05-19  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-05-18  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-05-17  Gustavo Maciel Dias Vieira <gustavo@sagui.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation done by
-	Gustavo Maciel Dias Vieira <gustavo@sagui.org>.
-
-2004-05-16  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2004-05-15  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-05-13  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-05-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2004-05-12  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated.
-
-2004-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* POTFILES.in: fix for xml error files, get i18n strings from
-	generated .h files.
-
-2004-05-11  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-05-10  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated.
-
-2004-05-10  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Spanish translation updated.
-
-2004-05-10  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-05-06  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-05-06  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated.
-
-2004-05-05  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-05-04  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-05-04  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spansih translation.
-
-2004-05-03  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-05-03  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-05-03  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-05-02  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Italian translation updated.
-
-2004-05-02  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Add some missing files.
-	* no.po: Update Norwegian translation.
-
-2004-05-02  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-05-02  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-05-01  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-05-01  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-05-01  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-05-01  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-05-01  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated and revised Portuguese translation.
-
-2004-04-30  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-04-30  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-04-30  Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Italian translation updated.
-
-2004-04-30  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-04-29  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-04-29  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-04-29  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-04-29  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-04-28  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-04-28  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-04-28  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-04-28  Not Zed  <NotZed@Ximian.com>
-
-	* POTFILES.in: Added mailer error files.
-
-2004-04-27  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-04-27  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-04-26  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-04-25  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-04-25  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-04-24  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spansih translation.
-
-2004-04-24  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation.
-
-2004-04-24  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-04-22  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-04-22  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-04-21  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by
-	Xavi Conde Rueda <xaviconde@eresmas.com>.
-
-2004-04-21  Carlos Perelló Marín <carlos@gnome.org>
-
-	* es.po: Fixed a typo and some fuzzy updates.
-
-2004-04-20  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-04-20  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-04-21  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-04-20  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-04-19  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-04-19  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-04-17  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-04-17  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-04-17  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-04-16  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-04-15  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-04-15  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-04-15  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-04-14  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-04-14  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation done by
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>.
-
-2004-04-14  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-04-14  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-04-13  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-04-13  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-04-12  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updated British English translation
-
-2004-04-12  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-07-11  Evandro Fernandes Giovanini <evandrofg@ig.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation
-	from Afonso Celso Medina <medina@maua.br>.
-
-2004-04-10  Adam Weinberger  <adamw@gnome.org>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-07-10  Evandro Fernandes Giovanini <evandrofg@ig.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation
-	from Afonso Celso Medina <medina@maua.br>.
-
-2004-04-10  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-04-09  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: s/eab-destination/e-destination/
-
-2004-04-08  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-04-07  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-04-07  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-04-07  Samúel Jón Gunnarsson  <sammi@techattack.nu>
-
-	* is.po:  Added Icelandic translation by
-	Helgi Þormar Þorbjörnsson  <helgi@trance.is>
-
-2004-04-06  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-04-05  Iñaki Larrañaga  <dooteo@euskalgnu.org>
-
-	* eu.po: Update Basque translation.
-
-2004-04-05  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-04-04  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-04-01  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2004-03-31  Gareth Owen  <gowen72@yahoo.com>
-
-	* en_GB.po: Updaed British English translation
-
-2004-03-31  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-03-31  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: Removed the imap4 files
-
-2004-03-30  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: Removed missing camel-imap-command.c for imap4
-
-2004-03-29  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-03-29  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by
-	Xavier Conde Rueda <xaviconde@eresmas.com>.
-
-2004-03-28  Robert Sedak  <robert.sedak@sk.htnet.hr>
-
-	* hr.po: Updated Croatian translation.
-
-2004-03-28  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-03-27  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation.
-
-2004-03-27  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-03-27  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-03-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2004-03-26  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-	* POTFILES.in: Added missing files.
-
-2004-03-25  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2004-03-25  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation done by
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>.
-
-2004-03-25  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: Remove mail/local-config.glade
-
-2004-03-24  Chris Toshok  <toshok@ximian.com>
-
-	* POTFILES.in: add addressbook/gui/contact-editor/eab-editor.c.
-
-2004-03-24  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2004-03-23  Miloslav Trmac  <mitr@volny.cz>
-
-	* az.po: Updated Czech translation.
-
-2004-03-23  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-03-22  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: updated Spansih translation.
-
-2004-03-22  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-03-21 Alastair McKinstry <mckinstry@debian.org>
-
-	* ga.po: Updated Irish translation.
-
-2004-03-21  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-03-21  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by
-	Xavier Conde Rueda <xaviconde@eresmas.com>.
-
-2004-03-19  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-03-19  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-03-18  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-03-17  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated  Greek translation.
-
-2004-03-17  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-03-17  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by the
-	Catalan Evolution team.
-
-2004-03-16  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-03-15  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-03-14  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2004-03-14  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-03-12  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-03-11  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation done by
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>.
-
-2004-03-11  Alexander Winston  <alexander.winston@comcast.net>
-
-	* en_CA.po: Updated Canadian English translation.
-
-2004-03-11  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2004-03-10  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-03-09  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-03-09  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-03-09  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by the
-	Catalan Evolution team.
-
-2004-03-09  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2004-03-08  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-03-06  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-03-05  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-03-06  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-03-04  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-03-03  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-03-02  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated  Greek translation.
-
-2004-03-02  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-03-01  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2004-03-01  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-02-29  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Translation updated
-
-2004-02-28  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-02-27 Leonid Kanter <leon@asplinux.ru>
-
-	* ru.po: Updated Russian translation
-
-2004-02-27  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated.
-
-2004-02-26  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2004-02-27  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-02-26  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Kees van den Broek.
-
-2004-02-26  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-02-25  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by the
-	Catalan Evolution team.
-
-2004-02-24 Alastair McKinstry <mckinstry@debian.org>
-
-	* ga.po: Updated.
-
-2004-02-24  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: Add mail/em-format-quote.c
-
-2004-02-24  JP Rosevear <jpr@ximian.com>
-
-	* POTFILES.in: remove dead file
-
-2004-02022  Adam Weinberger  <adamw@FreeBSD.org>
-
-	* en_CA.po: Added "en_CA" (Canadian English) translation.
-
-2004-02-23  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-02-22  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated finnish translation.
-
-2004-02-22  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2004-02-21  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-02-20  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-02-20  Danilo Å egan  <dsegan@gmx.net>
-
-	* POTFILES.in: Added missing files.
-
-2004-02-19  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation.
-
-2004-02-19  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-02-18  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-02-17  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-02-17  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-02-16  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-02-16  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-02-13  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated  Greek translation.
-
-2004-02-13  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation.
-
-2004-02-12  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by the
-	Catalan Evolution team.
-
-2004-02-12  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: Remove dead files and add new ones
-
-2004-02-11  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-02-10  JP Rosevear <jpr@ximian.com>
-
-	* POTFILES.in: remove files that were killed
-
-2004-02-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2004-02-08  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-02-07  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated finnish translation.
-
-2004-02-07  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-02-06  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-02-06  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-02-05  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: Remove e-shell-view-menu.c
-
-2004-02-04  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated finnish translation.
-
-2004-02-04  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-02-03  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: Updated with recent additions/moves
-
-2004-02-03  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-02-02  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated finnish translation.
-
-2004-02-02  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-02-02  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation by the
-	Catalan Evolution team.
-
-2004-02-02 Alastair McKinstry <mckinstry@computer.org>
-
-	* ga.po: Updated Irish translation.
-
-2004-02-01  Robert Sedak  <robert.sedak@sk.htnet.hr>
-
-	* hr.po: Updated Croatian translation.
-
-2004-01-31  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation.
-
-2004-02-01  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-01-31  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2004-01-30  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: Removed e-meeting-model.c
-
-2004-01-30  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-01-30  Mətin �mirovf  <metin@karegen.com>
-
-	* az.po: Translation updated by Mətin �mirov.
-
-2004-01-30  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-01-30  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-01-29  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated translation.
-
-2004-01-29  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-01-29  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2004-01-28  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2004-01-28  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po: Marked all plural-forms bugs with 'bug: plural-forms'.
-
-2004-01-28  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2004-01-28  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-01-28 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: updated italian translation.
-
-2004-01-28  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Fixed Czech translation.
-
-2004-01-27  Marco Ciampa <ciampix@libero.it>
-
-	* it.po: updated italian translation.
-
-2004-01-27  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2004-01-27  Artur Flinta  <aflinta@cvs.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2004-01-27  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2004-01-26 Nikos Charonitakis  <frolix68@yahoo.gr>
-
-	* el.po: Updated Greek translation.
-
-2004-01-26 Alastair McKinstry <mckinstry@computer.org>
-
-	* ga.po: Updated translations.
-
-2004-01-26  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2004-01-26  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-01-25  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation from
-	Sebastien Bacher <seb128@debian.org>.
-
-2004-01-25  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Daniel van Eeden.
-
-2004-01-25  Andras Timar  <timar@gnome.hu>
-
-	* hu.po: Updated Hungarian translation.
-
-2004-01-25  Andras Timar  <timar@gnome.hu>
-
-	* hu.po: Updated Hungarian translation.
-
-2004-01-25  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Merge from evolution-1-4-branch.
-
-2004-01-25  Christian Neumair  <chris@gnome-de.org>
-
-	* de.po: Updated German translation.
-
-2004-01-25  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-01-25  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated  Greek translation.
-
-2004-01-25  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation from
-	Yannick Marchegay <yannick.marchegay@lokanova.com>.
-
-2004-01-25  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2004-01-24  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2004-01-24  Sanlig Badral  <badral@openmn.org>
-
-	* mn.po: Added Mongolian translation.
-
-2004-01-24  Takeshi AIHANA <aihana@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* tr.po: remove duplicate msgid's
-
-2004-01-24  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
-
-	* ru.po: Updated Russian translation
-	from Russian team <gnome-cyr@gnome.org>.
-
-2004-01-24  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-01-23  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation done by
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>.
-
-2004-01-23  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-01-23  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2004-01-21  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: Updated for changes to the keys file in data/
-
-2004-01-21  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Kees van den Broek.
-
-2004-01-21  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-01-21  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-01-20  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated Greek translation.
-
-2004-01-19 Alastair McKinstry <mckinstry@computer.org>
-
-	* ga.po: Updated Irish translation.
-
-2004-01-19  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2004-01-19  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation.
-
-2004-01-18 Alastair McKinstry <mckinstry@computer.org>
-
-	* ga.po: Updated Irish translation.
-
-2004-01-18  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-01-17  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-	* POTFILES.in: Added camel/providers/groupwise/camel-gw-listener.c.
-
-2004-01-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2004-01-15  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-01-15  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2004-01-14 Alastair McKinstry <mckinstry@computer.org>
-
-	* ga.po: Updated Irish translation.
-
-2004-01-14  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-01-14  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-	* POTFILES.in: Added missing files.
-
-2004-01-14  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-01-14  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-01-13  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2004-01-13  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-01-13  Žygimantas Beru�ka  <uid0@tuxfamily.org>
-
-	* lt.po: Updated Lithuanian translation by Tomas Kuliavas.
-
-2004-01-13  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-01-12  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-01-12  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2004-01-11  Roozbeh Pournader  <roozbeh@sharif.edu>
-
-	* fa.po: Updated slightly.
-
-2004-01-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Added missing files.
-	* no.po: Updated slightly.
-
-2004-01-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2004-01-10  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-	* POTFILES.in: Updated.
-
-2004-01-09  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: Update the list of translatable files
-
-2004-01-09  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-01-09  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2004-01-08  Robert Sedak  <robert.sedak@sk.htnet.hr>
-
-	* hr.po: Updated Croatian translation.
-
-2004-01-07  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-01-07  Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2004-01-06  Kostas Papadimas <pkst@gnome.org>
-
-	* el.po: Updated Greek translation.
-
-2004-01-06  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-01-05  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-	* POTFILES.in: Added missing files.
-
-2004-01-05  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Added Albanian translation.
-
-2004-01-04  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2004-01-03  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2004-01-03  Roozbeh Pournader  <roozbeh@sharif.edu>
-
-	* fa.po: Updated Persian translation.
-
-2004-01-01  Roozbeh Pournader  <roozbeh@sharif.edu>
-
-	* fa.po: Added Persian translation.
-
-2004-01-01  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2003-12-30  JP Rosevear <jpr@ximian.com>
-
-	* POTFILES.in: remove dead file
-
-2003-12-29  JP Rosevear <jpr@ximian.com>
-
-	* POTFILES.in: remove dead files
-
-2003-12-22  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2003-12-20  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-12-19  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2003-12-18  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-12-15  Rodney Dawes  <dobey@ximian.com>
-
-	* it.po: Fix mismatched msgstr on line 11876
-
-2003-12-15  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-12-14  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-12-13  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2003-12-13  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2003-12-08  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2003-12-07 Paul Duffy <dubhthach@compsoc.nuigalway.ie>
-
-	* ga.po: Updated Irish Translation, submitted by David O'Callaghan <david.ocallaghan@cs.tcd.ie>
-
-2003-12-02  Rodney Dawes  <dobey@ixmian.com>
-
-	* POTFILES.in: Remove missing files, Add files with strings
-	* POTFILES.skip: Remove missing files
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: Remove missing files
-
-2003-11-27  Metin Amiroff  <metin@karegen.com>
-
-	* az.po: Updated Azerbaijani translation.
-
-2003-11-26  Chris Toshok  <toshok@ximian.com>
-
-	* POTFILES.in: add smime/gui/certificate-viewer.c and
-	smime/lib/e-pkcs12.c
-
-2003-11-24  Marco Ciampa <ciampix@libero.it>
-
-	*  it.po: Updated italian translation
-
-2003-11-19  Rodney Dawes  <dobey@ximian.com>
-
-	* it.po: Fixed msgstr missing ending
-
-
-2003-11-19  Marco Ciampa <ciampix@libero.it>
-
-	*  it.po: Updated italian translation
-
-2003-11-18  Hasbullah Bin Pit <sebol@ikhlas.com>
-
-	* ms.po: Updated initial Malay Translation by
-	MIMOS Open Source Development Group <ismas@mimos.my>
-
-2003-11-17  Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>
-
-	* pl.po: Updated Polish translation
-
-2003-11-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* POTFILES.in: Update.
-
-2003-11-13  JP Rosevear <jpr@ximian.com>
-
-	* POTFILES.in: remove dead file
-
-2003-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* POTFILES.in: add smime/lib/e-cert-db.c
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* POTFILES.in: update
-
-2003-10-30  JP Rosevear <jpr@ximian.com>
-
-	* POTFILES.in: remove dead file
-
-2003-10-30  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2003-10-23  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: s/smime-gui.glade/smime-ui.glade/
-
-2003-10-23  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: Add some missing files, and remove files
-	that have been removed from CVS
-	* POTFILES.skip: Add data/evolution.desktop.in
-
-2003-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* POTFILES.in: add smime files.
-
-2003-10-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Removed some unused mail source files
-
-2003-10-22  Dan Winship  <danw@ximian.com>
-
-	* POTFILES.in, POTFILES.skip: update to match the tree.
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* POTFILES.in: removed calendar-model.c.
-
-2003-10-13  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian Nynorsk translation.
-
-2003-10-09  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian (nynorsk) translation.
-
-2003-10-02  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian (nynorsk) translation.
-
-2003-10-01  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian (nynorsk) translation.
-
-2003-09-26  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated Norwegian (nynorsk) translation.
-
-2003-09-26  Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2003-09-25  Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2003-09-23  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Updated.
-
-2003-09-23  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Minor update.
-
-2003-09-18  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: And now with correct charset.
-
-2003-09-16  Åsmund Skjæveland  <aasmunds@fys.uio.no>
-
-	* nn.po: Roughly two hundred strings translated or defuzzed. Still
-	a long way to go (25% left), but every little bit helps.
-
-2003-09-15 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation (replay date corrected...)
-
-2003-09-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	* POTFILES.in: Add some files that were missing, remove some test
-	programs that don't need i18n, sort.
-
-2003-09-10 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-09-07  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Merged from evolution-1-4-branch.
-
-2003-08-20 Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
-
-	* zh_CN.po: Removed illegal '-'s from strptime msgstr, this fixes
-	#43558, Appointment Editor always gives time validation error for
-	apptmnts in non UTF-8/non ASCII locales.
-
-2003-08-20  Hasbullah Bin Pit <sebol@ikhlas.com>
-
-	* ms.po: Updated initial Malay Translation by
-	MIMOS Open Source Development Group <syed@mimos.my>
-
-2003-08-07  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Merged from evolution-1-4-branch.
-
-2003-08-06  Dan Winship  <danw@ximian.com>
-
-	* it.po: Fix a bug (control characters accidentally inserted into
-	the file?) and a warning (extra "
-")
-
-2003-08-05 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation (revision completed).
-
-2003-08-04 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation (under revision 91% completed).
-
-2003-08-03 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation (under revision 35% completed).
-
-2003-08-02  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation by
-	Brigitte Le Grand <brigitte.le.grand@sun.com>
-
-2003-08-02 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation (under revision 25% completed).
-
-2003-08-01  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-	* es.po: Updated Spanish translation by
-	Francisco Javier F. Serrador <serrador@arrakis.es>.
-
-2003-07-26  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po,sr@Latn.po: Updated Serbian translation by Serbian team
-	(Prevod.org).
-
-	* POTFILES.in: Removed "widgets/misc/e-messagebox.c" because it
-	was removed from repository on July 23, by danw.
-
-2003-07-26 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-07-22  Christian Neumair  <chris@gnome-de.org>
-
-	* de.po: Updated German translation.
-
-2003-07-21  Hasbullah Bin Pit <sebol@ikhlas.com>
-
-	* ms.po: Added initial Malay Translation by
-	MIMOS Open Source Development Group <syed@mimos.my>
-
-2003-07-19  Abel Cheung  <maddog@linux.org.hk>
-
-	* bg.po, ga.po, gl.po, lt.po: Convert to UTF-8 and merge with newest
-	template.
-
-2003-07-10  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-	* es.po: Updated Spanish translation by
-	Francisco Javier F. Serrador <serrador@arrakis.es>.
-
-2003-07-07 Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-	* es.po: Updated Spanish translation by
-	Francisco Javier F. Serrador <serrador@arrakis.es>.
-
-2003-06-26  Kostas Papadimas <pkst@gmx.net>
-
-	* el.po: Greek translation updated by Nikos Charonitakis <charosn@her.forthnet.gr>
-
-2003-06-25  Ivan Stojmirov  <stojmir@linux.net.mk>
-
-	* mk.po: Updated Macedonian translation.
-
-2003-06-25  Kang Jeong-Hee  <Keizi@mail.co.kr>
-
-	* ko.po: Updated Korean translation.
-
-2003-06-23  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-06-23  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Committed updated Turkish translation by Gorkem Cetin.
-
-2003-06-23  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-	* es.po: Updated Spanish translation by
-	Francisco Javier F. Serrador <serrador@arrakis.es>.
-
-2003-06-23 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-06-22  Kostas Papadimas <pkst@gmx.net>
-
-	* el.po: Greek translation updated by Nikos Charonitakis <charosn@her.forthnet.gr>
-
-2003-06-22  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation by Serbian team
-	(Prevod.org).
-
-2003-06-21  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated.
-
-2003-06-21  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated.
-
-2003-06-20  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-06-18  Andras Timar <timar@gnome.hu>
-
-	* hu.po: Proofreading: 100%
-
-2003-06-20  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-06-19  Danilo Å egan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Added Serbian translation by Serbian team
-	(Prevod.org).
-
-2003-06-18  Andras Timar <timar@gnome.hu>
-
-	* hu.po: Translation: 100% reached, Proofreading: 37%
-
-2003-06-19 Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation by
-	Funda Wang <fundawang@linux.net.cn>.
-
-2003-06-19 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2003-06-19  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation done by
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>.
-
-2003-06-19 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2003-06-18  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Committed updated Turkish translation by Gorkem Cetin.
-
-2003-06-18  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-	* es.po: Updated Spanish translation by
-	Francisco Javier F. Serrador <serrador@arrakis.es>.
-
-2003-06-18  Andras Timar <timar@gnome.hu>
-
-	* hu.po: Updated Hungarian translation.
-
-2003-06-17  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-	* es.po: Updated Spanish translation by
-	Francisco Javier F. Serrador <serrador@arrakis.es>.
-
-2003-06-16  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Committed updated Turkish translation by Gorkem Cetin.
-
-2003-06-16  Andras Timar <timar@gnome.hu>
-
-	* hu.po: Updated Hungarian translation.
-
-2003-06-15  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated.
-
-2003-06-14  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation, minor fixes.
-
-2003-06-10  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation done by
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>.
-
-2003-06-09  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-	* es.po: Updated Spanish translation from
-	Francisco Javier Fernandez <serrador@arrakis.es>.
-
-2003-06-04  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Fixed some bugs in Czech translation.
-
-2003-06-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* zh_CN.po: Updated (from Wang Li <charles@linux.net.cn> and Funda
-	Wang <fundawang@en2china.com>).
-
-2003-06-03 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2003-06-03  Stanislav Brabec  <sbrabec@suse.cz>
-
-	* cs.po: Fixed quotes: \" -> \".
diff --git a/po/ChangeLog.pre-1-4 b/po/ChangeLog.pre-1-4
deleted file mode 100644
index 58d6330957..0000000000
--- a/po/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,4726 +0,0 @@
-2003-06-02  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated.
-
-2003-05-30  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated.
-
-2003-05-30  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
-
-	* ru.po: Updated Russian translation
-	from Russian team <gnome-cyr@gnome.org>.
-
-2003-05-30  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated.
-
-2003-05-28  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated.
-
-2003-05-27  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
-
-	* be.po: Updated Belarusian translation
-	from Belarusian team <i18n@mova.org>.
-
-2003-05-26  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-        
-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>
-
-2003-05-26  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated.
-
-2003-05-22  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Update translation.
-
-2003-05-22  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
-
-	* be.po: Added Belarusian translation
-	from Belarusian team <i18n@mova.org>.
-
-2003-05-22  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * pt.po: Updated Portuguese translation.
-
-2003-05-21  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-05-21  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-05-20  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-05-20  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-	* es.po: Updated by Francisco Javier Fernandez <serrador@arrakis.es>
-
-2003-05-19  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-05-19  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
-
-	* ru.po: updated Russian translation
-	from Russian team <gnome-cyr@gnome.org>.
-
-2003-05-17  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-05-17  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation done by
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>.
-
-2003-05-14  Anders Carlsson  <andersca@codefactory.se>
-
-	* sv.po: Fix the last part of #113003.
-
-2003-05-14  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Fix #113003 in bugzilla.gnome.org.
-
-2003-05-14  Kenneth Rohde Christiansen  <kenneth@gnu.org>
-
-	* da.po: Updated a bit.
-
-2003-05-14  Carlos Perelló Marín <carlos@gnome.org>
-
-	* es.po: Updated by Francisco Javier Fernandez <serrador@arrakis.es>
-
-2003-05-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2003-05-11  Abel Cheung  <maddog@linux.org.hk>
-
-	* POTFILES.skip: Remove non-existant file(s).
-	* ca.po, en_AU.po, en_GB.po, et.po, eu.po, ro.po:
-	  Converted to UTF-8.
-
-2003-05-08  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * pt.po: Updated Portuguese translation.
-
-2003-05-07 Christophe Fergeau <teuf@users.sourceforge.net>
-
-	* fr.po: Updated French translation.
-
-2003-05-06 Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2003-05-05  Christian Neumair  <chris@gnome-de.org>
-
-	* de.po: Updated German translation.
-
-2003-04-29  Takuo KITAME  <kitame@debian.org>
-
-	* ja.po: Updated Japanese translation.
-
-2003-04-29  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-04-28  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-04-28  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-04-27  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * pt.po: Updated portuguese translation.
-
-2003-04-26  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-04-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	* POTFILES.in: Added calendar/gui/dialogs/delete-error.c
-	
-2003-04-25  Pablo Gonzalo del Campo <pablodc@bigfoot.com>
-
-        * es.po: Updated Spanish translation by
-                 Francisco Javier Fernandez <serrador@arrakis.es>
-
-2003-04-25  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-04-24  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated.
-
-2003-04-24  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-04-24  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-04-23  Pablo Gonzalo del Campo <pablodc@bigfoot.com>
-
-        * es.po: Updated Spanish translation by
-                 Francisco Javier Fernandez <serrador@arrakis.es>
-
-2003-04-23  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated.
-
-2003-04-23  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-04-23  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-04-23  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated.
-
-2003-04-22  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * pt.po: Updated Portuguese translation.
-
-2003-04-22  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-04-17  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * pt.po: Updated Portuguese translation.
-
-2003-04-17  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-04-17  Christian Neumair  <chris@gnome-de.org>
-
-	* POTFILES.in: Removed erroneous line.
-	Thanks to Christian Rose who reported that issue.
-	* POTFILES.skip: Removed obsolete line.
-
-2003-04-17  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-04-16  Christian Neumair  <chris@gnome-de.org>
-
-	* POTFILES.skip: Added missing files.
-	* de.po: Updated German translation.
-
-2003-04-15  Wang Jian <lark@linux.net.cn>
-
-	* zh_CN.po: Fixed an erroneous translation for "message".
-
-2003-04-14  Pablo Gonzalo del Campo <pablodc@bigfoot.com>
-
-        * es.po: Updated Spanish translation by
-                 Francisco Javier Fernandez <serrador@arrakis.es>
-
-2003-04-13  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * pt.po: Updated Portuguese translation.
-
-2003-04-12  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-04-12  Christian Neumair  <chris@gnome-de.org>
-
-	* POTFILES.in: Added missing files.
-	* POTFILES.skip: Added tools/evolution-addressbook-export*.
-	* de.po: Updated German translation.
-
-2003-04-11  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-04-10  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-04-09  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-04-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* POTFILES.in: Remove tools/evolution-addressbook-export.c, which
-	is gone now.
-
-2003-04-07  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* POTFILES.in: add tools/killev.c
-
-2003-04-06  Sami Pesonen <sampeson@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2003-04-06  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-04-03  Pablo Gonzalo del Campo <pablodc@bigfoot.com>
-
-        * es.po: Updated Spanish translation by
-                 Francisco Javier Fernandez <serrador@arrakis.es>
-
-2003-04-01  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-03-31  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2003-03-31  Yuriy Syrota  <rasta renome.rovno.ua>
-
-	* uk.po: Updated Ukrainian translation.
-
-2003-03-30  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech  translation.
-
-2003-03-29  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation done by
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>.
-
-2003-03-29  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-03-29  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * pt.po: Finished updating Portuguese translation.
-
-2003-03-28  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-    * es.po: Updated Spanish translation by
-	  Francisco Javier Fernandez <serrador@arakis.es>
-
-2003-03-28  Christian Neumair  <chris@gnome-de.org>
-
-	* de.po: Updated German translation.
-
-2003-03-27  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * pt.po: Non-final update to Portuguese translation.
-
-2003-03-27  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-03-24  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-03-23  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * pt.po: Non-final update to Portuguese translation.
-
-2003-03-23  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-03-23  Abel Cheung  <maddog@linux.org.hk>
-
-	* POTFILES.in, POTFILES.skip: Remove vanished files.
-	* zh_TW.po: Updated traditional Chinese translation from
-	  Chao-Hsiung Liao <pesder.liao@msa.hinet.net>
-
-2003-03-21  Christian Neumair  <chris@gnome-de.org>
-
-	* POTFILES.in, POTFILES.skip: Added missing files.
-	* de.po: Updated German translation.
-
-2003-03-21  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-03-20  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: Remove mail-search-dialogue.c
-	
-2003-03-18  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Fixed errors in Czech translation.
-
-2003-03-18  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * pt.po: Initial Portuguese translation update.
-
-2003-03-17  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-        * es.po: Updated Spanish translation by 
-                 Francisco Javier Fernandez <serrador@arrakis.es>
-
-2003-03-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2003-03-14  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-03-14  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-03-14  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-        * es.po: Updated Spanish translation by
-          Francisco Javier Fernandez <serrador@arrakis.es>.
-
-2003-03-13  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2003-03-13  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-03-11  Christian Neumair  <chris@gnome-de.org>
-
-	* de.po: Updated German translation.
-
-2003-03-11  Marco Ciampa  <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-03-07  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-03-07  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-03-05  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-03-03  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated by Kees van den Broek.
-
-2003-03-02  Sami Pesonen <sampeson@iki.fi>
-
-	* fi.po: converted fi.po to UTF-8 encoding & updated.
-
-2003-03-02  Rodney Dawes  <dobey@ximian.com>
-
-	* POTFILES.in: s/server.in$/server.in.in/
-	
-2003-02-26  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-02-25  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-02-25  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* vi.po: Updated Vietnamese file
-
-2003-02-21  Marco Ciampa <ciampix@libero.it>
-
-	* it.po: converted it.po in UTF-8 encoding & updated.
-
-2003-02-21  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-02-21  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-	* es.po: Updated Spanish translation 
-      from Francisco J Fernandez <serrador@arrakis.es>.
-
-2003-02-20  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-02-20  Artis Trops  <hornet@navigator.lv>
-
-	* lv.po: Updated Latvian tanslation by Peteris Krisjanis.
-
-2003-02-18  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated by Vincent van Adrighem.
-
-2003-02-18  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
-
-	* ru.po: updated Russian translation
-	from Russian team <gnome-cyr@gnome.org>.
-
-2003-02-13  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation.
-
-2003-02-11  Abel Cheung  <maddog@linux.org.hk>
-
-	* POTFILES.in: Add missing file(s) and remove non-existant one(s).
-
-2003-02-12  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
-
-	* ru.po: updated Russian translation
-	from Russian team <gnome-cyr@gnome.org>.
-
-2003-02-09  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Updated Czech translation, removed some obsolete entries
-
-2003-02-08  Abel Cheung  <maddog@linux.org.hk>
-
-	* POTFILES.in: Add missing files and remove non-existant one.
-	* el.po, en_AU.po, et.po, nn.po, sk.po: Mark incorrectly translated
-	  entries as fuzzy.
-
-2002-02-07  Daniel Yacob  <locales@geez.org>
-
-	* am.po: Updated Amharic translation.
-
-2003-02-06  Michal Bukovjan  <bukm@centrum.cz>
-
-	* cs.po: updated and proofread Czech translation
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* POTFILES.in: add cal-recur.c
-
-2003-02-05  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
-
-	* ru.po: updated Russian translation
-	from Russian team <gnome-cyr@gnome.org>.
-
-2003-02-04  Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated italian translation.
-
-2003-02-03  Daniel Yacob  <locales@geez.org>
-
-	* am.po: Updated Amharic translation.
-
-2003-02-02  Keld Simonsen <keld@dkuug.dk>
-
-        * da.po: Updated Danish translation.
-
-2003-02-02  German Poo-Caaman~o  <gpoo@ubiobio.cl>
-
-	* es.po: Updated Spanish translation 
-      from Francisco J Fernandez <serrador@arrakis.es>.
-
-2003-02-01  Keld Simonsen <keld@dkuug.dk>
-
-        * da.po: Updated Danish translation.
-
-2003-02-01  Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2003-01-31  Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2003-01-29  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2003-01-28  Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2003-01-28  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Take over for the HEAD branch in here...
-
-2003-01-28  Abel Cheung  <maddog@linux.org.hk>
-
-	* POTFILES.in, POTFILES.skip: Fixes file lists.
-	* flu-danish: Removed. This file has been present for 2.5 years.
-	* zh_TW.po: Converted to UTF-8.
-
-2003-01-27  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2003-01-26  Daniel Yacob <locales@geez.org>
-
-	* am.po: Updated Amharic translation.
-
-2003-01-24  Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2003-01-24  Daniel Yacob <locales@geez.org>
-
-	* am.po: Updated Amharic translation.
-
-2003-01-23  Alessio Frusciante  <algol@firenze.linux.it>
-
-	* it.po: Fixed bug #84257.
-
-2003-01-23  Not Zed  <NotZed@Ximian.com>
-
-	* zh_CN.po: Update for chinese translation from Yuedong Du
-	<yuedong.du@sun.com>
-
-2003-01-22  Marco Ciampa <ciampix@libero.it>
-
-	* it.po: Updated Italian translation.
-
-2003-01-21  Kostas Papadimas  <pkst@gmx.net>
-
-	* el.po: Updated Greek translation.
-
-2003-01-20  Christian Meyer  <chrisime@gnome.org>
-
-	* de.po: Updated German translation.
-
-2003-01-19  Kostas Papadimas  <pkst@gmx.net>
-
-	* el.po: Updated Greek translation.
-
-2003-01-19  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* POTFILES.in: Update for renamed and removed files.
-
-2003-01-14  Daniel Yacob <locales@geez.org>
-
-	* am.po: Updated Amharic translation.
-
-2003-01-13  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-	* es.po: Updated Spanish translation 
-      from Francisco J Fernandez <serrador@arrakis.es>.
-
-2003-01-10  Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2003-01-10  Christian Rose  <menthos@menthos.com>
-
-	* POTFILES.in: Removed non-existing file.
-	* sv.po: Updated Swedish translation.
-
-2003-01-08  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2003-01-07  Daniel Yaocb <locales@geez.org>
-
-	* am.po: Added Amharic translation.
-
-2003-01-06  Pablo Gonzalo del Campo <pablodc@bigfoot.com>
-
-	* es.po: Updated Spanish translation by Fco. Javier Fernandez <serrador@arrakis.es>.
-
-2003-01-06  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2003-01-02  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation somewhat.
-
-2003-01-02  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Dutch translation updated by "Last-Translator: \n".
-
-2002-12-29  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation somewhat.
-
-2002-12-28  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation somewhat.
-
-2002-12-25  Takuo KITAME  <kitame@debian.org>
-
-	* ja.po: Updated Japanese translation.
-
-2002-12-25  Andrew V. Samoilov  <sav@bcs.zp.ua>
-
-	* ru.po: Updated Russian translation.
-
-2002-12-21  Wang Jian  <lark@linux.net.cn>
-
-        * zh_CN.po: Updated Simplified Chinese translation by
-	Wang Li.
-
-2002-12-15  Christian Neumair  <chris@gnome-de.org>
-
-	* POTFILES.in: Added missing files.
-	* de.po: Updated German translation.
-
-2002-12-09  Pablo Gonzalo del Campo <pablodc@bigfoot.com>
-
-	* es.po: Updated Spanish translation by Fco. Javier Fernandez
-	<serrador@arrakis.es>.
-
-2002-12-03  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Spellchecking by Zdenko Podobny.
-
-2002-12-01  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation done by
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>.
-
-2002-11-27  Joaquim Fellmann  <joaquim@altern.org>
-
-	* fr.po: Updated French translation.
-	* POTFILES.in: Removed files that were messing with
-	intltool-update because they doesn't exist anymore.
-
-2002-11-25  Dan Winship  <danw@ximian.com>
-
-	* fr.po: Remove a ":" that shouldn't have been there (and
-	abbreviate the translation of "Mailer" to make the mail header
-	display look nicer).
-
-2002-11-14  German Poo Caaman~o <gpoo@ubiobio.cl>
-
-	* es.po: Updated spanish translation.
-
-2002-11-14  German Poo Caaman~o <gpoo@ubiobio.cl>
-
-	* es.po: Updated spanish translation.
-
-2002-10-28  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.40.
-
-2002-10-28  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.40.
-
-2002-10-28  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.40.
-
-2002-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2002-10-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	* POTFILES.in: Added new etspec files.
-
-2002-10-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2002-09-25  Changwoo Ryu  <cwryu@debian.org>
-
-        * ko.po: Updated Korean translation by Young-Ho Cha 
-        <ganadist@mizi.com>.
-
-2002-09-25  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2002-09-25  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2002-09-22  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* vi.po: Updated Vietnamese file
-
-2002-09-22  Roy-Magne Mo  <rmo@sunnmore.net>
-
-	* nn.po: Updated Norwegian nynorsk translation.
-
-2002-09-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Added a couple of missing .glade files.
-	* no.po: Updated Norwegian translation.
-
-2002-09-10  Fatih Demir	<kabalak@gtranslator.org>
-
-	* tr.po: Committed updated Turkish translation by Gorkem...
-
-2002-09-05  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-09-01  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation
-	and converted to UTF-8.
-
-2002-08-25  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2002-08-25  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2002-08-20  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-08-20  Yanko Kaneti <yaneti@declera.com>
-
-	* bg.po: Updated Bulgarian translation.
-	Not full: +~300 location places to 4305 translated.
-
-2002-08-16  Yanko Kaneti <yaneti@declera.com>
-
-	* bg.po: Updated Bulgarian translation.
-	Not full: +~400 location places to 3991.
-
-2002-07-30  Hector Garcia Alvarez  <hector@scouts-es.org>
-
-    * es.po: Updated Spanish translation.
-
-2002-07-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-07-23  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Updated Greek translation.
-
-2002-07-22  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-07-19  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2002-07-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Removed mail/mail-account-news-editor.c
-
-2002-07-04  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Convert back to native encoding.
-
-2002-07-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Removed camel/camel-pgp-context.c and added
-	camel-gpg-context.c and camel-multipart-encrypted.c.
-	Also removed camel/camel-spoold-store.c
-
-2002-06-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-06-21  Abel Cheung  <maddog@linux.org.hk>
-
-	* .cvsignore: Ignore more files.
-	* Makefile.i18npatch, update.sh: Removed obsolete files.
-	* POTFILES.in: Add missing files, remove entries already present in
-	POTFILES.skip.
-	* POTFILES.skip: Remove non-existant entries.
-
-2002-06-13  Andrew V. Samoilov  <kai@cmail.ru>
-
-	* ru.po: Updated Russian translation.
-	* uk.po: Updated Ukrainian translation.  Use utf-8 instead of
-	utf8 to avoid msgfmt's warning.
-
-2002-06-11  Andrew V. Samoilov  <kai@cmail.ru>
-
-	* uk.po: Updated Ukrainian translation.
-
-2002-06-09  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2002-05-24  Manuel Borchers  <webmaster@matronix.de>
-
-	* de.po: Updated German translation.
-
-2002-05-24  Chris Toshok  <toshok@ximian.com>
-
-	* POTFILES.in: added shell/e-shell-config-autocompletion.c and
-	shell/e-shell-config-folder-settings.c.
-
-2002-05-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-05-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Removed references to camel-remote-store.c
-
-2002-05-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-05-21  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2002-05-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Updated this.
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-05-14  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2002-05-10  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* vi.po: Updated Vietnamese file
-
-2002-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* Revert zh_CN and zh_TW changes because gettext sucks
-
-2002-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* Update the po files to cut down on dist time
-
-2002-05-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* POTFILES.in: Replaced ldap-config.c with addressbook-config.c.
-
-2002-04-30  Hector Garcia Alvarez  <hector@scouts-es.org>
-
-    * es.po: Updated Spanish translation.
-
-2002-04-30  Yanko Kaneti <yaneti@declera.com>
-
-	* Updated Bulgarian translation by
-	Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>
-
-2002-04-28  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Conversion to UTF-8 and some small hotkey corrections.
-
-2002-04-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Removed
-	addressbook/gui/component/addressbook-config.[c,glade] and added
-	in it's place ldap-config.[c,glade].
-
-2002-04-16  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2002-04-13  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2002-04-08  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation from work of
-	Frederic Riss <frederic.riss@laposte.net>.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: Remove notes files.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: Remove mail-summary.c
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: Remove executive summary files.
-
-2002-04-05  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: comment out more unused camel files
-
-2002-04-05  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: remove file that is not compiled (and hence not
-	disted)
-
-2002-04-04  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation done by
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>.
-
-2002-04-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* it.po: Updated Italian translation from Clara Tattoni
-	<clara.tattoni@libero.it>.
-
-2002-04-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-04-01  Christian Rose  <menthos@menthos.com>
-
-	* POTFILES.in: Added missing file.
-	* sv.po: Updated Swedish translation some.
-
-2002-03-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-03-27  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	* POTFILES.in: Bring back up to speed.
-
-2002-03-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-03-12  Tõivo Leedjärv  <toivo@linux.ee>
-
-	* et.po: Updated Estonian translation
-	by the Gnome Estonian team <gnome-et@linux.ee>.
-
-2002-03-11  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation from report of
-	Stéphane Raimbault <stephane.raimbault@deesse.univ-lemans.fr>
-
-2002-02-28  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-02-27  Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2002-02-26  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* eu.po: Updated Basque file
-
-2002-02-25  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation from work of
-	Frederic Riss <frederic.riss@laposte.net>.
-
-2002-02-24  Carlos Perelló Marín <carlos@gnome-db.org>
-
-        * es.po: Small fix.
-
-2002-02-23  Carlos Perelló Marín <carlos@gnome-db.org>
-
-	* es.po: Sync with translation memory.
-
-2002-02-21  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Committed updated Turkish translation by Görkem.
-
-2002-02-19  Tõivo Leedjärv  <leedjarv@interest.ee>
-
-	* et.po: Updated Estonian translation by
-	Ivar Smolin <okul@linux.ee>.
-
-2002-02-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-02-12  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* eu.po: Updated Basque file
-
-2002-02-12  Tõivo Leedjärv  <leedjarv@interest.ee>
-
-	* et.po: Added Estonian translation.
-
-2002-02-12  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: fixed typo.
-
-2002-02-11 Alastair McKinstry <mckinstry@computer.org>
-
-	* ga.po: Updated Irish file.
-
-2002-02-11  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* eu.po: Updated Basque file
-
-2002-02-04  Héctor García Alvarez  <hector@scouts-es.org>
-
-    * es.po: Updated Spanish translation.
-
-2002-02-04  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation by
-	Wang Li.
-
-2002-02-02  Héctor García �lvarez  <hector@scouts-es.org>
-
-	* es.po: Updated Spanish translation.
-
-2002-02-02  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-01-31  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Converted French translation to UTF-8.
-
-2002-01-31  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-01-30  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation from work of
-	Frederic Riss <frederic.riss@laposte.net>.
-
-2002-01-29  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2002-01-28  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation 
-
-2002-01-28  Christian Rose  <menthos@menthos.com>
-
-	* POTFILES.in: Added missing file.
-	* sv.po: Updated and converted to UTF-8.
-
-2002-01-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	* POTFILES.in: Updated.
-
-2002-01-25  Roy-Magne Mo <rmo@sunnmore.net>
-
-	* nn.po: Updated Norwegian (nynorsk) translation.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* it.po: More updates to the Italian translation.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* it.po: Updated translation by Clara Tattoni
-	<clara.tattoni@libero.it>.
-
-2002-01-23  Peteris Krisjanis <peteris.krisjanis@ttc.lv>
-
-	* lv.po: Updated Latvian translation.
-
-2002-01-22  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2002-01-21 Alastair McKinstry <mckinstry@computer.org>
-
-	* ga.po: updated Irish translation.
-
-2002-01-21  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2002-01-18  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Updated Greek translation (by Nick Niktaris).
-
-2002-01-14  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2002-01-13  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2002-01-13  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Updated Greek translation (work from Panayotis Pakos).
-
-2002-01-13  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2002-01-12  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2002-01-11  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-01-10  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation by
-	Wang Jian.
-
-2002-01-09  Christian Rose  <menthos@menthos.com>
-
-	* POTFILES.in: Sorted and added LOTS of missing files.
-	* sv.po: Updated Swedish translation.
-
-2002-01-05  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2002-01-04  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* eu.po: Added Basque file
-
-2002-01-04  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2001-12-28  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-12-26  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Small correction in the charset field of the po file.
-
-2001-12-22  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Run xml-i18n-update on the file.
-	* el.po: Updated Greek translation by  Nikos Niktaris.
-
-2001-12-21  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-12-19  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Fixed Swedish translation. Thanks to
-	Johan Dahlin <zilch.am@home.se> for his review.
-
-2001-12-19  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-12-18  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation by
-	Wang Li <charlesw1234@163.com>.
-
-2001-12-17  Iain Holmes  <iain@ximian.com>
-
-	* POFILES.in: Added my-evolution/Locations.h
-
-2001-12-17  Roy-Magne Mo  <rmo@sunnmore.net>
-
-	* nn.po: Updated Norwegian (nynorsk) translation.
-
-2001-12-15  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-12-13  Damon Chaplin  <damon@ximian.com>
-
-	* POTFILES.in: added calendar/zones.h
-
-2001-12-13  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-12-12  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-12-11  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-12-09  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified translation by
-	Wang Li <charlesw1234@163.com>.
-
-2001-12-07  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-12-02  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-11-30  Hector Garcia Alvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation
-	
-2001-11-26  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* az.po: Updated Azeri file
-
-2001-11-24  Peteris Krisjanis <pecisk@inbox.lv>
-
-	* lv.po: Added latvian translation.
-
-2001-11-23  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation from work of
-	Frederic Riss <frederic.riss@laposte.net>.
-
-2001-11-20  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Converted to UTF-8.
-
-2001-11-20  Hector Garcia Alvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation
-	
-2001-11-20  Christian Meyer  <chrisime@gnome.org>
-
-	* de.po: Applied Manuel Borchers diff.
-	Made the translation for consistent.
-
-2001-11-19  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation by
-	Wang Jian.
-
-2001-11-18  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Updated Greek translation.
-
-	* el.po: Updated Greek translation.
-
-2001-11-17  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation by
-	Wang Li <charlesw1234@163.com>.
-
-2001-11-15  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-12-06  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.39.
-
-2001-12-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2001-12-14  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation 
-		 and fixed Bugzilla ID 17344.
-
-2001-12-13  Damon Chaplin  <damon@ximian.com>
-
-	* POTFILES.in: added calendar/zones.h
-
-2001-12-12  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-12-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2001-12-12  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-12-12  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-12-11  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-12-07  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-12-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2001-12-07  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-12-06  Christian Meyer  <chrisime@gnome.org>
-
-	* de.po: Minor update + fixes.
-
-2001-12-04  Christian Meyer  <chrisime@gnome.org>
-
-	* de.po: Updated German translation.
-
-2001-12-04  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-12-03  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Updated Greek translation.
-
-2001-12-02  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2001-12-01  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-11-30  Peteris Krisjanis <pecisk@inbox.lv>
-
-	* lv.po: Updated Latvian translation.
-
-2001-11-28  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-11-25  Matthias Warkus  <mawarkus@gnome.org>
-
-	* de.po: Updated German translation for release.
-
-2001-11-25  Christophe Merlet  <christophe@merlet.net>
-	
-	* fr.po: Updated French translation from work of
-	Frederic Riss <frederic.riss@laposte.net>.
-
-2001-11-24  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-11-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Remove camel/camel-tcp-stream-openssl.c
-
-2001-11-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2001-11-20  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Minor QA by Wang Jian.
-
-2001-11-20  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2001-11-20  Hector Garcia Alavrez <hector@scouts-es.org>
-
-	* es.po: Updated Spanish translation, last fuzzy string fixed
-	
-2001-11-20  Carlos Perelló Marín <carlos@gnome-db.org>
-
-	* es.po: Some QA.
-
-2001-11-20  Hector Garcia Alavrez <hector@scouts-es.org>
-
-	* es.po: Updated Spanish translation
-
-2001-11-20  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Converted to UTF-8.
-
-2001-11-20  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-10-20  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated by Wang Jian.
-
-2001-11-19  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation by
-	Wang Jian(Merged from HEAD), and gettext-0.10.40 compatible.
-
-2001-11-19  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-11-18  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Updated + normalised Greek translation.
-
-2001-11-18  Administrator  <simos@hellug.gr>
-
-	* el.po: Updated Greek translation.
-
-2001-11-16  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-11-14  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-11-13  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-11-13  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-11-13  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-11-13  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-11-11  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-11-11  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-11-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2001-11-10  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation by
-	Wang Li <charlesw1234@163.com>.
-	
-2001-11-10  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Updated Greek translation.
-
-2001-11-09  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-11-09  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Convert to UTF8.
-
-2001-11-09  Carlos Perelló Marín <carlos@gnome-db.org>
-
-	* es.po: Some QA changes.
-
-2001-11-09  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* fr.po: Fix error in French translation
-
-2001-11-08  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2001-11-08  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation by
-	Wang Li <charlesw1234@163.com>.
-
-2001-11-08  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2001-11-08  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-11-07  Hector Garcia Alvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation. Added patches from Carlos
-	Perello.
-	
-2001-11-07  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Merged to new pot file.
-
-2001-11-07  Roy-Magne Mo  <rmo@sunnmore.net>
-
-	* nn.po: Small update of Norwegian (nynorsk) translation. 
-
-2001-11-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-11-05  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-11-01  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation from work of
-	Frederic Riss <frederic.riss@laposte.net>.
-
-2001-11-01  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* POTFILES.in: Add `calendar/cal-util/cal-component.c' and
-	`shell/e-shell-utils.c'.
-
-2001-10-31  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2001-10-31  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-10-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-10-30  Roy-Magne Mo <rmo@sunnmore.net>
-
-	* nn.po: Small update to Norwegian (nynorsk) translation.
-
-2001-10-30    <NotZed@Ximian.com>
-
-	* en_AU.po: Changed the weather to be something more appropriate
-	for the other side of the world.  And some updates.
-
-2001-10-29  Damon Chaplin  <damon@ximian.com>
-
-	* en_AU.po: new file. Copied en_GB.po since they should be pretty much
-	exactly the same.
-
-2001-10-30  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation by
-	Wang Li <charlesw1234@163.com>.
-
-2001-10-29  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Strip extra \r at end of each line, so that
-	  GTP status report shows it correctly. (Thanks Joe Man
-	  <trmetal@yahoo.com.hk>)
-
-2001-10-28  Matthias Warkus  <mawarkus@gnome.org>
-
-	* de.po: Updated translation for string freeze. Hopefully
-	everything is in order.
-
-2001-10-28  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-10-27  Hector Garcia Alvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-10-27  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-10-27  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2001-10-26  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-10-26  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-10-26  Christian Rose  <menthos@menthos.com>
-
-	* POTFILES.in: Removed the reference to the non-existant
-	"wombat/GNOME_Evolution_Wombat.oaf.in".
-
-2001-10-26  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated SLovak translation.
-
-2001-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* it.po: More updates to make it a little more usable.
-
-2001-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	* POTFILES.in: Updated with some missing files.
-	
-2001-10-25  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-10-24  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Updated Greek translation.
-
-2001-10-24  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-10-24  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-10-24  Takuo KITAME  <kitame@debian.org>
-
-	* ja.po: Updated Japanese translation.
-
-2001-10-23  Hector Garcia Alvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-10-23  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation from work of
-	Frederic Riss <frederic.riss@laposte.net>.
-
-2001-10-23  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation by
-	Wang Li <charlesw1234@163.com>.
-
-2001-10-23  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-10-22  Damon Chaplin  <damon@ximian.com>
-
-	* POTFILES.in: added calendar/gui/e-cell-date-edit-text.c and
-	widgets/misc/e-cell-percent.c.
-
-2001-10-22  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation from work of
-	Frederic Riss <frederic.riss@laposte.net>.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* it.po: More updates.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* it.po: Fixed up a little bit.
-
-2001-10-22  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-10-22  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-10-22  Marius Andreiana  <mandreiana@yahoo.com>
-
-	* ro.po: updated
-
-2001-10-21  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2001-10-21  Hector Garcia Alvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-10-21  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-10-20  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation from
-	Wang Li <charlesw1234@163.com>.
-
-2001-10-20  Christopher R. Gabriel  <cgabriel@cgabriel.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it>
-	
-2001-10-20  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2001-10-19  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-10-18  Carlos Perelló Marín <carlos@gnome-db.org>
-
-	* POTFILES.in: Fixed.
-
-2001-10-18  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2001-10-18  Wang Jian  <lark@linux.net.cn>
-
-	* zh_CN.po: Added Simplified Chinese translation by
-	Wang Li <charlesw1234@163.com>.
-
-2001-10-17  Abel Cheung  <maddog@linux.org.hk>
-
-	* ja.po: Mark line 3436, 9375 as fuzzy, fails at "msgfmt -c" check.
-
-2001-10-17  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Updated traditional Chinese translation from Joe Man
-	<trmetal@yahoo.com.hk> and Jau-Shiung Liau <pesder@seed.net.tw>.
-
-2001-10-17  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-10-16  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-10-15  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation
-
-2001-10-13  Hector Garcia Alvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-10-13  Dan Winship  <danw@ximian.com>
-
-	* POTFILES.in: Add shell/evolution-shell-component-utils.c
-
-2001-10-13  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2001-10-13  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-10-13  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2001-10-13  Hector Garcia Alvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-10-12 Ismael Olea <ismael@olea.org>
-
-	* es.po: Updates Spanish trasnlation
-
-2001-10-12  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-10-11  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-10-10  Hector Garcia Alvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-10-09  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-10-07  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-10-07  Hector Garcia Alvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-10-06  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Updated Greek translation. 
-
-2001-10-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2001-10-05  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2001-10-04  Takuo KITAME  <kitame@debian.org>
-
-	* ja.po: Updated Japanese translation.
-
-2001-10-03  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-10-03  Carlos Perelló Marín <carlos@gnome-db.org>
-
-	* es.po: Reverted a change from Ismael and /s/fichero/archivo/
-	* POTFILES.in: Fixed.
-
-2001-10-03  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-10-02  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-10-01  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2001-10-01  Takuo KITAME  <kitame@debian.org>
-
-	* ja.po: Updated Japanese translation.
-
-2001-09-30  Takuo KITAME  <kitame@debian.org>
-
-	* ja.po: Updated Japanese translation.
-
-2001-09-29  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation from
-	  Jacobo Tarrio Barreiro <jtarrio@trasno.net>
-
-2001-09-29  Carlos Perelló Marín <carlos@gnome-db.org>
-
-	* es.po: Fixed. /s/Salir/Existe/.
-
-2001-09-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-
-2001-09-29  Carlos Perelló Marín <carlos@gnome-db.org>
-
-	* es.po: Fixed /s/M/2º Nombre/ where M is Middle in english. A better
-	translation?.
-
-2001-09-29  Takuo KITAME  <kitame@debian.org>
-
-	* ja.po: Updated Japanese translation.
-
-2001-09-28  Dan Winship  <danw@ximian.com>
-
-	* de.po: Fix a printf-format bug in the translation of the "On
-	DATE, PERSON wrote" string, noted on the evolution list.
-
-2001-09-28  Takuo KITAME  <kitame@debian.org>
-
-	* ja.po: Updated Japanese translation.
-
-2001-09-27  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-09-26  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation
-
-2001-09-24  Damon Chaplin  <damon@ximian.com>
-
-	* POTFILES.in: added calendar/cal-util/cal-util.c
-
-2001-09-26  Héctor García �lvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-09-25  Héctor García �lvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-09-24  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2001-09-24  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-09-24  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation with contributions from
-	Jean-Noël Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>.
-
-2001-09-23  Carlos Perelló Marín <carlos@gnome-db.org>
-
-	* es.po: /s/Algún nuve/Algunas nuves/
-
-2001-09-23  Héctor García �lvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-09-22  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-09-22  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	* POTFILES.in: Added camel/camel-vee-store.c and camel/camel-folder.c
-		
-2001-09-21  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: reflect file additions/removals
-
-2001-09-18  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-09-18  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-09-16  Héctor García �lvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-09-16  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-09-16  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2001-09-15  Héctor García �lvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-09-15  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-09-14  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation + terminology fixes.
-
-2001-09-14  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-09-13  Pavel Cholakov <pavel@linux.zonebg.com>
-
-	* bg.po: Bulgarian translation by Nikolay Hristov <geroy@stemo.bg>.
-
-2001-09-13  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-09-13  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-09-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2001-09-12  Abel Cheung <maddog@linux.org.hk>
-
-	* tr.po: Modified line 3884, argument format error.
-	* ro.po: Ditto, for line 3847,3852,5260,6389. Added missing
-	  header.
-
-2001-09-11  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-09-11  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-09-10  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* ga.po: Updated Irish file
-
-2001-09-10  Yukihiro Nakai <nakai@gnome.gr.jp>
-
-	* ja.po: Update Japanese translation.
-
-2001-09-09  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: New traditional Chinese translation from
-	  Joe Man <trmetal@yahoo.com.hk>.
-
-2001-09-09  Matthias Warkus  <mawarkus@gnome.org>
-
-	* de.po: Updated German translation.
-
-2001-09-08  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation with contributions from
-	Jean-Noël Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>.
-
-2001-09-07  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-09-07  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-09-06  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-09-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2001-09-05  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2001-09-05  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation + terminology fixes.
-
-2001-09-04  Carlos Perelló Marín <carlos@gnome-db.org>
-
-	* es.po: Spell check.
-
-2001-09-04  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-09-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* POTFILES.in: Removed addressbook/gui/widgets/alphabet.glade.
-
-2001-09-03  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-09-02  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-09-02  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation from contribution of
-	Jean-Noël Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>.
-
-2001-09-01  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-08-31  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation from contribution of
-	Jean-Noël Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>.
-
-2001-08-30  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-08-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2001-08-28  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation from contribution of
-	Jean-Noël Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>.
-
-2001-08-27  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-08-27  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-08-27  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* POTFILES.in: Added shell/glade/evolution-startup-wizard.glade
-
-2001-08-26  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation from contribution of
-	Jean-Noël Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>.
-
-2001-08-26  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* POTFILES.in: Added addressbook/gui/widgets/e-addressbook-model.c
-
-	* pl.po: Updated Polish translation.
-
-2001-08-24  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2001-08-24  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-08-24  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-08-24  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Fixes to the Swedish translation.
-
-2001-08-24  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-08-24  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-08-23  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-08-22  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2001-08-21  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* lt.po: Updated Lithuanian translation a bit...
-
-2001-08-21  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-08-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2001-08-19  Damon Chaplin  <damon@ximian.com>
-
-	* en_GB.po: changed all %m/%d/%Y date formats to %d/%m/%Y.
-
-2001-08-20  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-08-19  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-08-17  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-08-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	* POTFILES.in: Updated with missing files.
-	
-2001-08-16  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-08-16  Marius Andreiana  <mandreiana@yahoo.com>
-
-	* ro.po: updated
-
-2001-08-14  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-08-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2001-08-14  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-08-13  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-08-13  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-08-12  Héctor García �lvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-08-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Added more missing files.
-	* no.po: Updated accordingly.
-		
-2001-05-08  Sami Pesonen  <spesonen@dlc.fi>
-	* fi.po: Updated Finnish translation by
-	Jarkko Ranta <jjranta@cc.joensuu.fi>
-
-2001-08-11  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation. Also thanks to
-	Mikael Hallendal for reporting a problem with the
-	translation.
-
-2001-08-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Added more missing files.
-	* no.po: Updated accordingly.
-		
-2001-08-11  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-08-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	* POTFILES.in: Updated.
-		
-2001-08-10  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-08-09  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation. Thanks to
-	Richard Hult <richard.hult@telia.com> for pointing out a
-	problem with the translation.
-
-2001-08-09  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-08-08  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-07-31  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	* nn.po: Updated Norwegian (nynorsk) translation.	
-
-2001-08-06  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation. Thanks to
-	Richard Hult <richard.hult@telia.com> for pointing out a
-	problem with the translation.
-
-2001-08-05  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-08-04  Héctor García �lvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-08-03  Héctor García �lvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-08-03  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-08-02  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* POTFILES.in: Added:
-	addressbook/gui/contact-editor/e-contact-save-as.c
-	calendar/gui/cal-search-bar.c
-	calendar/pcs/query.c
-	e-util/e-categories-config.c.
-
-2001-08-01  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-08-01  Héctor García �lvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Updated all the .po's for the release.
-
-2001-07-31  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2001-07-30  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-30  Matthias Warkus  <mawarkus@gnome.org>
-
-	* de.po: Updated German translation.
-
-2001-07-30  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-07-27  Damon Chaplin  <damon@ximian.com>
-
-	* es.po: changed strftime format translation from "%A %b de %B" to
-	"%A %d de %B". It was showing the abbreviated month name instead of
-	the day number.
-
-2001-07-27  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-07-24  Jason Leach  <jleach@ximian.com>
-
-	* POTFILES.in: Add shell/e-local-storage.c so "Local Folders" can
-	get translated.  Fixes #5385.
-
-2001-07-25  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-24  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-24  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-07-24  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-21  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-20  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-07-20  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-18  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-07-18  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-13  Carlos Perelló Marín <carlos@gnome-db.org>
-
-	* es.po: Some QA.
-
-2001-07-13  Zbigniew Chyla  <chyla@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-07-13  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nn.po: Updated Norwegian (nynorsk) translation.
-	
-2001-07-13  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updating again.
-
-2001-07-13  Zbigniew Chyla  <chyla@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-07-13  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-07-12  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: And again. Trying to keep the translation up-to-date with
-	the changes in cvs. 
-
-2001-07-12  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation again. Hi ho.
-
-2001-07-12  Zbigniew Chyla  <chyla@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-07-12  Carlos Perelló Marín <carlos@gnome-db.org>
-
-	* es.po: /s/_Acciones/A_cciones
-
-2001-07-12  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-12  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-07-11  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2001-07-11  Hector Garcia Alvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-07-11  Zbigniew Chyla  <chyla@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-07-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2001-07-10  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-10  Matthias Warkus  <mawarkus@gnome.org>
-
-	* de.po: Huge update to German translation.
-
-2001-07-10  Zbigniew Chyla  <chyla@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-07-10  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-10  Marius Andreiana  <mandreiana@yahoo.com>
-
-	* ro.po: added (thanks to Tiberiu Micu <tibimicu@gmx.net>)
-
-2001-07-10  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-09  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2001-07-09  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* POTFILES.in: Added files:
-	calendar/gui/dialogs/meeting-page.glade
-	shell/glade/e-active-connection-dialog.glade
-	Sorted everything.
-
-	* pl.po: Updated Polish translation.
-
-2001-07-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	* POTFILES.in: Huge update.
-	
-2001-07-08  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-08  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* POTFILES.in: Added:
-	addressbook/gui/contact-list-editor/contact-list-editor.glade,
-	addressbook/gui/contact-list-editor/e-contact-list-editor.c,
-	calendar/gui/dialogs/alarm-options.c,
-	calendar/gui/dialogs/alarm-options.glade,
-	calendar/gui/dialogs/e-timezone-dialog.glade,
-	mail/mail-folder-cache.c,
-	my-evolution/my-evolution.glade
-
-2001-07-08  Hector Garcia Alvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-07-07  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-07  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Committed updated Turkish translation
-		by Görkem.
-
-2001-07-06  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-07-05  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation. 
-
-2001-07-03  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation. 
-
-2001-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* sl.po: Add a missing double quote.
-
-2001-07-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Added widgets/misc/e-charset-picker.c
-
-2001-07-02  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation. 
-
-2001-06-30  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* POTFILES.in:
-	Added addressbook/gui/component/e-address-popup.c,
-	my-evolution/e-summary-mail.c, my-evolution/e-summary-rdf.c,
-	my-evolution/e-summary-weather.c.
-
-2001-06-28  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Updated to reflect reality.
-	* no.po: Updated Norwegian translation.
-	
-2001-06-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Removed ui/evolution-mail.xml and replaced it with
-	the 4 new evolution-mail*.xml files.
-
-2001-06-26  Héctor García �lvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-06-25  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation. 
-
-2001-06-24  Chris Toshok  <toshok@ximian.com>
-
-	* POTFILES.in: add ui/evolution-contact-list-editor.xml, and
-	correct path to the contact-editor files (to
-	addressbook/gui/contact-editor)
-
-2001-06-24  Federico Mena Quintero  <federico@ximian.com>
-
-	* POTFILES.in: Shuffled the alarm-notify files a bit.
-
-2001-06-22  Zbigniew Chyla  <chyla@gnome.pl>
-
-	* POTFILES.in: Added mail/message-list.etspec.
-
-2001-06-20  Zbigniew Chyla  <chyla@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-06-20  Almer S. Tigelaar  <almer@gnome.org>
-
-	For Mendel Mobach <mendel@mobach.nl> :
-	
-	* nl.po: Updated Dutch translation.
-
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: remove dead file
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: remove dead file
-
-2001-06-19  Héctor García �lvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-06-18  Héctor García �lvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-06-18  Zbigniew Chyla  <chyla@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2001-06-18  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: Remove more dead files
-
-2001-06-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* POTFILES.in: Remove `calendar/gui/calendar-summary.c' which
-	doesn't get distributed anymore.
-
-2001-06-15  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation from
-	  Manuel A. Fernández Montecelo <manuel@sindominio.net>
-
-2001-06-13  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-06-12  Akira TAGOH <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2001-06-12  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation. 
-
-2001-06-11  Damon Chaplin  <damon@ximian.com>
-
-	* de.po: fixed a few inconsistencies in the way times are translated.
-	This caused problems parsing dates, making parts of the interface
-	unusable.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* POTFILES.in: Added
-	addressbook/gui/merging/e-card-duplicate-detected.glade and
-	addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade
-	here.
-
-2001-06-10  HñÄtor Garcù Ž�lvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-06-10  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-06-08  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation. 
-
-2001-06-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2001-06-07  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-06-06  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation. 
-
-2001-06-03  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-06-02  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation. 
-
-2001-06-02  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: Update list of files
-
-2001-05-31  Jeffrey Stedfast <fejj@ximian.com>
-
-	* POTFILES.in: Added camel-cms-context.c
-
-2001-05-28  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2001-05-28  Andras Timar <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation  
-
-2001-05-26  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-05-26  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* az.po: Updated Azeri file
-
-2001-05-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* POTFILES.in: Added shell/e-storage-set-view.etspec.
-
-2001-05-23  Akira TAGOH <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation
-
-2001-05-22  AndrâÖ T’�âÕ <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation  
-
-2001-05-21  H‚Ætor Garc’Ä ŒÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-05-21  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* nn.po: removed 3 old entries not in utf-8
-
-2001-05-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Updated.
-	* no.po: Updated Norwegian translation.
-
-2001-05-21  Szabolcs Ban  <shooby@gnome.hu>
-
-        * hu.po: Updated Hungarian translation by 
-	  Andras Timar <timar@gnome.hu>
-
-2001-05-19  Matthias Warkus  <mawarkus@gnome.org>
-
-	* de.po: Updated German translation.
-
-2001-05-19  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2001-05-16  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: Remove importers/evolution-gnomecard-importer.c
-	
-2001-05-16  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: Remove camel/camel-pkcs7-context.c
-
-2001-05-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* POTFILES.in: e-minicard-view-model.c ->
-	e-addressbook-reflow-adapter.c
-
-2001-05-15  Szabolcs Ban  <shooby@gnome.hu>
-
-        * hu.po: Updated Hungarian translation by 
-	  Andras Timar <timar@gnome.hu>
-
-2001-05-15  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-05-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2001-05-12  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* po/POTFILES.in: update with new/moved files.
-
-2001-05-10  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-05-08  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-05-08  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* POTFILES.in: add mail/mail-search.c
-
-2001-05-05  Gediminas Paulauskas <menesis@delfi.lt>
-	
-	* lt.po: Updated Lithuanian translation.
-
-2001-05-05  H‚Ætor Garc’Ä ŒÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-05-03  Matthias Warkus  <mawarkus@gnome.org>
-
-	* de.po: Updated German translation
-
-2001-05-02  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* az.po: Updated Azeri file
-
-2001-04-29  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-04-28  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2001-04-28  Peter Williams  <peterw@ximian.com>
-
-	* POTFILES.in: Reflect Danw's move of mail/session.c to
-	mail/mail-session.c
-
-2001-04-27  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-04-26  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation again.
-
-2001-04-26  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-04-25  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	* POTFILES.in: Major overhaul.
-	
-2001-04-25  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-04-24  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-04-24  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-04-24  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Committed updated Turkish translation
-		by GŽ¶ŽÕkem Cetin.
-
-2001-04-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Added mail/message-browser.c and removed
-	mail/mail-view.c
-
-2001-04-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2001-04-23  Matthias Warkus  <mawarkus@gnome.org>
-
-	* de.po: Updated.
-
-2001-04-23  Szabolcs Ban  <shooby@gnome.hu>
-
-        * hu.po: Updated translation by Andras Timar <timar@gnome.hu>
-
-2001-04-21  Almer S. Tigelaar  <almer@gnome.org>
-
-	For Dirk-Jan C. Binnema <dirkjan@gnome.org> :
-	
-	* nl.po: Updated Dutch translation
-
-2001-04-20  Szabolcs Ban  <shooby@gnome.hu>
-
-        * hu.po: Updated translation by Andras Timar <timar@gnome.hu>
-
-2001-04-20  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updates from Clara Tattoni <clara.tattoni@libero.it>
-
-2001-04-20  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2001-04-18  Richard Hult  <rhult@codefactory.se>
-
-	* nl.po: Fixed two fatal errors.
-
-2001-04-18  Almer S. Tigelaar  <almer@gnome.org>
-
-	For Dirk-Jan C. Binnema <dirkjan@gnome.org> :
-	
-	* nl.po: Updated Dutch translation.
-
-2001-04-18  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-04-17  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-04-17  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2001-04-17  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2001-04-15  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-04-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Removed openpgp-utils.c and added the camel-pgp-*.c
-	files. Added camel-cipher-context.c also.
-
-2001-04-12  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-04-12  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-04-12  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Fixed Swedish translation. Thanks to GŽ¶ŽÕan Uddeborg
-	<goeran@uddeborg.pp.se>.
-
-2001-04-12  Mikael Hallendal  <micke@codefactory.se>
-
-	* fi.po: Removed a trailing 'k' making an error while compiling.
-
-2001-04-11  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2001-04-11  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-04-11  Matthias Warkus  <mawarkus@gnome.org>
-
-	* de.po: Commit to be sure.
-
-2001-04-11  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Committed updated Turkish translation.
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* POTFILES.in: Add the galview.xml files here.
-
-2001-04-08  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm„Ñ) translation.
-	
-2001-04-04  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Committed updated Turkish translation
-		by GŽ¶ŽÕkem.
-
-2001-04-01  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Another Finnish update.
-
-2001-03-29  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2001-03-29  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-03-25  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-03-25  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Committed updated Turkish translation
-		by GŽ¶ŽÕkem.
-
-2001-03-22  Dan Winship  <danw@ximian.com>
-
-	* az.po: Change \" to ' in translations for .oaf files, since
-	various bugs conspire to prevent double quotes from working there
-	currently.
-
-2001-03-23  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2001-03-21  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-03-20  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* az.po: Updated Azeri file
-
-2001-03-20  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm„Ñ) translation.
-
-2001-03-19  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2001-03-18  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Small update by GŽ¶ŽÕkem Cetin.
-
-2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Removed filter-system-flag.c.
-
-2001-03-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm„Ñ) translation.
-
-2001-03-15  Matthias Warkus  <mawarkus@gnome.org>
-
-	* de.po: Update.
-
-2001-03-15  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-03-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm„Ñ) translation.
-
-2001-03-15  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* az.po: Added Azeri file
-	* {es,fi,fr,ga,hu,nl,nn,no,sk,sl,sv}.po: corrected headers
-	and/or syntax errrors
-
-2001-03-15  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-03-14  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2001-03-13  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm„Ñ) translation.
-	* POTFILES.in: Updated with a bunch of missing files.
-	
-2001-03-12  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2001-03-11  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-03-11  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-03-10  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-03-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Removed mail-vtrash.c
-
-2001-03-08  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Committed updated Turkish translation by GŽ¶ŽÕkem Cetin.
-
-2001-03-05  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm„Ñ) translation.
-	* POTFILES.in: Updated with a bunch of missing files.
-	
-2001-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: update
-
-2001-03-04  Damon Chaplin  <damon@ximian.com>
-
-	* POTFILES.in: added e-util/e-time-utils.c and
-	widgets/misc/e-cell-date-edit.c
-
-2001-03-02  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* POTFILES.in: remove camel-imap-auth.c, add sasl stuff
-
-2001-02-27  JP Rosevear  <jpr@ximian.com>
-
-	* da.po: Correct a couple errors
-
-2001-02-25  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2001-02-24  Almer S. Tigelaar  <almer@gnome.org>
-
-	* nl.po: Updated Dutch translation.
-
-2001-02-24  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-02-24  Michael Meeks  <michael@ximian.com>
-
-	* POTFILES.in: remove stale calender oaf.in file
-
-2001-02-21  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-02-22  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it> 
-
-2001-02-22  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* POTFILES.in: Removed references to camel-vee-*.c
-
-2001-02-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Removed references to mail-threads.c
-
-2001-02-19  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-02-16  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2001-02-16  Matthias Warkus  <mawarkus@gnome.org>
-
-	* de.po: Update.
-
-2001-02-16  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-02-16  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from  Clara Tattoni
-	<clara.tattoni@libero.it> 
-
-2001-02-14  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-02-13  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: Remove dead glade file that was not being disted
-
-2001-02-13  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	* POTFILES.in: Added *.oaf.in files.
-	
-2001-02-11  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-02-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: removed e-contact-editor-strings.h
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* *.po: added strings from .desktop files, they are translated here
-	because we use xml-i18n-tools.
-	* POTFILES.in: added these *.desktop files, missing *.glade files,
-	removed *.glade.h and similar files.
-	* POTFILES.skip: removed all *.glade.h entries - they do not exist
-	anymore.
-
-2001-02-10  Fatih Demir	<kabalak@gtranslator.org>
-
-	* tr.po: Took over the stable tr.po also to HEAD.
-
-2001-02-09  Anders Carlsson  <andersca@codefactory.se>
-
-	* sl.po: Add \n to fix a compile error.
-
-2001-02-09  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2001-02-09  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-02-09  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-02-08  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-02-07  Fatih Demir	<kabalak@kabalak.net>
-	
-	* tr.po: Committed updated Turkish translation by
-		GŽ¶ŽÕkem Cetin.
-
-2001-02-07  Christopher R. Gabriel  <cgabriel@bug.rulez.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it> 
-
-2001-02-06  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-02-02  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-31  Szabolcs Ban  <shooby@gnome.hu>
-
-        * hu.po: Terminology fixes by Andras Timar <timar@gnome.hu>
-
-2001-01-30  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-01-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2001-01-29  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Added initial Slovak translation.
-
-2001-01-29  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-27  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-01-27  Julian Missig <julian@jabber.org>
-
-	* POTFILES.in: Someone forgot to update this when removing a file it
-	uses. This was preventing evolution from compiling...
-	
-2001-01-26  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated brazilian portuguese translation
-
-2001-01-26  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-01-26  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-24  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-01-24  Szabolcs Ban  <shooby@gnome.hu>
-
-        * hu.po: Tons of fixes by Andras and Emese (spelling,
-          terminology, headers)
-
-2001-01-23  Martin NorbüÈk  <d95mback@dtek.chalmers.se>
-
-	* sv.po: Updated Swedish translation.
-
-2001-01-23  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-22  Dan Winship  <danw@ximian.com>
-
-	* POTFILES.in: Update for filter code moves
-
-2001-01-19  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2001-01-19  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-18  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm„Ñ) translation.
-	* update.sh: Removed old script.
-	
-2001-01-17  Dave Camp <dave@ximian.com>
-
-	* POTFILES.in: Removed addressbook/gui/widgets/test-minicard-view.c,
-	camel/providers/local/camel-mbox-provider.c, 
-	notes/component-factory.c, notes/main.c, and 
-	calendar/gui/gnome-month-item.c, and calendar/gui/alarm-notify.c.
-
-2001-01-17  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-16  Martin NorbüÈk  <d95mback@dtek.chalmers.se>
-
-	* sv.po: Updated Swedish translation, using xml-i18n-update.
-
-2001-01.16  Kenneth Christiansen <kenneth@gnu.org>
-
-	* POTFILES.(in|skip): Updated after consulting Michael.
-
-2001-01-16  Martin NorbüÈk  <d95mback@dtek.chalmers.se>
-
-	* sv.po: Updated Swedish translation, using xml-i18n-update.
-
-2001-01-16  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it> 
-
-2001-01-15  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-01-15  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it> 
-
-2001-01-15  Richard Hult  <rhult@codefactory.se>
-
-	* sv.po: Updated Swedish translation.
-
-2001-01-11  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-01-11  Akira TAGOH <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2001-01-10  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* POTFILES.in: Added all the new source files and removed the old
-	ones, yadda yadda.
-
-2001-01-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* POTFILES.in: Removed .oaf.in files until the whole of Evolution
-	uses the xml-i18n-tools framework.
-
-2001-01-09  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-01-09  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm„Ñ) translation.
-	
-2001-01-07  Benedikt Roth  <Benedikt.Roth@gmx.net>
-
-	* de.po: Updated German translation
-
-2001-01-07  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2001-01-06  Fatih Demir	<kabalak@gmx.net>
-
-	* ko.po: Committed updated Korean translation.
-
-2001-01-06  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* POTFILES.in: Remove non-existent file
-
-2001-01-03  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-01-03  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-01-02  Chris Toshok  <toshok@helixcode.com>
-
-	* POTFILES.in: add addressbook-config.c, addressbook-storage.c,
-	and addressbook-config.glade.
-
-2001-01-01  Michael Meeks  <michael@helixcode.com>
-
-	* POTFILES.in: remove all the stale addressbook entries.
-
-2000-12-27  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-25  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2000-12-23  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2000-12-23  JP Rosevear  <jpr@helixcode.com>
-
-	* POTFILES.in: Remove deleted file
-
-2000-12-22  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2000-12-22  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-21  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-12-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2000-12-18  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2000-12-18  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-18  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-12-18  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it>
-
-2000-12-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* POTFILES.in: Removed getdate.y.
-
-	* POTFILES.ignore: Ditto.
-
-2000-12-15  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-14  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-12-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	* POTFILES.in: This too.
-	* .potignore: Adjust to fit the new tools.
-	
-2000-12-14  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Added Id tag to easier trace changes.
-
-2000-12-13  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* POTFILES.in: Update for reality. (Mostly from campd.)
-
-2000-12-12  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-12-11  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2000-12-06  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: updated italian translation from 
-	Clara Tattoni <clara.tattoni@libero.it>
-
-2000-12-05  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-05  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm„Ñ) translation.
-	
-2000-12-04  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-12-03  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2000-12-03  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-02  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Updated Dutch translation.
-
-2000-12-01  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-30  Zbigniew Chyla  <chyla@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2000-11-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm„Ñ) translation.
-	
-2000-11-30  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-29  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2000-11-28  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-26  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Updated Dutch translation.
-
-2000-11-26  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it>
-
-2000-11-24  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* POTFILES.in: Removed gncal-todo.c.
-
-2000-11-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* POTFILES.in: Removed mail/message-thread.c and added
-	camel/camel-folder-thread.c
-
-2000-11-20  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2000-11-19  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Updated Dutch translation.
-
-2000-11-18  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-17  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2000-11-17  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-17  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-16  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Major update.
-
-2000-11-14  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2000-11-14  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-06  Michael Meeks  <michael@helixcode.com>
-
-	* update.pl (GenHeaders, GeneratePot): Kill abortive
-	glade file translation code. It can't cope with line
-	breaks in the node content!
-
-2000-11-13  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-11-08  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-08  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2000-11-08  Akira Tagoh <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2000-11-07  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-06  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2000-11-06  Dan Winship  <danw@helixcode.com>
-
-	* POTFILES.in: Remove mail-local-storage.c
-
-2000-11-06  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-05  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-2000-11-05  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-05  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-05  Michael Meeks  <michael@helixcode.com>
-
-	* POTFILES.in: update all of ui/*.h to ui/*.xml
-
-	* Makefile.i18npatch: sort out the xml bits.
-
-	* ui-extract.pl: add from Kenneth.
-
-	* update.pl: Update to the version in bonobo.
-
-2000-11-04  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2000-11-04  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-11-03  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-02  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* fi.po: Fixed a missing ".
-
-2000-11-02  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2000-11-02  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-01  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2000-11-01  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* ca.po: Updated Catalan file
-
-2000-10-31  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it>
-
-2000-10-31  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-10-31  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Updated Dutch translation.
-
-2000-10-31  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: updated this.
-	* no.po: Updated this too.
-	
-2000-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm„Ñ) translation.
-	
-2000-10-30  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-10-30  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: more updates from Clara Tattoni <clara.tattoni@libero.it>
-
-2000-10-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pl.po: Removed spurious character that kept it from building.
-
-2000-10-30  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2000-10-29  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated Italian translation from Clara Tattoni 
-	<clara.tattoni@libero.it>
-
-2000-10-29  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2000-10-29  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Update.
-
-2000-10-28  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* ca.po: Added Catalan file
-
-2000-10-26  Joaquim Fellmann <joaquim@mail.dotcom.fr>
-
-	* fr.po: Updated French translation.
-
-2000-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm„Ñ) translation.
-	
-2000-10-26  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Huge update. Still not all of the "Could/Cannot" stuff
-	fixed to correct "...konnte nicht...werden" translation.
-
-2000-10-26  Joaquim Fellmann <joaquim@mail.dotcom.fr>
-
-	* fr.po: Updated French translation.
-
-2000-10-25  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated Italian translation from Clara Tattoni 
-	<clara.tattoni@libero.it>
-
-2000-10-25  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2000-10-25  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2000-10-24  Dan Winship  <danw@helixcode.com>
-
-	* POTFILES.in: Add lots of camel and filter files.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* POTFILES.in: Remove removed composer files
-
-2000-10-22  Robert Brady  <rwb197@zepler.org>
-
-	* en_GB.po: Added British translation.
-	
-2000-10-20  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2000-10-19  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-10-19  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2000-10-19  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-10-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Updated for the upcoming release.
-	* no.po: Same here.
-	
-2000-10-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nn.po: Added Norwegian (nynorsk) translation.
-	* no.po: Updated Norwegian (bokm„Ñ) translation.
-	
-2000-10-14  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Updated Dutch translation.
-
-2000-10-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Added ui/*.h
-	
-2000-10-14  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-10-13  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-10-13  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Updated.
-
-2000-10-10  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* lt.po: Added Lithuanian translation.
-
-2000-10-10  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2000-10-10  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-10-08  H€Ètor GarcÄÆ Alvarez  <hector@scouts-es.org>
-
-        * es.po: updated Spanish translation.
-	
-2000-10-08  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-10-08  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-2000-10-08  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-10-06  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Minors french translation updates.
-
-2000-10-06  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-10-05  H€Ètor GarcÄÆ Alvarez  <hector@scouts-es.org>
-
-        * es.po: updated Spanish translation.
-
-2000-10-04  H€Ètor GarcÄÆ Alvarez  <hector@scouts-es.org>
-
-        * es.po: updated Spanish translation.
-
-2000-10-04  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-10-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-10-03  H€Ètor GarcÄÆ ŽŒŽÃlvarez  <hector@scouts-es.org>
-
-	* es.po: updated Spanish translation.
-
-2000-10-02  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: updated French translation.
-
-2000-10-02  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-10-01  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-09-29  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-09-28  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-09-28  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-09-27  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-09-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-26  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Completed the Swedish translation.
-
-2000-09-25  Christophe Merlet <christophe@merlet.net>
-
-	* POTFILES.in: Reverted somes changes. Oups :(
-
-2000-09-25  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2000-09-25  Christophe Merlet <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-	* POTFILES.in: Updated files list
-	
-2000-09-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-20  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-09-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* POTFILES.in: Removed files that have been moved to gal.
-
-2000-09-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* POTFILES.in: `alphabet.glade.h' is now in
-	`addressbook/gui/widgets'.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* POTFILES.in: s/minicard/widgets/
-
-2000-09-12  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: corrected some mistakes
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* POTFILES.in: Removed some files that are not there anymore.
-
-2000-09-12  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-09-12  Richard Hult  <rhult@codefactory.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-09-12  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Added Finnish translation.
-
-2000-09-12  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-09-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-10  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Made a small correction to dutch translation.
-
-2000-09-10  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Update Dutch translation.
-
-2000-09-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-09  Akira TAGOH <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2000-09-09  Kai Lahmann <kl@linuxfaqs.de>
-
-	* nl.po: Updated dutch translation from Dennis Smit <synap@area101.penguin.nl>
-
-2000-09-08  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-04  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-09-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-29  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-08-29  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-29  Akira TAGOH <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2000-08-27  Joaquim Fellmann <joaquim@hrnet.fr>
-
-	* fr.po: Updated French translation.
-
-2000-08-27  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-26  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-2000-08-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* POTFILES.in: Remove add addressbook/demo files from this.
-
-2000-08-25  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-23  Richard Hult  <rhult@hem.passagen.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-08-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-08-19  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Updated.
-
-2000-08-19  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-	* POTFILES.in: Added missing files that are in the build.
-
-2000-08-17  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-17  Kai Lahmann <kl@linuxfaqs.de>
-
-	* de.po: Updated German translation
-
-2000-08-16  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-13  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-	* POTFILES.in: Added missing files that are in the build.
-
-2000-08-12  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-	* POTFILES.in: Added missing files that are in the build. Sorted in alphabet order
-
-
-2000-08-11  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-10  Akira TAGOH  <at@ue-spacy.com>
-
-	* ja.po: Updated Japanese translation.
-
-2000-08-08  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Added missing files that are in the build.
-	* no.po: Updated Norwegian translation.
-	
-2000-08-07  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-05  Fatih Demir  <kabalak@gmx.net> 
-
-        * tr.po: Updated the Turkish translation.
-
-2000-08-04  Szabolcs BAN <shooby@gnome.hu>
-
-	* hu.po: Updated Hungarian translations.
-
-2000-08-03 Alastair McKinstry <mckinstry@computer.org>
-
-	* ga.po: Add Irish translation.
-
-2000-08-02  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* es.po,hu.po,it.po,sl.po: various syntax checkings (missing %s, %S
-	instead of %s etc)
-
-2000-07-30  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-07-28  Szabolcs BAN <shooby@gnome.hu>
-
-	* hu.po: Updated Hungarian translations.
-
-2000-07-27  Fatih Demir  <kabalak@gmx.net> 
-
-        * tr.po: Updated the Turkish translation.
-
-2000-07-27  Fatih Demir  <kabalak@gmx.net> 
-
-        * tr.po: Updated the Turkish translation.
-
-2000-07-26  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-07-24  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Updated German translation.
-
-2000-07-24  Fatih Demir	<kabalak@gmx.net>
-	
-	* tr.po: Updated the Turkish translation.
-	
-2000-07-24  Szabolcs BAN  <shooby@gnome.hu>
-
-	* hu.po: updated Hungarian translations...
-
-2000-07-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* it.po: Added missing \n.
-
-2000-07-23  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-07-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* it.po: Updated Italian translation from Clara Tattoni
-	<clara.tattoni@libero.it>.
-
-2000-07-21  Szabolcs BAN  <shooby@gnome.hu>
-
-	* hu.po: updated Hungarian translations...
-
-2000-07-21  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Fixed an error.
-
-2000-07-19  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-07-16  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-2000-07-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-07-16  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-07-15  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Updated. Should be complete and pretty usable.
-
-2000-07-13  Fatih Demir  <kabalak@gmx.net> 
-
-        * tr.po: Updated the Turkish translation.
-
-2000-07-13  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-07-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* POTFILES.in: Removed several calendar/gui files that are no
-	longer there.
-
-2000-07-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* POTFILES.in: Removed calendar/gui/evolution-calendar-control.c
-
-2000-07-09  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-07-09  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Rough cut at a complete German translation. Still needs a
-	lot of love.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* POTFILES.in: Removed `e-select-names.c' and
-	`select-name.glade.h' which were removed by Chris' commit.
-
-2000-06-30  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-29  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-28  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-28  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Added a load of missing files.
-	* no.po: Updated Norwegian translation.
-	
-2000-06-27  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-24  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-06-20  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* pt.po: Updated Portuguese translation from
-	Tiago Antao <tiagoantao@bigfoot.com>
-
-2000-06-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* it.po: Italian translation from Clara Tattoni
-	<clara.tattoni@libero.it>.
-
-2000-06-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* POTFILES.in: why the heck was 
-	camel/providers/imap/imap.c listed? Oh well, 'tis
-	removed now...
-
-2000-06-17  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-06-13  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-11  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-11  Fatih Demir  <kabalak@gmx.net> 
-
-        * tr.po: Updated the Turkish translation.
-
-2000-06-10  Zbigniew Chyla  <chyla@buy.pl>
-
-	* pl.po: Added Polish translation.
-
-2000-06-10  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-09  Fatih Demir  <kabalak@gmx.net> 
-
-        * tr.po: Updated the Turkish translation.
-
-2000-06-08  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-06-06  Fatih Demir	<kabalak@gmx.net>
-	
-	* tr.po: Finished it [ what about the caveat message?
-		Translating it is much fun ;) ].
-
-2000-06-05  Kenneth Christiansen <kenneth@gnu.org>
-
-	* README.tools: Added readme file, which explains the
-	use of the newly checked in po tools.
-
-	hmm, looking forward to tomorrow...viva los compleaŽ¢ŽÒs!
-	:)
-
-2000-06-05  Fatih Demir	<kabalak@gmx.net>
-	
-	* tr.po: A quick-update ( not fully finished ).
-
-2000-06-04  Valek Filippov  <frob@df.ru>                                        
-                                                                                
-        * ru.po: updated russian translation.
-	
-2000-06-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* it.po: New.  Just a skeleton.
-
-	* de.po: New, from Kai Lahmann <kl@linuxfaqs.de>.
-
-	* POTFILES.in: Updated.
-
-2000-06-04  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-06-03  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-06-02  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* pt.po: Added Portuguese translation from
-	Tiago Antao <tiagoantao@bigfoot.com>
-
-2000-06-01  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-05-28  Fatih Demir	<kabalak@gmx.net>
-	
-	* tr.po: Updated the Turkish translation.
-
-2000-05-28  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-05-27  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-05-26  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-23  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-23  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-22  Yukihiro Nakai  <nakai@gnome.gr.jp>
-
-	* ja.po: Update from Akira TAGOH.
-
-2000-05-18  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-18  Yukihiro Nakai  <nakai@gnome.gr.jp>
-
-	* ja.po: Update from Akira TAGOH.
-
-2000-05-14  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-05-14  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-13  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-13  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-13  Valek Filippov  <frob@df.ru>
-
-	* POTFILES.in: added *.glade.h and *-strings.h files.
-	* ru.po: updated russian translation.
-
-2000-05-12  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-12  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* POTFILES.in: Removed mail/mail-component.c.
-
-2000-05-09  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-	* update.sh: Updated.
-
-2000-05-08  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* New update.sh script from Kenneth.
-
-2000-05-08  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-08  H€Ètor GarcÄÆ ŽŒŽÃlvarez <hector@scouts-es.org>
-
-	* es.po: added translation to spanish.
-
-2000-05-07  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* POTFILES.in: Remove `shell/e-shell-shortcut.c'.
-
-2000-05-05  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-2000-05-04  Fatih Demir	<kabalak@gmx.net>
-	
-	* tr.po : Updated the Turkish translation .
-
-2000-05-03  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-03  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* POTFILES.in: Removed `shell/e-service.c'.
-
-2000-05-02  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-01  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-04-30  Arjan Scherpenisse  <acscherp@wins.uva.nl>
-
-	* nl.po: Added Dutch translation
-
-2000-04-25  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-04-21  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-04-20  Fatih Demir	<kabalak@gmx.net>
-
-	* tr.po : Added the Turkish translation .
-
-2000-04-20  Yukihiro Nakai <nakai@gnome.gr.jp>
-
-	* ja.po: Initial Japanese translation from Akira Tagoh
-
-2000-04-19  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* da.po: Updated Danish file
-
-2000-04-19  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-04-18  Vincent Renardias  <vincent@redhat.com>
-
-	* fr.po: creation.
-
-2000-04-18  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-04-15  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* POTFILES.in: Removed `libversit/vcc.c' as its auto-generated and
-	breaks.
-
-2000-04-12  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* da.po: Updated Danish file
-
-2000-04-10  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-04-08  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Added Galician translation.
-
-2000-04-07  Yuri Syrota  <rasta@renome.rovno.ua>
-
-	* uk.po: Updated Ukrainian translation.
-
-2000-04-06  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-04-04  Spiros Papadimitriou  <spapadim+@cs.cmu.edu>
-
-	* el.po: Added Greek translation.
-
-2000-04-04  Kjartan Maraas  <kmaraas@online.no>
-
-	* da.po: Added Danish translation from Kenneth Christiansen
-	<kenneth@ripen.dk>.
-	* no.po: Updated Norwegian translation.
-	* ru.po: Added Russian translation from Valek Filippov
-	<frob@df.ru>.
-	
-2000-04-04  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-04-04  Yuri Syrota  <rasta@renome.rovno.ua>
-
-	* uk.po: Added Ukrainian translation.
-
-2000-04-03  Richard Hult  <rhult@hem.passagen.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-04-03  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Added Swedish translation.
-
-2000-04-01  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Added Norwegian translation.
-	
-2000-04-01  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added evolution.pot.
-
-2000-03-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* POTFILES.in: Removed the calendar files for now.
-
-1998-07-23  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* pt.po: Added Portuguese translation.
-
-1996-06-12  Tristan Tarrant <ttarrant@suntlc.etnoteam.it>
-
-	* it.po : Italian translations added
diff --git a/po/LINGUAS b/po/LINGUAS
index db3dc031ca..f2c74ad183 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -6,6 +6,7 @@ ar
 as
 ast
 az
+be
 be@latin
 bg
 bn
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9b7a9f6930..e8b6a1da78 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -279,6 +279,8 @@ modules/mail/e-mail-shell-view.c
 modules/mail/em-account-prefs.c
 modules/mail/em-composer-prefs.c
 modules/mail/em-mailer-prefs.c
+modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in
+modules/mailto-handler/evolution-mailto-handler.c
 modules/plugin-python/example/org-gnome-hello-python-ui.xml
 modules/plugin-python/example/org-gnome-hello-python.eplug.xml
 plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml
@@ -307,9 +309,6 @@ plugins/calendar-weather/calendar-weather.c
 plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml
 plugins/contacts-map/contacts-map.c
 plugins/contacts-map/org-gnome-contacts-map.eplug.xml
-plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in
-plugins/default-mailer/org-gnome-default-mailer.eplug.xml
-plugins/default-mailer/org-gnome-default-mailer.error.xml
 plugins/default-source/default-source.c
 plugins/default-source/org-gnome-default-source.eplug.xml
 plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
@@ -353,8 +352,6 @@ plugins/groupwise-features/send-options.c
 plugins/groupwise-features/share-folder-common.c
 plugins/groupwise-features/share-folder.c
 plugins/groupwise-features/status-track.c
-plugins/hula-account-setup/camel-hula-listener.c
-plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml
 plugins/image-inline/org-gnome-image-inline.eplug.xml
 plugins/imap-features/imap-headers.c
 [type: gettext/glade]plugins/imap-features/imap-headers.ui
@@ -406,7 +403,6 @@ plugins/vcard-inline/vcard-inline.c
 plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
 plugins/webdav-account-setup/webdav-contacts-source.c
 shell/apps_evolution_shell.schemas.in
-shell/e-config-upgrade.c
 shell/e-shell-backend.c
 shell/e-shell-content.c
 shell/e-shell-migrate.c
diff --git a/po/be@latin.po b/po/be@latin.po
index 3de1f8140b..eb5db5fe2d 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -13749,7 +13749,7 @@ msgstr "Zmoŭ�anaja šyrynia akna lista"
 #: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
-"Styl demanstracyi lista (\"zvy�ajny\", \"poŭnyja zahałoŭki\",\" krynica\")"
+"Styl demanstracyi lista (\"normal\" - zvy�ajny, \"full headers\" - poŭnyja zahałoŭki, \"source\" - krynica)"
 
 #: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
diff --git a/po/bg.po b/po/bg.po
index d0f21f6f9a..c8d7f2aa2c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -22,9 +22,9 @@
 #: ../shell/main.c:479
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution gnome-2-30\n"
+"Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-18 13:03+0200\n"
+"POT-Creation-Date: 2010-03-17 16:56+0200\n"
 "PO-Revision-Date: 2010-03-17 16:56+0200\n"
 "Last-Translator: Krasimir Chonov <mk2616@abv.bg>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 34247d7111..ca0cd07e1c 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -12,13 +12,13 @@
 # Runa Bhattacharjee <runabh@gmail.com>, 2006, 2007.
 # Runa Bhattacharjee <runab@fedoraproject.org>, 2008.
 # Runa Bhattacharjee <runab@redhat.com>, 2008, 2009, 2010.
-#: ../shell/main.c:479
+#: ../shell/main.c:454
 msgid ""
 msgstr ""
 "Project-Id-Version: bn_IN\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
-"POT-Creation-Date: 2010-04-16 11:44+0000\n"
+"POT-Creation-Date: 2010-04-17 05:26+0000\n"
 "PO-Revision-Date: 2010-04-17 16:59+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
 "Language-Team: Bengali INDIA <anubad@lists.ankur.org.in>\n"
@@ -107,7 +107,7 @@ msgstr "LDAP সারà§�ভারে পরিচয়-পà§�রমাণ করà
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1267
 msgid "Failed to delete contact"
 msgstr "নির�বাচিত পরিচিতি ম�ছে ফেলতে ব�যর�থ"
 
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 "Evolution প�নরায় আরম�ভ না করা হলে আপনার {0} সংখ�যক পরিচিতির তথ�য উপলব�ধ হবে না।"
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -247,16 +247,6 @@ msgstr "মাপ পরিবর�তন (_R)"
 msgid "_Use as it is"
 msgstr "�ই অবস�থায় ব�যবহার কর�ন (_U)"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "ডিফল�ট সিঙ�ক (Sync) ঠিকানা:"
@@ -273,7 +263,7 @@ msgstr "পাইলটের ঠিকানা অà§�যাপà§�লিকেà
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2005
 msgid "Anniversary"
 msgstr "বার�ষিকী"
 
@@ -284,38 +274,41 @@ msgstr "বার�ষিকী"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2004 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:107
 msgid "Birthday"
 msgstr "জন�মদিন"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#, fuzzy
+msgid "Blog:"
+msgstr "ব�লগ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "শ�রেণীবিভাগ...(_t)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #, fuzzy
 msgid "Calendar:"
 msgstr "বর�ষপঞ�জি:(_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
 msgid "Contact"
 msgstr "পরিচিতি"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2568
 msgid "Contact Editor"
 msgstr "পরিচিতি সম�পাদক"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
@@ -324,229 +317,197 @@ msgstr "পরিচিতি সম�পাদক"
 msgid "Email"
 msgstr "ই-মেইল"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "ম�ক�ত/ব�যস�ত(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "সম�পূর�ণ নাম ...(_N)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "গৃহ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 #, fuzzy
 msgid "Home Page:"
 msgstr "হোম পেজ(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "চিত�র"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 #, fuzzy
 msgid "Instant Messaging"
 msgstr "<b>ইনস�ট�যান�ট মেসেজিং</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "চিঠি লেখার ঠিকানা"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "বিবিধ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "ডাকনাম: (_k)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "নোট"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1711
 msgid "Other"
 msgstr "অন�যান�য"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "ব�যক�তিগত তথ�য"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "টেলিফোন"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 #, fuzzy
 msgid "Video Chat:"
 msgstr "ভিডিও চ�যাট(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 #, fuzzy
 msgid "Web Addresses"
 msgstr "<b>ওয়েব ঠিকানা</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-#, fuzzy
-msgid "Web Log:"
-msgstr "ওয়েব লগ(_W):"
-
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "কর�ম"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "ঠিকানা: (_A)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "বার�ষিকী:(_A)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "সহকারী:(_A)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "জন�মদিন:(_B)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#, fuzzy
+msgid "_Blog:"
+msgstr "ব�লগ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 #: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "বর�ষপঞ�জি:(_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "শহর:(_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "কোম�পানি:(_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "দেশ:(_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "বিভাগ:(_D)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "�র মধ�যে ফাইল কর�ন: (_F)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "ম�ক�ত/ব�যস�ত(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "হোম পেজ(_H):"
 
 # "Manager" �র বাংলা হইলো 'ব�যবস�থাপক'। তবে Context ব��তে না পারায় আপাতত সেটা লিখলাম না।
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "ম�যানেজার(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "কার�যালয়(_O) :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "পোস�ট বক�স (_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "পেশা(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "স�বামী/স�ত�রী(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "রাষ�ট�র/প�রদেশ (_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "শিরোনাম (_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "ভিডিও চ�যাট(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "HTML বিন�যাসের মেইল প�রাপ�ত করতে ইচ�ছ�ক(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "ওয়েব লগ(_W):"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "কোথায় (_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "জিপ/পোস�টাল কোড(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:320
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "নাম"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "সম�পাদনযোগ�য"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -588,7 +549,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "Error adding contact"
 msgstr "পরিচিতি যোগ করতে সমস�যা হয়েছে"
 
@@ -600,45 +561,21 @@ msgstr "পরিচিতি পরিবর�তন করতে সমস�
 msgid "Error removing contact"
 msgstr "পরিচিতি ম�ছে ফেলতে সমস�যা হয়েছে"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "উৎস বই"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "গন�তব�যর বই"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "নত�ন পরিচিতি হল"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "লিখনযোগ�য ক�ষেত�র"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "আবশ�যক মান"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "পরিবর�তিত"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2563
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "পরিচিতি সম�পাদক - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2971
 msgid "Please select an image for this contact"
 msgstr "অন�গ�রহ করে �ই পরিচিতির জন�য �কটি চিত�র নির�বাচন কর�ন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2972
 msgid "_No image"
 msgstr "কোনো ছবি উপস�থিত নেই(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -646,56 +583,46 @@ msgstr ""
 "পরিচিতি সংক�রান�ত ডাটা অবৈধ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3249
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s'-র বিন�যাস বৈধ নয়"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3256
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s'-র বিন�যাস বৈধ নয়"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3282
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ফা�কা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3296
 msgid "Invalid contact."
 msgstr "অবৈধ পরিচিতি।"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "�টপট পরিচিতি সংযোজন"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "সম�পূর�ণ সম�পাদন কর�ন (_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "সম�পূর�ণ নাম (_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "ই-মেইল(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "ঠিকানাবই নির�বাচন কর�ন (_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr ""
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr ""
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr ""
@@ -764,7 +691,7 @@ msgid "_Suffix:"
 msgstr "সাফিক�স (_S):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:674
 msgid "Contact List Editor"
 msgstr "পরিচিতি তালিকা সম�পাদক"
 
@@ -782,7 +709,7 @@ msgid "_List name:"
 msgstr "লিস�টের নাম (_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:155
 msgid "_Select..."
 msgstr "নির�বাচন কর�ন... (_S)"
 
@@ -791,39 +718,27 @@ 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:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:767
 msgid "Contact List Members"
 msgstr "পরিচিতি তালিকার সদস�য"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:915
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1331
 msgid "_Members"
 msgstr "সদস�য(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1170
 msgid "Error adding list"
 msgstr "লিস�ট যোগ করতে সমস�যা হয়েছে"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1184
 msgid "Error modifying list"
 msgstr "লিস�ট পরিবর�তন করতে সমস�যা হয়েছে"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1198
 msgid "Error removing list"
 msgstr "লিস�ট ম�ছে ফেলতে সমস�যা হয়েছে"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "বই"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "হল নত�ন লিস�ট"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "পরিবর�তিত পরিচিতি:"
@@ -863,11 +778,11 @@ msgstr ""
 " আপনি কি তারপরও �টি যোগ করতে চান?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "�কত�রিত কর�ন (_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 msgid "Merge Contact"
 msgstr "পরিচিতি �কত�রিত কর�ন"
 
@@ -875,20 +790,20 @@ msgstr "পরিচিতি �কত�রিত কর�ন"
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Any field contains"
 msgstr "যেকোনো ক�ষেত�র ধারণ করে"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "ই-মেইলের প�রথমাংশে আছে"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "নামের মধ�যে রয়েছে"
 
@@ -909,113 +824,83 @@ msgstr[1] "%d-টি পরিচিতি"
 msgid "Error getting book view"
 msgstr "বইয়ের ভিউ পেতে সমস�যা"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "অন�সন�ধান"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:706
 #, fuzzy
 msgid "Search Interrupted"
 msgstr "অন�সন�ধানের ফিল�টার"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "মডেল"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "কার�ড পরিবর�তন করতে সমস�যা"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
 #, fuzzy
 msgid "Cut selected contacts to the clipboard"
 msgstr "নির�বাচিত টেক�সটটি ক�লিপবোর�ডে কাট কর�ন"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 #, fuzzy
 msgid "Copy selected contacts to the clipboard"
 msgstr "নির�বাচিত টেক�সটটি ক�লিপবোর�ডে কপি করা হবে"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 #, fuzzy
 msgid "Paste contacts from the clipboard"
 msgstr "ক�লিপবোর�ড থেকে কর�ম পেস�ট কর�ন"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "নির�বাচিত পরিচিতি ম�ছে ফেল�ন"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 #, fuzzy
 msgid "Select all visible contacts"
 msgstr "সকল পরিচিতিদের নির�বাচন কর�ন"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-#, fuzzy
-msgid "Shell View"
-msgstr "প�রদর�শন নির�বাচন: %s"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "উৎস"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
 #, fuzzy
 msgid "Are you sure you want to delete these contact lists?"
 msgstr ""
 "আপনি কি নিশ�চিতরূপে �ই সমস�ত পরিচিতিদের\n"
 "তালিকা ম�ছে ফেলতে ইচ�ছ�ক?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1289
 #, fuzzy
 msgid "Are you sure you want to delete this contact list?"
 msgstr ""
 "আপনি কি নিশ�চিতরূপে �ই সমস�ত পরিচিতিদের\n"
 "তালিকা ম�ছে ফেলতে ইচ�ছ�ক?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1293
 #, fuzzy, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr ""
 "আপনি কি নিশ�চিতরূপে �ই পরিচিতিদের\n"
 "তালিকা (%s) ম�ছে ফেলতে ইচ�ছ�ক?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 #, fuzzy
 msgid "Are you sure you want to delete these contacts?"
 msgstr ""
 "আপনি কি নিশ�চিতরূপে �ই পরিচিতিদের\n"
 "তথ�য ম�ছে ফেলতে ইচ�ছ�ক?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, fuzzy
 msgid "Are you sure you want to delete this contact?"
 msgstr ""
 "আপনি কি নিশ�চিতরূপে �ই পরিচিতিদের\n"
 "তথ�য ম�ছে ফেলতে ইচ�ছ�ক?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
 #, fuzzy, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr ""
 "আপনি কি নিশ�চিতরূপে �ই পরিচিতির\n"
 "তথ�য (%s) ম�ছে ফেলতে ইচ�ছ�ক?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1462
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1024,11 +909,11 @@ msgstr ""
 "%d সংখ�যক নত�ন পরিচিতি খ�ললে %d সংখ�যক নত�ন উইন�ডোও খ�লবে।\n"
 "আপনি কি নিশ�চিতরূপে �ই সমস�ত পরিচিতি প�রদর�শন করতে ইচ�ছ�ক?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1467
 msgid "_Don't Display"
 msgstr "প�রদর�শন করা হবে না (_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 msgid "Display _All Contacts"
 msgstr "সমস�ত পরিচিতি প�রদর�শন করা হবে (_A)"
 
@@ -1189,7 +1074,6 @@ msgid "Telex"
 msgstr "টেলেক�স"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:825
 msgid "Title"
 msgstr "শিরোনাম"
 
@@ -1201,59 +1085,7 @@ msgstr "�কক"
 msgid "Web Site"
 msgstr "ওয়েব সাইট"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "প�রস�থ"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "উচ�চতা"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-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:140
-msgid "Column Width"
-msgstr "কলামের প�রস�থ"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1263,7 +1095,7 @@ msgstr ""
 "\n"
 "পরিচিতি অন�সন�ধান..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1277,7 +1109,7 @@ msgstr ""
 "\n"
 "নত�ন পরিচিতি নির�মাণ করতে �ই স�থানে দ�বার ক�লিক কর�ন।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1291,7 +1123,7 @@ msgstr ""
 "\n"
 "�কটি নত�ন পরিচিতি তৈরি করার জন�য �খানে দ�ইবার ক�লিক কর�ন।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1301,7 +1133,7 @@ msgstr ""
 "\n"
 "পরিচিতি অন�সন�ধান।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1311,10 +1143,6 @@ msgstr ""
 "\n"
 "�ই ভিউতে প�রদর�শন করার মত কিছ� নেই।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "অ�যাডাপ�টার"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "কর�মস�থলের ই-মেইল"
@@ -1324,18 +1152,10 @@ msgid "Home Email"
 msgstr "গৃহের ই-মেইল"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "অন�যান�য ই-মেইল"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "নির�বাচিত"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "কার�সার আছে"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1378,18 +1198,18 @@ msgid "Copy _Email Address"
 msgstr "ই-মেইল ঠিকানা কপি কর�ন (_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:381
 #, fuzzy
 msgid "Copy the email address to the clipboard"
 msgstr "ক�লিপবোর�ডে তথ�য কপি কর�ন।"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:386
 msgid "_Send New Message To..."
 msgstr "নত�ন বার�তা প�রাপক...(_S)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:388
 #, fuzzy
 msgid "Send a mail message to this address"
 msgstr "�কটি বার�তাকে �কটি নত�ন কর�মে রূপান�তর কর�ন।"
@@ -1426,22 +1246,21 @@ msgid "Video Chat"
 msgstr "ভিডিও চ�যাট"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:496
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "বর�ষপঞ�জি"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:116
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ম�ক�ত/ব�যস�ত"
@@ -1469,21 +1288,19 @@ msgid "Web Log"
 msgstr "ওয়েব লগ"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:346 ../mail/e-mail-migrate.c:962
+#: ../capplet/settings/mail-capplet-shell.c:350
 #: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/addressbook/e-book-shell-migrate.c:134
 #: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "ব�যক�তিগত"
@@ -1500,8 +1317,8 @@ msgstr "হোম পেজ"
 msgid "Blog"
 msgstr "ব�লগ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
 #, c-format
 msgid "Click to mail %s"
 msgstr "%s -কে মেইল করতে হলে ক�লিক কর�ন"
@@ -1559,11 +1376,11 @@ msgstr "অসমর�থিত প�রোটোকল"
 #. To Translators: This is task status
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2659
 msgid "Canceled"
 msgstr "বাতিল করা হয়েছে"
 
@@ -1696,27 +1513,27 @@ msgstr "�ই অন�সন�ধানটি সফলভাবে সম�
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "ঠিকানাবই নির�বাচন কর�ন"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "তালিকা"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "পরিচিতিটিকে �খানে স�থানান�তর কর�ন"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "পরিচিতিটিকে �খানে কপি কর�ন"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "পরিচিতি �খানে স�থানান�তর কর�ন"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "পরিচিতি �খানে কপি কর�ন"
 
@@ -1729,7 +1546,7 @@ msgstr "কার�ড ভিউ"
 #: ../addressbook/importers/evolution-ldif-importer.c:516
 #: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ইম�পোর�ট করা হচ�ছে..."
 
@@ -1850,19 +1667,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP সার�ভারের সাথে বেনামীভাবে সংযোগ স�থাপন করা হচ�ছে"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "পরিচয় প�রমাণে ব�যর�থ।\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s-র(ব�যবহারকারী %s) জন�য পাসওয়ার�ড লিখ�ন"
 
 #: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
+#: ../plugins/caldav/caldav-browse-server.c:808
 #: ../plugins/google-account-setup/google-source.c:440
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
@@ -2004,48 +1821,43 @@ msgstr "আপনি কি নিশ�চিতরূপে সারসংক
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "আপনি কি নিশ�চিতরূপে সারসংক�ষেপ বিনা কর�ম সংক�রান�ত তথ�য প�রেরণ করতে ইচ�ছ�ক?"
 
-# FIXME
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "বর�ষপঞ�জির রিপোসিটরি অফলাইন আছে।"
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "নত�ন অন�ষ�ঠান নির�মাণ করতে ব�যর�থ"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "অন�ষ�ঠান সংক�রান�ত তথ�য সংরক�ষণ করতে ব�যর�থ"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "'{0}' বর�ষপঞ�জি ম�ছে ফেলা হবে কি?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "'{0}' কর�মসূচী ম�ছে ফেলা হবে কি?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "'{0}' কর�মসূচী ম�ছে ফেলা হবে কি?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "প�রেরণ করা হবে না (_n)"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ডাউনলোড কর�ম বর�তমানে চলমান। আপনি কি সাক�ষাৎ‌কার সংরক�ষণ করতে ইচ�ছ�ক?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ডাউনলোড কর�ম বর�তমানে চলমান। আপনি কি কর�ম সংরক�ষণ করতে ইচ�ছ�ক?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "�ডিটর লোড করা যায়নি।"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -2053,31 +1865,26 @@ msgstr ""
 "সকল অংশগ�রহণকারীদেরকে ই-মেইলে আমন�ত�রনপত�র প�রেরণ করা হবে �বং তারা � কর�মটি গ�রহণ "
 "করতে পারবেন।"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "সকল অংশগ�রহণকারীদেরকে ই-মেইলে আমন�ত�রনপত�র প�রেরণ করা হবে �বং তারা তাদের উত�তর "
 "পাঠাতে পারবেন।"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "বর�ষপঞ�জি লোড করতে সমস�যা"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "কর�মের তালিকা লোড করতে সমস�যা"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "কর�মের তালিকা লোড করতে সমস�যা"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "'{0}'-� সমস�যা হয়েছে।"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2085,7 +1892,7 @@ msgstr ""
 "অন�যান�য অংশগ�রহণকারীদের কাছে বিলোপনের কোনো সূচনা আপনি প�রেরণ না করলে সভা বাতিল "
 "হওয়ার খবর অাজানা থাকবে।"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2093,7 +1900,7 @@ msgstr ""
 "অন�যান�য অংশগ�রহণকারীদের কাছে বিলোপনের কোনো সূচনা আপনি প�রেরণ না করলে �ই মেমোটি "
 "ম�ছে ফেলার খবর অজানা থাকবে।"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2101,11 +1908,7 @@ msgstr ""
 "অন�যান�য অংশগ�রহণকারীদের কাছে বিলোপনের কোনো সূচনা আপনি প�রেরণ না করলে �ই কর�মটি "
 "ম�ছে ফেলার খবর অজানা থাকবে।"
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "সার�ভার থেকে কোনো প�রতিক�রিয়া পাওয়া যায়নি।"
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2113,7 +1916,7 @@ msgstr ""
 "অংশগ�রণকারীদেরকে আপডেট করা তথ�য প�রেরণ করা হলে তারা তাদের বর�ষপঞ�জিটি আপডেট করে "
 "রাখতে পারেন।"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2121,7 +1924,7 @@ msgstr ""
 "অংশগ�রহণকারীদেরকে আপডেট করা তথ�য প�রেরণ করা হলে তারা তাদের কর�মতালিকাটি আপডেট "
 "করে রাখতে পারেন।"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2129,7 +1932,7 @@ msgstr ""
 "সংয�ক�ত কয়েকটি বস�ত� ডাউনলোড করা হচ�ছে। সাক�ষাৎ‌কার সংরক�ষণ করা হলে অসমাপ�ত ডাউনলোড "
 "হওয়া বস�ত�গ�লি সাক�ষাৎ‌কারের সাথে সংরক�ষিত হবে না।"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2137,98 +1940,94 @@ msgstr ""
 "সংয�ক�ত কয়েকটি বস�ত� ডাউনলোড করা হচ�ছে। কর�ম সংরক�ষণ করা হলে অসমাপ�ত ডাউনলোড হওয়া "
 "বস�ত�গ�লি কর�মের সাথে সংরক�ষিত হবে না।"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "আপনার দ�বারা বর�তমানে ব�যবহৃত সার�ভারের মধ�যে কয়েকটি বৈশিষ�ট�য সঠিকরূপে চলতে না পারার "
 "সম�ভাবনা রয়েছে।"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution বর�ষপঞ�জিকাটি অপ�রত�যাশিতভাবে বন�ধ হয়ে গেছে।"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution বর�ষপঞ�জিগ�লি অপ�রত�যাশিতভাবে বন�ধ হয়ে গেছে।"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution'র কর�মসূচী অপ�রত�যাশিতভাবে বন�ধ হয়ে গেছে।"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-র কর�মগ�লি অপ�রত�যাশিতভাবে বন�ধ হয়ে গেছে।"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:55
 msgid "The calendar is not marked for offline usage."
 msgstr "বর�ষপঞ�জিটি অফ-লাইন ব�যবহারের উদ�দেশ�যে চিহ�নিত করা হয়নি।"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:56
 msgid "The memo list is not marked for offline usage."
 msgstr "মেমোর তালিকা, অফ-লাইন ব�যবহারের জন�য চিহ�নিত নয়।"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "কর�মতালিকা অফ-লাইন ব�যবহারের উদ�দেশ�যে চিহ�নিত করা হয়নি।"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "বর�ষপঞ�জিটি স�থায়ীরূপে ম�ছে ফেলা হবে।"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "কর�মসূচী স�থায়ীরূপে ম�ছে ফেলা হবে।"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "কর�মতালিকা স�থায়ীরূপে ম�ছে ফেলা হবে।"
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "বর�ষপঞ�জি লোড করতে ব�যর�থ"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "আপনি কি �ই সাক�ষাৎকারে করা পরিবর�তনগ�লি সংরক�ষণ করতে ইচ�ছ�ক?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:62
 #, fuzzy
 msgid "Would you like to save your changes to this meeting?"
 msgstr "আপনি কি �ই কর�মসূচীতে করা পরিবর�তনগ�লি সংরক�ষণ করতে ইচ�ছ�ক?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "আপনি কি �ই কর�মসূচীতে করা পরিবর�তনগ�লি সংরক�ষণ করতে ইচ�ছ�ক?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "আপনি কি �ই কর�মের জন�য করা পরিবর�তনগ�লি সংরক�ষণ করতে ইচ�ছ�ক?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "�ই মেমো বিলোপন সংক�রান�ত কোনো সূচনা কি আপনি প�রেরণ করতে ইচ�ছ�ক?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "বিলোপনের সূচনা কি আপনি সমস�ত অংশগ�রহণকারীকে প�রেরণ করতে ইচ�ছ�ক?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "আপনি কি অংশগ�রহণকারীদেরকে সভার আমন�ত�রনপত�র প�রেরণ করতে ইচ�ছ�ক?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "আপনি কি �ই কর�মটি অংশগ�রহণকারীদেরকে প�রেরণ করতে ইচ�ছ�ক?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "আপনি কি সভা সংক�রান�ত তথ�য আপডেট করে অংশগ�রহনকারীদেরকে প�রেরণ করতে ইচ�ছ�ক?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
 msgstr "আপনি কি কার�য সংক�রান�ত তথ�য আপডেট করে অংশগ�রহণকারীদেরকে প�রেরণ করতে ইচ�ছ�ক?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2238,62 +2037,58 @@ msgstr ""
 "দর�ণ Evolution ব�যবহারের সময় সমস�যা দেখা দিতে পারে। সঠিক কার�যকারিতার জন�য "
 "সার�ভারে কোনো সমর�থিত সংস�করণ ব�যবহার কর�ন।"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:72
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "আপনি �ই সাক�ষাৎকারে কিছ� পরিবর�তন করেছেন, কিন�ত� সেগ�লি সংরক�ষণ করেননি।"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:73
 #, fuzzy
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "আপনি �ই কর�মতে কিছ� পরিবর�তন করেছেন, কিন�ত� তা �খনো সংরক�ষণ করননি।"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "আপনি �ই কর�মতে কিছ� পরিবর�তন করেছেন, কিন�ত� তা �খনো সংরক�ষণ করননি।"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "আপনি �ই কর�মসূচীতে কিছ� পরিবর�তন করেছেন, কিন�ত� তা �খনো সংরক�ষণ করননি।"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Evolution প�নরায় আরম�ভ না করা হলে আপনার বর�ষপঞ�জিগ�লি উপলব�ধ হবে না।"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Evolution প�নরায় আরম�ভ না করা হলে আপনার কর�মসূচী উপলব�ধ হবে না।"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Evolution প�নরায় আরম�ভ না করা হলে আপনার কর�মগ�লি উপলব�ধ হবে না।"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "পরিবর�তন পরিত�যাগ কর�ন (_D)"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "সংরক�ষণ কর�ন (_S)"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "পরিবর�তন সংরক�ষণ কর�ন (_S)"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "প�রেরণ কর�ন (_S)"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "সূচনা প�রদান কর�ন(_S)"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "�কাধিক-দিনব�যাপী অন�ষ�ঠানগ�লিকে ভাগ করা হবে:"
@@ -2349,7 +2144,7 @@ msgid_plural "hours"
 msgstr[0] "ঘন�টা"
 msgstr[1] "ঘন�টা"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "আরম�ভের সময়"
 
@@ -2367,7 +2162,7 @@ msgstr "সকল বাতিল কর�ন (_A)"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1573
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 #: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../plugins/itip-formatter/itip-view.c:1027
 msgid "Location:"
 msgstr "অবস�থান:"
 
@@ -2380,11 +2175,11 @@ msgid "_Dismiss"
 msgstr "বাতিল কর�ন (_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1025
+#: ../calendar/gui/dialogs/comp-editor.c:1015
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1625
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "সম�পাদনা (_E)"
@@ -2394,8 +2189,8 @@ msgid "_Snooze"
 msgstr "ঘ�ম (_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 #, fuzzy
@@ -2406,9 +2201,10 @@ msgstr "ঘন�টা"
 msgid "location of appointment"
 msgstr "সাক�ষাৎকারের স�থান"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "minutes"
@@ -2433,13 +2229,13 @@ msgstr "সà§�থান সমà§�পরà§�কে কোনো তথà§�য উà¦
 msgid "You have %d alarms"
 msgstr "%d চেতাবনী উপস�থিত"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "সতর�কবাণী"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2452,7 +2248,7 @@ msgstr ""
 "সাধারণ ডায়লগ বাক�স প�রদর�শন\n"
 "করবে।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2469,7 +2265,7 @@ msgstr ""
 "\n"
 "আপনি কি �ই প�রোগ�রামটি নিশ�চিতরূপে চালাতে ইচ�ছ�ক?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "আমাকে �ই প�রোগ�রামটির ব�যাপারে আর জিজ�ঞাসা করবে না।"
 
@@ -2511,7 +2307,7 @@ msgid "Alarm programs"
 msgstr "চেতাবনীর প�রোগ�রাম"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "স�ট�যাটাস বারের মধ�যে ত�র�টি প�রদর�শনের সময়, সেকেন�ডে নির�ধারিত।"
 
@@ -3139,7 +2935,7 @@ msgid "Classification"
 msgstr "শ�রেণীবিভাগ"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:571 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3183,19 +2979,19 @@ msgid "Organizer"
 msgstr "সংগঠক"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:569 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ব�যক�তিগত"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-cal-model.c:567
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "পাবলিক"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:299
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "প�নরাবৃত�তি"
@@ -3279,7 +3075,7 @@ msgstr "সà§�বনিরà§�বাচিত সতরà§�কধà§�বনির à
 msgid "Mes_sage:"
 msgstr "বার�তা (_s):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:77
 #, fuzzy
 msgid "Options"
 msgstr "বিকল�প (_O)"
@@ -3331,11 +3127,12 @@ msgstr "দিন"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
 #: ../plugins/google-account-setup/google-contacts-source.c:333
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "দিন"
 
@@ -3344,21 +3141,22 @@ msgstr "দিন"
 msgid "end of appointment"
 msgstr "নত�ন সাক�ষাৎকার"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "অতিরিক�ত বার প�রতি"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 #, fuzzy
 msgid "hour(s)"
 msgstr "ঘন�টা"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 #, fuzzy
 msgid "minute(s)"
 msgstr "মিনিট"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 #, fuzzy
 msgid "start of appointment"
 msgstr "সাক�ষাৎকারের স�থান"
@@ -3388,7 +3186,7 @@ msgstr "�কটিও নয়"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "নির�বাচন কর�ন ..."
 
@@ -3397,11 +3195,13 @@ msgid "Selected Calendars for Alarms"
 msgstr "সতর�কধ�বনির জন�য নির�বাচিত বর�ষপঞ�জি"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
+#, fuzzy
+msgid "Ti_me and date:"
 msgstr "তারিখ ও সময়:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
+#, fuzzy
+msgid "_Date only:"
 msgstr "শ�ধ�মাত�র তারিখ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
@@ -3440,13 +3240,13 @@ msgstr "মিনিট"
 msgid "60 minutes"
 msgstr "মিনিট"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 #, fuzzy
 msgid "Alerts"
 msgstr "সতর�কধ�বনি"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "তারিখ/সময়ের বিন�যাস"
@@ -3475,18 +3275,18 @@ msgid "Display alarms in _notification area only"
 msgstr "শ�ধ�মাত�র বিজ�ঞপ�তিস�থলে তাগাদা প�রদর�শন করা হবে (_n)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "শ�ক�রবার"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../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:278 ../mail/mail-config.ui.h:54
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2660
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "General"
@@ -3503,7 +3303,7 @@ msgid "Minutes"
 msgstr "মিনিট"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "সোমবার"
@@ -3517,184 +3317,196 @@ msgid "None"
 msgstr "�কটিও নয়"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "Pick a color"
 msgstr "�কটি রঙ নির�বাচন কর�ন"
 
 # FIXME
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "রবি (_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "শনিবার"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "মাস অন�যায়ী প�রদর�শনক�ষেত�রে, সপ�তাহ অন�যায়ী স�ক�রোল করা হবে (_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "দ�বিতীয় অঞ�চল: (_c)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "সতর�কবার�তা প�রদানের জন�য বর�ষপঞ�জি নির�বাচন কর�ন"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "�কটি তাগিদ প�রদর�শন কর�ন (_o)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "�কটি তাগিদ প�রদর�শন করা হবে (_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "তারিখ নেভিগেটরে সপ�তাহের সংখ�যা প�রদর�শন করা হবে (_n)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "দিন ও কর�মসপ�তাহ অন�সারে প�রদর�শনের মধ�যে সপ�তাহের সংখ�যা প�রদর�শন করা হবে (_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "রবিবার"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "আজকের জন�য নির�ধারিত কাজ (_a):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "বৃহঃ (_h)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "কার�য-তালিকা"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "টেমপ�লেট:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "বৃহঃস�পতিবার"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "সময়"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "সময়-অঞ�চল (_z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "সময় বিন�যাস:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "মঙ�গলবার"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "সিস�টেমের সময়ের অঞ�চল ব�যবহার করা হবে (_y)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "ব�ধবার"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "সপ�তাহের শ�র� (_k):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Work Week"
 msgstr "কার�যসপ�তাহ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "কার�যদিবস:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "১২ ঘন�টা (পূর�বাহ�ণ/অপরাহ�ণ) (_1)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "২৪ ঘন�টা (_2)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "কিছ� ম�ছে ফেলার পূর�বে নিশ�চিত হওয়ার জন�য জিঞ�জাসা করা হবে (_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "মাস অন�যায়ী প�রদর�শন ক�ষেত�রে সাপ�তাহান�তের ছ�টি �কত�রিত করা হবে(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "দিনের আরম�ভ: (_D)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "শ�ক�র (_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "উল�লিখিত সময়ের পর সম�পন�ন কর�ম আড়াল করা হবে (_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "সোম (_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "সময়োত�তীর�ণ কাজ (_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "শনি (_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "সপ�তাহ ও মাস অন�যায়ী প�রদর�শন ক�ষেত�রে সাক�ষাৎকার সমাপ�তির সময় প�রদর�শন করা হবে (_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "সময় বিভাজন: (_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "মঙ�গল (_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "ব�ধ (_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "বাৎসরিক/জন�মদিনের পূর�বে"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "প�রতি সাক�ষাৎকারের পূর�বে"
 
@@ -3703,12 +3515,12 @@ msgid "Type:"
 msgstr "ধরন:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "ধরন: (_T)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:147
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3727,35 +3539,35 @@ msgstr "অফলাইন কর�মের উদ�দেশ�যে কা
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "অফলাইন কর�মের উদ�দেশ�যে কর�মসূচী বিষয়বস�ত� স�থানীয় ফোল�ডারে কপি কর�ন (_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "রঙ: (_r)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "কর�মসূচী"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "বর�ষপঞ�জির বৈশিষ�ট�য"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "নত�ন বর�ষপঞ�জি"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "কার�য-তালিকার বৈশিষ�ট�য"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "নত�ন কর�ম-তালিকা"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "মেমো-তালিকার বৈশিষ�ট�য"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "নত�ন কর�মসূচী"
 
@@ -3812,255 +3624,234 @@ msgstr "%s  আপনি কোনো পরিবরà§�তন সাধন কà
 msgid "Validation error: %s"
 msgstr "বৈধতা সংক�রান�ত ত�র�টি: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " প�রতি "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (সম�পন�ন "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "সম�পন�ন"
-
-# FIXME
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (পূর�বনির�ধারিত "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "পূর�বনির�ধারিত "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:237
 msgid "Could not save attachments"
 msgstr "সংয�ক�ত বস�ত� সংরক�ষণ করা যায়নি"
 
-#: ../calendar/gui/dialogs/comp-editor.c:515
+#: ../calendar/gui/dialogs/comp-editor.c:505
 msgid "Could not update object"
 msgstr "অবজেক�টটি আপডেট করা যায়নি"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "সাক�ষাৎকার সম�পাদন কর�ন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "সভা - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "সাক�ষাৎকার - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:629
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "নির�ধারিত কর�ম - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:631
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "কর�ম - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:636
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "মেমো - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "সারাংশহীন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:761
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "মূল বস�ত�টি রাখা হবে কি?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:948
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "বর�তমান উইন�ডো বন�ধ করতে �ই স�থানে ক�লিক কর�ন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1464
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "নির�বাচিত বস�ত� কপি কর�ন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:962 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1471
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "নির�বাচিত বস�ত� কাট কর�ন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:969
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 #, fuzzy
 msgid "Delete the selection"
 msgstr "নির�বাচিত বস�ত� কাট কর�ন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "উপলব�ধ সহায়িকা দেখতে �ই স�থানে ক�লিক কর�ন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1513
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "ক�লিপবোর�ডের বস�ত� পেস�ট কর�ন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "বর�তমান উইন�ডো সংরক�ষণ করতে �ই স�থানে ক�লিক কর�ন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "সমস�ত টেক�সট নির�বাচন কর�ন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "শ�রেণীবিভাগ (_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1032 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1632
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "ফাইল (_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Help"
 msgstr "সাহায�য (_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "সন�নিবেশ কর�ন (_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "বিকল�প (_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1674
 msgid "_View"
 msgstr "প�রদর�শন (_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1070
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "সংয�ক�ত বস�ত�...(_A)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
 msgstr "ফাইল সংয�ক�ত করতে �ইস�থানে ক�লিক কর�ন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "শ�রেণীবিভাগ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "শ�রেণী প�রদর�শিত হবে কিনা তা টগল করে"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "সময়-অঞ�চল (_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "সময়ের অঞ�চল প�রদর�শিত হবে কিনা তা টগল করে"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "সার�বজনীন (_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "সার�বজনীন রূপে চিহ�নিত করা হবে"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "ব�যক�তিগত (_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "ব�যক�তিগত রূপে চিহ�নিত"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "গোপনীয় (_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "গোপনীয় রূপে চিহ�নিত"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "ভূমিকা শীর�ষক ক�ষেত�র (_o)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "ভূমিকা শীর�ষক ক�ষেত�র প�রদর�শন অথবা আড়াল করা হবে"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1133
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP ক�ষেত�র প�রদর�শন করা হবে কি না তা টগল করা হয়"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "অবস�থার ক�ষেত�র (_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "অবস�থার ক�ষেত�রটি প�রদর�শিত হবে কিনা তা টগল করে"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "ধরনের ক�ষেত�র (_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1149
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "যোগদানকারীর ধরন প�রদর�শন করা হবে কি না তা টগল করা হবে"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "সম�প�রতি ব�যবহৃত নথিপত�র (_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1693
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:477
 msgid "Attach"
 msgstr "সংয�ক�ত কর�ন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1748
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "সংরক�ষণ কর�ন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2025
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2965
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2958
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "কোনো আপডেটের আবির�ভাব ঘটলে �খানে যেসব পরিবর�তন করা হয়েছে তা বাতিল করা হতে পারে"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2933
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "সংয�ক�ত বস�ত�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2995
+#: ../calendar/gui/dialogs/comp-editor.c:2988
 msgid "Unable to use current version!"
 msgstr "বর�তমান সংস�করণ ব�যবহার করা সম�ভব হয়নি!"
 
@@ -4080,6 +3871,11 @@ msgstr "গনà§�তবà§�যসà§�থলটি শà§�ধà§�মাতà§�র পà
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "প�রাপকের মেইলবক�স থেকে �ই বস�ত�টি ম�ছে ফেলা হবে কি? (_D)"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+#, fuzzy
+msgid "_Retract comment"
+msgstr "শতাংশ সম�পন�ন (_e):"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "�কটি কোরবা (Corba) ত�র�টির কারণে �ই অন�ষ�ঠানটি ম�ছে ফেলা যায়নি"
@@ -4142,59 +3938,59 @@ msgstr "বন�টন কর�ন:"
 msgid "Enter Delegate"
 msgstr "প�রতিনিধির নাম লিখ�ন"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Alarms"
 msgstr "সতর�কধ�বনি (_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Click here to set or unset alarms for this event"
 msgstr "�ই অন�ষ�ঠানের জন�য তাগিদ নির�ধারণ অথবা বাতিল করার জন�য �ইখানে ক�লিক কর�ন"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Recurrence"
 msgstr "প�নরাবৃত�তি (_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Make this a recurring event"
 msgstr "�ই অন�ষ�ঠান প�নরাবৃত�তি করা হবে"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:219
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "প�রেরণ সংক�রান�ত বিকল�প"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:221
 #: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "প�রেরণ সংক�রান�ত উন�নত বিকল�প সন�নিবেশ কর�ন"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:229
 msgid "All _Day Event"
 msgstr "সারাদনব�যাপী নত�ন অন�ষ�ঠান(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:231
 msgid "Toggles whether to have All Day Event"
 msgstr "সারাদিন ব�যাপী অন�ষ�ঠান নির�ধারণ অথবা বাতিল করতে ব�যবহৃত"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "Show Time as _Busy"
 msgstr "ব�যস�ত হিসাবে সময় প�রদর�শন করা হবে (_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Toggles whether to show time as busy"
 msgstr "সময় ব�যস�ত ধার�য অথবা বাতিল করা হবে"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:248
 msgid "_Free/Busy"
 msgstr "ম�ক�ত/ব�যস�ত(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "Query free / busy information for the attendees"
 msgstr "অংশগ�রহণকারীদের জন�য ম�ক�ত/ব�যস�ত তথ�য অন�সন�ধান কর�ন"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "সাক�ষাৎকার (_m)"
 
@@ -4209,7 +4005,7 @@ msgstr ""
 "সংগঠক রূপে আপনি চিহ�নিত না হওয়ার ফলে, অন�ষ�ঠানটি আপনি সম�পাদনা করতে পারবেন না"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "চেতাবনীসহ অন�ষ�ঠান"
 
@@ -4270,7 +4066,7 @@ msgstr "�কটি সংগঠক আবশ�যক"
 msgid "At least one attendee is required."
 msgstr "অন�তত �কজন অংশগ�রহণকারী আবশ�যক।"
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' বর�ষপঞ�জিটি খোলা যায়নি।"
@@ -4281,14 +4077,14 @@ msgstr "'%s' বর�ষপঞ�জিটি খোলা যায়নি।"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:915
 #: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "আপনি %s-র প�রতিনিধিরূপে কর�ম সঞ�চালন করছেন"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -4296,26 +4092,26 @@ msgstr[0] "সাক�ষাৎকারের পূর�বে %d দিন"
 msgstr[1] "সাক�ষাৎকারের পূর�বে %d দিন"
 
 # FIXME
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, 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:2953
+#: ../calendar/gui/dialogs/event-page.c:2949
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "সাক�ষাৎকারের পূর�বে %d মিনিট"
 msgstr[1] "সাক�ষাৎকারের পূর�বে %d মিনিট"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "স�বনির�বাচিত"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2964
 #, fuzzy
 msgctxt "cal-alarms"
 msgid "None"
@@ -4338,8 +4134,10 @@ msgid "15 minutes before appointment"
 msgstr "সাক�ষাৎকারের পূর�বে %d মিনিট"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "অংশগ�রহণকারীবৃন�দ...(_s)"
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "অংশগ�রহণকারীবৃন�দ...(_n)"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
 #: ../calendar/gui/e-meeting-list-view.c:148
@@ -4354,28 +4152,27 @@ msgstr "সà§�বনিরà§�বাচিত সতরà§�কধà§�বনির à
 msgid "Event Description"
 msgstr "ঘটনা সংক�রান�ত বিবরণ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "সারাংশ (_m):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "সতর�কধ�বনি(_A)"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "বিবরণ: (_D)"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "অবস�থান(_L):"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#, fuzzy
+msgid "_Summary:"
+msgstr "সারাংশ:"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "সময়: (_T)"
@@ -4394,7 +4191,7 @@ msgstr ""
 "প�রতি\n"
 "অবধি"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2576
 msgid "Memo"
 msgstr "কর�মসূচী"
 
@@ -4409,15 +4206,15 @@ msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 "সংগঠক রূপে আপনি চিহ�নিত না হওয়ার ফলে, আপনি �ই কর�মসূচীটি সম�পাদনা করতে পারবেন না"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:876
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s'-� উপস�থিত কর�মসূচী খোলা সম�ভব হয়নি।"
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2246
-#: ../mail/em-format-html.c:2305 ../mail/em-format-html.c:2329
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1043 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:78
 msgid "To"
 msgstr "প�রাপক"
 
@@ -4426,6 +4223,11 @@ msgstr "প�রাপক"
 msgid "Sta_rt date:"
 msgstr "আরম�ভের তারিখ (_r):"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "সারাংশ (_m):"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "প�রাপক:(_o)"
@@ -4436,61 +4238,61 @@ msgstr "প�রাপক:(_o)"
 msgid "_Group:"
 msgstr "দল (_G):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "প�নরাবৃত�তিমূলক অন�ষ�ঠান পরিবর�তনের প�রচেষ�টা করা হচ�ছে। আপনি কী পরিবর�তন করতে ইচ�ছ�ক?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "প�নরাবৃত�তিমূলক অন�ষ�ঠান বণ�টনের প�রচেষ�টা করা হচ�ছে। আপনি কী পরিবর�তন করতে ইচ�ছ�ক?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "প�নরাবৃত�তিমূলক কর�ম পরিবর�তনের প�রচেষ�টা করা হচ�ছে। আপনি কী পরিবর�তন করতে ইচ�ছ�ক?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "প�নরাবৃত�তিমূলক মেমো পরিবর�তনের প�রচেষ�টা করা হচ�ছে। আপনি কী পরিবর�তন করতে ইচ�ছ�ক?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "শ�ধ�মাত�র �ই ইনস�ট�যান�সটি"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "�টি �বং �র পূর�বের ইনস�ট�যান�সগ�লি"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "�টি �বং ভবিষ�যতের ইনস�ট�যান�সগ�লি"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "সমস�ত ইনস�ট�যান�স"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "চিহ�নিত সাক�ষাৎ‌কারের মধ�যে উপস�থিত প�নরাবৃত�তিকর বিষয়বস�ত Evolution-র দ�বারা সম�পাদন "
 "করা সম�ভব নয়।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "রেকারেন�সের তারিখ বৈধ নয়"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "প�নরাবৃত�তির জন�য নির�ধারিত সময়, অন�ষ�ঠান আরম�ভের পূর�বে ধার�য করা হয়েছে"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:963
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "উপর"
 
@@ -4498,7 +4300,7 @@ msgstr "উপর"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1020
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "প�রথম"
 
@@ -4507,7 +4309,7 @@ msgstr "প�রথম"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "দ�বিতীয়"
 
@@ -4515,7 +4317,7 @@ msgstr "দ�বিতীয়"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "তৃতীয়"
 
@@ -4523,7 +4325,7 @@ msgstr "তৃতীয়"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "চত�র�থ"
 
@@ -4531,7 +4333,7 @@ msgstr "চত�র�থ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "পঞ�চম"
 
@@ -4539,13 +4341,13 @@ msgstr "পঞ�চম"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "অন�য তারিখ"
 
@@ -4553,7 +4355,7 @@ msgstr "অন�য তারিখ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1076
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "১ম থেকে ১০ম"
 
@@ -4561,7 +4363,7 @@ msgstr "১ম থেকে ১০ম"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "১১তম থেকে ২০তম"
 
@@ -4569,45 +4371,45 @@ msgstr "১১তম থেকে ২০তম"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "২১তম থেকে ৩১তম"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "দিন"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1242
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "�র উপর"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "ঘটনাসমূহ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2122
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "ব�যতিক�রম যোগ কর�ন"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2163
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "পরিবর�তনের উদ�দেশ�যে নির�বাচিত অংশ পাওয়া যায়নি।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "ব�যতিক�রম সম�পাদনা"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2213
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "ম�ছে ফেলার উদ�দেশ�যে নির�বাচিত অংশ পাওয়া যায়নি।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2352
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "তারিখ/সময়"
 
@@ -4620,7 +4422,7 @@ msgstr "প�রত�যেক"
 msgid "Exceptions"
 msgstr "<b>�ক�সেপশন</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:85
 #, fuzzy
 msgid "Preview"
 msgstr "পূর�বদৃশ�য (_P)"
@@ -4648,11 +4450,11 @@ msgstr "সপ�তাহ"
 msgid "year(s)"
 msgstr ""
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "অন�ষ�ঠানের সাথে তাগিদ দেওয়া হবে"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "শ�ধ�মাত�র নত�ন অংশগ�রহণকারীদেরকে সূচিত করা হবে (_I)"
 
@@ -4661,66 +4463,66 @@ msgstr "শà§�ধà§�মাতà§�র নতà§�ন অংশগà§�রহণকাà
 msgid "Completed date is wrong"
 msgstr "সমাপ�তির তারিখ সঠিক নয়"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "ওয়েব পেজ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2656 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "সম�পন�ন"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1132 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "উ�চ�"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2653
 msgid "In Progress"
 msgstr "চলছে"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1130 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1121 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "নিচ�"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1315 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1131
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1122
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "স�বাভাবিক"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2650 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "আরম�ভ হয়নি"
 
@@ -4736,7 +4538,7 @@ msgstr "অবস�থা:(_u)"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1759
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4746,7 +4548,7 @@ msgstr "অবস�থা"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "অন�ল�লেখকৃত"
@@ -4756,7 +4558,7 @@ msgid "_Date completed:"
 msgstr "সমাপ�তির তারিখ (_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "অগ�রগণ�য (_P):"
 
@@ -4777,11 +4579,11 @@ msgstr "কর�মের অবস�থা চিহ�নকারী বি
 msgid "_Send Options"
 msgstr "প�রেরণ সংক�রান�ত বিকল�প(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "_Task"
 msgstr "কাজ (_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:325
 msgid "Task Details"
 msgstr "কর�মের বিবরণ"
 
@@ -4809,10 +4611,6 @@ msgstr "দেয় তারিখ সঠিক নয়"
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'-� উপস�থিত কার�য খোলা সম�ভব হয়নি।"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "অংশগ�রহণকারীবৃন�দ...(_n)"
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "শ�রেণীবিভাগ...(_i)"
@@ -4901,47 +4699,47 @@ msgstr "%s %s-�"
 msgid "%s for an unknown trigger type"
 msgstr "%s অজানা ধরনের ট�রিগারের জন�য"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:191 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "শিরোনামহীন"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:197
 #, fuzzy
 msgid "Categories:"
 msgstr "শ�রেণীবিভাগ"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "সারাংশ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:258
 msgid "Start Date:"
 msgstr "আরম�ভের তারিখ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "দেয় তারিখ:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-cal-component-preview.c:284
 #: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../plugins/itip-formatter/itip-view.c:1058
 msgid "Status:"
 msgstr "অবস�থা:"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "অগ�রগণ�য:"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-cal-component-preview.c:336
 #: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Description:"
 msgstr "বিবরণ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:367
 msgid "Web Page:"
 msgstr "ওয়েব পেজ:"
 
@@ -4968,16 +4766,16 @@ msgid "Start Date"
 msgstr "আরম�ভের তারিখ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "ম�ক�ত"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "ব�যস�ত"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4988,67 +4786,50 @@ msgstr ""
 "৪৫.৪৩৬৮৪৫, ১২৫.৮৬২৫০১"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 #, fuzzy
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "�কটিও নয়"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "হ�যা�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "না"
 
-#: ../calendar/gui/e-cal-model.c:378
-#, fuzzy
-msgid "Default Client"
-msgstr "ডিফল�ট মেইল ক�লায়েন�ট"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:551
-#: ../shell/e-shell.c:868
-#, fuzzy
-msgid "Shell Settings"
-msgstr "Exchange সংক�রান�ত বৈশিষ�ট�য"
-
-#: ../calendar/gui/e-cal-model.c:389 ../calendar/gui/gnome-cal.c:552
-#: ../shell/e-shell.c:869
-#, fuzzy
-msgid "Application-wide settings"
-msgstr "স�বয়ংক�রিয়ভাবে সম�পূর�ণ করার প�রক�রিয়া সংক�রান�ত বৈশিষ�ট�য"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:573 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:976
+#: ../plugins/itip-formatter/itip-formatter.c:450
+#: ../plugins/itip-formatter/itip-formatter.c:2327
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "অজানা"
 
-#: ../calendar/gui/e-cal-model.c:1317
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "প�নরাবৃত�ত"
 
-#: ../calendar/gui/e-cal-model.c:1319
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "বরাদ�দকৃত"
 
-#: ../calendar/gui/e-cal-model.c:2225
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "%s খোলা হচ�ছে"
@@ -5092,94 +4873,94 @@ msgstr "আরম�ভের তারিখ"
 msgid "Type"
 msgstr "ধরন"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:404
 #, fuzzy
 msgid "Cut selected events to the clipboard"
 msgstr "নির�বাচিত টেক�সটটি ক�লিপবোর�ডে কাট কর�ন"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:410
 #, fuzzy
 msgid "Copy selected events to the clipboard"
 msgstr "নির�বাচিত টেক�সটটি ক�লিপবোর�ডে কপি করা হবে"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:416
 #, fuzzy
 msgid "Paste events from the clipboard"
 msgstr "ক�লিপবোর�ড থেকে টেক�সট পেস�ট কর�ন"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:422
 #, fuzzy
 msgid "Delete selected events"
 msgstr "নির�বাচিত কর�মসূচী ম�ছে ফেল�ন"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "নির�বাচিত অবজেক�টগ�লি মোছা হচ�ছে"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
 msgid "Updating objects"
 msgstr "অবজেক�টগ�লি আপডেট করা হচ�ছে"
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1706
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2315
 msgid "Accepted"
 msgstr "গ�রহণ করা হয়েছে"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1707
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2321
 msgid "Declined"
 msgstr "প�রত�যাখ�যান কর�ন"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1708
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "অস�থযায়ীরূপে"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1709
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2324
 msgid "Delegated"
 msgstr "বন�টন করা হয়েছে"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1710
 msgid "Needs action"
 msgstr "কর�ম প�রয়োজন"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "সংগঠক: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1856 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "সংগঠক: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/print.c:2608
 #, c-format
 msgid "Location: %s"
 msgstr "অবস�থান: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1903
 #, c-format
 msgid "Time: %s %s"
 msgstr "সময়: %s %s"
@@ -5222,8 +5003,8 @@ msgstr "দ�বিতীয় সময়ের অঞ�চল প�রদর�
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1883
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:865 ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5233,10 +5014,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1900
-#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/e-day-view-top-item.c:869 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:990
+#: ../modules/calendar/e-cal-shell-view-private.c:913
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5245,27 +5026,27 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1916
-#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../calendar/gui/e-day-view-top-item.c:873 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1026
+#: ../modules/calendar/e-cal-shell-view-private.c:949
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1116 ../calendar/gui/e-week-view.c:750
+#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "পূর�বাহ�ন"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1119 ../calendar/gui/e-week-view.c:753
+#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "অপরাহ�ন"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2613
+#: ../calendar/gui/e-day-view.c:2609
 #, c-format
 msgid "Week %d"
 msgstr "সপ�তাহ %d"
@@ -5362,11 +5143,11 @@ msgstr "iCalendar সংক�রান�ত ত�র�টি"
 
 #: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
 #: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "�কজন অজানা ব�যক�তি"
 
@@ -5380,14 +5161,14 @@ msgstr ""
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../plugins/itip-formatter/itip-formatter.c:2302
 #, fuzzy
 msgctxt "cal-itip"
 msgid "None"
 msgstr "�কটিও নয়"
 
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgid "Tentatively Accepted"
 msgstr "পরীক�ষার�থে গ�রহণ করা হয়েছে"
 
@@ -5606,7 +5387,7 @@ msgid "Attendee status updated\n"
 msgstr "অংশগ�রহণকারীর অবস�থা আপডেট করা হচ�ছে\n"
 
 #: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "অংশগ�রহণকারীর অবস�থা আপডেট করা সম�ভব হয়নি কারন বস�ত�টির আর অস�তিত�ব নেই"
 
@@ -5660,8 +5441,8 @@ msgid "Send Latest Information"
 msgstr "সর�বশেষ তথ�য পাঠানো হবে"
 
 #: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../modules/mail/e-mail-shell-view-actions.c:970
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "বাতিল কর�ন"
 
@@ -5710,56 +5491,56 @@ msgid "Resources"
 msgstr "রিসোর�সসমূহ"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "ব�যক�তিবিশেষ"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "দল"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "রিসোর�স"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "ঘর"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "চেয়ার"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "আবশ�যক অংশগ�রহণকারী"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "�চ�ছিক অংশগ�রহণকারী"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "অংশগ�রহণকারী নয়"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "কর�ম প�রয়েজন"
 
@@ -5768,14 +5549,14 @@ msgstr "কর�ম প�রয়েজন"
 msgid "Attendee                          "
 msgstr "অংশগ�রহনকারী                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -5784,7 +5565,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:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -5794,67 +5575,63 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "অফিসে উপস�থিত নেই"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "কোনো তথ�য নেই"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "অংশগ�রহণকারীবৃন�দ...(_t)"
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "বিকল�প (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "শ�ধ�মাত�র কাজের ঘন�টা প�রদর�শন করা হবে (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "ছোট মাপে প�রদর�শন করা হবে (_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "ম�ক�ত/ ব�যস�ত অবস�থা আপডেট করা হবে (_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "অটোপিক (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "সকল ব�যক�তি �বং রিসোর�সসমূহ (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "সকল ব�যক�তি �বং �কটি রিসোর�স (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "আবশ�যক ব�যক�তি (_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "আবশ�যক ব�যক�তি �বং �কটি রিসোর�স (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "আরম�ভের সময় (_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "সমাপ�তির সময় (_E):"
 
@@ -5883,47 +5660,49 @@ msgid "Member"
 msgstr "সদস�য"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:456
+#: ../modules/calendar/e-cal-shell-content.c:461
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "কর�মসূচী"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
 msgid "* No Summary *"
 msgstr "* সারাংশহীন *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
 msgid "Start: "
 msgstr "আরম�ভ: "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
 msgid "Due: "
 msgstr "দেয়: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:709
 #, fuzzy
 msgid "Cut selected memos to the clipboard"
 msgstr "নির�বাচিত বার�তা ক�লিপবোর�ডে কাট কর�ন"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:715
 #, fuzzy
 msgid "Copy selected memos to the clipboard"
 msgstr "নির�বাচিত বার�তা ক�লিপবোর�ডে কপি কর�ন"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:721
 #, fuzzy
 msgid "Paste memos from the clipboard"
 msgstr "ক�লিপবোর�ড থেকে কর�মসূচী পেস�ট কর�ন"
 
-#: ../calendar/gui/e-memo-table.c:725
+#: ../calendar/gui/e-memo-table.c:727
 #: ../modules/calendar/e-memo-shell-view-actions.c:556
 msgid "Delete selected memos"
 msgstr "নির�বাচিত কর�মসূচী ম�ছে ফেল�ন"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:733
 #, fuzzy
 msgid "Select all visible memos"
 msgstr "সকল দৃশ�যমান বার�তা নির�বাচন কর�ন"
@@ -5932,96 +5711,61 @@ msgstr "সকল দৃশ�যমান বার�তা নির�বা
 msgid "Click to add a memo"
 msgstr "কর�মসূচী যোগ করতে ক�লিক কর�ন"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "০%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "১০%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "২০%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "৩০%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "৪০%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "৫০%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "৬০%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "৭০%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "৮০%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "৯০%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "১০০%"
+#, fuzzy, c-format
+msgid "%d%%"
+msgstr "%d %b %Y"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:418
+#: ../modules/calendar/e-cal-shell-content.c:423
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "কর�ম"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:932
 #, fuzzy
 msgid "Cut selected tasks to the clipboard"
 msgstr "নির�বাচিত টেক�সটটি ক�লিপবোর�ডে কাট কর�ন"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:938
 #, fuzzy
 msgid "Copy selected tasks to the clipboard"
 msgstr "নির�বাচিত টেক�সটটি ক�লিপবোর�ডে কপি করা হবে"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:944
 msgid "Paste tasks from the clipboard"
 msgstr "ক�লিপবোর�ড থেকে কর�ম পেস�ট কর�ন"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "Delete selected tasks"
 msgstr "নির�বাচিত কর�মগ�লি ম�ছে ফেল�ন"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:956
 #, fuzzy
 msgid "Select all visible tasks"
 msgstr "সকল দৃশ�যমান বার�তা নির�বাচন কর�ন"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "সময়ের অঞ�চল নির�বাচন কর�ন"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -6050,7 +5794,7 @@ msgstr "বর�ষপঞ�জির অন�ষ�ঠান: সংক�ষ
 msgid "calendar view event"
 msgstr "বর�ষপঞ�জি অন�যায়ী প�রদর�শনের ঘটনা"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:541
 msgid "Grab Focus"
 msgstr "ফোকাস আটক করা হবে"
 
@@ -6079,7 +5823,7 @@ msgstr "নির�দিষ�ট তারিখ প�রদর�শন ক
 msgid "a table to view and select the current time range"
 msgstr "বর�তমান সময়সীমা প�রদর�শন ও নির�বাচনের উদ�দেশ�যে �কটি টেবিল"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -6088,14 +5832,14 @@ msgstr[1] "%d-টি অন�ষ�ঠান উপস�থিত রয়েছ
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 msgid "It has no events."
 msgstr "কোনো অন�ষ�ঠান উপস�থিত নেই।"
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "সাপ�তাহিক কর�মের দিন অন�সারে প�রদর�শন: %s. %s"
@@ -6103,16 +5847,16 @@ msgstr "সাপ�তাহিক কর�মের দিন অন�সা
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "দিন অন�সারে প�রদর�শন: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "সাপ�তাহিক কর�মের দিন অন�যায়ী বর�ষপঞ�জি প�রদর�শন"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "�ক অথবা অধিক সংখ�যক দিন অন�সারে বর�ষপঞ�জির প�রদর�শন"
 
@@ -6123,16 +5867,16 @@ msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:986
+#: ../modules/calendar/e-cal-shell-view-private.c:909
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:993
-#: ../modules/calendar/e-cal-shell-view-private.c:999
-#: ../modules/calendar/e-cal-shell-view-private.c:1002
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -6140,10 +5884,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1019
-#: ../modules/calendar/e-cal-shell-view-private.c:1030
-#: ../modules/calendar/e-cal-shell-view-private.c:1037
-#: ../modules/calendar/e-cal-shell-view-private.c:1040
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -6155,25 +5899,25 @@ msgstr "জাম�প বাটন"
 msgid "Click here, you can find more events."
 msgstr "অতিরিক�ত অন�ষ�ঠান অন�সন�ধানের উদ�দেশ�যে �ই স�থানে ক�লিক কর�ন।"
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "মাস অন�সারে প�রদর�শন: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "সপ�তাহ অন�সারে প�রদর�শন: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:188
 msgid "calendar view for a month"
 msgstr "মাস অন�যায়ী বর�ষপঞ�জি প�রদর�শন"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:190
 msgid "calendar view for one or more weeks"
 msgstr "�ক অথবা অধিক সপ�তাহ অন�যায়ী বর�ষপঞ�জি প�রদর�শন"
 
-#: ../calendar/gui/gnome-cal.c:2299
+#: ../calendar/gui/gnome-cal.c:2242
 msgid "Purging"
 msgstr "ম�ছে ফেলা হচ�ছে"
 
@@ -6232,40 +5976,41 @@ msgid "Select Date"
 msgstr "তারিখ নির�বাচন কর�ন"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "Select _Today"
+msgstr "আজকের তারিখ নির�বাচন কর�ন (_T)"
+
+#: ../calendar/gui/goto-dialog.ui.h:14
 #, fuzzy
 msgid "September"
 msgstr "সদস�য"
 
-#: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "আজকের তারিখ নির�বাচন কর�ন (_S)"
-
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "�কটি সংগঠক নির�ধারণ করতে হবে।"
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "অন�তত �কজন অংশগ�রহণকারী আবশ�যক"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "ঘটনার তথ�য"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "কাজের তথ�য"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "মেমো সংক�রান�ত তথ�য"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "ম�ক�ত/ব�যস�ত তথ�য"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "বর�ষপঞ�জির তথ�য"
 
@@ -6273,7 +6018,7 @@ msgstr "বর�ষপঞ�জির তথ�য"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "গ�রহণ করা হয়েছে"
@@ -6282,7 +6027,7 @@ msgstr "গ�রহণ করা হয়েছে"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "পরীক�ষার�থে গ�রহণ করা হয়েছে"
@@ -6294,7 +6039,7 @@ msgstr "পরীক�ষার�থে গ�রহণ করা হয়েছ
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "প�রত�যাখ�যাত"
@@ -6303,7 +6048,7 @@ msgstr "প�রত�যাখ�যাত"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "বন�টন করা হয়েছে"
@@ -6311,7 +6056,7 @@ msgstr "বন�টন করা হয়েছে"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "আপডেট করা হয়েছে"
@@ -6319,7 +6064,7 @@ msgstr "আপডেট করা হয়েছে"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "বাতিল"
@@ -6327,7 +6072,7 @@ msgstr "বাতিল"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "নত�ন করে প�রদর�শন"
@@ -6335,29 +6080,29 @@ msgstr "নত�ন করে প�রদর�শন"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "বিপরীত-প�রস�তাব"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ম�ক�ত/ব�যস�ত তথ�য (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "iCalendar সংক�রান�ত তথ�য"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "অন�ষ�ঠানে আপনার উপস�থিতি আবশ�যক।"
 
@@ -6513,49 +6258,75 @@ msgstr "শ�ক�র"
 msgid "Sa"
 msgstr "শনি"
 
-#: ../calendar/gui/print.c:2564
+#. Translators: This is part of "START to END" text, where START and END are date/times
+#: ../calendar/gui/print.c:2419
+msgid " to "
+msgstr " প�রতি "
+
+#. Translators: This is part of "START to END (Completed COMPLETED)", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2425
+msgid " (Completed "
+msgstr " (সম�পন�ন "
+
+#. Translators: This is part of "Completed COMPLETED", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2428
+msgid "Completed "
+msgstr "সম�পন�ন"
+
+# FIXME
+#. Translators: This is part of "START (Due DUE)", where START and DUE are dates/times
+#: ../calendar/gui/print.c:2435
+msgid " (Due "
+msgstr " (পূর�বনির�ধারিত "
+
+#. Translators: This is part of "Due DUE", where DUE is a date/time due the event should be finished
+#: ../calendar/gui/print.c:2438
+msgid "Due "
+msgstr "পূর�বনির�ধারিত "
+
+#: ../calendar/gui/print.c:2572
 msgid "Appointment"
 msgstr "সাক�ষাৎকার"
 
-#: ../calendar/gui/print.c:2566
+#: ../calendar/gui/print.c:2574 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "কাজ"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2599
 #, c-format
 msgid "Summary: %s"
 msgstr "সারাংশ: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2623
 msgid "Attendees: "
 msgstr "অংশগ�রহণকারী: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2666
 #, c-format
 msgid "Status: %s"
 msgstr "অবস�থা: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2681
 #, c-format
 msgid "Priority: %s"
 msgstr "প�রাধান�য: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2699
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "শতাংশ সম�পন�ন : %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2710
 #, c-format
 msgid "URL: %s"
 msgstr "ইউ-আর-�ল: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2723
 #, c-format
 msgid "Categories: %s"
 msgstr "শ�রেণীসমূহ: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2734
 msgid "Contacts: "
 msgstr "পরিচিতি: "
 
@@ -6586,7 +6357,7 @@ msgstr "সাক�ষাৎকার �বং সভা"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Opening calendar"
 msgstr "বর�ষপঞ�জি খোলা হচ�ছে"
 
@@ -8167,157 +7938,157 @@ msgstr "প�রশান�ত মহাসাগরীয়/ওয়ালিস"
 msgid "Pacific/Yap"
 msgstr "প�রশান�ত মহাসাগরীয়/ইয়াপ"
 
-#: ../composer/e-composer-actions.c:79
+#: ../composer/e-composer-actions.c:81
 msgid "Untitled Message"
 msgstr "শিরোনামহীন বার�তা"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "নত�ন নামে সংরক�ষণ..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:283
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "�কটি ফাইল সংয�ক�ত কর�ন"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:288
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "বন�ধ কর�ন (_C)"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "বর�তমান ফাইলটি বন�ধ কর�ন"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "প�রিন�ট কর�ন...(_P)"
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "প�রিন�টের পূর�বদৃশ�য (_v)"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "বর�তমান ফাইলটি সংরক�ষণ কর�ন"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "নত�ন নামে সংরক�ষণ কর�ন...(_A)"
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "বর�তমান ফাইলটি �কটি পৃথক নামে সংরক�ষণ কর�ন"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "খসড়া হিসাবে সংরক�ষণ কর�ন (_D)"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "খসড়া হিসাবে সংরক�ষণ কর�ন"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "প�রেরণ কর�ন (_e)"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "বার�তাটি প�রেরণ কর�ন"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "নত�ন বার�তা (_M)"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "নত�ন বার�তার উইন�ডো খ�ল�ন"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "ক�যারেক�টার �নকোডিং (_E)"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:363
 msgid "PGP _Encrypt"
 msgstr "PGP �নক�রিপ�ট (_E)"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:365
 msgid "Encrypt this message with PGP"
 msgstr "�ই বার�তাটি PGP ব�যবহার করে �নক�রিপ�ট কর�ন"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:371
 msgid "PGP _Sign"
 msgstr "PGP স�বাক�ষর (_S)"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:373
 msgid "Sign this message with your PGP key"
 msgstr "�ই বার�তাটি আপনার PGP কী (key)-র সাহায�য স�বাক�ষর কর�ন"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "বার�তার গ�র�ত�ব বৃদ�ধি (_P)"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "বার�তার গ�র�ত�ব 'উচ�চ' রূপে ধার�য কর�ন"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "বার�তা-পাঠের সূচনা প�রদানের অন�রোধ করা হবে (_q)"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:389
 msgid "Get delivery notification when your message is read"
 msgstr "আপনার বার�তা পাঠ হওয়ার পরে সূচনা প�রাপ�তি কর�ন"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "S/MIME �নক�রিপ�ট (_c)"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:397
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "চিহ�নিত বার�তাটি আপনার S/MIME �নক�রিপশন সার�টিফিকেট সহযোগে �নক�রিপ�ট কর�ন"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "S/MIME স�বাক�ষর (_n)"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:405
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "�ই বার�তাটি আপনার S/MIME স�বাক�ষর সার�টিফিকেটের সাহায�যে স�বাক�ষর কর�ন"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:411
 msgid "_Bcc Field"
 msgstr "অপ�রকাশিত অন�লিপিপ�রাপকের ক�ষেত�র (_B)"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:413
 msgid "Toggles whether the BCC field is displayed"
 msgstr "অপ�রকাশিত অন�লিপিপ�রাপকদের নামের ক�ষেত�র প�রদর�শিত হবে কিনা তা টগল করে"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "অন�লিপিপ�রাপকের ক�ষেত�র (_C)"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "অন�লিপিপ�রাপকদের নামের ক�ষেত�র প�রদর�শিত হবে কিনা তা টগল করে"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:427
 msgid "_From Field"
 msgstr "প�রেরক ক�ষেত�র (_F)"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:429
 msgid "Toggles whether the From chooser is displayed"
 msgstr "প�রেরকের নামের ক�ষেত�রটি প�রদর�শিত হবে কিনা তা টগল করে"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "উত�তর-প�রাপক ক�ষেত�র (_R)"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "উত�তর-প�রাপক ক�ষেত�রটি প�রদর�শিত হবে কিনা তা টগল করে"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:480
 msgid "Save Draft"
 msgstr "খসড়া হিসাবে সংরক�ষণ কর�ন"
 
@@ -8329,64 +8100,64 @@ msgstr "প�রদর�শন করা হবে"
 msgid "Hide"
 msgstr "আড়াল করা হবে"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "বার�তা প�রাপকদের নাম লিখ�ন"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "বার�তার অন�লিপি প�রাপকদের ঠিকানা লিখ�ন"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr "বার�তার অপ�রকাশিত অন�লিপি প�রাপকদের ঠিকানা লিখ�ন।"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "প�রেরক(_o):"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
+#: ../modules/mail/em-mailer-prefs.c:76
 msgid "From"
 msgstr "প�রেরক"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "উত�তর-প�রাপক:(_R)"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "প�রাপক(_T):"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "অন�লিপি প�রাপক(_C):"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "অন�লিপি প�রাপক"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "অপ�রকাশিত অন�লিপি প�রাপক(_B):"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "অপ�রকাশিত অন�লিপি প�রাপক"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "উল�লিখিত স�থানে পোস�ট কর�ন(_P):"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "বিষয়(_u):"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "স�বাক�ষর(_g):"
 
@@ -8426,19 +8197,19 @@ msgid "Save draft"
 msgstr "খসড়া হিসাবে সংরক�ষণ কর�ন"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:188 ../mail/em-utils.c:152
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "�ই বার�তাটি প�নরায় প�রদর�শন করা হবে না (_D)"
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:988
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "বহির�ম�খি বার�তা স�বাক�ষর করা সম�ভব নয়: �ই অ�যাকাউন�টের জন�য কোনো স�বাক�ষরকারী "
 "সার�টিফিকেট নির�ধারিত হয়নি"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:995
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8446,16 +8217,16 @@ msgstr ""
 "বহির�ম�খি বার�তা �নক�রিপ�ট করা সম�ভব নয়: �ই অ�যাকাউন�টের জন�য কোনো �নক�রিপশনকারী "
 "সার�টিফিকেট নির�ধারিত হয়নি"
 
-#: ../composer/e-msg-composer.c:1381
+#: ../composer/e-msg-composer.c:1386
 #, fuzzy
 msgid "Unable to reconstruct message from autosave file"
 msgstr "�ডিটার থেকে বার�তা উদ�ধার করা সম�ভব হয়নি"
 
-#: ../composer/e-msg-composer.c:1447 ../composer/e-msg-composer.c:1643
+#: ../composer/e-msg-composer.c:1452 ../composer/e-msg-composer.c:1648
 msgid "Compose Message"
 msgstr "বার�তা লিখ�ন"
 
-#: ../composer/e-msg-composer.c:3312
+#: ../composer/e-msg-composer.c:3313
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8540,7 +8311,8 @@ msgstr ""
 "করলে আপনি ব�যাঘাতের স�থান থেকে প�নরায় আরম�ভ করতে পারবেন।"
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "`{0}' কোনো সাধারণ ফাইল নয় �বং বার�তার সাথে প�রেরণ করা যাবে না।"
 
 # (contri by sm)
@@ -8561,7 +8333,8 @@ msgid "Unable to activate the address selector control."
 msgstr "ঠিকানা নির�বাচনের নিয়ন�ত�রক সক�রিয়া করা যায়নি।"
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "আপনি `{0}' ফাইলটিকে �ই বার�তার সাথে য�ক�ত করতে পারবেন না।"
 
 # not sure
@@ -8713,8 +8486,8 @@ msgid ""
 msgstr ""
 
 #: ../capplet/settings/mail-account-view.c:332
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2191
+#: ../mail/mail-config.ui.h:59
 msgid "Identity"
 msgstr "পরিচয়"
 
@@ -8777,7 +8550,7 @@ msgid "Back - Receiving options"
 msgstr "আহরণের বিকল�প"
 
 #: ../capplet/settings/mail-account-view.c:337
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../mail/em-account-editor.c:2770 ../mail/mail-config.ui.h:32
 msgid "Defaults"
 msgstr "ডিফল�ট মান"
 
@@ -8800,13 +8573,13 @@ msgstr ""
 msgid "Back - Sending"
 msgstr "ছোট থেকে বড়"
 
-#: ../capplet/settings/mail-account-view.c:671
-#: ../capplet/settings/mail-settings-view.c:262
+#: ../capplet/settings/mail-account-view.c:673
+#: ../capplet/settings/mail-settings-view.c:264
 #, fuzzy
 msgid "Close Tab"
 msgstr "বন�ধ কর�ন"
 
-#: ../capplet/settings/mail-account-view.c:681
+#: ../capplet/settings/mail-account-view.c:683
 #, fuzzy
 msgid "Account Wizard"
 msgstr "অ�যাকাউন�ট �ডিটর"
@@ -8817,20 +8590,20 @@ msgid "Evolution account assistant"
 msgstr "Evolution অ�যাকাউন�টের সাহায়ক"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:2948
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1614
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:675
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:212
+#: ../mail/message-list.c:1605
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/addressbook/e-book-shell-migrate.c:126
 #: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-cal-shell-migrate.c:141
 #: ../modules/calendar/e-memo-shell-backend.c:108
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-migrate.c:109
 msgid "On This Computer"
 msgstr "ব�যবহৃত কম�পিউটারের মধ�যে"
 
@@ -8849,7 +8622,7 @@ msgstr "কলাম যোগ কর�ন..."
 msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
 msgstr "<span weight=\"bold\">অ�যাকাউন�ট সংক�রান�ত তথ�য</span>"
 
-#: ../capplet/settings/mail-settings-view.c:272
+#: ../capplet/settings/mail-settings-view.c:274
 #, fuzzy
 msgid "Settings"
 msgstr "অবাঞ�ছিত বস�ত� সংক�রান�ত বৈশিষ�ট�য"
@@ -8864,7 +8637,7 @@ msgstr "বর�ষপঞ�জির তথ�য"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution Elm ইম�পোর�টার"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:825
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:821
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8992,33 +8765,37 @@ msgstr "পশ�চিম ইউরোপীয়"
 msgid "Western European, New"
 msgstr "পশ�চিম ইউরোপীয়, নত�ন"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "পারম�পরিক"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "সরলীকৃত"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "ইউক�রেইনিয়েন"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "ভিস�য়াল"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "আজ"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "আগামীকাল"
 
@@ -9026,23 +8803,29 @@ msgstr "আগামীকাল"
 msgid "Yesterday"
 msgstr "গতকাল"
 
-#: ../e-util/e-datetime-format.c:210
-#, c-format
-msgid "%d days from now"
-msgstr "আজ থেকে %d দিন পরে"
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
+#, fuzzy, c-format
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "আজ থেকে %d দিন পরে"
+msgstr[1] "আজ থেকে %d দিন পরে"
 
-#: ../e-util/e-datetime-format.c:212
-#, c-format
-msgid "%d days ago"
-msgstr "%d দিন পূর�বে"
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
+#, fuzzy, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d দিন পূর�বে"
+msgstr[1] "%d দিন পূর�বে"
 
-#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
-#: ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "লোকেইলের ডিফল�ট মান ব�যবহার করা হবে"
 
 # FIXME
-#: ../e-util/e-datetime-format.c:499
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "বিন�যাস:"
 
@@ -9064,21 +8847,6 @@ msgstr "%s � ping করা হচ�ছে"
 msgid "Writing \"%s\" to %s"
 msgstr "`%s',`%s'-� কপি করা হচ�ছে"
 
-#: ../e-util/e-logger.c:175
-#, fuzzy
-msgid "Name of the logger"
-msgstr "লগ করার জন�য চিহ�নিত সামগ�রী"
-
-#: ../e-util/e-module.c:188
-#, fuzzy
-msgid "Filename"
-msgstr "ফাইলের নাম(_i):"
-
-#: ../e-util/e-module.c:189
-#, fuzzy
-msgid "The filename of the module"
-msgstr "চিহ�নিত ফোল�ডারের নাম পরিবর�তন কর�ন"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "ডিবাগের লগ"
@@ -9101,13 +8869,13 @@ msgstr "লগ বার�তা:"
 msgid "Log Level"
 msgstr "লগের স�তর"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2687
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2677
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "বার�তা"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "�ই উইন�ডোটি বন�ধ কর�ন"
 
@@ -9131,18 +8899,7 @@ msgstr "ডিবাগ কর�ন"
 msgid "Error, Warnings and Debug messages"
 msgstr "ত�র�টি, সতর�কবার�তা ও ডিবাগ বার�তা"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "সক�রিয়"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "চিহ�নিত প�লাগ-ইন সক�রিয় রয়েছে কি না"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:334
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
@@ -9165,7 +8922,7 @@ msgstr "প�রিন�ট ব�যবস�থা দ�বারা ত�
 msgid "Autogenerated"
 msgstr "স�বয়ংক�রিয়ভাবে উত�পন�ন"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr " \"{1}\"-র কারণে।"
 
@@ -9187,235 +8944,235 @@ msgstr "আপনি কি ম�ছে ফেলে নত�ন করে ল
 msgid "File exists \"{0}\"."
 msgstr "\"{0}\" ফাইলটি বর�তমানে উপস�থিত রয়েছে।"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "ম�ছে নত�ন করে লিখ�ন(_O)"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:169
 msgid "Could not open the link."
 msgstr "লিংক খোলা যায়নি"
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:219
 msgid "Could not display help for Evolution."
 msgstr "Evolution সংক�রান�ত সহায়ক তথ�য প�রদর�শন করা যায়নি।"
 
-#: ../e-util/gconf-bridge.c:1307
+#: ../e-util/gconf-bridge.c:1303
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf সংক�রান�ত ত�র�টি: %s"
 
-#: ../e-util/gconf-bridge.c:1318
+#: ../e-util/gconf-bridge.c:1314
 msgid "All further errors shown only on terminal."
 msgstr "পরবর�তী সকল ত�র�টি শ�ধ�মাত�র টার�মিনালে প�রদর�শন করা হবে।"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "উত�তর - প�রাপক"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2247 ../mail/em-format-html.c:2309
-#: ../mail/em-format-html.c:2332 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "অন�লিপি প�রাপক"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2248 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2335 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "অপ�রকাশিত অন�লিপি প�রাপক"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:81
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "বিষয়"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2429
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1137
 msgid "Mailer"
 msgstr "মেইলার"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ফরওয়ার�ড করা বার�তা --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:82 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "তারিখ"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "নিউজগ�র�প"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:84
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Face"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1302
 #, c-format
 msgid "%s attachment"
 msgstr "%s সংয�ক�ত বস�ত�"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1361
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME বার�তা পার�স করা সম�ভব হয়নি: অজানা সমস�যা"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME বার�তা পার�স করা সম�ভব হয়নি। উত�স হিসাবে প�রদর�শিত হবে।"
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "মাল�টিপার�ট/�নক�রিপ�টকৃতের জন�য অসমর�থিত �নক�রিপশনের ধরন"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME বার�তা পার�স করা সম�ভব হয়নি"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME বার�তা পার�স করা সম�ভব হয়নি: অজানা সমস�যা"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "অসমর�থিত স�বাক�ষরের ফরমা"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 msgid "Error verifying signature"
 msgstr "স�বাক�ষর পরীক�ষা করতে ব�যর�থ"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "স�বাক�ষর পরীক�ষা করতে অজানা সমস�যা হয়েছে"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message"
 msgstr "PGP বার�তা পার�স করতে ব�যর�থ"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP বার�তা পার�স করা সম�ভব হয়নি: অজানা সমস�যা"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "১ সেকেন�ড পূর�বে"
 msgstr[1] "%d সেকেন�ড পূর�বে"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "১ সেকেন�ড পরে"
 msgstr[1] "%d সেকেন�ড পরে"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "১ মিনিট পূর�বে"
 msgstr[1] "%d মিনিট পূর�বে"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "১ মিনিট পরে"
 msgstr[1] "%d মিনিট পরে"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "১ ঘন�টা পূর�বে"
 msgstr[1] "%d ঘন�টা পূর�বে"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "১ ঘন�টা পরে"
 msgstr[1] "%d ঘন�টা পরে"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "১ দিন পূর�বে"
 msgstr[1] "%d দিন পূর�বে"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "১ দিন পরে"
 msgstr[1] "%d দিন পরে"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "১ সপ�তাহ পূর�বে"
 msgstr[1] "%d সপ�তাহ পূর�বে"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "১ সপ�তাহ পরে"
 msgstr[1] "%d সপ�তাহ পরে"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d মাস পূর�বে"
 msgstr[1] "%d মাস পূর�বে"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d মাস পরে"
 msgstr[1] "%d মাস পরে"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d বৎসর পূর�বে"
 msgstr[1] "%d বৎসর পূর�বে"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d বৎসর পরে"
 msgstr[1] "%d বৎসর পরে"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<তারিখ বাছাই করতে �খানে ক�লিক কর�ন>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "�খন"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "ত�লনা করার জন�য �কটি সময় বাছাই কর�ন"
 
@@ -9470,11 +9227,11 @@ msgid "I_nclude threads"
 msgstr "থ�রেড অন�তর�ভ�ক�ত কর�ন (_n)"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "আগমনকারী"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "বহির�গমনকারী"
 
@@ -9506,7 +9263,7 @@ msgstr "অন�পস�থিত তারিখ।"
 msgid "Missing file name."
 msgstr "অন�পস�থিত ফাইলের নাম।"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "অন�পস�থিত নাম।"
 
@@ -9593,7 +9350,7 @@ msgstr ""
 msgid "months"
 msgstr "মাস"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:171
 msgid "seconds"
 msgstr "সেকেন�ড"
 
@@ -9612,7 +9369,7 @@ msgid "years"
 msgstr "হেডার"
 
 #: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
+#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
 #: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
@@ -9620,38 +9377,20 @@ msgid_plural "Attachments"
 msgstr[0] "সংয�ক�ত বস�ত�"
 msgstr[1] "সংয�ক�ত বস�ত�"
 
-#: ../mail/e-mail-attachment-bar.c:621
+#: ../mail/e-mail-attachment-bar.c:617
 #: ../widgets/misc/e-attachment-paned.c:612
 msgid "Icon View"
 msgstr "আইকন অন�যায়ী প�রদর�শন"
 
-#: ../mail/e-mail-attachment-bar.c:622
+#: ../mail/e-mail-attachment-bar.c:618
 #: ../widgets/misc/e-attachment-paned.c:613
 msgid "List View"
 msgstr "তালিকা অন�যায়ী প�রদর�শন"
 
-#: ../mail/e-mail-browser.c:769 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr ""
-
-#: ../mail/e-mail-browser.c:779
-#, fuzzy
-msgid "Shell Module"
-msgstr "নির�বাচনের মোড"
-
-#: ../mail/e-mail-browser.c:780 ../mail/message-list.c:2580
-msgid "The mail shell backend"
-msgstr ""
-
-#: ../mail/e-mail-browser.c:790
-#, fuzzy
-msgid "Show Deleted"
-msgstr "ম�ছে ফেলা হয়েছে"
-
-#: ../mail/e-mail-browser.c:791
+#: ../mail/e-mail-browser.c:262
 #, fuzzy
-msgid "Show deleted messages"
-msgstr "ফরওয়ার�ড করা বার�তা"
+msgid "(No Subject)"
+msgstr "বিষয়"
 
 #: ../mail/e-mail-display.c:66
 #, fuzzy
@@ -9703,7 +9442,7 @@ msgid "_Later"
 msgstr "পরে (_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:519
+#: ../modules/mail/e-mail-shell-view-actions.c:472
 msgid "Add Label"
 msgstr "লেবেল যোগ কর�ন"
 
@@ -9724,116 +9463,57 @@ msgstr ""
 msgid "Color"
 msgstr "রঙ"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1158
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "নাম"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:363
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2585
+#: ../modules/mail/e-mail-shell-view-private.c:952
 msgid "Inbox"
 msgstr "ইনবক�স"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
 msgid "Drafts"
 msgstr "খসড়া"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
 msgid "Outbox"
 msgstr "আউটবক�স"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
 msgid "Sent"
 msgstr "প�রেরণ করা বস�ত�"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:570
 msgid "Templates"
 msgstr "টেমপ�লেট"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "প�রয়োজনীয়"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "করনীয়"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "পরে"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:147
 msgid "Migrating..."
 msgstr "মাইগ�রেট প�রণালী..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:180
 msgid "Migration"
 msgstr "মাইগ�রেশন প�রণালী"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:220
 #, c-format
 msgid "Migrating '%s':"
 msgstr "'%s' মাইগ�রেট করা হচ�ছে:"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "নত�ন ফোল�ডার `%s' তৈরি করা যায়নি: %s"
-
-# dont like
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "ফোল�ডার `%s' -কে `%s' -� কপি করা যায়নি: %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "`%s' � উপস�থিত মেইলবক�স অন�সন�ধান করা সম�ভব হয়নি: %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2932
+#: ../mail/e-mail-migrate.c:659
 msgid "Migrating Folders"
 msgstr "ফোল�ডার মাইগ�রেট করা হচ�ছে"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution মেইলবক�স ফোল�ডারের অবস�থান �বং অন�ক�রম Evolution ১.x-�র পর থেকে "
-"পরিবর�তিত হয়েছে।\n"
-"\n"
-"Evolution আপনার ফোল�ডার মাইগ�রেট করছে অন�গ�রহ করে অপেক�ষা কর�ন..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "প�রোনো, POP সার�ভারে-সংরক�ষণ-করা-হবে ডাটা `%s' খ�লতে ব�যর�থ: %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "POP3 সার�ভারে-সংরক�ষণ-করা-হবে ডাটা ডিরেক�টরি `%s' তৈরি করতে ব�যর�থ: %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "POP3 সার�ভারে-সংরক�ষণ-করা-হবে ডাটা `%s' কপি করতে ব�যর�থ: %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "স�থানীয় মেইল সংরক�ষণস�থল `%s' তৈরি করা যায়নি: %s"
-
-#: ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:660
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9845,25 +9525,16 @@ msgstr ""
 "\n"
 "Evolution দ�বারা আপনার ফোল�ডারগ�লি মাইগ�রেট করা হচ�ছে, অন�গ�রহ করে অপেক�ষা কর�ন..."
 
-#: ../mail/e-mail-migrate.c:3030
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
+#: ../mail/e-mail-migrate.c:756
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at '%s': %s"
 msgstr "`%s'-� স�থানীয় মেইল ফোল�ডার তৈরি করা যায়নি: %s"
 
-#: ../mail/e-mail-migrate.c:3048
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"পূর�ববর�তী Evolution ইনস�টলেশনের বৈশিষ�ট�য পড়া সম�ভব হয়নি, `evolution/config.xmldb' "
-"সম�ভবত উপস�থিত নেই অথবা ক�ষতিগ�রস�থ হয়েছে।"
-
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:103
+#: ../modules/calendar/e-task-shell-view-actions.c:561
 #, fuzzy
 msgid "Do not ask me again"
 msgstr "আমাকে প�নরায় জিঞ�জাসা করবে না।"
@@ -9872,7 +9543,7 @@ msgstr "আমাকে প�নরায় জিঞ�জাসা করবে
 msgid "Copy to Folder"
 msgstr "ফোল�ডারে কপি কর�ন"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "কপি কর�ন (_o)"
 
@@ -9880,7 +9551,7 @@ msgstr "কপি কর�ন (_o)"
 msgid "Move to Folder"
 msgstr "�ই ফোল�ডারে সরাও"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "স�থানান�তর কর�ন (_M)"
 
@@ -9898,7 +9569,6 @@ msgstr[1] "বার�তা সংরক�ষণ কর�ন..."
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
 #: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
 #, fuzzy
 msgid "Message"
 msgid_plural "Messages"
@@ -10214,8 +9884,8 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "নির�বাচিত বার�তাটি অন�য কোনো ব�যক�তির দিকে প�রেরিত হবে (রি-ডিরেক�ট/বাউন�স)"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "সকলের প�রতি উত�তর (_A)"
 
@@ -10233,7 +9903,7 @@ msgid "Compose a reply to the mailing list of the selected message"
 msgstr "নির�বাচিত বার�তার মেইলিং লিস�টের জন�য �কটি প�রত�য�ত�তর লেখো"
 
 #: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "প�রেরকের প�রতি উত�তর (_R)"
 
@@ -10403,19 +10073,19 @@ msgstr "সমস�ত বার�তার হেডার (_H)"
 msgid "Show messages with all email headers"
 msgstr "সমস�ত ই-মেইল হেডারসহ বার�তা প�রদর�শন কর�ন"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1878
 msgid "Unable to retrieve message"
 msgstr " বার�তা উদ�ধার করা সম�ভব হয়নি"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1939
+#: ../mail/mail-ops.c:1838
 #, fuzzy, c-format
 msgid "Retrieving message '%s'"
 msgstr "%s বার�তা উদ�ধার করা হচ�ছে"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2471
+#: ../mail/e-mail-reader.c:2453
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:534
 #: ../plugins/google-account-setup/google-source.c:656
@@ -10423,33 +10093,33 @@ msgstr "%s বার�তা উদ�ধার করা হচ�ছে"
 msgid "Default"
 msgstr "ডিফল�ট"
 
-#: ../mail/e-mail-reader.c:2592
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2574
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "ফরওয়ার�ড (_F)"
 
-#: ../mail/e-mail-reader.c:2593
+#: ../mail/e-mail-reader.c:2575
 msgid "Forward the selected message to someone"
 msgstr "নির�বাচিত বার�তাটি কাউকে ফরওয়ার�ড কর�ন"
 
-#: ../mail/e-mail-reader.c:2637 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2619 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "ম�ছে ফেল�ন"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "পরবর�তী"
 
-#: ../mail/e-mail-reader.c:2645
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "পূর�বাবস�থা"
 
-#: ../mail/e-mail-reader.c:2649 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2631 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "প�রত�য�ত�তর"
 
@@ -10459,24 +10129,24 @@ msgstr "অন�বৃত�তির জন�য চিহ�নিত ফ�
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:73
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "�নক�রিপশনবিহীন"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:121
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS �নক�রিপশন"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL �নক�রিপশন"
 
@@ -10499,36 +10169,36 @@ msgstr ""
 "জানাবার জন�য চেকবক�সটিতে টিক (tick) চিহ�ন দিন\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
 #, fuzzy
 msgctxt "mail-signature"
 msgid "None"
 msgstr "�কটিও নয়"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "কখনো নয়"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "সর�বদা"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "প�রতিটি বার�তার জন�য জিজ�ঞাসা করা হবে"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
 #, fuzzy
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "�কটিও নয়"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "মেইলের কনফিগারেশন"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10538,7 +10208,7 @@ msgstr ""
 "\n"
 "আরম�ভ করার জন�য \"পরবর�তী ধাপ\" -� ক�লিক কর�ন।"
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2060
 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 "
@@ -10547,20 +10217,20 @@ msgstr ""
 "আপনার নাম �বং ঠিকানা নিম�নোক�ত জায়গায় লিখ�ন। ই-মেইলে �ই তথ�যগ�লি পাঠাতে না চাইলে,"
 "\"�চ�ছিক\" ক�ষেত�রগ�লি পূরণ করার প�রয়োজন নেই।"
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2228
+#: ../mail/mail-config.ui.h:91
 msgid "Receiving Email"
 msgstr "ই-মেইল আহরণ করা হচ�ছে"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "অন�গ�রহ করে নিম�নলিখিত অ�যাকাউন�টের বৈশিষ�ট�য কনফিগার কর�ন।"
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2706
 msgid "Sending Email"
 msgstr "ই-মেইল প�রেরণ করা হচ�ছে"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10568,11 +10238,11 @@ msgstr ""
 "আপনার মেইল প�রেরণের প�রক�রিয়া সম�বন�ধে তথ�য লিখ�ন। �ই বিষয়ে নিশ�চিত না হলে আপনার "
 "সিস�টেম অ�যাডমিনিস�ট�রেটর অথবা ইন�টারনেট পরিসেবা উপলব�ধকারির সাথে যোগাযোগ কর�ন।"
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "অ�যাকাউন�ট নিয়ন�ত�রন"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2069
 #, fuzzy
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
@@ -10581,11 +10251,11 @@ msgstr ""
 "অন�গ�রহ করে নিম�নলিখিত স�থানে চিহ�নিত অ�যাকাউন�টের জন�য �কটি বর�ণনামূলক নাম লিখ�ন। "
 "শ�ধ�মাত�র প�রদর�শনেটর উদ�দেশ�যে �ই নামটি ব�যবহৃত হবে।"
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "সম�পন�ন"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2074
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -10601,56 +10271,56 @@ msgstr ""
 "\n"
 "\"প�রয়োগ কর�ন\" ক�লিক করে আপনার নির�ধারিত বৈশিষ�ট�য সংরক�ষণ কর�ন।"
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2515
 msgid "Check for _new messages every"
 msgstr "নত�ন মেইলের জন�য পরীক�ষা করা হবে প�রতি (_n)"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2523
 msgid "minu_tes"
 msgstr "মিনিট (_t)"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "স�রক�ষা"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
 msgid "Receiving Options"
 msgstr "আহরণের বিকল�প"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2878 ../mail/em-account-editor.c:2946
 msgid "Checking for New Messages"
 msgstr "নত�ন মেইল আছে কিনা তা পরীক�ষা করা হচ�ছে"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3414
 msgid "Account Editor"
 msgstr "অ�যাকাউন�ট �ডিটর"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3414
 msgid "Evolution Account Assistant"
 msgstr "Evolution অ�যাকাউন�টের সাহায়ক"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1570
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr ""
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1618
 #, fuzzy, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "মেইলের সূচনা ব�যবস�থার বৈশিষ�ট�য"
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1942
 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:1997
+#: ../mail/em-composer-utils.c:1989
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10658,20 +10328,20 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} -র ${24Hour}:${Minute} "
 "${TimeZone}-�, ${Sender} লিখেছিলেন:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2133
 msgid "-----Original Message-----"
 msgstr "--------  মূল বার�তা --------"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2314
 msgid "Posting destination"
 msgstr "পোস�ট করার গন�তব�যস�থল"
 
 # which is virtual - trash or folder (sm's question)
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2315
 msgid "Choose folders to post the message to."
 msgstr "যে ফোল�ডারগ�লিতে বার�তা পোস�ট করা হবে তা নির�বাচন কর�ন।"
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "ফোল�ডার নির�বাচন কর�ন"
 
@@ -10752,6 +10422,10 @@ msgstr "অন�বৃত�তি"
 msgid "Forward to"
 msgstr "অন�বর�তনের স�থান"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "প�রয়োজনীয়"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "পরে"
@@ -10776,7 +10450,7 @@ msgstr "নির�ধারিত নয়"
 msgid "is set"
 msgstr "নির�ধারিত"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:62
 msgid "Junk"
 msgstr "অবাঞ�ছিত"
 
@@ -10825,7 +10499,7 @@ msgid "Play Sound"
 msgstr "শব�দ বাজাও"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "পড়ো"
 
@@ -10906,16 +10580,16 @@ msgid "Unset Status"
 msgstr "অবস�থার মান বাতিল কর�ন"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "�র পরে"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "কর�ম যোগ কর�ন (_t)"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:169
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "না পড়া বার�তা:"
@@ -10923,23 +10597,23 @@ msgstr[1] "না পড়া বার�তা:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:173
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "সর�বমোট বার�তা:"
 msgstr[1] "সর�বমোট বার�তা:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:191
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "বরাদ�দ স�থলের ব�যবহার (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:193
 #, c-format
 msgid "Quota usage"
 msgstr "বরাদ�দ স�থলের ব�যবহার"
 
-#: ../mail/em-folder-properties.c:399
+#: ../mail/em-folder-properties.c:395
 #: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "ফোল�ডারের বৈশিষ�ট�য"
@@ -10948,37 +10622,37 @@ msgstr "ফোল�ডারের বৈশিষ�ট�য"
 msgid "<click here to select a folder>"
 msgstr "<ফোল�ডার নির�বাচন করতে হলে �খানে ক�লিক কর�ন>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "তৈরি কর�ন (_r)"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "ফোল�ডারের নাম (_n):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1073 ../mail/mail-vfolder.c:1138
 msgid "Search Folders"
 msgstr "ফোল�ডার অন�সন�ধান কর�ন"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1080
 msgid "Loading..."
 msgstr "লোড করা হচ�ছে..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:179
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" � রক�ষিত ফোল�ডারগ�লি স�ক�যান করা হচ�ছে"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:592
 msgid "Folder names cannot contain '/'"
 msgstr "ফোল�ডারের নামের মা�ে / লেখা যাবে না।"
 
@@ -11000,97 +10674,97 @@ msgstr "ফোল�ডারের নামের মা�ে / লেখা
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1074
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1280
 msgid "Mail Folder Tree"
 msgstr "মেইল ফোল�ডার ট�রি"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1486 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s ফোল�ডারটি সরিয়ে ফেলা হচ�ছে"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1488 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s ফোল�ডারটি কপি করা হচ�ছে"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2100
+#: ../mail/em-folder-tree.c:1495 ../mail/message-list.c:2098
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "%s ফোল�ডারে বার�তা সরিয়ে নেওয়া হচ�ছে"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2102
+#: ../mail/em-folder-tree.c:1497 ../mail/message-list.c:2100
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "%s ফোল�ডারে বার�তা কপি করা হচ�ছে"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1512
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "উপরের স�তরের সংগ�রহস�থলে বার�তা ফেলা যাচ�ছে না"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 #, fuzzy
 msgid "Move Folder To"
 msgstr "ফোল�ডার স�থানান�তরের স�থান...(_M)"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 #, fuzzy
 msgid "Copy Folder To"
 msgstr "ফোল�ডার কপি করার স�থান...(_C)"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
-#, c-format
-msgid "Creating folder `%s'"
+#: ../mail/em-folder-utils.c:500
+#: ../plugins/groupwise-features/share-folder-common.c:136
+#, fuzzy, c-format
+msgid "Creating folder '%s'"
 msgstr "`%s' ফোল�ডারটি তৈরি করা হচ�ছে"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:663
 #, fuzzy
 msgid "Create Folder"
 msgstr "ফোল�ডার তৈরি কর�ন"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:664
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Specify where to create the folder:"
 msgstr "ফোল�ডার কোথায় তৈরি করা হবে তা নির�ধারণ কর�ন:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:680
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "\"%s\" ফোল�ডার থেকে আন-সবাস�ক�রাইব কর�ন"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1540
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "স�বাক�ষরিত নয়"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "�ই বার�তাটি ডিজিটালি স�বাক�ষরিত নয়। �ই বার�তাটির সত�যতা প�রমানিত হয়নি।"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1541
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "বৈধ স�বাক�ষর"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 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:105 ../mail/em-format-html.c:1542
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "অবৈধ স�বাক�ষর"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11098,11 +10772,11 @@ msgstr ""
 "�ই বার�তাটির স�বাক�ষরটি পরীক�ষা করা সম�ভব হয়নি, সম�ভবত যাত�রাকালে �তে পরিবর�তন করা "
 "হয়েছে।"
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1543
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
 msgid "Valid signature, but cannot verify sender"
 msgstr "স�বাক�ষর বৈধ কিন�ত� প�রেরকের পরিচয় প�রমাণিত হয়নি"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11110,22 +10784,22 @@ msgstr ""
 "�ই বার�তাটি �কটি বৈধ স�বাক�ষরসহ স�বাক�ষরিত হয়েছে, কিন�ত� প�রেরকের পরিচয় নিশ�চিতায়ন "
 "করা সম�ভব হয়নি।"
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1544
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
 msgid "Signature exists, but need public key"
 msgstr "স�বাক�ষ র উপস�থিত হলেও সার�বজনীন-কি আবশ�যক"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 "�ই বার�তাটি �কটি বৈধ স�বাক�ষরসহ স�বাক�ষরিত হয়েছে, কিন�ত� যথাযত সার�বজনীন-কি অন�পস�থিত।"
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1550
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
 msgid "Unencrypted"
 msgstr "�নক�রিপ�ট করা নয়"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11133,11 +10807,11 @@ msgstr ""
 "�ই বার�তাটি �নক�রিপ�ট করা হয়নি।  ইন�টারনেটের মাধ�যমে যাত�রাকালে �তে অন�তর�ভ�ক�ত বস�ত� "
 "প�রত�যক�ষ করা সম�ভব।"
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1551
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "�নক�রিপ�ট করা, দ�র�বল"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -11147,11 +10821,11 @@ msgstr ""
 "বহিরাগত ব�যক�তি সহজে না হলেও, কিছ� সময় ব�যয় করলে �তে অন�তর�ভ�ক�ত বস�ত� পড়তে সক�ষম হতে "
 "পারে।"
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1552
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "�নক�রিপ�ট করা হয়েছে"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11159,11 +10833,11 @@ msgstr ""
 "�ই বার�তাটি �নক�রিপ�ট করা হয়েছে।  কোনো বহিরাগত ব�যক�তি সহজে �তে অন�তর�ভ�ক�ত বস�ত� পড়তে "
 "পারবে না।"
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1553
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "�নক�রিপ�ট করা, দৃ�ভাবে"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -11173,15 +10847,15 @@ msgstr ""
 "বহিরাগত ব�যক�তির দ�বারা স�বাভাবিক সময়ের মধ�যে �ই বার�তার বিষয়বস�ত� পাঠ করা সম�ভব হবে "
 "না।"
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "সার�টিফিকেট প�রত�যক�ষ কর�ন (_V)"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "সার�টিফিকেট প�রদর�শনযোগ�য নয়"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -11189,28 +10863,28 @@ msgstr ""
 "অত�যাধিক বড় হওয়া ফলে �ই বার�তাটি Evolution দ�বারা প�রদর�শন করা সম�ভব হয়নি। ফরম�যাট "
 "বিনা �টি প�রদর�শন করা যাবে অথবা কোনো স�বতন�ত�র টেক�সট �ডিটর সহযোগে �টি খোলা যাবে।"
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:726
 msgid "Completed on"
 msgstr "সমাপ�তির তারিখ"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:734
 msgid "Overdue:"
 msgstr "সময়সীমা পার হয়ে গেছে:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:738
 msgid "by"
 msgstr "তারিখ"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
 msgid "View _Unformatted"
 msgstr "বিন�যাসবিহীন প�রদর�শন (_U)"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:950
 msgid "Hide _Unformatted"
 msgstr "বিন�যাসবিহীন অবস�থায় আড়াল: (_U)"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1012
 msgid "O_pen With"
 msgstr "চিহ�নিত প�রোগ�রাম সহযোগে খ�ল�ন (_p)"
 
@@ -11219,48 +10893,48 @@ msgstr "চিহ�নিত প�রোগ�রাম সহযোগে খ
 msgid "Page %d of %d"
 msgstr "পৃষ�ঠা %d, %d -র"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:147
 msgid "Formatting message"
 msgstr "বার�তা ফরম�যাট করা হচ�ছে"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:338
 msgid "Formatting Message..."
 msgstr "বার�তা ফরম�যাট করা হচ�ছে..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
-#, c-format
-msgid "Retrieving `%s'"
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
+#, fuzzy, c-format
+msgid "Retrieving '%s'"
 msgstr "`%s' উদ�ধার করা হচ�ছে"
 
-#: ../mail/em-format-html.c:1859
+#: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
 msgstr "বহিস�থত অংশ অজানা।"
 
-#: ../mail/em-format-html.c:1867
+#: ../mail/em-format-html.c:1862
 msgid "Malformed external-body part."
 msgstr "বহিস�থত অংশ বিকৃত।"
 
-#: ../mail/em-format-html.c:1897
+#: ../mail/em-format-html.c:1892
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "�ফটিপি সাইটের নির�দেশচিহ�ন (%s)"
 
-#: ../mail/em-format-html.c:1908
+#: ../mail/em-format-html.c:1903
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "স�থানীয় ফাইলের (%s) নির�দেশচিহ�ন \"%s\" স�থানে বৈধ"
 
-#: ../mail/em-format-html.c:1910
+#: ../mail/em-format-html.c:1905
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "স�থানীয় ফাইলের নির�দেশচিহ�ন (%s)"
 
-#: ../mail/em-format-html.c:1931
+#: ../mail/em-format-html.c:1926
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "দূরবর�তী ডাটাকে নির�দেশকারী চিহ�ন (%s)"
 
-#: ../mail/em-format-html.c:1942
+#: ../mail/em-format-html.c:1937
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "অজানা বহিস�থ ডাটা (\"%s\" ধরনের)-কে নির�দেশকারী চিহ�ন"
@@ -11268,38 +10942,48 @@ msgstr "অজানা বহিস�থ ডাটা (\"%s\" ধরনের)
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:2602
+#: ../mail/em-format-html.c:2598
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "বার�তাটি <b>%s</b> দ�বারা <b>%s</b>-র পক�ষ থেকে পাঠানো হয়েছে"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "�ই সংরক�ষণস�থলে সাবস�ক�রিপশন সমর�থিত নয় অথবা সক�রিয় করা হয়নি।"
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "সাবস�ক�রাইব করা"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "ফোল�ডার"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:837
 msgid "Please select a server."
 msgstr "অন�গ�রহ করে �কটি সার�ভার নির�বাচন কর�ন।"
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "কোনো সার�ভার নির�বাচন করা হয়নি"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, fuzzy, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "আপনি কি নিশ�চিতরূপে {0}-টি বার�তা খ�লতে ইচ�ছ�ক?"
+msgstr[1] "আপনি কি নিশ�চিতরূপে {0}-টি বার�তা খ�লতে ইচ�ছ�ক?"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "বার�তা ফিল�টার"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:852
 #, c-format
 msgid "Messages from %s"
 msgstr "%s থেকে বার�তা"
@@ -11308,7 +10992,7 @@ msgstr "%s থেকে বার�তা"
 msgid "Search _Folders"
 msgstr "ফোল�ডার অন�সন�ধান কর�ন (_F)"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:521
 #, fuzzy
 msgid "Add Folder"
 msgstr "ফোল�ডার"
@@ -11356,50 +11040,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "\"মেইল প�রেরণ �বং গ�রহণ কর�ন\" উইন�ডোর প�রস�থ"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Evolution দ�বারা সীমিত মাপের টেক�সটের অংশ প�রদর�শনের অন�মতি প�রদান করা হবে"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "সর�বদা বার�তা-পাঠের সূচনা প�রদানের অন�রোধ করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "স�বয়ংক�রিয়ভাবে ভাব-প�রতীক(emoticon) সনাক�তকরণ"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "স�বয়ংক�রিয় লিঙ�ক পরিচিতি"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "অন�তর�মূখী মেইল জঞ�জাল কি না পরীক�ষা করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "উদ�ধৃতি উল�লেখ করতে ব�যবহৃত রং"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "উদ�ধৃতি উল�লেখ করতে ব�যবহৃত রং।"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "কম�পোসার উইন�ডোর ডিফল�ট উচ�চতা"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "কম�পোসার উইন�ডোর ডিফল�ট প�রস�থ"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "কম�পোসার লোড/সংয�ক�তকরণের ডিরেক�টরি"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "প�রাপক/অন�-প�রা/অপ�র-অন�-প�রা ক�ষেত�রগ�লির মধ�যে ঠিকানার প�রদর�শন সংক�চিত করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11407,7 +11087,7 @@ msgstr ""
 "address_count দ�বারা চিহ�নিত সংখ�যা অব�দি প�রাপক/অন�-প�রা/অপ�র-অন�-প�রা ক�ষেত�রগ�লির মধ�যে "
 "ঠিকানার প�রদর�শন সংক�চিত করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11415,11 +11095,11 @@ msgstr ""
 "স�থামীম পরিবর�তনগ�লি দূরবর�তী মেইল সার�ভারের সাথে স�সংগতির বিরতির হার নিয়ন�ত�রণ করতে "
 "ব�যবহৃত হয়। বিরতির মান অন�তত ৩০ সেকেন�ড হওয়া আবশ�যক।"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "আবর�জনা পরীক�ষা করার জন�য ব�যবহৃত স�বনির�ধারিত হেডার।"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11427,66 +11107,66 @@ msgstr ""
 "অবাঞ�ছিত বার�তা পরীক�ষণের সময় ব�যবহারযোগ�য স�বনির�ধারিত হেডার। তালিকায়র বস�ত�গ�লি "
 "\"headername=value\" বিন�যাসের উল�লিখিত হয়।"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "যে ডিফল�ট অক�ষরমালা (charset) ব�যবহার করে বার�তা কম�পোজ করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "যে ডিফল�ট অক�ষরমালা (charset) ব�যবহার করে বার�তা কম�পোজ করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "যে ডিফল�ট অক�ষরমালা (charset) ব�যবহার করে বার�তা প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "যে ডিফল�ট অক�ষরমালা (charset) ব�যবহার করে বার�তা প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "ফরওয়ার�ডের ডিফল�ট বিন�যাস"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "কম�পোসার উইন�ডোর ডিফল�ট উচ�চতা।"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 #, fuzzy
 msgid "Default height of the mail browser window."
 msgstr "কম�পোসার উইন�ডোর ডিফল�ট উচ�চতা।"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "সাবস�ক�রাইব ডায়লগের ডিফল�ট উচ�চতা।"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 #, fuzzy
 msgid "Default maximized state of the mail browser window."
 msgstr "কম�পোসার উইন�ডোর ডিফল�ট প�রস�থ।"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "উত�তর লেখার ডিফল�ট বিন�যাস"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "থ�রেড প�রসারণের অবস�থার ডিফল�ট মান"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "কম�পোসার উইন�ডোর ডিফল�ট প�রস�থ।"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 #, fuzzy
 msgid "Default width of the mail browser window."
 msgstr "কম�পোসার উইন�ডোর ডিফল�ট প�রস�থ।"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "সাবস�ক�রাইব ডায়লগের ডিফল�ট প�রস�থ।"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11494,13 +11174,13 @@ msgstr ""
 "অবাঞ�ছিত বার�তা সনাক�তকরণের উদ�দেশ�যে শ�ধ�মাত�র স�থানীয় ঠিকানা বইয়ের মধ�যে ঠিকানা "
 "অন�সন�ধান করা হবে কি না তা ধার�য করা হয়"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "বার�তা প�রেরকের ই-মেইল ঠিকানা, ঠিকানা বইয়ের মধ�যে অন�সন�ধান করা হবে কি না তা ধার�য "
 "করা হয়"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11513,13 +11193,13 @@ msgstr ""
 "LDAP) যদি স�বয়ংক�রিয় তথ�য সম�পূর�ণের জন�য চিহ�নিত হয় তাহলে ধীর গতিতে �ই কাজ সঞ�চালিত "
 "হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "অবাঞ�ছিত বার�তা পরীক�ষণের জন�য স�বনির�ধারিত হেডার প�রয়োগ করা হবে কি না তা নির�ধারণ "
 "করা হয়।"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11529,7 +11209,7 @@ msgstr ""
 "করে। �ই বিকল�পটি সক�রিয় করে হেডার উল�লেখ করা হলে, অবাঞ�ছিত বার�তা পরীক�ষণের "
 "গতিবৃদ�ধি হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11537,19 +11217,23 @@ msgstr ""
 "উলম�ব দিশায় প�রদর�শন ক�ষেত�রে \"বার�তা\" নামক কলামে  \"প�রেরক\" ও \"বিষয়\" শীর�ষক "
 "পংক�তিরগ�লিতে �কই ফন�ট ব�যবহার করা হবে কি না তা নির�ধারণ করে।"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "রচনা ক�ষেত�রে ফাইল লোড ও সংয�ক�ত করার জন�য ব�যবহৃড ডিরক�টরি।"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "মেইলের সাথের সামগ�রী সংরক�ষণের উদ�দেশ�যে ব�যবহৃত ডিরেক�টরি।"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "সাইড-বারের মধ�যে ফোল�ডারের নামে ইলিপসিস চিহ�নের ব�যবহার নিষ�ক�রিয় অথবা সক�রিয় কর�ন"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+
 #: ../mail/evolution-mail.schemas.in.h:49
 #, fuzzy
 msgid "Do not add signature delimiter"
@@ -11625,14 +11309,16 @@ msgstr ""
 "কি ব�যবহার করার জন�য �টি সক�রিয় কর�ন।"
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "বার�তার সীমিত মাপের টেক�সটের অংশ প�রদর�শনের জন�য সক�রিয় কর�ন।"
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "ক�যারেট মোড সক�রিয়/নিষ�ক�রিয় কর�ন"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:46
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Outlook/GMail-র অন�করণে ফাইলের নাম �নকোড করা হবে"
 
@@ -11780,11 +11466,13 @@ msgstr ""
 "নিষ�ক�রিয় করা হয়।"
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+#, fuzzy
+msgid "Last time Empty Junk was run"
 msgstr "অবাঞ�ছিত বার�তা ম�ছে ফেলার কর�ম সর�বশেষ চালনার সময়"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+#, fuzzy
+msgid "Last time Empty Trash was run"
 msgstr "আবর�জনার বাক�স সর�বশেষ যে সময় ফা�কা করা হয়েছিল"
 
 #: ../mail/evolution-mail.schemas.in.h:85
@@ -11897,64 +11585,68 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "বার�তার \"পূর�বদৃশ�য\"-র মধ�যে উদ�ধৃতি চিহ�নিত করা হবে।"
 
 #: ../mail/evolution-mail.schemas.in.h:109
+msgid "Message text limit for display"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "বার�তা-প�রদর�শনের ধরন (\"normal\"(স�বাভাবিক), \"full headers\"(সম�পূর�ণ হেডারসহ), "
 "\"source\"(উৎস))"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the junk on exit"
 msgstr "সবর�নিম�ন যে সংখ�যক দিন অপেক�ষা করে প�রস�থানের সময় আবর�জনা পরিষ�কার করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum days between emptying the trash on exit"
 msgstr "সবর�নিম�ন যে সংখ�যক দিন অপেক�ষা করে প�রস�থানের সময় আবর�জনা পরিষ�কার করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "সবর�নিম�ন যে সংখ�যক দিন অপেক�ষা করে প�রস�থানের সময় আবর�জনা পরিষ�কার করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "সবর�নিম�ন যে সংখ�যক দিন অপেক�ষা করে প�রস�থানের সময় আবর�জনা পরিষ�কার করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "প�রাপক/অন�লিপিপ�রাপক/অপ�রকাশিত অন�লিপিপ�রাপক ক�ষেত�রে প�রদর�শিত ঠিকানার সংখ�যা"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "কোনো বিষয় না উল�লিখিত না হলে সতর�কবাণী প�রদর�শন করবে"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "কোনো ফোল�ডার �ক�সপাঞ�জ করার চেষ�টা করলে ব�যবহারকারীকে সতর�কবাণী প�রদর�শন করবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "বিষয়হীন বার�তা প�রেরণ করার চেষ�টা করলে ব�যবহারকারীকে সতর�কবাণী প�রদর�শন করবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "অন�সন�ধানের ফোল�ডারের মধ�যে বার�তা ম�ছে ফেলার পূর�বে সতর�কবার�তা প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "ব�যবহারকারী �ক�সপাঞ�জ করলে সতর�কবাণী প�রদর�শন করবে"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 "ব�যবহারকারী শ�ধ�মাত�র অপ�রকাশিত অন�লীপিপ�রাপকের নাম লিখলে সতর�কবাণী প�রদর�শন করবে"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "�ক সময়ে ১০ অথবা অধিক সংখ�যক বার�তা পড়ার প�রচেষ�টা করা হলে সতর�কবার�তা প�রদর�শন করা "
 "হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11962,134 +11654,134 @@ msgstr ""
 "HTML বার�তা গ�রহণে অনিচ�ছ�ক প�রাপকদের ব�অবহারকারী HTML বার�তা প�রেরণ করার চেষ�টা করলে "
 "সতর�কবাণী প�রদর�শন করবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "ব�যবহারকারী যদি বার�তায় কোনো প�রাপক অথবা অন�লিপী প�রাপকদের নাম না লিখে বার�তা "
 "প�রেরণ করার চেষ�টা করলে সতর�কবাণী প�রদর�শন করবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ব�যবহারকারী অবাঞ�ছিত HTML প�রেরণ করতে চেষ�টা করলে সতর�কবাণী প�রদর�শন করবে"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "�কাধিক বার�তা চিহ�নিত করতে হলে সতর�কবার�তা প�রদর�শিত হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr "উত�তরের উপরে স�বনির�ধারিত স�বাক�ষর স�থাপন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "উত�তরের নীচের অংশে কার�সার স�থাপন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "টেক�সটের মধ�যে ভাব-আইকন অন�সন�ধান করে সেগ�লির পরিবর�তে ছবি স�থাপন করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "টেক�সটের মধ�যে লিঙ�ক অন�সন�ধান করে প�রতিস�থাপন করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "আগমনকারী মেইলে জঞ�জাল পরীক�ষা করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "সংরক�ষণের ডিরেক�টরি"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "স�থানীয় ঠিকানাবইয়ের মধ�যে প�রেরকের ছবি অন�সন�ধান করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "ডিফল�টভাবে HTML মেইল প�রেরণ করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "ডিফল�টভাবে HTML মেইল প�রেরণ করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "বার�তা তালিকায় প�রেরকের ই-মেইল ঠিকানার কলাম"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "সার�ভারের স�সংগতির মধ�যে বিরতি"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr ""
 "বার�তা পাঠানোর সময় \"অপ�রকাশিত অন�লিপি প�রাপক\" শীর�ষক ক�ষেত�রটি প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "বার�তা পাঠানোর সময় \"অন�লিপি প�রাপক\" শীর�ষক ক�ষেত�রটি প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "নিউজগ�র�পে বার�তা পাঠানোর সময় \"প�রেরক\" শীর�ষক ক�ষেত�রটি প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"From\" field when sending a mail message"
 msgstr "ই-মেইল বার�তা পাঠানোর সময় \"প�রেরক\" শীর�ষক ক�ষেত�রটি প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "নিউজগ�র�পে বার�তা পাঠানোর সময় \"উত�তর প�রাপক\" শীর�ষক ক�ষেত�রটি প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "ই-মেইল বার�তা পাঠানোর সময় \"উত�তর প�রাপক\" শীর�ষক ক�ষেত�রটি প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "অ�যানিমেশন ছবি প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 #, fuzzy
 msgid "Show all message headers"
 msgstr "সমস�ত বার�তার থ�রেড সংক�চিত করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 #, fuzzy
 msgid "Show all the headers when viewing a messages."
 msgstr "ই-মেইল বার�তা পাঠানোর সময় \"উত�তর প�রাপক\" শীর�ষক ক�ষেত�রটি প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "অ�যানিমেশন ছবি অ�যানিমেশন হিসাবে প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "ম�ছে ফেলা বার�তাগ�লিকে বার�তা-তালিকায় (মা�ে রেখাঙ�কন করে) প�রদর�শন করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr "বার�তা-তলিকায় ম�ছে-ফেলা বার�তা প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show image animations"
 msgstr "অ�যানিমেশন ছবি প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show original \"Date\" header value."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "প�রেরকের ছবি প�রদর�শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12098,7 +11790,7 @@ msgstr ""
 "হবে। মেইল অ�যাকাউন�ট নির�বাচনের পরে প�রদর�শন শীর�ষক মেন� থেকে �ই বৈশিষ�ট�যটি নিয়ন�ত�রণ "
 "করা যাবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12106,7 +11798,7 @@ msgstr ""
 "ই-মেইল বার�তা পাঠানোর সময় \"অন�লিপি প�রাপক\" শীর�ষক ক�ষেত�রটি প�রদর�শন করা হবে। মেইল "
 "অ�যাকাউন�ট নির�বাচনের পরে প�রদর�শন শীর�ষক মেন� থেকে �ই বৈশিষ�ট�যটি নিয়ন�ত�রণ করা যাবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -12114,7 +11806,7 @@ msgstr ""
 "নিউজগ�র�পে বার�তা পাঠানোর সময় \"প�রেরক\" শীর�ষক ক�ষেত�রটি প�রদর�শন করা হবে। নিউজ "
 "অ�যাকাউন�ট নির�বাচনের পরে প�রদর�শন শীর�ষক মেন� থেকে �ই বৈশিষ�ট�যটি নিয়ন�ত�রণ করা যাবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12122,7 +11814,7 @@ msgstr ""
 "ই-মেইল বার�তা পাঠানোর সময় \"প�রেরক\" শীর�ষক ক�ষেত�রটি প�রদর�শন করা হবে। মেইল "
 "অ�যাকাউন�ট নির�বাচনের পরে প�রদর�শন শীর�ষক মেন� থেকে �ই বৈশিষ�ট�যটি নিয়ন�ত�রণ করা যাবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -12130,7 +11822,7 @@ msgstr ""
 "নিউজগ�র�পে বার�তা পাঠানোর সময় \"উত�তর প�রাপক\" শীর�ষক ক�ষেত�রটি প�রদর�শন করা হবে। নিউজ "
 "অ�যাকাউন�ট নির�বাচনের পরে প�রদর�শন শীর�ষক মেন� থেকে �ই বৈশিষ�ট�যটি নিয়ন�ত�রণ করা যাবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -12138,64 +11830,64 @@ msgstr ""
 "মেইল বার�তা পাঠানোর সময় \"উত�তর প�রাপক\" শীর�ষক ক�ষেত�রটি প�রদর�শন করা হবে। মেইল "
 "অ�যাকাউন�ট নির�বাচনের পরে প�রদর�শন শীর�ষক মেন� থেকে �ই বৈশিষ�ট�যটি নিয়ন�ত�রণ করা যাবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "বার�তা তালিকার �কটি পৃথক কলামের মধ�যে প�রেরকের ই-মেইল ঠিকানা প�রদর�শন করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "বার�তা পাঠের পেইনের মধ�যে প�রেরকের ছবি প�রদর�শন করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "ইনলাইন বানান পরীক�ষণ"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "বানান পরীক�ষণে ব�যবহৃত রঙ"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "বানান পরীক�ষণ ভাষা"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "সাবস�ক�রাইব ডায়লগের ডিফল�ট উচ�চতা"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "সাবস�ক�রাইব ডায়লগের ডিফল�ট প�রস�থ"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "টার�মিন�যালের ফন�ট"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "টেক�সট বার�তার অংশে সীমা"
-
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "অবাঞ�ছিত বার�তা আটক করতে ব�যবহৃত ডিফল�ট প�লাগ-ইন"
 
 #: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
+#, fuzzy
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "অবাঞ�ছিত বার�তাগ�লি যে সময় সর�বশেষ ফা�কা করা হয়েছিল, জান�য়ারি ১-লা ১৯৭০ থেকে দিন "
 "অন�যায়ী গণনা করা হবে।"
 
 #: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
+#, fuzzy
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "আবর�জনার বাক�স যে সময় সর�বশেষ ফা�কা করা হয়েছিল, জান�য়ারি ১-লা ১৯৭০ থেকে দিন "
 "অন�যায়ী গণনা করা হবে।"
@@ -12225,9 +11917,11 @@ msgstr ""
 "বার�তার ক�ষেত�রে \"2\"।"
 
 #: ../mail/evolution-mail.schemas.in.h:176
+#, fuzzy
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
 "Evolution-র অধীন ফরম�যাট করার যোগ�য টেক�সট অংশের সর�বাধিক মাপ �টি দ�বারা নির�ধারিত "
 "হয়। ডিফল�ট মান হল ৪ মেগাবাইট / ৪০৯৬ কিলোবাইট �বং �ই ক�ষেত�রে কিলোবাইট অন�যায়ী "
@@ -12403,565 +12097,586 @@ msgstr "বার�তা-তালিকা পেইনের প�রস�
 msgid "Width of the message-list pane."
 msgstr "বার�তা-তালিকা পেইনের প�রস�থ।"
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "�ল�ম-�র ডাটা ইম�পোর�ট করা হচ�ছে"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "মেইল"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:365
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm ইম�পোর�টার"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:366
 msgid "Import mail from Elm."
 msgstr "Elm থেকে মেইল ইম�পোর�ট করা হবে।"
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
+#: ../mail/importers/evolution-mbox-importer.c:113
+#: ../plugins/pst-import/pst-importer.c:308
 msgid "Destination folder:"
 msgstr "গন�তব�যের ফোল�ডার:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder"
 msgstr "ফোল�ডার নির�বাচন কর�ন"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder to import into"
 msgstr "যে ফোল�ডারে ইম�পোর�ট করা হবে তা নির�বাচন কর�ন"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:245
+#: ../mail/importers/evolution-mbox-importer.c:258
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley মেইলবক�স (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:259
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer Berkeley Mailbox বিন�যাসের ফোল�ডার"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "মেইলবক�স ইম�পোর�ট করা হচ�ছে"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
-#, c-format
-msgid "Importing `%s'"
+#: ../mail/importers/mail-importer.c:148
+#: ../plugins/pst-import/pst-importer.c:453
+#: ../plugins/pst-import/pst-importer.c:559
+#, fuzzy, c-format
+msgid "Importing '%s'"
 msgstr "`%s' ইম�পোর�ট করা হচ�ছে"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:291
 #, c-format
 msgid "Scanning %s"
 msgstr "%s স�ক�যান করা হচ�ছে"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "পাইনের ডাটা ইম�পোর�ট করা হচ�ছে"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "ঠিকানা-বই"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:418
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine ইম�পোর�ট ব�যবস�থা"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:419
 msgid "Import mail from Pine."
 msgstr "Pine থেকে মেইল ইম�পোর�ট কর�ন।"
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "%s কে লেখা মেইল"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "%s থেকে মেইল"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "বিষয় হল %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s মেইলিং লিস�ট"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "ফিল�টার করার নিয়ম যোগ কর�ন"
 
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(উল�লেখ�য: অ�যাপ�লিকেশন আরম�ভ করা আবশ�যক)"
 
-#: ../mail/mail-config.ui.h:2
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:3
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>টপ-পোস�টিংয়ের বিকল�প</b> (প�রস�তাবিত নয়)"
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:4
 #, fuzzy
 msgid "Account Information"
 msgstr "কোনো তথ�য নেই"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "নত�ন স�বাক�ষর যোগ করা হবে...(_w)"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "চিহ�নিত অ�যাকাউন�ট ব�যবহার করে প�রেরিত বার�তা সর�বদা স�বাক�ষর করা হবে (_w)"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr ""
 "�নক�রিপ�ট করা মেইল প�রেরণের সময় নিজের ঠিকানাতেও বার�তা �নক�রিপ�ট করা হবে (_f)"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "সর�বদা �খানে �কটি অন�লিপি প�রেরণ করবে (_s):"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "সর�বদা �খানে �কটি অপ�রকাশিত অন�লিপি প�রেরণ করবে (_b):"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "�নক�রিপ�ট করার সময় আমার কীরিং-�র কী (key)গ�লিকে সর�বদা বিশ�বাস করা হবে (_t)"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr ""
 "�নক�রিপ�ট করা মেইল প�রেরণের সময় নিজের ক�ষেত�রে বার�তা সর�বদা �নক�রিপ�ট করা হবে (_m)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "সর�বদা মেইল-পাঠের সূচনা প�রদানের অন�রোধ করা হবে (_d)"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "অন�মোদন ব�যবস�থা"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "স�বয়ংক�রিয়ভাবে ভাব-আইকন ছবি সন�নিবেশ করা হবে (_e)"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "অক�ষর মালা (_h):"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "সমর�থিত ধরন পরীক�ষা কর�ন (_e)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "অবাঞ�ছিত মেইল যাচাইয়ের জন�য স�বনির�ধারিত হেডার পরীক�ষা করা হবে (_s)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
 msgstr "আগমনকারী মেইলের মা�ে অবাঞ�ছিত মেইল পরীক�ষা কর�ন (_m)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "টাইপ করার সময় বানান পরীক�ষা করবে (_t)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "আগমনকারী মেইলের মা�ে অবাঞ�ছিত মেইল পরীক�ষা করে"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "ম�ছে ফেল�ন (_a)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "ম�ছে ফেল�ন (_r)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "ভূল বানান যে রং দিয়ে চিহ�নিত করা হবে (_m):"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 #, fuzzy
 msgid "Composing Messages"
 msgstr "বার�তা লিখ�ন"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "কনফিগারেশন"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "কোনো ফোল�ডার �ক�সপাঞ�জ করার আগে সম�মতি নেবে(_w)"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 #, fuzzy
 msgid "Default Behavior"
 msgstr "ডিফল�ট অগ�রাধিকার:"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "অক�ষরের ডিফল�ট �নকোডিং (_n):"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 #, fuzzy
 msgid "Delete Mail"
 msgstr "ম�ছে ফেল�ন"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Delete junk messages on e_xit"
 msgstr "প�রস�থানকালে অবাঞ�ছিত বার�তা বর�জন করা হবে (_x)"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "বাহিরগামী বার�তা ডিজিট�যালভাবে স�বাক�ষর করা হবে (ডিফল�টরূপে) (_u)"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:37
 #, fuzzy
-msgid "Displayed Message _Headers"
+msgid "Displayed Message Headers"
 msgstr "সমস�ত বার�তার হেডার (_H)"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
+#: ../mail/mail-config.ui.h:38
+#, fuzzy
+msgid "Do not display messages when text si_ze exceeds"
 msgstr "টেক�সটের মাপ চিহ�নিত মাপের চেয়ে বেশি হলে বার�তা ফরম�যাট করা হবে না (_z)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "বার�তার প�রেরকের তথ�য ঠিকানা বইয়ের মধ�যে উপস�থিত থাকলে তাদের থেলে প�রাপ�ত বার�তাগ�লি "
 "অবাঞ�ছিত বার�তা রূপে চিহ�নিত হবে না (_k)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 #, fuzzy
 msgid "Do not quote"
 msgstr "ম�ছে ফেলা হবে না"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "খসড়ার ফোল�ডার (_F):"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "ই-মেইল ঠিকানা (_A):"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "প�রস�থান করার সময় আবর�জনার ফোল�ডার খালি করবে (_x)"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Magic S_pacebar"
 msgstr "ম�যাজিক স�পেস-বার সক�রিয় করা হবে (_p)"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Sea_rch Folders"
 msgstr "ফোল�ডার অন�সন�ধান সক�রিয় কর�ন (_r) "
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "�নক�রিপশন সার�টিফিকেট (_p):"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "বহির�গামী বার�তা �নক�রিপ�ট করা হবে (ডিফল�টরূপে) (_g)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fi_xed-width:"
 msgstr "স�থায়ী-প�রস�থ (_x):"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Fix_ed width Font:"
 msgstr "স�থায়ী-প�রস�থের ফন�ট: (_e)"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Font Properties"
 msgstr "ফন�টের বৈশিষ�ট�য"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Format messages in _HTML"
 msgstr "HTML বিন�যাসে বার�তা ফরম�যাট কর�ন(_H)"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "সম�পূর�ণ নাম: (_e)"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "HTML Messages"
 msgstr "HTML বার�তা"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
 msgid "H_TTP Proxy:"
 msgstr "HTTP প�রক�সি: (_T)"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Headers"
 msgstr "হেডার"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "Highlight _quotations with"
 msgstr "�র দ�বারা উদ�ধৃতি উজ�জ�বলিত করা হবে (_q)"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:60
 #, fuzzy
 msgid "Inline"
 msgstr "ইনলাইন(_I)"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 msgid "Inline (Outlook style)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:63
 msgid "KB"
 msgstr "কিলোবাইট"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "লেবেল"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "ভাষার টেবিল"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 #, fuzzy
 msgid "Loading Images"
 msgstr "ছবি লোড করা হবে (_L)"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "মেইল হেডারের টেবিল"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "মেইলবক�সের স�থান"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 #, fuzzy
 msgid "Message Display"
 msgstr "বার�তা"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 #, fuzzy
 msgid "Message Fonts"
 msgstr "বার�তায় অন�তর�ভ�ক�ত"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 #, fuzzy
 msgid "Message Receipts"
 msgstr "বার�তা প�রত�যাহার"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "No _Proxy for:"
 msgstr "�র জন�য কোনো প�রক�সি চিহ�নিত হয়নি: (_P)"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:74
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "উল�লেখ�য: প�রথমবার সংযোগ না করা অবধি আপনাকে পাসওয়ার�ড লিখতে বলা হবে না"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:75
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "অবাঞ�ছিত বার�তার স�বনির�ধারিত হেডারের সাথে মিল পাওয়া গেলে �ই বিকল�পটি উপেক�ষা করা "
 "হবে।"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:76
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 #, fuzzy
 msgid "Optional Information"
 msgstr "ব�যক�তিগত তথ�য"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 msgid "Or_ganization:"
 msgstr "প�রতিষ�ঠান (_g):"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:79
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Pass_word:"
 msgstr "পাসওয়ার�ড: (_w)"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Port:"
 msgstr "পোর�ট:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "বার�তায় শ�ধ�মাত�র অপ�রকাশিত অন�লিপি প�রাপকদের নাম লেখা থাকলে সতর�কবাণী প�রদর�শন করবে"
 "(_o)"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "<span weight=\"bold\">প�রিটি গ�ড প�রাইভেসি (PGP/GPG)</span>"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "কর�মসূচী প�রিন�ট কর�ন"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 #, fuzzy
 msgid "Proxy Settings"
 msgstr "অবাঞ�ছিত বস�ত� সংক�রান�ত বৈশিষ�ট�য"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 #, fuzzy
 msgid "Quoted"
 msgstr "উদ�ধৃত(_Q)"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "Re_member password"
 msgstr "পাসওয়ার�ড মনে রাখবে (_m)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "Re_ply-To:"
 msgstr "উত�তর-প�রাপক (_p):"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "Remember _password"
 msgstr "পাসওয়ার�ড মনে রাখবে (_p)"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 #, fuzzy
 msgid "Required Information"
 msgstr "সার�ভার সংক�রান�ত তথ�য"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 #, fuzzy
 msgid "SSL is not supported in this build of Evolution"
 msgstr "<b>বর�তমান গঠনের Evolution SSL সমর�থন করে না</b>"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "শ�ধ�মাত�র স�থানীয় ঠিকানাবাইয়ের মধ�যে প�রেরকের ছবি অন�সন�ধান করা হবে (_e)"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "নির�বাচন কর�ন...(_e)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "বার�তার প�রাপ�তির সূচনা প�রেরণ কর�ন:(_e)"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "আদর�শ ফন�ট (_t):"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 #, fuzzy
 msgid "Select Drafts Folder"
 msgstr "ফোল�ডার নির�বাচন কর�ন"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "HTML �র স�থায়ী বিস�তারের ফন�ট নির�বাচন কর�ন"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "প�রিন�ট করার জন�য HTML �র স�থায়ী বিস�তারের ফন�ট নির�বাচন কর�ন"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font"
 msgstr "HTML �র পরিবর�তনশীল বিস�তারের ফন�ট নির�বাচন কর�ন"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "প�রিন�ট করার জন�য HTML �র পরিবর�তনশীল বিস�তারের ফন�ট নির�বাচন কর�ন"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 #, fuzzy
 msgid "Select Sent Folder"
 msgstr "ফোল�ডার নির�বাচন কর�ন"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 #, fuzzy
 msgid "Sender Photograph"
 msgstr "<b>প�রেরকের ছবি</b>"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Sending Mail"
 msgstr "মেইল প�রেরণ করা হচ�ছে"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "প�রেরিত বার�তার ফোল�ডার (_M):"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "প�রেরিত বার�তা"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:112
 msgid "Ser_ver requires authentication"
 msgstr "সার�ভারে অন�মোদনের প�রয়োজন আছে (_v)"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 #, fuzzy
 msgid "Server Configuration"
 msgstr "সার�ভার সংক�রান�ত তথ�য"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:114
 msgid "Server _Type:"
 msgstr "সার�ভারের ধরন: (_T)"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 #, fuzzy
 msgid "Sig_natures"
 msgstr "স�বাক�ষর"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "স�বাক�ষরকারী সার�টিফিকেট (_n):"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "স�বাক�ষর (_u):"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "স�বাক�ষর"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "বানান পরীক�ষণ"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "উত�তর লেখার সময় নীচের অংশে টাইপ আরম�ভ করা হবে (_t)"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "ধরন: (_y)"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "�ই স�থানে প�রদর�শিত ভাষার তালিকায় উপস�থিত ভাষাগ�লির জন�য অভিধান ইনস�টল করা হয়েছে।"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 #, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
@@ -12971,7 +12686,7 @@ msgstr ""
 "�ই স�ক�রিপ�টের ফলাফল আপনার স�বাক�ষর হিসাবে ব�যবহৃত হবে। আপনার নির�ধারিত নাম শ�ধ�মাত�র\n"
 "প�রদর�শনের জন�য ব�যবহৃত হবে।"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12979,253 +12694,251 @@ msgstr ""
 "�ই অ�যাকাউন�টটি আপনি যে নামে চিহ�নিত করতে ইচ�ছ�ক তা লিখ�ন।\n"
 "উল�লেখ�য: \"কার�য \" অথবা \"ব�যক�তিগত \""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:129
 msgid "Us_ername:"
 msgstr "ব�যবহারকারীর নাম: (_e)"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:130
 msgid "Use Authe_ntication"
 msgstr "অন�মোদন ব�যবস�থা প�রয়োগ করা হবে (_n)"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../mail/mail-config.ui.h:131 ../plugins/caldav/caldav-source.c:222
 #: ../plugins/google-account-setup/google-contacts-source.c:283
 #: ../plugins/google-account-setup/google-source.c:620
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "ব�যবহারকারীর নাম (_n):"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:132
 msgid "V_ariable-width:"
 msgstr "পরিবর�তনশীল-বিস�তার (_a):"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "স�বাক�ষর যোগ কর�ন (_A)"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "ইন�টারনেট থেকে সর�বদা ছবি লোড করবে (_A)"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:135
 msgid "_Authentication Type"
 msgstr "পরিচয় প�রমাণ ব�যবস�থার প�রকৃতি (_A)"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:136
 msgid "_Default junk plugin:"
 msgstr "অবাঞ�ছিত বার�তার ডিফল�ট প�লাগ-ইন: (_D)"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:137
 msgid "_Direct connection to the Internet"
 msgstr "ইন�টারনেটের সাথে সরাসরি সংযোগ (_D)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:138
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "সভার অন�রোধ স�বাক�ষর করা হবে না (Outlook সাথে সামঞ�জস�য বজায় রাখার উদ�দেশ�যে) (_D)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "অন�বর�তনের ধরন (_F):"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:140
 msgid "_Keep Signature above the original message on replying"
 msgstr "প�রত�য�ত�তরের সময়, মূল বার�তার উপরে স�বাক�ষর স�থাপিত হবে (_K)"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:141
 #, fuzzy
 msgid "_Languages"
 msgstr "ভাষা"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:142
 msgid "_Load images in messages from contacts"
 msgstr "পরিচিত প�রেরকদের থেকে প�রাপ�ত মেইলের ছবি লোড করা হবে (_L)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:143
 msgid "_Lookup in local address book only"
 msgstr "শ�ধ�মাত�র স�থানীয় ঠিকানা বইয়ের মধ�যে অন�সন�ধান করা হবে (_L)"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:144
 msgid "_Make this my default account"
 msgstr "আমার ডিফল�ট অ�যাকাউন�ট হিসাবে চিহ�নিত করা হবে (_M)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:145
 msgid "_Manual proxy configuration:"
 msgstr "ব�যবহারকারী দ�বারা প�রক�সি কনফিগারেশন: (_M)"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:146
 msgid "_Mark messages as read after"
 msgstr "কত সময়ের পরে বার�তাগ�লিতে পড়া-হয়েছে চিহ�ন দেওয়া হবে (_M)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "ইন�টারনেট থেকে ছবি কখনো লোড করবে না (_N)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "পাথ (_P):"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "HTML বার�তা গ�রহণে অনিচ�ছ�ক প�রাপকদের HTML বার�তা প�রেরণ করার পূর�বে সতর�কবাণী প�রদান "
 "করা হবে (_P)"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:151
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "বার�তার বিষয় আলাদা ভাবে উল�লেখ না করা থাকলে সতর�কবাণী দেবে (_P)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:152
 msgid "_Reply style:"
 msgstr "উত�তর লেখার ধরন (_R):"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:153
 msgid "_Script:"
 msgstr "স�ক�রিপ�ট (_S):"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:154
 msgid "_Secure HTTP Proxy:"
 msgstr "নিরাপদ HTTP প�রক�সি: (_S)"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:156 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "সার�ভার: (_S)"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:158
 msgid "_Show image animations"
 msgstr "অ�যানিমেশন ছবি প�রদর�শন করা হবে (_S)"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:159
 msgid "_Show the photograph of sender in the message preview"
 msgstr "বার�তার পূর�বরূপ প�রদর�শনকালে প�রেরকের ছবি প�রদর�শন করা হবে (_S)"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:161
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "প�রাপক/অন�-প�রা/অপ�র-অন�-প�রা ক�ষেত�রগ�লি চিহ�নিত মাপ অবধি সংক�চন করা হবে (_S)"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:162
 msgid "_Use Secure Connection:"
 msgstr "স�রক�ষিত সংযোগব�যবস�থা প�রয়োগ করা হবে (_U):"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:163
 msgid "_Use system defaults"
 msgstr "ডিফল�ট মান ব�যবহার করা হবে (_U)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:164
 msgid "_Use the same fonts as other applications"
 msgstr "অন�যান�য অ�যাপ�লিকেশনে ব�যবহৃত ফন�ট ব�যবহার করা হবে (_U)"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:48
 #, fuzzy
 msgid "a"
 msgstr "পূর�বাহ�ন"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:167
 msgid "addresses"
 msgstr "ঠিকানা"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:49
 #, fuzzy
 msgid "b"
 msgstr "তারিখ"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:169
 msgid "color"
 msgstr "রং"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:170
 msgid "description"
 msgstr "বিবরণ"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "সকল সক�রিয় দূরবর�তী ফোল�ডার"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "সকল স�থানীয় �বং সক�রিয় দূরবর�তী ফোল�ডার"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "সকল স�থানীয় ফোল�ডার"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "ফোন কর�ন"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "সমাপ�ত (_m)"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:6
 #, fuzzy
 msgid "Digital Signature"
 msgstr "স�বাক�ষর সম�পাদন কর�ন"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "অন�বর�তন করা হবে না"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:8
 #, fuzzy
 msgid "Encryption"
 msgstr "�নক�রিপ�ট কর�ন"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Folder Subscriptions"
 msgstr "ফোল�ডারের সাবস�ক�রিপশন"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "অন�বৃত�তি"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "আপনার তথ�য জ�ঞাপনের জন�য"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "ফরওয়ার�ড"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "লাইসেন�স সংক�রান�ত চ�ক�তিপত�র"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "কোনো প�রতিক�রিয়ার প�রয়োজন নেই"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "সকলের প�রতি উত�তর"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "পর�যালোচনা"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:20
 msgid "S_erver:"
 msgstr "সার�ভার (_e):"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:21
 #, fuzzy
 msgid "Search Folder Sources"
 msgstr "অন�সন�ধান ফোল�ডারের উৎ‌স"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Security Information"
 msgstr "স�রক�ষা সংক�রান�ত তথ�য"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Specific folders"
 msgstr "স�নির�দিষ�ট ফোল�ডার"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:24
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13233,170 +12946,170 @@ msgstr ""
 "অন�বৃত�তির জন�য চিহ�নিত বার�তাগ�লি নীচে উল�লিখিত হয়েছে।\n"
 "অন�গ�রহ করে, \"ফ�ল�যাগ\" মেন� থেকে, অন�বৃত�তির উদ�দেশ�যে �কটি কর�ম নির�বাচন কর�ন।"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Accept License"
 msgstr "লাইসেন�সে সম�মতি প�রদান কর�ন(_A)"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Due By:"
 msgstr "নির�ধারিত সময়সীমা (_D):"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Flag:"
 msgstr "ফ�ল�যাগ (_F):"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Tick this to accept the license agreement"
 msgstr "লাইসেন�স সংক�রান�ত চ�ক�তিপত�র গ�রহণ করতে �ই স�থানে টিক (tick) চিহ�ন দিন(_T)"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:891
 #, c-format
 msgid "Pinging %s"
 msgstr "%s � ping করা হচ�ছে"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "নির�বাচিত বার�তা ফিল�টার করা হচ�ছে"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "মেইল আহরণ করা হচ�ছে"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:574
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "বহির�গমন সম�বন�ধীয় ফিল�টার প�রয়োগ করা সম�ভব হয়নি: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
-#, c-format
+#: ../mail/mail-ops.c:586 ../mail/mail-ops.c:613
+#, fuzzy, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "%s � লেখা যায়নি: %s\n"
 "�র পরিবর�তে স�থানীয় 'প�রেরিত বার�তা'- র ফোল�ডারে লেখা হচ�ছে।"
 
-#: ../mail/mail-ops.c:641
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+#: ../mail/mail-ops.c:630
+#, fuzzy, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "স�থানীয় 'প�রেরিত বার�তা' -র ফোল�ডারে লেখা সম�ভব হয়নি: %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:741 ../mail/mail-ops.c:822
 msgid "Sending message"
 msgstr "বার�তা প�রেরণ"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:751
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "বার�তা %d , %d-র মধ�যে, কে প�রেরণ করা হচ�ছে"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:778
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d বার�তা, %d-�র মা�ে থেকে প�রেরণ করতে ব�যর�থ"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:780 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "বাতিল করা হয়েছে।"
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:782 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "সমপন�ন।"
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:894
 #, fuzzy, c-format
 msgid "Saving message to folder '%s'"
 msgstr "ফোল�ডারে বার�তা সংরক�ষণ করা হচ�ছে"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, fuzzy, c-format
 msgid "Moving messages to '%s'"
 msgstr "%s � বার�তা সরিয়ে নেওয়া হচ�ছে"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, fuzzy, c-format
 msgid "Copying messages to '%s'"
 msgstr "%s � বার�তা কপি করা হচ�ছে"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1080
 #, fuzzy, c-format
 msgid "Scanning folders in '%s'"
 msgstr "\"%s\" � রক�ষিত ফোল�ডারগ�লি স�ক�যান করা হচ�ছে"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1188
 msgid "Forwarded messages"
 msgstr "ফরওয়ার�ড করা বার�তা"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1229
 #, fuzzy, c-format
 msgid "Opening folder '%s'"
 msgstr "%s ফোল�ডারটি খোলা হচ�ছে"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1295
 #, fuzzy, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "%s ফোল�ডারের জন�য বরাদ�দ স�থান সংক�রান�ত তথ�য প�রাপ�ত করা হচ�ছে"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1367
 #, fuzzy, c-format
 msgid "Opening store '%s'"
 msgstr "%s সংগ�রহস�থলটি খোলা হচ�ছে"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1438
 #, fuzzy, c-format
 msgid "Removing folder '%s'"
 msgstr "%s ফোল�ডারটি ম�ছে ফেলা হচ�ছে"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1556
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' ফোল�ডারটি সংরক�ষণ করা হচ�ছে"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1619
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "'%s' অ�যাকাউন�ট �ক�সপাঞ�জ করে সংরক�ষণ করা হচ�ছে"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1620
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' অ�যাকাউন�টিট সংরক�ষণ করা হচ�ছে"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1674
 #, fuzzy, c-format
 msgid "Refreshing folder '%s'"
 msgstr "ফোল�ডার নত�ন করে প�রদর�শন করা হচ�ছে"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1714
 #, fuzzy, c-format
 msgid "Expunging folder '%s'"
 msgstr "ফোল�ডার �ক�সপাঞ�জ করা হচ�ছে"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1759
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' � অবস�থিত অবর�জনা ফেলে দেওয়া হচ�ছে"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1760
 msgid "Local Folders"
 msgstr "স�থানীয় ফোল�ডার"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1956
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d টি বার�তা উদ�ধার করা হচ�ছে"
 msgstr[1] "%d টি বার�তা উদ�ধার করা হচ�ছে"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2045
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d-টি বার�তা সংরক�ষণ করা হচ�ছে"
 msgstr[1] "%d-টি বার�তা সংরক�ষণ করা হচ�ছে"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2126
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13405,11 +13118,11 @@ msgstr ""
 "�খানে বার�তা সংরক�ষণ করতে সমস�যা হয়েছে: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2198
 msgid "Saving attachment"
 msgstr "সংয�ক�ত বস�ত�টি সংরক�ষণ করা হচ�ছে"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2216 ../mail/mail-ops.c:2224
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13418,35 +13131,35 @@ msgstr ""
 "আউটপ�ট ফাইল  তৈরি করা সম�ভব হয়নি: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2239
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ডাটা লেখা সম�ভব হয়নি: %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, fuzzy, c-format
 msgid "Disconnecting from '%s'"
 msgstr "%s থেকে সংযোগ বিচ�ছিন�ন করা হচ�ছে"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, fuzzy, c-format
 msgid "Reconnecting to '%s'"
 msgstr "%s �র সাথে প�নরায় সংযোগ করা হচ�ছে"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2480
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s' অ�যাকাউন�ট অফলাইন অবস�থায় ব�যবহারের জন�য প�রস�ত�ত করা হচ�ছে"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2566
 msgid "Checking Service"
 msgstr "পরিসেবা পরীক�ষা করা হচ�ছে"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "বাতিল করা হচ�ছে ..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "মেইল প�রেরণ �বং গ�রহণ কর�ন"
 
@@ -13454,110 +13167,142 @@ msgstr "মেইল প�রেরণ �বং গ�রহণ কর�ন"
 msgid "Cancel _All"
 msgstr "সব বাতিল কর�ন (_A)"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "আপডেট করা হচ�ছে..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "অপেক�ষা করা হচ�ছে ..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "নত�নপ�রাপ�ত মেইল অন�সন�ধান করা হচ�ছে"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:217
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s-র জন�য পাসওয়ার�ড লিখ�ন"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:219
 msgid "Enter Passphrase"
 msgstr "পাসওয়ার�ড লিখ�ন"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:222
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s -�র জন�য পাসওয়ার�ড লিখ�ন"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:224
 msgid "Enter Password"
 msgstr "পাসওয়ার�ড লিখ�ন"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:266
 msgid "User canceled operation."
 msgstr "ব�যবহারকারীর দ�বারা কার�য বাতিল করা হয়েছে।"
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:660
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "উদ�দিষ�ট ঠিকানা উল�লিখিত না হওয়ার ফলে, বার�তা অন�বর�তন বাতিল করা হয়েছে।"
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:666
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "ব�যবহারযোগ�য কোনো অ�যাকাউন�ট পাওয়া যায়নি, বার�তা অন�বর�তন বাতিল করা হয়েছে।"
 
-#: ../mail/mail-tools.c:123
-#, c-format
-msgid "Could not create spool directory `%s': %s"
+#: ../mail/mail-tools.c:119
+#, fuzzy, c-format
+msgid "Could not create spool directory '%s': %s"
 msgstr "`%s' স�প�ল ডিরেক�টরিটি তৈরি করা যায়নি: %s"
 
-#: ../mail/mail-tools.c:153
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+#: ../mail/mail-tools.c:149
+#, fuzzy, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "�কটি non-mbox উত�স `%s'-কে movemail করার চেষ�টা হচ�ছে"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "ফরওয়ার�ড করা বার�তা - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "ফরওয়ার�ড করা বার�তা"
 
-#: ../mail/mail-tools.c:301
-#, c-format
-msgid "Invalid folder: `%s'"
+#: ../mail/mail-tools.c:297
+#, fuzzy, c-format
+msgid "Invalid folder: '%s'"
 msgstr "অবৈধ ফোল�ডার: `%s'"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "উল�লিখিত অন�সন�ধান ফোল�ডার স�থাপন করা হচ�ছে: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:229
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s:%s'-র জন�য অন�সন�ধানের ফোল�ডার আপডেট করা হচ�ছে"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:236
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s'-র জন�য অন�সন�ধানের ফোল�ডার আপডেট করা হচ�ছে"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:679
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-vfolder.c:1191
 msgid "Edit Search Folder"
 msgstr "অন�সন�ধানের ফোল�ডার সম�পাদনা"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1296
 msgid "New Search Folder"
 msgstr "নত�ন অন�সন�ধানের ফোল�ডার"
 
 #: ../mail/mail.error.xml.h:1
+#, fuzzy
+msgid "\"Check Junk\" Failed"
+msgstr "অবাঞ�ছিত বার�তা পরীক�ষণ ব�যর�থ"
+
+#: ../mail/mail.error.xml.h:2
+#, fuzzy
+msgid "\"Report Junk\" Failed"
+msgstr "অবাঞ�ছিত বার�তার সূচনা প�রদানে ব�যর�থ"
+
+#: ../mail/mail.error.xml.h:3
+#, fuzzy
+msgid "\"Report Not Junk\" Failed"
+msgstr "অবাঞ�ছিত না হওয়া বার�তার সূচনা প�রদানে ব�যর�থ"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 "\"{0}\" নামের �কটি ফোল�ডার বর�তমানে উপস�থিত আছে। অন�গ�রহ করে অন�য �কটি নাম নির�বাচন "
 "কর�ন।"
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 "\"{1}\" নামের �কটি ফোল�ডার বর�তমানে উপস�থিত আছে। অন�গ�রহ করে অন�য �কটি নাম নির�বাচন "
 "কর�ন।"
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13569,7 +13314,7 @@ msgstr ""
 "আপনি �ই ফোল�ডারটি উপেক�ষা করতে, নত�ন করে লিখতে অথবা �র মধ�যে অন�তর�ভ�ক�ত বস�ত� যোগ "
 "করতে পারেন, অথবা প�রস�থান করতে পারেন।"
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13577,7 +13322,7 @@ msgstr ""
 "\"{1}\"-র জন�য মেইল প�রাপ�তিস�বীকারের অন�রোধ করা হয়েছে।  প�রাপ�তি স�বীকারের সূচনা {0}-"
 "� প�রেরিত হবে কি?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
@@ -13585,7 +13330,7 @@ msgstr ""
 "\"{0}\" নামের �কটি স�বাক�ষর বর�তমানে উপস�থিত আছে। অন�গ�রহ করে অন�য �কটি নাম নির�বাচন "
 "কর�ন।"
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13593,24 +13338,20 @@ msgstr ""
 "আপনার বার�তায় �কটি বোধগম�য বিষয় উল�লেখ করা থাকলে প�রাপকরা তার অন�তর�ভ�ক�ত বস�ত� সম�পর�কে "
 "জানতে সক�ষম হবেন।"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 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:13
 msgid "Are you sure you want to delete this account?"
 msgstr "�ই অ�যাকাউন�টটি ম�ছে ফেলার বিষয়ে কি আপনি নিশ�চিত?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "আপনি কি �ই অ�যাকাউন�ট ও �র সাথে য�ক�ত সমস�ত প�রক�সি ম�ছে ফেলতে ইচ�ছ�ক?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "আপনি কি নিশ�চিতরূপে {0}-টি বার�তা খ�লতে ইচ�ছ�ক?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13618,7 +13359,7 @@ msgstr ""
 "আপনি কি সমস�ত ফোল�ডারে অবস�থিত ম�ছে ফেলা বার�তাগ�লি স�থায়ীরূপে ম�ছে ফেলার বিষয়ে "
 "নিশ�চিত?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13626,89 +13367,82 @@ msgstr ""
 "আপনি কি  \"{0}\" ফোল�ডারে অবস�থিত ম�ছে ফেলা বার�তাগ�লি স�থায়ীরূপে ম�ছে ফেলার বিষয়ে "
 "নিশ�চিত?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 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:18
 #, fuzzy
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "আপনি কি শ�ধ�মাত�র অপ�রকাশিত অন�লিপি প�রাপকসহ বার�তা প�রেরণ করার বিষয়ে নিশ�চিত?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 #, fuzzy
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "আপনি কি শ�ধ�মাত�র অপ�রকাশিত অন�লিপি প�রাপকসহ বার�তা প�রেরণ করার বিষয়ে নিশ�চিত?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "আপনি কি শ�ধ�মাত�র অপ�রকাশিত অন�লিপি প�রাপকসহ বার�তা প�রেরণ করার বিষয়ে নিশ�চিত?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "আপনি কি প�রসঙ�গ উল�লৈখ না করে বার�তা প�রেরণ করার বিষয়ে নিশ�চিত?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "\"{0}\"-র দর�ন।"
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "\"{2}\"-র দর�ন।"
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "স�বাক�ষর ফা�কা"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "অন�সন�ধানের ফোল�ডার \"{0}\" যোগ করা যায়নি।"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "ফোল�ডার \"{0}\", \"{1}\"-� কপি করা সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "ফোল�ডার \"{0}\" নির�মাণ করা সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "অস�থায়ী সংরক�ষণের ডিরেক�টরি তৈরি করা সম�ভব হয়নি।"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "\"{1}\"-র দর�ন সংরক�ষণের ডিরেক�টরি নির�মাণ করা যায়নি"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "ফোল�ডার \"{0}\" ম�ছে ফেলা সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "সিস�টেম ফোল�ডার  \"{0}\" ম�ছে ফেলা সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "অন�পস�থিত অন�সন�ধানের ফোল�ডার  \"{0}\" সম�পাদন করা সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "ফোল�ডার  \"{0}\" কে \"{1}\"-� সরানো সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
+#: ../mail/mail.error.xml.h:32
+#, fuzzy
+msgid "Cannot open source \"{1}\"."
 msgstr "উৎস \"{1}\" খোলা সম�ভব নয়"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "উৎস \"{2}\" খোলা সম�ভব নয়"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "\"{2}\" গন�তব�যস�থল খোলা সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13716,35 +13450,31 @@ msgstr ""
 "ইনস�টলেশন জড়িত সমস�যার জন�য  \"{0}\" লাইসেন�স ফাইলটি পড়া সম�ভব হয়নি।  লাইসেন�স "
 "গ�রহণ না করা অবধি আপনি �ই উপলব�ধকারীর পরিসেবা ব�যবহার করতে সক�ষম হবেন না।"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" থেকে  \"{1}\"-� নাম পরিবর�তন করা সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "সিস�টেম ফোল�ডার \"{0}\"-র নাম পরিবর�তন করা অথবা সরানো সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "অ�যাকাউন�টে পরিবর�তন সংরক�ষণ করা সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "ডিরেক�টরি \"{0}\"-তে সংরক�ষণ করতে ব�যর�থ।"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "\"{0}\" ফাইলে সংরক�ষণ করা সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "স�বাক�ষরের স�ক�রিপ�ট \"{0}\" স�থাপন করা সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "অবাঞ�ছিত বার�তা পরীক�ষণ ব�যর�থ"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13753,79 +13483,83 @@ msgstr ""
 "বড় �বং ছোট হাতের অক�ষর সম�পর�কে সচেতন থাকে; আপনার ক�যাপস-লক বাটনটি সক�রিয় থাকতে "
 "পারে।"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "স�বাক�ষরের ফাইলটি সংরক�ষণ করা সম�ভব হয়নি।"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "\"{0}\" অন�সন�ধানের ফোল�ডারের বার�তা ম�ছে ফেলা হবে কি?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Do not d_elete"
 msgstr "ম�ছে ফেলা হবে না (_e)"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "ম�ছে ফেলা হবে না"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "নিষ�ক�রিয় করা হবে"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "অফ-লাইন ব�যবহারের জন�য চিহ�নিত ফোল�ডারগ�লি কি স�থানীয়ভাবে স�সংগত করা হবে?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "সমস�ত বার�তা পড়া-হয়েছে হিসাবে চিহ�নিত করা হবে কি?"
 
 # msgstr "পরিবর�তিনগ�লি বাতিল করা হবে কি?"
 # imho..the msgid contains a typo
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "আপনি কি পরিবর�তনগ�লি সংরক�ষণ করতে ইচ�ছ�ক?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "পাসওয়ার�ড লিখ�ন।"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "ফিল�টার সম�বন�ধীয় তথ�য লোড করতে সমস�যা হয়েছে।"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "কর�মচালনার সময়ে সমস�যা দেখা দিয়েছে।"
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "{0} -র সময় সমস�যা হয়েছে।"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "ফাইলটি উপস�থিত আছে কিন�ত� ম�ছে লেখা সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "ফাইলটি বর�তমানে উপস�থিত নেই কিন�ত� �টি কোনো সাধারণ ফাইল নয়।"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "�গিয়ে গেলে আপনি �ই বার�তাগ�লি প�নরায় উদ�ধার করতে পারবে না।"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
+#, fuzzy
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
 "আপনি �ই ফোল�ডারটি ম�ছে ফেললে, �তে উপস�থিত সমস�ত বস�ত� �বং সাবফোল�ডার স�থায়ীভাবে ম�ছে "
 "যাবে।"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 #, fuzzy
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
@@ -13833,11 +13567,11 @@ msgstr ""
 "আপনি �ই ফোল�ডারটি ম�ছে ফেললে, �তে উপস�থিত সমস�ত বস�ত� �বং সাবফোল�ডার স�থায়ীভাবে ম�ছে "
 "যাবে।"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "�গিয়ে গেলে, সমস�ত প�রক�সি অ�যাকাউন�ট স�থায়ীরূপে ম�ছে যাবে।"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13845,34 +13579,34 @@ msgstr ""
 "�গিয়ে গেলে, �ই অ�যাকাউন�ট ও প�রক�সি সংক�রান�ত\n"
 "সমস�ত তথ�য স�থায়ীরূপে ম�ছে যাবে।"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "�গিয়ে গেলে, �ই অ�যাকাউন�ট সংক�রান�ত তথ�য স�থায়ীরূপে ম�ছে যাবে।"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
 "�খন প�রস�থান করলে, Evolution প�নরায় আরম�ভ না করা হলে �ই বার�তাগ�লি প�রেরিত হবে না।"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "উপেক�ষা করা হবে"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "অবৈধ অন�মোদন"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "মেইল ম�ছে ফেলতে ব�যর�থ"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "মেইল ফিল�টার স�বযংক�রিয়ভাবে আপডেট করা হয়েছে।"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13884,30 +13618,30 @@ msgstr ""
 "প�রাপকদের তালিকা প�রকাশিত হবে। �ই সম�ভাবনা �ড়াতে অন�তত �কটি  প�রাপক: অথবা অন�লিপি "
 "প�রাপক:-র নাম উল�লেখ কর�ন। "
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "অন�পস�থিত ফোল�ডার।"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "কোনো উত�স বাছাই করা হয়নি।"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 "�ক সময়ে অনেকগ�লি বার�তা পড়ার প�রচেষ�টা করা হলে অত�যাধিক সময় ব�যয় হওয়ার সম�ভাবনা "
 "রয়েছে।"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Please check your account settings and try again."
 msgstr "অন�গ�রহ করে আপনার অ�যাকাউন�টের বৈশিষ�ট�য পরীক�ষা করে প�নরায় চেষ�টা কর�ন।"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Please enable the account or send using another account."
 msgstr ""
 "অন�গ�রহ করে অ�যাকাউন�ট সক�রিয় কর�ন অথবা �কটি পৃথক অ�যাকাউন�ট ব�যবহার করে প�রেরণ কর�ন।"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 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."
@@ -13916,7 +13650,7 @@ msgstr ""
 "পাশে অবস�থিত প�রাপক: বাটনটিতে টিপে আপনি ই-মেইল ঠিকানার খো�জ করতে পারবেন।"
 
 # not sure
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13926,64 +13660,56 @@ msgstr ""
 "কর�ন:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "�ই স�বাক�ষরের জন�য �কটি স�বতন�ত�র নাম লিখ�ন।"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "অন�গ�রহ করে প�রতীক�ষা কর�ন।"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "প�রানো মেইল ফোল�ডার \"{0}\" মাইগ�রেট করাতে সমস�যা দেখা দিয়েছে।"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "সমর�থিত অন�মোদন ব�যবস�থার তালিকা প�রাপ�ত করতে সার�ভারে অন�সন�ধান করা হচ�ছে।"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "মেইল-পাঠের সূচনার অন�রোধ করা হয়েছে।"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "ফোল�ডার \"{0}\" �বং �র সকল সাবফোল�ডারগ�লি কি নিশ�চিতরূপে ম�ছে ফেলা হবে?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 #, fuzzy
 msgid "Really delete folder \"{0}\"?"
 msgstr "ফোল�ডার \"{0}\" ম�ছে ফেলা সম�ভব নয়।"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "অবাঞ�ছিত বার�তার সূচনা প�রদানে ব�যর�থ"
-
 #: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "অবাঞ�ছিত না হওয়া বার�তার সূচনা প�রদানে ব�যর�থ"
-
-#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "অন�সন�ধানের ফোল�ডার স�বয়ংক�রিয়ভাবে আপডেট করা হয়েছে।"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "মেইল-পাঠের সূচনা প�রেরণ কর�ন"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "�ই স�বাক�ষর বর�তমানে উপস�থিত রয়েছে"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "স�সংগত কর�ন"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "অফ-লাইন ব�যবহারের উদ�দেশ�যে ফোল�ডারগ�লি স�থানীয়রূপে স�সংগত করা হবে কি?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13991,7 +13717,7 @@ msgstr ""
 "Evolution সঠিকভাবে চালনা করতে হলে সিস�টেম ফোল�ডারের প�রয়োজন আছে �বং �গ�লি সরানো, "
 "ম�ছে ফেলা �বং নাম পরিবর�তন করা যাবে না।"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14008,51 +13734,23 @@ msgstr ""
 "প�রাপকদের তালিকা প�রকাশিত হবে। �ই সম�ভাবনা �ড়াতে অন�তত �কটি  প�রাপক: অথবা অন�লিপি "
 "প�রাপক:-র নাম উল�লেখ কর�ন। "
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"নিম�নলিখিত অন�সন�ধানের ফোল�ডার(গ�লি) দ�বারা:\n"
-"{0}\n"
-"অপসারিত ফোল�ডার ব�যবহার করা হত:\n"
-"    \"{1}\"\n"
-"�ই সংক�রান�ত তথ�য �খন আপডেট করা হয়েছে।"
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"নিম�নলিখিত ফিল�টারের নিয়ম(গ�লি)-র দ�বারা:\n"
-"{0}\n"
-"অপসারিত ফোল�ডার ব�যবহার করা হত:\n"
-"    \"{1}\"\n"
-"�ই সংক�রান�ত তথ�য �খন আপডেট করা হয়েছে।"
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "স�ক�রিপ�ট ফাইলটি উপস�থিত �বং কার�যকরী হওয়া আবশ�যক।"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14060,18 +13758,18 @@ msgstr ""
 "�ই ফোল�ডারটি ঊহ�যভাবে যোগ করা হয়েছে, প�রয়োজনে অন�সন�ধানে ফোল�ডার �ডিটার থেকে �টিকে "
 "স�পষ�টভাবে যোগ কর�ন।"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "প�রেরণের জন�য চিহ�নিত অ�যাকাউন�ট সক�রিয় না থাকার ফলে বার�তা প�রেরণ করা যায়নি"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "কোনো প�রাপক উল�লেখ না করার দর�ন �ই বার�তাটি প�রেরণ করা সম�ভব নয়"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14079,11 +13777,11 @@ msgstr ""
 "�ই সার�ভারটি প�রার�থিত অন�মোদনের ধরন সমর�থন করতে অক�ষম �বং সম�ভবত কোনো "
 "অন�মোদনপ�রক�রিয়া সমর�থন করে না।"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "�ই স�বাক�ষরটি পরিবর�তন করা হয়েছে, কিন�ত� সংরক�ষণ করা হয়নি।"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14091,11 +13789,11 @@ msgstr ""
 "নির�বাচিত ফোল�ডার ও সেটির সাব-ফোল�ডারের মধ�যে উপস�থিত সমস�ত বার�তা পড়া-হয়েছে হিসাবে "
 "চিহ�নিত করা হবে"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise সার�ভারের সাথে সংযোগ স�থাপন করতে ব�যর�থ।"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14103,19 +13801,19 @@ msgstr ""
 "�ই অ�যাকাউন�টের জন�য খসড়া ফোল�ডার খোলা যাচ�ছে না।  �র পরিবর�তে সিস�টেমের ডিফল�ট খসড়া "
 "ফোল�ডার ব�যবহার করা হবে কি?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "লাইসেন�স ফাইল পড়তে ব�যর�থ।"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "ডিফল�ট মান ব�যবহার করা হবে (_D)"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "ডিফল�ট খসড়া ফোল�ডার ব�যবহার করা হবে কি?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -14125,31 +13823,31 @@ msgstr ""
 "�কটি ফোল�ডার থেকে সংশ�লিষ�ট মূল বার�তাটি ম�ছে যাবে।\n"
 "আপনি কি নিশ�চিতরূপে �গিয়ে যেতে ইচ�ছ�ক?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:117
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "�ই বার�তা ম�ছে ফেলার জন�য পর�যাপ�ত অন�মতি আপনার নেই।"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:118
 msgid "You have not filled in all of the required information."
 msgstr "আপনি সকল প�রয়োজনীয় তথ�য প�রণ করেননি।"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:119
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "প�রেরিত হয়নি �মন বার�তা আছে, আপনি কি প�রস�থান করতে ইচ�ছ�ক?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:120
 msgid "You may not create two accounts with the same name."
 msgstr "�ক নামে আপনি �কাধিক অ�যাকাউন�ট করতে পারবেন না।"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "চিহ�নিত অন�সন�ধানের ফোল�ডারের নাম উল�লেখ করা আবশ�যক"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "আপনাকে �কটি ফোল�ডার নির�দিষ�ট করতে হবে।"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14159,115 +13857,111 @@ msgstr ""
 "ফোল�ডারগ�লিকে পৃথকভাবে �বং/অথবা সকল স�থানীয় ফোল�ডার, দূরবর�তী ফোল�ডার �কসাথে নির�বাচন "
 "করে, অথবা দ�ই।"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:125
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "আপনার সার�ভার \"{0}\"-� আপনার লগ-ইন \"{0}\" ব�যর�থ হয়েছে।"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "শেষে যোগ করা হবে (_A)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "পরিবর�তন বাতিল করা হবে (_D)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:128
 msgid "_Do not Synchronize"
 msgstr "স�সংগত করা হবে না (_D)"
 
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:866
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:821
 msgid "_Empty Trash"
 msgstr "আবর�জনা ফা�কা করা হবে (_E)"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "স�থায়ীরূপে বর�জন করা হবে (_E)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "খোলা বার�তা (_O)"
 
-#: ../mail/message-list.c:1119
+#: ../mail/message-list.c:1110
 msgid "Unseen"
 msgstr "পড়া হয়নি"
 
-#: ../mail/message-list.c:1120
+#: ../mail/message-list.c:1111
 msgid "Seen"
 msgstr "পড়া হয়েছে"
 
-#: ../mail/message-list.c:1121
+#: ../mail/message-list.c:1112
 msgid "Answered"
 msgstr "উত�তর দেওয়া হয়েছে"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1113
 msgid "Forwarded"
 msgstr "ফরওয়ার�ড করা হয়েছে"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1114
 msgid "Multiple Unseen Messages"
 msgstr "�কাধিক না পড়া বার�তা"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1115
 msgid "Multiple Messages"
 msgstr "�কাধিক বার�তা"
 
-#: ../mail/message-list.c:1128
+#: ../mail/message-list.c:1119
 msgid "Lowest"
 msgstr "সর�বনিম�ন"
 
-#: ../mail/message-list.c:1129
+#: ../mail/message-list.c:1120
 msgid "Lower"
 msgstr "নিম�নতর"
 
-#: ../mail/message-list.c:1133
+#: ../mail/message-list.c:1124
 msgid "Higher"
 msgstr "উচ�চতর"
 
-#: ../mail/message-list.c:1134
+#: ../mail/message-list.c:1125
 msgid "Highest"
 msgstr "সর�বোত�তম"
 
-#: ../mail/message-list.c:1744 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1735 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1751 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1742 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "আজ %l:%M %p"
 
-#: ../mail/message-list.c:1760
+#: ../mail/message-list.c:1751
 msgid "Yesterday %l:%M %p"
 msgstr "গতকাল %l:%M %p"
 
-#: ../mail/message-list.c:1772
+#: ../mail/message-list.c:1763
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1780
+#: ../mail/message-list.c:1771
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1782
+#: ../mail/message-list.c:1773
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2528
+#: ../mail/message-list.c:2518
 msgid "Select all visible messages"
 msgstr "সকল দৃশ�যমান বার�তা নির�বাচন কর�ন"
 
-#: ../mail/message-list.c:2579 ../shell/e-shell-view.c:729
-msgid "Shell Backend"
-msgstr ""
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4434 ../mail/message-list.c:4932
+#: ../mail/message-list.c:4199 ../mail/message-list.c:4595
 msgid "Generating message list"
 msgstr "বার�তার তালিকা প�রস�ত�ত করা হচ�ছে"
 
-#: ../mail/message-list.c:4763
+#: ../mail/message-list.c:4432
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14275,15 +13969,7 @@ msgstr ""
 "অন�সন�ধানের মান অন�যায়ী কোনো বার�তা চিহ�নিত করা হয়নি। অন�সন�ধান->ম�ছে ফেল�ন শীর�ষক মেন� "
 "থেকে �ই অন�সন�ধান ম�ছে ফেল�ন অথবা �টি পরিবর�তন কর�ন।"
 
-#: ../mail/message-list.c:4765
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"�ই ফোল�ডারের মধ�যে শ�ধ�মাত�র আড়াল করা বার�তা উপস�থিত রয়েছে। বার�তাগ�লি প�রদর�শন করা জন�য "
-"প�রদর�শন->আড়াল করা বার�তা প�রদর�শন কর�ন শীর�ষক মেন� প�রয়োগ কর�ন।"
-
-#: ../mail/message-list.c:4767
+#: ../mail/message-list.c:4434
 msgid "There are no messages in this folder."
 msgstr "�ই ফোল�ডারের মধ�যে কোনো বার�তা উপস�থিত নেই।"
 
@@ -14321,27 +14007,27 @@ msgid "Subject - Trimmed"
 msgstr "বিষয় - ছা�টাই করা"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Body contains"
 msgstr "মূল স�থানে অন�তর�ভ�ক�ত"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Message contains"
 msgstr "বার�তায় অন�তর�ভ�ক�ত"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Recipients contain"
 msgstr "প�রাপকে অন�তর�ভ�ক�ত"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Sender contains"
 msgstr "প�রেরকে অন�তর�ভ�ক�ত আছেন"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Subject contains"
 msgstr "বিষয়ে অন�তর�ভ�ক�ত আছে"
 
@@ -14375,16 +14061,16 @@ msgstr ""
 "দেওয়া হয়। অর�থাৎ, ব�যবহৃত সংযোগটি নিরাপদ হবে না ও নিরাপত�তার হানিকারী অন�প�রবেশের "
 "শিকার হতে পারেন।"
 
-#: ../modules/addressbook/addressbook-config.c:592
+#: ../modules/addressbook/addressbook-config.c:602
 #, fuzzy
-msgid "Use in _Birthday & Anniversaries calendar"
+msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "জন�মদিন �বং বার�ষিকী"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "অফলাইন কর�মের জন�য বইয়ের বিষয়বস�ত� স�থানীয় অবস�থানে কপি কর�ন (_b)"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -14394,7 +14080,7 @@ msgstr ""
 "(Standard) পোর�টের �কটি তালিকা প�রদান করা হল। কোন পোর�টটি আপনার উল�লেখ করা "
 "উচিৎতা জানতে হলে আপনার সিস�টেম অ�যাডমিনস�ট�রেটরকে জিজ�ঞাসা কর�ন।"
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14404,7 +14090,7 @@ msgstr ""
 "\"ই-মেইল ঠিকানা\" লেখা হলে LDAP সার�ভারের মধ�যে বিনা নামে প�রবেশের অধিকার থাকা "
 "আবশ�যক।"
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -14417,30 +14103,30 @@ msgstr ""
 "যদি হয় \"one\" (�ক), তবে আপনার নির�ধারিত অন�সন�ধানের স�থানের শ�ধ�মাত�র �ক ধাপ নীচ "
 "পর�যন�ত অন�সন�ধান চালানো হবে।"
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "সার�ভার সংক�রান�ত তথ�য"
 
-#: ../modules/addressbook/addressbook-config.c:996
+#: ../modules/addressbook/addressbook-config.c:1016
 #: ../smime/gui/smime-ui.ui.h:14
 msgid "Details"
 msgstr "বিবরণ"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "অন�সন�ধান"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "ডাউনলোড ব�যবস�থা"
 
 # FIXME
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "ঠিকানাবইয়ের বৈশিষ�ট�য"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "নত�ন ঠিকানাবই"
 
@@ -14522,8 +14208,11 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "পূর�বদৃশ�য পেইন প�রদর�শন করা হবে কি না।"
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
+#: ../modules/mail/em-mailer-prefs.c:1158
+#, fuzzy
+msgid "_Table column:"
 msgstr "টেবিলের কলাম:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
@@ -14536,7 +14225,7 @@ msgstr "সà§�বয়ংকà§�রিয়ভাবে সমà§�পূরà§�ণ কà
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "LDAP সার�ভারের মধ�যে"
 
@@ -14546,7 +14235,7 @@ msgid "_Contact"
 msgstr "পরিচিতি (_C)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "নত�ন পরিচিতি নির�মাণ"
 
@@ -14556,7 +14245,7 @@ msgid "Contact _List"
 msgstr "পরিচিতি তালিকা (_L)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "নত�ন পরিচিতি তালিকা নির�মাণ"
 
@@ -14566,7 +14255,7 @@ msgid "Address _Book"
 msgstr "ঠিকানাবই (_B)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "নত�ন ঠিকানা বই নির�মাণ"
 
@@ -14574,371 +14263,258 @@ msgstr "নত�ন ঠিকানা বই নির�মাণ"
 #: ../modules/addressbook/e-book-shell-backend.c:376
 #: ../modules/addressbook/e-book-shell-view.c:394
 #: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "পরিচিতি"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-#, fuzzy
-msgid "Source List"
-msgstr "উৎস"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-#, fuzzy
-msgid "The registry of address books"
-msgstr "ঠিকানা-বইয়ের তালিকা পাওয়া যায়নি"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-#, fuzzy
-msgid "Current View"
-msgstr "বর�তমান প�রদর�শনক�ষেত�র (_C)"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr ""
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-#, fuzzy
-msgid "Previewed Contact"
-msgstr "নত�ন পরিচিতি"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-#, fuzzy
-msgid "The contact being shown in the preview pane"
-msgstr "পূর�বদৃশ�য পেইন প�রদর�শন করা হবে কি না।"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-#, fuzzy
-msgid "Preview is Visible"
-msgstr "পার�শ�ববর�তী বার প�রদর�শিত হচ�ছে"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-#, fuzzy
-msgid "Whether the preview pane is visible"
-msgstr "পূর�বদৃশ�য পেইন প�রদর�শন করা হবে কি না।"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP সার�ভার"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "স�বয়ংক�রিয়ভাবে সম�পূর�ণ করার প�রক�রিয়া সংক�রান�ত বৈশিষ�ট�য"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-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 ""
-"Evolution পরিচিতির ফোল�ডারের অবস�থান �বং অন�ক�রম Evolution ১.x-র পরবর�তী সংস�করণে "
-"পরিবর�তিত হয়েছে।\n"
-"\n"
-"Evolution-র দ�বারা আপনার ফোল�ডার মাইগ�রেট করা হচ�ছে, অন�গ�রহ করে অপেক�ষা কর�ন..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"মেইলিং লিস�টের পরিচিতির ফরমা পরিবর�তিত হয়েছে।\n"
-"\n"
-"Evolution-র দ�বারা আপনার ফোল�ডার মাইগ�রেট করা হচ�ছে, অন�গ�রহ করে অপেক�ষা কর�ন..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution-র দ�বারা ফোন নম�বর সংরক�ষণ প�রক�রিয়া পরিবর�তিত হয়েছে।\n"
-"\n"
-"Evolution-র দ�বারা আপনার ফোল�ডার মাইগ�রেট করা হচ�ছে, অন�গ�রহ করে অপেক�ষা কর�ন..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolution-র Palm Sync changelog �বং ম�যাপ ফাইলগ�লি পরিবর�তন করা হয়েছে।\n"
-"\n"
-"Evolution-র দ�বারা আপনার পাইলট সিঙ�ক তথ�য মাইগ�রেট করা হচ�ছে, অন�গ�রহ করে অপেক�ষা "
-"কর�ন..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:763
-#: ../modules/calendar/e-memo-shell-sidebar.c:689
-#: ../modules/calendar/e-task-shell-sidebar.c:689
-#, fuzzy
-msgid "Source Selector Widget"
-msgstr "কর�মসূচী উৎ‌স নির�বাচক"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-#, fuzzy
-msgid "This widget displays groups of address books"
-msgstr "ঠিকানা-বইয়ের তালিকা পাওয়া যায়নি"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 #, fuzzy
 msgid "Save as vCard"
 msgstr "vCard হিসাবে সংরক�ষণ করা হবে..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "সমস�ত পরিচিতি চিহ�নিত স�থানে কপি করা হবে...(_p)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 #, fuzzy
 msgid "Copy the contacts of the selected address book to another"
 msgstr "নির�বাচিত ফোল�ডারের মধ�যে অন�তর�ভ�ক�ত পরিচিতি অন�য �কটি ফোল�ডারে কপি কর�ন"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 #, fuzzy
 msgid "D_elete Address Book"
 msgstr "ঠিকানা বই ম�ছে ফেল�ন (_e)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 #, fuzzy
 msgid "Delete the selected address book"
 msgstr "নির�বাচিত ফোল�ডার ম�ছে ফেল�ন"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "সমস�ত পরিচিতি চিহ�নিত স�থানে স�থানান�তর করা হবে...(_v)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 #, fuzzy
 msgid "Move the contacts of the selected address book to another"
 msgstr ""
 "নির�বাচিত ফোল�ডারের মধ�যে অন�তর�ভ�ক�ত সমস�ত পরিচিতির তালিকা �কটি পৃথক ফোল�ডারের "
 "স�থানান�তর কর�ন"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "নত�ন ঠিকানাবই (_N)"
 
 # FIXME
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "ঠিকানাবইয়ের বৈশিষ�ট�য (_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 #, fuzzy
 msgid "Show properties of the selected address book"
 msgstr "নির�বাচিত ফোল�ডারের বৈশিষ�ট�য পরিবর�তন কর�ন"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/mail/e-mail-shell-view-actions.c:905
 msgid "_Rename..."
 msgstr "নাম পরিবর�তন কর�ন...(_R)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 #, fuzzy
 msgid "Rename the selected address book"
 msgstr "নির�বাচিত ফোল�ডারের নাম পরিবর�তন কর�ন"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 #, fuzzy
 msgid "S_ave Address Book as vCard"
 msgstr "VCard রূপে ঠিকানা বই সংরক�ষণ করা হবে (_a)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 #, fuzzy
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "নির�বাচিত ফোল�ডারের পরিচিতি তালিকা VCard রূপে সংরক�ষণ করা হবে"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 #, fuzzy
 msgid "Stop loading"
 msgstr "লোড করার প�রক�রিয়া স�থগিত কর�ন"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 #, fuzzy
 msgid "_Copy Contact To..."
 msgstr "চিহ�নিত স�থানে পরিচিতি কপি কর�ন...(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 #, fuzzy
 msgid "Copy selected contacts to another address book"
 msgstr "নির�বাচিত পরিচিতিদের তথ�য অন�য ফোল�ডারে কপি কর�ন"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "পরিচিতি ম�ছে ফেল�ন (_D)"
 
 # FIXME
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 #, fuzzy
 msgid "_Find in Contact..."
 msgstr "পরিচিতি ফরওয়ার�ড কর�ন...(_F)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 #, fuzzy
 msgid "Search for text in the displayed contact"
 msgstr "প�রদর�শিত বার�তার মূল অংশে টেক�সটটি অন�সন�ধান কর�ন"
 
 # FIXME
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "পরিচিতি ফরওয়ার�ড কর�ন...(_F)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "নির�বাচিত পরিচিতিদের তথ�য অন�য কোনো ব�যক�তিকে পাঠিয়ে দিন"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 #, fuzzy
 msgid "_Move Contact To..."
 msgstr "পরিচিতি চিহ�নিত অবস�থানে স�থানান�তর কর�ন...(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 #, fuzzy
 msgid "Move selected contacts to another address book"
 msgstr "নির�বাচিত পরিচিতিদের তথ�য অন�য �কটি ফোল�ডারে সরিয়ে ফেল�ন"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "নত�ন পরিচিতি...(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "নত�ন পরিচিতি তালিকা...(_L)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 #, fuzzy
 msgid "_Open Contact"
 msgstr "পরিচিতি (_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "বর�তমান পরিচিতি দেখ�ন"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "�ই পরিচিতির নিকট বার�তা প�রেরণ কর�ন...(_S)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "নির�বাচিত পরিচিতিদের নিকট বার�তা প�রেরণ কর�ন"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "_Actions"
 msgstr "কর�ম (_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 #: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1094
+#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "_Preview"
 msgstr "পূর�বদৃশ�য (_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "_Delete"
 msgstr "ম�ছে ফেল�ন (_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "বিবিধ বৈশিষ�ট�য (_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "vCard হিসাবে সংরক�ষণ কর�ন...(_S)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "পরিচিতির তথ�যের পূর�বদৃশ�য (_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "পরিচিতি পূর�বদৃশ�যের উইন�ডোটি প�রদর�শন করা হবে"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 #: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/calendar/e-task-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Classic View"
 msgstr "পারম�পরিক প�রদর�শন(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 #, fuzzy
 msgid "Show contact preview below the contact list"
 msgstr "বার�তা-তলিকায় নীচে বার�তা পূর�বদৃশ�য করা হবে"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 #: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/calendar/e-task-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Vertical View"
 msgstr "উলম�ব দিশায় প�রদর�শন (_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 #, fuzzy
 msgid "Show contact preview alongside the contact list"
 msgstr "পরিচিতি পূর�বদৃশ�যের উইন�ডোটি প�রদর�শন করা হবে"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Any Category"
 msgstr "যেকোনো শ�রেণী"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/calendar/e-task-shell-view-actions.c:941
 msgid "Unmatched"
 msgstr "গরমিল"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
-#: ../shell/e-shell-content.c:516
+#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../shell/e-shell-content.c:441
 msgid "Advanced Search"
 msgstr "উন�নত অন�সন�ধান প�রক�রিয়া"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 #, fuzzy
 msgid "Print all shown contacts"
 msgstr "নির�বাচিত পরিচিতি প�রিন�ট কর�ন"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 #, fuzzy
 msgid "Preview the contacts to be printed"
 msgstr "যে পরিচিতিগ�লি প�রিন�ট করা হবে তার পূর�বদৃশ�য করে"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "নির�বাচিত পরিচিতি প�রিন�ট কর�ন"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "vCard হিসাবে সংরক�ষণ করা হবে..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 #, fuzzy
 msgid "Save selected contacts as a vCard"
 msgstr "নির�বাচিত পরিচিতির তথ�য ভিকার�ড (VCard) হিসাবে সংরক�ষণ কর�ন"
@@ -14988,59 +14564,49 @@ msgstr "পরিচিতির তথ�য"
 msgid "Contact information for %s"
 msgstr "%s'র পরিচিতির তথ�য"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "১"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr ""
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr ""
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "৫"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr ""
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr ""
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "নির�ধারিত সীমা অতিক�রান�ত না অবধি �ই ঠিকানা বই ব�রাউজ কর�ন (_r)"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "লগ-ইন: (_g)"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 #, fuzzy
 msgid "One"
 msgstr "অন-লাইন"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "অন�সন�ধানের ফিল�টার"
 
 # FIXME: 'ভিত�তি' শব�দটার ব�যবহার ঠিক ভাল লাগতেছে না :-(
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "অন�সন�ধানের স�থান: (_b)"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "অন�সন�ধানের ফিল�টার:(_f)"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -15049,16 +14615,16 @@ msgstr ""
 "পরিবর�তন না করা হলে \"person\" নামক তথ�যের ভিত�তিতে অন�সন�ধান করা হবে।"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 #, fuzzy
 msgid "Sub"
 msgstr "রবি"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "সমর�থিত অন�সন�ধানের স�থান"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr ""
@@ -15066,40 +14632,40 @@ msgstr ""
 "ই-মেইল ঠিকানা ব�যবহৃত হবে\n"
 "Distinguished name ব�যবহৃত হবে (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 #, fuzzy
 msgid "Using email address"
 msgstr "ই-মেইল ঠিকানা (_A):"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "ডাউনলোডের সীমা: (_D)"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "সম�ভাব�য অন�সন�ধানের স�থান খো�জ কর�ন (_F)"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "লগ-ইন প�রক�রিয়া (_L):"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "পোর�ট: (_P)"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "অন�সন�ধানের ক�ষেত�র: (_S)"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "সময়সীমা: (_T)"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "স�রক�ষিত সংযোগ ব�যবহার কর�ন: (_U)"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "কার�ড"
 
@@ -15125,11 +14691,11 @@ msgstr "কাজের তালিকায় ইম�পোর�ট কর�
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-migrate.c:176
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "ওয়েবে"
 
@@ -15139,7 +14705,7 @@ msgid "Weather"
 msgstr "আবহাওয়া"
 
 #: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "জন�মদিন �বং বার�ষিকী"
 
@@ -15149,7 +14715,7 @@ msgid "_Appointment"
 msgstr "সাক�ষাৎকার (_A)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "�কটি নত�ন সাক�ষাৎকার তৈরি কর�ন"
 
@@ -15177,45 +14743,15 @@ msgid "Cale_ndar"
 msgstr "বর�ষপঞ�জি (_n)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "�কটি নত�ন বর�ষপঞ�জি তৈরি কর�ন"
 
 #: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../plugins/itip-formatter/itip-formatter.c:2651
 msgid "Calendar and Tasks"
 msgstr "বর�ষপঞ�জি ও কার�যতালিকা"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-#, fuzzy
-msgid "The registry of calendars"
-msgstr "প�রধান বর�ষপঞ�জি"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-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 ""
-"Evolution বর�ষপঞ�জির ফোল�ডারের অবস�থান �বং অন�ক�রম Evolution ১.x-�র পর থেকে "
-"পরিবর�তিত হয়েছে।\n"
-"\n"
-"Evolution আপনার ফোল�ডার মাইগ�রেট করছে অন�গ�রহ করে অপেক�ষা কর�ন..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "evolution/config.xmldb থেকে প�রোনো বৈশিষ�ট�যগ�লি পড়া সম�ভব হয়নি"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "`%s' বর�ষপঞ�জিটি মাইগ�রেট করা সম�ভব হয়নি"
-
 #: ../modules/calendar/e-cal-shell-sidebar.c:168
 #: ../modules/calendar/e-memo-shell-sidebar.c:163
 #: ../modules/calendar/e-task-shell-sidebar.c:163
@@ -15237,27 +14773,6 @@ msgstr "বর�ষপঞ�জি লোড করা হচ�ছে"
 msgid "Calendar Selector"
 msgstr "বর�ষপঞ�জির উৎ‌স নির�বাচক"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:743
-msgid "Date Navigator Widget"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:744
-msgid "This widget displays a miniature calendar"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:753
-#, fuzzy
-msgid "Default Calendar Client"
-msgstr "ডিফল�ট মেইল ক�লায়েন�ট"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:754
-msgid "Default client for calendar operations"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:764
-msgid "This widget displays groups of calendars"
-msgstr ""
-
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-cal-shell-sidebar.c:952
 #, fuzzy, c-format
@@ -15305,269 +14820,270 @@ msgstr "প�রেরণ করা বস�ত�"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
 #: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-task-shell-view-actions.c:612
 #, fuzzy
 msgid "Save as iCalendar"
 msgstr "বর�ষপঞ�জি নির�বাচন কর�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "কপি কর�ন...(_C)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 #, fuzzy
 msgid "D_elete Calendar"
 msgstr "বর�ষপঞ�জি নির�বাচন কর�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 #, fuzzy
 msgid "Delete the selected calendar"
 msgstr "নির�বাচিত ফোল�ডার ম�ছে ফেল�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 #, fuzzy
 msgid "Go Back"
 msgstr "পূর�বাবস�থায় যাও"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 #, fuzzy
 msgid "Go Forward"
 msgstr "�গিয়ে চল�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "আজকের তারিখ নির�বাচন কর�ন (_T)"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "আজকের তারিখ নির�বাচন কর�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "তারিখ নির�বাচন কর�ন(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "�কটি নির�দিষ�ট তারিখ নির�বাচন কর�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "নত�ন বর�ষপঞ�জি (_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Purg_e"
 msgstr "সম�পূর�ণরূপে ম�ছে ফেল�ন(_e)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Purge old appointments and meetings"
 msgstr "প�রোনো সাক�ষাৎকার �বং সভা সম�পূর�ণরূপে ম�ছে ফেল�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Re_fresh"
 msgstr "নত�ন করে প�রদর�শন (_f)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 #, fuzzy
 msgid "Refresh the selected calendar"
 msgstr "নির�বাচিত ফোল�ডারের নাম পরিবর�তন কর�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 #, fuzzy
 msgid "Rename the selected calendar"
 msgstr "নির�বাচিত ফোল�ডারের নাম পরিবর�তন কর�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 #, fuzzy
 msgid "Show _Only This Calendar"
 msgstr "শ�ধ�মাত�র �ই বর�ষপঞ�জি প�রদর�শন করা হবে (_o)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Cop_y to Calendar..."
 msgstr "বর�ষপঞ�জিতে কপি কর�ন...(_y)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "সভার কর�ম বন�টন কর�ন...(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 #, fuzzy
 msgid "_Delete Appointment"
 msgstr "সাক�ষাৎকার ম�ছে ফেল�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 #, fuzzy
 msgid "Delete selected appointments"
 msgstr "সাক�ষাৎকার ম�ছে ফেল�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 #, fuzzy
 msgid "Delete This _Occurrence"
 msgstr "�ই ঘটনাটি ম�ছে ফেল�ন (_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "�ই ঘটনাটি ম�ছে ফেল�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 #, fuzzy
 msgid "Delete All Occ_urrences"
 msgstr "সমস�ত ঘটনাগ�লি ম�ছে ফেল�ন (_A)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "সমস�ত উপস�থিতি ম�ছে ফেল�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 #, fuzzy
 msgid "New All Day _Event..."
 msgstr "নত�ন সমস�তদিনব�যাপী ঘটনা (_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 #, fuzzy
 msgid "Create a new all day event"
 msgstr "�কটি নত�ন সারাদিনব�যাপী সাক�ষাৎকার তৈরি কর�ন"
 
 # msgstr "সভার অন�সূচনা করে (_ম)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar হিসাবে ফরওয়ার�ড কর�ন...(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 #, fuzzy
 msgid "New _Meeting..."
 msgstr "নত�ন সভা(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 #, fuzzy
 msgid "Create a new meeting"
 msgstr "�কটি নত�ন সভার আবেদন তৈরি কর�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "বর�ষপঞ�জিতে স�থানান�তর কর�ন...(_v)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "নত�ন সাক�ষাৎকার...(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "�ই ঘটনাটি স�থানান�তরযোগ�য বানাও (_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "সাক�ষাৎকার খোলো(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "বর�তমান সাক�ষাৎকারটি প�রত�যক�ষ কর�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "প�রত�য�ত�তর(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 #, fuzzy
 msgid "Save as iCalendar..."
 msgstr "vCard হিসাবে সংরক�ষণ করা হবে..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "সভার অন�সূচী তৈরি কর�ন...(_S)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 #, fuzzy
 msgid "Converts an appointment to a meeting"
 msgstr "প�রোনো সাক�ষাৎকার �বং সভা সম�পূর�ণরূপে ম�ছে ফেল�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 #, fuzzy
 msgid "Conv_ert to Appointment..."
 msgstr "নত�ন সাক�ষাৎকার...(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 #, fuzzy
 msgid "Converts a meeting to an appointment"
 msgstr "%s সাক�ষাৎকার শেষ হওয়ার সময়"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#, fuzzy
+msgid "Quit"
+msgstr "প�রস�থান (_Q)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "দিন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "�কটি দিন প�রদর�শন করা হবে"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "তালিকা"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "তালিকা হিসাবে প�রদর�শন কর�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "মাস"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "�কটি মাস প�রদর�শন করা হবে"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "সপ�তাহ"
 
 # FIXME: is this a place ? or a instruction ?
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "�কটি সপ�তাহ প�রদর�শন করা হবে"
 
 # FIXME: is this a place ? or a instruction ?
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 #, fuzzy
 msgid "Show one work week"
 msgstr "�কটি সপ�তাহ প�রদর�শন করা হবে"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "সক�রিয় সাক�ষাৎকার"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "পরবর�তী ৭ দিনের সাক�ষাৎকার"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Description contains"
 msgstr "বিবরণে রয়েছে"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Summary contains"
 msgstr "সারাংশে রয়েছে"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "�ই বর�ষপঞ�জিটি প�রিন�ট কর�ন"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 #, fuzzy
 msgid "Preview the calendar to be printed"
 msgstr "যে বর�ষপঞ�জিটি প�রিন�ট করা হবে তার পূর�বদৃশ�য করে"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "চিহ�নিত স�থানে চল�ন"
 
@@ -15604,7 +15120,7 @@ msgstr "নিরà§�বাচিত করà§�মসূচী পà§�রদরà§�à
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 #: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Open _Web Page"
 msgstr "ওয়েব পেজ খ�ল�ন (_W)"
 
@@ -15619,23 +15135,23 @@ msgstr "নিরà§�বাচিত করà§�মসূচী পà§�রদরà§�à
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:610
 #, fuzzy
 msgid "task"
 msgstr "কাজ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:672
 msgid "_Assign Task"
 msgstr "কর�ম বরাদ�দ কর�ন (_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "_Mark as Complete"
 msgstr "সম�পন�ন হিসাবে চিহ�নিত করা হবে(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Mark selected tasks as complete"
 msgstr "নির�বাচিত কর�মগ�লি সম�পন�ন-রূপে চিহ�নিত কর�ন"
 
@@ -15644,42 +15160,42 @@ msgid "_Mark as Incomplete"
 msgstr "অসম�পন�ন হিসাবে চিহ�নিত করা হবে(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 #, fuzzy
 msgid "Mark selected tasks as incomplete"
 msgstr "নির�বাচিত কর�মগ�লি সম�পন�ন-রূপে চিহ�নিত কর�ন"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "New _Task"
 msgstr "নত�ন কার�য(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Create a new task"
 msgstr "�কটি নত�ন কাজ তৈরি কর�ন"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "_Open Task"
 msgstr "কর�ম খ�ল�ন (_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "View the selected task"
 msgstr "নির�বাচিত কর�মটি প�রদর�শন কর�ন"
 
 # msgstr "সভার অন�সূচনা করে (_ম)..."
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
 #: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 #, fuzzy
 msgid "_Save as iCalendar..."
 msgstr "iCalendar হিসাবে ফরওয়ার�ড কর�ন...(_F)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:998
 #, fuzzy
 msgid "Print the selected task"
 msgstr "নির�বাচিত কর�মটি প�রদর�শন কর�ন"
@@ -15711,16 +15227,6 @@ msgstr "কর�মসূচী"
 msgid "Create a new memo list"
 msgstr "�কটি নত�ন কর�মসূচীর তালিকা তৈরি কর�ন"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-#, fuzzy
-msgid "The registry of memo lists"
-msgstr "কর�মসূচীর প�রধান তালিকা"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-#, fuzzy
-msgid "The memo table model"
-msgstr "টেবিলের মডেল"
-
 #: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "কর�মসূচী লোড করা হচ�ছে"
@@ -15730,20 +15236,6 @@ msgstr "কর�মসূচী লোড করা হচ�ছে"
 msgid "Memo List Selector"
 msgstr "কর�মসূচী উৎ‌স নির�বাচক"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:679
-#, fuzzy
-msgid "Default Memo Client"
-msgstr "ডিফল�ট মেইল ক�লায়েন�ট"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:680
-#, fuzzy
-msgid "Default client for memo operations"
-msgstr "কর�মচালন করতে ব�যর�থ।"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:690
-msgid "This widget displays groups of memo lists"
-msgstr ""
-
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-memo-shell-sidebar.c:870
 #, c-format
@@ -15873,38 +15365,10 @@ msgid "Tas_k List"
 msgstr "কার�য-তালিকা"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "Create a new task list"
 msgstr "�কটি নত�ন কার�য-তালিকা তৈরি কর�ন"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-#, fuzzy
-msgid "The registry of task lists"
-msgstr "কাজের প�রধান তালিকা"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-#, fuzzy
-msgid "The task table model"
-msgstr "টেবিলের মডেল"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution কাজের ফোল�ডারের অবস�থান �বং অন�ক�রম Evolution ১.x-�র পর থেকে পরিবর�তিত "
-"হয়েছে।\n"
-"\n"
-"Evolution আপনার ফোল�ডার মাইগ�রেট করছে অন�গ�রহ করে অপেক�ষা কর�ন..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "`%s' কর�মটি মাইগ�রেট করা সম�ভব হয়নি"
-
 #: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "কাজ লোড করা হচ�ছে"
@@ -15914,20 +15378,6 @@ msgstr "কাজ লোড করা হচ�ছে"
 msgid "Task List Selector"
 msgstr "কর�মের উৎ‌স নির�বাচক"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:679
-#, fuzzy
-msgid "Default Task Client"
-msgstr "ডিফল�ট মেইল ক�লায়েন�ট"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:680
-#, fuzzy
-msgid "Default client for task operations"
-msgstr "থ�রেড প�রসারণের অবস�থার ডিফল�ট মান"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:690
-msgid "This widget displays groups of task lists"
-msgstr ""
-
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-task-shell-sidebar.c:870
 #, c-format
@@ -15939,7 +15389,7 @@ msgstr "%s -� কাজ খোলো"
 msgid "Print Tasks"
 msgstr "কর�ম প�রিন�ট কর�ন"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:554
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15951,108 +15401,108 @@ msgstr ""
 "\n"
 "�ই কাজগ�লি নিশ�চিতরূপে ম�ছে ফেলা হবে কি?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:679
 #, fuzzy
 msgid "_Delete Task"
 msgstr "ম�ছে ফেল�ন (_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 #, fuzzy
 msgid "_Find in Task..."
 msgstr "বার�তার মধ�যে অন�সন�ধান কর�ন...(_F)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 #, fuzzy
 msgid "Search for text in the displayed task"
 msgstr "প�রদর�শিত বার�তার মূল অংশে টেক�সটটি অন�সন�ধান কর�ন"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:700
 #, fuzzy
 msgid "Copy..."
 msgstr "কপি কর�ন...(_C)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:707
 #, fuzzy
 msgid "D_elete Task List"
 msgstr "কর�ম তালিকা নির�বাচন কর�ন"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 #, fuzzy
 msgid "Delete the selected task list"
 msgstr "নির�বাচিত কর�মগ�লি ম�ছে ফেল�ন"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "_New Task List"
 msgstr "নত�ন কার�য-তালিকা(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 #, fuzzy
 msgid "Refresh the selected task list"
 msgstr "নির�বাচিত কর�মগ�লি ম�ছে ফেল�ন"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 #, fuzzy
 msgid "Rename the selected task list"
 msgstr "নির�বাচিত ফোল�ডারের নাম পরিবর�তন কর�ন"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 #, fuzzy
 msgid "Show _Only This Task List"
 msgstr "শ�ধ�মাত�র চিহ�নিত কর�মের তালিকা প�রদর�শন করা হবে (_o)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:756
 #, fuzzy
 msgid "Mar_k as Incomplete"
 msgstr "অসম�পন�ন হিসাবে চিহ�নিত করা হবে(_M)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Delete completed tasks"
 msgstr "সমাপ�ত কর�ম ম�ছে ফেল�ন"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:861
 msgid "Task _Preview"
 msgstr "কর�মের পূর�বদৃশ�য(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:863
 #, fuzzy
 msgid "Show task preview pane"
 msgstr "পূর�বদৃশ�য পেইন প�রদর�শন করা হবে"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:884
 #, fuzzy
 msgid "Show task preview below the task list"
 msgstr "বার�তা-তলিকায় নীচে বার�তা পূর�বদৃশ�য করা হবে"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 #, fuzzy
 msgid "Show task preview alongside the task list"
 msgstr "বার�তা-তলিকায় নীচে বার�তা পূর�বদৃশ�য করা হবে"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Active Tasks"
 msgstr "সক�রিয় কর�ম"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Completed Tasks"
 msgstr "সম�পন�ন কর�ম"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Next 7 Days' Tasks"
 msgstr "পরবর�তী ৭ দিনের কর�ম"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:927
 msgid "Overdue Tasks"
 msgstr "সময়োত�তীর�ণ কাজ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:934
 msgid "Tasks with Attachments"
 msgstr "সংয�ক�ত বস�ত�সহ কর�ম"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:984
 msgid "Print the list of tasks"
 msgstr "কর�মতালিকা প�রিন�ট কর�ন"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:991
 #, fuzzy
 msgid "Preview the list of tasks to be printed"
 msgstr "যে কর�মতালিকাটি প�রিন�ট করা হবে তার পূর�বদৃশ�য করে"
@@ -16080,415 +15530,383 @@ msgid "Delete Task"
 msgstr "বন�টন করা হবে"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, c-format
 msgid "%d attached messages"
 msgstr "%d-টি সংয�ক�ত বার�তা"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 #, fuzzy
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "�কটিও নয়"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:164
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "মেইল বার�তা (_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:166
 msgid "Compose a new mail message"
 msgstr "�কটি নত�ন মেইল বার�তা লিখ�ন"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:174
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "মেইল ফোল�ডার (_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:176
 msgid "Create a new mail folder"
 msgstr "�কটি নত�ন মেইল ফোল�ডার তৈরি কর�ন"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Mail Accounts"
 msgstr "মেইল অ�যাকাউন�ট"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:203
 msgid "Mail Preferences"
 msgstr "মেইলের বৈশিষ�ট�য"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgid "Composer Preferences"
 msgstr "কম�পোসারের বৈশিষ�ট�য"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:219
 msgid "Network Preferences"
 msgstr "নেটওয়ার�ক সংক�রান�ত বৈশিষ�ট�য"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-#, fuzzy
-msgid "Group by Threads"
-msgstr "থ�রেড অন�সারে শ�রেণীবদ�ধ করা হবে (_G)"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr ""
-
-#: ../modules/mail/e-mail-shell-view-actions.c:859
+#: ../modules/mail/e-mail-shell-view-actions.c:814
 #: ../modules/mail/e-mail-shell-view.c:875
 #, fuzzy
 msgid "_Disable Account"
 msgstr "অ�যাকাউন�ট নিষ�ক�রিয় কর�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:861
+#: ../modules/mail/e-mail-shell-view-actions.c:816
 #, fuzzy
 msgid "Disable this account"
 msgstr "অ�যাকাউন�ট নিষ�ক�রিয় কর�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:868
+#: ../modules/mail/e-mail-shell-view-actions.c:823
 #, fuzzy
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "সমস�ত ফোল�ডার থেকে সকল ম�ছে ফেলা বার�তা স�থায়ীরূপে সরিয়ে ফেল�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:873
+#: ../modules/mail/e-mail-shell-view-actions.c:828
 msgid "C_reate Search Folder From Search..."
 msgstr "অন�সন�ধানের ফলাফল থেকে অন�সন�ধানের ফোল�ডার নির�মাণ করা হবে...(_r)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view-actions.c:835
 msgid "_Download Messages for Offline Usage"
 msgstr "অফ-লাইন ব�যবহারের জন�য বার�তা ডাউনলোড কর�ন (_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:837
 #, fuzzy
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "অফ-লাইন ব�যবহারের জন�য চিহ�নিত অ�যাকাউন�ট/ফোল�ডারের বার�তা ডাউনলোড করা হবে"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../modules/mail/e-mail-shell-view-actions.c:842
 msgid "Fl_ush Outbox"
 msgstr "আউটবক�স পরিশ�র�ত কর�ন (_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:849
 msgid "_Copy Folder To..."
 msgstr "ফোল�ডার কপি করার স�থান...(_C)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:896
+#: ../modules/mail/e-mail-shell-view-actions.c:851
 msgid "Copy the selected folder into another folder"
 msgstr "নির�বাচিত ফোল�ডারটি অন�য �কটি ফোল�ডারে কপি কর�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:858
 msgid "Permanently remove this folder"
 msgstr "চিহ�নিত ফোল�ডার স�থায়ীরূপে ম�ছে ফেল�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:908
+#: ../modules/mail/e-mail-shell-view-actions.c:863
 msgid "E_xpunge"
 msgstr "স�থায়ীরূপে বর�জন কর�ন (_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:910
+#: ../modules/mail/e-mail-shell-view-actions.c:865
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "�ই ফোল�ডার থেকে সমস�ত ম�ছে ফেলা বার�তা স�থায়ীভাবে বর�জন করা হবে"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:870
 msgid "Mar_k All Messages as Read"
 msgstr "সমস�ত বার�তাগ�লিকে পড়া-হয়েছে হিসাবে চিহ�নিত কর�ন (_k)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:872
 msgid "Mark all messages in the folder as read"
 msgstr "ফোল�ডারের সমস�ত বার�তা পড়া-হয়েছে হিসাবে চিহ�নিত করা হবে"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:922
+#: ../modules/mail/e-mail-shell-view-actions.c:877
 msgid "_Move Folder To..."
 msgstr "ফোল�ডার স�থানান�তরের স�থান...(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:879
 msgid "Move the selected folder into another folder"
 msgstr "নির�বাচিত ফোল�ডার �কটি পৃথক ফোল�ডারে স�থানান�তর কর�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:884
 msgid "_New..."
 msgstr "নত�ন...(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:886
 msgid "Create a new folder for storing mail"
 msgstr "মেইল সংরক�ষণের উদ�দেশ�যে নত�ন ফোল�ডার নির�মাণ করা হবে"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:893
 msgid "Change the properties of this folder"
 msgstr "�ই ফোল�ডারের বৈশিষ�ট�য পরিবর�তন কর�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:900
 msgid "Refresh the folder"
 msgstr "ফোল�ডার নত�ন করে প�রদর�শন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:907
 msgid "Change the name of this folder"
 msgstr "চিহ�নিত ফোল�ডারের নাম পরিবর�তন কর�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:912
 msgid "Select Message _Thread"
 msgstr "বার�তার থ�রেড নির�বাচন কর�ন (_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:914
 msgid "Select all messages in the same thread as the selected message"
 msgstr "নির�বাচিত বার�তার বিষয় উল�লিখিত বাকি সমস�ত মেইল নির�বাচন কর�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:964
+#: ../modules/mail/e-mail-shell-view-actions.c:919
 msgid "Select Message S_ubthread"
 msgstr "বার�তার সাব-থ�রেড নির�বাচন কর�ন (_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:921
 msgid "Select all replies to the currently selected message"
 msgstr "বর�তমানে নির�বাচিত বার�তার জন�য প�রাপ�ত সব উত�তর নির�বাচন কর�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:926
 msgid "_Unsubscribe"
 msgstr "আনসাবস�ক�রাইব (_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:928
 #, fuzzy
 msgid "Unsubscribe from the selected folder"
 msgstr "নির�বাচিত ফোল�ডারের নাম পরিবর�তন কর�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:933
 msgid "Empty _Trash"
 msgstr "আবর�জনা ম�ছে ফেল�ন (_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:935
 #, fuzzy
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "সমস�ত ফোল�ডার থেকে সকল ম�ছে ফেলা বার�তা স�থায়ীরূপে সরিয়ে ফেল�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:940
 msgid "_New Label"
 msgstr "নত�ন লেবেল (_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:994
+#: ../modules/mail/e-mail-shell-view-actions.c:949
 #, fuzzy
 msgid "N_one"
 msgstr "�কটিও নয়"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
-msgid "Hide _Read Messages"
-msgstr "পড়া বার�তাগ�লি আড়াল কর�ন (_R)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1003
-msgid "Temporarily hide all messages that have already been read"
-msgstr "যে সকল বার�তা পড়া-হয়েছে সেগ�লি অস�থায়ীভাবে ল�কিয়ে ফেলা হবে"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1008
-msgid "Hide S_elected Messages"
-msgstr "নির�বাচিত বার�তাগ�লি আড়াল কর�ন (_e)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1010
-msgid "Temporarily hide the selected messages"
-msgstr "নির�বাচিত বার�তাগ�লি অস�থায়ীভাবে ল�কিয়ে ফেলা হবে"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
-msgid "Show Hidde_n Messages"
-msgstr "আড়াল করা বার�তা প�রদর�শন কর�ন (_n)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1017
-msgid "Show messages that have been temporarily hidden"
-msgstr "যে বার�তাগ�লিকে অস�থায়ীভাবে আড়াল হয়েছে সেগ�লি প�রদর�শন কর�ন"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:972
 msgid "Cancel the current mail operation"
 msgstr "বর�তমান মেইল অপারেশনটি বাতিল কর�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:977
 msgid "Collapse All _Threads"
 msgstr "সব থ�রেড সংক�চিত করা হবে (_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:979
 msgid "Collapse all message threads"
 msgstr "সমস�ত বার�তার থ�রেড সংক�চিত করা হবে"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:984
 msgid "E_xpand All Threads"
 msgstr "সমস�ত থ�রেড প�রসারণ করা হবে (_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:986
 msgid "Expand all message threads"
 msgstr "সমস�ত বার�তার থ�রেড প�রসারণ করা হবে"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:991
 msgid "_Message Filters"
 msgstr "বার�তা ফিল�টার (_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:993
 msgid "Create or edit rules for filtering new mail"
 msgstr "নত�ন মেইল ফিল�টার করার জন�য নিয়ম তৈরি অথবা সম�পাদন কর�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:998
 msgid "Search F_olders"
 msgstr "ফোল�ডার অন�সন�ধান কর�ন (_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
 #, fuzzy
 msgid "Create or edit search folder definitions"
 msgstr "অন�সন�ধান ফোল�ডারের ব�যাখ�যা নির�মাণ অথবা সম�পাদন কর�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
 msgid "_Subscriptions..."
 msgstr "সাবস�ক�রিপশন...(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "দূরবর�তী সার�ভারে অবস�থিত ফোল�ডারে সাবস�ক�রাইব অথবা আনসাবস�ক�রাইব কর�ন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
 msgid "F_older"
 msgstr "ফোল�ডার (_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "_Label"
 msgstr "লেবেল(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "_New Folder..."
 msgstr "নত�ন ফোল�ডার...(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
-msgid "Hide _Deleted Messages"
-msgstr "ম�ছে ফেলা বার�তাগ�লি ল�কিয়ে ফেল�ন (_D)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "ম�ছে ফেলা বার�তাগ�লির মা�ে রেখাঙ�কন করে প�রদর�শন করার পরিবর�তে ল�কিয়ে ফেলা হবে"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Show Message _Preview"
 msgstr "বার�তার পূর�বদৃশ�য(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 #, fuzzy
 msgid "Show message preview pane"
 msgstr "বার�তার পূর�বদৃশ�যের উইন�ডোটি প�রদর�শন করা হবে"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#, fuzzy
+msgid "Show _Deleted Messages"
+msgstr "ম�ছে ফেলা বার�তাগ�লি ল�কিয়ে ফেল�ন (_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#, fuzzy
+msgid "Show deleted messages with a line through them"
+msgstr "ম�ছে ফেলা বার�তাগ�লিকে বার�তা-তালিকায় (মা�ে রেখাঙ�কন করে) প�রদর�শন করা হবে।"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "_Group By Threads"
 msgstr "থ�রেড অন�সারে শ�রেণীবদ�ধ করা হবে (_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 #, fuzzy
 msgid "Threaded message list"
 msgstr "থ�রেড অন�যায়ী বার�তার তালিকা"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Show message preview below the message list"
 msgstr "বার�তা-তলিকায় নীচে বার�তা পূর�বদৃশ�য করা হবে"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 #, fuzzy
 msgid "Show message preview alongside the message list"
 msgstr "বার�তা-তলিকায় নীচে বার�তা পূর�বদৃশ�য করা হবে"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
 msgid "All Messages"
 msgstr "সমস�ত বার�তা"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
 msgid "Important Messages"
 msgstr "গ�র�ত�বপূর�ণ বার�তা"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Last 5 Days' Messages"
 msgstr "সর�বশেষ ৫ দিনের বার�তা"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Messages Not Junk"
 msgstr "বার�তাটি অবাঞ�ছিত নয়"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "Messages with Attachments"
 msgstr "সংয�ক�ত বস�ত�সহ বার�তা"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
 msgid "No Label"
 msgstr "লেবেলবিহীন"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1248
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Read Messages"
 msgstr "পাঠ হওয়া বার�তা"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1255
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "Recent Messages"
 msgstr "সাম�প�রতিক বার�তা"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "Unread Messages"
 msgstr "না পড়া বার�তা"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 #, fuzzy
 msgid "Subject or Addresses contain"
 msgstr "বিষয় অথবা ঠিকানায় অন�তর�ভ�ক�ত রয়েছে"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "All Accounts"
 msgstr "সর�বধরনের অ�যাকাউন�ট"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Current Account"
 msgstr "বর�তমান অ�যাকাউন�ট"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Current Folder"
 msgstr "বর�তমান ফোল�ডার"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:880
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d-টি নির�বাচিত,"
 msgstr[1] "%d-টি নির�বাচিত,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:891
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d টি ম�ছে ফেলা হয়েছে"
 msgstr[1] "%d টি ম�ছে ফেলা হয়েছে"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:897
+#: ../modules/mail/e-mail-shell-view-private.c:904
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d টি অবাঞ�ছিত"
 msgstr[1] "%d টি অবাঞ�ছিত"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:910
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d টি খসড়া"
 msgstr[1] "%d টি খসড়া"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:916
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d টি প�রেরিত হয়নি"
 msgstr[1] "%d টি প�রেরিত হয়নি"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:922
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d টি প�রেরিত"
 msgstr[1] "%d টি প�রেরিত"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:934
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d-টি পড়া হয়নি"
 msgstr[1] "%d-টি পড়া হয়নি"
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:937
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16507,80 +15925,79 @@ msgstr "অ�যাকাউন�ট অন�সন�ধান"
 msgid "Proxy _Logout"
 msgstr "প�রক�সি থেকে লগ-আউট (_L)"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "সক�রিয়"
+
+#: ../modules/mail/em-composer-prefs.c:476
 msgid "Language(s)"
 msgstr "ভাষা"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "প�রতি বার"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "প�রতিদিন �কবার"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "প�রতি সপ�তাহে �কবার"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "প�রতি মাসে �কবার"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:223
 msgid "Add Custom Junk Header"
 msgstr "অবাঞ�ছিত বার�তার জন�য স�বনির�ধারিত হেডার"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:231
 msgid "Header Name:"
 msgstr "হেডারের নাম:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:232
 msgid "Header Value Contains:"
 msgstr "হেডার মানের মধ�যে অন�তর�ভ�ক�ত হয়েছে:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:332
 msgid "Header"
 msgstr "হেডার"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:336
 msgid "Contains Value"
 msgstr "অন�তর�ভ�ক�ত মান"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:729 ../modules/mail/em-mailer-prefs.c:800
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s প�লাগ-ইন উপলব�ধ ও বাইনারি ইনস�টল করা হয়েছে।"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:737 ../modules/mail/em-mailer-prefs.c:809
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "%s প�লাগ-ইন উপলব�ধ নয়। অন�গ�রহ করে পরীক�ষা কর�ন প�যাকেজটি ইনস�টল করা হয়েছে কি না।"
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:773
 #, fuzzy
 msgid "No junk plugin available"
 msgstr "অবাঞ�ছিত বার�তা সংক�রান�ত প�লাগ-ইন উপস�থিত নয়"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-#, fuzzy
-msgid "_Table column:"
-msgstr "টেবিলের কলাম:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1160
 #, fuzzy
 msgid "_Date header:"
 msgstr "তারিখের শিরোনাম:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1161
 #, fuzzy
 msgid "Show _original header value"
 msgstr "মূল মাপ প�রদর�শন করা হবে (_O)"
@@ -16617,16 +16034,8 @@ msgstr ""
 "সংয�ক�ত বস�ত�র তাগাদা সম�বন�ধীয় প�লাগ-ইন দ�বারা বার�তার মূল অংশে অন�সন�ধানের জন�য "
 "ব�যবহারযোগ�য সূত�র"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"সংয�ক�ত বস�ত�র তাগাদা সম�বন�ধীয় প�লাগ-ইন দ�বারা বার�তার মূল অংশে অন�সন�ধানের জন�য "
-"ব�যবহারযোগ�য সূত�র।"
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "প�রাসঙ�গিক-শব�দ"
 
@@ -16711,7 +16120,8 @@ msgid "Restore from backup"
 msgstr "ব�যাক-আপ থেকে প�নর�দ�ধার কর�ন"
 
 #: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
+#, fuzzy
+msgid "_Backup Evolution Settings..."
 msgstr "ব�যাক-আপ সংক�রান�ত বৈশিষ�ট�য...(_B)"
 
 #: ../plugins/backup-restore/backup-restore.c:355
@@ -16720,7 +16130,8 @@ msgid "Backup Evolution data and settings to an archive file"
 msgstr "Evolution-র তথ�য ও বৈশিষ�ট�য ব�যাক-আপ �বং প�নর�দ�ধার কর�ন"
 
 #: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
+#, fuzzy
+msgid "R_estore Evolution Settings..."
 msgstr "প�নর�দ�ধার সংক�রান�ত বৈশিষ�ট�য...(_e)"
 
 #: ../plugins/backup-restore/backup-restore.c:362
@@ -16802,31 +16213,31 @@ msgid "Restoring from the folder %s"
 msgstr "%s ফোল�ডার থেকে প�নর�দ�ধার করা হচ�ছে"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Evolution ব�যাক-আপ"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Evolution প�নর�দ�ধার"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "Evolution-র বর�তমান তথ�যের ব�যাক-আপ"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Evolution দ�বারা তথ�য ব�যাক-আপ করা হচ�ছে। অন�গ�রহ করে প�রতীক�ষা কর�ন।"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "Evolution-র তথ�য প�নর�দ�ধার"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Evolution দ�বারা তথ�য প�নর�দ�ধার করা হচ�ছে। অন�গ�রহ করে প�রতীক�ষা কর�ন।"
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "অ�যাকাউন�টের মধ�যে উপস�থিত তথ�যের পরিমাণের ভিত�তিতপ �ই কাজের জন�য সময় ব�যয় হবে।"
@@ -16891,36 +16302,37 @@ msgstr ""
 "পরে স�বয়ংক�রিয়ভাবে Evolution প�নরারম�ভ করার জন�য অন�গ�রহ করে টগল বাটন সক�রিয় কর�ন।"
 
 # FIXME
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "স�বয়ংক�রিয় পরিচিতি"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "বার�তার পাঠানোর সময় স�বয়ংক�রিয়রূপে ঠিকানাবইয়ের মধ�যে তথ�য যোগ করা হবে (_a)"
 
 # FIXME
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "স�বয়ংক�রিয় পরিচিতিদের জন�য ঠিকানা বই নির�বাচন কর�ন"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "ইনস�ট�যান�ট মেসেজিংয়ের পরিচিতি তালিকা"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+#, fuzzy
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "Pidgin-� উপস�থিত পরিচিতি তালিকা থেকে তথ�য ও ছবি স�সংগত করা হবে"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Pidgin পরিচিতি তালিকার জন�য ঠিকানাবই নির�বাচন কর�ন"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "পরিচিতি তালিকার সাথে �ই ম�হূর�তে স�সংগত করা হবে (_b)"
 
@@ -16942,34 +16354,34 @@ msgstr ""
 "ঠিকানা যোগ করা হয়। আপনার বাডি-লিস�ট অন�সারে ইনস�ট�যান�ট মেসেনজার (IM) থেকে প�রাপ�ত "
 "তথ�য পূরণ করা হয়।"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr ""
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "%s স�পন করতে সমস�য: %s।"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr ""
 "Bogofilter চাইল�ড প�রসেস থেকে কোনো প�রতিক�রিয়া পাওয়া যায়নি, kill করা হচ�ছে..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Bogofilter চাইল�ড প�রসেস বিঘ�নিত হয়েছে, বন�ধ করা হচ�ছে..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Bogofilter-� পাইপ করতে ব�যর�থ, উৎপন�ন ত�র�টির কোড: %d।"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
 msgid "Convert message text to _Unicode"
 msgstr "বার�তার বিষয়বস�ত� Unicode-� রূপান�তর কর�ন (_U)"
 
@@ -16997,50 +16409,50 @@ msgstr "Bogofilter সংক�রান�ত বিকল�প"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Bogofilter সহযোগে অবাঞ�ছিত বার�তা ফিল�টার কর�ন।"
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
 "%d - %s"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
 msgid "Unknown error"
 msgstr "অজানা সমস�যা"
 
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 #, fuzzy
 msgid "Failed to parse server response."
 msgstr "প�রতিনিধিদের সংক�রান�ত তথ�য আপডেট করা যায়নি:"
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 #, fuzzy
 msgid "Events"
 msgstr "সমাপ�ত হচ�ছে"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 #, fuzzy
 msgid "User's calendars"
 msgstr "নত�ন বর�ষপঞ�জি"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 #, fuzzy
 msgid "Failed to get server URL."
 msgstr "LDAP সার�ভারে পরিচয়-প�রমাণ করতে ব�যর�থ।"
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
 #: ../plugins/caldav/caldav-browse-server.c:1272
 #, fuzzy
 msgid "Searching for user's calendars..."
@@ -17049,27 +16461,27 @@ msgstr ""
 "\n"
 "পরিচিতি অন�সন�ধান..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 #, fuzzy
 msgid "Could not find any user calendar."
 msgstr "বর�ষপঞ�জি সনাক�ত করতে ব�যর�থ"
 
-#: ../plugins/caldav/caldav-browse-server.c:794
+#: ../plugins/caldav/caldav-browse-server.c:793
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:796
+#: ../plugins/caldav/caldav-browse-server.c:795
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:798
 #, fuzzy, c-format
 msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
 msgstr "%s-র(ব�যবহারকারী %s) জন�য পাসওয়ার�ড লিখ�ন"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:855
 #, fuzzy, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr ""
@@ -17077,7 +16489,7 @@ msgstr ""
 " %s"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1090
 #, fuzzy
 msgid "Searching folder content..."
 msgstr ""
@@ -17085,12 +16497,12 @@ msgstr ""
 "\n"
 "পরিচিতি অন�সন�ধান..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1133
 #, fuzzy
 msgid "List of available calendars:"
 msgstr "স�থানীয় বর�ষপঞ�জি"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1170
 #, fuzzy
 msgid "Supports"
 msgstr "Hula সমর�থন"
@@ -17113,24 +16525,24 @@ msgstr ""
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/caldav/caldav-source.c:216
 #: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
+#: ../plugins/caldav/caldav-source.c:220
 #: ../plugins/google-account-setup/google-contacts-source.c:305
 msgid "Use _SSL"
 msgstr "SSL ব�যবহার করা হবে (_S)"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:229
 msgid "Brows_e server for a calendar"
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
+#: ../plugins/caldav/caldav-source.c:241
+#: ../plugins/calendar-file/calendar-file.c:182
 #: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
+#: ../plugins/calendar-weather/calendar-weather.c:395
 #: ../plugins/google-account-setup/google-contacts-source.c:323
 #: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
@@ -17144,31 +16556,31 @@ msgstr "Evolution-র জন�য CalDAV সমর�থন যোগ কর�
 msgid "CalDAV Support"
 msgstr "CalDAV সমর�থন"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:116
 msgid "_Customize options"
 msgstr "স�বনির�ধারিত বিকল�প (_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:135
 msgid "File _name:"
 msgstr "ফাইলের নাম: (_n)"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:139
 msgid "Choose calendar file"
 msgstr "বর�ষপঞ�জির ফাইল নির�বাচন কর�ন"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:187
 msgid "On open"
 msgstr "খোলার সময়"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:188
 msgid "On file change"
 msgstr "ফাইল পরিবর�তনের সময়"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:189
 msgid "Periodically"
 msgstr "নিয়মিতরূপে"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:204
 msgid "Force read _only"
 msgstr "বাধ�যতামূলকভাবে শ�ধ�মাত�র পাঠযোগ�য (_o)"
 
@@ -17232,27 +16644,27 @@ msgstr "আবহাওয়া: মেঘম�ক�ত আকাশ"
 msgid "Weather: Thunderstorms"
 msgstr "আবহাওয়া: বজ�রবিদ�য�ৎ‌সহ �ড়"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "অবস�থান নির�বাচন কর�ন"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 #, fuzzy
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "�কটিও নয়"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "�কক(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "মেট�রিক (সেলসিয়াস, সেন�টিমিটার, প�রভৃতি)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "ইম�পিরিয়াল (ফ�যারেনহাইট, ইঞ�চ, প�রভৃতি)"
 
@@ -17381,12 +16793,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "�কটিও নয়"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "স�বনির�ধারিত হেডার (_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17394,12 +16806,12 @@ msgstr ""
 "স�বনির�ধারিত হেডারের কি-র মান নির�ধারণের বিন�যাস হল:\n"
 "\";\" চিহ�ন দ�বারা বিভাজিত স�বনির�ধারিত হেডার কি মানের নাম।"
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:950
 msgid "Key"
 msgstr "কি"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "মান"
 
@@ -17422,7 +16834,7 @@ msgstr ""
 "বার�তা কম�পোসারের মধ�যে কোনো কি টেপা হলে স�বয়ংক�রিয়ভাবে সম�পাদনব�যবস�থা আরম�ভ করা হবে"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:118
 msgid "Automatically launch when a new mail is edited"
 msgstr "নত�ন বার�তা সম�পাদন করা হলে স�বয়ংক�রিয়ভাবে আরম�ভ করা হবে"
 
@@ -17434,11 +16846,11 @@ msgstr "ডিফলà§�ট সà§�বতà§�বনà§�তà§�র সমà§�পাদà
 msgid "The default command that must be used as the editor."
 msgstr "�ডিটর রূপে ব�যবহারযোগ�য ডিফল�ট কমান�ড।"
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:107
 msgid "Command to be executed to launch the editor: "
 msgstr "�ডিটর আরম�ভ করার জন�য সঞ�চালিত কমান�ড: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:108
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17446,8 +16858,8 @@ msgstr ""
 "Emacs-র জন�য \"xemacs\" ব�যবহার কর�ন\n"
 "VI-র জন�য \"gvim -f\" ব�যবহার কর�ন"
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:374
+#: ../plugins/external-editor/external-editor.c:376
 msgid "Compose in External Editor"
 msgstr "বহিস�থিত �ডিটরের মধ�যে রচনা কর�ন"
 
@@ -17587,8 +16999,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
 msgid "Unknown error."
 msgstr "অজানা সমস�যা।"
 
@@ -17608,7 +17020,7 @@ msgstr "Evolution-র মধ�যে Google Calender যোগ করা হব
 msgid "Google Calendars"
 msgstr "Google Calendars"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "পরীক�ষণতালিকা"
 
@@ -17640,12 +17052,12 @@ msgstr "অস�থায়ীরূপে গ�রহণ করা হবে"
 msgid "Rese_nd Meeting..."
 msgstr "সভার তথ�য প�নরায় পাঠানো হবে...(_n)"
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Create folder"
 msgstr "ফোল�ডার তৈরি কর�ন"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:219
 #, fuzzy, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17670,19 +17082,19 @@ msgstr ""
 "যৌথ ব�যবহারের ফোল�ডারটি ইনস�টল করার জন�য 'পরবর�তী' টিপ�ন\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "শেয়ার করা ফোল�ডার ইনস�টল কর�ন"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "শেয়ার করা ফোল�ডার ইনস�টলেশনের প�রকৃতি"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "অবাঞ�ছিত বস�ত� সংক�রান�ত বৈশিষ�ট�য"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "অবাঞ�ছিত বার�তা সংক�রান�ত বৈশিষ�ট�য"
@@ -17719,7 +17131,7 @@ msgstr "সরাও (_R)"
 msgid "Message Retract"
 msgstr "বার�তা প�রত�যাহার"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 #, fuzzy
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
@@ -17728,7 +17140,7 @@ msgstr ""
 "বার�তা প�রত�যাহার করা হলে, প�রাপকের মেইল-বাক�স থেকে তা অপসারিত হওয়ার সম�ভাবনা "
 "রয়েছে।  আপনি কি �গিয়ে যেতে ইচ�ছ�ক?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "সাফল�যের সাথে বার�তাটি প�রত�যাহার করা হয়েছে"
 
@@ -17938,43 +17350,50 @@ msgstr "<b>অ�যাকাউন�টের নাম</b>"
 msgid "Proxy Login"
 msgstr "প�রক�সি লগ-ইন"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s %s -র(ব�যবহারকারী %s) জন�য পাসওয়ার�ড লিখ�ন"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:690
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "শ�ধমাত�র অ�যাকউন�ট সক�রিয় করা হলে প�রক�সি সংক�রান�ত ট�যাব উপলব�ধ করা হবে।"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "শ�ধমাত�র অ�যাকউন�ট সক�রিয় করা হলে প�রক�সি সংক�রান�ত ট�যাব উপলব�ধ করা হবে।"
 
-#: ../plugins/groupwise-features/proxy.c:931
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+#, fuzzy
+msgctxt "GW"
+msgid "Proxy"
+msgstr "প�রক�সি"
+
+#: ../plugins/groupwise-features/proxy.c:929
 #: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "ব�যবহারকারী যোগ কর�ন"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "প�রেরণ সংক�রান�ত উন�নত বিকল�প"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:313
 #: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "ব�যবহারকারীবৃন�দ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:314
 msgid "Enter the users and set permissions"
 msgstr "ব�যবহারকারীদের নাম উল�লেখ করে অন�মতি নির�ধারণ কর�ন"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:412
 msgid "Sharing"
 msgstr "যৌথরূপে ব�যবহার"
 
@@ -17986,63 +17405,55 @@ msgstr "স�বনির�ধারিত সূচনাবার�তা"
 msgid "Add   "
 msgstr "যোগ কর�ন   "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "বার�তার অবস�থা"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "বিষয়:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "প�রেরক:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "নির�মাণের তারিখ:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "প�রাপকতালিকা:"
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "প�রেরিত হয়েছে: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "খোলা হয়েছে: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "গ�রহণ করা হয়েছে: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "ম�ছে ফেলা হয়েছে: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "প�রত�যাখ�যান করা হয়েছে: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "সম�পন�ন: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "প�রেরণ ব�যর�থ: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Evolution-র জন�য Hula সমর�থন যোগ করা হবে।"
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Hula সমর�থন"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 #, fuzzy
 msgid "Inline Image"
@@ -18053,12 +17464,12 @@ msgstr "ইনলাইন vCard"
 msgid "View image attachments directly in mail messages."
 msgstr "vCard সরাসরি মেইল বার�তার মধ�যে প�রদর�শন করা হবে।"
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:325
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "স�বনির�ধারিত হেডার"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:338
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP হেডার"
@@ -18105,142 +17516,142 @@ msgstr "IMAP অà§�যাকাউনà§�টের বৈশিষà§�টà§�য à¦
 msgid "IMAP Features"
 msgstr "IMAP-র বৈশিষ�ট�য"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/itip-formatter/itip-formatter.c:475
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "'%s' বর�ষপঞ�জিটি লোড করতে ব�যর�থ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:641
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "'%s' বর�ষপঞ�জির �কটি সাক�ষাৎকার �ই বৈঠকের সাথে �কই সময়ে চিহ�নিত রয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:677
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' বর�ষপঞ�জির মধ�যে সাক�ষাৎকার পাওয়া গিয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Unable to find any calendars"
 msgstr "বর�ষপঞ�জি সনাক�ত করতে ব�যর�থ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find this meeting in any calendar"
 msgstr "কোনো বর�ষপঞ�জির মধ�যে �ই সাক�ষাৎকার পাওয়া যায়নি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find this task in any task list"
 msgstr "কোনো কর�ম তালিকায় �ই কর�ম সনাক�ত করা যায়নি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this memo in any memo list"
 msgstr "কোনো মেমো তালিকায় �ই মেমো সনাক�ত করা যায়নি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:862
 msgid "Opening the calendar. Please wait.."
 msgstr "বর�ষপঞ�জি খোলা হচ�ছে। অন�গ�রহ করে অপেক�ষা কর�ন.."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:865
 msgid "Searching for an existing version of this appointment"
 msgstr "চিহ�নিত সাক�ষাৎকারের পূর�ববর�তী সংস�করণ অন�সন�ধান করা হচ�ছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1046
 msgid "Unable to parse item"
 msgstr "বস�ত� পার�স করা সম�ভব হয়নি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "'%s' বর�ষপঞ�জিতে বস�ত� প�রেরণ করা যায়নি।  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1145
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "'%s' বর�ষপঞ�জিতে গৃহীত হিসাবে প�রেরণ করা হয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1149
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "বর�ষপঞ�জিতে '%s' সম�ভাব�য হিসাবে নির�ধারণ করা হবে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1154
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "'%s' বর�ষপঞ�জিতে প�রত�যাখ�যান বার�তাসহ প�রেরণ করা হয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' বর�ষপঞ�জিতে বাতিল হিসাবে প�রেরণ করা হয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizer-র দ�বারা %s প�রতিনিধি অপসারণ করা হয়েছে "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Sent a cancelation notice to the delegate"
 msgstr "প�রতিনিধির উদ�দেশ�যে বাতিল সংক�রান�ত সূচনা প�রদান করা হয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1262
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "প�রতিনিধির উদ�দেশ�যে বাতিল সংক�রান�ত সূচনা প�রদান করা যায়নি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1373
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "অবৈধ মান হওয়ার দর�ন অংশগ�রহনকারীর অবস�থা আপডেট করা সম�ভব হয়নি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1402
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "অংশগ�রহণকারী সংক�রান�ত তথ�য আপডেট করা যায়নি। %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Attendee status updated"
 msgstr "অংশগ�রহণকারীর অবস�থা আপডেট করা হয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 msgid "Meeting information sent"
 msgstr "সভার তথ�য প�রেরিত"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1435
 msgid "Task information sent"
 msgstr "কর�ম সংক�রান�ত তথ�য প�রেরিত হয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1438
 msgid "Memo information sent"
 msgstr "মেমো সংক�রান�ত তথ�য প�রেরিত"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "সভা সংক�রান�ত তথ�য প�রেরণ করতে ব�যর�থ, �ই সভা বর�তমানে উপস�থিত নেই"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1450
 msgid "Unable to send task information, the task does not exist"
 msgstr "কর�ম সংক�রান�ত তথ�য প�রেরণ করতে ব�যর�থ, �ই কর�ম বর�তমানে উপস�থিত নেই"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "মেমো সংক�রান�ত তথ�য প�রেরণ করতে ব�যর�থ, �ই মেমো বর�তমানে উপস�থিত নেই"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 #, fuzzy
 msgid "calendar.ics"
 msgstr "বর�ষপঞ�জি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1523
 #, fuzzy
 msgid "Save Calendar"
 msgstr "নত�ন বর�ষপঞ�জি"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 #: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "সংয�ক�ত বর�ষপঞ�জি বৈধ নয়"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 #: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18248,15 +17659,15 @@ msgstr ""
 "বার�তার মধ�যে �কটি বর�ষপঞ�জির উপস�থিতি সম�বন�ধে দাবি করা হলেও বর�ষপঞ�জিটি বৈধ "
 "iCalendar নয়।"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1628
+#: ../plugins/itip-formatter/itip-formatter.c:1656
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "The item in the calendar is not valid"
 msgstr "বর�ষপঞ�জির মধ�যে উপস�থিত বিষয়বস�ত� বৈধ নয়"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1629
+#: ../plugins/itip-formatter/itip-formatter.c:1657
+#: ../plugins/itip-formatter/itip-formatter.c:1763
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18264,322 +17675,322 @@ msgstr ""
 "বার�তার মধ�যে �কটি বর�ষপঞ�জির উপস�থিতি সম�বন�ধে দাবি করা হলেও বর�ষপঞ�জিটি বৈধ "
 "iCalendar নয়।"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1670
 msgid "The calendar attached contains multiple items"
 msgstr "সংয�ক�ত বর�ষপঞ�জির মধ�যে �কাধিক বিষয়বস�ত� উপস�থিত রয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1671
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 "সমস�ত চিহ�নিত বস�ত�র ব�যবস�থাপনার জন�য ফাইলটি সংরক�ষণ করে বর�ষপঞ�জিটি ইম�পোর�ট করা আবশ�যক"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2436
 msgid "This meeting recurs"
 msgstr "চিহ�নিত সভার প�নরাবৃত�তি হবে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2439
 msgid "This task recurs"
 msgstr "চিহ�নিত কর�মের প�নরাবৃত�তি হবে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2442
 msgid "This memo recurs"
 msgstr "চিহ�নিত মেমোর প�নরাবৃত�তি হবে"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2676
 msgid "_Delete message after acting"
 msgstr "কর�ম সঞ�চালনের পরে বার�তা ম�ছে ফেলা হবে (_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2686
+#: ../plugins/itip-formatter/itip-formatter.c:2719
 msgid "Conflict Search"
 msgstr "দ�বন�দ�ব অন�সন�ধান"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2701
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "সভা সংক�রান�ত দ�বন�দ�ব অন�সন�ধানের উদ�দেশ�যে বর�ষপঞ�জি নির�বাচন কর�ন"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "আজ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "আজ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "আজ %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "আগামীকাল %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "আগামীকাল %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "আগামীকাল %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "আগামীকাল %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "<b>%s</b>-র পক�ষ থেকে অন�গ�রহ করে উত�তর দিন"
 
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "<b>%s</b>-র পক�ষ থেকে প�রাপ�ত হয়েছে"
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:358
 #, 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:364
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b>-র দ�বারা নিম�নলিখিত সভার তথ�য প�রকাশ করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b>-র দ�বারা নিম�নলিখিত সভাটি আপনাকে বন�টণ করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:368
 #, 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:374
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b>-র দ�বারা নিম�নলিখিত সভায় আপনার উপস�থিতি অন�রোধ করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, 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:382
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b>-র দ�বারা �কটি বিদ�যমান সভায় যোগ করার অন�রোধ জানানো হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b>, %s-র মাধ�যমে নিম�নলিখিত সভা সংক�রান�ত সর�বশেষ তথ�য পেতে ইচ�ছ�ক:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:384
 #, 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:392
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b>, %s-র মাধ�যমে সভা সংক�রান�ত নিম�নলিখিত প�রত�য�ত�তর পাঠিয়েছেন:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> সভা সংক�রান�ত নিম�নলিখিত প�রত�য�ত�তর পাঠিয়েছেন:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b>-র দ�বারা, %s-র মাধ�যমে নিম�নলিখিত সভা বাতিল করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b>-র দ�বারা নিম�নলিখিত সভা বাতিল করা হয়েছে।"
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr ""
 "<b>%s</b> %s-র মাধ�যমে সভা সংক�রান�ত নিম�নলিখিত পরিবর�তনগ�লির প�রস�তাবনা করেছেন।"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr ""
 "<b>%s</b>-র দ�বারা সভা সংক�রান�ত নিম�নলিখিত পরিবর�তনগ�লির প�রস�তাব জানানো হয়েছে।"
 
-#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:406
 #, 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:412
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b>-র দ�বারা সভা সংক�রান�ত নিম�নলিখিত প�রস�তাবগ�লি প�রত�যাখ�যান করা হয়েছে।"
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b>-র দ�বারা, %s-র মাধ�যমে নিম�নলিখিত কর�ম প�রকাশিত করা হয়েছে।"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> নিম�নলিখিত কর�ম প�রকাশ করেছেন:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:453
 #, 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:460
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b>-র দ�বারা, %s-র মাধ�যমে আপনাকে �কটি কর�মের নিয�ক�ত করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b>-র দ�বারা আপনাকে �কটি কর�মে নিয�ক�ত করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, 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:470
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> বর�তমান কাজে যোগ করতে ইচ�ছ�ক:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18588,14 +17999,14 @@ msgstr ""
 "<b>%s</b>, %s-র মাধ�যমে নিম�নলিখিত বরাদ�দ কর�ম সংক�রান�ত সর�বশেষ তথ�য প�রাপ�ত করতে "
 "ইচ�ছ�ক:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:472
 #, 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:480
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -18603,192 +18014,192 @@ msgstr ""
 "<b>%s</b>, %s-র মাধ�যমে দ�বারা নিম�নলিখিত বরাদ�দ কর�ম সংক�রান�ত প�রত�য�ত�তর প�রেরণ করা "
 "হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b>-র দ�বারা নিম�নলিখিত বরাদ�দ কর�ম সংক�রান�ত প�রত�য�ত�তর প�রেরণ করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:482
 #, 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:488
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b>-র দ�বারা, নিম�নলিখিত বরাদ�দ কর�ম বাতিল করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b>, %s-র মাধ�যমে নিম�নলিখিত বরাদ�দ কর�ম সংক�রান�ত পরিবর�তনের প�রস�তাবনা করেছেন:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b>-র দ�বারা নিম�নলিখিত বরাদ�দ কর�ম সংক�রান�ত পরিবর�তনের প�রস�তাব জানানো হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:494
 #, 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:500
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b>-র দ�বাটা নিম�নলিখিত বরাদ�দ কর�ম প�রত�যাখ�যান করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b>-র দ�বারা, %s-র মাধ�যমে নিম�নলিখিত কর�মসূচী প�রকাশিত করা হয়েছে।"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> নিম�নলিখিত কর�মসূচী প�রকাশ করেছেন:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:540
 #, 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:546
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr ""
 "<b>%s</b>-র দ�বারা �কটি বিদ�যমান কর�মসূচীতে তথ�য যোগ করার অন�রোধ জানানো হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:546
 #, 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:552
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b>-র দ�বারা, নিম�নলিখিত যৌথকর�মসূচী বাতিল করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:672
 msgid "All day:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:682
 #, fuzzy
 msgid "Start day:"
 msgstr "আরম�ভের তারিখ (_r):"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:682
+#: ../plugins/itip-formatter/itip-view.c:1037
 msgid "Start time:"
 msgstr "আরম�ভের সময়:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:694
 #, fuzzy
 msgid "End day:"
 msgstr "%d দিন"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:694
+#: ../plugins/itip-formatter/itip-view.c:1048
 msgid "End time:"
 msgstr "সমাপ�তির সময়:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:827
 msgid "_Open Calendar"
 msgstr "বর�ষপঞ�জি (_O)"
 
+#: ../plugins/itip-formatter/itip-view.c:833
 #: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:865
 msgid "_Decline"
 msgstr "প�রত�যাখ�যান কর�ন (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
-#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:867
 msgid "_Accept"
 msgstr "গ�রহণ কর�ন (_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:837
 msgid "_Decline all"
 msgstr "সমস�ত প�রত�যাখ�যান (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:838
 msgid "_Tentative all"
 msgstr "অস�থায়ীরূপে (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Tentative"
 msgstr "অস�থায়ীরূপে (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:839
 msgid "_Accept all"
 msgstr "সমস�ত গ�রহণ কর�ন (_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Send Information"
 msgstr "তথ�য প�রেরণ কর�ন (_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Update Attendee Status"
 msgstr "অংশগ�রহণকারীর অবস�থা আপডেট কর�ন (_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Update"
 msgstr "আপডেট কর�ন (_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1068
+#: ../plugins/itip-formatter/itip-view.c:1122
 msgid "Comment:"
 msgstr "বক�তব�য:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1107
 msgid "Send _reply to sender"
 msgstr "প�রেরকের প�রতি উত�তর (_r)"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1137
 msgid "Send _updates to attendees"
 msgstr "সভায় অংশগ�রহণকারীদের আপডেট প�রেরণ করা হবে (_u)"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1146
 msgid "_Apply to all instances"
 msgstr "সমস�ত ইনস�ট�যান�সের ক�ষেত�রে প�রয়োগ করা হবে (_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1155
 msgid "Show time as _free"
 msgstr "ম�ক�ত হিসাবে সময় প�রদর�শন করা হবে (_f)"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1158
 msgid "_Preserve my reminder"
 msgstr "আমার তাগাদাটি সংরক�ষণ করা হবে (_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1164
 msgid "_Inherit reminder"
 msgstr "তাগাদার বৈশিষ�ট�য আহরণ করা হবে (_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1907
 msgid "_Tasks:"
 msgstr "কর�ম (_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1909
 msgid "_Memos:"
 msgstr "কর�মসূচী: (_M)"
 
@@ -18896,16 +18307,16 @@ msgid "Whether to notify new messages in Inbox folder only."
 msgstr ""
 "শ�ধ�মাত�র ইনবক�স ফোল�ডারের মধ�যে নত�ন বার�তার আগমন সম�বন�ধে সূচনাপ�রদান করা হবে কি না।"
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:343
 msgid "Evolution's Mail Notification"
 msgstr "Evolution-র মেইল সংক�রান�ত সূচনা ব�যবস�থা"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:365
 msgid "Mail Notification Properties"
 msgstr "মেইলের সূচনা ব�যবস�থার বৈশিষ�ট�য"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:496
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18921,67 +18332,67 @@ msgstr[1] ""
 "%s-র মধ�যে প�রাপ�ত করেছেন।"
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:507
 #, fuzzy, c-format
 msgid "From: %s"
 msgstr "%s থেকে:"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#: ../plugins/mail-notification/mail-notification.c:519
 #, fuzzy, c-format
 msgid "Subject: %s"
 msgstr "বিষয়:"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:528
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "%d-টি নত�ন বার�তা প�রাপ�ত করেছেন।"
 msgstr[1] "%d-টি নত�ন বার�তা প�রাপ�ত করেছেন।"
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:551
 msgid "New email"
 msgstr "নত�ন ই-মেইল"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:605
 msgid "Show icon in _notification area"
 msgstr "সূচনাপ�রদানের স�থানের আইকন প�রদর�শন করা হবে (_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:633
 msgid "B_link icon in notification area"
 msgstr "সূচনাপ�রদানের স�থানের আইকনে �লকানি হবে (_l)"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:643
 msgid "Popup _message together with the icon"
 msgstr "আইকনের সাথে বার�তা পপ-আপ করে প�রদর�শিত হবে (_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:828
 msgid "_Play sound when new messages arrive"
 msgstr "নত�ন মেইল �লে শব�দ করা হবে (_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:857
 msgid "_Beep"
 msgstr "বিপ শব�দ করা হবে (_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:870
 msgid "Use sound _theme"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:889
 #, fuzzy
 msgid "Play _file:"
 msgstr "শব�দের ফাইল বাজানে হবে (_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:900
 msgid "Select sound file"
 msgstr "শব�দের ফাইল নির�বাচন কর�ন"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:958
 msgid "Notify new messages for _Inbox only"
 msgstr "শ�ধ�মাত�র ইনবক�স নত�ন বার�তা প�রাপ�তির সূচনা প�রদান করা হবে (_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:967
 msgid "Generate a _D-Bus message"
 msgstr "�কটি D-Bus বার�তা নির�মাণ কর�ন (_D)"
 
@@ -18994,12 +18405,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "নত�ন বার�তা প�রাপ�ত হলে সূচিত করা হবে।"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19008,7 +18419,7 @@ msgstr ""
 "নির�বাচিত বর�ষপঞ�জির মধ�যে '%s' অন�ষ�ঠানটি বর�তমানে উপস�থিত রয়েছে। পূর�ব উপস�থিত �ই "
 "অন�ষ�ঠানটি কি পরিবর�তন করা হবে?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19017,7 +18428,7 @@ msgstr ""
 "নির�বাচিত কাজের তালিকার মধ�যে '%s' কাজটি বর�তমানে উপস�থিত রয়েছে। পূর�ব উপস�থিত �ই "
 "কাজটি কি পরিবর�তন করা হবে?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19026,7 +18437,7 @@ msgstr ""
 "নির�বাচিত কর�মসূচীর মধ�যে '%s' মেমোটি বর�তমানে উপস�থিত রয়েছে। পূর�ব উপস�থিত �ই মেমোটি "
 "কি পরিবর�তন করা হবে?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#: ../plugins/mail-to-task/mail-to-task.c:512
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -19034,7 +18445,7 @@ msgstr ""
 "নির�বাচিত বর�ষপঞ�জির মধ�যে চিহ�নিত মেইলের কিছ� অন�ষ�ঠান বর�তমানে উপস�থিত রয়েছে। তথাপি "
 "নত�ন অন�ষ�ঠানগ�লি নির�মাণ করা হবে কি?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -19042,7 +18453,7 @@ msgstr ""
 "নির�বাচিত বর�ষপঞ�জির মধ�যে চিহ�নিত মেইলের কিছ� কাজ বর�তমানে উপস�থিত রয়েছে। তথাপি নত�ন "
 "কাজগ�লি নির�মাণ করা হবে কি?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#: ../plugins/mail-to-task/mail-to-task.c:518
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -19050,7 +18461,7 @@ msgstr ""
 "নির�বাচিত কর�মসূচীর মধ�যে চিহ�নিত মেইলের কিছ� মেমো বর�তমানে উপস�থিত রয়েছে। তথাপি নত�ন "
 "মেমোগ�লি নির�মাণ করা হবে কি?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#: ../plugins/mail-to-task/mail-to-task.c:536
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -19064,7 +18475,7 @@ msgstr[1] ""
 "নির�বাচিত বর�ষপঞ�জির মধ�যে চিহ�নিত মেইলের কিছ� অন�ষ�ঠান বর�তমানে উপস�থিত রয়েছে। তথাপি "
 "নত�ন অন�ষ�ঠানগ�লি নির�মাণ করা হবে কি?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:542
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -19078,7 +18489,7 @@ msgstr[1] ""
 "নির�বাচিত বর�ষপঞ�জির মধ�যে চিহ�নিত মেইলের কিছ� কাজ বর�তমানে উপস�থিত রয়েছে। তথাপি নত�ন "
 "কাজগ�লি নির�মাণ করা হবে কি?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -19092,25 +18503,25 @@ msgstr[1] ""
 "নির�বাচিত কর�মসূচীর মধ�যে চিহ�নিত মেইলের কিছ� মেমো বর�তমানে উপস�থিত রয়েছে। তথাপি নত�ন "
 "মেমোগ�লি নির�মাণ করা হবে কি?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:607
 msgid "[No Summary]"
 msgstr "[সারাংশ বিহীন]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:618
 msgid "Invalid object returned from a server"
 msgstr "সার�ভার থেকে প�রাপ�ত বস�ত� বৈধ নয়"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:689
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "প�রক�রিয়াকরণ কালে সমস�যা: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:718
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "বর�ষপঞ�জি খোলা যাচ�ছে না। %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:725
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -19118,7 +18529,7 @@ msgstr ""
 "নির�বাচিত উৎসস�থলটি শ�ধ�মাত�র পাঠযোগ�য ও �ইখানে কোনো অন�ষ�ঠান নির�মাণ করা সম�ভব নয়। "
 "অন�গ�রহ করে �কটি ভিন�ন উৎসস�থল নির�বাচন কর�ন।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19126,7 +18537,7 @@ msgstr ""
 "নির�বাচিত উৎস�থলটি শ�ধ�মাত�র পাঠযোগ�য ও �ইখানে কোনো কর�ম নির�মাণ করা সম�ভব নয়। অন�গ�রহ "
 "করে �কটি ভিন�ন উৎসস�থল নির�বাচন কর�ন।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:731
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19134,40 +18545,40 @@ msgstr ""
 "নির�বাচিত উৎস�থলটি শ�ধ�মাত�র পাঠযোগ�য ও �ইখানে কোনো মেমো নির�মাণ করা সম�ভব নয়। অন�গ�রহ "
 "করে �কটি ভিন�ন উৎসস�থল নির�বাচন কর�ন।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:934
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "উৎসের তালিকা প�রাপ�ত করতে ব�যর�থ। %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1053
 msgid "Create an _Event"
 msgstr "নত�ন অন�ষ�ঠান প�রস�ত�ত কর�ন (_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1055
 msgid "Create a new event from the selected message"
 msgstr "নির�বাচিত বার�তা থেকে �কটি নত�ন অন�ষ�ঠান তৈরি কর�ন"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create a Mem_o"
 msgstr "নত�ন কর�মসূচী প�রস�ত�ত কর�ন (_o)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new memo from the selected message"
 msgstr "নির�বাচিত বার�তা থেকে �কটি নত�ন মেমো তৈরি কর�ন"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a _Task"
 msgstr "নত�ন কাজ প�রস�ত�ত কর�ন (_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new task from the selected message"
 msgstr "নির�বাচিত বার�তা থেকে �কটি নত�ন কাজ তৈরি কর�ন"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a _Meeting"
 msgstr "নত�ন সভা প�রস�ত�ত কর�ন (_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a new meeting from the selected message"
 msgstr "নির�বাচিত বার�তা থেকে �কটি নত�ন সভা তৈরি কর�ন"
 
@@ -19175,56 +18586,56 @@ msgstr "নির�বাচিত বার�তা থেকে �কটি
 msgid "Convert a mail message to a task."
 msgstr "�কটি বার�তাকে �কটি নত�ন কর�মে রূপান�তর কর�ন।"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:279
 msgid "Get List _Archive"
 msgstr "লিস�টের আর�কাইভ প�রাপ�ত কর�ন (_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:281
 msgid "Get an archive of the list this message belongs to"
 msgstr "চিহ�নিত বার�তার মেইলিং-লিস�টের আর�কাইভ প�রাপ�ত কর�ন"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Usage Information"
 msgstr "লিস�ট ব�যবহার সংক�রান�ত তথ�য প�রাপ�ত কর�ন(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "চিহ�নিত বার�তার মেইলিং-লিস�টের ব�যবহার সংক�রান�ত তথ�য প�রাপ�ত কর�ন"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Contact List _Owner"
 msgstr "পরিচিতি তালিকার মালিক (_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "চিহ�নিত বার�তার মেইলিং লিস�টের মালিকের সাথে যোগাযোগ কর�ন"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "_Post Message to List"
 msgstr "লিস�টে বার�তা প�রেরণ কর�ন (_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "চিহ�নিত বার�তার মেইলিং লিস�টে বার�তা প�রেরণ কর�ন"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Subscribe to List"
 msgstr "লিস�টে সাবস�ক�রাইব কর�ন (_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "চিহ�নিত বার�তার মেইলিং লিস�টে সাবস�ক�রাইব কর�ন"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Unsubscribe from List"
 msgstr "লিস�ট থেকে আন-সবাস�ক�রাইব কর�ন (_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 #, fuzzy
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "চিহ�নিত বার�তার মেইলিং লিস�ট থেকে আনসাবস�ক�রাইব কর�ন"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Mailing _List"
 msgstr "মেইলিং লিস�ট (_L)"
 
@@ -19315,11 +18726,11 @@ msgstr "বার�তা সম�পাদনা (_E)"
 msgid "_Send message"
 msgstr "বার�তা প�রেরণ কর�ন (_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mark-all-read/mark-all-read.c:41
 msgid "Also mark messages in subfolders?"
 msgstr "সাবফোল�ডারে উপস�থিত বার�তাগ�লিও চিহ�নিত করা হবে কি?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:44
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19395,41 +18806,41 @@ msgstr "প�লেইন-টেক�সট বাঞ�ছনীয়"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "HTML অন�তর�ভ�ক�ত থাকলে প�লেইন-টেক�সটে বার�তা প�রদর�শন করা হবে।"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "উপস�থিত থসকলে HTML প�রদর�শন করা হবে"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 #, fuzzy
 msgid "Show plain text if present"
 msgstr "উপস�থিত থসকলে HTML প�রদর�শন করা হবে"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 #, fuzzy
 msgid "Only ever show plain text"
 msgstr "শ�ধ�মাত�র PLAIN হিসাবে প�রদর�শন করা হবে"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "HTML মোড (_M)"
 
@@ -19454,31 +18865,31 @@ msgstr "Outlook PST ইম�পোর�ট ব�যবস�থা"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook-র ব�যক�তিগত ফোল�ডার (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:296
 msgid "_Mail"
 msgstr "মেইল (_M)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "_Address Book"
 msgstr "ঠিকানা-বই (_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:321
 msgid "A_ppointments"
 msgstr "সাক�ষাৎকার (_p)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:327 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "কর�ম (_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:333
 msgid "_Journal entries"
 msgstr "জার�নালের �নট�রি (_J)"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "Importing Outlook data"
 msgstr "Outlook থেকে তথ�য ইম�পোর�ট করা হচ�ছে"
 
@@ -19648,56 +19059,56 @@ msgstr "ফোন কর�ন"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "বর�ষপঞ�জি প�রকাশ করতে ব�যর�থ: বর�ষপঞ�জির ব�যাক-�ন�ড বর�তমানে উপস�থিত নেই"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "নত�ন অবস�থান"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "অবস�থান পরিবর�তন কর�ন"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Spamassassin পাওয়া যায়নি, কোড: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "পাইপ নির�মাণ করতে ব�যর�থ: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 #, c-format
 msgid "Error after fork: %s"
 msgstr "ফর�কের পরে ত�র�টি: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr ""
 "SpamAssassin চাইল�ড প�রসেস থেকে কোনো প�রতিক�রিয়া পাওয়া যাচ�ছে না, kill করা হচ�ছে..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "SpamAssassin চাইল�ড প�রসেস বিঘ�নিত হয়েছে, বন�ধ করা হচ�ছে..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "SpamAssassin-� পাইপ করতে ব�যর�থ, উৎপন�ন ত�র�টির কোড: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
 #, fuzzy, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin উপলব�ধ নয়।"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "�র দর�ন Spamassasin ধীরে চলবে, কিন�ত� অনেক বেশি নির�ভরশীল হবে"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
 msgid "I_nclude remote tests"
 msgstr "দূরবর�তী পরীক�ষণ অন�তর�ভ�ক�ত করা হবে(_n)"
 
@@ -19881,11 +19292,11 @@ msgstr "%s থেকে:"
 msgid "Importing files"
 msgstr "ফাইল ইম�পোর�ট করা হচ�ছে"
 
-#: ../plugins/startup-wizard/startup-wizard.c:248
+#: ../plugins/startup-wizard/startup-wizard.c:251
 msgid "Importing data."
 msgstr "ডাটা ইম�পোর�ট করা হচ�ছে।"
 
-#: ../plugins/startup-wizard/startup-wizard.c:250
+#: ../plugins/startup-wizard/startup-wizard.c:257
 msgid "Please wait"
 msgstr "অন�গ�রহ করে প�রতীক�ষা কর�ন"
 
@@ -19918,17 +19329,17 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "খসড়া ভিত�তিক টেমপ�লেটের প�লাগ-ইন"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:613
 #, fuzzy
 msgid "No Title"
 msgstr "শিরোনাম বিহীন"
 
 # FIXME
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:684
 msgid "Save as _Template"
 msgstr "টেমপ�লেট রূপে সংরক�ষণ কর�ন (_T)"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:686
 msgid "Save as Template"
 msgstr "টেমপ�লেট রূপে সংরক�ষণ কর�ন"
 
@@ -19948,27 +19359,27 @@ msgstr "ইনলাইন vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "vCard সরাসরি মেইল বার�তার মধ�যে প�রদর�শন করা হবে।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:157
+#: ../plugins/vcard-inline/vcard-inline.c:242
 msgid "Show Full vCard"
 msgstr "সম�পূর�ণ vCard প�রদর�শন কর�ন"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:160
 msgid "Show Compact vCard"
 msgstr "সংক�ষিপ�ত vCard প�রদর�শন কর�ন"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:221
 msgid "There is one other contact."
 msgstr "শ�ধ�মাত�র �কটি অন�য পরিচিতি উপস�থিত।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:230
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "%d-টি অন�য পরিচিতি উপস�থিত।"
 msgstr[1] "%d-টি অন�য পরিচিতি উপস�থিত।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:251
 msgid "Save in Address Book"
 msgstr "ঠিকানাবইয়ে সংরক�ষণ কর�ন"
 
@@ -20158,7 +19569,7 @@ msgstr "পারà§�শà§�ববরà§�তী বার পà§�রদরà§�শিà
 msgid "Skip development warning dialog"
 msgstr "ডিভেলপমেন�টের সতর�কবাণীর ডায়লগটি �ড়িয়ে �গিয়ে যাওয়া হবে"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:305
 msgid "Start in offline mode"
 msgstr "অফলাইন মোডে আরম�ভ করা হবে"
 
@@ -20318,159 +19729,52 @@ msgid "Window buttons are visible"
 msgstr "উইন�ডোর বাটন প�রদর�শন করা হবে"
 
 # FIXME: 'ভিত�তি' শব�দটার ব�যবহার ঠিক ভাল লাগতেছে না :-(
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
 msgid "Searches"
 msgstr "অন�সন�ধান"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:545
 msgid "Save Search"
 msgstr "অন�সন�ধান সংরক�ষণ কর�ন"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld কিলোবাইট"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 #, fuzzy
 msgid "Sho_w:"
 msgstr "প�রদর�শন করা হবে:(_w)"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 #, fuzzy
 msgid "Sear_ch:"
 msgstr "অন�সন�ধান করা হবে:(_c)"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 #, fuzzy
 msgid "i_n"
 msgstr " চিহ�নিত স�থানে (_n)"
 
-#: ../shell/e-shell-switcher.c:448
-#, fuzzy
-msgid "Toolbar Style"
-msgstr "ট�লবারের বিন�যাস (_b)"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr ""
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-#, fuzzy
-msgid "Toolbar Visible"
-msgstr "ট�লবার প�রদর�শিত হচ�ছে"
-
-#: ../shell/e-shell-switcher.c:466
-#, fuzzy
-msgid "Whether the switcher is visible"
-msgstr "পার�শ�ববর�তী বার প�রদর�শিত হবে কি না।"
-
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:253
 #, fuzzy
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../shell/e-shell-utils.c:249
+#: ../shell/e-shell-utils.c:255
 #, fuzzy
 msgid "iCalendar (.ics)"
 msgstr "iCalendar-র ফাইল(.ics)"
 
-#: ../shell/e-shell-utils.c:270
+#: ../shell/e-shell-utils.c:276
 #, fuzzy
 msgid "All Files (*)"
 msgstr "সর�বধরনের ফাইল"
 
-#: ../shell/e-shell-view.c:681
-#, fuzzy
-msgid "Switcher Action"
-msgstr "%s-� পরিবর�তন কর�ন"
-
-#: ../shell/e-shell-view.c:682
-msgid "The switcher action for this shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:697
-#, fuzzy
-msgid "Page Number"
-msgstr "ক�রমিক সংখ�যা"
-
-#: ../shell/e-shell-view.c:698
-msgid "The notebook page number of the shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:714
-#, fuzzy
-msgid "Search Rule"
-msgstr "অন�সন�ধানের ফিল�টার"
-
-#: ../shell/e-shell-view.c:715
-msgid "Criteria for the current search results"
-msgstr ""
-
-#: ../shell/e-shell-view.c:730
-msgid "The EShellBackend for this shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:745
-msgid "Shell Content Widget"
-msgstr ""
-
-#: ../shell/e-shell-view.c:746
-msgid "The content widget appears in a shell window's right pane"
-msgstr ""
-
-#: ../shell/e-shell-view.c:762
-#, fuzzy
-msgid "Shell Sidebar Widget"
-msgstr "সাইডবারের ডিফল�ট প�রস�থ"
-
-#: ../shell/e-shell-view.c:763
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
-
-#: ../shell/e-shell-view.c:778
-msgid "Shell Taskbar Widget"
-msgstr ""
-
-#: ../shell/e-shell-view.c:779
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
-
-#: ../shell/e-shell-view.c:794
-#, fuzzy
-msgid "Shell Window"
-msgstr "নত�ন উইন�ডো (_W)"
-
-#: ../shell/e-shell-view.c:795
-msgid "The window to which the shell view belongs"
-msgstr ""
-
-#: ../shell/e-shell-view.c:811
-msgid "The key file holding widget state data"
-msgstr ""
-
-#: ../shell/e-shell-view.c:826
-msgid "The title of the shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:840
-#, fuzzy
-msgid "Current View ID"
-msgstr "বর�তমান প�রদর�শনক�ষেত�র (_C)"
-
-#: ../shell/e-shell-view.c:841
-#, fuzzy
-msgid "The current GAL view ID"
-msgstr "বর�তমান স�বনির�ধারিত প�রদর�শন বিন�যাস সংরক�ষণ কর�ন"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -20486,448 +19790,344 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution ওয়েব-সাইট"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1228
 #, fuzzy
 msgid "Bug Buddy is not installed."
 msgstr "বাগ-বাডি ইনস�টল করা হয়নি।"
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1230
 #, fuzzy
 msgid "Bug Buddy could not be run."
 msgstr "বাগ-বাডি চালানো যায়নি।"
 
-#: ../shell/e-shell-window-actions.c:1343
+#: ../shell/e-shell-window-actions.c:1347
 #, fuzzy
 msgid "GNOME Pilot is not installed."
 msgstr "বাগ-বাডি ইনস�টল করা হয়নি।"
 
-#: ../shell/e-shell-window-actions.c:1345
+#: ../shell/e-shell-window-actions.c:1349
 #, fuzzy
 msgid "GNOME Pilot could not be run."
 msgstr "বাগ-বাডি চালানো যায়নি।"
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1443
 msgid "Show information about Evolution"
 msgstr "Evolution সংক�রান�ত তথ�য প�রদর�শন কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "উইন�ডো বন�ধ কর�ন (_C)"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1455
 #, fuzzy
 msgid "_Contents"
 msgstr "সাক�ষাৎকার (_p)"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1457
 #, fuzzy
 msgid "Open the Evolution User Guide"
 msgstr "অন�যান�য ব�যবহারকারীর ফোল�ডার খ�ল�ন"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "সাধারণ প�রশ�নাবলীর ওয়েব-পেজ প�রদর�শন করা হবে"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1490
 msgid "_Forget Passwords"
 msgstr "পাসওয়ার�ড মনে রাখা হবে না (_F)"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1492
 #, fuzzy
 msgid "Forget all remembered passwords"
 msgstr "আপনি কি �ই সংরক�ষিত পাসওয়ার�ডগ�লি নিশ�চিতরূপে ম�ছে ফেলতে ইচ�ছ�ক?"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1497
 msgid "I_mport..."
 msgstr "ইম�পোর�ট কর�ন...(_m)"
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Import data from other programs"
 msgstr "অন�যান�য প�রোগ�রাম থেকে ডাটা ইম�পোর�ট কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1504
 msgid "New _Window"
 msgstr "নত�ন উইন�ডো (_W)"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1506
 #, fuzzy
 msgid "Create a new window displaying this view"
 msgstr "�কটি নত�ন উইন�ডো তৈরি করে �ই ফোল�ডারটি প�রদর�শন কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1520
 #, fuzzy
 msgid "Configure Evolution"
 msgstr "কনফিগারেশন"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "দ�র�ত তথ�য প�রাপ�তি (_Q)"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1527
 #, fuzzy
 msgid "Show Evolution's shortcut keys"
 msgstr "Evolution-র বৈশিষ�ট�য পরিবর�তন কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "প�রোগ�রাম থেকে প�রস�থান কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "উন�নত অন�সন�ধান প�রক�রিয়া...(_A)"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1548
 #, fuzzy
 msgid "Clear the current search parameters"
 msgstr "অন�সন�ধানের তথ�য ম�ছে ফেল�ন"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1553
 msgid "_Edit Saved Searches..."
 msgstr "সংরক�ষিত অন�সন�ধান ফল সম�পাদন কর�ন...(_E)"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1555
 #, fuzzy
 msgid "Manage your saved searches"
 msgstr "ই-মেইল, পরিচিতি ও কর�মতালিকা �খানে কনফিগার কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "অন�সন�ধানের ধরন নির�বাচনের জন�য �ই স�থানে ক�লিক কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "�খন অন�সন�ধান কর�ন (_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1569
 #, fuzzy
 msgid "Execute the current search parameters"
 msgstr "বর�তমান মেইল অপারেশনটি বাতিল কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "অন�সন�ধান সংরক�ষণ কর�ন...(_S)"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1576
 #, fuzzy
 msgid "Save the current search parameters"
 msgstr "বর�তমান ফাইলটি সংরক�ষণ কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Send / _Receive"
 msgstr "মেইল প�রেরণ / গ�রহণ কর�ন(_R)"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Send queued items and retrieve new items"
 msgstr "তালিকাভ�ক�ত বস�ত� প�রেরণ কর�ন �বং নত�ন বস�ত� আহরণ কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1595
 #, fuzzy
 msgid "Submit _Bug Report..."
 msgstr "বাগ রিপোর�ট প�রেরণ কর�ন (_B)"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy ব�যবহার করে বাগ রিপোর�ট প�রেরণ কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1602
 #, fuzzy
 msgid "GNOME Pilot _Synchronization..."
 msgstr "iPod'র সাথে স�সংগতি"
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1604
 #, fuzzy
 msgid "Set up GNOME Pilot configuration"
 msgstr "পাইলট কনফিগারেশন নির�ধারণ কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Work Offline"
 msgstr "অফলাইন কাজ কর�ন (_W)"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1611
 #, fuzzy
 msgid "Put Evolution into offline mode"
 msgstr "অফলাইন মোডে আরম�ভ করা হবে"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Work Online"
 msgstr "অনলাইন কাজ করা হবে (_W)"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1618
 #, fuzzy
 msgid "Put Evolution into online mode"
 msgstr "অনলাইন মোডে আরম�ভ করা হবে"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1646
 msgid "Lay_out"
 msgstr "বিন�যাস(_o)"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_New"
 msgstr "নত�ন (_N)"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Search"
 msgstr "অন�সন�ধান কর�ন (_S)"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Switcher Appearance"
 msgstr "অদলবদলকারীর চেহারাছবি (_S)"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Window"
 msgstr "উইন�ডো (_W)"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show Side _Bar"
 msgstr "পার�শ�ববর�তী বার প�রদর�শন করা হবে (_B)"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1712
 #, fuzzy
 msgid "Show the side bar"
 msgstr "পার�শ�ববর�তী বার প�রদর�শন করা হবে (_B)"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1718
 #, fuzzy
 msgid "Show _Buttons"
 msgstr "অ�যানিমেশন ছবি প�রদর�শন করা হবে"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1720
 #, fuzzy
 msgid "Show the switcher buttons"
 msgstr "দ�বিতীয় সময়ের অঞ�চল প�রদর�শন করা হবে"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1726
 msgid "Show _Status Bar"
 msgstr "স�ট�যাটার বার প�রদর�শন করা হবে (_S)"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1728
 #, fuzzy
 msgid "Show the status bar"
 msgstr "স�ট�যাটার বার প�রদর�শন করা হবে (_S)"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1734
 #, fuzzy
 msgid "Show _Tool Bar"
 msgstr "ট�ল-বার প�রদর�শন করা হবে (_T)"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1736
 #, fuzzy
 msgid "Show the tool bar"
 msgstr "ট�ল-বার প�রদর�শন করা হবে (_T)"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1758
 msgid "_Icons Only"
 msgstr "শ�ধ�মাত�র আইকন ব�যবহৃত হবে (_I)"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Display window buttons with icons only"
 msgstr "উইন�ডো বাটনের উপর শ�ধ�মাত�র আইকন প�রদর�শন করা হবে"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1765
 msgid "_Text Only"
 msgstr "শ�ধ�মাত�র টেক�সট (_T)"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1767
 msgid "Display window buttons with text only"
 msgstr "উইন�ডো বাটনের উপর শ�ধ�মাত�র টেক�সট প�রদর�শন করা হবে"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Icons _and Text"
 msgstr "আইকন �বং টেক�সট (_a)"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Display window buttons with icons and text"
 msgstr "উইন�ডো বাটনের উপর আইকন �বং টেক�সট প�রদর�শন করা হবে"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Tool_bar Style"
 msgstr "ট�লবারের বিন�যাস (_b)"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "ডেস�কটপ ট�লবারের বৈশিষ�ট�যের সাহায�যে উইন�ডোর বাটন প�রদর�শন কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Define Views..."
 msgstr "ভিউ নির�ধারণ কর�ন..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1791
 msgid "Create or edit views"
 msgstr "প�রদর�শন ক�ষেত�র নির�মাণ অথবা সম�পাদনা"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Save Custom View..."
 msgstr "স�বনির�বাচিত ভিউ সংরক�ষণ কর�ন..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Save current custom view"
 msgstr "বর�তমান স�বনির�ধারিত প�রদর�শন বিন�যাস সংরক�ষণ কর�ন"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1805
 msgid "C_urrent View"
 msgstr "বর�তমান প�রদর�শনক�ষেত�র (_u)"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Custom View"
 msgstr "স�বনির�বাচিত ভিউ"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Current view is a customized view"
 msgstr "বর�তমান প�রদর�শনে স�বনির�ধারিত বিন�যাস ব�যবহৃত হচ�ছে"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1827
 #, fuzzy
 msgid "Change the page settings for your current printer"
 msgstr "আপনার বর�তমান প�রিন�টারের জন�য পৃষ�ঠা সংক�রান�ত বৈশিষ�ঠ�যাবলী নির�ধারণ কর�ন"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2204
 #, c-format
 msgid "Switch to %s"
 msgstr "%s-� পরিবর�তন কর�ন"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2417
 msgid "Execute these search parameters"
 msgstr ""
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:571
+#: ../shell/e-shell-window-private.c:573
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "নত�ন"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr ""
-
-#: ../shell/e-shell-window.c:617
-#, fuzzy
-msgid "Name of the active shell view"
-msgstr "নত�ন প�রদর�শন ক�ষেত�রের নাম:"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr ""
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:804
-msgid "Geometry"
-msgstr ""
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:805
-msgid "Initial window geometry string"
-msgstr ""
-
-#: ../shell/e-shell-window.c:662
-#, fuzzy
-msgid "Safe Mode"
-msgstr "ক�যারেট মোড (_C)"
-
-#: ../shell/e-shell-window.c:663
-#, fuzzy
-msgid "Whether the shell window is in safe mode"
-msgstr "চিহ�নিত প�লাগ-ইন সক�রিয় রয়েছে কি না"
-
-#: ../shell/e-shell-window.c:694
-#, fuzzy
-msgid "Sidebar Visible"
-msgstr "পার�শ�ববর�তী বার প�রদর�শিত হচ�ছে"
-
-#: ../shell/e-shell-window.c:695
-#, fuzzy
-msgid "Whether the shell window's side bar is visible"
-msgstr "উইন�ডোর বাটন প�রদর�শন করা হবে কি না।"
-
-#: ../shell/e-shell-window.c:709
-#, fuzzy
-msgid "Switcher Visible"
-msgstr "পার�শ�ববর�তী বার প�রদর�শিত হচ�ছে"
-
-#: ../shell/e-shell-window.c:710
-#, fuzzy
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "উইন�ডোর বাটন প�রদর�শন করা হবে কি না।"
-
-#: ../shell/e-shell-window.c:725
-#, fuzzy
-msgid "Taskbar Visible"
-msgstr "স�ট�যাটাস-বার প�রদর�শিত হচ�ছে"
-
-#: ../shell/e-shell-window.c:726
-#, fuzzy
-msgid "Whether the shell window's task bar is visible"
-msgstr "স�ট�যাটাস-বার প�রদর�শিত হবে কি না।"
-
-#: ../shell/e-shell-window.c:741
-#, fuzzy
-msgid "Whether the shell window's tool bar is visible"
-msgstr "উইন�ডোর বাটন প�রদর�শন করা হবে কি না।"
-
-# "Manager" �র বাংলা হইলো 'ব�যবস�থাপক'। তবে Context ব��তে না পারায় আপাতত সেটা লিখলাম না।
-#: ../shell/e-shell-window.c:755
-#, fuzzy
-msgid "UI Manager"
-msgstr "ম�যানেজার"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr ""
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 #, fuzzy
 msgid "Preparing to go offline..."
 msgstr "'%s' অ�যাকাউন�ট অফলাইন অবস�থায় ব�যবহারের জন�য প�রস�ত�ত করা হচ�ছে"
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 #, fuzzy
 msgid "Preparing to go online..."
 msgstr "'%s' অ�যাকাউন�ট অফলাইন অবস�থায় ব�যবহারের জন�য প�রস�ত�ত করা হচ�ছে"
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr ""
 
-#: ../shell/e-shell.c:820
-#, fuzzy
-msgid "Module Directory"
-msgstr "সংরক�ষণের ডিরেক�টরি"
-
-#: ../shell/e-shell.c:821
-msgid "The directory from which to load EModules"
-msgstr ""
-
-#: ../shell/e-shell.c:836
-#, fuzzy
-msgid "Network Available"
-msgstr "টি�ল�স (TLS) উপলব�ধ নেই"
-
-#: ../shell/e-shell.c:837
-#, fuzzy
-msgid "Whether the network is available"
-msgstr "চিহ�নিত প�লাগ-ইন সক�রিয় রয়েছে কি না"
-
-#: ../shell/e-shell.c:852 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "অন-লাইন"
-
-#: ../shell/e-shell.c:853
-#, fuzzy
-msgid "Whether the shell is online"
-msgstr "চিহ�নিত প�লাগ-ইন সক�রিয় রয়েছে কি না"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:164
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20963,7 +20163,7 @@ msgstr ""
 "আশা করবো আপনারা আমাদের �ই পরিশ�রমের দর�ন উপকৃত হবেন\n"
 " �বং আমরা আপনাদের মতামতের জন�য অধীর অপেক�ষায় থাকবো!\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:188
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20971,62 +20171,58 @@ msgstr ""
 "ধন�যবাদ\n"
 "Evolution দলের পক�ষ থেকে\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:195
 msgid "Do not tell me again"
 msgstr "প�নরায় বলা হবে না"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:301
 msgid "Start Evolution activating the specified component"
 msgstr "নির�দিষ�ট কম�পোনেন�টকে সক�রিয় করে Evolution আরম�ভ কর�ন"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:303
 msgid "Apply the given geometry to the main window"
 msgstr ""
 
-#: ../shell/main.c:328
+#: ../shell/main.c:307
 msgid "Start in online mode"
 msgstr "অনলাইন মোডে আরম�ভ করা হবে"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:309
 #, fuzzy
 msgid "Start in \"express\" mode"
 msgstr "অনলাইন মোডে আরম�ভ করা হবে"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:312
 #, fuzzy
 msgid "Forcibly shut down Evolution"
 msgstr "Evolution-র সমস�ত অংশবিশেষ বলপূর�বক বন�ধ করা হবে"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Evolution ১.৪ থেকে বলপূর�বক প�নরায় মাইগ�রেট করা হবে"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:315
 msgid "Send the debugging output of all components to a file."
 msgstr "সকল কম�পোনেন�টের ডিবাগিং প�রক�রিয়ার আউটপ�ট �কটি ফাইলে প�রেরণ করা হবে।"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:317
 msgid "Disable loading of any plugins."
 msgstr "প�লাগ-ইন লোড করার ব�যবস�থা নিষ�ক�রিয় করা হবে।"
 
-#: ../shell/main.c:344
+#: ../shell/main.c:319
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "বার�তা, পরিচিতি ও কর�মের পূর�বরূপ প�রদর�শনের পেইন নিষ�ক�রিয় করা হবে।"
 
-#: ../shell/main.c:348
+#: ../shell/main.c:323
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:350
+#: ../shell/main.c:325
 #, fuzzy
 msgid "Request a running Evolution process to quit"
 msgstr "Evolution প�নরায় আরম�ভ করা হচ�ছে"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:440
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM ও Email Client"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:466
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21040,96 +20236,45 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "আপনি কি �ই সংরক�ষিত পাসওয়ার�ডগ�লি নিশ�চিতরূপে ম�ছে ফেলতে ইচ�ছ�ক?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "�গিয়ে চল�ন"
+#, fuzzy
+msgid "Cannot upgrade directly from version {0}"
+msgstr "ভারসান {0} থেকে প�রোনো ডাটা ম�ছে ফেলা হবে কি?"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "ভারসান {0} থেকে প�রোনো ডাটা ম�ছে ফেলা হবে কি?"
+#, fuzzy
+msgid "Continue Anyway"
+msgstr "�গিয়ে চল�ন"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "পাসওয়ার�ড ম�ছে ফেলা হলে প�রয়োজনের সময় আপনাকে পাসওয়ার�ড প�নরায় উল�লেখ করার অন�রোধ "
 "জানানো হবে।"
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "আপগ�রেড করার জন�য ডিস�কে পর�যাপ�ত স�থান উপস�থিত নেই।"
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "প�রোনো ডাটা কি নিশ�চিতভাবে ম�ছে ফেলা হবে?"
+#, fuzzy
+msgid "Quit Now"
+msgstr "প�রস�থান (_Q)"
 
 #: ../shell/shell.error.xml.h:8
-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 ""
-"&quot;evolution&quot; ডিরেক�টরির সমস�ত অন�তর�ভ�ক�ত বস�ত� �খন স�থায়ীরূপে ম�ছে ফেলা হবে।\n"
-"\n"
-"প�রোনো ডাটা ম�ছে ফেলার পূর�বে আপনার সমস�ত মেইল, পরিচিতি �বং বর�ষপঞ�জির ডাটা উপস�থিত "
-"আছে কিনা, �বং Evolution-র �ই সংস�করণ সঠিকভাবে চলছে কিনা তা পরীক�ষা করে নেওয়া "
-"বাঞ�ছনীয়।\n"
-"\n"
-"ম�ছে ফেলা হলে ব�যবহারকারীর হস�তক�ষেপ ছাড়া, আপনি পূর�ববর�তী সংস�করণ ফেরত� যেতে পারবেন "
-"না।\n"
-
-#: ../shell/shell.error.xml.h:14
-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 ""
-"Evolution-র পূর�ববর�তী সংস�করণের দ�বারা �র তথ�য �কটি পৃথক স�থানে সংরক�ষণ করা হয়।\n"
-"\n"
-"আপনি যদি �ই তথ�য ম�ছে ফেলেন, তাহলে &quot;evolution&quot; ডিরেক�টরিটি স�থায়ীরূপে "
-"ম�ছে যাবে। যদি �ই তথ�য সংরক�ষণ করতে ইচ�ছ�ক থাকেন, তাহলে &quot;evolution&quot;-র "
-"মধ�যে উপস�থিত সকল তথ�য নিজের স�বিধা অন�যায়ী স�বয়ং সরিয়ে নিতে পারেন।\n"
-
-#: ../shell/shell.error.xml.h:18
 #, fuzzy
 msgid "Upgrade from previous version failed:"
 msgstr "পূর�ববর�তী সংস�করণ থেকে আপগ�রেড করতে ব�যর�থ: {0}"
 
-#: ../shell/shell.error.xml.h:19
-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 ""
-"আপনার ডাটা �বং বৈশিষ�ট�য আপগ�রেড করতে হলে ডিস�কে {0} স�থান প�রয়োজন, কিন�ত� আপনার "
-"ডিস�কে শ�ধ�মাত�র {1} স�থান উপলব�ধ আছে।\n"
-"\n"
-"�গিয়ে যাওয়ার পূর�বে, আপনার ব�যক�তিগত ডিরেক�টরিতে অধিকতর স�থান উপলব�ধ করা আবশ�যক।"
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "ম�ছে ফেলা হবে (_F)"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "ডাটা রক�ষা করা হবে (_K)"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "পরে মনে করাবে (_R)"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 #, fuzzy
 msgid ""
 "{0}\n"
@@ -21229,7 +20374,7 @@ msgstr ""
 msgid "Show session management options"
 msgstr "অ�যানিমেশন ছবি প�রদর�শন করা হবে"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21306,18 +20451,18 @@ msgstr "ই-মেইল ঠিকানা"
 msgid "All CA certificate files"
 msgstr "সব CA সার�টিফিকেট ফাইল"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:1052
 msgid "Certificates"
 msgstr "সার�টিফিকেট"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "সার�টিফিকেট প�রদর�শনকারী: %s"
 
 #: ../smime/gui/component.c:46
-#, c-format
-msgid "Enter the password for `%s'"
+#, fuzzy, c-format
+msgid "Enter the password for '%s'"
 msgstr "`%s' �র জন�য পাসওয়ার�ড লিখ�ন"
 
 #. we're setting the password initially
@@ -21348,7 +20493,7 @@ msgstr ""
 "প�রকাশক:\n"
 "  বিষয়: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "সার�টিফিকেট নির�বাচন কর�ন"
 
@@ -21376,7 +20521,7 @@ msgstr ""
 "কোনো ধরনের কর�মের উদ�দেশ�যে চিহ�নিত CA-র উপর নির�ভর করার পূর�বে প�রাপ�ত সার�টিফিকেট "
 "�বং প�রযোজ�য নিয়মনীতি (উপলব�ধ হলে) পরীক�ষা কর�ন।"
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "সার�টিফিকেট"
 
@@ -21683,28 +20828,34 @@ msgstr "সংকটপূর�ণ নয়"
 msgid "Extensions"
 msgstr "�ক�সটেনশন"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Algorithm"
 msgstr "সার�টিফিকেট স�বাক�ষরের অ�যালগোরিদম"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "ইস�কারী"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "প�রকাশকের নিজস�ব ID"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "পরিচিতির নিজস�ব ID"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1220
 msgid "Certificate Signature Value"
 msgstr "সার�টিফিকেট স�বাক�ষরের মান"
 
@@ -21793,11 +20944,11 @@ msgid "With _Status"
 msgstr "অবস�থা সহ (_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -21829,19 +20980,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "নির�বাচনের মোড"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "সংগ�রহ"
-
-#: ../widgets/menus/gal-define-views-dialog.c:332
+#: ../widgets/menus/gal-define-views-dialog.c:339
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%s-র জন�য প�রদর�শনক�ষেত�র নির�বাচন কর�ন"
 
-#: ../widgets/menus/gal-define-views-dialog.c:340
-#: ../widgets/menus/gal-define-views-dialog.c:342
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-define-views-dialog.c:349
 msgid "Define Views"
 msgstr "প�রদর�শন ক�ষেত�র নির�ধারণ কর�ন"
 
@@ -21854,11 +21000,7 @@ msgstr "\"%s\"-র জনà§�য পà§�রদরà§�শনকà§�ষেতà§�র à¦
 msgid "Table"
 msgstr "টেবিল"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "ইনস�ট�যান�স"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "বর�তমান প�রদর�শন সংরক�ষণ কর�ন"
 
@@ -21870,11 +21012,7 @@ msgstr "নত�ন প�রদর�শন ক�ষেত�র নির�
 msgid "_Replace existing view"
 msgstr "উপস�থিত প�রদর�শন ক�ষেত�র পরিবর�তন কর�ন (_R)"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "ফ�যাক�টরি"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "নত�ন ভিউ নির�ধারণ কর�ন"
 
@@ -21903,15 +21041,6 @@ msgstr "অ�যাকাউন�টের নাম"
 msgid "Protocol"
 msgstr "প�রোটোকল"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-#, fuzzy
-msgid "Action"
-msgstr "কর�ম (_A)"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr ""
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "সংয�ক�ত বস�ত�র বৈশিষ�ট�য"
@@ -21929,11 +21058,11 @@ msgstr "MIME-র ধরন:"
 msgid "_Suggest automatic display of attachment"
 msgstr "সংয�ক�ত বস�ত� স�বয়ংক�রিয়ভাবে প�রদর�শন করার পরামর�শ (_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "পটভূমী হিসাবে নির�ধারণ করতে ব�যর�থ"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "পটভূমী হিসাবে নির�ধারণ কর�ন(_B)"
 
@@ -21967,14 +21096,11 @@ msgid "Hide Attachment _Bar"
 msgstr "সংয�ক�ত বস�ত�র বার আড়াল করা হবে (_A)"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:636
 #, fuzzy
 msgid "Show Attachment _Bar"
 msgstr "সংয�ক�ত বস�ত�সহ বার প�রদর�শন করা হবে (_A)"
 
-#: ../widgets/misc/e-attachment-paned.c:636
-msgid "Show _Attachment Bar"
-msgstr "সংয�ক�ত বস�ত�সহ বার প�রদর�শন করা হবে (_A)"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "বস�ত� সংয�ক�ত কর�ন"
@@ -21991,32 +21117,32 @@ msgstr[1] "সংয�ক�ত বস�ত� সংরক�ষণ কর�
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "সমস�ত সংরক�ষণ কর�ন (_a)"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "বস�ত� সংয�ক�ত কর�ন... (_A)"
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "ল�কিয়ে ফেল�ন (_H)"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:356
 msgid "_View Inline"
 msgstr "ইনলাইন প�রতক�ষ�য কর�ন (_V)"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "\"%s\" সহযোগে খ�ল�ন"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "%s সহযোগে �ই সংয�ক�ত বস�ত�টি খ�ল�ন"
@@ -22025,60 +21151,60 @@ msgstr "%s সহযোগে �ই সংয�ক�ত বস�ত�টি
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "সংয�ক�ত বার�তা"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 msgid "A load operation is already in progress"
 msgstr "বর�তমানে লোড করা হচ�ছে"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 msgid "A save operation is already in progress"
 msgstr "বর�তমানে সংরক�ষণ করা হচ�ছে"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s' লোড করতে ব�যর�থ"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "সংয�ক�ত বস�ত� লোড করতে ব�যর�থ"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2193
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s' খ�লতে ব�যর�থ"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2196
 #, c-format
 msgid "Could not open the attachment"
 msgstr "সংয�ক�ত বস�ত� খ�লতে ব�যর�থ"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "সংয�ক�ত বস�ত�র মধ�যে অন�তর�ভ�ক�ত সামগ�রী লোড করা যায়নি"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2707
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s' সংরক�ষণ করতে ব�যর�থ"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2710
 #, c-format
 msgid "Could not save the attachment"
 msgstr "সংয�ক�ত বস�ত� সংরক�ষণ করতে ব�যর�থ"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 #, fuzzy
 msgid "Ctrl-click to open a link"
 msgstr "%s খোলার জন�য ক�লিক কর�ন"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -22086,65 +21212,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "মাস অন�যায়ী বর�ষপঞ�জি"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "পূরণ করতে ব�যবহৃত রং"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK পূরণ করতে ব�যবহৃত রং"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "ক�ষ�দ�র বিন�দ� সহযোগে ভরাট"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "সর�বনিম�ন প�রস�থ"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "সর�বনিম�ন প�রস�থ"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "মধ�যবর�তী স�থান"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "অক�ষর মালা"
@@ -22157,49 +21224,49 @@ msgstr "যে অক�ষরমালাটি ব�যবহার করা
 msgid "Other..."
 msgstr "অন�যান�য..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "সময় ও তারিখ"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "তারিখ লেখঅর উদ�দেশ�যে টেক�সট �ন�ট�রি"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "বর�ষপঞ�জি প�রদর�শনের জন�য �ই বাটন ক�লিক কর�ন"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "সময় নির�বাচন করতে ব�যবহৃত কম�বোবক�স"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "�ই ম�হূর�তে (_w)"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "আজ(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "শূণ�য (_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 #, fuzzy
 msgctxt "date"
 msgid "None"
 msgstr "�কটিও নয়"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "তারিখের মান অবৈধ"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "সময়ের মান অবৈধ"
 
@@ -22300,11 +21367,11 @@ msgstr "Evolution-à¦� ফাইল ইমà§�পোরà§�ট করার জনà
 msgid "Import Data"
 msgstr "প�রয়োজনীয়"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "পৃথিবীর মানচিত�র"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22334,46 +21401,6 @@ msgstr ""
 "Evolution বর�তমানে অফলাইন কাজ করছে।\n"
 "�ই বাটনটি টিপে অনলাইনে কাজ কর�ন।"
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "বাটনের জন�য অন-লাইন অবস�থা ধার�য হয়েছে"
-
-#: ../widgets/misc/e-paned.c:306
-#, fuzzy
-msgid "Horizontal Position"
-msgstr "অন�ভূমিক পেইনের অবস�থান"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr ""
-
-#: ../widgets/misc/e-paned.c:318
-#, fuzzy
-msgid "Vertical Position"
-msgstr "উলম�ভ পেইনের অবস�থান"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr ""
-
-#: ../widgets/misc/e-paned.c:330
-#, fuzzy
-msgid "Proportion"
-msgstr "বিবিধ বৈশিষ�ট�য (_P)"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr ""
-
-#: ../widgets/misc/e-paned.c:342
-#, fuzzy
-msgid "Fixed Resize"
-msgstr "মাপ পরিবর�তন (_R)"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr ""
-
 # The equivalent for Sync escapes me now
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
@@ -22396,68 +21423,46 @@ msgstr "Evolution সংক�রান�ত পছন�দ"
 msgid "Matches: %d"
 msgstr "মিল: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "অন�সন�ধানের বার বন�ধ কর�ন"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "অন�সন�ধান:(_d)"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "অন�সন�ধানের তথ�য ম�ছে ফেল�ন"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "পূর�ববর�তী (_P)"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "�ই পংক�তির পূর�ববর�তী উপস�থিতি সন�ধান কর�ন"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "পরবর�তী (_N)"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "�ই পংক�তির পরবর�তী উপস�থিতি সন�ধান কর�ন"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "হরফের ছা�দ মেলানো হবে (_c)"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr "পৃষ�ঠায় সমাপ�তি অবধি অন�সন�ধান করা হয়েছে, প�রারম�ভ থেকে অন�সন�ধান আরম�ভ করা হচ�ছে"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "পৃষ�ঠায় প�রারম�ভ অবধি অন�সন�ধান করা হয়েছে, সমাপ�তি থেকে অন�সন�ধান আরম�ভ করা হচ�ছে"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "কার�সারের সারি"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "কার�সারের কলাম"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "ক�রমান�যায়ী বিন�যাস ব�যবস�থা"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "নির�বাচনের মোড"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "কার�সারের মোড"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "ম�ছে ফেলার সময়(_l):"
@@ -22539,43 +21544,48 @@ msgstr "সমাপ�তির সময়(_m):"
 msgid "When decli_ned:"
 msgstr "প�রত�যাখ�যানের সময় (_n):"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "অন�তর�গত (_t)"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+#, fuzzy
+msgid "_After"
 msgstr "পরে (_A):"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "সমস�ত তথ�য (_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "শ�রেণীবিভাগ: (_C)"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "বিলম�বের পরে বার�তা প�রেরণ করা হবে (_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "প�রেরিত হয়েছে (_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "মেয়াদপূর�তীর তারিখ নির�ধারণ কর�ন (_S)"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+#, fuzzy
+msgid "_Until"
 msgstr "অবধি (_U):"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "স�বিধাজনক সময়ে (_W)"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "খোলার সময় (_W):"
 
@@ -22636,45 +21646,45 @@ msgstr "স�ক�রিপ�ট ফাইলটি উপস�থিত �
 msgid "Click here to go to URL"
 msgstr "URL দেখতে �ইস�থানে ক�লিক কর�ন"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:359
 msgid "_Copy Link Location"
 msgstr "লিঙ�কের স�থান কপি কর�ন (_C)"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:361
 #, fuzzy
 msgid "Copy the link to the clipboard"
 msgstr "ক�লিপবোর�ডে তথ�য কপি কর�ন।"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Open Link in Browser"
 msgstr "লিঙ�কটি ব�রাউজারে প�রদর�শন কর�ন (_O)"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:371
 #, fuzzy
 msgid "Open the link in a web browser"
 msgstr "লিঙ�কটি ব�রাউজারে প�রদর�শন কর�ন (_O)"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:379
 #, fuzzy
 msgid "_Copy Email Address"
 msgstr "ই-মেইল ঠিকানা কপি কর�ন (_E)"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
 #, fuzzy
 msgid "Select all text and images"
 msgstr "বার�তার মধ�যে সমস�ত টেক�সট নির�বাচন কর�ন"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 #, c-format
 msgid "Click to call %s"
 msgstr "%s-কে কল করতে হলে ক�লিক কর�ন"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:846
 msgid "Click to hide/unhide addresses"
 msgstr "ঠিকানা প�রদর�শন/আড়াল করার উদ�দেশ�যে ক�লিক কর�ন"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to open %s"
 msgstr "%s খোলার জন�য ক�লিক কর�ন"
@@ -22693,7 +21703,7 @@ msgstr "বর�ষপঞ�জি: %s থেকে %s অবধি"
 msgid "evolution calendar item"
 msgstr "Evolution বর�ষপঞ�জির বিষয়বস�ত�"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "পপ-আপ তালিকা"
 
@@ -22712,7 +21722,7 @@ msgstr "�কটিও নয়"
 msgid "OK"
 msgstr "ঠিক আছে"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "তারিখ যে ফরমায় হতে হবে: %s"
@@ -22721,48 +21731,12 @@ msgstr "তারিখ যে ফরমায় হতে হবে: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "শতাংশের মান ০ থেকে ১০০ -র মধ�যে হতে হবে, দ�টি সংখ�যাই �র অন�তর�ভ�ক�ত"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "নির�বাচিত কলাম"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "ফোকাস করা কলাম"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "অনির�বাচিত কলাম"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "কলামে মধ�যরেখাঙ�কন করা হবে"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "কলামে নিম�নরেখাঙ�কন করা হবে"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "কলামকে উজ�জ�বল করা হবে"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "কলাম রঙীন করা হবে"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "কলামের প�ভূমির রং"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "ক�লিক করে যোগ কর�ন"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "অবস�থা"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(ছোট থেকে বড়)"
@@ -22779,12 +21753,12 @@ msgstr "বিন�যস�ত নয়"
 msgid "No grouping"
 msgstr "দল নির�ধারিত হয়নি"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "ক�ষেত�র প�রদর�শন করা হবে"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "উপস�থিত ক�ষেত�র"
 
@@ -22793,7 +21767,7 @@ msgid "A_vailable Fields:"
 msgstr "উপস�থিত ক�ষেত�র (_v):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "ছোট থেকে বড়"
 
@@ -22806,7 +21780,7 @@ msgid "Clear _All"
 msgstr "সমস�ত ম�ছে ফেল�ন (_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "বড় থেকে ছোট"
 
@@ -22866,7 +21840,7 @@ msgstr "কà§�রমানà§�সারে à¦�ই কà§�ষেতà§�রগà§�লà
 msgid "_Sort..."
 msgstr "ক�রমান�সারে বিন�যাস...(_S)"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 #, fuzzy
 msgid "Add a Column"
 msgstr "�কটি কলাম যোগ কর�ন...(_o)"
@@ -22879,249 +21853,113 @@ msgstr ""
 "টেবিলের মধ�যে কলাম যোগ করার জন�য,\n"
 "প�রদর�শনের জন�য চিহ�নিত স�থানে তা টেনে আন�ন।"
 
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
+#, fuzzy, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s : %s (%d-টি বস�ত�)"
 msgstr[1] "%s : %s (%d-টি বস�ত�)"
 
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d-টি বস�ত�)"
 msgstr[1] "%s (%d-টি বস�ত�)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "�কটি সারি অন�তর �ক রং ব�যবহার করা হবে"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "আন�ভূমিক দিশায় আ�কা গ�রিড"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "উলম�ব দিশায় আ�কা গ�রিড"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "ফোকাস আ�কা হবে"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "কার�সার মোড"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "নির�বাচনের মডেল"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "দৈঘ�যের প�রান�তিক মাপ"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "সমান উচ�চতার সারি"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "আবদ�ধ"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
 msgstr "বর�তমান প�রদর�শন ব�যবস�থা নিজস�ব পছন�দ অন�যায়ী বিন�যাস কর�ন"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Sort _Ascending"
 msgstr "ছোট থেকে বড় ক�রম অন�যায়ী বিন�যাস (_A)"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1565
 msgid "Sort _Descending"
 msgstr "বড় থেকে ছোট ক�রম অন�যায়ী বিন�যাস (_D)"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1568
 msgid "_Unsort"
 msgstr "অবিন�যাস�ত করা হবে (_U)"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1571
 msgid "Group By This _Field"
 msgstr "চিহ�নিত ক�ষেত�র অন�যায়ী দলভ�ক�ত করা হবে (_F)"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Group By _Box"
 msgstr "বক�স অন�যায়ী দলভ�ক�ত কর�ন (_B)"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Remove This _Column"
 msgstr "চিহ�নিত কলাম ম�ছে ফেল�ন (_C)"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Add a C_olumn..."
 msgstr "�কটি কলাম যোগ কর�ন...(_o)"
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "A_lignment"
 msgstr "দিশা (_l)"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "B_est Fit"
 msgstr "সর�বোত�তম মাপ (_e)"
 
 # FIXME
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Format Column_s..."
 msgstr "কলাম বিন�যাস কর�ন...(_s)"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Custo_mize Current View..."
 msgstr "বর�তমান প�রদর�শনক�ষেত�র নিজস�ব পছন�দ অন�যায়ী বিন�যাস কর�ন...(_m)"
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Sort By"
 msgstr "ক�রমবিন�যাস করা হবে (_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1672
 msgid "_Custom"
 msgstr "স�বনির�ধারিত (_C)"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "টেবিলের শিরোনাম"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "টেবিলের মডেল"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "কার�সারের সারি"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "তথ�য ক�রমবিন�যাস কর�ন"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "সর�বদা অন�সন�ধান করা হবে"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "ক�লিক করে যেগ কর�ন"
-
-#: ../widgets/table/e-table.c:3374
-#, fuzzy
-msgid "Vertical Row Spacing"
-msgstr "উলম�ব দিশায় আ�কা গ�রিড"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr ""
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree টেবিল অ�যাডাপ�টার"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "প�রোনো রূপ"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "রেখা ও +/- �ক�সপ�যান�ডার আ�ক�ন।"
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "অধিকৃতি দৈর�ঘ�য"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "অধিকৃতি চিহ�নের দৈর�ঘ�য"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "পপ-আপ"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "�কটি চাইল�ড পপ-আপ করা হবে"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "সম�পাদনা"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "বর�তমান সেল সম�পাদন কর�ন"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "অদলবদল"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "সেল অদলবদল কর�ন"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "প�রসারণ"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "ETree-র মধ�যে বর�তমান সেল ধারণকারী সারি প�রসারিত করে"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "সঙ�ক�চন"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ETree-র মধ�যে বর�তমান সেল ধারণকারী সারি সঙ�ক�চিত করে"
 
@@ -23137,120 +21975,14 @@ msgstr "ক�লিক কর�ন"
 msgid "sort"
 msgstr "ক�রমবিন�যাস"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "সমস�ত নির�বাচন কর�ন"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "ইনপ�টের পদ�ধতি"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "ঘটনা প�রসেস ব�যবস�থা"
-
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "টেক�সট"
-
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "গাড়"
-
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "মধ�যরেখাঙ�কিত"
-
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "অ�যাঙ�কর"
-
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "সমপ�রান�ত নির�ধারণ"
-
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "প�রস�থ হ�রাস করা হবে"
-
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "উচ�চতা হ�রাস করা হবে"
-
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "হ�রাস করা হবে"
-
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "হ�রাস করা আয়তক�ষেত�র ভরাট করা হবে"
-
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "X অফসেট"
-
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Y অফসেট"
-
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "টেক�সটের প�রস�থ"
-
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "হরফের উচ�চতা"
-
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "ইলিপসিস প�রয়োগ করা হবে"
-
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "ইলিপসিস"
-
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "লাইন গ�টানো"
-
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "বিভাজনের অক�ষর"
-
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "সর�বাধিক পংক�তি সংখ�যা"
-
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "প�রান�তরেখা আ�ক�ন"
-
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "নত�ন পংক�তি নির�মাণের অন�মতি প�রদান করা হবে"
-
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "পটভূমী আ�কা হবে"
-
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "বাটন আক��ন"
-
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "কার�সারের অবস�থান"
-
-# FIXME
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "IM অন�যায়ী"
-
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "পপ-আপ ব�যবস�থাপনা"
-
 # FIXME: 'ভিত�তি' শব�দটার ব�যবহার ঠিক ভাল লাগতেছে না :-(
 #~ msgid "search bar"
 #~ msgstr "অন�সন�ধানের স�থান"
@@ -23258,6 +21990,21 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "evolution calendar search bar"
 #~ msgstr "Evolution বর�ষপঞ�জি ও অন�সন�ধানের স�থান"
 
+#~ msgid "popup"
+#~ msgstr "পপ-আপ"
+
+#~ msgid "edit"
+#~ msgstr "সম�পাদনা"
+
+#~ msgid "toggle"
+#~ msgstr "অদলবদল"
+
+#~ msgid "expand"
+#~ msgstr "প�রসারণ"
+
+#~ msgid "collapse"
+#~ msgstr "সঙ�ক�চন"
+
 #~ msgid "Combo Button"
 #~ msgstr "কম�বো বাটন"
 
@@ -23273,6 +22020,12 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Server Version"
 #~ msgstr "সার�ভারের সংস�করণ"
 
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
 #~ msgid "C_ontacts"
 #~ msgstr "পরিচিতি (_o)"
 
@@ -23312,6 +22065,51 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Base"
 #~ msgstr "ভিত�তি"
 
+#~ msgid "LDAP Servers"
+#~ msgstr "LDAP সার�ভার"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "স�বয়ংক�রিয়ভাবে সম�পূর�ণ করার প�রক�রিয়া সংক�রান�ত বৈশিষ�ট�য"
+
+#~ 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 ""
+#~ "Evolution পরিচিতির ফোল�ডারের অবস�থান �বং অন�ক�রম Evolution ১.x-র পরবর�তী "
+#~ "সংস�করণে পরিবর�তিত হয়েছে।\n"
+#~ "\n"
+#~ "Evolution-র দ�বারা আপনার ফোল�ডার মাইগ�রেট করা হচ�ছে, অন�গ�রহ করে অপেক�ষা কর�ন..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "মেইলিং লিস�টের পরিচিতির ফরমা পরিবর�তিত হয়েছে।\n"
+#~ "\n"
+#~ "Evolution-র দ�বারা আপনার ফোল�ডার মাইগ�রেট করা হচ�ছে, অন�গ�রহ করে অপেক�ষা কর�ন..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution-র দ�বারা ফোন নম�বর সংরক�ষণ প�রক�রিয়া পরিবর�তিত হয়েছে।\n"
+#~ "\n"
+#~ "Evolution-র দ�বারা আপনার ফোল�ডার মাইগ�রেট করা হচ�ছে, অন�গ�রহ করে অপেক�ষা কর�ন..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Evolution-র Palm Sync changelog �বং ম�যাপ ফাইলগ�লি পরিবর�তন করা হয়েছে।\n"
+#~ "\n"
+#~ "Evolution-র দ�বারা আপনার পাইলট সিঙ�ক তথ�য মাইগ�রেট করা হচ�ছে, অন�গ�রহ করে অপেক�ষা "
+#~ "কর�ন..."
+
 #~ msgid "Rename the \"%s\" folder to:"
 #~ msgstr "\"%s\" ফোল�ডারের নাম পরিবর�তিত করে করা হবে:"
 
@@ -23429,6 +22227,30 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "<b>Work</b>"
 #~ msgstr "<b>কর�ম</b>"
 
+#~ msgid "_Web Log:"
+#~ msgstr "ওয়েব লগ(_W):"
+
+#~ msgid "Editable"
+#~ msgstr "সম�পাদনযোগ�য"
+
+#~ msgid "Source Book"
+#~ msgstr "উৎস বই"
+
+#~ msgid "Target Book"
+#~ msgstr "গন�তব�যর বই"
+
+#~ msgid "Is New Contact"
+#~ msgstr "নত�ন পরিচিতি হল"
+
+#~ msgid "Writable Fields"
+#~ msgstr "লিখনযোগ�য ক�ষেত�র"
+
+#~ msgid "Required Fields"
+#~ msgstr "আবশ�যক মান"
+
+#~ msgid "Changed"
+#~ msgstr "পরিবর�তিত"
+
 #~ msgid ""
 #~ "\n"
 #~ "Mr.\n"
@@ -23464,6 +22286,18 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "<b>Members</b>"
 #~ msgstr "<b>সদস�য</b>"
 
+#~ msgid "Book"
+#~ msgstr "বই"
+
+#~ msgid "Is New List"
+#~ msgstr "হল নত�ন লিস�ট"
+
+#~ msgid "Query"
+#~ msgstr "অন�সন�ধান"
+
+#~ msgid "Model"
+#~ msgstr "মডেল"
+
 #~ msgid "Name begins with"
 #~ msgstr "নামের প�রথমাংশে আছে"
 
@@ -23488,6 +22322,36 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "P_aste"
 #~ msgstr "পেস�ট কর�ন(_a)"
 
+#~ msgid "Width"
+#~ msgstr "প�রস�থ"
+
+#~ msgid "Height"
+#~ msgstr "উচ�চতা"
+
+#~ msgid "Has Focus"
+#~ msgstr "ফোকাসকৃত অবস�থায় আছে"
+
+#~ msgid "Field"
+#~ msgstr "ক�ষেত�র"
+
+#~ msgid "Text Model"
+#~ msgstr "টেক�সট মডেল"
+
+#~ msgid "Max field name length"
+#~ msgstr "ক�ষেত�রের নামের সর�বোচ�চ দৈর�ঘ�য"
+
+#~ msgid "Column Width"
+#~ msgstr "কলামের প�রস�থ"
+
+#~ msgid "Adapter"
+#~ msgstr "অ�যাডাপ�টার"
+
+#~ msgid "Selected"
+#~ msgstr "নির�বাচিত"
+
+#~ msgid "Has Cursor"
+#~ msgstr "কার�সার আছে"
+
 #~ msgid ""
 #~ "%s already exists\n"
 #~ "Do you want to overwrite it?"
@@ -23506,6 +22370,16 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Querying Address Book..."
 #~ msgstr "ঠিকানা-বইয়ে অন�সন�ধান করা হচ�ছে..."
 
+# FIXME
+#~ msgid "Calendar repository is offline."
+#~ msgstr "বর�ষপঞ�জির রিপোসিটরি অফলাইন আছে।"
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "'{0}'-� সমস�যা হয়েছে।"
+
+#~ msgid "No response from the server."
+#~ msgstr "সার�ভার থেকে কোনো প�রতিক�রিয়া পাওয়া যায়নি।"
+
 #~ msgid "Save Appointment"
 #~ msgstr "সাক�ষাৎকার সংরক�ষণ কর�ন"
 
@@ -23515,6 +22389,12 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Save Task"
 #~ msgstr "কাজ সংরক�ষণ কর�ন"
 
+#~ msgid "Unable to load the calendar"
+#~ msgstr "বর�ষপঞ�জি লোড করতে ব�যর�থ"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
 #~ msgid "Configure your timezone, Calendar and Task List here "
 #~ msgstr "�খানে আপনার সময়-অঞ�চল, বর�ষপঞ�জি �বং কার�যতালিকা কনফিগার কর�ন "
 
@@ -23726,6 +22606,9 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ "সাক�ষাৎকারের ১ ঘন�টা পূর�বে\n"
 #~ "সাক�ষাৎকারের ১ দিন পূর�বে"
 
+#~ msgid "Attendee_s..."
+#~ msgstr "অংশগ�রহণকারীবৃন�দ...(_s)"
+
 #~ msgid ""
 #~ "a\n"
 #~ "b"
@@ -23787,6 +22670,39 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ "সমাপ�ত\n"
 #~ "বাতিল"
 
+#~ msgid "0%"
+#~ msgstr "০%"
+
+#~ msgid "10%"
+#~ msgstr "১০%"
+
+#~ msgid "20%"
+#~ msgstr "২০%"
+
+#~ msgid "30%"
+#~ msgstr "৩০%"
+
+#~ msgid "40%"
+#~ msgstr "৪০%"
+
+#~ msgid "50%"
+#~ msgstr "৫০%"
+
+#~ msgid "60%"
+#~ msgstr "৬০%"
+
+#~ msgid "70%"
+#~ msgstr "৭০%"
+
+#~ msgid "80%"
+#~ msgstr "৮০%"
+
+#~ msgid "90%"
+#~ msgstr "৯০%"
+
+#~ msgid "100%"
+#~ msgstr "১০০%"
+
 #~ msgid "_Save As..."
 #~ msgstr "নত�ন নামে সংরক�ষণ কর�ন...(_S)"
 
@@ -23808,6 +22724,9 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "_Delete Selected Tasks"
 #~ msgstr "নির�বাচিত কার�যগ�লি ম�ছে ফেল�ন (_D)"
 
+#~ msgid "_Current View"
+#~ msgstr "বর�তমান প�রদর�শনক�ষেত�র (_C)"
+
 #~ msgid "Select T_oday"
 #~ msgstr "আজকের তারিখ নির�বাচন কর�ন (_o)"
 
@@ -23817,6 +22736,9 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Pri_nt..."
 #~ msgstr "প�রিন�ট কর�ন...(_n)"
 
+#~ msgid "A_ttendees..."
+#~ msgstr "অংশগ�রহণকারীবৃন�দ...(_t)"
+
 #~ msgid "_Delete Selected Memos"
 #~ msgstr "নির�বাচিত কর�মসূচী ম�ছে ফেল�ন (_D)"
 
@@ -23871,6 +22793,9 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ "নভেম�বর\n"
 #~ "ডিসেম�বর"
 
+#~ msgid "_Select Today"
+#~ msgstr "আজকের তারিখ নির�বাচন কর�ন (_S)"
+
 #~ msgid "Failed upgrading memos."
 #~ msgstr "কর�মসূচী আপগ�রেড করতে ব�যর�থ।"
 
@@ -23890,6 +22815,37 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Memo li_st"
 #~ msgstr "মেমোর তালিকা (_s)"
 
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution কাজের ফোল�ডারের অবস�থান �বং অন�ক�রম Evolution ১.x-�র পর থেকে "
+#~ "পরিবর�তিত হয়েছে।\n"
+#~ "\n"
+#~ "Evolution আপনার ফোল�ডার মাইগ�রেট করছে অন�গ�রহ করে অপেক�ষা কর�ন..."
+
+#~ 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 ""
+#~ "Evolution বর�ষপঞ�জির ফোল�ডারের অবস�থান �বং অন�ক�রম Evolution ১.x-�র পর থেকে "
+#~ "পরিবর�তিত হয়েছে।\n"
+#~ "\n"
+#~ "Evolution আপনার ফোল�ডার মাইগ�রেট করছে অন�গ�রহ করে অপেক�ষা কর�ন..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr "evolution/config.xmldb থেকে প�রোনো বৈশিষ�ট�যগ�লি পড়া সম�ভব হয়নি"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "`%s' বর�ষপঞ�জিটি মাইগ�রেট করা সম�ভব হয়নি"
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "`%s' কর�মটি মাইগ�রেট করা সম�ভব হয়নি"
+
 #~ msgid "Failed upgrading tasks."
 #~ msgstr "কর�ম আপগ�রেড করতে ব�যর�থ।"
 
@@ -23951,6 +22907,12 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Component"
 #~ msgstr "সামগ�রী"
 
+#~ msgid "Name of the component being logged"
+#~ msgstr "লগ করার জন�য চিহ�নিত সামগ�রী"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "চিহ�নিত প�লাগ-ইন সক�রিয় রয়েছে কি না"
+
 #~ msgid "Overwrite file?"
 #~ msgstr "�ই ফাইলটি কি ম�ছে লেখা হবে?"
 
@@ -24081,6 +23043,49 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "_Fit to Width"
 #~ msgstr "প�রস�থের মাপ অন�যায়ী (_F)"
 
+#~ msgid "To Do"
+#~ msgstr "করনীয়"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "নত�ন ফোল�ডার `%s' তৈরি করা যায়নি: %s"
+
+# dont like
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "ফোল�ডার `%s' -কে `%s' -� কপি করা যায়নি: %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "`%s' � উপস�থিত মেইলবক�স অন�সন�ধান করা সম�ভব হয়নি: %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution মেইলবক�স ফোল�ডারের অবস�থান �বং অন�ক�রম Evolution ১.x-�র পর থেকে "
+#~ "পরিবর�তিত হয়েছে।\n"
+#~ "\n"
+#~ "Evolution আপনার ফোল�ডার মাইগ�রেট করছে অন�গ�রহ করে অপেক�ষা কর�ন..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "প�রোনো, POP সার�ভারে-সংরক�ষণ-করা-হবে ডাটা `%s' খ�লতে ব�যর�থ: %s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "POP3 সার�ভারে-সংরক�ষণ-করা-হবে ডাটা ডিরেক�টরি `%s' তৈরি করতে ব�যর�থ: %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "POP3 সার�ভারে-সংরক�ষণ-করা-হবে ডাটা `%s' কপি করতে ব�যর�থ: %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "স�থানীয় মেইল সংরক�ষণস�থল `%s' তৈরি করা যায়নি: %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "পূর�ববর�তী Evolution ইনস�টলেশনের বৈশিষ�ট�য পড়া সম�ভব হয়নি, `evolution/config."
+#~ "xmldb' সম�ভবত উপস�থিত নেই অথবা ক�ষতিগ�রস�থ হয়েছে।"
+
 #~ msgid "Save As..."
 #~ msgstr "নত�ন নামে সংরক�ষণ কর�ন..."
 
@@ -24099,12 +23104,19 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Add address"
 #~ msgstr "ঠিকানা যোগ কর�ন"
 
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr ""
+#~ "Evolution দ�বারা সীমিত মাপের টেক�সটের অংশ প�রদর�শনের অন�মতি প�রদান করা হবে"
+
 #~ msgid "Default height of the message window."
 #~ msgstr "কম�পোসার উইন�ডোর ডিফল�ট প�রস�থ।"
 
 #~ msgid "Default width of the message window."
 #~ msgstr "বার�তা উইন�ডোর ডিফল�ট প�রস�থ।"
 
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "বার�তার সীমিত মাপের টেক�সটের অংশ প�রদর�শনের জন�য সক�রিয় কর�ন।"
+
 #~ msgid ""
 #~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
 #~ "vertically."
@@ -24128,6 +23140,9 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Prompt to check if the user wants to go offline immediately"
 #~ msgstr "ব�যবহারকারী অবিলম�বে অফ-লাইন যেতে ইচ�ছ�ক কি না জানতে জিজ�ঞাসা করা হবে"
 
+#~ msgid "Text message part limit"
+#~ msgstr "টেক�সট বার�তার অংশে সীমা"
+
 #~ msgid "Thread the message list."
 #~ msgstr "বার�তা তালিকা থ�রেড করা হবে।"
 
@@ -24254,6 +23269,9 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Signatures Table"
 #~ msgstr "স�বাক�ষরের টেবিল"
 
+#~ msgid "    "
+#~ msgstr "    "
+
 #~ msgid "<b>Search Folder Sources</b>"
 #~ msgstr "<b>অন�সন�ধান ফোল�ডারের উত�স</b>"
 
@@ -24263,6 +23281,12 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "<span weight=\"bold\">Encryption</span>"
 #~ msgstr "<span weight=\"bold\">�নক�রিপশন প�রক�রিয়া</span>"
 
+#~ msgid "Because \"{0}\"."
+#~ msgstr "\"{0}\"-র দর�ন।"
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "\"{2}\"-র দর�ন।"
+
 #~ msgid "Delete \"{0}\"?"
 #~ msgstr "\"{0}\" ম�ছে ফেলা হবে কি?"
 
@@ -24278,12 +23302,52 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Querying server"
 #~ msgstr "অন�সন�ধান করতে ব�যবহৃত সার�ভার"
 
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "নিম�নলিখিত অন�সন�ধানের ফোল�ডার(গ�লি) দ�বারা:\n"
+#~ "{0}\n"
+#~ "অপসারিত ফোল�ডার ব�যবহার করা হত:\n"
+#~ "    \"{1}\"\n"
+#~ "�ই সংক�রান�ত তথ�য �খন আপডেট করা হয়েছে।"
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "নিম�নলিখিত ফিল�টারের নিয়ম(গ�লি)-র দ�বারা:\n"
+#~ "{0}\n"
+#~ "অপসারিত ফোল�ডার ব�যবহার করা হত:\n"
+#~ "    \"{1}\"\n"
+#~ "�ই সংক�রান�ত তথ�য �খন আপডেট করা হয়েছে।"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "�ই ফোল�ডারের মধ�যে শ�ধ�মাত�র আড়াল করা বার�তা উপস�থিত রয়েছে। বার�তাগ�লি প�রদর�শন করা "
+#~ "জন�য প�রদর�শন->আড়াল করা বার�তা প�রদর�শন কর�ন শীর�ষক মেন� প�রয়োগ কর�ন।"
+
 #~ msgid "Subject or Recipients contains"
 #~ msgstr "বিষয় অথবা প�রেরকে অন�তর�ভ�ক�ত রয়েছে"
 
 #~ msgid "Subject or Sender contains"
 #~ msgstr "বিষয় অথবা প�রেরকে অন�তর�ভ�ক�ত রয়েছে"
 
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr ""
+#~ "সংয�ক�ত বস�ত�র তাগাদা সম�বন�ধীয় প�লাগ-ইন দ�বারা বার�তার মূল অংশে অন�সন�ধানের জন�য "
+#~ "ব�যবহারযোগ�য সূত�র।"
+
 #~ msgid "Audio Inline"
 #~ msgstr "ইনলাইন অডিও"
 
@@ -24353,6 +23417,9 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Folders Size"
 #~ msgstr "ফোল�ডারের মাপ"
 
+#~ msgid "Exchange Settings"
+#~ msgstr "Exchange সংক�রান�ত বৈশিষ�ট�য"
+
 #~ msgid "_OWA URL:"
 #~ msgstr "_OWA URL:"
 
@@ -24710,6 +23777,9 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Cannot display folders."
 #~ msgstr "ফোল�ডার প�রদর�শন করা যায়নি।"
 
+#~ msgid "Cannot perform the operation."
+#~ msgstr "কর�মচালন করতে ব�যর�থ।"
+
 #~ msgid ""
 #~ "Changes to options for Exchange account \"{0}\" will only take effect "
 #~ "after restarting Evolution."
@@ -25006,6 +24076,9 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "<b>Name</b>"
 #~ msgstr "<b>নাম</b>"
 
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "Evolution-র জন�য Hula সমর�থন যোগ করা হবে।"
+
 #~ msgid "<b>Custom Headers</b>"
 #~ msgstr "<b>স�বনির�ধারিত হেডার</b>"
 
@@ -25171,6 +24244,9 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Unknown system error."
 #~ msgstr "অজ�ঞাত সিস�টেমের সমস�যা।"
 
+#~ msgid "%ld KB"
+#~ msgstr "%ld কিলোবাইট"
+
 #~ msgid "Invalid arguments"
 #~ msgstr "অবৈধ আর�গ�মেন�ট"
 
@@ -25186,12 +24262,70 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Import File"
 #~ msgstr "ফাইল ইম�পোর�ট কর�ন"
 
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "Evolution ১.৪ থেকে বলপূর�বক প�নরায় মাইগ�রেট করা হবে"
+
 #~ msgid "Cannot start Evolution"
 #~ msgstr "Evolution আরম�ভ করতে ব�যর�থ"
 
 #~ msgid "Evolution can not start."
 #~ msgstr "Evolution আরম�ভ করা সম�ভব নয়।"
 
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "আপগ�রেড করার জন�য ডিস�কে পর�যাপ�ত স�থান উপস�থিত নেই।"
+
+#~ msgid "Really delete old data?"
+#~ msgstr "প�রোনো ডাটা কি নিশ�চিতভাবে ম�ছে ফেলা হবে?"
+
+#~ 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 ""
+#~ "&quot;evolution&quot; ডিরেক�টরির সমস�ত অন�তর�ভ�ক�ত বস�ত� �খন স�থায়ীরূপে ম�ছে ফেলা "
+#~ "হবে।\n"
+#~ "\n"
+#~ "প�রোনো ডাটা ম�ছে ফেলার পূর�বে আপনার সমস�ত মেইল, পরিচিতি �বং বর�ষপঞ�জির ডাটা "
+#~ "উপস�থিত আছে কিনা, �বং Evolution-র �ই সংস�করণ সঠিকভাবে চলছে কিনা তা পরীক�ষা "
+#~ "করে নেওয়া বাঞ�ছনীয়।\n"
+#~ "\n"
+#~ "ম�ছে ফেলা হলে ব�যবহারকারীর হস�তক�ষেপ ছাড়া, আপনি পূর�ববর�তী সংস�করণ ফেরত� যেতে "
+#~ "পারবেন না।\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "Evolution-র পূর�ববর�তী সংস�করণের দ�বারা �র তথ�য �কটি পৃথক স�থানে সংরক�ষণ করা হয়।\n"
+#~ "\n"
+#~ "আপনি যদি �ই তথ�য ম�ছে ফেলেন, তাহলে &quot;evolution&quot; ডিরেক�টরিটি "
+#~ "স�থায়ীরূপে ম�ছে যাবে। যদি �ই তথ�য সংরক�ষণ করতে ইচ�ছ�ক থাকেন, তাহলে &quot;"
+#~ "evolution&quot;-র মধ�যে উপস�থিত সকল তথ�য নিজের স�বিধা অন�যায়ী স�বয়ং সরিয়ে নিতে "
+#~ "পারেন।\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "আপনার ডাটা �বং বৈশিষ�ট�য আপগ�রেড করতে হলে ডিস�কে {0} স�থান প�রয়োজন, কিন�ত� আপনার "
+#~ "ডিস�কে শ�ধ�মাত�র {1} স�থান উপলব�ধ আছে।\n"
+#~ "\n"
+#~ "�গিয়ে যাওয়ার পূর�বে, আপনার ব�যক�তিগত ডিরেক�টরিতে অধিকতর স�থান উপলব�ধ করা আবশ�যক।"
+
 #~ msgid ""
 #~ "Your system configuration does not match your Evolution configuration.\n"
 #~ "\n"
@@ -25214,6 +24348,12 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ "\n"
 #~ "বিস�তারিত বিবরণের জন�য সহায়িকার উপর ক�লিক কর�ন।"
 
+#~ msgid "_Keep Data"
+#~ msgstr "ডাটা রক�ষা করা হবে (_K)"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "পরে মনে করাবে (_R)"
+
 #~ msgid "<b>Field Value</b>"
 #~ msgstr "<b>ক�ষেত�রর মান</b>"
 
@@ -25308,6 +24448,17 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Cut selected message(s) to the clipboard"
 #~ msgstr "নির�বাচিত বার�তা ক�লিপবোর�ডে কাট কর�ন"
 
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "নির�বাচিত বার�তাগ�লি আড়াল কর�ন (_e)"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "পড়া বার�তাগ�লি আড়াল কর�ন (_R)"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr ""
+#~ "ম�ছে ফেলা বার�তাগ�লির মা�ে রেখাঙ�কন করে প�রদর�শন করার পরিবর�তে ল�কিয়ে ফেলা হবে"
+
 #~ msgid "Paste message(s) from the clipboard"
 #~ msgstr "ক�লিপবোর�ড থেকে বার�তা পেস�ট কর�ন"
 
@@ -25317,6 +24468,18 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Select all and only the messages that are not currently selected"
 #~ msgstr "সমগ�র �বং বর�তমানে অনির�বাচিত বার�তাগ�লি নির�বাচন কর�ন"
 
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "আড়াল করা বার�তা প�রদর�শন কর�ন (_n)"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "যে বার�তাগ�লিকে অস�থায়ীভাবে আড়াল হয়েছে সেগ�লি প�রদর�শন কর�ন"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "যে সকল বার�তা পড়া-হয়েছে সেগ�লি অস�থায়ীভাবে ল�কিয়ে ফেলা হবে"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "নির�বাচিত বার�তাগ�লি অস�থায়ীভাবে ল�কিয়ে ফেলা হবে"
+
 #~ msgid "Not Junk"
 #~ msgstr "অবাঞ�ছিত নয়"
 
@@ -25395,9 +24558,6 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "_Hide Buttons"
 #~ msgstr "বাটন আড়াল করা হবে (_H)"
 
-#~ msgid "_Quit"
-#~ msgstr "প�রস�থান (_Q)"
-
 #~ msgid "_Synchronization Options..."
 #~ msgstr "স�সংগতি সংক�রান�ত বিকল�প...(_S)"
 
@@ -25407,9 +24567,51 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "<b>_Selection</b>"
 #~ msgstr "<b>নির�বাচন (_S)</b>"
 
+#~ msgid "Collection"
+#~ msgstr "সংগ�রহ"
+
+#~ msgid "Instance"
+#~ msgstr "ইনস�ট�যান�স"
+
 #~ msgid "Save Custom View"
 #~ msgstr "স�বনির�বাচিত প�রদর�শনক�ষেত�র সংরক�ষণ কর�ন"
 
+#~ msgid "Select View: %s"
+#~ msgstr "প�রদর�শন নির�বাচন: %s"
+
+#~ msgid "Factory"
+#~ msgstr "ফ�যাক�টরি"
+
+#~ msgid "Fill color"
+#~ msgstr "পূরণ করতে ব�যবহৃত রং"
+
+#~ msgid "GDK fill color"
+#~ msgstr "GDK পূরণ করতে ব�যবহৃত রং"
+
+#~ msgid "Fill stipple"
+#~ msgstr "ক�ষ�দ�র বিন�দ� সহযোগে ভরাট"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "সর�বনিম�ন প�রস�থ"
+
+#~ msgid "Minimum Width"
+#~ msgstr "সর�বনিম�ন প�রস�থ"
+
+#~ msgid "Spacing"
+#~ msgstr "মধ�যবর�তী স�থান"
+
 #~ msgid "Unknown character set: %s"
 #~ msgstr "অজানা অক�ষরমালা: %s"
 
@@ -25420,6 +24622,9 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Choose Image"
 #~ msgstr "ছবি নির�বাচন কর�ন"
 
+#~ msgid "The button state is online"
+#~ msgstr "বাটনের জন�য অন-লাইন অবস�থা ধার�য হয়েছে"
+
 #~ msgid "Empty message"
 #~ msgstr "ফা�কা বার�তা"
 
@@ -25435,6 +24640,21 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ msgid "Item ID"
 #~ msgstr "আইটেমের পরিচিতি"
 
+#~ msgid "Text"
+#~ msgstr "টেক�সট"
+
+#~ msgid "Cursor Row"
+#~ msgstr "কার�সারের সারি"
+
+#~ msgid "Cursor Column"
+#~ msgstr "কার�সারের কলাম"
+
+#~ msgid "Sorter"
+#~ msgstr "ক�রমান�যায়ী বিন�যাস ব�যবস�থা"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "কার�সারের মোড"
+
 #~ msgid "<b>Replies</b>"
 #~ msgstr "<b>প�রত�য�ত�তর</b>"
 
@@ -25467,8 +24687,165 @@ msgstr "পপ-আপ ব�যবস�থাপনা"
 #~ "প�রমিতমান\n"
 #~ "নিম�ন মাত�রা"
 
+#~ msgid "Selected Column"
+#~ msgstr "নির�বাচিত কলাম"
+
+#~ msgid "Focused Column"
+#~ msgstr "ফোকাস করা কলাম"
+
+#~ msgid "Unselected Column"
+#~ msgstr "অনির�বাচিত কলাম"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "কলামে মধ�যরেখাঙ�কন করা হবে"
+
+#~ msgid "Underline Column"
+#~ msgstr "কলামে নিম�নরেখাঙ�কন করা হবে"
+
+#~ msgid "Bold Column"
+#~ msgstr "কলামকে উজ�জ�বল করা হবে"
+
+#~ msgid "Color Column"
+#~ msgstr "কলাম রঙীন করা হবে"
+
+#~ msgid "BG Color Column"
+#~ msgstr "কলামের প�ভূমির রং"
+
+#~ msgid "State"
+#~ msgstr "অবস�থা"
+
 #~ msgid "Field Chooser"
 #~ msgstr "ক�ষেত�র নির�বাচক"
 
+#~ msgid "Alternating Row Colors"
+#~ msgstr "�কটি সারি অন�তর �ক রং ব�যবহার করা হবে"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "আন�ভূমিক দিশায় আ�কা গ�রিড"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "উলম�ব দিশায় আ�কা গ�রিড"
+
+#~ msgid "Draw focus"
+#~ msgstr "ফোকাস আ�কা হবে"
+
+#~ msgid "Cursor mode"
+#~ msgstr "কার�সার মোড"
+
+#~ msgid "Selection model"
+#~ msgstr "নির�বাচনের মডেল"
+
+#~ msgid "Length Threshold"
+#~ msgstr "দৈঘ�যের প�রান�তিক মাপ"
+
+#~ msgid "Frozen"
+#~ msgstr "আবদ�ধ"
+
+#~ msgid "Table model"
+#~ msgstr "টেবিলের মডেল"
+
+#~ msgid "Cursor row"
+#~ msgstr "কার�সারের সারি"
+
+#~ msgid "Sort Info"
+#~ msgstr "তথ�য ক�রমবিন�যাস কর�ন"
+
+#~ msgid "Always search"
+#~ msgstr "সর�বদা অন�সন�ধান করা হবে"
+
+#~ msgid "Use click to add"
+#~ msgstr "ক�লিক করে যেগ কর�ন"
+
 #~ msgid "Tree"
 #~ msgstr "ট�রি"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "ETree টেবিল অ�যাডাপ�টার"
+
+#~ msgid "Retro Look"
+#~ msgstr "প�রোনো রূপ"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "রেখা ও +/- �ক�সপ�যান�ডার আ�ক�ন।"
+
+#~ msgid "Expander Size"
+#~ msgstr "অধিকৃতি দৈর�ঘ�য"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "অধিকৃতি চিহ�নের দৈর�ঘ�য"
+
+#~ msgid "Event Processor"
+#~ msgstr "ঘটনা প�রসেস ব�যবস�থা"
+
+#~ msgid "Bold"
+#~ msgstr "গাড়"
+
+#~ msgid "Strikeout"
+#~ msgstr "মধ�যরেখাঙ�কিত"
+
+#~ msgid "Anchor"
+#~ msgstr "অ�যাঙ�কর"
+
+#~ msgid "Justification"
+#~ msgstr "সমপ�রান�ত নির�ধারণ"
+
+#~ msgid "Clip Width"
+#~ msgstr "প�রস�থ হ�রাস করা হবে"
+
+#~ msgid "Clip Height"
+#~ msgstr "উচ�চতা হ�রাস করা হবে"
+
+#~ msgid "Clip"
+#~ msgstr "হ�রাস করা হবে"
+
+#~ msgid "Fill clip rectangle"
+#~ msgstr "হ�রাস করা আয়তক�ষেত�র ভরাট করা হবে"
+
+#~ msgid "X Offset"
+#~ msgstr "X অফসেট"
+
+#~ msgid "Y Offset"
+#~ msgstr "Y অফসেট"
+
+#~ msgid "Text width"
+#~ msgstr "টেক�সটের প�রস�থ"
+
+#~ msgid "Text height"
+#~ msgstr "হরফের উচ�চতা"
+
+#~ msgid "Use ellipsis"
+#~ msgstr "ইলিপসিস প�রয়োগ করা হবে"
+
+#~ msgid "Ellipsis"
+#~ msgstr "ইলিপসিস"
+
+#~ msgid "Line wrap"
+#~ msgstr "লাইন গ�টানো"
+
+#~ msgid "Break characters"
+#~ msgstr "বিভাজনের অক�ষর"
+
+#~ msgid "Max lines"
+#~ msgstr "সর�বাধিক পংক�তি সংখ�যা"
+
+#~ msgid "Draw borders"
+#~ msgstr "প�রান�তরেখা আ�ক�ন"
+
+#~ msgid "Allow newlines"
+#~ msgstr "নত�ন পংক�তি নির�মাণের অন�মতি প�রদান করা হবে"
+
+#~ msgid "Draw background"
+#~ msgstr "পটভূমী আ�কা হবে"
+
+#~ msgid "Draw button"
+#~ msgstr "বাটন আক��ন"
+
+#~ msgid "Cursor position"
+#~ msgstr "কার�সারের অবস�থান"
+
+# FIXME
+#~ msgid "IM Context"
+#~ msgstr "IM অন�যায়ী"
+
+#~ msgid "Handle Popup"
+#~ msgstr "পপ-আপ ব�যবস�থাপনা"
diff --git a/po/ca.po b/po/ca.po
index 7be8037c4a..f1d1b99d3e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -11,13 +11,13 @@
 # Gil Forcada <gilforcada@guifi.net>, 2006
 # David Planella Molas <david.planella@gmail.com>, 2007, 2008, 2009, 2010.
 #
-#: ../shell/main.c:479
+#: ../shell/main.c:455
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-01 22:45+0200\n"
-"PO-Revision-Date: 2010-04-01 22:46+0200\n"
+"POT-Creation-Date: 2010-04-01 22:25+0200\n"
+"PO-Revision-Date: 2010-04-01 22:43+0200\n"
 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
@@ -244,16 +244,6 @@ msgstr "_Canvia de mida"
 msgid "_Use as it is"
 msgstr "_Utilitza tal com és"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Adreça de sincronització predeterminada:"
@@ -270,7 +260,7 @@ msgstr "No s'ha pogut llegir el bloc d'aplicació d'adreces del pilot"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2000
 msgid "Anniversary"
 msgstr "Commemoració"
 
@@ -281,8 +271,8 @@ msgstr "Commemoració"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:1999 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:107
 msgid "Birthday"
 msgstr "Aniversari"
 
@@ -297,16 +287,13 @@ msgid "Calendar:"
 msgstr "Calendari:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contacte"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2567
 msgid "Contact Editor"
 msgstr "Editor de contactes"
 
@@ -375,7 +362,7 @@ msgstr "Notes"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1708
 msgid "Other"
 msgstr "Altres"
 
@@ -399,12 +386,10 @@ msgstr "Adreces web"
 msgid "Web Log:"
 msgstr "Bloc:"
 
-#. red
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Feina"
 
@@ -509,32 +494,6 @@ msgstr "_On:"
 msgid "_Zip/Postal Code:"
 msgstr "Codi posta_l:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:320
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Nom"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "Editable"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -588,45 +547,21 @@ msgstr "S'ha produït un error en modificar el contacte"
 msgid "Error removing contact"
 msgstr "S'ha produït un error en suprimir el contacte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Llibreta d'adreces d'origen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "Llibreta d'adreces de destinació"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "És un contacte nou"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Camps d'escriptura"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Camps necessaris"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Modificat"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2562
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactes - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2970
 msgid "Please select an image for this contact"
 msgstr "Seleccioneu una imatge per a aquest contacte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2971
 msgid "_No image"
 msgstr "Cap _imatge"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3244
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -634,23 +569,23 @@ msgstr ""
 "Les dades del contacte no són vàlides:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3248
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» té un format no vàlid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3255
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» té un format no vàlid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3281
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» és buit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3295
 msgid "Invalid contact."
 msgstr "Contacte no vàlid."
 
@@ -674,16 +609,6 @@ msgstr "Correu electrò_nic"
 msgid "_Select Address Book"
 msgstr "_Seleccioneu la llibreta d'adreces"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Shell"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "El patró singleton de l'EShell"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr."
@@ -800,18 +725,6 @@ msgstr "S'ha produït un error en modificar la llista"
 msgid "Error removing list"
 msgstr "S'ha produït un error en suprimir la llista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Llibreta"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "És una llista nova"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contacte canviat:"
@@ -862,7 +775,7 @@ msgstr "Fusiona el contacte"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
 #: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Any field contains"
@@ -893,30 +806,10 @@ msgstr[1] "%d contactes"
 msgid "Error getting book view"
 msgstr "S'ha produït un error en obtenir la visualització de la llibreta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "Consulta"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
 msgstr "S'ha interromput la cerca"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Model"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "S'ha produït un error en modificar la targeta"
@@ -942,15 +835,6 @@ msgstr "Suprimeix els contactes seleccionats"
 msgid "Select all visible contacts"
 msgstr "Selecciona tots els contactes visibles"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Visualització del Shell"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Font"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1283
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Segur que voleu suprimir aquestes llistes de contactes?"
@@ -1150,7 +1034,6 @@ msgid "Telex"
 msgstr "Tèlex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:825
 msgid "Title"
 msgstr "Títol"
 
@@ -1162,58 +1045,6 @@ msgstr "Unitat"
 msgid "Web Site"
 msgstr "Lloc web"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Amplada"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Alçada"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "Té el focus"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Camp"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Nom del camp"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Model del text"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Longitud màxima del nom del camp"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Amplada de la columna"
-
 #: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
@@ -1272,10 +1103,6 @@ msgstr ""
 "\n"
 "Aquesta visualització no té cap element per mostrar."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Adaptador"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Adreça electrònica de la feina"
@@ -1289,14 +1116,6 @@ msgstr "Adreça electrònica particular"
 msgid "Other Email"
 msgstr "Una altra adreça electrònica"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Seleccionada"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "Té el cursor"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1339,17 +1158,17 @@ msgid "Copy _Email Address"
 msgstr "Copia l'adr_eça electrònica"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:382
 msgid "Copy the email address to the clipboard"
 msgstr "Copia l'adreça electrònica al porta-retalls"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:387
 msgid "_Send New Message To..."
 msgstr "Envia un mi_ssatge nou a..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:389
 msgid "Send a mail message to this address"
 msgstr "Envia un missatge de correu a aquesta adreça"
 
@@ -1388,7 +1207,7 @@ msgstr "Xat de vídeo"
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
+#: ../modules/calendar/e-cal-shell-view.c:495
 #: ../plugins/groupwise-features/camel-gw-listener.c:420
 #: ../plugins/groupwise-features/camel-gw-listener.c:445
 #: ../plugins/groupwise-features/camel-gw-listener.c:560
@@ -1428,21 +1247,19 @@ msgid "Web Log"
 msgstr "Bloc web"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
+#: ../capplet/settings/mail-capplet-shell.c:346
 #: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/addressbook/e-book-shell-migrate.c:134
 #: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Personal"
@@ -1460,7 +1277,7 @@ msgid "Blog"
 msgstr "Bloc"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../widgets/misc/e-web-view.c:798
 #, c-format
 msgid "Click to mail %s"
 msgstr "Feu clic per enviar un correu a en/na %s"
@@ -1518,8 +1335,8 @@ msgstr "El protocol no és compatible"
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
 #: ../calendar/gui/print.c:2651
 msgid "Canceled"
@@ -1689,7 +1506,7 @@ msgstr "Visualització de targeta"
 #: ../addressbook/importers/evolution-ldif-importer.c:516
 #: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "S'està important..."
 
@@ -2250,7 +2067,7 @@ msgid "_Save Changes"
 msgstr "De_sa els canvis"
 
 #: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Envia"
@@ -2260,10 +2077,6 @@ msgstr "_Envia"
 msgid "_Send Notice"
 msgstr "E_nvia l'avís"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Divideix els esdeveniments de múltiples dies:"
@@ -2363,7 +2176,7 @@ msgid "_Snooze"
 msgstr "Mi_gdiada"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 #: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:332
@@ -2375,7 +2188,7 @@ msgid "location of appointment"
 msgstr "ubicació de la cita"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
 #: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:331
@@ -3166,7 +2979,7 @@ msgid "Classification"
 msgstr "Classificació"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3210,13 +3023,13 @@ msgid "Organizer"
 msgstr "Organitzador"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
 #: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Públic"
@@ -3364,19 +3177,20 @@ msgstr "dies"
 msgid "end of appointment"
 msgstr "final de la cita"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "temps extra per cada"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "hores"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "minuts"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "inici de la cita"
 
@@ -3413,11 +3227,13 @@ msgid "Selected Calendars for Alarms"
 msgstr "Seleccioneu els calendaris per a les alarmes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
+#, fuzzy
+msgid "Ti_me and date:"
 msgstr "Hora i data:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
+#, fuzzy
+msgid "_Date only:"
 msgstr "Només la data:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
@@ -3527,182 +3343,194 @@ msgstr "Cap"
 msgid "Pick a color"
 msgstr "Seleccioneu un color"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "d_g"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 #: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Des_plaça la visualització mensual en passos d'una setmana"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Se_gon fus:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Seleccioneu els calendaris per a les notificacions d'alarma"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "M_ostra un recordatori"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "M_ostra un recordatori"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "Mostra el _número de setmana en el navegador de dates"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr ""
 "Mostra el nú_mero de setmana a les visualitzacions de dies i setmanes "
 "laborables"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1120
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "T_asques que vencen avui:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "d_j"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Llista de tasques"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "Plantilla:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Dijous"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Hora"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
 msgstr "Fu_s horari:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "Format de l'hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Utilitza el _fus horari del sistema"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 #: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "La s_etmana comença el:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Work Week"
 msgstr "Setmana laborable"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "Dies laborables:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 hores (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 hores"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "Sol·licit_a la confirmació en suprimir elements"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Comprimeix els caps de setmana en la visualització mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "El _dia comença a les:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "d_v"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "Amaga les tasqu_es completades després de"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "d_l"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "Tasq_ues endarrerides:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "d_s"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "Mo_stra les hores de finalització de les cites en visualitzacions setmanals "
 "i mensuals"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "Divisions de _temps:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "d_m"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "d_c"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "abans de cada commemoració/aniversari"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "abans de cada cita"
 
@@ -3894,14 +3722,14 @@ msgstr "Feu clic per tancar la finestra actual"
 #: ../calendar/gui/dialogs/comp-editor.c:955 ../mail/e-mail-browser.c:117
 #: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:399 ../widgets/misc/e-web-view.c:1023
 msgid "Copy the selection"
 msgstr "Copia la selecció"
 
 #: ../calendar/gui/dialogs/comp-editor.c:962 ../mail/e-mail-browser.c:124
 #: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1017
 msgid "Cut the selection"
 msgstr "Retalla la selecció"
 
@@ -3918,7 +3746,7 @@ msgstr "Feu clic per veure l'ajuda disponible"
 #: ../calendar/gui/dialogs/comp-editor.c:983 ../mail/e-mail-browser.c:131
 #: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1029
 msgid "Paste the clipboard"
 msgstr "Enganxa el porta-retalls"
 
@@ -4224,7 +4052,7 @@ msgstr ""
 "No es pot editar l'esdeveniment completament perquè no en sou l'organitzador"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2720
 msgid "This event has alarms"
 msgstr "Aquest esdeveniment té alarmes"
 
@@ -4286,7 +4114,7 @@ msgstr "Cal un organitzador."
 msgid "At least one attendee is required."
 msgstr "Cal un assistent com a mínim."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2593
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No s'ha pogut obrir el calendari «%s»."
@@ -4297,40 +4125,40 @@ msgstr "No s'ha pogut obrir el calendari «%s»."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2637
+#: ../calendar/gui/dialogs/memo-page.c:913
+#: ../calendar/gui/dialogs/task-page.c:1741
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Esteu actuant en representació de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2939
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dia abans de la cita"
 msgstr[1] "%d dies abans de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2945
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora abans de la cita"
 msgstr[1] "%d hores abans de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2951
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut abans de la cita"
 msgstr[1] "%d minuts abans de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2964
 msgid "Customize"
 msgstr "Personalitza"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2966
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Cap"
@@ -4415,14 +4243,14 @@ msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 "No es pot editar l'anotació completament perquè no en sou l'organitzador"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:874
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "No s'han pogut obrir les anotacions a «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
+#: ../calendar/gui/dialogs/memo-page.c:1041 ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:956 ../mail/em-format-html.c:2251
+#: ../mail/em-format-html.c:2311 ../mail/em-format-html.c:2353
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Per a"
@@ -4591,27 +4419,27 @@ msgstr "dia"
 msgid "on the"
 msgstr "al"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1411
 msgid "occurrences"
 msgstr "aparicions"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2122
+#: ../calendar/gui/dialogs/recurrence-page.c:2112
 msgid "Add exception"
 msgstr "Afegeix una excepció"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2163
+#: ../calendar/gui/dialogs/recurrence-page.c:2153
 msgid "Could not get a selection to modify."
 msgstr "No s'ha pogut obtenir una selecció per modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2159
 msgid "Modify exception"
 msgstr "Modifica l'excepció"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2213
+#: ../calendar/gui/dialogs/recurrence-page.c:2203
 msgid "Could not get a selection to delete."
 msgstr "No s'ha pogut obtenir una selecció per suprimir."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2352
+#: ../calendar/gui/dialogs/recurrence-page.c:2330
 msgid "Date/Time"
 msgstr "Data/hora"
 
@@ -4660,17 +4488,17 @@ msgstr "Notifica n_omés els assistents nous"
 msgid "Completed date is wrong"
 msgstr "La data de finalització és errònia"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:484
 msgid "Web Page"
 msgstr "Pàgina web"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
 #: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
 #: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
@@ -4681,16 +4509,16 @@ msgstr "Completada"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
 #: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../mail/message-list.c:1131 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Alta"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
 #: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
 #: ../calendar/gui/print.c:2645
 msgid "In Progress"
@@ -4700,15 +4528,15 @@ msgstr "En procés"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
 #: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../mail/message-list.c:1129 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Baixa"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:509
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1130
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "Normal"
@@ -4716,8 +4544,8 @@ msgstr "Normal"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
 #: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
 #: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
@@ -4735,7 +4563,7 @@ msgstr "_Estat:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1756
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4776,11 +4604,11 @@ msgstr "Feu clic per canviar o visualitzar els detalls de l'estat de la tasca"
 msgid "_Send Options"
 msgstr "_Opcions d'enviament"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "_Task"
 msgstr "_Tasca"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "Detalls de la tasca"
 
@@ -4803,7 +4631,7 @@ msgstr "Organit_zador:"
 msgid "Due date is wrong"
 msgstr "La data de venciment és errònia"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1698
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No s'han pogut obrir les tasques a «%s»."
@@ -4971,11 +4799,11 @@ msgid "Free"
 msgstr "Lliure"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:548 ../calendar/gui/e-task-table.c:561
 msgid "Busy"
 msgstr "Ocupat"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4986,63 +4814,49 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Cap"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sí"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "No"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "Client predeterminat"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:551
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Paràmetres del Shell"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:552
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Paràmetres de l'aplicació"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:937
 #: ../plugins/itip-formatter/itip-formatter.c:461
 #: ../plugins/itip-formatter/itip-formatter.c:2338
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Es desconeix"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Periòdic"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Assignat"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "S'està obrint %s"
@@ -5086,69 +4900,69 @@ msgstr "Data d'inici"
 msgid "Type"
 msgstr "Tipus"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:404
 msgid "Cut selected events to the clipboard"
 msgstr "Retalla els esdeveniments seleccionats al porta-retalls"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:410
 msgid "Copy selected events to the clipboard"
 msgstr "Copia els esdeveniments seleccionats al porta-retalls"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:416
 msgid "Paste events from the clipboard"
 msgstr "Enganxa els esdeveniments del porta-retalls"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Delete selected events"
 msgstr "Suprimeix els esdeveniments seleccionats"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "S'estan suprimint els objectes seleccionats"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:842
 #: ../calendar/gui/e-task-table.c:1063
 msgid "Updating objects"
 msgstr "S'estan actualitzant els objectes"
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1703
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../plugins/itip-formatter/itip-formatter.c:2326
 msgid "Accepted"
 msgstr "Acceptat"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1704
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../plugins/itip-formatter/itip-formatter.c:2332
 msgid "Declined"
 msgstr "Declinat"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1705
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Tentative"
 msgstr "Provisionalment"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1706
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 #: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Delegated"
 msgstr "Delegat"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1707
 msgid "Needs action"
 msgstr "Precisa una acció"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-calendar-view.c:1848 ../calendar/gui/e-memo-table.c:527
 #: ../calendar/gui/e-task-table.c:738
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -5156,20 +4970,20 @@ msgstr "Organitzador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:532
 #: ../calendar/gui/e-task-table.c:741
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organitzador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1868 ../calendar/gui/print.c:2600
 #, c-format
 msgid "Location: %s"
 msgstr "Ubicació: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1899
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -5213,7 +5027,7 @@ msgstr "Mostra el segon fus horari"
 #. 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:864 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1843
 #: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
@@ -5224,10 +5038,10 @@ msgstr "%A, %d de %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1860
 #: ../calendar/gui/e-week-view-main-item.c:231
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:907
+#: ../modules/calendar/e-cal-shell-view-private.c:913
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5236,27 +5050,27 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
+#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1876
 #: ../calendar/gui/e-week-view-main-item.c:245
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:943
+#: ../modules/calendar/e-cal-shell-view-private.c:949
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1074 ../calendar/gui/e-week-view.c:742
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:745
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2573
 #, c-format
 msgid "Week %d"
 msgstr "Setmana %d"
@@ -5655,7 +5469,7 @@ msgid "Send Latest Information"
 msgstr "Envia l'última informació"
 
 #: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
+#: ../modules/mail/e-mail-shell-view-actions.c:970
 #: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "Cancel·la"
@@ -5705,56 +5519,56 @@ msgid "Resources"
 msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grup"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Recurs"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Habitació"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "President"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Participant obligatori"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Participant opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "No hi participa"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "Precisa una acció"
 
@@ -5763,14 +5577,14 @@ msgstr "Precisa una acció"
 msgid "Attendee                          "
 msgstr "Assistent                         "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "En progré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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2305
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -5779,7 +5593,7 @@ msgstr "%A, %d de %B de %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:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2336
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5789,67 +5603,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "No Information"
 msgstr "Cap informació"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:565
 msgid "A_ttendees..."
 msgstr "Ass_istents..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:586
 msgid "O_ptions"
 msgstr "O_pcions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "M_ostra només les hores de treball"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _zoomed out"
 msgstr "Reduei_x l'ampliació"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "_Update free/busy"
 msgstr "Act_ualitza lliure/ocupat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:661
 msgid "_Autopick"
 msgstr "Tria _automàtica"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:676
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:693
 msgid "_All people and resources"
 msgstr "Tot_es les persones i recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "All _people and one resource"
 msgstr "Totes les _persones i un recurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "_Required people"
 msgstr "Pe_rsones necessàries"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:719
 msgid "Required people and _one resource"
 msgstr "Pers_ones necessàries i un recurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "Hora d_e finalització:"
 
@@ -5878,7 +5692,7 @@ msgid "Member"
 msgstr "Membre"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:456
+#: ../modules/calendar/e-cal-shell-content.c:461
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5970,7 +5784,7 @@ msgstr "100%"
 #: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:418
+#: ../modules/calendar/e-cal-shell-content.c:423
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
@@ -6111,16 +5925,16 @@ msgid "Gnome Calendar"
 msgstr "Calendari del Gnome"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../modules/calendar/e-cal-shell-view-private.c:909
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %B del %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:910
 #: ../modules/calendar/e-cal-shell-view-private.c:916
-#: ../modules/calendar/e-cal-shell-view-private.c:919
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -6128,10 +5942,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:936
-#: ../modules/calendar/e-cal-shell-view-private.c:947
-#: ../modules/calendar/e-cal-shell-view-private.c:954
-#: ../modules/calendar/e-cal-shell-view-private.c:957
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
 msgid "%d %b %Y"
 msgstr "%d de %B del %Y"
 
@@ -6161,7 +5975,7 @@ msgstr "visualització del calendari per a un mes"
 msgid "calendar view for one or more weeks"
 msgstr "visualització del calendari per a una o més setmanes"
 
-#: ../calendar/gui/gnome-cal.c:2299
+#: ../calendar/gui/gnome-cal.c:2243
 msgid "Purging"
 msgstr "S'està buidant"
 
@@ -8332,7 +8146,7 @@ msgid "Fr_om:"
 msgstr "D_e:"
 
 #: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:954
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
@@ -8403,7 +8217,7 @@ msgid "Save draft"
 msgstr "Desa l'esborrany"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:156
 #: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "No _tornis a mostrar aquest missatge."
@@ -8432,7 +8246,7 @@ msgstr ""
 msgid "Compose Message"
 msgstr "Redacta un missatge"
 
-#: ../composer/e-msg-composer.c:3310
+#: ../composer/e-msg-composer.c:3306
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8519,7 +8333,8 @@ msgstr ""
 "Si recupereu el missatge podreu continuar on us vau quedar."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 "El fitxer «{0}» no és un fitxer de dades i no es pot enviar en un missatge."
 
@@ -8540,7 +8355,8 @@ msgid "Unable to activate the address selector control."
 msgstr "No s'ha pogut activar el control de selecció d'adreces."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "No es pot adjuntar el fitxer «{0}» a aquest missatge."
 
 #: ../composer/mail-composer.error.xml.h:22
@@ -8563,31 +8379,27 @@ msgstr "R_ecupera"
 msgid "_Save Draft"
 msgstr "Desa l'_esborrany"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:199
 msgid "Run Anjal in a window"
 msgstr "Executa l'Anjal en una finestra"
 
-#: ../capplet/anjal-settings-main.c:203
+#: ../capplet/anjal-settings-main.c:200
 msgid "Make Anjal the default email client"
 msgstr "Fes que l'Anjal sigui el client de correu electrònic predeterminat"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:207
 msgid "ID of the socket to embed in"
 msgstr "Identificador del sòcol on incrustar-se"
 
-#: ../capplet/anjal-settings-main.c:211
+#: ../capplet/anjal-settings-main.c:208
 msgid "socket"
 msgstr "sòcol"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:221
 msgid "Anjal email client"
 msgstr "Client de correu Anjal"
 
-#: ../capplet/settings/mail-view.c:244
-msgid "New Tab"
-msgstr "Pestanya nova"
-
 #: ../capplet/settings/mail-account-view.c:56
 msgid "Please enter your full name."
 msgstr "Introduïu el vostre nom complet."
@@ -8600,52 +8412,52 @@ msgstr "Introduïu la vostra adreça electrònica."
 msgid "The email address you have entered is invalid."
 msgstr "L'adreça electrònica que heu introduït no és vàlida."
 
-#: ../capplet/settings/mail-account-view.c:224
+#: ../capplet/settings/mail-account-view.c:181
 msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
 msgstr "<span size=\"large\" weight=\"bold\">Dades personals:</span>"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:186
 msgid "Name:"
 msgstr "Nom:"
 
-#: ../capplet/settings/mail-account-view.c:238
+#: ../capplet/settings/mail-account-view.c:195
 msgid "Email address:"
 msgstr "Adreça electrònica:"
 
-#: ../capplet/settings/mail-account-view.c:248
+#: ../capplet/settings/mail-account-view.c:205
 msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
 msgstr "<span size=\"large\" weight=\"bold\">Dades de recepció:</span>"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
+#: ../capplet/settings/mail-account-view.c:210
+#: ../capplet/settings/mail-account-view.c:258
 msgid "Server type:"
 msgstr "Tipus de servidor:"
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
+#: ../capplet/settings/mail-account-view.c:219
+#: ../capplet/settings/mail-account-view.c:267
 msgid "Server address:"
 msgstr "Adreça del servidor:"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:228
+#: ../capplet/settings/mail-account-view.c:276
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
+#: ../capplet/settings/mail-account-view.c:237
+#: ../capplet/settings/mail-account-view.c:285
 msgid "Use encryption:"
 msgstr "Utilització d'encriptatge:"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:290
 msgid "never"
 msgstr "mai"
 
-#: ../capplet/settings/mail-account-view.c:298
+#: ../capplet/settings/mail-account-view.c:253
 msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
 msgstr "<span size=\"large\" weight=\"bold\">Dades d'enviament:</span>"
 
-#: ../capplet/settings/mail-account-view.c:355
+#: ../capplet/settings/mail-account-view.c:309
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -8656,7 +8468,7 @@ msgstr ""
 "automàticament tots els paràmetres. En cas que no es pugui fer, haureu "
 "d'introduir els detalls del servidor."
 
-#: ../capplet/settings/mail-account-view.c:357
+#: ../capplet/settings/mail-account-view.c:311
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -8667,11 +8479,11 @@ msgstr ""
 "començar amb els detalls que ja heu introduït, però pot ser que els hàgiu de "
 "canviar."
 
-#: ../capplet/settings/mail-account-view.c:359
+#: ../capplet/settings/mail-account-view.c:313
 msgid "You can specify more options to configure the account."
 msgstr "Podeu especificar més opcions per configurar el compte."
 
-#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:315
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8680,11 +8492,11 @@ msgstr ""
 "S'han intentat detectar-los automàticament, però els hauríeu de comprovar "
 "per estar-ne segur."
 
-#: ../capplet/settings/mail-account-view.c:362
+#: ../capplet/settings/mail-account-view.c:316
 msgid "You can specify your default settings for your account."
 msgstr "Podeu especificar les opcions predeterminades del vostre compte."
 
-#: ../capplet/settings/mail-account-view.c:363
+#: ../capplet/settings/mail-account-view.c:317
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8692,136 +8504,127 @@ msgstr ""
 "Ara teniu l'ocasió de comprovar els paràmetres abans d'intentar connectar "
 "amb el servidor i recollir el correu."
 
-#: ../capplet/settings/mail-account-view.c:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
+#: ../capplet/settings/mail-account-view.c:332
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2191
 #: ../mail/mail-config.ui.h:58
 msgid "Identity"
 msgstr "Identitat"
 
-#: ../capplet/settings/mail-account-view.c:378
+#: ../capplet/settings/mail-account-view.c:332
 msgid "Next - Receiving mail"
 msgstr "Següent - Recepció de correu"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:333
 msgid "Receiving mail"
 msgstr "Recepció de correu"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:334
 msgid "Next - Sending mail"
 msgstr "Següent - Enviament de correu"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:333
 msgid "Back - Identity"
 msgstr "Enrere - Identitat"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:333
 msgid "Next - Receiving options"
 msgstr "Següent - Opcions de recepció"
 
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:334
 msgid "Receiving options"
 msgstr "Opcions de recepció"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:336
 msgid "Back - Receiving mail"
 msgstr "Enrere - Recepció de correu"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:336
 msgid "Sending mail"
 msgstr "Enviament de correu"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:337
 msgid "Next - Review account"
 msgstr "Següent - Revisió del compte"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:336
 msgid "Next - Defaults"
 msgstr "Següent - Valors predeterminats"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:336
 msgid "Back - Receiving options"
 msgstr "Enrere - Opcions de recepció"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:337
+#: ../mail/em-account-editor.c:2769 ../mail/mail-config.ui.h:31
 msgid "Defaults"
 msgstr "Opcions predeterminades"
 
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:337
 msgid "Back - Sending mail"
 msgstr "Enrere - Enviament de correu"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:339
 msgid "Review account"
 msgstr "Revisió del compte"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:339
 msgid "Finish"
 msgstr "Finalitza"
 
 # gal/e-table/e-table-config.glade.h:3
 # gal/e-table/e-table-config-no-group.glade.h:3
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:339
 msgid "Back - Sending"
 msgstr "Enrere - Enviament"
 
-#: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
+#: ../capplet/settings/mail-account-view.c:671
+#: ../capplet/settings/mail-settings-view.c:262
 msgid "Close Tab"
 msgstr "Tanca la pestanya"
 
-#: ../capplet/settings/mail-account-view.c:729
+#: ../capplet/settings/mail-account-view.c:681
 msgid "Account Wizard"
 msgstr "Auxiliar per als comptes"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "Auxiliar de comptes de l'Evolution"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "Paràmetres del correu electrònic"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-msgid "Quit"
-msgstr "Surt"
-
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
+#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:682
 #: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
 #: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
 #: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1617
+#: ../mail/message-list.c:1613
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/addressbook/e-book-shell-migrate.c:126
 #: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-cal-shell-migrate.c:141
 #: ../modules/calendar/e-memo-shell-backend.c:108
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-migrate.c:109
 msgid "On This Computer"
 msgstr "En aquest ordinador"
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:146
 #: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "Modifica"
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "Afegeix un compte nou"
 
-#: ../capplet/settings/mail-settings-view.c:185
+#: ../capplet/settings/mail-settings-view.c:183
 msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
 msgstr "<span size=\"large\" weight=\"bold\">Gestió de comptes</span>"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:272
 msgid "Settings"
 msgstr "Paràmetres"
 
@@ -8854,6 +8657,10 @@ msgstr "Gestioneu els correus electrònics, contactes i horaris"
 msgid "Configure email accounts"
 msgstr "Configuració dels comptes de correu electrònic"
 
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "Paràmetres del correu electrònic"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "targeta d'adreça"
@@ -8973,38 +8780,38 @@ msgid "Visual"
 msgstr "Visual"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
 #: ../plugins/itip-formatter/itip-view.c:195
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Avui"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "Demà"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Ahir"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:210
 #, c-format
 msgid "%d days from now"
 msgstr "%d dies a partir d'ara"
 
-#: ../e-util/e-datetime-format.c:209
+#: ../e-util/e-datetime-format.c:212
 #, c-format
 msgid "%d days ago"
 msgstr "fa %d dies"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
+#: ../e-util/e-datetime-format.c:305
 msgid "Use locale default"
 msgstr "Utilitza els valors predeterminats de la localització"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:499
 msgid "Format:"
 msgstr "Format:"
 
@@ -9025,18 +8832,6 @@ msgstr "S'està escrivint «%s»"
 msgid "Writing \"%s\" to %s"
 msgstr "S'està escrivint «%s» a «%s»"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Nom de l'enregistrador"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "Nom de fitxer"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "El nom del fitxer del mòdul"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Registres de depuració"
@@ -9059,7 +8854,7 @@ msgstr "Missatges de registre:"
 msgid "Log Level"
 msgstr "Nivell de registre"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2676
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Missatges"
@@ -9089,17 +8884,6 @@ msgstr "Depuració"
 msgid "Error, Warnings and Debug messages"
 msgstr "Errors, avisos i missatges de depuració"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "Habilitat"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Si el connector està habilitat"
-
 #: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:334
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
@@ -9124,7 +8908,7 @@ msgstr ""
 msgid "Autogenerated"
 msgstr "Generada automàticament"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:20
 msgid "Because \"{1}\"."
 msgstr "Degut a «{1}»."
 
@@ -9144,15 +8928,15 @@ msgstr "El voleu sobreescriure?"
 msgid "File exists \"{0}\"."
 msgstr "Ja existeix el fitxer «{0}»."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "S_obreescriu"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:171
 msgid "Could not open the link."
 msgstr "No s'ha pogut obrir l'enllaç."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:221
 msgid "Could not display help for Evolution."
 msgstr "No s'ha pogut mostrar l'ajuda de l'Evolution."
 
@@ -9165,24 +8949,24 @@ msgstr "S'ha produït un error del GConf: %s"
 msgid "All further errors shown only on terminal."
 msgstr "La resta d'errors es mostraran només al terminal."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:955
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "Respon"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:957
+#: ../mail/em-format-html.c:2252 ../mail/em-format-html.c:2323
+#: ../mail/em-format-html.c:2360 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "CC"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../mail/em-format-html.c:2253 ../mail/em-format-html.c:2334
+#: ../mail/em-format-html.c:2367 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "CCO"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:959
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
 #: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
@@ -9190,7 +8974,7 @@ msgid "Subject"
 msgstr "Assumpte"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2465
 #: ../modules/mail/em-mailer-prefs.c:1130
 msgid "Mailer"
 msgstr "Generador del correu"
@@ -9199,22 +8983,22 @@ msgstr "Generador del correu"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Missatge reenviat --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:960 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:961 ../modules/mail/em-mailer-prefs.c:84
 msgid "Newsgroups"
 msgstr "Grups de notícies"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:962 ../modules/mail/em-mailer-prefs.c:85
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Cares"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1315
 #, c-format
 msgid "%s attachment"
 msgstr "fitxer adjunt %s"
@@ -9223,156 +9007,156 @@ msgstr "fitxer adjunt %s"
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S'ha produït un error desconegut en analitzar el missatge S/MIME"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1528 ../em-format/em-format.c:1698
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No s'ha pogut analitzar el missatge MIME. Es mostrarà com a codi font."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1536
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "El tipus de xifratge per a multipart/encrypted no està implementat"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1548
 msgid "Could not parse PGP/MIME message"
 msgstr "No s'ha pogut analitzar el missatge PGP/MIME"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1548
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "No s'ha pogut analitzar el missatge PGP/MIME: error desconegut"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1722
 msgid "Unsupported signature format"
 msgstr "El format de la signatura no està implementat"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1730 ../em-format/em-format.c:1880
 msgid "Error verifying signature"
 msgstr "S'ha produït un error en verificar la contrasenya"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1730 ../em-format/em-format.c:1869
+#: ../em-format/em-format.c:1880
 msgid "Unknown error verifying signature"
 msgstr "S'ha produït un error desconegut en verificar la contrasenya"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1957
 msgid "Could not parse PGP message"
 msgstr "No s'ha pogut analitzar el missatge PGP"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1957
 msgid "Could not parse PGP message: Unknown error"
 msgstr "No s'ha pogut analitzar el missatge PGP: error desconegut"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "fa 1 segon"
 msgstr[1] "fa %d segons"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "d'aquí a 1 segon"
 msgstr[1] "d'aquí a %d segons"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "fa 1 minut"
 msgstr[1] "fa %d minuts"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "d'aquí a 1 minut"
 msgstr[1] "d'aquí a %d minut"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "fa 1 hora"
 msgstr[1] "fa %d hores"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "d'aquí a 1 hora"
 msgstr[1] "d'aquí a %d hores"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "fa 1 dia"
 msgstr[1] "fa %d dies"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "D'aquí a 1 dia"
 msgstr[1] "D'aquí a %d dies"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "fa 1 setmana"
 msgstr[1] "fa %d setmanes"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "D'aquí a 1 setmana"
 msgstr[1] "D'aquí a %d setmanes"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "fa 1 mes"
 msgstr[1] "fa %d mesos"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "D'aquí a 1 mes"
 msgstr[1] "D'aquí a %d mesos"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "fa 1 any"
 msgstr[1] "fa %d anys"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "D'aquí a 1 any"
 msgstr[1] "D'aquí a %d anys"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<feu clic per seleccionar una data>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "ara"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d/%b/%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Seleccioneu amb quina hora es compararà"
 
@@ -9425,11 +9209,11 @@ msgid "I_nclude threads"
 msgstr "I_nclou els fils"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:307
 msgid "Incoming"
 msgstr "Entrada"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:308
 msgid "Outgoing"
 msgstr "Sortida"
 
@@ -9461,7 +9245,7 @@ msgstr "Manca la data."
 msgid "Missing file name."
 msgstr "Manca el nom de fitxer."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:72
 msgid "Missing name."
 msgstr "Manca el nom."
 
@@ -9575,26 +9359,6 @@ msgstr "Vista d'icones"
 msgid "List View"
 msgstr "Vista de llista"
 
-#: ../mail/e-mail-browser.c:763 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Seguidor de focus"
-
-#: ../mail/e-mail-browser.c:773
-msgid "Shell Module"
-msgstr "Mòdul del Shell"
-
-#: ../mail/e-mail-browser.c:774 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "El rerefons del Shell del correu"
-
-#: ../mail/e-mail-browser.c:784
-msgid "Show Deleted"
-msgstr "Mostra els suprimits"
-
-#: ../mail/e-mail-browser.c:785
-msgid "Show deleted messages"
-msgstr "Mostra els missatges suprimits"
-
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
 msgstr "_Afegeix a la llibreta d'adreces..."
@@ -9640,7 +9404,7 @@ msgid "_Later"
 msgstr "D_esprés"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:519
+#: ../modules/mail/e-mail-shell-view-actions.c:472
 msgid "Add Label"
 msgstr "Afegeix una etiqueta"
 
@@ -9661,6 +9425,15 @@ msgstr ""
 msgid "Color"
 msgstr "Color"
 
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1159
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:320
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Nom"
+
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
 #: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
 #: ../modules/mail/e-mail-shell-view-private.c:963
@@ -9685,91 +9458,24 @@ msgstr "Enviat"
 msgid "Templates"
 msgstr "Plantilles"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Important"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "Per fer"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Més tard"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:153
 msgid "Migrating..."
 msgstr "S'està migrant..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:186
 msgid "Migration"
 msgstr "Migració"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:226
 #, c-format
 msgid "Migrating '%s':"
 msgstr "S'està migrant «%s»:"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "No es pot crear la carpeta nova «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "No es pot copiar la carpeta «%s» a «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "No es poden cercar bústies de correu existents a «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:666
 msgid "Migrating Folders"
 msgstr "S'estan migrant les carpetes"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"La ubicació i la jerarquia de les carpetes de les bústies de correu ha "
-"canviat des de l'Evolution 1.x.\n"
-"\n"
-"Espereu mentre l'Evolution migra les vostres carpetes..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "No s'han pogut obrir les dades velles «%s» POP3 keep-on-server: %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "No s'ha pogut crear el directori de dades «%s» POP3 keep-on-server: %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "No s'han pogut copiar les dades «%s» POP3 keep-on-server: %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "No s'ha pogut crear el magatzem de correu local «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:667
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9781,20 +9487,11 @@ msgstr ""
 "\n"
 "Espereu mentre l'Evolution migra les vostres carpetes..."
 
-#: ../mail/e-mail-migrate.c:3031
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
+#: ../mail/e-mail-migrate.c:763
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at '%s': %s"
 msgstr "No s'ha pogut crear les carpetes de correu local a «%s»: %s"
 
-#: ../mail/e-mail-migrate.c:3049
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"No s'ha pogut llegir la configuració de la instal·lació anterior de "
-"l'Evolution. El fitxer «evolution/config.xmldb» no existeix o està malmès."
-
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
@@ -9832,7 +9529,6 @@ msgstr[1] "Desa els missatges"
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
 #: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Missatge"
@@ -10143,7 +9839,7 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "Reexpedeix el missatge seleccionat a una altra persona"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "Respon a _tots"
@@ -10323,11 +10019,11 @@ msgstr "Totes les _capçaleres de missatge"
 msgid "Show messages with all email headers"
 msgstr "Mostra els missatges amb totes les capçaleres"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1878
 msgid "Unable to retrieve message"
 msgstr "No s'ha pogut recuperar el missatge"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1943
 #: ../mail/mail-ops.c:1849
 #, c-format
 msgid "Retrieving message '%s'"
@@ -10335,7 +10031,7 @@ msgstr "S'està recuperant el missatge «%s»"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2457
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:534
 #: ../plugins/google-account-setup/google-source.c:656
@@ -10343,33 +10039,33 @@ msgstr "S'està recuperant el missatge «%s»"
 msgid "Default"
 msgstr "Predeterminat"
 
-#: ../mail/e-mail-reader.c:2588
+#: ../mail/e-mail-reader.c:2578
 #: ../modules/mail/e-mail-attachment-handler.c:134
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2579
 msgid "Forward the selected message to someone"
 msgstr "Reenvia el missatge seleccionat a una altra persona"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2623 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Següent"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2635 ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "Respon"
 
@@ -10419,34 +10115,34 @@ msgstr ""
 "i marqueu la casella de verificació per acceptar-lo\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "cap"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "Mai"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "Pregunta per cada missatge"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Cap"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "Configuració del correu"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10457,7 +10153,7 @@ msgstr ""
 "\n"
 "Feu clic a «Endavant» per començar."
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2060
 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 "
@@ -10467,20 +10163,20 @@ msgstr ""
 "«opcionals» no són necessaris, a menys que els vulgueu afegir en els correus "
 "que envieu."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2228
 #: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "Recepció de correu"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "Configureu els següents paràmetres del compte."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2705
 msgid "Sending Email"
 msgstr "Enviament de correu"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10488,11 +10184,11 @@ msgstr ""
 "Introduïu informació sobre com voleu enviar el correu. Si no n'esteu segur, "
 "pregunteu-ho a l'administrador del sistema o al vostre proveïdor d'Internet."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "Gestió de comptes"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2069
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10500,11 +10196,11 @@ msgstr ""
 "Introduïu un nom descriptiu per a aquest compte aquí sota. \n"
 "Aquest nom només s'utilitzarà per visualitzar-lo."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "Fet"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10518,33 +10214,33 @@ msgstr ""
 "\n"
 "Feu clic a «Aplica» per desar la configuració."
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2515
 msgid "Check for _new messages every"
 msgstr "Comprova si hi ha correu _nou cada"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2523
 msgid "minu_tes"
 msgstr "minu_ts"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2831 ../mail/mail-config.ui.h:100
 msgid "Security"
 msgstr "Seguretat"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2876 ../mail/em-account-editor.c:2944
 msgid "Receiving Options"
 msgstr "Opcions de recepció"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
 msgid "Checking for New Messages"
 msgstr "Comprovació de correu nou"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3413
 msgid "Account Editor"
 msgstr "Editor de comptes"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3413
 msgid "Evolution Account Assistant"
 msgstr "Auxiliar per als comptes de l'Evolution"
 
@@ -10668,6 +10364,10 @@ msgstr "Respondre"
 msgid "Forward to"
 msgstr "Reenvia a"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Important"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "és després de"
@@ -10880,7 +10580,7 @@ msgstr "_Nom de la carpeta:"
 #: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
 #: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
 #: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/mail-vfolder.c:1076 ../mail/mail-vfolder.c:1141
 msgid "Search Folders"
 msgstr "Carpetes de cerca"
 
@@ -10940,12 +10640,12 @@ msgstr "S'està movent la carpeta %s"
 msgid "Copying folder %s"
 msgstr "S'està copiant la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2098
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "S'estan movent els missatges a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2100
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "S'estan copiant els missatges a la carpeta %s"
@@ -10964,8 +10664,8 @@ msgstr "Copia la carpeta a"
 
 #: ../mail/em-folder-utils.c:507
 #: ../plugins/groupwise-features/share-folder-common.c:141
-#, c-format
-msgid "Creating folder `%s'"
+#, fuzzy, c-format
+msgid "Creating folder '%s'"
 msgstr "S'està creant la carpeta «%s»"
 
 #: ../mail/em-folder-utils.c:670
@@ -10983,7 +10683,7 @@ msgstr "Especifiqueu on s'ha de crear la carpeta:"
 msgid "Unsubscribing from folder \"%s\""
 msgstr "S'ha cancel·lat la subscripció a la carpeta «%s»"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1547
 msgid "Unsigned"
 msgstr "Sense signar"
 
@@ -10995,7 +10695,7 @@ msgstr ""
 "Aquest missatge no està signat. No hi ha cap garantia que el remitent del "
 "missatge sigui l'autèntic."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1548
 msgid "Valid signature"
 msgstr "La signatura és vàlida"
 
@@ -11007,7 +10707,7 @@ msgstr ""
 "Aquest missatge està signat i és vàlid. És molt probable que el remitent del "
 "missatge sigui l'autèntic."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1549
 msgid "Invalid signature"
 msgstr "La signatura no és vàlida"
 
@@ -11019,7 +10719,7 @@ msgstr ""
 "No es pot verificar la signatura del missatge. Pot ser que s'hagi alterat "
 "durant la transmissió."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1550
 msgid "Valid signature, but cannot verify sender"
 msgstr "La signatura és vàlida però no es pot verificar el remitent"
 
@@ -11031,7 +10731,7 @@ msgstr ""
 "Aquest missatge està signat amb una signatura vàlida, però no es pot "
 "verificar el remitent del missatge."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1551
 msgid "Signature exists, but need public key"
 msgstr "La signatura existeix, però es necessita la clau pública"
 
@@ -11043,7 +10743,7 @@ msgstr ""
 "Aquest missatge està signat amb una signatura vàlida, però no se li ha "
 "trobat la clau pública corresponent."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1557
 msgid "Unencrypted"
 msgstr "Sense xifrar"
 
@@ -11055,7 +10755,7 @@ msgstr ""
 "Aquest missatge no està xifrat. Es podria visualitzar el seu contingut en el "
 "transport per Internet."
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1558
 msgid "Encrypted, weak"
 msgstr "Xifrat, feble"
 
@@ -11070,7 +10770,7 @@ msgstr ""
 "visualitzar el contingut d'aquest missatge en una quantitat de temps "
 "raonable."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1559
 msgid "Encrypted"
 msgstr "Xifrat"
 
@@ -11082,7 +10782,7 @@ msgstr ""
 "Aquest missatge està xifrat. Seria molt difícil que una persona desconeguda "
 "visualitzés el contingut d'aquest missatge."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1560
 msgid "Encrypted, strong"
 msgstr "Xifrat, fort"
 
@@ -11142,48 +10842,48 @@ msgstr "O_bre amb"
 msgid "Page %d of %d"
 msgstr "Pàgina %d de %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:166
 msgid "Formatting message"
 msgstr "S'està formatant el missatge"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:357
 msgid "Formatting Message..."
 msgstr "S'està formatant el missatge..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
-#, c-format
-msgid "Retrieving `%s'"
+#: ../mail/em-format-html.c:1398 ../mail/em-format-html.c:1407
+#, fuzzy, c-format
+msgid "Retrieving '%s'"
 msgstr "S'està obtenint «%s»"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1864
 msgid "Unknown external-body part."
 msgstr "La part del cos externa és desconeguda."
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1872
 msgid "Malformed external-body part."
 msgstr "La part del cos externa està mal formada."
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1902
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punter al lloc FTP (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1913
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punter a un fitxer local (%s) vàlid al lloc «%s»"
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1915
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punter al fitxer local (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1936
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punter a dades remotes (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1947
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punter a dades externes (tipus «%s»)"
@@ -11191,7 +10891,7 @@ msgstr "Punter a dades externes (tipus «%s»)"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2638
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Aquest missatge fou enviat per <b>%s</b> en nom de <b>%s</b>"
@@ -11217,12 +10917,22 @@ msgstr "Seleccioneu un servidor."
 msgid "No server has been selected"
 msgstr "No s'ha seleccionat cap servidor"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:111
+#, fuzzy, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "Segur que voleu obrir {0} missatges a la vegada?"
+msgstr[1] "Segur que voleu obrir {0} missatges a la vegada?"
+
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Filtres de missatge"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:821
 #, c-format
 msgid "Messages from %s"
 msgstr "Missatges de %s"
@@ -12372,7 +12082,7 @@ msgid "Select folder to import into"
 msgstr "Seleccioneu a quina carpeta s'importarà"
 
 #: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Bústia de correu de Berkeley (mbox)"
 
@@ -12388,8 +12098,8 @@ msgstr "S'està important una bústia"
 #: ../mail/importers/mail-importer.c:155
 #: ../plugins/pst-import/pst-importer.c:456
 #: ../plugins/pst-import/pst-importer.c:562
-#, c-format
-msgid "Importing `%s'"
+#, fuzzy, c-format
+msgid "Importing '%s'"
 msgstr "S'està important «%s»"
 
 #: ../mail/importers/mail-importer.c:298
@@ -12438,6 +12148,23 @@ msgstr "Llista de correu %s"
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:453
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(Nota: s'haurà de reiniciar l'aplicació)"
@@ -12564,7 +12291,8 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Signa digitalment els missatges de sortida (per defecte)"
 
 #: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
+#, fuzzy
+msgid "Displayed Message Headers"
 msgstr "_Capçaleres de missatge mostrades"
 
 #: ../mail/mail-config.ui.h:37
@@ -13156,7 +12884,7 @@ msgstr "Sen_yalador:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Habili_teu-lo per acceptar l'acord de llicència"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:898
 #, c-format
 msgid "Pinging %s"
 msgstr "S'està enviant un ping a %s"
@@ -13176,17 +12904,17 @@ msgid "Failed to apply outgoing filters: %s"
 msgstr "No s'han pogut aplicar els filtres de sortida: %s"
 
 #: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "No s'ha pogut afegir a %s: %s\n"
 "S'afegirà a la carpeta local «Enviat» en lloc d'això."
 
 #: ../mail/mail-ops.c:641
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+#, fuzzy, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "No s'han pogut afegir a la carpeta local «Enviat»: %s"
 
 #: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
@@ -13412,13 +13140,13 @@ msgstr ""
 "reenviament del missatge."
 
 #: ../mail/mail-tools.c:123
-#, c-format
-msgid "Could not create spool directory `%s': %s"
+#, fuzzy, c-format
+msgid "Could not create spool directory '%s': %s"
 msgstr "No s'ha pogut crear el directori de cues «%s»: %s"
 
 #: ../mail/mail-tools.c:153
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+#, fuzzy, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "S'està intentant moure correus d'una font no mbox «%s»"
 
 #: ../mail/mail-tools.c:259
@@ -13431,8 +13159,8 @@ msgid "Forwarded message"
 msgstr "Missatge reenviat"
 
 #: ../mail/mail-tools.c:301
-#, c-format
-msgid "Invalid folder: `%s'"
+#, fuzzy, c-format
+msgid "Invalid folder: '%s'"
 msgstr "La carpeta no és vàlida: «%s»"
 
 #: ../mail/mail-vfolder.c:87
@@ -13450,11 +13178,28 @@ msgstr "S'estan actualitzant les carpetes de cerca per a «%s:%s»"
 msgid "Updating Search Folders for '%s'"
 msgstr "S'estan actualitzant les carpetes de cerca per a «%s»"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:682
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-vfolder.c:1192
 msgid "Edit Search Folder"
 msgstr "Edita les carpetes de cerca"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1294
 msgid "New Search Folder"
 msgstr "Carpeta de cerca nova"
 
@@ -13514,10 +13259,6 @@ msgid ""
 msgstr "Segur que voleu suprimir aquest compte i tots els seus apoderats?"
 
 #: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Segur que voleu obrir {0} missatges a la vegada?"
-
-#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13525,7 +13266,7 @@ msgstr ""
 "Segur que voleu suprimir permanentment tots els missatges suprimits de totes "
 "les carpetes?"
 
-#: ../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 \"{0}\"?"
@@ -13533,87 +13274,87 @@ msgstr ""
 "Segur que voleu suprimir permanentment tots els missatges suprimits de la "
 "carpeta «{0}»?"
 
-#: ../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 "Segur que voleu enviar un missatge HTML?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Segur que voleu enviar un missatge amb una adreça no vàlida?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Segur que voleu enviar un missatge només amb adreces no vàlides?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Segur que voleu enviar un missatge només amb destinataris CCO?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Segur que voleu enviar un missatge sense assumpte?"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because \"{0}\"."
 msgstr "Degut a «{0}»."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Because \"{2}\"."
 msgstr "Degut a «{2}»."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:22
 msgid "Blank Signature"
 msgstr "Signatura buida"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "No es pot afegir la carpeta de cerca «{0}»."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "No es pot copiar la carpeta «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "No s'ha pogut crear la carpeta «{0}»."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "No s'ha pogut crear el directori temporal per desar."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "No s'ha pogut crear el directori per desar degut a «{1}»"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "No s'ha pogut suprimir la carpeta «{0}»."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "No es pot suprimir la carpeta de sistema «{0}»."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "No es pot editar la carpeta de cerca «{0}» perquè no existeix."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "No es pot moure la carpeta «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source \"{1}\""
 msgstr "No s'ha pogut obrir l'origen «{1}»"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "No s'ha pogut obrir l'origen «{2}»."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "No es pot obrir la destinació «{2}»."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13622,35 +13363,35 @@ msgstr ""
 "d'instal·lació. No podreu utilitzar aquest proveïdor fins que no n'accepteu "
 "la llicència."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "No es pot canviar el nom de «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "No es pot canviar el nom o moure la carpeta de sistema «{0}»."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "No es poden desar els canvis al compte."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "No s'ha pogut desar al directori «{0}»."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "No es pot desar al fitxer «{0}»."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "No s'ha pogut establir l'script de signatura «{0}»."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Check Junk Failed"
 msgstr "Ha fallat la comprovació de correu brossa"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13659,27 +13400,27 @@ msgstr ""
 "moltes contrasenyes diferencien majúscules i minúscules. Assegureu-vos que "
 "la tecla de bloqueig de majúscules no estigui activada."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Could not save signature file."
 msgstr "No s'ha pogut desar el fitxer de signatura."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Voleu suprimir els missatges de la carpeta de cerca «{0}»?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not d_elete"
 msgstr "No ho su_primeixis"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do not delete"
 msgstr "No ho suprimeixis"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do not disable"
 msgstr "No ho inhabilitis"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13687,43 +13428,43 @@ msgstr ""
 "Voleu sincronitzar localment les carpetes marcades per treballar fora de "
 "línia?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "Voleu marcar tots els missatges com a llegits?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "Voleu desar els canvis?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Introduïu la contrasenya."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "S'ha produït un error en carregar les definicions de filtre."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "S'ha produït un error en realitzar l'operació."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "Error while {0}."
 msgstr "S'ha produït un error en {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but cannot overwrite it."
 msgstr "El fitxer existeix però no es pot sobreescriure."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but is not a regular file."
 msgstr "El fitxer existeix però no és un fitxer normal."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si continueu, no podreu recuperar aquests missatges."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -13731,18 +13472,18 @@ msgstr ""
 "Si suprimiu la carpeta, tots els continguts i els de les seves subcarpetes "
 "se suprimiran permanentment."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "Si suprimiu la carpeta, tots els continguts i els de les seves subcarpetes "
 "se suprimiran permanentment."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Si continueu, els comptes apoderats se suprimiran permanentment."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13750,11 +13491,11 @@ msgstr ""
 "Si continueu, la informació dels comptes i\n"
 "la informació de l'apoderat se suprimiran permanentment."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Si continueu, la informació dels comptes se suprimirà permanentment."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13762,23 +13503,23 @@ msgstr ""
 "Si sortiu, aquests missatges no s'enviaran fins que s'iniciï l'Evolution de "
 "nou."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Invalid authentication"
 msgstr "Autenticació no vàlida"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mail Deletion Failed"
 msgstr "Ha fallat la supressió del correu"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Mail filters automatically updated."
 msgstr "S'han actualitzat automàticament els filtres de correu."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:70
 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 "
@@ -13791,28 +13532,28 @@ msgstr ""
 "missatges. Per evitar-ho, hauríeu d'afegir almenys un destinatari «Per a:» o "
 "«CC:»."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "Missing folder."
 msgstr "Manca la carpeta."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "No sources selected."
 msgstr "No s'ha seleccionat cap font."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 "Si obriu molts missatges a la vegada pot ser que s'hi trigui molt de temps."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid "Please check your account settings and try again."
 msgstr "Comproveu la configuració de comptes i torneu-ho a provar."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "Please enable the account or send using another account."
 msgstr "Habiliteu el compte o bé envieu amb un altre compte."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:77
 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."
@@ -13821,7 +13562,7 @@ msgstr ""
 "adreces electròniques si feu clic en el botó Per a: al costat de l'entrada "
 "de text."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:78
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13831,64 +13572,64 @@ msgstr ""
 "format HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduïu un nom únic per identificar aquesta signatura."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Espereu."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Hi ha hagut un problema en migrar la carpeta de correu antiga «{0}»."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "S'estan consultant els mecanismes d'autenticació compatibles al servidor."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "S'ha sol·licitat una confirmació de lectura."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Voleu suprimir la carpeta «{0}» i totes les seves subcarpetes?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder \"{0}\"?"
 msgstr "Segur que voleu suprimir la carpeta «{0}»?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Report Junk Failed"
 msgstr "Ha fallat el marcatge com a correu brossa"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Report Not Junk Failed"
 msgstr "Ha fallat el marcatge com a correu que no és brossa"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid "Search Folders automatically updated."
 msgstr "S'han actualitzat les carpetes de cerca automàticament."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "Envia la confirmació"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "La signatura ja existeix"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "Sincronitza"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Voleu sincronitzar les carpetes localment per treballar fora de línia?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13896,7 +13637,7 @@ msgstr ""
 "L'Evolution necessita les carpetes del sistema per funcionar correctament i "
 "no se les pot tornar a anomenar, moure ni suprimir."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13913,35 +13654,7 @@ msgstr ""
 "tots els missatges. Per evitar-ho, hauríeu d'afegir almenys un destinatari "
 "«Per a:» o «CC:»."
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Les carpetes de cerca següents:\n"
-"{0}\n"
-"feien servir la carpeta suprimida:\n"
-"    «{1}»\n"
-"i s'han actualitzat."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Les regles de filtre següents:\n"
-"{0}\n"
-"feien servir la carpeta suprimida:\n"
-"    «{1}»\n"
-"i s'han actualitzat."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13949,7 +13662,7 @@ msgstr ""
 "No s'ha reconegut el destinatari següent com a una adreça de correu vàlida:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13958,11 +13671,11 @@ msgstr ""
 "vàlides:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "El fitxer de l'script ha de ser executable."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13971,7 +13684,7 @@ msgstr ""
 "Aneu a l'editor de carpetes de cerca per afegir-la explícitament en cas que "
 "sigui necessari."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13979,13 +13692,13 @@ msgstr ""
 "No es pot enviar el missatge perquè el compte que heu escollit per enviar no "
 "està habilitat"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Aquest missatge no es pot enviar perquè no se n'ha indicat cap destinatari"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13993,11 +13706,11 @@ msgstr ""
 "El servidor no funciona amb el tipus d'autenticació sol·licitat. És possible "
 "que no permeti cap tipus d'autenticació."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "Aquesta signatura s'ha modificat, però no s'ha desat."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14005,11 +13718,11 @@ msgstr ""
 "Això marcarà tots els missatges com a llegits en el directori seleccionat i "
 "els seus subdirectoris."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "No es pot connectar al servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14017,19 +13730,19 @@ msgstr ""
 "No s'ha pogut obrir la carpeta d'esborranys d'aquest compte. Voleu fer "
 "servir la carpeta d'esborranys del sistema?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "No es pot llegir el fitxer de la llicència."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "Pre_determinat"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "Voleu utilitzar la carpeta d'esborranys predeterminada?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -14039,31 +13752,31 @@ msgstr ""
 "missatge original de la carpeta local o remota.\n"
 "Esteu segur que voleu fer-ho?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:117
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "No teniu els permisos suficients per esborrar aquest correu."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:118
 msgid "You have not filled in all of the required information."
 msgstr "No heu introduït tota la informació necessària."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:119
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Teniu missatges sense enviar. Voleu sortir de totes maneres?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:120
 msgid "You may not create two accounts with the same name."
 msgstr "No és possible crear dos comptes amb el mateix nom."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "Heu d'assignar un nom a aquesta carpeta de cerca."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "Heu d'especificar una carpeta."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14073,115 +13786,111 @@ msgstr ""
 "Podeu fer-ho seleccionant les carpetes individualment, i/o seleccionant "
 "totes les carpetes locals, totes les remotes, o ambdues."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:125
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Ha fallat l'entrada al servidor «{0}» com a «{0}»."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "_Afegeix"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "_Descarta els canvis"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:128
 msgid "_Do not Synchronize"
 msgstr "N_o sincronitzis"
 
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:866
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:821
 msgid "_Empty Trash"
 msgstr "Buida la _paperera"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "Bui_da"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "_Obre els missatges"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1118
 msgid "Unseen"
 msgstr "No vist"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1119
 msgid "Seen"
 msgstr "Vist"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1120
 msgid "Answered"
 msgstr "Respost"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1121
 msgid "Forwarded"
 msgstr "Reenviat"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1122
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples missatges sense veure"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1123
 msgid "Multiple Messages"
 msgstr "Missatges múltiples"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1127
 msgid "Lowest"
 msgstr "La més baixa"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1128
 msgid "Lower"
 msgstr "Més baixa"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1132
 msgid "Higher"
 msgstr "Més alta"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1133
 msgid "Highest"
 msgstr "La més alta"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1743 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1750 ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M %p"
 msgstr "Avui a les %k:%M"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1759
 msgid "Yesterday %l:%M %p"
 msgstr "Ahir a les %k:%M"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1771
 msgid "%a %l:%M %p"
 msgstr "%a a les %k:%M"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1779
 msgid "%b %d %l:%M %p"
 msgstr "el %d de %b a les %k:%M"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1781
 msgid "%b %d %Y"
 msgstr "%d de %b del %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2517
 msgid "Select all visible messages"
 msgstr "Selecciona tots els missatges visibles"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:729
-msgid "Shell Backend"
-msgstr "Rerefons del Shell"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4426 ../mail/message-list.c:4922
+#: ../mail/message-list.c:4181 ../mail/message-list.c:4583
 msgid "Generating message list"
 msgstr "S'està generant la llista de missatges"
 
-#: ../mail/message-list.c:4753
+#: ../mail/message-list.c:4416
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14189,15 +13898,7 @@ msgstr ""
 "No hi ha cap missatge que satisfaci els vostres criteris de cerca. Netegeu "
 "la cerca a través de l'element de menú Cerca -> Neteja, o bé canvieu-la."
 
-#: ../mail/message-list.c:4755
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"Aquesta carpeta només conté missatges ocults. Utilitzeu l'entrada de menú "
-"«Visualitza->Mostra els missatges amagats» per mostrar-los."
-
-#: ../mail/message-list.c:4757
+#: ../mail/message-list.c:4418
 msgid "There are no messages in this folder."
 msgstr "No hi ha cap missatge en aquesta carpeta."
 
@@ -14235,27 +13936,27 @@ msgid "Subject - Trimmed"
 msgstr "Assumpte - retallat"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Body contains"
 msgstr "El cos conté"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Message contains"
 msgstr "El missatge conté"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Recipients contain"
 msgstr "Els destinataris contenen"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Sender contains"
 msgstr "El remitent conté"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Subject contains"
 msgstr "L'assumpte conté"
 
@@ -14290,7 +13991,8 @@ msgstr ""
 "vulnerables als atacs de seguretat."
 
 #: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
+#, fuzzy
+msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Utilitza al calendari d'_aniversaris i commemoracions"
 
 #: ../modules/addressbook/addressbook-config.c:628
@@ -14442,9 +14144,11 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "Si s'ha de mostrar la subfinestra de previsualització."
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Columna de la taula:"
+#: ../modules/mail/em-mailer-prefs.c:1151
+msgid "_Table column:"
+msgstr "Columna de la _taula:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -14456,7 +14160,7 @@ msgstr "M_ostra sempre l'adreça del contacte autocompletat"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "Als servidors d'LDAP"
 
@@ -14494,113 +14198,10 @@ msgstr "Crea una llibreta d'adreces nova"
 #: ../modules/addressbook/e-book-shell-backend.c:376
 #: ../modules/addressbook/e-book-shell-view.c:394
 #: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Contactes"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Llista d'origen"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "El registre de llibretes d'adreces"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "Visualització actual"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "La visualització de llibreta d'adreces seleccionada"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Contacte que es previsualitza"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "El contacte que es mostra la subfinestra de previsualització"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "La previsualització és visible"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "Si s'ha de mostrar la subfinestra de previsualització"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "Servidors d'LDAP"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "Paràmetres de la compleció automàtica"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-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 ""
-"S'ha modificat la ubicació i jerarquia de les carpetes de contactes de "
-"l'Evolution des de la versió 1.x.\n"
-"\n"
-"Espereu mentre l'Evolution migra les carpetes..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Ha canviat el format dels contactes de les llistes de correu.\n"
-"\n"
-"Espereu mentre l'Evolution migra les carpetes..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Ha canviat la manera com l'Evolution emmagatzema els números de telèfon.\n"
-"\n"
-"Espereu mentre l'Evolution migra les carpetes..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Ha canviat el registre de canvis del Palm Sync de l'Evolution i els fitxers "
-"de mapes.\n"
-"\n"
-"Espereu mentre l'Evolution migra les vostres dades del Pilot Sync..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "Giny de selecció de font"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "Aquest giny mostra grups de llibretes d'adreces"
-
 #: ../modules/addressbook/e-book-shell-view-actions.c:262
 #: ../modules/addressbook/e-book-shell-view-actions.c:539
 msgid "Save as vCard"
@@ -14643,10 +14244,10 @@ msgid "Show properties of the selected address book"
 msgstr "Canvia les propietats de la llibreta d'adreces seleccionada"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
 #: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/mail/e-mail-shell-view-actions.c:905
 msgid "_Rename..."
 msgstr "Can_via el nom..."
 
@@ -14727,7 +14328,7 @@ msgid "Send a message to the selected contacts"
 msgstr "Envia un missatge als contactes seleccionats"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
 #: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "_Actions"
 msgstr "_Accions"
@@ -14735,12 +14336,12 @@ msgstr "_Accions"
 #: ../modules/addressbook/e-book-shell-view-actions.c:790
 #: ../modules/calendar/e-memo-shell-view-actions.c:647
 #: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1094
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "_Preview"
 msgstr "_Previsualització"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
 #: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Delete"
@@ -14765,7 +14366,7 @@ msgstr "Mostra la finestra de previsualització de contactes"
 #: ../modules/addressbook/e-book-shell-view-actions.c:860
 #: ../modules/calendar/e-memo-shell-view-actions.c:717
 #: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Classic View"
 msgstr "Visualització _clàssica"
 
@@ -14776,7 +14377,7 @@ msgstr "Mostra la previsualització del contacte sota la llista de contactes"
 #: ../modules/addressbook/e-book-shell-view-actions.c:867
 #: ../modules/calendar/e-memo-shell-view-actions.c:724
 #: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Vertical View"
 msgstr "_Visualització vertical"
 
@@ -14786,25 +14387,25 @@ msgstr ""
 "Mostra la previsualització de contacte al costat de la llista de contactes"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
 #: ../modules/calendar/e-task-shell-view-actions.c:905
 msgid "Any Category"
 msgstr "Qualsevol categoria"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
 #: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Unmatched"
 msgstr "Sense coincidència"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
 #: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
-#: ../shell/e-shell-content.c:516
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../shell/e-shell-content.c:438
 msgid "Advanced Search"
 msgstr "Cerca avançada"
 
@@ -14998,11 +14599,11 @@ msgstr "_Importa a les tasques"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-migrate.c:176
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "A Internet"
 
@@ -15012,7 +14613,7 @@ msgid "Weather"
 msgstr "Temps"
 
 #: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Aniversaris i commemoracions"
 
@@ -15022,7 +14623,7 @@ msgid "_Appointment"
 msgstr "Cit_a"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "Crea una cita nova"
 
@@ -15050,7 +14651,7 @@ msgid "Cale_ndar"
 msgstr "Cale_ndari"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "Crea un calendari nou"
 
@@ -15059,37 +14660,6 @@ msgstr "Crea un calendari nou"
 msgid "Calendar and Tasks"
 msgstr "Calendari i tasques"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "El registre de calendaris"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-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 ""
-"Des de l'Evolution 1.x s'ha modificat la ubicació i la jerarquia de les "
-"carpetes del calendari de l'Evolution.\n"
-"\n"
-"Espereu mentre l'Evolution migra les carpetes..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"No s'ha pogut actualitzar la configuració anterior des de l'evolution/config."
-"xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "No s'ha pogut actualitzar el calendari «%s»"
-
 #: ../modules/calendar/e-cal-shell-sidebar.c:167
 #: ../modules/calendar/e-memo-shell-sidebar.c:162
 #: ../modules/calendar/e-task-shell-sidebar.c:162
@@ -15109,26 +14679,6 @@ msgstr "S'estan carregant els calendaris"
 msgid "Calendar Selector"
 msgstr "Selector de calendaris"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "Giny de navegació de dates"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "Aquest giny mostra un calendari en miniatura"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "Client de calendari predeterminat"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "Client predeterminat per a les operacions de calendari"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "Aquest giny mostra grups de calendaris"
-
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-cal-shell-sidebar.c:950
 #, c-format
@@ -15177,115 +14727,115 @@ msgstr "esdeveniment"
 msgid "Save as iCalendar"
 msgstr "Desa com a iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "D_elete Calendar"
 msgstr "S_uprimeix el calendari"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Delete the selected calendar"
 msgstr "Suprimeix el calendari seleccionat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Go Back"
 msgstr "Vés enrere"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Go Forward"
 msgstr "Vés endavant"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
 msgid "Select _Today"
 msgstr "Selecciona av_ui"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "Selecciona avui"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "Selecciona una _data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "Selecciona una data concreta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "Calendari no_u"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 #: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Purg_e"
 msgstr "Bui_da"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Purge old appointments and meetings"
 msgstr "Buida les cites i reunions antigues"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
 #: ../modules/calendar/e-task-shell-view-actions.c:727
 msgid "Re_fresh"
 msgstr "Re_fresca"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Refresh the selected calendar"
 msgstr "Refresca el calendari seleccionat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Rename the selected calendar"
 msgstr "Canvia el nom del calendari seleccionat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Show _Only This Calendar"
 msgstr "Mo_stra només aquest calendari"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendari..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "_Delega una reunió..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delete Appointment"
 msgstr "Su_primeix la cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete selected appointments"
 msgstr "Suprimeix les cites seleccionades"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete This _Occurrence"
 msgstr "Suprimeix aquesta a_parició"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "Suprimeix aquesta aparició"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete All Occ_urrences"
 msgstr "Suprimeix totes les _aparicions"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "Suprimeix totes les aparicions"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "New All Day _Event..."
 msgstr "_Esdeveniment de tot el dia nou..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Create a new all day event"
 msgstr "Crea un esdeveniment de tot el dia nou"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
@@ -15293,124 +14843,128 @@ msgstr "Crea un esdeveniment de tot el dia nou"
 msgid "_Forward as iCalendar..."
 msgstr "R_eenvia com a iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "New _Meeting..."
 msgstr "Re_unió nova..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Create a new meeting"
 msgstr "Crea una reunió nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_u al calendari..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "Cit_a nova..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "Per_met moure aquesta aparició"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "_Obre una cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "Visualitza la cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "_Respon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Anomena i desa com a iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "Planifica una _reunió..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Converteix la cita en una reunió"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "Con_verteix a cita..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Converteix una reunió en una cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+msgid "Quit"
+msgstr "Surt"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "Dia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "Mostra un dia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "Llista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "Mostra com a llista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "Mostra un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "Setmana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "Mostra una setmana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Show one work week"
 msgstr "Mostra una setmana laborable"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "Cites actives"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "Cites dels propers 7 dies"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
 #: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Description contains"
 msgstr "La descripció conté"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
 #: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Summary contains"
 msgstr "El resum conté"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "Imprimeix aquest calendari"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 msgid "Preview the calendar to be printed"
 msgstr "Previsualitza el calendari que s'ha d'imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "Vés a"
 
@@ -15543,14 +15097,6 @@ msgstr "Lli_sta d'anotacions"
 msgid "Create a new memo list"
 msgstr "Crea una llista d'anotacions nova"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "El registre de llistes d'anotacions"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "El model de la taula d'anotacions"
-
 #: ../modules/calendar/e-memo-shell-sidebar.c:221
 msgid "Loading memos"
 msgstr "S'estan carregant les anotacions"
@@ -15559,18 +15105,6 @@ msgstr "S'estan carregant les anotacions"
 msgid "Memo List Selector"
 msgstr "Selector de llistes d'anotacions"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "Client d'anotacions predeterminat"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "El client predeterminat per a les operacions d'anotacions"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "Aquest giny mostra un grup de llistes d'anotacions"
-
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-memo-shell-sidebar.c:868
 #, c-format
@@ -15688,32 +15222,6 @@ msgstr "Llista de tas_ques"
 msgid "Create a new task list"
 msgstr "Crea una llista de tasques nova"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "El registre de llistes de tasques"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "Model de la taula de tasques"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-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 ""
-"Des de l'Evolution 1.x s'ha modificat la ubicació i la jerarquia de les "
-"carpetes de les tasques de l'Evolution.\n"
-"\n"
-"Espereu mentre l'Evolution migra les carpetes..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "No s'han pogut actualitzar les tasques «%s»"
-
 #: ../modules/calendar/e-task-shell-sidebar.c:221
 msgid "Loading tasks"
 msgstr "S'estan carregant les tasques"
@@ -15722,18 +15230,6 @@ msgstr "S'estan carregant les tasques"
 msgid "Task List Selector"
 msgstr "Selector de llistes de tasques"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "Client de tasques predeterminat"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "Client predeterminat per les tasques d'operacions"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "Aquest giny mostra grups de llistes de tasques"
-
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-task-shell-sidebar.c:868
 #, c-format
@@ -15916,308 +15412,277 @@ msgstr "Preferències del redactor"
 msgid "Network Preferences"
 msgstr "Preferències de la xarxa"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "Agrupa per fils"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "Si s'han d'agrupar els missatges per fils"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:859
+#: ../modules/mail/e-mail-shell-view-actions.c:814
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "_Inhabilita el compte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:861
+#: ../modules/mail/e-mail-shell-view-actions.c:816
 msgid "Disable this account"
 msgstr "Inhabilita aquest compte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:868
+#: ../modules/mail/e-mail-shell-view-actions.c:823
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "Suprimeix permanentment tots els missatges suprimits de totes les carpetes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:873
+#: ../modules/mail/e-mail-shell-view-actions.c:828
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rea una carpeta de cerca a partir de la cerca..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view-actions.c:835
 msgid "_Download Messages for Offline Usage"
 msgstr "_Baixa els missatges per treballar fora de línia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:837
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Baixa els missatges dels comptes o carpetes marcats per treballar fora de "
 "línia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../modules/mail/e-mail-shell-view-actions.c:842
 msgid "Fl_ush Outbox"
 msgstr "Bui_da la safata de sortida"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:849
 msgid "_Copy Folder To..."
 msgstr "_Copia la carpeta a..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:896
+#: ../modules/mail/e-mail-shell-view-actions.c:851
 msgid "Copy the selected folder into another folder"
 msgstr "Copia la carpeta seleccionada a una altra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:858
 msgid "Permanently remove this folder"
 msgstr "Suprimeix permanentment la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:908
+#: ../modules/mail/e-mail-shell-view-actions.c:863
 msgid "E_xpunge"
 msgstr "Suprimei_x"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:910
+#: ../modules/mail/e-mail-shell-view-actions.c:865
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Suprimeix permanentment tots els missatges esborrats d'aquesta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:870
 msgid "Mar_k All Messages as Read"
 msgstr "Marca _tots els missatges com a llegits"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:872
 msgid "Mark all messages in the folder as read"
 msgstr "Marca tots els missatges d'aquesta carpeta com a llegits"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:922
+#: ../modules/mail/e-mail-shell-view-actions.c:877
 msgid "_Move Folder To..."
 msgstr "_Mou la carpeta a..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:879
 msgid "Move the selected folder into another folder"
 msgstr "Mou la carpeta seleccionada a una altra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:884
 msgid "_New..."
 msgstr "_Nova..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:886
 msgid "Create a new folder for storing mail"
 msgstr "Crea una carpeta nova per emmagatzemar correu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:893
 msgid "Change the properties of this folder"
 msgstr "Canvia les propietats de la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:900
 msgid "Refresh the folder"
 msgstr "Refresca la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:907
 msgid "Change the name of this folder"
 msgstr "Canvia el nom de la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:912
 msgid "Select Message _Thread"
 msgstr "Selecciona el fil del missa_tge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:914
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Selecciona tots els missatges del fil del missatge seleccionat"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:964
+#: ../modules/mail/e-mail-shell-view-actions.c:919
 msgid "Select Message S_ubthread"
 msgstr "Selecciona el _subfil del missatge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:921
 msgid "Select all replies to the currently selected message"
 msgstr "Selecciona totes les respostes del missatge seleccionat"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:926
 msgid "_Unsubscribe"
 msgstr "Cancel·la la s_ubscripció"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:928
 msgid "Unsubscribe from the selected folder"
 msgstr "Cancel·la la subscripció a la carpeta seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:933
 msgid "Empty _Trash"
 msgstr "Buida la _paperera"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:935
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "Suprimeix permanentment tots els missatges suprimits de tots els comptes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:940
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:994
+#: ../modules/mail/e-mail-shell-view-actions.c:949
 msgid "N_one"
 msgstr "Ca_p"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
-msgid "Hide _Read Messages"
-msgstr "Amaga els missatges _llegits"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1003
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Amaga temporalment tots els missatges que ja s'hagin llegit"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1008
-msgid "Hide S_elected Messages"
-msgstr "Amaga _els missatges seleccionats"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1010
-msgid "Temporarily hide the selected messages"
-msgstr "Amaga temporalment els missatges seleccionats"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
-msgid "Show Hidde_n Messages"
-msgstr "Mostra els missatges ama_gats"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1017
-msgid "Show messages that have been temporarily hidden"
-msgstr "Mostra els missatges que s'han amagat temporalment"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:972
 msgid "Cancel the current mail operation"
 msgstr "Cancel·la l'operació de correu actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:977
 msgid "Collapse All _Threads"
 msgstr "Col·lapsa tots els _fils"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:979
 msgid "Collapse all message threads"
 msgstr "Contrau tots els fils del missatge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:984
 msgid "E_xpand All Threads"
 msgstr "E_xpandeix tots els fils"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:986
 msgid "Expand all message threads"
 msgstr "Expandeix tots els fils de missatge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:991
 msgid "_Message Filters"
 msgstr "Filtres de _missatge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:993
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crea o edita les regles per filtrar el correu nou"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:998
 msgid "Search F_olders"
 msgstr "Car_petes de cerca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
 msgid "Create or edit search folder definitions"
 msgstr "Crea o edita les definicions de carpetes de cerca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
 msgid "_Subscriptions..."
 msgstr "_Subscripcions..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subscriu o cancel·la la subscripció a una carpeta en servidors remots"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
 msgid "F_older"
 msgstr "C_arpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "_New Folder..."
 msgstr "Carpeta _nova..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
-msgid "Hide _Deleted Messages"
-msgstr "Amaga els missatges _suprimits"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Oculta els missatges suprimits en comptes de mostrar-los amb una línia a "
-"sobre"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Show Message _Preview"
 msgstr "Mostra la _previsualització del missatge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "Show message preview pane"
 msgstr "Mostra la finestra de previsualització de missatges"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#, fuzzy
+msgid "Show _Deleted Messages"
+msgstr "Mostra els missatges suprimits"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#, fuzzy
+msgid "Show deleted messages with a line through them"
+msgstr ""
+"Mostra els missatges suprimits a la llista de missatges (amb una ratlla a "
+"sobre)."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "_Group By Threads"
 msgstr "Agrupa per _fils"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Threaded message list"
 msgstr "Llista de missatges amb fils"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Show message preview below the message list"
 msgstr "Mostra la previsualització del missatge sota la llista de missatges"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Show message preview alongside the message list"
 msgstr ""
 "Mostra la previsualització del missatge al costat de la llista de missatges"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
 msgid "All Messages"
 msgstr "Tots els missatges"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
 msgid "Important Messages"
 msgstr "Missatges importants"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Last 5 Days' Messages"
 msgstr "Missatges dels darrers 5 dies"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Messages Not Junk"
 msgstr "Missatges que no són brossa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "Messages with Attachments"
 msgstr "Missatges amb fitxers adjunts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
 msgid "No Label"
 msgstr "Cap etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1248
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Read Messages"
 msgstr "Missatges llegits"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1255
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "Recent Messages"
 msgstr "Missatges recents"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "Unread Messages"
 msgstr "Missatges sense llegir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Subject or Addresses contain"
 msgstr "L'assumpte o les adreces contenen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "All Accounts"
 msgstr "Comptes de correu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Current Account"
 msgstr "Compte actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
@@ -16290,7 +15755,14 @@ msgstr "Cerca al compte"
 msgid "Proxy _Logout"
 msgstr "Sortida de_l servidor intermediari"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-composer-prefs.c:474
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "Habilitat"
+
+#: ../modules/mail/em-composer-prefs.c:478
 msgid "Language(s)"
 msgstr "Idiomes"
 
@@ -16328,8 +15800,6 @@ msgid "Header Value Contains:"
 msgstr "El valor de la capçalera conté:"
 
 #: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Capçalera"
 
@@ -16356,11 +15826,6 @@ msgstr ""
 msgid "No junk plugin available"
 msgstr "No hi ha cap connector de correu brossa disponible"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "Columna de la _taula:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
 #: ../modules/mail/em-mailer-prefs.c:1153
 msgid "_Date header:"
@@ -16716,7 +16181,8 @@ msgstr "Contactes de la missatgeria instantània"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#, fuzzy
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Sincronitza la informació de contactes i les imatges de la llista d'amics "
 "del Pidgin"
@@ -19968,7 +19434,7 @@ msgstr "La barra lateral és visible"
 msgid "Skip development warning dialog"
 msgstr "Omet el diàleg d'avís de versió de desenvolupament"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:306
 msgid "Start in offline mode"
 msgstr "Inicia en mode fora de línia"
 
@@ -20134,149 +19600,46 @@ msgstr "Estil del botó de la finestra"
 msgid "Window buttons are visible"
 msgstr "Els botons de la finestra són visibles"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:499 ../shell/e-shell-content.c:500
 msgid "Searches"
 msgstr "Cerques"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:541
 msgid "Save Search"
 msgstr "Desa la cerca"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "Mos_tra:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "Cer_ca:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr "_a"
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "Estil de la barra d'eines"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "L'estil de la barra d'eines del commutador"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "La barra d'eines és visible"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "Si s'ha de veure el commutador"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Tots els fitxers (*)"
 
-#: ../shell/e-shell-view.c:681
-msgid "Switcher Action"
-msgstr "Acció del commutador"
-
-#: ../shell/e-shell-view.c:682
-msgid "The switcher action for this shell view"
-msgstr "L'acció del commutador per a aquesta visualització del Shell"
-
-#: ../shell/e-shell-view.c:697
-msgid "Page Number"
-msgstr "Número de pàgina"
-
-#: ../shell/e-shell-view.c:698
-msgid "The notebook page number of the shell view"
-msgstr "El número de pàgina de llibreta de la visualització del Shell"
-
-#: ../shell/e-shell-view.c:714
-msgid "Search Rule"
-msgstr "Regla de cerca"
-
-#: ../shell/e-shell-view.c:715
-msgid "Criteria for the current search results"
-msgstr "Criteris dels resultats de la cerca actual"
-
-#: ../shell/e-shell-view.c:730
-msgid "The EShellBackend for this shell view"
-msgstr "L'EShellBackend per a aquesta visualització del Shell"
-
-#: ../shell/e-shell-view.c:745
-msgid "Shell Content Widget"
-msgstr "Giny de contingut del Shell"
-
-#: ../shell/e-shell-view.c:746
-msgid "The content widget appears in a shell window's right pane"
-msgstr ""
-"El giny de contingut apareix a la subfinestra dreta d'una finestra del Shell"
-
-#: ../shell/e-shell-view.c:762
-msgid "Shell Sidebar Widget"
-msgstr "Giny de la barra lateral del Shell"
-
-#: ../shell/e-shell-view.c:763
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
-"El giny de barra lateral apareix a la subfinestra esquerra d'una finestra "
-"del Shell"
-
-#: ../shell/e-shell-view.c:778
-msgid "Shell Taskbar Widget"
-msgstr "Giny de la barra de tasques del Shell"
-
-#: ../shell/e-shell-view.c:779
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
-"El giny de la barra de tasques es mostra a la part de sota d'una finestra "
-"del Shell"
-
-#: ../shell/e-shell-view.c:794
-msgid "Shell Window"
-msgstr "Finestra del Shell"
-
-#: ../shell/e-shell-view.c:795
-msgid "The window to which the shell view belongs"
-msgstr "La finestra a la qual la visualització del Shell pertany"
-
-#: ../shell/e-shell-view.c:811
-msgid "The key file holding widget state data"
-msgstr "El fitxer de clau que conté les dades d'estat dels ginys"
-
-#: ../shell/e-shell-view.c:826
-msgid "The title of the shell view"
-msgstr "El títol de la visualització del Shell"
-
-#: ../shell/e-shell-view.c:840
-msgid "Current View ID"
-msgstr "Identificador de la visualització actual"
-
-#: ../shell/e-shell-view.c:841
-msgid "The current GAL view ID"
-msgstr ""
-"L'identificador de visualització de la llibreta d'adreces global actual"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -20585,117 +19948,29 @@ msgid "Execute these search parameters"
 msgstr "Executa aquests paràmetres de cerca"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:571
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "Nou"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "Visualització activa del Shell"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "Nom de la visualització del Shell activa"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "L'EFocusTracker de la finestra del Shell"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "Geometria"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "Cadena de la geometria de finestra inicial"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Mode segur"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Si la finestra del Shell està en mode segur o no"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "La barra lateral és visible"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "Si la barra lateral de la finestra del Shell és visible"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "El commutador és visible"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Si els botons de commutació de les finestres del Shell són visibles"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "La barra de tasques és visible"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "Si la barra de tasques de la finestra és visible"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Si la barra d'eines de la finestra del Shell és visible"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "Gestor de la interfície d'usuari"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "El GtkUIManager de la finestra del Shell"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "S'està preparant per treballar fora de línia..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "S'està preparant per treballar en línia..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "S'està preparant la sortida..."
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "Directori dels mòduls"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "El directori d'on carregar els EModules"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "La xarxa està disponible"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "Si la xarxa està disponible"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "En línia"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "Si el Shell està en línia"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:163
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20731,7 +20006,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feina, i esperem\n"
 "ansiosament les vostres contribucions.\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:187
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20739,63 +20014,59 @@ msgstr ""
 "Gràcies\n"
 "L'equip de l'Evolution\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:194
 msgid "Do not tell me again"
 msgstr "No ho tornis a mostrar"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:302
 msgid "Start Evolution activating the specified component"
 msgstr "Inicia l'Evolution activant el component especificat"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:304
 msgid "Apply the given geometry to the main window"
 msgstr "Aplica la geometria especificada a la finestra principal"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:308
 msgid "Start in online mode"
 msgstr "Inicia en mode en línia"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:310
 msgid "Start in \"express\" mode"
 msgstr "Inicia en mode senzill"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:313
 msgid "Forcibly shut down Evolution"
 msgstr "Força l'aturada de l'Evolution"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Força tornar a migrar des de l'Evolution 1.4"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:316
 msgid "Send the debugging output of all components to a file."
 msgstr "Envia la sortida de depuració de tots els components a un fitxer."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "Inhabilita la càrrega de connectors."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 "Inhabilita la subfinestra de previsualització per al Correu, Contactes i "
 "Tasques."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:324
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 "Importa els URI o noms de fitxers especificats com la resta d'arguments."
 
-#: ../shell/main.c:350
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr ""
 "Sol·licita que surti a un procés de l'Evolution que s'estigui executant"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:441
 msgid "- The Evolution PIM and Email Client"
 msgstr "El gestor d'informació personal i client de correu de l'Evolution"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:467
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20809,98 +20080,44 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Segur que voleu oblidar totes les contrasenyes recordades?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Conté el valor"
+#, fuzzy
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Voleu suprimir les dades de la versió {0}?"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Voleu suprimir les dades de la versió {0}?"
+#, fuzzy
+msgid "Continue Anyway"
+msgstr "Continua"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "Si oblideu les contrasenyes es netejaran totes les contrasenyes recordades. "
 "Se us tornarà a preguntar la propera vegada que calgui."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "Espai insuficient de disc per a l'actualització."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "Realment voleu suprimir les dades antigues?"
+#, fuzzy
+msgid "Quit Now"
+msgstr "Surt"
 
 #: ../shell/shell.error.xml.h:8
-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 ""
-"Se suprimiran permanentment els continguts del directori &quot;"
-"evolution&quot;.\n"
-"\n"
-"És recomanable que verifiqueu manualment que es conserven totes les vostres "
-"adreces de correu, contactes i calendaris, i que aquesta versió de "
-"l'Evolution funciona correctament abans de suprimir aquestes dades "
-"antigues.\n"
-"\n"
-"Una vegada que s'hagin suprimit, haureu d'efectuar modificacions manualment "
-"si és que voleu tornar a instal·lar una versió antiga.\n"
-
-#: ../shell/shell.error.xml.h:14
-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 ""
-"La versió anterior de l'Evolution emmagatzemava les seves dades en una "
-"ubicació diferent.\n"
-"\n"
-"Si escolliu suprimir aquestes dades, tots els continguts del directori &quot;"
-"evolution&quot; se suprimiran permanentment. Si voleu conservar aquestes "
-"dades, podeu suprimir el contingut de la carpeta «evolution» quan vulgueu.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "Ha fallat l'actualització des de la versió anterior:"
 
-#: ../shell/shell.error.xml.h:19
-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 ""
-"Per actualitzar les vostres dades i la configuració necessitareu fins a {0} "
-"d'espai de disc, però només en teniu {1} de disponible.\n"
-"\n"
-"Necessitareu més espai lliure en la carpeta d'inici abans de poder continuar."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "_Oblida"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_Conserva les dades"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_Recorda-m'ho després"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -21023,8 +20240,8 @@ msgid ""
 "unless otherwise indicated here"
 msgstr ""
 "Atès que no confieu en l'autoritat de certificació que ha emès aquest "
-"certificat, no confieu en l'autenticitat d'aquest certificat tret que aquí "
-"s'especifiqui el contrari"
+"certificat, no confieu en l'autenticitat d'aquest certificat tret que "
+"aquí s'especifiqui el contrari"
 
 #: ../smime/gui/certificate-manager.c:135
 #: ../smime/gui/certificate-manager.c:382
@@ -21084,8 +20301,8 @@ msgid "Certificate Viewer: %s"
 msgstr "Visualitzador de certificats: %s"
 
 #: ../smime/gui/component.c:46
-#, c-format
-msgid "Enter the password for `%s'"
+#, fuzzy, c-format
+msgid "Enter the password for '%s'"
 msgstr "Introduïu la contrasenya per a «%s»"
 
 #. we're setting the password initially
@@ -21594,11 +20811,6 @@ msgstr ""
 msgid "_Selection"
 msgstr "_Selecció"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "Col·lecció"
-
 #: ../widgets/menus/gal-define-views-dialog.c:332
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
@@ -21620,10 +20832,6 @@ msgstr "Defineix les visualitzacions per a «%s»"
 msgid "Table"
 msgstr "Taula"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Instància"
-
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "Desa la visualització actual"
@@ -21636,11 +20844,6 @@ msgstr "_Crea una visualització nova"
 msgid "_Replace existing view"
 msgstr "_Reemplaça la visualització actual"
 
-# gal/widgets/e-categories-master-list-dialog.c:194
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "Fàbrica"
-
 # gal/menus/gal-define-views.glade.h:2
 #: ../widgets/menus/gal-view-new-dialog.c:98
 msgid "Define New View"
@@ -21670,14 +20873,6 @@ msgstr "Nom del compte"
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "Acció"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "Una GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Propietats del fitxer adjunt"
@@ -21695,11 +20890,11 @@ msgstr "Tipus MIME:"
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggereix visualitzar l'adjunció automàticament"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "No s'ha pogut establir com a fons de pantalla"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "De_fineix-la com a fons"
 
@@ -21841,7 +21036,7 @@ msgid "Ctrl-click to open a link"
 msgstr "Premeu la tecla Ctrl i feu clic al mateix temps per obrir un enllaç"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21849,67 +21044,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Calendari mensual"
 
-# gal/e-table/e-table-field-chooser.glade.h:1
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Color per emplenar"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "Color GDK per emplenar"
-
-# gal/widgets/color-palette.c:595
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Omple puntejant"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Amplada mínima"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Amplada mínima"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Espaiat"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Codificació dels caràcters"
@@ -21922,48 +21056,48 @@ msgstr "Introduïu el joc de caràcters a utilitzar"
 msgid "Other..."
 msgstr "Altres..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Data i hora"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Entrada de text per a la data"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Feu clic a aquest botó per mostrar un calendari"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Quadre combinat per seleccionar l'hora"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "A_ra"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "A_vui"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Cap"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1918
 msgctxt "date"
 msgid "None"
 msgstr "Cap"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1813
 msgid "Invalid Date Value"
 msgstr "El valor de la data no és vàlid"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1857
 msgid "Invalid Time Value"
 msgstr "El valor de l'hora no és vàlid"
 
@@ -22089,42 +21223,6 @@ msgstr ""
 "L'Evolution està fora de línia. Feu clic en aquest botó per treballar en "
 "línia."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "L'estat del botó és en línia"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "Posició horitzontal"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "Posició de la subfinestra quan s'orienti horitzontalment"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "Posició vertical"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "Posició de la subfinestra quan s'orienti verticalment"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "Proporció"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "Proporció de la mida de la segona subfinestra"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "Fixa en canviar de mida"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Manté la segona subfinestra fixa en canviar la mida"
-
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Sincronitza amb:"
@@ -22186,28 +21284,6 @@ msgstr "S'ha arribat al final de la pàgina, es continua des de l'inici"
 msgid "Reached top of page, continued from bottom"
 msgstr "S'ha arribat a l'inici de la pàgina, es continua des del final"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "Fila del cursor"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Columna del cursor"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Tipus d'ordenació"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Mode de selecció"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Mode del cursor"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "_En suprimir:"
@@ -22372,41 +21448,41 @@ msgstr "El fitxer de l'script ha de ser executable."
 msgid "Click here to go to URL"
 msgstr "Feu clic per anar a l'URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:360
 msgid "_Copy Link Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:362
 msgid "Copy the link to the clipboard"
 msgstr "Copia l'enllaç al porta-retalls"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:370
 msgid "_Open Link in Browser"
 msgstr "_Obre l'enllaç en el navegador"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:372
 msgid "Open the link in a web browser"
 msgstr "Obre l'enllaç en el navegador"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:380
 msgid "_Copy Email Address"
 msgstr "Copia l'adr_eça electrònica"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:409 ../widgets/misc/e-web-view.c:1035
 msgid "Select all text and images"
 msgstr "Selecciona tot el text i les imatges"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:800 ../widgets/misc/e-web-view.c:802
+#: ../widgets/misc/e-web-view.c:804
 #, c-format
 msgid "Click to call %s"
 msgstr "Feu clic per trucar en/na %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:806
 msgid "Click to hide/unhide addresses"
 msgstr "Feu clic per mostrar/amagar adreces"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:808
 #, c-format
 msgid "Click to open %s"
 msgstr "Feu clic per obrir %s"
@@ -22452,51 +21528,12 @@ msgstr "L'hora ha d'estar en el format: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del percentatge ha d'estar entre 0 i 100, ambdós inclosos"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Columna seleccionada"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Columna amb el focus"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Columna no seleccionada"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Columna ratllada"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "Columna subratllada"
-
-# gal/e-table/e-table-header-item.c:1473
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Columna en negreta"
-
-# gal/e-table/e-table-header-item.c:1477
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Color de la columna"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Color de fons de la columna"
-
 #: ../widgets/table/e-table-click-to-add.c:586
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
 msgid "click to add"
 msgstr "feu clic per afegir"
 
-# gal/widgets/e-categories-master-list-array.c:80
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Estat"
-
 # gal/e-table/e-table-config.c:300 gal/e-table/e-table-config.c:342
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
@@ -22643,84 +21680,6 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d element)"
 msgstr[1] "%s (%d elements)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Alterna els colors de fila"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Graella de dibuix horitzontal"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Graella de dibuix vertical"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Dibuixa el focus"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Mode del cursor"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Model de selecció"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "Llindar de la longitud"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Alçada de fila uniforme"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "Aturat"
-
 # gal/e-table/e-table-header-item.c:1444
 #: ../widgets/table/e-table-header-item.c:1487
 msgid "Customize Current View"
@@ -22790,59 +21749,6 @@ msgstr "_Ordena per"
 msgid "_Custom"
 msgstr "_Personalitzat"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "Capçalera de la taula"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Model de la taula"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Fila del cursor"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Ordena informació"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Cerca sempre"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Afegeix amb un clic"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "Espaiat vertical de les files"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "Espai vertical entre files. S'afegeix a sobre i a sota d'una fila"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "Adaptador de taula ETree"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Aparença retro"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Dibuixa línies i expansors +/-."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "Mida de l'expansor"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "Mida de la fletxa de l'expansor"
-
 #: ../widgets/table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "emergent"
@@ -22905,125 +21811,880 @@ msgstr "Selecciona-ho tot"
 msgid "Input Methods"
 msgstr "Mètodes d'entrada"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Processador d'esdeveniments"
+#~ msgid "{0}"
+#~ msgstr "{0}"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Text"
+#~ msgid "{1}"
+#~ msgstr "{1}"
 
-# gal/widgets/color-palette.c:591
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Negreta"
+#~ msgid "Editable"
+#~ msgstr "Editable"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Ratllat"
+#~ msgid "Source Book"
+#~ msgstr "Llibreta d'adreces d'origen"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Àncora"
+#~ msgid "Target Book"
+#~ msgstr "Llibreta d'adreces de destinació"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "Justificació"
+#~ msgid "Is New Contact"
+#~ msgstr "És un contacte nou"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Amplada del tall"
+#~ msgid "Writable Fields"
+#~ msgstr "Camps d'escriptura"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Alçada del tall"
+#~ msgid "Required Fields"
+#~ msgstr "Camps necessaris"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Talla"
+#~ msgid "Changed"
+#~ msgstr "Modificat"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Emplena el rectangle de tall"
+#~ msgid "Shell"
+#~ msgstr "Shell"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "Desplaçament en X"
+#~ msgid "The EShell singleton"
+#~ msgstr "El patró singleton de l'EShell"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Desplaçament en Y"
+#~ msgid "Book"
+#~ msgstr "Llibreta"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Amplada de text"
+#~ msgid "Is New List"
+#~ msgstr "És una llista nova"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Alçada del text"
+#~ msgid "Query"
+#~ msgstr "Consulta"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Utilitza els punts suspensius"
+#~ msgid "Model"
+#~ msgstr "Model"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Punts suspensius"
+#~ msgid "Shell View"
+#~ msgstr "Visualització del Shell"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Ajustament de línia"
+#~ msgid "Source"
+#~ msgstr "Font"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Caràcters de trencament"
+#~ msgid "Width"
+#~ msgstr "Amplada"
+
+#~ msgid "Height"
+#~ msgstr "Alçada"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "Màxim de línies"
+#~ msgid "Has Focus"
+#~ msgstr "Té el focus"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Dibuixa les cantonades"
+#~ msgid "Field"
+#~ msgstr "Camp"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Permet les línies noves"
+#~ msgid "Field Name"
+#~ msgstr "Nom del camp"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Dibuixa el fons"
+#~ msgid "Text Model"
+#~ msgstr "Model del text"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Dibuixa el botó"
+#~ msgid "Max field name length"
+#~ msgstr "Longitud màxima del nom del camp"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "Posició del cursor"
+#~ msgid "Column Width"
+#~ msgstr "Amplada de la columna"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "Context de MI"
+#~ msgid "Adapter"
+#~ msgstr "Adaptador"
 
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "Menú emergent de l'ansa"
+#~ msgid "Selected"
+#~ msgstr "Seleccionada"
 
-#, fuzzy
-#~ msgid "Show deleted messages with a line through them"
+#~ msgid "Has Cursor"
+#~ msgstr "Té el cursor"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Default Client"
+#~ msgstr "Client predeterminat"
+
+#~ msgid "New Tab"
+#~ msgstr "Pestanya nova"
+
+#~ msgid "Name of the logger"
+#~ msgstr "Nom de l'enregistrador"
+
+#~ msgid "Filename"
+#~ msgstr "Nom de fitxer"
+
+#~ msgid "The filename of the module"
+#~ msgstr "El nom del fitxer del mòdul"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "Si el connector està habilitat"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "Seguidor de focus"
+
+#~ msgid "Shell Module"
+#~ msgstr "Mòdul del Shell"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "El rerefons del Shell del correu"
+
+#~ msgid "Show Deleted"
+#~ msgstr "Mostra els suprimits"
+
+#~ msgid "To Do"
+#~ msgstr "Per fer"
+
+#~ msgid "Later"
+#~ msgstr "Més tard"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "No es pot crear la carpeta nova «%s»: %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "No es pot copiar la carpeta «%s» a «%s»: %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "No es poden cercar bústies de correu existents a «%s»: %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
 #~ msgstr ""
-#~ "Mostra els missatges suprimits a la llista de missatges (amb una ratlla a "
-#~ "sobre)."
+#~ "La ubicació i la jerarquia de les carpetes de les bústies de correu ha "
+#~ "canviat des de l'Evolution 1.x.\n"
+#~ "\n"
+#~ "Espereu mentre l'Evolution migra les vostres carpetes..."
 
-#, fuzzy
-#~ msgid "Continue Anyway"
-#~ msgstr "Continua"
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "No s'han pogut obrir les dades velles «%s» POP3 keep-on-server: %s"
 
-#, fuzzy
-#~ msgid "Quit Now"
-#~ msgstr "Surt"
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr ""
+#~ "No s'ha pogut crear el directori de dades «%s» POP3 keep-on-server: %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "No s'han pogut copiar les dades «%s» POP3 keep-on-server: %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "No s'ha pogut crear el magatzem de correu local «%s»: %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "No s'ha pogut llegir la configuració de la instal·lació anterior de "
+#~ "l'Evolution. El fitxer «evolution/config.xmldb» no existeix o està malmès."
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Les carpetes de cerca següents:\n"
+#~ "{0}\n"
+#~ "feien servir la carpeta suprimida:\n"
+#~ "    «{1}»\n"
+#~ "i s'han actualitzat."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Les regles de filtre següents:\n"
+#~ "{0}\n"
+#~ "feien servir la carpeta suprimida:\n"
+#~ "    «{1}»\n"
+#~ "i s'han actualitzat."
+
+#~ msgid "Shell Backend"
+#~ msgstr "Rerefons del Shell"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "Aquesta carpeta només conté missatges ocults. Utilitzeu l'entrada de menú "
+#~ "«Visualitza->Mostra els missatges amagats» per mostrar-los."
+
+#~ msgid "Table column:"
+#~ msgstr "Columna de la taula:"
+
+#~ msgid "Source List"
+#~ msgstr "Llista d'origen"
+
+#~ msgid "The registry of address books"
+#~ msgstr "El registre de llibretes d'adreces"
+
+#~ msgid "Current View"
+#~ msgstr "Visualització actual"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "La visualització de llibreta d'adreces seleccionada"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "Contacte que es previsualitza"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "El contacte que es mostra la subfinestra de previsualització"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "La previsualització és visible"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "Si s'ha de mostrar la subfinestra de previsualització"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "Servidors d'LDAP"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "Paràmetres de la compleció automàtica"
+
+#~ 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 ""
+#~ "S'ha modificat la ubicació i jerarquia de les carpetes de contactes de "
+#~ "l'Evolution des de la versió 1.x.\n"
+#~ "\n"
+#~ "Espereu mentre l'Evolution migra les carpetes..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Ha canviat el format dels contactes de les llistes de correu.\n"
+#~ "\n"
+#~ "Espereu mentre l'Evolution migra les carpetes..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Ha canviat la manera com l'Evolution emmagatzema els números de telèfon.\n"
+#~ "\n"
+#~ "Espereu mentre l'Evolution migra les carpetes..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Ha canviat el registre de canvis del Palm Sync de l'Evolution i els "
+#~ "fitxers de mapes.\n"
+#~ "\n"
+#~ "Espereu mentre l'Evolution migra les vostres dades del Pilot Sync..."
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "Giny de selecció de font"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "Aquest giny mostra grups de llibretes d'adreces"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "El registre de calendaris"
+
+#~ 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 ""
+#~ "Des de l'Evolution 1.x s'ha modificat la ubicació i la jerarquia de les "
+#~ "carpetes del calendari de l'Evolution.\n"
+#~ "\n"
+#~ "Espereu mentre l'Evolution migra les carpetes..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr ""
+#~ "No s'ha pogut actualitzar la configuració anterior des de l'evolution/"
+#~ "config.xmldb"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "No s'ha pogut actualitzar el calendari «%s»"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "Giny de navegació de dates"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "Aquest giny mostra un calendari en miniatura"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "Client de calendari predeterminat"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "Client predeterminat per a les operacions de calendari"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "Aquest giny mostra grups de calendaris"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "El registre de llistes d'anotacions"
+
+#~ msgid "The memo table model"
+#~ msgstr "El model de la taula d'anotacions"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "Client d'anotacions predeterminat"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "El client predeterminat per a les operacions d'anotacions"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "Aquest giny mostra un grup de llistes d'anotacions"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "El registre de llistes de tasques"
+
+#~ msgid "The task table model"
+#~ msgstr "Model de la taula de tasques"
+
+#~ 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 ""
+#~ "Des de l'Evolution 1.x s'ha modificat la ubicació i la jerarquia de les "
+#~ "carpetes de les tasques de l'Evolution.\n"
+#~ "\n"
+#~ "Espereu mentre l'Evolution migra les carpetes..."
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "No s'han pogut actualitzar les tasques «%s»"
+
+#~ msgid "Default Task Client"
+#~ msgstr "Client de tasques predeterminat"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "Client predeterminat per les tasques d'operacions"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "Aquest giny mostra grups de llistes de tasques"
+
+#~ msgid "Group by Threads"
+#~ msgstr "Agrupa per fils"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "Si s'han d'agrupar els missatges per fils"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Amaga els missatges _llegits"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "Amaga temporalment tots els missatges que ja s'hagin llegit"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Amaga _els missatges seleccionats"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "Amaga temporalment els missatges seleccionats"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "Mostra els missatges ama_gats"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "Mostra els missatges que s'han amagat temporalment"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Amaga els missatges _suprimits"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr ""
+#~ "Oculta els missatges suprimits en comptes de mostrar-los amb una línia a "
+#~ "sobre"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "Estil de la barra d'eines"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "L'estil de la barra d'eines del commutador"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "La barra d'eines és visible"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "Si s'ha de veure el commutador"
+
+#~ msgid "Switcher Action"
+#~ msgstr "Acció del commutador"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "L'acció del commutador per a aquesta visualització del Shell"
+
+#~ msgid "Page Number"
+#~ msgstr "Número de pàgina"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "El número de pàgina de llibreta de la visualització del Shell"
+
+#~ msgid "Search Rule"
+#~ msgstr "Regla de cerca"
+
+#~ msgid "Criteria for the current search results"
+#~ msgstr "Criteris dels resultats de la cerca actual"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "L'EShellBackend per a aquesta visualització del Shell"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "Giny de contingut del Shell"
+
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr ""
+#~ "El giny de contingut apareix a la subfinestra dreta d'una finestra del "
+#~ "Shell"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Giny de la barra lateral del Shell"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr ""
+#~ "El giny de barra lateral apareix a la subfinestra esquerra d'una finestra "
+#~ "del Shell"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "Giny de la barra de tasques del Shell"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr ""
+#~ "El giny de la barra de tasques es mostra a la part de sota d'una finestra "
+#~ "del Shell"
+
+#~ msgid "Shell Window"
+#~ msgstr "Finestra del Shell"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "La finestra a la qual la visualització del Shell pertany"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "El fitxer de clau que conté les dades d'estat dels ginys"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "El títol de la visualització del Shell"
+
+#~ msgid "Current View ID"
+#~ msgstr "Identificador de la visualització actual"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr ""
+#~ "L'identificador de visualització de la llibreta d'adreces global actual"
+
+#~ msgid "Active Shell View"
+#~ msgstr "Visualització activa del Shell"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "Nom de la visualització del Shell activa"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "L'EFocusTracker de la finestra del Shell"
+
+#~ msgid "Geometry"
+#~ msgstr "Geometria"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "Cadena de la geometria de finestra inicial"
+
+#~ msgid "Safe Mode"
+#~ msgstr "Mode segur"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "Si la finestra del Shell està en mode segur o no"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "La barra lateral és visible"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "Si la barra lateral de la finestra del Shell és visible"
+
+#~ msgid "Switcher Visible"
+#~ msgstr "El commutador és visible"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "Si els botons de commutació de les finestres del Shell són visibles"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "La barra de tasques és visible"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "Si la barra de tasques de la finestra és visible"
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "Si la barra d'eines de la finestra del Shell és visible"
+
+#~ msgid "UI Manager"
+#~ msgstr "Gestor de la interfície d'usuari"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "El GtkUIManager de la finestra del Shell"
+
+#~ msgid "Module Directory"
+#~ msgstr "Directori dels mòduls"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "El directori d'on carregar els EModules"
+
+#~ msgid "Network Available"
+#~ msgstr "La xarxa està disponible"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "Si la xarxa està disponible"
+
+#~ msgid "Online"
+#~ msgstr "En línia"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "Si el Shell està en línia"
+
+#~ msgid "Shell Settings"
+#~ msgstr "Paràmetres del Shell"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "Paràmetres de l'aplicació"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "Força tornar a migrar des de l'Evolution 1.4"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "Espai insuficient de disc per a l'actualització."
+
+#~ msgid "Really delete old data?"
+#~ msgstr "Realment voleu suprimir les dades antigues?"
+
+#~ 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 ""
+#~ "Se suprimiran permanentment els continguts del directori &quot;"
+#~ "evolution&quot;.\n"
+#~ "\n"
+#~ "És recomanable que verifiqueu manualment que es conserven totes les "
+#~ "vostres adreces de correu, contactes i calendaris, i que aquesta versió "
+#~ "de l'Evolution funciona correctament abans de suprimir aquestes dades "
+#~ "antigues.\n"
+#~ "\n"
+#~ "Una vegada que s'hagin suprimit, haureu d'efectuar modificacions "
+#~ "manualment si és que voleu tornar a instal·lar una versió antiga.\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "La versió anterior de l'Evolution emmagatzemava les seves dades en una "
+#~ "ubicació diferent.\n"
+#~ "\n"
+#~ "Si escolliu suprimir aquestes dades, tots els continguts del directori "
+#~ "&quot;evolution&quot; se suprimiran permanentment. Si voleu conservar "
+#~ "aquestes dades, podeu suprimir el contingut de la carpeta «evolution» quan "
+#~ "vulgueu.\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "Per actualitzar les vostres dades i la configuració necessitareu fins a "
+#~ "{0} d'espai de disc, però només en teniu {1} de disponible.\n"
+#~ "\n"
+#~ "Necessitareu més espai lliure en la carpeta d'inici abans de poder "
+#~ "continuar."
+
+#~ msgid "_Keep Data"
+#~ msgstr "_Conserva les dades"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "_Recorda-m'ho després"
+
+#~ msgid "Collection"
+#~ msgstr "Col·lecció"
+
+#~ msgid "Instance"
+#~ msgstr "Instància"
+
+# gal/widgets/e-categories-master-list-dialog.c:194
+#~ msgid "Factory"
+#~ msgstr "Fàbrica"
+
+#~ msgid "Action"
+#~ msgstr "Acció"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "Una GtkRadioAction"
+
+# gal/e-table/e-table-field-chooser.glade.h:1
+#~ msgid "Fill color"
+#~ msgstr "Color per emplenar"
+
+#~ msgid "GDK fill color"
+#~ msgstr "Color GDK per emplenar"
+
+# gal/widgets/color-palette.c:595
+#~ msgid "Fill stipple"
+#~ msgstr "Omple puntejant"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "Amplada mínima"
+
+#~ msgid "Minimum Width"
+#~ msgstr "Amplada mínima"
+
+#~ msgid "Spacing"
+#~ msgstr "Espaiat"
+
+#~ msgid "The button state is online"
+#~ msgstr "L'estat del botó és en línia"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "Posició horitzontal"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "Posició de la subfinestra quan s'orienti horitzontalment"
+
+#~ msgid "Vertical Position"
+#~ msgstr "Posició vertical"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "Posició de la subfinestra quan s'orienti verticalment"
+
+#~ msgid "Proportion"
+#~ msgstr "Proporció"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "Proporció de la mida de la segona subfinestra"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "Fixa en canviar de mida"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "Manté la segona subfinestra fixa en canviar la mida"
+
+#~ msgid "Cursor Row"
+#~ msgstr "Fila del cursor"
+
+#~ msgid "Cursor Column"
+#~ msgstr "Columna del cursor"
+
+#~ msgid "Sorter"
+#~ msgstr "Tipus d'ordenació"
+
+#~ msgid "Selection Mode"
+#~ msgstr "Mode de selecció"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "Mode del cursor"
+
+#~ msgid "Selected Column"
+#~ msgstr "Columna seleccionada"
+
+#~ msgid "Focused Column"
+#~ msgstr "Columna amb el focus"
+
+#~ msgid "Unselected Column"
+#~ msgstr "Columna no seleccionada"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "Columna ratllada"
+
+#~ msgid "Underline Column"
+#~ msgstr "Columna subratllada"
+
+# gal/e-table/e-table-header-item.c:1473
+#~ msgid "Bold Column"
+#~ msgstr "Columna en negreta"
+
+# gal/e-table/e-table-header-item.c:1477
+#~ msgid "Color Column"
+#~ msgstr "Color de la columna"
+
+#~ msgid "BG Color Column"
+#~ msgstr "Color de fons de la columna"
+
+# gal/widgets/e-categories-master-list-array.c:80
+#~ msgid "State"
+#~ msgstr "Estat"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "Alterna els colors de fila"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "Graella de dibuix horitzontal"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "Graella de dibuix vertical"
+
+#~ msgid "Draw focus"
+#~ msgstr "Dibuixa el focus"
+
+#~ msgid "Cursor mode"
+#~ msgstr "Mode del cursor"
+
+#~ msgid "Selection model"
+#~ msgstr "Model de selecció"
+
+#~ msgid "Length Threshold"
+#~ msgstr "Llindar de la longitud"
+
+#~ msgid "Uniform row height"
+#~ msgstr "Alçada de fila uniforme"
+
+#~ msgid "Frozen"
+#~ msgstr "Aturat"
+
+#~ msgid "Table header"
+#~ msgstr "Capçalera de la taula"
+
+#~ msgid "Table model"
+#~ msgstr "Model de la taula"
+
+#~ msgid "Cursor row"
+#~ msgstr "Fila del cursor"
+
+#~ msgid "Sort Info"
+#~ msgstr "Ordena informació"
+
+#~ msgid "Always search"
+#~ msgstr "Cerca sempre"
+
+#~ msgid "Use click to add"
+#~ msgstr "Afegeix amb un clic"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "Espaiat vertical de les files"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr "Espai vertical entre files. S'afegeix a sobre i a sota d'una fila"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "Adaptador de taula ETree"
+
+#~ msgid "Retro Look"
+#~ msgstr "Aparença retro"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "Dibuixa línies i expansors +/-."
+
+#~ msgid "Expander Size"
+#~ msgstr "Mida de l'expansor"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Mida de la fletxa de l'expansor"
+
+#~ msgid "Event Processor"
+#~ msgstr "Processador d'esdeveniments"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+# gal/widgets/color-palette.c:591
+#~ msgid "Bold"
+#~ msgstr "Negreta"
+
+#~ msgid "Strikeout"
+#~ msgstr "Ratllat"
+
+#~ msgid "Anchor"
+#~ msgstr "Àncora"
+
+#~ msgid "Justification"
+#~ msgstr "Justificació"
+
+#~ msgid "Clip Width"
+#~ msgstr "Amplada del tall"
+
+#~ msgid "Clip Height"
+#~ msgstr "Alçada del tall"
+
+#~ msgid "Clip"
+#~ msgstr "Talla"
+
+#~ msgid "Fill clip rectangle"
+#~ msgstr "Emplena el rectangle de tall"
+
+#~ msgid "X Offset"
+#~ msgstr "Desplaçament en X"
+
+#~ msgid "Y Offset"
+#~ msgstr "Desplaçament en Y"
+
+#~ msgid "Text width"
+#~ msgstr "Amplada de text"
+
+#~ msgid "Text height"
+#~ msgstr "Alçada del text"
+
+#~ msgid "Use ellipsis"
+#~ msgstr "Utilitza els punts suspensius"
+
+#~ msgid "Ellipsis"
+#~ msgstr "Punts suspensius"
+
+#~ msgid "Line wrap"
+#~ msgstr "Ajustament de línia"
+
+#~ msgid "Break characters"
+#~ msgstr "Caràcters de trencament"
+
+#~ msgid "Max lines"
+#~ msgstr "Màxim de línies"
+
+#~ msgid "Draw borders"
+#~ msgstr "Dibuixa les cantonades"
+
+#~ msgid "Allow newlines"
+#~ msgstr "Permet les línies noves"
+
+#~ msgid "Draw background"
+#~ msgstr "Dibuixa el fons"
+
+#~ msgid "Draw button"
+#~ msgstr "Dibuixa el botó"
+
+#~ msgid "Cursor position"
+#~ msgstr "Posició del cursor"
+
+#~ msgid "IM Context"
+#~ msgstr "Context de MI"
+
+#~ msgid "Handle Popup"
+#~ msgstr "Menú emergent de l'ansa"
 
 #~ msgid "Loading appointments at %s"
 #~ msgstr "S'estan carregant les cites a %s"
diff --git a/po/da.po b/po/da.po
index 0e53b6bd5c..6d450553af 100644
--- a/po/da.po
+++ b/po/da.po
@@ -65,7 +65,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-27 22:24+0100\n"
+"POT-Creation-Date: 2010-03-27 22:23+0100\n"
 "PO-Revision-Date: 2010-03-27 22:22+0100\n"
 "Last-Translator: Kenneth Nielsen <k.nielsen81@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -315,7 +315,7 @@ msgstr "Kunne ikke læse pilotens adresseapplikationsblok"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2000
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
@@ -326,7 +326,7 @@ msgstr "Bryllupsdag"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
+#: ../calendar/gui/e-calendar-view.c:1999 ../capplet/anjal-settings-main.c:119
 #: ../shell/main.c:112
 msgid "Birthday"
 msgstr "Fødselsdag"
@@ -351,7 +351,7 @@ msgstr "Kontaktperson"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2553
 msgid "Contact Editor"
 msgstr "Redigering af kontaktperson"
 
@@ -420,7 +420,7 @@ msgstr "Noter"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1708
 msgid "Other"
 msgstr "Anden"
 
@@ -658,20 +658,20 @@ msgid "Changed"
 msgstr "Ændret"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2548
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Redigering af kontaktperson - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2945
 msgid "Please select an image for this contact"
 msgstr "Vælg venligst et billede til denne kontaktperson"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2946
 msgid "_No image"
 msgstr "_Intet billede"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3219
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -679,23 +679,23 @@ msgstr ""
 "Data om kontaktperson er ugyldige:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3223
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "\"%s\" er i et ugyldigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3230
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s\"%s\" er i et ugyldigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3256
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s\"%s\" har intet indhold"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3270
 msgid "Invalid contact."
 msgstr "Ugyldig kontaktperson."
 
@@ -720,12 +720,12 @@ msgid "_Select Address Book"
 msgstr "_Vælg adressebog"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
+#: ../shell/e-shell-window.c:700
 msgid "Shell"
 msgstr "Skal"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
+#: ../shell/e-shell-window.c:701
 msgid "The EShell singleton"
 msgstr "EShell-singletonen"
 
@@ -904,7 +904,7 @@ msgstr "Flet kontaktperson"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
 #: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Any field contains"
@@ -1193,7 +1193,7 @@ msgid "Telex"
 msgstr "Telex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
+#: ../shell/e-shell-view.c:923
 msgid "Title"
 msgstr "Titel"
 
@@ -1382,17 +1382,17 @@ msgid "Copy _Email Address"
 msgstr "Kopiér e-post_adresse"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:382
 msgid "Copy the email address to the clipboard"
 msgstr "Kopiér e-post-adressen til udklipsholderen"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:387
 msgid "_Send New Message To..."
 msgstr "_Send nyt brev til..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:389
 msgid "Send a mail message to this address"
 msgstr "Send et e-brev til denne adresse"
 
@@ -1431,7 +1431,7 @@ msgstr "Video-samtale"
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
+#: ../modules/calendar/e-cal-shell-view.c:495
 #: ../plugins/groupwise-features/camel-gw-listener.c:420
 #: ../plugins/groupwise-features/camel-gw-listener.c:445
 #: ../plugins/groupwise-features/camel-gw-listener.c:560
@@ -1503,7 +1503,7 @@ msgid "Blog"
 msgstr "Blog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../widgets/misc/e-web-view.c:798
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klik for at skrive til %s"
@@ -1561,8 +1561,8 @@ msgstr "Protokollen er ikke tilgængelig"
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
 #: ../calendar/gui/print.c:2651
 msgid "Canceled"
@@ -3168,7 +3168,7 @@ msgid "Classification"
 msgstr "Klassificering"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3212,13 +3212,13 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
 #: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Offentlig"
@@ -3526,178 +3526,190 @@ msgstr "Ingen"
 msgid "Pick a color"
 msgstr "Vælg en farve"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "_Søn"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 #: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "_Rul månedsvisningen med en uge ad gangen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "An_den zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Vælg kalendere hvor påmindelser ved alarm skal aktiveres"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "_Vis en påmindelse"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "Vis en på_mindelse"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uge_numre i datonavigeringen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Vis ugen_umre i dags- og arbejdsugevisningen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Søndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "_Dagens opgaver:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "T_or"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Opgaveliste"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "Skabelon:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Tid"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
 msgstr "Tids_zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Brug s_ystemtidszonen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "_Ugen starter:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Work Week"
 msgstr "Arbejdsuge"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "Arbejdsdage:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "Spørg efter bekræftelse ved sletning _af tilførsler"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Komprimér weekender i månedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "_Dagen begynder:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "_Fre"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul udførte opgaver efter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "_Man"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "_Opgaver der skulle have været udført:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "L_ør"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "_Vis sluttiderne for aftaler i uge- og måneds-oversigterne"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "_Tidsinddelinger:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "T_irs"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "_Ons"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "før hver jubilæum/fødselsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "før hver aftale"
 
@@ -3887,14 +3899,14 @@ msgstr "Klik her for at lukke det aktive vindue"
 #: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
 #: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:399 ../widgets/misc/e-web-view.c:1023
 msgid "Copy the selection"
 msgstr "Kopier det valgte"
 
 #: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
 #: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1017
 msgid "Cut the selection"
 msgstr "Klip det markerede ud"
 
@@ -3911,7 +3923,7 @@ msgstr "Klik her for at læse den tilgængelige hjælpedokumentation"
 #: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
 #: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1029
 msgid "Paste the clipboard"
 msgstr "Indsæt fra udklipsholderen"
 
@@ -4209,7 +4221,7 @@ msgstr ""
 "Begivenheden kan ikke redigeres fuldt ud, fordi du ikke er organisatoren"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2720
 msgid "This event has alarms"
 msgstr "Denne begivenhed har påmindelser"
 
@@ -4270,7 +4282,7 @@ msgstr "En organisator er påkrævet."
 msgid "At least one attendee is required."
 msgstr "Mindst en deltager er nødvendig."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2593
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan ikke åbne kalenderen \"%s\"."
@@ -4281,40 +4293,40 @@ msgstr "Kan ikke åbne kalenderen \"%s\"."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2637
+#: ../calendar/gui/dialogs/memo-page.c:913
+#: ../calendar/gui/dialogs/task-page.c:1741
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du udfører en handlig på vegne af %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2939
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag før aftalen"
 msgstr[1] "%d dage før aftalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2945
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time før aftalen"
 msgstr[1] "%d timer før aftalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2951
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut før aftale"
 msgstr[1] "%d minutter før aftale"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2964
 msgid "Customize"
 msgstr "Tilpas"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2966
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ingen"
@@ -4398,14 +4410,14 @@ msgstr "Memo kan ikke redigeres, fordi den valgte memoliste er skrivebeskyttet"
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Memo kan ikke redigeres fuldt ud, fordi du ikke er organisatoren"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:874
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke åbne memoer i \"%s\"."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
+#: ../calendar/gui/dialogs/memo-page.c:1041 ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2253
+#: ../mail/em-format-html.c:2313 ../mail/em-format-html.c:2355
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Til"
@@ -4576,27 +4588,27 @@ msgstr "dag"
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "forekomster"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2111
 msgid "Add exception"
 msgstr "Tilføj undtagelse"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Could not get a selection to modify."
 msgstr "Der er ikke markeret noget til redigering."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Modify exception"
 msgstr "Undtagelse fra redigering"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2202
 msgid "Could not get a selection to delete."
 msgstr "Der er ikke markeret noget til sletning."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2329
 msgid "Date/Time"
 msgstr "Dato/Tid"
 
@@ -4645,17 +4657,17 @@ msgstr "PÃ¥mind _kun nye deltagere"
 msgid "Completed date is wrong"
 msgstr "Fuldførelsesdato er forkert"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:484
 msgid "Web Page"
 msgstr "Webside"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
 #: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
 #: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
@@ -4673,9 +4685,9 @@ msgstr "Høj"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
 #: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
 #: ../calendar/gui/print.c:2645
 msgid "In Progress"
@@ -4692,7 +4704,7 @@ msgstr "Lav"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:509
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
@@ -4701,8 +4713,8 @@ msgstr "Normal"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
 #: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
 #: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
@@ -4720,7 +4732,7 @@ msgstr "_Status:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1756
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4761,11 +4773,11 @@ msgstr "Klik for at ændre eller vise statusdetaljer om opgaven"
 msgid "_Send Options"
 msgstr "_Afsendelsesindstillinger"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "_Task"
 msgstr "_Opgave"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "Opgavedetaljer"
 
@@ -4787,7 +4799,7 @@ msgstr "Organi_sator:"
 msgid "Due date is wrong"
 msgstr "Forfaldsdatoen er forkert"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1698
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åbne opgaver i \"%s\"."
@@ -4955,11 +4967,11 @@ msgid "Free"
 msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:548 ../calendar/gui/e-task-table.c:561
 msgid "Busy"
 msgstr "Optaget"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4970,47 +4982,37 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nej"
 
-#: ../calendar/gui/e-cal-model.c:377
+#: ../calendar/gui/e-cal-model.c:325
 msgid "Default Client"
 msgstr "Forvalgt klient"
 
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Skalindstillinger"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Indstillinger for hele programmet"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
 #: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
 #: ../plugins/itip-formatter/itip-formatter.c:461
 #: ../plugins/itip-formatter/itip-formatter.c:2338
@@ -5018,15 +5020,15 @@ msgstr "Indstillinger for hele programmet"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Tilbagevendende"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "Ã…bner %s"
@@ -5070,69 +5072,69 @@ msgstr "Startdato"
 msgid "Type"
 msgstr "Type"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:404
 msgid "Cut selected events to the clipboard"
 msgstr "Klip markerede begivenheder til udklipsholderen"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:410
 msgid "Copy selected events to the clipboard"
 msgstr "Kopier markerede begivenheder til udklipsholderen"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:416
 msgid "Paste events from the clipboard"
 msgstr "Indsæt begivenheder fra udklipsholderen"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Delete selected events"
 msgstr "Slet valgte begivenheder"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:842
 #: ../calendar/gui/e-task-table.c:1063
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1703
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../plugins/itip-formatter/itip-formatter.c:2326
 msgid "Accepted"
 msgstr "Accepteret"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1704
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../plugins/itip-formatter/itip-formatter.c:2332
 msgid "Declined"
 msgstr "Afslået"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1705
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Tentative"
 msgstr "Forsøgsvis"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1706
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 #: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Delegated"
 msgstr "Uddelegeret"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1707
 msgid "Needs action"
 msgstr "Kræver handling"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-calendar-view.c:1848 ../calendar/gui/e-memo-table.c:527
 #: ../calendar/gui/e-task-table.c:738
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -5140,20 +5142,20 @@ msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:532
 #: ../calendar/gui/e-task-table.c:741
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1868 ../calendar/gui/print.c:2600
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1899
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tid: %s %s"
@@ -5196,7 +5198,7 @@ msgstr "Vis den sekundære tidszone"
 #. 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:864 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1843
 #: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -5207,10 +5209,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1860
 #: ../calendar/gui/e-week-view-main-item.c:231
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:907
 msgid "%a %d %b"
 msgstr "%a %d. %b"
 
@@ -5219,27 +5221,27 @@ msgstr "%a %d. %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
+#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1876
 #: ../calendar/gui/e-week-view-main-item.c:245
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:943
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1074 ../calendar/gui/e-week-view.c:742
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:745
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2573
 #, c-format
 msgid "Week %d"
 msgstr "Uge %d"
@@ -5685,56 +5687,56 @@ msgid "Resources"
 msgstr "Ressourcer"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individuel"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Rum"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Formand"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Obligatorisk deltager"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Valgfri deltager"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Ikke-deltager"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "Behøver handling"
 
@@ -5743,14 +5745,14 @@ msgstr "Behøver handling"
 msgid "Attendee                          "
 msgstr "Deltager                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "I gang"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2305
 msgid "%A, %B %d, %Y"
 msgstr "%A den %d %B, %Y"
 
@@ -5759,7 +5761,7 @@ msgstr "%A den %d %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2336
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m-%Y"
 
@@ -5769,67 +5771,67 @@ msgstr "%a %d/%m-%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m-%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Out of Office"
 msgstr "Ude"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "No Information"
 msgstr "Ingen information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:565
 msgid "A_ttendees..."
 msgstr "D_eltagere..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:586
 msgid "O_ptions"
 msgstr "_Valgmuligheder"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "Vis _kun arbejdstid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ud"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "_Update free/busy"
 msgstr "_Opdatér ledig/optaget"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:661
 msgid "_Autopick"
 msgstr "_Autovælg"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:676
 msgid ">_>"
 msgstr "_>>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:693
 msgid "_All people and resources"
 msgstr "_Alle mennesker og ressourcer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "All _people and one resource"
 msgstr "Alle _personer og en enkelt ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "_Required people"
 msgstr "_Obligatoriske personer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:719
 msgid "Required people and _one resource"
 msgstr "Obligatoriske personer og _en enkelt ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "_Starttidspunkt:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "S_luttidspunkt:"
 
@@ -5858,7 +5860,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../modules/calendar/e-cal-shell-content.c:402
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5950,7 +5952,7 @@ msgstr "100%"
 #: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../modules/calendar/e-cal-shell-content.c:362
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
@@ -6091,16 +6093,16 @@ msgid "Gnome Calendar"
 msgstr "Gnome-kalenderen"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:903
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
 #: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:919
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
@@ -6108,10 +6110,10 @@ msgstr "%a, %d. %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:936
+#: ../modules/calendar/e-cal-shell-view-private.c:947
+#: ../modules/calendar/e-cal-shell-view-private.c:954
+#: ../modules/calendar/e-cal-shell-view-private.c:957
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -6141,7 +6143,7 @@ msgstr "kalenderoversigt for en måned"
 msgid "calendar view for one or more weeks"
 msgstr "kalenderoversigt for en eller flere uger"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2111
 msgid "Purging"
 msgstr "Opryder"
 
@@ -8763,6 +8765,7 @@ msgid "Email Settings"
 msgstr "Indstillinger for e-post"
 
 #: ../capplet/settings/mail-capplet-shell.c:334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "Quit"
 msgstr "Afslut"
 
@@ -8949,39 +8952,39 @@ msgid "Visual"
 msgstr "Visuel"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
 #: ../plugins/itip-formatter/itip-view.c:195
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "I dag"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "I morgen"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "I går"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:210
 #, c-format
 msgid "%d days from now"
 msgstr "%d dage fra nu"
 
 # FEJLRAPPORT: http://bugzilla.gnome.org/show_bug.cgi?id=591939
-#: ../e-util/e-datetime-format.c:209
+#: ../e-util/e-datetime-format.c:212
 #, c-format
 msgid "%d days ago"
 msgstr "%d dage siden"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
+#: ../e-util/e-datetime-format.c:305
 msgid "Use locale default"
 msgstr "Benyt lokaliseringsforvalg"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:499
 msgid "Format:"
 msgstr "Format:"
 
@@ -9006,11 +9009,11 @@ msgstr "Skriver \"%s\" til %s"
 msgid "Name of the logger"
 msgstr "Loggerens navn"
 
-#: ../e-util/e-module.c:188
+#: ../e-util/e-module.c:194
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../e-util/e-module.c:189
+#: ../e-util/e-module.c:195
 msgid "The filename of the module"
 msgstr "Modulets filnavn"
 
@@ -9124,11 +9127,11 @@ msgstr "Filen findes \"{0}\"."
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:171
 msgid "Could not open the link."
 msgstr "Kunne ikke åbne link."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:221
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjælp for Evolution."
 
@@ -9147,14 +9150,14 @@ msgid "Reply-To"
 msgstr "Svar-til"
 
 #: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../mail/em-format-html.c:2254 ../mail/em-format-html.c:2325
+#: ../mail/em-format-html.c:2362 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Cc"
 
 #: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../mail/em-format-html.c:2255 ../mail/em-format-html.c:2336
+#: ../mail/em-format-html.c:2369 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "Bcc"
 
@@ -9166,7 +9169,7 @@ msgid "Subject"
 msgstr "Emne"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2467
 #: ../modules/mail/em-mailer-prefs.c:1130
 msgid "Mailer"
 msgstr "E-postprogram"
@@ -9176,8 +9179,8 @@ msgid "-------- Forwarded Message --------"
 msgstr "-------- Videresendt brev --------"
 
 #: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Dato"
 
@@ -9236,119 +9239,119 @@ msgstr "Kunne ikke fortolke PGP-meddelelse"
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Kunne ikke fortolke PGP-meddelelse: Ukendt fejl"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekund ude i fremtiden"
 msgstr[1] "%d sekunder ude i fremtiden"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minut siden"
 msgstr[1] "%d minutter siden"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 minut ude i fremtiden"
 msgstr[1] "%d minutter ude i fremtiden"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 time siden"
 msgstr[1] "%d timer siden"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 time ude i fremtiden"
 msgstr[1] "%d timer ude i fremtiden"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dag siden"
 msgstr[1] "%d dage siden"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 dag ude i fremtiden"
 msgstr[1] "%d dage ude i fremtiden"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 uge siden"
 msgstr[1] "%d uger siden"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 uge ude i fremtiden"
 msgstr[1] "%d uger ude i fremtiden"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 måned ude i fremtiden"
 msgstr[1] "%d måneder ude i fremtiden"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 år siden"
 msgstr[1] "%d år siden"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 år ude i fremtiden"
 msgstr[1] "%d år ude i fremtiden"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<klik her for at vælge en dato>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "nu"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d %b %Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Vælg en tid at sammenligne med"
 
@@ -9550,7 +9553,7 @@ msgstr "Ikonvisning"
 msgid "List View"
 msgstr "Listevisning"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
+#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:653
 msgid "Focus Tracker"
 msgstr "Fokussporing"
 
@@ -10115,7 +10118,7 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdirigér (bounce) det markerede brev til en eller anden"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "Svar til _alle"
@@ -10293,11 +10296,11 @@ msgstr "Hele brev_hovedet"
 msgid "Show messages with all email headers"
 msgstr "Vis breve med det fulde brevhoved"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1878
 msgid "Unable to retrieve message"
 msgstr "Kan ikke hente brevet"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1943
 #: ../mail/mail-ops.c:1849
 #, c-format
 msgid "Retrieving message '%s'"
@@ -10305,7 +10308,7 @@ msgstr "Henter brev \"%s\""
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2457
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:534
 #: ../plugins/google-account-setup/google-source.c:656
@@ -10313,33 +10316,33 @@ msgstr "Henter brev \"%s\""
 msgid "Default"
 msgstr "Standard"
 
-#: ../mail/e-mail-reader.c:2588
+#: ../mail/e-mail-reader.c:2578
 #: ../modules/mail/e-mail-attachment-handler.c:134
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2579
 msgid "Forward the selected message to someone"
 msgstr "Videresend det valgte brev til en eller anden"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2623 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Slet"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Næste"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2635 ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "Svar"
 
@@ -10952,7 +10955,7 @@ msgstr "Angiver hvor mappen skal oprettes:"
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Opsiger abonnement på mappe \"%s\""
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1547
 msgid "Unsigned"
 msgstr "Ikke signeret"
 
@@ -10964,7 +10967,7 @@ msgstr ""
 "Dette brev er ikke signeret. Der er ingen garanti for at dette brev er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1548
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
@@ -10976,7 +10979,7 @@ msgstr ""
 "Dette brev er signeret og er gyldigt, hvilket sandsynligvis betyder at dette "
 "brev er autentisk."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1549
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
@@ -10988,7 +10991,7 @@ msgstr ""
 "Signaturen for dette brev kan ikke verificeres. Den kan være ændret under "
 "overføringen."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1550
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kunne ikke verificere afsenderen"
 
@@ -11000,7 +11003,7 @@ msgstr ""
 "Dette brev er signeret med en gyldig signatur, men afsenderen af brevet kan "
 "ikke verificeres."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1551
 msgid "Signature exists, but need public key"
 msgstr "Signaturen eksisterer, men der skal bruges en offentlig nøgle"
 
@@ -11012,7 +11015,7 @@ msgstr ""
 "Dette brev er signeret med en signatur, men der er ikke nogen tilsvarende "
 "offentlig nøgle."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1557
 msgid "Unencrypted"
 msgstr "Ikke krypteret"
 
@@ -11024,7 +11027,7 @@ msgstr ""
 "Dette brev er ikke krypteret. Indholdet af brevet kan ses ved overførslen "
 "over internettet."
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1558
 msgid "Encrypted, weak"
 msgstr "Krypteret, svag"
 
@@ -11038,7 +11041,7 @@ msgstr ""
 "vanskeligt, men i praksis ikke umuligt for en udenforstående at se indholdet "
 "af brevet."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1559
 msgid "Encrypted"
 msgstr "Krypteret"
 
@@ -11050,7 +11053,7 @@ msgstr ""
 "Dette brev er krypteret. Det vil være vanskeligt for en udenforstående at se "
 "indholdet i brevet."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1560
 msgid "Encrypted, strong"
 msgstr "Krypteret, stærk"
 
@@ -11110,48 +11113,48 @@ msgstr "_Ã…bn med"
 msgid "Page %d of %d"
 msgstr "Side %d af %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:166
 msgid "Formatting message"
 msgstr "Formaterer brev"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:357
 msgid "Formatting Message..."
 msgstr "Formaterer brev..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1398 ../mail/em-format-html.c:1407
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Henter \"%s\""
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1866
 msgid "Unknown external-body part."
 msgstr "Ukendt ydre del af brevindhold."
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1874
 msgid "Malformed external-body part."
 msgstr "Misdannet ydre del af brevindhold."
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1904
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-server (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1915
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peger til lokal fil (%s) gyldig på netsted \"%s\""
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1917
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1938
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peger til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1949
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
@@ -11159,7 +11162,7 @@ msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2640
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Dette brev blev sendt af <b>%s</b> på vegne af <b>%s</b>"
@@ -12306,7 +12309,7 @@ msgid "Select folder to import into"
 msgstr "Vælg mappen der skal importeres til"
 
 #: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
@@ -13080,7 +13083,7 @@ msgstr "_Markering:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Afkryds dette for at acceptere licensaftalen"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:898
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -14087,7 +14090,7 @@ msgstr "%d %b %Y"
 msgid "Select all visible messages"
 msgstr "Vælg alle synlige breve"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
+#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:827
 msgid "Shell Backend"
 msgstr "Underliggende skalprogram (Shell Backend)"
 
@@ -14556,7 +14559,7 @@ msgid "Show properties of the selected address book"
 msgstr "Vis egenskaber for den valgte adressebog"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
 #: ../modules/calendar/e-task-shell-view-actions.c:734
 #: ../modules/mail/e-mail-shell-view-actions.c:946
@@ -14640,7 +14643,7 @@ msgid "Send a message to the selected contacts"
 msgstr "Send et brev til de valgte kontaktpersoner"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
 #: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "_Actions"
 msgstr "H_andlinger"
@@ -14653,7 +14656,7 @@ msgid "_Preview"
 msgstr "Forhå_ndsvisning"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
 #: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Delete"
@@ -14698,25 +14701,25 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Vis kontaktforhåndsvisningen ved siden af kontaktlisten"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
 #: ../modules/calendar/e-task-shell-view-actions.c:905
 msgid "Any Category"
 msgstr "Alle kategorier"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
 #: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Unmatched"
 msgstr "Ingen træffere"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
 #: ../modules/calendar/e-task-shell-view-actions.c:950
 #: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../shell/e-shell-content.c:438
 msgid "Advanced Search"
 msgstr "Avanceret søgning"
 
@@ -14936,7 +14939,7 @@ msgid "_Appointment"
 msgstr "_Aftale"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "Opret en ny aftale"
 
@@ -14964,7 +14967,7 @@ msgid "Cale_ndar"
 msgstr "Kale_nder"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "Opret en ny kalender"
 
@@ -15091,115 +15094,115 @@ msgstr "begivenhed"
 msgid "Save as iCalendar"
 msgstr "Gem som iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "_Kopiér..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "D_elete Calendar"
 msgstr "Sl_et kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Delete the selected calendar"
 msgstr "Slet den valgte kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Go Back"
 msgstr "GÃ¥ tilbage"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Go Forward"
 msgstr "GÃ¥ fremad"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
 msgid "Select _Today"
 msgstr "Vælg _dagen i dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "Vælg dagen i dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "Vælg _dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "Vælg en specifik dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 #: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Purg_e"
 msgstr "_Fjern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Purge old appointments and meetings"
 msgstr "Fjern gamle aftaler og møder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
 #: ../modules/calendar/e-task-shell-view-actions.c:727
 msgid "Re_fresh"
 msgstr "Genop_frisk"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Refresh the selected calendar"
 msgstr "Genopfrisk den valgte kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Rename the selected calendar"
 msgstr "Omdøb den valgte kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Show _Only This Calendar"
 msgstr "Vis _kun denne kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Cop_y to Calendar..."
 msgstr "_Kopiér til kalender..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "Udde_legér møde..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delete Appointment"
 msgstr "_Slet aftalen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete selected appointments"
 msgstr "Slet de valgte aftaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete This _Occurrence"
 msgstr "Slet denne _forekomst"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "Slet denne forekomst"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete All Occ_urrences"
 msgstr "Slet alle _forekomster"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "Slet alle forekomster"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "New All Day _Event..."
 msgstr "Ny begivenhed som varer h_ele dagen..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Create a new all day event"
 msgstr "Opret en ny helddagsbegivenhed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
@@ -15207,124 +15210,124 @@ msgstr "Opret en ny helddagsbegivenhed"
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "New _Meeting..."
 msgstr "Nyt _møde..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Create a new meeting"
 msgstr "Opret et ny møde"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_yt til kalender..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "Ny _aftale..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "Gør denne hændelse _flytbar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "_Ã…bn aftale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "Vis den aktuelle aftale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "_Svar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Gem som iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "_Planlæg møde..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Konverter en aftale til en begivenhed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "Konv_erter til en aftale..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Konverter et møde til en aftale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "Dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "Vis som liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "MÃ¥ned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "Vis en måned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "Uge"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "Vis en uge"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Show one work week"
 msgstr "Vis en arbejdsuge"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "Aktive aftaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "Næste 7 dages aftaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
 #: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Description contains"
 msgstr "Beskrivelse indeholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
 #: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Summary contains"
 msgstr "Sammendrag indeholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "Udskriv denne kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 msgid "Preview the calendar to be printed"
 msgstr "Forhåndsvis kalenderen som skal skrives ud"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "GÃ¥ til"
 
@@ -19959,11 +19962,11 @@ msgstr "Vinduesknap-stil"
 msgid "Window buttons are visible"
 msgstr "Vinduesknapper er synlige"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:499 ../shell/e-shell-content.c:500
 msgid "Searches"
 msgstr "Søgninger"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:541
 msgid "Save Search"
 msgstr "Gem søgning"
 
@@ -19976,123 +19979,123 @@ msgstr "%ld kB"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "_Vis:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "Sø_g:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr " _i"
 
-#: ../shell/e-shell-switcher.c:448
+#: ../shell/e-shell-switcher.c:463
 msgid "Toolbar Style"
 msgstr "Værktøjslinjestil"
 
-#: ../shell/e-shell-switcher.c:449
+#: ../shell/e-shell-switcher.c:464
 msgid "The switcher's toolbar style"
 msgstr "Omskifterens værktøjslinjestil"
 
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
+#: ../shell/e-shell-switcher.c:480 ../shell/e-shell-window.c:762
 msgid "Toolbar Visible"
 msgstr "Værktøjslinje er synlig"
 
-#: ../shell/e-shell-switcher.c:466
+#: ../shell/e-shell-switcher.c:481
 msgid "Whether the switcher is visible"
 msgstr "Hvorvidt omskifteren er synlig"
 
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Alle filer (*)"
 
-#: ../shell/e-shell-view.c:675
+#: ../shell/e-shell-view.c:779
 msgid "Switcher Action"
 msgstr "Omskifterhandling"
 
-#: ../shell/e-shell-view.c:676
+#: ../shell/e-shell-view.c:780
 msgid "The switcher action for this shell view"
 msgstr "Omskifterhandling for denne skalvisning"
 
-#: ../shell/e-shell-view.c:691
+#: ../shell/e-shell-view.c:795
 msgid "Page Number"
 msgstr "Sidenummer"
 
-#: ../shell/e-shell-view.c:692
+#: ../shell/e-shell-view.c:796
 msgid "The notebook page number of the shell view"
 msgstr "Notebogens sidenummer i skalvisningen"
 
-#: ../shell/e-shell-view.c:708
+#: ../shell/e-shell-view.c:812
 msgid "Search Rule"
 msgstr "Søgeregel"
 
-#: ../shell/e-shell-view.c:709
+#: ../shell/e-shell-view.c:813
 msgid "Criteria for the current search results"
 msgstr "Kriterium for de aktuelle søgeresultater"
 
-#: ../shell/e-shell-view.c:724
+#: ../shell/e-shell-view.c:828
 msgid "The EShellBackend for this shell view"
 msgstr "EShellBackend for denne skalvisning"
 
-#: ../shell/e-shell-view.c:739
+#: ../shell/e-shell-view.c:843
 msgid "Shell Content Widget"
 msgstr "Skal-indholdskontrol"
 
-#: ../shell/e-shell-view.c:740
+#: ../shell/e-shell-view.c:844
 msgid "The content widget appears in a shell window's right pane"
 msgstr "Indholdskontrollen findes i skalvinduets højre rude"
 
-#: ../shell/e-shell-view.c:756
+#: ../shell/e-shell-view.c:860
 msgid "Shell Sidebar Widget"
 msgstr "Skal-sidepanelkontrol"
 
-#: ../shell/e-shell-view.c:757
+#: ../shell/e-shell-view.c:861
 msgid "The sidebar widget appears in a shell window's left pane"
 msgstr "Sidepanelkontrollen findes i skalvinduets venstre rude"
 
-#: ../shell/e-shell-view.c:772
+#: ../shell/e-shell-view.c:876
 msgid "Shell Taskbar Widget"
 msgstr "Skal-opgavelinjekontrol"
 
-#: ../shell/e-shell-view.c:773
+#: ../shell/e-shell-view.c:877
 msgid "The taskbar widget appears at the bottom of a shell window"
 msgstr "Skal-opgavelinjekontrollen findes i bunden af skalvinduet"
 
-#: ../shell/e-shell-view.c:788
+#: ../shell/e-shell-view.c:892
 msgid "Shell Window"
 msgstr "Skalvindue"
 
-#: ../shell/e-shell-view.c:789
+#: ../shell/e-shell-view.c:893
 msgid "The window to which the shell view belongs"
 msgstr "Vinduet som skalvisningen hører til"
 
-#: ../shell/e-shell-view.c:805
+#: ../shell/e-shell-view.c:909
 msgid "The key file holding widget state data"
 msgstr "Nøglefilen som indeholder tilstandsdata for kontrollerne"
 
-#: ../shell/e-shell-view.c:820
+#: ../shell/e-shell-view.c:924
 msgid "The title of the shell view"
 msgstr "Titlen på skalvisningen"
 
-#: ../shell/e-shell-view.c:834
+#: ../shell/e-shell-view.c:938
 msgid "Current View ID"
 msgstr "Aktuelle visnings-id"
 
-#: ../shell/e-shell-view.c:835
+#: ../shell/e-shell-view.c:939
 msgid "The current GAL view ID"
 msgstr "Den aktuelle GAL-visnings-id"
 
@@ -20410,115 +20413,123 @@ msgid "Execute these search parameters"
 msgstr "Udfør disse søgeparametre"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:568
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "Ny"
 
-#: ../shell/e-shell-window.c:616
+#: ../shell/e-shell-window.c:638
 msgid "Active Shell View"
 msgstr "Aktiv skalvisning"
 
-#: ../shell/e-shell-window.c:617
+#: ../shell/e-shell-window.c:639
 msgid "Name of the active shell view"
 msgstr "Navn på den aktive skalvisning"
 
-#: ../shell/e-shell-window.c:632
+#: ../shell/e-shell-window.c:654
 msgid "The shell window's EFocusTracker"
 msgstr "Skalvinduets EFocusTracker"
 
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
+#: ../shell/e-shell-window.c:668 ../shell/e-shell.c:802
 msgid "Geometry"
 msgstr "Geometri"
 
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
+#: ../shell/e-shell-window.c:669 ../shell/e-shell.c:803
 msgid "Initial window geometry string"
 msgstr "Streng for vinduets indledende geometri"
 
-#: ../shell/e-shell-window.c:662
+#: ../shell/e-shell-window.c:684
 msgid "Safe Mode"
 msgstr "Sikker tilstand"
 
-#: ../shell/e-shell-window.c:663
+#: ../shell/e-shell-window.c:685
 msgid "Whether the shell window is in safe mode"
 msgstr "Hvorvidt skalvinduet er i sikker tilstand"
 
-#: ../shell/e-shell-window.c:694
+#: ../shell/e-shell-window.c:716
 msgid "Sidebar Visible"
 msgstr "Sidepanelsynlighed"
 
-#: ../shell/e-shell-window.c:695
+#: ../shell/e-shell-window.c:717
 msgid "Whether the shell window's side bar is visible"
 msgstr "Hvorvidt skalvinduets sidepanel er synligt"
 
-#: ../shell/e-shell-window.c:709
+#: ../shell/e-shell-window.c:731
 msgid "Switcher Visible"
 msgstr "Omskiftersynlighed"
 
-#: ../shell/e-shell-window.c:710
+#: ../shell/e-shell-window.c:732
 msgid "Whether the shell window's switcher buttons are visible"
 msgstr "Hvorvidt omskifteknapperne til skalvinduet er synlige"
 
-#: ../shell/e-shell-window.c:725
+#: ../shell/e-shell-window.c:747
 msgid "Taskbar Visible"
 msgstr "Opgavelinjesynlighed"
 
-#: ../shell/e-shell-window.c:726
+#: ../shell/e-shell-window.c:748
 msgid "Whether the shell window's task bar is visible"
 msgstr "Hvorvidt opgavelinjen for skalvinduet er synlig"
 
-#: ../shell/e-shell-window.c:741
+#: ../shell/e-shell-window.c:763
 msgid "Whether the shell window's tool bar is visible"
 msgstr "Hvorvidt statuslinjen for skalvinduet er synlig"
 
-#: ../shell/e-shell-window.c:755
+#: ../shell/e-shell-window.c:777
 msgid "UI Manager"
 msgstr "UI-håndtering"
 
-#: ../shell/e-shell-window.c:756
+#: ../shell/e-shell-window.c:778
 msgid "The shell window's GtkUIManager"
 msgstr "Skalvinduets GtkUIManager"
 
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "Forbereder at gå i offline tilstand..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "Forbereder at gå i online tilstand..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "Forbereder at afslutte..."
 
-#: ../shell/e-shell.c:819
+#: ../shell/e-shell.c:818
 msgid "Module Directory"
 msgstr "Modulmappe"
 
-#: ../shell/e-shell.c:820
+#: ../shell/e-shell.c:819
 msgid "The directory from which to load EModules"
 msgstr "Mappen EModuler (EModules) skal indlæses fra"
 
-#: ../shell/e-shell.c:835
+#: ../shell/e-shell.c:834
 msgid "Network Available"
 msgstr "Netværk tilgængelig"
 
-#: ../shell/e-shell.c:836
+#: ../shell/e-shell.c:835
 msgid "Whether the network is available"
 msgstr "Hvorvidt netværk er tilgængeligt"
 
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
+#: ../shell/e-shell.c:850 ../widgets/misc/e-online-button.c:134
 msgid "Online"
 msgstr "Online"
 
-#: ../shell/e-shell.c:852
+#: ../shell/e-shell.c:851
 msgid "Whether the shell is online"
 msgstr "Hvorvidt skallen er online"
 
+#: ../shell/e-shell.c:866
+msgid "Shell Settings"
+msgstr "Skalindstillinger"
+
+#: ../shell/e-shell.c:867
+msgid "Application-wide settings"
+msgstr "Indstillinger for hele programmet"
+
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:168
 #, no-c-format
@@ -21505,11 +21516,11 @@ msgstr "MIME-type:"
 msgid "_Suggest automatic display of attachment"
 msgstr "F_oreslå automatisk visning af bilag"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "Kunne ikke sætte som baggrund"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "Vælg som _baggrund"
 
@@ -21654,7 +21665,7 @@ msgid "Ctrl-click to open a link"
 msgstr "Ctrl-klik for at åbne et link"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21733,48 +21744,48 @@ msgstr "Indtast tegnsæt som skal bruges"
 msgid "Other..."
 msgstr "Andre..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Dato og tidspunkt"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Tekstindtastningsfelt til indtastning af dato"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Klík på denne knap for at vise en kalender"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Rullegardin-kombinationsfelt for valg af tid"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "N_u"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "I _dag"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Ingen"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1918
 msgctxt "date"
 msgid "None"
 msgstr "Ingen"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1813
 msgid "Invalid Date Value"
 msgstr "Ugyldig datoværdi"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1857
 msgid "Invalid Time Value"
 msgstr "Ugyldig tidsværdi"
 
@@ -22180,41 +22191,41 @@ msgstr "Scriptfilen skal være eksekverbar."
 msgid "Click here to go to URL"
 msgstr "Klik her for at gå til adresse"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:360
 msgid "_Copy Link Location"
 msgstr "_Kopiér adresse"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:362
 msgid "Copy the link to the clipboard"
 msgstr "Kopiér linket til udklipsholderen"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:370
 msgid "_Open Link in Browser"
 msgstr "_Ã…bn link i browser"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:372
 msgid "Open the link in a web browser"
 msgstr "Ã…bn linket i webbrowseren"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:380
 msgid "_Copy Email Address"
 msgstr "_Kopiér e-postadresse"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:409 ../widgets/misc/e-web-view.c:1035
 msgid "Select all text and images"
 msgstr "Vælg al tekst og billeder"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:800 ../widgets/misc/e-web-view.c:802
+#: ../widgets/misc/e-web-view.c:804
 #, c-format
 msgid "Click to call %s"
 msgstr "Klik for at ringe til %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:806
 msgid "Click to hide/unhide addresses"
 msgstr "Klik for at vise/skjule adresser"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:808
 #, c-format
 msgid "Click to open %s"
 msgstr "Klik for at åbne %s"
diff --git a/po/de.po b/po/de.po
index 556e121ff2..f5a62ef4cd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,15 +19,15 @@
 # Andre Klapper <ak-47@gmx.net>, 2007-2009.
 # Mario Blättermann <mariobl@gnome.org>, 2010.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010.
-#: ../shell/main.c:479
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
-"POT-Creation-Date: 2010-03-20 19:25+0000\n"
-"PO-Revision-Date: 2010-03-20 10:35+0100\n"
-"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
+"POT-Creation-Date: 2010-04-30 17:01+0000\n"
+"PO-Revision-Date: 2010-05-02 13:25+0100\n"
+"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,8 +43,8 @@ msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
 msgstr ""
-"»{0}« ist ein schreibgeschütztes Adressbuch. Wechseln Sie zur Kontakte-"
-"Ansicht und wählen Sie ein anderes Adressbuch aus."
+"»{0}« ist ein schreibgeschütztes Adressbuch. Wechseln Sie zur Kontakte-Ansicht "
+"und wählen Sie ein anderes Adressbuch aus."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -114,7 +114,7 @@ msgstr "Legitimation am LDAP-Server gescheitert."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1266
 msgid "Failed to delete contact"
 msgstr "Kontakt konnte nicht gelöscht werden"
 
@@ -140,8 +140,8 @@ msgstr "Das Evolution-Adressbuch wurde unerwartet beendet."
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
-"Das ausgewählte Bild ist groß. Möchten Sie die Größe des Bildes ändern und "
-"es speichern?"
+"Das ausgewählte Bild ist groß. Möchten Sie die Größe des Bildes ändern und es "
+"speichern?"
 
 #: ../addressbook/addressbook.error.xml.h:21
 msgid ""
@@ -150,8 +150,8 @@ msgid ""
 "supported search bases."
 msgstr ""
 "Möglicherweise verwendet dieser Server eine ältere LDAP-Version, die diese "
-"Funktionen nicht unterstützt, oder er ist fehlerhaft konfiguriert. Fragen "
-"Sie Ihren Systemadministrator nach unterstützten Suchbasen."
+"Funktionen nicht unterstützt, oder er ist fehlerhaft konfiguriert. Fragen Sie "
+"Ihren Systemadministrator nach unterstützten Suchbasen."
 
 #: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book could not be opened."
@@ -206,8 +206,8 @@ msgstr ""
 #: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
+"problems using Evolution. For best results the server should be upgraded to a "
+"supported version"
 msgstr ""
 "Sie verbinden sich mit einem nicht unterstützten GroupWise-Server und werden "
 "bei der Benutzung von Evolution unter Umständen Probleme feststellen. Für "
@@ -235,7 +235,7 @@ msgstr ""
 "Ihre Kontakte für {0} sind nicht verfügbar, solange Evolution nicht neu "
 "gestartet wurde."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -258,16 +258,6 @@ msgstr "_Größe verändern"
 msgid "_Use as it is"
 msgstr "_Wie es ist benutzen"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Voreingestellte Adresse für Datenabgleich:"
@@ -284,7 +274,7 @@ msgstr "Adress-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2005
 msgid "Anniversary"
 msgstr "Jahrestag"
 
@@ -295,37 +285,40 @@ msgstr "Jahrestag"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2004 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:107
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#| msgid "Blog"
+msgid "Blog:"
+msgstr "Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorien …"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "Kalender:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2568
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
@@ -334,221 +327,190 @@ msgstr "Kontakteditor"
 msgid "Email"
 msgstr "E-Mail"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "Verfügbarkeit:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "_Voller Name …"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "Privat"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "Homepage:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Grafik"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "Sofortnachrichten"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Beruf"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Postadresse"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "_Spitzname:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Notizen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1711
 msgid "Other"
 msgstr "Weitere"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "Persönliche Informationen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "Video-Chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Web-Adressen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "Weblog:"
-
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Geschäftlich"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "_Jahrestag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "_Assistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "_Geburtstag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#| msgid "Blog"
+msgid "_Blog:"
+msgstr "_Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 #: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "S_tadt:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "_Firma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "_Land:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "A_bteilung:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "_Einsortieren als:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "_Verfügbarkeit:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "_Homepage:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "V_orgesetzter:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "Bü_ro:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "_Postfach:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "Ber_uf:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "E_hepartner:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "_Bundesstaat/Provinz:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "_Video-Chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "Wünscht _HTML-E-Mails"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "_Weblog:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_In:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "Postleit_zahl:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Name"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "Editierbar"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -590,7 +552,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "Error adding contact"
 msgstr "Fehler beim Hinzufügen eines Kontakts"
 
@@ -602,45 +564,21 @@ msgstr "Fehler beim Ändern eines Kontakts"
 msgid "Error removing contact"
 msgstr "Fehler beim Entfernen eines Kontakts"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Quellbuch"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "Zielbuch"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "Ist neuer Kontakt"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Beschreibbare Felder"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Benötigte Felder"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Geändert"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2563
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontakteditor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2971
 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:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2972
 msgid "_No image"
 msgstr "_Kein Bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -648,56 +586,46 @@ msgstr ""
 "Die Kontaktdaten sind ungültig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3249
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3256
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3282
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s»%s« ist leer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3296
 msgid "Invalid contact."
 msgstr "Kontakt ungültig."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufügen"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "Voll _bearbeiten"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "_Voller Name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "E-_Mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "Adressbuch aus_wählen"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Shell"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "Das EShell-Singleton"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr."
@@ -764,7 +692,7 @@ msgid "_Suffix:"
 msgstr "_Suffix:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:676
 msgid "Contact List Editor"
 msgstr "Kontaktlisteneditor"
 
@@ -781,7 +709,7 @@ msgid "_List name:"
 msgstr "_Listenname:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:157
 msgid "_Select..."
 msgstr "A_uswählen …"
 
@@ -791,39 +719,27 @@ msgstr ""
 "_Geben Sie eine E-Mail-Adresse ein oder ziehen Sie einen Kontakt auf die "
 "unten stehende Liste:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:769
 msgid "Contact List Members"
 msgstr "Kontaktlistenmitglieder"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:917
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1333
 msgid "_Members"
 msgstr "_Mitglieder"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1200
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Buch"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "Ist neue Liste"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Geänderter Kontakt:"
@@ -862,31 +778,31 @@ msgstr ""
 "bereits in diesem Ordner. Soll er dennoch hinzugefügt werden?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "_Zusammenführen"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 msgid "Merge Contact"
 msgstr "Kontakte zusammenführen"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Any field contains"
 msgstr "Ein beliebiges Feld enthält"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "E-Mail-Adresse beginnt mit"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "Name enthält"
 
@@ -905,91 +821,62 @@ msgstr[1] "%d Kontakte"
 msgid "Error getting book view"
 msgstr "Fehler beim Abrufen der Buchansicht"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "Abfrage"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
 msgstr "Suche wurde unterbrochen"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Modell"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
 msgid "Cut selected contacts to the clipboard"
 msgstr "Ausgewählte Kontakte in die Zwischenablage ausschneiden"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Copy selected contacts to the clipboard"
 msgstr "Ausgewählte Kontakte in die Zwischenablage kopieren"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Paste contacts from the clipboard"
 msgstr "Kontakte aus der Zwischenablage einfügen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "Die gewählten Kontakte löschen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 msgid "Select all visible contacts"
 msgstr "Alle sichtbaren Kontakte auswählen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Shell-Ansicht"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Quelle"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1284
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Sind Sie sicher, dass Sie diese Kontaktlisten löschen wollen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1288
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Sind Sie sicher, dass Sie diese Kontaktliste löschen wollen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1292
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Sind Sie sicher, dass Sie diese Kontaktliste löschen wollen (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Sind Sie sicher, dass Sie diese Kontakte löschen wollen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
 msgid "Are you sure you want to delete this contact?"
 msgstr "Sind Sie sicher, dass Sie diesen Kontakt löschen wollen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Sind Sie sicher, dass Sie diesen Kontakt löschen wollen (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1461
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -998,11 +885,11 @@ msgstr ""
 "Das Öffnen von %d Kontakten würde dazu führen, dass %d zusätzliche Fenster "
 "geöffnet werden. Wollen Sie wirklich diese Kontakte anzeigen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
 msgid "_Don't Display"
 msgstr "_Nicht anzeigen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1467
 msgid "Display _All Contacts"
 msgstr "_Alle Kontakte anzeigen"
 
@@ -1163,7 +1050,6 @@ msgid "Telex"
 msgstr "Telex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "Anrede"
 
@@ -1175,59 +1061,7 @@ msgstr "Einheit"
 msgid "Web Site"
 msgstr "Website"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Breite"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Höhe"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "Hat Fokus"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Feld"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Feldname"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Textmodell"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Maximale Länge des Feldnamens"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Spaltenbreite"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1237,7 +1071,7 @@ msgstr ""
 "\n"
 "Suche nach Kontakten …"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1251,7 +1085,7 @@ msgstr ""
 "\n"
 "Klicken Sie hier zwei mal, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1265,7 +1099,7 @@ msgstr ""
 "\n"
 "Klicken Sie hier zwei mal, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1275,7 +1109,7 @@ msgstr ""
 "\n"
 "Suche nach dem Kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1285,10 +1119,6 @@ msgstr ""
 "\n"
 "In dieser Ansicht existieren keine anzuzeigenden Einträge."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Adapter"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "E-Mail, geschäftlich"
@@ -1298,18 +1128,10 @@ msgid "Home Email"
 msgstr "E-Mail, privat"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "Weitere E-Mail-Adresse"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Gewählt"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "Hat Cursor"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1352,17 +1174,17 @@ msgid "Copy _Email Address"
 msgstr "_E-Mail-Adresse kopieren"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:381
 msgid "Copy the email address to the clipboard"
 msgstr "E-Mail-Adresse in die Zwischenablage kopieren"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:386
 msgid "_Send New Message To..."
 msgstr "Neue Nachricht _schicken an …"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:388
 msgid "Send a mail message to this address"
 msgstr "Eine Nachricht an diese Adresse senden"
 
@@ -1398,22 +1220,21 @@ msgid "Video Chat"
 msgstr "Video-Chat"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:496
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "Kalender"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:116
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Verfügbarkeit"
@@ -1441,21 +1262,19 @@ msgid "Web Log"
 msgstr "Weblog"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
+#: ../capplet/settings/mail-capplet-shell.c:350
 #: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/addressbook/e-book-shell-migrate.c:134
 #: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Persönlich"
@@ -1472,8 +1291,8 @@ msgstr "Homepage"
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
@@ -1530,11 +1349,11 @@ msgstr "Protokoll nicht unterstützt"
 #. To Translators: This is task status
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2659
 msgid "Canceled"
 msgstr "Abgebrochen"
 
@@ -1586,21 +1405,20 @@ msgstr "Nicht unterstützte Legitimationsmethode"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
+"This address book cannot be opened. This either means this book is not marked "
+"for offline usage or not yet downloaded for offline usage. Please load the "
+"address book once in online mode to download its contents."
 msgstr ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Dies bedeutet entweder, dass "
 "dieses Adressbuch nicht für die Offline-Benutzung markiert wurde oder bis "
-"jetzt noch nicht für die Offline-Benutzung heruntergeladen wurde. Bitte "
-"laden Sie das Adressbuch einmal im Online-Modus, um dessen Inhalte "
-"herunterzuladen."
+"jetzt noch nicht für die Offline-Benutzung heruntergeladen wurde. Bitte laden "
+"Sie das Adressbuch einmal im Online-Modus, um dessen Inhalte herunterzuladen."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
 msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
+"This address book cannot be opened.  Please check that the path %s exists and "
+"that permissions are set to access it."
 msgstr ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Bitte überprüfen Sie, ob der "
 "Pfad %s existiert und Sie darauf zugreifen dürfen."
@@ -1672,27 +1490,27 @@ msgstr "Diese Abfrage konnte nicht erfolgreich ausgeführt werden"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "Adressbuch auswählen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "Kontakt kopieren nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "Kontakte kopieren nach"
 
@@ -1704,7 +1522,7 @@ msgstr "Kartenansicht"
 #: ../addressbook/importers/evolution-ldif-importer.c:516
 #: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importieren …"
 
@@ -1788,8 +1606,7 @@ msgstr "Im asynchronen Modus exportieren"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
+"The number of cards in one output file in asynchronous mode, default size 100."
 msgstr ""
 "Die Anzahl der Karten pro Ausgabedatei im asynchronen Modus, Vorgabe: 100."
 
@@ -1798,11 +1615,10 @@ msgid "NUMBER"
 msgstr "ANZAHL"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:101
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
-"Argumentfehler in Befehlszeile, bitte übergeben Sie den »--help«-Parameter, "
-"um Hinweise zum Aufruf zu erhalten."
+"Argumentfehler in Befehlszeile, bitte übergeben Sie den »--help«-Parameter, um "
+"Hinweise zum Aufruf zu erhalten."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
@@ -1825,20 +1641,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Der Zugriff auf den LDAP-Server erfolgt anonym"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "Legitimation gescheitert.\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Geben Sie das Passwort für %s ein (Benutzer %s)"
 
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../addressbook/util/addressbook.c:225 ../calendar/common/authentication.c:51
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1863,27 +1678,32 @@ msgstr ""
 "und wählen Sie einen Kalender aus, der Termine akzeptieren kann."
 
 #: ../calendar/calendar.error.xml.h:5
+#| msgid ""
+#| "Adding a meaningful summary to your appointment will give your recipients "
+#| "an idea of what your appointment is about."
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of what "
+"your appointment is about."
 msgstr ""
 "Das Hinzufügen einer aussagekräftigen Zusammenfassung zu Ihrem Termin "
-"verschafft den Empfängern eine Vorstellung, worum es bei diesem Termin geht."
+"verschafft Ihnen eine Vorstellung, worum es bei diesem Termin geht."
 
 #: ../calendar/calendar.error.xml.h:6
+#| msgid ""
+#| "Adding a meaningful summary to your task will give your recipients an idea "
+#| "of what your task is about."
 msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr ""
 "Das Hinzufügen einer aussagekräftigen Zusammenfassung zu Ihrer Aufgabe "
-"verschafft den Empfängern eine Vorstellung, worum es sich bei dieser Aufgabe "
-"handelt."
+"verschafft Ihnen eine Vorstellung, worum es sich bei dieser Aufgabe handelt."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
-"Die gesamten Informationen zu diesen Notizen werden gelöscht und können "
-"nicht wiederhergestellt werden."
+"Die gesamten Informationen zu diesen Notizen werden gelöscht und können nicht "
+"wiederhergestellt werden."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
@@ -1893,8 +1713,7 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+"All information on these appointments will be deleted and can not be restored."
 msgstr ""
 "Die gesamten Informationen zu diesen Terminen werden gelöscht und können "
 "nicht wiederhergestellt werden."
@@ -1913,8 +1732,7 @@ msgstr ""
 "wiederhergestellt werden."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Die gesamten Informationen zu dieser Besprechung werden gelöscht und können "
 "nicht wiederhergestellt werden."
@@ -1928,8 +1746,8 @@ msgstr ""
 #: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
-"Die gesamten Informationen zu dieser Aufgabe werden gelöscht und können "
-"nicht wiederhergestellt werden."
+"Die gesamten Informationen zu dieser Aufgabe werden gelöscht und können nicht "
+"wiederhergestellt werden."
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
@@ -1982,66 +1800,64 @@ msgid "Are you sure you want to delete this task?"
 msgstr "Sind Sie sicher, dass Sie diese Aufgabe löschen wollen?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
+#| msgid "Are you sure you want to send the appointment without a summary?"
+msgid "Are you sure you want to save the appointment without a summary?"
 msgstr ""
-"Sind Sie sicher, dass Sie die Notiz ohne eine Zusammenfassung speichern "
+"Sind Sie sicher, dass Sie den Termin ohne eine Zusammenfassung speichern "
 "wollen?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
+msgid "Are you sure you want to save the memo without a summary?"
 msgstr ""
-"Sind Sie sicher, dass Sie den Termin ohne eine Zusammenfassung verschicken "
+"Sind Sie sicher, dass Sie die Notiz ohne eine Zusammenfassung speichern "
 "wollen?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
+#| msgid "Are you sure you want to send the task without a summary?"
+msgid "Are you sure you want to save the task without a summary?"
 msgstr ""
-"Sind Sie sicher, dass Sie die Aufgabe ohne eine Zusammenfassung verschicken "
+"Sind Sie sicher, dass Sie die Aufgabe ohne eine Zusammenfassung speichern "
 "wollen?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "Kalender-Repository ist offline."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Anlegen eines neuen Ereignisses gescheitert"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Ereignis kann nicht gespeichert werden"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Kalender »{0}« löschen?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Notizliste »{0}« löschen?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Aufgabenliste »{0}« löschen?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "_Nicht verschicken"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr ""
 "Das Herunterladen ist noch nicht beendet. Möchten Sie den Termin speichern?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr ""
 "Das Herunterladen ist noch nicht beendet. Möchten Sie die Aufgabe speichern?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "Editor konnte nicht geladen werden."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -2049,31 +1865,26 @@ msgstr ""
 "Es werden E-Mail-Einladungen an alle Teilnehmer verschickt, damit diese die "
 "Aufgabe übernehmen können."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Es werden E-Mail-Einladungen an alle Teilnehmer verschickt, damit diese die "
 "Einladungen akzeptieren können."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Fehler beim Laden des Kalenders"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Fehler beim Laden der Notizliste"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Fehler beim Laden der Aufgabenliste"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "Fehler auf »{0}«"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2081,7 +1892,7 @@ msgstr ""
 "Falls Sie keine Absagenachricht verschicken, wissen die anderen Teilnehmer "
 "möglicherweise nicht, dass die Besprechung abgesagt wurde."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2089,7 +1900,7 @@ msgstr ""
 "Falls Sie keine Absagenachricht verschicken, wissen die anderen Teilnehmer "
 "möglicherweise nicht, dass die Notiz gelöscht wurde."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2097,36 +1908,31 @@ msgstr ""
 "Falls Sie keine Absagenachricht verschicken, wissen die anderen Teilnehmer "
 "möglicherweise nicht, dass die Aufgabe gelöscht wurde."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "Keine Antwort vom Server."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+"Sending updated information allows other participants to keep their calendars "
+"up to date."
 msgstr ""
 "Es werden aktualisierte Informationen an andere Teilnehmer verschickt, um "
 "ihnen so zu ermöglichen, ihre Kalender auf dem neuesten Stand zu halten."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr ""
 "Es werden aktualisierte Informationen an andere Teilnehmer verschickt, um "
-"ihnen so zu ermöglichen, ihre Aufgabenlisten auf dem neuesten Stand zu "
-"halten."
+"ihnen so zu ermöglichen, ihre Aufgabenlisten auf dem neuesten Stand zu halten."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
+"Some attachments are being downloaded. Saving the appointment would result in "
+"the loss of these attachments."
 msgstr ""
 "Einige Anlagen werden zurzeit noch heruntergeladen. Das Speichern dieses "
 "Termins würde den Verlust dieser Anlagen zur Folge haben."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2134,100 +1940,96 @@ msgstr ""
 "Einige Anlagen werden zurzeit noch heruntergeladen. Das Speichern dieser "
 "Aufgabe würde den Verlust dieser Anlagen zur Folge haben."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Einige Funktionen werden mit Ihrem Server möglicherweise nicht einwandfrei "
 "arbeiten."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Der Evolution-Kalender wurde unerwartet beendet."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Die Evolution-Kalender wurden unerwartet beendet."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Die Evolution-Notizen wurden unerwartet beendet."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Die Evolution-Aufgaben wurden unerwartet beendet."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:55
 msgid "The calendar is not marked for offline usage."
 msgstr "Der Kalender ist nicht für eine Offline-Benutzung markiert."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:56
 msgid "The memo list is not marked for offline usage."
 msgstr "Die Notizliste ist nicht für eine Offline-Benutzung markiert."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "Die Aufgabenliste ist nicht für eine Offline-Benutzung markiert."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Dieser Kalender wird unwiderruflich gelöscht."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "Diese Notizliste wird unwiderruflich gelöscht."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Diese Aufgabenliste wird unwiderruflich gelöscht."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "Der Kalender konnte nicht geladen werden"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Wollen Sie die an diesem Termin vorgenommenen Änderungen speichern?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this meeting?"
 msgstr ""
 "Wollen Sie die an dieser Besprechung vorgenommenen Änderungen speichern?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "Wollen Sie die an dieser Notiz vorgenommenen Änderungen speichern?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "Wollen Sie die an dieser Aufgabe vorgenommenen Änderungen speichern?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Wollen Sie eine Absagenachricht für diese Notiz verschicken?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Wollen Sie allen Teilnehmern eine Absagenachricht schicken?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Wollen Sie Einladungen zur Besprechung an die Teilnehmer verschicken?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "Wollen Sie diese Aufgabe an die Teilnehmer verschicken?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "Wollen Sie aktuelle Besprechungsinformationen an die Teilnehmer verschicken?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "Wollen Sie aktuelle Aufgabeninformationen an die Teilnehmer verschicken?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2238,75 +2040,70 @@ msgstr ""
 "eine bestmögliche Zusammenarbeit sollte der Server auf eine unterstützte "
 "Version aktualisiert werden."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:72
 msgid "You have changed this appointment, but not yet saved it."
 msgstr ""
 "Sie haben Änderungen an diesem Termin vorgenommen, diese jedoch noch nicht "
 "gespeichert."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this meeting, but not yet saved it."
 msgstr ""
 "Sie haben Änderungen an dieser Besprechung vorgenommen, diese jedoch noch "
 "nicht gespeichert."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr ""
 "Sie haben Änderungen an dieser Aufgabe vorgenommen, diese jedoch noch nicht "
 "gespeichert."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr ""
 "Sie haben Änderungen an dieser Notiz vorgenommen, diese jedoch noch nicht "
 "gespeichert."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Ihre Kalender sind nicht verfügbar, solange Evolution nicht neu gestartet "
 "wurde."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Ihre Notizen sind nicht verfügbar, solange Evolution nicht neu gestartet "
 "wurde."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Ihre Aufgaben sind nicht verfügbar, solange Evolution nicht neu gestartet "
 "wurde."
 
-#: ../calendar/calendar.error.xml.h:84
-#: ../composer/mail-composer.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:79 ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "Änderungen _verwerfen"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "Änderungen _speichern"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:82 ../composer/mail-composer.error.xml.h:28
+#: ../mail/mail.error.xml.h:133
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "Ab_schicken"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "Nachricht ver_schicken"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Mehrtägige Ereignisse aufteilen:"
@@ -2361,7 +2158,7 @@ msgid_plural "hours"
 msgstr[0] "Stunde"
 msgstr[1] "Stunden"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "Anfangszeit"
 
@@ -2378,8 +2175,8 @@ msgstr "_Alle verwerfen"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1573
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "Ort:"
 
@@ -2392,11 +2189,11 @@ msgid "_Dismiss"
 msgstr "_Verwerfen"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:1015
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1625
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Bearbeiten"
@@ -2406,10 +2203,10 @@ msgid "_Snooze"
 msgstr "_Schlummer"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "Stunden"
 
@@ -2417,11 +2214,12 @@ msgstr "Stunden"
 msgid "location of appointment"
 msgstr "Ort des Termins"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "Minuten"
 
@@ -2444,13 +2242,13 @@ msgstr "Keine Ortsinformationen verfügbar."
 msgid "You have %d alarms"
 msgstr "Sie haben %d Alarme"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2463,7 +2261,7 @@ msgstr ""
 "Evolution wird stattdessen ein normales\n"
 "Erinnerungsdialogfenster anzeigen."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2480,7 +2278,7 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
@@ -2522,7 +2320,7 @@ msgid "Alarm programs"
 msgstr "Alarmprogramme"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Anzahl der Sekunden, die eine Fehlermeldung in der Statusleiste angezeigt "
@@ -2545,215 +2343,208 @@ msgid "Calendars to run alarms for"
 msgstr "Kalender, für die Alarme ausgeführt werden sollen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr ""
-"Kreuzen Sie dies an, um die Zeitzone des Systems in Evolution zu verwenden."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Farbe der Marcus-Bains-Linie in der Zeitleiste (Voreinstellung ist leer)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Farbe der Marcus-Bains-Linie in der Tagesansicht."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "Wochenenden in Monatsansicht komprimieren"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Beim Säubern nachfragen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr ""
 "Anzahl vorgegebener Wiederholungen für ein neues Ereignis. »-1« bedeutet "
 "unbegrenzt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
-"Die Tage, bei denen der Anfang und das Ende der Arbeitsstunden "
-"gekennzeichnet werden soll."
+"Die Tage, bei denen der Anfang und das Ende der Arbeitsstunden gekennzeichnet "
+"werden soll."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "Voreingestellte Erinnerung für Termine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "Voreingestellte Anzahl an Wiederholungen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Einheit der voreingestellten Erinnerung"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Wert der voreingestellten Erinnerung"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "Ordner für das Speichern der Alarm-Audiodateien"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "Ereignisverlauf"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "Ereignistransparenz"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "Verfügbarkeits-Server-Adressen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "Vorlage-Adresse für Verfügbarkeitsdaten"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "Verlauf der Ereignisse in der Kalenderansicht."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "Erledigte Aufgaben verbergen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "Einheit für das Verbergen von Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "Wert für das Verbergen von Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "Position der horizontalen Schiebeleiste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 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.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 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.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 "Falls auf »wahr« gesetzt, wird die Notizvorschau im Hauptfenster angezeigt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 "Falls auf »wahr« gesetzt, wird die Aufgabenvorschau im Hauptfenster angezeigt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"In der Tages- und Wochentagsansicht anzuzeigende Intervalle in Minuten."
+msgstr "In der Tages- und Wochentagsansicht anzuzeigende Intervalle in Minuten."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "Letzte Alarmzeit"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "Protokolltyp, ab welchem die Nachricht protokolliert werden soll."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr "Liste der zuletzt genutzten zweiten Zeitzonen in der Tagesansicht."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr ""
 "Liste der Server-Adressen für die Veröffentlichung von "
 "Verfügbarkeitsinformationen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Marcus-Bains-Linie"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Farbe der Marcus-Bains-Linie - Tagesansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Farbe der Marcus-Bains-Linie - Zeitleiste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
+"Maximum number of recently used timezones to remember in a 'day_second_zones' "
+"list."
 msgstr ""
 "Höchstzahl der zuletzt genutzten gespeicherten Zeitzonen in der Liste "
 "»day_second_zones«."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Höchstzahl der zuletzt genutzten gespeicherten Zeitzonen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "Stil der Notiz"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "Position der horizontalen Notizvorschau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "Position der vertikalen Notizvorschau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 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.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 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.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "Position der horizontalen Schiebeleiste in der Monatsansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "Position der vertikalen Schiebeleiste in der Monatsansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "Anzahl der Einheiten zur Festlegung einer voreingestellten Erinnerung."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 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.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "Farbe überfälliger Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
-"Die Position der horizontalen Schiebeleiste zwischen dem Kalender zur "
-"Auswahl des Datums und der Aufgabenliste in Pixel, wenn keine Monatsansicht "
+"Die Position der horizontalen Schiebeleiste zwischen dem Kalender zur Auswahl "
+"des Datums und der Aufgabenliste in Pixel, wenn keine Monatsansicht "
 "eingestellt ist."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2762,19 +2553,19 @@ msgstr ""
 "Datumsnavigator-Kalender und der Aufgabenliste in Pixel, wenn die "
 "Monatsansicht eingestellt ist."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "Position des Notiz-Vorschaufeldes in vertikaler Anordnung."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "Position des Aufgaben-Vorschaufeldes in horizontaler Anordnung."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "Position des Aufgaben-Vorschaufeldes in vertikaler Anordnung."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -2782,7 +2573,7 @@ msgstr ""
 "Die Position der vertikalen Leiste zwischen der Kalenderliste und dem "
 "Datumsauswahl-Kalender."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2791,7 +2582,7 @@ msgstr ""
 "Datumsnavigator-Kalender und der Aufgabenliste in Pixel, wenn die "
 "Monatsansicht eingestellt ist."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -2800,83 +2591,83 @@ msgstr ""
 "Datumsnavigator-Kalender und der Aufgabenliste in Pixel, wenn keine "
 "Monatsansicht eingestellt ist."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "Primärer Kalender"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "Primäre Notizliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "Primäre Aufgabenliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 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.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "Zuletzt genutzte zweite Zeitzonen in der Tagesansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "Speichern des Ordners für die Alarm-Audiodateien"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "Monatsansicht wochenweise durchblättern"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 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.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Positionsfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 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.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Kategoriefeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "Alarmausgaben im Benachrichtigungsfeld anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Statusfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "Das Notiz-Vorschaufeld anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "Das Aufgaben-Vorschaufeld anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Zeitzonenfeld im Ereignis-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show week number in Day and Work Week View"
 msgstr "Wochennummern in Tagesansicht und Arbeitswochenansicht anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week numbers in date navigator"
 msgstr "Wochennummern im Datumsnavigator anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -2885,23 +2676,23 @@ msgstr ""
 "diese definiert ist. Der Schlüsselwert hat das gleiche Format wie der "
 "Schlüssel »timezone«."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
 msgstr "Anordnung für Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (horizontal)"
 msgstr "Position der horizontalen Aufgabenvorschau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Task preview pane position (vertical)"
 msgstr "Position der vertikalen Aufgabenvorschau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Tasks due today color"
 msgstr "Farbe heute fälliger Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2911,7 +2702,7 @@ msgstr ""
 "wird durch den Benutzerteil der E-Mail-Adresse und »%d« durch die Domain "
 "ersetzt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2919,7 +2710,7 @@ msgstr ""
 "Die voreingestellte Zeitzone zur Verwendung für Datum und Zeit im Kalender "
 "als nicht übersetzter Ort der Olsen-Zeitzonendatenbank, z.B. »Europe/Berlin«."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -2930,22 +2721,22 @@ msgstr ""
 "Notizliste. »1« (vertikale Ansicht) setzt die Vorschauleiste neben die "
 "Notizliste. "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
-"Die Anordnung legt fest, wo die Vorschauleiste in Bezug auf die "
-"Aufgabenliste angezeigt wird. »0« (klassische Ansicht) setzt die "
-"Vorschauleiste unter die Aufgabenliste. »1« (vertikale Ansicht) setzt die "
-"Vorschauleiste neben die Aufgabenliste. "
+"Die Anordnung legt fest, wo die Vorschauleiste in Bezug auf die Aufgabenliste "
+"angezeigt wird. »0« (klassische Ansicht) setzt die Vorschauleiste unter die "
+"Aufgabenliste. »1« (vertikale Ansicht) setzt die Vorschauleiste neben die "
+"Aufgabenliste. "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "The second timezone for a Day View"
 msgstr "Die zweite Zeitzone für die Tagesansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -2953,90 +2744,90 @@ msgstr ""
 "Hier sind drei verschiedene Werte möglich: »0« für Fehler, »1« für Warnungen, "
 "»2« für Diagnosemeldungen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time divisions"
 msgstr "Zeiteinteilungen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time the last alarm ran, in time_t."
 msgstr "Zeit der letzten Alarmauslösung im »time_t«-Format."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
+"Transparency of the events in calendar views, a value between 0 (transparent) "
+"and 1 (opaque)."
 msgstr ""
 "Transparenz der Ereignisse in der Kalenderansicht; ein Wert zwischen 0 "
 "(transparent) und 1 (deckend)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Twenty four hour time format"
 msgstr "24-Stunden-Zeitformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "Adresse des hervorgehobenen (»primären«) Kalenders"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "Adresse der hervorgehobenen (»primären«) Notizliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "Adresse der hervorgehobenen (»primären«) Aufgabenliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Einheit für eine voreingestellte Erinnerung (»minutes«, »hours« oder »days«)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 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.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
 msgstr "Zeitzone des Systems verwenden"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "Die Zeitzone des Systems anstatt der in Evolution gewählten Zeitzone "
 "verwenden."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Vertical pane position"
 msgstr "Position der vertikalen Schiebeleiste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "Wochenanfang"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 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.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 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.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Soll beim Löschen von Terminen oder Aufgaben nachgefragt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Soll beim Säubern von Terminen oder Aufgaben nachgefragt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -3044,100 +2835,96 @@ 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.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 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.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 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.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr ""
-"Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
+msgstr "Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr ""
 "Soll in der Monatsansicht wochenweise geblättert werden anstatt monatsweise?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to set a default reminder for appointments."
 msgstr "Soll eine voreingestellte Erinnerung für Termine festgelegt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
-"Soll das UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
-"werden?"
+"Soll das UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 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.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 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.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 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.h:119
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Sollen Zeiten im 24-Stunden- und nicht im 12-Stunden-Format angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 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.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
-"Soll das Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
-"werden?"
+"Soll das Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr ""
 "Legt fest, ob die Wochennummern in der Tagesansicht und Arbeitswochenansicht "
 "angezeigt werden."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 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.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "Arbeitstage"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "Stunde, zu der der Arbeitstag endet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "Minute, zu der der Arbeitstag endet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "Stunde, zu der der Arbeitstag beginnt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "Minute, zu der der Arbeitstag beginnt"
 
@@ -3187,15 +2974,15 @@ msgid "Classification"
 msgstr "Einstufung"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
 #: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.ui.h:6
@@ -3217,8 +3004,8 @@ msgstr "Existieren nicht"
 msgid "Exist"
 msgstr "Existieren"
 
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
@@ -3231,29 +3018,26 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Öffentlich"
 
-#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/dialogs/event-editor.c:299
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../calendar/gui/tasktypes.xml.h:22 ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "Zusammenfassung"
 
@@ -3326,7 +3110,7 @@ msgstr "Benutzerdefinierter Alarmklang"
 msgid "Mes_sage:"
 msgstr "_Nachricht:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:77
 msgid "Options"
 msgstr "Optionen"
 
@@ -3373,11 +3157,12 @@ msgstr "Tag(e)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "Tage"
 
@@ -3385,19 +3170,20 @@ msgstr "Tage"
 msgid "end of appointment"
 msgstr "Ende des Termins"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "weitere Male alle"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "Stunde(n)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "Minute(n)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "Beginn des Termins"
 
@@ -3425,7 +3211,7 @@ msgstr "Keine"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Auswählen …"
 
@@ -3434,12 +3220,14 @@ msgid "Selected Calendars for Alarms"
 msgstr "Ausgewählte Kalender für die Alarme"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "Zeit und Datum:"
+#| msgid "Time and date:"
+msgid "Ti_me and date:"
+msgstr "_Zeit und Datum:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "Nur das Datum:"
+#| msgid "Date only:"
+msgid "_Date only:"
+msgstr "Nur das _Datum:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3471,12 +3259,11 @@ msgstr "30 Minuten"
 msgid "60 minutes"
 msgstr "60 Minuten"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "Alarme"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11 ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "Format von Datum/Zeit"
@@ -3502,20 +3289,20 @@ msgid "Display alarms in _notification area only"
 msgstr "Alarme nur im _Benachrichtigungsfeld anzeigen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Freitag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:54
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2675
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Allgemein"
 
@@ -3528,7 +3315,7 @@ msgid "Minutes"
 msgstr "Minuten"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Montag"
@@ -3541,183 +3328,194 @@ msgstr "Montag"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24 ../mail/mail-config.ui.h:81
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "_So"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Monatsansicht _wochenweise blättern"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Z_weite Zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Kalender für Alarmbenachrichtigung auswählen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "Eine _Erinnerung anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "Eine _Erinnerung anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "_Wochennummern im Datumsnavigator anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Wochenn_ummern in Tages- und Arbeitswochenansicht anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "Heute fällige _Aufgaben:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "D_o"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Aufgabenliste"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "Vorlage:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Uhrzeit"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "Zeit_zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "Zeitformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Zeitzone des S_ystems verwenden"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "W_oche beginnt am:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Work Week"
 msgstr "Arbeitswoche"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "Arbeitstage:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 Stunden"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 Stunden"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "Beim _Löschen von Objekten nachfragen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "Wochenenden in Monatsansicht _komprimieren"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "_Tag beginnt:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "_Fr"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "Erledigte Aufgaben _verbergen nach"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "_Mo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "_Überfällige Aufgaben:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "S_a"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 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.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "Zeit_unterteilungen:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "_Di"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "M_i"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "vor jedem Jahrestag/Geburtstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
@@ -3726,12 +3524,12 @@ msgid "Type:"
 msgstr "Art:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "A_rt:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:149
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3751,35 +3549,35 @@ msgstr ""
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Den Inhalt der Notizliste lokal zur Arbeit im Offline-Modus _kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "_Farbe:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Notizliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Kalendereigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "Neuer Kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "Aufgabenlisteneigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "Neue Aufgabenliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "Notizlisteneigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "Neue Notizliste"
 
@@ -3836,254 +3634,232 @@ msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " bis "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (Abgeschlossen "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "Abgeschlossen "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (Fällig am "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "Fällig am "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:237
 msgid "Could not save attachments"
 msgstr "Die Anlagen konnten nicht gespeichert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:505
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "Besprechung - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Zugewiesene Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "Notiz - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:643
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "Keine Zusammenfassung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "Originaleintrag behalten?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu schließen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1464 ../widgets/misc/e-focus-tracker.c:115
+#: ../widgets/misc/e-focus-tracker.c:550 ../widgets/misc/e-web-view.c:398
+#: ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1471 ../widgets/misc/e-focus-tracker.c:108
+#: ../widgets/misc/e-focus-tracker.c:545 ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1478 ../widgets/misc/e-focus-tracker.c:129
+#: ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Die Auswahl löschen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "Klicken Sie hier, um die verfügbare Hilfe anzuzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1513 ../widgets/misc/e-focus-tracker.c:122
+#: ../widgets/misc/e-focus-tracker.c:555 ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "Den Inhalt der Zwischenablage einfügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu speichern"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1583 ../widgets/misc/e-focus-tracker.c:136
+#: ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "E_instufung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1632
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Datei"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1037
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "Ein_fügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "_Optionen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1674 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "_Anlage …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
 msgstr "Klicken Sie hier, um eine Datei beizulegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "_Kategorien"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "Kategorien anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "Zeit_zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "Zeitzone anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "Ö_ffentlich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "Als öffentlich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "Als privat einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "Ver_traulich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "Als vertraulich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "_Positions-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "Feld für die Position angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "_UAwg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "UAwg-Feld angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "_Statusfeld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "Statusfeld anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "A_rt-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Feld für die Teilnehmerart angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "_Zuletzt geöffnet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:477
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "Speichern"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2958
 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:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:2988
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
@@ -4105,10 +3881,14 @@ msgstr ""
 "Soll dieses Objekt von allen anderen Postfächern der Empfänger ge_löscht "
 "werden?"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+#| msgid "P_ercent complete:"
+msgid "_Retract comment"
+msgstr "Kommentar zur_ückziehen"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
-msgstr ""
-"Das Ereignis konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
+msgstr "Das Ereignis konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
 #: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
@@ -4170,59 +3950,59 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Alarms"
 msgstr "_Alarme"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Click here to set or unset alarms for this event"
 msgstr "Klicken Sie hier, um Alarme für dieses Ereignis einzustellen"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Recurrence"
 msgstr "_Wiederholung"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Make this a recurring event"
 msgstr "Dies zu einem wiederkehrenden Ereignis machen"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:219
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "Versandoptionen"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:221
 #: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "Erweiterte Versandoptionen einfügen"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:229
 msgid "All _Day Event"
 msgstr "_Ganztägiges Ereignis"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:231
 msgid "Toggles whether to have All Day Event"
 msgstr "Festlegen, ob es ein ganztägiges Ereignis ist"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "Show Time as _Busy"
 msgstr "Zeit als b_eschäftigt anzeigen"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Toggles whether to show time as busy"
 msgstr "Festlegen, ob die Zeit als beschäftigt angezeigt wird"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:248
 msgid "_Free/Busy"
 msgstr "_Verfügbarkeit"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "Query free / busy information for the attendees"
 msgstr "Verfügbarkeitsinformationen der Teilnehmer abfragen"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "_Termin"
 
@@ -4239,7 +4019,7 @@ msgstr ""
 "Organisator sind"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "Dieses Ereignis enthält Alarme"
 
@@ -4266,7 +4046,7 @@ msgid "Event with no end date"
 msgstr "Ereignis ohne Enddatum"
 
 #: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/memo-page.c:657
 #: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
@@ -4284,13 +4064,13 @@ msgid "End time is wrong"
 msgstr "Die Endzeit ist falsch"
 
 #: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/memo-page.c:698
 #: ../calendar/gui/dialogs/task-page.c:921
 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:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/memo-page.c:704
 #: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
@@ -4300,7 +4080,7 @@ msgstr "Es ist ein Organisator erforderlich."
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Der Kalender »%s« konnte nicht geöffnet werden."
@@ -4311,40 +4091,40 @@ msgstr "Der Kalender »%s« konnte nicht geöffnet werden."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:917
 #: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Sie handeln im Namen von %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, 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:2947
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, 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:2953
+#: ../calendar/gui/dialogs/event-page.c:2949
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d Minute vor dem Termin"
 msgstr[1] "%d Minuten vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "Anpassen"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2964
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Keine"
@@ -4362,7 +4142,9 @@ msgid "15 minutes before appointment"
 msgstr "15 Minuten vor dem Termin"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
 msgstr "Teil_nehmer …"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
@@ -4378,28 +4160,27 @@ msgstr "Benutzerdefinierter Alarm:"
 msgid "Event Description"
 msgstr "Ereignisbeschreibung"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "Zusa_mmenfassung:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "A_larm"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Beschreibung:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "O_rt:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#| msgid "Summary:"
+msgid "_Summary:"
+msgstr "Zu_sammenfassung:"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "_Zeit:"
@@ -4414,7 +4195,7 @@ msgstr "für"
 msgid "until"
 msgstr "bis"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2576
 msgid "Memo"
 msgstr "Notiz"
 
@@ -4430,14 +4211,14 @@ msgstr ""
 "Die Notiz kann nicht vollständig bearbeitet werden, weil Sie nicht der "
 "Organisator sind"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:878
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Notizen in »%s« konnten nicht geöffnet werden."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
+#: ../calendar/gui/dialogs/memo-page.c:1045 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "An"
@@ -4447,6 +4228,11 @@ msgstr "An"
 msgid "Sta_rt date:"
 msgstr "_Anfangsdatum:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "Zusa_mmenfassung:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "A_n:"
@@ -4457,65 +4243,65 @@ msgstr "A_n:"
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einem wiederkehrenden Ereignis vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 "Sie delegieren ein wiederkehrendes Ereignis. Was möchten Sie delegieren?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einer wiederkehrenden Aufgabe vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einer wiederkehrenden Notiz vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Nur diese Instanz"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Diese und frühere Instanzen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Diese und zukünftige Instanzen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Alle Instanzen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Dieser Termin enthält Wiederholungen, die Evolution nicht bearbeiten kann."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Das Wiederholungsdatum ist ungültig"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "Die Zeit der letzten Wiederholung lag vor dem Start des Termins"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "am"
 
@@ -4523,7 +4309,7 @@ msgstr "am"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "erster"
 
@@ -4532,7 +4318,7 @@ msgstr "erster"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "zweiter"
 
@@ -4540,7 +4326,7 @@ msgstr "zweiter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "dritter"
 
@@ -4548,7 +4334,7 @@ msgstr "dritter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "vierter"
 
@@ -4556,7 +4342,7 @@ msgstr "vierter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "fünfter"
 
@@ -4564,13 +4350,13 @@ msgstr "fünfter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "letzter"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Anderes Datum"
 
@@ -4578,7 +4364,7 @@ msgstr "Anderes Datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1. bis 10."
 
@@ -4586,7 +4372,7 @@ msgstr "1. bis 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11. bis 20."
 
@@ -4594,46 +4380,46 @@ msgstr "11. bis 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "21. bis 31."
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "Tag"
 
 #. 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:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "am"
 
 # oder im Falle von Terminen: Wiederholungen ??
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "Wiederholungen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "Ausnahme hinzufügen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "Keine zu verändernde Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "Ausnahme verändern"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "Keine zu löschende Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "Datum/Zeit"
 
@@ -4645,7 +4431,7 @@ msgstr "Alle"
 msgid "Exceptions"
 msgstr "Ausnahmen"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:85
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -4669,11 +4455,11 @@ msgstr "Woche(n)"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "Meine Alarme zusammen mit diesem Termin verschicken"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "_Nur neue Teilnehmer benachrichtigen"
 
@@ -4682,66 +4468,65 @@ msgstr "_Nur neue Teilnehmer benachrichtigen"
 msgid "Completed date is wrong"
 msgstr "Das Fertigstellungsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "Website"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715 ../calendar/gui/e-itip-control.c:931
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-task-table.c:213 ../calendar/gui/e-task-table.c:228
+#: ../calendar/gui/e-task-table.c:586 ../calendar/gui/print.c:2656
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Hoch"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2653
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1121 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Niedrig"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1122
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "Normal"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2650 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Nicht begonnen"
 
@@ -4757,7 +4542,7 @@ msgstr "Stat_us:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1759
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4767,7 +4552,7 @@ msgstr "Status"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "Nicht festgelegt"
@@ -4777,7 +4562,7 @@ msgid "_Date completed:"
 msgstr "A_bgeschlossen am:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "_Priorität:"
 
@@ -4799,19 +4584,19 @@ msgstr ""
 msgid "_Send Options"
 msgstr "_Versandoptionen"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:325
 msgid "Task Details"
 msgstr "Aufgabendetails"
 
 #: ../calendar/gui/dialogs/task-page.c:336
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
-"Die Aufgabe kann nicht bearbeitet werden, weil die gewählte Aufgabenliste "
-"nur gelesen werden darf"
+"Die Aufgabe kann nicht bearbeitet werden, weil die gewählte Aufgabenliste nur "
+"gelesen werden darf"
 
 #: ../calendar/gui/dialogs/task-page.c:340
 msgid "Task cannot be fully edited, because you are not the organizer"
@@ -4833,10 +4618,6 @@ 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.ui.h:1
-msgid "Atte_ndees..."
-msgstr "Teil_nehmer …"
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Ka_tegorien …"
@@ -4925,46 +4706,46 @@ msgstr "%s um %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:191 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:197
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:258
 msgid "Start Date:"
 msgstr "Anfangsdatum:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "Fällig am:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "Priorität:"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:35
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:367
 msgid "Web Page:"
 msgstr "Website:"
 
@@ -4975,32 +4756,32 @@ msgstr "Website:"
 msgid "Created"
 msgstr "Angelegt"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "Enddatum"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "Zuletzt geändert"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "Frei"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5011,63 +4792,49 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nein"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "Bevorzugte Anwendung"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Shell-Einstellungen"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Einstellungen für die gesamte Anwendung"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet …"
@@ -5094,8 +4861,7 @@ msgid "Due date"
 msgstr "Fällig am"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/tasktypes.xml.h:20 ../plugins/save-calendar/csv-format.c:374
 msgid "Priority"
 msgstr "Priorität"
 
@@ -5111,90 +4877,88 @@ msgstr "Anfangsdatum"
 msgid "Type"
 msgstr "Art"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:404
 msgid "Cut selected events to the clipboard"
 msgstr "Die gewählten Ereignisse in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:410
 msgid "Copy selected events to the clipboard"
 msgstr "Die gewählten Ereignisse in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:416
 msgid "Paste events from the clipboard"
 msgstr "Die in der Zwischenablage befindlichen Ereignisse einfügen"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Delete selected events"
 msgstr "Die gewählten Ereignisse löschen"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2330
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2336
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1708
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1709
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1710
 msgid "Needs action"
 msgstr "Erfordert Maßnahme"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1856 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/print.c:2608
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1903
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
@@ -5237,8 +5001,8 @@ msgstr "Zweite Zeitzone anzeigen"
 #. 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:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:865 ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
@@ -5248,10 +5012,10 @@ msgstr "%A, %d. %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/e-day-view-top-item.c:869 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:913
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -5260,31 +5024,36 @@ msgstr "%a, %d. %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../calendar/gui/e-day-view-top-item.c:873 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:949
 msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "PM"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2609
 #, c-format
 msgid "Week %d"
 msgstr "Woche %d"
 
+#: ../calendar/gui/e-itip-control.c:761
+#| msgid "Recurring"
+msgid "Recurring:"
+msgstr "Wiederkehrend:"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (Komplexe Wiederholung)."
@@ -5368,7 +5137,7 @@ msgstr "Ende"
 msgid "Due"
 msgstr "Fällig"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "iCalendar-Informationen"
 
@@ -5377,316 +5146,335 @@ msgstr "iCalendar-Informationen"
 msgid "iCalendar Error"
 msgstr "iCalendar-Fehler"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
+#| msgid ""
+#| "<br> Please review the following information, and then select an action "
+#| "from the menu below."
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+"Please review the following information, and then select an action from the "
+"menu below."
 msgstr ""
-"<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
-"wählen Sie dann eine Aktion aus untenstehendem Menü."
+"Bitte sehen Sie sich die folgenden Informationen noch einmal an und wählen "
+"Sie dann eine Aktion aus untenstehendem Menü."
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2317
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2333
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
+"The meeting has been canceled, however it could not be found in your calendars"
 msgstr ""
 "Die Besprechung wurde abgesagt, konnte jedoch nicht in Ihren Kalendern "
 "gefunden werden"
 
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "Die Aufgabe wurde abgesagt, konnte jedoch nicht in Ihren Aufgabenlisten "
 "gefunden werden"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> hat Besprechungsinformationen veröffentlicht."
+#| msgid "<b>%s</b> has published meeting information."
+msgid "%s has published meeting information."
+msgstr "%s hat Besprechungsinformationen veröffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> wünscht die Teilnahme von %s an einer Besprechung."
+#| msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s wünscht die Teilnahme von %s an einer Besprechung."
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> wünscht Ihre Teilnahme an einer Besprechung."
+#| msgid "<b>%s</b> requests your presence at a meeting."
+msgid "%s requests your presence at a meeting."
+msgstr "%s wünscht Ihre Teilnahme an einer Besprechung."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr ""
-"<b>%s</b> wünscht zu einer existierenden Besprechung hinzugefügt zu werden."
+#| msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s wünscht zu einer existierenden Besprechung hinzugefügt zu werden."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> wünscht aktuelle Besprechungsinformationen zu erhalten."
+#| msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s wünscht aktuelle Besprechungsinformationen zu erhalten."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
+#| msgid "<b>%s</b> has replied to a meeting request."
+msgid "%s has replied to a meeting request."
+msgstr "%s hat auf eine Besprechungsanfrage geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> hat eine Besprechung abgesagt."
+#| msgid "<b>%s</b> has canceled a meeting."
+msgid "%s has canceled a meeting."
+msgstr "%s hat eine Besprechung abgesagt."
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "Besprechungsabsage"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> hat eine unverständliche Nachricht verschickt."
+#| msgid "<b>%s</b> has sent an unintelligible message."
+msgid "%s has sent an unintelligible message."
+msgstr "%s hat eine unverständliche Nachricht verschickt."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> hat Aufgabeninformationen veröffentlicht."
+#| msgid "<b>%s</b> has published task information."
+msgid "%s has published task information."
+msgstr "%s hat Aufgabeninformationen veröffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> wünscht, dass %s eine Aufgabe auszuführt."
+#| msgid "<b>%s</b> requests %s to perform a task."
+msgid "%s requests %s to perform a task."
+msgstr "%s wünscht, dass %s eine Aufgabe ausführt."
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> wünscht, dass Sie eine Aufgabe ausführen."
+#| msgid "<b>%s</b> requests you perform a task."
+msgid "%s requests you perform a task."
+msgstr "%s wünscht, dass Sie eine Aufgabe ausführen."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzugefügt zu werden."
+#| msgid "<b>%s</b> wishes to be added to an existing task."
+msgid "%s wishes to be added to an existing task."
+msgstr "%s wünscht zu einer bestehenden Aufgabe hinzugefügt zu werden."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> wünscht aktuelle Aufgabeninformationen zu erhalten."
+#| msgid "<b>%s</b> wishes to receive the latest task information."
+msgid "%s wishes to receive the latest task information."
+msgstr "%s wünscht aktuelle Aufgabeninformationen zu erhalten."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
+#| msgid "<b>%s</b> has replied to a task assignment."
+msgid "%s has replied to a task assignment."
+msgstr "%s hat auf eine Aufgabenzuweisung geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> hat eine Aufgabe abgesagt."
+#| msgid "<b>%s</b> has canceled a task."
+msgid "%s has canceled a task."
+msgstr "%s hat eine Aufgabe abgesagt."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "Aufgabenabsage"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> hat Verfügbarkeitsinformationen veröffentlicht."
+#| msgid "<b>%s</b> has published free/busy information."
+msgid "%s has published free/busy information."
+msgstr "%s hat Verfügbarkeitsinformationen veröffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> fordert Ihre Verfügbarkeitsinformationen an."
+#| msgid "<b>%s</b> requests your free/busy information."
+msgid "%s requests your free/busy information."
+msgstr "%s fordert Ihre Verfügbarkeitsinformationen an."
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "Verfügbarkeitsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> hat auf eine Verfugbarkeitsanfrage geantwortet."
+#| msgid "<b>%s</b> has replied to a free/busy request."
+msgid "%s has replied to a free/busy request."
+msgstr "%s hat auf eine Verfugbarkeitsanfrage geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "Verfügbarkeitsantwort"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verfügbarkeitsmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enthält ausschließlich nicht unterstützte Anfragen."
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Die Anlage enthält keine gültige Kalendernachricht"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalendereinträge"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt ist ungültig und konnte nicht aktualisiert werden\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
-"Diese Antwort stammt von keinem voraussichtlichen Teilnehmer.  Als "
-"Teilnehmer hinzufügen?"
+"Diese Antwort stammt von keinem voraussichtlichen Teilnehmer.  Als Teilnehmer "
+"hinzufügen?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Teilnahmestatus konnte auf Grund eines ungültigen Status nicht aktualisiert "
 "werden!\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "Teilnahmestatus aktualisiert\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../calendar/gui/e-itip-control.c:2084
+#: ../plugins/itip-formatter/itip-formatter.c:1420
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
 "existiert"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "Eine Aktion wählen:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-itip-control.c:2302
 #: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Annehmen"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen übermitteln"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:970
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -5735,56 +5523,56 @@ msgid "Resources"
 msgstr "Ressourcen"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Raum"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Vorsitzender"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
@@ -5793,14 +5581,14 @@ msgstr "Erfordert Maßnahme"
 msgid "Attendee                          "
 msgstr "Teilnehmer"
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
@@ -5809,7 +5597,7 @@ msgstr "%a, %d. %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
@@ -5819,67 +5607,63 @@ msgstr "%a, %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "Nicht im Büro"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "Keine Informationen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "_Teilnehmer …"
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "_Einstellungen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "Nur _Arbeitszeit anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "Ver_kleinert anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "_Auto-Auswählen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_Alle Personen und Ressourcen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "Alle _Personen und eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "_Benötigte Personen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "Benötigte Personen und _eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "_Anfangszeit:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "_Endzeit:"
 
@@ -5908,44 +5692,46 @@ msgid "Member"
 msgstr "Mitglied"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../modules/calendar/e-cal-shell-content.c:461
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "Notizen"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
 msgid "* No Summary *"
 msgstr "* Keine Zusammenfassung *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
 msgid "Start: "
 msgstr "Anfang:"
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
 msgid "Due: "
 msgstr "Fälligkeit:"
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:709
 msgid "Cut selected memos to the clipboard"
 msgstr "Die gewählten Notizen in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:715
 msgid "Copy selected memos to the clipboard"
 msgstr "Die gewählten Notizen in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:721
 msgid "Paste memos from the clipboard"
 msgstr "Notiz aus der Zwischenablage einfügen"
 
-#: ../calendar/gui/e-memo-table.c:725
+#: ../calendar/gui/e-memo-table.c:727
 #: ../modules/calendar/e-memo-shell-view-actions.c:556
 msgid "Delete selected memos"
 msgstr "Die gewählten Notizen löschen"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Select all visible memos"
 msgstr "Alle sichtbaren Notizen wählen"
 
@@ -5953,93 +5739,59 @@ msgstr "Alle sichtbaren Notizen wählen"
 msgid "Click to add a memo"
 msgstr "Klicken Sie hier, um eine Notiz hinzuzufügen"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+#| msgid "%d %b"
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../modules/calendar/e-cal-shell-content.c:423
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:932
 msgid "Cut selected tasks to the clipboard"
 msgstr "Die gewählten Aufgaben in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:938
 msgid "Copy selected tasks to the clipboard"
 msgstr "Die gewählten Aufgaben in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:944
 msgid "Paste tasks from the clipboard"
 msgstr "Aufgaben aus der Zwischenablage einfügen"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "Delete selected tasks"
 msgstr "Die gewählten Aufgaben löschen"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:956
 msgid "Select all visible tasks"
 msgstr "Alle sichtbaren Aufgaben wählen"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 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:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d. %B"
 
@@ -6068,7 +5820,7 @@ msgstr "Kalender-Ereignis: Keine Zusammenfassung verfügbar."
 msgid "calendar view event"
 msgstr "Kalenderansicht Ereignis"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:541
 msgid "Grab Focus"
 msgstr "Erhält Fokus"
 
@@ -6097,7 +5849,7 @@ 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"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -6106,14 +5858,14 @@ msgstr[1] "Sie enthält %d Ereignisse."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 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."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Arbeitswochenansicht: %s. %s"
@@ -6121,16 +5873,16 @@ 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."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Tagesansicht: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "Kalenderansicht für eine Arbeitswoche"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "Kalenderansicht für einen oder mehrere Tage"
 
@@ -6141,16 +5893,16 @@ msgid "Gnome Calendar"
 msgstr "GNOME Calendar"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:909
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %B %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
@@ -6158,10 +5910,10 @@ msgstr "%a, %d. %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -6173,25 +5925,25 @@ msgstr "Sprungknopf"
 msgid "Click here, you can find more events."
 msgstr "Klicken Sie hier, um weitere Ereignisse zu sehen."
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Monatsansicht: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Wochenansicht: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:188
 msgid "calendar view for a month"
 msgstr "Kalenderansicht für einen Monat"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:190
 msgid "calendar view for one or more weeks"
 msgstr "Kalenderansicht für eine oder mehrere Wochen"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2242
 msgid "Purging"
 msgstr "Säuberungsvorgang"
 
@@ -6244,39 +5996,40 @@ msgid "Select Date"
 msgstr "Datum wählen"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "September"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "Select _Today"
+msgstr "_Heute wählen"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_Heute wählen"
+msgid "September"
+msgstr "September"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "Es muss ein Organisator festgelegt werden."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "Es ist mindestens ein Teilnehmer erforderlich"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Ereignisinformationen"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Aufgabeninformationen"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Notiz-Informationen"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "Kalenderinformationen"
 
@@ -6284,7 +6037,7 @@ msgstr "Kalenderinformationen"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Angenommen"
@@ -6293,7 +6046,7 @@ msgstr "Angenommen"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
@@ -6305,7 +6058,7 @@ msgstr "Vorläufig angenommen"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Abgelehnt"
@@ -6314,7 +6067,7 @@ msgstr "Abgelehnt"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegiert"
@@ -6322,7 +6075,7 @@ msgstr "Delegiert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Aktualisiert"
@@ -6330,7 +6083,7 @@ msgstr "Aktualisiert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Abgesagt"
@@ -6338,7 +6091,7 @@ msgstr "Abgesagt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Aktualisieren"
@@ -6347,31 +6100,31 @@ msgstr "Aktualisieren"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Gegenvorschlag"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Verfügbarkeitsinformationen (%s bis %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "iCalendar-Informationen"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
-"Eine Ressource kann nicht belegt werden, das neue Ereignis überschneidet "
-"sich mit anderen."
+"Eine Ressource kann nicht belegt werden, das neue Ereignis überschneidet sich "
+"mit anderen."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "Eine Ressource kann nicht belegt werden, Fehler:"
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
@@ -6527,49 +6280,74 @@ msgstr "Fr"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2564
+#. Translators: This is part of "START to END" text, where START and END are date/times
+#: ../calendar/gui/print.c:2419
+msgid " to "
+msgstr " bis "
+
+#. Translators: This is part of "START to END (Completed COMPLETED)", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2425
+msgid " (Completed "
+msgstr " (Abgeschlossen "
+
+#. Translators: This is part of "Completed COMPLETED", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2428
+msgid "Completed "
+msgstr "Abgeschlossen "
+
+#. Translators: This is part of "START (Due DUE)", where START and DUE are dates/times
+#: ../calendar/gui/print.c:2435
+msgid " (Due "
+msgstr " (Fällig am "
+
+#. Translators: This is part of "Due DUE", where DUE is a date/time due the event should be finished
+#: ../calendar/gui/print.c:2438
+msgid "Due "
+msgstr "Fällig am "
+
+#: ../calendar/gui/print.c:2572
 msgid "Appointment"
 msgstr "Termin"
 
-#: ../calendar/gui/print.c:2566
+#: ../calendar/gui/print.c:2574 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2599
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2623
 msgid "Attendees: "
 msgstr "Teilnehmer: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2666
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2681
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2699
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2710
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2723
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2734
 msgid "Contacts: "
 msgstr "Kontakte: "
 
@@ -6600,7 +6378,7 @@ msgstr "Termine und Besprechungen"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1832
 msgid "Opening calendar"
 msgstr "Kalender wird geöffnet"
 
@@ -8181,159 +7959,158 @@ msgstr "Pazifik/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifik/Yap"
 
-#: ../composer/e-composer-actions.c:79
+#: ../composer/e-composer-actions.c:81
 msgid "Untitled Message"
 msgstr "Namenlose Nachricht"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "Speichern unter …"
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:283 ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:288
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "Die momentan geöffnete Datei schließen"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "_Drucken …"
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "Die momentan geöffnete Datei speichern"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "Speichern _unter …"
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "Die momentan geöffnete Datei unter einem anderem Namen speichern"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "Als _Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "Als Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "A_bschicken"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "Diese Nachricht verschicken"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "Neue _Nachricht"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "Neues Nachrichtenfenster öffnen"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "Zeichen_kodierung"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:363
 msgid "PGP _Encrypt"
 msgstr "Mit P_GP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:365
 msgid "Encrypt this message with PGP"
 msgstr "Diese Nachricht mit PGP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:371
 msgid "PGP _Sign"
 msgstr "Mit _PGP signieren"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:373
 msgid "Sign this message with your PGP key"
 msgstr "Diese Nachricht mit PGP signieren"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "Nachricht _priorisieren"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "Die Priorität der Nachricht auf hoch setzen"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "_Lesebestätigung anfordern"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:389
 msgid "Get delivery notification when your message is read"
 msgstr ""
 "Eine Zustellungsbestätigung erhalten, sobald Ihre Nachricht gelesen wurde"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "Mit S/_MIME verschlüsseln"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:397
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 "Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "Mit _S/MIME signieren"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:405
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:411
 msgid "_Bcc Field"
 msgstr "_Blindkopie-Feld"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:413
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Blindkopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "_Kopie-Feld"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "Kopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:427
 msgid "_From Field"
 msgstr "_Von-Feld"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:429
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Von-Wähler anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "An_twort-an-Feld"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Antwort-an-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:480
 msgid "Save Draft"
 msgstr "Entwurf speichern"
 
@@ -8345,16 +8122,16 @@ msgstr "Anzeigen"
 msgid "Hide"
 msgstr "Verbergen"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Geben Sie die Empfänger der Nachricht ein"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8362,58 +8139,57 @@ msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie erhalten, jedoch nicht in der "
 "Empfängerliste auftauchen sollen"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "V_on:"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
+#: ../composer/e-composer-header-table.c:958 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:937 ../mail/e-mail-tag-editor.c:323
+#: ../mail/message-list.etspec.h:7 ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "Von"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "Antwo_rt an:"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "A_n:"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "_Kopie an:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "CC"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "Blindko_pie an:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "_Veröffentlichen in:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "Be_treff:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
 
@@ -8438,19 +8214,19 @@ msgid "Save draft"
 msgstr "Entwurf speichern"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:188 ../mail/em-utils.c:152
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "Diese _Meldung nicht mehr anzeigen."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:988
 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:990
+#: ../composer/e-msg-composer.c:995
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8458,23 +8234,24 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
 "Verschlüsselungszertifikat für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1386
 msgid "Unable to reconstruct message from autosave file"
 msgstr ""
 "Nachricht konnte nicht aus der automatisch gespeicherten Datei "
 "wiederhergestellt werden"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1452 ../composer/e-msg-composer.c:1648
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../composer/e-msg-composer.c:3310
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#: ../composer/e-msg-composer.c:3314
+#| msgid ""
+#| "<b>(The composer contains a non-text message body, which cannot be edited.)"
+#| "</b>"
+msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
-"<b>(Der Editor enthält einen nicht-Text Nachrichtenrumpf, der nicht "
-"bearbeitet werden kann.)</b>"
+"Der Editor enthält einen nicht-Text-Nachrichtenrumpf, der nicht bearbeitet "
+"werden kann."
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -8482,8 +8259,8 @@ msgid ""
 "the mail to be sent without those pending attachments "
 msgstr ""
 "Einige Anlagen werden zurzeit noch heruntergeladen. Das Speichern dieser "
-"Nachricht wird zur Folge haben, dass die Nachricht ohne die noch "
-"ausstehenden Anlagen gespeichert wird."
+"Nachricht wird zur Folge haben, dass die Nachricht ohne die noch ausstehenden "
+"Anlagen gespeichert wird."
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
@@ -8491,8 +8268,7 @@ msgstr "Es wurden alle Konten entfernt."
 
 #: ../composer/mail-composer.error.xml.h:3
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr ""
 "Sind Sie sicher, dass Sie die soeben verfasste Nachricht namens »{0}« "
 "verwerfen wollen?"
@@ -8508,8 +8284,8 @@ msgstr "Grund: »{1}«."
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
+"Closing this composer window will discard the message permanently, unless you "
+"choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 "Wenn Sie dieses Editorfenster schließen, wird die Nachricht dauerhaft "
@@ -8561,10 +8337,11 @@ msgstr ""
 "können Sie dort mit dem Verfassen fortfahren, wo Sie zuletzt aufgehört haben."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+#| msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
-"Die Datei »{0}« ist keine gewöhnliche Datei und kann daher keiner Nachricht "
-"beigelegt werden."
+"Die Datei »{0}« ist keine gewöhnliche Datei und kann daher nicht in einer "
+"Nachricht verschickt werden."
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
@@ -8583,7 +8360,8 @@ msgid "Unable to activate the address selector control."
 msgstr "Bedienelement zur Adresswahl konnte nicht aktiviert werden."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
+#| msgid "You cannot attach the file `{0}' to this message."
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "Sie können die Datei »{0}« dieser Nachricht nicht beilegen."
 
 #: ../composer/mail-composer.error.xml.h:22
@@ -8606,34 +8384,33 @@ msgstr "_Wiederherstellen"
 msgid "_Save Draft"
 msgstr "Entwurf _speichern"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:199
 msgid "Run Anjal in a window"
 msgstr "Anjal in einem Fenster ausführen"
 
-#: ../capplet/anjal-settings-main.c:203
+#: ../capplet/anjal-settings-main.c:200
+#| msgid "Mark as _default memo list"
 msgid "Make Anjal the default email client"
-msgstr "Anjal als E-Mail-Anwendung voreinstellen"
+msgstr "Anjal als vorgegebenes E-Mail-Programm festlegen"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:207
 msgid "ID of the socket to embed in"
-msgstr "Kennung des Sockets zum Einbetten"
+msgstr "Kennung des Sockets zur Einbettung"
 
-#: ../capplet/anjal-settings-main.c:211
+#: ../capplet/anjal-settings-main.c:208
+#| msgid "sort"
 msgid "socket"
-msgstr "Socket"
+msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:221
+#| msgid "Default Mail Client"
 msgid "Anjal email client"
-msgstr "Anjal E-Mail-Anwendung"
-
-#: ../capplet/settings/mail-view.c:244
-msgid "New Tab"
-msgstr "Neuer Reiter"
+msgstr "Anjal E-Mail-Programm"
 
 #: ../capplet/settings/mail-account-view.c:56
 msgid "Please enter your full name."
-msgstr "Bitte geben Sie Ihren vollen Namen ein."
+msgstr "Bitte geben Sie Ihre vollständigen Namen ein."
 
 #: ../capplet/settings/mail-account-view.c:57
 msgid "Please enter your email address."
@@ -8641,228 +8418,249 @@ msgstr "Bitte geben Sie Ihre E-Mail-Adresse ein."
 
 #: ../capplet/settings/mail-account-view.c:58
 msgid "The email address you have entered is invalid."
-msgstr "Die eingegebene E-Mail-Adresse ist ungültig."
+msgstr "Die von Ihnen eingegebene E-Mail-Adresse ist ungültig."
 
-#: ../capplet/settings/mail-account-view.c:224
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Persönliche Angaben:</span>"
+#: ../capplet/settings/mail-account-view.c:182
+#| msgid "Personal"
+msgid "Personal details:"
+msgstr "Persönliche Angaben:"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:189
+#| msgid "_Name:"
 msgid "Name:"
 msgstr "Name:"
 
-#: ../capplet/settings/mail-account-view.c:238
+#: ../capplet/settings/mail-account-view.c:198
+#| msgid "Email address"
 msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: ../capplet/settings/mail-account-view.c:248
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Empfangsangaben:</span>"
+#: ../capplet/settings/mail-account-view.c:208
+#| msgid "Receiving Email"
+msgid "Receiving details:"
+msgstr "Empfangen von E-Mails:"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
+#: ../capplet/settings/mail-account-view.c:215
+#: ../capplet/settings/mail-account-view.c:265
+#| msgid "Server _Type:"
 msgid "Server type:"
-msgstr "Server-Typ:"
+msgstr "Servertyp:"
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
+#: ../capplet/settings/mail-account-view.c:224
+#: ../capplet/settings/mail-account-view.c:274
+#| msgid "Server Message:"
 msgid "Server address:"
-msgstr "Server-Adresse:"
+msgstr "Serveradresse:"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:233
+#: ../capplet/settings/mail-account-view.c:283
+#| msgid "Us_ername:"
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:292
+#| msgid "No encryption"
 msgid "Use encryption:"
-msgstr "Verschlüsselung verwenden:"
+msgstr "Verschlüsselung benutzen:"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:247
+#: ../capplet/settings/mail-account-view.c:297
+#| msgid "Never"
 msgid "never"
 msgstr "Nie"
 
-#: ../capplet/settings/mail-account-view.c:298
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Versandangaben:</span>"
+#: ../capplet/settings/mail-account-view.c:258
+#| msgid "Sending Mail"
+msgid "Sending details:"
+msgstr "Verschicken von E-Mails:"
 
-#: ../capplet/settings/mail-account-view.c:355
+#: ../capplet/settings/mail-account-view.c:316
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
-"address and password in below and we'll try and work out all the settings. "
-"If we can't do it automatically you'll need your server details as well."
+"address and password in below and we'll try and work out all the settings. If "
+"we can't do it automatically you'll need your server details as well."
 msgstr ""
-"Zur Verwendung der E-Mail-Anwendung müssen Sie ein Konto einrichten. Geben "
-"Sie Ihre E-Mail-Adresse und Ihr Passwort unten ein, und der Rest sollte für "
-"Sie erledigt werden. Falls es nicht automatisch gemacht werden kann, müssen "
-"Sie die Angaben zum E-Mail-Server bereit halten."
+"Um die E-Mail-Anwendung nutzen zu können, müssen Sie ein Konto einrichten. "
+"Geben Sie Ihre E-Mail-Adresse und Ihr Passwort unten ein. Es wird dann "
+"versucht, die entsprechenden Einstellungen automatisch vorzunehmen. Falls "
+"dies nicht möglich sein sollte, werden Sie Ihre Servereinstellungen benötigen."
 
-#: ../capplet/settings/mail-account-view.c:357
+#: ../capplet/settings/mail-account-view.c:318
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
 msgstr ""
-"Verzeihung, die Einstellungen zum Abrufen von E-Mails können nicht "
-"automatisch ermittelt werden. Bitte geben Sie sie unten ein. Es wurde "
-"bereits versucht, einige Angaben zu ermitteln. Eventuell müssen Sie diese "
-"korrigieren."
+"Leider können die Einstellungen zum Empfangen Ihrer Nachrichten nicht "
+"automatisch ermittelt werden. Bitte geben Sie diese nachstehend ein. Es wird "
+"versucht, zunächst einige der von Ihnen gerade eingegebenen Werten zu "
+"verwenden, doch Sie werden wahrscheinlich Änderungen vornehmen müssen."
 
-#: ../capplet/settings/mail-account-view.c:359
+#: ../capplet/settings/mail-account-view.c:320
+#| msgid "You may only configure a single Exchange account."
 msgid "You can specify more options to configure the account."
-msgstr "Sie können weitere Optionen für das Konto konfigurieren."
+msgstr "Sie dürfen bei der Konfiguration Ihres Kontos weitere Optionen angeben."
 
-#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:322
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
 msgstr ""
-"Nun werden die Einstellungen zum Verschicken benötigt. Es wurde bereits "
-"versucht, einige Angaben zu ermitteln. Eventuell müssen Sie diese "
-"korrigieren."
+"Nun werden Ihre Einstellungen zum Verschicken von Nachrichten benötigt. Es "
+"wird versucht, einige Einstellungen bereits vorauszuwählen, jedoch sollten "
+"Sie diese sicherheitshalber überprüfen."
 
-#: ../capplet/settings/mail-account-view.c:362
+#: ../capplet/settings/mail-account-view.c:323
 msgid "You can specify your default settings for your account."
-msgstr "Sie können die Voreinstellungen für Ihr Konto angeben."
+msgstr "Sie können Ihre Vorgabeeinstellungen für Ihr Konto festlegen."
 
-#: ../capplet/settings/mail-account-view.c:363
+#: ../capplet/settings/mail-account-view.c:324
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
 msgstr ""
-"Bitte überprüfen Sie die Angaben, bevor versucht wird, sich mit dem Server "
-"zu verbinden und E-Mails abzurufen."
+"Nun ist Zeit, alles zu überprüfen, bevor versucht wird, eine Verbindung zum "
+"Server herzustellen und Ihre Nachrichten abzurufen."
 
-#: ../capplet/settings/mail-account-view.c:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:339 ../mail/em-account-editor.c:2059
+#: ../mail/em-account-editor.c:2191 ../mail/mail-config.ui.h:59
 msgid "Identity"
 msgstr "Identität"
 
-#: ../capplet/settings/mail-account-view.c:378
+#: ../capplet/settings/mail-account-view.c:339
+#| msgid "Receiving Email"
 msgid "Next - Receiving mail"
-msgstr "Vor - Abrufen von E-Mails"
+msgstr "Weiter - Abrufen von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
+#| msgid "Receiving Email"
 msgid "Receiving mail"
-msgstr "Empfangen von E-Mails"
+msgstr "Abrufen von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:340
+#: ../capplet/settings/mail-account-view.c:341
+#| msgid "Sending Email"
 msgid "Next - Sending mail"
-msgstr "Vor - Verschicken von E-Mails"
+msgstr "Weiter - Verschicken von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
+#| msgid "Identity"
 msgid "Back - Identity"
 msgstr "Zurück - Identität"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
+#| msgid "Receiving Options"
 msgid "Next - Receiving options"
-msgstr "Vor - Empfangsoptionen"
+msgstr "Weiter - Empfangsoptionen"
 
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:341
+#| msgid "Receiving Options"
 msgid "Receiving options"
 msgstr "Empfangsoptionen"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:341
+#: ../capplet/settings/mail-account-view.c:343
+#| msgid "Receiving Email"
 msgid "Back - Receiving mail"
 msgstr "Zurück - Abrufen von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
+#| msgid "Sending Email"
 msgid "Sending mail"
-msgstr "Verschicken von E-Mails"
+msgstr "Abrufen von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:343
+#: ../capplet/settings/mail-account-view.c:344
+#| msgid "Delete account?"
 msgid "Next - Review account"
-msgstr "Vor - Konto überprüfen"
+msgstr "Weiter - Konto überprüfen"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
+#| msgid "Defaults"
 msgid "Next - Defaults"
-msgstr "Vor - Vorgaben"
+msgstr "Weiter - Vorgaben"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
+#| msgid "Receiving Options"
 msgid "Back - Receiving options"
 msgstr "Zurück - Empfangsoptionen"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:344 ../mail/em-account-editor.c:2770
+#: ../mail/mail-config.ui.h:32
 msgid "Defaults"
 msgstr "Vorgaben"
 
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:344
+#| msgid "Sending Email"
 msgid "Back - Sending mail"
 msgstr "Zurück - Verschicken von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
+#| msgid "Delete account?"
 msgid "Review account"
 msgstr "Konto überprüfen"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
+#| msgid "Fiji"
 msgid "Finish"
 msgstr "Beenden"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
+#| msgid "Ascending"
 msgid "Back - Sending"
-msgstr "Zurück - Verschicken"
+msgstr "Zurück - Senden"
 
-#: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
+#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-settings-view.c:267
+#| msgid "Close"
 msgid "Close Tab"
 msgstr "Reiter schließen"
 
-#: ../capplet/settings/mail-account-view.c:729
+#: ../capplet/settings/mail-account-view.c:690
+#| msgid "Account Editor"
 msgid "Account Wizard"
-msgstr "Konto-Assistent"
+msgstr "Kontenassistent"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
+#: ../capplet/settings/mail-capplet-shell.c:208
+#| msgid "Evolution Account Assistant"
 msgid "Evolution account assistant"
 msgstr "Evolution-Kontoassistent"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "E-Mail-Einstellungen"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-msgid "Quit"
-msgstr "Beenden"
-
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1617
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:659
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:211
+#: ../mail/message-list.c:1605
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/addressbook/e-book-shell-migrate.c:126
 #: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-cal-shell-migrate.c:141
 #: ../modules/calendar/e-memo-shell-backend.c:108
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-migrate.c:109
 msgid "On This Computer"
 msgstr "Auf diesem Rechner"
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:146
 #: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "Ändern"
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "Ein neues Konto hinzufügen"
 
-#: ../capplet/settings/mail-settings-view.c:185
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Kontoverwaltung</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+#| msgid "Account Management"
+msgid "Account management"
+msgstr "Kontenverwaltung"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:277
+#| msgid "Junk Settings"
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -8874,7 +8672,7 @@ msgstr "Benachrichtigungen über Kalenderereignisse"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution Alarm-Benachrichtigung"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:823
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8892,9 +8690,15 @@ msgid "Manage your email, contacts and schedule"
 msgstr "Ihre E-Mails, Kontakte und Kalender verwalten"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
+#| msgid "Configure your email accounts here"
 msgid "Configure email accounts"
 msgstr "E-Mail-Konten konfigurieren"
 
+#: ../data/evolution-settings.desktop.in.in.h:2
+#| msgid "Junk Mail Settings"
+msgid "Email Settings"
+msgstr "E-Mail-Einstellungen"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "Adresskarte"
@@ -8996,58 +8800,70 @@ msgstr "Westeuropäisch"
 msgid "Western European, New"
 msgstr "Westeuropäisch, neu"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "Traditionell"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "Vereinfacht"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
 # CHECK
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "Visuell"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Heute"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Morgen"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Gestern"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "In %d Tagen"
+#| msgid "%d days from now"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "In %d Tag"
+msgstr[1] "In %d Tagen"
 
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "Vor %d Tagen"
+#| msgid "%d days ago"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Vor %d Tag"
+msgstr[1] "Vor %d Tagen"
 
 # Hier hieß es mal: Systemvorgabe benutzen. Deshalb vermute ich, dass es nun um die lokale (Benutzer-) Vorgabe im Gegensatz zur Systemvorgabe geht, nicht explizit um die Spracheinstellung.
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "Lokale Vorgabe benutzen"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "Format:"
 
@@ -9068,18 +8884,6 @@ msgstr "»%s« wird geschrieben"
 msgid "Writing \"%s\" to %s"
 msgstr "»%s« wird nach »%s« geschrieben"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Name der Protokollierung"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "Dateiname"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "Der Dateiname des Moduls"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Fehlerdiagnose-Protokoll"
@@ -9102,13 +8906,13 @@ msgstr "Protokollmeldungen:"
 msgid "Log Level"
 msgstr "Protokolltyp"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2683
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
@@ -9132,32 +8936,21 @@ msgstr "Fehlerdiagnose"
 msgid "Error, Warnings and Debug messages"
 msgstr "Fehler, Warnungen und Diagnosemeldungen"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "Aktiv"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Legt fest, ob das Plugin aktiviert ist"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "Wochen"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "Während des Druckens ist ein Fehler aufgetreten"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "Das Drucksystem hat folgende Details zum Fehler berichtet:"
 
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -9168,7 +8961,7 @@ msgstr ""
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "Grund: »{1}«."
 
@@ -9188,243 +8981,243 @@ msgstr "Soll sie überschrieben werden?"
 msgid "File exists \"{0}\"."
 msgstr "Die Datei »{0}« existiert bereits."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "Ü_berschreiben"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:169
 msgid "Could not open the link."
 msgstr "Verknüpfung konnte nicht geöffnet werden."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:219
 msgid "Could not display help for Evolution."
 msgstr "Hilfe für Evolution konnte nicht angezeigt werden."
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1303
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf-Fehler: %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1314
 msgid "All further errors shown only on terminal."
 msgstr "Weitere Fehler werden nur im Terminal ausgegeben."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Kopie"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "Blindkopie"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Betreff"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1138
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Datum"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:84
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:85
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Gesicht"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1302
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1361
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 "Die Syntax der S/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
 "Fehler"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Die Syntax der MIME-Nachricht konnte nicht analysiert werden und wird daher "
 "als Quelltext angezeigt."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nicht unterstützter Verschlüsselungstyp für multipart/encrypted"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message"
 msgstr "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
-"Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden: "
-"Unbekannter Fehler"
+"Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
+"Fehler"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "Nicht unterstütztes Signaturformat"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 msgid "Error verifying signature"
 msgstr "Fehler beim Überprüfen der Signatur"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "Unbekannter Fehler beim Überprüfen der Signatur"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message"
 msgstr "Die Syntax der PGP-Nachricht konnte nicht analysiert werden"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message: Unknown error"
 msgstr ""
 "Die Syntax der PGP-Nachricht konnte nicht analysiert werden: Unbekannter "
 "Fehler"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Vor 1 Sekunde"
 msgstr[1] "Vor %d Sekunden"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "In 1 Sekunde"
 msgstr[1] "In %d Sekunden"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Vor 1 Minute"
 msgstr[1] "Vor %d Minuten"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "In 1 Minute"
 msgstr[1] "In %d Minuten"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Vor 1 Stunde"
 msgstr[1] "Vor %d Stunden"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "In 1 Stunde"
 msgstr[1] "In %d Stunden"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Vor 1 Tag"
 msgstr[1] "Vor %d Tagen"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "In 1 Tag"
 msgstr[1] "In %d Tagen"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Vor 1 Woche"
 msgstr[1] "Vor %d Wochen"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "In 1 Woche"
 msgstr[1] "In %d Wochen"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Vor 1 Monat"
 msgstr[1] "Vor %d Monaten"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "In 1 Monat"
 msgstr[1] "In %d Monaten"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "Vor 1 Jahr"
 msgstr[1] "Vor %d Jahren"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "In 1 Jahr"
 msgstr[1] "In %d Jahren"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<Klicken Sie hier, um ein Datum zu wählen>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "jetzt"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d.%m.%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Wählen Sie eine Vergleichszeit"
 
@@ -9478,11 +9271,11 @@ msgid "I_nclude threads"
 msgstr "_Threads einschließen"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Eingang"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Ausgehend"
 
@@ -9514,7 +9307,7 @@ msgstr "Datum fehlt."
 msgid "Missing file name."
 msgstr "Dateiname fehlt."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "Name fehlt."
 
@@ -9593,7 +9386,7 @@ msgstr "in der Zukunft"
 msgid "months"
 msgstr "Monaten"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:173
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -9610,7 +9403,7 @@ msgid "years"
 msgstr "Jahren"
 
 #: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
+#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
 #: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
@@ -9618,35 +9411,18 @@ msgid_plural "Attachments"
 msgstr[0] "Anlage"
 msgstr[1] "Anlagen"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:617 ../widgets/misc/e-attachment-paned.c:612
 msgid "Icon View"
 msgstr "Symbolansicht"
 
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:618 ../widgets/misc/e-attachment-paned.c:613
 msgid "List View"
 msgstr "Listenansicht"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Fokusverfolgung"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "Shell-Modul"
-
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "Das Shell-Backend für E-Mails"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "Gelöschte anzeigen"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "Gelöschte Nachrichten anzeigen"
+#: ../mail/e-mail-browser.c:262
+#| msgid "Subject"
+msgid "(No Subject)"
+msgstr "(Kein Betreff)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9693,7 +9469,7 @@ msgid "_Later"
 msgstr "S_päter"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:472
 msgid "Add Label"
 msgstr "Beschriftung hinzufügen"
 
@@ -9713,115 +9489,57 @@ msgstr ""
 msgid "Color"
 msgstr "Farbe"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Name"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2682
+#: ../modules/mail/e-mail-shell-view-private.c:953
 msgid "Inbox"
 msgstr "Eingang"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
 msgid "Sent"
 msgstr "Verschickt"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:572
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Wichtig"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "Zu erledigen"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Später"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "Migrationsvorgang …"
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "Migration"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "»%s« wird migriert:"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Der Ordner »%s« konnte nicht angelegt werden: %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Der Ordner »%s« konnte nicht nach »%s« kopiert werden: %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, 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/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:643
 msgid "Migrating Folders"
 msgstr "Ordner werden migriert"
 
-#: ../mail/e-mail-migrate.c:1824
-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 ""
-"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 …"
-
-#: ../mail/e-mail-migrate.c:2027
-#, 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/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "POP-Keep-on-Server-Datenordner »%s« konnte nicht angelegt werden: %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, 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/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Lokaler E-Mail-Speicher unter »%s« konnte nicht angelegt werden: %s"
-
-#: ../mail/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:644
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9833,45 +9551,37 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:740
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
+#| msgid "Unable to create local mail folders at `%s': %s"
+msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Lokale E-Mail-Ordner unter »%s« konnten nicht angelegt werden: %s"
 
-#: ../mail/e-mail-migrate.c:3049
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Die Einstellungen der vorhandenen Evolution-Installation konnten nicht "
-"gelesen werden, »evolution/config.xmldb« existiert nicht oder ist fehlerhaft."
-
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:108
+#: ../modules/calendar/e-task-shell-view-actions.c:561
 msgid "Do not ask me again"
 msgstr "Nicht mehr nachfragen."
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:266 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:266 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "K_opieren"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:640 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:640 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../mail/e-mail-reader.c:864
+#: ../mail/e-mail-reader.c:866
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Nachricht speichern"
@@ -9883,541 +9593,538 @@ msgstr[1] "Nachrichten speichern"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:887 ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Nachricht"
 msgstr[1] "Nachrichten"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1145
 msgid "A_dd Sender to Address Book"
 msgstr "A_bsender zum Adressbuch hinzufügen"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1147
 msgid "Add sender to address book"
 msgstr "Absender zum Adressbuch hinzufügen"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1152
 msgid "Check for _Junk"
 msgstr "Über_prüfung auf unerwünschte Nachrichten"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1154
 msgid "Filter the selected messages for junk status"
 msgstr "Die gewählten Nachrichten auf den Status »Unerwünscht« filtern"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1159
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren …"
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1161
 msgid "Copy selected messages to another folder"
 msgstr "Die gewählten Nachrichten in einen anderen Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1166
 msgid "_Delete Message"
 msgstr "Nachricht _löschen"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1168
 msgid "Mark the selected messages for deletion"
 msgstr "Die gewählten Nachrichten als zu löschend markieren"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1173
 msgid "Filter on Mailing _List..."
 msgstr "Filter über Mailing_liste …"
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1175
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Mailingliste zu filtern"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1180
 msgid "Filter on _Recipients..."
 msgstr "Filter über _Empfänger …"
 
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1182
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Empfänger zu filtern"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1187
 msgid "Filter on Se_nder..."
 msgstr "Filter über _Absender …"
 
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1189
 msgid "Create a rule to filter messages from this sender"
 msgstr "Eine Regel anlegen, um Nachrichten von diesem Absender zu filtern"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1194
 msgid "Filter on _Subject..."
 msgstr "Filter über _Betreff …"
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1196
 msgid "Create a rule to filter messages with this subject"
 msgstr "Eine Regel anlegen, um Nachrichten mit diesem Betreff zu filtern"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1201
 msgid "A_pply Filters"
 msgstr "Filter an_wenden"
 
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1203
 msgid "Apply filter rules to the selected messages"
 msgstr "Filterregeln auf die gewählten Nachrichten anwenden"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1208
 msgid "_Find in Message..."
 msgstr "In Nachricht _suchen …"
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1210
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach Text suchen"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1215
 msgid "_Clear Flag"
 msgstr "Markierung _löschen"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1217
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Die Folgemarkierung aus den gewählten Nachrichten entfernen"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1222
 msgid "_Flag Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1224
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 "Für die gewählten Nachrichten die Folgenachricht-Markierung auf »vollständig« "
 "setzen"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1229
 msgid "Follow _Up..."
 msgstr "_Folgenachricht …"
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1231
 msgid "Flag the selected messages for follow-up"
 msgstr "Die gewählten Nachrichten zur Nachverfolgung markieren"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1236
 msgid "_Attached"
 msgstr "_Anhang"
 
-#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1238 ../mail/e-mail-reader.c:1245
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Die gewählte Nachricht an jemanden als Anlage weiterleiten"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1243
 msgid "Forward As _Attached"
 msgstr "Als _Anhang weiterleiten"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1250
 msgid "_Inline"
 msgstr "_Eingebettet"
 
-#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1252 ../mail/e-mail-reader.c:1259
 msgid "Forward the selected message in the body of a new message"
 msgstr "Die gewählte Nachricht im Rumpf einer neuen Nachricht weiterleiten"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1257
 msgid "Forward As _Inline"
 msgstr "_Eingebettet weiterleiten"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1264
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1266 ../mail/e-mail-reader.c:1273
 msgid "Forward the selected message quoted like a reply"
 msgstr "Die gewählte Nachricht als Zitat wie in einer Antwort weiterleiten"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1271
 msgid "Forward As _Quoted"
 msgstr "_Zitiert weiterleiten"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1278
 msgid "_Load Images"
 msgstr "_Bilder laden"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1280
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laden von Bildern in HTML-E-Mail erzwingen"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1285
 msgid "_Important"
 msgstr "_Wichtig"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1287
 msgid "Mark the selected messages as important"
 msgstr "Die gewählten Nachrichten als wichtig markieren"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1292
 msgid "_Junk"
 msgstr "Unerwü_nscht"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1294
 msgid "Mark the selected messages as junk"
 msgstr "Die gewählten Nachrichten als unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1299
 msgid "_Not Junk"
 msgstr "E_rwünscht"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1301
 msgid "Mark the selected messages as not being junk"
 msgstr "Die gewählten Nachrichten als nicht unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1306
 msgid "_Read"
 msgstr "Ge_lesen"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1308
 msgid "Mark the selected messages as having been read"
 msgstr "Die gewählten Nachrichten als gelesen markieren"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1313
 msgid "Uni_mportant"
 msgstr "_Unwichtig"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1315
 msgid "Mark the selected messages as unimportant"
 msgstr "Die gewählten Nachrichten als unwichtig markieren"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1320
 msgid "_Unread"
 msgstr "_Ungelesen"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1322
 msgid "Mark the selected messages as not having been read"
 msgstr "Die gewählten Nachrichten als ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1327
 msgid "_Edit as New Message..."
 msgstr "Als neue _Nachricht bearbeiten …"
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1329
 msgid "Open the selected messages in the composer for editing"
 msgstr "Die gewählten Nachrichten zum Bearbeiten im Editor öffnen"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1334
 msgid "Compose _New Message"
 msgstr "_Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1336
 msgid "Open a window for composing a mail message"
 msgstr "Ein Fenster zum Verfassen einer E-Mail-Nachricht öffnen"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1341
 msgid "_Open in New Window"
 msgstr "In neuem _Fenster öffnen"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1343
 msgid "Open the selected messages in a new window"
 msgstr "Die gewählten Nachrichten in einem neuen Fenster öffnen"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1348
 msgid "_Move to Folder..."
 msgstr "In Ordner _verschieben …"
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1350
 msgid "Move selected messages to another folder"
 msgstr "Die gewählten Nachrichten in einen anderen Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1355
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1357
 msgid "Display the next message"
 msgstr "Die nächste Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1362
 msgid "Next _Important Message"
 msgstr "Nächste _wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1364
 msgid "Display the next important message"
 msgstr "Die nächste wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1369
 msgid "Next _Thread"
 msgstr "Nächster _Thread"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1371
 msgid "Display the next thread"
 msgstr "Nächsten Thread anzeigen"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1376
 msgid "Next _Unread Message"
 msgstr "Nächste _ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1378
 msgid "Display the next unread message"
 msgstr "Die nächste ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1383
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1385
 msgid "Display the previous message"
 msgstr "Die vorhergehende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1390
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1392
 msgid "Display the previous important message"
 msgstr "Die vorhergehende wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1397
 msgid "P_revious Unread Message"
 msgstr "_Vorherige ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1399
 msgid "Display the previous unread message"
 msgstr "Die vorhergehende ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1406
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1413
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1418
 msgid "Re_direct"
 msgstr "_Umleiten"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1420
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden umleiten"
 
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1427
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Eine Antwort an alle Empfänger der gewählten Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1432
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1434
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Eine Antwort an die Mailingliste der gewählten Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1439 ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1441
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Eine Antwort an den Absender der gewählten Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1446
 msgid "_Save as mbox..."
 msgstr "_Speichern als mbox …"
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1448
 msgid "Save selected messages as an mbox file"
 msgstr "Die gewählten Nachrichten als mbox-Datei speichern"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1453
 msgid "Search Folder from Mailing _List..."
 msgstr "Suchordner über Mailing_liste …"
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1455
 msgid "Create a search folder for this mailing list"
 msgstr "Einen Suchordner für diese Mailingliste anlegen"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1460
 msgid "Search Folder from Recipien_ts..."
 msgstr "Suchordner über _Empfänger …"
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1462
 msgid "Create a search folder for these recipients"
 msgstr "Einen Suchordner für diese Empfänger anlegen"
 
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1467
 msgid "Search Folder from Sen_der..."
 msgstr "Suchordner über _Absender …"
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1469
 msgid "Create a search folder for this sender"
 msgstr "Einen Suchordner für diesen Absender anlegen"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1474
 msgid "Search Folder from S_ubject..."
 msgstr "Suchordner über _Betreff …"
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1476
 msgid "Create a search folder for this subject"
 msgstr "Einen Suchordner für diesen Betreff anlegen"
 
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1481
 msgid "_Message Source"
 msgstr "Nachrichten-_Quelltext"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1483
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1495
 msgid "_Undelete Message"
 msgstr "Löschen der Nachricht _rückgängig"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1497
 msgid "Undelete the selected messages"
 msgstr "Löschen der gewählten Nachrichten rückgängig machen"
 
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1502
 msgid "_Normal Size"
 msgstr "_Normale Größe"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1504
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgröße zurücksetzen"
 
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1509
 msgid "_Zoom In"
 msgstr "Ansicht ver_größern"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1511
 msgid "Increase the text size"
 msgstr "Die Textgröße heraufsetzen"
 
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1516
 msgid "Zoom _Out"
 msgstr "Ansicht ver_kleinern"
 
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1518
 msgid "Decrease the text size"
 msgstr "Die Textgröße heruntersetzen"
 
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1525
 msgid "Create R_ule"
 msgstr "_Regel anlegen"
 
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1532
 msgid "Ch_aracter Encoding"
 msgstr "Zeichenko_dierung"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1539
 msgid "F_orward As"
 msgstr "_Weiterleiten als …"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1546
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1553
 msgid "Mar_k As"
 msgstr "Mar_kieren als"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1560
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1567
 msgid "_Zoom"
 msgstr "Ansicht ver_größern"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1592
 msgid "Mark for Follo_w Up..."
 msgstr "Als _Folgenachricht markieren …"
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1600
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1604
 msgid "Mark as _Junk"
 msgstr "Als un_erwünscht markieren"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1608
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1612
 msgid "Mar_k as Read"
 msgstr "Als _gelesen markieren"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1616
 msgid "Mark as Uni_mportant"
 msgstr "Als un_wichtig markieren"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1620
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:1654
+#: ../mail/e-mail-reader.c:1656
 msgid "_Caret Mode"
 msgstr "Cursor-_Modus"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:1658
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Im Rumpf der angezeigten Nachricht einen blinkenden Cursor anzeigen"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1664
 msgid "All Message _Headers"
 msgstr "Alle Nachrichtenk_öpfe"
 
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:1666
 msgid "Show messages with all email headers"
 msgstr "Nachrichten mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1880
 msgid "Unable to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1884 ../mail/e-mail-reader.c:1944
+#: ../mail/mail-ops.c:1843
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Nachricht »%s« wird abgerufen"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2460
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2581 ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2582
 msgid "Forward the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden weiterleiten"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2626 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2630
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Weiter"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2638 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Antworten"
 
@@ -10427,24 +10134,24 @@ msgstr "Als Folgenachricht markieren"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:73
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Keine Verschlüsselung"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:121
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS-Verschlüsselung"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL-Verschlüsselung"
 
@@ -10468,34 +10175,34 @@ msgstr ""
 "Haken Sie das Kontrollkästchen ab, um sie zu akzeptieren.\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Keine"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "Nie"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "Immer"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "Bei jeder Nachricht nachfragen"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Keine"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "E-Mail-Konfiguration"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10505,31 +10212,31 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Vor«, um die Konfiguration zu beginnen."
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2060
 msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"Please enter your name and email address below. The \"optional\" fields below "
+"do not need to be filled in, unless you wish to include this information in "
+"email you send."
 msgstr ""
 "Bitte geben Sie unten Ihren Namen und Ihre E-Mail-Adresse an. Die Felder "
 "unter »Optional« müssen nicht\n"
 "ausgefüllt werden, es sei denn, Sie wollen diese Informationen in von Ihnen "
 "verschickten E-Mails einschließen."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2228
+#: ../mail/mail-config.ui.h:91
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "Bitte konfigurieren Sie die folgenden Konteneinstellungen."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2706
 msgid "Sending Email"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10538,11 +10245,11 @@ msgstr ""
 "Mails verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich "
 "bitte an Ihren Systemadministrator oder Internet-Provider."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "Kontenverwaltung"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2069
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10550,11 +10257,11 @@ msgstr ""
 "Bitte geben Sie unten einen bezeichnenden Namen für dieses Konto ein.\n"
 "Dieser Name wird nur zum Anzeigen verwendet."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "Fertig"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10571,56 +10278,56 @@ msgstr ""
 "Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu\n"
 "speichern."
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2515
 msgid "Check for _new messages every"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2523
 msgid "minu_tes"
 msgstr "Minu_ten"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "Sicherheit"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
 msgid "Receiving Options"
 msgstr "Empfangsoptionen"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2878 ../mail/em-account-editor.c:2946
 msgid "Checking for New Messages"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3414
 msgid "Account Editor"
 msgstr "Konteneditor"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3414
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Kontoassistent"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1570
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Ihre Nachricht an %s mit dem Betreff »%s« am %s wurde gelesen."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1618
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Zustellungsbestätigung für: »%s«"
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1947
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1997
+#: ../mail/em-composer-utils.c:1994
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10628,19 +10335,19 @@ msgstr ""
 "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} "
 "${TimeZone} schrieb ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2138
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2319
 msgid "Posting destination"
 msgstr "Zielordner"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2320
 msgid "Choose folders to post the message to."
 msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
@@ -10721,6 +10428,10 @@ msgstr "Folgenachricht"
 msgid "Forward to"
 msgstr "Weiterleiten an"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Wichtig"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "ist nach"
@@ -10745,7 +10456,7 @@ msgstr "ist nicht gesetzt"
 msgid "is set"
 msgstr "ist gesetzt"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:62
 msgid "Junk"
 msgstr "Unerwünscht"
 
@@ -10794,7 +10505,7 @@ msgid "Play Sound"
 msgstr "Klang abspielen"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Gelesen"
 
@@ -10875,16 +10586,16 @@ msgid "Unset Status"
 msgstr "Status nicht setzen"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "Dann"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "Aktion hin_zufügen"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ungelesene Nachrichten:"
@@ -10892,24 +10603,24 @@ msgstr[1] "Ungelesene Nachrichten:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Nachrichten insgesamt:"
 msgstr[1] "Nachrichten insgesamt:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Speicherverbrauch (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "Speicherverbrauch:"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "Ordnereigenschaften"
 
@@ -10917,38 +10628,38 @@ msgstr "Ordnereigenschaften"
 msgid "<click here to select a folder>"
 msgstr "<Klicken Sie hier, um einen Ordner auszuwählen>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "_Anlegen"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "Ordner_name:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1079 ../mail/mail-vfolder.c:1144
 msgid "Search Folders"
 msgstr "Suchordner"
 
 # CHECK
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "OHNE TREFFER"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1080
 msgid "Loading..."
 msgstr "Ladevorgang …"
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:183
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden eingelesen"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:596
 msgid "Folder names cannot contain '/'"
 msgstr "Ordnernamen dürfen das Slash-Zeichen »/« nicht enthalten"
 
@@ -10970,88 +10681,89 @@ msgstr "Ordnernamen dürfen das Slash-Zeichen »/« nicht enthalten"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1078
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1286
 msgid "Mail Folder Tree"
 msgstr "E-Mail-Ordnerbaum"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1583 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird verschoben"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1585 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1592 ../mail/message-list.c:2104
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1594 ../mail/message-list.c:2106
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1609
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Sie können Nachrichten nicht im Speicher auf der obersten Ebene abgelegen"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Move Folder To"
 msgstr "Ordner verschieben nach"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Copy Folder To"
 msgstr "Ordner kopieren nach"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:509
+#: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
-msgid "Creating folder `%s'"
+#| msgid "Creating folder `%s'"
+msgid "Creating folder '%s'"
 msgstr "Ordner »%s« wird angelegt"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:672
 msgid "Create Folder"
 msgstr "Ordner anlegen"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:673
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner angelegt werden soll:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:689
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Abbestellen des Ordners »%s«"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "Unsigniert"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
-"Diese Nachricht ist nicht signiert. Die Authentizität des Absenders ist "
-"daher nicht sichergestellt."
+"Diese Nachricht ist nicht signiert. Die Authentizität des Absenders ist daher "
+"nicht sichergestellt."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "Gültige Signatur"
 
 # CHECK
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11059,23 +10771,23 @@ 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:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "Ungültige Signatur"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+"The signature of this message cannot be verified, it may have been altered in "
+"transit."
 msgstr ""
-"Die Signatur dieser Nachricht konnte nicht verifiziert werden. "
-"Möglicherweise wurde sie bei der Übertragung verändert."
+"Die Signatur dieser Nachricht konnte nicht verifiziert werden. Möglicherweise "
+"wurde sie bei der Übertragung verändert."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gültige Signatur, Absender konnte jedoch nicht verifiziert werden"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11083,23 +10795,23 @@ 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:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
 msgid "Signature exists, but need public key"
 msgstr "Signatur existiert, jedoch wird der öffentliche Schlüssel benötigt"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+"This message is signed with a signature, but there is no corresponding public "
+"key."
 msgstr ""
 "Diese Nachricht wurde mit einer gültigen Signatur signiert, jedoch ist kein "
 "passender öffentlicher Schlüssel vorhanden."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
 msgid "Unencrypted"
 msgstr "Nicht verschlüsselt"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11107,55 +10819,55 @@ 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:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "Schwach verschlüsselt"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 ""
-"Diese Nachricht ist verschlüsselt, der Verschlüsselungsalgorithmus ist "
-"jedoch schwach. Daher können Dritte ihren Inhalt zwar nur schwerlich, jedoch "
-"nicht unmöglich innerhalb eines praktikablen Zeitraums ausspähen."
+"Diese Nachricht ist verschlüsselt, der Verschlüsselungsalgorithmus ist jedoch "
+"schwach. Daher können Dritte ihren Inhalt zwar nur schwerlich, jedoch nicht "
+"unmöglich innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+"This message is encrypted.  It would be difficult for an outsider to view the "
+"content of this message."
 msgstr ""
 "Diese Nachricht ist verschlüsselt. Daher können Dritte ihren Inhalt nur "
 "schwerlich ausspähen."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "Stark verschlüsselt"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 ""
 "Diese Nachricht ist mit einem starken Verschlüsselungsalgorithmus "
-"verschlüsselt. Daher können Dritte ihren Inhalt nur sehr schwerlich "
-"innerhalb eines praktikablen Zeitraums ausspähen."
+"verschlüsselt. Daher können Dritte ihren Inhalt nur sehr schwerlich innerhalb "
+"eines praktikablen Zeitraums ausspähen."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -11163,28 +10875,28 @@ msgstr ""
 "Evolution kann diese E-Mail nicht wiedergeben, da sie zu groß ist um sie zu "
 "verarbeiten. Sie können Sie unformatiert oder in einem Texteditor betrachten."
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:726
 msgid "Completed on"
 msgstr "Abgeschlossen am"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:734
 msgid "Overdue:"
 msgstr "Überfällig:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:738
 msgid "by"
 msgstr "am"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
 msgid "View _Unformatted"
 msgstr "_Unformatierte ansehen"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:950
 msgid "Hide _Unformatted"
 msgstr "_Unformatierte verstecken"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1012
 msgid "O_pen With"
 msgstr "Ö_ffnen mit"
 
@@ -11193,17 +10905,18 @@ msgstr "Ö_ffnen mit"
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:147
 msgid "Formatting message"
 msgstr "Nachricht wird formatiert"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:338
 msgid "Formatting Message..."
 msgstr "Nachricht wird formatiert  …"
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
 #, c-format
-msgid "Retrieving `%s'"
+#| msgid "Retrieving `%s'"
+msgid "Retrieving '%s'"
 msgstr "»%s« wird abgerufen"
 
 #: ../mail/em-format-html.c:1854
@@ -11241,40 +10954,50 @@ msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#.
-#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2600
 #, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "Diese Nachricht wurde von <b>%s</b> im Namen von <b>%s</b> gesendet"
+#| msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Diese Nachricht wurde von %s im Namen von %s gesendet"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:583
 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:619
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Ordner"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:837
 msgid "Please select a server."
 msgstr "Bitte wählen Sie einen Server."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gewählt"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+#| msgid "Are you sure you want to open {0} messages at once?"
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "Sind Sie sicher, dass Sie %d Nachrichten auf einmal öffnen wollen?"
+msgstr[1] "Sind Sie sicher, dass Sie %d Nachrichten auf einmal öffnen wollen?"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Nachrichtenfilter"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:853
 #, c-format
 msgid "Messages from %s"
 msgstr "Nachrichten von %s"
@@ -11283,7 +11006,7 @@ msgstr "Nachrichten von %s"
 msgid "Search _Folders"
 msgstr "Such_ordner"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:521
 msgid "Add Folder"
 msgstr "Ordner hinzufügen"
 
@@ -11324,51 +11047,47 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Weite des Fensters »E-Mails verschicken und abrufen«"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Erlaubt Evolution Textteile von begrenzter Größe anzuzeigen"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Lesebestätigung immer anfordern"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "Automatische Emoticon-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "Automatische Link-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Eingehende E-Mails daraufhin überprüfen, ob sie unerwünscht sind"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Hervorhebungsfarbe für Zitate"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Hervorhebungsfarbe für Zitate."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Voreingestellte Höhe des Editorfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Voreingestellte Breite des Editorfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "Vorgabeordner für Anlagen im Nachrichteneditor"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Kürzen der Adressanzeige in den Empfängerfeldern (An/Kopie/Blindkopie)"
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11376,7 +11095,7 @@ msgstr ""
 "Die Anzeige der Adressen in den Empfängerfeldern (An/Kopie/Blindkopie) auf "
 "die im Schlüssel »address_count« angegebene Anzahl reduzieren."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11384,13 +11103,13 @@ msgstr ""
 "Legt fest, wie oft lokale Änderungen mit dem entfernen Mail-Server "
 "abgeglichen werden. Der Intervall muss mindestens 30 Sekunden betragen."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr ""
 "Benutzerdefinierte Kopfzeilen, die für die Prüfung auf Unerwünschtheit "
 "genutzt werden."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11398,63 +11117,63 @@ msgstr ""
 "Benutzerdefinierte Kopfzeilen, die für die Prüfung auf Unerwünschtheit "
 "genutzt werden.Das Format ist »Kopfzeilenname=Wert« im GConf-Schlüssel."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Vorgabe-Weiterleitungsstil"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Die voreingestellte Höhe des Editorfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Die voreingestellte Höhe des Nachrichtenbrowserfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Die voreingestellte Höhe des Abonnementdialogs."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "Der vorgegebene Maximierungsstatus des Nachrichtenbrowserfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Vorgabe-Antwortstil"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Vorgabewert, ob Threads ausgeklappt angezeigt werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Die voreingestellte Breite des Editorfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Die voreingestellte Breite des Nachrichtenbrowserfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Die voreingestellte Breite des Abonnementdialogs."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11462,13 +11181,12 @@ msgstr ""
 "Legt fest, ob nur in lokalen Adressbüchern nach der E-Mail-Adresse des "
 "Absenders für das Filtern unerwünschter Nachrichten gesucht wird"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
-"Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht "
-"wird"
+"Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht wird"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11477,28 +11195,28 @@ msgid ""
 msgstr ""
 "Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht "
 "wird. Falls die Adresse gefunden wird, so ist die E-Mail nicht unerwünscht. "
-"Es wird nur in Adressbüchern gesucht, die für Auto-Vervollständigung "
-"markiert sind. Diese Funktion kann langsam sein falls entfernte Adressbücher "
-"(wie LDAP) für die Auto-Vervollständigung aktiviert sind."
+"Es wird nur in Adressbüchern gesucht, die für Auto-Vervollständigung markiert "
+"sind. Diese Funktion kann langsam sein falls entfernte Adressbücher (wie "
+"LDAP) für die Auto-Vervollständigung aktiviert sind."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Legt fest, ob benutzerdefinierte Kopfzeilen für die Unerwünscht-Prüfung "
 "benutzt werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
+"Determines whether to use custom headers to check for junk. If this option is "
+"enabled and the headers are mentioned, it will be improve the junk checking "
+"speed."
 msgstr ""
 "Legt fest, ob benutzerdefinierte Kopfzeilen für die Prüfung auf "
 "Unerwünschtheit benutzt werden sollen. Wenn diese Option aktiviert ist und "
 "eine angegebene Kopfzeile auftritt, so wird hierdurch die Prüfung auf "
 "Unerwünschtheit beschleunigt."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11506,18 +11224,23 @@ msgstr ""
 "Legt fest, ob die gleichen Schriften für die »Von«- und die »Betreff«-Zeile in "
 "der »Nachrichten«-Spalte der vertikalen Ansicht verwendet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "Vorgabeordner für Anlagen im Nachrichteneditor."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "Ordner zum Speichern der E-Mailkomponenten-Dateien."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Zu lange Ordnernamen in Seitenleiste abkürzen"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+"Nur Nachrichtentexte anzeigen, die eine bestimmte Größe nicht überschreiten"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "Kein Signaturtrennzeichen hinzufügen"
@@ -11544,8 +11267,8 @@ msgstr "Alle Müllordner beim Beenden von Evolution leeren."
 
 #: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
+"Enable animated images in HTML mail. Many users find animated images annoying "
+"and prefer to see a static image instead."
 msgstr ""
 "Bewegte Bilder in HTML-Nachrichten einschalten. Viele Benutzer empfinden "
 "animierte Bilder als störend und bevorzugen, ein statisches Bild zu sehen."
@@ -11553,8 +11276,8 @@ msgstr ""
 #: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
-"Eingabezeiger aktivieren, so dass beim Lesen von E-Mails ein Cursor "
-"angezeigt wird."
+"Eingabezeiger aktivieren, so dass beim Lesen von E-Mails ein Cursor angezeigt "
+"wird."
 
 #: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
@@ -11593,16 +11316,18 @@ msgstr ""
 "Nachrichtenliste und den Ordnern benutzt werden soll."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
 msgstr ""
-"Verarbeiten von Nachrichten-Textteilen von begrenzter Größe aktivieren/"
-"deaktivieren"
+"Nur Nachrichtentexte anzeigen, welche die im Schlüssel "
+"»message_text_part_limit« angegebene Größe nicht übersteigen."
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "Eingabezeiger aktivieren/deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:46
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Dateinamen wie Outlook und GMail kodieren"
 
@@ -11632,8 +11357,8 @@ msgstr "Deaktiviert das Vorschaufenster und entfernt die Auswahl"
 
 #: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
+"If a user tries to open 10 or more messages at one time, ask the user if they "
+"really want to do it."
 msgstr ""
 "Wenn ein Benutzer versucht, 10 oder mehr Nachrichten auf einmal zu öffnen, "
 "wird er gefragt, ob er es wirklich tun will."
@@ -11652,11 +11377,11 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:73
 msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
+"Initial height of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window vertically."
 msgstr ""
-"Legt fest, wie hoch das Fenster »Filtereditor« anfänglich ist. Der Wert "
-"ändert sich, wenn der Benutzer das Fenster vertikal vergrößert."
+"Legt fest, wie hoch das Fenster »Filtereditor« anfänglich ist. Der Wert ändert "
+"sich, wenn der Benutzer das Fenster vertikal vergrößert."
 
 #: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
@@ -11704,12 +11429,11 @@ msgstr ""
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
+"particular value is not used by Evolution since the \"Send and Receive Mail\" "
+"window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"Legt fest, ob das Fenster »E-Mails verschicken und abrufen« maximiert ist. "
-"Der Wert ändert sich, wenn der Benutzer das Fenster maximiert oder "
+"Legt fest, ob das Fenster »E-Mails verschicken und abrufen« maximiert ist. Der "
+"Wert ändert sich, wenn der Benutzer das Fenster maximiert oder "
 "wiederherstellt. Hinweis: dieser Schlüssel wird von Evolution nicht "
 "verwendet, da das Fenster nicht maximiert werden kann. Dieser Schlüssel "
 "existiert nur als Implementierungsdetail."
@@ -11745,15 +11469,17 @@ msgid ""
 "the search results."
 msgstr ""
 "Legt fest, ob der Benutzer gewarnt werden soll, dass das Löschen einer "
-"Nachricht in einem Suchordner die Nachricht wirklich löscht und nicht nur "
-"aus den Suchergebnissen entfernt."
+"Nachricht in einem Suchordner die Nachricht wirklich löscht und nicht nur aus "
+"den Suchergebnissen entfernt."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
-msgstr "Letzte Unerwünscht-Ordner-Leerung"
+#| msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
+msgstr "Letzte Leerung des Unerwünscht-Ordners"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+#| msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
 msgstr "Letzte Müllleerung"
 
 #: ../mail/evolution-mail.schemas.in.h:85
@@ -11804,9 +11530,9 @@ msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
-"Liste der Beschriftungen, die Evolutions E-Mail-Komponenete bekannt sind. "
-"Die Liste enthält Zeichenketten der Form Name:Farbe, wobei die Farbe als "
-"HTML-Hextriplet anzugeben ist."
+"Liste der Beschriftungen, die Evolutions E-Mail-Komponenete bekannt sind. Die "
+"Liste enthält Zeichenketten der Form Name:Farbe, wobei die Farbe als HTML-"
+"Hextriplet anzugeben ist."
 
 #: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
@@ -11819,8 +11545,8 @@ msgstr "Bilder für HTML-Nachrichten per HTTP laden"
 #: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
+"Never load images off the net. \"1\" - Load images in messages from contacts. "
+"\"2\" - Always load images off the net."
 msgstr ""
 "Bilder von HTML-Nachrichten per HTTP(S) laden. Mögliche Werte sind: »0« - "
 "Niemals Bilder aus dem Netz laden, »1« - Bilder laden falls Absender im "
@@ -11871,70 +11597,75 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen."
 
 #: ../mail/evolution-mail.schemas.in.h:109
+#| msgid "Message Display"
+msgid "Message text limit for display"
+msgstr "Anzeigebegrenzung des Nachrichtentexts"
+
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Stil der Nachrichtenanzeige. Zulässige Werte: »normal« (normal), »full "
 "headers« (alle Kopfzeilen), »source« (Quelltext)"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim "
 "Beenden"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Mülls beim Beenden"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim "
 "Beenden."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Mülls beim Beenden."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 "Anzahl der Adressen, die in den Empfängerfeldern (An/Kopie/Blindkopie"
 "( angezeigt werden"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Rückfragen, falls ein Benutzer versucht, einen Ordner zu säubern."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Rückfragen, falls ein Benutzer versucht, eine Nachricht ohne Betreff zu "
 "verschicken."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "Nachfrage beim Löschen von Nachrichten in Suchordner"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "Beim Säubern nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "Rückfragen, falls der Benutzer nur das Blindkopie-Feld ausfüllt"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Vor gleichzeitigem Öffnen von 10 oder mehr Nachrichten einen Hinweis anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11942,65 +11673,64 @@ msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "nachfragen."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Beim Verschicken von Nachrichten ohne An- und Kopie-Feld nachfragen."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
-"Rückfragen, falls der Benutzer versucht, nicht erwünschtes HTML zu "
-"verschicken"
+"Rückfragen, falls der Benutzer versucht, nicht erwünschtes HTML zu verschicken"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr "Beim Antworten eigene Signaturen an den Anfang stellen"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "Beim Antworten auf Mails unten mit dem Schreiben beginnen"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Emoticons im Text erkennen und durch Bilder ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "Links im Text erkennen und ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "Unerwünscht-Test auf eingehende E-Mails anwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "Ordner speichern"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "In den lokalen Adressbüchern nach dem Foto des Absenders suchen"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "Spalte mit der E-Mail-Adresse des Absenders in der Nachrichtenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "Intervall für Datenabgleich mit Servern"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -12008,71 +11738,69 @@ msgstr ""
 "Setzen Sie dies auf »wahr«, wenn Sie kein beim Verfassen von Nachrichten kein "
 "Signaturtrennzeichen vor Ihre Signatur setzen wollen."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Das Feld »Blindkopie an« beim Verfassen einer Nachricht anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Das Feld »Kopie an« beim Verfassen einer Nachricht anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when posting to a newsgroup"
-msgstr ""
-"Das Feld »Von« beim Verfassen einer Nachricht an eine Newsgroup anzeigen"
+msgstr "Das Feld »Von« beim Verfassen einer Nachricht an eine Newsgroup anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"From\" field when sending a mail message"
 msgstr "Das Feld »Von« beim Verfassen einer Nachricht anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
-"Das Feld »Antwort an« beim Verfassen einer Nachricht an eine Newsgroup "
-"anzeigen"
+"Das Feld »Antwort an« beim Verfassen einer Nachricht an eine Newsgroup anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Das Feld »Antwort an« beim Verfassen einer Nachricht anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show all message headers"
 msgstr "Alle Nachrichtenköpfe anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show all the headers when viewing a messages."
 msgstr "Beim Anzeigen von Nachrichten alle Nachrichtenköpfe anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Gelöschte Nachrichten (durchgestrichen) in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show image animations"
 msgstr "Bildanimationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show original \"Date\" header value."
 msgstr "Den originalen Wert der Kopfzeile »Datum« anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "Foto des Absenders anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12080,7 +11808,7 @@ msgstr ""
 "Das Feld »Blindkopie an« beim Verfassen einer Nachricht anzeigen. Die "
 "Einstellung kann im Menü »Ansicht« beim Verfassen angepasst werden."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12088,7 +11816,7 @@ msgstr ""
 "Das Feld »Kopie an« beim Verfassen einer Nachricht anzeigen. Die Einstellung "
 "kann im Menü »Ansicht« beim Verfassen angepasst werden."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -12096,7 +11824,7 @@ msgstr ""
 "Das Feld »Von« beim Verfassen einer Nachricht an eine Newsgroup anzeigen. Die "
 "Einstellung kann im Menü »Ansicht« beim Verfassen angepasst werden."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12104,7 +11832,7 @@ msgstr ""
 "Das Feld »Von« beim Verfassen einer Nachricht anzeigen. Die Einstellung kann "
 "im Menü »Ansicht« beim Verfassen angepasst werden."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -12113,23 +11841,22 @@ msgstr ""
 "anzeigen. Die Einstellung kann im Menü »Ansicht« beim Verfassen angepasst "
 "werden."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
-"Das Feld »Antwort an« beim Verfassen einer Nachricht anzeigen. Die "
-"Einstellung kann im Menü »Ansicht« beim Verfassen angepasst werden."
+"Das Feld »Antwort an« beim Verfassen einer Nachricht anzeigen. Die Einstellung "
+"kann im Menü »Ansicht« beim Verfassen angepasst werden."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+"Show the email-address of the sender in a separate column in the message list."
 msgstr ""
 "Zeigt die E-Mail-Adresse des Absenders in einer eigenen Spalte in der "
 "Nachrichtenliste an."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -12137,53 +11864,53 @@ msgid ""
 msgstr ""
 "Den originalen Wert der Kopfzeile »Datum« anzeigen, mit einer lokalen Zeit, "
 "falls sich die Zeitzonen unterscheiden. Anderenfalls wird der Wert der "
-"Kopfzeile »Datum« in einem benutzerdefinierten Format und der lokalen "
-"Zeitzone dargestellt."
+"Kopfzeile »Datum« in einem benutzerdefinierten Format und der lokalen Zeitzone "
+"dargestellt."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Fotos des Absenders in der Nachrichtenvorschau anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "Rechtschreibprüfung an Ort und Stelle"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "Farbe für Rechtschreibprüfung"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "Sprachen für Rechtschreibprüfung"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "Voreingestellte Höhe des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "Voreingestellte Breite des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "Textnachrichtenteil-Begrenzung"
-
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "Vorgabe-Plugin für die Unerwünscht-Erkennung"
 
 #: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
+#| msgid "The last time empty junk was run, in days since the epoch."
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Die Zeit seit der letzten Unerwünscht-Ordner-Leerung in Tagen seit dem "
 "01.01.1970."
 
 #: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
+#| msgid "The last time empty trash was run, in days since the epoch."
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Die Zeit seit der letzten Müllleerung in Tagen seit dem 01.01.1970."
 
 #: ../mail/evolution-mail.schemas.in.h:172
@@ -12208,29 +11935,34 @@ msgstr "Die zum Anzeigen von E-Mails verwendete Schrift variabler Breite."
 
 #: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2"
+"\" for debug messages."
 msgstr ""
 "Hier sind drei verschiedene Werte möglich: »0« für Fehler, »1« für Warnungen, "
 "»2« für Diagnosemeldungen."
 
 #: ../mail/evolution-mail.schemas.in.h:176
+#| msgid ""
+#| "This decides the max size of the text part that can be formatted under "
+#| "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value is "
+"used only when 'force_message_limit' key is activated."
 msgstr ""
 "Dies bestimmt die maximale Größe des Textteils, der von Evolution formatiert "
-"wird. Die Vorgabe sind 4MB/4096kb und ist in KB angegeben."
+"wird, angegeben in kB. Die Vorgabe sind 4MB/4096kB. Dieser Wert wird nur dann "
+"verwendet, wenn der Schlüssel »force_message_limit« aktiviert ist."
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
+"enabled. If the default listed plugin is disabled, then it won't fall back to "
+"the other available plugins."
 msgstr ""
-"Dies ist das Vorgabe-Unerwünscht-Plugin, auch falls mehrere Plugins "
-"aktiviert sind. Falls das als Vorgabe aufgelistete Plugin deaktiviert ist, "
-"so wird nicht auf eines der anderen Plugins zurückgegriffen."
+"Dies ist das Vorgabe-Unerwünscht-Plugin, auch falls mehrere Plugins aktiviert "
+"sind. Falls das als Vorgabe aufgelistete Plugin deaktiviert ist, so wird "
+"nicht auf eines der anderen Plugins zurückgegriffen."
 
 #: ../mail/evolution-mail.schemas.in.h:178
 msgid ""
@@ -12247,8 +11979,8 @@ msgstr ""
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+"header enabled&gt; - set enabled if the header is to be displayed in the mail "
+"view."
 msgstr ""
 "Dieser Schlüssel enthält eine Liste von XML-Strukturen, die "
 "benutzerdefinierte Kopfzeilen angeben, und ob diese angezeigt werden sollen. "
@@ -12257,9 +11989,9 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
+"This option is related to the key lookup_addressbook and is used to determine "
+"whether to look up addresses in local address book only to exclude mail sent "
+"by known contacts from junk filtering."
 msgstr ""
 "Diese Option bezieht sich auf den Schlüssel »lookup_addressbook« und legt "
 "fest, ob Adressen im lokalen Adressbuch gesucht werden um sicherzustellen, "
@@ -12279,12 +12011,12 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
+"This setting specifies whether the threads should be in expanded or collapsed "
+"state by default. Evolution requires a restart."
 msgstr ""
 "Legt fest, ob Threads standardmäßig ausgeklappt oder eingeklappt dargestellt "
-"werden sollen. Evolution muss nach Ändern dieses Wertes hierfür neu "
-"gestartet werden."
+"werden sollen. Evolution muss nach Ändern dieses Wertes hierfür neu gestartet "
+"werden."
 
 #: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
@@ -12356,9 +12088,9 @@ msgid ""
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
-"Benutzer streiten sich wo die Signatur beim Verfassen einer Antwort "
-"platziert werden soll. Dies legt fest, ob die Signatur zu Beginn oder am "
-"Ende der Nachricht platziert wird."
+"Benutzer streiten sich wo die Signatur beim Verfassen einer Antwort platziert "
+"werden soll. Dies legt fest, ob die Signatur zu Beginn oder am Ende der "
+"Nachricht platziert wird."
 
 #: ../mail/evolution-mail.schemas.in.h:198
 msgid "Variable width font"
@@ -12378,8 +12110,8 @@ msgstr ""
 # CHECK - etwas schluderig, kommt aber hoffentlich hin.
 #: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+"Whether or not to fall back on threading by subjects when the messages do not "
+"contain In-Reply-To or References headers."
 msgstr ""
 "Auf Betreffbasis auf die Thread-Ordnung zurückgreifen, falls die Kopfzeilen "
 "einer Nachricht auf keine Referenznachricht verweisen."
@@ -12396,543 +12128,569 @@ msgstr "Breite der Nachrichtenliste"
 msgid "Width of the message-list pane."
 msgstr "Breite der Nachrichtenliste."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Elm-Daten werden importiert"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "E-Mail"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:365
 msgid "Evolution Elm importer"
 msgstr "Evolution-Elm-Importeur"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:366
 msgid "Import mail from Elm."
 msgstr "E-Mail von Elm importieren."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "Zielordner:"
+#: ../mail/importers/evolution-mbox-importer.c:114
+#| msgid "Destination folder:"
+msgid "_Destination folder:"
+msgstr "Zielor_dner:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder to import into"
 msgstr "Wählen Sie den Ordner, in den importiert werden soll"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#: ../mail/importers/evolution-mbox-importer.c:262 ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:263
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importeur für Ordner im Berkeley-Mailbox-Format"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "E-Mail-Postfach wird importiert"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:149
+#: ../plugins/pst-import/pst-importer.c:453
+#: ../plugins/pst-import/pst-importer.c:559
 #, c-format
-msgid "Importing `%s'"
+#| msgid "Importing `%s'"
+msgid "Importing '%s'"
 msgstr "»%s« wird importiert"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:293
 #, c-format
 msgid "Scanning %s"
 msgstr "%s wird eingelesen"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "Pine-Daten werden importiert"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:418
 msgid "Evolution Pine importer"
 msgstr "Evolution-Pine-Importeur"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:419
 msgid "Import mail from Pine."
 msgstr "E-Mail von Pine importieren."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "E-Mail an %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "E-Mail von %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "Betreff ist %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(Hinweis: Erfordert einen Neustart der Anwendung)"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"Die Filterregel »%s« wurde aktualisiert, weil sie folgenden gerade entfernten "
+"Ordner verwendet:\n"
+"»%s«."
+msgstr[1] ""
+"Die folgenden Filterregeln »%s« wurden aktualisiert, weil sie folgenden gerade "
+"entfernten Ordner verwenden:\n"
+"»%s«."
 
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>Top-Posting-Option</b> (nicht empfohlen)"
+msgid "(Not Recommended)"
+msgstr "(Nicht empfohlen)"
 
 #: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(Hinweis: Erfordert einen Neustart der Anwendung)"
+
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "Konteninformation"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "N_eue Signatur …"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Aus diesem Konto ausgehende Nachrichten _immer signieren"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr ""
 "Beim Verschicken verschlüsselter E-Mails auch für sich sel_bst verschlüsseln"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Immer _Kopie schicken an:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Immer _Blindkopie schicken an:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Schlüssel am Schlüsselbund beim Verschlüsseln _immer vertrauen"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr ""
 "Beim Verschicken verschlüsselter E-Mails _immer für mich selbst verschlüsseln"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "_Lesebestätigung immer anfordern"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:15 ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "_Emoticon-Bilder automatisch einfügen"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "_Zeichensatz:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "_Prüfen, welche Arten unterstützt werden"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "_Benutzerdefinierte Kopfzeilen auf Unerwünschtheit prüfen"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
 msgstr "_Eingehende E-Mail auf Unerwünschtheit prüfen"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "Rechtschreibprüfung während der Ein_gabe durchführen"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Überprüft, ob eingehende Nachrichten unerwünscht sind"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "En_tfernen"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "Ent_fernen"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "_Farbe für falsch geschriebene Wörter:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "Verfassen von Nachrichten"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "Beim _Säubern eines Ordners nachfragen"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Default Behavior"
 msgstr "Vorgabeverhalten"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "Voreingestellte _Zeichenkodierung:"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Delete Mail"
 msgstr "Nachricht löschen"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Delete junk messages on e_xit"
 msgstr "Unerwünscht-Ordner beim Beenden lee_ren"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Ausgehende Nachrichten (per Vorgabe) digital _signieren"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "Angezeigte Nac_hrichtenköpfe"
-
 #: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "E-Mail-Textinhalte nicht formatieren wenn Text _größer als"
+#| msgid "Displayed Message _Headers"
+msgid "Displayed Message Headers"
+msgstr "Angezeigte Nachrichtenköpfe"
 
 #: ../mail/mail-config.ui.h:38
+#| msgid "Do not format messages when text si_ze exceeds"
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "Nachrichten nicht anzeigen, wenn Text _größer als"
+
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "_Nachrichten nicht als Unerwünscht markieren, wenn Absender im Adressbuch"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not quote"
 msgstr "Nicht zitieren"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "_Entwurfsordner:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "_E-Mail-Adresse:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "Müllordner beim Beenden _leeren"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Magic S_pacebar"
 msgstr "Magische _Leertaste einschalten"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Sea_rch Folders"
 msgstr "Such_ordner aktivieren"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "_Verschlüsselungszertifikat:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "Ausgehende Nachrichten _verschlüsseln (per Vorgabe)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fi_xed-width:"
 msgstr "_Dicktengleich:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Fix_ed width Font:"
 msgstr "_Dicktengleiche Schrift:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Font Properties"
 msgstr "Schrifteigenschaften"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Format messages in _HTML"
 msgstr "Nachrichten in _HTML formatieren"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "_Voller Name:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "HTML Messages"
 msgstr "HTML-Nachrichten"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-Proxy:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Headers"
 msgstr "Kopfzeilen"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:60
 msgid "Inline"
 msgstr "Eingebettet"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 msgid "Inline (Outlook style)"
 msgstr "Eingebettet (Outlook-Stil)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:63
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Beschriftungen"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "Sprachtabelle"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "Bilder werden geladen"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "E-Mail-Kopf-Tabelle"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "Nachrichtenanzeige"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 msgid "Message Fonts"
 msgstr "Nachrichtenschriften"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "Message Receipts"
 msgstr "Lesebestätigungen"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "No _Proxy for:"
 msgstr "Kein _Proxy für:"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:74
 msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+"Note: you will not be prompted for a password until you connect for the first "
+"time"
 msgstr ""
 "Hinweis: Sie werden erst nach dem Passwort gefragt, wenn Sie das erste Mal "
 "eine Verbindung mit dem Server aufbauen"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:75
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Einstellung wird ignoriert, falls eine benutzerdefinierte unerwünschte "
 "Kopfzeile gefunden wird."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:76
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Zusätzliche Informationen"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:79
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_Schlüsselkennung:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Pass_word:"
 msgstr "_Passwort:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 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.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Printed Fonts"
 msgstr "Gedruckte Schriften"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Proxy Settings"
 msgstr "Proxy-Einstellungen"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Quoted"
 msgstr "Zitiert"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "Re_member password"
 msgstr "An Passwort _erinnern"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "Re_ply-To:"
 msgstr "_Antwort an:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "Remember _password"
 msgstr "An _Passwort erinnern"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "Required Information"
 msgstr "Benötigte Informationen"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL wird von dieser Erstellung von Evolution nicht unterstützt"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "_Nach Foto des Absenders nur in lokalen Adressbüchern suchen"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "A_uswählen …"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "Lese_bestätigungen verschicken:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "_Standard-Schrift:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "Sicheres MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "Select Drafts Folder"
 msgstr "Ordner für Entwürfe wählen"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "Dicktengleiche HTML-Schrift wählen"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "Dicktengleiche HTML-Druckschrift wählen"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font"
 msgstr "HTML-Proportionalschrift wählen"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "HTML-Proportionaldruckschrift wählen"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "Select Sent Folder"
 msgstr "Gesendet-Ordner wählen"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 msgid "Sender Photograph"
 msgstr "Foto des Absenders"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Sending Mail"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "Ordner für _verschickte Nachrichten:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Sent and Draft Messages"
 msgstr "Verschickte und entworfene Nachrichten"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server erfordert _Legitimation"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:114
 msgid "Server _Type:"
 msgstr "_Server-Art:"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_natures"
 msgstr "Sig_naturen"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "Signatur_zertifikat:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "_Signatur:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "Signaturen"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "Beim Antworten auf Mails _unten mit dem Schreiben beginnen"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "T_yp:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"Diese Sprachliste enthält ausschließlich die Sprachen, für die ein "
-"Wörterbuch installiert sind."
+"Diese Sprachliste enthält ausschließlich die Sprachen, für die ein Wörterbuch "
+"installiert sind."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12942,7 +12700,13 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zur Anzeige verwendet."
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:128
+#| msgid "Posting destination"
+msgid "Top Posting Option"
+msgstr "Top-Posting-Option"
+
+#: ../mail/mail-config.ui.h:129
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12950,418 +12714,419 @@ msgstr ""
 "Geben Sie einen Namen an, den Sie mit diesem Konto assoziieren,\n"
 "zum Beispiel »Geschäftlich« oder »Persönlich«."
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:131
 msgid "Us_ername:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:132
 msgid "Use Authe_ntication"
 msgstr "_Legitimation benutzen"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:133 ../plugins/caldav/caldav-source.c:222
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:134
 msgid "V_ariable-width:"
 msgstr "_Proportional:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:135
 msgid "_Add Signature"
 msgstr "Signatur _hinzufügen"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:136
 msgid "_Always load images from the Internet"
 msgstr "Bilder _immer aus dem Internet laden"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:137
 msgid "_Authentication Type"
 msgstr "_Legitimationsart"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:138
 msgid "_Default junk plugin:"
 msgstr "_Vorgabe-Unerwünscht-Plugin:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:139
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte Internetverbindung"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:140
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Besprechungsanfragen nicht signieren (zur Kompatibilität mit Outlook)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:141
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:142
 msgid "_Keep Signature above the original message on replying"
 msgstr "Signat_ur beim Antworten über der Original-Nachricht behalten"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:143
 msgid "_Languages"
 msgstr "_Sprachen"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:144
 msgid "_Load images in messages from contacts"
 msgstr "Bilder in Nachrichten von Kontakten _laden"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:145
 msgid "_Lookup in local address book only"
 msgstr "Nur in _lokalen Adressbüchern suchen"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:146
 msgid "_Make this my default account"
 msgstr "Dieses zum Vo_rgabekonto machen"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:147
 msgid "_Manual proxy configuration:"
 msgstr "_Manuelle Proxy-Konfiguration:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:148
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:150
 msgid "_Never load images from the Internet"
 msgstr "Bilder _nie aus dem Internet laden"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:151
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:152
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "_Nachfrage beim Abschicken von HTML-Nachrichten an Kontakte, die dies nicht "
 "wünschen"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:153
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Nachfrage beim Abschicken von Nachrichten mit _leerem Betreff"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:154
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:155
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:156
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sicherer HTTP-Proxy:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Server:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:160
 msgid "_Show image animations"
 msgstr "Bildanimationen an_zeigen"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:161
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Foto des Absenders in der Nachrichtenvorschau anzeigen"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:163
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Empfängerkopfzeilen (An/Kopie/Blindkopie) _verkleinern zu "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:164
 msgid "_Use Secure Connection:"
 msgstr "_Sichere Verbindung verwenden:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:165
 msgid "_Use system defaults"
 msgstr "_Vorgabe benutzen"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:166
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie andere Anwendungen _verwenden"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:169
 msgid "addresses"
 msgstr "Adressen"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:170 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:171
 msgid "color"
 msgstr "Farbe"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:172
 msgid "description"
 msgstr "Beschreibung"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Alle aktiven fernen Ordner"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "Alle lokalen und aktiven, fernen Ordner"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "Alle lokalen Ordner"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Anrufen"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "Abges_chlossen"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Digital Signature"
 msgstr "Digitale Signatur"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "Nicht weiterleiten"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Folder Subscriptions"
 msgstr "Ordnerabonnements"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Folgenachricht"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Zu Ihrer Information"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Lizenzvereinbarung"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "Antwort an alle"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "Überprüfen"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:20
 msgid "S_erver:"
 msgstr "_Server:"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Search Folder Sources"
 msgstr "Ordnerquellen durchsuchen"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Security Information"
 msgstr "Sicherheitsinformationen"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Specific folders"
 msgstr "Bestimmte Ordner"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:24
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
-"Dies ist eine Liste der von Ihnen als Folgenachricht markierten "
-"Nachrichten.\n"
+"Dies ist eine Liste der von Ihnen als Folgenachricht markierten Nachrichten.\n"
 "Bitte wählen Sie eine Aktion für die Folgenachricht aus dem Menü »Markierung«."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Accept License"
 msgstr "Lizenz _akzeptieren"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Due By:"
 msgstr "_Fällig am:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Flag:"
 msgstr "_Markierung:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Tick this to accept the license agreement"
 msgstr "Ha_ken Sie dies ab, um die Lizenzvereinbarung zu akzeptieren"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:896
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Gewählte Nachrichten filtern"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:576
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:588 ../mail/mail-ops.c:616
 #, c-format
+#| msgid ""
+#| "Failed to append to %s: %s\n"
+#| "Appending to local `Sent' folder instead."
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "Anhängen an %s gescheitert: %s\n"
 "Stattdessen wird versucht, an den lokalen »Verschicken«-Ordner anzuhängen."
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:633
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+#| msgid "Failed to append to local `Sent' folder: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Anhängen an lokalen »Verschickt«-Ordner gescheitert: %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:744 ../mail/mail-ops.c:825
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:754
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:781
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d von %d Nachrichten konnten nicht verschickt werden"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:783 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "Abgebrochen."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:785 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:897
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Nachricht wird in Ordner »%s« gespeichert"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:974
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Nachrichten werden nach »%s« verschoben"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:974
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Nachrichten werden nach »%s« kopiert"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1083
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Ordner in »%s« werden eingelesen"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1191
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1232
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Ordner »%s« wird geöffnet"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1298
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Informationen über Speicherplatzlimit für Ordner »%s« werden abgerufen"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1370
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Speicher »%s« wird geöffnet"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1441
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Ordner »%s« wird entfernt"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1561
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1624
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto »%s« wird gesäubert und gespeichert"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1625
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto »%s« wird gespeichert"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1679
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Ordner »%s« wird aufgefrischt"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1719
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Ordner »%s« wird gesäubert"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1764
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1765
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1961
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d Nachricht wird abgerufen"
 msgstr[1] "%d Nachrichten werden abgerufen"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2050
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d Nachricht wird gespeichert"
 msgstr[1] "%d Nachrichten werden gespeichert"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2131
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13370,11 +13135,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2203
 msgid "Saving attachment"
 msgstr "Anlage wird gespeichert"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2221 ../mail/mail-ops.c:2229
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13383,35 +13148,35 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2244
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2389
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Verbindung mit »%s« wird getrennt"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2389
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Verbindung mit »%s« wird erneut hergestellt"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2485
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Konto »%s« wird für Offline-Betrieb vorbereitet"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2571
 msgid "Checking Service"
 msgstr "Dienst wird überprüft"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "Absagevorgang …"
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "E-Mails verschicken und abrufen"
 
@@ -13419,114 +13184,155 @@ msgstr "E-Mails verschicken und abrufen"
 msgid "Cancel _All"
 msgstr "A_lles abbrechen"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "Aktualisieren …"
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "Warten …"
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:208
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Passwort für %s eingeben"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:210
 msgid "Enter Passphrase"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:213
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort für %s eingeben"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:215
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:257
 msgid "User canceled operation."
 msgstr "Benutzer hat Vorgang abgebrochen."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:667
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da keine Zieladresse "
 "angegeben wurde."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:673
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da kein nutzbares Konto "
 "gefunden wurde."
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:119
 #, c-format
-msgid "Could not create spool directory `%s': %s"
+#| msgid "Could not create spool directory `%s': %s"
+msgid "Could not create spool directory '%s': %s"
 msgstr "Spool-Ordner »%s« konnte nicht angelegt werden: %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:149
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+#| msgid "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Es wurde versucht, movemail auf eine nicht-mbox-Quelle »%s« auszuführen"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:297
 #, c-format
-msgid "Invalid folder: `%s'"
+#| msgid "Invalid folder: `%s'"
+msgid "Invalid folder: '%s'"
 msgstr "Ungültiger Ordner: »%s«"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Suchordner wird eingerichtet: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:228
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Suchordner für »%s:%s« werden aktualisiert"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Suchordner für »%s« werden aktualisiert"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:678
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"Der Suchordner »%s« wurde aktualisiert, weil er folgenden gerade entfernten "
+"Ordner verwendet:\n"
+"»%s«."
+msgstr[1] ""
+"Die folgenden Suchordner »%s« wurde aktualisiert, weil sie folgenden gerade "
+"entfernten Ordner verwenden:\n"
+"»%s«."
+
+#: ../mail/mail-vfolder.c:1197
 msgid "Edit Search Folder"
 msgstr "Suchordner bearbeiten"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1302
 msgid "New Search Folder"
 msgstr "Neuer Suchordner"
 
 #: ../mail/mail.error.xml.h:1
+#| msgid "Check Junk Failed"
+msgid "\"Check Junk\" Failed"
+msgstr "Überprüfung auf Unerwünschtheit gescheitert"
+
+#: ../mail/mail.error.xml.h:2
+#| msgid "Report Junk Failed"
+msgid "\"Report Junk\" Failed"
+msgstr "Bericht über Unerwünschtheit gescheitert"
+
+#: ../mail/mail.error.xml.h:3
+#| msgid "Report Not Junk Failed"
+msgid "\"Report Not Junk\" Failed"
+msgstr "Bericht über Erwünschtheit gescheitert"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 "Es existiert bereits ein Ordner namens »{0}«. Bitte verwenden Sie einen "
 "anderen Namen."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 "Es existiert bereits ein Ordner namens »{1}«. Bitte verwenden Sie einen "
 "anderen Namen."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13538,7 +13344,7 @@ msgstr ""
 "Sie können diesen Ordner ignorieren, überschreiben, seinen Inhalt anhängen "
 "oder abbrechen."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13546,7 +13352,7 @@ msgstr ""
 "Eine Lesebestätigung wurde für »{1}« angefordert. Soll die Bestätigung an {0} "
 "geschickt werden?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
@@ -13554,7 +13360,7 @@ msgstr ""
 "Es existiert bereits eine Signatur namens »{0}«. Bitte verwenden Sie einen  "
 "anderen Namen."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13562,28 +13368,24 @@ msgstr ""
 "Das Hinzufügen einer aussagekräftigen Betreffzeile zu Ihren Nachrichten "
 "verschafft den Empfängern eine Vorstellung, wovon Ihre E-Mail handelt."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr ""
 "Sind Sie sicher, dass Sie dieses Konto und alle seine Vertretungen löschen "
 "wollen?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "Sind Sie sicher, dass Sie dieses Konto löschen wollen?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Sind Sie sicher, dass Sie dieses Konto deaktivieren und alle seine "
 "Vertretungen löschen wollen?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Sind Sie sicher, dass Sie {0} Nachrichten auf einmal öffnen wollen?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13591,7 +13393,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie endgültig alle gelöschten Nachrichten aus allen "
 "Ordnern entfernen wollen?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13599,95 +13401,88 @@ msgstr ""
 "Sind Sie sicher, dass Sie endgültig alle gelöschten Nachrichten aus dem "
 "Ordner »{0}« entfernen wollen?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Sind Sie sicher, dass Sie eine HTML-Nachricht verschicken wollen?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr ""
 "Sind Sie sicher, dass Sie eine Nachricht mit einer ungültigen Adresse "
 "verschicken wollen?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr ""
 "Sind Sie sicher, dass Sie eine Nachricht mit ungültigen Adressen verschicken "
 "wollen?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Sind Sie sicher, dass Sie eine Nachricht verschicken wollen, die nur an "
 "Blindkopie-Empfänger gerichtet ist?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr ""
 "Sind Sie sicher, dass Sie eine Nachricht ohne Betreff verschicken wollen?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "Grund: »{0}«."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "Grund: »{2}«."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Leere Signatur"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Suchordner »{0}« konnte nicht hinzugefügt werden."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Ordner »{0}« konnte nicht nach »{1}« kopiert werden."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "Ordner »{0}« konnte nicht angelegt werden."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "Temporärer Speicherordner konnte nicht angelegt werden."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Der Speicherordner konnte nicht angelegt werden. Grund: »{1}«."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Ordner »{0}« konnte nicht gelöscht werden."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Systemordner »{0}« konnte nicht gelöscht werden."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
 "Suchordner »{0}« konnte nicht bearbeitet werden, da er nicht vorhanden ist."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Ordner »{0}« konnte nicht nach »{1}« verschoben werden."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
-msgstr "Quelle »{1}« konnte nicht geöffnet werden"
+#: ../mail/mail.error.xml.h:32
+#| msgid "Cannot open source \"{1}\""
+msgid "Cannot open source \"{1}\"."
+msgstr "Quelle »{1}« konnte nicht geöffnet werden."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "Quelle »{2}« konnte nicht geöffnet werden."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "Ziel »{2}« konnte nicht geöffnet werden."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13696,35 +13491,31 @@ msgstr ""
 "werden. Die Nutzung dieses Providers ist nicht möglich, solange Sie dessen "
 "Lizenz nicht akzeptiert haben."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "»{0}« konnte nicht in »{1}« umbenannt werden."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Systemordner »{0}« konnte nicht umbenannt oder verschoben werden."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "Änderungen am Konto konnten nicht gespeichert werden."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Speichern in den Ordner »{0}« gescheitert."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "Speichern in die Datei »{0}« gescheitert."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Signaturskript »{0}« konnte nicht festgelegt werden."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Überprüfung auf Unerwünschtheit gescheitert"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13733,27 +13524,27 @@ msgstr ""
 "Erinnerung: Bei Passwörtern wird zwischen Groß- und Kleinschreibung "
 "unterschieden. Möglicherweise ist Ihre Dauerumschalttaste aktiv."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Signaturdatei konnte nicht gespeichert werden."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Nachrichten im Suchordner »{0}« löschen?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Do not d_elete"
 msgstr "Nicht l_öschen"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "Nicht löschen"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "Nicht deaktivieren"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13761,64 +13552,69 @@ msgstr ""
 "Sollen die für die Benutzung im Offline-Modus markierten Ordner lokal "
 "abgeglichen werden?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "Sollen alle Nachrichten als gelesen markiert werden?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Sollen die vorgenommenen Änderungen gespeichert werden?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Passwort eingeben."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Fehler beim Laden der Filterdefinitionen."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Fehler beim Ausführen eines Vorgangs."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "Fehler bei »{0}«."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "Die Datei existiert, das Überschreiben ist jedoch nicht möglich."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "Die Datei existiert, ist jedoch keine gewöhnliche Datei"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 "Falls Sie fortfahren, können Sie diese Nachrichten nicht mehr "
 "wiederherstellen."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
+#| msgid ""
+#| "If you delete the folder, all of its contents and its subfolders contents "
+#| "will be deleted permanently."
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
 "Falls Sie einen Ordner löschen, geht sein gesamter Inhalt sowie der Inhalt "
 "seiner Unterordner dauerhaft verloren."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "Falls Sie einen Ordner löschen, geht sein gesamter Inhalt dauerhaft verloren."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr ""
-"Falls Sie fortfahren, werden alle Vertretungskonten dauerhaft gelöscht."
+msgstr "Falls Sie fortfahren, werden alle Vertretungskonten dauerhaft gelöscht."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13826,40 +13622,39 @@ msgstr ""
 "Falls Sie fortfahren, werden die Konten- und\n"
 "Vertretungsinformationen dauerhaft gelöscht."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 "Falls Sie fortfahren, werden die Konteninformationen dauerhaft gelöscht."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+"If you quit, these messages will not be sent until Evolution is started again."
 msgstr ""
 "Falls Sie Evolution beenden, werden diese Nachrichten nicht verschickt, "
 "solange Evolution nicht neu gestartet wurde."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Legitimation ungültig"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Löschen der E-Mail gescheitert"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "E-Mail-Filter automatisch aktualisiert."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
+"Many email systems add an Apparently-To header to messages that only have BCC "
+"recipients. This header, if added, will list all of your recipients to your "
+"message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
 "Viele E-Mail-Systeme fügen eine »Apparently-To«-Kopfzeile zu Nachrichten "
@@ -13868,41 +13663,40 @@ msgstr ""
 "Um dies zu umgehen, sollten Sie mindestens einen »An:«- oder »Kopie an:-"
 "Empfänger hinzufügen.«"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "Ordner fehlt."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "Keine Quellen gewählt."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 "Zu viele Nachrichten auf einmal zu öffnen, könnte eine längere Zeit in "
 "Anspruch nehmen."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Please check your account settings and try again."
 msgstr ""
 "Bitte überprüfen Sie ihre Kontoeinstellungen und versuchen Sie es erneut."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Please enable the account or send using another account."
 msgstr ""
 "Aktivieren Sie bitte das Konto oder verwenden Sie ein anderes Konto zum "
 "Senden."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
+"Please enter a valid email address in the To: field. You can search for email "
+"addresses by clicking on the To: button next to the entry box."
 msgstr ""
-"Bitte geben Sie eine gültige E-Mail-Adresse im An-Feld ein. Sie können nach "
-"E-Mail-Adressen suchen, indem Sie den An-Knopf neben dem Eingabefeld "
-"anklicken."
+"Bitte geben Sie eine gültige E-Mail-Adresse im An-Feld ein. Sie können nach E-"
+"Mail-Adressen suchen, indem Sie den An-Knopf neben dem Eingabefeld anklicken."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13913,80 +13707,71 @@ msgstr ""
 "{0}\n"
 "Dennoch abschicken?"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "Geben Sie bitte einen eindeutigen Namen für diese Signatur ein."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "Bitte warten."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Probleme beim Migrieren des alten E-Mail-Ordners »{0}«."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Abfrage des Servers nach einer Liste der unterstützten "
 "Legitimationsmechanismen."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "Lesebestätigung angefordert."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Ordner »{0}« und alle seine Unterordner wirklich löschen?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\"?"
 msgstr "Soll der Ordner »{0}« wirklich gelöscht werden?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "Bericht über Unerwünschtheit gescheitert"
-
 #: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "Bericht über Erwünschtheit gescheitert"
-
-#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "Suchordner automatisch aktualisiert."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "Bestätigung senden"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "Signatur existiert bereits"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "Abgleichen"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Ordner lokal für Offline-Benutzung abgleichen?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Evolution to function correctly and cannot be "
+"renamed, moved, or deleted."
 msgstr ""
 "Evolution benötigt Systemordner, um korrekt zu funktionieren. Diese können "
 "weder umbenannt, noch verschoben oder gelöscht werden."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC "
+"recipients. This header, if added, will list all of your recipients in your "
+"message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
 "Die zu verschickende Kontaktliste ist so konfiguriert, dass Listenempfänger "
 "verborgen werden.\n"
@@ -13997,35 +13782,7 @@ msgstr ""
 "Um dies zu umgehen, sollten Sie mindestens einen »An:«- oder »Kopie an:-"
 "Empfänger hinzufügen.«"
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Der bzw. die folgende(n) Suchordner:\n"
-"{0}\n"
-"verwendete(n) den soeben entfernten Ordner:\n"
-"    »{1}«\n"
-"und wurde(n) aktualisiert."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Die folgende(n) Filterregel(n):\n"
-"{0}\n"
-"verwendete(n) den soeben entfernten Ordner:\n"
-"    »{1}«\n"
-"und wurde(n) aktualisiert."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -14033,7 +13790,7 @@ msgstr ""
 "Der folgende Empfänger wurden als ungültige E-Mail-Adresse erkannt:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -14041,11 +13798,11 @@ msgstr ""
 "Die folgenden Empfänger wurden als ungültige E-Mail-Adressen erkannt:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "Die Skriptdatei muss existieren und ausführbar sein."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14053,22 +13810,22 @@ msgstr ""
 "Möglicherweise wurde dieser Ordner implizit hinzugefügt. Falls erforderlich, "
 "können Sie zum Editor für Suchordner gehen, um ihn explizit hinzuzufügen."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:105
 msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+"This message cannot be sent because the account you chose to send with is not "
+"enabled"
 msgstr ""
 "Diese Nachricht konnte nicht verschickt werden, da das zum Verschicken "
 "gewählte Konto nicht aktiviert ist"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Diese Nachricht konnte nicht verschickt werden, da Sie keine Empfänger "
 "angegeben haben"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14076,23 +13833,22 @@ msgstr ""
 "Dieser Server unterstützt diese Art der Legitimation nicht. Möglicherweise "
 "unterstützt er keinerlei Legitimation."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "Diese Signatur wurde geändert, aber nicht gespeichert"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:109
 msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
+"This will mark all messages as read in the selected folder and its subfolders."
 msgstr ""
 "Dies wird alle Nachrichten im gewählten Ordner und seinen Unterordnern als "
 "gelesen markieren."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "Verbindungsaufbau zum GroupWise-Server gescheitert."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14100,57 +13856,55 @@ msgstr ""
 "Der Entwurfsordner für dieses Konto konnte nicht geöffnet werden. Soll "
 "stattdessen der System-Entwurfsordner verwendet werden?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "Die Lizenzdatei konnte nicht gelesen werden."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "_Vorgabe benutzen"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "Soll der vorgegebene Entwurfsordner benutzt werden?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"Das Löschen von E-Mails in Suchordnern löscht diese E-Mails in den "
-"jeweiligen Nachrichtenordnern, in denen sich diese E-Mails physikalisch "
-"befinden.\n"
+"Das Löschen von E-Mails in Suchordnern löscht diese E-Mails in den jeweiligen "
+"Nachrichtenordnern, in denen sich diese E-Mails physikalisch befinden.\n"
 "Möchten Sie wirklich löschen?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:117
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Sie haben keine ausreichenden Rechte um diese E-Mail zu löschen."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:118
 msgid "You have not filled in all of the required information."
 msgstr "Sie haben nicht alle erforderlichen Felder ausgefüllt."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:119
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
-"Es existieren unverschickte Nachrichten. Wollen Sie Evolution dennoch "
-"beenden?"
+"Es existieren unverschickte Nachrichten. Wollen Sie Evolution dennoch beenden?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:120
 msgid "You may not create two accounts with the same name."
 msgstr "Sie können keine zwei Konten mit dem selben Namen anlegen."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "Sie müssen einen Namen für diesen Suchordner vergeben."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "Sie müssen einen Ordner angeben."
 
 # CHECK
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14160,115 +13914,110 @@ msgstr ""
 "Dies geschieht entweder durch individuelle Auswahl der Ordner und/oder durch "
 "das Wählen aller lokalen, aller fernen Ordner oder beider."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:125
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Anmedlung am Server »{0}« als »{0}« ist gescheitert."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "An_hängen"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "Änderungen _verwerfen"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:128
 msgid "_Do not Synchronize"
 msgstr "_Nicht abgleichen"
 
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:129 ../modules/mail/e-mail-shell-view-actions.c:821
 msgid "_Empty Trash"
 msgstr "_Müll leeren"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "_Säubern"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "Nachrichten ö_ffnen"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1110
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1111
 msgid "Seen"
 msgstr "Gelesen"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1112
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1113
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1114
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1115
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1119
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1120
 msgid "Lower"
 msgstr "Niedriger"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1124
 msgid "Higher"
 msgstr "Höher"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1125
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1735 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1742 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1751
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1763
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1771
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1773
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2524
 msgid "Select all visible messages"
 msgstr "Alle sichtbaren Nachrichten wählen"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "Shell-Backend"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4204 ../mail/message-list.c:4600
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4437
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14276,15 +14025,7 @@ msgstr ""
 "Auf Ihr Suchkriterium treffen keine Nachrichten zu. Leeren Sie die Suche mit "
 "Suchen->Verwerfen oder ändern Sie sie."
 
-#: ../mail/message-list.c:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"Es sind nur verborgene Nachrichten in diesem Ordner. Verwenden Sie zum "
-"Anzeigen im Menü »Ansicht->Verborgene Nachrichten anzeigen«."
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4439
 msgid "There are no messages in this folder."
 msgstr "Es existieren keine Nachrichten in diesem Ordner."
 
@@ -14321,28 +14062,23 @@ msgstr "Größe"
 msgid "Subject - Trimmed"
 msgstr "Betreff - Gekürzt"
 
-#: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../mail/searchtypes.xml.h:1 ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Body contains"
 msgstr "Rumpf enthält"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../mail/searchtypes.xml.h:2 ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Message contains"
 msgstr "Nachricht enthält"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../mail/searchtypes.xml.h:3 ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Recipients contain"
 msgstr "Empfänger enthalten"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../mail/searchtypes.xml.h:4 ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Sender contains"
 msgstr "Absender enthält"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../mail/searchtypes.xml.h:5 ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Subject contains"
 msgstr "Betreff enthält"
 
@@ -14376,15 +14112,16 @@ msgstr ""
 "Verbindung zu Ihrem LDAP-Server her. Das bedeutet, dass Ihre Verbindung "
 "unsicher ist und dadurch ein Sicherheitsproblem entsteht."
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "Im Geburts- und Jahrestagskalender suchen"
+#: ../modules/addressbook/addressbook-config.c:602
+#| msgid "Use in _Birthday & Anniversaries calendar"
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "Im Geburt_s- und Jahrestagskalender verwenden"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "Den Adressbuchinhalt lokal zum Arbeiten im Offline-Modus _kopieren"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -14394,51 +14131,50 @@ msgstr ""
 "soll. Es wurde bereits eine Liste der Standard-Ports bereitgestellt. Fragen "
 "Sie Ihren Systemadministrator, welchen Port Sie angeben müssen."
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
+"This is the method Evolution will use to authenticate you.  Note that setting "
+"this to \"Email Address\" requires anonymous access to your LDAP server."
 msgstr ""
 "Dies ist die von Evolution verwendete Methode, um Sie zu legitimieren. "
-"Beachten Sie, dass ein anonymer Zugriff auf den LDAP-Server erforderlich "
-"ist, wenn Sie dies auf »E-Mail-Adresse« einstellen."
+"Beachten Sie, dass ein anonymer Zugriff auf den LDAP-Server erforderlich ist, "
+"wenn Sie dies auf »E-Mail-Adresse« einstellen."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
+"your search base. A search scope of \"one\" will only include the entries one "
+"level beneath your base."
 msgstr ""
-"Der Suchbereich legt fest, wie tief Sie bei der Suche im Ordnerbaum "
-"absteigen wollen. Der Suchbereich »sub« schließt alle Einträge unterhalb des "
+"Der Suchbereich legt fest, wie tief Sie bei der Suche im Ordnerbaum absteigen "
+"wollen. Der Suchbereich »sub« schließt alle Einträge unterhalb des "
 "Suchbereichs ein. Der Suchbereich »one« hingegen schließt lediglich die Ebene "
 "unterhalb des Ausgangspunktes der Suche ein."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "Server-Informationen"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Details"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Suchen"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "Herunterladen"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "Adressbucheigenschaften"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
@@ -14478,8 +14214,7 @@ msgstr "Position des Vorschaufeldes der Kontaktliste bei vertikaler Anordnung."
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Show autocompleted name with an address"
 msgstr ""
-"Legt fest, ob der automatisch vervollständigte Name mit Adresse angezeigt "
-"wird"
+"Legt fest, ob der automatisch vervollständigte Name mit Adresse angezeigt wird"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show preview pane"
@@ -14525,9 +14260,11 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "Soll das Vorschaufeld angezeigt werden?"
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Tabellenspalte:"
+#: ../modules/mail/em-mailer-prefs.c:1159
+msgid "_Table column:"
+msgstr "_Tabellenspalte:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -14539,7 +14276,7 @@ msgstr "Immer Adresse des automatisch vervollständigten Kontakts an_zeigen"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "Auf LDAP-Servern"
 
@@ -14549,7 +14286,7 @@ msgid "_Contact"
 msgstr "_Kontakt"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
@@ -14559,7 +14296,7 @@ msgid "Contact _List"
 msgstr "Kontakt_liste"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "Eine neue Kontaktliste anlegen"
 
@@ -14569,7 +14306,7 @@ msgid "Address _Book"
 msgstr "Adressb_uch"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "Ein neues Adressbuch anlegen"
 
@@ -14577,340 +14314,236 @@ msgstr "Ein neues Adressbuch anlegen"
 #: ../modules/addressbook/e-book-shell-backend.c:376
 #: ../modules/addressbook/e-book-shell-view.c:394
 #: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Quellenliste"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "Die Registratur für Adressbücher"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "Aktuelle Ansicht"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "Die derzeit ausgewählte Adressbuchansicht"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Als Vorschau angezeigter Kontakt"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "Der im Vorschaufeld angezeigte Kontakt"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "Vorschau anzeigen"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "Legt fest, ob das Vorschaufeld angezeigt werden soll"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP-Server"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "Einstellungen der Auto-Vervollständigung"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-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 ""
-"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 …"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Das Format der Mailinglisten-Kontakte hat sich geändert.\n"
-"\n"
-"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Das Format der Telefonnummern hat sich teilweise geändert.\n"
-"\n"
-"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-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 …"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "Quellenauswahl-Widget"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "Dieses Widget zeigt Gruppen von Adressbüchern an"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "Als VCard speichern"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "Kontakte _kopieren nach …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr ""
 "Die Kontakte des gewählten Adressbuchs in ein anderes Adressbuch kopieren"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "Adressbuch _löschen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "Das gewählte Adressbuch löschen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "Alle Kontakte _verschieben nach …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr ""
 "Die Kontakte des gewählten Adressbuchs in ein anderes Adressbuch verschieben"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "_Neues Adressbuch"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "Adress_bucheigenschaften"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "Die Eigenschaften des gewählten Adressbuchs anzeigen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/mail/e-mail-shell-view-actions.c:905
 msgid "_Rename..."
 msgstr "_Umbenennen …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "Das gewählte Adressbuch umbenennen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "Adressbuch als v_Card speichern"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Die Kontakte des gewählten Adressbuchs als vCard speichern"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "Laden stoppen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "Kontakt _kopieren nach …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "Gewählte Kontakte in ein anderes Adressbuch kopieren"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "Kontakt _löschen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "In Kontakten _suchen …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "Im angezeigten Kontakt einen Text suchen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "Kontakt _weiterleiten …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "Gewählte Kontakte an jemanden verschicken"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "Kontakt _verschieben nach …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "Gewählte Kontakte in ein anderes Adressbuch verschieben"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "_Neuer Kontakt …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "Neue Kontakt_liste …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "Kontakt ö_ffnen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "Den aktuellen Kontakt anzeigen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "_Nachricht an Kontakt schicken …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "Eine Nachricht an die gewählten Kontakte schicken"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "_Actions"
 msgstr "A_ktionen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 #: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "_Preview"
 msgstr "_Vorschau"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "Ei_genschaften"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "Als VCard _speichern …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "Kontakt_vorschau"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "Kontakt-Vorschaufenster anzeigen"
 
 # CHECK
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 #: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/calendar/e-task-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Classic View"
 msgstr "_Klassische Ansicht"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "Kontakt-Vorschaufenster unter der Kontaktliste anzeigen"
 
 # CHECK - macht überhaupt keinen Sinn
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 #: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/calendar/e-task-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Vertical View"
 msgstr "_Vertikale Ansicht"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "Kontakt-Vorschaufenster neben der Kontaktliste anzeigen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/calendar/e-task-shell-view-actions.c:941
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../shell/e-shell-content.c:441
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "Alle angezeigten Kontakte drucken"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "Eine Vorschau auf die zu druckenden Kontakte anzeigen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "Die gewählten Kontakte drucken"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Als VCard speichern …"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "Gewählte Kontakte als vCard speichern"
 
@@ -14954,116 +14587,107 @@ msgstr "Kontaktinformationen"
 msgid "Contact information for %s"
 msgstr "Kontaktinformationen für %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "Anonym"
 
 # server until either set time limit or amount of contacts limit reached
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "A_dressbuch durchblättern, bis das Limit erreicht ist"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "Anm_eldename:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "Eins"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Suchfilter"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "Such_basis:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "Such_filter:"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
 msgstr ""
-"Der Suchfilter legt die Art der Objekte fest, nach denen gesucht werden "
-"soll. Wird er nicht verändert, so wird die voreingestellte Suche auf den Typ "
+"Der Suchfilter legt die Art der Objekte fest, nach denen gesucht werden soll. "
+"Wird er nicht verändert, so wird die voreingestellte Suche auf den Typ "
 "»Person« durchgeführt."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "Sub"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "Unterstützte Suchbasen"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "Eindeutiger Name (DN) wird verwendet"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "_Download-Limit:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "Unterstützte Suchbasen _suchen"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "An_meldemethode:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "_Suchbereich:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_Zeitüberschreitung:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Sichere Verbindung verwenden:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "Karten"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mportieren"
 
@@ -15085,11 +14709,11 @@ msgstr "In _Aufgaben importieren"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-migrate.c:176
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "Im Web"
 
@@ -15099,7 +14723,7 @@ msgid "Weather"
 msgstr "Wetter"
 
 #: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Geburts- und Jahrestage"
 
@@ -15109,7 +14733,7 @@ msgid "_Appointment"
 msgstr "_Termin"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
@@ -15137,48 +14761,18 @@ msgid "Cale_ndar"
 msgstr "Kalen_der"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
 #: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../plugins/itip-formatter/itip-formatter.c:2666
 msgid "Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "Die Registratur für Kalender"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-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 ""
-"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 …"
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"Alte Einstellungen aus evolution/config.xmldb konnten nicht migiriert werden"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Der Kalender »%s« konnte nicht migriert werden."
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -15187,36 +14781,16 @@ msgstr ""
 "Fehler bei %s\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
 msgid "Loading calendars"
 msgstr "Kalender werden geladen"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:617
 msgid "Calendar Selector"
 msgstr "Kalenderquellenauswahl"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "Widget für die Datumswahl"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "Dieses Widget zeigt einen verkleinerten Kalender an"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "Vorgegebener Kalender"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "Vorgegebener Client für Kalenderverwaltung"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "Dieses Widget zeigt Gruppen von Kalendern an"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:952
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender auf %s wird geöffnet"
@@ -15229,8 +14803,7 @@ msgstr "Drucken"
 #: ../modules/calendar/e-cal-shell-view-actions.c:306
 msgid ""
 "This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
+"amount of time. If you continue, you will not be able to recover these events."
 msgstr ""
 "Dieser Vorgang löscht alle Ereignisse, die älter als der angegebene Zeitraum "
 "sind. Falls Sie fortfahren, können Sie diese Ereignisse nicht "
@@ -15260,244 +14833,245 @@ msgstr "Ereignis"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
 #: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-task-shell-view-actions.c:612
 msgid "Save as iCalendar"
 msgstr "Als iCalendar speichern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "_Kopieren …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "D_elete Calendar"
 msgstr "Kalender _löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Delete the selected calendar"
 msgstr "Den gewählten Kalender löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Go Back"
 msgstr "Zurück gehen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Go Forward"
 msgstr "Vor gehen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "_Heute wählen"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "Heute wählen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "_Datum wählen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "Ein bestimmtes Datum wählen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "_Neuer Kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Purg_e"
 msgstr "_Säubern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Purge old appointments and meetings"
 msgstr "Alte Termine und Besprechungen löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Re_fresh"
 msgstr "Auf_frischen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Refresh the selected calendar"
 msgstr "Den gewählten Kalender aktualisieren"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Rename the selected calendar"
 msgstr "Den gewählten Kalender umbenennen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Show _Only This Calendar"
 msgstr "Nur diesen _Kalender anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Cop_y to Calendar..."
 msgstr "In Kalender k_opieren …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "Besprechung dele_gieren …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delete Appointment"
 msgstr "Den Termin _löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete selected appointments"
 msgstr "Ausgewählte Termine löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete This _Occurrence"
 msgstr "Dieses V_orkommen löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "Diesen Treffer löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete All Occ_urrences"
 msgstr "Alle _Vorkommen löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "Alle Vorkommen löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "New All Day _Event..."
 msgstr "Neues _ganztägiges Ereignis …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Create a new all day event"
 msgstr "Ein neues ganztägiges Ereignis anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "New _Meeting..."
 msgstr "Neue Bes_prechung …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Create a new meeting"
 msgstr "Eine neue Besprechung anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "In Kalender _verschieben …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "Neuer _Termin …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "Diese Wiederholung v_erschiebbar machen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "Termin ö_ffnen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "Den aktuellen Termin anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Als iCalendar speichern …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Wandelt einen Termin in eine Besprechung um"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "In T_ermin umwandeln…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Wandelt eine Besprechung in einen Termin um"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#| msgid "_Quit"
+msgid "Quit"
+msgstr "Beenden"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "Tag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "Tagesansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "Listenansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "Monat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "Monatsansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "Woche"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "Wochenansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Show one work week"
 msgstr "Eine Arbeitswoche anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "Aktuelle Termine"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "Termine der nächsten 7 Tage"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Description contains"
 msgstr "Beschreibung enthält"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 msgid "Preview the calendar to be printed"
 msgstr "Vorschau auf den zu druckenden Kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "Gehe zu"
 
@@ -15532,7 +15106,7 @@ msgstr "Die gewählte Notiz anzeigen"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 #: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
@@ -15546,22 +15120,22 @@ msgstr "Die gewählte Notiz drucken"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:610
 msgid "task"
 msgstr "Aufgabe"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:672
 msgid "_Assign Task"
 msgstr "Aufgabe _zuweisen"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Mark selected tasks as complete"
 msgstr "Die gewählten Aufgaben als abgeschlossen markieren"
 
@@ -15570,39 +15144,39 @@ msgid "_Mark as Incomplete"
 msgstr "Als _offen markieren"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Mark selected tasks as incomplete"
 msgstr "Die gewählten Aufgaben als unvollständig markieren"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "New _Task"
 msgstr "_Neue Aufgabe"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "_Open Task"
 msgstr "Aufgabe ö_ffnen"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "View the selected task"
 msgstr "Die gewählte Aufgabe anzeigen"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
 #: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "_Save as iCalendar..."
 msgstr "Als i_Calendar speichern …"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:998
 msgid "Print the selected task"
 msgstr "Die gewählte Aufgabe drucken"
 
@@ -15630,36 +15204,16 @@ msgstr "Notizli_ste"
 msgid "Create a new memo list"
 msgstr "Eine neue Notizliste anlegen"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "Die Registratur für Notizlisten"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "Das Tabellenmodell für Notizen"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "Notizen werden geladen"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:571
 msgid "Memo List Selector"
 msgstr "Notizquellenauswahl"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "Vorgegebene Notizverwaltung"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "Vorgegebener Client für Notizverwaltung"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "Dieses Widget zeigt Gruppen von Notizlisten an"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:870
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Notizen unter %s werden geöffnet"
@@ -15770,58 +15324,20 @@ msgid "Tas_k List"
 msgstr "_Aufgabenliste"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "Die Registratur für Aufgabenlisten"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "Das Tabellenmodell für Aufgaben"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-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 ""
-"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 …"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Die Aufgaben in »%s« konnten nicht migriert werden."
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "Aufgaben werden geladen"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:571
 msgid "Task List Selector"
 msgstr "Aufgabenlistenauswahl"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "Vorgegebener Client für Aufgabenverwaltung"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "Vorgegebener Client für Aufgabenverwaltung"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "Dieses Widget zeigt Gruppen von Aufgabenlisten an"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:870
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben unter %s werden geöffnet"
@@ -15831,7 +15347,7 @@ msgstr "Aufgaben unter %s werden geöffnet"
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:554
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15844,95 +15360,95 @@ msgstr ""
 "\n"
 "Sollen die Aufgaben wirklich entfernt werden?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:679
 msgid "_Delete Task"
 msgstr "Aufgabe _löschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "_Find in Task..."
 msgstr "In Aufgabe _suchen …"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "Search for text in the displayed task"
 msgstr "In der angezeigten Aufgabe nach Text suchen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:700
 msgid "Copy..."
 msgstr "Kopieren …"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:707
 msgid "D_elete Task List"
 msgstr "Aufgabenlist_e löschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Delete the selected task list"
 msgstr "Die gewählte Aufgabenliste löschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "_New Task List"
 msgstr "_Neue Aufgabenliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "Refresh the selected task list"
 msgstr "Die gewählte Aufgabenliste aktualisieren"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Rename the selected task list"
 msgstr "Die gewählte Aufgabenliste umbenennen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Show _Only This Task List"
 msgstr "Nur diese Auf_gabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:756
 msgid "Mar_k as Incomplete"
 msgstr "Als unvollständig mar_kieren"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Delete completed tasks"
 msgstr "Die abgeschlossenen Aufgaben löschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:861
 msgid "Task _Preview"
 msgstr "Aufgaben_vorschau"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:863
 msgid "Show task preview pane"
 msgstr "Aufgabenvorschaufeld anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:884
 msgid "Show task preview below the task list"
 msgstr "Aufgabenvorschau unter der Aufgabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 msgid "Show task preview alongside the task list"
 msgstr "Aufgabenvorschau neben der Aufgabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Active Tasks"
 msgstr "Aktuelle Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Completed Tasks"
 msgstr "Abgeschlossene Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Next 7 Days' Tasks"
 msgstr "Aufgaben der nächsten 7 Tage"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:927
 msgid "Overdue Tasks"
 msgstr "Überfällige Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:934
 msgid "Tasks with Attachments"
 msgstr "Aufgaben mit Anlagen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:984
 msgid "Print the list of tasks"
 msgstr "Die Aufgabenliste drucken"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:991
 msgid "Preview the list of tasks to be printed"
 msgstr "Vorschau auf die zu druckende Aufgabenliste"
 
@@ -15956,404 +15472,372 @@ msgid "Delete Task"
 msgstr "Aufgabe löschen"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, c-format
 msgid "%d attached messages"
 msgstr "%d beigelegte Nachrichten"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "Kein"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:164
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_E-Mail-Nachricht"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:166
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:174
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-Mail-_Ordner"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:176
 msgid "Create a new mail folder"
 msgstr "Einen neuen E-Mail-Ordner anlegen"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:203
 msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgid "Composer Preferences"
 msgstr "Editoreinstellungen"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:219
 msgid "Network Preferences"
 msgstr "Netzwerkeinstellungen"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "Nach Threads gruppieren"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "Ob Nachrichten nach Themen gruppiert werden sollen"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:814
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "Konto _deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:816
 msgid "Disable this account"
 msgstr "Dieses Konto deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:823
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:828
 msgid "C_reate Search Folder From Search..."
 msgstr "Sucho_rdner aus Suche anlegen …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:835
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nachrichten für Offline-Benutzung herunterladen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:837
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Nachrichten von Konten/Ordnern herunterladen, die für den Offline-Modus "
 "markiert sind"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:842
 msgid "Fl_ush Outbox"
 msgstr "E-Mails aus A_usgang verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:849
 msgid "_Copy Folder To..."
 msgstr "Ordner _kopieren nach …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:851
 msgid "Copy the selected folder into another folder"
 msgstr "Den gewählten Ordner in einen anderen Ordner kopieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:858
 msgid "Permanently remove this folder"
 msgstr "Diesen Ordner dauerhaft entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:863
 msgid "E_xpunge"
 msgstr "_Säubern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:865
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus diesem Ordner entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:870
 msgid "Mar_k All Messages as Read"
 msgstr "Alle Nachrichten als gelesen _markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:872
 msgid "Mark all messages in the folder as read"
 msgstr "Alle Nachrichten im Ordner als gelesen markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:877
 msgid "_Move Folder To..."
 msgstr "Ordner verschie_ben nach …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:879
 msgid "Move the selected folder into another folder"
 msgstr "Den gewählten Ordner in einen anderen Ordner verschieben"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:884
 msgid "_New..."
 msgstr "_Neu …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:886
 msgid "Create a new folder for storing mail"
 msgstr "Einen neuen Ordner zum Ablegen von Nachrichten anlegen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:893
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:900
 msgid "Refresh the folder"
 msgstr "Den Ordner auffrischen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:907
 msgid "Change the name of this folder"
 msgstr "Den Namen dieses Ordners ändern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:912
 msgid "Select Message _Thread"
 msgstr "Nachrichten-_Thread auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:914
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Alle Nachrichten im selben Thread wie die gewählte Nachricht markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:919
 msgid "Select Message S_ubthread"
 msgstr "Nachrichten-_Subthread auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:921
 msgid "Select all replies to the currently selected message"
 msgstr "Alle Antworten auf die momentan ausgewählten Nachricht auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:926
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:928
 msgid "Unsubscribe from the selected folder"
 msgstr "Den gewählten Ordner abbestellen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:933
 msgid "Empty _Trash"
 msgstr "_Müll leeren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:935
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Konten entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:940
 msgid "_New Label"
 msgstr "_Neue Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:949
 msgid "N_one"
 msgstr "_Keine"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "Ge_lesene Nachrichten verbergen"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Alle bereits gelesenen Nachrichten zeitweilig verbergen"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "Ge_wählte Nachrichten verbergen"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "Die gewählten Nachrichten zeitweilig verbergen"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "Verborgene Nachrichten an_zeigen"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "Nachrichten anzeigen, die zeitweilig verborgen wurden"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:972
 msgid "Cancel the current mail operation"
 msgstr "Den momentan ausgeführten E-Mail-Vorgang abbrechen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:977
 msgid "Collapse All _Threads"
 msgstr "Alle _Threads einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:979
 msgid "Collapse all message threads"
 msgstr "Alle Nachrichten-Threads einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:984
 msgid "E_xpand All Threads"
 msgstr "Alle Threads a_usklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:986
 msgid "Expand all message threads"
 msgstr "Alle Nachrichten-Threads ausklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:991
 msgid "_Message Filters"
 msgstr "Nachrichtenf_ilter"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:993
 msgid "Create or edit rules for filtering new mail"
 msgstr "Regeln zum Filtern neuer E-Mails anlegen/bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:998
 msgid "Search F_olders"
 msgstr "S_uchordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
 msgid "Create or edit search folder definitions"
 msgstr "Suchordner-Definitionen anlegen oder bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
 msgid "_Subscriptions..."
 msgstr "A_bonnements …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Ordner auf fernen Servern abonnieren oder abbestellen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
 msgid "F_older"
 msgstr "_Ordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "_Label"
 msgstr "Bes_chriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "Gelö_schte Nachrichten verbergen"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Verborgene Nachrichten verbergen, statt sie durchgestrichen darzustellen"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Show Message _Preview"
 msgstr "Nachrichten_vorschau anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "Show message preview pane"
 msgstr "Nachrichten-Vorschaufenster anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#| msgid "Show deleted messages"
+msgid "Show _Deleted Messages"
+msgstr "Gel_öschte Nachrichten anzeigen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#| msgid "Show deleted messages (with a strike-through) in the message-list."
+msgid "Show deleted messages with a line through them"
+msgstr "Gelöschte Nachrichten (durchgestrichen) anzeigen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "_Group By Threads"
 msgstr "Nach Threads _gruppieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Threaded message list"
 msgstr "Nachrichtenliste nach Threads sortieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Show message preview below the message list"
 msgstr "Nachrichtenvorschau unter der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Show message preview alongside the message list"
 msgstr "Nachrichtenvorschau neben der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
 msgid "All Messages"
 msgstr "Alle Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
 msgid "Important Messages"
 msgstr "Wichtige Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Last 5 Days' Messages"
 msgstr "Nachrichten der letzten fünf Tage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwünscht"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "Messages with Attachments"
 msgstr "Nachrichten mit Anlagen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
 msgid "No Label"
 msgstr "Keine Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Read Messages"
 msgstr "Gelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "Recent Messages"
 msgstr "Letzte Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Subject or Addresses contain"
 msgstr "Betreff oder Adresse enthält"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "All Accounts"
 msgstr "Alle Konten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Current Account"
 msgstr "Derzeitiges Konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Current Folder"
 msgstr "Derzeitiger Ordner"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:881
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d gewählt, "
 msgstr[1] "%d gewählt, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:892
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d gelöscht"
 msgstr[1] "%d gelöscht"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:898
+#: ../modules/mail/e-mail-shell-view-private.c:905
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d unerwünscht"
 msgstr[1] "%d unerwünscht"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:911
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d Entwurf"
 msgstr[1] "%d Entwürfe"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:917
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d nicht verschickt"
 msgstr[1] "%d nicht verschickt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:923
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d verschickt"
 msgstr[1] "%d verschickt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:935
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ungelesen, "
 msgstr[1] "%d ungelesen, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:938
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16372,7 +15856,14 @@ msgstr "Konto durchsuchen"
 msgid "Proxy _Logout"
 msgstr "Vertretungsa_bmeldung"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "Aktiv"
+
+#: ../modules/mail/em-composer-prefs.c:476
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
@@ -16392,36 +15883,34 @@ msgstr "Einmal pro Woche"
 msgid "Once per month"
 msgstr "Einmal pro Monat"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:224
 msgid "Add Custom Junk Header"
 msgstr "Benutzerdefinierte Unerwünscht-Kopfzeile hinzufügen"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:232
 msgid "Header Name:"
 msgstr "Name der Kopfzeile:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Value Contains:"
 msgstr "Wert der Kopfzeile enthält:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:333
 msgid "Header"
 msgstr "Kopfzeile"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:337
 msgid "Contains Value"
 msgstr "Enthält Wert"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:801
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s-Plugin ist verfügbar und das zugehörige Programm ist installiert."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:738 ../modules/mail/em-mailer-prefs.c:810
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
@@ -16429,21 +15918,16 @@ msgstr ""
 "%s-Plugin ist nicht verfügbar. Bitte prüfen Sie, ob das zugehörige "
 "Programmpaket installiert ist."
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:774
 msgid "No junk plugin available"
 msgstr "Kein Unerwünscht-Plugin verfügbar"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "_Tabellenspalte:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1161
 msgid "_Date header:"
 msgstr "_Datum in der Kopfzeile:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1162
 msgid "Show _original header value"
 msgstr "_Originalwert der Kopfzeile anzeigen"
 
@@ -16473,22 +15957,13 @@ msgstr "Lokale Adressbücher"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
+"List of clues for the attachment reminder plugin to look for in a message body"
 msgstr ""
 "Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
 "sucht"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
-"sucht."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "Schlüsselwörter"
 
@@ -16529,23 +16004,23 @@ msgstr "Eingebettete Klänge"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Audio-Anlagen direkt in Nachrichten wiedergeben."
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "Name des Evolution-Sicherungsarchivs auswählen"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "Evolution nach Sicherung neu sta_rten"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Evolution-Sicherungsarchiv zur Wiederherstellung wählen"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "Evolution nach Wiederherstellung neu sta_rten"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16555,37 +16030,39 @@ msgstr ""
 "Mails, Kalender, Aufgaben, Notizen und Adressbücher sowie alle persönlichen "
 "Einstellungen, Filter etc. können wiederhergestellt werden."
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "Evolution aus _Sicherungsdatei wiederherstellen"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Evolution-Archiv zur Wiederherstellung wählen:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "Eine Datei zum Wiederherstellen wählen"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "Aus Sicherungsdatei wiederherstellen"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "Einstellungen sic_hern …"
+#: ../plugins/backup-restore/backup-restore.c:361
+#| msgid "_Backup Settings..."
+msgid "_Backup Evolution Settings..."
+msgstr "Evolution-Einstellungen sic_hern …"
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr ""
 "Sichern und Wiederherstellen von Evolution-Daten und Einstellungen in einer "
 "Archivdatei"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "Einstellungen _zurücksetzen …"
+#: ../plugins/backup-restore/backup-restore.c:368
+#| msgid "R_estore Settings..."
+msgid "R_estore Evolution Settings..."
+msgstr "Evolution-Einstellungen wiederherstell_en …"
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
 "Sichern und Wiederherstellen von Evolution-Daten und Einstellungen aus einer "
@@ -16636,8 +16113,9 @@ msgid "Restarting Evolution"
 msgstr "Evolution wird neugestartet"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
-msgstr "Evolution-Daten sichern"
+#| msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
+msgstr "Aktuelle Evolution-Daten sichern"
 
 #: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
@@ -16666,31 +16144,31 @@ msgid "Restoring from the folder %s"
 msgstr "Wiederherstellen von %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Evolution-Datensicherung"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Evolution-Wiederherstellung"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "Sichern der Evolution-Daten"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Bitte warten Sie, während Evolution Ihre Daten sichert."
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "Wiederherstellen der Evolution-Daten"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Bitte warten Sie, während Evolution Ihre Daten wiederherstellt."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Dies kann abhängig von den Daten in Ihrem Konto einige Zeit dauern."
 
@@ -16711,8 +16189,8 @@ msgstr "Sind Sie sicher, dass Sie Evolution beenden wollen?"
 msgid ""
 "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
-"Sind Sie sicher, dass Evolution aus dem ausgewählten Archiv "
-"wiederhergestellt werden soll?"
+"Sind Sie sicher, dass Evolution aus dem ausgewählten Archiv wiederhergestellt "
+"werden soll?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid ""
@@ -16723,9 +16201,8 @@ msgid ""
 msgstr ""
 "Die Evolution-Sicherung kann nur gestartet werden, wenn Evolution nicht "
 "läuft. Bitte stellen Sie sicher, dass alle ungesicherten Evolution-Fenster "
-"zunächst gespeichert und dann geschlossen werden. Sie können zudem "
-"auswählen, ob Evolution nach der Sicherung automatisch neu gestartet werden "
-"soll."
+"zunächst gespeichert und dann geschlossen werden. Sie können zudem auswählen, "
+"ob Evolution nach der Sicherung automatisch neu gestartet werden soll."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
@@ -16746,9 +16223,9 @@ msgstr "Der gewählte Ordner ist schreibgeschützt."
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
 "This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
+"them from your backup. Evolution restore can start only when Evolution is not "
+"running. Please make sure that you close all your unsaved windows before you "
+"proceed. If you want Evolution to restart automatically restart after "
 "restore, please enable the toggle button."
 msgstr ""
 "Dies löscht alle momentanen Evolution-Daten und -Einstellungen und stellt "
@@ -16758,38 +16235,39 @@ msgstr ""
 "geschlossen werden. Sie können zudem auswählen, ob Evolution nach der "
 "Sicherung automatisch neu gestartet werden soll."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatische Kontakte"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "_Automatische Erstellung von Adressbucheinträgen bei Versendung von E-Mails"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "Adressbuch für automatische Kontakte auswählen"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Instant-Messaging-Kontakte"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+#| msgid "Synchronize contact info and images from Pidgin buddy list"
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Kontaktinformationen und -bilder regelmäßig mit der Pidgin-Kontaktliste "
-"abgleichen"
+"_abgleichen"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Adressbuch für die Pidgin-Kontaktliste auswählen"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Jetzt mit der _Buddy-Liste abgleichen"
 
@@ -16811,33 +16289,33 @@ msgstr ""
 "Nachrichten geantwortet wird und fügt auch Instant-Messaging-"
 "Kontaktinformationen aus Ihren Buddy-Listen hinzu."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter ist nicht verfügbar. Bitte installieren Sie es zunächst."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Beim Aufrufen von %s ist ein Fehler aufgetreten: %s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter-Kindprozess antwortet nicht. Wird abgewürgt …"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Warten auf Bogofilter-Kindprozess abgebrochen. Wird beendet …"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Weiterleitung an Bogofilter gescheitert, Fehler-Code: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
 msgid "Convert message text to _Unicode"
 msgstr "Nachrichtentext nach _Unicode konvertieren"
 
@@ -16865,16 +16343,16 @@ msgstr "Bogofilter-Optionen"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filtert unerwünschte Nachrichten mit Bogofilter."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
 "Legitimierung ist fehlgeschlagen. Der Server erfordert korrekte Anmeldung."
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "Angegebene Adresse konnte nicht gefunden werden."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16883,36 +16361,36 @@ msgstr ""
 "Server gab unerwartete Daten zurück.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "Verarbeitung der Serverantwort ist gescheitert."
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "Ereignisse"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "Benutzerkalender"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "Serveradresse konnte nicht erhalten werden"
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "Nach Benutzerkalendern wird gesucht …"
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "Es wurde kein Benutzerkalender gefunden."
 
@@ -16926,41 +16404,41 @@ msgstr "Vorheriger Versuch scheiterte: %s"
 msgid "Previous attempt failed with code %d"
 msgstr "Vorheriger Versuch scheiterte mit Code %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr ""
-"Geben Sie das Passwort für Benutzer <b>%s</b> auf dem Server <b>%s</b> ein"
+#| msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgid "Enter password for user %s on server %s"
+msgstr "Geben Sie das Passwort für Benutzer %s auf dem Server %s ein"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "Soup-Nachricht für Adresse »%s« konnte nicht erstellt werden"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "Ordnerinhalt wird durchsucht …"
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "Liste der verfügbaren Kalender:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "Unterstützt"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Thema konnte nicht angelegt werden: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "Serveradresse »%s« ist keine gültige Adresse"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "Nach einem CalDAV-Kalender suchen"
 
@@ -16968,26 +16446,26 @@ msgstr "Nach einem CalDAV-Kalender suchen"
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_Adresse:"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:220
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "_SSL verwenden"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:229
 msgid "Brows_e server for a calendar"
 msgstr "Server nach einem Kal_ender durchsuchen"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:241
+#: ../plugins/calendar-file/calendar-file.c:190
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "Auf_frischen:"
 
@@ -16999,31 +16477,31 @@ msgstr "CalDAV-Unterstützung zu Evolution hinzufügen."
 msgid "CalDAV Support"
 msgstr "CalDAV-Unterstützung"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:124
 msgid "_Customize options"
 msgstr "Optionen _anpassen"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:143
 msgid "File _name:"
 msgstr "Datei_name:"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:147
 msgid "Choose calendar file"
 msgstr "Wählen Sie eine Kalenderdatei"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:195
 msgid "On open"
 msgstr "Beim Öffnen"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On file change"
 msgstr "Bei Dateiänderungen"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "Periodically"
 msgstr "Regelmäßig"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:212
 msgid "Force read _only"
 msgstr "_Nur lesen erzwingen"
 
@@ -17035,11 +16513,11 @@ msgstr "Lokale Kalender zu Evolution hinzufügen."
 msgid "Local Calendars"
 msgstr "Lokale Kalender"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "_Sichere Verbindung"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "_Benutzername:"
 
@@ -17087,26 +16565,26 @@ msgstr "Wetter: Klare Nacht"
 msgid "Weather: Thunderstorms"
 msgstr "Wetter: Gewitter"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "Einen Ort wählen"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Keine"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "Ein_heiten:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrisch (Celsius, cm, usw.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Englisch (Fahrenheit, Inch, usw.)"
 
@@ -17129,8 +16607,7 @@ msgstr "Eine Karte aller Kontakte anzeigen"
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
 msgid "Add a map showing the location of contacts when possible."
-msgstr ""
-"Wenn möglich, eine Karte hinzufügen, die den Ort von Kontakten anzeigt."
+msgstr "Wenn möglich, eine Karte hinzufügen, die den Ort von Kontakten anzeigt."
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
 msgid "Map for contacts"
@@ -17138,8 +16615,7 @@ msgstr "Karte für Kontakte"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
-msgstr ""
-"Überprüfen, ob Evolution die Vorgabeanwendung zur E-Mail-Verwaltung ist"
+msgstr "Überprüfen, ob Evolution die Vorgabeanwendung zur E-Mail-Verwaltung ist"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
@@ -17162,23 +16638,23 @@ msgstr "Bevorzugte E-Mail-Verwaltung"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Möchten Sie Evolution zu Ihrer bevorzugten E-Mail-Anwendung machen?"
 
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "Als _Vorgabeadressbuch markieren"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
 msgstr "Aus diesem Adressbuch a_utomatisch vervollständigen"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "Als _Vorgabekalender markieren"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "Als _Vorgabeaufgabenliste markieren"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "Als _Vorgabenotizliste markieren"
 
@@ -17233,14 +16709,14 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Keine"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "Benutzerdefinierte _Kopfzeile"
 
 # CHECK
 #  to specifying the format of the key values
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17248,12 +16724,12 @@ msgstr ""
 "Das Format zum Festlegen einer eigenen Kopfzeile lautet:\n"
 "Name der eigenen Kopfzeile;Wert«"
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:950
 msgid "Key"
 msgstr "Schlüssel"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "Werte"
 
@@ -17276,7 +16752,7 @@ msgstr ""
 "Automatisch den Editor bei Tastendruck beim Verfassen einer Nachricht starten"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "Automatisch beim Bearbeiten einer neuen E-Mail starten"
 
@@ -17289,11 +16765,11 @@ msgstr "Vorgabe für externen Editor"
 msgid "The default command that must be used as the editor."
 msgstr "Der Befehl, der als Editor verwendet werden muss."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "Auszuführender Befehl, um den Editor zu starten:"
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17301,8 +16777,8 @@ msgstr ""
 "Verwenden Sie »xemacs« für Emacs\n"
 "Verwenden Sie »gvim -f« für VI"
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "Im externen Editor verfassen"
 
@@ -17312,8 +16788,7 @@ msgstr "Externer Editor"
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
 msgid "Use an external editor to compose plain-text mail messages."
-msgstr ""
-"Einen externen Editor zum Verfassen von Nur-Text-Nachrichten verwenden."
+msgstr "Einen externen Editor zum Verfassen von Nur-Text-Nachrichten verwenden."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
@@ -17325,8 +16800,7 @@ msgstr "Editor kann nicht gestartet werden"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
+"Evolution is unable to create a temporary file to save your mail. Retry later."
 msgstr ""
 "Es konnte keine temporäre Datei zum Speichern der E-Mails angelegt werden. "
 "Bitte versuchen Sie es später erneut."
@@ -17348,8 +16822,8 @@ msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
-"Der in den Pluin-Einstellungen gesetzte externe Editor konnte nicht "
-"gestartet werden. Bitte benutzen Sie einen anderen Editor."
+"Der in den Pluin-Einstellungen gesetzte externe Editor konnte nicht gestartet "
+"werden. Bitte benutzen Sie einen anderen Editor."
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
@@ -17380,7 +16854,7 @@ msgstr "Porträtfoto standardmäßig e_infügen"
 msgid "Load new _Face picture"
 msgstr "Neues _Porträtfoto laden"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "_Porträtfoto einschließen"
 
@@ -17415,23 +16889,24 @@ msgstr ""
 "Fehler: {0}"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
+#: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>Server</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+#| msgid "_Server:"
+msgid "Server"
+msgstr "Server"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Geben Sie das Passwort für den Benutzer %s ein, um auf die Liste der "
 "abonnierten Kalender zuzugreifen."
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17440,18 +16915,19 @@ msgstr ""
 "Daten konnten nicht vom Google-Server empfangen werden.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "_Kalender:"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+#| msgid "Retrieve _list"
+msgid "Retrieve _List"
 msgstr "_Liste abrufen"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
@@ -17462,7 +16938,7 @@ msgstr "Google-Kalender zu Evolution hinzufügen."
 msgid "Google Calendars"
 msgstr "Google-Kalender"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Checkliste"
 
@@ -17494,12 +16970,12 @@ msgstr "Vorläufig annehmen"
 msgid "Rese_nd Meeting..."
 msgstr "Besprechung er_neut versenden …"
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
 msgid "Create folder"
 msgstr "Ordner anlegen"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17524,19 +17000,19 @@ msgstr ""
 "Klicken Sie auf »Anwenden«, um den gemeinsamen Ordner einzurichten\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "Gemeinsamen Ordner einrichten"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "Einrichten von Gemeinsamen Ordnern"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "Einstellungen zu unerwünschten Nachrichten"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Einstellungen zu unerwünschten Nachrichten"
@@ -17572,15 +17048,15 @@ msgstr "_Entfernen"
 msgid "Message Retract"
 msgstr "Nachricht zurückziehen"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this?"
+"Retracting a message may remove it from the recipient's mailbox. Are you sure "
+"you want to do this?"
 msgstr ""
 "Das Zurückziehen einer Nachricht entfernt diese möglicherweise aus dem "
 "Posteingang des Empfängers. Sind Sie sicher, dass Sie dies tun möchten?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr ""
 "Aktivieren der Seitenleisten-Suchfunktion, damit Sie interaktiv suchen "
@@ -17655,13 +17131,12 @@ msgstr "Sie haben diesem Benutzer bereits Zugriff auf den Proxy gewährt."
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
-"Sie müssen einen gültigen Benutzernamen eingeben, um Zugriff auf den Proxy "
-"zu gewähren."
+"Sie müssen einen gültigen Benutzernamen eingeben, um Zugriff auf den Proxy zu "
+"gewähren."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr ""
-"Sie können diesen Ordner nicht mit dem angegebenen Benutzer »{0}« teilen"
+msgstr "Sie können diesen Ordner nicht mit dem angegebenen Benutzer »{0}« teilen"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
 msgid "You have to specify a user name which you want to add to the list"
@@ -17714,25 +17189,26 @@ msgid "Would you like to decline it?"
 msgstr "Wollen Sie dies ablehnen?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>Benutzer:</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "Benachrichtigung an_passen"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "Kon_takte …"
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "Benachrichtigung zur Ordnerfreigabe"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "Die berechtigten Nutzer werden folgende Benachrichtigung erhalten.\n"
 
+#: ../plugins/groupwise-features/properties.ui.h:9
+#| msgid "Users"
+msgid "Users:"
+msgstr "Benutzer:"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Nicht freigeben"
@@ -17790,50 +17266,58 @@ msgid "Proxy"
 msgstr "Vertretung"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Kontoname</b>"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "Kontoname"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "Vertretungsanmeldung"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%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.c:692
+#: ../plugins/groupwise-features/proxy.c:690
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Der Vertretungsreiter ist nur verfügbar, wenn das Konto online ist."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Der Vertretungsreiter ist nur verfügbar, wenn das Konto aktiviert ist."
 
-#: ../plugins/groupwise-features/proxy.c:931
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+#| msgid "Proxy"
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../plugins/groupwise-features/proxy.c:929
 #: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "Benutzer hinzufügen"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "Erweiterte Versandoptionen"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:315
 #: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:316
 msgid "Enter the users and set permissions"
 msgstr "Eingabe der Benutzer und Festlegen der Rechte"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:416
 msgid "Sharing"
 msgstr "Freigeben"
 
@@ -17845,63 +17329,55 @@ msgstr "Eigene Benachrichtigung"
 msgid "Add   "
 msgstr "Hinzufügen   "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Nachrichtenstatus"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "Von:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Erstellungsdatum:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "Empfänger: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "Zugestellt: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "Geöffnet: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "Angenommen: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "Gelöscht: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "Abgelehnt: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "Abgeschlossen: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "Nicht zugestellt: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Unterstützung für Hula hinzufügen."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Unterstützung für Hula"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Eingebettetes Bild"
@@ -17910,12 +17386,12 @@ msgstr "Eingebettetes Bild"
 msgid "View image attachments directly in mail messages."
 msgstr "Bildanhänge direkt innerhalb von Nachrichten anzeigen."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:332
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Benutzerdefinierte Kopfzeilen"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:345
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP-Kopfzeilen"
@@ -17962,147 +17438,147 @@ msgstr "IMAP-Konten detailliert einstellen."
 msgid "IMAP Features"
 msgstr "IMAP-Funktionen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/itip-formatter/itip-formatter.c:482
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Der Kalender »%s« konnte nicht geladen werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:648
 #, 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:688
+#: ../plugins/itip-formatter/itip-formatter.c:684
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Der Termin wurde im Kalender »%s« gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find any calendars"
 msgstr "Es wurden keine Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:790
 msgid "Unable to find this meeting in any calendar"
 msgstr "Diese Besprechung wurde in keinem Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this task in any task list"
 msgstr "Diese Aufgabe wurde in keiner Aufgabenliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this memo in any memo list"
 msgstr "Diese Notiz wurde in keiner Notizliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:872
 msgid "Opening the calendar. Please wait.."
 msgstr "Kalender wird geöffnet. Bitte warten …"
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:875
 msgid "Searching for an existing version of this appointment"
 msgstr "Eine bestehende Version dieses Termins wird gesucht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1056
 msgid "Unable to parse item"
 msgstr "Element kann nicht analysiert werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1143
 #, 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:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1155
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "In Kalender »%s« als »Angenommen« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "In Kalender »%s« als »Vorläufig angenommen« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1164
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "In Kalender »%s« als »Abgelehnt« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1169
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "In Kalender »%s« als »Abgesagt« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1263
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Der Organisator hat den Delegaten %s entfernt "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1270
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Dem Delegaten wurde eine Absagenachricht zugestellt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1272
 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:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1383
 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:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Teilnehmer konnte nicht aktualisiert werden. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Attendee status updated"
 msgstr "Teilnehmerstatus aktualisiert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1442
 msgid "Meeting information sent"
 msgstr "Besprechungsinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Task information sent"
 msgstr "Aufgabeninformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Memo information sent"
 msgstr "Notizinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1457
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Verschicken der Besprechungsinformationen nicht möglich, die Besprechung "
 "existiert nicht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1460
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 "Verschicken der Aufgabeninformationen nicht möglich, die Aufgabe existiert "
 "nicht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "Verschicken der Notizinformationen nicht möglich, die Notiz existiert nicht"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1533
 msgid "Save Calendar"
 msgstr "Kalender speichern"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1597
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18110,15 +17586,15 @@ msgstr ""
 "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist "
 "jedoch kein gültiger iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1638
+#: ../plugins/itip-formatter/itip-formatter.c:1666
+#: ../plugins/itip-formatter/itip-formatter.c:1772
 msgid "The item in the calendar is not valid"
 msgstr "Das Element im Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18126,11 +17602,11 @@ msgstr ""
 "Die Nachricht enthält einen Kalender. Dieser beinhaltet allerdings keine "
 "Ereignisse, Aufgaben oder Verfügbarkeitsinformationen."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1680
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthält mehrere Elemente."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18138,519 +17614,562 @@ msgstr ""
 "Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und "
 "der Kalender importiert werden."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2451
 msgid "This meeting recurs"
 msgstr "Diese Besprechung wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "This task recurs"
 msgstr "Diese Aufgabe wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "This memo recurs"
 msgstr "Diese Notiz wird wiederholt"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2691
 msgid "_Delete message after acting"
 msgstr "_Löschen der Nachricht nach Abarbeitung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2701
+#: ../plugins/itip-formatter/itip-formatter.c:2734
 msgid "Conflict Search"
 msgstr "Konfliktsuche"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2716
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Kalender zur Suche nach Besprechungskonflikten auswählen"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Heute %k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Heute %k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Heute %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Morgen %k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Morgen %k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 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:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Morgen %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %k:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %k:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B %k:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B %k:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y %k:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e. %B %Y %k:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "Bitte antworten Sie im Namen von <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "Erhalten im Namen von <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr ""
-"<b>%s</b> hat durch %s folgende Besprechungsinformationen veröffentlicht:"
-
-#: ../plugins/itip-formatter/itip-view.c:364
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> hat folgende Besprechungsinformationen veröffentlicht:"
+#| msgid "Please respond on behalf of <b>%s</b>"
+msgid "Please respond on behalf of %s"
+msgstr "Bitte antworten Sie im Namen von %s"
 
 #: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> hat folgende Besprechung an Sie delegiert:"
-
-#: ../plugins/itip-formatter/itip-view.c:372
-#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> wünscht durch %s Ihre Teilnahme an folgender Besprechung:"
+#| msgid "Received on behalf of <b>%s</b>"
+msgid "Received on behalf of %s"
+msgstr "Erhalten im Namen von %s"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> wünscht Ihre Teilnahme an folgender Besprechung:"
+#| msgid "<b>%s</b> through %s has published the following meeting information:"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s hat durch %s folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr ""
-"<b>%s</b> wünscht durch %s zu einer existierenden Besprechung hinzuzufügen:"
+#| msgid "<b>%s</b> has published the following meeting information:"
+msgid "%s has published the following meeting information:"
+msgstr "%s hat folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> wünscht zu einer existierenden Besprechung hinzuzufügen:"
+#| msgid "<b>%s</b> has delegated the following meeting to you:"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s hat folgende Besprechung an Sie delegiert:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> durch %s wünscht, aktuelle Informationen zu folgender Besprechung "
-"zu erhalten:"
+#| msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s wünscht durch %s Ihre Teilnahme an folgender Besprechung:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr ""
-"<b>%s</b> wünscht, aktuelle Informationen zu folgender Besprechung zu "
-"erhalten:"
+#| msgid "<b>%s</b> requests your presence at the following meeting:"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s wünscht Ihre Teilnahme an folgender Besprechung:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> durch %s hat folgende Besprechungsrückmeldung geschickt:"
+#| msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s wünscht durch %s zu einer existierenden Besprechung hinzuzufügen:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> hat folgende Besprechungsrückmeldung geschickt:"
+#| msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s wünscht zu einer existierenden Besprechung hinzuzufügen:"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> hat durch %s folgende Besprechung abgesagt:"
+#| msgid ""
+#| "<b>%s</b> through %s wishes to receive the latest information for the "
+#| "following meeting:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr ""
+"%s durch %s wünscht, aktuelle Informationen zu folgender Besprechung zu "
+"erhalten:"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> hat folgende Besprechung abgesagt:"
+#| msgid ""
+#| "<b>%s</b> wishes to receive the latest information for the following "
+#| "meeting:"
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr ""
+"%s wünscht, aktuelle Informationen zu folgender Besprechung zu erhalten:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> durch %s hat folgende Besprechungsänderungen vorgeschlagen:"
+#| msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s durch %s hat folgende Besprechungsrückmeldung geschickt:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> hat folgende Besprechungsänderungen vorgeschlagen:"
+#| msgid "<b>%s</b> has sent back the following meeting response:"
+msgid "%s has sent back the following meeting response:"
+msgstr "%s hat folgende Besprechungsrückmeldung geschickt:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> hat durch %s folgende Besprechungsänderungen abgelehnt:"
+#| msgid "<b>%s</b> through %s has canceled the following meeting:"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s hat durch %s folgende Besprechung abgesagt:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> hat folgende Besprechungsänderungen abgelehnt:"
+#| msgid "<b>%s</b> has canceled the following meeting."
+msgid "%s has canceled the following meeting."
+msgstr "%s hat folgende Besprechung abgesagt:"
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
-msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> hat durch %s folgende Aufgabe veröffentlicht:"
+#| msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s durch %s hat folgende Besprechungsänderungen vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> hat folgende Aufgabe veröffentlicht:"
+#| msgid "<b>%s</b> has proposed the following meeting changes."
+msgid "%s has proposed the following meeting changes."
+msgstr "%s hat folgende Besprechungsänderungen vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> wünscht die Zuweisung folgender Aufgabe an %s:"
+#| msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s hat durch %s folgende Besprechungsänderungen abgelehnt:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> hat Ihnen durch %s eine Aufgabe zugewiesen:"
+#| msgid "<b>%s</b> has declined the following meeting changes."
+msgid "%s has declined the following meeting changes."
+msgstr "%s hat folgende Besprechungsänderungen abgelehnt:"
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> hat Ihnen eine Aufgabe zugewiesen:"
+#| msgid "<b>%s</b> through %s has published the following task:"
+msgid "%s through %s has published the following task:"
+msgstr "%s hat durch %s folgende Aufgabe veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> wünscht durch %s zu einer bestehenden Aufgabe hinzuzufügen:"
+#| msgid "<b>%s</b> has published the following task:"
+msgid "%s has published the following task:"
+msgstr "%s hat folgende Aufgabe veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzuzufügen:"
+#| msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s wünscht die Zuweisung folgender Aufgabe an %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> durch %s wünscht aktuelle Informationen zu folgender zugewiesener "
-"Aufgabe zu erhalten:"
+#| msgid "<b>%s</b> through %s has assigned you a task:"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s hat Ihnen durch %s eine Aufgabe zugewiesen:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> wünscht aktuelle Informationen zu folgender zugewiesener Aufgabe "
-"zu erhalten:"
+#| msgid "<b>%s</b> has assigned you a task:"
+msgid "%s has assigned you a task:"
+msgstr "%s hat Ihnen eine Aufgabe zugewiesen:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr ""
-"<b>%s</b> durch %s hat folgende Rückmeldung zu einer zugewiesenen Aufgabe "
-"geschickt:"
+#| msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s wünscht durch %s zu einer bestehenden Aufgabe hinzuzufügen:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr ""
-"<b>%s</b> hat folgende Rückmeldung zu einer zugewiesenen Aufgabe geschickt:"
+#| msgid "<b>%s</b> wishes to add to an existing task:"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s wünscht zu einer bestehenden Aufgabe hinzuzufügen:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> hat durch %s folgende zugewiesene Aufgabe zurückgezogen:"
+#| msgid ""
+#| "<b>%s</b> through %s wishes to receive the latest information for the "
+#| "following assigned task:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"%s durch %s wünscht aktuelle Informationen zu folgender zugewiesener Aufgabe "
+"zu erhalten:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> hat folgende zugewiesene Aufgabe zurückgezogen:"
+#| msgid ""
+#| "<b>%s</b> wishes to receive the latest information for the following "
+#| "assigned task:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr ""
+"%s wünscht aktuelle Informationen zu folgender zugewiesener Aufgabe zu "
+"erhalten:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+#| msgid ""
+#| "<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "%s through %s has sent back the following assigned task response:"
 msgstr ""
-"<b>%s</b> durch %s hat folgende Änderungen an der Aufgabenzuweisung "
-"vorgeschlagen:"
+"%s durch %s hat folgende Rückmeldung zu einer zugewiesenen Aufgabe geschickt:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr ""
-"<b>%s</b> hat folgende Änderungen an der Aufgabenzuweisung vorgeschlagen:"
+#| msgid "<b>%s</b> has sent back the following assigned task response:"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s hat folgende Rückmeldung zu einer zugewiesenen Aufgabe geschickt:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> hat durch %s folgende zugewiesene Aufgabe zurückgezogen:"
+#| msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s hat durch %s folgende zugewiesene Aufgabe zurückgezogen:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> hat die folgende zugewiesene Aufgabe zurückgezogen:"
+#| msgid "<b>%s</b> has canceled the following assigned task:"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s hat folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:504
 #, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> hat durch %s folgende Notiz veröffentlicht:"
+#| msgid ""
+#| "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr ""
+"%s durch %s hat folgende Änderungen an der Aufgabenzuweisung vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> hat folgende Notiz veröffentlicht:"
+#| msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s hat folgende Änderungen an der Aufgabenzuweisung vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:510
+#, c-format
+#| msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s hat durch %s folgende zugewiesene Aufgabe abgelehnt:"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+#| msgid "<b>%s</b> has declined the following assigned task:"
+msgid "%s has declined the following assigned task:"
+msgstr "%s hat die folgende zugewiesene Aufgabe abgelehnt:"
+
+#: ../plugins/itip-formatter/itip-view.c:549
+#, c-format
+#| msgid "<b>%s</b> through %s has published the following memo:"
+msgid "%s through %s has published the following memo:"
+msgstr "%s hat durch %s folgende Notiz veröffentlicht:"
+
+#: ../plugins/itip-formatter/itip-view.c:551
+#, c-format
+#| msgid "<b>%s</b> has published the following memo:"
+msgid "%s has published the following memo:"
+msgstr "%s hat folgende Notiz veröffentlicht:"
+
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> wünscht durch %s zu einer existierenden Notiz hinzuzufügen:"
+#| msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s wünscht durch %s zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> wünscht zu einer existierenden Notiz hinzuzufügen:"
+#| msgid "<b>%s</b> wishes to add to an existing memo:"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s wünscht zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:562
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> hat durch %s folgende gemeinsame Notiz gelöscht:"
+#| msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s hat durch %s folgende gemeinsame Notiz gelöscht:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:564
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> hat folgende gemeinsame Notiz gelöscht:"
+#| msgid "<b>%s</b> has canceled the following shared memo:"
+msgid "%s has canceled the following shared memo:"
+msgstr "%s hat folgende gemeinsame Notiz gelöscht:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "Ganztägig:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "Anfangsdatum:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "Anfangszeit:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "Enddatum:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "Endzeit:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "Kalender ö_ffnen"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "Ab_lehnen"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "An_nehmen"
-
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+#| msgid "Accept"
+msgid "A_ccept"
+msgstr "Anneh_men"
+
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "Alles a_blehnen"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "Alles vorläu_fig"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "_Vorläufig"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:855
+#| msgid "_Accept all"
+msgid "A_ccept all"
 msgstr "Alles anneh_men"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "Informationen über_mitteln"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "Teilnehmerstatus a_ktualisieren"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "A_ktualisieren"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "_Antwort an Absender"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "Akt_ualisierungen an die Teilnehmer verschicken"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "Auf alle _Instanzen anwenden"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "Zeit als _frei anzeigen"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "_Erinnerung aufbewahren"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "Erinnerung übernehmen"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "Auf_gaben:"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "_Notizen:"
 
@@ -18667,8 +18186,7 @@ msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot;?"
 msgstr ""
-"»{0}« hat die Besprechung delegiert. Möchten Sie den Delegaten »{1}« "
-"hinzufügen?"
+"»{0}« hat die Besprechung delegiert. Möchten Sie den Delegaten »{1}« hinzufügen?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -18706,8 +18224,8 @@ msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
 msgstr ""
-"Legt fest, ob beim Eintreffen neuer Nachrichten ein Signalton ausgegeben "
-"wird (»TRUE«) oder eine Klangdatei abgespielt wird (»FALSE«)."
+"Legt fest, ob beim Eintreffen neuer Nachrichten ein Signalton ausgegeben wird "
+"(»TRUE«) oder eine Klangdatei abgespielt wird (»FALSE«)."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -18729,8 +18247,7 @@ msgstr "Popup-Fenster zusammen mit dem Symbol anzeigen."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr ""
-"Symbol im Benachrichtigungsfeld beim Eintreffen neuer E-Mails anzeigen."
+msgstr "Symbol im Benachrichtigungsfeld beim Eintreffen neuer E-Mails anzeigen."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
@@ -18768,16 +18285,16 @@ msgstr ""
 "Legt fest, ob nur über Nachrichten im Eingangsordner benachrichtigt werden "
 "soll."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:346
 msgid "Evolution's Mail Notification"
 msgstr "Benachrichtigung bei neuen E-Mails"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Mail Notification Properties"
 msgstr "Einstellungen zur E-Mail-Benachrichtigung"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:499
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18793,66 +18310,66 @@ msgstr[1] ""
 "im %s."
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:510
 #, c-format
 msgid "From: %s"
 msgstr "Von: %s"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#: ../plugins/mail-notification/mail-notification.c:522
 #, c-format
 msgid "Subject: %s"
 msgstr "Betreff: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:531
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Sie haben %d neue Nachricht."
 msgstr[1] "Sie haben %d neue Nachrichten."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:554
 msgid "New email"
 msgstr "Neue E-Mail"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:608
 msgid "Show icon in _notification area"
 msgstr "Symbol im _Benachrichtigungsfeld anzeigen"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:636
 msgid "B_link icon in notification area"
 msgstr "_Blinkendes Symbol im Benachrichtigungsfeld"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:646
 msgid "Popup _message together with the icon"
 msgstr "Popup-_Nachricht zusammen mit Symbol anzeigen"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:831
 msgid "_Play sound when new messages arrive"
 msgstr "Beim Eintreffen neuer E-Mails _Klang abspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:860
 msgid "_Beep"
 msgstr "_Signalton ausgeben"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:873
 msgid "Use sound _theme"
 msgstr "Klang_thema verwenden"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:892
 msgid "Play _file:"
 msgstr "Klang_datei abspielen:"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:903
 msgid "Select sound file"
 msgstr "Klangdatei auswählen"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:961
 msgid "Notify new messages for _Inbox only"
 msgstr "Nur über neue Nachrichten im _Eingangsordner benachrichtigen."
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:970
 msgid "Generate a _D-Bus message"
 msgstr "Eine _D-Bus-Nachricht erzeugen"
 
@@ -18865,69 +18382,69 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Beim Eintreffen neuer E-Mails benachrichtigen"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Erstellt aus einer Nachricht an %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
-"Selected calendar contains event '%s' already. Would you like to edit the "
-"old event?"
+"Selected calendar contains event '%s' already. Would you like to edit the old "
+"event?"
 msgstr ""
 "Der ausgewählte Kalender enthält bereits das Ereignis »%s«. Möchten Sie das "
 "alte Ereignis bearbeiten?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
-"Selected task list contains task '%s' already. Would you like to edit the "
-"old task?"
+"Selected task list contains task '%s' already. Would you like to edit the old "
+"task?"
 msgstr ""
 "Die ausgewählte Aufgabenliste enthält bereits die Aufgabe »%s«. Möchten Sie "
 "die alte Aufgabe bearbeiten?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
-"Selected memo list contains memo '%s' already. Would you like to edit the "
-"old memo?"
+"Selected memo list contains memo '%s' already. Would you like to edit the old "
+"memo?"
 msgstr ""
 "Die ausgewählte Notizliste enthält bereits die Notiz »%s«. Möchten Sie die "
 "alte Notiz bearbeiten?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#: ../plugins/mail-to-task/mail-to-task.c:512
 msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+"Selected calendar contains some events for the given mails already. Would you "
+"like to create new events anyway?"
 msgstr ""
 "Der ausgewählte Kalender enthält bereits einige Ereignisse für die "
 "vorliegenden E-Mails. Möchten Sie dennoch neue Ereignisse erstellen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+"Selected task list contains some tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
 msgstr ""
 "Die ausgewählte Aufgabenliste enthält bereits einige Aufgaben für die "
 "vorliegenden E-Mails. Möchten Sie dennoch neue Aufgaben erstellen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#: ../plugins/mail-to-task/mail-to-task.c:518
 msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
+"Selected memo list contains some memos for the given mails already. Would you "
+"like to create new memos anyway?"
 msgstr ""
 "Die ausgewählte Notizliste enthält bereits einige Notizen für die "
 "vorliegenden E-Mails. Möchten Sie dennoch neue Notizen erstellen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#: ../plugins/mail-to-task/mail-to-task.c:536
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
 msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
+"Selected calendar contains events for the given mails already. Would you like "
+"to create new events anyway?"
 msgstr[0] ""
 "Der ausgewählte Kalender enthält bereits ein Ereignis für die vorliegende E-"
 "Mail. Möchten Sie dennoch ein neues Ereignis erstellen?"
@@ -18935,13 +18452,13 @@ msgstr[1] ""
 "Der ausgewählte Kalender enthält bereits Ereignisse für die vorliegenden E-"
 "Mails. Möchten Sie dennoch neue Ereignisse erstellen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:542
 msgid ""
-"Selected task list contains a task for the given mail already. Would you "
-"like to create new task anyway?"
+"Selected task list contains a task for the given mail already. Would you like "
+"to create new task anyway?"
 msgid_plural ""
-"Selected task list contains tasks for the given mails already. Would you "
-"like to create new tasks anyway?"
+"Selected task list contains tasks for the given mails already. Would you like "
+"to create new tasks anyway?"
 msgstr[0] ""
 "Die ausgewählte Aufgabenliste enthält bereits eine Aufgabe für die "
 "vorliegende E-Mail. Möchten Sie dennoch eine neue Aufgabe erstellen?"
@@ -18949,13 +18466,13 @@ msgstr[1] ""
 "Die ausgewählte Aufgabenliste enthält bereits einige Aufgaben für die "
 "vorliegenden E-Mails. Möchten Sie dennoch neue Aufgaben erstellen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
-"Selected memo list contains a memo for the given mail already. Would you "
-"like to create new memo anyway?"
+"Selected memo list contains a memo for the given mail already. Would you like "
+"to create new memo anyway?"
 msgid_plural ""
-"Selected memo list contains memos for the given mails already. Would you "
-"like to create new memos anyway?"
+"Selected memo list contains memos for the given mails already. Would you like "
+"to create new memos anyway?"
 msgstr[0] ""
 "Die ausgewählte Notizliste enthält bereits eine Notiz für die vorliegende E-"
 "Mail. Möchten Sie dennoch eine neue Notiz erstellen?"
@@ -18963,25 +18480,25 @@ msgstr[1] ""
 "Die ausgewählte Notizliste enthält bereits einige Notizen für die "
 "vorliegenden E-Mails. Möchten Sie dennoch neue Notizen erstellen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:607
 msgid "[No Summary]"
 msgstr "[Keine Zusammenfassung]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:618
 msgid "Invalid object returned from a server"
 msgstr "Ein ungültiges Objekt wurde vom Server zurückgegeben."
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:689
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Ein Fehler ist während der Verarbeitung aufgetreten: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:718
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalender konnte nicht geöffnet werden. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:725
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18989,7 +18506,7 @@ msgstr ""
 "Die gewählte Quelle ist schreibgeschützt, daher kann kein neues Ereignis "
 "erstellt werden. Bitte wählen Sie eine andere Quelle aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18997,7 +18514,7 @@ msgstr ""
 "Die gewählte Quelle ist schreibgeschützt, daher kann keine neue Aufgabe "
 "erstellt werden. Bitte wählen Sie eine andere Quelle aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:731
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19005,40 +18522,40 @@ msgstr ""
 "Die gewählte Quelle ist schreibgeschützt, daher kann keine neue Notiz "
 "erstellt werden. Bitte wählen Sie eine andere Quelle aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:934
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Die Liste der Quelle konnte nicht erhalten werden. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1053
 msgid "Create an _Event"
 msgstr "Ein _Ereignis anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1055
 msgid "Create a new event from the selected message"
 msgstr "Ein neues Ereignis mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create a Mem_o"
 msgstr "Eine _Notiz anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new memo from the selected message"
 msgstr "Eine neue Notiz mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a _Task"
 msgstr "Eine _Aufgabe anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new task from the selected message"
 msgstr "Eine neue Aufgabe mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a _Meeting"
 msgstr "Eine _Besprechung anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a new meeting from the selected message"
 msgstr "Eine neue Besprechung mit Hilfe der gewählten Nachricht anlegen"
 
@@ -19046,56 +18563,56 @@ msgstr "Eine neue Besprechung mit Hilfe der gewählten Nachricht anlegen"
 msgid "Convert a mail message to a task."
 msgstr "Eine Nachricht in eine neue Aufgabe umwandeln."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Archive"
 msgstr "Listen_archiv abrufen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get an archive of the list this message belongs to"
 msgstr "Ein Archiv der Mailingliste dieser Nachricht abrufen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get List _Usage Information"
 msgstr "Ben_utzungsinformationen der Liste abrufen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 "Informationen über die Nutzung der Mailingliste dieser Nachricht abrufen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Contact List _Owner"
 msgstr "Kontaktlisten_besitzer"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 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/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Post Message to List"
 msgstr "_Nachricht an Liste schicken"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Eine Nachricht an die Mailingliste der gewählten Nachricht verfassen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Subscribe to List"
 msgstr "Liste _abonnieren"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Die Mailingliste der gewählten Nachricht abonnieren"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "_Unsubscribe from List"
 msgstr "Liste _abbestellen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Die Mailingliste der gewählten Nachricht abbestellen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
 msgid "Mailing _List"
 msgstr "Mailing_liste"
 
@@ -19143,9 +18660,9 @@ msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
 msgstr ""
-"Veröffentlichungen auf dieser Mailingliste sind nicht erlaubt. "
-"Möglicherweise ist diese Liste nur zum Lesen gedacht. Um Einzelheiten "
-"darüber zu erfahren, nehmen Sie bitte Kontakt zum Eigner dieser Liste auf."
+"Veröffentlichungen auf dieser Mailingliste sind nicht erlaubt. Möglicherweise "
+"ist diese Liste nur zum Lesen gedacht. Um Einzelheiten darüber zu erfahren, "
+"nehmen Sie bitte Kontakt zum Eigner dieser Liste auf."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
@@ -19153,8 +18670,8 @@ msgstr "Die Nachricht an die Mailingliste schicken?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not contain "
+"any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -19176,8 +18693,7 @@ msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
-"This message does not contain the header information required for this "
-"action."
+"This message does not contain the header information required for this action."
 msgstr ""
 "Diese Nachricht enthält nicht die benötigten Kopfdaten, die zur Ausführung "
 "dieser Aktion notwendig sind."
@@ -19190,11 +18706,11 @@ msgstr "Nachricht _bearbeiten"
 msgid "_Send message"
 msgstr "Nachricht ver_schicken"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mark-all-read/mark-all-read.c:41
 msgid "Also mark messages in subfolders?"
 msgstr "Auch auf Unterordner anwenden?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:44
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19202,15 +18718,15 @@ msgstr ""
 "Sollen nur Nachrichten im gewählten Ordner als gelesen markiert werden, oder "
 "auch in seinen Unterordnern?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:175
 msgid "In Current Folder and _Subfolders"
 msgstr "Im derzeitigen Ordner und in _Unterordnern"
 
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:189
 msgid "In Current _Folder Only"
 msgstr "Nur im _derzeitigen Ordner"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:412
 msgid "Mark Me_ssages as Read"
 msgstr "Nachrichten als gelesen _markieren"
 
@@ -19269,19 +18785,19 @@ msgstr "Einfachen Text bevorzugen"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Nachrichten als einfachen Text anzeigen, auch wenn sie HTML sind"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "HTML anzeigen, wenn vorhanden"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "Evolution den besten Teil zur Anzeige auswählen lassen."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "Klartext anzeigen, wenn vorhanden"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19289,11 +18805,11 @@ msgstr ""
 "Klartext-Teil anzeigen, wenn verfügbar, ansonsten Evolution den besten Teil "
 "zur Anzeige auswählen lassen."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "Immer als einfachen Text anzeigen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19301,11 +18817,11 @@ msgstr ""
 "Immer den Klartext-Teil anzeigen und aus anderen Teilen Anhänge erstellen, "
 "wenn erforderlich."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "_Unterdrückte HTML-Teile als Anhänge anzeigen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "HTML-_Modus"
 
@@ -19330,31 +18846,35 @@ msgstr "Outlook PST-Importeur"
 msgid "Outlook personal folders (.pst)"
 msgstr "Persönliche Outlook-Ordner (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:296
 msgid "_Mail"
 msgstr "_E-Mail"
 
+#: ../plugins/pst-import/pst-importer.c:308
+msgid "Destination folder:"
+msgstr "Zielordner:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "_Address Book"
 msgstr "_Adressbuch"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:321
 msgid "A_ppointments"
 msgstr "_Termine"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:327 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Aufgaben"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:333
 msgid "_Journal entries"
 msgstr "_Journal-Einträge"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "Importing Outlook data"
 msgstr "Outlook-Daten werden importiert"
 
@@ -19514,55 +19034,55 @@ msgstr ""
 "Kalender konnte nicht veröffentlicht werden: Das Backend ist nicht mehr "
 "vorhanden"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "Neuer Ort"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "Ort bearbeiten"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin nicht gefunden, Fehler-Code: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Weiterleitung konnte nicht angelegt werden: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Fehler nach Fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin-Kindprozess antwortet nicht. Wird abgewürgt …"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Warten auf SpamAssassin-Kindprozess abgebrochen. Wird beendet …"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Weiterleitung an SpamAssassin gescheitert, Fehler-Code: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin ist nicht verfügbar. Bitte installieren Sie es zunächst."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Dies erhöht die Zuverlässigkeit des Filters, verlangsamt ihn jedoch"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
 msgid "I_nclude remote tests"
 msgstr "Zusätzliche _Ferntests durchführen"
 
@@ -19664,8 +19184,7 @@ msgstr "Auswahl speichern"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Save a calendar or task list to disk."
-msgstr ""
-"Einen Kalender oder eine Aufgabenliste auf einem Datenträger speichern."
+msgstr "Einen Kalender oder eine Aufgabenliste auf einem Datenträger speichern."
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
@@ -19680,23 +19199,23 @@ msgstr "%d.%m.%YT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF-Format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Zieldatei wählen"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "Den gewählten Kalender auf einem Datenträger speichern"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "Die gewählte Notizliste auf einem Datenträger speichern"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "Die gewählte Aufgabenliste auf einem Datenträger speichern."
 
@@ -19708,47 +19227,46 @@ msgstr "Hilft Ihnen beim erstmaligen Erstellen von Konten."
 msgid "Setup Assistant"
 msgstr "Setup-Assistent"
 
-#: ../plugins/startup-wizard/startup-wizard.c:110
+#: ../plugins/startup-wizard/startup-wizard.c:117
 msgid "Evolution Setup Assistant"
 msgstr "Evolution-Einrichtungsassistent"
 
-#: ../plugins/startup-wizard/startup-wizard.c:115
+#: ../plugins/startup-wizard/startup-wizard.c:122
 msgid "Welcome"
 msgstr "Willkommen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:118
+#: ../plugins/startup-wizard/startup-wizard.c:125
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect to "
+"your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 "Willkommen bei Evolution. Die folgenden Dialoge werden Ihnen helfen, Ihre E-"
-"Mail-Konten einzurichten und Dateien aus anderen Anwendungen zu "
-"importieren.\n"
+"Mail-Konten einzurichten und Dateien aus anderen Anwendungen zu importieren.\n"
 "\n"
 "Klicken Sie auf »Vor«, um fortzufahren. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
+#: ../plugins/startup-wizard/startup-wizard.c:160
 #: ../widgets/misc/e-import-assistant.c:385
 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:168
+#: ../plugins/startup-wizard/startup-wizard.c:175
 #: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:185
+#: ../plugins/startup-wizard/startup-wizard.c:192
 msgid "Importing files"
 msgstr "Dateien werden importiert"
 
-#: ../plugins/startup-wizard/startup-wizard.c:248
+#: ../plugins/startup-wizard/startup-wizard.c:258
 msgid "Importing data."
 msgstr "Daten werden importiert."
 
-#: ../plugins/startup-wizard/startup-wizard.c:250
+#: ../plugins/startup-wizard/startup-wizard.c:264
 msgid "Please wait"
 msgstr "Bitte warten"
 
@@ -19765,7 +19283,7 @@ msgid "Thread messages by subject"
 msgstr "Betreffsbezogenes Threading der Nachrichten"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "Zurückfallen auf be_treffsbezogenes Threading der Nachrichten"
 
@@ -19781,15 +19299,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Vorlagen-Plugin basierend auf Entwürfen"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:615
 msgid "No Title"
 msgstr "Kein Titel"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:686
 msgid "Save as _Template"
 msgstr "Als V_orlage speichern"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:688
 msgid "Save as Template"
 msgstr "Als Vorlage speichern"
 
@@ -19809,27 +19327,27 @@ msgstr "Eingebettete vCards"
 msgid "Show vCards directly in mail messages."
 msgstr "vCards innerhalb von Nachrichten anzeigen."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
 msgid "Show Full vCard"
 msgstr "Gesamte VCard anzeigen"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:167
 msgid "Show Compact vCard"
 msgstr "Kompakt-VCard anzeigen"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:228
 msgid "There is one other contact."
 msgstr "Es gibt einen weiteren Kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:237
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Es gibt %d weiteren Kontakt."
 msgstr[1] "Es gibt %d weitere Kontakte."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:258
 msgid "Save in Address Book"
 msgstr "In Adressbuch speichern"
 
@@ -19845,11 +19363,11 @@ msgstr "WebDAV-Kontakte"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "Adresse:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "IfMatch _vermeiden (benötigt von Apache < 2.2.8)"
 
@@ -19890,6 +19408,7 @@ msgid "Default window width"
 msgstr "Voreingestellte Fensterbreite"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
+#| msgid "Enable search folders"
 msgid "Enable express mode"
 msgstr "Express-Modus aktivieren"
 
@@ -19901,7 +19420,8 @@ msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Flag that enables a much simplified user interface."
-msgstr "Flag, das eine wesentlich einfachere Benutzeroberfläche aktiviert."
+msgstr ""
+"Markierung, die eine deutlich vereinfachte Benutzerschnittstelle aktiviert."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
@@ -19934,8 +19454,8 @@ msgid ""
 msgstr ""
 "Legt fest, ob Verbindungen zum Proxy-Server legitimiert werden müssen. Der "
 "Benutzername wird aus dem Schlüssel »/apps/evolution/shell/network_config/"
-"authentication_user« geholt, das Passwort entweder aus dem GNOME-"
-"Schlüsselbund oder der Passwortdatei unter ~/.gnome2_private/Evolution."
+"authentication_user« geholt, das Passwort entweder aus dem GNOME-Schlüsselbund "
+"oder der Passwortdatei unter ~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
@@ -19954,8 +19474,8 @@ msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
 msgstr ""
-"Initiale Ansicht der Widgets in der Anlagenleiste. »0« bedeutet "
-"Symbolansicht, »1« Listenansicht"
+"Initiale Ansicht der Widgets in der Anlagenleiste. »0« bedeutet Symbolansicht, "
+"»1« Listenansicht"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
@@ -20015,7 +19535,7 @@ msgstr "Seitenleiste anzeigen"
 msgid "Skip development warning dialog"
 msgstr "Entwicklungs-Warndialog nicht anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:305
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
@@ -20028,8 +19548,8 @@ msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
-"Die Konfigurationsversion von Evolution mit Haupt-, Unter- und "
-"Konfigurations-Stufe (z.B. »2.6.0«)."
+"Die Konfigurationsversion von Evolution mit Haupt-, Unter- und Konfigurations-"
+"Stufe (z.B. »2.6.0«)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
@@ -20077,8 +19597,8 @@ msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
-"Der Port des in »/apps/evolution/shell/network_config/http_host» "
-"festgelegten Proxys."
+"Der Port des in »/apps/evolution/shell/network_config/http_host» festgelegten "
+"Proxys."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
@@ -20093,14 +19613,14 @@ msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr ""
-"Der Port des in »/apps/evolution/shell/network_config/socks_host« "
-"festgelegten Proxys."
+"Der Port des in »/apps/evolution/shell/network_config/socks_host« festgelegten "
+"Proxys."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by "
+"the GNOME toolbar setting."
 msgstr ""
 "Der Stil der Fensterknöpfe. Mögliche Einstellungen sind »text«, »icons«, »both« "
 "und »toolbar«. Wenn »toolbar« gesetzt wurde, wird der Stil anhand der GNOME-"
@@ -20173,144 +19693,46 @@ msgstr "Fensterknopfstil"
 msgid "Window buttons are visible"
 msgstr "Fensterknöpfe sind sichtbar"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
 msgid "Searches"
 msgstr "Suchen"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:545
 msgid "Save Search"
 msgstr "Suche speichern"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "An_zeigen: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "S_uchen: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr " _in "
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "Werkzeugleistenstil"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "Der Werkzeugleistenstil des Umschalters"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "Werkzeugleiste anzeigen"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "Legt fest, ob der Umschalter sichtbar ist"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Alle Dateien (*)"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "Aktion des Umschaltknopfs"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "Die Umschalteraktion für diese Shell-Ansicht"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "Seitennummer"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr "Die Seitennummer innerhalb der Reitermappe der Shell-Ansicht"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "Suchregel"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "Kriterien für die aktuellen Suchergebnisse"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "Das EShellBackend für diese Shell-Ansicht"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "Widget für den Shell-Inhalt"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr ""
-"Das Seitenleisten-Widget erscheint im rechten Feld eines Shell-Fensters"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "Shell-Seitenleisten-Widget"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "Das Seitenleisten-Widget erscheint im linken Feld eines Shell-Fensters"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "Shell-Aufgabenlisten-Widget"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "Das Aufgaben-Widget erscheint am unteren Rand eines Shell-Fensters"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "Shell-Fenster"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "Das Fenster, auf welches sich die Shellansicht bezieht"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "Die Schlüsseldatei, welche die Statusdaten des Widgets enthält"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "Der Titel des Shell-Ansicht"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "Kennung der aktuellen Ansicht"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "Die momentane Kennung der GAL-Ansicht"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -20332,404 +19754,316 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution-Webseite"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "Bug-Buddy ist nicht installiert."
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "Bug-Buddy konnte nicht gestartet werden."
 
-#: ../shell/e-shell-window-actions.c:1343
+#: ../shell/e-shell-window-actions.c:1347
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME Pilot ist nicht installiert."
 
-#: ../shell/e-shell-window-actions.c:1345
+#: ../shell/e-shell-window-actions.c:1349
 msgid "GNOME Pilot could not be run."
 msgstr "GNOME Pilot konnte nicht gestartet werden."
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1443
 msgid "Show information about Evolution"
 msgstr "Informationen zu Evolution anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "Fenster s_chließen"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1455
 msgid "_Contents"
 msgstr "_Inhalte"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1457
 msgid "Open the Evolution User Guide"
 msgstr "Das Benutzerhandbuch von Evolution öffnen"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Evolution _FAQ"
 msgstr "Häufig gestellte _Fragen"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Öffnet die Webseite mit den am häufigsten gestellten Fragen"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1490
 msgid "_Forget Passwords"
 msgstr "Passwörter ver_werfen"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1492
 msgid "Forget all remembered passwords"
 msgstr "Alle gemerkten Passwörter verwerfen"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1497
 msgid "I_mport..."
 msgstr "Impor_tieren …"
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Import data from other programs"
 msgstr "Daten aus anderen Programmen importieren"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1504
 msgid "New _Window"
 msgstr "Neues F_enster"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1506
 msgid "Create a new window displaying this view"
 msgstr "Ein neues Fenster öffnen, das diese Ansicht anzeigt"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Configure Evolution"
 msgstr "Evolution konfigurieren"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "_Kurzreferenz"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Show Evolution's shortcut keys"
 msgstr "Die Tastenkürzel von Evolution anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "Das Programm beenden"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "Er_weiterte Suche …"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr "Erweiterte Suche ausführen"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Clear the current search parameters"
 msgstr "Die aktuellen Suchparameter leeren"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1553
 msgid "_Edit Saved Searches..."
 msgstr "Gespeicherte Suchen _bearbeiten …"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Manage your saved searches"
 msgstr "Ihre gespeicherten Suchvorgänge verwalten"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "Klicken Sie hier, um den Suchtypen zu ändern"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "_Jetzt suchen"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Execute the current search parameters"
 msgstr "Die aktuellen Suchparameter anwenden"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "Suche _speichern …"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Save the current search parameters"
 msgstr "Die aktuellen Suchparameter speichern"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Send / _Receive"
 msgstr "Verschicken/Ab_rufen"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Send queued items and retrieve new items"
 msgstr "Objekte in der Warteschlange verschicken und neue Objekte abrufen"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Submit _Bug Report..."
 msgstr "Fehler_bericht einschicken …"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1602
 msgid "GNOME Pilot _Synchronization..."
 msgstr "GNOME Pilot-_Datenabgleich …"
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1604
 msgid "Set up GNOME Pilot configuration"
 msgstr "Die Pilot-Einstellungen festlegen"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1611
 msgid "Put Evolution into offline mode"
 msgstr "Evolution in den Offline-Modus versetzen"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1618
 msgid "Put Evolution into online mode"
 msgstr "Evolution in den Online-Modus versetzen"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1646
 msgid "Lay_out"
 msgstr "_Anordnung"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_New"
 msgstr "_Neu"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Switcher Appearance"
 msgstr "Erscheinungsbild der Knö_pfe"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Window"
 msgstr "_Fenster"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show Side _Bar"
 msgstr "Sei_tenleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1712
 msgid "Show the side bar"
 msgstr "Seitenleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show _Buttons"
 msgstr "_Knöpfe anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1720
 msgid "Show the switcher buttons"
 msgstr "Umschaltknöpfe anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1726
 msgid "Show _Status Bar"
 msgstr "Stat_usleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Show the status bar"
 msgstr "Die Statusleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1734
 msgid "Show _Tool Bar"
 msgstr "_Werkzeugleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1736
 msgid "Show the tool bar"
 msgstr "Die Werkzeugleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1758
 msgid "_Icons Only"
 msgstr "Nur S_ymbole"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Display window buttons with icons only"
 msgstr "Fensterknöpfe nur als Symbole anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1765
 msgid "_Text Only"
 msgstr "Nur _Text"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1767
 msgid "Display window buttons with text only"
 msgstr "Fensterknöpfe nur als Text anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Icons _and Text"
 msgstr "Symbole _und Text"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Display window buttons with icons and text"
 msgstr "Fensterknöpfe mit Symbolen und Text anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Tool_bar Style"
 msgstr "_Werkzeugleistenstil"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Fensterknöpfe mit der Systemeinstellung für Werkzeugleisten anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Define Views..."
 msgstr "Ansichten definieren …"
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1791
 msgid "Create or edit views"
 msgstr "Ansicht er_stellen oder bearbeiten"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Save Custom View..."
 msgstr "Benutzerdefinierte Ansicht speichern …"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Save current custom view"
 msgstr "Aktuelle benutzerdefinierte Ansicht speichern"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1805
 msgid "C_urrent View"
 msgstr "A_ktuelle Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Custom View"
 msgstr "Benutzerdefinierte Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Current view is a customized view"
 msgstr "Aktuelle Ansicht ist eine benutzerdefinierte Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1827
 msgid "Change the page settings for your current printer"
 msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker ändern"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2204
 #, c-format
 msgid "Switch to %s"
 msgstr "Zu %s wechseln"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2417
 msgid "Execute these search parameters"
 msgstr "Diese Suchparameter ausführen"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:573
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "Neu"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "Aktive Shell-Ansicht"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "Name des aktiven Shell-Fensters"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "EFocusTracker des Shell-Fensters"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "Geometrie"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "Zeichenkette für die anfängliche Fenstergeometrie"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Sicherer Modus"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Legt fest, ob sich das Shellfenster im sicheren Modus befindet"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "Seitenleiste anzeigen"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "Legt fest, ob die Seitenleiste des Shellfensters sichtbar ist"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "Umschaltknöpfe sind sichtbar"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Legt fest, ob die Umschaltknöpfe des Shellfensters sichtbar sind"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "Aufgabenleiste ist sichtbar"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "Legt fest, ob die Aufgabenleiste des Shellfensters sichtbar ist"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Legt fest, ob die Werkzeugleiste des Shellfensters sichtbar ist"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "UI-Verwaltung"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "GtkUIManager des Shell-Fensters"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "Offline-Betrieb wird vorbereitet …"
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "Online-Betrieb wird vorbereitet …"
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "Beenden wird vorbereitet …"
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "Modulordner"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "Der Ordner, aus dem EModules geladen werden sollen"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "Netzwerk ist verfügbar"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "Legt fest, ob das Netzwerk verfügbar ist"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "Online"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "Legt fest, ob die Shell online ist"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:164
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20768,7 +20102,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:192
+#: ../shell/main.c:188
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20776,59 +20110,56 @@ msgstr ""
 "Vielen Dank\n"
 "Das Evolution-Team\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:195
 msgid "Do not tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:301
 msgid "Start Evolution activating the specified component"
 msgstr "Beim Start von Evolution die angegebene Komponente aktivieren"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:303
 msgid "Apply the given geometry to the main window"
 msgstr "Die angegebene Geometrie auf das Hauptfenster anwenden"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:307
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:309
+#| msgid "Start in online mode"
 msgid "Start in \"express\" mode"
 msgstr "Im Express-Modus starten"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:312
 msgid "Forcibly shut down Evolution"
 msgstr "Evolution zum Herunterfahren zwingen"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Remigrierung von Evolution 1.4 erzwingen"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:315
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:317
 msgid "Disable loading of any plugins."
 msgstr "Das Laden von allen Plugins deaktivieren."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:319
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Die Vorschau von E-Mails, Kontakten und Aufgaben deaktivieren."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:323
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Die Adressen oder Dateinamen in den restlichen Argumenten importieren."
 
-#: ../shell/main.c:350
+#: ../shell/main.c:325
 msgid "Request a running Evolution process to quit"
 msgstr "Einen laufenden Evolution-Prozess zum Beenden auffordern"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:440
 msgid "- The Evolution PIM and Email Client"
 msgstr "– Die Evolution PIM- und E-Mail-Anwendung"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:466
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20843,15 +20174,27 @@ msgstr ""
 "Sind Sie sicher, dass alle Passworterinnerungen verworfen werden sollen?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Fortfahren"
+#| msgid "Delete old data from version {0}?"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Versionsaktualisierung direkt von Version {0} ist nicht möglich"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Alte Daten von Version {0} löschen?"
+#| msgid "Continue"
+msgid "Continue Anyway"
+msgstr "Trotzdem fortsetzen"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then upgrading "
+"to Evolution 3."
+msgstr ""
+"Evolution unterstützt die Aktualisierung direkt von Version {0} nicht mehr. "
+"Es ist allerdings möglich, zunächst auf Version 2 und dann auf Version 3 zu "
+"aktualisieren."
+
+#: ../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 ""
@@ -20859,89 +20202,24 @@ msgstr ""
 "Passworte gelöscht. Wenn sie wieder benötigt werden, wird Ihnen eine "
 "Eingabeaufforderung angezeigt."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "Unzureichender Plattenplatz für Aktualisierung."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "Alte Daten wirklich löschen?"
+#| msgid "_Quit"
+msgid "Quit Now"
+msgstr "Jetzt beenden"
 
 #: ../shell/shell.error.xml.h:8
-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 ""
-"Sie sind im Begriff, den gesamten Inhalt des Ordners »evolution« dauerhaft zu "
-"löschen.\n"
-"\n"
-"Es ist empfehlenswert, vor dem Löschen der alten Daten manuell "
-"sicherzustellen, dass alle E-Mail-, Kontakt- und Kalenderdaten vorhanden "
-"sind, und dass diese Evolution-Version korrekt arbeitet.\n"
-"\n"
-"Sobald diese gelöscht sind, können Sie ohne manuelle Eingriffe nicht zur "
-"vorherigen Evolution-Version zurückkehren.\n"
-
-#: ../shell/shell.error.xml.h:14
-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 ""
-"Die vorherige Evolution-Version hat ihre Daten an einem anderen Ort "
-"gespeichert.\n"
-"\n"
-"Falls Sie sich dafür entscheiden, diese Daten zu entfernen, gehen die "
-"gesamten Daten im Ordner »evolution« dauerhaft verloren. Falls Sie sich dafür "
-"entscheiden, diese Daten beizubehalten, können Sie den Inhalt von »evolution« "
-"jederzeit manuell entfernen.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "Aktualisieren von vorheriger Version gescheitert:"
 
-#: ../shell/shell.error.xml.h:19
-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 ""
-"Das Aktualisieren Ihrer Daten und Einstellungen macht bis zu {0} "
-"Plattenplatz erforderlich, es ist jedoch lediglich {1} verfügbar.\n"
-"\n"
-"Vor dem Fortfahren müssen Sie mehr Platz in Ihrem persönlichen Ordner "
-"bereitstellen."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "Verw_erfen"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "Daten _beibehalten"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_Später erinnern"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{0}\n"
 "\n"
@@ -21031,7 +20309,7 @@ msgstr "Optionen der Sitzungsverwaltung:"
 msgid "Show session management options"
 msgstr "Optionen der Sitzungsverwaltung anzeigen"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21089,7 +20367,7 @@ msgstr "Zertifikatname"
 msgid "Purposes"
 msgstr "Verwendungszwecke"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Seriennummer"
@@ -21110,18 +20388,19 @@ msgstr "E-Mail-Adresse"
 msgid "All CA certificate files"
 msgstr "Alle CA-Zertifikatdateien"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:1052
 msgid "Certificates"
 msgstr "Zertifikate"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Zertifikatbetrachter: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
+#| msgid "Enter the password for `%s'"
+msgid "Enter the password for '%s'"
 msgstr "Geben Sie das Passwort für »%s« ein"
 
 #. we're setting the password initially
@@ -21152,7 +20431,7 @@ msgstr ""
 "Aussteller:\n"
 "      Empfänger: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Zertifikat wählen"
 
@@ -21165,175 +20444,165 @@ msgid "Authorities"
 msgstr "Zertifizierungsstellen"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "Sichern"
-
-#: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "Alle sichern"
+#| msgid "Backup All"
+msgid "Backup _All"
+msgstr "_Alle sichern"
 
 # CHECK
-#: ../smime/gui/smime-ui.ui.h:5
+#: ../smime/gui/smime-ui.ui.h:4
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 msgstr ""
-"Bevor Sie dieser Zertifizierungsstelle uneingeschränkt vertrauen, sollten "
-"Sie sein Zertifikat und seine Verfahrensweisen unter die Lupe nehmen (falls "
+"Bevor Sie dieser Zertifizierungsstelle uneingeschränkt vertrauen, sollten Sie "
+"sein Zertifikat und seine Verfahrensweisen unter die Lupe nehmen (falls "
 "möglich)."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "Zertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "Vertrauenswürdigkeit einer Zertifizierungsstelle"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "Zertifikatfelder"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "Zertifikathierarchie"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "Zertifikatdetails"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "Zertifikattabelle"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "Common-Name (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Kontaktzertifikate"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Nicht auf die Authentizität dieses Zertifikats vertrauen"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "Einstellungen zur Vertrauenswürdigkeit von E-Mail-Zertifizierungen"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "E-Mail-Empfangszertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "E-Mail-Signaturzertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Läuft aus"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "Feldname"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "Fingerabdrücke"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "Importieren"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "Ausgestellt von"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Ausgestellt am"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "Ausgestellt für"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "MD5-Fingerabdruck"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "Organisation (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "Organisationseinheit (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-Fingerabdruck"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "SSL-Client-Zertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "SSL-Server-Zertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "Dieses Zertifikat wurde für folgende Verwendungszwecke verifiziert:"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "Auf die Authentizität dieses Zertifikats vertrauen"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "Dieser CA bei der Identifikation von E-Mail-Benutzern vertrauen."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "Dieser CA bei der Identifikation von Software-Entwicklern vertrauen."
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
-msgstr "Dieser CA bei der Website-Identifikation vertrauen."
+#: ../smime/gui/smime-ui.ui.h:37
+#| msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify websites."
+msgstr "Dieser Zertifizierungsstelle bei der Website-Identifikation vertrauen."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "Gültigkeit"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "Anzeigen"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
-msgstr ""
-"Sie haben Zertifikate folgender Organisationen, die Sie identifizieren:"
+msgstr "Sie haben Zertifikate folgender Organisationen, die Sie identifizieren:"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Sie haben Zertifikate, die folgende Zertifizierungsstellen identifizieren:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "Sie haben Zertifikate, die folgende Personen identifizieren:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "Ihre Zertifikate"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+#| msgid "Backup"
+msgid "_Backup"
+msgstr "_Sichern"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "CA-Vertrauenswürdigkeit _bearbeiten"
 
@@ -21482,28 +20751,34 @@ msgstr "Nicht-kritisch"
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Algorithm"
 msgstr "Algorithmus der Zertifikatsignatur"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Aussteller"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "Eindeutige Ausstellerkennung"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "Eindeutige Empfängerkennung"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1220
 msgid "Certificate Signature Value"
 msgstr "Wert der Zertifikatsignatur"
 
@@ -21593,11 +20868,11 @@ 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:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -21619,27 +20894,22 @@ msgid ""
 "zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Benutzen Sie die linke Maustaste, um einen Kartenausschnitt zu vergrößern "
-"und wählen Sie eine Zeitzone.\n"
+"Benutzen Sie die linke Maustaste, um einen Kartenausschnitt zu vergrößern und "
+"wählen Sie eine Zeitzone.\n"
 "Mit der rechten Maustaste können Sie die Ansicht verkleinern."
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
 msgid "_Selection"
 msgstr "Au_swahl"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "Sammlung"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:339
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Ansichten für %s definieren"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-define-views-dialog.c:349
 msgid "Define Views"
 msgstr "Ansichten definieren"
 
@@ -21652,11 +20922,7 @@ msgstr "Ansichten für »%s« definieren"
 msgid "Table"
 msgstr "Tabelle"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Instanz"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Aktuelle Ansicht speichern"
 
@@ -21668,11 +20934,7 @@ msgstr "Neue Ansicht er_stellen"
 msgid "_Replace existing view"
 msgstr "Vorhandene Ansicht erset_zen"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "Fabrik"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "Neue Ansicht definieren"
 
@@ -21692,22 +20954,10 @@ msgstr "Art der Ansicht:"
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "Kontoname"
-
 #: ../widgets/misc/e-account-tree-view.c:255
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "Aktion"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "Eine GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Eigenschaften der Anlage"
@@ -21725,11 +20975,11 @@ msgstr "MIME-Typ:"
 msgid "_Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage _vorschlagen"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "Konnte nicht als Hintergrund gesetzt werden"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "Zum _Hintergrund machen"
 
@@ -21762,13 +21012,10 @@ msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:636
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "Anla_genleiste anzeigen"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "Anlage hinzufügen"
@@ -21784,33 +21031,33 @@ msgstr[0] "Anlage speichern"
 msgstr[1] "Anlagen speichern"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment-store.c:633 ../widgets/misc/e-attachment.c:1773
+#: ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "Anlage.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "_Alle speichern"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "Anlage _hinzufügen …"
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:356
 msgid "_View Inline"
 msgstr "_Eingebettet anzeigen"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Mit »%s« öffnen"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Diese Anlage mit »%s« öffnen"
@@ -21819,59 +21066,59 @@ msgstr "Diese Anlage mit »%s« öffnen"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "Beigelegte Nachricht"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 msgid "A load operation is already in progress"
 msgstr "Ein Ladevorgang läuft bereits"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 msgid "A save operation is already in progress"
 msgstr "Ein Speichervorgang läuft bereits"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "»%s« konnte nicht geladen werden"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Die Anlage konnte nicht geladen werden"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2193
 #, c-format
 msgid "Could not open '%s'"
 msgstr "»%s« konnte nicht geöffnet werden"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2196
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Die Anlage konnte nicht geöffnet werden"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "Anlagen wurden nicht geladen"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2707
 #, c-format
 msgid "Could not save '%s'"
 msgstr "»%s« konnte nicht gespeichert werden"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2710
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Die Anlage konnte nicht gespeichert werden"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "Drücken Sie Strg und klicken Sie, um einen Link zu öffnen"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21879,65 +21126,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Monatskalender"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Füllfarbe"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK-Füllfarbe"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Getüpfelt füllen"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Mindestbreite"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Mindestbreite"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Abstand"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Zeichenkodierung"
@@ -21950,48 +21138,48 @@ msgstr "Geben Sie den zu verwendenden Zeichensatz ein"
 msgid "Other..."
 msgstr "Weitere …"
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Datum und Uhrzeit"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Eingabefeld für das Datum"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Diesen Knopf drücken, um den Kalender anzuzeigen"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Auswahlliste für die Zeit"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "_Jetzt"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_Heute"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Keine"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "Keine"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "Ungültiges Datum"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "Ungültige Zeitangabe"
 
@@ -22044,8 +21232,8 @@ msgid ""
 msgstr ""
 "Evolution hat nach zu importierenden Einstellungen folgender Anwendungen "
 "gesucht: Pine, Netscape, Elm sowie iCalendar. Es wurden keine importierbaren "
-"Einstellungen gefunden. Klicken Sie bitte auf den Knopf »Zurück«, falls Sie "
-"es noch einmal versuchen wollen."
+"Einstellungen gefunden. Klicken Sie bitte auf den Knopf »Zurück«, falls Sie es "
+"noch einmal versuchen wollen."
 
 #: ../widgets/misc/e-import-assistant.c:1187
 #: ../widgets/misc/e-import-assistant.c:1214
@@ -22089,11 +21277,11 @@ msgstr ""
 msgid "Import Data"
 msgstr "Daten importieren"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "Weltkarte"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22119,42 +21307,6 @@ msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "Evolution ist im Augenblick offline, weil das Netzwerk nicht verfügbar ist."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "Der Status des Knopfes ist »online«"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "Horizontale Position"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "Position des Feldes bei horizontaler Anordnung"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "Vertikale Position"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "Position des Feldes bei vertikaler Anordnung"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "Proportion"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "Proportion der Größe des zweiten Feldes"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "Feste Größenänderung"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Während Größenänderungen die zweite Leiste nicht ändern"
-
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Abgleichen mit:"
@@ -22176,68 +21328,46 @@ msgstr "Evolution-Einstellungen"
 msgid "Matches: %d"
 msgstr "Passt auf: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "Die Suchleiste schließen"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "_Suchen:"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "Das Suchfeld leeren"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "_Rückwärts suchen"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "Den letzten Suchtreffer finden"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "_Weitersuchen"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "Den nächsten Suchtreffer finden"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "_Groß-/Kleinschreibung berücksichtigen"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr "Seitenende erreicht, ab Anfang wird fortgesetzt"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "Seitenanfang erreicht, ab Ende wird fortgesetzt"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "Cursor-Zeile"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Cursor-Spalte"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Sortierer"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Markierungsmodus"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Cursor-Modus"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Wenn ge_löscht:"
@@ -22310,43 +21440,48 @@ msgstr "Wenn a_bgeschlossen:"
 msgid "When decli_ned:"
 msgstr "Wenn abge_lehnt:"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "B_innen"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "D_anach:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+#| msgid "_After:"
+msgid "_After"
+msgstr "D_anach"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_Alle Informationen"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "E_instufung:"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "Nachrichtenzustellung ver_zögern"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "Zuge_stellt"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "_Verfallsdatum angeben"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "_Bis:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+#| msgid "_Until:"
+msgid "_Until"
+msgstr "_Bis"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "_Wenn passend"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "_Wenn geöffnet:"
 
@@ -22403,41 +21538,41 @@ msgstr "Die Skriptdatei muss ausführbar sein."
 msgid "Click here to go to URL"
 msgstr "Klicken Sie hier, um zur Adresse zu gehen"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:359
 msgid "_Copy Link Location"
 msgstr "Link-Ziel _kopieren"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:361
 msgid "Copy the link to the clipboard"
 msgstr "Den Verweis in die Zwischenablage kopieren"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Open Link in Browser"
 msgstr "Link im Browser ö_ffnen"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:371
 msgid "Open the link in a web browser"
 msgstr "Verweis im Browser ö_ffnen"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Copy Email Address"
 msgstr "_E-Mail-Adresse kopieren"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
 msgid "Select all text and images"
 msgstr "Den gesamten Text und Bilder in einer Nachricht markieren"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicken Sie hier, um %s anzurufen"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:846
 msgid "Click to hide/unhide addresses"
 msgstr "Adressen anzeigen/verbergen"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
@@ -22456,7 +21591,7 @@ msgstr "Kalender: von %s bis %s"
 msgid "evolution calendar item"
 msgstr "Evolution Kalenderelement"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "Popup-Liste"
 
@@ -22474,7 +21609,7 @@ msgstr "Keine"
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
@@ -22483,48 +21618,12 @@ msgstr "Die Zeit muss folgendes Format haben: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschließlich) sein"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Markierte Spalte"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Fokussierte Spalte"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Nicht markierte Spalte"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Durchgestrichene Spalte"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "Unterstrichene Spalte"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Fette Spalte"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Farbige Spalte"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Spalte für Hintergrundfarbe"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "Klicken zum Hinzufügen"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Zustand"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Aufsteigend)"
@@ -22541,12 +21640,12 @@ msgstr "Nicht sortiert"
 msgid "No grouping"
 msgstr "Nicht gruppieren"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Felder anzeigen"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "Verfügbare Felder"
 
@@ -22555,7 +21654,7 @@ msgid "A_vailable Fields:"
 msgstr "_Verfügbare Felder:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "Aufsteigend"
 
@@ -22568,7 +21667,7 @@ msgid "Clear _All"
 msgstr "Alles _entfernen"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "Absteigend"
 
@@ -22628,7 +21727,7 @@ msgstr "Diese Felder der Reihe nach an_zeigen:"
 msgid "_Sort..."
 msgstr "_Sortieren …"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "Spalte hinzufügen"
 
@@ -22640,251 +21739,114 @@ msgstr ""
 "Um eine Spalte zur Tabelle hinzuzufügen, ziehen Sie\n"
 "sie an die Stelle, an der die Spalte erscheinen soll."
 
-#: ../widgets/table/e-table-group-container.c:342
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
 #, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+#| msgid "%s : %s (%d item)"
+#| msgid_plural "%s : %s (%d items)"
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s: %s (%d Objekt)"
 msgstr[1] "%s: %s (%d Objekte)"
 
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d Objekt)"
 msgstr[1] "%s (%d Objekte)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Wechselnde Zeilenfarben"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Horizontales Zeichengitter"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Vertikales Zeichengitter"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Fokus zeichnen"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Cursor-Modus"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Markierungsmodell"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "Längenschwellwert"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Einheitliche Zeilenhöhe"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "Eingefroren"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
 msgstr "Aktuelle Ansicht anpassen"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Sort _Ascending"
 msgstr "A_ufsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1565
 msgid "Sort _Descending"
 msgstr "A_bsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1568
 msgid "_Unsort"
 msgstr "_Nicht sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1571
 msgid "Group By This _Field"
 msgstr "Nach diesem _Feld gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Group By _Box"
 msgstr "Nach Fäc_hern gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Remove This _Column"
 msgstr "_Diese Spalte entfernen"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Add a C_olumn..."
 msgstr "Spalte hin_zufügen …"
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "A_lignment"
 msgstr "Aus_richtung"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "B_est Fit"
 msgstr "_Optimal"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Format Column_s..."
 msgstr "Spalten for_matieren …"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Custo_mize Current View..."
 msgstr "A_ktuelle Ansicht anpassen …"
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Sort By"
 msgstr "_Sortieren nach"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1672
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "Tabellenkopf"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Tabellenvorlage"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Cursor-Zeile"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Sortierinfos"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Immer suchen"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Klick zum Hinzufügen verwenden"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "Vertikale Zeilenabstand"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr ""
-"Vertikaler Zwischeraum zwischen Zeilen. Dieser Zwischenraum wird über und "
-"unter einer Zeile eingefügt"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree-Tabellenadapter"
-
-# CHECK
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Retro-Look"
-
-# CHECK
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Linien und »+/-«-Ausklapper anzeigen."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "Ausklappergröße"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "Größe des Ausklapppfeils"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "Aufklappen"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "Kind aufklappen"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "Bearbeiten"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "Zelle bearbeiten"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "Umschalten"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "Zelle umschalten"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "Ausklappen"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "Die Zeile des ETrees ausklappen, die diese Zelle enthält"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "Einrollen"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "Die Zeile des ETrees einrollen, die diese Zelle enthält"
 
@@ -22900,118 +21862,1026 @@ msgstr "Klicken"
 msgid "sort"
 msgstr "Sortieren"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "Eingabemethoden"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Ereignisprozessor"
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
+#~ msgid "Web Log:"
+#~ msgstr "Weblog:"
+
+#~ msgid "_Web Log:"
+#~ msgstr "_Weblog:"
+
+#~ msgid "Editable"
+#~ msgstr "Editierbar"
+
+#~ msgid "Source Book"
+#~ msgstr "Quellbuch"
+
+#~ msgid "Target Book"
+#~ msgstr "Zielbuch"
+
+#~ msgid "Is New Contact"
+#~ msgstr "Ist neuer Kontakt"
+
+#~ msgid "Writable Fields"
+#~ msgstr "Beschreibbare Felder"
+
+#~ msgid "Required Fields"
+#~ msgstr "Benötigte Felder"
+
+#~ msgid "Changed"
+#~ msgstr "Geändert"
+
+#~ msgid "Shell"
+#~ msgstr "Shell"
+
+#~ msgid "The EShell singleton"
+#~ msgstr "Das EShell-Singleton"
+
+#~ msgid "Book"
+#~ msgstr "Buch"
+
+#~ msgid "Is New List"
+#~ msgstr "Ist neue Liste"
+
+#~ msgid "Query"
+#~ msgstr "Abfrage"
+
+#~ msgid "Model"
+#~ msgstr "Modell"
+
+#~ msgid "Shell View"
+#~ msgstr "Shell-Ansicht"
+
+#~ msgid "Source"
+#~ msgstr "Quelle"
+
+#~ msgid "Width"
+#~ msgstr "Breite"
+
+#~ msgid "Height"
+#~ msgstr "Höhe"
+
+#~ msgid "Has Focus"
+#~ msgstr "Hat Fokus"
+
+#~ msgid "Field"
+#~ msgstr "Feld"
+
+#~ msgid "Field Name"
+#~ msgstr "Feldname"
+
+#~ msgid "Text Model"
+#~ msgstr "Textmodell"
+
+#~ msgid "Max field name length"
+#~ msgstr "Maximale Länge des Feldnamens"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Text"
+#~ msgid "Column Width"
+#~ msgstr "Spaltenbreite"
+
+#~ msgid "Adapter"
+#~ msgstr "Adapter"
+
+#~ msgid "Selected"
+#~ msgstr "Gewählt"
+
+#~ msgid "Has Cursor"
+#~ msgstr "Hat Cursor"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "Kalender-Repository ist offline."
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "Fehler auf »{0}«"
+
+#~ msgid "No response from the server."
+#~ msgstr "Keine Antwort vom Server."
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "Der Kalender konnte nicht geladen werden"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Check this to use system timezone in Evolution."
+#~ msgstr ""
+#~ "Kreuzen Sie dies an, um die Zeitzone des Systems in Evolution zu verwenden."
+
+#~ msgid "Attendee_s..."
+#~ msgstr "Teil_nehmer …"
+
+#~ msgid "Default Client"
+#~ msgstr "Bevorzugte Anwendung"
+
+#~ msgid "Shell Settings"
+#~ msgstr "Shell-Einstellungen"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "Einstellungen für die gesamte Anwendung"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "_Teilnehmer …"
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "_Heute wählen"
+
+#~ msgid "Name of the logger"
+#~ msgstr "Name der Protokollierung"
+
+#~ msgid "Filename"
+#~ msgstr "Dateiname"
+
+#~ msgid "The filename of the module"
+#~ msgstr "Der Dateiname des Moduls"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "Legt fest, ob das Plugin aktiviert ist"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "Fokusverfolgung"
+
+#~ msgid "Shell Module"
+#~ msgstr "Shell-Modul"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "Das Shell-Backend für E-Mails"
+
+#~ msgid "Show Deleted"
+#~ msgstr "Gelöschte anzeigen"
+
+#~ msgid "To Do"
+#~ msgstr "Zu erledigen"
+
+#~ msgid "Later"
+#~ msgstr "Später"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "Der Ordner »%s« konnte nicht angelegt werden: %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "Der Ordner »%s« konnte nicht nach »%s« kopiert werden: %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "»%s« konnte nicht auf vorhandene Postfächer überprüft werden: %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "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 …"
+
+#~ 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"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "POP-Keep-on-Server-Datenordner »%s« konnte nicht angelegt werden: %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "POP-Keep-on-Server-Daten »%s« konnten nicht kopiert werden: %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "Lokaler E-Mail-Speicher unter »%s« konnte nicht angelegt werden: %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/config."
+#~ "xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "Die Einstellungen der vorhandenen Evolution-Installation konnten nicht "
+#~ "gelesen werden, »evolution/config.xmldb« existiert nicht oder ist "
+#~ "fehlerhaft."
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "Erlaubt Evolution Textteile von begrenzter Größe anzuzeigen"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr ""
+#~ "Verarbeiten von Nachrichten-Textteilen von begrenzter Größe aktivieren/"
+#~ "deaktivieren"
+
+#~ msgid "Text message part limit"
+#~ msgstr "Textnachrichtenteil-Begrenzung"
+
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>Top-Posting-Option</b> (nicht empfohlen)"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "Grund: »{0}«."
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "Grund: »{2}«."
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Der bzw. die folgende(n) Suchordner:\n"
+#~ "{0}\n"
+#~ "verwendete(n) den soeben entfernten Ordner:\n"
+#~ "    »{1}«\n"
+#~ "und wurde(n) aktualisiert."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Die folgende(n) Filterregel(n):\n"
+#~ "{0}\n"
+#~ "verwendete(n) den soeben entfernten Ordner:\n"
+#~ "    »{1}«\n"
+#~ "und wurde(n) aktualisiert."
+
+#~ msgid "Shell Backend"
+#~ msgstr "Shell-Backend"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "Es sind nur verborgene Nachrichten in diesem Ordner. Verwenden Sie zum "
+#~ "Anzeigen im Menü »Ansicht->Verborgene Nachrichten anzeigen«."
+
+#~ msgid "Table column:"
+#~ msgstr "Tabellenspalte:"
+
+#~ msgid "Source List"
+#~ msgstr "Quellenliste"
+
+#~ msgid "The registry of address books"
+#~ msgstr "Die Registratur für Adressbücher"
+
+#~ msgid "Current View"
+#~ msgstr "Aktuelle Ansicht"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "Die derzeit ausgewählte Adressbuchansicht"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "Als Vorschau angezeigter Kontakt"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "Der im Vorschaufeld angezeigte Kontakt"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "Vorschau anzeigen"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "Legt fest, ob das Vorschaufeld angezeigt werden soll"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "LDAP-Server"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "Einstellungen der Auto-Vervollständigung"
+
+#~ 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 ""
+#~ "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 …"
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Das Format der Mailinglisten-Kontakte hat sich geändert.\n"
+#~ "\n"
+#~ "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Das Format der Telefonnummern hat sich teilweise geändert.\n"
+#~ "\n"
+#~ "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ 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 …"
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "Quellenauswahl-Widget"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "Dieses Widget zeigt Gruppen von Adressbüchern an"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "Als VCard speichern …"
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "Die Registratur für Kalender"
+
+#~ 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 ""
+#~ "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 …"
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr ""
+#~ "Alte Einstellungen aus evolution/config.xmldb konnten nicht migiriert "
+#~ "werden"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "Der Kalender »%s« konnte nicht migriert werden."
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "Widget für die Datumswahl"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "Dieses Widget zeigt einen verkleinerten Kalender an"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "Vorgegebener Kalender"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "Vorgegebener Client für Kalenderverwaltung"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "Dieses Widget zeigt Gruppen von Kalendern an"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "Die Registratur für Notizlisten"
+
+#~ msgid "The memo table model"
+#~ msgstr "Das Tabellenmodell für Notizen"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "Vorgegebene Notizverwaltung"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "Vorgegebener Client für Notizverwaltung"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "Dieses Widget zeigt Gruppen von Notizlisten an"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "Die Registratur für Aufgabenlisten"
+
+#~ msgid "The task table model"
+#~ msgstr "Das Tabellenmodell für Aufgaben"
+
+#~ 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 ""
+#~ "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 …"
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "Die Aufgaben in »%s« konnten nicht migriert werden."
+
+#~ msgid "Default Task Client"
+#~ msgstr "Vorgegebener Client für Aufgabenverwaltung"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "Vorgegebener Client für Aufgabenverwaltung"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "Dieses Widget zeigt Gruppen von Aufgabenlisten an"
+
+#~ msgid "Group by Threads"
+#~ msgstr "Nach Threads gruppieren"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "Ob Nachrichten nach Themen gruppiert werden sollen"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Ge_lesene Nachrichten verbergen"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "Alle bereits gelesenen Nachrichten zeitweilig verbergen"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Ge_wählte Nachrichten verbergen"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "Die gewählten Nachrichten zeitweilig verbergen"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "Verborgene Nachrichten an_zeigen"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "Nachrichten anzeigen, die zeitweilig verborgen wurden"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Gelö_schte Nachrichten verbergen"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr ""
+#~ "Verborgene Nachrichten verbergen, statt sie durchgestrichen darzustellen"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr ""
+#~ "Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
+#~ "sucht."
+
+#~ msgid "<b>Server</b>"
+#~ msgstr "<b>Server</b>"
+
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>Benutzer:</b>"
+
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>Kontoname</b>"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Fett"
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "Unterstützung für Hula hinzufügen."
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Durchgestrichen"
+#~ msgid "Hula Support"
+#~ msgstr "Unterstützung für Hula"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Verankerung"
+#~ msgid "_Accept"
+#~ msgstr "An_nehmen"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "Ausrichtung"
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Clip-Breite"
+#~ msgid "Toolbar Style"
+#~ msgstr "Werkzeugleistenstil"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Clip-Höhe"
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "Der Werkzeugleistenstil des Umschalters"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Clip"
+#~ msgid "Toolbar Visible"
+#~ msgstr "Werkzeugleiste anzeigen"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Clip-Rechteck füllen"
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "Legt fest, ob der Umschalter sichtbar ist"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "X-Versatz"
+#~ msgid "Switcher Action"
+#~ msgstr "Aktion des Umschaltknopfs"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Y-Versatz"
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "Die Umschalteraktion für diese Shell-Ansicht"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Textbreite"
+#~ msgid "Page Number"
+#~ msgstr "Seitennummer"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Texthöhe"
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "Die Seitennummer innerhalb der Reitermappe der Shell-Ansicht"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Ellipse verwenden"
+#~ msgid "Search Rule"
+#~ msgstr "Suchregel"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Ellipse"
+#~ msgid "Criteria for the current search results"
+#~ msgstr "Kriterien für die aktuellen Suchergebnisse"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Zeilenumbruch"
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "Das EShellBackend für diese Shell-Ansicht"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Zeichen umbrechen"
+#~ msgid "Shell Content Widget"
+#~ msgstr "Widget für den Shell-Inhalt"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "Max. Zeilen"
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr ""
+#~ "Das Seitenleisten-Widget erscheint im rechten Feld eines Shell-Fensters"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Shell-Seitenleisten-Widget"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr ""
+#~ "Das Seitenleisten-Widget erscheint im linken Feld eines Shell-Fensters"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "Shell-Aufgabenlisten-Widget"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr "Das Aufgaben-Widget erscheint am unteren Rand eines Shell-Fensters"
+
+#~ msgid "Shell Window"
+#~ msgstr "Shell-Fenster"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "Das Fenster, auf welches sich die Shellansicht bezieht"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "Die Schlüsseldatei, welche die Statusdaten des Widgets enthält"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "Der Titel des Shell-Ansicht"
+
+#~ msgid "Current View ID"
+#~ msgstr "Kennung der aktuellen Ansicht"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "Die momentane Kennung der GAL-Ansicht"
+
+#~ msgid "Active Shell View"
+#~ msgstr "Aktive Shell-Ansicht"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "Name des aktiven Shell-Fensters"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "EFocusTracker des Shell-Fensters"
+
+#~ msgid "Geometry"
+#~ msgstr "Geometrie"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "Zeichenkette für die anfängliche Fenstergeometrie"
+
+#~ msgid "Safe Mode"
+#~ msgstr "Sicherer Modus"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "Legt fest, ob sich das Shellfenster im sicheren Modus befindet"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "Seitenleiste anzeigen"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "Legt fest, ob die Seitenleiste des Shellfensters sichtbar ist"
+
+#~ msgid "Switcher Visible"
+#~ msgstr "Umschaltknöpfe sind sichtbar"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "Legt fest, ob die Umschaltknöpfe des Shellfensters sichtbar sind"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "Aufgabenleiste ist sichtbar"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "Legt fest, ob die Aufgabenleiste des Shellfensters sichtbar ist"
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "Legt fest, ob die Werkzeugleiste des Shellfensters sichtbar ist"
+
+#~ msgid "UI Manager"
+#~ msgstr "UI-Verwaltung"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "GtkUIManager des Shell-Fensters"
+
+#~ msgid "Module Directory"
+#~ msgstr "Modulordner"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "Der Ordner, aus dem EModules geladen werden sollen"
+
+#~ msgid "Network Available"
+#~ msgstr "Netzwerk ist verfügbar"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "Legt fest, ob das Netzwerk verfügbar ist"
+
+#~ msgid "Online"
+#~ msgstr "Online"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "Legt fest, ob die Shell online ist"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "Remigrierung von Evolution 1.4 erzwingen"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "Unzureichender Plattenplatz für Aktualisierung."
+
+#~ msgid "Really delete old data?"
+#~ msgstr "Alte Daten wirklich löschen?"
+
+#~ 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 ""
+#~ "Sie sind im Begriff, den gesamten Inhalt des Ordners »evolution« dauerhaft "
+#~ "zu löschen.\n"
+#~ "\n"
+#~ "Es ist empfehlenswert, vor dem Löschen der alten Daten manuell "
+#~ "sicherzustellen, dass alle E-Mail-, Kontakt- und Kalenderdaten vorhanden "
+#~ "sind, und dass diese Evolution-Version korrekt arbeitet.\n"
+#~ "\n"
+#~ "Sobald diese gelöscht sind, können Sie ohne manuelle Eingriffe nicht zur "
+#~ "vorherigen Evolution-Version zurückkehren.\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "Die vorherige Evolution-Version hat ihre Daten an einem anderen Ort "
+#~ "gespeichert.\n"
+#~ "\n"
+#~ "Falls Sie sich dafür entscheiden, diese Daten zu entfernen, gehen die "
+#~ "gesamten Daten im Ordner »evolution« dauerhaft verloren. Falls Sie sich "
+#~ "dafür entscheiden, diese Daten beizubehalten, können Sie den Inhalt von "
+#~ "»evolution« jederzeit manuell entfernen.\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, but "
+#~ "you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "Das Aktualisieren Ihrer Daten und Einstellungen macht bis zu {0} "
+#~ "Plattenplatz erforderlich, es ist jedoch lediglich {1} verfügbar.\n"
+#~ "\n"
+#~ "Vor dem Fortfahren müssen Sie mehr Platz in Ihrem persönlichen Ordner "
+#~ "bereitstellen."
+
+#~ msgid "_Keep Data"
+#~ msgstr "Daten _beibehalten"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "_Später erinnern"
+
+#~ msgid "Edit"
+#~ msgstr "Bearbeiten"
+
+#~ msgid "Import"
+#~ msgstr "Importieren"
+
+#~ msgid "View"
+#~ msgstr "Anzeigen"
+
+#~ msgid "Collection"
+#~ msgstr "Sammlung"
+
+#~ msgid "Instance"
+#~ msgstr "Instanz"
+
+#~ msgid "Factory"
+#~ msgstr "Fabrik"
+
+#~ msgid "Action"
+#~ msgstr "Aktion"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "Eine GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "Anla_genleiste anzeigen"
+
+#~ msgid "Fill color"
+#~ msgstr "Füllfarbe"
+
+#~ msgid "GDK fill color"
+#~ msgstr "GDK-Füllfarbe"
+
+#~ msgid "Fill stipple"
+#~ msgstr "Getüpfelt füllen"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "Mindestbreite"
+
+#~ msgid "Minimum Width"
+#~ msgstr "Mindestbreite"
+
+#~ msgid "Spacing"
+#~ msgstr "Abstand"
+
+#~ msgid "The button state is online"
+#~ msgstr "Der Status des Knopfes ist »online«"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "Horizontale Position"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "Position des Feldes bei horizontaler Anordnung"
+
+#~ msgid "Vertical Position"
+#~ msgstr "Vertikale Position"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Rahmen zeichnen"
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "Position des Feldes bei vertikaler Anordnung"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Zeilenumbruchzeichen erlauben"
+#~ msgid "Proportion"
+#~ msgstr "Proportion"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Hintergrund zeichnen"
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "Proportion der Größe des zweiten Feldes"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Knopf zeichnen"
+#~ msgid "Fixed Resize"
+#~ msgstr "Feste Größenänderung"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "Cursor-Position"
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "Während Größenänderungen die zweite Leiste nicht ändern"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "EM-Kontext"
+#~ msgid "Cursor Row"
+#~ msgstr "Cursor-Zeile"
 
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "Handle-Popup"
+#~ msgid "Cursor Column"
+#~ msgstr "Cursor-Spalte"
+
+#~ msgid "Sorter"
+#~ msgstr "Sortierer"
+
+#~ msgid "Selection Mode"
+#~ msgstr "Markierungsmodus"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "Cursor-Modus"
+
+#~ msgid "Selected Column"
+#~ msgstr "Markierte Spalte"
+
+#~ msgid "Focused Column"
+#~ msgstr "Fokussierte Spalte"
+
+#~ msgid "Unselected Column"
+#~ msgstr "Nicht markierte Spalte"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "Durchgestrichene Spalte"
+
+#~ msgid "Underline Column"
+#~ msgstr "Unterstrichene Spalte"
+
+#~ msgid "Bold Column"
+#~ msgstr "Fette Spalte"
+
+#~ msgid "Color Column"
+#~ msgstr "Farbige Spalte"
+
+#~ msgid "BG Color Column"
+#~ msgstr "Spalte für Hintergrundfarbe"
+
+#~ msgid "State"
+#~ msgstr "Zustand"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "Wechselnde Zeilenfarben"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "Horizontales Zeichengitter"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "Vertikales Zeichengitter"
+
+#~ msgid "Draw focus"
+#~ msgstr "Fokus zeichnen"
+
+#~ msgid "Cursor mode"
+#~ msgstr "Cursor-Modus"
+
+#~ msgid "Selection model"
+#~ msgstr "Markierungsmodell"
+
+#~ msgid "Length Threshold"
+#~ msgstr "Längenschwellwert"
+
+#~ msgid "Uniform row height"
+#~ msgstr "Einheitliche Zeilenhöhe"
+
+#~ msgid "Frozen"
+#~ msgstr "Eingefroren"
+
+#~ msgid "Table header"
+#~ msgstr "Tabellenkopf"
+
+#~ msgid "Table model"
+#~ msgstr "Tabellenvorlage"
+
+#~ msgid "Cursor row"
+#~ msgstr "Cursor-Zeile"
+
+#~ msgid "Sort Info"
+#~ msgstr "Sortierinfos"
+
+#~ msgid "Always search"
+#~ msgstr "Immer suchen"
+
+#~ msgid "Use click to add"
+#~ msgstr "Klick zum Hinzufügen verwenden"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "Vertikale Zeilenabstand"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr ""
+#~ "Vertikaler Zwischeraum zwischen Zeilen. Dieser Zwischenraum wird über und "
+#~ "unter einer Zeile eingefügt"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "ETree-Tabellenadapter"
+
+# CHECK
+#~ msgid "Retro Look"
+#~ msgstr "Retro-Look"
+
+# CHECK
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "Linien und »+/-«-Ausklapper anzeigen."
+
+#~ msgid "Expander Size"
+#~ msgstr "Ausklappergröße"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Größe des Ausklapppfeils"
+
+#~ msgid "popup"
+#~ msgstr "Aufklappen"
+
+#~ msgid "edit"
+#~ msgstr "Bearbeiten"
+
+#~ msgid "toggle"
+#~ msgstr "Umschalten"
+
+#~ msgid "expand"
+#~ msgstr "Ausklappen"
+
+#~ msgid "collapse"
+#~ msgstr "Einrollen"
+
+#~ msgid "Event Processor"
+#~ msgstr "Ereignisprozessor"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Bold"
+#~ msgstr "Fett"
+
+#~ msgid "Strikeout"
+#~ msgstr "Durchgestrichen"
+
+#~ msgid "Anchor"
+#~ msgstr "Verankerung"
+
+#~ msgid "Justification"
+#~ msgstr "Ausrichtung"
+
+#~ msgid "Clip Width"
+#~ msgstr "Clip-Breite"
+
+#~ msgid "Clip Height"
+#~ msgstr "Clip-Höhe"
+
+#~ msgid "Clip"
+#~ msgstr "Clip"
+
+#~ msgid "Fill clip rectangle"
+#~ msgstr "Clip-Rechteck füllen"
+
+#~ msgid "X Offset"
+#~ msgstr "X-Versatz"
+
+#~ msgid "Y Offset"
+#~ msgstr "Y-Versatz"
+
+#~ msgid "Text width"
+#~ msgstr "Textbreite"
+
+#~ msgid "Text height"
+#~ msgstr "Texthöhe"
+
+#~ msgid "Use ellipsis"
+#~ msgstr "Ellipse verwenden"
+
+#~ msgid "Ellipsis"
+#~ msgstr "Ellipse"
+
+#~ msgid "Line wrap"
+#~ msgstr "Zeilenumbruch"
+
+#~ msgid "Break characters"
+#~ msgstr "Zeichen umbrechen"
+
+#~ msgid "Max lines"
+#~ msgstr "Max. Zeilen"
+
+#~ msgid "Draw borders"
+#~ msgstr "Rahmen zeichnen"
+
+#~ msgid "Allow newlines"
+#~ msgstr "Zeilenumbruchzeichen erlauben"
+
+#~ msgid "Draw background"
+#~ msgstr "Hintergrund zeichnen"
+
+#~ msgid "Draw button"
+#~ msgstr "Knopf zeichnen"
+
+#~ msgid "Cursor position"
+#~ msgstr "Cursor-Position"
+
+#~ msgid "IM Context"
+#~ msgstr "EM-Kontext"
+
+#~ msgid "Handle Popup"
+#~ msgstr "Handle-Popup"
 
 #~ msgid "Loading appointments at %s"
 #~ msgstr "Termine unter %s werden geladen"
@@ -23152,8 +23022,8 @@ msgstr "Handle-Popup"
 
 #~ 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."
+#~ "searches will begin. If you leave this blank, the search will begin at the "
+#~ "root of the directory tree."
 #~ msgstr ""
 #~ "Die Suchbasis ist der eindeutige Name (Distinguished Name, kurz DN) des "
 #~ "Eintrags, bei dem die Suche beginnt. Wenn Sie dieses Feld leer lassen, "
@@ -23174,8 +23044,8 @@ msgstr "Handle-Popup"
 #~ "zu hoch angesetzt ist, werden Vorgänge im Adressbuch verlangsamt."
 
 #~ msgid ""
-#~ "This is the name for this server that will appear in your Evolution "
-#~ "folder list. It is for display purposes only. "
+#~ "This is the name for this server that will appear in your Evolution folder "
+#~ "list. It is for display purposes only. "
 #~ msgstr ""
 #~ "Dies ist der Name für diesen Server, der in der Ordnerliste von Evolution "
 #~ "angezeigt wird. Er dient lediglich zu Anzeigezwecken. "
@@ -23459,6 +23329,9 @@ msgstr "Handle-Popup"
 #~ msgid "<span weight=\"bold\">Date/Time Format</span>"
 #~ msgstr "<span weight=\"bold\">Datums-/Zeitformat</span>"
 
+#~ msgid "<span weight=\"bold\">General</span>"
+#~ msgstr "<b>Allgemein</b>"
+
 #~ msgid "<span weight=\"bold\">Task List</span>"
 #~ msgstr "<b>Aufgabenliste</b>"
 
@@ -23772,8 +23645,8 @@ msgstr "Handle-Popup"
 #~ msgid ""
 #~ "Configure mail preferences, including security and message display, here"
 #~ msgstr ""
-#~ "Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit "
-#~ "und der Anzeige von Nachrichten festlegen"
+#~ "Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
+#~ "der Anzeige von Nachrichten festlegen"
 
 #~ msgid "Configure spell-checking, signatures, and the message composer here"
 #~ msgstr ""
@@ -23914,8 +23787,8 @@ msgstr "Handle-Popup"
 
 #~ msgid "Prompt to check if the user wants to go offline immediately"
 #~ msgstr ""
-#~ "Legt fest, ob der Benutzer gefragt werden soll, ob er sofort offline "
-#~ "gehen möchte"
+#~ "Legt fest, ob der Benutzer gefragt werden soll, ob er sofort offline gehen "
+#~ "möchte"
 
 #~ msgid "Thread the message list."
 #~ msgstr "Die Nachrichtenliste nach Threads sortieren."
@@ -23941,6 +23814,9 @@ msgstr "Handle-Popup"
 #~ msgid "<b>_Languages</b>"
 #~ msgstr "<b>_Sprachen</b>"
 
+#~ msgid "<span weight=\"bold\">Account Information</span>"
+#~ msgstr "<b>Konteninformationen</b>"
+
 #~ msgid "<span weight=\"bold\">Authentication</span>"
 #~ msgstr "<b>Legitimation</b>"
 
@@ -23953,6 +23829,9 @@ msgstr "Handle-Popup"
 #~ msgid "<span weight=\"bold\">Default Behavior</span>"
 #~ msgstr "<b>Vorgabeverhalten</b>"
 
+#~ msgid "<span weight=\"bold\">Delete Mail</span>"
+#~ msgstr "<b>Löschen von E-Mails</b>"
+
 #~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 #~ msgstr "<b>_Angezeigte E-Mail-Kopfzeilen</b>"
 
@@ -24105,8 +23984,8 @@ msgstr "Handle-Popup"
 #~ "This option will connect to the Exchange server using standard plaintext "
 #~ "password authentication."
 #~ msgstr ""
-#~ "Diese Option stellt eine Verbindung mit dem Exchange-Server her, wobei "
-#~ "ein einfaches Klartext-Passwort verwendet wird."
+#~ "Diese Option stellt eine Verbindung mit dem Exchange-Server her, wobei ein "
+#~ "einfaches Klartext-Passwort verwendet wird."
 
 #~ msgid "Out Of Office"
 #~ msgstr "Nicht im Büro"
@@ -24184,8 +24063,7 @@ msgstr "Handle-Popup"
 
 #~ msgid "The two passwords do not match. Please re-enter the passwords."
 #~ msgstr ""
-#~ "Die beiden Passworte stimmen nicht überein. Bitte geben Sie sie erneut "
-#~ "ein."
+#~ "Die beiden Passworte stimmen nicht überein. Bitte geben Sie sie erneut ein."
 
 #~ msgid "Confirm Password:"
 #~ msgstr "Passwort bestätigen:"
@@ -24222,12 +24100,11 @@ msgstr "Handle-Popup"
 
 #~ msgid ""
 #~ "This message was sent automatically by Evolution to inform you that you "
-#~ "have been designated as a delegate. You can now send messages on my "
-#~ "behalf."
+#~ "have been designated as a delegate. You can now send messages on my behalf."
 #~ msgstr ""
-#~ "Diese Nachricht wurde automatisch von Evolution verschickt, um Sie "
-#~ "darüber zu informieren, dass Sie als Delegat bestimmt wurden. Sie können "
-#~ "nun Nachrichten in meinem Namen verschicken."
+#~ "Diese Nachricht wurde automatisch von Evolution verschickt, um Sie darüber "
+#~ "zu informieren, dass Sie als Delegat bestimmt wurden. Sie können nun "
+#~ "Nachrichten in meinem Namen verschicken."
 
 #~ msgid "You have been given the following permissions on my folders:"
 #~ msgstr "Sie haben nun folgende Zugriffserlaubnis auf meine Ordner:"
@@ -24658,8 +24535,7 @@ msgstr "Handle-Popup"
 
 #~ msgid "Please make sure the Global Catalog Server name is correct."
 #~ msgstr ""
-#~ "Stellen Sie sicher, dass der Name des globalen Katalog-Servers korrekt "
-#~ "ist."
+#~ "Stellen Sie sicher, dass der Name des globalen Katalog-Servers korrekt ist."
 
 #~ msgid "Please restart Evolution for changes to take effect"
 #~ msgstr ""
@@ -24678,8 +24554,7 @@ msgstr "Handle-Popup"
 #~ msgstr "Das Exchange-Konto wird entfernt, sobald Sie Evolution beenden"
 
 #~ msgid "The Exchange server is not compatible with Exchange Connector."
-#~ msgstr ""
-#~ "Der Exchange-Server ist mit dem Exchange-Connector nicht kompatibel."
+#~ msgstr "Der Exchange-Server ist mit dem Exchange-Connector nicht kompatibel."
 
 #~ msgid ""
 #~ "The server is running Exchange 5.5. Exchange Connector \n"
@@ -24717,8 +24592,7 @@ msgstr "Handle-Popup"
 #~ msgid "Unsupported operation"
 #~ msgstr "Nicht unterstützte Aktion"
 
-#~ msgid ""
-#~ "You are nearing your quota available for storing mail on this server."
+#~ 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."
@@ -24739,8 +24613,8 @@ msgstr "Handle-Popup"
 #~ "Server überschritten."
 
 #~ msgid ""
-#~ "Your current usage is: {0} KB. Try to clear up some space by deleting "
-#~ "some mail."
+#~ "Your current usage is: {0} KB. Try to clear up some space by deleting some "
+#~ "mail."
 #~ msgstr ""
 #~ "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Versuchen Sie durch "
 #~ "das Löschen einiger Nachrichten etwas Platz zu schaffen."
@@ -24749,12 +24623,12 @@ msgstr "Handle-Popup"
 #~ "Your current usage is: {0} KB. You will not be able to either send or "
 #~ "receive mail now."
 #~ msgstr ""
-#~ "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Sie sind jetzt "
-#~ "nicht mehr in der Lage, Nachrichten zu senden oder zu empfangen."
+#~ "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Sie sind jetzt nicht "
+#~ "mehr in der Lage, Nachrichten zu senden oder zu empfangen."
 
 #~ 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."
+#~ "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 ""
 #~ "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Erst nachdem etwas "
 #~ "Speicherplatz durch das Löschen einiger Nachrichten freigemacht wurde, "
@@ -24801,8 +24675,7 @@ msgstr "Handle-Popup"
 #~ msgstr "Ordner abbestellen"
 
 #~ msgid ""
-#~ "Unsubscribe from an IMAP folder by right-clicking on it in the folder "
-#~ "tree."
+#~ "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
 #~ msgstr "Einen IMAP-Ordner durch Rechtsklick im Ordnerbaum abbestellen."
 
 #~ msgid "Add Novell GroupWise support to Evolution."
@@ -24964,8 +24837,7 @@ msgstr "Handle-Popup"
 
 #~ msgid "Click OK to close these connections and go offline"
 #~ msgstr ""
-#~ "Klicken Sie auf OK, um diese Verbindungen zu schließen und offline zu "
-#~ "gehen"
+#~ "Klicken Sie auf OK, um diese Verbindungen zu schließen und offline zu gehen"
 
 #~ msgid "_Import"
 #~ msgstr "_Importieren"
@@ -25176,8 +25048,7 @@ msgstr "Handle-Popup"
 
 #~ msgid "Forget remembered passwords so you will be prompted for them again"
 #~ msgstr ""
-#~ "Erinnerte Passwörter verwerfen, sodass Sie wieder nach ihnen gefragt "
-#~ "werden"
+#~ "Erinnerte Passwörter verwerfen, sodass Sie wieder nach ihnen gefragt werden"
 
 #~ msgid "Hide window buttons"
 #~ msgstr "Fensterknöpfe verbergen"
@@ -25546,8 +25417,8 @@ msgstr "Handle-Popup"
 
 #~ msgid "A plugin for saving all attachments or parts of a message at once."
 #~ msgstr ""
-#~ "Ein Plugin zum Speichern aller Anlagen oder von Teilen einer Nachricht "
-#~ "auf einmal."
+#~ "Ein Plugin zum Speichern aller Anlagen oder von Teilen einer Nachricht auf "
+#~ "einmal."
 
 #~ msgid ""
 #~ "If set, an underline in the text indicates the next character should be "
@@ -25668,9 +25539,9 @@ msgstr "Handle-Popup"
 #~ msgstr "_Anrufen …"
 
 #~ 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 "
+#~ "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 ""
 #~ "Aktivieren der Seitenleisten-Suchfunktion, damit Sie interaktiv suchen "
@@ -25773,8 +25644,8 @@ msgstr "Handle-Popup"
 #~ msgstr "_Namen des Postfachs angeben"
 
 #~ msgid ""
-#~ "A plugin that manages a collection of Exchange account specific "
-#~ "operations and features."
+#~ "A plugin that manages a collection of Exchange account specific operations "
+#~ "and features."
 #~ msgstr ""
 #~ "Ein Plugin, das eine Reihe von Exchange-spezifischen Abläufen und "
 #~ "Funktionen bereitstellt."
@@ -25863,8 +25734,8 @@ msgstr "Handle-Popup"
 #~ "Filters junk messages using SpamAssassin. This plugin requires "
 #~ "SpamAssassin to be installed."
 #~ msgstr ""
-#~ "Filtert unerwünschte Nachrichten unter Verwendung von SpamAssassin. "
-#~ "Dieses Plugin erfordert, dass SpamAssassin installiert ist."
+#~ "Filtert unerwünschte Nachrichten unter Verwendung von SpamAssassin. Dieses "
+#~ "Plugin erfordert, dass SpamAssassin installiert ist."
 
 #~ msgid "Indicates if threading of messages should fall back to subject."
 #~ msgstr ""
@@ -26789,8 +26660,8 @@ msgstr "Handle-Popup"
 
 #, fuzzy
 #~ msgid ""
-#~ "A plugin which allows the creation of meetings from the contents of a "
-#~ "mail message."
+#~ "A plugin which allows the creation of meetings from the contents of a mail "
+#~ "message."
 #~ msgstr ""
 #~ "Ein Plugin zur Erstellung von Aufgaben aus den Inhalten einer E-Mail."
 
diff --git a/po/el.po b/po/el.po
index f5b7651d6e..99e06197ce 100644
--- a/po/el.po
+++ b/po/el.po
@@ -45,8 +45,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-28 11:12+0300\n"
-"PO-Revision-Date: 2010-03-28 11:12+0200\n"
+"POT-Creation-Date: 2010-03-28 10:57+0300\n"
+"PO-Revision-Date: 2010-03-28 11:08+0200\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <team@lists.gnome.gr>\n"
 "MIME-Version: 1.0\n"
@@ -247,7 +247,7 @@ msgstr "Δεν ήταν δυνατή η ανάγνωση του τμήματος
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2000
 msgid "Anniversary"
 msgstr "Επέτειος"
 
@@ -258,7 +258,7 @@ msgstr "Επέτειος"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986
+#: ../calendar/gui/e-calendar-view.c:1999
 #: ../capplet/anjal-settings-main.c:119
 #: ../shell/main.c:112
 msgid "Birthday"
@@ -284,7 +284,7 @@ msgstr "Επαφή"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2553
 msgid "Contact Editor"
 msgstr "Επεξε�γαστής επαφών"
 
@@ -354,7 +354,7 @@ msgstr "Σημειώσεις"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1708
 msgid "Other"
 msgstr "Άλλο"
 
@@ -594,20 +594,20 @@ msgid "Changed"
 msgstr "Τ�οποποιήθηκε"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2548
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Επεξε�γαστής επαφών - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2945
 msgid "Please select an image for this contact"
 msgstr "Πα�ακαλώ επιλέξτε μια εικόνα για αυτή την επαφή"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2946
 msgid "_No image"
 msgstr "_Χω�ίς εικόνα"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3219
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -615,23 +615,23 @@ msgstr ""
 "Τα δεδομένα επαφής δεν είναι έγκυ�α:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3223
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Το '%s' δεν έχει έγκυ�η μο�φή"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3230
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' δεν έχει έγκυ�η μο�φή"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3256
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' είναι κενό"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3270
 msgid "Invalid contact."
 msgstr "Μη έγκυ�η επαφή."
 
@@ -656,14 +656,12 @@ msgid "_Select Address Book"
 msgstr "Επιλο_γή βιβλίου διευθ�νσεων"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218
-#: ../shell/e-shell-window.c:678
+#: ../shell/e-shell-window.c:700
 msgid "Shell"
 msgstr "Κέλυφος"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219
-#: ../shell/e-shell-window.c:679
+#: ../shell/e-shell-window.c:701
 msgid "The EShell singleton"
 msgstr "Το EShell singleton"
 
@@ -838,7 +836,7 @@ msgstr "Συγχώνευση επαφής"
 #: ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
 #: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Any field contains"
@@ -1129,7 +1127,7 @@ msgid "Telex"
 msgstr "Τηλέτυπο"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
+#: ../shell/e-shell-view.c:923
 msgid "Title"
 msgstr "Τίτλος"
 
@@ -1324,17 +1322,17 @@ msgid "Copy _Email Address"
 msgstr "Αντιγ�αφή διε�_θυνσης Email"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:382
 msgid "Copy the email address to the clipboard"
 msgstr "Αντιγ�αφή επιλεγμένων διευθ�νσεων στο π�όχει�ο"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:387
 msgid "_Send New Message To..."
 msgstr "Απο_στολή νέου μην�ματος σε..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:389
 msgid "Send a mail message to this address"
 msgstr "Αποστολή μην�ματος σε αυτή τη διε�θυνση"
 
@@ -1373,7 +1371,7 @@ msgstr "Συνομιλία μέσω βίντεο"
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
+#: ../modules/calendar/e-cal-shell-view.c:495
 #: ../plugins/groupwise-features/camel-gw-listener.c:420
 #: ../plugins/groupwise-features/camel-gw-listener.c:445
 #: ../plugins/groupwise-features/camel-gw-listener.c:560
@@ -1446,7 +1444,7 @@ msgid "Blog"
 msgstr "Ιστολόγιο"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../widgets/misc/e-web-view.c:798
 #, c-format
 msgid "Click to mail %s"
 msgstr "Κλικ εδώ για μήνυμα σε %s"
@@ -1504,8 +1502,8 @@ msgstr "Δεν υποστη�ίζεται το π�ωτόκολλο"
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717
 #: ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230
 #: ../calendar/gui/e-task-table.c:584
@@ -2924,7 +2922,7 @@ msgstr "Διαβάθμιση"
 
 #: ../calendar/gui/caltypes.xml.h:7
 #: ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560
+#: ../calendar/gui/e-cal-model.c:499
 #: ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
@@ -2978,7 +2976,7 @@ msgstr "Διο�γανωτής"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558
+#: ../calendar/gui/e-cal-model.c:497
 #: ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
@@ -2986,8 +2984,8 @@ msgstr "Ιδιωτικό"
 
 #: ../calendar/gui/caltypes.xml.h:15
 #: ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549
-#: ../calendar/gui/e-cal-model.c:556
+#: ../calendar/gui/e-cal-model.c:488
+#: ../calendar/gui/e-cal-model.c:495
 #: ../calendar/gui/e-task-table.c:486
 #: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
@@ -3198,12 +3196,12 @@ msgid "Selected Calendars for Alarms"
 msgstr "Επιλεγμένα ημε�ολόγια ως ειδοποιήσεις"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "��α και ημε�ομηνία:"
+msgid "Ti_me and date:"
+msgstr "�_�α και ημε�ομηνία:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "Ημε�ομηνία μόνο:"
+msgid "_Date only:"
+msgstr "Ημε�ο_μηνία μόνο:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3312,178 +3310,190 @@ msgstr "Κανένα"
 msgid "Pick a color"
 msgstr "Επιλογή ενός χ�ώματος"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "_Κυ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 #: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Κ�λιση π�οβολής μήνα κατά μια _εβδομάδα"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "_Δε�τε�η ζώνη:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Επιλογή των ημε�ολογίων για σημείωση ειδοποίησης"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "Εμ_φάνιση υπενθ�μισης"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "Εμ_φάνιση υπενθ�μισης"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "Εμφάνιση _α�ιθμών εβδομάδων στον πε�ιηγητή ημε�ολογίου"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Εμφάνιση α_�ιθμών εβδομάδων στην π�οβολή ημέ�ας και ε�γάσιμης εβδομάδας"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Κυ�ιακή"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "Ε�_γασίες που λήγουν σήμε�α:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "_Πέμ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Λίστα Ε�γασιών"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "Π�ότυπο:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "��α"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
 msgstr "_Ζώνη ώ�ας:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "Μο�φή ώ�ας:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Τ�ίτη"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Χ�ήση _ζώνης ώ�ας συστήματος"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Τετά�τη"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "Ε_βδομάδα ξεκινάει:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Work Week"
 msgstr "Ε�γάσιμη Εβδομάδα"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "Ημέ�ες ε�γασίας:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ��ες (ΠΜ/ΜΜ)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 ώ�ες"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Ε�ώτηση επαλήθευσης για τα στοιχεία που διαγ�άφονται"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Συμπίεση σαββατοκ��ιακων στη μηνιαία π�οβολή"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "Η _μέ�α α�χίζει στις:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "_Πα�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Απόκ�υψη ολοκλη�ωμένων ε�γασιών μετά"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "_Δευ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "Ε�γασίες που έχουν λή_ξει:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "_Σάβ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "Ε_μφάνιση χ�όνων τέλους �αντεβο� στις π�οβολές εβδομάδας και μήνα"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "_Διαι�έσεις ώ�ας:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "Τ_�ίτη"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "_Τετ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "π�ιν κάθε επέτειο/γενέθλια"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "π�ιν από κάθε �αντεβο�"
 
@@ -3677,8 +3687,8 @@ msgstr "Κάντε κλικ εδώ για κλείσιμο του τ�έχοντ
 #: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:115
 #: ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387
-#: ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:399
+#: ../widgets/misc/e-web-view.c:1023
 msgid "Copy the selection"
 msgstr "Αντιγ�αφή της επιλογής"
 
@@ -3687,7 +3697,7 @@ msgstr "Αντιγ�αφή της επιλογής"
 #: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:108
 #: ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1017
 msgid "Cut the selection"
 msgstr "Αποκοπή της επιλογής"
 
@@ -3707,7 +3717,7 @@ msgstr "Κάντε κλικ εδώ για να δείτε τη διαθέσιμÎ
 #: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:122
 #: ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1029
 msgid "Paste the clipboard"
 msgstr "Επικόλληση του π�οχεί�ου"
 
@@ -4005,7 +4015,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Δεν είναι δυνατή η πλή�ης επεξε�γασία του γεγονότος επειδή δεν είστε ο ο�γανωτής"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2720
 msgid "This event has alarms"
 msgstr "Αυτό το γεγονός έχει ειδοποιήσεις"
 
@@ -4066,7 +4076,7 @@ msgstr "Χ�ειάζεται ένας διο�γανωτής."
 msgid "At least one attendee is required."
 msgstr "Απαιτείται τουλάχιστον ένας πα�ευ�ισκόμενος."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2593
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Αδυναμία ανοίγματος του ημε�ολογίου '%s'."
@@ -4077,40 +4087,40 @@ msgstr "Αδυναμία ανοίγματος του ημε�ολογίου '%s'
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2637
+#: ../calendar/gui/dialogs/memo-page.c:913
+#: ../calendar/gui/dialogs/task-page.c:1741
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Λήφθηκε εκ μέ�ους του %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2939
 #, 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:2947
+#: ../calendar/gui/dialogs/event-page.c:2945
 #, 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:2953
+#: ../calendar/gui/dialogs/event-page.c:2951
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d λεπτό π�ιν από �αντεβο�"
 msgstr[1] "%d λεπτά π�ιv από �αντεβο�"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2964
 msgid "Customize"
 msgstr "Π�οσα�μογή"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2966
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Κανένα"
@@ -4193,17 +4203,17 @@ msgstr "Δεν είναι δυνατή η επεξεÏ�γασία του memo εÏ
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Δεν είναι δυνατή η πλή�ης επεξε�γασία του memo επειδή δεν είστε ο ο�γανωτής"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:874
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Δεν ήταν δυνατό το άνοιγμα του memo '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042
+#: ../calendar/gui/dialogs/memo-page.c:1041
 #: ../em-format/em-format-quote.c:223
 #: ../em-format/em-format.c:960
-#: ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301
-#: ../mail/em-format-html.c:2343
+#: ../mail/em-format-html.c:2253
+#: ../mail/em-format-html.c:2313
+#: ../mail/em-format-html.c:2355
 #: ../mail/message-list.etspec.h:20
 #: ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
@@ -4371,27 +4381,27 @@ msgstr "ημέ�α"
 msgid "on the"
 msgstr "στο"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "εμφανίσεις"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2111
 msgid "Add exception"
 msgstr "Π�οσθήκη εξαί�εσης"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Could not get a selection to modify."
 msgstr "Αδυναμία λήψης επιλογής για τ�οποποίηση"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Modify exception"
 msgstr "Τ�οποποίηση εξαί�εσης"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2202
 msgid "Could not get a selection to delete."
 msgstr "Δεν ήταν δυνατή η λήψη επιλογής για διαγ�αφή."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2329
 msgid "Date/Time"
 msgstr "Ημε�ομηνία/��α"
 
@@ -4441,18 +4451,18 @@ msgstr "Ειδοποίηση μόνο νέων συμ_μετεχόντων"
 msgid "Completed date is wrong"
 msgstr "Η συμπλη�ωμένη ημε�ομηνία είναι λανθασμένη"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:484
 msgid "Web Page"
 msgstr "Ιστοσελίδα"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
 #: ../calendar/gui/e-itip-control.c:931
-#: ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220
 #: ../calendar/gui/e-task-table.c:213
 #: ../calendar/gui/e-task-table.c:228
 #: ../calendar/gui/e-task-table.c:583
@@ -4475,9 +4485,9 @@ msgstr "Υψηλή"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790
 #: ../calendar/gui/e-task-table.c:211
 #: ../calendar/gui/e-task-table.c:226
 #: ../calendar/gui/e-task-table.c:582
@@ -4498,7 +4508,7 @@ msgstr "Χαμηλή"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304
+#: ../calendar/gui/e-cal-model.c:1243
 #: ../calendar/gui/e-task-table.c:509
 #: ../calendar/gui/tasktypes.xml.h:17
 #: ../mail/message-list.c:1134
@@ -4509,8 +4519,8 @@ msgstr "Κανονική"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711
 #: ../calendar/gui/e-task-table.c:209
 #: ../calendar/gui/e-task-table.c:224
 #: ../calendar/gui/e-task-table.c:581
@@ -4531,7 +4541,7 @@ msgstr "Κα_τάσταση:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1756
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21
@@ -4574,11 +4584,11 @@ msgstr "Κάντε κλικ για αλλαγή / π�οβολή των λεπτ
 msgid "_Send Options"
 msgstr "Επιλογές απο_στολής"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "_Task"
 msgstr "Ε_�γασία"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "Λεπτομέ�ειες ε�γασίας"
 
@@ -4599,7 +4609,7 @@ msgstr "Διο�γα_νωτής:"
 msgid "Due date is wrong"
 msgstr "Η ημε�ομηνία λήξης είναι λανθασμένη"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1698
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Δεν ήταν δυνατό το άνοιγμα των ε�γασιών στο '%s'."
@@ -4770,12 +4780,12 @@ msgid "Free"
 msgstr "Διαθέσιμη"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:548
 #: ../calendar/gui/e-task-table.c:561
 msgid "Busy"
 msgstr "Απασχολημένη"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4786,54 +4796,42 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Κανένα"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087
-#: ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065
+#: ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "�αι"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087
-#: ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065
+#: ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Όχι"
 
-#: ../calendar/gui/e-cal-model.c:377
+#: ../calendar/gui/e-cal-model.c:325
 msgid "Default Client"
 msgstr "Π�οεπιλεγμένη εφα�μογή αλληλογ�αφίας"
 
-#: ../calendar/gui/e-cal-model.c:387
-#: ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Ρυθμίσεις κελ�φους"
-
-#: ../calendar/gui/e-cal-model.c:388
-#: ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Καθολικές �υθμίσεις εφα�μογής"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562
+#: ../calendar/gui/e-cal-model.c:501
 #: ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120
-#: ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225
 #: ../calendar/gui/print.c:972
 #: ../calendar/gui/print.c:989
 #: ../e-util/e-charset.c:52
@@ -4844,15 +4842,15 @@ msgstr "Καθολικές �υθμίσεις εφα�μογής"
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Επανάληψη"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Ανάθεση"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "Άνοιγμα %s"
@@ -4896,75 +4894,75 @@ msgstr "Ημε�ομηνία ένα�ξης"
 msgid "Type"
 msgstr "Τ�πος"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:404
 msgid "Cut selected events to the clipboard"
 msgstr "Αποκοπή επιλεγμένων γεγονότων στο π�όχει�ο"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:410
 msgid "Copy selected events to the clipboard"
 msgstr "Αντιγ�αφή επιλεγμένων γεγονότων στο π�όχει�ο"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:416
 msgid "Paste events from the clipboard"
 msgstr "Επικόλληση γεγονότων από το π�όχει�ο"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Delete selected events"
 msgstr "Διαγ�αφή επιλεγμένων γεγονότων"
 
-#: ../calendar/gui/e-calendar-view.c:429
+#: ../calendar/gui/e-calendar-view.c:441
 #: ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Διαγ�αφή επιλεγμένων αντικειμένων"
 
-#: ../calendar/gui/e-calendar-view.c:617
+#: ../calendar/gui/e-calendar-view.c:629
 #: ../calendar/gui/e-memo-table.c:842
 #: ../calendar/gui/e-task-table.c:1063
 msgid "Updating objects"
 msgstr "Αναβάθμιση αντικειμένων"
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1703
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182
-#: ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-meeting-store.c:212
 #: ../plugins/itip-formatter/itip-formatter.c:2326
 msgid "Accepted"
 msgstr "Αποδοχή"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1704
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184
-#: ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:214
 #: ../plugins/itip-formatter/itip-formatter.c:2332
 msgid "Declined"
 msgstr "Ά�νηση π�όσβασης"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1705
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186
-#: ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Tentative"
 msgstr "Δοκιμαστικά"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1706
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:195
+#: ../calendar/gui/e-meeting-store.c:218
 #: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Delegated"
 msgstr "Εξουσιοδοτήθηκε"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1707
 msgid "Needs action"
 msgstr "Απαιτεί ενέ�γεια"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835
+#: ../calendar/gui/e-calendar-view.c:1848
 #: ../calendar/gui/e-memo-table.c:527
 #: ../calendar/gui/e-task-table.c:738
 #, c-format
@@ -4973,7 +4971,7 @@ msgstr "Διο�γανωτής: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839
+#: ../calendar/gui/e-calendar-view.c:1852
 #: ../calendar/gui/e-memo-table.c:532
 #: ../calendar/gui/e-task-table.c:741
 #, c-format
@@ -4981,14 +4979,14 @@ msgid "Organizer: %s"
 msgstr "Διο�γανωτής: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855
+#: ../calendar/gui/e-calendar-view.c:1868
 #: ../calendar/gui/print.c:2600
 #, c-format
 msgid "Location: %s"
 msgstr "Τοποθεσία: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1899
 #, c-format
 msgid "Time: %s %s"
 msgstr "��α: %s %s"
@@ -5032,7 +5030,7 @@ msgstr "Εμφάνιση της δε�τε�ης ζώνης ώ�ας"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:864
-#: ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-day-view.c:1843
 #: ../calendar/gui/e-week-view-main-item.c:222
 #: ../calendar/gui/print.c:1735
 msgid "%A %d %B"
@@ -5045,10 +5043,10 @@ msgstr "%A %d %B"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../calendar/gui/e-day-view-top-item.c:868
-#: ../calendar/gui/e-day-view.c:1901
+#: ../calendar/gui/e-day-view.c:1860
 #: ../calendar/gui/e-week-view-main-item.c:231
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:907
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5058,29 +5056,29 @@ msgstr "%a %d %b"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-day-view-top-item.c:872
-#: ../calendar/gui/e-day-view.c:1917
+#: ../calendar/gui/e-day-view.c:1876
 #: ../calendar/gui/e-week-view-main-item.c:245
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:943
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115
-#: ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1074
+#: ../calendar/gui/e-week-view.c:742
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "πμ"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118
-#: ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1077
+#: ../calendar/gui/e-week-view.c:745
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "μμ"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2573
 #, c-format
 msgid "Week %d"
 msgstr "Εβδομάδα %d"
@@ -5521,68 +5519,68 @@ msgid "Resources"
 msgstr "Πό�οι"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95
-#: ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850
+#: ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823
 #: ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Άτομο"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97
-#: ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969
 #: ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Ομάδα"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99
-#: ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Πό�ος"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Αίθουσα"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Π�οεδ�είο"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853
+#: ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826
 #: ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Απα�αίτητος Συμμετέχων"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Π�οαι�ετικός Συμμετέχων"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Μη-Συμμετέχων"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180
-#: ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "Απαιτεί ενέ�γεια"
 
@@ -5591,15 +5589,15 @@ msgstr "Απαιτεί ενέ�γεια"
 msgid "Attendee                          "
 msgstr "Πα�ευ�ισκόμενος"
 
-#: ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-store.c:222
 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2305
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -5608,7 +5606,7 @@ msgstr "%A, %d %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2336
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5618,67 +5616,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Out of Office"
 msgstr "Εκτός Γ�αφείου"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "No Information"
 msgstr "Χω�ίς Πλη�οφο�ίες"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:565
 msgid "A_ttendees..."
 msgstr "Πα�ευ_�ισκόμενοι..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:586
 msgid "O_ptions"
 msgstr "Επι_λογές"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "Εμφάνιση _μόνο των ω�ών Ε�γασίας"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _zoomed out"
 msgstr "Εμφάνιση Σ_μίκ�υνσης"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "_Update free/busy"
 msgstr "Ανα_νέωση Διαθεσιμότητας"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:661
 msgid "_Autopick"
 msgstr "_Αυτόματη επιλογή"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:676
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:693
 msgid "_All people and resources"
 msgstr "Όλα _τα Άτομα και οι Πό�οι"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "All _people and one resource"
 msgstr "Όλα τα Άτομα και ένας _Πό�ος"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "_Required people"
 msgstr "_Απαιτο�μενα άτομα"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:719
 msgid "Required people and _one resource"
 msgstr "Απαιτο�μενα Άτομα και έ_νας Πό�ος"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "Χ�όνος Έ_να�ξης:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "_Χ�όνος Λήξης:"
 
@@ -5707,7 +5705,7 @@ msgid "Member"
 msgstr "Μέλος"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../modules/calendar/e-cal-shell-content.c:402
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5803,7 +5801,7 @@ msgstr "100%"
 #: ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../modules/calendar/e-cal-shell-content.c:362
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
@@ -5947,16 +5945,16 @@ msgid "Gnome Calendar"
 msgstr "Ημε�ολόγιο του Gnome"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:903
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
 #: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:919
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -5964,10 +5962,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:936
+#: ../modules/calendar/e-cal-shell-view-private.c:947
+#: ../modules/calendar/e-cal-shell-view-private.c:954
+#: ../modules/calendar/e-cal-shell-view-private.c:957
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -5997,7 +5995,7 @@ msgstr "π�οβολή ημε�ολογίου για ένα μήνα"
 msgid "calendar view for one or more weeks"
 msgstr "π�οβολή ημε�ολογίου για μια ή πε�ισσότε�ες εβδομάδες"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2111
 msgid "Purging"
 msgstr "Εκκαθά�ιση"
 
@@ -8577,6 +8575,7 @@ msgid "Email Settings"
 msgstr "Ρυθμίσεις αλληλογ�αφίας"
 
 #: ../capplet/settings/mail-capplet-shell.c:334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "Quit"
 msgstr "Έξοδος"
 
@@ -8776,40 +8775,40 @@ msgid "Visual"
 msgstr "Οπτική"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
 #: ../plugins/itip-formatter/itip-view.c:195
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Σήμε�α"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202
+#: ../e-util/e-datetime-format.c:205
 #: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "Α��ιο"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Χθες"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:210
 #, c-format
 msgid "%d days from now"
 msgstr "%d ημέ�ες από τώ�α"
 
-#: ../e-util/e-datetime-format.c:209
+#: ../e-util/e-datetime-format.c:212
 #, c-format
 msgid "%d days ago"
 msgstr "%d ημέ�ες π�ιν"
 
-#: ../e-util/e-datetime-format.c:283
-#: ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:286
+#: ../e-util/e-datetime-format.c:296
+#: ../e-util/e-datetime-format.c:305
 msgid "Use locale default"
 msgstr "Χ�ήση π�οεπιλογών locale"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:499
 msgid "Format:"
 msgstr "Μο�φή:"
 
@@ -8834,11 +8833,11 @@ msgstr "Γίνεται εγγ�αφή \"%s\" σε %s"
 msgid "Name of the logger"
 msgstr "Όνομα στοιχείου που καταγ�άφεται"
 
-#: ../e-util/e-module.c:188
+#: ../e-util/e-module.c:194
 msgid "Filename"
 msgstr "Όνομα α�χείου"
 
-#: ../e-util/e-module.c:189
+#: ../e-util/e-module.c:195
 msgid "The filename of the module"
 msgstr "Το όνομα α�χείου αυτο� του α�θ�ώματος"
 
@@ -8957,11 +8956,11 @@ msgstr "Το α�χείο υπά�χει \"{0}\"."
 msgid "_Overwrite"
 msgstr "Αντι_κατάσταση"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:171
 msgid "Could not open the link."
 msgstr "Δεν ήταν δυνατό το άνοιγμα του συνδέσμου."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:221
 msgid "Could not display help for Evolution."
 msgstr "Δεν ήταν δυνατή η εμφάνιση βοήθειας για το Evolution."
 
@@ -8982,18 +8981,18 @@ msgstr "Απ. Σε"
 
 #: ../em-format/em-format-quote.c:223
 #: ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242
-#: ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350
+#: ../mail/em-format-html.c:2254
+#: ../mail/em-format-html.c:2325
+#: ../mail/em-format-html.c:2362
 #: ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Αντίγ�αφο:"
 
 #: ../em-format/em-format-quote.c:223
 #: ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243
-#: ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357
+#: ../mail/em-format-html.c:2255
+#: ../mail/em-format-html.c:2336
+#: ../mail/em-format-html.c:2369
 #: ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "Ιδιαίτε�η Κοινοποίηση"
@@ -9011,7 +9010,7 @@ msgstr "Θέμα"
 
 #. pseudo-header
 #: ../em-format/em-format-quote.c:366
-#: ../mail/em-format-html.c:2455
+#: ../mail/em-format-html.c:2467
 #: ../modules/mail/em-mailer-prefs.c:1130
 msgid "Mailer"
 msgstr "Λογισμικό"
@@ -9024,8 +9023,8 @@ msgstr "-------- Π�οωθημένο Μήνυμα --------"
 #: ../em-format/em-format.c:964
 #: ../mail/message-list.etspec.h:2
 #: ../modules/mail/em-mailer-prefs.c:83
-#: ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Ημ/νία"
 
@@ -9089,120 +9088,120 @@ msgstr "Αδυναμία ανάλυσης μην�ματος PGP"
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Αδυναμία ανάλυσης μην�ματος PGP: Άγνωστο σφάλμα"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 δευτε�όλεπτο π�ιν"
 msgstr[1] "%d δευτε�όλεπτα π�ιν"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 δευτε�όλεπτο στο μέλλον"
 msgstr[1] "%d δευτε�όλεπτα στο μέλλον"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 λεπτό π�ιν"
 msgstr[1] "%d λεπτά π�ιν"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 λεπτό στο μέλλον1 λεπτό στο μέλλον"
 msgstr[1] "%d λεπτά στο μέλλον"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 ώ�α π�ιν"
 msgstr[1] "%d ώ�ες π�ιν"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 ώ�α στο μέλλον"
 msgstr[1] "%d ώ�ες στο μέλλον"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 ημέ�α π�ιν"
 msgstr[1] "%d ημέ�ες π�ιν"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 ημέ�α στο μέλλον"
 msgstr[1] "%d ημέ�ες στο μέλλον"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 εβδομάδα π�ιν"
 msgstr[1] "%d εβδομάδες π�ιν"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 εβδομάδα στο μέλλον"
 msgstr[1] "%d εβδομάδες στο μέλλον"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 μήνα π�ιν"
 msgstr[1] "%d μήνες π�ιν"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 μήνα στο μέλλον"
 msgstr[1] "%d μήνες στο μέλλον"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 χ�όνος π�ιν"
 msgstr[1] "%d χ�όνια π�ιν"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 έτος στο μέλλον"
 msgstr[1] "%d έτη στο μέλλον"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<κάντε κλικ εδώ για να επιλέξετε ημε�ομηνία>"
 
-#: ../filter/e-filter-datespec.c:119
-#: ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122
+#: ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "τώ�α"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Επιλέξτε μια ώ�α για να συγκ�ίνετε"
 
@@ -9413,7 +9412,7 @@ msgid "List View"
 msgstr "Π�οβολή λίστας"
 
 #: ../mail/e-mail-browser.c:732
-#: ../shell/e-shell-window.c:631
+#: ../shell/e-shell-window.c:653
 msgid "Focus Tracker"
 msgstr "Πα�ακολο�θηση εστίασης"
 
@@ -9986,7 +9985,7 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "Επαναδ�ομολόγηση (αναπήδηση) του επιλεγμένου μην�ματος σε κάποιον"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "Απάντηση σε ό_λους"
@@ -10164,12 +10163,12 @@ msgstr "Όλες οι κε_φαλίδες μηνυμάτων"
 msgid "Show messages with all email headers"
 msgstr "Εμφάνιση μηνυμάτων με όλες τις επικεφαλίδες ηλεκτ�ονικο� ταχυδ�ομείου"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1878
 msgid "Unable to retrieve message"
 msgstr "Αδ�νατη η ανάκτηση του μην�ματος"
 
-#: ../mail/e-mail-reader.c:1900
-#: ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:1882
+#: ../mail/e-mail-reader.c:1943
 #: ../mail/mail-ops.c:1849
 #, c-format
 msgid "Retrieving message '%s'"
@@ -10177,7 +10176,7 @@ msgstr "Πα�αλαμβάνεται το μήνυμα '%s'"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2457
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:534
 #: ../plugins/google-account-setup/google-source.c:656
@@ -10185,34 +10184,34 @@ msgstr "Πα�αλαμβάνεται το μήνυμα '%s'"
 msgid "Default"
 msgstr "Π�οεπιλογή"
 
-#: ../mail/e-mail-reader.c:2588
+#: ../mail/e-mail-reader.c:2578
 #: ../modules/mail/e-mail-attachment-handler.c:134
 msgid "_Forward"
 msgstr "_Π�οώθηση"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2579
 msgid "Forward the selected message to someone"
 msgstr "Π�οώθηση του επιλεγμένου μην�ματος σε κάποιον"
 
-#: ../mail/e-mail-reader.c:2633
+#: ../mail/e-mail-reader.c:2623
 #: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Διαγ�αφή"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Επόμενο"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Π�οηγο�μενο"
 
-#: ../mail/e-mail-reader.c:2645
+#: ../mail/e-mail-reader.c:2635
 #: ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "Απάντηση"
@@ -10835,7 +10834,7 @@ msgid "Unsubscribing from folder \"%s\""
 msgstr "Αποχώ�ηση απο το φάκελο \"%s\""
 
 #: ../mail/em-format-html-display.c:103
-#: ../mail/em-format-html.c:1535
+#: ../mail/em-format-html.c:1547
 msgid "Unsigned"
 msgstr "Μη υπογεγ�αμμένο"
 
@@ -10844,7 +10843,7 @@ msgid "This message is not signed. There is no guarantee that this message is au
 msgstr "Αυτό το μήνυμα είναι υπογεγ�αμμένο. Δεν υπά�χει εγγ�ηση ότι το μήνυμα είναι αυθεντικό."
 
 #: ../mail/em-format-html-display.c:104
-#: ../mail/em-format-html.c:1536
+#: ../mail/em-format-html.c:1548
 msgid "Valid signature"
 msgstr "Έγκυ�η υπογ�αφή"
 
@@ -10853,7 +10852,7 @@ msgid "This message is signed and is valid meaning that it is very likely that t
 msgstr "Αυτό το μήνυμα είναι υπογεγ�αμμένο και έγκυ�ο, ο αποστολέας του μην�ματος είναι και αυτός που ισχυ�ίζεται ότι είναι."
 
 #: ../mail/em-format-html-display.c:105
-#: ../mail/em-format-html.c:1537
+#: ../mail/em-format-html.c:1549
 msgid "Invalid signature"
 msgstr "Μη έγκυ�η υπογ�αφή"
 
@@ -10862,7 +10861,7 @@ msgid "The signature of this message cannot be verified, it may have been altere
 msgstr "Η υπογ�αφή του μην�ματος δε μπο�εί να επιβεβαιωθεί, μπο�εί να έχει αλλοιωθεί κατά τη μεταφο�ά."
 
 #: ../mail/em-format-html-display.c:106
-#: ../mail/em-format-html.c:1538
+#: ../mail/em-format-html.c:1550
 msgid "Valid signature, but cannot verify sender"
 msgstr "Έγκυ�η υπογ�αφή, αδυναμία επιβεβαίωσης αποστολέα"
 
@@ -10871,7 +10870,7 @@ msgid "This message is signed with a valid signature, but the sender of the mess
 msgstr "Αυτό το μήνυμα είναι υπογεγ�αμμένο με μια έγκυ�η υπογ�αφή, αλλά δεν είναι δυνατή η επιβεβαίωση του αποστολέα."
 
 #: ../mail/em-format-html-display.c:107
-#: ../mail/em-format-html.c:1539
+#: ../mail/em-format-html.c:1551
 msgid "Signature exists, but need public key"
 msgstr "Η υπογ�αφή υπά�χει, αλλά χ�ειάζεται δημόσιο κλειδί"
 
@@ -10880,7 +10879,7 @@ msgid "This message is signed with a signature, but there is no corresponding pu
 msgstr "Αυτό το μήνυμα είναι υπογεγ�αμμένο με μια έγκυ�η υπογ�αφή, αλλά δεν υπά�χει το αντίστοιχο δημόσιο κλειδί."
 
 #: ../mail/em-format-html-display.c:114
-#: ../mail/em-format-html.c:1545
+#: ../mail/em-format-html.c:1557
 msgid "Unencrypted"
 msgstr "Μη κ�υπτογ�αφημένο"
 
@@ -10889,7 +10888,7 @@ msgid "This message is not encrypted. Its content may be viewed in transit acros
 msgstr "Αυτό το μήνυμα δεν είναι κ�υπτογ�αφημένο. Το πε�ιεχόμενο του μπο�εί να αναγνωστεί κατά τη μεταφο�ά του στο διαδίκτυο."
 
 #: ../mail/em-format-html-display.c:115
-#: ../mail/em-format-html.c:1546
+#: ../mail/em-format-html.c:1558
 msgid "Encrypted, weak"
 msgstr "Αδ�ναμα κ�υπτογ�αφημένο"
 
@@ -10898,7 +10897,7 @@ msgid "This message is encrypted, but with a weak encryption algorithm. It would
 msgstr "Αυτό το μήνυμα είναι κ�υπτογ�αφημένο με ένα αδ�ναμο αλγό�ιθμο κ�υπτογ�άφησης. Θα είναι δ�σκολο αλλά όχι αδ�νατο σε ένα τ�ίτο να διαβάσει το πε�ιεχόμενο του μην�ματος μέσα σε ένα λογικό χ�όνο."
 
 #: ../mail/em-format-html-display.c:116
-#: ../mail/em-format-html.c:1547
+#: ../mail/em-format-html.c:1559
 msgid "Encrypted"
 msgstr "Κ�υπτογ�αφημένο"
 
@@ -10907,7 +10906,7 @@ msgid "This message is encrypted.  It would be difficult for an outsider to view
 msgstr "Αυτό το μήνυμα είναι κ�υπτογ�αφημένο. Θα είναι δ�σκολο σε ένα τ�ίτο να διαβάσει το πε�ιεχόμενο του μην�ματος."
 
 #: ../mail/em-format-html-display.c:117
-#: ../mail/em-format-html.c:1548
+#: ../mail/em-format-html.c:1560
 msgid "Encrypted, strong"
 msgstr "Ισχυ�ά κ�υπτογ�αφημένο"
 
@@ -10959,49 +10958,49 @@ msgstr "Ά_νοιγμα με"
 msgid "Page %d of %d"
 msgstr "Σελίδα %d από %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:166
 msgid "Formatting message"
 msgstr "Μο�φοποίηση μηνυμάτων"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:357
 msgid "Formatting Message..."
 msgstr "Μο�φοποίηση μην�ματος..."
 
-#: ../mail/em-format-html.c:1386
-#: ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1398
+#: ../mail/em-format-html.c:1407
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Πα�αλαμβάνεται '%s'"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1866
 msgid "Unknown external-body part."
 msgstr "Άγνωστο εξωτε�ικό μέ�ος μην�ματος."
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1874
 msgid "Malformed external-body part."
 msgstr "Κακοδιατυπωμένο εξωτε�ικό μέ�ος μην�ματος."
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1904
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Δείκτης σε σελίδα FTP (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1915
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Δείκτης σε τοπικό α�χείο (%s) έγκυ�ο στη σελίδα \"%s\""
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1917
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Δείκτης σε τοπικό α�χείο (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1938
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Δείκτης σε απομακ�υσμένα δεδομένα (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1949
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Δείκτης σε άγνωστα εξωτε�ικά δεδομένα (τ�πος \"%s\")"
@@ -11009,7 +11008,7 @@ msgstr "Δείκτης σε άγνωστα εξωτε�ικά δεδομένα (
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2640
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Αυτό το μήνυμα έχει αποσταλεί από τον <b>%s</b> εκ μέ�ους του <b>%s</b>"
@@ -11897,7 +11896,7 @@ msgid "Select folder to import into"
 msgstr "Επιλογή ενός φακέλου για εισαγωγή σε"
 
 #: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
@@ -12087,8 +12086,8 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "�α _υπογ�άφονται πάντα ψηφιακά τα μην�ματα (π�οεπιλογή)"
 
 #: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "Εμφανιζόμενες κε_φαλίδες μηνυμάτων"
+msgid "Displayed Message Headers"
+msgstr "Εμφανιζόμενες κεφαλίδες μηνυμάτων"
 
 #: ../mail/mail-config.ui.h:37
 msgid "Do not format messages when text si_ze exceeds"
@@ -12671,7 +12670,7 @@ msgstr "_Σημαία:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Επιλέ_ξτε αυτό για να αποδεχθείτε την άδεια χ�ήσης"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:898
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -13591,7 +13590,7 @@ msgid "Select all visible messages"
 msgstr "Επιλογή όλων των μηνυμάτων που εμφανίζονται"
 
 #: ../mail/message-list.c:2588
-#: ../shell/e-shell-view.c:723
+#: ../shell/e-shell-view.c:827
 msgid "Shell Backend"
 msgstr "Backend κελ�φους"
 
@@ -13797,9 +13796,11 @@ msgstr "Αν θα εμφανίζεται υποχÏ�εωτικά η ηλεκτÏ�Î
 msgid "Whether to show the preview pane."
 msgstr "Αν θα εμφανίζεται το ταμπλό της π�οεπισκόπησης."
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Στήλη πίνακα:"
+#: ../modules/mail/em-mailer-prefs.c:1151
+msgid "_Table column:"
+msgstr "Στήλη _πίνακα:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -13995,7 +13996,7 @@ msgid "Show properties of the selected address book"
 msgstr "Π�οβολή των ιδιοτήτων του επιλεγμένου βιβλίου διευθ�νσεων"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
 #: ../modules/calendar/e-task-shell-view-actions.c:734
 #: ../modules/mail/e-mail-shell-view-actions.c:946
@@ -14079,7 +14080,7 @@ msgid "Send a message to the selected contacts"
 msgstr "Στείλτε ένα μήνυμα στις επιλεγμένες επαφές"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
 #: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "_Actions"
 msgstr "Ε_νέ�γειες"
@@ -14092,7 +14093,7 @@ msgid "_Preview"
 msgstr "_Π�οεπισκόπηση"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
 #: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Delete"
@@ -14137,25 +14138,25 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Εμφάνιση πα�αθ��ου π�οεπισκόπησης επαφής δίπλα από τη λίστα επαφών"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
 #: ../modules/calendar/e-task-shell-view-actions.c:905
 msgid "Any Category"
 msgstr "Οποιαδήποτε κατηγο�ία"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
 #: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Unmatched"
 msgstr "Αταί�ιαστο"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
 #: ../modules/calendar/e-task-shell-view-actions.c:950
 #: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../shell/e-shell-content.c:438
 msgid "Advanced Search"
 msgstr "Π�οχω�ημένη αναζήτηση"
 
@@ -14368,7 +14369,7 @@ msgid "_Appointment"
 msgstr "Ρ_αντεβο�"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "Δημιου�γία νέου �αντεβο�"
 
@@ -14396,7 +14397,7 @@ msgid "Cale_ndar"
 msgstr "Ημε�ο_λόγιο"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "Δημιου�γία νέου ημε�ολογίου"
 
@@ -14514,115 +14515,115 @@ msgstr "γεγονός"
 msgid "Save as iCalendar"
 msgstr "Αποθήκευση ως iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "Αντι_γ�αφή..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "D_elete Calendar"
 msgstr "Δια_γ�αφή ημε�ολογίου"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Delete the selected calendar"
 msgstr "Διαγ�αφή του επιλεγμένου ημε�ολογίου"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Go Back"
 msgstr "Μετάβαση πίσω"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Go Forward"
 msgstr "Μετάβαση μπ�οστά"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
 msgid "Select _Today"
 msgstr "Επιλογή _Σημε�ινής Μέ�ας"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "Επιλογή σημε�ινής μέ�ας"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "Επιλογή Η_με�ομηνίας"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "Επιλογή μιας συγκεκ�ιμένης ημε�ομηνίας"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "_�έο Ημε�ολόγιο"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 #: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Purg_e"
 msgstr "Εκκα_θά�ιση"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Purge old appointments and meetings"
 msgstr "Εκκαθά�ιση παλαιών �αντεβο� και συναντήσεων"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
 #: ../modules/calendar/e-task-shell-view-actions.c:727
 msgid "Re_fresh"
 msgstr "Ανα_νέωση"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Refresh the selected calendar"
 msgstr "Ανανέωση του επιλεγμένου ημε�ολογίου"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Rename the selected calendar"
 msgstr "Μετονομασία του επιλεγμένου ημε�ολογίου"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Show _Only This Calendar"
 msgstr "Ε_μφάνιση μόνο αυτο� του ημε�ολογίου"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Cop_y to Calendar..."
 msgstr "Α_ντιγ�αφή στο Ημε�ολόγιο..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "Ανάθεση _συνάντησης..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delete Appointment"
 msgstr "_Διαγ�αφή του �αντεβο�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete selected appointments"
 msgstr "Διαγ�αφή επιλεγμένων �αντεβο�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete This _Occurrence"
 msgstr "Διαγ�αφή αυτής της _εμφάνισης"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "Διαγ�αφή αυτής της εμφάνισης"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete All Occ_urrences"
 msgstr "Διαγ�αφή ό_λων των εμφανίσεων"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "Διαγ�αφή όλων των εμφανίσεων"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "New All Day _Event..."
 msgstr "�έο ολοήμε�ο _γεγονός..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Create a new all day event"
 msgstr "Δημιου�γία νέου ολοήμε�ου γεγονότος"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
@@ -14630,124 +14631,124 @@ msgstr "Δημιου�γία νέου ολοήμε�ου γεγονότος"
 msgid "_Forward as iCalendar..."
 msgstr "Π�οώ_θηση ως iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "New _Meeting..."
 msgstr "�έα _συνάντηση..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Create a new meeting"
 msgstr "Δημιου�γία νέας συνάντησης"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "Με_τακίνηση στο Ημε�ολόγιο..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "�έο Ρ_αντεβο�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "�α γίνει μετακινο�μενη αυτή η επανά_ληψη"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "Άν_οιγμα �αντεβο�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "Π�οβολή του τ�έχοντος �αντεβο�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "Α_πάντηση"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Αποθήκευση ως iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "Π�ογ�αμματισμός _Συνάντησης..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Μετατ�έπει ένα �αντεβο� σε συνάντηση"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "Μετα_τ�οπή σε �αντεβο�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Μετατ�έπει μια συνάντηση σε ένα �αντεβο�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "Ημέ�α"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "Εμφάνιση μίας ημέ�ας"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "Λίστα"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "Εμφάνιση ως λίστα"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "Μήνας"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "Εμφάνιση ένας μήνα"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "Εβδομάδα"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "Εμφάνιση μίας εβδομάδας"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Show one work week"
 msgstr "Εμφάνιση μίας ε�γάσιμης εβδομάδας"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "Ενε�γά �αντεβο�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "Ραντεβο� των επόμενων 7 ημε�ών"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
 #: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Description contains"
 msgstr "Η πε�ιγ�αφή πε�ιέχει"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
 #: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Summary contains"
 msgstr "Η πε�ίληψη πε�ιέχει"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "Εκτ�πωση αυτο� του ημε�ολογίου"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 msgid "Preview the calendar to be printed"
 msgstr "Π�οεπισκόπηση του ημε�ολογίου π�ος εκτ�πωση"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "Μετάβαση Σε"
 
@@ -15674,11 +15675,6 @@ msgstr "Η π�όσθετη λειτου�γία %s δεν είναι διαθέ
 msgid "No junk plugin available"
 msgstr "Δεν υπά�χει διαθέσιμη π�όσθετη λειτου�γία ανεπιθυμήτων"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "Στήλη _πίνακα:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
 #: ../modules/mail/em-mailer-prefs.c:1153
 msgid "_Date header:"
@@ -15973,8 +15969,8 @@ msgstr "Επαφές άμεσων μηνυμάτων"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "Συγχ�ονισμός πλη�οφο�ιών επαφών και εικόνων από την λίστα φίλων του Pidgin"
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "_Συγχ�ονισμός πλη�οφο�ιών επαφών και εικόνων από την λίστα φίλων του Pidgin"
 
 #: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
@@ -19060,12 +19056,12 @@ msgstr "Στυλ κουμπιών πα�αθ��ου"
 msgid "Window buttons are visible"
 msgstr "Τα κουμπιά πα�αθ��ου είναι ο�ατά"
 
-#: ../shell/e-shell-content.c:577
-#: ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:499
+#: ../shell/e-shell-content.c:500
 msgid "Searches"
 msgstr "Αναζητήσεις"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:541
 msgid "Save Search"
 msgstr "Αποθήκευση αναζήτησης"
 
@@ -19079,124 +19075,124 @@ msgstr "%ld KB"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "Εμ_φάνιση:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "_Αναζήτηση:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr "_σε"
 
-#: ../shell/e-shell-switcher.c:448
+#: ../shell/e-shell-switcher.c:463
 msgid "Toolbar Style"
 msgstr "Στυλ ε�γαλειοθήκης"
 
-#: ../shell/e-shell-switcher.c:449
+#: ../shell/e-shell-switcher.c:464
 msgid "The switcher's toolbar style"
 msgstr "Το στυλ της ε�γαλειοθήκης των κουμπιών εναλλαγής"
 
-#: ../shell/e-shell-switcher.c:465
-#: ../shell/e-shell-window.c:740
+#: ../shell/e-shell-switcher.c:480
+#: ../shell/e-shell-window.c:762
 msgid "Toolbar Visible"
 msgstr "Ο�ατή ε�γαλειοθήκη"
 
-#: ../shell/e-shell-switcher.c:466
+#: ../shell/e-shell-switcher.c:481
 msgid "Whether the switcher is visible"
 msgstr "Αν θα είναι ο�ατά τα κουμπιά εναλλαγής"
 
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Όλα τα α�χεία (*)"
 
-#: ../shell/e-shell-view.c:675
+#: ../shell/e-shell-view.c:779
 msgid "Switcher Action"
 msgstr "Ενέ�γεια κουμπιών εναλλαγής"
 
-#: ../shell/e-shell-view.c:676
+#: ../shell/e-shell-view.c:780
 msgid "The switcher action for this shell view"
 msgstr "Η ενέ�γεια των κουμπιών εναλλαγής για αυτή τη π�οβολή κελ�φους"
 
-#: ../shell/e-shell-view.c:691
+#: ../shell/e-shell-view.c:795
 msgid "Page Number"
 msgstr "Α�ιθμός σελίδας"
 
-#: ../shell/e-shell-view.c:692
+#: ../shell/e-shell-view.c:796
 msgid "The notebook page number of the shell view"
 msgstr "Ο α�ιθμός σελίδας του notebook της π�οβολής κελ�φους"
 
-#: ../shell/e-shell-view.c:708
+#: ../shell/e-shell-view.c:812
 msgid "Search Rule"
 msgstr "Κανόνας αναζήτησης"
 
-#: ../shell/e-shell-view.c:709
+#: ../shell/e-shell-view.c:813
 msgid "Criteria for the current search results"
 msgstr "Κ�ιτή�ια για τα τ�έχοντα αποτελέσματα αναζήτησης"
 
-#: ../shell/e-shell-view.c:724
+#: ../shell/e-shell-view.c:828
 msgid "The EShellBackend for this shell view"
 msgstr "Το EShellBackend για αυτήν τη π�οβολή του κελ�φους"
 
-#: ../shell/e-shell-view.c:739
+#: ../shell/e-shell-view.c:843
 msgid "Shell Content Widget"
 msgstr "Γ�αφικό συστατικό πε�ιεχομένου του κελ�φους"
 
-#: ../shell/e-shell-view.c:740
+#: ../shell/e-shell-view.c:844
 msgid "The content widget appears in a shell window's right pane"
 msgstr "Το γ�αφικό συστατικό πε�ιεχομένου εμφανίζεται στο δεξιό ταμπλό του πα�αθ��ου του κελ�φους"
 
-#: ../shell/e-shell-view.c:756
+#: ../shell/e-shell-view.c:860
 msgid "Shell Sidebar Widget"
 msgstr "Γ�αφικό συστατικό πλευ�ικής στήλης καλ�φους"
 
-#: ../shell/e-shell-view.c:757
+#: ../shell/e-shell-view.c:861
 msgid "The sidebar widget appears in a shell window's left pane"
 msgstr "Το γ�αφικό συστατικό της πλευ�ικής ε�γαλειοθήκης εμφανίζεται στο α�ιστε�ό ταμπλό του πα�αθ��ου του κελ�φους"
 
-#: ../shell/e-shell-view.c:772
+#: ../shell/e-shell-view.c:876
 msgid "Shell Taskbar Widget"
 msgstr "Γ�αφικό συστατικό ε�γαλειοθήκης του κελ�φους"
 
-#: ../shell/e-shell-view.c:773
+#: ../shell/e-shell-view.c:877
 msgid "The taskbar widget appears at the bottom of a shell window"
 msgstr "Το γ�αφικό συστατικό της ε�γαλειοθήκης εμφανίζεται στο κάτω μέ�ος του πα�αθ��ου του κελ�φους"
 
-#: ../shell/e-shell-view.c:788
+#: ../shell/e-shell-view.c:892
 msgid "Shell Window"
 msgstr "Πα�άθυ�ο κελ�φους"
 
-#: ../shell/e-shell-view.c:789
+#: ../shell/e-shell-view.c:893
 msgid "The window to which the shell view belongs"
 msgstr "Το πα�άθυ�ο στο οποίο ανήκει η π�οβολή κελ�φους"
 
-#: ../shell/e-shell-view.c:805
+#: ../shell/e-shell-view.c:909
 msgid "The key file holding widget state data"
 msgstr "Το α�χείο κλειδί που πε�ιέχει τα δεδομένα κατάστασης των widget"
 
-#: ../shell/e-shell-view.c:820
+#: ../shell/e-shell-view.c:924
 msgid "The title of the shell view"
 msgstr "Ο τίτλος της π�οβολής κελ�φους"
 
-#: ../shell/e-shell-view.c:834
+#: ../shell/e-shell-view.c:938
 msgid "Current View ID"
 msgstr "Τ�έχον ID π�οβολής"
 
-#: ../shell/e-shell-view.c:835
+#: ../shell/e-shell-view.c:939
 msgid "The current GAL view ID"
 msgstr "Η τ�έχουσα GAL view ID"
 
@@ -19507,118 +19503,126 @@ msgid "Execute these search parameters"
 msgstr "Εκτέλεση αυτών των πα�αμέτ�ων αναζήτησης"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:568
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "�έο"
 
-#: ../shell/e-shell-window.c:616
+#: ../shell/e-shell-window.c:638
 msgid "Active Shell View"
 msgstr "Ενε�γή π�οβολή κελ�φους"
 
-#: ../shell/e-shell-window.c:617
+#: ../shell/e-shell-window.c:639
 msgid "Name of the active shell view"
 msgstr "Όνομα της ενε�γής π�οβολής κελ�φους"
 
-#: ../shell/e-shell-window.c:632
+#: ../shell/e-shell-window.c:654
 msgid "The shell window's EFocusTracker"
 msgstr "Το EFocusTracker του πα�αθ��ου του κελ�φους"
 
-#: ../shell/e-shell-window.c:646
-#: ../shell/e-shell.c:803
+#: ../shell/e-shell-window.c:668
+#: ../shell/e-shell.c:802
 msgid "Geometry"
 msgstr "Γεωμετ�ία"
 
-#: ../shell/e-shell-window.c:647
-#: ../shell/e-shell.c:804
+#: ../shell/e-shell-window.c:669
+#: ../shell/e-shell.c:803
 msgid "Initial window geometry string"
 msgstr "Α�χική συμβολοσει�ά γεωμετ�ίας πα�αθ��ου"
 
-#: ../shell/e-shell-window.c:662
+#: ../shell/e-shell-window.c:684
 msgid "Safe Mode"
 msgstr "Ασφαλής λειτου�γία"
 
-#: ../shell/e-shell-window.c:663
+#: ../shell/e-shell-window.c:685
 msgid "Whether the shell window is in safe mode"
 msgstr "Εάν το πα�άθυ�ο του κελ�φους θα είναι σε ασφαλή λειτου�γία"
 
-#: ../shell/e-shell-window.c:694
+#: ../shell/e-shell-window.c:716
 msgid "Sidebar Visible"
 msgstr "Ο�ατή πλευ�ική στήλη"
 
-#: ../shell/e-shell-window.c:695
+#: ../shell/e-shell-window.c:717
 msgid "Whether the shell window's side bar is visible"
 msgstr "Αν θα είναι ο�ατή η πλευ�ική στήλη του πα�αθ��ου του κελ�φους"
 
-#: ../shell/e-shell-window.c:709
+#: ../shell/e-shell-window.c:731
 msgid "Switcher Visible"
 msgstr "Ο�ατά κουμπιά εναλλαγής"
 
-#: ../shell/e-shell-window.c:710
+#: ../shell/e-shell-window.c:732
 msgid "Whether the shell window's switcher buttons are visible"
 msgstr "Αν θα είναι ο�ατά τα κουμπιά εναλλαγής του πα�αθ��ου του κελ�φους"
 
-#: ../shell/e-shell-window.c:725
+#: ../shell/e-shell-window.c:747
 msgid "Taskbar Visible"
 msgstr "Ο�ατή ε�γαλειοθήκη"
 
-#: ../shell/e-shell-window.c:726
+#: ../shell/e-shell-window.c:748
 msgid "Whether the shell window's task bar is visible"
 msgstr "Αν θα είναι ο�ατή η γ�αμμή κατάστασης του πα�αθ��ου του κελ�φους"
 
-#: ../shell/e-shell-window.c:741
+#: ../shell/e-shell-window.c:763
 msgid "Whether the shell window's tool bar is visible"
 msgstr "Αν θα είναι ο�ατή η ε�γαλειοθήκη του πα�αθ��ου του κελ�φους"
 
-#: ../shell/e-shell-window.c:755
+#: ../shell/e-shell-window.c:777
 msgid "UI Manager"
 msgstr "Διαχεί�ιση UI"
 
-#: ../shell/e-shell-window.c:756
+#: ../shell/e-shell-window.c:778
 msgid "The shell window's GtkUIManager"
 msgstr "Το GtkUIManager του πα�αθ��ου του κελ�φους"
 
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "Π�οετοιμασία για ε�γασία χω�ίς σ�νδεση..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "Π�οετοιμασία για ε�γασία με σ�νδεση..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "Π�οετοιμασία για τε�ματισμό..."
 
-#: ../shell/e-shell.c:819
+#: ../shell/e-shell.c:818
 msgid "Module Directory"
 msgstr "Καταλόγος α�θ�ώματος"
 
-#: ../shell/e-shell.c:820
+#: ../shell/e-shell.c:819
 msgid "The directory from which to load EModules"
 msgstr "Ο κατάλογος φό�τωσης των EModules"
 
-#: ../shell/e-shell.c:835
+#: ../shell/e-shell.c:834
 msgid "Network Available"
 msgstr "Διαθέσιμο δίκτυο"
 
-#: ../shell/e-shell.c:836
+#: ../shell/e-shell.c:835
 msgid "Whether the network is available"
 msgstr "Αν είναι διαθέσιμο το δίκτυο"
 
-#: ../shell/e-shell.c:851
+#: ../shell/e-shell.c:850
 #: ../widgets/misc/e-online-button.c:134
 msgid "Online"
 msgstr "Σε σ�νδεση"
 
-#: ../shell/e-shell.c:852
+#: ../shell/e-shell.c:851
 msgid "Whether the shell is online"
 msgstr "Εάν το κέλυφος είναι ακόμα σε σ�νδεση"
 
+#: ../shell/e-shell.c:866
+msgid "Shell Settings"
+msgstr "Ρυθμίσεις κελ�φους"
+
+#: ../shell/e-shell.c:867
+msgid "Application-wide settings"
+msgstr "Καθολικές �υθμίσεις εφα�μογής"
+
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:168
 #, no-c-format
@@ -20567,11 +20571,11 @@ msgstr "Τ�πος MIME:"
 msgid "_Suggest automatic display of attachment"
 msgstr "_Π�όταση για αυτόματη π�οβολή του συνημμένου"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "Αδυναμία ο�ισμο� ως πα�ασκήνιο"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "Ο�ισμός ως _πα�ασκήνιο"
 
@@ -20716,7 +20720,7 @@ msgid "Ctrl-click to open a link"
 msgstr "Κλικ για άνοιγμα δεσμο�"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20800,49 +20804,49 @@ msgstr "Εισάγετε την κωδικοποίηση π�ος χ�ήση"
 msgid "Other..."
 msgstr "Άλλο..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Ημε�ομηνία και ώ�α"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Εγγ�αφή κειμένου για εισαγωγή ημε�ομηνίας"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Πατήστε αυτό το κουμπί για την π�οβολή ημε�ολογίου"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Κουτί επιλογής ώ�ας"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "_Τώ�α"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_Σήμε�α"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "Κα_νένα"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703
-#: ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682
+#: ../widgets/misc/e-dateedit.c:1918
 msgctxt "date"
 msgid "None"
 msgstr "Κανένα"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1813
 msgid "Invalid Date Value"
 msgstr "Μη έγκυ�η τιμή ημε�ομηνίας"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1857
 msgid "Invalid Time Value"
 msgstr "Μη έγκυ�η τιμή ώ�ας"
 
@@ -21230,43 +21234,43 @@ msgstr "Το α�χείο δέσμης ενε�γειών π�έπει να εί
 msgid "Click here to go to URL"
 msgstr "Κάντε κλικ εδώ για μετάβαση σε URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:360
 msgid "_Copy Link Location"
 msgstr "Αντι_γ�αφή τοποθεσίας δεσμο�"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:362
 msgid "Copy the link to the clipboard"
 msgstr "Αντιγ�αφή του δεσμο� στο π�όχει�ο"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:370
 msgid "_Open Link in Browser"
 msgstr "Άν_οιγμα δεσμο� στο φυλλομετ�ητή"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:372
 msgid "Open the link in a web browser"
 msgstr "Άνοιγμα δεσμο� στο πε�ιηγητή"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:380
 msgid "_Copy Email Address"
 msgstr "Αντιγ�αφή διε�_θυνσης Email"
 
-#: ../widgets/misc/e-web-view.c:397
-#: ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:409
+#: ../widgets/misc/e-web-view.c:1035
 msgid "Select all text and images"
 msgstr "Επιλογή όλου του κειμένου και των εικόνων"
 
-#: ../widgets/misc/e-web-view.c:752
-#: ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:800
+#: ../widgets/misc/e-web-view.c:802
+#: ../widgets/misc/e-web-view.c:804
 #, c-format
 msgid "Click to call %s"
 msgstr "Κλικ εδώ για κλήση σε %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:806
 msgid "Click to hide/unhide addresses"
 msgstr "Κλικ για την εμφάνιση/απόκ�υψη διευθ�νσεων"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:808
 #, c-format
 msgid "Click to open %s"
 msgstr "Κλικ για άνοιγμα %s"
@@ -21885,6 +21889,8 @@ msgstr "Πε�ιεχόμενο IM"
 msgid "Handle Popup"
 msgstr "Χει�ισμός αναδυόμενου"
 
+#~ msgid "Table column:"
+#~ msgstr "Στήλη πίνακα:"
 #~ msgid "Error loading address book."
 #~ msgstr "Σφάλμα κατά τη φό�τωση του βιβλίου διευθ�νσεων."
 #~ msgid "Server Version"
diff --git a/po/en@shaw.po b/po/en@shaw.po
index 658cf3dff1..1c00d899f5 100644
--- a/po/en@shaw.po
+++ b/po/en@shaw.po
@@ -1,17 +1,21 @@
 # Shavian translation for evolution.
-# Copyright (C) 2009 The Gnome Foundation.
+# Copyright (C) 2009-2010 The Gnome Foundation.
 # Thomas Thurman <tthurman@gnome.org>, 2009.
+# Transliterate Evolution as ·��������
+# Transliterate GNOME as ·���
+#: ../shell/main.c:463
 msgid ""
 msgstr ""
-"Project-Id-Version: metacity\n"
-"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2009-11-06 19:17+0200\n"
+"Project-Id-Version: evolution\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n"
+"POT-Creation-Date: 2010-05-12 23:13+0000\n"
+"PO-Revision-Date: 2010-05-14 20:07 -0400\n"
 "Last-Translator: Thomas Thurman <tthurman@gnome.org>\n"
-"Language-Team: Shavian <ubuntu-l10n-en-shaw@lists.launchpad.net>\n"
+"Language-Team: Shavian <ubuntu-l10n-en-shaw@launchpad.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n!=1\n"
+"Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -19,8 +23,8 @@ msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
 msgstr ""
-"'{0}' �� � ���-���� ����� ��� � ����� �� �������. ���� ������ � ������� "
-"����� ��� ���� � ��� �� �� � �������� ��."
+"'{0}' �� � ���-���� ����� ��� � ����� �� �������. ���� ������ � ������� ����� "
+"��� ���� � ��� �� �� � �������� ��."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -55,59 +59,81 @@ msgstr ""
 "��� � ��� ��� �� ������ �� ����� ������� � ��� � � ���� � ������� ����� "
 "�����. ������� ��� ���� ������� � ��� ��������; �� ���� ��� ��� �� ��."
 
+#: ../addressbook/addressbook.error.xml.h:9
+msgid "Could not get schema information for LDAP server."
+msgstr "��� ��� ��� ����� ��������� �� LDAP ����."
+
 #: ../addressbook/addressbook.error.xml.h:10
 msgid "Could not remove address book."
 msgstr "��� ��� ����� ����� ���."
 
+#: ../addressbook/addressbook.error.xml.h:11
+msgid ""
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
+"�������� � ��� ���� ����� � GroupWise ������ ����� ��� ���� ·��������. ���� "
+"�� ��� ��� GroupWise ��� ������ ���� � ��� �� GroupWise �������� �������� � "
+"Groupwise ������� �������� ������."
+
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "����� ����� ��� '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading address book."
-msgstr "�� ����� ����� ���."
-
-#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "�� ����� {0} � {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Failed to authenticate with LDAP server."
 msgstr "���� � ��������� ��� LDAP ����."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1268
 msgid "Failed to delete contact"
 msgstr "���� � ����� �������"
 
-#: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:54
-msgid "Server Version"
-msgstr "���� �����"
+#: ../addressbook/addressbook.error.xml.h:16
+msgid "GroupWise Address book creation:"
+msgstr "GroupWise ����� ��� �������:"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:17
+msgid "LDAP server did not respond with valid schema information."
+msgstr "LDAP ���� ��� ��� ������� ��� ����� ����� ���������."
+
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr "��� ����� �� ��� ��� ������� ��� �� ������ ����"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "� ·�������� ����� ��� ��� ���� �������������."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:20
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "� ���� � ��� �������� �� ���. �� � ���� � ����� � ��� ��?"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:21
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"��� LDAP ���� �� �� �� ���� ����� � LDAP, ��� ��� ��� ����� ��� ������������ "
+"� �� �� �� �����������. ��� �� ������������ �� ������� ��� �����."
+
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book could not be opened."
 msgstr "��� ����� ��� ��� ��� �� �����."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book server does not have any suggested search bases."
 msgstr "��� ����� ��� ���� ��� ��� ��� ��� �������� ��� �����."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:24
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -115,27 +141,31 @@ msgstr ""
 "��� ����� ��� ���� ��� �� ��������� � � ���� ��� �� �� �������� � �� ������ "
 "�������� ��� �� ���."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "��� ����� ��� ��� �� ������ ����������."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:26
+msgid "This server does not support LDAPv3 schema information."
+msgstr "��� ���� ��� ��� ����� LDAPv3 ����� ���������."
+
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open address book"
 msgstr "������ � ���� ����� ���"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "������ � ����� ���."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "������ � ��� {0}."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "��� � ��� � ��� �� ������?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:31
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -143,534 +173,541 @@ msgstr ""
 "� � �������� � ��� � ������� ���� ��� ����� ��� � ����� ��� �� ����� �� "
 "������ ���� � ���. �� � ���� � ��� � ���� ������?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:32
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to a "
+"supported version"
+msgstr ""
+"� � �������� � �� ��������� GroupWise ���� � �� ������� �������� ���� "
+"·��������. �� ���� ������� � ���� ��� �� �������� � � ������� �����"
+
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "� �� ��� ��� ������� � ����� �������� �� ��� ����� ���."
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "� ��� ��� ������������ � ��� �������. �� � ���� � ��� ��� ������?"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "�� �������� �� {0} ��� ��� �� �������� ����� ·�������� �� ��������."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:517
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
+#: ../plugins/groupwise-features/junk-settings.ui.h:4
+#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_��"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "_Discard"
 msgstr "_�������"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Do not save"
 msgstr "_�� ��� ���"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Resize"
 msgstr "_�����"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Use as it is"
 msgstr "_�� �� �� ��"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:137
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:46
-msgid "{1}"
-msgstr "{1}"
-
-#: ../addressbook/conduit/address-conduit.c:595
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "������ ���� �����:"
 
-#: ../addressbook/conduit/address-conduit.c:1618
-#: ../addressbook/conduit/address-conduit.c:1619
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
 msgstr "��� ��� ��� ����� ���"
 
-#: ../addressbook/conduit/address-conduit.c:1696
-#: ../addressbook/conduit/address-conduit.c:1699
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
 msgstr "��� ��� ��� �����'� ����� ��������� ����"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>����</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>���</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>������� �������</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>���</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>����������</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "<b>Notes</b>"
-msgstr "<b>����</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Other</b>"
-msgstr "<b>���</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Telephone</b>"
-msgstr "<b>�������</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../calendar/gui/e-calendar-view.c:2005
+msgid "Anniversary"
+msgstr "��������"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Web Addresses</b>"
-msgstr "<b>��� �������</b>"
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../calendar/gui/e-calendar-view.c:2004 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:107
+msgid "Birthday"
+msgstr "�����"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "<b>Work</b>"
-msgstr "<b>���</b>"
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "����:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "��_������..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:312
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1264
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+msgid "Calendar:"
+msgstr "�������:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
 msgid "Contact"
 msgstr "�������"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2570
 msgid "Contact Editor"
 msgstr "������� �����"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+msgid "Email"
+msgstr "����"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+msgid "Free/Busy:"
+msgstr "���/����:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "��� _���..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:70
+msgid "Home"
+msgstr "���"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+msgid "Home Page:"
+msgstr "��� ���:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "����"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+msgid "Instant Messaging"
+msgstr "������� �������"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+msgid "Job"
+msgstr "���"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "����� �����"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+msgid "Miscellaneous"
+msgstr "����������"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "��_����:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:452
-#: ../plugins/groupwise-features/camel-gw-listener.c:565
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "����"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:71
+#: ../addressbook/gui/widgets/eab-contact-display.c:460
+#: ../calendar/gui/e-calendar-view.c:1711
+msgid "Other"
+msgstr "���"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "������� ���������"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "�������"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+msgid "Video Chat:"
+msgstr "����� ���:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+msgid "Web Addresses"
+msgstr "��� �������"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
+msgid "Work"
+msgstr "���"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "_�����:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "_��������:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "_��������:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "_�����:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../calendar/gui/dialogs/event-page.c:824
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1909
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+msgid "_Blog:"
+msgstr "_����:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_�������:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "_����:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "_�������:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "_������:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "_���������:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "_��� ����:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "_���/����:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "_��� ���:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "_������:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "_����:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "_� � ����:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "_��������:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "_����:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "_����/�������:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fullname.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_�����:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "_����� ���:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "_����� � ����� HTML ���"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "_Web Log:"
-msgstr "_��� ���:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_��:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "_���/������ ���:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../e-util/e-logger.c:171 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:344
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:61
-msgid "Name"
-msgstr "���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:340
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1284
-#: ../addressbook/gui/widgets/e-addressbook-model.c:523
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:428
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
-#: ../widgets/text/e-text.c:3675
-msgid "Editable"
-msgstr "��������"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "·��"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "·����"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "·����"
 
-#. red
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:76
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../modules/mail/e-mail-shell-migrate.c:957
-msgid "Work"
-msgstr "���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:77
-msgid "Home"
-msgstr "���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:445
-#: ../calendar/gui/e-calendar-view.c:1603
-msgid "Other"
-msgstr "���"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
+msgid "Gadu-Gadu"
+msgstr "·����-����"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:537
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
+msgid "Skype"
+msgstr "·����"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "Error adding contact"
 msgstr "�� ���� �������"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
 msgid "Error modifying contact"
 msgstr "�� �������� �������"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Error removing contact"
 msgstr "�� ������� �������"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
-msgid "Source Book"
-msgstr "��� ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
-msgid "Target Book"
-msgstr "����� ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:319
-msgid "Is New Contact"
-msgstr "�� �� �������"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:326
-msgid "Writable Fields"
-msgstr "������� �����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:333
-msgid "Required Fields"
-msgstr "������� �����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:347
-msgid "Changed"
-msgstr "�����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2488
 #, c-format
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2565
 msgid "Contact Editor - %s"
 msgstr "������� ����� - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2883
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2973
 msgid "Please select an image for this contact"
 msgstr "���� ������ �� ���� �� ��� �������"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2884
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2974
 msgid "_No image"
 msgstr "_�� ����"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
-msgid ""
-"The contact data is invalid:\n"
-"\n"
-msgstr ""
-"� ������� ���� �� �������:\n"
-"\n"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3247
+msgid "The contact data is invalid:\n\n"
+msgstr "� ������� ���� �� �������:\n\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3159
 #, c-format
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
 msgid "'%s' has an invalid format"
 msgstr "'%s' ��� �� ������� �����"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
 #, c-format
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3258
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ��� �� ������� �����"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3181
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3192
 #, c-format
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3284
 msgid "%s'%s' is empty"
 msgstr "%s'%s' �� �����"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
 msgid "Invalid contact."
 msgstr "������� �������."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:350
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "������� ����-��"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "_���� ���"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:427
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "_��� ���"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "�_���"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:449
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "_������ ����� ���"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:323
-msgid "Shell"
-msgstr "���"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+msgid "Dr."
+msgstr "�����"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
-msgstr ""
-"\n"
-"�����.\n"
-"�����.\n"
-"��.\n"
-"���\n"
-"�����."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+msgid "Esq."
+msgstr "������"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "��� ���"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+msgid "I"
+msgstr "I"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+msgid "II"
+msgstr "II"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+msgid "III"
+msgstr "III"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+msgid "Jr."
+msgstr "�����."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+msgid "Miss"
+msgstr "���"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+msgid "Mr."
+msgstr "�����"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+msgid "Mrs."
+msgstr "�����"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+msgid "Ms."
+msgstr "���"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
+msgid "Sr."
+msgstr "�����"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "_����:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "_����:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_�����:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "_������:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "<b>Members</b>"
-msgstr "<b>������</b>"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:692
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:676
 msgid "Contact List Editor"
 msgstr "������� ���� �����"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "Members"
+msgstr "������"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_��� ������� ��� ������ ��� � ��� ����"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "_���� ���:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../mail/mail-config.glade.h:157
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:157
 msgid "_Select..."
 msgstr "_������..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_��� �� ���� ����� � ���� � ������� ���� � ���� ����:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:785
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:769
 msgid "Contact List Members"
 msgstr "������� ���� ������"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:954
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1345
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:917
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1333
 msgid "_Members"
 msgstr "_������"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1182
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error adding list"
 msgstr "�� ���� ����"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1196
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error modifying list"
 msgstr "�� �������� ����"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1210
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1200
 msgid "Error removing list"
 msgstr "�� ������� ����"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1254
-#: ../addressbook/gui/widgets/e-addressbook-model.c:513
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:414
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Book"
-msgstr "���"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1274
-msgid "Is New List"
-msgstr "�� �� ����"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "����� �������:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.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
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "�������� ������� ��������"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
@@ -678,158 +715,140 @@ msgstr ""
 "� ��� � ���� � ��� ������� ������ ������� �� ��� �����.  ��� � ��� � �� �� "
 "�����?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
 msgstr "�� �������:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid "Original Contact:"
 msgstr "������� �������:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
-"The name or email address of this contact already exists\n"
-"in this folder.  Would you like to add it anyway?"
+"The name or email address of this contact already exists\nin this folder.  "
+"Would you like to add it anyway?"
 msgstr ""
-"� ��� � ���� ����� � ��� ������� ������ �������\n"
-"�� ��� �����.  ��� � ��� � �� �� �����?"
+"� ��� � ���� ����� � ��� ������� ������ �������\n�� ��� �����.  ��� � ��� � "
+"�� �� �����?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "_���"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 msgid "Merge Contact"
 msgstr "��� �������"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:510
-#: ../addressbook/gui/widgets/eab-contact-display.c:515
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
-#: ../addressbook/gui/widgets/eab-contact-display.c:786
-#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
-msgid "Email"
-msgstr "����"
-
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:876
-#: ../modules/calendar/e-cal-shell-view-actions.c:1579
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
-#: ../modules/calendar/e-task-shell-view-actions.c:1001
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Any field contains"
 msgstr "��� ���� �������"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:883
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "���� ������ ���"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:890
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "��� �������"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:143
+#: ../addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No contacts"
 msgstr "�� ��������"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
+#: ../addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d �������"
 msgstr[1] "%d ��������"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:308
+#: ../addressbook/gui/widgets/e-addressbook-model.c:307
 msgid "Error getting book view"
 msgstr "�� ����� ��� ��"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:533
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:421
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Query"
-msgstr "����"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:707
+#: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
 msgstr "��� ���������"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:435
-#: ../addressbook/gui/widgets/e-addressbook-view.c:645
-#: ../calendar/gui/e-calendar-table.c:886 ../calendar/gui/e-memo-table.c:669
-#: ../modules/calendar/e-memo-shell-content.c:597
-#: ../modules/calendar/e-task-shell-content.c:620
-#: ../widgets/table/e-table-click-to-add.c:505
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3344
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
-#: ../widgets/text/e-text.c:3542
-msgid "Model"
-msgstr "�����"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "�� �������� ���"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:655
-#: ../calendar/gui/e-calendar-table.c:897 ../calendar/gui/e-memo-table.c:680
-msgid "Shell View"
-msgstr "��� ��"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
+msgid "Cut selected contacts to the clipboard"
+msgstr "��� �������� �������� � � �������"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
+msgid "Copy selected contacts to the clipboard"
+msgstr "���� �������� �������� � � �������"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
+msgid "Paste contacts from the clipboard"
+msgstr "���� �������� ���� � �������"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
+msgid "Delete selected contacts"
+msgstr "����� �������� ��������"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:666
-msgid "Source"
-msgstr "���"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
+msgid "Select all visible contacts"
+msgstr "������ �� ������� ��������"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1134
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1286
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "� � ��� � ���� � ����� ��� ������� �����?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1138
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1290
 msgid "Are you sure you want to delete this contact list?"
 msgstr "� � ��� � ���� � ����� ��� ������� ����?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1142
 #, c-format
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1294
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "� � ��� � ���� � ����� ��� ������� ���� (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1148
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete these contacts?"
 msgstr "� � ��� � ���� � ����� ��� ��������?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1152
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete this contact?"
 msgstr "� � ��� � ���� � ����� ��� �������?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1156
 #, c-format
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "� � ��� � ���� � ����� ��� ������� (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1345
 #, c-format
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1463
 msgid ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
+"Opening %d contacts will open %d new windows as well.\nDo you really want to "
+"display all of these contacts?"
 msgstr ""
-"������ %d �������� ��� ���� %d �� ������ �� ���.\n"
-"�� � ���� ���� � ������ �� � ��� ��������?"
+"������ %d �������� ��� ���� %d �� ������ �� ���.\n�� � ���� ���� � ������ �� "
+"� ��� ��������?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1350
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 msgid "_Don't Display"
 msgstr "_���� ������"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1469
 msgid "Display _All Contacts"
 msgstr "������ _�� ��������"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "��������"
 
@@ -849,12 +868,16 @@ msgstr "������ ���"
 msgid "Business Phone 2"
 msgstr "������ ��� 2"
 
+#: ../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/dialogs/event-page.ui.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
@@ -862,7 +885,7 @@ msgid "Categories"
 msgstr "���������"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "Company"
 msgstr "�������"
 
@@ -902,27 +925,31 @@ msgstr "��� ���"
 msgid "Home Phone 2"
 msgstr "��� ��� 2"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "ISDN Phone"
+msgstr "ISDN ���"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "�����"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
 msgstr "������"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Mobile Phone"
 msgstr "����� ���"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:526
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "Nickname"
 msgstr "������"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "���"
 
@@ -951,22 +978,31 @@ msgid "Radio"
 msgstr "�����"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:573
+#: ../calendar/gui/e-meeting-list-view.c:578
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "���"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 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 "������"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:519
 msgid "Title"
 msgstr "�����"
 
@@ -978,119 +1014,29 @@ msgstr "����"
 msgid "Web Site"
 msgstr "��� ���"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:519
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-group-container.c:994
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
-msgid "Width"
-msgstr "����"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:526
-#: ../widgets/table/e-table-group-container.c:987
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
-msgid "Height"
-msgstr "���"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-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:140
-msgid "Column Width"
-msgstr "����� ����"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:179
-msgid ""
-"\n"
-"\n"
-"Searching for the Contacts..."
-msgstr ""
-"\n"
-"\n"
-"����� �� � ��������..."
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
+msgid "\n\nSearching for the Contacts..."
+msgstr "\n\n����� �� � ��������..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
-"\n"
-"\n"
-"Search for the Contact\n"
-"\n"
-"or double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"��� �� � �������\n"
-"\n"
-"� �����-���� �� � ����� � �� �������."
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:185
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"�� � �� ����� � �� �� ��� ��.\n"
-"\n"
-"�����-���� �� � ����� � �� �������."
+"\n\nSearch for the Contact\n\nor double-click here to create a new Contact."
+msgstr "\n\n��� �� � �������\n\n� �����-���� �� � ����� � �� �������."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
-"\n"
-"\n"
-"Search for the Contact."
+"\n\nThere are no items to show in this view.\n\nDouble-click here to create a "
+"new Contact."
 msgstr ""
-"\n"
-"\n"
-"��� �� � �������."
+"\n\n�� � �� ����� � �� �� ��� ��.\n\n�����-���� �� � ����� � �� �������."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"�� � �� ����� � �� �� ��� ��."
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
+msgid "\n\nSearch for the Contact."
+msgstr "\n\n��� �� � �������."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:520
-msgid "Adapter"
-msgstr "������"
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
+msgid "\n\nThere are no items to show in this view."
+msgstr "\n\n�� � �� ����� � �� �� ��� ��."
 
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
@@ -1101,18 +1047,10 @@ msgid "Home Email"
 msgstr "��� ����"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "��� ����"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "��������"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "��� ����"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1127,8 +1065,8 @@ msgstr "�� �������"
 msgid "New Contact List"
 msgstr "�� ������� ����"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
 #, c-format
+#: ../addressbook/gui/widgets/ea-minicard-view.c:161
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "������ ����� ��� ����� %s ��� %d ���"
@@ -1138,152 +1076,146 @@ msgstr[1] "ð�‘’ð�‘³ð�‘®ð�‘©ð�‘¯ð�‘‘ ð�‘©ð�‘›ð�‘®ð�‘§ð�‘• ð�‘šð�‘«ð�‘’ ð�‘“ð�‘´ð�
 msgid "Open"
 msgstr "����"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:141
+#: ../addressbook/gui/widgets/ea-minicard.c:153
 msgid "Contact List: "
 msgstr "������� ����: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:142
+#: ../addressbook/gui/widgets/ea-minicard.c:154
 msgid "Contact: "
 msgstr "�������: "
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../addressbook/gui/widgets/ea-minicard.c:180
+msgid "evolution minicard"
+msgstr "·�������� �������"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
 msgstr "���� _���� �����"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:196
-#: ../widgets/misc/e-web-view.c:330
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:381
+msgid "Copy the email address to the clipboard"
+msgstr "���� � ���� ����� � � �������"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:386
 msgid "_Send New Message To..."
 msgstr "_���� �� ����� �..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:206
-#: ../widgets/misc/e-web-view.c:303
-msgid "_Copy Link Location"
-msgstr "_���� ���� �������"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:213
-#: ../widgets/misc/e-web-view.c:313
-msgid "_Open Link in Browser"
-msgstr "_���� ���� �� �����"
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:388
+msgid "Send a mail message to this address"
+msgstr "���� � ��� ����� � ��� �����"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:289
-#: ../addressbook/gui/widgets/eab-contact-display.c:291
+#: ../addressbook/gui/widgets/eab-contact-display.c:258
+#: ../addressbook/gui/widgets/eab-contact-display.c:260
 msgid "(map)"
 msgstr "(���)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:309
-#: ../addressbook/gui/widgets/eab-contact-display.c:320
+#: ../addressbook/gui/widgets/eab-contact-display.c:278
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
 msgid "map"
 msgstr "���"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:404
-#: ../addressbook/gui/widgets/eab-contact-display.c:753
+#: ../addressbook/gui/widgets/eab-contact-display.c:415
+#: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
 msgstr "���� ������"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "���������"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "��������"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "�������"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Video Chat"
 msgstr "����� ���"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../modules/calendar/e-cal-shell-view-actions.c:214
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:329
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:450
-#: ../plugins/groupwise-features/camel-gw-listener.c:563
-#: ../plugins/hula-account-setup/camel-hula-listener.c:372
-#: ../plugins/hula-account-setup/camel-hula-listener.c:400
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view.c:498
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "�������"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
 #: ../calendar/gui/dialogs/event-editor.c:116
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "���/����"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Phone"
 msgstr "���"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "����"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
 msgid "Address"
 msgstr "�����"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Home Page"
 msgstr "��� ���"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
 msgstr "��� ���"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-#: ../calendar/gui/e-calendar-view.c:1894 ../shell/main.c:116
-msgid "Birthday"
-msgstr "�����"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
-#: ../calendar/gui/e-calendar-view.c:1895
-msgid "Anniversary"
-msgstr "��������"
-
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#. orange
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../capplet/settings/mail-capplet-shell.c:350
 #: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:167
-#: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:152
+#: ../modules/addressbook/e-book-shell-migrate.c:134
+#: ../modules/calendar/e-cal-shell-backend.c:171
+#: ../modules/calendar/e-cal-shell-migrate.c:151
+#: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:156
-#: ../modules/calendar/e-task-shell-migrate.c:511
-#: ../modules/mail/e-mail-shell-migrate.c:958
-#: ../plugins/email-custom-header/email-custom-header.c:333
+#: ../modules/calendar/e-task-shell-backend.c:158
+#: ../modules/calendar/e-task-shell-migrate.c:119
+#: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "�������"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:771
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "��� �����"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:807
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "��� ���"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:815
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "����"
 
+#, c-format
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
+msgid "Click to mail %s"
+msgstr "���� � ��� %s"
+
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Success"
@@ -1333,13 +1265,14 @@ msgid "Protocol not supported"
 msgstr "�������� ��� �������"
 
 #. E_BOOK_ERROR_CANCELLED
+#. To Translators: This is task status
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/e-cal-component-preview.c:201
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:224
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:800 ../calendar/gui/print.c:2614
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2666
 msgid "Canceled"
 msgstr "�������"
 
@@ -1358,6 +1291,11 @@ msgstr "����������� ����"
 msgid "Authentication Required"
 msgstr "����������� �������"
 
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
+msgid "TLS not Available"
+msgstr "TLS ��� ��������"
+
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
 #: ../addressbook/gui/widgets/eab-gui-util.c:71
@@ -1384,147 +1322,177 @@ msgstr "������� ���� �����"
 msgid "Unsupported authentication method"
 msgstr "��������� ����������� �����"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:105
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
+"This address book cannot be opened. This either means this book is not marked "
+"for offline usage or not yet downloaded for offline usage. Please load the "
+"address book once in online mode to download its contents."
 msgstr ""
 "��� ����� ��� ����� �� �����. ��� ��� ���� ��� ��� �� ��� ���� �� ����� ���� "
 "� ��� ��� �������� �� ����� ����. ���� ��� � ����� ��� ���� �� ����� ��� � "
 "������ ��� ��������."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:114
 #, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
+"This address book cannot be opened.  Please check that the path %s exists and "
+"that permissions are set to access it."
 msgstr ""
-"��� ����� ��� ����� �� �����.  ���� ��� ��� � ��� %s ������� � ��� �������� "
-"� ��� � ����� ��."
+"��� ����� ��� ����� �� �����.  ���� ��� ��� � ��� %s ������� � ��� �������� � "
+"��� � ����� ��."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:126
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
-"��� ����� � ·�������� ��� ��� ��� LDAP ����� ������� �� � ��.  � �� "
-"LDAP �� ·�������� �� LDAP-������� ·�������� ����� ���� �� �������."
+"��� ����� � ·�������� ��� ��� ��� LDAP ����� ������� �� � ��.  � �� LDAP �� "
+"·�������� �� LDAP-������� ·�������� ����� ���� �� �������."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:135
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
 msgstr ""
-"��� ����� ��� ����� �� �����.  ��� ��� ���� ��� �� ������� URI ��� �����, � "
-"� ���� �� ���������."
+"��� ����� ��� ����� �� �����.  ��� ��� ���� ��� �� ������� URI ��� �����, � � "
+"���� �� ���������."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:143
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
 msgstr "������ �� �����:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
+"More cards matched this query than either the server is \nconfigured to "
+"return or Evolution is configured to display.\nPlease make your search more "
+"specific or raise the result limit in\nthe directory server preferences for "
+"this address book."
 msgstr ""
-"�� ���� ���� ��� ���� ��� ��� � ���� �� \n"
-"��������� � ����� � ·�������� �� ��������� � ������.\n"
-"���� ��� �� ��� �� �������� � ��� � ������ ����� ��\n"
-"� �������� ���� ���������� �� ��� ����� ���."
+"�� ���� ���� ��� ���� ��� ��� � ���� �� \n��������� � ����� � ·�������� �� "
+"��������� � ������.\n���� ��� �� ��� �� �������� � ��� � ������ ����� ��\n� "
+"�������� ���� ���������� �� ��� ����� ���."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
+"The time to execute this query exceeded the server limit or the "
+"limit\nconfigured for this address book.  Please make your search\nmore "
+"specific or raise the time limit in the directory server\npreferences for "
+"this address book."
 msgstr ""
-"� ��� � ������� ��� ���� ������� � ���� ����� � � �����\n"
-"��������� �� ��� ����� ���.  ���� ��� �� ���\n"
-"�� �������� � ��� � ��� ����� �� � �������� ����\n"
-"���������� �� ��� ����� ���."
+"� ��� � ������� ��� ���� ������� � ���� ����� � � �����\n��������� �� ��� "
+"����� ���.  ���� ��� �� ���\n�� �������� � ��� � ��� ����� �� � �������� "
+"����\n���������� �� ��� ����� ���."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book was unable to parse this query."
 msgstr "� ������ �� ��� ����� ��� ��� ������ � ��� ��� ����."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:181
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book refused to perform this query."
 msgstr "� ������ �� ��� ����� ��� ������ � ����� ��� ����."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "��� ���� ��� ��� ������� ����������."
 
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s ������ �������\n"
-"�� � ���� � ������ ��?"
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
+msgid "card.vcf"
+msgstr "���.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:216
-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:256
-#: ../addressbook/gui/widgets/eab-gui-util.c:259
-msgid "contact"
-msgid_plural "contacts"
-msgstr[0] "�������"
-msgstr[1] "��������"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:342
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "������ ����� ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:456
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "����"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:598
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "��� ������� �"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:600
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "���� ������� �"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "��� �������� �"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:605
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "���� �������� �"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
 msgid "Card View"
 msgstr "��� ��"
 
-#: ../addressbook/importers/evolution-csv-importer.c:660
-#: ../addressbook/importers/evolution-ldif-importer.c:511
-#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-vcard-importer.c:262
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "�������..."
 
+#: ../addressbook/importers/evolution-csv-importer.c:858
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "����� CSV � ��� (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:859
+msgid "Outlook CSV and Tab Importer"
+msgstr "����� CSV � ��� ������"
+
+#: ../addressbook/importers/evolution-csv-importer.c:867
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "·������ CSV � ��� (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:868
+msgid "Mozilla CSV and Tab Importer"
+msgstr "·������ CSV � ��� ������"
+
+#: ../addressbook/importers/evolution-csv-importer.c:876
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "·�������� CSV � ��� (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:877
+msgid "Evolution CSV and Tab Importer"
+msgstr "·�������� CSV � ��� ������"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:689
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP ���� �������� ����� (.ldif)"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:690
+msgid "Evolution LDIF importer"
+msgstr "·�������� LDIF ������"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:565
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vcf, .gcrd)"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:566
+msgid "Evolution vCard Importer"
+msgstr "·�������� vCard ������"
+
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#, c-format
+#: ../addressbook/printing/e-contact-print.c:733
+msgid "Page %d"
+msgstr "��� %d"
+
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "��� ��� ���� ���"
 
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
+msgid "Couldn't get list of address books"
+msgstr "����� ��� ���� � ����� ����"
+
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "���� � ���� ���"
@@ -1533,52 +1501,77 @@ msgstr "���� � ���� ���"
 msgid "Specify the output file instead of standard output"
 msgstr "������� � ����� ��� ������ � ������� �����"
 
+#, fuzzy
+#: ../addressbook/tools/evolution-addressbook-export.c:46
+msgid "OUTPUTFILE"
+msgstr "OUTPUTFILE"
+
 #: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
 msgstr "���� ����� ����� ��� ������"
 
+#: ../addressbook/tools/evolution-addressbook-export.c:52
+msgid "Show cards as vcard or csv file"
+msgstr "�� ���� �� vcard � csv ���"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:53
+msgid "[vcard|csv]"
+msgstr "[vcard|csv]"
+
 #: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "������ �� ���������� ���"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
+"The number of cards in one output file in asynchronous mode, default size 100."
 msgstr "� ����� � ���� �� ��� ����� ��� �� ���������� ���, ������ ��� 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "�����"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:99
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "������ ��� �������� ��, ���� �� --help ����� � �� � ����."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:130
+#: ../addressbook/tools/evolution-addressbook-export.c:115
+msgid "Only support csv or vcard format."
+msgstr "���� ����� csv � vcard �����."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:124
+msgid "In async mode, output must be file."
+msgstr "�� ����� ���, ����� ���� �� ���."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "�� ����� ���, �� �� �� ��� �� � ��� �����."
 
+#: ../addressbook/tools/evolution-addressbook-export.c:163
+msgid "Unhandled error"
+msgstr "��������� ��"
+
 #: ../addressbook/util/addressbook.c:103
 msgid "Accessing LDAP Server anonymously"
 msgstr "������� LDAP ���� ����������"
 
-#: ../addressbook/util/addressbook.c:208
-#: ../plugins/groupwise-features/camel-gw-listener.c:530
+#: ../addressbook/util/addressbook.c:210
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "���� � ���������.\n"
 
-#: ../addressbook/util/addressbook.c:215
-#: ../plugins/groupwise-features/camel-gw-listener.c:510
 #, c-format
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 msgid "Enter password for %s (user %s)"
 msgstr "���� ������ �� %s (��� %s)"
 
-#: ../addressbook/util/addressbook.c:223
+#: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:518
-#: ../plugins/publish-calendar/publish-calendar.c:215
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
+#: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "���� ������"
@@ -1589,8 +1582,8 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}' �� � ���-���� ������� � ����� �� �������. ���� ������ � ������� "
-"������� ���� � ��� �� �� � ������� ��."
+"'{0}' �� � ���-���� ������� � ����� �� �������. ���� ������ � ������� ������� "
+"���� � ��� �� �� � ������� ��."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
@@ -1598,27 +1591,27 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
-"'{0}' �� � ���-���� ������� � ����� �� �������. ���� ������ � ������� "
-"������� ��� ��� ������ ����������."
+"'{0}' �� � ���-���� ������� � ����� �� �������. ���� ������ � ������� ������� "
+"��� ��� ������ ����������."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of what "
+"your appointment is about."
 msgstr ""
-"���� � �������� ����� � �� ��������� ��� ��� �� ���������� �� ��� � ��� �� "
-"��������� �� ����."
+"���� � �������� ����� � �� ��������� ��� ��� � �� ��� � ��� �� ��������� �� "
+"����."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr ""
-"���� � �������� ����� � �� ���� ��� ��� �� ���������� �� ��� � ��� �� ���� "
-"�� ����."
+"���� � �������� ����� � �� ���� ��� ��� � �� ��� � ��� �� ���� �� ����."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid "All information in these memos will be deleted and can not be restored."
+msgid ""
+"All information in these memos will be deleted and can not be restored."
 msgstr "�� ��������� �� ��� ����� ��� �� ������� � ��� ��� �� ������."
 
 #: ../calendar/calendar.error.xml.h:8
@@ -1627,12 +1620,12 @@ msgstr "�� ��������� �� ��� �
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+"All information on these appointments will be deleted and can not be restored."
 msgstr "�� ��������� �� ��� ���������� ��� �� ������� � ��� ��� �� ������."
 
 #: ../calendar/calendar.error.xml.h:10
-msgid "All information on these tasks will be deleted and can not be restored."
+msgid ""
+"All information on these tasks will be deleted and can not be restored."
 msgstr "�� ��������� �� ��� ����� ��� �� ������� � ��� ��� �� ������."
 
 #: ../calendar/calendar.error.xml.h:11
@@ -1662,58 +1655,58 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "� � ��� � ���� � ����� � ��������� ������ '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "� � ��� � ���� � ����� � ����� ������ '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "� � ��� � ���� � ����� � ���� '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "� � ��� � ���� � ����� ��� {0} ����������?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "� � ��� � ���� � ����� ��� {0} �����?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "� � ��� � ���� � ����� ��� {0} �����?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this appointment?"
 msgstr "� � ��� � ���� � ����� ��� ���������?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
 msgid "Are you sure you want to delete this meeting?"
 msgstr "� � ��� � ���� � ����� ��� �����?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
 msgid "Are you sure you want to delete this memo?"
 msgstr "� � ��� � ���� � ����� ��� ����?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
 msgid "Are you sure you want to delete this task?"
 msgstr "� � ��� � ���� � ����� ��� ����?"
 
-#: ../calendar/calendar.error.xml.h:25
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "� � ��� � ���� � ��� � ���� ����� � �����?"
-
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "� � ��� � ���� � ���� � ��������� ����� � �����?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "� � ��� � ���� � ��� � ��������� ����� � �����?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "� � ��� � ���� � ���� � ���� ����� � �����?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "� � ��� � ���� � ��� � ���� ����� � �����?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Calendar repository is offline."
-msgstr "������� ���������� �� �����."
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "� � ��� � ���� � ��� � ���� ����� � �����?"
 
 #: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
@@ -1775,50 +1768,53 @@ msgstr "�� ����� ���� ����"
 msgid "Error loading task list"
 msgstr "�� ����� ���� ����"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:44
-msgid "Error on '{0}'"
-msgstr "�� �� '{0}'"
-
-#: ../calendar/calendar.error.xml.h:48
-msgid "No response from the server."
-msgstr "�� ������� ���� � ����."
-
-#: ../calendar/calendar.error.xml.h:49
-msgid "Save Appointment"
-msgstr "��� ���������"
+#: ../calendar/calendar.error.xml.h:43
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"�� � �� ��� ���� � ���������� �����, � ��� ������������ �� ��� �� � ����� �� "
+"�������."
 
-#: ../calendar/calendar.error.xml.h:50
-msgid "Save Memo"
-msgstr "��� ����"
+#: ../calendar/calendar.error.xml.h:44
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+"�� � �� ��� ���� � ���������� �����, � ��� ������������ �� ��� �� � ���� ��� "
+"��� �������."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "Save Task"
-msgstr "��� ����"
+#: ../calendar/calendar.error.xml.h:45
+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:52
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+"Sending updated information allows other participants to keep their calendars "
+"up to date."
 msgstr ""
 "������ ������� ��������� ���� ��� ������������ � ��� �� �������� �� � ���."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr ""
 "������ ������� ��������� ���� ��� ������������ � ��� �� ���� ����� �� � ���."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
+"Some attachments are being downloaded. Saving the appointment would result in "
+"the loss of these attachments."
 msgstr ""
 "��� ��������� � ���� ��������. ����� � ��������� ��� ������ �� � ��� � ��� "
 "���������."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -1826,157 +1822,175 @@ msgstr ""
 "��� ��������� � ���� ��������. ����� � ���� ��� ������ �� � ��� � ��� "
 "���������."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr "��� ����� �� ��� ��� ������� ��� �� ������ ����."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "� ·�������� ������� ��� ���� �������������."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "� ·�������� �������� ��� ���� �������������."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "� ·�������� ���� ��� ���� �������������."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "� ·�������� ����� ��� ���� �������������."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:55
 msgid "The calendar is not marked for offline usage."
 msgstr "� ������� �� ��� ���� �� ����� ����."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:56
 msgid "The memo list is not marked for offline usage."
 msgstr "� ���� ���� �� ��� ���� �� ����� ����."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "� ���� ���� �� ��� ���� �� ����� ����."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "��� ������� ��� �� ������ ����������."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "��� ���� ���� ��� �� ������ ����������."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "��� ���� ���� ��� �� ������ ����������."
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "Unable to load the calendar"
-msgstr "������ � ��� � �������"
-
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "��� � ��� � ��� �� ������ � ��� ���������?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:62
+msgid "Would you like to save your changes to this meeting?"
+msgstr "��� � ��� � ��� �� ������ � ��� �����?"
+
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "��� � ��� � ��� �� ������ � ��� ����?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "��� � ��� � ��� �� ������ � ��� ����?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:65
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "��� � ��� � ���� � ���������� ����� �� ��� ����?"
+
+#: ../calendar/calendar.error.xml.h:66
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr "��� � ��� � ���� �� � ������������ � ���������� �����?"
+
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "��� � ��� � ���� ����� ���������� � ������������?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "��� � ��� � ���� ��� ���� � ������������?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "��� � ��� � ���� ������� ����� ��������� � ������������?"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
 msgstr "��� � ��� � ���� ������� ���� ��������� � ������������?"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:71
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"� � �������� � �� ��������� GroupWise ���� � �� ������� �������� ���� "
+"·��������. �� ���� �������, � ���� ��� �� �������� � � ������� �����."
+
+#: ../calendar/calendar.error.xml.h:72
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "� ��� ����� ��� ���������, ��� ��� ��� ���� ��."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:73
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "� ��� ����� ��� �����, ��� ��� ��� ���� ��."
+
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "� ��� ����� ��� ����, ��� ��� ��� ���� ��."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "� ��� ��� ������ � ��� ����, ��� ��� ��� ���� ���."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "�� �������� ��� ��� �� �������� ����� ·�������� �� ��������."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "�� ����� ��� ��� �� �������� ����� ·�������� �� ��������."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "�� ����� ��� ��� �� �������� ����� ·�������� �� ��������."
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/mail-composer.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:79
+#: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_������� ������"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:305
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "_���"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_��� ������"
 
-#: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:32 ../mail/mail.error.xml.h:136
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_����"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_���� �����"
 
-#: ../calendar/calendar.error.xml.h:90
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "����� �����-�� ������:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:811
-#: ../calendar/conduits/memo/memo-conduit.c:812
-#: ../calendar/conduits/todo/todo-conduit.c:1011
-#: ../calendar/conduits/todo/todo-conduit.c:1012
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1533
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/memo/memo-conduit.c:822
+#: ../calendar/conduits/todo/todo-conduit.c:1022
+#: ../calendar/conduits/todo/todo-conduit.c:1023
 msgid "Could not start evolution-data-server"
 msgstr "��� ��� ���� ·��������-����-����"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
 msgstr "��� ��� ��� �����'� ������� ��������� ����"
 
-#: ../calendar/conduits/memo/memo-conduit.c:905
-#: ../calendar/conduits/memo/memo-conduit.c:908
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "��� ��� ��� �����'� ���� ��������� ����"
 
-#: ../calendar/conduits/memo/memo-conduit.c:952
-#: ../calendar/conduits/memo/memo-conduit.c:955
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "��� ��� ��� �����'� ���� ��������� ����"
 
@@ -1984,83 +1998,90 @@ msgstr "ð�‘’ð�‘«ð�‘› ð�‘¯ð�‘ªð�‘‘ ð�‘®ð�‘²ð�‘‘ ð�‘�ð�‘²ð�‘¤ð�‘©ð�‘‘'ð�‘• ð�‘¥ð�‘
 msgid "Default Priority:"
 msgstr "������ ��������:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
+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/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "�����"
 msgstr[1] "������"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-#: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-file/calendar-file.c:294
-#: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:515
-#: ../plugins/google-account-setup/google-contacts-source.c:331
-#: ../plugins/google-account-setup/google-source.c:740
-msgid "hours"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+msgid "hour"
 msgid_plural "hours"
 msgstr[0] "��"
 msgstr[1] "���"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:296
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "���� ���"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "����������"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
 msgstr "������ _��"
 
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1573
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1173
-#: ../plugins/itip-formatter/itip-view.c:1022
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "�������:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
 msgid "Snooze _time:"
 msgstr "���� _���:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
 msgid "_Dismiss"
 msgstr "_������"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1062
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11 ../mail/e-mail-browser.c:111
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#: ../shell/e-shell-window-actions.c:1627
-#: ../widgets/menus/gal-define-views.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:151
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1625
+#: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_����"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "_����"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:335
+msgid "hours"
+msgstr "���"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "������� � ���������"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../modules/addressbook/ldap-config.glade.h:43
-#: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-file/calendar-file.c:293
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:514
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-#: ../plugins/google-account-setup/google-source.c:739
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "������"
 
@@ -2078,47 +2099,38 @@ msgstr "ð�‘¯ð�‘´ ð�‘›ð�‘¦ð�‘•ð�‘’ð�‘®ð�‘¦ð�‘�ð�‘–ð�‘©ð�‘¯ ð�‘©ð�‘�ð�‘±ð�‘¤ð�‘©ð�
 msgid "No location information available."
 msgstr "�� ������� ��������� ��������."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
 #, c-format
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
 msgid "You have %d alarms"
 msgstr "� ��� %d �����"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1666
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "�����"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1670
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 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."
+"Evolution does not support calendar reminders with\nemail notifications yet, "
+"but this reminder was\nconfigured to send an email.  Evolution will "
+"display\na normal reminder dialog box instead."
 msgstr ""
-"·�������� ��� ��� ����� ������� �������� ���\n"
-"���� ������������ ���, ��� ��� ������� ���\n"
-"��������� � ���� �� ����.  ·�������� ��� ������\n"
-"� ����� ������� ������ ���� ������."
+"·�������� ��� ��� ����� ������� �������� ���\n���� ������������ ���, ��� ��� "
+"������� ���\n��������� � ���� �� ����.  ·�������� ��� ������\n� ����� ������� "
+"������ ���� ������."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1700
 #, c-format
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 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?"
+"configured to run the following program:\n\n        %s\n\nAre you sure you "
+"want to run this program?"
 msgstr ""
 "�� ·�������� ������� ������� �� ���� � �����. ��� ������� �� ��������� � ��� "
-"� ������ �������:\n"
-"\n"
-"        %s\n"
-"\n"
-"� � ��� � ���� � ��� ��� �������?"
+"� ������ �������:\n\n        %s\n\n� � ��� � ���� � ��� ��� �������?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1714
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "�� ��� ��� �� ���� ��� ������� ����."
 
@@ -2127,18 +2139,18 @@ msgid "invalid time"
 msgstr "������� ���"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#, c-format
 #: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
-#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ��"
 msgstr[1] "%d ���"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#, c-format
 #: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
-#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d �����"
@@ -2147,9 +2159,9 @@ 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")
+#, c-format
 #: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
-#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d ������"
@@ -2160,7 +2172,7 @@ msgid "Alarm programs"
 msgstr "���� ��������"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "����� � ��� �� ������� � �� ��� �� ��� �� � ������ ��."
 
@@ -2168,181 +2180,200 @@ msgstr "����� � ��� �� ������
 msgid "Ask for confirmation when deleting items"
 msgstr "��� �� ���������� ��� ������� �����"
 
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "�������� ���� � ����� ��� � �� ����, �� \"#rrggbb\" �����."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "�������� ���� � ����� ��� � �����, �� \"#rrggbb\" �����."
+
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid "Calendars to run alarms for"
 msgstr "�������� � ��� ����� ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "���� � ��� � ·������ ·���� ��� �� � ��� �� (����� �� ������)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "���� � ��� � ·������ ·���� ��� �� � �� ��."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "������� ������� �� ���� ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "������ �������"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr "���� � ������ ������� �� � �� �����. -1 ���� �����."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "��� �� ��� � ���� � ��� � ��� ��� ��� �� ���������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "������ ��������� �������"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "������ ������� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "������ ������� �����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "������ ������� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "�������� �� ����� ���� ���� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "����� ��������"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "����� �����������"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "���/���� ���� URL�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "���/���� ������� URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "�������� � � ������ �� ������� ���."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "��� ��������� �����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "��� ���� �����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "��� ���� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "���������� ��� �������"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "�� � ����� ���� ��, �� ������ �� �� �����, 0 � 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "�� � ����� ����� ��, �� ������ �� �� �����, 0 � 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "�� \"���\", �� � ���� ����� ��� �� � ��� �����."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "�� \"���\", �� � ���� ����� ��� �� � ��� �����."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "�������� ��� �� �� � ��� ��� ���, �� ������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "���� ���� ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "����� ������ ��� � ����� ��� �� ����."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr "���� � �������� ��� ������ ��� ���� �� � �� ��."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "���� � ���� URL� �� ���/���� ��������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "·������ ·���� ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "·������ ·���� ��� ���� - �� ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "·������ ·���� ��� ���� - ��� ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+msgid ""
+"Maximum number of recently used timezones to remember in a 'day_second_zones' "
+"list."
+msgstr ""
+"�������� ����� � �������� ��� ������� � ������� �� � 'day_second_zones' ����."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+msgid "Maximum number of recently used timezones to remember."
+msgstr "�������� ����� � �������� ��� ������� � �������."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "���� ���� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "���� ����� ��� ������� (����������)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "���� ����� ��� ������� (�������)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "����� � ����� ���� ��, 0 � 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "����� � ����� ����� ��, 0 � 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "���� �� ���������� ��� �������"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "���� �� ������� ��� �������"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "����� � ����� �� ��������� � ������ �������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "����� � ����� �� ��������� ��� � ��� �����."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "����� ����� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -2350,7 +2381,7 @@ msgstr ""
 "������� � � ���������� ���, ������ � ��� �������� ������� � � ���� ���� ��� "
 "��� �� � ���� ��, �� �������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2358,26 +2389,26 @@ msgstr ""
 "������� � � ���������� ���, ������ � �� � � ��� �������� ������� � ���� ���� "
 "�� � ���� ��, �� �������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "������� � � ���� ����� ��� ��� �������� ��������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "������� � � ���� ����� ��� ��� �������� �����������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "������� � � ���� ����� ��� ��� �������� ��������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr ""
 "������� � � ������� ���, ������ � ������� ����� � � ��� �������� �������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2385,108 +2416,133 @@ msgstr ""
 "������� � � ������� ���, ������ � �� � � ��� �������� ������� � ���� ���� �� "
 "� ���� ��, �� �������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
-"������� � � ������� ���, ������ � �� � � ��� �������� ������� � ���� ���� "
-"��� ��� �� � ���� ��, �� �������."
+"������� � � ������� ���, ������ � �� � � ��� �������� ������� � ���� ���� ��� "
+"��� �� � ���� ��, �� �������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "������ �������"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "������ ���� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "������ ���� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "�������� ��� � ���� � �� ��� �� �����."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "�������� ��� ������ ��� ���� �� � �� ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "��� �������� �� ���� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "����� ���� �� �� � ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "�� RSVP ���� �� � �����/����/����� �����"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "�� ��� ���� �� � �����/����/����� �����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr "�� ��������� ��� ���� �� ��� � ���� ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "�� ��������� ���� �� � �����/�����/���� �����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "�� ������ ����� �� ����������� ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "�� ������ ���� �� � �����/����/����� �����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "�� � ���� ����� ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "�� � ���� ����� ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+msgid "Show timezone field in the event/meeting editor"
+msgstr "�� ������ ���� �� � �����/����� �����"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "�� ��� ���� �� � �����/����/����� �����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show week number in Day and Work Week View"
 msgstr "�� ��� ����� �� �� � ��� ��� ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week numbers in date navigator"
 msgstr "�� ��� ������ �� ��� ��������"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"��� � ������ ��� ��� �� � �� ��, �� ���. ���� �� ������ � ��� ��� �� � "
+"'������' ��."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
 msgstr "���� ���� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (horizontal)"
 msgstr "���� ����� ��� ������� (����������)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Task preview pane position (vertical)"
 msgstr "���� ����� ��� ������� (�������)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Tasks due today color"
 msgstr "����� �� ���� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 #, no-c-format
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 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.h:87
+#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+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 ""
+"� ������ timezone � �� �� ���� � ���� �� � �������, �� �� untranslated ����� "
+"timezone ������� ������� ��� \"·�������/·�� ·���\"."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -2496,7 +2552,7 @@ msgstr ""
 "(������ ��) ������ � ����� ��� ���� � ���� ����. \"1\" (������� ��) ������ � "
 "����� ��� ����� � � ���� ����."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -2506,169 +2562,197 @@ msgstr ""
 "(������ ��) ������ � ����� ��� ���� � ���� ����. \"1\" (������� ��) ������ � "
 "����� ��� ����� � � ���� ����."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid "The second timezone for a Day View"
+msgstr "� ������ ������ �� � �� ��"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr ""
 "��� ��� ��� ��� ������� �����. 0 �� ���. 1 �� �������. 2 �� ����� �������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time divisions"
 msgstr "��� ��������"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time the last alarm ran, in time_t."
 msgstr "��� � ���� ���� ���, �� time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+msgid "Timezone"
+msgstr "������"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
+"Transparency of the events in calendar views, a value between 0 (transparent) "
+"and 1 (opaque)."
 msgstr ""
 "����������� � � ������ �� ������� ���, � ���� ������ 0 (����������) � 1 "
 "(����)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Twenty four hour time format"
 msgstr "������ �� �� ��� �����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "URI � � ������� (\"������\") �������"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "URI � � ������� (\"������\") ���� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "URI � � ������� (\"������\") ���� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "����� �� � ������ �������, \"������\", \"���\" � \"���\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "����� �� ��������� ��� � ��� �����, \"������\", \"���\" � \"���\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+msgid "Use system timezone"
+msgstr "�� ������ ������"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "�� � ������ ������ ������ � � ������ �������� �� ·��������."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Vertical pane position"
 msgstr "������� ��� �������"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "��� ����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "����� � ��� ����� ��, ���� ·����� (0) � ·������ (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "���� � ��� � �� � ����������� ��� �� ������ �����."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "���� � ��� �� ���������� ��� ������� �� ��������� � ����."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "���� � ��� �� ���������� ��� ��������� ���������� � �����."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
-"���� � ������� ������� �� � ���� ��, ��� ���� ·������ � ·����� �� � ���� � ��� "
-"�����."
+"���� � ������� ������� �� � ���� ��, ��� ���� ·������ � ·����� �� � ���� � "
+"��� �����."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "���� � ������ � ��� ��� � ������ �� � ��� � ���� ���."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "���� � ��� � ·������ ·���� ��� (��� �� ������ ���) �� � �������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "���� � ��� ��������� ����� �� � ����� ��."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "���� � ����� � ���� �� �� � ���, ��� �� � ����."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to set a default reminder for appointments."
 msgstr "���� � ��� � ������ ������� �� ����������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "���� � �� RSVP ���� �� � �����/����/����� �����"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "���� � �� ��������� ���� �� � �����/����� �����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "���� � �� ��� ���� �� � �����/����/����� �����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "���� � �� ������ ���� �� � �����/����/����� �����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 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.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "���� � �� ������ ���� �� � �����/����� �����"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "���� � �� ��� ���� �� � �����/����/����� �����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "���� � �� ��� ����� �� � �� � ��� ��� ��."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week numbers in the date navigator."
 msgstr "���� � �� ��� ������ �� � ��� ��������."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "��� ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "����� ��� ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "����� ��� �����"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "����� ���� ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "����� ���� �����"
 
-#: ../calendar/gui/cal-editor-utils.c:102
+#: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
 msgstr "������� ������"
 
-#: ../calendar/gui/calendar-view-factory.c:113
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Day View"
 msgstr "�� ��"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Work Week View"
 msgstr "��� ��� ��"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:123
 msgid "Week View"
 msgstr "��� ��"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:126
 msgid "Month View"
 msgstr "���� ��"
 
@@ -2697,18 +2781,19 @@ msgstr "�������"
 msgid "Classification"
 msgstr "������������"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:262
-#: ../calendar/gui/e-cal-model.c:526 ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:336
+#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "�����������"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../widgets/misc/e-attachment-tree-view.c:499
+#: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "����������"
 
@@ -2728,9 +2813,10 @@ msgid "Exist"
 msgstr "������"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:724
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "�������"
 
@@ -2739,27 +2825,30 @@ msgstr "�������"
 msgid "Organizer"
 msgstr "�������"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:261
-#: ../calendar/gui/e-cal-model.c:524 ../calendar/gui/e-calendar-table.c:703
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "������"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:260
-#: ../calendar/gui/e-cal-model.c:515 ../calendar/gui/e-cal-model.c:522
-#: ../calendar/gui/e-calendar-table.c:702 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "������"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "�������"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:22 ../plugins/save-calendar/csv-format.c:356
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "�����"
 
@@ -2788,477 +2877,455 @@ msgstr "��"
 msgid "is not"
 msgstr "�� ���"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:627
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "���� ����"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:822
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "��� �� �� ����"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
 #: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "��� � ����"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
 #: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "��� � �������"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
 #: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "���� �� ����"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>����</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>������</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>�����</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
 msgstr "�� ����"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+msgid "Alarm"
+msgstr "����"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "������ _�����"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
 msgstr "������ ���� ����"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "��_���:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:77
+msgid "Options"
+msgstr "������"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+msgid "Repeat"
+msgstr "�����"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
 msgstr "������ � ���"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "���� �:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "_��������:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "_�������:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "_����� � ����"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "_����:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-msgid ""
-"before\n"
-"after"
-msgstr ""
-"����\n"
-"����"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+msgid "after"
+msgstr "����"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+msgid "before"
+msgstr "����"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+msgid "day(s)"
+msgstr "��(�)"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:336
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:43
+msgid "days"
+msgstr "���"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+msgid "end of appointment"
+msgstr "��� � ���������"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "������ ���� ����"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
-msgid ""
-"minute(s)\n"
-"hour(s)\n"
-"day(s)"
-msgstr ""
-"�����(�)\n"
-"��(�)\n"
-"��(�)"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+msgid "hour(s)"
+msgstr "��(�)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-msgid ""
-"minutes\n"
-"hours\n"
-"days"
-msgstr ""
-"������\n"
-"���\n"
-"���"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+msgid "minute(s)"
+msgstr "�����(�)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-msgid ""
-"start of appointment\n"
-"end of appointment"
-msgstr ""
-"���� � ���������\n"
-"��� � ���������"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
+msgid "start of appointment"
+msgstr "���� � ���������"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "�����/�����"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 msgid "A_dd"
 msgstr "�_�"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "Alarms"
 msgstr "�����"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:553
-msgid "_Suggest automatic display of attachment"
-msgstr "_������ �������� ������ � ��������"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
-msgid "Attach file(s)"
-msgstr "���� ���(�)"
-
-#. an empty string is the same as 'None'
+#. Translators: "None" indicates no second time zone set for a day view
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/event-page.c:2936
-#: ../calendar/gui/e-cal-model-tasks.c:727
-#: ../calendar/gui/e-day-view-time-item.c:798
-#: ../calendar/gui/e-itip-control.c:1159 ../filter/e-filter-rule.c:739
-#: ../mail/em-account-editor.c:916 ../mail/em-account-editor.c:1725
-#: ../modules/mail/e-mail-junk-hook.c:88
-#: ../plugins/calendar-weather/calendar-weather.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:378
-#: ../plugins/email-custom-header/email-custom-header.c:390
-#: ../plugins/itip-formatter/itip-formatter.c:2226
-#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1559
-#: ../widgets/misc/e-dateedit.c:1776
-#: ../widgets/misc/e-signature-combo-box.c:75
-#: ../widgets/table/e-cell-date-edit.c:312
+#: ../calendar/gui/e-day-view-time-item.c:797
+msgctxt "cal-second-zone"
 msgid "None"
 msgstr "���"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-day-view-time-item.c:824
 #: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "������..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
 msgid "Selected Calendars for Alarms"
 msgstr "�������� �������� �� �����"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
-msgid "Time and date:"
-msgstr "��� � ���:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
+msgid "Ti_me and date:"
+msgstr "_��� � ���:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-msgid "Date only:"
-msgstr "��� ����:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "(Shown in a Day View)"
-msgstr "(��� �� � �� ��)"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
+msgid "_Date only:"
+msgstr "_��� ����:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-msgstr ""
-"60 ������\n"
-"30 ������\n"
-"15 ������\n"
-"10 ������\n"
-"05 ������"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
-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.ui.h:2
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u � %d ��� �� ������� �� ��� � ����� ���� � ���� �����."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<span weight=\"bold\">Alarms</span>"
-msgstr "<span weight=\"bold\">�����</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(��� �� � �� ��)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">�����</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+msgid "05 minutes"
+msgstr "05 ������"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Date/Time Format</span>"
-msgstr "<span weight=\"bold\">���/��� �����</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
+msgid "10 minutes"
+msgstr "10 ������"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">������ ���/���� ����</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+msgid "15 minutes"
+msgstr "15 ������"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: ../mail/mail-config.glade.h:17
-#: ../plugins/publish-calendar/publish-calendar.glade.h:1
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">������</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+msgid "30 minutes"
+msgstr "30 ������"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">���� ����</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+msgid "60 minutes"
+msgstr "60 ������"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">���</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
+msgid "Alerts"
+msgstr "�����"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">��� ���</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
+#: ../mail/mail-config.ui.h:29
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "���/��� �����"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
 msgstr "�� _����:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
+msgid "Days"
+msgstr "���"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "������ ���/���� ����"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
 msgstr "������"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
 msgid "Display alarms in _notification area only"
 msgstr "������ ����� �� _����������� ��� ����"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "·�����"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:81
-#: ../modules/addressbook/addressbook-config.c:1046
-#: ../modules/addressbook/ldap-config.glade.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:2573
-#: ../smime/gui/smime-ui.glade.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:54
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2675
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "������"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"������\n"
-"���\n"
-"���"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
+msgid "Hours"
+msgstr "���"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1109
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
+msgid "Minutes"
+msgstr "������"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "·�����"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"·�����\n"
-"·�����\n"
-"·������\n"
-"·�����\n"
-"·�����\n"
-"·������\n"
-"·�����"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../mail/mail-config.glade.h:101
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#. Translators: Used in send options dialog
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
+msgid "None"
+msgstr "���"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
+#: ../mail/mail-config.ui.h:81
 msgid "Pick a color"
 msgstr "��� � ����"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "_�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "·������"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "��_��� ���� �� �� � ���"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "��_���� ���:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "������ � �������� �� ���� �����������"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "�_� � �������"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "�� � _�������"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "�� ��� _������ �� ��� ��������"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "�� ��� n_umber �� �� � ��� ��� ��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "�����"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "�_���� �� ����:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "_�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Task List"
+msgstr "���� ����"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "�������:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "·�����"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../e-util/e-non-intrusive-error-dialog.c:287
+#: ../widgets/misc/e-dateedit.c:592
+msgid "Time"
+msgstr "���"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "��� _���:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "��� �����:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: ../calendar/gui/dialogs/recurrence-page.c:1110
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "·�����"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "�� �_����� ��� ���"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "·������"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "��_� ����� ��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
+msgid "Work Week"
+msgstr "��� ���"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "��� ���:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 �� (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 ��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "_��� �� ���������� ��� ������� �����"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_������� ������� �� ���� ��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "_�� ������:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+msgid "_Fri"
+msgstr "_�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_��� ��������� ����� ����"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "_�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "_����� �����:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "_��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "_�� ��������� ��� ���� �� ��� � ���� ��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "_��� ��������:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "_�"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "_�"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "���� ���� ��������/�����"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "���� ���� ���������"
 
@@ -3267,15 +3334,14 @@ msgid "Type:"
 msgstr "���:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:542
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "_���:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:149
-#: ../modules/addressbook/ldap-config.glade.h:36
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:149
+#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
 msgid "_Name:"
 msgstr "_���:"
@@ -3292,39 +3358,35 @@ msgstr "���_� ���� ���� �����
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "���_� ���� ���� �������� ������ �� ����� �������"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "���_�:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-msgid "Task List"
-msgstr "���� ����"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "���� ����"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "������� ��������"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "�� �������"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "���� ���� ��������"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "�� ���� ����"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "���� ���� ��������"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "�� ���� ����"
 
@@ -3340,13 +3402,13 @@ msgstr "��� ���� ��� ��� ����
 msgid "This memo has been deleted."
 msgstr "��� ���� ��� ��� �������."
 
-#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
+#: ../calendar/gui/dialogs/changed-comp.c:76
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  � ��� ��� ������. ����� ��� ������ � ���� � �����?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
+#: ../calendar/gui/dialogs/changed-comp.c:78
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  � ��� ��� �� ������, ���� � �����?"
 
@@ -3362,222 +3424,228 @@ msgstr "��� ���� ��� ��� ����
 msgid "This memo has been changed."
 msgstr "��� ���� ��� ��� �����."
 
-#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
+#: ../calendar/gui/dialogs/changed-comp.c:100
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  � ��� ��� ������. ����� ��� ������ � ����� � �����?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
+#: ../calendar/gui/dialogs/changed-comp.c:102
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  � ��� ��� �� ������, ����� � �����?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 msgid "Validation error: %s"
 msgstr "��������� ��: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2386
-msgid " to "
-msgstr " � "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2390
-msgid " (Completed "
-msgstr " (��������� "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2392
-msgid "Completed "
-msgstr "��������� "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2397
-msgid " (Due "
-msgstr " (�� "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2399
-msgid "Due "
-msgstr "�� "
-
-#: ../calendar/gui/dialogs/comp-editor.c:238
+#: ../calendar/gui/dialogs/comp-editor.c:237
 msgid "Could not save attachments"
 msgstr "��� ��� ��� ���������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:501
+#: ../calendar/gui/dialogs/comp-editor.c:505
 msgid "Could not update object"
 msgstr "��� ��� ����� ������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:596
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "���� ���������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:603
 #, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:611
 msgid "Meeting - %s"
 msgstr "����� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
 #, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:613
 msgid "Appointment - %s"
 msgstr "��������� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:619
 msgid "Assigned Task - %s"
 msgstr "������ ���� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:621
 msgid "Task - %s"
 msgstr "���� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:618
 #, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:626
 msgid "Memo - %s"
 msgstr "���� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:634
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "�� �����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:788
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "��� ������� ����?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:992
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "���� �� � ���� � ������ �����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:999
-msgid "Copy selected text to the clipboard"
-msgstr "���� �������� ����� � � �������"
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1464
+#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
+msgid "Copy the selection"
+msgstr "���� � ��������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-msgid "Cut selected text to the clipboard"
-msgstr "��� �������� ����� � � �������"
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1471
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:1045
+msgid "Cut the selection"
+msgstr "��� � ��������"
+
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1478
+#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+msgid "Delete the selection"
+msgstr "����� � ��������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1013
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "���� �� � �� ���� ��������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1020
-msgid "Paste text from the clipboard"
-msgstr "���� ����� ���� � �������"
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1513
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:1057
+msgid "Paste the clipboard"
+msgstr "���� � �������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1041
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "���� �� � ��� � ������ �����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1583
+#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "������ �� �����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1055
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "_������������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1069 ../mail/e-mail-browser.c:104
-#: ../shell/e-shell-window-actions.c:1634
-#: ../widgets/misc/e-signature-editor.c:214
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1632
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076
-#: ../shell/e-shell-window-actions.c:1641
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Help"
 msgstr "_����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "_�����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "_������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:118
-#: ../shell/e-shell-window-actions.c:1676
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1674 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "_��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
-#: ../composer/e-composer-actions.c:277
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "_��������..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
 msgstr "���� �� � ���� � ���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "_���������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "������ ���� � ������ ���������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "��� _���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "������ ���� � ��� ��� �� �������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "��_����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "������� �� ������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "_������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "������� �� ������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "_�����������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "������� �� �����������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "�_�� ����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "������ ���� � ��� ���� �� �������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1121
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1123
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "������ ���� � RSVP ���� �� �������"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "_������ ����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "������ ���� � ������ ���� �� �������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "_��� ����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "������ ���� � ������ ��� �� �������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1210
-#: ../composer/e-composer-private.c:68
+#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "������ _���������"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1683
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:477
 msgid "Attach"
 msgstr "����"
 
@@ -3585,37 +3653,57 @@ msgstr "����"
 msgid "Save"
 msgstr "���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2013
-#: ../calendar/gui/dialogs/comp-editor.c:2062
-#: ../calendar/gui/dialogs/comp-editor.c:2944
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2958
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "������ ��� � ��� ���� �� �� ��������� �� �� ����� ����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2912 ../mail/em-utils.c:361
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "��������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2974
+#: ../calendar/gui/dialogs/comp-editor.c:2988
 msgid "Unable to use current version!"
 msgstr "������ � �� ������ �����!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:64
+#: ../calendar/gui/dialogs/copy-source-dialog.c:91
 msgid "Could not open source"
 msgstr "��� ��� ���� ���"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:72
+#: ../calendar/gui/dialogs/copy-source-dialog.c:99
 msgid "Could not open destination"
 msgstr "��� ��� ���� ����������"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:81
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Destination is read only"
 msgstr "���������� �� ��� ����"
 
-#: ../calendar/gui/dialogs/delete-comp.c:205
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_����� ��� ���� ���� �� ��� ���������'� ���������?"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "_������� �������"
+
+#: ../calendar/gui/dialogs/delete-error.c:55
+msgid "The event could not be deleted due to a corba error"
+msgstr "� ����� ��� ��� �� ������� �� � � corba ��"
+
+#: ../calendar/gui/dialogs/delete-error.c:58
+msgid "The task could not be deleted due to a corba error"
+msgstr "� ���� ��� ��� �� ������� �� � � corba ��"
+
+#: ../calendar/gui/dialogs/delete-error.c:61
+msgid "The memo could not be deleted due to a corba error"
+msgstr "� ���� ��� ��� �� ������� �� � � corba ��"
+
+#: ../calendar/gui/dialogs/delete-error.c:64
+msgid "The item could not be deleted due to a corba error"
+msgstr "� ���� ��� ��� �� ������� �� � � corba ��"
+
 #: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "� ����� ��� ��� �� ������� ����� ������� ��� �����"
@@ -3648,132 +3736,146 @@ msgstr "ð�‘ž ð�‘¥ð�‘§ð�‘¥ð�‘´ ð�‘’ð�‘«ð�‘› ð�‘¯ð�‘ªð�‘‘ ð�‘šð�‘° ð�‘›ð�‘¦ð�‘¤ð�‘
 msgid "The item could not be deleted due to an error"
 msgstr "� ���� ��� ��� �� ������� �� � �� ��"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
 msgstr "��������..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "������� �:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
 msgstr "���� �������"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Alarms"
 msgstr "_�����"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Click here to set or unset alarms for this event"
 msgstr "���� �� � ��� � ����� ����� �� ��� �����"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Recurrence"
 msgstr "_�������"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Make this a recurring event"
 msgstr "��� ��� � ������ �����"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:219
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../plugins/groupwise-features/send-options.c:210
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "���� ������"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "����� ������� ���� ������"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:229
 msgid "All _Day Event"
 msgstr "�� _�� �����"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:231
 msgid "Toggles whether to have All Day Event"
 msgstr "������ ���� � ��� �� �� �����"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "Show Time as _Busy"
 msgstr "�� ��� �� _����"
 
-#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Toggles whether to show time as busy"
 msgstr "������ ���� � �� ��� �� ����"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:248
 msgid "_Free/Busy"
 msgstr "_���/����"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "Query free / busy information for the attendees"
 msgstr "���� ��� / ���� ��������� �� � �������"
 
-#: ../calendar/gui/dialogs/event-editor.c:292
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "�����_���"
 
-#: ../calendar/gui/dialogs/event-page.c:752
+#: ../calendar/gui/dialogs/event-page.c:751
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "����� ����� �� ������, ����� � �������� ������� �� ��� ����"
 
-#: ../calendar/gui/dialogs/event-page.c:756
+#: ../calendar/gui/dialogs/event-page.c:755
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "����� ����� �� ���� ������, ����� � � ��� � �������"
 
-#: ../calendar/gui/dialogs/event-page.c:768
-#: ../calendar/gui/dialogs/event-page.c:2691
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "��� ����� ��� �����"
 
-#: ../calendar/gui/dialogs/event-page.c:1070
+#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
+msgid "Or_ganizer:"
+msgstr "_�������:"
+
+#: ../calendar/gui/dialogs/event-page.c:877
+msgid "_Delegatees"
+msgstr "_���������"
+
+#: ../calendar/gui/dialogs/event-page.c:879
+msgid "Atte_ndees"
+msgstr "_�������"
+
+#: ../calendar/gui/dialogs/event-page.c:1094
 msgid "Event with no start date"
 msgstr "����� ��� �� ���� ���"
 
-#: ../calendar/gui/dialogs/event-page.c:1073
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no end date"
 msgstr "����� ��� �� ��� ���"
 
-#: ../calendar/gui/dialogs/event-page.c:1244
+#: ../calendar/gui/dialogs/event-page.c:1268
 #: ../calendar/gui/dialogs/memo-page.c:657
-#: ../calendar/gui/dialogs/task-page.c:836
+#: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "���� ��� �� ���"
 
-#: ../calendar/gui/dialogs/event-page.c:1254
+#: ../calendar/gui/dialogs/event-page.c:1278
 msgid "End date is wrong"
 msgstr "��� ��� �� ���"
 
-#: ../calendar/gui/dialogs/event-page.c:1277
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Start time is wrong"
 msgstr "���� ��� �� ���"
 
-#: ../calendar/gui/dialogs/event-page.c:1284
+#: ../calendar/gui/dialogs/event-page.c:1308
 msgid "End time is wrong"
 msgstr "��� ��� �� ���"
 
-#: ../calendar/gui/dialogs/event-page.c:1446
+#: ../calendar/gui/dialogs/event-page.c:1470
 #: ../calendar/gui/dialogs/memo-page.c:698
-#: ../calendar/gui/dialogs/task-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:921
 msgid "The organizer selected no longer has an account."
 msgstr "� ������� �������� �� ����� ��� �� �����."
 
-#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/event-page.c:1476
 #: ../calendar/gui/dialogs/memo-page.c:704
-#: ../calendar/gui/dialogs/task-page.c:902
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "�� ������� �� �������."
 
-#: ../calendar/gui/dialogs/event-page.c:1477
-#: ../calendar/gui/dialogs/task-page.c:926
+#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/task-page.c:951
 msgid "At least one attendee is required."
 msgstr "�� ���� ��� ������ �� �������."
 
-#: ../calendar/gui/dialogs/event-page.c:2564
 #, c-format
+#: ../calendar/gui/dialogs/event-page.c:2591
 msgid "Unable to open the calendar '%s'."
 msgstr "������ � ���� � ������� '%s'."
 
@@ -3783,108 +3885,110 @@ msgstr "������ � ���� � �����
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2608
-#: ../calendar/gui/dialogs/memo-page.c:913
-#: ../calendar/gui/dialogs/task-page.c:1720
 #, c-format
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:917
+#: ../calendar/gui/dialogs/task-page.c:1743
 msgid "You are acting on behalf of %s"
 msgstr "� � ����� �� ����� � %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2910
 #, c-format
+#: ../calendar/gui/dialogs/event-page.c:2937
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d �� ���� ���������"
 msgstr[1] "%d ��� ���� ���������"
 
-#: ../calendar/gui/dialogs/event-page.c:2916
 #, c-format
+#: ../calendar/gui/dialogs/event-page.c:2943
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d �� ���� ���������"
 msgstr[1] "%d ��� ���� ���������"
 
-#: ../calendar/gui/dialogs/event-page.c:2922
 #, c-format
+#: ../calendar/gui/dialogs/event-page.c:2949
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d ����� ���� ���������"
 msgstr[1] "%d ������ ���� ���������"
 
-#: ../calendar/gui/dialogs/event-page.c:2935
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "��������"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid ""
-"15 minutes before appointment\n"
-"1 hour before appointment\n"
-"1 day before appointment"
-msgstr ""
-"15 ������ ���� ���������\n"
-"1 �� ���� ���������\n"
-"1 �� ���� ���������"
+#. Translators: "None" for "No alarm set"
+#: ../calendar/gui/dialogs/event-page.c:2964
+msgctxt "cal-alarms"
+msgid "None"
+msgstr "���"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+msgid "1 day before appointment"
+msgstr "1 �� ���� ���������"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgid "1 hour before appointment"
+msgstr "1 �� ���� ���������"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+msgid "15 minutes before appointment"
+msgstr "15 ������ ���� ���������"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "_�������..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "�������"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "������ ����:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "����� ����������"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
-msgid "Su_mmary:"
-msgstr "��_���:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "_����"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_����������:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:363
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_�������:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_�����:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "_���:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:166 ../mail/mail-dialogs.glade.h:21
-#: ../smime/gui/smime-ui.glade.h:49
-msgid ""
-"a\n"
-"b"
-msgstr ""
-"�\n"
-"�"
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgid "for"
+msgstr "��"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid ""
-"for\n"
-"until"
-msgstr ""
-"��\n"
-"�����"
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+msgid "until"
+msgstr "�����"
 
-#: ../calendar/gui/dialogs/memo-editor.c:110 ../calendar/gui/print.c:2535
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2583
 msgid "Memo"
 msgstr "����"
 
@@ -3896,80 +4000,89 @@ msgstr "���� ����� �� ������,
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "���� ����� �� ���� ������, ����� � � ��� � �������"
 
-#: ../calendar/gui/dialogs/memo-page.c:874
 #, c-format
+#: ../calendar/gui/dialogs/memo-page.c:878
 msgid "Unable to open memos in '%s'."
 msgstr "������ � ���� ����� �� '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1041 ../em-format/em-format-quote.c:224
-#: ../em-format/em-format.c:961 ../mail/em-format-html.c:2185
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2268
+#: ../calendar/gui/dialogs/memo-page.c:1045 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "�"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
 msgstr "��_�� ���:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "��_���:"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_�:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
 #: ../calendar/gui/dialogs/task-page.c:380
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_����:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
+#: ../calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "� � �������� � ������ �����. ��� ��� � ��� � ������?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
+#: ../calendar/gui/dialogs/recur-comp.c:56
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "� � ��������� � ������ �����. ��� ��� � ��� � �������?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
+#: ../calendar/gui/dialogs/recur-comp.c:60
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "� � �������� � ������ ����. ��� ��� � ��� � ������?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
+#: ../calendar/gui/dialogs/recur-comp.c:64
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "� � �������� � ������ ����. ��� ��� � ��� � ������?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "��� ������� ����"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "��� � ���� ���������"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "��� � ���� ���������"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "�� ���������"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:560
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "��� ��������� ������� ���������� ��� ·�������� ����� ����."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "������� ��� �� �������"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "��� ��� � � ������� ��� ���� �����'� ����"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:958
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "��"
 
@@ -3977,7 +4090,7 @@ msgstr "��"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "����"
 
@@ -3986,7 +4099,7 @@ msgstr "����"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1021
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "������"
 
@@ -3994,7 +4107,7 @@ msgstr "������"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "���"
 
@@ -4002,7 +4115,7 @@ msgstr "���"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "���"
 
@@ -4010,7 +4123,7 @@ msgstr "���"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "����"
 
@@ -4018,13 +4131,13 @@ msgstr "����"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1065
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "��� ���"
 
@@ -4032,7 +4145,7 @@ msgstr "��� ���"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1071
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1st � 10th"
 
@@ -4040,7 +4153,7 @@ msgstr "1st � 10th"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1077
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11th � 20th"
 
@@ -4048,21 +4161,21 @@ msgstr "11th � 20th"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "21st � 31st"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "��"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1237
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "�� �"
 
@@ -4070,80 +4183,63 @@ msgstr "�� �"
 msgid "occurrences"
 msgstr "��������"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2117
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "�� ��������"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2158
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "��� ��� ��� � �������� � ������."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2164
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "������ ��������"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2208
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "��� ��� ��� � �������� � �����."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2347
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "���/���"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>���������</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
-msgid "<b>Preview</b>"
-msgstr "<b>�����</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Recurrence</b>"
-msgstr "<b>�������</b>"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
 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:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+msgid "Exceptions"
+msgstr "���������"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:85
+msgid "Preview"
+msgstr "�����"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
 msgstr "��� ��������� �����"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid ""
-"day(s)\n"
-"week(s)\n"
-"month(s)\n"
-"year(s)"
-msgstr ""
-"��(�)\n"
-"���(�)\n"
-"����(�)\n"
-"��(�)"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
-msgid ""
-"for\n"
-"until\n"
-"forever"
-msgstr ""
-"��\n"
-"�����\n"
-"�����"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+msgid "forever"
+msgstr "�����"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgid "month(s)"
+msgstr "����(�)"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgid "week(s)"
+msgstr "���(�)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+msgid "year(s)"
+msgstr "��(�)"
+
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "���� �� ����� ��� ��� �����"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "������ �� ������� _����"
 
@@ -4152,81 +4248,127 @@ msgstr "������ �� ������� _��
 msgid "Completed date is wrong"
 msgstr "��������� ��� �� ���"
 
-#: ../calendar/gui/dialogs/task-details-page.c:484
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "��� ���"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">����������</span>"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2663 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
+msgid "Completed"
+msgstr "���������"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">������</span>"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1125 ../widgets/misc/e-send-options.ui.h:8
+msgid "High"
+msgstr "��"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-"Undefined"
-msgstr ""
-"��\n"
-"�����\n"
-"��\n"
-"��������"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:289
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2660
+msgid "In Progress"
+msgstr "�� �������"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Canceled"
-msgstr ""
-"��� ������\n"
-"�� �������\n"
-"���������\n"
-"�������"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:9
+msgid "Low"
+msgstr "��"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1124
+#: ../widgets/misc/e-send-options.ui.h:13
+msgid "Normal"
+msgstr "�����"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2657 ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "��� ������"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
-msgstr "�_����� �������:"
+msgstr "�_����� �������:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 msgid "Stat_us:"
 msgstr "����_��:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/dialogs/task-details-page.ui.h:18
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:1759
+#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "������"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:24
+msgid "Undefined"
+msgstr "��������"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "_��� ���������:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "_��������:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "_��� ���:"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "_������ ������"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "Click to change or view the status details of the task"
 msgstr "���� � ���� � �� � ������ ������ � � ����"
 
-#: ../calendar/gui/dialogs/task-editor.c:123
-#: ../plugins/groupwise-features/mail-send-options.c:198
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "_���� ������"
 
-#: ../calendar/gui/dialogs/task-editor.c:335
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "_Task"
 msgstr "_����"
 
-#: ../calendar/gui/dialogs/task-editor.c:338
+#: ../calendar/gui/dialogs/task-editor.c:325
 msgid "Task Details"
 msgstr "���� ������"
 
@@ -4238,34 +4380,43 @@ msgstr "���� ����� �� ������,
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "���� ����� �� ���� ������, ����� � � ��� � �������"
 
-#: ../calendar/gui/dialogs/task-page.c:809
+#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.ui.h:4
+msgid "Organi_zer:"
+msgstr "_�������:"
+
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "�� ��� �� ���"
 
-#: ../calendar/gui/dialogs/task-page.c:1677
 #, c-format
+#: ../calendar/gui/dialogs/task-page.c:1700
 msgid "Unable to open tasks in '%s'."
 msgstr "������ � ���� ����� �� '%s'."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:2
+msgid "Categor_ies..."
+msgstr "_���������..."
+
+#: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "�_� ���:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:7
 msgid "Time zone:"
 msgstr "��� ���:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
+#: ../calendar/gui/e-alarm-list.c:394
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d ��"
 msgstr[1] "%d ���"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
+#: ../calendar/gui/e-alarm-list.c:400
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d ���"
@@ -4277,345 +4428,192 @@ msgstr "���� ����� � �� �����
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
+#: ../calendar/gui/e-alarm-list.c:476
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s ���� � ���� � � ���������"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
+#: ../calendar/gui/e-alarm-list.c:481
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s ���� � ���� � � ���������"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
+#: ../calendar/gui/e-alarm-list.c:488
 msgid "%s at the start of the appointment"
 msgstr "%s �� � ���� � � ���������"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
+#: ../calendar/gui/e-alarm-list.c:499
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s ���� � ��� � � ���������"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
+#: ../calendar/gui/e-alarm-list.c:504
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s ���� � ��� � � ���������"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
+#: ../calendar/gui/e-alarm-list.c:511
 msgid "%s at the end of the appointment"
 msgstr "%s �� � ��� � � ���������"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:535
 #, c-format
+#: ../calendar/gui/e-alarm-list.c:535
 msgid "%s at %s"
 msgstr "%s �� %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
+#: ../calendar/gui/e-alarm-list.c:543
 msgid "%s for an unknown trigger type"
 msgstr "%s �� �� ���� ����� ���"
 
-#: ../calendar/gui/e-cal-component-preview.c:116
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+msgid "Untitled"
+msgstr "��������"
+
+#: ../calendar/gui/e-cal-component-preview.c:198
 msgid "Categories:"
 msgstr "���������:"
 
-#: ../calendar/gui/e-cal-component-preview.c:151
-#: ../calendar/gui/e-itip-control.c:1163
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "�����:"
 
-#: ../calendar/gui/e-cal-component-preview.c:158
-#: ../calendar/gui/e-cal-component-preview.c:169
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:259
 msgid "Start Date:"
 msgstr "���� ���:"
 
-#: ../calendar/gui/e-cal-component-preview.c:180
+#: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Due Date:"
 msgstr "�� ���:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:191
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-view.c:1053
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "������:"
 
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:731
-#: ../calendar/gui/e-cal-model-tasks.c:808
-#: ../calendar/gui/e-calendar-table.c:220
-#: ../calendar/gui/e-calendar-table.c:231
-#: ../calendar/gui/e-calendar-table.c:798 ../calendar/gui/print.c:2608
-msgid "In Progress"
-msgstr "�� �������"
-
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/e-cal-component-preview.c:198
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:733
-#: ../calendar/gui/e-calendar-table.c:222
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:799 ../calendar/gui/e-itip-control.c:948
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/print.c:2611 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:360
-msgid "Completed"
-msgstr "���������"
-
-#: ../calendar/gui/e-cal-component-preview.c:205
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:729
-#: ../calendar/gui/e-calendar-table.c:218
-#: ../calendar/gui/e-calendar-table.c:229
-#: ../calendar/gui/e-calendar-table.c:797 ../calendar/gui/print.c:2605
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "��� ������"
-
-#: ../calendar/gui/e-cal-component-preview.c:216
+#: ../calendar/gui/e-cal-component-preview.c:312
 msgid "Priority:"
 msgstr "��������:"
 
-#: ../calendar/gui/e-cal-component-preview.c:218
-#: ../calendar/gui/e-calendar-table.c:724 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1081
-msgid "High"
-msgstr "��"
-
-#: ../calendar/gui/e-cal-component-preview.c:220
-#: ../calendar/gui/e-cal-model.c:1274 ../calendar/gui/e-calendar-table.c:725
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1080
-msgid "Normal"
-msgstr "�����"
-
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-calendar-table.c:726 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1079
-msgid "Low"
-msgstr "��"
-
-#: ../calendar/gui/e-cal-component-preview.c:239
-#: ../calendar/gui/e-itip-control.c:1219
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:64
+#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:35
 msgid "Description:"
 msgstr "����������:"
 
-#: ../calendar/gui/e-cal-component-preview.c:263
+#: ../calendar/gui/e-cal-component-preview.c:368
 msgid "Web Page:"
 msgstr "��� ���:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Created"
 msgstr "�������"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "��� ���"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "���� �������"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "���� ���"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:776
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "���"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:777
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "����"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+"The geographical position must be entered in the format: "
+"\n\n45.436845,125.862501"
 msgstr ""
-"� ����������� ������� ���� �� ����� �� � �����: \n"
-"\n"
-"45.436845,125.862501"
+"� ����������� ������� ���� �� ����� �� � �����: \n\n45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1280
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:709
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "���"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "���"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1280
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "��"
 
-#: ../calendar/gui/e-cal-model.c:362 ../calendar/gui/gnome-cal.c:522
-#: ../shell/e-shell.c:720
-msgid "Shell Settings"
-msgstr "��� ������"
-
-#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:523
-#: ../shell/e-shell.c:721
-msgid "Application-wide settings"
-msgstr "���������-��� ������"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:528 ../calendar/gui/e-itip-control.c:1204
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:977
-#: ../calendar/gui/print.c:994 ../e-util/e-charset.c:52
-#: ../mail/em-utils.c:1226 ../plugins/itip-formatter/itip-formatter.c:459
-#: ../plugins/itip-formatter/itip-formatter.c:2251
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "����"
 
-#: ../calendar/gui/e-cal-model.c:1276
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "������"
 
-#: ../calendar/gui/e-cal-model.c:1278
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "������"
 
-#: ../calendar/gui/e-calendar-table.c:337 ../calendar/gui/e-memo-table.c:270
-msgid "* No Summary *"
-msgstr "* �� ����� *"
-
-#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:1743 ../calendar/gui/e-memo-table.c:306
 #, c-format
-msgid "Organizer: %s <%s>"
-msgstr "�������: %s <%s>"
-
-#. With SunOne accounts, there may be no ':' in organiser.value
-#. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:1747 ../calendar/gui/e-memo-table.c:309
-#, c-format
-msgid "Organizer: %s"
-msgstr "�������: %s"
-
-#: ../calendar/gui/e-calendar-table.c:415 ../calendar/gui/e-memo-table.c:348
-msgid "Start: "
-msgstr "����: "
-
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/e-memo-table.c:366
-msgid "Due: "
-msgstr "��: "
-
-#: ../calendar/gui/e-calendar-table.c:727 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "��������"
-
-#: ../calendar/gui/e-calendar-table.c:746
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-calendar-table.c:747
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-calendar-table.c:748
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-calendar-table.c:749
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-calendar-table.c:750
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-calendar-table.c:751
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-calendar-table.c:752
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-calendar-table.c:753
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-calendar-table.c:754
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-calendar-table.c:755
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-calendar-table.c:756
-msgid "100%"
-msgstr "100%"
-
-#: ../calendar/gui/e-calendar-table.c:864 ../calendar/gui/print.c:2009
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:424
-#: ../modules/calendar/e-task-shell-view-actions.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:301
-#: ../modules/calendar/e-task-shell-view.c:426
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:564
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "�����"
-
-#: ../calendar/gui/e-calendar-table.c:1108
-#: ../calendar/gui/e-calendar-view.c:610 ../calendar/gui/e-memo-table.c:894
-msgid "Deleting selected objects"
-msgstr "������� �������� �������"
-
-#: ../calendar/gui/e-calendar-table.c:1403
-#: ../calendar/gui/e-calendar-view.c:828 ../calendar/gui/e-memo-table.c:1118
-msgid "Updating objects"
-msgstr "������� �������"
+#: ../calendar/gui/e-cal-model.c:2141
+msgid "Opening %s"
+msgstr "������ %s"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
+#: ../calendar/gui/e-calendar-table.etspec.h:2
 msgid "% Complete"
 msgstr "% �������"
 
@@ -4636,7 +4634,8 @@ msgid "Due date"
 msgstr "�� ���"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:20 ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Priority"
 msgstr "��������"
 
@@ -4644,100 +4643,127 @@ msgstr "��������"
 msgid "Start date"
 msgstr "���� ���"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1651
-#: ../calendar/gui/e-meeting-list-view.c:598
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "������"
-
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-list-view.c:566
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:557
 msgid "Type"
 msgstr "���"
 
-#: ../calendar/gui/e-calendar-view.c:1598
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:404
+msgid "Cut selected events to the clipboard"
+msgstr "��� �������� ������ � � �������"
+
+#: ../calendar/gui/e-calendar-view.c:410
+msgid "Copy selected events to the clipboard"
+msgstr "���� �������� ������ � � �������"
+
+#: ../calendar/gui/e-calendar-view.c:416
+msgid "Paste events from the clipboard"
+msgstr "���� ������ ���� � �������"
+
+#: ../calendar/gui/e-calendar-view.c:422
+msgid "Delete selected events"
+msgstr "����� �������� ������"
+
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
+msgid "Deleting selected objects"
+msgstr "������� �������� �������"
+
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
+msgid "Updating objects"
+msgstr "������� �������"
+
+#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2239
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2330
 msgid "Accepted"
 msgstr "��������"
 
-#: ../calendar/gui/e-calendar-view.c:1599
-#: ../calendar/gui/e-itip-control.c:1200
+#: ../calendar/gui/e-calendar-view.c:1707
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2245
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2336
 msgid "Declined"
 msgstr "�������"
 
-#: ../calendar/gui/e-calendar-view.c:1600
+#: ../calendar/gui/e-calendar-view.c:1708
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "��������"
 
-#: ../calendar/gui/e-calendar-view.c:1601
+#: ../calendar/gui/e-calendar-view.c:1709
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2248
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "Delegated"
 msgstr "���������"
 
-#: ../calendar/gui/e-calendar-view.c:1602
+#: ../calendar/gui/e-calendar-view.c:1710
 msgid "Needs action"
 msgstr "���� �����"
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
+#, c-format
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
+msgid "Organizer: %s <%s>"
+msgstr "�������: %s <%s>"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
+#, c-format
+#: ../calendar/gui/e-calendar-view.c:1856 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
+msgid "Organizer: %s"
+msgstr "�������: %s"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1763 ../calendar/gui/print.c:2567
 #, c-format
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/print.c:2615
 msgid "Location: %s"
 msgstr "�������: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1794
 #, c-format
+#: ../calendar/gui/e-calendar-view.c:1903
 msgid "Time: %s %s"
 msgstr "���: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:162
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:165
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:173
 #, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"%s"
-msgstr ""
-"� ��� ���� �� ����� �� � �����: \n"
-"%s"
+#: ../calendar/gui/e-cell-date-edit-text.c:171
+msgid "The date must be entered in the format: \n%s"
+msgstr "� ��� ���� �� ����� �� � �����: \n%s"
 
 #. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:760
 #, c-format
+#: ../calendar/gui/e-day-view-time-item.c:759
 msgid "%02i minute divisions"
 msgstr "%02i ����� ��������"
 
-#: ../calendar/gui/e-day-view-time-item.c:781
+#: ../calendar/gui/e-day-view-time-item.c:780
 msgid "Show the second time zone"
 msgstr "�� � ������ ��� ���"
 
@@ -4747,8 +4773,8 @@ msgstr "�� � ������ ��� ���"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:870 ../calendar/gui/e-day-view.c:1887
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1701
+#: ../calendar/gui/e-day-view-top-item.c:865 ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4758,10 +4784,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:874 ../calendar/gui/e-day-view.c:1904
+#: ../calendar/gui/e-day-view-top-item.c:869 ../calendar/gui/e-day-view.c:1896
 #: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:189
-#: ../modules/calendar/e-cal-shell-view-private.c:881
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:913
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4770,406 +4796,452 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:878 ../calendar/gui/e-day-view.c:1920
+#: ../calendar/gui/e-day-view-top-item.c:873 ../calendar/gui/e-day-view.c:1912
 #: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../modules/calendar/e-cal-shell-view-private.c:917
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../modules/calendar/e-cal-shell-view-private.c:949
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:750
-#: ../calendar/gui/print.c:824
+#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
+#: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1126 ../calendar/gui/e-week-view.c:753
-#: ../calendar/gui/print.c:826
+#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
+#: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2625
 #, c-format
+#: ../calendar/gui/e-day-view.c:2609
 msgid "Week %d"
 msgstr "��� %d"
 
-#: ../calendar/gui/e-itip-control.c:767
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "������:"
+
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "���. (�������� �������)"
 
-#: ../calendar/gui/e-itip-control.c:784
 #, c-format
+#: ../calendar/gui/e-itip-control.c:782
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "���� ��"
 msgstr[1] "���� %d ���"
 
-#: ../calendar/gui/e-itip-control.c:797
 #, c-format
+#: ../calendar/gui/e-itip-control.c:795
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "���� ���"
 msgstr[1] "���� %d ����"
 
-#: ../calendar/gui/e-itip-control.c:804
 #, c-format
+#: ../calendar/gui/e-itip-control.c:802
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "���� ��� �� "
 msgstr[1] "���� %d ���� �� "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " � "
 
-#: ../calendar/gui/e-itip-control.c:824
 #, c-format
+#: ../calendar/gui/e-itip-control.c:822
 msgid "The %s day of "
 msgstr "� %s �� � "
 
-#: ../calendar/gui/e-itip-control.c:840
 #, c-format
+#: ../calendar/gui/e-itip-control.c:838
 msgid "The %s %s of "
 msgstr "� %s %s � "
 
-#: ../calendar/gui/e-itip-control.c:851
 #, c-format
+#: ../calendar/gui/e-itip-control.c:849
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "���� ����"
 msgstr[1] "���� %d �����"
 
-#: ../calendar/gui/e-itip-control.c:863
 #, c-format
+#: ../calendar/gui/e-itip-control.c:861
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "���� ��"
 msgstr[1] "���� %d ���"
 
-#: ../calendar/gui/e-itip-control.c:876
 #, c-format
+#: ../calendar/gui/e-itip-control.c:874
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
 msgstr[0] "� ����� � %d ���"
 msgstr[1] "� ����� � %d ����"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:887
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", ����� �� "
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:909
+#: ../calendar/gui/e-itip-control.c:906
 msgid "Starts"
 msgstr "�����"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:923
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "����"
 
-#: ../calendar/gui/e-itip-control.c:963
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-itip-control.c:943
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
 msgstr "��"
 
-#: ../calendar/gui/e-itip-control.c:1093 ../calendar/gui/e-itip-control.c:1109
-#: ../calendar/gui/e-itip-control.c:1120 ../calendar/gui/e-itip-control.c:1137
-#: ../plugins/itip-formatter/itip-view.c:346
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:434
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
-#: ../plugins/itip-formatter/itip-view.c:523
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
+msgid "iCalendar Information"
+msgstr "iCalendar ���������"
+
+#. Title
+#: ../calendar/gui/e-itip-control.c:1008
+msgid "iCalendar Error"
+msgstr "iCalendar ��"
+
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "�� ���� �����"
 
-#: ../calendar/gui/e-itip-control.c:1196
-#: ../plugins/itip-formatter/itip-formatter.c:2242
+#: ../calendar/gui/e-itip-control.c:1145
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr "���� ���� � ������ ���������, � ��� ������ �� ����� ���� � ���� ����."
+
+#. Translators: "None" used as a default value for events without Summary received by mail
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2317
+msgctxt "cal-itip"
+msgid "None"
+msgstr "���"
+
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2333
 msgid "Tentatively Accepted"
 msgstr "���������� ��������"
 
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
+"The meeting has been canceled, however it could not be found in your calendars"
 msgstr "� ����� ��� ��� �������, ����� �� ��� ��� �� ���� �� �� ��������"
 
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "� ���� ��� ��� �������, ����� �� ��� ��� �� ���� �� �� ���� �����"
 
-#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> ��� ������� ����� ���������."
+#: ../calendar/gui/e-itip-control.c:1369
+msgid "%s has published meeting information."
+msgstr "%s ��� ������� ����� ���������."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "����� ���������"
 
-#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> �������� � ������� � %s �� � �����."
+#: ../calendar/gui/e-itip-control.c:1376
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s �������� � ������� � %s �� � �����."
 
-#: ../calendar/gui/e-itip-control.c:1371
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> �������� �� ������� �� � �����."
+#: ../calendar/gui/e-itip-control.c:1378
+msgid "%s requests your presence at a meeting."
+msgstr "%s �������� �� ������� �� � �����."
 
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "����� ��������"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> ����� � �� ���� � �� �������� �����."
+#: ../calendar/gui/e-itip-control.c:1385
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s ����� � �� ���� � �� �������� �����."
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "����� �����"
 
-#: ../calendar/gui/e-itip-control.c:1383
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> ����� � ����� � ������ ����� ���������."
+#: ../calendar/gui/e-itip-control.c:1390
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s ����� � ����� � ������ ����� ���������."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "����� ����� �������"
 
-#: ../calendar/gui/e-itip-control.c:1391
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> ��� ������ � � ����� �������."
+#: ../calendar/gui/e-itip-control.c:1398
+msgid "%s has replied to a meeting request."
+msgstr "%s ��� ������ � � ����� �������."
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "����� �����"
 
-#: ../calendar/gui/e-itip-control.c:1399
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> ��� ������� � �����."
+#: ../calendar/gui/e-itip-control.c:1406
+msgid "%s has canceled a meeting."
+msgstr "%s ��� ������� � �����."
+
+#, fuzzy
+#: ../calendar/gui/e-itip-control.c:1407
+msgid "Meeting Cancelation"
+msgstr "����� Cancelation"
 
-#: ../calendar/gui/e-itip-control.c:1410 ../calendar/gui/e-itip-control.c:1487
-#: ../calendar/gui/e-itip-control.c:1527
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> ��� ���� �� ������������� �����."
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
+msgid "%s has sent an unintelligible message."
+msgstr "%s ��� ���� �� ������������� �����."
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "��� ����� �����"
 
-#: ../calendar/gui/e-itip-control.c:1438
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> ��� ������� ���� ���������."
+#: ../calendar/gui/e-itip-control.c:1445
+msgid "%s has published task information."
+msgstr "%s ��� ������� ���� ���������."
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "���� ���������"
 
-#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> �������� %s � ����� � ����."
+#: ../calendar/gui/e-itip-control.c:1453
+msgid "%s requests %s to perform a task."
+msgstr "%s �������� %s � ����� � ����."
 
-#: ../calendar/gui/e-itip-control.c:1448
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> �������� � ����� � ����."
+#: ../calendar/gui/e-itip-control.c:1455
+msgid "%s requests you perform a task."
+msgstr "%s �������� � ����� � ����."
 
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "���� ��������"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> ����� � �� ���� � �� �������� ����."
+#: ../calendar/gui/e-itip-control.c:1462
+msgid "%s wishes to be added to an existing task."
+msgstr "%s ����� � �� ���� � �� �������� ����."
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "���� �����"
 
-#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> ����� � ����� � ������ ���� ���������."
+#: ../calendar/gui/e-itip-control.c:1467
+msgid "%s wishes to receive the latest task information."
+msgstr "%s ����� � ����� � ������ ���� ���������."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "���� ����� �������"
 
-#: ../calendar/gui/e-itip-control.c:1468
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> ��� ������ � � ���� ��������."
+#: ../calendar/gui/e-itip-control.c:1475
+msgid "%s has replied to a task assignment."
+msgstr "%s ��� ������ � � ���� ��������."
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "���� �����"
 
-#: ../calendar/gui/e-itip-control.c:1476
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> ��� ������� � ����."
+#: ../calendar/gui/e-itip-control.c:1483
+msgid "%s has canceled a task."
+msgstr "%s ��� ������� � ����."
+
+#, fuzzy
+#: ../calendar/gui/e-itip-control.c:1484
+msgid "Task Cancelation"
+msgstr "���� Cancelation"
 
-#: ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "��� ���� �����"
 
-#: ../calendar/gui/e-itip-control.c:1512
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> ��� ������� ���/���� ���������."
+#: ../calendar/gui/e-itip-control.c:1519
+msgid "%s has published free/busy information."
+msgstr "%s ��� ������� ���/���� ���������."
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "���/���� ���������"
 
-#: ../calendar/gui/e-itip-control.c:1517
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> �������� �� ���/���� ���������."
+#: ../calendar/gui/e-itip-control.c:1524
+msgid "%s requests your free/busy information."
+msgstr "%s �������� �� ���/���� ���������."
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
-msgstr "���/���� �������"
+msgstr "���/���� �������"
 
-#: ../calendar/gui/e-itip-control.c:1522
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> ��� ������ � � ���/���� �������."
+#: ../calendar/gui/e-itip-control.c:1529
+msgid "%s has replied to a free/busy request."
+msgstr "%s ��� ������ � � ���/���� �������."
 
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
-msgstr "���/���� �����"
+msgstr "���/���� �����"
 
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
-msgstr "��� ���/���� �����"
+msgstr "��� ���/���� �����"
 
-#: ../calendar/gui/e-itip-control.c:1604
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "� ����� ��� ��� ��� � �� ������� ����"
 
-#: ../calendar/gui/e-itip-control.c:1663
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "� ����� ������� ���� ��������� ��������."
 
-#: ../calendar/gui/e-itip-control.c:1696
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "� �������� ��� ��� ������ � ����� ������� �����"
 
-#: ../calendar/gui/e-itip-control.c:1976
+#, fuzzy
+#: ../calendar/gui/e-itip-control.c:1741
+msgid "The attachment has no viewable calendar items"
+msgstr "� �������� ��� �� viewable ������� �����"
+
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "����� �������\n"
 
-#: ../calendar/gui/e-itip-control.c:2010
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "������ �� ������� � ����� �� �������\n"
 
-#: ../calendar/gui/e-itip-control.c:2027
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "��� ������� �� ��� ���� � ������ ������.  �� �� �� ������?"
 
-#: ../calendar/gui/e-itip-control.c:2045
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "������ ������ ��� ��� �� ������� ����� � �� ������� ������!\n"
 
-#: ../calendar/gui/e-itip-control.c:2069
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "������ ������ �������\n"
 
-#: ../calendar/gui/e-itip-control.c:2076
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../calendar/gui/e-itip-control.c:2084
+#: ../plugins/itip-formatter/itip-formatter.c:1420
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "������ ������ ��� ��� �� ������� ����� � ���� �� ����� �������"
 
-#: ../calendar/gui/e-itip-control.c:2107 ../calendar/gui/e-itip-control.c:2164
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "���� ����!\n"
 
-#: ../calendar/gui/e-itip-control.c:2113 ../calendar/gui/e-itip-control.c:2172
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "� ���� ��� ��� �� ����!\n"
 
-#: ../calendar/gui/e-itip-control.c:2290
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "��� �� �����:"
 
-#: ../calendar/gui/e-itip-control.c:2359
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "�����"
 
-#: ../calendar/gui/e-itip-control.c:2383
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "������"
 
-#: ../calendar/gui/e-itip-control.c:2384
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "���������� ������"
 
-#: ../calendar/gui/e-itip-control.c:2385
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "������"
 
-#: ../calendar/gui/e-itip-control.c:2410
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
-msgstr "���� ���/���� ���������"
+msgstr "���� ���/���� ���������"
 
-#: ../calendar/gui/e-itip-control.c:2434
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "����� ���������� ������"
 
-#: ../calendar/gui/e-itip-control.c:2458
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "���� ������ ���������"
 
-#: ../calendar/gui/e-itip-control.c:2482
-#: ../modules/mail/e-mail-shell-view-actions.c:1214
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:970
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "������"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.ui.h:1
 msgid "--to--"
 msgstr "--�--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.ui.h:2
 msgid "Calendar Message"
 msgstr "������� �����"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.ui.h:3
 msgid "Date:"
 msgstr "���:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.ui.h:5
 msgid "Loading Calendar"
 msgstr "����� �������"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
 msgstr "����� �������..."
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.ui.h:7
 msgid "Organizer:"
 msgstr "�������:"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.ui.h:8
 msgid "Server Message:"
 msgstr "���� �����:"
 
@@ -5190,72 +5262,72 @@ msgid "Resources"
 msgstr "�������"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:973
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "����������"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/print.c:974 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "����"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/print.c:975
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "�����"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../calendar/gui/print.c:976
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
+#: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "���"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:990
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "��"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:991
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "������� �����������"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/print.c:992
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "������� �����������"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/print.c:993
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "���-�����������"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "���� �����"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:541
+#: ../calendar/gui/e-meeting-list-view.c:546
 msgid "Attendee                          "
 msgstr "������                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2272
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -5264,7 +5336,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:462
-#: ../calendar/gui/e-meeting-time-sel.c:2303
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -5274,51 +5346,64 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "�� � ����"
 
-#: ../calendar/gui/e-meeting-time-sel.c:546
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "�� ���������"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "�_�����"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "�� _���� ����� ���"
 
-#: ../calendar/gui/e-meeting-time-sel.c:609
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "�� _���� ��"
 
-#: ../calendar/gui/e-meeting-time-sel.c:624
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "_����� ���/����"
 
-#: ../calendar/gui/e-meeting-time-sel.c:689
+#: ../calendar/gui/e-meeting-time-sel.c:659
+msgid "_<<"
+msgstr "_<<"
+
+#, fuzzy
+#: ../calendar/gui/e-meeting-time-sel.c:677
+msgid "_Autopick"
+msgstr "_Autopick"
+
+#: ../calendar/gui/e-meeting-time-sel.c:692
+msgid ">_>"
+msgstr ">_>"
+
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_�� ����� � �������"
 
-#: ../calendar/gui/e-meeting-time-sel.c:698
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "�� _����� � ��� �����"
 
-#: ../calendar/gui/e-meeting-time-sel.c:707
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "_������� �����"
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "������� ����� � _��� �����"
 
-#: ../calendar/gui/e-meeting-time-sel.c:762
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "_���� ���:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:799
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "_��� ���:"
 
@@ -5346,79 +5431,167 @@ msgstr "�������"
 msgid "Member"
 msgstr "�����"
 
-#: ../calendar/gui/e-memo-table.c:647
-#: ../modules/calendar/e-cal-shell-content.c:453
-#: ../modules/calendar/e-memo-shell-view-actions.c:253
-#: ../modules/calendar/e-memo-shell-view-actions.c:270
-#: ../modules/calendar/e-memo-shell-view.c:279
+#: ../calendar/gui/e-memo-table.c:411
+#: ../modules/calendar/e-cal-shell-content.c:465
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view.c:289
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "�����"
 
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
+msgid "* No Summary *"
+msgstr "* �� ����� *"
+
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
+msgid "Start: "
+msgstr "����: "
+
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
+msgid "Due: "
+msgstr "��: "
+
+#: ../calendar/gui/e-memo-table.c:709
+msgid "Cut selected memos to the clipboard"
+msgstr "��� �������� ����� � � �������"
+
+#: ../calendar/gui/e-memo-table.c:715
+msgid "Copy selected memos to the clipboard"
+msgstr "���� �������� ����� � � �������"
+
+#: ../calendar/gui/e-memo-table.c:721
+msgid "Paste memos from the clipboard"
+msgstr "���� ����� ���� � �������"
+
+#: ../calendar/gui/e-memo-table.c:727
+#: ../modules/calendar/e-memo-shell-view-actions.c:556
+msgid "Delete selected memos"
+msgstr "����� �������� �����"
+
+#: ../calendar/gui/e-memo-table.c:733
+msgid "Select all visible memos"
+msgstr "������ �� ������� �����"
+
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "���� � �� � ����"
 
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
+#, c-format
+#: ../calendar/gui/e-task-table.c:538
+msgid "%d%%"
+msgstr "%d%%"
+
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2043
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:427
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view.c:437
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "�����"
+
+#: ../calendar/gui/e-task-table.c:932
+msgid "Cut selected tasks to the clipboard"
+msgstr "��� �������� ����� � � �������"
+
+#: ../calendar/gui/e-task-table.c:938
+msgid "Copy selected tasks to the clipboard"
+msgstr "���� �������� ����� � � �������"
+
+#: ../calendar/gui/e-task-table.c:944
+msgid "Paste tasks from the clipboard"
+msgstr "���� ����� ���� � �������"
+
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:681
+msgid "Delete selected tasks"
+msgstr "����� �������� �����"
+
+#: ../calendar/gui/e-task-table.c:956
+msgid "Select all visible tasks"
+msgstr "������ �� ������� �����"
+
+#, fuzzy
+#: ../calendar/gui/e-timezone-entry.c:330
+msgid "Select Timezone"
+msgstr "������ Timezone"
+
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1682
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:263
+#: ../calendar/gui/ea-cal-view-event.c:276
 msgid "It has alarms."
 msgstr "�� ��� �����."
 
-#: ../calendar/gui/ea-cal-view-event.c:269
+#, fuzzy
+#: ../calendar/gui/ea-cal-view-event.c:279
+msgid "It has recurrences."
+msgstr "�� ��� recurrences."
+
+#: ../calendar/gui/ea-cal-view-event.c:282
 msgid "It is a meeting."
 msgstr "�� �� � �����."
 
-#: ../calendar/gui/ea-cal-view-event.c:275
 #, c-format
+#: ../calendar/gui/ea-cal-view-event.c:288
 msgid "Calendar Event: Summary is %s."
 msgstr "������� �����: ����� �� %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:277
+#: ../calendar/gui/ea-cal-view-event.c:290
 msgid "Calendar Event: It has no summary."
 msgstr "������� �����: �� ��� �� �����."
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:312
 msgid "calendar view event"
 msgstr "������� �� �����"
 
-#: ../calendar/gui/ea-cal-view-event.c:525
+#: ../calendar/gui/ea-cal-view-event.c:541
 msgid "Grab Focus"
 msgstr "���� �����"
 
-#: ../calendar/gui/ea-cal-view.c:298
+#: ../calendar/gui/ea-cal-view.c:300
 msgid "New Appointment"
 msgstr "�� ���������"
 
-#: ../calendar/gui/ea-cal-view.c:299
+#: ../calendar/gui/ea-cal-view.c:301
 msgid "New All Day Event"
 msgstr "�� �� �� �����"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:302
 msgid "New Meeting"
 msgstr "�� �����"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:303
 msgid "Go to Today"
 msgstr "�� � ����"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "Go to Date"
 msgstr "�� � ���"
 
-#: ../calendar/gui/ea-day-view-main-item.c:305
-#: ../calendar/gui/ea-week-view-main-item.c:302
+#: ../calendar/gui/ea-day-view-main-item.c:308
+#: ../calendar/gui/ea-week-view-main-item.c:340
 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."
-#: ../calendar/gui/ea-day-view.c:147 ../calendar/gui/ea-week-view.c:146
 #, c-format
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "�� ��� %d �����."
@@ -5426,80 +5599,80 @@ msgstr[1] "�� ��� %d ������."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:148
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 msgid "It has no events."
 msgstr "�� ��� �� ������."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:158
 #, c-format
+#: ../calendar/gui/ea-day-view.c:160
 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."
-#: ../calendar/gui/ea-day-view.c:164
 #, c-format
+#: ../calendar/gui/ea-day-view.c:166
 msgid "Day View: %s. %s"
 msgstr "�� ��: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:195
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "������� �� �� � ��� ���"
 
-#: ../calendar/gui/ea-day-view.c:197
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "������� �� �� ��� � �� ���"
 
-#: ../calendar/gui/ea-gnome-calendar.c:186
-#: ../modules/calendar/e-cal-shell-view-private.c:877
+#: ../calendar/gui/ea-gnome-calendar.c:46
+#: ../calendar/gui/ea-gnome-calendar.c:54
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "·���� �������"
+
+#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../modules/calendar/e-cal-shell-view-private.c:909
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:191
-#: ../calendar/gui/ea-gnome-calendar.c:196
-#: ../calendar/gui/ea-gnome-calendar.c:198
-#: ../modules/calendar/e-cal-shell-view-private.c:884
-#: ../modules/calendar/e-cal-shell-view-private.c:890
-#: ../modules/calendar/e-cal-shell-view-private.c:893
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:215
-#: ../calendar/gui/ea-gnome-calendar.c:221
-#: ../calendar/gui/ea-gnome-calendar.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:229
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:921
-#: ../modules/calendar/e-cal-shell-view-private.c:928
-#: ../modules/calendar/e-cal-shell-view-private.c:931
+#: ../calendar/gui/ea-gnome-calendar.c:226
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:240
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
-msgid "Gnome Calendar"
-msgstr "·���� �������"
-
-#: ../calendar/gui/ea-jump-button.c:146
+#: ../calendar/gui/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "���� �����"
 
-#: ../calendar/gui/ea-jump-button.c:155
+#: ../calendar/gui/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "���� ��, � ��� ���� �� ������."
 
-#: ../calendar/gui/ea-week-view.c:153
 #, c-format
+#: ../calendar/gui/ea-week-view.c:153
 msgid "Month View: %s. %s"
 msgstr "���� ��: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:157
 #, c-format
+#: ../calendar/gui/ea-week-view.c:157
 msgid "Week View: %s. %s"
 msgstr "��� ��: %s. %s"
 
@@ -5511,78 +5684,93 @@ msgstr "������� �� �� � ����"
 msgid "calendar view for one or more weeks"
 msgstr "������� �� �� ��� � �� ����"
 
-#: ../calendar/gui/gnome-cal.c:1945
-#, c-format
-msgid "Loading appointments at %s"
-msgstr "����� ���������� �� %s"
+#: ../calendar/gui/gnome-cal.c:2240
+msgid "Purging"
+msgstr "�����"
 
-#: ../calendar/gui/gnome-cal.c:2031
-#, c-format
-msgid "Opening %s"
-msgstr "������ %s"
+#: ../calendar/gui/goto-dialog.ui.h:1
+msgid "April"
+msgstr "·�����"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
-msgid ""
-"January\n"
-"February\n"
-"March\n"
-"April\n"
-"May\n"
-"June\n"
-"July\n"
-"August\n"
-"September\n"
-"October\n"
-"November\n"
-"December"
-msgstr ""
-"·�������\n"
-"·�������\n"
-"·���\n"
-"·�����\n"
-"·��\n"
-"·���\n"
-"·����\n"
-"·�����\n"
-"·��������\n"
-"·������\n"
-"·�������\n"
-"·�������"
-
-#: ../calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.ui.h:2
+msgid "August"
+msgstr "·�����"
+
+#: ../calendar/gui/goto-dialog.ui.h:3
+msgid "December"
+msgstr "·�������"
+
+#: ../calendar/gui/goto-dialog.ui.h:4
+msgid "February"
+msgstr "·��������"
+
+#: ../calendar/gui/goto-dialog.ui.h:5
+msgid "January"
+msgstr "·�������"
+
+#: ../calendar/gui/goto-dialog.ui.h:6
+msgid "July"
+msgstr "·����"
+
+#: ../calendar/gui/goto-dialog.ui.h:7
+msgid "June"
+msgstr "·���"
+
+#: ../calendar/gui/goto-dialog.ui.h:8
+msgid "March"
+msgstr "·���"
+
+#: ../calendar/gui/goto-dialog.ui.h:9
+msgid "May"
+msgstr "·��"
+
+#: ../calendar/gui/goto-dialog.ui.h:10
+msgid "November"
+msgstr "·�������"
+
+#: ../calendar/gui/goto-dialog.ui.h:11
+msgid "October"
+msgstr "·������"
+
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "������ ���"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
-msgid "_Select Today"
-msgstr "_������ ����"
+#: ../calendar/gui/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "Select _Today"
+msgstr "������ _����"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/goto-dialog.ui.h:14
+msgid "September"
+msgstr "·��������"
+
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "�� ������� ���� �� ���."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "�� ���� ��� ������ �� �������"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:780
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "����� ���������"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "���� ���������"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "���� ���������"
 
-#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "���/���� ���������"
 
-#: ../calendar/gui/itip-utils.c:642
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "������� ���������"
 
@@ -5590,7 +5778,7 @@ msgstr "������� ���������"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:676
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "��������"
@@ -5599,7 +5787,7 @@ msgstr "��������"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:683
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "���������� ��������"
@@ -5611,7 +5799,7 @@ msgstr "ð�‘‘ð�‘§ð�‘¯ð�‘‘ð�‘©ð�‘‘ð�‘¦ð�‘�ð�‘¤ð�‘° ð�‘¨ð�‘’ð�‘•ð�‘§ð�‘�ð�‘‘ð�‘©ð�‘
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:738
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "�������"
@@ -5620,7 +5808,7 @@ msgstr "�������"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:697
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "���������"
@@ -5628,7 +5816,7 @@ msgstr "���������"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:710
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "�������"
@@ -5636,7 +5824,7 @@ msgstr "�������"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:717
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "������"
@@ -5644,7 +5832,7 @@ msgstr "������"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:724
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "������"
@@ -5652,224 +5840,265 @@ msgstr "������"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:731
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "�����-��������"
 
-#: ../calendar/gui/itip-utils.c:801
 #, c-format
+#: ../calendar/gui/itip-utils.c:803
 msgid "Free/Busy information (%s to %s)"
 msgstr "���/���� ��������� (%s � %s)"
 
-#: ../calendar/gui/itip-utils.c:829
+#, fuzzy
+#: ../calendar/gui/itip-utils.c:811
+msgid "iCalendar information"
+msgstr "iCalendar ���������"
+
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "������ � ��� � �����, � �� ����� ������ ��� ��� ���."
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "������ � ��� � �����, ��: "
 
-#: ../calendar/gui/itip-utils.c:985
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "� ���� �� �� ������ � � �����."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "31st"
 msgstr "31st"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "��"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "�"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "�"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "�"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "�"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:594
+msgid "Fr"
+msgstr "�"
+
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "��"
 
-#: ../calendar/gui/print.c:2531
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2420
+msgid " to "
+msgstr " � "
+
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2428
+msgid " (Completed "
+msgstr " (��������� "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2432
+msgid "Completed "
+msgstr "��������� "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2440
+msgid " (Due "
+msgstr " (�� "
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2445
+msgid "Due "
+msgstr "�� "
+
+#: ../calendar/gui/print.c:2579
 msgid "Appointment"
 msgstr "���������"
 
-#: ../calendar/gui/print.c:2533
+#: ../calendar/gui/print.c:2581 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "����"
 
-#: ../calendar/gui/print.c:2558
 #, c-format
+#: ../calendar/gui/print.c:2606
 msgid "Summary: %s"
 msgstr "�����: %s"
 
-#: ../calendar/gui/print.c:2581
+#: ../calendar/gui/print.c:2630
 msgid "Attendees: "
 msgstr "�������: "
 
-#: ../calendar/gui/print.c:2621
 #, c-format
+#: ../calendar/gui/print.c:2673
 msgid "Status: %s"
 msgstr "������: %s"
 
-#: ../calendar/gui/print.c:2635
 #, c-format
+#: ../calendar/gui/print.c:2688
 msgid "Priority: %s"
 msgstr "��������: %s"
 
-#: ../calendar/gui/print.c:2650
 #, c-format
+#: ../calendar/gui/print.c:2706
 msgid "Percent Complete: %i"
 msgstr "������ �������: %i"
 
-#: ../calendar/gui/print.c:2661
 #, c-format
+#: ../calendar/gui/print.c:2717
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2674
 #, c-format
+#: ../calendar/gui/print.c:2730
 msgid "Categories: %s"
 msgstr "���������: %s"
 
-#: ../calendar/gui/print.c:2685
+#: ../calendar/gui/print.c:2741
 msgid "Contacts: "
 msgstr "��������: "
 
-#: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
+#: ../calendar/gui/tasktypes.xml.h:2
 msgid "% Completed"
 msgstr "% ���������"
 
@@ -5895,14 +6124,30 @@ msgstr "���������� � ������"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1747
+#: ../plugins/itip-formatter/itip-formatter.c:1832
 msgid "Opening calendar"
 msgstr "������ �������"
 
+#: ../calendar/importers/icalendar-importer.c:442
+msgid "iCalendar files (.ics)"
+msgstr "iCalendar ���� (.ics)"
+
+#: ../calendar/importers/icalendar-importer.c:443
+msgid "Evolution iCalendar importer"
+msgstr "·�������� iCalendar ������"
+
 #: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "�������!"
 
+#: ../calendar/importers/icalendar-importer.c:583
+msgid "vCalendar files (.vcf)"
+msgstr "vCalendar ���� (.vcf)"
+
+#: ../calendar/importers/icalendar-importer.c:584
+msgid "Evolution vCalendar importer"
+msgstr "·�������� vCalendar ������"
+
 #: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "������� ������"
@@ -5911,137 +6156,1869 @@ msgstr "������� ������"
 msgid "Evolution Calendar intelligent importer"
 msgstr "·�������� ������� ���������� ������"
 
+#.
+#. *
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#. *
+#.
+#.
+#. * These are the timezone names from the Olson timezone data.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
+#: ../calendar/zones.h:26
+msgid "Africa/Abidjan"
+msgstr "·������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:27
+msgid "Africa/Accra"
+msgstr "·������/Accra"
+
+#, fuzzy
+#: ../calendar/zones.h:28
+msgid "Africa/Addis_Ababa"
+msgstr "·������/_AddisAbaba"
+
+#: ../calendar/zones.h:29
+msgid "Africa/Algiers"
+msgstr "·������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:30
+msgid "Africa/Asmera"
+msgstr "·������/Asmera"
+
+#: ../calendar/zones.h:31
+msgid "Africa/Bamako"
+msgstr "·������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:32
+msgid "Africa/Bangui"
+msgstr "·������/Bangui"
+
+#, fuzzy
+#: ../calendar/zones.h:33
+msgid "Africa/Banjul"
+msgstr "·������/Banjul"
+
+#, fuzzy
+#: ../calendar/zones.h:34
+msgid "Africa/Bissau"
+msgstr "·������/Bissau"
+
+#, fuzzy
+#: ../calendar/zones.h:35
+msgid "Africa/Blantyre"
+msgstr "·������/Blantyre"
+
+#: ../calendar/zones.h:36
+msgid "Africa/Brazzaville"
+msgstr "·������/·��������"
+
+#: ../calendar/zones.h:37
+msgid "Africa/Bujumbura"
+msgstr "·������/·���������"
+
+#: ../calendar/zones.h:38
+msgid "Africa/Cairo"
+msgstr "·������/·����"
+
+#: ../calendar/zones.h:39
+msgid "Africa/Casablanca"
+msgstr "·������/·����������"
+
+#, fuzzy
+#: ../calendar/zones.h:40
+msgid "Africa/Ceuta"
+msgstr "·������/Ceuta"
+
+#, fuzzy
+#: ../calendar/zones.h:41
+msgid "Africa/Conakry"
+msgstr "·������/Conakry"
+
+#: ../calendar/zones.h:42
+msgid "Africa/Dakar"
+msgstr "·������/·����"
+
+#, fuzzy
+#: ../calendar/zones.h:43
+msgid "Africa/Dar_es_Salaam"
+msgstr "·������/Dar_es_�����"
+
+#: ../calendar/zones.h:44
+msgid "Africa/Djibouti"
+msgstr "·������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:45
+msgid "Africa/Douala"
+msgstr "·������/Douala"
+
+#, fuzzy
+#: ../calendar/zones.h:46
+msgid "Africa/El_Aaiun"
+msgstr "·������/El_Aaiun"
+
+#: ../calendar/zones.h:47
+msgid "Africa/Freetown"
+msgstr "·������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:48
+msgid "Africa/Gaborone"
+msgstr "·������/Gaborone"
+
+#: ../calendar/zones.h:49
+msgid "Africa/Harare"
+msgstr "·������/·�����"
+
+#: ../calendar/zones.h:50
+msgid "Africa/Johannesburg"
+msgstr "·������/·����������"
+
+#: ../calendar/zones.h:51
+msgid "Africa/Kampala"
+msgstr "·������/·�������"
+
+#: ../calendar/zones.h:52
+msgid "Africa/Khartoum"
+msgstr "·������/·�����"
+
+#: ../calendar/zones.h:53
+msgid "Africa/Kigali"
+msgstr "·������/·������"
+
+#: ../calendar/zones.h:54
+msgid "Africa/Kinshasa"
+msgstr "·������/·�������"
+
+#: ../calendar/zones.h:55
+msgid "Africa/Lagos"
+msgstr "·������/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:56
+msgid "Africa/Libreville"
+msgstr "·������/Libreville"
+
+#, fuzzy
+#: ../calendar/zones.h:57
+msgid "Africa/Lome"
+msgstr "·������/Lome"
+
+#: ../calendar/zones.h:58
+msgid "Africa/Luanda"
+msgstr "·������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:59
+msgid "Africa/Lubumbashi"
+msgstr "·������/Lubumbashi"
+
+#: ../calendar/zones.h:60
+msgid "Africa/Lusaka"
+msgstr "·������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:61
+msgid "Africa/Malabo"
+msgstr "·������/Malabo"
+
+#: ../calendar/zones.h:62
+msgid "Africa/Maputo"
+msgstr "·������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:63
+msgid "Africa/Maseru"
+msgstr "·������/Maseru"
+
+#, fuzzy
+#: ../calendar/zones.h:64
+msgid "Africa/Mbabane"
+msgstr "·������/Mbabane"
+
+#: ../calendar/zones.h:65
+msgid "Africa/Mogadishu"
+msgstr "·������/·��������"
+
+#: ../calendar/zones.h:66
+msgid "Africa/Monrovia"
+msgstr "·������/·��������"
+
+#: ../calendar/zones.h:67
+msgid "Africa/Nairobi"
+msgstr "·������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:68
+msgid "Africa/Ndjamena"
+msgstr "·������/Ndjamena"
+
+#, fuzzy
+#: ../calendar/zones.h:69
+msgid "Africa/Niamey"
+msgstr "·������/Niamey"
+
+#, fuzzy
+#: ../calendar/zones.h:70
+msgid "Africa/Nouakchott"
+msgstr "·������/Nouakchott"
+
+#: ../calendar/zones.h:71
+msgid "Africa/Ouagadougou"
+msgstr "·������/·��������"
+
+#: ../calendar/zones.h:72
+msgid "Africa/Porto-Novo"
+msgstr "·������/·�����-����"
+
+#, fuzzy
+#: ../calendar/zones.h:73
+msgid "Africa/Sao_Tome"
+msgstr "·������/Sao_Tome"
+
+#: ../calendar/zones.h:74
+msgid "Africa/Timbuktu"
+msgstr "·������/·��������"
+
+#: ../calendar/zones.h:75
+msgid "Africa/Tripoli"
+msgstr "·������/·�������"
+
+#: ../calendar/zones.h:76
+msgid "Africa/Tunis"
+msgstr "·������/·�����"
+
+#: ../calendar/zones.h:77
+msgid "Africa/Windhoek"
+msgstr "·������/·�������"
+
+#: ../calendar/zones.h:78
+msgid "America/Adak"
+msgstr "·�������/·����"
+
+#: ../calendar/zones.h:79
+msgid "America/Anchorage"
+msgstr "·�������/·������"
+
+#: ../calendar/zones.h:80
+msgid "America/Anguilla"
+msgstr "·�������/·������"
+
+#: ../calendar/zones.h:81
+msgid "America/Antigua"
+msgstr "·�������/·�������"
+
+#, fuzzy
+#: ../calendar/zones.h:82
+msgid "America/Araguaina"
+msgstr "·�������/·Araguaina"
+
+#: ../calendar/zones.h:83
+msgid "America/Aruba"
+msgstr "·�������/·����"
+
+#: ../calendar/zones.h:84
+msgid "America/Asuncion"
+msgstr "·�������/·�������"
+
+#: ../calendar/zones.h:85
+msgid "America/Barbados"
+msgstr "·�������/·��������"
+
+#, fuzzy
+#: ../calendar/zones.h:86
+msgid "America/Belem"
+msgstr "·�������/·Belem"
+
+#: ../calendar/zones.h:87
+msgid "America/Belize"
+msgstr "·�������/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:88
+msgid "America/Boa_Vista"
+msgstr "·�������/·Boa_Vista"
+
+#: ../calendar/zones.h:89
+msgid "America/Bogota"
+msgstr "·�������/·������"
+
+#: ../calendar/zones.h:90
+msgid "America/Boise"
+msgstr "·�������/·����"
+
+#, fuzzy
+#: ../calendar/zones.h:91
+msgid "America/Buenos_Aires"
+msgstr "·�������/·Buenos_Aires"
+
+#, fuzzy
+#: ../calendar/zones.h:92
+msgid "America/Cambridge_Bay"
+msgstr "·�������/·Cambridge_Bay"
+
+#: ../calendar/zones.h:93
+msgid "America/Cancun"
+msgstr "·�������/·������"
+
+#: ../calendar/zones.h:94
+msgid "America/Caracas"
+msgstr "·�������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:95
+msgid "America/Catamarca"
+msgstr "·�������/·Catamarca"
+
+#: ../calendar/zones.h:96
+msgid "America/Cayenne"
+msgstr "·�������/·����"
+
+#: ../calendar/zones.h:97
+msgid "America/Cayman"
+msgstr "·�������/·�����"
+
+#: ../calendar/zones.h:98
+msgid "America/Chicago"
+msgstr "·�������/·������"
+
+#: ../calendar/zones.h:99
+msgid "America/Chihuahua"
+msgstr "·�������/·������"
+
+#: ../calendar/zones.h:100
+msgid "America/Cordoba"
+msgstr "·�������/·�������"
+
+#, fuzzy
+#: ../calendar/zones.h:101
+msgid "America/Costa_Rica"
+msgstr "·�������/·_CostaRica"
+
+#, fuzzy
+#: ../calendar/zones.h:102
+msgid "America/Cuiaba"
+msgstr "·�������/·Cuiaba"
+
+#: ../calendar/zones.h:103
+msgid "America/Curacao"
+msgstr "·�������/·�������"
+
+#, fuzzy
+#: ../calendar/zones.h:104
+msgid "America/Danmarkshavn"
+msgstr "·�������/·Danmarkshavn"
+
+#: ../calendar/zones.h:105
+msgid "America/Dawson"
+msgstr "·�������/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:106
+msgid "America/Dawson_Creek"
+msgstr "·�������/·_DawsonCreek"
+
+#: ../calendar/zones.h:107
+msgid "America/Denver"
+msgstr "·�������/·�����"
+
+#: ../calendar/zones.h:108
+msgid "America/Detroit"
+msgstr "·�������/·������"
+
+#: ../calendar/zones.h:109
+msgid "America/Dominica"
+msgstr "·�������/·��������"
+
+#: ../calendar/zones.h:110
+msgid "America/Edmonton"
+msgstr "·�������/·��������"
+
+#, fuzzy
+#: ../calendar/zones.h:111
+msgid "America/Eirunepe"
+msgstr "·�������/·Eirunepe"
+
+#, fuzzy
+#: ../calendar/zones.h:112
+msgid "America/El_Salvador"
+msgstr "·�������/·_ElSalvador"
+
+#, fuzzy
+#: ../calendar/zones.h:113
+msgid "America/Fortaleza"
+msgstr "·�������/·Fortaleza"
+
+#, fuzzy
+#: ../calendar/zones.h:114
+msgid "America/Glace_Bay"
+msgstr "·�������/·_GlaceBay"
+
+#, fuzzy
+#: ../calendar/zones.h:115
+msgid "America/Godthab"
+msgstr "·�������/·Godthab"
+
+#, fuzzy
+#: ../calendar/zones.h:116
+msgid "America/Goose_Bay"
+msgstr "·�������/·_GooseBay"
+
+#, fuzzy
+#: ../calendar/zones.h:117
+msgid "America/Grand_Turk"
+msgstr "·�������/·_GrandTurk"
+
+#: ../calendar/zones.h:118
+msgid "America/Grenada"
+msgstr "·�������/·�������"
+
+#: ../calendar/zones.h:119
+msgid "America/Guadeloupe"
+msgstr "·�������/·��������"
+
+#: ../calendar/zones.h:120
+msgid "America/Guatemala"
+msgstr "·�������/·���������"
+
+#, fuzzy
+#: ../calendar/zones.h:121
+msgid "America/Guayaquil"
+msgstr "·�������/·Guayaquil"
+
+#: ../calendar/zones.h:122
+msgid "America/Guyana"
+msgstr "·�������/·�����"
+
+#: ../calendar/zones.h:123
+msgid "America/Halifax"
+msgstr "·�������/·��������"
+
+#: ../calendar/zones.h:124
+msgid "America/Havana"
+msgstr "·�������/·������"
+
+#: ../calendar/zones.h:125
+msgid "America/Hermosillo"
+msgstr "·�������/·��������"
+
+#: ../calendar/zones.h:126
+msgid "America/Indiana/Indianapolis"
+msgstr "·�������/·�������/·������������"
+
+#: ../calendar/zones.h:127
+msgid "America/Indiana/Knox"
+msgstr "·�������/·�������/·����"
+
+#: ../calendar/zones.h:128
+msgid "America/Indiana/Marengo"
+msgstr "·�������/·�������/·�������"
+
+#: ../calendar/zones.h:129
+msgid "America/Indiana/Vevay"
+msgstr "·�������/·�������/·����"
+
+#: ../calendar/zones.h:130
+msgid "America/Indianapolis"
+msgstr "·�������/·������������"
+
+#, fuzzy
+#: ../calendar/zones.h:131
+msgid "America/Inuvik"
+msgstr "·�������/·Inuvik"
+
+#, fuzzy
+#: ../calendar/zones.h:132
+msgid "America/Iqaluit"
+msgstr "·�������/·Iqaluit"
+
+#: ../calendar/zones.h:133
+msgid "America/Jamaica"
+msgstr "·�������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:134
+msgid "America/Jujuy"
+msgstr "·�������/·Jujuy"
+
+#: ../calendar/zones.h:135
+msgid "America/Juneau"
+msgstr "·�������/·����"
+
+#: ../calendar/zones.h:136
+msgid "America/Kentucky/Louisville"
+msgstr "·�������/·�������/·������"
+
+#: ../calendar/zones.h:137
+msgid "America/Kentucky/Monticello"
+msgstr "·�������/·�������/·���������"
+
+#, fuzzy
+#: ../calendar/zones.h:138
+msgid "America/La_Paz"
+msgstr "·�������/·_LaPaz"
+
+#: ../calendar/zones.h:139
+msgid "America/Lima"
+msgstr "·�������/·����"
+
+#: ../calendar/zones.h:140
+msgid "America/Los_Angeles"
+msgstr "·�������/·���_�������"
+
+#: ../calendar/zones.h:141
+msgid "America/Louisville"
+msgstr "·�������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:142
+msgid "America/Maceio"
+msgstr "·�������/·Maceio"
+
+#: ../calendar/zones.h:143
+msgid "America/Managua"
+msgstr "·�������/·�������"
+
+#, fuzzy
+#: ../calendar/zones.h:144
+msgid "America/Manaus"
+msgstr "·�������/·Manaus"
+
+#: ../calendar/zones.h:145
+msgid "America/Martinique"
+msgstr "·�������/·��������"
+
+#, fuzzy
+#: ../calendar/zones.h:146
+msgid "America/Mazatlan"
+msgstr "·�������/·Mazatlan"
+
+#: ../calendar/zones.h:147
+msgid "America/Mendoza"
+msgstr "·�������/·�������"
+
+#, fuzzy
+#: ../calendar/zones.h:148
+msgid "America/Menominee"
+msgstr "·�������/·Menominee"
+
+#: ../calendar/zones.h:149
+msgid "America/Merida"
+msgstr "·�������/·�����"
+
+#: ../calendar/zones.h:150
+msgid "America/Mexico_City"
+msgstr "·�������/·�������_����"
+
+#, fuzzy
+#: ../calendar/zones.h:151
+msgid "America/Miquelon"
+msgstr "·�������/·Miquelon"
+
+#: ../calendar/zones.h:152
+msgid "America/Monterrey"
+msgstr "·�������/·������"
+
+#: ../calendar/zones.h:153
+msgid "America/Montevideo"
+msgstr "·�������/·����������"
+
+#: ../calendar/zones.h:154
+msgid "America/Montreal"
+msgstr "·�������/·��������"
+
+#: ../calendar/zones.h:155
+msgid "America/Montserrat"
+msgstr "·�������/·�������"
+
+#: ../calendar/zones.h:156
+msgid "America/Nassau"
+msgstr "·�������/·����"
+
+#, fuzzy
+#: ../calendar/zones.h:157
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
+msgid "America/New_York"
+msgstr "·�������/·_NewYork"
+
+#, fuzzy
+#: ../calendar/zones.h:158
+msgid "America/Nipigon"
+msgstr "·�������/·Nipigon"
+
+#: ../calendar/zones.h:159
+msgid "America/Nome"
+msgstr "·�������/·���"
+
+#, fuzzy
+#: ../calendar/zones.h:160
+msgid "America/Noronha"
+msgstr "·�������/·Noronha"
+
+#, fuzzy
+#: ../calendar/zones.h:161
+msgid "America/North_Dakota/Center"
+msgstr "·�������/·_NorthDakota/�����"
+
+#: ../calendar/zones.h:162
+msgid "America/Panama"
+msgstr "·�������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:163
+msgid "America/Pangnirtung"
+msgstr "·�������/·Pangnirtung"
+
+#, fuzzy
+#: ../calendar/zones.h:164
+msgid "America/Paramaribo"
+msgstr "·�������/·Paramaribo"
+
+#: ../calendar/zones.h:165
+msgid "America/Phoenix"
+msgstr "·�������/·������"
+
+#: ../calendar/zones.h:166
+msgid "America/Port-au-Prince"
+msgstr "·�������/·���-�-�����"
+
+#, fuzzy
+#: ../calendar/zones.h:167
+msgid "America/Port_of_Spain"
+msgstr "·�������/·_Portof_·����"
+
+#, fuzzy
+#: ../calendar/zones.h:168
+msgid "America/Porto_Velho"
+msgstr "·�������/·_PortoVelho"
+
+#, fuzzy
+#: ../calendar/zones.h:169
+msgid "America/Puerto_Rico"
+msgstr "·�������/·_PuertoRico"
+
+#, fuzzy
+#: ../calendar/zones.h:170
+msgid "America/Rainy_River"
+msgstr "·�������/·_RainyRiver"
+
+#, fuzzy
+#: ../calendar/zones.h:171
+msgid "America/Rankin_Inlet"
+msgstr "·�������/·_RankinInlet"
+
+#, fuzzy
+#: ../calendar/zones.h:172
+msgid "America/Recife"
+msgstr "·�������/·Recife"
+
+#: ../calendar/zones.h:173
+msgid "America/Regina"
+msgstr "·�������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:174
+msgid "America/Rio_Branco"
+msgstr "·�������/·_RioBranco"
+
+#: ../calendar/zones.h:175
+msgid "America/Rosario"
+msgstr "·�������/·�������"
+
+#: ../calendar/zones.h:176
+msgid "America/Santiago"
+msgstr "·�������/·��������"
+
+#, fuzzy
+#: ../calendar/zones.h:177
+msgid "America/Santo_Domingo"
+msgstr "·�������/·_SantoDomingo"
+
+#, fuzzy
+#: ../calendar/zones.h:178
+msgid "America/Sao_Paulo"
+msgstr "·�������/·_SaoPaulo"
+
+#, fuzzy
+#: ../calendar/zones.h:179
+msgid "America/Scoresbysund"
+msgstr "·�������/·Scoresbysund"
+
+#, fuzzy
+#: ../calendar/zones.h:180
+msgid "America/Shiprock"
+msgstr "·�������/·Shiprock"
+
+#, fuzzy
+#: ../calendar/zones.h:181
+msgid "America/St_Johns"
+msgstr "·�������/·_StJohns"
+
+#, fuzzy
+#: ../calendar/zones.h:182
+msgid "America/St_Kitts"
+msgstr "·�������/·_StKitts"
+
+#, fuzzy
+#: ../calendar/zones.h:183
+msgid "America/St_Lucia"
+msgstr "·�������/·_StLucia"
+
+#, fuzzy
+#: ../calendar/zones.h:184
+msgid "America/St_Thomas"
+msgstr "·�������/·_StThomas"
+
+#, fuzzy
+#: ../calendar/zones.h:185
+msgid "America/St_Vincent"
+msgstr "·�������/·_StVincent"
+
+#, fuzzy
+#: ../calendar/zones.h:186
+msgid "America/Swift_Current"
+msgstr "·�������/·_SwiftCurrent"
+
+#: ../calendar/zones.h:187
+msgid "America/Tegucigalpa"
+msgstr "·�������/·�����������"
+
+#, fuzzy
+#: ../calendar/zones.h:188
+msgid "America/Thule"
+msgstr "·�������/·Thule"
+
+#, fuzzy
+#: ../calendar/zones.h:189
+msgid "America/Thunder_Bay"
+msgstr "·�������/·_ThunderBay"
+
+#: ../calendar/zones.h:190
+msgid "America/Tijuana"
+msgstr "·�������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:191
+msgid "America/Tortola"
+msgstr "·�������/·Tortola"
+
+#: ../calendar/zones.h:192
+msgid "America/Vancouver"
+msgstr "·�������/·�������"
+
+#: ../calendar/zones.h:193
+msgid "America/Whitehorse"
+msgstr "·�������/·�������"
+
+#: ../calendar/zones.h:194
+msgid "America/Winnipeg"
+msgstr "·�������/·�������"
+
+#, fuzzy
+#: ../calendar/zones.h:195
+msgid "America/Yakutat"
+msgstr "·�������/·Yakutat"
+
+#: ../calendar/zones.h:196
+msgid "America/Yellowknife"
+msgstr "·�������/·�������"
+
+#: ../calendar/zones.h:197
+msgid "Antarctica/Casey"
+msgstr "·����������/·����"
+
+#: ../calendar/zones.h:198
+msgid "Antarctica/Davis"
+msgstr "·����������/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:199
+msgid "Antarctica/DumontDUrville"
+msgstr "·����������/·DumontDUrville"
+
+#: ../calendar/zones.h:200
+msgid "Antarctica/Mawson"
+msgstr "·����������/·�����"
+
+#: ../calendar/zones.h:201
+msgid "Antarctica/McMurdo"
+msgstr "·����������/·�������"
+
+#: ../calendar/zones.h:202
+msgid "Antarctica/Palmer"
+msgstr "·����������/·����"
+
+#, fuzzy
+#: ../calendar/zones.h:203
+msgid "Antarctica/South_Pole"
+msgstr "·����������/·_SouthPole"
+
+#, fuzzy
+#: ../calendar/zones.h:204
+msgid "Antarctica/Syowa"
+msgstr "·����������/·Syowa"
+
+#, fuzzy
+#: ../calendar/zones.h:205
+msgid "Antarctica/Vostok"
+msgstr "·����������/·Vostok"
+
+#, fuzzy
+#: ../calendar/zones.h:206
+msgid "Arctic/Longyearbyen"
+msgstr "������/Longyearbyen"
+
+#: ../calendar/zones.h:207
+msgid "Asia/Aden"
+msgstr "·���/·����"
+
+#, fuzzy
+#: ../calendar/zones.h:208
+msgid "Asia/Almaty"
+msgstr "·���/·Almaty"
+
+#: ../calendar/zones.h:209
+msgid "Asia/Amman"
+msgstr "·���/·����"
+
+#, fuzzy
+#: ../calendar/zones.h:210
+msgid "Asia/Anadyr"
+msgstr "·���/·Anadyr"
+
+#, fuzzy
+#: ../calendar/zones.h:211
+msgid "Asia/Aqtau"
+msgstr "·���/·Aqtau"
+
+#, fuzzy
+#: ../calendar/zones.h:212
+msgid "Asia/Aqtobe"
+msgstr "·���/·Aqtobe"
+
+#, fuzzy
+#: ../calendar/zones.h:213
+msgid "Asia/Ashgabat"
+msgstr "·���/·Ashgabat"
+
+#: ../calendar/zones.h:214
+msgid "Asia/Baghdad"
+msgstr "·���/·������"
+
+#: ../calendar/zones.h:215
+msgid "Asia/Bahrain"
+msgstr "·���/·�����"
+
+#: ../calendar/zones.h:216
+msgid "Asia/Baku"
+msgstr "·���/·����"
+
+#: ../calendar/zones.h:217
+msgid "Asia/Bangkok"
+msgstr "·���/·������"
+
+#: ../calendar/zones.h:218
+msgid "Asia/Beirut"
+msgstr "·���/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:219
+msgid "Asia/Bishkek"
+msgstr "·���/·Bishkek"
+
+#: ../calendar/zones.h:220
+msgid "Asia/Brunei"
+msgstr "·���/·�����"
+
+#: ../calendar/zones.h:221
+msgid "Asia/Calcutta"
+msgstr "·���/·�������"
+
+#, fuzzy
+#: ../calendar/zones.h:222
+msgid "Asia/Choibalsan"
+msgstr "·���/·Choibalsan"
+
+#: ../calendar/zones.h:223
+msgid "Asia/Chongqing"
+msgstr "·���/·������"
+
+#: ../calendar/zones.h:224
+msgid "Asia/Colombo"
+msgstr "·���/·�������"
+
+#: ../calendar/zones.h:225
+msgid "Asia/Damascus"
+msgstr "·���/·��������"
+
+#: ../calendar/zones.h:226
+msgid "Asia/Dhaka"
+msgstr "·���/·����"
+
+#, fuzzy
+#: ../calendar/zones.h:227
+msgid "Asia/Dili"
+msgstr "·���/·Dili"
+
+#: ../calendar/zones.h:228
+msgid "Asia/Dubai"
+msgstr "·���/·����"
+
+#, fuzzy
+#: ../calendar/zones.h:229
+msgid "Asia/Dushanbe"
+msgstr "·���/·Dushanbe"
+
+#: ../calendar/zones.h:230
+msgid "Asia/Gaza"
+msgstr "·���/·����"
+
+#: ../calendar/zones.h:231
+msgid "Asia/Harbin"
+msgstr "·���/·������"
+
+#: ../calendar/zones.h:232
+msgid "Asia/Hong_Kong"
+msgstr "·���/·_������"
+
+#, fuzzy
+#: ../calendar/zones.h:233
+msgid "Asia/Hovd"
+msgstr "·���/·Hovd"
+
+#: ../calendar/zones.h:234
+msgid "Asia/Irkutsk"
+msgstr "·���/·������"
+
+#: ../calendar/zones.h:235
+msgid "Asia/Istanbul"
+msgstr "·���/·��������"
+
+#: ../calendar/zones.h:236
+msgid "Asia/Jakarta"
+msgstr "·���/·�������"
+
+#, fuzzy
+#: ../calendar/zones.h:237
+msgid "Asia/Jayapura"
+msgstr "·���/·Jayapura"
+
+#: ../calendar/zones.h:238
+msgid "Asia/Jerusalem"
+msgstr "·���/·���������"
+
+#: ../calendar/zones.h:239
+msgid "Asia/Kabul"
+msgstr "·���/·�����"
+
+#: ../calendar/zones.h:240
+msgid "Asia/Kamchatka"
+msgstr "·���/·��������"
+
+#: ../calendar/zones.h:241
+msgid "Asia/Karachi"
+msgstr "·���/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:242
+msgid "Asia/Kashgar"
+msgstr "·���/·Kashgar"
+
+#: ../calendar/zones.h:243
+msgid "Asia/Katmandu"
+msgstr "·���/·��������"
+
+#: ../calendar/zones.h:244
+msgid "Asia/Krasnoyarsk"
+msgstr "·���/·����������"
+
+#, fuzzy
+#: ../calendar/zones.h:245
+msgid "Asia/Kuala_Lumpur"
+msgstr "·���/·_KualaLumpur"
+
+#, fuzzy
+#: ../calendar/zones.h:246
+msgid "Asia/Kuching"
+msgstr "·���/·Kuching"
+
+#: ../calendar/zones.h:247
+msgid "Asia/Kuwait"
+msgstr "·���/·�����"
+
+#: ../calendar/zones.h:248
+msgid "Asia/Macao"
+msgstr "·���/·����"
+
+#: ../calendar/zones.h:249
+msgid "Asia/Macau"
+msgstr "·���/·����"
+
+#: ../calendar/zones.h:250
+msgid "Asia/Magadan"
+msgstr "·���/·�������"
+
+#, fuzzy
+#: ../calendar/zones.h:251
+msgid "Asia/Makassar"
+msgstr "·���/·Makassar"
+
+#: ../calendar/zones.h:252
+msgid "Asia/Manila"
+msgstr "·���/·������"
+
+#: ../calendar/zones.h:253
+msgid "Asia/Muscat"
+msgstr "·���/·������"
+
+#: ../calendar/zones.h:254
+msgid "Asia/Nicosia"
+msgstr "·���/·�������"
+
+#: ../calendar/zones.h:255
+msgid "Asia/Novosibirsk"
+msgstr "·���/·�����������"
+
+#, fuzzy
+#: ../calendar/zones.h:256
+msgid "Asia/Omsk"
+msgstr "·���/·Omsk"
+
+#: ../calendar/zones.h:257
+msgid "Asia/Oral"
+msgstr "·���/·����"
+
+#, fuzzy
+#: ../calendar/zones.h:258
+msgid "Asia/Phnom_Penh"
+msgstr "·���/·_PhnomPenh"
+
+#, fuzzy
+#: ../calendar/zones.h:259
+msgid "Asia/Pontianak"
+msgstr "·���/·Pontianak"
+
+#: ../calendar/zones.h:260
+msgid "Asia/Pyongyang"
+msgstr "·���/·�������"
+
+#: ../calendar/zones.h:261
+msgid "Asia/Qatar"
+msgstr "·���/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:262
+msgid "Asia/Qyzylorda"
+msgstr "·���/·Qyzylorda"
+
+#: ../calendar/zones.h:263
+msgid "Asia/Rangoon"
+msgstr "·���/·������"
+
+#: ../calendar/zones.h:264
+msgid "Asia/Riyadh"
+msgstr "·���/·����"
+
+#: ../calendar/zones.h:265
+msgid "Asia/Saigon"
+msgstr "·���/·�����"
+
+#: ../calendar/zones.h:266
+msgid "Asia/Sakhalin"
+msgstr "·���/·��������"
+
+#: ../calendar/zones.h:267
+msgid "Asia/Samarkand"
+msgstr "·���/·���������"
+
+#: ../calendar/zones.h:268
+msgid "Asia/Seoul"
+msgstr "·���/·���"
+
+#: ../calendar/zones.h:269
+msgid "Asia/Shanghai"
+msgstr "·���/·�����"
+
+#: ../calendar/zones.h:270
+msgid "Asia/Singapore"
+msgstr "·���/·�������"
+
+#: ../calendar/zones.h:271
+msgid "Asia/Taipei"
+msgstr "·���/·����"
+
+#: ../calendar/zones.h:272
+msgid "Asia/Tashkent"
+msgstr "·���/·�������"
+
+#: ../calendar/zones.h:273
+msgid "Asia/Tbilisi"
+msgstr "·���/·��������"
+
+#: ../calendar/zones.h:274
+msgid "Asia/Tehran"
+msgstr "·���/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:275
+msgid "Asia/Thimphu"
+msgstr "·���/·Thimphu"
+
+#: ../calendar/zones.h:276
+msgid "Asia/Tokyo"
+msgstr "·���/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:277
+msgid "Asia/Ujung_Pandang"
+msgstr "·���/·_UjungPandang"
+
+#, fuzzy
+#: ../calendar/zones.h:278
+msgid "Asia/Ulaanbaatar"
+msgstr "·���/·Ulaanbaatar"
+
+#, fuzzy
+#: ../calendar/zones.h:279
+msgid "Asia/Urumqi"
+msgstr "·���/·Urumqi"
+
+#, fuzzy
+#: ../calendar/zones.h:280
+msgid "Asia/Vientiane"
+msgstr "·���/·Vientiane"
+
+#: ../calendar/zones.h:281
+msgid "Asia/Vladivostok"
+msgstr "·���/·�����������"
+
+#, fuzzy
+#: ../calendar/zones.h:282
+msgid "Asia/Yakutsk"
+msgstr "·���/·Yakutsk"
+
+#: ../calendar/zones.h:283
+msgid "Asia/Yekaterinburg"
+msgstr "·���/·������������"
+
+#: ../calendar/zones.h:284
+msgid "Asia/Yerevan"
+msgstr "·���/·�������"
+
+#: ../calendar/zones.h:285
+msgid "Atlantic/Azores"
+msgstr "·��������/·�����"
+
+#: ../calendar/zones.h:286
+msgid "Atlantic/Bermuda"
+msgstr "·��������/·�������"
+
+#: ../calendar/zones.h:287
+msgid "Atlantic/Canary"
+msgstr "·��������/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:288
+msgid "Atlantic/Cape_Verde"
+msgstr "·��������/·_CapeVerde"
+
+#, fuzzy
+#: ../calendar/zones.h:289
+msgid "Atlantic/Faeroe"
+msgstr "·��������/·Faeroe"
+
+#, fuzzy
+#: ../calendar/zones.h:290
+msgid "Atlantic/Jan_Mayen"
+msgstr "·��������/·_JanMayen"
+
+#: ../calendar/zones.h:291
+msgid "Atlantic/Madeira"
+msgstr "·��������/·������"
+
+#: ../calendar/zones.h:292
+msgid "Atlantic/Reykjavik"
+msgstr "·��������/·��������"
+
+#, fuzzy
+#: ../calendar/zones.h:293
+msgid "Atlantic/South_Georgia"
+msgstr "·��������/·_SouthGeorgia"
+
+#, fuzzy
+#: ../calendar/zones.h:294
+msgid "Atlantic/St_Helena"
+msgstr "·��������/·_StHelena"
+
+#: ../calendar/zones.h:295
+msgid "Atlantic/Stanley"
+msgstr "·��������/·������"
+
+#: ../calendar/zones.h:296
+msgid "Australia/Adelaide"
+msgstr "·�������/������"
+
+#: ../calendar/zones.h:297
+msgid "Australia/Brisbane"
+msgstr "·�������/�������"
+
+#, fuzzy
+#: ../calendar/zones.h:298
+msgid "Australia/Broken_Hill"
+msgstr "·�������/_BrokenHill"
+
+#: ../calendar/zones.h:299
+msgid "Australia/Darwin"
+msgstr "·�������/������"
+
+#: ../calendar/zones.h:300
+msgid "Australia/Hobart"
+msgstr "·�������/·������"
+
+#: ../calendar/zones.h:301
+msgid "Australia/Lindeman"
+msgstr "·�������/·�������"
+
+#, fuzzy
+#: ../calendar/zones.h:302
+msgid "Australia/Lord_Howe"
+msgstr "·�������/·Lord_Howe"
+
+#: ../calendar/zones.h:303
+msgid "Australia/Melbourne"
+msgstr "·�������/·������"
+
+#: ../calendar/zones.h:304
+msgid "Australia/Perth"
+msgstr "·�������/·���"
+
+#: ../calendar/zones.h:305
+msgid "Australia/Sydney"
+msgstr "·�������/·�����"
+
+#: ../calendar/zones.h:306
+msgid "Europe/Amsterdam"
+msgstr "·�����/·��������"
+
+#: ../calendar/zones.h:307
+msgid "Europe/Andorra"
+msgstr "·�����/·������"
+
+#: ../calendar/zones.h:308
+msgid "Europe/Athens"
+msgstr "·�����/·�����"
+
+#: ../calendar/zones.h:309
+msgid "Europe/Belfast"
+msgstr "·�����/·�������"
+
+#: ../calendar/zones.h:310
+msgid "Europe/Belgrade"
+msgstr "·�����/·�������"
+
+#: ../calendar/zones.h:311
+msgid "Europe/Berlin"
+msgstr "·�����/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:312
+msgid "Europe/Bratislava"
+msgstr "·�����/·Bratislava"
+
+#: ../calendar/zones.h:313
+msgid "Europe/Brussels"
+msgstr "·�����/·�������"
+
+#: ../calendar/zones.h:314
+msgid "Europe/Bucharest"
+msgstr "·�����/·��������"
+
+#: ../calendar/zones.h:315
+msgid "Europe/Budapest"
+msgstr "·�����/·��������"
+
+#, fuzzy
+#: ../calendar/zones.h:316
+msgid "Europe/Chisinau"
+msgstr "·�����/·Chisinau"
+
+#: ../calendar/zones.h:317
+msgid "Europe/Copenhagen"
+msgstr "·�����/·����������"
+
+#: ../calendar/zones.h:318
+msgid "Europe/Dublin"
+msgstr "·�����/·������"
+
+#: ../calendar/zones.h:319
+msgid "Europe/Gibraltar"
+msgstr "·�����/·��������"
+
+#: ../calendar/zones.h:320
+msgid "Europe/Helsinki"
+msgstr "·�����/·��������"
+
+#: ../calendar/zones.h:321
+msgid "Europe/Istanbul"
+msgstr "·�����/·��������"
+
+#: ../calendar/zones.h:322
+msgid "Europe/Kaliningrad"
+msgstr "·�����/·�����������"
+
+#: ../calendar/zones.h:323
+msgid "Europe/Kiev"
+msgstr "·�����/·����"
+
+#: ../calendar/zones.h:324
+msgid "Europe/Lisbon"
+msgstr "·�����/·������"
+
+#: ../calendar/zones.h:325
+msgid "Europe/Ljubljana"
+msgstr "·�����/·���������"
+
+#: ../calendar/zones.h:326
+msgid "Europe/London"
+msgstr "·�����/·������"
+
+#: ../calendar/zones.h:327
+msgid "Europe/Luxembourg"
+msgstr "·�����/·����������"
+
+#: ../calendar/zones.h:328
+msgid "Europe/Madrid"
+msgstr "·�����/·������"
+
+#: ../calendar/zones.h:329
+msgid "Europe/Malta"
+msgstr "·�����/·�����"
+
+#: ../calendar/zones.h:330
+msgid "Europe/Minsk"
+msgstr "·�����/·�����"
+
+#: ../calendar/zones.h:331
+msgid "Europe/Monaco"
+msgstr "·�����/·������"
+
+#: ../calendar/zones.h:332
+msgid "Europe/Moscow"
+msgstr "·�����/·�����"
+
+#: ../calendar/zones.h:333
+msgid "Europe/Nicosia"
+msgstr "·�����/·�������"
+
+#: ../calendar/zones.h:334
+msgid "Europe/Oslo"
+msgstr "·�����/·����"
+
+#: ../calendar/zones.h:335
+msgid "Europe/Paris"
+msgstr "·�����/·�����"
+
+#: ../calendar/zones.h:336
+msgid "Europe/Prague"
+msgstr "·�����/·����"
+
+#: ../calendar/zones.h:337
+msgid "Europe/Riga"
+msgstr "·�����/·����"
+
+#: ../calendar/zones.h:338
+msgid "Europe/Rome"
+msgstr "·�����/·���"
+
+#: ../calendar/zones.h:339
+msgid "Europe/Samara"
+msgstr "·�����/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:340
+msgid "Europe/San_Marino"
+msgstr "·�����/·_SanMarino"
+
+#: ../calendar/zones.h:341
+msgid "Europe/Sarajevo"
+msgstr "·�����/·��������"
+
+#, fuzzy
+#: ../calendar/zones.h:342
+msgid "Europe/Simferopol"
+msgstr "·�����/·Simferopol"
+
+#: ../calendar/zones.h:343
+msgid "Europe/Skopje"
+msgstr "·�����/·�������"
+
+#: ../calendar/zones.h:344
+msgid "Europe/Sofia"
+msgstr "·�����/·�����"
+
+#: ../calendar/zones.h:345
+msgid "Europe/Stockholm"
+msgstr "·�����/·��������"
+
+#, fuzzy
+#: ../calendar/zones.h:346
+msgid "Europe/Tallinn"
+msgstr "·�����/·Tallinn"
+
+#: ../calendar/zones.h:347
+msgid "Europe/Tirane"
+msgstr "·�����/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:348
+msgid "Europe/Uzhgorod"
+msgstr "·�����/·Uzhgorod"
+
+#, fuzzy
+#: ../calendar/zones.h:349
+msgid "Europe/Vaduz"
+msgstr "·�����/·Vaduz"
+
+#: ../calendar/zones.h:350
+msgid "Europe/Vatican"
+msgstr "·�����/·�������"
+
+#: ../calendar/zones.h:351
+msgid "Europe/Vienna"
+msgstr "·�����/·�����"
+
+#: ../calendar/zones.h:352
+msgid "Europe/Vilnius"
+msgstr "·�����/·�������"
+
+#: ../calendar/zones.h:353
+msgid "Europe/Warsaw"
+msgstr "·�����/·�����"
+
+#: ../calendar/zones.h:354
+msgid "Europe/Zagreb"
+msgstr "·�����/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:355
+msgid "Europe/Zaporozhye"
+msgstr "·�����/·Zaporozhye"
+
+#: ../calendar/zones.h:356
+msgid "Europe/Zurich"
+msgstr "·�����/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:357
+msgid "Indian/Antananarivo"
+msgstr "·������/·Antananarivo"
+
+#, fuzzy
+#: ../calendar/zones.h:358
+msgid "Indian/Chagos"
+msgstr "·������/·Chagos"
+
+#: ../calendar/zones.h:359
+msgid "Indian/Christmas"
+msgstr "·������/·�������"
+
+#: ../calendar/zones.h:360
+msgid "Indian/Cocos"
+msgstr "·������/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:361
+msgid "Indian/Comoro"
+msgstr "·������/·Comoro"
+
+#, fuzzy
+#: ../calendar/zones.h:362
+msgid "Indian/Kerguelen"
+msgstr "·������/·Kerguelen"
+
+#: ../calendar/zones.h:363
+msgid "Indian/Mahe"
+msgstr "·������/·����"
+
+#: ../calendar/zones.h:364
+msgid "Indian/Maldives"
+msgstr "·������/·�������"
+
+#: ../calendar/zones.h:365
+msgid "Indian/Mauritius"
+msgstr "·������/·��������"
+
+#: ../calendar/zones.h:366
+msgid "Indian/Mayotte"
+msgstr "·������/·����"
+
+#: ../calendar/zones.h:367
+msgid "Indian/Reunion"
+msgstr "·������/·�������"
+
+#, fuzzy
+#: ../calendar/zones.h:368
+msgid "Pacific/Apia"
+msgstr "·�������/·Apia"
+
+#: ../calendar/zones.h:369
+msgid "Pacific/Auckland"
+msgstr "·�������/·������"
+
+#: ../calendar/zones.h:370
+msgid "Pacific/Chatham"
+msgstr "·�������/·�����"
+
+#: ../calendar/zones.h:371
+msgid "Pacific/Easter"
+msgstr "·�������/·����"
+
+#, fuzzy
+#: ../calendar/zones.h:372
+msgid "Pacific/Efate"
+msgstr "·�������/·Efate"
+
+#, fuzzy
+#: ../calendar/zones.h:373
+msgid "Pacific/Enderbury"
+msgstr "·�������/·Enderbury"
+
+#, fuzzy
+#: ../calendar/zones.h:374
+msgid "Pacific/Fakaofo"
+msgstr "·�������/·Fakaofo"
+
+#: ../calendar/zones.h:375
+msgid "Pacific/Fiji"
+msgstr "·�������/·����"
+
+#, fuzzy
+#: ../calendar/zones.h:376
+msgid "Pacific/Funafuti"
+msgstr "·�������/·Funafuti"
+
+#: ../calendar/zones.h:377
+msgid "Pacific/Galapagos"
+msgstr "·�������/·���������"
+
+#, fuzzy
+#: ../calendar/zones.h:378
+msgid "Pacific/Gambier"
+msgstr "·�������/·Gambier"
+
+#: ../calendar/zones.h:379
+msgid "Pacific/Guadalcanal"
+msgstr "·�������/·�����������"
+
+#: ../calendar/zones.h:380
+msgid "Pacific/Guam"
+msgstr "·�������/·����"
+
+#: ../calendar/zones.h:381
+msgid "Pacific/Honolulu"
+msgstr "·�������/·��������"
+
+#: ../calendar/zones.h:382
+msgid "Pacific/Johnston"
+msgstr "·�������/·�������"
+
+#, fuzzy
+#: ../calendar/zones.h:383
+msgid "Pacific/Kiritimati"
+msgstr "·�������/·Kiritimati"
+
+#, fuzzy
+#: ../calendar/zones.h:384
+msgid "Pacific/Kosrae"
+msgstr "·�������/·Kosrae"
+
+#, fuzzy
+#: ../calendar/zones.h:385
+msgid "Pacific/Kwajalein"
+msgstr "·�������/·Kwajalein"
+
+#, fuzzy
+#: ../calendar/zones.h:386
+msgid "Pacific/Majuro"
+msgstr "·�������/·Majuro"
+
+#, fuzzy
+#: ../calendar/zones.h:387
+msgid "Pacific/Marquesas"
+msgstr "·�������/·Marquesas"
+
+#: ../calendar/zones.h:388
+msgid "Pacific/Midway"
+msgstr "·�������/·�����"
+
+#, fuzzy
+#: ../calendar/zones.h:389
+msgid "Pacific/Nauru"
+msgstr "·�������/·Nauru"
+
+#, fuzzy
+#: ../calendar/zones.h:390
+msgid "Pacific/Niue"
+msgstr "·�������/·Niue"
+
+#: ../calendar/zones.h:391
+msgid "Pacific/Norfolk"
+msgstr "·�������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:392
+msgid "Pacific/Noumea"
+msgstr "·�������/·Noumea"
+
+#, fuzzy
+#: ../calendar/zones.h:393
+msgid "Pacific/Pago_Pago"
+msgstr "·�������/·_PagoPago"
+
+#: ../calendar/zones.h:394
+msgid "Pacific/Palau"
+msgstr "·�������/·����"
+
+#, fuzzy
+#: ../calendar/zones.h:395
+msgid "Pacific/Pitcairn"
+msgstr "·�������/·Pitcairn"
+
+#, fuzzy
+#: ../calendar/zones.h:396
+msgid "Pacific/Ponape"
+msgstr "·�������/·Ponape"
+
+#, fuzzy
+#: ../calendar/zones.h:397
+msgid "Pacific/Port_Moresby"
+msgstr "·�������/·_PortMoresby"
+
+#, fuzzy
+#: ../calendar/zones.h:398
+msgid "Pacific/Rarotonga"
+msgstr "·�������/·Rarotonga"
+
+#: ../calendar/zones.h:399
+msgid "Pacific/Saipan"
+msgstr "·�������/·�����"
+
+#: ../calendar/zones.h:400
+msgid "Pacific/Tahiti"
+msgstr "·�������/·������"
+
+#, fuzzy
+#: ../calendar/zones.h:401
+msgid "Pacific/Tarawa"
+msgstr "·�������/·Tarawa"
+
+#, fuzzy
+#: ../calendar/zones.h:402
+msgid "Pacific/Tongatapu"
+msgstr "·�������/·Tongatapu"
+
+#, fuzzy
+#: ../calendar/zones.h:403
+msgid "Pacific/Truk"
+msgstr "·�������/·Truk"
+
+#: ../calendar/zones.h:404
+msgid "Pacific/Wake"
+msgstr "·�������/·���"
+
+#: ../calendar/zones.h:405
+msgid "Pacific/Wallis"
+msgstr "·�������/·�����"
+
+#: ../calendar/zones.h:406
+msgid "Pacific/Yap"
+msgstr "·�������/·���"
+
+#, fuzzy
+#: ../composer/e-composer-actions.c:81
+msgid "Untitled Message"
+msgstr "Untitled �����"
+
 # not making any attempt at present to translate
 # timezone names
-#: ../composer/e-composer-actions.c:200
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
-#: ../modules/calendar/e-memo-shell-view-actions.c:495
-#: ../modules/calendar/e-task-shell-view-actions.c:622
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "��� ��..."
 
-#: ../composer/e-composer-actions.c:279 ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:283
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "���� � ���"
 
-#: ../composer/e-composer-actions.c:284
-#: ../widgets/misc/e-signature-editor.c:200
+#: ../composer/e-composer-actions.c:288
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_����"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "���� � ������ ���"
 
-#: ../composer/e-composer-actions.c:291
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "_�����..."
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "����� ���_��"
 
-#: ../composer/e-composer-actions.c:307
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "��� � ������ ���"
 
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "��� _��..."
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "��� � ������ ��� ��� � ������� ���"
 
-#: ../composer/e-composer-actions.c:319
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "��� �� _�����"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "��� �� �����"
 
-#: ../composer/e-composer-actions.c:326 ../composer/e-composer-private.c:194
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "�_���"
 
-#: ../composer/e-composer-actions.c:328
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "���� ��� �����"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "�� _�����"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "���� �� ����� �����"
 
-#: ../composer/e-composer-actions.c:342
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "������ _�������"
 
-#: ../composer/e-composer-actions.c:349
-msgid "_Security"
-msgstr "_���������"
+#: ../composer/e-composer-actions.c:363
+msgid "PGP _Encrypt"
+msgstr "PGP _�������"
+
+#: ../composer/e-composer-actions.c:365
+msgid "Encrypt this message with PGP"
+msgstr "������� ��� ����� ��� PGP"
 
-#: ../composer/e-composer-actions.c:375
+#: ../composer/e-composer-actions.c:371
+msgid "PGP _Sign"
+msgstr "PGP _���"
+
+#: ../composer/e-composer-actions.c:373
+msgid "Sign this message with your PGP key"
+msgstr "��� ��� ����� ��� �� PGP ��"
+
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "_��������� �����"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "��� � ����� �������� � ��"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "��_����� ��� �����"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:389
 msgid "Get delivery notification when your message is read"
 msgstr "��� ������� ����������� ��� �� ����� �� ���"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "S/MIME ��_�����"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:397
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "������� ��� ����� ��� �� S/MIME ��������� ���������"
 
-#: ../composer/e-composer-actions.c:399
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Sig_n"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:405
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "��� ��� ����� ��� �� S/MIME ������� ���������"
 
-#: ../composer/e-composer-actions.c:415
+#: ../composer/e-composer-actions.c:411
+msgid "_Bcc Field"
+msgstr "_Bcc ����"
+
+#: ../composer/e-composer-actions.c:413
+msgid "Toggles whether the BCC field is displayed"
+msgstr "������ ���� � BCC ���� �� �������"
+
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "_Cc ����"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "������ ���� � Cc ���� �� �������"
 
-#: ../composer/e-composer-actions.c:423
+#: ../composer/e-composer-actions.c:427
 msgid "_From Field"
 msgstr "_���� ����"
 
-#: ../composer/e-composer-actions.c:431
+#, fuzzy
+#: ../composer/e-composer-actions.c:429
+msgid "Toggles whether the From chooser is displayed"
+msgstr "������ ���� � ���� chooser �� �������"
+
+#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "_�����-� ����"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "������ ���� � �����-� ���� �� �������"
 
-#: ../composer/e-composer-actions.c:476
+#: ../composer/e-composer-actions.c:480
 msgid "Save Draft"
 msgstr "��� �����"
 
+#: ../composer/e-composer-header.c:129
+msgid "Show"
+msgstr "��"
+
+#: ../composer/e-composer-header.c:137
+msgid "Hide"
+msgstr "���"
+
 #: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "���� � ���������� � � �����"
@@ -6058,92 +8035,118 @@ msgstr ""
 "���� � ������� ��� ��� ����� � ������ ���� � � ����� ����� ����� �� � "
 "��������� ���� � � �����"
 
-#: ../composer/e-composer-header-table.c:949
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "��_��:"
 
-#: ../composer/e-composer-header-table.c:949
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:959
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:299
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "����"
 
-#: ../composer/e-composer-header-table.c:958
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "_�����-�:"
 
-#: ../composer/e-composer-header-table.c:963
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "_�:"
 
-#: ../composer/e-composer-header-table.c:969
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "_����:"
 
-#: ../composer/e-composer-header-table.c:969
-msgid "Show CC"
-msgstr "�� ����"
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "Cc"
+
+#: ../composer/e-composer-header-table.c:984
+msgid "_Bcc:"
+msgstr "_Bcc:"
+
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
 
-#: ../composer/e-composer-header-table.c:980
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "_���� �:"
 
-#: ../composer/e-composer-header-table.c:984
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "�_������:"
 
-#: ../composer/e-composer-header-table.c:993
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "��_������:"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "���� �� �� � ����� ���"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "���� �� � ������ ������ � ���� �"
 
-#: ../composer/e-composer-private.c:210
+#: ../composer/e-composer-private.c:199
+msgid "Undo the last action"
+msgstr "���� � ���� �����"
+
+#: ../composer/e-composer-private.c:203
+msgid "Redo the last undone action"
+msgstr "���� � ���� ����� �����"
+
+#: ../composer/e-composer-private.c:207
+msgid "Search for text"
+msgstr "��� �� �����"
+
+#: ../composer/e-composer-private.c:211
+msgid "Search for and replace text"
+msgstr "��� �� � ������ �����"
+
+#: ../composer/e-composer-private.c:301
 msgid "Save draft"
 msgstr "��� �����"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:190 ../mail/em-utils.c:146
-#: ../plugins/attachment-reminder/attachment-reminder.c:129
+#: ../composer/e-msg-composer.c:188 ../mail/em-utils.c:152
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "_�� ��� �� ��� ����� ����."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:988
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "����� ��� ������ �����: �� ����� ��������� ��� �� ��� �����"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:995
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "����� ������� ������ �����: �� ��������� ��������� ��� �� ��� �����"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:2172
+#, fuzzy
+#: ../composer/e-msg-composer.c:1386
+msgid "Unable to reconstruct message from autosave file"
+msgstr "������ � ����������� ����� ���� autosave ���"
+
+#: ../composer/e-msg-composer.c:1452 ../composer/e-msg-composer.c:1648
 msgid "Compose Message"
 msgstr "������ �����"
 
-#: ../composer/e-msg-composer.c:3402
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr ""
-"<b>(� ������� ������� � ���-����� ����� ����, ��� ����� �� ������.)</b>"
+#: ../composer/e-msg-composer.c:3314
+msgid "The composer contains a non-text message body, which cannot be edited."
+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."
@@ -6151,14 +8154,22 @@ msgstr "�� ������ ��� ��� ���
 
 #: ../composer/mail-composer.error.xml.h:3
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr "� � ��� � ���� � ������� � �����, ������ '{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
+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 "
+"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 ""
 "������ ��� ������� ����� ��� ������� � ����� ����������, ����� � ��� � ��� � "
@@ -6172,23 +8183,33 @@ msgstr "ð�‘’ð�‘«ð�‘› ð�‘¯ð�‘ªð�‘‘ ð�‘’ð�‘®ð�‘¦ð�‘±ð�‘‘ ð�‘’ð�‘©ð�‘¥ð�‘�ð�‘´ð�‘Ÿð
 msgid "Could not create message."
 msgstr "��� ��� ����� �����."
 
+#: ../composer/mail-composer.error.xml.h:9
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr "��� ��� ��� ������� ��� &quot;{0}&quot;."
+
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "��� ��� ������ ������� � ���� ���� {0}."
 
-#: ../composer/mail-composer.error.xml.h:12
-msgid "Directories can not be attached to Messages."
-msgstr "��������� ��� ��� �� ����� � �������."
+#, fuzzy
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "��� ��� ��� � autosave ��� &quot;{0}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:13
+#: ../composer/mail-composer.error.xml.h:12
 msgid "Do you want to recover unfinished messages?"
 msgstr "�� � ���� � ������ �������� �������?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "������ �� �������. �� � ���� � ���� � ���?"
 
-#: ../composer/mail-composer.error.xml.h:16
+#, fuzzy
+#: ../composer/mail-composer.error.xml.h:14
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "�� ����� � autosave ����� &quot;{1}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:15
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -6196,50 +8217,291 @@ 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:16
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr "� ��� '{0}' �� ��� � ������� ��� � ����� �� ���� �� � �����."
 
-#: ../composer/mail-composer.error.xml.h:18
+#: ../composer/mail-composer.error.xml.h:17
 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."
+"Unable to activate the HTML editor control.\n\nPlease make sure that you have "
+"the correct version of gtkhtml and libgtkhtml installed."
 msgstr ""
-"� ���� � �������� � ��� ��������, ��� ���� � ���� �� ��� �������� "
-"�����������, � ����� �� ���� � � �������� � ���� ��."
+"������ � ������� � HTML ����� �������.\n\n���� ��� ��� ��� � ��� � ������ "
+"����� � gtkhtml � libgtkhtml �������."
 
-#: ../composer/mail-composer.error.xml.h:23
-msgid "Unfinished messages found"
-msgstr "�������� ������� ����"
+#, fuzzy
+#: ../composer/mail-composer.error.xml.h:20
+msgid "Unable to activate the address selector control."
+msgstr "������ � ������� � ����� selector �������."
 
-#: ../composer/mail-composer.error.xml.h:24
-msgid "Warning: Modified Message"
-msgstr "�����: ������� �����"
+#: ../composer/mail-composer.error.xml.h:21
+msgid "You cannot attach the file n{0}' to this message."
+msgstr "� ����� ���� � ��� n{0}' � ��� �����."
 
-#: ../composer/mail-composer.error.xml.h:25
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "� ����� ���� � ��� `{0}' � ��� �����."
-
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr "� ��� � �������� �� ����� ���� � ��� ������ ���."
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:23
 msgid "_Continue Editing"
 msgstr "_������� ������"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:25
 msgid "_Do not Recover"
 msgstr "_�� ��� ������"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:26
 msgid "_Recover"
 msgstr "_������"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Save Draft"
 msgstr "_��� �����"
 
+#, fuzzy
+#: ../capplet/anjal-settings-main.c:199
+msgid "Run Anjal in a window"
+msgstr "��� Anjal �� � �����"
+
+#, fuzzy
+#: ../capplet/anjal-settings-main.c:200
+msgid "Make Anjal the default email client"
+msgstr "��� Anjal � ������ ���� ������"
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:207
+msgid "ID of the socket to embed in"
+msgstr "ID � � ����� � ����� ��"
+
+#: ../capplet/anjal-settings-main.c:208
+msgid "socket"
+msgstr "�����"
+
+#, fuzzy
+#: ../capplet/anjal-settings-main.c:221
+msgid "Anjal email client"
+msgstr "Anjal ���� ������"
+
+#: ../capplet/settings/mail-account-view.c:56
+msgid "Please enter your full name."
+msgstr "���� ���� �� ��� ���."
+
+#: ../capplet/settings/mail-account-view.c:57
+msgid "Please enter your email address."
+msgstr "���� ���� �� ���� �����."
+
+#: ../capplet/settings/mail-account-view.c:58
+msgid "The email address you have entered is invalid."
+msgstr "� ���� ����� � ��� ����� �� �������."
+
+#: ../capplet/settings/mail-account-view.c:182
+msgid "Personal details:"
+msgstr "������� ������:"
+
+#: ../capplet/settings/mail-account-view.c:189
+msgid "Name:"
+msgstr "���:"
+
+#: ../capplet/settings/mail-account-view.c:198
+msgid "Email address:"
+msgstr "���� �����:"
+
+#: ../capplet/settings/mail-account-view.c:208
+msgid "Receiving details:"
+msgstr "������� ������:"
+
+#: ../capplet/settings/mail-account-view.c:215
+#: ../capplet/settings/mail-account-view.c:265
+msgid "Server type:"
+msgstr "���� ���:"
+
+#: ../capplet/settings/mail-account-view.c:224
+#: ../capplet/settings/mail-account-view.c:274
+msgid "Server address:"
+msgstr "���� �����:"
+
+#: ../capplet/settings/mail-account-view.c:233
+#: ../capplet/settings/mail-account-view.c:283
+msgid "Username:"
+msgstr "������:"
+
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:292
+msgid "Use encryption:"
+msgstr "�� ���������:"
+
+#: ../capplet/settings/mail-account-view.c:247
+#: ../capplet/settings/mail-account-view.c:297
+msgid "never"
+msgstr "����"
+
+#: ../capplet/settings/mail-account-view.c:258
+msgid "Sending details:"
+msgstr "������ ������:"
+
+#: ../capplet/settings/mail-account-view.c:316
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. If "
+"we can't do it automatically you'll need your server details as well."
+msgstr ""
+"� �� � ���� ��������� �'� ��� � ����� �� �����. ��� �� ���� ����� � ������ �� "
+"���� � ��'� ��� � ��� �� �� � ������. �� �� ���� �� �� ���������� �'� ��� �� "
+"���� ������ �� ���."
+
+#: ../capplet/settings/mail-account-view.c:318
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+"����, �� ���� ��� �� � ������ � ��� �� ��� ����������. ���� ���� ��� ����. "
+"��'� ���� � ��� � ���� ��� � ������ � ���� ����� ��� � �� ��� � ���� ���."
+
+#: ../capplet/settings/mail-account-view.c:320
+msgid "You can specify more options to configure the account."
+msgstr "� ��� ������� �� ������ � �������� � �����."
+
+#: ../capplet/settings/mail-account-view.c:322
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+"�� �� ��� �� ������ �� ������ ���. ��'� ���� � ��� ��� ����� ��� � ��� ��� "
+"��� ��� � ��� ���."
+
+#: ../capplet/settings/mail-account-view.c:323
+msgid "You can specify your default settings for your account."
+msgstr "� ��� ������� �� ������ ������ �� �� �����."
+
+#: ../capplet/settings/mail-account-view.c:324
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr "��� � ��� ���� ��� ���� �� ��� � ������ � � ���� � ��� �� ���."
+
+#: ../capplet/settings/mail-account-view.c:339
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2190
+#: ../mail/mail-config.ui.h:59
+msgid "Identity"
+msgstr "��������"
+
+#: ../capplet/settings/mail-account-view.c:339
+msgid "Next - Receiving mail"
+msgstr "����� - ������� ���"
+
+#: ../capplet/settings/mail-account-view.c:340
+msgid "Receiving mail"
+msgstr "������� ���"
+
+#: ../capplet/settings/mail-account-view.c:340
+#: ../capplet/settings/mail-account-view.c:341
+msgid "Next - Sending mail"
+msgstr "����� - ������ ���"
+
+#: ../capplet/settings/mail-account-view.c:340
+msgid "Back - Identity"
+msgstr "��� - ��������"
+
+#: ../capplet/settings/mail-account-view.c:340
+msgid "Next - Receiving options"
+msgstr "����� - ������� ������"
+
+#: ../capplet/settings/mail-account-view.c:341
+msgid "Receiving options"
+msgstr "������� ������"
+
+#: ../capplet/settings/mail-account-view.c:341
+#: ../capplet/settings/mail-account-view.c:343
+msgid "Back - Receiving mail"
+msgstr "��� - ������� ���"
+
+#: ../capplet/settings/mail-account-view.c:343
+msgid "Sending mail"
+msgstr "������ ���"
+
+#: ../capplet/settings/mail-account-view.c:343
+#: ../capplet/settings/mail-account-view.c:344
+msgid "Next - Review account"
+msgstr "����� - ���� �����"
+
+#: ../capplet/settings/mail-account-view.c:343
+msgid "Next - Defaults"
+msgstr "����� - �������"
+
+#: ../capplet/settings/mail-account-view.c:343
+msgid "Back - Receiving options"
+msgstr "��� - ������� ������"
+
+#: ../capplet/settings/mail-account-view.c:344
+#: ../mail/em-account-editor.c:2769 ../mail/mail-config.ui.h:32
+msgid "Defaults"
+msgstr "�������"
+
+#: ../capplet/settings/mail-account-view.c:344
+msgid "Back - Sending mail"
+msgstr "��� - ������ ���"
+
+#: ../capplet/settings/mail-account-view.c:346
+msgid "Review account"
+msgstr "���� �����"
+
+#: ../capplet/settings/mail-account-view.c:346
+msgid "Finish"
+msgstr "�����"
+
+#: ../capplet/settings/mail-account-view.c:346
+msgid "Back - Sending"
+msgstr "��� - ������"
+
+#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-settings-view.c:267
+msgid "Close Tab"
+msgstr "���� ���"
+
+#: ../capplet/settings/mail-account-view.c:690
+msgid "Account Wizard"
+msgstr "����� �����"
+
+#: ../capplet/settings/mail-capplet-shell.c:208
+msgid "Evolution account assistant"
+msgstr "·�������� ����� ��������"
+
+#. create the local source group
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:659
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:211
+#: ../mail/message-list.c:1607
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:126
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:141
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:109
+msgid "On This Computer"
+msgstr "�� ��� �������"
+
+#: ../capplet/settings/mail-settings-view.c:146
+#: ../plugins/groupwise-features/share-folder.c:747
+msgid "Modify"
+msgstr "������"
+
+#: ../capplet/settings/mail-settings-view.c:148
+msgid "Add a new account"
+msgstr "�� � �� �����"
+
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "����� ���������"
+
+#: ../capplet/settings/mail-settings-view.c:277
+msgid "Settings"
+msgstr "������"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Calendar event notifications"
 msgstr "������� ����� ������������"
@@ -6248,9 +8510,8 @@ msgstr "ð�‘’ð�‘¨ð�‘¤ð�‘©ð�‘¯ð�‘›ð�‘¼ ð�‘¦ð�‘�ð�‘§ð�‘¯ð�‘‘ ð�‘¯ð�‘´ð�‘‘ð�‘©ð�‘“ð�
 msgid "Evolution Alarm Notify"
 msgstr "·�������� ���� ������"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:712
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/e-shell-window-private.c:209
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:823
+#: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "·��������"
 
@@ -6258,7 +8519,7 @@ msgstr "·��������"
 msgid "Evolution Mail and Calendar"
 msgstr "·�������� ��� � �������"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "������� ����"
 
@@ -6266,6 +8527,14 @@ msgstr "������� ����"
 msgid "Manage your email, contacts and schedule"
 msgstr "����� �� ����, �������� � �����"
 
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Configure email accounts"
+msgstr "�������� ���� ������"
+
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "���� ������"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "����� ���"
@@ -6274,6 +8543,43 @@ msgstr "����� ���"
 msgid "calendar information"
 msgstr "������� ���������"
 
+#. Translators: This is a cancelled activity.
+#, c-format
+#: ../e-util/e-activity.c:224
+msgid "%s (cancelled)"
+msgstr "%s (�������)"
+
+#. Translators: This is a completed activity.
+#, c-format
+#: ../e-util/e-activity.c:227
+msgid "%s (completed)"
+msgstr "%s (���������)"
+
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#, c-format
+#: ../e-util/e-activity.c:231
+msgid "%s..."
+msgstr "%s..."
+
+#, c-format
+#: ../e-util/e-activity.c:236
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% �������)"
+
+#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+msgid "Evolution Error"
+msgstr "·�������� ��"
+
+#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+msgid "Evolution Warning"
+msgstr "·�������� �����"
+
+#, c-format
+#: ../e-util/e-alert.c:634
+msgid "Internal error, unknown error '%s' requested"
+msgstr "������� ��, ���� �� '%s' ���������"
+
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "�����"
@@ -6330,168 +8636,163 @@ msgstr "������ ��������"
 msgid "Western European, New"
 msgstr "������ ��������, ��"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "����������"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "���������"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "���������"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "�������"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:304
+#: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "����"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "������"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "�������"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
 #, c-format
-msgid "%d days from now"
-msgstr "%d ��� ���� ��"
+#: ../e-util/e-datetime-format.c:211
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "%d �� ���� ��"
+msgstr[1] "%d ��� ���� ��"
 
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
 #, c-format
-msgid "%d days ago"
-msgstr "%d ��� ���"
+#: ../e-util/e-datetime-format.c:214
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d �� ���"
+msgstr[1] "%d ��� ���"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "�� ����� ������"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "�����:"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78
-msgid "Evolution Error"
-msgstr "·�������� ��"
+#: ../e-util/e-file-utils.c:136
+msgid "(Unknown Filename)"
+msgstr "(���� ������)"
 
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80
-msgid "Evolution Warning"
-msgstr "·�������� �����"
-
-#. setup a dummy error
-#: ../e-util/e-error.c:451
+#. Translators: The string value is the basename of a file.
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "������� ��, ���� �� '%s' ���������"
+#: ../e-util/e-file-utils.c:140
+msgid "Writing \"%s\""
+msgstr "����� \"%s\""
 
-#: ../e-util/e-logger.c:172
-msgid "Name of the logger"
-msgstr "��� � � ����"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "������"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "� ������ � � �����"
+#. Translators: The first string value is the basename of a
+#. * remote file, the second string value is the hostname.
+#, c-format
+#: ../e-util/e-file-utils.c:145
+msgid "Writing \"%s\" to %s"
+msgstr "����� \"%s\" � %s"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:191
+#: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "����� ����"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:205
+#: ../e-util/e-non-intrusive-error-dialog.c:208
 msgid "Show _errors in the status bar for"
 msgstr "�� _��� �� � ������ �� ��"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:223
+#: ../e-util/e-non-intrusive-error-dialog.c:226
 msgid "second(s)."
 msgstr "������(�)."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:229
+#: ../e-util/e-non-intrusive-error-dialog.c:232
 msgid "Log Messages:"
 msgstr "��� �������:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:274
+#: ../e-util/e-non-intrusive-error-dialog.c:279
 msgid "Log Level"
 msgstr "��� �����"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:282
-#: ../widgets/misc/e-dateedit.c:497
-msgid "Time"
-msgstr "���"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2627
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2686
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "�������"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:97
-#: ../shell/e-shell-window-actions.c:1487
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "���� ��� �����"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "��"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "���"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "������� � ���"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "�����"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Error, Warnings and Debug messages"
 msgstr "��, ������� � ����� �������"
 
-#: ../e-util/e-plugin.c:292 ../filter/e-rule-editor.c:827
-#: ../modules/mail/em-composer-prefs.c:474
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:720
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "�������"
-
-#: ../e-util/e-plugin.c:293
-msgid "Whether the plugin is enabled"
-msgstr "���� � ������ �� �������"
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "����"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "�� �� ���� ��� �������"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "� ������� ������ ������� � ������ ������ ���� � ��:"
 
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "� ������� ������ ��� ��� ����� ��� �������� ������ ���� � ��."
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#, fuzzy
+#: ../e-util/e-signature.c:701
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "����� \"{1}\"."
 
@@ -6511,272 +8812,314 @@ msgstr "�� � ��� � ������ ��?"
 msgid "File exists \"{0}\"."
 msgstr "��� ������� \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "������ ���?"
-
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:135
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "_������"
 
-#: ../e-util/e-util.c:139
+#: ../e-util/e-util.c:170
 msgid "Could not open the link."
 msgstr "��� ��� ���� � ����."
 
-#: ../e-util/e-util.c:189
+#: ../e-util/e-util.c:220
 msgid "Could not display help for Evolution."
 msgstr "��� ��� ������ ���� �� ·��������."
 
-#: ../e-util/gconf-bridge.c:1233
+#, c-format
+#: ../e-util/gconf-bridge.c:1304
+msgid "GConf error: %s"
+msgstr "GConf ��: %s"
+
+#: ../e-util/gconf-bridge.c:1315
 msgid "All further errors shown only on terminal."
 msgstr "�� ���� ��� ��� ���� �� �������."
 
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:960
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "�����-�"
 
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2186 ../mail/em-format-html.c:2250
-#: ../mail/em-format-html.c:2271 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "����"
 
-#: ../em-format/em-format-quote.c:356 ../em-format/em-format.c:964
-#: ../mail/em-filter-i18n.h:74 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:303 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1112
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:81
+msgid "Bcc"
+msgstr "Bcc"
+
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
+#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "�������"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2366
-#: ../modules/mail/em-mailer-prefs.c:1126
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1138
 msgid "Mailer"
 msgstr "����"
 
-#: ../em-format/em-format-quote.c:432 ../mail/em-composer-utils.c:1166
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
 msgid "-------- Forwarded Message --------"
 msgstr "-------- �������� ����� --------"
 
-#: ../em-format/em-format.c:965 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:433
-#: ../widgets/misc/e-dateedit.c:455
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "���"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:84
 msgid "Newsgroups"
 msgstr "��������"
 
-#: ../em-format/em-format.c:967 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:85
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "���"
 
-#: ../em-format/em-format.c:1320
 #, c-format
+#: ../em-format/em-format.c:1302
 msgid "%s attachment"
 msgstr "%s ��������"
 
-#: ../em-format/em-format.c:1375
+#: ../em-format/em-format.c:1361
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "��� ��� ��� S/MIME �����: ���� ��"
 
-#: ../em-format/em-format.c:1513 ../em-format/em-format.c:1675
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "��� ��� ��� MIME �����. �������� �� ���."
 
-#: ../em-format/em-format.c:1521
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "��������� ��������� ��� �� ���������/���������"
 
-#: ../em-format/em-format.c:1699
+#: ../em-format/em-format.c:1535
+msgid "Could not parse PGP/MIME message"
+msgstr "��� ��� ��� PGP/MIME �����"
+
+#: ../em-format/em-format.c:1535
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "��� ��� ��� PGP/MIME �����: ���� ��"
+
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "��������� ������� �����"
 
-#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1848
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 msgid "Error verifying signature"
 msgstr "�� �������� �������"
 
-#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1837
-#: ../em-format/em-format.c:1848
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "���� �� �������� �������"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../em-format/em-format.c:1946
+msgid "Could not parse PGP message"
+msgstr "��� ��� ��� PGP �����"
+
+#: ../em-format/em-format.c:1946
+msgid "Could not parse PGP message: Unknown error"
+msgstr "��� ��� ��� PGP �����: ���� ��"
+
 #, c-format
+#: ../filter/e-filter-datespec.c:74
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ������ ���"
 msgstr[1] "%d ������� ���"
 
-#: ../filter/e-filter-datespec.c:72
 #, c-format
+#: ../filter/e-filter-datespec.c:74
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 ������ �� � ����"
 msgstr[1] "%d ������� �� � ����"
 
-#: ../filter/e-filter-datespec.c:73
 #, c-format
+#: ../filter/e-filter-datespec.c:75
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 ����� ���"
 msgstr[1] "%d ������ ���"
 
-#: ../filter/e-filter-datespec.c:73
 #, c-format
+#: ../filter/e-filter-datespec.c:75
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 ����� �� � ����"
 msgstr[1] "%d ������ �� � ����"
 
-#: ../filter/e-filter-datespec.c:74
 #, c-format
+#: ../filter/e-filter-datespec.c:76
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 �� ���"
 msgstr[1] "%d ��� ���"
 
-#: ../filter/e-filter-datespec.c:74
 #, c-format
+#: ../filter/e-filter-datespec.c:76
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 �� �� � ����"
 msgstr[1] "%d ��� �� � ����"
 
-#: ../filter/e-filter-datespec.c:75
 #, c-format
+#: ../filter/e-filter-datespec.c:77
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 �� ���"
 msgstr[1] "%d ��� ���"
 
-#: ../filter/e-filter-datespec.c:75
 #, c-format
+#: ../filter/e-filter-datespec.c:77
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 �� �� � ����"
 msgstr[1] "%d ��� �� � ����"
 
-#: ../filter/e-filter-datespec.c:76
 #, c-format
+#: ../filter/e-filter-datespec.c:78
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 ��� ���"
 msgstr[1] "%d ���� ���"
 
-#: ../filter/e-filter-datespec.c:76
 #, c-format
+#: ../filter/e-filter-datespec.c:78
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 ��� �� � ����"
 msgstr[1] "%d ���� �� � ����"
 
-#: ../filter/e-filter-datespec.c:77
 #, c-format
+#: ../filter/e-filter-datespec.c:79
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 ���� ���"
 msgstr[1] "%d ����� ���"
 
-#: ../filter/e-filter-datespec.c:77
 #, c-format
+#: ../filter/e-filter-datespec.c:79
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 ���� �� � ����"
 msgstr[1] "%d ����� �� � ����"
 
-#: ../filter/e-filter-datespec.c:78
 #, c-format
+#: ../filter/e-filter-datespec.c:80
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 �� ���"
 msgstr[1] "%d ��� ���"
 
-#: ../filter/e-filter-datespec.c:78
 #, c-format
+#: ../filter/e-filter-datespec.c:80
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 �� �� � ����"
 msgstr[1] "%d ��� �� � ����"
 
-#: ../filter/e-filter-datespec.c:117
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<���� �� � ������ � ���>"
 
-#: ../filter/e-filter-datespec.c:120 ../filter/e-filter-datespec.c:131
-#: ../filter/e-filter-datespec.c:142
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "��"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:127
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:271
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "������ � ��� � ����� ������"
 
-#: ../filter/e-filter-file.c:181
+#: ../filter/e-filter-file.c:184
 msgid "Choose a File"
 msgstr "��� � ���"
 
-#: ../filter/e-filter-rule.c:677
+#: ../filter/e-filter-rule.c:659
+msgid "R_ule name:"
+msgstr "_��� ���:"
+
+#: ../filter/e-filter-rule.c:689
 msgid "Find items that meet the following conditions"
 msgstr "���� ����� ��� ��� � ������ ���������"
 
-#: ../filter/e-filter-rule.c:717
+#: ../filter/e-filter-rule.c:723
+msgid "A_dd Condition"
+msgstr "_�� ��������"
+
+#: ../filter/e-filter-rule.c:732
 msgid "If all conditions are met"
 msgstr "�� �� ��������� � ���"
 
-#: ../filter/e-filter-rule.c:717
+#: ../filter/e-filter-rule.c:733
 msgid "If any conditions are met"
 msgstr "�� ��� ��������� � ���"
 
-#: ../filter/e-filter-rule.c:719
+#: ../filter/e-filter-rule.c:736
 msgid "_Find items:"
 msgstr "_���� �����:"
 
-#: ../filter/e-filter-rule.c:739
+#: ../filter/e-filter-rule.c:760
 msgid "All related"
 msgstr "�� �������"
 
-#: ../filter/e-filter-rule.c:739
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "������"
 
-#: ../filter/e-filter-rule.c:739
+#: ../filter/e-filter-rule.c:762
 msgid "Replies and parents"
 msgstr "������ � ������"
 
-#: ../filter/e-filter-rule.c:739
+#: ../filter/e-filter-rule.c:763
 msgid "No reply or parent"
 msgstr "�� ����� � �����"
 
-#: ../filter/e-filter-rule.c:1114 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:297
+#: ../filter/e-filter-rule.c:766
+msgid "I_nclude threads"
+msgstr "_������ �����"
+
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "�������"
 
-#: ../filter/e-filter-rule.c:1114 ../mail/em-utils.c:298
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "������"
 
-#: ../filter/e-rule-editor.c:260
+#: ../filter/e-rule-editor.c:265
 msgid "Add Rule"
 msgstr "�� ���"
 
-#: ../filter/e-rule-editor.c:343
+#: ../filter/e-rule-editor.c:352
 msgid "Edit Rule"
 msgstr "���� ���"
 
-#: ../filter/e-rule-editor.c:837
-msgid "Rule name"
-msgstr "��� ���"
+#: ../filter/filter.error.xml.h:1
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "��� ������� ��������� &quot;{0}&quot;."
+
+#: ../filter/filter.error.xml.h:2
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "��� ��� ������ ������� ��������� &quot;{1}&quot;."
+
+#: ../filter/filter.error.xml.h:3
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "��� &quot;{0}&quot; ��� ��� ������ � �� ��� � ������� ���."
 
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
@@ -6786,10 +9129,14 @@ 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:74
 msgid "Missing name."
 msgstr "����� ���."
 
+#: ../filter/filter.error.xml.h:7
+msgid "Name &quot;{0}&quot; already used."
+msgstr "��� &quot;{0}&quot; ������ ���."
+
 #: ../filter/filter.error.xml.h:8
 msgid "Please choose another name."
 msgstr "���� ��� ����� ���."
@@ -6806,108 +9153,90 @@ msgstr "� ���� ��� ��� �����."
 msgid "You must specify a file name."
 msgstr "� ���� ������� � ��� ���."
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>_����� ����</b>"
-
-#: ../filter/filter.glade.h:2
+#: ../filter/filter.ui.h:1
 msgid "Compare against"
 msgstr "����� ������"
 
-#: ../filter/filter.glade.h:4
+#: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
 msgstr "�� ������ �� ���:"
 
-#: ../filter/filter.glade.h:5
+#: ../filter/filter.ui.h:4
 msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"� �����'� ��� ��� �� ������ ������\n"
-"12:00am � � ��� ��������."
+"The message's date will be compared against\n12:00am of the date specified."
+msgstr "� �����'� ��� ��� �� ������ ������\n12:00am � � ��� ��������."
 
-#: ../filter/filter.glade.h:7
+#: ../filter/filter.ui.h:6
 msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"� �����'� ��� ��� �� ������ ������\n"
-"� ��� ������� � ��� ������� ����."
+"The message's date will be compared against\na time relative to when "
+"filtering occurs."
+msgstr "� �����'� ��� ��� �� ������ ������\n� ��� ������� � ��� ������� ����."
 
-#: ../filter/filter.glade.h:9
+#: ../filter/filter.ui.h:8
 msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"� �����'� ��� ��� �� ������ ������\n"
-"� ������ ��� ��� ������� ����."
+"The message's date will be compared against\nthe current time when filtering "
+"occurs."
+msgstr "� �����'� ��� ��� �� ������ ������\n� ������ ��� ��� ������� ����."
 
-#: ../filter/filter.glade.h:12
-msgid ""
-"ago\n"
-"in the future"
-msgstr ""
-"���\n"
-"�� � ����"
-
-#: ../filter/filter.glade.h:14
-msgid ""
-"seconds\n"
-"minutes\n"
-"hours\n"
-"days\n"
-"weeks\n"
-"months\n"
-"years"
-msgstr ""
-"�������\n"
-"������\n"
-"���\n"
-"���\n"
-"����\n"
-"�����\n"
-"���"
-
-#: ../filter/filter.glade.h:21
-msgid ""
-"the current time\n"
-"the time you specify\n"
-"a time relative to the current time"
-msgstr ""
-"� ������ ���\n"
-"� ��� � �������\n"
-"� ��� ������� � � ������ ���"
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "_����� ����"
+
+#: ../filter/filter.ui.h:12
+msgid "a time relative to the current time"
+msgstr "� ��� ������� � � ������ ���"
+
+#: ../filter/filter.ui.h:13
+msgid "ago"
+msgstr "���"
+
+#: ../filter/filter.ui.h:16
+msgid "in the future"
+msgstr "�� � ����"
+
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+msgid "months"
+msgstr "�����"
 
-#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:1263
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:173
+msgid "seconds"
+msgstr "�������"
+
+#: ../filter/filter.ui.h:20
+msgid "the current time"
+msgstr "� ������ ���"
+
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
+msgstr "� ��� � �������"
+
+#: ../filter/filter.ui.h:23
+msgid "years"
+msgstr "���"
+
+#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
+#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
+#: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "��������"
 msgstr[1] "���������"
 
-#: ../mail/e-mail-attachment-bar.c:614 ../widgets/misc/e-attachment-paned.c:607
+#: ../mail/e-mail-attachment-bar.c:617
+#: ../widgets/misc/e-attachment-paned.c:612
 msgid "Icon View"
 msgstr "���� ��"
 
-#: ../mail/e-mail-attachment-bar.c:615 ../widgets/misc/e-attachment-paned.c:608
+#: ../mail/e-mail-attachment-bar.c:618
+#: ../widgets/misc/e-attachment-paned.c:613
 msgid "List View"
 msgstr "���� ��"
 
-#: ../mail/e-mail-browser.c:665
-msgid "Shell Module"
-msgstr "��� �����"
-
-#: ../mail/e-mail-browser.c:666 ../mail/message-list.c:2511
-msgid "The mail shell backend"
-msgstr "� ��� ��� ������"
-
-#: ../mail/e-mail-browser.c:676
-msgid "Show Deleted"
-msgstr "�� �������"
-
-#: ../mail/e-mail-browser.c:677
-msgid "Show deleted messages"
-msgstr "�� ������� �������"
+#: ../mail/e-mail-browser.c:262
+msgid "(No Subject)"
+msgstr "(�� �������)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -6929,6 +9258,10 @@ msgstr "����� ��� _�����"
 msgid "_Label name:"
 msgstr "_����� ���:"
 
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "_��������"
+
 #. red
 #: ../mail/e-mail-label-list-store.c:42
 msgid "_Work"
@@ -6950,7 +9283,7 @@ msgid "_Later"
 msgstr "_����"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:552
+#: ../modules/mail/e-mail-shell-view-actions.c:472
 msgid "Add Label"
 msgstr "�� �����"
 
@@ -6960,655 +9293,756 @@ msgstr "���� �����"
 
 #: ../mail/e-mail-label-manager.c:349
 msgid ""
-"Note: Underscore in the label name is used\n"
-"as mnemonic identifier in menu."
-msgstr ""
-"���: �������� �� � ����� ��� �� ���\n"
-"�� ������� ��������� �� ����."
+"Note: Underscore in the label name is used\nas mnemonic identifier in menu."
+msgstr "���: �������� �� � ����� ��� �� ���\n�� ������� ��������� �� ����."
 
 #: ../mail/e-mail-label-tree-view.c:86
 msgid "Color"
 msgstr "����"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:577
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "���"
+
+#, fuzzy
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2706
+#: ../modules/mail/e-mail-shell-view-private.c:953
+msgid "Inbox"
+msgstr "Inbox"
+
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
 msgid "Drafts"
 msgstr "������"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:589
+#, fuzzy
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
+msgid "Outbox"
+msgstr "Outbox"
+
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
 msgid "Sent"
 msgstr "����"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:580
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:539
+#: ../plugins/templates/templates.c:572
 msgid "Templates"
 msgstr "��������"
 
+#: ../mail/e-mail-migrate.c:131
+msgid "Migrating..."
+msgstr "��������..."
+
+#: ../mail/e-mail-migrate.c:164
+msgid "Migration"
+msgstr "��������"
+
+#, c-format
+#: ../mail/e-mail-migrate.c:204
+msgid "Migrating '%s':"
+msgstr "�������� '%s':"
+
+#: ../mail/e-mail-migrate.c:643
+msgid "Migrating Folders"
+msgstr "�������� ������"
+
+#: ../mail/e-mail-migrate.c:644
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n\nPlease be patient while Evolution migrates your "
+"folders..."
+msgstr ""
+"� ����� ����� � � ·�������� ������� ������ ��� ��� ���� � SQLite ���� "
+"·�������� 2.24.\n\n���� �� ������ ��� ·�������� ������� �� ������..."
+
+#, c-format
+#: ../mail/e-mail-migrate.c:740
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "������ � ����� ����� ��� ������ �� '%s': %s"
+
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:107
-#: ../modules/calendar/e-task-shell-view-actions.c:576
+#: ../mail/e-mail-reader-utils.c:108
+#: ../modules/calendar/e-task-shell-view-actions.c:561
 msgid "Do not ask me again"
 msgstr "�� ��� ��� �� ����"
 
-#: ../mail/e-mail-reader.c:216 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:266 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "���� � �����"
 
-#: ../mail/e-mail-reader.c:216 ../mail/em-folder-utils.c:381
+#: ../mail/e-mail-reader.c:266 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "�_���"
 
-#: ../mail/e-mail-reader.c:605 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:640 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "��� � �����"
 
-#: ../mail/e-mail-reader.c:605 ../mail/em-folder-utils.c:381
+#: ../mail/e-mail-reader.c:640 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "_���"
 
-#: ../mail/e-mail-reader.c:1083
+#: ../mail/e-mail-reader.c:866
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "��� �����"
+msgstr[1] "��� �������"
+
+#. Translators: This is a part of a suggested file name
+#. * used when saving a message or multiple messages to an
+#. * mbox format, when the first message doesn't have a
+#. * Subject. The extension ".mbox" is appended to this
+#. * string, thus it will be something like "Message.mbox"
+#. * at the end.
+#: ../mail/e-mail-reader.c:887 ../plugins/groupwise-features/properties.ui.h:4
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "�����"
+msgstr[1] "�������"
+
+#: ../mail/e-mail-reader.c:1145
 msgid "A_dd Sender to Address Book"
 msgstr "�_� ����� � ����� ���"
 
-#: ../mail/e-mail-reader.c:1085
+#: ../mail/e-mail-reader.c:1147
 msgid "Add sender to address book"
 msgstr "�� ����� � ����� ���"
 
-#: ../mail/e-mail-reader.c:1090
+#: ../mail/e-mail-reader.c:1152
 msgid "Check for _Junk"
 msgstr "��� �� _����"
 
-#: ../mail/e-mail-reader.c:1092
+#: ../mail/e-mail-reader.c:1154
 msgid "Filter the selected messages for junk status"
 msgstr "����� � �������� ������� �� ���� ������"
 
-#: ../mail/e-mail-reader.c:1099
-msgid "Copy selected messages to the clipboard"
-msgstr "���� �������� ������� � � �������"
-
-#: ../mail/e-mail-reader.c:1104
+#: ../mail/e-mail-reader.c:1159
 msgid "_Copy to Folder..."
 msgstr "_���� � �����..."
 
-#: ../mail/e-mail-reader.c:1106
+#: ../mail/e-mail-reader.c:1161
 msgid "Copy selected messages to another folder"
 msgstr "���� �������� ������� � ����� �����"
 
-#: ../mail/e-mail-reader.c:1111
+#: ../mail/e-mail-reader.c:1166
 msgid "_Delete Message"
 msgstr "_����� �����"
 
-#: ../mail/e-mail-reader.c:1113
+#: ../mail/e-mail-reader.c:1168
 msgid "Mark the selected messages for deletion"
 msgstr "��� � �������� ������� �� �������"
 
-#: ../mail/e-mail-reader.c:1118
+#: ../mail/e-mail-reader.c:1173
 msgid "Filter on Mailing _List..."
 msgstr "����� �� ����� _����..."
 
-#: ../mail/e-mail-reader.c:1120
+#: ../mail/e-mail-reader.c:1175
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "����� � ��� � ����� ������� � ��� ����� ����"
 
-#: ../mail/e-mail-reader.c:1125
+#: ../mail/e-mail-reader.c:1180
 msgid "Filter on _Recipients..."
 msgstr "����� �� _����������..."
 
-#: ../mail/e-mail-reader.c:1127
+#: ../mail/e-mail-reader.c:1182
 msgid "Create a rule to filter messages to these recipients"
 msgstr "����� � ��� � ����� ������� � ��� ����������"
 
-#: ../mail/e-mail-reader.c:1134
+#: ../mail/e-mail-reader.c:1187
+msgid "Filter on Se_nder..."
+msgstr "����� �� _�����..."
+
+#: ../mail/e-mail-reader.c:1189
 msgid "Create a rule to filter messages from this sender"
 msgstr "����� � ��� � ����� ������� ���� ��� �����"
 
-#: ../mail/e-mail-reader.c:1139
+#: ../mail/e-mail-reader.c:1194
 msgid "Filter on _Subject..."
 msgstr "����� �� _�������..."
 
-#: ../mail/e-mail-reader.c:1141
+#: ../mail/e-mail-reader.c:1196
 msgid "Create a rule to filter messages with this subject"
 msgstr "����� � ��� � ����� ������� ��� ��� �������"
 
-#: ../mail/e-mail-reader.c:1148
+#: ../mail/e-mail-reader.c:1201
+msgid "A_pply Filters"
+msgstr "_���� ������"
+
+#: ../mail/e-mail-reader.c:1203
 msgid "Apply filter rules to the selected messages"
 msgstr "���� ����� ���� � � �������� �������"
 
-#: ../mail/e-mail-reader.c:1153
+#: ../mail/e-mail-reader.c:1208
 msgid "_Find in Message..."
 msgstr "_���� �� �����..."
 
-#: ../mail/e-mail-reader.c:1155
+#: ../mail/e-mail-reader.c:1210
 msgid "Search for text in the body of the displayed message"
 msgstr "��� �� ����� �� � ���� � � ������� �����"
 
-#: ../mail/e-mail-reader.c:1160
+#: ../mail/e-mail-reader.c:1215
 msgid "_Clear Flag"
 msgstr "_��� ����"
 
-#: ../mail/e-mail-reader.c:1162
+#: ../mail/e-mail-reader.c:1217
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "����� � ����-�� ���� ���� � �������� �������"
 
-#: ../mail/e-mail-reader.c:1167
+#: ../mail/e-mail-reader.c:1222
 msgid "_Flag Completed"
 msgstr "_���� ���������"
 
-#: ../mail/e-mail-reader.c:1169
+#: ../mail/e-mail-reader.c:1224
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "��� � ����-�� ���� � ��������� �� � �������� �������"
 
-#: ../mail/e-mail-reader.c:1174
+#: ../mail/e-mail-reader.c:1229
 msgid "Follow _Up..."
 msgstr "���� _��..."
 
-#: ../mail/e-mail-reader.c:1176
+#: ../mail/e-mail-reader.c:1231
 msgid "Flag the selected messages for follow-up"
 msgstr "���� � �������� ������� �� ����-��"
 
-#: ../mail/e-mail-reader.c:1181
+#: ../mail/e-mail-reader.c:1236
 msgid "_Attached"
 msgstr "_�����"
 
-#: ../mail/e-mail-reader.c:1183 ../mail/e-mail-reader.c:1190
+#: ../mail/e-mail-reader.c:1238 ../mail/e-mail-reader.c:1245
 msgid "Forward the selected message to someone as an attachment"
 msgstr "����� � �������� ����� � ������ �� �� ��������"
 
-#: ../mail/e-mail-reader.c:1188
+#: ../mail/e-mail-reader.c:1243
 msgid "Forward As _Attached"
 msgstr "����� �� _�����"
 
-#: ../mail/e-mail-reader.c:1197 ../mail/e-mail-reader.c:1204
+#, fuzzy
+#: ../mail/e-mail-reader.c:1250
+msgid "_Inline"
+msgstr "_Inline"
+
+#: ../mail/e-mail-reader.c:1252 ../mail/e-mail-reader.c:1259
 msgid "Forward the selected message in the body of a new message"
 msgstr "����� � �������� ����� �� � ���� � � �� �����"
 
-#: ../mail/e-mail-reader.c:1209
+#, fuzzy
+#: ../mail/e-mail-reader.c:1257
+msgid "Forward As _Inline"
+msgstr "����� �� _Inline"
+
+#: ../mail/e-mail-reader.c:1264
 msgid "_Quoted"
 msgstr "_������"
 
-#: ../mail/e-mail-reader.c:1211 ../mail/e-mail-reader.c:1218
+#: ../mail/e-mail-reader.c:1266 ../mail/e-mail-reader.c:1273
 msgid "Forward the selected message quoted like a reply"
 msgstr "����� � �������� ����� ������ ��� � �����"
 
-#: ../mail/e-mail-reader.c:1216
+#: ../mail/e-mail-reader.c:1271
 msgid "Forward As _Quoted"
 msgstr "����� �� _������"
 
-#: ../mail/e-mail-reader.c:1223
+#: ../mail/e-mail-reader.c:1278
 msgid "_Load Images"
 msgstr "_��� ������"
 
-#: ../mail/e-mail-reader.c:1225
+#: ../mail/e-mail-reader.c:1280
 msgid "Force images in HTML mail to be loaded"
 msgstr "��� ������ �� HTML ��� � �� �����"
 
-#: ../mail/e-mail-reader.c:1230
+#: ../mail/e-mail-reader.c:1285
 msgid "_Important"
 msgstr "_��������"
 
-#: ../mail/e-mail-reader.c:1232
+#: ../mail/e-mail-reader.c:1287
 msgid "Mark the selected messages as important"
 msgstr "��� � �������� ������� �� ��������"
 
-#: ../mail/e-mail-reader.c:1237
+#: ../mail/e-mail-reader.c:1292
 msgid "_Junk"
 msgstr "_����"
 
-#: ../mail/e-mail-reader.c:1239
+#: ../mail/e-mail-reader.c:1294
 msgid "Mark the selected messages as junk"
 msgstr "��� � �������� ������� �� ����"
 
-#: ../mail/e-mail-reader.c:1244
+#: ../mail/e-mail-reader.c:1299
 msgid "_Not Junk"
 msgstr "_��� ����"
 
-#: ../mail/e-mail-reader.c:1246
+#: ../mail/e-mail-reader.c:1301
 msgid "Mark the selected messages as not being junk"
 msgstr "��� � �������� ������� �� ��� ���� ����"
 
-#: ../mail/e-mail-reader.c:1251
+#: ../mail/e-mail-reader.c:1306
 msgid "_Read"
 msgstr "_���"
 
-#: ../mail/e-mail-reader.c:1253
+#: ../mail/e-mail-reader.c:1308
 msgid "Mark the selected messages as having been read"
 msgstr "��� � �������� ������� �� ����� ��� ���"
 
-#: ../mail/e-mail-reader.c:1260
+#: ../mail/e-mail-reader.c:1313
+msgid "Uni_mportant"
+msgstr "_����������"
+
+#: ../mail/e-mail-reader.c:1315
 msgid "Mark the selected messages as unimportant"
 msgstr "��� � �������� ������� �� ����������"
 
-#: ../mail/e-mail-reader.c:1265
+#: ../mail/e-mail-reader.c:1320
 msgid "_Unread"
 msgstr "_�����"
 
-#: ../mail/e-mail-reader.c:1267
+#: ../mail/e-mail-reader.c:1322
 msgid "Mark the selected messages as not having been read"
 msgstr "��� � �������� ������� �� ��� ����� ��� ���"
 
-#: ../mail/e-mail-reader.c:1272
+#: ../mail/e-mail-reader.c:1327
 msgid "_Edit as New Message..."
 msgstr "_���� �� �� �����..."
 
-#: ../mail/e-mail-reader.c:1274
+#: ../mail/e-mail-reader.c:1329
 msgid "Open the selected messages in the composer for editing"
 msgstr "���� � �������� ������� �� � ������� �� ������"
 
-#: ../mail/e-mail-reader.c:1279
+#: ../mail/e-mail-reader.c:1334
 msgid "Compose _New Message"
 msgstr "������ _�� �����"
 
-#: ../mail/e-mail-reader.c:1281
+#: ../mail/e-mail-reader.c:1336
 msgid "Open a window for composing a mail message"
 msgstr "���� � ����� �� �������� � ��� �����"
 
-#: ../mail/e-mail-reader.c:1286
+#: ../mail/e-mail-reader.c:1341
 msgid "_Open in New Window"
 msgstr "_���� �� �� �����"
 
-#: ../mail/e-mail-reader.c:1288
+#: ../mail/e-mail-reader.c:1343
 msgid "Open the selected messages in a new window"
 msgstr "���� � �������� ������� �� � �� �����"
 
-#: ../mail/e-mail-reader.c:1293
+#: ../mail/e-mail-reader.c:1348
 msgid "_Move to Folder..."
 msgstr "_��� � �����..."
 
-#: ../mail/e-mail-reader.c:1295
+#: ../mail/e-mail-reader.c:1350
 msgid "Move selected messages to another folder"
 msgstr "��� �������� ������� � ����� �����"
 
-#: ../mail/e-mail-reader.c:1300
+#: ../mail/e-mail-reader.c:1355
 msgid "_Next Message"
 msgstr "_����� �����"
 
-#: ../mail/e-mail-reader.c:1302
+#: ../mail/e-mail-reader.c:1357
 msgid "Display the next message"
 msgstr "������ � ����� �����"
 
-#: ../mail/e-mail-reader.c:1307
+#: ../mail/e-mail-reader.c:1362
 msgid "Next _Important Message"
 msgstr "����� _�������� �����"
 
-#: ../mail/e-mail-reader.c:1309
+#: ../mail/e-mail-reader.c:1364
 msgid "Display the next important message"
 msgstr "������ � ����� �������� �����"
 
-#: ../mail/e-mail-reader.c:1314
+#: ../mail/e-mail-reader.c:1369
 msgid "Next _Thread"
 msgstr "����� _����"
 
-#: ../mail/e-mail-reader.c:1316
+#: ../mail/e-mail-reader.c:1371
 msgid "Display the next thread"
 msgstr "������ � ����� ����"
 
-#: ../mail/e-mail-reader.c:1321
+#: ../mail/e-mail-reader.c:1376
 msgid "Next _Unread Message"
 msgstr "����� _����� �����"
 
-#: ../mail/e-mail-reader.c:1323
+#: ../mail/e-mail-reader.c:1378
 msgid "Display the next unread message"
 msgstr "������ � ����� ����� �����"
 
-#: ../mail/e-mail-reader.c:1328
+#: ../mail/e-mail-reader.c:1383
 msgid "_Previous Message"
 msgstr "_������� �����"
 
-#: ../mail/e-mail-reader.c:1330
+#: ../mail/e-mail-reader.c:1385
 msgid "Display the previous message"
 msgstr "������ � ������� �����"
 
-#: ../mail/e-mail-reader.c:1337
+#: ../mail/e-mail-reader.c:1390
+msgid "Pr_evious Important Message"
+msgstr "_������� �������� �����"
+
+#: ../mail/e-mail-reader.c:1392
 msgid "Display the previous important message"
 msgstr "������ � ������� �������� �����"
 
-#: ../mail/e-mail-reader.c:1344
+#: ../mail/e-mail-reader.c:1397
+msgid "P_revious Unread Message"
+msgstr "_������� ����� �����"
+
+#: ../mail/e-mail-reader.c:1399
 msgid "Display the previous unread message"
 msgstr "������ � ������� ����� �����"
 
-#: ../mail/e-mail-reader.c:1351
+#: ../mail/e-mail-reader.c:1406
 msgid "Print this message"
 msgstr "����� ��� �����"
 
-#: ../mail/e-mail-reader.c:1358
+#: ../mail/e-mail-reader.c:1413
 msgid "Preview the message to be printed"
 msgstr "����� � ����� � �� �������"
 
-#: ../mail/e-mail-reader.c:1365
+#: ../mail/e-mail-reader.c:1418
+msgid "Re_direct"
+msgstr "_�������"
+
+#: ../mail/e-mail-reader.c:1420
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "������� (����) � �������� ����� � ������"
 
-#: ../mail/e-mail-reader.c:1370
-#: ../modules/calendar/e-cal-shell-view-actions.c:1368
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "����� � _��"
 
-#: ../mail/e-mail-reader.c:1372
+#: ../mail/e-mail-reader.c:1427
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "������ � ����� � �� � ���������� � � �������� �����"
 
-#: ../mail/e-mail-reader.c:1377
+#: ../mail/e-mail-reader.c:1432
 msgid "Reply to _List"
 msgstr "����� � _����"
 
-#: ../mail/e-mail-reader.c:1379
+#: ../mail/e-mail-reader.c:1434
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "������ � ����� � � ����� ���� � � �������� �����"
 
-#: ../mail/e-mail-reader.c:1384 ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1439
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "_����� � �����"
 
-#: ../mail/e-mail-reader.c:1386
+#: ../mail/e-mail-reader.c:1441
 msgid "Compose a reply to the sender of the selected message"
 msgstr "������ � ����� � � ����� � � �������� �����"
 
-#: ../mail/e-mail-reader.c:1398
+# not making any attempt at present to translate
+# timezone names
+#: ../mail/e-mail-reader.c:1446
+msgid "_Save as mbox..."
+msgstr "_��� �� mbox..."
+
+#: ../mail/e-mail-reader.c:1448
+msgid "Save selected messages as an mbox file"
+msgstr "��� �������� ������� �� �� mbox ���"
+
+#: ../mail/e-mail-reader.c:1453
 msgid "Search Folder from Mailing _List..."
 msgstr "��� ����� ���� ����� _����..."
 
-#: ../mail/e-mail-reader.c:1400
+#: ../mail/e-mail-reader.c:1455
 msgid "Create a search folder for this mailing list"
 msgstr "����� � ��� ����� �� ��� ����� ����"
 
-#: ../mail/e-mail-reader.c:1407
+#: ../mail/e-mail-reader.c:1460
+msgid "Search Folder from Recipien_ts..."
+msgstr "��� ����� ���� _����������..."
+
+#: ../mail/e-mail-reader.c:1462
 msgid "Create a search folder for these recipients"
 msgstr "����� � ��� ����� �� ��� ����������"
 
-#: ../mail/e-mail-reader.c:1414
+#: ../mail/e-mail-reader.c:1467
+msgid "Search Folder from Sen_der..."
+msgstr "��� ����� ���� _�����..."
+
+#: ../mail/e-mail-reader.c:1469
 msgid "Create a search folder for this sender"
 msgstr "����� � ��� ����� �� ��� �����"
 
-#: ../mail/e-mail-reader.c:1421
+#: ../mail/e-mail-reader.c:1474
+msgid "Search Folder from S_ubject..."
+msgstr "��� ����� ���� _�������..."
+
+#: ../mail/e-mail-reader.c:1476
 msgid "Create a search folder for this subject"
 msgstr "����� � ��� ����� �� ��� �������"
 
-#: ../mail/e-mail-reader.c:1426
-msgid "Select _All Text"
-msgstr "������ _�� �����"
-
-#: ../mail/e-mail-reader.c:1428
-msgid "Select all the text in a message"
-msgstr "������ �� � ����� �� � �����"
-
-#: ../mail/e-mail-reader.c:1433
+#: ../mail/e-mail-reader.c:1481
 msgid "_Message Source"
 msgstr "_����� ���"
 
-#: ../mail/e-mail-reader.c:1435
+#: ../mail/e-mail-reader.c:1483
 msgid "Show the raw email source of the message"
 msgstr "�� � �� ���� ��� � � �����"
 
-#: ../mail/e-mail-reader.c:1454
+#, fuzzy
+#: ../mail/e-mail-reader.c:1495
+msgid "_Undelete Message"
+msgstr "_Undelete �����"
+
+#, fuzzy
+#: ../mail/e-mail-reader.c:1497
+msgid "Undelete the selected messages"
+msgstr "Undelete � �������� �������"
+
+#: ../mail/e-mail-reader.c:1502
 msgid "_Normal Size"
 msgstr "_����� ���"
 
-#: ../mail/e-mail-reader.c:1456
+#: ../mail/e-mail-reader.c:1504
 msgid "Reset the text to its original size"
 msgstr "����� � ����� � ��� ������� ���"
 
-#: ../mail/e-mail-reader.c:1461
+#: ../mail/e-mail-reader.c:1509
 msgid "_Zoom In"
 msgstr "_��� ��"
 
-#: ../mail/e-mail-reader.c:1463
+#: ../mail/e-mail-reader.c:1511
 msgid "Increase the text size"
 msgstr "������ � ����� ���"
 
-#: ../mail/e-mail-reader.c:1468
+#: ../mail/e-mail-reader.c:1516
 msgid "Zoom _Out"
 msgstr "��� _��"
 
-#: ../mail/e-mail-reader.c:1470
+#: ../mail/e-mail-reader.c:1518
 msgid "Decrease the text size"
 msgstr "������ � ����� ���"
 
-#: ../mail/e-mail-reader.c:1498
+#: ../mail/e-mail-reader.c:1525
+msgid "Create R_ule"
+msgstr "����� _���"
+
+#: ../mail/e-mail-reader.c:1532
+msgid "Ch_aracter Encoding"
+msgstr "_������� �������"
+
+#: ../mail/e-mail-reader.c:1539
+msgid "F_orward As"
+msgstr "_����� ��"
+
+#: ../mail/e-mail-reader.c:1546
 msgid "_Go To"
 msgstr "_�� �"
 
-#: ../mail/e-mail-reader.c:1512
+#: ../mail/e-mail-reader.c:1553
+msgid "Mar_k As"
+msgstr "_��� ��"
+
+#: ../mail/e-mail-reader.c:1560
 msgid "_Message"
 msgstr "_�����"
 
-#: ../mail/e-mail-reader.c:1519
+#: ../mail/e-mail-reader.c:1567
 msgid "_Zoom"
 msgstr "_���"
 
-#: ../mail/e-mail-reader.c:1548
+#: ../mail/e-mail-reader.c:1592
+msgid "Mark for Follo_w Up..."
+msgstr "��� �� _���� ��..."
+
+#: ../mail/e-mail-reader.c:1600
 msgid "Mark as _Important"
 msgstr "��� �� _��������"
 
-#: ../mail/e-mail-reader.c:1552
+#: ../mail/e-mail-reader.c:1604
 msgid "Mark as _Junk"
 msgstr "��� �� _����"
 
-#: ../mail/e-mail-reader.c:1556
+#: ../mail/e-mail-reader.c:1608
 msgid "Mark as _Not Junk"
 msgstr "��� �� _��� ����"
 
-#: ../mail/e-mail-reader.c:1560
+#: ../mail/e-mail-reader.c:1612
 msgid "Mar_k as Read"
-msgstr "Mar_k �� ���"
+msgstr "_��� �� ���"
 
-#: ../mail/e-mail-reader.c:1568
+#: ../mail/e-mail-reader.c:1616
+msgid "Mark as Uni_mportant"
+msgstr "��� �� _����������"
+
+#: ../mail/e-mail-reader.c:1620
 msgid "Mark as _Unread"
 msgstr "��� �� _�����"
 
-#: ../mail/e-mail-reader.c:1606
+#, fuzzy
+#: ../mail/e-mail-reader.c:1656
+msgid "_Caret Mode"
+msgstr "_Caret ���"
+
+#: ../mail/e-mail-reader.c:1658
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "�� � ������� ���� �� � ���� � ������� �������"
 
-#: ../mail/e-mail-reader.c:1612
+#: ../mail/e-mail-reader.c:1664
 msgid "All Message _Headers"
 msgstr "�� ����� _�����"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1666
 msgid "Show messages with all email headers"
 msgstr "�� ������� ��� �� ���� �����"
 
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:1880
 msgid "Unable to retrieve message"
 msgstr "������ � ������ �����"
 
+#, c-format
+#: ../mail/e-mail-reader.c:1884 ../mail/e-mail-reader.c:1944
+#: ../mail/mail-ops.c:1843
+msgid "Retrieving message '%s'"
+msgstr "�������� ����� '%s'"
+
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2460
 #: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:612
-#: ../plugins/google-account-setup/google-source.c:783
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "������"
 
-#: ../mail/e-mail-reader.c:2414 ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2581
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "_�����"
 
-#: ../mail/e-mail-reader.c:2415
+#: ../mail/e-mail-reader.c:2582
 msgid "Forward the selected message to someone"
 msgstr "����� � �������� ����� � ������"
 
-#: ../mail/e-mail-reader.c:2463 ../mail/em-filter-i18n.h:14
-#: ../modules/addressbook/e-book-shell-view-actions.c:979
-#: ../modules/calendar/e-cal-shell-view-actions.c:1692
-#: ../modules/calendar/e-memo-shell-view-actions.c:911
-#: ../modules/calendar/e-task-shell-view-actions.c:1111
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../mail/e-mail-reader.c:2626 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "�����"
 
-#: ../mail/e-mail-reader.c:2467
-#: ../modules/calendar/e-cal-shell-view-actions.c:1200
+#: ../mail/e-mail-reader.c:2630
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "�����"
 
-#: ../mail/e-mail-reader.c:2471
-#: ../modules/calendar/e-cal-shell-view-actions.c:1193
+#: ../mail/e-mail-reader.c:2634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "�������"
 
-#: ../mail/e-mail-reader.c:2475 ../mail/message-tag-followup.c:62
+#: ../mail/e-mail-reader.c:2638 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "�����"
 
-#: ../mail/e-mail-search-bar.c:77
-#, c-format
-msgid "Matches: %d"
-msgstr "�����: %d"
-
-#: ../mail/e-mail-search-bar.c:552
-msgid "Close the find bar"
-msgstr "���� � ���� ��"
-
-#: ../mail/e-mail-search-bar.c:560
-msgid "Fin_d:"
-msgstr "���_�:"
-
-#: ../mail/e-mail-search-bar.c:572
-msgid "Clear the search"
-msgstr "��� � ���"
-
-#: ../mail/e-mail-search-bar.c:595
-msgid "_Previous"
-msgstr "_�������"
-
-#: ../mail/e-mail-search-bar.c:601
-msgid "Find the previous occurrence of the phrase"
-msgstr "���� � ������� ������ � � ����"
-
-#: ../mail/e-mail-search-bar.c:611
-msgid "_Next"
-msgstr "_�����"
-
-#: ../mail/e-mail-search-bar.c:617
-msgid "Find the next occurrence of the phrase"
-msgstr "���� � ����� ������ � � ����"
-
-#: ../mail/e-mail-search-bar.c:627
-msgid "Mat_ch case"
-msgstr "��_� ���"
-
-#: ../mail/e-mail-search-bar.c:655
-msgid "Reached bottom of page, continued from top"
-msgstr "���� ����� � ���, �������� ���� ���"
-
-#: ../mail/e-mail-search-bar.c:677
-msgid "Reached top of page, continued from bottom"
-msgstr "���� ��� � ���, �������� ���� �����"
-
-#. On This Computer is always first, and Search Folders
-#. * is always last.
-#. create the local source group
-#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:144
-#: ../mail/em-folder-tree-model.c:146 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1563
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:120
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:107
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:110
-#: ../modules/calendar/e-task-shell-migrate.c:501
-#: ../modules/mail/e-mail-shell-migrate.c:2932
-msgid "On This Computer"
-msgstr "�� ��� �������"
+#: ../mail/e-mail-tag-editor.c:292
+msgid "Flag to Follow Up"
+msgstr "���� � ���� ��"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:485
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:73
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "�� ���������"
 
 #. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:121
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "TLS ���������"
+
+#. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:493
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL ���������"
 
-#: ../mail/em-account-editor.c:584
 #, c-format
+#: ../mail/em-account-editor.c:594
 msgid "%s License Agreement"
 msgstr "%s ������ ��������"
 
-#: ../mail/em-account-editor.c:591
 #, c-format
+#: ../mail/em-account-editor.c:601
 msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
+"\nPlease read carefully the license agreement\nfor %s displayed below\nand "
+"tick the check box for accepting it\n"
 msgstr ""
-"\n"
-"���� ��� ������ � ������ ��������\n"
-"�� %s ������� ����\n"
-"� ��� � ��� ���� �� �������� ��\n"
+"\n���� ��� ������ � ������ ��������\n�� %s ������� ����\n� ��� � ��� ���� �� "
+"�������� ��\n"
 
-#: ../mail/em-account-editor.c:664 ../mail/em-filter-folder-element.c:255
-msgid "Select Folder"
-msgstr "������ �����"
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "���"
 
-#: ../mail/em-account-editor.c:999
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "����"
 
-#: ../mail/em-account-editor.c:1000
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "�����"
 
-#: ../mail/em-account-editor.c:1001
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "��� �� �� �����"
 
-#: ../mail/em-account-editor.c:2076
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "���"
+
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "��� ������������"
 
-#: ../mail/em-account-editor.c:2077
+#: ../mail/em-account-editor.c:2057
 msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
+"Welcome to the Evolution Mail Configuration Assistant.\n\nClick \"Forward\" "
+"to begin."
 msgstr ""
-"������ � � ·�������� ��� ������������ ��������.\n"
-"\n"
-"���� \"�����\" � �����."
+"������ � � ·�������� ��� ������������ ��������.\n\n���� \"�����\" � �����."
 
-#: ../mail/em-account-editor.c:2079 ../mail/em-account-editor.c:2214
-#: ../mail/mail-config.glade.h:86
-msgid "Identity"
-msgstr "��������"
-
-#: ../mail/em-account-editor.c:2080
+#: ../mail/em-account-editor.c:2060
 msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"Please enter your name and email address below. The \"optional\" fields below "
+"do not need to be filled in, unless you wish to include this information in "
+"email you send."
 msgstr ""
 "���� ���� �� ��� � ���� ����� ����. � \"�������\" ����� ���� �� ��� ��� � �� "
 "���� ��, ����� � ��� � ������ ��� ��������� �� ���� � ����."
 
-#: ../mail/em-account-editor.c:2082 ../mail/em-account-editor.c:2255
-#: ../mail/mail-config.glade.h:106
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2227
+#: ../mail/mail-config.ui.h:91
 msgid "Receiving Email"
 msgstr "������� ����"
 
-#: ../mail/em-account-editor.c:2083
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "���� �������� � ������ ����� ������."
 
-#: ../mail/em-account-editor.c:2085 ../mail/em-account-editor.c:2715
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2705
 msgid "Sending Email"
 msgstr "������ ����"
 
-#: ../mail/em-account-editor.c:2086
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -7616,98 +10050,103 @@ msgstr ""
 "���� ���� ��������� ���� � �� � ��� ���� ���. �� � � ��� ���, ��� �� ������ "
 "������������ � ·������� ����� �������."
 
-#: ../mail/em-account-editor.c:2088
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "����� ���������"
 
-#: ../mail/em-account-editor.c:2089
+#: ../mail/em-account-editor.c:2069
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
+"Please enter a descriptive name for this account in the space below.\nThis "
+"name will be used for display purposes only."
 msgstr ""
-"���� ���� � ���������� ��� �� ��� ����� �� � ���� ����.\n"
-"��� ��� ��� �� ��� �� ������ ������� ����."
+"���� ���� � ���������� ��� �� ��� ����� �� � ���� ����.\n��� ��� ��� �� ��� "
+"�� ������ ������� ����."
 
-#: ../mail/em-account-editor.c:2093
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "���"
 
-#: ../mail/em-account-editor.c:2094
+#: ../mail/em-account-editor.c:2074
 msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
+"Congratulations, your mail configuration is complete.\n\nYou are now ready to "
+"send and receive email using Evolution.\n\nClick \"Apply\" to save your "
+"settings."
 msgstr ""
-"���������������, �� ��� ������������ �� �������.\n"
-"\n"
-"� � �� ���� � ���� � ����� ���� ���� ·��������.\n"
-"\n"
-"���� \"����\" � ��� �� ������."
+"���������������, �� ��� ������������ �� �������.\n\n� � �� ���� � ���� � "
+"����� ���� ���� ·��������.\n\n���� \"����\" � ��� �� ������."
 
-#: ../mail/em-account-editor.c:2527
+#: ../mail/em-account-editor.c:2514
 msgid "Check for _new messages every"
 msgstr "��� �� _�� ������� ����"
 
-#: ../mail/em-account-editor.c:2535
+#: ../mail/em-account-editor.c:2522
 msgid "minu_tes"
 msgstr "����_��"
 
-#: ../mail/em-account-editor.c:2777 ../mail/mail-config.glade.h:62
-msgid "Defaults"
-msgstr "�������"
-
-#: ../mail/em-account-editor.c:2843 ../mail/mail-config.glade.h:112
+#: ../mail/em-account-editor.c:2831 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "���������"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2880 ../mail/em-account-editor.c:2948
+#: ../mail/em-account-editor.c:2876 ../mail/em-account-editor.c:2944
 msgid "Receiving Options"
 msgstr "������� ������"
 
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
 msgid "Checking for New Messages"
 msgstr "����� �� �� �������"
 
-#: ../mail/em-account-editor.c:3408 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3413
 msgid "Account Editor"
 msgstr "����� �����"
 
-#: ../mail/em-account-editor.c:3408
+#: ../mail/em-account-editor.c:3413
 msgid "Evolution Account Assistant"
 msgstr "·�������� ����� ��������"
 
-#: ../mail/em-composer-utils.c:1622
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr "�� ���������� ����� ��������, ����� � � ����� ��� ��� �������."
+#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
+#, c-format
+#: ../mail/em-composer-utils.c:1570
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr "�� ����� � %s ���� \"%s\" �� %s ��� ��� ���."
 
-#: ../mail/em-composer-utils.c:1628
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "�� ����� ���� � ��, ����� � � ����� ��� ��� �������."
+#. Translators: %s is the subject of the email message
+#, c-format
+#: ../mail/em-composer-utils.c:1618
+msgid "Delivery Notification for: \"%s\""
+msgstr "������� ����������� ��: \"%s\""
 
-#: ../mail/em-composer-utils.c:2071
+#: ../mail/em-composer-utils.c:1947
 msgid "an unknown sender"
 msgstr "�� ���� �����"
 
-#: ../mail/em-composer-utils.c:2262
+#. 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:1994
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"�� ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} �� ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} ���:"
+
+#: ../mail/em-composer-utils.c:2138
 msgid "-----Original Message-----"
 msgstr "-----������� �����-----"
 
-#: ../mail/em-composer-utils.c:2442
+#: ../mail/em-composer-utils.c:2319
 msgid "Posting destination"
 msgstr "������ ����������"
 
-#: ../mail/em-composer-utils.c:2443
+#: ../mail/em-composer-utils.c:2320
 msgid "Choose folders to post the message to."
 msgstr "��� ������ � ���� � ����� �."
 
-#: ../mail/em-filter-editor.c:188
-msgid "_Filter Rules"
-msgstr "_����� ����"
+#: ../mail/em-filter-folder-element.c:260
+msgid "Select Folder"
+msgstr "������ �����"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -7726,10 +10165,6 @@ msgstr "���� ���"
 msgid "Beep"
 msgstr "���"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "Cc"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "��������� ��"
@@ -7790,7 +10225,7 @@ msgstr "���� ��"
 msgid "Forward to"
 msgstr "����� �"
 
-#: ../mail/em-filter-i18n.h:30 ../modules/mail/e-mail-shell-migrate.c:956
+#: ../mail/em-filter-i18n.h:30
 msgid "Important"
 msgstr "��������"
 
@@ -7818,7 +10253,7 @@ msgstr "�� ��� ���"
 msgid "is set"
 msgstr "�� ���"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:87
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:62
 msgid "Junk"
 msgstr "����"
 
@@ -7866,8 +10301,8 @@ msgstr "��� � �������"
 msgid "Play Sound"
 msgstr "��� ����"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "���"
 
@@ -7875,6 +10310,10 @@ msgstr "���"
 msgid "Recipients"
 msgstr "����������"
 
+#: ../mail/em-filter-i18n.h:56
+msgid "Regex Match"
+msgstr "������ ���"
+
 #: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "������ �"
@@ -7915,6 +10354,10 @@ msgstr "��� �����"
 msgid "Set Status"
 msgstr "��� ������"
 
+#: ../mail/em-filter-i18n.h:67
+msgid "Size (kB)"
+msgstr "��� (kB)"
+
 #: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "����� ���"
@@ -7940,16 +10383,16 @@ msgid "Unset Status"
 msgstr "����� ������"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "���"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "�� ��_���"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "����� �����:"
@@ -7957,24 +10400,24 @@ msgstr[1] "����� �������:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "����� �����:"
 msgstr[1] "����� �������:"
 
-#: ../mail/em-folder-properties.c:196
 #, c-format
+#: ../mail/em-folder-properties.c:148
 msgid "Quota usage (%s):"
 msgstr "����� ���� (%s):"
 
-#: ../mail/em-folder-properties.c:198
 #, c-format
+#: ../mail/em-folder-properties.c:150
 msgid "Quota usage"
 msgstr "����� ����"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "����� ��������"
 
@@ -7982,35 +10425,37 @@ msgstr "����� ��������"
 msgid "<click here to select a folder>"
 msgstr "<���� �� � ������ � �����>"
 
-#: ../mail/em-folder-selector.c:267
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "�_����"
 
-#: ../mail/em-folder-selector.c:271
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "����� _���:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
-#: ../mail/mail-vfolder.c:968 ../mail/mail-vfolder.c:1024
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1070 ../mail/mail-vfolder.c:1135
 msgid "Search Folders"
 msgstr "��� ������"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "������"
 
-#: ../mail/em-folder-tree-model.c:648 ../mail/em-folder-tree-model.c:985
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1086
 msgid "Loading..."
 msgstr "�����..."
 
-#: ../mail/em-folder-tree.c:188
 #, c-format
+#: ../mail/em-folder-tree.c:183
 msgid "Scanning folders in \"%s\""
 msgstr "������ ������ �� \"%s\""
 
-#: ../mail/em-folder-tree.c:445
+#: ../mail/em-folder-tree.c:596
 msgid "Folder names cannot contain '/'"
 msgstr "����� ���� ����� ������ '/'"
 
@@ -8032,80 +10477,85 @@ msgstr "ð�‘“ð�‘´ð�‘¤ð�‘›ð�‘¼ ð�‘¯ð�‘±ð�‘¥ð�‘Ÿ ð�‘’ð�‘¨ð�‘¯ð�‘ªð�‘‘ ð�‘’ð�‘©ð�‘¯ð
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:978
 #, c-format
+#: ../mail/em-folder-tree.c:1078
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1309
+#: ../mail/em-folder-tree.c:1286
 msgid "Mail Folder Tree"
 msgstr "��� ����� ���"
 
-#: ../mail/em-folder-tree.c:1476
 #, c-format
+#: ../mail/em-folder-tree.c:1583 ../mail/em-folder-utils.c:92
 msgid "Moving folder %s"
 msgstr "����� ����� %s"
 
-#: ../mail/em-folder-tree.c:1478
 #, c-format
+#: ../mail/em-folder-tree.c:1585 ../mail/em-folder-utils.c:94
 msgid "Copying folder %s"
 msgstr "������ ����� %s"
 
-#: ../mail/em-folder-tree.c:1485 ../mail/message-list.c:2076
 #, c-format
+#: ../mail/em-folder-tree.c:1592 ../mail/message-list.c:2106
 msgid "Moving messages into folder %s"
 msgstr "����� ������� ���� ����� %s"
 
-#: ../mail/em-folder-tree.c:1487 ../mail/message-list.c:2078
 #, c-format
+#: ../mail/em-folder-tree.c:1594 ../mail/message-list.c:2108
 msgid "Copying messages into folder %s"
 msgstr "������ ������� ���� ����� %s"
 
-#: ../mail/em-folder-utils.c:98
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "������ `%s' � `%s'"
+#: ../mail/em-folder-tree.c:1609
+msgid "Cannot drop message(s) into toplevel store"
+msgstr "����� ���� �����(��) ���� toplevel ���"
 
-#: ../mail/em-folder-utils.c:382
+#: ../mail/em-folder-utils.c:379
 msgid "Move Folder To"
 msgstr "��� ����� �"
 
-#: ../mail/em-folder-utils.c:382
+#: ../mail/em-folder-utils.c:379
 msgid "Copy Folder To"
 msgstr "���� ����� �"
 
-#: ../mail/em-folder-utils.c:495
-#: ../plugins/groupwise-features/share-folder-common.c:142
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "������� ����� `%s'"
+#: ../mail/em-folder-utils.c:509
+#: ../plugins/groupwise-features/share-folder-common.c:138
+msgid "Creating folder '%s'"
+msgstr "������� ����� '%s'"
 
-#: ../mail/em-folder-utils.c:657
+#: ../mail/em-folder-utils.c:672
 msgid "Create Folder"
 msgstr "����� �����"
 
-#: ../mail/em-folder-utils.c:658
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:351
+#: ../mail/em-folder-utils.c:673
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
 msgid "Specify where to create the folder:"
 msgstr "������� �� � ����� � �����:"
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1492
+#, c-format
+#, fuzzy
+#: ../mail/em-folder-utils.c:693
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Unsubscribing ���� ����� \"%s\""
+
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "������"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "��� ����� �� ��� ����. �� �� �� ������ ��� ��� ����� �� �������."
 
-#: ../mail/em-format-html-display.c:108 ../mail/em-format-html.c:1493
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "����� �������"
 
-#: ../mail/em-format-html-display.c:108
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -8113,78 +10563,81 @@ msgstr ""
 "��� ����� �� ���� � �� ����� ����� ��� �� �� ���� ����� ��� ��� ����� �� "
 "�������."
 
-#: ../mail/em-format-html-display.c:109 ../mail/em-format-html.c:1494
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "������� �������"
 
-#: ../mail/em-format-html-display.c:109
+#: ../mail/em-format-html-display.c:92
 msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+"The signature of this message cannot be verified, it may have been altered in "
+"transit."
 msgstr ""
 "� ������� � ��� ����� ����� �� �������, �� �� ��� ��� ����� �� �������."
 
-#: ../mail/em-format-html-display.c:110 ../mail/em-format-html.c:1495
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
 msgid "Valid signature, but cannot verify sender"
 msgstr "����� �������, ��� ����� ������ �����"
 
-#: ../mail/em-format-html-display.c:110
+#: ../mail/em-format-html-display.c:93
 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:111 ../mail/em-format-html.c:1496
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
 msgid "Signature exists, but need public key"
 msgstr "������� �������, ��� ��� ������ ��"
 
-#: ../mail/em-format-html-display.c:111
+#: ../mail/em-format-html-display.c:94
 msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+"This message is signed with a signature, but there is no corresponding public "
+"key."
 msgstr "��� ����� �� ���� ��� � �������, ��� �� �� �� ���������� ������ ��."
 
-#: ../mail/em-format-html-display.c:118
+#, fuzzy
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
+msgid "Unencrypted"
+msgstr "Unencrypted"
+
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
-"��� ����� �� ��� ���������. ��� ������� �� �� ��� �� ������� ����� � "
-"·�������."
+"��� ����� �� ��� ���������. ��� ������� �� �� ��� �� ������� ����� � ·�������."
 
-#: ../mail/em-format-html-display.c:119 ../mail/em-format-html.c:1503
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "���������, ���"
 
-#: ../mail/em-format-html-display.c:119
+#: ../mail/em-format-html-display.c:102
 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:120 ../mail/em-format-html.c:1504
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "���������"
 
-#: ../mail/em-format-html-display.c:120
+#: ../mail/em-format-html-display.c:103
 msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+"This message is encrypted.  It would be difficult for an outsider to view the "
+"content of this message."
 msgstr ""
-"��� ����� �� ���������.  �� ��� �� �������� �� �� ������ � �� � ������� � "
-"��� �����."
+"��� ����� �� ���������.  �� ��� �� �������� �� �� ������ � �� � ������� � ��� "
+"�����."
 
-#: ../mail/em-format-html-display.c:121 ../mail/em-format-html.c:1505
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "���������, �����"
 
-#: ../mail/em-format-html-display.c:121
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -8193,117 +10646,146 @@ msgstr ""
 "��� ����� �� ���������, ��� � ����� ��������� ��������. �� ��� �� ���� "
 "�������� �� �� ������ � �� � ������� � ��� ����� �� � ��������� ����� � ���."
 
-#: ../mail/em-format-html-display.c:253 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "_�� ���������"
 
-#: ../mail/em-format-html-display.c:787
+#, fuzzy
+#: ../mail/em-format-html-display.c:248
+msgid "This certificate is not viewable"
+msgstr "��� ��������� �� ��� viewable"
+
+#, fuzzy
+#: ../mail/em-format-html-display.c:497
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"·�������� ����� ����� ��� ���� �� �� �� �� ��� � ������. � ��� �� �� "
+"unformatted � ��� �� �������� ����� �����."
+
+#: ../mail/em-format-html-display.c:726
 msgid "Completed on"
 msgstr "��������� ��"
 
-#: ../mail/em-format-html-display.c:795
+#: ../mail/em-format-html-display.c:734
 msgid "Overdue:"
 msgstr "�����:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:799
+#: ../mail/em-format-html-display.c:738
 msgid "by"
 msgstr "��"
 
-#: ../mail/em-format-html-display.c:1255
+#, fuzzy
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
+msgid "View _Unformatted"
+msgstr "�� _Unformatted"
+
+#, fuzzy
+#: ../mail/em-format-html-display.c:950
+msgid "Hide _Unformatted"
+msgstr "��� _Unformatted"
+
+#: ../mail/em-format-html-display.c:1012
 msgid "O_pen With"
 msgstr "�_��� ���"
 
-#: ../mail/em-format-html-print.c:163
 #, c-format
+#: ../mail/em-format-html-print.c:163
 msgid "Page %d of %d"
 msgstr "��� %d � %d"
 
-#: ../mail/em-format-html.c:163
+#: ../mail/em-format-html.c:147
 msgid "Formatting message"
 msgstr "������� �����"
 
-#: ../mail/em-format-html.c:354
+#: ../mail/em-format-html.c:338
 msgid "Formatting Message..."
 msgstr "������� �����..."
 
-#: ../mail/em-format-html.c:1343 ../mail/em-format-html.c:1352
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "�������� `%s'"
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
+msgid "Retrieving '%s'"
+msgstr "�������� '%s'"
 
-#: ../mail/em-format-html.c:1804
+#: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
 msgstr "���� ��������-���� ���."
 
-#: ../mail/em-format-html.c:1812
+#: ../mail/em-format-html.c:1862
 msgid "Malformed external-body part."
 msgstr "������� ��������-���� ���."
 
-#: ../mail/em-format-html.c:1853
 #, c-format
+#: ../mail/em-format-html.c:1892
+msgid "Pointer to FTP site (%s)"
+msgstr "����� � FTP ��� (%s)"
+
+#, c-format
+#: ../mail/em-format-html.c:1903
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "����� � ����� ��� (%s) ����� �� ��� \"%s\""
 
-#: ../mail/em-format-html.c:1855
 #, c-format
+#: ../mail/em-format-html.c:1905
 msgid "Pointer to local file (%s)"
 msgstr "����� � ����� ��� (%s)"
 
-#: ../mail/em-format-html.c:1876
 #, c-format
+#: ../mail/em-format-html.c:1926
 msgid "Pointer to remote data (%s)"
 msgstr "����� � ����� ���� (%s)"
 
-#: ../mail/em-format-html.c:1887
 #, c-format
+#: ../mail/em-format-html.c:1937
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "����� � ���� �������� ���� (\"%s\" ���)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#.
-#: ../mail/em-format-html.c:2530
 #, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "��� ����� ��� ���� �� <b>%s</b> �� ����� � <b>%s</b>"
+#: ../mail/em-format-html.c:2600
+msgid "This message was sent by %s on behalf of %s"
+msgstr "��� ����� ��� ���� �� %s �� ����� � %s"
 
-#: ../mail/em-subscribe-editor.c:597
+#: ../mail/em-subscribe-editor.c:668
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "��� ��� ��� ��� ����� ������������, � �� � ��� �������."
 
-#: ../mail/em-subscribe-editor.c:630
+#: ../mail/em-subscribe-editor.c:719
 msgid "Subscribed"
 msgstr "���������"
 
-#: ../mail/em-subscribe-editor.c:634
+#: ../mail/em-subscribe-editor.c:723
 msgid "Folder"
 msgstr "�����"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:853
+#: ../mail/em-subscribe-editor.c:1111
 msgid "Please select a server."
 msgstr "���� ������ � ����."
 
-#: ../mail/em-subscribe-editor.c:889
+#: ../mail/em-subscribe-editor.c:1157
 msgid "No server has been selected"
 msgstr "�� ���� ��� ��� ��������"
 
-#: ../mail/em-utils.c:307
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#, c-format
+#: ../mail/em-utils.c:106
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "� � ��� � ���� � ���� %d ������� �� ����?"
+msgstr[1] "� � ��� � ���� � ���� %d ������� �� ����?"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "����� ������"
 
-#: ../mail/em-utils.c:359
-msgid "message"
-msgstr "�����"
-
-#: ../mail/em-utils.c:647
-msgid "Save Message..."
-msgstr "��� �����..."
-
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1110
 #, c-format
+#: ../mail/em-utils.c:853
 msgid "Messages from %s"
 msgstr "������� ���� %s"
 
@@ -8311,14 +10793,10 @@ msgstr "������� ���� %s"
 msgid "Search _Folders"
 msgstr "��� _������"
 
-#: ../mail/em-vfolder-rule.c:517
+#: ../mail/em-vfolder-rule.c:521
 msgid "Add Folder"
 msgstr "�� �����"
 
-#: ../mail/em-vfolder-rule.c:594
-msgid "Search Folder source"
-msgstr "��� ����� ���"
-
 #: ../mail/evolution-mail.schemas.in.h:1
 msgid "\"Filter Editor\" window height"
 msgstr "\"����� �����\" ����� ���"
@@ -8356,46 +10834,53 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "\"���� � ����� ���\" ����� ����"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "���� ·�������� � ������ ����� ��� � ������� ���"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "����� ������� ��� �����"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "�������� �������� ����������"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "�������� ���� ����������"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "��� ������� ��� ���� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "������� ����� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "������� ����� ����."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "������� ����� ������ ���"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "������� ����� ������ ����"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "������� ���/���� ��������"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr "������� ������ � ������� �� �/CC/BCC"
+
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+"������� ������ � ������� �� �/CC/BCC � � ����� �������� �� address_count."
+
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -8403,74 +10888,116 @@ msgstr ""
 "�������� �� ���������� ����� ������ � ���������� ��� � ����� ��� ����. � "
 "������� ���� �� �� ���� 30 �������."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "������ ����� � �� ��� ����� �� ����."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"������ ����� � �� ��� ����� �� ����. � ���� �������� � ����� �� � ����� "
+"\"headername=����\"."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default charset in which to compose messages"
+msgstr "������ charset �� ��� � ������ �������"
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default charset in which to compose messages."
+msgstr "������ charset �� ��� � ������ �������."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Default charset in which to display messages"
+msgstr "������ charset �� ��� � ������ �������"
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid "Default charset in which to display messages."
+msgstr "������ charset �� ��� � ������ �������."
+
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "������ ����� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "������ ��� � � ������� �����."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "������ ��� � � ��� ����� �����."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "������ ��� � � �������� ������."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "������ ��������� ���� � � ��� ����� �����."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "������ ����� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "������ ���� �� ���� ������� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "������ ���� � � ������� �����."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "������ ���� � � ��� ����� �����."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "������ ���� � � �������� ������."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
-msgstr "�������� ���� � ��� �� ������� �� ���� ������� �� ����� ����� ��� ����"
+msgstr ""
+"�������� ���� � ��� �� ������� �� ���� ������� �� ����� ����� ��� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "�������� ���� � ����� �� ����� ��� �� ����� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+"�������� ���� � ����� � ����� ���� �� ����� ���. �� ����, �� ����� �� � ����. "
+"�� ���� �� �� � ���� ���� �� autocompletion. �� ��� �� ���, �� ����� ����� "
+"���� (��� LDAP) � ���� �� autocompletion."
+
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "�������� ���� � �� ������ ����� � ��� �� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
+"Determines whether to use custom headers to check for junk. If this option is "
+"enabled and the headers are mentioned, it will be improve the junk checking "
+"speed."
 msgstr ""
 "�������� ���� � �� ������ ����� � ��� �� ����. �� ��� ����� �� ������� � � "
 "����� � �������, �� ��� �� ������ � ���� ����� ����."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8478,14 +11005,28 @@ msgstr ""
 "�������� ���� � �� � ��� ����� �� ��� \"����\" � \"�������\" ���� �� � "
 "\"�������\" ����� �� ������� ��."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "�������� �� �����/������ ���� � �������."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "�������� �� ����� ��� ��������� ����."
 
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:47
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr "������� � ������ ellipsizing � ����� ���� �� ��� ��"
+
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "������ ���� ����� ������ ��� ������� ����� ���"
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Do not add signature delimiter"
+msgstr "�� ��� �� ������� delimiter"
+
 #: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
 msgstr "��� ������ �� ��������� �� ���� �� � ���."
@@ -8508,11 +11049,16 @@ msgstr "����� �� ���� ������
 
 #: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
+"Enable animated images in HTML mail. Many users find animated images annoying "
+"and prefer to see a static image instead."
 msgstr ""
-"������ �������� ������ �� HTML ���. ���� ���� ���� �������� ������ ����� "
-"� ����� � �� � ������ ���� ������."
+"������ �������� ������ �� HTML ���. ���� ���� ���� �������� ������ ����� � "
+"����� � �� � ������ ���� ������."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr "������ caret ���, �� ��� � ��� �� � ���� ��� ����� ���."
 
 #: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
@@ -8548,8 +11094,32 @@ msgstr ""
 "������ ��� � �� ���� �� �� � ����� �� ����� �����, ����� ���� � ������."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "������ � ����� ����� ����� ��� � ������� ���."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+"������ � ������ ���� ����� ������ ��� ������� ��� ������ �� "
+"'message_text_part_limit' ��."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable/disable caret mode"
+msgstr "������/������� caret ���"
+
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:46
+msgid "Encode file names in an Outlook/GMail way"
+msgstr "����� ��� ���� �� �� ·�����/GMail ��"
+
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr ""
+"����� ��� ���� �� � ��� ����� ��� �� ·����� � GMail ��, � ��� ��� ������ "
+"�������� ��� ���� ��� UTF-8 ����� ���� �� ·��������, ����� �� �� ��� ���� � "
+"RFC 2231, ��� �� � �������� RFC 2047 �������."
 
 #: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane"
@@ -8565,12 +11135,115 @@ msgstr "���� � ��-����� �����
 
 #: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
+"If a user tries to open 10 or more messages at one time, ask the user if they "
+"really want to do it."
 msgstr ""
 "�� � ��� ���� � ���� 10 � �� ������� �� ��� ���, ��� � ��� �� �� ���� ���� � "
 "�� ��."
 
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid ""
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
+msgstr ""
+"�� �� ���� � ������ ��� �� � �������� MIME ��� ����� ·��������, ��� MIME ���� "
+"����� �� ��� ���� ��� ��� � � ·������ ��������� ��� �� ·����� MIME ��� "
+"������� �� �� ��� �� �������� �������."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window vertically."
+msgstr ""
+"������ ��� � � \"����� �����\" �����. � ���� ������ �� � ��� resizes � ����� "
+"��������."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"������ ��� � � \"��� ����� �����\" �����. � ���� ������ �� � ��� resizes � "
+"����� ��������."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"������ ��� � � \"���� � ����� ���\" �����. � ���� ������ �� � ��� resizes � "
+"����� ��������."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"������ �������� ���� � � \"����� �����\" �����. � ���� ������ ��� � ��� "
+"���������� � unmaximizes � �����. ���, ��� �������� ���� �� ��� ��� �� "
+"·�������� ���� � \"����� �����\" ����� ����� �� ���������. ��� �� ������� "
+"���� �� �� ������������� �����."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"������ �������� ���� � � \"��� ����� �����\" �����. � ���� ������ ��� � ��� "
+"���������� � unmaximizes � �����. ���, ��� �������� ���� �� ��� ��� �� "
+"·�������� ���� � \"��� ����� �����\" ����� ����� �� ���������. ��� �� ������� "
+"���� �� �� ������������� �����."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:78
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"������ �������� ���� � � \"���� � ����� ���\" �����. � ���� ������ ��� � ��� "
+"���������� � unmaximizes � �����. ���, ��� �������� ���� �� ��� ��� �� "
+"·�������� ���� � \"���� � ����� ���\" ����� ����� �� ���������. ��� �� "
+"������� ���� �� �� ������������� �����."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+"������ ���� � � \"����� �����\" �����. � ���� ������ �� � ��� resizes � ����� "
+"�����������."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"������ ���� � � \"��� ����� �����\" �����. � ���� ������ �� � ��� resizes � "
+"����� �����������."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"������ ���� � � \"���� � ����� ���\" �����. � ���� ������ �� � ��� resizes � "
+"����� �����������."
+
 #: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
@@ -8581,11 +11254,11 @@ msgstr ""
 "����� ���������� ������ � �����, ��� ������ ������� �� ���� � ��� �������."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
 msgstr "���� ��� ����� ���� ��� ���"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
 msgstr "���� ��� ����� ���� ��� ���"
 
 #: ../mail/evolution-mail.schemas.in.h:85
@@ -8608,6 +11281,15 @@ msgstr "ð�‘¤ð�‘¦ð�‘•ð�‘‘ ð�‘� ð�‘¨ð�‘’ð�‘•ð�‘§ð�‘�ð�‘‘ð�‘©ð�‘› ð�‘¤ð�‘²ð�‘•ð�‘©ð
 msgid "List of accounts"
 msgstr "���� � ������"
 
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+"���� � ������ ��� � � ��� ��������� � ·��������. � ���� ������� ������ ����� "
+"subdirectories ������� � /���/·��������/���/������."
+
 #: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
 msgstr "���� � ������ ����� � ���� �� � �������."
@@ -8635,12 +11317,12 @@ msgstr "��� ������ �� HTML �����
 #: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
+"Never load images off the net. \"1\" - Load images in messages from contacts. "
+"\"2\" - Always load images off the net."
 msgstr ""
-"��� ������ �� HTML ������� ��� HTTP(S). ������� ����� �: \"0\" - "
-"���� ��� ������ �� � ���. \"1\" - ��� ������ �� ������� ���� ��������. \"2\" "
-"- ����� ��� ������ �� � ���."
+"��� ������ �� HTML ������� ��� HTTP(S). ������� ����� �: \"0\" - ���� ��� "
+"������ �� � ���. \"1\" - ��� ������ �� ������� ���� ��������. \"2\" - ����� "
+"��� ������ �� � ���."
 
 #: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
@@ -8650,6 +11332,16 @@ msgstr "��� ����� ������"
 msgid "Log filter actions to the specified log file."
 msgstr "��� ����� ������ � � �������� ��� ���."
 
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Logfile to log filter actions"
+msgstr "Logfile � ��� ����� ������"
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid "Logfile to log filter actions."
+msgstr "Logfile � ��� ����� ������."
+
 #: ../mail/evolution-mail.schemas.in.h:102
 msgid "Mail browser height"
 msgstr "��� ����� ���"
@@ -8679,189 +11371,228 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "��� �������� �� � ����� \"�����\"."
 
 #: ../mail/evolution-mail.schemas.in.h:109
+msgid "Message text limit for display"
+msgstr "����� ����� ����� �� ������"
+
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "�����-������ ���� (\"�����\", \"��� �����\", \"���\")"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the junk on exit"
 msgstr "������� ��� ������ ������� � ���� �� �����"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum days between emptying the trash on exit"
 msgstr "������� ��� ������ ������� � ���� �� �����"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "������� ��� ������ ������� � ���� �� �����, �� ���."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "������� ��� ������ ������� � ���� �� �����, �� ���."
 
 #: ../mail/evolution-mail.schemas.in.h:115
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr "����� � ������� � ������ �� �/CC/BCC"
+
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "������ �� ����� �������"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "������ � ��� ��� �� � �� ���� � ������� � �����."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "������ � ��� ��� �� � �� ���� � ���� � ����� ����� � �������."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "������ ��� ������� ������� �� ��� �����"
 
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:120
+msgid "Prompt when user expunges"
+msgstr "������ ��� ��� expunges"
+
 #: ../mail/evolution-mail.schemas.in.h:121
+msgid "Prompt when user only fills Bcc"
+msgstr "������ ��� ��� ���� ���� Bcc"
+
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "������ ��� ��� ���� � ���� 10 � �� ������� �� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
-"������ ��� ��� ���� � ���� HTML ��� � ���������� ��� �� ��� ���� � ����� "
-"HTML ���."
+"������ ��� ��� ���� � ���� HTML ��� � ���������� ��� �� ��� ���� � ����� HTML "
+"���."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "������ ��� ��� ���� � ���� � ����� ��� �� � � Cc ����������."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "������ ��� ��� ���� � ���� �������� HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "������ ��� ����� �������� �������"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr "��� ���������� �������� �� � ��� � ������"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "��� � ���� �� � ����� � ������"
 
+#, fuzzy
 #: ../mail/evolution-mail.schemas.in.h:129
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "�������� emoticons �� ����� � ������ ��� ��� ������."
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "�������� ����� �� ����� � ������ ���."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "��� ���� ���� �� ������� ���."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "��� ��������"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "��� �� � ����� ���� �� ����� ����� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "���� HTML ��� �� ������"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "���� HTML ��� �� ������."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "����� ����-����� ����� �� � ����� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "���� ������������� �������"
 
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+"��� � ��� �� ��� � �� ��� ���� � �� ������� delimiter ���� �� ������� ��� "
+"�������� � ���."
+
 #: ../mail/evolution-mail.schemas.in.h:139
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "�� \"Bcc\" ���� ��� ������ � ��� �����"
+
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "�� \"Cc\" ���� ��� ������ � ��� �����"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "�� \"����\" ���� ��� ������ � � �������"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"From\" field when sending a mail message"
 msgstr "�� \"����\" ���� ��� ������ � ��� �����"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "�� \"����� �\" ���� ��� ������ � � �������"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "�� \"����� �\" ���� ��� ������ � ��� �����"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "�� ���������"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show all message headers"
 msgstr "�� �� ����� �����"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show all the headers when viewing a messages."
 msgstr "�� �� � ����� ��� ���� � �������."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "�� �������� ������ �� ���������."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "�� ������� ������� (��� � �����-���) �� � �����-����."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr "�� ������� ������� �� � �����-����"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show image animations"
 msgstr "�� ���� ���������"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid "Show original \"Date\" header value."
+msgstr "�� �������� \"���\" ���� ����."
+
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "�� ���� � � �����"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"�� � \"Bcc\" ���� ��� ������ � ��� �����. ��� �� �������� ���� � �� ���� ��� "
+"� ��� ����� �� �����."
+
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"�� � \"Cc\" ���� ��� ������ � ��� �����. ��� �� �������� ���� � �� ���� "
-"��� � ��� ����� �� �����."
+"�� � \"Cc\" ���� ��� ������ � ��� �����. ��� �� �������� ���� � �� ���� ��� � "
+"��� ����� �� �����."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
-"�� � \"����\" ���� ��� ������ � � �������. ��� �� �������� ���� � �� ���� "
-"��� � ��� ����� �� �����."
+"�� � \"����\" ���� ��� ������ � � �������. ��� �� �������� ���� � �� ���� ��� "
+"� ��� ����� �� �����."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"�� � \"����\" ���� ��� ������ � ��� �����. ��� �� �������� ���� � �� ���� "
-"��� � ��� ����� �� �����."
-
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid "Show the \"Preview\" pane"
-msgstr "�� � \"�����\" ���"
-
-#: ../mail/evolution-mail.schemas.in.h:157
-msgid "Show the \"Preview\" pane."
-msgstr "�� � \"�����\" ���."
+"�� � \"����\" ���� ��� ������ � ��� �����. ��� �� �������� ���� � �� ���� ��� "
+"� ��� ����� �� �����."
 
 #: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
@@ -8881,49 +11612,60 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+"Show the email-address of the sender in a separate column in the message list."
 msgstr "�� � ����-����� � � ����� �� � ������ ����� �� � ����� ����."
 
 #: ../mail/evolution-mail.schemas.in.h:161
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+"�� � �������� \"���\" ���� (��� � ����� ��� ���� �� � ��� ��� �����). ������ "
+"����� �� \"���\" ���� ���� �� � ��� ������ ����� � ����� ��� ���."
+
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "�� � ���� � � ����� �� � ����� ����� ���."
 
+#, fuzzy
 #: ../mail/evolution-mail.schemas.in.h:163
+msgid "Spell check inline"
+msgstr "���� ��� inline"
+
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "���� ����� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "���� ����� ���������"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "�������� ������ ������ ���"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "�������� ������ ������ ����"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "������� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "����� ����� ��� �����"
-
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "� ������ ������ �� ���� ���"
 
 #: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
-msgstr "� ���� ��� ����� ���� ��� ���, �� ��� ���� � ����."
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "� ���� ��� ����� ���� ��� ���, �� ��� ���� ������� 1st, 1970 (����)."
 
 #: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
-msgstr "� ���� ��� ����� ���� ��� ���, �� ��� ���� � ����."
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "� ���� ��� ����� ���� ��� ���, �� ��� ���� ������� 1st, 1970 (����)."
 
 #: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
@@ -8933,8 +11675,8 @@ msgid ""
 "message list."
 msgstr ""
 "� ���� ���� �������� �� � ���� � ����� ��� �� ������� � � ����� ����. \"0\" "
-"(������ ��) ������ � ����� ��� ���� � ����� ����. \"1\" (������� ��) ������ "
-"� ����� ��� ����� � � ����� ����."
+"(������ ��) ������ � ����� ��� ���� � ����� ����. \"1\" (������� ��) ������ � "
+"����� ��� ����� � � ����� ����."
 
 #: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
@@ -8949,24 +11691,54 @@ msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
-"��� ��� ��� ��� ������� �����. \"0\" �� ���. \"1\" �� �������. \"2\" �� "
-"����� �������."
+"��� ��� ��� ��� ������� �����. \"0\" �� ���. \"1\" �� �������. \"2\" �� ����� "
+"�������."
+
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid ""
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value is "
+"used only when 'force_message_limit' key is activated."
+msgstr ""
+"��� ������ � ���� ��� � � ����� ����� ��� ��� �� ������� ���� ·��������, "
+"�������� �� ���� � KB. � ������ �� 4096 (4MB). ��� ���� �� ��� ���� ��� "
+"'force_message_limit' �� �� ���������."
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
+"enabled. If the default listed plugin is disabled, then it won't fall back to "
+"the other available plugins."
 msgstr ""
 "��� �� � ������ ���� ������, ���� �� �� � �������� ������� �������. �� � "
 "������ ������ ������ �� ��������, ��� �� ���'�� ��� ��� � � ��� �������� "
 "�������."
 
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid ""
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
+msgstr ""
+"��� �� �� ��� ���� ���� � ����� � \"����\" ���� ���. ��� unselects � ��� �� � "
+"���� � ������ � ����� �� ��� �����."
+
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is "
+"&lt;header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+"��� �� ��� ������ � ���� � XML �������� ��������� ������ �����, � ���� �� � � "
+"�� �������. � ����� � � XML ������� �� &lt;���� �������&gt; - ��� ������� �� "
+"� ���� �� � �� ������� �� � ��� ��."
+
 #: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
+"This option is related to the key lookup_addressbook and is used to determine "
+"whether to look up addresses in local address book only to exclude mail sent "
+"by known contacts from junk filtering."
 msgstr ""
 "��� ����� �� ������� � � �� lookup_addressbook � �� ��� � ������� ���� � ��� "
 "�� ������� �� ����� ����� ��� ���� � ������� ��� ���� �� ��� �������� ���� "
@@ -8986,11 +11758,11 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
+"This setting specifies whether the threads should be in expanded or collapsed "
+"state by default. Evolution requires a restart."
 msgstr ""
-"��� ����� �������� ���� � ����� ��� �� �� ��������� � ������� ���� �� "
-"������. ·�������� ������� � ������."
+"��� ����� �������� ���� � ����� ��� �� �� ��������� � ������� ���� �� ������. "
+"·�������� ������� � ������."
 
 #: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
@@ -8998,42 +11770,55 @@ msgid ""
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
-"��� ����� �������� ���� � ����� ��� �� ����� ���� �� ������ ����� �� �� "
-"����, ���� ��� �� �����'� ���. ·�������� ������� � ������."
+"��� ����� �������� ���� � ����� ��� �� ����� ���� �� ������ ����� �� �� ����, "
+"���� ��� �� �����'� ���. ·�������� ������� � ������."
 
 #: ../mail/evolution-mail.schemas.in.h:185
-msgid "Thread the message list."
-msgstr "���� � ����� ����."
-
-#: ../mail/evolution-mail.schemas.in.h:186
-msgid "Thread the message-list"
-msgstr "���� � �����-����"
-
-#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Thread the message-list based on Subject"
 msgstr "���� � �����-���� ���� �� �������"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Timeout for marking message as seen"
 msgstr "����� �� ����� ����� �� ���"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Timeout for marking message as seen."
 msgstr "����� �� ����� ����� �� ���."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:188
+msgid "UID string of the default account."
+msgstr "UID ����� � � ������ �����."
+
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:189
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr "������� ���� �� �������� ���� ��� ���� inline ������."
+
+#: ../mail/evolution-mail.schemas.in.h:190
+msgid "Use SpamAssassin daemon and client"
+msgstr "�� SpamAssassin ����� � ������"
+
+#: ../mail/evolution-mail.schemas.in.h:191
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "�� SpamAssassin ����� � ������ (spamc/spamd)."
+
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use custom fonts"
 msgstr "�� ������ �����"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use custom fonts for displaying mail."
 msgstr "�� ������ ����� �� �������� ���."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use only local spam tests."
 msgstr "�� ���� ����� ���� �����."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:195
+msgid "Use only the local spam tests (no DNS)."
+msgstr "�� ���� � ����� ���� ����� (�� DNS)."
+
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -9042,7 +11827,7 @@ msgstr ""
 "���� ��� �� �� �� ��� ��� �� � ���� ��� �� ��� ������� � � �����. ��� "
 "�������� ���� � ���� �� ����� �� � ��� � � ����� � � �����."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -9051,485 +11836,582 @@ msgstr ""
 "���� ��� �� �� �� ��� ��� �� �� ������� ��� �� ��� ������� � � �����. ��� "
 "�������� ���� � ������� �� ����� �� � ��� � � ����� � � �����."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Variable width font"
 msgstr "������� ���� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "���� � ��� ����� ������� ���� ���� � ���� ����� �� ������."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:200
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr "���� ������� ellipsizing ���� � ����� ���� �� ��� ��."
+
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+"Whether or not to fall back on threading by subjects when the messages do not "
+"contain In-Reply-To or References headers."
 msgstr ""
-"���� � ��� � ��� ��� �� ������ �� �������� ��� � ������� �� ��� ������ ��-"
-"�����-� � ��������� �����."
+"���� � ��� � ��� ��� �� ������ �� �������� ��� � ������� �� ��� ������ "
+"��-�����-� � ��������� �����."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "���� ��� ����� ���� �� ������ ����� �� ��� ����"
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Width of the message-list pane"
 msgstr "���� � � �����-���� ���"
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Width of the message-list pane."
 msgstr "���� � � �����-���� ���."
 
-#: ../mail/importers/elm-importer.c:179
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "������� ·��� ����"
 
-#: ../mail/importers/elm-importer.c:324 ../mail/importers/pine-importer.c:378
-#: ../modules/mail/e-mail-shell-view.c:591
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
+#: ../modules/mail/e-mail-shell-view.c:952
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "���"
 
-#: ../mail/importers/elm-importer.c:364
+#: ../mail/importers/elm-importer.c:365
 msgid "Evolution Elm importer"
 msgstr "·�������� ·��� ������"
 
-#: ../mail/importers/elm-importer.c:365
+#: ../mail/importers/elm-importer.c:366
 msgid "Import mail from Elm."
 msgstr "����� ��� ���� ·���."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "���������� �����:"
+#: ../mail/importers/evolution-mbox-importer.c:114
+msgid "_Destination folder:"
+msgstr "_���������� �����:"
 
-#: ../mail/importers/evolution-mbox-importer.c:87
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder"
 msgstr "������ �����"
 
-#: ../mail/importers/evolution-mbox-importer.c:87
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder to import into"
 msgstr "������ ����� � ����� ����"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:262
+#: ../shell/e-shell-utils.c:251
+msgid "Berkeley Mailbox (mbox)"
+msgstr "·����� ������� (mbox)"
+
+#: ../mail/importers/evolution-mbox-importer.c:263
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "������ ·����� ������� ����� ������"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "������� �������"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
 #, c-format
-msgid "Importing `%s'"
-msgstr "������� `%s'"
+#: ../mail/importers/mail-importer.c:149
+#: ../plugins/pst-import/pst-importer.c:453
+#: ../plugins/pst-import/pst-importer.c:559
+msgid "Importing '%s'"
+msgstr "������� '%s'"
 
-#: ../mail/importers/mail-importer.c:298
 #, c-format
+#: ../mail/importers/mail-importer.c:293
 msgid "Scanning %s"
 msgstr "������ %s"
 
-#: ../mail/importers/pine-importer.c:225
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "������� ·��� ����"
 
-#: ../mail/importers/pine-importer.c:383
-#: ../modules/addressbook/addressbook-config.c:1047
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "����� ���"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:418
 msgid "Evolution Pine importer"
 msgstr "·�������� ·��� ������"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:419
 msgid "Import mail from Pine."
 msgstr "����� ��� ���� ·���."
 
-#: ../mail/mail-autofilter.c:71
 #, c-format
+#: ../mail/mail-autofilter.c:70
 msgid "Mail to %s"
 msgstr "��� � %s"
 
-#: ../mail/mail-autofilter.c:234 ../mail/mail-autofilter.c:273
 #, c-format
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 msgid "Mail from %s"
 msgstr "��� ���� %s"
 
-#: ../mail/mail-autofilter.c:257
 #, c-format
+#: ../mail/mail-autofilter.c:256
 msgid "Subject is %s"
 msgstr "������� �� %s"
 
-#: ../mail/mail-autofilter.c:292
 #, c-format
+#: ../mail/mail-autofilter.c:291
 msgid "%s mailing list"
 msgstr "%s ����� ����"
 
-#: ../mail/mail-autofilter.c:364
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "�� ����� ���"
 
-#: ../mail/mail-config.glade.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(���: ������� ������ � � ���������)"
-
-#: ../mail/mail-config.glade.h:3
-msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>SSL �� ��� ������� �� ��� ���� � ·��������</b>"
-
-#: ../mail/mail-config.glade.h:4
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>����� ��������</b>"
-
-#: ../mail/mail-config.glade.h:5
-msgid "<b>Sig_natures</b>"
-msgstr "<b>���_������</b>"
-
-#: ../mail/mail-config.glade.h:6
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>��� ������ �����</b> (��� ����������)"
-
-#: ../mail/mail-config.glade.h:7
-msgid "<b>_Languages</b>"
-msgstr "<b>_���������</b>"
-
-#: ../mail/mail-config.glade.h:8
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">����� ���������</span>"
-
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">�����������</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">�������� �������</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">������������</span>"
-
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">������ �������</span>"
-
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">����� ���</span>"
-
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">������� ����� _�����</span>"
-
-#: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">������</span>"
-
-#: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">����� ������</span>"
-
-#: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">����� ������</span>"
-
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">����� �����</span>"
-
-#: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">����� ������</span>"
-
-#: ../mail/mail-config.glade.h:23
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">������� ���������</span>"
-
-#: ../mail/mail-config.glade.h:24
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">������</span>"
-
-#: ../mail/mail-config.glade.h:26
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">������� �����</span>"
-
-#: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">������ ������</span>"
-
-#: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">������� ���������</span>"
-
-#: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr "<span weight=\"bold\">������ MIME (S/MIME)</span>"
-
-#: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">���������</span>"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#, c-format
+#: ../mail/mail-autofilter.c:450
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n\"%s\"."
+msgid_plural ""
+"The following filter rules\n%s have been updated, because they used just "
+"removed folder\n\"%s\"."
+msgstr[0] ""
+"� ����� ��� \"%s\" ��� ��� �������, ����� �� ��� ���� ������ �����\n\"%s\"."
+msgstr[1] ""
+"� ������ ����� ����\n%s ��� ��� �������, ����� �� ��� ���� ������ "
+"�����\n\"%s\"."
 
-#: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">���� � ����� �������</span>"
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
+#: ../mail/mail-config.ui.h:2
+msgid "(Not Recommended)"
+msgstr "(��� ����������)"
 
-#: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">���� ������������</span>"
+#: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(���: ������� ������ � � ���������)"
 
-#: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">_����������� ���</span>"
+#: ../mail/mail-config.ui.h:4
+msgid "Account Information"
+msgstr "����� ���������"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "�� �_� �������..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "��_��� ��� ������ ������� ��� ���� ��� �����"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "���� ������� � ���_� ��� ������ ��������� �������"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "����_� ������-���� (����) �:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.ui.h:10
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "����� _����� ������-���� (bcc) �:"
+
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "����� _����� ��� �� �� ����� ��� ���������"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "����� ������� � _������ ��� ������ ��������� �������"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "����� ������� ��_� �����"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
+msgid "Authentication"
+msgstr "�����������"
+
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "���������� ����� _�������� ������"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "�_����� ���:"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "�_�� �� ������� ����"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "��� ��_���� ����� �� ����"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
 msgstr "��� ������� _������� �� ����"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "��� ������ ��� � _���"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "���� ������� ��� ������� � �� ����"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "��_�"
 
-#: ../mail/mail-config.glade.h:58 ../mail/message-tag-followup.c:321
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "��_�"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "���� �� _�������� ����:"
 
-#: ../mail/mail-config.glade.h:61
+#: ../mail/mail-config.ui.h:26
+msgid "Composing Messages"
+msgstr "�������� �������"
+
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "������������"
+
+#, fuzzy
+#: ../mail/mail-config.ui.h:28
+msgid "Confirm _when expunging a folder"
+msgstr "������ _��� expunging � �����"
+
+#: ../mail/mail-config.ui.h:30
+msgid "Default Behavior"
+msgstr "������ �������"
+
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "������ ������ �_������:"
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.ui.h:33
+msgid "Delete Mail"
+msgstr "����� ���"
+
+#: ../mail/mail-config.ui.h:34
 msgid "Delete junk messages on e_xit"
 msgstr "����� ���� ������� �� �_����"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.ui.h:36
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "�������� ��� �_����� ������� (�� ������)"
 
-#: ../mail/mail-config.glade.h:66
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "�� ��� ����� ������� ��� ����� ��_� ������"
+#: ../mail/mail-config.ui.h:37
+msgid "Displayed Message Headers"
+msgstr "������� ����� �����"
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.ui.h:38
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "�� ��� ������ ������� ��� ����� _��� ������"
+
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "�� ��� ��_� ������� �� ���� �� ����� �� �� �� ����� ���"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.ui.h:40
+msgid "Do not quote"
+msgstr "�� ��� ����"
+
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "������ _�����:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "���� _�����:"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "����� ���� ������ �� �_����"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Magic S_pacebar"
 msgstr "������ ����� �_�����"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Sea_rch Folders"
 msgstr "������ �_�� ������"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "�����_���� ���������:"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "������� ��_���� ������� (�� ������)"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.ui.h:49
 msgid "Fi_xed-width:"
 msgstr "��_���-����:"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.ui.h:50
 msgid "Fix_ed width Font:"
 msgstr "����_� ���� ����:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:51
 msgid "Font Properties"
 msgstr "���� ��������"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.ui.h:52
 msgid "Format messages in _HTML"
 msgstr "����� ������� �� _HTML"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "��� �_��:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.ui.h:55
 msgid "HTML Messages"
 msgstr "HTML �������"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:56
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ������:"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.ui.h:57
 msgid "Headers"
 msgstr "�����"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.ui.h:58
 msgid "Highlight _quotations with"
 msgstr "����� _��������� ���"
 
-#: ../mail/mail-config.glade.h:89 ../mail/message-list.etspec.h:8
+#, fuzzy
+#: ../mail/mail-config.ui.h:60
+msgid "Inline"
+msgstr "Inline"
+
+#, fuzzy
+#: ../mail/mail-config.ui.h:61
+msgid "Inline (Outlook style)"
+msgstr "Inline (����� ����)"
+
+#: ../mail/mail-config.ui.h:63
+msgid "KB"
+msgstr "KB"
+
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "������"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "��������� �����"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.ui.h:66
+msgid "Loading Images"
+msgstr "����� ������"
+
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "��� ����� �����"
 
-#: ../mail/mail-config.glade.h:92 ../modules/mail/e-mail-shell-backend.c:213
-msgid "Mail Preferences"
-msgstr "��� ����������"
-
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "������� �������"
 
-#: ../mail/mail-config.glade.h:94
-msgid "Message Composer"
-msgstr "����� �������"
+#: ../mail/mail-config.ui.h:69
+msgid "Message Display"
+msgstr "����� ������"
+
+#: ../mail/mail-config.ui.h:70
+msgid "Message Fonts"
+msgstr "����� �����"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.ui.h:71
+msgid "Message Receipts"
+msgstr "����� ������"
+
+#: ../mail/mail-config.ui.h:72
 msgid "No _Proxy for:"
 msgstr "�� _������ ��:"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.ui.h:74
 msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+"Note: you will not be prompted for a password until you connect for the first "
+"time"
 msgstr "���: � ��� ��� �� �������� �� � ������ ����� � ������ �� � ���� ���"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:75
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "����� �� ����� �� � ��� �� ������ ���� ����� �� ����."
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.ui.h:76
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Optional Information"
+msgstr "������� ���������"
+
+#: ../mail/mail-config.ui.h:78
+msgid "Or_ganization:"
+msgstr "_����������:"
+
+#: ../mail/mail-config.ui.h:79
+msgid "PGP/GPG _Key ID:"
+msgstr "PGP/GPG _�� ID:"
+
+#: ../mail/mail-config.ui.h:80
+msgid "Pass_word:"
+msgstr "_������:"
+
+#: ../mail/mail-config.ui.h:82
 msgid "Port:"
 msgstr "���:"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.ui.h:83
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "_������ ��� ������ ������� ��� ���� Bcc ���������� ������"
+
+#: ../mail/mail-config.ui.h:84
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "����� ��� ������� (PGP/GPG)"
+
+#: ../mail/mail-config.ui.h:86
+msgid "Printed Fonts"
+msgstr "������� �����"
+
+#: ../mail/mail-config.ui.h:87
+msgid "Proxy Settings"
+msgstr "������ ������"
+
+#: ../mail/mail-config.ui.h:88
+msgid "Quoted"
+msgstr "������"
+
+#: ../mail/mail-config.ui.h:89
+msgid "Re_member password"
+msgstr "_������� ������"
+
+#: ../mail/mail-config.ui.h:90
+msgid "Re_ply-To:"
+msgstr "_�����-�:"
+
+#: ../mail/mail-config.ui.h:92
 msgid "Remember _password"
 msgstr "������� _������"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.ui.h:93
+msgid "Required Information"
+msgstr "������� ���������"
+
+#: ../mail/mail-config.ui.h:95
+msgid "SSL is not supported in this build of Evolution"
+msgstr "SSL �� ��� ������� �� ��� ���� � ·��������"
+
+#: ../mail/mail-config.ui.h:96
+msgid "S_earch for sender photograph only in local address books"
+msgstr "_��� �� ����� �������� ���� �� ����� ����� ����"
+
+#: ../mail/mail-config.ui.h:97
+msgid "S_elect..."
+msgstr "_������..."
+
+#: ../mail/mail-config.ui.h:98
+msgid "S_end message receipts:"
+msgstr "_���� ����� ������:"
+
+#: ../mail/mail-config.ui.h:99
+msgid "S_tandard Font:"
+msgstr "_������� ����:"
+
+#: ../mail/mail-config.ui.h:100
+msgid "Secure MIME (S/MIME)"
+msgstr "������ MIME (S/MIME)"
+
+#: ../mail/mail-config.ui.h:102
+msgid "Select Drafts Folder"
+msgstr "������ ������ �����"
+
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "������ HTML ����� ���� ����"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "������ HTML ����� ���� ���� �� �������"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font"
 msgstr "������ HTML ������� ���� ����"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.ui.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "������ HTML ������� ���� ���� �� �������"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.ui.h:107
+msgid "Select Sent Folder"
+msgstr "������ ���� �����"
+
+#: ../mail/mail-config.ui.h:108
+msgid "Sender Photograph"
+msgstr "����� ��������"
+
+#: ../mail/mail-config.ui.h:109
 msgid "Sending Mail"
 msgstr "������ ���"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "���� _������� �����:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.ui.h:111
+msgid "Sent and Draft Messages"
+msgstr "���� � ����� �������"
+
+#: ../mail/mail-config.ui.h:112
+msgid "Ser_ver requires authentication"
+msgstr "_���� ������� �����������"
+
+#: ../mail/mail-config.ui.h:113
+msgid "Server Configuration"
+msgstr "���� ������������"
+
+#: ../mail/mail-config.ui.h:114
 msgid "Server _Type:"
 msgstr "���� _���:"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.ui.h:115
+msgid "Sig_natures"
+msgstr "_��������"
+
+#: ../mail/mail-config.ui.h:116
+msgid "Sig_ning certificate:"
+msgstr "_����� ���������:"
+
+#: ../mail/mail-config.ui.h:117
+msgid "Signat_ure:"
+msgstr "_�������:"
+
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "��������"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "���� �����"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "���� _����� �� � ����� �� �������"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "�_��:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -9537,505 +12419,640 @@ msgstr ""
 "� ���� � ��������� �� �������� ���� � ��������� �� ��� � ��� � �������� "
 "�������."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.ui.h:124
 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. "
+"The output of this script will be used as your\nsignature. The name you "
+"specify will be used\nfor display purposes only. "
 msgstr ""
-"� ����� � ��� ������ ��� �� ��� �� ��\n"
-"�������. � ��� � ������� ��� �� ���\n"
-"�� ������ ������� ����. "
+"� ����� � ��� ������ ��� �� ��� �� ��\n�������. � ��� � ������� ��� �� "
+"���\n�� ������ ������� ����. "
 
-#: ../mail/mail-config.glade.h:131
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:128
+msgid "Top Posting Option"
+msgstr "��� ������ �����"
+
+#: ../mail/mail-config.ui.h:129
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
+"Type the name by which you would like to refer to this account.\nFor example: "
+"\"Work\" or \"Personal\""
 msgstr ""
-"��� � ��� �� ��� � ��� ��� � ���� � ��� �����.\n"
-"�� ��������: \"���\" � \"�������\""
+"��� � ��� �� ��� � ��� ��� � ���� � ��� �����.\n�� ��������: \"���\" � "
+"\"�������\""
 
-#: ../mail/mail-config.glade.h:135 ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-contacts-source.c:280
-#: ../plugins/google-account-setup/google-source.c:700
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
+#: ../mail/mail-config.ui.h:131
+msgid "Us_ername:"
+msgstr "_������:"
+
+#: ../mail/mail-config.ui.h:132
+msgid "Use Authe_ntication"
+msgstr "�� _�����������"
+
+#: ../mail/mail-config.ui.h:133 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "���_���:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.ui.h:134
+msgid "V_ariable-width:"
+msgstr "_�������-����:"
+
+#: ../mail/mail-config.ui.h:135
 msgid "_Add Signature"
 msgstr "_�� �������"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.ui.h:136
 msgid "_Always load images from the Internet"
 msgstr "_����� ��� ������ ���� � ·�������"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.ui.h:137
+msgid "_Authentication Type"
+msgstr "_����������� ���"
+
+#: ../mail/mail-config.ui.h:138
 msgid "_Default junk plugin:"
 msgstr "_������ ���� ������:"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.ui.h:139
 msgid "_Direct connection to the Internet"
 msgstr "_������ �������� � � ·�������"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.ui.h:140
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_�� ��� ��� ����� �������� (�� ·����� �������������)"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.ui.h:141
 msgid "_Forward style:"
 msgstr "_����� ����:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.ui.h:142
 msgid "_Keep Signature above the original message on replying"
 msgstr "_��� ������� ���� � ������� ����� �� �������"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.ui.h:143
+msgid "_Languages"
+msgstr "_���������"
+
+#: ../mail/mail-config.ui.h:144
 msgid "_Load images in messages from contacts"
 msgstr "_��� ������ �� ������� ���� ��������"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.ui.h:145
 msgid "_Lookup in local address book only"
 msgstr "_����� �� ����� ����� ��� ����"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.ui.h:146
 msgid "_Make this my default account"
 msgstr "_��� ��� �� ������ �����"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.ui.h:147
 msgid "_Manual proxy configuration:"
 msgstr "_������� ������ ������������:"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.ui.h:148
 msgid "_Mark messages as read after"
 msgstr "_��� ������� �� ��� ����"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.ui.h:150
 msgid "_Never load images from the Internet"
 msgstr "_���� ��� ������ ���� � ·�������"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.ui.h:151
 msgid "_Path:"
 msgstr "_���:"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.ui.h:152
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_������ �� ������ HTML ��� � �������� ��� �� ��� ���� ���"
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.ui.h:153
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_������ ��� ������ ������� ��� �� ����� ������� ���"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.ui.h:154
 msgid "_Reply style:"
 msgstr "_����� ����:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.ui.h:155
 msgid "_Script:"
 msgstr "_������:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.ui.h:156
 msgid "_Secure HTTP Proxy:"
 msgstr "_������ HTTP ������:"
 
-#: ../mail/mail-config.glade.h:158
-#: ../modules/addressbook/ldap-config.glade.h:39
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_����:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.ui.h:160
 msgid "_Show image animations"
 msgstr "_�� ���� ���������"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.ui.h:161
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_�� � �������� � ����� �� � ����� �����"
 
-#: ../mail/mail-config.glade.h:163
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#, fuzzy
+#: ../mail/mail-config.ui.h:163
+msgid "_Shrink To / Cc / Bcc headers to "
+msgstr "_����� � / ���� / Bcc ����� � "
+
+#: ../mail/mail-config.ui.h:164
 msgid "_Use Secure Connection:"
 msgstr "_�� ������ ��������:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:165
 msgid "_Use system defaults"
 msgstr "_�� ������ �������"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:166
 msgid "_Use the same fonts as other applications"
 msgstr "_�� � ��� ����� �� ��� ����������"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:47
+msgid "a"
+msgstr "�"
+
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:169
 msgid "addresses"
 msgstr "�������"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:170 ../smime/gui/smime-ui.ui.h:48
+msgid "b"
+msgstr "�"
+
+#: ../mail/mail-config.ui.h:171
 msgid "color"
 msgstr "����"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.ui.h:172
 msgid "description"
 msgstr "����������"
 
-#: ../mail/mail-config.glade.h:171
-msgid "seconds"
-msgstr "�������"
-
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>��� ����� �����</b>"
-
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">������� �������</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">���������</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.ui.h:1
 msgid "All active remote folders"
 msgstr "�� ����� ����� ������"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "�� ����� � ����� ����� ������"
 
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "�� ����� ������"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:268
-msgid "Flag to Follow Up"
-msgstr "���� � ���� ��"
+#: ../mail/mail-dialogs.ui.h:4
+msgid "Call"
+msgstr "���"
+
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Co_mpleted"
+msgstr "_���������"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Collapse _all"
+msgstr "������ _��"
+
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Digital Signature"
+msgstr "������� �������"
+
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "�� ��� �����"
+
+#: ../mail/mail-dialogs.ui.h:9
+msgid "E_xpand all"
+msgstr "_������� ��"
+
+#: ../mail/mail-dialogs.ui.h:10
+msgid "Encryption"
+msgstr "���������"
+
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "����� ������������"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.ui.h:12
+msgid "Follow-Up"
+msgstr "����-��"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "For Your Information"
+msgstr "�� �� ���������"
+
+#: ../mail/mail-dialogs.ui.h:14
+msgid "Forward"
+msgstr "�����"
+
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "������ ��������"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.ui.h:16
+msgid "No Response Necessary"
+msgstr "�� ������� �������"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Reply to All"
+msgstr "����� � ��"
+
+#: ../mail/mail-dialogs.ui.h:21
+msgid "Review"
+msgstr "����"
+
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "�_���:"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr "_�� ���� ����� ��������:"
+
+#: ../mail/mail-dialogs.ui.h:24
+msgid "Search Folder Sources"
+msgstr "��� ����� �����"
+
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "��������� ���������"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "�������� ������"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
+"The messages you have selected for follow up are listed below.\nPlease select "
+"a follow up action from the \"Flag\" menu."
 msgstr ""
-"� ������� � ��� �������� �� ���� �� � ������ ����.\n"
-"���� ������ � ���� �� ����� ���� � \"����\" ����."
+"� ������� � ��� �������� �� ���� �� � ������ ����.\n���� ������ � ���� �� "
+"����� ���� � \"����\" ����."
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "_������ ������"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "_�� ��:"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "_����:"
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "_��� ��� � ������ � ������ ��������"
 
-#: ../mail/mail-folder-cache.c:890
 #, c-format
+#: ../mail/mail-folder-cache.c:750
 msgid "Pinging %s"
 msgstr "����� %s"
 
-#: ../mail/mail-ops.c:110
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "������� �������� �������"
 
-#: ../mail/mail-ops.c:269
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "����� ���"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:572
 #, c-format
+#: ../mail/mail-ops.c:576
 msgid "Failed to apply outgoing filters: %s"
 msgstr "���� � ���� ������ ������: %s"
 
-#: ../mail/mail-ops.c:628
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "���� � ����� � ����� `����' �����: %s"
+#, fuzzy
+#: ../mail/mail-ops.c:588 ../mail/mail-ops.c:616
+msgid "Failed to append to %s: %s\nAppending to local 'Sent' folder instead."
+msgstr "���� � ����� � %s: %s\nAppending � ����� '����' ����� ������."
+
+#, c-format
+#, fuzzy
+#: ../mail/mail-ops.c:633
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "���� � ����� � ����� '����' �����: %s"
 
-#: ../mail/mail-ops.c:736 ../mail/mail-ops.c:817
+#: ../mail/mail-ops.c:744 ../mail/mail-ops.c:825
 msgid "Sending message"
 msgstr "������ �����"
 
-#: ../mail/mail-ops.c:746
 #, c-format
+#: ../mail/mail-ops.c:754
 msgid "Sending message %d of %d"
 msgstr "������ ����� %d � %d"
 
-#: ../mail/mail-ops.c:773
 #, c-format
+#: ../mail/mail-ops.c:781
 msgid "Failed to send %d of %d messages"
 msgstr "���� � ���� %d � %d �������"
 
-#: ../mail/mail-ops.c:775 ../mail/mail-send-recv.c:759
+#: ../mail/mail-ops.c:783 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "�������."
 
-#: ../mail/mail-ops.c:777 ../mail/mail-send-recv.c:761
+#: ../mail/mail-ops.c:785 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "�������."
 
-#: ../mail/mail-ops.c:889
 #, c-format
+#: ../mail/mail-ops.c:897
 msgid "Saving message to folder '%s'"
 msgstr "����� ����� � ����� '%s'"
 
-#: ../mail/mail-ops.c:966
 #, c-format
+#: ../mail/mail-ops.c:974
 msgid "Moving messages to '%s'"
 msgstr "����� ������� � '%s'"
 
-#: ../mail/mail-ops.c:966
 #, c-format
+#: ../mail/mail-ops.c:974
 msgid "Copying messages to '%s'"
 msgstr "������ ������� � '%s'"
 
-#: ../mail/mail-ops.c:1075
 #, c-format
+#: ../mail/mail-ops.c:1083
 msgid "Scanning folders in '%s'"
 msgstr "������ ������ �� '%s'"
 
-#: ../mail/mail-ops.c:1183
+#: ../mail/mail-ops.c:1191
 msgid "Forwarded messages"
 msgstr "�������� �������"
 
-#: ../mail/mail-ops.c:1224
 #, c-format
+#: ../mail/mail-ops.c:1232
 msgid "Opening folder '%s'"
 msgstr "������ ����� '%s'"
 
-#: ../mail/mail-ops.c:1290
 #, c-format
+#: ../mail/mail-ops.c:1298
 msgid "Retrieving quota information for folder '%s'"
 msgstr "�������� ����� ��������� �� ����� '%s'"
 
-#: ../mail/mail-ops.c:1362
 #, c-format
+#: ../mail/mail-ops.c:1370
 msgid "Opening store '%s'"
 msgstr "������ ��� '%s'"
 
-#: ../mail/mail-ops.c:1433
 #, c-format
+#: ../mail/mail-ops.c:1441
 msgid "Removing folder '%s'"
 msgstr "������� ����� '%s'"
 
-#: ../mail/mail-ops.c:1551
 #, c-format
+#: ../mail/mail-ops.c:1561
 msgid "Storing folder '%s'"
 msgstr "����� ����� '%s'"
 
-#: ../mail/mail-ops.c:1615
 #, c-format
+#, fuzzy
+#: ../mail/mail-ops.c:1624
+msgid "Expunging and storing account '%s'"
+msgstr "Expunging � ����� ����� '%s'"
+
+#, c-format
+#: ../mail/mail-ops.c:1625
 msgid "Storing account '%s'"
 msgstr "����� ����� '%s'"
 
-#: ../mail/mail-ops.c:1669
 #, c-format
+#: ../mail/mail-ops.c:1679
 msgid "Refreshing folder '%s'"
 msgstr "�������� ����� '%s'"
 
-#: ../mail/mail-ops.c:1754
 #, c-format
+#, fuzzy
+#: ../mail/mail-ops.c:1719
+msgid "Expunging folder '%s'"
+msgstr "Expunging ����� '%s'"
+
+#, c-format
+#: ../mail/mail-ops.c:1764
 msgid "Emptying trash in '%s'"
 msgstr "������� ���� �� '%s'"
 
-#: ../mail/mail-ops.c:1755
+#: ../mail/mail-ops.c:1765
 msgid "Local Folders"
 msgstr "����� ������"
 
-#: ../mail/mail-ops.c:1833
-#, c-format
-msgid "Retrieving message '%s'"
-msgstr "�������� ����� '%s'"
-
-#: ../mail/mail-ops.c:1951
 #, c-format
+#: ../mail/mail-ops.c:1961
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "�������� %d �����"
 msgstr[1] "�������� %d �������"
 
-#: ../mail/mail-ops.c:2040
 #, c-format
+#: ../mail/mail-ops.c:2050
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "����� %d �����"
 msgstr[1] "����� %d �������"
 
-#: ../mail/mail-ops.c:2120
 #, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"�� ����� ������� �: %s:\n"
-" %s"
+#: ../mail/mail-ops.c:2131
+msgid "Error saving messages to: %s:\n %s"
+msgstr "�� ����� ������� �: %s:\n %s"
 
-#: ../mail/mail-ops.c:2192
+#: ../mail/mail-ops.c:2203
 msgid "Saving attachment"
 msgstr "����� ��������"
 
-#: ../mail/mail-ops.c:2210 ../mail/mail-ops.c:2218
 #, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"����� ����� ����� ���: %s:\n"
-" %s"
+#: ../mail/mail-ops.c:2221 ../mail/mail-ops.c:2229
+msgid "Cannot create output file: %s:\n %s"
+msgstr "����� ����� ����� ���: %s:\n %s"
 
-#: ../mail/mail-ops.c:2233
 #, c-format
+#: ../mail/mail-ops.c:2244
 msgid "Could not write data: %s"
 msgstr "��� ��� ��� ����: %s"
 
-#: ../mail/mail-ops.c:2378
 #, c-format
+#: ../mail/mail-ops.c:2389
 msgid "Disconnecting from '%s'"
 msgstr "����������� ���� '%s'"
 
-#: ../mail/mail-ops.c:2378
 #, c-format
+#: ../mail/mail-ops.c:2389
 msgid "Reconnecting to '%s'"
 msgstr "���������� � '%s'"
 
-#: ../mail/mail-ops.c:2474
 #, c-format
+#: ../mail/mail-ops.c:2485
 msgid "Preparing account '%s' for offline"
 msgstr "������� ����� '%s' �� �����"
 
-#: ../mail/mail-ops.c:2560
+#: ../mail/mail-ops.c:2571
 msgid "Checking Service"
 msgstr "����� �����"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "��������..."
 
-#: ../mail/mail-send-recv.c:430
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "���� � ����� ���"
 
-#: ../mail/mail-send-recv.c:443
+#: ../mail/mail-send-recv.c:444
 msgid "Cancel _All"
 msgstr "������ _��"
 
-#: ../mail/mail-send-recv.c:552
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "�������..."
 
-#: ../mail/mail-send-recv.c:552 ../mail/mail-send-recv.c:629
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "�����..."
 
-#: ../mail/mail-send-recv.c:872
 #, c-format
+#: ../mail/mail-send-recv.c:874
 msgid "Checking for new mail"
 msgstr "����� �� �� ���"
 
-#: ../mail/mail-session.c:217
 #, c-format
+#, fuzzy
+#: ../mail/mail-session.c:208
+msgid "Enter Passphrase for %s"
+msgstr "���� Passphrase �� %s"
+
+#, fuzzy
+#: ../mail/mail-session.c:210
+msgid "Enter Passphrase"
+msgstr "���� Passphrase"
+
+#, c-format
+#: ../mail/mail-session.c:213
 msgid "Enter Password for %s"
 msgstr "���� ������ �� %s"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:215
 msgid "Enter Password"
 msgstr "���� ������"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:257
 msgid "User canceled operation."
 msgstr "��� ������� �������."
 
-#: ../mail/mail-tools.c:136
+#: ../mail/mail-session.c:667
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "�� ���������� ����� ��������, ����� � � ����� ��� ��� �������."
+
+#: ../mail/mail-session.c:673
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "�� ����� ���� � ��, ����� � � ����� ��� ��� �������."
+
+#, c-format
+#, fuzzy
+#: ../mail/mail-tools.c:119
+msgid "Could not create spool directory '%s': %s"
+msgstr "��� ��� ����� ���� �������� '%s': %s"
+
 #, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "��� ��� ����� ���� �������� `%s': %s"
+#, fuzzy
+#: ../mail/mail-tools.c:149
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "����� � movemail � ���-mbox ��� '%s'"
 
-#: ../mail/mail-tools.c:272
 #, c-format
+#: ../mail/mail-tools.c:255
 msgid "Forwarded message - %s"
 msgstr "�������� ����� - %s"
 
-#: ../mail/mail-tools.c:274
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "�������� �����"
 
-#: ../mail/mail-tools.c:314
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "������� �����: `%s'"
+#, fuzzy
+#: ../mail/mail-tools.c:297
+msgid "Invalid folder: '%s'"
+msgstr "������� �����: '%s'"
 
-#: ../mail/mail-vfolder.c:88
 #, c-format
+#: ../mail/mail-vfolder.c:85
 msgid "Setting up Search Folder: %s"
 msgstr "����� �� ��� �����: %s"
 
-#: ../mail/mail-vfolder.c:233
 #, c-format
+#: ../mail/mail-vfolder.c:228
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "������� ��� ������ �� '%s:%s'"
 
-#: ../mail/mail-vfolder.c:240
 #, c-format
+#: ../mail/mail-vfolder.c:235
 msgid "Updating Search Folders for '%s'"
 msgstr "������� ��� ������ �� '%s'"
 
-#: ../mail/mail-vfolder.c:1075
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#, c-format
+#, fuzzy
+#: ../mail/mail-vfolder.c:678
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n\"%s\"."
+msgid_plural ""
+"The following Search Folders\n%s have been updated, because they used just "
+"removed folder\n\"%s\"."
+msgstr[0] ""
+"� ��� ����� \"%s\" ��� ��� �������, ����� �� ��� ���� ������ �����\n\"%s\"."
+msgstr[1] ""
+"� ������ ��� ������\n%s ��� ��� �������, ����� �� ��� ���� ������ "
+"�����\n\"%s\"."
+
+#: ../mail/mail-vfolder.c:1188
 msgid "Edit Search Folder"
 msgstr "���� ��� �����"
 
-#: ../mail/mail-vfolder.c:1166
+#: ../mail/mail-vfolder.c:1293
 msgid "New Search Folder"
 msgstr "�� ��� �����"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "\"��� ����\" ����"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "\"����� ����\" ����"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "\"����� ��� ����\" ����"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "� ����� ���� \"{0}\" ������ �������. ���� �� � ������� ���."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "� ����� ���� \"{1}\" ������ �������. ���� �� � ������� ���."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"A non-empty folder at \"{1}\" already exists.\n\nYou can choose to ignore "
+"this folder, overwrite or append its contents, or quit."
 msgstr ""
-"� ���-����� ����� �� \"{1}\" ������ �������.\n"
-"\n"
-"� ��� ��� � ���� ��� �����, ������ � ����� ��� ��������, � ����."
+"� ���-����� ����� �� \"{1}\" ������ �������.\n\n� ��� ��� � ���� ��� �����, "
+"������ � ����� ��� ��������, � ����."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -10043,14 +13060,14 @@ msgstr ""
 "� ��� ����� ����������� ��� ��� ��������� �� \"{1}\". ���� � ����� "
 "����������� � {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr ""
 "� ������� ������ ������� ��� � ��� \"{0}\". ���� ������� � ������� ���."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -10058,140 +13075,137 @@ msgstr ""
 "���� � �������� ������� ��� � �� ������� ��� ��� �� ���������� �� ��� � ��� "
 "�� ��� �� ����."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 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:13
 msgid "Are you sure you want to delete this account?"
 msgstr "� � ��� � ���� � ����� ��� �����?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "� � ��� � ���� � ������� ��� ����� � ����� �� ��� �������?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "� � ��� � ���� � ���� {0} ������� �� ����?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 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:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr ""
 "� � ��� � ���� � ���������� ����� �� � ������� ������� �� ����� \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "� � ��� � ���� � ���� � ����� �� HTML �����?"
 
-#: ../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:18
-msgid "Because \"{0}\"."
-msgstr "����� \"{0}\"."
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr "� � ��� � ���� � ���� � ����� ��� ������� �����?"
 
+#: ../mail/mail.error.xml.h:19
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "� � ��� � ���� � ���� � ����� ��� ������� �������?"
+
+#, fuzzy
 #: ../mail/mail.error.xml.h:20
-msgid "Because \"{2}\"."
-msgstr "����� \"{2}\"."
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "� � ��� � ���� � ���� � ����� ��� ���� BCC ����������?"
 
 #: ../mail/mail.error.xml.h:21
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "� � ��� � ���� � ���� � ����� ����� � �������?"
+
+#: ../mail/mail.error.xml.h:22
 msgid "Blank Signature"
 msgstr "����� �������"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "����� �� ��� ����� \"{0}\"."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "����� ���� ����� \"{0}\" � \"{1}\"."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "����� ����� ����� \"{0}\"."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "����� ����� ������� ��� ��������."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "����� ����� � ��� ��������, ����� \"{1}\""
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "����� ����� ����� \"{0}\"."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "����� ����� ������ ����� \"{0}\"."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "����� ���� ��� ����� \"{0}\" �� �� ��� ��� ������."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "����� ��� ����� \"{0}\" � \"{1}\"."
 
-#: ../mail/mail.error.xml.h:31
-msgid "Cannot open source \"{1}\""
-msgstr "����� ���� ��� \"{1}\""
-
 #: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "����� ���� ��� \"{1}\"."
+
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "����� ���� ��� \"{2}\"."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "����� ���� ����� \"{2}\"."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
 msgstr ""
-"����� ��� � ������ ��� \"{0}\", �� � �� ���������� �������. � ��� ��� �� "
-"���� � �� ��� ������� ����� � ��� ������ ��� ������."
+"����� ��� � ������ ��� \"{0}\", �� � �� ���������� �������. � ��� ��� �� ���� "
+"� �� ��� ������� ����� � ��� ������ ��� ������."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "����� ����� \"{0}\" � \"{1}\"."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "����� ����� � ��� ������ ����� \"{0}\"."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "����� ��� ������ � �����."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "����� ��� � �������� \"{0}\"."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "����� ��� � ��� \"{0}\"."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "����� ��� ������� ������ \"{0}\"."
 
-#: ../mail/mail.error.xml.h:41
-msgid "Check Junk Failed"
-msgstr "��� ���� ����"
-
 #: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
@@ -10208,6 +13222,10 @@ msgstr "��� ��� ��� ������� �
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "����� ������� �� ��� ����� \"{0}\"?"
 
+#: ../mail/mail.error.xml.h:45
+msgid "Do not d_elete"
+msgstr "�� ��� _�����"
+
 #: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "�� ��� �����"
@@ -10242,395 +13260,425 @@ msgstr "ð�‘»ð�‘¼ ð�‘¤ð�‘´ð�‘›ð�‘¦ð�‘™ ð�‘“ð�‘¦ð�‘¤ð�‘‘ð�‘¼ ð�‘›ð�‘§ð�‘“ð�‘©ð�‘¯ð
 msgid "Error while performing operation."
 msgstr "�� ��� ������� �������."
 
-#: ../mail/mail.error.xml.h:54
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "�� ��� {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "��� ������� ��� ����� ������ ��."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "��� ������� ��� �� ��� � ������� ���."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:60
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "�� � �������, � ��� ��� �� ���� � ������ ��� �������."
 
-#: ../mail/mail.error.xml.h:59
+#, fuzzy
+#: ../mail/mail.error.xml.h:61
+msgid ""
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
+msgstr ""
+"�� � ����� � �����, �� � ��� �������� � ��� subfolders' �������� ��� �� "
+"������� ����������."
+
+#: ../mail/mail.error.xml.h:62
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr "�� � ����� � �����, �� � ��� �������� ��� �� ������� ����������."
+
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "�� � ������, �� ������ ������ ��� �� ������� ����������."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:64
 msgid ""
-"If you proceed, the account information and\n"
-"all proxy information will be deleted permanently."
+"If you proceed, the account information and\nall proxy information will be "
+"deleted permanently."
 msgstr ""
-"�� � ������, � ����� ��������� �\n"
-"�� ������ ��������� ��� �� ������� ����������."
+"�� � ������, � ����� ��������� �\n�� ������ ��������� ��� �� ������� "
+"����������."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "�� � ������, � ����� ��������� ��� �� ������� ����������."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:67
 msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr "�� � ����, ��� ������� ��� ��� �� ���� ����� ·�������� �� ������ ����."
+"If you quit, these messages will not be sent until Evolution is started again."
+msgstr ""
+"�� � ����, ��� ������� ��� ��� �� ���� ����� ·�������� �� ������ ����."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "����"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "������� �����������"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "��� ������� ����"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "��� ������ ���������� �������."
 
-#: ../mail/mail.error.xml.h:69
+#, fuzzy
+#: ../mail/mail.error.xml.h:72
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have BCC "
+"recipients. This header, if added, will list all of your recipients to your "
+"message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+"���� ���� ������� �� �� ���������-� ���� � ������� ��� ���� ��� BCC "
+"����������. ��� ����, �� ����, ��� ���� �� � �� ���������� � �� ����� �����. "
+"� ���� ���, � ��� �� �� ���� ��� �: � ����: ���������."
+
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "����� �����."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "�� ����� ��������."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:76
 msgid "Opening too many messages at once may take a long time."
 msgstr "������ �� ���� ������� �� ���� �� ��� � ��� ���."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:77
 msgid "Please check your account settings and try again."
 msgstr "���� ��� �� ����� ������ � ��� ����."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:78
 msgid "Please enable the account or send using another account."
 msgstr "���� ������ � ����� � ���� ���� ����� �����."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:79
 msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
+"Please enter a valid email address in the To: field. You can search for email "
+"addresses by clicking on the To: button next to the entry box."
 msgstr ""
 "���� ���� � ����� ���� ����� �� � �: ����. � ��� ��� �� ���� ������� �� "
 "������ �� � �: ����� ����� � � ����� ����."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}"
+"HTML email:\n{0}"
 msgstr ""
-"���� ��� ��� � ������ ���������� � ����� � ���� � ����� HTML ����:\n"
-"{0}"
+"���� ��� ��� � ������ ���������� � ����� � ���� � ����� HTML ����:\n{0}"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "���� ������ �� ���� ��� � �������� ��� �������."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "���� ���."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:84
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "������� �������� ��� ��� ����� \"{0}\"."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:85
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "������ ���� �� � ���� � ������� ����������� ���������."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "��� ����� ���������."
 
-#: ../mail/mail.error.xml.h:84
-msgid "Report Junk Failed"
-msgstr "����� ���� ����"
+#, fuzzy
+#: ../mail/mail.error.xml.h:87
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "���� ����� ����� \"{0}\" � �� � ��� subfolders?"
 
-#: ../mail/mail.error.xml.h:85
-msgid "Report Not Junk Failed"
-msgstr "����� ��� ���� ����"
+#: ../mail/mail.error.xml.h:88
+msgid "Really delete folder \"{0}\"?"
+msgstr "���� ����� ����� \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid "Search Folders automatically updated."
 msgstr "��� ������ ���������� �������."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "���� �����"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "������� ������ �������"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "���������"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "��������� ������ ������ �� ����� ����?"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:94
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Evolution to function correctly and cannot be "
+"renamed, moved, or deleted."
 msgstr ""
 "������ ������ � ������� �� ·�������� � ������� ������� � ����� �� ������, "
 "����, � �������."
 
+#, fuzzy
 #: ../mail/mail.error.xml.h:95
 msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
+"The contact list you are sending to is configured to hide list "
+"recipients.\n\nMany email systems add an Apparently-To header to messages "
+"that only have BCC recipients. This header, if added, will list all of your "
+"recipients in your message. To avoid this, you should add at least one To: or "
+"CC: recipient. "
 msgstr ""
-"� ������ ��� �����(�):\n"
-"{0}\n"
-"��� � �� ������ �����:\n"
-"    \"{1}\"\n"
-"� ��� ��� �������."
+"� ������� ���� � � ������ � �� ��������� � ��� ���� ����������.\n\n���� ���� "
+"������� �� �� ���������-� ���� � ������� ��� ���� ��� BCC ����������. ��� "
+"����, �� ����, ��� ���� �� � �� ���������� �� �� �����. � ���� ���, � ��� �� "
+"�� ���� ��� �: � ����: ���������. "
+
+#: ../mail/mail.error.xml.h:98
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n{0}"
+msgstr "� ������ ��������� ��� ��� ��������� �� � ����� ��� �����:\n{0}"
 
 #: ../mail/mail.error.xml.h:100
 msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"� ������ ����� ���(�):\n"
-"{0}\n"
-"��� � �� ������ �����:\n"
-"    \"{1}\"\n"
-"� ��� ��� �������."
+"The following recipients were not recognized as valid mail addresses:\n{0}"
+msgstr "� ������ ���������� �� ��� ��������� �� ����� ��� �������:\n{0}"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "� ������ ��� ���� ������ � �� �����������."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid ""
-"This folder may have been added implicitly,\n"
-"go to the Search Folder editor to add it explicitly, if required."
+"This folder may have been added implicitly,\ngo to the Search Folder editor "
+"to add it explicitly, if required."
 msgstr ""
-"��� ����� �� ��� ��� ���� ����������,\n"
-"�� � � ��� ����� ����� � �� �� �����������, �� �������."
+"��� ����� �� ��� ��� ���� ����������,\n�� � � ��� ����� ����� � �� �� "
+"�����������, �� �������."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:105
 msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+"This message cannot be sent because the account you chose to send with is not "
+"enabled"
 msgstr "��� ����� ����� �� ���� ����� � ����� � ��� � ���� ��� �� ��� �������"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "��� ����� ����� �� ���� ����� � ��� ��� �������� ��� ����������"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
-"��� ���� ��� ��� ����� ��� ��� � ����������� � �� ��� ����� ����������� �� "
-"��."
+"��� ���� ��� ��� ����� ��� ��� � ����������� � �� ��� ����� ����������� �� ��."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "��� ������� ��� ��� �����, ��� ��� ��� ��� ����."
 
-#: ../mail/mail.error.xml.h:114
+#, fuzzy
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"This will mark all messages as read in the selected folder and its subfolders."
+msgstr "��� ��� ��� �� ������� �� ��� �� � �������� ����� � ��� subfolders."
+
+#, fuzzy
+#: ../mail/mail.error.xml.h:110
+msgid "Unable to connect to the GroupWise server."
+msgstr "������ � ������ � � GroupWise ����."
+
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 "������ � ���� � ������ ����� �� ��� �����. �� � ������ ������ ����� ������?"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "������ � ��� ������ ���."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "�� _������"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "�� ������ ������ �����?"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
-"Do you really want to do this?"
+"message from one of your local or remote folders.\nDo you really want to do "
+"this?"
 msgstr ""
 "�����: ������� ������� ���� � ��� ����� ��� ����� � ������ ����� ���� ��� � "
-"�� ����� � ����� ������.\n"
-"�� � ���� ���� � �� ���?"
+"�� ����� � ����� ������.\n�� � ���� ���� � �� ���?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "� �� ��� ��� �������� �������� � ����� ��� ���."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "You have not filled in all of the required information."
 msgstr "� ��� ��� ���� �� �� � � ������� ���������."
 
-#: ../mail/mail.error.xml.h:123
+#, fuzzy
+#: ../mail/mail.error.xml.h:119
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "� ��� unsent �������, �� � ��� � ���� �����?"
+
+#: ../mail/mail.error.xml.h:120
 msgid "You may not create two accounts with the same name."
 msgstr "� �� ��� ����� �� ������ ��� � ��� ���."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "� ���� ��� ��� ��� �����."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "� ���� ������� � �����."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 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."
+"You must specify at least one folder as a source.\nEither 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:128
+#: ../mail/mail.error.xml.h:125
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "�� ����� � �� ���� \"{0}\" �� \"{0}\" ����."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "_�����"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "_������� ������"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:128
 msgid "_Do not Synchronize"
 msgstr "_�� ��� ���������"
 
-#: ../mail/mail.error.xml.h:132
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:821
 msgid "_Empty Trash"
 msgstr "_����� ����"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "_�������"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "_���� �������"
 
-#: ../mail/message-list.c:1068
+#: ../mail/message-list.c:1112
 msgid "Unseen"
 msgstr "�����"
 
-#: ../mail/message-list.c:1069
+#: ../mail/message-list.c:1113
 msgid "Seen"
 msgstr "���"
 
-#: ../mail/message-list.c:1070
+#: ../mail/message-list.c:1114
 msgid "Answered"
 msgstr "�����"
 
-#: ../mail/message-list.c:1071
+#: ../mail/message-list.c:1115
 msgid "Forwarded"
 msgstr "��������"
 
-#: ../mail/message-list.c:1072
+#: ../mail/message-list.c:1116
 msgid "Multiple Unseen Messages"
 msgstr "�������� ����� �������"
 
-#: ../mail/message-list.c:1073
+#: ../mail/message-list.c:1117
 msgid "Multiple Messages"
 msgstr "�������� �������"
 
-#: ../mail/message-list.c:1077
+#: ../mail/message-list.c:1121
 msgid "Lowest"
 msgstr "�����"
 
-#: ../mail/message-list.c:1078
+#: ../mail/message-list.c:1122
 msgid "Lower"
 msgstr "���"
 
-#: ../mail/message-list.c:1082
+#: ../mail/message-list.c:1126
 msgid "Higher"
 msgstr "���"
 
-#: ../mail/message-list.c:1083
+#: ../mail/message-list.c:1127
 msgid "Highest"
 msgstr "�����"
 
-#: ../mail/message-list.c:1712 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1737 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1719 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1744 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: ../mail/message-list.c:1728
+#: ../mail/message-list.c:1753
 msgid "Yesterday %l:%M %p"
 msgstr "������� %l:%M %p"
 
-#: ../mail/message-list.c:1740
+#: ../mail/message-list.c:1765
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1748
+#: ../mail/message-list.c:1773
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1750
+#: ../mail/message-list.c:1775
 msgid "%b %d %Y"
 msgstr "%b %d %��"
 
-#: ../mail/message-list.c:2510 ../shell/e-shell-view.c:534
-msgid "Shell Backend"
-msgstr "��� ������"
+#: ../mail/message-list.c:2527
+msgid "Select all visible messages"
+msgstr "������ �� ������� �������"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4263 ../mail/message-list.c:4743
+#: ../mail/message-list.c:4212 ../mail/message-list.c:4608
 msgid "Generating message list"
 msgstr "�������� ����� ����"
 
-#: ../mail/message-list.c:4578
+#: ../mail/message-list.c:4445
 msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
+"No message satisfies your search criteria. Either clear search with "
+"Search->Clear menu item or change it."
 msgstr ""
 "�� ����� �������� �� ��� ��������. ��� ��� ��� ��� ���->��� ���� ���� � ���� "
 "��."
 
-#: ../mail/message-list.c:4580
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"�� � ���� ����� ������� �� ��� �����. �� ��->�� ����� ������� � �� ���."
-
-#: ../mail/message-list.c:4582
+#: ../mail/message-list.c:4447
 msgid "There are no messages in this folder."
 msgstr "�� � �� ������� �� ��� �����."
 
@@ -10659,7 +13707,7 @@ msgid "Sent Messages"
 msgstr "���� �������"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:545
 msgid "Size"
 msgstr "���"
 
@@ -10667,55 +13715,28 @@ msgstr "���"
 msgid "Subject - Trimmed"
 msgstr "������� - �����"
 
-#: ../mail/message-tag-followup.c:54
-msgid "Call"
-msgstr "���"
-
-#: ../mail/message-tag-followup.c:55
-msgid "Do Not Forward"
-msgstr "�� ��� �����"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Follow-Up"
-msgstr "����-��"
-
-#: ../mail/message-tag-followup.c:57
-msgid "For Your Information"
-msgstr "�� �� ���������"
-
-#: ../mail/message-tag-followup.c:58
-msgid "Forward"
-msgstr "�����"
-
-#: ../mail/message-tag-followup.c:59
-msgid "No Response Necessary"
-msgstr "�� ������� �������"
-
-#: ../mail/message-tag-followup.c:63
-msgid "Reply to All"
-msgstr "����� � ��"
-
-#: ../mail/message-tag-followup.c:64
-msgid "Review"
-msgstr "����"
-
-#: ../mail/searchtypes.xml.h:1 ../modules/mail/e-mail-shell-view-actions.c:1450
+#: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Body contains"
 msgstr "���� �������"
 
-#: ../mail/searchtypes.xml.h:2 ../modules/mail/e-mail-shell-view-actions.c:1457
+#: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Message contains"
 msgstr "����� �������"
 
-#: ../mail/searchtypes.xml.h:3 ../modules/mail/e-mail-shell-view-actions.c:1464
+#: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Recipients contain"
 msgstr "���������� ������"
 
-#: ../mail/searchtypes.xml.h:4 ../modules/mail/e-mail-shell-view-actions.c:1471
+#: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Sender contains"
 msgstr "����� �������"
 
-#: ../mail/searchtypes.xml.h:5 ../modules/mail/e-mail-shell-view-actions.c:1478
+#: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Subject contains"
 msgstr "������� �������"
 
@@ -10723,27 +13744,42 @@ msgstr "������� �������"
 msgid "Subject or Addresses contains"
 msgstr "������� � ������� �������"
 
-#: ../modules/addressbook/addressbook-config.c:212
+#: ../modules/addressbook/addressbook-config.c:206
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
 msgstr ""
-"�������� ��� ����� ���� ��� ·�������� ��� ���� ������ � �� LDAP ���� �� "
-"�� LDAP ���� ������ SSL."
+"�������� ��� ����� ���� ��� ·�������� ��� ���� ������ � �� LDAP ���� �� �� "
+"LDAP ���� ������ SSL."
 
-#: ../modules/addressbook/addressbook-config.c:341
-msgid "Base"
-msgstr "���"
+#, fuzzy
+#: ../modules/addressbook/addressbook-config.c:208
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"�������� ��� ����� ���� ��� ·�������� ��� ���� ������ � �� LDAP ���� �� �� "
+"LDAP ���� ������ TLS."
 
-#: ../modules/addressbook/addressbook-config.c:638
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "�� �� _����� & ��������� �������"
+#, fuzzy
+#: ../modules/addressbook/addressbook-config.c:210
+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 ""
+"�������� ��� ����� ���� ��� �� ���� ��� ��� ����� ��� ·�·�·� � TLS. ��� ���� "
+"��� �� �������� ��� �� �������, � ��� � ��� �� ��������� � ��������� ��������."
+
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "_�� �� ����� & ��������� �������"
 
-#: ../modules/addressbook/addressbook-config.c:674
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "���� _��� ������� ������ �� ����� �������"
 
-#: ../modules/addressbook/addressbook-config.c:785
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -10753,57 +13789,56 @@ msgstr ""
 "������� ���� ��� ��� ��������. ��� �� ������ ������������ ��� ��� � ��� "
 "�������."
 
-#: ../modules/addressbook/addressbook-config.c:863
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
+"This is the method Evolution will use to authenticate you.  Note that setting "
+"this to \"Email Address\" requires anonymous access to your LDAP server."
 msgstr ""
 "��� �� � ����� ·�������� ��� �� � ��������� �.  ��� ��� ����� ��� � \"���� "
 "�����\" ������� �������� ����� � �� LDAP ����."
 
-#: ../modules/addressbook/addressbook-config.c:942
+#: ../modules/addressbook/addressbook-config.c:895
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
+"your search base. A search scope of \"one\" will only include the entries one "
+"level beneath your base."
 msgstr ""
 "� ��� ���� ������ �� ��� � ��� ��� � ��� � ������� ��� � �������� ���. � ��� "
-"���� � \"���\" ��� ������ �� ������ ���� �� ��� ���. � ��� ���� � \"���\" "
-"��� ���� ������ � ������ ��� ����� ����� �� ���."
+"���� � \"���\" ��� ������ �� ������ ���� �� ��� ���. � ��� ���� � \"���\" ��� "
+"���� ������ � ������ ��� ����� ����� �� ���."
 
-#: ../modules/addressbook/addressbook-config.c:1052
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "���� ���������"
 
-#: ../modules/addressbook/addressbook-config.c:1054
-msgid "Authentication"
-msgstr "�����������"
-
-#: ../modules/addressbook/addressbook-config.c:1057
-#: ../modules/addressbook/ldap-config.glade.h:15
-#: ../smime/gui/smime-ui.glade.h:20
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "������"
 
-#: ../modules/addressbook/addressbook-config.c:1058
+#: ../modules/addressbook/addressbook-config.c:1017
+#: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "�����"
 
-#: ../modules/addressbook/addressbook-config.c:1060
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "��������"
 
-#: ../modules/addressbook/addressbook-config.c:1270
-#: ../modules/addressbook/ldap-config.glade.h:9
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "����� ��� ��������"
 
-#: ../modules/addressbook/addressbook-config.c:1272
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "�� ����� ���"
 
+#, fuzzy
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "Autocomplete ����"
+
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
 msgid "Contact layout style"
 msgstr "������� ���� ����"
@@ -10816,6 +13851,16 @@ msgstr "ð�‘’ð�‘ªð�‘¯ð�‘‘ð�‘¨ð�‘’ð�‘‘ ð�‘�ð�‘®ð�‘°ð�‘�ð�‘¿ ð�‘�ð�‘±ð�‘¯ ð�‘�ð�‘©ð
 msgid "Contact preview pane position (vertical)"
 msgstr "������� ����� ��� ������� (�������)"
 
+#, fuzzy
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "EFolderList ·�·�·� �� � ���� � ��������� URIs"
+
+#, fuzzy
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "EFolderList ·�·�·� �� � ���� � ��������� URIs."
+
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "Position of the contact preview pane when oriented horizontally."
 msgstr "������� � � ������� ����� ��� ��� �������� �����������."
@@ -10824,6 +13869,11 @@ msgstr "������� � � ������� �
 msgid "Position of the contact preview pane when oriented vertically."
 msgstr "������� � � ������� ����� ��� ��� �������� ��������."
 
+#, fuzzy
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr "�� autocompleted ��� ��� �� �����"
+
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show preview pane"
 msgstr "�� ����� ���"
@@ -10835,9 +13885,17 @@ msgid ""
 "contact list. \"1\" (Vertical View) places the preview pane next to the "
 "contact list."
 msgstr ""
-"� ���� ���� �������� �� � ���� � ����� ��� �� ������� � � ������� ����. "
-"\"0\" (������ ��) ������ � ����� ��� ���� � ������� ����. \"1\" (������� ��) "
-"������ � ����� ��� ����� � � ������� ����."
+"� ���� ���� �������� �� � ���� � ����� ��� �� ������� � � ������� ����. \"0\" "
+"(������ ��) ������ � ����� ��� ���� � ������� ����. \"1\" (������� ��) ������ "
+"� ����� ��� ����� � � ������� ����."
+
+#, fuzzy
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"� ����� � �������� ��� ���� �� ���� ���� ·�������� ��� ������ � autocomplete."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "URI for the folder last used in the select names dialog"
@@ -10847,22 +13905,37 @@ msgstr "URI ð�‘“ð�‘¹ ð�‘ž ð�‘“ð�‘´ð�‘¤ð�‘›ð�‘¼ ð�‘¤ð�‘­ð�‘•ð�‘‘ ð�‘¿ð�‘•ð�‘‘ ð�‘
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI �� � ����� ���� ��� �� � ������ ���� ������."
 
+#, fuzzy
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"���� ��� ���� � ��� ����� ��� � ��� � � autocompleted ������� �� � �����."
+
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "Whether to show the preview pane."
 msgstr "���� � �� � ����� ���."
 
-#: ../modules/addressbook/autocompletion-config.c:153
-msgid "Date/Time Format"
-msgstr "���/��� �����"
-
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-#: ../modules/mail/em-mailer-prefs.c:1147
-msgid "Table column:"
-msgstr "����� �����:"
+#: ../modules/mail/em-mailer-prefs.c:1159
+msgid "_Table column:"
+msgstr "_����� �����:"
+
+#, fuzzy
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "Autocompletion"
+
+#, fuzzy
+#: ../modules/addressbook/autocompletion-config.c:165
+msgid "Always _show address of the autocompleted contact"
+msgstr "����� _�� ����� � � autocompleted �������"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "�� LDAP �����"
 
@@ -10872,7 +13945,7 @@ msgid "_Contact"
 msgstr "_�������"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "����� � �� �������"
 
@@ -10882,7 +13955,7 @@ msgid "Contact _List"
 msgstr "������� _����"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "����� � �� ������� ����"
 
@@ -10892,450 +13965,395 @@ msgid "Address _Book"
 msgstr "����� _���"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:619
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "����� � �� ����� ���"
 
 #. Create the contacts group
 #: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:378
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/addressbook/e-book-shell-view.c:398
+#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "��������"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:759
-#: ../modules/calendar/e-memo-shell-backend.c:583
-#: ../modules/calendar/e-task-shell-backend.c:593
-msgid "Source List"
-msgstr "��� ����"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "� �������� � ����� ����"
-
-#: ../modules/addressbook/e-book-shell-content.c:313
-msgid "Current View"
-msgstr "������ ��"
-
-#: ../modules/addressbook/e-book-shell-content.c:314
-msgid "The currently selected address book view"
-msgstr "� �������� �������� ����� ��� ��"
-
-#: ../modules/addressbook/e-book-shell-content.c:323
-msgid "Previewed Contact"
-msgstr "������� �������"
-
-#: ../modules/addressbook/e-book-shell-content.c:324
-msgid "The contact being shown in the preview pane"
-msgstr "� ������� ���� ��� �� � ����� ���"
-
-#: ../modules/addressbook/e-book-shell-content.c:333
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:630
-#: ../modules/mail/e-mail-shell-content.c:725
-msgid "Preview is Visible"
-msgstr "����� �� �������"
-
-#: ../modules/addressbook/e-book-shell-content.c:334
-#: ../modules/calendar/e-memo-shell-content.c:608
-#: ../modules/calendar/e-task-shell-content.c:631
-#: ../modules/mail/e-mail-shell-content.c:726
-msgid "Whether the preview pane is visible"
-msgstr "���� � ����� ��� �� �������"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
-#: ../modules/mail/e-mail-shell-migrate.c:1106
-msgid "Migrating..."
-msgstr "��������..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
-#: ../modules/mail/e-mail-shell-migrate.c:1179
-#, c-format
-msgid "Migrating '%s':"
-msgstr "�������� '%s':"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP �����"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-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 ""
-"� ������� � ������� � � ·�������� ������� ������ ��� ����� ���� ·�������� 1."
-"���.\n"
-"\n"
-"���� �� ������ ��� ·�������� ������� �� ������..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"� ����� � ����� ���� �������� ��� �����.\n"
-"\n"
-"���� �� ������ ��� ·�������� ������� �� ������..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"� �� ·�������� ���� ��� ��� ������ ��� �����.\n"
-"\n"
-"���� �� ������ ��� ·�������� ������� �� ������..."
+#. Translators: This is a save dialog title
+#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
+msgid "Save as vCard"
+msgstr "��� �� vCard"
 
-#: ../modules/addressbook/e-book-shell-sidebar.c:174
-msgid "This widget displays groups of address books"
-msgstr "��� ����� ������� ����� � ����� ����"
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
+msgid "Co_py All Contacts To..."
+msgstr "_���� �� �������� �..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:598
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "���� � �������� � � �������� ����� ��� � �����"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:605
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
+msgid "D_elete Address Book"
+msgstr "_����� ����� ���"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "����� � �������� ����� ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:612
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
+msgid "Mo_ve All Contacts To..."
+msgstr "_��� �� �������� �..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "��� � �������� � � �������� ����� ��� � �����"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:617
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "_�� ����� ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:624
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "����� _��� ��������"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:626
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "�� �������� � � �������� ����� ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:631
-#: ../modules/calendar/e-cal-shell-view-actions.c:1242
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
-#: ../modules/calendar/e-task-shell-view-actions.c:762
-#: ../modules/mail/e-mail-shell-view-actions.c:1130
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/mail/e-mail-shell-view-actions.c:905
 msgid "_Rename..."
 msgstr "_�����..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:633
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "����� � �������� ����� ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:647
-msgid "Stop loading"
-msgstr "���� �����"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:654
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Copy the selection"
-msgstr "���� � ��������"
+#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
+msgid "S_ave Address Book as vCard"
+msgstr "_��� ����� ��� �� vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:661
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
-msgid "Cut the selection"
-msgstr "��� � ��������"
+#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "��� � �������� � � �������� ����� ��� �� � vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:668
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
-msgid "Paste the clipboard"
-msgstr "���� � �������"
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
+msgid "Stop loading"
+msgstr "���� �����"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:673
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "_���� ������� �..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:675
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "���� �������� �������� � ����� ����� ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "_����� �������"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
-msgid "Delete selected contacts"
-msgstr "����� �������� ��������"
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
+msgid "_Find in Contact..."
+msgstr "_���� �� �������..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
+msgid "Search for text in the displayed contact"
+msgstr "��� �� ����� �� � ������� �������"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "_����� �������..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:689
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "���� �������� �������� � ����� �����"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "_��� ������� �..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "��� �������� �������� � ����� ����� ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "_�� �������..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "�� ������� _����..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
-msgid "_Open"
-msgstr "_����"
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
+msgid "_Open Contact"
+msgstr "_���� �������"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:717
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "�� � ������ �������"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
-msgid "Select all contacts"
-msgstr "������ �� ��������"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "_���� ����� � �������..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "���� � ����� � � �������� ��������"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
-#: ../modules/calendar/e-task-shell-view-actions.c:827
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "_Actions"
 msgstr "_������"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
-#: ../modules/calendar/e-memo-shell-view-actions.c:681
-#: ../modules/calendar/e-task-shell-view-actions.c:834
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "_Preview"
 msgstr "_�����"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:761
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "_Delete"
 msgstr "_�����"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:765
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "_��������"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+# not making any attempt at present to translate
+# timezone names
+#. Translators: This is an action label
+#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
+msgid "_Save as vCard..."
+msgstr "_��� �� vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "������� _�����"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:823
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "�� ������� ����� �����"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:932
-#: ../modules/mail/e-mail-shell-view-actions.c:1367
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Classic View"
 msgstr "_������ ��"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "�� ������� ����� ���� � ������� ����"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:939
-#: ../modules/mail/e-mail-shell-view-actions.c:1374
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Vertical View"
 msgstr "_������� ��"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:851
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "�� ������� ����� ������� � ������� ����"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:859
-#: ../modules/calendar/e-cal-shell-view-actions.c:1555
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Any Category"
 msgstr "��� �������"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:866
-#: ../modules/calendar/e-cal-shell-view-actions.c:1569
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
-#: ../modules/calendar/e-task-shell-view-actions.c:991
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
+#: ../modules/calendar/e-memo-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:941
 msgid "Unmatched"
 msgstr "������"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
-msgid "Print selected contacts"
-msgstr "����� �������� ��������"
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../shell/e-shell-content.c:441
+msgid "Advanced Search"
+msgstr "������� ���"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
+msgid "Print all shown contacts"
+msgstr "����� �� ��� ��������"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "����� � �������� � �� �������"
 
-#: ../modules/addressbook/e-book-shell-view.c:322
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
+msgid "Print selected contacts"
+msgstr "����� �������� ��������"
+
+#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
+msgid "Save selected contacts as a vCard"
+msgstr "��� �������� �������� �� � vCard"
+
+#: ../modules/addressbook/e-book-shell-view.c:342
 msgid "_Forward Contacts"
 msgstr "_����� ��������"
 
-#: ../modules/addressbook/e-book-shell-view.c:324
+#: ../modules/addressbook/e-book-shell-view.c:344
 msgid "_Forward Contact"
 msgstr "_����� �������"
 
-#: ../modules/addressbook/e-book-shell-view.c:355
+#: ../modules/addressbook/e-book-shell-view.c:375
 msgid "_Send Message to Contacts"
 msgstr "_���� ����� � ��������"
 
-#: ../modules/addressbook/e-book-shell-view.c:357
+#: ../modules/addressbook/e-book-shell-view.c:377
 msgid "_Send Message to List"
 msgstr "_���� ����� � ����"
 
-#: ../modules/addressbook/e-book-shell-view.c:359
+#: ../modules/addressbook/e-book-shell-view.c:379
 msgid "_Send Message to Contact"
 msgstr "_���� ����� � �������"
 
-#: ../modules/addressbook/eab-composer-util.c:159
-#: ../modules/addressbook/eab-composer-util.c:186
+#, fuzzy
+#: ../modules/addressbook/eab-composer-util.c:137
+msgid "Multiple vCards"
+msgstr "�������� vCards"
+
 #, c-format
+#, fuzzy
+#: ../modules/addressbook/eab-composer-util.c:145
+msgid "vCard for %s"
+msgstr "vCard �� %s"
+
+#, c-format
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
 msgid "Contact information"
 msgstr "������� ���������"
 
-#: ../modules/addressbook/eab-composer-util.c:188
 #, c-format
+#: ../modules/addressbook/eab-composer-util.c:186
 msgid "Contact information for %s"
 msgstr "������� ��������� �� %s"
 
-#: ../modules/addressbook/ldap-config.glade.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.glade.h:2
-msgid ""
-"389\n"
-"636\n"
-"3268"
-msgstr ""
-"389\n"
-"636\n"
-"3268"
-
-#: ../modules/addressbook/ldap-config.glade.h:5
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
-#: ../modules/addressbook/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>�����������</b>"
-
-#: ../modules/addressbook/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>��������</b>"
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "Anonymously"
+msgstr "����������"
 
-#: ../modules/addressbook/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>�����</b>"
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:7
+msgid "B_rowse this book until limit reached"
+msgstr "_���� ��� ��� ����� ����� ����"
 
-#: ../modules/addressbook/ldap-config.glade.h:16
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr "·�������� ��� �� ��� ���� ����� � ��������� � ��� � ����."
+#: ../modules/addressbook/ldap-config.ui.h:8
+msgid "Lo_gin:"
+msgstr "_�����:"
 
-#: ../modules/addressbook/ldap-config.glade.h:19
-msgid ""
-"One\n"
-"Sub"
-msgstr ""
-"���\n"
-"���"
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:11
+msgid "One"
+msgstr "���"
 
-#: ../modules/addressbook/ldap-config.glade.h:24
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "��� �����"
 
-#: ../modules/addressbook/ldap-config.glade.h:25
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "��� _���:"
 
-#: ../modules/addressbook/ldap-config.glade.h:26
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "��� _�����:"
 
-#: ../modules/addressbook/ldap-config.glade.h:27
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
 msgstr ""
-"��� ����� �� � ��� � ������ � �� ���� ��. �� ��� �� ��� �������, � ������ "
-"��� ��� �� ������ �� � ��� \"�����\"."
+"��� ����� �� � ��� � ������ � �� ���� ��. �� ��� �� ��� �������, � ������ ��� "
+"��� �� ������ �� � ��� \"�����\"."
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:18
+msgid "Sub"
+msgstr "���"
 
-#: ../modules/addressbook/ldap-config.glade.h:28
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "������� ��� �����"
 
-#: ../modules/addressbook/ldap-config.glade.h:31
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"��� �� � �������� ����� � ������ � ������. ����� ��� ����� � �� �� ��� ��� "
-"��� ��� �� ����� ���."
+#, fuzzy
+#: ../modules/addressbook/ldap-config.ui.h:21
+msgid "Using distinguished name (DN)"
+msgstr "���� ����������� ��� (DN)"
 
-#: ../modules/addressbook/ldap-config.glade.h:32
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"��� �� � ��� �� ��� ���� ��� ��� ��� �� �� ·�������� ����� ����. �� �� �� "
-"������ ������� ����. "
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Using email address"
+msgstr "���� ���� �����"
 
-#: ../modules/addressbook/ldap-config.glade.h:33
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "_������ �����:"
 
-#: ../modules/addressbook/ldap-config.glade.h:34
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "_���� ������� ��� �����"
 
-#: ../modules/addressbook/ldap-config.glade.h:35
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "_����� �����:"
 
-#: ../modules/addressbook/ldap-config.glade.h:37
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_���:"
 
-#: ../modules/addressbook/ldap-config.glade.h:38
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "_��� ����:"
 
-#: ../modules/addressbook/ldap-config.glade.h:40
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_�����:"
 
-#: ../modules/addressbook/ldap-config.glade.h:41
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_�� ������ ��������:"
 
-#: ../modules/addressbook/ldap-config.glade.h:42
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "����"
 
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "I_mport"
+msgstr "_�����"
+
 #: ../modules/calendar/e-cal-attachment-handler.c:341
 msgid "Select a Calendar"
 msgstr "������ � �������"
@@ -11344,1138 +14362,1169 @@ msgstr "������ � �������"
 msgid "Select a Task List"
 msgstr "������ � ���� ����"
 
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+msgid "I_mport to Calendar"
+msgstr "_����� � �������"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+msgid "I_mport to Tasks"
+msgstr "_����� � �����"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:122
-#: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-cal-shell-backend.c:125
+#: ../modules/calendar/e-cal-shell-migrate.c:176
+#: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-backend.c:113
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "�� � ���"
 
-#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../modules/calendar/e-cal-shell-backend.c:127
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "����"
 
-#: ../modules/calendar/e-cal-shell-backend.c:238
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:242
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "������ & ���������"
 
-#: ../modules/calendar/e-cal-shell-backend.c:424
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_���������"
 
-#: ../modules/calendar/e-cal-shell-backend.c:426
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "����� � �� ���������"
 
-#: ../modules/calendar/e-cal-shell-backend.c:433
+#: ../modules/calendar/e-cal-shell-backend.c:453
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "�� �� _���������"
+
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new all-day appointment"
 msgstr "����� � �� ��-�� ���������"
 
-#: ../modules/calendar/e-cal-shell-backend.c:440
+#: ../modules/calendar/e-cal-shell-backend.c:460
+msgctxt "New"
+msgid "M_eeting"
+msgstr "_�����"
+
+#: ../modules/calendar/e-cal-shell-backend.c:462
 msgid "Create a new meeting request"
 msgstr "����� � �� ����� �������"
 
-#: ../modules/calendar/e-cal-shell-backend.c:450
-#: ../modules/calendar/e-cal-shell-view-actions.c:1223
+#: ../modules/calendar/e-cal-shell-backend.c:470
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "_�������"
+
+#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "����� � �� �������"
 
-#: ../modules/calendar/e-cal-shell-backend.c:485
-#: ../plugins/itip-formatter/itip-formatter.c:2564
+#: ../modules/calendar/e-cal-shell-backend.c:507
+#: ../plugins/itip-formatter/itip-formatter.c:2666
 msgid "Calendar and Tasks"
 msgstr "������� � �����"
 
-#: ../modules/calendar/e-cal-shell-backend.c:760
-msgid "The registry of calendars"
-msgstr "� �������� � ��������"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-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 ""
-"� ������� � ������� � � ·�������� ������� ������ ��� ����� ���� ·�������� 1."
-"���.\n"
-"\n"
-"���� �� ������ ��� ·�������� ������� �� ������..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
 #, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "������ � ������ ������� `%s'"
+#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
+msgid "Error on %s\n%s"
+msgstr "�� �� %s\n%s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:152
-#: ../modules/calendar/e-memo-shell-sidebar.c:149
-#: ../modules/calendar/e-task-shell-sidebar.c:147
-#, c-format
-msgid ""
-"Error on %s\n"
-"%s"
-msgstr ""
-"�� �� %s\n"
-"%s"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:188
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
 msgid "Loading calendars"
 msgstr "����� ��������"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:551
-msgid "Date Navigator Widget"
-msgstr "��� �������� �����"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:552
-msgid "This widget displays a miniature calendar"
-msgstr "��� ����� ������� � �������� �������"
+#, fuzzy
+#: ../modules/calendar/e-cal-shell-sidebar.c:633
+msgid "Calendar Selector"
+msgstr "������� Selector"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:562
-msgid "This widget displays groups of calendars"
-msgstr "��� ����� ������� ����� � ��������"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:723
+#. Translators: The string field is a URI.
 #, c-format
+#: ../modules/calendar/e-cal-shell-sidebar.c:974
 msgid "Opening calendar at %s"
 msgstr "������ ������� �� %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:214
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
 msgid "Print"
 msgstr "�����"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:304
+#: ../modules/calendar/e-cal-shell-view-actions.c:306
 msgid ""
 "This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
+"amount of time. If you continue, you will not be able to recover these events."
 msgstr ""
-"��� ������� ��� ���������� ���� �� ������ ���� ��� � �������� ����� � ���. "
-"�� � �������, � ��� ��� �� ���� � ������ ��� ������."
+"��� ������� ��� ���������� ���� �� ������ ���� ��� � �������� ����� � ���. �� "
+"� �������, � ��� ��� �� ���� � ������ ��� ������."
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:321
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
 msgid "Purge events older than"
 msgstr "��� ������ ���� ���"
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:334
-#: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-file/calendar-file.c:295
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:516
-#: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../plugins/google-account-setup/google-source.c:741
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "���"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:551
+#: ../modules/calendar/e-cal-shell-view-actions.c:534
 msgid "Copying Items"
 msgstr "������ �����"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:796
 msgid "Moving Items"
 msgstr "����� �����"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1097
-msgid "Save As..."
-msgstr "��� ��..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1179
-#: ../modules/calendar/e-memo-shell-view-actions.c:609
+#. Translators: Default filename part saving an event to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+msgid "event"
+msgstr "�����"
+
+#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1100
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:494
+#: ../modules/calendar/e-task-shell-view-actions.c:612
+msgid "Save as iCalendar"
+msgstr "��� �� iCalendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "_����..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1195
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+msgid "D_elete Calendar"
+msgstr "_����� �������"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+msgid "Delete the selected calendar"
+msgstr "����� � �������� �������"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Go Back"
 msgstr "�� ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1202
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Go Forward"
 msgstr "�� �����"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1207
-msgid "Select _Today"
-msgstr "������ _����"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "������ ����"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1214
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "������ _���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1216
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "������ � �������� ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1221
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "_�� �������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-task-shell-view-actions.c:784
+msgid "Purg_e"
+msgstr "_���"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Purge old appointments and meetings"
 msgstr "��� ��� ���������� � ������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#: ../modules/calendar/e-task-shell-view-actions.c:728
+msgid "Re_fresh"
+msgstr "_������"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
+msgid "Refresh the selected calendar"
+msgstr "������ � �������� �������"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Rename the selected calendar"
 msgstr "����� � �������� �������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1249
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Show _Only This Calendar"
 msgstr "�� _���� ��� �������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+msgid "Cop_y to Calendar..."
+msgstr "_���� � �������..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "_������� �����..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-msgid "Delete the appointment"
-msgstr "����� � ���������"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+msgid "_Delete Appointment"
+msgstr "_����� ���������"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+msgid "Delete selected appointments"
+msgstr "����� �������� ����������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete This _Occurrence"
 msgstr "����� ��� _������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "����� ��� ������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1305
-msgid "Delete _All Occurrences"
-msgstr "����� _�� ��������"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+msgid "Delete All Occ_urrences"
+msgstr "����� �� _��������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "����� �� ��������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "New All Day _Event..."
 msgstr "�� �� �� _�����..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Create a new all day event"
 msgstr "����� � �� �� �� �����"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:568
+#: ../modules/calendar/e-task-shell-view-actions.c:693
+msgid "_Forward as iCalendar..."
+msgstr "_����� �� iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "New _Meeting..."
 msgstr "�� _�����..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Create a new meeting"
 msgstr "����� � �� �����"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+msgid "Mo_ve to Calendar..."
+msgstr "_��� � �������..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "�� _���������..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "��� ��� ������ _�������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "_���� ���������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "�� � ������ ���������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "_�����"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+msgid "Save as iCalendar..."
+msgstr "��� �� iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "_����� �����..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+msgid "Converts an appointment to a meeting"
+msgstr "������� �� ��������� � � �����"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
+msgid "Conv_ert to Appointment..."
+msgstr "_������ � ���������..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+msgid "Converts a meeting to an appointment"
+msgstr "������� � ����� � �� ���������"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+msgid "Quit"
+msgstr "����"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1512
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "�� ��� ��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "����"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "�� �� ����"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "����"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "�� ��� ����"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1533
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "�� ��� ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1538
-msgid "Work Week"
-msgstr "��� ���"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Show one work week"
 msgstr "�� ��� ��� ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1548
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "����� ����������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "����� 7 ���' ����������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1586
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
-#: ../modules/calendar/e-task-shell-view-actions.c:1008
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Description contains"
 msgstr "���������� �������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1593
-#: ../modules/calendar/e-memo-shell-view-actions.c:815
-#: ../modules/calendar/e-task-shell-view-actions.c:1015
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Summary contains"
 msgstr "����� �������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1605
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "����� ��� �������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1612
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 msgid "Preview the calendar to be printed"
 msgstr "����� � ������� � �� �������"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "�� �"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:76
-#: ../modules/calendar/e-memo-shell-view-actions.c:96
-msgid "Deleting selected memos..."
-msgstr "������� �������� �����..."
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:576
-msgid "Copy selected memo"
-msgstr "���� �������� ����"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:288
-#: ../modules/calendar/e-memo-shell-view-actions.c:583
-msgid "Cut selected memo"
-msgstr "��� �������� ����"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:295
-#: ../modules/calendar/e-memo-shell-view-actions.c:590
-msgid "Paste memo from the clipboard"
-msgstr "���� ���� ���� � �������"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:300
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
-msgid "_Delete Memo"
-msgstr "_����� ����"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:302
-#: ../modules/calendar/e-memo-shell-view-actions.c:597
-msgid "Delete selected memos"
-msgstr "����� �������� �����"
+#. Translators: Default filename part saving a memo to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:492
+msgid "memo"
+msgstr "����"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:314
-#: ../modules/calendar/e-memo-shell-view-actions.c:651
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
 msgid "New _Memo"
 msgstr "�� _����"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:316
-#: ../modules/calendar/e-memo-shell-backend.c:318
-#: ../modules/calendar/e-memo-shell-view-actions.c:653
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../modules/calendar/e-memo-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
 msgid "Create a new memo"
 msgstr "����� � �� ����"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:321
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
 msgid "_Open Memo"
 msgstr "_���� ����"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:323
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "View the selected memo"
 msgstr "�� � �������� ����"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:328
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:416
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Open _Web Page"
 msgstr "���� _��� ���"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:347
-#: ../modules/calendar/e-memo-shell-view-actions.c:841
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
 msgid "Print the selected memo"
 msgstr "����� � �������� ����"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:429
-#: ../modules/calendar/e-memo-shell-view.c:223
-msgid "Delete Memo"
-msgid_plural "Delete Memos"
-msgstr[0] "����� ����"
-msgstr[1] "����� �����"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:99
-#: ../modules/calendar/e-task-shell-view-actions.c:127
-msgid "Deleting selected tasks..."
-msgstr "������� �������� �����..."
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:610
+msgid "task"
+msgstr "����"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:672
 msgid "_Assign Task"
 msgstr "_���� ����"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:355
-#: ../modules/calendar/e-task-shell-view-actions.c:701
-msgid "Copy selected tasks"
-msgstr "���� �������� �����"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../modules/calendar/e-task-shell-view-actions.c:708
-msgid "Cut selected tasks"
-msgstr "��� �������� �����"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:369
-#: ../modules/calendar/e-task-shell-view-actions.c:715
-msgid "Paste tasks from the clipboard"
-msgstr "���� ����� ���� � �������"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:374
-#: ../modules/calendar/e-task-shell-view-actions.c:720
-msgid "_Delete Task"
-msgstr "_����� ����"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:376
-#: ../modules/calendar/e-task-shell-view-actions.c:722
-msgid "Delete selected tasks"
-msgstr "����� �������� �����"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:388
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "_Mark as Complete"
 msgstr "_��� �� �������"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:390
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Mark selected tasks as complete"
 msgstr "��� �������� ����� �� �������"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:395
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
 msgid "_Mark as Incomplete"
 msgstr "_��� �� ���������"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:397
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Mark selected tasks as incomplete"
 msgstr "��� �������� ����� �� ���������"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:402
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "New _Task"
 msgstr "�� _����"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:404
-#: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Create a new task"
 msgstr "����� � �� ����"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:409
-#: ../modules/calendar/e-task-shell-view-actions.c:797
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "_Open Task"
 msgstr "_���� ����"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:411
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "View the selected task"
 msgstr "�� � �������� ����"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:435
-#: ../modules/calendar/e-task-shell-view-actions.c:1041
+#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-memo-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+msgid "_Save as iCalendar..."
+msgstr "_��� �� iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-task-shell-view-actions.c:998
 msgid "Print the selected task"
 msgstr "����� � �������� ����"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:540
-#: ../modules/calendar/e-task-shell-view.c:350
-msgid "Delete Task"
-msgid_plural "Delete Tasks"
-msgstr[0] "����� ����"
-msgstr[1] "����� �����"
+#: ../modules/calendar/e-memo-shell-backend.c:318
+msgctxt "New"
+msgid "Mem_o"
+msgstr "_����"
 
-#: ../modules/calendar/e-memo-shell-backend.c:323
+#: ../modules/calendar/e-memo-shell-backend.c:325
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_��� ����"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:327
 msgid "Create a new shared memo"
 msgstr "����� � �� ��� ����"
 
 #: ../modules/calendar/e-memo-shell-backend.c:335
-#: ../modules/calendar/e-memo-shell-view-actions.c:625
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "���� _����"
+
+#: ../modules/calendar/e-memo-shell-backend.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "Create a new memo list"
 msgstr "����� � �� ���� ����"
 
-#: ../modules/calendar/e-memo-shell-backend.c:584
-msgid "The registry of memo lists"
-msgstr "� �������� � ���� �����"
-
-#: ../modules/calendar/e-memo-shell-content.c:598
-msgid "The memo table model"
-msgstr "� ���� ����� �����"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:185
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "����� �����"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:529
-msgid "This widget displays groups of memo lists"
-msgstr "��� ����� ������� ����� � ���� �����"
+#, fuzzy
+#: ../modules/calendar/e-memo-shell-sidebar.c:587
+msgid "Memo List Selector"
+msgstr "���� ���� Selector"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:682
+#. Translators: The string field is a URI.
 #, c-format
+#: ../modules/calendar/e-memo-shell-sidebar.c:892
 msgid "Opening memos at %s"
 msgstr "������ ����� �� %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:253
-#: ../modules/calendar/e-memo-shell-view-actions.c:270
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
 msgid "Print Memos"
 msgstr "����� �����"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-memo-shell-view-actions.c:554
+msgid "_Delete Memo"
+msgstr "_����� ����"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:561
+msgid "_Find in Memo..."
+msgstr "_���� �� ����..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:563
+msgid "Search for text in the displayed memo"
+msgstr "��� �� ����� �� � ������� ����"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
+msgid "D_elete Memo List"
+msgstr "_����� ���� ����"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+msgid "Delete the selected memo list"
+msgstr "����� � �������� ���� ����"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
 msgid "_New Memo List"
 msgstr "_�� ���� ����"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:639
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+msgid "Refresh the selected memo list"
+msgstr "������ � �������� ���� ����"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 msgid "Rename the selected memo list"
 msgstr "����� � �������� ���� ����"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Show _Only This Memo List"
 msgstr "�� _���� ��� ���� ����"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:746
+#: ../modules/calendar/e-memo-shell-view-actions.c:696
 msgid "Memo _Preview"
 msgstr "���� _�����"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:748
+#: ../modules/calendar/e-memo-shell-view-actions.c:698
 msgid "Show memo preview pane"
 msgstr "�� ���� ����� ���"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:769
+#: ../modules/calendar/e-memo-shell-view-actions.c:719
 msgid "Show memo preview below the memo list"
 msgstr "�� ���� ����� ���� � ���� ����"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
 msgid "Show memo preview alongside the memo list"
 msgstr "�� ���� ����� ������� � ���� ����"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:827
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
 msgid "Print the list of memos"
 msgstr "����� � ���� � �����"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:834
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
 msgid "Preview the list of memos to be printed"
 msgstr "����� � ���� � ����� � �� �������"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:412
 #, c-format
+#: ../modules/calendar/e-memo-shell-view-private.c:416
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d ����"
 msgstr[1] "%d �����"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:416
-#: ../modules/calendar/e-task-shell-view-private.c:510
 #, c-format
+#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-task-shell-view-private.c:569
 msgid "%d selected"
 msgstr "%d ��������"
 
-#: ../modules/calendar/e-memo-shell-view.c:221
+#: ../modules/calendar/e-memo-shell-view.c:223
 msgid "Delete Memos"
 msgstr "����� �����"
 
-#: ../modules/calendar/e-task-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view.c:225
+msgid "Delete Memo"
+msgstr "����� ����"
+
+#: ../modules/calendar/e-task-shell-backend.c:322
 msgctxt "New"
 msgid "_Task"
 msgstr "_����"
 
 #: ../modules/calendar/e-task-shell-backend.c:329
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "_������ ����"
+
+#: ../modules/calendar/e-task-shell-backend.c:331
 msgid "Create a new assigned task"
 msgstr "����� � �� ������ ����"
 
 #: ../modules/calendar/e-task-shell-backend.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "_���� ����"
+
+#: ../modules/calendar/e-task-shell-backend.c:341
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "Create a new task list"
 msgstr "����� � �� ���� ����"
 
-#: ../modules/calendar/e-task-shell-backend.c:594
-msgid "The registry of task lists"
-msgstr "� �������� � ���� �����"
-
-#: ../modules/calendar/e-task-shell-content.c:621
-msgid "The task table model"
-msgstr "� ���� ����� �����"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-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 ""
-"� ������� � ������� � � ·�������� ���� ������ ��� ����� ���� ·�������� 1.���.\n"
-"\n"
-"���� �� ������ ��� ·�������� ������� �� ������..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "������ � ������ ����� `%s'"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:183
+#: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "����� �����"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:527
-msgid "This widget displays groups of task lists"
-msgstr "��� ����� ������� ����� � ���� �����"
+#, fuzzy
+#: ../modules/calendar/e-task-shell-sidebar.c:587
+msgid "Task List Selector"
+msgstr "���� ���� Selector"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:680
+#. Translators: The string field is a URI.
 #, c-format
+#: ../modules/calendar/e-task-shell-sidebar.c:892
 msgid "Opening tasks at %s"
 msgstr "������ ����� �� %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:301
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
 msgid "Print Tasks"
 msgstr "����� �����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../modules/calendar/e-task-shell-view-actions.c:554
 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?"
+"continue, you will not be able to recover these tasks.\n\nReally erase these "
+"tasks?"
 msgstr ""
 "��� ������� ��� ���������� ���� �� ����� ���� �� ���������. �� � �������, � "
-"��� ��� �� ���� � ������ ��� �����.\n"
-"\n"
-"���� ���� ��� �����?"
+"��� ��� �� ���� � ������ ��� �����.\n\n���� ���� ��� �����?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:679
+msgid "_Delete Task"
+msgstr "_����� ����"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:686
+msgid "_Find in Task..."
+msgstr "_���� �� ����..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:688
+msgid "Search for text in the displayed task"
+msgstr "��� �� ����� �� � ������� ����"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:700
 msgid "Copy..."
 msgstr "����..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:707
+msgid "D_elete Task List"
+msgstr "_����� ���� ����"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:709
+msgid "Delete the selected task list"
+msgstr "����� � �������� ���� ����"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "_New Task List"
 msgstr "_�� ���� ����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:730
+msgid "Refresh the selected task list"
+msgstr "������ � �������� ���� ����"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Rename the selected task list"
 msgstr "����� � �������� ���� ����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Show _Only This Task List"
 msgstr "�� _���� ��� ���� ����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:756
+msgid "Mar_k as Incomplete"
+msgstr "_��� �� ���������"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Delete completed tasks"
 msgstr "����� ��������� �����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../modules/calendar/e-task-shell-view-actions.c:861
 msgid "Task _Preview"
 msgstr "���� _�����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../modules/calendar/e-task-shell-view-actions.c:863
 msgid "Show task preview pane"
 msgstr "�� ���� ����� ���"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:934
+#: ../modules/calendar/e-task-shell-view-actions.c:884
 msgid "Show task preview below the task list"
 msgstr "�� ���� ����� ���� � ���� ����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:941
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 msgid "Show task preview alongside the task list"
 msgstr "�� ���� ����� ������� � ���� ����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Active Tasks"
 msgstr "����� �����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:963
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Completed Tasks"
 msgstr "��������� �����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:970
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Next 7 Days' Tasks"
 msgstr "����� 7 ���' �����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:977
+#: ../modules/calendar/e-task-shell-view-actions.c:927
 msgid "Overdue Tasks"
 msgstr "����� �����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:984
+#: ../modules/calendar/e-task-shell-view-actions.c:934
 msgid "Tasks with Attachments"
 msgstr "����� ��� ���������"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#: ../modules/calendar/e-task-shell-view-actions.c:984
 msgid "Print the list of tasks"
 msgstr "����� � ���� � �����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1034
+#: ../modules/calendar/e-task-shell-view-actions.c:991
 msgid "Preview the list of tasks to be printed"
 msgstr "����� � ���� � ����� � �� �������"
 
-#: ../modules/calendar/e-task-shell-view-private.c:506
+#, fuzzy
+#: ../modules/calendar/e-task-shell-view-private.c:463
+msgid "Expunging"
+msgstr "Expunging"
+
 #, c-format
+#: ../modules/calendar/e-task-shell-view-private.c:565
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d ����"
 msgstr[1] "%d �����"
 
-#: ../modules/calendar/e-task-shell-view.c:348
+#: ../modules/calendar/e-task-shell-view.c:351
 msgid "Delete Tasks"
 msgstr "����� �����"
 
+#: ../modules/calendar/e-task-shell-view.c:353
+msgid "Delete Task"
+msgstr "����� ����"
+
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
 #, c-format
+#: ../modules/mail/e-mail-attachment-handler.c:333
 msgid "%d attached messages"
 msgstr "%d ����� �������"
 
-#: ../modules/mail/e-mail-shell-backend.c:174
+#. Translators: "None" for a junk hook name,
+#. * when the junk plugin is not enabled.
+#: ../modules/mail/e-mail-junk-hook.c:89
+msgctxt "mail-junk-hook"
+msgid "None"
+msgstr "���"
+
+#: ../modules/mail/e-mail-shell-backend.c:164
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_��� �����"
 
-#: ../modules/mail/e-mail-shell-backend.c:176
+#: ../modules/mail/e-mail-shell-backend.c:166
 msgid "Compose a new mail message"
 msgstr "������ � �� ��� �����"
 
-#: ../modules/mail/e-mail-shell-backend.c:184
+#: ../modules/mail/e-mail-shell-backend.c:174
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "��� _�����"
 
-#: ../modules/mail/e-mail-shell-backend.c:186
+#: ../modules/mail/e-mail-shell-backend.c:176
 msgid "Create a new mail folder"
 msgstr "����� � �� ��� �����"
 
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Mail Accounts"
 msgstr "��� ������"
 
-#: ../modules/mail/e-mail-shell-backend.c:221
+#: ../modules/mail/e-mail-shell-backend.c:203
+msgid "Mail Preferences"
+msgstr "��� ����������"
+
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgid "Composer Preferences"
 msgstr "������� ����������"
 
-#: ../modules/mail/e-mail-shell-backend.c:229
+#: ../modules/mail/e-mail-shell-backend.c:219
 msgid "Network Preferences"
 msgstr "������ ����������"
 
-#. green
-#: ../modules/mail/e-mail-shell-migrate.c:959
-msgid "To Do"
-msgstr "� ��"
-
-#. blue
-#: ../modules/mail/e-mail-shell-migrate.c:960
-msgid "Later"
-msgstr "����"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1139
-msgid "Migration"
-msgstr "��������"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1589
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "������ � ����� �� ����� `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1617
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "������ � ���� ����� `%s' � `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1812
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "������ � ���� �� �������� ��������� �� `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1818
-#: ../modules/mail/e-mail-shell-migrate.c:2915
-msgid "Migrating Folders"
-msgstr "�������� ������"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1819
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"� ������� � ������� � � ·�������� ������� ������ ��� ����� ���� ·�������� 1."
-"���.\n"
-"\n"
-"���� �� ������ ��� ·�������� ������� �� ������..."
-
-#: ../modules/mail/e-mail-shell-migrate.c:2022
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "������ � ���� ��� ��� ���-��-���� ���� `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2038
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "������ � ����� POP3 ���-��-���� ���� �������� `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2070
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "������ � ���� POP3 ���-��-���� ���� `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2541
-#: ../modules/mail/e-mail-shell-migrate.c:2555
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "���� � ����� ����� ��� ����� `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:3013
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "������ � ����� ����� ��� ������ �� `%s': %s"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../modules/mail/e-mail-shell-view.c:510
+#: ../modules/mail/e-mail-shell-view-actions.c:814
+#: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "_������� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:816
 msgid "Disable this account"
 msgstr "������� ��� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:823
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "���������� ����� �� � ������� ������� ���� �� ������"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:828
+msgid "C_reate Search Folder From Search..."
+msgstr "_����� ��� ����� ���� ���..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:835
 msgid "_Download Messages for Offline Usage"
 msgstr "_������ ������� �� ����� ����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
-msgid "Download messages of accounts and folders marked for offline"
-msgstr "������ ������� � ������ � ������ ���� �� �����"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
-msgid "Empty _Trash"
-msgstr "����� _����"
+#: ../modules/mail/e-mail-shell-view-actions.c:837
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr "������ ������� � ������ � ������ ���� �� ����� ����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
-msgid "Permanently remove all the deleted messages from all folders"
-msgstr "���������� ����� �� � ������� ������� ���� �� ������"
+#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:842
+msgid "Fl_ush Outbox"
+msgstr "_���� Outbox"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1074
+#: ../modules/mail/e-mail-shell-view-actions.c:849
 msgid "_Copy Folder To..."
 msgstr "_���� ����� �..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:851
 msgid "Copy the selected folder into another folder"
 msgstr "���� � �������� ����� ���� ����� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:858
 msgid "Permanently remove this folder"
 msgstr "���������� ����� ��� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/mail/e-mail-shell-view-actions.c:863
+msgid "E_xpunge"
+msgstr "_�������"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:865
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "���������� ����� �� ������� ������� ���� ��� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1097
+#: ../modules/mail/e-mail-shell-view-actions.c:870
+msgid "Mar_k All Messages as Read"
+msgstr "_��� �� ������� �� ���"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:872
 msgid "Mark all messages in the folder as read"
 msgstr "��� �� ������� �� � ����� �� ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1102
+#: ../modules/mail/e-mail-shell-view-actions.c:877
 msgid "_Move Folder To..."
 msgstr "_��� ����� �..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1104
+#: ../modules/mail/e-mail-shell-view-actions.c:879
 msgid "Move the selected folder into another folder"
 msgstr "��� � �������� ����� ���� ����� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1109
+#: ../modules/mail/e-mail-shell-view-actions.c:884
 msgid "_New..."
 msgstr "_��..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1111
+#: ../modules/mail/e-mail-shell-view-actions.c:886
 msgid "Create a new folder for storing mail"
 msgstr "����� � �� ����� �� ����� ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1118
+#: ../modules/mail/e-mail-shell-view-actions.c:893
 msgid "Change the properties of this folder"
 msgstr "���� � �������� � ��� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1125
+#: ../modules/mail/e-mail-shell-view-actions.c:900
 msgid "Refresh the folder"
 msgstr "������ � �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1132
+#: ../modules/mail/e-mail-shell-view-actions.c:907
 msgid "Change the name of this folder"
 msgstr "���� � ��� � ��� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1137
-msgid "Select _All Messages"
-msgstr "������ _�� �������"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1139
-msgid "Select all visible messages"
-msgstr "������ �� ������� �������"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1144
+#: ../modules/mail/e-mail-shell-view-actions.c:912
 msgid "Select Message _Thread"
 msgstr "������ ����� _����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1146
+#: ../modules/mail/e-mail-shell-view-actions.c:914
 msgid "Select all messages in the same thread as the selected message"
 msgstr "������ �� ������� �� � ��� ���� �� � �������� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:919
+msgid "Select Message S_ubthread"
+msgstr "������ ����� _Subthread"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:921
 msgid "Select all replies to the currently selected message"
 msgstr "������ �� ������ � � �������� �������� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:926
 msgid "_Unsubscribe"
 msgstr "_����������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
+#: ../modules/mail/e-mail-shell-view-actions.c:928
 msgid "Unsubscribe from the selected folder"
 msgstr "���������� ���� � �������� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1165
-msgid "_New Label"
-msgstr "_�� �����"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1179
-msgid "Hide _Read Messages"
-msgstr "��� _��� �������"
+#: ../modules/mail/e-mail-shell-view-actions.c:933
+msgid "Empty _Trash"
+msgstr "����� _����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1181
-msgid "Temporarily hide all messages that have already been read"
-msgstr "��������� ��� �� ������� ��� ��� ������ ��� ���"
+#: ../modules/mail/e-mail-shell-view-actions.c:935
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "���������� ����� �� � ������� ������� ���� �� ������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1188
-msgid "Temporarily hide the selected messages"
-msgstr "��������� ��� � �������� �������"
+#: ../modules/mail/e-mail-shell-view-actions.c:940
+msgid "_New Label"
+msgstr "_�� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1195
-msgid "Show messages that have been temporarily hidden"
-msgstr "�� ������� ��� ��� ��� ��������� �����"
+#: ../modules/mail/e-mail-shell-view-actions.c:949
+msgid "N_one"
+msgstr "_���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:972
 msgid "Cancel the current mail operation"
 msgstr "������ � ������ ��� �������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1221
+#: ../modules/mail/e-mail-shell-view-actions.c:977
 msgid "Collapse All _Threads"
 msgstr "������ �� _�����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:979
 msgid "Collapse all message threads"
 msgstr "������ �� ����� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:984
+msgid "E_xpand All Threads"
+msgstr "_������� �� �����"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:986
 msgid "Expand all message threads"
 msgstr "������� �� ����� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1235
+#: ../modules/mail/e-mail-shell-view-actions.c:991
 msgid "_Message Filters"
 msgstr "_����� ������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:993
 msgid "Create or edit rules for filtering new mail"
 msgstr "����� � ���� ���� �� ������� �� ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:998
+msgid "Search F_olders"
+msgstr "��� _������"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
 msgid "Create or edit search folder definitions"
 msgstr "����� � ���� ��� ����� ����������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
 msgid "_Subscriptions..."
 msgstr "_������������..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "�������� � ���������� � ������ �� ����� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1265
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
+msgid "F_older"
+msgstr "_�����"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "_Label"
 msgstr "_�����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "_New Folder..."
 msgstr "_�� �����..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
-msgid "Hide _Deleted Messages"
-msgstr "��� _������� �������"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "��� ������� ������� ���� ��� �������� ��� ��� � ��� ��� ���"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Show Message _Preview"
 msgstr "�� ����� _�����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "Show message preview pane"
 msgstr "�� ����� ����� ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1346
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+msgid "Show _Deleted Messages"
+msgstr "�� _������� �������"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+msgid "Show deleted messages with a line through them"
+msgstr "�� ������� ������� ��� � ��� ��� ���"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "_Group By Threads"
 msgstr "_���� �� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1348
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Threaded message list"
 msgstr "������ ����� ����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1369
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Show message preview below the message list"
 msgstr "�� ����� ����� ���� � ����� ����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Show message preview alongside the message list"
 msgstr "�� ����� ����� ������� � ����� ����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
 msgid "All Messages"
 msgstr "�� �������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
 msgid "Important Messages"
 msgstr "�������� �������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Last 5 Days' Messages"
 msgstr "���� 5 ���' �������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1405
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Messages Not Junk"
 msgstr "������� ��� ����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1412
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "Messages with Attachments"
 msgstr "������� ��� ���������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1419
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
 msgid "No Label"
 msgstr "�� �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1426
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Read Messages"
 msgstr "��� �������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1433
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "Recent Messages"
 msgstr "������ �������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1440
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "Unread Messages"
 msgstr "����� �������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1485
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Subject or Addresses contain"
 msgstr "������� � ������� ������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1495
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "All Accounts"
 msgstr "�� ������"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1502
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Current Account"
 msgstr "������ �����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1509
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Current Folder"
 msgstr "������ �����"
 
-#: ../modules/mail/e-mail-shell-view-private.c:781
 #, c-format
+#: ../modules/mail/e-mail-shell-view-private.c:881
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d ��������, "
 msgstr[1] "%d ��������, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:792
 #, c-format
+#: ../modules/mail/e-mail-shell-view-private.c:892
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d �������"
 msgstr[1] "%d �������"
 
-#: ../modules/mail/e-mail-shell-view-private.c:798
-#: ../modules/mail/e-mail-shell-view-private.c:805
 #, c-format
+#: ../modules/mail/e-mail-shell-view-private.c:898
+#: ../modules/mail/e-mail-shell-view-private.c:905
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ����"
 msgstr[1] "%d ����"
 
-#: ../modules/mail/e-mail-shell-view-private.c:811
 #, c-format
+#: ../modules/mail/e-mail-shell-view-private.c:911
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d �����"
 msgstr[1] "%d ������"
 
-#: ../modules/mail/e-mail-shell-view-private.c:823
 #, c-format
+#, fuzzy
+#: ../modules/mail/e-mail-shell-view-private.c:917
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d unsent"
+msgstr[1] "%d unsent"
+
+#, c-format
+#: ../modules/mail/e-mail-shell-view-private.c:923
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d ����"
 msgstr[1] "%d ����"
 
-#: ../modules/mail/e-mail-shell-view-private.c:835
 #, c-format
+#: ../modules/mail/e-mail-shell-view-private.c:935
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d �����, "
 msgstr[1] "%d �����, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:838
 #, c-format
+#: ../modules/mail/e-mail-shell-view-private.c:938
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d �����"
 msgstr[1] "%d �����"
 
-#: ../modules/mail/em-composer-prefs.c:478
+#: ../modules/mail/e-mail-shell-view.c:548
+msgid "All Account Search"
+msgstr "�� ����� ���"
+
+#: ../modules/mail/e-mail-shell-view.c:685
+msgid "Account Search"
+msgstr "����� ���"
+
+#, fuzzy
+#: ../modules/mail/e-mail-shell-view.c:873
+msgid "Proxy _Logout"
+msgstr "������ _Logout"
+
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "�������"
+
+#: ../modules/mail/em-composer-prefs.c:476
 msgid "Language(s)"
 msgstr "�������(�)"
 
@@ -12495,48 +15544,51 @@ msgstr "���� �� ���"
 msgid "Once per month"
 msgstr "���� �� ����"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:224
 msgid "Add Custom Junk Header"
 msgstr "�� ������ ���� ����"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:232
 msgid "Header Name:"
 msgstr "���� ���:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Value Contains:"
 msgstr "���� ���� �������:"
 
-#: ../modules/mail/em-mailer-prefs.c:326
-#: ../widgets/table/e-table-click-to-add.c:498
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:333
 msgid "Header"
 msgstr "����"
 
-#: ../modules/mail/em-mailer-prefs.c:330
+#: ../modules/mail/em-mailer-prefs.c:337
 msgid "Contains Value"
 msgstr "������� ����"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:777
 #, c-format
+#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:801
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s ������ �� �������� � � ����� �� �������."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:786
 #, c-format
+#: ../modules/mail/em-mailer-prefs.c:738 ../modules/mail/em-mailer-prefs.c:810
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s ������ �� ��� ��������. ���� ��� ���� � ����� �� �������."
 
-#: ../modules/mail/em-mailer-prefs.c:752
-msgid "No Junk plugin available"
+#: ../modules/mail/em-mailer-prefs.c:774
+msgid "No junk plugin available"
 msgstr "�� ���� ������ ��������"
 
-#: ../modules/mail/em-mailer-prefs.c:1146
-msgid "Date header:"
-msgstr "��� ����:"
+#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
+#: ../modules/mail/em-mailer-prefs.c:1161
+msgid "_Date header:"
+msgstr "_��� ����:"
+
+#: ../modules/mail/em-mailer-prefs.c:1162
+msgid "Show _original header value"
+msgstr "�� _�������� ���� ����"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
@@ -12550,6 +15602,11 @@ msgstr "·ð�‘�ð�‘²ð�‘”ð�‘ªð�‘¯ ð�‘�ð�‘¤ð�‘³ð�‘œð�‘¦ð�‘¯ ð�‘¤ð�‘´ð�‘›ð�‘» ð�‘‘ð�‘
 msgid "Python Test Plugin"
 msgstr "·����� ���� ������"
 
+#, fuzzy
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "���� ������ �� ����� EPlugin ����."
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "�� ����� ����� ���� � ·��������."
@@ -12560,27 +15617,15 @@ msgstr "����� ����� ����"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
+"List of clues for the attachment reminder plugin to look for in a message body"
 msgstr "���� � ���� �� � �������� ������� ������ � ��� �� �� � ����� ����"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr "���� � ���� �� � �������� ������� ������ � ��� �� �� � ����� ����."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:476
-#: ../plugins/templates/templates.c:378
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "������"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
-msgid "Attachment Reminder"
-msgstr "�������� �������"
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
@@ -12588,43 +15633,52 @@ msgstr ""
 "·�������� ��� ���� ��� ������ ��� ������ ��� ��� ����� ��� ������ �� "
 "��������, ��� ����� ���� ���."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid "Message has no attachments"
 msgstr "����� ��� �� ���������"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add attachment..."
 msgstr "_�� ��������..."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "_���� �����"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "�������� �������"
+
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "������� � ��� � ����� � �� �� �������� � � ��� �����."
 
+#, fuzzy
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid "Inline Audio"
+msgstr "Inline ����"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Play audio attachments directly in mail messages."
 msgstr "��� ���� ��������� �������� �� ��� �������."
 
-#: ../plugins/backup-restore/backup-restore.c:143
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "������ ��� � � ·�������� ����� ���"
 
-#: ../plugins/backup-restore/backup-restore.c:168
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "_������ ·�������� ���� �����"
 
-#: ../plugins/backup-restore/backup-restore.c:198
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr "������ ��� � � ·�������� ����� ��� � �����"
 
-#: ../plugins/backup-restore/backup-restore.c:219
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "_������ ·�������� ���� �����"
 
-#: ../plugins/backup-restore/backup-restore.c:293
+#: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -12633,133 +15687,137 @@ msgstr ""
 "� ��� ����� ·�������� ���� �� �����. �� ��� ����� �� � ����, ��������, �����, "
 "�����, ��������. �� ���� ������ �� �� ������� ������, ��� ������ ���."
 
-#: ../plugins/backup-restore/backup-restore.c:300
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "_����� ·�������� ���� � ����� ���"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "���� ������ �� ·�������� ���� � �����:"
 
-#: ../plugins/backup-restore/backup-restore.c:310
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "��� � ��� � �����"
 
-#: ../plugins/backup-restore/backup-restore.c:318
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "����� ���� �����"
 
-#: ../plugins/backup-restore/backup-restore.c:354
-msgid "_Backup Settings..."
-msgstr "_����� ������..."
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "_Backup Evolution Settings..."
+msgstr "_����� ·�������� ������..."
 
-#: ../plugins/backup-restore/backup-restore.c:356
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "����� ·�������� ���� � ������ � �� ���� ���"
 
-#: ../plugins/backup-restore/backup-restore.c:363
+#: ../plugins/backup-restore/backup-restore.c:368
+msgid "R_estore Evolution Settings..."
+msgstr "_����� ·�������� ������..."
+
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "����� ·�������� ���� � ������ ���� �� ���� ���"
 
-#: ../plugins/backup-restore/backup.c:62
+#: ../plugins/backup-restore/backup.c:63
 msgid "Backup Evolution directory"
 msgstr "����� ·�������� ��������"
 
-#: ../plugins/backup-restore/backup.c:64
+#: ../plugins/backup-restore/backup.c:65
 msgid "Restore Evolution directory"
 msgstr "����� ·�������� ��������"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:67
 msgid "Check Evolution Backup"
 msgstr "��� ·�������� �����"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:69
 msgid "Restart Evolution"
 msgstr "������ ·��������"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:71
 msgid "With Graphical User Interface"
 msgstr "��� �������� ��� �������"
 
-#: ../plugins/backup-restore/backup.c:188
-#: ../plugins/backup-restore/backup.c:250
+#: ../plugins/backup-restore/backup.c:189
+#: ../plugins/backup-restore/backup.c:251
 msgid "Shutting down Evolution"
 msgstr "����� ��� ·��������"
 
-#: ../plugins/backup-restore/backup.c:195
+#: ../plugins/backup-restore/backup.c:196
 msgid "Backing Evolution accounts and settings"
 msgstr "����� ·�������� ������ � ������"
 
-#: ../plugins/backup-restore/backup.c:201
+#: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "����� ·�������� ���� (����, ��������, �������, �����, �����)"
 
-#: ../plugins/backup-restore/backup.c:212
+#: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
 msgstr "����� �������"
 
-#: ../plugins/backup-restore/backup.c:217
-#: ../plugins/backup-restore/backup.c:238
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:218
+#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:285
 msgid "Restarting Evolution"
 msgstr "�������� ·��������"
 
-#: ../plugins/backup-restore/backup.c:254
-msgid "Backup current Evolution data"
-msgstr "����� ������ ·�������� ����"
+#: ../plugins/backup-restore/backup.c:255
+msgid "Back up current Evolution data"
+msgstr "��� �� ������ ·�������� ����"
 
-#: ../plugins/backup-restore/backup.c:259
+#: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
 msgstr "���������� ���� ���� �����"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:267
 msgid "Loading Evolution settings"
 msgstr "����� ·�������� ������"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:274
 msgid "Removing temporary backup files"
 msgstr "������� ������� ����� ����"
 
-#: ../plugins/backup-restore/backup.c:280
+#: ../plugins/backup-restore/backup.c:281
 msgid "Ensuring local sources"
 msgstr "������� ����� �����"
 
-#: ../plugins/backup-restore/backup.c:429
 #, c-format
+#: ../plugins/backup-restore/backup.c:428
 msgid "Backing up to the folder %s"
 msgstr "����� �� � � ����� %s"
 
-#: ../plugins/backup-restore/backup.c:434
 #, c-format
+#: ../plugins/backup-restore/backup.c:433
 msgid "Restoring from the folder %s"
 msgstr "������� ���� � ����� %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "·�������� �����"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "·�������� �����"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "����� �� ·�������� ����"
 
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "���� ��� ��� ·�������� �� ����� �� �� ����."
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "������� ·�������� ����"
 
-#: ../plugins/backup-restore/backup.c:493
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "���� ��� ��� ·�������� �� ������� �� ����."
 
-#: ../plugins/backup-restore/backup.c:511
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "��� �� ��� � ��� �������� �� � ����� � ���� �� �� �����."
 
@@ -12781,6 +15839,18 @@ msgid ""
 "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "� � ��� � ���� � ����� ·�������� ���� � �������� ����� ���?"
 
+#, fuzzy
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid ""
+"Evolution backup can start only when Evolution is not running. Please make "
+"sure that you save and close all your unsaved windows before proceeding.  If "
+"you want Evolution to restart automatically after backup, please enable the "
+"toggle button."
+msgstr ""
+"·�������� ����� ��� ���� ���� ��� ·�������� �� ��� �����. ���� ��� ��� ��� � "
+"��� � ���� �� �� unsaved ������ ���� ��������.  �� � ���� ·�������� � ������ "
+"���������� ���� �����, ���� ������ � ����� �����."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
 msgstr "���������� ��������"
@@ -12797,36 +15867,101 @@ msgstr "���� ������ � ����� �
 msgid "The selected folder is not writable."
 msgstr "� �������� ����� �� ��� �������."
 
-#: ../plugins/bbdb/bbdb.c:617 ../plugins/bbdb/bbdb.c:626
+#, fuzzy
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid ""
+"This will delete all your current Evolution data and settings and restore "
+"them from your backup. Evolution restore can start only when Evolution is not "
+"running. Please make sure that you close all your unsaved windows before you "
+"proceed. If you want Evolution to restart automatically restart after "
+"restore, please enable the toggle button."
+msgstr ""
+"��� ��� ����� �� �� ������ ·�������� ���� � ������ � ����� ��� ���� �� �����. "
+"·�������� ����� ��� ���� ���� ��� ·�������� �� ��� �����. ���� ��� ��� ��� � "
+"���� �� �� unsaved ������ ���� � ������. �� � ���� ·�������� � ������ "
+"���������� ������ ���� �����, ���� ������ � ����� �����."
+
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "�������� ��������"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:641
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "����� _����� ��� ������ ��� ������ ����"
 
-#: ../plugins/bbdb/bbdb.c:647
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "������ ����� ��� �� �������� ��������"
 
-#: ../plugins/bbdb/bbdb.c:662
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "������� ������� ��������"
 
+#. Enable Gaim Checkbox
+#, fuzzy
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "_��������� ������� ���� � ������ ���� Pidgin ���� ����"
+
+#, fuzzy
+#: ../plugins/bbdb/bbdb.c:751
+msgid "Select Address book for Pidgin buddy list"
+msgstr "������ ����� ��� �� Pidgin ���� ����"
+
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "��������� ��� _���� ���� ��"
 
+#, fuzzy
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#, fuzzy
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid ""
+"Takes the gruntwork out of managing your address book.\n\nAutomatically fills "
+"your address book with names and email addresses as you reply to messages.  "
+"Also fills in IM contact information from your buddy lists."
+msgstr ""
+"���� � gruntwork �� � ������� �� ����� ���.\n\n���������� ���� �� ����� ��� "
+"��� ���� � ���� ������� �� � ����� � �������.  ���� ���� �� �� ������� "
+"��������� ���� �� ���� �����."
+
+#, c-format
+#, fuzzy
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
+msgid "Bogofilter is not available. Please install it first."
+msgstr "Bogofilter �� ��� ��������. ���� ������ �� ����."
+
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
 #, c-format
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 msgid "Error occurred while spawning %s: %s."
 msgstr "�� ���� ��� ������ %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#, c-format
+#, fuzzy
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "Bogofilter ���� ������ ��� ��� �������, �����..."
+
+#, c-format
+#, fuzzy
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr "��� �� Bogofilter ���� ������ ���������, ���������..."
+
+#, c-format
+#, fuzzy
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr "��� � Bogofilter ����, �� ���: %d."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
 msgid "Convert message text to _Unicode"
 msgstr "������ ����� ����� � _·������"
 
@@ -12834,50 +15969,196 @@ msgstr "������ ����� ����� �
 msgid "Convert mail messages to Unicode"
 msgstr "������ ��� ������� � ·������"
 
-#: ../plugins/caldav/caldav-source.c:366
-#: ../plugins/calendar-http/calendar-http.c:171
+#, fuzzy
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"������ ����� ����� � ·������ UTF-8 � ������ ����/��� ������ ����� ���� "
+"������� ������� ����."
+
+#, fuzzy
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+msgid "Bogofilter Junk Filter"
+msgstr "Bogofilter ���� �����"
+
+#, fuzzy
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter Options"
+msgstr "Bogofilter ������"
+
+#, fuzzy
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
+msgid "Filter junk messages using Bogofilter."
+msgstr "����� ���� ������� ���� Bogofilter."
+
+#: ../plugins/caldav/caldav-browse-server.c:197
+msgid "Authentication failed. Server requires correct login."
+msgstr "����������� ����. ���� ������� ������ �����."
+
+#, fuzzy
+#: ../plugins/caldav/caldav-browse-server.c:199
+msgid "Given URL cannot be found."
+msgstr "����� URL ����� �� ����."
+
+#, c-format
+#, fuzzy
+#: ../plugins/caldav/caldav-browse-server.c:203
+msgid "Server returned unexpected data.\n%d - %s"
+msgstr "���� ������ ����������� ����.\n%d - %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "���� ��"
+
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
+msgid "Failed to parse server response."
+msgstr "���� � ��� ���� �������."
+
+#: ../plugins/caldav/caldav-browse-server.c:427
+msgid "Events"
+msgstr "������"
+
+#: ../plugins/caldav/caldav-browse-server.c:449
+msgid "User's calendars"
+msgstr "���'� ��������"
+
+#, fuzzy
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
+msgid "Failed to get server URL."
+msgstr "���� � ��� ���� URL."
+
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
+msgid "Searching for user's calendars..."
+msgstr "����� �� ���'� ��������..."
+
+#: ../plugins/caldav/caldav-browse-server.c:665
+msgid "Could not find any user calendar."
+msgstr "��� ��� ���� ��� ��� �������."
+
+#, c-format
+#, fuzzy
+#: ../plugins/caldav/caldav-browse-server.c:794
+msgid "Previous attempt failed: %s"
+msgstr "������� ������ ����: %s"
+
+#, c-format
+#, fuzzy
+#: ../plugins/caldav/caldav-browse-server.c:796
+msgid "Previous attempt failed with code %d"
+msgstr "������� ������ ���� ��� ��� %d"
+
+#, c-format
+#, fuzzy
+#: ../plugins/caldav/caldav-browse-server.c:801
+msgid "Enter password for user %s on server %s"
+msgstr "���� ������ �� ��� %s �� ���� %s"
+
+#, c-format
+#, fuzzy
+#: ../plugins/caldav/caldav-browse-server.c:860
+msgid "Cannot create soup message for URL '%s'"
+msgstr "����� ����� ��� ����� �� URL '%s'"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1095
+msgid "Searching folder content..."
+msgstr "����� ����� �������..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1138
+msgid "List of available calendars:"
+msgstr "���� � �������� ��������:"
+
+#: ../plugins/caldav/caldav-browse-server.c:1175
+msgid "Supports"
+msgstr "������"
+
+#, c-format
+#, fuzzy
+#: ../plugins/caldav/caldav-browse-server.c:1254
+msgid "Failed to create thread: %s"
+msgstr "���� � ����� ����: %s"
+
+#, c-format
+#, fuzzy
+#: ../plugins/caldav/caldav-browse-server.c:1362
+msgid "Server URL '%s' is not a valid URL"
+msgstr "���� URL '%s' �� ��� � ����� URL"
+
+#, fuzzy
+#: ../plugins/caldav/caldav-browse-server.c:1368
+msgid "Browse for a CalDAV calendar"
+msgstr "���� �� � CalDAV �������"
+
+#, fuzzy
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:390
-#: ../plugins/google-account-setup/google-contacts-source.c:303
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "�� _SSL"
 
-#: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-file/calendar-file.c:296
-#: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:517
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-#: ../plugins/google-account-setup/google-source.c:742
-msgid "weeks"
-msgstr "����"
-
-#: ../plugins/calendar-file/calendar-file.c:208
+#: ../plugins/caldav/caldav-source.c:235
+msgid "Brows_e server for a calendar"
+msgstr "_���� ���� �� � �������"
+
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
+msgid "Re_fresh:"
+msgstr "_������:"
+
+#, fuzzy
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "Add CalDAV support to Evolution."
+msgstr "�� CalDAV ����� � ·��������."
+
+#, fuzzy
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV Support"
+msgstr "CalDAV �����"
+
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "_�������� ������"
 
-#: ../plugins/calendar-file/calendar-file.c:227
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "��� _���:"
 
-#: ../plugins/calendar-file/calendar-file.c:231
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "��� ������� ���"
 
-#: ../plugins/calendar-file/calendar-file.c:279
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "�� ����"
 
-#: ../plugins/calendar-file/calendar-file.c:280
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "�� ��� ����"
 
-#: ../plugins/calendar-file/calendar-file.c:281
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "�����������"
 
-#: ../plugins/calendar-file/calendar-file.c:308
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "��� ��� _����"
 
@@ -12889,10 +16170,14 @@ msgstr "ð�‘¨ð�‘› ð�‘¤ð�‘´ð�‘’ð�‘©ð�‘¤ ð�‘’ð�‘¨ð�‘¤ð�‘©ð�‘¯ð�‘›ð�‘¼ð�‘Ÿ ð�‘‘ ·ð�
 msgid "Local Calendars"
 msgstr "����� ��������"
 
-#: ../plugins/calendar-http/calendar-http.c:369
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "_������ ��������"
 
+#: ../plugins/calendar-http/calendar-http.c:194
+msgid "Userna_me:"
+msgstr "_������:"
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "Add web calendars to Evolution."
 msgstr "�� ��� �������� � ·��������."
@@ -12937,15 +16222,27 @@ msgstr "����: ��� ���"
 msgid "Weather: Thunderstorms"
 msgstr "����: �����������"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "������ � �������"
 
-#: ../plugins/calendar-weather/calendar-weather.c:597
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "���"
+
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_�����:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:605
+#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:455
+msgid "Metric (Celsius, cm, etc)"
+msgstr "������ (�������, cm, ���)"
+
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "������� (·��������, �����, ���)"
 
@@ -12957,6 +16254,23 @@ msgstr "ð�‘¨ð�‘› ð�‘¢ð�‘§ð�‘žð�‘¼ ð�‘’ð�‘¨ð�‘¤ð�‘©ð�‘¯ð�‘›ð�‘¼ð�‘Ÿ ð�‘‘ ·ð�‘§ð�
 msgid "Weather Calendars"
 msgstr "���� ��������"
 
+#: ../plugins/contacts-map/contacts-map.c:55
+#: ../plugins/contacts-map/contacts-map.c:201
+msgid "Contacts map"
+msgstr "�������� ���"
+
+#: ../plugins/contacts-map/contacts-map.c:56
+msgid "Show a map of all the contacts"
+msgstr "�� � ��� � �� � ��������"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
+msgstr "�� � ��� ���� � ������� � �������� ��� �������."
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+msgid "Map for contacts"
+msgstr "��� �� ��������"
+
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "��� ���� ·�������� �� � ������ ����"
@@ -12978,19 +16292,24 @@ msgstr "������ ��� ������"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "�� � ���� � ��� ·�������� �� ������ �-��� ������?"
 
-#: ../plugins/default-source/default-source.c:94
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "��� �� _������ ����� ���"
 
-#: ../plugins/default-source/default-source.c:138
+#, fuzzy
+#: ../plugins/default-source/default-source.c:96
+msgid "A_utocomplete with this address book"
+msgstr "_Autocomplete ��� ��� ����� ���"
+
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "��� �� _������ �������"
 
-#: ../plugins/default-source/default-source.c:139
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "��� �� _������ ���� ����"
 
-#: ../plugins/default-source/default-source.c:140
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "��� �� _������ ���� ����"
 
@@ -13016,48 +16335,56 @@ msgstr ""
 "�� ��������� � ���� � ���� ���� ��: ��� � � ������ ���� ����� �� \"=\" � � "
 "����� �������� �� \";\""
 
-#: ../plugins/email-custom-header/email-custom-header.c:329
+#: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
 msgstr "���������:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:321
 msgid "Unclassified"
 msgstr "����������"
 
-#: ../plugins/email-custom-header/email-custom-header.c:335
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgid "Protected"
 msgstr "���������"
 
-#: ../plugins/email-custom-header/email-custom-header.c:337
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "Secret"
 msgstr "������"
 
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgid "Top secret"
 msgstr "��� ������"
 
-#: ../plugins/email-custom-header/email-custom-header.c:580
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
+#. indicating the header will not be added to a mail message
+#: ../plugins/email-custom-header/email-custom-header.c:379
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "���"
+
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "_������ ����"
 
-#: ../plugins/email-custom-header/email-custom-header.c:905
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.c:896
+msgid ""
+"The format for specifying a Custom Header key value is:\nName of the Custom "
+"Header key values separated by \";\"."
+msgstr ""
+"� ����� �� ��������� � ������ ���� �� ���� ��:\n��� � � ������ ���� �� ����� "
+"�������� �� \";\"."
+
+#: ../plugins/email-custom-header/email-custom-header.c:950
 msgid "Key"
 msgstr "��"
 
-#: ../plugins/email-custom-header/email-custom-header.c:916
-#: ../plugins/templates/templates.c:384
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "�����"
 
-#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.glade.h:2
-msgid ""
-"The format for specifying a Custom Header key value is:\n"
-"Name of the Custom Header key values separated by \";\"."
-msgstr ""
-"� ����� �� ��������� � ������ ���� �� ���� ��:\n"
-"��� � � ������ ���� �� ����� �������� �� \";\"."
-
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
 msgid "Add custom headers to outgoing mail messages."
@@ -13067,7 +16394,7 @@ msgstr "�� ������ ����� � ���
 msgid "Custom Header"
 msgstr "������ ����"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr "���� ������ ����"
 
@@ -13076,7 +16403,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "���������� ���� ����� ��� �� �� ����� �� � ��� �������"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "���������� ���� ��� � �� ��� �� ������"
 
@@ -13088,12 +16415,17 @@ msgstr "ð�‘›ð�‘¦ð�‘“ð�‘·ð�‘¤ð�‘‘ ð�‘¦ð�‘’ð�‘•ð�‘‘ð�‘»ð�‘¯ð�‘©ð�‘¤ ð�‘§ð�‘›ð�‘¦ð�
 msgid "The default command that must be used as the editor."
 msgstr "� ������ ������ ��� ���� �� ��� �� � �����."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "������ � �� ��������� � ���� � �����: "
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#, fuzzy
+#: ../plugins/external-editor/external-editor.c:116
+msgid "For Emacs use \"xemacs\"\nFor VI use \"gvim -f\""
+msgstr "�� Emacs �� \"xemacs\"\n�� �� �� \"gvim -��\""
+
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "������ �� �������� �����"
 
@@ -13109,10 +16441,14 @@ msgstr "�� �� �������� �����
 msgid "Cannot create Temporary File"
 msgstr "����� ����� ������� ���"
 
+#, fuzzy
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid "Editor not launchable"
+msgstr "����� ��� launchable"
+
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
+"Evolution is unable to create a temporary file to save your mail. Retry later."
 msgstr "·�������� �� ������ � ����� � ������� ��� � ��� �� ���. ����� ����."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
@@ -13147,10 +16483,6 @@ msgstr ""
 "���� ����� ��� ����� � ������ ������� �� ������. � ����� ��� �� ��� ���� "
 "����� ���, ������ ����� ������."
 
-#: ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "���� ��"
-
 #: ../plugins/face/face.c:286
 msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
 msgstr "������ � PNG ����� (� ���� 48*48 � ��� < 720 ����)"
@@ -13167,7 +16499,7 @@ msgstr "_ð�‘¦ð�‘¯ð�‘•ð�‘»ð�‘‘ ð�‘“ð�‘±ð�‘• ð�‘�ð�‘¦ð�‘’ð�‘—ð�‘¼ ð�‘šð�‘² ð�‘›ð�‘
 msgid "Load new _Face picture"
 msgstr "��� �� _��� �����"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "������ _���"
 
@@ -13196,50 +16528,77 @@ msgid "The file cannot be read"
 msgstr "� ��� ����� �� ���"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgid ""
+"The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "� ��� � �������� ��� ��� ��� ��� � ����� .·�·�·� ����. ��: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
-msgid "<b>Server</b>"
-msgstr "<b>����</b>"
+#, fuzzy
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+msgid "Server"
+msgstr "����"
 
-#: ../plugins/google-account-setup/google-source.c:517
 #, c-format
+#: ../plugins/google-account-setup/google-source.c:437
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "���� ������ �� ��� %s � ����� ���� � ��������� ��������."
 
-#: ../plugins/google-account-setup/google-source.c:623
-#: ../plugins/mail-to-task/mail-to-task.c:668
-#: ../plugins/mail-to-task/mail-to-task.c:886
+#, c-format
+#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:548
+msgid "Cannot read data from Google server.\n%s"
+msgstr "����� ��� ���� ���� Google ����.\n%s"
+
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
 msgid "Unknown error."
 msgstr "���� ��."
 
-#: ../plugins/google-account-setup/google-source.c:793
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:634
+msgid "Cal_endar:"
+msgstr "_�������:"
+
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
 msgstr "������ _����"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:451
+#, fuzzy
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "Add Google Calendars to Evolution."
+msgstr "�� Google �������� � ·��������."
+
+#, fuzzy
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google Calendars"
+msgstr "Google ��������"
+
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "�������"
 
-#: ../plugins/groupwise-features/gw-ui.c:110
+#: ../plugins/groupwise-features/gw-ui.c:112
 msgid "New _Shared Folder..."
 msgstr "�� _��� �����..."
 
-#: ../plugins/groupwise-features/gw-ui.c:117
+#: ../plugins/groupwise-features/gw-ui.c:119
 msgid "_Proxy Login..."
 msgstr "_������ �����..."
 
-#: ../plugins/groupwise-features/gw-ui.c:168
+#: ../plugins/groupwise-features/gw-ui.c:170
 msgid "Junk Mail Settings..."
 msgstr "���� ��� ������..."
 
-#: ../plugins/groupwise-features/gw-ui.c:175
+#: ../plugins/groupwise-features/gw-ui.c:177
 msgid "Track Message Status..."
 msgstr "���� ����� ������..."
 
-#: ../plugins/groupwise-features/gw-ui.c:181
+#: ../plugins/groupwise-features/gw-ui.c:183
 msgid "Retract Mail"
 msgstr "������� ���"
 
@@ -13247,100 +16606,104 @@ msgstr "������� ���"
 msgid "Accept Tentatively"
 msgstr "������ ����������"
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:351
+#, fuzzy
+#: ../plugins/groupwise-features/gw-ui.c:352
+msgid "Rese_nd Meeting..."
+msgstr "_Resend �����..."
+
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
 msgid "Create folder"
 msgstr "����� �����"
 
-#: ../plugins/groupwise-features/install-shared.c:225
 #, c-format
+#: ../plugins/groupwise-features/install-shared.c:219
 msgid ""
-"The user '%s' has shared a folder with you\n"
-"\n"
-"Message from '%s'\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Click 'Apply' to install the shared folder\n"
-"\n"
+"The user '%s' has shared a folder with you\n\nMessage from "
+"'%s'\n\n\n%s\n\n\nClick 'Apply' to install the shared folder\n\n"
 msgstr ""
-"� ��� '%s' ��� ��� � ����� ��� �\n"
-"\n"
-"����� ���� '%s'\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"���� '����' � ������ � ��� �����\n"
-"\n"
-
-#: ../plugins/groupwise-features/install-shared.c:237
+"� ��� '%s' ��� ��� � ����� ��� �\n\n����� ���� '%s'\n\n\n%s\n\n\n���� '����' "
+"� ������ � ��� �����\n\n"
+
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "������ � ��� �����"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "��� ����� ����������"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "���� ������"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
+#: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "���� ��� ������"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b>���� ����:</b>"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#: ../plugins/groupwise-features/junk-settings.ui.h:1
 msgid "Email:"
 msgstr "����:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../plugins/groupwise-features/junk-settings.ui.h:2
+msgid "Junk List:"
+msgstr "���� ����:"
+
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "_Disable"
 msgstr "_�������"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:6
+#: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "_������"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#: ../plugins/groupwise-features/junk-settings.ui.h:7
 msgid "_Junk List"
 msgstr "_���� ����"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
+#: ../plugins/groupwise-features/junk-settings.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "_�����"
 
-#: ../plugins/groupwise-features/mail-retract.c:82
+#: ../plugins/groupwise-features/mail-retract.c:81
 msgid "Message Retract"
 msgstr "����� �������"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this?"
+"Retracting a message may remove it from the recipient's mailbox. Are you sure "
+"you want to do this?"
 msgstr ""
-"��������� � ����� �� ����� �� ���� � ���������'� �������. � � ��� � ���� � "
-"�� ���?"
+"��������� � ����� �� ����� �� ���� � ���������'� �������. � � ��� � ���� � �� "
+"���?"
 
-#: ../plugins/groupwise-features/mail-retract.c:106
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "����� ��������� ����������"
 
-#: ../plugins/groupwise-features/mail-send-options.c:200
+#: ../plugins/groupwise-features/mail-send-options.c:202
 msgid "Insert Send options"
 msgstr "����� ���� ������"
 
+#, fuzzy
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
+msgid "Add Send Options to GroupWise messages"
+msgstr "�� ���� ������ � GroupWise �������"
+
+#, fuzzy
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
+msgid "Fine-tune your GroupWise accounts."
+msgstr "���-��� �� GroupWise ������."
+
+#, fuzzy
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
+msgid "GroupWise Features"
+msgstr "GroupWise �����"
+
 #: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "����� ������� ����"
@@ -13349,6 +16712,11 @@ msgstr "����� ������� ����"
 msgid "The server did not allow the selected message to be retracted."
 msgstr "� ���� ��� ��� ��� � �������� ����� � �� ���������."
 
+#, fuzzy
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "����� &quot;{0}&quot; ������ �������. ���� ��� �� ����� ���."
+
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
 msgid "Account Already Exists"
 msgstr "����� ������ �������"
@@ -13359,6 +16727,21 @@ msgstr "ð�‘©ð�‘’ð�‘¬ð�‘¯ð�‘‘ ð�‘·ð�‘¤ð�‘®ð�‘§ð�‘›ð�‘¦ ð�‘§ð�‘’ð�‘Ÿð�‘¦ð�‘•ð�‘‘ð�
 msgid "Invalid user"
 msgstr "������� ���"
 
+#, fuzzy
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"������ ����� �� &quot;{0}&quot; ��� �����������. ���� ��� �� ���� ����� � ��� "
+"����."
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#, fuzzy
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "������ ����� ����� �� ����� � ��� &quot;{0}&quot;"
+
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
@@ -13374,10 +16757,25 @@ msgstr "� ��� ������ ����� ��
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "� ��� � ������� � ����� ��� ��� � ��� ������ ����."
 
+#, fuzzy
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "� ����� �� ��� ����� ��� � �������� ��� &quot;{0}&quot;"
+
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
 msgid "You have to specify a user name which you want to add to the list"
 msgstr "� ��� � ������� � ��� ��� ��� � ���� � �� � � ����"
 
+#, fuzzy
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+msgid "Do you want to resend the meeting?"
+msgstr "�� � ���� � resend � �����?"
+
+#, fuzzy
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+msgid "Do you want to resend the recurring meeting?"
+msgstr "�� � ���� � resend � ������ �����?"
+
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
 msgid "Do you want to retract the original item?"
 msgstr "�� � ���� � ������� � ������� ����?"
@@ -13399,8 +16797,8 @@ msgid ""
 "This will create a new meeting with the existing meeting details. The "
 "recurrence rule needs to be re-entered."
 msgstr ""
-"��� ��� ����� � �� ����� ��� � �������� ����� ������. � ������� ��� ���� � "
-"�� ��-�����."
+"��� ��� ����� � �� ����� ��� � �������� ����� ������. � ������� ��� ���� � �� "
+"��-�����."
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
@@ -13412,123 +16810,130 @@ msgstr "��� � ��� � ������ ��?"
 msgid "Would you like to decline it?"
 msgstr "��� � ��� � ������ ��?"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>����:</b>"
+#: ../plugins/groupwise-features/properties.ui.h:1
+msgid "C_ustomize notification message"
+msgstr "_�������� ����������� �����"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:512
-msgid "Message"
-msgstr "�����"
+#: ../plugins/groupwise-features/properties.ui.h:2
+msgid "Con_tacts..."
+msgstr "_��������..."
 
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "��� ����� �����������"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "� ������������ ��� ����� � ������ �����������.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.ui.h:9
+msgid "Users:"
+msgstr "����:"
+
+#: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_��� ���"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.ui.h:14
 msgid "_Shared With..."
 msgstr "_��� ���..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
 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
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "����� ����"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
 msgid "Add/Edit"
 msgstr "��/����"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
+msgid "Con_tacts"
+msgstr "_��������"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
 msgid "Modify _folders/options/rules/"
 msgstr "������ _������/������/����/"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
 msgid "Read items marked _private"
 msgstr "��� ����� ���� _������"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
 msgid "Reminder Notes"
 msgstr "������� ����"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
 msgstr "�������� � �� _�����"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
 msgstr "�������� � �� _������������"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
 msgstr "_���"
 
-#. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
 msgid "permission to read|_Read"
 msgstr "_���"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
+#: ../plugins/groupwise-features/proxy-listing.ui.h:1
 msgid "Proxy"
 msgstr "������"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>����� ���</b>"
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "����� ���"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "������ �����"
 
-#: ../plugins/groupwise-features/proxy-login.c:209
-#: ../plugins/groupwise-features/proxy-login.c:252
-#: ../plugins/groupwise-features/proxy.c:487
-#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s���� ������ �� %s (��� %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:688
+#: ../plugins/groupwise-features/proxy.c:690
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "� ������ ��� ��� �� �������� ���� ��� � ����� �� �����."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:694
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "� ������ ��� ��� �� �������� ���� ��� � ����� �� �������."
 
-#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:713
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+msgctxt "GW"
+msgid "Proxy"
+msgstr "������"
+
+#: ../plugins/groupwise-features/proxy.c:929
+#: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "�� ���"
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "������� ���� ������"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
-#: ../plugins/groupwise-features/share-folder.c:748
+#: ../plugins/groupwise-features/share-folder-common.c:315
+#: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "����"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:316
 msgid "Enter the users and set permissions"
 msgstr "���� � ���� � ��� ��������"
 
@@ -13536,32 +16941,28 @@ msgstr "ð�‘§ð�‘¯ð�‘‘ð�‘¼ ð�‘ž ð�‘¿ð�‘Ÿð�‘¼ð�‘Ÿ ð�‘¯ ð�‘•ð�‘§ð�‘‘ ð�‘�ð�‘»ð�‘¥ð�‘
 msgid "Sharing"
 msgstr "����"
 
-#: ../plugins/groupwise-features/share-folder.c:531
+#: ../plugins/groupwise-features/share-folder.c:529
 msgid "Custom Notification"
 msgstr "������ �����������"
 
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../plugins/groupwise-features/share-folder.c:741
 msgid "Add   "
 msgstr "��   "
 
-#: ../plugins/groupwise-features/share-folder.c:759
-msgid "Modify"
-msgstr "������"
-
-#: ../plugins/groupwise-features/status-track.c:124
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "����� ������"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:138
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "�������:"
 
-#: ../plugins/groupwise-features/status-track.c:152
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "����:"
 
-#: ../plugins/groupwise-features/status-track.c:167
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "������� ���:"
 
@@ -13597,60 +16998,53 @@ msgstr "���������: "
 msgid "Undelivered: "
 msgstr "���������: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "�� ·���� ����� � ·��������."
+#, fuzzy
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+msgid "Inline Image"
+msgstr "Inline ����"
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "·���� �����"
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr "�� ���� ��������� �������� �� ��� �������."
 
-#: ../plugins/imap-features/imap-headers.c:331
+#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "������ �����"
 
-#: ../plugins/imap-features/imap-headers.c:344
+#: ../plugins/imap-features/imap-headers.c:345
+#: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP �����"
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
-msgid "<b>Custom Headers</b>"
-msgstr "<b>������ �����</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers</b>"
-msgstr "<b>IMAP �����</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:3
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid "Basic and _Mailing List Headers (Default)"
 msgstr "����� � _����� ���� ����� (������)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
+#: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
+"standard headers. \nYou can ignore this if you choose \"All Headers\"."
 msgstr ""
-"��� � ������ ����� ��� � ��� � ��� �� ������ � � ���� ������� �����. \n"
-"� ��� ���� ��� �� � ��� \"�� �����\"."
+"��� � ������ ����� ��� � ��� � ��� �� ������ � � ���� ������� �����. \n� ��� "
+"���� ��� �� � ��� \"�� �����\"."
 
-#: ../plugins/imap-features/imap-headers.glade.h:6
+#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
-"Select your IMAP Header Preferences. \n"
-"The more headers you have the more time it will take to download."
+"Select your IMAP Header Preferences. \nThe more headers you have the more "
+"time it will take to download."
 msgstr ""
-"������ �� IMAP ���� ����������. \n"
-"� �� ����� � ��� � �� ��� �� ��� ��� � ������."
+"������ �� IMAP ���� ����������. \n� �� ����� � ��� � �� ��� �� ��� ��� � "
+"������."
 
-#: ../plugins/imap-features/imap-headers.glade.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
-"_Basic Headers - (Fastest) \n"
-"Use this if you do not have filters based on mailing lists"
+"_Basic Headers - (Fastest) \nUse this if you do not have filters based on "
+"mailing lists"
 msgstr ""
-"_����� ����� - (�������) \n"
-"�� ��� �� � �� ��� ��� ������ ���� �� ����� �����"
+"_����� ����� - (�������) \n�� ��� �� � �� ��� ��� ������ ���� �� ����� �����"
 
-#: ../plugins/imap-features/imap-headers.glade.h:10
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "_Fetch All Headers"
 msgstr "_��� �� �����"
 
@@ -13662,173 +17056,201 @@ msgstr "���-��� �� IMAP ������."
 msgid "IMAP Features"
 msgstr "IMAP �����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:492
-#: ../plugins/itip-formatter/itip-formatter.c:617
 #, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:482
 msgid "Failed to load the calendar '%s'"
 msgstr "���� � ��� � ������� '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:637
 #, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:648
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "�� ��������� �� � ������� '%s' ��������� ��� ��� �����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:673
 #, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:684
 msgid "Found the appointment in the calendar '%s'"
 msgstr "���� � ��������� �� � ������� '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find any calendars"
 msgstr "������ � ���� ��� ��������"
 
-#: ../plugins/itip-formatter/itip-formatter.c:779
+#: ../plugins/itip-formatter/itip-formatter.c:790
 msgid "Unable to find this meeting in any calendar"
 msgstr "������ � ���� ��� ����� �� ��� �������"
 
-#: ../plugins/itip-formatter/itip-formatter.c:783
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this task in any task list"
 msgstr "������ � ���� ��� ���� �� ��� ���� ����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this memo in any memo list"
 msgstr "������ � ���� ��� ���� �� ��� ���� ����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:858
+#: ../plugins/itip-formatter/itip-formatter.c:872
 msgid "Opening the calendar. Please wait.."
 msgstr "������ � �������. ���� ���.."
 
-#: ../plugins/itip-formatter/itip-formatter.c:861
+#: ../plugins/itip-formatter/itip-formatter.c:875
 msgid "Searching for an existing version of this appointment"
 msgstr "����� �� �� �������� ����� � ��� ���������"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1043
+#: ../plugins/itip-formatter/itip-formatter.c:1056
 msgid "Unable to parse item"
 msgstr "������ � ��� ����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
 #, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:1143
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "������ � ���� ���� � ������� '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1142
 #, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:1155
 msgid "Sent to calendar '%s' as accepted"
 msgstr "���� � ������� '%s' �� ��������"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1146
 #, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 msgid "Sent to calendar '%s' as tentative"
 msgstr "���� � ������� '%s' �� ��������"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1151
 #, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:1164
 msgid "Sent to calendar '%s' as declined"
 msgstr "���� � ������� '%s' �� �������"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
 #, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:1169
 msgid "Sent to calendar '%s' as canceled"
 msgstr "���� � ������� '%s' �� �������"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
 #, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:1263
 msgid "Organizer has removed the delegate %s "
 msgstr "������� ��� ������ � ������� %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
+#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1270
+msgid "Sent a cancelation notice to the delegate"
+msgstr "���� � cancelation ����� � � �������"
+
+#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1272
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "��� ��� ���� � cancelation ����� � � �������"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1383
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "������ ������ ��� ��� �� ������� ����� � ������ �� �������"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1396
 #, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 msgid "Unable to update attendee. %s"
 msgstr "������ � ����� ������. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1400
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Attendee status updated"
 msgstr "������ ������ �������"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1426
+#: ../plugins/itip-formatter/itip-formatter.c:1442
 msgid "Meeting information sent"
 msgstr "����� ��������� ����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1429
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Task information sent"
 msgstr "���� ��������� ����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1432
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Memo information sent"
 msgstr "���� ��������� ����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1441
+#: ../plugins/itip-formatter/itip-formatter.c:1457
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "������ � ���� ����� ���������, � ����� ��� ��� ������"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1444
+#: ../plugins/itip-formatter/itip-formatter.c:1460
 msgid "Unable to send task information, the task does not exist"
 msgstr "������ � ���� ���� ���������, � ���� ��� ��� ������"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "������ � ���� ���� ���������, � ���� ��� ��� ������"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1515
-#: ../plugins/itip-formatter/itip-formatter.c:1526
+#. Translators: This is a default filename for a calendar.
+#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1528
+msgid "calendar.ics"
+msgstr "�������.ics"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1533
+msgid "Save Calendar"
+msgstr "��� �������"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1597
 msgid "The calendar attached is not valid"
 msgstr "� ������� ����� �� ��� �����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1567
-#: ../plugins/itip-formatter/itip-formatter.c:1595
-#: ../plugins/itip-formatter/itip-formatter.c:1687
+#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
+msgstr ""
+"� ����� ����� � ������ � �������, ��� � ������� �� ��� � ����� iCalendar."
+
+#: ../plugins/itip-formatter/itip-formatter.c:1638
+#: ../plugins/itip-formatter/itip-formatter.c:1666
+#: ../plugins/itip-formatter/itip-formatter.c:1772
 msgid "The item in the calendar is not valid"
 msgstr "� ���� �� � ������� �� ��� �����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1568
-#: ../plugins/itip-formatter/itip-formatter.c:1596
-#: ../plugins/itip-formatter/itip-formatter.c:1688
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 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:1607
+#: ../plugins/itip-formatter/itip-formatter.c:1680
 msgid "The calendar attached contains multiple items"
 msgstr "� ������� ����� ������� �������� �����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1608
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "� ������ �� � ��� �����, � ��� ��� �� ���� � � ������� �������"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../plugins/itip-formatter/itip-formatter.c:2451
 msgid "This meeting recurs"
 msgstr "��� ����� �����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2356
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "This task recurs"
 msgstr "��� ���� �����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "This memo recurs"
 msgstr "��� ���� �����"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2589
+#: ../plugins/itip-formatter/itip-formatter.c:2691
 msgid "_Delete message after acting"
 msgstr "_����� ����� ���� �����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2599
-#: ../plugins/itip-formatter/itip-formatter.c:2632
+#: ../plugins/itip-formatter/itip-formatter.c:2701
+#: ../plugins/itip-formatter/itip-formatter.c:2734
 msgid "Conflict Search"
 msgstr "�������� ���"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2614
+#: ../plugins/itip-formatter/itip-formatter.c:2716
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "������ � �������� � ��� �� ����� ���������"
 
@@ -13875,8 +17297,8 @@ msgid "Tomorrow %l:%M:%S %p"
 msgstr "������ %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
+#: ../plugins/itip-formatter/itip-view.c:256
 msgid "%A"
 msgstr "%A"
 
@@ -13964,330 +17386,381 @@ msgstr "%A, %B %e, %Y %l:%M %p"
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%s %p"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "���� ������� �� ����� � <b>%s</b>"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
+msgid "Please respond on behalf of %s"
+msgstr "���� ������� �� ����� � %s"
 
-#: ../plugins/itip-formatter/itip-view.c:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "������ �� ����� � <b>%s</b>"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
+msgid "Received on behalf of %s"
+msgstr "������ �� ����� � %s"
 
-#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> ��� %s ��� ������� � ������ ����� ���������:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:374
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s ��� %s ��� ������� � ������ ����� ���������:"
 
-#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> ��� ������� � ������ ����� ���������:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:376
+msgid "%s has published the following meeting information:"
+msgstr "%s ��� ������� � ������ ����� ���������:"
 
-#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> ��� ��������� � ������ ����� � �:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:381
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s ��� ��������� � ������ ����� � �:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> ��� %s �������� �� ������� �� � ������ �����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:384
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s ��� %s �������� �� ������� �� � ������ �����:"
 
-#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> �������� �� ������� �� � ������ �����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:386
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s �������� �� ������� �� � ������ �����:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> ��� %s ����� � �� � �� �������� �����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:392
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s ��� %s ����� � �� � �� �������� �����:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> ����� � �� � �� �������� �����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:394
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s ����� � �� � �� �������� �����:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:398
 msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr "<b>%s</b> ��� %s ����� � ����� � ������ ��������� �� � ������ �����:"
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "%s ��� %s ����� � ����� � ������ ��������� �� � ������ �����:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> ����� � ����� � ������ ��������� �� � ������ �����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:400
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s ����� � ����� � ������ ��������� �� � ������ �����:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> ��� %s ��� ���� ��� � ������ ����� �������:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:404
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s ��� %s ��� ���� ��� � ������ ����� �������:"
 
-#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> ��� ���� ��� � ������ ����� �������:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:406
+msgid "%s has sent back the following meeting response:"
+msgstr "%s ��� ���� ��� � ������ ����� �������:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> ��� %s ��� ������� � ������ �����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:410
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s ��� %s ��� ������� � ������ �����:"
 
-#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> ��� ������� � ������ �����."
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:412
+msgid "%s has canceled the following meeting."
+msgstr "%s ��� ������� � ������ �����."
 
-#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> ��� %s ��� ������� � ������ ����� ������."
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:416
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s ��� %s ��� ������� � ������ ����� ������."
 
-#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> ��� ������� � ������ ����� ������."
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:418
+msgid "%s has proposed the following meeting changes."
+msgstr "%s ��� ������� � ������ ����� ������."
 
-#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> ��� %s ��� ������� � ������ ����� ������:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:422
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s ��� %s ��� ������� � ������ ����� ������:"
 
-#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> ��� ������� � ������ ����� ������."
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:424
+msgid "%s has declined the following meeting changes."
+msgstr "%s ��� ������� � ������ ����� ������."
 
-#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
-msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> ��� %s ��� ������� � ������ ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:462
+msgid "%s through %s has published the following task:"
+msgstr "%s ��� %s ��� ������� � ������ ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> ��� ������� � ������ ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:464
+msgid "%s has published the following task:"
+msgstr "%s ��� ������� � ������ ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> �������� � �������� � %s � � ������ ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:469
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s �������� � �������� � %s � � ������ ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> ��� %s ��� ������ � � ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:472
+msgid "%s through %s has assigned you a task:"
+msgstr "%s ��� %s ��� ������ � � ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> ��� ������ � � ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:474
+msgid "%s has assigned you a task:"
+msgstr "%s ��� ������ � � ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> ��� %s ����� � �� � �� �������� ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:480
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s ��� %s ����� � �� � �� �������� ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> ����� � �� � �� �������� ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:482
+msgid "%s wishes to add to an existing task:"
+msgstr "%s ����� � �� � �� �������� ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:486
 msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> ��� %s ����� � ����� � ������ ��������� �� � ������ ������ ����:"
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr "%s ��� %s ����� � ����� � ������ ��������� �� � ������ ������ ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:488
 msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr "<b>%s</b> ����� � ����� � ������ ��������� �� � ������ ������ ����:"
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr "%s ����� � ����� � ������ ��������� �� � ������ ������ ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> ��� %s ��� ���� ��� � ������ ������ ���� �������:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:492
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%s ��� %s ��� ���� ��� � ������ ������ ���� �������:"
 
-#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> ��� ���� ��� � ������ ������ ���� �������:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:494
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s ��� ���� ��� � ������ ������ ���� �������:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> ��� %s ��� ������� � ������ ������ ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:498
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s ��� %s ��� ������� � ������ ������ ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> ��� ������� � ������ ������ ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:500
+msgid "%s has canceled the following assigned task:"
+msgstr "%s ��� ������� � ������ ������ ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ��� %s ��� ������� � ������ ���� �������� ������:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:504
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%s ��� %s ��� ������� � ������ ���� �������� ������:"
 
-#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ��� ������� � ������ ���� �������� ������:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:506
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s ��� ������� � ������ ���� �������� ������:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> ��� %s ��� ������� � ������ ������ ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:510
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s ��� %s ��� ������� � ������ ������ ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> ��� ������� � ������ ������ ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:512
+msgid "%s has declined the following assigned task:"
+msgstr "%s ��� ������� � ������ ������ ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> ��� %s ��� ������� � ������ ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:549
+msgid "%s through %s has published the following memo:"
+msgstr "%s ��� %s ��� ������� � ������ ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> ��� ������� � ������ ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:551
+msgid "%s has published the following memo:"
+msgstr "%s ��� ������� � ������ ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> ��� %s ����� � �� � �� �������� ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:556
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s ��� %s ����� � �� � �� �������� ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> ����� � �� � �� �������� ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:558
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s ����� � �� � �� �������� ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> ��� %s ��� ������� � ������ ��� ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:562
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s ��� %s ��� ������� � ������ ��� ����:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> ��� ������� � ������ ��� ����:"
+#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:564
+msgid "%s has canceled the following shared memo:"
+msgstr "%s ��� ������� � ������ ��� ����:"
+
+#: ../plugins/itip-formatter/itip-view.c:688
+msgid "All day:"
+msgstr "�� ��:"
+
+#: ../plugins/itip-formatter/itip-view.c:698
+msgid "Start day:"
+msgstr "���� ��:"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
+msgid "Start time:"
+msgstr "���� ���:"
+
+#: ../plugins/itip-formatter/itip-view.c:710
+msgid "End day:"
+msgstr "��� ��:"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
+msgid "End time:"
+msgstr "��� ���:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:822
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "_���� �������"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "_������"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:855
 #: ../plugins/itip-formatter/itip-view.c:862
-msgid "_Accept"
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+msgid "A_ccept"
 msgstr "_������"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "_������ ��"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "_�������� ��"
 
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "_��������"
 
-#: ../plugins/itip-formatter/itip-view.c:834
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:855
+msgid "A_ccept all"
 msgstr "_������ ��"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "_���� ���������"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "_����� ������ ������"
 
-#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "_�����"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1032
-msgid "Start time:"
-msgstr "���� ���:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1043
-msgid "End time:"
-msgstr "��� ���:"
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1063
-#: ../plugins/itip-formatter/itip-view.c:1117
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "�������:"
 
-#: ../plugins/itip-formatter/itip-view.c:1102
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "���� _����� � �����"
 
-#: ../plugins/itip-formatter/itip-view.c:1132
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "���� _������ � �������"
 
-#: ../plugins/itip-formatter/itip-view.c:1141
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "_���� � �� ���������"
 
-#: ../plugins/itip-formatter/itip-view.c:1150
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "�� ��� �� _���"
 
-#: ../plugins/itip-formatter/itip-view.c:1153
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "_������ �� �������"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1159
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "_������� �������"
 
-#: ../plugins/itip-formatter/itip-view.c:1911
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "_�����:"
 
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "_�����:"
 
@@ -14295,6 +17768,20 @@ msgstr "_�����:"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "������ \"text/calendar\" MIME ���� �� ��� �������."
 
+#, fuzzy
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Itip Formatter"
+msgstr "Itip ������"
+
+#, fuzzy
+#: ../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;?"
+
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr "��� ����� ��� ��� ���������"
@@ -14330,6 +17817,11 @@ msgid ""
 "arrive."
 msgstr "�� \"���\", ��� ���, ������ ��� ��� ���� ��� ��� �� ������� ���."
 
+#, fuzzy
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Notify new messages for Inbox only."
+msgstr "������ �� ������� �� Inbox ����."
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play sound when new messages arrive."
 msgstr "��� ���� ��� �� ������� ���."
@@ -14370,83 +17862,89 @@ msgstr "ð�‘¢ð�‘§ð�‘žð�‘¼ ð�‘–ð�‘´ ð�‘¥ð�‘§ð�‘•ð�‘¦ð�‘¡ ð�‘´ð�‘�ð�‘¼ ð�‘ž ð�‘²ð�‘
 msgid "Whether the icon should blink or not."
 msgstr "���� � ���� ��� ����� � ���."
 
-#: ../plugins/mail-notification/mail-notification.c:341
+#, fuzzy
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr "���� � ������ �� ������� �� Inbox ����� ����."
+
+#: ../plugins/mail-notification/mail-notification.c:346
 msgid "Evolution's Mail Notification"
 msgstr "·��������'� ��� �����������"
 
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Mail Notification Properties"
 msgstr "��� ����������� ��������"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:492
 #, c-format
-msgid ""
-"You have received %d new message\n"
-"in %s."
-msgid_plural ""
-"You have received %d new messages\n"
-"in %s."
-msgstr[0] ""
-"� ��� ������ %d �� �����\n"
-"�� %s."
-msgstr[1] ""
-"� ��� ������ %d �� �������\n"
-"�� %s."
+#: ../plugins/mail-notification/mail-notification.c:499
+msgid "You have received %d new message\nin %s."
+msgid_plural "You have received %d new messages\nin %s."
+msgstr[0] "� ��� ������ %d �� �����\n�� %s."
+msgstr[1] "� ��� ������ %d �� �������\n�� %s."
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:503
 #, c-format
+#: ../plugins/mail-notification/mail-notification.c:510
 msgid "From: %s"
 msgstr "����: %s"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:515
 #, c-format
+#: ../plugins/mail-notification/mail-notification.c:522
 msgid "Subject: %s"
 msgstr "�������: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:524
 #, c-format
+#: ../plugins/mail-notification/mail-notification.c:531
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "� ��� ������ %d �� �����."
 msgstr[1] "� ��� ������ %d �� �������."
 
-#: ../plugins/mail-notification/mail-notification.c:541
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:554
 msgid "New email"
 msgstr "�� ����"
 
-#: ../plugins/mail-notification/mail-notification.c:599
+#: ../plugins/mail-notification/mail-notification.c:608
 msgid "Show icon in _notification area"
 msgstr "�� ���� �� _����������� ���"
 
-#: ../plugins/mail-notification/mail-notification.c:637
+#: ../plugins/mail-notification/mail-notification.c:636
+msgid "B_link icon in notification area"
+msgstr "_����� ���� �� ����������� ���"
+
+#: ../plugins/mail-notification/mail-notification.c:646
 msgid "Popup _message together with the icon"
 msgstr "����� _����� ������ ��� � ����"
 
-#: ../plugins/mail-notification/mail-notification.c:816
+#: ../plugins/mail-notification/mail-notification.c:831
 msgid "_Play sound when new messages arrive"
 msgstr "_��� ���� ��� �� ������� ���"
 
-#: ../plugins/mail-notification/mail-notification.c:845
+#: ../plugins/mail-notification/mail-notification.c:860
 msgid "_Beep"
 msgstr "_���"
 
-#: ../plugins/mail-notification/mail-notification.c:858
+#: ../plugins/mail-notification/mail-notification.c:873
 msgid "Use sound _theme"
 msgstr "�� ���� _���"
 
-#: ../plugins/mail-notification/mail-notification.c:877
+#: ../plugins/mail-notification/mail-notification.c:892
 msgid "Play _file:"
 msgstr "��� _���:"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:903
 msgid "Select sound file"
 msgstr "������ ���� ���"
 
-#: ../plugins/mail-notification/mail-notification.c:955
+#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:961
+msgid "Notify new messages for _Inbox only"
+msgstr "������ �� ������� �� _Inbox ����"
+
+#: ../plugins/mail-notification/mail-notification.c:970
 msgid "Generate a _D-Bus message"
 msgstr "������ � _D-Bus �����"
 
@@ -14459,170 +17957,174 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "������� � ��� �� ��� ������� ���."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:184
 #, c-format
+#: ../plugins/mail-to-task/mail-to-task.c:158
 msgid "Created from a mail by %s"
 msgstr "������� ���� � ��� �� %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:439
 #, c-format
+#: ../plugins/mail-to-task/mail-to-task.c:489
 msgid ""
-"Selected calendar contains event '%s' already. Would you like to edit the "
-"old event?"
+"Selected calendar contains event '%s' already. Would you like to edit the old "
+"event?"
 msgstr ""
 "�������� ������� ������� ����� '%s' ������. ��� � ��� � ���� � ��� �����?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:442
 #, c-format
+#: ../plugins/mail-to-task/mail-to-task.c:492
 msgid ""
-"Selected task list contains task '%s' already. Would you like to edit the "
-"old task?"
+"Selected task list contains task '%s' already. Would you like to edit the old "
+"task?"
 msgstr ""
 "�������� ���� ���� ������� ���� '%s' ������. ��� � ��� � ���� � ��� ����?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:445
 #, c-format
+#: ../plugins/mail-to-task/mail-to-task.c:495
 msgid ""
-"Selected memo list contains memo '%s' already. Would you like to edit the "
-"old memo?"
+"Selected memo list contains memo '%s' already. Would you like to edit the old "
+"memo?"
 msgstr ""
 "�������� ���� ���� ������� ���� '%s' ������. ��� � ��� � ���� � ��� ����?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:462
+#: ../plugins/mail-to-task/mail-to-task.c:512
 msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+"Selected calendar contains some events for the given mails already. Would you "
+"like to create new events anyway?"
 msgstr ""
-"�������� ������� ������� ��� ������ �� � ����� ���� ������. ��� � ��� � "
-"����� �� ������ �����?"
+"�������� ������� ������� ��� ������ �� � ����� ���� ������. ��� � ��� � ����� "
+"�� ������ �����?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:465
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+"Selected task list contains some tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
 msgstr ""
 "�������� ���� ���� ������� ��� ����� �� � ����� ���� ������. ��� � ��� � "
 "����� �� ����� �����?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:468
+#: ../plugins/mail-to-task/mail-to-task.c:518
 msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
+"Selected memo list contains some memos for the given mails already. Would you "
+"like to create new memos anyway?"
 msgstr ""
 "�������� ���� ���� ������� ��� ����� �� � ����� ���� ������. ��� � ��� � "
 "����� �� ����� �����?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:486
+#: ../plugins/mail-to-task/mail-to-task.c:536
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
 msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
+"Selected calendar contains events for the given mails already. Would you like "
+"to create new events anyway?"
 msgstr[0] ""
-"�������� ������� ������� �� ����� �� � ����� ��� ������. ��� � ��� � ����� "
-"�� ����� �����?"
+"�������� ������� ������� �� ����� �� � ����� ��� ������. ��� � ��� � ����� �� "
+"����� �����?"
 msgstr[1] ""
-"�������� ������� ������� ������ �� � ����� ��� ������. ��� � ��� � ����� "
-"�� ����� �����?"
+"�������� ������� ������� ������ �� � ����� ��� ������. ��� � ��� � ����� �� "
+"����� �����?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:492
+#: ../plugins/mail-to-task/mail-to-task.c:542
 msgid ""
-"Selected task list contains a task for the given mail already. Would you "
-"like to create new task anyway?"
+"Selected task list contains a task for the given mail already. Would you like "
+"to create new task anyway?"
 msgid_plural ""
-"Selected task list contains tasks for the given mails already. Would you "
-"like to create new tasks anyway?"
+"Selected task list contains tasks for the given mails already. Would you like "
+"to create new tasks anyway?"
 msgstr[0] ""
-"�������� ���� ���� ������� � ���� �� � ����� ��� ������. ��� � ��� � ����� "
-"�� ���� �����?"
+"�������� ���� ���� ������� � ���� �� � ����� ��� ������. ��� � ��� � ����� �� "
+"���� �����?"
 msgstr[1] ""
-"�������� ���� ���� ������� ����� �� � ����� ��� ������. ��� � ��� � ����� "
-"�� ���� �����?"
+"�������� ���� ���� ������� ����� �� � ����� ��� ������. ��� � ��� � ����� �� "
+"���� �����?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:498
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
-"Selected memo list contains a memo for the given mail already. Would you "
-"like to create new memo anyway?"
+"Selected memo list contains a memo for the given mail already. Would you like "
+"to create new memo anyway?"
 msgid_plural ""
-"Selected memo list contains memos for the given mails already. Would you "
-"like to create new memos anyway?"
+"Selected memo list contains memos for the given mails already. Would you like "
+"to create new memos anyway?"
 msgstr[0] ""
-"�������� ���� ���� ������� � ���� �� � ����� ��� ������. ��� � ��� � ����� "
-"�� ���� �����?"
+"�������� ���� ���� ������� � ���� �� � ����� ��� ������. ��� � ��� � ����� �� "
+"���� �����?"
 msgstr[1] ""
 "�������� ���� ���� ������� � ���� �� � ����� ���� ������. ��� � ��� � ����� "
 "�� ���� �����?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:557
+#: ../plugins/mail-to-task/mail-to-task.c:607
 msgid "[No Summary]"
 msgstr "[�� �����]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:568
+#: ../plugins/mail-to-task/mail-to-task.c:618
 msgid "Invalid object returned from a server"
 msgstr "������� ������ ������ ���� � ����"
 
-#: ../plugins/mail-to-task/mail-to-task.c:639
 #, c-format
+#: ../plugins/mail-to-task/mail-to-task.c:689
 msgid "An error occurred during processing: %s"
 msgstr "�� �� ���� ������ ��������: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:668
 #, c-format
+#: ../plugins/mail-to-task/mail-to-task.c:718
 msgid "Cannot open calendar. %s"
 msgstr "����� ���� �������. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:675
+#: ../plugins/mail-to-task/mail-to-task.c:725
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr ""
 "�������� ��� �� ��� ����, ��� ����� ����� ����� ��. ������ ��� ���, ����."
 
-#: ../plugins/mail-to-task/mail-to-task.c:678
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr ""
 "�������� ��� �� ��� ����, ��� ����� ����� ���� ��. ������ ��� ���, ����."
 
-#: ../plugins/mail-to-task/mail-to-task.c:681
+#: ../plugins/mail-to-task/mail-to-task.c:731
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr ""
 "�������� ��� �� ��� ����, ��� ����� ����� ���� ��. ������ ��� ���, ����."
 
-#: ../plugins/mail-to-task/mail-to-task.c:886
 #, c-format
+#: ../plugins/mail-to-task/mail-to-task.c:934
 msgid "Cannot get source list. %s"
 msgstr "����� ��� ��� ����. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1005
+#: ../plugins/mail-to-task/mail-to-task.c:1053
 msgid "Create an _Event"
 msgstr "����� �� _�����"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1007
+#: ../plugins/mail-to-task/mail-to-task.c:1055
 msgid "Create a new event from the selected message"
 msgstr "����� � �� ����� ���� � �������� �����"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1014
+#: ../plugins/mail-to-task/mail-to-task.c:1060
+msgid "Create a Mem_o"
+msgstr "����� � _����"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new memo from the selected message"
 msgstr "����� � �� ���� ���� � �������� �����"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1019
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a _Task"
 msgstr "����� � _����"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1021
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new task from the selected message"
 msgstr "����� � �� ���� ���� � �������� �����"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1029
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a _Meeting"
 msgstr "����� � _�����"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1031
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a new meeting from the selected message"
 msgstr "����� � �� ����� ���� � �������� �����"
 
@@ -14630,55 +18132,55 @@ msgstr "����� � �� ����� ����
 msgid "Convert a mail message to a task."
 msgstr "������ � ��� ����� � � ����."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:276
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Archive"
 msgstr "��� ���� _����"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:278
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get an archive of the list this message belongs to"
 msgstr "��� �� ���� � � ���� ��� ����� ������ �"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get List _Usage Information"
 msgstr "��� ���� _���� ���������"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "��� ��������� ���� � ���� � � ���� ��� ����� ������ �"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Contact List _Owner"
 msgstr "������� ���� _���"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "������� � ��� � � ����� ���� ��� ����� ������ �"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Post Message to List"
 msgstr "_���� ����� � ����"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "���� � ����� � � ����� ���� ��� ����� ������ �"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Subscribe to List"
 msgstr "_�������� � ����"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "�������� � � ����� ���� ��� ����� ������ �"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "_Unsubscribe from List"
 msgstr "_���������� ���� ����"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "���������� ���� � ����� ���� ��� ����� ������ �"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
 msgid "Mailing _List"
 msgstr "����� _����"
 
@@ -14697,15 +18199,12 @@ 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."
+"message automatically, or see and change it first.\n\nYou should receive an "
+"answer from the mailing list shortly after the message has been sent."
 msgstr ""
 "�� �-��� ����� ��� �� ���� � � URL \"{0}\". � ��� ��� ���� � ����� "
-"����������, � �� � ���� �� ����.\n"
-"\n"
-"� ��� ����� �� ���� ���� � ����� ���� ����� ���� � ����� ��� ��� ����."
+"����������, � �� � ���� �� ����.\n\n� ��� ����� �� ���� ���� � ����� ���� "
+"����� ���� � ����� ��� ��� ����."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Malformed header"
@@ -14733,30 +18232,21 @@ msgstr "ð�‘•ð�‘§ð�‘¯ð�‘› ð�‘§-ð�‘¥ð�‘±ð�‘¤ ð�‘¥ð�‘§ð�‘•ð�‘¦ð�‘¡ ð�‘‘ ð�‘¥ð�‘±ð�‘
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
-"\n"
-"Header: {0}"
+"The action could not be performed. The header for this action did not contain "
+"any action that could be processed.\n\nHeader: {0}"
 msgstr ""
 "� ����� ��� ��� �� ������. � ���� �� ��� ����� ��� ��� ������ ��� ����� ��� "
-"��� �� �������.\n"
-"\n"
-"����: {0}"
+"��� �� �������.\n\n����: {0}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
 msgid ""
-"The {0} header of this message is malformed and could not be processed.\n"
-"\n"
-"Header: {1}"
-msgstr ""
-"� {0} ���� � ��� ����� �� ������� � ��� ��� �� �������.\n"
-"\n"
-"����: {1}"
+"The {0} header of this message is malformed and could not be "
+"processed.\n\nHeader: {1}"
+msgstr "� {0} ���� � ��� ����� �� ������� � ��� ��� �� �������.\n\n����: {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
-"This message does not contain the header information required for this "
-"action."
+"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
@@ -14767,10 +18257,33 @@ msgstr "_���� �����"
 msgid "_Send message"
 msgstr "_���� �����"
 
-#: ../plugins/mark-all-read/mark-all-read.c:186
+#, fuzzy
+#: ../plugins/mark-all-read/mark-all-read.c:41
+msgid "Also mark messages in subfolders?"
+msgstr "���� ��� ������� �� subfolders?"
+
+#, fuzzy
+#: ../plugins/mark-all-read/mark-all-read.c:43
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"�� � ���� � ��� ������� �� ��� �� � ������ ����� ����, � �� � ������ ����� �� "
+"��� �� �� subfolders?"
+
+#, fuzzy
+#: ../plugins/mark-all-read/mark-all-read.c:175
+msgid "In Current Folder and _Subfolders"
+msgstr "�� ������ ����� � _Subfolders"
+
+#: ../plugins/mark-all-read/mark-all-read.c:189
 msgid "In Current _Folder Only"
 msgstr "�� ������ _����� ����"
 
+#: ../plugins/mark-all-read/mark-all-read.c:412
+msgid "Mark Me_ssages as Read"
+msgstr "��� _������� �� ���"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "��� �� ���"
@@ -14792,10 +18305,6 @@ msgstr "������ ������"
 msgid "Author(s)"
 msgstr "���(�)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:146
-msgid "Configuration"
-msgstr "������������"
-
 #: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr "���: ��� ������ ��� ��� ��� ����� ����� ������"
@@ -14830,36 +18339,41 @@ msgstr "����� ���� �����"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "�� ��� ������� �� ���� �����, ���� �� �� ������ HTML �������."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "�� HTML �� �������"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "��� ·�������� ��� � ���� ��� � ��."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "�� ���� ����� �� �������"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr ""
 "�� ���� ����� ���, �� �������, ������ ��� ·�������� ��� � ���� ��� � ��."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "���� ��� �� ���� �����"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "����� �� ���� ����� ��� � ��� ��������� ���� ��� ����, �� ���������."
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#, fuzzy
+#: ../plugins/prefer-plain/prefer-plain.c:247
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr "�� _������� HTML ���� �� ���������"
+
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "HTML _���"
 
@@ -14871,30 +18385,56 @@ msgstr "·�������� �������"
 msgid "Profile data events in Evolution (for developers only)."
 msgstr "������ ���� ������ �� ·�������� (�� ��������� ����)."
 
-#: ../plugins/pst-import/pst-importer.c:299
+#, fuzzy
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "����� ����� ������� ���� PST ���"
+
+#, fuzzy
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr "����� PST �����"
+
+#, fuzzy
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "����� ������� ������ (.pst)"
+
+#: ../plugins/pst-import/pst-importer.c:296
 msgid "_Mail"
 msgstr "_���"
 
+#: ../plugins/pst-import/pst-importer.c:308
+msgid "Destination folder:"
+msgstr "���������� �����:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "_Address Book"
 msgstr "_����� ���"
 
+#. Appointments
+#: ../plugins/pst-import/pst-importer.c:321
+msgid "A_ppointments"
+msgstr "_����������"
+
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:327 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_�����"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:333
 msgid "_Journal entries"
 msgstr "_����� ������"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "Importing Outlook data"
 msgstr "������� ����� ����"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../plugins/publish-calendar/publish-calendar.c:146
+#: ../plugins/publish-calendar/publish-calendar.c:153
 msgid "Calendar Publishing"
 msgstr "������� ��������"
 
@@ -14906,185 +18446,312 @@ msgstr "��������"
 msgid "Publish calendars to the web."
 msgstr "������ �������� � � ���."
 
-#: ../plugins/publish-calendar/publish-calendar.c:94
-#: ../plugins/publish-calendar/publish-calendar.c:336
 #, c-format
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
 msgid "Could not open %s:"
 msgstr "��� ��� ���� %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:96
 #, c-format
+#: ../plugins/publish-calendar/publish-calendar.c:210
 msgid "Could not open %s: Unknown error"
 msgstr "��� ��� ���� %s: ���� ��"
 
-#: ../plugins/publish-calendar/publish-calendar.c:116
 #, c-format
+#: ../plugins/publish-calendar/publish-calendar.c:230
 msgid "There was an error while publishing to %s:"
 msgstr "�� ��� �� �� ��� �������� � %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:118
 #, c-format
+#: ../plugins/publish-calendar/publish-calendar.c:232
 msgid "Publishing to %s finished successfully"
 msgstr "�������� � %s ������ ����������"
 
-#: ../plugins/publish-calendar/publish-calendar.c:163
 #, c-format
+#: ../plugins/publish-calendar/publish-calendar.c:276
 msgid "Mount of %s failed:"
 msgstr "���� � %s ����:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:629
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "_������"
+
+#: ../plugins/publish-calendar/publish-calendar.c:739
 msgid "Are you sure you want to remove this location?"
 msgstr "� � ��� � ���� � ����� ��� �������?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:943
+#. To Translators: This is shown to a user when creation of a new thread,
+#. where the publishing should be done, fails. Basically, this shouldn't
+#. ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1051
 msgid "Could not create publish thread."
 msgstr "��� ��� ����� ������ ����."
 
-#: ../plugins/publish-calendar/publish-calendar.c:950
+#: ../plugins/publish-calendar/publish-calendar.c:1059
 msgid "_Publish Calendar Information"
 msgstr "_������ ������� ���������"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:2
-msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">�������</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Custom Location"
+msgstr "������ �������"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">�����</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr "����"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
-msgstr ""
-"����\n"
-"�����\n"
-"������� (��� ������ ����)"
+#, fuzzy
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (��� �����)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Manual (via Actions menu)"
+msgstr "������� (��� ������ ����)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+msgid "P_ort:"
+msgstr "_���:"
+
+#, fuzzy
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Public FTP"
+msgstr "������ FTP"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
 msgstr "�������� �������"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
 msgstr "�������� _���������:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#, fuzzy
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr "������ FTP (SSH)"
+
+#, fuzzy
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr "������ WebDAV (HTTPS)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
 msgstr "����� _���:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+msgid "Sources"
+msgstr "�����"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "��� _�������:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#, fuzzy
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (·�·�·�·�)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Weekly"
+msgstr "�����"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Windows share"
+msgstr "������ ��"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "_���:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
 msgstr "_������:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "_������ ��:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
 msgstr "_������� ������"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "_������:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
-msgid ""
-"days\n"
-"weeks\n"
-"months"
-msgstr ""
-"���\n"
-"����\n"
-"�����"
+#, fuzzy
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "iCal"
 
+#, c-format
 #: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
-#, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "��� ��� ������ �������: ������� ������ �� ����� �������"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "�� �������"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "���� �������"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
+#, fuzzy
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
+msgid "SpamAssassin not found, code: %d"
+msgstr "SpamAssassin ��� ����, ���: %d"
+
+#, c-format
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
 msgid "Failed to create pipe: %s"
 msgstr "���� � ����� ���: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 msgid "Error after fork: %s"
 msgstr "�� ���� ���: %s"
 
+#, c-format
+#, fuzzy
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "SpamAssassin ���� ������ ��� ��� �������, �����..."
+
+#, c-format
+#, fuzzy
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
+msgstr "��� �� SpamAssassin ���� ������ ���������, ���������..."
+
+#, c-format
+#, fuzzy
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr "��� � SpamAssassin ����, �� ���: %d"
+
+#, c-format
+#, fuzzy
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
+msgid "SpamAssassin is not available. Please install it first."
+msgstr "SpamAssassin �� ��� ��������. ���� ������ �� ����."
+
+#, fuzzy
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr "��� ��� ��� SpamAssassin �� ��������, ��� ����"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
+msgid "I_nclude remote tests"
+msgstr "_������ ����� �����"
+
+#, fuzzy
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+msgid "Filter junk messages using SpamAssassin."
+msgstr "����� ���� ������� ���� SpamAssassin."
+
+#, fuzzy
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+msgid "SpamAssassin Junk Filter"
+msgstr "SpamAssassin ���� �����"
+
+#, fuzzy
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin ������"
+
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:159
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:357
+#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "UID"
+msgstr "UID"
+
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Description List"
 msgstr "���������� ����"
 
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Categories List"
 msgstr "��������� ����"
 
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Comment List"
 msgstr "������� ����"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Contact List"
 msgstr "������� ����"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Start"
 msgstr "����"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "End"
 msgstr "���"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "������ ���"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Attendees List"
 msgstr "������� ����"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Modified"
 msgstr "�������"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:530
+msgid "A_dvanced options for the CSV format"
+msgstr "_������� ������ �� � CSV �����"
+
+#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:537
+msgid "Prepend a _header"
+msgstr "Prepend � _����"
+
+#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:546
+msgid "_Value delimiter:"
+msgstr "_���� delimiter:"
+
+#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:553
+msgid "_Record delimiter:"
+msgstr "_����� delimiter:"
+
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "_Encapsulate values with:"
 msgstr "_���������� ����� ���:"
 
+#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:582
+msgid "Comma separated value format (.csv)"
+msgstr "���� �������� ���� ����� (.csv)"
+
+#, fuzzy
+#: ../plugins/save-calendar/ical-format.c:162
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar ����� (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "��� ��������"
@@ -15093,23 +18760,38 @@ msgstr "��� ��������"
 msgid "Save a calendar or task list to disk."
 msgstr "��� � ������� � ���� ���� � ����."
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#.
+#. * 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
+#. *
+#, fuzzy
+#: ../plugins/save-calendar/rdf-format.c:147
+msgid "%FT%T"
+msgstr "%FT%T"
+
+#, fuzzy
+#: ../plugins/save-calendar/rdf-format.c:369
+msgid "RDF format (.rdf)"
+msgstr "RDF ����� (.rdf)"
+
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "_�����:"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "������ ���������� ���"
 
-#: ../plugins/save-calendar/save-calendar.c:323
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "��� � �������� ������� � ����"
 
-#: ../plugins/save-calendar/save-calendar.c:358
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "��� � �������� ���� ���� � ����"
 
-#: ../plugins/save-calendar/save-calendar.c:393
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "��� � �������� ���� ���� � ����"
 
@@ -15121,46 +18803,44 @@ msgstr "ð�‘œð�‘²ð�‘›ð�‘Ÿ ð�‘¿ ð�‘”ð�‘®ð�‘µ ð�‘¿ð�‘¼ ð�‘¦ð�‘¯ð�‘¦ð�‘–ð�‘©ð�‘¤ ð�‘
 msgid "Setup Assistant"
 msgstr "����� ��������"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:117
 msgid "Evolution Setup Assistant"
 msgstr "·�������� ����� ��������"
 
-#: ../plugins/startup-wizard/startup-wizard.c:92
+#: ../plugins/startup-wizard/startup-wizard.c:122
 msgid "Welcome"
 msgstr "������"
 
-#: ../plugins/startup-wizard/startup-wizard.c:97
+#: ../plugins/startup-wizard/startup-wizard.c:125
 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. "
+"Welcome to Evolution. The next few screens will allow Evolution to connect to "
+"your email accounts, and to import files from other applications. \n\nPlease "
+"click the \"Forward\" button to continue. "
 msgstr ""
 "������ � ·��������. � ����� �� ������ ��� ��� ·�������� � ������ � �� ���� "
-"������, � � ����� ���� ���� ��� ����������. \n"
-"\n"
-"���� ���� � \"�����\" ����� � �������. "
+"������, � � ����� ���� ���� ��� ����������. \n\n���� ���� � \"�����\" ����� � "
+"�������. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
-#: ../widgets/misc/e-import-assistant.c:370
+#: ../plugins/startup-wizard/startup-wizard.c:160
+#: ../widgets/misc/e-import-assistant.c:385
 msgid "Please select the information that you would like to import:"
 msgstr "���� ������ � ��������� ��� � ��� ��� � �����:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
-#: ../widgets/misc/e-import-assistant.c:462
 #, c-format
+#: ../plugins/startup-wizard/startup-wizard.c:175
+#: ../widgets/misc/e-import-assistant.c:542
 msgid "From %s:"
 msgstr "���� %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:167
+#: ../plugins/startup-wizard/startup-wizard.c:192
 msgid "Importing files"
 msgstr "������� ����"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:258
 msgid "Importing data."
 msgstr "������� ����."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:264
 msgid "Please wait"
 msgstr "���� ���"
 
@@ -15176,6 +18856,11 @@ msgstr "������� ������"
 msgid "Thread messages by subject"
 msgstr "���� ������� �� �������"
 
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: ../plugins/subject-thread/subject-thread.c:63
+msgid "F_all back to threading messages by subject"
+msgstr "_��� ��� � ������ ������� �� �������"
+
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -15187,37 +18872,88 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "������ ���� ������� ������"
 
-#: ../plugins/templates/templates.c:582
+#: ../plugins/templates/templates.c:615
 msgid "No Title"
 msgstr "�� �����"
 
-#: ../plugins/templates/templates.c:653
+#: ../plugins/templates/templates.c:686
 msgid "Save as _Template"
 msgstr "��� �� _�������"
 
-#: ../plugins/templates/templates.c:655
+#: ../plugins/templates/templates.c:688
 msgid "Save as Template"
 msgstr "��� �� �������"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#, fuzzy
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "����� TNEF (winmail.���) ��������� ���� ��������� �����."
+
+#, fuzzy
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Decoder"
+msgstr "TNEF ������"
+
+#, fuzzy
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+msgid "Inline vCards"
+msgstr "Inline vCards"
+
+#, fuzzy
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "�� vCards �������� �� ��� �������."
+
+#, fuzzy
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
+msgid "Show Full vCard"
+msgstr "�� ��� vCard"
+
+#, fuzzy
+#: ../plugins/vcard-inline/vcard-inline.c:167
+msgid "Show Compact vCard"
+msgstr "�� ������� vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:228
 msgid "There is one other contact."
 msgstr "�� �� ��� ��� �������."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
 #, c-format
+#: ../plugins/vcard-inline/vcard-inline.c:237
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "�� �� %d ��� �������."
 msgstr[1] "�� �� %d ��� ��������."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:258
 msgid "Save in Address Book"
 msgstr "��� �� ����� ���"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
+#, fuzzy
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "Add WebDAV contacts to Evolution."
+msgstr "�� WebDAV �������� � ·��������."
+
+#, fuzzy
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV ��������"
+
+#, fuzzy
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "URL:"
 
+#, fuzzy
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr "_���� IfMatch (����� �� ����� < 2.2.8)"
+
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
 msgstr "��������� ������ ���� ���������"
@@ -15255,91 +18991,139 @@ msgid "Default window width"
 msgstr "������ ����� ����"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Enable express mode"
+msgstr "������ ������� ���"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
-"������� � ������ ������ ��� ������� HTTP/������ HTTP ��� � ·�������."
+msgstr "������� � ������ ������ ��� ������� HTTP/������ HTTP ��� � ·�������."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr "���� ��� ������� � ��� ��������� ��� �������."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
 msgstr "HTTP ������ ���� ���"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
 msgstr "HTTP ������ ������"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "HTTP proxy port"
 msgstr "HTTP ������ ���"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "HTTP proxy username"
 msgstr "HTTP ������ ������"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID � ����� � � ��������� � �� ��� �� ������ �� ����-��."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the "
+"\"/apps/evolution/shell/network_config/authentication_user\" GConf key, and "
+"the password is retrieved from either gnome-keyring or the "
+"~/.gnome2_private/Evolution password file."
+msgstr ""
+"�� ���, ��� ��������� � � ������ ���� ������ �����������. � ������ �� ������� "
+"���� � \"/���/·��������/���/_networkconfig/_authenticationuser\" GConf ��, � "
+"� ������ �� ������� ���� ��� ���-����� � � ~/.gnome2_������/·�������� ������ "
+"���."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
 msgstr "������ �������� ��"
 
+#, fuzzy
 #: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Initial file chooser folder"
+msgstr "������ ��� chooser �����"
+
+#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "������ ����� �� GtkFileChooser �������."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
 msgstr "������ �� �� �������� �� ������. \"0\" �� ���� ��, \"1\" �� ���� ��."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "���� �������� ������������ �����"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "���� � ���� �� � ������ � �� ���������� � ���� �� ����� ����"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
 msgstr "���-������ �����"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "������ � ��� �� ����������� ��� ���� HTTP ��������."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Proxy configuration mode"
 msgstr "������ ������������ ���"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
 msgstr "·���� ������ ���� ���"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
 msgstr "·���� ������ ���"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
 msgstr "������ HTTP ������ ���� ���"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
 msgstr "������ HTTP ������ ���"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig "
+"url\" respectively."
+msgstr ""
+"������ � ������ ������������ ���. ������� ����� � 0, 1, 2, � 3 ����������� "
+"\"�� ������ ������\", \"�� ������\", \"�� ������� ������ ������������\" � "
+"\"�� ������ ������������ �������� �� � autoconfig URL\" �����������."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
 msgstr "������ �� �������"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Skip development warning dialog"
 msgstr "���� ����������� ����� ������"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:316
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:305
 msgid "Start in offline mode"
 msgstr "���� �� ����� ���"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "Statusbar is visible"
+msgstr "Statusbar �� �������"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -15347,662 +19131,637 @@ msgstr ""
 "� ������������ ����� � ·��������, ��� ����/����/������������ ����� (�� "
 "�������� \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
 msgstr "� ������ X �������� �� � ��� �����."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default Y coordinate for the main window."
 msgstr "� ������ Y �������� �� � ��� �����."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
 msgstr "� ������ ��� �� � ��� �����, �� �������."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The default width for the main window, in pixels."
 msgstr "� ������ ���� �� � ��� �����, �� �������."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The default width for the sidebar, in pixels."
 msgstr "� ������ ���� �� � ������, �� �������."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
+"The last upgraded configuration version of Evolution, with "
+"major/minor/configuration level (for example \"2.6.0\")."
 msgstr ""
 "� ���� �������� ������������ ����� � ·��������, ��� ����/����/������������ "
 "����� (�� �������� \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
 msgstr "� ����� ��� � ������ HTTP ���."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The machine name to proxy secure HTTP through."
 msgstr "� ����� ��� � ������ ������ HTTP ���."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "The machine name to proxy socks through."
 msgstr "� ����� ��� � ������ ·���� ���."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
+"The port on the machine defined by "
+"\"/apps/evolution/shell/network_config/http_host\" that you proxy through."
 msgstr ""
 "� ��� �� � ����� ������ �� \"/apps/evolution/shell/network_config/http_host\" "
 "��� � ������ ���."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
+"The port on the machine defined by "
+"\"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
 msgstr ""
-"� ��� �� � ����� ������ �� \"/apps/evolution/shell/network_config/secure_host\" "
-"��� � ������ ���."
+"� ��� �� � ����� ������ �� "
+"\"/apps/evolution/shell/network_config/secure_host\" ��� � ������ ���."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
+"The port on the machine defined by "
+"\"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
 msgstr ""
-"� ��� �� � ����� ������ �� \"/apps/evolution/shell/network_config/socks_host\" "
-"��� � ������ ���."
+"� ��� �� � ����� ������ �� "
+"\"/apps/evolution/shell/network_config/socks_host\" ��� � ������ ���."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by "
+"the GNOME toolbar setting."
 msgstr ""
-"� ���� � � ����� ������. ��� �� \"text\", \"icons\", \"both\", \"toolbar\". �� "
-"\"toolbar\" �� ���, � ���� � � ������ �� �������� �� � ·���� ����� �����."
+"� ���� � � ����� ������. ��� �� \"text\", \"icons\", \"both\", \"toolbar\". "
+"�� \"toolbar\" �� ���, � ���� � � ������ �� �������� �� � ·���� ����� �����."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+"��� �� ������� � ���� � ����� ��� � �������� � ��������, ���� ��� ��� � "
+"������ (�� �� �� �����). � ����� ��� �� hostnames, ������ (���� �� ������ "
+"�������� ��� *.��.���), ·�·� ���� ������� (��� IPv4 � IPv6) � ������ ������� "
+"��� � netmask (������ ��� 192.168.0.0/24)."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
 msgstr "����� �� �������"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "URL that provides proxy configuration values."
 msgstr "URL ��� ������� ������ ������������ �����."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Use HTTP proxy"
 msgstr "�� HTTP ������"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "��� ��� � ��� �� ����������� ��� ���� HTTP ��������."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Whether Evolution will start up in offline mode instead of online mode."
+#: ../shell/apps_evolution_shell.schemas.in.h:56
+msgid ""
+"Whether Evolution will start up in offline mode instead of online mode."
 msgstr "���� ·�������� ��� ���� �� �� ����� ��� ������ � ����� ���."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
 msgstr "���� � ��� � ����� ��� �� ���������."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the sidebar should be visible."
 msgstr "���� � ������ ��� �� �������."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Whether the status bar should be visible."
 msgstr "���� � ������ �� ��� �� �������."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the toolbar should be visible."
 msgstr "���� � ����� ��� �� �������."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "���� � ����� ������ �� ����������� ������ � ·�������� �� �����."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:60
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
 msgstr "���� � ����� ������ ��� �� �������."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:61
+#: ../shell/apps_evolution_shell.schemas.in.h:63
 msgid "Window button style"
 msgstr "����� ����� ����"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:62
+#: ../shell/apps_evolution_shell.schemas.in.h:64
 msgid "Window buttons are visible"
 msgstr "����� ������ � �������"
 
-#. Scope Combo Widgets
-#. Translators: This is part of the quick search interface.
-#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:939
-msgid "i_n"
-msgstr "�_�"
-
-#: ../shell/e-shell-content.c:1362
-msgid "Advanced Search"
-msgstr "������� ���"
-
-#: ../shell/e-shell-content.c:1419 ../shell/e-shell-content.c:1420
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
 msgid "Searches"
 msgstr "�����"
 
-#: ../shell/e-shell-content.c:1465
+#: ../shell/e-shell-content.c:545
 msgid "Save Search"
 msgstr "��� ���"
 
-#: ../shell/e-shell-switcher.c:446
-msgid "Toolbar Style"
-msgstr "����� ����"
-
-#: ../shell/e-shell-switcher.c:447
-msgid "The switcher's toolbar style"
-msgstr "� �����'� ����� ����"
-
-#: ../shell/e-shell-switcher.c:463
-msgid "Toolbar Visible"
-msgstr "����� �������"
-
-#: ../shell/e-shell-switcher.c:464
-msgid "Whether the switcher is visible"
-msgstr "���� � ����� �� �������"
-
-#: ../shell/e-shell-view.c:485
-msgid "Switcher Action"
-msgstr "����� �����"
-
-#: ../shell/e-shell-view.c:486
-msgid "The switcher action for this shell view"
-msgstr "� ����� ����� �� ��� ��� ��"
-
-#: ../shell/e-shell-view.c:501
-msgid "Page Number"
-msgstr "��� �����"
+#. Translators: The "Show:" label precedes a combo box that
+#. * allows the user to filter the current view.  Examples of
+#. * items that appear in the combo box are "Unread Messages",
+#. * "Important Messages", or "Active Appointments".
+#: ../shell/e-shell-searchbar.c:918
+msgid "Sho_w:"
+msgstr "_��:"
 
-#: ../shell/e-shell-view.c:502
-msgid "The notebook page number of the shell view"
-msgstr "� ������ ��� ����� � � ��� ��"
-
-#: ../shell/e-shell-view.c:520
-msgid "The title of the shell view"
-msgstr "� ����� � � ��� ��"
-
-#: ../shell/e-shell-view.c:550
-msgid "Shell Content Widget"
-msgstr "��� ������� �����"
-
-#: ../shell/e-shell-view.c:551
-msgid "The content widget appears in a shell window's right pane"
-msgstr "� ������� ����� ���� �� � ��� �����'� ��� ���"
-
-#: ../shell/e-shell-view.c:567
-msgid "Shell Sidebar Widget"
-msgstr "��� ������ �����"
-
-#: ../shell/e-shell-view.c:568
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "� ������ ����� ���� �� � ��� �����'� ���� ���"
-
-#: ../shell/e-shell-view.c:583
-msgid "Shell Taskbar Widget"
-msgstr "��� ������ �����"
-
-#: ../shell/e-shell-view.c:584
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "� ������ ����� ���� �� � ����� � � ��� �����"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:949
+msgid "Sear_ch:"
+msgstr "_���:"
 
-#: ../shell/e-shell-view.c:599
-msgid "Shell Window"
-msgstr "��� �����"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:1010
+msgid "i_n"
+msgstr "�_�"
 
-#: ../shell/e-shell-view.c:600
-msgid "The window to which the shell view belongs"
-msgstr "� ����� � ��� � ��� �� ������"
+#: ../shell/e-shell-utils.c:253
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-view.c:615
-msgid "Current View ID"
-msgstr "������ �� ID"
+#: ../shell/e-shell-utils.c:255
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-view.c:616
-msgid "The current GAL view ID"
-msgstr "� ������ GAL �� ID"
+#: ../shell/e-shell-utils.c:276
+msgid "All Files (*)"
+msgstr "�� ���� (*)"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:643
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr "·����� ·�����"
 
-#: ../shell/e-shell-window-actions.c:654
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "·�������� ������"
 
-#: ../shell/e-shell-window-actions.c:1280
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "·��� ·���� �� ��� �������."
 
-#: ../shell/e-shell-window-actions.c:1282
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "·��� ·���� ��� ��� �� ���."
 
-#: ../shell/e-shell-window-actions.c:1384
+#: ../shell/e-shell-window-actions.c:1347
 msgid "GNOME Pilot is not installed."
 msgstr "·���� ����� �� ��� �������."
 
-#: ../shell/e-shell-window-actions.c:1386
+#: ../shell/e-shell-window-actions.c:1349
 msgid "GNOME Pilot could not be run."
 msgstr "·���� ����� ��� ��� �� ���."
 
-#: ../shell/e-shell-window-actions.c:1480
+#: ../shell/e-shell-window-actions.c:1443
 msgid "Show information about Evolution"
 msgstr "�� ��������� ���� ·��������"
 
-#: ../shell/e-shell-window-actions.c:1485
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "_���� �����"
 
-#: ../shell/e-shell-window-actions.c:1492
+#: ../shell/e-shell-window-actions.c:1455
 msgid "_Contents"
 msgstr "_��������"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1457
 msgid "Open the Evolution User Guide"
 msgstr "���� � ·�������� ��� ���"
 
-#: ../shell/e-shell-window-actions.c:1506
+#: ../shell/e-shell-window-actions.c:1483
+msgid "Evolution _FAQ"
+msgstr "·�������� _FAQ"
+
+#, fuzzy
+#: ../shell/e-shell-window-actions.c:1485
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "���� � ���������� ���� �������� webpage"
+
+#: ../shell/e-shell-window-actions.c:1490
 msgid "_Forget Passwords"
 msgstr "_����� �������"
 
-#: ../shell/e-shell-window-actions.c:1508
+#: ../shell/e-shell-window-actions.c:1492
 msgid "Forget all remembered passwords"
 msgstr "����� �� �������� �������"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1497
+msgid "I_mport..."
+msgstr "_�����..."
+
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Import data from other programs"
 msgstr "����� ���� ���� ��� ��������"
 
-#: ../shell/e-shell-window-actions.c:1520
+#: ../shell/e-shell-window-actions.c:1504
 msgid "New _Window"
 msgstr "�� _�����"
 
-#: ../shell/e-shell-window-actions.c:1522
+#: ../shell/e-shell-window-actions.c:1506
 msgid "Create a new window displaying this view"
 msgstr "����� � �� ����� �������� ��� ��"
 
-#: ../shell/e-shell-window-actions.c:1529
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Configure Evolution"
 msgstr "�������� ·��������"
 
-#: ../shell/e-shell-window-actions.c:1534
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "_���� �������"
 
-#: ../shell/e-shell-window-actions.c:1536
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Show Evolution's shortcut keys"
 msgstr "�� ·��������'� ������ ���"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "����� � �������"
 
-#: ../shell/e-shell-window-actions.c:1548
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "_������� ���..."
 
-#: ../shell/e-shell-window-actions.c:1550
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr "��������� � �� ������� ���"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Clear the current search parameters"
 msgstr "��� � ������ ��� ��������"
 
-#: ../shell/e-shell-window-actions.c:1562
+#: ../shell/e-shell-window-actions.c:1553
 msgid "_Edit Saved Searches..."
 msgstr "_���� ���� �����..."
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Manage your saved searches"
 msgstr "����� �� ���� �����"
 
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "���� �� � ���� � ��� ���"
 
-#: ../shell/e-shell-window-actions.c:1576
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "_���� ��"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1578
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Execute the current search parameters"
 msgstr "������� � ������ ��� ��������"
 
-#: ../shell/e-shell-window-actions.c:1583
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "_��� ���..."
 
-#: ../shell/e-shell-window-actions.c:1585
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Save the current search parameters"
 msgstr "��� � ������ ��� ��������"
 
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Send / _Receive"
 msgstr "���� / _�����"
 
-#: ../shell/e-shell-window-actions.c:1592
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Send queued items and retrieve new items"
 msgstr "���� ��� ����� � ������ �� �����"
 
-#: ../shell/e-shell-window-actions.c:1597
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Submit _Bug Report..."
 msgstr "������ _��� �����..."
 
-#: ../shell/e-shell-window-actions.c:1599
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Submit a bug report using Bug Buddy"
 msgstr "������ � ��� ����� ���� ·��� ·����"
 
-#: ../shell/e-shell-window-actions.c:1604
-msgid "_Synchronization Options..."
-msgstr "_������������� ������..."
+#: ../shell/e-shell-window-actions.c:1602
+msgid "GNOME Pilot _Synchronization..."
+msgstr "��� ����� _�������������..."
 
-#: ../shell/e-shell-window-actions.c:1606
-msgid "Set up Pilot configuration"
-msgstr "��� �� ·����� ������������"
+#: ../shell/e-shell-window-actions.c:1604
+msgid "Set up GNOME Pilot configuration"
+msgstr "��� �� ·��� ����� ������������"
 
-#: ../shell/e-shell-window-actions.c:1611
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Work Offline"
 msgstr "_��� �����"
 
-#: ../shell/e-shell-window-actions.c:1613
+#: ../shell/e-shell-window-actions.c:1611
 msgid "Put Evolution into offline mode"
 msgstr "��� ·�������� ���� ����� ���"
 
-#: ../shell/e-shell-window-actions.c:1618
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Work Online"
 msgstr "_��� �����"
 
-#: ../shell/e-shell-window-actions.c:1620
+#: ../shell/e-shell-window-actions.c:1618
 msgid "Put Evolution into online mode"
 msgstr "��� ·�������� ���� ����� ���"
 
-#: ../shell/e-shell-window-actions.c:1655
+#: ../shell/e-shell-window-actions.c:1646
+msgid "Lay_out"
+msgstr "_����"
+
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_New"
 msgstr "_��"
 
-#: ../shell/e-shell-window-actions.c:1662
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Search"
 msgstr "_���"
 
-#: ../shell/e-shell-window-actions.c:1669
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Switcher Appearance"
 msgstr "_����� ������"
 
-#: ../shell/e-shell-window-actions.c:1683
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Window"
 msgstr "_�����"
 
-#: ../shell/e-shell-window-actions.c:1693
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show Side _Bar"
 msgstr "�� ��� _��"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1712
 msgid "Show the side bar"
 msgstr "�� � ��� ��"
 
-#: ../shell/e-shell-window-actions.c:1701
-msgid "Show _Status Bar"
-msgstr "�� _������ ��"
-
-#: ../shell/e-shell-window-actions.c:1703
-msgid "Show the status bar"
-msgstr "�� � ������ ��"
-
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show _Buttons"
 msgstr "�� _������"
 
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1720
 msgid "Show the switcher buttons"
 msgstr "�� � ����� ������"
 
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1726
+msgid "Show _Status Bar"
+msgstr "�� _������ ��"
+
+#: ../shell/e-shell-window-actions.c:1728
+msgid "Show the status bar"
+msgstr "�� � ������ ��"
+
+#: ../shell/e-shell-window-actions.c:1734
 msgid "Show _Tool Bar"
 msgstr "�� _��� ��"
 
-#: ../shell/e-shell-window-actions.c:1719
-msgid "Show the toolbar"
-msgstr "�� � �����"
+#: ../shell/e-shell-window-actions.c:1736
+msgid "Show the tool bar"
+msgstr "�� � ��� ��"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1758
 msgid "_Icons Only"
 msgstr "_����� ����"
 
-#: ../shell/e-shell-window-actions.c:1743
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Display window buttons with icons only"
 msgstr "������ ����� ������ ��� ����� ����"
 
-#: ../shell/e-shell-window-actions.c:1748
+#: ../shell/e-shell-window-actions.c:1765
 msgid "_Text Only"
 msgstr "_����� ����"
 
-#: ../shell/e-shell-window-actions.c:1750
+#: ../shell/e-shell-window-actions.c:1767
 msgid "Display window buttons with text only"
 msgstr "������ ����� ������ ��� ����� ����"
 
-#: ../shell/e-shell-window-actions.c:1755
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Icons _and Text"
 msgstr "����� _� �����"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Display window buttons with icons and text"
 msgstr "������ ����� ������ ��� ����� � �����"
 
-#: ../shell/e-shell-window-actions.c:1764
+#: ../shell/e-shell-window-actions.c:1779
+msgid "Tool_bar Style"
+msgstr "_����� ����"
+
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "������ ����� ������ ���� � ������� ����� �����"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Define Views..."
 msgstr "����� ���..."
 
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1791
 msgid "Create or edit views"
 msgstr "����� � ���� ���"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Save Custom View..."
 msgstr "��� ������ ��..."
 
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Save current custom view"
 msgstr "��� ������ ������ ��"
 
-#: ../shell/e-shell-window-actions.c:1798
+#: ../shell/e-shell-window-actions.c:1805
+msgid "C_urrent View"
+msgstr "_������ ��"
+
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Custom View"
 msgstr "������ ��"
 
-#: ../shell/e-shell-window-actions.c:1800
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Current view is a customized view"
 msgstr "������ �� �� � ��������� ��"
 
-#: ../shell/e-shell-window-actions.c:1810
+#: ../shell/e-shell-window-actions.c:1827
 msgid "Change the page settings for your current printer"
 msgstr "���� � ��� ������ �� �� ������ ������"
 
-#: ../shell/e-shell-window-actions.c:2082
 #, c-format
+#: ../shell/e-shell-window-actions.c:2204
 msgid "Switch to %s"
 msgstr "���� � %s"
 
-#: ../shell/e-shell-window-actions.c:2285
+#: ../shell/e-shell-window-actions.c:2417
 msgid "Execute these search parameters"
 msgstr "������� ��� ��� ��������"
 
-#: ../shell/e-shell-window-private.c:254
-msgid "New"
-msgstr "��"
-
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:571
 #, c-format
+#: ../shell/e-shell-window-private.c:573
 msgid "%s - Evolution"
 msgstr "%s - ·��������"
 
-#: ../shell/e-shell-window.c:292
-msgid "Active Shell View"
-msgstr "����� ��� ��"
-
-#: ../shell/e-shell-window.c:293
-msgid "Name of the active shell view"
-msgstr "��� � � ����� ��� ��"
-
-#: ../shell/e-shell-window.c:307
-msgid "Safe Mode"
-msgstr "��� ���"
-
-#: ../shell/e-shell-window.c:308
-msgid "Whether the shell window is in safe mode"
-msgstr "���� � ��� ����� �� �� ��� ���"
+#: ../shell/e-shell-window.c:382
+msgid "New"
+msgstr "��"
 
-#: ../shell/e-shell.c:207
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "������� � �� �����..."
 
-#: ../shell/e-shell.c:261
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "������� � �� �����..."
 
-#: ../shell/e-shell.c:324
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "������� � ����..."
 
-#: ../shell/e-shell.c:688
-msgid "Network Available"
-msgstr "������ ��������"
-
-#: ../shell/e-shell.c:689
-msgid "Whether the network is available"
-msgstr "���� � ������ �� ��������"
-
-#: ../shell/e-shell.c:704 ../widgets/misc/e-online-button.c:130
-msgid "Online"
-msgstr "�����"
-
-#: ../shell/e-shell.c:705
-msgid "Whether the shell is online"
-msgstr "���� � ��� �� �����"
-
-#: ../shell/main.c:189
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
+#. Preview/Alpha/Beta version warning message
+#, no-c-format
+#: ../shell/main.c:164
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\nof the "
+"Evolution groupware suite.\n\nThis version of Evolution is not yet complete. "
+"It is getting close,\nbut some features are either unfinished or do not work "
+"properly.\n\nIf you want a stable version of Evolution, we urge you to "
+"uninstall\nthis version, and install version %s instead.\n\nIf you find bugs, "
+"please report them to us at bugzilla.gnome.org.\nThis product comes with no "
+"warranty and is not intended for\nindividuals prone to violent fits of "
+"anger.\n\nWe hope that you enjoy the results of our hard work, and "
+"we\neagerly await your contributions!\n"
 msgstr ""
-"�����\n"
-"� ·�������� ���\n"
-
-#: ../shell/main.c:196
+"��.  ����� �� ����� � ��� � ������ ��� ����� �����\n� � ·�������� ������� "
+"����.\n\n��� ����� � ·�������� �� ��� ��� �������. �� �� ����� ����,\n��� ��� "
+"����� � ��� �������� � �� ��� ��� �������.\n\n�� � ���� � ������ ����� � "
+"·��������, �� �� � � ��������\n��� �����, � ������ ����� %s ������.\n\n�� � "
+"���� ����, ���� ����� ��� � �� �� bugzilla.gnome.org.\n��� ������� ���� ��� "
+"�� ������� � �� ��� �������� ��\n����������� ���� � ������� ���� � "
+"����.\n\n�� ��� ��� � ���� � ������� � �� ��� ���, � ��\n����� ���� �� "
+"������������!\n"
+
+#: ../shell/main.c:188
+msgid "Thanks\nThe Evolution Team\n"
+msgstr "�����\n� ·�������� ���\n"
+
+#: ../shell/main.c:195
 msgid "Do not tell me again"
 msgstr "�� ��� ��� �� ����"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:301
 msgid "Start Evolution activating the specified component"
 msgstr "���� ·�������� ��������� � �������� ���������"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:303
+msgid "Apply the given geometry to the main window"
+msgstr "���� � ����� �������� � � ��� �����"
+
+#: ../shell/main.c:307
 msgid "Start in online mode"
 msgstr "���� �� ����� ���"
 
-#: ../shell/main.c:321
+#: ../shell/main.c:309
+msgid "Start in \"express\" mode"
+msgstr "���� �� \"�������\" ���"
+
+#: ../shell/main.c:312
 msgid "Forcibly shut down Evolution"
 msgstr "�������� ��� ��� ·��������"
 
-#: ../shell/main.c:325
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "�������� ��-������ ���� ·�������� 1.4"
-
-#: ../shell/main.c:328
+#: ../shell/main.c:315
 msgid "Send the debugging output of all components to a file."
 msgstr "���� � ������� ����� � �� ���������� � � ���."
 
-#: ../shell/main.c:330
+#: ../shell/main.c:317
 msgid "Disable loading of any plugins."
 msgstr "������� ����� � ��� �������."
 
-#: ../shell/main.c:332
+#: ../shell/main.c:319
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "������� ����� ��� � ���, �������� � �����."
 
-#: ../shell/main.c:540
+#: ../shell/main.c:323
+msgid "Import URIs or file names given as rest of arguments."
+msgstr "����� URI� � ��� ���� ����� �� ���� � ��������."
+
+#: ../shell/main.c:325
+msgid "Request a running Evolution process to quit"
+msgstr "������� � ����� ·�������� ������ � ����"
+
+#: ../shell/main.c:449
+msgid "- The Evolution PIM and Email Client"
+msgstr "- � ·�������� PIM � ���� ������"
+
 #, c-format
+#: ../shell/main.c:475
 msgid ""
-"%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
+"%s: --online and --offline cannot be used together.\n  Use %s --help for more "
+"information.\n"
 msgstr ""
-"%s: --����� � --����� ����� �� ��� ������.\n"
-"  �� %s --���� �� �� ���������.\n"
+"%s: --online � --offline ����� �� ��� ������.\n  �� %s --help �� �� "
+"���������.\n"
 
 #: ../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 "�������"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "����� ������ �������� ���� ����� {0}"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "����� ��� ���� ���� ����� {0}?"
+msgid "Continue Anyway"
+msgstr "������� �����"
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "���������� ���� ���� �� ������."
+#: ../shell/shell.error.xml.h:4
+msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then upgrading "
+"to Evolution 3."
+msgstr ""
+"·�������� �� ����� ������ �������� �������� ���� ����� {0}. ����� �� � "
+"�������� � ��� ��� ���� �������� � ·�������� 2, � ��� �������� � ·�������� 3."
+
+#, fuzzy
+#: ../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 ""
+"������� �� ������� ��� ��� �� �������� �������. � ��� �� reprompted ����� ��� "
+"�� � �����."
 
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "���� ����� ��� ����?"
+msgid "Quit Now"
+msgstr "���� ��"
 
-#: ../shell/shell.error.xml.h:18
+#: ../shell/shell.error.xml.h:8
 msgid "Upgrade from previous version failed:"
 msgstr "������ ���� ������� ����� ����:"
 
-#: ../shell/shell.error.xml.h:19
-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 ""
-"�������� �� ���� � ������ ��� ������ �� � {0} � ���� ����, ��� � ���� ��� "
-"{1} ��������.\n"
-"\n"
-"� ��� ��� � ��� �� ���� �������� �� �� ��� �������� ���� � ��� �������."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "_�����"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_��� ����"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_������ �� ����"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
-"{0}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old data."
-"\n"
-msgstr ""
-"{0}\n"
-"\n"
-"�� � ��� � �������, � �� ��� ��� ����� � ��� � �� ��� ����.\n"
+"{0}\n\nIf you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr "{0}\n\n�� � ��� � �������, � �� ��� ��� ����� � ��� � �� ��� ����.\n"
 
 #: ../shell/test/e-test-shell-backend.c:60
 msgctxt "New"
@@ -16022,71 +19781,76 @@ msgstr "���� _���"
 msgid "Create a new test source"
 msgstr "����� � �� ���� ���"
 
-#: ../smclient/eggdesktopfile.c:165
 #, c-format
+#: ../smclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
 msgstr "��� �� ��� � ����� .������� ���"
 
-#: ../smclient/eggdesktopfile.c:188
 #, c-format
+#: ../smclient/eggdesktopfile.c:188
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "����������� ������� ��� ����� '%s'"
 
-#: ../smclient/eggdesktopfile.c:958
 #, c-format
+#: ../smclient/eggdesktopfile.c:958
 msgid "Starting %s"
 msgstr "������ %s"
 
-#: ../smclient/eggdesktopfile.c:1100
 #, c-format
+#: ../smclient/eggdesktopfile.c:1100
 msgid "Application does not accept documents on command line"
 msgstr "��������� ��� ��� ������ ��������� �� ������ ���"
 
-#: ../smclient/eggdesktopfile.c:1168
 #, c-format
+#: ../smclient/eggdesktopfile.c:1168
 msgid "Unrecognized launch option: %d"
 msgstr "����������� ���� �����: %d"
 
-#: ../smclient/eggsmclient.c:225
+#, c-format
+#: ../smclient/eggdesktopfile.c:1373
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr "���� ��� �������� URIs � � 'Type=Link' ������� �����"
+
+#, c-format
+#, fuzzy
+#: ../smclient/eggdesktopfile.c:1394
+msgid "Not a launchable item"
+msgstr "��� � launchable ����"
+
+#: ../smclient/eggsmclient.c:227
 msgid "Disable connection to session manager"
 msgstr "������� �������� � ����� ������"
 
-#: ../smclient/eggsmclient.c:228
+#: ../smclient/eggsmclient.c:230
 msgid "Specify file containing saved configuration"
 msgstr "������� ��� �������� ���� ������������"
 
-#: ../smclient/eggsmclient.c:228
+#: ../smclient/eggsmclient.c:230
 msgid "FILE"
 msgstr "���"
 
-#: ../smclient/eggsmclient.c:231
+#: ../smclient/eggsmclient.c:233
 msgid "Specify session management ID"
 msgstr "������� ����� ��������� ID"
 
-#: ../smclient/eggsmclient.c:231
+#: ../smclient/eggsmclient.c:233
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:252
+#: ../smclient/eggsmclient.c:254
 msgid "Session management options:"
 msgstr "����� ��������� ������:"
 
-#: ../smclient/eggsmclient.c:253
+#: ../smclient/eggsmclient.c:255
 msgid "Show session management options"
 msgstr "�� ����� ��������� ������"
 
-#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
-msgid ""
-"Certificate '%s' is a CA certificate.\n"
-"\n"
-"Edit trust settings:"
-msgstr ""
-"��������� '%s' �� � �� ���������.\n"
-"\n"
-"���� ����� ������:"
+#: ../smime/gui/ca-trust-dialog.c:104
+msgid "Certificate '%s' is a CA certificate.\n\nEdit trust settings:"
+msgstr "��������� '%s' �� � �� ���������.\n\n���� ����� ������:"
 
-#: ../smime/gui/cert-trust-dialog.c:150
+#: ../smime/gui/cert-trust-dialog.c:144
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -16095,60 +19859,60 @@ msgstr ""
 "����� � ����� � ��������� ������� ��� ���� ��� ���������, ��� � ����� � "
 "���������� � ��� ��������� ����� ������ ��������� ��"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:148
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
-"����� � �� ��� ����� � ��������� ������� ��� ���� ��� ���������, ��� � �� "
-"��� ����� � ���������� � ��� ��������� ����� ������ ��������� ��"
+"����� � �� ��� ����� � ��������� ������� ��� ���� ��� ���������, ��� � �� ��� "
+"����� � ���������� � ��� ��������� ����� ������ ��������� ��"
 
-#: ../smime/gui/certificate-manager.c:137
-#: ../smime/gui/certificate-manager.c:384
-#: ../smime/gui/certificate-manager.c:612
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "������ � ��������� � �����..."
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "�� PKCS12 ����"
 
-#: ../smime/gui/certificate-manager.c:152
-#: ../smime/gui/certificate-manager.c:399
-#: ../smime/gui/certificate-manager.c:626
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
 msgid "All files"
 msgstr "�� ����"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:489
-#: ../smime/gui/certificate-manager.c:714
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "��������� ���"
 
-#: ../smime/gui/certificate-manager.c:285
-#: ../smime/gui/certificate-manager.c:507
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "�������"
 
-#: ../smime/gui/certificate-manager.c:294 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:552
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "������ �����"
 
-#: ../smime/gui/certificate-manager.c:302
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "�������"
 
-#: ../smime/gui/certificate-manager.c:393
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "�� ���� ��������� ����"
 
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "�-��� �����"
 
-#: ../smime/gui/certificate-manager.c:621
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "�� �� ��������� ����"
 
@@ -16156,15 +19920,15 @@ msgstr "�� �� ��������� ����"
 msgid "Certificates"
 msgstr "����������"
 
-#: ../smime/gui/certificate-viewer.c:338
 #, c-format
+#: ../smime/gui/certificate-viewer.c:338
 msgid "Certificate Viewer: %s"
 msgstr "��������� ���: %s"
 
-#: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "���� � ������ �� `%s'"
+#: ../smime/gui/component.c:46
+msgid "Enter the password for '%s'"
+msgstr "���� � ������ �� '%s'"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -16176,77 +19940,33 @@ msgid "Enter new password"
 msgstr "���� �� ������"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
 #, c-format
-msgid ""
-"Issued to:\n"
-"  Subject: %s\n"
-msgstr ""
-"���� �:\n"
-"  �������: %s\n"
+#: ../smime/gui/e-cert-selector.c:116
+msgid "Issued to:\n  Subject: %s\n"
+msgstr "���� �:\n  �������: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
 #, c-format
-msgid ""
-"Issued by:\n"
-"  Subject: %s\n"
-msgstr ""
-"���� ��:\n"
-"  �������: %s\n"
+#: ../smime/gui/e-cert-selector.c:117
+msgid "Issued by:\n  Subject: %s\n"
+msgstr "���� ��:\n  �������: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "������ ���������"
 
-#: ../smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<��� ��� � ���������>"
 
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b>��������� �����</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>��������� �������</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b>���� ����</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>�����������</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>���� ��</b>"
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-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>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>��������</b>"
-
-#: ../smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.ui.h:2
 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.ui.h:3
+msgid "Backup _All"
+msgstr "����� _��"
 
-#: ../smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.ui.h:4
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -16254,276 +19974,341 @@ msgstr ""
 "���� ������� ��� �� �� ��� �����, � ��� ������� ��� ��������� � ��� ������ � "
 "�������� (�� ��������)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "���������"
 
-#: ../smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "��������� ������� �����"
 
-#: ../smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.ui.h:7
+msgid "Certificate Fields"
+msgstr "��������� �����"
+
+#: ../smime/gui/smime-ui.ui.h:8
+msgid "Certificate Hierarchy"
+msgstr "��������� �������"
+
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "��������� ������"
 
-#: ../smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "���������� �����"
 
-#: ../smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.ui.h:11
+msgid "Common Name (CN)"
+msgstr "����� ��� (CN)"
+
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "������� ����������"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.ui.h:14
 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
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "���� ��������� ����� ������"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "���� ��������� ���������"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "���� ���� ���������"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "������� ��"
 
-#: ../smime/gui/smime-ui.glade.h:29
-msgid "Import"
-msgstr "�����"
+#: ../smime/gui/smime-ui.ui.h:19
+msgid "Field Value"
+msgstr "���� ����"
+
+#: ../smime/gui/smime-ui.ui.h:20
+msgid "Fingerprints"
+msgstr "�����������"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "Issued By"
+msgstr "���� ��"
+
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "���� ��"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Issued To"
+msgstr "���� �"
+
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "MD5 ����������"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "���������� (O)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "������������� ���� (OU)"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 ����������"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "SSL ������ ���������"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "SSL ���� ���������"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:33
+msgid "This certificate has been verified for the following uses:"
+msgstr "��� ��������� ��� ��� ������� �� � ������ ����:"
+
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "����� � ���������� � ��� ���������"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "����� ��� CA � �������� ���� ����."
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "����� ��� CA � �������� ������ ���������."
 
-#: ../smime/gui/smime-ui.glade.h:41
-msgid "Trust this CA to identify web sites."
-msgstr "����� ��� CA � �������� ��� ����."
+#, fuzzy
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
+msgstr "����� ��� �� � �������� websites."
 
-#: ../smime/gui/smime-ui.glade.h:42
-msgid "View"
-msgstr "��"
+#: ../smime/gui/smime-ui.ui.h:38
+msgid "Validity"
+msgstr "��������"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "� ��� ���������� ���� ��� ����������� ��� �������� �:"
 
-#: ../smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "� ��� ���������� �� ��� ��� �������� ��� ��������� �������:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "� ��� ���������� �� ��� ��� �������� ��� �����:"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "�� ����������"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_Backup"
+msgstr "_�����"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "_���� CA �����"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:652
+#: ../smime/lib/e-cert-db.c:711
 msgid "Certificate already exists"
 msgstr "��������� ������ �������"
 
-#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:407
+#: ../smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "���"
 
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "�������"
 
-#: ../smime/lib/e-cert.c:513
+#: ../smime/lib/e-cert.c:527
 msgid "Version"
 msgstr "�����"
 
-#: ../smime/lib/e-cert.c:528
+#: ../smime/lib/e-cert.c:542
 msgid "Version 1"
 msgstr "����� 1"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:545
 msgid "Version 2"
 msgstr "����� 2"
 
-#: ../smime/lib/e-cert.c:534
+#: ../smime/lib/e-cert.c:548
 msgid "Version 3"
 msgstr "����� 3"
 
-#: ../smime/lib/e-cert.c:652
+#, fuzzy
+#: ../smime/lib/e-cert.c:630
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr "PKCS #1 MD2 ��� RSA ���������"
+
+#, fuzzy
+#: ../smime/lib/e-cert.c:633
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr "PKCS #1 MD5 ��� RSA ���������"
+
+#, fuzzy
+#: ../smime/lib/e-cert.c:636
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr "PKCS #1 ��-1 ��� RSA ���������"
+
+#, fuzzy
+#: ../smime/lib/e-cert.c:663
+msgid "PKCS #1 RSA Encryption"
+msgstr "PKCS #1 RSA ���������"
+
+#: ../smime/lib/e-cert.c:666
 msgid "Certificate Key Usage"
 msgstr "��������� �� ����"
 
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-cert.c:669
 msgid "Netscape Certificate Type"
 msgstr "·������� ��������� ���"
 
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-cert.c:672
 msgid "Certificate Authority Key Identifier"
 msgstr "��������� ������� �� ���������"
 
-#: ../smime/lib/e-cert.c:670
 #, c-format
+#: ../smime/lib/e-cert.c:684
 msgid "Object Identifier (%s)"
 msgstr "������ ��������� (%s)"
 
-#: ../smime/lib/e-cert.c:720
+#: ../smime/lib/e-cert.c:735
 msgid "Algorithm Identifier"
 msgstr "�������� ���������"
 
-#: ../smime/lib/e-cert.c:728
+#: ../smime/lib/e-cert.c:743
 msgid "Algorithm Parameters"
 msgstr "�������� ��������"
 
-#: ../smime/lib/e-cert.c:750
+#: ../smime/lib/e-cert.c:765
 msgid "Subject Public Key Info"
 msgstr "������� ������ �� ����"
 
-#: ../smime/lib/e-cert.c:755
+#: ../smime/lib/e-cert.c:770
 msgid "Subject Public Key Algorithm"
 msgstr "������� ������ �� ��������"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:785
 msgid "Subject's Public Key"
 msgstr "�������'� ������ ��"
 
-#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
 msgid "Error: Unable to process extension"
 msgstr "��: ������ � ������ ���������"
 
-#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
 msgid "Object Signer"
 msgstr "������ ����"
 
-#: ../smime/lib/e-cert.c:816
+#: ../smime/lib/e-cert.c:831
 msgid "SSL Certificate Authority"
 msgstr "SSL ��������� �������"
 
-#: ../smime/lib/e-cert.c:820
+#: ../smime/lib/e-cert.c:835
 msgid "Email Certificate Authority"
 msgstr "���� ��������� �������"
 
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:863
 msgid "Signing"
 msgstr "�����"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:867
 msgid "Non-repudiation"
 msgstr "���-�����������"
 
-#: ../smime/lib/e-cert.c:864
+#, fuzzy
+#: ../smime/lib/e-cert.c:871
+msgid "Key Encipherment"
+msgstr "�� Encipherment"
+
+#, fuzzy
+#: ../smime/lib/e-cert.c:875
+msgid "Data Encipherment"
+msgstr "���� Encipherment"
+
+#: ../smime/lib/e-cert.c:879
 msgid "Key Agreement"
 msgstr "�� ��������"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:883
 msgid "Certificate Signer"
 msgstr "��������� ����"
 
-#: ../smime/lib/e-cert.c:920
+#: ../smime/lib/e-cert.c:887
+msgid "CRL Signer"
+msgstr "CRL ����"
+
+#: ../smime/lib/e-cert.c:935
 msgid "Critical"
 msgstr "��������"
 
-#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
 msgid "Not Critical"
 msgstr "��� ��������"
 
-#: ../smime/lib/e-cert.c:946
+#: ../smime/lib/e-cert.c:961
 msgid "Extensions"
 msgstr "����������"
 
-#: ../smime/lib/e-cert.c:1017
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
 #, c-format
+#: ../smime/lib/e-cert.c:1036
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Algorithm"
 msgstr "��������� ������� ��������"
 
-#: ../smime/lib/e-cert.c:1081
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "����"
 
-#: ../smime/lib/e-cert.c:1135
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "���� ���� ID"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "������� ���� ID"
 
-#: ../smime/lib/e-cert.c:1197
+#: ../smime/lib/e-cert.c:1220
 msgid "Certificate Signature Value"
 msgstr "��������� ������� ����"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ��� ������"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:251
 msgid "Enter password for PKCS12 file:"
 msgstr "���� ������ �� PKCS12 ���:"
 
-#: ../smime/lib/e-pkcs12.c:348
+#: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
 msgstr "������� ���������"
 
@@ -16539,6 +20324,10 @@ msgstr "_����� ����"
 msgid "_List View"
 msgstr "_���� ��"
 
+#: ../views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "_��� ��"
+
 #: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
 msgstr "_�� ��"
@@ -16551,10 +20340,26 @@ msgstr "_���� ��"
 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
+msgid "By S_tatus"
+msgstr "�� _������"
+
+#: ../views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "�� _�����"
+
+#: ../views/mail/galview.xml.h:5
+msgid "By Su_bject"
+msgstr "�� _�������"
+
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
 msgstr "�� _���� �� ����"
@@ -16579,126 +20384,96 @@ msgstr "��� _�� ���"
 msgid "With _Status"
 msgstr "��� _������"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>��� ����</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "<b>_Selection</b>"
-msgstr "<b>_��������</b>"
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
+msgid "UTC"
+msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
 msgstr "������ � ��� ���"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+msgid "Time Zones"
+msgstr "��� ����"
+
+#, fuzzy
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+msgid "Timezone drop-down combination box"
+msgstr "Timezone ����-��� ���������� ����"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
+"zone.\nUse the right mouse button to zoom out."
 msgstr ""
-"�� � ���� ��� ����� � ��� �� �� �� ��� � � ��� � ������ � ��� ���.\n"
-"�� � ��� ��� ����� � ��� ��."
+"�� � ���� ��� ����� � ��� �� �� �� ��� � � ��� � ������ � ��� ���.\n�� � ��� "
+"��� ����� � ��� ��."
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "��������"
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_��������"
 
-#: ../widgets/menus/gal-define-views-dialog.c:356
-#: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
+#: ../widgets/menus/gal-define-views-dialog.c:339
+#: ../widgets/menus/gal-define-views.ui.h:4
 msgid "Define Views for %s"
 msgstr "����� ��� �� %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:364
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-define-views-dialog.c:349
 msgid "Define Views"
 msgstr "����� ���"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
 #, no-c-format
+#: ../widgets/menus/gal-define-views.ui.h:2
 msgid "Define Views for \"%s\""
 msgstr "����� ��� �� \"%s\""
 
-#: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/menus/gal-view-factory-etable.c:113
 msgid "Table"
 msgstr "�����"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "�������"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "��� ������ ��"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "_����� �� ��"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "_������ �������� ��"
 
-#: ../widgets/menus/gal-view-new-dialog.c:68
-msgid "Factory"
-msgstr "������"
-
-#: ../widgets/menus/gal-view-new-dialog.c:103
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "����� �� ��"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "��� � �� ��:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
 msgstr "��� � ��"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "��� � ��:"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "����� ���"
+#: ../widgets/misc/e-account-manager.c:348
+msgid "De_fault"
+msgstr "_������"
 
 #: ../widgets/misc/e-account-tree-view.c:255
 msgid "Protocol"
 msgstr "��������"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "�����"
-
-#. Translators: This is a cancelled activity.
-#: ../widgets/misc/e-activity.c:224
-#, c-format
-msgid "%s (cancelled)"
-msgstr "%s (�������)"
-
-#. Translators: This is a completed activity.
-#: ../widgets/misc/e-activity.c:227
-#, c-format
-msgid "%s (completed)"
-msgstr "%s (���������)"
-
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../widgets/misc/e-activity.c:231
-#, c-format
-msgid "%s..."
-msgstr "%s..."
-
-#: ../widgets/misc/e-activity.c:236
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% �������)"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "�������� ��������"
@@ -16711,11 +20486,16 @@ msgstr "_������:"
 msgid "MIME Type:"
 msgstr "MIME ���:"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "_Suggest automatic display of attachment"
+msgstr "_������ �������� ������ � ��������"
+
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "��� ��� ��� �� ��������"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "��� �� _��������"
 
@@ -16734,97 +20514,118 @@ msgid "Send the selected attachments somewhere"
 msgstr "���� � �������� ��������� �����"
 
 #: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-tree-view.c:520
 msgid "Loading"
 msgstr "�����"
 
 #: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-tree-view.c:532
 msgid "Saving"
 msgstr "�����"
 
 #: ../widgets/misc/e-attachment-paned.c:87
-msgid "Hide _Attachment Bar"
-msgstr "��� _�������� ��"
+msgid "Hide Attachment _Bar"
+msgstr "��� �������� _��"
 
 #: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:626
-msgid "Show _Attachment Bar"
-msgstr "�� _�������� ��"
+#: ../widgets/misc/e-attachment-paned.c:636
+msgid "Show Attachment _Bar"
+msgstr "�� �������� _��"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "�� ��������"
 
-#: ../widgets/misc/e-attachment-store.c:607
+#: ../widgets/misc/e-attachment-store.c:541
+msgid "A_ttach"
+msgstr "_����"
+
+#: ../widgets/misc/e-attachment-store.c:604
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "��� ��������"
 msgstr[1] "��� ���������"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:636
+#: ../widgets/misc/e-attachment-store.c:633
 #: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "��������.dat"
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:299
+msgid "S_ave All"
+msgstr "_��� ��"
+
+#: ../widgets/misc/e-attachment-view.c:325
+msgid "A_dd Attachment..."
+msgstr "_�� ��������..."
+
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "_���"
 
-#: ../widgets/misc/e-attachment-view.c:643
+#, fuzzy
+#: ../widgets/misc/e-attachment-view.c:356
+msgid "_View Inline"
+msgstr "_�� Inline"
+
 #, c-format
+#: ../widgets/misc/e-attachment-view.c:638
 msgid "Open with \"%s\""
 msgstr "���� ��� \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:646
 #, c-format
+#: ../widgets/misc/e-attachment-view.c:641
 msgid "Open this attachment in %s"
 msgstr "���� ��� �������� �� %s"
 
-#: ../widgets/misc/e-attachment.c:990
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "����� �����"
 
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 msgid "A load operation is already in progress"
 msgstr "� ��� ������� �� ������ �� �������"
 
-#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 msgid "A save operation is already in progress"
 msgstr "� ��� ������� �� ������ �� �������"
 
-#: ../widgets/misc/e-attachment.c:1923
 #, c-format
+#: ../widgets/misc/e-attachment.c:1914
 msgid "Could not load '%s'"
 msgstr "��� ��� ��� '%s'"
 
-#: ../widgets/misc/e-attachment.c:1926
 #, c-format
+#: ../widgets/misc/e-attachment.c:1917
 msgid "Could not load the attachment"
 msgstr "��� ��� ��� � ��������"
 
-#: ../widgets/misc/e-attachment.c:2190
 #, c-format
+#: ../widgets/misc/e-attachment.c:2193
 msgid "Could not open '%s'"
 msgstr "��� ��� ���� '%s'"
 
-#: ../widgets/misc/e-attachment.c:2193
 #, c-format
+#: ../widgets/misc/e-attachment.c:2196
 msgid "Could not open the attachment"
 msgstr "��� ��� ���� � ��������"
 
-#: ../widgets/misc/e-attachment.c:2635
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "�������� �������� ��� �����"
 
-#: ../widgets/misc/e-attachment.c:2712
 #, c-format
+#: ../widgets/misc/e-attachment.c:2707
 msgid "Could not save '%s'"
 msgstr "��� ��� ��� '%s'"
 
-#: ../widgets/misc/e-attachment.c:2715
 #, c-format
+#: ../widgets/misc/e-attachment.c:2710
 msgid "Could not save the attachment"
 msgstr "��� ��� ��� � ��������"
 
@@ -16834,7 +20635,7 @@ msgid "Ctrl-click to open a link"
 msgstr "�������-���� � ���� � ����"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1253
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16842,50 +20643,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "���� �������"
 
-#: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
-#: ../widgets/text/e-text.c:3633
-msgid "Fill color"
-msgstr "��� ����"
-
-#: ../widgets/misc/e-canvas-background.c:482
-#: ../widgets/misc/e-canvas-background.c:483
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:489
-#: ../widgets/misc/e-canvas-background.c:490
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:496
-#: ../widgets/misc/e-canvas-background.c:497
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:503
-#: ../widgets/misc/e-canvas-background.c:504
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1001
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3062
-msgid "Minimum width"
-msgstr "������� ����"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3063
-msgid "Minimum Width"
-msgstr "������� ����"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "������"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "������ �������"
@@ -16898,45 +20655,52 @@ msgstr "ð�‘§ð�‘¯ð�‘‘ð�‘¼ ð�‘ž ð�‘’ð�‘¸ð�‘©ð�‘’ð�‘‘ð�‘¼ ð�‘•ð�‘§ð�‘‘ ð�‘‘ ð�‘¿ð�‘
 msgid "Other..."
 msgstr "���..."
 
-#: ../widgets/misc/e-dateedit.c:412
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "��� � ���"
 
-#: ../widgets/misc/e-dateedit.c:432
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "����� ����� � ����� ���"
 
-#: ../widgets/misc/e-dateedit.c:454
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "���� ��� ����� � �� � �������"
 
-#: ../widgets/misc/e-dateedit.c:496
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "����-��� ���������� ���� � ������ ���"
 
-#: ../widgets/misc/e-dateedit.c:572
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "�_�"
 
-#: ../widgets/misc/e-dateedit.c:578
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_����"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:586
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_���"
 
-#: ../widgets/misc/e-dateedit.c:1679
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
+msgctxt "date"
+msgid "None"
+msgstr "���"
+
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "������� ��� ����"
 
-#: ../widgets/misc/e-dateedit.c:1715
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "������� ��� ����"
 
-#: ../widgets/misc/e-import-assistant.c:223
+#: ../widgets/misc/e-import-assistant.c:238
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -16944,74 +20708,101 @@ msgstr ""
 "��� � ��� ��� � ���� � ����� ���� ·��������, � ������ ��� ��� � ��� �� �� "
 "���� � ����."
 
-#: ../widgets/misc/e-import-assistant.c:250
+#: ../widgets/misc/e-import-assistant.c:255
+msgid "F_ilename:"
+msgstr "_������:"
+
+#: ../widgets/misc/e-import-assistant.c:265
 msgid "Select a file"
 msgstr "������ � ���"
 
-#: ../widgets/misc/e-import-assistant.c:264
+#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:455
 msgid "File _type:"
 msgstr "��� _���:"
 
-#: ../widgets/misc/e-import-assistant.c:307
+#: ../widgets/misc/e-import-assistant.c:322
 msgid "Choose the destination for this import"
 msgstr "��� � ���������� �� ��� �����"
 
-#: ../widgets/misc/e-import-assistant.c:332
+#: ../widgets/misc/e-import-assistant.c:347
 msgid "Choose the type of importer to run:"
 msgstr "��� � ��� � ������ � ���:"
 
-#: ../widgets/misc/e-import-assistant.c:340
+#: ../widgets/misc/e-import-assistant.c:355
 msgid "Import data and settings from _older programs"
 msgstr "����� ���� � ������ ���� _���� ��������"
 
-#: ../widgets/misc/e-import-assistant.c:348
+#: ../widgets/misc/e-import-assistant.c:363
 msgid "Import a _single file"
 msgstr "����� � _������ ���"
 
-#: ../widgets/misc/e-import-assistant.c:823
-#: ../widgets/misc/e-import-assistant.c:839
+#: ../widgets/misc/e-import-assistant.c:439
+msgid "Select what type of file you want to import from the list."
+msgstr "������ ��� ��� � ��� � ���� � ����� ���� � ����."
+
+#: ../widgets/misc/e-import-assistant.c:516
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"·�������� ���� �� ������ � ����� ���� � ������ ����������: ·���, ·�������, "
+"·���, iCalendar. �� ��������� ������ ����. �� � ��� ��� � ��� ����, ���� ���� "
+"� \"���\" �����."
+
+#: ../widgets/misc/e-import-assistant.c:1187
+#: ../widgets/misc/e-import-assistant.c:1214
 msgid "Evolution Import Assistant"
 msgstr "·�������� ����� ��������"
 
-#: ../widgets/misc/e-import-assistant.c:832
+#: ../widgets/misc/e-import-assistant.c:1196
+#: ../widgets/misc/e-import-assistant.c:1248
+msgid "Import Location"
+msgstr "����� �������"
+
+#: ../widgets/misc/e-import-assistant.c:1207
 msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
+"Welcome to the Evolution Import Assistant.\nWith this assistant you will be "
+"guided through the process of importing external files into Evolution."
 msgstr ""
-"������ � � ·�������� ����� ��������.\n"
-"��� ��� �������� � ��� �� ����� ��� � ������ � ������� �������� ���� ���� "
-"·��������."
+"������ � � ·�������� ����� ��������.\n��� ��� �������� � ��� �� ����� ��� � "
+"������ � ������� �������� ���� ���� ·��������."
 
-#: ../widgets/misc/e-import-assistant.c:848
+#: ../widgets/misc/e-import-assistant.c:1223
 msgid "Importer Type"
 msgstr "������ ���"
 
-#: ../widgets/misc/e-import-assistant.c:857
+#: ../widgets/misc/e-import-assistant.c:1232
 msgid "Select Information to Import"
 msgstr "������ ��������� � �����"
 
-#: ../widgets/misc/e-import-assistant.c:865
+#: ../widgets/misc/e-import-assistant.c:1240
 msgid "Select a File"
 msgstr "������ � ���"
 
-#: ../widgets/misc/e-import-assistant.c:873
-msgid "Import Location"
-msgstr "����� �������"
-
-#: ../widgets/misc/e-import-assistant.c:880
+#: ../widgets/misc/e-import-assistant.c:1255
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "���� \"����\" � ����� ������� � ��� ���� ·��������."
 
-#: ../widgets/misc/e-import-assistant.c:886
-#: ../widgets/misc/e-import-assistant.c:895
+#: ../widgets/misc/e-import-assistant.c:1261
+#: ../widgets/misc/e-import-assistant.c:1271
 msgid "Import Data"
 msgstr "����� ����"
 
-#: ../widgets/misc/e-map.c:605
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "���� ���"
 
+#, fuzzy
+#: ../widgets/misc/e-map.c:626
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"���-���� ��������� ��� ����� �� �������� timezone. ������ ���� ��� ������ "
+"������ � timezone ���� � ����-��� ���������� ���� ����."
+
 #: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "·�������� �� �������� �����.  ���� ��� ����� � ��� �����."
@@ -17024,177 +20815,198 @@ msgstr "·�������� �� �������
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "·�������� �� �������� ����� ����� � ������ �� ����������."
 
-#: ../widgets/misc/e-online-button.c:131
-msgid "The button state is online"
-msgstr "� ����� ���� �� �����"
-
-#: ../widgets/misc/e-paned.c:234
-msgid "Horizontal Position"
-msgstr "���������� �������"
-
-#: ../widgets/misc/e-paned.c:235
-msgid "Pane position when oriented horizontally"
-msgstr "��� ������� ��� �������� �����������"
-
-#: ../widgets/misc/e-paned.c:246
-msgid "Vertical Position"
-msgstr "������� �������"
-
-#: ../widgets/misc/e-paned.c:247
-msgid "Pane position when oriented vertically"
-msgstr "��� ������� ��� �������� ��������"
-
-#: ../widgets/misc/e-pilot-settings.c:99
+#: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "���� ���:"
 
-#: ../widgets/misc/e-pilot-settings.c:107
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync Private Records:"
 msgstr "���� ������ ������:"
 
-#: ../widgets/misc/e-pilot-settings.c:116
+#: ../widgets/misc/e-pilot-settings.c:112
 msgid "Sync Categories:"
 msgstr "���� ���������:"
 
-#: ../widgets/misc/e-popup-action.c:173
-msgid "Source Action"
-msgstr "��� �����"
-
-#: ../widgets/misc/e-popup-action.c:174
-msgid "The source action to proxy"
-msgstr "� ��� ����� � ������"
-
 #: ../widgets/misc/e-preferences-window.c:218
 msgid "Evolution Preferences"
 msgstr "·�������� ����������"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "���� ��"
+#, c-format
+#: ../widgets/misc/e-search-bar.c:77
+msgid "Matches: %d"
+msgstr "�����: %d"
 
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "���� �����"
+#: ../widgets/misc/e-search-bar.c:554
+msgid "Close the find bar"
+msgstr "���� � ���� ��"
 
-#: ../widgets/misc/e-selection-model.c:208
-msgid "Sorter"
-msgstr "�����"
+#: ../widgets/misc/e-search-bar.c:562
+msgid "Fin_d:"
+msgstr "���_�:"
 
-#: ../widgets/misc/e-selection-model.c:215
-msgid "Selection Mode"
-msgstr "�������� ���"
+#: ../widgets/misc/e-search-bar.c:574
+msgid "Clear the search"
+msgstr "��� � ���"
 
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Cursor Mode"
-msgstr "���� ���"
+#: ../widgets/misc/e-search-bar.c:597
+msgid "_Previous"
+msgstr "_�������"
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>������� ������</b>"
+#: ../widgets/misc/e-search-bar.c:603
+msgid "Find the previous occurrence of the phrase"
+msgstr "���� � ������� ������ � � ����"
 
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>������</b>"
+#: ../widgets/misc/e-search-bar.c:613
+msgid "_Next"
+msgstr "_�����"
 
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>����� �����������</b>"
+#: ../widgets/misc/e-search-bar.c:619
+msgid "Find the next occurrence of the phrase"
+msgstr "���� � ����� ������ � � ����"
 
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>������ ������</b>"
+#: ../widgets/misc/e-search-bar.c:629
+msgid "Mat_ch case"
+msgstr "��_� ���"
 
-#: ../widgets/misc/e-send-options.glade.h:9
-msgid ""
-"None\n"
-"Mail Receipt"
-msgstr ""
-"���\n"
-"��� �����"
+#: ../widgets/misc/e-search-bar.c:657
+msgid "Reached bottom of page, continued from top"
+msgstr "���� ����� � ���, �������� ���� ���"
 
-#: ../widgets/misc/e-send-options.glade.h:11
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
-msgstr ""
-"�����\n"
-"�����������\n"
-"�����������\n"
-"������\n"
-"��� ������\n"
-"�� �� �� ����"
-
-#: ../widgets/misc/e-send-options.glade.h:20
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"��������\n"
-"��\n"
-"�������\n"
-"��"
+#: ../widgets/misc/e-search-bar.c:679
+msgid "Reached top of page, continued from bottom"
+msgstr "���� ��� � ���, �������� ���� �����"
+
+#: ../widgets/misc/e-send-options.c:515
+msgid "When de_leted:"
+msgstr "��� _�������:"
+
+#: ../widgets/misc/e-send-options.ui.h:1
+msgid "A_uto-delete sent item"
+msgstr "_���-����� ���� ����"
+
+#: ../widgets/misc/e-send-options.ui.h:3
+msgid "Creat_e a sent item to track information"
+msgstr "_����� � ���� ���� � ���� ���������"
+
+#: ../widgets/misc/e-send-options.ui.h:4
+msgid "Deli_vered and opened"
+msgstr "_������� � �����"
+
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Delivery Options"
+msgstr "������� ������"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgid "For Your Eyes Only"
+msgstr "�� �� �� ����"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+msgid "Gene_ral Options"
+msgstr "_������ ������"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+msgid "Mail Receipt"
+msgstr "��� �����"
+
+#: ../widgets/misc/e-send-options.ui.h:14
+msgid "Proprietary"
+msgstr "�����������"
+
+#: ../widgets/misc/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "_����� ���������"
+
+#: ../widgets/misc/e-send-options.ui.h:17
+msgid "Return Notification"
+msgstr "����� �����������"
+
+#: ../widgets/misc/e-send-options.ui.h:20
+msgid "Sta_tus Tracking"
+msgstr "_������ ������"
+
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Standard"
+msgstr "�������"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+msgid "Status Tracking"
+msgstr "������ ������"
+
+#: ../widgets/misc/e-send-options.ui.h:23
+msgid "Top Secret"
+msgstr "��� ������"
 
-#: ../widgets/misc/e-send-options.glade.h:28
-msgid "_After:"
-msgstr "_����:"
+#: ../widgets/misc/e-send-options.ui.h:25
+msgid "When acce_pted:"
+msgstr "��� _��������:"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.ui.h:26
+msgid "When co_mpleted:"
+msgstr "��� _���������:"
+
+#: ../widgets/misc/e-send-options.ui.h:27
+msgid "When decli_ned:"
+msgstr "��� _�������:"
+
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
+msgid "Wi_thin"
+msgstr "_�����"
+
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_After"
+msgstr "_����"
+
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_�� ���������"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "_������������:"
 
-#. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "_���� ����� �������"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "_�������"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "_��� ��������� ���"
 
-#: ../widgets/misc/e-send-options.glade.h:36
-msgid "_Until:"
-msgstr "_�����:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "_Until"
+msgstr "_�����"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "_��� ����������"
 
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "_��� �����:"
 
-#: ../widgets/misc/e-signature-editor.c:130
-#: ../widgets/misc/e-signature-editor.c:489
+#: ../widgets/misc/e-signature-editor.c:133
+#: ../widgets/misc/e-signature-editor.c:549
 #: ../widgets/misc/e-signature-manager.c:349
 #: ../widgets/misc/e-signature-script-dialog.c:218
 msgid "Unnamed"
 msgstr "������"
 
-#: ../widgets/misc/e-signature-editor.c:207
+#: ../widgets/misc/e-signature-editor.c:210
 msgid "_Save and Close"
 msgstr "_��� � ����"
 
-#: ../widgets/misc/e-signature-editor.c:361
+#: ../widgets/misc/e-signature-editor.c:389
 msgid "Edit Signature"
 msgstr "���� �������"
 
-#: ../widgets/misc/e-signature-editor.c:376
+#: ../widgets/misc/e-signature-editor.c:404
 msgid "_Signature Name:"
 msgstr "_������� ���:"
 
@@ -17212,86 +21024,98 @@ msgstr "�� _������"
 
 #: ../widgets/misc/e-signature-script-dialog.c:266
 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."
+"The output of this script will be used as your\nsignature. The name you "
+"specify will be used\nfor display purposes only."
 msgstr ""
-"� ����� � ��� ������ ��� �� ��� �� ��\n"
-"�������. � ��� � ������� ��� �� ���\n"
-"�� ������ ������� ����."
+"� ����� � ��� ������ ��� �� ��� �� ��\n�������. � ��� � ������� ��� �� "
+"���\n�� ������ ������� ����."
+
+#: ../widgets/misc/e-signature-script-dialog.c:311
+msgid "S_cript:"
+msgstr "_������:"
 
 #: ../widgets/misc/e-signature-script-dialog.c:342
 msgid "Script file must be executable."
 msgstr "������ ��� ���� �� �����������."
 
-#: ../widgets/misc/e-url-entry.c:103
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "���� �� � �� � URL"
 
-#: ../widgets/misc/e-web-view.c:305
+#: ../widgets/misc/e-web-view.c:359
+msgid "_Copy Link Location"
+msgstr "_���� ���� �������"
+
+#: ../widgets/misc/e-web-view.c:361
 msgid "Copy the link to the clipboard"
 msgstr "���� � ���� � � �������"
 
-#: ../widgets/misc/e-web-view.c:315
+#: ../widgets/misc/e-web-view.c:369
+msgid "_Open Link in Browser"
+msgstr "_���� ���� �� �����"
+
+#: ../widgets/misc/e-web-view.c:371
 msgid "Open the link in a web browser"
 msgstr "���� � ���� �� � ��� �����"
 
-#: ../widgets/misc/e-web-view.c:323
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Copy Email Address"
 msgstr "_���� ���� �����"
 
-#: ../widgets/misc/e-web-view.c:325
-msgid "Copy the email address to the clipboard"
-msgstr "���� � ���� ����� � � �������"
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
+msgid "Select all text and images"
+msgstr "������ �� ����� � ������"
 
-#: ../widgets/misc/e-web-view.c:332
-msgid "Send a mail message to this address"
-msgstr "���� � ��� ����� � ��� �����"
-
-#: ../widgets/misc/e-web-view.c:576
-#, c-format
-msgid "Click to mail %s"
-msgstr "���� � ��� %s"
-
-#: ../widgets/misc/e-web-view.c:578 ../widgets/misc/e-web-view.c:580
-#: ../widgets/misc/e-web-view.c:582
 #, c-format
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 msgid "Click to call %s"
 msgstr "���� � ��� %s"
 
-#: ../widgets/misc/e-web-view.c:586
+#, fuzzy
+#: ../widgets/misc/e-web-view.c:846
+msgid "Click to hide/unhide addresses"
+msgstr "���� � ���/unhide �������"
+
 #, c-format
+#: ../widgets/misc/e-web-view.c:848
 msgid "Click to open %s"
 msgstr "���� � ���� %s"
 
-#: ../widgets/misc/ea-calendar-item.c:295
-#: ../widgets/misc/ea-calendar-item.c:301
+#: ../widgets/misc/ea-calendar-item.c:299
+#: ../widgets/misc/ea-calendar-item.c:308
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:303
 #, c-format
+#: ../widgets/misc/ea-calendar-item.c:311
 msgid "Calendar: from %s to %s"
 msgstr "�������: ���� %s � %s"
 
-#: ../widgets/misc/ea-calendar-item.c:338
+#: ../widgets/misc/ea-calendar-item.c:347
 msgid "evolution calendar item"
 msgstr "·�������� ������� ����"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "����� ����"
 
-#: ../widgets/table/e-cell-date-edit.c:296
+#: ../widgets/table/e-cell-date-edit.c:303
 msgid "Now"
 msgstr "��"
 
+#. Translators: "None" as a label of a button to unset date in a date table cell
 #: ../widgets/table/e-cell-date-edit.c:320
+msgctxt "table-date"
+msgid "None"
+msgstr "���"
+
+#: ../widgets/table/e-cell-date-edit.c:328
 msgid "OK"
 msgstr "���"
 
-#: ../widgets/table/e-cell-date-edit.c:846
 #, c-format
+#: ../widgets/table/e-cell-date-edit.c:872
 msgid "The time must be in the format: %s"
 msgstr "� ��� ���� �� �� � �����: %s"
 
@@ -17299,341 +21123,237 @@ msgstr "ð�‘ž ð�‘‘ð�‘²ð�‘¥ ð�‘¥ð�‘³ð�‘•ð�‘‘ ð�‘šð�‘° ð�‘¦ð�‘¯ ð�‘ž ð�‘“ð�‘¹ð�‘¥ð�
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "� ������ ���� ���� �� ������ 0 � 100, ��������"
 
-#: ../widgets/table/e-cell-pixbuf.c:360
-msgid "Selected Column"
-msgstr "�������� �����"
-
-#: ../widgets/table/e-cell-pixbuf.c:367
-msgid "Focused Column"
-msgstr "������ �����"
-
-#: ../widgets/table/e-cell-text.c:1788
-msgid "Strikeout Column"
-msgstr "������� �����"
-
-#: ../widgets/table/e-cell-text.c:1795
-msgid "Underline Column"
-msgstr "������� �����"
-
-#: ../widgets/table/e-cell-text.c:1802
-msgid "Bold Column"
-msgstr "���� �����"
-
-#: ../widgets/table/e-cell-text.c:1809
-msgid "Color Column"
-msgstr "���� �����"
-
-#: ../widgets/table/e-table-click-to-add.c:576
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "���� � ��"
 
-#: ../widgets/table/e-table-config.c:152
-msgid "State"
-msgstr "����"
-
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(�������)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(��������)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:388
 msgid "Not sorted"
 msgstr "��� �����"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:429
 msgid "No grouping"
 msgstr "�� ������"
 
-#: ../widgets/table/e-table-config.c:642
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config.c:647
+#: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "�� �����"
 
-#: ../widgets/table/e-table-config.c:663
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "�������� �����"
 
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1577
+#: ../widgets/table/e-table-config.ui.h:1
+msgid "A_vailable Fields:"
+msgstr "_�������� �����:"
+
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "�������"
 
-#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
 msgstr "��� ��"
 
-#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-config.ui.h:4
 msgid "Clear _All"
 msgstr "��� _��"
 
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1577
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "��������"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "���� ����� ��"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.ui.h:9
 msgid "Move _Down"
 msgstr "��� _���"
 
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.ui.h:10
 msgid "Move _Up"
 msgstr "��� _��"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.ui.h:12
 msgid "Show _field in View"
 msgstr "�� _���� �� ��"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:13
+msgid "Show field i_n View"
+msgstr "�� ���� _�� ��"
+
+#: ../widgets/table/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "�� ���� �� _��"
 
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "���"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "��� ����� ��"
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.ui.h:17
 msgid "Then By"
 msgstr "��� ��"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
 msgstr "_����� ���..."
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
 msgstr "_���� ��..."
 
-#: ../widgets/table/e-table-config.glade.h:22
+#: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "_�� ���� �� ��"
 
-#: ../widgets/table/e-table-config.glade.h:23
+#: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
 msgstr "_�� ��� ����� �� ���:"
 
-#: ../widgets/table/e-table-config.glade.h:24
+#: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
 msgstr "_���..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
-msgid "Add a column..."
-msgstr "�� � �����..."
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
+msgid "Add a Column"
+msgstr "�� � �����"
 
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
+"To add a column to your table, drag it into\nthe location in which you want "
+"it to appear."
 msgstr ""
-"� �� � ����� � �� �����, ���� �� ����\n"
-"� ������� �� ��� � ���� �� � ���."
-
-#: ../widgets/table/e-table-group-container.c:341
+"� �� � ����� � �� �����, ���� �� ����\n� ������� �� ��� � ���� �� � ���."
+
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
 #, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d ����)"
-msgstr[1] "%s : %s (%d �����)"
-
-#: ../widgets/table/e-table-group-container.c:347
+#: ../widgets/table/e-table-group-container.c:351
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s: %s (%d ����)"
+msgstr[1] "%s: %s (%d �����)"
+
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
 #, c-format
+#: ../widgets/table/e-table-group-container.c:363
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d ����)"
 msgstr[1] "%s (%d �����)"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
-msgid "Alternating Row Colors"
-msgstr "��������� �� �����"
-
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
-msgid "Horizontal Draw Grid"
-msgstr "���������� ��� ����"
-
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
-#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
-msgid "Vertical Draw Grid"
-msgstr "������� ��� ����"
-
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
-msgid "Draw focus"
-msgstr "��� �����"
-
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
-msgid "Cursor mode"
-msgstr "���� ���"
-
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
-msgid "Selection model"
-msgstr "�������� �����"
-
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
-msgid "Length Threshold"
-msgstr "���� �������"
-
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
-#: ../widgets/table/e-tree.c:3366
-msgid "Uniform row height"
-msgstr "������ �� ���"
-
-#: ../widgets/table/e-table-group-container.c:980
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "������"
-
-#: ../widgets/table/e-table-header-item.c:1447
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
 msgstr "�������� ������ ��"
 
-#: ../widgets/table/e-table-header-item.c:1467
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Sort _Ascending"
 msgstr "��� _�������"
 
-#: ../widgets/table/e-table-header-item.c:1468
+#: ../widgets/table/e-table-header-item.c:1565
 msgid "Sort _Descending"
 msgstr "��� _��������"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1568
+msgid "_Unsort"
+msgstr "_Unsort"
+
+#: ../widgets/table/e-table-header-item.c:1571
 msgid "Group By This _Field"
 msgstr "���� �� ��� _����"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Group By _Box"
 msgstr "���� �� _����"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Remove This _Column"
 msgstr "����� ��� _�����"
 
-#: ../widgets/table/e-table-header-item.c:1537
-msgid "_Sort By"
-msgstr "_��� ��"
-
-#. Custom
-#: ../widgets/table/e-table-header-item.c:1555
-msgid "_Custom"
-msgstr "_������"
+#: ../widgets/table/e-table-header-item.c:1581
+msgid "Add a C_olumn..."
+msgstr "�� � _�����..."
 
-#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
-msgid "Table header"
-msgstr "����� ����"
+#: ../widgets/table/e-table-header-item.c:1585
+msgid "A_lignment"
+msgstr "_��������"
 
-#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
-msgid "Table model"
-msgstr "����� �����"
+#: ../widgets/table/e-table-header-item.c:1588
+msgid "B_est Fit"
+msgstr "_���� ���"
 
-#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
-msgid "Cursor row"
-msgstr "���� ��"
+#: ../widgets/table/e-table-header-item.c:1591
+msgid "Format Column_s..."
+msgstr "����� _������..."
 
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "��� ����"
+#: ../widgets/table/e-table-header-item.c:1595
+msgid "Custo_mize Current View..."
+msgstr "_�������� ������ ��..."
 
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
-#: ../widgets/table/e-tree.c:3373
-msgid "Always search"
-msgstr "����� ���"
-
-#: ../widgets/table/e-table.c:3337
-msgid "Use click to add"
-msgstr "�� ���� � ��"
-
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "���"
-
-#: ../widgets/table/e-tree.c:3379
-msgid "Retro Look"
-msgstr "����� ���"
+#: ../widgets/table/e-table-header-item.c:1654
+msgid "_Sort By"
+msgstr "_��� ��"
 
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "�����"
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1672
+msgid "_Custom"
+msgstr "_������"
 
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "����� � ����"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "����"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "����� ������ ��� ���"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "�����"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "����� � ���"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "�������"
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
+msgid "expands the row in the ETree containing this cell"
+msgstr "�������� � �� �� � ETree �������� ��� ���"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "������"
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
+msgid "collapses the row in the ETree containing this cell"
+msgstr "�������� � �� �� � ETree �������� ��� ���"
 
-#: ../widgets/table/gal-a11y-e-cell.c:120
+#: ../widgets/table/gal-a11y-e-cell.c:119
 msgid "Table Cell"
 msgstr "����� ���"
 
@@ -17641,107 +21361,15 @@ msgstr "����� ���"
 msgid "click"
 msgstr "����"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+#: ../widgets/table/gal-a11y-e-table-column-header.c:154
 msgid "sort"
 msgstr "���"
 
-#: ../widgets/text/e-text.c:2719
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "������ ��"
 
-#: ../widgets/text/e-text.c:2731
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "����� ������"
 
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
-msgid "Event Processor"
-msgstr "����� �������"
-
-#: ../widgets/text/e-text.c:3555 ../widgets/text/e-text.c:3556
-msgid "Text"
-msgstr "�����"
-
-#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
-msgid "Bold"
-msgstr "����"
-
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
-msgid "Strikeout"
-msgstr "�������"
-
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
-msgid "Anchor"
-msgstr "����"
-
-#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
-msgid "Justification"
-msgstr "������������"
-
-#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
-msgid "Clip Width"
-msgstr "���� ����"
-
-#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
-msgid "Clip Height"
-msgstr "���� ���"
-
-#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
-msgid "Clip"
-msgstr "����"
-
-#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
-msgid "Fill clip rectangle"
-msgstr "��� ���� ���������"
-
-#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
-msgid "X Offset"
-msgstr "��� �����"
-
-#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
-msgid "Y Offset"
-msgstr "�� �����"
-
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
-msgid "Text width"
-msgstr "����� ����"
-
-#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
-msgid "Text height"
-msgstr "����� ���"
-
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
-msgid "Line wrap"
-msgstr "��� ���"
-
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
-msgid "Break characters"
-msgstr "���� �������"
-
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
-msgid "Max lines"
-msgstr "���� ����"
-
-#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
-msgid "Draw borders"
-msgstr "��� �����"
-
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
-msgid "Draw background"
-msgstr "��� ��������"
-
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
-msgid "Draw button"
-msgstr "��� �����"
-
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
-msgid "Cursor position"
-msgstr "���� �������"
-
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
-msgid "IM Context"
-msgstr "�� ��������"
-
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
-msgid "Handle Popup"
-msgstr "������ �����"
diff --git a/po/en_GB.po b/po/en_GB.po
index c781b90ee4..0264e16e9b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,19 +2,20 @@
 # Robert Brady <rwb197@zepler.org>, 2000.
 # Gareth Owen <gowen72@yahoo.com>, David Lodge <dave@cirt.net>, 2004.
 # Bruce Cowan <bcowan@fastmail.co.uk>, 2009, 2010.
-#: ../shell/main.c:479
+# Philip Withnall <philip@tecnocode.co.uk>, 2010.
+#: ../shell/main.c:456
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-17 22:37+0000\n"
+"POT-Creation-Date: 2010-04-13 08:49+0100\n"
 "PO-Revision-Date: 2010-03-17 22:43+0100\n"
-"Last-Translator: Bruce Cowan <bcowan@fastmail.co.uk>\n"
+"Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n"
 "Language-Team: British English <en@li.org>\n"
-"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.5.2\n"
 
@@ -93,7 +94,7 @@ msgstr "Failed to authenticate with LDAP server."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1267
 msgid "Failed to delete contact"
 msgstr "Failed to delete contact"
 
@@ -206,7 +207,7 @@ msgid ""
 msgstr ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -229,16 +230,6 @@ msgstr "_Resize"
 msgid "_Use as it is"
 msgstr "_Use as it is"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Default Sync Address:"
@@ -255,7 +246,7 @@ msgstr "Could not read pilot's Address application block"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2005
 msgid "Anniversary"
 msgstr "Anniversary"
 
@@ -266,37 +257,39 @@ msgstr "Anniversary"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2004 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:107
 msgid "Birthday"
 msgstr "Birthday"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegories…"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "Calendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
 msgid "Contact"
 msgstr "Contact"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2567
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
@@ -305,221 +298,189 @@ msgstr "Contact Editor"
 msgid "Email"
 msgstr "E-mail"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "Free/Busy:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "Full _Name…"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "Home"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "Home Page:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Image"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "Instant Messaging"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Job"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Mailing Address"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "Nic_kname:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Notes"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1711
 msgid "Other"
 msgstr "Other"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "Telephone"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "Video Chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Web Addresses"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "Web Log:"
-
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Work"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "_Address:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "_Anniversary:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "_Assistant:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "_Birthday:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+msgid "_Blog:"
+msgstr "_Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 #: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "_City:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "_Company:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "_Country:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "_Department:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "_File under:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "_Free/Busy:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "_Home Page:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "_Manager:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "_Office:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "_Profession:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "_Spouse:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "_State/Province/County:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Title:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "_Video Chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "_Wants to receive HTML mail"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "_Web Log:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Where:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/Postal Code:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Name"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "Editable"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -561,7 +522,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
@@ -573,45 +534,21 @@ msgstr "Error modifying contact"
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Source Book"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "Target Book"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "Is New Contact"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Writable Fields"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Required Fields"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Changed"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2562
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Contact Editor — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2970
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2971
 msgid "_No image"
 msgstr "_No image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3244
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -619,56 +556,46 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3248
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3255
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3281
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' is empty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3295
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "_Edit Full"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "_Full name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "_Select Address Book"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Shell"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "The EShell singleton"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr."
@@ -735,7 +662,7 @@ msgid "_Suffix:"
 msgstr "_Suffix:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:674
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
@@ -752,7 +679,7 @@ msgid "_List name:"
 msgstr "_List name:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:155
 msgid "_Select..."
 msgstr "_Select…"
 
@@ -760,39 +687,27 @@ msgstr "_Select…"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Type an e-mail address or drag a contact into the list below:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:767
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:915
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1331
 msgid "_Members"
 msgstr "_Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1170
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1184
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1198
 msgid "Error removing list"
 msgstr "Error removing list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Book"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "Is New List"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Changed Contact:"
@@ -811,7 +726,7 @@ msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
 msgstr ""
-"The name or e-mail of this contact already exists in this folder.  Would you "
+"The name or e-mail address of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
@@ -831,31 +746,31 @@ msgstr ""
 "in this folder.  Would you like to add it anyway?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "_Merge"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 msgid "Merge Contact"
 msgstr "Merge Contact"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Any field contains"
 msgstr "Any field contains"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "E-mail begins with"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "Name contains"
 
@@ -874,91 +789,62 @@ msgstr[1] "%d contacts"
 msgid "Error getting book view"
 msgstr "Error getting book view"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "Query"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
 msgstr "Search Interrupted"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Model"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cut selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copy selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Paste contacts from the clipboard"
 msgstr "Paste contacts from the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "Delete selected contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 msgid "Select all visible contacts"
 msgstr "Select all visible contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Shell View"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Source"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Are you sure you want to delete these contact lists?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1289
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Are you sure you want to delete this contact list?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1293
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Are you sure you want to delete this contact list (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Are you sure you want to delete these contacts?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 msgid "Are you sure you want to delete this contact?"
 msgstr "Are you sure you want to delete this contact?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Are you sure you want to delete this contact (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1462
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -967,11 +853,11 @@ msgstr ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1467
 msgid "_Don't Display"
 msgstr "_Don't Display"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 msgid "Display _All Contacts"
 msgstr "Display _All Contacts"
 
@@ -1131,7 +1017,6 @@ msgid "Telex"
 msgstr "Telex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "Title"
 
@@ -1143,59 +1028,7 @@ msgstr "Unit"
 msgid "Web Site"
 msgstr "Website"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Width"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Height"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "Has Focus"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Field"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Field Name"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Text Model"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Max field name length"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Column Width"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1205,7 +1038,7 @@ msgstr ""
 "\n"
 "Searching for the Contacts…"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1219,7 +1052,7 @@ msgstr ""
 "\n"
 "or double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1233,7 +1066,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1243,7 +1076,7 @@ msgstr ""
 "\n"
 "Search for the Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1253,10 +1086,6 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Adaptor"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Work E-mail"
@@ -1266,18 +1095,10 @@ msgid "Home Email"
 msgstr "Home E-mail"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "Other E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Selected"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "Has Cursor"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1320,17 +1141,17 @@ msgid "Copy _Email Address"
 msgstr "Copy _E-mail Address"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:381
 msgid "Copy the email address to the clipboard"
 msgstr "Copy the e-mail address to the clipboard"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:386
 msgid "_Send New Message To..."
 msgstr "_Send New Message To…"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:388
 msgid "Send a mail message to this address"
 msgstr "Send a mail message to this address"
 
@@ -1369,19 +1190,18 @@ msgstr "Video Chat"
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:495
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "Calendar"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:116
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Free/Busy"
@@ -1409,21 +1229,19 @@ msgid "Web Log"
 msgstr "Web Log"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
+#: ../capplet/settings/mail-capplet-shell.c:346
 #: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/addressbook/e-book-shell-migrate.c:134
 #: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Personal"
@@ -1440,8 +1258,8 @@ msgstr "Home page"
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
@@ -1498,11 +1316,11 @@ msgstr "Protocol not supported"
 #. To Translators: This is task status
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2659
 msgid "Canceled"
 msgstr "Cancelled"
 
@@ -1632,27 +1450,27 @@ msgstr "This query did not complete successfully."
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "Select Address Book"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "list"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
@@ -1664,7 +1482,7 @@ msgstr "Card View"
 #: ../addressbook/importers/evolution-ldif-importer.c:516
 #: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importing…"
 
@@ -1785,19 +1603,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accessing LDAP Server anonymously"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "Failed to authenticate.\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Enter password for %s (user %s)"
 
 #: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
+#: ../plugins/caldav/caldav-browse-server.c:808
 #: ../plugins/google-account-setup/google-source.c:440
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
@@ -1943,46 +1761,42 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "Are you sure you want to send the task without a summary?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "Calendar repository is offline."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Cannot create a new event"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Cannot save event"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Delete calendar '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Delete memo list '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Delete task list '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "Do _not Send"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Download in progress. Do you want to save the appointment?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Download in progress. Do you want to save the task?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "Editor could not be loaded."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -1990,30 +1804,25 @@ msgstr ""
 "E-mail invitations will be sent to all participants and allow them to accept "
 "this task."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-mail invitations will be sent to all participants and allow them to reply."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Error loading calendar"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Error loading memo list"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Error loading task list"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "Error on '{0}'"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2021,7 +1830,7 @@ msgstr ""
 "If you do not send a cancellation notice, the other participants may not "
 "know the meeting is cancelled."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2029,7 +1838,7 @@ msgstr ""
 "If you do not send a cancellation notice, the other participants may not "
 "know the memo has been deleted."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2037,11 +1846,7 @@ msgstr ""
 "If you do not send a cancellation notice, the other participants may not "
 "know the task has been deleted."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "No response from the server."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2049,7 +1854,7 @@ msgstr ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2057,7 +1862,7 @@ msgstr ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2065,7 +1870,7 @@ msgstr ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2073,98 +1878,94 @@ msgstr ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr "Some features may not work properly with your current server."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "The Evolution calendar has quit unexpectedly."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "The Evolution calendars have quit unexpectedly."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "The Evolution memo has quit unexpectedly."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "The Evolution tasks have quit unexpectedly."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:55
 msgid "The calendar is not marked for offline usage."
 msgstr "The calendar is not marked for offline usage."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:56
 msgid "The memo list is not marked for offline usage."
-msgstr "The memo list is not marked for offline usage"
+msgstr "The memo list is not marked for offline usage."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "The task list is not marked for offline usage."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "This calendar will be removed permanently."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "This memo list will be removed permanently."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "This task list will be removed permanently."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "Unable to load the calendar"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Would you like to save your changes to this appointment?"
 
 #  calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Would you like to save your changes to this meeting?"
 
 #  calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "Would you like to save your changes to this memo?"
 
 #  calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "Would you like to save your changes to this task?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Would you like to send a cancellation notice for this memo?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Would you like to send all the participants a cancellation notice?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Would you like to send meeting invitations to participants?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "Would you like to send this task to participants?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Would you like to send updated meeting information to participants?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
 msgstr "Would you like to send updated task information to participants?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2174,64 +1975,60 @@ msgstr ""
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:72
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "You have changed this appointment, but not yet saved it."
 
 #  calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "You have changed this meeting, but not yet saved it."
 
 #  calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "You have changed this task, but not yet saved it."
 
 #  calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "You have made changes to this memo, but not yet saved them."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Your calendars will not be available until Evolution is restarted."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Your memos will not be available until Evolution is restarted."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Your tasks will not be available until Evolution is restarted."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Discard Changes"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "_Save"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Save Changes"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Send"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Send Notice"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Split Multi-Day Events:"
@@ -2286,7 +2083,7 @@ msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "Start time"
 
@@ -2304,7 +2101,7 @@ msgstr "Dismiss _All"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1573
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 #: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../plugins/itip-formatter/itip-view.c:1027
 msgid "Location:"
 msgstr "Location:"
 
@@ -2317,11 +2114,11 @@ msgid "_Dismiss"
 msgstr "_Dismiss"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:1015
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1625
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Edit"
@@ -2331,7 +2128,7 @@ msgid "_Snooze"
 msgstr "_Snooze"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 #: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:332
@@ -2342,8 +2139,9 @@ msgstr "hours"
 msgid "location of appointment"
 msgstr "location of appointment"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
 #: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:331
@@ -2369,13 +2167,13 @@ msgstr "No location information available."
 msgid "You have %d alarms"
 msgstr "You have %d alarms"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Warning"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2387,7 +2185,7 @@ msgstr ""
 "configured to send an e-mail.  Evolution will display\n"
 "a normal reminder dialogue box instead."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2404,7 +2202,7 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
@@ -2446,7 +2244,7 @@ msgid "Alarm programs"
 msgstr "Alarm programs"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Amount of time in seconds the error should be shown on the status bar."
 
@@ -2671,15 +2469,15 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the memo preview pane when oriented vertically."
-msgstr "Position of the memo preview pane when orientated vertically."
+msgstr "Position of the memo preview pane when oriented vertically."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented horizontally."
-msgstr "Position of the task preview pane when orientated horizontally."
+msgstr "Position of the task preview pane when oriented horizontally."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Position of the task preview pane when oriented vertically."
-msgstr "Position of the task preview pane when orientated vertically."
+msgstr "Position of the task preview pane when oriented vertically."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
@@ -2922,7 +2720,7 @@ msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Whether or not to use the notification tray for display alarms."
+msgstr "Whether to use the notification tray for display alarms."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when deleting an appointment or task."
@@ -3066,7 +2864,7 @@ msgid "Classification"
 msgstr "Classification"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3110,19 +2908,19 @@ msgid "Organizer"
 msgstr "Organiser"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Private"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Public"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:299
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Recurrence"
@@ -3205,7 +3003,7 @@ msgstr "Custom alarm sound"
 msgid "Mes_sage:"
 msgstr "Mes_sage:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:77
 msgid "Options"
 msgstr "Options"
 
@@ -3252,11 +3050,12 @@ msgstr "day(s)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
 #: ../plugins/google-account-setup/google-contacts-source.c:333
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "days"
 
@@ -3264,19 +3063,20 @@ msgstr "days"
 msgid "end of appointment"
 msgstr "end of appointment"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "extra times every"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "hour(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "minute(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "start of appointment"
 
@@ -3304,7 +3104,7 @@ msgstr "None"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Select…"
 
@@ -3313,12 +3113,12 @@ msgid "Selected Calendars for Alarms"
 msgstr "Selected Calendars for Alarms"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "Time and date:"
+msgid "Ti_me and date:"
+msgstr "Ti_me and date:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "Date only:"
+msgid "_Date only:"
+msgstr "_Date only:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3349,12 +3149,12 @@ msgstr "30 minutes"
 msgid "60 minutes"
 msgstr "60 minutes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "Alerts"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "Date/Time Format"
@@ -3380,7 +3180,7 @@ msgid "Display alarms in _notification area only"
 msgstr "Display alarms in _notification area only"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Friday"
@@ -3389,9 +3189,9 @@ msgstr "Friday"
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/dialogs/calendar-setup.c:378
 #: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../mail/em-folder-properties.c:278 ../mail/mail-config.ui.h:54
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2660
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "General"
@@ -3406,7 +3206,7 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Monday"
@@ -3420,182 +3220,194 @@ msgid "None"
 msgstr "None"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "S_un"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Saturday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Sc_roll Month View by a week"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Se_cond zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Select the calendars for alarm notification"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "Sh_ow a reminder"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "Show a _reminder"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "Show week _numbers in date navigator"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Show week n_umber in Day and Work Week View"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Sunday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "T_asks due today:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "T_hu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Task List"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "Template:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Thursday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Time"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "Time format:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Use s_ystem time zone"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "Wee_k starts on:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Work Week"
 msgstr "Work Week"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "Work days:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 hour (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 hour"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Ask for confirmation when deleting items"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Compress weekends in month view"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "_Day begins:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "_Fri"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Hide completed tasks after"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "_Mon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "_Overdue tasks:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "_Sat"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "_Show appointment end times in week and month view"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "_Time divisions:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "_Tue"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "_Wed"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "before every anniversary/birthday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "before every appointment"
 
@@ -3604,12 +3416,12 @@ msgid "Type:"
 msgstr "Type:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:147
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3709,252 +3521,232 @@ msgstr "%s  You have made no changes, update the editor?"
 msgid "Validation error: %s"
 msgstr "Validation error: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " to "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (Completed "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "Completed "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (Due "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "Due "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:237
 msgid "Could not save attachments"
 msgstr "Could not save attachments"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:505
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "Meeting — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Assigned Task — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "Task — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:643
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "No Summary"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "Keep original item?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "Click here to close the current window"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1464
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1471
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "Click here to view help available"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1513
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "Click here to save the current window"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1632
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_File"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Help"
 msgstr "_Help"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1037
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1674
 msgid "_View"
 msgstr "_View"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "_Attachment…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
 msgstr "Click here to attach a file"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "_Private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "R_ole Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "Toggles whether the Role field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Toggles whether the RSVP field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "_Status Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "Toggles whether the Status field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "_Type Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Toggles whether the Attendee Type is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "Recent _Documents"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:477
 msgid "Attach"
 msgstr "Attach"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "Save"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2958
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Changes made to this item may be discarded if an update arrives"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "attachment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:2988
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
@@ -3974,6 +3766,10 @@ msgstr "Destination is read only"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Delete this item from all other recipient's mailboxes?"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "_Retract comment"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "The event could not be deleted due to a corba error"
@@ -4034,59 +3830,59 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Alarms"
 msgstr "_Alarms"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Click here to set or unset alarms for this event"
 msgstr "Click here to set or unset alarms for this event"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Recurrence"
 msgstr "_Recurrence"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Make this a recurring event"
 msgstr "Make this a recurring event"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:219
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "Send Options"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:221
 #: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "Insert advanced send options"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:229
 msgid "All _Day Event"
 msgstr "All _Day Event"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:231
 msgid "Toggles whether to have All Day Event"
 msgstr "Toggles whether to have All Day Event"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "Show Time as _Busy"
 msgstr "Show Time as _Busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Toggles whether to show time as busy"
 msgstr "Toggles whether to show time as busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:248
 msgid "_Free/Busy"
 msgstr "_Free/Busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "Query free / busy information for the attendees"
 msgstr "Query free / busy information for the attendees"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "Appoint_ment"
 
@@ -4099,7 +3895,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Event cannot be fully edited, because you are not the organiser"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "This event has alarms"
 
@@ -4160,7 +3956,7 @@ msgstr "An organiser is required."
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
@@ -4171,40 +3967,40 @@ msgstr "Unable to open the calendar '%s'."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:915
 #: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "You are acting on behalf of %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d day before appointment"
 msgstr[1] "%d days before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hour before appointment"
 msgstr[1] "%d hours before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2949
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minute before appointment"
 msgstr[1] "%d minutes before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "Customise"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2964
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "None"
@@ -4222,8 +4018,10 @@ msgid "15 minutes before appointment"
 msgstr "15 minutes before appointment"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "Attendee_s…"
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "Atte_ndees…"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
 #: ../calendar/gui/e-meeting-list-view.c:148
@@ -4238,28 +4036,26 @@ msgstr "Custom Alarm:"
 msgid "Event Description"
 msgstr "Event Description"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "Su_mmary:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Description:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_Location:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_Summary:"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "_Time:"
@@ -4274,7 +4070,7 @@ msgstr "for"
 msgid "until"
 msgstr "until"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2576
 msgid "Memo"
 msgstr "Memo"
 
@@ -4286,15 +4082,15 @@ msgstr "Memo cannot be edited, because the selected memo list is read only"
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Memo cannot be fully edited, because you are not the organiser"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:876
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Unable to open memos in '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1043 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:78
 msgid "To"
 msgstr "To"
 
@@ -4303,6 +4099,11 @@ msgstr "To"
 msgid "Sta_rt date:"
 msgstr "Sta_rt date:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "Su_mmary:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "T_o:"
@@ -4313,57 +4114,57 @@ msgstr "T_o:"
 msgid "_Group:"
 msgstr "_Group:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "You are modifying a recurring event. What would you like to modify?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "You are delegating a recurring event. What would you like to delegate?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "You are modifying a recurring task. What would you like to modify?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "You are modifying a recurring memo. What would you like to modify?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "This Instance Only"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "This and Prior Instances"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "This and Future Instances"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "All Instances"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "End time of the recurrence was before event's start"
 
 #. 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:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "on"
 
@@ -4371,7 +4172,7 @@ msgstr "on"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "first"
 
@@ -4380,7 +4181,7 @@ msgstr "first"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "second"
 
@@ -4388,7 +4189,7 @@ msgstr "second"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "third"
 
@@ -4396,7 +4197,7 @@ msgstr "third"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "fourth"
 
@@ -4404,7 +4205,7 @@ msgstr "fourth"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "fifth"
 
@@ -4412,13 +4213,13 @@ msgstr "fifth"
 #. * (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:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "last"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Other Date"
 
@@ -4426,7 +4227,7 @@ msgstr "Other Date"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1st to 10th"
 
@@ -4434,7 +4235,7 @@ msgstr "1st to 10th"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11th to 20th"
 
@@ -4442,45 +4243,45 @@ msgstr "11th to 20th"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "21st to 31st"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "day"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "on the"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "Add exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "Could not get a selection to modify."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "Modify exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "Could not get a selection to delete."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "Date/Time"
 
@@ -4492,7 +4293,7 @@ msgstr "Every"
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:85
 msgid "Preview"
 msgstr "Preview"
 
@@ -4516,11 +4317,11 @@ msgstr "week(s)"
 msgid "year(s)"
 msgstr "year(s)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "Send my alarms with this event"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "Notify new attendees _only"
 
@@ -4529,66 +4330,66 @@ msgstr "Notify new attendees _only"
 msgid "Completed date is wrong"
 msgstr "Completed date is wrong"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "Web Page"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2656 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Completed"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1120 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "High"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2653
 msgid "In Progress"
 msgstr "In Progress"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1118 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Low"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1119
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "Normal"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2650 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Not Started"
 
@@ -4604,7 +4405,7 @@ msgstr "Stat_us:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1759
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4614,7 +4415,7 @@ msgstr "Status"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "Undefined"
@@ -4624,7 +4425,7 @@ msgid "_Date completed:"
 msgstr "_Date completed:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "_Priority:"
 
@@ -4645,11 +4446,11 @@ msgstr "Click to change or view the status details of the task"
 msgid "_Send Options"
 msgstr "_Send Options"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "_Task"
 msgstr "_Task"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:325
 msgid "Task Details"
 msgstr "Task Details"
 
@@ -4675,10 +4476,6 @@ msgstr "Due date is wrong"
 msgid "Unable to open tasks in '%s'."
 msgstr "Unable to open tasks in '%s'."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "Atte_ndees…"
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Categor_ies…"
@@ -4767,46 +4564,46 @@ msgstr "%s at %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:191 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "Untitled"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:197
 msgid "Categories:"
 msgstr "Categories:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Summary:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:258
 msgid "Start Date:"
 msgstr "Start Date:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "Due Date:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-cal-component-preview.c:284
 #: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../plugins/itip-formatter/itip-view.c:1058
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "Priority:"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-cal-component-preview.c:336
 #: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Description:"
 msgstr "Description:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:367
 msgid "Web Page:"
 msgstr "Web Page:"
 
@@ -4833,16 +4630,16 @@ msgid "Start Date"
 msgstr "Start Date"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "Free"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "Busy"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4853,63 +4650,49 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "None"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Yes"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "No"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "Default Client"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Shell Settings"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Application-wide settings"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:976
+#: ../plugins/itip-formatter/itip-formatter.c:450
+#: ../plugins/itip-formatter/itip-formatter.c:2327
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Assigned"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
@@ -4953,90 +4736,90 @@ msgstr "Start date"
 msgid "Type"
 msgstr "Type"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:404
 msgid "Cut selected events to the clipboard"
 msgstr "Cut selected events to the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:410
 msgid "Copy selected events to the clipboard"
 msgstr "Copy selected events to the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:416
 msgid "Paste events from the clipboard"
 msgstr "Paste events from the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Delete selected events"
 msgstr "Delete selected events"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
 msgid "Updating objects"
 msgstr "Updating objects"
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1706
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2315
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1707
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2321
 msgid "Declined"
 msgstr "Declined"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1708
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1709
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2324
 msgid "Delegated"
 msgstr "Delegated"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1710
 msgid "Needs action"
 msgstr "Needs action"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organiser: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1856 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organiser: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/print.c:2608
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1903
 #, c-format
 msgid "Time: %s %s"
 msgstr "Time: %s %s"
@@ -5079,8 +4862,8 @@ msgstr "Show the second time zone"
 #. 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:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:865 ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5090,10 +4873,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/e-day-view-top-item.c:869 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:913
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5102,27 +4885,27 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../calendar/gui/e-day-view-top-item.c:873 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:949
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2609
 #, c-format
 msgid "Week %d"
 msgstr "Week %d"
@@ -5219,11 +5002,11 @@ msgstr "iCalendar Error"
 
 #: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
 #: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "An unknown person"
 
@@ -5237,13 +5020,13 @@ msgstr ""
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../plugins/itip-formatter/itip-formatter.c:2302
 msgctxt "cal-itip"
 msgid "None"
 msgstr "None"
 
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
@@ -5463,7 +5246,7 @@ msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
 #: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Attendee status can not be updated because the item no longer exists"
 
@@ -5517,8 +5300,8 @@ msgid "Send Latest Information"
 msgstr "Send Latest Information"
 
 #: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../modules/mail/e-mail-shell-view-actions.c:970
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -5567,56 +5350,56 @@ msgid "Resources"
 msgstr "Resources"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Group"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Resource"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Room"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Chair"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Required Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "Needs Action"
 
@@ -5625,14 +5408,14 @@ msgstr "Needs Action"
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "In Process"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -5641,7 +5424,7 @@ msgstr "%A, %d %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5651,67 +5434,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "Out of Office"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "No Information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "A_ttendees…"
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "_Required people"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "_End time:"
 
@@ -5740,44 +5519,46 @@ msgid "Member"
 msgstr "Member"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../modules/calendar/e-cal-shell-content.c:461
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "Memos"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
 msgid "* No Summary *"
 msgstr "* No Summary *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
 msgid "Start: "
 msgstr "Start: "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
 msgid "Due: "
 msgstr "Due: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:709
 msgid "Cut selected memos to the clipboard"
 msgstr "Cut selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:715
 msgid "Copy selected memos to the clipboard"
 msgstr "Copy selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:721
 msgid "Paste memos from the clipboard"
 msgstr "Paste memos from the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:725
+#: ../calendar/gui/e-memo-table.c:727
 #: ../modules/calendar/e-memo-shell-view-actions.c:556
 msgid "Delete selected memos"
 msgstr "Delete selected memos"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Select all visible memos"
 msgstr "Select all visible memos"
 
@@ -5785,93 +5566,58 @@ msgstr "Select all visible memos"
 msgid "Click to add a memo"
 msgstr "Click to add a memo"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../modules/calendar/e-cal-shell-content.c:423
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Tasks"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:932
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cut selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:938
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copy selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:944
 msgid "Paste tasks from the clipboard"
 msgstr "Paste tasks from the clipboard"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "Delete selected tasks"
 msgstr "Delete selected tasks"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:956
 msgid "Select all visible tasks"
 msgstr "Select all visible tasks"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Select Timezone"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -5900,7 +5646,7 @@ msgstr "Calendar Event: It has no summary."
 msgid "calendar view event"
 msgstr "calendar view event"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:541
 msgid "Grab Focus"
 msgstr "Grab Focus"
 
@@ -5929,7 +5675,7 @@ msgstr "Go to Date"
 msgid "a table to view and select the current time range"
 msgstr "a table to view and select the current time range"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5938,14 +5684,14 @@ msgstr[1] "It has %d events."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 msgid "It has no events."
 msgstr "It has no events."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Work Week View: %s. %s"
@@ -5953,16 +5699,16 @@ msgstr "Work Week View: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Day View: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "calendar view for a work week"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "calendar view for one or more days"
 
@@ -5973,16 +5719,16 @@ msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:909
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -5990,10 +5736,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -6005,25 +5751,25 @@ msgstr "Jump button"
 msgid "Click here, you can find more events."
 msgstr "Click here, you can find more events."
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Month View: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Week View: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:188
 msgid "calendar view for a month"
 msgstr "calendar view for a month"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:190
 msgid "calendar view for one or more weeks"
 msgstr "calendar view for one or more weeks"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2242
 msgid "Purging"
 msgstr "Purging"
 
@@ -6076,39 +5822,40 @@ msgid "Select Date"
 msgstr "Select Date"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "September"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "Select _Today"
+msgstr "Select _Today"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_Select Today"
+msgid "September"
+msgstr "September"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Event information"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Task information"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "Calendar information"
 
@@ -6116,7 +5863,7 @@ msgstr "Calendar information"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Accepted"
@@ -6125,7 +5872,7 @@ msgstr "Accepted"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
@@ -6137,7 +5884,7 @@ msgstr "Tentatively Accepted"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declined"
@@ -6146,7 +5893,7 @@ msgstr "Declined"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegated"
@@ -6154,7 +5901,7 @@ msgstr "Delegated"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Updated"
@@ -6162,7 +5909,7 @@ msgstr "Updated"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel"
@@ -6170,7 +5917,7 @@ msgstr "Cancel"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Refresh"
@@ -6178,29 +5925,29 @@ msgstr "Refresh"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Unable to book a resource, the new event collides with some other."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "Unable to book a resource, error: "
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
@@ -6356,49 +6103,74 @@ msgstr "Fr"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2564
+#. Translators: This is part of "START to END" text, where START and END are date/times
+#: ../calendar/gui/print.c:2419
+msgid " to "
+msgstr " to "
+
+#. Translators: This is part of "START to END (Completed COMPLETED)", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2425
+msgid " (Completed "
+msgstr " (Completed "
+
+#. Translators: This is part of "Completed COMPLETED", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2428
+msgid "Completed "
+msgstr "Completed "
+
+#. Translators: This is part of "START (Due DUE)", where START and DUE are dates/times
+#: ../calendar/gui/print.c:2435
+msgid " (Due "
+msgstr " (Due "
+
+#. Translators: This is part of "Due DUE", where DUE is a date/time due the event should be finished
+#: ../calendar/gui/print.c:2438
+msgid "Due "
+msgstr "Due "
+
+#: ../calendar/gui/print.c:2572
 msgid "Appointment"
 msgstr "Appointment"
 
-#: ../calendar/gui/print.c:2566
+#: ../calendar/gui/print.c:2574 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "Task"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2599
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2623
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2666
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2681
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2699
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2710
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2723
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2734
 msgid "Contacts: "
 msgstr "Contacts: "
 
@@ -6429,7 +6201,7 @@ msgstr "Appointments and Meetings"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Opening calendar"
 msgstr "Opening calendar"
 
@@ -8010,157 +7782,157 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: ../composer/e-composer-actions.c:79
+#: ../composer/e-composer-actions.c:81
 msgid "Untitled Message"
 msgstr "Untitled Message"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "Save as…"
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:283
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:288
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_Close"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "Close the current file"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "_Print…"
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "Save the current file"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "Save _As…"
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "Save the current file with a different name"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "Save as _Draft"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "Save as draft"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "Send this message"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "New _Message"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "Open New Message window"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "Character _Encoding"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:363
 msgid "PGP _Encrypt"
 msgstr "PGP _Encrypt"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:365
 msgid "Encrypt this message with PGP"
 msgstr "Encrypt this message with PGP"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:371
 msgid "PGP _Sign"
 msgstr "PGP _Sign"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:373
 msgid "Sign this message with your PGP key"
 msgstr "Sign this message with your PGP key"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "_Prioritise Message"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "Set the message priority to high"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "Re_quest Read Receipt"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:389
 msgid "Get delivery notification when your message is read"
 msgstr "Get delivery notification when your message is read"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:397
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Encrypt this message with your S/MIME Encryption Certificate"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Sig_n"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:405
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sign this message with your S/MIME Signature Certificate"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:411
 msgid "_Bcc Field"
 msgstr "_Bcc Field"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:413
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Toggles whether the BCC field is displayed"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "_Cc Field"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "Toggles whether the CC field is displayed"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:427
 msgid "_From Field"
 msgstr "_From Field"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:429
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Toggles whether the From chooser is displayed"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Toggles whether the Reply-To field is displayed"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:480
 msgid "Save Draft"
 msgstr "Save Draft"
 
@@ -8172,15 +7944,15 @@ msgstr "Show"
 msgid "Hide"
 msgstr "Hide"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Enter the recipients of the message"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Enter the addresses that will receive a carbon copy of the message"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8188,50 +7960,50 @@ msgstr ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "Fr_om:"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
+#: ../modules/mail/em-mailer-prefs.c:76
 msgid "From"
 msgstr "From"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "_Reply-To:"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "_To:"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "CC"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "_Post To:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "S_ubject:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
@@ -8264,18 +8036,18 @@ msgid "Save draft"
 msgstr "Save draft"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:188 ../mail/em-utils.c:152
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "_Do not show this message again."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:988
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:995
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8283,15 +8055,15 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1386
 msgid "Unable to reconstruct message from autosave file"
 msgstr "Unable to reconstruct message from autosave file"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1452 ../composer/e-msg-composer.c:1648
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../composer/e-msg-composer.c:3310
+#: ../composer/e-msg-composer.c:3313
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8379,8 +8151,8 @@ msgstr ""
 "Recovering the message will allow you to continue where you left off."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "The file `{0}' is not a regular file and cannot be sent in a message."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr "The file '{0}' is not a regular file and cannot be sent in a message."
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
@@ -8399,8 +8171,8 @@ msgid "Unable to activate the address selector control."
 msgstr "Unable to activate the address selector control."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "You cannot attach the file `{0}' to this message."
+msgid "You cannot attach the file n{0}' to this message."
+msgstr "You cannot attach the file '{0}' to this message."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8422,31 +8194,27 @@ msgstr "_Recover"
 msgid "_Save Draft"
 msgstr "_Save Draft"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:199
 msgid "Run Anjal in a window"
 msgstr "Run Anjal in a window"
 
-#: ../capplet/anjal-settings-main.c:203
+#: ../capplet/anjal-settings-main.c:200
 msgid "Make Anjal the default email client"
 msgstr "Make Anjal the default e-mail client"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:207
 msgid "ID of the socket to embed in"
 msgstr "ID of the socket to embed in"
 
-#: ../capplet/anjal-settings-main.c:211
+#: ../capplet/anjal-settings-main.c:208
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:221
 msgid "Anjal email client"
 msgstr "Anjal e-mail client"
 
-#: ../capplet/settings/mail-view.c:244
-msgid "New Tab"
-msgstr "New Tab"
-
 #: ../capplet/settings/mail-account-view.c:56
 msgid "Please enter your full name."
 msgstr "Please enter your full name."
@@ -8459,63 +8227,63 @@ msgstr "Please enter your e-mail address."
 msgid "The email address you have entered is invalid."
 msgstr "The e-mail address you have entered is invalid."
 
-#: ../capplet/settings/mail-account-view.c:224
+#: ../capplet/settings/mail-account-view.c:181
 msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
 msgstr "<span size=\"large\" weight=\"bold\">Personal details:</span>"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:186
 msgid "Name:"
 msgstr "Name:"
 
-#: ../capplet/settings/mail-account-view.c:238
+#: ../capplet/settings/mail-account-view.c:195
 msgid "Email address:"
 msgstr "E-mail address:"
 
-#: ../capplet/settings/mail-account-view.c:248
+#: ../capplet/settings/mail-account-view.c:205
 msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
 msgstr "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
+#: ../capplet/settings/mail-account-view.c:210
+#: ../capplet/settings/mail-account-view.c:258
 msgid "Server type:"
 msgstr "Server type:"
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
+#: ../capplet/settings/mail-account-view.c:219
+#: ../capplet/settings/mail-account-view.c:267
 msgid "Server address:"
 msgstr "Server address:"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:228
+#: ../capplet/settings/mail-account-view.c:276
 msgid "Username:"
 msgstr "Username:"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
+#: ../capplet/settings/mail-account-view.c:237
+#: ../capplet/settings/mail-account-view.c:285
 msgid "Use encryption:"
 msgstr "Use encryption:"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:290
 msgid "never"
 msgstr "never"
 
-#: ../capplet/settings/mail-account-view.c:298
+#: ../capplet/settings/mail-account-view.c:253
 msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
 msgstr "<span size=\"large\" weight=\"bold\">Sending details:</span>"
 
-#: ../capplet/settings/mail-account-view.c:355
+#: ../capplet/settings/mail-account-view.c:309
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
 "If we can't do it automatically you'll need your server details as well."
 msgstr ""
-"To use the e-mail application you'll need to setup an account. Put your "
-"e-mail address and password in below and we'll try and work out all the "
+"To use the e-mail application you'll need to set up an account. Put your e-"
+"mail address and password in below and we'll try and work out all the "
 "settings. If we can't do it automatically you'll need your server details as "
 "well."
 
-#: ../capplet/settings/mail-account-view.c:357
+#: ../capplet/settings/mail-account-view.c:311
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -8525,11 +8293,11 @@ msgstr ""
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
 
-#: ../capplet/settings/mail-account-view.c:359
+#: ../capplet/settings/mail-account-view.c:313
 msgid "You can specify more options to configure the account."
 msgstr "You can specify more options to configure the account."
 
-#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:315
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8537,11 +8305,11 @@ msgstr ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
 
-#: ../capplet/settings/mail-account-view.c:362
+#: ../capplet/settings/mail-account-view.c:316
 msgid "You can specify your default settings for your account."
 msgstr "You can specify your default settings for your account."
 
-#: ../capplet/settings/mail-account-view.c:363
+#: ../capplet/settings/mail-account-view.c:317
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8549,134 +8317,125 @@ msgstr ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
 
-#: ../capplet/settings/mail-account-view.c:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:332
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2191
+#: ../mail/mail-config.ui.h:59
 msgid "Identity"
 msgstr "Identity"
 
-#: ../capplet/settings/mail-account-view.c:378
+#: ../capplet/settings/mail-account-view.c:332
 msgid "Next - Receiving mail"
-msgstr "Next - Receiving mail"
+msgstr "Next — Receiving mail"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:333
 msgid "Receiving mail"
 msgstr "Receiving mail"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:334
 msgid "Next - Sending mail"
-msgstr "Next - Sending mail"
+msgstr "Next — Sending mail"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:333
 msgid "Back - Identity"
-msgstr "Back - Identity"
+msgstr "Back — Identity"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:333
 msgid "Next - Receiving options"
-msgstr "Next - Receiving options"
+msgstr "Next — Receiving options"
 
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:334
 msgid "Receiving options"
 msgstr "Receiving options"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:336
 msgid "Back - Receiving mail"
-msgstr "Back - Receiving mail"
+msgstr "Back — Receiving mail"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:336
 msgid "Sending mail"
 msgstr "Sending mail"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:337
 msgid "Next - Review account"
-msgstr "Next - Review account"
+msgstr "Next — Review account"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:336
 msgid "Next - Defaults"
-msgstr "Next - Defaults"
+msgstr "Next — Defaults"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:336
 msgid "Back - Receiving options"
-msgstr "Back - Receiving options"
+msgstr "Back — Receiving options"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:337
+#: ../mail/em-account-editor.c:2769 ../mail/mail-config.ui.h:32
 msgid "Defaults"
 msgstr "Defaults"
 
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:337
 msgid "Back - Sending mail"
-msgstr "Back - Sending mail"
+msgstr "Back — Sending mail"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:339
 msgid "Review account"
 msgstr "Review account"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:339
 msgid "Finish"
 msgstr "Finish"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:339
 msgid "Back - Sending"
-msgstr "Back - Sending"
+msgstr "Back — Sending"
 
-#: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
+#: ../capplet/settings/mail-account-view.c:671
+#: ../capplet/settings/mail-settings-view.c:262
 msgid "Close Tab"
 msgstr "Close Tab"
 
-#: ../capplet/settings/mail-account-view.c:729
+#: ../capplet/settings/mail-account-view.c:681
 msgid "Account Wizard"
 msgstr "Account Wizard"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "Evolution account assistant"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "E-mail Settings"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-msgid "Quit"
-msgstr "Quit"
-
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1617
+#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:675
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:212
+#: ../mail/message-list.c:1602
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/addressbook/e-book-shell-migrate.c:126
 #: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-cal-shell-migrate.c:141
 #: ../modules/calendar/e-memo-shell-backend.c:108
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-migrate.c:109
 msgid "On This Computer"
 msgstr "On This Computer"
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:146
 #: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "Modify"
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "Add a new account"
 
-#: ../capplet/settings/mail-settings-view.c:185
+#: ../capplet/settings/mail-settings-view.c:183
 msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
 msgstr "<span size=\"large\" weight=\"bold\">Account management</span>"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:272
 msgid "Settings"
 msgstr "Settings"
 
@@ -8688,7 +8447,7 @@ msgstr "Calendar event notifications"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution Alarm Notify"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:821
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8709,6 +8468,10 @@ msgstr "Manage your e-mail, contacts and schedule"
 msgid "Configure email accounts"
 msgstr "Configure e-mail accounts"
 
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "E-mail Settings"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "address card"
@@ -8810,56 +8573,66 @@ msgstr "Western European"
 msgid "Western European, New"
 msgstr "Western European, New"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "Traditional"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "Simplified"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "Ukrainian"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "Visual"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Today"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Yesterday"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "%d days from now"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "%d day from now"
+msgstr[1] "%d days from now"
 
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "%d days ago"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d day ago"
+msgstr[1] "%d days ago"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "Use locale default"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "Format:"
 
@@ -8880,18 +8653,6 @@ msgstr "Writing \"%s\""
 msgid "Writing \"%s\" to %s"
 msgstr "Writing \"%s\" to %s"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Name of the logger"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "Filename"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "The filename of the module"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Debug Logs"
@@ -8914,13 +8675,13 @@ msgstr "Log Messages:"
 msgid "Log Level"
 msgstr "Log Level"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2674
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Messages"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "Close this window"
 
@@ -8944,17 +8705,6 @@ msgstr "Debug"
 msgid "Error, Warnings and Debug messages"
 msgstr "Error, Warnings and Debug messages"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "Enabled"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Whether the plugin is enabled"
-
 #: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:334
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
@@ -8979,7 +8729,7 @@ msgstr ""
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "Because \"{1}\"."
 
@@ -8999,15 +8749,15 @@ msgstr "Do you wish to overwrite it?"
 msgid "File exists \"{0}\"."
 msgstr "File exists \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:169
 msgid "Could not open the link."
 msgstr "Could not open the link."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:219
 msgid "Could not display help for Evolution."
 msgstr "Could not display help for Evolution."
 
@@ -9020,214 +8770,214 @@ msgstr "GConf error: %s"
 msgid "All further errors shown only on terminal."
 msgstr "All further errors shown only on terminal."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:81
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Subject"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1137
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1221
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:82 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Date"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:84
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Face"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1302
 #, c-format
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1361
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Could not parse S/MIME message: Unknown error"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message"
 msgstr "Could not parse PGP/MIME message"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Could not parse PGP/MIME message: Unknown error"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 msgid "Error verifying signature"
 msgstr "Error verifying signature"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "Unknown error verifying signature"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message"
 msgstr "Could not parse PGP message"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Could not parse PGP message: Unknown error"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 second ago"
 msgstr[1] "%d seconds ago"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 second in the future"
 msgstr[1] "%d seconds in the future"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minute ago"
 msgstr[1] "%d minutes ago"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 minute in the future"
 msgstr[1] "%d minutes in the future"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 hour ago"
 msgstr[1] "%d hours ago"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 hour in the future"
 msgstr[1] "%d hours in the future"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 day ago"
 msgstr[1] "%d days ago"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 day in the future"
 msgstr[1] "%d days in the future"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 week ago"
 msgstr[1] "%d weeks ago"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 week in the future"
 msgstr[1] "%d weeks in the future"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 month ago"
 msgstr[1] "%d months ago"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 month in the future"
 msgstr[1] "%d months in the future"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 year ago"
 msgstr[1] "%d years ago"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 year in the future"
 msgstr[1] "%d years in the future"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<click here to select a date>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "now"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
@@ -9280,11 +9030,11 @@ msgid "I_nclude threads"
 msgstr "I_nclude threads"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Outgoing"
 
@@ -9316,7 +9066,7 @@ msgstr "Missing date."
 msgid "Missing file name."
 msgstr "Missing file name."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "Missing name."
 
@@ -9393,13 +9143,13 @@ msgstr "in the future"
 msgid "months"
 msgstr "months"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:171
 msgid "seconds"
 msgstr "seconds"
 
 #: ../filter/filter.ui.h:20
 msgid "the current time"
-msgstr "the current file"
+msgstr "the current time"
 
 #: ../filter/filter.ui.h:21
 msgid "the time you specify"
@@ -9410,7 +9160,7 @@ msgid "years"
 msgstr "years"
 
 #: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
+#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
 #: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
@@ -9418,35 +9168,19 @@ msgid_plural "Attachments"
 msgstr[0] "Attachment"
 msgstr[1] "Attachments"
 
-#: ../mail/e-mail-attachment-bar.c:621
+#: ../mail/e-mail-attachment-bar.c:617
 #: ../widgets/misc/e-attachment-paned.c:612
 msgid "Icon View"
 msgstr "Icon View"
 
-#: ../mail/e-mail-attachment-bar.c:622
+#: ../mail/e-mail-attachment-bar.c:618
 #: ../widgets/misc/e-attachment-paned.c:613
 msgid "List View"
 msgstr "List View"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Focus Tracker"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "Shell Module"
-
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "The mail shell backend"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "Show Deleted"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "Show deleted messages"
+#: ../mail/e-mail-browser.c:262
+msgid "(No Subject)"
+msgstr "(No Subject)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9493,7 +9227,7 @@ msgid "_Later"
 msgstr "_Later"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:472
 msgid "Add Label"
 msgstr "Add Label"
 
@@ -9513,115 +9247,57 @@ msgstr ""
 msgid "Color"
 msgstr "Colour"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1158
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Name"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:363
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2585
+#: ../modules/mail/e-mail-shell-view-private.c:952
 msgid "Inbox"
 msgstr "Inbox"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
 msgid "Drafts"
 msgstr "Drafts"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
 msgid "Outbox"
 msgstr "Outbox"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
 msgid "Sent"
 msgstr "Sent"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:570
 msgid "Templates"
 msgstr "Templates"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Important"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "To Do"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Later"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:147
 msgid "Migrating..."
 msgstr "Migrating…"
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:180
 msgid "Migration"
 msgstr "Migration"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:220
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migrating '%s':"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Unable to create new folder `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Unable to copy folder `%s' to `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Unable to scan for existing mailboxes at `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:659
 msgid "Migrating Folders"
 msgstr "Migrating Folders"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders…"
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Unable to open old POP keep-on-server data `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Failed to create local mail storage `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:660
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9633,25 +9309,16 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders…"
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:756
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Unable to create local mail folders at `%s': %s"
-
-#: ../mail/e-mail-migrate.c:3049
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "Unable to create local mail folders at '%s': %s"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:103
+#: ../modules/calendar/e-task-shell-view-actions.c:561
 msgid "Do not ask me again"
 msgstr "Do not ask me again"
 
@@ -9659,7 +9326,7 @@ msgstr "Do not ask me again"
 msgid "Copy to Folder"
 msgstr "Copy to Folder"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "C_opy"
 
@@ -9667,7 +9334,7 @@ msgstr "C_opy"
 msgid "Move to Folder"
 msgstr "Move to Folder"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "_Move"
 
@@ -9684,7 +9351,6 @@ msgstr[1] "Save Messages"
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
 #: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Message"
@@ -9991,8 +9657,8 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirect (bounce) the selected message to someone"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
@@ -10009,7 +9675,7 @@ msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Compose a reply to the mailing list of the selected message"
 
 #: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
@@ -10023,7 +9689,7 @@ msgstr "_Save as mbox…"
 
 #: ../mail/e-mail-reader.c:1446
 msgid "Save selected messages as an mbox file"
-msgstr "Save selected messages as a mbox file"
+msgstr "Save selected messages as an mbox file"
 
 #: ../mail/e-mail-reader.c:1451
 msgid "Search Folder from Mailing _List..."
@@ -10031,7 +9697,7 @@ msgstr "Search Folder from Mailing _List…"
 
 #: ../mail/e-mail-reader.c:1453
 msgid "Create a search folder for this mailing list"
-msgstr "Create a Search folder for this mailing list"
+msgstr "Create a search folder for this mailing list"
 
 #: ../mail/e-mail-reader.c:1458
 msgid "Search Folder from Recipien_ts..."
@@ -10039,7 +9705,7 @@ msgstr "Search Folder from Recipien_ts…"
 
 #: ../mail/e-mail-reader.c:1460
 msgid "Create a search folder for these recipients"
-msgstr "Create a Search folder for these recipients"
+msgstr "Create a search folder for these recipients"
 
 #: ../mail/e-mail-reader.c:1465
 msgid "Search Folder from Sen_der..."
@@ -10047,7 +9713,7 @@ msgstr "Search Folder from Sen_der…"
 
 #: ../mail/e-mail-reader.c:1467
 msgid "Create a search folder for this sender"
-msgstr "Create a Search folder for this sender"
+msgstr "Create a search folder for this sender"
 
 #: ../mail/e-mail-reader.c:1472
 msgid "Search Folder from S_ubject..."
@@ -10055,7 +9721,7 @@ msgstr "Search Folder from S_ubject…"
 
 #: ../mail/e-mail-reader.c:1474
 msgid "Create a search folder for this subject"
-msgstr "Create a Search folder for this subject"
+msgstr "Create a search folder for this subject"
 
 #: ../mail/e-mail-reader.c:1479
 msgid "_Message Source"
@@ -10169,19 +9835,19 @@ msgstr "All Message _Headers"
 msgid "Show messages with all email headers"
 msgstr "Show messages with all e-mail headers"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1878
 msgid "Unable to retrieve message"
 msgstr "Unable to retrieve message"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1939
+#: ../mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Retrieving message '%s'"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2453
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:534
 #: ../plugins/google-account-setup/google-source.c:656
@@ -10189,33 +9855,33 @@ msgstr "Retrieving message '%s'"
 msgid "Default"
 msgstr "Default"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2574
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2575
 msgid "Forward the selected message to someone"
 msgstr "Forward the selected message to someone"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2619 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Delete"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Next"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Previous"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2631 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Reply"
 
@@ -10225,24 +9891,24 @@ msgstr "Flag to Follow Up"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:73
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "No encryption"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:121
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS encryption"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL encryption"
 
@@ -10265,34 +9931,34 @@ msgstr ""
 "and tick the check box for accepting it\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "None"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "Never"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "Always"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "Ask for each message"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "None"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "Mail Configuration"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10302,7 +9968,7 @@ msgstr ""
 "\n"
 "Click \"Forward\" to begin."
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2060
 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 "
@@ -10310,22 +9976,22 @@ msgid ""
 msgstr ""
 "Please enter your name and e-mail address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
-"information in e-mail you send."
+"information in e-mails you send."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2228
+#: ../mail/mail-config.ui.h:91
 msgid "Receiving Email"
 msgstr "Receiving E-mail"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "Please configure the following account settings."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2705
 msgid "Sending Email"
 msgstr "Sending E-mail"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10333,11 +9999,11 @@ msgstr ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "Account Management"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2069
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10345,11 +10011,11 @@ msgstr ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "Done"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10363,56 +10029,56 @@ msgstr ""
 "\n"
 "Click \"Apply\" to save your settings."
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2515
 msgid "Check for _new messages every"
 msgstr "Check for _new messages every"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2523
 msgid "minu_tes"
 msgstr "minu_tes"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2831 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "Security"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2876 ../mail/em-account-editor.c:2944
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
 msgid "Checking for New Messages"
 msgstr "Checking for New Messages"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3413
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3413
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1571
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Your message to %s about \"%s\" on %s has been read."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1619
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Delivery Notification for: \"%s\""
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1943
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1997
+#: ../mail/em-composer-utils.c:1990
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10420,19 +10086,19 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2134
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2315
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2316
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "Select Folder"
 
@@ -10513,6 +10179,10 @@ msgstr "Follow Up"
 msgid "Forward to"
 msgstr "Forward to"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Important"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "is after"
@@ -10537,7 +10207,7 @@ msgstr "is not set"
 msgid "is set"
 msgstr "is set"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:62
 msgid "Junk"
 msgstr "Junk"
 
@@ -10586,7 +10256,7 @@ msgid "Play Sound"
 msgstr "Play Sound"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Read"
 
@@ -10667,16 +10337,16 @@ msgid "Unset Status"
 msgstr "Unset Status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "Then"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:169
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Unread messages:"
@@ -10684,23 +10354,23 @@ msgstr[1] "Unread messages:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:173
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total messages:"
 msgstr[1] "Total messages:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:191
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Quota usage (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:193
 #, c-format
 msgid "Quota usage"
 msgstr "Quota usage"
 
-#: ../mail/em-folder-properties.c:399
+#: ../mail/em-folder-properties.c:395
 #: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "Folder Properties"
@@ -10709,37 +10379,37 @@ msgstr "Folder Properties"
 msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "C_reate"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1073 ../mail/mail-vfolder.c:1138
 msgid "Search Folders"
 msgstr "Search Folders"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1080
 msgid "Loading..."
 msgstr "Loading…"
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:179
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:592
 msgid "Folder names cannot contain '/'"
 msgstr "Folder names cannot contain '/'"
 
@@ -10761,74 +10431,74 @@ msgstr "Folder names cannot contain '/'"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1074
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1280
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1486 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1488 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1495 ../mail/message-list.c:2095
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1497 ../mail/message-list.c:2097
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1512
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Move Folder To"
 msgstr "Move Folder To"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Copy Folder To"
 msgstr "Copy Folder To"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:500
+#: ../plugins/groupwise-features/share-folder-common.c:136
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "Creating folder `%s'"
+msgid "Creating folder '%s'"
+msgstr "Creating folder '%s'"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:663
 msgid "Create Folder"
 msgstr "Create Folder"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:664
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:680
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Unsubscribing from folder \"%s\""
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10836,11 +10506,11 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10848,11 +10518,11 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10860,11 +10530,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
 msgid "Valid signature, but cannot verify sender"
 msgstr "Valid signature, but cannot verify sender"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10872,11 +10542,11 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
 msgid "Signature exists, but need public key"
 msgstr "Signature exists, but need public key"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -10884,11 +10554,11 @@ msgstr ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10896,11 +10566,11 @@ msgstr ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -10910,11 +10580,11 @@ msgstr ""
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10922,11 +10592,11 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -10936,15 +10606,15 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10952,28 +10622,28 @@ msgstr ""
 "Evolution cannot render this e-mail as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:726
 msgid "Completed on"
 msgstr "Completed on"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:734
 msgid "Overdue:"
 msgstr "Overdue:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:738
 msgid "by"
 msgstr "by"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
 msgid "View _Unformatted"
 msgstr "View _Unformatted"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:950
 msgid "Hide _Unformatted"
 msgstr "Hide _Unformatted"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1012
 msgid "O_pen With"
 msgstr "O_pen With"
 
@@ -10982,18 +10652,18 @@ msgstr "O_pen With"
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:147
 msgid "Formatting message"
 msgstr "Formatting message"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:338
 msgid "Formatting Message..."
 msgstr "Formatting Message…"
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "Retrieving `%s'"
+msgid "Retrieving '%s'"
+msgstr "Retrieving '%s'"
 
 #: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
@@ -11031,38 +10701,48 @@ msgstr "Pointer to unknown external data (\"%s\" type)"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2598
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "This store does not support subscriptions, or they are not enabled."
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:837
 msgid "Please select a server."
 msgstr "Please select a server."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "No server has been selected"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "Are you sure you want to open %d messages at once?"
+msgstr[1] "Are you sure you want to open %d messages at once?"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Message Filters"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:852
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
@@ -11071,7 +10751,7 @@ msgstr "Messages from %s"
 msgid "Search _Folders"
 msgstr "Search _Folders"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:521
 msgid "Add Folder"
 msgstr "Add Folder"
 
@@ -11112,50 +10792,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "\"Send and Receive Mail\" window width"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Allows Evolution to display text part of limited size"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Always request read receipt"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "Automatic emoticon recognition"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "Automatic link recognition"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Check incoming mail being junk"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Citation highlight colour"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Citation highlight colour."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Composer Window default height"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Composer Window default width"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "Composer load/attach directory"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Compress display of addresses in TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11163,7 +10839,7 @@ msgstr ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11171,11 +10847,11 @@ msgstr ""
 "Controls how frequently local changes are synchronised with the remote mail "
 "server. The interval must be at least 30 seconds."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "Custom headers to use while checking for junk."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11183,63 +10859,63 @@ msgstr ""
 "Custom headers to use while checking for junk. The list elements are strings "
 "in the format \"headername=value\"."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Default charset in which to compose messages"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Default charset in which to compose messages."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Default charset in which to display messages"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Default charset in which to display messages."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Default forward style"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Default height of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Default height of the mail browser window."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Default height of the subscribe dialogue."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "Default maximised state of the mail browser window."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Default reply style"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Default value for thread expand state"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Default width of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Default width of the mail browser window."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Default width of the subscribe dialogue."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11247,27 +10923,27 @@ msgstr ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
-msgstr "Determines whether to lookup in address book for sender e-mail"
+msgstr "Determines whether to look up in address book for sender e-mail"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
 "can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
-"Determines whether to lookup the sender e-mail in address book. If found, it "
+"Determines whether to look up the sender e-mail in the address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
 "can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Determines whether to use custom headers to check for junk"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11277,7 +10953,7 @@ msgstr ""
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11285,18 +10961,22 @@ msgstr ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directory for loading/attaching files to composer."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "Directory for saving mail component files."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Disable or enable ellipsizing of folder names in side bar"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "Display only message texts not exceeding certain size"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "Do not add signature delimiter"
@@ -11370,14 +11050,18 @@ msgstr ""
 "and folders."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "Enable to render message text part of limited size."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "Enable/disable caret mode"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:46
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Encode file names in an Outlook/GMail way"
 
@@ -11521,12 +11205,12 @@ msgstr ""
 "the search results."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
-msgstr "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
+msgstr "Last time Empty Junk was run"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
-msgstr "Last time empty wastebasket was run"
+msgid "Last time Empty Trash was run"
+msgstr "Last time Empty Wastebasket was run"
 
 #: ../mail/evolution-mail.schemas.in.h:85
 msgid "Layout style"
@@ -11635,60 +11319,64 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "Mark citations in the message \"Preview\"."
 
 #: ../mail/evolution-mail.schemas.in.h:109
+msgid "Message text limit for display"
+msgstr "Message text limit for display"
+
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minimum days between emptying the junk on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum number of days between emptying the wastebasket on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minimum time between emptying the junk on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum time between emptying the wastebasket on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Number of addresses to display in TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "Prompt when deleting messages in search folder"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Prompt when user tries to open 10 or more messages at once"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11696,63 +11384,63 @@ msgstr ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "Prompt while marking multiple messages"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr "Put personalised signatures at the top of replies"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "Put the cursor at the bottom of replies"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Recognise emoticons in text and replace them with images."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "Recognise links in text and replace them."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "Run junk test on incoming mail."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "Save directory"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "Search for the sender photo in local address books"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "Send HTML mail by default."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "Sender e-mail address column in the message list"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "Server synchronisation interval"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11760,67 +11448,67 @@ msgstr ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Show \"Bcc\" field when sending a mail message"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Show \"Cc\" field when sending a mail message"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Show \"From\" field when posting to a newsgroup"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"From\" field when sending a mail message"
 msgstr "Show \"From\" field when sending a mail message"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Show \"Reply To\" field when posting to a newsgroup"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Show \"Reply To\" field when sending a mail message"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "Show Animations"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show all message headers"
 msgstr "Show all message headers"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show all the headers when viewing a messages."
 msgstr "Show all the headers when viewing a messages."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "Show animated images as animations."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Show deleted messages (with a strike-through) in the message-list."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr "Show deleted messages in the message-list"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show image animations"
 msgstr "Show image animations"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show original \"Date\" header value."
 msgstr "Show original \"Date\" header value."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "Show photo of the sender"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11828,7 +11516,7 @@ msgstr ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11836,7 +11524,7 @@ msgstr ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11844,7 +11532,7 @@ msgstr ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11852,7 +11540,7 @@ msgstr ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11860,7 +11548,7 @@ msgstr ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11868,7 +11556,7 @@ msgstr ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -11876,7 +11564,7 @@ msgstr ""
 "Show the e-mail address of the sender in a separate column in the message "
 "list."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -11886,49 +11574,49 @@ msgstr ""
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Show the photo of the sender in the message reading pane."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "Spell check inline"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "Spell checking colour"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "Subscribe dialogue default height"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "Subscribe dialogue default width"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "Text message part limit"
-
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "The default plugin for Junk hook"
 
 #: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
-msgstr "The last time empty junk was run, in days since the epoch."
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 
 #: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
-msgstr "The last time empty wastebasket was run, in days since the epoch."
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"The last time Empty Wastebasket was run, in days since January 1st, 1970 (Epoch)."
 
 #: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
@@ -11960,11 +11648,13 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the maximum size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when the 'force_message_limit' key is activated."
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
@@ -12118,7 +11808,7 @@ msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
-"Whether or not to fall back on threading by subjects when the messages do "
+"Whether to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 
 #: ../mail/evolution-mail.schemas.in.h:202
@@ -12133,355 +11823,381 @@ msgstr "Width of the message-list pane"
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Importing Elm data"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "Mail"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:365
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm importer"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:366
 msgid "Import mail from Elm."
 msgstr "Import mail from Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
+#: ../mail/importers/evolution-mbox-importer.c:113
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../plugins/pst-import/pst-importer.c:294
 msgid "Select folder"
 msgstr "Select folder"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../plugins/pst-import/pst-importer.c:294
 msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#: ../mail/importers/evolution-mbox-importer.c:258
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:259
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer Berkeley Mailbox format folders"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:148
+#: ../plugins/pst-import/pst-importer.c:446
+#: ../plugins/pst-import/pst-importer.c:552
 #, c-format
-msgid "Importing `%s'"
-msgstr "Importing `%s'"
+msgid "Importing '%s'"
+msgstr "Importing '%s'"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:291
 #, c-format
 msgid "Scanning %s"
 msgstr "Scanning %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "Importing Pine data"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Address Book"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:418
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine importer"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:419
 msgid "Import mail from Pine."
 msgstr "Import mail from Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail to %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail from %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "Subject is %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"The filter rule \"%s\" has been updated, because it used the just-removed "
+"folder\n"
+"\"%s\"."
+msgstr[1] ""
+"The following filter rules\n"
+"%s have been updated, because they used the just-removed folder\n"
+"\"%s\"."
+
 #: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(Note: Requires restart of the application)"
 
-#: ../mail/mail-config.ui.h:2
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:3
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Top Posting Option</b> (Not Recommended)"
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "Account Information"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "Add Ne_w Signature…"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Al_ways sign outgoing messages when using this account"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Also encrypt to sel_f when sending encrypted messages"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Alway_s carbon-copy (cc) to:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Always _blind carbon-copy (bcc) to:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Always _trust keys in my keyring when encrypting"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Always encrypt to _myself when sending encrypted messages"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "Always request rea_d receipt"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "Authentication"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "Automatically insert _emoticon images"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "C_haracter set:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "Ch_eck for Supported Types"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "Check cu_stom headers for junk"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
 msgstr "Check incoming _messages for junk"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "Check spelling while I _type"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Checks incoming mail messages to be Junk"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "Cle_ar"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "Clea_r"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "Colour for _misspelt words:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "Composing Messages"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "Confirm _when expunging a folder"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Default Behavior"
 msgstr "Default Behaviour"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "Default character e_ncoding:"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Delete Mail"
 msgstr "Delete Mail"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Delete junk messages on e_xit"
 msgstr "Delete junk messages on e_xit"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Digitally sign o_utgoing messages (by default)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "Displayed Message _Headers"
-
 #: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "Do not format messages when text si_ze exceeds"
+msgid "Displayed Message Headers"
+msgstr "Displayed Message Headers"
 
 #: ../mail/mail-config.ui.h:38
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "Do not display messages when text si_ze exceeds"
+
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Do not mar_k messages as junk if sender is in my address book"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not quote"
 msgstr "Do not quote"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "Drafts _Folder:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "E-mail _Address:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "Empty wastebasket folders on e_xit"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Magic S_pacebar"
 msgstr "Enable Magic S_pacebar"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Sea_rch Folders"
 msgstr "Enable Sea_rch Folders"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "Encry_ption certificate:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "Encrypt out_going messages (by default)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fi_xed-width:"
 msgstr "Fi_xed-width:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Fix_ed width Font:"
 msgstr "Fix_ed width Font:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Font Properties"
 msgstr "Font Properties"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Format messages in _HTML"
 msgstr "Format messages in _HTML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "Full Nam_e:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "HTML Messages"
 msgstr "HTML Messages"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
 msgid "H_TTP Proxy:"
 msgstr "H_TTP Proxy:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Headers"
 msgstr "Headers"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:60
 msgid "Inline"
 msgstr "Inline"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 msgid "Inline (Outlook style)"
 msgstr "Inline (Outlook style)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:63
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Labels"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "Languages Table"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "Loading Images"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "Mail Headers Table"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "Mailbox location"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "Message Display"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 msgid "Message Fonts"
 msgstr "Message Fonts"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "Message Receipts"
 msgstr "Message Receipts"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "No _Proxy for:"
 msgstr "No _Proxy for:"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:74
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12489,172 +12205,172 @@ msgstr ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:75
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "Option is ignored if a match for custom junk headers is found."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:76
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Optional Information"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:79
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Printed Fonts"
 msgstr "Printed Fonts"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Proxy Settings"
 msgstr "Proxy Settings"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Quoted"
 msgstr "Quoted"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "Re_member password"
 msgstr "Re_member password"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "Re_ply-To:"
 msgstr "Re_ply-To:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "Remember _password"
 msgstr "Remember _password"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "Required Information"
 msgstr "Required Information"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL is not supported in this build of Evolution"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "S_earch for sender photograph only in local address books"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "S_elect…"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "S_end message receipts:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "S_tandard Font:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "Select Drafts Folder"
 msgstr "Select Drafts Folder"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "Select HTML fixed width font"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "Select HTML fixed width font for printing"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font"
 msgstr "Select HTML variable width font"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "Select HTML variable width font for printing"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "Select Sent Folder"
 msgstr "Select Sent Folder"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 msgid "Sender Photograph"
 msgstr "Sender Photograph"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Sending Mail"
 msgstr "Sending Mail"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "Sent _Messages Folder:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Sent and Draft Messages"
 msgstr "Sent and Draft Messages"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver requires authentication"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 msgid "Server Configuration"
 msgstr "Server Configuration"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:114
 msgid "Server _Type:"
 msgstr "Server _Type:"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_natures"
 msgstr "Sig_natures"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "Sig_ning certificate:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "Signat_ure:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "Start _typing at the bottom on replying"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12662,7 +12378,7 @@ msgstr ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12672,7 +12388,7 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12680,244 +12396,242 @@ msgstr ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:129
 msgid "Us_ername:"
 msgstr "Us_ername:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:130
 msgid "Use Authe_ntication"
 msgstr "Use Authe_ntication"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../mail/mail-config.ui.h:131 ../plugins/caldav/caldav-source.c:221
 #: ../plugins/google-account-setup/google-contacts-source.c:283
 #: ../plugins/google-account-setup/google-source.c:620
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "User_name:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:132
 msgid "V_ariable-width:"
 msgstr "V_ariable-width:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "_Add Signature"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "_Always load images from the Internet"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:135
 msgid "_Authentication Type"
 msgstr "_Authentication Type"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:136
 msgid "_Default junk plugin:"
 msgstr "_Default junk plugin:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:137
 msgid "_Direct connection to the Internet"
 msgstr "_Direct connection to the Internet"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:138
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Do not sign meeting requests (for Outlook compatibility)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:140
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Keep Signature above the original message on replying"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:141
 msgid "_Languages"
 msgstr "_Languages"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:142
 msgid "_Load images in messages from contacts"
 msgstr "_Load images in messages from contacts"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:143
 msgid "_Lookup in local address book only"
 msgstr "_Look up in local address book only"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:144
 msgid "_Make this my default account"
 msgstr "_Make this my default account"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:145
 msgid "_Manual proxy configuration:"
 msgstr "_Manual proxy configuration:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:146
 msgid "_Mark messages as read after"
 msgstr "_Mark messages as read after"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "_Never load images from the Internet"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "_Path:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Prompt on sending HTML mail to contacts that do not want them"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:151
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Prompt when sending messages with an empty subject line"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:152
 msgid "_Reply style:"
 msgstr "_Reply style:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:153
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:154
 msgid "_Secure HTTP Proxy:"
 msgstr "_Secure HTTP Proxy:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:156 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Server:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:158
 msgid "_Show image animations"
 msgstr "_Show image animations"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:159
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Show the photograph of sender in the message preview"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:161
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Shrink To / Cc / Bcc headers to "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:162
 msgid "_Use Secure Connection:"
 msgstr "_Use Secure Connection:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:163
 msgid "_Use system defaults"
 msgstr "_Use system defaults"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:164
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:167
 msgid "addresses"
 msgstr "addresses"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:169
 msgid "color"
 msgstr "colour"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:170
 msgid "description"
 msgstr "description"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "All active remote folders"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "All local and active remote folders"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "All local folders"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Call"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "Co_mpleted"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Digital Signature"
 msgstr "Digital Signature"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "Do Not Forward"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "Encryption"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Folder Subscriptions"
 msgstr "Folder Subscriptions"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Follow-Up"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "For Your Information"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Forward"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Licence Agreement"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "Reply to All"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "Review"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:20
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Search Folder Sources"
 msgstr "Search Folder Sources"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Security Information"
 msgstr "Security Information"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Specific folders"
 msgstr "Specific folders"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:24
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12925,170 +12639,170 @@ msgstr ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Accept License"
 msgstr "_Accept Licence"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Due By:"
 msgstr "_Due By:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Flag:"
 msgstr "_Flag:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Tick this to accept the license agreement"
 msgstr "_Tick this to accept the licence agreement"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:891
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Filtering Selected Messages"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "Fetching Mail"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:574
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:586 ../mail/mail-ops.c:613
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:630
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Failed to append to local `Sent' folder: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Failed to append to local 'Sent' folder: %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:741 ../mail/mail-ops.c:822
 msgid "Sending message"
 msgstr "Sending message"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:751
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:778
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:780 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "Cancelled."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:782 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "Complete."
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:894
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Saving message to folder '%s'"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Moving messages to '%s'"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copying messages to '%s'"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1080
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Scanning folders in '%s'"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1188
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1229
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Opening folder '%s'"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1295
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Retrieving quota information for folder '%s'"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1367
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Opening store '%s'"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1438
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Removing folder '%s'"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1556
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1619
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1620
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1674
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Refreshing folder '%s'"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1714
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Expunging folder '%s'"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1759
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying wastebasket in '%s'"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1760
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1956
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retrieving %d messages"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2045
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messages"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2126
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13097,11 +12811,11 @@ msgstr ""
 "Error saving messages to: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2198
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2216 ../mail/mail-ops.c:2224
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13110,35 +12824,35 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2239
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Disconnecting from '%s'"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Reconnecting to '%s'"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2480
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparing account '%s' for offline"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2566
 msgid "Checking Service"
 msgstr "Checking Service"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "Cancelling…"
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "Send & Receive Mail"
 
@@ -13146,107 +12860,142 @@ msgstr "Send & Receive Mail"
 msgid "Cancel _All"
 msgstr "Cancel _All"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "Updating…"
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "Waiting…"
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "Checking for new mail"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:217
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Enter Passphrase for %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:219
 msgid "Enter Passphrase"
 msgstr "Enter Passphrase"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:222
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Enter Password for %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:224
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:266
 msgid "User canceled operation."
 msgstr "User cancelled operation."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:660
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "No destination address provided; forward of the message has been cancelled."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:666
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "No account found to use; forward of the message has been cancelled."
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:119
 #, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "Could not create spool directory `%s': %s"
+msgid "Could not create spool directory '%s': %s"
+msgstr "Could not create spool directory '%s': %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:149
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "Trying to movemail a non-mbox source '%s'"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Forwarded message — %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "Forwarded message"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:297
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "Invalid folder: `%s'"
+msgid "Invalid folder: '%s'"
+msgstr "Invalid folder: '%s'"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setting up Search Folder: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:229
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Updating Search Folders for '%s:%s'"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:236
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Updating Search Folders for '%s'"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:679
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"The Search Folder \"%s\" has been updated, because it used the just-removed "
+"folder\n"
+"\"%s\"."
+msgstr[1] ""
+"The following Search Folders\n"
+"%s have been updated, because they used the just-removed folder\n"
+"\"%s\"."
+
+#: ../mail/mail-vfolder.c:1191
 msgid "Edit Search Folder"
 msgstr "Edit Search Folder"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1296
 msgid "New Search Folder"
 msgstr "New Search Folder"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "\"Check Junk\" Failed"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "\"Report Junk\" Failed"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "\"Report Not Junk\" Failed"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "A folder named \"{0}\" already exists. Please use a different name."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "A folder named \"{1}\" already exists. Please use a different name."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13258,7 +13007,7 @@ msgstr ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13266,7 +13015,7 @@ msgstr ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
@@ -13274,7 +13023,7 @@ msgstr ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13282,25 +13031,21 @@ msgstr ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Are you sure you want to delete this account and all its proxies?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "Are you sure you want to delete this account?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Are you sure you want to disable this account and delete all its proxies?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Are you sure you want to open {0} messages at once?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13308,7 +13053,7 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13316,87 +13061,79 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Are you sure you want to send a message in HTML format?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
-msgstr "Are you sure you want to send a message with a invalid address?"
+msgstr "Are you sure you want to send a message with an invalid address?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Are you sure you want to send a message with invalid addresses?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Are you sure you want to send a message with only BCC recipients?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Are you sure you want to send a message without a subject?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "Because \"{0}\"."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "Because \"{2}\"."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Blank Signature"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Cannot add Search Folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "Cannot create folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "Cannot create temporary save directory."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Cannot create the save directory, because \"{1}\""
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Cannot delete folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Cannot delete system folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Cannot edit Search Folder \"{0}\" as it does not exist."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Cannot move folder \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
-msgstr "Cannot open source \"{1}\""
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "Cannot open source \"{1}\"."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "Cannot open source \"{2}\"."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "Cannot open target \"{2}\"."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13404,35 +13141,31 @@ msgstr ""
 "Cannot read the licence file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its licence."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Cannot rename \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Cannot rename or move system folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "Cannot save changes to account."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Cannot save to directory \"{0}\"."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "Cannot save to file \"{0}\"."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Cannot set signature script \"{0}\"."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Check Junk Failed"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13440,27 +13173,27 @@ msgstr ""
 "Check to make sure your password is spelt correctly. Remember that many "
 "passwords are case-sensitive; your caps lock might be on."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Could not save signature file."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Delete messages in Search Folder \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Do not d_elete"
 msgstr "Do not d_elete"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "Do not delete"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "Do not disable"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13468,61 +13201,64 @@ msgstr ""
 "Do you want to locally synchronise the folders that are marked for offline "
 "usage?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "Do you want to mark all messages as read?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Do you wish to save your changes?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Enter password."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Error loading filter definitions."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Error while performing operation."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "Error while {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "File exists but cannot overwrite it."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "File exists but is not a regular file."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "If you continue, you will not be able to recover these messages."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "If you delete the folder, all of its contents will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "If you proceed, all proxy accounts will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13530,11 +13266,11 @@ msgstr ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "If you proceed, the account information will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13542,23 +13278,23 @@ msgstr ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Ignore"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Invalid authentication"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Mail Deletion Failed"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13570,29 +13306,29 @@ msgstr ""
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "Missing folder."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "No sources selected."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "Opening too many messages at once may take a long time."
 msgstr "Opening too many messages at once may take a long time."
 
 #  mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Please check your account settings and try again."
 msgstr "Please check your account settings and try again."
 
 #  mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Please enable the account or send using another account."
 msgstr "Please enable the account or send using another account."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 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."
@@ -13600,7 +13336,7 @@ msgstr ""
 "Please enter a valid e-mail address in the To: field. You can search for e-"
 "mail addresses by clicking on the To: button next to the entry box."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13610,63 +13346,55 @@ msgstr ""
 "HTML e-mail:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "Please provide an unique name to identify this signature."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "Please wait."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem migrating old mail folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Querying server for a list of supported authentication mechanisms."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "Read receipt requested."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Really delete folder \"{0}\" and all of its subfolders?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\"?"
 msgstr "Really delete folder \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "Report Junk Failed"
-
 #: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "Report Not Junk Failed"
-
-#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "Search Folders automatically updated."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "Send Receipt"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "Signature Already Exists"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "Synchronise"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synchronise folders locally for offline usage?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13674,7 +13402,7 @@ msgstr ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13690,35 +13418,7 @@ msgstr ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now-removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now-removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13726,7 +13426,7 @@ msgstr ""
 "The following recipient was not recognised as a valid mail address:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13734,11 +13434,11 @@ msgstr ""
 "The following recipients were not recognised as valid mail addresses:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "The script file must exist and be executable."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13746,7 +13446,7 @@ msgstr ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13754,13 +13454,13 @@ msgstr ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "This message cannot be sent because you have not specified any recipients"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13768,11 +13468,11 @@ msgstr ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "This signature has been changed, but has not been saved."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13781,11 +13481,11 @@ msgstr ""
 "subfolders."
 
 #  mail:gw-accountsetup-error primary
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "Unable to connect to the GroupWise server."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13793,19 +13493,19 @@ msgstr ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "Unable to read licence file."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "Use _Default"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "Use default drafts folder?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13815,31 +13515,31 @@ msgstr ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:117
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "You do not have sufficient permissions to delete this mail."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:118
 msgid "You have not filled in all of the required information."
 msgstr "You have not filled in all of the required information."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:119
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "You have unsent messages, do you wish to quit anyway?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:120
 msgid "You may not create two accounts with the same name."
 msgstr "You may not create two accounts with the same name."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "You must name this Search Folder."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "You must specify a folder."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13849,115 +13549,111 @@ msgstr ""
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:125
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "_Append"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "_Discard changes"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:128
 msgid "_Do not Synchronize"
 msgstr "_Do not Synchronise"
 
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:821
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "_Expunge"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "_Open Messages"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1107
 msgid "Unseen"
 msgstr "Unseen"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1108
 msgid "Seen"
 msgstr "Seen"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1109
 msgid "Answered"
 msgstr "Answered"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1110
 msgid "Forwarded"
 msgstr "Forwarded"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1111
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1112
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1116
 msgid "Lowest"
 msgstr "Lowest"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1117
 msgid "Lower"
 msgstr "Lower"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1121
 msgid "Higher"
 msgstr "Higher"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1122
 msgid "Highest"
 msgstr "Highest"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1732 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1739 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1748
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1760
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1768
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1770
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2515
 msgid "Select all visible messages"
 msgstr "Select all visible messages"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "Shell Backend"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4196 ../mail/message-list.c:4592
 msgid "Generating message list"
 msgstr "Generating message list"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4429
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13965,15 +13661,7 @@ msgstr ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 
-#: ../mail/message-list.c:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4431
 msgid "There are no messages in this folder."
 msgstr "There are no messages in this folder."
 
@@ -14011,27 +13699,27 @@ msgid "Subject - Trimmed"
 msgstr "Subject — Trimmed"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Body contains"
 msgstr "Body contains"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Message contains"
 msgstr "Message contains"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Recipients contain"
 msgstr "Recipients contain"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Sender contains"
 msgstr "Sender contains"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Subject contains"
 msgstr "Subject contains"
 
@@ -14065,15 +13753,15 @@ msgstr ""
 "TLS. This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits."
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "Use in _Birthday & Anniversaries calendar"
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "U_se in Birthday & Anniversaries calendar"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "Copy _book content locally for offline operation"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -14083,7 +13771,7 @@ msgstr ""
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14093,7 +13781,7 @@ msgstr ""
 "setting this to \"E-mail Address\" requires anonymous access to your LDAP "
 "server."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -14105,29 +13793,29 @@ msgstr ""
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "Server Information"
 
-#: ../modules/addressbook/addressbook-config.c:996
+#: ../modules/addressbook/addressbook-config.c:1016
 #: ../smime/gui/smime-ui.ui.h:14
 msgid "Details"
 msgstr "Details"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Searching"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "Downloading"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "New Address Book"
 
@@ -14157,11 +13845,11 @@ msgstr "EFolderList XML for the list of completion URIs."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "Position of the contact preview pane when oriented horizontally."
-msgstr "Position of the contact preview pane when orientated horizontally."
+msgstr "Position of the contact preview pane when oriented horizontally."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "Position of the contact preview pane when oriented vertically."
-msgstr "Position of the contact preview pane when orientated vertically."
+msgstr "Position of the contact preview pane when oriented vertically."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Show autocompleted name with an address"
@@ -14204,16 +13892,18 @@ msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
 msgstr ""
-"Whether to force showing the mail address with the name of the autocompleted "
+"Whether to force showing the e-mail address with the name of the autocompleted "
 "contact in the entry."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "Whether to show the preview pane."
 msgstr "Whether to show the preview pane."
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Table column:"
+#: ../modules/mail/em-mailer-prefs.c:1158
+msgid "_Table column:"
+msgstr "_Table column:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -14225,7 +13915,7 @@ msgstr "Always _show address of the autocompleted contact"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "On LDAP Servers"
 
@@ -14235,7 +13925,7 @@ msgid "_Contact"
 msgstr "_Contact"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "Create a new contact"
 
@@ -14245,7 +13935,7 @@ msgid "Contact _List"
 msgstr "Contact _List"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "Create a new contact list"
 
@@ -14255,7 +13945,7 @@ msgid "Address _Book"
 msgstr "Address _Book"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "Create a new address book"
 
@@ -14263,335 +13953,232 @@ msgstr "Create a new address book"
 #: ../modules/addressbook/e-book-shell-backend.c:376
 #: ../modules/addressbook/e-book-shell-view.c:394
 #: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Source List"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "The registry of address books"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "Current View"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "The currently selected address book view"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Previewed Contact"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "The contact being shown in the preview pane"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "Preview is Visible"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "Whether the preview pane is visible"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP Servers"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "Autocompletion Settings"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-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 ""
-"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…"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders…"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders…"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data…"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "Source Selector Widget"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "This widget displays groups of address books"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "Save as vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "Co_py All Contacts To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copy the contacts of the selected address book to another"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "D_elete Address Book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "Delete the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ve All Contacts To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "Move the contacts of the selected address book to another"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "_New Address Book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "Address _Book Properties"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "Show properties of the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/mail/e-mail-shell-view-actions.c:905
 msgid "_Rename..."
 msgstr "_Rename…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "Rename the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "S_ave Address Book as vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Save the contacts of the selected address book as a vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "Stop loading"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "_Copy Contact To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "Copy selected contacts to another address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "_Delete Contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "_Find in Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "Search for text in the displayed contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "_Forward Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "Send selected contacts to another person"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "_Move Contact To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "Move selected contacts to another address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "_New Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "New Contact _List…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "_Open Contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "View the current contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "_Send Message to Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "Send a message to the selected contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 #: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "_Preview"
 msgstr "_Preview"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "_Delete"
 msgstr "_Delete"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "_Properties"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "_Save as vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "Contact _Preview"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "Show contact preview window"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 #: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/calendar/e-task-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Classic View"
 msgstr "_Classic View"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "Show contact preview below the contact list"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 #: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/calendar/e-task-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Vertical View"
 msgstr "_Vertical View"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "Show contact preview alongside the contact list"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Any Category"
 msgstr "Any Category"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/calendar/e-task-shell-view-actions.c:941
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../shell/e-shell-content.c:441
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "Print all shown contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "Preview the contacts to be printed"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "Print selected contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Save as vCard…"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "Save selected contacts as a vCard"
 
@@ -14635,57 +14222,47 @@ msgstr "Contact information"
 msgid "Contact information for %s"
 msgstr "Contact information for %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "Anonymously"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "B_rowse this book until limit reached"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "Lo_gin:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "One"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Search Filter"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "Search _base:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "Search _filter:"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14694,51 +14271,51 @@ msgstr ""
 "modified, the default search will be performed on the type \"person\"."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "Sub"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "Supported Search Bases"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "Using distinguished name (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "Using e-mail address"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "_Download limit:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "_Find Possible Search Bases"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "_Login method:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "_Search scope:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_Timeout:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Use secure connection:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "cards"
 
@@ -14764,11 +14341,11 @@ msgstr "I_mport to Tasks"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-migrate.c:176
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "On The Web"
 
@@ -14778,7 +14355,7 @@ msgid "Weather"
 msgstr "Weather"
 
 #: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Birthdays & Anniversaries"
 
@@ -14788,7 +14365,7 @@ msgid "_Appointment"
 msgstr "_Appointment"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
@@ -14816,47 +14393,18 @@ msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
 #: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../plugins/itip-formatter/itip-formatter.c:2651
 msgid "Calendar and Tasks"
 msgstr "Calendar and Tasks"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "The registry of calendars"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-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 ""
-"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…"
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "Unable to migrate old settings from evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Unable to migrate calendar `%s'"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14865,36 +14413,16 @@ msgstr ""
 "Error on %s\n"
 "%s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
 msgid "Loading calendars"
 msgstr "Loading calendars"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:617
 msgid "Calendar Selector"
 msgstr "Calendar Selector"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "Date Navigator Widget"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "This widget displays a miniature calendar"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "Default Calendar Client"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "Default client for calendar operations"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "This widget displays groups of calendars"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:952
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Opening calendar at %s"
@@ -14938,244 +14466,244 @@ msgstr "event"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
 #: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-task-shell-view-actions.c:612
 msgid "Save as iCalendar"
 msgstr "Save as iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "_Copy…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "D_elete Calendar"
 msgstr "D_elete Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Delete the selected calendar"
 msgstr "Delete the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Go Back"
 msgstr "Go Back"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Go Forward"
 msgstr "Go Forward"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "Select _Today"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "Select today"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "Select _Date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "Select a specific date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "_New Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Purg_e"
 msgstr "Purg_e"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Purge old appointments and meetings"
 msgstr "Purge old appointments and meetings"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Re_fresh"
 msgstr "Re_fresh"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Refresh the selected calendar"
 msgstr "Refresh the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Rename the selected calendar"
 msgstr "Rename the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Show _Only This Calendar"
 msgstr "Show _Only This Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "_Delegate Meeting…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delete Appointment"
 msgstr "_Delete Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete selected appointments"
 msgstr "Delete selected appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete This _Occurrence"
 msgstr "Delete This _Occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "Delete this occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete All Occ_urrences"
 msgstr "Delete All Occ_urrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "Delete all occurrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "New All Day _Event..."
 msgstr "New All Day _Event…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Create a new all day event"
 msgstr "Create a new all-day event"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "New _Meeting..."
 msgstr "New _Meeting…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Create a new meeting"
 msgstr "Create a new meeting"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "New _Appointment…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "_Open Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "View the current appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Save as iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Converts an appointment to a meeting"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_ert to Appointment…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Converts a meeting to an appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+msgid "Quit"
+msgstr "Quit"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "Day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "Show one day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "List"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "Show as list"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "Month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "Show one month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "Week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "Show one week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Show one work week"
 msgstr "Show one work week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "Active Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "Next 7 Days' Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Description contains"
 msgstr "Description contains"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "Print this calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 msgid "Preview the calendar to be printed"
 msgstr "Preview the calendar to be printed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "Go To"
 
@@ -15210,7 +14738,7 @@ msgstr "View the selected memo"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 #: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
@@ -15224,22 +14752,22 @@ msgstr "Print the selected memo"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:610
 msgid "task"
 msgstr "task"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:672
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "_Mark as Complete"
 msgstr "_Mark as Complete"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Mark selected tasks as complete"
 msgstr "Mark selected tasks as complete"
 
@@ -15248,39 +14776,39 @@ msgid "_Mark as Incomplete"
 msgstr "_Mark as Incomplete"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Mark selected tasks as incomplete"
 msgstr "Mark selected tasks as incomplete"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "New _Task"
 msgstr "New _Task"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Create a new task"
 msgstr "Create a new task"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "_Open Task"
 msgstr "_Open Task"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "View the selected task"
 msgstr "View the selected task"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
 #: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "_Save as iCalendar..."
 msgstr "_Save as iCalendar…"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:998
 msgid "Print the selected task"
 msgstr "Print the selected task"
 
@@ -15308,36 +14836,16 @@ msgstr "Memo Li_st"
 msgid "Create a new memo list"
 msgstr "Create a new memo list"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "The registry of memo lists"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "The memo table model"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "Loading memos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:571
 msgid "Memo List Selector"
 msgstr "Memo List Selector"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "Default Memo Client"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "Default client for memo operations"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "This widget displays groups of memo lists"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:870
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Opening memos at %s"
@@ -15448,58 +14956,20 @@ msgid "Tas_k List"
 msgstr "Tas_k List"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "Create a new task list"
 msgstr "Create a new task list"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "The registry of task lists"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "The task table model"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-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 ""
-"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…"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Unable to migrate tasks `%s'"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:571
 msgid "Task List Selector"
 msgstr "Task List Selector"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "Default Task Client"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "Default client for task operations"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "This widget displays groups of task lists"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:870
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
@@ -15509,7 +14979,7 @@ msgstr "Opening tasks at %s"
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:554
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15521,95 +14991,95 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:679
 msgid "_Delete Task"
 msgstr "_Delete Task"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "_Find in Task..."
 msgstr "_Find in Task…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "Search for text in the displayed task"
 msgstr "Search for text in the displayed task"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:700
 msgid "Copy..."
 msgstr "Copy…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:707
 msgid "D_elete Task List"
 msgstr "D_elete Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Delete the selected task list"
 msgstr "Delete the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "_New Task List"
 msgstr "_New Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "Refresh the selected task list"
 msgstr "Refresh the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Rename the selected task list"
 msgstr "Rename the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Show _Only This Task List"
 msgstr "Show _Only This Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:756
 msgid "Mar_k as Incomplete"
 msgstr "Mar_k as Incomplete"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Delete completed tasks"
 msgstr "Delete completed tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:861
 msgid "Task _Preview"
 msgstr "Task _Preview"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:863
 msgid "Show task preview pane"
 msgstr "Show task preview pane"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:884
 msgid "Show task preview below the task list"
 msgstr "Show task preview below the task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 msgid "Show task preview alongside the task list"
 msgstr "Show task preview alongside the task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Active Tasks"
 msgstr "Active Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Completed Tasks"
 msgstr "Completed Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Next 7 Days' Tasks"
 msgstr "Next 7 Days' Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:927
 msgid "Overdue Tasks"
 msgstr "Overdue Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:934
 msgid "Tasks with Attachments"
 msgstr "Tasks with Attachments"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:984
 msgid "Print the list of tasks"
 msgstr "Print the list of tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:991
 msgid "Preview the list of tasks to be printed"
 msgstr "Preview the list of tasks to be printed"
 
@@ -15633,402 +15103,368 @@ msgid "Delete Task"
 msgstr "Delete Task"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, c-format
 msgid "%d attached messages"
 msgstr "%d attached messages"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "None"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:164
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:166
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:174
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:176
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:203
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:219
 msgid "Network Preferences"
 msgstr "Network Preferences"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "Group by Threads"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "Whether to group messages by threads"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:814
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "_Disable Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:816
 msgid "Disable this account"
 msgstr "Disable this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:823
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Permanently remove all the deleted messages from all folders"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:828
 msgid "C_reate Search Folder From Search..."
 msgstr "C_reate Search Folder From Search…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:835
 msgid "_Download Messages for Offline Usage"
 msgstr "_Download Messages for Offline Usage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:837
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Download messages of accounts and folders marked for offline usage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:842
 msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:849
 msgid "_Copy Folder To..."
 msgstr "_Copy Folder To…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:851
 msgid "Copy the selected folder into another folder"
 msgstr "Copy the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:858
 msgid "Permanently remove this folder"
 msgstr "Permanently remove this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:863
 msgid "E_xpunge"
 msgstr "E_xpunge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:865
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Permanently remove all deleted messages from this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:870
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_k All Messages as Read"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:872
 msgid "Mark all messages in the folder as read"
 msgstr "Mark all messages in the folder as read"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:877
 msgid "_Move Folder To..."
 msgstr "_Move Folder To…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:879
 msgid "Move the selected folder into another folder"
 msgstr "Move the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:884
 msgid "_New..."
 msgstr "_New…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:886
 msgid "Create a new folder for storing mail"
 msgstr "Create a new folder for storing mail"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:893
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:900
 msgid "Refresh the folder"
 msgstr "Refresh the folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:907
 msgid "Change the name of this folder"
 msgstr "Change the name of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:912
 msgid "Select Message _Thread"
 msgstr "Select Message _Thread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:914
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Select all messages in the same thread as the selected message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:919
 msgid "Select Message S_ubthread"
 msgstr "Select Message S_ubthread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:921
 msgid "Select all replies to the currently selected message"
 msgstr "Select all replies to the currently selected message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:926
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:928
 msgid "Unsubscribe from the selected folder"
 msgstr "Unsubscribe from the selected folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:933
 msgid "Empty _Trash"
-msgstr "Empty Wastebaske_t"
+msgstr "Empty Was_tebasket"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:935
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Permanently remove all the deleted messages from all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:940
 msgid "_New Label"
 msgstr "_New Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:949
 msgid "N_one"
 msgstr "N_one"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "Hide _Read Messages"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Temporarily hide all messages that have already been read"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "Hide S_elected Messages"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "Temporarily hide the selected messages"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "Show Hidde_n Messages"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "Show messages that have been temporarily hidden"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:972
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:977
 msgid "Collapse All _Threads"
 msgstr "Collapse All _Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:979
 msgid "Collapse all message threads"
 msgstr "Collapse all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:984
 msgid "E_xpand All Threads"
 msgstr "E_xpand All Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:986
 msgid "Expand all message threads"
 msgstr "Expand all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:991
 msgid "_Message Filters"
 msgstr "_Message Filters"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:993
 msgid "Create or edit rules for filtering new mail"
 msgstr "Create or edit rules for filtering new mail"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:998
 msgid "Search F_olders"
 msgstr "Search F_olders"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
 msgid "Create or edit search folder definitions"
 msgstr "Create or edit search folder definitions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
 msgid "_Subscriptions..."
 msgstr "_Subscriptions…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subscribe or unsubscribe to folders on remote servers"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
 msgid "F_older"
 msgstr "F_older"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "_Label"
 msgstr "_Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "_New Folder..."
 msgstr "_New Folder…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "Hide _Deleted Messages"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Hide deleted messages rather than displaying them with a line through them"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Show Message _Preview"
 msgstr "Show Message _Preview"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "Show message preview pane"
 msgstr "Show message preview pane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+msgid "Show _Deleted Messages"
+msgstr "Show _Deleted Messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+msgid "Show deleted messages with a line through them"
+msgstr "Show deleted messages with a line through them"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "_Group By Threads"
 msgstr "_Group By Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Threaded message list"
 msgstr "Threaded message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Show message preview below the message list"
 msgstr "Show message preview below the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Show message preview alongside the message list"
 msgstr "Show message preview alongside the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
 msgid "All Messages"
 msgstr "All Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
 msgid "Important Messages"
 msgstr "Important Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Last 5 Days' Messages"
 msgstr "Last 5 Days' Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "Messages with Attachments"
 msgstr "Messages with Attachments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
 msgid "No Label"
 msgstr "No Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Read Messages"
 msgstr "Read Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "Recent Messages"
 msgstr "Recent Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Subject or Addresses contain"
 msgstr "Subject or Addresses contain"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "All Accounts"
 msgstr "All Accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Current Account"
 msgstr "Current Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Current Folder"
 msgstr "Current Folder"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:880
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d selected, "
 msgstr[1] "%d selected, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:891
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d deleted"
 msgstr[1] "%d deleted"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:897
+#: ../modules/mail/e-mail-shell-view-private.c:904
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d junk"
 msgstr[1] "%d junk"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:910
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d draft"
 msgstr[1] "%d drafts"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:916
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d unsent"
 msgstr[1] "%d unsent"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:922
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sent"
 msgstr[1] "%d sent"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:934
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d unread, "
 msgstr[1] "%d unread, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:937
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16047,77 +15483,77 @@ msgstr "Account Search"
 msgid "Proxy _Logout"
 msgstr "Proxy _Logout"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "Enabled"
+
+#: ../modules/mail/em-composer-prefs.c:476
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "Every time"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "Once per day"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "Once per week"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "Once per month"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:223
 msgid "Add Custom Junk Header"
 msgstr "Add Custom Junk Header"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:231
 msgid "Header Name:"
 msgstr "Header Name:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:232
 msgid "Header Value Contains:"
 msgstr "Header Value Contains:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:332
 msgid "Header"
 msgstr "Header"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:336
 msgid "Contains Value"
 msgstr "Contains Value"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:729 ../modules/mail/em-mailer-prefs.c:800
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s plugin is available and the binary is installed."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:737 ../modules/mail/em-mailer-prefs.c:809
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "%s plugin is not available. Please check whether the package is installed."
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:773
 msgid "No junk plugin available"
 msgstr "No junk plugin available"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "_Table column:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1160
 msgid "_Date header:"
 msgstr "_Date header:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1161
 msgid "Show _original header value"
 msgstr "Show _original header value"
 
@@ -16153,16 +15589,8 @@ msgstr ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "Keywords"
 
@@ -16245,16 +15673,16 @@ msgid "Restore from backup"
 msgstr "Restore from backup"
 
 #: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "_Backup Settings…"
+msgid "_Backup Evolution Settings..."
+msgstr "_Back Up Evolution Settings…"
 
 #: ../plugins/backup-restore/backup-restore.c:355
 msgid "Backup Evolution data and settings to an archive file"
-msgstr "Backup Evolution data and settings to an archive file"
+msgstr "Back up Evolution data and settings to an archive file"
 
 #: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "R_estore Settings…"
+msgid "R_estore Evolution Settings..."
+msgstr "R_estore Evolution Settings…"
 
 #: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore Evolution data and settings from an archive file"
@@ -16262,7 +15690,7 @@ msgstr "Restore Evolution data and settings from an archive file"
 
 #: ../plugins/backup-restore/backup.c:63
 msgid "Backup Evolution directory"
-msgstr "Backup Evolution directory"
+msgstr "Back up Evolution directory"
 
 #: ../plugins/backup-restore/backup.c:65
 msgid "Restore Evolution directory"
@@ -16287,11 +15715,11 @@ msgstr "Shutting down Evolution"
 
 #: ../plugins/backup-restore/backup.c:196
 msgid "Backing Evolution accounts and settings"
-msgstr "Backing Evolution accounts and settings"
+msgstr "Backing up Evolution accounts and settings"
 
 #: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr "Backing up Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 
 #: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
@@ -16305,7 +15733,7 @@ msgstr "Restarting Evolution"
 
 #: ../plugins/backup-restore/backup.c:255
 msgid "Backup current Evolution data"
-msgstr "Backup current Evolution data"
+msgstr "Back up current Evolution data"
 
 #: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
@@ -16334,31 +15762,31 @@ msgid "Restoring from the folder %s"
 msgstr "Restoring from the folder %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Evolution Backup"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Evolution Restore"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "Backing up Evolution Data"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Please wait while Evolution backs up your data."
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "Restoring Evolution Data"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Please wait while Evolution restores your data."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "This may take a while depending on the amount of data in your account."
 
@@ -16369,7 +15797,7 @@ msgstr "Backup and Restore"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore your Evolution data and settings."
-msgstr "Backup and restore your Evolution data and settings."
+msgstr "Back up and restore your Evolution data and settings."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -16423,35 +15851,35 @@ msgstr ""
 "you proceed. If you want Evolution to restart automatically restart after "
 "restore, please enable the toggle button."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatic Contacts"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "Create _address book entries when sending mails"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "Select Address book for Automatic Contacts"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Instant Messaging Contacts"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "Synchronise contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "_Synchronise contact info and images from Pidgin buddy list"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Select Address book for Pidgin buddy list"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Synchronise with _buddy list now"
 
@@ -16473,33 +15901,33 @@ msgstr ""
 "reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter is not available. Please install it first."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Error occurred while spawning %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter child process does not respond, killing…"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Wait for Bogofilter child process interrupted, terminating…"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Pipe to Bogofilter failed, error code: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:392
 msgid "Convert message text to _Unicode"
 msgstr "Convert message text to _Unicode"
 
@@ -16527,15 +15955,15 @@ msgstr "Bogofilter Options"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filter junk messages using Bogofilter."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr "Authentication failed. Server requires correct login."
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "Given URL cannot be found."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16544,69 +15972,69 @@ msgstr ""
 "Server returned unexpected data.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "Failed to parse server response."
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "Events"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "User's calendars"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "Failed to get server URL."
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
 #: ../plugins/caldav/caldav-browse-server.c:1272
 msgid "Searching for user's calendars..."
 msgstr "Searching for user's calendars…"
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "Could not find any user calendar."
 
-#: ../plugins/caldav/caldav-browse-server.c:794
+#: ../plugins/caldav/caldav-browse-server.c:793
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "Previous attempt failed: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:796
+#: ../plugins/caldav/caldav-browse-server.c:795
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "Previous attempt failed with code %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:798
 #, c-format
 msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
 msgstr "Enter password for user <b>%s</b> on server <b>%s</b>"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:855
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "Cannot create soup message for URL '%s'"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1090
 msgid "Searching folder content..."
-msgstr "Searching folder content..."
+msgstr "Searching folder contents…"
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1133
 msgid "List of available calendars:"
 msgstr "List of available calendars:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1170
 msgid "Supports"
 msgstr "Supports"
 
@@ -16645,7 +16073,7 @@ msgstr "Brows_e server for a calendar"
 #: ../plugins/caldav/caldav-source.c:237
 #: ../plugins/calendar-file/calendar-file.c:178
 #: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
+#: ../plugins/calendar-weather/calendar-weather.c:395
 #: ../plugins/google-account-setup/google-contacts-source.c:323
 #: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
@@ -16747,26 +16175,26 @@ msgstr "Weather: Clear Night"
 msgid "Weather: Thunderstorms"
 msgstr "Weather: Thunderstorms"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "Select a location"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "None"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_Units:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metric (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, inches, etc)"
 
@@ -16803,7 +16231,7 @@ msgstr "Check whether Evolution is the default mailer"
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+"Every time Evolution starts, check whether it is the default mailer."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Check whether Evolution is the default mail client on startup."
@@ -16887,12 +16315,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "None"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "_Custom Header"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16900,12 +16328,12 @@ msgstr ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:950
 msgid "Key"
 msgstr "Key"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "Values"
 
@@ -16927,7 +16355,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "Automatically launch editor when key is pressed in the mail composer"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:118
 msgid "Automatically launch when a new mail is edited"
 msgstr "Automatically launch when a new mail is edited"
 
@@ -16939,11 +16367,11 @@ msgstr "Default External Editor"
 msgid "The default command that must be used as the editor."
 msgstr "The default command that must be used as the editor."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:107
 msgid "Command to be executed to launch the editor: "
 msgstr "Command to be executed to launch the editor: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:108
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16951,8 +16379,8 @@ msgstr ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:374
+#: ../plugins/external-editor/external-editor.c:376
 msgid "Compose in External Editor"
 msgstr "Compose in External Editor"
 
@@ -17059,7 +16487,7 @@ msgstr "The file cannot be read"
 #: ../plugins/face/org-gnome-face.error.xml.h:6
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
-"The file you selected does not look like a valid .png image. Error: {0}"
+"The file you selected does not look like a valid PNG image. Error: {0}"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:53
 #: ../plugins/google-account-setup/google-source.c:82
@@ -17086,8 +16514,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
 msgid "Unknown error."
 msgstr "Unknown error."
 
@@ -17107,7 +16535,7 @@ msgstr "Add Google Calendars to Evolution."
 msgid "Google Calendars"
 msgstr "Google Calendars"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Checklist"
 
@@ -17139,12 +16567,12 @@ msgstr "Accept Tentatively"
 msgid "Rese_nd Meeting..."
 msgstr "Rese_nd Meeting…"
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Create folder"
 msgstr "Create folder"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17169,19 +16597,19 @@ msgstr ""
 "Click 'Apply' to install the shared folder\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "Install the shared folder"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "Shared Folder Installation"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "Junk Settings"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Junk Mail Settings"
@@ -17217,7 +16645,7 @@ msgstr "_Remove"
 msgid "Message Retract"
 msgstr "Message Retract"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -17225,7 +16653,7 @@ msgstr ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "Message retracted successfully"
 
@@ -17297,7 +16725,7 @@ msgstr "You have to specify a valid user name to give proxy rights."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "You cannot share folder with the specified user &quot;{0}&quot;"
+msgstr "You cannot share this folder with the specified user &quot;{0}&quot;"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
 msgid "You have to specify a user name which you want to add to the list"
@@ -17429,43 +16857,49 @@ msgstr "<b>Account Name</b>"
 msgid "Proxy Login"
 msgstr "Proxy Login"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sEnter password for %s (user %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:690
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "The Proxy tab will be available only when the account is online."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "The Proxy tab will be available only when the account is enabled."
 
-#: ../plugins/groupwise-features/proxy.c:931
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../plugins/groupwise-features/proxy.c:929
 #: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "Add User"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "Advanced send options"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:313
 #: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "Users"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:314
 msgid "Enter the users and set permissions"
 msgstr "Enter the users and set permissions"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:412
 msgid "Sharing"
 msgstr "Sharing"
 
@@ -17477,63 +16911,55 @@ msgstr "Custom Notification"
 msgid "Add   "
 msgstr "Add   "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Message Status"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Subject:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "From:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Creation date:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "Delivered: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "Opened: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "Accepted: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "Deleted: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "Declined: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "Completed: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "Undelivered: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Add Hula support to Evolution."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Hula Support"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Inline Image"
@@ -17542,12 +16968,12 @@ msgstr "Inline Image"
 msgid "View image attachments directly in mail messages."
 msgstr "View image attachments directly in mail messages."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:325
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Custom Headers"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:338
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP Headers"
@@ -17594,140 +17020,140 @@ msgstr "Fine-tune your IMAP accounts."
 msgid "IMAP Features"
 msgstr "IMAP Features"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/itip-formatter/itip-formatter.c:475
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Failed to load the calendar '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:641
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "An appointment in the calendar '%s' conflicts with this meeting"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:677
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Found the appointment in the calendar '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find this meeting in any calendar"
 msgstr "Unable to find this meeting in any calendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find this task in any task list"
 msgstr "Unable to find this task in any task list"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this memo in any memo list"
 msgstr "Unable to find this memo in any memo list"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:862
 msgid "Opening the calendar. Please wait.."
 msgstr "Opening the calendar. Please wait.."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:865
 msgid "Searching for an existing version of this appointment"
 msgstr "Searching for an existing version of this appointment"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1046
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Unable to send item to calendar '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1145
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sent to calendar '%s' as accepted"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1149
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sent to calendar '%s' as tentative"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1154
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sent to calendar '%s' as declined"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sent to calendar '%s' as cancelled"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1262
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Could not send the cancellation notice to the delegate"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1373
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Attendee status could not be updated because the status is invalid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1402
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1435
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1438
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Unable to send meeting information, the meeting does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1450
 msgid "Unable to send task information, the task does not exist"
 msgstr "Unable to send task information, the task does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Unable to send memo information, the memo does not exist"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1523
 msgid "Save Calendar"
 msgstr "Save Calendar"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 #: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 #: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17735,15 +17161,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1628
+#: ../plugins/itip-formatter/itip-formatter.c:1656
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "The item in the calendar is not valid"
 msgstr "The item in the calendar is not valid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1629
+#: ../plugins/itip-formatter/itip-formatter.c:1657
+#: ../plugins/itip-formatter/itip-formatter.c:1763
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17751,11 +17177,11 @@ msgstr ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1670
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1671
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17763,216 +17189,216 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2436
 msgid "This meeting recurs"
 msgstr "This meeting recurs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2439
 msgid "This task recurs"
 msgstr "This task recurs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2442
 msgid "This memo recurs"
 msgstr "This memo recurs"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2676
 msgid "_Delete message after acting"
 msgstr "_Delete message after acting"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2686
+#: ../plugins/itip-formatter/itip-formatter.c:2719
 msgid "Conflict Search"
 msgstr "Conflict Search"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2701
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Select the calendars to search for meeting conflicts"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Today %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Today %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Today %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Tomorrow %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Tomorrow %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Tomorrow %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Tomorrow %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Please respond on behalf of <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Received on behalf of <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> through %s has published the following meeting information:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> has published the following meeting information:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> has delegated the following meeting to you:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> through %s requests your presence at the following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> requests your presence at the following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> through %s wishes to add to an existing meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> wishes to add to an existing meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17981,89 +17407,89 @@ msgstr ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> through %s has sent back the following meeting response:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> has sent back the following meeting response:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> through %s has cancelled the following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> has cancelled the following meeting."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> through %s has proposed the following meeting changes."
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> has proposed the following meeting changes."
 
-#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> through %s has declined the following meeting changes:"
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> has declined the following meeting changes."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> through %s has published the following task:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> has published the following task:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> requests the assignment of %s to the following task:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> through %s has assigned you a task:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> has assigned you a task:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> through %s wishes to add to an existing task:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> wishes to add to an existing task:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18072,7 +17498,7 @@ msgstr ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18081,194 +17507,194 @@ msgstr ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> has sent back the following assigned task response:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> through %s has cancelled the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> has cancelled the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> has proposed the following task assignment changes:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> through %s has declined the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> has declined the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> through %s has published the following memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> has published the following memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:540
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> through %s wishes to add to an existing memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> wishes to add to an existing memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> through %s has cancelled the following shared memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> has cancelled the following shared memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:672
 msgid "All day:"
 msgstr "All day:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:682
 msgid "Start day:"
 msgstr "Start day:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:682
+#: ../plugins/itip-formatter/itip-view.c:1037
 msgid "Start time:"
 msgstr "Start time:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:694
 msgid "End day:"
 msgstr "End day:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:694
+#: ../plugins/itip-formatter/itip-view.c:1048
 msgid "End time:"
 msgstr "End time:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:827
 msgid "_Open Calendar"
 msgstr "_Open Calendar"
 
+#: ../plugins/itip-formatter/itip-view.c:833
 #: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:865
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
-#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:867
 msgid "_Accept"
 msgstr "_Accept"
 
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:837
 msgid "_Decline all"
 msgstr "_Decline all"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:838
 msgid "_Tentative all"
 msgstr "_Tentative all"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Tentative"
 msgstr "_Tentative"
 
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:839
 msgid "_Accept all"
 msgstr "_Accept all"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Send Information"
 msgstr "_Send Information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Update Attendee Status"
 msgstr "_Update Attendee Status"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Update"
 msgstr "_Update"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1068
+#: ../plugins/itip-formatter/itip-view.c:1122
 msgid "Comment:"
 msgstr "Comment:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1107
 msgid "Send _reply to sender"
 msgstr "Send _reply to sender"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1137
 msgid "Send _updates to attendees"
 msgstr "Send _updates to attendees"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1146
 msgid "_Apply to all instances"
 msgstr "_Apply to all instances"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1155
 msgid "Show time as _free"
 msgstr "Show time as _free"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1158
 msgid "_Preserve my reminder"
 msgstr "_Preserve my reminder"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1164
 msgid "_Inherit reminder"
 msgstr "_Inherit reminder"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1907
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1909
 msgid "_Memos:"
 msgstr "_Memos:"
 
@@ -18374,16 +17800,16 @@ msgstr "Whether the icon should blink or not."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Whether to notify new messages in Inbox folder only."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:343
 msgid "Evolution's Mail Notification"
 msgstr "Evolution's Mail Notification"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:365
 msgid "Mail Notification Properties"
 msgstr "Mail Notification Properties"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:496
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18399,66 +17825,66 @@ msgstr[1] ""
 "in %s."
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:507
 #, c-format
 msgid "From: %s"
 msgstr "From: %s"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#: ../plugins/mail-notification/mail-notification.c:519
 #, c-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:528
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "You have received %d new message."
 msgstr[1] "You have received %d new messages."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:551
 msgid "New email"
 msgstr "New e-mail"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:605
 msgid "Show icon in _notification area"
 msgstr "Show icon in _notification area"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:633
 msgid "B_link icon in notification area"
 msgstr "B_link icon in notification area"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:643
 msgid "Popup _message together with the icon"
 msgstr "Popup _message together with the icon"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:828
 msgid "_Play sound when new messages arrive"
 msgstr "_Play sound when new messages arrive"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:857
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:870
 msgid "Use sound _theme"
 msgstr "Use sound _theme"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:889
 msgid "Play _file:"
 msgstr "Play _file:"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:900
 msgid "Select sound file"
 msgstr "Select sound file"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:958
 msgid "Notify new messages for _Inbox only"
 msgstr "Notify new messages for _Inbox only"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:967
 msgid "Generate a _D-Bus message"
 msgstr "Generate a _D-Bus message"
 
@@ -18471,12 +17897,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Notifies you when new mail messages arrive."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Created from a mail by %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18485,7 +17911,7 @@ msgstr ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18494,7 +17920,7 @@ msgstr ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18503,7 +17929,7 @@ msgstr ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#: ../plugins/mail-to-task/mail-to-task.c:512
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18511,7 +17937,7 @@ msgstr ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18519,7 +17945,7 @@ msgstr ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#: ../plugins/mail-to-task/mail-to-task.c:518
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18527,7 +17953,7 @@ msgstr ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#: ../plugins/mail-to-task/mail-to-task.c:536
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18541,7 +17967,7 @@ msgstr[1] ""
 "Selected calendar contains events for the given mails already. Would you "
 "like to create new events anyway?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:542
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18555,7 +17981,7 @@ msgstr[1] ""
 "Selected task list contains tasks for the given mails already. Would you "
 "like to create new tasks anyway?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18569,25 +17995,25 @@ msgstr[1] ""
 "Selected memo list contains memos for the given mails already. Would you "
 "like to create new memos anyway?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:607
 msgid "[No Summary]"
 msgstr "[No Summary]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:618
 msgid "Invalid object returned from a server"
 msgstr "Invalid object returned from a server"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:689
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "An error occurred during processing: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:718
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Cannot open calendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:725
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18595,7 +18021,7 @@ msgstr ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18603,7 +18029,7 @@ msgstr ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:731
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18611,40 +18037,40 @@ msgstr ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:934
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Cannot get source list. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1053
 msgid "Create an _Event"
 msgstr "Create an _Event"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1055
 msgid "Create a new event from the selected message"
 msgstr "Create a new event from the selected message"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create a Mem_o"
 msgstr "Create a Mem_o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new memo from the selected message"
 msgstr "Create a new memo from the selected message"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a _Task"
 msgstr "Create a _Task"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new task from the selected message"
 msgstr "Create a new task from the selected message"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a _Meeting"
 msgstr "Create a _Meeting"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a new meeting from the selected message"
 msgstr "Create a new meeting from the selected message"
 
@@ -18652,55 +18078,55 @@ msgstr "Create a new meeting from the selected message"
 msgid "Convert a mail message to a task."
 msgstr "Convert a mail message to a task."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:279
 msgid "Get List _Archive"
 msgstr "Get List _Archive"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:281
 msgid "Get an archive of the list this message belongs to"
 msgstr "Get an archive of the list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Usage Information"
 msgstr "Get List _Usage Information"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Get information about the usage of the list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Contact List _Owner"
 msgstr "Contact List _Owner"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Contact the owner of the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "_Post Message to List"
 msgstr "_Post Message to List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Post a message to the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Subscribe to List"
 msgstr "_Subscribe to List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Subscribe to the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Unsubscribe from List"
 msgstr "_Unsubscribe from List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Unsubscribe from the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Mailing _List"
 msgstr "Mailing _List"
 
@@ -18792,11 +18218,11 @@ msgstr "_Edit message"
 msgid "_Send message"
 msgstr "_Send message"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mark-all-read/mark-all-read.c:41
 msgid "Also mark messages in subfolders?"
 msgstr "Also mark messages in subfolders?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:44
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18871,19 +18297,19 @@ msgstr "Prefer Plain Text"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "View mail messages as plain text, even if they contain HTML content."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "Show HTML if present"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "Let Evolution choose the best part to show."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "Show plain text if present"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18891,11 +18317,11 @@ msgstr ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "Only ever show plain text"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -18903,11 +18329,11 @@ msgstr ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Show s_uppressed HTML parts as attachments"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "HTML _Mode"
 
@@ -18931,31 +18357,31 @@ msgstr "Outlook PST import"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personal folders (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:289
 msgid "_Mail"
 msgstr "_Mail"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:307
 msgid "_Address Book"
 msgstr "_Address Book"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "A_ppointments"
 msgstr "A_ppointments"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:320 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tasks"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:326
 msgid "_Journal entries"
 msgstr "_Journal entries"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:341
 msgid "Importing Outlook data"
 msgstr "Importing Outlook data"
 
@@ -19113,55 +18539,55 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Could not publish calendar: Calendar backend no longer exists"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "New Location"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "Edit Location"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin not found, code: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Failed to create pipe: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Error after fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr "SpamAssassin child process does not respond, killing…"
+msgstr "SpamAssassin child process does not respond; killing…"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "Wait for SpamAssassin child process interrupted, terminating…"
+msgstr "Wait for SpamAssassin child process interrupted; terminating…"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Pipe to SpamAssassin failed, error code: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin is not available. Please install it first."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "This will make SpamAssassin more reliable, but slower"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
 msgid "I_nclude remote tests"
 msgstr "I_nclude remote tests"
 
@@ -19341,11 +18767,11 @@ msgstr "From %s:"
 msgid "Importing files"
 msgstr "Importing files"
 
-#: ../plugins/startup-wizard/startup-wizard.c:248
+#: ../plugins/startup-wizard/startup-wizard.c:251
 msgid "Importing data."
 msgstr "Importing data."
 
-#: ../plugins/startup-wizard/startup-wizard.c:250
+#: ../plugins/startup-wizard/startup-wizard.c:257
 msgid "Please wait"
 msgstr "Please wait"
 
@@ -19378,15 +18804,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Drafts-based template plugin"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:613
 msgid "No Title"
 msgstr "No Title"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:684
 msgid "Save as _Template"
 msgstr "Save as _Template"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:686
 msgid "Save as Template"
 msgstr "Save as Template"
 
@@ -19406,27 +18832,27 @@ msgstr "Inline vCards"
 msgid "Show vCards directly in mail messages."
 msgstr "Show vCards directly in mail messages."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:157
+#: ../plugins/vcard-inline/vcard-inline.c:242
 msgid "Show Full vCard"
 msgstr "Show Full vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:160
 msgid "Show Compact vCard"
 msgstr "Show Compact vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:221
 msgid "There is one other contact."
 msgstr "There is one other contact."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:230
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "There is %d other contact."
 msgstr[1] "There are %d other contacts."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:251
 msgid "Save in Address Book"
 msgstr "Save in Address Book"
 
@@ -19492,11 +18918,9 @@ msgstr "Enable express mode"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the "
-"Internet."
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the "
-"Internet."
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Flag that enables a much simplified user interface."
@@ -19612,7 +19036,7 @@ msgstr "Sidebar is visible"
 msgid "Skip development warning dialog"
 msgstr "Skip development warning dialogue"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:307
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
@@ -19737,7 +19161,7 @@ msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
-msgstr "Whether or not the window should be maximised."
+msgstr "Whether the window should be maximised."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the sidebar should be visible."
@@ -19769,143 +19193,46 @@ msgstr "Window button style"
 msgid "Window buttons are visible"
 msgstr "Window buttons are visible"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
 msgid "Searches"
 msgstr "Searches"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:545
 msgid "Save Search"
 msgstr "Save Search"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "Sho_w:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "Sear_ch:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr "i_n"
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "Toolbar Style"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "The switcher's toolbar style"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "Toolbar Visible"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "Whether the switcher is visible"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "All Files (*)"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "Switcher Action"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "The switcher action for this shell view"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "Page Number"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr "The notebook page number of the shell view"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "Search Rule"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "Criteria for the current search results"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "EShellBackend"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "Shell Content Widget"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr "The content widget appears in a shell window's right pane"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "Shell Sidebar Widget"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "The sidebar widget appears in a shell window's left pane"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "Shell Taskbar Widget"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "The taskbar widget appears at the bottom of a shell window"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "Shell Window"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "The window to which the shell view belongs"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "The key file holding widget state data"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "The title of the shell view"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "Current View ID"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "The current GAL view ID"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -19921,404 +19248,316 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution Website"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy is not installed."
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy could not be run."
 
-#: ../shell/e-shell-window-actions.c:1343
+#: ../shell/e-shell-window-actions.c:1347
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME Pilot is not installed."
 
-#: ../shell/e-shell-window-actions.c:1345
+#: ../shell/e-shell-window-actions.c:1349
 msgid "GNOME Pilot could not be run."
 msgstr "GNOME Pilot could not be run."
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1443
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1455
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1457
 msgid "Open the Evolution User Guide"
 msgstr "Open the Evolution User Guide"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Open the Frequently Asked Questions webpage"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1490
 msgid "_Forget Passwords"
 msgstr "_Forget Passwords"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1492
 msgid "Forget all remembered passwords"
 msgstr "Forget all remembered passwords"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1497
 msgid "I_mport..."
 msgstr "I_mport…"
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1504
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1506
 msgid "Create a new window displaying this view"
 msgstr "Create a new window displaying this view"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Configure Evolution"
 msgstr "Configure Evolution"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Show Evolution's shortcut keys"
 msgstr "Show Evolution's shortcut keys"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "_Advanced Search…"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr "Construct a more advanced search"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Clear the current search parameters"
 msgstr "Clear the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1553
 msgid "_Edit Saved Searches..."
 msgstr "_Edit Saved Searches…"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Manage your saved searches"
 msgstr "Manage your saved searches"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "_Find Now"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Execute the current search parameters"
 msgstr "Execute the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "_Save Search…"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Save the current search parameters"
 msgstr "Save the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Send / _Receive"
 msgstr "Send / _Receive"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Send queued items and retrieve new items"
 msgstr "Send queued items and retrieve new items"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Submit _Bug Report..."
 msgstr "Submit _Bug Report…"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1602
 msgid "GNOME Pilot _Synchronization..."
-msgstr "GNOME Pilot _Synchronisation..."
+msgstr "GNOME Pilot _Synchronisation…"
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1604
 msgid "Set up GNOME Pilot configuration"
 msgstr "Set up GNOME Pilot configuration"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1611
 msgid "Put Evolution into offline mode"
 msgstr "Put Evolution into offline mode"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1618
 msgid "Put Evolution into online mode"
 msgstr "Put Evolution into online mode"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1646
 msgid "Lay_out"
 msgstr "Lay_out"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_New"
 msgstr "_New"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Search"
 msgstr "_Search"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Window"
 msgstr "_Window"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show Side _Bar"
 msgstr "Show Side _Bar"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1712
 msgid "Show the side bar"
 msgstr "Show the side bar"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show _Buttons"
 msgstr "Show _Buttons"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1720
 msgid "Show the switcher buttons"
 msgstr "Show the switcher buttons"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1726
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Show the status bar"
 msgstr "Show the status bar"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1734
 msgid "Show _Tool Bar"
 msgstr "Show _Tool Bar"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1736
 msgid "Show the tool bar"
 msgstr "Show the tool bar"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1758
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1765
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1767
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Icons _and Text"
 msgstr "Icons _and Text"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Tool_bar Style"
 msgstr "Tool_bar Style"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Display window buttons using the desktop toolbar setting"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Define Views..."
 msgstr "Define Views…"
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1791
 msgid "Create or edit views"
 msgstr "Create or edit views"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Save Custom View..."
 msgstr "Save Custom View…"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1805
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1827
 msgid "Change the page settings for your current printer"
 msgstr "Change the page settings for your current printer"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2204
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2417
 msgid "Execute these search parameters"
 msgstr "Execute these search parameters"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:571
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s — Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "New"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "Active Shell View"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "Name of the active shell view"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "The shell window's EFocusTracker"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "Geometry"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "Initial window geometry string"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Safe Mode"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Whether the shell window is in safe mode"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "Sidebar is visible"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "Whether the shell window's side bar is visible"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "Switcher Visible"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Whether the shell window's switcher buttons are visible"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "Taskbar Visible"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "Whether the shell window's task bar is visible"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Whether the shell window's tool bar is visible"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "UI Manager"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "The shell window's GtkUIManager"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
-msgstr "Preparing to go offline..."
+msgstr "Preparing to go offline…"
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
-msgstr "Preparing to go online..."
+msgstr "Preparing to go online…"
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "Preparing to quit…"
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "Module Directory"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "The directory from which to load EModules"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "Network Available"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "Whether the network is available"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "Online"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "Whether the shell is online"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:164
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20353,7 +19592,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:188
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20361,59 +19600,55 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:195
 msgid "Do not tell me again"
 msgstr "Do not tell me again"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:303
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:305
 msgid "Apply the given geometry to the main window"
 msgstr "Apply the given geometry to the main window"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:309
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:311
 msgid "Start in \"express\" mode"
 msgstr "Start in \"express\" mode"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:314
 msgid "Forcibly shut down Evolution"
 msgstr "Forcibly shut down Evolution"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Forcibly re-migrate from Evolution 1.4"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:317
 msgid "Send the debugging output of all components to a file."
 msgstr "Send the debugging output of all components to a file."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:319
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:321
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:325
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Import URIs or file names given as rest of arguments."
 
-#: ../shell/main.c:350
+#: ../shell/main.c:327
 msgid "Request a running Evolution process to quit"
 msgstr "Request a running Evolution process to quit"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:442
 msgid "- The Evolution PIM and Email Client"
 msgstr "- The Evolution PIM and E-mail Client"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:468
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20426,105 +19661,47 @@ msgstr ""
 msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Are you sure you want to forget all remembered passwords?"
 
-#: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Continue"
-
 #  shell:upgrade-remove-1-4 title
 #  shell:upgrade-remove-1-4 primary
+#: ../shell/shell.error.xml.h:2
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Cannot upgrade directly from version {0}"
+
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Delete old data from version {0}?"
+msgid "Continue Anyway"
+msgstr "Continue Anyway"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+
+#: ../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 ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "Insufficient disk space for upgrade."
-
-#  shell:upgrade-remove-1-4-confirm title
-#  shell:upgrade-remove-1-4-confirm primary
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "Really delete old data?"
+msgid "Quit Now"
+msgstr "Quit Now"
 
-#  shell:upgrade-remove-1-4-confirm secondary
 #: ../shell/shell.error.xml.h:8
-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 ""
-"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"
-
-#  shell:upgrade-remove-1-4 secondary
-#: ../shell/shell.error.xml.h:14
-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 ""
-"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"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "Upgrade from previous version failed:"
 
-#: ../shell/shell.error.xml.h:19
-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 ""
-"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."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "_Forget"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_Keep Data"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_Remind Me Later"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20617,7 +19794,7 @@ msgstr "Session management options:"
 msgid "Show session management options"
 msgstr "Show session management options"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20696,19 +19873,19 @@ msgstr "E-Mail Address"
 msgid "All CA certificate files"
 msgstr "All CA certificate files"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:1052
 msgid "Certificates"
 msgstr "Certificates"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Certificate Viewer: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "Enter the password for `%s'"
+msgid "Enter the password for '%s'"
+msgstr "Enter the password for '%s'"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -20738,7 +19915,7 @@ msgstr ""
 "Issued by:\n"
 "  Subject: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Select certificate"
 
@@ -20766,7 +19943,7 @@ msgstr ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "Certificate"
 
@@ -21063,28 +20240,34 @@ msgstr "Not Critical"
 msgid "Extensions"
 msgstr "Extensions"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Algorithm"
 msgstr "Certificate Signature Algorithm"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Issuer"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "Issuer Unique ID"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "Subject Unique ID"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1220
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
@@ -21174,10 +20357,10 @@ msgstr "With _Status"
 
 #. Put the "UTC" entry at the top of the combo's list.
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:778
 msgid "UTC"
 msgstr "UTC"
 
@@ -21207,19 +20390,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_Selection"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "Collection"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:339
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Define Views for %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-define-views-dialog.c:349
 msgid "Define Views"
 msgstr "Define Views"
 
@@ -21232,11 +20410,7 @@ msgstr "Define Views for \"%s\""
 msgid "Table"
 msgstr "Table"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Instance"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Save Current View"
 
@@ -21248,11 +20422,7 @@ msgstr "_Create new view"
 msgid "_Replace existing view"
 msgstr "_Replace existing view"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "Factory"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "Define New View"
 
@@ -21280,14 +20450,6 @@ msgstr "Account Name"
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "Action"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "A GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Attachment Properties"
@@ -21305,11 +20467,11 @@ msgstr "MIME Type:"
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggest automatic display of attachment"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "Could not set as background"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
@@ -21342,13 +20504,10 @@ msgid "Hide Attachment _Bar"
 msgstr "Hide Attachment _Bar"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:636
 msgid "Show Attachment _Bar"
 msgstr "Show Attachment _Bar"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "Show _Attachment Bar"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "Add Attachment"
@@ -21365,32 +20524,32 @@ msgstr[1] "Save Attachments"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "S_ave All"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "A_dd Attachment…"
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "_Hide"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:356
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Open with \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Open this attachment in %s"
@@ -21399,59 +20558,59 @@ msgstr "Open this attachment in %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "Attached message"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 msgid "A load operation is already in progress"
 msgstr "A load operation is already in progress"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 msgid "A save operation is already in progress"
 msgstr "A save operation is already in progress"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Could not load '%s'"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Could not load the attachment"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2193
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Could not open '%s'"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2196
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Could not open the attachment"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "Attachment contents not loaded"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2707
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Could not save '%s'"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2710
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Could not save the attachment"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-click to open a link"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21459,65 +20618,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Month Calendar"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Fill colour"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK fill colour"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Fill stipple"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Minimum width"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Minimum Width"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Spacing"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Character Encoding"
@@ -21530,48 +20630,48 @@ msgstr "Enter the character set to use"
 msgid "Other..."
 msgstr "Other…"
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Text entry to input date"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Click this button to show a calendar"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Drop-down combination box to select time"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "No_w"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_Today"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_None"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "None"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "Invalid Date Value"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "Invalid Time Value"
 
@@ -21667,11 +20767,11 @@ msgstr "Click \"Apply\" to begin importing the file into Evolution."
 msgid "Import Data"
 msgstr "Import Data"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:621
 msgid "World Map"
 msgstr "World Map"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:623
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21691,42 +20791,6 @@ msgstr "Evolution is currently offline.  Click this button to work online."
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution is currently offline because the network is unavailable."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "The button state is online"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "Horizontal Position"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "Pane position when orientated horizontally"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "Vertical Position"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "Pane position when orientated vertically"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "Proportion"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "Proportion of the 2nd pane size"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "Fixed Resize"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Keep the 2nd pane fixed during resize"
-
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Sync with:"
@@ -21748,68 +20812,46 @@ msgstr "Evolution Preferences"
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "Close the find bar"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "Fin_d:"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "Clear the search"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "_Previous"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "Find the previous occurrence of the phrase"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "_Next"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "Find the next occurrence of the phrase"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "Mat_ch case"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr "Reached bottom of page, continued from top"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "Reached top of page, continued from bottom"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "Cursor Row"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Cursor Column"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Sorter"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Selection Mode"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Cursor Mode"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "When de_leted:"
@@ -21882,43 +20924,46 @@ msgstr "When co_mpleted:"
 msgid "When decli_ned:"
 msgstr "When decli_ned:"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "Wi_thin"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "_After:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_After"
+msgstr "_After"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_All information"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "_Classification:"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "_Delay message delivery"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "_Delivered"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "_Set expiration date"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "_Until:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "_Until"
+msgstr "_Until"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "_When convenient"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "_When opened:"
 
@@ -21975,41 +21020,41 @@ msgstr "Script file must be executable."
 msgid "Click here to go to URL"
 msgstr "Click here to go to URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:359
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:361
 msgid "Copy the link to the clipboard"
 msgstr "Copy the link to the clipboard"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:371
 msgid "Open the link in a web browser"
 msgstr "Open the link in a web browser"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Copy Email Address"
 msgstr "_Copy E-mail Address"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
 msgid "Select all text and images"
 msgstr "Select all text and images"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 #, c-format
 msgid "Click to call %s"
 msgstr "Click to call %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:846
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
@@ -22028,7 +21073,7 @@ msgstr "Calendar: from %s to %s"
 msgid "evolution calendar item"
 msgstr "evolution calendar item"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:178
 msgid "popup list"
 msgstr "popup list"
 
@@ -22046,7 +21091,7 @@ msgstr "None"
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "The time must be in the format: %s"
@@ -22055,48 +21100,12 @@ msgstr "The time must be in the format: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "The percent value must be between 0 and 100, inclusive"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Selected Column"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Focused Column"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Unselected Column"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Strikeout Column"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "Underline Column"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Bold Column"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Colour Column"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "BG Colour Column"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "click to add"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "State"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Ascending)"
@@ -22113,12 +21122,12 @@ msgstr "Not sorted"
 msgid "No grouping"
 msgstr "No grouping"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Show Fields"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "Available Fields"
 
@@ -22127,7 +21136,7 @@ msgid "A_vailable Fields:"
 msgstr "A_vailable Fields:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "Ascending"
 
@@ -22140,7 +21149,7 @@ msgid "Clear _All"
 msgstr "Clear _All"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "Descending"
 
@@ -22200,7 +21209,7 @@ msgstr "_Show these fields in order:"
 msgid "_Sort..."
 msgstr "_Sort…"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "Add a Column"
 
@@ -22212,247 +21221,112 @@ msgstr ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d item)"
-msgstr[1] "%s : %s (%d items)"
-
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
+#, 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)"
+
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d item)"
 msgstr[1] "%s (%d items)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Alternating Row Colours"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Horizontal Draw Grid"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Vertical Draw Grid"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Draw focus"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Cursor mode"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Selection model"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "Length Threshold"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Uniform row height"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "Frozen"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
 msgstr "Customise Current View"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Sort _Ascending"
 msgstr "Sort _Ascending"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1565
 msgid "Sort _Descending"
 msgstr "Sort _Descending"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1568
 msgid "_Unsort"
 msgstr "_Unsort"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1571
 msgid "Group By This _Field"
 msgstr "Group By This _Field"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Group By _Box"
 msgstr "Group By _Box"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Remove This _Column"
 msgstr "Remove This _Column"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Add a C_olumn..."
 msgstr "Add a C_olumn…"
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "A_lignment"
 msgstr "A_lignment"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "B_est Fit"
 msgstr "B_est Fit"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Format Column_s..."
 msgstr "Format Column_s…"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Custo_mize Current View..."
 msgstr "Custo_mise Current View…"
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Sort By"
 msgstr "_Sort By"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1672
 msgid "_Custom"
 msgstr "_Custom"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "Table header"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Table model"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Cursor row"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Sort Info"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Always search"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Use click to add"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "Vertical Row Spacing"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "Vertical space between rows. It is added to top and to bottom of a row"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree table adaptor"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Retro Look"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Draw lines and +/- expanders."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "Expander Size"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "Size of the expander arrow"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "popup"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "pop up a child"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "edit"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "begin editing this cell"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "toggle"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "toggle the cell"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "expand"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "expands the row in the ETree containing this cell"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "collapse"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "collapses the row in the ETree containing this cell"
 
@@ -22468,118 +21342,994 @@ msgstr "click"
 msgid "sort"
 msgstr "sort"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "Select All"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "Input Methods"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Event Processor"
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
+#~ msgid "Web Log:"
+#~ msgstr "Web Log:"
+
+#~ msgid "_Web Log:"
+#~ msgstr "_Web Log:"
+
+#~ msgid "Editable"
+#~ msgstr "Editable"
+
+#~ msgid "Source Book"
+#~ msgstr "Source Book"
+
+#~ msgid "Target Book"
+#~ msgstr "Target Book"
+
+#~ msgid "Is New Contact"
+#~ msgstr "Is New Contact"
+
+#~ msgid "Writable Fields"
+#~ msgstr "Writable Fields"
+
+#~ msgid "Required Fields"
+#~ msgstr "Required Fields"
+
+#~ msgid "Changed"
+#~ msgstr "Changed"
+
+#~ msgid "Shell"
+#~ msgstr "Shell"
+
+#~ msgid "The EShell singleton"
+#~ msgstr "The EShell singleton"
+
+#~ msgid "Book"
+#~ msgstr "Book"
+
+#~ msgid "Is New List"
+#~ msgstr "Is New List"
+
+#~ msgid "Query"
+#~ msgstr "Query"
+
+#~ msgid "Model"
+#~ msgstr "Model"
+
+#~ msgid "Shell View"
+#~ msgstr "Shell View"
+
+#~ msgid "Source"
+#~ msgstr "Source"
+
+#~ msgid "Width"
+#~ msgstr "Width"
+
+#~ msgid "Height"
+#~ msgstr "Height"
+
+#~ msgid "Has Focus"
+#~ msgstr "Has Focus"
+
+#~ msgid "Field"
+#~ msgstr "Field"
+
+#~ msgid "Field Name"
+#~ msgstr "Field Name"
+
+#~ msgid "Text Model"
+#~ msgstr "Text Model"
+
+#~ msgid "Max field name length"
+#~ msgstr "Max field name length"
+
+#~ msgid "Column Width"
+#~ msgstr "Column Width"
+
+#~ msgid "Adapter"
+#~ msgstr "Adaptor"
+
+#~ msgid "Selected"
+#~ msgstr "Selected"
+
+#~ msgid "Has Cursor"
+#~ msgstr "Has Cursor"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "Calendar repository is offline."
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "Error on '{0}'"
+
+#~ msgid "No response from the server."
+#~ msgstr "No response from the server."
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "Unable to load the calendar"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Attendee_s..."
+#~ msgstr "Attendee_s…"
+
+#~ msgid "Default Client"
+#~ msgstr "Default Client"
+
+#~ msgid "Shell Settings"
+#~ msgstr "Shell Settings"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "Application-wide settings"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "A_ttendees…"
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "_Select Today"
+
+#~ msgid "New Tab"
+#~ msgstr "New Tab"
+
+#~ msgid "Name of the logger"
+#~ msgstr "Name of the logger"
+
+#~ msgid "Filename"
+#~ msgstr "Filename"
+
+#~ msgid "The filename of the module"
+#~ msgstr "The filename of the module"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "Whether the plugin is enabled"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "Focus Tracker"
+
+#~ msgid "Shell Module"
+#~ msgstr "Shell Module"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "The mail shell backend"
+
+#~ msgid "Show Deleted"
+#~ msgstr "Show Deleted"
+
+#~ msgid "To Do"
+#~ msgstr "To Do"
+
+#~ msgid "Later"
+#~ msgstr "Later"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "Unable to create new folder `%s': %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "Unable to copy folder `%s' to `%s': %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "Unable to scan for existing mailboxes at `%s': %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "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…"
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "Unable to open old POP keep-on-server data `%s': %s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "Failed to create local mail storage `%s': %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "Allows Evolution to display text part of limited size"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "Enable to render message text part of limited size."
+
+#~ msgid "Text message part limit"
+#~ msgstr "Text message part limit"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "Because \"{0}\"."
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "Because \"{2}\"."
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now-removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now-removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+
+#~ msgid "Shell Backend"
+#~ msgstr "Shell Backend"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+
+#~ msgid "Table column:"
+#~ msgstr "Table column:"
+
+#~ msgid "Source List"
+#~ msgstr "Source List"
+
+#~ msgid "The registry of address books"
+#~ msgstr "The registry of address books"
+
+#~ msgid "Current View"
+#~ msgstr "Current View"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "The currently selected address book view"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "Previewed Contact"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "The contact being shown in the preview pane"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "Preview is Visible"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "Whether the preview pane is visible"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "LDAP Servers"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "Autocompletion Settings"
+
+#~ 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 ""
+#~ "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…"
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders…"
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders…"
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data…"
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "Source Selector Widget"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "This widget displays groups of address books"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "Save as vCard…"
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "The registry of calendars"
+
+#~ 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 ""
+#~ "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…"
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr "Unable to migrate old settings from evolution/config.xmldb"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "Unable to migrate calendar `%s'"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "Date Navigator Widget"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "This widget displays a miniature calendar"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "Default Calendar Client"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "Default client for calendar operations"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "This widget displays groups of calendars"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "The registry of memo lists"
+
+#~ msgid "The memo table model"
+#~ msgstr "The memo table model"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "Default Memo Client"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "Default client for memo operations"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "This widget displays groups of memo lists"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "The registry of task lists"
+
+#~ msgid "The task table model"
+#~ msgstr "The task table model"
+
+#~ 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 ""
+#~ "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…"
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "Unable to migrate tasks `%s'"
+
+#~ msgid "Default Task Client"
+#~ msgstr "Default Task Client"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "Default client for task operations"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "This widget displays groups of task lists"
+
+#~ msgid "Group by Threads"
+#~ msgstr "Group by Threads"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "Whether to group messages by threads"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Hide _Read Messages"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "Temporarily hide all messages that have already been read"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Hide S_elected Messages"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "Temporarily hide the selected messages"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "Show Hidde_n Messages"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "Show messages that have been temporarily hidden"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Hide _Deleted Messages"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "Add Hula support to Evolution."
+
+#~ msgid "Hula Support"
+#~ msgstr "Hula Support"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "Toolbar Style"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "The switcher's toolbar style"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "Toolbar Visible"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "Whether the switcher is visible"
+
+#~ msgid "Switcher Action"
+#~ msgstr "Switcher Action"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "The switcher action for this shell view"
+
+#~ msgid "Page Number"
+#~ msgstr "Page Number"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "The notebook page number of the shell view"
+
+#~ msgid "Search Rule"
+#~ msgstr "Search Rule"
+
+#~ msgid "Criteria for the current search results"
+#~ msgstr "Criteria for the current search results"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "EShellBackend"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "Shell Content Widget"
+
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr "The content widget appears in a shell window's right pane"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Shell Sidebar Widget"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr "The sidebar widget appears in a shell window's left pane"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "Shell Taskbar Widget"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr "The taskbar widget appears at the bottom of a shell window"
+
+#~ msgid "Shell Window"
+#~ msgstr "Shell Window"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "The window to which the shell view belongs"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "The key file holding widget state data"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "The title of the shell view"
+
+#~ msgid "Current View ID"
+#~ msgstr "Current View ID"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "The current GAL view ID"
+
+#~ msgid "Active Shell View"
+#~ msgstr "Active Shell View"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "Name of the active shell view"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "The shell window's EFocusTracker"
+
+#~ msgid "Geometry"
+#~ msgstr "Geometry"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "Initial window geometry string"
+
+#~ msgid "Safe Mode"
+#~ msgstr "Safe Mode"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "Whether the shell window is in safe mode"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "Sidebar is visible"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "Whether the shell window's side bar is visible"
+
+#~ msgid "Switcher Visible"
+#~ msgstr "Switcher Visible"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "Whether the shell window's switcher buttons are visible"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "Taskbar Visible"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "Whether the shell window's task bar is visible"
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "Whether the shell window's tool bar is visible"
+
+#~ msgid "UI Manager"
+#~ msgstr "UI Manager"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "The shell window's GtkUIManager"
+
+#~ msgid "Module Directory"
+#~ msgstr "Module Directory"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "The directory from which to load EModules"
+
+#~ msgid "Network Available"
+#~ msgstr "Network Available"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "Whether the network is available"
+
+#~ msgid "Online"
+#~ msgstr "Online"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "Whether the shell is online"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "Forcibly re-migrate from Evolution 1.4"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "Insufficient disk space for upgrade."
+
+#  shell:upgrade-remove-1-4-confirm title
+#  shell:upgrade-remove-1-4-confirm primary
+#~ msgid "Really delete old data?"
+#~ msgstr "Really delete old data?"
+
+#  shell:upgrade-remove-1-4-confirm secondary
+#~ 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 ""
+#~ "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"
+
+#  shell:upgrade-remove-1-4 secondary
+#~ 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 ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "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."
+
+#~ msgid "_Keep Data"
+#~ msgstr "_Keep Data"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "_Remind Me Later"
+
+#~ msgid "Collection"
+#~ msgstr "Collection"
+
+#~ msgid "Instance"
+#~ msgstr "Instance"
+
+#~ msgid "Factory"
+#~ msgstr "Factory"
+
+#~ msgid "Action"
+#~ msgstr "Action"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "A GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "Show _Attachment Bar"
+
+#~ msgid "Fill color"
+#~ msgstr "Fill colour"
+
+#~ msgid "GDK fill color"
+#~ msgstr "GDK fill colour"
+
+#~ msgid "Fill stipple"
+#~ msgstr "Fill stipple"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "Minimum width"
+
+#~ msgid "Minimum Width"
+#~ msgstr "Minimum Width"
+
+#~ msgid "Spacing"
+#~ msgstr "Spacing"
+
+#~ msgid "The button state is online"
+#~ msgstr "The button state is online"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "Horizontal Position"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "Pane position when orientated horizontally"
+
+#~ msgid "Vertical Position"
+#~ msgstr "Vertical Position"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "Pane position when orientated vertically"
+
+#~ msgid "Proportion"
+#~ msgstr "Proportion"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "Proportion of the 2nd pane size"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "Fixed Resize"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "Keep the 2nd pane fixed during resize"
+
+#~ msgid "Cursor Row"
+#~ msgstr "Cursor Row"
+
+#~ msgid "Cursor Column"
+#~ msgstr "Cursor Column"
+
+#~ msgid "Sorter"
+#~ msgstr "Sorter"
+
+#~ msgid "Selection Mode"
+#~ msgstr "Selection Mode"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "Cursor Mode"
+
+#~ msgid "Selected Column"
+#~ msgstr "Selected Column"
+
+#~ msgid "Focused Column"
+#~ msgstr "Focused Column"
+
+#~ msgid "Unselected Column"
+#~ msgstr "Unselected Column"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "Strikeout Column"
+
+#~ msgid "Underline Column"
+#~ msgstr "Underline Column"
+
+#~ msgid "Bold Column"
+#~ msgstr "Bold Column"
+
+#~ msgid "Color Column"
+#~ msgstr "Colour Column"
+
+#~ msgid "BG Color Column"
+#~ msgstr "BG Colour Column"
+
+#~ msgid "State"
+#~ msgstr "State"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "Alternating Row Colours"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "Horizontal Draw Grid"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "Vertical Draw Grid"
+
+#~ msgid "Draw focus"
+#~ msgstr "Draw focus"
+
+#~ msgid "Cursor mode"
+#~ msgstr "Cursor mode"
+
+#~ msgid "Selection model"
+#~ msgstr "Selection model"
+
+#~ msgid "Length Threshold"
+#~ msgstr "Length Threshold"
+
+#~ msgid "Uniform row height"
+#~ msgstr "Uniform row height"
+
+#~ msgid "Frozen"
+#~ msgstr "Frozen"
+
+#~ msgid "Table header"
+#~ msgstr "Table header"
+
+#~ msgid "Table model"
+#~ msgstr "Table model"
+
+#~ msgid "Cursor row"
+#~ msgstr "Cursor row"
+
+#~ msgid "Sort Info"
+#~ msgstr "Sort Info"
+
+#~ msgid "Always search"
+#~ msgstr "Always search"
+
+#~ msgid "Use click to add"
+#~ msgstr "Use click to add"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "Vertical Row Spacing"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "ETree table adaptor"
+
+#~ msgid "Retro Look"
+#~ msgstr "Retro Look"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "Draw lines and +/- expanders."
+
+#~ msgid "Expander Size"
+#~ msgstr "Expander Size"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Size of the expander arrow"
+
+#~ msgid "popup"
+#~ msgstr "popup"
+
+#~ msgid "edit"
+#~ msgstr "edit"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "expand"
+#~ msgstr "expand"
+
+#~ msgid "collapse"
+#~ msgstr "collapse"
+
+#~ msgid "Event Processor"
+#~ msgstr "Event Processor"
+
+#~ msgid "Text"
+#~ msgstr "Text"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Text"
+#~ msgid "Bold"
+#~ msgstr "Bold"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Bold"
+#~ msgid "Strikeout"
+#~ msgstr "Strikeout"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Strikeout"
+#~ msgid "Anchor"
+#~ msgstr "Anchor"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Anchor"
+#~ msgid "Justification"
+#~ msgstr "Justification"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "Justification"
+#~ msgid "Clip Width"
+#~ msgstr "Clip Width"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Clip Width"
+#~ msgid "Clip Height"
+#~ msgstr "Clip Height"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Clip Height"
+#~ msgid "Clip"
+#~ msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Clip"
+#~ msgid "Fill clip rectangle"
+#~ msgstr "Fill clip rectangle"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Fill clip rectangle"
+#~ msgid "X Offset"
+#~ msgstr "X Offset"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "X Offset"
+#~ msgid "Y Offset"
+#~ msgstr "Y Offset"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Y Offset"
+#~ msgid "Text width"
+#~ msgstr "Text width"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Text width"
+#~ msgid "Text height"
+#~ msgstr "Text height"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Text height"
+#~ msgid "Use ellipsis"
+#~ msgstr "Use ellipsis"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Use ellipsis"
+#~ msgid "Ellipsis"
+#~ msgstr "Ellipsis"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Ellipsis"
+#~ msgid "Line wrap"
+#~ msgstr "Line wrap"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Line wrap"
+#~ msgid "Break characters"
+#~ msgstr "Break characters"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Break characters"
+#~ msgid "Max lines"
+#~ msgstr "Max lines"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "Max lines"
+#~ msgid "Draw borders"
+#~ msgstr "Draw borders"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Draw borders"
+#~ msgid "Allow newlines"
+#~ msgstr "Allow newlines"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Allow newlines"
+#~ msgid "Draw background"
+#~ msgstr "Draw background"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Draw background"
+#~ msgid "Draw button"
+#~ msgstr "Draw button"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Draw button"
+#~ msgid "Cursor position"
+#~ msgstr "Cursor position"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "Cursor position"
+#~ msgid "IM Context"
+#~ msgstr "IM Context"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "IM Context"
-
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "Handle Popup"
+#~ msgid "Handle Popup"
+#~ msgstr "Handle Popup"
 
 #~ msgid "Loading appointments at %s"
 #~ msgstr "Loading appointments at %s"
diff --git a/po/es.po b/po/es.po
index f4465e7277..71cc7d4a5b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,14 +10,15 @@
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2003 (revisión).
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003, 2004, 2005, 2006.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010.
-#: ../shell/main.c:479
+#
+#: ../shell/main.c:497
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
-"POT-Creation-Date: 2010-03-17 15:37+0000\n"
-"PO-Revision-Date: 2010-03-17 17:30+0100\n"
+"POT-Creation-Date: 2010-05-25 07:44+0000\n"
+"PO-Revision-Date: 2010-05-25 18:07+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -104,7 +105,7 @@ msgstr "No es posible autenticar con el servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1268
 msgid "Failed to delete contact"
 msgstr "Falló al eliminar el contacto"
 
@@ -222,7 +223,7 @@ msgstr ""
 "Los contactos para {0} no estarán disponibles hasta que Evolution se "
 "reinicie."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -245,16 +246,6 @@ msgstr "_Redimensionar"
 msgid "_Use as it is"
 msgstr "_Usar tal cual es"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Dirección de sincr. predeterminada:"
@@ -271,7 +262,7 @@ msgstr "No es posible leer el bloque de la aplicación de Direcciones del Pilot"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2020
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -282,260 +273,231 @@ msgstr "Aniversario"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2019 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:115
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorías…"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:916
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2570
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "Correo-e"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "Disponibilidad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "_Nombre completo…"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "Domicilio"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "Página personal:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Imagen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "Mensajería instantánea"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Empleo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Dirección de correo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "Apo_do:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Notas"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1723
 msgid "Other"
 msgstr "Otro"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "Charla por vídeo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Páginas web"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "Diario web:"
-
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "_Dirección:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "_Secretaría:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "_Cumpleaños:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+msgid "_Blog:"
+msgstr "_Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "_Ciudad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "_Empresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "_País:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "A_rchivar como:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "_Disponibilidad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "_Página personal:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "_Jefe:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "_Apdo. de correos:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "_Profesión:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "_Cónyuge:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Tratamiento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "_Charla por vídeo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "_Quiere recibir el correo como HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "_Diario web:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Dónde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "_Código postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Nombre"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "Editable"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -577,7 +539,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "Error adding contact"
 msgstr "Error al añadir el contacto"
 
@@ -589,45 +551,21 @@ msgstr "Error al modificar el contacto"
 msgid "Error removing contact"
 msgstr "Error al eliminar el contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Libro origen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "Libro destino"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "Es un contacto nuevo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Campos editables"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Campos requeridos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Modificados"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2565
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos: %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2973
 msgid "Please select an image for this contact"
 msgstr "Seleccione una imagen para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2974
 msgid "_No image"
 msgstr "_Sin imagen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3247
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -635,55 +573,45 @@ msgstr ""
 "Los datos del contacto son inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» tiene un formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3258
 #, 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:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3284
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» está vacío"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "Añadir contacto rápido"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "_Editar todo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
-msgstr "Nombre _completo"
+msgstr "Nombre co_mpleto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
-msgstr "_Correo-e"
+msgstr "Correo-_e"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
-msgstr "_Seleccione la libreta de direcciones"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Shell"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "El «singleton» EShell"
+msgstr "_Seleccionar la libreta de direcciones"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
@@ -751,7 +679,7 @@ msgid "_Suffix:"
 msgstr "_Sufijo:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:676
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
@@ -768,7 +696,7 @@ msgid "_List name:"
 msgstr "_Nombre de la lista:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:164
 msgid "_Select..."
 msgstr "_Seleccionar…"
 
@@ -777,39 +705,27 @@ 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:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:769
 msgid "Contact List Members"
 msgstr "Miembros de la lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:917
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1333
 msgid "_Members"
 msgstr "_Miembros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error adding list"
 msgstr "Error al añadir la lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error modifying list"
 msgstr "Error al modificar la lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1200
 msgid "Error removing list"
 msgstr "Error al eliminar la lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Libro"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "Es una lista nueva"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contacto modificado:"
@@ -848,31 +764,31 @@ msgstr ""
 "en esta carpeta.  ¿Quiere añadirlo de todos modos?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "Co_mbinar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 msgid "Merge Contact"
 msgstr "Combinar contacto"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "El nombre contiene"
 
@@ -891,91 +807,62 @@ msgstr[1] "%d contactos"
 msgid "Error getting book view"
 msgstr "Error al obtener la vista de libro"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "Consulta"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
 msgstr "Búsqueda interrumpida"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Modelo"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Error al modificar la tarjeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cortar los contactos seleccionados al portapapeles"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copiar los contactos seleccionados al portapapeles"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Paste contacts from the clipboard"
 msgstr "Pegar los contactos desde el portapapeles"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "Eliminar los contactos seleccionados"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 msgid "Select all visible contacts"
 msgstr "Seleccionar todos los contactos visibles"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Vista de «shell»"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Fuente"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1286
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "¿Seguro que quiere eliminar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1290
 msgid "Are you sure you want to delete this contact list?"
 msgstr "¿Seguro que quiere eliminar esta lista de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1294
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "¿Seguro que quiere eliminar esta lista de contactos (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete these contacts?"
 msgstr "¿Seguro que quiere eliminar estos contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete this contact?"
 msgstr "¿Seguro que quiere eliminar este contacto?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "¿Seguro que quiere eliminar este contacto (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1463
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -984,11 +871,11 @@ msgstr ""
 "Abrir %d contactos abrirá también %d ventanas nuevas.\n"
 "¿Quiere realmente mostrar todos estos contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 msgid "_Don't Display"
 msgstr "_No mostrar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1469
 msgid "Display _All Contacts"
 msgstr "Mostrar t_odos los contactos"
 
@@ -1148,7 +1035,6 @@ msgid "Telex"
 msgstr "Télex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "Tratamiento"
 
@@ -1160,59 +1046,7 @@ msgstr "Unidad"
 msgid "Web Site"
 msgstr "Sitio web"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Anchura"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Altura"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "Tiene el foco"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Campo"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Nombre del campo"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Modelo del texto"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Longitud máx. del campo"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Anchura de columna"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1222,7 +1056,7 @@ msgstr ""
 "\n"
 "Buscando contactos…"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1236,7 +1070,7 @@ msgstr ""
 "\n"
 "o pulse dos veces aquí para crear un contacto nuevo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1250,7 +1084,7 @@ msgstr ""
 "\n"
 "Pulse dos veces aquí para crear un contacto nuevo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1260,7 +1094,7 @@ msgstr ""
 "\n"
 "Buscar contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1270,10 +1104,6 @@ msgstr ""
 "\n"
 "No hay elementos para mostrar en esta vista."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Adaptador"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Correo-e de trabajo"
@@ -1283,18 +1113,10 @@ msgid "Home Email"
 msgstr "Correo-e de casa"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "Otro correo-e"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Seleccionado"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "Tiene el cursor"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1337,17 +1159,17 @@ msgid "Copy _Email Address"
 msgstr "Copiar dirección de _correo-e"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:381
 msgid "Copy the email address to the clipboard"
 msgstr "Copiar la dirección de correo-e al portapapeles"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:386
 msgid "_Send New Message To..."
 msgstr "_Enviar un correo nuevo a…"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:388
 msgid "Send a mail message to this address"
 msgstr "Enviar un correo a esta dirección"
 
@@ -1383,22 +1205,21 @@ msgid "Video Chat"
 msgstr "Charla por vídeo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:498
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "Calendario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:116
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Disponibilidad"
@@ -1426,21 +1247,19 @@ msgid "Web Log"
 msgstr "Diario web"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:176
+#: ../modules/addressbook/e-book-shell-migrate.c:134
+#: ../modules/calendar/e-cal-shell-backend.c:180
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Privado"
@@ -1457,8 +1276,8 @@ msgstr "Página personal"
 msgid "Blog"
 msgstr "Diario web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
@@ -1516,10 +1335,10 @@ msgstr "Protocolo no implementado"
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2675
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -1619,8 +1438,8 @@ msgid ""
 msgstr ""
 "Se encontraron más tarjetas que las que el servidor está \n"
 "configurado para devolver o Evolution está configurado\n"
-"para mostrar. Por favor, haga su búsqueda más específica o \n"
-"aumente el límite de resultados en las preferencias del servidor\n"
+"para mostrar. Haga su búsqueda más específica o aumente\n"
+"el límite de resultados en las preferencias del servidor\n"
 "de directorios para esta libreta de direcciones."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:174
@@ -1654,27 +1473,27 @@ msgstr "Esta consulta no se completó con éxito."
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "Seleccione la libreta de direcciones"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
@@ -1684,52 +1503,59 @@ msgstr "Vista de la tarjeta"
 
 #: ../addressbook/importers/evolution-csv-importer.c:654
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importando…"
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:937
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "VSC o Tab de Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:938
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importador de VSC y Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:946
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "VSC o Tab de Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:947
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importador de VSC y Tab de Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:955
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "VSC o Tab de Evolution (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:956
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador de VSC y Tab de Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF de Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard de Evolution"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:733
+#, c-format
+msgid "Page %d"
+msgstr "Página %d"
+
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1808,20 +1634,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accediendo al servidor LDAP anónimamente"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "No es posible autenticar.\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduzca la contraseña para %s (usuario %s)"
 
 #: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1847,18 +1673,18 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 msgstr ""
 "Añadir un resumen con sentido a su cita dará a sus destinatarios una idea de "
 "qué trata su cita."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr ""
-"Añadir un Resumen con sentido a su tarea dará a sus destinatarios una idea "
+"Añadir un resumen con sentido a su tarea dará a sus destinatarios una idea "
 "de qué trata su tarea."
 
 #: ../calendar/calendar.error.xml.h:7
@@ -1956,58 +1782,54 @@ msgid "Are you sure you want to delete this task?"
 msgstr "¿Seguro que quiere eliminar esta tarea?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "¿Seguro que quiere guardar la nota sin un resumen?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "¿Seguro que quiere guardar la cita sin un resumen?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "¿Seguro que quiere enviar la cita sin un resumen?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "¿Seguro que quiere guardar la nota sin un resumen?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "¿Seguro que quiere enviar la tarea sin un resumen?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "¿Seguro que quiere guardar la tarea sin un resumen?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "El repositorio del calendario está desconectado."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "No es posible crear un acontecimiento nuevo"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "No se puede guardar el acontecimiento"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "¿Quiere eliminar el calendario «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "¿Quiere la lista de notas «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "¿Quiere eliminar la lista de tareas «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "_No enviar"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Descarga en progreso. ¿Desea guardar la cita?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Descarga en progreso. ¿Desea guardar la tarea?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "No es posible cargar el editor."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -2015,31 +1837,26 @@ msgstr ""
 "Se enviarán invitaciones por correo-e a todos los participantes y se les "
 "permitirá aceptar esta tarea."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Se enviarán invitaciones por correo-e a todos los participantes y se les "
 "permitirá responder."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Error al cargar el calendario"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Error al cargar la lista de notas"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Error al cargar la lista de tareas"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "Error en «{0}»"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2047,7 +1864,7 @@ msgstr ""
 "Si no envía una notificación de cancelación, los otros participantes quizá "
 "no sepan que la reunión se ha cancelado."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2055,7 +1872,7 @@ msgstr ""
 "Si no envía una notificación de cancelación, los otros participantes quizá "
 "no sepan que la nota se ha borrado."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2063,11 +1880,7 @@ msgstr ""
 "Si no envía una notificación de cancelación, los otros participantes quizá "
 "no sepan que la tarea ha sido borrada."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "Sin respuesta del servidor"
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2075,7 +1888,7 @@ msgstr ""
 "Al enviar información actualizada permite que otros participantes mantengan "
 "sus calendarios al día."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2083,7 +1896,7 @@ msgstr ""
 "El envío de información actualizada permite que otros participantes "
 "mantengan su lista de tareas al día."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2091,7 +1904,7 @@ msgstr ""
 "Hay algunos adjuntos descargándose. Guardar la cita podría resultar en la "
 "pérdida de esos adjuntos."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2099,100 +1912,96 @@ msgstr ""
 "Hay algunos adjuntos descargándose. Guardar la tarea podría resultar en la "
 "pérdida de esos adjuntos."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Algunas características quizá no funcionen correctamente con su servidor "
 "actual."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "El calendario de Evolution ha terminado inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "El calendario de Evolution ha terminado inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Las notas de Evolution han terminado inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Las tareas de Evolution han terminado inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:55
 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:60
+#: ../calendar/calendar.error.xml.h:56
 msgid "The memo list is not marked for offline usage."
 msgstr "La lista de notas no está marcada para usarse sin conexión."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "La lista de tareas no está marcada para usarse sin conexión."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Este calendario se eliminará permanentemente."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de notas se eliminará permanentemente."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tareas se eliminará permanentemente."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "No es posible cargar el calendario «%s»"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "¿Desea guardar los cambios de esta cita?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this meeting?"
 msgstr "¿Quiere guardar los cambios de esta reunión?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "¿Quiere guardar los cambios de esta nota?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "¿Quiere guardar los cambios de esta tarea?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "¿Quiere enviar una notificación de cancelación para esta nota?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr ""
 "¿Quiere enviar a todos los participantes una notificación de cancelación?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "¿Quiere enviar invitaciones a la reunión a los participantes?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "¿Quiere enviar esta tarea a los participantes?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "¿Quiere enviar información de la reunión actualizada a los participantes?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "¿Quiere enviar información actualizada de las tareas a los participantes?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2202,61 +2011,57 @@ msgstr ""
 "problemas usando Evolution. Para los mejores resultados el servidor debería "
 "actualizarse a una versión soportada."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:72
 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:78
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Ha realizado cambios en esta reunión, pero no la ha guardado aún."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Ha realizado cambios en esta tarea, pero no la ha guardado aún."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Ha realizado cambios en esta nota, pero no los ha guardado aún."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Sus calendarios no estarán disponibles hasta que reinicie Evolution."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Sus notas no estarán disponibles hasta que reinicie Evolution."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Sus tareas no estarán disponibles hasta que reinicie Evolution."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Descartar cambios"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Guardar cambios"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:134
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Enviar notificación"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Dividir acontecimientos de días múltiples:"
@@ -2312,7 +2117,7 @@ msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "Hora de inicio"
 
@@ -2329,8 +2134,8 @@ msgstr "Descartar _todo"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1573
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "Lugar:"
 
@@ -2345,9 +2150,9 @@ msgstr "_Descartar"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
 #: ../calendar/gui/dialogs/comp-editor.c:1016
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1625
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
@@ -2357,10 +2162,10 @@ msgid "_Snooze"
 msgstr "_Posponer"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "horas"
 
@@ -2368,11 +2173,12 @@ msgstr "horas"
 msgid "location of appointment"
 msgstr "lugar de la cita"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "minutos"
 
@@ -2395,13 +2201,13 @@ msgstr "No hay información del lugar disponible."
 msgid "You have %d alarms"
 msgstr "Tiene %d alertas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2413,7 +2219,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:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2430,7 +2236,7 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "No preguntar otra vez sobre este programa."
 
@@ -2472,7 +2278,7 @@ msgid "Alarm programs"
 msgstr "Programas de alerta"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Tiempo en segundos que deberá mostrarse el error en la barra de estado."
@@ -2495,156 +2301,152 @@ msgid "Calendars to run alarms for"
 msgstr "Los calendarios ejecutarán alertas durante"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "Marque esto para usar la hora del sistema en Evolution."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 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)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Color para dibujar la línea de Marcus Bains en la vista diaria."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "Comprimir fines de semana en la vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Confirmar compactación"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr ""
 "Conteo de las repeticiones predeterminadas para un acontecimiento nuevo. -1 "
 "significa para siempre."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "Recordatorio predeterminado de citas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "Conteo de repeticiones predeterminado"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Unidades predeterminadas del recordatorio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Valor predeterminado del recordatorio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "Directorio para guardar los archivos de sonidos de alertas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "Degradado de acontecimientos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "Transparencia de acontecimientos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "URL del servidor de disponibilidad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "URL de la plantilla de disponibilidad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 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.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "Ocultar tareas terminadas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "Ocultar Lista de tareas nueva"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "Ocultar el valor de la tarea"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "Posición horizontal del panel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 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.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 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.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 "Si es cierto mostrará el panel de vista previa de notas en la ventana "
 "principal."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 "Si es cierto mostrará el panel de vista previa de tareas en la ventana "
 "principal."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 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.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "Hora de la última alerta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel más allá del cuál el mensaje se debe registrar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 "Lista de zonas horarias secundarias recientemente usadas en una Vista diaria."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista de URL del servidor para publicación de disponibilidad."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Línea de Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Color de la línea de Marcus Bains de la vista de día"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Color de la línea de Marcus Bains de la barra de tiempo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -2652,51 +2454,51 @@ msgstr ""
 "Máximo número de zonas horarias usadas recientemente para recordar en la "
 "lista «day_second_zones»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Máximo número de zonas horarias usadas recientemente para recordar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "Estilo de la distribución de notas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "Vista previa del panel de posición de las notas (horizontal)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "Vista previa del panel de posición de las notas (vertical)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 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.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 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.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "Posición del panel horizontal de la vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "Posición del panel vertical en la vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 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.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 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.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "Color para las tareas fuera de plazo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -2704,7 +2506,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.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2712,25 +2514,25 @@ 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.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
 "Posición del panel de vista previa de notas cuando está orientado "
 "verticalmente."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 "Posición del panel de vista previa de tareas cuando está orientado "
 "horizontalmente."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 "Posición del panel de vista previa de tareas cuando está orientado "
 "verticalmente."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -2738,7 +2540,7 @@ msgstr ""
 "Posición del panel vertical, entre las listas del calendario el calendario "
 "del navegador de fechas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2746,7 +2548,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.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -2755,93 +2557,93 @@ msgstr ""
 "calendario y la lista de tareas cuando no está en la vista mensual, en "
 "píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "Calendario primario"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "Lista de notas primaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "Lista de tareas primaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programas que se permite que sean ejecutados por las alertas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "Zonas horarias secundarias recientemente usadas en una Vista diaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "Directorio donde guardar los sonidos de las alertas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "Desplazar la vista mensual una semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Mostrar el campo «Confirmar» en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Mostrar el campo «Rol» en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 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.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 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.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "Mostrar el visor de la alerta en una bandeja de notificación"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr ""
 "Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "Mostrar el panel de vista previa de las notas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "Mostrar el panel de vista previa de las tareas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr ""
 "Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr ""
 "Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show week number in Day and Work Week View"
 msgstr ""
 "Mostrar los números de las semanas en las Vistas diaria y Vista de la semana "
 "laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 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.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -2849,23 +2651,23 @@ msgstr ""
 "Muestra la segunda zona horaria en la Vista diaria, si está establecido. El "
 "valor es similar al usado en la clave «timezone»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
 msgstr "Estilo de distribución de las tareas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (horizontal)"
 msgstr "Vista previa del panel de posición de las tareas (horizontal)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Task preview pane position (vertical)"
 msgstr "Vista previa del panel de posición de las tareas (vertical)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Tasks due today color"
 msgstr "Color para las tareas que vencen hoy"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2875,7 +2677,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.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2884,7 +2686,7 @@ msgstr ""
 "calendario, como una localización sin correspondencia en una base de datos "
 "de franjas horarias Olsen, como en \"América/Nueva York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -2895,7 +2697,7 @@ msgstr ""
 "vista previa debajo de la lista de notas. «1» (vista vertical) ubica el panel "
 "de vista previa junto a la lista de notas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -2906,11 +2708,11 @@ msgstr ""
 "vista previa debajo de la lista de tareas. «1» (vista vertical) ubica el "
 "panel de vista previa junto a la lista de tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "The second timezone for a Day View"
 msgstr "La segunda zona horaria para una Vista diaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -2918,19 +2720,19 @@ msgstr ""
 "Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. «2» "
 "para mensajes de depuración."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time divisions"
 msgstr "Divisiones de hora"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time the last alarm ran, in time_t."
 msgstr "La hora en que la última alerta sonó, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -2938,72 +2740,72 @@ 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.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Twenty four hour time format"
 msgstr "Formato de hora de veinticuatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "URI del calendario resaltado («primario»)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "URI de la lista de notas resaltada («primaria»)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "URI de la lista de tareas resaltada («primaria»)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para el recordatorio predeterminado, \"minutes\", \"hours\" o \"days"
 "\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cuándo ocultar tareas, \"minutes\", \"hours\" o "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
 msgstr "Usar la hora del sistema"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "Usar la zona horaria del sistema en lugar de la zona horaria seleccionada en "
 "Evolution."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Vertical pane position"
 msgstr "Posición del panel vertical"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "Comienzo de la semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr ""
 "El día en que empieza la semana, desde el domingo (0) hasta el sábado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 "Indica si se debe usar o no la bandeja de notificación para mostrar alertas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Indica si debe pedir confirmación al eliminar una cita o tarea."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Indica si debe pedir confirmación al compactar citas y tareas."
+msgstr "Indica si debe pedir confirmación al purgar citas y tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -3011,103 +2813,103 @@ 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.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indica si debe mostrar la hora de finalización de los acontecimientos en las "
 "vistas semanales y mensuales."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indica si debe dibujar la línea Marcus Bains (línea a la hora actual) en el "
 "calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "Indica si se debe desplazar la vista mensual una semana, no un mes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to set a default reminder for appointments."
 msgstr ""
 "Indica si debe establecer un recordatorio predeterminado para las citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 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.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 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.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 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.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 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.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 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.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 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.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 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.h:122
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr ""
 "Indica si debe mostrar los números de la semana en la Vista diaria y en la "
 "Vista de la semana laboral."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 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.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "Días laborables"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "Hora de finalización de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "Minuto de finalización de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "Hora de comienzo de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "Minuto de comienzo de la jornada laboral"
 
@@ -3157,17 +2959,17 @@ msgid "Classification"
 msgstr "Clasificación"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:514
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Descripción"
@@ -3188,7 +2990,7 @@ msgid "Exist"
 msgstr "Existen"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
@@ -3201,25 +3003,25 @@ msgid "Organizer"
 msgstr "Organizador"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Público"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:305
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Repetición"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
@@ -3296,7 +3098,7 @@ msgstr "Sonido de alerta personalizado"
 msgid "Mes_sage:"
 msgstr "_Mensaje:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:78
 msgid "Options"
 msgstr "Opciones"
 
@@ -3343,11 +3145,12 @@ msgstr "día(s)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "días"
 
@@ -3355,19 +3158,20 @@ msgstr "días"
 msgid "end of appointment"
 msgstr "fin de la cita"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "veces adicionales cada"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "inicio de la cita"
 
@@ -3395,7 +3199,7 @@ msgstr "Ninguno"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Seleccionar…"
 
@@ -3403,13 +3207,13 @@ msgstr "Seleccionar…"
 msgid "Selected Calendars for Alarms"
 msgstr "Calendarios seleccionados para alertas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "Fecha y hora"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+msgid "Ti_me and date:"
+msgstr "Fecha y _hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "Sólo fecha:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:791
+msgid "_Date only:"
+msgstr "Sólo _fecha:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3442,12 +3246,12 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "Alertas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "Formato de la fecha y hora"
@@ -3473,20 +3277,20 @@ msgid "Display alarms in _notification area only"
 msgstr "Mostrar alarmas sólo en el área de _notificación"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "viernes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:55
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2675
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "General"
 
@@ -3499,7 +3303,7 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "lunes"
@@ -3513,185 +3317,197 @@ msgid "None"
 msgstr "Ninguna"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
 msgid "Pick a color"
 msgstr "Elija un color"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "sábado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Desplazar la vista mens_ual una semana"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Zona se_cundaria:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Seleccione los calendarios para las alertas de notificación"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "Mos_\ttrar un recordatorio"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "Mostrar un _recordatorio"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 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.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr ""
 "Mostrar los núme_ros de las semanas en la Vista diaria y en la Vista de la "
 "semana laboral"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "_Tareas que vencen hoy:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "_Jue"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Lista de tareas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "Plantilla:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Hora"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "Formato de la hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Usar la zona horaria del s_istema"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "miércoles"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "La sema_na empieza en:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Work Week"
 msgstr "Semana laboral"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "Días laborables:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir con_firmación al eliminar elementos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fines de semana en la vista mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "La jornada laboral c_omienza a las:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "Vi_e"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar tareas terminadas tras"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "Tareas fuera de pla_zo:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "_Sáb"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 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"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "Divisiones de _hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "_Mar"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "M_ié"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "antes de cada aniversario/cumpleaños"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
@@ -3700,12 +3516,12 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:156
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3729,35 +3545,35 @@ msgstr ""
 "Copia_r el contenido de la lista de notas localmente para trabajar "
 "desconectado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "Colo_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Propiedades del calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "Calendario nuevo"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "Propiedades de lista de tareas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "Lista de tareas nueva"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "Propiedades de lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "Lista de notas nueva"
 
@@ -3812,31 +3628,11 @@ msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
 msgid "Validation error: %s"
 msgstr "Error de validación: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " a "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (Completado "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "Completado "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (Vence "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "Vence "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:238
 msgid "Could not save attachments"
 msgstr "No se pudieron guardar los adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:506
 msgid "Could not update object"
 msgstr "No es posible actualizar el objeto"
 
@@ -3881,22 +3677,22 @@ msgstr "¿Mantener el elemento original?"
 msgid "Click here to close the current window"
 msgstr "Pulse aquí para cerrar la ventana actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1464
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "Copiar la selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1471
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "Cortar la selección"
 
 #: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Eliminar la selección"
@@ -3905,10 +3701,10 @@ msgstr "Eliminar la selección"
 msgid "Click here to view help available"
 msgstr "Pulse aquí para ver la ayuda disponible"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1513
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "Pega el contenido del porta papeles"
 
@@ -3916,8 +3712,8 @@ msgstr "Pega el contenido del porta papeles"
 msgid "Click here to save the current window"
 msgstr "Pulse aquí para guardar la vista actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
@@ -3926,14 +3722,14 @@ msgstr "Selecciona todo el texto"
 msgid "_Classification"
 msgstr "_Clasificación"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1632
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Archivo"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Help"
 msgstr "Ay_uda"
 
@@ -3942,17 +3738,17 @@ msgid "_Insert"
 msgstr "_Insertar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "_Opciones"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1674 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "_Ver"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "_Adjunto…"
 
@@ -4037,29 +3833,29 @@ msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»"
 msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1692
+#: ../composer/e-composer-actions.c:477
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
+#: ../calendar/gui/dialogs/comp-editor.c:1747
 msgid "Save"
 msgstr "Guardar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2031
+#: ../calendar/gui/dialogs/comp-editor.c:2080
+#: ../calendar/gui/dialogs/comp-editor.c:2974
 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:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2942
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "adjunto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:3004
 msgid "Unable to use current version!"
 msgstr "Imposible usar la versión actual."
 
@@ -4079,6 +3875,10 @@ msgstr "El destino es de sólo lectura"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "¿_Eliminar este elemento de todos los otros buzones del destinatario?"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "Co_ntraer comentario"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "No se pudo eliminar el acontecimiento debido a un error de CORBA"
@@ -4139,62 +3939,67 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir un delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Alarms"
 msgstr "_Alertas"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Click here to set or unset alarms for this event"
 msgstr "Pulse aquí para poner o quitar alertas para este acontecimiento"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:215
+msgid "Show Time as _Busy"
+msgstr "Mostrar hora como _ocupada"
+
+#: ../calendar/gui/dialogs/event-editor.c:217
+msgid "Toggles whether to show time as busy"
+msgstr "Se activa cuando se deben mostrar la hora como ocupada"
+
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "_Recurrence"
 msgstr "_Repetición"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Make this a recurring event"
 msgstr "Convertir en acontecimiento repetitivo"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:233
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "Opciones de envío"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:235
 #: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "Opciones de envío avanzadas"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:243
 msgid "All _Day Event"
 msgstr "Acontecimiento para todo el _día"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "Toggles whether to have All Day Event"
 msgstr "Se activa cuando se tiene un «Acontecimiento para todo el día»"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
-msgid "Show Time as _Busy"
-msgstr "Mostrar hora como _ocupada"
-
-#: ../calendar/gui/dialogs/event-editor.c:235
-msgid "Toggles whether to show time as busy"
-msgstr "Se activa cuando se deben mostrar la hora como ocupada"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "_Free/Busy"
 msgstr "_Disponibilidad"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar información de disponibilidad para los participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
+#: ../calendar/gui/dialogs/event-editor.c:302
 msgid "Appoint_ment"
 msgstr "_Cita"
 
+#: ../calendar/gui/dialogs/event-editor.c:528
+#| msgid "Print this message"
+msgid "Print this event"
+msgstr "Imprime este acontecimiento"
+
 #: ../calendar/gui/dialogs/event-page.c:751
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "El acontecimiento no se puede editar porque es de sólo lectura"
@@ -4206,68 +4011,68 @@ msgstr ""
 "organizador"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2721
 msgid "This event has alarms"
 msgstr "Este acontecimiento tiene alertas."
 
-#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.c:833
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:880
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:882
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no start date"
 msgstr "Acontecimiento sin fecha de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1100
 msgid "Event with no end date"
 msgstr "Acontecimiento sin fecha de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1271
+#: ../calendar/gui/dialogs/memo-page.c:660
+#: ../calendar/gui/dialogs/task-page.c:864
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1281
 msgid "End date is wrong"
 msgstr "La fecha de finalización está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1304
 msgid "Start time is wrong"
 msgstr "La hora de inicio está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1311
 msgid "End time is wrong"
 msgstr "La hora de finalización está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:924
 msgid "The organizer selected no longer has an account."
 msgstr "El organizador seleccionado ya no tiene una cuenta."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1479
+#: ../calendar/gui/dialogs/memo-page.c:707
+#: ../calendar/gui/dialogs/task-page.c:930
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1504
+#: ../calendar/gui/dialogs/task-page.c:954
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2594
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No es posible abrir el calendario «%s»."
@@ -4278,40 +4083,40 @@ msgstr "No es posible abrir el calendario «%s»."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2638
+#: ../calendar/gui/dialogs/memo-page.c:920
+#: ../calendar/gui/dialogs/task-page.c:1746
 #, c-format
 msgid "You are acting on behalf of %s"
-msgstr "Está actuando en nombre de <b>%s</b>"
+msgstr "Está actuando en nombre de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d día antes de la cita"
 msgstr[1] "%d días antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2946
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes de la cita"
 msgstr[1] "%d horas antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2952
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes de la cita"
 msgstr[1] "%d minutos antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2965
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2967
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ninguna"
@@ -4329,7 +4134,9 @@ msgid "15 minutes before appointment"
 msgstr "15 minutos antes de la cita"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
 msgstr "_Participantes…"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
@@ -4345,28 +4152,26 @@ msgstr "Alerta personalizada:"
 msgid "Event Description"
 msgstr "Descripción del acontecimiento"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "Resu_men:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "_Alerta"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Descripción:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_Lugar:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_Resumen:"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "_Hora:"
@@ -4381,10 +4186,15 @@ msgstr "durante"
 msgid "until"
 msgstr "hasta"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
 msgid "Memo"
 msgstr "Nota"
 
+#: ../calendar/gui/dialogs/memo-editor.c:156
+#| msgid "Print the list of memos"
+msgid "Print this memo"
+msgstr "Imprimir esta nota"
+
 #: ../calendar/gui/dialogs/memo-page.c:350
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "La nota no se puede editar porque es de sólo lectura"
@@ -4393,14 +4203,14 @@ msgstr "La nota no se puede editar porque es de sólo lectura"
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "La nota no se puede editar completamente porque no es el organizador"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:881
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "No es posible abrir las notas en «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
+#: ../calendar/gui/dialogs/memo-page.c:1048 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Para"
@@ -4410,62 +4220,67 @@ msgstr "Para"
 msgid "Sta_rt date:"
 msgstr "Fecha de ini_cio:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "Resu_men:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:383
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Está modificando un acontecimiento que se repite. ¿Qué quiere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Está delegando un acontecimiento que se repite. ¿Qué quiere delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Está modificando una tarea que se repite. ¿Qué quiere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Está modificando una nota que se repite. ¿Qué quiere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Esta instancia únicamente"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Esta instancia y las anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Esta instancia y las futuras"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Todas las instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene repeticiones que Evolution no puede editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "La fecha de repetición es inválida"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 "La fecha de finalización de la repetición es anterior al inicio del "
@@ -4473,7 +4288,7 @@ msgstr ""
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "en"
 
@@ -4481,7 +4296,7 @@ msgstr "en"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "primer"
 
@@ -4490,7 +4305,7 @@ msgstr "primer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "segundo"
 
@@ -4498,7 +4313,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "tercer"
 
@@ -4506,7 +4321,7 @@ msgstr "tercer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "cuarto"
 
@@ -4514,7 +4329,7 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "quinto"
 
@@ -4522,13 +4337,13 @@ msgstr "quinto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "último"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Otra fecha"
 
@@ -4536,7 +4351,7 @@ msgstr "Otra fecha"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "del 1 al 10"
 
@@ -4544,7 +4359,7 @@ msgstr "del 1 al 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "del 11 al 20"
 
@@ -4552,45 +4367,45 @@ msgstr "del 11 al 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "del 21 al 31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "día"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "en el"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "repeticiones"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "Añadir excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "No es posible obtener una selección que modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "Modificar excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "No es posible obtener una selección que eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
@@ -4602,7 +4417,7 @@ msgstr "Cada"
 msgid "Exceptions"
 msgstr "Excepciones"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:86
 msgid "Preview"
 msgstr "Vista previa"
 
@@ -4626,11 +4441,11 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "año(s)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "Enviar mis alarmas con este evento"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "Notificar sól_o a los participantes"
 
@@ -4639,19 +4454,19 @@ msgstr "Notificar sól_o a los participantes"
 msgid "Completed date is wrong"
 msgstr "La fecha de terminación es errónea"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "Página web"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Terminado"
@@ -4659,35 +4474,35 @@ msgstr "Terminado"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1125 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Alta"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2669
 msgid "In Progress"
 msgstr "En proceso"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Baja"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1124
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "Normal"
@@ -4695,10 +4510,10 @@ msgstr "Normal"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Sin comenzar"
 
@@ -4714,7 +4529,7 @@ msgstr "_Estado:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1771
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4724,7 +4539,7 @@ msgstr "Estado"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "Sin definir"
@@ -4734,7 +4549,7 @@ msgid "_Date completed:"
 msgstr "_Fecha de terminación:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "_Prioridad:"
 
@@ -4755,14 +4570,19 @@ msgstr "Pulse para cambiar o ver los detalles del estado de la tarea"
 msgid "_Send Options"
 msgstr "Opciones de _envío"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:323
 msgid "_Task"
 msgstr "_Tarea"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:326
 msgid "Task Details"
 msgstr "Detalles"
 
+#: ../calendar/gui/dialogs/task-editor.c:368
+#| msgid "Print the list of tasks"
+msgid "Print this task"
+msgstr "Imprimir esta tarea"
+
 #: ../calendar/gui/dialogs/task-page.c:336
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "La tarea no se puede editar porque es de sólo lectura"
@@ -4771,24 +4591,20 @@ msgstr "La tarea no se puede editar porque es de sólo lectura"
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "La tarea no se puede editar completamente porque no es el organizador"
 
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:391
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:837
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errónea"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1703
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No es posible abrir las tareas en «%s»."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "_Participantes…"
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "_Categorías…"
@@ -4886,7 +4702,7 @@ msgid "Categories:"
 msgstr "Categorías:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -4901,8 +4717,8 @@ msgstr "Fecha de vencimiento:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "Estado:"
 
@@ -4911,8 +4727,8 @@ msgid "Priority:"
 msgstr "Prioridad:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "Descripción:"
 
@@ -4927,32 +4743,32 @@ msgstr "Página web:"
 msgid "Created"
 msgstr "Creado"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "Fecha de terminación"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "Modificado por última vez"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Fecha de inicio"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "Ocupada"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4963,63 +4779,49 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sí"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "No"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "Cliente predeterminado"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Configuración de «shell»"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Ajustes globales de la aplicación"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Repetición"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Asignado"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
@@ -5059,94 +4861,94 @@ msgstr "Fecha de inicio"
 #: ../calendar/gui/e-meeting-list-view.c:566
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Type"
 msgstr "Tipo"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:407
 msgid "Cut selected events to the clipboard"
 msgstr "Cortar los acontecimientos seleccionados al portapapeles"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:413
 msgid "Copy selected events to the clipboard"
 msgstr "Copiar los acontecimientos seleccionados al portapapeles"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:419
 msgid "Paste events from the clipboard"
 msgstr "Pega los acontecimientos desde el portapapeles"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:425
 msgid "Delete selected events"
 msgstr "Borra los acontecimientos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2330
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2336
 msgid "Declined"
 msgstr "Rehusado"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1720
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1721
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1722
 msgid "Needs action"
 msgstr "Necesita una acción"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1867 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1871 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1887 ../calendar/gui/print.c:2624
 #, c-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1918
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -5189,8 +4991,8 @@ msgstr "Muestra la segunda zona horaria"
 #. 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:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:878 ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
 msgstr "%A %e de %B"
 
@@ -5200,10 +5002,10 @@ msgstr "%A %e de %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/e-day-view-top-item.c:882 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:916
 msgid "%a %d %b"
 msgstr "%a, %e de %b"
 
@@ -5212,31 +5014,35 @@ msgstr "%a, %e de %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../calendar/gui/e-day-view-top-item.c:886 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:952
 msgid "%d %b"
 msgstr "%e de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2638
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
 
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "Repetición:"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (Repetición compuesta)"
@@ -5318,7 +5124,7 @@ msgstr "Termina"
 msgid "Due"
 msgstr "Vence"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "Información de iCalendar"
 
@@ -5327,37 +5133,36 @@ msgstr "Información de iCalendar"
 msgid "iCalendar Error"
 msgstr "Error de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+"Please review the following information, and then select an action from the "
+"menu below."
 msgstr ""
-"<br> Revise la siguiente información y seleccione una acción del menú de "
-"abajo."
+"Revise la siguiente información y seleccione una acción del menú de abajo."
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2317
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ninguno"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2333
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -5365,275 +5170,275 @@ msgstr ""
 "La reunión ha sido cancelada, sin embargo no pudo encontrarse en sus "
 "calendarios"
 
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
 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"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> ha publicado información de reunión."
+msgid "%s has published meeting information."
+msgstr "%s ha publicado información de reunión."
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "Información de reunión"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> solicita la presencia de %s en una reunión."
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s solicita la presencia de %s en una reunión."
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> solicita su presencia en una reunión."
+msgid "%s requests your presence at a meeting."
+msgstr "%s solicita su presencia en una reunión."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "Propuesta de reunión"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> desea apuntarse a una reunión existente."
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s desea apuntarse a una reunión existente."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "Actualización de reunión"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> desea recibir la última información de la reunión."
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s desea recibir la última información de la reunión."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "Solicitud de actualización de la reunión"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> ha contestado a la solicitud de reunión."
+msgid "%s has replied to a meeting request."
+msgstr "%s ha contestado a la solicitud de reunión."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "Respuesta de reunión"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> ha cancelado una reunión."
+msgid "%s has canceled a meeting."
+msgstr "%s> ha cancelado una reunión."
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "Cancelación de reunión"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
+msgid "%s has sent an unintelligible message."
+msgstr "%s ha enviado un mensaje ininteligible."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reunión erróneo"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> ha publicado la información de la tarea."
+msgid "%s has published task information."
+msgstr "%s ha publicado la información de la tarea."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "Información de la tarea"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> pide a %s que realice una tarea."
+msgid "%s requests %s to perform a task."
+msgstr "%s pide a %s que realice una tarea."
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> le pide que realice una tarea."
+msgid "%s requests you perform a task."
+msgstr "%s le pide que realice una tarea."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> desea añadirse a una tarea existente."
+msgid "%s wishes to be added to an existing task."
+msgstr "%s desea añadirse a una tarea existente."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "Actualización de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> quiere recibir la última información de la tarea."
+msgid "%s wishes to receive the latest task information."
+msgstr "%s quiere recibir la última información de la tarea."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "Solicitud de actualización de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> ha contestado a una asignación de tarea."
+msgid "%s has replied to a task assignment."
+msgstr "%s ha contestado a una asignación de tarea."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> ha cancelado una tarea."
+msgid "%s has canceled a task."
+msgstr "%s ha cancelado una tarea."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "Cancelación de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea erróneo"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> ha publicado la información de disponibilidad."
+msgid "%s has published free/busy information."
+msgstr "%s ha publicado la información de disponibilidad."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "Información de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> pide su información de disponibilidad."
+msgid "%s requests your free/busy information."
+msgstr "%s pide su información de disponibilidad."
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "Solicitud de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> ha contestado a una solicitud de disponibilidad."
+msgid "%s has replied to a free/busy request."
+msgstr "%s ha contestado a una solicitud de disponibilidad."
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad erróneo"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje sólo contiene solicitudes no soportadas."
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un mensaje de calendario válido"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "El objeto es inválido y no puede ser actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 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?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 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"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "Estado del participante actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../calendar/gui/e-itip-control.c:2084
+#: ../plugins/itip-formatter/itip-formatter.c:1420
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado del participante no pudo actualizarse porque ya no existe el "
 "elemento"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo enviarse.\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "Elija una acción:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-itip-control.c:2302
 #: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Confirmar"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Rehusar"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -5682,56 +5487,56 @@ msgid "Resources"
 msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Participante requerido"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "No participan"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "Necesita acción"
 
@@ -5740,14 +5545,14 @@ msgstr "Necesita acción"
 msgid "Attendee                          "
 msgstr "Participante                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -5756,7 +5561,7 @@ msgstr "%A, %d de %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5766,67 +5571,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%e/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "Sin información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "_Participantes…"
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "O_pciones"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "Mostrar quitando _ampliación"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "_Actualizar disponibilidad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "_Auto-seleccionar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr "_>>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_Todas las personas y los recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "Todas las _personas y un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "Personas _requeridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
@@ -5855,44 +5656,46 @@ msgid "Member"
 msgstr "Miembro"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../modules/calendar/e-cal-shell-content.c:465
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "Notas"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
 msgid "* No Summary *"
 msgstr "* Sin resumen *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
 msgid "Start: "
 msgstr "Empieza: "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
 msgid "Due: "
 msgstr "Vence: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:709
 msgid "Cut selected memos to the clipboard"
 msgstr "Cortar las notas seleccionadas al portapapeles"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:715
 msgid "Copy selected memos to the clipboard"
 msgstr "Copiar las notas seleccionadas al portapapeles"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:721
 msgid "Paste memos from the clipboard"
 msgstr "Pegar las notas desde el portapapeles"
 
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:727
+#: ../modules/calendar/e-memo-shell-view-actions.c:565
 msgid "Delete selected memos"
 msgstr "Borra las notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Select all visible memos"
 msgstr "Seleccionar todas las notas visibles"
 
@@ -5900,122 +5703,87 @@ msgstr "Seleccionar todas las notas visibles"
 msgid "Click to add a memo"
 msgstr "Pulse aquí para añadir una nota"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2052
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:427
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Tareas"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:932
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cortar las tareas seleccionadas al portapapeles"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:938
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copiar las tareas seleccionadas al portapapeles"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:944
 msgid "Paste tasks from the clipboard"
 msgstr "Pega las tareas del portapapeles"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "Borra las tareas seleccionadas"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:956
 msgid "Select all visible tasks"
 msgstr "Seleccionar todas las tareas visibles"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Seleccione la zona horaria"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
 msgid "%d %B"
 msgstr "%e de %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "Tiene alertas."
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "Tiene repeticiones."
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "Es una reunión."
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Acontecimiento de calendario: El resumen es %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "Acontecimiento de calendario: Sin resumen."
 
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "vista de acontecimientos del calendario"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "Obtener el foco"
 
@@ -6044,7 +5812,7 @@ 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"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -6053,14 +5821,14 @@ msgstr[1] "Tiene %d acontecimientos."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 msgid "It has no events."
 msgstr "No tiene acontecimientos."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Vista de la semana laboral: %s. %s"
@@ -6068,36 +5836,36 @@ msgstr "Vista de la semana laboral: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vista diaria: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "vista de calendario para una semana laboral"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "vista de calendario para uno o más días"
 
 #: ../calendar/gui/ea-gnome-calendar.c:46
 #: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Calendario de GNOME"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:912
 msgid "%A %d %b %Y"
 msgstr "%A, %e de %b de %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:919
+#: ../modules/calendar/e-cal-shell-view-private.c:925
+#: ../modules/calendar/e-cal-shell-view-private.c:928
 msgid "%a %d %b %Y"
 msgstr "%a, %e de %b de %Y"
 
@@ -6105,10 +5873,10 @@ msgstr "%a, %e de %b de %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:945
+#: ../modules/calendar/e-cal-shell-view-private.c:956
+#: ../modules/calendar/e-cal-shell-view-private.c:963
+#: ../modules/calendar/e-cal-shell-view-private.c:966
 msgid "%d %b %Y"
 msgstr "%e de %B de %Y"
 
@@ -6120,25 +5888,25 @@ msgstr "Botón de salto"
 msgid "Click here, you can find more events."
 msgstr "Pulse aquí para buscar más acontecimientos."
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vista mensual: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vista semanal: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:188
 msgid "calendar view for a month"
 msgstr "vista de calendario para un mes"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:190
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendario para una o más semanas"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "Purging"
 msgstr "Compactando"
 
@@ -6191,39 +5959,40 @@ msgid "Select Date"
 msgstr "Seleccionar fecha"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "Septiembre"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
+msgid "Select _Today"
+msgstr "Seleccionar _hoy"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_Seleccionar hoy"
+msgid "September"
+msgstr "Septiembre"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "Es necesario por lo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Información del acontecimiento"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Información de la tarea"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Información de la nota"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Información de disponibilidad"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "Información de calendario"
 
@@ -6231,7 +6000,7 @@ msgstr "Información de calendario"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceptado"
@@ -6240,7 +6009,7 @@ msgstr "Aceptado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
@@ -6252,7 +6021,7 @@ msgstr "Aceptado provisionalmente"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Rehusado"
@@ -6261,7 +6030,7 @@ msgstr "Rehusado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegado"
@@ -6269,7 +6038,7 @@ msgstr "Delegado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizado"
@@ -6277,7 +6046,7 @@ msgstr "Actualizado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -6285,7 +6054,7 @@ msgstr "Cancelar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualizar"
@@ -6293,31 +6062,31 @@ msgstr "Actualizar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contra-propuesta"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de disponibilidad (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "No se pudo reservar un recurso, el nuevo acontecimiento coincide con algún "
 "otro."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "No se pudo reservar un recurso, error: "
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante en el acontecimiento."
 
@@ -6473,49 +6242,81 @@ msgstr "Vi"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2564
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2429
+msgid " to "
+msgstr " a "
+
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2437
+msgid " (Completed "
+msgstr " (Completado "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2441
+msgid "Completed "
+msgstr "Completado "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2449
+msgid " (Due "
+msgstr " (Vence "
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2454
+msgid "Due "
+msgstr "Vence "
+
+#: ../calendar/gui/print.c:2588
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2566
+#: ../calendar/gui/print.c:2590 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "Tarea"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumen: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2639
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2682
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2697
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2726
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2739
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2750
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -6540,44 +6341,214 @@ msgstr "es mayor que"
 msgid "is less than"
 msgstr "es menor que"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "Reuniones y citas"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
+#: ../plugins/itip-formatter/itip-formatter.c:1832
 msgid "Opening calendar"
 msgstr "Apertura del calendario"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "Archivos iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar de Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "¡Recuerde!"
 
-#: ../calendar/importers/icalendar-importer.c:583
+#: ../calendar/importers/icalendar-importer.c:662
 msgid "vCalendar files (.vcf)"
 msgstr "Archivos vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar de Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "Acontecimientos de calendario"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador inteligente del calendario de Evolution"
 
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1237
+#| msgctxt "New"
+#| msgid "M_eeting"
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "Reunión"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1237
+#| msgid "Events"
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "Acontecimiento"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1238
+#| msgid "Task"
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Tarea"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1239
+#| msgid "Memo"
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Nota"
+
+#: ../calendar/importers/icalendar-importer.c:941
+#| msgid "It has recurrences."
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "tiene repeticiones"
+
+#: ../calendar/importers/icalendar-importer.c:946
+#| msgid "This and Prior Instances"
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "es una instancia"
+
+#: ../calendar/importers/icalendar-importer.c:951
+#| msgid "It has alarms."
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "tiene alertas"
+
+#: ../calendar/importers/icalendar-importer.c:956
+#| msgid "%s attachment"
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "tiene adjuntos"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+#| msgid "Public"
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "Pública"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+#| msgid "Private"
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Privado"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+#| msgid "Confidential"
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+#| msgid "Classification"
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "Clasificación"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1278
+#| msgid "Summary"
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Resumen"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+#| msgid "Location"
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "Lugar"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1274
+#| msgid "Start"
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "Empieza"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+#| msgid "Due"
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "Vence"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+#| msgid "End"
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Termina"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+#| msgid "Categories"
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "Categorías"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+#| msgid "Completed"
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Completada"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+#| msgid "URL"
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+#| msgid "Organizer"
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Organizador"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+#| msgid "Attendees"
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Participantes"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+#| msgid "Description"
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Descripción"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1270
+#| msgid "Type"
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Tipo"
+
 #.
 #. *
 #. * This program is free software; you can redistribute it and/or
@@ -8127,157 +8098,157 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: ../composer/e-composer-actions.c:79
+#: ../composer/e-composer-actions.c:81
 msgid "Untitled Message"
 msgstr "Mensaje sin título"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "Guardar como…"
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:283
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:288
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "Cierra el archivo actual"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "_Imprimir…"
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "Vist_a previa de impresión"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "Guardar _como…"
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "Guardar el archivo actual con un nombre diferente"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "Guardar como _borrador"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "Guardar como borrador"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "Enviar este mensaje"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "_Mensaje nuevo"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "Abrir la ventana del mensaje nuevo"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "_Codificación de caracteres"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:363
 msgid "PGP _Encrypt"
 msgstr "Cif_rar con PGP"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:365
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar este mensaje con PGP"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:371
 msgid "PGP _Sign"
 msgstr "_Firmar con PGP"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:373
 msgid "Sign this message with your PGP key"
 msgstr "Firmar este mensaje con su clave GPG"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "_Priorizar mensaje"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "Establecer la prioridad del mensaje a alta"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "_Solicitar confirmación de lectura"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:389
 msgid "Get delivery notification when your message is read"
 msgstr "Obtener notificación de entrega cuando su mensaje sea leído"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "C_ifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:397
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Cifrar este mensaje con su certificado de cifrado S/MIME"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "Fi_rmar con S/MIME"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:405
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Firmar este mensaje con su certificado de firma S/MIME"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:411
 msgid "_Bcc Field"
 msgstr "Campo «Cc_o»"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:413
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Conmutador que indica si se muestra el campo «Cco»"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "Campo «_Cc»"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "Conmutador que indica si se muestra el campo «Cc»"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:427
 msgid "_From Field"
 msgstr "Campo «_De»"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:429
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Conmutador que indica si se muestra el selector «De»"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "Campo «_Responder-a»"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Conmutador que indica si se muestra el campo «Responder-a»"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:480
 msgid "Save Draft"
 msgstr "Guardar borrador"
 
@@ -8290,15 +8261,15 @@ msgstr "Mostrar"
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirán una copia del mensaje"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8306,58 +8277,58 @@ msgstr ""
 "Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "De"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "Cc"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "Cc_o:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Cco"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "_Firma:"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "Pulse aquí para la libreta de direcciones"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "Pulse aquí para seleccionar carpetas en las que publicar"
 
@@ -8382,19 +8353,19 @@ msgid "Save draft"
 msgstr "Guardar borrador"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:188
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "_No mostrar otra vez este mensaje."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:1005
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "No es posible firmar el mensaje saliente: No hay establecido un certificado "
 "de firma para esta cuenta"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:1012
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8402,21 +8373,19 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1405
 msgid "Unable to reconstruct message from autosave file"
 msgstr "No se pudo reconstruir el mensaje desde el archivo autoguardado"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1471 ../composer/e-msg-composer.c:1678
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:3310
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#: ../composer/e-msg-composer.c:3334
+msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
-"<b>(El editor contiene un mensaje cuyo cuerpo no tiene texto, el cual no "
-"puede editarse.)</b>"
+"El editor contiene un mensaje cuyo cuerpo no tiene texto, el cual no puede "
+"editarse."
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -8497,7 +8466,7 @@ msgstr ""
 "nuevo. La recuperación del mensaje le permitirá continuar donde lo dejó."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+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."
 
@@ -8517,7 +8486,7 @@ msgid "Unable to activate the address selector control."
 msgstr "No es posible activar el control de selección de direcciones."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "No puede adjuntar el archivo «{0}» a este mensaje."
 
 #: ../composer/mail-composer.error.xml.h:22
@@ -8540,31 +8509,27 @@ msgstr "_Recuperar"
 msgid "_Save Draft"
 msgstr "Guardar _borrador"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:199
 msgid "Run Anjal in a window"
 msgstr "Ejecutar Anjal en una ventana"
 
-#: ../capplet/anjal-settings-main.c:203
+#: ../capplet/anjal-settings-main.c:200
 msgid "Make Anjal the default email client"
 msgstr "Hacer que Anjal sea el cliente de correo predeterminado"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:207
 msgid "ID of the socket to embed in"
 msgstr "El ID del socket en el que empotrarse"
 
-#: ../capplet/anjal-settings-main.c:211
+#: ../capplet/anjal-settings-main.c:208
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:221
 msgid "Anjal email client"
 msgstr "Cliente de correo Anjal"
 
-#: ../capplet/settings/mail-view.c:244
-msgid "New Tab"
-msgstr "Solapa nueva"
-
 #: ../capplet/settings/mail-account-view.c:56
 msgid "Please enter your full name."
 msgstr "Introduzca su nombre completo."
@@ -8574,56 +8539,55 @@ msgid "Please enter your email address."
 msgstr "Introduzca su dirección de correo-e."
 
 #: ../capplet/settings/mail-account-view.c:58
-#| msgid "The email addres you have entered is invalid."
 msgid "The email address you have entered is invalid."
 msgstr "La dirección de correo-e que ha introducido no es válida."
 
-#: ../capplet/settings/mail-account-view.c:224
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalles personales:</span>"
+#: ../capplet/settings/mail-account-view.c:182
+msgid "Personal details:"
+msgstr "Detalles personales:"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:189
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../capplet/settings/mail-account-view.c:238
+#: ../capplet/settings/mail-account-view.c:198
 msgid "Email address:"
 msgstr "Dirección de correo-e:"
 
-#: ../capplet/settings/mail-account-view.c:248
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalles de recepción:</span>"
+#: ../capplet/settings/mail-account-view.c:208
+msgid "Receiving details:"
+msgstr "Detalles de recepción:"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
+#: ../capplet/settings/mail-account-view.c:215
+#: ../capplet/settings/mail-account-view.c:265
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
+#: ../capplet/settings/mail-account-view.c:224
+#: ../capplet/settings/mail-account-view.c:274
 msgid "Server address:"
 msgstr "Dirección del servidor:"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:233
+#: ../capplet/settings/mail-account-view.c:283
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:292
 msgid "Use encryption:"
 msgstr "Usar cifrado:"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:247
+#: ../capplet/settings/mail-account-view.c:297
 msgid "never"
 msgstr "nunca"
 
-#: ../capplet/settings/mail-account-view.c:298
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalles de envío:</span>"
+#: ../capplet/settings/mail-account-view.c:258
+msgid "Sending details:"
+msgstr "Detalles de envío:"
 
-#: ../capplet/settings/mail-account-view.c:355
+#: ../capplet/settings/mail-account-view.c:316
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -8634,11 +8598,7 @@ msgstr ""
 "averiguar los ajustes. Si no se puede hacer automáticamente necesitará "
 "también los detalles del servidor."
 
-#: ../capplet/settings/mail-account-view.c:357
-#| msgid ""
-#| "Sorry, we can't work out the settings to get your mail automatically. "
-#| "Please enter them below. We've tried  to make a start with the details "
-#| "you just entered but you may need to change them."
+#: ../capplet/settings/mail-account-view.c:318
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -8648,11 +8608,11 @@ msgstr ""
 "Intrdúzcalos debajo. Se ha intentado hacer una aproximación inicial con los "
 "detallas que ha introducido pero puede que tenga que cambiarlos."
 
-#: ../capplet/settings/mail-account-view.c:359
+#: ../capplet/settings/mail-account-view.c:320
 msgid "You can specify more options to configure the account."
 msgstr "Puede especificar más opciones para configurar la cuenta."
 
-#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:322
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8660,11 +8620,11 @@ msgstr ""
 "Ahora se necesitan sus ajustes para el envío de correo. Se intentaron hacer "
 "algunas averiguaciones pero debería comprobarlas para asegurarse."
 
-#: ../capplet/settings/mail-account-view.c:362
+#: ../capplet/settings/mail-account-view.c:323
 msgid "You can specify your default settings for your account."
 msgstr "Puede especificar sus ajustes predeterminados para su cuenta."
 
-#: ../capplet/settings/mail-account-view.c:363
+#: ../capplet/settings/mail-account-view.c:324
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8672,134 +8632,126 @@ msgstr ""
 "Hora de comprobar los ajustes antes de intentar conectar con el servidor y "
 "obtener su correo."
 
-#: ../capplet/settings/mail-account-view.c:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:339
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2190
+#: ../mail/mail-config.ui.h:60
 msgid "Identity"
 msgstr "Identidad"
 
-#: ../capplet/settings/mail-account-view.c:378
+#: ../capplet/settings/mail-account-view.c:339
 msgid "Next - Receiving mail"
 msgstr "Siguiente - Recepción de correo"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
 msgid "Receiving mail"
 msgstr "Recepción de correo"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:340
+#: ../capplet/settings/mail-account-view.c:341
 msgid "Next - Sending mail"
 msgstr "Siguiente - Envío de correo"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
 msgid "Back - Identity"
 msgstr "Atrás - Identidad"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
 msgid "Next - Receiving options"
 msgstr "Siguiente - Opciones de recepción"
 
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:341
 msgid "Receiving options"
 msgstr "Opciones de recepción"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:341
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Back - Receiving mail"
 msgstr "Siguiente - Recepción de correo"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Sending mail"
 msgstr "Envío de correo"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:343
+#: ../capplet/settings/mail-account-view.c:344
 msgid "Next - Review account"
 msgstr "Siguiente - Revisar la cuenta"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Next - Defaults"
 msgstr "Siguiente - Predeterminados"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Back - Receiving options"
 msgstr "Atrás - Opciones de recepción"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:344
+#: ../mail/em-account-editor.c:2769 ../mail/mail-config.ui.h:33
 msgid "Defaults"
 msgstr "Predeterminados"
 
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:344
 msgid "Back - Sending mail"
 msgstr "Atrás - Envío de correo"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
 msgid "Review account"
 msgstr "Revisar la cuenta"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
 msgid "Finish"
 msgstr "Finalizar"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
 msgid "Back - Sending"
 msgstr "Atras - Envío"
 
-#: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
+#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "Cerrar solapa"
 
-#: ../capplet/settings/mail-account-view.c:729
+#: ../capplet/settings/mail-account-view.c:690
 msgid "Account Wizard"
 msgstr "Asistente de cuentas"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "Ajustes del correo"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-msgid "Quit"
-msgstr "Salir"
-
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1617
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:659
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:211
+#: ../mail/message-list.c:1607
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/addressbook/e-book-shell-migrate.c:126
 #: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-cal-shell-backend.c:133
+#: ../modules/calendar/e-cal-shell-migrate.c:141
 #: ../modules/calendar/e-memo-shell-backend.c:108
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-migrate.c:109
 msgid "On This Computer"
 msgstr "En este equipo"
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:146
 #: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "Añadir una cuenta nueva"
 
-#: ../capplet/settings/mail-settings-view.c:185
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Gestión de cuentas</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "Gestión de cuentas"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -8811,7 +8763,7 @@ msgstr "Notificaciones de acontecimientos del calendario"
 msgid "Evolution Alarm Notify"
 msgstr "Notificador de alertas de Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:823
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8832,13 +8784,9 @@ msgstr "Gestione su correo-e, contactos y calendario"
 msgid "Configure email accounts"
 msgstr "Configurar cuentas de correo-e"
 
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "tarjeta de dirección"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "información de calendario"
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "Ajustes del correo"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:224
@@ -8933,56 +8881,66 @@ msgstr "Europeo occidental"
 msgid "Western European, New"
 msgstr "Europeo occidental, nuevo"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "tradicional"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "simplificado"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "visual"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1788
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Hoy"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Mañana"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "Dentro de %d días"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "Dentro de %d día"
+msgstr[1] "Dentro de %d días"
 
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "Hace %d días"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Hace %d día"
+msgstr[1] "Hace %d días"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "Usar los valores predeterminados del sistema"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "Formato:"
 
@@ -9003,18 +8961,6 @@ msgstr "Escribiendo «%s»"
 msgid "Writing \"%s\" to %s"
 msgstr "Escribiendo «%s» a «%s»"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Nombre del registrador"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "Nombre del archivo"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "El nombre de archivo del módulo"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Depuración de sucesos"
@@ -9037,13 +8983,13 @@ msgstr "Mensajes de sucesos:"
 msgid "Log Level"
 msgstr "Nivel de sucesos"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2686
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "Cierra esta ventana"
 
@@ -9067,33 +9013,22 @@ msgstr "Depurar"
 msgid "Error, Warnings and Debug messages"
 msgstr "Mensajes de error, avisos y depuración"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "Activado"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Indica si el complemento está activado"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "semanas"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "Ocurrió un error al imprimir"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr ""
 "El sistema de impresión informó de los siguientes detalles sobre el error:"
 
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -9104,7 +9039,7 @@ msgstr ""
 msgid "Autogenerated"
 msgstr "Autogenerado"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "Porque «{1}»."
 
@@ -9124,236 +9059,236 @@ msgstr "¿Quiere sobreescribirlo?"
 msgid "File exists \"{0}\"."
 msgstr "El archivo existe «{0}»."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:133
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:170
 msgid "Could not open the link."
 msgstr "No se pudo abrir el enlace."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:220
 msgid "Could not display help for Evolution."
 msgstr "No se pudo mostrar la ayuda de Evolution."
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1304
 #, c-format
 msgid "GConf error: %s"
 msgstr "Error de GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1315
 msgid "All further errors shown only on terminal."
 msgstr "En adelante todos los errores sólo se mostrarán en el terminal."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "Cco"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Asunto"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1138
 msgid "Mailer"
 msgstr "Transporte"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Fecha"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:84
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:85
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Cara"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1302
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1361
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "No es posible interpretar el mensaje S/MIME: Error desconocido"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No es posible analizar el mensaje MIME. Mostrando la fuente."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado no soportado para multipart/encrypted"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message"
 msgstr "No es posible interpretar el mensaje PGP/MIME"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "No se pudo interpretar el mensaje PGP/MIME: Error desconocido"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "Formato de firma no soportado"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 msgid "Error verifying signature"
 msgstr "Error al verificar la firma"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "Error desconocido al verificar la firma"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message"
 msgstr "No es posible interpretar el mensaje PGP"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message: Unknown error"
 msgstr "No es posible interpretar el mensaje PGP: Error desconocido"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "hace un segundo"
 msgstr[1] "hace %d segundos"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "dentro de un segundo"
 msgstr[1] "dentro de %d segundos"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hace un minuto"
 msgstr[1] "hace %d minutos"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "dentro de un minuto"
 msgstr[1] "dentro de %d minutos"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hace una hora"
 msgstr[1] "hace %d horas"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "dentro de una hora"
 msgstr[1] "dentro de %d horas"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "hace un día"
 msgstr[1] "hace %d días"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "dentro de un día"
 msgstr[1] "dentro de %d días"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "hace una semana"
 msgstr[1] "hace %d semanas"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "dentro de una semana"
 msgstr[1] "dentro de %d semanas"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "hace un mes"
 msgstr[1] "hace %d meses"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "dentro de un mes"
 msgstr[1] "dentro de %d meses"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "hace un año"
 msgstr[1] "hace %d años"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "dentro de un años"
 msgstr[1] "dentro de %d años"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<pulse aquí para seleccionar una fecha>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "ahora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%e/%b/%Y"
 
 # Aquí time se refiere a fecha
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Seleccione una fecha con la que comparar"
 
@@ -9406,11 +9341,11 @@ msgid "I_nclude threads"
 msgstr "I_ncluir conversaciones"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Saliente"
 
@@ -9442,7 +9377,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:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "Falta el nombre."
 
@@ -9519,7 +9454,7 @@ msgstr "en el futuro"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:180
 msgid "seconds"
 msgstr "segundos"
 
@@ -9535,44 +9470,28 @@ msgstr "la fecha que especifique"
 msgid "years"
 msgstr "años"
 
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
+#: ../widgets/misc/e-attachment-paned.c:123
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Adjunto"
 msgstr[1] "Adjuntos"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:586
+#: ../widgets/misc/e-attachment-paned.c:581
 msgid "Icon View"
 msgstr "Vista de icono"
 
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:587
+#: ../widgets/misc/e-attachment-paned.c:582
 msgid "List View"
 msgstr "Vista de lista"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Enfocar el seguimiento"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "Modo de «shell»"
-
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "El «backend» de la «shell» de correo"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "Mostrar borrados"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "Mostrar los mensajes borrados"
+#: ../mail/e-mail-browser.c:262
+msgid "(No Subject)"
+msgstr "(Sin asunto)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9619,7 +9538,7 @@ msgid "_Later"
 msgstr "_Más tarde"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:476
 msgid "Add Label"
 msgstr "Añadir etiqueta"
 
@@ -9639,115 +9558,57 @@ msgstr ""
 msgid "Color"
 msgstr "Color"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Nombre"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2706
+#: ../modules/mail/e-mail-shell-view-private.c:953
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
 msgid "Drafts"
 msgstr "Borradores"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
 msgid "Outbox"
 msgstr "Bandeja de salida"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
 msgid "Sent"
 msgstr "Correo enviado"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:572
 msgid "Templates"
 msgstr "Plantillas"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Importante"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "Tareas pendientes"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Más tarde"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "Migrando…"
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "Migración"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migrando «%s»:"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "No es posible crear la carpeta nueva: «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "No es posible copiar el la carpeta «%s» a «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "No es posible buscar buzones existentes en «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:643
 msgid "Migrating Folders"
 msgstr "Migrando carpetas"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El lugar y jerarquía de las carpetas de buzones de correo ha cambiado desde "
-"Evolution 1.x.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetas…"
-
-#: ../mail/e-mail-migrate.c:2027
-#, 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"
-
-#: ../mail/e-mail-migrate.c:2043
-#, 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"
-
-#: ../mail/e-mail-migrate.c:2075
-#, 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"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "No es posible crear el almacén de correo local «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:644
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9759,45 +9620,36 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas…"
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:740
 #, 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"
-
-#: ../mail/e-mail-migrate.c:3049
-#, c-format
-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, "
-"«evolution/config.xmldb» no existe o está corrompido."
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "No se pueden crear las carpetas de correo local en: «%s»: %s"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:108
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "No preguntarme de nuevo"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:260 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:260 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:634 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:634 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:864
+#: ../mail/e-mail-reader.c:860
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Guardar mensaje"
@@ -9809,540 +9661,539 @@ msgstr[1] "Guardar mensajes"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:881 ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaje"
 msgstr[1] "Mensajes"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1139
 msgid "A_dd Sender to Address Book"
 msgstr "_Añadir remitente a la libreta"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1141
 msgid "Add sender to address book"
 msgstr "Añadir el remitente a la libreta de direcciones"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1146
 msgid "Check for _Junk"
 msgstr "Detectar _SPAM"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1148
 msgid "Filter the selected messages for junk status"
 msgstr "Filtra los mensajes seleccionados por el estado de SPAM"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1153
 msgid "_Copy to Folder..."
 msgstr "Copiar a la c_arpeta…"
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1155
 msgid "Copy selected messages to another folder"
 msgstr "Copia mensajes seleccionados a otra carpeta"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1160
 msgid "_Delete Message"
 msgstr "_Eliminar el mensaje"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1162
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para eliminar"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1167
 msgid "Filter on Mailing _List..."
 msgstr "Filtro según la _lista de correo…"
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1169
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crea una regla para filtrar los mensajes de esta lista de correo"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1174
 msgid "Filter on _Recipients..."
 msgstr "Filtro según los _destinatarios…"
 
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1176
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crea una regla para filtrar los mensajes de estos destinatarios"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1181
 msgid "Filter on Se_nder..."
 msgstr "Filtro según el _remitente…"
 
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1183
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crea una regla para filtrar los mensajes de este remitente"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1188
 msgid "Filter on _Subject..."
 msgstr "Filtro según el _asunto…"
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1190
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crea una regla para filtrar los mensajes con este asunto"
 
 # Colisión en la A
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1195
 msgid "A_pply Filters"
 msgstr "Aplicar _filtros"
 
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1197
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplica filtros a los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1202
 msgid "_Find in Message..."
 msgstr "B_uscar en el mensaje…"
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1204
 msgid "Search for text in the body of the displayed message"
 msgstr "Busca un texto en el cuerpo del mensaje mostrado"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1209
 msgid "_Clear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1211
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Quitar la marca de seguimiento de los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1216
 msgid "_Flag Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1218
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Establecer la marca de completado en los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1223
 msgid "Follow _Up..."
 msgstr "Se_guimiento…"
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1225
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar los mensajes seleccionados para seguimiento"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1230
 msgid "_Attached"
 msgstr "_Adjunto"
 
-#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1232 ../mail/e-mail-reader.c:1239
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reenvía a alguien el mensaje seleccionado como un adjunto"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1237
 msgid "Forward As _Attached"
 msgstr "Reenviar como _adjunto"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1244
 msgid "_Inline"
 msgstr "_Incluido en línea"
 
-#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1246 ../mail/e-mail-reader.c:1253
 msgid "Forward the selected message in the body of a new message"
 msgstr "Reenvía el mensaje seleccionado en el cuerpo de un mensaje nuevo"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1251
 msgid "Forward As _Inline"
 msgstr "Reenviar en _línea"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1258
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1260 ../mail/e-mail-reader.c:1267
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reenvía el mensaje seleccionado citado como una respuesta"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1265
 msgid "Forward As _Quoted"
 msgstr "Reenviar como ci_tado"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1272
 msgid "_Load Images"
 msgstr "Cargar _imágenes"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1274
 msgid "Force images in HTML mail to be loaded"
 msgstr "Fuerza la carga de imágenes en el correo HTML"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1279
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1281
 msgid "Mark the selected messages as important"
 msgstr "Marcar los mensajes seleccionados como importantes"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1286
 msgid "_Junk"
 msgstr "_SPAM"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1288
 msgid "Mark the selected messages as junk"
 msgstr "Marcar los mensajes seleccionados como SPAM"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1293
 msgid "_Not Junk"
 msgstr "No es SPA_M"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1295
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar los mensajes seleccionados como no SPAM"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1300
 msgid "_Read"
 msgstr "_Leído"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1302
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar los mensajes seleccionados como leídos"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1307
 msgid "Uni_mportant"
 msgstr "N_o importante"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1309
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar los mensajes seleccionados como no importantes"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1314
 msgid "_Unread"
 msgstr "_No leído"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1316
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar los mensajes seleccionados como no leídos"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1321
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo…"
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1323
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abre los mensajes seleccionados en el editor para editarlo"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1328
 msgid "Compose _New Message"
 msgstr "Redactar un mensaje _nuevo"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1330
 msgid "Open a window for composing a mail message"
 msgstr "Abre una ventana para escribir un mensaje de correo"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1335
 msgid "_Open in New Window"
 msgstr "_Abrir en una ventana nueva"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1337
 msgid "Open the selected messages in a new window"
 msgstr "Abre los mensajes seleccionados en una ventana nueva"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1342
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta…"
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1344
 msgid "Move selected messages to another folder"
 msgstr "Mueve los mensajes seleccionados a otra carpeta"
 
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1349
 msgid "_Next Message"
 msgstr "Mensaje _siguiente"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1351
 msgid "Display the next message"
 msgstr "Mostrar el mensaje siguiente"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1356
 msgid "Next _Important Message"
 msgstr "Mensaje siguiente _importante"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1358
 msgid "Display the next important message"
 msgstr "Mostrar el mensaje siguiente importante"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1363
 msgid "Next _Thread"
 msgstr "_Conversación siguiente"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1365
 msgid "Display the next thread"
 msgstr "Mostrar la siguiente conversación"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1370
 msgid "Next _Unread Message"
 msgstr "Mensaje siguiente _no leído"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1372
 msgid "Display the next unread message"
 msgstr "Mostrar el siguiente mensaje no leído"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1377
 msgid "_Previous Message"
 msgstr "Mensaje _anterior"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1379
 msgid "Display the previous message"
 msgstr "Mostrar el mensaje anterior"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1384
 msgid "Pr_evious Important Message"
 msgstr "Mensaje anterior i_mportante"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1386
 msgid "Display the previous important message"
 msgstr "Mostrar el anterior mensaje importante"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1391
 msgid "P_revious Unread Message"
 msgstr "Mensaje anterior n_o leído"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1393
 msgid "Display the previous unread message"
 msgstr "Mostrar el anterior mensaje no leído"
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1400
 msgid "Print this message"
 msgstr "Imprime este mensaje"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1407
 msgid "Preview the message to be printed"
 msgstr "Vista previa del mensaje que va a imprimirse"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1412
 msgid "Re_direct"
 msgstr "Re_dirigir"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1414
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirige (rebotar) el mensaje seleccionado a alguien"
 
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1421
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Responder a todos los destinatarios del mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1426
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1428
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Responde a la lista de correo remitente del mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1433
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1435
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Responde al remitente del mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1440
 msgid "_Save as mbox..."
 msgstr "_Guardar como mbox…"
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1442
 msgid "Save selected messages as an mbox file"
 msgstr "Guarda los mensajes como un archivo mbox"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1447
 msgid "Search Folder from Mailing _List..."
 msgstr "Carpeta de búsqueda según la l_ista de correo…"
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1449
 msgid "Create a search folder for this mailing list"
 msgstr "Crear una carpeta de búsqueda para esta lista de correo"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1454
 msgid "Search Folder from Recipien_ts..."
 msgstr "Carpeta de búsqueda según los des_tinatarios…"
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1456
 msgid "Create a search folder for these recipients"
 msgstr "Crear una carpeta de búsqueda para estos destinatarios"
 
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1461
 msgid "Search Folder from Sen_der..."
 msgstr "Carpeta de búsqueda según el r_emitente…"
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1463
 msgid "Create a search folder for this sender"
 msgstr "Crear una carpeta de búsqueda para este remitente"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1468
 msgid "Search Folder from S_ubject..."
 msgstr "Carpeta de búsqueda según el a_sunto…"
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1470
 msgid "Create a search folder for this subject"
 msgstr "Crear una carpeta de búsqueda para este asunto"
 
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1475
 msgid "_Message Source"
 msgstr "Me_nsaje en bruto"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1477
 msgid "Show the raw email source of the message"
 msgstr "Mostrar mensaje de correo-e en bruto"
 
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1489
 msgid "_Undelete Message"
 msgstr "_Recuperar mensaje"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1491
 msgid "Undelete the selected messages"
 msgstr "Recupera los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1496
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1498
 msgid "Reset the text to its original size"
 msgstr "Restablecer el texto a su tamaño original"
 
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1503
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1505
 msgid "Increase the text size"
 msgstr "Incrementar el tamaño del texto"
 
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1510
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1512
 msgid "Decrease the text size"
 msgstr "Reduce el tamaño del texto"
 
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1519
 msgid "Create R_ule"
 msgstr "Crear _regla"
 
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1526
 msgid "Ch_aracter Encoding"
 msgstr "C_odificación de caracteres"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1533
 msgid "F_orward As"
 msgstr "Reenviar _como"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1540
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1547
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1554
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1561
 msgid "_Zoom"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1586
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para se_guimiento…"
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1594
 msgid "Mark as _Important"
 msgstr "Marcar como imp_ortante"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1598
 msgid "Mark as _Junk"
 msgstr "Marcar como _SPAM"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1602
 msgid "Mark as _Not Junk"
 msgstr "Marcar como no _SPAM"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1606
 msgid "Mar_k as Read"
 msgstr "Marcar como _leído"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1610
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como no imp_ortante"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1614
 msgid "Mark as _Unread"
 msgstr "Marcar como no _leído"
 
-#: ../mail/e-mail-reader.c:1654
+#: ../mail/e-mail-reader.c:1650
 msgid "_Caret Mode"
 msgstr "Activar cu_rsor"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:1652
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostrar un cursor parpadeante en el cuerpo de los mensajes mostrados"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1658
 msgid "All Message _Headers"
 msgstr "_Todas las cabeceras del mensaje"
 
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:1660
 msgid "Show messages with all email headers"
 msgstr "Mostrar los mensajes con todas las cabeceras de correo-e"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1882
 msgid "Unable to retrieve message"
 msgstr "No se pudo obtener el mensaje"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1886 ../mail/e-mail-reader.c:1946
+#: ../mail/mail-ops.c:1843
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Obteniendo mensaje «%s»"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2462 ../mail/mail-config.ui.h:30
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2583
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2584
 msgid "Forward the selected message to someone"
 msgstr "Reenvía a alguien el mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2629 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2637
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2641 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "Responder"
 
@@ -10352,24 +10203,24 @@ msgstr "Marcar para seguimiento"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:74
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Sin cifrado"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:128
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:99
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
@@ -10387,39 +10238,39 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 "\n"
-"Por favor, lea cuidadosamente el acuerdo de licencia\n"
+"Lea cuidadosamente el acuerdo de licencia\n"
 "para %s mostrado abajo\n"
 "y marque la casilla para aceptarlo.\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "Siempre"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "Preguntar por cada mensaje"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10429,43 +10280,43 @@ msgstr ""
 "\n"
 "Pulse «Adelante» para comenzar. "
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2060
 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 ""
-"Por favor escriba debajo su nombre y dirección de correo-e. Los campos "
-"«opcionales» no hace falta que los rellene, a menos que quiera incluir esta "
-"información en el correo-e que envíe."
+"Escriba debajo su nombre y dirección de correo-e. Los campos «opcionales» no "
+"hace falta que los rellene, a menos que quiera incluir esta información en "
+"el correo-e que envíe."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2227
+#: ../mail/mail-config.ui.h:92
 msgid "Receiving Email"
 msgstr "Recepción de correo"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "Configure las siguientes opciones de la cuenta."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2705
 msgid "Sending Email"
 msgstr "Envío de correo"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2066
 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 ""
-"Por favor escriba debajo la información acerca de cómo enviará su correo. Si "
-"no está seguro, pregúntele a su administrador de sistemas o a su Proveedor "
-"de Servicios de Internet."
+"Escriba debajo la información acerca de cómo enviará su correo. Si no está "
+"seguro, pregúntele a su administrador de sistemas o a su Proveedor de "
+"Servicios de Internet."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "Administración de cuentas"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2069
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10473,11 +10324,11 @@ msgstr ""
 "Introduzca un nombre descriptivo para esta cuenta en el espacio de abajo.\n"
 "Este nombre se usará sólo para mostrarlo."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "Hecho"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10491,56 +10342,56 @@ msgstr ""
 "\n"
 "Pulse «Aplicar» para guardar su configuración."
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2514
 msgid "Check for _new messages every"
 msgstr "Comprobar si hay mensajes _nuevos cada"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2522
 msgid "minu_tes"
-msgstr "minu_tos"
+msgstr "minuto_s"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2892 ../mail/mail-config.ui.h:106
 msgid "Security"
 msgstr "Seguridad"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2937 ../mail/em-account-editor.c:3005
 msgid "Receiving Options"
 msgstr "Opciones de recepción"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2938 ../mail/em-account-editor.c:3006
 msgid "Checking for New Messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3474
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3474
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1570
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Su mensaje para %s acerca de «%s» se ha leído el «%s»"
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1618
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Notificación de entrega para: «%s»"
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1947
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
 #. 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:1997
+#: ../mail/em-composer-utils.c:1994
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10548,19 +10399,19 @@ msgstr ""
 "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribió:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2138
 msgid "-----Original Message-----"
 msgstr "-----Mensaje original-----"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2319
 msgid "Posting destination"
 msgstr "Destino de publicación"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2320
 msgid "Choose folders to post the message to."
 msgstr "Elija las carpetas en las que publicar el mensaje."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -10641,6 +10492,10 @@ msgstr "Seguimiento"
 msgid "Forward to"
 msgstr "Reenviar a"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Importante"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "es posterior a"
@@ -10665,7 +10520,7 @@ msgstr "no está establecida"
 msgid "is set"
 msgstr "está establecida"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "SPAM"
 
@@ -10714,7 +10569,7 @@ msgid "Play Sound"
 msgstr "Reproducir un sonido"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "Leído"
 
@@ -10795,16 +10650,16 @@ msgid "Unset Status"
 msgstr "Quitar estado"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "Luego"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "Añadir a_cción"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensajes no leído:"
@@ -10812,24 +10667,24 @@ msgstr[1] "Mensajes no leídos:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Mensajes en total:"
 msgstr[1] "Mensajes en total:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Uso de cuota (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "Uso de cuota"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "Propiedades de la carpeta"
 
@@ -10837,37 +10692,37 @@ msgstr "Propiedades de la carpeta"
 msgid "<click here to select a folder>"
 msgstr "<pulse aquí para seleccionar una carpeta>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1070 ../mail/mail-vfolder.c:1135
 msgid "Search Folders"
 msgstr "Carpetas de búsqueda"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "NO COINCIDENTE"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1086
 msgid "Loading..."
 msgstr "Cargando…"
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:183
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:596
 msgid "Folder names cannot contain '/'"
 msgstr "Los nombres de carpetas no pueden contener el carácter «/»"
 
@@ -10889,74 +10744,74 @@ msgstr "Los nombres de carpetas no pueden contener el carácter «/»"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1078
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1286
 msgid "Mail Folder Tree"
 msgstr "�rbol de carpetas de correo"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1583 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1585 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1592 ../mail/message-list.c:2106
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1594 ../mail/message-list.c:2108
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1609
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se puede dejar el(los) mensaje(s) en el almacén de nivel superior"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Move Folder To"
 msgstr "Mover carpeta a"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Copy Folder To"
 msgstr "Copiar carpeta a"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:509
+#: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
-msgid "Creating folder `%s'"
+msgid "Creating folder '%s'"
 msgstr "Creando carpeta «%s»"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:672
 msgid "Create Folder"
 msgstr "Crear carpeta"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:673
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:693
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Desuscribiéndose de la carpeta «%s»"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10964,11 +10819,11 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "Firma válida"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10976,11 +10831,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:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "Firma no válida"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10988,11 +10843,11 @@ msgstr ""
 "La firma de este mensaje no se puede verificar, pudo haber sido alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
 msgid "Valid signature, but cannot verify sender"
 msgstr "Firma válida, pero no se puede verificar el remitente"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11000,11 +10855,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:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
 msgid "Signature exists, but need public key"
 msgstr "La firma existe pero se necesita la clave pública"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -11012,11 +10867,11 @@ msgstr ""
 "Este mensaje está firmado con una firma pero no existe una clave pública "
 "correspondiente."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11024,11 +10879,11 @@ msgstr ""
 "Este mensaje no está cifrado. Su contenido puede verse en tránsito a través "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -11038,11 +10893,11 @@ msgstr ""
 "ser difícil, pero no imposible para un espía ver el contenido de este "
 "mensaje empleando algo de tiempo."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11050,11 +10905,11 @@ msgstr ""
 "Este mensaje está cifrado. Sería difícil para un espía ver el contenido de "
 "este mensaje."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "Cifrado, fuerte"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -11064,15 +10919,15 @@ msgstr ""
 "difícil que un espía vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -11080,28 +10935,28 @@ msgstr ""
 "Evolution no puede mostrar este correo debido a que es demasiado grande para "
 "procesarlo. Puede verlo sin formato o con un editor de texto externo."
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:726
 msgid "Completed on"
 msgstr "Completado en"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:734
 msgid "Overdue:"
 msgstr "Atrasado:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:738
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
 msgid "View _Unformatted"
 msgstr "Ver _sin formato"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:950
 msgid "Hide _Unformatted"
 msgstr "Ocultar _sin formato"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1012
 msgid "O_pen With"
 msgstr "Abrir c_on"
 
@@ -11110,17 +10965,17 @@ msgstr "Abrir c_on"
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:147
 msgid "Formatting message"
 msgstr "Formateando el mensaje"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:338
 msgid "Formatting Message..."
 msgstr "Formateando el mensaje…"
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
 #, c-format
-msgid "Retrieving `%s'"
+msgid "Retrieving '%s'"
 msgstr "Obteniendo «%s»"
 
 #: ../mail/em-format-html.c:1854
@@ -11158,39 +11013,52 @@ msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#.
-#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2600
 #, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "Este mensaje lo envió <b>%s</b> en nombre de <b>%s</b>"
+msgid "This message was sent by %s on behalf of %s"
+msgstr "%s envió este mensaje en nombre de %s"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:668
 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:619
+#: ../mail/em-subscribe-editor.c:719
 msgid "Subscribed"
 msgstr "Suscrito"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:723
 msgid "Folder"
 msgstr "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1111
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1157
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "¿Está seguro de que quiere abrir %d mensaje a la vez?"
+msgstr[1] "¿Está seguro de que quiere abrir %d mensajes a la vez?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "_Do not show this message again"
+msgstr "_No mostrar otra vez este mensaje."
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Filtros de mensajes"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:853
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensajes de %s"
@@ -11199,7 +11067,7 @@ msgstr "Mensajes de %s"
 msgid "Search _Folders"
 msgstr "Carpetas de _búsqueda"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:521
 msgid "Add Folder"
 msgstr "Añadir carpeta"
 
@@ -11240,50 +11108,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Anchura de la ventana «Enviar y recibir correo»"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Permite a Evolution mostrar la parte de texto de tamaño limitado"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Siempre solicitar confirmación de lectura"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "Reconocimiento automático de emoticonos"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "Reconocimiento automático de enlaces"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Comprobar si el correo entrante es SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Color de resaltado de citas"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Color de resaltado de citas."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Altura predeterminada de la ventana de redacción de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Anchura predeterminada de la ventana de redacción de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "Directorio de carga/adjuntos del editor"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Comprimir la visualización de direcciones en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11291,7 +11155,7 @@ msgstr ""
 "Comprime la visualización de direcciones en A/CC/CCO al número especificado "
 "en address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11299,11 +11163,11 @@ msgstr ""
 "Controla la frecuencia con la que los cambios locales se sincronizan con el "
 "servidor de correo-e remoto. El intervalo debe ser de al menos 30 segundos."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "Cabeceras personalizadas que usar al comprobar si es SPAM."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11311,65 +11175,65 @@ msgstr ""
 "Cabeceras personalizadas que usar para comprobar si es SPAM. La lista de "
 "elementos son cadenas con el formato \"headername=valor\"."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Estilo de reenvío predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Altura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Altura predeterminada de la ventana del examinador de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Altura predeterminada del diálogo de suscripción."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr ""
 "Anchura predeterminada en estado maximizado de la ventana del examinador de "
 "correo."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Estilo de respuesta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Valor predeterminado para el estado de expansión de la conversación"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Anchura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Anchura predeterminada de la ventana del examinador de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Anchura predeterminada del diálogo de suscripción."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11377,13 +11241,13 @@ msgstr ""
 "Determina si se deben buscar direcciones para filtrar SPAM sólo en la "
 "libreta de direcciones local"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina si se debe buscar la dirección del remitente en la libreta de "
 "direcciones"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11395,12 +11259,12 @@ msgstr ""
 "libretas marcadas para autocompletado. Puede ser lento si se han marcado "
 "para autocompletado libretas de direcciones remotas (como LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina si se deben usar cabeceras personalizadas para comprobar si es SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11410,7 +11274,7 @@ msgstr ""
 "SPAM. Si esta opción está activada y las cabeceras se mencionan, se mejorará "
 "la velocidad de comprobado de correo basura."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11418,20 +11282,24 @@ msgstr ""
 "Determina si se debe usar la misma tipografía para las líneas «De» y «Asunto» "
 "en la columna «Mensajes» de la vista vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directorio para cargar/adjuntar archivos en el editor."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "Directorio para guardar archivos enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Desactivar o activar la elipsis de los nombres de las carpetas en la barra "
 "lateral"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "Mostrar sólo los mensajes de texto que no excedan de cierto tamaño"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "No añadir un delimitador de firma"
@@ -11507,14 +11375,18 @@ msgstr ""
 "previa del mensaje, lista de mensajes y carpetas."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "Activar para mostrar la parte de texto del mensaje de tamaño limitado."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+"Activar el mostrado exclusivo de mensajes de texto que no excedan el tamaño "
+"definido en la clave «message_text_part_limit»."
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:47
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar nombres de archivo de la forma Outlook/GMail"
 
@@ -11659,11 +11531,11 @@ msgstr ""
 "sólo los elimina de los resultados de la búsqueda."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
 msgstr "Última vez que se vació el SPAM"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
 msgstr "Última vez que se vació la papelera"
 
 #: ../mail/evolution-mail.schemas.in.h:85
@@ -11777,125 +11649,129 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuales en la «vista previa» del mensaje."
 
 #: ../mail/evolution-mail.schemas.in.h:109
+msgid "Message text limit for display"
+msgstr "Límite del texto del mensaje para mostrarlo"
+
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualización del mensaje (\"normal\", \"full headers\" (cabeceras "
 "completas), \"source\" (fuente))"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Días mínimos entre el vaciado del SPAM a la salida"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Días mínimos entre el vaciado de la papelera a la salida"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado del SPAM a la salida, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado de la papelera a la salida, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Número de direcciones a mostrar en PARA/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "Preguntar si el asunto está en blanco"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr "Preguntar al usuario cuando intente compactar una carpeta."
+msgstr "Preguntar al usuario cuando intente purgar una carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intente enviar un mensaje sin un asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "Preguntar al eliminar mensajes en carpetas de búsqueda"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "Preguntar cuando el usuario compacte"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cuando el usuario sólo rellene el campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Preguntar cuando el usuario intente abrir diez o más mensajes a la vez"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Preguntar al enviar mensajes en HTML a contactos quizá no los quieran."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cuando el usuario intente enviar un mensaje sin destinatarios Para "
 "o Cc."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cuando el usuario intente enviar HTML no deseado"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cuando se marquen varios mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr "Poner firmas personalizas en la parte superior de las respuestas"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "Comenzar a escribir en la parte final al responder"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Reconocer emoticonos en el texto y reemplazarlos con imágenes."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "Reconocer enlaces en el texto y reemplazarlos."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "Ejecutar la prueba de SPAM en el correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "Directorio donde guardar"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "Buscar la foto del remitente en libretas de direcciones locales"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML de forma predeterminada"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "Enviar el correo en HTML de forma predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "Columna del correo-e del remitente en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronización con el servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11903,67 +11779,67 @@ msgstr ""
 "Establézcalo a verdadero si no quiere añadir un delimitador de firma antes "
 "de su firma al editar un correo."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Mostrar el campo «Cco» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Mostrar el campo «Cc» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Mostrar el campo «De» al publicar en un grupo de noticias"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"From\" field when sending a mail message"
 msgstr "Mostrar el campo «De» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Mostrar el campo «Responder a» al publicar en un grupo de noticias"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Mostrar el campo «Responder a» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "Mostrar animaciones"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show all message headers"
 msgstr "Mostrar todas las cabeceras del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show all the headers when viewing a messages."
 msgstr "Mostrar todas las cabeceras al ver mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "Mostrar las imágenes animadas como animaciones."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar los mensajes borrados (tachados) en la lista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar los mensajes borrados en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show image animations"
 msgstr "Mostrar imágenes animadas"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar el valor original de la cabecera «Fecha»."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "Mostrar la foto del remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11971,7 +11847,7 @@ msgstr ""
 "Mostrar el campo «Cco» al enviar un mensaje de correo. Esto se controla desde "
 "el menú Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11979,7 +11855,7 @@ msgstr ""
 "Mostrar el campo «Cc» al enviar un mensaje de correo. Esto se controla desde "
 "el menú Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11987,7 +11863,7 @@ msgstr ""
 "Mostrar el campo «De» al enviar un mensaje de correo. Esto se controla desde "
 "el menú Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11995,7 +11871,7 @@ msgstr ""
 "Mostrar el campo «De» al enviar un mensaje de correo. Esto se controla desde "
 "el menú Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -12003,7 +11879,7 @@ msgstr ""
 "Mostrar el campo «Responder a» al publicar en un grupo de noticias. Esto se "
 "controla desde el menú Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -12011,7 +11887,7 @@ msgstr ""
 "Mostrar el campo «Responder a» al enviar un mensaje de correo. Esto se "
 "controla desde el menú Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -12019,7 +11895,7 @@ msgstr ""
 "Mostrar el correo-e del remitente en una columna separada en la lista de "
 "mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -12030,49 +11906,51 @@ msgstr ""
 "cabecera «Fecha» en el formato preferido por el usuario para la fecha y hora "
 "locales."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar la foto del remitente en el panel de lectura de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en línea"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "Color de la corrección ortográfica"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "Comprobación ortográfica de idiomas"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "Anchura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "Tipografía del terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "Límite de la parte de texto del mensaje"
-
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "El complemento predeterminado para SPAM"
 
 #: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
-msgstr "La última vez que se vació el SPAM, en días desde la época."
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"La última vez que se vació el SPAM, en días desde el 1 de enero de 1970 "
+"(época)."
 
 #: ../mail/evolution-mail.schemas.in.h:171
-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."
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"La última vez que se vació la papelera, en días desde el 1 de enero de 1970 "
+"(época)."
 
 #: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
@@ -12104,12 +11982,14 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
 "Esto decide el tamaño máximo de la parte de texto que se puede formatear "
-"bajo Evolution. Lo predeterminado son 4 MiB/4096 KiB y está especificado en "
-"términos de KiB."
+"bajo Evolution, especificado en términos de KB. Lo predeterminado son 4096 "
+"(4MiB). Este valor sólo se usa cuando la clave 'force_message_limit' está "
+"activada."
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
@@ -12288,531 +12168,590 @@ msgstr "Anchura del panel de lista de mensajes"
 msgid "Width of the message-list pane."
 msgstr "Anchura del panel de lista de mensajes."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Importando datos de Elm"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "Correo"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
 msgstr "Importador de Elm de Evolution"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
 msgstr "Importar correo de Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "Carpeta de destino:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+msgid "_Destination folder:"
+msgstr "Carpeta de _destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder to import into"
 msgstr "Seleccione la carpeta en la que importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
+#| msgid "Subject"
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Asunto"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
+#| msgid "From"
+msgctxt "mboxImp"
+msgid "From"
+msgstr "De"
+
+#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Buzón Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:413
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de carpetas en formato buzón de Berkeley"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Importando buzón de correo"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:149
+#: ../plugins/pst-import/pst-importer.c:453
+#: ../plugins/pst-import/pst-importer.c:559
 #, c-format
-msgid "Importing `%s'"
+msgid "Importing '%s'"
 msgstr "Importando «%s»"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:293
 #, c-format
 msgid "Scanning %s"
 msgstr "Analizando %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "Importando datos de Pine"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:419
 msgid "Evolution Pine importer"
 msgstr "Importador de Pine de Evolution"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:420
 msgid "Import mail from Pine."
 msgstr "Importar correo de Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Correo para %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "Asunto es %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "Lista de correo %s"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Añadir regla de filtrado"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(Nota: Requiere reiniciar la aplicación)"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
 
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>Opción publicar por encima</b> (no se recomienda)"
+msgid "(Not Recommended)"
+msgstr "(No recomendado)"
 
 #: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(Nota: Requiere reiniciar la aplicación)"
+
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "Información de la cuenta"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "Añadir firma _nueva…"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Firmar siempre los mensajes salientes cuando se use esta cuenta"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "También cifrar a _mí mismo cuando envíe correo cifrado"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Siempre enviar _copia de carbón (Cc) a:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Siempre enviar copia de carbón _oculta (Cco) a:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Siempre _confiar en las claves de mi almacén al cifrar"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Siempre cifrar a _mí mismo cuando envíe correo cifrado"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "Siempre _solicitar confirmación de lectura"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "Insertar imágenes de _emoticonos automáticamente"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "Conjunto de carac_teres:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
-msgstr "_Comprobar tipos soportados"
+msgstr "C_omprobar tipos soportados"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "Compro_bar las cabeceras personalizadas contra SPAM"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar si los _mensajes entrantes son basura"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "Comprobar orto_grafía mientras se escribe"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Comprueba si los mensajes de correo entrantes son SPAM"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "_Vaciar"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "Vacia_r"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "Color para las palabras _mal escritas:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "Redactar mensajes"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Configuración"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
-msgstr "_Confirmar antes de compactar una carpeta"
+msgstr "_Confirmar antes de purgar una carpeta"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:31
 msgid "Default Behavior"
 msgstr "Comportamiento predeterminado"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:32
 msgid "Default character e_ncoding:"
 msgstr "_Codificación de caracteres predeterminada:"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:34
 msgid "Delete Mail"
 msgstr "Eliminar correo-e"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar los mensajes SPAM al _salir"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:37
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Firmar digitalmente los mensajes s_alientes (por omisión)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "Ca_beceras mostradas del mensaje"
+#: ../mail/mail-config.ui.h:38
+msgid "Displayed Message Headers"
+msgstr "Cabeceras mostradas del mensaje"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "No formatear mensajes si el ta_maño del texto excede"
+#: ../mail/mail-config.ui.h:39
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "No mostrar mensajes si el tama_ño del texto excede"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:40
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "_No marcar los mensajes como basura si el remitente está en mi libreta de "
 "direcciones"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "No entrecomillar"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "Carpeta de _borradores:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "Dir_ección de correo-e:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "Vaciar _papelera al salir"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Magic S_pacebar"
 msgstr "Activar la barra e_spaciadora mágica"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Sea_rch Folders"
 msgstr "Activar las Carpetas de _búsqueda"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:48
 msgid "Encry_ption certificate:"
 msgstr "Certificado de ci_frado:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
 msgid "Encrypt out_going messages (by default)"
 msgstr "Cifrar mensajes _salientes (por omisión)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
 msgid "Fi_xed-width:"
 msgstr "Anchura _fija:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:51
 msgid "Fix_ed width Font:"
 msgstr "Tipografía de anchura _fija:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:52
 msgid "Font Properties"
 msgstr "Propiedades de tipografías"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:53
 msgid "Format messages in _HTML"
 msgstr "Dar formato _HTML a los mensajes"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:54
 msgid "Full Nam_e:"
-msgstr "Nombre _completo:"
+msgstr "Nombre co_mpleto:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:56
 msgid "HTML Messages"
 msgstr "Mensajes HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:57
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "Cabeceras"
 
 # Esta cadena debe permanecer así
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "Resaltar texto _citado con este color:"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "En línea"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "En línea (estilo Outlook)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:64
 msgid "KB"
 msgstr "Kib"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:65 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:66
 msgid "Languages Table"
 msgstr "Tabla de idiomas"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:67
 msgid "Loading Images"
 msgstr "Cargando imágenes"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:68
 msgid "Mail Headers Table"
 msgstr "Tabla de cabeceras de correo"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:69
 msgid "Mailbox location"
 msgstr "Dirección del buzón"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:70
 msgid "Message Display"
 msgstr "Mostrado de mensajes"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:71
 msgid "Message Fonts"
 msgstr "Tipografías del mensaje"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:72
 msgid "Message Receipts"
 msgstr "Destinatarios del mensaje"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:73
 msgid "No _Proxy for:"
 msgstr "Sin _proxy para:"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:75
 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.ui.h:74
+#: ../mail/mail-config.ui.h:76
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Esta opción se omitirá si se encuentra alguna coincidencia para una cabecera "
 "de SPAM personalizada."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:77
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Información opcional"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:79
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de c_lave GPG/PGP:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
 msgid "Pass_word:"
 msgstr "_Contraseña:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
 msgid "Port:"
 msgstr "Puerto:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
 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.ui.h:83
+#: ../mail/mail-config.ui.h:85
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:87
 msgid "Printed Fonts"
 msgstr "Tipografías imprimidas"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:88
 msgid "Proxy Settings"
 msgstr "Ajustes del proxy"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:89
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:90
 msgid "Re_member password"
 msgstr "_Recordar contraseña"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:91
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:93
 msgid "Remember _password"
-msgstr "Recordar _contraseña"
+msgstr "Recordar contrase_ña"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94
 msgid "Required Information"
 msgstr "Información requerida"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:96
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:97
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:98
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:100
 msgid "SSL is not supported in this build of Evolution"
 msgstr "Esta compilación de Evolution no soporta SSL"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:101
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Bu_scar la foto del remitente sólo en libretas de direcciones locales"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:102
 msgid "S_elect..."
 msgstr "S_eleccionar…"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:103
 msgid "S_end message receipts:"
 msgstr "_Enviar confirmaciones de mensajes:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:104
 msgid "S_tandard Font:"
 msgstr "Tipografía _estándar:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:107
 msgid "Select Drafts Folder"
 msgstr "Seleccionar la carpeta de borradores"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:108
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:109
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona letra de anchura fija en HTML para imprimir"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:110
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:111
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:112
 msgid "Select Sent Folder"
 msgstr "Seleccionar la carpeta de enviados"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:113
 msgid "Sender Photograph"
 msgstr "Foto del remitente"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:114
 msgid "Sending Mail"
 msgstr "Envío de correo"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:116
 msgid "Sent and Draft Messages"
 msgstr "Mensajes enviados y borradores"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:117
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticación"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:118
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:119
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:120
+#| msgid "Sig_ning certificate:"
+msgid "Si_gning algorithm:"
+msgstr "Algoritmo de _firma:"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "_Firmas"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "Certificado de _firma:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "_Firma:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "Firmas"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:125
+#| msgid "Sig_ning certificate:"
+msgid "Signing _algorithm:"
+msgstr "_Algoritmo de firma:"
+
+#: ../mail/mail-config.ui.h:126
 msgid "Spell Checking"
 msgstr "Ortografía"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:127
 msgid "Start _typing at the bottom on replying"
 msgstr "Comenzar a _escribir en la parte final al responder"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:129
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:130
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12820,7 +12759,7 @@ msgstr ""
 "La lista de idiomas de aquí refleja únicamente los idiomas para los cuáles "
 "hay instalado un diccionario."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:131
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12830,7 +12769,12 @@ msgstr ""
 "El nombre que especifique se usará únicamente \n"
 "para mostrarlo por pantalla. "
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:135
+msgid "Top Posting Option"
+msgstr "Opción de publicar por encima"
+
+#: ../mail/mail-config.ui.h:136
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12838,185 +12782,187 @@ msgstr ""
 "Teclee el nombre por el que quiere identificar a esta cuenta.\n"
 "Por ejemplo: «Trabajo» o «Personal»"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:138
 msgid "Us_ername:"
 msgstr "_Usuario:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:139
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:140 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "_Usuario:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:141
 msgid "V_ariable-width:"
 msgstr "An_chura variable:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "_Añadir firma"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "_Siempre cargar las imágenes desde Internet"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticación"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:145
 msgid "_Default junk plugin:"
 msgstr "Complemento SPAM pre_determinado:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "Conexión _directa a Internet"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:147
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:148
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Mantener la firma por encima del mensaje original al responder"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "_Idiomas"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images in messages from contacts"
 msgstr "_Cargar imágenes en los mensajes de mis contactos"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "_Buscar sólo en la libreta de direcciones local"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "_Hacer que ésta sea mi cuenta predeterminada"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "Configuración _manual del proxy:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:155
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como leídos tras"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:157
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar imágenes desde Internet"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:158
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Preguntar al enviar mensajes en HTML a contactos que no los quieren"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:160
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pr_eguntar al enviar mensajes con el asunto vacío"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:161
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:162
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:163
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Servidor:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:167
 msgid "_Show image animations"
 msgstr "_Mostrar animaciones"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:168
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar la foto del remitente en la vista previa del mensaje"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:170
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Reducir las cabeceras Para / Cc / Cco a "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:171
 msgid "_Use Secure Connection:"
-msgstr "_Usar conexión segura:"
+msgstr "Usar cone_xión segura:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:172
 msgid "_Use system defaults"
 msgstr "_Usar los valores predeterminados del sistema"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:173
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "am"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:176
 msgid "addresses"
 msgstr "direcciones"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:177 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "por"
 
 # Esta traducción debe mantenerse así
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:178
 msgid "color"
 msgstr "color"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:179
 msgid "description"
 msgstr "descripción"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Todas las carpetas remotas activas"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "Todas las carpetas locales y remotas activas"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "Todas las carpetas locales"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Llamar"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "_Terminado"
 
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Collapse _all"
+msgstr "Contraer t_odas"
+
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Firma digital"
@@ -13026,58 +12972,66 @@ msgid "Do Not Forward"
 msgstr "No reenviar"
 
 #: ../mail/mail-dialogs.ui.h:9
+msgid "E_xpand all"
+msgstr "E_xpandir todas"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "Suscripciones de carpetas"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "Seguimiento"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "Para su información"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "Acuerdo de licencia"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "No es necesaria una respuesta"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "Revisar"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr "Sólo _mostrar elementos que contengan:"
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr "Orígenes de las carpetas de búsqueda"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "Información de seguridad"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "Carpetas específicas"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13085,170 +13039,170 @@ msgstr ""
 "Los mensajes que ha seleccionado para seguir se listan abajo.\n"
 "Seleccione una acción de seguimiento desde el menú «Marcar»."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "_Aceptar licencia"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "_Vence el:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque esto para aceptar el acuerdo de licencia"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:754
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Filtrado de mensajes seleccionados"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:576
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "No se pudieron aplicar los filtros al correo saliente: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:588 ../mail/mail-ops.c:616
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"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"
+"En su lugar se anexará a la carpeta local «Correo enviado»."
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:633
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "No es posible anexar a la carpeta local «Correo enviado»: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Falló anexar a la carpeta local «Correo enviado»: %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:744 ../mail/mail-ops.c:825
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:754
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:781
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Falló al enviar %d de %d mensajes"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:783 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:785 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "Completado."
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:897
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Guardando mensaje en la carpeta «%s»"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:974
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Moviendo mensajes a «%s»"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:974
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando mensajes a «%s»"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1083
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Analizando carpetas en «%s»"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1191
 msgid "Forwarded messages"
 msgstr "Mensajes reenviados"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1232
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Abriendo carpeta «%s»"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1298
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Obteniendo la información de la cuota para la carpeta «%s»"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1370
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Abriendo almacén «%s»"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1441
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Eliminando carpeta «%s»"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1561
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1624
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta «%s»"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1625
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta «%s»"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1679
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando carpeta «%s»"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1719
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Compactando carpeta «%s»"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1764
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1765
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1961
 #, 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:2056
+#: ../mail/mail-ops.c:2050
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Guardando %d mensaje"
 msgstr[1] "Guardando %d mensajes"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2131
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13257,11 +13211,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2203
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2221 ../mail/mail-ops.c:2229
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13270,35 +13224,35 @@ msgstr ""
 "No es posible crear el archivo de salida: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2244
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No es posible escribir datos: %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2389
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Desconectando de «%s»"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2389
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Reconectándose con «%s»"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2485
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando la cuenta «%s» para desconexión"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2571
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "Cancelando…"
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
@@ -13306,109 +13260,138 @@ msgstr "Enviar y recibir correo"
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "Actualizando…"
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "Esperando…"
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando correo nuevo"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:208
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduzca la contraseña para %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:210
 msgid "Enter Passphrase"
 msgstr "Introduzca la contraseña"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:213
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:215
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:257
 msgid "User canceled operation."
 msgstr "El usuario canceló la operación."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:667
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "No se proporcionó ninguna dirección de destino, se canceló el reenvío del "
 "mensaje."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:673
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "No se encontró ninguna cuenta que usar, se canceló el reenvío del mensaje."
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:119
 #, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "No es posible crear el directorio spool «%s»: %s"
+msgid "Could not create spool directory '%s': %s"
+msgstr "No se pudo crear el directorio spool «%s»: %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:149
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Intentando mover correo desde un origen que no es un buzón «%s»"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaje reenviado: %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:297
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "Carpeta inválida: «%s»"
+msgid "Invalid folder: '%s'"
+msgstr "Carpeta no válida: «%s»"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Configurando carpeta de búsqueda: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:228
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Actualizando carpetas de búsqueda para «%s: %s»"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Actualizando carpetas de búsqueda para «%s»"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:678
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-vfolder.c:1188
 msgid "Edit Search Folder"
 msgstr "Editar carpeta de búsqueda"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1293
 msgid "New Search Folder"
 msgstr "Carpeta de búsqueda nueva"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "Falló la comprobación de SPAM"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "Falló al informar de que es SPAM"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "Falló al informar de que no es SPAM"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Ya existe una carpeta llamada «{0}». Use un nombre diferente."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Ya existe una carpeta llamada «{1}». Use un nombre diferente."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13420,7 +13403,7 @@ msgstr ""
 "Puede elegir ignorar esta carpeta, sobreescribirla o añadir su contenido, o "
 "salir."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13428,14 +13411,14 @@ msgstr ""
 "Se ha solicitado una notificación de recepción para «{1}». ¿Quiere enviar una "
 "notificación de recepción a {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr ""
 "Ya existe una firma con el nombre «{0}». Especifique un nombre diferente."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13443,25 +13426,21 @@ msgstr ""
 "Añadir una línea de Asunto con significado al mensaje dará a sus "
 "destinatarios una idea de qué trata su correo."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "¿Seguro que quiere eliminar esta cuenta y todos sus proxies?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Seguro que quiere eliminar esta cuenta?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "¿Seguro que quiere desactivar esta esta cuenta y eliminar todos sus proxies?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "¿Seguro que quiere abrir {0} mensajes a la vez?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13469,7 +13448,7 @@ msgstr ""
 "¿Seguro que quiere eliminar permanentemente todos los mensajes borrados en "
 "todas las carpetas?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13477,87 +13456,79 @@ msgstr ""
 "¿Seguro que quiere eliminar permanentemente todos los mensajes borrados en "
 "la carpeta «{0}»?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "¿Seguro que quiere enviar un mensaje en formato HTML?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "¿Seguro que quiere enviar un mensaje con una dirección no válida?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "¿Seguro que quiere enviar un mensaje con direcciones no válidas?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "¿Seguro que quiere enviar un mensaje con sólo destinatarios Cco?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "¿Seguro que quiere enviar un mensaje sin un asunto?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "Porque «{0}»."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "Porque «{2}»."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Firma en blanco"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "No se puede añadir la carpeta de búsqueda «{0}»."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "No se puede copiar la carpeta: «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "No se puede crear la carpeta: «{0}»."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "No se puede crear el directorio de guardado temporal."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "No se puede crear el directorio de guardado, debido a «{1}»"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "No se puede eliminar la carpeta «{0}»."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "No se puede eliminar la carpeta del sistema «{0}»."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "No se puede editar la carpeta de búsqueda «{0}» ya que no existe."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "No se puede mover la carpeta «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
-msgstr "No se puede abrir el origen «{1}»"
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "No se puede abrir el origen «{1}»."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "No se puede abrir el origen «{2}»."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "No se puede abrir el destino «{2}»."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13566,35 +13537,31 @@ msgstr ""
 "instalación. No podrá usar este proveedor hasta que pueda aceptar esta "
 "licencia."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "No se puede renombrar «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "No se puede renombrar o mover la carpeta del sistema «{0}»."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "No se pueden guardar los cambios en la cuenta."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "No se puede guardar al directorio «{0}»."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "No se puede guardar al archivo «{0}»."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "No se puede establecer el script de firma «{0}»."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Falló la comprobación de SPAM"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13603,87 +13570,90 @@ msgstr ""
 "contraseñas distinguen las mayúsculas, su tecla de bloqueo de mayúsculas "
 "puede estar activada."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "No es posible guardar el archivo de firma."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "¿Eliminar los mensajes en la carpeta de búsqueda «{0}»?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Do not d_elete"
 msgstr "No _eliminar"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "No eliminar"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "No desactivar"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr ""
 "¿Quiere sincronizar localmente las carpetas marcadas para uso en desconexión?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "¿Quiere marcar todos los mensajes como leídos?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "¿Desea guardar los cambios?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Introduzca la contraseña."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Error al cargar las definiciones de filtros."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Error al efectuar operación."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "Error mientras estaba {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "El archivo existe pero no se puede sobreescribir."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "El archivo existe pero no es un archivo regular."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si continua, no podrá recuperar estos mensajes."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
-"Si borra la carpeta, todo su contenido y el de sus subcarpetas se eliminará "
-"permanentemente."
+"Si elimina la carpeta, todo su contenido y el de sus subcarpetas se "
+"eliminará permanentemente."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Si borra la carpeta, se eliminará permanentemente todo su contenido."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Si continúa, las cuentas proxy se eliminarán permanentemente."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13691,11 +13661,11 @@ msgstr ""
 "Si continúa, la información de la cuenta y toda la\n"
 "información del proxy se eliminará permanentemente."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Si continúa, la información de la cuenta se eliminará permanentemente."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13703,23 +13673,23 @@ msgstr ""
 "Si sale, estos mensajes no se enviarán hasta que Evolution sea iniciado de "
 "nuevo."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Autenticación inválida"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Ha fallado el borrado del correo"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automáticamente."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13731,36 +13701,36 @@ msgstr ""
 "listará todos los destinatarios de su mensaje de todas formas. Para evitar "
 "esto debería añadir al menos un destinatario «Para:» o «CC:»."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "Falta la carpeta."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "No se ha seleccionado ningún origen."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 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:76
+#: ../mail/mail.error.xml.h:77
 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:77
+#: ../mail/mail.error.xml.h:78
 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:78
+#: ../mail/mail.error.xml.h:79
 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 ""
-"Por favor, introduzca una dirección de correo válida en el campo «Para:» "
-"Puede buscar direcciones de correo pulsando en el botón «Para:» al lado de la "
-"caja de entrada."
+"Introduzca una dirección de correo válida en el campo «Para:» Puede buscar "
+"direcciones de correo pulsando en el botón «Para:» al lado de la caja de "
+"entrada."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13770,65 +13740,57 @@ msgstr ""
 "recibir correo-e en HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduzca un nombre único para identificar esta firma."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "Por favor espere."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problema al migrar la carpeta antigua de correo «{0}»."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 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:86
 msgid "Read receipt requested."
 msgstr "Se solicitó una notificación de lectura."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "¿Seguro que quiere eliminar la carpeta «{0}» y todas sus subcarpetas?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\"?"
 msgstr "¿Realmente quiere borrar la carpeta «{0}»?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "Falló al informe de que es SPAM"
-
 #: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "Falló al informar de que no es SPAM"
-
-#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "Carpetas de búsqueda autoactualizadas."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "Enviar confirmación"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "La firma ya existe"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "Sincronizar"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "¿Sincronizar las carpetas localmente para usarse sin conexión?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13836,7 +13798,7 @@ msgstr ""
 "Evolution requiere las carpetas de sistema para funcionar correctamente y no "
 "pueden renombrarse, moverse o eliminarse."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13852,35 +13814,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:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"La(s) siguiente(s) carpeta(s) de búsqueda:\n"
-"{0}\n"
-"Usaban la carpeta ahora eliminada:\n"
-"    «{1}» \n"
-"Y se han actualizado."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"La(s) siguiente(s) reglas de filtrado:\n"
-"«{0}»\n"
-"usaban la ahora carpeta eliminada:\n"
-"    «{1}»\n"
-"Y se han actualizado."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13888,7 +13822,7 @@ msgstr ""
 "No se reconoció el siguiente destinatario como dirección de correo válida:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13897,11 +13831,11 @@ msgstr ""
 "válidas:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "El archivo de script debe existir y ser ejecutable."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13910,7 +13844,7 @@ msgstr ""
 "vaya al editor de carpetas de búsqueda para añadirla explícitamente, si es "
 "necesario."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13918,13 +13852,13 @@ msgstr ""
 "El mensaje no puede enviarse porque la cuenta con la que eligió enviar no "
 "está activada"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:106
 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:118
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13932,11 +13866,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:119
+#: ../mail/mail.error.xml.h:108
 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:120
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13944,11 +13878,19 @@ msgstr ""
 "Esto marcará todos los mensajes como leídos en la carpeta seleccionada y sus "
 "subcarpetas."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:110
+#| msgid ""
+#| "This will mark all messages as read in the selected folder and its "
+#| "subfolders."
+msgid "This will mark all messages as read in the selected folder."
+msgstr ""
+"Esto marcará todos los mensajes como leídos en la carpeta seleccionada."
+
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "No es posible conectarse con el servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13956,19 +13898,19 @@ msgstr ""
 "No es posible abrir la carpeta de borradores para esta cuenta. ¿Quiere usar "
 "la carpeta de borradores del sistema?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "No es posible leer el archivo de licencia."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Usar _predeterminada"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "¿Desea usar la carpeta de borradores predeterminada?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13978,31 +13920,31 @@ msgstr ""
 "e actual de una de sus carpetas locales o remotas.\n"
 "¿Quiere borrar estos mensajes?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:118
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "No tiene suficientes permisos para eliminar este correo."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:119
 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:130
+#: ../mail/mail.error.xml.h:120
 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:131
+#: ../mail/mail.error.xml.h:121
 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:132
+#: ../mail/mail.error.xml.h:122
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nombre a esta carpeta de búsqueda."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:123
 msgid "You must specify a folder."
 msgstr "Debe especificar una carpeta."
 
-#: ../mail/mail.error.xml.h:134
+#: ../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 "
@@ -14012,115 +13954,111 @@ 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:136
+#: ../mail/mail.error.xml.h:126
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Su inicio de sesión en su servidor «{0}» como «{0}» falló."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:127
 msgid "_Append"
 msgstr "_Agregar"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:128
 msgid "_Discard changes"
 msgstr "_Descartar los cambios"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:129
 msgid "_Do not Synchronize"
 msgstr "_No sincronizar"
 
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:130
+#: ../modules/mail/e-mail-shell-view-actions.c:825
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:131
 msgid "_Expunge"
-msgstr "C_ompactar"
+msgstr "_Purgar"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:132
 msgid "_Open Messages"
 msgstr "_Abrir mensajes"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1112
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1113
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1114
 msgid "Answered"
 msgstr "Contestado"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1115
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1116
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1117
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1121
 msgid "Lowest"
 msgstr "La más baja"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1122
 msgid "Lower"
 msgstr "Más baja"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1126
 msgid "Higher"
 msgstr "Más alta"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1127
 msgid "Highest"
 msgstr "La más alta"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1737 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1744 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1753
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1765
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1773
 msgid "%b %d %l:%M %p"
 msgstr "%e de %b %l:%M %p"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1775
 msgid "%b %d %Y"
 msgstr "%e de %b de %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2527
 msgid "Select all visible messages"
 msgstr "Selecciona todos los mensajes visibles"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "«Backend» de la «shell»"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4212 ../mail/message-list.c:4606
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4445
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14128,15 +14066,7 @@ msgstr ""
 "Ningún mensaje satisface su criterio de búsqueda. Limpie el criterio de "
 "selección con el elemento del menú Buscar->Limpiar o cámbielo."
 
-#: ../mail/message-list.c:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"Sólo hay mensajes ocultos en esta carpeta. Use Ver->Mostrar mensajes ocultos "
-"para mostrarlos."
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4447
 msgid "There are no messages in this folder."
 msgstr "No hay mensajes en esta carpeta."
 
@@ -14165,7 +14095,7 @@ msgid "Sent Messages"
 msgstr "Mensajes enviados"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:560
 msgid "Size"
 msgstr "Tamaño"
 
@@ -14174,27 +14104,27 @@ msgid "Subject - Trimmed"
 msgstr "Asunto recortado"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1216
 msgid "Body contains"
 msgstr "El cuerpo contiene"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1223
 msgid "Message contains"
 msgstr "El mensaje contiene"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1230
 msgid "Recipients contain"
 msgstr "El destinatario contiene"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1237
 msgid "Sender contains"
 msgstr "El remitente contiene"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1244
 msgid "Subject contains"
 msgstr "El asunto contiene"
 
@@ -14228,15 +14158,15 @@ msgstr ""
 "Esto significa que su conexión será insegura, y que usted será vulnerable a "
 "fallos de seguridad."
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "Usar en el calendario Cu_mpleaños y aniversarios"
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "U_sar en el calendario Cumpleaños y aniversarios"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "Copiar la li_breta localmente para trabajar desconectado"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -14246,7 +14176,7 @@ msgstr ""
 "Se ha proporcionado una lista de puertos estándar. Pregunte a su "
 "administrador del sistema qué puerto debería especificar."
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14256,7 +14186,7 @@ msgstr ""
 "establecer esto a «Dirección de correo-e» requiere acceso anónimo a su "
 "servidor ldap."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -14268,29 +14198,29 @@ msgstr ""
 "«sub» incluirá todas las entradas por debajo de su base de búsqueda. Un "
 "ámbito de «uno» sólo incluirá las entradas un nivel bajo su base."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "Información del servidor"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detalles"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Búsqueda"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
@@ -14382,9 +14312,11 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "Indica si se muestra el panel de vista previa."
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Columna de tabla:"
+#: ../modules/mail/em-mailer-prefs.c:1159
+msgid "_Table column:"
+msgstr "Columna de _tabla:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -14395,396 +14327,292 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "_Siempre mostrar la dirección del contacto autocompletado"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:191
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:341
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:343
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "Crea un contacto nuevo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:350
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "Crea una lista de contactos nueva"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:358
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Libreta de _direcciones"
 
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:360
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "Crea una libreta de direcciones nueva"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
+#: ../modules/addressbook/e-book-shell-backend.c:377
+#: ../modules/addressbook/e-book-shell-view.c:398
 #: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Contactos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Lista de origen"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "El registro de las libretas de direcciones"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "Vista actual"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "La vista actual de la libreta de direcciones seleccionada"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Contacto previsualizado"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "El contacto mostrado en el panel de vista previa"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "La vista previa es visible"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "Indica si se muestra el panel de vista previa"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "Servidores LDAP"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "Configuración de autocompletado"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El lugar y jerarquía de las carpetas de contactos de Evolution ha cambiado "
-"desde Evolution 1.x.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetas…"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El formato de los contactos de listas de correo ha cambiado.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetas…"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"La forma en que Evolution almacena algunos números de teléfono ha cambiado.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetas…"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Los archivos del registro de cambios y los mapas Palm Sync de Evolution han "
-"cambiado.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus datos Pilot Sync…"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "Selector de fuentes"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "Este widget muestra grupos de libretas de direcciones"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "Guardar como vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "Co_piar todos los contactos a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copiar el contenido de la libreta de direcciones seleccionada a otra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "_Eliminar la libreta de direcciones"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "Eliminar la libreta de direcciones seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ver todos los contactos a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "Mover los contactos de la libreta de direcciones seleccionada a otra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "Libreta de direcciones _nueva"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "Propiedades de la _libreta de direcciones"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "Mostrar las propiedades de la libreta de direcciones seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:909
 msgid "_Rename..."
 msgstr "_Renombrar…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "Renombrar la libreta de direcciones seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "G_uardar la libreta de direcciones como VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr ""
 "Guardar los contactos de la libreta de direcciones seleccionada como VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "Parar la carga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "_Copiar contacto a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "Copiar los contactos seleccionados a otra libreta de direcciones"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "_Eliminar contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "_Buscar en el contacto…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "Buscar el texto en el contacto mostrado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "_Reenviar contacto…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "Enviar los contactos seleccionados a otra persona"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "_Mover contacto a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "Mover los contactos seleccionados a otra libreta de direcciones"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "Contacto _nuevo…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "_Lista de contactos nueva…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "_Abrir contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "Ver el contacto actual"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "Enviar _mensaje al contacto…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "Enviar un mensaje a los contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1494
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "A_cciones"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1032
 msgid "_Preview"
 msgstr "Vista _previa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-memo-shell-view-actions.c:669
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "_Eliminar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "G_uardar como vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "Vista _previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "Mostrar una ventana de vista previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "_Classic View"
 msgstr "Vista _clásica"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "Mostrar la vista previa del contacto bajo la lista de mensajes"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "_Vertical View"
 msgstr "Vista _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "Mostrar la vista previa del contacto junto a la lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../modules/calendar/e-memo-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../shell/e-shell-content.c:441
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "Imprimir todos los contactos mostrados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "Previsualizar los contactos que imprimir"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "Imprimir los contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Guardar como vCard…"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "Guardar los contactos seleccionados como VCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:342
 msgid "_Forward Contacts"
 msgstr "_Reenviar contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:344
 msgid "_Forward Contact"
 msgstr "_Reenviar contacto"
 
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:375
 msgid "_Send Message to Contacts"
 msgstr "_Enviar un correo a los contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:377
 msgid "_Send Message to List"
 msgstr "_Enviar un correo a la lista"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:379
 msgid "_Send Message to Contact"
 msgstr "_Enviar un correo al contacto"
 
@@ -14808,57 +14636,47 @@ msgstr "Información de contacto"
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "Anónimamente"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "_Examinar esta libreta hasta llegar al final"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "_Inicio de sesión:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "Uno"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Filtro de búsqueda"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "_Base de búsqueda:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "_Filtro de búsqueda:"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14868,55 +14686,56 @@ msgstr ""
 "de tipo «person»."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "Sub"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "Bases de búsqueda soportadas"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "Usando Nombre distintivo (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "Usando dirección de correo-e"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "Límite de _descarga:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "_Buscar bases de búsqueda posibles"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "Método de _inicio de sesión:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "�_mbito de búsqueda:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_Tiempo de expiración:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "Usar _conexión segura:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "tarjetas"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mportar"
 
@@ -14938,11 +14757,11 @@ msgstr "I_mportar a las tareas"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-migrate.c:176
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "En la web"
 
@@ -14951,87 +14770,57 @@ msgstr "En la web"
 msgid "Weather"
 msgstr "Meteorología"
 
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:251
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Cumpleaños y aniversarios"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:457
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "Create a new appointment"
 msgstr "Crea una cita nueva"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:462
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Cita para todo el _día"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:464
 msgid "Create a new all-day appointment"
 msgstr "Crea una cita nueva para todo el día"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:469
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:471
 msgid "Create a new meeting request"
 msgstr "Crea una solicitud de reunión nueva"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:479
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-backend.c:481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Create a new calendar"
 msgstr "Crea un calendario nuevo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../modules/calendar/e-cal-shell-backend.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:2666
 msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "El registro de calendarios"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El lugar y jerarquía de las carpetas de calendario de Evolution ha cambiado "
-"desde Evolution 1.x.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetas…"
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"No es posible migrar la configuración antigua desde evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "No es posible migrar el calendario «%s»"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -15040,36 +14829,16 @@ msgstr ""
 "Error en %s:\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
 msgid "Loading calendars"
 msgstr "Cargando calendarios"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:633
 msgid "Calendar Selector"
 msgstr "Selector de calendarios"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "Widget de navegación de fecha"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "Este widget muestra un calendario en miniatura"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "Cliente de calendario predeterminado"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "Cliente predeterminado para las operaciones de calendario"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "Este widget muestra grupos de calendarios"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:974
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abriendo el calendario en «%s»"
@@ -15099,298 +14868,298 @@ msgstr "Purgar acontecimientos anteriores a"
 msgid "Copying Items"
 msgstr "Copiando elementos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 msgid "Moving Items"
 msgstr "Moviendo elementos"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
 msgstr "acontecimiento"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:503
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "Guardar como iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "_Copy..."
 msgstr "_Copiar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "D_elete Calendar"
 msgstr "_Eliminar calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "Delete the selected calendar"
 msgstr "Eliminar el calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 msgid "Go Back"
 msgstr "Retroceder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 msgid "Go Forward"
 msgstr "Avanzar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "Seleccionar _hoy"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Select today"
 msgstr "Selecciona hoy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Select _Date"
 msgstr "Seleccionar _fecha"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select a specific date"
 msgstr "Selecciona una fecha específica"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "_New Calendar"
 msgstr "Calendario _nuevo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "Purg_ar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
 msgid "Purge old appointments and meetings"
 msgstr "Purgar reuniones y acontecimientos antiguos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "Actuali_zar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Refresh the selected calendar"
 msgstr "Actualizar el calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
 msgid "Rename the selected calendar"
 msgstr "Renombrar el calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "Show _Only This Calendar"
 msgstr "Mostrar _sólo este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar al calendario…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reunión…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Delete Appointment"
 msgstr "_Eliminar cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Delete selected appointments"
 msgstr "Eliminar las citas seleccionadas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "Delete This _Occurrence"
 msgstr "Eliminar esta _repetición"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete this occurrence"
 msgstr "Eliminar esta repetición"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Delete All Occ_urrences"
 msgstr "Eliminar tod_as las repeticiones"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete all occurrences"
 msgstr "Eliminar todas las repeticiones"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "New All Day _Event..."
 msgstr "Acont_ecimiento nuevo para todo el día"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Create a new all day event"
 msgstr "Crear un acontecimiento nuevo para todo el día"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
 msgid "New _Meeting..."
 msgstr "_Reunión nueva…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "Create a new meeting"
 msgstr "Crear una reunión nueva"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver al calendario…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1429
 msgid "New _Appointment..."
 msgstr "_Cita nueva…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta repetición _movible"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "View the current appointment"
 msgstr "Ver la cita actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1450
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1464
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Guardar como iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
 msgid "_Schedule Meeting..."
 msgstr "_Concertar una reunión…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "Converts an appointment to a meeting"
 msgstr "Convierte una cita en una reunión"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1478
 msgid "Conv_ert to Appointment..."
 msgstr "Con_vertir en una cita…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Converts a meeting to an appointment"
 msgstr "Convierte una reunión en una cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+msgid "Quit"
+msgstr "Salir"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Day"
 msgstr "Día"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one day"
 msgstr "Mostrar un día"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1616
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Show as list"
 msgstr "Mostrar como una lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1623
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one week"
 msgstr "Mostrar una semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show one work week"
 msgstr "Mostrar una semana de trabajo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1661
 msgid "Next 7 Days' Appointments"
 msgstr "Citas de los próximos 7 días"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1711
 msgid "Print this calendar"
 msgstr "Imprime este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Preview the calendar to be printed"
 msgstr "Previsualizar el calendario que imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1791
 msgid "Go To"
 msgstr "Ir a"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-memo-shell-view-actions.c:501
 msgid "memo"
 msgstr "nota"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "New _Memo"
 msgstr "_Nota nueva"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
 #: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 msgid "Create a new memo"
 msgstr "Crea una nota nueva"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
 msgid "_Open Memo"
 msgstr "_Abrir nota"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "View the selected memo"
 msgstr "Ver la nota seleccionada"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-memo-shell-view-actions.c:807
 msgid "Print the selected memo"
 msgstr "Imprimir la nota seleccionada"
 
@@ -15399,22 +15168,22 @@ msgstr "Imprimir la nota seleccionada"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
 msgstr "tarea"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "Marcar tareas seleccionadas como terminadas"
 
@@ -15423,39 +15192,39 @@ msgid "_Mark as Incomplete"
 msgstr "_Marcar como incompleta"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "Marcar las tareas seleccionadas como incompletas"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "_Tarea nueva"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "_Abrir tarea"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "Ver la tarea seleccionada"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "G_uardar como iCalendar…"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "Imprimir la tarea seleccionada"
 
@@ -15479,40 +15248,20 @@ msgid "Memo Li_st"
 msgstr "Li_sta de notas"
 
 #: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Create a new memo list"
 msgstr "Crea una lista de notas nueva"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "El registro de lista de notas"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "El modelo de la tabla de notas"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "Cargando notas"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:587
 msgid "Memo List Selector"
 msgstr "Selector de lista de notas"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "Cliente de notas predeterminado"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "Cliente predeterminado para las operaciones de notas"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "Este widget muestra grupos de listas de notas"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:892
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abriendo notas en %s"
@@ -15522,63 +15271,63 @@ msgstr "Abriendo notas en %s"
 msgid "Print Memos"
 msgstr "Imprimir notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:563
 msgid "_Delete Memo"
 msgstr "_Eliminar nota"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Find in Memo..."
 msgstr "_Buscar en la nota…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Search for text in the displayed memo"
 msgstr "Buscar el texto en la nota mostrada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "D_elete Memo List"
 msgstr "Eli_minar la lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "Delete the selected memo list"
 msgstr "Eliminar la lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
 msgid "_New Memo List"
 msgstr "Lista de notas _nueva"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Refresh the selected memo list"
 msgstr "Actualizar la lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Rename the selected memo list"
 msgstr "Renombrar la lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
 msgid "Show _Only This Memo List"
 msgstr "Mostrar _sólo esta lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:705
 msgid "Memo _Preview"
 msgstr "Vista pre_via de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:707
 msgid "Show memo preview pane"
 msgstr "Mostrar el panel de vista previa de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Show memo preview below the memo list"
 msgstr "Mostrar la vista previa de la nota bajo la lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:735
 msgid "Show memo preview alongside the memo list"
 msgstr "Mostrar la vista previa de la nota junto a la lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:793
 msgid "Print the list of memos"
 msgstr "Imprime la lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:800
 msgid "Preview the list of memos to be printed"
 msgstr "Vista previa de la lista de notas para imprimir"
 
@@ -15623,58 +15372,20 @@ msgid "Tas_k List"
 msgstr "Lista de _tareas"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "Crea una lista de tareas nueva"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "El registro de listas de tareas"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "El modelo de tablas de tareas"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El lugar y jerarquía de las carpetas de tareas de Evolution ha cambiado "
-"desde Evolution 1.x.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetas…"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "No es posible migrar las tareas en «%s»"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "Cargando tareas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:587
 msgid "Task List Selector"
 msgstr "Selector de listas de tareas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "Cliente de tareas predeterminado"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "Cliente predeterminado para las operaciones de tareas"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "Este widget muestra grupos de listas de tareas"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:892
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tareas en %s"
@@ -15684,7 +15395,7 @@ msgstr "Abriendo tareas en %s"
 msgid "Print Tasks"
 msgstr "Imprimir tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15696,95 +15407,95 @@ msgstr ""
 "\n"
 "¿Eliminar realmente esas tareas?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "_Eliminar tarea"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
 msgstr "_Buscar en la tarea…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
 msgstr "Buscar el texto en la tarea mostrada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "_Copiar…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
 msgstr "_Eliminar lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
 msgstr "Eliminar la lista de tareas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "Lista de tareas _nueva"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
 msgstr "Actualizar la lista de tareas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "Renombrar la lista de tareas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "Mostrar _sólo esta lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "_Marcar como incompleto"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "Eliminar tareas completadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "_Vista previa de tarea"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "Mostrar el panel de vista previa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr "Mostrar la vista previa de tareas bajo la lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr "Mostrar la vista previa de tareas junto a la lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "Tareas activas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "Tareas completadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "Tareas de los próximos 7 días"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "Tareas fuera de plazo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "Tareas con adjuntos"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "Imprime la lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "Vista previa de la lista de tareas para imprimir"
 
@@ -15808,407 +15519,373 @@ msgid "Delete Task"
 msgstr "Eliminar tarea"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, c-format
 msgid "%d attached messages"
 msgstr "%d mensajes adjuntos"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "Ninguno"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:169
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:179
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Carpeta de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:200
 msgid "Mail Accounts"
 msgstr "Cuentas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:208
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:216
 msgid "Composer Preferences"
 msgstr "Preferencias del editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:224
 msgid "Network Preferences"
 msgstr "Preferencias de red"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "Agrupar por conversaciones"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "Indica si se deben agrupar los mensajes por conversaciones"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:818
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "_Desactivar cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:820
 msgid "Disable this account"
 msgstr "Desactivar esta cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:827
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todos los correos borrados de todas las carpetas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:832
 msgid "C_reate Search Folder From Search..."
 msgstr "_Crear una carpeta de búsqueda desde la búsqueda…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:839
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar correos para trabajar sin conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:841
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Descargar correos para las cuentas y carpetas marcadas para usar sin conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:846
 msgid "Fl_ush Outbox"
 msgstr "Enviar correos pe_ndientes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:853
 msgid "_Copy Folder To..."
 msgstr "_Copiar carpeta a…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:855
 msgid "Copy the selected folder into another folder"
 msgstr "Copia la carpeta seleccionada en otra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:862
 msgid "Permanently remove this folder"
 msgstr "Elimina permanentemente esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:867
 msgid "E_xpunge"
-msgstr "C_ompactar"
+msgstr "_Purgar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Elimina permanentemente todos los mensajes borrados de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:874
 msgid "Mar_k All Messages as Read"
 msgstr "Marcar todos los mensajes como _leídos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "Mark all messages in the folder as read"
 msgstr "Marcar todos los mensajes en la carpeta como leídos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:881
 msgid "_Move Folder To..."
 msgstr "_Mover carpeta a…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "Move the selected folder into another folder"
 msgstr "Mueve la carpeta seleccionada a otra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:888
 msgid "_New..."
 msgstr "_Nueva…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "Create a new folder for storing mail"
 msgstr "Crea una carpeta nueva para almacenar correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:897
 msgid "Change the properties of this folder"
 msgstr "Cambia las propiedades de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:904
 msgid "Refresh the folder"
 msgstr "Actualizar la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:911
 msgid "Change the name of this folder"
 msgstr "Cambia el nombre de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:916
 msgid "Select Message _Thread"
 msgstr "Seleccionar con_versación del mensaje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Selecciona todos los correos en la misma conversación que el correo "
 "seleccionado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:923
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar s_ubconversación del mensaje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "Select all replies to the currently selected message"
 msgstr "Seleccionar todas las respuestas al mensaje actualmente seleccionado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:930
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:932
 msgid "Unsubscribe from the selected folder"
 msgstr "Desuscribirse de la carpeta seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:937
 msgid "Empty _Trash"
 msgstr "_Vaciar papelera"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:939
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "Eliminar permanentemente todos los correos borrados de todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:944
 msgid "_New Label"
 msgstr "Etiqueta n_ueva"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:953
 msgid "N_one"
 msgstr "Ning_uno"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "Ocultar mensajes _leídos"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Oculta temporalmente todos los mensajes que han sido leídos"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "Ocultar mensajes s_eleccionados"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "Oculta temporalmente los mensajes seleccionados"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "_Mostrar mensajes ocultos"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "Mostrar los mensajes que han estado ocultos temporalmente"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:976
 msgid "Cancel the current mail operation"
 msgstr "Cancela la operación de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:981
 msgid "Collapse All _Threads"
 msgstr "_Contraer todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "Collapse all message threads"
 msgstr "Contrae todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:988
 msgid "E_xpand All Threads"
 msgstr "E_xpandir todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "Expand all message threads"
 msgstr "Expandir todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:995
 msgid "_Message Filters"
 msgstr "_Filtros de correos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear o editar reglas para el filtrado de correos nuevos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1002
 msgid "Search F_olders"
 msgstr "Carpetas de búsque_da"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Create or edit search folder definitions"
 msgstr "Crear o edita definiciones para carpetas de búsqueda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1009
 msgid "_Subscriptions..."
 msgstr "_Suscripciones…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Suscribirse o desuscribirse de carpetas alojadas en servidores remotos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1018
 msgid "F_older"
 msgstr "_Carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1025
 msgid "_Label"
 msgstr "Etiq_ueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1065
 msgid "_New Folder..."
 msgstr "Carpeta _nueva…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "Ocultar correos _borrados"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Ocultar los correos borrados en lugar de mostrarlos tachados por una línea"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1089
 msgid "Show Message _Preview"
 msgstr "Mostrar vista _previa del correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Show message preview pane"
 msgstr "Mostrar el correo en el panel de vista previa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1097
+msgid "Show _Deleted Messages"
+msgstr "Mostrar los mensajes _eliminados"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+msgid "Show deleted messages with a line through them"
+msgstr "Mostrar los mensajes eliminados tachándolos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
 msgid "_Group By Threads"
 msgstr "A_grupar por conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "Threaded message list"
 msgstr "Lista de correos por conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
 msgid "Show message preview below the message list"
 msgstr "Mostrar la vista previa del correo bajo la lista de mensajes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "Show message preview alongside the message list"
 msgstr "Mostrar la vista previa del correo junto a la lista de mensajes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "All Messages"
 msgstr "Todos los correos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1150
 msgid "Important Messages"
 msgstr "Mensajes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "Last 5 Days' Messages"
 msgstr "Mensajes de los últimos 5 días"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son SPAM"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "Messages with Attachments"
 msgstr "Mensajes con adjuntos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "No Label"
 msgstr "Sin etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "Read Messages"
 msgstr "Mensajes leídos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
 msgid "Recent Messages"
 msgstr "Mensajes recientes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "Unread Messages"
 msgstr "Mensajes no leídos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
 msgid "Subject or Addresses contain"
 msgstr "El asunto o las direcciones contienen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "All Accounts"
 msgstr "Todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "Current Account"
 msgstr "Cuenta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:881
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionados, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:892
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d borrado"
 msgstr[1] "%d borrados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:898
+#: ../modules/mail/e-mail-shell-view-private.c:905
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d SPAM"
 msgstr[1] "%d SPAM"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:911
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:917
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sin enviar"
 msgstr[1] "%d sin enviar"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:923
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:935
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d no leído, "
 msgstr[1] "%d no leídos, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:938
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16227,7 +15904,14 @@ msgstr "Búsqueda en la cuenta"
 msgid "Proxy _Logout"
 msgstr "_Cerrar sesión proxy"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "Activado"
+
+#: ../modules/mail/em-composer-prefs.c:476
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
@@ -16247,60 +15931,69 @@ msgstr "Una vez por semana"
 msgid "Once per month"
 msgstr "Una vez por mes"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:224
 msgid "Add Custom Junk Header"
 msgstr "Añadir cabecera de SPAM personalizada"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:232
 msgid "Header Name:"
 msgstr "Nombre de la cabecera:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Value Contains:"
 msgstr "El valor de cabecera contiene:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:333
 msgid "Header"
 msgstr "Cabecera"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:337
 msgid "Contains Value"
 msgstr "Contiene el valor"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:801
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "El complemento %s está disponible y el binario está instalado."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:738 ../modules/mail/em-mailer-prefs.c:810
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "El complemento %s no está disponible. Compruebe si el paquete está instalado."
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:774
 msgid "No junk plugin available"
 msgstr "No existe un complemento de SPAM disponible"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "Columna de _tabla:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1161
 msgid "_Date header:"
 msgstr "Cabecera de _fecha:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1162
 msgid "Show _original header value"
 msgstr "Mostrar el valor _original de la cabecera"
 
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Comprobar si Evolution es la aplicación de correo predeterminada"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Cada vez que Evolution se inicie, comprobar si es o no el cliente de correo "
+"predeterminado."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+#| msgid "Do you want to make Evolution your default e-mail client?"
+msgid "Do you want to make Evolution your default email client?"
+msgstr "¿Quiere que Evolution sea su cliente de correo predeterminado?"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -16333,16 +16026,8 @@ msgstr ""
 "Lista de indicios para que el complemento de recuerdo de adjuntos busque en "
 "el cuerpo de un mensaje"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Lista de indicios para que el complemento de recuerdo de adjuntos busque en "
-"el cuerpo de un mensaje."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "Palabras clave"
 
@@ -16384,24 +16069,24 @@ msgid "Play audio attachments directly in mail messages."
 msgstr ""
 "Reproducir los adjuntos de sonido directamente en los mensajes de correo."
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccione el nombre de archivo de respaldo Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar Evolution después del respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccione el nombre del archivo de respaldo de Evolution para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar Evolution después de la restauración"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16411,35 +16096,35 @@ msgstr ""
 "todos los correos, calendarios, tareas, notas, libreta de direcciones. "
 "También restaura su configuración personal, filtros de correo, etc."
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar Evolution desde el archivo de respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccione un archivador de Evolution para restaurar:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "Elija un archivador para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "Restaurar desde un respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "_Respaldar ajustes…"
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "_Backup Evolution Settings..."
+msgstr "_Respaldar ajustes de Evolution…"
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "Respaldar y restaurar los datos y la configuración a un archivador"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "R_estaurar ajustes…"
+#: ../plugins/backup-restore/backup-restore.c:368
+msgid "R_estore Evolution Settings..."
+msgstr "R_estaurar ajustes de Evolution…"
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Respaldar y restaurar los datos y la configuración desde un archivador"
 
@@ -16489,7 +16174,7 @@ msgid "Restarting Evolution"
 msgstr "Reiniciando Evolution"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
 msgstr "Respaldar los datos actuales de Evolution"
 
 #: ../plugins/backup-restore/backup.c:260
@@ -16519,31 +16204,31 @@ msgid "Restoring from the folder %s"
 msgstr "Restaurando desde la carpeta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Respaldo de Evolution"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Restaurador de Evolution"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "Respaldando los datos de Evolution"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Espere mientras Evolution respalda sus datos."
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "Restaurando los datos de Evolution"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Espere mientras Evolution restaura sus datos."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Esto puede llevar un tiempo dependiendo de la cantidad de datos en su cuenta."
@@ -16576,9 +16261,9 @@ msgid ""
 "toggle button."
 msgstr ""
 "El respaldo de Evolution sólo puede iniciarse cuando Evolution no se está "
-"ejecutando. Por favor, asegúrese de que guarda y cierra todas sus ventanas "
-"no guardadas antes de proceder. Si quiere que Evolution se reinicie "
-"automáticamente después del respaldo, active el botón conmutador."
+"ejecutando. Asegúrese de que guarda y cierra todas sus ventanas no guardadas "
+"antes de proceder. Si quiere que Evolution se reinicie automáticamente "
+"después del respaldo, active el botón conmutador."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
@@ -16606,44 +16291,44 @@ msgid ""
 msgstr ""
 "Esto eliminará todos sus datos actuales de Evolution y los restaurará desde "
 "su respaldo. El restaurador de Evolution sólo puede iniciarse cuando "
-"Evolution no se está ejecutando. Por favor, asegúrese de cerrar todas sus "
-"ventanas no guardadas antes de proceder. Si quiere que Evolution se reinicie "
+"Evolution no se está ejecutando. Asegúrese de cerrar todas sus ventanas no "
+"guardadas antes de proceder. Si quiere que Evolution se reinicie "
 "automáticamente después del restaurado, active el botón conmutador."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "Crear entradas _automáticamente en la libreta de direcciones al enviar "
 "correos"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccione la libreta para contactos automáticos"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de mensajería instantánea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Sincronizar información e imágenes de contactos desde la lista de contactos "
+"_Sincronizar información e imágenes de contactos desde la lista de contactos "
 "de Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr ""
 "Seleccione la libreta de direcciones para la lista de contactos de Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar con la lista de _contactos de MI ahora"
 
@@ -16665,33 +16350,33 @@ msgstr ""
 "direcciones de correo-e cuando contesta a los correos. También rellena la "
 "información de contacto de MI de su lista de amigos."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter no está disponible. Instálelo primero."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Ocurrió un error al crear %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "El proceso hijo de Bogofilter no está respondiendo, matándolo…"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Espere a que el proceso hijo de Bogofilter se interrumpa, terminando…"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Falló la tubería hacia Bogofilter, código de error: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
 msgid "Convert message text to _Unicode"
 msgstr "Convertir el texto del correo a _Unicode"
 
@@ -16719,16 +16404,16 @@ msgstr "Opciones de Bogofilter"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filtra mensajes SPAM usando Bogofilter."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
 "Falló la autenticación. El servidor requiere un inicio de sesión correcto."
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "No se puede encontrar el URL proporcionado."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16737,36 +16422,36 @@ msgstr ""
 "El servidor devolvió datos inesperados.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "Falló al analizar la respuesta del servidor."
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "Acontecimientos"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "Calendarios del usuario"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "Falló al obtener el URL del servidor."
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "Buscando los calendarios del usuario…"
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "No se pudo encontrar ningún calendario del usuario."
 
@@ -16780,41 +16465,40 @@ msgstr "Falló el intento anterior: %s"
 msgid "Previous attempt failed with code %d"
 msgstr "El intento anterior falló con el código %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr ""
-"Introduzca la contraseña para el usuario <b>%s</b> en el servidor <b>%s</b>"
+msgid "Enter password for user %s on server %s"
+msgstr "Introduzca la contraseña para el usuario %s en el servidor %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "No se puede crear el mensaje «soup» para el URL «%s»"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "Buscando el contenido de la carpeta…"
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "Lista de calendarios disponibles:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "Soporta"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Falló al crear la conversación: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "El URL del servidor «%s» no es un URL válido"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "Examinar para calendarios CalDAV"
 
@@ -16822,26 +16506,26 @@ msgstr "Examinar para calendarios CalDAV"
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "_Examinar el servidor para un calendario"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "A_ctualizar:"
 
@@ -16853,31 +16537,31 @@ msgstr "Añadir soporte CalDAV a Evolution."
 msgid "CalDAV Support"
 msgstr "Soporte CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "Opciones de personali_zación"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "_Nombre del archivo:"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "Elegir un archivo de calendario"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "Al abrir"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "Al cambiar un archivo"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "Periodicamente"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "Forzar _sólo lectura"
 
@@ -16889,11 +16573,11 @@ msgstr "Añadir calendarios locales a Evolution."
 msgid "Local Calendars"
 msgstr "Calendarios locales"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "_Securizar conexión"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "Nombre de _usuario:"
 
@@ -16941,26 +16625,26 @@ msgstr "Meteorología: Noche despejada"
 msgid "Weather: Thunderstorms"
 msgstr "Meteorología: Tormenta"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "Seleccione un lugar"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_Unidades:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Métrica (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, pulgadas, etc)"
 
@@ -16990,47 +16674,23 @@ msgstr ""
 msgid "Map for contacts"
 msgstr "Mapa para los contactos"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Comprobar si Evolution es la aplicación de correo predeterminada"
-
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"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 "Check whether Evolution is the default mail client on startup."
-msgstr ""
-"Comprueba al iniciar si Evolution es el cliente de correo predeterminado."
-
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "Cliente de correo predeterminado"
-
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "¿Quiere que Evolution sea su cliente de correo predeterminado?"
-
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "Marcar como libreta de direcciones pre_determinada"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
 msgstr "A_utocompletar con esta libreta de direcciones"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "Marcar como calendario pre_determinado"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "Marcar como lista de tareas pre_determinada"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "Marcar como lista de notas pre_determinada"
 
@@ -17087,12 +16747,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "_Cabeceras personalizadas"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17101,12 +16761,12 @@ msgstr ""
 "es:\n"
 "Valores clave del nombre de la cabecera personalizada separados por «;»."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:950
 msgid "Key"
 msgstr "Clave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "Valores"
 
@@ -17129,7 +16789,7 @@ msgstr ""
 "Lanzar el editor automáticamente al pulsar una tecla en el editor de correos"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "Lanzar automáticamente al editar un correo nuevo"
 
@@ -17141,11 +16801,11 @@ msgstr "Editor externo predeterminado"
 msgid "The default command that must be used as the editor."
 msgstr "El comando predeterminado que usar como editor."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "Comando que ejecutar para lanzar el editor: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17153,8 +16813,8 @@ msgstr ""
 "Para Emacs use «xemacs»\n"
 "Para VI use «gvim -f»"
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "Redactar en un editor externo"
 
@@ -17231,7 +16891,7 @@ msgstr "_Insertar imagen de rostro de forma predeterminada"
 msgid "Load new _Face picture"
 msgstr "Cargar una nueva imagen de _rostro"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "Incluir _rostro"
 
@@ -17265,23 +16925,23 @@ msgstr ""
 "El archivo que ha seleccionado no parece una imagen .png válida. Error: {0}"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
+#: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>Servidor</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+msgid "Server"
+msgstr "Servidor"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Introduzca la contraseña para que el usuario %s acceda a la lista de "
 "calendarios suscritos."
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17290,18 +16950,18 @@ msgstr ""
 "No se pueden leer los datos del servidor de Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "Cal_endario:"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
 msgstr "Obtener _lista"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
@@ -17312,7 +16972,7 @@ msgstr "Añadir un calendario de Google a Evolution."
 msgid "Google Calendars"
 msgstr "Calendarios de Google"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Lista de comprobación"
 
@@ -17344,12 +17004,12 @@ msgstr "Aceptar provisionalmente"
 msgid "Rese_nd Meeting..."
 msgstr "Reen_viar reunión…"
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
 msgid "Create folder"
 msgstr "Crear carpeta"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17374,19 +17034,19 @@ msgstr ""
 "Pulse «Aplicar» para instalar la carpeta compartida\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "Instalar la carpeta compartida"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "Instalación de carpeta compartida"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "Opciones de SPAM"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Configuración de SPAM"
@@ -17422,7 +17082,7 @@ msgstr "_Quitar"
 msgid "Message Retract"
 msgstr "Retirada de correo"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -17430,7 +17090,7 @@ msgstr ""
 "Retirar un correo puede eliminarlo del buzón de correo del destinatario. "
 "¿Está seguro de que quiere hacer esto?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "Correo retirado con éxito"
 
@@ -17555,25 +17215,25 @@ msgid "Would you like to decline it?"
 msgstr "¿Quiere rechazarlo?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>Usuarios:</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "_Personalizar el mensaje de notificación"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "Con_tactos…"
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "Notificación de carpeta compartida"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "Los participantes recibirán la notificación siguiente.\n"
 
+#: ../plugins/groupwise-features/properties.ui.h:9
+msgid "Users:"
+msgstr "Usuarios:"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Sin compartir"
@@ -17631,52 +17291,59 @@ msgid "Proxy"
 msgstr "Proxy"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Nombre de la cuenta</b>"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "Nombre de la cuenta"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "Sesión proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s Introduzca la contraseña para %s (usuario %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:690
 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."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "La solapa del Proxy estará disponible sólo cuando la cuenta esté activada."
 
-#: ../plugins/groupwise-features/proxy.c:931
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../plugins/groupwise-features/proxy.c:929
 #: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "Añadir usuario"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "Opciones de envío avanzadas"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:315
 #: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:316
 msgid "Enter the users and set permissions"
 msgstr "Introduzca los usuarios y establezca permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:416
 msgid "Sharing"
 msgstr "Compartir"
 
@@ -17688,63 +17355,55 @@ msgstr "Notificación personalizada"
 msgid "Add   "
 msgstr "Añadir   "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Estado del mensaje"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Fecha de creación:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "Entregado: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "Abierto: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "Aceptado: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "Borrado: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "Rechazado: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "Completado: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "Sin entregar: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Añadir soporte Hula para Evolution."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Soporte Hula"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Imagen en línea"
@@ -17753,12 +17412,12 @@ msgstr "Imagen en línea"
 msgid "View image attachments directly in mail messages."
 msgstr "Ver los adjuntos directamente en los mensajes de correo."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:332
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Cabeceras personalizadas"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:345
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "Cabeceras IMAP"
@@ -17805,142 +17464,142 @@ msgstr "Configurar sus cuentas IMAP."
 msgid "IMAP Features"
 msgstr "Características IMAP"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/itip-formatter/itip-formatter.c:482
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "No es posible cargar el calendario «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:648
 #, 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:688
+#: ../plugins/itip-formatter/itip-formatter.c:684
 #, 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:787
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find any calendars"
 msgstr "No se puede encontrar ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:790
 msgid "Unable to find this meeting in any calendar"
 msgstr "No se puede encontrar esta reunión en ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this task in any task list"
 msgstr "No se puede encontrar esta tarea en ninguna lista de tareas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this memo in any memo list"
 msgstr "No se puede encontrar esta nota en ninguna lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:872
 msgid "Opening the calendar. Please wait.."
 msgstr "Abriendo el calendario. Espere..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:875
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando una versión existente de esta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1056
 msgid "Unable to parse item"
 msgstr "No es posible interpretar el elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1143
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "No es posible enviar el elemento al calendario «%s»: %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1155
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado al calendario «%s» como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado al calendario «%s» como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1164
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado al calendario «%s» como rehusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1169
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado al calendario «%s» como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1263
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "El organizador ha quitado al delegado %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1270
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1272
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "No es posible enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1383
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "El estado de asistencia no pudo actualizarse debido a que el estado es "
 "inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No es posible actualizar la asistencia. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Attendee status updated"
 msgstr "Estado de asistencia actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1442
 msgid "Meeting information sent"
 msgstr "Información de reunión enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Task information sent"
 msgstr "Información de la tarea enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Memo information sent"
 msgstr "Información de la nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1457
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "No se puede enviar la información de la reunión, la reunión no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1460
 msgid "Unable to send task information, the task does not exist"
 msgstr "No se puede enviar la información de la tarea, la tarea no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "No se puede enviar la información de la nota, la nota no existe"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "calendar.ics"
 msgstr "calendario.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1533
 msgid "Save Calendar"
 msgstr "Guardar calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1597
 msgid "The calendar attached is not valid"
 msgstr "El calendario adjunto no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17948,15 +17607,15 @@ msgstr ""
 "El mensaje dice contener un calendario, pero el calendario no es un "
 "iCalendar válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1638
+#: ../plugins/itip-formatter/itip-formatter.c:1666
+#: ../plugins/itip-formatter/itip-formatter.c:1772
 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:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17964,11 +17623,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:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1680
 msgid "The calendar attached contains multiple items"
 msgstr "El calendario adjunto contiene elementos múltiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17976,519 +17635,507 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo debería guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2451
 msgid "This meeting recurs"
 msgstr "Esta reunión se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2691
 msgid "_Delete message after acting"
 msgstr "_Eliminar el mensaje después de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2701
+#: ../plugins/itip-formatter/itip-formatter.c:2734
 msgid "Conflict Search"
 msgstr "Búsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2716
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Hoy a las %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Hoy a las %H:%M %S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Hoy a las %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Mañana a las %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Mañana a las %H:%M %S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Mañana a las %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Mañana a las %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A, %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e de %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e de %B a las %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e de %B a las %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e de %B a las %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e de %B a las %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e de %B de %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B de %Y a las %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e de %B de %Y, a las %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e de %B de %Y, a las %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y a las %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "Responda en nombre de <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
-#, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "Recibido en nombre de <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:362
-#, 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:364
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
 #, 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:"
+msgid "Please respond on behalf of %s"
+msgstr "Responda en nombre de %s"
 
 #: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, 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:372
-#, 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:"
+msgid "Received on behalf of %s"
+msgstr "Recibido en nombre de %s"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, 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:"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s ha publicado información de reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, 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:"
+msgid "%s has published the following meeting information:"
+msgstr "%s ha publicado la siguiente información de reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> desea apuntarse a una reunión existente:"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s ha delegado la reunión siguiente en usted:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> desea recibir la última información de la siguiente reunión a "
-"través de %s:"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s solicita su presencia en la siguiente reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-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:"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s solicita su presencia en la siguiente reunión:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr ""
-"<b>%s</b> ha devuelto la siguiente respuesta a la reunión a través de %s:"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s desea apuntarse a una reunión existente a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, 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:"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s desea apuntarse a una reunión existente:"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> ha cancelado la siguiente reunión a través de %s:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr ""
+"%s desea recibir la última información de la siguiente reunión a través de %"
+"s:"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> ha cancelado la reunión siguiente."
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s desea recibir la última información para la siguiente reunión:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr ""
-"<b>%s</b> ha propuesto los cambios siguientes para la reunión a través de %s."
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s ha devuelto la siguiente respuesta a la reunión a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, 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."
+msgid "%s has sent back the following meeting response:"
+msgstr "%s ha devuelto la siguiente respuesta a la reunión:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr ""
-"<b>%s</b> ha rehusado los siguientes cambios para la reunión a través de %s:"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s ha cancelado la siguiente reunión a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> ha rehusado los cambios siguientes para la reunión."
+msgid "%s has canceled the following meeting."
+msgstr "%s ha cancelado la siguiente reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:416
 #, 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:"
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s ha propuesto los siguientes cambios para la reunión a través de %s."
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> ha publicado la tarea siguiente:"
+msgid "%s has proposed the following meeting changes."
+msgstr "%s ha propuesto los siguientes cambios para la reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:422
 #, 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:"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s ha rehusado los siguientes cambios para la reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> le ha asignado una tarea a través de %s:"
+msgid "%s has declined the following meeting changes."
+msgstr "%s ha rehusado los siguientes cambios para la reunión."
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> le ha asignado a usted una tarea:"
+msgid "%s through %s has published the following task:"
+msgstr "%s ha publicado la siguiente tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> desea añadirse a una tarea existente a través de %s:"
+msgid "%s has published the following task:"
+msgstr "%s ha publicado la siguiente tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> desea añadirse a una tarea existente:"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s solicita la asignación de %s para la siguiente tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> desea recibir la última información para la siguiente tarea "
-"asignada a través de %s:"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s le ha asignado una tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> quiere recibir la última información para la siguiente tarea "
-"asignada:"
+msgid "%s has assigned you a task:"
+msgstr "%s le ha asignado a usted una tarea:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr ""
-"<b>%s</b> ha devuelto la siguiente respuesta a la tarea asignada a través de "
-"%s:"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s desea añadirse a una tarea existente a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, 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:"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s desea añadirse a una tarea existente:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
 msgstr ""
-"<b>%s</b> ha cancelado la siguiente asignación de tarea a través de %s:"
+"%s desea recibir la última información para la siguiente tarea asignada a "
+"través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> ha cancelado la siguiente tarea asignada:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr ""
+"%s quiere recibir la última información para la siguiente tarea asignada:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "%s through %s has sent back the following assigned task response:"
 msgstr ""
-"<b>%s</b> ha propuesto los siguientes cambios en la asignación de tareas a "
-"través de %s:"
+"%s ha devuelto la siguiente respuesta a la tarea asignada a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, 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:"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s ha devuelto la siguiente respuesta a la tarea:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> ha rehusado la siguiente tarea asignada a través de %s:"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s ha cancelado la siguiente asignación de tarea a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> ha rehusado la siguiente tarea asignada:"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s ha cancelado la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:504
 #, 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:"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr ""
+"%s ha propuesto los siguientes cambios en la asignación de tareas a través "
+"de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> ha publicado la nota siguiente:"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s ha propuesto los siguientes cambios en la asignación de tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:510
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s ha rehusado la siguiente tarea asignada a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s ha rehusado la siguiente tarea asignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:549
 #, 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:"
+msgid "%s through %s has published the following memo:"
+msgstr "%s ha publicado la siguiente nota a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:551
 #, 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:"
+msgid "%s has published the following memo:"
+msgstr "%s ha publicado la siguiente nota:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> ha cancelado la siguiente nota compartida a través de %s:"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s desea añadir algo a una nota existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> ha cancelado la siguiente nota compartida:"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s desea añadir algo a una nota existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:562
+#, c-format
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s ha cancelado la siguiente nota compartida a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:564
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "%s ha cancelado la siguiente nota compartida:"
+
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "Todo el día:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "Día de inicio:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "Hora de inicio:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "Día de fin:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "Hora de fin:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "_Rehusar"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "_Aceptar"
-
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+msgid "A_ccept"
+msgstr "A_ceptar"
+
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "_Rehusar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
-msgstr "_Aceptar todo"
+#: ../plugins/itip-formatter/itip-view.c:855
+msgid "A_ccept all"
+msgstr "A_ceptar todo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "_Enviar información"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "_Actualizar el estado del participante"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "_Actualizar"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "_Responder al remitente"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "Mandar _actualizaciones a los participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas las instancias"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "Mostrar hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "Conser_var mi recordatorio"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "_Heredar recordatorio"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "_Tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "_Notas:"
 
@@ -18602,16 +18249,16 @@ msgstr ""
 "Indica si se deben notificar sólo los mensajes en la carpeta bandeja de "
 "entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:346
 msgid "Evolution's Mail Notification"
 msgstr "Notificación de correo de Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Mail Notification Properties"
 msgstr "Propiedades de la notificación de correo"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:499
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18627,66 +18274,66 @@ msgstr[1] ""
 "en %s."
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:510
 #, c-format
 msgid "From: %s"
 msgstr "De: %s"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#: ../plugins/mail-notification/mail-notification.c:522
 #, c-format
 msgid "Subject: %s"
 msgstr "Asunto: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:531
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Ha recibido %d mensaje nuevo."
 msgstr[1] "Ha recibido %d mensajes nuevos."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:554
 msgid "New email"
 msgstr "Nuevo correo-e"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:608
 msgid "Show icon in _notification area"
 msgstr "Mostrar icono en el área de _notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:636
 msgid "B_link icon in notification area"
 msgstr "Icono pa_rpadeante en el área de notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:646
 msgid "Popup _message together with the icon"
 msgstr "_Mensaje emergente junto con el icono"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:831
 msgid "_Play sound when new messages arrive"
 msgstr "Re_producir un sonido cuando llegue correo nuevo"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:860
 msgid "_Beep"
 msgstr "_Pitar"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:873
 msgid "Use sound _theme"
 msgstr "Usar un _tema de sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:892
 msgid "Play _file:"
 msgstr "_Reproducir un archivo:"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:903
 msgid "Select sound file"
 msgstr "Seleccione un arhivo de sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:961
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar nuevos mensajes sólo para la _bandeja de entrada"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:970
 msgid "Generate a _D-Bus message"
 msgstr "Generar un mensaje _D-Bus"
 
@@ -18699,12 +18346,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Le notifica cuando llega un mensaje de correo nuevo."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Creado desde un correo de %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18713,7 +18360,7 @@ msgstr ""
 "El calendario seleccionado ya contiene el acontecimiento «%s». ¿Quiere editar "
 "el acontecimiento antiguo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18722,7 +18369,7 @@ msgstr ""
 "La lista de tareas seleccionada ya contiene la tarea «%s». ¿Quiere editar la "
 "tarea antigua?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18731,7 +18378,7 @@ msgstr ""
 "La lista de notas seleccionada ya contiene la nota «%s». ¿Quiere editar la "
 "nota antigua?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#: ../plugins/mail-to-task/mail-to-task.c:512
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18739,7 +18386,7 @@ msgstr ""
 "El calendario seleccionado ya contiene algunos acontecimientos para los "
 "correos proporcionados. ¿Quiere crear acontecimientos nuevos de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18747,7 +18394,7 @@ msgstr ""
 "La lista de tareas seleccionada ya contiene algunas tareas para los correos "
 "proporcionados. ¿Quiere crear tareas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#: ../plugins/mail-to-task/mail-to-task.c:518
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18755,7 +18402,7 @@ msgstr ""
 "La lista de notas seleccionada contiene algunas notas para los correos "
 "proporcionados. ¿Quiere crear notas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#: ../plugins/mail-to-task/mail-to-task.c:536
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18769,7 +18416,7 @@ msgstr[1] ""
 "El calendario seleccionada ya contiene acontecimientos para los correos "
 "proporcionados. ¿Quiere crear los acontecimientos nuevos de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:542
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18783,7 +18430,7 @@ msgstr[1] ""
 "La lista de tareas seleccionada ya contiene notas para los correos "
 "proporcionados. ¿Quiere crear las tareas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18797,25 +18444,25 @@ msgstr[1] ""
 "La lista de notas seleccionada ya contiene notas para los correos "
 "proporcionados. ¿Quiere crear las notas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:607
 msgid "[No Summary]"
 msgstr "[Sin resumen]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:618
 msgid "Invalid object returned from a server"
 msgstr "Un servidor devolvió un objeto no válido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:689
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Ocurrió un error al procesar: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:718
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "No se puede abrir el calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:725
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18823,7 +18470,7 @@ msgstr ""
 "El origen seleccionado es de sólo lectura, por ello no se puede crear un "
 "acontecimiento en él. Seleccione otro origen."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18831,7 +18478,7 @@ msgstr ""
 "El origen seleccionado es de sólo lectura, por ello no se puede crear una "
 "tarea en él. Seleccione otro origen."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:731
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18839,40 +18486,40 @@ msgstr ""
 "El origen seleccionado es de sólo lectura, por ello no se puede crear una "
 "nota en él. Seleccione otro origen."
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:934
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "No se pudo obtener la lista de origen. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1053
 msgid "Create an _Event"
 msgstr "Crear un _acontecimiento"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1055
 msgid "Create a new event from the selected message"
 msgstr "Crear un acontecimiento nuevo del mensaje seleccionado"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create a Mem_o"
 msgstr "Crear una _nota"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new memo from the selected message"
 msgstr "Crear una nota nueva del mensaje seleccionado"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a _Task"
 msgstr "Crear una _tarea"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new task from the selected message"
 msgstr "Crear una tarea nueva del mensaje seleccionado"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a _Meeting"
 msgstr "Crear una _reunión"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a new meeting from the selected message"
 msgstr "Crear una reunión nueva del mensaje seleccionado"
 
@@ -18880,59 +18527,59 @@ msgstr "Crear una reunión nueva del mensaje seleccionado"
 msgid "Convert a mail message to a task."
 msgstr "Convertir el mensaje de correo en una tarea."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Archive"
 msgstr "Obtener _archivador de la lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get an archive of the list this message belongs to"
 msgstr "Obtener un archivador de la lista a la que pertenece este mensaje"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get List _Usage Information"
 msgstr "Obtener información de _uso de la lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 "Obtiene información sobre el uso de la lista a la que pertenece este mensaje"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Contact List _Owner"
 msgstr "_Responsable de la lista de contactos"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 "Contactar con el responsable de la lista de correo a la que pertenece este "
 "mensaje"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Post Message to List"
 msgstr "_Publicar un mensaje a la lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Post a message to the mailing list this message belongs to"
 msgstr ""
 "Publicar un mensaje en la lista de correo a la que pertenece este mensaje"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Subscribe to List"
 msgstr "_Suscribirse a la lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Suscribirse a la lista de correo a la que pertenece este mensaje"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "_Unsubscribe from List"
 msgstr "_Desuscribirse de la lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Desuscribirse de la lista de correo a la que pertenece este correo"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
 msgid "Mailing _List"
 msgstr "_Lista de correo"
 
@@ -19038,15 +18685,15 @@ msgstr ""
 "¿Quiere marcar los mensajes como leídos sólo en la carpeta actual o en la "
 "capeta actual y todas sus subcarpetas?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:181
 msgid "In Current Folder and _Subfolders"
 msgstr "En la carpeta actual y _subcarpetas"
 
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:195
 msgid "In Current _Folder Only"
 msgstr "Sólo en la ca_rpeta actual"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:418
 msgid "Mark Me_ssages as Read"
 msgstr "Marcar los mensajes como _leídos"
 
@@ -19105,19 +18752,19 @@ msgstr "Preferir texto plano"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Ver los mensajes de correo en texto plano, incluso si contienen HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "Mostrar HTML si está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "Permitir que Evolution elija la mejor parte para mostrar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "Mostrar texto plano si está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19125,11 +18772,11 @@ msgstr ""
 "Mostrar la parte en texto plano si está presente, de otra forma dejar que "
 "Evolution elija la mejor parte para mostrar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "Sólo mostrar texto plano"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19137,11 +18784,11 @@ msgstr ""
 "Mostrar siempre parte en texto plano y, si se solicita, crear adjuntos de "
 "otras partes."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Mostrar las partes HTML s_uprimidas como adjuntos"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -19165,31 +18812,35 @@ msgstr "Importador PST de Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "Carpetas personales de Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:296
 msgid "_Mail"
 msgstr "Co_rreo"
 
+#: ../plugins/pst-import/pst-importer.c:308
+msgid "Destination folder:"
+msgstr "Carpeta de destino:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "_Address Book"
 msgstr "Libreta de _direcciones"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:321
 msgid "A_ppointments"
 msgstr "Ci_tas"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:327 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tareas"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:333
 msgid "_Journal entries"
 msgstr "Entradas del dia_rio"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "Importing Outlook data"
 msgstr "_Importando datos de Outlook"
 
@@ -19348,55 +18999,55 @@ msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
 "No se pudo publicar el calendario: El «backend» del calendario ya no existe."
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "Ubicación nueva"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "Editar ubicación"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "No se encontró SpamAssasin, código: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Falló al crear la tubería: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Error después de bifurcar: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "El proceso hijo de SpamAssasin no está respondiendo, matándolo…"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Espere a que el proceso hijo de SpamAssasin se interrumpa, terminando…"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Falló la tubería hacia SpamAssasin, código de error: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssasin no está disponible. Instálelo primero."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Esto hará que SpamAssasin sea más exacto, pero más lento"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
 msgid "I_nclude remote tests"
 msgstr "I_ncluir tests remotos"
 
@@ -19513,23 +19164,23 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "_Formato:"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Seleccione el archivo de destino"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "Guardar el calendario seleccionado al disco"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "Guardar la lista de notas seleccionada al disco"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "Guardar la lista de tareas seleccionada al disco"
 
@@ -19541,21 +19192,15 @@ msgstr "Le guía a través de su configuración inicial de cuenta."
 msgid "Setup Assistant"
 msgstr "Asistente de configuración"
 
-#: ../plugins/startup-wizard/startup-wizard.c:110
+#: ../plugins/startup-wizard/startup-wizard.c:117
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de configuración de Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:115
+#: ../plugins/startup-wizard/startup-wizard.c:122
 msgid "Welcome"
 msgstr "Bienvenido"
 
-#: ../plugins/startup-wizard/startup-wizard.c:118
-#| msgid ""
-#| "ZZZ ! 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. "
+#: ../plugins/startup-wizard/startup-wizard.c:125
 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"
@@ -19563,31 +19208,31 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 "Bienvenido a Evolution. Las siguientes pantallas permitirán a Evolution "
-"conectarse a sus cuentas de correo, e importar archivos desde otras "
-"aplicaciones. \n"
+"conectarse a sus cuentas de correo e importar archivos desde otras "
+"aplicaciones.\n"
 "\n"
-"Por favor pulse el botón «Adelante» para continuar. "
+"Pulse el botón «Adelante» para continuar."
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
+#: ../plugins/startup-wizard/startup-wizard.c:160
+#: ../widgets/misc/e-import-assistant.c:389
 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:168
-#: ../widgets/misc/e-import-assistant.c:542
+#: ../plugins/startup-wizard/startup-wizard.c:175
+#: ../widgets/misc/e-import-assistant.c:545
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:185
+#: ../plugins/startup-wizard/startup-wizard.c:192
 msgid "Importing files"
 msgstr "Importando archivos"
 
-#: ../plugins/startup-wizard/startup-wizard.c:248
+#: ../plugins/startup-wizard/startup-wizard.c:258
 msgid "Importing data."
 msgstr "Importando datos."
 
-#: ../plugins/startup-wizard/startup-wizard.c:250
+#: ../plugins/startup-wizard/startup-wizard.c:264
 msgid "Please wait"
 msgstr "Por favor espere"
 
@@ -19604,7 +19249,7 @@ msgid "Thread messages by subject"
 msgstr "Agrupar mensajes según el asunto"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "Agrupar los mensajes por _asunto"
 
@@ -19620,15 +19265,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Borradores basados en el complemento de plantillas"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:615
 msgid "No Title"
 msgstr "Sin título"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:686
 msgid "Save as _Template"
 msgstr "Guardar como plan_tilla"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:688
 msgid "Save as Template"
 msgstr "Guardar como plantilla"
 
@@ -19649,27 +19294,27 @@ msgstr "vCards en línea"
 msgid "Show vCards directly in mail messages."
 msgstr "Mostrar vCards directamente en los mensajes de correo."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
 msgid "Show Full vCard"
 msgstr "Mostrar vCard completa"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:167
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:228
 msgid "There is one other contact."
 msgstr "Hay otro contacto más."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:237
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Hay %d contacto más."
 msgstr[1] "Hay otros %d contactos."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:258
 msgid "Save in Address Book"
 msgstr "Guardar en la libreta de direcciones"
 
@@ -19685,11 +19330,11 @@ msgstr "Contactos WebDAV"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Evitar IfMatch (necesario en Apache < 2.2.8)"
 
@@ -19745,7 +19390,7 @@ msgstr "Opción que activa una interfaz mucho más simple."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
-msgstr "Nombre del equipo proxy HTtP"
+msgstr "Nombre del servidor proxy HTtP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
@@ -19809,7 +19454,7 @@ msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
-msgstr "Equipos que no sean proxy"
+msgstr "Servidores que no sean proxy"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Password to pass as authentication when doing HTTP proxying."
@@ -19821,7 +19466,7 @@ msgstr "Modo de configuración del proxy"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
-msgstr "Nombre del equipo proxy SOCKS"
+msgstr "Nombre del servidor proxy SOCKS"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
@@ -19829,7 +19474,7 @@ msgstr "Puerto del proxy SOCKS"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
-msgstr "Nombre del equipo proxy HTTP seguro"
+msgstr "Nombre del servidor proxy HTTP seguro"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
@@ -19855,7 +19500,7 @@ 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.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:321
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
@@ -19952,10 +19597,10 @@ msgid ""
 "(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
-"Esta clave contiene una lista de anfitriones con los que está conectado "
+"Esta clave contiene una lista de servidores con los que está conectado "
 "directamente, en vez de por medio del proxy (si está activo). Los valores "
 "pueden ser nombres de equipo, dominios (usando un comodín auxiliar como *."
-"foo.com), direcciones IP de anfitriones (tanto IPv4 como IPv6) y direcciones "
+"foo.com), direcciones IP de servidores (tanto IPv4 como IPv6) y direcciones "
 "de red con una máscara (algo como 192.168.0.0/24)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
@@ -20015,149 +19660,47 @@ msgstr "Estilo de los botones de ventana"
 msgid "Window buttons are visible"
 msgstr "Los botones de la ventana son visibles"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
 msgid "Searches"
 msgstr "Búsquedas"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:545
 msgid "Save Search"
 msgstr "Guardar búsqueda"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KiB"
-
 # #En conflicto con _Mensaje
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "M_ostrar:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "B_uscar:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr "e_n"
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "Estilo de la barra de herramientas"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "El estilo de la barra de herramientas del selector"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "Barra de herramientas visible"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "Indica si el selector es visible"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Todos los archivos (*)"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "Acción del selector"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "La acción del selector para esta vista de la «shell»"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "Número de página"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr "El número de página del libro de notas para esta vista de «shell»"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "Regla de búsqueda"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "Criterio para los resultados de búsqueda actuales"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "El «EShellBackend» para esta vista de «shell»"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "Widget de contenido «shell»"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr ""
-"El widget de contenido aparece en un panel derecho de la ventana de «shell»"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "Widget de barra lateral de «shell»"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
-"El widget de barra lateral aparee en un panel izquierdo de la ventana de "
-"«shell»"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "Widget de barra de tareas de «shell»"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
-"El widget de barra de tareas aparece en la parte inferior de una ventana de "
-"«shell»"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "Ventana «shell»"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "La ventana a la que pertenece la «shell»"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "El archivo clave que tiene los datos de estado del «widget»"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "El título de esta vista de «shell»"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "El ID de la vista actual"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "El ID de la vista GAL actual"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -20176,407 +19719,319 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Página web de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy no está instalado."
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "No se pudo ejecutar Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1343
+#: ../shell/e-shell-window-actions.c:1347
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME Pilot no está instalado."
 
-#: ../shell/e-shell-window-actions.c:1345
+#: ../shell/e-shell-window-actions.c:1349
 msgid "GNOME Pilot could not be run."
 msgstr "No se pudo ejecutar GNOME Pilot."
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1443
 msgid "Show information about Evolution"
 msgstr "Mostrar información acerca de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "_Cerrar ventana"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1455
 msgid "_Contents"
 msgstr "�nd_ice"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1457
 msgid "Open the Evolution User Guide"
 msgstr "Abrir la Guía de usuario de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Evolution _FAQ"
 msgstr "P+_F de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Abrir la página web de preguntas más frecuentes"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1490
 msgid "_Forget Passwords"
 msgstr "_Olvidar contraseñas"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1492
 msgid "Forget all remembered passwords"
 msgstr "Olvidar todas las contraseñas recordadas"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1497
 msgid "I_mport..."
 msgstr "I_mportar…"
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Import data from other programs"
 msgstr "Importa datos de otros programas"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1504
 msgid "New _Window"
 msgstr "_Ventana nueva"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1506
 msgid "Create a new window displaying this view"
 msgstr "Crear una ventana nueva mostrando esta vista"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Configure Evolution"
 msgstr "Configurar Evolution"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Show Evolution's shortcut keys"
 msgstr "Mostrar los atajos de teclas de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "Sale del programa"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "Búsqueda _avanzada…"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr "Construir una búsqueda más avanzada"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Clear the current search parameters"
 msgstr "Limpiar los parámetros de búsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1553
 msgid "_Edit Saved Searches..."
 msgstr "_Editar búsquedas guardadas…"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Manage your saved searches"
 msgstr "Gestionar sus búsquedas guardadas"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "Pulse aquí para cambiar el tipo de búsqueda"
 
 # En conflicto con _Buscar del menu principal
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "B_uscar ahora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Execute the current search parameters"
 msgstr "Ejecutar los parámetros de búsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "_Guardar búsqueda…"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Save the current search parameters"
 msgstr "Guardar los parámetros de búsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Send / _Receive"
 msgstr "Enviar / Reci_bir"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Send queued items and retrieve new items"
 msgstr "Envía el correo en la cola y obtiene el nuevo"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Submit _Bug Report..."
 msgstr "Enviar informe de _fallo…"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Envía un informe de fallos usando Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1602
 msgid "GNOME Pilot _Synchronization..."
 msgstr "_sincronización de GNOME Pilot…"
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1604
 msgid "Set up GNOME Pilot configuration"
 msgstr "Configurar GNOME Pilot"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1611
 msgid "Put Evolution into offline mode"
 msgstr "Poner Evolution en modo desconectado"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1618
 msgid "Put Evolution into online mode"
 msgstr "Poner Evolution en modo conectado"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1646
 msgid "Lay_out"
 msgstr "_Distribución"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Switcher Appearance"
 msgstr "Apariencia del _selector"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Window"
 msgstr "_Ventana"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show Side _Bar"
 msgstr "Mostrar barra _lateral"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1712
 msgid "Show the side bar"
 msgstr "Mostrar la barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show _Buttons"
 msgstr "Mostrar _botones"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1720
 msgid "Show the switcher buttons"
 msgstr "Mostrar los botones del selector"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1726
 msgid "Show _Status Bar"
 msgstr "Mostrar barra de _estado"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Show the status bar"
 msgstr "Mostrar la barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1734
 msgid "Show _Tool Bar"
 msgstr "Mostrar barra de _herramientas"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1736
 msgid "Show the tool bar"
 msgstr "Mostrar la barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1758
 msgid "_Icons Only"
 msgstr "Sólo _iconos"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Display window buttons with icons only"
 msgstr "Mostrar los botones de la ventana sólo con iconos"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1765
 msgid "_Text Only"
 msgstr "Sólo _texto"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1767
 msgid "Display window buttons with text only"
 msgstr "Mostrar los botones de la ventana sólo con texto"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Icons _and Text"
 msgstr "Iconos _y texto"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Display window buttons with icons and text"
 msgstr "Mostrar los botones de la ventana con iconos y texto"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Tool_bar Style"
 msgstr "Estilo de la _barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Mostrar los botones de la ventana usando la configuración de la barra de "
 "herramientas del escritorio"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Define Views..."
 msgstr "Definir vistas…"
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1791
 msgid "Create or edit views"
 msgstr "Crear o editar vistas"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Save Custom View..."
 msgstr "Guardar vista personalizada…"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Save current custom view"
 msgstr "Guardar la vista actual personalizada"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1805
 msgid "C_urrent View"
 msgstr "Vista act_ual"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Custom View"
 msgstr "Vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Current view is a customized view"
 msgstr "La vista actual es una vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1827
 msgid "Change the page settings for your current printer"
 msgstr "Cambiar la configuración de página para la impresora actual"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2204
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2417
 msgid "Execute these search parameters"
 msgstr "Ejecutar estos parámetros de búsqueda"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:573
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "Nuevo"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "Vista activa de «shell»"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "Nombre de la vista activa de la «shell»"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "El EFocusTracker de la ventana «shell»"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "Geometría"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "Cadena de geometría inicial de la ventana"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Modo seguro"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Indica si la ventana de «shell» está en modo seguro"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "Barra lateral visible"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "Indica si la barra lateral de la ventana de «shell» es visible"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "Selector visible"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Indica si los botones del selector de la ventana «shell» son visibles"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "Barra de tareas visible"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "Indica si la barra de tareas de la ventana de «shell» es visible"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Indica si la barra de herramientas de la ventana de «shell» es visible"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "Gestor de IU"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "El GtkUIManager de la ventana «shell»"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "Preparándose para desconectarse…"
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "Preparándose para conectarse…"
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "Preparándose para salir…"
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "Directorio de módulos"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "El directorio del cuál cargar los módulos de evolution"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "Red disponible"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "Indica si la red está disponible"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "En línea"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "Indica si la «shell» está conectada"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:172
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20595,7 +20050,7 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"Hola.  Gracias por tomarse el tiempo en descargar esta versión \n"
+"Hola. Gracias por tomarse el tiempo en descargar esta versión \n"
 "preliminar de lanzamiento de la suite para trabajo en grupo Evolution.\n"
 "\n"
 "Esta versión de Evolution todavía no está terminada. Está cerca de\n"
@@ -20612,7 +20067,7 @@ msgstr ""
 "Esperamos que disfrute del resultado de nuestro duro trabajo y \n"
 "esperamos su contribución.\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:196
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20620,59 +20075,55 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:203
 msgid "Do not tell me again"
 msgstr "No preguntarme más veces"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:317
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:319
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar la geometría proporcionada a la ventana principal"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:323
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:325
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo «exprés»"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:328
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar el cierre de Evolution"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Fuerza la reemigración desde Evolution 1.4"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:331
 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:342
+#: ../shell/main.c:333
 msgid "Disable loading of any plugins."
 msgstr "Desactivar la carga de cualquier complemento."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:335
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar la vista previa del correo, contactos y tareas."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:339
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importar URI o nombres de archivos proporcionados como argumentos."
 
-#: ../shell/main.c:350
+#: ../shell/main.c:341
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar que el proceso de ejecución de Evolution finalice"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:458
 msgid "- The Evolution PIM and Email Client"
 msgstr "El cliente de correo-e y GIP Evolution"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:509
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20686,99 +20137,44 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "¿Seguro que quiere olvidar todas las contraseñas almacenadas?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Continuar"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "No se puede actualizar directamente desde la versión {0}"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "¿Seguro que quiere eliminar los datos antiguos de la versión {0}?"
+msgid "Continue Anyway"
+msgstr "Continuar de todas formas"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+"Evolution ya no soporta actualizar directamente desde la versión {0}. No "
+"obstante, como solución puede intentar actualizar primero a Evolution 2 y "
+"después a Evolution 3."
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "Olvidar sus contraseñas eliminará todas las contraseñas recordadas. Se le "
 "volverá a preguntar la próxima vez que se necesiten."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "Espacio de disco insuficiente para la actualización."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "¿Seguro que quiere eliminar los datos antiguos?"
+msgid "Quit Now"
+msgstr "Salir ahora"
 
 #: ../shell/shell.error.xml.h:8
-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 ""
-"El contenido completo del directorio «evolution» se va a eliminar "
-"permanentemente.\n"
-"\n"
-"Se sugiere que verifique manualmente que todos los datos de su correo, "
-"contactos, y calendarios están presentes, y que esta versión de Evolution "
-"funciona correctamente antes de eliminar los datos antiguos.\n"
-"\n"
-"Una vez borrados, no podrá desactualizarse a la versión anterior de "
-"Evolution sin intervención manual.\n"
-
-#: ../shell/shell.error.xml.h:14
-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 ""
-"La versión anterior de Evolution almacenaba sus datos en un lugar "
-"diferente.\n"
-"\n"
-"Si elije eliminar estos datos, todo el contenido del directorio &quot;"
-"evolution&quot; se eliminará permanentemente. Si elije conservar estos "
-"datos, entonces puede eliminar manualmente el contenido de &quot;"
-"evolution&quot; a su conveniencia.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "Falló la actualización desde la versión anterior:"
 
-#: ../shell/shell.error.xml.h:19
-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 ""
-"La actualización de sus datos y configuración requerirá hasta {0} de espacio "
-"de disco, pero sólo tiene {1} disponibles.\n"
-"\n"
-"Necesitará hacer más espacio libre en su carpeta personal antes de que pueda "
-"continuar."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "_Olvidar"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_Conservar los datos"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_Recordármelo más tarde"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20871,7 +20267,7 @@ msgstr "Opciones de gestión de la sesión:"
 msgid "Show session management options"
 msgstr "Mostrar las opciones de gestión de la sesión"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20929,7 +20325,7 @@ msgstr "Nombre del certificado"
 msgid "Purposes"
 msgstr "Propósito"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Número de serie"
@@ -20950,19 +20346,19 @@ msgstr "Dirección de correo-e"
 msgid "All CA certificate files"
 msgstr "Todos los archivos de certificados AC"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:1052
 msgid "Certificates"
 msgstr "Certificados"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visor de certificados: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "Introduzca la contraseña para «%s»"
+msgid "Enter the password for '%s'"
+msgstr "Introducir la contraseña para «%s»"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -20992,7 +20388,7 @@ msgstr ""
 "Emitido por:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Seleccione el certificado"
 
@@ -21005,14 +20401,10 @@ msgid "Authorities"
 msgstr "Autoridades"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "Respaldo"
+msgid "Backup _All"
+msgstr "Respaldar _todo"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "Respaldar todo"
-
-#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -21020,158 +20412,150 @@ msgstr ""
 "Antes de confiar en esta AC para cualquier propósito, debería examinar su "
 "certificado y su directiva y procedimientos (si están disponibles)."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "Certificado"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "Confianza en la autoridad certificadora"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "Campos del certificado"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "Jerarquía del certificado"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "Detalles del certificado"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "Tabla de certificados"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "Nombre común (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Certificados de contactos"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "No confiar en la autenticidad de este certificado"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "Editar"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "Ajustes de confianza de certificados de correo-e"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "Certificado del destinatario del correo-e"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "Certificado del firmante del correo-e"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Caduca el"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "Valor del campo"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "Huellas"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "Importar"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "Emitido por"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Emitido el"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "Emitido a"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "Huella MD5"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "Organización (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "Unidad organizativa (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "Huella SHA1"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "Certificado de cliente SSL"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "Certificado de servidor SSL"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "Este certificado ha sido verificado para los siguientes usos:"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "Confiar en la autenticidad de este certificado"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "Confiar en esta AC para identificar a usuarios de correo-e."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "Confiar en esta AC para identificar a desarrolladores de software."
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
 msgstr "Confiar en esta AC para identificar sitios web."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "Validez"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "Ver"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Tiene certificados de estas organizaciones que le identifican:"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Tiene archivados los certificados que identifican a estas autoridades de "
 "certificación:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "Tiene archivados los certificados que identifican a estas personas:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "Sus certificados"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_Backup"
+msgstr "_Respaldo"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "_Editar confianza en la AC"
 
@@ -21221,125 +20605,146 @@ msgstr "PKCS #1 MD5 con cifrado RSA"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:642
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:645
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 cifrado RSA"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "Uso de la clave del certificado"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador de la clave de la autoridad del certificado"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador del objeto (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "Identificador del algoritmo"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "Parámetros del algoritmo"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "Información del propósito de la clave pública"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "Propósito del algoritmo de clave pública"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "Clave pública del propósito"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "Erro: No es posible procesar la extensión"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "Firmante del objeto"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "Autoridad certificadora SSL"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "Autoridad certificadora de correo"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "Firma"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "No repudio"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "Cifrado de la clave"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "Cifrado de datos"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "Acuerdo de claves"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "Firmante del certificado"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "Firmante de la LRC"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "No crítico"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "Extensiones"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo de firma del certificado"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "Emisor"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "ID único del emisor"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "ID único del propósito"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "Valor de la firma del certificado"
 
@@ -21428,11 +20833,11 @@ 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:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -21462,19 +20867,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_Selección"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "Colección"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:347
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definir vistas para %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:355
+#: ../widgets/menus/gal-define-views-dialog.c:357
 msgid "Define Views"
 msgstr "Definir vistas"
 
@@ -21487,11 +20887,7 @@ msgstr "Definir vistas para «%s»"
 msgid "Table"
 msgstr "Tabla"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Instancia"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Guardar vista actual"
 
@@ -21503,11 +20899,7 @@ msgstr "_Crear vista nueva"
 msgid "_Replace existing view"
 msgstr "_Reemplazar vista existente"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "Fábrica"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "Definir vistas nuevas"
 
@@ -21527,22 +20919,10 @@ msgstr "Tipo de vista:"
 msgid "De_fault"
 msgstr "_Predeterminada"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "Nombre de la cuenta"
-
 #: ../widgets/misc/e-account-tree-view.c:255
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "Acción"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "Un GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Propiedades de adjuntos"
@@ -21560,11 +20940,11 @@ msgstr "Tipo MIME:"
 msgid "_Suggest automatic display of attachment"
 msgstr "_Sugerir mostrar automáticamente el adjunto"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "No se pudo establecer como fondo"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "Establecer como _fondo"
 
@@ -21582,13 +20962,13 @@ msgstr "En_viar a…"
 msgid "Send the selected attachments somewhere"
 msgstr "Enviar los adjuntos seleccionados a algún sitio"
 
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:495
+#: ../widgets/misc/e-attachment-tree-view.c:535
 msgid "Loading"
 msgstr "Cargando"
 
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:507
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Saving"
 msgstr "Guardando"
 
@@ -21597,13 +20977,10 @@ msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de adjuntos"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:605
 msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "Mostrar _barra de adjuntos"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "Añadir adjunto"
@@ -21620,32 +20997,32 @@ msgstr[1] "Guardar los adjuntos"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "Guardar _todo"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "_Añadir adjunto…"
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:356
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Abrir con «%s»"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Abrir este adjunto en %s"
@@ -21654,59 +21031,59 @@ msgstr "Abrir este adjunto en %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "Mensaje adjunto"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 msgid "A load operation is already in progress"
 msgstr "Existe una operación de carga en progreso"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 msgid "A save operation is already in progress"
 msgstr "Existe una operación de guardado en progreso"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "No se pudo cargar «%s»"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "No se pudo cargar el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2193
 #, c-format
 msgid "Could not open '%s'"
 msgstr "No se pudo abrir «%s»"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2196
 #, c-format
 msgid "Could not open the attachment"
 msgstr "No se pudo abrir el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "No se cargó el contenido del adjunto"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2707
 #, c-format
 msgid "Could not save '%s'"
 msgstr "No se pudo guardar «%s»"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2710
 #, c-format
 msgid "Could not save the attachment"
 msgstr "No se pudo guardar el adjunto"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "Pulse Ctrl-botón del ratón para abrir un enlace"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1255
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21714,65 +21091,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Calendario mensual"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Color de relleno"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "Color de relleno GDK"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Punteo de relleno"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Ancho mínimo"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Ancho mínimo"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Espaciado"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Codificación de caracteres"
@@ -21785,52 +21103,52 @@ msgstr "Introduzca el conjunto de caracteres a usar"
 msgid "Other..."
 msgstr "Otro…"
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Fecha y hora"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir la fecha"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Pulse este botón para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Caja combo desplegable para seleccionar la hora"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "_Ahora"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_Hoy"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Ninguna"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "Valor de fecha inválido"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "Valor de hora inválido"
 
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:242
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21838,40 +21156,37 @@ msgstr ""
 "Elija el archivo que quiere importar en Evolution y seleccione de la lista "
 "el tipo de archivo que es."
 
-#: ../widgets/misc/e-import-assistant.c:255
+#: ../widgets/misc/e-import-assistant.c:259
 msgid "F_ilename:"
 msgstr "Nombre del _archivo:"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:283
+#: ../widgets/misc/e-import-assistant.c:458
 msgid "File _type:"
 msgstr "_Tipo de archivo:"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:326
+#: ../widgets/misc/e-import-assistant.c:875
 msgid "Choose the destination for this import"
 msgstr "Elija el destino de esta importación"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:351
 msgid "Choose the type of importer to run:"
 msgstr "Elija el tipo de importador a ejecutar:"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:359
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos y configuración de programas _antiguos"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:367
 msgid "Import a _single file"
 msgstr "Importar un _único archivo"
 
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr "Seleccionar qué tipo de archivo quiere importar de la lista"
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:519
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21882,17 +21197,35 @@ msgstr ""
 "configuración que se pueda importar. Si quiere intentarlo de nuevo, pulse el "
 "botón «Atrás»."
 
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#: ../widgets/misc/e-import-assistant.c:874
+#| msgid "Preview the message to be printed"
+msgid "Preview data to be imported"
+msgstr "Vista previa de los datos para importar"
+
+#: ../widgets/misc/e-import-assistant.c:879
+#: ../widgets/misc/e-import-assistant.c:888
+#: ../widgets/misc/e-import-assistant.c:1265
+#: ../widgets/misc/e-import-assistant.c:1338
+#: ../widgets/misc/e-import-assistant.c:1348
+msgid "Import Data"
+msgstr "Importar datos"
+
+#. multiple importers found, be able to choose from them
+#: ../widgets/misc/e-import-assistant.c:884
+msgid "Select what type of file you want to import from the list."
+msgstr "Seleccionar qué tipo de archivo quiere importar de la lista"
+
+#: ../widgets/misc/e-import-assistant.c:1256
+#: ../widgets/misc/e-import-assistant.c:1291
 msgid "Evolution Import Assistant"
 msgstr "Asistente de importación de Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1273
+#: ../widgets/misc/e-import-assistant.c:1325
 msgid "Import Location"
 msgstr "Lugar de importación"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1284
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21902,32 +21235,27 @@ msgstr ""
 "Este asistente le guiará a través del proceso de importación de archivos "
 "externos dentro de Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1300
 msgid "Importer Type"
 msgstr "Tipo de importador"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1309
 msgid "Select Information to Import"
 msgstr "Seleccione la imformación para importar"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1317
 msgid "Select a File"
 msgstr "Seleccione un archivo"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1332
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Pulse «Aplicar» para comenzar a importar el archivo en Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "Importar datos"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "Mapa mundial"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21953,42 +21281,6 @@ msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "Actualmente Evolution está desconectado porque la red no está disponible."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "El botón de estado está en línea"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "Posición horizontal"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "Posición del panel cuando está orientado horizontal"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "Posición vertical"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "Posición del panel cuando está orientado verticalmente"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "Proporción"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "Proporción del tamaño del 2º panel"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "Redimensión fija"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Mantener el 2º panel fijo durante la redimensión"
-
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Sincronizar con:"
@@ -22010,68 +21302,46 @@ msgstr "Preferencias de Evolution"
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "Cerrar la barra de búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "Limpiar la búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "Buscar la coincidencia anterior de la frase"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "_Siguiente"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "Buscar la siguiente coincidencia de la frase"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "_Coincidir con capitalización"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr "Se llegó al final de la página, continuando desde el principio"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "Se llegó al principio de la página, continuando desde el final"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "Cursor de fila"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Cursor de columna"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Ordenador"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Modo de selección"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Modo del cursor"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Al e_liminar:"
@@ -22144,43 +21414,46 @@ msgstr "Al _terminar:"
 msgid "When decli_ned:"
 msgstr "Al _rehusar:"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "_Dentro"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "_Después de:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_After"
+msgstr "_Después"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_Toda la información"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "_Clasificación:"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "_Retrasar la entrega del mensaje"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "_Entregado"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "_Establecer fecha de caducidad"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "_Hasta:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "_Until"
+msgstr "_Hasta"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "_Cuando convenga"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "_Al abrir:"
 
@@ -22237,41 +21510,41 @@ msgstr "El script debe ser ejecutable."
 msgid "Click here to go to URL"
 msgstr "Pulse aquí para ir a la URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:359
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:361
 msgid "Copy the link to the clipboard"
 msgstr "Copiar el enlace al portapapeles"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:371
 msgid "Open the link in a web browser"
 msgstr "_Abrir enlace en el navegador"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Copy Email Address"
 msgstr "_Copiar dirección de correo-e"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
 msgid "Select all text and images"
 msgstr "Seleccionar todo el texto y las imágenes"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 #, c-format
 msgid "Click to call %s"
 msgstr "Pulse para llamar a %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:846
 msgid "Click to hide/unhide addresses"
 msgstr "Pulse para ocultar/mostrar las direcciones"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
@@ -22290,7 +21563,7 @@ msgstr "Calendario: desde %s a %s"
 msgid "evolution calendar item"
 msgstr "elemento de calendario de Evolution"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "lista emergente"
 
@@ -22308,7 +21581,7 @@ msgstr "Ninguna"
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La fecha debe estar en el formato: %s"
@@ -22317,48 +21590,12 @@ msgstr "La fecha debe estar en el formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del porcentaje debe estar entre 0 y 100, inclusive"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Columna seleccionada"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Columna enfocada"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Columna deseleccionada"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Tachar columna"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "Subrayar columna"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Columna en negrita"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Color de la columna"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Color de fondo de la columna"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "pulse para añadir"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Estado"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Ascendente)"
@@ -22375,12 +21612,12 @@ msgstr "Sin ordenar"
 msgid "No grouping"
 msgstr "Sin agrupar"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Mostrar campos"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "Campos disponibles"
 
@@ -22389,7 +21626,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos _disponibles:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -22402,7 +21639,7 @@ msgid "Clear _All"
 msgstr "Quitar _todo"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "Descendente"
 
@@ -22462,7 +21699,7 @@ msgstr "_Mostrar estos campos en orden:"
 msgid "_Sort..."
 msgstr "_Ordenar…"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "Añadir una columna"
 
@@ -22474,249 +21711,112 @@ 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:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d elemento)"
-msgstr[1] "%s : %s (%d elementos)"
-
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
+#, 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)"
+
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Alternar colores de las filas"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Dibujar rejilla horizontal"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Dibujar rejilla vertical"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Dibujar el foco"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Modo del cursor"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Modelo de selección"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "Umbral de longitud"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Altura uniforme de la fila"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "Congelado"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
 msgstr "Personalizar vista actual"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Sort _Ascending"
 msgstr "Ordenar _ascendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1565
 msgid "Sort _Descending"
 msgstr "Ordenar _descendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1568
 msgid "_Unsort"
 msgstr "_Desordenar"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1571
 msgid "Group By This _Field"
 msgstr "Agrupar por _este campo"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Group By _Box"
 msgstr "Agrupar por _caja"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Remove This _Column"
 msgstr "Quitar esta c_olumna"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Add a C_olumn..."
 msgstr "Añadir una c_olumna…"
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "A_lignment"
 msgstr "A_lineación"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "B_est Fit"
 msgstr "Ajust_e automático"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Format Column_s..."
 msgstr "Formatear columna_s…"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar vista actual…"
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Sort By"
 msgstr "_Ordenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1672
 msgid "_Custom"
 msgstr "_Personalizado"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "Cabecera de la tabla"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Modelo de la tabla"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Fila del cursor"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Ordenar información"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Buscar siempre"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Pulsar para añadir"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "Espaciado vertical de fila"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr ""
-"Espacio vertical entre filas. Si añade en la parte superior e inferior de "
-"una fila."
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "Adaptador de tabla Etree"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Apariencia retro"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Dibujar líneas y expansores +/−."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "Tamaño del expansor"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "Tamaño de la flecha del expansor"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "emergente"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "emerger un descendiente"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "editar"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "empezar a editar esta celda"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "cambiar"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "cambiar la celda"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "expandir"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "expande la fila en el ETree que contiene esta celda"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "contraer"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "contrae la fila en el ETree que contiene esta celda"
 
@@ -22732,118 +21832,1052 @@ msgstr "pulsar"
 msgid "sort"
 msgstr "ordenar"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "Métodos de entrada"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Procesador de acontecimientos"
+#~ msgid "address card"
+#~ msgstr "tarjeta de dirección"
+
+#~ msgid "calendar information"
+#~ msgstr "información de calendario"
+
+#~ msgid "Check whether Evolution is the default mail client on startup."
+#~ msgstr ""
+#~ "Comprueba al iniciar si Evolution es el cliente de correo predeterminado."
+
+#~ msgid "Default Mail Client"
+#~ msgstr "Cliente de correo predeterminado"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Texto"
+#~ msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Detalles personales:</span>"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Negrita"
+#~ msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Detalles de recepción:</span>"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Tachar"
+#~ msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Detalles de envío:</span>"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Ancla"
+#~ msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Gestión de cuentas</span>"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "Justificación"
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>Opción publicar por encima</b> (no se recomienda)"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Anchura del clip"
+#~ msgid "<b>Server</b>"
+#~ msgstr "<b>Servidor</b>"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Altura del clip"
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>Usuarios:</b>"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Clip"
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>Nombre de la cuenta</b>"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Rellenar el rectángulo del clip"
+#~ msgid "_Accept"
+#~ msgstr "_Aceptar"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "Desplazamiento en X"
+#~ msgid "Edit"
+#~ msgstr "Editar"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Desplazamiento en Y"
+#~ msgid "Import"
+#~ msgstr "Importar"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Anchura del texto"
+#~ msgid "View"
+#~ msgstr "Ver"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Altura del texto"
+#~ msgid "{0}"
+#~ msgstr "{0}"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Usar elipsis"
+#~ msgid "{1}"
+#~ msgstr "{1}"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Elipsis"
+#~ msgid "Web Log:"
+#~ msgstr "Diario web:"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Ajuste de línea"
+#~ msgid "_Web Log:"
+#~ msgstr "_Diario web:"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Caracteres de ruptura"
+#~ msgid "Editable"
+#~ msgstr "Editable"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "Líneas máximas"
+#~ msgid "Source Book"
+#~ msgstr "Libro origen"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Dibujar bordes"
+#~ msgid "Target Book"
+#~ msgstr "Libro destino"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Permitir nuevas líneas"
+#~ msgid "Is New Contact"
+#~ msgstr "Es un contacto nuevo"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Dibujar fondo"
+#~ msgid "Writable Fields"
+#~ msgstr "Campos editables"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Dibujar botón"
+#~ msgid "Required Fields"
+#~ msgstr "Campos requeridos"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "Posición del cursor"
+#~ msgid "Changed"
+#~ msgstr "Modificados"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "Contexto IM"
+#~ msgid "Shell"
+#~ msgstr "Shell"
 
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "Tirador emergente"
+#~ msgid "The EShell singleton"
+#~ msgstr "El «singleton» EShell"
+
+#~ msgid "Book"
+#~ msgstr "Libro"
+
+#~ msgid "Is New List"
+#~ msgstr "Es una lista nueva"
+
+#~ msgid "Query"
+#~ msgstr "Consulta"
+
+#~ msgid "Model"
+#~ msgstr "Modelo"
+
+#~ msgid "Shell View"
+#~ msgstr "Vista de «shell»"
+
+#~ msgid "Source"
+#~ msgstr "Fuente"
+
+#~ msgid "Width"
+#~ msgstr "Anchura"
+
+#~ msgid "Height"
+#~ msgstr "Altura"
+
+#~ msgid "Has Focus"
+#~ msgstr "Tiene el foco"
+
+#~ msgid "Field"
+#~ msgstr "Campo"
+
+#~ msgid "Field Name"
+#~ msgstr "Nombre del campo"
+
+#~ msgid "Text Model"
+#~ msgstr "Modelo del texto"
+
+#~ msgid "Max field name length"
+#~ msgstr "Longitud máx. del campo"
+
+#~ msgid "Column Width"
+#~ msgstr "Anchura de columna"
+
+#~ msgid "Adapter"
+#~ msgstr "Adaptador"
+
+#~ msgid "Selected"
+#~ msgstr "Seleccionado"
+
+#~ msgid "Has Cursor"
+#~ msgstr "Tiene el cursor"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "El repositorio del calendario está desconectado."
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "Error en «{0}»"
+
+#~ msgid "No response from the server."
+#~ msgstr "Sin respuesta del servidor"
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "No es posible cargar el calendario «%s»"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Check this to use system timezone in Evolution."
+#~ msgstr "Marque esto para usar la hora del sistema en Evolution."
+
+#~ msgid "Attendee_s..."
+#~ msgstr "_Participantes…"
+
+#~ msgid "Default Client"
+#~ msgstr "Cliente predeterminado"
+
+#~ msgid "Shell Settings"
+#~ msgstr "Configuración de «shell»"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "Ajustes globales de la aplicación"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "_Participantes…"
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "_Seleccionar hoy"
+
+#~| msgid "New _Task"
+#~ msgid "New Tab"
+#~ msgstr "Solapa nueva"
+
+#~ msgid "Name of the logger"
+#~ msgstr "Nombre del registrador"
+
+#~ msgid "Filename"
+#~ msgstr "Nombre del archivo"
+
+#~ msgid "The filename of the module"
+#~ msgstr "El nombre de archivo del módulo"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "Indica si el complemento está activado"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "Enfocar el seguimiento"
+
+#~ msgid "Shell Module"
+#~ msgstr "Modo de «shell»"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "El «backend» de la «shell» de correo"
+
+#~ msgid "Show Deleted"
+#~ msgstr "Mostrar borrados"
+
+#~ msgid "To Do"
+#~ msgstr "Tareas pendientes"
+
+#~ msgid "Later"
+#~ msgstr "Más tarde"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "No es posible crear la carpeta nueva: «%s»: %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "No es posible copiar el la carpeta «%s» a «%s»: %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "No es posible buscar buzones existentes en «%s»: %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "El lugar y jerarquía de las carpetas de buzones de correo ha cambiado "
+#~ "desde Evolution 1.x.\n"
+#~ "\n"
+#~ "Tenga paciencia mientras Evolution migra sus carpetas…"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "No es posible copiar los datos POP3 keep-on-server «%s»: %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "No es posible crear el almacén de correo local «%s»: %s"
+
+#~ 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, «evolution/config.xmldb» no existe o está corrompido."
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "Permite a Evolution mostrar la parte de texto de tamaño limitado"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr ""
+#~ "Activar para mostrar la parte de texto del mensaje de tamaño limitado."
+
+#~ msgid "Text message part limit"
+#~ msgstr "Límite de la parte de texto del mensaje"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "Porque «{0}»."
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "Porque «{2}»."
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "La(s) siguiente(s) carpeta(s) de búsqueda:\n"
+#~ "{0}\n"
+#~ "Usaban la carpeta ahora eliminada:\n"
+#~ "    «{1}» \n"
+#~ "Y se han actualizado."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "La(s) siguiente(s) reglas de filtrado:\n"
+#~ "«{0}»\n"
+#~ "usaban la ahora carpeta eliminada:\n"
+#~ "    «{1}»\n"
+#~ "Y se han actualizado."
+
+#~ msgid "Shell Backend"
+#~ msgstr "«Backend» de la «shell»"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "Sólo hay mensajes ocultos en esta carpeta. Use Ver->Mostrar mensajes "
+#~ "ocultos para mostrarlos."
+
+#~ msgid "Table column:"
+#~ msgstr "Columna de tabla:"
+
+#~ msgid "Source List"
+#~ msgstr "Lista de origen"
+
+#~ msgid "The registry of address books"
+#~ msgstr "El registro de las libretas de direcciones"
+
+#~ msgid "Current View"
+#~ msgstr "Vista actual"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "La vista actual de la libreta de direcciones seleccionada"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "Contacto previsualizado"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "El contacto mostrado en el panel de vista previa"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "La vista previa es visible"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "Indica si se muestra el panel de vista previa"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "Servidores LDAP"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "Configuración de autocompletado"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution contact folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "El lugar y jerarquía de las carpetas de contactos de Evolution ha "
+#~ "cambiado desde Evolution 1.x.\n"
+#~ "\n"
+#~ "Tenga paciencia mientras Evolution migra sus carpetas…"
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "El formato de los contactos de listas de correo ha cambiado.\n"
+#~ "\n"
+#~ "Tenga paciencia mientras Evolution migra sus carpetas…"
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "La forma en que Evolution almacena algunos números de teléfono ha "
+#~ "cambiado.\n"
+#~ "\n"
+#~ "Tenga paciencia mientras Evolution migra sus carpetas…"
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Los archivos del registro de cambios y los mapas Palm Sync de Evolution "
+#~ "han cambiado.\n"
+#~ "\n"
+#~ "Tenga paciencia mientras Evolution migra sus datos Pilot Sync…"
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "Selector de fuentes"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "Este widget muestra grupos de libretas de direcciones"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "Guardar como vCard…"
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "El registro de calendarios"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution calendar folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "El lugar y jerarquía de las carpetas de calendario de Evolution ha "
+#~ "cambiado desde Evolution 1.x.\n"
+#~ "\n"
+#~ "Tenga paciencia mientras Evolution migra sus carpetas…"
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr ""
+#~ "No es posible migrar la configuración antigua desde evolution/config.xmldb"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "No es posible migrar el calendario «%s»"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "Widget de navegación de fecha"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "Este widget muestra un calendario en miniatura"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "Cliente de calendario predeterminado"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "Cliente predeterminado para las operaciones de calendario"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "Este widget muestra grupos de calendarios"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "El registro de lista de notas"
+
+#~ msgid "The memo table model"
+#~ msgstr "El modelo de la tabla de notas"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "Cliente de notas predeterminado"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "Cliente predeterminado para las operaciones de notas"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "Este widget muestra grupos de listas de notas"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "El registro de listas de tareas"
+
+#~ msgid "The task table model"
+#~ msgstr "El modelo de tablas de tareas"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "El lugar y jerarquía de las carpetas de tareas de Evolution ha cambiado "
+#~ "desde Evolution 1.x.\n"
+#~ "\n"
+#~ "Tenga paciencia mientras Evolution migra sus carpetas…"
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "No es posible migrar las tareas en «%s»"
+
+#~ msgid "Default Task Client"
+#~ msgstr "Cliente de tareas predeterminado"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "Cliente predeterminado para las operaciones de tareas"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "Este widget muestra grupos de listas de tareas"
+
+#~ msgid "Group by Threads"
+#~ msgstr "Agrupar por conversaciones"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "Indica si se deben agrupar los mensajes por conversaciones"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Ocultar mensajes _leídos"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "Oculta temporalmente todos los mensajes que han sido leídos"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Ocultar mensajes s_eleccionados"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "Oculta temporalmente los mensajes seleccionados"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "_Mostrar mensajes ocultos"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "Mostrar los mensajes que han estado ocultos temporalmente"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Ocultar correos _borrados"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr ""
+#~ "Ocultar los correos borrados en lugar de mostrarlos tachados por una línea"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr ""
+#~ "Lista de indicios para que el complemento de recuerdo de adjuntos busque "
+#~ "en el cuerpo de un mensaje."
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "Añadir soporte Hula para Evolution."
+
+#~ msgid "Hula Support"
+#~ msgstr "Soporte Hula"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld KiB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "Estilo de la barra de herramientas"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "El estilo de la barra de herramientas del selector"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "Barra de herramientas visible"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "Indica si el selector es visible"
+
+#~ msgid "Switcher Action"
+#~ msgstr "Acción del selector"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "La acción del selector para esta vista de la «shell»"
+
+#~ msgid "Page Number"
+#~ msgstr "Número de página"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "El número de página del libro de notas para esta vista de «shell»"
+
+#~ msgid "Search Rule"
+#~ msgstr "Regla de búsqueda"
+
+#~ msgid "Criteria for the current search results"
+#~ msgstr "Criterio para los resultados de búsqueda actuales"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "El «EShellBackend» para esta vista de «shell»"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "Widget de contenido «shell»"
+
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr ""
+#~ "El widget de contenido aparece en un panel derecho de la ventana de «shell»"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Widget de barra lateral de «shell»"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr ""
+#~ "El widget de barra lateral aparee en un panel izquierdo de la ventana de "
+#~ "«shell»"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "Widget de barra de tareas de «shell»"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr ""
+#~ "El widget de barra de tareas aparece en la parte inferior de una ventana "
+#~ "de «shell»"
+
+#~ msgid "Shell Window"
+#~ msgstr "Ventana «shell»"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "La ventana a la que pertenece la «shell»"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "El archivo clave que tiene los datos de estado del «widget»"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "El título de esta vista de «shell»"
+
+#~ msgid "Current View ID"
+#~ msgstr "El ID de la vista actual"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "El ID de la vista GAL actual"
+
+#~ msgid "Active Shell View"
+#~ msgstr "Vista activa de «shell»"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "Nombre de la vista activa de la «shell»"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "El EFocusTracker de la ventana «shell»"
+
+#~ msgid "Geometry"
+#~ msgstr "Geometría"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "Cadena de geometría inicial de la ventana"
+
+#~ msgid "Safe Mode"
+#~ msgstr "Modo seguro"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "Indica si la ventana de «shell» está en modo seguro"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "Barra lateral visible"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "Indica si la barra lateral de la ventana de «shell» es visible"
+
+#~ msgid "Switcher Visible"
+#~ msgstr "Selector visible"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr ""
+#~ "Indica si los botones del selector de la ventana «shell» son visibles"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "Barra de tareas visible"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "Indica si la barra de tareas de la ventana de «shell» es visible"
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr ""
+#~ "Indica si la barra de herramientas de la ventana de «shell» es visible"
+
+#~ msgid "UI Manager"
+#~ msgstr "Gestor de IU"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "El GtkUIManager de la ventana «shell»"
+
+#~ msgid "Module Directory"
+#~ msgstr "Directorio de módulos"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "El directorio del cuál cargar los módulos de evolution"
+
+#~ msgid "Network Available"
+#~ msgstr "Red disponible"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "Indica si la red está disponible"
+
+#~ msgid "Online"
+#~ msgstr "En línea"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "Indica si la «shell» está conectada"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "Fuerza la reemigración desde Evolution 1.4"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "Espacio de disco insuficiente para la actualización."
+
+#~ msgid "Really delete old data?"
+#~ msgstr "¿Seguro que quiere eliminar los datos antiguos?"
+
+#~ 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 ""
+#~ "El contenido completo del directorio «evolution» se va a eliminar "
+#~ "permanentemente.\n"
+#~ "\n"
+#~ "Se sugiere que verifique manualmente que todos los datos de su correo, "
+#~ "contactos, y calendarios están presentes, y que esta versión de Evolution "
+#~ "funciona correctamente antes de eliminar los datos antiguos.\n"
+#~ "\n"
+#~ "Una vez borrados, no podrá desactualizarse a la versión anterior de "
+#~ "Evolution sin intervención manual.\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "La versión anterior de Evolution almacenaba sus datos en un lugar "
+#~ "diferente.\n"
+#~ "\n"
+#~ "Si elije eliminar estos datos, todo el contenido del directorio &quot;"
+#~ "evolution&quot; se eliminará permanentemente. Si elije conservar estos "
+#~ "datos, entonces puede eliminar manualmente el contenido de &quot;"
+#~ "evolution&quot; a su conveniencia.\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "La actualización de sus datos y configuración requerirá hasta {0} de "
+#~ "espacio de disco, pero sólo tiene {1} disponibles.\n"
+#~ "\n"
+#~ "Necesitará hacer más espacio libre en su carpeta personal antes de que "
+#~ "pueda continuar."
+
+#~ msgid "_Keep Data"
+#~ msgstr "_Conservar los datos"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "_Recordármelo más tarde"
+
+#~ msgid "Collection"
+#~ msgstr "Colección"
+
+#~ msgid "Instance"
+#~ msgstr "Instancia"
+
+#~ msgid "Factory"
+#~ msgstr "Fábrica"
+
+#~ msgid "Action"
+#~ msgstr "Acción"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "Un GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "Mostrar _barra de adjuntos"
+
+#~ msgid "Fill color"
+#~ msgstr "Color de relleno"
+
+#~ msgid "GDK fill color"
+#~ msgstr "Color de relleno GDK"
+
+#~ msgid "Fill stipple"
+#~ msgstr "Punteo de relleno"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "Ancho mínimo"
+
+#~ msgid "Minimum Width"
+#~ msgstr "Ancho mínimo"
+
+#~ msgid "Spacing"
+#~ msgstr "Espaciado"
+
+#~ msgid "The button state is online"
+#~ msgstr "El botón de estado está en línea"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "Posición horizontal"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "Posición del panel cuando está orientado horizontal"
+
+#~ msgid "Vertical Position"
+#~ msgstr "Posición vertical"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "Posición del panel cuando está orientado verticalmente"
+
+#~ msgid "Proportion"
+#~ msgstr "Proporción"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "Proporción del tamaño del 2º panel"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "Redimensión fija"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "Mantener el 2º panel fijo durante la redimensión"
+
+#~ msgid "Cursor Row"
+#~ msgstr "Cursor de fila"
+
+#~ msgid "Cursor Column"
+#~ msgstr "Cursor de columna"
+
+#~ msgid "Sorter"
+#~ msgstr "Ordenador"
+
+#~ msgid "Selection Mode"
+#~ msgstr "Modo de selección"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "Modo del cursor"
+
+#~ msgid "Selected Column"
+#~ msgstr "Columna seleccionada"
+
+#~ msgid "Focused Column"
+#~ msgstr "Columna enfocada"
+
+#~ msgid "Unselected Column"
+#~ msgstr "Columna deseleccionada"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "Tachar columna"
+
+#~ msgid "Underline Column"
+#~ msgstr "Subrayar columna"
+
+#~ msgid "Bold Column"
+#~ msgstr "Columna en negrita"
+
+#~ msgid "Color Column"
+#~ msgstr "Color de la columna"
+
+#~ msgid "BG Color Column"
+#~ msgstr "Color de fondo de la columna"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "Alternar colores de las filas"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "Dibujar rejilla horizontal"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "Dibujar rejilla vertical"
+
+#~ msgid "Draw focus"
+#~ msgstr "Dibujar el foco"
+
+#~ msgid "Cursor mode"
+#~ msgstr "Modo del cursor"
+
+#~ msgid "Selection model"
+#~ msgstr "Modelo de selección"
+
+#~ msgid "Length Threshold"
+#~ msgstr "Umbral de longitud"
+
+#~ msgid "Uniform row height"
+#~ msgstr "Altura uniforme de la fila"
+
+#~ msgid "Frozen"
+#~ msgstr "Congelado"
+
+#~ msgid "Table header"
+#~ msgstr "Cabecera de la tabla"
+
+#~ msgid "Table model"
+#~ msgstr "Modelo de la tabla"
+
+#~ msgid "Cursor row"
+#~ msgstr "Fila del cursor"
+
+#~ msgid "Sort Info"
+#~ msgstr "Ordenar información"
+
+#~ msgid "Always search"
+#~ msgstr "Buscar siempre"
+
+#~ msgid "Use click to add"
+#~ msgstr "Pulsar para añadir"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "Espaciado vertical de fila"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr ""
+#~ "Espacio vertical entre filas. Si añade en la parte superior e inferior de "
+#~ "una fila."
+
+#~ msgid "ETree table adapter"
+#~ msgstr "Adaptador de tabla Etree"
+
+#~ msgid "Retro Look"
+#~ msgstr "Apariencia retro"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "Dibujar líneas y expansores +/−."
+
+#~ msgid "Expander Size"
+#~ msgstr "Tamaño del expansor"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Tamaño de la flecha del expansor"
+
+#~ msgid "popup"
+#~ msgstr "emergente"
+
+#~ msgid "edit"
+#~ msgstr "editar"
+
+#~ msgid "toggle"
+#~ msgstr "cambiar"
+
+#~ msgid "expand"
+#~ msgstr "expandir"
+
+#~ msgid "Event Processor"
+#~ msgstr "Procesador de acontecimientos"
+
+#~ msgid "Text"
+#~ msgstr "Texto"
+
+#~ msgid "Bold"
+#~ msgstr "Negrita"
+
+#~ msgid "Strikeout"
+#~ msgstr "Tachar"
+
+#~ msgid "Anchor"
+#~ msgstr "Ancla"
+
+#~ msgid "Justification"
+#~ msgstr "Justificación"
+
+#~ msgid "Clip Width"
+#~ msgstr "Anchura del clip"
+
+#~ msgid "Clip Height"
+#~ msgstr "Altura del clip"
+
+#~ msgid "Clip"
+#~ msgstr "Clip"
+
+#~ msgid "Fill clip rectangle"
+#~ msgstr "Rellenar el rectángulo del clip"
+
+#~ msgid "X Offset"
+#~ msgstr "Desplazamiento en X"
+
+#~ msgid "Y Offset"
+#~ msgstr "Desplazamiento en Y"
+
+#~ msgid "Text width"
+#~ msgstr "Anchura del texto"
+
+#~ msgid "Text height"
+#~ msgstr "Altura del texto"
+
+#~ msgid "Use ellipsis"
+#~ msgstr "Usar elipsis"
+
+#~ msgid "Ellipsis"
+#~ msgstr "Elipsis"
+
+#~ msgid "Line wrap"
+#~ msgstr "Ajuste de línea"
+
+#~ msgid "Break characters"
+#~ msgstr "Caracteres de ruptura"
+
+#~ msgid "Max lines"
+#~ msgstr "Líneas máximas"
+
+#~ msgid "Draw borders"
+#~ msgstr "Dibujar bordes"
+
+#~ msgid "Allow newlines"
+#~ msgstr "Permitir nuevas líneas"
+
+#~ msgid "Draw background"
+#~ msgstr "Dibujar fondo"
+
+#~ msgid "Draw button"
+#~ msgstr "Dibujar botón"
+
+#~ msgid "Cursor position"
+#~ msgstr "Posición del cursor"
+
+#~ msgid "IM Context"
+#~ msgstr "Contexto IM"
+
+#~ msgid "Handle Popup"
+#~ msgstr "Tirador emergente"
 
 #~ msgid "Loading appointments at %s"
 #~ msgstr "Cargando citas de %s"
@@ -26290,9 +26324,6 @@ msgstr "Tirador emergente"
 #~ msgid "Orientation"
 #~ msgstr "Orientación"
 
-#~ msgid "Page"
-#~ msgstr "Página"
-
 #~ msgid "Page Setup:"
 #~ msgstr "Configuración de la página:"
 
@@ -26626,6 +26657,3 @@ msgstr "Tirador emergente"
 #~ "ejecutó. Como medida de precación se ocultarán todos los paneles de "
 #~ "vista\n"
 #~ "previa. Puede restablecer los paneles de vista previa desde el menú Ver.\n"
-
-#~ msgid "_Do not show this message again"
-#~ msgstr "_No mostrar otra vez este mensaje."
diff --git a/po/et.po b/po/et.po
index a5ae41f53b..0149d96143 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,23 +1,23 @@
 # Evolutioni eesti keele tõlge.
 # Estonian translation of Evolution.
 #
-# Copyright (C) 2001-2006 Free Software Foundation, Inc.
-# Copyright (C) 2007-2010 The GNOME Project.
+# Copyright (C) 2001–2006 Free Software Foundation, Inc.
+# Copyright (C) 2007–2010 The GNOME Project.
 # This file is distributed under the same license as the evolution package.
 #
 # Ilmar Kerm <ikerm hot ee>, 2001.
 # Marek Sepp <marek sepp ttu ee>, 2001, 2002.
-# Ivar Smolin <okul linux ee>, 2002, 2003, 2005-2010.
+# Ivar Smolin <okul linux ee>, 2002, 2003, 2005–2010.
 # Kaarel Jõgi <kaarel gg ee>, 2002.
-# Priit Laes <plaes plaes org>, 2003-2007, 2009, 2010.
-# Mattias Põldaru <mahfiaz gmail com>, 2009-2010.
+# Priit Laes <plaes plaes org>, 2003–2007, 2009, 2010.
+# Mattias Põldaru <mahfiaz gmail com>, 2009–2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Evolution 2.30\n"
+"Project-Id-Version: Evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
-"POT-Creation-Date: 2010-05-21 15:35+0000\n"
+"POT-Creation-Date: 2010-05-24 14:20+0000\n"
 "PO-Revision-Date: 2010-05-24 18:51+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -193,14 +193,6 @@ msgstr "_Vähenda"
 msgid "_Use as it is"
 msgstr "_Kasuta nii, nagu on"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-msgid "{1}"
-msgstr "{1}"
-
 msgid "Default Sync Address:"
 msgstr "Vaikimisi sünkroniseerimisaadress:"
 
@@ -221,6 +213,10 @@ msgstr "Aastapäev"
 msgid "Birthday"
 msgstr "Sünnipäev"
 
+#. Translators: an accessibility name
+msgid "Blog:"
+msgstr "Blogi:"
+
 msgid "Ca_tegories..."
 msgstr "Kate_gooriad..."
 
@@ -284,10 +280,6 @@ msgstr "Videovestlus:"
 msgid "Web Addresses"
 msgstr "Veebiaadressid"
 
-msgid "Web Log:"
-msgstr "Veebilogi:"
-
-#. red
 msgid "Work"
 msgstr "Töö"
 
@@ -303,6 +295,9 @@ msgstr "Ass_istent:"
 msgid "_Birthday:"
 msgstr "_Sünnipäev:"
 
+msgid "_Blog:"
+msgstr "_Blogi:"
+
 msgid "_Calendar:"
 msgstr "Kalen_der:"
 
@@ -354,21 +349,12 @@ msgstr "_Videovestlus:"
 msgid "_Wants to receive HTML mail"
 msgstr "Soovib saada _HTML sõnumeid"
 
-msgid "_Web Log:"
-msgstr "Veebilo_gi:"
-
 msgid "_Where:"
 msgstr "K_us:"
 
 msgid "_Zip/Postal Code:"
 msgstr "_Postiindeks:"
 
-msgid "Name"
-msgstr "Nimi"
-
-msgid "Editable"
-msgstr "Muudetav"
-
 msgid "AIM"
 msgstr "AIM"
 
@@ -402,24 +388,6 @@ msgstr "Viga kontakti muutmisel"
 msgid "Error removing contact"
 msgstr "Viga kontakti eemaldamisel"
 
-msgid "Source Book"
-msgstr "Lähteraamat"
-
-msgid "Target Book"
-msgstr "Sihtraamat"
-
-msgid "Is New Contact"
-msgstr "Tegemist on uue kontaktiga"
-
-msgid "Writable Fields"
-msgstr "Muudetavad väljad"
-
-msgid "Required Fields"
-msgstr "Vajalikud väljad"
-
-msgid "Changed"
-msgstr "Muudetud"
-
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktiredaktor - %s"
@@ -469,12 +437,6 @@ msgstr "E-_post:"
 msgid "_Select Address Book"
 msgstr "_Vali aadressiraamat"
 
-msgid "Shell"
-msgstr "Kest"
-
-msgid "The EShell singleton"
-msgstr ""
-
 msgid "Dr."
 msgstr "Dr"
 
@@ -557,12 +519,6 @@ msgstr "Viga loendi muutmisel"
 msgid "Error removing list"
 msgstr "Viga loendi eemaldamisel"
 
-msgid "Book"
-msgstr "Raamat"
-
-msgid "Is New List"
-msgstr "On uus loend"
-
 msgid "Changed Contact:"
 msgstr "Muudetud kontakt:"
 
@@ -619,15 +575,9 @@ msgstr[1] "%d kontakti"
 msgid "Error getting book view"
 msgstr "Viga raamatu vaate hankimisel"
 
-msgid "Query"
-msgstr "Päring"
-
 msgid "Search Interrupted"
 msgstr "Otsing katkestati"
 
-msgid "Model"
-msgstr "Mudel"
-
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
@@ -646,12 +596,6 @@ msgstr "Valitud kontaktide kustutamine"
 msgid "Select all visible contacts"
 msgstr "Kõigi nähtaval olevate kontaktide valimine"
 
-msgid "Shell View"
-msgstr "Kestvaade"
-
-msgid "Source"
-msgstr "Allikas"
-
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Kas soovid kustutada need kontaktide loendid?"
 
@@ -803,30 +747,6 @@ msgstr "Ãœhik"
 msgid "Web Site"
 msgstr "Koduleht"
 
-msgid "Width"
-msgstr "Laius"
-
-msgid "Height"
-msgstr "Kõrgus"
-
-msgid "Has Focus"
-msgstr "On fookuses"
-
-msgid "Field"
-msgstr "Väli"
-
-msgid "Field Name"
-msgstr "Välja nimi"
-
-msgid "Text Model"
-msgstr "Teksti mudel"
-
-msgid "Max field name length"
-msgstr "Suurim välja nime pikkus"
-
-msgid "Column Width"
-msgstr "Veeru laius"
-
 msgid ""
 "\n"
 "\n"
@@ -880,9 +800,6 @@ msgstr ""
 "\n"
 "Selles vaates kirjed puuduvad."
 
-msgid "Adapter"
-msgstr "Adapter"
-
 msgid "Work Email"
 msgstr "Töö e-post"
 
@@ -892,12 +809,6 @@ msgstr "Kodune e-post"
 msgid "Other Email"
 msgstr "Muu e-post"
 
-msgid "Selected"
-msgstr "Valitud"
-
-msgid "Has Cursor"
-msgstr "On fookuses"
-
 msgid "evolution address book"
 msgstr "Evolutioni aadressiraamat"
 
@@ -980,8 +891,6 @@ msgid "Web Log"
 msgstr "Veebilogi"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
@@ -1207,6 +1116,12 @@ msgstr "vKaart (.vcf, .gcrd)"
 msgid "Evolution vCard Importer"
 msgstr "Evolutioni vKaardi importija"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#, c-format
+msgid "Page %d"
+msgstr "Lehekülg %d"
+
 msgid "Can not open file"
 msgstr "Faili pole võimalik avada"
 
@@ -1289,16 +1204,24 @@ msgstr ""
 "Kalendriallikas '{0}' on kirjutuskaitsega ja seda pole võimalik muuta. Palun "
 "vali kalender, mis võimaldab sündmuseid sisestada."
 
+#, fuzzy
+#| msgid ""
+#| "Adding a meaningful summary to your appointment will give your recipients "
+#| "an idea of what your appointment is about."
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 msgstr ""
 "Sündmusele mõtestatud kokkuvõtte lisamine annab adressaatidele aimu sündmuse "
 "sisu kohta."
 
+#, fuzzy
+#| msgid ""
+#| "Adding a meaningful summary to your task will give your recipients an "
+#| "idea of what your task is about."
 msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr ""
 "Ülesandele mõtestatud kokkuvõtte lisamine annab adressaatidele aimu ülesande "
 "sisu kohta."
@@ -1383,20 +1306,21 @@ msgstr "Kas soovid kustutada selle märkme?"
 msgid "Are you sure you want to delete this task?"
 msgstr "Kas soovid kustutada selle ülesande?"
 
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Kas oled kindel, et soovid salvestada selle märkme ilma kokkuvõtteta?"
-
-msgid "Are you sure you want to send the appointment without a summary?"
+#, fuzzy
+#| msgid "Are you sure you want to send the appointment without a summary?"
+msgid "Are you sure you want to save the appointment without a summary?"
 msgstr ""
 "Kas oled kindel, et soovid salvestada selle sündmuse ilma kokkuvõtteta?"
 
-msgid "Are you sure you want to send the task without a summary?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Kas oled kindel, et soovid salvestada selle märkme ilma kokkuvõtteta?"
+
+#, fuzzy
+#| msgid "Are you sure you want to send the task without a summary?"
+msgid "Are you sure you want to save the task without a summary?"
 msgstr ""
 "Kas oled kindel, et soovid salvestada selle ülesande ilma kokkuvõtteta?"
 
-msgid "Calendar repository is offline."
-msgstr "Kalendrihoidla pole võrku ühendatud."
-
 msgid "Cannot create a new event"
 msgstr "Uut sündmust pole võimalik luua"
 
@@ -1446,10 +1370,6 @@ msgstr "Viga märkmeloendi laadimisel"
 msgid "Error loading task list"
 msgstr "Viga ülesandeloendi laadimisel"
 
-#. For Translators: {0} is specify the backend server
-msgid "Error on '{0}'"
-msgstr "Viga toimingul '{0}'"
-
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -1471,9 +1391,6 @@ msgstr ""
 "Kui sa ei saada tühistamisteadet, siis ülejäänud osalised võivad selle "
 "ülesande kustutamisest mitte teada saada."
 
-msgid "No response from the server."
-msgstr "Serverist ei tulnud vastust."
-
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -1536,9 +1453,6 @@ msgstr "See märkmeloend eemaldatakse jäädavalt."
 msgid "This task list will be removed permanently."
 msgstr "See ülesandeloend eemaldatakse jäädavalt."
 
-msgid "Unable to load the calendar"
-msgstr "Kalendrit pole võimalik laadida"
-
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Kas soovid selle sündmuse muudatused salvestada?"
 
@@ -1614,9 +1528,6 @@ msgstr "Saa_da"
 msgid "_Send Notice"
 msgstr "Saada _teavitus"
 
-msgid "{0}."
-msgstr "{0}."
-
 msgid "Split Multi-Day Events:"
 msgstr "Mitmepäevaste sündmuste osadeks jagamine:"
 
@@ -1682,6 +1593,7 @@ msgstr "tundi"
 msgid "location of appointment"
 msgstr "sündmuse asukoht"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 msgid "minutes"
 msgstr "minutit"
 
@@ -2342,12 +2254,14 @@ msgstr "päev(a)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 msgid "days"
 msgstr "päeva"
 
 msgid "end of appointment"
 msgstr "sündmuse lõpp"
 
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
 msgid "extra times every"
 msgstr "korda vahemikuga"
 
@@ -2380,10 +2294,14 @@ msgstr "Vali..."
 msgid "Selected Calendars for Alarms"
 msgstr "Alarmidele valitud kalendrid"
 
-msgid "Time and date:"
+#, fuzzy
+#| msgid "Time and date:"
+msgid "Ti_me and date:"
 msgstr "Kuupäev ja kellaaeg:"
 
-msgid "Date only:"
+#, fuzzy
+#| msgid "Date only:"
+msgid "_Date only:"
 msgstr "Ainult kuupäev:"
 
 #, no-c-format
@@ -2455,6 +2373,7 @@ msgstr "Puudub"
 msgid "Pick a color"
 msgstr "Värvuse valimine"
 
+#. Sunday
 msgid "S_un"
 msgstr "_P"
 
@@ -2470,9 +2389,11 @@ msgstr "_Teine ajavöönd:"
 msgid "Select the calendars for alarm notification"
 msgstr "Alarmmärguannetega kalendrite valimine"
 
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
 msgid "Sh_ow a reminder"
 msgstr "_Meeldetuletusi näidatakse"
 
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
 msgid "Show a _reminder"
 msgstr "_Meeldetuletusi näidatakse"
 
@@ -2488,6 +2409,7 @@ msgstr "Pühapäev"
 msgid "T_asks due today:"
 msgstr "_Tänase tähtajaga ülesanded:"
 
+#. Thursday
 msgid "T_hu"
 msgstr "_N"
 
@@ -2518,6 +2440,7 @@ msgstr "Näidatakse _süsteemi ajavööndit"
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
+#. A weekday like "Monday" follows
 msgid "Wee_k starts on:"
 msgstr "Nä_dala algus:"
 
@@ -2542,18 +2465,21 @@ msgstr "Nädalalõppe kuvatakse kokkusurutud _vormis"
 msgid "_Day begins:"
 msgstr "Päev al_gab:"
 
+#. Friday
 msgid "_Fri"
 msgstr "_R"
 
 msgid "_Hide completed tasks after"
 msgstr "Täidetud ülesanded _peidetakse pärast"
 
+#. Monday
 msgid "_Mon"
 msgstr "_E"
 
 msgid "_Overdue tasks:"
 msgstr "Tä_htaja ületanud ülesanded:"
 
+#. Saturday
 msgid "_Sat"
 msgstr "_L"
 
@@ -2563,15 +2489,19 @@ msgstr "Nädala ja kuu vaadetel näidatakse sündmuste _lõpuaegu"
 msgid "_Time divisions:"
 msgstr "Aeg _jaotatakse:"
 
+#. Tuesday
 msgid "_Tue"
 msgstr "_T"
 
+#. Wednesday
 msgid "_Wed"
 msgstr "_K"
 
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
 msgid "before every anniversary/birthday"
 msgstr "enne aasta-/sünnipäeva"
 
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
 msgid "before every appointment"
 msgstr "enne iga sündmuse algust"
 
@@ -2662,21 +2592,6 @@ msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 msgid "Validation error: %s"
 msgstr "Valideerimisviga: %s"
 
-msgid " to "
-msgstr " kuni "
-
-msgid " (Completed "
-msgstr " (Täidetud "
-
-msgid "Completed "
-msgstr "Täidetud"
-
-msgid " (Due "
-msgstr " (Tähtaeg "
-
-msgid "Due "
-msgstr "Tähtaeg "
-
 msgid "Could not save attachments"
 msgstr "Manuseid pole võimalik salvestada"
 
@@ -2845,6 +2760,11 @@ msgstr "Sihtkoht on kirjutuskaitsega"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Kas kustutada see kirje kõigi teiste adressaatide kirjakastidest?"
 
+#, fuzzy
+#| msgid "P_ercent complete:"
+msgid "_Retract comment"
+msgstr "Täitmis_protsent"
+
 msgid "The event could not be deleted due to a corba error"
 msgstr "Seda sündmust pole võimalik corba vea tõttu kustutada"
 
@@ -2929,6 +2849,9 @@ msgstr "Osalejate vaba/hõivatud andmete pärimine"
 msgid "Appoint_ment"
 msgstr "Sünd_mus"
 
+msgid "Print this event"
+msgstr "Valitud sündmuse printimine"
+
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "Sündmust pole võimalik muuta, kuna valitud kalender on kirjutuskaitsega"
@@ -3025,7 +2948,7 @@ msgstr "1 tund enne sündmust"
 msgid "15 minutes before appointment"
 msgstr "15 minut enne sündmust"
 
-msgid "Attendee_s..."
+msgid "Atte_ndees..."
 msgstr "_Osalejad..."
 
 msgid "Attendees"
@@ -3037,9 +2960,6 @@ msgstr "Kohandatud alarm:"
 msgid "Event Description"
 msgstr "Sündmuse kirjeldus"
 
-msgid "Su_mmary:"
-msgstr "Kokkuvõt_e:"
-
 msgid "_Alarm"
 msgstr "_Alarm"
 
@@ -3049,6 +2969,9 @@ msgstr "_Kirjeldus:"
 msgid "_Location:"
 msgstr "Asuko_ht:"
 
+msgid "_Summary:"
+msgstr "_Kokkuvõte:"
+
 msgid "_Time:"
 msgstr "Ae_g:"
 
@@ -3061,6 +2984,9 @@ msgstr "kuni"
 msgid "Memo"
 msgstr "Märge"
 
+msgid "Print this memo"
+msgstr "Valitud märkme printimine"
+
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 "Märget pole võimalik muuta, kuna valitud märkmeloend on kirjutuskaitsega"
@@ -3078,6 +3004,9 @@ msgstr "Kellele"
 msgid "Sta_rt date:"
 msgstr "_Algusaeg:"
 
+msgid "Su_mmary:"
+msgstr "Kokkuvõt_e:"
+
 msgid "T_o:"
 msgstr "_Kellele:"
 
@@ -3324,6 +3253,9 @@ msgstr "_Ãœlesanne"
 msgid "Task Details"
 msgstr "Ülesande üksikasjad"
 
+msgid "Print this task"
+msgstr "Valitud ülesande printimine"
+
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "Ülesannet pole võimalik muuta, kuna valitud ülesandeloend on kirjutuskaitsega"
@@ -3342,9 +3274,6 @@ msgstr "Tähtaja kuupäev on vale"
 msgid "Unable to open tasks in '%s'."
 msgstr "Ülesandeid pole võimalik '%s'-s avada."
 
-msgid "Atte_ndees..."
-msgstr "_Osalejad..."
-
 msgid "Categor_ies..."
 msgstr "Kate_gooriad..."
 
@@ -3485,15 +3414,6 @@ msgstr "Jah"
 msgid "No"
 msgstr "Ei"
 
-msgid "Default Client"
-msgstr "Vaikimisi klient"
-
-msgid "Shell Settings"
-msgstr "Kesta sätted"
-
-msgid "Application-wide settings"
-msgstr "Rakendust hõlmavad sätted"
-
 #. This is the default filename used for temporary file creation
 msgid "Unknown"
 msgstr "Tundmatu"
@@ -3654,6 +3574,9 @@ msgstr "pl"
 msgid "Week %d"
 msgstr "%d. nädal"
 
+msgid "Recurring:"
+msgstr "Korduv:"
+
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jah. (keeruline kordumine)"
 
@@ -3730,9 +3653,13 @@ msgstr "iKalendri viga"
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
+#, fuzzy
+#| msgid ""
+#| "<br> Please review the following information, and then select an action "
+#| "from the menu below."
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+"Please review the following information, and then select an action from the "
+"menu below."
 msgstr ""
 "<br> Palun vaata järgnev info üle ja vali alumisest menüüst  sobilik tegevus."
 
@@ -3756,102 +3683,102 @@ msgstr ""
 "Ülesanne on tühistatud, kuid seda pole sinu ülesannete hulgast võimalik leida"
 
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> avaldas koosoleku andmed."
+msgid "%s has published meeting information."
+msgstr "%s avaldas koosoleku andmed."
 
 msgid "Meeting Information"
 msgstr "Koosoleku andmed"
 
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> soovib, et koosolekul osaleks ka %s."
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s soovib, et koosolekul osaleks ka %s."
 
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> soovib, et sa osaleksid koosolekul."
+msgid "%s requests your presence at a meeting."
+msgstr "%s soovib, et sa osaleksid koosolekul."
 
 msgid "Meeting Proposal"
 msgstr "Koosoleku ettepanek"
 
 #. FIXME Whats going on here?
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> soovib liituda olemasoleva koosolekuga."
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s soovib liituda olemasoleva koosolekuga."
 
 msgid "Meeting Update"
 msgstr "Koosoleku info uuendus"
 
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> soovib saada värskemaid andmeid koosoleku kohta."
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s soovib saada värskemaid andmeid koosoleku kohta."
 
 msgid "Meeting Update Request"
 msgstr "Soov muuta koosolekut"
 
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> vastas koosoleku soovile."
+msgid "%s has replied to a meeting request."
+msgstr "%s vastas koosoleku soovile."
 
 msgid "Meeting Reply"
 msgstr "Koosoleku vastus"
 
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> tühistas koosoleku."
+msgid "%s has canceled a meeting."
+msgstr "%s tühistas koosoleku."
 
 msgid "Meeting Cancelation"
 msgstr "Koosoleku tühistamine"
 
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> saatis arusaamatu sõnumi."
+msgid "%s has sent an unintelligible message."
+msgstr "%s saatis arusaamatu sõnumi."
 
 msgid "Bad Meeting Message"
 msgstr "Vigane koosoleku sõnum"
 
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> avaldas ülesande andmed."
+msgid "%s has published task information."
+msgstr "%s avaldas ülesande andmed."
 
 msgid "Task Information"
 msgstr "Ãœlesande andmed"
 
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> soovib, et %s täidaks ülesande."
+msgid "%s requests %s to perform a task."
+msgstr "%s soovib, et %s täidaks ülesande."
 
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> soovib, et sa täidaksid ülesande."
+msgid "%s requests you perform a task."
+msgstr "%s soovib, et sa täidaksid ülesande."
 
 msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
 #. FIXME Whats going on here?
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> soovib liituda olemasoleva ülesandega."
+msgid "%s wishes to be added to an existing task."
+msgstr "%s soovib liituda olemasoleva ülesandega."
 
 msgid "Task Update"
 msgstr "Ãœlesande uuendus"
 
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> soovib saada värskemaid andmeid ülesande kohta."
+msgid "%s wishes to receive the latest task information."
+msgstr "%s soovib saada värskemaid andmeid ülesande kohta."
 
 msgid "Task Update Request"
 msgstr "Soov muuta ülesannet"
 
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> vastas ülesande täitjaks määramisele."
+msgid "%s has replied to a task assignment."
+msgstr "%s vastas ülesande täitjaks määramisele."
 
 msgid "Task Reply"
 msgstr "Ãœlesande vastus"
 
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> tühistas ülesande."
+msgid "%s has canceled a task."
+msgstr "%s tühistas ülesande."
 
 msgid "Task Cancelation"
 msgstr "Ülesande tühistamine"
@@ -3860,22 +3787,22 @@ msgid "Bad Task Message"
 msgstr "Vigane ülesande sõnum"
 
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> avaldas vaba/hõivatud andmed."
+msgid "%s has published free/busy information."
+msgstr "%s avaldas vaba/hõivatud andmed."
 
 msgid "Free/Busy Information"
 msgstr "Vaba/hõivatud andmed"
 
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> soovib saada sinu vaba/hõivatud andmeid."
+msgid "%s requests your free/busy information."
+msgstr "%s soovib saada sinu vaba/hõivatud andmeid."
 
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/hõivatud teavet"
 
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> vastas vaba/hõivatud päringule."
+msgid "%s has replied to a free/busy request."
+msgstr "%s vastas vaba/hõivatud päringule."
 
 msgid "Free/Busy Reply"
 msgstr "Vaba/hõivatud vastus"
@@ -4041,9 +3968,6 @@ msgstr "Kontorist väljas"
 msgid "No Information"
 msgstr "Andmed puuduvad"
 
-msgid "A_ttendees..."
-msgstr "_Osalejad..."
-
 msgid "O_ptions"
 msgstr "_Valikud"
 
@@ -4107,9 +4031,11 @@ msgstr "Märkmed"
 msgid "* No Summary *"
 msgstr "* Kokkuvõte puudub *"
 
+#. Translators: This is followed by an event's start date/time
 msgid "Start: "
 msgstr "Algus: "
 
+#. Translators: This is followed by an event's due date/time
 msgid "Due: "
 msgstr "Tähtaeg: "
 
@@ -4131,38 +4057,13 @@ msgstr "Kõigi nähtavate märkmete valimine"
 msgid "Click to add a memo"
 msgstr "Märkme lisamiseks klõpsa siia"
 
-msgid "0%"
-msgstr "0%"
-
-msgid "10%"
-msgstr "10%"
-
-msgid "20%"
-msgstr "20%"
-
-msgid "30%"
-msgstr "30%"
-
-msgid "40%"
-msgstr "40%"
-
-msgid "50%"
-msgstr "50%"
-
-msgid "60%"
-msgstr "60%"
-
-msgid "70%"
-msgstr "70%"
-
-msgid "80%"
-msgstr "80%"
-
-msgid "90%"
-msgstr "90%"
-
-msgid "100%"
-msgstr "100%"
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
 msgid "Tasks"
 msgstr "Ãœlesanded"
@@ -4333,12 +4234,12 @@ msgstr "Oktoober"
 msgid "Select Date"
 msgstr "Kuupäeva valimine"
 
+msgid "Select _Today"
+msgstr "Vali _tänane kuupäev"
+
 msgid "September"
 msgstr "September"
 
-msgid "_Select Today"
-msgstr "_Vali tänane kuupäev"
-
 msgid "An organizer must be set."
 msgstr "Korraldaja peab olema määratud."
 
@@ -4554,6 +4455,33 @@ msgstr "R"
 msgid "Sa"
 msgstr "L"
 
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+msgid " to "
+msgstr " kuni "
+
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+msgid " (Completed "
+msgstr " (Täidetud "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+msgid "Completed "
+msgstr "Täidetud"
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+msgid " (Due "
+msgstr " (Tähtaeg "
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+msgid "Due "
+msgstr "Tähtaeg "
+
 msgid "Appointment"
 msgstr "Sündmus"
 
@@ -4633,6 +4561,119 @@ msgstr "Kalendrisündmused"
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolutioni intelligentne kalendriimportija"
 
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "Koosolek"
+
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "Sündmus"
+
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Ãœlesanne"
+
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Märge"
+
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "kordub"
+
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr ""
+
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "on alarmidega"
+
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "on manustega"
+
+#. Translators: Appointment's classification
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "Avalik"
+
+#. Translators: Appointment's classification
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Isiklik"
+
+#. Translators: Appointment's classification
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Salajane"
+
+#. Translators: Appointment's classification section name
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "Liigitus"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Kokkuvõte"
+
+#. Translators: Appointment's location
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "Asukoht"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "Algus"
+
+#. Translators: 'Due' like the time due a task should be finished
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "Tähtaeg"
+
+#. Translators: Appointment's end time
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Lõpp"
+
+#. Translators: Appointment's categories
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "Kategooriad"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Täidetud"
+
+#. Translators: Appointment's URL
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Korraldaja"
+
+#. Translators: Appointment's attendees
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Osalejad"
+
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Kirjeldus"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Liik"
+
 #.
 #. *
 #. * This program is free software; you can redistribute it and/or
@@ -6014,9 +6055,11 @@ msgstr "Ei suudetud taastada sõnumit automaatsalvestusfailist"
 msgid "Compose Message"
 msgstr "Sõnumi koostamine"
 
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#, fuzzy
+#| msgid ""
+#| "<b>(The composer contains a non-text message body, which cannot be "
+#| "edited.)</b>"
+msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "<b>(Redaktor sisaldab mittetekstilist sõnumit, mida pole võimalik muuta.)</b>"
 
@@ -6080,8 +6123,8 @@ msgstr ""
 "Evolution lõpetas ootamatult uue sõnumi koostamise ajal. Sõnumi taastamine "
 "võimaldab jätkata sealt, kuhu pooleli jäid."
 
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "Fail `{0}' ei ole tavaline fail ja seda pole võimalik sõnumiga saata."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr "Fail '{0}' ei ole tavaline fail ja seda pole võimalik sõnumiga saata."
 
 msgid ""
 "Unable to activate the HTML editor control.\n"
@@ -6097,7 +6140,9 @@ msgstr ""
 msgid "Unable to activate the address selector control."
 msgstr "Aadressi valimise juhtimist pole võimalik aktiveerida."
 
-msgid "You cannot attach the file `{0}' to this message."
+#, fuzzy
+#| msgid "You cannot attach the file `{0}' to this message."
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "Sul pole võimalik sellele sõnumile faili `{0}' manustada."
 
 msgid "You need to configure an account before you can compose mail."
@@ -6140,8 +6185,8 @@ msgstr "Palun sisesta enda meiliaadress."
 msgid "The email address you have entered is invalid."
 msgstr "Sisestatud meiliaadress ei ole korrektne."
 
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Isiklikud üksikasjad:</span>"
+msgid "Personal details:"
+msgstr "Isiklikud üksikasjad:"
 
 msgid "Name:"
 msgstr "Nimi:"
@@ -6149,8 +6194,8 @@ msgstr "Nimi:"
 msgid "Email address:"
 msgstr "E-posti aadress:"
 
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Vastuvõtmise üksikasjad:</span>"
+msgid "Receiving details:"
+msgstr "Vastuvõtmise üksikasjad:"
 
 msgid "Server type:"
 msgstr "Serveri liik:"
@@ -6167,8 +6212,8 @@ msgstr "Kasutatav krüptimine:"
 msgid "never"
 msgstr "mitte kunagi"
 
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Saatmise üksikasjad:</span>"
+msgid "Sending details:"
+msgstr "Saatmise üksikasjad:"
 
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
@@ -6214,8 +6259,6 @@ msgstr "Identiteet"
 msgid "Next - Receiving mail"
 msgstr "Edasi - e-posti  vastuvõtmine"
 
-#, fuzzy
-#| msgid "Receiving Email"
 msgid "Receiving mail"
 msgstr "E-posti vastuvõtmine"
 
@@ -6228,16 +6271,12 @@ msgstr "Tagasi - identiteet"
 msgid "Next - Receiving options"
 msgstr "Edasi - vastuvõtmise valikud"
 
-#, fuzzy
-#| msgid "Receiving Options"
 msgid "Receiving options"
 msgstr "Vastuvõtmise valikud"
 
 msgid "Back - Receiving mail"
 msgstr "Tagasi - e-posti vastuvõtmine"
 
-#, fuzzy
-#| msgid "Sending Email"
 msgid "Sending mail"
 msgstr "Kirjade saatmine"
 
@@ -6271,8 +6310,6 @@ msgstr "Saki sulgemine"
 msgid "Account Wizard"
 msgstr "Konto nõustaja"
 
-#, fuzzy
-#| msgid "Evolution Account Assistant"
 msgid "Evolution account assistant"
 msgstr "Evolutioni kontoabiline"
 
@@ -6286,8 +6323,8 @@ msgstr "Muuda"
 msgid "Add a new account"
 msgstr "Uue konto lisamine"
 
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Kontohaldus</span>"
+msgid "Account management"
+msgstr "Kontohaldus"
 
 msgid "Settings"
 msgstr "Sätted"
@@ -6295,7 +6332,6 @@ msgstr "Sätted"
 msgid "Calendar event notifications"
 msgstr "Kalendrisündmuste märguanded"
 
-#, fuzzy
 msgid "Evolution Alarm Notify"
 msgstr "Evolutioni äratuse märguanne"
 
@@ -6389,15 +6425,19 @@ msgstr "Lääne-Euroopa"
 msgid "Western European, New"
 msgstr "Lääne-Euroopa, uus"
 
+#. Translators: Character set "Chinese, Traditional"
 msgid "Traditional"
 msgstr "Traditsiooniline"
 
+#. Translators: Character set "Chinese, Simplified"
 msgid "Simplified"
 msgstr "Lihtsustatud"
 
+#. Translators: Character set "Cyrillic, Ukrainian"
 msgid "Ukrainian"
 msgstr "Ukraina"
 
+#. Translators: Character set "Hebrew, Visual"
 msgid "Visual"
 msgstr "Visuaalne"
 
@@ -6412,13 +6452,19 @@ msgstr "Homme"
 msgid "Yesterday"
 msgstr "Eile"
 
+#. Translators: %d is replaced with a number of days. It's always greater than 1
 #, c-format
-msgid "%d days from now"
-msgstr "%d päeva alates praegusest"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "%d päev alates praegusest"
+msgstr[1] "%d päeva alates praegusest"
 
+#. Translators: %d is replaced with a number of days. It's always greater than 1
 #, c-format
-msgid "%d days ago"
-msgstr "%d päeva tagasi"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d päev tagasi"
+msgstr[1] "%d päeva tagasi"
 
 msgid "Use locale default"
 msgstr "Kasutatakse lokaadi vaikeväärtuseid"
@@ -6440,15 +6486,6 @@ msgstr "\"%s\" kirjutamine"
 msgid "Writing \"%s\" to %s"
 msgstr "\"%s\" kirjutamine kohta %s"
 
-msgid "Name of the logger"
-msgstr "Logiva komponendi nimi"
-
-msgid "Filename"
-msgstr "Failinimi"
-
-msgid "The filename of the module"
-msgstr "Mooduli failinimi"
-
 msgid "Debug Logs"
 msgstr "Silumislogid"
 
@@ -6487,12 +6524,6 @@ msgstr "Silumine"
 msgid "Error, Warnings and Debug messages"
 msgstr "Vea-, hoiatus- ja silumisteated"
 
-msgid "Enabled"
-msgstr "Lubatud"
-
-msgid "Whether the plugin is enabled"
-msgstr "Kas plugin on lubatud või mitte"
-
 msgid "weeks"
 msgstr "nädalat"
 
@@ -6845,20 +6876,8 @@ msgstr "Ikoonivaade"
 msgid "List View"
 msgstr "Loeteluvaade"
 
-msgid "Focus Tracker"
-msgstr ""
-
-msgid "Shell Module"
-msgstr "Kesta moodul"
-
-msgid "The mail shell backend"
-msgstr "Meilikesta taustprogramm"
-
-msgid "Show Deleted"
-msgstr "Kustutatuid näidatakse"
-
-msgid "Show deleted messages"
-msgstr "Kustutatud sõnumite kuvamine"
+msgid "(No Subject)"
+msgstr "(Teema puudub)"
 
 msgid "_Add to Address Book..."
 msgstr "_Lisa aadressiraamatusse..."
@@ -6910,6 +6929,9 @@ msgstr ""
 msgid "Color"
 msgstr "Värvus"
 
+msgid "Name"
+msgstr "Nimi"
+
 msgid "Inbox"
 msgstr "Saabuvad"
 
@@ -6925,17 +6947,6 @@ msgstr "Saadetud"
 msgid "Templates"
 msgstr "Mallid"
 
-msgid "Important"
-msgstr "Tähtis"
-
-#. green
-msgid "To Do"
-msgstr "Ãœlesanne"
-
-#. blue
-msgid "Later"
-msgstr "Hiljem"
-
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
@@ -6946,49 +6957,10 @@ msgstr "Siirdamine"
 msgid "Migrating '%s':"
 msgstr "Siirdamine '%s':"
 
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Uut kataloogi `%s' pole võimalik luua: %s"
-
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Kausta `%s' pole võimalik kopeerida `%s': %s"
-
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Olemasolevaid postkaste asukohas '%s' pole võimalik läbi vaadata: %s"
-
 msgid "Migrating Folders"
 msgstr "Kaustade siirdamine"
 
 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 ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
-"versioonist muutunud.\n"
-"\n"
-"Palun oota, kuni Evolution siirdab sinu kaustu..."
-
-#, 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"
-
-#, 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"
-
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "POP3 hoia-serveris `%s' andmeid pole võimalik kopeerida: %s"
-
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Tõrge kohapealse postisalvesti `%s' loomisel: %s"
-
-msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
 "\n"
@@ -6999,18 +6971,11 @@ msgstr ""
 "\n"
 "Palun oota, kuni Evolution siirdab sinu kaustu..."
 
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
+#, fuzzy, c-format
+#| msgid "Unable to create local mail folders at `%s': %s"
+msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Kohalikku postikausta pole võimalik asukohas `%s' luua: %s"
 
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Eelmisest Evolutioni paigaldusest pole võimalik sätteid lugeda, `evolution/"
-"configxmldb' pole olemas või on see rikutud."
-
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
@@ -7670,6 +7635,9 @@ msgstr "Jälgimislipp"
 msgid "Forward to"
 msgstr "Edasta aadressile"
 
+msgid "Important"
+msgstr "Tähtis"
+
 msgid "is after"
 msgstr "on pärast"
 
@@ -7896,8 +7864,8 @@ msgid "Copy Folder To"
 msgstr "Kausta kopeerimine kohta"
 
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "Kataloogi `%s' loomine"
+msgid "Creating folder '%s'"
+msgstr "Kataloogi '%s' loomine"
 
 msgid "Create Folder"
 msgstr "Kausta loomine"
@@ -8045,8 +8013,8 @@ msgid "Formatting Message..."
 msgstr "Sõnumi vormindamine..."
 
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "`%s' tõmbamine"
+msgid "Retrieving '%s'"
+msgstr "'%s' tõmbamine"
 
 msgid "Unknown external-body part."
 msgstr "Tundmatu väliskeha (external-body) osa."
@@ -8076,9 +8044,9 @@ msgstr "Viide tundmatutele välistele andmetele (tüüp \"%s\")"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#.
-#, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+#, fuzzy, c-format
+#| msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgid "This message was sent by %s on behalf of %s"
 msgstr "Selle sõnumi on <b>%2$s</b> nimel saatnud <b>%1$s</b>"
 
 msgid "This store does not support subscriptions, or they are not enabled."
@@ -8097,10 +8065,24 @@ msgstr "Palun vali server."
 msgid "No server has been selected"
 msgstr "Serverit ei ole valitud"
 
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#, fuzzy, c-format
+#| msgid "Are you sure you want to open {0} messages at once?"
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "Kas oled kindel, et soovid korraga avada {0} sõnumit?"
+msgstr[1] "Kas oled kindel, et soovid korraga avada {0} sõnumit?"
+
+#, fuzzy
+#| msgid "_Do not show this message again."
+msgid "_Do not show this message again"
+msgstr "Seda teadet enam _uuesti mitte näidata."
+
 msgid "Message Filters"
 msgstr "Sõnumifiltrid"
 
-#. Drop filename for messages from a mailbox
 #, c-format
 msgid "Messages from %s"
 msgstr "Sõnumid postkastist %s"
@@ -8138,9 +8120,6 @@ msgstr "\"Posti saatmise ja vastuvõtmise\" maksimeerimise olek"
 msgid "\"Send and Receive Mail\" window width"
 msgstr "\"Posti saatmise ja vastuvõtmise\" akna laius"
 
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Piiratud suurusega tekstiosa kuvamise lubamine"
-
 msgid "Always request read receipt"
 msgstr "Lugemiskinnitust küsitakse alati"
 
@@ -8284,6 +8263,9 @@ msgstr "Meilikomponentide failide salvestamise kataloog."
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+
 msgid "Do not add signature delimiter"
 msgstr "Signatuuri eraldajat ei lisata"
 
@@ -8343,8 +8325,10 @@ msgstr ""
 "Selle märkimisega lubatakse sõnumi eelvaates, sõnumite nimekirjas ja "
 "kataloogides kasutada tühikuklahvi kuva edasikerimiseks."
 
-msgid "Enable to render message text part of limited size."
-msgstr "Piiratud suurusega tekstiosa kuvamise lubamine."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
 
 msgid "Enable/disable caret mode"
 msgstr "Kursorirežiimi lubamine/keelamine"
@@ -8476,10 +8460,14 @@ msgstr ""
 "kustutamine kustutab sõnumid jäädavalt, mitte ei eemalda neid "
 "otsingutulemuste seast."
 
-msgid "Last time empty junk was run"
+#, fuzzy
+#| msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
 msgstr "Viimane kord, kui rämpsukausta tühjendati"
 
-msgid "Last time empty trash was run"
+#, fuzzy
+#| msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
 msgstr "Viimane kord, kui prügikasti tühjendati"
 
 msgid "Layout style"
@@ -8568,6 +8556,11 @@ msgstr "Tsitaatide märkimine sõnumi eelvaates"
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Tsitaatide märkimine sõnumi eelvaates."
 
+#, fuzzy
+#| msgid "Message Display"
+msgid "Message text limit for display"
+msgstr "Sõnumi kuva"
+
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Sõnumi kuvamise laad (\"normal\" - [tavaline], \"full headers\" - [kõik "
@@ -8794,16 +8787,19 @@ msgstr "Tellimisdialoogi vaikimisi laius"
 msgid "Terminal font"
 msgstr "Terminali kirjatüüp"
 
-msgid "Text message part limit"
-msgstr "Sõnumi tekstiosa piirang"
-
 msgid "The default plugin for Junk hook"
 msgstr "Vaikimisi plugin rämpsposti käsitlemiseks"
 
-msgid "The last time empty junk was run, in days since the epoch."
+#, fuzzy
+#| msgid "The last time empty junk was run, in days since the epoch."
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimane rämpsukausta tühjendamise aeg päevades alates epohhi algusest."
 
-msgid "The last time empty trash was run, in days since the epoch."
+#, fuzzy
+#| msgid "The last time empty trash was run, in days since the epoch."
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimane prügikasti tühjendamise aeg päevades alates epohhi algusest."
 
 msgid ""
@@ -8829,9 +8825,14 @@ msgstr ""
 "Siin on kolm võimalikku väärtust. \"0\" vigade jaoks, \"1\" hoiatuste jaoks "
 "ja \"2\" silumisteadete jaoks."
 
+#, fuzzy
+#| msgid ""
+#| "This decides the max size of the text part that can be formatted under "
+#| "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
 "Selle alusel otsustatakse Evolutioni abil vormindatava sõnumi tekstiosa "
 "suurim suurus. Väärtus määratakse kilobaitides ja vaikimisi on selleks 4MB / "
@@ -8990,8 +8991,8 @@ msgstr "Evolutioni Elmi importija"
 msgid "Import mail from Elm."
 msgstr "Postkasti importimine programmist Elm."
 
-msgid "Destination folder:"
-msgstr "Sihtkataloog:"
+msgid "_Destination folder:"
+msgstr "_Sihtkaust:"
 
 msgid "Select folder"
 msgstr "Kausta valimine"
@@ -8999,6 +9000,16 @@ msgstr "Kausta valimine"
 msgid "Select folder to import into"
 msgstr "Vali kaust, kuhu importida"
 
+#. Translators: Column header for a message subject
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Teema"
+
+#. Translators: Column header for a message From address
+msgctxt "mboxImp"
+msgid "From"
+msgstr "Saatja"
+
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley postkast (mbox)"
 
@@ -9010,7 +9021,7 @@ msgstr "Postkasti importimine"
 
 #. Destination folder, was set in our widget
 #, c-format
-msgid "Importing `%s'"
+msgid "Importing '%s'"
 msgstr "'%s' importimine"
 
 #, c-format
@@ -9048,12 +9059,29 @@ msgstr "%s postiloend"
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
+msgid "(Not Recommended)"
+msgstr "(pole soovitatav)"
+
 msgid "(Note: Requires restart of the application)"
 msgstr "(Märkus: rakendus tuleb taaskäivitada)"
 
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>Vastus kirja päises</b> (pole soovitatav)"
-
 msgid "Account Information"
 msgstr "Konto andmed"
 
@@ -9138,10 +9166,12 @@ msgstr "Lõpetamisel _kustutatakse rämpspost"
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Väljuvate sõnumite _digitaalne allkirjastamine (vaikimisi)"
 
-msgid "Displayed Message _Headers"
-msgstr "Kuvatavad sõnumi _päised"
+msgid "Displayed Message Headers"
+msgstr "Kuvatavad sõnumi päised"
 
-msgid "Do not format messages when text si_ze exceeds"
+#, fuzzy
+#| msgid "Do not format messages when text si_ze exceeds"
+msgid "Do not display messages when text si_ze exceeds"
 msgstr "Sõnumite tekstiosa ei vo_rmindata, kui selle suurus ületab"
 
 msgid "Do not mar_k messages as junk if sender is in my address book"
@@ -9284,6 +9314,18 @@ msgstr "Parool jäetakse _meelde"
 msgid "Required Information"
 msgstr "Nõutud andmed"
 
+msgid "SHA1"
+msgstr "SHA1"
+
+msgid "SHA256"
+msgstr "SHA256"
+
+msgid "SHA384"
+msgstr "SHA384"
+
+msgid "SHA512"
+msgstr "SHA512"
+
 msgid "SSL is not supported in this build of Evolution"
 msgstr "Käesolev Evolution on ehitatud ilma SSL-i toeta"
 
@@ -9341,6 +9383,11 @@ msgstr "Serveri seadistus"
 msgid "Server _Type:"
 msgstr "Serveri l_iik:"
 
+#, fuzzy
+#| msgid "Sig_ning certificate:"
+msgid "Si_gning algorithm:"
+msgstr "All_kirjastamissertifikaat:"
+
 msgid "Sig_natures"
 msgstr "_Allkirjad"
 
@@ -9353,6 +9400,11 @@ msgstr "All_kiri:"
 msgid "Signatures"
 msgstr "Allkirjad"
 
+#, fuzzy
+#| msgid "Sig_ning certificate:"
+msgid "Signing _algorithm:"
+msgstr "All_kirjastamissertifikaat:"
+
 msgid "Spell Checking"
 msgstr "Õigekirja kontrollimine"
 
@@ -9377,6 +9429,10 @@ msgstr ""
 "Selle skripti väljundit kasutatakse sinu signatuurina.\n"
 "Nimevälja kasutatakse ainult kuvamiseks."
 
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+msgid "Top Posting Option"
+msgstr "Tipp-postituse valik"
+
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -9470,6 +9526,7 @@ msgstr "_Pildianimatsioone näitatakse"
 msgid "_Show the photograph of sender in the message preview"
 msgstr "E-sõnumi eelvaates näidatakse saatja _fotot"
 
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Kellele / koopia / pimekoopia välju vä_hendatakse"
 
@@ -9485,6 +9542,7 @@ msgstr "_Kirjatüüp on sama, mis teistes rakendustes"
 msgid "a"
 msgstr "a"
 
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
 msgid "addresses"
 msgstr "aadressid"
 
@@ -9497,9 +9555,6 @@ msgstr "värvusega"
 msgid "description"
 msgstr "kirjeldus"
 
-msgid "    "
-msgstr "    "
-
 msgid "All active remote folders"
 msgstr "Kõik aktiivsed võrgukaustad"
 
@@ -9515,12 +9570,22 @@ msgstr "Helista"
 msgid "Co_mpleted"
 msgstr "_Valmis"
 
+#, fuzzy
+#| msgid "collapse"
+msgid "Collapse _all"
+msgstr "ahenda"
+
 msgid "Digital Signature"
 msgstr "Digiallkiri"
 
 msgid "Do Not Forward"
 msgstr "Ära edasta"
 
+#, fuzzy
+#| msgid "E_xpand All Threads"
+msgid "E_xpand all"
+msgstr "A_va kõik lõimed"
+
 msgid "Encryption"
 msgstr "Krüpteering"
 
@@ -9551,6 +9616,9 @@ msgstr "Vaata üle"
 msgid "S_erver:"
 msgstr "_Server:"
 
+msgid "S_how only items containing:"
+msgstr ""
+
 msgid "Search Folder Sources"
 msgstr "Otsingukausta allikad"
 
@@ -9594,17 +9662,20 @@ msgstr "E-posti võtmine"
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Tõrge väljundfiltrite rakendamisel: %s"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to append to %s: %s\n"
+#| "Appending to local `Sent' folder instead."
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "Tõrge lisamisel kausta %s: %s\n"
 "Selle asemel lisatakse kohalikku kausta `Saadetud'."
 
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Tõrge lisamisel kohalikku `Saadetud' kausta: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Tõrge lisamisel kohalikku 'Saadetud' kausta: %s"
 
 msgid "Sending message"
 msgstr "Sõnumi saatmine"
@@ -9778,13 +9849,15 @@ msgstr "Sihtaadressi ei määratud, sõnumi edastamine katkestati."
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Ei leitud kontot, mida kasutada, sõnumi edastamine katkestati."
 
-#, c-format
-msgid "Could not create spool directory `%s': %s"
+#, fuzzy, c-format
+#| msgid "Could not create spool directory `%s': %s"
+msgid "Could not create spool directory '%s': %s"
 msgstr "Puhverkataloogi `%s' pole võimalik luua: %s"
 
 # ???
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+#, fuzzy, c-format
+#| msgid "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Movemaili proovimine mitte-mbox allikaga `%s'"
 
 #, c-format
@@ -9795,8 +9868,8 @@ msgid "Forwarded message"
 msgstr "Edastatud sõnum"
 
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "Vigane kaust: `%s'"
+msgid "Invalid folder: '%s'"
+msgstr "Vigane kaust: '%s'"
 
 #, c-format
 msgid "Setting up Search Folder: %s"
@@ -9810,12 +9883,43 @@ msgstr "'%s:%s' otsingukaustade uuendamine"
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' otsingukaustade uuendamine"
 
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "Edit Search Folder"
 msgstr "Otsingukausta muutmine"
 
 msgid "New Search Folder"
 msgstr "Uus otsingukaust"
 
+#, fuzzy
+#| msgid "Check Junk Failed"
+msgid "\"Check Junk\" Failed"
+msgstr "Tõrge rämpsposti kontrollimisel"
+
+#, fuzzy
+#| msgid "Report Junk Failed"
+msgid "\"Report Junk\" Failed"
+msgstr "Tõrge rämpspostist raporteerimisel"
+
+#, fuzzy
+#| msgid "Report Not Junk Failed"
+msgid "\"Report Not Junk\" Failed"
+msgstr "Mitterämpspostist teatamine nurjus"
+
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Kaust nimega \"{0}\" on juba olemas. Palun kasuta teistsugust nime."
 
@@ -9864,9 +9968,6 @@ msgid ""
 msgstr ""
 "Kas soovid keelata selle konto ja kustutada kõik sellega seotud proksid?"
 
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Kas oled kindel, et soovid korraga avada {0} sõnumit?"
-
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -9897,12 +9998,6 @@ msgstr ""
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Kas oled kindel, et soovid selle sõnumi saata ilma pealkirjata?"
 
-msgid "Because \"{0}\"."
-msgstr "Põhjus: \"{0}\"."
-
-msgid "Because \"{2}\"."
-msgstr "Põhjus: \"{2}\"."
-
 msgid "Blank Signature"
 msgstr "Tühi allkiri"
 
@@ -9933,8 +10028,8 @@ msgstr "Otsingukausta \"{0}\" pole võimalik muuta, kuna seda pole olemas."
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kausta \"{0}\" pole võimalik kausta \"{1}\" ümber tõsta."
 
-msgid "Cannot open source \"{1}\""
-msgstr "Allikat \"{1}\" pole võimalik avada"
+msgid "Cannot open source \"{1}\"."
+msgstr "Allikat \"{1}\" pole võimalik avada."
 
 msgid "Cannot open source \"{2}\"."
 msgstr "Allikat \"{2}\" pole võimalik avada."
@@ -9967,9 +10062,6 @@ msgstr "Faili \"{0}\" pole võimalik salvestada."
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Signatuuriskripti \"{0}\" pole võimalik määrata."
 
-msgid "Check Junk Failed"
-msgstr "Tõrge rämpsposti kontrollimisel"
-
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -10015,6 +10107,9 @@ msgstr "Viga filtridefinitsioonide laadimisel."
 msgid "Error while performing operation."
 msgstr "Viga käsu täitmisel."
 
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
 msgid "Error while {0}."
 msgstr "Viga toimingul: {0}."
 
@@ -10027,8 +10122,12 @@ msgstr "Fail on juba olemas, aga see ei ole tavaline fail."
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Kui jätkad, siis neid sõnumeid ei ole võimalik enam taastada."
 
+#, fuzzy
+#| msgid ""
+#| "If you delete the folder, all of its contents and its subfolders contents "
+#| "will be deleted permanently."
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
 "Kui selle kausta kustutad, siis kustuvad jäädavalt ka kõik selles olevad "
@@ -10129,12 +10228,6 @@ msgstr "Kas tõesti kustutada kaust \"{0}\" ja selle kõik alamkaustad?"
 msgid "Really delete folder \"{0}\"?"
 msgstr "Kas tõesti kustutada kaust \"{0}\"?"
 
-msgid "Report Junk Failed"
-msgstr "Tõrge rämpspostist raporteerimisel"
-
-msgid "Report Not Junk Failed"
-msgstr "Mitterämpspostist teatamine nurjus"
-
 msgid "Search Folders automatically updated."
 msgstr "Otsingukaustad automaatselt uuendatud."
 
@@ -10158,6 +10251,7 @@ msgstr ""
 "Süsteemsed kaustad on tarvilikud Evolutioni korrektseks toimimiseks ja neid "
 "pole võimalik ümber nimetada, ümber tõsta või kustutada."
 
+#, fuzzy
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -10166,32 +10260,9 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
-
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Järgnevad otsingukaustad:\n"
-"{0}\n"
-"Kasutasid nüüdseks eemaldatud kausta:\n"
-"    \"{1}\"\n"
-"Otsingukaustad on nüüd uuendatud."
-
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Järgnevad filtreerimisreeglid:\n"
-"{0}\n"
-"Kasutasid nüüdseks eemaldatud kausta:\n"
-"    \"{1}\"\n"
-"Reeglid on nüüd uuendatud."
+"Kontaktiloend, kellele sa saadad, on seadistatud kirja saajaid varjama.\n"
+"\n"
+"Paljud meilisüsteemid lisavad "
 
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
@@ -10244,6 +10315,15 @@ msgstr ""
 "Kõigi valitud kataloogis ja selle alamkataloogides olevate sõnumite "
 "loetuksmärkimine"
 
+#, fuzzy
+#| msgid ""
+#| "This will mark all messages as read in the selected folder and its "
+#| "subfolders."
+msgid "This will mark all messages as read in the selected folder."
+msgstr ""
+"Kõigi valitud kataloogis ja selle alamkataloogides olevate sõnumite "
+"loetuksmärkimine"
+
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise serveriga pole võimalik ühenduda."
 
@@ -10373,9 +10453,6 @@ msgstr "%d. %b %Y"
 msgid "Select all visible messages"
 msgstr "Kõigi peitmata sõnumite valimine"
 
-msgid "Shell Backend"
-msgstr "Kesta taustprogramm"
-
 #. there is some info why the message list is empty, let it be something useful
 msgid "Generating message list"
 msgstr "Sõnumiloendi genereerimine"
@@ -10387,13 +10464,6 @@ msgstr ""
 "Mitte ükski sõnum ei sobi sinu määratud otsikriteeriumitega. Muuda otsingut "
 "või puhasta see menüüst Otsing -> Puhasta."
 
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"Selles kaustas on ainult varjatud sõnumid. Nende nägemiseks vali Vaade -> "
-"Kuva peidetud sõnumeid."
-
 msgid "There are no messages in this folder."
 msgstr "Selles kaustas pole sõnumeid."
 
@@ -10461,7 +10531,9 @@ msgstr ""
 "See valik tähendab, et sinu server ei toeta SSL-i ega TLS-i. Seega pole sinu "
 "ühendus turvaline ja võib olla ohustatud turvaaukudest."
 
-msgid "Use in _Birthday & Anniversaries calendar"
+#, fuzzy
+#| msgid "Use in _Birthday & Anniversaries calendar"
+msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Kasutatakse _sünnipäevade ja aastapäevade kalendris"
 
 msgid "Copy _book content locally for offline operation"
@@ -10575,8 +10647,9 @@ msgstr "Kas sundida meiliaadressi kuvamist koos automaatlõpetatud nimega."
 msgid "Whether to show the preview pane."
 msgstr "Kas kuvada eelvaatluspaani."
 
-msgid "Table column:"
-msgstr "Tabeli veerg:"
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
+msgid "_Table column:"
+msgstr "_Tabeli veerg:"
 
 msgid "Autocompletion"
 msgstr "Automaatlõpetus"
@@ -10613,80 +10686,7 @@ msgstr "Uue aadressiraamatu loomine"
 msgid "Contacts"
 msgstr "Kontaktid"
 
-msgid "Source List"
-msgstr "Allikate loend"
-
-msgid "The registry of address books"
-msgstr "Aadressiraamatute nimekiri"
-
-msgid "Current View"
-msgstr "Käesolev vaade"
-
-msgid "The currently selected address book view"
-msgstr "Praegu valitud aadressiraamatu vaade"
-
-msgid "Previewed Contact"
-msgstr "Eelvaatlusel olev kontakt"
-
-msgid "The contact being shown in the preview pane"
-msgstr "Kontakt, mida kuvatakse eelvaatluspaanil"
-
-msgid "Preview is Visible"
-msgstr "Eelvaade on nähtav"
-
-msgid "Whether the preview pane is visible"
-msgstr "Kas eelvaatluspaan on nähtav"
-
-msgid "LDAP Servers"
-msgstr "LDAP-serverid"
-
-msgid "Autocompletion Settings"
-msgstr "Automaatlõpetamise sätted"
-
-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 ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
-"versioonist muutunud.\n"
-"\n"
-"Palun oota, kuni Evolution siirdab sinu kaustad..."
-
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Postiloendi kontaktide salvestusvorming on muutunud.\n"
-"\n"
-"Palun oota, kuni Evolution siirdab sinu kaustad..."
-
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Viis, kuidas Evolution salvestab mõningaid telefoninumbreid, on muutunud.\n"
-"\n"
-"Palun oota, kuni Evolution siirdab sinu kaustad..."
-
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolutioni Palm Sync muutuste logi ja kaardifailid on muutunud.\n"
-"\n"
-"Palun oota, kuni Evolution migreerib sinu Pilot Sync andmed..."
-
-msgid "Source Selector Widget"
-msgstr "Allika valija vidin"
-
-msgid "This widget displays groups of address books"
-msgstr "See vidin kuvab aadressiraamatute gruppe"
-
+#. Translators: This is a save dialog title
 msgid "Save as vCard"
 msgstr "Salvesta vKaardina"
 
@@ -10792,6 +10792,7 @@ msgstr "_Kustuta"
 msgid "_Properties"
 msgstr "_Omadused"
 
+#. Translators: This is an action label
 msgid "_Save as vCard..."
 msgstr "_Salvesta vKaardina..."
 
@@ -10831,9 +10832,6 @@ msgstr "Prinditavate kontaktide eelvaatlemine"
 msgid "Print selected contacts"
 msgstr "Valitud kontaktide printimine"
 
-msgid "Save as vCard..."
-msgstr "Salvesta vKaardina..."
-
 msgid "Save selected contacts as a vCard"
 msgstr "Valitud kontaktide salvestamine vKaardina."
 
@@ -10867,21 +10865,14 @@ msgstr "Kontaktandmed"
 msgid "Contact information for %s"
 msgstr "Kontaktandmed - %s"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 msgid "1"
 msgstr "1"
 
-msgid "3268"
-msgstr "3268"
-
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 msgid "5"
 msgstr "5"
 
-msgid "636"
-msgstr "636"
-
 msgid "Anonymously"
 msgstr "Anonüümselt"
 
@@ -11005,31 +10996,6 @@ msgstr "Uue kalendri loomine"
 msgid "Calendar and Tasks"
 msgstr "Kalender ja ülesanded"
 
-msgid "The registry of calendars"
-msgstr "Kalendrite register"
-
-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 ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
-"versioonist muutunud.\n"
-"\n"
-"Palun oota, kuni Evolution siirdab sinu kaustad..."
-
-#. FIXME: set proper domain/code
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"Vanade sätete migreerimine failist evolution/config.xmldb pole võimalik"
-
-#. FIXME: domain/code
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Kalendrit `%s' pole võimalik siirdada"
-
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -11044,21 +11010,6 @@ msgstr "Kalendrite laadimine"
 msgid "Calendar Selector"
 msgstr "Kalendri valimine"
 
-msgid "Date Navigator Widget"
-msgstr "Kuupäeva navigeerimisvidin"
-
-msgid "This widget displays a miniature calendar"
-msgstr "See vidin kuvab pisikese kalendri"
-
-msgid "Default Calendar Client"
-msgstr "Vaikimisi kalendriklient"
-
-msgid "Default client for calendar operations"
-msgstr "Vaikimisi klient kalendritoiminguteks"
-
-msgid "This widget displays groups of calendars"
-msgstr "See vidin kuvab kalendreid gruppidena"
-
 #. Translators: The string field is a URI.
 #, c-format
 msgid "Opening calendar at %s"
@@ -11109,9 +11060,6 @@ msgstr "Tagasiliikumine"
 msgid "Go Forward"
 msgstr "Edasiliikumine"
 
-msgid "Select _Today"
-msgstr "Vali _tänane kuupäev"
-
 msgid "Select today"
 msgstr "Tänase kuupäeva valimine"
 
@@ -11214,6 +11162,9 @@ msgstr "_Teisenda sündmuseks..."
 msgid "Converts a meeting to an appointment"
 msgstr "Koosoleku teisendamine sündmuseks"
 
+msgid "Quit"
+msgstr "Lõpeta"
+
 msgid "Day"
 msgstr "Päev"
 
@@ -11343,27 +11294,12 @@ msgstr "Märkme_loend"
 msgid "Create a new memo list"
 msgstr "Uue märkmeloendi loomine"
 
-msgid "The registry of memo lists"
-msgstr "Märkmeloendite nimekiri"
-
-msgid "The memo table model"
-msgstr "Märkmete tabeli mudel"
-
 msgid "Loading memos"
 msgstr "Märkmete laadimine"
 
 msgid "Memo List Selector"
 msgstr "Märkmete loendi valija"
 
-msgid "Default Memo Client"
-msgstr "Vaikimisi märkmeklient"
-
-msgid "Default client for memo operations"
-msgstr "Märkmetoimingute vaikimisi klient"
-
-msgid "This widget displays groups of memo lists"
-msgstr "See vidin kuvab märmeloendeid gruppidena"
-
 #. Translators: The string field is a URI.
 #, c-format
 msgid "Opening memos at %s"
@@ -11451,43 +11387,12 @@ msgstr "Ü_lesandeloend"
 msgid "Create a new task list"
 msgstr "Uue ülesandeloendi loomine"
 
-msgid "The registry of task lists"
-msgstr "Ãœlesandeloendite register"
-
-msgid "The task table model"
-msgstr "Ãœlesannete tabeli mudel"
-
-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 ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on pärast Evolution 1.x. "
-"versiooni muutunud.\n"
-"\n"
-"Palun oota, kuni Evolution siirdab sinu kaustad..."
-
-#. FIXME: domain/code
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Ülesandeid `%s' pole võimalik siirdada"
-
 msgid "Loading tasks"
 msgstr "Ãœlesannete laadimine"
 
 msgid "Task List Selector"
 msgstr "Ãœlesannete loendi valija"
 
-msgid "Default Task Client"
-msgstr "Vaikimisi ülesandeklient"
-
-msgid "Default client for task operations"
-msgstr "Ãœlesandetegevuste vaikimisi klient"
-
-msgid "This widget displays groups of task lists"
-msgstr "See vidin kuvab ülesandeloendeid gruppidena"
-
 #. Translators: The string field is a URI.
 #, c-format
 msgid "Opening tasks at %s"
@@ -11627,12 +11532,6 @@ msgstr "Sõnumikoostaja eelistused"
 msgid "Network Preferences"
 msgstr "Võrgueelistused"
 
-msgid "Group by Threads"
-msgstr "Grupeeri lõimedena"
-
-msgid "Whether to group messages by threads"
-msgstr "Kas sõnumid grupeerida lõimedeks."
-
 msgid "_Disable Account"
 msgstr "_Keela konto"
 
@@ -11728,24 +11627,6 @@ msgstr "_Uus silt"
 msgid "N_one"
 msgstr "_Puudub"
 
-msgid "Hide _Read Messages"
-msgstr "Peida _loetud sõnumid"
-
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Kõigi loetud sõnumite ajutine peitmine"
-
-msgid "Hide S_elected Messages"
-msgstr "Peida _valitud sõnumid"
-
-msgid "Temporarily hide the selected messages"
-msgstr "Valitud sõnumite ajutine peitmine"
-
-msgid "Show Hidde_n Messages"
-msgstr "_Näita peidetud sõnumeid"
-
-msgid "Show messages that have been temporarily hidden"
-msgstr "Ajutiselt peidetud sõnumite peidust väljatoomine"
-
 msgid "Cancel the current mail operation"
 msgstr "Käimasoleva sõnumioperatsiooni katkestamine"
 
@@ -11788,20 +11669,20 @@ msgstr "_Märgista"
 msgid "_New Folder..."
 msgstr "_Uus kaust..."
 
-msgid "Hide _Deleted Messages"
-msgstr "Peida _kustutatud sõnumid"
-
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Kustutatud sõnumite peitmine selle asemel, et neid läbikriipsutatuna kuvada"
-
 msgid "Show Message _Preview"
 msgstr "Sõnumi _eelvaade"
 
 msgid "Show message preview pane"
 msgstr "Sõnumi eelvaateakna näitamine"
 
+msgid "Show _Deleted Messages"
+msgstr "_Kustutatud sõnumite kuvamine"
+
+#, fuzzy
+#| msgid "Show deleted messages (with a strike-through) in the message-list."
+msgid "Show deleted messages with a line through them"
+msgstr "Kustutatud sõnumite kuvamine (läbikriipsutatult) sõnumiloendis."
+
 msgid "_Group By Threads"
 msgstr "_Grupeeri lõimedena"
 
@@ -11910,6 +11791,9 @@ msgstr "Kontootsing"
 msgid "Proxy _Logout"
 msgstr "Voliniku välja_logimine"
 
+msgid "Enabled"
+msgstr "Lubatud"
+
 msgid "Language(s)"
 msgstr "Keel(ed)"
 
@@ -11955,10 +11839,6 @@ msgstr ""
 msgid "No junk plugin available"
 msgstr "Ühtegi rämpsposti pluginat pole saadaval"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-msgid "_Table column:"
-msgstr "_Tabeli veerg:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
 msgid "_Date header:"
 msgstr "_Kuupäeva päis:"
@@ -11966,6 +11846,20 @@ msgstr "_Kuupäeva päis:"
 msgid "Show _original header value"
 msgstr "Näita päise _algset väärtust"
 
+msgid "Check whether Evolution is the default mailer"
+msgstr "Kontroll, kas Evolution on vaikimisi postiprogramm"
+
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Evolutioni iga käivitamise ajal kontrollitakse, kas Evolution on vaikimisi "
+"postiprogramm või mitte."
+
+#, fuzzy
+#| msgid "Do you want to make Evolution your default e-mail client?"
+msgid "Do you want to make Evolution your default email client?"
+msgstr "Kas soovid Evolutioni määrata vaikimisi e-posti kliendiks?"
+
 msgid "Hello Python"
 msgstr "Tere Python"
 
@@ -11991,13 +11885,6 @@ msgstr ""
 "Fraaside kirjeldamine, mille esinemisel näidatakse manuse puudumise kohta "
 "meeldetuletust"
 
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Fraaside kirjeldamine, mille esinemisel näidatakse manuse puudumise kohta "
-"meeldetuletust."
-
 msgid "Keywords"
 msgstr "Võtmesõnad"
 
@@ -12062,14 +11949,14 @@ msgstr "Taastatava faili valimine"
 msgid "Restore from backup"
 msgstr "Taastamine varukoopiast"
 
-msgid "_Backup Settings..."
-msgstr "_Varunda sätted..."
+msgid "_Backup Evolution Settings..."
+msgstr "_Varunda Evolutioni sätted..."
 
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "Evolutioni andmete ja seadistuste varundamine arhiivifaili"
 
-msgid "R_estore Settings..."
-msgstr "_Taasta sätted..."
+msgid "R_estore Evolution Settings..."
+msgstr "_Taasta Evolutioni sätted..."
 
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Evolutioni andmete ja seadistuste taastamine arhiivifailist"
@@ -12106,7 +11993,7 @@ msgstr "Varundamine on valmis"
 msgid "Restarting Evolution"
 msgstr "Evolutioni taaskäivitamine"
 
-msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
 msgstr "Praeguste Evolutioni andmete varundamine"
 
 msgid "Extracting files from backup"
@@ -12215,7 +12102,9 @@ msgid "Instant Messaging Contacts"
 msgstr "Kiirsuhtluse kontaktid"
 
 #. Enable Gaim Checkbox
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#, fuzzy
+#| msgid "Synchronize contact info and images from Pidgin buddy list"
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "Kontaktandmete ja piltide sünkroniseerimine Pidgini sõbranimekirjaga"
 
 msgid "Select Address book for Pidgin buddy list"
@@ -12328,8 +12217,9 @@ msgstr "Eelmine katse nurjus: %s"
 msgid "Previous attempt failed with code %d"
 msgstr "Eelmine katse nurjus koodiga %d"
 
-#, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+#, fuzzy, c-format
+#| msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgid "Enter password for user %s on server %s"
 msgstr "Sisesta kasutaja <b>%s</b> parool serveril <b>%s</b>"
 
 #, c-format
@@ -12479,24 +12369,6 @@ msgstr "Kaardi lisamine, millel võimalusel kuvatakse kontaktide asukohti"
 msgid "Map for contacts"
 msgstr "Kontaktide kaart"
 
-msgid "Check whether Evolution is the default mailer"
-msgstr "Kontroll, kas Evolution on vaikimisi postiprogramm"
-
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Evolutioni iga käivitamise ajal kontrollitakse, kas Evolution on vaikimisi "
-"postiprogramm või mitte."
-
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "Käivitumisel kontrollitakse, kas Evolution on vaikimisi meiliklient."
-
-msgid "Default Mail Client"
-msgstr "Vaikimisi postiklient"
-
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "Kas soovid Evolutioni määrata vaikimisi e-posti kliendiks?"
-
 msgid "Mark as _default address book"
 msgstr "Märgitud _vaikimisi aadressiraamatuks"
 
@@ -12690,8 +12562,8 @@ msgstr "Tundub, et valitud pilt ei ole korrektne .png pilt. Viga: {0}"
 msgid "Google"
 msgstr "Google"
 
-msgid "<b>Server</b>"
-msgstr "<b>Server</b>"
+msgid "Server"
+msgstr "Server"
 
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
@@ -12712,7 +12584,9 @@ msgstr "Tundmatu viga."
 msgid "Cal_endar:"
 msgstr "Kalen_der:"
 
-msgid "Retrieve _list"
+#, fuzzy
+#| msgid "Retrieve _list"
+msgid "Retrieve _List"
 msgstr "Hangi _loend"
 
 msgid "Add Google Calendars to Evolution."
@@ -12904,9 +12778,6 @@ msgstr "Kas nõustud sellega?"
 msgid "Would you like to decline it?"
 msgstr "Kas lükkad selle tagasi?"
 
-msgid "<b>Users:</b>"
-msgstr "<b>Kasutajad:</b>"
-
 msgid "C_ustomize notification message"
 msgstr "Ko_handa teavitussõnumit"
 
@@ -12919,6 +12790,9 @@ msgstr "Jagatud kataloogi teavitus"
 msgid "The participants will receive the following notification.\n"
 msgstr "Osalejad saavad järgneva teate.\n"
 
+msgid "Users:"
+msgstr "Kasutajad:"
+
 msgid "_Not Shared"
 msgstr "_Väljajagamata"
 
@@ -12961,8 +12835,8 @@ msgstr "Lu_gemine"
 msgid "Proxy"
 msgstr "Volinik"
 
-msgid "<b>Account Name</b>"
-msgstr "<b>Konto nimi</b>"
+msgid "Account Name"
+msgstr "Konto nimi"
 
 # Proxy tähendab siin kedagi, kes on volitatud
 msgid "Proxy Login"
@@ -12982,6 +12856,11 @@ msgstr "Voliniku sakk on saadaval ainult juhul, kui konto on võrku ühendatud."
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Voliniku sakk on saadaval ainult juhul, kui konto on lubatud."
 
+#. 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
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Proksi"
+
 msgid "Add User"
 msgstr "Kasutaja lisamine"
 
@@ -13040,12 +12919,6 @@ msgstr "Täidetud: "
 msgid "Undelivered: "
 msgstr "Kohale toimetamata: "
 
-msgid "Add Hula support to Evolution."
-msgstr "Hula toe lisamine Evolutionile."
-
-msgid "Hula Support"
-msgstr "Hula tugi"
-
 msgid "Inline Image"
 msgstr "Sõnumisisene pilt"
 
@@ -13353,187 +13226,181 @@ msgstr "%A, %e. %B %Y, %l:%M %p"
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y, %l:%M%S %p"
 
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
+#, fuzzy, c-format
+#| msgid "Please respond on behalf of <b>%s</b>"
+msgid "Please respond on behalf of %s"
 msgstr "Palun vasta kasutaja <b>%s</b> nimel"
 
-#, c-format
-msgid "Received on behalf of <b>%s</b>"
+#, fuzzy, c-format
+#| msgid "Received on behalf of <b>%s</b>"
+msgid "Received on behalf of %s"
 msgstr "Võeti vastu <b>%s</b> nimel"
 
 #, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> avaldas %s kaudu teabe järgneva koosoleku kohta:"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s avaldas %s kaudu teabe järgneva koosoleku kohta:"
 
 #, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> avaldas järgneva koosoleku teabe:"
+msgid "%s has published the following meeting information:"
+msgstr "%s avaldas järgneva koosoleku teabe:"
 
 #, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> delegeeris järgneva koosoleku sulle:"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s delegeeris järgneva koosoleku sulle:"
 
 #, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> taotleb %s kaudu, et sa osaleksid järgneval koosolekul:"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s taotleb %s kaudu sinu osalemist järgneval koosolekul:"
 
 #, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> taotleb, et sa osaleksid järgneval koosolekul:"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s taotleb sinu osalemist järgneval koosolekul:"
 
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale koosolekule:"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s soovib %s kaudu lisada olemasolevale koosolekule:"
 
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule:"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s soovib lisada olemasolevale koosolekule:"
 
 #, c-format
 msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> soovib %s kaudu saada värskemat teavet järgneva koosoleku kohta:"
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "%s soovib %s kaudu saada värskemat teavet järgneva koosoleku kohta:"
 
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> soovib saada värskemat teavet järgneva koosoleku kohta:"
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s soovib saada värskemat teavet järgneva koosoleku kohta:"
 
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> saatis %s kaudu järgneva koosoleku kohta vastukaja:"
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s saatis %s kaudu järgneva koosoleku kohta vastukaja:"
 
 #, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> saatis koosoleku kohta järgneva vastukaja:"
+msgid "%s has sent back the following meeting response:"
+msgstr "%s saatis koosoleku kohta järgneva vastukaja:"
 
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> tühistas %s kaudu järgneva koosoleku:"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s tühistas %s kaudu järgneva koosoleku:"
 
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> tühistas järgneva koosoleku."
+msgid "%s has canceled the following meeting."
+msgstr "%s tühistas järgneva koosoleku."
 
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> pakkus %s kaudu välja järgmised koosoleku muudatused."
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s pakkus %s kaudu välja järgmised koosoleku muudatused."
 
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> esitas järgnevad koosoleku muudatused."
+msgid "%s has proposed the following meeting changes."
+msgstr "%s esitas järgnevad koosoleku muudatused."
 
 #, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> tühistas %s kaudu järgnevad koosoleku muudatused:"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s tühistas %s kaudu järgnevad koosoleku muudatused:"
 
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> keeldus järgnevatest koosoleku muudatusest."
+msgid "%s has declined the following meeting changes."
+msgstr "%s keeldus järgnevatest koosoleku muudatusest."
 
 #, c-format
-msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> avaldas %s kaudu järgneva ülesande:"
+msgid "%s through %s has published the following task:"
+msgstr "%s avaldas %s kaudu järgneva ülesande:"
 
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> avaldas järgmise ülesande:"
+msgid "%s has published the following task:"
+msgstr "%s avaldas järgmise ülesande:"
 
 #, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> taotleb %s määramist järgneva ülesande täitjaks:"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s taotleb %s määramist järgneva ülesande täitjaks:"
 
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> määras %s kaudu sulle ülesande:"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s määras %s kaudu sulle ülesande:"
 
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> määras sulle ülesande:"
+msgid "%s has assigned you a task:"
+msgstr "%s määras sulle ülesande:"
 
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale ülesandele:"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s soovib %s kaudu lisada olemasolevale ülesandele:"
 
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> soovib lisada olemasolevale ülesandele:"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s soovib lisada olemasolevale ülesandele:"
 
 #, c-format
 msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
 msgstr ""
-"<b>%s</b> soovib %s kaudu saada värskemat teavet järgneva omistatud ülesande "
-"kohta:"
+"%s soovib %s kaudu saada värskemat teavet järgneva omistatud ülesande kohta:"
 
 #, c-format
 msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> soovib saada värskemat teavet järgneva omistatud ülesande kohta:"
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr "%s soovib saada värskemat teavet järgneva omistatud ülesande kohta:"
 
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> saatis %s kasutades omistatud ülesandele järgmise vastuse:"
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%s saatis %s kasutades omistatud ülesandele järgmise vastuse:"
 
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> saatis omistatud ülesandele järgmise vastuse:"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s saatis omistatud ülesandele järgmise vastuse:"
 
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> tühistas %s kaudu järgneva omistatud ülesande:"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s tühistas %s kaudu järgneva omistatud ülesande:"
 
 #, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> tühistas järgneva omistatud ülesande:"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s tühistas järgneva omistatud ülesande:"
 
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr ""
-"<b>%s</b> pakkus %s kaudu välja järgmised ülesande täitjate muudatused:"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%s pakkus %s kaudu välja järgmised ülesande täitjate muudatused:"
 
 #, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> esitas järgnevad ülesande täitjate muudatused:"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s esitas järgnevad ülesande täitjate muudatused:"
 
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> keeldus %s kaudu järgneva ülesande täitmisest:"
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s keeldus %s kaudu järgneva ülesande täitmisest:"
 
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> keeldus järgneva ülesande täitmisest:"
+msgid "%s has declined the following assigned task:"
+msgstr "%s keeldus järgneva ülesande täitmisest:"
 
 #, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> avaldas %s kaudu järgneva märkme:"
+msgid "%s through %s has published the following memo:"
+msgstr "%s avaldas %s kaudu järgneva märkme:"
 
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> avaldas järgmise märkme:"
+msgid "%s has published the following memo:"
+msgstr "%s avaldas järgmise märkme:"
 
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale märkmele:"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s soovib %s kaudu lisada olemasolevale märkmele:"
 
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> soovib lisada olemasolevale märkmele:"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s soovib lisada olemasolevale märkmele:"
 
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> tühistas %s kaudu järgneva jagatud märkme:"
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s tühistas %s kaudu järgneva jagatud märkme:"
 
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> tühistas järgneva jagatud märkme:"
+msgid "%s has canceled the following shared memo:"
+msgstr "%s tühistas järgneva jagatud märkme:"
 
 msgid "All day:"
 msgstr "Iga päev:"
@@ -13559,8 +13426,8 @@ msgstr "_Ava kalender"
 msgid "_Decline"
 msgstr "_Lükka tagasi"
 
-msgid "_Accept"
-msgstr "_Nõustu"
+msgid "A_ccept"
+msgstr "_Nõustun"
 
 msgid "_Decline all"
 msgstr "_Lükka kõik tagasi"
@@ -13571,7 +13438,9 @@ msgstr "Kõik _võimaluse korral"
 msgid "_Tentative"
 msgstr "_Võimaluse korral"
 
-msgid "_Accept all"
+#, fuzzy
+#| msgid "_Accept all"
+msgid "A_ccept all"
 msgstr "_Nõustu kõigiga"
 
 #. FIXME Is this really the right button?
@@ -14148,6 +14017,9 @@ msgstr "Outlooki isiklikud kataloogid (.pst)"
 msgid "_Mail"
 msgstr "_Post"
 
+msgid "Destination folder:"
+msgstr "Sihtkataloog:"
+
 #. Address book
 msgid "_Address Book"
 msgstr "_Aadressiraamat"
@@ -14796,10 +14668,6 @@ msgstr "Otsingud"
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
@@ -14817,18 +14685,6 @@ msgstr "Ot_sing: "
 msgid "i_n"
 msgstr "_ "
 
-msgid "Toolbar Style"
-msgstr "Tööriistariba laad"
-
-msgid "The switcher's toolbar style"
-msgstr "Vahetaja tööriistariba laad"
-
-msgid "Toolbar Visible"
-msgstr "Tööriistariba on nähtav"
-
-msgid "Whether the switcher is visible"
-msgstr "Kas vahetaja on nähtaval"
-
 msgid "vCard (.vcf)"
 msgstr "vKaart (.vcf)"
 
@@ -14838,64 +14694,6 @@ msgstr "iKalendri failid (.ics)"
 msgid "All Files (*)"
 msgstr "Kõik failid (*)"
 
-msgid "Switcher Action"
-msgstr "Vahetaja tegevus"
-
-msgid "The switcher action for this shell view"
-msgstr "Selle kestavaate vahetaja tegevus"
-
-msgid "Page Number"
-msgstr "Lehekülje number"
-
-#, fuzzy
-msgid "The notebook page number of the shell view"
-msgstr "Kestavaate märkmiku lehekülg"
-
-msgid "Search Rule"
-msgstr "Otsingufilter"
-
-msgid "Criteria for the current search results"
-msgstr "Nende otsingutulemuste kriteeriumid"
-
-msgid "The EShellBackend for this shell view"
-msgstr "Selle kestvaate EShellBackend"
-
-msgid "Shell Content Widget"
-msgstr "Kesta sisuvidin"
-
-msgid "The content widget appears in a shell window's right pane"
-msgstr "Sisuvidin paikneb kestaakna paremal paanil"
-
-msgid "Shell Sidebar Widget"
-msgstr "Külgpaani kesta vidin"
-
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "Külgriba vidin paikneb kestaakna vasakul paanil"
-
-msgid "Shell Taskbar Widget"
-msgstr "Kesta ülesanderiba vidin"
-
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "Ãœlesanderiba vidin paikneb kestaakna all"
-
-msgid "Shell Window"
-msgstr "Kestaken"
-
-msgid "The window to which the shell view belongs"
-msgstr "Aken, millele kestavaade kuulub"
-
-msgid "The key file holding widget state data"
-msgstr "Võtmefail, mis sisaldab vidina oleku andmeid"
-
-msgid "The title of the shell view"
-msgstr "Kestavaate pealkiri"
-
-msgid "Current View ID"
-msgstr "Käesoleva vaate ID"
-
-msgid "The current GAL view ID"
-msgstr "Praeguse GAL-vaate ID"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -15134,54 +14932,6 @@ msgstr "%s - Evolution"
 msgid "New"
 msgstr "Uus"
 
-msgid "Active Shell View"
-msgstr "Aktiivse kesta vaade"
-
-msgid "Name of the active shell view"
-msgstr "Aktiivse kestaakna nimi"
-
-msgid "The shell window's EFocusTracker"
-msgstr "Kestakna EFocusTracker"
-
-msgid "Geometry"
-msgstr "Geomeetria"
-
-msgid "Initial window geometry string"
-msgstr "Esialgse akna geomeetriasõne"
-
-msgid "Safe Mode"
-msgstr "Ohutu režiim"
-
-msgid "Whether the shell window is in safe mode"
-msgstr "Kas kestaaken peaks olema ohutus režiimis"
-
-msgid "Sidebar Visible"
-msgstr "Külgpaan on nähtav"
-
-msgid "Whether the shell window's side bar is visible"
-msgstr "Kas kestakna külgriba peaks nähtav olema"
-
-msgid "Switcher Visible"
-msgstr "Vahetaja on nähtav"
-
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Kas kestakna vahetusnupud peaksid olema nähtaval"
-
-msgid "Taskbar Visible"
-msgstr "Ülesanderiba on nähtav"
-
-msgid "Whether the shell window's task bar is visible"
-msgstr "Kas kestakna ülesanderiba peaks olema nähtav"
-
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Kas kestakna tööriistariba peaks olema nähtav"
-
-msgid "UI Manager"
-msgstr "Kasutajaliidese haldur"
-
-msgid "The shell window's GtkUIManager"
-msgstr "Kestakna GtkUIManager"
-
 msgid "Preparing to go offline..."
 msgstr "Ettevalmistused võrguvabaks režiimiks..."
 
@@ -15191,24 +14941,6 @@ msgstr "Ettevalmistused võrgurežiimiks..."
 msgid "Preparing to quit..."
 msgstr "Lõpetamise ettevalmistamine..."
 
-msgid "Module Directory"
-msgstr "Moodulite kataloog"
-
-msgid "The directory from which to load EModules"
-msgstr "Kataloog, millest laaditakse EModules"
-
-msgid "Network Available"
-msgstr "Võrk on saadaval"
-
-msgid "Whether the network is available"
-msgstr "Kas võrguühendus on saadaval"
-
-msgid "Online"
-msgstr "Ãœhendatud"
-
-msgid "Whether the shell is online"
-msgstr "Kas kest on võrku ühendatud või mitte"
-
 #. Preview/Alpha/Beta version warning message
 #, no-c-format
 msgid ""
@@ -15271,9 +15003,6 @@ msgstr "Alustamine ekspressrežiimis"
 msgid "Forcibly shut down Evolution"
 msgstr "Evolutioni sundimine töö lõpetamisele"
 
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Uuesti Evolutioni versioonist 1.4 migreerumisele sundimine"
-
 msgid "Send the debugging output of all components to a file."
 msgstr "Kõikide komponentide silumisinfo saatmine faili."
 
@@ -15303,11 +15032,21 @@ msgstr ""
 msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Kas soovid unustada kõik meeldejäetud paroolid?"
 
-msgid "Continue"
+#, fuzzy
+#| msgid "Delete old data from version {0}?"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Kas kustutada vanad andmed versioonist {0}?"
+
+#, fuzzy
+#| msgid "Continue"
+msgid "Continue Anyway"
 msgstr "Jätka"
 
-msgid "Delete old data from version {0}?"
-msgstr "Kas kustutada vanad andmed versioonist {0}?"
+msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
 
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
@@ -15316,70 +15055,17 @@ msgstr ""
 "Meeldejäetud paroolide unustamine nullib ära kõik meeldejäetud paroolid. "
 "Paroolid küsitakse uuesti järgmisel korral, mil neid vaja läheb."
 
-msgid "Insufficient disk space for upgrade."
-msgstr "Uuendamiseks napib kettaruumi."
-
-msgid "Really delete old data?"
-msgstr "Kas tõesti kustutada vanad andmed?"
-
-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 ""
-"Kogu &quot;evolution&quot; kataloogi sisu eemaldatakse jäädavalt.\n"
-"\n"
-"Sul on soovitatav kõik oma e-posti, kontaktide ja kalendrite andmed üle "
-"vaadata ning enne vanade andmete kustutamist veenduda, et see Evolutioni "
-"versioon käitub korrektselt.\n"
-"\n"
-"Pärast kustutamist pole sul võimalik ilma käsitsi sekkumiseta enam "
-"Evolutioni vanemat versiooni kasutada.\n"
-
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
-msgstr ""
-"Evolutioni eelmine versioon hoidis andmeid teises kohas.\n"
-"\n"
-"Kui valid andmete eemaldamise, siis eemaldatakse kogu kataloog &quot;"
-"evolution&quot; jäädavalt. Kui valid andmete säilitamise, siis võid hiljem "
-"omal vabal valikul kataloogi &quot;evolution&quot; käsitsi eemaldada.\n"
+#, fuzzy
+#| msgid "Quit"
+msgid "Quit Now"
+msgstr "Lõpeta"
 
 msgid "Upgrade from previous version failed:"
 msgstr "Tõrge eelmisest versioonist uuendamisel:"
 
-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 ""
-"Sinu andmete ja sätete uuendamine vajab kuni {0} kettaruumi, kuid saadaval "
-"on ainult {1}.\n"
-"\n"
-"Enne jätkamist pead oma kodukataloogis vabastama ruumi."
-
 msgid "_Forget"
 msgstr "_Unusta"
 
-msgid "_Keep Data"
-msgstr "_Säilita andmed"
-
-msgid "_Remind Me Later"
-msgstr "_Tuleta mulle hiljem meelde"
-
 msgid ""
 "{0}\n"
 "\n"
@@ -15518,8 +15204,9 @@ msgstr "Sertifikaadid"
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikaadivaatur: %s"
 
-#, c-format
-msgid "Enter the password for `%s'"
+#, fuzzy, c-format
+#| msgid "Enter the password for `%s'"
+msgid "Enter the password for '%s'"
 msgstr "Sisesta parool '%s' jaoks"
 
 #. we're setting the password initially
@@ -15555,10 +15242,9 @@ msgstr "<Ei ole sertifikaadi osa>"
 msgid "Authorities"
 msgstr "Sertifitseerimiskeskused"
 
-msgid "Backup"
-msgstr "Varunda"
-
-msgid "Backup All"
+#, fuzzy
+#| msgid "Backup All"
+msgid "Backup _All"
 msgstr "Varunda kõik"
 
 msgid ""
@@ -15596,9 +15282,6 @@ msgstr "Kontaktide sertifikaadid"
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ära selle sertifikaadi autentsust usalda"
 
-msgid "Edit"
-msgstr "Redigeerimine"
-
 msgid "Email Certificate Trust Settings"
 msgstr "E-posti sertifikaadi usaldussätted"
 
@@ -15617,9 +15300,6 @@ msgstr "Välja väärtus"
 msgid "Fingerprints"
 msgstr "Sõrmejäljed"
 
-msgid "Import"
-msgstr "Impordi"
-
 msgid "Issued By"
 msgstr "Väljastaja"
 
@@ -15661,15 +15341,14 @@ msgid "Trust this CA to identify software developers."
 msgstr ""
 "Seda sertifitseerimiskeskust usaldatakse tarkvaraarendajate tuvastamisel."
 
-msgid "Trust this CA to identify web sites."
+#, fuzzy
+#| msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify websites."
 msgstr "Seda sertifitseerimiskeskust usaldatakse veebisaitide tuvastamisel."
 
 msgid "Validity"
 msgstr "Kehtivus"
 
-msgid "View"
-msgstr "Vaata"
-
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Sinu sertifikaadid organisatsioonidelt, mis aitavad sind tuvastada:"
 
@@ -15685,6 +15364,9 @@ msgstr "Failis on sertifikaadid, mis sul aitavad neid inimesi tuvastada:"
 msgid "Your Certificates"
 msgstr "Sinu sertifikaadid"
 
+msgid "_Backup"
+msgstr "_Varunda"
+
 msgid "_Edit CA Trust"
 msgstr "_Muuda SK usaldust"
 
@@ -15723,6 +15405,15 @@ msgstr "PKCS #1 MD5 koos RSA krüpteeringuga"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 koos RSA krüpteeringuga"
 
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 koos RSA krüpteeringuga"
+
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 koos RSA krüpteeringuga"
+
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 koos RSA krüpteeringuga"
+
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA krüptimine"
 
@@ -15796,6 +15487,12 @@ msgstr "Mittekriitiline"
 msgid "Extensions"
 msgstr "Laiendused"
 
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
@@ -15902,9 +15599,6 @@ msgstr ""
 msgid "_Selection"
 msgstr "_Valik"
 
-msgid "Collection"
-msgstr "Kollektsioon"
-
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Vaadete kirjeldamine %s jaoks"
@@ -15919,9 +15613,6 @@ msgstr "\"%s\" jaoks vaadete kirjeldamine"
 msgid "Table"
 msgstr "Tabel"
 
-msgid "Instance"
-msgstr "Instants"
-
 msgid "Save Current View"
 msgstr "Salvesta käesolev vaade"
 
@@ -15931,9 +15622,6 @@ msgstr "_Loo uus vaade"
 msgid "_Replace existing view"
 msgstr "_Asenda olemasolev vaade"
 
-msgid "Factory"
-msgstr "Factory"
-
 msgid "Define New View"
 msgstr "Uue vaate kirjeldamine"
 
@@ -15949,18 +15637,9 @@ msgstr "Vaate liik:"
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-msgid "Account Name"
-msgstr "Konto nimi"
-
 msgid "Protocol"
 msgstr "Protokoll"
 
-msgid "Action"
-msgstr "Tegevus"
-
-msgid "A GtkRadioAction"
-msgstr "GtkRadioAction"
-
 msgid "Attachment Properties"
 msgstr "Manuse omadused"
 
@@ -16003,9 +15682,6 @@ msgstr "Peida _manuseriba"
 msgid "Show Attachment _Bar"
 msgstr "Näita _manuseriba"
 
-msgid "Show _Attachment Bar"
-msgstr "Näita _manuseriba"
-
 msgid "Add Attachment"
 msgstr "Manuse lisamine"
 
@@ -16093,36 +15769,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Kuu kalender"
 
-msgid "Fill color"
-msgstr "Täitevärvus"
-
-msgid "GDK fill color"
-msgstr "GDK täitevärvus"
-
-msgid "Fill stipple"
-msgstr "Täpiline täide"
-
-msgid "X1"
-msgstr "X1"
-
-msgid "X2"
-msgstr "X2"
-
-msgid "Y1"
-msgstr "Y1"
-
-msgid "Y2"
-msgstr "Y2"
-
-msgid "Minimum width"
-msgstr "Vähim laius"
-
-msgid "Minimum Width"
-msgstr "Vähim laius"
-
-msgid "Spacing"
-msgstr "Jaotus"
-
 msgid "Character Encoding"
 msgstr "Kooditabel"
 
@@ -16195,9 +15841,6 @@ msgstr "Andmete ja seadistuste importimine _vanematest programmidest"
 msgid "Import a _single file"
 msgstr "Ãœksiku _faili importimine"
 
-msgid "Select what type of file you want to import from the list."
-msgstr "Vali loendist, millist liiki faile importida."
-
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -16207,6 +15850,16 @@ msgstr ""
 "Pine, Netscape, Elm ja iCalendar. Paraku ei leitud ühtegi imporditavat "
 "seadistusfaili. Kui soovid veel proovida, siis vajuta \"Tagasi\" nuppu."
 
+msgid "Preview data to be imported"
+msgstr "Imporditavate andmete eelvaatlemine"
+
+msgid "Import Data"
+msgstr "Andmete importimine"
+
+#. multiple importers found, be able to choose from them
+msgid "Select what type of file you want to import from the list."
+msgstr "Vali loendist, millist liiki faile importida."
+
 msgid "Evolution Import Assistant"
 msgstr "Evolutioni impordiabiline"
 
@@ -16234,9 +15887,6 @@ msgstr "Faili valimine"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Faili importimiseks Evolutioni vajuta \"Rakenda\"."
 
-msgid "Import Data"
-msgstr "Andmete importimine"
-
 msgid "World Map"
 msgstr "Maailmakaart"
 
@@ -16259,33 +15909,6 @@ msgstr ""
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution on hetkel võrguvabas olekus, kuna võrk pole saadaval."
 
-msgid "The button state is online"
-msgstr "Nupu olek on saadaval"
-
-msgid "Horizontal Position"
-msgstr "Rõhtsuunaline asukoht"
-
-msgid "Pane position when oriented horizontally"
-msgstr "Paani asukoht, kui horisontaalselt suunatud"
-
-msgid "Vertical Position"
-msgstr "Püstsuunaline asukoht"
-
-msgid "Pane position when oriented vertically"
-msgstr "Paani asukoht, kui vertikaalselt suunatud"
-
-msgid "Proportion"
-msgstr "Proportsioonid"
-
-msgid "Proportion of the 2nd pane size"
-msgstr "Teise paani suuruse proportsioonid"
-
-msgid "Fixed Resize"
-msgstr "Fikseeritud mõõtmed"
-
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Teise paani suuruse hoidmine suuruse muutmisel"
-
 msgid "Sync with:"
 msgstr "Millega sünkroniseerida:"
 
@@ -16332,21 +15955,6 @@ msgstr "Jõuti lehekülje lõppu, jätkati algusest"
 msgid "Reached top of page, continued from bottom"
 msgstr "Jõuti lehekülje algusesse, jätkati lõpust"
 
-msgid "Cursor Row"
-msgstr "Kursori rida"
-
-msgid "Cursor Column"
-msgstr "Kursori veerg"
-
-msgid "Sorter"
-msgstr "Sortija"
-
-msgid "Selection Mode"
-msgstr "Valimise režiim"
-
-msgid "Cursor Mode"
-msgstr "Kursorirežiim"
-
 msgid "When de_leted:"
 msgstr "Kui _kustutatakse:"
 
@@ -16401,11 +16009,13 @@ msgstr "Kui _täidetakse:"
 msgid "When decli_ned:"
 msgstr "Kui k_eeldutakse:"
 
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
 msgid "Wi_thin"
 msgstr ""
 
-msgid "_After:"
-msgstr "_Pärast:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+msgid "_After"
+msgstr "_Pärast"
 
 msgid "_All information"
 msgstr "_Kogu teave"
@@ -16422,8 +16032,9 @@ msgstr "_Kohale toimetatud"
 msgid "_Set expiration date"
 msgstr "_Määra aegumistähtaeg"
 
-msgid "_Until:"
-msgstr "_Kuni:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+msgid "_Until"
+msgstr "_Kuni"
 
 msgid "_When convenient"
 msgstr "_Kui sobib"
@@ -16529,36 +16140,9 @@ msgstr "Kellaaeg peab olema sisestatud %s formaadis"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Protsendi väärtus peab olema 0 - 100."
 
-msgid "Selected Column"
-msgstr "Valitud veerg"
-
-msgid "Focused Column"
-msgstr "Fokusseeritud veerg"
-
-msgid "Unselected Column"
-msgstr "Valimata veerg"
-
-msgid "Strikeout Column"
-msgstr "Läbikriipsutatud veerg"
-
-msgid "Underline Column"
-msgstr "Allajoonitud veerg"
-
-msgid "Bold Column"
-msgstr "Rasvane veerg"
-
-msgid "Color Column"
-msgstr "Värviline veerg"
-
-msgid "BG Color Column"
-msgstr "Taustavärviga veerg"
-
 msgid "click to add"
 msgstr "lisamiseks klõpsa"
 
-msgid "State"
-msgstr "Seisund"
-
 msgid "(Ascending)"
 msgstr "(Kasvav)"
 
@@ -16644,45 +16228,31 @@ msgstr ""
 "Tabelisse veeru lisamiseks tuleb see\n"
 "lohistada kohale, kus seda näha soovid."
 
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
 #, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d kirje)"
-msgstr[1] "%s : %s (%d kirjet)"
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s: %s (%d kirje)"
+msgstr[1] "%s: %s (%d kirjet)"
 
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d kirje)"
 msgstr[1] "%s (%d kirjet)"
 
-msgid "Alternating Row Colors"
-msgstr "Reavärvuste asendamine"
-
-msgid "Horizontal Draw Grid"
-msgstr ""
-
-msgid "Vertical Draw Grid"
-msgstr ""
-
-msgid "Draw focus"
-msgstr "Haara fookus"
-
-msgid "Cursor mode"
-msgstr "Kursorirežiim"
-
-msgid "Selection model"
-msgstr "Valikumudel"
-
-msgid "Length Threshold"
-msgstr "Pikkuse lävi"
-
-msgid "Uniform row height"
-msgstr "Ühtlane rea kõrgus"
-
-msgid "Frozen"
-msgstr "Külmutatud"
-
 msgid "Customize Current View"
 msgstr "Käesoleva vaate kohandamine"
 
@@ -16726,74 +16296,23 @@ msgstr "_Sordi välja järgi"
 msgid "_Custom"
 msgstr "_Kohandatud"
 
-msgid "Table header"
-msgstr "Tabeli päis"
-
-msgid "Table model"
-msgstr "Tabeli mudel"
-
-msgid "Cursor row"
-msgstr "Kursori rida"
-
-msgid "Sort Info"
-msgstr "Sortimisandmed"
-
-msgid "Always search"
-msgstr "Alati otsitakse"
-
-msgid "Use click to add"
-msgstr "Klõpsa lisamiseks"
-
-msgid "Vertical Row Spacing"
-msgstr "Ridade vahekaugus"
-
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "Vertikaalne vahe ridade vahel. See lisatakse rea alla ja kohale."
-
-msgid "ETree table adapter"
-msgstr "ETree tabeliadapter"
-
-msgid "Retro Look"
-msgstr "Retrovälimus"
-
-msgid "Draw lines and +/- expanders."
-msgstr "Joonte ning +/- laiendajate joonistamine."
-
-msgid "Expander Size"
-msgstr "Laiendaja suurus"
-
-msgid "Size of the expander arrow"
-msgstr "Laienduse noole suurus"
-
-msgid "popup"
-msgstr "hüpikaken"
-
-#. action name
+#. Translators: description of a "popup" action
 msgid "popup a child"
 msgstr ""
 
-msgid "edit"
-msgstr "redigeerimine"
-
+#. Translators: description of an "edit" action
 msgid "begin editing this cell"
 msgstr "selle välja muutmise alustamine"
 
-msgid "toggle"
-msgstr "lüliti"
-
-#. action name
+#. Translators: description of a "toggle" action
 msgid "toggle the cell"
 msgstr "lahtri ümberlülitamine"
 
-msgid "expand"
-msgstr "laienda"
-
+#. Translators: description of an "expand" action
 msgid "expands the row in the ETree containing this cell"
 msgstr "ETree seda välja sisaldava rea laiendamine"
 
-msgid "collapse"
-msgstr "ahenda"
-
+#. Translators: description of a "collapse" action
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ETree seda välja sisaldava rea ahendamine"
 
@@ -16812,81 +16331,962 @@ msgstr "Vali kõik"
 msgid "Input Methods"
 msgstr "Sisestusmeetodid"
 
-msgid "Event Processor"
-msgstr "Sündmusteprotsessor"
+#~ msgid "address card"
+#~ msgstr "aadressikaart"
 
-msgid "Text"
-msgstr "Tekst"
+#~ msgid "calendar information"
+#~ msgstr "kalendri andmed"
 
-msgid "Bold"
-msgstr "Rasvane"
+#~ msgid "Check whether Evolution is the default mail client on startup."
+#~ msgstr ""
+#~ "Käivitumisel kontrollitakse, kas Evolution on vaikimisi meiliklient."
 
-msgid "Strikeout"
-msgstr "Läbikriipsutatud"
+#~ msgid "Default Mail Client"
+#~ msgstr "Vaikimisi postiklient"
 
-msgid "Anchor"
-msgstr "Ankur"
+#~ msgid "Editable"
+#~ msgstr "Muudetav"
 
-msgid "Justification"
-msgstr "Rööpjoondus"
+#~ msgid "Source Book"
+#~ msgstr "Lähteraamat"
 
-msgid "Clip Width"
-msgstr "Klambri laius"
+#~ msgid "Target Book"
+#~ msgstr "Sihtraamat"
 
-msgid "Clip Height"
-msgstr "Klambri kõrgus"
+#~ msgid "Is New Contact"
+#~ msgstr "Tegemist on uue kontaktiga"
 
-msgid "Clip"
-msgstr "Klamber"
+#~ msgid "Writable Fields"
+#~ msgstr "Muudetavad väljad"
 
-msgid "Fill clip rectangle"
-msgstr ""
+#~ msgid "Required Fields"
+#~ msgstr "Vajalikud väljad"
 
-msgid "X Offset"
-msgstr "X-nihe"
+#~ msgid "Changed"
+#~ msgstr "Muudetud"
 
-msgid "Y Offset"
-msgstr "Y-nihe"
+#~ msgid "Shell"
+#~ msgstr "Kest"
 
-msgid "Text width"
-msgstr "Teksti laius"
+#~ msgid "Book"
+#~ msgstr "Raamat"
 
-msgid "Text height"
-msgstr "Teksti kõrgus"
+#~ msgid "Is New List"
+#~ msgstr "On uus loend"
 
-msgid "Use ellipsis"
-msgstr "Ellipsite kasutamine"
+#~ msgid "Query"
+#~ msgstr "Päring"
 
-msgid "Ellipsis"
-msgstr "Ellipsid"
+#~ msgid "Model"
+#~ msgstr "Mudel"
 
-msgid "Line wrap"
-msgstr "Reamurdmine"
+#~ msgid "Shell View"
+#~ msgstr "Kestvaade"
 
-msgid "Break characters"
-msgstr "Murdmismärgid"
+#~ msgid "Source"
+#~ msgstr "Allikas"
 
-msgid "Max lines"
-msgstr "Suurim ridade arv"
+#~ msgid "Width"
+#~ msgstr "Laius"
 
-msgid "Draw borders"
-msgstr "Piirjoonte näitamine"
+#~ msgid "Height"
+#~ msgstr "Kõrgus"
 
-msgid "Allow newlines"
-msgstr "Reamurdmise lubamine"
+#~ msgid "Has Focus"
+#~ msgstr "On fookuses"
 
-msgid "Draw background"
-msgstr "Tausta joonistamine"
+#~ msgid "Field"
+#~ msgstr "Väli"
 
-msgid "Draw button"
-msgstr "Nupu joonistamine"
+#~ msgid "Field Name"
+#~ msgstr "Välja nimi"
 
-msgid "Cursor position"
-msgstr "Kursori asukoht"
+#~ msgid "Text Model"
+#~ msgstr "Teksti mudel"
 
-#. Translators: Input Method Context
-msgid "IM Context"
-msgstr "Välksõnumikontekst"
+#~ msgid "Max field name length"
+#~ msgstr "Suurim välja nime pikkus"
 
-msgid "Handle Popup"
-msgstr ""
+#~ msgid "Column Width"
+#~ msgstr "Veeru laius"
+
+#~ msgid "Adapter"
+#~ msgstr "Adapter"
+
+#~ msgid "Selected"
+#~ msgstr "Valitud"
+
+#~ msgid "Has Cursor"
+#~ msgstr "On fookuses"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "Kalendrihoidla pole võrku ühendatud."
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "Viga toimingul '{0}'"
+
+#~ msgid "No response from the server."
+#~ msgstr "Serverist ei tulnud vastust."
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "Kalendrit pole võimalik laadida"
+
+#~ msgid "Check this to use system timezone in Evolution."
+#~ msgstr "Märgi see, et kasutada Evolutionis süsteemi ajavööndit."
+
+#~ msgid "Attendee_s..."
+#~ msgstr "_Osalejad..."
+
+#~ msgid "Default Client"
+#~ msgstr "Vaikimisi klient"
+
+#~ msgid "Shell Settings"
+#~ msgstr "Kesta sätted"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "Rakendust hõlmavad sätted"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "_Osalejad..."
+
+#~ msgid "_Select Today"
+#~ msgstr "_Vali tänane kuupäev"
+
+#~ msgid "New Tab"
+#~ msgstr "Uus sakk"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Isiklikud andmed:</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Vastuvõtmise andmed:</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Saatmise andmed:</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Konto haldus</span>"
+
+#~ msgid "Name of the logger"
+#~ msgstr "Logiva komponendi nimi"
+
+#~ msgid "Filename"
+#~ msgstr "Failinimi"
+
+#~ msgid "The filename of the module"
+#~ msgstr "Mooduli failinimi"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "Kas plugin on lubatud või mitte"
+
+#~ msgid "Shell Module"
+#~ msgstr "Kesta moodul"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "Meilikesta taustprogramm"
+
+#~ msgid "Show Deleted"
+#~ msgstr "Kustutatuid näidatakse"
+
+#~ msgid "To Do"
+#~ msgstr "Ãœlesanne"
+
+#~ msgid "Later"
+#~ msgstr "Hiljem"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "Uut kataloogi `%s' pole võimalik luua: %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "Kausta `%s' pole võimalik kopeerida `%s': %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr ""
+#~ "Olemasolevaid postkaste asukohas '%s' pole võimalik läbi vaadata: %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
+#~ "versioonist muutunud.\n"
+#~ "\n"
+#~ "Palun oota, kuni Evolution siirdab sinu kaustu..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "Vana POP `%s' hoia-serveris andmeid pole võimalik avada: %s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "POP3 hoia-serveris andmekataloogi `%s' pole võimalik luua: %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "POP3 hoia-serveris `%s' andmeid pole võimalik kopeerida: %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "Tõrge kohapealse postisalvesti `%s' loomisel: %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "Eelmisest Evolutioni paigaldusest pole võimalik sätteid lugeda, "
+#~ "`evolution/configxmldb' pole olemas või on see rikutud."
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "Piiratud suurusega tekstiosa kuvamise lubamine"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "Piiratud suurusega tekstiosa kuvamise lubamine."
+
+#~ msgid "Text message part limit"
+#~ msgstr "Sõnumi tekstiosa piirang"
+
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>Vastus kirja päises</b> (pole soovitatav)"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "Põhjus: \"{0}\"."
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "Põhjus: \"{2}\"."
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Järgnevad otsingukaustad:\n"
+#~ "{0}\n"
+#~ "Kasutasid nüüdseks eemaldatud kausta:\n"
+#~ "    \"{1}\"\n"
+#~ "Otsingukaustad on nüüd uuendatud."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Järgnevad filtreerimisreeglid:\n"
+#~ "{0}\n"
+#~ "Kasutasid nüüdseks eemaldatud kausta:\n"
+#~ "    \"{1}\"\n"
+#~ "Reeglid on nüüd uuendatud."
+
+#~ msgid "Shell Backend"
+#~ msgstr "Kesta taustprogramm"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "Selles kaustas on ainult varjatud sõnumid. Nende nägemiseks vali Vaade -> "
+#~ "Kuva peidetud sõnumeid."
+
+#~ msgid "Table column:"
+#~ msgstr "Tabeli veerg:"
+
+#~ msgid "Source List"
+#~ msgstr "Allikate loend"
+
+#~ msgid "The registry of address books"
+#~ msgstr "Aadressiraamatute nimekiri"
+
+#~ msgid "Current View"
+#~ msgstr "Käesolev vaade"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "Praegu valitud aadressiraamatu vaade"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "Eelvaatlusel olev kontakt"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "Kontakt, mida kuvatakse eelvaatluspaanil"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "Eelvaade on nähtav"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "Kas eelvaatluspaan on nähtav"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "LDAP-serverid"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "Automaatlõpetamise sätted"
+
+#~ 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 ""
+#~ "Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
+#~ "versioonist muutunud.\n"
+#~ "\n"
+#~ "Palun oota, kuni Evolution siirdab sinu kaustad..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Postiloendi kontaktide salvestusvorming on muutunud.\n"
+#~ "\n"
+#~ "Palun oota, kuni Evolution siirdab sinu kaustad..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Viis, kuidas Evolution salvestab mõningaid telefoninumbreid, on "
+#~ "muutunud.\n"
+#~ "\n"
+#~ "Palun oota, kuni Evolution siirdab sinu kaustad..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Evolutioni Palm Sync muutuste logi ja kaardifailid on muutunud.\n"
+#~ "\n"
+#~ "Palun oota, kuni Evolution migreerib sinu Pilot Sync andmed..."
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "Allika valija vidin"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "See vidin kuvab aadressiraamatute gruppe"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "Salvesta vKaardina..."
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "Kalendrite register"
+
+#~ 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 ""
+#~ "Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
+#~ "versioonist muutunud.\n"
+#~ "\n"
+#~ "Palun oota, kuni Evolution siirdab sinu kaustad..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr ""
+#~ "Vanade sätete migreerimine failist evolution/config.xmldb pole võimalik"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "Kalendrit `%s' pole võimalik siirdada"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "Kuupäeva navigeerimisvidin"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "See vidin kuvab pisikese kalendri"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "Vaikimisi kalendriklient"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "Vaikimisi klient kalendritoiminguteks"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "See vidin kuvab kalendreid gruppidena"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "Märkmeloendite nimekiri"
+
+#~ msgid "The memo table model"
+#~ msgstr "Märkmete tabeli mudel"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "Vaikimisi märkmeklient"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "Märkmetoimingute vaikimisi klient"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "See vidin kuvab märmeloendeid gruppidena"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "Ãœlesandeloendite register"
+
+#~ msgid "The task table model"
+#~ msgstr "Ãœlesannete tabeli mudel"
+
+#~ 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 ""
+#~ "Evolutioni kontaktikaustade asukoht ja hierarhia on pärast Evolution 1.x. "
+#~ "versiooni muutunud.\n"
+#~ "\n"
+#~ "Palun oota, kuni Evolution siirdab sinu kaustad..."
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "Ülesandeid `%s' pole võimalik siirdada"
+
+#~ msgid "Default Task Client"
+#~ msgstr "Vaikimisi ülesandeklient"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "Ãœlesandetegevuste vaikimisi klient"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "See vidin kuvab ülesandeloendeid gruppidena"
+
+#~ msgid "Group by Threads"
+#~ msgstr "Grupeeri lõimedena"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "Kas sõnumid grupeerida lõimedeks."
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Peida _loetud sõnumid"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "Kõigi loetud sõnumite ajutine peitmine"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Peida _valitud sõnumid"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "Valitud sõnumite ajutine peitmine"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "_Näita peidetud sõnumeid"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "Ajutiselt peidetud sõnumite peidust väljatoomine"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Peida _kustutatud sõnumid"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr ""
+#~ "Kustutatud sõnumite peitmine selle asemel, et neid läbikriipsutatuna "
+#~ "kuvada"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr ""
+#~ "Fraaside kirjeldamine, mille esinemisel näidatakse manuse puudumise kohta "
+#~ "meeldetuletust."
+
+#~ msgid "<b>Server</b>"
+#~ msgstr "<b>Server</b>"
+
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>Kasutajad:</b>"
+
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>Konto nimi</b>"
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "Hula toe lisamine Evolutionile."
+
+#~ msgid "Hula Support"
+#~ msgstr "Hula tugi"
+
+#~ msgid "_Accept"
+#~ msgstr "_Nõustu"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "Tööriistariba laad"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "Vahetaja tööriistariba laad"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "Tööriistariba on nähtav"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "Kas vahetaja on nähtaval"
+
+#~ msgid "Switcher Action"
+#~ msgstr "Vahetaja tegevus"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "Selle kestavaate vahetaja tegevus"
+
+#~ msgid "Page Number"
+#~ msgstr "Lehekülje number"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "Kestavaate märkmiku lehekülg"
+
+#~ msgid "Search Rule"
+#~ msgstr "Otsingufilter"
+
+#~ msgid "Criteria for the current search results"
+#~ msgstr "Nende otsingutulemuste kriteeriumid"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "Selle kestvaate EShellBackend"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "Kesta sisuvidin"
+
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr "Sisuvidin paikneb kestaakna paremal paanil"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Külgpaani kesta vidin"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr "Külgriba vidin paikneb kestaakna vasakul paanil"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "Kesta ülesanderiba vidin"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr "Ãœlesanderiba vidin paikneb kestaakna all"
+
+#~ msgid "Shell Window"
+#~ msgstr "Kestaken"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "Aken, millele kestavaade kuulub"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "Võtmefail, mis sisaldab vidina oleku andmeid"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "Kestavaate pealkiri"
+
+#~ msgid "Current View ID"
+#~ msgstr "Käesoleva vaate ID"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "Praeguse GAL-vaate ID"
+
+#~ msgid "Active Shell View"
+#~ msgstr "Aktiivse kesta vaade"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "Aktiivse kestaakna nimi"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "Kestakna EFocusTracker"
+
+#~ msgid "Geometry"
+#~ msgstr "Geomeetria"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "Esialgse akna geomeetriasõne"
+
+#~ msgid "Safe Mode"
+#~ msgstr "Ohutu režiim"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "Kas kestaaken peaks olema ohutus režiimis"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "Külgpaan on nähtav"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "Kas kestakna külgriba peaks nähtav olema"
+
+#~ msgid "Switcher Visible"
+#~ msgstr "Vahetaja on nähtav"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "Kas kestakna vahetusnupud peaksid olema nähtaval"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "Ülesanderiba on nähtav"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "Kas kestakna ülesanderiba peaks olema nähtav"
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "Kas kestakna tööriistariba peaks olema nähtav"
+
+#~ msgid "UI Manager"
+#~ msgstr "Kasutajaliidese haldur"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "Kestakna GtkUIManager"
+
+#~ msgid "Module Directory"
+#~ msgstr "Moodulite kataloog"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "Kataloog, millest laaditakse EModules"
+
+#~ msgid "Network Available"
+#~ msgstr "Võrk on saadaval"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "Kas võrguühendus on saadaval"
+
+#~ msgid "Online"
+#~ msgstr "Ãœhendatud"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "Kas kest on võrku ühendatud või mitte"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "Uuesti Evolutioni versioonist 1.4 migreerumisele sundimine"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "Uuendamiseks napib kettaruumi."
+
+#~ msgid "Really delete old data?"
+#~ msgstr "Kas tõesti kustutada vanad andmed?"
+
+#~ 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 ""
+#~ "Kogu &quot;evolution&quot; kataloogi sisu eemaldatakse jäädavalt.\n"
+#~ "\n"
+#~ "Sul on soovitatav kõik oma e-posti, kontaktide ja kalendrite andmed üle "
+#~ "vaadata ning enne vanade andmete kustutamist veenduda, et see Evolutioni "
+#~ "versioon käitub korrektselt.\n"
+#~ "\n"
+#~ "Pärast kustutamist pole sul võimalik ilma käsitsi sekkumiseta enam "
+#~ "Evolutioni vanemat versiooni kasutada.\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "Evolutioni eelmine versioon hoidis andmeid teises kohas.\n"
+#~ "\n"
+#~ "Kui valid andmete eemaldamise, siis eemaldatakse kogu kataloog &quot;"
+#~ "evolution&quot; jäädavalt. Kui valid andmete säilitamise, siis võid "
+#~ "hiljem omal vabal valikul kataloogi &quot;evolution&quot; käsitsi "
+#~ "eemaldada.\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "Sinu andmete ja sätete uuendamine vajab kuni {0} kettaruumi, kuid "
+#~ "saadaval on ainult {1}.\n"
+#~ "\n"
+#~ "Enne jätkamist pead oma kodukataloogis vabastama ruumi."
+
+#~ msgid "_Keep Data"
+#~ msgstr "_Säilita andmed"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "_Tuleta mulle hiljem meelde"
+
+#~ msgid "Edit"
+#~ msgstr "Redigeerimine"
+
+#~ msgid "Import"
+#~ msgstr "Impordi"
+
+#~ msgid "View"
+#~ msgstr "Vaata"
+
+#~ msgid "Collection"
+#~ msgstr "Kollektsioon"
+
+#~ msgid "Instance"
+#~ msgstr "Instants"
+
+#~ msgid "Factory"
+#~ msgstr "Factory"
+
+#~ msgid "Action"
+#~ msgstr "Tegevus"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "Näita _manuseriba"
+
+#~ msgid "Fill color"
+#~ msgstr "Täitevärvus"
+
+#~ msgid "GDK fill color"
+#~ msgstr "GDK täitevärvus"
+
+#~ msgid "Fill stipple"
+#~ msgstr "Täpiline täide"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "Vähim laius"
+
+#~ msgid "Minimum Width"
+#~ msgstr "Vähim laius"
+
+#~ msgid "Spacing"
+#~ msgstr "Jaotus"
+
+#~ msgid "The button state is online"
+#~ msgstr "Nupu olek on saadaval"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "Rõhtsuunaline asukoht"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "Paani asukoht, kui horisontaalselt suunatud"
+
+#~ msgid "Vertical Position"
+#~ msgstr "Püstsuunaline asukoht"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "Paani asukoht, kui vertikaalselt suunatud"
+
+#~ msgid "Proportion"
+#~ msgstr "Proportsioonid"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "Teise paani suuruse proportsioonid"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "Fikseeritud mõõtmed"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "Teise paani suuruse hoidmine suuruse muutmisel"
+
+#~ msgid "Cursor Row"
+#~ msgstr "Kursori rida"
+
+#~ msgid "Cursor Column"
+#~ msgstr "Kursori veerg"
+
+#~ msgid "Sorter"
+#~ msgstr "Sortija"
+
+#~ msgid "Selection Mode"
+#~ msgstr "Valimise režiim"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "Kursorirežiim"
+
+#~ msgid "Selected Column"
+#~ msgstr "Valitud veerg"
+
+#~ msgid "Focused Column"
+#~ msgstr "Fokusseeritud veerg"
+
+#~ msgid "Unselected Column"
+#~ msgstr "Valimata veerg"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "Läbikriipsutatud veerg"
+
+#~ msgid "Underline Column"
+#~ msgstr "Allajoonitud veerg"
+
+#~ msgid "Bold Column"
+#~ msgstr "Rasvane veerg"
+
+#~ msgid "Color Column"
+#~ msgstr "Värviline veerg"
+
+#~ msgid "BG Color Column"
+#~ msgstr "Taustavärviga veerg"
+
+#~ msgid "State"
+#~ msgstr "Seisund"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "Reavärvuste asendamine"
+
+#~ msgid "Draw focus"
+#~ msgstr "Haara fookus"
+
+#~ msgid "Cursor mode"
+#~ msgstr "Kursorirežiim"
+
+#~ msgid "Selection model"
+#~ msgstr "Valikumudel"
+
+#~ msgid "Length Threshold"
+#~ msgstr "Pikkuse lävi"
+
+#~ msgid "Uniform row height"
+#~ msgstr "Ühtlane rea kõrgus"
+
+#~ msgid "Frozen"
+#~ msgstr "Külmutatud"
+
+#~ msgid "Table header"
+#~ msgstr "Tabeli päis"
+
+#~ msgid "Table model"
+#~ msgstr "Tabeli mudel"
+
+#~ msgid "Cursor row"
+#~ msgstr "Kursori rida"
+
+#~ msgid "Sort Info"
+#~ msgstr "Sortimisandmed"
+
+#~ msgid "Always search"
+#~ msgstr "Alati otsitakse"
+
+#~ msgid "Use click to add"
+#~ msgstr "Klõpsa lisamiseks"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "Ridade vahekaugus"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr "Vertikaalne vahe ridade vahel. See lisatakse rea alla ja kohale."
+
+#~ msgid "ETree table adapter"
+#~ msgstr "ETree tabeliadapter"
+
+#~ msgid "Retro Look"
+#~ msgstr "Retrovälimus"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "Joonte ning +/- laiendajate joonistamine."
+
+#~ msgid "Expander Size"
+#~ msgstr "Laiendaja suurus"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Laienduse noole suurus"
+
+#~ msgid "popup"
+#~ msgstr "hüpikaken"
+
+#~ msgid "edit"
+#~ msgstr "redigeerimine"
+
+#~ msgid "toggle"
+#~ msgstr "lüliti"
+
+#~ msgid "expand"
+#~ msgstr "laienda"
+
+#~ msgid "Event Processor"
+#~ msgstr "Sündmusteprotsessor"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Bold"
+#~ msgstr "Rasvane"
+
+#~ msgid "Strikeout"
+#~ msgstr "Läbikriipsutatud"
+
+#~ msgid "Anchor"
+#~ msgstr "Ankur"
+
+#~ msgid "Justification"
+#~ msgstr "Rööpjoondus"
+
+#~ msgid "Clip Width"
+#~ msgstr "Klambri laius"
+
+#~ msgid "Clip Height"
+#~ msgstr "Klambri kõrgus"
+
+#~ msgid "Clip"
+#~ msgstr "Klamber"
+
+#~ msgid "X Offset"
+#~ msgstr "X-nihe"
+
+#~ msgid "Y Offset"
+#~ msgstr "Y-nihe"
+
+#~ msgid "Text width"
+#~ msgstr "Teksti laius"
+
+#~ msgid "Text height"
+#~ msgstr "Teksti kõrgus"
+
+#~ msgid "Use ellipsis"
+#~ msgstr "Ellipsite kasutamine"
+
+#~ msgid "Ellipsis"
+#~ msgstr "Ellipsid"
+
+#~ msgid "Line wrap"
+#~ msgstr "Reamurdmine"
+
+#~ msgid "Break characters"
+#~ msgstr "Murdmismärgid"
+
+#~ msgid "Max lines"
+#~ msgstr "Suurim ridade arv"
+
+#~ msgid "Draw borders"
+#~ msgstr "Piirjoonte näitamine"
+
+#~ msgid "Allow newlines"
+#~ msgstr "Reamurdmise lubamine"
+
+#~ msgid "Draw background"
+#~ msgstr "Tausta joonistamine"
+
+#~ msgid "Draw button"
+#~ msgstr "Nupu joonistamine"
+
+#~ msgid "Cursor position"
+#~ msgstr "Kursori asukoht"
+
+#~ msgid "IM Context"
+#~ msgstr "Välksõnumikontekst"
diff --git a/po/eu.po b/po/eu.po
index 5987368ead..50e4db00f8 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n"
-"POT-Creation-Date: 2010-03-27 10:09+0000\n"
-"PO-Revision-Date: 2010-03-27 16:54+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-17 15:16+0100\n"
+"PO-Revision-Date: 2010-03-22 18:30+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -2951,8 +2951,8 @@ msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
-"Asteburuak hileko ikuspegian konprimituko den edo ez (larunbata eta igandea "
-"asteko lanegun baten lekua hartuko dute)."
+"Asteburuak hileko ikuspegian konprimituko den edo ez (larunbata eta "
+"igandea asteko lanegun baten lekua hartuko dute)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to display the end time of events in the week and month views."
@@ -3306,15 +3306,6 @@ msgstr "_Gehitu"
 msgid "Alarms"
 msgstr "Alarmak"
 
-#. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
-#: ../calendar/gui/e-day-view-time-item.c:797
-#| msgid "None"
-msgctxt "cal-second-zone"
-msgid "None"
-msgstr "Bat ere ez"
-
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
 #: ../calendar/gui/e-timezone-entry.c:343
@@ -4218,13 +4209,6 @@ msgstr[1] "Hitzordua baino %d minutu lehenago"
 msgid "Customize"
 msgstr "Pertsonalizatu"
 
-#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
-#| msgid "None"
-msgctxt "cal-alarms"
-msgid "None"
-msgstr "Bat ere ez"
-
 #: ../calendar/gui/dialogs/event-page.ui.h:1
 msgid "1 day before appointment"
 msgstr "Hitzordua baino egun 1 lehenago"
@@ -4872,13 +4856,6 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
-#| msgid "None"
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "Bat ere ez"
-
 #: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
@@ -5254,14 +5231,6 @@ msgid ""
 "the menu below."
 msgstr "<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
 
-#. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
-#| msgid "None"
-msgctxt "cal-itip"
-msgid "None"
-msgstr "Bat ere ez"
-
 #: ../calendar/gui/e-itip-control.c:1187
 #: ../plugins/itip-formatter/itip-formatter.c:2329
 msgid "Tentatively Accepted"
@@ -6130,84 +6099,6 @@ msgstr "Libre/lanpetuta informazioa"
 msgid "Calendar information"
 msgstr "Egutegi-informazioa"
 
-#. Translators: This is part of the subject
-#. * line of a meeting request or update email.
-#. * The full subject line would be:
-#. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
-#| msgid "Accepted"
-msgctxt "Meeting"
-msgid "Accepted"
-msgstr "Onartua"
-
-#. Translators: This is part of the subject
-#. * line of a meeting request or update email.
-#. * The full subject line would be:
-#. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
-#| msgid "Tentatively Accepted"
-msgctxt "Meeting"
-msgid "Tentatively Accepted"
-msgstr "Oraingoz onartua"
-
-#. Translators: This is part of the subject
-#. * line of a meeting request or update email.
-#. * The full subject line would be:
-#. * "Declined: Meeting Name".
-#. Translators: This is part of the subject line of a
-#. * meeting request or update email.  The full subject
-#. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
-#| msgid "Declined"
-msgctxt "Meeting"
-msgid "Declined"
-msgstr "Ukatua"
-
-#. Translators: This is part of the subject
-#. * line of a meeting request or update email.
-#. * The full subject line would be:
-#. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
-#| msgid "Delegated"
-msgctxt "Meeting"
-msgid "Delegated"
-msgstr "Delegatua"
-
-#. Translators: This is part of the subject line of a
-#. * meeting request or update email.  The full subject
-#. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
-#| msgid "Update"
-msgctxt "Meeting"
-msgid "Updated"
-msgstr "Eguneratua"
-
-#. Translators: This is part of the subject line of a
-#. * meeting request or update email.  The full subject
-#. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
-#| msgid "Cancel"
-msgctxt "Meeting"
-msgid "Cancel"
-msgstr "Utzita"
-
-#. Translators: This is part of the subject line of a
-#. * meeting request or update email.  The full subject
-#. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
-#| msgid "Re_fresh"
-msgctxt "Meeting"
-msgid "Refresh"
-msgstr "Freskatua"
-
-#. Translators: This is part of the subject line of a
-#. * meeting request or update email.  The full subject
-#. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
-msgctxt "Meeting"
-msgid "Counter-proposal"
-msgstr "Kontraproposamena"
-
 #: ../calendar/gui/itip-utils.c:804
 #, c-format
 msgid "Free/Busy information (%s to %s)"
@@ -8479,7 +8370,7 @@ msgstr "Idatzi zure helbide elektronikoa."
 
 #: ../capplet/settings/mail-account-view.c:58
 msgid "The email address you have entered is invalid."
-msgstr "Sartu duzun helb. elektronikoa ez da baliozkoa."
+msgstr "Sartu duzun helbide elektronikoa ez da baliozkoa."
 
 #: ../capplet/settings/mail-account-view.c:224
 msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
@@ -8543,9 +8434,9 @@ msgid ""
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
 msgstr ""
-"Ezin izan da zure posta automatikoki eskuratzeko ezarpenak funtzionatu "
-"erazi. Sartu behean. Sartu dituzun datuekin hasten saiatuko da, hala ere "
-"baliteke datu horiek zuk aldatu beharra izatea."
+"Ezin izan da zure posta automatikoki eskuratzeko ezarpenak funtzionatu erazi. Sartu "
+"behean. Sartu dituzun datuekin hasten saiatuko da, hala ere baliteke datu "
+"horiek zuk aldatu beharra izatea."
 
 #: ../capplet/settings/mail-account-view.c:359
 msgid "You can specify more options to configure the account."
@@ -10285,13 +10176,6 @@ msgstr ""
 "lizentzia-kontratua,\n"
 "eta, onartzeko, hautatu kontrol-laukia.\n"
 
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
-#| msgid "None"
-msgctxt "mail-signature"
-msgid "None"
-msgstr "Bat ere ez"
-
 #: ../mail/em-account-editor.c:965
 msgid "Never"
 msgstr "Inoiz ere ez"
@@ -10304,13 +10188,6 @@ msgstr "Beti"
 msgid "Ask for each message"
 msgstr "Galdetu mezu bakoitzean"
 
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
-#| msgid "None"
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "Bat ere ez"
-
 #: ../mail/em-account-editor.c:2061
 msgid "Mail Configuration"
 msgstr "Posta-konfigurazioa"
@@ -10766,31 +10643,6 @@ msgstr "\"%s\": karpetak eskaneatzen"
 msgid "Folder names cannot contain '/'"
 msgstr "Karpeta-izenak ezin du '/' karaktererik eduki."
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:1083
-#, c-format
-#| msgid "%s = %s"
-msgctxt "folder-display"
-msgid "%s (%u%s)"
-msgstr "%s (%u%s)"
-
 #: ../mail/em-folder-tree.c:1289
 msgid "Mail Folder Tree"
 msgstr "Posta-karpetaren zuhaitza"
@@ -10967,7 +10819,7 @@ msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
-"Evolution-ek ezin du mezu hau erakutsi luzeegia delako kudeatzeko. Formaturik "
+"Evolutionek ezin du mezu hau erakutsi luzeegia delako kudeatzeko. Formaturik "
 "gabe ikus dezakezu edo kanpoko testu editore batekin."
 
 #: ../mail/em-format-html-display.c:738
@@ -14183,7 +14035,7 @@ msgstr "Kontaktuen aurrebistaren panelaren posizioa bertikalki orientatutakoan."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Show autocompleted name with an address"
-msgstr "Erakutsi automatikoki osatutako izena helbide batetin"
+msgstr "Erakutsi automatikoki osatutako izena helbide batekin"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show preview pane"
@@ -14247,34 +14099,16 @@ msgstr "Erakutsi _beti helbidea auto-osatutako kontaktuarekin"
 msgid "On LDAP Servers"
 msgstr "LDAP zerbitzarian"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
-#| msgid "Contact"
-msgctxt "New"
-msgid "_Contact"
-msgstr "_Kontaktua"
-
 #: ../modules/addressbook/e-book-shell-backend.c:342
 #: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "Create a new contact"
 msgstr "Sortu kontaktu berria"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
-#| msgid "Contact List"
-msgctxt "New"
-msgid "Contact _List"
-msgstr "Kontaktuen _zerrenda"
-
 #: ../modules/addressbook/e-book-shell-backend.c:349
 #: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "Create a new contact list"
 msgstr "Sortu kontaktu-zerrenda berria"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
-#| msgid "Address Book"
-msgctxt "New"
-msgid "Address _Book"
-msgstr "Helbide-_liburua"
-
 #: ../modules/addressbook/e-book-shell-backend.c:359
 #: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "Create a new address book"
@@ -14711,7 +14545,7 @@ msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
 msgstr ""
-"Bilaketa-iragazkia bilatutako objektuen mota da, bilaketa lantzen den "
+"Bilaketa-iragazkita bilatutako objektuen mota da, bilaketa lantzen den "
 "bitartean. Hau ez bada aldatzen \"pertsona\" motan landuko da lehenespeneko "
 "bilaketa."
 
@@ -14804,43 +14638,19 @@ msgstr "Eguraldia"
 msgid "Birthdays & Anniversaries"
 msgstr "Urtebetetzeak eta urteurrenak"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
-#| msgid "Appointment"
-msgctxt "New"
-msgid "_Appointment"
-msgstr "_Hitzordua"
-
 #: ../modules/calendar/e-cal-shell-backend.c:448
 #: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new appointment"
 msgstr "Sortu hitzordu berria"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
-#| msgid "A_ppointments"
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "Egun _osoko hitzordua"
-
 #: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new all-day appointment"
 msgstr "Sortu egun osoko hitzordu berria"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
-#| msgid "New Meeting"
-msgctxt "New"
-msgid "M_eeting"
-msgstr "_Bilera"
-
 #: ../modules/calendar/e-cal-shell-backend.c:462
 msgid "Create a new meeting request"
 msgstr "Sortu bilera-eskaera berria"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
-#| msgid "Calendar"
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "_Egutegia"
-
 #: ../modules/calendar/e-cal-shell-backend.c:472
 #: ../modules/calendar/e-cal-shell-view-actions.c:1274
 msgid "Create a new calendar"
@@ -15312,28 +15122,10 @@ msgstr "_Gorde iCalendar gisa..."
 msgid "Print the selected task"
 msgstr "Inprimatu hautatutako zeregina"
 
-#: ../modules/calendar/e-memo-shell-backend.c:318
-#| msgid "Memo"
-msgctxt "New"
-msgid "Mem_o"
-msgstr "_Zirkularra"
-
-#: ../modules/calendar/e-memo-shell-backend.c:325
-#| msgid "_Open Memo"
-msgctxt "New"
-msgid "_Shared Memo"
-msgstr "_Partekatutako zirkularra"
-
 #: ../modules/calendar/e-memo-shell-backend.c:327
 msgid "Create a new shared memo"
 msgstr "Sortu partekatutako zirkular berria"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
-#| msgid "Memo List"
-msgctxt "New"
-msgid "Memo Li_st"
-msgstr "Zirkularren _zerrenda"
-
 #: ../modules/calendar/e-memo-shell-backend.c:337
 #: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "Create a new memo list"
@@ -15459,28 +15251,10 @@ msgstr "Ezabatu zirkularrak"
 msgid "Delete Memo"
 msgstr "Ezabatu zirkularra"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
-#| msgid "_Task"
-msgctxt "New"
-msgid "_Task"
-msgstr "_Zeregina"
-
-#: ../modules/calendar/e-task-shell-backend.c:329
-#| msgid "_Assign Task"
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "E_sleitutako zeregina"
-
 #: ../modules/calendar/e-task-shell-backend.c:331
 msgid "Create a new assigned task"
 msgstr "Sortu esleitutako zeregin berria"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
-#| msgid "Task List"
-msgctxt "New"
-msgid "Tas_k List"
-msgstr "_Zereginen zerrenda"
-
 #: ../modules/calendar/e-task-shell-backend.c:341
 #: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "Create a new task list"
@@ -15671,30 +15445,10 @@ msgstr "Ezabatu zeregina"
 msgid "%d attached messages"
 msgstr "Erantsitako %d mezu"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
-#| msgid "None"
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "Bat ere ez"
-
-#: ../modules/mail/e-mail-shell-backend.c:168
-#| msgid "_Edit Message"
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "_Mezua"
-
 #: ../modules/mail/e-mail-shell-backend.c:170
 msgid "Compose a new mail message"
 msgstr "Prestatu posta-mezu berria"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
-#| msgid "Mail Folder Tree"
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "Posta _karpeta"
-
 #: ../modules/mail/e-mail-shell-backend.c:180
 msgid "Create a new mail folder"
 msgstr "Sortu posta-karpeta berria"
@@ -16788,14 +16542,6 @@ msgstr "Eguraldia: trumoi-ekaitza"
 msgid "Select a location"
 msgstr "Hautatu kokaleku bat"
 
-#. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
-#| msgid "None"
-msgctxt "weather-cal-location"
-msgid "None"
-msgstr "Bat ere ez"
-
 #: ../plugins/calendar-weather/calendar-weather.c:446
 msgid "_Units:"
 msgstr "_Unitateak:"
@@ -16919,14 +16665,6 @@ msgstr "Ezkutukoa"
 msgid "Top secret"
 msgstr "Ezkutu gorenekoa"
 
-#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
-#. indicating the header will not be added to a mail message
-#: ../plugins/email-custom-header/email-custom-header.c:379
-#| msgid "None"
-msgctxt "email-custom-header"
-msgid "None"
-msgstr "Bat ere ez"
-
 #: ../plugins/email-custom-header/email-custom-header.c:569
 msgid "_Custom Header"
 msgstr "_Goiburu pertsonalizatuak"
@@ -18675,7 +18413,7 @@ msgstr "Sortu zirkular berri bat hautatutako mezutik"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create a _Task"
-msgstr "Sortu z_eregina"
+msgstr "Sortu z_eeregina"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1076
 msgid "Create a new task from the selected message"
@@ -18842,7 +18580,7 @@ msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
 msgstr ""
-"Uneko karpetako mezuak soilik irakurritako gisa markatzea nahi duzu, edo "
+"Uneko karpetako mezuak soilikm irakurritako gisa markatzea nahi duzu, edo "
 "uneko karpetan eta haren azpikarpeta guztietan ere bai?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:168
@@ -19874,7 +19612,7 @@ msgstr "Aldatzailearen ekintza"
 
 #: ../shell/e-shell-view.c:676
 msgid "The switcher action for this shell view"
-msgstr "Aldatzailearen ekintza shell-aren ikuspegi honentzako"
+msgstr "Aldatzailearen eskintza shell-aren ikuspegi honentzako"
 
 #: ../shell/e-shell-view.c:691
 msgid "Page Number"
@@ -20132,7 +19870,7 @@ msgstr "_Bilatu"
 
 #: ../shell/e-shell-window-actions.c:1663
 msgid "_Switcher Appearance"
-msgstr "_Aldatzailea itxura"
+msgstr "_Konmutadorearen itxura"
 
 #: ../shell/e-shell-window-actions.c:1677
 msgid "_Window"
@@ -20566,22 +20304,10 @@ msgstr ""
 "\n"
 "Jarraitzea aukeratu baduzu, zenbait datu zahar ezingo dituzu erabili.\n"
 
-#: ../shell/test/e-test-shell-backend.c:60
-#| msgid "B_est Fit"
-msgctxt "New"
-msgid "_Test Item"
-msgstr "_Probako elementua"
-
 #: ../shell/test/e-test-shell-backend.c:62
 msgid "Create a new test item"
 msgstr "Sortu probako elementu berria"
 
-#: ../shell/test/e-test-shell-backend.c:70
-#| msgid "Resource"
-msgctxt "New"
-msgid "Test _Source"
-msgstr "Probako _iturburua"
-
 #: ../shell/test/e-test-shell-backend.c:72
 msgid "Create a new test source"
 msgstr "Sortu probako iturburu berria"
@@ -21589,14 +21315,6 @@ msgstr "_Gaur"
 msgid "_None"
 msgstr "_Bat ere ez"
 
-#. Translators: "None" for date field of a date edit, shown when
-#. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
-#| msgid "None"
-msgctxt "date"
-msgid "None"
-msgstr "Bat ere ez"
-
 #: ../widgets/misc/e-dateedit.c:1834
 msgid "Invalid Date Value"
 msgstr "Baliogabeko data balioa"
@@ -21715,7 +21433,7 @@ msgstr "Evolution linean dago. Egin klik botoi honetan lineaz kanpo lan egiteko.
 
 #: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
-msgstr "Evolution lineaz kanpo dago. Egin klik botoi honetan linean lan egiteko."
+msgstr "Evolution lineaz kanpo dago.Egin klik botoi honetan linean lan egiteko."
 
 #: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
@@ -22067,13 +21785,6 @@ msgstr "Zerrenda laster-leihoan"
 msgid "Now"
 msgstr "Orain"
 
-#. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:320
-#| msgid "None"
-msgctxt "table-date"
-msgid "None"
-msgstr "Bat ere ez"
-
 #: ../widgets/table/e-cell-date-edit.c:328
 msgid "OK"
 msgstr "Ados"
@@ -22228,7 +21939,7 @@ msgstr "_Erakutsi eremua ikuspegian"
 
 #: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
-msgstr "_Erakutsi eremuak ordenan:"
+msgstr "_Erakutsi eremuak ordenean:"
 
 #: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
@@ -22433,7 +22144,7 @@ msgstr ""
 
 #: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
 msgid "ETree table adapter"
-msgstr "Etree taulako egokitzailea"
+msgstr "ETree taulako egokitzailea"
 
 #: ../widgets/table/e-tree.c:3413
 msgid "Retro Look"
diff --git a/po/fr.po b/po/fr.po
index 174d078e41..f8d83f5033 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -24,13 +24,13 @@
 # Claude Paroz <claude@2xlibre.net>, 2007-2010.
 # Laurent Coudeur <laurentc@iol.ie>, 2010.
 #
-#: ../shell/main.c:479
+#: ../shell/main.c:454
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
-"POT-Creation-Date: 2010-03-18 11:05+0000\n"
+"POT-Creation-Date: 2010-04-26 21:49+0000\n"
 "PO-Revision-Date: 2010-03-19 21:12+0100\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -118,7 +118,7 @@ msgstr "L'authentification sur le serveur LDAP a échoué."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1267
 msgid "Failed to delete contact"
 msgstr "La suppression du contact a échoué"
 
@@ -242,7 +242,7 @@ msgstr ""
 "Vos contacts pour {0} ne seront plus disponibles tant que Evolution n'aura "
 "pas été redémarré."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -265,16 +265,6 @@ msgstr "_Redimensionner"
 msgid "_Use as it is"
 msgstr "_Utiliser tel quel"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Adresse de synchronisation par défaut :"
@@ -291,7 +281,7 @@ msgstr "Impossible de lire les données de l'application Adresses du Pilot"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2005
 msgid "Anniversary"
 msgstr "Anniversaire"
 
@@ -302,37 +292,39 @@ msgstr "Anniversaire"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2004 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:107
 msgid "Birthday"
 msgstr "Date de naissance"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "Blog :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tégories..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "Calendrier :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
 msgid "Contact"
 msgstr "Contact"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2568
 msgid "Contact Editor"
 msgstr "Éditeur de contacts"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
@@ -341,221 +333,189 @@ msgstr "Éditeur de contacts"
 msgid "Email"
 msgstr "Adresse électronique"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "Libre/Occupé :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "_Nom complet..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "Domicile"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "Site Web :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Image"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "Messagerie instantanée"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Travail"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Adresse postale"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "_Surnom :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Notes"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1711
 msgid "Other"
 msgstr "Autre"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "Vidéo-conférence :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Sites Web"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "Journal en ligne :"
-
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Bureau"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "_Adresse :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "_Anniversaire :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "_Adjoint :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "Date de _naissance :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+msgid "_Blog:"
+msgstr "_Blog"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 #: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "C_alendrier :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "_Ville :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "_Société :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "_Pays :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "_Service :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "_Classer sous :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "_Libre/Occupé :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "_Site Web :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "_Directeur :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "_Bureau :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "_Boîte postale :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "_Profession :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "_Conjoint(e) :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "État/Pro_vince :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Titre :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "_Vidéo-conférence :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "_Préfère recevoir les courriels en HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "_Journal en ligne :"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Où :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "_Code postal :"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Nom"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "Modifiable"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -597,7 +557,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "Error adding contact"
 msgstr "Erreur lors de l'ajout du contact"
 
@@ -609,45 +569,21 @@ msgstr "Erreur lors de la modification du contact"
 msgid "Error removing contact"
 msgstr "Erreur lors de la suppression du contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Livre source"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "Livre cible"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "Nouveau contact"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Champs modifiables"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Champs requis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Modifié"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2563
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Éditeur de contacts - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2971
 msgid "Please select an image for this contact"
 msgstr "Sélectionnez une image pour ce contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2972
 msgid "_No image"
 msgstr "_Aucune image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -655,56 +591,46 @@ msgstr ""
 "La donnée sur le contact n'est pas valide :\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3249
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "« %s » n'a pas un format valide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3256
 #, 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:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3282
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s « %s » est vide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3296
 msgid "Invalid contact."
 msgstr "Contact non valide."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "Ajout express de contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "Mo_difier entièrement"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "_Nom complet"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "_Adresse électronique"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "_Sélectionner le carnet d'adresses"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Shell"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "Le singleton EShell"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr"
@@ -771,7 +697,7 @@ msgid "_Suffix:"
 msgstr "_Suffixe :"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:676
 msgid "Contact List Editor"
 msgstr "Éditeur de liste de contacts"
 
@@ -788,7 +714,7 @@ msgid "_List name:"
 msgstr "_Nom de la liste :"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:157
 msgid "_Select..."
 msgstr "_Sélectionner..."
 
@@ -798,39 +724,27 @@ 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:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:769
 msgid "Contact List Members"
 msgstr "Membres de la liste de contacts"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:917
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1333
 msgid "_Members"
 msgstr "_Membres"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error adding list"
 msgstr "Erreur lors de l'ajout de la liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error modifying list"
 msgstr "Erreur lors de la modification de la liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1200
 msgid "Error removing list"
 msgstr "Erreur lors de la suppression de la liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Carnet"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "Est une nouvelle liste"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contact modifié :"
@@ -869,31 +783,31 @@ msgstr ""
 "dans ce dossier. Voulez-vous quand même l'ajouter ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "_Fusionner"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 msgid "Merge Contact"
 msgstr "Fusionner le contact"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "L'adresse commence par"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "Le nom contient"
 
@@ -912,91 +826,62 @@ msgstr[1] "%d contacts"
 msgid "Error getting book view"
 msgstr "Erreur d'obtention de l'affichage du carnet"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "Requête"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
 msgstr "Recherche interrompue"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Modèle"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Erreur lors de la modification de la carte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
 msgid "Cut selected contacts to the clipboard"
 msgstr "Coupe les contacts sélectionnés vers le presse-papiers"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copie les contacts sélectionnés dans le presse-papiers"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Paste contacts from the clipboard"
 msgstr "Colle les contacts depuis le presse-papiers"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "Supprimer les contacts sélectionnés"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 msgid "Select all visible contacts"
 msgstr "Sélectionne tous les contacts visibles"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Vue du shell"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Source"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Voulez-vous vraiment supprimer ces listes de contacts ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1289
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Voulez-vous vraiment supprimer cette liste de contacts ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1293
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Voulez-vous vraiment supprimer cette liste de contacts (%s) ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Voulez-vous vraiment supprimer ces contacts ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 msgid "Are you sure you want to delete this contact?"
 msgstr "Voulez-vous vraiment supprimer ce contact ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Voulez-vous vraiment supprimer ce contact (%s) ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1462
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1005,11 +890,11 @@ msgstr ""
 "L'affichage de %d contacts implique l'ouverture de %d nouvelles fenêtres.\n"
 "Voulez-vous vraiment afficher tous ces contacts ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1467
 msgid "_Don't Display"
 msgstr "_Ne pas afficher"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 msgid "Display _All Contacts"
 msgstr "Afficher _tous les contacts"
 
@@ -1169,7 +1054,6 @@ msgid "Telex"
 msgstr "Télex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "Titre"
 
@@ -1181,59 +1065,7 @@ msgstr "Unité"
 msgid "Web Site"
 msgstr "Site Web"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Largeur"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Hauteur"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "A le focus"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Champ"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Nom du champ"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Modèle de texte"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Longueur max. du nom du champ"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Largeur des colonnes"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1243,7 +1075,7 @@ msgstr ""
 "\n"
 "Recherche des contacts..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1257,7 +1089,7 @@ msgstr ""
 "\n"
 "ou double-cliquez ici pour créer un nouveau contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1271,7 +1103,7 @@ msgstr ""
 "\n"
 "Double-cliquez ici pour créer un nouveau contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1281,7 +1113,7 @@ msgstr ""
 "\n"
 "Rechercher le contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1291,10 +1123,6 @@ msgstr ""
 "\n"
 "Il n'y a aucun élément à afficher dans cette vue."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Adaptateur"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Adresse électronique (travail)"
@@ -1304,18 +1132,10 @@ msgid "Home Email"
 msgstr "Adresse électronique (domicile)"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "Autre adresse électronique"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Sélectionné"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "A le curseur"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1358,17 +1178,17 @@ msgid "Copy _Email Address"
 msgstr "Copier l'_adresse électronique"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:381
 msgid "Copy the email address to the clipboard"
 msgstr "Copie l'adresse électronique dans le presse-papiers"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:386
 msgid "_Send New Message To..."
 msgstr "Envoyer un nouveau _message à..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:388
 msgid "Send a mail message to this address"
 msgstr "Envoie un courriel à cette adresse"
 
@@ -1404,22 +1224,21 @@ msgid "Video Chat"
 msgstr "Vidéo-conférence"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:496
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "Calendrier"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:116
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Libre/Occupé"
@@ -1447,21 +1266,19 @@ msgid "Web Log"
 msgstr "Journal en ligne"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
+#: ../capplet/settings/mail-capplet-shell.c:350
 #: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/addressbook/e-book-shell-migrate.c:134
 #: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Personnel"
@@ -1478,8 +1295,8 @@ msgstr "Page Web personnelle"
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliquer pour envoyer un courriel à %s"
@@ -1536,11 +1353,11 @@ msgstr "Protocole non pris en charge"
 #. To Translators: This is task status
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2659
 msgid "Canceled"
 msgstr "Annulé"
 
@@ -1678,27 +1495,27 @@ msgstr "Cette requête ne s'est pas terminée correctement."
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "Sélection du carnet d'adresses"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "Déplacer le contact vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "Copier le contact vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "Déplacer les contacts vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "Copier les contacts vers"
 
@@ -1710,7 +1527,7 @@ msgstr "Affichage de la carte"
 #: ../addressbook/importers/evolution-ldif-importer.c:516
 #: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importation..."
 
@@ -1832,20 +1649,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accès anonyme au serveur LDAP"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "L'authentification a échoué.\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
 
 #: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -2002,46 +1819,42 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "Voulez-vous vraiment envoyer la tâche sans résumé ?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "Le dépôt du calendrier est hors ligne."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Impossible de créer un nouvel évènement"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Impossible d'enregistrer l'évènement"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Supprimer le calendrier « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Supprimer la liste des mémos « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Supprimer la liste des tâches « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "_Ne pas envoyer"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Téléchargement en cours. Voulez-vous enregistrer ce rendez-vous ?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Téléchargement en cours. Voulez-vous enregistrer la tâche ?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "L'éditeur ne peut pas être chargé."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -2049,31 +1862,26 @@ msgstr ""
 "Des invitations vont être envoyées par courriel à tous les participants, les "
 "autorisant à accepter cette tâche."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Des invitations vont être envoyées par courriel à tous les participants, les "
 "autorisant à répondre à celle-ci."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Erreur lors du chargement du calendrier"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Erreur lors du chargement de la liste des mémos"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Erreur lors du chargement de la liste des tâches"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "Erreur sur « {0} »"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2081,7 +1889,7 @@ msgstr ""
 "Si vous n'envoyez pas un avis d'annulation, les autres participants ne "
 "seront pas nécessairement informés que la réunion a été annulée."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2089,7 +1897,7 @@ msgstr ""
 "Si vous n'envoyez pas un avis d'annulation, les autres participants ne "
 "seront pas nécessairement informés que le mémo a été supprimé."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2097,11 +1905,7 @@ msgstr ""
 "Si vous n'envoyez pas un avis d'annulation, les autres participants ne "
 "seront pas nécessairement informés que la tâche a été supprimée."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "Le serveur ne répond pas."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2109,7 +1913,7 @@ msgstr ""
 "L'envoi d'informations à jour permet aux autres participants de maintenir à "
 "jour leurs calendriers."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2117,7 +1921,7 @@ msgstr ""
 "L'envoi d'informations à jour permet aux autres participants de maintenir à "
 "jour leurs listes de tâches."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2125,7 +1929,7 @@ msgstr ""
 "Des pièces jointes ont été téléchargées mais l'enregistrement du rendez-vous "
 "sera effectué, sans les pièces jointes, auxquelles il est associé."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2133,101 +1937,97 @@ msgstr ""
 "Des pièces jointes ont été téléchargées mais l'enregistrement de la tâche "
 "sera effectué, sans les pièces jointes, auxquelles elle est associée."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Certaines fonctionnalités peuvent ne pas fonctionner correctement avec la "
 "version actuelle de votre serveur."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Le calendrier d'Evolution a quitté de façon inattendue."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Les calendriers d'Evolution ont quitté de façon inattendue."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Le mémo d'Evolution a quitté de façon inattendue."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:54
 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:59
+#: ../calendar/calendar.error.xml.h:55
 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:60
+#: ../calendar/calendar.error.xml.h:56
 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."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "La liste des tâches n'est pas marquée pour une utilisation hors ligne."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Ce calendrier sera définitivement supprimé."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "Cette liste des mémos sera définitivement supprimée."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Cette liste des tâches sera définitivement supprimée."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "Impossible de charger le calendrier"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Voulez-vous enregistrer les modifications apportées à ce rendez-vous ?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Voulez-vous enregistrer les modifications apportées à cette réunion ?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "Voulez-vous enregistrer les modifications apportées à ce mémo ?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "Voulez-vous enregistrer les modifications apportées à cette tâche ?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Voulez-vous envoyer un avis d'annulation pour ce mémo ?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Voulez-vous envoyer un avis d'annulation à tous les participants ?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Voulez-vous envoyer des invitations pour la réunion aux participants ?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "Voulez-vous envoyer cette tâche aux participants ?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "Voulez-vous envoyer des informations mises à jour sur la réunion aux "
 "participants ?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "Voulez-vous envoyer des informations mises à jour sur la tâche aux "
 "participants ?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2238,67 +2038,63 @@ msgstr ""
 "meilleurs résultats, il est recommandé de mettre à niveau votre serveur vers "
 "une version prise en charge."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:72
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Les modifications de ce rendez-vous n'ont pas encore été enregistrées."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Les modifications de cette réunion n'ont pas encore été enregistrées."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Les modifications de cette tâche n'ont pas encore été enregistrées."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Les modifications de ce mémo n'ont pas encore été enregistrées."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Vos calendriers ne seront pas disponibles tant que Evolution n'aura pas été "
 "redémarré."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Vos mémos ne seront pas disponibles tant que Evolution n'aura pas été "
 "redémarré."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Vos tâches ne seront pas disponibles tant que Evolution n'aura pas été "
 "redémarré."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "A_bandonner les modifications"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Enregistrer les modifications"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Envoyer un avis"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Partager les évènements sur plusieurs jours :"
@@ -2353,7 +2149,7 @@ msgid_plural "hours"
 msgstr[0] "heure"
 msgstr[1] "heures"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "Heure de début"
 
@@ -2370,8 +2166,8 @@ msgstr "_Tout fermer"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1573
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "Lieu :"
 
@@ -2384,11 +2180,11 @@ msgid "_Dismiss"
 msgstr "_Fermer"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:1015
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1625
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "É_dition"
@@ -2398,10 +2194,10 @@ msgid "_Snooze"
 msgstr "_Reporter"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "heures"
 
@@ -2409,11 +2205,12 @@ msgstr "heures"
 msgid "location of appointment"
 msgstr "lieu du rendez-vous"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "minutes"
 
@@ -2436,13 +2233,13 @@ msgstr "Aucune information sur le lieu."
 msgid "You have %d alarms"
 msgstr "%d alarmes sont présentes"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2455,7 +2252,7 @@ msgstr ""
 "un courriel. Evolution affichera une fenêtre\n"
 "d'avertissement classique à la place."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2472,7 +2269,7 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment lancer ce programme ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "Ne plus m'interroger à propos de ce programme."
 
@@ -2514,7 +2311,7 @@ msgid "Alarm programs"
 msgstr "Exécutions par alarme"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Durée d'affichage en secondes de l'erreur dans la barre d'état."
 
@@ -2537,162 +2334,157 @@ msgid "Calendars to run alarms for"
 msgstr "Calendriers pour lesquels lancer les alarmes"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr ""
-"Cochez cette case pour utiliser le fuseau horaire du système dans Evolution."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Couleur de la ligne de l'heure actuelle (MBL) dans la barre de temps (vide "
 "par défaut)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr ""
 "Couleur de la ligne de l'heure actuelle (MBL) dans l'affichage du jour."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "Compresser les week-ends dans la vue mensuelle"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Confirmer le nettoyage"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr ""
 "Nombre de récurrences par défaut pour un nouvel évènement. -1 signifie pour "
 "toujours."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 "Jours pour lesquels les heures de début et de fin du travail doivent être "
 "indiquées."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "Rappel par défaut des rendez-vous"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "Nombre de récurrences par défaut"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Unités par défaut du rappel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Valeur par défaut du rappel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "Répertoire de sauvegarde des fichiers d'alarmes audio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "Dégradé de l'évènement"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "Transparence de l'évènement"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "URL des serveurs Libre/Occupé"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "URL du modèle Libre/Occupé"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "Dégradé des évènements dans les vues du calendrier."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "Masquer les tâches terminées"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "Masquer les unités des tâches"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "Masquer la valeur de la tâche"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "Position du panneau horizontal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 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.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 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.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 "Si « vrai », le panneau d'aperçu des mémos est affiché dans la fenêtre "
 "principale."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 "Si « vrai », le panneau d'aperçu des tâches est affiché dans la fenêtre "
 "principale."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Intervalles affichés dans les vues quotidiennes et hebdomadaires de travail, "
 "en minutes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "Dernier déclenchement de l'alarme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "Niveau au-delà duquel les messages doivent être journalisés."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 "Liste des fuseaux horaires secondaires récemment utilisés dans une vue "
 "quotidienne."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr ""
 "Liste des URL des serveurs pour les publications des informations de type "
 "Libre/Occupé."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Ligne de l'heure actuelle (MBL)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Couleur de la ligne de l'heure actuelle (MBL) - Vue du jour"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Couleur de la ligne de l'heure actuelle (MBL) - Barre de temps"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -2700,51 +2492,51 @@ msgstr ""
 "Nombre maximum de fuseaux horaires récemment utilisés à enregistrer dans une "
 "liste « day_second_zones »."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Nombre maximum de fuseaux horaires récemment utilisés à enregistrer."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "Style de l'agencement des mémos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "Position du panneau d'aperçu des mémos (horizontale)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "Position du panneau d'aperçu des mémos (verticale)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 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.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 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.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "Position du panneau horizontal dans la vue mensuelle"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "Position du panneau vertical dans la vue mensuelle"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 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.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 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.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "Couleur des tâches en retard"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -2752,7 +2544,7 @@ msgstr ""
 "Position du panneau horizontal hors vue mensuelle, entre le navigateur de "
 "dates du calendrier et la liste des tâches, en pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2760,21 +2552,21 @@ msgstr ""
 "Position du panneau horizontal 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.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "Position du panneau d'aperçu des mémos pour une orientation verticale."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 "Position du panneau d'aperçu des tâches pour une orientation horizontale."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 "Position du panneau d'aperçu des tâches pour une orientation verticale."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -2782,7 +2574,7 @@ msgstr ""
 "Position du panneau vertical, entre les listes du calendrier, et le "
 "navigateur de dates du calendrier."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2790,7 +2582,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.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -2798,90 +2590,90 @@ 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.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "Calendrier principal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "Liste principale de mémos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "Liste principale de tâches"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programmes qui peuvent être lancés par les alarmes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr ""
 "Fuseaux horaires secondaires récemment utilisés dans une vue quotidienne"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "Répertoire de sauvegarde des alarmes audio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "Faire défiler la vue mensuelle d'une semaine"
 
 # Resource Reservation Protocol
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 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.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 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.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 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.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 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.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "Afficher les alarmes dans la zone de notification"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Afficher le champ état dans l'éditeur d'évènement/tâche/réunion"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "Afficher le panneau d'aperçu des mémos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "Afficher le panneau d'aperçu des tâches"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 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.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 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.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show week number in Day and Work Week View"
 msgstr ""
 "Afficher le numéro de la semaine dans les vues quotidiennes et hebdomadaires "
 "de travail"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 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.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -2889,23 +2681,23 @@ msgstr ""
 "Si activé, affiche le fuseau horaire secondaire dans une vue quotidienne. La "
 "valeur est identique à celle utilisée pour une clé « timezone »."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
 msgstr "Style de l'agencement des tâches"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (horizontal)"
 msgstr "Position du panneau d'aperçu des tâches (horizontale)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Task preview pane position (vertical)"
 msgstr "Position du panneau d'aperçu des tâches (verticale)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Tasks due today color"
 msgstr "Couleurs des tâches à effectuer aujourd'hui"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2915,7 +2707,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.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2924,7 +2716,7 @@ 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.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -2935,7 +2727,7 @@ msgstr ""
 "sous la liste des mémos. « 1 » (vue verticale) place le panneau d'aperçu à "
 "côté de la liste des mémos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -2946,11 +2738,11 @@ msgstr ""
 "d'aperçu sous la liste des tâches. « 1 » (vue verticale) place le panneau "
 "d'aperçu à côté de la liste des tâches."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "The second timezone for a Day View"
 msgstr "Le fuseau horaire secondaire pour une vue quotidienne"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -2958,19 +2750,19 @@ msgstr ""
 "Cette option peut prendre les valeurs suivantes : 0 pour les erreurs, 1 pour "
 "les avertissements et 2 pour les messages de débogage."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time divisions"
 msgstr "Divisions horaires"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time the last alarm ran, in time_t."
 msgstr "Heure à laquelle la dernière alarme a été lancée, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -2978,73 +2770,73 @@ msgstr ""
 "Transparence des évènements dans la vue du calendrier, une valeur entre 0 "
 "(transparent) et 1 (opaque)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Twenty four hour time format"
 msgstr "Format de date 24 heures"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "URI du calendrier sélectionné (« principal »)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "URI de la liste de mémos sélectionnée (« principale »)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "URI de la liste de tâches sélectionnée (« principale »)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 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.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 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.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
 msgstr "Utiliser le fuseau horaire du système"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "Utiliser le fuseau horaire du système au lieu de celui défini dans Evolution."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Vertical pane position"
 msgstr "Position du panneau vertical"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "Début de la semaine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 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.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 "Indique s'il faut utiliser une icône de notification pour afficher les "
 "alarmes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr ""
 "Indique s'il faut demander une confirmation pour la suppression des rendez-"
 "vous ou des tâches."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 "Indique s'il faut demander une confirmation pour le nettoyage des rendez-"
 "vous et des tâches."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -3052,105 +2844,105 @@ 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.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indique s'il faut afficher l'heure de fin des évènements dans les vues "
 "hebdomadaire et mensuelle."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indique s'il faut dessiner la ligne Marcus Bains (ligne à la date actuelle) "
 "dans le calendrier."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Indique s'il faut masquer les tâches terminées dans la vue des tâches."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr ""
 "Indique s'il faut faire défiler la vue mensuelle d'une semaine et pas d'un "
 "mois."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to set a default reminder for appointments."
 msgstr ""
 "Indique s'il faut mettre en place un rappel par défaut des rendez-vous."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ RSVP dans l'éditeur d'évènement/tâche/"
 "réunion"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ catégories dans l'éditeur d'évènement/"
 "tâche/réunion"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ rôle dans l'éditeur d'évènement/tâche/"
 "réunion"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ état dans l'éditeur d'évènement/tâche/"
 "réunion"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indique s'il faut afficher l'heure en format 24h au lieu du format am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ fuseau horaire dans l'éditeur "
 "d'évènement/tâche/réunion"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ type dans l'éditeur d'évènement/tâche/"
 "réunion"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr ""
 "Indique s'il faut afficher le numéro de la semaine dans les vues "
 "quotidiennes et hebdomadaires de travail."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week numbers in the date navigator."
 msgstr ""
 "Indique s'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.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "Jours ouvrés"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "Heure à laquelle les jours ouvrés se terminent"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "Minute à laquelle les jours ouvrés se terminent"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "Heure à laquelle les jours ouvrés commencent"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "Minute à laquelle les jours ouvrés commencent"
 
@@ -3200,7 +2992,7 @@ msgid "Classification"
 msgstr "Classification"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3244,19 +3036,19 @@ msgid "Organizer"
 msgstr "Organisateur"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privé"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Public"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:299
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Récurrence"
@@ -3339,7 +3131,7 @@ msgstr "Alarme sonore personnalisée"
 msgid "Mes_sage:"
 msgstr "_Message :"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:77
 msgid "Options"
 msgstr "Options"
 
@@ -3386,11 +3178,12 @@ msgstr "jour(s)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "jours"
 
@@ -3399,19 +3192,20 @@ msgid "end of appointment"
 msgstr "la fin du rendez-vous"
 
 # Répéter l'alarme: x fois toutes les x minutes
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "fois toutes les"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "heure(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "minute(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "le début du rendez-vous"
 
@@ -3439,7 +3233,7 @@ msgstr "Aucune"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Sélectionner..."
 
@@ -3448,12 +3242,12 @@ msgid "Selected Calendars for Alarms"
 msgstr "Calendriers sélectionnés pour les alarmes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "Date et heure :"
+msgid "Ti_me and date:"
+msgstr "Date et _heure :"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "Date uniquement :"
+msgid "_Date only:"
+msgstr "_Date uniquement :"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3486,12 +3280,12 @@ msgstr "30 minutes"
 msgid "60 minutes"
 msgstr "60 minutes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "Alertes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "Format de date et d'heure"
@@ -3517,20 +3311,20 @@ msgid "Display alarms in _notification area only"
 msgstr "Afficher les alarmes dans la zone de _notification uniquement"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Vendredi"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../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:278 ../mail/mail-config.ui.h:54
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2660
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Général"
 
@@ -3543,7 +3337,7 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Lundi"
@@ -3557,186 +3351,198 @@ msgid "None"
 msgstr "Aucune"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "_Dim"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Samedi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Faire défile_r la vue mensuelle d'une semaine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Deuxième f_useau :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Sélectionnez les calendriers pour les notifications d'alarme"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "Aff_icher un rappel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "Afficher un _rappel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 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.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr ""
 "Afficher le n_uméro de la semaine dans les vues quotidiennes et "
 "hebdomadaires de travail"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "Tâches d'_aujourd'hui :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "_Jeu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Liste des tâches"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "Modèle :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Heure"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "Fuseau _horaire :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "Format de date :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Utiliser le fuseau horaire du s_ystème"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "La s_emaine débute un :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Work Week"
 msgstr "Sem. de travail"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "Jours ouvrés :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 heures (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 heures"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Demander une confirmation pour l'effacement des éléments"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Compresser les week-ends dans la vue mensuelle"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "La _journée débute à :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "_Ven"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Masquer les tâches effectuées après"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "Tâches en _retard :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "_Sam"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 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.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "Di_visions horaires :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "_Mar"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "M_er"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "avant chaque anniversaire"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "avant chaque rendez-vous"
 
@@ -3745,12 +3551,12 @@ msgid "Type:"
 msgstr "Type :"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "_Type :"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:149
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3774,35 +3580,35 @@ msgstr ""
 "_Copier localement le contenu de la liste des mémos pour les opérations hors "
 "ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "Couleu_r :"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Liste des mémos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Propriétés du calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "Nouveau calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "Propriétés de la liste des tâches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "Nouvelle liste de tâches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "Propriétés de la liste des mémos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "Nouvelle liste de mémos"
 
@@ -3862,254 +3668,234 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr "Erreur de validation : %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " À "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (terminé "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "Terminé "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (date d'échéance "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "Date d'échéance "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:237
 msgid "Could not save attachments"
 msgstr "Impossible d'enregistrer les pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:505
 msgid "Could not update object"
 msgstr "Impossible de mettre à jour l'objet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "Éditer le rendez-vous"
 
-#: ../calendar/gui/dialogs/comp-editor.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "Réunion - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tâche attribuée - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "Tâche - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "Mémo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:643
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "Aucun résumé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "Conserver l'élément d'origine ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "Cliquez ici pour fermer la fenêtre actuelle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1464
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "Copie la sélection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1471
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "Coupe la sélection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Supprime la sélection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "Cliquez ici pour voir l'aide disponible"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1513
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "Colle le contenu du presse-papiers"
 
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "Cliquez ici pour enregistrer la fenêtre actuelle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Sélectionne tout le texte"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "C_lassification"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1632
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1037
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "I_nsertion"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1674 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "_Pièce jointe..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
 msgstr "Cliquez ici pour joindre un fichier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "_Catégories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "L'état indique si les catégories sont affichées"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "Fu_seau horaire"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "L'état indique si le champ Fuseau horaire est affiché"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "Classer comme public"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "_Privé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "Classer comme privé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "_Confidentiel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "Classer comme confidentiel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "Champ _Rôle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "L'état indique si le champ Rôle est affiché"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "L'état indique si le champ RSVP est affiché"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "Champ _État"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "L'état indique si le champ État est affiché"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "Champ _Type"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "L'état indique si le champ Type de participant est affiché"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "_Documents récents"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:477
 msgid "Attach"
 msgstr "Joindre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2958
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Les modifications effectuées sur cet élément peuvent être annulées en cas de "
 "réception d'une mise à jour"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "pièce jointe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:2988
 msgid "Unable to use current version!"
 msgstr "Impossible d'utiliser la version actuelle !"
 
@@ -4131,6 +3917,10 @@ msgstr ""
 "_Supprimer cet élément de toutes les autres boîtes à lettres des "
 "destinataires ?"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "_Retirer le commentaire"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Impossible de supprimer l'évènement à cause d'une erreur CORBA"
@@ -4192,60 +3982,60 @@ msgstr "Déléguer à :"
 msgid "Enter Delegate"
 msgstr "Saisissez un délégué"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Alarms"
 msgstr "_Alarmes"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Click here to set or unset alarms for this event"
 msgstr "Cliquez ici pour définir ou annuler les alarmes de cet évènement"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Recurrence"
 msgstr "_Récurrence"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Make this a recurring event"
 msgstr "Transforme en évènement récurrent"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:219
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "Options d'envoi"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:221
 #: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "Insère les options avancées d'envoi"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:229
 msgid "All _Day Event"
 msgstr "Toute la _journée"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:231
 msgid "Toggles whether to have All Day Event"
 msgstr "L'état indique si défini comme « Évènement toute la journée »"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "Show Time as _Busy"
 msgstr "Afficher la période comme _occupée"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Toggles whether to show time as busy"
 msgstr "L'état indique si la période est affichée comme occupée"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:248
 msgid "_Free/Busy"
 msgstr "_Libre/Occupé"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "Query free / busy information for the attendees"
 msgstr ""
 "Interroge les personnes attendues sur leur disponibilité (libre/occupé)"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "_Rendez-vous"
 
@@ -4262,7 +4052,7 @@ msgstr ""
 "n'êtes pas l'organisateur"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "Cet évènement possède des alarmes"
 
@@ -4289,7 +4079,7 @@ msgid "Event with no end date"
 msgstr "Évènement sans date de fin"
 
 #: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/memo-page.c:657
 #: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "La date de début est erronée"
@@ -4307,13 +4097,13 @@ msgid "End time is wrong"
 msgstr "L'heure de fin est erronée"
 
 #: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/memo-page.c:698
 #: ../calendar/gui/dialogs/task-page.c:921
 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:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/memo-page.c:704
 #: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "Un organisateur est nécessaire."
@@ -4323,7 +4113,7 @@ msgstr "Un organisateur est nécessaire."
 msgid "At least one attendee is required."
 msgstr "Au moins un participant est nécessaire."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Impossible d'ouvrir le calendrier « %s »."
@@ -4334,40 +4124,40 @@ msgstr "Impossible d'ouvrir le calendrier « %s »."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:917
 #: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Vous intervenez pour le compte de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d jour avant le rendez-vous"
 msgstr[1] "%d jours avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d heure avant le rendez-vous"
 msgstr[1] "%d heures avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2949
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minute avant le rendez-vous"
 msgstr[1] "%d minutes avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "Personnaliser"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2964
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Aucune"
@@ -4385,8 +4175,10 @@ msgid "15 minutes before appointment"
 msgstr "15 minutes avant le rendez-vous"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "Participant_s..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "Participa_nts..."
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
 #: ../calendar/gui/e-meeting-list-view.c:148
@@ -4401,28 +4193,26 @@ msgstr "Alarme personnalisée :"
 msgid "Event Description"
 msgstr "Description de l'évènement"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "_Résumé :"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "_Alarme"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Description :"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_Emplacement :"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "Ré_sumé :"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "_Heure :"
@@ -4437,7 +4227,7 @@ msgstr "pour"
 msgid "until"
 msgstr "jusqu'au"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2576
 msgid "Memo"
 msgstr "Mémo"
 
@@ -4451,14 +4241,14 @@ msgstr ""
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Ce mémo ne peut pas être modifié car vous n'êtes pas l'organisateur"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:878
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Impossible d'ouvrir les mémos dans « %s »."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
+#: ../calendar/gui/dialogs/memo-page.c:1045 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "À"
@@ -4468,6 +4258,11 @@ msgstr "À"
 msgid "Sta_rt date:"
 msgstr "Date de _début :"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "_Résumé :"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_À :"
@@ -4478,64 +4273,64 @@ msgstr "_À :"
 msgid "_Group:"
 msgstr "_Groupe :"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Vous modifiez actuellement un évènement récurrent. Que souhaitez-vous "
 "modifier ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 "Vous déléguez actuellement un évènement récurrent. Que souhaitez-vous "
 "déléguer ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 "Vous modifiez actuellement une tâche récurrente. Que souhaitez-vous "
 "modifier ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "Vous modifiez actuellement un mémo récurrent. Que souhaitez-vous modifier ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Seulement cette occurrence"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Cette occurrence et les précédentes"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Cette instance et celles à venir"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Toutes les occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ce rendez-vous contient des récurrences qu'Evolution ne peut éditer."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "La date de la récurrence n'est pas valide"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "L'heure de fin de la récurrence est antérieure au début de l'évènement"
 
 #. 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:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "le"
 
@@ -4543,7 +4338,7 @@ msgstr "le"
 #. * (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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "première"
 
@@ -4552,7 +4347,7 @@ msgstr "première"
 #. * (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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "seconde"
 
@@ -4560,7 +4355,7 @@ msgstr "seconde"
 #. * (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:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "troisième"
 
@@ -4568,7 +4363,7 @@ msgstr "troisième"
 #. * (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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "quatrième"
 
@@ -4576,7 +4371,7 @@ msgstr "quatrième"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "cinquième"
 
@@ -4584,13 +4379,13 @@ msgstr "cinquième"
 #. * (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:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "dernier"
 
 #. 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:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Autre date"
 
@@ -4598,7 +4393,7 @@ msgstr "Autre date"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1er au 10"
 
@@ -4606,7 +4401,7 @@ msgstr "1er au 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11 au 20"
 
@@ -4614,47 +4409,47 @@ msgstr "11 au 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "21 au 31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "jour"
 
 #. 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:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "le"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "occurrences"
 
 # pas certain de la traduction. ça peut être aussi exclusion ...
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "Ajouter une exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "Impossible d'obtenir une sélection à modifier."
 
 # idem add exception
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "Modifier l'exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "Impossible d'obtenir une sélection à détruire."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "Date/Heure"
 
@@ -4666,7 +4461,7 @@ msgstr "Tous les"
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:85
 msgid "Preview"
 msgstr "Aperçu"
 
@@ -4690,11 +4485,11 @@ msgstr "semaine(s)"
 msgid "year(s)"
 msgstr "année(s)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "Envoyer mes alarmes avec cet évènement"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "Avertir _uniquement les nouveaux participants"
 
@@ -4703,66 +4498,66 @@ msgstr "Avertir _uniquement les nouveaux participants"
 msgid "Completed date is wrong"
 msgstr "La date d'achèvement est erronée"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "Page Web"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2656 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Achevée"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Haute"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2653
 msgid "In Progress"
 msgstr "En cours"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1121 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Basse"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1122
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "Normale"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2650 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Non démarrée"
 
@@ -4778,7 +4573,7 @@ msgstr "É_tat :"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1759
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4788,7 +4583,7 @@ msgstr "État"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "Indéfinie"
@@ -4798,7 +4593,7 @@ msgid "_Date completed:"
 msgstr "_Date d'achèvement :"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "_Priorité :"
 
@@ -4819,11 +4614,11 @@ msgstr "Cliquer pour modifier ou afficher les détails de l'état de la tâche"
 msgid "_Send Options"
 msgstr "Options d'_envoi"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "_Task"
 msgstr "_Tâche"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:325
 msgid "Task Details"
 msgstr "Détails de la tâche"
 
@@ -4853,10 +4648,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.ui.h:1
-msgid "Atte_ndees..."
-msgstr "Participa_nts..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Ca_tégories..."
@@ -4945,46 +4736,46 @@ msgstr "%s à %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s pour un type d'activation inconnu"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:191 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:197
 msgid "Categories:"
 msgstr "Catégories :"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Résumé :"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:258
 msgid "Start Date:"
 msgstr "Date de début :"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "Date d'échéance :"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "État :"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "Priorité :"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:35
 msgid "Description:"
 msgstr "Description :"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:367
 msgid "Web Page:"
 msgstr "Page Web :"
 
@@ -5011,16 +4802,16 @@ msgid "Start Date"
 msgstr "Date de début"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5031,63 +4822,49 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Aucune"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Oui"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "Client par défaut"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Paramètres du shell"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Paramètres généraux de l'application"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:976
+#: ../plugins/itip-formatter/itip-formatter.c:450
+#: ../plugins/itip-formatter/itip-formatter.c:2327
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Récurrent"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Attribué"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
@@ -5131,90 +4908,90 @@ msgstr "Date de début"
 msgid "Type"
 msgstr "Type"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:404
 msgid "Cut selected events to the clipboard"
 msgstr "Coupe les évènements sélectionnés vers le presse-papiers"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:410
 msgid "Copy selected events to the clipboard"
 msgstr "Copie les évènements sélectionnés dans le presse-papiers"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:416
 msgid "Paste events from the clipboard"
 msgstr "Colle les évènements depuis le presse-papiers"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Delete selected events"
 msgstr "Supprime les évènements sélectionnés"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2315
 msgid "Accepted"
 msgstr "Accepté"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1707
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2321
 msgid "Declined"
 msgstr "Refusé"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1708
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Provisoire"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1709
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2324
 msgid "Delegated"
 msgstr "Délégué"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1710
 msgid "Needs action"
 msgstr "Nécessite une action"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisateur : %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1856 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisateur : %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/print.c:2608
 #, c-format
 msgid "Location: %s"
 msgstr "Lieu : %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1903
 #, c-format
 msgid "Time: %s %s"
 msgstr "Heure : %s %s"
@@ -5257,8 +5034,8 @@ msgstr "Afficher le second fuseau horaire"
 #. 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:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:865 ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5268,10 +5045,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/e-day-view-top-item.c:869 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:913
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5280,31 +5057,35 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../calendar/gui/e-day-view-top-item.c:873 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:949
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2609
 #, c-format
 msgid "Week %d"
 msgstr "Semaine %d"
 
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "Récurrent :"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Oui. (Récurrence complexe)"
@@ -5386,7 +5167,7 @@ msgstr "Fins"
 msgid "Due"
 msgstr "Échéance"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "Information iCalendar"
 
@@ -5395,37 +5176,37 @@ msgstr "Information iCalendar"
 msgid "iCalendar Error"
 msgstr "Erreur iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+"Please review the following information, and then select an action from the "
+"menu below."
 msgstr ""
-"<br> Vérifiez les informations suivantes puis sélectionner une action du "
-"menu ci-dessous."
+"Vérifiez les informations suivantes puis sélectionner une action du menu ci-"
+"dessous."
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2302
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Aucun"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgid "Tentatively Accepted"
 msgstr "Accepté provisoirement"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -5433,276 +5214,276 @@ msgstr ""
 "La réunion a été annulée mais elle ne peut pas être trouvée dans vos "
 "calendriers"
 
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "La tâche a été annulée mais elle ne peut pas être trouvée dans vos listes de "
 "tâches"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> a publié les informations de la réunion."
+msgid "%s has published meeting information."
+msgstr "%s a publié les informations de la réunion."
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "Informations de la réunion"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> demande la présence de %s à ce rendez-vous."
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s demande la présence de %s à ce rendez-vous."
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> demande votre présence à cette réunion."
+msgid "%s requests your presence at a meeting."
+msgstr "%s demande votre présence à cette réunion."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "Proposition de réunion"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> souhaite être intégré à une réunion existante."
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s souhaite être intégré à une réunion existante."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "Mise à jour de la réunion"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> souhaite recevoir les informations de la dernière réunion."
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s souhaite recevoir les informations de la dernière réunion."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "Demande de mise à jour de la réunion"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> a répondu à une demande de réunion."
+msgid "%s has replied to a meeting request."
+msgstr "%s a répondu à une demande de réunion."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "Réponse à une réunion"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> a annulé une réunion."
+msgid "%s has canceled a meeting."
+msgstr "%s a annulé une réunion."
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "Annulation de réunion"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> a envoyé un message incompréhensible."
+msgid "%s has sent an unintelligible message."
+msgstr "%s a envoyé un message incompréhensible."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "Message de réunion incorrect"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> a publié les informations de la tâche."
+msgid "%s has published task information."
+msgstr "%s a publié les informations de la tâche."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "Informations de la tâche"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> demande à %s d'exécuter une tâche."
+msgid "%s requests %s to perform a task."
+msgstr "%s demande à %s d'exécuter une tâche."
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> vous demande d'exécuter une tâche."
+msgid "%s requests you perform a task."
+msgstr "%s vous demande d'exécuter une tâche."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "Tâche proposée"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> souhaite être intégré à une tâche existante."
+msgid "%s wishes to be added to an existing task."
+msgstr "%s souhaite être intégré à une tâche existante."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "Mise à jour de tâche"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> souhaite recevoir les informations de la dernière tâche."
+msgid "%s wishes to receive the latest task information."
+msgstr "%s souhaite recevoir les informations de la dernière tâche."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "Demande de mise à jour de tâche"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> a répondu à une attribution de tâche."
+msgid "%s has replied to a task assignment."
+msgstr "%s a répondu à une attribution de tâche."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "Réponse à une tâche"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> a annulé une tâche."
+msgid "%s has canceled a task."
+msgstr "%s a annulé une tâche."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "Annulation de tâche"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "Message de tâche incorrect"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> a publié une information Libre/Occupé."
+msgid "%s has published free/busy information."
+msgstr "%s a publié une information Libre/Occupé."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "Information Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> demande votre information Libre/Occupé."
+msgid "%s requests your free/busy information."
+msgstr "%s demande votre information Libre/Occupé."
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "Demande Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> a répondu à une demande Libre/Occupé."
+msgid "%s has replied to a free/busy request."
+msgstr "%s a répondu à une demande Libre/Occupé."
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "Réponse Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "Message Libre/Occupé incorrect"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "Le message ne semble pas être correctement rempli"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "Le message ne contient que des requêtes non prises en charge."
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "La pièce jointe ne contient pas d'information de calendrier valide"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 "La pièce jointe ne contient pas d'information de calendrier visualisable"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "L'objet n'est pas valide et ne peut pas être mis à jour\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Cette réponse ne provient pas d'un participant. L'ajouter comme participant ?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "L'état du participant n'a pas pu être mis à jour à cause d'un état non "
 "valide !\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "État du participant mis à jour\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../calendar/gui/e-itip-control.c:2084
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 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"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "Élément envoyé !\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "Impossible d'envoyer l'élément !\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "Sélectionner une action :"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-itip-control.c:2302
 #: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Accepter"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "Accepter provisoirement"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Refuser"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "Envoyer l'information Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "Mettre à jour l'état de l'interlocuteur"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:970
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -5751,56 +5532,56 @@ msgid "Resources"
 msgstr "Ressources"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individuel"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Groupe"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Salle"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Président"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Participant attendu"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Non participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "Nécessite une action"
 
@@ -5809,14 +5590,14 @@ msgstr "Nécessite une action"
 msgid "Attendee                          "
 msgstr "Participant                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
@@ -5825,7 +5606,7 @@ msgstr "%A %d %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5835,67 +5616,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "Absent du bureau"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "Aucune information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "Par_ticipants..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "Afficher _seulement les heures de travail"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "Afficher Zoom a_rrière"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "_Mettre à jour Libre/Occupé"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "_Choix automatique"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_Toutes les personnes et ressources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "Toutes les _personnes et une ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "Personnes atte_ndues"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "Personnes attendues et _une ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "Heure de _début :"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "Heure de _fin :"
 
@@ -5924,44 +5701,46 @@ msgid "Member"
 msgstr "Membre"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../modules/calendar/e-cal-shell-content.c:461
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "Mémos"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
 msgid "* No Summary *"
 msgstr "* Aucun résumé *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
 msgid "Start: "
 msgstr "Début : "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
 msgid "Due: "
 msgstr "Échéance : "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:709
 msgid "Cut selected memos to the clipboard"
 msgstr "Coupe les mémos sélectionnés vers le presse-papiers"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:715
 msgid "Copy selected memos to the clipboard"
 msgstr "Copie les mémos sélectionnés vers le presse-papiers"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:721
 msgid "Paste memos from the clipboard"
 msgstr "Colle les mémos depuis le presse-papiers"
 
-#: ../calendar/gui/e-memo-table.c:725
+#: ../calendar/gui/e-memo-table.c:727
 #: ../modules/calendar/e-memo-shell-view-actions.c:556
 msgid "Delete selected memos"
 msgstr "Supprime les mémos sélectionnés"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Select all visible memos"
 msgstr "Sélectionne tous les mémos visibles"
 
@@ -5969,93 +5748,58 @@ msgstr "Sélectionne tous les mémos visibles"
 msgid "Click to add a memo"
 msgstr "Cliquez ici pour ajouter un mémo"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d %%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../modules/calendar/e-cal-shell-content.c:423
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Tâches"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:932
 msgid "Cut selected tasks to the clipboard"
 msgstr "Coupe les tâches sélectionnées vers le presse-papiers"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:938
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copie les tâches sélectionnées dans le presse-papiers"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:944
 msgid "Paste tasks from the clipboard"
 msgstr "Colle les tâches depuis le presse-papiers"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "Delete selected tasks"
 msgstr "Supprime les tâches sélectionnées"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:956
 msgid "Select all visible tasks"
 msgstr "Sélectionne toutes les tâches visibles"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Sélectionner un fuseau horaire"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -6084,7 +5828,7 @@ msgstr "Évènement du calendrier : il n'a pas de résumé."
 msgid "calendar view event"
 msgstr "vue des évènements du calendrier"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:541
 msgid "Grab Focus"
 msgstr "Capturer le focus"
 
@@ -6113,7 +5857,7 @@ msgstr "Aller à la date"
 msgid "a table to view and select the current time range"
 msgstr "un tableau pour consulter et sélectionner l'intervalle de temps actuel"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -6122,14 +5866,14 @@ msgstr[1] "Il possède %d évènements."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 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."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Vue hebdomadaire de travail : %s. %s"
@@ -6137,16 +5881,16 @@ 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."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vue journalière : %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "vue du calendrier pour une semaine de travail"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "vue du calendrier pour un ou plusieurs jours"
 
@@ -6157,16 +5901,16 @@ msgid "Gnome Calendar"
 msgstr "Calendrier de GNOME"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:909
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -6174,10 +5918,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -6189,25 +5933,25 @@ msgstr "Bouton du saut"
 msgid "Click here, you can find more events."
 msgstr "Cliquez ici, vous pourrez trouver plus d'évènements."
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vue mensuelle : %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vue hebdomadaire : %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:188
 msgid "calendar view for a month"
 msgstr "vue du calendrier pour un mois"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:190
 msgid "calendar view for one or more weeks"
 msgstr "vue du calendrier pour une ou plusieurs semaines"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2242
 msgid "Purging"
 msgstr "Nettoyage"
 
@@ -6260,39 +6004,40 @@ msgid "Select Date"
 msgstr "Sélectionnez une date"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "Septembre"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "Select _Today"
+msgstr "Sélectionner au_jourd'hui"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_Sélectionner aujourd'hui"
+msgid "September"
+msgstr "Septembre"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "Un organisateur doit être défini."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "Au moins un participant est nécessaire"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Informations de l'évènement"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Informations de la tâche"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Informations du mémo"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Information Libre/Occupé"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "Informations du calendrier"
 
@@ -6300,7 +6045,7 @@ msgstr "Informations du calendrier"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Acceptée"
@@ -6309,7 +6054,7 @@ msgstr "Acceptée"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Acceptée provisoirement"
@@ -6321,7 +6066,7 @@ msgstr "Acceptée provisoirement"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Refusée"
@@ -6330,7 +6075,7 @@ msgstr "Refusée"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Déléguée"
@@ -6338,7 +6083,7 @@ msgstr "Déléguée"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Mise à jour"
@@ -6346,7 +6091,7 @@ msgstr "Mise à jour"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Annulée"
@@ -6354,7 +6099,7 @@ msgstr "Annulée"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualisée"
@@ -6362,31 +6107,31 @@ msgstr "Actualisée"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contre-proposition"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Information Libre/Occupé (%s à %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "Information iCalendar"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Impossible de réserver une ressource, le nouvel évènement est en conflit "
 "avec un autre."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "Impossible de réserver une ressource, l'erreur est : "
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "Vous devez être inscrit comme participant à l'évènement."
 
@@ -6542,49 +6287,74 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2564
+#. Translators: This is part of "START to END" text, where START and END are date/times
+#: ../calendar/gui/print.c:2419
+msgid " to "
+msgstr " À "
+
+#. Translators: This is part of "START to END (Completed COMPLETED)", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2425
+msgid " (Completed "
+msgstr " (terminé "
+
+#. Translators: This is part of "Completed COMPLETED", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2428
+msgid "Completed "
+msgstr "Terminé "
+
+#. Translators: This is part of "START (Due DUE)", where START and DUE are dates/times
+#: ../calendar/gui/print.c:2435
+msgid " (Due "
+msgstr " (date d'échéance "
+
+#. Translators: This is part of "Due DUE", where DUE is a date/time due the event should be finished
+#: ../calendar/gui/print.c:2438
+msgid "Due "
+msgstr "Date d'échéance "
+
+#: ../calendar/gui/print.c:2572
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: ../calendar/gui/print.c:2566
+#: ../calendar/gui/print.c:2574 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "Tâche"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2599
 #, c-format
 msgid "Summary: %s"
 msgstr "Résumé : %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2623
 msgid "Attendees: "
 msgstr "Participants : "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2666
 #, c-format
 msgid "Status: %s"
 msgstr "État : %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2681
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorité : %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2699
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Pourcentage effectué : %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2710
 #, c-format
 msgid "URL: %s"
 msgstr "URL : %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2723
 #, c-format
 msgid "Categories: %s"
 msgstr "Catégories : %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2734
 msgid "Contacts: "
 msgstr "Contacts : "
 
@@ -6615,7 +6385,7 @@ msgstr "Rendez-vous et réunions"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Opening calendar"
 msgstr "Ouverture du calendrier"
 
@@ -8196,157 +7966,157 @@ msgstr "Pacifique/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacifique/Yap"
 
-#: ../composer/e-composer-actions.c:79
+#: ../composer/e-composer-actions.c:81
 msgid "Untitled Message"
 msgstr "Message sans sujet"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:283
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:288
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "Ferme le fichier actuel"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "_Aperçu avant impression"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "Enregistre le fichier actuel"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "Enregistrer _sous..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "Enregistre le fichier actuel avec un nom différent"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "Enregistrer comme _brouillon"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "Enregistre comme brouillon"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "E_nvoyer"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "Envoie ce message"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "Nouveau _message"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "Ouvre la fenêtre Nouveau message"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "_Codage des caractères"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:363
 msgid "PGP _Encrypt"
 msgstr "_Chiffrer avec PGP"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:365
 msgid "Encrypt this message with PGP"
 msgstr "Chiffre ce message avec PGP"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:371
 msgid "PGP _Sign"
 msgstr "_Signer avec PGP"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:373
 msgid "Sign this message with your PGP key"
 msgstr "Signe ce message avec votre clé PGP"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "_Prioriser le message"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "Affecte une priorité élevée au message"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "D_emander un accusé de lecture"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:389
 msgid "Get delivery notification when your message is read"
 msgstr "Obtenir un avertissement quand votre message est lu"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "C_hiffrer avec S/MIME"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:397
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Chiffre ce message avec votre certificat de chiffrement S/MIME"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "S_igner avec S/MIME"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:405
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signe ce message avec votre certificat de signature S/MIME"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:411
 msgid "_Bcc Field"
 msgstr "Champ Cc_i"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:413
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Indique si le champ Cci est affiché"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "Champ _Cc"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "Indique si le champ Cc est affiché"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:427
 msgid "_From Field"
 msgstr "Champ _De"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:429
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Indique si le champ De est affiché"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "Champ _Répondre à"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Indique si le champ Répondre à est affiché"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:480
 msgid "Save Draft"
 msgstr "Enregistrer le brouillon"
 
@@ -8358,15 +8128,15 @@ msgstr "Afficher"
 msgid "Hide"
 msgstr "Masquer"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Saisissez les destinataires du message"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 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-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8374,58 +8144,58 @@ msgstr ""
 "Saisissez les adresses qui recevront une copie du message sans apparaître "
 "dans la liste des destinataires du message"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "_De :"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "De"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "_Répondre à :"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "_À :"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "_Cc :"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "Cc"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "Cc_i :"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Cci"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "_Poster à :"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "_Sujet :"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "Si_gnature :"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "Cliquez ici pour sélectionner les dossiers de destination"
 
@@ -8450,19 +8220,19 @@ msgid "Save draft"
 msgstr "Enregistrer le brouillon"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:188 ../mail/em-utils.c:152
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "_Ne plus afficher ce message."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:988
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Impossible de signer le message sortant : aucun certificat de signature "
 "défini pour ce compte"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:995
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8470,23 +8240,21 @@ msgstr ""
 "Impossible de chiffrer le message sortant : aucun certificat de chiffrement "
 "défini pour ce compte"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1386
 msgid "Unable to reconstruct message from autosave file"
 msgstr ""
 "Impossible de reconstruire le message à partir du fichier de sauvegarde "
 "automatique"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1452 ../composer/e-msg-composer.c:1648
 msgid "Compose Message"
 msgstr "Rédaction d'un message"
 
-#: ../composer/e-msg-composer.c:3310
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#: ../composer/e-msg-composer.c:3314
+msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
-"<b>(l'éditeur contient un corps de message non textuel qui ne peut pas être "
-"édité.)<b>"
+"L'éditeur contient un corps de message non textuel qui ne peut pas être "
+"édité."
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -8573,7 +8341,7 @@ msgstr ""
 "étiez arrêté."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 "Le fichier « {0} » n'est pas un fichier régulier et ne peut pas être envoyé "
 "dans un message."
@@ -8594,7 +8362,7 @@ msgid "Unable to activate the address selector control."
 msgstr "Impossible d'activer le composant de sélection d'adresses."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "Vous ne pouvez pas joindre le fichier « {0} » à ce message."
 
 #: ../composer/mail-composer.error.xml.h:22
@@ -8617,31 +8385,27 @@ msgstr "_Récupérer"
 msgid "_Save Draft"
 msgstr "Enregistrer le _brouillon"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:199
 msgid "Run Anjal in a window"
 msgstr "Lancer Anjal dans une fenêtre"
 
-#: ../capplet/anjal-settings-main.c:203
+#: ../capplet/anjal-settings-main.c:200
 msgid "Make Anjal the default email client"
 msgstr "Faire de Anjal le client de messagerie par défaut"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:207
 msgid "ID of the socket to embed in"
 msgstr "Identifiant du socket dans lequel s'intégrer"
 
-#: ../capplet/anjal-settings-main.c:211
+#: ../capplet/anjal-settings-main.c:208
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:221
 msgid "Anjal email client"
 msgstr "Client de messagerie Anjal"
 
-#: ../capplet/settings/mail-view.c:244
-msgid "New Tab"
-msgstr "Nouvel onglet"
-
 #: ../capplet/settings/mail-account-view.c:56
 msgid "Please enter your full name."
 msgstr "Saisissez votre nom complet."
@@ -8654,52 +8418,52 @@ msgstr "Saisissez votre adresse électronique."
 msgid "The email address you have entered is invalid."
 msgstr "L'adresse électronique saisie n'est pas valable."
 
-#: ../capplet/settings/mail-account-view.c:224
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Détails personnels :</span>"
+#: ../capplet/settings/mail-account-view.c:182
+msgid "Personal details:"
+msgstr "Détails personnels :"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:189
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../capplet/settings/mail-account-view.c:238
+#: ../capplet/settings/mail-account-view.c:198
 msgid "Email address:"
 msgstr "Adresse électronique :"
 
-#: ../capplet/settings/mail-account-view.c:248
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Détails de réception :</span>"
+#: ../capplet/settings/mail-account-view.c:208
+msgid "Receiving details:"
+msgstr "Détails de la réception :"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
+#: ../capplet/settings/mail-account-view.c:215
+#: ../capplet/settings/mail-account-view.c:265
 msgid "Server type:"
 msgstr "Type de serveur :"
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
+#: ../capplet/settings/mail-account-view.c:224
+#: ../capplet/settings/mail-account-view.c:274
 msgid "Server address:"
 msgstr "Adresse du serveur :"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:233
+#: ../capplet/settings/mail-account-view.c:283
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:292
 msgid "Use encryption:"
 msgstr "Utiliser le chiffrement :"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:247
+#: ../capplet/settings/mail-account-view.c:297
 msgid "never"
 msgstr "jamais"
 
-#: ../capplet/settings/mail-account-view.c:298
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Détails d'envoi :</span>"
+#: ../capplet/settings/mail-account-view.c:258
+msgid "Sending details:"
+msgstr "Détails de l'envoi :"
 
-#: ../capplet/settings/mail-account-view.c:355
+#: ../capplet/settings/mail-account-view.c:316
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -8711,7 +8475,7 @@ msgstr ""
 "Si cela n'est pas possible, vous devrez alors encore saisir d'autres détails "
 "de configuration."
 
-#: ../capplet/settings/mail-account-view.c:357
+#: ../capplet/settings/mail-account-view.c:318
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -8722,12 +8486,12 @@ msgstr ""
 "paramètres ont été pré-remplis selon ce que vous avez déjà saisi, mais il "
 "est possible que vous deviez les modifier."
 
-#: ../capplet/settings/mail-account-view.c:359
+#: ../capplet/settings/mail-account-view.c:320
 msgid "You can specify more options to configure the account."
 msgstr ""
 "Vous pouvez indiquez des options de configuration de compte supplémentaires."
 
-#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:322
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8736,11 +8500,11 @@ msgstr ""
 "sont pré-remplis par le logiciel, mais vous devez tout de même vous assurer "
 "qu'ils sont corrects."
 
-#: ../capplet/settings/mail-account-view.c:362
+#: ../capplet/settings/mail-account-view.c:323
 msgid "You can specify your default settings for your account."
 msgstr "Vous pouvez indiquer les paramètres par défaut de votre compte."
 
-#: ../capplet/settings/mail-account-view.c:363
+#: ../capplet/settings/mail-account-view.c:324
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8748,134 +8512,125 @@ msgstr ""
 "Veuillez vérifier les paramètres avant que le logiciel essaye de se "
 "connecter au serveur pour récupérer vos messages."
 
-#: ../capplet/settings/mail-account-view.c:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:339
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2191
+#: ../mail/mail-config.ui.h:59
 msgid "Identity"
 msgstr "Identité"
 
-#: ../capplet/settings/mail-account-view.c:378
+#: ../capplet/settings/mail-account-view.c:339
 msgid "Next - Receiving mail"
 msgstr "Suite - Réception du courriel"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
 msgid "Receiving mail"
 msgstr "Réception du courriel"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:340
+#: ../capplet/settings/mail-account-view.c:341
 msgid "Next - Sending mail"
 msgstr "Suite - Envoi du courriel"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
 msgid "Back - Identity"
 msgstr "Retour - Identité"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
 msgid "Next - Receiving options"
 msgstr "Suite - Options de réception"
 
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:341
 msgid "Receiving options"
 msgstr "Options de réception"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:341
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Back - Receiving mail"
 msgstr "Retour - Réception du courriel"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Sending mail"
 msgstr "Envoi du courriel"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:343
+#: ../capplet/settings/mail-account-view.c:344
 msgid "Next - Review account"
 msgstr "Suite - Vérification des paramètres"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Next - Defaults"
 msgstr "Suite - Valeurs par défaut"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Back - Receiving options"
 msgstr "Retour - Options de réception"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:344
+#: ../mail/em-account-editor.c:2770 ../mail/mail-config.ui.h:32
 msgid "Defaults"
 msgstr "Valeurs par défaut"
 
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:344
 msgid "Back - Sending mail"
 msgstr "Retour - Envoi du courriel"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
 msgid "Review account"
 msgstr "Vérification des paramètres du compte"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
 msgid "Finish"
 msgstr "Terminer"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
 msgid "Back - Sending"
 msgstr "Retour - Envoi"
 
-#: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
+#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "Fermer l'onglet"
 
-#: ../capplet/settings/mail-account-view.c:729
+#: ../capplet/settings/mail-account-view.c:690
 msgid "Account Wizard"
 msgstr "Assistant de compte"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "Assistant de compte d'Evolution"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "Paramètres de messagerie"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-msgid "Quit"
-msgstr "Quitter"
-
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1617
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:659
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:212
+#: ../mail/message-list.c:1605
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/addressbook/e-book-shell-migrate.c:126
 #: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-cal-shell-migrate.c:141
 #: ../modules/calendar/e-memo-shell-backend.c:108
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-migrate.c:109
 msgid "On This Computer"
 msgstr "Sur cet ordinateur"
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:146
 #: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "Modifier"
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "Ajouter un nouveau compte"
 
-#: ../capplet/settings/mail-settings-view.c:185
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Gestion de compte</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "Gestion des comptes"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -8887,7 +8642,7 @@ msgstr "Notifications des évènements du calendrier"
 msgid "Evolution Alarm Notify"
 msgstr "Notification d'alarmes Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:823
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8909,6 +8664,10 @@ msgstr "Gérer vos courriels, contacts et agendas"
 msgid "Configure email accounts"
 msgstr "Configurer les comptes de messagerie"
 
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "Paramètres de messagerie"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "carte de visite"
@@ -9010,56 +8769,66 @@ msgstr "Européen de l'ouest"
 msgid "Western European, New"
 msgstr "Européen de l'ouest, Nouveau"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "Traditionnel"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "Simplifié"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "Visuel"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Aujourd'hui"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Demain"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Hier"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "Dans %d jours"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "Dans %d jour"
+msgstr[1] "Dans %d jours"
 
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "Il y a %d jours"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Il y a %d jour"
+msgstr[1] "Il y a %d jours"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "Utiliser les réglages locaux par défaut"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "Format :"
 
@@ -9080,18 +8849,6 @@ msgstr "Écriture de « %s »"
 msgid "Writing \"%s\" to %s"
 msgstr "Écriture de « %s » vers %s"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Nom du composant de journalisation"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "Nom de fichier"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "Le nom de fichier du module"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Journaux de débogage"
@@ -9114,13 +8871,13 @@ msgstr "Journal des messages :"
 msgid "Log Level"
 msgstr "Niveau du journal"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2677
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Messages"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "Ferme cette fenêtre"
 
@@ -9144,34 +8901,23 @@ msgstr "Débogage"
 msgid "Error, Warnings and Debug messages"
 msgstr "Messages d'erreur, d'avertissement et de débogage"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "Activé"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Indique si le greffon est activé"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "semaines"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "Erreur durant l'impression"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr ""
 "Le système d'impression a rapporté les informations suivantes sur cette "
 "erreur :"
 
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -9182,7 +8928,7 @@ msgstr ""
 msgid "Autogenerated"
 msgstr "Générée automatiquement"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "À cause de « {1} »."
 
@@ -9202,235 +8948,235 @@ msgstr "Voulez-vous l'écraser ?"
 msgid "File exists \"{0}\"."
 msgstr "Fichier existant « {0} »."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "É_craser"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:169
 msgid "Could not open the link."
 msgstr "Impossible d'ouvrir le lien."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:219
 msgid "Could not display help for Evolution."
 msgstr "Impossible d'afficher l'aide d'Evolution."
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1303
 #, c-format
 msgid "GConf error: %s"
 msgstr "Erreur GConf : %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1314
 msgid "All further errors shown only on terminal."
 msgstr "Toutes les erreurs futures seront affichées seulement sur le terminal."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "Répondre à"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "Cci"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Sujet"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1138
 msgid "Mailer"
 msgstr "Client de messagerie"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Message transféré --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Date"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:84
 msgid "Newsgroups"
 msgstr "Groupes de discussion"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:85
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Portrait"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1302
 #, c-format
 msgid "%s attachment"
 msgstr "pièce jointe %s"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1361
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Impossible d'analyser le message S/MIME : erreur inconnue"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossible d'analyser le message MIME. Afficher comme source."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Type de chiffrement non pris en charge pour multipart/encrypted"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message"
 msgstr "Impossible d'analyser le message PGP/MIME"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Impossible d'analyser le message PGP/MIME : erreur inconnue"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "Format de signature non pris en charge"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 msgid "Error verifying signature"
 msgstr "Erreur lors de la vérification de la signature"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "Erreur inconnue lors de la vérification de la signature"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message"
 msgstr "Impossible d'analyser le message PGP"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Impossible d'analyser le message PGP : erreur inconnue"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Il y a une seconde"
 msgstr[1] "Il y a %d secondes"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "Dans 1 seconde"
 msgstr[1] "Dans %d secondes"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Il y a une minute"
 msgstr[1] "Il y a %d minutes"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "Dans 1 minute"
 msgstr[1] "Dans %d minutes"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Il y a 1 heure"
 msgstr[1] "Il y a %d heures"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "Dans 1 heure"
 msgstr[1] "Dans %d heures"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Il y a 1 jour"
 msgstr[1] "Il y a %d jours"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "Dans 1 jour"
 msgstr[1] "Dans %d jours"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Il y a une semaine"
 msgstr[1] "Il y a %d semaines"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "Dans 1 semaine"
 msgstr[1] "Dans %d semaines"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Il y a 1 mois"
 msgstr[1] "Il y a %d mois"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "Dans 1 mois"
 msgstr[1] "Dans %d mois"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "Il y a 1 an"
 msgstr[1] "Il y a %d ans"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "Dans 1 an"
 msgstr[1] "Dans %d ans"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<cliquez ici pour sélectionner une date>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "maintenant"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Sélectionnez une heure pour la comparaison"
 
@@ -9483,11 +9229,11 @@ msgid "I_nclude threads"
 msgstr "I_nclure les fils de discussion"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Entrant"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Sortant"
 
@@ -9519,7 +9265,7 @@ msgstr "Date manquante."
 msgid "Missing file name."
 msgstr "Nom de fichier manquant."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "Nom manquant."
 
@@ -9596,7 +9342,7 @@ msgstr "dans le futur"
 msgid "months"
 msgstr "mois"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:173
 msgid "seconds"
 msgstr "secondes"
 
@@ -9613,7 +9359,7 @@ msgid "years"
 msgstr "années"
 
 #: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
+#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
 #: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
@@ -9621,35 +9367,19 @@ msgid_plural "Attachments"
 msgstr[0] "Pièce jointe"
 msgstr[1] "Pièces jointes"
 
-#: ../mail/e-mail-attachment-bar.c:621
+#: ../mail/e-mail-attachment-bar.c:617
 #: ../widgets/misc/e-attachment-paned.c:612
 msgid "Icon View"
 msgstr "Vue en icônes"
 
-#: ../mail/e-mail-attachment-bar.c:622
+#: ../mail/e-mail-attachment-bar.c:618
 #: ../widgets/misc/e-attachment-paned.c:613
 msgid "List View"
 msgstr "Vue en liste"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Suivi du focus"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "Module shell"
-
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "Le moteur shell de courriels"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "Afficher les suppressions"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "Affiche les messages supprimés"
+#: ../mail/e-mail-browser.c:262
+msgid "(No Subject)"
+msgstr "(Pas de sujet)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9696,7 +9426,7 @@ msgid "_Later"
 msgstr "Plus _tard"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:472
 msgid "Add Label"
 msgstr "Ajouter une étiquette"
 
@@ -9716,121 +9446,57 @@ msgstr ""
 msgid "Color"
 msgstr "Couleur"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Nom"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:363
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2674
+#: ../modules/mail/e-mail-shell-view-private.c:953
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
 msgid "Outbox"
 msgstr "Boîte d'envoi"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
 msgid "Sent"
 msgstr "Envoyés"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:570
 msgid "Templates"
 msgstr "Modèles"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Important"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "À faire"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Plus tard"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "Migration..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "Migration"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migration de « %s » :"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Impossible de créer le nouveau dossier « %s » : %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Impossible de copier le dossier « %s » vers « %s » : %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, 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/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:643
 msgid "Migrating Folders"
 msgstr "Migration des dossiers"
 
-#: ../mail/e-mail-migrate.c:1824
-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 ""
-"L'emplacement et la hiérarchie des dossiers des boîtes à lettres ont changé "
-"depuis Evolution 1.x.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, 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/e-mail-migrate.c:2043
-#, 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/e-mail-migrate.c:2075
-#, 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/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, 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/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:644
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9842,26 +9508,17 @@ msgstr ""
 "\n"
 "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:740
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
+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/e-mail-migrate.c:3049
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Impossible de lire les paramètres de l'installation d'Evolution précédente, "
-"« evolution/config.xmldb » n'existe pas ou est corrompu."
-
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
 #: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../modules/calendar/e-task-shell-view-actions.c:561
 msgid "Do not ask me again"
 msgstr "Ne plus poser la question"
 
@@ -9869,7 +9526,7 @@ msgstr "Ne plus poser la question"
 msgid "Copy to Folder"
 msgstr "Copier vers le dossier"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "C_opier"
 
@@ -9877,7 +9534,7 @@ msgstr "C_opier"
 msgid "Move to Folder"
 msgstr "Déplacer vers le dossier"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "_Déplacer"
 
@@ -9893,8 +9550,7 @@ msgstr[1] "Enregistrer les messages..."
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Message"
@@ -10203,8 +9859,8 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirige le message sélectionné à un correspondant"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
@@ -10221,7 +9877,7 @@ msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Répond à la liste de diffusion du message sélectionné"
 
 #: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "_Répondre à l'expéditeur"
 
@@ -10381,53 +10037,53 @@ msgstr "Tous les en-_têtes du message"
 msgid "Show messages with all email headers"
 msgstr "Affiche les messages avec tous les en-têtes"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1878
 msgid "Unable to retrieve message"
 msgstr "Impossible de récupérer le message"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1939
+#: ../mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Récupération du message « %s »"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2453
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2574
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2575
 msgid "Forward the selected message to someone"
 msgstr "Fait suivre le message sélectionné à un correspondant"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2619 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Suivant"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Précédent"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2631 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Répondre"
 
@@ -10437,24 +10093,24 @@ msgstr "Marquer pour donner suite"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:73
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Sans chiffrement"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:121
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "Chiffrement TLS"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "Chiffrement SSL"
 
@@ -10477,34 +10133,34 @@ msgstr ""
 "et cochez la case pour l'accepter\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Aucune"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "Jamais"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "Toujours"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "Demander à chaque message"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Aucun"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10514,7 +10170,7 @@ msgstr ""
 "\n"
 "Cliquez sur « Suivant » pour commencer."
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2060
 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 "
@@ -10524,20 +10180,20 @@ msgstr ""
 "« optionnels » ci-dessous n'ont pas besoin d'être remplis, à moins que vous "
 "ne désiriez inclure ces informations dans les messages que vous envoyez."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2228
+#: ../mail/mail-config.ui.h:91
 msgid "Receiving Email"
 msgstr "Réception du courriel"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "Configurez les paramètres de compte suivants."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2706
 msgid "Sending Email"
 msgstr "Envoi du courriel"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10546,11 +10202,11 @@ msgstr ""
 "doute, adressez-vous à votre administrateur système ou à votre fournisseur "
 "d'accès Internet."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "Gestion des comptes"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2069
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10558,11 +10214,11 @@ msgstr ""
 "Saisissez un nom descriptif pour ce compte dans l'espace ci-dessous.\n"
 "Ce nom sera seulement utilisé à des fins d'affichage."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "Terminé"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10577,57 +10233,57 @@ msgstr ""
 "Cliquez sur « Appliquer » pour enregistrer les paramètres."
 
 # Toutes les n minutes (Stéphane)
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2515
 msgid "Check for _new messages every"
 msgstr "Vérifier les _nouveaux messages toutes les"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2523
 msgid "minu_tes"
 msgstr "minu_tes"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "Sécurité"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
 msgid "Receiving Options"
 msgstr "Options de réception"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2878 ../mail/em-account-editor.c:2946
 msgid "Checking for New Messages"
 msgstr "Recherche de nouveaux messages"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3414
 msgid "Account Editor"
 msgstr "Éditeur de comptes"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3414
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
 # Ordre des paramètres inversé pour plus de sens en français
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1570
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Votre message « %2$s » du %3$s à %1$s a été lu."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1618
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Notification de distribution pour : « %s »"
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1942
 msgid "an unknown sender"
 msgstr "un expéditeur inconnu"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1997
+#: ../mail/em-composer-utils.c:1989
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10635,19 +10291,19 @@ msgstr ""
 "Le ${WeekdayName} ${Day} ${MonthName} ${Year} à ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} a écrit :"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2133
 msgid "-----Original Message-----"
 msgstr "-------- Message initial --------"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2314
 msgid "Posting destination"
 msgstr "Destination d'envoi"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2315
 msgid "Choose folders to post the message to."
 msgstr "Choisissez les dossiers auxquels envoyer ce message."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "Sélectionnez un dossier"
 
@@ -10729,6 +10385,10 @@ msgstr "Donner suite"
 msgid "Forward to"
 msgstr "Faire suivre à"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Important"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "est après"
@@ -10753,7 +10413,7 @@ msgstr "n'est pas défini"
 msgid "is set"
 msgstr "est défini"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:62
 msgid "Junk"
 msgstr "Pourriel"
 
@@ -10803,7 +10463,7 @@ msgid "Play Sound"
 msgstr "Jouer le son"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Lu"
 
@@ -10884,16 +10544,16 @@ msgid "Unset Status"
 msgstr "Retirer l'état"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "Alors"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "Ajouter une ac_tion"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:169
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Messages non lus :"
@@ -10901,24 +10561,24 @@ msgstr[1] "Messages non lus :"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:173
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total des messages :"
 msgstr[1] "Total des messages :"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:191
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Utilisation de votre quota (%s) :"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:193
 #, c-format
 msgid "Quota usage"
 msgstr "Utilisation de votre quota"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:395
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "Propriétés du dossier"
 
@@ -10926,37 +10586,37 @@ msgstr "Propriétés du dossier"
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour sélectionner un dossier>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "C_réer"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "_Nom du dossier :"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1073 ../mail/mail-vfolder.c:1138
 msgid "Search Folders"
 msgstr "Dossiers de recherche"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "CORRESPONDPAS"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1080
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:183
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examen des dossiers dans « %s »"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:596
 msgid "Folder names cannot contain '/'"
 msgstr "Les noms des dossiers ne peuvent pas contenir le caractère « / »"
 
@@ -10978,75 +10638,75 @@ msgstr "Les noms des dossiers ne peuvent pas contenir le caractère « / »"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1078
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1286
 msgid "Mail Folder Tree"
 msgstr "Arborescence des courriels"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1575 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Déplacement du dossier %s"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1577 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copie du dossier %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1584 ../mail/message-list.c:2098
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Déplacement des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1586 ../mail/message-list.c:2100
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copie des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1601
 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-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Move Folder To"
 msgstr "Déplacer le dossier vers"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Copy Folder To"
 msgstr "Copier le dossier vers"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:500
+#: ../plugins/groupwise-features/share-folder-common.c:136
 #, c-format
-msgid "Creating folder `%s'"
+msgid "Creating folder '%s'"
 msgstr "Création du dossier « %s »"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:663
 msgid "Create Folder"
 msgstr "Création d'un dossier"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:664
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Specify where to create the folder:"
 msgstr "Précisez l'emplacement de création du dossier :"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:680
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Désabonnement au dossier « %s »"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "Non signé"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11054,11 +10714,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:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "Signature valide"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11066,11 +10726,11 @@ msgstr ""
 "Ce message est signé et valide, ce qui signifie que ce message est "
 "vraisemblablement authentique."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "Signature non valide"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11078,11 +10738,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:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
 msgid "Valid signature, but cannot verify sender"
 msgstr "Signature valide, mais impossible de vérifier l'expéditeur"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11090,22 +10750,22 @@ msgstr ""
 "Ce message est signé avec une signature valide, mais l'expéditeur du message "
 "ne peut pas être vérifié."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
 msgid "Signature exists, but need public key"
 msgstr "La signature existe, mais elle requiert une clé publique"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 "Ce message est signé avec une signature dont la clé publique est absente."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
 msgid "Unencrypted"
 msgstr "Non chiffré"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11113,11 +10773,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:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "Chiffré, faiblement"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -11127,11 +10787,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:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "Chiffré"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11139,11 +10799,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:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "Chiffré, fortement"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -11153,15 +10813,15 @@ 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:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "_Voir le certificat"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Ce certificat n'est pas affichable"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -11171,28 +10831,28 @@ msgstr ""
 "externe."
 
 # « Terminé le » pourrait poser un pb si « hier » était ajouté par exemple (Stéphane)
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:726
 msgid "Completed on"
 msgstr "Terminé "
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:734
 msgid "Overdue:"
 msgstr "Retard :"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:738
 msgid "by"
 msgstr " "
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
 msgid "View _Unformatted"
 msgstr "Afficher _sans mise en forme"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:950
 msgid "Hide _Unformatted"
 msgstr "Masquer _non formaté"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1012
 msgid "O_pen With"
 msgstr "_Ouvrir avec"
 
@@ -11201,17 +10861,17 @@ msgstr "_Ouvrir avec"
 msgid "Page %d of %d"
 msgstr "Page %d sur %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:147
 msgid "Formatting message"
 msgstr "Formatage des messages"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:338
 msgid "Formatting Message..."
 msgstr "Formatage du message..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
 #, c-format
-msgid "Retrieving `%s'"
+msgid "Retrieving '%s'"
 msgstr "Récupération de « %s »"
 
 #: ../mail/em-format-html.c:1854
@@ -11249,41 +10909,50 @@ msgstr "Pointeur sur des données externes inconnues (type « %s »)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#.
-#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2600
 #, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "Ce message a été envoyé par <b>%s</b> pour le compte de <b>%s</b>"
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Ce message a été envoyé par %s pour le compte de %s"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Soit ce stockage ne prend pas en charge les abonnements, soit ils ne sont "
 "pas activés."
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Abonné"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Dossier"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:837
 msgid "Please select a server."
 msgstr "Sélectionnez un serveur."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Aucun serveur n'a été sélectionné"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "Voulez-vous vraiment ouvrir %d messages en une fois ?"
+msgstr[1] "Voulez-vous vraiment ouvrir %d messages en une fois ?"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Filtres de messages"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:852
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages de %s"
@@ -11292,33 +10961,33 @@ msgstr "Messages de %s"
 msgid "Search _Folders"
 msgstr "Dossiers de _recherche"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:521
 msgid "Add Folder"
 msgstr "Ajouter un dossier"
 
 #: ../mail/evolution-mail.schemas.in.h:1
 msgid "\"Filter Editor\" window height"
-msgstr "Hauteur de la fenêtre « éditeur de filtres »"
+msgstr "Hauteur de la fenêtre « Éditeur de filtres »"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Filter Editor\" window maximize state"
-msgstr "État de maximisation de la fenêtre « éditeur de filtres »"
+msgstr "État de maximisation de la fenêtre « Éditeur de filtres »"
 
 #: ../mail/evolution-mail.schemas.in.h:3
 msgid "\"Filter Editor\" window width"
-msgstr "Largeur de la fenêtre « éditeur de filtres »"
+msgstr "Largeur de la fenêtre « Éditeur de filtres »"
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "\"Search Folder Editor\" window height"
-msgstr "Hauteur de la fenêtre « éditeur de dossiers de recherche »"
+msgstr "Hauteur de la fenêtre « Éditeur de dossiers de recherche »"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "\"Search Folder Editor\" window maximize state"
-msgstr "État de maximisation de la fenêtre « éditeur de dossiers de recherche »"
+msgstr "État de maximisation de la fenêtre « Éditeur de dossiers de recherche »"
 
 #: ../mail/evolution-mail.schemas.in.h:6
 msgid "\"Search Folder Editor\" window width"
-msgstr "Largeur de la fenêtre « éditeur de dossiers de recherche »"
+msgstr "Largeur de la fenêtre « Éditeur de dossiers de recherche »"
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
@@ -11333,51 +11002,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Largeur de la fenêtre « Envoi et réception du courriel »"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr ""
-"Permet à Evolution d'afficher des extraits de texte d'une taille limitée"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Toujours demander un accusé de lecture"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "Reconnaître automatiquement les frimousses"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "Reconnaître automatiquement les liens"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Vérifier si les messages entrants sont des pourriels"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Couleur de surbrillance des citations"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Couleur de surbrillance des citations."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Hauteur par défaut de la fenêtre d'édition"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Largeur par défaut de la fenêtre d'édition"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "Répertoire de l'éditeur pour charger/joindre"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Compresser l'affichage des adresses dans À/Cc/Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11385,7 +11049,7 @@ msgstr ""
 "Compresser l'affichage des adresses dans À/Cc/Cci au nombre indiqué dans "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11393,11 +11057,11 @@ msgstr ""
 "Vérifie à quelle fréquence les modifications locales sont synchronisées avec "
 "le serveur de messagerie distant. Le délai doit être d'au moins 30 secondes."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "En-têtes personnalisés à utiliser pour la détection des pourriels."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11405,63 +11069,63 @@ msgstr ""
 "En-têtes personnalisés à utiliser pour la détection des pourriels. Les "
 "éléments de la liste sont des chaînes au format « nom-entête=valeur »."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Jeu de caractère par défaut pour la rédaction des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Jeu de caractère par défaut pour la rédaction des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Jeu de caractère par défaut pour l'affichage des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Jeu de caractère par défaut pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Style de transfert par défaut"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Hauteur par défaut de la fenêtre d'édition."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Hauteur par défaut de la fenêtre de navigation des courriels."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Hauteur par défaut du dialogue des abonnements."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "État maximisé par défaut de la fenêtre de navigation des courriels."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Style de réponse par défaut"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Valeur par défaut pour l'état d'expansion des fils de discussion"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Largeur par défaut de la fenêtre d'édition."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Largeur par défaut de la fenêtre de navigation des courriels."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Largeur par défaut de la boîte de dialogue des abonnements."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11469,13 +11133,13 @@ msgstr ""
 "Indique s'il faut vérifier les adresses pour le filtrage des pourriels "
 "seulement dans le carnet d'adresses local"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Indique s'il faut consulter le carnet d'adresses pour l'expéditeur du "
 "courriel"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11488,13 +11152,13 @@ msgstr ""
 "l'opération peut être lente si vous utilisez des carnets d'adresses distants "
 "(tel que LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Indique s'il faut utiliser des en-têtes personnalisés pour la détection des "
 "pourriels"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11504,7 +11168,7 @@ msgstr ""
 "pourriels. Si cette option est active et que des en-têtes sont renseignés, "
 "la détection des pourriels sera plus rapide."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11512,20 +11176,25 @@ msgstr ""
 "Indique s'il faut utiliser les mêmes polices pour les lignes « De » et "
 "« Sujet » dans la colonne « Messages » en affichage verticale."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "Répertoire pour charger/joindre des fichiers dans l'éditeur."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "Répertoire pour enregistrer les fichiers joints aux courriels."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Activer ou désactiver la troncature des noms de dossier dans le panneau "
 "latéral"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+"N'afficher que les textes de message ne dépassant pas une certaine taille"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "Ne pas ajouter de séparateur de signature"
@@ -11602,14 +11271,18 @@ msgstr ""
 "les listes de messages et les dossiers."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "Activer l'affichage partiel du texte selon une limite de taille."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+"Activer pour n'afficher que les textes de messages dont la taille ne dépasse "
+"pas celle définie par la clé « message_text_part_limit »."
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "Activer/désactiver la lecture au curseur"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:46
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Coder les noms de fichiers à la manière Outlook/GMail"
 
@@ -11662,7 +11335,7 @@ msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr ""
-"Hauteur initiale de la fenêtre « éditeur de filtres ». La valeur est mise à "
+"Hauteur initiale de la fenêtre « Éditeur de filtres ». La valeur est mise à "
 "jour si l'utilisateur redimensionne la fenêtre verticalement."
 
 #: ../mail/evolution-mail.schemas.in.h:74
@@ -11670,7 +11343,7 @@ msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"Hauteur initiale de la fenêtre « éditeur de dossiers de recherche ». La "
+"Hauteur initiale de la fenêtre « Éditeur de dossiers de recherche ». La "
 "valeur est mise à jour si l'utilisateur redimensionne la fenêtre "
 "verticalement."
 
@@ -11689,10 +11362,10 @@ msgid ""
 "value is not used by Evolution since the \"Filter Editor\" window cannot be "
 "maximized. This key exists only as an implementation detail."
 msgstr ""
-"État maximisé initial de la fenêtre « éditeur de filtres ». La valeur est "
+"État maximisé initial de la fenêtre « Éditeur de filtres ». La valeur est "
 "mise à jour si l'utilisateur maximise ou démaximise la fenêtre. Notez que "
 "cette valeur particulière n'est pas utilisée par Evolution puisque la "
-"fenêtre « éditeur de filtres » ne peut pas être maximisée. Cette clé n'est "
+"fenêtre « Éditeur de filtres » ne peut pas être maximisée. Cette clé n'est "
 "qu'un détail d'implémentation."
 
 #: ../mail/evolution-mail.schemas.in.h:77
@@ -11702,10 +11375,10 @@ msgid ""
 "particular value is not used by Evolution since the \"Search Folder Editor\" "
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"État maximisé initial de la fenêtre « éditeur de dossiers de recherche ». La "
+"État maximisé initial de la fenêtre « Éditeur de dossiers de recherche ». La "
 "valeur est mise à jour si l'utilisateur maximise ou démaximise la fenêtre. "
 "Notez que cette valeur particulière n'est pas utilisée par Evolution puisque "
-"la fenêtre « éditeur de dossiers de recherche » ne peut pas être maximisée. "
+"la fenêtre « Éditeur de dossiers de recherche » ne peut pas être maximisée. "
 "Cette clé n'est qu'un détail d'implémentation."
 
 #: ../mail/evolution-mail.schemas.in.h:78
@@ -11727,7 +11400,7 @@ msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr ""
-"Largeur initiale de la fenêtre « éditeur de filtres ». La valeur est mise à "
+"Largeur initiale de la fenêtre « Éditeur de filtres ». La valeur est mise à "
 "jour si l'utilisateur redimensionne la fenêtre horizontalement."
 
 #: ../mail/evolution-mail.schemas.in.h:80
@@ -11735,7 +11408,7 @@ msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"Largeur initiale de la fenêtre « éditeur de dossiers de recherche ». La "
+"Largeur initiale de la fenêtre « Éditeur de dossiers de recherche ». La "
 "valeur est mise à jour si l'utilisateur redimensionne la fenêtre "
 "horizontalement."
 
@@ -11758,11 +11431,11 @@ msgstr ""
 "messages, et ne les supprime pas simplement des résultats de recherche."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
 msgstr "Dernière fois où les pourriels ont été vidés"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
 msgstr "Dernière fois où la corbeille a été vidée"
 
 #: ../mail/evolution-mail.schemas.in.h:85
@@ -11878,64 +11551,68 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "Marquer les citations dans le message « Preview »."
 
 #: ../mail/evolution-mail.schemas.in.h:109
+msgid "Message text limit for display"
+msgstr "Taille limite du texte des messages à l'affichage"
+
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Style d'affichage des messages (« normal », « en-têtes complets », « source »)"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Nombre minimum de jours entre les vidages de pourriels en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Nombre minimum de jours entre les vidages de corbeille en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Durée minimum en jours entre les vidages de pourriels en quittant."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Durée minimum en jours avant de vider la corbeille en quittant."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Nombre d'adresses à afficher pour À/Cc/Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "Demander pour les sujets vides"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Demander à l'utilisateur quand il ou elle essaie de nettoyer un dossier."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Demander confirmation à l'utilisateur quand il ou elle envoie des message "
 "sans sujet."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr ""
 "Demander lors de la suppression de messages dans un dossier de recherche"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "Demander quand l'utilisateur nettoie"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "Demander si l'utilisateur remplit uniquement Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Demander lors de l'envoi de 10 messages ou plus à la fois"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11943,67 +11620,67 @@ msgstr ""
 "Demander lors de l'envoi de messages HTML à des contacts qui n'en veulent "
 "pas."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 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.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Demander lorsque l'utilisateur essaye d'envoyer des message HTML non désirés"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "Demander lors du marquage de messages multiples"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr "Ajouter les signatures personnalisées en haut des réponses"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "Positionner le curseur en bas des réponses"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr ""
 "Reconnaître les frimousses dans le texte et les remplacer par des images."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "Reconnaître les liens dans le texte et les remplacer."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "Lancer le test de pourriel sur les messages entrants."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "Répertoire de sauvegarde"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "Chercher la photo de l'expéditeur dans les carnets d'adresses locaux"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "Envoyer par défaut le courriel au format HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "Envoyer par défaut le courriel au format HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "Colonne du courriel de l'expéditeur dans la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "Délai de synchronisation avec le serveur"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -12011,72 +11688,72 @@ msgstr ""
 "Définir à « vrai » si vous ne souhaitez pas ajouter une séparation avant la "
 "signature dans la rédaction d'un message."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Afficher le champ « Cci » lors de l'envoi d'un message"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Afficher le champ « Cc » lors de l'envoi d'un message"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr ""
 "Afficher le champ « De » lors de l'envoi d'un message à un groupe de "
 "discussion"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"From\" field when sending a mail message"
 msgstr "Afficher le champ « De » lors de l'envoi d'un message"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 "Afficher le champ « Répondre à » lors de l'envoi à un groupe de discussion"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Afficher le champ « Répondre à » lors de l'envoi d'un message"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "Afficher les animations"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show all message headers"
 msgstr "Afficher tous les en-têtes des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show all the headers when viewing a messages."
 msgstr "Affiche tous les en-têtes lors de l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "Afficher les images animées comme une animation."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Afficher les messages supprimés (comme barrés) dans la liste des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr ""
 "Afficher les messages marqués comme supprimés dans la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show image animations"
 msgstr "Afficher les animations"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show original \"Date\" header value."
 msgstr "Afficher la valeur d'origine de l'en-tête « Date »."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "Afficher la photo de l'expéditeur"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12084,7 +11761,7 @@ msgstr ""
 "Afficher le champ « Cci » lors de l'envoi d'un message. Cette option est "
 "contrôlée par le menu Affichage lorsqu'un compte de messagerie est choisi."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12092,7 +11769,7 @@ msgstr ""
 "Afficher le champ « Cc » lors de l'envoi d'un message. Cette option est "
 "contrôlée par le menu Affichage lorsqu'un compte de messagerie est choisi."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -12101,7 +11778,7 @@ msgstr ""
 "discussion. Cette option est contrôlée par le menu Affichage lorsqu'un "
 "compte de groupe de discussion est choisi."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12109,7 +11786,7 @@ msgstr ""
 "Afficher le champ « De » lors de l'envoi d'un message. Cette option est "
 "contrôlée par le menu Affichage lorsqu'un compte de messagerie est choisi."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -12118,7 +11795,7 @@ msgstr ""
 "discussion. Cette option est contrôlée par le menu Affichage lorsqu'un "
 "compte de groupe de discussion est choisi."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -12127,7 +11804,7 @@ msgstr ""
 "est contrôlée par le menu Affichage lorsqu'un compte de messagerie est "
 "choisi."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -12135,7 +11812,7 @@ msgstr ""
 "Afficher le courriel de l'expéditeur dans une colonne à part dans la liste "
 "des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -12146,50 +11823,49 @@ msgstr ""
 "tête « Date » dans le format préféré de l'utilisateur et dans le fuseau "
 "horaire local."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Afficher la photo de l'expéditeur dans le volet de lecture de message."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "Correction orthographique en ligne"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "Couleur du correcteur orthographique"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "Langues du correcteur orthographique"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "Hauteur par défaut de la fenêtre d'abonnements"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "Largeur par défaut de la fenêtre d'abonnements"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "Police du terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "Limite de la partie texte du message"
-
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "Le greffon par défaut pour le traitement du pourriel"
 
 #: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
-msgstr "Dernier vidage des pourriels, en jours depuis le 1/1/1970."
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "Dernier vidage des pourriels, en jours depuis le 1/1/1970 (Epoch)."
 
 #: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
-"La dernière fois que la corbeille a été vidée, en jours depuis le 1/1/1970."
+"La dernière fois que la corbeille a été vidée, en jours depuis le 1/1/1970 "
+"(Epoch)."
 
 #: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
@@ -12221,12 +11897,14 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
-"Indique la taille maximale de la portion de texte qui peut être formatée "
-"sous Evolution. La taille par défaut est 4 096 Kio (4 Mio) et est renseignée "
-"en Kio."
+"Indique la taille maximale du texte du message qui peut être affichée sous "
+"Evolution, renseignée en Kio. La taille par défaut est 4 096 Kio (4 Mio). "
+"Cette valeur n'est utilisée que lorsque la clé « force_message_limit » est "
+"activée."
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
@@ -12403,359 +12081,385 @@ msgstr "Largeur du panneau de la liste des messages"
 msgid "Width of the message-list pane."
 msgstr "Largeur du panneau de la liste des messages."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Importation des données Elm"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "Courriel"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:365
 msgid "Evolution Elm importer"
 msgstr "Assistant d'importation Elm d'Evolution"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:366
 msgid "Import mail from Elm."
 msgstr "Importation des boîtes à lettres de Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "Dossier de destination :"
+#: ../mail/importers/evolution-mbox-importer.c:114
+msgid "_Destination folder:"
+msgstr "_Dossier de destination :"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder"
 msgstr "Sélectionnez un dossier"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder to import into"
 msgstr "Sélectionnez un dossier pour l'importation"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#: ../mail/importers/evolution-mbox-importer.c:262
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Boîte à lettres Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:263
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importe les dossiers au format de boîte à lettres Berkeley"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Importation des boîtes à lettres"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:148
+#: ../plugins/pst-import/pst-importer.c:453
+#: ../plugins/pst-import/pst-importer.c:559
 #, c-format
-msgid "Importing `%s'"
+msgid "Importing '%s'"
 msgstr "Importation de « %s »"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:291
 #, c-format
 msgid "Scanning %s"
 msgstr "Examen de %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "Importation des données de Pine"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:418
 msgid "Evolution Pine importer"
 msgstr "Assistant d'importation Pine d'Evolution"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:419
 msgid "Import mail from Pine."
 msgstr "Importation des boîtes à lettres de Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Courriel à %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "Courriel de %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "Le sujet est %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "Liste de diffusion %s"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Ajouter une règle de filtre"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(note : requiert le redémarrage de l'application)"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"Le règle de filtre « %s » a été mise à jour parce qu'elle utilisait le "
+"dossier qui vient d'être supprimé\n"
+"« %s »."
+msgstr[1] ""
+"Les règles de filtre suivantes\n"
+"%s ont été mises à jour parce qu'elles utilisaient le dossier qui vient "
+"d'être supprimé\n"
+"« %s »."
 
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>Option de réponse en tête de message</b> (non recommandé)"
+msgid "(Not Recommended)"
+msgstr "(non recommandé)"
 
 #: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(note : requiert le redémarrage de l'application)"
+
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "Informations sur le compte"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "Ajouter une _nouvelle signature..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 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.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Chiffrer également pour _moi-même lors de l'envoi de messages chiffrés"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Toujours envoyer une copie (_Cc) à :"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Toujours envoyer une copie cachée (Cc_i) à :"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 "Toujours faire _confiance aux clés de mon trousseau lors du chiffrement"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Toujours chiffrer pour _moi-même lors de l'envoi de messages chiffrés"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "Toujours demander un accusé de _lecture"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "Authentification"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "Insérer automatiquement les images de frimou_sses"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "Jeu de _caractères :"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "_Vérifier les types pris en charge"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "Détecter les pourriels en utilisant des en-têtes per_sonnalisés"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
 msgstr "Détecter les pourriels dans les _messages entrants"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "Vérifier l'or_thographe pendant la frappe"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Vérifier si les messages entrants sont du pourriel"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "_Effacer"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "E_ffacer"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "Couleur pour les _mots mal orthographiés :"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "Rédaction de messages"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "_Confirmer avant le nettoyage d'un dossier"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Default Behavior"
 msgstr "Comportement par défaut"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "_Codage des caractères par défaut :"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Delete Mail"
 msgstr "Supprimer le courriel"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Delete junk messages on e_xit"
 msgstr "Supprimer les pourriels en q_uittant"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer numériquement les messages _sortants (par défaut)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "Afficher les _en-têtes des messages"
-
 #: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "Ne pas mettre en forme le contenu du message quand leur taille e_xcède"
+msgid "Displayed Message Headers"
+msgstr "Afficher les en-têtes des messages"
 
 #: ../mail/mail-config.ui.h:38
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "Ne pas afficher le contenu du message quand leur taille e_xcède"
+
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "Ne _pas marquer les messages comme pourriel si l'expéditeur est présent dans "
 "mon carnet d'adresses"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not quote"
 msgstr "Ne pas citer"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "Dossier des _brouillons :"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "_Adresse électronique :"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "Vider les dossiers corbeille en qui_ttant"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Magic S_pacebar"
 msgstr "Activer la barre d'es_pace magique"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Sea_rch Folders"
 msgstr "Activer les dossiers de _recherche"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "Certificat de _chiffrement :"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Chiffrer les messages sortants (par défaut)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fi_xed-width:"
 msgstr "Largeur fi_xe :"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Fix_ed width Font:"
 msgstr "Police à largeur fi_xe :"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Font Properties"
 msgstr "Propriétés de la police"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Format messages in _HTML"
 msgstr "Formater les messages en _HTML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "Nom compl_et :"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "HTML Messages"
 msgstr "Messages HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
 msgid "H_TTP Proxy:"
 msgstr "Serveur mandataire H_TTP :"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Headers"
 msgstr "En-têtes"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "Highlight _quotations with"
 msgstr "Mettre les citations en _surbrillance avec"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:60
 msgid "Inline"
 msgstr "Dans le corps"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 msgid "Inline (Outlook style)"
 msgstr "Dans le corps (style Outlook)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:63
 msgid "KB"
 msgstr "Kio"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Étiquettes"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "Langues"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "Chargement des images"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "En-têtes des messages"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "Emplacement de la boîte à lettres"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "Affichage des messages"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 msgid "Message Fonts"
 msgstr "Police des messages"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "Message Receipts"
 msgstr "Accusés de réception des messages"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "No _Proxy for:"
 msgstr "Pas de serveur mandataire _pour :"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:74
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12763,178 +12467,178 @@ msgstr ""
 "Note : vous n'aurez pas à fournir de mot de passe avant votre première "
 "connexion"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:75
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "L'option est ignorée si des pourriels par en-têtes personnalisés sont "
 "détectés."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:76
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Informations optionnelles"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 msgid "Or_ganization:"
 msgstr "Or_ganisation :"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:79
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de la _clé PGP/GPG :"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Pass_word:"
 msgstr "_Mot de passe :"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Port:"
 msgstr "Port :"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 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.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Printed Fonts"
 msgstr "Polices d'impression"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Proxy Settings"
 msgstr "Réglages du serveur mandataire"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Quoted"
 msgstr "Cité"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "Re_member password"
 msgstr "_Mémoriser le mot de passe"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "Re_ply-To:"
 msgstr "Ré_pondre à :"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "Remember _password"
 msgstr "_Mémoriser le mot de passe"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "Required Information"
 msgstr "Informations requises"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL n'est pas pris en charge dans cette compilation d'Evolution"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr ""
 "R_echercher la photo de l'expéditeur uniquement dans les carnets d'adresses "
 "locaux"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "S_électionner..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "_Envoie des accusés de réception des messages :"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "Police par _défaut :"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "Select Drafts Folder"
 msgstr "Sélectionner le dossier des brouillons"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "Sélection d'une police HTML à largeur fixe"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "Sélection d'une police HTML à largeur fixe pour l'impression"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font"
 msgstr "Sélection d'une police HTML à largeur variable"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "Sélection d'une police HTML à largeur variable pour l'impression"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "Select Sent Folder"
 msgstr "Sélectionner le dossier des messages envoyés"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 msgid "Sender Photograph"
 msgstr "Photo de l'expéditeur"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Sending Mail"
 msgstr "Envoi de courriels"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "Dossier des _messages envoyés :"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Sent and Draft Messages"
 msgstr "Messages envoyés et brouillons"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Le _serveur requiert une authentification"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:114
 msgid "Server _Type:"
 msgstr "_Type de serveur :"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_natures"
 msgstr "Sig_natures"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "Certificat de _signature :"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "Signat_ure :"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "_Commencer la rédaction en bas lors des réponses"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "T_ype :"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12942,7 +12646,7 @@ msgstr ""
 "La liste des langues ne contient que les langues pour lesquelles un "
 "dictionnaire a été installé."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12952,7 +12656,12 @@ msgstr ""
 "signature. Le nom indiqué ne sera utilisé que\n"
 "pour l'affichage."
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:128
+msgid "Top Posting Option"
+msgstr "Option de réponse en tête de message"
+
+#: ../mail/mail-config.ui.h:129
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12960,247 +12669,245 @@ msgstr ""
 "Saisissez le nom par lequel vous voulez désigner ce compte.\n"
 "Par exemple : « Travail » ou « Personnel »"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:131
 msgid "Us_ername:"
 msgstr "_Nom d'utilisateur :"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:132
 msgid "Use Authe_ntication"
 msgstr "Utiliser l'_authentification"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:133 ../plugins/caldav/caldav-source.c:222
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "_Nom d'utilisateur :"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:134
 msgid "V_ariable-width:"
 msgstr "_Largeur variable :"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:135
 msgid "_Add Signature"
 msgstr "A_jouter une signature"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:136
 msgid "_Always load images from the Internet"
 msgstr "_Toujours charger les images à partir d'Internet"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:137
 msgid "_Authentication Type"
 msgstr "Type d'_authentification"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:138
 msgid "_Default junk plugin:"
 msgstr "_Greffon pourriel par défaut :"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:139
 msgid "_Direct connection to the Internet"
 msgstr "Connexion _directe à Internet"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:140
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne pas signer les de_mandes de réunion (compatibilité Outlook)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:141
 msgid "_Forward style:"
 msgstr "Style de _transfert :"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:142
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 "C_onserver la signature au-dessus du message d'origine lors des réponses"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:143
 msgid "_Languages"
 msgstr "_Langues"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:144
 msgid "_Load images in messages from contacts"
 msgstr "_Afficher les images dans les messages des contacts"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:145
 msgid "_Lookup in local address book only"
 msgstr "Rechercher seulement dans le carnet d'adresses _local"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:146
 msgid "_Make this my default account"
 msgstr "En faire _mon compte par défaut"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:147
 msgid "_Manual proxy configuration:"
 msgstr "Configuration _manuelle du serveur mandataire :"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:148
 msgid "_Mark messages as read after"
 msgstr "_Marquer les messages comme lus après"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:150
 msgid "_Never load images from the Internet"
 msgstr "_Ne jamais charger les images à partir d'Internet"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:151
 msgid "_Path:"
 msgstr "_Chemin :"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:152
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "_Demander l'autorisation lors de l'envoi de messages HTML à des contacts qui "
 "n'en veulent pas"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:153
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "De_mander lors de l'envoi de messages dépourvus de sujet"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:154
 msgid "_Reply style:"
 msgstr "Style de _réponse  :"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:155
 msgid "_Script:"
 msgstr "_Script :"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:156
 msgid "_Secure HTTP Proxy:"
 msgstr "_Serveur mandataire HTTP sécurisé :"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "S_erveur :"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:160
 msgid "_Show image animations"
 msgstr "_Afficher les animations"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:161
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Afficher la photo de l'expéditeur dans l'aperçu du courriel"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:163
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Réduire les en-têtes À / Cc / Cci à"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:164
 msgid "_Use Secure Connection:"
 msgstr "_Utiliser une connexion sécurisée :"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:165
 msgid "_Use system defaults"
 msgstr "_Utiliser les réglages par défaut du système"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:166
 msgid "_Use the same fonts as other applications"
 msgstr "_Utiliser les mêmes polices que dans les autres applications"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:169
 msgid "addresses"
 msgstr "adresses"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:170 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:171
 msgid "color"
 msgstr "couleur"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:172
 msgid "description"
 msgstr "description"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Tous les dossiers actifs distants"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "Tous les dossiers locaux et actifs distants"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "Tous les dossiers locaux"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Appel"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "_Achevée"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Digital Signature"
 msgstr "Signature numérique"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "Ne pas faire suivre"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Folder Subscriptions"
 msgstr "Gérer les abonnements"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Donner suite"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Pour votre information"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Accord de licence"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "Aucune réponse nécessaire"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "Répondre à tous"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "Revoir"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:20
 msgid "S_erver:"
 msgstr "_Serveur :"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Search Folder Sources"
 msgstr "Sources de dossier de recherche"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Security Information"
 msgstr "Informations de sécurité"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Specific folders"
 msgstr "Dossiers spécifiques"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:24
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13208,170 +12915,170 @@ msgstr ""
 "Les messages sélectionnés pour suivi sont listés ci-après.\n"
 "Sélectionnez une action de suivi dans le menu « Marqueur »."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Accept License"
 msgstr "_Accepter la licence"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Due By:"
 msgstr "_Date d'échéance :"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Flag:"
 msgstr "_Marqueur :"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Tick this to accept the license agreement"
 msgstr "Cochez ici pour accepter les _termes de la licence"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:891
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping sur %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Filtrage des messages sélectionnés"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "Récupération du courriel"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:574
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "L'application des filtres de sortie a échoué : %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:586 ../mail/mail-ops.c:613
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "L'ajout à %s a échoué : %s\n"
 "Ajouté au dossier local « Envoyés » à la place."
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:630
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "L'ajout au dossier local « Envoyés » a échoué : %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:741 ../mail/mail-ops.c:822
 msgid "Sending message"
 msgstr "Envoi du message"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:751
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Envoi du message %d sur %d"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:778
 #, 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:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:780 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "Annulé."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:782 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "Terminé."
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:894
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Enregistrement du message dans le dossier « %s »"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Déplacement des messages vers « %s »"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copie des messages vers « %s »"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1080
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Examen des dossiers dans « %s »"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1188
 msgid "Forwarded messages"
 msgstr "Messages transférés"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1229
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Ouverture du dossier « %s »"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1295
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Récupération des informations de quota pour le dossier « %s »"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1367
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Ouverture du stockage « %s »"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1438
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Suppression du dossier « %s »"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1556
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Stockage du dossier « %s »"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1619
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Nettoyage et stockage du compte « %s »"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1620
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Stockage du compte « %s »"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1674
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualisation du dossier « %s »"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1714
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Nettoyage du dossier « %s »"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1759
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vidage de la corbeille dans « %s »"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1760
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1956
 #, 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:2056
+#: ../mail/mail-ops.c:2045
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Enregistrement de %d message"
 msgstr[1] "Enregistrement de %d messages"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2126
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13380,11 +13087,11 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2198
 msgid "Saving attachment"
 msgstr "Enregistrement de la pièce jointe"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2216 ../mail/mail-ops.c:2224
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13393,35 +13100,35 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s :\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2239
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossible d'écrire les données : %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Déconnexion de « %s »"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Reconnexion à « %s »"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2480
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Préparation du compte « %s » pour utilisation hors ligne"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2566
 msgid "Checking Service"
 msgstr "Service de vérification"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "Annulation..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "Envoi et réception du courriel"
 
@@ -13429,110 +13136,146 @@ msgstr "Envoi et réception du courriel"
 msgid "Cancel _All"
 msgstr "_Tout annuler"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "Mise à jour..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "Recherche de nouveau courriel"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:208
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Saisissez la phrase de passe pour %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:210
 msgid "Enter Passphrase"
 msgstr "Saisissez la phrase de passe"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:213
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:215
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:257
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulé l'opération."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:667
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "Aucune adresse de destination fournie, le transfert du message a été annulé."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:673
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "Aucun compte à utiliser n'a été trouvé, le transfert du message a été annulé."
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:119
 #, c-format
-msgid "Could not create spool directory `%s': %s"
+msgid "Could not create spool directory '%s': %s"
 msgstr "Impossible de créer le dossier spool « %s » : %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:149
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Tentative de movemail d'une source non mbox « %s »"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Message transféré - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "Message transféré"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:297
 #, c-format
-msgid "Invalid folder: `%s'"
+msgid "Invalid folder: '%s'"
 msgstr "Dossier non valide : « %s »"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Mise en place du dossier de recherche : %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:229
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Mise à jour des dossiers de recherche pour « %s:%s »"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:236
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Mise à jour des dossiers de recherche pour « %s »"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:679
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"Le dossier de recherche « %s » a été mise à jour parce qu'il utilisait le "
+"dossier qui vient d'être supprimé\n"
+"« %s »."
+msgstr[1] ""
+"Les dossiers de recherche suivants\n"
+"%s ont été mis à jour parce qu'ils utilisaient le dossier qui vient d'être "
+"supprimé\n"
+"« %s »."
+
+#: ../mail/mail-vfolder.c:1191
 msgid "Edit Search Folder"
 msgstr "Éditer un dossier de recherche"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1296
 msgid "New Search Folder"
 msgstr "Nouveau dossier de recherche"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "Échec de la détection des pourriels"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "Échec du signalement de pourriel"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "Échec du signalement de non pourriel"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 "Un dossier nommé « {0} » existe déjà. Veuillez utiliser un nom différent."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 "Un dossier nommé « {1} » existe déjà. Veuillez utiliser un nom différent."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13544,7 +13287,7 @@ msgstr ""
 "Vous pouvez choisir d'ignorer ce dossier, d'écraser ou ajouter son contenu, "
 "ou de quitter."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13552,14 +13295,14 @@ msgstr ""
 "Un accusé de réception a été demandé pour la lecture de « {1} ». Voulez-vous "
 "envoyer l'accusé de réception à {0} ?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr ""
 "Une signature nommée « {0} » existe déjà. Veuillez indiquer un nom différent."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13567,24 +13310,20 @@ msgstr ""
 "Ajouter un sujet compréhensible à vos messages permet de donner à vos "
 "destinataires une idée du propos du courriel."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Voulez-vous vraiment supprimer ce compte et tous ses mandataires ?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "Voulez-vous vraiment supprimer ce compte ?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Voulez-vous vraiment supprimer ce compte et tous ses mandataires ?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Voulez-vous vraiment ouvrir {0} messages en une fois ?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13592,7 +13331,7 @@ msgstr ""
 "Voulez-vous vraiment supprimer définitivement tous les messages effacés dans "
 "tous les dossiers ?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13600,91 +13339,83 @@ msgstr ""
 "Voulez-vous vraiment supprimer définitivement tous les messages effacés dans "
 "le dossier « {0} » ?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Voulez-vous vraiment envoyer un message au format HTML ?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Voulez-vous vraiment envoyer un message avec une adresse non valide ?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr ""
 "Voulez-vous vraiment envoyer un message avec des adresses non valides ?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Voulez-vous vraiment envoyer un message avec des destinataires Cci "
 "seulement ?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Voulez-vous vraiment envoyer un message sans sujet ?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "À cause de « {0} »."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "À cause de « {2} »."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Signature vide"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Impossible d'ajouter le dossier de recherche « {0} »."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Impossible de copier le dossier « {0} » vers « {1} »."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "Impossible de créer le dossier « {0} »."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "Impossible de créer de dossier de sauvegarde temporaire."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Impossible de créer le dossier de sauvegarde parce que « {1} »"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Impossible de supprimer le dossier « {0} »."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Impossible de supprimer le dossier système « {0} »."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
 "Impossible de modifier le dossier de recherche « {0} » puisqu'il n'existe pas."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Impossible de déplacer le dossier « {0} » vers « {1} »."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
-msgstr "Impossible d'ouvrir la source « {1} »"
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "Impossible d'ouvrir la source « {1} »."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "Impossible d'ouvrir la source « {2} »."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "Impossible d'ouvrir la cible « {2} »."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13693,35 +13424,31 @@ msgstr ""
 "d'installation. Vous ne serez pas capable d'utiliser ce fournisseur jusqu'à "
 "ce que vous acceptiez sa licence."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Impossible de renommer « {0} » en « {1} »."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Impossible de renommer ou déplacer le dossier système « {0} »."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "Impossible d'enregistrer les modifications au compte."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Impossible d'enregistrer dans le dossier « {0} »."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "Impossible d'enregistrer dans le fichier « {0} »."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Impossible de définir le script de signature « {0} »."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Échec de la détection des pourriels"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13730,27 +13457,27 @@ msgstr ""
 "que beaucoup de mots de passe sont sensibles à la casse ; le verrouillage "
 "majuscules est peut-être actif."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Impossible d'enregistrer le fichier de signature."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Supprimer les messages du dossier de recherche « {0} » ?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Do not d_elete"
 msgstr "Ne pas s_upprimer"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "Ne pas supprimer"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "Ne pas désactiver"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13758,63 +13485,66 @@ msgstr ""
 "Désirez-vous synchroniser localement les dossiers qui sont marqués pour une "
 "utilisation hors ligne ?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "Voulez-vous marquer tous les messages comme lus ?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Voulez-vous enregistrer vos modifications ?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Saisissez le mot de passe."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Erreur de chargement des définitions du filtre."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Erreur durant l'exécution de l'opération."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "Erreur durant {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "Le fichier existe mais ne peut pas être écrasé."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "Le fichier existe mais n'est pas un fichier régulier."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si vous continuez vous ne serez pas capable de récupérer ces messages."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
 "Si vous supprimez le dossier, tout son contenu ainsi que le contenu de ses "
 "sous-dossiers sera définitivement supprimés."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "Si vous supprimez le dossier, tout son contenu sera définitivement supprimé."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 "Si vous continuez, tous les comptes des mandataires seront définitivement "
 "supprimés."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13822,13 +13552,13 @@ msgstr ""
 "Si vous continuez, toutes les informations sur le compte\n"
 "et sur les mandataires seront définitivement supprimés."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 "Si vous continuez, toutes les informations sur le compte seront "
 "définitivement supprimées."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13836,23 +13566,23 @@ msgstr ""
 "Si vous quittez, ces messages ne seront pas envoyés avant qu'Evolution soit "
 "à nouveau démarré."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Authentification non valide"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Impossible de supprimer le courriel"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Filtres du courriel automatiquement mis à jour."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13864,28 +13594,28 @@ 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:72
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "Dossier manquant."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "Aucune source n'a été sélectionnée."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 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:76
+#: ../mail/mail.error.xml.h:77
 msgid "Please check your account settings and try again."
 msgstr "Vérifiez les paramètres de votre compte et essayez à nouveau."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Please enable the account or send using another account."
 msgstr ""
 "Activez le compte ou bien effectuez l'envoi en utilisant un autre compte."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 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."
@@ -13894,7 +13624,7 @@ msgstr ""
 "rechercher des adresses électroniques en cliquant sur le bouton « À : » à "
 "côté de la boîte de saisie."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13904,67 +13634,59 @@ msgstr ""
 "courriel HTML :\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "Saisissez un nom unique pour identifier cette signature."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "Veuillez patienter."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problème lors de la migration de l'ancien dossier de courriel « {0} »."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Questionne le serveur pour obtenir une liste des mécanismes "
 "d'authentification pris en charge."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "Accusé de réception demandé."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Really delete folder \"{0}\" 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:88
 msgid "Really delete folder \"{0}\"?"
 msgstr "Voulez-vous vraiment supprimer le dossier « {0} » ?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "Échec du signalement de pourriel"
-
 #: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "Échec du signalement de non pourriel"
-
-#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "Dossiers de recherche automatiquement mis à jour."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "Envoyer un accusé de réception"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "Signature déjà existante"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "Synchroniser"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 "Faut-il synchroniser localement les dossiers pour une utilisation hors "
 "ligne ?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13972,7 +13694,7 @@ 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."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13989,35 +13711,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:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Les dossiers de recherche suivants :\n"
-"{0}\n"
-"utilisaient le dossier maintenant supprimé :\n"
-"    « {1} »\n"
-"Ils ont été mis à jour."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Les règles de filtrage suivantes :\n"
-"{0}\n"
-"utilisaient le dossier maintenant supprimé :\n"
-"    « {1} »\n"
-"Elles ont été mises à jour."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -14026,7 +13720,7 @@ msgstr ""
 "valide :\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -14035,11 +13729,11 @@ msgstr ""
 "valides :\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:102
 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:114
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14048,7 +13742,7 @@ msgstr ""
 "si nécessaire, allez dans l'éditeur de dossiers de recherche\n"
 "pour l'ajouter explicitement."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14056,13 +13750,13 @@ 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:117
+#: ../mail/mail.error.xml.h:106
 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 indiqué aucun destinataire"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14070,11 +13764,11 @@ msgstr ""
 "Le serveur ne prend pas en charge ce type d'authentification et il se peut "
 "qu'il ne prenne en charge aucune identification du tout."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:108
 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:120
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14082,11 +13776,11 @@ msgstr ""
 "Marque tous les messages dans le dossier sélectionné, et ses sous-dossiers, "
 "comme lus."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "Impossible de se connecter au serveur GroupWise."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14094,19 +13788,19 @@ 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:123
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "Impossible de lire le fichier de licence."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "Utiliser le _défaut"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "Utiliser le dossier Brouillons par défaut ?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -14116,34 +13810,34 @@ msgstr ""
 "le message d'un de vos dossiers local ou distant.\n"
 "Est-ce vraiment ce que vous souhaitez ?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:117
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr ""
 "Vous ne disposez pas des droits nécessaires pour supprimer ce courriel."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:118
 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:130
+#: ../mail/mail.error.xml.h:119
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Certains messages n'ont pas été envoyés. Voulez-vous vraiment quitter le "
 "programme ?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:120
 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:132
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "Vous devez nommer ce dossier de recherche."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "Vous devez indiquer un dossier."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14153,116 +13847,112 @@ 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:136
+#: ../mail/mail.error.xml.h:125
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
 "Votre identification sur le serveur « {0} » en tant que « {0} » a échoué."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "A_jouter"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "Aban_donner les modifications"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:128
 msgid "_Do not Synchronize"
 msgstr "_Ne pas synchroniser"
 
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:821
 msgid "_Empty Trash"
 msgstr "_Vider la corbeille"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "Ne_ttoyer"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "_Ouvrir les messages"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1110
 msgid "Unseen"
 msgstr "Non vu"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1111
 msgid "Seen"
 msgstr "Vu"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1112
 msgid "Answered"
 msgstr "Répondu"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1113
 msgid "Forwarded"
 msgstr "Transféré"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1114
 msgid "Multiple Unseen Messages"
 msgstr "Multiples messages non vus"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1115
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1119
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1120
 msgid "Lower"
 msgstr "Plus bas"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1124
 msgid "Higher"
 msgstr "Plus haut"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1125
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1735 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1742 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %H:%M"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1751
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %H:%M"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1763
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1771
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1773
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2518
 msgid "Select all visible messages"
 msgstr "Sélectionne tous les messages visibles"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "Moteur du shell"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4199 ../mail/message-list.c:4595
 msgid "Generating message list"
 msgstr "Génération de la liste des messages"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4432
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14270,15 +13960,7 @@ msgstr ""
 "Aucun message ne remplit vos critères de recherche. Effacez la recherche "
 "avec le menu Recherche->Effacer ou modifiez les critères."
 
-#: ../mail/message-list.c:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"Ce dossier ne contient que des messages cachés. Choisissez « Affichage-"
-">Afficher tous les messages masqués » pour les afficher."
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4434
 msgid "There are no messages in this folder."
 msgstr "Il n'y a aucun message dans ce dossier."
 
@@ -14316,27 +13998,27 @@ msgid "Subject - Trimmed"
 msgstr "Sujet - Tronqué"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Body contains"
 msgstr "Le corps contient"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Message contains"
 msgstr "Le message contient"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Recipients contain"
 msgstr "Les destinataires contiennent"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Sender contains"
 msgstr "L'expéditeur contient"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Subject contains"
 msgstr "Le sujet contient"
 
@@ -14370,15 +14052,15 @@ msgstr ""
 "SSL ni TLS. Cela signifie que votre connexion ne sera pas sécurisée et que "
 "vous serez vulnérable aux failles de sécurité."
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Utiliser dans le calendrier _Anniversaires"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "Copier localement le contenu du _carnet pour les opérations hors ligne"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -14388,7 +14070,7 @@ msgstr ""
 "connecter. Une liste de ports standard est fournie. Demandez à votre "
 "administrateur système le port à utiliser."
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14398,7 +14080,7 @@ msgstr ""
 "Notez qu'indiquer « Adresse électronique » implique l'accès anonyme à votre "
 "serveur LDAP."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -14410,29 +14092,29 @@ msgstr ""
 "les entrées sous la base de recherche. Un domaine de recherche « one » "
 "inclura les entrées se trouvant un niveau en dessous de la base."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "Informations sur le serveur"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Détails"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Recherche"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "Téléchargement"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "Propriétés du carnet d'adresses"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "Nouveau carnet d'adresses"
 
@@ -14520,9 +14202,11 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "Indique s'il faut afficher le panneau d'aperçu."
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Colonne de tableau :"
+#: ../modules/mail/em-mailer-prefs.c:1159
+msgid "_Table column:"
+msgstr "Colonne de _tableau :"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -14534,7 +14218,7 @@ msgstr "Toujours _afficher l'adresse du contact autocomplété"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "Sur les serveurs LDAP"
 
@@ -14544,7 +14228,7 @@ msgid "_Contact"
 msgstr "_Contact"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "Crée un nouveau contact"
 
@@ -14554,7 +14238,7 @@ msgid "Contact _List"
 msgstr "_Liste de contacts"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "Crée une nouvelle liste de contacts"
 
@@ -14564,7 +14248,7 @@ msgid "Address _Book"
 msgstr "Carnet d'_adresses"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "Crée un nouveau carnet d'adresses"
 
@@ -14572,336 +14256,232 @@ msgstr "Crée un nouveau carnet d'adresses"
 #: ../modules/addressbook/e-book-shell-backend.c:376
 #: ../modules/addressbook/e-book-shell-view.c:394
 #: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Liste de source"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "Le registre des carnets d'adresses"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "Vue active"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "La vue actuellement sélectionnée du carnet d'adresses"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Contact prévisualisé"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "Le contact actuellement affiché dans le panneau d'aperçu"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "L'aperçu est visible"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "Indique si le panneau d'aperçu est visible"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "Serveurs LDAP"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "Paramètres de complétion automatique"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-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 ""
-"L'emplacement et la hiérarchie des dossiers des contacts ont changé depuis "
-"Evolution 1.x.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Le format des contacts de listes de diffusion a changé.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"La manière dont Evolution stocke certains numéros de téléphone a changé.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Les fichiers de données de synchronisation des Palms d'Evolution ont "
-"changé.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "Composant graphique sélecteur de source"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "Ce composant graphique affiche les groupes de carnets d'adresses"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "Enregistrer comme vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "Co_pier tous les contacts vers..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copie les contacts du carnet d'adresses sélectionné dans un autre"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "_Supprimer le carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "Supprime le carnet d'adresses sélectionné"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "Dépla_cer tous les contacts vers..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "Déplace les contacts du carnet d'adresses sélectionné dans un autre"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "_Nouveau carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "Propriétés du _carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "Affiche les propriétés du carnet d'adresses sélectionné"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/mail/e-mail-shell-view-actions.c:905
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "Renomme le carnet d'adresses sélectionné"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "_Enregistrer le carnet d'adresses comme vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Enregistre les contacts du carnet d'adresses sélectionné comme vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "Arrête le chargement"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "_Copier le contact vers..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "Copie les contacts sélectionnés dans un autre carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "_Supprimer le contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "_Rechercher dans le contact..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "Recherche du texte dans le contact affiché"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "_Faire suivre le contact..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "Envoie les contacts sélectionnés à une autre personne"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "_Déplacer le contact vers..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "Déplace les contacts sélectionnés dans un autre carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "_Nouveau contact..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "_Nouvelle liste de contacts..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "_Ouvrir le contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "Affiche le contact actuel"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "Envoyer un _message au contact..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "Envoie un message aux contacts sélectionnés"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "_Actions"
 msgstr "A_ctions"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 #: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "_Preview"
 msgstr "_Aperçu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "_Propriétés"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "_Enregistrer comme vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "_Aperçu du contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "Affiche la fenêtre de prévisualisation des contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 #: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/calendar/e-task-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Classic View"
 msgstr "Affichage _classique"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "Affiche l'aperçu du contact sous la liste des contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 #: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/calendar/e-task-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Vertical View"
 msgstr "Affichage _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "Affiche l'aperçu du contact à côté de la liste des contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Any Category"
 msgstr "Toutes les catégories"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/calendar/e-task-shell-view-actions.c:941
 msgid "Unmatched"
 msgstr "Différent"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../shell/e-shell-content.c:441
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "Imprime tous les contacts visibles"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "Prévisualise les contacts à imprimer"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "Imprime les contacts sélectionnés"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Enregistrer comme vCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "Enregistre les contacts sélectionnés comme vCard"
 
@@ -14945,58 +14525,48 @@ msgstr "Informations sur le contact"
 msgid "Contact information for %s"
 msgstr "Informations sur le contact %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "Anonyme"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "Pa_rcourir ce carnet d'adresses jusqu'à ce que la limite soit atteinte"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "Co_nnexion :"
 
 # LDAP search scope
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "Un niveau"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Filtre de recherche"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "Ba_se de recherche :"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "_Filtre de recherche :"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -15007,55 +14577,56 @@ msgstr ""
 
 # LDAP search scope
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "Arborescence"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "Bases de recherche prises en charge"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "En utilisant le nom distinctif (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "En utilisant l'adresse électronique"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "Limite de _téléchargement :"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "_Trouver les bases de recherche possibles"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "_Méthode d'identification :"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Port :"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "Domain_e de recherche :"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_Délai :"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Utiliser une connexion sécurisée :"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "cartes"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mporter"
 
@@ -15077,11 +14648,11 @@ msgstr "I_mporter dans les tâches"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-migrate.c:176
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "Sur le Web"
 
@@ -15091,7 +14662,7 @@ msgid "Weather"
 msgstr "Météo"
 
 #: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Anniversaires"
 
@@ -15101,7 +14672,7 @@ msgid "_Appointment"
 msgstr "_Rendez-vous"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "Crée un nouveau rendez-vous"
 
@@ -15129,49 +14700,18 @@ msgid "Cale_ndar"
 msgstr "_Calendrier"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "Crée un nouveau calendrier"
 
 #: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../plugins/itip-formatter/itip-formatter.c:2651
 msgid "Calendar and Tasks"
 msgstr "Calendrier et tâches"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "Le registre des calendriers"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-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 ""
-"L'emplacement et la hiérarchie des dossiers des calendriers ont changé "
-"depuis Evolution 1.x.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"Impossible de migrer les anciens paramètres à partir de evolution/config."
-"xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Impossible de migrer le calendrier « %s »"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -15180,36 +14720,16 @@ msgstr ""
 "Erreur sur %s\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
 msgid "Loading calendars"
 msgstr "Chargement des calendriers"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:617
 msgid "Calendar Selector"
 msgstr "Sélecteur de calendrier"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "Composant graphique navigateur de date"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "Ce composant graphique affiche un calendrier miniature"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "Client de calendrier par défaut"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "Client par défaut pour les opérations de calendrier"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "Ce composant graphique affiche les groupes de calendriers"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:952
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ouverture du calendrier à %s"
@@ -15253,244 +14773,244 @@ msgstr "évènement"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
 #: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-task-shell-view-actions.c:612
 msgid "Save as iCalendar"
 msgstr "Enregistrer comme iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "_Copier..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "D_elete Calendar"
 msgstr "Supprim_er le calendrier"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Delete the selected calendar"
 msgstr "Supprime le calendrier sélectionné"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Go Back"
 msgstr "En arrière"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Go Forward"
 msgstr "En avant"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "Sélectionner au_jourd'hui"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "Sélectionne le jour d'aujourd'hui"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "Sélectionner une _date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "Sélectionne une date précise"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "_Nouveau calendrier"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Purg_e"
 msgstr "Nettoy_er"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Purge old appointments and meetings"
 msgstr "Nettoie les anciens rendez-vous et les anciennes réunions"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Re_fresh"
 msgstr "Ac_tualiser"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Refresh the selected calendar"
 msgstr "Actualise le calendrier sélectionné"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Rename the selected calendar"
 msgstr "Renomme le calendrier sélectionné"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Show _Only This Calendar"
 msgstr "Afficher _uniquement ce calendrier"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Cop_y to Calendar..."
 msgstr "Copier vers le c_alendrier..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "Déléguer une _réunion..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delete Appointment"
 msgstr "Su_pprimer le rendez-vous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete selected appointments"
 msgstr "Supprime les rendez-vous sélectionnés"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete This _Occurrence"
 msgstr "Supprimer cette _occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "Supprime cette occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete All Occ_urrences"
 msgstr "Supprimer _toutes les occurrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "Supprime toutes les occurrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "New All Day _Event..."
 msgstr "Nouvel évén_ement toute la journée..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Create a new all day event"
 msgstr "Crée un nouvel évènement toute la journée"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "New _Meeting..."
 msgstr "Nouvelle _réunion..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Create a new meeting"
 msgstr "Crée une nouvelle réunion"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "Déplacer _vers le calendrier..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "Nouveau re_ndez-vous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurrence _déplaçable"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "_Ouvrir un rendez-vous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "Affiche le rendez-vous actuel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Enregistrer comme iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Convertit un rendez-vous en réunion"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_ertir en rendez-vous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Convertit une réunion en rendez-vous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+msgid "Quit"
+msgstr "Quitter"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "Jour"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "Affiche une journée"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "Affiche comme une liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "Mois"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "Affiche un mois"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "Semaine"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "Affiche une semaine"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Show one work week"
 msgstr "Affiche une semaine de travail"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "Rendez-vous actuels"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "Rendez-vous des 7 prochains jours"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Description contains"
 msgstr "La description contient"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Summary contains"
 msgstr "Le résumé contient"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "Imprime ce calendrier"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 msgid "Preview the calendar to be printed"
 msgstr "Prévisualise le calendrier à imprimer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "Aller à"
 
@@ -15525,7 +15045,7 @@ msgstr "Affiche le mémo sélectionné"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 #: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Open _Web Page"
 msgstr "Ouvrir le _site Web"
 
@@ -15539,22 +15059,22 @@ msgstr "Imprime le mémo sélectionné"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:610
 msgid "task"
 msgstr "tâche"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:672
 msgid "_Assign Task"
 msgstr "_Attribuer une tâche"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "_Mark as Complete"
 msgstr "_Marquer comme terminé"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Mark selected tasks as complete"
 msgstr "Marque les tâches sélectionnées comme terminées"
 
@@ -15563,39 +15083,39 @@ msgid "_Mark as Incomplete"
 msgstr "_Marquer comme incomplet"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Mark selected tasks as incomplete"
 msgstr "Marque les tâches sélectionnées comme incomplètes"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "New _Task"
 msgstr "Nouvelle _tâche"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Create a new task"
 msgstr "Crée une nouvelle tâche"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "_Open Task"
 msgstr "_Ouvrir une tâche"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "View the selected task"
 msgstr "Affiche les tâches sélectionnées"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
 #: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "_Save as iCalendar..."
 msgstr "_Enregistrer comme iCalendar..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:998
 msgid "Print the selected task"
 msgstr "Imprime la tâche sélectionnée"
 
@@ -15623,36 +15143,16 @@ msgstr "Li_ste de mémos"
 msgid "Create a new memo list"
 msgstr "Crée une nouvelle liste de mémos"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "Le registre des listes de mémos"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "Le modèle de tableau des mémos"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "Chargement des mémos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:571
 msgid "Memo List Selector"
 msgstr "Sélecteur de liste de mémos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "Client de mémo par défaut"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "Client par défaut pour les opérations de mémo"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "Ce composant graphique affiche les groupes de listes de mémos"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:870
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Ouverture des mémos de %s"
@@ -15763,58 +15263,20 @@ msgid "Tas_k List"
 msgstr "Liste de _tâches"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "Create a new task list"
 msgstr "Crée une nouvelle liste de tâches"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "Le registre des listes de tâches"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "Le modèle de tableau des tâches"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-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 ""
-"L'emplacement et la hiérarchie des dossiers des tâches ont changé depuis "
-"Evolution 1.x.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Impossible de migrer les tâches « %s »"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "Chargement des tâches"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:571
 msgid "Task List Selector"
 msgstr "Sélecteur de liste de tâches"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "Client de tâche par défaut"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "Client par défaut pour les opérations sur les tâches"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "Ce composant graphique affiche les groupes de listes de tâches"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:870
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tâches à %s"
@@ -15824,7 +15286,7 @@ msgstr "Ouverture des tâches à %s"
 msgid "Print Tasks"
 msgstr "Imprimer les tâches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:554
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15836,95 +15298,95 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tâches ?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:679
 msgid "_Delete Task"
 msgstr "_Supprimer la tâche"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "_Find in Task..."
 msgstr "_Rechercher dans la tâche..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "Search for text in the displayed task"
 msgstr "Recherche du texte dans la tâche affichée"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:700
 msgid "Copy..."
 msgstr "Copier..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:707
 msgid "D_elete Task List"
 msgstr "S_upprimer la liste des tâches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Delete the selected task list"
 msgstr "Supprime la liste de tâches sélectionnée"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "_New Task List"
 msgstr "_Nouvelle liste de tâches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "Refresh the selected task list"
 msgstr "Actualise la liste de tâches sélectionnée"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Rename the selected task list"
 msgstr "Renomme la liste de tâches sélectionnée"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Show _Only This Task List"
 msgstr "Afficher _uniquement cette liste de tâches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:756
 msgid "Mar_k as Incomplete"
 msgstr "_Marquer comme incomplet"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Delete completed tasks"
 msgstr "Supprime les tâches terminées"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:861
 msgid "Task _Preview"
 msgstr "A_perçu de la tâche"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:863
 msgid "Show task preview pane"
 msgstr "Afficher le panneau d'aperçu des tâches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:884
 msgid "Show task preview below the task list"
 msgstr "Affiche l'aperçu des tâches sous la liste des tâches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 msgid "Show task preview alongside the task list"
 msgstr "Affiche l'aperçu des tâches à côté de la liste des tâches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Active Tasks"
 msgstr "Tâches actuelles"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Completed Tasks"
 msgstr "Tâches terminées"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Next 7 Days' Tasks"
 msgstr "Tâches des 7 prochains jours"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:927
 msgid "Overdue Tasks"
 msgstr "Tâches en retard"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:934
 msgid "Tasks with Attachments"
 msgstr "Tâches avec des pièces jointes"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:984
 msgid "Print the list of tasks"
 msgstr "Imprime la liste de tâches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:991
 msgid "Preview the list of tasks to be printed"
 msgstr "Prévisualise la liste de tâches à imprimer"
 
@@ -15948,406 +15410,373 @@ msgid "Delete Task"
 msgstr "Supprimer la tâche"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, c-format
 msgid "%d attached messages"
 msgstr "%d messages joints"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "Aucun"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:164
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Message"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:166
 msgid "Compose a new mail message"
 msgstr "Rédiger un nouveau courriel"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:174
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Dossier de courriel"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:176
 msgid "Create a new mail folder"
 msgstr "Crée un nouveau dossier pour le courriel"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Mail Accounts"
 msgstr "Comptes de messagerie"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:203
 msgid "Mail Preferences"
 msgstr "Préférences du courriel"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgid "Composer Preferences"
 msgstr "Préférences de l'éditeur"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:219
 msgid "Network Preferences"
 msgstr "Préférences réseau"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "Grouper par fils de discussion"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "Indique s'il faut grouper les messages par fils de discussion"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:814
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "_Désactiver le compte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:816
 msgid "Disable this account"
 msgstr "Désactiver ce compte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:823
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Supprime définitivement les messages effacés de tous les dossiers"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:828
 msgid "C_reate Search Folder From Search..."
 msgstr "Créer un dossier de _recherche à partir d'une recherche..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:835
 msgid "_Download Messages for Offline Usage"
 msgstr "_Télécharger les messages pour utilisation hors ligne"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:837
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Télécharge les messages des comptes et dossiers marqués pour utilisation "
 "hors ligne"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:842
 msgid "Fl_ush Outbox"
 msgstr "Vi_der la boîte d'envoi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:849
 msgid "_Copy Folder To..."
 msgstr "_Copier le dossier vers..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:851
 msgid "Copy the selected folder into another folder"
 msgstr "Copie le dossier sélectionné vers un autre dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:858
 msgid "Permanently remove this folder"
 msgstr "Supprime définitivement ce dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:863
 msgid "E_xpunge"
 msgstr "Nettoy_er"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:865
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Supprime définitivement les messages effacés de ce dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:870
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_quer tous les messages comme lus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:872
 msgid "Mark all messages in the folder as read"
 msgstr "Marque tous les messages du dossier comme lus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:877
 msgid "_Move Folder To..."
 msgstr "_Déplacer le dossier vers..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:879
 msgid "Move the selected folder into another folder"
 msgstr "Déplace le dossier sélectionné vers un autre dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:884
 msgid "_New..."
 msgstr "_Nouveau..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:886
 msgid "Create a new folder for storing mail"
 msgstr "Crée un nouveau dossier pour stocker les courriels"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:893
 msgid "Change the properties of this folder"
 msgstr "Modifie les propriétés de ce dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:900
 msgid "Refresh the folder"
 msgstr "Actualise le contenu du dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:907
 msgid "Change the name of this folder"
 msgstr "Modifie le nom de ce dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:912
 msgid "Select Message _Thread"
 msgstr "Sélectionner le _fil de discussion de ce message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:914
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Sélectionne tous les messages dans le même fil de discussion que le message "
 "sélectionné"
 
 # _tip="Select all replies to the currently selected message"
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:919
 msgid "Select Message S_ubthread"
 msgstr "Sélectionner les ré_ponses à ce message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:921
 msgid "Select all replies to the currently selected message"
 msgstr "Sélectionne toutes les réponses au message actuellement sélectionné"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:926
 msgid "_Unsubscribe"
 msgstr "Se _désabonner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:928
 msgid "Unsubscribe from the selected folder"
 msgstr "Désabonne le dossier sélectionné"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:933
 msgid "Empty _Trash"
 msgstr "_Vider la corbeille"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:935
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Supprime définitivement les messages effacés de tous les comptes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:940
 msgid "_New Label"
 msgstr "_Nouvelle étiquette"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:949
 msgid "N_one"
 msgstr "_Aucun"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "Masquer les messages _lus"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Masque temporairement tous les messages déjà lus"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "Masquer les messages _sélectionnés"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "Masque temporairement les messages sélectionnés"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "Afficher tous les messages _masqués"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "Affiche les messages qui ont été temporairement masqués"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:972
 msgid "Cancel the current mail operation"
 msgstr "Annule l'opération de messagerie en cours"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:977
 msgid "Collapse All _Threads"
 msgstr "Grouper tous les _fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:979
 msgid "Collapse all message threads"
 msgstr "Groupe tous les fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:984
 msgid "E_xpand All Threads"
 msgstr "Dé_plier tous les fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:986
 msgid "Expand all message threads"
 msgstr "Déplie tous les fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:991
 msgid "_Message Filters"
 msgstr "Filtres de _message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:993
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crée ou modifie les règles pour filtrer les nouveaux courriels"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:998
 msgid "Search F_olders"
 msgstr "D_ossiers de recherche"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
 msgid "Create or edit search folder definitions"
 msgstr "Crée ou modifie les définitions de dossiers de recherche"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
 msgid "_Subscriptions..."
 msgstr "_Abonnements..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonne ou désabonne aux dossiers sur les serveurs distants"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
 msgid "F_older"
 msgstr "D_ossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "_Label"
 msgstr "É_tiquette"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "_New Folder..."
 msgstr "_Nouveau dossier..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "Masquer les messages _supprimés"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "Masque les messages supprimés plutôt que de les afficher barrés"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Show Message _Preview"
 msgstr "Afficher l'a_perçu du message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "Show message preview pane"
 msgstr "Affiche le panneau de prévisualisation des messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+msgid "Show _Deleted Messages"
+msgstr "Affiche les messages _supprimés"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+msgid "Show deleted messages with a line through them"
+msgstr "Afficher les messages supprimés comme barrés"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "_Group By Threads"
 msgstr "_Grouper par fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Threaded message list"
 msgstr "Liste les messages par fil de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Show message preview below the message list"
 msgstr "Affiche l'aperçu du message sous la liste des messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Show message preview alongside the message list"
 msgstr "Affiche l'aperçu du message à côté de la liste des messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
 msgid "All Messages"
 msgstr "Tous les messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
 msgid "Important Messages"
 msgstr "Messages importants"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Last 5 Days' Messages"
 msgstr "Messages des 5 derniers jours"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Messages Not Junk"
 msgstr "Messages non pourriels"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "Messages with Attachments"
 msgstr "Messages avec une pièce jointe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
 msgid "No Label"
 msgstr "Aucune étiquette"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Read Messages"
 msgstr "Messages lus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "Recent Messages"
 msgstr "Messages récents"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "Unread Messages"
 msgstr "Messages non lus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Subject or Addresses contain"
 msgstr "Le sujet ou les adresses contiennent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "All Accounts"
 msgstr "Tous les comptes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Current Account"
 msgstr "Compte actuel"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Current Folder"
 msgstr "Dossier actuel"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:881
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d sélectionné, "
 msgstr[1] "%d sélectionnés, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:892
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d supprimé"
 msgstr[1] "%d supprimés"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:898
+#: ../modules/mail/e-mail-shell-view-private.c:905
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d pourriel"
 msgstr[1] "%d pourriels"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:911
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d brouillon"
 msgstr[1] "%d brouillons"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:917
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d non envoyé"
 msgstr[1] "%d non envoyés"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:923
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d envoyé"
 msgstr[1] "%d envoyés"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:935
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d non lu,"
 msgstr[1] "%d non lus,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:938
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16366,7 +15795,14 @@ msgstr "Rechercher dans un compte"
 msgid "Proxy _Logout"
 msgstr "_Déconnecter le mandataire"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "Activé"
+
+#: ../modules/mail/em-composer-prefs.c:476
 msgid "Language(s)"
 msgstr "Langues"
 
@@ -16386,57 +15822,50 @@ msgstr "Une fois par semaine"
 msgid "Once per month"
 msgstr "Une fois par mois"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:224
 msgid "Add Custom Junk Header"
 msgstr "Ajouter des en-têtes de pourriels personnalisés"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:232
 msgid "Header Name:"
 msgstr "Nom de l'en-tête :"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Value Contains:"
 msgstr "La valeur de l'en-tête contient :"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:333
 msgid "Header"
 msgstr "En-tête"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:337
 msgid "Contains Value"
 msgstr "Contient la valeur"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:801
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Le greffon %s est disponible et le paquet binaire est installé."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:738 ../modules/mail/em-mailer-prefs.c:810
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "Le greffon %s n'est pas disponible. Vérifiez si le paquet est installé."
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:774
 msgid "No junk plugin available"
 msgstr "Aucun greffon de pourriel disponible"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "Colonne de _tableau :"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1161
 msgid "_Date header:"
 msgstr "En-tête de _date :"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1162
 msgid "Show _original header value"
 msgstr "Afficher la valeur d'en-tête d'_origine"
 
@@ -16472,16 +15901,8 @@ msgstr ""
 "Liste d'indices que le greffon d'oubli des pièces jointes doit rechercher "
 "dans le corps d'un message"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Liste d'indices que le greffon d'oubli des pièces jointes doit rechercher "
-"dans le corps d'un message."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "Mots-clés"
 
@@ -16565,8 +15986,8 @@ msgid "Restore from backup"
 msgstr "Restaurer à partir de l'archive"
 
 #: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "_Archiver les paramètres..."
+msgid "_Backup Evolution Settings..."
+msgstr "_Archiver les paramètres d'Evolution..."
 
 #: ../plugins/backup-restore/backup-restore.c:355
 msgid "Backup Evolution data and settings to an archive file"
@@ -16574,8 +15995,8 @@ msgstr ""
 "Archive les données et les paramètres d'Evolution dans un fichier archive"
 
 #: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "Res_taurer les paramètres..."
+msgid "R_estore Evolution Settings..."
+msgstr "Res_taurer les paramètres d'Evolution..."
 
 #: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore Evolution data and settings from an archive file"
@@ -16629,7 +16050,7 @@ msgid "Restarting Evolution"
 msgstr "Redémarrage d'Evolution"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
 msgstr "Archiver les données actuelles d'Evolution"
 
 #: ../plugins/backup-restore/backup.c:260
@@ -16660,31 +16081,31 @@ msgstr "Restauration depuis le dossier %s"
 
 # Titre
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Archivage d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Restauration d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "Archivage des données d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Veuillez attendre qu'Evolution finisse d'archiver vos données."
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "Restauration des données d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Veuillez attendre qu'Evolution finisse de restaurer vos données."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "En fonction de la quantité de données sur votre compte, cela peut prendre du "
@@ -16752,38 +16173,38 @@ msgstr ""
 "ouvertes. Si vous désirez qu'Evolution redémarre automatiquement après la "
 "restauration, activez l'option correspondante."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contacts automatiques"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "Créer des entrées dans le carnet d'_adresses lors de l'envoi de courriels"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "Sélectionnez un carnet d'adresses pour les contacts automatiques"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Contacts de messagerie instantanée"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Synchroniser les informations et les images des contacts depuis la liste de "
+"_Synchroniser les informations et les images des contacts depuis la liste de "
 "contacts Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Sélectionnez un carnet d'adresses pour la liste de contacts Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Synchroniser maintenant avec la liste de _contacts"
 
@@ -16805,34 +16226,34 @@ msgstr ""
 "de courriel de la personne à qui vous répondez. Complète également les "
 "informations de messagerie instantanée issues de vos listes de contacts."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter n'est pas disponible. Vous devez d'abord l'installer."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Erreur pendant le lancement de %s : %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Le processus fils Bogofilter ne répond pas, il va être tué..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr ""
 "En attente du processus fils Bogofilter interrompu, terminaison en cours..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Échec du tube vers Bogofilter, code erreur : %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
 msgid "Convert message text to _Unicode"
 msgstr "Convertir le texte du message en _Unicode"
 
@@ -16860,17 +16281,17 @@ msgstr "Options de Bogofilter"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filtre les pourriels en utilisant Bogofilter."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
 "Échec de l'authentification. Le serveur a besoin d'une identification "
 "correcte."
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "L'URL indiqué est introuvable."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16879,36 +16300,36 @@ msgstr ""
 "Le serveur a renvoyé des données inattendues.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "Échec de l'analyse de la réponse du serveur."
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "Évènements"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "Calendriers de l'utilisateur"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "Impossible d'obtenir l'URL du serveur."
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "Recherche des calendriers de l'utilisateur..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "Impossible de trouver un calendrier pour l'utilisateur."
 
@@ -16922,42 +16343,40 @@ msgstr "Échec de la tentative précédente : %s"
 msgid "Previous attempt failed with code %d"
 msgstr "Échec de la tentative précédente avec le code %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr ""
-"Saisissez le mot de passe pour l'utilisateur <b>%s</b> sur le serveur <b>%s</"
-"b>"
+msgid "Enter password for user %s on server %s"
+msgstr "Saisissez le mot de passe pour l'utilisateur %s sur le serveur %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "Impossible de créer le message soup pour l'URL « %s »"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "Recherche dans le contenu du dossier..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "Liste des calendriers disponibles :"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "Prises en charge"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Impossible de créer le fil de discussion : %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "L'URL du serveur « %s » n'est pas valide"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "Recherche d'un calendrier CalDAV"
 
@@ -16965,26 +16384,26 @@ msgstr "Recherche d'un calendrier CalDAV"
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/caldav/caldav-source.c:216
 #: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "_URL :"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:220
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "Utiliser _SSL"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:229
 msgid "Brows_e server for a calendar"
 msgstr "_Rechercher un calendrier sur le serveur"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
+#: ../plugins/caldav/caldav-source.c:241
+#: ../plugins/calendar-file/calendar-file.c:182
 #: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "Ac_tualiser :"
 
@@ -16996,31 +16415,31 @@ msgstr "Ajoute la prise en charge de CalDAV à Evolution."
 msgid "CalDAV Support"
 msgstr "Support CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:116
 msgid "_Customize options"
 msgstr "Options de _personnalisation"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:135
 msgid "File _name:"
 msgstr "_Nom du fichier :"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:139
 msgid "Choose calendar file"
 msgstr "Choisissez un fichier de calendrier"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:187
 msgid "On open"
 msgstr "À l'ouverture"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:188
 msgid "On file change"
 msgstr "À la modification du fichier"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:189
 msgid "Periodically"
 msgstr "Périodiquement"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:204
 msgid "Force read _only"
 msgstr "_Forcer la lecture seule"
 
@@ -17084,26 +16503,26 @@ msgstr "Météo : nuit claire"
 msgid "Weather: Thunderstorms"
 msgstr "Météo : orages "
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "Sélectionnez un emplacement"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Aucun"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_Unités :"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Métrique (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Anglo-saxon (Farenheit, pouces, etc)"
 
@@ -17229,12 +16648,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Aucun"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "_En-tête personnalisé"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17242,12 +16661,12 @@ msgstr ""
 "Le format de définition d'une valeur de clé d'en-tête personnalisé est :\n"
 "Nom de l'en-tête personnalisé puis clé et valeurs, séparées par « ; »."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:950
 msgid "Key"
 msgstr "Clé"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "Valeurs"
 
@@ -17271,7 +16690,7 @@ msgstr ""
 "de courriel"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:118
 msgid "Automatically launch when a new mail is edited"
 msgstr "Lancer automatiquement lorsqu'un nouveau courriel est édité"
 
@@ -17283,11 +16702,11 @@ msgstr "Éditeur externe par défaut"
 msgid "The default command that must be used as the editor."
 msgstr "La commande à utiliser par défaut pour lancer l'éditeur."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:107
 msgid "Command to be executed to launch the editor: "
 msgstr "Commande à exécuter pour lancer l'éditeur : "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:108
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17295,8 +16714,8 @@ msgstr ""
 "Pour Emacs, saisissez « xemacs »\n"
 "pour VI, saisissez « gvim -f »"
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:374
+#: ../plugins/external-editor/external-editor.c:376
 msgid "Compose in External Editor"
 msgstr "Édition dans un éditeur externe"
 
@@ -17410,23 +16829,23 @@ msgstr ""
 "Le fichier sélectionné ne semble pas être une image PNG valide. Erreur : {0}"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
+#: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>Serveur</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+msgid "Server"
+msgstr "Serveur"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Saisissez le mot de passe de l'utilisateur %s pour accéder à la liste des "
 "calendriers auxquels il est abonné."
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17435,18 +16854,18 @@ msgstr ""
 "Impossible de lire les données du serveur Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "C_alendrier :"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
 msgstr "Récupération de la _liste"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
@@ -17457,7 +16876,7 @@ msgstr "Ajoute des calendriers Google à Evolution."
 msgid "Google Calendars"
 msgstr "Calendriers Google"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Liste de contrôle"
 
@@ -17489,12 +16908,12 @@ msgstr "Accepter provisoirement"
 msgid "Rese_nd Meeting..."
 msgstr "Re_nvoyer la réunion..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Create folder"
 msgstr "Création d'un dossier"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17519,19 +16938,19 @@ msgstr ""
 "Cliquez sur « Appliquer » pour installer le dossier partagé\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "Installer le dossier partagé"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "Installation du dossier partagé"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "Paramètres du pourriel"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Paramètres de détection des pourriels"
@@ -17567,7 +16986,7 @@ msgstr "_Enlever"
 msgid "Message Retract"
 msgstr "Rétractation du message"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -17575,7 +16994,7 @@ msgstr ""
 "Il se peut que le retrait d'un message l'efface de la boîte aux lettres des "
 "destinataires. Voulez-vous vraiment faire cela ?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "Message rétracté avec succès"
 
@@ -17703,25 +17122,25 @@ msgid "Would you like to decline it?"
 msgstr "Voulez-vous le refuser ?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>Utilisateurs :</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "_Personnaliser le message de notification"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "Con_tacts..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "Notification de dossier partagé"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "Les participants recevront la notification suivante.\n"
 
+#: ../plugins/groupwise-features/properties.ui.h:9
+msgid "Users:"
+msgstr "Utilisateurs :"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Non partagé"
@@ -17779,54 +17198,61 @@ msgid "Proxy"
 msgstr "Mandataire"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Nom du compte</b>"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "Nom du compte"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "Nom de connexion du mandataire"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSaisissez le mot de passe pour %s (utilisateur %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:690
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "L'onglet Mandataire sera accessible seulement lorsque le compte sera en "
 "ligne."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "L'onglet du serveur mandataire sera accessible seulement lorsque le compte "
 "sera actif."
 
-#: ../plugins/groupwise-features/proxy.c:931
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Mandataire"
+
+#: ../plugins/groupwise-features/proxy.c:929
 #: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "Ajouter un utilisateur"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "Options d'envoi avancées"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:313
 #: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:314
 msgid "Enter the users and set permissions"
 msgstr "Saisissez les utilisateurs et réglez les permissions"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:412
 msgid "Sharing"
 msgstr "Partage"
 
@@ -17838,63 +17264,55 @@ msgstr "Notification personnalisée"
 msgid "Add   "
 msgstr "Ajouter"
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "État du message"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "De :"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Date de création :"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "Destinataire : "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "Distribué : "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "Ouvert : "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "Accepté : "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "Supprimé : "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "Refusé : "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "Terminé : "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "Non distribué : "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Ajoute la prise en charge de Hula à Evolution."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Support Hula"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Intégration des images"
@@ -17903,12 +17321,12 @@ msgstr "Intégration des images"
 msgid "View image attachments directly in mail messages."
 msgstr "Affiche les images en pièces jointes directement dans les courriels."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:325
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "En-têtes personnalisés"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:338
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "En-têtes IMAP"
@@ -17956,144 +17374,144 @@ msgstr "Ajuste vos comptes IMAP."
 msgid "IMAP Features"
 msgstr "Fonctionnalités IMAP"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/itip-formatter/itip-formatter.c:475
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Impossible de charger le calendrier « %s »"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:641
 #, 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:688
+#: ../plugins/itip-formatter/itip-formatter.c:677
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Rendez-vous trouvé dans le calendrier « %s »"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Unable to find any calendars"
 msgstr "Impossible de trouver un calendrier"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:783
 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:798
+#: ../plugins/itip-formatter/itip-formatter.c:787
 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:802
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this memo in any memo list"
 msgstr "Impossible de trouver ce mémo dans une liste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:862
 msgid "Opening the calendar. Please wait.."
 msgstr "Ouverture du calendrier. Veuillez patienter..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:865
 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:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1046
 msgid "Unable to parse item"
 msgstr "Impossible d'analyser le contenu de l'élément"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, 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:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1145
 #, 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:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1149
 #, 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:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1154
 #, 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:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, 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:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 #, 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:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Envoie un avis d'annulation à la délégation"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1262
 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:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1373
 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:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1402
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Impossible de mettre à jour le participant. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Attendee status updated"
 msgstr "État du participant mis à jour"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 msgid "Meeting information sent"
 msgstr "Les informations de la réunion ont été envoyées"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1435
 msgid "Task information sent"
 msgstr "Les informations de la tâche ont été envoyées"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1438
 msgid "Memo information sent"
 msgstr "Les informations du mémo ont été envoyées"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Impossible d'envoyer les informations de la réunion, celle-ci n'existe pas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1450
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 "Impossible d'envoyer les informations de la tâche, celle-ci n'existe pas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Impossible d'envoyer les informations du mémo, celui-ci n'existe pas"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "calendar.ics"
 msgstr "calendrier.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1523
 msgid "Save Calendar"
 msgstr "Enregistrer le calendrier"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 #: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "Le calendrier joint n'est pas valide"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 #: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18101,15 +17519,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:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1628
+#: ../plugins/itip-formatter/itip-formatter.c:1656
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 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:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1629
+#: ../plugins/itip-formatter/itip-formatter.c:1657
+#: ../plugins/itip-formatter/itip-formatter.c:1763
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18117,11 +17535,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:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1670
 msgid "The calendar attached contains multiple items"
 msgstr "Le calendrier joint contient des éléments multiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1671
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18129,533 +17547,518 @@ msgstr ""
 "Pour traiter tous ces éléments, le fichier devra être enregistré et le "
 "calendrier importé"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2436
 msgid "This meeting recurs"
 msgstr "Cette réunion est récurrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2439
 msgid "This task recurs"
 msgstr "Cette tâche est récurrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2442
 msgid "This memo recurs"
 msgstr "Ce mémo est récurrent"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2676
 msgid "_Delete message after acting"
 msgstr "_Supprimer le message après intervention"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2686
+#: ../plugins/itip-formatter/itip-formatter.c:2719
 msgid "Conflict Search"
 msgstr "Recherche de conflit"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2701
 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 time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Aujourd'hui %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 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:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Aujourd'hui %I:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Demain %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 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:237
+#: ../plugins/itip-formatter/itip-view.c:233
 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:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Demain %I:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 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:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %I:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A %e %B, %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A %e %B, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A %e %B, %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A %e %B, %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A %e %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A %e %B %Y, %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A %e %B %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A %e %B %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Y, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "Veuillez répondre par délégation de <b>%s</b>"
+msgid "Please respond on behalf of %s"
+msgstr "Veuillez répondre par délégation de %s"
 
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "Reçu par délégation de <b>%s</b>"
+msgid "Received on behalf of %s"
+msgstr "Reçu par délégation de %s"
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
+msgid "%s through %s has published the following meeting information:"
 msgstr ""
-"<b>%s</b> par l'intermédiaire de %s a publié les informations de la réunion "
+"%s par l'intermédiaire de %s a publié les informations de la réunion "
 "suivantes :"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:376
 #, 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 :"
+msgid "%s has published the following meeting information:"
+msgstr "%s a publié les informations de la réunion suivantes :"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:381
 #, 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 :"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s vous a délégué la réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+msgid "%s through %s requests your presence at the following meeting:"
 msgstr ""
-"<b>%s</b> par l'intermédiaire de %s demande votre présence à la réunion "
-"suivante :"
-
-#: ../plugins/itip-formatter/itip-view.c:374
-#, 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:380
-#, 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:382
-#, 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 :"
+"%s par l'intermédiaire de %s demande votre présence à la réunion suivante :"
 
 #: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> par l'intermédiaire de %s souhaite recevoir les dernières "
-"informations pour la réunion suivante :"
-
-#: ../plugins/itip-formatter/itip-view.c:388
-#, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr ""
-"<b>%s</b> souhaite recevoir les dernières informations pour la réunion "
-"suivante :"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s demande votre présence à la réunion suivante :"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgid "%s through %s wishes to add to an existing meeting:"
 msgstr ""
-"<b>%s</b> par l'intermédiaire de %s a envoyé la réponse à une réunion "
-"suivante :"
+"%s par l'intermédiaire de %s souhaite être intégré à une réunion existante :"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, 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 :"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s souhaite être intégré à une réunion existante :"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, 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 :"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr ""
+"%s par l'intermédiaire de %s souhaite recevoir les dernières informations "
+"pour la réunion suivante :"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> a annulé la réunion suivante."
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr ""
+"%s souhaite recevoir les dernières informations pour la réunion suivante :"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgid "%s through %s has sent back the following meeting response:"
 msgstr ""
-"<b>%s</b> par l'intermédiaire de %s a proposé les changements suivants à la "
-"réunion."
+"%s par l'intermédiaire de %s a envoyé la réponse à une réunion suivante :"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> a proposé les changements suivants à la réunion."
+msgid "%s has sent back the following meeting response:"
+msgstr "%s a envoyé la réponse à une réunion suivante :"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, 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 :"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s par l'intermédiaire de %s a annulé la réunion suivante :"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, 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."
+msgid "%s has canceled the following meeting."
+msgstr "%s a annulé la réunion suivante."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:416
 #, 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 :"
+msgid "%s through %s has proposed the following meeting changes."
+msgstr ""
+"%s par l'intermédiaire de %s a proposé les changements suivants à la réunion."
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> a publié la tâche suivante :"
+msgid "%s has proposed the following meeting changes."
+msgstr "%s a proposé les changements suivants à la réunion."
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> demande l'attribution à %s de la tâche suivante :"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr ""
+"%s par l'intermédiaire de %s a refusé les changements suivants à la réunion :"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> par l'intermédiaire de %s vous a attribué une tâche :"
+msgid "%s has declined the following meeting changes."
+msgstr "%s a refusé les changements suivants de la réunion."
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> vous a attribué une tâche :"
+msgid "%s through %s has published the following task:"
+msgstr "%s par l'intermédiaire de %s a publié les tâches suivantes :"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, 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 :"
+msgid "%s has published the following task:"
+msgstr "%s a publié la tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:469
 #, 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 :"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s demande l'attribution à %s de la tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> par l'intermédiaire de %s souhaite recevoir les dernières "
-"informations pour l'attribution de tâche suivante :"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s par l'intermédiaire de %s vous a attribué une tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> souhaite recevoir les dernières informations pour l'attribution de "
-"tâche suivante :"
+msgid "%s has assigned you a task:"
+msgstr "%s vous a attribué une tâche :"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "%s through %s wishes to add to an existing task:"
 msgstr ""
-"<b>%s</b> par l'intermédiaire de %s a renvoyé une réponse à la tâche "
-"attribuée suivante :"
+"%s par l'intermédiaire de %s souhaite être intégré à une tâche existante :"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> a renvoyé une réponse à la tâche attribuée suivante :"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s souhaite être intégré à une tâche existante :"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
 msgstr ""
-"<b>%s</b> par l'intermédiaire de %s a annulé la tâche attribuée suivante :"
+"%s par l'intermédiaire de %s souhaite recevoir les dernières informations "
+"pour l'attribution de tâche suivante :"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> a annulé la tâche attribuée suivante :"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr ""
+"%s souhaite recevoir les dernières informations pour l'attribution de tâche "
+"suivante :"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "%s through %s has sent back the following assigned task response:"
 msgstr ""
-"<b>%s</b> par l'intermédiaire de %s a proposé les changements suivants à "
-"l'attribution de tâche :"
+"%s par l'intermédiaire de %s a renvoyé une réponse à la tâche attribuée "
+"suivante :"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr ""
-"<b>%s</b> a proposé les changements suivants à l'attribution de tâche :"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s a renvoyé une réponse à la tâche attribuée suivante :"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr ""
-"<b>%s</b> par l'intermédiaire de %s a refusé la tâche attribuée suivante :"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s par l'intermédiaire de %s a annulé la tâche attribuée suivante :"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> a refusé la tâche attribuée suivante :"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s a annulé la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:504
 #, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> par l'intermédiaire de %s a publié le mémo suivant :"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr ""
+"%s par l'intermédiaire de %s a proposé les changements suivants à "
+"l'attribution de tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> a publié le mémo suivant :"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s a proposé les changements suivants à l'attribution de tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:510
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr ""
-"<b>%s</b> par l'intermédiaire de %s souhaite être intégré à mémo existant :"
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s par l'intermédiaire de %s a refusé la tâche attribuée suivante :"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s a refusé la tâche attribuée suivante :"
+
+#: ../plugins/itip-formatter/itip-view.c:549
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "%s par l'intermédiaire de %s a publié le mémo suivant :"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> souhaite être intégré à un mémo existant :"
+msgid "%s has published the following memo:"
+msgstr "%s a publié le mémo suivant :"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> par l'intermédiaire de %s a annulé le mémo partagé suivant :"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s par l'intermédiaire de %s souhaite être intégré à mémo existant :"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> a annulé le mémo partagé suivant :"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s souhaite être intégré à un mémo existant :"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:562
+#, c-format
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s par l'intermédiaire de %s a annulé le mémo partagé suivant :"
+
+#: ../plugins/itip-formatter/itip-view.c:564
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "%s a annulé le mémo partagé suivant :"
+
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "Journée entière :"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "Jour de départ :"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "Heure de début :"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "Jour de fin :"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "Heure de fin :"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "_Ouvrir un calendrier"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "_Refuser"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "_Accepter"
-
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+msgid "A_ccept"
+msgstr "A_ccepter"
+
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "Tout _refuser"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "Tout _provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "_Provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:855
+msgid "A_ccept all"
 msgstr "Tout _accepter"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "_Envoyer l'information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "Mettre à jo_ur l'état du participant"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "_Mettre à jour"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "Ré_pondre à l'expéditeur"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "Envoyer des _mises à jour aux participants"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "_Appliquer à toutes les occurrences"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "Afficher la période comme _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "_Conserver mes rappels"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "Rappel hér_ité"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "_Tâches :"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "_Mémos :"
 
@@ -18774,16 +18177,16 @@ msgstr ""
 "Indique s'il faut avertir seulement de la réception de nouveaux messages "
 "dans la « Boîte de réception »."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:343
 msgid "Evolution's Mail Notification"
 msgstr "Notification de courriel d'Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:365
 msgid "Mail Notification Properties"
 msgstr "Propriétés des notifications de courriel"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:496
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18799,66 +18202,66 @@ msgstr[1] ""
 "dans %s."
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:507
 #, c-format
 msgid "From: %s"
 msgstr "De : %s"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#: ../plugins/mail-notification/mail-notification.c:519
 #, c-format
 msgid "Subject: %s"
 msgstr "Sujet : %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:528
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Vous avez reçu %d nouveau message."
 msgstr[1] "Vous avez reçu %d nouveaux messages."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:551
 msgid "New email"
 msgstr "Nouveau courriel"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:605
 msgid "Show icon in _notification area"
 msgstr "Afficher une icône dans la zone de _notification"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:633
 msgid "B_link icon in notification area"
 msgstr "Icône c_lignotante dans la zone de notification"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:643
 msgid "Popup _message together with the icon"
 msgstr "_Message contextuel avec l'icône"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:828
 msgid "_Play sound when new messages arrive"
 msgstr "_Jouer un son à la réception d'un nouveau message"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:857
 msgid "_Beep"
 msgstr "_Bip"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:870
 msgid "Use sound _theme"
 msgstr "Utiliser le _thème sonore"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:889
 msgid "Play _file:"
 msgstr "Jouer le f_ichier :"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:900
 msgid "Select sound file"
 msgstr "Sélection d'un fichier sonore"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:958
 msgid "Notify new messages for _Inbox only"
 msgstr "Avertir uniquement des nouveaux messages de la _boîte de réception"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:967
 msgid "Generate a _D-Bus message"
 msgstr "Générer un message _D-Bus"
 
@@ -18871,12 +18274,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Avertissement à la réception de nouveaux messages."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Créé à partir d'un courriel de %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18885,7 +18288,7 @@ msgstr ""
 "Le calendrier sélectionné contient déjà l'évènement « %s ». Voulez-vous "
 "modifier l'évènement existant ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18894,7 +18297,7 @@ msgstr ""
 "La liste de tâches sélectionnée contient déjà la tâche « %s ». Voulez-vous "
 "modifier la tâche existante ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18903,7 +18306,7 @@ msgstr ""
 "La liste de mémos sélectionnée contient déjà le mémo « %s ». Voulez-vous "
 "modifier le mémo existant ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#: ../plugins/mail-to-task/mail-to-task.c:512
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18911,7 +18314,7 @@ msgstr ""
 "Le calendrier sélectionné contient déjà des évènements pour les courriels "
 "concernés. Voulez-vous tout de même créer de nouveaux évènements ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18919,7 +18322,7 @@ msgstr ""
 "La liste de tâches sélectionnée contient déjà des tâches pour les courriels "
 "concernés. Voulez-vous tout de même créer de nouvelles tâches ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#: ../plugins/mail-to-task/mail-to-task.c:518
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18927,7 +18330,7 @@ msgstr ""
 "La liste de mémos sélectionnée contient déjà des mémos pour les courriels "
 "concernés. Voulez-vous tout de même créer de nouveaux mémos ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#: ../plugins/mail-to-task/mail-to-task.c:536
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18941,7 +18344,7 @@ msgstr[1] ""
 "Le calendrier sélectionné contient déjà des évènements pour les courriels "
 "concernés. Voulez-vous tout de même créer de nouveaux évènements ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:542
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18955,7 +18358,7 @@ msgstr[1] ""
 "La liste de tâches sélectionnée contient déjà des tâches pour les courriels "
 "concernés. Voulez-vous tout de même créer de nouvelles tâches ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18969,25 +18372,25 @@ msgstr[1] ""
 "La liste de mémos sélectionnée contient déjà des mémos pour les courriels "
 "concernés. Voulez-vous tout de même créer de nouveaux mémos ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:607
 msgid "[No Summary]"
 msgstr "[Aucun résumé]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:618
 msgid "Invalid object returned from a server"
 msgstr "Objet non valide renvoyé par un serveur"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:689
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Une erreur est survenue pendant le traitement : %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:718
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Impossible d'ouvrir le calendrier. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:725
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18995,7 +18398,7 @@ msgstr ""
 "La source sélectionnée est en lecture seule, vous ne pouvez donc pas y créer "
 "d'évènement. Veuillez sélectionner une autre source."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19003,7 +18406,7 @@ msgstr ""
 "La source sélectionnée est en lecture seule, vous ne pouvez donc pas y créer "
 "de tâche. Veuillez sélectionner une autre source."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:731
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19011,40 +18414,40 @@ msgstr ""
 "La source sélectionnée est en lecture seule, vous ne pouvez donc pas y créer "
 "de mémo. Veuillez sélectionner une autre source."
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:934
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Impossible d'obtenir la liste source. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1053
 msgid "Create an _Event"
 msgstr "Créer un é_vénement"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1055
 msgid "Create a new event from the selected message"
 msgstr "Crée un nouvel évènement à partir du message sélectionné"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create a Mem_o"
 msgstr "Créer un mém_o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new memo from the selected message"
 msgstr "Crée un nouveau mémo à partir du message sélectionné"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a _Task"
 msgstr "Créer une _tâche"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new task from the selected message"
 msgstr "Crée une nouvelle tâche à partir du message sélectionné"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a _Meeting"
 msgstr "Créer une _réunion"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a new meeting from the selected message"
 msgstr "Crée une nouvelle réunion à partir du message sélectionné"
 
@@ -19052,61 +18455,61 @@ msgstr "Crée une nouvelle réunion à partir du message sélectionné"
 msgid "Convert a mail message to a task."
 msgstr "Convertit un courriel en tâche."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:279
 msgid "Get List _Archive"
 msgstr "Récupérer l'_archive de la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:281
 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/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Usage Information"
 msgstr "Récupérer les informations d'_utilisation de la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 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 "
 "appartient ce message"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Contact List _Owner"
 msgstr "_Propriétaire de la liste de contacts"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 "Contacte le propriétaire de la liste de diffusion auquel ce message "
 "appartient"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "_Post Message to List"
 msgstr "_Envoyer un message à la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Post a message to the mailing list this message belongs to"
 msgstr ""
 "Envoyer un message à la liste de diffusion à laquelle le message appartient"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Subscribe to List"
 msgstr "S'_abonner à la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "S'inscrire à la liste de diffusion à laquelle le message appartient"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Unsubscribe from List"
 msgstr "Se _désabonner de la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr ""
 "Se désabonner de la liste de diffusion à laquelle le message appartient"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Mailing _List"
 msgstr "_Liste de diffusion"
 
@@ -19201,11 +18604,11 @@ msgstr "É_diter le message"
 msgid "_Send message"
 msgstr "_Envoyer le message"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mark-all-read/mark-all-read.c:41
 msgid "Also mark messages in subfolders?"
 msgstr "Marquer aussi les messages dans les sous-dossiers ?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:44
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19282,19 +18685,19 @@ msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 "Afficher les messages en texte simple, même s'ils contiennent de l'HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "Afficher au format HTML si présent"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "Laisser Evolution choisir la meilleure partie à afficher."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "Afficher au format texte si présent"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19302,11 +18705,11 @@ msgstr ""
 "Afficher le contenu en texte simple, s'il existe, sinon laisser Evolution "
 "choisir la meilleure partie à afficher."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "Toujours afficher au format texte simple"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19314,11 +18717,11 @@ msgstr ""
 "Toujours afficher le texte simple et transformer les autres parties en "
 "pièces jointes, si souhaité."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Afficher les parties HTML s_upprimées comme pièces jointes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "_Mode HTML"
 
@@ -19344,31 +18747,35 @@ msgstr "Importation Outlook PST"
 msgid "Outlook personal folders (.pst)"
 msgstr "Dossiers personnels Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:296
 msgid "_Mail"
 msgstr "_Courriel"
 
+#: ../plugins/pst-import/pst-importer.c:308
+msgid "Destination folder:"
+msgstr "Dossier de destination :"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "_Address Book"
 msgstr "C_arnet d'adresses"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:321
 msgid "A_ppointments"
 msgstr "Ren_dez-vous"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:327 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tâches"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:333
 msgid "_Journal entries"
 msgstr "Entrées de _journal"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "Importing Outlook data"
 msgstr "Importation des données Outlook"
 
@@ -19527,55 +18934,55 @@ msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
 "Impossible de publier le calendrier : le moteur du calendrier n'existe plus"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "Nouvel emplacement"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "Modifier l'emplacement"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin non trouvé, code : %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Impossible de transférer vers le programme : %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Erreur après le clonage : %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "Le processus fils SpamAssassin ne répond pas, il va être tué..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "En attente du processus fils Spamassassin interrompu, fermeture..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Échec du tube vers SpamAssassin, code erreur : %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin n'est pas disponible. Vous devez d'abord l'installer."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Cela rendra SpamAssassin plus fiable, mais plus lent"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
 msgid "I_nclude remote tests"
 msgstr "I_nclure les tests distants"
 
@@ -19756,11 +19163,11 @@ msgstr "De %s :"
 msgid "Importing files"
 msgstr "Importation de fichiers"
 
-#: ../plugins/startup-wizard/startup-wizard.c:248
+#: ../plugins/startup-wizard/startup-wizard.c:251
 msgid "Importing data."
 msgstr "Importation des données."
 
-#: ../plugins/startup-wizard/startup-wizard.c:250
+#: ../plugins/startup-wizard/startup-wizard.c:257
 msgid "Please wait"
 msgstr "Veuillez patienter"
 
@@ -19793,15 +19200,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Greffon de modèles basés sur des brouillons"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:613
 msgid "No Title"
 msgstr "Sans titre"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:684
 msgid "Save as _Template"
 msgstr "Enregistrer comme _modèle"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:686
 msgid "Save as Template"
 msgstr "Enregistre comme modèle"
 
@@ -19821,27 +19228,27 @@ msgstr "vCards dans le corps du message"
 msgid "Show vCards directly in mail messages."
 msgstr "Afficher les vCards directement dans les messages."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:157
+#: ../plugins/vcard-inline/vcard-inline.c:242
 msgid "Show Full vCard"
 msgstr "Afficher tous les champs de la vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:160
 msgid "Show Compact vCard"
 msgstr "Afficher partiellement la vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:221
 msgid "There is one other contact."
 msgstr "Il existe un autre contact."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:230
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Il existe %d autre contact."
 msgstr[1] "Il existe %d autres contacts."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:251
 msgid "Save in Address Book"
 msgstr "Enregistrer dans le carnet d'adresses"
 
@@ -19857,11 +19264,11 @@ msgstr "Contacts WebDAV"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "URL :"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "É_viter IfMatch (requis pour Apache < 2.2.8)"
 
@@ -20031,7 +19438,7 @@ 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.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:305
 msgid "Start in offline mode"
 msgstr "Démarrer en mode hors ligne"
 
@@ -20194,149 +19601,46 @@ msgstr "Style des boutons de la fenêtre"
 msgid "Window buttons are visible"
 msgstr "Les boutons de la fenêtre sont visibles"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
 msgid "Searches"
 msgstr "Recherches"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:545
 msgid "Save Search"
 msgstr "Enregistrer la recherche"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld Kio"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "_Afficher :"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "_Rechercher :"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr "_dans "
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "Style de la barre d'outils"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "Le style de la barre d'outils du sélecteur"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "Barre d'outils visible"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "Indique si le sélecteur est visible"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Tous les fichiers (*)"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "Action du sélecteur"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "L'action du sélecteur pour cette vue du shell"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "Numéro de page"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr "Le numéro de page de l'onglet de la vue shell"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "Règle de recherche"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "Critères pour les résultats de la recherche actuelle"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "Le EShellBackend pour cette vue shell"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "Composant graphique de contenu du shell"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr ""
-"Le composant graphique de contenu apparaît dans le panneau de droite d'une "
-"fenêtre de shell"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "Composant graphique du panneau latéral du shell"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
-"Le composant graphique du panneau latéral apparaît dans le panneau de gauche "
-"d'une fenêtre de shell"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "Composant graphique barre des tâches du shell"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
-"Le composant graphique barre des tâches apparaît en bas d'une fenêtre de "
-"shell"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "Fenêtre du shell"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "La fenêtre à laquelle la vue shell appartient"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "Le fichier clé contenant les données d'état du widget"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "Le titre de la vue shell"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "ID de la vue actuelle"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "L'ID de la vue GAL actuelle"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -20367,407 +19671,319 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Site Web d'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy n'est pas installé."
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy ne peut pas être exécuté."
 
-#: ../shell/e-shell-window-actions.c:1343
+#: ../shell/e-shell-window-actions.c:1347
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME Pilot n'est pas installé."
 
-#: ../shell/e-shell-window-actions.c:1345
+#: ../shell/e-shell-window-actions.c:1349
 msgid "GNOME Pilot could not be run."
 msgstr "GNOME Pilot ne peut pas être exécuté."
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1443
 msgid "Show information about Evolution"
 msgstr "Affiche les informations concernant Evolution"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "_Fermer la fenêtre"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1455
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1457
 msgid "Open the Evolution User Guide"
 msgstr "Ouvre le manuel d'utilisation d'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Evolution _FAQ"
 msgstr "_FAQ d'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Ouvre la page Web de la Foire aux questions"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1490
 msgid "_Forget Passwords"
 msgstr "O_ublier les mots de passe"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1492
 msgid "Forget all remembered passwords"
 msgstr "Oublie tous les mots de passe mémorisés"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1497
 msgid "I_mport..."
 msgstr "I_mporter..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Import data from other programs"
 msgstr "Importe les données d'autres programmes"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1504
 msgid "New _Window"
 msgstr "Nouvelle _fenêtre"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1506
 msgid "Create a new window displaying this view"
 msgstr "Crée une nouvelle fenêtre pour afficher cette vue"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Configure Evolution"
 msgstr "Configurer Evolution"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "_Référence rapide"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Show Evolution's shortcut keys"
 msgstr "Affiche les raccourcis clavier d'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "Quitte le programme"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "Recherche _avancée..."
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr "Construit une recherche plus élaborée"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Clear the current search parameters"
 msgstr "Efface les paramètres de recherche actuels"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1553
 msgid "_Edit Saved Searches..."
 msgstr "Mo_difier les recherches enregistrées..."
 
 # Utilisation de l'infinitif dans les infobulles du Bureau
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Manage your saved searches"
 msgstr "Gérer vos recherches enregistrées"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "Cliquez ici pour modifier le type de recherche"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "_Trouver maintenant"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Execute the current search parameters"
 msgstr "Applique les paramètres de recherche actuels"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "Enre_gistrer la recherche..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Save the current search parameters"
 msgstr "Enregistre les paramètres de recherche actuels"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Send / _Receive"
 msgstr "Envoyer / _Recevoir"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Send queued items and retrieve new items"
 msgstr "Envoie les courriels en attente et récupère les nouveaux"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Submit _Bug Report..."
 msgstr "Soumettre un _rapport d'anomalie..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Soumet un rapport d'anomalie en utilisant Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1602
 msgid "GNOME Pilot _Synchronization..."
 msgstr "_Synchronisation de GNOME Pilot..."
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1604
 msgid "Set up GNOME Pilot configuration"
 msgstr "Configuration de GNOME Pilot"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Work Offline"
 msgstr "Travailler _hors ligne"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1611
 msgid "Put Evolution into offline mode"
 msgstr "Bascule Evolution en mode hors ligne"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Work Online"
 msgstr "Travailler _en ligne"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1618
 msgid "Put Evolution into online mode"
 msgstr "Bascule Evolution en mode en ligne"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1646
 msgid "Lay_out"
 msgstr "_Agencement"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Search"
 msgstr "_Recherche"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Switcher Appearance"
 msgstr "A_pparence du sélecteur"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Window"
 msgstr "_Fenêtre"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show Side _Bar"
 msgstr "Afficher la barre _latérale"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1712
 msgid "Show the side bar"
 msgstr "Affiche la barre latérale"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show _Buttons"
 msgstr "Afficher les b_outons"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1720
 msgid "Show the switcher buttons"
 msgstr "Affiche les boutons du sélecteur"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1726
 msgid "Show _Status Bar"
 msgstr "Afficher la _barre d'état"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Show the status bar"
 msgstr "Affiche la barre d'état"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1734
 msgid "Show _Tool Bar"
 msgstr "Afficher la barre d'ou_tils"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1736
 msgid "Show the tool bar"
 msgstr "Affiche la barre d'outils"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1758
 msgid "_Icons Only"
 msgstr "_Icônes uniquement"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Display window buttons with icons only"
 msgstr "Affiche les boutons de la fenêtre avec uniquement des icônes"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1765
 msgid "_Text Only"
 msgstr "_Texte uniquement"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1767
 msgid "Display window buttons with text only"
 msgstr "Affiche les boutons de la fenêtre avec uniquement du texte"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Icons _and Text"
 msgstr "Icônes _et texte"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Display window buttons with icons and text"
 msgstr "Affiche les boutons de la fenêtre avec des icônes et du texte"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Tool_bar Style"
 msgstr "Style de la _barre d'outils"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Affiche les boutons de la fenêtre en utilisant les paramètres de la barre "
 "d'outils du bureau"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Define Views..."
 msgstr "Définir les vues..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1791
 msgid "Create or edit views"
 msgstr "Crée ou édite des vues"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Save Custom View..."
 msgstr "Enregistrer la vue personnalisée..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Save current custom view"
 msgstr "Enregistrer la vue personnalisée actuelle"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1805
 msgid "C_urrent View"
 msgstr "Vue co_urante"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Custom View"
 msgstr "Vue personnalisée"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Current view is a customized view"
 msgstr "La vue actuelle est une vue personnalisée"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1827
 msgid "Change the page settings for your current printer"
 msgstr "Modifie les paramètres de la page pour votre imprimante actuelle"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2204
 #, c-format
 msgid "Switch to %s"
 msgstr "Change pour %s"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2417
 msgid "Execute these search parameters"
 msgstr "Exécuter ces paramètres de recherche"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:573
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "Nouveau"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "Vue active du shell"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "Nom de la vue active du shell"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "Le EFocusTracker de la fenêtre shell"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "Géométrie"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "Chaîne de la géométrie initiale de la fenêtre"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Mode sécurisé"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Indique si la fenêtre du shell est en mode sécurisé"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "Le panneau latéral est visible"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "Indique si le panneau latéral de la fenêtre du shell est visible"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "Le sélecteur est visible"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Indique si les boutons du sélecteur de fenêtre shell sont visibles"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "Barre des tâches visible"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "Indique si la barre des tâches de la fenêtre de shell est visible"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Indique si la barre d'outils de la fenêtre shell est visible"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "Gestionnaire d'interface"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "Le GtkUIManager de la fenêtre shell"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "Préparation à la mise hors ligne..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "Préparation à la mise en ligne..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "Préparation de l'arrêt..."
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "Répertoire du module"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "Le répertoire permettant de charger EModules"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "Réseau disponible"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "Indique si le réseau est disponible"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "En ligne"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "Indique si le shell est en ligne"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:164
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20806,7 +20022,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:192
+#: ../shell/main.c:188
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20814,60 +20030,56 @@ msgstr ""
 "Merci,\n"
 "L'équipe d'Evolution\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:195
 msgid "Do not tell me again"
 msgstr "Ne plus afficher le message"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:301
 msgid "Start Evolution activating the specified component"
 msgstr "Démarre Evolution en activant le composant indiqué"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:303
 msgid "Apply the given geometry to the main window"
 msgstr "Applique la géométrie indiquée à la fenêtre principale"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:307
 msgid "Start in online mode"
 msgstr "Démarre en mode connecté"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:309
 msgid "Start in \"express\" mode"
 msgstr "Démarre en mode « express »"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:312
 msgid "Forcibly shut down Evolution"
 msgstr "Force l'arrêt d'Evolution"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Force la remigration depuis Evolution 1.4"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:315
 msgid "Send the debugging output of all components to a file."
 msgstr "Envoie la sortie de débogage de tous les composants vers un fichier."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:317
 msgid "Disable loading of any plugins."
 msgstr "Désactive le chargement des greffons."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:319
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Désactive l'aperçu des courriels, contacts et tâches."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:323
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 "Importe les URI ou noms de fichier indiqués dans la suite des paramètres."
 
-#: ../shell/main.c:350
+#: ../shell/main.c:325
 msgid "Request a running Evolution process to quit"
 msgstr "Demande à un processus d'Evolution en cours d'exécution de quitter"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:440
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Le client de messagerie et l'agenda Evolution"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:466
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20881,99 +20093,44 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Voulez-vous vraiment oublier tous les mots de passe mémorisés ?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Continuer"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Impossible de mettre à jour directement depuis la version {0}"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Supprimer les anciennes données de la version {0} ?"
+msgid "Continue Anyway"
+msgstr "Continuer quand même"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+"Evolution ne prend plus en charge la mise à jour directe depuis la version "
+"{0}. Vous pouvez cependant tenter de faire d'abord une mise à jour vers "
+"Evolution 2, puis une mise à jour vers Evolution 3."
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "Oublier vos mots de passe effacera tous les mots de passe mémorisés. Il vous "
 "sera demandé de les ressaisir au besoin."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "Espace disque insuffisant pour la mise à jour."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "Voulez-vous vraiment supprimer ces anciennes données ?"
+msgid "Quit Now"
+msgstr "Quitter maintenant"
 
 #: ../shell/shell.error.xml.h:8
-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 ""
-"Le contenu intégral du dossier « evolution » est sur le point d'être "
-"définitivement supprimé.\n"
-"\n"
-"Il est conseillé de vérifier manuellement que tous vos courriels, contacts "
-"et données de calendrier sont présents, et que cette version d'Evolution "
-"fonctionne correctement avant de supprimer ces anciennes données.\n"
-"\n"
-"Une fois supprimés, vous ne pourrez pas revenir à une version précédente "
-"d'Evolution sans intervention manuelle.\n"
-
-#: ../shell/shell.error.xml.h:14
-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 ""
-"La version précédente d'Evolution stockait les données à un emplacement "
-"différent.\n"
-"\n"
-"Si vous choisissez de supprimer ces données, le contenu intégral du dossier "
-"« evolution » sera définitivement supprimé. Si vous choisissez de conserver "
-"ces données, alors vous pourrez supprimer manuellement le contenu "
-"d'« evolution » à votre convenance.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "La mise à jour depuis la version précédente a échoué :"
 
-#: ../shell/shell.error.xml.h:19
-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 ""
-"Mettre à jour vos données et vos paramètres nécessite jusqu'à {0} d'espace "
-"disque, mais vous disposez actuellement de seulement {1} disponibles.\n"
-"\n"
-"Vous devez libérer d'avantage d'espace dans votre dossier personnel avant de "
-"pouvoir continuer."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "_Oublier"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_Conserver les données"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "Me _rappeler plus tard"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -21068,7 +20225,7 @@ msgstr "Options de gestion de sessions :"
 msgid "Show session management options"
 msgstr "Afficher les options de gestion de sessions"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21126,7 +20283,7 @@ msgstr "Nom de certificat"
 msgid "Purposes"
 msgstr "Sujets"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Numéro de série"
@@ -21147,18 +20304,18 @@ msgstr "Adresse électronique"
 msgid "All CA certificate files"
 msgstr "Tous les fichiers de certification CA"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:1052
 msgid "Certificates"
 msgstr "Certificats"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visionneur de certificat : %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
+msgid "Enter the password for '%s'"
 msgstr "Saisissez le mot de passe pour « %s »"
 
 #. we're setting the password initially
@@ -21189,7 +20346,7 @@ msgstr ""
 "Émis par :\n"
 "   Sujet : %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Sélectionnez le certificat"
 
@@ -21202,14 +20359,10 @@ msgid "Authorities"
 msgstr "Autorités"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "Archiver"
+msgid "Backup _All"
+msgstr "Tout _archiver"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "Tout archiver"
-
-#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -21218,164 +20371,156 @@ msgstr ""
 "ce soit, vous devriez vérifier son certificat, sa politique et ses "
 "procédures (si elles sont disponibles)."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "Certificat"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "Approbation d'autorité de certification"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "Champs du certificat"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "Hiérarchie du certificat"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "Détails du certificat"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "Table de certificats"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "Nom commun (NC)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Certificats des contacts"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ne pas faire confiance en l'authenticité de ce certificat"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "Éditer"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "Paramètres d'approbation du certificat de courriel"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "Certificat de destinataire de courriel"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "Certificat de signataire de courriel"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Expire le"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "Valeur du champ"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "Empreintes numériques"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "Importer"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "Émis par"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Fourni le"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "Émis pour"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "Empreinte numérique MD5"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "Organisation (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "Unité d'organisation (UO)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "Empreinte numérique SHA1"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "Certificat de client SSL"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "Certificat de serveur SSL"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "Ce certificat a été vérifié pour les usages suivants :"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "Faire confiance en l'authenticité de ce certificat"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr ""
 "Faire confiance à cette AC pour identifier les utilisateurs de courriel."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr ""
 "Faire confiance à cette AC pour identifier les développeurs de logiciel."
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
 msgstr "Faire confiance à cette AC pour identifier les sites Web."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "Validité"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "Affichage"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 "Vous possédez des certificats vous identifiant auprès des organisations "
 "suivantes :"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Vous possédez des fichiers certificats qui identifient les autorités de "
 "certification suivantes :"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 "Vous possédez des fichiers de certificats qui identifient les personnes "
 "suivantes :"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "Vos certificats"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_Backup"
+msgstr "A_rchiver"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "M_odifier l'approbation CA"
 
@@ -21522,28 +20667,34 @@ msgstr "Non critique"
 msgid "Extensions"
 msgstr "Extensions"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Algorithm"
 msgstr "Algorithme de signature de certificat"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Émetteur"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "ID unique de l'émetteur"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "ID unique du sujet"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1220
 msgid "Certificate Signature Value"
 msgstr "Valeur de la signature du certificat"
 
@@ -21633,11 +20784,11 @@ 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:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -21667,19 +20818,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_Sélection"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "Collection"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:339
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Définir les vues pour %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-define-views-dialog.c:349
 msgid "Define Views"
 msgstr "Définir les vues"
 
@@ -21692,11 +20838,7 @@ msgstr "Définir les vues pour « %s »"
 msgid "Table"
 msgstr "Tableau"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Instance"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Enregistrement de la vue actuelle"
 
@@ -21708,12 +20850,7 @@ msgstr "_Créer une nouvelle vue"
 msgid "_Replace existing view"
 msgstr "_Remplacer la vue existante"
 
-# Usine ???
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "Fabrique"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "Définir une nouvelle vue"
 
@@ -21733,22 +20870,10 @@ msgstr "Type de la vue :"
 msgid "De_fault"
 msgstr "Dé_faut"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "Nom du compte"
-
 #: ../widgets/misc/e-account-tree-view.c:255
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "Action"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "Une GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Propriétés de la pièce jointe"
@@ -21766,11 +20891,11 @@ msgstr "Type MIME :"
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggérer l'affichage automatique de la pièce jointe"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "Impossible de définir comme arrière-plan"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "Définir comme _arrière-plan"
 
@@ -21803,13 +20928,10 @@ msgid "Hide Attachment _Bar"
 msgstr "Masquer la barre des pièces _jointes"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:636
 msgid "Show Attachment _Bar"
 msgstr "Afficher la barre des pièces _jointes"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "Afficher la barre des pièces _jointes"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "Ajouter une pièce jointe"
@@ -21826,32 +20948,32 @@ msgstr[1] "Enregistrer les pièces jointes"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "piècejointe.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "_Tout enregistrer"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "A_jouter une pièce jointe..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "_Masquer"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:356
 msgid "_View Inline"
 msgstr "_Afficher dans le corps"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Ouvrir dans « %s »"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Ouvrir cette pièce jointe dans %s"
@@ -21860,59 +20982,59 @@ msgstr "Ouvrir cette pièce jointe dans %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "Message joint"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 msgid "A load operation is already in progress"
 msgstr "Un chargement est déjà en cours"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 msgid "A save operation is already in progress"
 msgstr "Un enregistrement est déjà en cours"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Impossible de charger « %s »"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Impossible de charger la pièce jointe"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2193
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Impossible d'ouvrir « %s »"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2196
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Impossible d'ouvrir la pièce jointe"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "Le contenu de la pièce jointe n'est pas chargé"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2707
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Impossible d'enregistrer « %s »"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2710
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Impossible d'enregistrer la pièce jointe"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "Cliquez en appuyant sur Ctrl pour ouvrir un lien"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21920,66 +21042,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Calendrier mensuel"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Couleur de remplissage"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "Couleur de remplissage GDK"
-
-# ??? stipple : mot inconnu
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Remplir le stipple"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Largeur minimale"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Largeur minimale"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Espacement"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Codage des caractères"
@@ -21992,48 +21054,48 @@ msgstr "Saisissez le jeu de caractères à utiliser"
 msgid "Other..."
 msgstr "Autre..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Date et heure"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Zone de saisie pour fixer la date"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Cliquez sur ce bouton pour afficher un calendrier"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Zone de liste déroulante de sélection de la date"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "_Maintenant"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "A_ujourd'hui"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Aucun"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "Aucune"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "Date non valide"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "Heure non valide"
 
@@ -22132,11 +21194,11 @@ msgstr ""
 msgid "Import Data"
 msgstr "Importer les données"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "Carte du monde"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22163,42 +21225,6 @@ msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "Evolution est actuellement hors ligne parce que le réseau est indisponible."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "L'état du bouton est en ligne"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "Position horizontale"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "Position du panneau lorsqu'il est disposé horizontalement."
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "Position verticale"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "Position du panneau lorsqu'il est disposé verticalement."
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "Proportion"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "Proportion de la taille du second panneau"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "Redimensionnement fixe"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Conserver la taille du second panneau pendant un redimensionnement"
-
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Synchroniser avec :"
@@ -22220,69 +21246,47 @@ msgstr "Préférences d'Evolution"
 msgid "Matches: %d"
 msgstr "Correspond : %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "Ferme la barre de recherche"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "_Rechercher :"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "Efface la recherche"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "_Précédent"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "Recherche l'occurrence précédente de la phrase"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "_Suivant"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "Recherche la prochaine occurrence de la phrase"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "Respecter la _casse"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr ""
 "La fin de la page a été atteinte, la recherche continue depuis le début"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "Le début de la page a été atteint, la recherche continue depuis la fin"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "Rangée de curseurs"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Colonne de curseurs"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Trieur"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Mode de sélection"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Mode du curseur"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Si s_upprimé :"
@@ -22355,43 +21359,46 @@ msgstr "Quand t_erminé :"
 msgid "When decli_ned:"
 msgstr "Quand _refusé :"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "_Dans"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "_Après :"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_After"
+msgstr "_Après"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_Toutes les informations"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "_Classification :"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "_Retarder la distribution du message"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "_Distribué"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "_Définir une date d'expiration"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "_Jusqu'au :"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "_Until"
+msgstr "_Jusqu'au"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "Quand cela vous _convient"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "_Quand ouvert :"
 
@@ -22447,41 +21454,41 @@ msgstr "Le fichier de script doit être exécutable."
 msgid "Click here to go to URL"
 msgstr "Cliquez ici pour aller à l'URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:359
 msgid "_Copy Link Location"
 msgstr "_Copier l'emplacement du lien"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:361
 msgid "Copy the link to the clipboard"
 msgstr "Copie le lien dans le presse-papiers"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir un lien dans le navigateur"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:371
 msgid "Open the link in a web browser"
 msgstr "Ouvre le lien dans un navigateur Web"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Copy Email Address"
 msgstr "Copier l'_adresse électronique"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
 msgid "Select all text and images"
 msgstr "Sélectionne tout le texte et les images"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 #, c-format
 msgid "Click to call %s"
 msgstr "Cliquer pour appeler %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:846
 msgid "Click to hide/unhide addresses"
 msgstr "Cliquer pour masquer/afficher les adresses"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliquez pour ouvrir %s"
@@ -22500,7 +21507,7 @@ msgstr "Calendrier : du %s au %s"
 msgid "evolution calendar item"
 msgstr "élément du calendrier d'Evolution"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "liste des popups"
 
@@ -22518,7 +21525,7 @@ msgstr "Aucune"
 msgid "OK"
 msgstr "Valider"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La date doit être dans le format : %s"
@@ -22527,48 +21534,12 @@ msgstr "La date doit être dans le format : %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Le pourcentage doit être compris entre 0 et 100 inclus"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Colonne sélectionnée"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Colonne ayant le focus"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Colonne non sélectionnée"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Colonne barrée"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "Colonne soulignée"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Colonne en gras"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Colonne en couleur"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Colonne de couleur d'arrière-plan"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "cliquez pour ajouter"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "État"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Croissant)"
@@ -22585,12 +21556,12 @@ msgstr "Non trié"
 msgid "No grouping"
 msgstr "Aucun groupement"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Afficher les champs"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "Champs disponibles"
 
@@ -22599,7 +21570,7 @@ msgid "A_vailable Fields:"
 msgstr "Champs _disponibles :"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "Croissant"
 
@@ -22612,7 +21583,7 @@ msgid "Clear _All"
 msgstr "_Tout effacer"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "Décroissant"
 
@@ -22672,7 +21643,7 @@ msgstr "_Afficher ces champs dans l'ordre :"
 msgid "_Sort..."
 msgstr "_Trier..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "Ajouter une colonne"
 
@@ -22684,248 +21655,112 @@ msgstr ""
 "Pour ajouter une colonne à votre table, glissez-la\n"
 "à l'emplacement où elle doit apparaître."
 
-#: ../widgets/table/e-table-group-container.c:342
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
 #, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s : %s (%d élément)"
 msgstr[1] "%s : %s (%d éléments)"
 
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d élément)"
 msgstr[1] "%s (%d éléments)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Couleurs de rangées alternatives"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Grille de dessin horizontal"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Grille de dessin vertical"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Dessiner le focus"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Mode du curseur"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Modèle de sélection"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "Longueur du seuil"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Hauteur de rangée uniforme"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "Gelé"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
 msgstr "Personnaliser la vue en cours"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Sort _Ascending"
 msgstr "Tri _croissant"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1565
 msgid "Sort _Descending"
 msgstr "Tri _décroissant"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1568
 msgid "_Unsort"
 msgstr "_Ne pas trier"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1571
 msgid "Group By This _Field"
 msgstr "Grouper par ce _champ"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Group By _Box"
 msgstr "Grouper par _boîte"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Remove This _Column"
 msgstr "Enlever cette c_olonne"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Add a C_olumn..."
 msgstr "_Ajouter une colonne..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "A_lignment"
 msgstr "A_lignement"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "B_est Fit"
 msgstr "_Meilleur ajustement"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Format Column_s..."
 msgstr "Format des colonne_s..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Custo_mize Current View..."
 msgstr "_Personnaliser la vue actuelle..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Sort By"
 msgstr "_Trier par"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1672
 msgid "_Custom"
 msgstr "_Personnaliser"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "En-tête de tableau"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Modèle de tableau"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Rangée de curseurs"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Info de tri"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Toujours rechercher"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Utiliser le clic pour ajouter"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "Espacement vertical des lignes"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "Espacement vertical entre les lignes (au-dessus et au-dessous)"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "Adaptateur de table ETree"
-
-# ??? je ne comprends pas
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Rechercher en arrière"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Dessiner les lignes et les icônes d'extension +/-."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "Taille de l'icône d'extension"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "Taille de la flèche de l'icône d'extension"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "popup"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "affiche un fils"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "modifier"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "commence la modification de cette cellule"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "basculer"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "bascule la cellule"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "étendre"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "étend la rangée du ETree contenant cette cellule"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "réduire"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "réduit la rangée du ETree contenant cette cellule"
 
@@ -22941,115 +21776,10 @@ msgstr "clic"
 msgid "sort"
 msgstr "tri"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "Méthodes de saisie"
-
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Processeur d'évènements"
-
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Texte"
-
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Gras"
-
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Barré"
-
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Ancre"
-
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "Justification"
-
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Largeur du masque"
-
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Hauteur du masque"
-
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Masque"
-
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Remplir le masque rectangulaire"
-
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "Décalage en X"
-
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Décalage en Y"
-
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Largeur du texte"
-
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Hauteur du texte"
-
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Utiliser des points de suspension"
-
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Points de suspension"
-
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Coupure des lignes"
-
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Caractères de coupure"
-
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "Lignes maximum"
-
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Dessiner les bordures"
-
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Autoriser les nouvelles lignes"
-
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Dessiner l'arrière-plan"
-
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Dessiner le bouton"
-
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "Position du curseur"
-
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "Contexte des méthodes de saisie"
-
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "Poignée du menu contextuel"
diff --git a/po/gl.po b/po/gl.po
index 9aba77d5eb..f939b0d7ab 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -16,21 +16,21 @@
 # Antón Méixome <meixome@mancomun.org>, 2009.
 # Antón Méixome <meixome@certima.net>, 2010.
 # Fran Diéguez <frandieguez@ubuntu.com>, 2009, 2010.
-#: ../shell/main.c:479
+#
+#: ../shell/main.c:497
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=evolution\n"
-"POT-Creation-Date: 2010-03-20 11:37+0000\n"
-"PO-Revision-Date: 2010-03-20 15:07+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-25 09:43+0200\n"
+"PO-Revision-Date: 2010-05-25 09:42+0200\n"
 "Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
-"Language-Team: Galician <proxecto@trasno.net>\n"
+"Language-Team: Galician <gnome@g11.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\\\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. For Translators: {0} is the name of the address book source
@@ -111,7 +111,7 @@ msgstr "Produciuse un fallo ao autenticarse no servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1268
 msgid "Failed to delete contact"
 msgstr "Produciuse un fallo ao eliminar o contacto"
 
@@ -226,7 +226,7 @@ msgstr ""
 "Os seus contactos para {0} non estarán dispoñíbeis até que o Evolution sexa "
 "reiniciado."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -249,16 +249,6 @@ msgstr "_Redimensionar"
 msgid "_Use as it is"
 msgstr "_Usar tal como está"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Enderezo de sincronización predefinido:"
@@ -275,7 +265,7 @@ msgstr "Non foi posíbel ler o bloque de Aplicativo de enderezos do pilot"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2020
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -286,260 +276,231 @@ msgstr "Aniversario"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2019 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:115
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "_Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:916
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2570
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "_Dispoñibilidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "_Nome completo..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "Enderezo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "Páxina de _inicio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Imaxe"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "<b>Mensaxaría instantánea</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Traballo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Enderezo de correo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "_Alcume:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Notas"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1723
 msgid "Other"
 msgstr "Outros"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "Datos persoais"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "_Videoconferencia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "<b>Enderezos Web</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "Rexistro _web:"
-
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Traballo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "_Asistente:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+msgid "_Blog:"
+msgstr "_Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "_Empresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "_País:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "_Arquivar como:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "_Dispoñibilidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "Páxina de _inicio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "_Xestor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "_Apdo. de correos:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "_Profesión:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "_Cónxuxe:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "_Videoconferencia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "_Quere recibir correo en HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "Rexistro _web:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Onde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "_Código Postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Nome"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "Editábel"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -581,7 +542,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "Error adding contact"
 msgstr "Produciuse un erro ao engadir o contacto"
 
@@ -593,45 +554,21 @@ msgstr "Produciuse un erro ao modificar o contacto"
 msgid "Error removing contact"
 msgstr "Produciuse un erro ao eliminar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Axenda de enderezos de orixe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "Axenda de enderezos de destino"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "É un contacto novo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Campos que se poden escribir"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Campos requiridos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Modificado"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2565
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2973
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2974
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3247
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -639,56 +576,46 @@ msgstr ""
 "Os datos de contacto non son válidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ten un formato non válido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3258
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ten un formato non válido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3284
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' está baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
 msgid "Invalid contact."
 msgstr "Contacto non válido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "Adición rápida de contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "_Editar completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "Correo _electrónico"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "_Seleccione a axenda de enderezos"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Terminal"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "O singleton de EShell"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr."
@@ -755,7 +682,7 @@ msgid "_Suffix:"
 msgstr "_Sufixo:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:676
 msgid "Contact List Editor"
 msgstr "Editor da lista de contactos"
 
@@ -772,7 +699,7 @@ msgid "_List name:"
 msgstr "_Nome da lista:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:164
 msgid "_Select..."
 msgstr "_Seleccionar..."
 
@@ -781,39 +708,27 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Escriba un enderezo de correo ou arrastre un contacto á lista de abaixo:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:769
 msgid "Contact List Members"
 msgstr "Membros da lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:917
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1333
 msgid "_Members"
 msgstr "_Integrantes"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error adding list"
 msgstr "Produciuse un erro ao engadir a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error modifying list"
 msgstr "Produciuse un erro ao modificar a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1200
 msgid "Error removing list"
 msgstr "Produciuse un erro ao eliminar a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Axenda de enderezos"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "É unha lista nova"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contacto modificado:"
@@ -852,31 +767,31 @@ msgstr ""
 "cartafol. Quere engadilo de todas as formas?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "_Combinar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 msgid "Merge Contact"
 msgstr "Combinar contacto"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "O correo comeza por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "O nome contén"
 
@@ -895,91 +810,62 @@ msgstr[1] "%d contactos"
 msgid "Error getting book view"
 msgstr "Produciuse un erro ao obter a visualización da axenda de enderezos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "Consulta"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
 msgstr "Búsqueda interrompida"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Modelo"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Produciuse un erro ao modificar a tarxeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cortar o texto seleccionado para o portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Paste contacts from the clipboard"
 msgstr "Pegar os contactos desde o portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "Eliminar os contactos seleccionados"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 msgid "Select all visible contacts"
 msgstr "Seleccionar todos os contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Visualización de terminal"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Orixe"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1286
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Está seguro de que quere eliminar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1290
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Está seguro de que quere eliminar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1294
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Está seguro de que quere eliminar a lista de contactos (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Está seguro de que quere eliminar estes contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete this contact?"
 msgstr "Está seguro de que quere eliminar estes contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Está seguro de que quere eliminar o contacto (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1463
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -988,11 +874,11 @@ msgstr ""
 "Ao abrir %d contacto abrirá tamén %d novas xanelas.\n"
 "Está seguro de que quere mostrar este contacto?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 msgid "_Don't Display"
 msgstr "_Non mostrar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1469
 msgid "Display _All Contacts"
 msgstr "Mostrar _todos os contactos"
 
@@ -1152,7 +1038,6 @@ msgid "Telex"
 msgstr "Télex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "Título"
 
@@ -1164,59 +1049,7 @@ msgstr "Unidade"
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Largura"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Altura"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "Ten foco"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Campo"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Nome do campo"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Modelo de texto"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Lonxitude máxima do campo"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Largura da columna"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1226,7 +1059,7 @@ msgstr ""
 "\n"
 "Buscando os contactos..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1240,7 +1073,7 @@ msgstr ""
 "\n"
 "ou prema dúas veces aquí para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1254,7 +1087,7 @@ msgstr ""
 "\n"
 "Prema aquí dúas veces para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1264,7 +1097,7 @@ msgstr ""
 "\n"
 "Buscar o contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1274,10 +1107,6 @@ msgstr ""
 "\n"
 "Non hai elementos para mostrar nesta visualización."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Adaptador"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Correo electrónico do traballo"
@@ -1287,18 +1116,10 @@ msgid "Home Email"
 msgstr "Correo electrónico particular"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "Outro correo electrónico"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Seleccionado"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "Posúe cursor"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1341,17 +1162,17 @@ msgid "Copy _Email Address"
 msgstr "Copiar enderezo de _correo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:381
 msgid "Copy the email address to the clipboard"
 msgstr "Copia obxectos no portapapeis."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:386
 msgid "_Send New Message To..."
 msgstr "_Enviar unha mensaxe nova a..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:388
 msgid "Send a mail message to this address"
 msgstr "Converte unha mensaxe nunha tarefa."
 
@@ -1387,22 +1208,21 @@ msgid "Video Chat"
 msgstr "Videoconferencia"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:498
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "Calendario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:116
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Dispoñibilidade"
@@ -1430,21 +1250,19 @@ msgid "Web Log"
 msgstr "Blogue"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:176
+#: ../modules/addressbook/e-book-shell-migrate.c:134
+#: ../modules/calendar/e-cal-shell-backend.c:180
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Persoal"
@@ -1461,8 +1279,8 @@ msgstr "Páxina de inicio"
 msgid "Blog"
 msgstr "Blogue"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
@@ -1520,10 +1338,10 @@ msgstr "O protocolo non é compatíbel"
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2675
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -1656,27 +1474,27 @@ msgstr "Esta consulta non terminou con éxito."
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "Seleccione a axenda de enderezos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
@@ -1686,52 +1504,59 @@ msgstr "Visualización de tarxeta"
 
 #: ../addressbook/importers/evolution-csv-importer.c:654
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importando..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:937
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:938
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:946
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:947
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:955
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:956
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard do Evolution"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:733
+#, c-format
+msgid "Page %d"
+msgstr "Páxina %d"
+
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1809,20 +1634,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accedendo anonimamente ao servidor LDAP"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "Produciuse un fallo ao autenticarse.\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza o contrasinal para %s (usuario %s)"
 
 #: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1848,19 +1673,19 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 msgstr ""
-"Engadir un resumo significativo á súa cita daralle unha idea sobre o contido "
-"aos seus destinatarios."
+"Engadir un resumo significativo á súa cita daralle aos seus destinatarios "
+"unha idea sobre o contido."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr ""
-"Engadir un resumo significativo á súa tarefa daralle unha idea sobre o "
-"contido aos seus destinatarios."
+"Engadir un resumo significativo á súa tarefa daralle unha idea aos seus "
+"destinatarios sobre o contido."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -1957,58 +1782,54 @@ msgid "Are you sure you want to delete this task?"
 msgstr "Está seguro de que quere eliminar esta tarefa?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Está seguro que quere gardar a nota sen un resumo?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "Está seguro de que quere gardar a cita sen un resumo?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Está seguro de que quere enviar a cita sen un resumo?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Está seguro que quere gardar a nota sen un resumo?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "Está seguro de que quere enviar a tarefa sen un resumo?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "Está seguro de que quere gardar a tarefa sen un resumo?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "O repositorio de calendarios está desconectado."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Non é posíbel crear un novo actividade"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Non é posíbel gardar o actividade"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Quere eliminar o calendario '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Quere eliminar a lista de notas '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Quere eliminar a lista de tarefas '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "_Non enviar"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Hai unha descarga en progreso. Quere gardar a cita?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Hai unha descarga en progreso. Quere gardar a tarefa?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "Non foi posíbel cargar o editor."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -2016,31 +1837,26 @@ msgstr ""
 "Enviaranse convites por correo electrónico a todos os participantes e "
 "permitiráselles aceptar esta tarefa."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Enviaranse convites por correo electrónico a todos os participantes e "
 "permitiráselles confirmalos."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Produciuse un erro ao cargar o calendario"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Produciuse un erro ao cargar a lista de notas"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Produciuse un erro ao cargar a lista de tarefas"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "Erro en '{0}'"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2048,7 +1864,7 @@ msgstr ""
 "Se non envía unha notificación de cancelación, os outros participantes "
 "quizais non saiban que se cancelou a cita."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2056,7 +1872,7 @@ msgstr ""
 "Se non envía unha notificación de cancelación, os outros participantes "
 "quizais non saiban que se eliminou a nota."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2064,11 +1880,7 @@ msgstr ""
 "Se non envía unha notificación de cancelación, os outros participantes "
 "quizais non saiban que se eliminou a tarefa."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "Non hai resposta do servidor."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2076,7 +1888,7 @@ msgstr ""
 "Ao enviar información actualizada permite que outros participantes manteñan "
 "os seus calendarios ao día."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2084,7 +1896,7 @@ msgstr ""
 "Ao enviar información actualizada permítese que outros participantes "
 "manteñan a súa lista de tarefas ao día."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2092,7 +1904,7 @@ msgstr ""
 "Estanse descargando algúns anexos. Gardar a cita fará que se perdan eses "
 "anexos."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2100,98 +1912,94 @@ msgstr ""
 "Estanse descargando algúns anexos. Gardar a tarefa fará que se perdan eses "
 "anexos."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Pode que algunhas características non funcionen apropiadamente co servidor "
 "actual."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "O calendario do Evolution saíu inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Os calendarios do Evolution saíron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "As notas do Evolution saíron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "As tarefas do Evolution saíron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:55
 msgid "The calendar is not marked for offline usage."
 msgstr "O calendario non está marcado para o uso sen conexión."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:56
 msgid "The memo list is not marked for offline usage."
 msgstr "A lista de notas non está marcada para o uso no modo sen conexión."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "A lista de tarefas non está marcada para o uso sen conexión."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Este calendario eliminarase permanentemente."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de notas vaise eliminar permanentemente."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas vaise eliminar permanentemente."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "Non é posíbel cargar o calendario"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Quere gardar as modificacións feitas nesta cita?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Quere gardar as modificacións feitas nesta nota?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "Quere gardar as modificacións feitas nesta nota?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "Quere gardar as modificacións feitas nesta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Quere enviar unha notificación de cancelación para esta nota?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr ""
 "Quere enviar a todos os participantes unha notificación de cancelación?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Quere enviar convites para a cita aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "Quere enviar esta tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Quere enviar información actualizada da cita aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
 msgstr "Quere enviar información actualizada das tarefas aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2201,62 +2009,58 @@ msgstr ""
 "problemas ao usar o Evolution. Para os mellores resultados, o servidor "
 "debería actualizarse a unha versión compatíbel."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:72
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Modificou esta cita, mais aínda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Modificou esta tarefa, mais aínda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Modificou esta tarefa, mais aínda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Realizou modificacións nesta nota, mais aínda non as gardou."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Os seus calendarios non estarán dispoñíbeis até que reinicie o Evolution."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "As súas notas non estarán dispoñíbeis até que reinicie o Evolution."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "As súas tarefas non estarán dispoñíbeis até que reinicie o Evolution."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Rexeitar as modificacións"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Gardar modificacións"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:134
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Enviar notificación"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Dividir eventos de días múltiples:"
@@ -2312,7 +2116,7 @@ msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "Hora de comezo"
 
@@ -2329,8 +2133,8 @@ msgstr "Ignorar _todo"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1573
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "Localización:"
 
@@ -2345,9 +2149,9 @@ msgstr "_Ignorar"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
 #: ../calendar/gui/dialogs/comp-editor.c:1016
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1625
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
@@ -2357,10 +2161,10 @@ msgid "_Snooze"
 msgstr "_Pospor"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "horas"
 
@@ -2368,11 +2172,12 @@ msgstr "horas"
 msgid "location of appointment"
 msgstr "localización da cita"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "minutos"
 
@@ -2395,13 +2200,13 @@ msgstr "Non hai información da localización dispoñíbel."
 msgid "You have %d alarms"
 msgstr "Ten %d alarmas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2413,7 +2218,7 @@ msgstr ""
 "configurado para enviar unha mensaxe de correo electrónico. No seu lugar\n"
 "O Evolution vai mostrar un diálogo de aviso normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2430,7 +2235,7 @@ msgstr ""
 "\n"
 "Está seguro de que quere executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
@@ -2472,7 +2277,7 @@ msgid "Alarm programs"
 msgstr "Programas de alarma"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Tempo (en segundos) durante o que mostrará o erro na barra de estado."
 
@@ -2494,155 +2299,151 @@ msgid "Calendars to run alarms for"
 msgstr "Os calendarios nos que se activarán alarmas"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "Active isto para empregar o fuso horario do sistema en Evolution."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Cor para debuxar a liña de Marcus Bains na barra de tempo (baleiro para a "
 "predefinida)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Cor para debuxar a liña de Marcus Bains na visualización diaria."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "Comprimir as fins de semana na visualización mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Confirmar a compactación"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr ""
 "Conta de recorrencia predefinida para unha actividade nova. -1 significa "
 "sempre."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Días nos que debe indicarse o inicio e fin das horas de traballo."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "Aviso de cita predefinido"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "Conta de recorrencia predefinida"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Unidades de aviso predefinidas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Valor de aviso predefinido"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "Cartafol para gardar ficheiros de audio para alarmas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "Gradación de eventos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "Transparencia de actividade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "Os URL do servidor de dispoñibilidade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "URL do modelo de dispoñibilidade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "Gradación de eventos nas visualizacións de calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "Ocultar as tarefas terminadas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "Ocultar as unidades da tarefa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "Ocultar o valor da tarefa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "Posición horizontal do panel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora de fin da xornada laboral, en formato de vinte e catro horas, de 0 a 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora de comezo da xornada laboral, en formato de vinte e catro horas, de 0 a "
 "23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 "Se é \"true\", móstrase o panel de previsualización de recordatorios na "
 "xanela principal."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 "Se é \"true\", móstrase o panel de previsualización de tarefas na xanela "
 "principal."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Os intervalos de tempo mostrados nas visualizacións diaria e de semana "
 "laboral, en minutos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "Hora da última alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel a partir do que se debería rexistrar a mensaxe."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 "Unha listaxe dos fusos horarios secundarios usados recentemente nunha "
 "Visualización diaria."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista dos URL do servidor para publicación de dispoñibilidade."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Liña de Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Cor da liña de Marcus Bains - Visualización de día"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 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.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -2650,52 +2451,52 @@ msgstr ""
 "O número máximo de fusos horarios usados recentemente para recordar nunha "
 "listaxe 'day_second_zones'."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr ""
 "O número máximo de fusos horarios usados recentemente que hai que recordar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "Estilo da _resposta:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "Posición do panel de previsualización de recordatorios (horizontal)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "Posición do panel de previsualización de recordatorios (vertical)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto de finalización da xornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto de comezo da xornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "Posición do panel horizontal da visualización mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "Posición do panel vertical na visualización mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "Número de unidades para determinar un aviso predefinido."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "Número de unidades para determinar cando ocultar as tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "Cor para as tarefas pendentes"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -2704,7 +2505,7 @@ msgstr ""
 "do calendario e a lista de tarefas cando non está na visualización mensual, "
 "en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2712,25 +2513,25 @@ msgstr ""
 "Posición do panel horizontal, entre a visualización e o navegador de datas "
 "do calendario e a lista de tarefas na visualización mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
 "Posición do panel de previsualización de recordatorios cando está horientado "
 "verticalmente."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 "Posición do panel de previsualización de recordatorios cando está horientado "
 "horizontalmente."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 "Posición do panel de previsualización de tarefas cando está horientado "
 "verticalmente."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -2738,7 +2539,7 @@ msgstr ""
 "Posición do panel vertical, entre as listas de calendario e o navegador de "
 "datas do calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2746,7 +2547,7 @@ msgstr ""
 "Posición do panel vertical, entre a visualización e o navegador de datas do "
 "calendario e a lista de tarefas na visualización mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -2755,86 +2556,86 @@ msgstr ""
 "calendario e a lista de tarefas cando non está na visualización mensual, en "
 "píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "Calendario primario"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "Lista de notas primaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "Lista de tarefas primaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programas que poden ser executados polas alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr ""
 "Fusos horarios secundarios usados recentemente nunha Visualización diaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "Cartafol onde gardar a alarma de audio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "Desprazar a vista de mes por semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Mostrar o campo RSVP no editor de eventos/tarefas/reunións"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Mostrar o campo Rol no editor de eventos/tarefas/reunións"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Mostrar os prazos finais das citas nas visualizacións semanal e mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Mostrar o campo categorías no editor de eventos/reunións/tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "Mostrar o visualizador da alarma nunha bandexa de notificación"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Mostrar o campo de estado no editor de eventos/tarefas/reunións"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "Mostrar o panel de \"Previsualización\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "Mostrar o panel de \"Previsualización\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Mostrar o campo de fuso horario no editor de eventos/reunións"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Mostrar o campo de tipo no editor de eventos/tarefas/reunións"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show week number in Day and Work Week View"
 msgstr ""
 "Mostrar o número de semana nas visualizacións de Día e de Semana laborábel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week numbers in date navigator"
 msgstr "Mostrar os números de semana no navegador de datas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -2842,23 +2643,23 @@ msgstr ""
 "Mostra os fusos horarios secundarios nunha Visualización diaria, se está "
 "estabelecido. O valor é semellante ao usado na chave 'timezone'."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
 msgstr "Estilo da disposición de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (horizontal)"
 msgstr "Posición do panel vertical de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Task preview pane position (vertical)"
 msgstr "Posición do panel vertical de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Tasks due today color"
 msgstr "Cor para as tarefas que vencen hoxe"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2868,7 +2669,7 @@ msgstr ""
 "u substitúese pola parte de usuario do enderezo de correo e %d substitúese "
 "polo dominio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2877,7 +2678,7 @@ msgstr ""
 "como unha localización non traducida da base de datos de fusos horarios "
 "Olsen, como en \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -2889,7 +2690,7 @@ msgstr ""
 "\" (Visualización vertical) mostra o panel de previsualización ao lado da "
 "lista de recordatorios."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -2900,11 +2701,11 @@ msgstr ""
 "panel de previsualización debaixo da lista de tarefas. \"1\" (Visualización "
 "vertical) mostra o panel de previsualización ao lado da lista de tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "The second timezone for a Day View"
 msgstr "O segundo fuso horario dunha Visualización diaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -2912,19 +2713,19 @@ msgstr ""
 "Isto pode tomar tres valores diferentes: 0 para erros; 1 para avisos e 2 "
 "para as mensaxes de depuración."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time divisions"
 msgstr "Divisións horarias"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time the last alarm ran, in time_t."
 msgstr "A hora na que se executou a última alarma, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -2932,70 +2733,70 @@ msgstr ""
 "Transparencia dos eventos nas visualizacións de calendario, un valor entre 0 "
 "(transparente) e 1 (opaco)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Twenty four hour time format"
 msgstr "Formato de hora en vinte e catro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "URI do calendario realzado (\"primario\")"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "URI da lista de memorización realzada (\"primary\")"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "URI da lista de tarefas realzada (\"primaria\")"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Unidades para o aviso predefinido: \"minutes\", \"hours\" ou \"days\"."
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cando ocultar as tarefas: \"minutes\", \"hours\" ou "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
 msgstr "Empregar o fuso horario do sistema"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "Usar o fuso horario do sistema no canto do fuso horario seleccionado no "
 "Evolution."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Vertical pane position"
 msgstr "Posición vertical do panel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "Comezo da semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 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) até o sábado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Se se debe usar ou non a bandexa de notificación para mostrar alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Indica se se solicita confirmación ao eliminar unha cita ou tarefa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Indica se se solicita confirmación ao expurgar citas ou tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -3003,94 +2804,94 @@ msgstr ""
 "Indica se se comprimen as fins de semana. Isto pon o sábado e o domingo no "
 "mesmo espazo que un día laborábel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indica se se mostra a hora de finalización dos eventos nas visualizacións "
 "semanais e mensuais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indica se se debuxa a liña Marcus Bains (liña na hora actual) no calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr ""
 "Indica se se ocultan as tarefas terminadas na visualización de tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "Se desprazarse na vista de mes por semana ou por mes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to set a default reminder for appointments."
 msgstr "Indica se se define un aviso predefinido para as citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Indica se se mostra o campo RSVP no editor de eventos/tarefas/reunións"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Indica se se mostra o campo de categorías no editor de eventos/reunións"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Indica se se mostra o campo de rol no editor de eventos/tarefas/reunións"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Indica se se mostra o campo de estado no editor de eventos/tarefas/reunións"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indica se se mostran as horas en formato de vinte e catro horas en vez de "
 "usar am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Indica se se mostra o campo de fuso horario no editor de eventos ou reunións"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Indica se se mostra o campo de tipo no editor de eventos, tarefas ou reunións"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr ""
 "Indica se se mostra o número de semana nas visualizacións Diaria e de Semana "
 "laborábel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Indica se se mostran os números de semana no navegador de datas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "Días laborábeis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "Hora de finalización da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "Minuto de finalización da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "Hora de comezo da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "Minuto de comezo da xornada laboral"
 
@@ -3140,17 +2941,17 @@ msgid "Classification"
 msgstr "Clasificación"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:514
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Descrición"
@@ -3171,7 +2972,7 @@ msgid "Exist"
 msgstr "Existe"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
@@ -3184,25 +2985,25 @@ msgid "Organizer"
 msgstr "Organizador"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Público"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:305
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Recorrencia"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
@@ -3279,7 +3080,7 @@ msgstr "Son de alarma personalizado"
 msgid "Mes_sage:"
 msgstr "Mensa_xes:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:78
 msgid "Options"
 msgstr "_Opcións"
 
@@ -3326,11 +3127,12 @@ msgstr "días"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "días"
 
@@ -3338,19 +3140,20 @@ msgstr "días"
 msgid "end of appointment"
 msgstr "Cita nova"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "tempos adicionais a cada"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "horas"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "minutos"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "localización da cita"
 
@@ -3378,7 +3181,7 @@ msgstr "Ningún"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Seleccionar..."
 
@@ -3386,13 +3189,13 @@ msgstr "Seleccionar..."
 msgid "Selected Calendars for Alarms"
 msgstr "Seleccionar calendario para alarmas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "Hora e data:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+msgid "Ti_me and date:"
+msgstr "_Hora e data:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "Só data:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:791
+msgid "_Date only:"
+msgstr "Só _data:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3425,12 +3228,12 @@ msgstr "minutos"
 msgid "60 minutes"
 msgstr "minutos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "Alarmas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "Data/Formato de hora"
@@ -3456,20 +3259,20 @@ msgid "Display alarms in _notification area only"
 msgstr "Mostrar as alertas só na área de _notificación"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Venres"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:55
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2675
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Xeral"
 
@@ -3482,7 +3285,7 @@ msgid "Minutes"
 msgstr "minutos"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Luns"
@@ -3496,184 +3299,196 @@ msgid "None"
 msgstr "Ningún"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
 msgid "Pick a color"
 msgstr "Seleccionar unha cor"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Sábado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Desp_razar a vista de mes por semana"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Seg_undo fuso horario:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Seleccione os calendarios para a notificación de alarma"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "M_ostrar un aviso"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "Mostrar un a_viso"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar os _números das semanas no navegador de datas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr ""
 "Mostrar o _número de semana nas visualizacións Diaria e de Semana laborábel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "T_arefas que vencen hoxe:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "_Xov"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "Modelo:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Xoves"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Hora"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "Fuso _horario:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Martes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Empregar o fuso horario do s_istema"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Mércores"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "A _semana comeza en:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Work Week"
 msgstr "Semana laboral"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "Días laborábeis:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pedir confirmación ao eliminar elementos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir as fins de semana na visualización mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "A _xornada comeza ás:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "_Ven"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar as tarefas terminadas despois de"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "Tarefas _atrasadas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "_Sáb"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "_Mostrar os prazos finais das citas nas visualizacións semanal e mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "Di_visións horarias:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "_Mar"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "Mé_r"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "antes de cada data especial ou aniversario"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
@@ -3682,12 +3497,12 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:156
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3711,35 +3526,35 @@ msgstr ""
 "Copia_r localmente os contidos da lista de notas para unha operación sen "
 "conexión"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "Co_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Propiedades do calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "Calendario novo"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "Propiedades da lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "Lista de tarefas nova"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "Propiedades da lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "Lista de notas nova"
 
@@ -3796,31 +3611,11 @@ msgstr "%s  Non realizou modificacións. Quere actualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro de validación: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " para "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (Terminada "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "Terminada "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (Pendente "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "Pendente "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:238
 msgid "Could not save attachments"
 msgstr "Non foi posíbel gardar os anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:506
 msgid "Could not update object"
 msgstr "Non foi posíbel actualizar o obxecto"
 
@@ -3865,22 +3660,22 @@ msgstr "Quere gardar o elemento orixinal?"
 msgid "Click here to close the current window"
 msgstr "Prema aquí para pechar a xanela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1464
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "Copiar a selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1471
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "Cortar a selección"
 
 #: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Cortar a selección"
@@ -3889,10 +3684,10 @@ msgstr "Cortar a selección"
 msgid "Click here to view help available"
 msgstr "Prema aquí para ver a axuda dispoñíbel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1513
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
@@ -3900,8 +3695,8 @@ msgstr "Pegar o contido do portapapeis"
 msgid "Click here to save the current window"
 msgstr "Prema aquí para gardar a xanela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
@@ -3910,14 +3705,14 @@ msgstr "Seleccionar todo o texto"
 msgid "_Classification"
 msgstr "_Clasificación"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1632
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Ficheiro"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -3926,17 +3721,17 @@ msgid "_Insert"
 msgstr "_Inserir"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "_Opcións"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1674 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "_Ver"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
@@ -4021,29 +3816,29 @@ msgstr "Alterna entre se mostrar o Tipo de participante ou non"
 msgid "Recent _Documents"
 msgstr "_Documentos recentes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1692
+#: ../composer/e-composer-actions.c:477
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
+#: ../calendar/gui/dialogs/comp-editor.c:1747
 msgid "Save"
 msgstr "Gardar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2031
+#: ../calendar/gui/dialogs/comp-editor.c:2080
+#: ../calendar/gui/dialogs/comp-editor.c:2974
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As modificacións realizadas neste elemento pódense rexeitar se chega unha "
 "actualización"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2942
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:3004
 msgid "Unable to use current version!"
 msgstr "Non é posíbel usar a versión actual!"
 
@@ -4065,6 +3860,10 @@ msgstr ""
 "Quere e_liminar este elemento das caixas de correo de todos os outros "
 "destinatarios?"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "_Retirar comentario"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Non foi posíbel eliminar a actividade debido a un erro de Corba"
@@ -4125,63 +3924,67 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Alarms"
 msgstr "_Alarmas"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Click here to set or unset alarms for this event"
 msgstr ""
 "Prema aquí para configurar ou desconfigurar as alarmas para este actividade"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:215
+msgid "Show Time as _Busy"
+msgstr "Mostrar hora como oc_upada"
+
+#: ../calendar/gui/dialogs/event-editor.c:217
+msgid "Toggles whether to show time as busy"
+msgstr "Alterna entre se se mostran as horas como ocupadas ou non"
+
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "_Recurrence"
 msgstr "_Recorrencia"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Make this a recurring event"
 msgstr "Converter en actividade recorrente"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:233
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "Opcións de envío"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:235
 #: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "Inserir opcións avanzadas de envío"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:243
 msgid "All _Day Event"
 msgstr "Evento de _día completo"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "Toggles whether to have All Day Event"
 msgstr "Alterna entre se se ten un actividade de día completo ou non"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
-msgid "Show Time as _Busy"
-msgstr "Mostrar hora como oc_upada"
-
-#: ../calendar/gui/dialogs/event-editor.c:235
-msgid "Toggles whether to show time as busy"
-msgstr "Alterna entre se se mostran as horas como ocupadas ou non"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "_Free/Busy"
 msgstr "_Dispoñibilidade"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar información de dispoñibilidade para os participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
+#: ../calendar/gui/dialogs/event-editor.c:302
 msgid "Appoint_ment"
 msgstr "_Cita"
 
+#: ../calendar/gui/dialogs/event-editor.c:528
+msgid "Print this event"
+msgstr "Imprimir esta evento"
+
 #: ../calendar/gui/dialogs/event-page.c:751
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
@@ -4194,68 +3997,68 @@ msgstr ""
 "Incluso se non pode ser totalmente editada porque vostede é o organizador"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2721
 msgid "This event has alarms"
 msgstr "Este actividade ten alarmas"
 
-#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.c:833
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:880
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:882
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no start date"
 msgstr "Actividade sen data de comezo"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1100
 msgid "Event with no end date"
 msgstr "Actividade sen data de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1271
+#: ../calendar/gui/dialogs/memo-page.c:660
+#: ../calendar/gui/dialogs/task-page.c:864
 msgid "Start date is wrong"
 msgstr "A data de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1281
 msgid "End date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1304
 msgid "Start time is wrong"
 msgstr "A hora de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1311
 msgid "End time is wrong"
 msgstr "A hora de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:924
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado xa non ten unha conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1479
+#: ../calendar/gui/dialogs/memo-page.c:707
+#: ../calendar/gui/dialogs/task-page.c:930
 msgid "An organizer is required."
 msgstr "Requírese un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1504
+#: ../calendar/gui/dialogs/task-page.c:954
 msgid "At least one attendee is required."
 msgstr "Requírese polo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2594
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Non foi posíbel abrir o calendario '%s'."
@@ -4266,40 +4069,40 @@ msgstr "Non foi posíbel abrir o calendario '%s'."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2638
+#: ../calendar/gui/dialogs/memo-page.c:920
+#: ../calendar/gui/dialogs/task-page.c:1746
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Está actuando no nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d día antes da cita"
 msgstr[1] "%d días antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2946
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes da cita"
 msgstr[1] "%d horas antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2952
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes da cita"
 msgstr[1] "%d minutos antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2965
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2967
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ningún"
@@ -4317,8 +4120,10 @@ msgid "15 minutes before appointment"
 msgstr "%d minuto antes da cita"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "Participante_s..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "Participa_ntes..."
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
 #: ../calendar/gui/e-meeting-list-view.c:148
@@ -4333,28 +4138,26 @@ msgstr "Alarma personalizada:"
 msgid "Event Description"
 msgstr "Descrición da actividade"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "Resu_mo:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "_Alarma"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Descrición:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_Localización:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_Resumo:"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "_Hora:"
@@ -4371,10 +4174,14 @@ msgstr ""
 "para\n"
 "até"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
 msgid "Memo"
 msgstr "Nota"
 
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "Imprimir esta nota"
+
 #: ../calendar/gui/dialogs/memo-page.c:350
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "A nota non pode ser editada porque a nota solicitado é de só lectura"
@@ -4383,14 +4190,14 @@ msgstr "A nota non pode ser editada porque a nota solicitado é de só lectura"
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "A nota non pode ser totalmente editada porque vostede é o organizador"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:881
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Non é posíbel abrir as notas en '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
+#: ../calendar/gui/dialogs/memo-page.c:1048 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Para"
@@ -4400,68 +4207,73 @@ msgstr "Para"
 msgid "Sta_rt date:"
 msgstr "Data de _comezo:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "Resu_mo:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:383
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Está modificando unha actividade recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Está delegando unha actividade recorrente. Que quere delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Está modificando unha tarefa recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Está modificando unha nota recorrente. Que é o que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Unicamente esta instancia"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Esta instancia e as anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Esta instancia e as futuras"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Todas as instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita contén recorrencias que o Evolution non pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "A data da recorrencia non é válida"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 "A hora de finalización da recorrencia era anterior á do comezo do actividade"
 
 #. 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:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "en"
 
@@ -4469,7 +4281,7 @@ msgstr "en"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "primeiro"
 
@@ -4478,7 +4290,7 @@ msgstr "primeiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "segundo"
 
@@ -4486,7 +4298,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "terceiro"
 
@@ -4494,7 +4306,7 @@ msgstr "terceiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "cuarto"
 
@@ -4502,7 +4314,7 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "quinto"
 
@@ -4510,13 +4322,13 @@ msgstr "quinto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "último"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -4524,7 +4336,7 @@ msgstr "Outra data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "Do 1 ao 10"
 
@@ -4532,7 +4344,7 @@ msgstr "Do 1 ao 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "do 11 ao 20"
 
@@ -4540,45 +4352,45 @@ msgstr "do 11 ao 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "Do 21 ao 31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "día"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "aparicións"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "Engadir excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "Non foi posíbel obter unha selección para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "Modificar excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "Non foi posíbel obter unha selección para eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "Data e hora"
 
@@ -4590,7 +4402,7 @@ msgstr "Cada"
 msgid "Exceptions"
 msgstr "<b>Excepcións</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:86
 msgid "Preview"
 msgstr "_Previsualización"
 
@@ -4614,11 +4426,11 @@ msgstr "semanas"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "Enviar as miñas alarmas con este actividade"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "Notificar mensaxes n_ovas"
 
@@ -4627,19 +4439,19 @@ msgstr "Notificar mensaxes n_ovas"
 msgid "Completed date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "Páxina web"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Terminada"
@@ -4647,35 +4459,35 @@ msgstr "Terminada"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1125 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Alta"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2669
 msgid "In Progress"
 msgstr "En progreso"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Baixa"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1124
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "Normal"
@@ -4683,10 +4495,10 @@ msgstr "Normal"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Non Iniciada"
 
@@ -4702,7 +4514,7 @@ msgstr "Esta_do:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1771
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4712,7 +4524,7 @@ msgstr "Estado"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "Indefinida"
@@ -4722,7 +4534,7 @@ msgid "_Date completed:"
 msgstr "_Data completada:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
@@ -4743,14 +4555,18 @@ msgstr "Prema para cambiar ou ver os detalles da tarefa"
 msgid "_Send Options"
 msgstr "Opción_s de envío"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:323
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:326
 msgid "Task Details"
 msgstr "Detalles da tarefa"
 
+#: ../calendar/gui/dialogs/task-editor.c:368
+msgid "Print this task"
+msgstr "Imprimir esta tarefa"
+
 #: ../calendar/gui/dialogs/task-page.c:336
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
@@ -4761,24 +4577,20 @@ msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr ""
 "A tarefa non pode ser editada totalmente porque vostede non é o organizador"
 
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:391
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:837
 msgid "Due date is wrong"
 msgstr "A data de vencemento é incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1703
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non é posíbel abrir as tarefas en '%s'."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "Participa_ntes..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Ca_tegorías..."
@@ -4876,7 +4688,7 @@ msgid "Categories:"
 msgstr "Categorías"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -4891,8 +4703,8 @@ msgstr "Data de vencemento:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "Estado:"
 
@@ -4901,8 +4713,8 @@ msgid "Priority:"
 msgstr "Prioridade:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "Descrición:"
 
@@ -4917,32 +4729,32 @@ msgstr "Páxina Web:"
 msgid "Created"
 msgstr "Creado"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "Data final"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "Último modificado"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Data de inicio"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4953,63 +4765,49 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ningún"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Si"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "Cliente predefinido"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Configuración do Exchange"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Configuración do completado automático"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Recorrencia"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
@@ -5049,94 +4847,94 @@ msgstr "Data de inicio"
 #: ../calendar/gui/e-meeting-list-view.c:566
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Type"
 msgstr "Tipo"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:407
 msgid "Cut selected events to the clipboard"
 msgstr "Cortar o texto seleccionado para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:413
 msgid "Copy selected events to the clipboard"
 msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:419
 msgid "Paste events from the clipboard"
 msgstr "Pegar eventos desde o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:425
 msgid "Delete selected events"
 msgstr "Eliminar os eventos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Eliminar os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
 msgid "Updating objects"
 msgstr "Actualizando obxectos"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2330
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2336
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1720
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1721
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1722
 msgid "Needs action"
 msgstr "Necesita unha acción"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1867 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1871 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1887 ../calendar/gui/print.c:2624
 #, c-format
 msgid "Location: %s"
 msgstr "Localización: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1918
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -5179,8 +4977,8 @@ msgstr "Mostrar o fuso horario secundario"
 #. 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:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:878 ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
@@ -5190,10 +4988,10 @@ msgstr "%A %d de %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/e-day-view-top-item.c:882 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:916
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
 
@@ -5202,31 +5000,35 @@ msgstr "%a, %d de %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../calendar/gui/e-day-view-top-item.c:886 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:952
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2638
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
 
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "Recorrencia:"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Si. (Recorrencia complexa)"
@@ -5313,7 +5115,7 @@ msgstr "Finaliza"
 msgid "Due"
 msgstr "Vence"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "información de iCalendar"
 
@@ -5322,313 +5124,313 @@ msgstr "información de iCalendar"
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "Unha persoa descoñecida"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+"Please review the following information, and then select an action from the "
+"menu below."
 msgstr ""
-"<br> Revise a seguinte información, e escolla unha acción do menú de abaixo."
+"Revise a seguinte información e escolla unha acción do menú de embaixo."
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2317
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ningún"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2333
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 "A cita foi cancelouse, porén non foi posíbel encontralo nos seus calendarios"
 
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "A tarefa cancelouse, porén non foi posíbel encontralo nas súas listas de "
 "tarefas"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> publicou información sobre unha cita."
+msgid "%s has published meeting information."
+msgstr "%s publicou información sobre unha cita."
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "Información da cita"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> solicita a presenza de %s nunha cita."
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s solicita a presenza de %s nunha cita."
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> require a súa presenza nunha cita."
+msgid "%s requests your presence at a meeting."
+msgstr "%s require a súa presenza nunha cita."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "Proposta de cita"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> quere que se lle engada a unha cita existente."
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s quere que se lle engada a unha cita existente."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "Actualización da cita"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> quere recibir a última información sobre a cita."
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s quere recibir a última información sobre a cita."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "Solicitude de actualización da cita"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> respondeu a unha petición de cita."
+msgid "%s has replied to a meeting request."
+msgstr "%s respondeu a unha petición de cita."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "Resposta de cita"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> cancelou unha cita."
+msgid "%s has canceled a meeting."
+msgstr "%s cancelou unha cita."
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "Cancelación da cita"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> enviou unha mensaxe inintelixíbel."
+msgid "%s has sent an unintelligible message."
+msgstr "%s enviou unha mensaxe inintelixíbel."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "Mensaxe de cita incorrecta"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> publicou información da tarefa."
+msgid "%s has published task information."
+msgstr "%s publicou información da tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "Información da tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> require a %s que efectúe unha tarefa."
+msgid "%s requests %s to perform a task."
+msgstr "%s require a %s que efectúe unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> require que efectúe unha tarefa."
+msgid "%s requests you perform a task."
+msgstr "%s require que efectúe unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> quere que se lle engada a unha tarefa existente."
+msgid "%s wishes to be added to an existing task."
+msgstr "%s quere que se lle engada a unha tarefa existente."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "Actualización de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> quere recibir a última información sobre a tarefa."
+msgid "%s wishes to receive the latest task information."
+msgstr "%s quere recibir a última información sobre a tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "Solicitude de actualización de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> respondeu a unha asignación de tarefa."
+msgid "%s has replied to a task assignment."
+msgstr "%s respondeu a unha asignación de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "Resposta de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> cancelou unha tarefa."
+msgid "%s has canceled a task."
+msgstr "%s cancelou unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "Cancelación de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "Mensaxe de tarefa incorrecta"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> publicou información de dispoñibilidade."
+msgid "%s has published free/busy information."
+msgstr "%s publicou información de dispoñibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "Información de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> require a súa información de dispoñibilidade."
+msgid "%s requests your free/busy information."
+msgstr "%s require a súa información de dispoñibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "Solicitude de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> respondeu a unha solicitude de dispoñibilidade."
+msgid "%s has replied to a free/busy request."
+msgstr "%s respondeu a unha solicitude de dispoñibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "Resposta de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe incorrecta de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "A mensaxe non parece estar formada apropiadamente"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe só contén solicitudes non compatíbeis."
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O anexo non contén unha mensaxe de calendario válida"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo non ten elementos de calendario visíbeis"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "O obxecto non é válido e non pode ser actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta non é dun participante actual. Quere engadilo como "
 "participante?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Non foi posíbel actualizar o estado do participante debido a un estado non "
 "válido!\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "Estado do participante actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../calendar/gui/e-itip-control.c:2084
+#: ../plugins/itip-formatter/itip-formatter.c:1420
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Non foi posíbel actualizar estado do participante porque xa non existe o "
 "elemento"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "Elemento enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "Non foi posíbel enviar o elemento!\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "Seleccione unha acción:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-itip-control.c:2302
 #: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Rexeitar"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "Actualizar o estado do interlocutor"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "Enviar a última información"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -5677,56 +5479,56 @@ msgid "Resources"
 msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Participante requirido"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Non-participante"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "Necesita acción"
 
@@ -5735,14 +5537,14 @@ msgstr "Necesita acción"
 msgid "Attendee                          "
 msgstr "Participante                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -5751,7 +5553,7 @@ msgstr "%A, %d de %B de %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:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5761,67 +5563,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "Fóra da oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "Sen información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "Par_ticipantes..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "O_pcións"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "Mostrar _só as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "Mostrar _reducido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "_Actualizar dispoñibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "Seleccionar _automaticamente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_Todas as persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "Todas as _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "Persoas _requiridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "Persoas requiridas e _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
@@ -5850,44 +5648,46 @@ msgid "Member"
 msgstr "Integrante"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../modules/calendar/e-cal-shell-content.c:465
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "Notas"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
 msgid "* No Summary *"
 msgstr "* Sen resumo *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
 msgid "Start: "
 msgstr "Comezo: "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
 msgid "Due: "
 msgstr "Pendente: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:709
 msgid "Cut selected memos to the clipboard"
 msgstr "Cortar as mensaxes seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:715
 msgid "Copy selected memos to the clipboard"
 msgstr "Copiar as mensaxes seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:721
 msgid "Paste memos from the clipboard"
 msgstr "Pegar recordatorios desde o portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:727
+#: ../modules/calendar/e-memo-shell-view-actions.c:565
 msgid "Delete selected memos"
 msgstr "Eliminar as notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Select all visible memos"
 msgstr "Seleccionar todas as mensaxes visíbeis"
 
@@ -5895,86 +5695,51 @@ msgstr "Seleccionar todas as mensaxes visíbeis"
 msgid "Click to add a memo"
 msgstr "Prema para engadir unha nota"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2052
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:427
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:932
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cortar o texto seleccionado para o portapapeis"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:938
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:944
 msgid "Paste tasks from the clipboard"
 msgstr "Pegar as tarefas desde o portapapeis"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "Eliminar as tarefas seleccionadas"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:956
 msgid "Select all visible tasks"
 msgstr "Seleccionar todas as mensaxes visíbeis"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Seleccionar fuso horario"
 
@@ -5982,36 +5747,36 @@ 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:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "Ten alarmas."
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "Ten recorrencias."
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "É unha cita."
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Evento de calendario: o resumo é %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "Evento de calendario: non ten resumo."
 
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "visualización de actividades de calendario"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "Obter o foco"
 
@@ -6040,7 +5805,7 @@ msgstr "Ir á data"
 msgid "a table to view and select the current time range"
 msgstr "unha táboa para ver e seleccionar o intervalo de tempo actual"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -6049,14 +5814,14 @@ msgstr[1] "Ten %d eventos."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 msgid "It has no events."
 msgstr "Non ten eventos."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Visualización de semana laboral: %s. %s"
@@ -6064,36 +5829,36 @@ msgstr "Visualización de semana laboral: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Visualización diaria: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "visualización de calendario para unha semana laboral"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "visualización de calendario para un ou máis días"
 
 #: ../calendar/gui/ea-gnome-calendar.c:46
 #: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Calendario do GNOME"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:912
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:919
+#: ../modules/calendar/e-cal-shell-view-private.c:925
+#: ../modules/calendar/e-cal-shell-view-private.c:928
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -6101,10 +5866,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:945
+#: ../modules/calendar/e-cal-shell-view-private.c:956
+#: ../modules/calendar/e-cal-shell-view-private.c:963
+#: ../modules/calendar/e-cal-shell-view-private.c:966
 msgid "%d %b %Y"
 msgstr "%d de %b de %Y"
 
@@ -6116,25 +5881,25 @@ msgstr "Botón de salto"
 msgid "Click here, you can find more events."
 msgstr "Prema aquí para localizar máis eventos."
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Visualización mensual: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Visualización semanal: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:188
 msgid "calendar view for a month"
 msgstr "Visualización de calendario para un mes"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:190
 msgid "calendar view for one or more weeks"
 msgstr "visualización de calendario para unha ou máis semanas"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "Purging"
 msgstr "Depurando"
 
@@ -6187,39 +5952,40 @@ msgid "Select Date"
 msgstr "Seleccionar data"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "Integrante"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
+msgid "Select _Today"
+msgstr "Seleccionar _hoxe"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_Seleccionar hoxe"
+msgid "September"
+msgstr "Integrante"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "Débese definir un organizador."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "É necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Información do actividade"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Información da tarefa"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Información da nota"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Información de dispoñibilidade"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "Información do calendario"
 
@@ -6227,7 +5993,7 @@ msgstr "Información do calendario"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceptado"
@@ -6236,7 +6002,7 @@ msgstr "Aceptado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
@@ -6248,7 +6014,7 @@ msgstr "Aceptado provisionalmente"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Rexeitado"
@@ -6257,7 +6023,7 @@ msgstr "Rexeitado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegado"
@@ -6265,7 +6031,7 @@ msgstr "Delegado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizado"
@@ -6273,7 +6039,7 @@ msgstr "Actualizado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -6281,7 +6047,7 @@ msgstr "Cancelar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualizar"
@@ -6289,31 +6055,31 @@ msgstr "Actualizar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de dispoñibilidade (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Non foi posíbel almacenar un recurso, o novo evento colisiona con algún "
 "outro."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "Non foi posíbel almacenar un recurso, erro:"
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante no actividade."
 
@@ -6469,49 +6235,81 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "Sá"
 
-#: ../calendar/gui/print.c:2564
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2429
+msgid " to "
+msgstr " para "
+
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2437
+msgid " (Completed "
+msgstr " (Terminada "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2441
+msgid "Completed "
+msgstr "Terminada "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2449
+msgid " (Due "
+msgstr " (Pendente "
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2454
+msgid "Due "
+msgstr "Pendente "
+
+#: ../calendar/gui/print.c:2588
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2566
+#: ../calendar/gui/print.c:2590 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2639
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2682
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2697
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2726
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2739
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2750
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -6536,44 +6334,189 @@ msgstr "é maior que"
 msgid "is less than"
 msgstr "é menor que"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "Citas e reunións"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
+#: ../plugins/itip-formatter/itip-formatter.c:1832
 msgid "Opening calendar"
 msgstr "Abrir calendario"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "Aviso!"
 
-#: ../calendar/importers/icalendar-importer.c:583
+#: ../calendar/importers/icalendar-importer.c:662
 msgid "vCalendar files (.vcf)"
 msgstr "Ficheiros vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "Eventos de calendario"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador intelixente do calendario do Evolution"
 
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1237
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "Reunión"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1237
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "Evento"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1238
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Tarefa"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1239
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Nota"
+
+#: ../calendar/importers/icalendar-importer.c:941
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "ten recorrencias"
+
+#: ../calendar/importers/icalendar-importer.c:946
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "é unha instancia"
+
+#: ../calendar/importers/icalendar-importer.c:951
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "ten alarmas"
+
+#: ../calendar/importers/icalendar-importer.c:956
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "ten anexos"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "Público"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Privado"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "Clasificación"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1278
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Resumo"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "Localización"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1274
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "Comezar"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "Vence"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Remata"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "Categorías"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Rematada"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Organizador"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Participantes"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Descrición"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1270
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Tipo"
+
 #.
 #. *
 #. * This program is free software; you can redistribute it and/or
@@ -8127,157 +8070,157 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: ../composer/e-composer-actions.c:79
+#: ../composer/e-composer-actions.c:81
 msgid "Untitled Message"
 msgstr "Mensaxe sen título"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:283
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:288
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "Pre_visualización da impresión"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "Gardar _como..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual cun nome diferente"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "Gardar como borra_dor"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "Enviar esta mensaxe"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "_Mensaxe nova"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "Abrir unha xanela de Mensaxe nova"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "C_odificación de caracteres"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:363
 msgid "PGP _Encrypt"
 msgstr "C_ifrar con PGP"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:365
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensaxe con PGP"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:371
 msgid "PGP _Sign"
 msgstr "A_sinar con PGP"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:373
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa súa chave PGP"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "_Mensaxe prioritaria"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensaxe como alta"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "_Requirir confirmación de lectura"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:389
 msgid "Get delivery notification when your message is read"
 msgstr "Obter unha notificación de entrega cando se lea a súa mensaxe"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "_Cifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:397
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Cifrar esta mensaxe co seu certificado de cifrado S/MIME"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "Si_natura S/MIME"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:405
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Asinar esta mensaxe co seu certificado de sinatura S/MIME"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:411
 msgid "_Bcc Field"
 msgstr "Campo _Cco"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:413
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CCO"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CC"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:427
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:429
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Alterna entre se se mostra ou non o selector do campo De"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Responder a"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:480
 msgid "Save Draft"
 msgstr "Gardar borrador"
 
@@ -8289,15 +8232,15 @@ msgstr "Mostrar"
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 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-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8305,58 +8248,58 @@ msgstr ""
 "Introduza os enderezos que recibirán unha copia da mensaxe sen aparecerer na "
 "lista de destinatarios da mensaxe"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "De"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "Cc"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "_Cco:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Cco"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "Prema aquí para ir á axenda de enderezos"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "Prema aquí para seleccionar os cartafoles nos que publicar"
 
@@ -8381,19 +8324,19 @@ msgid "Save draft"
 msgstr "Gardar borrador"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:188
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "_Non mostrar esta mensaxe outra vez."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:1005
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Non é posíbel asinar a mensaxe saínte: non hai un certificado de sinatura "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:1012
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8401,21 +8344,19 @@ msgstr ""
 "Non é posíbel cifrar a mensaxe saínte: non hai un certificado de cifrado "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1405
 msgid "Unable to reconstruct message from autosave file"
 msgstr "Non é posíbel obter a mensaxe do editor"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1471 ../composer/e-msg-composer.c:1678
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:3310
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#: ../composer/e-msg-composer.c:3334
+msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
-"<b>(O editor contén un corpo de mensaxe que non ten texto, polo que non se "
-"pode editar.)</b>"
+"(O editor contén un corpo de mensaxe que non ten texto, polo que non se pode "
+"editar.)"
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -8500,9 +8441,9 @@ msgstr ""
 "nova. Recuperar a mensaxe permitiralle continuar onde a deixou."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
-"O ficheiro `{0}' non é un ficheiro normal e non pode ser enviado nunha "
+"O ficheiro «{0}» non é un ficheiro normal e non pode ser enviado nunha "
 "mensaxe."
 
 #: ../composer/mail-composer.error.xml.h:17
@@ -8521,8 +8462,8 @@ msgid "Unable to activate the address selector control."
 msgstr "Non é posíbel activar o control de selección de enderezos."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "Non pode anexar o ficheiro `{0}' a esta mensaxe."
+msgid "You cannot attach the file n{0}' to this message."
+msgstr "Non pode anexar o ficheiro «{0}» a esta mensaxe."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8544,31 +8485,27 @@ msgstr "_Recuperar"
 msgid "_Save Draft"
 msgstr "_Gardar borrador"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:199
 msgid "Run Anjal in a window"
 msgstr "Executar Anjar nunha xanela"
 
-#: ../capplet/anjal-settings-main.c:203
+#: ../capplet/anjal-settings-main.c:200
 msgid "Make Anjal the default email client"
 msgstr "Facer Anjal o cliente de correo electrónico predefinido"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:207
 msgid "ID of the socket to embed in"
 msgstr "ID do socket para incrustar"
 
-#: ../capplet/anjal-settings-main.c:211
+#: ../capplet/anjal-settings-main.c:208
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:221
 msgid "Anjal email client"
 msgstr "Cliente de correo Anjal"
 
-#: ../capplet/settings/mail-view.c:244
-msgid "New Tab"
-msgstr "Novo _separador"
-
 #: ../capplet/settings/mail-account-view.c:56
 msgid "Please enter your full name."
 msgstr "Insira o seu nome completo."
@@ -8581,52 +8518,52 @@ msgstr "Insira o seu enderezo de correo electrónico:"
 msgid "The email address you have entered is invalid."
 msgstr "O enderezo de correo electrónico inserido é incorrecto."
 
-#: ../capplet/settings/mail-account-view.c:224
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalles persoais:</span>"
+#: ../capplet/settings/mail-account-view.c:182
+msgid "Personal details:"
+msgstr "Información persoal:"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:189
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../capplet/settings/mail-account-view.c:238
+#: ../capplet/settings/mail-account-view.c:198
 msgid "Email address:"
 msgstr "Enderezo de correo:"
 
-#: ../capplet/settings/mail-account-view.c:248
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalles de recepción:</span>"
+#: ../capplet/settings/mail-account-view.c:208
+msgid "Receiving details:"
+msgstr "Detalles de recepción:"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
+#: ../capplet/settings/mail-account-view.c:215
+#: ../capplet/settings/mail-account-view.c:265
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
+#: ../capplet/settings/mail-account-view.c:224
+#: ../capplet/settings/mail-account-view.c:274
 msgid "Server address:"
 msgstr "Endrezo do servidor:"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:233
+#: ../capplet/settings/mail-account-view.c:283
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:292
 msgid "Use encryption:"
 msgstr "Usar cifrado:"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:247
+#: ../capplet/settings/mail-account-view.c:297
 msgid "never"
 msgstr "nunca"
 
-#: ../capplet/settings/mail-account-view.c:298
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalles de envío:</span>"
+#: ../capplet/settings/mail-account-view.c:258
+msgid "Sending details:"
+msgstr "Detalles de envío"
 
-#: ../capplet/settings/mail-account-view.c:355
+#: ../capplet/settings/mail-account-view.c:316
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -8637,21 +8574,21 @@ msgstr ""
 "configurar as preferencias. Se non é posíbel facelo de forma automatica "
 "necesitará os detalles do seu servidor."
 
-#: ../capplet/settings/mail-account-view.c:357
+#: ../capplet/settings/mail-account-view.c:318
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
 msgstr ""
-"Desculpe, non foi posíbel adiviñar as configuracións para configurar o seu "
-"correo electrónico automaticamente. Insíraas debaixo, tente comezar coas que "
-"están inseridas debaixo pero o máis seguro e que teña que cambialas."
+"Non foi posíbel adiviñar as configuracións para configurar o seu correo "
+"electrónico automaticamente. Insíraas embaixo, tente comezar coas que están "
+"inseridas embaixo pero o máis seguro e que teña que cambialas."
 
-#: ../capplet/settings/mail-account-view.c:359
+#: ../capplet/settings/mail-account-view.c:320
 msgid "You can specify more options to configure the account."
 msgstr "Vostede pode especificar máis opcións para configurar a conta."
 
-#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:322
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8659,13 +8596,13 @@ msgstr ""
 "Agora necesita as súas configuracións para enviar correo. Tentouse adiviñar "
 "pero debería comprobalas para asegurarse."
 
-#: ../capplet/settings/mail-account-view.c:362
+#: ../capplet/settings/mail-account-view.c:323
 msgid "You can specify your default settings for your account."
 msgstr ""
 "Vostede pode especificar as súas configuracións predefinidas para a súa "
 "conta."
 
-#: ../capplet/settings/mail-account-view.c:363
+#: ../capplet/settings/mail-account-view.c:324
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8673,134 +8610,126 @@ msgstr ""
 "O tempo para verificar as cousas antes de tentar conectar ao servidor e "
 "obter o seu correo electrónico"
 
-#: ../capplet/settings/mail-account-view.c:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:339
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2190
+#: ../mail/mail-config.ui.h:60
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../capplet/settings/mail-account-view.c:378
+#: ../capplet/settings/mail-account-view.c:339
 msgid "Next - Receiving mail"
 msgstr "Seguinte - Recibindo o correo"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
 msgid "Receiving mail"
 msgstr "Recibindo correo"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:340
+#: ../capplet/settings/mail-account-view.c:341
 msgid "Next - Sending mail"
 msgstr "Seguinte - Enviando o correo"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
 msgid "Back - Identity"
 msgstr "Anterior - Identidade"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
 msgid "Next - Receiving options"
 msgstr "Seguinte - Opcións de recepción"
 
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:341
 msgid "Receiving options"
 msgstr "Opcións de recepción"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:341
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Back - Receiving mail"
 msgstr "Anterior - Recibindo o correo"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Sending mail"
 msgstr "Enviando correo"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:343
+#: ../capplet/settings/mail-account-view.c:344
 msgid "Next - Review account"
 msgstr "Seguinte - Revisando a conta"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Next - Defaults"
 msgstr "Seguinte - Predefinidos"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Back - Receiving options"
 msgstr "Anterior - Opcións de recepción"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:344
+#: ../mail/em-account-editor.c:2769 ../mail/mail-config.ui.h:33
 msgid "Defaults"
 msgstr "Predefinidos"
 
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:344
 msgid "Back - Sending mail"
 msgstr "Anterior - Enviando correo"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
 msgid "Review account"
 msgstr "Revisar a conta"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
 msgid "Finish"
 msgstr "Rematar"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
 msgid "Back - Sending"
 msgstr "Anterior - Enviando"
 
-#: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
+#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "Pechar separador"
 
-#: ../capplet/settings/mail-account-view.c:729
+#: ../capplet/settings/mail-account-view.c:690
 msgid "Account Wizard"
 msgstr "Asistente da conta"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "Asistente de contas do Evolution"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "Configuración de correo electrónico"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-msgid "Quit"
-msgstr "Saír"
-
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1617
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:659
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:211
+#: ../mail/message-list.c:1607
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/addressbook/e-book-shell-migrate.c:126
 #: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-cal-shell-backend.c:133
+#: ../modules/calendar/e-cal-shell-migrate.c:141
 #: ../modules/calendar/e-memo-shell-backend.c:108
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-migrate.c:109
 msgid "On This Computer"
 msgstr "Neste computador"
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:146
 #: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "Engadir unha nova conta"
 
-#: ../capplet/settings/mail-settings-view.c:185
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Xestión de conta</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "Xestión de contas"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "Configuracións"
 
@@ -8812,7 +8741,7 @@ msgstr "Información do calendario"
 msgid "Evolution Alarm Notify"
 msgstr "Importador do Elm do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:823
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8833,13 +8762,9 @@ msgstr "Xestionar o seu correo, contactos e calendario"
 msgid "Configure email accounts"
 msgstr "Configurar as contas de correo"
 
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "tarxeta de enderezo"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "información de calendario"
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "Configuración de correo electrónico"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:224
@@ -8934,57 +8859,67 @@ msgstr "Europeo occidental"
 msgid "Western European, New"
 msgstr "Europeo occidental, novo"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "Simplificado"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "Ucraíno"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "Visual"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1788
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Hoxe"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Mañá"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Onte"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "%d días desde agora"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "Dentro de %d día"
+msgstr[1] "Dentro de %d días"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "hai %d días"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Hai %d día"
+msgstr[1] "Hai %d días"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "Usar os locais predefinidos"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "Formato:"
 
@@ -9005,18 +8940,6 @@ msgstr "Facendo ping a %s"
 msgid "Writing \"%s\" to %s"
 msgstr "Copiando `%s' a `%s'"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Nome do compoñente que se está rexistrando"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "Nome do f_icheiro:"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "Modificar o nome deste cartafol"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Rexistros de depuración"
@@ -9039,13 +8962,13 @@ msgstr "Rexistro de mensaxes:"
 msgid "Log Level"
 msgstr "Nivel de rexistro"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2686
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "Pechar esta xanela"
 
@@ -9069,32 +8992,21 @@ msgstr "Depuración"
 msgid "Error, Warnings and Debug messages"
 msgstr "Erros, avisos e mensaxes de depuración"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "Activado"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Indica se o engadido está activado"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "semanas"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "Produciuse un erro ao imprimir"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "O sistema de impresión informou dos seguintes detalles sobre o erro:"
 
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -9104,7 +9016,7 @@ msgstr ""
 msgid "Autogenerated"
 msgstr "Xerado automaticamente"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "Porque \"{1}\"."
 
@@ -9124,124 +9036,124 @@ msgstr "Quere sobrescribilo?"
 msgid "File exists \"{0}\"."
 msgstr "O ficheiro xa existe \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:133
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:170
 msgid "Could not open the link."
 msgstr "Non foi posíbel abrir a ligazón."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:220
 msgid "Could not display help for Evolution."
 msgstr "Non foi posíbel mostrar a axuda do Evolution."
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1304
 #, c-format
 msgid "GConf error: %s"
 msgstr "Erro do GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1315
 msgid "All further errors shown only on terminal."
 msgstr "Todos os erros posteriores mostraranse só no terminal."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "Cco"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Asunto"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1138
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reenviada --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:84
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:85
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Cara"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1302
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1361
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Non foi posíbel analizar a mensaxe S/MIME: erro descoñecido"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non foi posíbel analizar a mensaxe MIME. Mostrándoa como orixe."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado non compatíbel para multipart/encrypted"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message"
 msgstr "Non foi posíbel analizar a mensaxe PGP/MIME"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Non foi posíbel analizar a mensaxe PGP/MIME: erro descoñecido"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "O formato da sinatura non é compatíbel"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 msgid "Error verifying signature"
 msgstr "Produciuse un erro ao verificar a sinatura"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "Produciuse un erro descoñecido ao verificar a sinatura"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message"
 msgstr "Non foi posíbel analizar a mensaxe PGP"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Non foi posíbel analizar a mensaxe PGP: erro descoñecido"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -9249,7 +9161,7 @@ msgstr[0] "hai un segundo"
 msgstr[1] "hai %d segundos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -9257,7 +9169,7 @@ msgstr[0] "dentro de 1 segundo"
 msgstr[1] "dentro de %d segundos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -9265,7 +9177,7 @@ msgstr[0] "hai 1 minuto"
 msgstr[1] "hai %d minutos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -9273,7 +9185,7 @@ msgstr[0] "dentro de 1 minuto"
 msgstr[1] "dentro de %d minutos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -9281,7 +9193,7 @@ msgstr[0] "hai 1 hora"
 msgstr[1] "hai %d horas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -9289,7 +9201,7 @@ msgstr[0] "dentro de 1 hora"
 msgstr[1] "dentro de %d horas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -9297,7 +9209,7 @@ msgstr[0] "hai 1 día"
 msgstr[1] "hai %d días"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -9305,7 +9217,7 @@ msgstr[0] "dentro de 1 día"
 msgstr[1] "dentro de %d días"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -9313,7 +9225,7 @@ msgstr[0] "hai 1 semana"
 msgstr[1] "hai %d semanas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -9321,7 +9233,7 @@ msgstr[0] "dentro de 1 semana"
 msgstr[1] "dentro de %d semanas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -9329,7 +9241,7 @@ msgstr[0] "hai 1 mes"
 msgstr[1] "hai %d meses"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -9337,35 +9249,35 @@ msgstr[0] "dentro de 1 mes"
 msgstr[1] "dentro de %d meses"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "hai 1 ano"
 msgstr[1] "hai %d anos"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "dentro de 1 ano"
 msgstr[1] "dentro de %d anos"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<prema aquí para seleccionar unha data>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "agora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Seleccione unha hora coa que comparar"
 
@@ -9418,11 +9330,11 @@ msgid "I_nclude threads"
 msgstr "I_ncluír fíos"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Saínte"
 
@@ -9454,7 +9366,7 @@ msgstr "Falta a data."
 msgid "Missing file name."
 msgstr "Falta o nome do ficheiro."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "Falta o nome."
 
@@ -9536,7 +9448,7 @@ msgstr ""
 msgid "months"
 msgstr "Mes"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:180
 msgid "seconds"
 msgstr "segundos"
 
@@ -9552,44 +9464,28 @@ msgstr "o tempo que especificou"
 msgid "years"
 msgstr "Cabeceiras"
 
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
+#: ../widgets/misc/e-attachment-paned.c:123
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anexo"
 msgstr[1] "Anexos"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:586
+#: ../widgets/misc/e-attachment-paned.c:581
 msgid "Icon View"
 msgstr "Visualización en iconas"
 
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:587
+#: ../widgets/misc/e-attachment-paned.c:582
 msgid "List View"
 msgstr "Visualización de lista"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Enfocar o tracker"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "Modo de selección"
-
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "A infraestrutura da terminal de mail"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "Eliminada"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "Mensaxes reenviadas"
+#: ../mail/e-mail-browser.c:262
+msgid "(No Subject)"
+msgstr "(Sen asunto)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9636,7 +9532,7 @@ msgid "_Later"
 msgstr "_Máis tarde"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:476
 msgid "Add Label"
 msgstr "Engadir etiqueta"
 
@@ -9656,115 +9552,57 @@ msgstr ""
 msgid "Color"
 msgstr "Cor"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Nome"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2706
+#: ../modules/mail/e-mail-shell-view-private.c:953
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
 msgid "Drafts"
 msgstr "Borradores"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
 msgid "Outbox"
 msgstr "Caixa de saída"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
 msgid "Sent"
 msgstr "Enviado"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:572
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Importante"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "Tarefas pendentes"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Máis tarde"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "Migrando..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "Migración"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migrando '%s':"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Non é posíbel crear un cartafol novo: `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Non é posíbel copiar o cartafol `%s' en `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Non é posíbel examinar as caixas de correo existentes en `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:643
 msgid "Migrating Folders"
 msgstr "Migración de cartafoles"
 
-#: ../mail/e-mail-migrate.c:1824
-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 ""
-"A localización e a xerarquía dos cartafoles da caixa de correo modificouse "
-"desde Evolution 1.x.\n"
-"\n"
-"Agarde mentres o Evolution migra os seus cartafoles..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Non é posíbel abrir os datos antigos POP keep-on-server `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Non é posíbel crear o cartafol de datos POP3 keep-on-server `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Non é posíbel copiar os datos POP3 keep-on-server `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Produciuse un fallo ao crear o almacenamento de correo local `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:644
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9776,45 +9614,36 @@ msgstr ""
 "\n"
 "Sexa paciente mentres o Evolution migra os seus cartafoles..."
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:740
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Non é posíbel crear os cartafoles de correo local en `%s': %s"
-
-#: ../mail/e-mail-migrate.c:3049
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Non é posíbel ler a configuración da instalación anterior do Evolution: "
-"`evolution/config.xmldb' non existe ou está danado."
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "Non é posíbel crear os cartafoles de correo local en «%s»: %s"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:108
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "Non preguntar de novo."
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:260 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:260 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:634 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mover ao cartafol"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:634 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:864
+#: ../mail/e-mail-reader.c:860
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar mensaxe..."
@@ -9826,540 +9655,539 @@ msgstr[1] "Gardar mensaxe..."
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:881 ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaxe"
 msgstr[1] "Mensaxe"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1139
 msgid "A_dd Sender to Address Book"
 msgstr "_Engadir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1141
 msgid "Add sender to address book"
 msgstr "Engadir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1146
 msgid "Check for _Junk"
 msgstr "Verificar se hai correo non dese_xado"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1148
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de correo non desexado"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1153
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafol..."
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1155
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1160
 msgid "_Delete Message"
 msgstr "E_liminar mensaxe"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1162
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1167
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar por _lista de correo..."
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1169
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crear unha regra para filtrar mensaxes a esta lista de correo"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1174
 msgid "Filter on _Recipients..."
 msgstr "Filtrar por _destinatarios..."
 
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1176
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crear unha regra para filtrar mensaxes a estes destinatarios"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1181
 msgid "Filter on Se_nder..."
 msgstr "Filtrar por re_mitente..."
 
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1183
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crear unha regra para filtrar mensaxes deste remitente"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1188
 msgid "Filter on _Subject..."
 msgstr "Filtrar por a_sunto..."
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1190
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crear unha regra para filtrar mensaxes con este asunto"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1195
 msgid "A_pply Filters"
 msgstr "_Aplicar filtros"
 
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1197
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtraxe ás mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1202
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxe..."
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1204
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar texto no corpo da mensaxe mostrada"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1209
 msgid "_Clear Flag"
 msgstr "E_liminar marca"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1211
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Crear unha tarefa nova a partir da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1216
 msgid "_Flag Completed"
 msgstr "_Marcar como terminado"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1218
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Seleccionar todas as mensaxes do mesmo fío que a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1223
 msgid "Follow _Up..."
 msgstr "Seg_uimento..."
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1225
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para o seguimento"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1230
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1232 ../mail/e-mail-reader.c:1239
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reenviar a alguén a mensaxe seleccionada como un anexo"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1237
 msgid "Forward As _Attached"
 msgstr "_Remitir como iCalendar"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1244
 msgid "_Inline"
 msgstr "_En liña"
 
-#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1246 ../mail/e-mail-reader.c:1253
 msgid "Forward the selected message in the body of a new message"
 msgstr "Reenviar a mensaxe seleccionada no corpo dunha mensaxe nova"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1251
 msgid "Forward As _Inline"
 msgstr "Estilo de _reenvío:"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1258
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1260 ../mail/e-mail-reader.c:1267
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reenviar a mensaxe seleccionada citada como unha resposta"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1265
 msgid "Forward As _Quoted"
 msgstr "Estilo de _reenvío:"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1272
 msgid "_Load Images"
 msgstr "_Cargar imaxes"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1274
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga de imaxes no correo HTML"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1279
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1281
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensaxes seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1286
 msgid "_Junk"
 msgstr "_Correo non desexado"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1288
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensaxes seleccionadas como correo non desexado"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1293
 msgid "_Not Junk"
 msgstr "_Non é correo non desexado"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1295
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como non lixo"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1300
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1302
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como lidas"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1307
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1309
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas como non importantes"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1314
 msgid "_Unread"
 msgstr "_Non lida"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1316
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como non lidas"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1321
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe nova..."
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1323
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1328
 msgid "Compose _New Message"
 msgstr "Redactar unha mensaxe _nova"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1330
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha xanela para compor unha mensaxe de correo"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1335
 msgid "_Open in New Window"
 msgstr "_Abrir nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1337
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1342
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafol..."
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1344
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1349
 msgid "_Next Message"
 msgstr "_Seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1351
 msgid "Display the next message"
 msgstr "Mostrar a seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1356
 msgid "Next _Important Message"
 msgstr "Seguinte mensaxe _importante"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1358
 msgid "Display the next important message"
 msgstr "Mostrar a seguinte mensaxe importante"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1363
 msgid "Next _Thread"
 msgstr "Seguinte _fío"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1365
 msgid "Display the next thread"
 msgstr "Mostrar o seguinte fío"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1370
 msgid "Next _Unread Message"
 msgstr "Seguinte mensaxe _non lida"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1372
 msgid "Display the next unread message"
 msgstr "Mostrar a seguinte mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1377
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1379
 msgid "Display the previous message"
 msgstr "Mostrar a mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1384
 msgid "Pr_evious Important Message"
 msgstr "Ant_erior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1386
 msgid "Display the previous important message"
 msgstr "Mostrar a anterior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1391
 msgid "P_revious Unread Message"
 msgstr "Ante_rior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1393
 msgid "Display the previous unread message"
 msgstr "Mostrar a anterior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1400
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1407
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1412
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1414
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguén (rebotar) a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Responder a t_odos"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1421
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr ""
 "Redactar unha resposta para todos os destinatarios da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1426
 msgid "Reply to _List"
 msgstr "Responder á _lista"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1428
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Redactar unha resposta para a lista de correo da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1433
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1435
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Redactar unha resposta para o remitente da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1440
 msgid "_Save as mbox..."
 msgstr "Gardar como..."
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1442
 msgid "Save selected messages as an mbox file"
 msgstr "Gardar as mensaxes como un ficheiro de texto"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1447
 msgid "Search Folder from Mailing _List..."
 msgstr "Cartafol de busca por _lista de correo..."
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1449
 msgid "Create a search folder for this mailing list"
 msgstr "Crear un cartafol de busca para esta lista de correo"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1454
 msgid "Search Folder from Recipien_ts..."
 msgstr "Cartafol de busca por des_tinatarios..."
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1456
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1461
 msgid "Search Folder from Sen_der..."
 msgstr "Cartafol de busca por _remitente..."
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1463
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1468
 msgid "Search Folder from S_ubject..."
 msgstr "Cartafol de busca por as_unto..."
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1470
 msgid "Create a search folder for this subject"
 msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1475
 msgid "_Message Source"
 msgstr "Orixe da _mensaxe"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1477
 msgid "Show the raw email source of the message"
 msgstr "Mostrar o código fonte da mensaxe"
 
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1489
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1491
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1496
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1498
 msgid "Reset the text to its original size"
 msgstr "Restabelecer o texto ao seu tamaño orixinal"
 
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1503
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1505
 msgid "Increase the text size"
 msgstr "Aumentar o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1510
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1512
 msgid "Decrease the text size"
 msgstr "Diminuír o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1519
 msgid "Create R_ule"
 msgstr "Crear r_egra"
 
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1526
 msgid "Ch_aracter Encoding"
 msgstr "Codificación de car_acteres"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1533
 msgid "F_orward As"
 msgstr "Reen_viar como..."
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1540
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1547
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1554
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1561
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1586
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimento..."
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1594
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1598
 msgid "Mark as _Junk"
 msgstr "Marcar como correo _non desexado"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1602
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como correo non dese_xado"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1606
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1610
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como non im_portante"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1614
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/e-mail-reader.c:1654
+#: ../mail/e-mail-reader.c:1650
 msgid "_Caret Mode"
 msgstr "Activar _cursor"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:1652
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostrar un cursor intermitente no corpo das mensaxes mostradas"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1658
 msgid "All Message _Headers"
 msgstr "Todas as ca_beceiras da mensaxe"
 
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:1660
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrónico"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1882
 msgid "Unable to retrieve message"
 msgstr "Non foi posíbel obter a mensaxe"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1886 ../mail/e-mail-reader.c:1946
+#: ../mail/mail-ops.c:1843
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Recuperando a mensaxe %s"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2462 ../mail/mail-config.ui.h:30
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "Predefinido"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2583
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2584
 msgid "Forward the selected message to someone"
 msgstr "Reenviar a alguén a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2629 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2637
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2641 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "Responder"
 
@@ -10369,24 +10197,24 @@ msgstr "Marcar para facer seguimento"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:74
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Sen cifrado"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:128
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:99
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
@@ -10409,34 +10237,34 @@ msgstr ""
 "e marque a caixa de verificación para aceptalo\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ningún"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "Preguntar para cada mensaxe"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ningún"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "Configuración do correo"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10446,7 +10274,7 @@ msgstr ""
 "\n"
 "Prema en \"Adiante\" para comezar."
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2060
 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 "
@@ -10456,20 +10284,20 @@ msgstr ""
 "abaixo non necesitan encherse, a non ser que desexe incluír esta información "
 "no correo que envíe."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2227
+#: ../mail/mail-config.ui.h:92
 msgid "Receiving Email"
 msgstr "Recibindo correo"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "Configure as seguintes opcións de conta."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2705
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10478,11 +10306,11 @@ msgstr ""
 "seguro, pregunte ao seu administrador do sistema ou provedor de acceso a "
 "Internet."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "Xestión de contas"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2069
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10490,11 +10318,11 @@ msgstr ""
 "Introduza un nome descritivo para esta conta no espazo de abaixo.\n"
 "Este nome usarase só para os efectos de visualización."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "Feito"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10509,56 +10337,56 @@ msgstr ""
 "\n"
 "Prema en \"Aplicar\" para gardar a súa configuración."
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2514
 msgid "Check for _new messages every"
 msgstr "Verificar automaticamente se hai mensaxes _novas cada"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2522
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2892 ../mail/mail-config.ui.h:106
 msgid "Security"
 msgstr "Seguranza"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2937 ../mail/em-account-editor.c:3005
 msgid "Receiving Options"
 msgstr "Opcións de recepción"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2938 ../mail/em-account-editor.c:3006
 msgid "Checking for New Messages"
 msgstr "Comprobando se hai mensaxes novas"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3474
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3474
 msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1570
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "A súa mensaxe a %s sobre \"%s\" o %s foi lida."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1618
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Notificación de envío para: \"%s\""
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1947
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1997
+#: ../mail/em-composer-utils.c:1994
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10566,19 +10394,19 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} ás ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2138
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2319
 msgid "Posting destination"
 msgstr "Destino onde publicar"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2320
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
@@ -10659,6 +10487,10 @@ msgstr "Seguimento"
 msgid "Forward to"
 msgstr "Reenviar a"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Importante"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "é posterior a"
@@ -10683,7 +10515,7 @@ msgstr "non está definida"
 msgid "is set"
 msgstr "está definida"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "Correo non desexado"
 
@@ -10732,7 +10564,7 @@ msgid "Play Sound"
 msgstr "Reproducir son"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "Ler"
 
@@ -10813,16 +10645,16 @@ msgid "Unset Status"
 msgstr "Desfacer a definición de estado"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "Entón"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "Engadir a_cción"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensaxes non lidas:"
@@ -10830,24 +10662,24 @@ msgstr[1] "Mensaxes non lidas:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Mensaxes totais:"
 msgstr[1] "Mensaxes totais:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Cuota de uso (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "Cuota de uso"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "Propiedades do cartafol"
 
@@ -10855,37 +10687,37 @@ msgstr "Propiedades do cartafol"
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "_Nome do cartafol:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1070 ../mail/mail-vfolder.c:1135
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "SEN EQUIVALENCIA"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1086
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:183
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:596
 msgid "Folder names cannot contain '/'"
 msgstr "Os nomes dos cartafoles non poden conter o carácter '/'"
 
@@ -10907,74 +10739,74 @@ msgstr "Os nomes dos cartafoles non poden conter o carácter '/'"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1078
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1286
 msgid "Mail Folder Tree"
 msgstr "�rbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1583 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1585 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando cartafol %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1592 ../mail/message-list.c:2106
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1594 ../mail/message-list.c:2108
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1609
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non é posíbel soltar as mensaxes no almacenamento do nivel superior"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Move Folder To"
 msgstr "_Mover o cartafol a..."
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Copy Folder To"
 msgstr "_Copiar cartafol a..."
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:509
+#: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "Creando o cartafol `%s'"
+msgid "Creating folder '%s'"
+msgstr "Creando o cartafol «%s»"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:672
 msgid "Create Folder"
 msgstr "Crear cartafol"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:673
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde crear o cartafol:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:693
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Eliminando a subscrición do cartafol \"%s\""
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10982,11 +10814,11 @@ msgstr ""
 "Esta mensaxe non está asinada. Non hai garantía de que a mensaxe sexa "
 "auténtica."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "Sinatura válida"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10994,11 +10826,11 @@ msgstr ""
 "Esta mensaxe está asinada e é válida, o que significa que é moi probábel que "
 "a mensaxe sexa auténtica."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "Sinatura non válida"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11006,11 +10838,11 @@ msgstr ""
 "A sinatura desta mensaxe non se pode verificar, puido ser alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
 msgid "Valid signature, but cannot verify sender"
 msgstr "A sinatura é válida, mais non se pode verificar o remitente"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11018,11 +10850,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura válida, mais non foi posíbel "
 "verificar o remitente da mensaxe."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
 msgid "Signature exists, but need public key"
 msgstr "A sinatura existe, mais precisa unha chave pública"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -11030,11 +10862,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura, mais non existe unha chave pública "
 "correspondente."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
 msgid "Unencrypted"
 msgstr "Non cifrada"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11042,11 +10874,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:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "Cifrada; débil"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -11056,11 +10888,11 @@ msgstr ""
 "difícil, mais non imposíbel para un intruso ver o contido desta mensaxe "
 "dentro dun período de tempo útil."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "Cifrada"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11068,11 +10900,11 @@ msgstr ""
 "Esta mensaxe está cifrada. Sería difícil para un intruso ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "Cifrada; forte"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -11081,15 +10913,15 @@ msgstr ""
 "Esta mensaxe está cifrada cun algoritmo de cifrado forte. Sería moi difícil "
 "para un intruso ver o contido desta mensaxe dentro dun período de tempo útil."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "_Ver o certificado"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Este certificado non é visíbel"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -11098,28 +10930,28 @@ msgstr ""
 "procesamento demora demasiado. Pode visualizalo sen formato ou ben cun "
 "editor de texto externo."
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:726
 msgid "Completed on"
 msgstr "Terminado o"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:734
 msgid "Overdue:"
 msgstr "Atrasada:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:738
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
 msgid "View _Unformatted"
 msgstr "Ver sen _formato"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:950
 msgid "Hide _Unformatted"
 msgstr "Ocultar sen _formato"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1012
 msgid "O_pen With"
 msgstr "A_brir con"
 
@@ -11128,18 +10960,18 @@ msgstr "A_brir con"
 msgid "Page %d of %d"
 msgstr "Páxina %d de %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:147
 msgid "Formatting message"
 msgstr "Formatando a mensaxe"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:338
 msgid "Formatting Message..."
 msgstr "Formatando a mensaxe..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "Recuperando `%s'"
+msgid "Retrieving '%s'"
+msgstr "Obtendo «%s»"
 
 #: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
@@ -11176,40 +11008,53 @@ msgstr "Punteiro aos datos externos descoñecidos (tipo \"%s\")"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#.
-#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2600
 #, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "Esta mensaxe foi enviada por <b>%s</b> no nome de <b>%s</b>"
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Esta mensaxe foi enviada por %s no nome de %s"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:668
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Este almacenamento non é compatíbel con subscricións, ou non están activadas."
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:719
 msgid "Subscribed"
 msgstr "Subscrito"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:723
 msgid "Folder"
 msgstr "Cartafol"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1111
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1157
 msgid "No server has been selected"
 msgstr "Non se seleccionou un servidor"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "Está seguro de que quere abrir %d mensaxe ao mesmo tempo?"
+msgstr[1] "Está seguro de que quere abrir %d mensaxes ao mesmo tempo?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "_Do not show this message again"
+msgstr "_Non mostrar esta mensaxe outra vez"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:853
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
@@ -11218,7 +11063,7 @@ msgstr "Mensaxes de %s"
 msgid "Search _Folders"
 msgstr "Carta_foles de busca"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:521
 msgid "Add Folder"
 msgstr "Cartafol"
 
@@ -11259,50 +11104,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Largura da xanela \"Enviar e recibir correo\""
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Permite que o Evolution mostre unha parte de texto de tamaño limitado"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Requirir sempre confirmación de lectura"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "Recoñecemento automático de emoticonas"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "Recoñecemento automático da ligazón"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Verificar se o correo entrante é correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Cor de realce de citas"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Cor de realce de citas."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Altura predefinida da xanela do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Largura predefinida da xanela do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "Cartafol para cargar/anexar do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 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.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11310,7 +11151,7 @@ msgstr ""
 "Comprime a visualización de enderezos en A/CC/CCO co número especificado en "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11318,13 +11159,13 @@ msgstr ""
 "Controla a frecuencia coa que se sincronizan os cambios locais co servidor "
 "de correo remoto. O intervalo debe ser de polo menos 30 segundos."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr ""
 "As cabeceiras personalizadas para usar mentres se verifica o correo non "
 "desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11332,63 +11173,63 @@ msgstr ""
 "As cabeceiras personalizadas para usar mentres se verifica o correo non "
 "desexado. A lista de elementos son cadeas no formato \"headername=value\"."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Conxunto de caracteres predefinido para escribir mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Conxunto de caracteres predefinido para escribir mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Conxunto de caracteres predefinido para mostrar mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Conxunto de caracteres predefinido para mostrar mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Estilo de reenvío predefinido"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Altura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Altura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Altura predefinida do diálogo de subscrición."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "Largura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Estilo de resposta predefinido"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Valor predefinido para o estado expandido do fío"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Largura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Largura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Largura predefinida do diálogo de subscrición."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11396,12 +11237,12 @@ msgstr ""
 "Determina se hai que buscar correo non desexado nos enderezos filtrando só "
 "as axendas de enderezos locais"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina se hai que buscar enderezos de remitentes nas axendas de enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11414,13 +11255,13 @@ msgstr ""
 "axendas de enderezos remotas (LDAP, por exemplo) están marcadas para o "
 "completado automático."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina se se deben usar cabeceiras personalizadas para comprobar o correo "
 "non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11430,7 +11271,7 @@ msgstr ""
 "non desexado. Se esta opción está activada e se mencionan as cabeceiras, "
 "mellorarase a velocidade de comprobación do correo non desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11438,20 +11279,24 @@ msgstr ""
 "Determina se se debe usar o mesmo tipo de letra para as liñas De e Asunto na "
 "columna Mensaxes da visualización vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "Cartafol onde cargar/anexar os ficheiros no editor."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "Cartafol onde gardar os ficheiros enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Desactivar ou activar a elisión (...) dos nomes de cartafoles na barra "
 "lateral"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "Só mostrar as mensaxes de texto que non excedan certo tamaño"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "Non foi posíbel gardar o ficheiro de sinatura."
@@ -11528,15 +11373,18 @@ msgstr ""
 "previsualización da mensaxe, na lista de mensaxes e nos cartafoles."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
 msgstr ""
-"Active isto para renderizar a parte da mensaxe de texto de tamaño limitado."
+"Activar a mostra de só as mensaxes que non excedan o tamaño definido pola "
+"chave 'message_text_part_limit'."
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo de cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:47
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar os nomes de ficheiro como o Outlook ou o Gmail"
 
@@ -11682,11 +11530,11 @@ msgstr ""
 "dos resultados da busca."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
 msgstr "Última vez que se baleirou o correo non desexado"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
 msgstr "Última vez que se baleirou o lixo"
 
 #: ../mail/evolution-mail.schemas.in.h:85
@@ -11801,65 +11649,69 @@ msgstr "Marcar as citas textuais na \"Previsualización\" da mensaxe"
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar as citas textuais na \"Previsualización\" da mensaxe."
 
-# (pofilter) gconf: do not translate gconf attribute: "source"
 #: ../mail/evolution-mail.schemas.in.h:109
+msgid "Message text limit for display"
+msgstr "Límite do texto do mensaxe para mostralo"
+
+# (pofilter) gconf: do not translate gconf attribute: "source"
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualización da mensaxe (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Número mínimo de días antes do baleirado do correo non desexado ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Número mínimo de días antes do baleirado do lixo ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Tempo mínimo antes do baleirado do correo non desexado ao saír, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo mínimo antes do baleirado do lixo ao saír, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Número de enderezos para mostrar en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "Preguntar cando o asunto está baleiro"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 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.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 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 asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "Preguntar cando se eliminen mensaxes nun cartafol de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "Preguntar cando o usuario compacta"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cando o usuario só encha o campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 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 ao mesmo tempo"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11867,65 +11719,65 @@ msgstr ""
 "Preguntar ao enviar mensaxes en HTML a destinatarios que non desexen "
 "recibilas."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 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.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cando o usuario tente enviar un HTML non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cando se marquen varias mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr "Poñer sinaturas personalizadas no inicio das respostas"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "Poñer o cursor ao fondo da resposta"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Recoñecer emoticonas no texto e substituílas con imaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "Recoñecer ligazóns no texto e substituílas."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "Realizar a proba de correo non desexado no correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "Cartafol onde gardar"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "Buscar a fotografía do remitente nas axendas locais de enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisión"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "Enviar correo en HTML por omisión."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "Columna cos enderezos dos remitentes na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronización do servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11933,67 +11785,67 @@ msgstr ""
 "Estabelézao a TRUE no caso de que queira engadir o delimitador de sinatura "
 "antes da súa sinatura ao escribir un correo electrónico."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Mostrar o campo \"Bcc\" ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Mostrar o campo \"Cc\" ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Mostrar o campo \"De\" ao enviar a unha rolda de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"From\" field when sending a mail message"
 msgstr "Mostrar o campo \"De\" ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Mostrar o campo \"Respostar a\" ao enviar a unha rolda de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Mostrar o campo \"Respostar a\" ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "Mostrar animacións"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show all message headers"
 msgstr "Contraer todos os fíos de mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show all the headers when viewing a messages."
 msgstr "Mostrar o campo \"Respostar a\" ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "Mostrar as imaxes animadas como animacións."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar as mensaxes eliminadas (riscadas) na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show image animations"
 msgstr "Mostrar as animacións de imaxe "
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar o valor da cabeceira \"Date\" orixinal"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "Mostrar a foto do remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12001,7 +11853,7 @@ msgstr ""
 "Mostrar o campo \"Bcc\" ao enviar unha mensaxe de correo. Isto pódese "
 "configurar desde o menú Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12009,7 +11861,7 @@ msgstr ""
 "Mostrar o campo \"Cc\" ao enviar unha mensaxe de correo. Isto pódese "
 "configurar desde o menú Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -12017,7 +11869,7 @@ msgstr ""
 "Mostrar o campo \"De\" ao enviar a unha rolda de correo. Isto pódese "
 "configurar desde o menú Ver cando se selecciona unha conta de novas."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12025,7 +11877,7 @@ msgstr ""
 "Mostrar o campo \"De\" ao enviar unha mensaxe de correo. Isto pódese "
 "configurar desde o menú Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -12033,7 +11885,7 @@ msgstr ""
 "Mostrar o campo \"Respostar a\" ao enviar a unha rolda de correo. Isto "
 "pódese configurar desde o menú VEr cando se selecciona unha conta de novas."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -12041,14 +11893,14 @@ msgstr ""
 "Mostrar o campo \"Respostar a\" ao enviar unha mensaxe de correo. Isto "
 "pódese configurar desde o menú Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Mostrar o enderezo do remitente nunha columna á parte na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -12058,50 +11910,51 @@ msgstr ""
 "distinto). Doutro xeito móstrase o valor de cabeceira \"Data no formato "
 "predefinido polo usuario e o fuso de hora local."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar a foto do remitente no panel de lectura da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "Verificación ortográfica en liña"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "Cor da verificación ortográfica"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "Idiomas da verificación ortográfica"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "Altura predefinida do diálogo de subscrición"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "Largura predefinida do diálogo de subscrición"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "Límite da parte de texto da mensaxe"
-
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "O engadido predefinido para a asociación de correo non desexado"
 
 #: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
-"A última vez que se baleirou o correo non desexado, en días desde a época."
+"A última vez que se baleirou o correo non desexado, en días desde o 1 de "
+"xaneiro de 1970 (Epoch)."
 
 #: ../mail/evolution-mail.schemas.in.h:171
-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."
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"A última vez que se baleirou o Lixo, en días desde o 1 de xaneiro de 1970 "
+"(Epoch)."
 
 #: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
@@ -12133,11 +11986,13 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
-"Isto decide o tamaño máximo da parte de texto que pode ser formatada no "
-"Evolution. O predefinido é 4MB/4096 KB e está especificado en termos de KB."
+"Isto decide o tamaño máximo da parte de texto que se pode formatar no "
+"Evolution, está especificado en termos de KB. O predefinido é 4096 (4MB). "
+"Este valor úsase só cando a chave 'force_message_limit' está activada."
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
@@ -12315,532 +12170,590 @@ msgstr "Largura do panel de lista de mensaxes"
 msgid "Width of the message-list pane."
 msgstr "Largura do panel de lista de mensaxes."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Importando datos Elm"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "Correo"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
 msgstr "Importador do Elm do Evolution"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
 msgstr "Importar correo desde o Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "Cartafol de destino:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+msgid "_Destination folder:"
+msgstr "Cartafol de _destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder to import into"
 msgstr "Seleccionar un cartafol para o que importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Asunto"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
+msgctxt "mboxImp"
+msgid "From"
+msgstr "De"
+
+#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de correo Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:413
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Importando caixa de correo"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:149
+#: ../plugins/pst-import/pst-importer.c:453
+#: ../plugins/pst-import/pst-importer.c:559
 #, c-format
-msgid "Importing `%s'"
-msgstr "Importando `%s'"
+msgid "Importing '%s'"
+msgstr "Importando «%s»"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:293
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:419
 msgid "Evolution Pine importer"
 msgstr "Importador do Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:420
 msgid "Import mail from Pine."
 msgstr "Importar correo do Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Enviar a %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto é %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Engadir unha regra de filtraxe"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(Nota: é preciso reiniciar o aplicativo)"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"Actualizouse a regra do filtro «%s» porque o cartafol %s foi eliminado."
+msgstr[1] ""
+"Actualizáronse as seguintes regras de filtro %s xa que o cartafol «%s»\n"
+"foi eliminado."
 
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>Opción para responder por encima</b> (Non se recomenda)"
+msgid "(Not Recommended)"
+msgstr "(Non recomendado)"
 
 #: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(Nota: é preciso reiniciar o aplicativo)"
+
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "Sen información"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "Engadir sinatura _nova..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Asinar sem_pre as mensaxes saíntes cando se use esta conta"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Ci_frar tamén para un mesmo ao enviar correo cifrado"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar sempre _copia de carbón (Cc) a:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre copia de carbón _oculta (Cco) a:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Confia_r sempre nas chaves do meu anel de chaves ao cifrar"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Cifrar sempre para un _mesmo ao enviar correo cifrado"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "Requirir sempre confirmación de lec_tura"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "Inserir imaxes de _emoticonas automaticamente"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "Conxunto de ca_racteres:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "_Verificar os tipos compatíbeis"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr ""
 "Verificar as cabeceiras personalizada_s para detectar correo non desexado"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
 msgstr "Verificar as _mensaxes entrantes para detectar correo non desexado"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "Verificar a orto_grafía mentres se escribe"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Verifica se o correo entrante é correo non desexado"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "Limp_ar"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "Limpa_r"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "Cor para as palabras escritas _incorrectamente:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "Escribir unha mensaxe"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Configuración"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar a_o compactar un cartafol"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:31
 msgid "Default Behavior"
 msgstr "Prioridade predefinida:"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:32
 msgid "Default character e_ncoding:"
 msgstr "Codificació_n de caracteres predefinida:"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:34
 msgid "Delete Mail"
 msgstr "Eliminar"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar os correos non desexados ao saí_r"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:37
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Asinar dixitalmente as mensaxes saínt_es (por omisión)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "Todas as ca_beceiras da mensaxe"
+#: ../mail/mail-config.ui.h:38
+msgid "Displayed Message Headers"
+msgstr "Cabeceiras mostradas do mensaxe"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "Non formatar as mensaxes cando o ta_maño do texto excede"
+#: ../mail/mail-config.ui.h:39
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "Non mostrar mensaxes se o tama_ño do texto excede"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:40
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "Non ma_rcar as mensaxes como correo non desexado se o remitente está na miña "
 "axenda de enderezos"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "Non eliminar"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "Carta_fol de borradores:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "_Enderezo de correo:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "Baleirar os cartafoles de lixo ao _saír"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Magic S_pacebar"
 msgstr "Activar a barra de espa_zos máxica"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Sea_rch Folders"
 msgstr "Activar cartafoles de _busca"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:48
 msgid "Encry_ption certificate:"
 msgstr "Certificado de ci_frado:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
 msgid "Encrypt out_going messages (by default)"
 msgstr "Cifrar as mensaxes saín_tes (por omisión)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
 msgid "Fi_xed-width:"
 msgstr "Largura fi_xa:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:51
 msgid "Fix_ed width Font:"
 msgstr "Tipo de letra de largura f_ixa:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:52
 msgid "Font Properties"
 msgstr "Propiedades do tipo de letra"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:53
 msgid "Format messages in _HTML"
 msgstr "Formato das mensaxes en _HTML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:54
 msgid "Full Nam_e:"
 msgstr "Nom_e completo:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:56
 msgid "HTML Messages"
 msgstr "Mensaxes HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:57
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "Cabeceiras"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "Realzar as _citas con"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "En liña"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "En liña (estilo Outlook)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:64
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:65 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:66
 msgid "Languages Table"
 msgstr "Táboa de idiomas"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:67
 msgid "Loading Images"
 msgstr "_Cargar imaxes"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:68
 msgid "Mail Headers Table"
 msgstr "Táboa de cabeceiras de correo"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:69
 msgid "Mailbox location"
 msgstr "Localización da caixa de correo"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:70
 msgid "Message Display"
 msgstr "Mensaxes"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:71
 msgid "Message Fonts"
 msgstr "A mensaxe contén"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:72
 msgid "Message Receipts"
 msgstr "Retirada de mensaxe"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:73
 msgid "No _Proxy for:"
 msgstr "Sen pro_xy para:"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:75
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Nota: non se lle pedirá un contrasinal até que se conecte por primeira vez"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:76
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Ignórase a opción se se encontra unha coincidencia para as cabeceiras "
 "personalizadas de correo non desexado."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:77
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Datos persoais"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:79
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da _Chave PGP/GPG:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
 msgid "Pass_word:"
 msgstr "Con_trasinal:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preg_untar cando se envíen mensaxes só con destinatarios Cco definidos"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:85
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "<span weight=\"bold\">Privacidade bastante boa (PGP/GPG)</span>"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:87
 msgid "Printed Fonts"
 msgstr "Imprimir notas"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:88
 msgid "Proxy Settings"
 msgstr "Configuración de correo non desexado"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:89
 msgid "Quoted"
 msgstr "_Citada"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:90
 msgid "Re_member password"
 msgstr "Le_mbrar contrasinal"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:91
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:93
 msgid "Remember _password"
 msgstr "Lembrar _contrasinal"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94
 msgid "Required Information"
 msgstr "Información do servidor"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:96
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:97
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:98
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:100
 msgid "SSL is not supported in this build of Evolution"
-msgstr "<b>SSL non é compatíbel con esta versión do Evolution</b>"
+msgstr "SSL non é compatíbel con esta versión do Evolution"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:101
 msgid "S_earch for sender photograph only in local address books"
 msgstr "B_uscar o remitente da fotografía só nas axendas de enderezos locais"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:102
 msgid "S_elect..."
 msgstr "S_eleccionar..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:103
 msgid "S_end message receipts:"
 msgstr "En_viar confirmacións de mensaxes:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:104
 msgid "S_tandard Font:"
 msgstr "Tipo de letra es_tándar:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:107
 msgid "Select Drafts Folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:108
 msgid "Select HTML fixed width font"
 msgstr "Seleccione o tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:109
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleccione o tipo de letra de largura fixa en HTML para imprimir"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:110
 msgid "Select HTML variable width font"
 msgstr "Seleccione o tipo de letra de largura variábel en HTML"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:111
 msgid "Select HTML variable width font for printing"
 msgstr "Seleccione o tipo de letra de largura variábel en HTML para imprimir"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:112
 msgid "Select Sent Folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:113
 msgid "Sender Photograph"
 msgstr "<b>Fotografía do remitente</b>"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:114
 msgid "Sending Mail"
 msgstr "Enviando correo"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol de _mensaxes enviadas:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:116
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes enviadas"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:117
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor require autenticación"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:118
 msgid "Server Configuration"
 msgstr "Información do servidor"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:119
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:120
+msgid "Si_gning algorithm:"
+msgstr "Algoritmo de si_natura:"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "Certificado de si_natura:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "Sinat_ura:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:125
+msgid "Signing _algorithm:"
+msgstr "_Algoritmo de sinatura:"
+
+#: ../mail/mail-config.ui.h:126
 msgid "Spell Checking"
 msgstr "Verificación ortográfica"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:127
 msgid "Start _typing at the bottom on replying"
 msgstr "Comezar a escri_bir ao final da resposta"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:129
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:130
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12848,7 +12761,7 @@ msgstr ""
 "Esta lista de idiomas reflicte unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:131
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12857,7 +12770,12 @@ msgstr ""
 "A saída deste script usarase como a súa\n"
 "sinatura. O nome que especifique usarase só para os efectos de visualización."
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:135
+msgid "Top Posting Option"
+msgstr "Opción de publicar por enriba"
+
+#: ../mail/mail-config.ui.h:136
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12865,183 +12783,185 @@ msgstr ""
 "Teclee o nome polo que quere identificar a esta conta.\n"
 "Por exemplo: \"Traballo\" ou \"Persoal\""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:138
 msgid "Us_ername:"
 msgstr "Nome de _usuario:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:139
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:140 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "_Nome de usuario:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:141
 msgid "V_ariable-width:"
 msgstr "Largura v_ariábel:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "_Engadir sinatura"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "Cargar _sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticación"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:145
 msgid "_Default junk plugin:"
 msgstr "engadido por _omisión de correo non desexado:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "Conexión _directa a Internet"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:147
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Non asinar as peticións de cita (para a compatibilidade co Outlook)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:148
 msgid "_Forward style:"
 msgstr "Estilo de _reenvío:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Manter a sinatura sobre a mensaxe orixinal ao responder"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "Idioma"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images in messages from contacts"
 msgstr "Ca_rgar as imaxes nas mensaxes dos contactos"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "_Buscar só nas axendas de enderezos locais"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "_Facer desta a miña conta predefinida"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "Configuración _manual do proxy:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:155
 msgid "_Mark messages as read after"
 msgstr "_Marcar as mensaxes como lidas despois de"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:157
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:158
 msgid "_Path:"
 msgstr "_Camiño:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Preguntar ao enviar correo HTML aos contactos que non o queren"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:160
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Preguntar cando se envíen mensaxes cun asunto baleiro"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:161
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:162
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:163
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Servidor:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:167
 msgid "_Show image animations"
 msgstr "_Mostrar animacións de imaxes"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:168
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar a fotografía do remitente na previsualización da mensaxe"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:170
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Reducir as cabeceiras Para/Cc/Cco como "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:171
 msgid "_Use Secure Connection:"
 msgstr "_Usar unha conexión segura:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:172
 msgid "_Use system defaults"
 msgstr "_Usar as configuracións predefinidas do sistema"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:173
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que noutros aplicativos"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "am"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:176
 msgid "addresses"
 msgstr "enderezos"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:177 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "por"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:178
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:179
 msgid "description"
 msgstr "descrición"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Todos os cartafoles remotos activados"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "Todos os cartafoles locais e remotos activados"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "Todos os cartafoles locais"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Chamar"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "Ter_minado"
 
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Collapse _all"
+msgstr "Contraer _todas"
+
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Editar a sinatura"
@@ -13051,58 +12971,66 @@ msgid "Do Not Forward"
 msgstr "Non reenviar"
 
 #: ../mail/mail-dialogs.ui.h:9
+msgid "E_xpand all"
+msgstr "E_xpandir todas"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "Subscricións de cartafoles"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "Seguimento"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "Para a súa información"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "Acordo de licenza"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "Non é necesaria unha resposta"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "Revisar"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr "Só _mostrar elementos que conteñan:"
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr "Orixe do cartafol de busca"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "Información de seguranza"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "Cartafoles específicos"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13110,170 +13038,170 @@ msgstr ""
 "As mensaxes que seleccionou para o seguimento lístanse abaixo.\n"
 "Seleccione unha acción de seguimento desde o menú \"Marcar\"."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "_Aceptar a licenza"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "_Vence o:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "Ma_rque isto para aceptar o acordo de licenza"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:754
 #, c-format
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Filtrando as mensaxes seleccionadas"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "Recibindo correo"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:576
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Produciuse un fallo ao aplicar os filtros ao correo saínte: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:588 ../mail/mail-ops.c:616
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "Produciuse un fallo ao anexar a %s: %s\n"
-"anexando ao cartafol local `Enviados' no seu lugar."
+"No seu lugar anexaranse ao cartafol local «Enviados»."
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:633
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Produciuse un fallo ao anexar ao cartafol local `Enviados': %s"
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Produciuse un fallo ao anexar ao cartafol local «Enviados»: %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:744 ../mail/mail-ops.c:825
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:754
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:781
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Produciuse un fallo ao enviar %d de %d mensaxes"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:783 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:785 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "Terminado."
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:897
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Gardando a mensaxe no cartafol %s"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:974
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Movendo as mensaxes a %s"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:974
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando as mensaxes a %s"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1083
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1191
 msgid "Forwarded messages"
 msgstr "Mensaxes reenviadas"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1232
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Abrindo cartafol %s"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1298
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Obtendo a información de cuota do cartafol %s"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1370
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Abrindo almacenamento %s"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1441
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Eliminando o cartafol %s"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1561
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Almacenando o cartafol '%s'"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1624
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando e almacenando a conta '%s'"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1625
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando a conta '%s'"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1679
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando o cartafol %s"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1719
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Compactando o cartafol %s"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1764
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo en '%s'"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1765
 msgid "Local Folders"
 msgstr "Cartafoles locais"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1961
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Recuperando %d mensaxe"
 msgstr[1] "Recuperando %d mensaxes"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2050
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Gardando %d mensaxe"
 msgstr[1] "Gardando %d mensaxes"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2131
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13282,11 +13210,11 @@ msgstr ""
 "Produciuse un erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2203
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2221 ../mail/mail-ops.c:2229
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13295,35 +13223,35 @@ msgstr ""
 "Non é posíbel crear o ficheiro de saída: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2244
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non é posíbel escribir os datos: %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2389
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2389
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Conectando novamente con %s"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2485
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando a conta '%s' para o modo sen conexión"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2571
 msgid "Checking Service"
 msgstr "Verificando o servizo"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "Cancelando..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir correo"
 
@@ -13331,111 +13259,143 @@ msgstr "Enviar e recibir correo"
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "En espera..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando o correo novo"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:208
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduza a frase de paso para %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:210
 msgid "Enter Passphrase"
 msgstr "Introduza a frase de paso"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:213
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o contrasinal para %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:215
 msgid "Enter Password"
 msgstr "Introduza o contrasinal"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:257
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:667
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "Non se proporcionou ningún enderezo de destino; foi cancelado o reenvío da "
 "mensaxe."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:673
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "Non se encontrou ningunha conta para usar; foi cancelado o reenvío da "
 "mensaxe."
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:119
 #, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "Non foi posíbel crear o cartafol spool `%s': %s"
+msgid "Could not create spool directory '%s': %s"
+msgstr "Non foi posíbel crear o cartafol spool «%s»: %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:149
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr ""
-"Tentando facer un movemail dunha orixe que non é unha caixa de correo `%s'"
+"Tentando mover o correo desde unha orixe que non é unha caixa de correo «%s»"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "Mensaxe reenviada"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:297
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "Cartafol non válido: `%s'"
+msgid "Invalid folder: '%s'"
+msgstr "Cartafol non válido: «%s»"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Configurando o cartafol de busca: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:228
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Actualizando os cartafoles de busca para '%s: %s'"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Actualizando os cartafoles de busca para '%s'"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:678
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"Actualizouse o cartafol de busca «%s» porque o cartafol «%s» foi eliminado."
+msgstr[1] ""
+"Actualizáronse os seguintes cartafoles de busca «%s» porque o cartafol\n"
+"«%s» foi eliminado."
+
+#: ../mail/mail-vfolder.c:1188
 msgid "Edit Search Folder"
 msgstr "Editar cartafol de busca"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1293
 msgid "New Search Folder"
 msgstr "Cartafol de busca novo"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "Produciuse un fallo na comprobación de correo lixo"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "Produciuse un fallo ao informar de que é correo non desexado"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "Produciuse un fallo ao informar de que non é non desexado"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Xa existe un cartafol co nome \"{0}\". Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Xa existe un cartafol co nome \"{1}\". Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13447,7 +13407,7 @@ msgstr ""
 "Pode escoller entre ignorar este cartafol, sobrescribir ou anexar os seus "
 "contidos ou saír."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13455,13 +13415,13 @@ msgstr ""
 "Foi solicitada unha confirmación de lectura para \"{1}\". Quérelle enviar a "
 "confirmación de lectura a {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr "Xa existe unha sinatura co nome \"{0}\". Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13469,26 +13429,22 @@ msgstr ""
 "Engadir unha liña de asunto significativa ás mensaxes dará aos seus "
 "destinatarios unha idea sobre o contido do correo."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Está seguro de que quere eliminar esta conta e todos os seus proxies?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "Está seguro de que quere eliminar esta conta?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Está seguro de que quere desactivar esta conta e eliminar todos os seus "
 "proxies?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Está seguro de que quere abrir {0} mensaxes ao mesmo tempo?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13496,7 +13452,7 @@ msgstr ""
 "Está seguro de que quere eliminar permanentemente todas as mensaxes "
 "eliminadas en todos os cartafoles?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13504,87 +13460,79 @@ msgstr ""
 "Está seguro de que quere eliminar permanentemente todas as mensaxes "
 "eliminadas do cartafol \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Está seguro de que quere enviar unha mensaxe en formato HTML?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Está seguro de que quere enviar unha mensaxe só con destinatarios Cco?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Está seguro de que quere enviar unha mensaxe só con destinatarios Cco?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Está seguro de que quere enviar unha mensaxe só con destinatarios Cco?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Está seguro de que quere enviar unha mensaxe sen un asunto?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "Por causa de \"{0}\"."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "Por causa de \"{2}\"."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Sinatura en branco"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Non é posíbel engadir o Cartafol de busca \"{0}\"."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Non é posíbel copiar o cartafol \"{0}\" en \"{1}\"."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "Non é posíbel crear o cartafol \"{0}\"."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "Non é posíbel crear o cartafol de gardado temporal."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Non é posíbel crear o cartafol de gardado porque \"{1}\""
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Non é posíbel eliminar o cartafol \"{0}\"."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Non é posíbel eliminar o cartafol de sistema \"{0}\"."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Non é posíbel editar o Cartafol de busca \"{0}\" porque non existe."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Non é posíbel mover o cartafol \"{0}\" a \"{1}\"."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
-msgstr "Non é posíbel abrir a orixe \"{1}\""
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "Non é posíbel abrir a orixe «{1}»"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "Non é posíbel abrir a orixe \"{2}\"."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "Non é posíbel abrir o destino \"{2}\"."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13593,35 +13541,31 @@ msgstr ""
 "instalación. Non será capaz de usar este provedor até que acepte a súa "
 "licenza."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Non é posíbel renomear \"{0}\" como \"{1}\"."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Non é posíbel renomear ou mover o cartafol de sistema \"{0}\"."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "Non é posíbel gardar as modificacións na conta."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Non é posíbel gardar no cartafol \"{0}\"."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "Non é posíbel gardar no ficheiro \"{0}\"."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Non é posíbel estabelecer o script de sinatura \"{0}\"."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Produciuse un fallo na verificación de correo non desexado"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13630,27 +13574,27 @@ msgstr ""
 "moitos contrasinais diferencian maiúsculas de minúsculas, a súa tecla Bloq "
 "Maiús pode estar activada."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Non foi posíbel gardar o ficheiro de sinatura."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Quere eliminar as mensaxes no Cartafol de busca \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Do not d_elete"
 msgstr "Non _eliminar"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "Non eliminar"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "Non desactivar"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13658,60 +13602,63 @@ msgstr ""
 "Quere sincronizar localmente os cartafoles que están marcados para o uso sen "
 "conexión?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "Quere marcar todas as mensaxes como lidas?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Quere gardar as modificacións?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Introduza o contrasinal."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Produciuse un erro ao cargar as definicións dos filtros."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Produciuse un erro ao efectuar a operación."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "Produciuse un erro ao {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "O ficheiro existe mais non é posíbel sobrescribilo."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "O ficheiro existe mais non é un ficheiro normal."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Se continúa non poderá recuperar estas mensaxes."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
-"Se elimina o cartafol eliminarase permanentemente todo o seu contido e o dos "
-"seus subcartafoles."
+"Se elimina o cartafol todo o seu contido e o dos seus subcartafoles "
+"eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Se elimina o cartafol eliminarase permanentemente todo o seu contido."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Se procede, as contas proxy eliminaranse permanentemente."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13719,11 +13666,11 @@ msgstr ""
 "Se continúa, a información da conta e toda a\n"
 "información do proxy eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Se procede, a información da conta eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13731,23 +13678,23 @@ msgstr ""
 "Se sae, estas mensaxes non se enviarán até que o Evolution sexa iniciado de "
 "novo."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Autenticación non válida"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Produciuse un fallo na eliminación de correo"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13759,27 +13706,27 @@ msgstr ""
 "todas as formas todos os destinatarios da súa mensaxe. Para evitar isto "
 "debería engadir polo menos un destinatario Para: ou CC:."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "Falta o cartafol."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "Non se seleccionou ningunha orixe."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir demasiadas mensaxes ao mesmo tempo pode levar moito tempo."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Please check your account settings and try again."
 msgstr "Verifique a configuración da conta e ténteo outra vez."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Please enable the account or send using another account."
 msgstr "Active a conta ou envíe usando outra conta."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 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."
@@ -13787,7 +13734,7 @@ msgstr ""
 "Introduza un enderezo de correo válido no campo Para:. Pode buscar enderezos "
 "de correo premendo no botón Para: ao lado da caixa de entrada."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13797,67 +13744,59 @@ msgstr ""
 "HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduza un nome único para identificar esta sinatura."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "Agarde."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Produciuse un problema ao migrar o cartafol de correo antigo \"{0}\"."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Estase consultando o servidor sobre unha lista de mecanismos de "
 "autenticación compatíbeis."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "Solicitouse unha confirmación de lectura."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 "Está seguro de que quere eliminar o cartafol \"{0}\" e todos os seus "
 "cartafoles secundarios?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\"?"
 msgstr "Confirma o borrado do cartafol \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "Produciuse un fallo ao informar de correo non desexado"
-
 #: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "Produciuse un fallo ao informe do correo que non é non desexado"
-
-#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "Os cartafoles de busca actualizáronse automaticamente."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "Enviar notificación de recepción"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "A sinatura xa existe"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "Sincronizar"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Sincronizar os cartafoles localmente para o uso sen conexión?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13865,7 +13804,7 @@ msgstr ""
 "O Evolution precisa os cartafoles de sistema para funcionar correctamente e "
 "non é posíbel renomear, mover nin eliminar."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13882,35 +13821,7 @@ msgstr ""
 "destinatarios na súa mensaxe. Para evitar isto, debería engadir polo menos "
 "un destinatario a Para: ou Cc:. "
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Os seguintes cartafoles de busca:\n"
-"{0}\n"
-"usan o cartafol que se eliminou agora:\n"
-"    \"{1}\"\n"
-"e foron actualizados."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"As seguintes regras de filtraxe:\n"
-"{0}\n"
-"usan o cartafol que se eliminou agora:\n"
-"    \"{1}\"\n"
-"e foron actualizadas."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13919,7 +13830,7 @@ msgstr ""
 "electrónico correcto:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13928,11 +13839,11 @@ msgstr ""
 "electrónico correcto:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "O ficheiro de script debe existir e ser executábel."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13941,7 +13852,7 @@ msgstr ""
 "vaia ao editor de cartafoles de busca para engadilo explicitamente, se é "
 "necesario."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13949,14 +13860,14 @@ msgstr ""
 "Esta mensaxe non pode ser enviada porque a conta que escolleu para enviala "
 "non está activada"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Esta mensaxe non pode ser enviada porque non se especificou ningún "
 "destinatario"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13964,11 +13875,11 @@ msgstr ""
 "Este servidor non é compatíbel con este tipo de autenticación e quizais non "
 "permita ningún tipo de autenticación."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "Modificouse esta sinatura mais non foi gardada."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13976,11 +13887,15 @@ msgstr ""
 "Isto marcará todas as mensaxes como lidas no cartafol seleccionado e nos "
 "seus subcartafoles."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:110
+msgid "This will mark all messages as read in the selected folder."
+msgstr "Isto marcará todas as mensaxes como lidas no cartafol seleccionado."
+
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "Non foi posíbel conectar co servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13988,19 +13903,19 @@ msgstr ""
 "Non é posíbel abrir o cartafol de borradores nesta conta. Quere usar no seu "
 "lugar o cartafol de borradores do sistema?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Non é posíbel ler o ficheiro da licenza."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Usar o pre_determinado"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Quere usar o cartafol de borradores predefinidos?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -14010,31 +13925,31 @@ msgstr ""
 "mensaxes reais dun dos seus cartafoles locais ou remotos.\n"
 "Está seguro de que quere facer isto?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:118
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Vostede non ten os permisos suficientes para eliminar este correo."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:119
 msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a información requirida."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:120
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Ten mensaxes non enviadas. Aínda así quere saír?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:121
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear dúas contas co mesmo nome."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:122
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nome a este cartafol de busca."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:123
 msgid "You must specify a folder."
 msgstr "Debe especificar un cartafol."
 
-#: ../mail/mail.error.xml.h:134
+#: ../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 "
@@ -14044,119 +13959,115 @@ msgstr ""
 "Fágao seleccionando os cartafoles individualmente, ou seleccionando todos os "
 "cartafoles locais e todos os cartafoles remotos ou ambos."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:126
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
 "Produciuse un fallo no seu inicio de sesión no servidor \"{0}\" como \"{0}\"."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:127
 msgid "_Append"
 msgstr "_Engadir"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:128
 msgid "_Discard changes"
 msgstr "_Rexeitar as modificacións"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:129
 msgid "_Do not Synchronize"
 msgstr "_Non sincronizar"
 
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:130
+#: ../modules/mail/e-mail-shell-view-actions.c:825
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:131
 msgid "_Expunge"
 msgstr "_Compactar"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:132
 msgid "_Open Messages"
 msgstr "_Abrir mensaxes"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1112
 msgid "Unseen"
 msgstr "Non vista"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1113
 msgid "Seen"
 msgstr "Vista"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1114
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1115
 msgid "Forwarded"
 msgstr "Reenviada"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1116
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensaxes non vistas"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1117
 msgid "Multiple Messages"
 msgstr "Múltiples mensaxes"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1121
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1122
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1126
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1127
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1737 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1744 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %l:%M %p"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1753
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %l:%M %p"
 
 # (pofilter) variables: do not translate: %a, %l, %p
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1765
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
 # (pofilter) variables: do not translate: %b, %l, %p
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1773
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
 # (pofilter) variables: do not translate: %b
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1775
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2527
 msgid "Select all visible messages"
 msgstr "Seleccionar todas as mensaxes visíbeis"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "Infraestrutura shell"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4212 ../mail/message-list.c:4606
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4445
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14164,15 +14075,7 @@ msgstr ""
 "Non hai mensaxes que satisfagan os seus criterios de busca. Limpe a busca no "
 "elemento de menú Buscar->Limpar ou cámbieo."
 
-#: ../mail/message-list.c:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"Só hai mensaxes ocultas neste cartafol. Use Ver -> Mostrar mensaxes ocultas "
-"para velas."
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4447
 msgid "There are no messages in this folder."
 msgstr "Non hai mensaxes neste cartafol."
 
@@ -14201,7 +14104,7 @@ msgid "Sent Messages"
 msgstr "Mensaxes enviadas"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:560
 msgid "Size"
 msgstr "Tamaño"
 
@@ -14210,27 +14113,27 @@ msgid "Subject - Trimmed"
 msgstr "Asunto - Recortado"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1216
 msgid "Body contains"
 msgstr "O corpo contén"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1223
 msgid "Message contains"
 msgstr "A mensaxe contén"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1230
 msgid "Recipients contain"
 msgstr "Os destinatarios conteñen"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1237
 msgid "Sender contains"
 msgstr "O remitente contén"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1244
 msgid "Subject contains"
 msgstr "O asunto contén"
 
@@ -14264,17 +14167,17 @@ msgstr ""
 "TLS. Isto significa que a súa conexión será insegura e que vostede será "
 "vulnerábel a fallos de seguranza."
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "Datas de nacementos e aniversarios"
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "U_sar no calendario Cumpleanos e aniversarios"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 "Copiar o contido da a_xenda de enderezos localmente para unha operación sen "
 "conexión"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -14284,7 +14187,7 @@ msgstr ""
 "Proporcionouse unha lista de portos estándar. Pregunte ao seu administrador "
 "do sistema que porto debería especificar."
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14294,7 +14197,7 @@ msgstr ""
 "definir isto como \"Enderezo de correo\" require o acceso anónimo ao "
 "servidor LDAP."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -14306,29 +14209,29 @@ msgstr ""
 "todas as entradas por debaixo da súa base de busca. Un ámbito \"un\" só "
 "incluirá as entradas un nivel por debaixo da súa base."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "Información do servidor"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detalles"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Buscando"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "Propiedades da axenda de enderezos"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "Nova axenda de enderezos"
 
@@ -14419,8 +14322,10 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "Indica se se mostra o panel de previsualización."
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
+#: ../modules/mail/em-mailer-prefs.c:1159
+msgid "_Table column:"
 msgstr "Columna da táboa:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
@@ -14432,396 +14337,291 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "Mo_strar sempre o enderezo do contacto completado automaticamente"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:191
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:341
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:343
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "Crear un contacto novo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:350
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "Crear unha lista de contactos nova"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:358
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:360
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "Crear unha axenda de enderezos nova"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
+#: ../modules/addressbook/e-book-shell-backend.c:377
+#: ../modules/addressbook/e-book-shell-view.c:398
 #: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Contactos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Orixe"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "Non foi posíbel obter unha lista de axendas de enderezos"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "_Visualización actual"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "A visualización de axenda de enderezo seleccionada actualmente"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Contacto novo"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "Indica se se mostra o panel de previsualización."
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "A barra lateral é visíbel"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "Indica se se mostra o panel de previsualización."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "Servidores LDAP"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "Configuración do completado automático"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localización e a xerarquía dos cartafoles de contactos do Evolution "
-"modificouse desde o Evolution 1.x.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus cartafoles..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Modificouse o formato dos contactos da lista de correo.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus cartafoles..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Modificouse a maneira en que o Evolution almacena algúns números de "
-"teléfono.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus cartafoles..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Modificouse o rexistro de modificacións e os ficheiros de mapa no Palm Sync "
-"do Evolution.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus datos Pilot Sync..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "Selector de orixe de notas"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "Non foi posíbel obter unha lista de axendas de enderezos"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "Gardar como vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "Co_piar todos os contactos a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copiar os contactos do cartafol seleccionado noutro cartafol"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "E_liminar a axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "Eliminar o cartafol seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ver todos os contactos a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "Mover os contactos do cartafol seleccionado a outro cartafol"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "_Nova axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "Propiedades da a_xenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "Modificar as propiedades do cartafol seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:909
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "G_ardar axenda de enderezos como VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Gardar os contactos do cartafol seleccionado como unha VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "Deter a carga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "_Copiar contacto a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "Copiar os contactos seleccionados a outro cartafol"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "E_liminar contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "_Buscar no contacto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "Buscar texto no corpo da mensaxe mostrada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "_Reenviar contacto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "Enviar os contactos seleccionados a outra persoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "_Mover contacto a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "Mover os contactos seleccionados a outro cartafol"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "Contacto _novo..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "_Lista de contactos nova..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "_Contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "Ver o contacto actual"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "_Enviar mensaxe ao contacto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "Enviar unha mensaxe aos contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1494
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "_Accións"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1032
 msgid "_Preview"
 msgstr "_Previsualización"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-memo-shell-view-actions.c:669
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "E_liminar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "_Gardar como vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "_Previsualización de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "Mostrar a xanela de previsualización de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "_Classic View"
 msgstr "Visualización _clásica"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "Mostrar a previsualización da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "_Vertical View"
 msgstr "Visualización _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "Mostrar a xanela de previsualización de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "Calquera categoría"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "Sen equivalencia"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../modules/calendar/e-memo-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../shell/e-shell-content.c:441
 msgid "Advanced Search"
 msgstr "Busca avanzada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "Imprimir os contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "Previsualiza os contactos que se van imprimir"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "Imprimir os contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Gardar como vCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "Gardar os contactos seleccionados como unha VCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:342
 msgid "_Forward Contacts"
 msgstr "_Reenviar contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:344
 msgid "_Forward Contact"
 msgstr "_Reenviar contacto"
 
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:375
 msgid "_Send Message to Contacts"
 msgstr "Enviar unha _mensaxe aos contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:377
 msgid "_Send Message to List"
 msgstr "Enviar unha _mensaxe á lista"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:379
 msgid "_Send Message to Contact"
 msgstr "Enviar unha _mensaxe ao contacto"
 
@@ -14845,57 +14645,47 @@ msgstr "Información de contacto"
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "Anonimamente"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "Examina_r esta axenda de enderezos até atinxir o límite"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "_Iniciar a sesión:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "Conectado"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Filtro de busca"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "_Base de busca:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "_Filtro de busca:"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14905,58 +14695,59 @@ msgstr ""
 "obxectos do tipo \"persoa\"."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "Do"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "Bases de busca compatíbeis"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr ""
 "Anonimamente\n"
 "Empregar enderezo de correo\n"
 "Empregar nome distintivo (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "_Enderezo de correo:"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "Límite de _descarga:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "_Localizar bases de busca posíbeis"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "Método de _inicio de sesión:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "�mbito da bu_sca:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_Tempo de espera:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Usar unha conexión segura:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "tarxetas"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mportar"
 
@@ -14978,11 +14769,11 @@ msgstr "_Importar ás tarefas"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-migrate.c:176
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "Na Web"
 
@@ -14991,87 +14782,57 @@ msgstr "Na Web"
 msgid "Weather"
 msgstr "O tempo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:251
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Datas de nacementos e aniversarios"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgctxt "New"
 msgid "_Appointment"
 msgstr "Cit_a"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:457
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "Create a new appointment"
 msgstr "Crear unha cita nova"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:462
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Ci_ta para todo o día"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:464
 msgid "Create a new all-day appointment"
 msgstr "Crear nova cita nova para todo o día"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:469
 msgctxt "New"
 msgid "M_eeting"
 msgstr "R_eunión"
 
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:471
 msgid "Create a new meeting request"
 msgstr "Crear unha solicitude de cita nova"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:479
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-backend.c:481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Create a new calendar"
 msgstr "Crear un calendario novo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../modules/calendar/e-cal-shell-backend.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:2666
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "Calendario primario"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localización e xerarquía dos cartafoles de calendario do Evolution "
-"modificouse desde o Evolution 1.x.\n"
-"\n"
-"Agarde mentres o Evolution migra os seus cartafoles..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"Non é posíbel migrar a configuración antiga desde evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Non foi posíbel migrar o calendario `%s'"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -15080,36 +14841,16 @@ msgstr ""
 "Erro en %s:\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
 msgid "Loading calendars"
 msgstr "Cargando calendario"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:633
 msgid "Calendar Selector"
 msgstr "Selector de orixe do calendario"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "Widget do navegador de datas"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "Este widget mostra unha calendario en miniatura"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "Cliente de correo predefinido"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "O cliente predefinido para as operacións no calendario"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "Este widget mostra grupos de calendarios"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:974
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrir calendario en %s"
@@ -15139,298 +14880,298 @@ msgstr "Purgar eventos anteriores a"
 msgid "Copying Items"
 msgstr "Copiando elementos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 msgid "Moving Items"
 msgstr "Movendo elementos"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
 msgstr "Enviado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:503
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "Seleccione un calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "D_elete Calendar"
 msgstr "_Eliminar o calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "Delete the selected calendar"
 msgstr "Eliminar o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 msgid "Go Back"
 msgstr "Atrás"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 msgid "Go Forward"
 msgstr "Adiante"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "Seleccionar _hoxe"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Select today"
 msgstr "Seleccionar hoxe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Select _Date"
 msgstr "Seleccionar _data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select a specific date"
 msgstr "Seleccionar unha data específica"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "_New Calendar"
 msgstr "Calendario _novo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "D_epurar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
 msgid "Purge old appointments and meetings"
 msgstr "Depurar as reunións e as citas antigas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "Ac_tualizar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Refresh the selected calendar"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
 msgid "Rename the selected calendar"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "Show _Only This Calendar"
 msgstr "M_ostrar só este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar a un calendario..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Delegate Meeting..."
 msgstr "_Delegar cita..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Delete Appointment"
 msgstr "_Eliminar esta cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Delete selected appointments"
 msgstr "Eliminar a cita seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "Delete This _Occurrence"
 msgstr "Eliminar esta _aparición"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete this occurrence"
 msgstr "Eliminar esta aparición"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Delete All Occ_urrences"
 msgstr "Eliminar _todas as aparicións"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete all occurrences"
 msgstr "Eliminar todas as aparicións"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "New All Day _Event..."
 msgstr "Novo _actividade de día completo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Create a new all day event"
 msgstr "Crear nova cita nova para todo o día"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "Remi_tir como iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
 msgid "New _Meeting..."
 msgstr "_Reunión nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "Create a new meeting"
 msgstr "Crear unha solicitude de cita nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1429
 msgid "New _Appointment..."
 msgstr "_Cita nova..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta aparición _movíbel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "View the current appointment"
 msgstr "Ver a cita actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1450
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1464
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Gardar como vCard..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
 msgid "_Schedule Meeting..."
 msgstr "_Programar cita..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "Converts an appointment to a meeting"
 msgstr "Depurar as reunións e as citas antigas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1478
 msgid "Conv_ert to Appointment..."
 msgstr "_Cita nova..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Converts a meeting to an appointment"
 msgstr "%s ao finalizar a cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+msgid "Quit"
+msgstr "Saír"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Day"
 msgstr "Día"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one day"
 msgstr "Mostrar un día"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1616
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Show as list"
 msgstr "Mostrar como unha lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1623
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one week"
 msgstr "Mostrar unha semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show one work week"
 msgstr "Mostrar unha semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1661
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos próximos sete días"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1711
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Preview the calendar to be printed"
 msgstr "Previsualiza o calendario que se vai imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1791
 msgid "Go To"
 msgstr "Ir a"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-memo-shell-view-actions.c:501
 msgid "memo"
 msgstr "Nota"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "New _Memo"
 msgstr "Nota nova"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
 #: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 msgid "Create a new memo"
 msgstr "Crear unha nota nova"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
 msgid "_Open Memo"
 msgstr "_Abrir nota"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "View the selected memo"
 msgstr "Ver a nota seleccionada"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "Abrir páxina _web"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-memo-shell-view-actions.c:807
 msgid "Print the selected memo"
 msgstr "Ver a nota seleccionada"
 
@@ -15439,22 +15180,22 @@ msgstr "Ver a nota seleccionada"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
 msgstr "Tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "_Asignar Tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminada"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "Marcar as tarefas seleccionadas como terminadas"
 
@@ -15463,39 +15204,39 @@ msgid "_Mark as Incomplete"
 msgstr "_Marcar como non terminada"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "Marcar as tarefas seleccionadas como terminadas"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "Nova _tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "Crear unha tarefa nova"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "_Abrir tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "Ver a tarefa seleccionada"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "Remi_tir como iCalendar..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "Ver a tarefa seleccionada"
 
@@ -15519,40 +15260,20 @@ msgid "Memo Li_st"
 msgstr "Lista de notas"
 
 #: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Create a new memo list"
 msgstr "Crear unha lista de notas nova"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "Lista de notas primaria"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "Modelo da táboa"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "Cargando notas"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:587
 msgid "Memo List Selector"
 msgstr "Selector de orixe de notas"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "Cliente de recordatorios predefinido"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "Cliente predefinido para as operacións nas citas"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "Este widget mostra os grupos de listas de recordatorios"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:892
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abrindo notas en %s"
@@ -15562,63 +15283,63 @@ msgstr "Abrindo notas en %s"
 msgid "Print Memos"
 msgstr "Imprimir notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:563
 msgid "_Delete Memo"
 msgstr "E_liminar mensaxe"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Find in Memo..."
 msgstr "_Buscar na cita..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Search for text in the displayed memo"
 msgstr "Buscar texto no corpo da cita mostrada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "D_elete Memo List"
 msgstr "E_liminar a lista de citas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "Delete the selected memo list"
 msgstr "Eliminar a lista de citas seleccionadas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
 msgid "_New Memo List"
 msgstr "Lista de notas _nova"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Refresh the selected memo list"
 msgstr "Eliminar as notas seleccionadas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Rename the selected memo list"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
 msgid "Show _Only This Memo List"
 msgstr "M_ostrar só esta lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:705
 msgid "Memo _Preview"
 msgstr "_Previsualización"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:707
 msgid "Show memo preview pane"
 msgstr "Mostrar o panel de previsualización"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Show memo preview below the memo list"
 msgstr "Mostrar a previsualización da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:735
 msgid "Show memo preview alongside the memo list"
 msgstr "Mostrar a previsualización da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:793
 msgid "Print the list of memos"
 msgstr "Imprimir a lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:800
 msgid "Preview the list of memos to be printed"
 msgstr "Previsualiza a lista de notas para imprimir"
 
@@ -15663,58 +15384,20 @@ msgid "Tas_k List"
 msgstr "Lista de tarefas"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "Crear unha lista de tarefas nova"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "Lista de tarefas primaria"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "Modelo da táboa"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localización e xerarquía dos cartafoles de tarefas do Evolution "
-"modificouse desde o Evolution 1.x.\n"
-"\n"
-"Agarde mentres o Evolution migra os seus cartafoles..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Non foi posíbel migrar as tarefas `%s'"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "Cargando tarefas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:587
 msgid "Task List Selector"
 msgstr "Selector de orixe de tarefas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "Cliente de tarefas predefinido"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "Cliente predefinido para a operación na tarefa"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "Este widget mostra os grupos de listas de tarefas"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:892
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas en %s"
@@ -15724,7 +15407,7 @@ msgstr "Abrindo tarefas en %s"
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15736,95 +15419,95 @@ msgstr ""
 "\n"
 "Está seguro de que quere eliminar estas tarefas?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "E_liminar"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
 msgstr "_Buscar na tarefa..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
 msgstr "Buscar texto no corpo da tarefa mostrada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "_Copiar..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
 msgstr "_Eliminar a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
 msgstr "Eliminar a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "Lista de tarefas _nova"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
 msgstr "Eliminar as tarefas seleccionadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "M_ostrar só esta lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "Eliminar as tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "_Previsualizar tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "Mostrar o panel de previsualización"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr "Mostrar a previsualización da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr "Mostrar a previsualización da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "Tarefas activas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "Tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos próximos sete días"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "Tarefas atrasadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "Tarefas con anexos"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "Imprimir a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "Previsualiza a lista de tarefas para imprimir"
 
@@ -15849,406 +15532,373 @@ msgstr "Eliminar a tarefa"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, c-format
 msgid "%d attached messages"
 msgstr "%d mensaxes anexas"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "Ningún"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:169
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaxe de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgid "Compose a new mail message"
 msgstr "Compor unha mensaxe de correo nova"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:179
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Carta_fol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgid "Create a new mail folder"
 msgstr "Crear un cartafol novo de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:200
 msgid "Mail Accounts"
 msgstr "Contas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:208
 msgid "Mail Preferences"
 msgstr "Preferencias de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:216
 msgid "Composer Preferences"
 msgstr "Preferencias do editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:224
 msgid "Network Preferences"
 msgstr "Preferencias de rede"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "Agr_upar por fíos"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "Indica se as mensaxes se agrupan por fíos"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:818
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "Desactivar conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:820
 msgid "Disable this account"
 msgstr "Desactivar conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:827
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todas as mensaxes eliminadas en todos os cartafoles"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:832
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear un cartafol de busca por busca..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:839
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar as mensaxes para o uso sen conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:841
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Descargar as mensaxes para as contas e cartafoles marcados para o modo sen "
 "conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:846
 msgid "Fl_ush Outbox"
 msgstr "Lim_par a caixa de saída"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:853
 msgid "_Copy Folder To..."
 msgstr "_Copiar cartafol a..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:855
 msgid "Copy the selected folder into another folder"
 msgstr "Copiar o cartafol seleccionado noutro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:862
 msgid "Permanently remove this folder"
 msgstr "Eliminar permanentemente este cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:867
 msgid "E_xpunge"
 msgstr "Com_pactar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Eliminar permanentemente as mensaxes eliminadas deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:874
 msgid "Mar_k All Messages as Read"
 msgstr "Ma_rcar todas as mensaxes como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "Mark all messages in the folder as read"
 msgstr "Marcar todas as mensaxes do cartafol como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:881
 msgid "_Move Folder To..."
 msgstr "_Mover o cartafol a..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "Move the selected folder into another folder"
 msgstr "Mover o cartafol seleccionado a outro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:888
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "Create a new folder for storing mail"
 msgstr "Crear un cartafol novo para almacenar correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:897
 msgid "Change the properties of this folder"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:904
 msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:911
 msgid "Change the name of this folder"
 msgstr "Modificar o nome deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:916
 msgid "Select Message _Thread"
 msgstr "Seleccionar o _fío da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Seleccionar todas as mensaxes do mesmo fío que a mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:923
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar o fío sec_undario da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "Select all replies to the currently selected message"
 msgstr "Seleccionar todas as respostas á mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:930
 msgid "_Unsubscribe"
 msgstr "Eliminar s_ubscrición"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:932
 msgid "Unsubscribe from the selected folder"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:937
 msgid "Empty _Trash"
 msgstr "Baleirar o _lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:939
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "Eliminar permanentemente todas as mensaxes eliminadas en todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:944
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:953
 msgid "N_one"
 msgstr "Ningún"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "Ocultar as mensaxes _lidas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Ocultar temporalmente todas as mensaxes lidas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "Ocultar as mensaxes s_eleccionadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "Ocultar temporalmente as mensaxes seleccionadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "Mostrar as mensaxes o_cultas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "Mostrar as mensaxes ocultas temporalmente"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:976
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a operación de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:981
 msgid "Collapse All _Threads"
 msgstr "Contraer todos os _fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "Collapse all message threads"
 msgstr "Contraer todos os fíos de mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:988
 msgid "E_xpand All Threads"
 msgstr "E_xpandir todos os fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "Expand all message threads"
 msgstr "Expandir todos os fíos de mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:995
 msgid "_Message Filters"
 msgstr "Filtros de _mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear ou editar regras para a filtraxe do correo novo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1002
 msgid "Search F_olders"
 msgstr "Cartaf_oles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Create or edit search folder definitions"
 msgstr "Crear ou editar as definicións de cartafoles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1009
 msgid "_Subscriptions..."
 msgstr "_Subscricións..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 "Subscribirse ou eliminar subscrición dos cartafoles en servidores remotos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1018
 msgid "F_older"
 msgstr "Cartaf_ol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1025
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1065
 msgid "_New Folder..."
 msgstr "Cartafol _novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "Ocultar as mensaxes elimina_das"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "Ocultar as mensaxes eliminadas en vez de mostralas riscadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1089
 msgid "Show Message _Preview"
 msgstr "Mostrar _previsualización da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Show message preview pane"
 msgstr "Mostrar a xanela de previsualización da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1097
+msgid "Show _Deleted Messages"
+msgstr "Mostrar as mensaxes _eliminadas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+msgid "Show deleted messages with a line through them"
+msgstr "Mostrar as mensaxes eliminadas riscándoas."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
 msgid "_Group By Threads"
 msgstr "Agr_upar por fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "Threaded message list"
 msgstr "Lista de mensaxes por fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
 msgid "Show message preview below the message list"
 msgstr "Mostrar a previsualización da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "Show message preview alongside the message list"
 msgstr "Mostrar a previsualización da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1150
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos últimos 5 días"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
 msgid "Recent Messages"
 msgstr "Mensaxes recentes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "Unread Messages"
 msgstr "Mensaxes non lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
 msgid "Subject or Addresses contain"
 msgstr "O asunto ou os enderezos conteñen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:881
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionados, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:892
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d eliminado"
 msgstr[1] "%d eliminados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:898
+#: ../modules/mail/e-mail-shell-view-private.c:905
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d correo non desexado"
 msgstr[1] "%d correos non desexados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:911
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:917
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d non enviado"
 msgstr[1] "%d non enviados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:923
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:935
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d sen ler, "
 msgstr[1] "%d sen ler, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:938
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16267,7 +15917,14 @@ msgstr "Buscar na conta"
 msgid "Proxy _Logout"
 msgstr "_Terminar a sesión proxy"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "Activado"
+
+#: ../modules/mail/em-composer-prefs.c:476
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
@@ -16287,60 +15944,69 @@ msgstr "Unha vez á semana"
 msgid "Once per month"
 msgstr "Unha vez ao mes"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:224
 msgid "Add Custom Junk Header"
 msgstr "Engadir unha cabeceira personalizada para o correo non desexado"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:232
 msgid "Header Name:"
 msgstr "Nome da cabeceira:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Value Contains:"
 msgstr "O valor da cabeceira contén:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:333
 msgid "Header"
 msgstr "Cabeceira"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:337
 msgid "Contains Value"
 msgstr "Contén o valor"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:801
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "O engadido %s está dispoñíbel e o binario está instalado."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:738 ../modules/mail/em-mailer-prefs.c:810
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "O engadido %s non está dispoñíbel. Verifique se o paquete está instalado."
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:774
 msgid "No junk plugin available"
 msgstr "Non hai dispoñíbel un engadido de correo non desexado"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "Columna da táboa:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1161
 msgid "_Date header:"
 msgstr "Data da cabeceira:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1162
 msgid "Show _original header value"
 msgstr "Mostrar tamaño _orixinal"
 
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Verificar se o Evolution é o aplicativo de correo predefinido"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Cada vez que se inicie o Evolution, verificar se é ou non o cliente de "
+"correo predefinido."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+msgid "Do you want to make Evolution your default email client?"
+msgstr ""
+"Quere que Evolution sexa o seu cliente de correo electrónico predefinido?"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Ola Python"
@@ -16373,16 +16039,8 @@ msgstr ""
 "Lista de pistas do engadido de aviso de anexos para buscar no corpo dunha "
 "mensaxe"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Lista de pistas do engadido de aviso de anexos para buscar no corpo dunha "
-"mensaxe."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "Palabras chave"
 
@@ -16422,25 +16080,25 @@ msgstr "vCards en liña"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Reproducir os anexos de audio directamente desde Evolution."
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccione o nome do ficheiro de copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution despois de facer unha copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccione o nome do ficheiro de copia de seguranza do Evolution que quere "
 "restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar o Evolution despois de restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16450,36 +16108,36 @@ msgstr ""
 "pode restaurar todos os correos, calendarios, tarefas, notas e contactos. \n"
 "Tamén restaurará todas as configuracións persoais, filtros de correo etc."
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar o Evolution desde o ficheiro de copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccione o arquivo do Evolution para restaurar:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "Escolla un ficheiro para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "Restaurar desde unha copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "_Configuracións de copia de seguranza..."
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "_Backup Evolution Settings..."
+msgstr "_Respaldar axustes de Evolution…"
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr ""
 "Facer copia de seguranza e restaurar os datos e a configuración do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "Configuracións de r_estauración..."
+#: ../plugins/backup-restore/backup-restore.c:368
+msgid "R_estore Evolution Settings..."
+msgstr "R_estaurar axustes de Evolution…"
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
 "Facer copia de seguranza e restaurar os datos e a configuración do Evolution"
@@ -16531,8 +16189,8 @@ msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
-msgstr "Facendo unha copia dos datos actuais do Evolution"
+msgid "Back up current Evolution data"
+msgstr "Facer unha copia de seguridade dos datos de Evolution"
 
 #: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
@@ -16561,33 +16219,33 @@ msgid "Restoring from the folder %s"
 msgstr "Restaurando desde o cartafol %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Restauración do Evolution"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "Facendo unha copia de seguranza dos datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 "Agarde mentres o Evolution está facendo unha copia de seguranza dos seus "
 "datos."
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "Restaurando os datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Agarde mentres o Evolution restaura os seus datos."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Isto podería levar algún tempo, dependendo da cantidade de datos da súa "
@@ -16657,39 +16315,39 @@ msgstr ""
 "Evolution se reinicie automaticamente despois da restauración, active o "
 "botón de estado."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "Crear _automaticamente as entradas da axenda de enderezos ao enviar as "
 "mensaxes"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccione a axenda de enderezos para contactos automáticos"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de mensaxería instantánea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Sincronizar a información de contacto e as imaxes desde a lista de amigos do "
-"Pidgin"
+"_Sincronizar a información e as imaxes de contactos desde a lista de amigos "
+"do Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccione a axenda de enderezos para a lista de amigos do Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar coa lista de _amigos agora"
 
@@ -16711,34 +16369,34 @@ msgstr ""
 "correo electrónico ao responder as mensaxes. Tamén enche a información de "
 "contacto IM desde a súa lista de amigos."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter non está dispoñíbel. Instáleo primeiro."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Produciuse un erro ao iniciar %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "O proceso fillo Bogofilter non responde; matándoo..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Interrompeuse a espera polo proceso fillo Bogofilter; terminando..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr ""
 "Produciuse un fallo na canalización co Bogofilter; o código de erro é: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
 msgid "Convert message text to _Unicode"
 msgstr "Converter o texto da mensaxe a _Unicode"
 
@@ -16766,17 +16424,17 @@ msgstr "Opcións do Bogofilter"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filtra os correos non desexados usando o Bogofilter."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
 "Produciuse un fallo na autenticación. O servidor require un inicio de sesión "
 "correcto."
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "Non é posíbel encontrar o URL fornecido."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16785,36 +16443,36 @@ msgstr ""
 "O servidor devolveu datos non esperados.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "Produciuse un fallo ao actualizar delegados:"
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "Finaliza"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "Calendario novo"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "Produciuse un fallo ao autenticarse no servidor LDAP."
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "Buscando os contactos..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "Non é posíbel localizar ningún calendario"
 
@@ -16828,40 +16486,40 @@ msgstr "Produciuse un fallo no intento anterior: %s"
 msgid "Previous attempt failed with code %d"
 msgstr "Produciuse un fallo no intento anterior co código %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr "Introduza o contrasinal para %s (usuario %s)"
+msgid "Enter password for user %s on server %s"
+msgstr "Introduza o contrasinal para %s no servidor %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "Non é posíbel crear a mensaxe para o URL '%s'"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "Buscando nos contidos do cartafol..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "Calendarios locais"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "Compatibilidade con Hula"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Produciuse un fallo ao crear a canalización: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "O URL do servidor '%s' non é un URL válido"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "Explorar por un calendario CalDAV"
 
@@ -16869,26 +16527,26 @@ msgstr "Explorar por un calendario CalDAV"
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "_Explorar o servidor por un calendario"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "Actuali_zar:"
 
@@ -16900,31 +16558,31 @@ msgstr "Engade a compatibilidade de CalDAV con Evolution."
 msgid "CalDAV Support"
 msgstr "Compatibilidade de CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "Personalizar as op_cións"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "Nome do f_icheiro:"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "Escoller ficheiro de calendario"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "Ao abrir"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "Cambio de ficheiro"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "Periodicamente"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "Forzar s_ó lectura"
 
@@ -16936,11 +16594,11 @@ msgstr "Engadir calendarios locais a Evolution."
 msgid "Local Calendars"
 msgstr "Calendarios locais"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "Conexión _segura"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "No_me de usuario:"
 
@@ -16988,26 +16646,26 @@ msgstr "Tempo: noite despexada"
 msgid "Weather: Thunderstorms"
 msgstr "Tempo: treboadas"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "Seleccione unha localización"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Ningún"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_Unidades:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Métrico (Centígrados, cm etc.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Non métrico (Fahrenheit, polgadas etc.)"
 
@@ -17037,47 +16695,23 @@ msgstr ""
 msgid "Map for contacts"
 msgstr "Sen contactos"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Verificar se o Evolution é o aplicativo de correo predefinido"
-
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Cada vez que se inicie o Evolution, verificar se é ou non o cliente de "
-"correo predefinido."
-
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "Verificar se o Evolution é o cliente de correo predefinido ao iniciar."
-
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "Cliente de correo predefinido"
-
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr ""
-"Quere que o Evolution sexa o seu cliente de correo electrónico predefinido?"
-
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "Marcar como a axenda de enderezos pre_determinada"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
 msgstr "Mostrar o nome completado automaticamente cun enderezo"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "Marcar como calendario pre_determinado"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "Marcar como a lista de tarefas pre_determinada"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "Marcar como a lista de notas pre_determinada"
 
@@ -17132,12 +16766,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ningún"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "Cabeceira p_ersonalizada"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17147,12 +16781,12 @@ msgstr ""
 "Nome dos valores da chave para unha Cabeceira personalizada separados por \";"
 "\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:950
 msgid "Key"
 msgstr "Chave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "Valores"
 
@@ -17175,7 +16809,7 @@ msgstr ""
 "Lanza automaticamente o editor ao presionar unha tecla no editor de correo"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "Lanzar automaticamente cando se edite un novo correo"
 
@@ -17187,11 +16821,11 @@ msgstr "Editor externo predefinido"
 msgid "The default command that must be used as the editor."
 msgstr "A orde predefinida que se debe usar como o editor."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "A orde que se executará para iniciar o editor: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17199,8 +16833,8 @@ msgstr ""
 "Para o Emacs use \"xemacs\"\n"
 "Para o VI use \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "Compoñer no editor externo"
 
@@ -17278,7 +16912,7 @@ msgstr "_Inserir a imaxe de cara predefinida"
 msgid "Load new _Face picture"
 msgstr "Caragar a imaxe da nova _cara"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "I_ncluír fíos"
 
@@ -17311,23 +16945,23 @@ msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "O ficheiro que seleccionou non semella ser unha imaxe .png. Erro: {0}"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
+#: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>Servidor</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+msgid "Server"
+msgstr "Servidor"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Introduza o contrasinal para que o usuario %s acceda aos calendarios "
 "subscritos."
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17336,19 +16970,19 @@ msgstr ""
 "Non é posíbel ler datos desde o servidor do Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
 msgid "Unknown error."
 msgstr "Erro descoñecido."
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "Cal_endario:"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
-msgstr "Obter _lista"
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
+msgstr "Obter a _lista"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
@@ -17358,7 +16992,7 @@ msgstr "Engadir calendario de Google a Evolution."
 msgid "Google Calendars"
 msgstr "Calendarios de Google"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Lista de verificación"
 
@@ -17390,12 +17024,12 @@ msgstr "Aceptar provisionalmente"
 msgid "Rese_nd Meeting..."
 msgstr "Ree_nviar cita..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
 msgid "Create folder"
 msgstr "Crear cartafol"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17420,19 +17054,19 @@ msgstr ""
 "Prema en 'adiante' para instalar o cartafol compartido\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "Instalar o cartafol compartido"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "Instalación de cartafol compartido"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "Configuración de correo non desexado"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Configuración de correo non desexado"
@@ -17468,7 +17102,7 @@ msgstr "E_liminar"
 msgid "Message Retract"
 msgstr "Retirada de mensaxe"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -17476,7 +17110,7 @@ msgstr ""
 "Ao retirar unha mensaxe pode eliminala da caixa de correo do destinatario. "
 "Está seguro de que quere facer isto?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "Mensaxe anulada con éxito"
 
@@ -17601,25 +17235,25 @@ msgid "Would you like to decline it?"
 msgstr "Quere esquecela?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>Usuarios:</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "Personali_zar a mensaxe de notificación"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "Con_tactos..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "Notificación de cartafol compartido"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "Os participantes recibirán a seguinte notificación.\n"
 
+#: ../plugins/groupwise-features/properties.ui.h:9
+msgid "Users:"
+msgstr "Usuarios:"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Non compartido"
@@ -17677,51 +17311,58 @@ msgid "Proxy"
 msgstr "Proxy"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Nome da conta</b>"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "Nome da conta"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "Iniciar sesión no proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s Introduza o seu contrasinal para %s (usuario %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:690
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "O separador do proxy estará dispoñíbel só cando a conta estea en liña."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "O separador do proxy estará dispoñíbel só cando a conta estea activada."
 
-#: ../plugins/groupwise-features/proxy.c:931
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../plugins/groupwise-features/proxy.c:929
 #: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "Engadir usuario"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "Opcións de envío avanzadas"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:315
 #: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:316
 msgid "Enter the users and set permissions"
 msgstr "Introduza os usuarios e defina os permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:416
 msgid "Sharing"
 msgstr "Compartir"
 
@@ -17733,63 +17374,55 @@ msgstr "Notificación personalizada"
 msgid "Add   "
 msgstr "Engadir   "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Estado da mensaxe"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Data de creación:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "Entregada: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "Aberta: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "Aceptada: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "Eliminada: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "Rexeitada: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "Terminada: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "Sen entregar: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Engade a compatibilidade de Hula con Evolution."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Compatibilidade con Hula"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "vCards en liña"
@@ -17798,12 +17431,12 @@ msgstr "vCards en liña"
 msgid "View image attachments directly in mail messages."
 msgstr "Mostrar vCards directamente nas mensaxes de correo."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:332
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Cabeceiras personalizadas"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:345
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "Cabeceiras IMAP"
@@ -17850,142 +17483,142 @@ msgstr "Axuste os detalles das súas contas IMAP."
 msgid "IMAP Features"
 msgstr "Características IMAP"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/itip-formatter/itip-formatter.c:482
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Produciuse un fallo ao cargar o calendario '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:648
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Unha cita no calendario '%s' entra en conflito con esta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:684
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizouse a cita no calendario '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find any calendars"
 msgstr "Non é posíbel localizar ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:790
 msgid "Unable to find this meeting in any calendar"
 msgstr "Non é posíbel localizar esta cita en ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this task in any task list"
 msgstr "Non é posíbel localizar esta tarefa en ningunha lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this memo in any memo list"
 msgstr "Non é posíbel localizar esta nota en ningunha lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:872
 msgid "Opening the calendar. Please wait.."
 msgstr "Abrindo o calendario. Agarde..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:875
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando unha versión existente desta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1056
 msgid "Unable to parse item"
 msgstr "Non é posíbel analizar o elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1143
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Non é posíbel enviar o elemento ao calendario '%s'. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1155
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado ao calendario '%s' como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado ao calendario '%s' como provisional"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1164
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado ao calendario '%s' como rexeitado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1169
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado ao calendario '%s' como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1263
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador eliminou o delegado %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1270
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviouse unha notificación de cancelación ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1272
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Non foi posíbel enviar unha notificación de cancelación ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1383
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Non foi posíbel actualizar o estado de participación debido a que o estado "
 "non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Non é posíbel actualizar o participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Attendee status updated"
 msgstr "Estado de participación actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1442
 msgid "Meeting information sent"
 msgstr "Información da cita enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Task information sent"
 msgstr "Información da tarefa enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Memo information sent"
 msgstr "Información da nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1457
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Non é posíbel enviar información da cita: a cita non existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1460
 msgid "Unable to send task information, the task does not exist"
 msgstr "Non é posíbel enviar información da tarefa: a tarefa non existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Non é posíbel enviar información da nota: a nota non existe"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "calendar.ics"
 msgstr "Calendarios"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1533
 msgid "Save Calendar"
 msgstr "Calendario novo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1597
 msgid "The calendar attached is not valid"
 msgstr "O calendario anexo non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17993,15 +17626,15 @@ msgstr ""
 "A mensaxe di que contén un calendario mais o calendario non é un iCalendar "
 "válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1638
+#: ../plugins/itip-formatter/itip-formatter.c:1666
+#: ../plugins/itip-formatter/itip-formatter.c:1772
 msgid "The item in the calendar is not valid"
 msgstr "O elemento no calendario non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18009,11 +17642,11 @@ msgstr ""
 "A mensaxe contén un calendario mais o calendario non contén eventos, tarefas "
 "nin información de dispoñibilidade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1680
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexo contén múltiples elementos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18021,514 +17654,506 @@ msgstr ""
 "Para procesar todos estes elementos, debería gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2451
 msgid "This meeting recurs"
 msgstr "Esta cita repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "This task recurs"
 msgstr "Esta tarefa repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "This memo recurs"
 msgstr "Esta nota repítese"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2691
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2701
+#: ../plugins/itip-formatter/itip-formatter.c:2734
 msgid "Conflict Search"
 msgstr "Buscar conflito"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2716
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione os calendarios nos que buscar conflitos entre reunións"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Hoxe ás %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Hoxe ás %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Hoxe ás %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Mañá ás %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Mañá ás %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Mañá ás %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Mañá ás %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e de %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 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:297
+#: ../plugins/itip-formatter/itip-view.c:293
 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:302
+#: ../plugins/itip-formatter/itip-view.c:298
 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:306
+#: ../plugins/itip-formatter/itip-view.c:302
 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:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e de %B de %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B de %Y ás %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 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:326
+#: ../plugins/itip-formatter/itip-view.c:322
 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:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e de %B de %Y, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "Responda de parte de <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "Recibido de parte de <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> publicou a seguinte información de cita a través de %s:"
-
-#: ../plugins/itip-formatter/itip-view.c:364
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> publicou a seguinte información de cita:"
+msgid "Please respond on behalf of %s"
+msgstr "Responda de parte de %s"
 
 #: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> delegoulle a cita seguinte:"
-
-#: ../plugins/itip-formatter/itip-view.c:372
-#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> require a súa presenza na seguinte cita a través de %s:"
+msgid "Received on behalf of %s"
+msgstr "Recibido de parte de %s"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> require a súa presenza na seguinte cita:"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s publicou a seguinte información de cita a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> quere apuntarse a unha cita existente a través de %s:"
+msgid "%s has published the following meeting information:"
+msgstr "%s publicou a seguinte información de cita:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> quere apuntarse a unha cita existente:"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s delegoulle a cita seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> a través de %s quere recibir a última información para a próxima "
-"cita:"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s require a súa presenza na seguinte cita a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> quere recibir a última información da seguinte cita:"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s require a súa presenza na seguinte cita:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> a través de %s devolveu a seguinte resposta á cita:"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s quere apuntarse a unha cita existente a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> devolveu a seguinte resposta á cita:"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s quere apuntarse a unha cita existente:"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> a través de %s cancelou a seguinte cita:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr ""
+"%s a través de %s quere recibir a última información para a próxima cita:"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> cancelou a cita seguinte."
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s quere recibir a última información da seguinte cita:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr ""
-"<b>%s</b> a través de %s propuxo as seguintes modificacións para a cita."
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s a través de %s devolveu a seguinte resposta á cita:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> propuxo as seguintes modificacións para a cita."
+msgid "%s has sent back the following meeting response:"
+msgstr "%s devolveu a seguinte resposta á cita:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr ""
-"<b>%s</b> rexeitou as seguintes modificacións para a cita a través de %s:"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s a través de %s cancelou a seguinte cita:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> rexeitou as seguintes modificacións para a cita."
+msgid "%s has canceled the following meeting."
+msgstr "%s cancelou a cita seguinte."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
-msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> publicou a seguinte tarefa a través de %s:"
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s a través de %s propuxo as seguintes modificacións para a cita."
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> publicou a tarefa seguinte:"
+msgid "%s has proposed the following meeting changes."
+msgstr "%s propuxo as seguintes modificacións para a cita."
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> require a asignación de %s para a seguinte tarefa:"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s rexeitou as seguintes modificacións para a cita a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> a través de %s asignoulle unha tarefa:"
+msgid "%s has declined the following meeting changes."
+msgstr "%s rexeitou as seguintes modificacións para a cita."
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> asignoulle unha tarefa:"
+msgid "%s through %s has published the following task:"
+msgstr "%s publicou a seguinte tarefa a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> a través de %s quere engadirse a unha tarefa existente:"
+msgid "%s has published the following task:"
+msgstr "%s publicou a tarefa seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> quere engadirse a unha tarefa existente:"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s require a asignación de %s para a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> a través de %s quere recibir a última información para a seguinte "
-"tarefa asignada:"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s a través de %s asignoulle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> quere recibir a última información para a seguinte tarefa asignada:"
+msgid "%s has assigned you a task:"
+msgstr "%s asignoulle unha tarefa:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr ""
-"<b>%s</b> a través de %s devolveu a seguinte resposta para a seguinte tarefa "
-"asignada:"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s a través de %s quere engadirse a unha tarefa existente:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> devolveu a seguinte resposta á tarefa asignada:"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s quere engadirse a unha tarefa existente:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> a través de %s cancelou a seguinte tarefa asignada:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"%s a través de %s quere recibir a última información para a seguinte tarefa "
+"asignada:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> cancelou a seguinte tarefa asignada:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr "%s quere recibir a última información para a seguinte tarefa asignada:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "%s through %s has sent back the following assigned task response:"
 msgstr ""
-"<b>%s</b> a través de %s propuxo as seguintes modificacións na asignación de "
-"tarefas:"
+"%s a través de %s devolveu a seguinte resposta para a seguinte tarefa "
+"asignada:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> propuxo as seguintes modificacións na asignación de tarefas:"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s devolveu a seguinte resposta á tarefa asignada:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> rexeitou a seguinte tarefa asignada a través de %s:"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s a través de %s cancelou a seguinte tarefa asignada:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> rexeitou a seguinte tarefa asignada:"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s cancelou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:504
 #, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> publicou a seguinte nota a través de %s:"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr ""
+"%s a través de %s propuxo as seguintes modificacións na asignación de "
+"tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> publicou a seguinte nota:"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s propuxo as seguintes modificacións na asignación de tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:510
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s rexeitou a seguinte tarefa asignada a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s rexeitou a seguinte tarefa asignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:549
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "%s publicou a seguinte nota a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:551
+#, c-format
+msgid "%s has published the following memo:"
+msgstr "%s publicou a seguinte nota:"
+
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> quere sumarse a unha cita existente a través de %s:"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s quere sumarse a unha cita existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> quere sumarse a unha nota existente:"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s quere sumarse a unha nota existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:562
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> a través de %s cancelou a seguinte nota compartida:"
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s a través de %s cancelou a seguinte nota compartida:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:564
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> cancelou a seguinte nota compartida:"
+msgid "%s has canceled the following shared memo:"
+msgstr "%s cancelou a seguinte nota compartida:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "Todo o día:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "Data de _comezo:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "Hora de comezo:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "%d día"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "Hora de finalización:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "_Aceptar"
-
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+msgid "A_ccept"
+msgstr "A_ceptar"
+
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "_Rexeitar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "Facer _provisional todo"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:855
+msgid "A_ccept all"
 msgstr "_Aceptar todo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "_Enviar información"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "Act_ualizar o estado do participante"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "Act_ualizar"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "_Responder ao remitente"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "Mandar as act_ualizacións aos participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "_Aplicar en todos os casos"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "Mostrar a hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "_Preservar o meu aviso"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "_Herdar o aviso"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "_Notas:"
 
@@ -18642,16 +18267,16 @@ msgstr "Se a icona se debería volver intermitente ou non."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Se notificar as mensaxes só na caixa de entrada ou non."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:346
 msgid "Evolution's Mail Notification"
 msgstr "Notificación de correo do Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Mail Notification Properties"
 msgstr "Propiedades da notificación de correo"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:499
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18667,68 +18292,68 @@ msgstr[1] ""
 "en %s."
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:510
 #, c-format
 msgid "From: %s"
 msgstr "De: %s:"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#: ../plugins/mail-notification/mail-notification.c:522
 #, c-format
 msgid "Subject: %s"
 msgstr "Asunto: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:531
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Recibiu %d mensaxe nova."
 msgstr[1] "Recibiu %d mensaxes novas."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:554
 msgid "New email"
 msgstr "Novo correo"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:608
 msgid "Show icon in _notification area"
 msgstr "Mostrar a icona na área de _notificación"
 
 # (pofilter) accelerators: accelerator _ is missing from translation
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:636
 msgid "B_link icon in notification area"
 msgstr "Volver _intermitente a icona da área de notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:646
 msgid "Popup _message together with the icon"
 msgstr "Facer emerxer a _mensaxe xunto coa icona"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:831
 msgid "_Play sound when new messages arrive"
 msgstr "_Reproducir un son cando cheguen mensaxes novas"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:860
 msgid "_Beep"
 msgstr "_Ton de aviso"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:873
 msgid "Use sound _theme"
 msgstr "Usar _tema de sons"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:892
 msgid "Play _file:"
 msgstr "Reproducir un ficheiro de _son"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:903
 msgid "Select sound file"
 msgstr "Seleccionar un ficheiro de son"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:961
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar mensaxes novas só para a caixa de _entrada"
 
 # (pofilter) accelerators: accelerator _ is missing from translation
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:970
 msgid "Generate a _D-Bus message"
 msgstr "Xerar unha mensaxe _D-Bus"
 
@@ -18741,12 +18366,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Reproducir un son cando cheguen mensaxes novas."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Creado desde un correo electrónico por %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18755,7 +18380,7 @@ msgstr ""
 "O calendario seleccionado contén xa unha actividade '%s'. Quere editar a  "
 "actividade vella?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18764,7 +18389,7 @@ msgstr ""
 "A lista de tarefas seleccionadas contén xa unha tarefa '%s'. Quere editar a "
 "actividade vella?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18773,7 +18398,7 @@ msgstr ""
 "A lista de notas seleccionada xa contén unha nota '%s' . Quere editar a nota "
 "vella?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#: ../plugins/mail-to-task/mail-to-task.c:512
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18781,7 +18406,7 @@ msgstr ""
 "O calendario seleccionado xa contén algunhas actividades para os correos "
 "dados. Quere crear actividades novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18789,7 +18414,7 @@ msgstr ""
 "A lista de tarefas seleccionada xa contén algunhas tarefas para os correos "
 "dados. Quere crear tarefas novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#: ../plugins/mail-to-task/mail-to-task.c:518
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18797,7 +18422,7 @@ msgstr ""
 "A lista de notas seleccionada xa contén algunhas notas para os correos "
 "dados. Quere crear notas novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#: ../plugins/mail-to-task/mail-to-task.c:536
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18811,7 +18436,7 @@ msgstr[1] ""
 "O calendario seleccionado xa contén unha actividade para o correo dado. "
 "Quere crear actividades novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:542
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18825,7 +18450,7 @@ msgstr[1] ""
 "A lista de tarefas seleccionada xa contén tarefas para o correo dado. Quere "
 "crear actividades novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18839,25 +18464,25 @@ msgstr[1] ""
 "A lista de notas seleccionada xa contén notas para os correos dados. Quere "
 "crear notas novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:607
 msgid "[No Summary]"
 msgstr "[Sen resumo]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:618
 msgid "Invalid object returned from a server"
 msgstr "O obxecto devolto polo servidor non é válido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:689
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Produciuse un erro no proceso: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:718
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Non é posíbel abrir o calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:725
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18865,7 +18490,7 @@ msgstr ""
 "A orixe seleccionada é só de lectura, polo que non é posíbel crear eventos "
 "nela. Seleccione outra orixe."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18873,7 +18498,7 @@ msgstr ""
 "A orixe seleccionada é só de lectura, polo que non é posíbel crear tarefas "
 "nela. Seleccione outra orixe."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:731
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18881,40 +18506,40 @@ msgstr ""
 "A orixe seleccionada é só de lectura, polo que non é posíbel crear notas "
 "nela. Seleccione outra orixe."
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:934
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Non é posíbel obter a lista orixe. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1053
 msgid "Create an _Event"
 msgstr "Cr_ear unha actividade"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1055
 msgid "Create a new event from the selected message"
 msgstr "Crear unha actividade nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create a Mem_o"
 msgstr "Crear unha n_ota"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new memo from the selected message"
 msgstr "Crear unha nota nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a _Task"
 msgstr "Crear unha _tarefa"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new task from the selected message"
 msgstr "Crear unha tarefa nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a _Meeting"
 msgstr "Crear unha _cita"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a new meeting from the selected message"
 msgstr "Crear unha cita nova a partir da mensaxe seleccionada"
 
@@ -18922,56 +18547,56 @@ msgstr "Crear unha cita nova a partir da mensaxe seleccionada"
 msgid "Convert a mail message to a task."
 msgstr "Converte unha mensaxe nunha tarefa."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Archive"
 msgstr "Obter _arquivo da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get an archive of the list this message belongs to"
 msgstr "Obter un arquivo da lista á que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get List _Usage Information"
 msgstr "Obter información do _uso da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Obter información sobre o uso da lista á que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Contact List _Owner"
 msgstr "Pr_opietario da lista de contactos"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 "Contactar co propietario da lista de correo á que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Post Message to List"
 msgstr "_Publicar unha mensaxe na lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Publicar unha mensaxe na lista de correo á que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Subscribe to List"
 msgstr "_Subscribirse á lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Subscribirse á lista de correo á que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "_Unsubscribe from List"
 msgstr "E_liminar subscrición da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Eliminar subscrición da lista de correo á que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
 msgid "Mailing _List"
 msgstr "_Lista de correo"
 
@@ -19079,15 +18704,15 @@ msgstr ""
 "Quere marcar as mensaxes do cartafol actual como lidas ou tamén as dos seus "
 "subcartafoles?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:181
 msgid "In Current Folder and _Subfolders"
 msgstr "No cartafol actual e _subcartafoles"
 
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:195
 msgid "In Current _Folder Only"
 msgstr "Só no carta_fol actual"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:418
 msgid "Mark Me_ssages as Read"
 msgstr "Marcar as men_saxes como lidas"
 
@@ -19147,19 +18772,19 @@ msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 "Ver mensaxes de correo como texto plano aínda que conteñan contido HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "Deixar que Evolution cree a mellor parte a mostrar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "Mostrar HTML se está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19167,21 +18792,21 @@ msgstr ""
 "Mostrar a parte en texto simple, se está presente, doutro xeito Evolution "
 "seleccionará a mellor parte a mostrar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "Mostrar só PLANO"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "Mostrar sempre a parte de texto simple e "
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Mostra a parte HTML _suprimida como anexos"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -19205,31 +18830,35 @@ msgstr "Importación de PST do Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "Cartafoles persoais do Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:296
 msgid "_Mail"
 msgstr "_Correo"
 
+#: ../plugins/pst-import/pst-importer.c:308
+msgid "Destination folder:"
+msgstr "Cartafol de destino:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "_Address Book"
 msgstr "_Axenda de enderezos"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:321
 msgid "A_ppointments"
 msgstr "Ci_tas"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:327 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tarefas"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:333
 msgid "_Journal entries"
 msgstr "Entradas de _diario"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "Importing Outlook data"
 msgstr "Importación de datos do Outlook"
 
@@ -19392,57 +19021,57 @@ msgstr ""
 "Non foi posíbel publicar o calendario: A infraestrutura Calendar xa non "
 "existe"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "Localización nova"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "Editar localización"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Non se encontrou o SpamAssassin; código: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Produciuse un fallo ao crear a canalización: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Erro despois de facer fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "O proceso fillo SpamAssassin non responde; matándoo..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Interrompeuse a espera polo proceso fillo SpamAssassin; terminando..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr ""
 "Produciuse un fallo na canalización co SpamAssassin; código de erro: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "O SpamAssassin non está dispoñíbel."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr ""
 "Isto pode facer que o SpamAssassin sexa máis fiábel, aínda que máis lento"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
 msgid "I_nclude remote tests"
 msgstr "I_ncluír probas remotas"
 
@@ -19559,23 +19188,23 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "_Formato:"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Seleccione un ficheiro de destino"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "Gardar as mensaxes como un ficheiro de texto"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "Gardar as mensaxes como un ficheiro de texto"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "Garda un calendario ou unha lista de tarefas no disco."
 
@@ -19587,47 +19216,47 @@ msgstr "Guíao durante a configuración inicial da súa conta."
 msgid "Setup Assistant"
 msgstr "Asistente de configuración"
 
-#: ../plugins/startup-wizard/startup-wizard.c:110
+#: ../plugins/startup-wizard/startup-wizard.c:117
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de configuración do Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:115
+#: ../plugins/startup-wizard/startup-wizard.c:122
 msgid "Welcome"
 msgstr "Benvido/a"
 
-#: ../plugins/startup-wizard/startup-wizard.c:118
+#: ../plugins/startup-wizard/startup-wizard.c:125
 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 ""
-"Benvido/a ao Evolution. As seguintes pantallas permitiranlle ao Evolution "
+"Benvido/a a Evolution. As seguintes pantallas permitiranlle a Evolution "
 "conectarse ás súas contas de correo e importar ficheiros desde outros "
 "aplicativos.\n"
 "\n"
 "Prema o botón \"Adiante\" para continuar. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
+#: ../plugins/startup-wizard/startup-wizard.c:160
+#: ../widgets/misc/e-import-assistant.c:389
 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:168
-#: ../widgets/misc/e-import-assistant.c:542
+#: ../plugins/startup-wizard/startup-wizard.c:175
+#: ../widgets/misc/e-import-assistant.c:545
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:185
+#: ../plugins/startup-wizard/startup-wizard.c:192
 msgid "Importing files"
 msgstr "Importación de ficheiros"
 
-#: ../plugins/startup-wizard/startup-wizard.c:248
+#: ../plugins/startup-wizard/startup-wizard.c:258
 msgid "Importing data."
 msgstr "Importando datos."
 
-#: ../plugins/startup-wizard/startup-wizard.c:250
+#: ../plugins/startup-wizard/startup-wizard.c:264
 msgid "Please wait"
 msgstr "Espere"
 
@@ -19644,7 +19273,7 @@ msgid "Thread messages by subject"
 msgstr "Encadear mensaxes polo asunto"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "Volver a relacionar as mensaxes polo _asunto"
 
@@ -19660,15 +19289,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "engadido de modelo baseado en borradores"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:615
 msgid "No Title"
 msgstr "Sen título"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:686
 msgid "Save as _Template"
 msgstr "Gardar como _modelo"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:688
 msgid "Save as Template"
 msgstr "Gardar como modelo"
 
@@ -19688,29 +19317,29 @@ msgstr "vCards en liña"
 msgid "Show vCards directly in mail messages."
 msgstr "Mostrar vCards directamente nas mensaxes de correo."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
 msgid "Show Full vCard"
 msgstr "Mostrar vCard completa"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:167
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:228
 msgid "There is one other contact."
 msgstr "Hai outro contacto máis."
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:237
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Hai outro contacto máis."
 msgstr[1] "Hai outros %d contactos."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:258
 msgid "Save in Address Book"
 msgstr "Gardar na axenda de enderezos"
 
@@ -19726,11 +19355,11 @@ msgstr "Contactos WebDAV"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Evit_ar o IfMatch (necesario no Apache < 2.2.8)"
 
@@ -19897,7 +19526,7 @@ msgstr "A barra lateral é visíbel"
 msgid "Skip development warning dialog"
 msgstr "Saltar o diálogo de aviso de desenvolvemento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:321
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexión"
 
@@ -20056,149 +19685,46 @@ msgstr "Estilo dos botóns de xanela"
 msgid "Window buttons are visible"
 msgstr "Os botóns da xanela son visíbeis"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
 msgid "Searches"
 msgstr "Buscas"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:545
 msgid "Save Search"
 msgstr "Gardar a busca"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "Mos_trar: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "Busca_r: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr " e_n "
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "Estilo da _barra de ferramentas"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "O estilo da barra de ferramentas do alternador"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "A barra de ferramentas é visíbel"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "Se a barra lateral debería ser visíbel."
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Todos os ficheiros"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "Cambiar a %s"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "A acción do alternador para esta visualización de terminal de ordes"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "Número de serie"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr ""
-"O número de páxina do libro de notas da visualización de terminal de ordes"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "Filtro de busca"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "Criterio para os resultados da búsqueda actual"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "O EShellBackend para esta visualizacion de terminal de ordes"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "Widget de contido de intérprete de ordes"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr ""
-"O contido do wiget aparece no panel dereito da xanela da terminal de ordes"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "Largura predefinida da barra lateral"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
-"A barra lateral do widget aparece no panel da esquerda da xanela da terminal "
-"de ordes"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "Widget da barra de ferramentas da terminal de ordes"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
-"O widget da barra de ferramentas aparece na parte inferior da xanela da "
-"terminal de ordes"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "_Xanela nova"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "A xanela á que pertence a visualización da terminal de ordes"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "O ficheiro chave que contén os datos de estado do wiget"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "O título da visualización da terminal de sesión"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "_Visualización actual"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "Gardar a visualización personalizada actual"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -20212,406 +19738,318 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Sitio web do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "O Bug buddy non está instalado."
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "Non foi posíbel executar o Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1343
+#: ../shell/e-shell-window-actions.c:1347
 msgid "GNOME Pilot is not installed."
 msgstr "O Bug buddy non está instalado."
 
-#: ../shell/e-shell-window-actions.c:1345
+#: ../shell/e-shell-window-actions.c:1349
 msgid "GNOME Pilot could not be run."
 msgstr "Non foi posíbel executar o Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1443
 msgid "Show information about Evolution"
 msgstr "Mostrar información sobre o Evolution"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "_Pechar xanela"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1455
 msgid "_Contents"
 msgstr "Ci_tas"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1457
 msgid "Open the Evolution User Guide"
 msgstr "Abrir o cartafol doutro usuario"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Evolution _FAQ"
 msgstr "_FAQ do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Abrir a páxina web das Preguntas frecuentes (FAQ)"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1490
 msgid "_Forget Passwords"
 msgstr "_Esquecer os contrasinais"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1492
 msgid "Forget all remembered passwords"
 msgstr "Está seguro de que quere esquecer todos os contrasinais memorizados?"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1497
 msgid "I_mport..."
 msgstr "I_mportar..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Import data from other programs"
 msgstr "Importar datos doutros programas"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1504
 msgid "New _Window"
 msgstr "_Xanela nova"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1506
 msgid "Create a new window displaying this view"
 msgstr "Crear unha xanela nova ao mostrar este cartafol"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Configure Evolution"
 msgstr "Configuración"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Show Evolution's shortcut keys"
 msgstr "Modificar a configuración do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "Saír do programa"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "Busca _avanzada..."
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr "Constrúe unha búsqueda máis avanzada"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Clear the current search parameters"
 msgstr "Limpar búsqueda"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1553
 msgid "_Edit Saved Searches..."
 msgstr "_Editar as buscas gardadas..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Manage your saved searches"
 msgstr "Xestionar o seu correo, contactos e calendario"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "Prema aquí para cambiar o tipo de busca"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "_Buscar agora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Execute the current search parameters"
 msgstr "Cancelar a operación de correo actual"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "_Gardar a busca..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Save the current search parameters"
 msgstr "Gardar o ficheiro actual"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Send / _Receive"
 msgstr "Enviar/_Recibir"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar elementos da fila e obter elementos novos"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Submit _Bug Report..."
 msgstr "Enviar un _informe de erro"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1602
 msgid "GNOME Pilot _Synchronization..."
 msgstr "_Sincronización con GNOME Pilot..."
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1604
 msgid "Set up GNOME Pilot configuration"
 msgstr "Definir a configuración do GNOME Pilot"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Work Offline"
 msgstr "_Traballar sen conexión"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1611
 msgid "Put Evolution into offline mode"
 msgstr "Iniciar en modo sen conexión"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Work Online"
 msgstr "_Traballar con conexión"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1618
 msgid "Put Evolution into online mode"
 msgstr "Iniciar en modo con conexión"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1646
 msgid "Lay_out"
 msgstr "Disp_osición"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_New"
 msgstr "_Novo"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Switcher Appearance"
 msgstr "Aparencia do _selector"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Window"
 msgstr "_Xanela"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show Side _Bar"
 msgstr "Mostrar _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1712
 msgid "Show the side bar"
 msgstr "Mostrar _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show _Buttons"
 msgstr "Mostrar animacións"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1720
 msgid "Show the switcher buttons"
 msgstr "Mostrar o fuso horario secundario"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1726
 msgid "Show _Status Bar"
 msgstr "Mostrar _barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Show the status bar"
 msgstr "Mostrar _barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1734
 msgid "Show _Tool Bar"
 msgstr "Mostrar barra de _ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1736
 msgid "Show the tool bar"
 msgstr "Mostrar barra de _ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1758
 msgid "_Icons Only"
 msgstr "Só _iconas"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Display window buttons with icons only"
 msgstr "Mostrar os botóns da xanela só con iconas"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1765
 msgid "_Text Only"
 msgstr "Só _texto"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1767
 msgid "Display window buttons with text only"
 msgstr "Mostrar os botóns da xanela só con texto"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Icons _and Text"
 msgstr "Iconas _e texto"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Display window buttons with icons and text"
 msgstr "Mostrar os botóns da xanela con iconas e texto"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Tool_bar Style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Mostrar os botóns da xanela usando a configuración da barra de ferramentas "
 "do escritorio"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Define Views..."
 msgstr "Definir visualizacións..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1791
 msgid "Create or edit views"
 msgstr "Crear ou editar visualizacións"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Save Custom View..."
 msgstr "Gardar visualización personalizada..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Save current custom view"
 msgstr "Gardar a visualización personalizada actual"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1805
 msgid "C_urrent View"
 msgstr "Visualización act_ual"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Custom View"
 msgstr "Visualización personalizada"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Current view is a customized view"
 msgstr "A visualización actual é unha visualización personalizada"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1827
 msgid "Change the page settings for your current printer"
 msgstr "Definir a configuración da páxina para a impresora actual"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2204
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2417
 msgid "Execute these search parameters"
 msgstr "Executar estes parámetros de búsqueda"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:573
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "Visualización da terminal de ordes activa"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "Nome da visualización nova:"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "O EFocusTracker da xanela da terminal de ordes"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "Xeometría"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "A cadea da xeometría inicial da xanela"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Activar _cursor"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Indica se o engadido está activado"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "A barra lateral é visíbel"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "Se os botóns da xanela deberían ser visíbeis."
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "A barra lateral é visíbel"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Se os botóns da xanela deberían ser visíbeis."
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "A barra de estado é visíbel"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "Se a barra de estado debería ser visíbel."
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Se os botóns da xanela deberían ser visíbeis."
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "Xestor"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "O GtkUIManager da xanela da terminal de ordes"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "Preparando a conta '%s' para o modo sen conexión"
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "Preparando a conta '%s' para o modo sen conexión"
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "Preparándose para saír..."
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "Cartafol onde gardar"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "O cartafol desde o cal ler EModules"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "TLS non dispoñíbel"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "Indica se o engadido está activado"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "Conectado"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "Indica se o engadido está activado"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:172
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20648,7 +20086,7 @@ msgstr ""
 "Esperamos que lles sexa de proveito o resultado do noso duro traballo, e\n"
 "agardamos ansiosamente as súas colaboracións!\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:196
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20656,61 +20094,57 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:203
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:317
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution activando o compoñente especificado"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:319
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometría fornecida á xanela principal"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:323
 msgid "Start in online mode"
 msgstr "Iniciar en modo con conexión"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:325
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo \"express\""
 
-#: ../shell/main.c:333
+#: ../shell/main.c:328
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche de todos os compoñentes do Evolution"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Forza a remigración desde o Evolution 1.4"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:331
 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:342
+#: ../shell/main.c:333
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de calquera engadido."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:335
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de previsualización de correo, contactos e tarefas."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:339
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 "Imporatar os URIs ou nomes de ficheiros fornecidos como o resto dos "
 "argumentos."
 
-#: ../shell/main.c:350
+#: ../shell/main.c:341
 msgid "Request a running Evolution process to quit"
 msgstr "Reiniciando o Evolution"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:458
 msgid "- The Evolution PIM and Email Client"
 msgstr "- O cliente de correo e PIM do Evolution"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:509
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20724,99 +20158,44 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Está seguro de que quere esquecer todos os contrasinais memorizados?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Continuar"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Non é posíbel actualizar directamente desde a versión {0}"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Quere eliminar os datos antigos da versión {0}?"
+msgid "Continue Anyway"
+msgstr "Continuar de todas formas"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+"Evolution xa non admite a actualización directamente desde a versión {0}. "
+"Porén, como solución pode intentar actualizar primeiro a Evolution 2 e "
+"despois a Evolution 3."
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "Ao esquecer os seus contrasinais memorizados eliminará todos os contrasinais "
 "gardados. Volveráselle preguntar a próxima vez que sexan necesarios."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "Espazo en disco insuficiente para a actualización."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "Está seguro de que quere eliminar os datos antigos?"
+msgid "Quit Now"
+msgstr "Saír agora"
 
 #: ../shell/shell.error.xml.h:8
-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 ""
-"Todo o contido do cartafol &quot;evolution&quot; vaise eliminar "
-"permanentemente.\n"
-"\n"
-"Suxíreselle que verifique manualmente que todos os datos do seu correo, "
-"contactos, e calendarios están presentes, e que esta versión do Evolution "
-"funciona correctamente antes de eliminar os datos antigos.\n"
-"\n"
-"Unha vez eliminados, non poderá desactualizarse á versión anterior do "
-"Evolution sen intervención manual.\n"
-
-#: ../shell/shell.error.xml.h:14
-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 ""
-"As versións anteriores do Evolution gardan os seus datos nunha localización "
-"diferente.\n"
-"\n"
-"Se escolle eliminar estes datos, todos os contidos do cartafol &quot;"
-"evolution&quot; serán eliminados permanentemente. Se escolle gardar estes "
-"datos, entón poderá eliminar os contidos de &quot;evolution&quot; cando o "
-"vexa conveniente.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "Produciuse un fallo ao actualizar desde a versión anterior: {0}"
 
-#: ../shell/shell.error.xml.h:19
-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 ""
-"A actualización dos seus datos e configuración requirirá até {0} de espazo "
-"no disco, mais só ten {1} dispoñíbeis.\n"
-"\n"
-"Necesitará facer máis espazo dispoñíbel no seu cartafol persoal antes de que "
-"poida continuar."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "_Esquecer"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_Conservar os datos"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_Avisarme máis tarde"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20910,7 +20289,7 @@ msgstr "Opcións de xestión de sesión:"
 msgid "Show session management options"
 msgstr "Mostrar as animacións de imaxe "
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20968,7 +20347,7 @@ msgstr "Nome do certificado"
 msgid "Purposes"
 msgstr "Obxectivos"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Número de serie"
@@ -20989,19 +20368,19 @@ msgstr "Enderezo de correo electrónico"
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros CA de certificación de correo"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:1052
 msgid "Certificates"
 msgstr "Certificados"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de certificados: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "Introduza o seu contrasinal para `%s'"
+msgid "Enter the password for '%s'"
+msgstr "Introduza o seu contrasinal para «%s»"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -21031,7 +20410,7 @@ msgstr ""
 "Emitido por:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Seleccione o certificado"
 
@@ -21044,14 +20423,10 @@ msgid "Authorities"
 msgstr "Autoridades"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "Facer unha copia de seguranza"
+msgid "Backup _All"
+msgstr "Respaldar _todo"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "Facer unha copia de seguranza para todo"
-
-#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -21059,158 +20434,150 @@ msgstr ""
 "Antes de confiar nesta CA para calquera obxectivo, debería examinar o seu "
 "certificado e as súas directrices e procedementos (se están dispoñíbeis)."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "Certificado"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "Confianza na autoridade do certificado"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "<b>Campos do certificado</b>"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "<b>Xerarquía do certificado</b>"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "Detalles do certificado"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "Táboa de certificados"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "Nome común (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Certificados de contactos"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Non confiar na autenticidade deste certificado"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "Editar"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "Control de confianza de certificados de correo"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "Certificado do destinatario do correo"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "Certificado do asinante do correo"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Caduca o"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "Nome do campo"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "Impresión dixital MD5"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "Importar"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "Emitido o"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Emitido o"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "Emitido o"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "Impresión dixital MD5"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "Organización (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "Unidade organizacional (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "Impresión dixital SHA1"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "Certificado de cliente SSL"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "Certificado de servidor SSL"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "<b>Este certificado verificouse para os seguintes usos:</b>"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "Confiar na autenticidade deste certificado"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "Confiar nesta AC para identificar a usuarios de correo."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "Confiar nesta AC para identificar desenvolvedores de software."
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
-msgstr "Confiar nesta AC para identificar sitios web."
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
+msgstr "Confiar nesta CA para identificar sitios web."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "<b>Validación</b>"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "Ver"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Ten certificados destas organizacións que o identifican:"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Ten nun ficheiro os certificados que identifican a estas autoridades de "
 "certificación:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "Ten nun ficheiro os certificados que identifican a estas persoas:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "Os seus certificados"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_Backup"
+msgstr "_Respaldar"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "_Editar confianza na CA"
 
@@ -21260,125 +20627,143 @@ msgstr "PKCS #1 MD5 con cifrado RSA"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:642
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:645
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 cifrado RSA"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "Uso da chave de certificado"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador da chave da autoridade do certificado"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador do obxecto (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "Identificador do algoritmo"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "Parámetros do algoritmo"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "Información do asunto da chave pública"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmo da chave pública do asunto"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "Chave pública do asunto"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "Erro: non é posíbel procesar a extensión"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "Asinante do obxecto"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "Autoridade do certificado SSL"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "Autoridade do certificado de correo"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "Sinatura"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "Non rexeitar"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "Cifrado da chave"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "Cifrado de datos"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "Acordo de chaves"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "Asinante do certificado"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "Asinante da LRC"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "Non crítico"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "Extensións"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo de sinatura do certificado"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "Emisor"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "ID único do emisor"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "ID único do asunto"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "Valor da sinatura do certificado"
 
@@ -21467,11 +20852,11 @@ msgid "With _Status"
 msgstr "Con e_stado"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -21501,19 +20886,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "Modo de selección"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "Colección"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:347
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definir visualizacións para %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:355
+#: ../widgets/menus/gal-define-views-dialog.c:357
 msgid "Define Views"
 msgstr "Definir visualizacións"
 
@@ -21526,11 +20906,7 @@ msgstr "Definir visualizacións para \"%s\""
 msgid "Table"
 msgstr "Táboa"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Instancia"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Gardar visualización actual"
 
@@ -21542,11 +20918,7 @@ msgstr "_Crear visualización nova"
 msgid "_Replace existing view"
 msgstr "_Substituír visualización existente"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "Factoría"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "Definir visualizacións novas"
 
@@ -21566,22 +20938,10 @@ msgstr "Tipo de visualización:"
 msgid "De_fault"
 msgstr "Pre_determinado"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "Nome da conta"
-
 #: ../widgets/misc/e-account-tree-view.c:255
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "_Accións"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "Un GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Propiedades de anexos"
@@ -21599,11 +20959,11 @@ msgstr "Tipo MIME:"
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suxerir mostrar o anexo automaticamente"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "Non foi posíbel definir como fondo"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "Definir como _fondo"
 
@@ -21621,13 +20981,13 @@ msgstr "_Enviar a..."
 msgid "Send the selected attachments somewhere"
 msgstr "Enviar os anexos seleccionados a algún lugar"
 
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:495
+#: ../widgets/misc/e-attachment-tree-view.c:535
 msgid "Loading"
 msgstr "Cargando"
 
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:507
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Saving"
 msgstr "Gargando"
 
@@ -21636,13 +20996,10 @@ msgid "Hide Attachment _Bar"
 msgstr "Ocultar a _barra de anexos"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:605
 msgid "Show Attachment _Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "Mostrar a _barra de anexos"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "Engadir anexo"
@@ -21659,32 +21016,32 @@ msgstr[1] "Gardar anexos"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "G_ardar todos"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "_Engadir anexo..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:356
 msgid "_View Inline"
 msgstr "_Ver en liña"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Abrir con \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Abrir os anexos en %s"
@@ -21694,59 +21051,59 @@ msgstr "Abrir os anexos en %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "Mensaxe anexa"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 msgid "A load operation is already in progress"
 msgstr "Xa se está a executar unha operación de cargado"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 msgid "A save operation is already in progress"
 msgstr "Xa se está a executar unha operación de gardado"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Non foi posíbel cargar '%s'"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Non foi posíbel cargar o anexo"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2193
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Non foi posíbel abrir '%s'"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2196
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Non foi posíbel abrir o anexo"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "Os contidos dos anexos non foron cargados"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2707
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Non foi posíbel gardar '%s'"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2710
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Non foi posíbel gardar o anexo"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "Prema para abrir %s"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1255
 msgid "%B %Y"
 msgstr "%B de %Y"
 
@@ -21754,65 +21111,6 @@ msgstr "%B de %Y"
 msgid "Month Calendar"
 msgstr "Calendario mensual"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Encher con cor"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "Encher con cor GDK"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Encher con liña de puntos"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Largura mínima"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Largura mínima"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Espazamento"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Codificación de caracteres"
@@ -21825,52 +21123,52 @@ msgstr "Introduza o conxunto de caracteres que se vai usar"
 msgid "Other..."
 msgstr "Outro..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir a data"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Prema este botón para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Caixa de combinación despregábel para seleccionar a hora"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "Ago_ra"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_Hoxe"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Ningún"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "Ningún"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "O valor da data non é válido"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "O valor da hora non é válido"
 
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:242
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21878,40 +21176,37 @@ msgstr ""
 "Escolla o ficheiro que quere importar ao Evolution e seleccione que tipo de "
 "ficheiro é na listaxe."
 
-#: ../widgets/misc/e-import-assistant.c:255
+#: ../widgets/misc/e-import-assistant.c:259
 msgid "F_ilename:"
 msgstr "Nome do f_icheiro:"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:283
+#: ../widgets/misc/e-import-assistant.c:458
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:326
+#: ../widgets/misc/e-import-assistant.c:875
 msgid "Choose the destination for this import"
 msgstr "Escolla o destino desta importación"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:351
 msgid "Choose the type of importer to run:"
 msgstr "Seleccione o tipo de importador que se executará:"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:359
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos e configuración de programas _antigos"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:367
 msgid "Import a _single file"
 msgstr "Importar un úni_co ficheiro"
 
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr "Seleccione o tipo de ficheiro que quere importar desde a lista."
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:519
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21922,17 +21217,34 @@ msgstr ""
 "localizou ningunha configuración que se poida importar. Se\n"
 "quere tentalo de novo, prema o botón \"Atrás\"."
 
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#: ../widgets/misc/e-import-assistant.c:874
+msgid "Preview data to be imported"
+msgstr "Previsualizar os datos a importar"
+
+#: ../widgets/misc/e-import-assistant.c:879
+#: ../widgets/misc/e-import-assistant.c:888
+#: ../widgets/misc/e-import-assistant.c:1265
+#: ../widgets/misc/e-import-assistant.c:1338
+#: ../widgets/misc/e-import-assistant.c:1348
+msgid "Import Data"
+msgstr "Importante"
+
+#. multiple importers found, be able to choose from them
+#: ../widgets/misc/e-import-assistant.c:884
+msgid "Select what type of file you want to import from the list."
+msgstr "Seleccione o tipo de ficheiro que quere importar desde a lista."
+
+#: ../widgets/misc/e-import-assistant.c:1256
+#: ../widgets/misc/e-import-assistant.c:1291
 msgid "Evolution Import Assistant"
 msgstr "Asistente de importación do Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1273
+#: ../widgets/misc/e-import-assistant.c:1325
 msgid "Import Location"
 msgstr "Importar localización"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1284
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21942,33 +21254,28 @@ msgstr ""
 "Este asistente guiarao no proceso de importación de\n"
 "ficheiros externos ao Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1300
 msgid "Importer Type"
 msgstr "Tipo de importador"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1309
 msgid "Select Information to Import"
 msgstr "Seleccione a información para importar"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1317
 msgid "Select a File"
 msgstr "Seleccionar un ficheiro"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1332
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr ""
 "Prema en \"Importar\" para comezar a importar o ficheiro ao Evolution. "
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "Importante"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "Mapa do mundo"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21995,42 +21302,6 @@ msgstr ""
 "O Evolution está actualmente desconectado.\n"
 "Prema neste botón para traballar conectado."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "O estado do botón é conectado"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "Posición horizontal do panel"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "Posición do panel ao orientalo horizontalmente"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "Posición vertical do panel"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "Posición do panel ao orientalo verticalmente"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "_Propiedades"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "Proporción do tamaño do segundo panel"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "_Redimensionar"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Manter o segundo panel fixo durante o redimensionado"
-
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Sincronizar con:"
@@ -22052,68 +21323,46 @@ msgstr "Preferencias do Evolution"
 msgid "Matches: %d"
 msgstr "Equivalencias: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "Pechar esta barra de búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "Limpar búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "Buscar a anterior aparición na frase"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "Buscar a seguinte aparición na frase"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "_Coincidir maiúsculas e minúsculas"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr "Atinxiuse o final da páxina, continúase pola parte superior"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "Atinxiuse a parte superior da páxina, continúase pola parte inferior"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "Fila de cursor"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Columna de cursor"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Clasificador"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Modo de selección"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Modo do cursor"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Ao e_liminar:"
@@ -22188,43 +21437,46 @@ msgstr "Ao co_mpletar:"
 msgid "When decli_ned:"
 msgstr "Ao _rexeitar:"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "Den_tro"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "_Despois:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_After"
+msgstr "_Despois"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_Toda a información"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "_Clasificación:"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "_Atrasar a entrega da mensaxe"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "_Entregada"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "_Definir a data de vencemento"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "_Até:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "_Until"
+msgstr "_Até"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "_Cando sexa conveniente"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "_Ao abrir:"
 
@@ -22280,41 +21532,41 @@ msgstr "O ficheiro de script debe existir e ser executábel."
 msgid "Click here to go to URL"
 msgstr "Prema aquí para ir ao URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:359
 msgid "_Copy Link Location"
 msgstr "_Copiar a localización da ligazón"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:361
 msgid "Copy the link to the clipboard"
 msgstr "Copia obxectos no portapapeis."
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Open Link in Browser"
 msgstr "_Abrir ligazón no navegador"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:371
 msgid "Open the link in a web browser"
 msgstr "_Abrir ligazón no navegador"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Copy Email Address"
 msgstr "Copiar enderezo de _correo"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
 msgid "Select all text and images"
 msgstr "Seleccionar todo o texto dunha mensaxe"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 #, c-format
 msgid "Click to call %s"
 msgstr "Prema para chamar %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:846
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar ou mostrar os enderezos"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
@@ -22333,7 +21585,7 @@ msgstr "Calendario: desde %s até %s"
 msgid "evolution calendar item"
 msgstr "elemento de calendario do Evolution"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "lista emerxente"
 
@@ -22351,7 +21603,7 @@ msgstr "Ningún"
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A data ten que ser introducida no formato: %s"
@@ -22360,48 +21612,12 @@ msgstr "A data ten que ser introducida no formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, incluídos"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Columna seleccionada"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Columna enfocada"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Columna non seleccionada"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Riscar columna"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "Subliñar columna"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Columna en negra"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Cor da columna"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Cor de fondo da columna"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "prema para engadir"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Estado"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Ascendente)"
@@ -22418,12 +21634,12 @@ msgstr "Sen ordenar"
 msgid "No grouping"
 msgstr "Sen agrupar"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Mostrar os campos"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "Campos dispoñíbeis"
 
@@ -22432,7 +21648,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos _dispoñíbeis:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -22445,7 +21661,7 @@ msgid "Clear _All"
 msgstr "Limp_ar todo"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "Descendente"
 
@@ -22505,7 +21721,7 @@ msgstr "_Mostrar estes campos por orde:"
 msgid "_Sort..."
 msgstr "_Ordenar..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "Engadir unha c_olumna..."
 
@@ -22517,248 +21733,112 @@ msgstr ""
 "Para engadir unha columna á súa táboa, arrástrea á\n"
 "localización na que quere que apareza."
 
-#: ../widgets/table/e-table-group-container.c:342
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
 #, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s : %s (%d elemento)"
 msgstr[1] "%s : %s (%d elementos)"
 
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Alternar as cores das filas"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Debuxar a grade horizontal"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Debuxar a grade vertical"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Debuxar o foco"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Modo de cursor"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Modelo de selección"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "Límite de lonxitude"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Altura uniforme da fila"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "Conxelado"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
 msgstr "Personalizar a visualización actual"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Sort _Ascending"
 msgstr "Orde _ascendente"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1565
 msgid "Sort _Descending"
 msgstr "Orde _descendente"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1568
 msgid "_Unsort"
 msgstr "Sen ord_enar"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1571
 msgid "Group By This _Field"
 msgstr "Agrupar por este ca_mpo"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Group By _Box"
 msgstr "Agrupar por cai_xa"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Remove This _Column"
 msgstr "Eliminar esta _columna"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Add a C_olumn..."
 msgstr "Engadir unha c_olumna..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "A_lignment"
 msgstr "A_liñamento"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "B_est Fit"
 msgstr "Axuste ópt_imo"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Format Column_s..."
 msgstr "Formatar columna_s..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar a visualización actual..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Sort By"
 msgstr "O_rdenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1672
 msgid "_Custom"
 msgstr "_Personalizado"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "Cabeceira da táboa"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Modelo da táboa"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Fila do cursor"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Ordenar a información"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Buscar sempre"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Premer para engadir"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "Debuxar a grade vertical"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr ""
-"Espazo vertical entre filas. Engádese na parte superior e inferior dunha fila"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "Adaptador de táboa Etree"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Aparencia retro"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Debuxar liñas e expansores +/-."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "Tamaño do expansor"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "Tamaño da frecha do expansor"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "emerxente"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "emerxer un fillo"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "editar"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "comezar a editar esta cela"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "alternar o estado"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "alternar o estado da cela"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "expandir"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "expande a fila no ETree que contén esta cela"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "contraer"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "contrae a fila no ETree que contén esta cela"
 
@@ -22774,115 +21854,1051 @@ msgstr "premer"
 msgid "sort"
 msgstr "ordenar"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "Métodos de entrada"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Procesador de eventos"
+#~ msgid "address card"
+#~ msgstr "tarxeta de enderezo"
+
+#~ msgid "calendar information"
+#~ msgstr "información de calendario"
+
+#~ msgid "Check whether Evolution is the default mail client on startup."
+#~ msgstr ""
+#~ "Verificar se o Evolution é o cliente de correo predefinido ao iniciar."
+
+#~ msgid "Default Mail Client"
+#~ msgstr "Cliente de correo predefinido"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Detalles persoais:</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Detalles de recepción:</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Detalles de envío:</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Xestión de conta</span>"
+
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>Opción para responder por encima</b> (Non se recomenda)"
+
+#~ msgid "<b>Server</b>"
+#~ msgstr "<b>Servidor</b>"
+
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>Usuarios:</b>"
+
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>Nome da conta</b>"
+
+#~ msgid "_Accept"
+#~ msgstr "_Aceptar"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#~ msgid "Import"
+#~ msgstr "Importar"
+
+#~ msgid "View"
+#~ msgstr "Ver"
+
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
+#~ msgid "Web Log:"
+#~ msgstr "Rexistro _web:"
+
+#~ msgid "_Web Log:"
+#~ msgstr "Rexistro _web:"
+
+#~ msgid "Editable"
+#~ msgstr "Editábel"
+
+#~ msgid "Source Book"
+#~ msgstr "Axenda de enderezos de orixe"
+
+#~ msgid "Target Book"
+#~ msgstr "Axenda de enderezos de destino"
+
+#~ msgid "Is New Contact"
+#~ msgstr "É un contacto novo"
+
+#~ msgid "Writable Fields"
+#~ msgstr "Campos que se poden escribir"
+
+#~ msgid "Required Fields"
+#~ msgstr "Campos requiridos"
+
+#~ msgid "Changed"
+#~ msgstr "Modificado"
+
+#~ msgid "Shell"
+#~ msgstr "Terminal"
+
+#~ msgid "The EShell singleton"
+#~ msgstr "O singleton de EShell"
+
+#~ msgid "Book"
+#~ msgstr "Axenda de enderezos"
+
+#~ msgid "Is New List"
+#~ msgstr "É unha lista nova"
+
+#~ msgid "Query"
+#~ msgstr "Consulta"
+
+#~ msgid "Model"
+#~ msgstr "Modelo"
+
+#~ msgid "Shell View"
+#~ msgstr "Visualización de terminal"
+
+#~ msgid "Source"
+#~ msgstr "Orixe"
+
+#~ msgid "Width"
+#~ msgstr "Largura"
+
+#~ msgid "Height"
+#~ msgstr "Altura"
+
+#~ msgid "Has Focus"
+#~ msgstr "Ten foco"
+
+#~ msgid "Field"
+#~ msgstr "Campo"
+
+#~ msgid "Field Name"
+#~ msgstr "Nome do campo"
+
+#~ msgid "Text Model"
+#~ msgstr "Modelo de texto"
+
+#~ msgid "Max field name length"
+#~ msgstr "Lonxitude máxima do campo"
+
+#~ msgid "Column Width"
+#~ msgstr "Largura da columna"
+
+#~ msgid "Adapter"
+#~ msgstr "Adaptador"
+
+#~ msgid "Selected"
+#~ msgstr "Seleccionado"
+
+#~ msgid "Has Cursor"
+#~ msgstr "Posúe cursor"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "O repositorio de calendarios está desconectado."
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "Erro en '{0}'"
+
+#~ msgid "No response from the server."
+#~ msgstr "Non hai resposta do servidor."
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "Non é posíbel cargar o calendario"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Check this to use system timezone in Evolution."
+#~ msgstr "Active isto para empregar o fuso horario do sistema en Evolution."
+
+#~ msgid "Attendee_s..."
+#~ msgstr "Participante_s..."
+
+#~ msgid "Default Client"
+#~ msgstr "Cliente predefinido"
+
+#~ msgid "Shell Settings"
+#~ msgstr "Configuración do Exchange"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "Configuración do completado automático"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "Par_ticipantes..."
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "_Seleccionar hoxe"
+
+#~| msgid "New _Task"
+#~ msgid "New Tab"
+#~ msgstr "Novo _separador"
+
+#~ msgid "Name of the logger"
+#~ msgstr "Nome do compoñente que se está rexistrando"
+
+#~ msgid "Filename"
+#~ msgstr "Nome do f_icheiro:"
+
+#~ msgid "The filename of the module"
+#~ msgstr "Modificar o nome deste cartafol"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "Indica se o engadido está activado"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "Enfocar o tracker"
+
+#~ msgid "Shell Module"
+#~ msgstr "Modo de selección"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "A infraestrutura da terminal de mail"
+
+#~ msgid "Show Deleted"
+#~ msgstr "Eliminada"
+
+#~ msgid "To Do"
+#~ msgstr "Tarefas pendentes"
+
+#~ msgid "Later"
+#~ msgstr "Máis tarde"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "Non é posíbel crear un cartafol novo: `%s': %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "Non é posíbel copiar o cartafol `%s' en `%s': %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "Non é posíbel examinar as caixas de correo existentes en `%s': %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "A localización e a xerarquía dos cartafoles da caixa de correo "
+#~ "modificouse desde Evolution 1.x.\n"
+#~ "\n"
+#~ "Agarde mentres o Evolution migra os seus cartafoles..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "Non é posíbel abrir os datos antigos POP keep-on-server `%s': %s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr ""
+#~ "Non é posíbel crear o cartafol de datos POP3 keep-on-server `%s': %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "Non é posíbel copiar os datos POP3 keep-on-server `%s': %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr ""
+#~ "Produciuse un fallo ao crear o almacenamento de correo local `%s': %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "Non é posíbel ler a configuración da instalación anterior do Evolution: "
+#~ "`evolution/config.xmldb' non existe ou está danado."
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr ""
+#~ "Permite que o Evolution mostre unha parte de texto de tamaño limitado"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr ""
+#~ "Active isto para renderizar a parte da mensaxe de texto de tamaño "
+#~ "limitado."
+
+#~ msgid "Text message part limit"
+#~ msgstr "Límite da parte de texto da mensaxe"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "Por causa de \"{0}\"."
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "Por causa de \"{2}\"."
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Os seguintes cartafoles de busca:\n"
+#~ "{0}\n"
+#~ "usan o cartafol que se eliminou agora:\n"
+#~ "    \"{1}\"\n"
+#~ "e foron actualizados."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "As seguintes regras de filtraxe:\n"
+#~ "{0}\n"
+#~ "usan o cartafol que se eliminou agora:\n"
+#~ "    \"{1}\"\n"
+#~ "e foron actualizadas."
+
+#~ msgid "Shell Backend"
+#~ msgstr "Infraestrutura shell"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "Só hai mensaxes ocultas neste cartafol. Use Ver -> Mostrar mensaxes "
+#~ "ocultas para velas."
+
+#~ msgid "Table column:"
+#~ msgstr "Columna da táboa:"
+
+#~ msgid "Source List"
+#~ msgstr "Orixe"
+
+#~ msgid "The registry of address books"
+#~ msgstr "Non foi posíbel obter unha lista de axendas de enderezos"
+
+#~ msgid "Current View"
+#~ msgstr "_Visualización actual"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "A visualización de axenda de enderezo seleccionada actualmente"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "Contacto novo"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "Indica se se mostra o panel de previsualización."
+
+#~ msgid "Preview is Visible"
+#~ msgstr "A barra lateral é visíbel"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "Indica se se mostra o panel de previsualización."
+
+#~ msgid "LDAP Servers"
+#~ msgstr "Servidores LDAP"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "Configuración do completado automático"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution contact folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "A localización e a xerarquía dos cartafoles de contactos do Evolution "
+#~ "modificouse desde o Evolution 1.x.\n"
+#~ "\n"
+#~ "Sexa paciente mentres o Evolution migra os seus cartafoles..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Modificouse o formato dos contactos da lista de correo.\n"
+#~ "\n"
+#~ "Sexa paciente mentres o Evolution migra os seus cartafoles..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Modificouse a maneira en que o Evolution almacena algúns números de "
+#~ "teléfono.\n"
+#~ "\n"
+#~ "Sexa paciente mentres o Evolution migra os seus cartafoles..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Modificouse o rexistro de modificacións e os ficheiros de mapa no Palm "
+#~ "Sync do Evolution.\n"
+#~ "\n"
+#~ "Sexa paciente mentres o Evolution migra os seus datos Pilot Sync..."
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "Selector de orixe de notas"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "Non foi posíbel obter unha lista de axendas de enderezos"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "Gardar como vCard..."
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "Calendario primario"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution calendar folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "A localización e xerarquía dos cartafoles de calendario do Evolution "
+#~ "modificouse desde o Evolution 1.x.\n"
+#~ "\n"
+#~ "Agarde mentres o Evolution migra os seus cartafoles..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr ""
+#~ "Non é posíbel migrar a configuración antiga desde evolution/config.xmldb"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "Non foi posíbel migrar o calendario `%s'"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "Widget do navegador de datas"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "Este widget mostra unha calendario en miniatura"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "Cliente de correo predefinido"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "O cliente predefinido para as operacións no calendario"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "Este widget mostra grupos de calendarios"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "Lista de notas primaria"
+
+#~ msgid "The memo table model"
+#~ msgstr "Modelo da táboa"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "Cliente de recordatorios predefinido"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "Cliente predefinido para as operacións nas citas"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "Este widget mostra os grupos de listas de recordatorios"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "Lista de tarefas primaria"
+
+#~ msgid "The task table model"
+#~ msgstr "Modelo da táboa"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "A localización e xerarquía dos cartafoles de tarefas do Evolution "
+#~ "modificouse desde o Evolution 1.x.\n"
+#~ "\n"
+#~ "Agarde mentres o Evolution migra os seus cartafoles..."
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "Non foi posíbel migrar as tarefas `%s'"
+
+#~ msgid "Default Task Client"
+#~ msgstr "Cliente de tarefas predefinido"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "Cliente predefinido para a operación na tarefa"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "Este widget mostra os grupos de listas de tarefas"
+
+#~ msgid "Group by Threads"
+#~ msgstr "Agr_upar por fíos"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "Indica se as mensaxes se agrupan por fíos"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Ocultar as mensaxes _lidas"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "Ocultar temporalmente todas as mensaxes lidas"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Ocultar as mensaxes s_eleccionadas"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "Ocultar temporalmente as mensaxes seleccionadas"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "Mostrar as mensaxes o_cultas"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "Mostrar as mensaxes ocultas temporalmente"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Ocultar as mensaxes elimina_das"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "Ocultar as mensaxes eliminadas en vez de mostralas riscadas"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr ""
+#~ "Lista de pistas do engadido de aviso de anexos para buscar no corpo dunha "
+#~ "mensaxe."
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "Engade a compatibilidade de Hula con Evolution."
+
+#~ msgid "Hula Support"
+#~ msgstr "Compatibilidade con Hula"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "Estilo da _barra de ferramentas"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "O estilo da barra de ferramentas do alternador"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "A barra de ferramentas é visíbel"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "Se a barra lateral debería ser visíbel."
+
+#~ msgid "Switcher Action"
+#~ msgstr "Cambiar a %s"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "A acción do alternador para esta visualización de terminal de ordes"
+
+#~ msgid "Page Number"
+#~ msgstr "Número de serie"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr ""
+#~ "O número de páxina do libro de notas da visualización de terminal de ordes"
+
+#~ msgid "Search Rule"
+#~ msgstr "Filtro de busca"
+
+#~ msgid "Criteria for the current search results"
+#~ msgstr "Criterio para os resultados da búsqueda actual"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "O EShellBackend para esta visualizacion de terminal de ordes"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "Widget de contido de intérprete de ordes"
+
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr ""
+#~ "O contido do wiget aparece no panel dereito da xanela da terminal de ordes"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Largura predefinida da barra lateral"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr ""
+#~ "A barra lateral do widget aparece no panel da esquerda da xanela da "
+#~ "terminal de ordes"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "Widget da barra de ferramentas da terminal de ordes"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr ""
+#~ "O widget da barra de ferramentas aparece na parte inferior da xanela da "
+#~ "terminal de ordes"
+
+#~ msgid "Shell Window"
+#~ msgstr "_Xanela nova"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "A xanela á que pertence a visualización da terminal de ordes"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "O ficheiro chave que contén os datos de estado do wiget"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "O título da visualización da terminal de sesión"
+
+#~ msgid "Current View ID"
+#~ msgstr "_Visualización actual"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "Gardar a visualización personalizada actual"
+
+#~ msgid "Active Shell View"
+#~ msgstr "Visualización da terminal de ordes activa"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "Nome da visualización nova:"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "O EFocusTracker da xanela da terminal de ordes"
+
+#~ msgid "Geometry"
+#~ msgstr "Xeometría"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "A cadea da xeometría inicial da xanela"
+
+#~ msgid "Safe Mode"
+#~ msgstr "Activar _cursor"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "Indica se o engadido está activado"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "A barra lateral é visíbel"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "Se os botóns da xanela deberían ser visíbeis."
+
+#~ msgid "Switcher Visible"
+#~ msgstr "A barra lateral é visíbel"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "Se os botóns da xanela deberían ser visíbeis."
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "A barra de estado é visíbel"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "Se a barra de estado debería ser visíbel."
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "Se os botóns da xanela deberían ser visíbeis."
+
+#~ msgid "UI Manager"
+#~ msgstr "Xestor"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "O GtkUIManager da xanela da terminal de ordes"
+
+#~ msgid "Module Directory"
+#~ msgstr "Cartafol onde gardar"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "O cartafol desde o cal ler EModules"
+
+#~ msgid "Network Available"
+#~ msgstr "TLS non dispoñíbel"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "Indica se o engadido está activado"
+
+#~ msgid "Online"
+#~ msgstr "Conectado"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "Indica se o engadido está activado"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "Forza a remigración desde o Evolution 1.4"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "Espazo en disco insuficiente para a actualización."
+
+#~ msgid "Really delete old data?"
+#~ msgstr "Está seguro de que quere eliminar os datos antigos?"
+
+#~ 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 ""
+#~ "Todo o contido do cartafol &quot;evolution&quot; vaise eliminar "
+#~ "permanentemente.\n"
+#~ "\n"
+#~ "Suxíreselle que verifique manualmente que todos os datos do seu correo, "
+#~ "contactos, e calendarios están presentes, e que esta versión do Evolution "
+#~ "funciona correctamente antes de eliminar os datos antigos.\n"
+#~ "\n"
+#~ "Unha vez eliminados, non poderá desactualizarse á versión anterior do "
+#~ "Evolution sen intervención manual.\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "As versións anteriores do Evolution gardan os seus datos nunha "
+#~ "localización diferente.\n"
+#~ "\n"
+#~ "Se escolle eliminar estes datos, todos os contidos do cartafol &quot;"
+#~ "evolution&quot; serán eliminados permanentemente. Se escolle gardar estes "
+#~ "datos, entón poderá eliminar os contidos de &quot;evolution&quot; cando o "
+#~ "vexa conveniente.\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "A actualización dos seus datos e configuración requirirá até {0} de "
+#~ "espazo no disco, mais só ten {1} dispoñíbeis.\n"
+#~ "\n"
+#~ "Necesitará facer máis espazo dispoñíbel no seu cartafol persoal antes de "
+#~ "que poida continuar."
+
+#~ msgid "_Keep Data"
+#~ msgstr "_Conservar os datos"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "_Avisarme máis tarde"
+
+#~ msgid "Collection"
+#~ msgstr "Colección"
+
+#~ msgid "Instance"
+#~ msgstr "Instancia"
+
+#~ msgid "Factory"
+#~ msgstr "Factoría"
+
+#~ msgid "Action"
+#~ msgstr "_Accións"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "Un GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "Mostrar a _barra de anexos"
+
+#~ msgid "Fill color"
+#~ msgstr "Encher con cor"
+
+#~ msgid "GDK fill color"
+#~ msgstr "Encher con cor GDK"
+
+#~ msgid "Fill stipple"
+#~ msgstr "Encher con liña de puntos"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "Largura mínima"
+
+#~ msgid "Minimum Width"
+#~ msgstr "Largura mínima"
+
+#~ msgid "Spacing"
+#~ msgstr "Espazamento"
+
+#~ msgid "The button state is online"
+#~ msgstr "O estado do botón é conectado"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "Posición horizontal do panel"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "Posición do panel ao orientalo horizontalmente"
+
+#~ msgid "Vertical Position"
+#~ msgstr "Posición vertical do panel"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "Posición do panel ao orientalo verticalmente"
+
+#~ msgid "Proportion"
+#~ msgstr "_Propiedades"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "Proporción do tamaño do segundo panel"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "_Redimensionar"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "Manter o segundo panel fixo durante o redimensionado"
+
+#~ msgid "Cursor Row"
+#~ msgstr "Fila de cursor"
+
+#~ msgid "Cursor Column"
+#~ msgstr "Columna de cursor"
+
+#~ msgid "Sorter"
+#~ msgstr "Clasificador"
+
+#~ msgid "Selection Mode"
+#~ msgstr "Modo de selección"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "Modo do cursor"
+
+#~ msgid "Selected Column"
+#~ msgstr "Columna seleccionada"
+
+#~ msgid "Focused Column"
+#~ msgstr "Columna enfocada"
+
+#~ msgid "Unselected Column"
+#~ msgstr "Columna non seleccionada"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "Riscar columna"
+
+#~ msgid "Underline Column"
+#~ msgstr "Subliñar columna"
+
+#~ msgid "Bold Column"
+#~ msgstr "Columna en negra"
+
+#~ msgid "Color Column"
+#~ msgstr "Cor da columna"
+
+#~ msgid "BG Color Column"
+#~ msgstr "Cor de fondo da columna"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "Alternar as cores das filas"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "Debuxar a grade horizontal"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "Debuxar a grade vertical"
+
+#~ msgid "Draw focus"
+#~ msgstr "Debuxar o foco"
+
+#~ msgid "Cursor mode"
+#~ msgstr "Modo de cursor"
+
+#~ msgid "Selection model"
+#~ msgstr "Modelo de selección"
+
+#~ msgid "Length Threshold"
+#~ msgstr "Límite de lonxitude"
+
+#~ msgid "Uniform row height"
+#~ msgstr "Altura uniforme da fila"
+
+#~ msgid "Frozen"
+#~ msgstr "Conxelado"
+
+#~ msgid "Table header"
+#~ msgstr "Cabeceira da táboa"
+
+#~ msgid "Table model"
+#~ msgstr "Modelo da táboa"
+
+#~ msgid "Cursor row"
+#~ msgstr "Fila do cursor"
+
+#~ msgid "Sort Info"
+#~ msgstr "Ordenar a información"
+
+#~ msgid "Always search"
+#~ msgstr "Buscar sempre"
+
+#~ msgid "Use click to add"
+#~ msgstr "Premer para engadir"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "Debuxar a grade vertical"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr ""
+#~ "Espazo vertical entre filas. Engádese na parte superior e inferior dunha "
+#~ "fila"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "Adaptador de táboa Etree"
+
+#~ msgid "Retro Look"
+#~ msgstr "Aparencia retro"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "Debuxar liñas e expansores +/-."
+
+#~ msgid "Expander Size"
+#~ msgstr "Tamaño do expansor"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Tamaño da frecha do expansor"
+
+#~ msgid "popup"
+#~ msgstr "emerxente"
+
+#~ msgid "edit"
+#~ msgstr "editar"
+
+#~ msgid "toggle"
+#~ msgstr "alternar o estado"
+
+#~ msgid "expand"
+#~ msgstr "expandir"
+
+#~ msgid "Event Processor"
+#~ msgstr "Procesador de eventos"
+
+#~ msgid "Text"
+#~ msgstr "Texto"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Texto"
+#~ msgid "Bold"
+#~ msgstr "Negra"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Negra"
+#~ msgid "Strikeout"
+#~ msgstr "Riscado"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Riscado"
+#~ msgid "Anchor"
+#~ msgstr "�ncora"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "�ncora"
+#~ msgid "Justification"
+#~ msgstr "Aliñamento"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "Aliñamento"
+#~ msgid "Clip Width"
+#~ msgstr "Largura do clip"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Largura do clip"
+#~ msgid "Clip Height"
+#~ msgstr "Altura do clip"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Altura do clip"
+#~ msgid "Clip"
+#~ msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Clip"
+#~ msgid "Fill clip rectangle"
+#~ msgstr "Encher o rectángulo do clip"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Encher o rectángulo do clip"
+#~ msgid "X Offset"
+#~ msgstr "Desprazamento X"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "Desprazamento X"
+#~ msgid "Y Offset"
+#~ msgstr "Desprazamento Y"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Desprazamento Y"
+#~ msgid "Text width"
+#~ msgstr "Largura do texto"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Largura do texto"
+#~ msgid "Text height"
+#~ msgstr "Altura do texto"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Altura do texto"
+#~ msgid "Use ellipsis"
+#~ msgstr "Usar a elipse"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Usar a elipse"
+#~ msgid "Ellipsis"
+#~ msgstr "Elipse"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Elipse"
+#~ msgid "Line wrap"
+#~ msgstr "Axuste de liña"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Axuste de liña"
+#~ msgid "Break characters"
+#~ msgstr "Caracteres de quebra"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Caracteres de quebra"
+#~ msgid "Max lines"
+#~ msgstr "Máximo de liñas"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "Máximo de liñas"
+#~ msgid "Draw borders"
+#~ msgstr "Debuxar os bordos"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Debuxar os bordos"
+#~ msgid "Allow newlines"
+#~ msgstr "Permitir liñas novas"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Permitir liñas novas"
+#~ msgid "Draw background"
+#~ msgstr "Debuxar o fondo"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Debuxar o fondo"
+#~ msgid "Draw button"
+#~ msgstr "Debuxar o botón"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Debuxar o botón"
+#~ msgid "Cursor position"
+#~ msgstr "Posición do cursor"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "Posición do cursor"
+#~ msgid "IM Context"
+#~ msgstr "Contexto MI"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "Contexto MI"
-
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "Tirador emerxente"
+#~ msgid "Handle Popup"
+#~ msgstr "Tirador emerxente"
diff --git a/po/id.po b/po/id.po
index 7c9fb9d467..4aa0559084 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,479 +2,137 @@
 # This file is distributed under the same license as the evolution package.
 # Ahmad Riza H Nst  <rizahnst@gnome.org>, 2006
 # Mohammad DAMT <mdamt@Bisnisweb.com>, 2004.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-14 10:38+0700\n"
-"PO-Revision-Date: 2006-08-14 11:15+0700\n"
-"Last-Translator: Mohammad DAMT <mdamt@bisnisweb.com>\n"
-"Language-Team: Indonesian <kontak@id.gnome.org>\n"
+"Project-Id-Version: evolution master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n"
+"POT-Creation-Date: 2010-04-16 17:12+0000\n"
+"PO-Revision-Date: 2010-04-17 12:21+0700\n"
+"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
+"Language-Team: GNOME Indonesian Translation Team <gnome@i15n.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"
+"X-Poedit-Language: Indonesian\n"
+"X-Poedit-Country: Indonesia\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
-msgid "evolution addressbook"
-msgstr "buku alamat evolution"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:226
-msgid "New Contact"
-msgstr "Kontak Baru"
-
-#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:234
-msgid "New Contact List"
-msgstr "Buat Daftar Kontak"
-
-#: ../a11y/addressbook/ea-minicard-view.c:163
-#, 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"
-
-#: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "Buka"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "Daftar Kontak:"
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "Kontak: "
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "evolution minicard"
-
-#: ../a11y/calendar/ea-cal-view-event.c:264
-msgid "It has alarms."
-msgstr "Ada alarmnya."
-
-#: ../a11y/calendar/ea-cal-view-event.c:267
-msgid "It has recurrences."
-msgstr "Berulang."
-
-#: ../a11y/calendar/ea-cal-view-event.c:270
-msgid "It is a meeting."
-msgstr "Pertemuan."
-
-#: ../a11y/calendar/ea-cal-view-event.c:276
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "Acara: Keterangannya %s"
-
-#: ../a11y/calendar/ea-cal-view-event.c:278
-msgid "Calendar Event: It has no summary."
-msgstr "Acara: Tidak ada keterangan"
-
-#: ../a11y/calendar/ea-cal-view-event.c:297
-msgid "calendar view event"
-msgstr "kalender tampil acara"
-
-#: ../a11y/calendar/ea-cal-view-event.c:526
-msgid "Grab Focus"
-msgstr "Ambil Fokus"
-
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "New Appointment"
-msgstr "Jadwal Pertemuan Baru"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "New All Day Event"
-msgstr "Acara Seluruh Hari Baru"
-
-#: ../a11y/calendar/ea-cal-view.c:304
-msgid "New Meeting"
-msgstr "Buat Pertemuan Baru"
-
-#: ../a11y/calendar/ea-cal-view.c:305
-msgid "Go to Today"
-msgstr "Lihat Hari Ini"
-
-#: ../a11y/calendar/ea-cal-view.c:306
-msgid "Go to Date"
-msgstr "Lihat Tanggal"
-
-#: ../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 "tabel untuk melihat dan memilih cakupan waktu saat ini"
-
-#. 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
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "Ada %d acara."
-
-#. 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
-msgid "It has no events."
-msgstr "Tidak ada acara."
-
-#. 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
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "Tampilan Minggu Kerja: %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
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "Tampilan Hari: %s. %s"
-
-#: ../a11y/calendar/ea-day-view.c:199
-msgid "calendar view for a work week"
-msgstr "kalender tampil untuk satu minggu kerja"
-
-#: ../a11y/calendar/ea-day-view.c:201
-msgid "calendar view for one or more days"
-msgstr "tampilan kalender untuk satu hari atau lebih"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:704
-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:707
-#: ../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
-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:709
-#: ../calendar/gui/calendar-component.c:714
-#: ../calendar/gui/calendar-component.c:716
-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:728
-#: ../calendar/gui/calendar-component.c:735
-#: ../calendar/gui/calendar-component.c:741
-#: ../calendar/gui/calendar-component.c:743
-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:733
-#: ../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
-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 "Gnome Calendar"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:290
-msgid "search bar"
-msgstr "panel pencarian"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:291
-msgid "evolution calendar search bar"
-msgstr "panel pencarian kalender evolution"
-
-#: ../a11y/calendar/ea-jump-button.c:149
-msgid "Jump button"
-msgstr "Tombol lompat"
-
-#: ../a11y/calendar/ea-jump-button.c:158
-msgid "Click here, you can find more events."
-msgstr "Klik di sini untuk melihat acara."
-
-#: ../a11y/calendar/ea-week-view.c:157
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "Tampilan Bulan: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:161
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "Tampilan Minggu: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:192
-msgid "calendar view for a month"
-msgstr "kalender tampi untuk sebulan"
-
-#: ../a11y/calendar/ea-week-view.c:194
-msgid "calendar view for one or more weeks"
-msgstr "tampilan kalender untuk satu minggu atau lebih"
-
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
-msgid "popup"
-msgstr "popup"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
-msgid "popup a child"
-msgstr "popup kan sebuah anak"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
-msgid "edit"
-msgstr "sunting"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
-msgid "begin editing this cell"
-msgstr "mulai menyunting cell ini"
-
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
-msgid "toggle"
-msgstr "ganti"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
-msgid "toggle the cell"
-msgstr "ganti sel"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
-msgid "expand"
-msgstr "perluas"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
-msgid "expands the row in the ETree containing this cell"
-msgstr "perluas barin pada ETree yang mengandung cell ini"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
-msgid "collapse"
-msgstr "runtuh"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
-msgid "collapses the row in the ETree containing this cell"
-msgstr "runtuhkan baris dalam ETree yang mengandung cell ini"
-
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
-msgid "Table Cell"
-msgstr "Tabel Cell"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:574
-msgid "click to add"
-msgstr "klik untuk menambah"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
-msgid "click"
-msgstr "klik"
-
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
-msgid "sort"
-msgstr "urutkan"
-
-#: ../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 "Kalender: dari %s hingga %s"
-
-#: ../a11y/widgets/ea-calendar-item.c:339
-msgid "evolution calendar item"
-msgstr "objek kalender evolution"
-
-#: ../a11y/widgets/ea-combo-button.c:40
-msgid "Combo Button"
-msgstr "Tombol Kombo"
-
-#: ../a11y/widgets/ea-combo-button.c:50
-msgid "Activate Default"
-msgstr "Aktifkan Awal"
-
-#: ../a11y/widgets/ea-combo-button.c:52
-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 "
-"with the same address anyway?"
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:2
+msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
 msgstr ""
-"Nama atau alamat email pada kontak ini sudah ada. Tambahkan saja kartu baru "
-"dengan alamat yang sama?"
 
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../addressbook/addressbook.error.xml.h:3
+msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgstr "Nama atau alamat email pada kontak ini sudah ada. Tambahkan saja kartu baru dengan alamat yang sama?"
+
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
 msgstr "Alamat '{0}' sudah ada sebelumnya"
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../addressbook/addressbook.error.xml.h:5
+#, fuzzy
+msgid "Cannot add new contact"
+msgstr "Buat kontak baru"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
 msgstr "Informasi orang ini tidak dapat dipindahkan."
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
 msgstr "Penyunting kategori tidak tersedia."
 
-#: ../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 ""
-"Silakan periksa apakah Anda sudah menulis kata sandi dengan benar. Periksa "
-"juga apakah Anda sudah login dengan cara yang benar. Ingatlah bahwa kata "
-"sandi memperhatikan huruf besar/kecil. Periksa apakah tombol caps-lock "
-"menyala atau tidak."
+#: ../addressbook/addressbook.error.xml.h:8
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Silakan periksa apakah Anda sudah menulis kata sandi dengan benar. Periksa juga apakah Anda sudah login dengan cara yang benar. Ingatlah bahwa kata sandi memperhatikan huruf besar/kecil. Periksa apakah tombol caps-lock menyala atau tidak."
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
 msgstr "Gagal mendapatkan informasi schema dari server LDAP."
 
-#: ../addressbook/addressbook.error.xml.h:7
-msgid "Could not remove addressbook."
+#: ../addressbook/addressbook.error.xml.h:10
+#, fuzzy
+msgid "Could not remove address book."
 msgstr "Buku alamat tidak dapat dihapus."
 
-#: ../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 ""
-"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:11
+#, fuzzy
+msgid "Currently you can only access the GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr "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
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "Hapus buku alamat '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:10
-msgid "Error loading addressbook."
-msgstr "Ada error saat membuka buku alamat."
-
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Ada error saat menyimpan {0} ke {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Failed to authenticate with LDAP server."
 msgstr "Gagal saat menghubungkan diri dengan server LDAP."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1908
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1267
 msgid "Failed to delete contact"
 msgstr "Gagal menghapus kontak"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "GroupWise Address book creation:"
 msgstr "Pembuatan Buku alamat GroupWise:"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "LDAP server did not respond with valid schema information."
 msgstr "Server LDAP tidak menjawab dengan informasi schema yang benar."
 
-#: ../addressbook/addressbook.error.xml.h:16
-msgid "Permission Denied."
-msgstr "Hak akses ditolak."
-
-#: ../addressbook/addressbook.error.xml.h:17
-msgid "Server Version"
-msgstr "Versi Server"
-
 #: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr "Ada fitur yang tidak bisa digunakan pada server Anda"
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "The Evolution addressbook has quit unexpectedly."
+#, fuzzy
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Program buku alamat Evolution tiba-tiba harus dihentikan."
 
 #: ../addressbook/addressbook.error.xml.h:20
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"Gambar yang dipilih terlalu besar. Perkecil gambarnya sebelum disimpan?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "Gambar yang dipilih terlalu besar. Perkecil gambarnya sebelum disimpan?"
 
 #: ../addressbook/addressbook.error.xml.h:21
-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 ""
-"Versi server LDAP ini mungkin sudah cukup tua dan tidak mendukung "
-"fungsionalitas ini atau bisa juga belum dikonfigurasikan dengan benar. "
-"Silakan hubungi bagian IT atau administrator untuk mengaktifkan pencarian "
-"pada LDAP."
+msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
+msgstr "Versi server LDAP ini mungkin sudah cukup tua dan tidak mendukung fungsionalitas ini atau bisa juga belum dikonfigurasikan dengan benar. Silakan hubungi bagian IT atau administrator untuk mengaktifkan pencarian pada LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid "This address book will be removed permanently."
-msgstr "Buku alamat akan dibuang selamanya."
+#, fuzzy
+msgid "This address book could not be opened."
+msgstr "Buku alamat tidak dapat di buka"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid "This addressbook could not be opened."
-msgstr "Buku alamat tidak dapat di buka"
+#, fuzzy
+msgid "This address book server does not have any suggested search bases."
+msgstr "Server buku alamat ini tidak memiliki basis pencarian yang disarankan."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This addressbook server does not have any suggested search bases."
-msgstr "Server buku alamat ini tidak memiliki basis pencarian yang disarankan."
+#, fuzzy
+msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
+msgstr "Server buku alamat sedang tidak dapat dibuka, mungkin nama servernya salah atau jaringan/internet sedang mati."
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"Server buku alamat sedang tidak dapat dibuka, mungkin nama servernya salah "
-"atau jaringan/internet sedang mati."
+msgid "This address book will be removed permanently."
+msgstr "Buku alamat akan dibuang selamanya."
 
 #: ../addressbook/addressbook.error.xml.h:26
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Server ini tidak dapat menggunakan informasi schema LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:27
-msgid "Unable to open addressbook"
-msgstr "Buku alamat tidak dapat dibuka"
+#, fuzzy
+msgid "Unable to open address book"
+msgstr "Buku alamat tak dapat dibuka"
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
@@ -489,2073 +147,386 @@ msgid "Would you like to save your changes?"
 msgstr "Apakah Anda ingin menyimpan semua perubahan yang telah dilakukan?"
 
 #: ../addressbook/addressbook.error.xml.h:31
-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 ""
-"Anda sedang berusaha memindahkan informasi orang ini dari satu buku alamat "
-"ke buku alamat yang lain, tetapi sayangnya, informasi ini tidak dapat "
-"dihapus dari buku alamat asalnya. Apakah Anda ingin menyalinnya saja?"
+#, fuzzy
+msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
+msgstr "Anda sedang berusaha memindahkan informasi orang ini dari satu buku alamat ke buku alamat yang lain, tetapi sayangnya, informasi ini tidak dapat dihapus dari buku alamat asalnya. Apakah Anda ingin menyalinnya saja?"
 
 #: ../addressbook/addressbook.error.xml.h:32
-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 ""
-"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"
+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 "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"
 
 #: ../addressbook/addressbook.error.xml.h:33
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
-"Anda telah melakukan perubahan pada informasi orang ini. Anda ingin "
-"menyimpan perubahan tersebut?"
 
 #: ../addressbook/addressbook.error.xml.h:34
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
-"Informasi alamat {0} baru akan aktif setelah Evolution dijalankan ulang."
+msgid "You have made modifications to this contact. Do you want to save these changes?"
+msgstr "Anda telah melakukan perubahan pada informasi orang ini. Anda ingin menyimpan perubahan tersebut?"
+
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgstr "Informasi alamat {0} baru akan aktif setelah Evolution dijalankan ulang."
 
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:511
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../addressbook/addressbook.error.xml.h:36
+#: ../mail/em-vfolder-rule.c:521
+#: ../plugins/groupwise-features/junk-settings.ui.h:4
+#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "T_ambah"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "_Discard"
 msgstr "_Abaikan"
 
-#: ../addressbook/addressbook.error.xml.h:37
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid "{0}"
-msgstr "{0}"
-
 #: ../addressbook/addressbook.error.xml.h:38
-msgid "{1}"
-msgstr "{1}"
+#, fuzzy
+msgid "_Do not save"
+msgstr "Jangan matikan"
+
+#: ../addressbook/addressbook.error.xml.h:39
+#, fuzzy
+msgid "_Resize"
+msgstr "Belize"
+
+#: ../addressbook/addressbook.error.xml.h:40
+msgid "_Use as it is"
+msgstr ""
 
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Alamat Sync Awal:"
 
-#: ../addressbook/conduit/address-conduit.c:1241
-#: ../addressbook/conduit/address-conduit.c:1242
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
+#, fuzzy
+msgid "Could not load address book"
 msgstr "Buku alamat tidak dapat dibuka"
 
-#: ../addressbook/conduit/address-conduit.c:1310
-#: ../addressbook/conduit/address-conduit.c:1313
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
 msgstr "Blok aplikasi buku alamat pada Pilot tidak dapat dibaca"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Auto komplet"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "C_ontacts"
-msgstr "_Alamat"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Certificates"
-msgstr "Sertifikat"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-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
-#: ../calendar/gui/calendar-component.c:269 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
-msgid "Contacts"
-msgstr "Alamat"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book"
-msgstr "Buku Alamat Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
-msgstr "Pop up alamat pada Buku Alamat Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book address viewer"
-msgstr "Penampil alamat Buku Alamat Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book card viewer"
-msgstr "Pembaca kartu Buku Alamat Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Address Book component"
-msgstr "Komponen Buku Alamat Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Pengatur Sertifikat S/MIME Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Konfigurasi Pengaturan folder Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manage your S/MIME certificates here"
-msgstr "Atur sertifikat S/MIME di sini"
-
-#. create the local source group
-#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:141
-#: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c: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 "Di Komputer Ini"
-
-#. 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:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
-#: ../calendar/gui/calendar-component.c:239
-#: ../calendar/gui/memos-component.c:203 ../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
-msgid "Personal"
-msgstr "Pribadi"
-
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:159
-#: ../addressbook/gui/component/addressbook-migrate.c:501
-msgid "On LDAP Servers"
-msgstr "Pada Server LDAP"
-
-#: ../addressbook/gui/component/addressbook-component.c:227
-msgid "_Contact"
-msgstr "_Kontak"
-
-#: ../addressbook/gui/component/addressbook-component.c:228
-msgid "Create a new contact"
-msgstr "Buat kontak baru"
-
-#: ../addressbook/gui/component/addressbook-component.c:235
-msgid "Contact _List"
-msgstr "_Daftar Kontak"
-
-#: ../addressbook/gui/component/addressbook-component.c:236
-msgid "Create a new contact list"
-msgstr "Buat daftar kontak baru"
-
-#: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
-msgid "New Address Book"
-msgstr "Buku Alamat Baru"
-
-#: ../addressbook/gui/component/addressbook-component.c:243
-msgid "Address _Book"
-msgstr "_Buku Alamat"
-
-#: ../addressbook/gui/component/addressbook-component.c:244
-msgid "Create a new address book"
-msgstr "Buat buku alamat baru"
-
-#: ../addressbook/gui/component/addressbook-component.c:406
-msgid "Failed upgrading Address Book settings or folders."
-msgstr "Gagal saat meningkatkan pengaturan atau folder Buku Alamat."
-
-#: ../addressbook/gui/component/addressbook-config.c:332
-msgid "Base"
-msgstr "Basis"
-
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Type:"
-msgstr "_Tipe:"
-
-#: ../addressbook/gui/component/addressbook-config.c:635
-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:984
-#: ../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
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "Umum"
-
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
-#: ../mail/importers/pine-importer.c:392
-msgid "Address Book"
-msgstr "Buku Alamat"
-
-#: ../addressbook/gui/component/addressbook-config.c:989
-msgid "Server Information"
-msgstr "Informasi server"
-
-#: ../addressbook/gui/component/addressbook-config.c:991
-msgid "Authentication"
-msgstr "Otentikasi"
-
-#: ../addressbook/gui/component/addressbook-config.c:994
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
-msgid "Details"
-msgstr "Rincian"
-
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:802
-msgid "Searching"
-msgstr "Mencari"
-
-#: ../addressbook/gui/component/addressbook-config.c:997
-msgid "Downloading"
-msgstr "Mengunduh"
-
-#: ../addressbook/gui/component/addressbook-config.c:1203
-#: ../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
-msgid "Migrating..."
-msgstr "Dalam proses migrasi..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
-#, c-format
-msgid "Migrating `%s':"
-msgstr "Dalam proses migrasi `%s':"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:629
-msgid "LDAP Servers"
-msgstr "Server LDAP"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:744
-msgid "Autocompletion Settings"
-msgstr "Pengaturan Auto Komplet"
-
-#: ../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 ""
-"Lokasi dan hirarki folder kontak Evolution telah berubah sejak versi "
-"Evolution 1.x.\n"
-"\n"
-"Silakan tunggu sebentar selama Evolution melakukan migrasi folder..."
-
-#: ../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 ""
-"Format kontak milis telah berubah.\n"
-"\n"
-"Silakan tunggu sebentar selama Evolution melakukan migrasi folder..."
-
-#: ../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 ""
-"Evolution sudah mengganti metode penyimpanan nomor telepon.\n"
-"\n"
-"Mohon tunggu sebentar selama Evolution melakukan migrasi folder..."
-
-#: ../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 ""
-"Evolution telah mengganti file log dan peta Sync pada Palm.\n"
-"\n"
-"Silakan tunggu selama Evolution melakukan migrasi data Sync Pilot Anda..."
-
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Ganti nama folder \"%s\" menjadi:"
-
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
-msgid "Rename Folder"
-msgstr "Ganti Nama Folder"
-
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
-msgid "Folder names cannot contain '/'"
-msgstr "Nama folder tidak boleh berisi karakter \"/\"."
-
-#: ../addressbook/gui/component/addressbook-view.c:445
-msgid "A Folder with this name already exists"
-msgstr "Folder dengan nama ini sudah ada"
-
-#: ../addressbook/gui/component/addressbook-view.c:956
-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
-#: ../calendar/gui/calendar-component.c:581
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1125
-#: ../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
-msgid "Save As Vcard..."
-msgstr "Simpan sebagai Vcard..."
-
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:582
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
-msgid "_Properties..."
-msgstr "_Pengaturan..."
-
-#: ../addressbook/gui/component/addressbook-view.c:1343
-msgid "Contact Source Selector"
-msgstr "Hubungi Pemilih Sumber"
-
-#: ../addressbook/gui/component/addressbook.c:99
-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:499
-msgid "Failed to authenticate.\n"
-msgstr "Gagal melakukan otentikasi.\n"
-
-#: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Silakan masukkan kata sandi untuk %s (pengguna %s)"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
-msgid "Autocomplete length"
-msgstr "Panjang pelengkapan otomatis"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "Xml EFolderList untuk daftar pelengkapan URI"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "Xml EFolderList untuk daftar pelengkapan URI"
-
-#: ../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 ""
-"Posisi panel vertikal, antara kartu dan daftar tampil dan panel pracetak, "
-"dalam piksel."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
-msgid "Show preview pane"
-msgstr "Tampilkan panel pratinjau"
-
-#: ../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 ""
-"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"
-msgstr "URI folder yang terakhir digunakan dalam dialog pemilih nama"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
-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:68
-msgid "Vertical pane position"
-msgstr "Posisi panel vertikal"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
-msgid "Whether to show the preview pane."
-msgstr "Apakah menampilkan panel pracetak."
-
-#: ../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:1
-msgid "<b>Authentication</b>"
-msgstr "<b>Otentikasi</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>Tampilan</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-msgid "<b>Downloading</b>"
-msgstr "<b>Mendownload</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Searching</b>"
-msgstr "<b>Mencari</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>Informasi Server</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
-msgid "<b>Type:</b>"
-msgstr "<b>Tipe:</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-msgid "Add Address Book"
-msgstr "Tambah Buku Alamat"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:777
-msgid "Always"
-msgstr "Selalu"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-msgid "Anonymously"
-msgstr "Anonim"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "Dasar"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "Distinguished name"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "Alamat email"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution akan menggunakan alamat email ini untuk melakukan otentikasi."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "Cari Basis Pencarian Yang Mungkin"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-msgid "Lo_gin:"
-msgstr "Lo_gin:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
-msgid "Never"
-msgstr "Jangan pernah"
-
-#. 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 "Tanpa pengacakan"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "Satu"
-
-#. 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 "Pengacakan SSL"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search Filter"
-msgstr "Saringan Pencarian"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search _base:"
-msgstr "_Basis pencarian:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid "Search _filter:"
-msgstr "Saringan _pencarian:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "Saringan pencarian"
-
-#: ../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 ""
-"Cari saring adalah jenis pencarian objek, ketika menjalankan pencarian.Jika "
-"hal ini tidak dimodifikasi, oleh  pencarian default akan dilaksanakan "
-"padaobjectclass dari jenis \"orang\"."
-
-#: ../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 ""
-"Memilih ini berarti Evolution hanya akan terhubung ke server LDAP bila "
-"server tersebut mendukung 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 ""
-"Memilih ini berarti Evolution hanya akan terhubung ke server LDAP bila "
-"server tersebut mendukung TLS."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"Pilihan ini berarti server Anda tidak mendukung penggunaan SSL atau TLS. "
-"Artinya koneksi Anda akan tidak aman, dan anda akan rentan terhadap celah "
-"keamanan."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "Sub"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "Supported Search Bases"
-msgstr "Basis Pencarian Yang Didukung"
-
-#. 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 "Pengacakan TLS"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"Basis pencarian adalah nama terang/distinguished name (DN) milik entri yang "
-"hendak dicari. Bila dikosongkan, pencarian akan dimulai pada root direktori."
-
-#: ../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 ""
-"Lingkup pencarian adalah seberapa dalam proses pencarian akan dilakukan "
-"dalam pohon direktori. Lingkup pencarian jenis \"sub\" akan mencari semua "
-"data di bawah basis pencarian. Lingkup pencarian jenis \"satu\" hanya akan "
-"mencari satu tingkat di bawah basis pencarian saja."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr "Ini adalah nama lengkap server ldap, misalnya \"ldap.kantor.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 ""
-"Ini adalah nilai maksimum entri yang akan didownload. Bila terlalu besar "
-"akan berakibat buku alamat Anda menjadi lebih lambat."
-
-#: ../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 ""
-"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."
-
-#: ../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 ""
-"Ini adalah nama server yang akan kelihatan dalam daftar folder Evolution. "
-"Ini hanya untuk keperluan tampilan saja."
-
-#: ../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 ""
-"Ini adalah nomor port server LDAP yang akan dihubungi. Daftar port standar "
-"sudah disediakan. Silakan hubungi bagian IT/administrator untuk memilih "
-"nomor port ini."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "Gunakan distinguished name (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "Gunakan alamat email"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "Apabila Mungkin"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "T_ambah Buku Alamat"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-msgid "_Download limit:"
-msgstr "Batasan _Download:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-msgid "_Find Possible Search Bases"
-msgstr "_Cari Basis Pencarian Yang Mungkin"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:52
-msgid "_Login method:"
-msgstr "Metoda _login:"
-
-#: ../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
-msgid "_Name:"
-msgstr "_Nama:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:55
-msgid "_Search scope:"
-msgstr "Lingku_p pencarian:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:57
-msgid "_Timeout:"
-msgstr "Waktu _timeout:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:58
-msgid "_Use secure connection:"
-msgstr "G_unakan koneksi yang aman:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:59
-msgid "cards"
-msgstr "kartu"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2022
-#: ../plugins/calendar-http/calendar-http.c:286
-#: ../plugins/calendar-weather/calendar-weather.c:563
-msgid "minutes"
-msgstr "menit"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>Email</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>Rumah</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>Program Pesan Instan</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>Pekerjaan</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Lainnya</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "<b>Other</b>"
-msgstr "<b>Lainnya</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../calendar/gui/e-calendar-view.c:2005
+msgid "Anniversary"
+msgstr "Peringatan"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Telephone</b>"
-msgstr "<b>Telepon</b>"
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../calendar/gui/e-calendar-view.c:2004
+#: ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:107
+msgid "Birthday"
+msgstr "Ulang Tahun"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Web Addresses</b>"
-msgstr "<b>Alamat Web</b>"
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#, fuzzy
+msgid "Blog:"
+msgstr "Blog"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Work</b>"
-msgstr "<b>Pekerjaan</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:1
+msgid "Ca_tegories..."
+msgstr "Ka_tegori..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
-msgid "AIM"
-msgstr "AIM"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#, fuzzy
+msgid "Calendar:"
+msgstr "Kalender"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
 msgid "Contact"
 msgstr "Kontak"
 
-#: ../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.ui.h:8
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2568
 msgid "Contact Editor"
 msgstr "Penyunting Kontak"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
+#: ../plugins/groupwise-features/junk-settings.c:408
+#: ../smime/lib/e-cert.c:823
+msgid "Email"
+msgstr "Email"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#, fuzzy
+msgid "Free/Busy:"
+msgstr "_Luang/Sibuk:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "_Nama Lengkap..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:70
+msgid "Home"
+msgstr "Rumah"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#, fuzzy
+msgid "Home Page:"
+msgstr "_Laman web:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Foto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#, fuzzy
+msgid "Instant Messaging"
+msgstr "Pesan Instan"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#, fuzzy
+msgid "Job"
+msgstr "Pekerjaan"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Alamat Surat"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "Serba neka"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#, fuzzy
+msgid "Nic_kname:"
 msgstr "Nama pan_ggilan:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
-msgid "Novell Groupwise"
-msgstr "Novell Groupwise"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
+msgid "Notes"
+msgstr "Catatan"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:71
+#: ../addressbook/gui/widgets/eab-contact-display.c:460
+#: ../calendar/gui/e-calendar-view.c:1711
+msgid "Other"
+msgstr "Lainnya"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "Data Pribadi"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "Telepon"
 
-#. 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.ui.h:24
+#, fuzzy
+msgid "Video Chat:"
+msgstr "_Video Chat:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#, fuzzy
+msgid "Web Addresses"
+msgstr "<b>Alamat Web</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Work"
 msgstr "Kantor"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "_Alamat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "Pering_atan:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "_Asisten:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "Ulang _Tahun:"
 
-#: ../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.ui.h:31
+#, fuzzy
+msgid "_Blog:"
+msgstr "Blog"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "_Kategori..."
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "_Kota:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "Per_usahaan:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "_Negara:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "_Bagian:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "_Simpan dalam:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "_Luang/Sibuk:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "_Halaman Utama:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "_Manajer:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Notes:"
-msgstr "Catata_n:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "Kant_or:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "_Profesi:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "Pa_sangan hidup:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "Negara bagian/Provin_si:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Gelar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "_Video Chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "_Boleh dikirimi email HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
-msgid "_Web Log:"
-msgstr "_Web Log:"
-
-#: ../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.ui.h:49
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Lokasi:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 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:582
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-msgid "Address"
-msgstr "Alamat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
-#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c: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
-msgid "Editable"
-msgstr "Dapat diedit"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "United States"
-msgstr "Amerika Serikat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Afghanistan"
-msgstr "Afghanistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Albania"
-msgstr "Albania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Algeria"
-msgstr "Algeria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "American Samoa"
-msgstr "Amerikan Samoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Andorra"
-msgstr "Andorra"
-
-#: ../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 "Antartika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Antigua And Barbuda"
-msgstr "Antigua And Barbuda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Argentina"
-msgstr "Argentina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Armenia"
-msgstr "Armenia"
-
-#: ../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 "Australia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Austria"
-msgstr "Austria"
-
-#: ../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 "Belgia"
-
-#: ../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 "Bolivia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bosnia And Herzegowina"
-msgstr "Bosnia Herzegovina"
-
-#: ../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 "Bouvet Island"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Brazil"
-msgstr "Brazil"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "British Indian Ocean Territory"
-msgstr "British Indian Ocean Territory"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Bulgaria"
-msgstr "Bulgaria"
-
-#: ../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 "Kamboja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Cameroon"
-msgstr "Kamerun"
-
-#: ../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 "Tanjung Verde"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cayman Islands"
-msgstr "Cayman Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Central African Republic"
-msgstr "Republik Afrika Tengah"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Chad"
-msgstr "Chad"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Chile"
-msgstr "Chile"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "China"
-msgstr "China"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Christmas Island"
-msgstr "Christmas Island"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Cocos (Keeling) Islands"
-msgstr "Cocos (Keeling) Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Colombia"
-msgstr "Kolombia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Comoros"
-msgstr "Komoro"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Congo"
-msgstr "Congo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Congo, The Democratic Republic Of The"
-msgstr "Kongo, Republik Demokrat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Cook Islands"
-msgstr "Kepulauan Cook"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Costa Rica"
-msgstr "Kosta Rika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Cote d'Ivoire"
-msgstr "Pantai Gading"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Croatia"
-msgstr "Kroasia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Cuba"
-msgstr "Kuba"
-
-#: ../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 Ceko"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "Denmark"
-msgstr "Denmark"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Djibouti"
-msgstr "Jiboti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Dominica"
-msgstr "Dominika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Dominican Republic"
-msgstr "Republik Dominika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ecuador"
-msgstr "Ekuador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Egypt"
-msgstr "Mesir"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "El Salvador"
-msgstr "El Salvador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Equatorial Guinea"
-msgstr "Equatorial Guinea"
-
-#: ../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 "Estonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "Ethiopia"
-msgstr "Ethiopia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "Falkland Islands"
-msgstr "Falkland Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "Faroe Islands"
-msgstr "Faroe Islands"
-
-#: ../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 "Finlandia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "France"
-msgstr "Prancis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "French Guiana"
-msgstr "Guyana Perancis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "French Polynesia"
-msgstr "French Polynesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "French Southern Territories"
-msgstr "French Southern Territories"
-
-#: ../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 "Gambia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Georgia"
-msgstr "Georgia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Germany"
-msgstr "Jerman"
-
-#: ../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 "Yunani"
-
-#: ../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 "Grenada"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guadeloupe"
-msgstr "Guadeloupe"
-
-#: ../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 "Guinea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
-msgstr "Guinea-bissau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Guyana"
-msgstr "Guyana"
-
-#: ../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 "Heard And McDonald Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Holy See"
-msgstr "Holy See"
-
-#: ../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 "Hungaria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Iceland"
-msgstr "Islandia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "India"
-msgstr "Hindia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Indonesia"
-msgstr "Indonesia"
-
-#: ../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 "Irlandia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Isle of Man"
-msgstr "Isle of 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 "Jamaika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Japan"
-msgstr "Jepang"
-
-#: ../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 "Yordania"
-
-#: ../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 "Korea, Republik Rakyat Demokrat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Korea, Republic Of"
-msgstr "Korea, Republik"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Kuwait"
-msgstr "Kuwait"
-
-#: ../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 "Latvia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Lebanon"
-msgstr "Libanon"
-
-#: ../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 "Libya"
-
-#: ../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 "Lituania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Luxembourg"
-msgstr "Luxembourg"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Macao"
-msgstr "Makao"
-
-#: ../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 "Madagaskar"
-
-#: ../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 "Malaysia"
-
-#: ../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 "Malta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Marshall Islands"
-msgstr "Marshall Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Martinique"
-msgstr "Martinique"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Mauritania"
-msgstr "Mauritania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mauritius"
-msgstr "Mauritius"
-
-#: ../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 "Mexico"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Micronesia"
-msgstr "Micronesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Moldova, Republic Of"
-msgstr "Moldova, Republik"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Monaco"
-msgstr "Monako"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Mongolia"
-msgstr "Mongolia"
-
-#: ../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 "Maroko"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Mozambique"
-msgstr "Mozambique"
-
-#: ../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 "Namibia"
-
-#: ../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 "Belanda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Netherlands Antilles"
-msgstr "Netherlands Antilles"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "New Caledonia"
-msgstr "New Caledonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "New Zealand"
-msgstr "Selandia Baru"
-
-#: ../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 "Norfolk Island"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Northern Mariana Islands"
-msgstr "Northern Mariana Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Norway"
-msgstr "Norwegia"
-
-#: ../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 "Teritorial Palestina"
-
-#: ../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 "Papua Nugini"
-
-#: ../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 "Peru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Philippines"
-msgstr "Philippines"
-
-#: ../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 "Polandia"
-
-#: ../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 "Rumania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "Russian Federation"
-msgstr "Federasi Rusia"
-
-#: ../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 "Saint Kitts And Nevis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Saint Lucia"
-msgstr "Saint Lucia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Saint Vincent And The Grenadines"
-msgstr "Saint Vincent And The Grenadines"
-
-#: ../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 "Sao Tome And Principe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Saudi Arabia"
-msgstr "Arab Saudi"
-
-#: ../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 "Serbia Montenegro"
-
-#: ../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 "Singapura"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Slovakia"
-msgstr "Slovakia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Slovenia"
-msgstr "Slovenia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "Solomon Islands"
-msgstr "Solomon Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "Somalia"
-msgstr "Somalia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "South Africa"
-msgstr "Afrika Selatan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "South Georgia And The South Sandwich Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Spain"
-msgstr "Spanyol"
-
-#: ../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. Helena"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "St. Pierre And Miquelon"
-msgstr "St. Pierre And Miquelon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Sudan"
-msgstr "Sudan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Suriname"
-msgstr "Suriname"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "Svalbard And Jan Mayen Islands"
-
-#: ../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 "Swedia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Switzerland"
-msgstr "Swiss"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Syria"
-msgstr "Siria"
-
-#: ../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 "Tanzania, United Republic Of"
-
-#: ../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 "Timor-Leste"
-
-#: ../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 And Tobago"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Tunisia"
-msgstr "Tunisia"
-
-#: ../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 "Turks And Caicos Islands"
-
-#: ../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 "Ukraina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "United Arab Emirates"
-msgstr "Uni Emirat Arab"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "United Kingdom"
-msgstr "Inggris Raya"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "United States Minor Outlying Islands"
-msgstr "United States Minor Outlying Islands"
-
-#: ../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 "Viet Nam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Virgin Islands, British"
-msgstr "Virgin Islands, British"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
-msgid "Virgin Islands, U.S."
-msgstr "Virgin Islands, U.S."
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
-msgid "Wallis And Futuna Islands"
-msgstr "Wallis And Futuna Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
-msgid "Western Sahara"
-msgstr "Western Sahara"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
-msgid "Yemen"
-msgstr "Yaman"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
-msgid "Zambia"
-msgstr "Zambia"
-
-#: ../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:370
-#: ../widgets/menus/gal-view-new-dialog.c:73
-msgid "Name"
-msgstr "Nama"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
-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
-msgid "ICQ"
-msgstr "ICQ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-msgid "Service"
-msgstr "Layanan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
-#: ../plugins/save-calendar/csv-format.c:400
-msgid "Location"
-msgstr "Lokasi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
-msgid "Username"
-msgstr "Nama user"
-
-#: ../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
-msgid "Home"
-msgstr "Rumah"
-
-#: ../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
-msgid "Other"
-msgstr "Lainnya"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 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/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 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:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
-msgid "Source Book"
-msgstr "Buku Asal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
-msgid "Target Book"
-msgstr "Buku Tujuan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
-msgid "Is New Contact"
-msgstr "Kontak Baru?"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#, fuzzy
+msgid "Skype"
+msgstr "Tipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
-msgid "Writable Fields"
-msgstr "Kolom Yang Dapat Ditulisi"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
+msgid "Error adding contact"
+msgstr "Error saat menambahkan kontak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Required Fields"
-msgstr "Kolom yang dibutuhkan"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+msgid "Error modifying contact"
+msgstr "Error saat merubah kontak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-msgid "Changed"
-msgstr "Berubah"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+msgid "Error removing contact"
+msgstr "Error saat menghapus kontak"
 
-#: ../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:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2563
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Penyunting Kontak - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2971
 msgid "Please select an image for this contact"
 msgstr "Pilih foto untuk orang ini"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2972
 msgid "_No image"
 msgstr "Ta_npa gambar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2563,278 +534,188 @@ msgstr ""
 "Data kontak salah:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3249
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' bentuknya salah"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3256
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' bentuknya salah"
 
-#: ../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:3271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3282
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' kosong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3296
 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:355
 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:358
 msgid "_Edit Full"
 msgstr "_Ubah Semua"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "Nama _lengkap"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 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:455
 msgid "_Select Address Book"
 msgstr "_Pilih Buku Alamat"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr ""
-"Apakah Anda benar-benar ingin\n"
-"menghapus daftar kontak (%s)?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-msgstr ""
-"Apakah Anda benar-benar ingin\n"
-"menghapus daftar kontak ini?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
-msgstr ""
-"Apakah Anda benar-benar ingin\n"
-"menghapus kontak (%s)?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Apakah Anda benar-benar ingin\n"
-"menghapus kontak ini?"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Alamat _2:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "Ko_ta:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "N_egara:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "Alamat Lengkap"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "K_ode pos:"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
 msgid "Esq."
 msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Nama Lengkap"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
 msgid "Miss"
 msgstr "Nona"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
 msgid "Mr."
 msgstr "Tuan"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
 msgid "Mrs."
 msgstr "Ny."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
 msgid "Ms."
 msgstr "Nona"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "_Depan:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "Be_lakang:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_Tengah:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "_Akhiran:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "Tambahkan Akun IM"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "Nama _akunt:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "Layanan _IM:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
-msgid "_Location:"
-msgstr "_Lokasi:"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-msgid "Add an email to the List"
-msgstr "Tambahkan email ke dalam Daftar"
-
-#: ../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.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:674
 msgid "Contact List Editor"
 msgstr "Penyunting Daftar Kontak"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Insert email addresses from Address Book"
-msgstr "Masukkan alamat email dari Buku Alamat"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
 msgid "Members"
 msgstr "Anggota"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Remove an email address from the List"
-msgstr "Hapus alamat email dari Daftar"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Sembunyikan alamat saat mengirim ke daftar ini"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "Nama _daftar:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-msgid "_Select"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:155
+#, fuzzy
+msgid "_Select..."
 msgstr "_Pilih"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"Ke_tikkan alamat email atau tarik dari sebuah kontak ke daftar di bawah:"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
-#: ../addressbook/gui/widgets/e-addressbook-model.c:296
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
-msgid "Book"
-msgstr "Buku"
+msgstr "Ke_tikkan alamat email atau tarik dari sebuah kontak ke daftar di bawah:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
-msgid "Is New List"
-msgstr "Daftar Baru?"
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:767
+msgid "Contact List Members"
+msgstr "Alamat Daftar Anggota"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:915
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1331
 msgid "_Members"
 msgstr "_Anggota"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
-msgid "Contact List Members"
-msgstr "Alamat Daftar Anggota"
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1170
+msgid "Error adding list"
+msgstr "Error saat menambahkan isi daftar"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1184
+msgid "Error modifying list"
+msgstr "Error saat mengubah isi daftar"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1198
+msgid "Error removing list"
+msgstr "Error saat menghapus daftar"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Kontak yang Berubah:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid "Conflicting Contact:"
 msgstr "Kontak yang Konflik:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Ada Kontak yang Dobel"
 
-#: ../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?"
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+#, fuzzy
+msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Email atau nama yang berubah pada kontak ini\n"
-"sebenarnya sudah ada dalam folder ini. Tambahkan saja?"
+"Nama atau alamat email pada kontak ini sudah ada\n"
+"pada folder. Tambahkan saja?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
 msgstr "Kontak Baru:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid "Original Contact:"
 msgstr "Kontak Asli:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2842,172 +723,151 @@ msgstr ""
 "Nama atau alamat email pada kontak ini sudah ada\n"
 "pada folder. Tambahkan saja?"
 
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
+#, fuzzy
+msgid "_Merge"
+msgstr "Gabung"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
+#, fuzzy
+msgid "Merge Contact"
+msgstr "Kontak Baru"
+
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:53
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Any field contains"
 msgstr "Kolom berisi"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "Email diawali dengan"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
-msgid "Name begins with"
-msgstr "Nama diawali dengan"
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
+#, fuzzy
+msgid "Name contains"
+msgstr "berisi"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No contacts"
 msgstr "Tidak ada kontak"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:146
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 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-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
-msgid "Query"
-msgstr "Query"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:307
 msgid "Error getting book view"
 msgstr "Error saat membuka tampilan buku"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3329
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
-msgid "Model"
-msgstr "Model"
-
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#, fuzzy
+msgid "Search Interrupted"
+msgstr "Saringan Pencarian"
+
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Error saat mengubah kartu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
-msgid "Source"
-msgstr "Sumber"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
-#: ../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
-msgid "Type"
-msgstr "Tipe"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2083
-#: ../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:1101
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:901
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "B_uka"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
+#, fuzzy
+msgid "Cut selected contacts to the clipboard"
+msgstr "Ambil teks yang sudah dipilih ke dalam klipbod"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
-msgid "_New Contact..."
-msgstr "Alamat _Baru..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
+#, fuzzy
+msgid "Copy selected contacts to the clipboard"
+msgstr "Salin teks yang sudah dipilih ke dalam klipbod"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
-msgid "New Contact _List..."
-msgstr "Daftar Alamat _Baru..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
+#, fuzzy
+msgid "Paste contacts from the clipboard"
+msgstr "Ambil tugas dari papan tempel"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
-msgid "_Save as VCard..."
-msgstr "_Simpan dalam bentuk VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
+msgid "Delete selected contacts"
+msgstr "Hapus kontak yang terpilih"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
-msgid "_Forward Contact"
-msgstr "_Meneruskan Alamat"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
+#, fuzzy
+msgid "Select all visible contacts"
+msgstr "Pilih semua kontak"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
-msgid "_Forward Contacts"
-msgstr "_Meneruskan Alamat"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
+#, fuzzy
+msgid "Are you sure you want to delete these contact lists?"
+msgstr ""
+"Apakah Anda benar-benar ingin\n"
+"menghapus daftar kontak ini?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
-msgid "Send _Message to Contact"
-msgstr "Kirim Pesan ke Ala_mat"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1289
+#, fuzzy
+msgid "Are you sure you want to delete this contact list?"
+msgstr ""
+"Apakah Anda benar-benar ingin\n"
+"menghapus daftar kontak ini?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
-msgid "Send _Message to List"
-msgstr "Kiri_m Pesan ke Daftar"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1293
+#, fuzzy, c-format
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr ""
+"Apakah Anda benar-benar ingin\n"
+"menghapus daftar kontak (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
-msgid "Send _Message to Contacts"
-msgstr "Kirim Pesan ke Ala_mat"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#, fuzzy
+msgid "Are you sure you want to delete these contacts?"
+msgstr ""
+"Apakah Anda benar-benar ingin\n"
+"menghapus kontak ini?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
-msgid "_Print"
-msgstr "_Cetak"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
-msgid "Cop_y to Address Book..."
-msgstr "Sal_in ke Buku Alamat..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
-msgid "Mo_ve to Address Book..."
-msgstr "Pind_ahkan ke Buku Alamat..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
-#: ../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
-#: ../calendar/gui/calendar-component.c:580
-#: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3152 ../mail/em-folder-tree.c:1002
-#: ../mail/em-folder-view.c:1111 ../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
-msgid "_Copy"
-msgstr "_Salin"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#, fuzzy
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+"Apakah Anda benar-benar ingin\n"
+"menghapus kontak ini?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
-msgid "P_aste"
-msgstr "T_empel"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
+#, fuzzy, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr ""
+"Apakah Anda benar-benar ingin\n"
+"menghapus kontak (%s)?"
 
-#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1602
-#: ../calendar/gui/cal-search-bar.c:357
-msgid "Any Category"
-msgstr "Kategori Apa Saja"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1462
+#, fuzzy, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"Membuka %d alamat akan juga membuka %d jendela baru.\n"
+"Yakin ingin menampilkan alamat ini?Membuka %d alamat akan juga membuka %d jendela baru.\n"
+"Yakin ingin menampilkan seluruh alamat ini?"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1801
-msgid "Print cards"
-msgstr "Cetak kartu"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1467
+#, fuzzy
+msgid "_Don't Display"
+msgstr "Tampilan"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1908
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-msgid "Other error"
-msgstr "Error lainnya"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
+#, fuzzy
+msgid "Display _All Contacts"
+msgstr "Sa_lin Seluruh Alamat Ke..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "Asisten"
 
@@ -3036,7 +896,7 @@ msgid "Car Phone"
 msgstr "Telepon Mobil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.ui.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
@@ -3044,84 +904,79 @@ msgid "Categories"
 msgstr "Kategori"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Telepon Kantor"
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#, fuzzy
+msgid "Company"
+msgstr "Per_usahaan:"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
-#: ../smime/lib/e-cert.c:827
-msgid "Email"
-msgstr "Email"
+msgid "Company Phone"
+msgstr "Telepon Kantor"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
 msgstr "Email 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 3"
 msgstr "Email 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
 msgstr "Nama Keluarga"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Simpan Sebagai"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
 msgstr "Nama Asli"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Fax Rumah"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone"
 msgstr "Telepon Rumah"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone 2"
 msgstr "Telepon Rumah 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "Telepon ISDN"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "Jurnal"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
 msgstr "Manajer"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Mobile Phone"
 msgstr "Telepon Seluler"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "Nickname"
 msgstr "Nama panggilan"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "Catatan"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Perkantoran"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Organization"
-msgstr "Organisasi"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Fax Lainnya"
@@ -3143,15 +998,13 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:497
+#: ../calendar/gui/e-meeting-list-view.c:578
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "Peranan"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 msgid "Spouse"
 msgstr "Pasangan Hidup"
 
@@ -3181,63 +1034,18 @@ msgstr "Unit"
 msgid "Web Site"
 msgstr "Situs Web"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
-#: ../widgets/table/e-table-click-to-add.c:516
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:656
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
-#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
-msgid "Width"
-msgstr "Lebar"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
-#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-field-chooser-item.c:663
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
-#: ../widgets/text/e-text.c:3675 ../widgets/text/e-text.c:3676
-msgid "Height"
-msgstr "Tinggi:"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
-msgid "Has Focus"
-msgstr "Ada Fokus"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Bagian"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Nama Kolom"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Model Teks"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Panjang kolom nama maksimal"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
-msgid "Column Width"
-msgstr "Lebar Kolom"
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Mencari Kontak."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -3251,7 +1059,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:189
 msgid ""
 "\n"
 "\n"
@@ -3265,7 +1073,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:193
 msgid ""
 "\n"
 "\n"
@@ -3275,7 +1083,7 @@ msgstr ""
 "\n"
 "Mencari Kontak."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -3285,1241 +1093,923 @@ msgstr ""
 "\n"
 "Tidak ada isian yang dapat ditampilkan."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
-msgid "Adapter"
-msgstr "Adapter"
-
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Email Kerja"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Email Rumah"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "Email Lainnya"
 
-#: ../addressbook/gui/widgets/e-minicard.c:172
-msgid "Selected"
-msgstr "Terpilih"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#, fuzzy
+msgid "evolution address book"
+msgstr "Buku Alamat Evolution"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
-msgid "Has Cursor"
-msgstr "Ada Kursor"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "Kontak Baru"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Buka Link dalam Br_owser"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "Buat Daftar Kontak"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2496
-msgid "_Copy Link Location"
-msgstr "_Salin Lokasi Link"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "folder buku alamat %s saat ini memiliki %d kartu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-msgid "_Send New Message To ..."
-msgstr "Kirim Pe_san Baru Ke ..."
+#: ../addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "Buka"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../addressbook/gui/widgets/ea-minicard.c:153
+msgid "Contact List: "
+msgstr "Daftar Kontak:"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:154
+msgid "Contact: "
+msgstr "Kontak: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:180
+msgid "evolution minicard"
+msgstr "evolution minicard"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
 msgstr "Salin Alamat _Email"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:381
+#, fuzzy
+msgid "Copy the email address to the clipboard"
+msgstr "Salin pesan terpilih ke papan tempel"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:386
+msgid "_Send New Message To..."
+msgstr "Kirim Pe_san Baru ke..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:388
+#, fuzzy
+msgid "Send a mail message to this address"
+msgstr "Kirim email ke milis ini?"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:258
+#: ../addressbook/gui/widgets/eab-contact-display.c:260
 msgid "(map)"
 msgstr "(peta)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:278
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
 msgid "map"
 msgstr "peta"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:415
+#: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
 msgstr "Daftar Anggota"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-msgid "E-mail"
-msgstr "E-mail"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "Bagian"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "Profesi"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "Posisi"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 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:752
-#: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view.c:496
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Luang/Sibuk"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Phone"
 msgstr "Telepon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+msgid "Address"
+msgstr "Alamat"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Home Page"
 msgstr "Halaman Utama"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
 msgstr "Web Log"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
-msgid "Birthday"
-msgstr "Ulang Tahun"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Anniversary"
-msgstr "Peringatan"
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:175
+#: ../modules/addressbook/e-book-shell-migrate.c:134
+#: ../modules/calendar/e-cal-shell-backend.c:171
+#: ../modules/calendar/e-cal-shell-migrate.c:151
+#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:158
+#: ../modules/calendar/e-task-shell-migrate.c:119
+#: ../plugins/email-custom-header/email-custom-header.c:320
+msgid "Personal"
+msgstr "Pribadi"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "Jabatan"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "Homepage"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "Blog"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
+#, c-format
+msgid "Click to mail %s"
+msgstr "Klik untuk mengirim email kepada %s"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Success"
 msgstr "Sukses"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Backend busy"
 msgstr "Program server sibuk"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Repository offline"
 msgstr "Repositori sedang mati/offline"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Address Book does not exist"
 msgstr "Buku Alamat tidak ada"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "No Self Contact defined"
 msgstr "Tidak ada Kontak Diri Sendiri"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Permission denied"
 msgstr "Hak akses ditolak"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact not found"
 msgstr "Kontak tidak ditemukan"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
 msgstr "ID Kontak sudah ada"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Protocol not supported"
 msgstr "Protokol tidak didukung"
 
 #. 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:664
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#. To Translators: This is task status
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717
+#: ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230
+#: ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2659
 msgid "Canceled"
 msgstr "Dibatalkan"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Could not cancel"
 msgstr "Tidak dapat membatalkan"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Failed"
 msgstr "Otentikasi Salah"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Authentication Required"
 msgstr "Otentikasi Dibutuhkan"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "TLS not Available"
 msgstr "TLS Tidak Tersedia"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "No such source"
 msgstr "Tidak ada sumbernya"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Not available in offline mode"
 msgstr "Tak tersedia dalam mode offline"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+msgid "Other error"
+msgstr "Error lainnya"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Invalid server version"
 msgstr "Versi server tidak benar"
 
-#: ../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 ""
-"Buku alamat ini tidak dapat dibuka. Artinya buku ini tidak dapat "
-"dipergunakan dalam keadaan tidak tersambung atau mungkin juga belum selesai "
-"diunduh agar dapat digunakan pada keadaan tidak tersambung. Silakan buka "
-"lagi buku alamat ini sekali lagi dalam keadaan tersambung agar isinya dapat "
-"dibaca."
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#, fuzzy
+msgid "Unsupported authentication method"
+msgstr "Operasi tidak dapat dilakukan"
 
-#: ../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 ""
-"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:107
+#, fuzzy
+msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
+msgstr "Buku alamat ini tidak dapat dibuka. Artinya buku ini tidak dapat dipergunakan dalam keadaan tidak tersambung atau mungkin juga belum selesai diunduh agar dapat digunakan pada keadaan tidak tersambung. Silakan buka lagi buku alamat ini sekali lagi dalam keadaan tersambung agar isinya dapat dibaca."
 
-#: ../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 ""
-"Buku alamat tidak dapat dibuka. Mungkin Anda memasukkan URI yang tidak benar "
-"atau server LDAPnya sedang mati atau tidak terjangkau."
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#, fuzzy, c-format
+msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
+msgstr "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: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 ""
-"Versi Evolution ini tidak dilengkapi dengan dukungan LDAP. Bila Anda ingin "
-"menggunakan LDAP pada Evolution, silakan instal paket Evolution yang "
-"dilengkapi dengan LDAP."
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#, fuzzy
+msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr "Versi Evolution ini tidak dilengkapi dengan dukungan LDAP. Bila Anda ingin menggunakan LDAP pada Evolution, silakan instal paket Evolution yang dilengkapi dengan 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 ""
-"Buku alamat ini tidak dapat dibuka. Mungkin URI yang Anda masukan tidak "
-"benar atau server sedang mati atau diluar jangkauan."
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#, fuzzy
+msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
+msgstr "Buku alamat ini tidak dapat dibuka. Mungkin URI yang Anda masukan tidak benar atau server sedang mati atau diluar jangkauan."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#, fuzzy
+msgid "Detailed error message:"
+msgstr "Total pesan:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:147
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#, fuzzy
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"the directory server preferences for this address book."
 msgstr ""
 "Ada banyak kartu yang cocok dengan query ini yang jumlahnya\n"
 "lebih banyak dari yang mampu ditampilkan oleh server atau Evolution.\n"
 "Tolong ubah pencariannya menjadi lebih spesifik atau tambahkan batasan\n"
 "hasil pencarian pada pengaturan server direktori pada buku alamat ini."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#, fuzzy
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
+"configured for this address book.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
+"preferences for this address book."
 msgstr ""
 "Waktu proses pencarian melebihi batas waktu yang ditentukan.\n"
 "Mohon gunakan kata kunci yang lain atau yang lebih spesifik.\n"
 "Bisa juga tambahkan batas waktu pencarian pada pengaturan\n"
 "server direktori pada buku alamat ini."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"Program buku alamat tidak dapat membaca kata kunci pencarian yang dimasukkan."
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
+#, fuzzy
+msgid "The backend for this address book was unable to parse this query."
+msgstr "Program buku alamat tidak dapat membaca kata kunci pencarian yang dimasukkan."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#, fuzzy
+msgid "The backend for this address book refused to perform this query."
 msgstr "Program buku alamat menolak untuk melakukan pencarian."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "Proses pencarian tidak berhasil dilakukan."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
-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
-msgid "Error adding contact"
-msgstr "Error saat menambahkan kontak"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
-msgid "Error modifying list"
-msgstr "Error saat mengubah isi daftar"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
-msgid "Error modifying contact"
-msgstr "Error saat merubah kontak"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-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
-msgid "Error removing contact"
-msgstr "Error saat menghapus kontak"
-
-#: ../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?"
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr ""
-"Membuka %d alamat akan juga membuka %d jendela baru.\n"
-"Yakin ingin menampilkan alamat ini?"
-"Membuka %d alamat akan juga membuka %d jendela baru.\n"
-"Yakin ingin menampilkan seluruh alamat ini?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s sudah ada\n"
-"Anda ingin menimpanya dengan data baru?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
-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
-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:208
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "Pilih Buku Alamat"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "daftar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "Pindahkan kontak ke"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "Salin kontak ke"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "Pindahkan kontak ke"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "Salin kontak ke"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
-msgid "Multiple VCards"
-msgstr "VCard Ganda"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
-#, 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
-msgid "Contact information"
-msgstr "Informasi alamat"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
-#, c-format
-msgid "Contact information for %s"
-msgstr "Informasi alamat untuk %s"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
-msgid "Querying Address Book..."
-msgstr "Mencari dalam Buku Alamat..."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "There is %d other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "Ada satu %d kontak lainnya."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:223
-#: ../addressbook/gui/widgets/eab-vcard-control.c:272
-msgid "Show Full VCard"
-msgstr "Tampilkan Keseluruhan Isi VCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Tampilkan Ringkasan VCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Save in addressbook"
-msgstr "Simpan dalam buku alamat"
-
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
 msgid "Card View"
 msgstr "Tampilan Kartu"
 
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "Tampilan Pohon GTK"
-
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252
+#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-vcard-importer.c:253
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:685
+#: ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Mengimpor..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:858
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "CSV Outlook atau Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:859
 msgid "Outlook CSV and Tab Importer"
 msgstr "CSV Outlook dan Pengimpor Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:867
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "CSV Mozilla atau Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:868
 msgid "Mozilla CSV and Tab Importer"
 msgstr "CSV Mozilla dan Pengimpor Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:876
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "CSV Evolution atau Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:877
 msgid "Evolution CSV and Tab Importer"
 msgstr "CSV Evolution dan Pengimport 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 "Mengimpor..."
-
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:689
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:690
 msgid "Evolution LDIF importer"
 msgstr "Program impor LDIF Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
-msgid "VCard (.vcf, .gcrd)"
+#: ../addressbook/importers/evolution-vcard-importer.c:556
+#, fuzzy
+msgid "vCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
-msgid "Evolution VCard Importer"
+#: ../addressbook/importers/evolution-vcard-importer.c:557
+#, fuzzy
+msgid "Evolution vCard Importer"
 msgstr "Program Impor VCard Evolution"
 
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "Cetak amplop"
-
-#: ../addressbook/printing/e-contact-print.c:849
-msgid "Print contacts"
-msgstr "Cetak kontak"
-
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
-msgid "Print contact"
-msgstr "Cetak kontak"
-
-#: ../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 "Kolom kosong pada akhir:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Isi"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Bawah:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Ukuran:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "J_enis Huruf..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Font"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Kaki:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Format"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:495
-#: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:649
-#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
-#: ../widgets/table/e-table-selection-model.c:318
-msgid "Header"
-msgstr "Header"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Header/Footer"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Kepala"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Kepala surat"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Tinggi:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Langsung setelahnya"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Termasuk:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Mendatar"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "K_iri"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Tab huruf pada sisi"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Margin"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Jumlah kolom:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Pilihan"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:120
-msgid "Orientation"
-msgstr "Orientasi"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Halaman"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Pengaturan Halaman:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Kertas"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Sumber kertas:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Berdiri"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Contoh hasil cetak:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Mencetak dengan bayangan abu-abu"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Balik pada halaman genap"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Kanan:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Bagian:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-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
-msgid "Size:"
-msgstr "Ukuran:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Mulai pada halaman baru"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Nama gaya:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Atas:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:176
-msgid "Type:"
-msgstr "Tipe:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Lebar:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "Jenis Huru_f..."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
-msgid "Contact Print Style Editor Test"
-msgstr "Uji Penyunting Alamat Alamat Cetak"
-
-#: ../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 "Ini akan menguji widget penyunting gaya alamat cetak"
-
-#: ../addressbook/printing/test-print.c:52
-msgid "Contact Print Test"
-msgstr "Tes Cetak Kontak"
-
-#: ../addressbook/printing/test-print.c:55
-msgid "This should test the contact print code"
-msgstr "Ini akan menguji kode alamat cetak"
-
-#: ../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
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "Tidak dapat membuka file"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
+#, fuzzy
+msgid "Couldn't get list of address books"
 msgstr "Tidak dapat mengambil daftar buku alamat"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "gagal membuka buku alamat"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "Masukkan file output dan bukan stardard output"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
-msgid "List local addressbook folders"
+#: ../addressbook/tools/evolution-addressbook-export.c:49
+#, fuzzy
+msgid "List local address book folders"
 msgstr "Tampilkan folder daftar buku alamat lokal"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "Tampilkan kartu dalam bentuk vcard atau file csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "Ekspor dalam mode asinkronus"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
-msgstr ""
-"Jumlah kartu dalam satu file output dalam moda asinkronus, ukuran standarnya "
-"100."
+#: ../addressbook/tools/evolution-addressbook-export.c:59
+#, fuzzy
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
+msgstr "Jumlah kartu dalam satu file output dalam moda asinkronus, ukuran standarnya 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "ANGKA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Error pada argumen perintah, silakan gunakan --help untuk melihat cara "
-"penggunaan program ini."
+#: ../addressbook/tools/evolution-addressbook-export.c:101
+msgid "Command line arguments error, please use --help option to see the usage."
+msgstr "Error pada argumen perintah, silakan gunakan --help untuk melihat cara penggunaan program ini."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "Hanya format csv atau vcard yang didukung."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "Pada moda asinkronus, output haruslah berupa file."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "Pada moda normal, pilihan ukuran tidak diperlukan."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Kesalahan tak tertangani"
 
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "Error membuka buku alamat default."
+#: ../addressbook/util/addressbook.c:103
+msgid "Accessing LDAP Server anonymously"
+msgstr "Mengakses Server LDAP secara anonim"
 
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "File Input"
+#: ../addressbook/util/addressbook.c:210
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
+msgid "Failed to authenticate.\n"
+msgstr "Gagal melakukan otentikasi.\n"
 
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "Nama file belum diberikan."
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Silakan masukkan kata sandi untuk %s (pengguna %s)"
 
-#: ../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 ""
-"Menambahkan rangkuman yang berarti ke pertemuan anda akan memberikan ide "
-"bagi penerima anda tentang pertemuan anda."
+#: ../addressbook/util/addressbook.c:225
+#: ../calendar/common/authentication.c:51
+#: ../plugins/caldav/caldav-browse-server.c:808
+#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/publish-calendar/publish-calendar.c:328
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Masukkan kata sandi"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../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."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
 msgstr ""
-"Menambahkan rangkuman yang berarti ke tugas anda akan memberika ide pada "
-"penerima tentang tugas tersebut."
-
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
-msgstr ""
-"Semua informasi jurnal ini akan dihapus dan tidak dapat dikembalikan ke "
-"semula."
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
-msgstr ""
-"Semua informasi jurnal ini akan dihapus dan tidak dapat dikembalikan semula."
+#, fuzzy
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
+msgstr "Anda memilih sumber kalender yang dibaca-saja. Ganti ke Tampilan Kalender dan tandai kalender yang dapat menerima pertemuan."
 
 #: ../calendar/calendar.error.xml.h:5
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr ""
-"Semua informasi tentang jadwal pertemuan ini akan dihapus dan tidak dapat "
-"dikembalikan ke semula."
+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."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"Semua informasi tentang tugas-tugas ini akan dihapus dan tidak dapat "
-"dikembalikan semula."
+msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
+msgstr "Menambahkan rangkuman yang berarti ke tugas anda akan memberika ide pada penerima tentang tugas tersebut."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"Semua informasi mengenai jadwal pertemuan ini akan dihapus dan tidak dapat "
-"dikembalikan ke semula."
+#, fuzzy
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr "Semua informasi tentang tugas-tugas ini akan dihapus dan tidak dapat dikembalikan semula."
 
 #: ../calendar/calendar.error.xml.h:8
-msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
-msgstr ""
-"Informasi pada entri jurnal ini akan dihapus dan tidak dapat dikembalikan ke "
-"semula."
+#, fuzzy
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr "Semua informasi jurnal ini akan dihapus dan tidak dapat dikembalikan semula."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr ""
-"Semua informasi pertemuan ini akan dihapus dan tidak akan dikembalikan "
-"menjadi semula."
+msgid "All information on these appointments will be deleted and can not be restored."
+msgstr "Semua informasi tentang jadwal pertemuan ini akan dihapus dan tidak dapat dikembalikan ke semula."
 
 #: ../calendar/calendar.error.xml.h:10
-msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
-"Semua informasi pada tugas ini akan dihapus dan tidak dapat dikembalikan ke "
-"semula."
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr "Semua informasi tentang tugas-tugas ini akan dihapus dan tidak dapat dikembalikan semula."
 
 #: ../calendar/calendar.error.xml.h:11
+msgid "All information on this appointment will be deleted and can not be restored."
+msgstr "Semua informasi mengenai jadwal pertemuan ini akan dihapus dan tidak dapat dikembalikan ke semula."
+
+#: ../calendar/calendar.error.xml.h:12
+msgid "All information on this meeting will be deleted and can not be restored."
+msgstr "Semua informasi pertemuan ini akan dihapus dan tidak akan dikembalikan menjadi semula."
+
+#: ../calendar/calendar.error.xml.h:13
+#, fuzzy
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr "Semua informasi pertemuan ini akan dihapus dan tidak akan dikembalikan menjadi semula."
+
+#: ../calendar/calendar.error.xml.h:14
+msgid "All information on this task will be deleted and can not be restored."
+msgstr "Semua informasi pada tugas ini akan dihapus dan tidak dapat dikembalikan ke semula."
+
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Apakah Anda ingin menghapus tugas '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Apakah Anda ingin menghapus pertemuan '{0}' ini?"
 
-#: ../calendar/calendar.error.xml.h:13
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "Apakah Anda ingin menghapus entri jurnal '{0}'?"
+#: ../calendar/calendar.error.xml.h:17
+#, fuzzy
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "Apakah Anda ingin menghapus pertemuan '{0}' ini?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:18
+#, fuzzy
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "Apakah Anda ingin menghapus tugas '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Apakah Anda ingin menghapus jadwal pertemuan {0}?"
 
-#: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "Apakah Anda ingin menghapus {0} entri jurnal ini?"
+#: ../calendar/calendar.error.xml.h:20
+#, fuzzy
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "Apakah Anda ingin menghapus {0} tugas ini?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Apakah Anda ingin menghapus {0} tugas ini?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:22
 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
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
+#, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Apakah Anda ingin menghapus pertemuan ini?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
+#, fuzzy, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "Apakah Anda ingin menghapus pertemuan ini?"
+
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
+#, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Apakah Anda ingin menghapus tugas ini?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:26
+#, fuzzy
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Apakah benar ingin mengirim tugas tanpa rangkuman?"
+
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Apakah benar ingin mengirim pertemuan tanpa rangkuman?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:28
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Apakah benar ingin mengirim tugas tanpa rangkuman?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "Gagal membuat acara baru"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:30
+#, fuzzy
+msgid "Cannot save event"
+msgstr "Gagal membuat acara baru"
+
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Hapus kalender \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Hapus daftar memo '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Hapus daftar tugas '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "Ja_ngan Kirim"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Apakah Anda ingin menghapus jadwal pertemuan ini?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Sedang mengunduh. Simpan tugas ini?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "Penyunting tidak bisa dibaca."
 
-#: ../calendar/calendar.error.xml.h:31
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"Pemberitahuan melalui email akan dikirim ke semua peserta dan meminta mereka "
-"untuk menerima tugas ini."
+#: ../calendar/calendar.error.xml.h:38
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgstr "Pemberitahuan melalui email akan dikirim ke semua peserta dan meminta mereka untuk menerima tugas ini."
 
-#: ../calendar/calendar.error.xml.h:32
-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."
+#: ../calendar/calendar.error.xml.h:39
+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."
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Salah saat membuka kalender"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Salah saat menambahkan daftar memo"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Salah saat menambahkan daftar tugas"
 
-#: ../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 ""
-"Jika tidak mengirimkan nota pembatalan, peserta lainnya mungkin tidak akan "
-"tahu bahwa jurnal ini telah dihapus. "
+#: ../calendar/calendar.error.xml.h:43
+msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+msgstr "Bila Anda tidak mengirimkan berita pembatalan, peserta lain mungkin tidak akan tahu bahwa pertemuan ini telah dibatalkan."
 
-#: ../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 ""
-"Bila Anda tidak mengirimkan berita pembatalan, peserta lain mungkin tidak "
-"akan tahu bahwa pertemuan ini telah dibatalkan."
+#: ../calendar/calendar.error.xml.h:44
+#, fuzzy
+msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
+msgstr "Bila Anda tidak mengirimkan berita pembatalan, peserta lain mungkin tidak tahu bahwa tugas ini telah dihapus."
 
-#: ../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."
+#: ../calendar/calendar.error.xml.h:45
+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."
 
-#: ../calendar/calendar.error.xml.h:39
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr ""
-"Mengirim informasi terbaru akan membantu peserta lain dalam mengatur "
-"kalender mereka."
+#: ../calendar/calendar.error.xml.h:46
+msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgstr "Mengirim informasi terbaru akan membantu peserta lain dalam mengatur kalender mereka."
 
-#: ../calendar/calendar.error.xml.h:40
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr ""
-"Mengirim informasi terbaru ke semua peserta akan membantu peserta lain untuk "
-"mengatur daftar tugas mereka."
+#: ../calendar/calendar.error.xml.h:47
+msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgstr "Mengirim informasi terbaru ke semua peserta akan membantu peserta lain untuk mengatur daftar tugas mereka."
 
-#: ../calendar/calendar.error.xml.h:41
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr ""
-"Ada beberapa lampiran yang akan diunduh. Menyimpan pertemuan akan "
-"menghilangkan lampiran ini."
+#: ../calendar/calendar.error.xml.h:48
+msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+msgstr "Ada beberapa lampiran yang akan diunduh. Menyimpan pertemuan akan menghilangkan lampiran ini."
 
-#: ../calendar/calendar.error.xml.h:42
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr ""
-"Ada beberapa lampiran yang akan diunduh. Menyimpan tugas akan menyebabkan "
-"kehilangan lampiran ini."
+#: ../calendar/calendar.error.xml.h:49
+msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+msgstr "Ada beberapa lampiran yang akan diunduh. Menyimpan tugas akan menyebabkan kehilangan lampiran ini."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr "Beberapa fasilitas mungkin tidak akan jalan di server anda."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Kalender Evolution telah berhenti mendadak."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:52
+#, fuzzy
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Kalender Evolution telah berhenti mendadak."
+
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Memo Evolution telah berhenti mendadak."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Program Tugas Evolution berhenti mendadak."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:55
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalender tidak ditandai untuk penggunaan offline."
 
-#: ../calendar/calendar.error.xml.h:48
-msgid "The memo list is not marked for offline usage"
+#: ../calendar/calendar.error.xml.h:56
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
 msgstr "Daftar memo tidak ditandai untuk penggunaan offline"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "Daftar tugas tidak ditandai untuk penggunaan offline."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Kalender ini akan dihapus permanen."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "Daftar memo ini akan dihapus secara permanen."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Daftar tugas ini akan dihapus secara permanen."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Apakah Anda ingin menyimpan jadwal pertemuan ini?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:62
+#, fuzzy
+msgid "Would you like to save your changes to this meeting?"
+msgstr "Apakah Anda ingin menyimpan perubahan pada memo ini?"
+
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "Apakah Anda ingin menyimpan perubahan pada memo ini?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "Apakah Anda ingin menyimpan perubahan pada tugas ini?"
 
-#: ../calendar/calendar.error.xml.h:56
-msgid "Would you like to send a cancelation notice for this journal entry?"
+#: ../calendar/calendar.error.xml.h:65
+#, fuzzy
+msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Apakah Anda ingin mengirimkan berita pembatalan entri jurnal ini?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Apakah Anda ingin mengirimkan berita pembatalan pada semua peserta?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Apakah Anda ingin mengirim undangan pertemuan pada setiap peserta?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "Apakah Anda ingin mengirim tugas ini ke semua peserta?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
-"Apakah Anda ingin mengirimkan informasi pertemuan terbaru pada setiap "
-"peserta?"
+msgstr "Apakah Anda ingin mengirimkan informasi pertemuan terbaru pada setiap peserta?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
-msgstr ""
-"Apakah Anda ingin mengirim informasi terbaru tentang tugas ini kepada semua "
-"peserta?"
+msgstr "Apakah Anda ingin mengirim informasi terbaru tentang tugas ini kepada semua peserta?"
 
-#: ../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 ""
-"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."
-
-#: ../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 ""
-"Anda memilih sumber kalender yang dibaca-saja. Ganti ke Tampilan Kalender dan "
-"tandai kalender yang dapat menerima pertemuan."
+#: ../calendar/calendar.error.xml.h:71
+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 "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."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:72
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Anda telah mengganti pertemuan ini, tetapi belum lagi disimpan."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:73
+#, fuzzy
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "Anda telah merubah tugas ini, tapi belum disimpan."
+
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Anda telah merubah tugas ini, tapi belum disimpan."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Anda telah merubah memo ini, tapi belum disimpan."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Kalender tidak akan aktif hingga Evolution dijalankan ulang."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Memo anda tidak akan ada sampai Evolution dijalankan ulang."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Tugas yang telah dibuat belum aktif hingga Evolution dijalankan ulang."
 
-#: ../calendar/calendar.error.xml.h:70
-#: ../composer/mail-composer.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:79
+#: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Abaikan"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../calendar/calendar.error.xml.h:80
+#: ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "_Simpan"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Simpan Perubahan"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28
+#: ../mail/mail.error.xml.h:133
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Kirim"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Kirim Pemberitahuan"
 
-#: ../calendar/calendar.error.xml.h:75
-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 "Masukkan kata sandi"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:255
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Pisahkan Acara > 1 hari:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1432
-#: ../calendar/conduits/calendar/calendar-conduit.c:1433
-#: ../calendar/conduits/memo/memo-conduit.c:854
-#: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1533
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/memo/memo-conduit.c:822
+#: ../calendar/conduits/todo/todo-conduit.c:1022
+#: ../calendar/conduits/todo/todo-conduit.c:1023
 msgid "Could not start evolution-data-server"
 msgstr "Evolution-data-server tidak dapat dijalankan"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1529
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
 msgstr "Blok aplikasi kalender pada Pilot tidak dapat dibaca"
 
-#: ../calendar/conduits/memo/memo-conduit.c:937
-#: ../calendar/conduits/memo/memo-conduit.c:940
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "Tidak bisa membaca block aplikasi memo pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:976
-#: ../calendar/conduits/memo/memo-conduit.c:979
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "Tidak bisa menulis aplikasi block memo pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:239
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
 msgstr "Prioritas Awal:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1112
-#: ../calendar/conduits/todo/todo-conduit.c:1115
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
 msgid "Could not read pilot's ToDo application block"
 msgstr "Blok aplikasi ToDo pada Pilot tidak dapat dibaca"
 
@@ -4528,171 +2018,113 @@ msgstr "Blok aplikasi ToDo pada Pilot tidak dapat dibaca"
 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:2038
-msgid "Calendar and Tasks"
-msgstr "Kalender dan Tugas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1358
-msgid "Calendars"
-msgstr "Kalender"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Atur zona waktu, Kalender, dan Daftar Tugas di sini "
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalender Evolution dan Tugas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Kontrol konfigurasi Kalender Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Penampil pesan penjadwalan Kalender Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Penyunting Kalender/Tugas Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Komponen Kalender Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Komponen Memo Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "Komponen Tugas Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "Mem_o"
-
-#: ../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
-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/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/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "Tugas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "_Kalender"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tugas"
-
-#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-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:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "menit"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
-#: ../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/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"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#, fuzzy
+msgid "hour"
 msgid_plural "hours"
 msgstr[0] "jam"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "Waktu awal"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "Jadwal Pertemuan"
 
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr ""
+
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1622
-#: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:934
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/e-itip-control.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1027
 msgid "Location:"
 msgstr "Lokasi:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
 msgid "Snooze _time:"
 msgstr "Waktu _terlelap:"
 
-#: ../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
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:46
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+msgid "_Dismiss"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
+#: ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:151
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1625
+#: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Ubah"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "_Ingatkan lagi"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+#: ../e-util/e-plugin-util.c:424
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#, fuzzy
+msgid "hours"
+msgstr "jam"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "lokasi pertemuan"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1452
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+#: ../e-util/e-plugin-util.c:423
+#: ../filter/filter.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+msgid "minutes"
+msgstr "menit"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
 msgid "No summary available."
 msgstr "Tidak ada keterangan"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
 msgid "No description available."
 msgstr "Tidak ada keterangan"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1471
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
 msgid "No location information available."
 msgstr "Tidak ada keterangan lokasi."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
 #, c-format
 msgid "You have %d alarms"
 msgstr "Anda punya %d alarm"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1700
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4704,50 +2136,42 @@ msgstr ""
 "menampilkan kotak dialog saja saat mengingatkan\n"
 "kalender."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 #, 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 ""
-"Pengingat Kalender Evolution akan dijalankan. Pengingat ini telah "
-"dikonfigurasi untuk menjalankan perintah berikut:\n"
+"Pengingat Kalender Evolution akan dijalankan. Pengingat ini telah dikonfigurasi untuk menjalankan perintah berikut:\n"
 "\n"
 ".........%s\n"
 "\n"
 "Benar ingin menjalankan program ini?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "Jangan tanya lagi tentang program ini."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo tidak dapat dijalankan"
-
-#: ../calendar/gui/alarm-notify/notify-main.c:153
-msgid "Could not create the alarm notify service factory"
-msgstr "Tidak dapat membuat program faktori layanan notifikasi alarm"
-
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "jam tidak benar"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69
+#: ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d jam"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75
+#: ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4756,1706 +2180,1949 @@ msgstr[0] "%d menit"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79
+#: ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d detik"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "Program alarm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "Konfirm_asi saat menghapus data"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Warna latar dari tugas berakhir hari ini, dalam bentuk \"#rrggbb\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Warna latar tugas yang habis waktu, dalam bentuk \"#rrggbb\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid "Calendars to run alarms for"
 msgstr "Alarm yang dijalankan Kalender untuk"
 
-#: ../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 ""
-"Warna untuk menggambar Baris Marcus Bains di batang Waktu (kosong untuk "
-"awal)."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Warna untuk menggambar Baris Marcus Bains di batang Waktu (kosong untuk awal)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Warna untuk menggambar baris Marcus Bains dalam Tampilan Hari."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "Padatkan akhir pekan dalam tampilan bulan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 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."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr ""
-"Hari yang seharusnya mengindikasikan dimana jam kerja diawali dan diakhiri."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+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."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "Pengingat jadwal pertemuan utama"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#, fuzzy
+msgid "Default recurrence count"
+msgstr "Unit pengingat awal"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Unit pengingat awal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Nilai pengingat awal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+msgid "Directory for saving alarm audio files"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "Informasi Acara"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "Transparansi Acara"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 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.h:21
 msgid "Free/busy template URL"
 msgstr "URL contoh Bebas/sibuk"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 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.h:23
 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.h:24
 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.h:25
 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.h:26
 msgid "Horizontal pane position"
 msgstr "Posisi mendatar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 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.h:28
 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.h:29
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "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.h:32
 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.h:33
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid "Level beyond which the message should be logged."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "Daftar server URL untuk jadwal luang/sibuk."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 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.h:37
 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.h:38
 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.h:39
+msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#, fuzzy
+msgid "Memo layout style"
+msgstr "Cara mem_balas:"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#, fuzzy
+msgid "Memo preview pane position (vertical)"
+msgstr "Tampilan bulan posisi panel tegak"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 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.h:45
 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.h:46
 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.h:47
 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.h:48
 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.h:49
 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.h:50
 msgid "Overdue tasks color"
 msgstr "Warga tugas belum selesai"
 
-#: ../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 ""
-"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.h:51
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+msgstr "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
-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."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "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
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
-"Posisi jendela vertikal, antara daftar kalender dan navigasi tanggal kalender."
 
-#: ../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.h:54
+msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
-"Posisi jendela tegak, diantara daftar tugas dan jendela cuplikan tugas, dalam "
-"piksel."
 
-#: ../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."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
-"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: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 ""
-"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.h:56
+msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
+msgstr "Posisi jendela vertikal, antara daftar kalender dan navigasi tanggal kalender."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "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.h:58
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
+msgstr "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.h:59
+#, fuzzy
+msgid "Primary calendar"
+msgstr "Cetak kalender ini"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#, fuzzy
+msgid "Primary memo list"
+msgstr "Daftar memo baru"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#, fuzzy
+msgid "Primary task list"
+msgstr "Buat daftar tugas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 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:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+msgid "Save directory for alarm audio"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid "Scroll Month View by a week"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Tampilkan bagian RSVP pada penyunting acara/tugas/rapat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 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:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 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:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 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:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "Tampilkan alaram pada bagian pemberitahuan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 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:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
-msgid "Show the \"Preview\" pane"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#, fuzzy
+msgid "Show the memo preview pane"
 msgstr "Tampilkan panel \"Pratinjau\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#: ../mail/evolution-mail.schemas.in.in.h:82
-msgid "Show the \"Preview\" pane."
-msgstr "Tampilkan panel \"Pratinjau\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#, fuzzy
+msgid "Show the task preview pane"
+msgstr "Tampilkan panel \"Pratinjau\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 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:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 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:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#, fuzzy
+msgid "Show week number in Day and Work Week View"
+msgstr "Tampilkan nomor jumlah dalam navigasi tanggal"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week numbers in date navigator"
 msgstr "Tampilkan nomor jumlah dalam navigasi tanggal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
-msgid "Tasks due today color"
-msgstr "Warna tugas harus selesai hari ini"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
-msgid "Tasks vertical pane position"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#, fuzzy
+msgid "Task preview pane position (horizontal)"
+msgstr "Posisi batang tegak tugas"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#, fuzzy
+msgid "Task preview pane position (vertical)"
 msgstr "Posisi batang tegak tugas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+msgid "Tasks due today color"
+msgstr "Warna tugas harus selesai hari ini"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 #, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
+msgstr "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.h:85
+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 "Timezone yang dipergunakan untuk penanggalan dan waktu di kalender, sebagaimana zona lokasi basis data waktu Olsen yang tidak diterjemahkan seperti \"Amerika/New York\"."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "The layout style determines where to place the preview pane in relation to the memo list. \"0\" (Classic View) places the preview pane below the memo list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr ""
-"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: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\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "The layout style determines where to place the preview pane in relation to the task list. \"0\" (Classic View) places the preview pane below the task list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
-"Timezone yang dipergunakan untuk penanggalan dan waktu di kalender, "
-"sebagaimana zona lokasi basis data waktu Olsen yang tidak diterjemahkan "
-"seperti \"Amerika/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time divisions"
 msgstr "Pembagian waktu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 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:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Timezone"
 msgstr "Zona waktu"
 
-#: ../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 ""
-"Transparansi acara dalam tampilan kalender, nilai antara 0 (transparan) "
-"dan 1 (opasi)."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
+msgstr "Transparansi acara dalam tampilan kalender, nilai antara 0 (transparan) dan 1 (opasi)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Twenty four hour time format"
 msgstr "Bentuk dua puluh empat jam"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Satuan sebagai pengingat, \"menit\", \"jam\" ataupun \"hari\"."
+msgstr "Satuan sebagai pengingat,  \"minutes\" (menit), \"hours\" (jam) atau \"days\" hari."
 
-#: ../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.h:99
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "Unit untuk menentukan kapan menyembunyikan tugas,  \"minutes\" (menit), \"hours\" (jam) atau \"days\" (hari)."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+msgid "Use system timezone"
 msgstr ""
-"Unit untuk menentukan kapan menyembunyikan tugas, \"menit\", \"jam\" atau "
-"\"hari\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr "Posisi panel vertikal"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "Mulai minggu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 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:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 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:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 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"
+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.h:107
 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"
+msgstr "Atur untuk menentukan apakah ingin melakukan konfirmasi pada saat menghapus jadwal pertemuan atau tidak"
 
-#: ../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 ""
-"Apakah untuk memadatkan mingguan dalam tampilan bulan, yang meletakkan Sabtu "
-"dan Minggu dalam ruang satu minggu."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+msgstr "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:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 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:76
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 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:78
-msgid "Whether to set a default reminder for appointments."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr ""
-"Atur untuk menentukan apakah ingin membuat pengingat default untuk pertemuan "
-"atau tidak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+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.h:114
 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:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 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:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 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:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 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:83
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 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:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 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:86
-msgid "Whether to show week numbers in the date navigator."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#, fuzzy
+msgid "Whether to show week number in the Day and Work Week View."
 msgstr "Apakah menampilkan jumlah minggu dalam navigasi tanggal."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "Apakah menggunakan waktu siang ketika menampilkan acara."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
+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:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "Hari kerja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "Akhir Jam hari kerja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "Menit akhir hari kerja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "Mulai jam hari kerja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "Mulai menit hari kerja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr "waktu siang"
-
-#: ../calendar/gui/cal-search-bar.c:48
-msgid "Summary contains"
-msgstr "Ringkasan berisi"
-
-#: ../calendar/gui/cal-search-bar.c:49
-msgid "Description contains"
-msgstr "Deskripsi berisi"
-
-#: ../calendar/gui/cal-search-bar.c:50
-msgid "Category is"
-msgstr "Kategori"
-
-#: ../calendar/gui/cal-search-bar.c:51
-msgid "Comment contains"
-msgstr "Komentar berisi"
-
-#: ../calendar/gui/cal-search-bar.c:52
-msgid "Location contains"
-msgstr "Lokasi berisi"
-
-#: ../calendar/gui/cal-search-bar.c:360
-msgid "Unmatched"
-msgstr "Tidak cocok"
-
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
-#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Cetak"
-
-#: ../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 ""
-"Proses ini akan menghapus secara permanen semua acara yang waktunya lebih "
-"tua dari waktu yang Anda tentukan. Semua yang dihapus tidak dapat "
-"dikembalikan ke semula."
-
-#: ../calendar/gui/calendar-commands.c:354
-msgid "Purge events older than"
-msgstr "Hapus acara yang waktunya lebih tua dari"
-
-#: ../calendar/gui/calendar-commands.c:359
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
-#: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
-msgid "days"
-msgstr "hari"
-
-#. 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:257
-#: ../calendar/gui/memos-component.c:222 ../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 "Web"
-
-#: ../calendar/gui/calendar-component.c:275 ../calendar/gui/migration.c:403
-msgid "Birthdays & Anniversaries"
-msgstr "Ulang Tahun dan Peringatan"
-
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:100
-msgid "Weather"
-msgstr "Cuaca"
+#: ../calendar/gui/cal-editor-utils.c:105
+#, fuzzy
+msgid "Invalid object"
+msgstr "Kontak salah"
 
-#: ../calendar/gui/calendar-component.c:579
-msgid "_New Calendar"
-msgstr "Kale_nder Baru"
+#: ../calendar/gui/calendar-view-factory.c:117
+msgid "Day View"
+msgstr "Tampilan Hari"
 
-#: ../calendar/gui/calendar-component.c:896
-msgid "Failed upgrading calendars."
-msgstr "Gagal meningkatkan kalender."
+#: ../calendar/gui/calendar-view-factory.c:120
+msgid "Work Week View"
+msgstr "Tampilan Minggu Kerja"
 
-#: ../calendar/gui/calendar-component.c:1195
-#, c-format
-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-view-factory.c:123
+msgid "Week View"
+msgstr "Tampilan Minggu"
 
-#: ../calendar/gui/calendar-component.c:1211
-msgid "There is no calendar available for creating events and meetings"
-msgstr "Tidak ada kalender tersedia untuk mengatur acara dan pertemuan"
+#: ../calendar/gui/calendar-view-factory.c:126
+msgid "Month View"
+msgstr "Tampilan Bulan"
 
-#: ../calendar/gui/calendar-component.c:1333
-msgid "Calendar Source Selector"
-msgstr "Pilihan Sumber Kalender"
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
+#, fuzzy
+msgid "Any Field"
+msgstr "Bagian"
 
-#: ../calendar/gui/calendar-component.c:1541
-msgid "New appointment"
-msgstr "Jadwal pertemuan baru"
+#: ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5
+#: ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Lampiran"
 
-#: ../calendar/gui/calendar-component.c:1542
-msgid "_Appointment"
-msgstr "J_anji"
+#: ../calendar/gui/caltypes.xml.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:6
+msgid "Attendee"
+msgstr "Peserta"
 
-#: ../calendar/gui/calendar-component.c:1543
-msgid "Create a new appointment"
-msgstr "Buat jadwal pertemuan yang baru"
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
+#, fuzzy
+msgid "Category"
+msgstr "Kategori"
 
-#: ../calendar/gui/calendar-component.c:1549
-msgid "New meeting"
-msgstr "Pertemuan baru"
+#: ../calendar/gui/caltypes.xml.h:6
+#: ../calendar/gui/memotypes.xml.h:5
+msgid "Classification"
+msgstr "Klasifikasi"
 
-#: ../calendar/gui/calendar-component.c:1550
-msgid "M_eeting"
-msgstr "P_ertemuan"
+#: ../calendar/gui/caltypes.xml.h:7
+#: ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:499
+#: ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/memotypes.xml.h:6
+#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../widgets/misc/e-send-options.ui.h:2
+msgid "Confidential"
+msgstr "Rahasia"
 
-#: ../calendar/gui/calendar-component.c:1551
-msgid "Create a new meeting request"
-msgstr "Buat usulan pertemuan"
+#: ../calendar/gui/caltypes.xml.h:8
+#: ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
+#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/table/e-table-config.ui.h:6
+msgid "Description"
+msgstr "Keterangan"
 
-#: ../calendar/gui/calendar-component.c:1557
-msgid "New all day appointment"
-msgstr "Buat jadwal pertemuan seharian penuh"
+#: ../calendar/gui/caltypes.xml.h:9
+#: ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
+#, fuzzy
+msgid "Description Contains"
+msgstr "Deskripsi berisi"
 
-#: ../calendar/gui/calendar-component.c:1558
-msgid "All Day A_ppointment"
-msgstr "Jadwal Pertemuan Sehari _Penuh"
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#: ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "Tidak Ada"
 
-#: ../calendar/gui/calendar-component.c:1559
-msgid "Create a new all-day appointment"
-msgstr "Buat jadwal pertemuan seharian penuh"
+#: ../calendar/gui/caltypes.xml.h:11
+#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Ada"
 
-#: ../calendar/gui/calendar-component.c:1565
-msgid "New calendar"
-msgstr "Kalender baru"
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:377
+msgid "Location"
+msgstr "Lokasi"
 
-#: ../calendar/gui/calendar-component.c:1566
-msgid "Cale_ndar"
-msgstr "Kale_nder"
+#: ../calendar/gui/caltypes.xml.h:13
+#: ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Organizer"
+msgstr "Penyelenggara"
 
-#: ../calendar/gui/calendar-component.c:1567
-msgid "Create a new calendar"
-msgstr "Buat kalender baru"
+#: ../calendar/gui/caltypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:497
+#: ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/memotypes.xml.h:12
+msgid "Private"
+msgstr "Pribadi"
 
-#: ../calendar/gui/calendar-view-factory.c:109
-msgid "Day View"
-msgstr "Tampilan Hari"
+#: ../calendar/gui/caltypes.xml.h:15
+#: ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:488
+#: ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/memotypes.xml.h:13
+msgid "Public"
+msgstr "Publik"
 
-#: ../calendar/gui/calendar-view-factory.c:112
-msgid "Work Week View"
-msgstr "Tampilan Minggu Kerja"
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
+msgid "Recurrence"
+msgstr "Pengulangan"
 
-#: ../calendar/gui/calendar-view-factory.c:115
-msgid "Week View"
-msgstr "Tampilan Minggu"
+#: ../calendar/gui/caltypes.xml.h:17
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:363
+msgid "Summary"
+msgstr "Judul"
 
-#: ../calendar/gui/calendar-view-factory.c:118
-msgid "Month View"
-msgstr "Tampilan Bulan"
+#: ../calendar/gui/caltypes.xml.h:18
+#: ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
+#, fuzzy
+msgid "Summary Contains"
+msgstr "Ringkasan berisi"
 
-#: ../calendar/gui/comp-editor-factory.c:415
-msgid "Error while opening the calendar"
-msgstr "Error saat membuka kalender"
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25
+#: ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "berisi"
 
-#: ../calendar/gui/comp-editor-factory.c:421
-msgid "Method not supported when opening the calendar"
-msgstr "Metode tidak dapat dijalankan saat membuka kalender"
+#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26
+#: ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "tidak berisi"
 
-#: ../calendar/gui/comp-editor-factory.c:427
-msgid "Permission denied to open the calendar"
-msgstr "Pembukaan kalender tidak diperbolehkan"
+#: ../calendar/gui/caltypes.xml.h:21
+#: ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27
+#: ../mail/em-filter-i18n.h:31
+msgid "is"
+msgstr "adalah"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1272
-msgid "Unknown error"
-msgstr "Keybord tak dikenal"
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../mail/em-filter-i18n.h:37
+msgid "is not"
+msgstr "bukan"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "Sunting Alarm"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>Alarm</b>"
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "Ingatkan"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Bunyikan suara"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>Pilihan Lain</b>"
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Jalankan program"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>Ulangi</b>"
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Kirim email"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
 msgstr "Tambah Alarm"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#, fuzzy
+msgid "Alarm"
+msgstr "<b>Alarm</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "Cantu_mkan pesan"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
 msgstr "Bunyikan suara lain"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "Pe_san:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
-msgid "Play a sound"
-msgstr "Bunyikan suara"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../mail/mail-config.ui.h:77
+msgid "Options"
+msgstr "Pilihan"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
-msgid "Pop up an alert"
-msgstr "Ingatkan"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+#, fuzzy
+msgid "Repeat"
+msgstr "_Ulangi"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
-msgid "Run a program"
-msgstr "Jalankan program"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#, fuzzy
+msgid "Select A File"
+msgstr "Pilih Berkas"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "Kirim Ke:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:454
-msgid "Send an email"
-msgstr "Kirim email"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "_Argumen:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "Ulangi ala_rm"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "_Suara:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "after"
 msgstr "setelah"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
 msgid "before"
 msgstr "sebelum"
 
-#. 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
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
 msgid "day(s)"
 msgstr "hari"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
+#: ../e-util/e-plugin-util.c:425
+#: ../filter/filter.ui.h:14
+#: ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:43
+msgid "days"
+msgstr "hari"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "end of appointment"
 msgstr "pertemuan berakhir"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "kali lagi setiap"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "jam"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "menit"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "pertemuan dimulai"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "Aksi/Pemicu"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 msgid "A_dd"
 msgstr "Tam_bah"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 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"
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/e-day-view-time-item.c:797
+#, fuzzy
+msgctxt "cal-second-zone"
+msgid "None"
+msgstr "Tak Ada"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
-msgid "Attach file(s)"
-msgstr "Lampirkan file"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/e-day-view-time-item.c:824
+#: ../calendar/gui/e-timezone-entry.c:319
+#, fuzzy
+msgid "Select..."
+msgstr "_Pilih"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
 msgid "Selected Calendars for Alarms"
 msgstr "Kalender Terpilih untuk Alarm"
 
-#: ../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 menit\n"
-"30 menit\n"
-"15 menit\n"
-"10 menit\n"
-"05 menit"
-
-#: ../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 dan %d akan diisikan dengan nama pengguna dan ranah/domain pada alamat "
-"email</i>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
+#, fuzzy
+msgid "Ti_me and date:"
+msgstr "Zona waktu:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">Peringatan</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
+#, fuzzy
+msgid "_Date only:"
+msgstr "Tanggal _selesai:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">Server Bebas/Sibuk Awal</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
+#, fuzzy, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "<i>%u dan %d akan diisikan dengan nama pengguna dan ranah/domain pada alamat email</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
-#: ../plugins/publish-calendar/publish-calendar.glade.h:1
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">Umum</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
+#, fuzzy
+msgid "(Shown in a Day View)"
+msgstr "Tampilkan kolom pada Tampilan"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">Daftar Tugas</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+#, fuzzy
+msgid "05 minutes"
+msgstr "menit"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">Waktu</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
+#, fuzzy
+msgid "10 minutes"
+msgstr "menit"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">Minggu Kerja</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+#, fuzzy
+msgid "15 minutes"
+msgstr "menit"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "Tentukan untuk waktu si_ang"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+#, fuzzy
+msgid "30 minutes"
+msgstr "menit"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+#, fuzzy
+msgid "60 minutes"
+msgstr "menit"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10
+#: ../mail/mail-config.ui.h:7
+#, fuzzy
+msgid "Alerts"
+msgstr "Alarm"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
+#: ../mail/mail-config.ui.h:29
+#: ../modules/addressbook/autocompletion-config.c:153
+#, fuzzy
+msgid "Date/Time Format"
+msgstr "Tanggal/Waktu"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
 msgstr "A_khir hari:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
+#, fuzzy
+msgid "Days"
+msgstr "5 Hari"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
+#, fuzzy
+msgid "Default Free/Busy Server"
+msgstr "<span weight=\"bold\">Server Bebas/Sibuk Awal</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
 msgstr "Tampilan"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
+#, fuzzy
+msgid "Display alarms in _notification area only"
+msgstr "Tampilkan alaram pada bagian pemberitahuan"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Jumat"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"Menit\n"
-"Jam\n"
-"Hari"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:278
+#: ../mail/mail-config.ui.h:54
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2660
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "General"
+msgstr "Umum"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
+#, fuzzy
+msgid "Hours"
+msgstr "jam"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
+#, fuzzy
+msgid "Minutes"
+msgstr "menit"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Senin"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"Senin\n"
-"Selasa\n"
-"Rabu\n"
-"Kamis\n"
-"Jumat\n"
-"Sabtu\n"
-"Minggu"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#. Translators: Used in send options dialog
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
+#: ../filter/e-filter-rule.c:759
+#: ../widgets/misc/e-send-options.ui.h:12
+msgid "None"
+msgstr "Tidak ada"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
+#: ../mail/mail-config.ui.h:81
 msgid "Pick a color"
 msgstr "Pilih warna"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "_Min"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+msgid "Sc_roll Month View by a week"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#, fuzzy
+msgid "Se_cond zone:"
+msgstr "Kirim Ke:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Pilih kalender untuk pemberitahuan alarm"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "_Ingatkan"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#, fuzzy
+msgid "Show a _reminder"
+msgstr "_Ingatkan"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "Tampilka_n jumlah pekan dalam penelusur tanggal"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:725
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#, fuzzy
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Tampilkan nomor jumlah dalam navigasi tanggal"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Minggu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "Tug_as harus selesai hari ini:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "_Kam"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Task List"
+msgstr "Daftar Tugas"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "Templat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Kamis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../e-util/e-non-intrusive-error-dialog.c:287
+#: ../widgets/misc/e-dateedit.c:592
+msgid "Time"
+msgstr "Waktu"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "_Zona waktu:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "Format waktu:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+msgid "Use s_ystem time zone"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Rabu"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "Mingg_u dimulai pada:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
+msgid "Work Week"
+msgstr "Minggu Kerja"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "Hari kerja:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 jam (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 jam"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "Konfirm_asi saat menghapus data"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "Pada_tkan akhir pekan pada tampilan bulan"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "Awa_l hari:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "_Jum"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "S_embunyikan tugas selesai setelah"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "_Sen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "_Tugas belum selesai padahal harus sudah selesai:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "Sa_b"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 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:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "Pembagian wak_tu:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "Se_l"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "_Rab"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "sebelum setiap pertemuan"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:288
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "Tipe:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../modules/addressbook/addressbook-config.c:510
+msgid "_Type:"
+msgstr "_Tipe:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.ui.h:147
+#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
+#: ../widgets/misc/e-signature-script-dialog.c:282
+msgid "_Name:"
+msgstr "_Nama:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Sal_in isi kalender ke sistem lokal untuk operasi offline"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Sal_in isi daftar tugas ke sistem lokal untuk operasi offline"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Sal_in isi daftar memo ke sistem lokal untuk operasi offline"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "C_olor:"
+#: ../calendar/gui/dialogs/calendar-setup.c:346
+#, fuzzy
+msgid "Colo_r:"
 msgstr "Wa_rna:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-msgid "Task List"
-msgstr "Daftar Tugas"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Daftar Memo"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Pengaturan Kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "Kalender Baru"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "Pengaturan Daftar Tugas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
-msgid "New Memo List"
-msgstr "Daftar Memo Baru"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-msgid "Add Calendar"
-msgstr "Tambah Kalender"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Task List"
-msgstr "Tambah Daftar Tugas"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "_Add Calendar"
-msgstr "T_ambah Kalender"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Task List"
-msgstr "T_ambah Daftar Tugas"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../plugins/calendar-http/calendar-http.c:271
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "Pe_rbarui:"
+#: ../calendar/gui/dialogs/calendar-setup.c:533
+#, fuzzy
+msgid "New Task List"
+msgstr "_Daftar Tugas Baru"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
-msgid "_URL:"
-msgstr "_URL:"
+#: ../calendar/gui/dialogs/calendar-setup.c:589
+#, fuzzy
+msgid "Memo List Properties"
+msgstr "Pengaturan Daftar Tugas"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "minggu"
+#: ../calendar/gui/dialogs/calendar-setup.c:589
+msgid "New Memo List"
+msgstr "Daftar Memo Baru"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Acara ini telah dihapus."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Tugas ini telah dihapus."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr "Isian jurnal ini telah dihapus."
+#: ../calendar/gui/dialogs/changed-comp.c:67
+#, fuzzy
+msgid "This memo has been deleted."
+msgstr "Acara ini telah dihapus."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Ada perubahan yang Anda lakukan.  saja semua dan tutup editor ini?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Tidak ada perubahan, tutup editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Acara ini telah diubah."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Tugas ini telah diubah."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr "Isi jurnal ini telah diubah."
+#: ../calendar/gui/dialogs/changed-comp.c:91
+#, fuzzy
+msgid "This memo has been changed."
+msgstr "Acara ini telah diubah."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  Ada perubahan yang Anda lakukan.  saja semua dan perbarui isi editor ini?"
+msgstr "%s  Ada perubahan yang Anda lakukan.  saja semua dan perbarui isi editor ini?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Tidak ada perubahan, perbarui isi editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:515
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Error validasi: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2280
-msgid " to "
-msgstr " ke "
+#: ../calendar/gui/dialogs/comp-editor.c:237
+#, fuzzy
+msgid "Could not save attachments"
+msgstr "Simpan lampiran"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
-msgid " (Completed "
-msgstr " (Selesai "
+#: ../calendar/gui/dialogs/comp-editor.c:505
+msgid "Could not update object"
+msgstr "Tidak dapat memperbarui obyek"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
-msgid "Completed "
-msgstr "Selesai "
+#: ../calendar/gui/dialogs/comp-editor.c:604
+msgid "Edit Appointment"
+msgstr "Ubah Pertemuan"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
-msgid " (Due "
-msgstr " (Batas "
+#: ../calendar/gui/dialogs/comp-editor.c:611
+#, c-format
+msgid "Meeting - %s"
+msgstr "Rapat - %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
-msgid "Due "
-msgstr "Batas "
+#: ../calendar/gui/dialogs/comp-editor.c:613
+#, c-format
+msgid "Appointment - %s"
+msgstr "Pertemuan - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
-msgid "Attached message - %s"
-msgstr "Lampiran pesan email - %s"
+msgid "Assigned Task - %s"
+msgstr "Tugas yang telah diberikan - %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:621
 #, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "%d pesan terlampir"
+msgid "Task - %s"
+msgstr "Tugas - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:1003 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1007 ../mail/message-list.c:1902
-msgid "_Move"
-msgstr "_Pindahkan"
+#: ../calendar/gui/dialogs/comp-editor.c:626
+#, fuzzy, c-format
+msgid "Memo - %s"
+msgstr "Mem_o"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:1005 ../mail/message-list.c:1904
-msgid "Cancel _Drag"
-msgstr " _Drag"
+#: ../calendar/gui/dialogs/comp-editor.c:642
+#, fuzzy
+msgid "No Summary"
+msgstr "Tidak ada judul"
 
-#: ../calendar/gui/dialogs/comp-editor.c:802
-msgid "Could not update object"
-msgstr "Tidak dapat memperbarui obyek"
+#: ../calendar/gui/dialogs/comp-editor.c:751
+msgid "Keep original item?"
+msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:948 ../composer/e-msg-composer.c:2501
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> Lampiran"
+#: ../calendar/gui/dialogs/comp-editor.c:938
+msgid "Click here to close the current window"
+msgstr "Klik di sini untuk menutup jendela ini"
 
-#: ../calendar/gui/dialogs/comp-editor.c:980
-msgid "Hide Attachment _Bar"
-msgstr "Sem_bunyikan Panel Lampiran"
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1464
+#: ../widgets/misc/e-focus-tracker.c:115
+#: ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:398
+#: ../widgets/misc/e-web-view.c:1051
+msgid "Copy the selection"
+msgstr "Salin bagian yang dipilih"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
-#: ../calendar/gui/dialogs/comp-editor.c:1468
-msgid "Show Attachment _Bar"
-msgstr "Tam_pilkan Panel Lampiran"
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1471
+#: ../widgets/misc/e-focus-tracker.c:108
+#: ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:1045
+msgid "Cut the selection"
+msgstr "Potong bagian yang dipilih"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
-#: ../calendar/gui/dialogs/event-page.c:1896
-#: ../calendar/gui/dialogs/task-page.c:1199
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "_Buang"
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1478
+#: ../widgets/misc/e-focus-tracker.c:129
+#: ../widgets/misc/e-focus-tracker.c:560
+#, fuzzy
+msgid "Delete the selection"
+msgstr "Potong bagian yang dipilih"
+
+#: ../calendar/gui/dialogs/comp-editor.c:966
+msgid "Click here to view help available"
+msgstr "Klik di sini untuk menampilkan bantuan tersedia"
+
+#: ../calendar/gui/dialogs/comp-editor.c:973
+#: ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1513
+#: ../widgets/misc/e-focus-tracker.c:122
+#: ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:1057
+msgid "Paste the clipboard"
+msgstr "Tempel isi clipboard"
+
+#: ../calendar/gui/dialogs/comp-editor.c:994
+msgid "Click here to save the current window"
+msgstr "Klik di sini untuk menyimpan jendela ini"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1001
+#: ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1583
+#: ../widgets/misc/e-focus-tracker.c:136
+#: ../widgets/misc/e-focus-tracker.c:565
+msgid "Select all text"
+msgstr "Pilih semua teks"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1008
+msgid "_Classification"
+msgstr "K_lasifikasi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1022
+#: ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1632
+#: ../widgets/misc/e-signature-editor.c:217
+msgid "_File"
+msgstr "_Berkas"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1639
+msgid "_Help"
+msgstr "Ba_ntuan"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1036
+#, fuzzy
+msgid "_Insert"
+msgstr "_Sisipkan"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:353
+msgid "_Options"
+msgstr "_Pilihan"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1050
+#: ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1674
+msgid "_View"
+msgstr "_Lihat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:281
+msgid "_Attachment..."
+msgstr "L_ampiran..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1062
+msgid "Click here to attach a file"
+msgstr "Klik di sini untuk melampirkan berkas"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1070
+msgid "_Categories"
+msgstr "_Kategori"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1072
+msgid "Toggles whether to display categories"
+msgstr "Apakah akan menampilkan kategori"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1078
+msgid "Time _Zone"
+msgstr "_Zona waktu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1080
+msgid "Toggles whether the time zone is displayed"
+msgstr "Apakah menampilkan daerah zona waktu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+msgid "Pu_blic"
+msgstr "Pu_blik"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1091
+msgid "Classify as public"
+msgstr "Ditentukan sebagai Umum"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1096
+msgid "_Private"
+msgstr "_Pribadi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1098
+#, fuzzy
+msgid "Classify as private"
+msgstr "Ditentukan sebagai Pribadi"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1103
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2081
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
-msgid "_Properties"
-msgstr "_Informasi"
+msgid "_Confidential"
+msgstr "_Rahasia"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1105
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
-msgid "_Add attachment..."
-msgstr "T_ambah lampiran..."
+#, fuzzy
+msgid "Classify as confidential"
+msgstr "Ditentukan sebagai Rahasia"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1492
-#: ../mail/em-format-html-display.c:2266
-msgid "Show Attachments"
-msgstr "Tampilkan Lampiran"
+#: ../calendar/gui/dialogs/comp-editor.c:1113
+msgid "R_ole Field"
+msgstr "D_aerah Pesan"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1493
-msgid "Press space key to toggle attachment bar"
-msgstr "Tekan spasi untuk memunculkan batang attachment"
+#: ../calendar/gui/dialogs/comp-editor.c:1115
+msgid "Toggles whether the Role field is displayed"
+msgstr "Apakah daerah peran diampilkan"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2100
-#: ../calendar/gui/dialogs/comp-editor.c:2143
-msgid "Edit Appointment"
-msgstr "Ubah Pertemuan"
+#: ../calendar/gui/dialogs/comp-editor.c:1121
+msgid "_RSVP"
+msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2106
-#: ../calendar/gui/dialogs/comp-editor.c:2149
-#, c-format
-msgid "Meeting - %s"
-msgstr "Rapat - %s"
+#: ../calendar/gui/dialogs/comp-editor.c:1123
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Apakah daerah RSVP ditampilkan"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2108
-#: ../calendar/gui/dialogs/comp-editor.c:2151
-#, c-format
-msgid "Appointment - %s"
-msgstr "Pertemuan - %s"
+#: ../calendar/gui/dialogs/comp-editor.c:1129
+msgid "_Status Field"
+msgstr "Daerah _Status"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2112
-#: ../calendar/gui/dialogs/comp-editor.c:2155
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tugas yang telah diberikan - %s"
+#: ../calendar/gui/dialogs/comp-editor.c:1131
+msgid "Toggles whether the Status field is displayed"
+msgstr "Apakah menampilkan daerah Status"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
-#, c-format
-msgid "Task - %s"
-msgstr "Tugas - %s"
+#: ../calendar/gui/dialogs/comp-editor.c:1137
+msgid "_Type Field"
+msgstr "Daerah Ke_tik"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2117
-#: ../calendar/gui/dialogs/comp-editor.c:2160
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Isi jurmal - %s"
+#: ../calendar/gui/dialogs/comp-editor.c:1139
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Apakah daerah pengetikan para peserta ditampilkan"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2128
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-msgid "No summary"
-msgstr "Tidak ada judul"
+#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../composer/e-composer-private.c:70
+#, fuzzy
+msgid "Recent _Documents"
+msgstr "Terakhir Dibuka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2715
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:518
-#: ../mail/em-utils.c:555 ../widgets/misc/e-attachment-bar.c:365
-msgid "attachment"
-msgstr "lampiran"
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:477
+msgid "Attach"
+msgstr "Lampirkan"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1738
+msgid "Save"
+msgstr "Simpan"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2804
-#: ../calendar/gui/dialogs/comp-editor.c:2858
-#: ../calendar/gui/dialogs/comp-editor.c:2882
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2958
 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"
+msgstr "Perubahan yang terjadi pada isian ini akan dibatalkan bila ada data baru yang datang"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../plugins/prefer-plain/prefer-plain.c:64
+msgid "attachment"
+msgstr "lampiran"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2906
+#: ../calendar/gui/dialogs/comp-editor.c:2988
 msgid "Unable to use current version!"
 msgstr "Tidak dapat menggunakan versi ini!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:91
 msgid "Could not open source"
 msgstr "Tidak dapat membuka asal"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:99
 msgid "Could not open destination"
 msgstr "Tidak dapat membuka tujuan"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Destination is read only"
 msgstr "Tujuan hanya dapat dibaca saja"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:214
 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
+#: ../calendar/gui/dialogs/delete-comp.c:217
+#, fuzzy
+msgid "_Retract comment"
+msgstr "Persentase selesai:"
+
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Acara ini tidak dapat dihapus karena ada error corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr "Tugas ini tidak dapat dihapus karena ada error corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
-msgid "The journal entry could not be deleted due to a corba error"
-msgstr "Isian jurnal tidak dapat dihapus karena ada error corba"
+#: ../calendar/gui/dialogs/delete-error.c:61
+#, fuzzy
+msgid "The memo could not be deleted due to a corba error"
+msgstr "Isian ini tidak dapat dihapus karena ada error corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr "Isian ini tidak dapat dihapus karena ada error corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "Acara ini tidak dapat dihapus karena tidak diperbolehkan"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr "Tugas ini tidak dapat dihapus karena tidak diperbolehkan"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The journal entry could not be deleted because permission was denied"
-msgstr "Isi jurnal ini tidak dapat dihapus karena tidak diperbolehkan"
+#: ../calendar/gui/dialogs/delete-error.c:77
+#, fuzzy
+msgid "The memo could not be deleted because permission was denied"
+msgstr "Isian ini tidak dapat dihapus karena tidak diperbolehkan"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr "Isian ini tidak dapat dihapus karena tidak diperbolehkan"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "Acara ini tidak dapat dihapus karena ada error"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "Tugas ini tidak dapat dihapus karena ada error"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
-msgid "The journal entry could not be deleted due to an error"
-msgstr "Isi jurnal ini tidak dapat dihapus karena ada error"
+#: ../calendar/gui/dialogs/delete-error.c:93
+#, fuzzy
+msgid "The memo could not be deleted due to an error"
+msgstr "Isian ini ini tidak dapat dihapus karena ada error"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "Isian ini ini tidak dapat dihapus karena ada error"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
 msgstr "Kontak..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "Delegasikan Ke:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
 msgstr "Masukkan Delegasi"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "_Alarms"
+msgstr "_Alarm"
+
+#: ../calendar/gui/dialogs/event-editor.c:207
+msgid "Click here to set or unset alarms for this event"
+msgstr "Klik di sini untuk mengatur alarm acara ini"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+msgid "_Recurrence"
+msgstr "_Pengulangan"
+
+#: ../calendar/gui/dialogs/event-editor.c:214
+msgid "Make this a recurring event"
+msgstr "Buat ini sebagai acara berulang"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:210
+#: ../widgets/misc/e-send-options.ui.h:19
+msgid "Send Options"
+msgstr "Pilihan Pengiriman"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Sisipkan pilihan kirim lebih lanjutan"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "All _Day Event"
+msgstr "Acara _Sehari Penuh"
+
+#: ../calendar/gui/dialogs/event-editor.c:231
+msgid "Toggles whether to have All Day Event"
+msgstr "Apakah akan mengadakan Acara Satu Harian"
+
+#: ../calendar/gui/dialogs/event-editor.c:237
+#, fuzzy
+msgid "Show Time as _Busy"
+msgstr "Tampilkan waktu sebagai waktu si_buk"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "Toggles whether to show time as busy"
+msgstr "Apakah menampilkan waktu sebagai sibuk"
+
+#: ../calendar/gui/dialogs/event-editor.c:248
+msgid "_Free/Busy"
+msgstr "_Luang/Sibuk"
+
+#: ../calendar/gui/dialogs/event-editor.c:250
+msgid "Query free / busy information for the attendees"
+msgstr "Berikan informasi bebas / sibuk untuk peserta"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "Perte_muan"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Pengulangan"
+#: ../calendar/gui/dialogs/event-page.c:751
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:755
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "Acara ini ada alarmnya"
 
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:441
+#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Penyelen_ggara:"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:877
 msgid "_Delegatees"
 msgstr "_Delegasi"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:879
 msgid "Atte_ndees"
 msgstr "Pese_rta"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1094
 msgid "Event with no start date"
 msgstr "Acara tanpa tanggal awal"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no end date"
 msgstr "Acara tanpa tanggal akhir"
 
-#: ../calendar/gui/dialogs/event-page.c:1259
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:849
+#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "Tanggal awal salah"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1278
 msgid "End date is wrong"
 msgstr "Tanggal akhir salah"
 
-#: ../calendar/gui/dialogs/event-page.c:1292
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Start time is wrong"
 msgstr "Waktu awal salah"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1308
 msgid "End time is wrong"
 msgstr "Waktu akhir salah"
 
-#: ../calendar/gui/dialogs/event-page.c:1454
-#: ../calendar/gui/dialogs/memo-page.c:718
-#: ../calendar/gui/dialogs/task-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/task-page.c:921
 msgid "The organizer selected no longer has an account."
 msgstr "Penyelenggara yang terpilih tidak memiliki account."
 
-#: ../calendar/gui/dialogs/event-page.c:1460
-#: ../calendar/gui/dialogs/memo-page.c:724
-#: ../calendar/gui/dialogs/task-page.c:912
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "Penyelenggara harus dipilih."
 
-#: ../calendar/gui/dialogs/event-page.c:1475
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/task-page.c:951
 msgid "At least one attendee is required."
 msgstr "Paling tidak harus ada seorang peserta."
 
-#: ../calendar/gui/dialogs/event-page.c:1897
-#: ../calendar/gui/dialogs/task-page.c:1200
-msgid "_Add "
-msgstr "T_ambah "
-
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Tidak dapat membuka kalender '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2927
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:1743
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, 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:2935
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, 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:2943
-#, c-format
-msgid "%d minute before appointement"
+#: ../calendar/gui/dialogs/event-page.c:2949
+#, fuzzy, c-format
+msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d menit sebelum pertemuan"
 
-#: ../calendar/gui/dialogs/event-page.c:2959
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "Sesuaikan"
 
-#. an empty string is the same as 'None'
+#. Translators: "None" for "No alarm set"
 #: ../calendar/gui/dialogs/event-page.c:2964
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
-#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c: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
+#, fuzzy
+msgctxt "cal-alarms"
 msgid "None"
-msgstr "Tidak ada"
+msgstr "Tak Ada"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 msgid "1 day before appointment"
 msgstr "1 hari sebelum pertemuan"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 msgid "1 hour before appointment"
 msgstr "1 jam sebelum pertemuan"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 msgid "15 minutes before appointment"
 msgstr "15 menit sebelum pertemuan"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
 msgstr "Pe_serta..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "Ka_tegori..."
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+#: ../calendar/gui/e-meeting-list-view.c:148
+#, fuzzy
+msgid "Attendees"
+msgstr "Pese_rta"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "Alarm Disesuaikan:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "D_escription:"
-msgstr "D_eskripsi:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "Keterangan Acara"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/task-page.glade.h:6
-msgid "Su_mmary:"
-msgstr "Rin_gkasan:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "Ing_atkan"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
+#, fuzzy
+msgid "_Description:"
+msgstr "Ke_terangan:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
+msgid "_Location:"
+msgstr "_Lokasi:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#, fuzzy
+msgid "_Summary:"
+msgstr "Ringkasan:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "Wak_tu:"
 
-#. 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
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "for"
 msgstr "untuk"
 
-#. 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
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
 msgid "until"
 msgstr "hingga"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Peserta"
-
-#: ../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 "Klik di sini untuk menambahkan peserta"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Common Name"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Didelegasikan Dari"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Didelegasikan Kepada"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Bahasa"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Anggota"
-
-#. 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 "Konfirmasi/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-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
-msgid "Status"
-msgstr "Kondisi"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>P_eserta</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "Ganti _Penyelenggara"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "Ala_mat..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Penyelenggara"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "Penyelenggara:"
-
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:109
+#: ../calendar/gui/print.c:2576
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:868
+#: ../calendar/gui/dialogs/memo-page.c:350
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:354
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:876
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Tidak dapat membuka memo dalam '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1019 ../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
+#: ../calendar/gui/dialogs/memo-page.c:1043
+#: ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939
+#: ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301
+#: ../mail/em-format-html.c:2325
+#: ../mail/message-list.etspec.h:20
+#: ../modules/mail/em-mailer-prefs.c:78
 msgid "To"
 msgstr "Untuk"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
 msgstr "Tanggal _mulai:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Su_mmary"
-msgstr "Rin_gkasan"
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "Rin_gkasan:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "P_ada:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.c:434
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Grup:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-msgid "_Memo Content:"
-msgstr "Isi _Memo:"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-msgid "<b>Calendar options</b>"
-msgstr "<b>Pilihan Kalender</b>"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "Add New Calendar"
-msgstr "Tambah Kalender Baru"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Calendar Group"
-msgstr "Grup Kalender"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Location"
-msgstr "Lokasi Kalender"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Name"
-msgstr "Nama Kalender"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-msgid "<b>Task List Options</b>"
-msgstr "<b>Pilihan Daftar Tugas</b>"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "Add New Task List"
-msgstr "Tambahkan Daftar Tugas Baru"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Task List Group"
-msgstr "Grup Daftar Tugas"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Name"
-msgstr "Nama Daftar Tugas"
-
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:54
+#, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Anda sedang merubah acara yang berulang. Apa yang ingin Anda ganti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:56
+#, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr ""
-"Anda sedang mendelegasikan acara yang berulang. Apa yang ingin Anda "
-"delegasikan?"
+msgstr "Anda sedang mendelegasikan acara yang berulang. Apa yang ingin Anda delegasikan?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:60
+#, c-format
 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 ""
-"You are modifying a recurring journal entry. What would you like to modify?"
-msgstr ""
-"Anda sedang merubah isi jurnal yang berulang. Bagian apa yang ingin Anda "
-"ganti?"
+#: ../calendar/gui/dialogs/recur-comp.c:64
+#, fuzzy, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Anda sedang merubah acara yang berulang. Apa yang ingin Anda ganti?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6473,18 +4140,21 @@ msgstr "Contoh Ini dan Kedepan"
 msgid "All Instances"
 msgstr "Semua Kejadian"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 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:819
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Tanggal perulangan tidak benar"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "pada hari"
 
@@ -6492,7 +4162,7 @@ msgstr "pada hari"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:996
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "pertama"
 
@@ -6501,7 +4171,7 @@ msgstr "pertama"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "detik"
 
@@ -6509,7 +4179,7 @@ msgstr "detik"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "ketiga"
 
@@ -6517,21 +4187,30 @@ msgstr "ketiga"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "keempat"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#, fuzzy
+msgid "fifth"
+msgstr "Lebar"
+
 #. 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:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "terakhir"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Tanggal Lainnya"
 
@@ -6539,7 +4218,7 @@ msgstr "Tanggal Lainnya"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1 ke 10"
 
@@ -6547,7 +4226,7 @@ msgstr "1 ke 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11 ke 20"
 
@@ -6555,18 +4234,21 @@ msgstr "11 ke 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1063
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "21 ke 31"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "hari"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "pada"
 
@@ -6574,400 +4256,413 @@ msgstr "pada"
 msgid "occurrences"
 msgstr "kali"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2378
-msgid "Date/Time"
-msgstr "Tanggal/Waktu"
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
+#, fuzzy
+msgid "Add exception"
+msgstr "deskripsi"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>Pengecualian</b>"
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
+#, fuzzy
+msgid "Could not get a selection to modify."
+msgstr "Pindahkan pilihan ke papan tempel"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
+#, fuzzy
+msgid "Modify exception"
+msgstr "Tanpa pengacakan"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
-msgid "<b>Preview</b>"
-msgstr "<b>Tampilan Kalender</b>"
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#, fuzzy
+msgid "Could not get a selection to delete."
+msgstr "Daftar delegasi tidak dapat diperbarui"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Recurrence</b>"
-msgstr "<b>Perulangan</b>"
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
+msgid "Date/Time"
+msgstr "Tanggal/Waktu"
 
-#. 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
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
 msgid "Every"
 msgstr "Setiap"
 
-#. 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
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+#, fuzzy
+msgid "Exceptions"
+msgstr "<b>Pengecualian</b>"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3
+#: ../mail/mail-config.ui.h:85
+#, fuzzy
+msgid "Preview"
+msgstr "Pratampil"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
 msgstr "Pertemuan ini ber_ulang"
 
-#. 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
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
 msgid "forever"
 msgstr "selamanya"
 
-#. 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
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
 msgid "month(s)"
 msgstr "bulan"
 
-#. 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
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgid "week(s)"
 msgstr "minggu"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
 msgid "year(s)"
 msgstr "tahun"
 
-#: ../calendar/gui/dialogs/task-details-page.c:411
-#: ../calendar/gui/dialogs/task-details-page.c:431
+#: ../calendar/gui/dialogs/send-comp.c:162
+msgid "Send my alarms with this event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/send-comp.c:164
+msgid "Notify new attendees _only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.c:379
+#: ../calendar/gui/dialogs/task-details-page.c:399
 msgid "Completed date is wrong"
 msgstr "Tanggal selesai salah"
 
-#: ../calendar/gui/dialogs/task-details-page.c:518
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "Halaman Web"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">Lainnya</span>"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">Status</span>"
-
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:231
-#: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2382 ../plugins/save-calendar/csv-format.c:390
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931
+#: ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228
+#: ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2656
+#: ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
 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:1031
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-task-table.c:510
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1123
+#: ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Tinggi"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:228
-#: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790
+#: ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2653
 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:1029
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1121
+#: ../widgets/misc/e-send-options.ui.h:9
 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:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1030
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1243
+#: ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/message-list.c:1122
+#: ../widgets/misc/e-send-options.ui.h:13
 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:658
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711
+#: ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224
+#: ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2650
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Belum Dimulai"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
 msgstr "Persentase selesai:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 msgid "Stat_us:"
 msgstr "Stat_us:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/dialogs/task-details-page.ui.h:18
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:1759
+#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Kondisi"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:513
+#: ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "Belum didefinisikan"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "Tanggal _selesai:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "_Prioritas:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "Halaman _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "Rincian _Status"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+#, fuzzy
+msgid "Click to change or view the status details of the task"
+msgstr "Klik ganti / tampil status rincian dari tugas"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../plugins/groupwise-features/mail-send-options.c:200
+msgid "_Send Options"
+msgstr "_Pilihan Pengiriman"
+
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "_Task"
 msgstr "_Tugas"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:325
 msgid "Task Details"
 msgstr "Rincian Tugas"
 
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:340
+#, fuzzy
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "Pesan ini tidak dapat dikirim karena Anda belum menentukan penerimanya"
+
+#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.ui.h:4
+#, fuzzy
+msgid "Organi_zer:"
+msgstr "Penyelenggara:"
+
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "Tanggal target selesai"
 
-#: ../calendar/gui/dialogs/task-page.c:1650
+#: ../calendar/gui/dialogs/task-page.c:1700
 #, c-format
 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
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Kategor_i..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "Penyelen_ggara:"
+#: ../calendar/gui/dialogs/task-page.ui.h:3
+#, fuzzy
+msgid "D_ue date:"
+msgstr "Tanggal _harus selesai:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:7
 msgid "Time zone:"
 msgstr "Zona waktu:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "Tanggal _harus selesai:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>Kalender Luang/Sibuk</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "<b>Publishing Frequency</b>"
-msgstr "<b>Frekuensi Publikasi</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing _Location</b>"
-msgstr "<b>Lokasi Publikasi</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Publishing Settings"
-msgstr "Pengaturan Publikasi Luang/Sibuk"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "_Daily"
-msgstr "_Harian"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "_Manual"
-msgstr "_Manual"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
-msgid "_Password:"
-msgstr "_Sandi:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
-msgid "_Remember password"
-msgstr "Ingat _sandi"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Username:"
-msgstr "Pengg_una:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "_Weekly"
-msgstr "_Mingguan"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d hari"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d minggu"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Tidak tahu harus melakukan apa"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s sebelum pertemuan dimulai"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s setelah pertemuan dimulai"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s saat pertemuan dimulai"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s sebelum pertemuan berakhir"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s setelah pertemuan berakhir"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s saat pertemuan berakhir"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:535
 #, c-format
 msgid "%s at %s"
 msgstr "%s pada %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s 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:2861
-#, c-format
-msgid "Click to open %s"
-msgstr "Klik untuk membuka %s"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+#: ../calendar/gui/e-cal-component-preview.c:191
+#: ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "Tak ada judul"
 
-#: ../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 "Tanggal Mulai:"
-
-#: ../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 "Keterangan:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
-#: ../calendar/gui/e-cal-component-preview.c:301
-msgid "Web Page:"
-msgstr "Halaman Web:"
+#: ../calendar/gui/e-cal-component-preview.c:197
+#, fuzzy
+msgid "Categories:"
+msgstr "_Kategori..."
 
-#: ../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-cal-component-preview.c:236
+#: ../calendar/gui/e-itip-control.c:1151
+#: ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Ringkasan:"
 
-#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:258
+msgid "Start Date:"
+msgstr "Tanggal Mulai:"
+
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "Tanggal Harus Selesai:"
 
-#. 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:959
+#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1058
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "Prioritas: "
 
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:365
-msgid "Public"
-msgstr "Publik"
-
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
-msgid "Private"
-msgstr "Pribadi"
+#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../calendar/gui/e-itip-control.c:1214
+#: ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:35
+msgid "Description:"
+msgstr "Keterangan:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
-msgid "Confidential"
-msgstr "Rahasia"
+#: ../calendar/gui/e-cal-component-preview.c:367
+msgid "Web Page:"
+msgstr "Halaman Web:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:368
+msgid "Created"
+msgstr "Dibuat"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "Tanggal Akhir"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
+#, fuzzy
+msgid "Last modified"
+msgstr "Diubah"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Tanggal Awal"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:386
-msgid "Summary"
-msgstr "Judul"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-task-table.c:562
 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-cal-model-calendar.c:190
+#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "Sibuk"
 
-#: ../calendar/gui/e-cal-model-tasks.c:610
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6977,214 +4672,73 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:709
+#, fuzzy
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "Tak Ada"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1065
+#: ../calendar/gui/e-cal-model.c:1249
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ya"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-cal-model-tasks.c:1065
+#: ../calendar/gui/e-cal-model.c:1249
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Tidak ada"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1760
-#: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../calendar/gui/e-cal-model.c:501
+#: ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225
+#: ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989
+#: ../e-util/e-charset.c:52
+#: ../mail/em-utils.c:976
+#: ../plugins/itip-formatter/itip-formatter.c:450
+#: ../plugins/itip-formatter/itip-formatter.c:2327
+#: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Tidak dikenal"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Berulang"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Telah ditugaskan"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
-msgid "Save As..."
-msgstr "Simpan Sebagai..."
-
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2112
-msgid "Select folder to save selected attachments..."
-msgstr "Pilih folder untuk menyimpan lampiran ini..."
-
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
-msgid "untitled_image.%s"
-msgstr "gambar-tidak-berjudul %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:1121 ../mail/em-popup.c:554 ../mail/em-popup.c:565
-msgid "_Save As..."
-msgstr "Simpan _Jadi..."
-
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
-#: ../mail/em-popup.c:566
-msgid "Set as _Background"
-msgstr "Set jadi Latar _Belakang"
-
-#: ../calendar/gui/e-cal-popup.c:278
-msgid "_Save Selected"
-msgstr "_Simpan Terpilih"
-
-#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
-#, c-format
-msgid "Open in %s..."
-msgstr "Buka menggunakan %s..."
-
-#: ../calendar/gui/e-calendar-table.c:409
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-calendar-table.c:410
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-calendar-table.c:411
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-calendar-table.c:412
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-calendar-table.c:413
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-calendar-table.c:414
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-calendar-table.c:415
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-calendar-table.c:416
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-calendar-table.c:417
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-calendar-table.c:418
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-calendar-table.c:419
-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
-msgid "Deleting selected objects"
-msgstr "Menghapus obyek terpilih"
-
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
-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:798
-#: ../composer/e-msg-composer.c:1348
-msgid "Save as..."
-msgstr "Simpan sebagai..."
-
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "_Tugas Baru"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
-msgid "Open _Web Page"
-msgstr "Buka Halaman _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:1122
-#: ../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 "_Cetak..."
-
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
-#: ../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:1289
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:910
-#: ../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:1293 ../ui/evolution-tasks.xml.h:22
-msgid "_Assign Task"
-msgstr "Tug_askan"
-
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
-#: ../ui/evolution-tasks.xml.h:26
-msgid "_Forward as iCalendar"
-msgstr "_Kirim dalam bentuk iCalendar"
-
-#: ../calendar/gui/e-calendar-table.c:1295
-msgid "_Mark as Complete"
-msgstr "_Tandai Sudah Selesai"
-
-#: ../calendar/gui/e-calendar-table.c:1296
-msgid "_Mark Selected Tasks as Complete"
-msgstr "_Tandai Tugas Sudah Selesai"
-
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "_Tandai Belum Selesai"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Tandai Tugas Belum Selesai"
-
-#: ../calendar/gui/e-calendar-table.c:1303
-msgid "_Delete Selected Tasks"
-msgstr "_Hapus Tugas yang Terpilih"
-
-#: ../calendar/gui/e-calendar-table.c:1536
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "Klik untuk menambah tugas baru"
+msgid "Opening %s"
+msgstr "Membuka %s"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "%s Selesai"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:652
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "Klik untuk menambah tugas baru"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Selesai"
 
@@ -7192,137 +4746,144 @@ msgstr "Selesai"
 msgid "Completion date"
 msgstr "Tanggal penyelesaian"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "Tanggal harus selesai"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Priority"
 msgstr "Prioritas"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "Tanggal awal"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-msgid "Task sort"
-msgstr "Pengurutan tugas"
-
-#: ../calendar/gui/e-calendar-view.c:1367
-msgid "Moving items"
-msgstr "Memindahkan isian"
-
-#: ../calendar/gui/e-calendar-view.c:1369
-msgid "Copying items"
-msgstr "Menyalin isian"
-
-#: ../calendar/gui/e-calendar-view.c:1678
-msgid "New _Appointment..."
-msgstr "J_anji Baru..."
-
-#: ../calendar/gui/e-calendar-view.c:1679
-msgid "New All Day _Event"
-msgstr "Buat Baru Acara S_ehari Penuh"
-
-#: ../calendar/gui/e-calendar-view.c:1680
-msgid "New _Meeting"
-msgstr "Perte_muan Baru"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
-msgid "_Current View"
-msgstr "Tampilan _Sekarang"
-
-#: ../calendar/gui/e-calendar-view.c:1693
-msgid "Select T_oday"
-msgstr "Pilih _Hari ini"
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
+msgid "Type"
+msgstr "Tipe"
 
-#: ../calendar/gui/e-calendar-view.c:1694
-msgid "_Select Date..."
-msgstr "_Pilih Tanggal..."
+#: ../calendar/gui/e-calendar-view.c:404
+#, fuzzy
+msgid "Cut selected events to the clipboard"
+msgstr "Ambil teks yang sudah dipilih ke dalam klipbod"
 
-#: ../calendar/gui/e-calendar-view.c:1710
-msgid "Cop_y to Calendar..."
-msgstr "Sal_in ke Kalender..."
+#: ../calendar/gui/e-calendar-view.c:410
+#, fuzzy
+msgid "Copy selected events to the clipboard"
+msgstr "Salin teks yang sudah dipilih ke dalam klipbod"
 
-#: ../calendar/gui/e-calendar-view.c:1711
-msgid "Mo_ve to Calendar..."
-msgstr "Pin_dahkan ke Kalender..."
+#: ../calendar/gui/e-calendar-view.c:416
+#, fuzzy
+msgid "Paste events from the clipboard"
+msgstr "Tempelkan teks dari klipbod"
 
-#: ../calendar/gui/e-calendar-view.c:1712
-msgid "_Delegate Meeting..."
-msgstr "_Jadwalkan Pertemuan..."
+#: ../calendar/gui/e-calendar-view.c:422
+#, fuzzy
+msgid "Delete selected events"
+msgstr "Hapus memo yang dipilih"
 
-#: ../calendar/gui/e-calendar-view.c:1713
-msgid "_Schedule Meeting..."
-msgstr "_Jadwalkan Pertemuan..."
+#: ../calendar/gui/e-calendar-view.c:441
+#: ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
+msgid "Deleting selected objects"
+msgstr "Menghapus obyek terpilih"
 
-#: ../calendar/gui/e-calendar-view.c:1714
-msgid "_Forward as iCalendar..."
-msgstr "_Kirim dalam bentuk iCalendar..."
+#: ../calendar/gui/e-calendar-view.c:629
+#: ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
+msgid "Updating objects"
+msgstr "Memperbarui obyek"
 
-#: ../calendar/gui/e-calendar-view.c:1715
-msgid "_Reply"
-msgstr "_Balas"
+#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2315
+msgid "Accepted"
+msgstr "Terima"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1116
-#: ../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:1707
+#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2321
+msgid "Declined"
+msgstr "Ditolak"
 
-#: ../calendar/gui/e-calendar-view.c:1721
-msgid "Make this Occurrence _Movable"
-msgstr "Kejadian Ini Dapat _Dipindahkan"
+#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
+msgid "Tentative"
+msgstr "Sementara"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
-msgid "Delete this _Occurrence"
-msgstr "Hapus _Kejadian Ini"
+#: ../calendar/gui/e-calendar-view.c:1709
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:195
+#: ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2324
+msgid "Delegated"
+msgstr "Terdelegasi"
 
-#: ../calendar/gui/e-calendar-view.c:1723
-msgid "Delete _All Occurrences"
-msgstr "Hapus Semu_a Kejadian"
+#: ../calendar/gui/e-calendar-view.c:1710
+#, fuzzy
+msgid "Needs action"
+msgstr "Butuh Penanganan"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:1852
+#: ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, 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
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:1856
+#: ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, 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:1872
+#: ../calendar/gui/print.c:2608
 #, 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:1903
 #, c-format
 msgid "Time: %s %s"
 msgstr "Waktu: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:116
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:124
-#, c-format
+#: ../calendar/gui/e-cell-date-edit-text.c:171
+#, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
-"\n"
 "%s"
 msgstr ""
 "Tanggal harus diketikkan dalam bentuk:\n"
@@ -7333,545 +4894,586 @@ 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:759
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i pembagi menit"
 
+#: ../calendar/gui/e-day-view-time-item.c:780
+#, fuzzy
+msgid "Show the second time zone"
+msgstr "Tampilkan panel \"Pratinjau\""
+
 #. 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: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:865
+#: ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-week-view-main-item.c:218
+#: ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:869
+#: ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:913
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:873
+#: ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../modules/calendar/e-cal-shell-view-private.c:949
+msgid "%d %b"
+msgstr "%d %b"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c: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:1076
+#: ../calendar/gui/e-week-view.c:748
+#: ../calendar/gui/print.c:819
 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:1079
+#: ../calendar/gui/e-week-view.c:751
+#: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:759
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2609
+#, fuzzy, c-format
+msgid "Week %d"
+msgstr "minggu"
+
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ya (Perulangan Yang Rumit)"
 
-#: ../calendar/gui/e-itip-control.c:770
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Setiap %d hari"
 
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Setiap %d minggu"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Setiap %d minggu pada hari"
 
-#: ../calendar/gui/e-itip-control.c:785
+#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " dan "
 
-#: ../calendar/gui/e-itip-control.c:792
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s hari dalam "
 
-#: ../calendar/gui/e-itip-control.c:805
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s dalam "
 
-#: ../calendar/gui/e-itip-control.c:812
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "setiap %d bulan"
 
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Setiap %d tahun "
 
-#: ../calendar/gui/e-itip-control.c:827
-#, c-format
+#: ../calendar/gui/e-itip-control.c:874
+#, fuzzy, c-format
 msgid "a total of %d time"
-msgid_plural " a total of %d times"
+msgid_plural "a total of %d times"
 msgstr[0] "total waktu %d kali"
 
-#: ../calendar/gui/e-itip-control.c:836
+#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", berakhir pada "
 
-#: ../calendar/gui/e-itip-control.c:857
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:906
 msgid "Starts"
 msgstr "Awal"
 
-#: ../calendar/gui/e-itip-control.c:870
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "Akhir"
 
-#: ../calendar/gui/e-itip-control.c:904
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../calendar/gui/e-itip-control.c:943
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
 msgstr "Jatuh Tempo"
 
-#: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
+#: ../calendar/gui/e-itip-control.c:986
+#: ../calendar/gui/e-itip-control.c:1047
 msgid "iCalendar Information"
 msgstr "Informasi iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:961
+#: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Error"
 msgstr "Error 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
+#: ../calendar/gui/e-itip-control.c:1080
+#: ../calendar/gui/e-itip-control.c:1096
+#: ../calendar/gui/e-itip-control.c:1107
+#: ../calendar/gui/e-itip-control.c:1124
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Orang tidak dikenal"
 
-#. 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> Silakan periksa informasi di bawah ini, dan pilih aksi yang hendak "
-"dijalankan pada menu di bawah."
-
 #: ../calendar/gui/e-itip-control.c:1132
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:685
-#: ../plugins/itip-formatter/itip-formatter.c:1748
-msgid "Accepted"
-msgstr "Terima"
+msgid "<br> Please review the following information, and then select an action from the menu below."
+msgstr "<br> Silakan periksa informasi di bawah ini, dan pilih aksi yang hendak dijalankan pada menu di bawah."
 
-#: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:688
-#: ../plugins/itip-formatter/itip-formatter.c:1751
+#. Translators: "None" used as a default value for events without Summary received by mail
+#: ../calendar/gui/e-itip-control.c:1147
+#: ../plugins/itip-formatter/itip-formatter.c:2302
+#, fuzzy
+msgctxt "cal-itip"
+msgid "None"
+msgstr "Tak Ada"
+
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 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/itip-utils.c:691 ../calendar/gui/itip-utils.c:720
-#: ../plugins/itip-formatter/itip-formatter.c:1754
-msgid "Declined"
-msgstr "Ditolak"
+#: ../calendar/gui/e-itip-control.c:1277
+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"
 
-#: ../calendar/gui/e-itip-control.c:1224
-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"
-
-#: ../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"
+#: ../calendar/gui/e-itip-control.c:1279
+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"
 
-#: ../calendar/gui/e-itip-control.c:1305
+#: ../calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> telah menerbitkan informasi pertemuan."
 
-#: ../calendar/gui/e-itip-control.c:1306
+#: ../calendar/gui/e-itip-control.c:1357
 msgid "Meeting Information"
 msgstr "Informasi Pertemuan"
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> mengharapkan kehadiran %s pada pertemuan."
 
-#: ../calendar/gui/e-itip-control.c:1314
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> mengharapkan kehadiran Anda pada pertemuan."
 
-#: ../calendar/gui/e-itip-control.c:1315
+#: ../calendar/gui/e-itip-control.c:1366
 msgid "Meeting Proposal"
 msgstr "Usulan Pertemuan"
 
 #. 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."
+#: ../calendar/gui/e-itip-control.c:1372
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> berniat untuk menambah pertemuan yang sudah ada"
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Update"
 msgstr "Info Terbaru Tentang Pertemuan"
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1377
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> meminta informasi terakhir tentang pertemuan."
 
-#: ../calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1378
 msgid "Meeting Update Request"
 msgstr "Permintaan Informasi Terbaru Tentang Pertemuan"
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> telah membalas pada usulan pertemuan."
 
-#: ../calendar/gui/e-itip-control.c:1335
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Reply"
 msgstr "Balasan Tentang Pertemuan"
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> telah membatalkan pertemuan."
 
-#: ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-itip-control.c:1394
 msgid "Meeting Cancelation"
 msgstr "Pembatalan Pertemuan"
 
-#: ../calendar/gui/e-itip-control.c:1353 ../calendar/gui/e-itip-control.c:1430
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1481
+#: ../calendar/gui/e-itip-control.c:1521
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> telah mengirimkan pesan email yang tidak dapat dimengerti."
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Bad Meeting Message"
 msgstr "Pesan Pertemuan Tidak Terbaca"
 
-#: ../calendar/gui/e-itip-control.c:1381
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> telah memublikasikan informasi tugas."
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Information"
 msgstr "Informasi Tugas"
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1440
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> meminta %s untuk menjalankan tugas."
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> meminta Anda untuk menjalankan tugas."
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1443
 msgid "Task Proposal"
 msgstr "Usulan Tugas"
 
 #. 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."
+#: ../calendar/gui/e-itip-control.c:1449
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> berniat untuk menambah pada tugas yang ada"
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Update"
 msgstr "Informasi Terbaru Tentang Tugas"
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> meminta informasi terakhir berkenaan dengan tugasnya."
 
-#: ../calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1455
 msgid "Task Update Request"
 msgstr "Permintaan Informasi Terbaru Tentang Tugas"
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> telah membalas surat penugasan."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Reply"
 msgstr "Surat Balasan Tentang Penugasan"
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> telah membatalkan tugas."
 
-#: ../calendar/gui/e-itip-control.c:1420
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Task Cancelation"
 msgstr "Pembatalan Tugas"
 
-#: ../calendar/gui/e-itip-control.c:1431
+#: ../calendar/gui/e-itip-control.c:1482
 msgid "Bad Task Message"
 msgstr "Pesan Tugas Tidak Terbaca"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> telah memublikasikan informasi waktu luang/sibuknya."
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Information"
 msgstr "Informasi Waktu Luang/Sibuk"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> meminta informasi tentang waktu luang/sibuk Anda."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Free/Busy Request"
 msgstr "Permintaan Waktu Luang/Sibuk"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1516
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> telah membalas permintaan waktu luang/sibuknya."
 
-#: ../calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1517
 msgid "Free/Busy Reply"
 msgstr "Surat Balasan Mengenai Waktu Luang/Sibuk"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1522
 msgid "Bad Free/Busy Message"
 msgstr "Pesan Waktu Luang/Sibuk Tidak Terbaca"
 
-#: ../calendar/gui/e-itip-control.c:1546
+#: ../calendar/gui/e-itip-control.c:1598
 msgid "The message does not appear to be properly formed"
 msgstr "Pesan ini tidak disusun dengan benar"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1657
 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
+#: ../calendar/gui/e-itip-control.c:1690
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Lampiran dalam pesan email ini tidak berisi pesan kalender yang benar"
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1728
 msgid "The attachment has no viewable calendar items"
 msgstr "Lampiran tidak berisi data kalender yang dapat ditampilkan"
 
-#: ../calendar/gui/e-itip-control.c:1904
+#: ../calendar/gui/e-itip-control.c:1970
 msgid "Update complete\n"
 msgstr "Update selesai\n"
 
-#: ../calendar/gui/e-itip-control.c:1932
+#: ../calendar/gui/e-itip-control.c:2004
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Obyek rusak dan tidak dapat diperbarui\n"
 
-#: ../calendar/gui/e-itip-control.c:1942
+#: ../calendar/gui/e-itip-control.c:2022
 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
+#: ../calendar/gui/e-itip-control.c:2040
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Status peserta tidak dapat diperbarui karena berisi status yang tidak "
-"dikenal!\n"
+msgstr "Status peserta tidak dapat diperbarui karena berisi status yang tidak dikenal!\n"
 
-#: ../calendar/gui/e-itip-control.c:1971
+#: ../calendar/gui/e-itip-control.c:2064
 msgid "Attendee status updated\n"
 msgstr "Status peserta diperbarui\n"
 
-#: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../calendar/gui/e-itip-control.c:2071
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Status peserta tidak dapat diubah karena sudah tidak ada lagi"
 
-#: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
+#: ../calendar/gui/e-itip-control.c:2102
+#: ../calendar/gui/e-itip-control.c:2159
 msgid "Item sent!\n"
 msgstr "Pesan terkirim!\n"
 
-#: ../calendar/gui/e-itip-control.c:2000 ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2108
+#: ../calendar/gui/e-itip-control.c:2167
 msgid "The item could not be sent!\n"
 msgstr "Item ini tidak dapat dikirim!\n"
 
-#: ../calendar/gui/e-itip-control.c:2130
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Choose an action:"
 msgstr "Pilih aksi yang akan dilakukan:"
 
-#: ../calendar/gui/e-itip-control.c:2202
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "Konfirmasi/RSVP"
+
+#: ../calendar/gui/e-itip-control.c:2329
 msgid "Update"
 msgstr "Pembaruan"
 
-#: ../calendar/gui/e-itip-control.c:2230
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2353
+#: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Terima"
 
-#: ../calendar/gui/e-itip-control.c:2231
+#: ../calendar/gui/e-itip-control.c:2354
 msgid "Tentatively accept"
 msgstr "Terima sementara"
 
-#: ../calendar/gui/e-itip-control.c:2232
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Tolak"
 
-#: ../calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2380
 msgid "Send Free/Busy Information"
 msgstr "Kirim Informasi Mengenai Waktu Luang/Sibuk"
 
-#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-itip-control.c:2404
 msgid "Update respondent status"
 msgstr "Perbarui status responden"
 
-#: ../calendar/gui/e-itip-control.c:2317
+#: ../calendar/gui/e-itip-control.c:2428
 msgid "Send Latest Information"
 msgstr "Kirim Informasi Terakhir"
 
-#: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:708
-#: ../mail/mail-send-recv.c:447 ../mail/mail-send-recv.c:500
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2452
+#: ../modules/mail/e-mail-shell-view-actions.c:970
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.ui.h:1
 msgid "--to--"
 msgstr "--ke--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.ui.h:2
 msgid "Calendar Message"
 msgstr "Pesan Kalender"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.ui.h:3
 msgid "Date:"
 msgstr "Tanggal:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.ui.h:5
 msgid "Loading Calendar"
 msgstr "Buka Kalender"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
 msgstr "Buka kalender..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.ui.h:7
+msgid "Organizer:"
+msgstr "Penyelenggara:"
+
+#: ../calendar/gui/e-itip-control.ui.h:8
 msgid "Server Message:"
 msgstr "Pesan Server:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Pimpinan"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Partisipan Wajib"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Peserta Tambahan"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:67
 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-list-view.c:159
+#: ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823
+#: ../calendar/gui/print.c:968
 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
-#: ../widgets/table/e-table-config-no-group.glade.h:7
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/print.c:969
+#: ../widgets/table/e-table-config.ui.h:7
 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-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/print.c:970
 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-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/e-meeting-store.c:125
+#: ../calendar/gui/print.c:971
 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-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/print.c:985
 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-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826
+#: ../calendar/gui/print.c:986
 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-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/print.c:987
 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-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/print.c:988
 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-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 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
-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/itip-utils.c:694
-#: ../plugins/itip-formatter/itip-formatter.c:1757
-msgid "Delegated"
-msgstr "Terdelegasi"
-
 #. 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:546
 msgid "Attendee                          "
 msgstr "Peserta                            "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-store.c:222
 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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
@@ -7879,2557 +5481,2729 @@ 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:462
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 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:466
 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:562
 msgid "Out of Office"
 msgstr "Keluar Kantor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "Tidak Ada Informasi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
-msgid "A_ttendees..."
-msgstr "Peser_ta..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "_Pilihan"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:617
 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:628
 msgid "Show _zoomed out"
 msgstr "Tampilkan _zoom keluar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:644
 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:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "Pili_h otomatis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:710
 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:720
 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:730
 msgid "_Required people"
 msgstr "O_rang -orang yang dibutuhkan"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:739
 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:785
 msgid "_Start time:"
 msgstr "Waktu _mulai:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "Waktu b_erakhir:"
 
-#: ../calendar/gui/e-memo-table.c:919
-msgid "_Delete Selected Memos"
-msgstr "_Hapus Memo Terpilih"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Klik di sini untuk menambahkan peserta"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
-msgid "Click to add a memo"
-msgstr "Klik untuk menambah memo"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Common Name"
 
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "Memo terurut"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Didelegasikan Dari"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2743
-#, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"Error pada %s:\n"
-"%s"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Didelegasikan Kepada"
 
-#: ../calendar/gui/e-memos.c:772
-msgid "Loading memos"
-msgstr "Buka memo"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Bahasa"
 
-#: ../calendar/gui/e-memos.c:853
-#, c-format
-msgid "Opening memos at %s"
-msgstr "Buka memo pada %s"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Anggota"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
-msgid "Deleting selected objects..."
-msgstr "Menghapus obyek terpilih..."
+#: ../calendar/gui/e-memo-table.c:411
+#: ../modules/calendar/e-cal-shell-content.c:461
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view.c:289
+#: ../plugins/caldav/caldav-browse-server.c:431
+msgid "Memos"
+msgstr "Memo"
 
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Masukkan kata sandi %s"
+#: ../calendar/gui/e-memo-table.c:489
+#: ../calendar/gui/e-task-table.c:706
+#, fuzzy
+msgid "* No Summary *"
+msgstr "Tidak ada judul"
 
-#: ../calendar/gui/e-tasks.c:885
-msgid "Loading tasks"
-msgstr "Buka tugas"
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574
+#: ../calendar/gui/e-task-table.c:786
+#, fuzzy
+msgid "Start: "
+msgstr "Mulai %s"
 
-#: ../calendar/gui/e-tasks.c:972
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Buka tugas pada %s"
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593
+#: ../calendar/gui/e-task-table.c:804
+#, fuzzy
+msgid "Due: "
+msgstr " (Batas "
 
-#: ../calendar/gui/e-tasks.c:1217
-msgid "Completing tasks..."
-msgstr "Menyelesaikan tugas..."
+#: ../calendar/gui/e-memo-table.c:709
+#, fuzzy
+msgid "Cut selected memos to the clipboard"
+msgstr "Pindahkan pesan terpilih ke papan tempel"
 
-#: ../calendar/gui/e-tasks.c:1267
-msgid "Expunging"
-msgstr "Menghapus"
+#: ../calendar/gui/e-memo-table.c:715
+#, fuzzy
+msgid "Copy selected memos to the clipboard"
+msgstr "Salin pesan terpilih ke papan tempel"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-memo-table.c:721
+#, fuzzy
+msgid "Paste memos from the clipboard"
+msgstr "Tempelkan memo dari papan tempel"
+
+#: ../calendar/gui/e-memo-table.c:727
+#: ../modules/calendar/e-memo-shell-view-actions.c:556
+msgid "Delete selected memos"
+msgstr "Hapus memo yang dipilih"
+
+#: ../calendar/gui/e-memo-table.c:733
+#, fuzzy
+msgid "Select all visible memos"
+msgstr "Pilih semua pesan yang dapat Anda lihat sekarang"
+
+#: ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "Klik untuk menambah memo"
+
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
+#: ../calendar/gui/e-task-table.c:538
+#, fuzzy, c-format
+msgid "%d%%"
+msgstr "%d %b %Y"
+
+#: ../calendar/gui/e-task-table.c:628
+#: ../calendar/gui/print.c:2043
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:423
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view.c:437
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "Tugas"
+
+#: ../calendar/gui/e-task-table.c:932
+#, fuzzy
+msgid "Cut selected tasks to the clipboard"
+msgstr "Ambil teks yang sudah dipilih ke dalam klipbod"
+
+#: ../calendar/gui/e-task-table.c:938
+#, fuzzy
+msgid "Copy selected tasks to the clipboard"
+msgstr "Salin teks yang sudah dipilih ke dalam klipbod"
+
+#: ../calendar/gui/e-task-table.c:944
+msgid "Paste tasks from the clipboard"
+msgstr "Ambil tugas dari papan tempel"
+
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:681
+msgid "Delete selected tasks"
+msgstr "Hapus tugas yang dipilih"
+
+#: ../calendar/gui/e-task-table.c:956
+#, fuzzy
+msgid "Select all visible tasks"
+msgstr "Pilih semua pesan yang dapat Anda lihat sekarang"
+
+#: ../calendar/gui/e-timezone-entry.c:330
 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:235
+#: ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
-msgid "Updating query"
-msgstr "Perbarui query"
+#: ../calendar/gui/ea-cal-view-event.c:276
+msgid "It has alarms."
+msgstr "Ada alarmnya."
 
-#: ../calendar/gui/gnome-cal.c:2404
-msgid "_Custom View"
-msgstr "_Tampilan Disesuaikan"
+#: ../calendar/gui/ea-cal-view-event.c:279
+msgid "It has recurrences."
+msgstr "Berulang."
+
+#: ../calendar/gui/ea-cal-view-event.c:282
+msgid "It is a meeting."
+msgstr "Pertemuan."
+
+#: ../calendar/gui/ea-cal-view-event.c:288
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "Acara: Keterangannya %s"
+
+#: ../calendar/gui/ea-cal-view-event.c:290
+msgid "Calendar Event: It has no summary."
+msgstr "Acara: Tidak ada keterangan"
+
+#: ../calendar/gui/ea-cal-view-event.c:312
+msgid "calendar view event"
+msgstr "kalender tampil acara"
+
+#: ../calendar/gui/ea-cal-view-event.c:541
+msgid "Grab Focus"
+msgstr "Ambil Fokus"
+
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Appointment"
+msgstr "Jadwal Pertemuan Baru"
 
-#: ../calendar/gui/gnome-cal.c:2405
-msgid "_Save Custom View"
-msgstr "_Simpan Tampilan Disesuaikan"
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "New All Day Event"
+msgstr "Acara Seluruh Hari Baru"
+
+#: ../calendar/gui/ea-cal-view.c:302
+msgid "New Meeting"
+msgstr "Buat Pertemuan Baru"
+
+#: ../calendar/gui/ea-cal-view.c:303
+msgid "Go to Today"
+msgstr "Lihat Hari Ini"
+
+#: ../calendar/gui/ea-cal-view.c:304
+msgid "Go to Date"
+msgstr "Lihat Tanggal"
 
-#: ../calendar/gui/gnome-cal.c:2410
-msgid "_Define Views..."
-msgstr "_Definisikan Tampilan..."
+#: ../calendar/gui/ea-day-view-main-item.c:308
+#: ../calendar/gui/ea-week-view-main-item.c:340
+msgid "a table to view and select the current time range"
+msgstr "tabel untuk melihat dan memilih cakupan waktu saat ini"
 
-#: ../calendar/gui/gnome-cal.c:2574
+#: ../calendar/gui/ea-day-view.c:148
+#: ../calendar/gui/ea-week-view.c:146
 #, c-format
-msgid "Loading appointments at %s"
-msgstr "Membuka jadwal pertemuan pada %s"
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Ada %d acara."
 
-#: ../calendar/gui/gnome-cal.c:2593
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:153
+#: ../calendar/gui/ea-week-view.c:148
+msgid "It has no events."
+msgstr "Tidak ada acara."
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "Membuka tugas pada %s"
+msgid "Work Week View: %s. %s"
+msgstr "Tampilan Minggu Kerja: %s, %s"
 
-#: ../calendar/gui/gnome-cal.c:2602
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
-msgid "Loading memos at %s"
-msgstr "Buka memo pada %s"
+msgid "Day View: %s. %s"
+msgstr "Tampilan Hari: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/ea-day-view.c:197
+msgid "calendar view for a work week"
+msgstr "kalender tampil untuk satu minggu kerja"
+
+#: ../calendar/gui/ea-day-view.c:199
+msgid "calendar view for one or more days"
+msgstr "tampilan kalender untuk satu hari atau lebih"
+
+#: ../calendar/gui/ea-gnome-calendar.c:46
+#: ../calendar/gui/ea-gnome-calendar.c:54
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "Gnome Calendar"
+
+#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../modules/calendar/e-cal-shell-view-private.c:909
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:226
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:240
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
+
+#: ../calendar/gui/ea-jump-button.c:147
+msgid "Jump button"
+msgstr "Tombol lompat"
+
+#: ../calendar/gui/ea-jump-button.c:156
+msgid "Click here, you can find more events."
+msgstr "Klik di sini untuk melihat acara."
+
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
-msgid "Opening %s"
-msgstr "Membuka %s"
+msgid "Month View: %s. %s"
+msgstr "Tampilan Bulan: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:157
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Tampilan Minggu: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:188
+msgid "calendar view for a month"
+msgstr "kalender tampi untuk sebulan"
 
-#: ../calendar/gui/gnome-cal.c:3636
+#: ../calendar/gui/ea-week-view.c:190
+msgid "calendar view for one or more weeks"
+msgstr "tampilan kalender untuk satu minggu atau lebih"
+
+#: ../calendar/gui/gnome-cal.c:2242
 msgid "Purging"
 msgstr "Menghapus"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
+#: ../calendar/gui/goto-dialog.ui.h:1
 msgid "April"
 msgstr "April"
 
-#: ../calendar/gui/goto-dialog.glade.h:2
+#: ../calendar/gui/goto-dialog.ui.h:2
 msgid "August"
 msgstr "Agustus"
 
-#: ../calendar/gui/goto-dialog.glade.h:3
+#: ../calendar/gui/goto-dialog.ui.h:3
 msgid "December"
 msgstr "Desember"
 
-#: ../calendar/gui/goto-dialog.glade.h:4
+#: ../calendar/gui/goto-dialog.ui.h:4
 msgid "February"
 msgstr "Februari"
 
-#: ../calendar/gui/goto-dialog.glade.h:5
+#: ../calendar/gui/goto-dialog.ui.h:5
 msgid "January"
 msgstr "Januari"
 
-#: ../calendar/gui/goto-dialog.glade.h:6
+#: ../calendar/gui/goto-dialog.ui.h:6
 msgid "July"
 msgstr "Juli"
 
-#: ../calendar/gui/goto-dialog.glade.h:7
+#: ../calendar/gui/goto-dialog.ui.h:7
 msgid "June"
 msgstr "Juni"
 
-#: ../calendar/gui/goto-dialog.glade.h:8
+#: ../calendar/gui/goto-dialog.ui.h:8
 msgid "March"
 msgstr "Maret"
 
-#: ../calendar/gui/goto-dialog.glade.h:9
+#: ../calendar/gui/goto-dialog.ui.h:9
 msgid "May"
 msgstr "Mei"
 
-#: ../calendar/gui/goto-dialog.glade.h:10
+#: ../calendar/gui/goto-dialog.ui.h:10
 msgid "November"
 msgstr "Nopember"
 
-#: ../calendar/gui/goto-dialog.glade.h:11
+#: ../calendar/gui/goto-dialog.ui.h:11
 msgid "October"
 msgstr "Oktober"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "Pilih Tanggal"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "Select _Today"
+msgstr "Pilih _Hari Ini"
+
+#: ../calendar/gui/goto-dialog.ui.h:14
 msgid "September"
 msgstr "September"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
-msgid "_Select Today"
-msgstr "_Pilih Hari Ini"
-
-#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:408
+#: ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "Penyelenggara harus dipilih."
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "Paling tidak harus ada satu orang peserta"
 
-#: ../calendar/gui/itip-utils.c:647 ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Informasi acara"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:635
+#: ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Informasi tugas"
 
-#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
-msgid "Journal information"
-msgstr "Informasi jurnal"
+#: ../calendar/gui/itip-utils.c:638
+#: ../calendar/gui/itip-utils.c:788
+#, fuzzy
+msgid "Memo information"
+msgstr "Tidak Ada Informasi"
 
-#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:792
+#: ../calendar/gui/itip-utils.c:641
+#: ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Informasi Luang/Sibuk"
 
-#: ../calendar/gui/itip-utils.c:655
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "Informasi kalender"
 
-#: ../calendar/gui/itip-utils.c:704
-msgid "Updated"
-msgstr "Baru"
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:678
+#, fuzzy
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Terima"
 
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:685
+#, fuzzy
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Sementara Terima"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:692
+#: ../calendar/gui/itip-utils.c:740
+#, fuzzy
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Ditolak"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:699
+#, fuzzy
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Terdelegasi"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
 #: ../calendar/gui/itip-utils.c:712
+#, fuzzy
+msgctxt "Meeting"
+msgid "Updated"
+msgstr "Termutakhirkan"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:719
+#, fuzzy
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Batal"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:726
+#, fuzzy
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Perbarui"
 
-#: ../calendar/gui/itip-utils.c:716
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:733
+#, fuzzy
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informasi Luang/Sibuk (%s sampai %s)"
 
-#: ../calendar/gui/itip-utils.c:798
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "Informasi iCalendar"
 
-#: ../calendar/gui/itip-utils.c:953
-msgid "You must be an attendee of the event."
-msgstr "Anda harus menjadi peserta acara ini."
-
-#: ../calendar/gui/memos-component.c:451
-msgid "_New Memo List"
-msgstr "_Daftar Memo Baru"
-
-#: ../calendar/gui/memos-component.c:527
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d memo"
-
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
-#: ../mail/mail-component.c:560
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d yang terpilih"
-
-#: ../calendar/gui/memos-component.c:576
-msgid "Failed upgrading memos."
-msgstr "Gagal saat memperbarui memo."
-
-#: ../calendar/gui/memos-component.c:872
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "Gagal membuka daftar memo '%s' dalam pembuatan acara dan pertemuan"
-
-#: ../calendar/gui/memos-component.c:885
-msgid "There is no calendar available for creating memos"
-msgstr "Tidak ada kalender yang tersedia untuk membuat memo"
-
-#: ../calendar/gui/memos-component.c:981
-msgid "Memo Source Selector"
-msgstr "Pemilih Sumber Memo"
-
-#: ../calendar/gui/memos-component.c:1164
-msgid "New memo"
-msgstr "Memo baru"
-
-#: ../calendar/gui/memos-component.c:1165
-msgid "Mem_o"
-msgstr "Mem_o"
-
-#: ../calendar/gui/memos-component.c:1166
-msgid "Create a new memo"
-msgstr "Buat memo baru"
-
-#: ../calendar/gui/memos-component.c:1172
-msgid "New shared memo"
-msgstr "Memo berbagi baru"
-
-#: ../calendar/gui/memos-component.c:1173
-msgid "_Shared memo"
-msgstr "_Berbagi memo"
-
-#: ../calendar/gui/memos-component.c:1174
-msgid "Create a shared new memo"
-msgstr "Buat memo berbagi yg baru"
-
-#: ../calendar/gui/memos-component.c:1180
-msgid "New memo list"
-msgstr "Daftar memo baru"
-
-#: ../calendar/gui/memos-component.c:1181
-msgid "Memo li_st"
-msgstr "Daftar m_emo"
-
-#: ../calendar/gui/memos-component.c:1182
-msgid "Create a new memo list"
-msgstr "Buat daftar memo baru"
-
-#: ../calendar/gui/memos-control.c:340
-msgid "Print Memos"
-msgstr "Cetak Memo"
-
-#: ../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..."
+#: ../calendar/gui/itip-utils.c:831
+msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
-"Lokasi dan hirakri folder tugas Evolution telah diperbarui sejak versi "
-"Evolution 1.x.\n"
-"\n"
-"Silakan tunggu sebentar sementara Evolution melakukan migrasi folder..."
 
-#: ../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 ""
-"Lokasi dan hirakri folder kalender Evolution telah diperbarui sejak versi "
-"Evolution 1.x.\n"
-"\n"
-"Silakan tunggu sebentar sementara Evolution melakukan migrasi folder..."
-
-#. 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 ""
-"Tidak dapat melakukan migrasi pengaturan yang lama dari file evolution/"
-"config.xmldb"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:794
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Tidak dapat melakukan migrasi terhadap kalender '%s'"
+#: ../calendar/gui/itip-utils.c:833
+#, fuzzy
+msgid "Unable to book a resource, error: "
+msgstr "Buku alamat tidak dapat dibuka"
 
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:962
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Tidak dapat melakukan migrasi terhadap tugas '%s'"
+#: ../calendar/gui/itip-utils.c:986
+msgid "You must be an attendee of the event."
+msgstr "Anda harus menjadi peserta acara ini."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:514
 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:593
 msgid "Su"
 msgstr "Min"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "Sen"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "Sel"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "Rab"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "Kam"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "Jum"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "Sab"
 
-#. Day
-#: ../calendar/gui/print.c:1936
-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
-msgid "%a %b %d"
-msgstr "%a, %d %b"
-
-#: ../calendar/gui/print.c:1962
-msgid "%a %d %Y"
-msgstr "%a, %d %Y"
+#. Translators: This is part of "START to END" text, where START and END are date/times
+#: ../calendar/gui/print.c:2419
+msgid " to "
+msgstr " ke "
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
-msgid "%a %b %d %Y"
-msgstr "%a, %d %b %Y"
+#. Translators: This is part of "START to END (Completed COMPLETED)", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2425
+msgid " (Completed "
+msgstr " (Selesai "
 
-#: ../calendar/gui/print.c:1973
-#, c-format
-msgid "Selected week (%s - %s)"
-msgstr "Minggu yang dipilih (%s - %s)"
+#. Translators: This is part of "Completed COMPLETED", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2428
+msgid "Completed "
+msgstr "Selesai "
 
-#. Month
-#: ../calendar/gui/print.c:1981
-msgid "Selected month (%b %Y)"
-msgstr "Bulan yang dipilih (%b %Y)"
+#. Translators: This is part of "START (Due DUE)", where START and DUE are dates/times
+#: ../calendar/gui/print.c:2435
+msgid " (Due "
+msgstr " (Batas "
 
-#. Year
-#: ../calendar/gui/print.c:1988
-msgid "Selected year (%Y)"
-msgstr "Tahun yang dipilih (%Y)"
+#. Translators: This is part of "Due DUE", where DUE is a date/time due the event should be finished
+#: ../calendar/gui/print.c:2438
+msgid "Due "
+msgstr "Batas "
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2572
 msgid "Appointment"
 msgstr "Pertemuan"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2574
+#: ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "Tugas"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2599
 #, c-format
 msgid "Summary: %s"
 msgstr "Keterangan: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2623
+#, fuzzy
+msgid "Attendees: "
+msgstr "Pese_rta"
+
+#: ../calendar/gui/print.c:2666
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2681
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritas: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2699
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Persen selesai: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2710
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2723
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategori: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2734
 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
-msgid "Print Preview"
-msgstr "Tampilan Cetak"
-
-#: ../calendar/gui/print.c:2636
-msgid "Print Item"
-msgstr "Cetak Item"
-
-#: ../calendar/gui/tasks-component.c:441
-msgid "_New Task List"
-msgstr "_Daftar Tugas Baru"
-
-#: ../calendar/gui/tasks-component.c:517
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d tugas"
-
-#: ../calendar/gui/tasks-component.c:566
-msgid "Failed upgrading tasks."
-msgstr "Gagal saat melakukan upgrade tugas-tugas."
-
-#: ../calendar/gui/tasks-component.c:877
-#, c-format
-msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-"TIdak dapat membuka daftar tugas '%s' dalam rangka membuat informasi acara "
-"dan pertemuan"
-
-#: ../calendar/gui/tasks-component.c:890
-msgid "There is no calendar available for creating tasks"
-msgstr "Tidak ada kalender yang tersedia untuk membuat informasi tugas"
-
-#: ../calendar/gui/tasks-component.c:987
-msgid "Task Source Selector"
-msgstr "Pemilih Sumber Tugas"
-
-#: ../calendar/gui/tasks-component.c:1170
-msgid "New task"
-msgstr "Tugas baru"
-
-#: ../calendar/gui/tasks-component.c:1172
-msgid "Create a new task"
-msgstr "Buat tugas baru"
-
-#: ../calendar/gui/tasks-component.c:1178
-msgid "New assigned task"
-msgstr "Buat penugasan baru"
-
-#: ../calendar/gui/tasks-component.c:1179
-msgid "Assigne_d Task"
-msgstr "Tugas _dan Pelaksananya"
-
-#: ../calendar/gui/tasks-component.c:1180
-msgid "Create a new assigned task"
-msgstr "Buat sebuah penugasan"
-
-#: ../calendar/gui/tasks-component.c:1186
-msgid "New task list"
-msgstr "Buat daftar tugas"
-
-#: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
-msgstr "Daftar _tugas"
-
-#: ../calendar/gui/tasks-component.c:1188
-msgid "Create a new task list"
-msgstr "Buat daftar tugas baru"
+#: ../calendar/gui/tasktypes.xml.h:2
+#, fuzzy, no-c-format
+msgid "% Completed"
+msgstr "Selesai"
 
-#: ../calendar/gui/tasks-control.c:446
-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"
-"\n"
-"Yakin ingin menghapus tugas ini?"
+#: ../calendar/gui/tasktypes.xml.h:7
+#, fuzzy
+msgid "Cancelled"
+msgstr "Dibatalkan"
 
-#: ../calendar/gui/tasks-control.c:449
-msgid "Do not ask me again."
-msgstr "Jangan tanya lagi."
+#: ../calendar/gui/tasktypes.xml.h:15
+#, fuzzy
+msgid "In progress"
+msgstr "Dalam Proses"
 
-#: ../calendar/gui/tasks-control.c:483
-msgid "Print Tasks"
-msgstr "Cetak Tugas"
+#: ../calendar/gui/tasktypes.xml.h:28
+#: ../mail/em-filter-i18n.h:35
+msgid "is greater than"
+msgstr "lebih besar dari"
 
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "MSSRKJS"
+#: ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/em-filter-i18n.h:36
+msgid "is less than"
+msgstr "kurang dari"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "Jadwal Pertemuan dan Rapat"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Opening calendar"
 msgstr "Buka kalender"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "File iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Program import iCalendar milik Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "Pengingat!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "File vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Program impor vCalendar ke Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Acara Kalender"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Program import Kalender Evolution yang pintar"
 
 #.
+#. *
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#. *
+#.
+#.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:7
+#: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "Afrika/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Afrika/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika/Addis_Ababa"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Afrika/Algiers"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Afrika/Cairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "Afrika/Djibouti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "Amerika/Costa_Rica"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "Amerika/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "Amerika/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaica"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../calendar/zones.h:157
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "Amerika/North_Dakota/Center"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antartika/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antartika/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antartika/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antartika/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antartika/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antartika/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antartika/South_Pole"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antartika/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antartika/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arktik/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Asia/Baghdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Asia/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Asia/Damascus"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalem"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Asia/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Asia/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Asia/Tehran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azores"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermuda"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Canary"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Cape_Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faeroe"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/South_Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/St_Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Eropa/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Eropa/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Eropa/Athens"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Eropa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Eropa/Belgrade"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Eropa/Berlin"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Eropa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Eropa/Brussels"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Eropa/Bucharest"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Eropa/Budapest"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Eropa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Eropa/Copenhagen"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Eropa/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Eropa/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Eropa/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Eropa/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Eropa/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Eropa/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Eropa/Lisbon"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Eropa/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Eropa/London"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Eropa/Luxembourg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Eropa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Eropa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Eropa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Eropa/Monaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Eropa/Moscow"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Eropa/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Eropa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Eropa/Paris"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Eropa/Prague"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Eropa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Eropa/Rome"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Eropa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Eropa/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Eropa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Eropa/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Eropa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Eropa/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Eropa/Stockholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Eropa/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Eropa/Tirane"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Eropa/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Eropa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Eropa/Vatikan"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Eropa/Wina"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Eropa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Eropa/Warsaw"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Eropa/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Eropa/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Eropa/Zurich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Hindia/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Hindia/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Hindia/Christmas"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Hindia/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Hindia/Komoro"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Hindia/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Hindia/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Hindia/Maldives"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Hindia/Mauritius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Hindia/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Hindia/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pasifik/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pasifik/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pasifik/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pasifik/Easter"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pasifik/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pasifik/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pasifik/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pasifik/Fiji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pasifik/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pasifik/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pasifik/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pasifik/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pasifik/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pasifik/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pasifik/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pasifik/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pasifik/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pasifik/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pasifik/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pasifik/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pasifik/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pasifik/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pasifik/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pasifik/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pasifik/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pasifik/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pasifik/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pasifik/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pasifik/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pasifik/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pasifik/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pasifik/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pasifik/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pasifik/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pasifik/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pasifik/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pasifik/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pasifik/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pasifik/Yap"
 
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:107
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
+#: ../composer/e-composer-actions.c:81
+msgid "Untitled Message"
+msgstr "Belum Diberi Judul"
 
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:110
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
+#: ../composer/e-composer-actions.c:204
+msgid "Save as..."
+msgstr "Simpan sebagai..."
 
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:113
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
+#: ../composer/e-composer-actions.c:283
+#: ../widgets/misc/e-attachment-view.c:327
+msgid "Attach a file"
+msgstr "Lampirkan berkas"
 
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
-msgid "Attachment Bar"
-msgstr "Kotak Lampiran"
+#: ../composer/e-composer-actions.c:288
+#: ../widgets/misc/e-signature-editor.c:203
+msgid "_Close"
+msgstr "_Tutup"
 
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Tidak dapat melampirkan file %s: %s"
+#: ../composer/e-composer-actions.c:290
+msgid "Close the current file"
+msgstr "Tutup berkas yang aktif sekarang"
 
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Tidak dapat melampirkan file %s: bukan file biasa"
+#: ../composer/e-composer-actions.c:295
+msgid "_Print..."
+msgstr "_Cetak..."
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "Pengaturan Lampiran"
+#: ../composer/e-composer-actions.c:302
+msgid "Print Pre_view"
+msgstr "Tampilan _Cetak"
 
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Nama file:"
+#: ../composer/e-composer-actions.c:311
+msgid "Save the current file"
+msgstr "Simpan file aktif sekarang"
 
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "Tipe MIME:"
+#: ../composer/e-composer-actions.c:316
+msgid "Save _As..."
+msgstr "Simpan Seb_agai..."
 
-#: ../composer/e-msg-composer-hdrs.c:570
-msgid "Posting destination"
-msgstr "Tujuan posting"
+#: ../composer/e-composer-actions.c:318
+msgid "Save the current file with a different name"
+msgstr "Simpan file aktif sekarang dengan nama yang berbeda"
 
-#: ../composer/e-msg-composer-hdrs.c:571
-msgid "Choose folders to post the message to."
-msgstr "Pilih folder tempat melakukan posting."
+#: ../composer/e-composer-actions.c:323
+#, fuzzy
+msgid "Save as _Draft"
+msgstr "Simpan draf"
 
-#: ../composer/e-msg-composer-hdrs.c:603
-msgid "Click here for the address book"
-msgstr "Klik untuk membuka buku alamat"
+#: ../composer/e-composer-actions.c:325
+msgid "Save as draft"
+msgstr "Simpan draf"
 
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: ../composer/e-msg-composer-hdrs.c:635
-msgid "_Reply-To:"
-msgstr "_Alamat Balasan:"
+#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-private.c:281
+#, fuzzy
+msgid "S_end"
+msgstr "End"
 
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-composer-actions.c:332
+msgid "Send this message"
+msgstr "Kirim pesan email ini"
+
+#: ../composer/e-composer-actions.c:337
+#, fuzzy
+msgid "New _Message"
+msgstr "_Pesan"
+
+#: ../composer/e-composer-actions.c:339
+#, fuzzy
+msgid "Open New Message window"
+msgstr "Kirim Pe_san Baru ke..."
+
+#: ../composer/e-composer-actions.c:346
+#, fuzzy
+msgid "Character _Encoding"
+msgstr "Pengkodean Karakter"
+
+#: ../composer/e-composer-actions.c:363
+#, fuzzy
+msgid "PGP _Encrypt"
+msgstr "Enkripsi PGP"
+
+#: ../composer/e-composer-actions.c:365
+msgid "Encrypt this message with PGP"
+msgstr "Acak pesan email ini dengan PGP"
+
+#: ../composer/e-composer-actions.c:371
+#, fuzzy
+msgid "PGP _Sign"
+msgstr "Tanda tangani PGP"
+
+#: ../composer/e-composer-actions.c:373
+msgid "Sign this message with your PGP key"
+msgstr "Tanda tangani pesan email ini dengan kunci PGP Anda"
+
+#: ../composer/e-composer-actions.c:379
+msgid "_Prioritize Message"
+msgstr "_Prioritaskan Pesan"
+
+#: ../composer/e-composer-actions.c:381
+msgid "Set the message priority to high"
+msgstr "Buat prioritas pesan tinggi"
+
+#: ../composer/e-composer-actions.c:387
+#, fuzzy
+msgid "Re_quest Read Receipt"
+msgstr "Minta P_enerimaan Baca"
+
+#: ../composer/e-composer-actions.c:389
+msgid "Get delivery notification when your message is read"
+msgstr "Dapatkan pengiriman pemberitahuan ketika pesan anda dibaca"
+
+#: ../composer/e-composer-actions.c:395
+#, fuzzy
+msgid "S/MIME En_crypt"
+msgstr "Enkripsi S/MIME"
+
+#: ../composer/e-composer-actions.c:397
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Acak email ini dengan Sertifikat Enkripsi S/MIME"
+
+#: ../composer/e-composer-actions.c:403
+#, fuzzy
+msgid "S/MIME Sig_n"
+msgstr "Tanda tangani S/MIME"
+
+#: ../composer/e-composer-actions.c:405
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Tanda tangani pesan email ini dengan Sertifikat Tanda Tangan S/MIME"
+
+#: ../composer/e-composer-actions.c:411
+msgid "_Bcc Field"
+msgstr "Kolom _Bcc"
+
+#: ../composer/e-composer-actions.c:413
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Atur untuk menampilkan/menyembunyikan kolom Bcc"
+
+#: ../composer/e-composer-actions.c:419
+msgid "_Cc Field"
+msgstr "Kolom _Tembusan"
+
+#: ../composer/e-composer-actions.c:421
+msgid "Toggles whether the CC field is displayed"
+msgstr "Atur untuk menampilkan/menyembunyikan kolom Tembusan"
+
+#: ../composer/e-composer-actions.c:427
+msgid "_From Field"
+msgstr "Kolom _Dari"
+
+#: ../composer/e-composer-actions.c:429
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Atur untuk menampilkan kotak pemilih alamat untuk kolom From"
+
+#: ../composer/e-composer-actions.c:435
+msgid "_Reply-To Field"
+msgstr "Kolom _Alamat Balasan"
+
+#: ../composer/e-composer-actions.c:437
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Atur untuk menampilkan/menyembunyikan kolom Reply-To"
+
+#: ../composer/e-composer-actions.c:480
+msgid "Save Draft"
+msgstr "Simpan Draf"
+
+#: ../composer/e-composer-header.c:129
+#, fuzzy
+msgid "Show"
+msgstr "_Tampilkan: "
+
+#: ../composer/e-composer-header.c:137
+#, fuzzy
+msgid "Hide"
+msgstr "_Cari"
+
+#: ../composer/e-composer-header-table.c:41
+msgid "Enter the recipients of the message"
+msgstr "Isi daftar penerima pesan email ini"
+
+#: ../composer/e-composer-header-table.c:43
+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-composer-header-table.c:46
+#, fuzzy
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
+msgstr "Isi alamat-alamat yang akan menerima salinan karbon pesan email ini, namun alamatnya tidak tercantum pada daftar penerima (BCc)."
+
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "_Dari:"
 
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:649
-msgid "S_ubject:"
-msgstr "J_udul:"
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:937
+#: ../mail/e-mail-tag-editor.c:323
+#: ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:76
+msgid "From"
+msgstr "Dari"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-composer-header-table.c:967
+msgid "_Reply-To:"
+msgstr "_Alamat Balasan:"
+
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "Un_tuk:"
 
-#: ../composer/e-msg-composer-hdrs.c:659
-msgid "Enter the recipients of the message"
-msgstr "Isi daftar penerima pesan email ini"
-
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "_Tembusan:"
 
-#: ../composer/e-msg-composer-hdrs.c:663
-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-composer-header-table.c:978
+#: ../mail/em-filter-i18n.h:8
+#, fuzzy
+msgid "CC"
+msgstr "_Tembusan:"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Isi alamat-alamat yang akan menerima salinan karbon pesan email ini, namun "
-"alamatnya tidak tercantum pada daftar penerima (BCc)."
+#: ../composer/e-composer-header-table.c:984
+#: ../mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "BCC"
+msgstr "_Bcc:"
 
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "_Kirim Ke:"
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-composer-header-table.c:993
+msgid "S_ubject:"
+msgstr "J_udul:"
+
+#: ../composer/e-composer-header-table.c:1002
+msgid "Si_gnature:"
+msgstr "Tanda tan_gan:"
+
+#: ../composer/e-composer-name-header.c:134
+msgid "Click here for the address book"
+msgstr "Klik untuk membuka buku alamat"
+
+#: ../composer/e-composer-post-header.c:116
 msgid "Click here to select folders to post to"
 msgstr "Klik disini untuk memilih folder tempat posting"
 
-#: ../composer/e-msg-composer-hdrs.c:684
-msgid "Post To:"
-msgstr "Post To:"
-
-#: ../composer/e-msg-composer-select-file.c:82
-msgid "A_ttach"
-msgstr "_Lampirkan"
+#: ../composer/e-composer-private.c:199
+#, fuzzy
+msgid "Undo the last action"
+msgstr "Salin bagian yang dipilih"
 
-#: ../composer/e-msg-composer-select-file.c:243
-msgid "Insert Attachment"
-msgstr "Sisipkan Lampiran"
+#: ../composer/e-composer-private.c:203
+#, fuzzy
+msgid "Redo the last undone action"
+msgstr "Kirim Informasi Terakhir"
 
-#: ../composer/e-msg-composer.c:827
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Tidak dapat menandatangani pesan email keluar: Sertifikat untuk tanda tangan "
-"belum diset untuk account ini"
+#: ../composer/e-composer-private.c:207
+#, fuzzy
+msgid "Search for text"
+msgstr "Saringan pencarian"
 
-#: ../composer/e-msg-composer.c:834
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
+#: ../composer/e-composer-private.c:211
+msgid "Search for and replace text"
 msgstr ""
-"Tidak dapat mengacak pesan email keluar: Sertifikat enkripsi belum diset "
-"untuk account ini"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
-msgid "Hide _Attachment Bar"
-msgstr "Sembunyikan Panel L_ampiran"
+#: ../composer/e-composer-private.c:301
+#, fuzzy
+msgid "Save draft"
+msgstr "Simpan Draf"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
-msgid "Show _Attachment Bar"
-msgstr "Tampilkan P_anel Lampiran"
+#. Check buttons
+#: ../composer/e-msg-composer.c:188
+#: ../mail/em-utils.c:152
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
+#, fuzzy
+msgid "_Do not show this message again."
+msgstr "Jangan tampilkan pesan ini lagi."
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
-#: ../plugins/mail-remote/e-corba-utils.c:135
-msgid "Unknown reason"
-msgstr "Alasan tidak diketahui"
+#: ../composer/e-msg-composer.c:988
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Tidak dapat menandatangani pesan email keluar: Sertifikat untuk tanda tangan belum diset untuk account ini"
 
-#: ../composer/e-msg-composer.c:1401
-msgid "Could not open file"
-msgstr "Tidak dapat membuka file"
+#: ../composer/e-msg-composer.c:995
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgstr "Tidak dapat mengacak pesan email keluar: Sertifikat enkripsi belum diset untuk account ini"
 
-#: ../composer/e-msg-composer.c:1409
-msgid "Unable to retrieve message from editor"
+#: ../composer/e-msg-composer.c:1386
+#, fuzzy
+msgid "Unable to reconstruct message from autosave file"
 msgstr "Tidak dapat mengambil pesan dari editor"
 
-#: ../composer/e-msg-composer.c:1688
-msgid "Untitled Message"
-msgstr "Belum Diberi Judul"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
-msgid "Open File"
-msgstr "Buka Berksa"
-
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
-msgid "Autogenerated"
-msgstr "Otomatis"
-
-#: ../composer/e-msg-composer.c:2276
-msgid "Si_gnature:"
-msgstr "Tanda tan_gan:"
-
-#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
-#: ../composer/e-msg-composer.c:3782
+#: ../composer/e-msg-composer.c:1452
+#: ../composer/e-msg-composer.c:1648
 msgid "Compose Message"
 msgstr "Tulis Pesan Baru"
 
-#: ../composer/e-msg-composer.c:5006
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr ""
-"<b>(Penyunting pesan berisi bagian bukan teks yang tidak dapat diubah-ubah)"
-"</b>"
+#: ../composer/e-msg-composer.c:3313
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
+msgstr "<b>(Penyunting pesan berisi bagian bukan teks yang tidak dapat diubah-ubah)</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 ""
-" Ada beberapa lampiran yang hendak didownload. Mengirimkan surat akan "
-"menyebabkan surat terkirim tanpa lampiran tersebut "
+msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
+msgstr " Ada beberapa lampiran yang hendak didownload. Mengirimkan surat akan menyebabkan surat terkirim tanpa lampiran tersebut "
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "Semua account telah dihapus."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr "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
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "Karena &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 ""
-"Bila Anda memilih tombol \"Abaikan\", maka semua tulisan Anda dalam email "
-"ini tidak akan dikirim dan akan dihapus. Bila Anda memilih \"Simpan sebagai "
-"Draf\", maka email ini akan disimpan dalam folder Draf dan dapat Anda "
-"lanjutkan pada kesempatan lain. Bila tidak yakin, tekan tombol \"Batal\"."
+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 "Bila Anda memilih tombol \"Abaikan\", maka semua tulisan Anda dalam email ini tidak akan dikirim dan akan dihapus. Bila Anda memilih \"Simpan sebagai Draf\", maka email ini akan disimpan dalam folder Draf dan dapat Anda lanjutkan pada kesempatan lain. Bila tidak yakin, tekan tombol \"Batal\"."
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -10452,101 +8226,374 @@ msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "Tidak dapat menyimpan ke berkas autosave &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:12
-msgid "Directories can not be attached to Messages."
-msgstr "Direktori tidak dapat dilampirkan dalam email."
-
-#: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "Teruskan email yang belum selesai?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "Sedang mengunduh. Kirim email ini?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Error menyimpan ke berkas simpan auto karena &quot;{1}&quot;."
 
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+msgstr "Terakhir kali digunakan, Evolution mati mendadak saat Anda sedang menulis email baru. Bila Anda inginkan, Evolution dapat menampilkan kembali email yang belum selesai ditulis tersebut."
+
 #: ../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 ""
-"Terakhir kali digunakan, Evolution mati mendadak saat Anda sedang menulis "
-"email baru. Bila Anda inginkan, Evolution dapat menampilkan kembali email "
-"yang belum selesai ditulis tersebut."
+#, fuzzy
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr "File '{0}' bukan file biasa dan tidak dapat disisipkan dalam pesan email."
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"File '{0}' bukan file biasa dan tidak dapat disisipkan dalam pesan email."
-
-#: ../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 ""
-"Untuk menyisipkan isi direktori ini dalam email, silakan masukkan masing-"
-"masing file dalam direktori ini dalam lampiran, atau buat file kompresi yang "
-"berisi direktori ini, baru kemudian dimasukkan ke dalam lampiran."
-
-#: ../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 ""
 "Tidak dapat mengaktifkan kontrol editor HTML.\n"
 "\n"
 "Pastikan Anda memiliki versi gtkhtml dan libgtkhtml yang benar."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
 msgstr "Tidak dapat mengaktifkan kontrol pemilih alamat."
 
-#: ../composer/mail-composer.error.xml.h:23
-msgid "Unfinished messages found"
-msgstr "Ada email yang belum selesai ditulis"
-
-#: ../composer/mail-composer.error.xml.h:24
-msgid "Warning: Modified Message"
-msgstr "Awas: Pesan Email Telah Berubah"
-
-#: ../composer/mail-composer.error.xml.h:25
-msgid "You cannot attach the file `{0}' to this message."
+#: ../composer/mail-composer.error.xml.h:21
+#, fuzzy
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "Anda tidak dapat melampirkan file '{0}' ke dalam pesan ini."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"Anda harus melakukan konfigurasi account sebelum dapat menulis email baru."
+msgstr "Anda harus melakukan konfigurasi account sebelum dapat menulis email baru."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:23
+#, fuzzy
+msgid "_Continue Editing"
+msgstr "_Lanjutkan menyunting"
+
+#: ../composer/mail-composer.error.xml.h:25
 msgid "_Do not Recover"
 msgstr "_Jangan Kembalikan"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:26
 msgid "_Recover"
 msgstr "_Kembalikan"
 
-#: ../composer/mail-composer.error.xml.h:30
-msgid "_Save Message"
-msgstr "_Simpan Pesan"
+#: ../composer/mail-composer.error.xml.h:27
+#, fuzzy
+msgid "_Save Draft"
+msgstr "Simpan Draf"
+
+#: ../capplet/anjal-settings-main.c:199
+msgid "Run Anjal in a window"
+msgstr ""
+
+#: ../capplet/anjal-settings-main.c:200
+#, fuzzy
+msgid "Make Anjal the default email client"
+msgstr "Jadikan ini akun uta_ma"
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:207
+msgid "ID of the socket to embed in"
+msgstr ""
+
+#: ../capplet/anjal-settings-main.c:208
+#, fuzzy
+msgid "socket"
+msgstr "urutkan"
+
+#: ../capplet/anjal-settings-main.c:221
+#, fuzzy
+msgid "Anjal email client"
+msgstr "Pemakai Surat Awal "
+
+#: ../capplet/settings/mail-account-view.c:56
+#, fuzzy
+msgid "Please enter your full name."
+msgstr "Silakan pilih nama lain"
+
+#: ../capplet/settings/mail-account-view.c:57
+#, fuzzy
+msgid "Please enter your email address."
+msgstr "Gunakan alamat email"
+
+#: ../capplet/settings/mail-account-view.c:58
+msgid "The email address you have entered is invalid."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:181
+#, fuzzy
+msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+msgstr "<span weight=\"bold\">Penghapusan Email</span>"
+
+#: ../capplet/settings/mail-account-view.c:186
+msgid "Name:"
+msgstr "Nama:"
+
+#: ../capplet/settings/mail-account-view.c:195
+#, fuzzy
+msgid "Email address:"
+msgstr "Alamat Email"
+
+#: ../capplet/settings/mail-account-view.c:205
+#, fuzzy
+msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+msgstr "<span weight=\"bold\">Umum</span>"
+
+#: ../capplet/settings/mail-account-view.c:210
+#: ../capplet/settings/mail-account-view.c:258
+#, fuzzy
+msgid "Server type:"
+msgstr "_Tipe Server: "
+
+#: ../capplet/settings/mail-account-view.c:219
+#: ../capplet/settings/mail-account-view.c:267
+#, fuzzy
+msgid "Server address:"
+msgstr "Pesan Server:"
+
+#: ../capplet/settings/mail-account-view.c:228
+#: ../capplet/settings/mail-account-view.c:276
+#, fuzzy
+msgid "Username:"
+msgstr "Nama Pengguna:"
+
+#: ../capplet/settings/mail-account-view.c:237
+#: ../capplet/settings/mail-account-view.c:285
+#, fuzzy
+msgid "Use encryption:"
+msgstr "Tanpa pengacakan"
+
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:290
+#, fuzzy
+msgid "never"
+msgstr "Tidak pernah"
+
+#: ../capplet/settings/mail-account-view.c:253
+#, fuzzy
+msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+msgstr "<span weight=\"bold\">Umum</span>"
+
+#: ../capplet/settings/mail-account-view.c:309
+msgid "To use the email application you'll need to setup an account. Put your email address and password in below and we'll try and work out all the settings. If we can't do it automatically you'll need your server details as well."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:311
+msgid "Sorry, we can't work out the settings to get your mail automatically. Please enter them below. We've tried to make a start with the details you just entered but you may need to change them."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:313
+#, fuzzy
+msgid "You can specify more options to configure the account."
+msgstr "Anda hanya dapat melakukan konfigurasi pada satu akun Exchange saja."
+
+#: ../capplet/settings/mail-account-view.c:315
+msgid "Now we need your settings for sending mail. We've tried to make some guesses but you should check them over to make sure."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:316
+msgid "You can specify your default settings for your account."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:317
+msgid "Time to check things over before we try and connect to the server and fetch your mail."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:332
+#: ../mail/em-account-editor.c:2059
+#: ../mail/em-account-editor.c:2191
+#: ../mail/mail-config.ui.h:59
+msgid "Identity"
+msgstr "Identitas"
+
+#: ../capplet/settings/mail-account-view.c:332
+#, fuzzy
+msgid "Next - Receiving mail"
+msgstr "Pengambilan Email"
+
+#: ../capplet/settings/mail-account-view.c:333
+#, fuzzy
+msgid "Receiving mail"
+msgstr "Pengambilan Email"
+
+#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:334
+#, fuzzy
+msgid "Next - Sending mail"
+msgstr "Pengiriman Email"
+
+#: ../capplet/settings/mail-account-view.c:333
+#, fuzzy
+msgid "Back - Identity"
+msgstr "Identitas"
+
+#: ../capplet/settings/mail-account-view.c:333
+#, fuzzy
+msgid "Next - Receiving options"
+msgstr "Pilihan Penerimaan"
+
+#: ../capplet/settings/mail-account-view.c:334
+#, fuzzy
+msgid "Receiving options"
+msgstr "Pilihan Penerimaan"
+
+#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:336
+#, fuzzy
+msgid "Back - Receiving mail"
+msgstr "Pengambilan Email"
+
+#: ../capplet/settings/mail-account-view.c:336
+#, fuzzy
+msgid "Sending mail"
+msgstr "Pengiriman Email"
+
+#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:337
+#, fuzzy
+msgid "Next - Review account"
+msgstr "Hapus account ini?"
+
+#: ../capplet/settings/mail-account-view.c:336
+#, fuzzy
+msgid "Next - Defaults"
+msgstr "Standar"
+
+#: ../capplet/settings/mail-account-view.c:336
+#, fuzzy
+msgid "Back - Receiving options"
+msgstr "Pilihan Penerimaan"
+
+#: ../capplet/settings/mail-account-view.c:337
+#: ../mail/em-account-editor.c:2770
+#: ../mail/mail-config.ui.h:32
+msgid "Defaults"
+msgstr "Standar"
+
+#: ../capplet/settings/mail-account-view.c:337
+#, fuzzy
+msgid "Back - Sending mail"
+msgstr "Pengiriman Email"
+
+#: ../capplet/settings/mail-account-view.c:339
+#, fuzzy
+msgid "Review account"
+msgstr "Hapus account ini?"
+
+#: ../capplet/settings/mail-account-view.c:339
+#, fuzzy
+msgid "Finish"
+msgstr "_Selesai"
+
+#: ../capplet/settings/mail-account-view.c:339
+#, fuzzy
+msgid "Back - Sending"
+msgstr "Simpan Pengaturan..."
+
+#: ../capplet/settings/mail-account-view.c:673
+#: ../capplet/settings/mail-settings-view.c:264
+#, fuzzy
+msgid "Close Tab"
+msgstr "Tutup Tab"
+
+#: ../capplet/settings/mail-account-view.c:683
+#, fuzzy
+msgid "Account Wizard"
+msgstr "Pengatur Akun"
+
+#: ../capplet/settings/mail-capplet-shell.c:208
+#, fuzzy
+msgid "Evolution account assistant"
+msgstr "Pengatur Akun Evolution"
+
+#. create the local source group
+#: ../capplet/settings/mail-capplet-shell.c:342
+#: ../mail/e-mail-migrate.c:675
+#: ../mail/e-mail-store.c:227
+#: ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162
+#: ../mail/mail-vfolder.c:212
+#: ../mail/message-list.c:1605
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:126
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:141
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:109
+msgid "On This Computer"
+msgstr "Di Komputer Ini"
+
+#: ../capplet/settings/mail-settings-view.c:146
+#: ../plugins/groupwise-features/share-folder.c:747
+#, fuzzy
+msgid "Modify"
+msgstr "Diubah"
+
+#: ../capplet/settings/mail-settings-view.c:148
+#, fuzzy
+msgid "Add a new account"
+msgstr "Tambahkan Akun IM"
+
+#: ../capplet/settings/mail-settings-view.c:183
+#, fuzzy
+msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+msgstr "<span weight=\"bold\">Informasi Account</span>"
+
+#: ../capplet/settings/mail-settings-view.c:274
+msgid "Settings"
+msgstr "Setting"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+#, fuzzy
+msgid "Calendar event notifications"
+msgstr "Lokasi Kalender"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+#, fuzzy
+msgid "Evolution Alarm Notify"
+msgstr "Program pengimpor data Elm Evolution"
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../mail/e-mail-browser.c:821
+#: ../shell/e-shell-window-private.c:251
 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
+#, fuzzy
+msgid "Evolution Mail and Calendar"
+msgstr "Komponen Email Evolution"
+
+#: ../data/evolution.desktop.in.in.h:3
+#: ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
-#: ../data/evolution.desktop.in.in.h:3
-msgid "The Evolution PIM and Email Client"
-msgstr "Pemakai Surat dan PIM Evolution"
+#: ../data/evolution.desktop.in.in.h:4
+#, fuzzy
+msgid "Manage your email, contacts and schedule"
+msgstr "Konfigurasikan account email di sini"
+
+#: ../data/evolution-settings.desktop.in.in.h:1
+#, fuzzy
+msgid "Configure email accounts"
+msgstr "Konfigurasikan account email di sini"
+
+#: ../data/evolution-settings.desktop.in.in.h:2
+#, fuzzy
+msgid "Email Settings"
+msgstr "Pengaturan Email Spam"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10556,154 +8603,285 @@ msgstr "kartu alamat"
 msgid "calendar information"
 msgstr "informasi kalender"
 
-#: ../designs/OOA/ooa.glade.h:1
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:224
+#, fuzzy, c-format
+msgid "%s (cancelled)"
+msgstr "Dibatalkan"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:227
+#, fuzzy, c-format
+msgid "%s (completed)"
+msgstr "Selesai"
+
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../e-util/e-activity.c:231
+#, fuzzy, c-format
+msgid "%s..."
+msgstr "%s (...)"
+
+#: ../e-util/e-activity.c:236
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% selesai)"
+
+#: ../e-util/e-alert.c:72
+#: ../e-util/e-alert.c:73
+msgid "Evolution Error"
+msgstr "Error Evolution"
+
+#: ../e-util/e-alert.c:74
+#: ../e-util/e-alert.c:75
+msgid "Evolution Warning"
+msgstr "Pesan Peringatan Evolution"
+
+#: ../e-util/e-alert.c:634
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Kesalahan di dalam, kesalahan tak dikenal '%s' telah diminta"
+
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
 msgstr ""
-"<b>Saat ini, status Anda adalah \"Keluar Kantor\". </b>\n"
-"\n"
-"Ingin ganti statusnya ke \"Di Kantor\"?"
 
-#: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Sedang Keluar Kantor, Pesan:</b>"
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "Balkan"
 
-#: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>Status:</b>"
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "Eropa Tengah"
 
-#: ../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>Email ini akan dikirimkan kepada semua orang yang mengirimi email "
-"kepada Anda\n"
-"pada saat Anda berada di luar kantor.</small>"
-
-#: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "Saya sekarang ada di kantor"
-
-#: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "Saya sekarang ada di luar kantor"
-
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Do not Change Status"
-msgstr "Jangan, Jangan Ganti Status"
-
-#: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "Program Pembantu Keluar Kantor"
-
-#: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "Ya, Ganti Statusnya"
-
-#: ../designs/read_receipts/read.glade.h:1
-msgid "<b>Receiving Email</b>"
-msgstr "<b>Mengambil Email</b>"
-
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Sending Email:</b>"
-msgstr "<b>Mengirim Email:</b>"
-
-#: ../designs/read_receipts/read.glade.h:3
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
-msgstr ""
-"<small>Bagian ini akan membantu Anda apakah Anda ingin diberitahu melalui "
-"sebuah pesan kecil saat semua email yang Anda kirimkan\n"
-"telah dibaca oleh penerimanya, juga untuk menentukan apa yang harus "
-"dilakukan Evolution saat ada orang yang menginginkan hal yang sama.</small>"
-
-#: ../designs/read_receipts/read.glade.h:5
-msgid "Always send back a read receipt"
-msgstr "Selalu kirim kembali nota pemberitahuan pembacaan email"
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "Bahasa Mandarin"
 
-#: ../designs/read_receipts/read.glade.h:6
-msgid "Ask me if I want to send back a read receipt"
-msgstr "Tanya lagi sebelum mengirim nota pemberitahuan pembacaan"
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "Cyrillic"
 
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Never send back a read receipt"
-msgstr "Jangan pernah kirim nota pemberitahuan pembacaan"
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "Yunani"
 
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Read Receipts"
-msgstr "Nota Pembacaan"
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "Ibrani"
 
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Request a read receipt for all messages I send"
-msgstr "Minta nota pembacaan untuk semua email yang saya kirim"
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "Jepang"
 
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "Kecuali bila dikirim ke milis dan bukan ke saya langsung"
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "Korea"
 
-#: ../designs/read_receipts/read.glade.h:11
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "Thai"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "Turki"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "Eropa Barat"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "Eropa Barat, Gaya Baru"
+
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85
+#: ../e-util/e-charset.c:87
+#: ../e-util/e-charset.c:89
+msgid "Traditional"
+msgstr "Tradisional"
+
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91
+#: ../e-util/e-charset.c:93
+#: ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
+msgid "Simplified"
+msgstr "Sederhana"
+
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
+msgid "Ukrainian"
+msgstr "Ukrania"
+
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
+msgid "Visual"
+msgstr "Visual"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../widgets/table/e-cell-date-edit.c:311
+msgid "Today"
+msgstr "Hari ini"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:205
+#: ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "Besok"
+
+#: ../e-util/e-datetime-format.c:207
+#, fuzzy
+msgid "Yesterday"
+msgstr "Kemarin"
+
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
+#, fuzzy, c-format
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "%d hari sebelum pertemuan"
+
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
+#, fuzzy, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d hari yang lalu"
+
+#: ../e-util/e-datetime-format.c:289
+#: ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
+#, fuzzy
+msgid "Use locale default"
+msgstr "Gunakan Stan_dar"
+
+#: ../e-util/e-datetime-format.c:502
+#, fuzzy
+msgid "Format:"
+msgstr "_Format"
+
+#: ../e-util/e-file-utils.c:136
+#, fuzzy
+msgid "(Unknown Filename)"
+msgstr "Alasan tidak diketahui"
+
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:140
+#, fuzzy, c-format
+msgid "Writing \"%s\""
+msgstr "Ping %s"
+
+#. Translators: The first string value is the basename of a
+#. * remote file, the second string value is the hostname.
+#: ../e-util/e-file-utils.c:145
+#, fuzzy, c-format
+msgid "Writing \"%s\" to %s"
+msgstr "Menyalin dari `%s' ke `%s'."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:194
+#, fuzzy
+msgid "Debug Logs"
+msgstr "Web Log"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:208
+msgid "Show _errors in the status bar for"
 msgstr ""
-"Saat menerima email dengan nota pembacaan, apa yang harus dilakukan oleh "
-"Evolution?"
 
-#: ../e-util/e-dialog-utils.c:283
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:226
+#, fuzzy
+msgid "second(s)."
+msgstr "%i detik"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:232
+#, fuzzy
+msgid "Log Messages:"
+msgstr "Pesan"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:279
+msgid "Log Level"
 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
-msgid "Overwrite file?"
-msgstr "Timpa file?"
+#: ../e-util/e-non-intrusive-error-dialog.c:297
+#: ../mail/message-list.c:2677
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Pesan"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
-msgid "Evolution Error"
-msgstr "Error Evolution"
+#: ../e-util/e-non-intrusive-error-dialog.c:306
+#: ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1450
+msgid "Close this window"
+msgstr "Tutup jendela ini"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
-msgid "Evolution Warning"
-msgstr "Pesan Peringatan Evolution"
+#: ../e-util/e-non-intrusive-error-dialog.h:38
+#, fuzzy
+msgid "Error"
+msgstr "Galat"
 
-#: ../e-util/e-error.c:126
-msgid "Evolution Information"
-msgstr "Pesan Informasi Evolution"
+#: ../e-util/e-non-intrusive-error-dialog.h:38
+msgid "Errors"
+msgstr ""
 
-#: ../e-util/e-error.c:128
-msgid "Evolution Query"
-msgstr "Query Evolution"
+#: ../e-util/e-non-intrusive-error-dialog.h:39
+msgid "Warnings and Errors"
+msgstr ""
 
-#. setup a dummy error
-#: ../e-util/e-error.c:454
-#, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "Kesalahan di dalam, kesalahan tak dikenal '%s' telah diminta"
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+#, fuzzy
+msgid "Debug"
+msgstr "Runut"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error, Warnings and Debug messages"
+msgstr ""
+
+#: ../e-util/e-plugin-util.c:426
+#: ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "minggu"
+
+#: ../e-util/e-print.c:160
+#, fuzzy
+msgid "An error occurred while printing"
+msgstr "Kesalahan terjadi ketika mencetak"
+
+#: ../e-util/e-print.c:167
+msgid "The printing system reported the following details about the error:"
+msgstr ""
+
+#: ../e-util/e-print.c:173
+msgid "The printing system did not report any additional details about the error."
+msgstr ""
+
+#: ../e-util/e-signature.c:701
+msgid "Autogenerated"
+msgstr "Otomatis"
+
+#: ../e-util/e-system.error.xml.h:1
+#, fuzzy
+msgid "Because \"{1}\"."
+msgstr "Karena &quot;{1}&quot;."
 
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "Tidak dapat membuka berkas &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "Tidak dapat membuka file"
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
 msgstr "Tidak dapat menyimpan berkas &quot;{0}&quot;."
 
 #: ../e-util/e-system.error.xml.h:4
@@ -10711,150 +8889,333 @@ msgid "Do you wish to overwrite it?"
 msgstr "Apakah Anda ingin menimpa file ini?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
+#, fuzzy
+msgid "File exists \"{0}\"."
 msgstr "Berkas sudah ada &quot;{0}&quot;"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:6
+#: ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "_Tulis ulang"
 
-#: ../e-util/eggtrayicon.c:121
-msgid "The orientation of the tray."
-msgstr "Arah dari laci."
+#: ../e-util/e-util.c:169
+#, fuzzy
+msgid "Could not open the link."
+msgstr "Tidak dapat membuka file"
 
-#: ../filter/filter-datespec.c:78
+#: ../e-util/e-util.c:219
+#, fuzzy
+msgid "Could not display help for Evolution."
+msgstr "Hak akses folder tidak dapat diperbarui"
+
+#: ../e-util/gconf-bridge.c:1303
+#, fuzzy, c-format
+msgid "GConf error: %s"
+msgstr "Error GConf: %s"
+
+#: ../e-util/gconf-bridge.c:1314
+#, fuzzy
+msgid "All further errors shown only on terminal."
+msgstr "Error yang lain berikutnya akan ditampilkan pada terminal saja."
+
+#: ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:938
+#: ../modules/mail/em-mailer-prefs.c:77
+msgid "Reply-To"
+msgstr "Balas-Ke"
+
+#: ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243
+#: ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328
+#: ../modules/mail/em-mailer-prefs.c:79
+msgid "Cc"
+msgstr "Cc"
+
+#: ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244
+#: ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331
+#: ../modules/mail/em-mailer-prefs.c:80
+msgid "Bcc"
+msgstr "Bcc"
+
+#: ../em-format/em-format-quote.c:347
+#: ../em-format/em-format.c:942
+#: ../mail/e-mail-tag-editor.c:328
+#: ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18
+#: ../modules/mail/em-mailer-prefs.c:81
+#: ../plugins/groupwise-features/properties.ui.h:7
+#: ../smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Judul"
+
+#. pseudo-header
+#: ../em-format/em-format-quote.c:358
+#: ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1137
+msgid "Mailer"
+msgstr "Mailer"
+
+#: ../em-format/em-format-quote.c:423
+#: ../mail/em-composer-utils.c:1220
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Isi Pesan Asli --------"
+
+#: ../em-format/em-format.c:943
+#: ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:82
+#: ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
+msgid "Date"
+msgstr "Tanggal"
+
+#: ../em-format/em-format.c:944
+#: ../modules/mail/em-mailer-prefs.c:83
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#: ../em-format/em-format.c:945
+#: ../modules/mail/em-mailer-prefs.c:84
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#, fuzzy
+msgid "Face"
+msgstr "Prancis"
+
+#: ../em-format/em-format.c:1302
+#, c-format
+msgid "%s attachment"
+msgstr "Attachment %s"
+
+#: ../em-format/em-format.c:1361
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Tidak dapat membuka pesan S/MIME: Error tidak diketahui"
+
+#: ../em-format/em-format.c:1515
+#: ../em-format/em-format.c:1685
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Tidak dapat membuka pesan MIME. Pesan ditampilkan apa adanya."
+
+#: ../em-format/em-format.c:1523
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tipe enkripsi ini tidak dapat dipakai pada multipart/encrypted"
+
+#: ../em-format/em-format.c:1535
+#, fuzzy
+msgid "Could not parse PGP/MIME message"
+msgstr "Tidak dapat membuka pesan S/MIME: Error tidak diketahui"
+
+#: ../em-format/em-format.c:1535
+#, fuzzy
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Tidak dapat membuka pesan S/MIME: Error tidak diketahui"
+
+#: ../em-format/em-format.c:1709
+msgid "Unsupported signature format"
+msgstr "Jenis tanda tangan tidak dapat dibaca"
+
+#: ../em-format/em-format.c:1717
+#: ../em-format/em-format.c:1867
+msgid "Error verifying signature"
+msgstr "Error saat melakukan verifikasi tanda tangan"
+
+#: ../em-format/em-format.c:1717
+#: ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
+msgid "Unknown error verifying signature"
+msgstr "Ada error tidak dikenal saat melakukan verifikasi tanda tangan"
+
+#: ../em-format/em-format.c:1946
+#, fuzzy
+msgid "Could not parse PGP message"
+msgstr "Tidak dapat membuat pesan email."
+
+#: ../em-format/em-format.c:1946
+#, fuzzy
+msgid "Could not parse PGP message: Unknown error"
+msgstr "Tidak dapat membuka pesan S/MIME: Error tidak diketahui"
+
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d detik yang lalu"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:74
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] ""
+
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d menit yang lalu"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:75
+#, fuzzy, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "Saya sekarang ada di kantor"
+
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d jam yang lalu "
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:76
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] ""
+
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d hari yang lalu"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:77
+#, fuzzy, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "Saya sekarang ada di kantor"
+
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d minggu yang lalu"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:78
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] ""
+
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d bulan yang lalu"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:79
+#, fuzzy, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "Saya sekarang ada di kantor"
+
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d tahun yang lalu"
 
-#: ../filter/filter-datespec.c:285
+#: ../filter/e-filter-datespec.c:80
+#, fuzzy, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "Saya sekarang ada di kantor"
+
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<klik di sini untuk memilih tanggal>"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/e-filter-datespec.c:122
+#: ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "saat ini"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:415
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Pilih tanggal pembanding"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
-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:91
-msgid "Important"
-msgstr "Penting"
-
-#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "PR"
-
-#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
-msgid "Later"
-msgstr "Nanti"
-
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
+#: ../filter/e-filter-file.c:184
+#, fuzzy
+msgid "Choose a File"
+msgstr "Pilih sebuah berkas..."
 
-#: ../filter/filter-rule.c:799
-msgid "_Search name:"
-msgstr "_Cari nama:"
+#: ../filter/e-filter-rule.c:659
+#, fuzzy
+msgid "R_ule name:"
+msgstr "Nama aturan"
 
-#: ../filter/filter-rule.c:827
-msgid "Find items that meet the following criteria"
+#: ../filter/e-filter-rule.c:689
+#, fuzzy
+msgid "Find items that meet the following conditions"
 msgstr "Temukan objek yang cocok dengan kriteria berikut"
 
-#: ../filter/filter-rule.c:866
-msgid "If all criteria are met"
+#: ../filter/e-filter-rule.c:723
+msgid "A_dd Condition"
+msgstr ""
+
+#: ../filter/e-filter-rule.c:732
+#, fuzzy
+msgid "If all conditions are met"
 msgstr "Bila semua persyaratan terpenuhi"
 
-#: ../filter/filter-rule.c:866
-msgid "If any criteria are met"
+#: ../filter/e-filter-rule.c:733
+#, fuzzy
+msgid "If any conditions are met"
 msgstr "Bila ada persyaratan terpenuhi"
 
-#: ../filter/filter-rule.c:868
-msgid "Find items:"
+#: ../filter/e-filter-rule.c:736
+#, fuzzy
+msgid "_Find items:"
 msgstr "Temukan objek:"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/e-filter-rule.c:760
 msgid "All related"
 msgstr "Semua yg berhubungan"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/e-filter-rule.c:761
+#: ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "Balasan"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/e-filter-rule.c:762
 msgid "Replies and parents"
 msgstr "Balasan dan induk"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/e-filter-rule.c:763
 msgid "No reply or parent"
 msgstr "Tidak ada balasan ataupun orang tua"
 
-#: ../filter/filter-rule.c:891
-msgid "Include threads"
+#: ../filter/e-filter-rule.c:766
+#, fuzzy
+msgid "I_nclude threads"
 msgstr "Termasuk ulir diskusi"
 
-#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../filter/e-filter-rule.c:1141
+#: ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Masuk"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/e-filter-rule.c:1141
+#: ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Keluar"
 
+#: ../filter/e-rule-editor.c:265
+msgid "Add Rule"
+msgstr "Tambah Aturan"
+
+#: ../filter/e-rule-editor.c:352
+msgid "Edit Rule"
+msgstr "Ganti Aturan"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "Regular expression buruk &quot;{0}&quot;."
@@ -10875,7 +9236,8 @@ msgstr "Tanggal belum diisi"
 msgid "Missing file name."
 msgstr "File name tidak ada"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "Nama tidak diisi."
 
@@ -10899,19 +9261,15 @@ msgstr "Anda harus mengisi nama pada filter ini"
 msgid "You must specify a file name."
 msgstr "Anda harus menuliskan nama file"
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>Aturan _Filter</b>"
-
-#: ../filter/filter.glade.h:2
+#: ../filter/filter.ui.h:1
 msgid "Compare against"
 msgstr "Bandingkan dengan"
 
-#: ../filter/filter.glade.h:4
+#: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
 msgstr "Tampilkan penyaring untuk email:"
 
-#: ../filter/filter.glade.h:5
+#: ../filter/filter.ui.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10919,7 +9277,7 @@ msgstr ""
 "Tanggal email akan dibandingkan dengan\n"
 "jam 12:00am pada tanggal yang ditentukan."
 
-#: ../filter/filter.glade.h:7
+#: ../filter/filter.ui.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10927,7 +9285,7 @@ msgstr ""
 "Tanggal email akan dibandingkan dengan\n"
 "waktu relatif saat filter dilakukan."
 
-#: ../filter/filter.glade.h:9
+#: ../filter/filter.ui.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10935,119 +9293,858 @@ msgstr ""
 "Tanggal email akan dibandingkan dengan\n"
 "waktu saat ini saat filter dilakukan."
 
-#: ../filter/filter.glade.h:12
+#: ../filter/filter.ui.h:11
+#: ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "Aturan _Saringan"
+
+#: ../filter/filter.ui.h:12
 msgid "a time relative to the current time"
 msgstr "waktu relatif dari waktu saat ini"
 
-#: ../filter/filter.glade.h:13
+#: ../filter/filter.ui.h:13
 msgid "ago"
 msgstr "yang lalu"
 
-#: ../filter/filter.glade.h:17
+#: ../filter/filter.ui.h:16
+#, fuzzy
+msgid "in the future"
+msgstr "di masa mendatang"
+
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
 msgid "months"
 msgstr "bulan"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.ui.h:19
+#: ../mail/mail-config.ui.h:171
 msgid "seconds"
 msgstr "detik"
 
-#: ../filter/filter.glade.h:19
+#: ../filter/filter.ui.h:20
 msgid "the current time"
 msgstr "saat ini"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.ui.h:21
 msgid "the time you specify"
 msgstr "waktu yang Anda tentukan"
 
-#: ../filter/filter.glade.h:22
+#: ../filter/filter.ui.h:23
 msgid "years"
 msgstr "tahun"
 
-#: ../filter/rule-editor.c:378
-msgid "Add Rule"
-msgstr "Tambah Aturan"
+#: ../mail/e-mail-attachment-bar.c:120
+#: ../mail/e-mail-attachment-bar.c:125
+#: ../mail/em-format-html-display.c:1020
+#: ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1
+#: ../widgets/misc/e-attachment-paned.c:148
+#: ../widgets/misc/e-attachment-paned.c:153
+#, fuzzy
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Jadikan Lampiran"
 
-#: ../filter/rule-editor.c:454
-msgid "Edit Rule"
-msgstr "Ganti Aturan"
+#: ../mail/e-mail-attachment-bar.c:617
+#: ../widgets/misc/e-attachment-paned.c:612
+#, fuzzy
+msgid "Icon View"
+msgstr "Tampilan Ikon"
 
-#: ../filter/rule-editor.c:732
-msgid "Rule name"
-msgstr "Nama aturan"
+#: ../mail/e-mail-attachment-bar.c:618
+#: ../widgets/misc/e-attachment-paned.c:613
+#, fuzzy
+msgid "List View"
+msgstr "Tampilan Tabel"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Pengaturan Penyusun"
+#: ../mail/e-mail-browser.c:262
+#, fuzzy
+msgid "(No Subject)"
+msgstr "Judul"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/e-mail-display.c:66
+#, fuzzy
+msgid "_Add to Address Book..."
+msgstr "T_ambahkan ke Buku Alamat"
+
+#: ../mail/e-mail-display.c:73
+#, fuzzy
+msgid "_To This Address"
+msgstr "Ke Alama_t Ini"
+
+#: ../mail/e-mail-display.c:80
+#, fuzzy
+msgid "_From This Address"
+msgstr "_Dari Alamat Ini:"
+
+#: ../mail/e-mail-display.c:89
+#, fuzzy
+msgid "Create Search _Folder"
+msgstr "Buat Folder _Pencarian"
+
+#: ../mail/e-mail-label-dialog.c:220
+#, fuzzy
+msgid "_Label name:"
+msgstr "Nama _daftar:"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "Penti_ng"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "Kerja"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "_Pribadi"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "_Tugas"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "_Nanti"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:472
+#, fuzzy
+msgid "Add Label"
+msgstr "Label"
+
+#: ../mail/e-mail-label-manager.c:216
+#, fuzzy
+msgid "Edit Label"
+msgstr "Dapat diedit"
+
+#: ../mail/e-mail-label-manager.c:349
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
 msgstr ""
-"Konfigurasikan pengaturan email, termasuk sisi keamanan dan tampilan email "
-"di sini"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: ../mail/e-mail-label-tree-view.c:86
+#, fuzzy
+msgid "Color"
+msgstr "Warna"
+
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1158
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Nama"
+
+#: ../mail/e-mail-local.c:37
+#: ../mail/em-folder-properties.c:363
+#: ../mail/em-folder-tree-model.c:675
+#: ../mail/em-folder-tree.c:2585
+#: ../modules/mail/e-mail-shell-view-private.c:952
+msgid "Inbox"
+msgstr "Email Masuk"
+
+#: ../mail/e-mail-local.c:38
+#: ../mail/em-folder-tree-model.c:668
+msgid "Drafts"
+msgstr "Draf"
+
+#: ../mail/e-mail-local.c:39
+#: ../mail/em-folder-tree-model.c:678
+msgid "Outbox"
+msgstr "Email Keluar"
+
+#: ../mail/e-mail-local.c:40
+#: ../mail/em-folder-tree-model.c:680
+msgid "Sent"
+msgstr "Email Terkirim"
+
+#: ../mail/e-mail-local.c:41
+#: ../mail/em-folder-tree-model.c:671
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:570
+#, fuzzy
+msgid "Templates"
+msgstr "Templat:"
+
+#: ../mail/e-mail-migrate.c:147
+msgid "Migrating..."
+msgstr "Dalam proses migrasi..."
+
+#: ../mail/e-mail-migrate.c:180
+#, fuzzy
+msgid "Migration"
+msgstr "Dalam proses migrasi..."
+
+#: ../mail/e-mail-migrate.c:220
+#, fuzzy, c-format
+msgid "Migrating '%s':"
+msgstr "Dalam proses migrasi..."
+
+#: ../mail/e-mail-migrate.c:659
+#, fuzzy
+msgid "Migrating Folders"
+msgstr "Melakukan Filter Dalam Folder"
+
+#: ../mail/e-mail-migrate.c:660
+#, fuzzy
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Konfigurasikan pengecekan ejaan, tanda-tangan, dan penyusun email di sini"
+"Lokasi dan hirarki folder kotak surat Evolution sudah berubah sejak Evolution 1.x.\n"
+"\n"
+"Silakan tunggu sebentar sementara Evolution melakukan migrasi folder..."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Konfigurasikan account email di sini"
+#: ../mail/e-mail-migrate.c:756
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "Tidak dapat membuat folder email lokal di '%s': %s"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Email Evolution"
+#. XXX e-error should provide a widget layout and API suitable
+#. *     for packing additional widgets to the right of the alert
+#. *     icon.  But for now, screw it.
+#: ../mail/e-mail-reader-utils.c:103
+#: ../modules/calendar/e-task-shell-view-actions.c:561
+#, fuzzy
+msgid "Do not ask me again"
+msgstr "Jangan tanya lagi."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Program pengatur konfigurasi account Email Evolution"
+#: ../mail/e-mail-reader.c:264
+#: ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "Salin ke dalam Folder"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Komponen Email Evolution"
+#: ../mail/e-mail-reader.c:264
+#: ../mail/em-folder-utils.c:378
+msgid "C_opy"
+msgstr "S_alin"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Penyusun Email Evolution"
+#: ../mail/e-mail-reader.c:638
+#: ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "Pindahkan ke Folder"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Program konfigurasi penyusun Email Evolution"
+#: ../mail/e-mail-reader.c:638
+#: ../mail/em-folder-utils.c:378
+msgid "_Move"
+msgstr "_Pindahkan"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail preferences control"
-msgstr "Program pengaturan Email Evolution"
+#: ../mail/e-mail-reader.c:864
+#, fuzzy
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "_Simpan Pesan"
+
+#. Translators: This is a part of a suggested file name
+#. * used when saving a message or multiple messages to an
+#. * mbox format, when the first message doesn't have a
+#. * Subject. The extension ".mbox" is appended to this
+#. * string, thus it will be something like "Message.mbox"
+#. * at the end.
+#: ../mail/e-mail-reader.c:885
+#: ../plugins/groupwise-features/properties.ui.h:5
+#, fuzzy
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Pesan"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
-#: ../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
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "Surat"
+#: ../mail/e-mail-reader.c:1143
+msgid "A_dd Sender to Address Book"
+msgstr "Masukkan Pengirim ke _Dalam Buku Alamat"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
-msgid "Mail Accounts"
-msgstr "Account Email"
+#: ../mail/e-mail-reader.c:1145
+#, fuzzy
+msgid "Add sender to address book"
+msgstr "Masukkan Pengirim ke Buku Alamat"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
-msgid "Mail Preferences"
-msgstr "Pengaturan Email"
+#: ../mail/e-mail-reader.c:1150
+msgid "Check for _Junk"
+msgstr "Saring _Spam"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "_Mail"
-msgstr "E_mail"
+#: ../mail/e-mail-reader.c:1152
+msgid "Filter the selected messages for junk status"
+msgstr "Saring pesan-pesan email yang telah dipilih dari spam"
+
+#: ../mail/e-mail-reader.c:1157
+msgid "_Copy to Folder..."
+msgstr "_Salin ke Folder..."
+
+#: ../mail/e-mail-reader.c:1159
+msgid "Copy selected messages to another folder"
+msgstr "Salin email yang dipilih ke folder lain"
+
+#: ../mail/e-mail-reader.c:1164
+msgid "_Delete Message"
+msgstr "_Hapus Pesan"
+
+#: ../mail/e-mail-reader.c:1166
+msgid "Mark the selected messages for deletion"
+msgstr "Tandai pesan terpilih sebagai dihapus"
+
+#: ../mail/e-mail-reader.c:1171
+msgid "Filter on Mailing _List..."
+msgstr "Saring Berdasarkan Mi_lis..."
+
+#: ../mail/e-mail-reader.c:1173
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Buat aturan filter berdasarkan milis pada email ini"
+
+#: ../mail/e-mail-reader.c:1178
+msgid "Filter on _Recipients..."
+msgstr "Saring Berdasarkan Pene_rima..."
+
+#: ../mail/e-mail-reader.c:1180
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Buat aturan filter berdasarkan penerima email ini"
+
+#: ../mail/e-mail-reader.c:1185
+msgid "Filter on Se_nder..."
+msgstr "Saring Berdasarka_n  Pengirim..."
+
+#: ../mail/e-mail-reader.c:1187
+msgid "Create a rule to filter messages from this sender"
+msgstr "Buat aturan filter berdasarkan pengirim email ini"
+
+#: ../mail/e-mail-reader.c:1192
+msgid "Filter on _Subject..."
+msgstr "Saring Berda_sarkan Judul..."
+
+#: ../mail/e-mail-reader.c:1194
+msgid "Create a rule to filter messages with this subject"
+msgstr "Buat aturan filter berdasarkan judul email ini"
+
+#: ../mail/e-mail-reader.c:1199
+msgid "A_pply Filters"
+msgstr "Lakukan _Penyaringan"
+
+#: ../mail/e-mail-reader.c:1201
+msgid "Apply filter rules to the selected messages"
+msgstr "Lakukan penyaringan dengan filter pesan-pesan yang sedang dipilih"
+
+#: ../mail/e-mail-reader.c:1206
+msgid "_Find in Message..."
+msgstr "Cari _dalam Email..."
+
+#: ../mail/e-mail-reader.c:1208
+msgid "Search for text in the body of the displayed message"
+msgstr "Cari pada badan teks email yang sedang dibuka"
+
+#: ../mail/e-mail-reader.c:1213
+msgid "_Clear Flag"
+msgstr "Hap_us Tanda"
+
+#: ../mail/e-mail-reader.c:1215
+#, fuzzy
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "Jangan hapus pesan terpilih"
+
+#: ../mail/e-mail-reader.c:1220
+msgid "_Flag Completed"
+msgstr "_Tanda Selesai"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/e-mail-reader.c:1222
+#, fuzzy
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "Pilih semua pesan dalam thread yang sama dengan pesan yang sedang dipilih"
+
+#: ../mail/e-mail-reader.c:1227
+msgid "Follow _Up..."
+msgstr "Tindak-lanj_uti..."
+
+#: ../mail/e-mail-reader.c:1229
+#, fuzzy
+msgid "Flag the selected messages for follow-up"
+msgstr "Tandai pesan terpilih untuk kelanjutan"
+
+#: ../mail/e-mail-reader.c:1234
+msgid "_Attached"
+msgstr "Terl_ampir"
+
+#: ../mail/e-mail-reader.c:1236
+#: ../mail/e-mail-reader.c:1243
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Teruskan email ini ke orang lain dalam bentuk lampiran"
+
+#: ../mail/e-mail-reader.c:1241
+#, fuzzy
+msgid "Forward As _Attached"
+msgstr "_Kirim dalam bentuk iCalendar"
+
+#: ../mail/e-mail-reader.c:1248
+msgid "_Inline"
+msgstr "Sebar_is"
+
+#: ../mail/e-mail-reader.c:1250
+#: ../mail/e-mail-reader.c:1257
+msgid "Forward the selected message in the body of a new message"
+msgstr "Kirimkan pesan email yang sedang dibaca ini dalam bentuk sisipan pada badan email baru"
+
+#: ../mail/e-mail-reader.c:1255
+#, fuzzy
+msgid "Forward As _Inline"
+msgstr "Cara meneru_skan email:"
+
+#: ../mail/e-mail-reader.c:1262
+msgid "_Quoted"
+msgstr "Di_kutip"
+
+#: ../mail/e-mail-reader.c:1264
+#: ../mail/e-mail-reader.c:1271
+msgid "Forward the selected message quoted like a reply"
+msgstr "Kirimkan pesan email yang sedang dibaca ini dalam bentuk kutipan seperti balasan surat"
+
+#: ../mail/e-mail-reader.c:1269
+#, fuzzy
+msgid "Forward As _Quoted"
+msgstr "Cara meneru_skan email:"
+
+#: ../mail/e-mail-reader.c:1276
+msgid "_Load Images"
+msgstr "Tampi_lkan Gambar"
+
+#: ../mail/e-mail-reader.c:1278
+msgid "Force images in HTML mail to be loaded"
+msgstr "Tampilkan gambar pada email HTML"
+
+#: ../mail/e-mail-reader.c:1283
+msgid "_Important"
+msgstr "_Penting"
+
+#: ../mail/e-mail-reader.c:1285
+msgid "Mark the selected messages as important"
+msgstr "Tandai pesan terpilih sebagai penting"
+
+#: ../mail/e-mail-reader.c:1290
+msgid "_Junk"
+msgstr "_Sampah"
+
+#: ../mail/e-mail-reader.c:1292
+msgid "Mark the selected messages as junk"
+msgstr "Tandai pesan terpilih sebagai sampah"
+
+#: ../mail/e-mail-reader.c:1297
+msgid "_Not Junk"
+msgstr "Buka_n Spam"
+
+#: ../mail/e-mail-reader.c:1299
+msgid "Mark the selected messages as not being junk"
+msgstr "Tandai pesan terpilih sebagai bukan sampah"
+
+#: ../mail/e-mail-reader.c:1304
+msgid "_Read"
+msgstr "Sudah _Dibaca"
+
+#: ../mail/e-mail-reader.c:1306
+msgid "Mark the selected messages as having been read"
+msgstr "Tandai pesan terpilih sebagai telah dibaca"
+
+#: ../mail/e-mail-reader.c:1311
+msgid "Uni_mportant"
+msgstr "Tidak Pe_nting"
+
+#: ../mail/e-mail-reader.c:1313
+msgid "Mark the selected messages as unimportant"
+msgstr "Tandai pesan terpilih sebagai tidak penting"
+
+#: ../mail/e-mail-reader.c:1318
+msgid "_Unread"
+msgstr "Bel_um Dibaca"
+
+#: ../mail/e-mail-reader.c:1320
+msgid "Mark the selected messages as not having been read"
+msgstr "Tandai pesan terpilih sebagai belum lagi dibaca"
+
+#: ../mail/e-mail-reader.c:1325
+msgid "_Edit as New Message..."
+msgstr "Jadikan s_ebagai Pesan Baru..."
+
+#: ../mail/e-mail-reader.c:1327
+msgid "Open the selected messages in the composer for editing"
+msgstr "Buka pesan yang dipilih ini di tulis surat untuk diubah isinya"
+
+#: ../mail/e-mail-reader.c:1332
+msgid "Compose _New Message"
+msgstr "_Buat Email Baru"
+
+#: ../mail/e-mail-reader.c:1334
+msgid "Open a window for composing a mail message"
+msgstr "Buka jendela untuk menulis email baru"
+
+#: ../mail/e-mail-reader.c:1339
+msgid "_Open in New Window"
+msgstr "Buka dalam Je_ndela Baru"
+
+#: ../mail/e-mail-reader.c:1341
+msgid "Open the selected messages in a new window"
+msgstr "Bukan email yang sudah dipilih ini dalam jendela baru"
+
+#: ../mail/e-mail-reader.c:1346
+msgid "_Move to Folder..."
+msgstr "_Pindahkan ke Folder..."
+
+#: ../mail/e-mail-reader.c:1348
+msgid "Move selected messages to another folder"
+msgstr "Pindahkan pesan terpilih ke folder lain"
+
+#: ../mail/e-mail-reader.c:1353
+msgid "_Next Message"
+msgstr "Pesa_n Berikutnya"
+
+#: ../mail/e-mail-reader.c:1355
+msgid "Display the next message"
+msgstr "Buka pesan email berikutnya"
+
+#: ../mail/e-mail-reader.c:1360
+msgid "Next _Important Message"
+msgstr "Pesan Tak Pent_ing Berikutnya"
+
+#: ../mail/e-mail-reader.c:1362
+msgid "Display the next important message"
+msgstr "Buka pesan email penting berikutnya"
+
+#: ../mail/e-mail-reader.c:1367
+msgid "Next _Thread"
+msgstr "Ulir Diskusi Beriku_tnya"
+
+#: ../mail/e-mail-reader.c:1369
+msgid "Display the next thread"
+msgstr "Tampilkan topik selanjutnya"
+
+#: ../mail/e-mail-reader.c:1374
+msgid "Next _Unread Message"
+msgstr "Pesan Bel_um Dibaca Berikutnya"
+
+#: ../mail/e-mail-reader.c:1376
+msgid "Display the next unread message"
+msgstr "Buka pesan email berikutnya yang belum dibaca"
+
+#: ../mail/e-mail-reader.c:1381
+msgid "_Previous Message"
+msgstr "_Pesan Sebelumnya"
+
+#: ../mail/e-mail-reader.c:1383
+msgid "Display the previous message"
+msgstr "Buka pesan email sebelumnya"
+
+#: ../mail/e-mail-reader.c:1388
+msgid "Pr_evious Important Message"
+msgstr "Pesan P_enting Berikutnya"
+
+#: ../mail/e-mail-reader.c:1390
+msgid "Display the previous important message"
+msgstr "Buka pesan email penting sebelumnya"
+
+#: ../mail/e-mail-reader.c:1395
+msgid "P_revious Unread Message"
+msgstr "_Pesan Belum Dibaca Sebelumnya"
+
+#: ../mail/e-mail-reader.c:1397
+msgid "Display the previous unread message"
+msgstr "Buka pesan email sebelumnya yang belum dibaca"
+
+#: ../mail/e-mail-reader.c:1404
+msgid "Print this message"
+msgstr "Cetak pesan email ini"
+
+#: ../mail/e-mail-reader.c:1411
+msgid "Preview the message to be printed"
+msgstr "Lihat contoh jadi hasil cetakan pesan email ini"
+
+#: ../mail/e-mail-reader.c:1416
+msgid "Re_direct"
+msgstr "_Mental"
+
+#: ../mail/e-mail-reader.c:1418
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Pentalkan (bounce) pesan yang dipilih ini kepada orang lain"
+
+#: ../mail/e-mail-reader.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-attachment-handler.c:139
+msgid "Reply to _All"
+msgstr "Balas ke Semu_a"
+
+#: ../mail/e-mail-reader.c:1425
+#, fuzzy
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "Tulis balasan ke semua penerima email ini"
+
+#: ../mail/e-mail-reader.c:1430
+msgid "Reply to _List"
+msgstr "Balas ke Mi_lis"
+
+#: ../mail/e-mail-reader.c:1432
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Tulis balasan ke milis pada pesan email ini"
+
+#: ../mail/e-mail-reader.c:1437
+#: ../modules/mail/e-mail-attachment-handler.c:146
+msgid "_Reply to Sender"
+msgstr "Balas ke Pengi_rim"
+
+#: ../mail/e-mail-reader.c:1439
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Tulis balasan pada pengirim email ini"
+
+#: ../mail/e-mail-reader.c:1444
+#, fuzzy
+msgid "_Save as mbox..."
+msgstr "Simpan sebagai..."
+
+#: ../mail/e-mail-reader.c:1446
+#, fuzzy
+msgid "Save selected messages as an mbox file"
+msgstr "Simpan pesan terpilih dalam bentuk teks"
+
+#: ../mail/e-mail-reader.c:1451
+msgid "Search Folder from Mailing _List..."
+msgstr "Saring Folder berdasarkan Mi_lis..."
+
+#: ../mail/e-mail-reader.c:1453
+#, fuzzy
+msgid "Create a search folder for this mailing list"
+msgstr "Buat Folder Pencarian untuk mailing list ini"
+
+#: ../mail/e-mail-reader.c:1458
+#, fuzzy
+msgid "Search Folder from Recipien_ts..."
+msgstr "Saring Folder berdasarkan Pene_rima..."
+
+#: ../mail/e-mail-reader.c:1460
+#, fuzzy
+msgid "Create a search folder for these recipients"
+msgstr "Buat Folder Pencarian untuk penerima ini"
+
+#: ../mail/e-mail-reader.c:1465
+msgid "Search Folder from Sen_der..."
+msgstr "Saring Folder berdasarkan Pe_ngirim..."
+
+#: ../mail/e-mail-reader.c:1467
+#, fuzzy
+msgid "Create a search folder for this sender"
+msgstr "Buat Folder Pencarian untuk pengirim ini"
+
+#: ../mail/e-mail-reader.c:1472
+msgid "Search Folder from S_ubject..."
+msgstr "Saring Folder berdasarkan _Judul..."
+
+#: ../mail/e-mail-reader.c:1474
+#, fuzzy
+msgid "Create a search folder for this subject"
+msgstr "Buat Folder Pencarian untuk subjek ini"
+
+#: ../mail/e-mail-reader.c:1479
+msgid "_Message Source"
+msgstr "Kode Asli Pesa_n"
+
+#: ../mail/e-mail-reader.c:1481
+msgid "Show the raw email source of the message"
+msgstr "Tampilkan isi email dalam bentuk aslinya"
+
+#: ../mail/e-mail-reader.c:1493
+msgid "_Undelete Message"
+msgstr " Penghap_usan"
+
+#: ../mail/e-mail-reader.c:1495
+msgid "Undelete the selected messages"
+msgstr "Jangan hapus pesan terpilih"
+
+#: ../mail/e-mail-reader.c:1500
+msgid "_Normal Size"
+msgstr "Ukuran _Normal"
+
+#: ../mail/e-mail-reader.c:1502
+msgid "Reset the text to its original size"
+msgstr "Kembalikan ukuran teks kembali semula"
+
+#: ../mail/e-mail-reader.c:1507
+msgid "_Zoom In"
+msgstr "_Perbesar"
+
+#: ../mail/e-mail-reader.c:1509
+msgid "Increase the text size"
+msgstr "Perbesar ukuran teks"
+
+#: ../mail/e-mail-reader.c:1514
+msgid "Zoom _Out"
+msgstr "P_erkecil"
+
+#: ../mail/e-mail-reader.c:1516
+msgid "Decrease the text size"
+msgstr "Kecilkan ukuran teks"
+
+#: ../mail/e-mail-reader.c:1523
+msgid "Create R_ule"
+msgstr "At_uran Penyaringan"
+
+#: ../mail/e-mail-reader.c:1530
+msgid "Ch_aracter Encoding"
+msgstr "Pengkodean K_arakter"
+
+#: ../mail/e-mail-reader.c:1537
+#, fuzzy
+msgid "F_orward As"
+msgstr "Ter_uskan Sebagai..."
+
+#: ../mail/e-mail-reader.c:1544
+msgid "_Go To"
+msgstr "_Buka"
+
+#: ../mail/e-mail-reader.c:1551
+#, fuzzy
+msgid "Mar_k As"
+msgstr "Angga_p Email Ini"
+
+#: ../mail/e-mail-reader.c:1558
+msgid "_Message"
+msgstr "_Pesan"
+
+#: ../mail/e-mail-reader.c:1565
+msgid "_Zoom"
+msgstr "_Perbesar"
+
+#: ../mail/e-mail-reader.c:1590
+msgid "Mark for Follo_w Up..."
+msgstr "Tindak Lan_juti..."
+
+#: ../mail/e-mail-reader.c:1598
+msgid "Mark as _Important"
+msgstr "Tandai Sebagai Email Pent_ing"
+
+#: ../mail/e-mail-reader.c:1602
+msgid "Mark as _Junk"
+msgstr "Tandai Sebagai Email Sampa_h"
+
+#: ../mail/e-mail-reader.c:1606
+msgid "Mark as _Not Junk"
+msgstr "Tandai Buka_n Sebagai Spam"
+
+#: ../mail/e-mail-reader.c:1610
+msgid "Mar_k as Read"
+msgstr "Anggap Sudah _Dibaca"
+
+#: ../mail/e-mail-reader.c:1614
+#, fuzzy
+msgid "Mark as Uni_mportant"
+msgstr "Tandai Sebagai T_idak Penting"
+
+#: ../mail/e-mail-reader.c:1618
+msgid "Mark as _Unread"
+msgstr "Tandai Bel_um Dibaca"
+
+#: ../mail/e-mail-reader.c:1654
+msgid "_Caret Mode"
+msgstr "_Modus Caret"
+
+#: ../mail/e-mail-reader.c:1656
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Tampilkan kursor berkedip dalam badan pesan yang sedang dibuka ini"
+
+#: ../mail/e-mail-reader.c:1662
+msgid "All Message _Headers"
+msgstr "Semua Bagian _Kepala Email"
+
+#: ../mail/e-mail-reader.c:1664
+msgid "Show messages with all email headers"
+msgstr "Tampilkan pesan dengan seluruh judul surat"
+
+#: ../mail/e-mail-reader.c:1878
+msgid "Unable to retrieve message"
+msgstr "Email tidak dapat ditarik"
+
+#: ../mail/e-mail-reader.c:1882
+#: ../mail/e-mail-reader.c:1939
+#: ../mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving message '%s'"
+msgstr "Mengambil pesan email %s"
+
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:2453
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:534
+#: ../plugins/google-account-setup/google-source.c:656
+#: ../widgets/misc/e-account-tree-view.c:234
+msgid "Default"
+msgstr "Default"
+
+#: ../mail/e-mail-reader.c:2574
+#: ../modules/mail/e-mail-attachment-handler.c:132
+msgid "_Forward"
+msgstr "_Teruskan ke Orang Lain"
+
+#: ../mail/e-mail-reader.c:2575
+msgid "Forward the selected message to someone"
+msgstr "Teruskan email ini ke orang lain"
+
+#: ../mail/e-mail-reader.c:2619
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:753
+msgid "Delete"
+msgstr "Hapus"
+
+#: ../mail/e-mail-reader.c:2623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "Selanjutnya"
+
+#: ../mail/e-mail-reader.c:2627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "Sebelum"
+
+#: ../mail/e-mail-reader.c:2631
+#: ../mail/mail-dialogs.ui.h:17
+msgid "Reply"
+msgstr "Balas"
+
+#: ../mail/e-mail-tag-editor.c:292
+msgid "Flag to Follow Up"
+msgstr "Tandai untuk Ditindak Lanjuti"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:499
+#: ../mail/mail-config.ui.h:73
+#: ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "Tanpa pengacakan"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:503
+#: ../mail/mail-config.ui.h:121
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "Pengacakan TLS"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:507
+#: ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "Pengacakan SSL"
+
+#: ../mail/em-account-editor.c:594
 #, c-format
 msgid "%s License Agreement"
 msgstr "Perjanjian Lisensi %s"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:601
 #, c-format
 msgid ""
 "\n"
@@ -11059,127 +10156,180 @@ msgstr ""
 "Silakan baca perjanjian lisensi %s berikut ini dengan seksama\n"
 "kemudian beri tanda centang sebagai tanda penerimaan\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
-msgid "Select Folder"
-msgstr "Pilih Folder"
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:876
+#: ../widgets/misc/e-signature-combo-box.c:75
+#, fuzzy
+msgctxt "mail-signature"
+msgid "None"
+msgstr "Tak Ada"
+
+#: ../mail/em-account-editor.c:960
+msgid "Never"
+msgstr "Jangan pernah"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:961
+msgid "Always"
+msgstr "Selalu"
+
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "Konfirmasi dulu untuk setiap email yang dikirim"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
-msgid "Identity"
-msgstr "Identitas"
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1699
+#: ../widgets/misc/e-account-tree-view.c:124
+#, fuzzy
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "Tak Ada"
+
+#: ../mail/em-account-editor.c:2056
+msgid "Mail Configuration"
+msgstr "Konfigurasi Mail"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:2057
+#, fuzzy
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"Selamat datang pada Pengatur Konfigurasi Email Evolution/\n"
+"\n"
+"Klik tombol \"Maju\" untuk mulai. "
+
+#: ../mail/em-account-editor.c:2060
+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 "Silakan masukkan nama dan alamat email di bawah ini. Pada kolom \"tambahan\" Anda tidak perlu mengisinya dengan lengkap, kecuali memang bila ingin memasukkan isinya ke dalam setiap email yang Anda kirim."
+
+#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2228
+#: ../mail/mail-config.ui.h:91
 msgid "Receiving Email"
 msgstr "Pengambilan Email"
 
-#: ../mail/em-account-editor.c:2014
-msgid "Automatically check for _new mail every"
-msgstr "Periksa otomatis email baru _setiap"
+#: ../mail/em-account-editor.c:2063
+#, fuzzy
+msgid "Please configure the following account settings."
+msgstr "Pilih dari sekian pilihan"
 
-#: ../mail/em-account-editor.c:2195 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2706
 msgid "Sending Email"
 msgstr "Pengiriman Email"
 
-#: ../mail/em-account-editor.c:2254 ../mail/mail-config.glade.h:67
-msgid "Defaults"
-msgstr "Standar"
+#: ../mail/em-account-editor.c:2066
+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 "Silakan masukkan metode cara Anda mengirim email. Bila Anda tidak tahu jawabannya, silakan hubungi bagian IT/administrator atau tempat Anda berlangganan Internet."
+
+#: ../mail/em-account-editor.c:2068
+msgid "Account Management"
+msgstr "Manajemen Akun"
 
-#. Security settings
-#: ../mail/em-account-editor.c:2320 ../mail/mail-config.glade.h:123
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2069
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"Silakan isi nama untuk akun ini.\n"
+" Nama ini hanya untuk tampilan saja."
+
+#: ../mail/em-account-editor.c:2073
+msgid "Done"
+msgstr "Selesai"
+
+#: ../mail/em-account-editor.c:2074
+#, fuzzy
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Selamat, konfigurasi email Anda sudah selesai.\n"
+"\n"
+"Sekarang Anda siap untuk mulai mengirim dan menerima email \n"
+"dengan Evolution.\n"
+"\n"
+"Klik tombol \"Terapkan\" untuk menyimpan konfigurasi."
+
+#: ../mail/em-account-editor.c:2515
+#, fuzzy
+msgid "Check for _new messages every"
+msgstr "Periksa otomatis email baru _setiap"
+
+#: ../mail/em-account-editor.c:2523
+#, fuzzy
+msgid "minu_tes"
+msgstr "menit"
+
+#: ../mail/em-account-editor.c:2832
+#: ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "Keamanan"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+#: ../mail/em-account-editor.c:2877
+#: ../mail/em-account-editor.c:2945
 msgid "Receiving Options"
 msgstr "Pilihan Penerimaan"
 
-#: ../mail/em-account-editor.c:2358 ../mail/em-account-editor.c:2449
-msgid "Checking for New Mail"
+#: ../mail/em-account-editor.c:2878
+#: ../mail/em-account-editor.c:2946
+#, fuzzy
+msgid "Checking for New Messages"
 msgstr "Periksa Email Baru"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:3414
 msgid "Account Editor"
 msgstr "Pengatur Akun"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:3414
 msgid "Evolution Account Assistant"
 msgstr "Pengatur Akun Evolution"
 
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
-msgid "Disable"
-msgstr "Matikan"
-
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411
-msgid "Enable"
-msgstr "Aktifkan"
-
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:466
-msgid "[Default]"
-msgstr "[Utama]"
-
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:493
-msgid "Enabled"
-msgstr "aktif"
-
-#: ../mail/em-account-prefs.c:525
-msgid "Account name"
-msgstr "Nama akun"
-
-#: ../mail/em-account-prefs.c:527
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
-msgid "Unnamed"
-msgstr "Belum diberi nama"
-
-#: ../mail/em-composer-prefs.c:936
-msgid "Language(s)"
-msgstr "Bahasa"
-
-#: ../mail/em-composer-prefs.c:979
-msgid "Add signature script"
-msgstr "Tambahkan skrip tanda tangan"
-
-#: ../mail/em-composer-prefs.c:999
-msgid "Signature(s)"
-msgstr "Tanda tangan"
+#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
+#: ../mail/em-composer-utils.c:1570
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr ""
 
-#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Isi Pesan Asli --------"
+#. Translators: %s is the subject of the email message
+#: ../mail/em-composer-utils.c:1618
+#, c-format
+msgid "Delivery Notification for: \"%s\""
+msgstr ""
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1942
 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
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"Pada hari ${WeekdayName}, tanggal ${Day}/${Month}/${Year} pukul ${24Hour}:"
-"${Minute} ${TimeZone}, ${Sender} menulis:"
+#: ../mail/em-composer-utils.c:1989
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr "Pada hari ${WeekdayName}, tanggal ${Day}/${Month}/${Year} pukul ${24Hour}:${Minute} ${TimeZone}, ${Sender} menulis:"
 
-#: ../mail/em-filter-editor.c:155
-msgid "_Filter Rules"
-msgstr "Aturan _Saringan"
+#: ../mail/em-composer-utils.c:2133
+#, fuzzy
+msgid "-----Original Message-----"
+msgstr "-------- Isi Pesan Asli --------"
+
+#: ../mail/em-composer-utils.c:2314
+msgid "Posting destination"
+msgstr "Tujuan posting"
+
+#: ../mail/em-composer-utils.c:2315
+msgid "Choose folders to post the message to."
+msgstr "Pilih folder tempat melakukan posting."
+
+#: ../mail/em-filter-folder-element.c:260
+msgid "Select Folder"
+msgstr "Pilih Folder"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -11194,367 +10344,332 @@ msgstr "Pilih Warna"
 msgid "Assign Score"
 msgstr "Pilih Skor"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Lampiran"
-
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Bunyi Bip"
 
-#: ../mail/em-filter-i18n.h:7
-msgid "contains"
-msgstr "berisi"
-
-#: ../mail/em-filter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Salin ke dalam Folder"
-
 #: ../mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Completed On"
+msgstr "Selesai pada %d %B %Y, %l:%M %p"
+
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Tanggal diterima"
 
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
 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
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Dihapus"
 
-#: ../mail/em-filter-i18n.h:13
-msgid "does not contain"
-msgstr "tidak berisi"
-
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "tidak diakhiri dengan"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "tidak ada"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "tidak kembali"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "bunyinya tidak mirip dengan"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "tidak diawali dengan"
 
-#: ../mail/em-filter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Tidak Ada"
-
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Draf"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "diakhiri dengan"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Exist"
-msgstr "Ada"
-
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "ada"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "Ekspresi"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "Tindak Lanjut"
 
-#: ../mail/em-filter-i18n.h:27
-msgid "is"
-msgstr "adalah"
+#: ../mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "Forward to"
+msgstr "Teruskan"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Penting"
+
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "setelah"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "sebelum"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "di Tandai"
 
-#: ../mail/em-filter-i18n.h:31
-msgid "is greater than"
-msgstr "lebih besar dari"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "is less than"
-msgstr "kurang dari"
+#: ../mail/em-filter-i18n.h:38
+msgid "is not Flagged"
+msgstr "tidak Ditandai"
 
-#: ../mail/em-filter-i18n.h:33
-msgid "is not"
+#: ../mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "is not set"
 msgstr "bukan"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is not Flagged"
-msgstr "tidak Ditandai"
+#: ../mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "is set"
+msgstr "bukan"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41
+#: ../mail/mail-config.ui.h:62
 msgid "Junk"
 msgstr "Spam"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "Tes Spam"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "Label"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "Milis"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "Cocok Semua"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "Badan Pesan"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "Kepala Pesan"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "Pesan ini Spam"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "Pesan ini Bukan Spam"
 
-#: ../mail/em-filter-i18n.h:44
-msgid "Move to Folder"
-msgstr "Pindahkan ke Folder"
+#: ../mail/em-filter-i18n.h:50
+#, fuzzy
+msgid "Message Location"
+msgstr "Pesan berisi"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Kirimkan ke Program melalui Pipe"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "Bunyikan Suara"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Baca"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:55
+#: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Penerima"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "Regex yang Cocok"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "Balas ke"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "hasil"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "hasil lebih besar dari"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "hasil lebih kecil dari"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "Jalankan Program"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:62
+#: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Nilai"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Pengirim"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:64
+#, fuzzy
+msgid "Sender or Recipients"
+msgstr "Filter Berdasarkan _Penerima"
+
+#: ../mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Set Label"
+msgstr "Label"
+
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "Set Status"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "Ukuran (kB)"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "bunyinya mirip dengan"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "Asal Akun"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "Kepala surat tertentu"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "diawali dengan"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "Stop Pemrosesan"
 
-#: ../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/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
-#: ../smime/lib/e-cert.c:1132
-msgid "Subject"
-msgstr "Judul"
-
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr " Status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:488
-msgid "<b>Then</b>"
+#: ../mail/em-filter-rule.c:533
+#, fuzzy
+msgid "Then"
 msgstr "<b>Lalu</b>"
 
-#: ../mail/em-folder-browser.c:162
-msgid "C_reate Search Folder From Search..."
-msgstr "Buat Sa_ringan Folder dari Hasil Pencarian..."
-
-#: ../mail/em-folder-browser.c:184
-msgid "All Messages"
-msgstr "Seluruh Pesan"
-
-#: ../mail/em-folder-browser.c:185
-msgid "Unread Messages"
-msgstr "Pesan Belum Terbaca"
-
-#: ../mail/em-folder-browser.c:187
-msgid "No Label"
-msgstr "Tanpa Label"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Read Messages"
-msgstr "Baca Pesan"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Recent Messages"
-msgstr "Pesan Saat ini"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Last 5 Days' Messages"
-msgstr "Pesan 5 Hari Terakhir"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages with Attachments"
-msgstr "Pesan dengan Lampiran"
-
-#: ../mail/em-folder-browser.c:198
-msgid "Important Messages"
-msgstr "Pesan Penting"
+#: ../mail/em-filter-rule.c:564
+#, fuzzy
+msgid "Add Ac_tion"
+msgstr "Butuh Penanganan"
 
-#: ../mail/em-folder-browser.c:199
-msgid "Messages Not Junk"
-msgstr "Pesan Bukan Spam"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:169
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "Pesan belum terbaca:"
 
 #. 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:173
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total pesan:"
 
-#. 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] "Pesan belum terbaca:"
+#: ../mail/em-folder-properties.c:191
+#, fuzzy, c-format
+msgid "Quota usage (%s):"
+msgstr "Total pesan:"
+
+#: ../mail/em-folder-properties.c:193
+#, fuzzy, c-format
+msgid "Quota usage"
+msgstr "Total pesan:"
 
-#: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../mail/em-folder-properties.c:395
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "Pengaturan Folder"
 
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:75
 msgid "<click here to select a folder>"
 msgstr "<klik di sini untuk memilih folder>"
 
-#: ../mail/em-folder-selector.c:261
-msgid "Create"
+#: ../mail/em-folder-selector.c:264
+#, fuzzy
+msgid "C_reate"
 msgstr "Buat"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:268
 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
+#. load store to mail component
+#: ../mail/em-folder-tree-model.c:146
+#: ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155
+#: ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164
+#: ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1073
+#: ../mail/mail-vfolder.c:1138
 msgid "Search Folders"
 msgstr "Cari Folder"
 
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:171
+#: ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:151
-msgid "Drafts"
-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
-msgid "Inbox"
-msgstr "Email Masuk"
-
-#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:152
-msgid "Outbox"
-msgstr "Email Keluar"
-
-#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
-msgid "Sent"
-msgstr "Email Terkirim"
-
-#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
+#: ../mail/em-folder-tree-model.c:743
+#: ../mail/em-folder-tree-model.c:1080
 msgid "Loading..."
 msgstr "Meload...."
 
+#: ../mail/em-folder-tree.c:179
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Memeriksa folder dalam \"%s\""
+
+#: ../mail/em-folder-tree.c:592
+msgid "Folder names cannot contain '/'"
+msgstr "Nama folder tidak boleh berisi karakter \"/\"."
+
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
@@ -11564,2030 +10679,1764 @@ msgstr "Meload...."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:366
-#, c-format
-msgid "folder-display|%s (%u)"
-msgstr "\"%s (%u)\""
+#: ../mail/em-folder-tree.c:1074
+#, fuzzy, c-format
+msgctxt "folder-display"
+msgid "%s (%u%s)"
+msgstr "%s = %s"
 
-#: ../mail/em-folder-tree.c:717
+#: ../mail/em-folder-tree.c:1280
 msgid "Mail Folder Tree"
 msgstr "Pohon Folder Email"
 
-#: ../mail/em-folder-tree.c:877
+#: ../mail/em-folder-tree.c:1486
+#: ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Memindahkan folder %s"
 
-#: ../mail/em-folder-tree.c:879
+#: ../mail/em-folder-tree.c:1488
+#: ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Menyalin folder %s"
 
-#: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:1495
+#: ../mail/message-list.c:2098
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Memindahkan semua pesan ke dalam folder %s"
 
-#: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1808
+#: ../mail/em-folder-tree.c:1497
+#: ../mail/message-list.c:2100
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Menyalin semua pesan ke dalam folder %s"
 
-#: ../mail/em-folder-tree.c:904
+#: ../mail/em-folder-tree.c:1512
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Tidak dapat menyimpan email dalam penyimpanan tingkat atas"
 
-#: ../mail/em-folder-tree.c:1000 ../ui/evolution-mail-message.xml.h:105
-msgid "_Copy to Folder"
-msgstr "_Salin ke Folder"
-
-#: ../mail/em-folder-tree.c:1001 ../ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Pindahkan ke folder"
-
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1060
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Memeriksa folder dalam \"%s\""
-
-#: ../mail/em-folder-tree.c:2065 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
-msgid "_View"
-msgstr "_Lihat"
-
-#: ../mail/em-folder-tree.c:2066
-msgid "Open in _New Window"
-msgstr "Buka dalam Je_ndela Baru"
-
-#: ../mail/em-folder-tree.c:2070
-msgid "_Copy..."
-msgstr "Sa_lin..."
-
-#: ../mail/em-folder-tree.c:2071
-msgid "_Move..."
-msgstr "_Pindahkan..."
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2075
-msgid "_New Folder..."
-msgstr "Folder Bar_u"
-
-#: ../mail/em-folder-tree.c:2078 ../ui/evolution-mail-list.xml.h:34
-msgid "_Rename..."
-msgstr "_Ganti nama..."
-
-#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:128
-msgid "_Empty Trash"
-msgstr "_Kosongkan Tong Sampah"
-
-#: ../mail/em-folder-utils.c:104
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "Menyalin dari `%s' ke `%s'."
-
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1007
-#: ../mail/em-folder-view.c:1022
-#: ../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:379
+#, fuzzy
+msgid "Move Folder To"
+msgstr "Pindahkan ke Folder"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1022
-msgid "C_opy"
-msgstr "S_alin"
+#: ../mail/em-folder-utils.c:379
+#, fuzzy
+msgid "Copy Folder To"
+msgstr "Salin ke dalam Folder"
 
-#: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:145
-#, c-format
-msgid "Creating folder `%s'"
+#: ../mail/em-folder-utils.c:500
+#: ../plugins/groupwise-features/share-folder-common.c:136
+#, fuzzy, c-format
+msgid "Creating folder '%s'"
 msgstr "Buat folder '%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 "Buat folder"
+#: ../mail/em-folder-utils.c:663
+#, fuzzy
+msgid "Create Folder"
+msgstr "Buat _Folder"
 
-#: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../mail/em-folder-utils.c:664
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Specify where to create the folder:"
 msgstr "Tentukan lokasi folder baru:"
 
-#: ../mail/em-folder-view.c:1115 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "Balas ke Pengi_rim"
-
-#: ../mail/em-folder-view.c:1117 ../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:1120 ../ui/evolution-mail-message.xml.h:107
-msgid "_Edit as New Message..."
-msgstr "Jadikan s_ebagai Pesan Baru..."
-
-#: ../mail/em-folder-view.c:1126
-msgid "U_ndelete"
-msgstr "T_idak jadi hapus"
-
-#: ../mail/em-folder-view.c:1127
-msgid "_Move to Folder..."
-msgstr "_Pindahkan ke Folder..."
-
-#: ../mail/em-folder-view.c:1128
-msgid "_Copy to Folder..."
-msgstr "_Salin ke Folder..."
-
-#: ../mail/em-folder-view.c:1131
-msgid "Mar_k as Read"
-msgstr "Anggap Sudah _Dibaca"
-
-#: ../mail/em-folder-view.c:1132
-msgid "Mark as _Unread"
-msgstr "Tandai Bel_um Dibaca"
-
-#: ../mail/em-folder-view.c:1133
-msgid "Mark as _Important"
-msgstr "Tandai Sebagai Email Pent_ing"
-
-#: ../mail/em-folder-view.c:1134
-msgid "Mark as Un_important"
-msgstr "Tandai Sebagai T_idak Penting"
-
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as _Junk"
-msgstr "Tandai Sebagai Email Sampa_h"
-
-#: ../mail/em-folder-view.c:1136
-msgid "Mark as _Not Junk"
-msgstr "Tandai Buka_n Sebagai Spam"
-
-#: ../mail/em-folder-view.c:1137
-msgid "Mark for Follo_w Up..."
-msgstr "Tindak Lan_juti..."
-
-#: ../mail/em-folder-view.c:1139
-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:1140 ../widgets/misc/e-dateedit.c:475
-msgid "_None"
-msgstr "_Tidak ada"
-
-#: ../mail/em-folder-view.c:1145
-msgid "Fla_g Completed"
-msgstr "Fla_g Selesai"
-
-#: ../mail/em-folder-view.c:1146
-msgid "Cl_ear Flag"
-msgstr "Ha_pus Flag"
-
-#: ../mail/em-folder-view.c:1149
-msgid "Crea_te Rule From Message"
-msgstr "Bua_t Aturan Baru dari Pesan Ini"
-
-#: ../mail/em-folder-view.c:1150
-msgid "Search Folder from _Subject"
-msgstr "Saring Folder berdasarkan _Judul"
-
-#: ../mail/em-folder-view.c:1151
-msgid "Search Folder from Se_nder"
-msgstr "Saring Folder berdasarkan Pe_ngirim"
-
-#: ../mail/em-folder-view.c:1152
-msgid "Search Folder from _Recipients"
-msgstr "Saring Folder berdasarkan Pene_rima"
-
-#: ../mail/em-folder-view.c:1153
-msgid "Search Folder from Mailing _List"
-msgstr "Saring Folder berdasarkan Mi_lis"
-
-#: ../mail/em-folder-view.c:1157
-msgid "Filter on Sub_ject"
-msgstr "Filter Berdasarkan Sub_yek"
-
-#: ../mail/em-folder-view.c:1158
-msgid "Filter on Sen_der"
-msgstr "Filter Berdasarkan Pen_girim"
-
-#: ../mail/em-folder-view.c:1159
-msgid "Filter on Re_cipients"
-msgstr "Filter Berdasarkan _Penerima"
-
-#: ../mail/em-folder-view.c:1160
-msgid "Filter on _Mailing List"
-msgstr "Filter Berdasarkan _Milis"
-
-#. default charset used in mail view
-#: ../mail/em-folder-view.c:2001 ../mail/em-folder-view.c:2045
-msgid "Default"
-msgstr "Default"
-
-#: ../mail/em-folder-view.c:2144
-#: ../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:2300
-msgid "Unable to retrieve message"
-msgstr "Email tidak dapat ditarik"
-
-#: ../mail/em-folder-view.c:2498
-msgid "Create _Search Folder"
-msgstr "Buat Folder _Pencarian"
-
-#: ../mail/em-folder-view.c:2499
-msgid "_From this Address"
-msgstr "_Dari Alamat Ini:"
-
-#: ../mail/em-folder-view.c:2500
-msgid "_To this Address"
-msgstr "Ke Alama_t Ini"
-
-#: ../mail/em-folder-view.c:2854
+#: ../mail/em-folder-utils.c:680
 #, c-format
-msgid "Click to mail %s"
-msgstr "Klik untuk mengirim email kepada %s"
-
-#: ../mail/em-folder-view.c:2859
-msgid "Click to hide/unhide addresses"
-msgstr "Klik untuk sembunyi/tampilkan alamat"
-
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:503
-#, c-format
-msgid "Matches: %d"
-msgstr "Jumlah Kecocokan: %d"
-
-#: ../mail/em-format-html-display.c:646
-msgid "Fi_nd:"
-msgstr "Temuka_n:"
-
-#: ../mail/em-format-html-display.c:674
-msgid "Fo_rward"
-msgstr "Te_ruskan"
-
-#: ../mail/em-format-html-display.c:679
-msgid "M_atch case"
-msgstr "Cocok _huruf"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Stop berlangganan folder \"%s\""
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "Tidak Ditandatangani"
 
-#: ../mail/em-format-html-display.c:926
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: ../mail/em-format-html-display.c:90
+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:927 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "Tanda tangan sah"
 
-#: ../mail/em-format-html-display.c:927
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Pesan ini ditandatangani dan sah, artinya pesan ini benar-benar dikirim oleh "
-"orang ini."
+#: ../mail/em-format-html-display.c:91
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+msgstr "Pesan ini ditandatangani dan sah, artinya pesan ini benar-benar dikirim oleh orang ini."
 
-#: ../mail/em-format-html-display.c:928 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "Tanda tangan tidak sah"
 
-#: ../mail/em-format-html-display.c:928
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"Tanda tangan tidak dapat diperiksa keabsahannya, mungkin data tanda tangan "
-"digitalnya terubah pada saat melalui pengiriman."
+#: ../mail/em-format-html-display.c:92
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgstr "Tanda tangan tidak dapat diperiksa keabsahannya, mungkin data tanda tangan digitalnya terubah pada saat melalui pengiriman."
 
-#: ../mail/em-format-html-display.c:929
-msgid "Valid signature, cannot verify sender"
-msgstr "Tanda tangan sah, namun tidak dapat memeriksa pengirimnya"
+#: ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html.c:1536
+#, fuzzy
+msgid "Valid signature, but cannot verify sender"
+msgstr "Tanda tangan sah namun pengirim tidak dapat diverifikasi"
 
-#: ../mail/em-format-html-display.c:929
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: ../mail/em-format-html-display.c:93
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+msgstr "Pesan ini ditandatangani dengan tanda tangan yang sah, namun pengirim pesan ini tidak dapat diverifikasi kebenarannya."
+
+#: ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html.c:1537
+msgid "Signature exists, but need public key"
 msgstr ""
-"Pesan ini ditandatangani dengan tanda tangan yang sah, namun pengirim pesan "
-"ini tidak dapat diverifikasi kebenarannya."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:94
+#, fuzzy
+msgid "This message is signed with a signature, but there is no corresponding public key."
+msgstr "Pesan ini ditandatangani dengan tanda tangan yang sah, namun pengirim pesan ini tidak dapat diverifikasi kebenarannya."
+
+#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html.c:1543
 msgid "Unencrypted"
 msgstr "Tidak terenkripsi"
 
-#: ../mail/em-format-html-display.c:935
-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."
+#: ../mail/em-format-html-display.c:101
+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."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "Terenkripsi, lemah"
 
-#: ../mail/em-format-html-display.c:936
-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."
+#: ../mail/em-format-html-display.c:102
+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."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "Diacak"
 
-#: ../mail/em-format-html-display.c:937
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-"Pesan ini terenkripsi. Orang yang tidak berhak akan cukup mengalami "
-"kesulitan dalam membuka pesan ini."
+#: ../mail/em-format-html-display.c:103
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+msgstr "Pesan ini terenkripsi. Orang yang tidak berhak akan cukup mengalami kesulitan dalam membuka pesan ini."
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "Terenkripsi, kuat"
 
-#: ../mail/em-format-html-display.c:938
-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."
+#: ../mail/em-format-html-display.c:104
+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."
 
-#: ../mail/em-format-html-display.c:1039 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:235
+#: ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "Lihat Serti_fikat"
 
-#: ../mail/em-format-html-display.c:1054
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Sertifikat tidak dapat dilihat"
 
-#: ../mail/em-format-html-display.c:1373
-msgid "Completed on %B %d, %Y, %l:%M %p"
+#: ../mail/em-format-html-display.c:497
+msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:726
+#, fuzzy
+msgid "Completed on"
 msgstr "Selesai pada %d %B %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1381
+#: ../mail/em-format-html-display.c:734
 msgid "Overdue:"
 msgstr "Waktu Terlewat:"
 
-#: ../mail/em-format-html-display.c:1384
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "pada %d %B %Y, %l:%M %p"
-
-#: ../mail/em-format-html-display.c:1444
-msgid "_View Inline"
-msgstr "_Lihat Langsung"
-
-#: ../mail/em-format-html-display.c:1445
-msgid "_Hide"
-msgstr "_Cari"
-
-#: ../mail/em-format-html-display.c:1446
-msgid "_Fit to Width"
-msgstr "_Lebarkan"
-
-#: ../mail/em-format-html-display.c:1447
-msgid "Show _Original Size"
-msgstr "Tampilkan U_kuran Asli"
-
-#: ../mail/em-format-html-display.c:1866 ../mail/mail-config.glade.h:44
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Jadikan Lampiran"
-
-#: ../mail/em-format-html-display.c:2073
-msgid "Select folder to save all attachments..."
-msgstr "Pilih folder untuk menyimpan semua lampiran ini..."
-
-#: ../mail/em-format-html-display.c:2120
-msgid "_Save Selected..."
-msgstr "_Simpan Terpilih..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2187
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d lampira_n"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:738
+#, fuzzy
+msgid "by"
+msgstr "%d %s kali %d %s"
 
-#: ../mail/em-format-html-display.c:2194 ../mail/em-format-html-display.c:2272
-msgid "S_ave"
-msgstr "Simp_an"
+#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:992
+#, fuzzy
+msgid "View _Unformatted"
+msgstr "Format waktu:"
 
-#: ../mail/em-format-html-display.c:2205
-msgid "S_ave All"
-msgstr "Simp_an Semua"
+#: ../mail/em-format-html-display.c:950
+#, fuzzy
+msgid "Hide _Unformatted"
+msgstr "Format waktu:"
 
-#: ../mail/em-format-html-display.c:2268
-msgid "No Attachment"
-msgstr "Tidak Ada Lampiran"
+#: ../mail/em-format-html-display.c:1012
+#, fuzzy
+msgid "O_pen With"
+msgstr "Buka Berksa"
 
-#: ../mail/em-format-html-print.c:130
+#: ../mail/em-format-html-print.c:163
 #, c-format
 msgid "Page %d of %d"
 msgstr "Halaman %d dari %d"
 
-#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
-#, c-format
-msgid "Retrieving `%s'"
+#: ../mail/em-format-html.c:147
+msgid "Formatting message"
+msgstr "Pembentukan email"
+
+#: ../mail/em-format-html.c:338
+#, fuzzy
+msgid "Formatting Message..."
+msgstr "Pembentukan email"
+
+#: ../mail/em-format-html.c:1380
+#: ../mail/em-format-html.c:1389
+#, fuzzy, c-format
+msgid "Retrieving '%s'"
 msgstr "Mengambil '%s'"
 
-#: ../mail/em-format-html.c:620
-msgid "Valid signature but cannot verify sender"
-msgstr "Tanda tangan sah namun pengirim tidak dapat diverifikasi"
+#: ../mail/em-format-html.c:1854
+#, fuzzy
+msgid "Unknown external-body part."
+msgstr "Badan email tidak tersusun dengan benar."
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:1862
 msgid "Malformed external-body part."
 msgstr "Badan email tidak tersusun dengan benar."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:1892
 #, 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:1903
 #, 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:1905
 #, 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:1926
 #, 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:1937
 #, 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
-msgid "Formatting message"
-msgstr "Pembentukan email"
-
-#: ../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
-msgid "From"
-msgstr "Dari"
-
-#: ../mail/em-format-html.c:1488 ../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.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.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:1025
-msgid "Mailer"
-msgstr "Mailer"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
-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
-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
-#: ../widgets/misc/e-dateedit.c:363
-msgid "Date"
-msgstr "Tanggal"
-
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:92
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
-#: ../mail/em-format.c:1102
-#, c-format
-msgid "%s attachment"
-msgstr "Attachment %s"
-
-#: ../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 "Tidak dapat membuka pesan S/MIME: Error tidak diketahui"
-
-#: ../mail/em-format.c:1271 ../mail/em-format.c:1427
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Tidak dapat membuka pesan MIME. Pesan ditampilkan apa adanya."
-
-#: ../mail/em-format.c:1279
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tipe enkripsi ini tidak dapat dipakai pada multipart/encrypted"
-
-#: ../mail/em-format.c:1446
-msgid "Unsupported signature format"
-msgstr "Jenis tanda tangan tidak dapat dibaca"
-
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
-msgid "Error verifying signature"
-msgstr "Error saat melakukan verifikasi tanda tangan"
-
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
-msgid "Unknown error verifying signature"
-msgstr "Ada error tidak dikenal saat melakukan verifikasi tanda tangan"
-
-#: ../mail/em-mailer-prefs.c:103
-msgid "Every time"
-msgstr "Setiap saat"
-
-#: ../mail/em-mailer-prefs.c:104
-msgid "Once per day"
-msgstr "Sekali dalam sehari"
-
-#: ../mail/em-mailer-prefs.c:105
-msgid "Once per week"
-msgstr "Sekali dalam seminggu"
-
-#: ../mail/em-mailer-prefs.c:106
-msgid "Once per month"
-msgstr "Sekali dalam sebulan"
-
-#: ../mail/em-migrate.c:1210
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Lokasi dan hirarki folder kotak surat Evolution sudah berubah sejak "
-"Evolution 1.x.\n"
-"\n"
-"Silakan tunggu sebentar sementara Evolution melakukan migrasi folder..."
-
-#: ../mail/em-migrate.c:1649
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Tidak dapat membuat folder baru '%s': %s"
-
-#: ../mail/em-migrate.c:1675
-#, 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
-#, 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
-#, 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
-#, 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
-#, 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
-#, 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
+#. To translators: This message suggests to the receipients that the sender of the mail is
+#. different from the one listed in From field.
+#.
+#: ../mail/em-format-html.c:2598
 #, 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
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr ""
-"Tidak dapat membaca pengaturan Evolution yang lama. file 'evolution/config."
-"xmldb' telah hilang atau telah rusak."
-
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
-msgid "_Reply to sender"
-msgstr "Balas ke pengi_rim"
-
-#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Reply to _List"
-msgstr "Balas ke Mi_lis"
-
-#: ../mail/em-popup.c:621
-msgid "_Send New Message To..."
-msgstr "Kirim Pe_san Baru ke..."
-
-#: ../mail/em-popup.c:622
-msgid "_Add to Address Book"
-msgstr "T_ambahkan ke Buku Alamat"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
-msgstr ""
-"Penyimpanan ini tidak mendukung fasilitas langganan atau belum diaktifkan."
+msgstr "Penyimpanan ini tidak mendukung fasilitas langganan atau belum diaktifkan."
 
-#: ../mail/em-subscribe-editor.c:612
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Langganan"
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:814
+#: ../mail/em-subscribe-editor.c:837
 msgid "Please select a server."
 msgstr "Silakan pilih servernya."
 
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Server belum dipilih"
 
-#: ../mail/em-utils.c:141
-msgid "Do not show this message again."
-msgstr "Jangan tampilkan pesan ini lagi."
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, fuzzy, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "Anda yakin ini membuka {0} pesan pada satu saat?"
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Penyaringan Pesan"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
-msgid "message"
-msgstr "pesan"
-
-#: ../mail/em-utils.c:688
-msgid "Save Message..."
-msgstr "Simpan Pesan..."
-
-#: ../mail/em-utils.c:737
-msgid "Add address"
-msgstr "Tambah alamat"
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:852
 #, c-format
 msgid "Messages from %s"
 msgstr "Pesan dari %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
 msgstr "Cari _Folder"
 
-#: ../mail/em-vfolder-rule.c:591
-msgid "Search Folder source"
-msgstr "Pilih sumber Folder"
+#: ../mail/em-vfolder-rule.c:521
+#, fuzzy
+msgid "Add Folder"
+msgstr "Folder"
 
-#: ../mail/evolution-mail.schemas.in.in.h:1
-msgid "Automatic link recognition"
+#: ../mail/evolution-mail.schemas.in.h:1
+#, fuzzy
+msgid "\"Filter Editor\" window height"
+msgstr "Tinggi jendela awal"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Filter Editor\" window maximize state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+#, fuzzy
+msgid "\"Filter Editor\" window width"
+msgstr "Lebar jendela awal"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+#, fuzzy
+msgid "\"Search Folder Editor\" window height"
+msgstr "Tinggi jendela awal"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+#, fuzzy
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "Saring Folder berdasarkan Mi_lis"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+#, fuzzy
+msgid "\"Search Folder Editor\" window width"
+msgstr "Saring Folder berdasarkan Mi_lis"
+
+#: ../mail/evolution-mail.schemas.in.h:7
+#, fuzzy
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Kirim & Ambil Email"
+
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:9
+#, fuzzy
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Kirim & Ambil Email"
+
+#: ../mail/evolution-mail.schemas.in.h:10
+#, fuzzy
+msgid "Always request read receipt"
+msgstr "Selalu kirim kembali nota pemberitahuan pembacaan email"
+
+#: ../mail/evolution-mail.schemas.in.h:12
+#, fuzzy
+msgid "Automatic emoticon recognition"
 msgstr "Pengenalan link otomatis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:2
-msgid "Automatic smiley recognition"
-msgstr "Pengenalan smiley otomatis"
+#: ../mail/evolution-mail.schemas.in.h:13
+msgid "Automatic link recognition"
+msgstr "Pengenalan link otomatis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Periksa apakah email yang datang spam atau bukan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Warna penanda kutipan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Warna penanda kutipan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Tinggi standar Jendela Penulis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Lebar standar Jendela Penulis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:19
+#, fuzzy
+msgid "Composer load/attach directory"
+msgstr "Tanpa direktori keluaran!"
+
+#: ../mail/evolution-mail.schemas.in.h:20
 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."
+#: ../mail/evolution-mail.schemas.in.h:21
+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.h:22
+msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Custom headers to use while checking for junk."
 msgstr ""
-"Padatkan tampilan alamat dalam TO/CC/BCC ke nomor yang ditentukan dalam "
-"address_count."
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:25
 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.h:26
 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.h:27
 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.h:28
 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.h:29
 msgid "Default forward style"
 msgstr "Gaya penerusan email utama"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
-msgid "Default height of the Composer Window"
+#: ../mail/evolution-mail.schemas.in.h:30
+#, fuzzy
+msgid "Default height of the Composer Window."
 msgstr "Tinggi standar Jendela Penulis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
-msgid "Default height of the Message Window"
-msgstr "Tinggi standar Jendela Pesan"
+#: ../mail/evolution-mail.schemas.in.h:31
+#, fuzzy
+msgid "Default height of the mail browser window."
+msgstr "Tinggi standar Jendela Penulis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
-msgid "Default height of the Subscribe dialog"
+#: ../mail/evolution-mail.schemas.in.h:32
+#, fuzzy
+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.h:33
+#, fuzzy
+msgid "Default maximized state of the mail browser window."
+msgstr "Lebar standar Jendela Penulis"
+
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Gaya utama yang digunakan untuk membalas email"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
-msgid "Default width of the Composer Window"
+#: ../mail/evolution-mail.schemas.in.h:35
+#, fuzzy
+msgid "Default value for thread expand state"
+msgstr "Judul awal pesan email."
+
+#: ../mail/evolution-mail.schemas.in.h:36
+#, fuzzy
+msgid "Default width of the Composer Window."
 msgstr "Lebar standar Jendela Penulis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
-msgid "Default width of the Message Window"
-msgstr "Lebar standar Jendela Pesan"
+#: ../mail/evolution-mail.schemas.in.h:37
+#, fuzzy
+msgid "Default width of the mail browser window."
+msgstr "Lebar standar Jendela Penulis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
-msgid "Default width of the Subscribe dialog"
+#: ../mail/evolution-mail.schemas.in.h:38
+#, fuzzy
+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.h:39
+msgid "Determines whether to look up addresses for junk filtering in local address book only"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Determines whether to lookup in address book for sender email"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Directory for loading/attaching files to composer."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:46
+msgid "Directory for saving mail component files."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:47
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:49
+#, fuzzy
+msgid "Do not add signature delimiter"
+msgstr "Tidak dapat menyimpan file tanda tangan."
+
+#: ../mail/evolution-mail.schemas.in.h:50
 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.h:51
+#, fuzzy
+msgid "Empty Junk folders on exit"
+msgstr "Bersihkan Tong Sampah saat keluar"
+
+#: ../mail/evolution-mail.schemas.in.h:52
 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.h:53
+#, fuzzy
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Kosongkan folder Sampah saat keluar dari Evolution."
+
+#: ../mail/evolution-mail.schemas.in.h:54
 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.h:55
+msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:56
 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
+#: ../mail/evolution-mail.schemas.in.h:57
+#, fuzzy
+msgid "Enable or disable magic space bar"
+msgstr "Aktif atau matikan pengetikan pada fasilitas cari"
+
+#: ../mail/evolution-mail.schemas.in.h:58
+#, fuzzy
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "Akan mematikan/aktifkan promp selagi menandai berbagai pesan."
+
+#: ../mail/evolution-mail.schemas.in.h:59
 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."
+#: ../mail/evolution-mail.schemas.in.h:60
+#, fuzzy
+msgid "Enable search folders"
+msgstr "Cari Folder"
+
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid "Enable search folders on startup."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid "Enable the side bar search feature to allow interactive searching of folder names."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
 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.h:64
+msgid "Enable to display only message texts not exceeding size defined in 'message_text_part_limit' key."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "Aktifkan/matikan mode caret"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/mail-config.ui.h:46
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid "Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:68
 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.h:69
 msgid "Height of the message-list pane."
 msgstr "Tinggi panel daftar pesan."
 
-#: ../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."
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Hides the per-folder preview and removes the selection"
 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."
+#: ../mail/evolution-mail.schemas.in.h:71
+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 "Jika pengguna membuka 10 atau lebih pesan pada suatu saat, tanya mereka apakah memang benar-benar ingin melakukannya."
+
+#: ../mail/evolution-mail.schemas.in.h:72
+#, 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 "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.h:73
+msgid "Initial height of the \"Filter Editor\" window. The value updates as the user resizes the window vertically."
 msgstr ""
-"Jika panel \"Preview\" hidup, maka tampilkan sisi -demi-sisi dari pada "
-"secara tegak."
 
-#: ../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."
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "Initial height of the \"Search Folder Editor\" window. The value updates as the user resizes the window vertically."
 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."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "Akan mematikan/aktifkan promp selagi menandai berbagai pesan."
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "Initial maximize state of the \"Filter Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Filter Editor\" window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Initial maximize state of the \"Search Folder Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Search Folder Editor\" window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:78
+msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "Initial width of the \"Filter Editor\" window. The value updates as the user resizes the window horizontally."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
-msgid "Last time empty trash was run"
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "Initial width of the \"Search Folder Editor\" window. The value updates as the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:83
+#, fuzzy
+msgid "Last time Empty Junk was run"
 msgstr "Kali terakhir pengosongan sampah dilakukan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:84
+#, fuzzy
+msgid "Last time Empty Trash was run"
+msgstr "Kali terakhir pengosongan sampah dilakukan"
+
+#: ../mail/evolution-mail.schemas.in.h:85
+#, fuzzy
+msgid "Layout style"
+msgstr "Mayotte"
+
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
 msgstr "Daftar label dan warne yang bersesuaian"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:88
+#, fuzzy
+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.h:89
 msgid "List of accepted licenses"
 msgstr "Daftar lisensi yang diterima"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "Daftar akun"
 
-#: ../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 ""
-"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.h:91
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+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:40
+#: ../mail/evolution-mail.schemas.in.h:92
 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: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."
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "List of dictionary language codes used for spell checking."
 msgstr ""
-"Daftar label yang dikenal komponel surat Evolution. Daftar ini mengandung "
-"kalimat yang berisi nama:warna di mana warna menggunakan penerjemahan hex "
-"HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
-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.h:94
+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."
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:95
 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:44
-msgid "Load images for HTML messages over http"
+#: ../mail/evolution-mail.schemas.in.h:96
+#, fuzzy
+msgid "Load images for HTML messages over HTTP"
 msgstr "Baca gambar untuk pesan HTML melalui http"
 
-#: ../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 ""
-"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.h:97
+#, fuzzy
+msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
+msgstr "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:46
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
 msgstr "Aksi saringan log"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:99
 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:48
+#: ../mail/evolution-mail.schemas.in.h:100
 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.h:101
 msgid "Logfile to log filter actions."
 msgstr "Aksi berkas log ke saringan log."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:102
+#, fuzzy
+msgid "Mail browser height"
+msgstr "Tinggi baris seragam"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Mail browser maximized"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:104
+#, fuzzy
+msgid "Mail browser width"
+msgstr "Email diawali dengan"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 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.h:106
 msgid "Mark as Seen after specified timeout."
 msgstr "Tandai sebagai Terlihat setelah jeda tertentu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:107
 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.h:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Tandai kutipan dalam pesan \"Pracetak\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
-msgid "Message Window default height"
-msgstr "Tinggi default Jendela Pesan"
-
-#: ../mail/evolution-mail.schemas.in.in.h:55
-msgid "Message Window default width"
-msgstr "Lebar default Jendela Pesan"
+#: ../mail/evolution-mail.schemas.in.h:109
+msgid "Message text limit for display"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Gaya penampilan-pesan (\"normal\", \"judul penuh\", \"sumber\")"
+msgstr "Gaya penampilan pesan (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
-msgid "Minimum days between emptying the trash on exit"
+#: ../mail/evolution-mail.schemas.in.h:111
+#, fuzzy
+msgid "Minimum days between emptying the junk on exit"
 msgstr "Hari paling sedikit antara mengosongkan sampah pada saat keluar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
-msgid "Minimum time between emptying the trash on exit, in days."
-msgstr ""
-"Waktu paling sedikit antara mengosongkan sampah pada saat keluar, dalam hari."
+#: ../mail/evolution-mail.schemas.in.h:112
+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:59
-msgid "New Mail Notify sound file"
-msgstr "Berkas suara untuk Pemberitahuan Email Baru"
+#: ../mail/evolution-mail.schemas.in.h:113
+#, fuzzy
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "Waktu paling sedikit antara mengosongkan sampah pada saat keluar, dalam hari."
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
-msgid "New Mail Notify type"
-msgstr "Jenis Pemberitahuan Email Baru"
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr "Waktu paling sedikit antara mengosongkan sampah pada saat keluar, dalam hari."
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:115
 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:62
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "Konfirmasi pada email dengan judul kosong"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:117
 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:64
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:118
+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:65
+#: ../mail/evolution-mail.schemas.in.h:119
+#, fuzzy
+msgid "Prompt when deleting messages in search folder"
+msgstr "K_onfirmasi saat mengirim email dengan isi baris subyek kosong"
+
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "Konfirmasi saat user menghapus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "Konfirmasi saat user hanya mengisi kolom Bcc saja"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:122
 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:68
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-"Konfirmasi saat user hendak mengirim email dalam HTML padahal alamat tujuan "
-"tidak mau menerima email dalam HTML."
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+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:69
+#: ../mail/evolution-mail.schemas.in.h:124
 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:70
+#: ../mail/evolution-mail.schemas.in.h:125
 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:71
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "Konfirmasi saat menandai beberapa pesan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
-msgid "Recognize links in text and replace them."
-msgstr "Kenali link dalam teks dan menggantinya."
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Recognize smileys in text and replace them with images."
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Put the cursor at the bottom of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:129
+#, fuzzy
+msgid "Recognize emoticons in text and replace them with images."
 msgstr "Kenali smiley pada teks dan ganti dengan gambar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Run junk test on incoming mail"
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Recognize links in text and replace them."
+msgstr "Kenali link dalam teks dan menggantinya."
+
+#: ../mail/evolution-mail.schemas.in.h:131
+#, fuzzy
+msgid "Run junk test on incoming mail."
 msgstr "Jalankan tes spam pada email masuk"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:132
+#, fuzzy
+msgid "Save directory"
+msgstr "_Mental"
+
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid "Search for the sender photo in local address books"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "Kirim email HTML secara default"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "Kirim email HTML secara default."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:136
+#, fuzzy
+msgid "Sender email-address column in the message list"
+msgstr "Tampilkan email pengirim dalam kolom pesan daftar pesan"
+
+#: ../mail/evolution-mail.schemas.in.h:137
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "Pilihan _Sinkronisasi..."
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Show \"From\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "Tampilkan Animasi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:146
+#, fuzzy
+msgid "Show all message headers"
+msgstr "Runtuh seluruh topik pesan"
+
+#: ../mail/evolution-mail.schemas.in.h:147
+#, fuzzy
+msgid "Show all the headers when viewing a messages."
+msgstr "Pilih seluruh teks dalam sebuah pesan"
+
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "Tampilkan gambar animasi."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:149
 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:80
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr "Tampilkan email terhapus dalam daftar pesan"
 
-#: ../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 "Tampilkan email pengrim pada kolom pembalasan pesan pada daftar pesan"
+#: ../mail/evolution-mail.schemas.in.h:151
+#, fuzzy
+msgid "Show image animations"
+msgstr "Tampilkan Anima_si gambar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
-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.h:152
+msgid "Show original \"Date\" header value."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
-msgid "Sound file to play when new mail arrives."
-msgstr "Mainkan suara saat email datang."
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Show photo of the sender"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
-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.h:154
+msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Show the \"From\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:160
+#, fuzzy
+msgid "Show the email-address of the sender in a separate column in the message list."
+msgstr "Tampilkan email pengrim pada kolom pembalasan pesan pada daftar pesan"
+
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "Show the original \"Date\" header (with a local time only if the time zone differs). Otherwise always show \"Date\" header value in a user preferred format and local time zone."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:162
+#, fuzzy
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "Tampilkan email pengrim pada kolom pembalasan pesan pada daftar pesan"
+
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "Periksa ejaan inline"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:164
+#, fuzzy
+msgid "Spell checking color"
+msgstr "Pemeriksaan Ejaan"
+
+#: ../mail/evolution-mail.schemas.in.h:165
+#, fuzzy
+msgid "Spell checking languages"
+msgstr "Periksa ejaan inline"
+
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "Dafarkan tinggi default dialog"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "Dafarkan lebar default dialog"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "Huruf jenis Terminal"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
-msgid "The last time empty trash was run, in days since the epoch."
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "The default plugin for Junk hook"
 msgstr ""
-"Saat terakhir pengosongan tong sampah dilakukan, dalam hari sejak terakhir."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
-msgid "The terminal font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:170
+#, fuzzy
+msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "Saat terakhir pengosongan tong sampah dilakukan, dalam hari sejak terakhir."
+
+#: ../mail/evolution-mail.schemas.in.h:171
+#, fuzzy
+msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "Saat terakhir pengosongan tong sampah dilakukan, dalam hari sejak terakhir."
+
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid "The layout style determines where to place the preview pane in relation to the message list. \"0\" (Classic View) places the preview pane below the message list. \"1\" (Vertical View) places the preview pane next to the message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:173
+#, fuzzy
+msgid "The terminal font for mail display."
 msgstr "Huruf terminal untuk penampil surat"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
-msgid "The variable width font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:174
+#, fuzzy
+msgid "The variable width font for mail display."
 msgstr "Huruf variable untuk menampilkan surat"
 
-#: ../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."
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
 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."
 
-#: ../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."
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "This decides the max size of the message text that will be displayed under Evolution, specified in terms of KB. The default is 4096 (4MB). This value is used only when 'force_message_limit' key is activated."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:177
+msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:179
+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."
+
+#: ../mail/evolution-mail.schemas.in.h:180
+msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
 msgstr ""
-"Ini menentukan nomor alamat yang ditampilkan pada daftar tampil pesan awal, "
-"yang a '...' di tunjukkan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
-msgid "Thread the message list."
-msgstr "Hubungkan daftar pesan."
+#: ../mail/evolution-mail.schemas.in.h:181
+msgid "This option would help in improving the speed of fetching."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
-msgid "Thread the message-list"
-msgstr "Hubungkan daftar-pesan"
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
+msgstr "Ini menentukan nomor alamat yang ditampilkan pada daftar tampil pesan awal, yang a '...' di tunjukkan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message-list based on Subject"
 msgstr "Hubungkan daftar-pesan berdasarkan pada Subjek"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
-msgid "Timeout for marking message as Seen"
+#: ../mail/evolution-mail.schemas.in.h:186
+#, fuzzy
+msgid "Timeout for marking message as seen"
 msgstr "Habis waktu untuk menandai pesan sebagai Telah dilihat"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
-msgid "Timeout for marking message as Seen."
-msgstr "Habis waktu untuk menandai pesan sebagai Telah dilihat."
+#: ../mail/evolution-mail.schemas.in.h:187
+#, fuzzy
+msgid "Timeout for marking message as seen."
+msgstr "Habis waktu untuk menandai pesan sebagai Telah dilihat"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "UID string of the default account."
 msgstr "Kode UID akun standar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
-msgid "Use Spamassassin daemon and client"
+#: ../mail/evolution-mail.schemas.in.h:189
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:190
+#, fuzzy
+msgid "Use SpamAssassin daemon and client"
 msgstr "Gunakan daemon dan klien Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
-msgid "Use Spamassassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:191
+#, fuzzy
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Gunakan daemon dan klien Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use custom fonts"
 msgstr "Gunakan jenis huruf sendiri"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
-msgid "Use custom fonts for displaying mail"
+#: ../mail/evolution-mail.schemas.in.h:193
+#, fuzzy
+msgid "Use custom fonts for displaying mail."
 msgstr "Gunakan jenis huruf sendiri saat menampilkan email"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use only local spam tests."
 msgstr "Gunakan tes spam lokal saja"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Gunakan tes spam lokal saja (tanpa DNS)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr "Gunakan susunan sisi-demi-sisi atau melebar"
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:197
+msgid "Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Variable width font"
 msgstr "Huruf lebar bebas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
-msgid "View/Bcc menu item is checked"
-msgstr "Data menu Lihat/Bcc dipilih"
-
-#: ../mail/evolution-mail.schemas.in.in.h:111
-msgid "View/Bcc menu item is checked."
-msgstr "Data menu Lihat/Bcc dipilih."
-
-#: ../mail/evolution-mail.schemas.in.in.h:112
-msgid "View/Cc menu item is checked"
-msgstr "Data menu Lihat/Cc dipilih"
-
-#: ../mail/evolution-mail.schemas.in.in.h:113
-msgid "View/Cc menu item is checked."
-msgstr "Data menu Lihat/Cc dipilih."
-
-#: ../mail/evolution-mail.schemas.in.in.h:114
-msgid "View/From menu item is checked"
-msgstr "Data menu Lihat/From dipilih"
-
-#: ../mail/evolution-mail.schemas.in.in.h:115
-msgid "View/From menu item is checked."
-msgstr "Data menu Lihat/From dipilih."
-
-#: ../mail/evolution-mail.schemas.in.in.h:116
-msgid "View/PostTo menu item is checked"
-msgstr "Data menu Lihat/PostTo dipilih"
-
-#: ../mail/evolution-mail.schemas.in.in.h:117
-msgid "View/PostTo menu item is checked."
-msgstr "Data menu Lihat/PostTo dipilih."
+#: ../mail/evolution-mail.schemas.in.h:199
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
-msgid "View/ReplyTo menu item is checked"
-msgstr "Data menu Lihat/Reply-To dipilih"
+#: ../mail/evolution-mail.schemas.in.h:200
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
-msgid "View/ReplyTo menu item is checked."
-msgstr "Data menu Lihat/ReplyTo dipilih."
+#: ../mail/evolution-mail.schemas.in.h:201
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+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:120
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+#: ../mail/evolution-mail.schemas.in.h:202
+msgid "Whether sort threads based on latest message in that thread"
 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:121
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Width of the message-list pane"
 msgstr "Tinggi panel daftar pesan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Width of the message-list pane."
 msgstr "Tinggi panel daftar pesan."
 
-#: ../mail/importers/elm-importer.c:192
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Mengimpor data Elm"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:325
+#: ../mail/importers/pine-importer.c:372
+#: ../modules/mail/e-mail-shell-view.c:952
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
+msgid "Mail"
+msgstr "Surat"
+
+#: ../mail/importers/elm-importer.c:365
 msgid "Evolution Elm importer"
 msgstr "Program pengimpor data Elm Evolution"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:366
 msgid "Import mail from Elm."
 msgstr "Impor dari Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
-#: ../mail/importers/evolution-outlook-importer.c:136
+#: ../mail/importers/evolution-mbox-importer.c:113
+#: ../plugins/pst-import/pst-importer.c:308
 msgid "Destination folder:"
 msgstr "Folder tujuan:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../plugins/pst-import/pst-importer.c:301
+msgid "Select folder"
+msgstr "Pilih folder"
+
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder to import into"
 msgstr "Pilih folder tujuan impor"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:258
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Kotak Surat Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:259
 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
-#, 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
-msgid "Please wait"
-msgstr "Silakan tunggu sebentar"
-
-#: ../mail/importers/evolution-outlook-importer.c:310
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Mengimpor kotak surat"
 
-#: ../mail/importers/mail-importer.c:376
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:148
+#: ../plugins/pst-import/pst-importer.c:453
+#: ../plugins/pst-import/pst-importer.c:559
+#, fuzzy, c-format
+msgid "Importing '%s'"
+msgstr "Mengimpor..."
+
+#: ../mail/importers/mail-importer.c:291
 #, c-format
 msgid "Scanning %s"
 msgstr "Menelusuri %s"
 
-#: ../mail/importers/netscape-importer.c:74
-#, c-format
-msgid "Priority Filter \"%s\""
-msgstr "Filter Prioritas \"%s\""
-
-#: ../mail/importers/netscape-importer.c:663
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-"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"
-"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"
-"dari pada prioritas. Periksa saringan yang diimpor untuk meyakinkan\n"
-"segalanya tetap bekerja seperti yang diinginkan."
-
-#: ../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 ""
-"Beberapa saringan surat Netscape anda menggunakan\n"
-"fasilitas \"Abaikan Hubungan\" atau \"Perhatikan Hubungan\"\n"
-"yang tidak didukung pada Evolution.\n"
-"Saringan ini telah dibuang."
-
-#: ../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 ""
-"Beberapa saringan surat Netscape anda menguji badan surat\n"
-"terhadapan (in)equality kepada kata yang diberikan,\n"
-"yang mana hal ini tidak didukung pada Evolution. Saringan ini\n"
-"telah dirubah untuk menguji apakah berisi atau tidak berisi badan pesan."
-
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution sedang mengimpor data lama Netscape Anda"
-
-#: ../mail/importers/netscape-importer.c:1708
-msgid "Importing Netscape data"
-msgstr "Mengimpor data Netscape"
-
-#: ../mail/importers/netscape-importer.c:1908
-msgid "Settings"
-msgstr "Setting"
-
-#: ../mail/importers/netscape-importer.c:1913
-msgid "Mail Filters"
-msgstr "Filter Email"
-
-#: ../mail/importers/netscape-importer.c:1934
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution menemukan file-file email Netscape.]nAnda ingin mengimpornya ke "
-"dalam Evolution?"
-
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "Mengimpor data Pine"
 
-#: ../mail/importers/pine-importer.c:433
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
+msgid "Address Book"
+msgstr "Buku Alamat"
+
+#: ../mail/importers/pine-importer.c:418
 msgid "Evolution Pine importer"
 msgstr "Program Impor Pine Evolution"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:419
 msgid "Import mail from Pine."
 msgstr "Impor dari Pine"
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Email ke %s"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:233
+#: ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "Email dari %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "Judulnya %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "milis %s"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "TAmbahkan Aturan Filter"
 
-#: ../mail/mail-component.c:521
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d dihapus"
-
-#: ../mail/mail-component.c:523
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d spam"
-
-#: ../mail/mail-component.c:546
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d rancangan"
-
-#: ../mail/mail-component.c:548
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
 #, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d terkirim"
-
-#: ../mail/mail-component.c:550
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d belum terkirim"
-
-#: ../mail/mail-component.c:554
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d total"
-
-#: ../mail/mail-component.c:556
-#, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] ", %d belum dibaca"
-
-#: ../mail/mail-component.c:819
-msgid "New Mail Message"
-msgstr "Buat Email Baru"
-
-#: ../mail/mail-component.c:820
-msgid "_Mail Message"
-msgstr "E_mail Baru"
-
-#: ../mail/mail-component.c:821
-msgid "Compose a new mail message"
-msgstr "Buat email baru"
-
-#: ../mail/mail-component.c:827
-msgid "New Mail Folder"
-msgstr "Buat Folder Email"
-
-#: ../mail/mail-component.c:828
-msgid "Mail _Folder"
-msgstr "_Folder Email"
-
-#: ../mail/mail-component.c:829
-msgid "Create a new mail folder"
-msgstr "Buat folder email baru"
-
-#: ../mail/mail-component.c:973
-msgid "Failed upgrading Mail settings or folders."
-msgstr "Gagal melakukan upgrade konfigurasi Email dan folder."
-
-#: ../mail/mail-config.c:85
-msgid "I_mportant"
-msgstr "Penti_ng"
-
-#. red
-#: ../mail/mail-config.c:86
-msgid "_Work"
-msgstr "Kerja"
-
-#. orange
-#: ../mail/mail-config.c:87
-msgid "_Personal"
-msgstr "_Pribadi"
-
-#. forest green
-#: ../mail/mail-config.c:88
-msgid "_To Do"
-msgstr "_Tugas"
-
-#. blue
-#: ../mail/mail-config.c:89
-msgid "_Later"
-msgstr "_Nanti"
-
-#: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr " Periksa Jenis-jenis Yang Didukung"
-
-#: ../mail/mail-config.glade.h:3
-msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>SSL tidak dapat digunakan pada versi Evolution</b>"
-
-#: ../mail/mail-config.glade.h:4
-msgid "<b>Sig_natures</b>"
-msgstr "<b>Ta_nda tangan</b>"
-
-#: ../mail/mail-config.glade.h:5
-msgid "<b>_Languages</b>"
-msgstr "<b>_Bahasa</b>"
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
 
-#: ../mail/mail-config.glade.h:6
-msgid "<small>This will make the the filter more reliable, but slower</small>"
+#: ../mail/mail-config.ui.h:1
+msgid "(Note: Requires restart of the application)"
 msgstr ""
-"<small>Ini akan membuat filter lebih baik walaupun kerjanya lambat</small>"
-
-#: ../mail/mail-config.glade.h:7
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">Informasi Account</span>"
-
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr "<span weight=\"bold\">Tipe Otentikasi</span>"
-
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">Otentikasi</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">Penyusunan Email</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">Konfigurasi</span>"
-
-#: ../mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">Perilaku Standar</span>"
-
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">Penghapusan Email</span>"
 
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr "<span weight=\"bold\">_Kolom Dalam Kepala Email Yang Tampil</span>"
-
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr "<span weight=\"bold\">Pilihan Filter</span>"
-
-#: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr "<span weight=\"bold\">Label dan Warna</span>"
-
-#: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">Pembukaan Gambar</span>"
-
-#: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">Tampilan Isi Email</span>"
-
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">Jenis Huruf Pada Email</span>"
-
-#: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">Tanda Terima Email</span>"
-
-#: ../mail/mail-config.glade.h:23
-msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\">Notifikasi Email Baru</span>"
-
-#: ../mail/mail-config.glade.h:24
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">Informasi Tambahan</span>"
-
-#: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">Pilihan</span>"
-
-#: ../mail/mail-config.glade.h:26
-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
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">Jenis Huruf Cetakan</span>"
-
-#: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">Informasi Dasar</span>"
-
-#: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-
-#: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">Keamanan</span>"
-
-#: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">Email Terkirim dan Draf</span>"
-
-#: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">Konfigurasi Server</span>"
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:3
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:34
-msgid "Account Management"
-msgstr "Manajemen Akun"
+#: ../mail/mail-config.ui.h:4
+#, fuzzy
+msgid "Account Information"
+msgstr "Tidak Ada Informasi"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "Buat Tanda tangan _Baru..."
 
-#: ../mail/mail-config.glade.h:36
-msgid "Add _Script"
-msgstr "Tambahkan _Skrip"
-
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
-msgstr ""
-"_Selalu bubuhkan tanda tangan pada email keluar saat menggunakan akun ini"
+msgstr "_Selalu bubuhkan tanda tangan pada email keluar saat menggunakan akun ini"
 
-#: ../mail/mail-config.glade.h:38
-msgid "Also encrypt to sel_f when sending encrypted mail"
-msgstr ""
-"_Juga acak email yang dikirim ke diri sendiri saat mengirim email teracak"
+#: ../mail/mail-config.ui.h:8
+#, fuzzy
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr "_Juga acak email yang dikirim ke diri sendiri saat mengirim email teracak"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Selalu kirim tembusan (cc) ke:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Selalu kirimkan tem_busan bayangan (bcc) ke:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Selalu _percaya kunci pada keyring saat mengacak"
 
-#: ../mail/mail-config.glade.h:42
-msgid "Always encrypt to _myself when sending encrypted mail"
+#: ../mail/mail-config.ui.h:12
+#, fuzzy
+msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Acak juga bila kiri_m ke diri sendiri"
 
-#: ../mail/mail-config.glade.h:43
-msgid "Attach original message"
-msgstr "Lampirkan pesan aslinya"
-
-#: ../mail/mail-config.glade.h:45
-msgid "Automatically insert _smiley images"
-msgstr "Masukkan ikon emo_si secara otomatis"
-
-#: ../mail/mail-config.glade.h:46
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltik (ISO-8859-13)"
+#: ../mail/mail-config.ui.h:13
+#, fuzzy
+msgid "Always request rea_d receipt"
+msgstr "Selalu kirim kembali nota pemberitahuan pembacaan email"
 
-#: ../mail/mail-config.glade.h:47
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltik (ISO-8859-4)"
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
+msgid "Authentication"
+msgstr "Otentikasi"
 
-#: ../mail/mail-config.glade.h:48
-msgid "Beep w_hen new mail arrives"
-msgstr "Bunyikan suara bip saat ada email baru datang"
+#: ../mail/mail-config.ui.h:16
+#, fuzzy
+msgid "Automatically insert _emoticon images"
+msgstr "Masukkan ikon emo_si secara otomatis"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "Gu_gus karakter:"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
-msgstr "P_eriksa Jenis-jenis Yang Didukung "
+#: ../mail/mail-config.ui.h:18
+msgid "Ch_eck for Supported Types"
+msgstr "Lihat Pilihan Yang T_ersedia"
 
-#: ../mail/mail-config.glade.h:51
-msgid "Check in_coming mail for junk"
+#: ../mail/mail-config.ui.h:19
+#, fuzzy
+msgid "Check cu_stom headers for junk"
 msgstr "_Cari spam pada email masuk"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:20
+#, fuzzy
+msgid "Check incoming _messages for junk"
+msgstr "_Cari spam pada email masuk"
+
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "Periksa ejaan saa_t mengetik"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Periksa semua spam pada email-email yang masuk"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "Kosongk_an"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "_Kosongkan"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "Warna kata yang salah eja:"
 
-#: ../mail/mail-config.glade.h:57
-msgid "Colors"
-msgstr "Warna"
+#: ../mail/mail-config.ui.h:26
+#, fuzzy
+msgid "Composing Messages"
+msgstr "Tulis Pesan Baru"
+
+#: ../mail/mail-config.ui.h:27
+#: ../plugins/plugin-manager/plugin-manager.c:146
+#, fuzzy
+msgid "Configuration"
+msgstr "Konfigurasi Mail"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "Konfirmasi _saat menghapus folder"
 
-#: ../mail/mail-config.glade.h:59
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Selamat, konfigurasi email Anda sudah selesai.\n"
-"\n"
-"Sekarang Anda siap untuk mulai mengirim dan menerima email \n"
-"dengan Evolution.\n"
-"\n"
-"Klik tombol \"Terapkan\" untuk menyimpan konfigurasi."
-
-#: ../mail/mail-config.glade.h:65
-msgid "De_fault"
-msgstr "_Standar"
+#: ../mail/mail-config.ui.h:30
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Prioritas Awal:"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "_Gugus karakter utama:"
 
-#: ../mail/mail-config.glade.h:69
-msgid "Digitally _sign outgoing messages (by default)"
+#: ../mail/mail-config.ui.h:33
+#, fuzzy
+msgid "Delete Mail"
+msgstr "Hapus _Semua"
+
+#: ../mail/mail-config.ui.h:34
+msgid "Delete junk messages on e_xit"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:36
+#, fuzzy
+msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Tanda tangani _semua email keluar (standar)"
 
-#: ../mail/mail-config.glade.h:70
-msgid "Do not quote original message"
-msgstr "Jangan kutip pesan aslinya"
+#: ../mail/mail-config.ui.h:37
+#, fuzzy
+msgid "Displayed Message Headers"
+msgstr "Semua Bagian _Kepala Email"
 
-#: ../mail/mail-config.glade.h:71
-msgid "Done"
-msgstr "Selesai"
+#: ../mail/mail-config.ui.h:38
+msgid "Do not display messages when text si_ze exceeds"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:72
-msgid "Drafts _Folder:"
-msgstr "_Folder Draf:"
+#: ../mail/mail-config.ui.h:39
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:73
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "Aktifka_n"
+#: ../mail/mail-config.ui.h:40
+#, fuzzy
+msgid "Do not quote"
+msgstr "Jangan hapus"
 
-#: ../mail/mail-config.glade.h:74
-msgid "Email Accounts"
-msgstr "Akun Email"
+#: ../mail/mail-config.ui.h:41
+msgid "Drafts _Folder:"
+msgstr "_Folder Draf:"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "_Alamat Email:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "Kosongkan tong sampah saat _keluar"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.ui.h:44
+msgid "Enable Magic S_pacebar"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:45
+#, fuzzy
+msgid "Enable Sea_rch Folders"
+msgstr "Cari Folder"
+
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat enkri_psi:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Enkripsi semua email keluar (standar)"
 
-#: ../mail/mail-config.glade.h:80
-msgid "Fi_xed width Font:"
-msgstr "Huruf Lebar-_tetap:"
-
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.ui.h:49
 msgid "Fi_xed-width:"
 msgstr "Lebar-_tetap:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.ui.h:50
+#, fuzzy
+msgid "Fix_ed width Font:"
+msgstr "Huruf Lebar-_tetap:"
+
+#: ../mail/mail-config.ui.h:51
 msgid "Font Properties"
 msgstr "Pengaturan Jenis Huruf"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:52
 msgid "Format messages in _HTML"
 msgstr "Kirim Email dalam bentuk _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "Nama L_engkap:"
 
-#: ../mail/mail-config.glade.h:86
-msgid "HTML Mail"
-msgstr "Email HTML"
+#: ../mail/mail-config.ui.h:55
+#, fuzzy
+msgid "HTML Messages"
+msgstr "Pesan"
+
+#: ../mail/mail-config.ui.h:56
+#, fuzzy
+msgid "H_TTP Proxy:"
+msgstr "Proksi H_TTP:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.ui.h:57
 msgid "Headers"
 msgstr "Kepala Surat"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.ui.h:58
 msgid "Highlight _quotations with"
 msgstr "_Sorot kutipan dengan"
 
-#: ../mail/mail-config.glade.h:89
-msgid "I_nclude remote tests"
-msgstr "Lakuka_n penyaringan dari server"
-
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.ui.h:60
 msgid "Inline"
 msgstr "Biasa"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.ui.h:61
+msgid "Inline (Outlook style)"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:63
+msgid "KB"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:64
+#: ../mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Labels"
+msgstr "Label"
+
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "Tabel Bahasa"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Mail Configuration"
-msgstr "Konfigurasi Mail"
+#: ../mail/mail-config.ui.h:66
+#, fuzzy
+msgid "Loading Images"
+msgstr "Tampi_lkan Gambar"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "Tabel Kepala Email"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "Lokasi kotak surat"
 
-#: ../mail/mail-config.glade.h:100
-msgid "Message Composer"
-msgstr "Penyusun Isi Email"
+#: ../mail/mail-config.ui.h:69
+#, fuzzy
+msgid "Message Display"
+msgstr "Pesan"
 
-#: ../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.ui.h:70
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Pesan berisi"
+
+#: ../mail/mail-config.ui.h:71
+#, fuzzy
+msgid "Message Receipts"
+msgstr "Nota Pembacaan"
+
+#: ../mail/mail-config.ui.h:72
+msgid "No _Proxy for:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:74
+msgid "Note: you will not be prompted for a password until you connect for the first time"
+msgstr "Perhatian: Anda tidak akan ditanya sandi hingga Anda melakukan koneksi untuk pertama kali"
+
+#: ../mail/mail-config.ui.h:75
+msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
-"Perhatian: Anda tidak akan ditanya sandi hingga Anda melakukan koneksi untuk "
-"pertama kali"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.ui.h:76
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+#, fuzzy
+msgid "Optional Information"
+msgstr "Informasi tambahan:"
+
+#: ../mail/mail-config.ui.h:78
 msgid "Or_ganization:"
 msgstr "Or_ganisasi:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.ui.h:79
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Play sound file when new mail arri_ves"
-msgstr "Putar berkas suara saat ada email _datang"
-
-#: ../mail/mail-config.glade.h:107
-msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"Silakan isi nama untuk akun ini.\n"
-" Nama ini hanya untuk tampilan saja."
-
-#: ../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 ""
-"Silakan masukkan metode cara Anda mengirim email. Bila Anda tidak tahu "
-"jawabannya, silakan hubungi bagian IT/administrator atau tempat Anda "
-"berlangganan Internet."
-
-#: ../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 ""
-"Silakan masukkan nama dan alamat email di bawah ini. Pada kolom \"tambahan\" "
-"Anda tidak perlu mengisinya dengan lengkap, kecuali memang bila ingin "
-"memasukkan isinya ke dalam setiap email yang Anda kirim."
+#: ../mail/mail-config.ui.h:80
+#, fuzzy
+msgid "Pass_word:"
+msgstr "_Sandi:"
 
-#: ../mail/mail-config.glade.h:111
-msgid "Please select among the following options"
-msgstr "Pilih dari sekian pilihan"
+#: ../mail/mail-config.ui.h:82
+#, fuzzy
+msgid "Port:"
+msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.ui.h:83
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "K_onfirmasi saat pada email hanya kolom Bcc yang diisi"
 
-#: ../mail/mail-config.glade.h:113
-msgid "Quote original message"
-msgstr "Kutip pesan aslinya"
+#: ../mail/mail-config.ui.h:84
+#, fuzzy
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.ui.h:86
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Cetak kontak"
+
+#: ../mail/mail-config.ui.h:87
+#, fuzzy
+msgid "Proxy Settings"
+msgstr "Setting"
+
+#: ../mail/mail-config.ui.h:88
 msgid "Quoted"
 msgstr "Dikutip"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.ui.h:89
 msgid "Re_member password"
 msgstr "I_ngat sandi"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.ui.h:90
 msgid "Re_ply-To:"
 msgstr "Alamat-_Balasan:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.ui.h:92
 msgid "Remember _password"
 msgstr "Ingat _sandi"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.ui.h:93
+#, fuzzy
+msgid "Required Information"
+msgstr "Informasi server"
+
+#: ../mail/mail-config.ui.h:95
+#, fuzzy
+msgid "SSL is not supported in this build of Evolution"
+msgstr "<b>SSL tidak dapat digunakan pada versi Evolution</b>"
+
+#: ../mail/mail-config.ui.h:96
+#, fuzzy
+msgid "S_earch for sender photograph only in local address books"
+msgstr "Sediakan fungsionalitas inti untuk buku alamat setempat."
+
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "_Pilih..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "Kirim nota p_esan:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "Jenis Huruf S_tandar:"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Se_lect..."
-msgstr "Pi_lih..."
+#: ../mail/mail-config.ui.h:100
+msgid "Secure MIME (S/MIME)"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:102
+#, fuzzy
+msgid "Select Drafts Folder"
+msgstr "Pilih Folder"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "Pilih jenis huruf dengan lebar tetap untuk HTML"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "Pilih jenis huruf dengan lebar tetap untuk pencetakan"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font"
 msgstr "Pilih jenis huruf dengan lebar bebas"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.ui.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "Pilih jenis huruf dengan lebar bebas untuk cetakan"
 
-#: ../mail/mail-config.glade.h:128
-msgid "Select sound file"
-msgstr "Pilih berkas suara"
+#: ../mail/mail-config.ui.h:107
+#, fuzzy
+msgid "Select Sent Folder"
+msgstr "Pilih Folder"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.ui.h:108
+#, fuzzy
+msgid "Sender Photograph"
+msgstr "Pengirim berisi"
+
+#: ../mail/mail-config.ui.h:109
 msgid "Sending Mail"
 msgstr "Pengiriman Email"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "Folder E_mail Terkirim:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.ui.h:111
+#, fuzzy
+msgid "Sent and Draft Messages"
+msgstr "Kirim Pesan"
+
+#: ../mail/mail-config.ui.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Otentikasi harus dilakukan ser_ver"
 
-#: ../mail/mail-config.glade.h:133
-msgid "Server _Type: "
+#: ../mail/mail-config.ui.h:113
+#, fuzzy
+msgid "Server Configuration"
+msgstr "Informasi server"
+
+#: ../mail/mail-config.ui.h:114
+#, fuzzy
+msgid "Server _Type:"
 msgstr "_Tipe Server: "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.ui.h:115
+#, fuzzy
+msgid "Sig_natures"
+msgstr "<b>Ta_nda tangan</b>"
+
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat ta_nda tangan:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "Tanda-_tangan:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "Tanda tangan"
 
-#: ../mail/mail-config.glade.h:137
-msgid "Signatures Table"
-msgstr "Tabel Tanda Tangan"
-
-#: ../mail/mail-config.glade.h:138
-msgid "Specify _filename:"
-msgstr "Tulis nama _berkas:"
-
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "Pemeriksaan Ejaan"
 
-#: ../mail/mail-config.glade.h:140
-msgid "T_ype: "
+#: ../mail/mail-config.ui.h:120
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:122
+#, fuzzy
+msgid "T_ype:"
 msgstr "_Tipe:"
 
-#: ../mail/mail-config.glade.h:141
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Daftar bahasa yang ada di sini adalah bahasa-bahasa yang Anda miliki data "
-"kamusnya."
+#: ../mail/mail-config.ui.h:123
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+msgstr "Daftar bahasa yang ada di sini adalah bahasa-bahasa yang Anda miliki data kamusnya."
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13597,7 +12446,7 @@ msgstr ""
 "Nama yang diberikan akan digunakan untuk keperluan\n"
 "tampilan saja. "
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.ui.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13605,184 +12454,261 @@ msgstr ""
 "Beri nama yang hendak Anda berikan pada account ini.\n"
 "Misalnya: \"Kantor\" atau \"Rumah\""
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.ui.h:129
+#, fuzzy
+msgid "Us_ername:"
+msgstr "Pengg_una:"
+
+#: ../mail/mail-config.ui.h:130
+#, fuzzy
+msgid "Use Authe_ntication"
+msgstr "Otentikasi"
+
+#: ../mail/mail-config.ui.h:131
+#: ../plugins/caldav/caldav-source.c:222
+#: ../plugins/google-account-setup/google-contacts-source.c:283
+#: ../plugins/google-account-setup/google-source.c:620
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "Nama Pe_ngguna:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.ui.h:132
 msgid "V_ariable-width:"
 msgstr "Lebar beb_as:"
 
-#: ../mail/mail-config.glade.h:150
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin. "
-msgstr ""
-"Selamat datang pada Pengatur Konfigurasi Email Evolution/\n"
-"\n"
-"Klik tombol \"Maju\" untuk mulai. "
-
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "T_ambah Tanda tangan"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "Sel_alu buka gambar dari Internet"
 
-#: ../mail/mail-config.glade.h:156
-msgid "_Do not notify me when new mail arrives"
-msgstr "Jangan beritahu apabila a_da email baru datang."
+#: ../mail/mail-config.ui.h:135
+#, fuzzy
+msgid "_Authentication Type"
+msgstr "Jenis Otentikasi"
+
+#: ../mail/mail-config.ui.h:136
+msgid "_Default junk plugin:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:137
+msgid "_Direct connection to the Internet"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.ui.h:138
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Jangan tan_da tangani usulan pertemuan (agar bisa dibaca pada Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "Cara meneru_skan email:"
 
-#: ../mail/mail-config.glade.h:160
-msgid "_Load images in mail from contacts"
+#: ../mail/mail-config.ui.h:140
+msgid "_Keep Signature above the original message on replying"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:141
+#, fuzzy
+msgid "_Languages"
+msgstr "<b>_Bahasa</b>"
+
+#: ../mail/mail-config.ui.h:142
+#, fuzzy
+msgid "_Load images in messages from contacts"
 msgstr "Buka gambar pada emai_l dari kontak"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.ui.h:143
+#, fuzzy
+msgid "_Lookup in local address book only"
+msgstr "Tampilkan folder daftar buku alamat lokal"
+
+#: ../mail/mail-config.ui.h:144
 msgid "_Make this my default account"
 msgstr "Jadikan ini akun uta_ma"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.ui.h:145
+#, fuzzy
+msgid "_Manual proxy configuration:"
+msgstr "Konfigurasi Mail"
+
+#: ../mail/mail-config.ui.h:146
 msgid "_Mark messages as read after"
 msgstr "Tandai pesan _menjadi terbaca setelah"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "Ja_ngan pernah membuka gambar dari Internet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "_Path:"
 
-#: ../mail/mail-config.glade.h:166
-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"
+#: ../mail/mail-config.ui.h:150
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "_Konfirmasi bila mengirim email HTML ke kontak yang tidak bersedia dikirimi"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.ui.h:151
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "K_onfirmasi saat mengirim email dengan isi baris subyek kosong"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.ui.h:152
 msgid "_Reply style:"
 msgstr "Cara mem_balas:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:153
 msgid "_Script:"
 msgstr "_Skrip:"
 
+#: ../mail/mail-config.ui.h:154
+#, fuzzy
+msgid "_Secure HTTP Proxy:"
+msgstr "Proksi HTTP_S:"
+
+#: ../mail/mail-config.ui.h:156
+#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Server:"
+msgstr "_Server:"
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.ui.h:158
 msgid "_Show image animations"
 msgstr "Tampilkan Anima_si gambar"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.ui.h:159
+#, fuzzy
+msgid "_Show the photograph of sender in the message preview"
+msgstr "Tampilkan isi email dalam bentuk aslinya"
+
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:161
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Pendekkan judul To / CC / Bcc ke "
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.ui.h:162
 msgid "_Use Secure Connection:"
 msgstr "G_unakan Koneksi Teracak:"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.ui.h:163
+#, fuzzy
+msgid "_Use system defaults"
+msgstr "Gunakan Stan_dar"
+
+#: ../mail/mail-config.ui.h:164
 msgid "_Use the same fonts as other applications"
 msgstr "G_unakan jenis huruf yang sama dengan aplikasi lain"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.ui.h:165
+#: ../smime/gui/smime-ui.ui.h:48
+#, fuzzy
+msgid "a"
+msgstr "a"
+
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:167
 msgid "addresses"
 msgstr "alamat"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.ui.h:168
+#: ../smime/gui/smime-ui.ui.h:49
+msgid "b"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:169
 msgid "color"
 msgstr "warna"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.ui.h:170
 msgid "description"
 msgstr "deskripsi"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>Asal Saringan Folder</b>"
-
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Tanda Tangan Digital</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Enkripsi</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.ui.h:1
 msgid "All active remote folders"
 msgstr "Semua folder remote aktif"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "Semua lokal dan folder remote aktif"
 
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "Semua folder lokal"
 
-#: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "_Sensitif huruf"
+#: ../mail/mail-dialogs.ui.h:4
+msgid "Call"
+msgstr "Panggil"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "_Selesai"
 
-#: ../mail/mail-dialogs.glade.h:11
-msgid "F_ind:"
-msgstr "Car_i:"
+#: ../mail/mail-dialogs.ui.h:6
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Ubah tanda tangan"
 
-#: ../mail/mail-dialogs.glade.h:12
-msgid "Find in Message"
-msgstr "Cari dalam Email"
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Do Not Forward"
+msgstr "Jangan Teruskan"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
-msgid "Flag to Follow Up"
-msgstr "Tandai untuk Ditindak Lanjuti"
+#: ../mail/mail-dialogs.ui.h:8
+#, fuzzy
+msgid "Encryption"
+msgstr "Enkripsi"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Folder Subscriptions"
 msgstr "Langganan Folder"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.ui.h:10
+msgid "Follow-Up"
+msgstr "Follow-Up"
+
+#: ../mail/mail-dialogs.ui.h:11
+msgid "For Your Information"
+msgstr "Sekedar Informasi"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "Forward"
+msgstr "Teruskan"
+
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Perjanjian Lisensi"
 
-#: ../mail/mail-dialogs.glade.h:16
-msgid "None Selected"
-msgstr "Tidak Ada Yang DIpilih"
+#: ../mail/mail-dialogs.ui.h:14
+msgid "No Response Necessary"
+msgstr "Tidak Perlu Direspon"
+
+#: ../mail/mail-dialogs.ui.h:18
+msgid "Reply to All"
+msgstr "Balas ke Semua"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Review"
+msgstr "Tinjau"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.ui.h:20
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:21
+#, fuzzy
+msgid "Search Folder Sources"
+msgstr "<b>Asal Saringan Folder</b>"
+
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Security Information"
 msgstr "Informasi Keamanan"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Specific folders"
 msgstr "Folder tertentu"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.ui.h:24
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13790,156 +12716,174 @@ msgstr ""
 "Email-email yang dipilih untuk ditindaklanjuti adalah sebagai berikut.\n"
 "Silakan pilih tindakan yang Anda ingin lakukan dari menu \"Tandai\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Accept License"
 msgstr "Terim_a Lisensi"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Due By:"
 msgstr "Tanggal _Berlaku:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Flag:"
 msgstr "_Tandai:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Tick this to accept the license agreement"
 msgstr "Beri tanda centang untuk menerima perjanjian lisensi"
 
-#: ../mail/mail-folder-cache.c:858
+#: ../mail/mail-folder-cache.c:891
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping %s"
 
-#: ../mail/mail-ops.c:105
-msgid "Filtering Folder"
-msgstr "Melakukan Filter Dalam Folder"
+#: ../mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Selected Messages"
+msgstr "Sembunyikan _Email Terpilih"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "Mengambil Email"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:574
 #, 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
-#, c-format
+#: ../mail/mail-ops.c:586
+#: ../mail/mail-ops.c:613
+#, fuzzy, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "Gagal saat menambahkan file ke %s: %s\n"
 "File disimpan ke folder 'Sent' saja."
 
-#: ../mail/mail-ops.c:624
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+#: ../mail/mail-ops.c:630
+#, fuzzy, 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:741
+#: ../mail/mail-ops.c:822
+#, fuzzy
+msgid "Sending message"
+msgstr "Mengirim pesan email ke %d dari total %d pesan."
+
+#: ../mail/mail-ops.c:751
 #, 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:778
 #, 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:648
+#: ../mail/mail-ops.c:780
+#: ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "Dibatalkan."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:782
+#: ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "Selesai."
 
-#: ../mail/mail-ops.c:862
-msgid "Saving message to folder"
+#: ../mail/mail-ops.c:894
+#, fuzzy, c-format
+msgid "Saving message to folder '%s'"
 msgstr "Simpan pesan email ke dalam folder"
 
-#: ../mail/mail-ops.c:947
-#, c-format
-msgid "Moving messages to %s"
+#: ../mail/mail-ops.c:971
+#, fuzzy, c-format
+msgid "Moving messages to '%s'"
 msgstr "Pindahkan pesan email ke %s"
 
-#: ../mail/mail-ops.c:947
-#, c-format
-msgid "Copying messages to %s"
+#: ../mail/mail-ops.c:971
+#, fuzzy, c-format
+msgid "Copying messages to '%s'"
 msgstr "Menyalin pesan email ke %s."
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1080
+#, fuzzy, c-format
+msgid "Scanning folders in '%s'"
+msgstr "Memeriksa folder dalam \"%s\""
+
+#: ../mail/mail-ops.c:1188
 msgid "Forwarded messages"
 msgstr "Pesan email yang diteruskan"
 
-#: ../mail/mail-ops.c:1213
-#, c-format
-msgid "Opening folder %s"
+#: ../mail/mail-ops.c:1229
+#, fuzzy, c-format
+msgid "Opening folder '%s'"
 msgstr "Membuka folder %s"
 
-#: ../mail/mail-ops.c:1285
-#, c-format
-msgid "Opening store %s"
+#: ../mail/mail-ops.c:1295
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder '%s'"
+msgstr "Informasi alamat untuk %s"
+
+#: ../mail/mail-ops.c:1367
+#, fuzzy, c-format
+msgid "Opening store '%s'"
 msgstr "Membuka store %s"
 
-#: ../mail/mail-ops.c:1363
-#, c-format
-msgid "Removing folder %s"
+#: ../mail/mail-ops.c:1438
+#, fuzzy, c-format
+msgid "Removing folder '%s'"
 msgstr "Menghapus folder %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1556
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1619
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Menghapus dan menyimpan account '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1620
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Menyimpan account '%s'"
 
-#: ../mail/mail-ops.c:1578
-msgid "Refreshing folder"
+#: ../mail/mail-ops.c:1674
+#, fuzzy, c-format
+msgid "Refreshing folder '%s'"
 msgstr "Memperbarui tampilan folder"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
-msgid "Expunging folder"
+#: ../mail/mail-ops.c:1714
+#, fuzzy, c-format
+msgid "Expunging folder '%s'"
 msgstr "Hapus folder"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1759
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Mengosongkan tong sampah pada '%s'"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1760
 msgid "Local Folders"
 msgstr "Folder Lokal"
 
-#: ../mail/mail-ops.c:1746
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Mengambil pesan email %s"
-
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1956
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Mengambil %d email"
 
-#: ../mail/mail-ops.c:1942
-#, c-format
+#: ../mail/mail-ops.c:2045
+#, fuzzy, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Menyimpan %d email"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:2126
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13948,11 +12892,12 @@ msgstr ""
 "Error saat menyimpan pesan email ke: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2198
 msgid "Saving attachment"
 msgstr "Simpan lampiran"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2216
+#: ../mail/mail-ops.c:2224
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13961,402 +12906,419 @@ msgstr ""
 "Tidak dapat membuat file output: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2239
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: ../mail/mail-ops.c:2263
-#, c-format
-msgid "Disconnecting from %s"
+#: ../mail/mail-ops.c:2384
+#, fuzzy, c-format
+msgid "Disconnecting from '%s'"
 msgstr "Koneksi putus dari %s"
 
-#: ../mail/mail-ops.c:2263
-#, c-format
-msgid "Reconnecting to %s"
+#: ../mail/mail-ops.c:2384
+#, fuzzy, c-format
+msgid "Reconnecting to '%s'"
 msgstr "Menyambung ulang ke %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2480
+#, fuzzy, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Akun Exchange sedang padam."
+
+#: ../mail/mail-ops.c:2566
 msgid "Checking Service"
 msgstr "Pemeriksaan Layanan"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "Membatalkan..."
 
-#: ../mail/mail-send-recv.c:345
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "Kirim & Ambil Email"
 
-#: ../mail/mail-send-recv.c:352
+#: ../mail/mail-send-recv.c:444
 msgid "Cancel _All"
 msgstr "B_atalkan Semua"
 
-#: ../mail/mail-send-recv.c:449
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "Memperbarui..."
 
-#: ../mail/mail-send-recv.c:449 ../mail/mail-send-recv.c:502
+#: ../mail/mail-send-recv.c:554
+#: ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "Menunggu..."
 
-#: ../mail/mail-send-recv.c:734
+#: ../mail/mail-send-recv.c:874
+#, c-format
 msgid "Checking for new mail"
 msgstr "Periksa email baru"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:217
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Masukkan Sandi untuk %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:219
 msgid "Enter Passphrase"
 msgstr "Masukkan Kata Sandi"
 
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:222
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Masukkan Sandi %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:224
 msgid "Enter Password"
 msgstr "Masukkan Kata Sandi"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:266
 msgid "User canceled operation."
 msgstr "User membatalkan proses"
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Ubah tanda tangan"
-
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Beri judul tanda tangan ini"
+#: ../mail/mail-session.c:660
+msgid "No destination address provided, forward of the message has been cancelled."
+msgstr ""
 
-#: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
-msgid "Name:"
-msgstr "Nama:"
+#: ../mail/mail-session.c:666
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
 
-#: ../mail/mail-tools.c:120
-#, c-format
-msgid "Could not create spool directory `%s': %s"
+#: ../mail/mail-tools.c:119
+#, fuzzy, c-format
+msgid "Could not create spool directory '%s': %s"
 msgstr "Tidak dapat membuat direktori spool '%s': %s"
 
-#: ../mail/mail-tools.c:150
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+#: ../mail/mail-tools.c:149
+#, fuzzy, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Mencoba untuk memindahkan email dari kotak bukan mbox '%s'"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Pesan yang diteruskan - %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "Pesan yang diteruskan"
 
-#: ../mail/mail-tools.c:298
-#, c-format
-msgid "Invalid folder: `%s'"
+#: ../mail/mail-tools.c:297
+#, fuzzy, c-format
+msgid "Invalid folder: '%s'"
 msgstr "Folder error: %s"
 
-#: ../mail/mail-vfolder.c:91
+#: ../mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Membuat Saringan Folder: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:229
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Saringan Folder untuk '%s: %s' diperbarui"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:236
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Memperbarui Saringan Folder untuk '%s'"
 
-#: ../mail/mail-vfolder.c:1023
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:679
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+
+#: ../mail/mail-vfolder.c:1191
 msgid "Edit Search Folder"
 msgstr "Ubah Folder Pencarian"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1296
 msgid "New Search Folder"
 msgstr "Pilih Folder Pencarian"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "\"Check Junk\" Failed"
 msgstr ""
-"Folder dengan nama &quot;{1}&quot; sudah ada. Silakan gunakan nama lain."
 
 #: ../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."
+msgid "\"Report Junk\" Failed"
 msgstr ""
-"Folder tidak-kosong pada &quot;{1}&quot; sudah ada.\n"
-"\n"
-"Anda boleh mengabaikan folder ini, menimpa atau menambahkan isinya, atau "
-"berhenti."
 
-#: ../mail/mail.error.xml.h:5
-msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
 msgstr ""
-"Pemberitahuan terima baca telah diminta untuk &quot;{1}&quot;. Kirim "
-"pemberitahuan penerimaan ke {0}?"
 
-#: ../mail/mail.error.xml.h:6
-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."
+#: ../mail/mail.error.xml.h:4
+#, fuzzy
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "Folder dengan nama &quot;{1}&quot; sudah ada. Silakan gunakan nama lain."
+
+#: ../mail/mail.error.xml.h:5
+#, fuzzy
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "Folder dengan nama &quot;{1}&quot; sudah ada. Silakan gunakan nama lain."
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:6
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
-"Berilah judul pada kolom Subject untuk menggambarkan isi pesan Anda dalam "
-"email ini."
-
-#: ../mail/mail.error.xml.h:8
-msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "Apakah benar Anda ingin menghapus akun dan proksinya ini?"
+"Folder tidak-kosong pada &quot;{1}&quot; sudah ada.\n"
+"\n"
+"Anda boleh mengabaikan folder ini, menimpa atau menambahkan isinya, atau berhenti."
 
 #: ../mail/mail.error.xml.h:9
-msgid "Are you sure you want to delete this account?"
-msgstr "Apakah benar Anda ingin menghapus account ini?"
+#, fuzzy
+msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgstr "Pemberitahuan terima baca telah diminta untuk &quot;{1}&quot;. Kirim pemberitahuan penerimaan ke {0}?"
 
 #: ../mail/mail.error.xml.h:10
-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?"
+#, fuzzy
+msgid "A signature already exists with the name \"{0}\". Please specify a different name."
+msgstr "Tanda tangan dengan nama &quot;{0}&quot; sudah ada. Coba berikan nama yang lain."
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Anda yakin ini membuka {0} pesan pada satu saat?"
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgstr "Berilah judul pada kolom Subject untuk menggambarkan isi pesan Anda dalam email ini."
 
 #: ../mail/mail.error.xml.h:12
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr ""
-"Apakah benar ingin menghapus secara permanen semua email yang sudah ditandai "
-"untuk dihapus pada semua folder?"
+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:13
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr ""
-"Apakah benar ingin menghapus secara permanen semua pesan yang telah dihapus "
-"pada folder &quot;{0}&quot;?"
+msgid "Are you sure you want to delete this account?"
+msgstr "Apakah benar Anda ingin menghapus account ini?"
 
 #: ../mail/mail.error.xml.h:14
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Apakah benar ingin mengirim email dalam bentuk HTML?"
+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:15
-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?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgstr "Apakah benar ingin menghapus secara permanen semua email yang sudah ditandai untuk dihapus pada semua folder?"
 
 #: ../mail/mail.error.xml.h:16
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "Apakah benar ingin mengirim email tanpa judul?"
+#, fuzzy
+msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+msgstr "Apakah benar ingin menghapus secara permanen semua email yang sudah ditandai untuk dihapus pada semua folder?"
 
 #: ../mail/mail.error.xml.h:17
-msgid "Because &quot;{0}&quot;."
-msgstr "Karena &quot;{0}&quot;."
+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:18
+#, fuzzy
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr "Apakah benar ingin mengirim email dengan penerima hanya pada kolom Bcc?"
 
 #: ../mail/mail.error.xml.h:19
-msgid "Because &quot;{2}&quot;."
-msgstr "Karena &quot;{2}&quot;."
+#, fuzzy
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "Apakah benar ingin mengirim email dengan penerima hanya pada kolom Bcc?"
 
 #: ../mail/mail.error.xml.h:20
-msgid "Blank Signature"
-msgstr "Tanda tangan Kosong"
+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:21
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "Tidak dapat menambahkan Folder Pencarian &quot;{0}&quot;"
+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:22
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Tidak dapat menyalin folder &quot;{0}&quot; ke &quot;{1}&quot;."
+msgid "Blank Signature"
+msgstr "Tanda tangan Kosong"
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Tidak dapat membuat folder &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Tidak dapat menambahkan Folder Pencarian &quot;{0}&quot;"
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create temporary save directory."
-msgstr "Tidak dapat membuat direktori penyimpanan sementara."
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Tidak dapat menyalin folder &quot;{0}&quot; ke &quot;{1}&quot;."
 
 #: ../mail/mail.error.xml.h:25
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "TIdak dapat menyimpan direktori simpan, karena &quot;{1}&quot;"
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Tidak dapat membuat folder &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "Tidak dapat menghapus folder &quot;{0}&quot;."
+msgid "Cannot create temporary save directory."
+msgstr "Tidak dapat membuat direktori penyimpanan sementara."
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "TIdak dapat menghapus folder sistem &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "TIdak dapat menyimpan direktori simpan, karena &quot;{1}&quot;"
 
 #: ../mail/mail.error.xml.h:28
-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."
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Tidak dapat menghapus folder &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Tidak dapat memindahkan folder &quot;{0}&quot; ke &quot;{1}&quot;."
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "TIdak dapat menghapus folder sistem &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "Tidak dapat membuka sumber &quot;{1}&quot;"
+#, fuzzy
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Tidak dapat merubah Folder Pencarian &quot;{0}&quot; karena tidak ada."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "Tidak dapat membuka sumber &quot;{2}&quot;."
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Tidak dapat memindahkan folder &quot;{0}&quot; ke &quot;{1}&quot;."
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "Tidak dapat membuka target &quot;{2}&quot;."
+#, fuzzy
+msgid "Cannot open source \"{1}\"."
+msgstr "Tidak dapat membuka sumber &quot;{1}&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 ""
-"Tidak dapat membaca berkas lisensi &quot;{0}&quot;, karena masalah "
-"pemasangan. Anda tidak akan bisa menggunakan penyedia ini sampai anda bisa "
-"menerima lisensinya."
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "Tidak dapat membuka sumber &quot;{2}&quot;."
 
 #: ../mail/mail.error.xml.h:34
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Tidak dapat mengubah nama &quot;{0}&quot; menjadi &quot;{1}&quot;."
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "Tidak dapat membuka target &quot;{2}&quot;."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr ""
-"Tidak dapat mengubah nama atau memindahkan folder sistem &quot;{0}&quot;"
+#, fuzzy
+msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
+msgstr "Tidak dapat membaca berkas lisensi &quot;{0}&quot;, karena masalah pemasangan. Anda tidak akan bisa menggunakan penyedia ini sampai anda bisa menerima lisensinya."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot save changes to account."
-msgstr "Tidak dapat menyimpan perubahan ke dalam account."
+#, fuzzy
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Tidak dapat mengubah nama &quot;{0}&quot; menjadi &quot;{1}&quot;."
 
 #: ../mail/mail.error.xml.h:37
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "Tidak dapat menyimpan ke direktori &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Tidak dapat mengubah nama atau memindahkan folder sistem &quot;{0}&quot;"
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "Tidak dapat menyimpan ke berkas &quot;{0}&quot;."
+msgid "Cannot save changes to account."
+msgstr "Tidak dapat menyimpan perubahan ke dalam account."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "Tidak dapat memasang skrip tanda tangan &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Tidak dapat menyimpan ke direktori &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 ""
-"Silakan periksa apakah sandi telah ditulis dengan benar. Harap diingat "
-"biasanya kata sandi membedakan antara huruf besar dan kecil, periksa apakah "
-"tombol CapsLock menyala atau tidak."
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr "Tidak dapat menyimpan ke berkas &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:41
-msgid "Could not save signature file."
-msgstr "Tidak dapat menyimpan file tanda tangan."
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Tidak dapat memasang skrip tanda tangan &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:42
-msgid "Delete &quot;{0}&quot;?"
-msgstr "Hapus &quot;{0}&quot;?"
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Silakan periksa apakah sandi telah ditulis dengan benar. Harap diingat biasanya kata sandi membedakan antara huruf besar dan kecil, periksa apakah tombol CapsLock menyala atau tidak."
 
 #: ../mail/mail.error.xml.h:43
-msgid "Delete account?"
-msgstr "Hapus account ini?"
+msgid "Could not save signature file."
+msgstr "Tidak dapat menyimpan file tanda tangan."
 
 #: ../mail/mail.error.xml.h:44
-msgid "Discard changes?"
-msgstr "Benar tanpa menyimpan?"
+#, fuzzy
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "Salin email yang dipilih ke folder lain"
 
 #: ../mail/mail.error.xml.h:45
-msgid "Do not delete"
+#, fuzzy
+msgid "Do not d_elete"
 msgstr "Jangan hapus"
 
 #: ../mail/mail.error.xml.h:46
-msgid "Do not disable"
-msgstr "Jangan matikan"
+msgid "Do not delete"
+msgstr "Jangan hapus"
 
 #: ../mail/mail.error.xml.h:47
-msgid "Do you want the operation to be performed in the subfolders?"
-msgstr "Lakukan operasi ini pada subfolder?"
+msgid "Do not disable"
+msgstr "Jangan matikan"
 
 #: ../mail/mail.error.xml.h:48
+msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
+msgstr ""
+
+#: ../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
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "Error saat {0}"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:58
 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:59
 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:60
 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
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-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:61
+#, fuzzy
+msgid "If you delete the folder, all of its contents and its subfolders' contents will be deleted permanently."
+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:62
+#, fuzzy
+msgid "If you delete the folder, all of its contents will be deleted permanently."
+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:63
 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:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14364,382 +13326,358 @@ 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:66
 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
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"Bila Anda keluar, email-email tersebut tidak akan dikirim sampai Evolution "
-"dijalankan lagi."
+#: ../mail/mail.error.xml.h:67
+msgid "If you quit, these messages will not be sent until Evolution is started again."
+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:68
 msgid "Ignore"
 msgstr "Abaikan"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Otentikasi invalid"
 
-#: ../mail/mail.error.xml.h:65
-msgid "Mail filters automatically updated."
-msgstr "Filter email telah secara otomatis diperbarui."
-
-#: ../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."
+#: ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
 msgstr ""
-"Beberapa jenis sistem email akan menambahkan kolom Apparently-To pada kepala "
-"surat yang penerimanya hanya dicantumkan pada kolom Bcc. Apabila kolom "
-"Apparently-To ini ditambahkan pada kepala surat, maka daftar penerima email "
-"justru akan ditampilkan di sana. Untuk menghindarinya, silakan isi paling "
-"tidak satu penerima pada kolom To atau Cc."
-
-#: ../mail/mail.error.xml.h:67
-msgid "Mark all messages as read"
-msgstr "Tandai semua pesa dengan terbaca"
 
-#: ../mail/mail.error.xml.h:68
-msgid "Mark all messages in subfolders as read?"
-msgstr "Tandai semua pesa dalam subfolder dengan terbaca?"
+#: ../mail/mail.error.xml.h:71
+msgid "Mail filters automatically updated."
+msgstr "Filter email telah secara otomatis diperbarui."
 
-#: ../mail/mail.error.xml.h:69
-msgid "Mark as _Read"
-msgstr "Anggap _Dibaca"
+#: ../mail/mail.error.xml.h:72
+msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgstr "Beberapa jenis sistem email akan menambahkan kolom Apparently-To pada kepala surat yang penerimanya hanya dicantumkan pada kolom Bcc. Apabila kolom Apparently-To ini ditambahkan pada kepala surat, maka daftar penerima email justru akan ditampilkan di sana. Untuk menghindarinya, silakan isi paling tidak satu penerima pada kolom To atau Cc."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "Folder hilang."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "Tidak ada sumber yang dipilih."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 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:74
+#: ../mail/mail.error.xml.h:77
 msgid "Please check your account settings and try again."
 msgstr "Coba periksa pengaturan account Anda dan coba lagi."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Please enable the account or send using another account."
 msgstr "Coba aktifkan account atau kirim menggunakan account lain."
 
-#: ../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."
-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:79
+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 "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:77
+#: ../mail/mail.error.xml.h:80
+#, fuzzy
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"{0}"
 msgstr ""
-"Pastikan bahwa orang-orang ini memperbolehkan atau dapat menerima email "
-"dalam bentuk HTML:\n"
+"Pastikan bahwa orang-orang ini memperbolehkan atau dapat menerima email dalam bentuk HTML:\n"
 "{0}Kirim saja?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:82
 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:81
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "Silakan tunggu."
 
-#: ../mail/mail.error.xml.h:82
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:84
+#, fuzzy
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Masalah saat memindah folder surat lama &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:83
-msgid "Querying server"
-msgstr "Menghubungi server"
-
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Mencari server untuk daftar mekanisme autentikasi yang didukung."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "Baca resep yang diminta."
 
-#: ../mail/mail.error.xml.h:86
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+#: ../mail/mail.error.xml.h:87
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Benar ingin menghapus folder &quot;{0}&quot; dan semua isinya?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
+#, fuzzy
+msgid "Really delete folder \"{0}\"?"
+msgstr "Benar ingin menghapus data lama?"
+
+#: ../mail/mail.error.xml.h:89
 msgid "Search Folders automatically updated."
 msgstr "Saringan Folder otomatis diperbarui."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "Nota Pengiriman"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "Tanda tangan Sudah Ada"
 
-#: ../mail/mail.error.xml.h:90
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
-"Keberadaan folder sistem digunakan oleh Evolution untuk dapat bekerja dengan "
-"benar, dan tidak dapat diganti namanya, dipinahkan, ataupun dihapus."
+#: ../mail/mail.error.xml.h:92
+#, fuzzy
+msgid "Synchronize"
+msgstr "Sinkronkan ke iPod"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:93
+#, fuzzy
+msgid "Synchronize folders locally for offline usage?"
+msgstr "Kalender tidak ditandai untuk penggunaan offline."
+
+#: ../mail/mail.error.xml.h:94
+msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
+msgstr "Keberadaan folder sistem digunakan oleh Evolution untuk dapat bekerja dengan benar, dan tidak dapat diganti namanya, dipinahkan, ataupun dihapus."
+
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
-"Daftar kontak yang dikirim ini diatur untuk menyembunyikan daftar "
-"penerimanya.\n"
+"Daftar kontak yang dikirim ini diatur untuk menyembunyikan daftar penerimanya.\n"
 "\n"
-"Beberapa jenis sistem email akan menambahkan kolom Apparently-To pada kepala "
-"surat yang penerimanya hanya dicantumkan pada kolom Bcc. Apabila kolom "
-"Apparently-To ini ditambahkan pada kepala surat, maka daftar penerima email "
-"justru akan ditampilkan di sana. Untuk menghindarinya, silakan isi paling "
-"tidak satu penerima pada kolom To atau Cc."
+"Beberapa jenis sistem email akan menambahkan kolom Apparently-To pada kepala surat yang penerimanya hanya dicantumkan pada kolom Bcc. Apabila kolom Apparently-To ini ditambahkan pada kepala surat, maka daftar penerima email justru akan ditampilkan di sana. Untuk menghindarinya, silakan isi paling tidak satu penerima pada kolom To atau Cc."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:98
 msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
-"And have been updated."
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
 msgstr ""
-"Saringan Folder berikut ini:\n"
-"{0}\n"
-"menggunakan folder-folder yang telah dihapus:\n"
-"....\"{1}\"\n"
-"Dan telah diperbarui."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:100
 msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
-"And have been updated."
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
 msgstr ""
-"Aturan saringan berikut ini:\n"
-"{0}\n"
-"menggunakan folder-folder yang telah dihapus:\n"
-"....\"{1}\"\n"
-"Dan telah diperbarui."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "File skrip harus ada dan harus dapat dijalankan."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
-msgstr ""
-"Folder ini sepertinya telah ditambahkan secara implisit, tapi silakan buka "
-"pengatur saringan folder untuk menambahkannya secara eksplisit bila perlu."
+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:107
-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."
+#: ../mail/mail.error.xml.h:105
+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."
 
-#: ../mail/mail.error.xml.h:108
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+#: ../mail/mail.error.xml.h:106
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Pesan ini tidak dapat dikirim karena Anda belum menentukan penerimanya"
 
-#: ../mail/mail.error.xml.h:109
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Server ini tidak dapat menggunakan jenis otentikasi ini dan bahkan tidak "
-"menggunakan otentikasi sama sekali."
+#: ../mail/mail.error.xml.h:107
+msgid "This server does not support this type of authentication and may not support authentication at all."
+msgstr "Server ini tidak dapat menggunakan jenis otentikasi ini dan bahkan tidak menggunakan otentikasi sama sekali."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:108
 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:111
-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."
+#: ../mail/mail.error.xml.h:109
+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."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "Tidak dapat tersambung ke server GroupWise."
 
-#: ../mail/mail.error.xml.h:113
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Tidak dapat membuka folder draf untuk account ini. Gunakan folder draf "
-"sistem saja?"
+#: ../mail/mail.error.xml.h:111
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+msgstr "Tidak dapat membuka folder draf untuk account ini. Gunakan folder draf sistem saja?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "Berkas lisensi tidak dapat dibuka."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "Gunakan Stan_dar"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "Gunakan folder draf utama?"
 
+#: ../mail/mail.error.xml.h:115
+msgid ""
+"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
+"Do you really want to do this?"
+msgstr ""
+
 #: ../mail/mail.error.xml.h:117
+#, fuzzy
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "Gagal menentukan hak akses folder untuk delegasi."
+
+#: ../mail/mail.error.xml.h:118
 msgid "You have not filled in all of the required information."
 msgstr "Anda belum mengisi semua informasi yang dibutuhkan."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:119
 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:119
+#: ../mail/mail.error.xml.h:120
 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:120
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "Saringan Folder ini harus diberi nama."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "Anda harus memilih folder dulu."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:123
 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 ""
 "Anda harus memilih paling tidak satu buah folder sebagai sumber.\n"
 "Caranya, pilih folder dan/atau pilih semua folder lokal, atau pilih semua \n"
 "folder pada server atau keduanya."
 
-#: ../mail/mail.error.xml.h:124
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+#: ../mail/mail.error.xml.h:125
+#, fuzzy
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Login ke server &quot;{0}&quot; sebagai &quot;{0}&quot; gagal."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "T_ambahkan"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "_Abaikan"
 
-#: ../mail/mail.error.xml.h:127
-msgid "_Do not Mark as Read"
-msgstr "Jangan anggap Sudah _Dibaca"
+#: ../mail/mail.error.xml.h:128
+#, fuzzy
+msgid "_Do not Synchronize"
+msgstr "_Jangan Kembalikan"
 
 #: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:821
+msgid "_Empty Trash"
+msgstr "_Kosongkan Tong Sampah"
+
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "_Hapus"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "B_uka Pesan Email"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1110
 msgid "Unseen"
 msgstr "Belum dilihat"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1111
 msgid "Seen"
 msgstr "Sudah dilihat"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1112
 msgid "Answered"
 msgstr "Sudah dijawab"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1113
+#, fuzzy
+msgid "Forwarded"
+msgstr "Teruskan"
+
+#: ../mail/message-list.c:1114
 msgid "Multiple Unseen Messages"
 msgstr "Pesan Belum Dilihat Ganda"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1115
 msgid "Multiple Messages"
 msgstr "Pesan Ganda"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1119
 msgid "Lowest"
 msgstr "Paling Rendah"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1120
 msgid "Lower"
 msgstr "Bawah"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1124
 msgid "Higher"
 msgstr "Lebih Tinggi"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1125
 msgid "Highest"
 msgstr "Paling Tinggi"
 
-#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1735
+#: ../widgets/table/e-cell-date.c:46
 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
-#: ../widgets/table/e-cell-date.c:72
+#: ../mail/message-list.c:1742
+#: ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Hari ini %l:%M %p"
 
-#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1751
 msgid "Yesterday %l:%M %p"
 msgstr "Kemarin %l:%M %p"
 
-#: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1763
 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:1771
 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:1773
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
-msgid "Messages"
-msgstr "Pesan"
+#: ../mail/message-list.c:2518
+msgid "Select all visible messages"
+msgstr "Pilih semua pesan yang dapat Anda lihat sekarang"
 
-#: ../mail/message-list.c:3629
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:4199
+#: ../mail/message-list.c:4595
 msgid "Generating message list"
 msgstr "Buat daftar email"
 
+#: ../mail/message-list.c:4432
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4434
+#, fuzzy
+msgid "There are no messages in this folder."
+msgstr ""
+"\n"
+"\n"
+"Tidak ada isian yang dapat ditampilkan."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Tiba Saatnya Pada"
@@ -14756,1972 +13694,4154 @@ msgstr "Ada flag"
 msgid "Follow Up Flag"
 msgstr "Tanda Untuk Ditindaklanjuti"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "Diterima"
 
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
 msgstr "Kirim Pesan"
 
-#: ../mail/message-list.etspec.h:15
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../mail/message-list.etspec.h:16
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "Ukuran"
 
-#: ../mail/message-tag-followup.c:75
-msgid "Call"
-msgstr "Panggil"
-
-#: ../mail/message-tag-followup.c:76
-msgid "Do Not Forward"
-msgstr "Jangan Teruskan"
-
-#: ../mail/message-tag-followup.c:77
-msgid "Follow-Up"
-msgstr "Follow-Up"
-
-#: ../mail/message-tag-followup.c:78
-msgid "For Your Information"
-msgstr "Sekedar Informasi"
-
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
-msgid "Forward"
-msgstr "Teruskan"
-
-#: ../mail/message-tag-followup.c:80
-msgid "No Response Necessary"
-msgstr "Tidak Perlu Direspon"
-
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
-msgid "Reply"
-msgstr "Balas"
-
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
-msgid "Reply to All"
-msgstr "Balas ke Semua"
-
-#: ../mail/message-tag-followup.c:84
-msgid "Review"
-msgstr "Tinjau"
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "Ulir pada Judul"
 
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Body contains"
 msgstr "Badan pesan berisi"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Message contains"
 msgstr "Pesan berisi"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Recipients contain"
 msgstr "Penerima berisi"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Sender contains"
 msgstr "Pengirim berisi"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Subject contains"
 msgstr "Judul berisi"
 
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Sender contains"
+#, fuzzy
+msgid "Subject or Addresses contains"
 msgstr "Judul atau Pengirim berisi"
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "Buku Alamat Lokal"
+#: ../modules/addressbook/addressbook-config.c:206
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
+msgstr "Memilih ini berarti Evolution hanya akan terhubung ke server LDAP bila server tersebut mendukung SSL."
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "Sediakan fungsionalitas inti untuk buku alamat setempat."
+#: ../modules/addressbook/addressbook-config.c:208
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
+msgstr "Memilih ini berarti Evolution hanya akan terhubung ke server LDAP bila server tersebut mendukung TLS."
 
-#: ../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 ""
-"Plugin pembentuk yang menampilkan langsung lampiran audio dan dapat langsung "
-"diputar."
+#: ../modules/addressbook/addressbook-config.c:210
+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 "Pilihan ini berarti server Anda tidak mendukung penggunaan SSL atau TLS. Artinya koneksi Anda akan tidak aman, dan anda akan rentan terhadap celah keamanan."
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "Plugin audio"
+#: ../modules/addressbook/addressbook-config.c:602
+#, fuzzy
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "Ulang Tahun dan Peringatan"
 
-#: ../plugins/backup-restore/backup-restore.c:51
-msgid "Select name of Evolution archive"
-msgstr "Pilih nama arsip data Evolution"
+#: ../modules/addressbook/addressbook-config.c:638
+#, fuzzy
+msgid "Copy _book content locally for offline operation"
+msgstr "Salin isi folder ke sistem lokal agar dapat dikerjakan tanpa tersambung ke jaringan"
 
-#: ../plugins/backup-restore/backup-restore.c:61
-msgid "_Restart Evolution after backup"
-msgstr "_Jalankan ulang Evolution setelah melakukan backup"
+#: ../modules/addressbook/addressbook-config.c:746
+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 "Ini adalah nomor port server LDAP yang akan dihubungi. Daftar port standar sudah disediakan. Silakan hubungi bagian IT/administrator untuk memilih nomor port ini."
 
-#: ../plugins/backup-restore/backup-restore.c:89
-msgid "Select Evolution archive to restore"
-msgstr "Pilih data yang hendak disimpan ulang"
+#: ../modules/addressbook/addressbook-config.c:820
+#, fuzzy
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
+msgstr "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."
 
-#: ../plugins/backup-restore/backup-restore.c:97
-msgid "_Restart Evolution after restore"
-msgstr ""
-"Ja_lankan ulang Evolution setelah selesai menyimpan ulang data simpanan"
+#: ../modules/addressbook/addressbook-config.c:895
+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 "Lingkup pencarian adalah seberapa dalam proses pencarian akan dilakukan dalam pohon direktori. Lingkup pencarian jenis \"sub\" akan mencari semua data di bawah basis pencarian. Lingkup pencarian jenis \"satu\" hanya akan mencari satu tingkat di bawah basis pencarian saja."
 
-#: ../plugins/backup-restore/backup.c:109
-msgid "Backup Evolution directory"
-msgstr "Simpan dan selamatkan direktori Evolution"
+#: ../modules/addressbook/addressbook-config.c:1011
+msgid "Server Information"
+msgstr "Informasi server"
 
-#: ../plugins/backup-restore/backup.c:111
-msgid "Restore Evolution directory"
-msgstr "Kembalikan isi direktori Evolution dari berkas simpanan"
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Details"
+msgstr "Rincian"
 
-#: ../plugins/backup-restore/backup.c:113
-msgid "Check Evolution archive"
-msgstr "Periksa arsip Evolution"
+#: ../modules/addressbook/addressbook-config.c:1017
+#: ../modules/mail/e-mail-shell-view.c:54
+msgid "Searching"
+msgstr "Mencari"
 
-#: ../plugins/backup-restore/backup.c:115
-msgid "Restart Evolution"
-msgstr "Jalankan ulang Evolution"
+#: ../modules/addressbook/addressbook-config.c:1019
+msgid "Downloading"
+msgstr "Mengunduh"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "Plugin untuk backup dan pengembalian setingan dan data Evolutio."
+#: ../modules/addressbook/addressbook-config.c:1225
+msgid "Address Book Properties"
+msgstr "Pengaturan Buku Alamat"
 
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "Simpan dan kembalikan plugin"
+#: ../modules/addressbook/addressbook-config.c:1227
+msgid "New Address Book"
+msgstr "Buku Alamat Baru"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup Settings..."
-msgstr "Simpan Pengaturan..."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "Panjang pelengkapan otomatis"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-msgid "Backup and restore Evolution data and settings"
-msgstr "Simpan dan kembalikan simpanan data dan pengaturan Evolution"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+#, fuzzy
+msgid "Contact layout style"
+msgstr "Tes Cetak Kontak"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "Restore Settings..."
-msgstr "Kembalikan Pengaturan..."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:443 ../plugins/bbdb/bbdb.c:452
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-msgid "Automatic Contacts"
-msgstr "Kontak Otomatis"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+#, fuzzy
+msgid "Contact preview pane position (vertical)"
+msgstr "Tampilan bulan posisi panel tegak"
 
-#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:467
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
-msgstr "Bu_at isian dalam buku alamat saat membalas email secara otomatis"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "Xml EFolderList untuk daftar pelengkapan URI"
 
-#: ../plugins/bbdb/bbdb.c:473
-msgid "Select Address book for Automatic Contacts"
-msgstr "Pilih buku Alamat untuk Kontak Otomatis"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "Xml EFolderList untuk daftar pelengkapan URI"
 
-#: ../plugins/bbdb/bbdb.c:488
-msgid "Instant Messaging Contacts"
-msgstr "Alamat Pesan Instant"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
 
-#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:503
-msgid ""
-"Periodically synchronize contact information and images from gaim buddy list"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
 msgstr ""
-"Lakukan sinkronisasi informasi kontak dan foto dengan daftar teman program "
-"gaim secara teratur."
 
-#: ../plugins/bbdb/bbdb.c:509
-msgid "Select Address book for Gaim buddy list"
-msgstr "Pilih Buku Alamat untuk daftar kawan Gaim"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr ""
 
-#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:520
-msgid "Synchronize with _buddy list now"
-msgstr "Lakukan sinkronisasi dengan _daftar teman sekarang"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show preview pane"
+msgstr "Tampilkan panel pratinjau"
 
-#: ../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."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid "The layout style determines where to place the preview pane in relation to the contact list. \"0\" (Classic View) places the preview pane below the contact list. \"1\" (Vertical View) places the preview pane next to the contact list."
 msgstr ""
-"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"
-msgstr "BBDB"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+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."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
-msgid "CalDAV"
-msgstr "CallDAV"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "URI for the folder last used in the select names dialog"
+msgstr "URI folder yang terakhir digunakan dalam dialog pemilih nama"
 
-#: ../plugins/caldav/caldav-source.c:269
-msgid "Use _SSL"
-msgstr "Gunakan _SSL"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "URI for the folder last used in the select names dialog."
+msgstr "URI untuk folder yang terakhir digunakan dalam dialog pemilih nama."
 
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Kalender Lokal"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
+msgstr ""
 
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "Sediakan fungsionalitas ini untuk kalender setempat."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Whether to show the preview pane."
+msgstr "Apakah menampilkan panel pracetak."
 
-#: ../plugins/calendar-http/calendar-http.c:339
-msgid "_Secure connection"
-msgstr "_Sambungan aman"
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
+#: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/mail/em-mailer-prefs.c:1158
+#, fuzzy
+msgid "_Table column:"
+msgstr "Model tabel"
 
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "Kalender HTTP"
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "Auto komplet"
 
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "Sediakan fungsionalitas inti untuk kalender webcal dan http."
+#: ../modules/addressbook/autocompletion-config.c:165
+msgid "Always _show address of the autocompleted contact"
+msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "Cuaca: Mendung"
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:190
+#: ../modules/addressbook/e-book-shell-migrate.c:144
+msgid "On LDAP Servers"
+msgstr "Pada Server LDAP"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
-msgid "Weather: Fog"
-msgstr "Cuaca: Berkabut"
+#: ../modules/addressbook/e-book-shell-backend.c:340
+#, fuzzy
+msgctxt "New"
+msgid "_Contact"
+msgstr "_Kontak"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "Cuaca: Berawan Sebagian"
+#: ../modules/addressbook/e-book-shell-backend.c:342
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
+msgid "Create a new contact"
+msgstr "Buat kontak baru"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "Cuaca: Hujan"
+#: ../modules/addressbook/e-book-shell-backend.c:347
+#, fuzzy
+msgctxt "New"
+msgid "Contact _List"
+msgstr "_Daftar Kontak"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
-msgid "Weather: Snow"
-msgstr "Cuaca: Bersalju"
+#: ../modules/addressbook/e-book-shell-backend.c:349
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
+msgid "Create a new contact list"
+msgstr "Buat daftar kontak baru"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
-msgid "Weather: Sunny"
-msgstr "Cuaca: Cerah"
+#: ../modules/addressbook/e-book-shell-backend.c:357
+#, fuzzy
+msgctxt "New"
+msgid "Address _Book"
+msgstr "_Buku Alamat"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
-msgid "Weather: Thunderstorms"
-msgstr "Cuaca: Badai"
+#: ../modules/addressbook/e-book-shell-backend.c:359
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
+msgid "Create a new address book"
+msgstr "Buat buku alamat baru"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
-msgid "Select a location"
-msgstr "Pilih lokasi"
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:376
+#: ../modules/addressbook/e-book-shell-view.c:394
+#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../modules/calendar/e-cal-shell-migrate.c:57
+msgid "Contacts"
+msgstr "Alamat"
 
-#: ../plugins/calendar-weather/calendar-weather.c:654
-msgid "_Units:"
-msgstr "_Unit:"
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
+#, fuzzy
+msgid "Save as vCard"
+msgstr "Simpan sebagai Vcard..."
 
-#: ../plugins/calendar-weather/calendar-weather.c:661
-msgid "Metric (Celsius, cm, etc)"
-msgstr "Satuan metrik (Celcius, cm, dsb)"
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
+msgid "Co_py All Contacts To..."
+msgstr "Sa_lin Seluruh Alamat Ke..."
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
-msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr "Satuan imperial (Fahrenheit, inci, dsb)"
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
+#, fuzzy
+msgid "Copy the contacts of the selected address book to another"
+msgstr "Salin alamat folder terpilih ke folder lain"
 
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "Sediakan fungsionalitas inti untuk cuaca setempat."
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#, fuzzy
+msgid "D_elete Address Book"
+msgstr "Hap_us Buku Alamat"
 
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
-msgid "Weather Calendars"
-msgstr "Kalender Cuaca"
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
+#, fuzzy
+msgid "Delete the selected address book"
+msgstr "Hapus folder terpilih"
 
-#: ../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 ""
-"Plugin coba yang menunjukkan plugin menu popup yang memudahkan anda untuk "
-"menyalin sesuatu ke papan tempel."
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
+msgid "Mo_ve All Contacts To..."
+msgstr "Pin_dahkan Seluruh Alamat Ke..."
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "Alat penyalin"
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#, fuzzy
+msgid "Move the contacts of the selected address book to another"
+msgstr "Pindahkan alamat folder terpilih ini ke folder lain"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Memeriksa apakah Evolution adalah program email utama"
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
+msgid "_New Address Book"
+msgstr "_Buku Alamat Baru"
 
-#: ../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 ""
-"Setiap saat Evolution mulai, periksa apakah dia merupakan penyurat default."
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
+msgid "Address _Book Properties"
+msgstr "Pengaturan _Buku Alamat"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
-"Memeriksa pada saat mulai dijalankan apakah Evolution adalah program email "
-"utama."
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#, fuzzy
+msgid "Show properties of the selected address book"
+msgstr "Ganti pengaturan dari folder terpilih"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
-msgstr "Pemakai Surat Awal "
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/mail/e-mail-shell-view-actions.c:905
+msgid "_Rename..."
+msgstr "_Ganti nama..."
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "Jadikan Evolution sebagai program email utama?"
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#, fuzzy
+msgid "Rename the selected address book"
+msgstr "Ganti nama folder terpilih"
 
-#: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
-msgid "Mark as _default folder"
-msgstr "Tandai sebagai fol_der awal"
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#, fuzzy
+msgid "S_ave Address Book as vCard"
+msgstr "Simp_an Buku Sebagai VCard"
 
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
-msgid "Default Sources"
-msgstr "Sumber Awal"
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#, fuzzy
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Simpan alamat folder terpilih dalam bentuk VCard"
 
-#: ../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 ""
-"Sediakan fungsionalitas untuk menandai kalender ataupun buku alamat sebagai "
-"yang awal."
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
+#, fuzzy
+msgid "Stop loading"
+msgstr "Hentikan Pembukaan"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#, fuzzy
+msgid "_Copy Contact To..."
+msgstr "Salin kontak ke"
 
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Buka Folder Pengguna Lainnya"
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
+#, fuzzy
+msgid "Copy selected contacts to another address book"
+msgstr "Kirim kontak yang sudah dipilih kepada orang lain."
 
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Akun:"
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
+msgid "_Delete Contact"
+msgstr "_Hapus Kontak"
 
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Nama _Folder:"
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#, fuzzy
+msgid "_Find in Contact..."
+msgstr "_Kirimkan Info Kontak..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#, fuzzy
+msgid "Search for text in the displayed contact"
+msgstr "Cari pada badan teks email yang sedang dibuka"
 
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-msgid "_User:"
-msgstr "P_emakai:"
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
+msgid "_Forward Contact..."
+msgstr "_Kirimkan Info Kontak..."
 
-#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
-msgid "Secure Password"
-msgstr "Sandi Teracak"
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#, fuzzy
+msgid "Send selected contacts to another person"
+msgstr "Kirim kontak yang sudah dipilih kepada orang lain."
 
-#. 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 ""
-"Pilihan ini akan membuat Anda tersambung ke server menggunakan otentikasi "
-"sandi teracak (NTLM)"
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#, fuzzy
+msgid "_Move Contact To..."
+msgstr "Pindahkan kontak ke"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "Plaintext Password"
-msgstr "Sandi Teks Biasa"
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#, fuzzy
+msgid "Move selected contacts to another address book"
+msgstr "Kirim kontak yang sudah dipilih kepada orang lain."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
+msgid "_New Contact..."
+msgstr "Alamat _Baru..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
+msgid "New Contact _List..."
+msgstr "Daftar Alamat _Baru..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#, fuzzy
+msgid "_Open Contact"
+msgstr "_Kontak"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
+msgid "View the current contact"
+msgstr "Lihat kontak saat ini"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
+msgid "_Send Message to Contact..."
+msgstr "Kirim Pe_san Email kepada Kontak Ini..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#, fuzzy
+msgid "Send a message to the selected contacts"
+msgstr "Kirim pesan email ke kontak-kontak yang sudah dipilih."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:793
+msgid "_Actions"
+msgstr "Tind_akan"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
+msgid "_Preview"
+msgstr "_Preview"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-task-shell-view-actions.c:813
+msgid "_Delete"
+msgstr "_Hapus"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
+msgid "_Properties"
+msgstr "_Informasi"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#, fuzzy
+msgid "_Save as vCard..."
+msgstr "Simpan sebagai Vcard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
+msgid "Contact _Preview"
+msgstr "_Pracetak Alamat"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
+msgid "Show contact preview window"
+msgstr "Tampilkan jendela contoh kontak"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
+msgid "_Classic View"
+msgstr "Tampilan _Klasik"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
+#, fuzzy
+msgid "Show contact preview below the contact list"
+msgstr "Tampilkan preview pesan di bawah daftar pesan"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
+msgid "_Vertical View"
+msgstr "Tampilan _Tegak"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
+#, fuzzy
+msgid "Show contact preview alongside the contact list"
+msgstr "Tampilkan jendela contoh kontak"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:906
+msgid "Any Category"
+msgstr "Kategori Apa Saja"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
+#: ../modules/calendar/e-memo-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:941
+msgid "Unmatched"
+msgstr "Tidak cocok"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../shell/e-shell-content.c:441
+msgid "Advanced Search"
+msgstr "Pencarian Detil"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#, fuzzy
+msgid "Print all shown contacts"
+msgstr "Cetak kontak"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#, fuzzy
+msgid "Preview the contacts to be printed"
+msgstr "Lihat contoh hasil jadi kontak yang akan dicetak"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
+msgid "Print selected contacts"
+msgstr "Cetak kontak yang sudah dipilih"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#, fuzzy
+msgid "Save selected contacts as a vCard"
+msgstr "Simpan kontak-kontak yang sudah dipilih dalam bentuk VCard."
+
+#: ../modules/addressbook/e-book-shell-view.c:338
+msgid "_Forward Contacts"
+msgstr "_Meneruskan Alamat"
+
+#: ../modules/addressbook/e-book-shell-view.c:340
+msgid "_Forward Contact"
+msgstr "_Meneruskan Alamat"
+
+#: ../modules/addressbook/e-book-shell-view.c:371
+#, fuzzy
+msgid "_Send Message to Contacts"
+msgstr "Kirim Pesan ke Ala_mat"
+
+#: ../modules/addressbook/e-book-shell-view.c:373
+#, fuzzy
+msgid "_Send Message to List"
+msgstr "Kiri_m Pesan ke Daftar"
+
+#: ../modules/addressbook/e-book-shell-view.c:375
+#, fuzzy
+msgid "_Send Message to Contact"
+msgstr "Kirim Pesan ke Ala_mat"
+
+#: ../modules/addressbook/eab-composer-util.c:137
+#, fuzzy
+msgid "Multiple vCards"
+msgstr "VCard Ganda"
+
+#: ../modules/addressbook/eab-composer-util.c:145
+#, fuzzy, c-format
+msgid "vCard for %s"
+msgstr "VCard untuk %s"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
+#, c-format
+msgid "Contact information"
+msgstr "Informasi alamat"
+
+#: ../modules/addressbook/eab-composer-util.c:186
+#, c-format
+msgid "Contact information for %s"
+msgstr "Informasi alamat untuk %s"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
+msgid "1"
+msgstr "1"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:4
+msgid "5"
+msgstr "5:"
+
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "Anonymously"
+msgstr "Anonim"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:7
+msgid "B_rowse this book until limit reached"
 msgstr ""
-"Pilihan ini akan membuat Anda tersambung ke server  dengan menggunakan sandi "
-"teks biasa."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
-msgid "Out Of Office"
-msgstr "Keluar Kantor"
+#: ../modules/addressbook/ldap-config.ui.h:8
+msgid "Lo_gin:"
+msgstr "Lo_gin:"
 
-#: ../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 ""
-"Email ini akan dikirimkan kepada semua orang yang mengirimi email kepada "
-"Anda\n"
-"pada saat Anda berada di luar kantor."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
-msgid "I am out of the office"
-msgstr "Saya sekarang ada di luar kantor"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
-msgid "I am in the office"
-msgstr "Saya sekarang ada di kantor"
-
-#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
-msgid "Change the password for Exchange account"
-msgstr "Ubah sandi Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-msgid "Change Password"
-msgstr "Ganti Kata Sandi"
-
-#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
-msgid "Manage the delegate settings for Exchange account"
-msgstr "Atur pendelegasian akun Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
-msgid "Delegation Assitant"
-msgstr "Program Bantu Delegasi"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
-msgid "Miscelleneous"
-msgstr "Lainnya"
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:11
+msgid "One"
+msgstr "Satu"
 
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
-msgid "View the size of all Exchange folders"
-msgstr "Lihat ukuran semua folder Exchange"
+#: ../modules/addressbook/ldap-config.ui.h:13
+msgid "Search Filter"
+msgstr "Saringan Pencarian"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
-msgid "Folders Size"
-msgstr "Ukuran Folder"
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Search _base:"
+msgstr "_Basis pencarian:"
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Search _filter:"
+msgstr "Saringan _pencarian:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-msgid "Exchange Settings"
-msgstr "Pengaturan Exchange"
+#: ../modules/addressbook/ldap-config.ui.h:16
+#, fuzzy
+msgid "Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type \"person\"."
+msgstr "Cari saring adalah jenis pencarian objek, ketika menjalankan pencarian.Jika hal ini tidak dimodifikasi, oleh  pencarian default akan dilaksanakan padaobjectclass dari jenis \"orang\"."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
-msgid "_OWA URL:"
-msgstr "URL _OWA:"
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:18
+msgid "Sub"
+msgstr "Sub"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
-msgid "A_uthenticate"
-msgstr "_Otentikasi"
+#: ../modules/addressbook/ldap-config.ui.h:19
+msgid "Supported Search Bases"
+msgstr "Basis Pencarian Yang Didukung"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
-msgid "Authentication Type"
-msgstr "Jenis Otentikasi"
+#: ../modules/addressbook/ldap-config.ui.h:21
+msgid "Using distinguished name (DN)"
+msgstr "Gunakan distinguished name (DN)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
-msgid "Ch_eck for Supported Types"
-msgstr "Lihat Pilihan Yang T_ersedia"
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Using email address"
+msgstr "Gunakan alamat email"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "_Download limit:"
+msgstr "Batasan _Download:"
+
+#: ../modules/addressbook/ldap-config.ui.h:24
+msgid "_Find Possible Search Bases"
+msgstr "_Cari Basis Pencarian Yang Mungkin"
+
+#: ../modules/addressbook/ldap-config.ui.h:25
+msgid "_Login method:"
+msgstr "Metoda _login:"
+
+#: ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../modules/addressbook/ldap-config.ui.h:28
+msgid "_Search scope:"
+msgstr "Lingku_p pencarian:"
+
+#: ../modules/addressbook/ldap-config.ui.h:30
+msgid "_Timeout:"
+msgstr "Waktu _timeout:"
+
+#: ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
+msgstr "G_unakan koneksi yang aman:"
+
+#: ../modules/addressbook/ldap-config.ui.h:32
+msgid "cards"
+msgstr "kartu"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+#, fuzzy
+msgid "I_mport"
+msgstr "I_mpor..."
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+#, fuzzy
+msgid "Select a Calendar"
+msgstr "Pilih Kalender"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:368
+#, fuzzy
+msgid "Select a Task List"
+msgstr "Pilih Daftar Tugas"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+#, fuzzy
+msgid "I_mport to Calendar"
+msgstr "_Import ke Kalender"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+#, fuzzy
+msgid "I_mport to Tasks"
+msgstr "_Import ke Tugas"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:125
+#: ../modules/calendar/e-cal-shell-migrate.c:176
+#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-task-shell-backend.c:113
+#: ../modules/calendar/e-task-shell-migrate.c:143
+msgid "On The Web"
+msgstr "Web"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../plugins/calendar-weather/calendar-weather.c:117
+msgid "Weather"
+msgstr "Cuaca"
+
+#: ../modules/calendar/e-cal-shell-backend.c:242
+#: ../modules/calendar/e-cal-shell-migrate.c:60
+msgid "Birthdays & Anniversaries"
+msgstr "Ulang Tahun dan Peringatan"
+
+#: ../modules/calendar/e-cal-shell-backend.c:446
+#, fuzzy
+msgctxt "New"
+msgid "_Appointment"
+msgstr "J_anji"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+msgid "Create a new appointment"
+msgstr "Buat jadwal pertemuan yang baru"
+
+#: ../modules/calendar/e-cal-shell-backend.c:453
+#, fuzzy
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "Jadwal Pertemuan Sehari _Penuh"
+
+#: ../modules/calendar/e-cal-shell-backend.c:455
+msgid "Create a new all-day appointment"
+msgstr "Buat jadwal pertemuan seharian penuh"
+
+#: ../modules/calendar/e-cal-shell-backend.c:460
+#, fuzzy
+msgctxt "New"
+msgid "M_eeting"
+msgstr "P_ertemuan"
+
+#: ../modules/calendar/e-cal-shell-backend.c:462
+msgid "Create a new meeting request"
+msgstr "Buat usulan pertemuan"
+
+#: ../modules/calendar/e-cal-shell-backend.c:470
+#, fuzzy
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "Kale_nder"
+
+#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+msgid "Create a new calendar"
+msgstr "Buat kalender baru"
+
+#: ../modules/calendar/e-cal-shell-backend.c:507
+#: ../plugins/itip-formatter/itip-formatter.c:2651
+msgid "Calendar and Tasks"
+msgstr "Kalender dan Tugas"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
+#, fuzzy, c-format
 msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
+"Error on %s\n"
+"%s"
 msgstr ""
-"Evolution pada mode offline. Anda tidak dapat membuat ataupun memodifikasi "
-"direktori.\n"
-"Coba pindah ke mode online untuk menjalankan operasi tersebut."
+"Error pada %s:\n"
+"%s"
 
-#. User entered a wrong existing
-#. * password. Prompt him again.
-#.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
+#, fuzzy
+msgid "Loading calendars"
+msgstr "Buka Kalender"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:617
+#, fuzzy
+msgid "Calendar Selector"
+msgstr "Pilihan Sumber Kalender"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-cal-shell-sidebar.c:952
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Buka kalender"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+msgid "Print"
+msgstr "Cetak"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:306
+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 "Proses ini akan menghapus secara permanen semua acara yang waktunya lebih tua dari waktu yang Anda tentukan. Semua yang dihapus tidak dapat dikembalikan ke semula."
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
+msgid "Purge events older than"
+msgstr "Hapus acara yang waktunya lebih tua dari"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:534
+#, fuzzy
+msgid "Copying Items"
+msgstr "Menyalin isian"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#, fuzzy
+msgid "Moving Items"
+msgstr "Memindahkan isian"
+
+#. Translators: Default filename part saving an event to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#, fuzzy
+msgid "event"
+msgstr "Email Terkirim"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1100
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:494
+#: ../modules/calendar/e-task-shell-view-actions.c:612
+#, fuzzy
+msgid "Save as iCalendar"
+msgstr "_Kirim dalam bentuk iCalendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
+msgid "_Copy..."
+msgstr "Sa_lin..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+#, fuzzy
+msgid "D_elete Calendar"
+msgstr "Pilih Kalender"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#, fuzzy
+msgid "Delete the selected calendar"
+msgstr "Hapus folder terpilih"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#, fuzzy
+msgid "Go Back"
+msgstr "Mundur"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+#, fuzzy
+msgid "Go Forward"
+msgstr "Maju"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
+msgid "Select today"
+msgstr "Pilih hari ini"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+msgid "Select _Date"
+msgstr "Pilih _Tanggal"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+msgid "Select a specific date"
+msgstr "Pilih tanggal yang diinginkan"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+msgid "_New Calendar"
+msgstr "Kale_nder Baru"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-task-shell-view-actions.c:784
+msgid "Purg_e"
+msgstr "_Hapus"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+msgid "Purge old appointments and meetings"
+msgstr "Hapus jadwal pertemuan dan rapat yang sudah lewat"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#: ../modules/calendar/e-task-shell-view-actions.c:728
+#, fuzzy
+msgid "Re_fresh"
+msgstr "Perbarui"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
+#, fuzzy
+msgid "Refresh the selected calendar"
+msgstr "Ganti nama folder terpilih"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+#, fuzzy
+msgid "Rename the selected calendar"
+msgstr "Ganti nama folder terpilih"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#, fuzzy
+msgid "Show _Only This Calendar"
+msgstr "Tampilkan Kalender ini _saja"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+msgid "Cop_y to Calendar..."
+msgstr "Sal_in ke Kalender..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+msgid "_Delegate Meeting..."
+msgstr "_Jadwalkan Pertemuan..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#, fuzzy
+msgid "_Delete Appointment"
+msgstr "Hapus jadwal pertemuan"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#, fuzzy
+msgid "Delete selected appointments"
+msgstr "Hapus jadwal pertemuan"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#, fuzzy
+msgid "Delete This _Occurrence"
+msgstr "Hapus _Kejadian Ini"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+msgid "Delete this occurrence"
+msgstr "Hapus kejadian ini"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#, fuzzy
+msgid "Delete All Occ_urrences"
+msgstr "Hapus Semu_a Kejadian"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+msgid "Delete all occurrences"
+msgstr "Hapus Semua Kejadian"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+#, fuzzy
+msgid "New All Day _Event..."
+msgstr "Acara Seluruh Hari Baru"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#, fuzzy
+msgid "Create a new all day event"
+msgstr "Buat jadwal pertemuan seharian penuh"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:568
+#: ../modules/calendar/e-task-shell-view-actions.c:693
+msgid "_Forward as iCalendar..."
+msgstr "_Kirim dalam bentuk iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#, fuzzy
+msgid "New _Meeting..."
+msgstr "Buat Pertemuan Baru"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#, fuzzy
+msgid "Create a new meeting"
+msgstr "Buat usulan pertemuan"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+msgid "Mo_ve to Calendar..."
+msgstr "Pin_dahkan ke Kalender..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+msgid "New _Appointment..."
+msgstr "J_anji Baru..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+msgid "Make this Occurrence _Movable"
+msgstr "Kejadian Ini Dapat _Dipindahkan"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+msgid "_Open Appointment"
+msgstr "B_uka Jadwal Pertemuan"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+msgid "View the current appointment"
+msgstr "Lihat jadwal pertemuan mendatang"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+msgid "_Reply"
+msgstr "_Balas"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#, fuzzy
+msgid "Save as iCalendar..."
+msgstr "Simpan sebagai VCard..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+msgid "_Schedule Meeting..."
+msgstr "_Jadwalkan Pertemuan..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#, fuzzy
+msgid "Converts an appointment to a meeting"
+msgstr "Hapus jadwal pertemuan dan rapat yang sudah lewat"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
+#, fuzzy
+msgid "Conv_ert to Appointment..."
+msgstr "J_anji Baru..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#, fuzzy
+msgid "Converts a meeting to an appointment"
+msgstr "%s saat pertemuan berakhir"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#, fuzzy
+msgid "Quit"
+msgstr "_Berhenti"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+msgid "Day"
+msgstr "Hari"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
+msgid "Show one day"
+msgstr "Tampilkan dalam satu hari"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
+msgid "List"
+msgstr "Daftar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
+msgid "Show as list"
+msgstr "Tampilkan dalam daftar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
+msgid "Month"
+msgstr "Bulan"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
+msgid "Show one month"
+msgstr "Tampilkan dalam satu bulan"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
+msgid "Week"
+msgstr "Minggu"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
+msgid "Show one week"
+msgstr "Tampilkan dalam satu minggu"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
+#, fuzzy
+msgid "Show one work week"
+msgstr "Tampilkan dalam satu minggu"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
+#, fuzzy
+msgid "Active Appointments"
+msgstr "Jadwal Pertemuan"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
+#, fuzzy
+msgid "Next 7 Days' Appointments"
+msgstr "Jadwal Pertemuan Sehari _Penuh"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:965
+msgid "Description contains"
+msgstr "Deskripsi berisi"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:972
+msgid "Summary contains"
+msgstr "Ringkasan berisi"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+msgid "Print this calendar"
+msgstr "Cetak kalender ini"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
+#, fuzzy
+msgid "Preview the calendar to be printed"
+msgstr "Lihat contoh hasil kalendar yang hendak dicetak"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
+msgid "Go To"
+msgstr "Buka"
+
+#. Translators: Default filename part saving a memo to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#, fuzzy
+msgid "memo"
+msgstr "Mem_o"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#, fuzzy
+msgid "New _Memo"
+msgstr "Memo baru"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../modules/calendar/e-memo-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
+msgid "Create a new memo"
+msgstr "Buat memo baru"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
+msgid "_Open Memo"
+msgstr "B_uka Memo"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+msgid "View the selected memo"
+msgstr "Tampilkan memo terpilih"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-task-shell-view-actions.c:777
+msgid "Open _Web Page"
+msgstr "Buka Halaman _Web"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#, fuzzy
+msgid "Print the selected memo"
+msgstr "Tampilkan memo terpilih"
+
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:610
+#, fuzzy
+msgid "task"
+msgstr "Tugas - %s"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:672
+msgid "_Assign Task"
+msgstr "Tug_askan"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:749
+msgid "_Mark as Complete"
+msgstr "_Tandai Sudah Selesai"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:751
+msgid "Mark selected tasks as complete"
+msgstr "Tandai bahwa tugas ini telah selesai dilaksanakan"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+msgid "_Mark as Incomplete"
+msgstr "_Tandai Belum Selesai"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:758
+#, fuzzy
+msgid "Mark selected tasks as incomplete"
+msgstr "_Tandai Tugas Belum Selesai"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:763
+msgid "New _Task"
+msgstr "_Tugas Baru"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:765
+msgid "Create a new task"
+msgstr "Buat tugas baru"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:770
+msgid "_Open Task"
+msgstr "_Buka Tugas"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:772
+msgid "View the selected task"
+msgstr "Lihat tugas-tugas yang dipilih"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-memo-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#, fuzzy
+msgid "_Save as iCalendar..."
+msgstr "_Kirim dalam bentuk iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-task-shell-view-actions.c:998
+#, fuzzy
+msgid "Print the selected task"
+msgstr "Lihat tugas-tugas yang dipilih"
+
+#: ../modules/calendar/e-memo-shell-backend.c:318
+#, fuzzy
+msgctxt "New"
+msgid "Mem_o"
+msgstr "Mem_o"
+
+#: ../modules/calendar/e-memo-shell-backend.c:325
+#, fuzzy
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "_Berbagi memo"
+
+#: ../modules/calendar/e-memo-shell-backend.c:327
+#, fuzzy
+msgid "Create a new shared memo"
+msgstr "Buat memo berbagi yg baru"
+
+#: ../modules/calendar/e-memo-shell-backend.c:335
+#, fuzzy
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "Daftar m_emo"
+
+#: ../modules/calendar/e-memo-shell-backend.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
+msgid "Create a new memo list"
+msgstr "Buat daftar memo baru"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
+msgid "Loading memos"
+msgstr "Buka memo"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:571
+#, fuzzy
+msgid "Memo List Selector"
+msgstr "Pemilih Sumber Memo"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-memo-shell-sidebar.c:870
+#, c-format
+msgid "Opening memos at %s"
+msgstr "Buka memo pada %s"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+msgid "Print Memos"
+msgstr "Cetak Memo"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#, fuzzy
+msgid "_Delete Memo"
+msgstr "_Hapus Pesan"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#, fuzzy
+msgid "_Find in Memo..."
+msgstr "Cari _dalam Email..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#, fuzzy
+msgid "Search for text in the displayed memo"
+msgstr "Cari pada badan teks email yang sedang dibuka"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#, fuzzy
+msgid "D_elete Memo List"
+msgstr "_Daftar Memo Baru"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#, fuzzy
+msgid "Delete the selected memo list"
+msgstr "Hapus memo yang dipilih"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
+msgid "_New Memo List"
+msgstr "_Daftar Memo Baru"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#, fuzzy
+msgid "Refresh the selected memo list"
+msgstr "Hapus memo yang dipilih"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#, fuzzy
+msgid "Rename the selected memo list"
+msgstr "Ganti nama folder terpilih"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#, fuzzy
+msgid "Show _Only This Memo List"
+msgstr "Tampilkan hanya Daftar Tuga_s ini saja"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#, fuzzy
+msgid "Memo _Preview"
+msgstr "_Preview"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#, fuzzy
+msgid "Show memo preview pane"
+msgstr "Tampilkan panel pratinjau"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#, fuzzy
+msgid "Show memo preview below the memo list"
+msgstr "Tampilkan preview pesan di bawah daftar pesan"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#, fuzzy
+msgid "Show memo preview alongside the memo list"
+msgstr "Tampilkan preview pesan di bawah daftar pesan"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+msgid "Print the list of memos"
+msgstr "Cetak daftar memo"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#, fuzzy
+msgid "Preview the list of memos to be printed"
+msgstr "Pracetak daftar memo yang mau dicetak"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:416
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d memo"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-task-shell-view-private.c:569
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "\"%s\" terpilih"
+
+#: ../modules/calendar/e-memo-shell-view.c:223
+#, fuzzy
+msgid "Delete Memos"
+msgstr "_Hapus Pesan"
+
+#: ../modules/calendar/e-memo-shell-view.c:225
+#, fuzzy
+msgid "Delete Memo"
+msgstr "Delegasikan Ke"
+
+#: ../modules/calendar/e-task-shell-backend.c:322
+#, fuzzy
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tugas"
+
+#: ../modules/calendar/e-task-shell-backend.c:329
+#, fuzzy
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "Tugas _dan Pelaksananya"
+
+#: ../modules/calendar/e-task-shell-backend.c:331
+msgid "Create a new assigned task"
+msgstr "Buat sebuah penugasan"
+
+#: ../modules/calendar/e-task-shell-backend.c:339
+#, fuzzy
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "Daftar _tugas"
+
+#: ../modules/calendar/e-task-shell-backend.c:341
+#: ../modules/calendar/e-task-shell-view-actions.c:716
+msgid "Create a new task list"
+msgstr "Buat daftar tugas baru"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:222
+msgid "Loading tasks"
+msgstr "Buka tugas"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:571
+#, fuzzy
+msgid "Task List Selector"
+msgstr "Pemilih Sumber Tugas"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-task-shell-sidebar.c:870
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Buka tugas pada %s"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+msgid "Print Tasks"
+msgstr "Cetak Tugas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:554
 msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
+"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 ""
-"Sandi yang Anda masukkan tidak cocok dengan sandi yang tersimpan dalam akun "
-"ini. Silakan masukkan kembali sandi yang benar"
+"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?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:679
+#, fuzzy
+msgid "_Delete Task"
+msgstr "_Hapus tugas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:686
+#, fuzzy
+msgid "_Find in Task..."
+msgstr "Cari _dalam Email..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:688
+#, fuzzy
+msgid "Search for text in the displayed task"
+msgstr "Cari pada badan teks email yang sedang dibuka"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:700
+#, fuzzy
+msgid "Copy..."
+msgstr "_Salin"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:707
+#, fuzzy
+msgid "D_elete Task List"
+msgstr "Pilih Daftar Tugas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:709
+#, fuzzy
+msgid "Delete the selected task list"
+msgstr "Hapus tugas yang dipilih"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:714
+msgid "_New Task List"
+msgstr "_Daftar Tugas Baru"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:730
+#, fuzzy
+msgid "Refresh the selected task list"
+msgstr "Hapus tugas yang dipilih"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
-msgid "The two passwords do not match. Please re-enter the passwords."
+#: ../modules/calendar/e-task-shell-view-actions.c:737
+#, fuzzy
+msgid "Rename the selected task list"
+msgstr "Ganti nama folder terpilih"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:742
+#, fuzzy
+msgid "Show _Only This Task List"
+msgstr "Tampilkan hanya Daftar Tuga_s ini saja"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:756
+#, fuzzy
+msgid "Mar_k as Incomplete"
+msgstr "_Tandai Belum Selesai"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:786
+msgid "Delete completed tasks"
+msgstr "Hapus tugas yang telah dilaksanakan"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:861
+msgid "Task _Preview"
+msgstr "_Pracetak Tugas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:863
+#, fuzzy
+msgid "Show task preview pane"
+msgstr "Tampilkan panel pratinjau"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:884
+#, fuzzy
+msgid "Show task preview below the task list"
+msgstr "Tampilkan preview pesan di bawah daftar pesan"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#, fuzzy
+msgid "Show task preview alongside the task list"
+msgstr "Tampilkan preview pesan di bawah daftar pesan"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:899
+#, fuzzy
+msgid "Active Tasks"
+msgstr "Tugas _dan Pelaksananya"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:913
+#, fuzzy
+msgid "Completed Tasks"
+msgstr "Selesai "
+
+#: ../modules/calendar/e-task-shell-view-actions.c:920
+msgid "Next 7 Days' Tasks"
 msgstr ""
-"Ke dua sandi yang Anda masukkan tidak cocok. Silakan masukkan lagi sandinya."
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-msgid "Confirm Password:"
-msgstr "Konfirmasi Sandi:"
+#: ../modules/calendar/e-task-shell-view-actions.c:927
+#, fuzzy
+msgid "Overdue Tasks"
+msgstr "_Tugas belum selesai padahal harus sudah selesai:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-msgid "Current Password:"
-msgstr "Sandi:"
+#: ../modules/calendar/e-task-shell-view-actions.c:934
+#, fuzzy
+msgid "Tasks with Attachments"
+msgstr "Pesan dengan Lampiran"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-msgid "New Password:"
-msgstr "Sandi Baru:"
+#: ../modules/calendar/e-task-shell-view-actions.c:984
+msgid "Print the list of tasks"
+msgstr "Cetak daftar tugas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:991
+#, fuzzy
+msgid "Preview the list of tasks to be printed"
+msgstr "Lihat contoh jadi daftar tugas yang akan dicetak"
+
+#: ../modules/calendar/e-task-shell-view-private.c:463
+msgid "Expunging"
+msgstr "Menghapus"
+
+#: ../modules/calendar/e-task-shell-view-private.c:565
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d tugas"
+
+#: ../modules/calendar/e-task-shell-view.c:351
+#, fuzzy
+msgid "Delete Tasks"
+msgstr "Pilih Daftar Tugas"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-msgid "Your current password has expired. Please change your password now."
+#: ../modules/calendar/e-task-shell-view.c:353
+#, fuzzy
+msgid "Delete Task"
+msgstr "_Hapus tugas"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:333
+#, fuzzy, c-format
+msgid "%d attached messages"
+msgstr "%d pesan terlampir"
+
+#. Translators: "None" for a junk hook name,
+#. * when the junk plugin is not enabled.
+#: ../modules/mail/e-mail-junk-hook.c:89
+#, fuzzy
+msgctxt "mail-junk-hook"
+msgid "None"
+msgstr "Tak Ada"
+
+#: ../modules/mail/e-mail-shell-backend.c:164
+#, fuzzy
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "E_mail Baru"
+
+#: ../modules/mail/e-mail-shell-backend.c:166
+msgid "Compose a new mail message"
+msgstr "Buat email baru"
+
+#: ../modules/mail/e-mail-shell-backend.c:174
+#, fuzzy
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "_Folder Email"
+
+#: ../modules/mail/e-mail-shell-backend.c:176
+msgid "Create a new mail folder"
+msgstr "Buat folder email baru"
+
+#: ../modules/mail/e-mail-shell-backend.c:195
+msgid "Mail Accounts"
+msgstr "Account Email"
+
+#: ../modules/mail/e-mail-shell-backend.c:203
+msgid "Mail Preferences"
+msgstr "Pengaturan Email"
+
+#: ../modules/mail/e-mail-shell-backend.c:211
+msgid "Composer Preferences"
+msgstr "Pengaturan Penyusun"
+
+#: ../modules/mail/e-mail-shell-backend.c:219
+#, fuzzy
+msgid "Network Preferences"
+msgstr "Pengaturan Penyusun"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:814
+#: ../modules/mail/e-mail-shell-view.c:875
+#, fuzzy
+msgid "_Disable Account"
+msgstr "Matikan Akun"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:816
+#, fuzzy
+msgid "Disable this account"
+msgstr "Matikan Akun"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:823
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "Hapus secara permanen semua pesan yang sudah dihapus dari semua folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:828
+msgid "C_reate Search Folder From Search..."
+msgstr "Buat Sa_ringan Folder dari Hasil Pencarian..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:835
+msgid "_Download Messages for Offline Usage"
 msgstr ""
-"Sandi Anda saat ini telah kadaluwarsa. Silakan ganti sandi Anda sekarang."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../modules/mail/e-mail-shell-view-actions.c:837
+#, fuzzy
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr "Daftar memo tidak ditandai untuk penggunaan offline"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:842
+#, fuzzy
+msgid "Fl_ush Outbox"
+msgstr "Email Keluar"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:849
+msgid "_Copy Folder To..."
+msgstr "_Salin Folder..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:851
+msgid "Copy the selected folder into another folder"
+msgstr "Salin folder terpilih ke folder lain"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:858
+msgid "Permanently remove this folder"
+msgstr "Hapus folder ini selamanya"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:863
+msgid "E_xpunge"
+msgstr "_Hapus"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:865
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Hapus semua pesan yang telah ditandai untuk dihapus dari dalam folder ini"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:870
+msgid "Mar_k All Messages as Read"
+msgstr "Tan_dai Seluruh Surat Sudah Dibaca"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:872
+#, fuzzy
+msgid "Mark all messages in the folder as read"
+msgstr "Tandai semua pesa dalam subfolder dengan terbaca?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:877
+msgid "_Move Folder To..."
+msgstr "_Pindahkan Folder..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:879
+msgid "Move the selected folder into another folder"
+msgstr "Pindahkan folder terpilih ini ke folder lain"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:884
+msgid "_New..."
+msgstr "Buat Bar_u..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:886
+msgid "Create a new folder for storing mail"
+msgstr "Buat folder baru untuk menyimpan surat"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:893
+msgid "Change the properties of this folder"
+msgstr "Atur folder ini"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:900
+#, fuzzy
+msgid "Refresh the folder"
+msgstr "Memperbarui tampilan folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:907
+msgid "Change the name of this folder"
+msgstr "Ubah nama folder ini"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:912
+msgid "Select Message _Thread"
+msgstr "Pilih _Topik Pesan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:914
+msgid "Select all messages in the same thread as the selected message"
+msgstr "Pilih semua pesan dalam thread yang sama dengan pesan yang sedang dipilih"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:919
+#, fuzzy
+msgid "Select Message S_ubthread"
+msgstr "Pilih _Topik Pesan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:921
+#, fuzzy
+msgid "Select all replies to the currently selected message"
+msgstr "Pilih semua pesan dalam thread yang sama dengan pesan yang sedang dipilih"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:926
+msgid "_Unsubscribe"
+msgstr "_Berhenti langganan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:928
+#, fuzzy
+msgid "Unsubscribe from the selected folder"
+msgstr "Ganti nama folder terpilih"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:933
+msgid "Empty _Trash"
+msgstr "Kosongkan _Tong Sampah"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:935
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "Hapus secara permanen semua pesan yang sudah dihapus dari semua folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:940
+#, fuzzy
+msgid "_New Label"
+msgstr "Tanpa Label"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:949
+#, fuzzy
+msgid "N_one"
+msgstr "Satu"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:972
+msgid "Cancel the current mail operation"
+msgstr " proses email yang sedang berjalan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:977
+msgid "Collapse All _Threads"
+msgstr "Runtuhkan Seluruh _Topik"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:979
+msgid "Collapse all message threads"
+msgstr "Runtuh seluruh topik pesan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:984
+msgid "E_xpand All Threads"
+msgstr "Kembangkan Seluruh Susunan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:986
+msgid "Expand all message threads"
+msgstr "Perlihatkan seluruh topik pesan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:991
+msgid "_Message Filters"
+msgstr "Penyar_ingan Pesan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:993
+msgid "Create or edit rules for filtering new mail"
+msgstr "Buat atau ganti seting penyaring email baru"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:998
+msgid "Search F_olders"
+msgstr "F_older Pencarian"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
+#, fuzzy
+msgid "Create or edit search folder definitions"
+msgstr "Buat atau sunting penentuan Pencarian Folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
+#, fuzzy
+msgid "_Subscriptions..."
+msgstr "_Langganan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Masuk atau keluar dari keanggotaan folder pada server"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
+msgid "F_older"
+msgstr "F_older"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
+msgid "_Label"
+msgstr "_Label"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
+msgid "_New Folder..."
+msgstr "Folder Bar_u"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
+msgid "Show Message _Preview"
+msgstr "Tampilkan _Pratinjau Pesan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#, fuzzy
+msgid "Show message preview pane"
+msgstr "Tampilkan jendela pratinjau"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#, fuzzy
+msgid "Show _Deleted Messages"
+msgstr "Sembunyikan Email _Terhapus"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#, fuzzy
+msgid "Show deleted messages with a line through them"
+msgstr "Tampilkan email yang terhapus dengan tercoret dalam daftar email."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
+msgid "_Group By Threads"
+msgstr "_Kelompokkan Oleh Topik"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
+#, fuzzy
+msgid "Threaded message list"
+msgstr "daftar Pesan dalam Thread"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
+msgid "Show message preview below the message list"
+msgstr "Tampilkan preview pesan di bawah daftar pesan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#, fuzzy
+msgid "Show message preview alongside the message list"
+msgstr "Tampilkan preview pesan di bawah daftar pesan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
+msgid "All Messages"
+msgstr "Seluruh Pesan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
+msgid "Important Messages"
+msgstr "Pesan Penting"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
+msgid "Last 5 Days' Messages"
+msgstr "Pesan 5 Hari Terakhir"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
+msgid "Messages Not Junk"
+msgstr "Pesan Bukan Spam"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
+msgid "Messages with Attachments"
+msgstr "Pesan dengan Lampiran"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
+msgid "No Label"
+msgstr "Tanpa Label"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
+msgid "Read Messages"
+msgstr "Baca Pesan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
+msgid "Recent Messages"
+msgstr "Pesan Saat ini"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
+msgid "Unread Messages"
+msgstr "Pesan Belum Terbaca"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#, fuzzy
+msgid "Subject or Addresses contain"
+msgstr "Judul atau Pengirim berisi"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
+msgid "All Accounts"
+msgstr "Seluruh Account"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+msgid "Current Account"
+msgstr "Akun Saat ini"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+msgid "Current Folder"
+msgstr "Folder Saat ini"
+
+#: ../modules/mail/e-mail-shell-view-private.c:880
+#, fuzzy, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "\"%s\" terpilih"
+
+#: ../modules/mail/e-mail-shell-view-private.c:891
 #, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "Kata sandi anda akan kadaluarsa dalam %d hari"
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d dihapus"
 
-#. 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"
+#: ../modules/mail/e-mail-shell-view-private.c:897
+#: ../modules/mail/e-mail-shell-view-private.c:904
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d spam"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:191
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegate Permissions"
-msgstr "Delegasikan Hak Akses"
+#: ../modules/mail/e-mail-shell-view-private.c:910
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d rancangan"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../modules/mail/e-mail-shell-view-private.c:916
 #, c-format
-msgid "Permissions for %s"
-msgstr "Hak akses untuk %s"
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d belum terkirim"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
-msgid "Delegate To"
-msgstr "Delegasikan Ke"
+#: ../modules/mail/e-mail-shell-view-private.c:922
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d terkirim"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../modules/mail/e-mail-shell-view-private.c:934
+#, fuzzy, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] ", %d belum dibaca"
+
+#: ../modules/mail/e-mail-shell-view-private.c:937
 #, c-format
-msgid "Remove the delegate %s?"
-msgstr "Hapus delegasi %s?"
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d total"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:680
-msgid "Could not access Active Directory"
-msgstr "Tidak dapat mengakses Direktori Aktif"
+#: ../modules/mail/e-mail-shell-view.c:548
+#, fuzzy
+msgid "All Account Search"
+msgstr "Seluruh Account"
+
+#: ../modules/mail/e-mail-shell-view.c:685
+#, fuzzy
+msgid "Account Search"
+msgstr "Nama akun"
+
+#: ../modules/mail/e-mail-shell-view.c:873
+msgid "Proxy _Logout"
+msgstr "Ke_luar dari Proxy"
+
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "aktif"
+
+#: ../modules/mail/em-composer-prefs.c:476
+msgid "Language(s)"
+msgstr "Bahasa"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:692
-msgid "Could not find self in Active Directory"
-msgstr "Tidak dapat menemukan sendiri dalam Direktori Aktif"
+#: ../modules/mail/em-mailer-prefs.c:95
+msgid "Every time"
+msgstr "Setiap saat"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:705
+#: ../modules/mail/em-mailer-prefs.c:96
+msgid "Once per day"
+msgstr "Sekali dalam sehari"
+
+#: ../modules/mail/em-mailer-prefs.c:97
+msgid "Once per week"
+msgstr "Sekali dalam seminggu"
+
+#: ../modules/mail/em-mailer-prefs.c:98
+msgid "Once per month"
+msgstr "Sekali dalam sebulan"
+
+#: ../modules/mail/em-mailer-prefs.c:223
+msgid "Add Custom Junk Header"
+msgstr ""
+
+#: ../modules/mail/em-mailer-prefs.c:231
+#, fuzzy
+msgid "Header Name:"
+msgstr "Nama _Folder:"
+
+#: ../modules/mail/em-mailer-prefs.c:232
+#, fuzzy
+msgid "Header Value Contains:"
+msgstr "Pengirim berisi"
+
+#: ../modules/mail/em-mailer-prefs.c:332
+msgid "Header"
+msgstr "Header"
+
+#: ../modules/mail/em-mailer-prefs.c:336
+#, fuzzy
+msgid "Contains Value"
+msgstr "Lanjutkan"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:729
+#: ../modules/mail/em-mailer-prefs.c:800
 #, c-format
-msgid "Could not find delegate %s in Active Directory"
-msgstr "Delegasi %s tidak ditemukan dalam Direktori Aktif"
+msgid "%s plugin is available and the binary is installed."
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:717
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:737
+#: ../modules/mail/em-mailer-prefs.c:809
 #, c-format
-msgid "Could not remove delegate %s"
-msgstr "Delegasi %s tidak dapat dihapus"
+msgid "%s plugin is not available. Please check whether the package is installed."
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:777
-msgid "Could not update list of delegates."
-msgstr "Daftar delegasi tidak dapat diperbarui"
+#: ../modules/mail/em-mailer-prefs.c:773
+#, fuzzy
+msgid "No junk plugin available"
+msgstr "Tidak ada keterangan"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "Tidak dapat menambah delegasi %s"
+#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
+#: ../modules/mail/em-mailer-prefs.c:1160
+#, fuzzy
+msgid "_Date header:"
+msgstr "Kepala tabel"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:963
-msgid "Error reading delegates list."
-msgstr "Gagal membaca daftar delegasi"
+#: ../modules/mail/em-mailer-prefs.c:1161
+#, fuzzy
+msgid "Show _original header value"
+msgstr "Tampilkan U_kuran Asli"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "Penulis (baca, buat)"
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+msgid "Hello Python"
+msgstr "Telepon Rumah"
 
-#. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
-msgid "C_alendar:"
-msgstr "K_alender:"
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
 
-#. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-msgid "Co_ntacts:"
-msgstr "Ko_ntak: "
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-msgid "Delegates"
-msgstr "Delegasi"
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+#, fuzzy
+msgid "Add local address books to Evolution."
+msgstr "Tampilkan folder daftar buku alamat lokal"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "Penyunting (baca, buat, ubah)"
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Local Address Books"
+msgstr "Buku Alamat Lokal"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
-msgid "Permissions for"
-msgstr "Hak akses untuk"
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid "List of clues for the attachment reminder plugin to look for in a message body"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "Petugas Reviu (hanya baca saja)"
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
+#, fuzzy
+msgid "Keywords"
+msgstr "Kata kunci"
 
-#: ../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."
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
 msgstr ""
-"Orang-orang ini akan dapat mengirim email dengan menggunakan nama Anda\n"
-"dan juga dapat mengakses semua folder Anda bergantung hak akses yang Anda "
-"berikan."
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-msgid "_Delegate can see private items"
-msgstr "_Delegasi boleh melihat data pribadi"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+#, fuzzy
+msgid "Message has no attachments"
+msgstr "Pesan dengan Lampiran"
 
-#. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
-msgid "_Inbox:"
-msgstr "Kotak _Masuk:"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "_Add attachment..."
+msgstr "T_ambah lampiran..."
 
-#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
-msgid "_Tasks:"
-msgstr "_Tugas:"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#, fuzzy
+msgid "_Edit Message"
+msgstr "Ubah _email"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:58
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-msgid "Permissions..."
-msgstr "Hak Akses..."
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#, fuzzy
+msgid "Attachment Reminder"
+msgstr "Kotak Lampiran"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
-msgid "Folder Name"
-msgstr "Nama Folder"
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
-msgid "Folder Size"
-msgstr "Ukuran Folder"
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline Audio"
+msgstr "Biasa"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "Daftar ke Direktor Pengguna Yang Lain"
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Play audio attachments directly in mail messages."
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-msgid "Exchange Folder Tree"
-msgstr "Pohon Folder Exchange"
+#: ../plugins/backup-restore/backup-restore.c:152
+#, fuzzy
+msgid "Select name of the Evolution backup file"
+msgstr "Pilih nama arsip data Evolution"
 
-#: ../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 "Stop Langganan Folder..."
+#: ../plugins/backup-restore/backup-restore.c:183
+msgid "_Restart Evolution after backup"
+msgstr "_Jalankan ulang Evolution setelah melakukan backup"
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "Stop langganan folder \"%s\"?"
+#: ../plugins/backup-restore/backup-restore.c:209
+#, fuzzy
+msgid "Select name of the Evolution backup file to restore"
+msgstr "Pilih data yang hendak disimpan ulang"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "Stop langganan \"%s\""
+#: ../plugins/backup-restore/backup-restore.c:222
+msgid "_Restart Evolution after restore"
+msgstr "Ja_lankan ulang Evolution setelah selesai menyimpan ulang data simpanan"
 
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-msgid "Password Expiry Warning..."
-msgstr "Peringatan Kata Sandi Kadaluarsa..."
+#: ../plugins/backup-restore/backup-restore.c:290
+msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
-msgstr "Sandi Anda akan kadaluwarsa dalam 7 hari..."
+#: ../plugins/backup-restore/backup-restore.c:297
+#, fuzzy
+msgid "_Restore Evolution from the backup file"
+msgstr "_Jalankan ulang Evolution setelah melakukan backup"
 
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
-msgstr "_Ganti Kata Sandi"
+#: ../plugins/backup-restore/backup-restore.c:304
+#, fuzzy
+msgid "Please select an Evolution Archive to restore:"
+msgstr "Pilih data yang hendak disimpan ulang"
 
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
-msgid "ok_button"
-msgstr "tom_bol ok"
+#: ../plugins/backup-restore/backup-restore.c:307
+#, fuzzy
+msgid "Choose a file to restore"
+msgstr "Pilih file"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
-msgid "(Permission denied.)"
-msgstr "(Hak akses ditolak)"
+#: ../plugins/backup-restore/backup-restore.c:315
+#, fuzzy
+msgid "Restore from backup"
+msgstr "_Jalankan ulang Evolution setelah melakukan backup"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
-msgid "Add User:"
-msgstr "Tambah Pengguna:"
+#: ../plugins/backup-restore/backup-restore.c:353
+#, fuzzy
+msgid "_Backup Evolution Settings..."
+msgstr "Simpan Pengaturan..."
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
-msgid "Add User"
-msgstr "Tambah Pengguna"
+#: ../plugins/backup-restore/backup-restore.c:355
+#, fuzzy
+msgid "Backup Evolution data and settings to an archive file"
+msgstr "Simpan dan kembalikan simpanan data dan pengaturan Evolution"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-msgid "<b>Permissions</b>"
-msgstr "<b>Hak Akses</b>"
+#: ../plugins/backup-restore/backup-restore.c:360
+#, fuzzy
+msgid "R_estore Evolution Settings..."
+msgstr "Kembalikan Pengaturan..."
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-msgid "Cannot Delete"
-msgstr "Tidak Dapat Menghapus"
+#: ../plugins/backup-restore/backup-restore.c:362
+#, fuzzy
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "Simpan dan kembalikan simpanan data dan pengaturan Evolution"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Edit"
-msgstr "Tidak Dapat Merubah"
+#: ../plugins/backup-restore/backup.c:63
+msgid "Backup Evolution directory"
+msgstr "Simpan dan selamatkan direktori Evolution"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-msgid "Create items"
-msgstr "Buat objek"
+#: ../plugins/backup-restore/backup.c:65
+msgid "Restore Evolution directory"
+msgstr "Kembalikan isi direktori Evolution dari berkas simpanan"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-msgid "Create subfolders"
-msgstr "Buat subfolder"
+#: ../plugins/backup-restore/backup.c:67
+#, fuzzy
+msgid "Check Evolution Backup"
+msgstr "Periksa arsip Evolution"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-msgid "Delete Any Items"
-msgstr "Hapus Data"
+#: ../plugins/backup-restore/backup.c:69
+msgid "Restart Evolution"
+msgstr "Jalankan ulang Evolution"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-msgid "Delete Own Items"
-msgstr "Hapus Data Sendiri"
+#: ../plugins/backup-restore/backup.c:71
+msgid "With Graphical User Interface"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-msgid "Edit Any Items"
-msgstr "Ubah Data"
+#: ../plugins/backup-restore/backup.c:189
+#: ../plugins/backup-restore/backup.c:251
+#, fuzzy
+msgid "Shutting down Evolution"
+msgstr "Mematikan %s (%s)\n"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-msgid "Edit Own Items"
-msgstr "Sunting Objek Milik"
+#: ../plugins/backup-restore/backup.c:196
+#, fuzzy
+msgid "Backing Evolution accounts and settings"
+msgstr "Simpan dan kembalikan simpanan data dan pengaturan Evolution"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-msgid "Folder contact"
-msgstr "Direktori alamat"
+#: ../plugins/backup-restore/backup.c:202
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-msgid "Folder owner"
-msgstr "Pemilik folder"
+#: ../plugins/backup-restore/backup.c:213
+#, fuzzy
+msgid "Backup complete"
+msgstr "_Tandai Belum Selesai"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-msgid "Folder visible"
-msgstr "Folder nampak"
+#: ../plugins/backup-restore/backup.c:218
+#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:285
+#, fuzzy
+msgid "Restarting Evolution"
+msgstr "Jalankan ulang Evolution"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-msgid "Read items"
-msgstr "Baca data"
+#: ../plugins/backup-restore/backup.c:255
+#, fuzzy
+msgid "Backup current Evolution data"
+msgstr "Simpan dan selamatkan direktori Evolution"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-msgid "Role: "
-msgstr "Peranan:"
+#: ../plugins/backup-restore/backup.c:260
+msgid "Extracting files from backup"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Jangan, Jangan Ganti Status"
+#: ../plugins/backup-restore/backup.c:267
+#, fuzzy
+msgid "Loading Evolution settings"
+msgstr "Atur Evolution"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:144
-msgid "Select User"
-msgstr "Pilih Pengguna"
+#: ../plugins/backup-restore/backup.c:274
+msgid "Removing temporary backup files"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:182
-msgid "Address Book..."
-msgstr "Buku Alamat..."
+#: ../plugins/backup-restore/backup.c:281
+msgid "Ensuring local sources"
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
-msgid "Subscribe to Other User's Contacts"
-msgstr "Berlangganan ke Kontak Pengguna Lain"
+#: ../plugins/backup-restore/backup.c:428
+#, fuzzy, c-format
+msgid "Backing up to the folder %s"
+msgstr "Membuat Saringan Folder: %s"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-msgid "Subscribe to Other User's Calendar"
-msgstr "Daftar ke Kalender Pengguna Lain"
+#: ../plugins/backup-restore/backup.c:433
+#, fuzzy, c-format
+msgid "Restoring from the folder %s"
+msgstr "Menghapus folder %s"
 
-#: ../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."
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:455
+#, fuzzy
+msgid "Evolution Backup"
+msgstr "Email Evolution"
+
+#: ../plugins/backup-restore/backup.c:455
+#, fuzzy
+msgid "Evolution Restore"
+msgstr "Tes Evolution"
+
+#: ../plugins/backup-restore/backup.c:494
+#, fuzzy
+msgid "Backing up Evolution Data"
+msgstr "Simpan dan selamatkan direktori Evolution"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
 msgstr ""
-"Suatu plugin yang menangani sebuah kumpulan account Exchange operasi khusus "
-"dan fasilitas-fasilitas."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-msgid "Exchange Operations"
-msgstr "Operasi Exchange"
+#: ../plugins/backup-restore/backup.c:497
+#, fuzzy
+msgid "Restoring Evolution Data"
+msgstr "Jalankan ulang Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot change password due to configuration problems."
-msgstr "Sandi tidak dapat diganti karena ada masalah konfigurasi."
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-msgid "Cannot display folders."
-msgstr "Tidak dapat menampilkan folder."
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot perform the operation."
-msgstr "Gagal melakukan operasi."
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#, fuzzy
+msgid "Backup and Restore"
+msgstr "Simpan dan kembalikan plugin"
 
-#: ../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."
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#, fuzzy
+msgid "Backup and restore your Evolution data and settings."
+msgstr "Simpan dan kembalikan simpanan data dan pengaturan Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+#, fuzzy
+msgid "Are you sure you want to close Evolution?"
+msgstr "Apakah benar Anda ingin menghapus account ini?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#, fuzzy
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "Apakah Anda ingin menghapus pertemuan ini?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding.  If you want Evolution to restart automatically after backup, please enable the toggle button."
 msgstr ""
-"Perubahan terhadap konfigurasi akun Exchange \"{0}\" akan diaktifkan setelah "
-"Anda keluar dan menjalankan ulang Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid "Could not authenticate to server."
-msgstr "Tidak dapat melakukan otentikasi ke server"
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#, fuzzy
+msgid "Insufficient Permissions"
+msgstr "Delegasikan Hak Akses"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-msgid "Could not change password."
-msgstr "Tidak dapat merubah sandi."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#, fuzzy
+msgid "Invalid Evolution backup file"
+msgstr "Email Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#, fuzzy
+msgid "Please select a valid backup file to restore."
+msgstr "Pilih data yang hendak disimpan ulang"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#, fuzzy
+msgid "The selected folder is not writable."
+msgstr "Salin folder terpilih ke folder lain"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "This will delete all your current Evolution data and settings and restore them from your backup. Evolution restore can start only when Evolution is not running. Please make sure that you close all your unsaved windows before you proceed. If you want Evolution to restart automatically restart after restore, please enable the toggle button."
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:685
+#: ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic Contacts"
+msgstr "Kontak Otomatis"
+
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:709
+#, fuzzy
+msgid "Create _address book entries when sending mails"
+msgstr "_Sembunyikan alamat saat mengirim ke daftar ini"
+
+#: ../plugins/bbdb/bbdb.c:715
+msgid "Select Address book for Automatic Contacts"
+msgstr "Pilih buku Alamat untuk Kontak Otomatis"
+
+#: ../plugins/bbdb/bbdb.c:730
+msgid "Instant Messaging Contacts"
+msgstr "Alamat Pesan Instant"
+
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:745
+#, fuzzy
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "Lakukan sinkronisasi informasi kontak dan foto dengan daftar teman program gaim secara teratur."
+
+#: ../plugins/bbdb/bbdb.c:751
+#, fuzzy
+msgid "Select Address book for Pidgin buddy list"
+msgstr "Pilih Buku Alamat untuk daftar kawan Gaim"
+
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:762
+msgid "Synchronize with _buddy list now"
+msgstr "Lakukan sinkronisasi dengan _daftar teman sekarang"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#, fuzzy
 msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists."
+msgstr "Otomatis isi buku alamat anda dengan nama dan alamat surat ketika anda membalas pesan. Juga isi informasi alamat IM dari daftar teman anda."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
+#, c-format
+msgid "Bogofilter is not available. Please install it first."
 msgstr ""
-"Akun Exchange tidak dapat dikonfigurasikan karena\n"
-"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
-msgid "Could not connect to Exchange server."
-msgstr "Tidak dapat tersambung ke Server Exchange."
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not connect to server {0}."
-msgstr "Tidak dapat tersambung ke server {0}."
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-msgid "Could not determine folder permissions for delegates."
-msgstr "Gagal menentukan hak akses folder untuk delegasi."
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not find Exchange Web Storage System."
-msgstr "Sistem Penyimpanan Web Exchange tidak dapat ditemukan."
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-msgid "Could not locate server {0}."
-msgstr "Server {0} tidak dapat ditemukan."
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
+msgid "Convert message text to _Unicode"
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-msgid "Could not make {0} a delegate"
-msgstr "{0} tidak dapat dijadikan delegasi"
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+#, fuzzy
+msgid "Convert mail messages to Unicode"
+msgstr "Kirim email ke folder Publik"
 
-#: ../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/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-msgid "Could not read folder permissions."
-msgstr "Hak akses folder tidak dapat dibaca."
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+msgid "Bogofilter Junk Filter"
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-msgid "Could not read out-of-office state"
-msgstr "Status kehadiran di kantor tidak dapat dibaca"
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+#, fuzzy
+msgid "Bogofilter Options"
+msgstr "Aksi saringan log"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Could not update folder permissions."
-msgstr "Hak akses folder tidak dapat diperbarui"
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
+msgid "Filter junk messages using Bogofilter."
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Could not update out-of-office state"
-msgstr "Status kehadiran di kantor tidak dapat diperbarui"
+#: ../plugins/caldav/caldav-browse-server.c:197
+msgid "Authentication failed. Server requires correct login."
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Exchange Account is offline."
-msgstr "Akun Exchange sedang padam."
+#: ../plugins/caldav/caldav-browse-server.c:199
+msgid "Given URL cannot be found."
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/caldav/caldav-browse-server.c:203
+#, c-format
 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"
-"  "
+"Server returned unexpected data.\n"
+"%d - %s"
 msgstr ""
-"Penyambung Exchange memerlukan akses ke fungsionalitas\n"
-"tertentu pada Server Exchange yang kelihatannya telah dimatikan\n"
-"atau diblok. (Hal ini biasanya tidak disengaja.) Administrator perlu\n"
-"mengaktifkan fungsionalitas ini supaya anda dapat menggunakan\n"
-"Penyambung Exchange.\n"
-"\n"
-"Untuk informasi bagi administrator Exchange anda, \n"
-"silahkan ikuti tautan di bawah:\n"
-"\n"
-"{0}\n"
-".."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
-msgid "Failed to update delegates:"
+#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "Keybord tak dikenal"
+
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
+#, fuzzy
+msgid "Failed to parse server response."
 msgstr "Gagal memperbarui delegasi:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
-msgid "Folder already exists"
-msgstr "Folder sudah ada"
+#: ../plugins/caldav/caldav-browse-server.c:427
+#, fuzzy
+msgid "Events"
+msgstr "Akhir"
+
+#: ../plugins/caldav/caldav-browse-server.c:449
+#, fuzzy
+msgid "User's calendars"
+msgstr "Kalender baru"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-msgid "Folder does not exist"
-msgstr "Folder tidak ada."
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
+#, fuzzy
+msgid "Failed to get server URL."
+msgstr "Gagal saat menghubungkan diri dengan server LDAP."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-msgid "Folder offline"
-msgstr "Folder tidak tersambung"
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1272
+#, fuzzy
+msgid "Searching for user's calendars..."
+msgstr "Buka kalender..."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1270
-msgid "Generic error"
-msgstr "Error generik"
+#: ../plugins/caldav/caldav-browse-server.c:665
+#, fuzzy
+msgid "Could not find any user calendar."
+msgstr "Gagal menemukan kalender apapun"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Global Catalog Server is not reachable"
-msgstr "Server Katalog Global tidak terjangkau"
+#: ../plugins/caldav/caldav-browse-server.c:793
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
+#: ../plugins/caldav/caldav-browse-server.c:795
+#, c-format
+msgid "Previous attempt failed with code %d"
 msgstr ""
-"Tentukan path OWA pada dialog konfigurasi bila OWA berada pada path yang "
-"berbeda."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "Mailbox for {0} is not on this server."
-msgstr "Kotak surat {0} tidak ada pada server ini."
+#: ../plugins/caldav/caldav-browse-server.c:798
+#, fuzzy, c-format
+msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgstr "Silakan masukkan kata sandi untuk %s (pengguna %s)"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid "Make sure the URL is correct and try again."
-msgstr "Pastikan URLnya sudah ditulis dengan benar, dan silakan coba lagi."
+#: ../plugins/caldav/caldav-browse-server.c:855
+#, fuzzy, c-format
+msgid "Cannot create soup message for URL '%s'"
+msgstr ""
+"Tidak dapat membuat file output: %s:\n"
+"%s"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
-msgid "Make sure the server name is spelled correctly and try again."
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1090
+#, fuzzy
+msgid "Searching folder content..."
+msgstr "Saring Folder berdasarkan Pe_ngirim..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1133
+#, fuzzy
+msgid "List of available calendars:"
+msgstr "Kalender Lokal"
+
+#: ../plugins/caldav/caldav-browse-server.c:1170
+#, fuzzy
+msgid "Supports"
+msgstr "Urutan"
+
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#, fuzzy, c-format
+msgid "Failed to create thread: %s"
+msgstr "Gagal membuat sebuah thread"
+
+#: ../plugins/caldav/caldav-browse-server.c:1357
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
 msgstr ""
-"Pastikan nama servernya ditulis dengan benar, kemudian silakan coba kembali."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
-msgid "Make sure the username and password are correct and try again."
-msgstr "Pastikan nama pengguna dan sandinya benar, kemudian silakan coba lagi."
+#: ../plugins/caldav/caldav-browse-server.c:1363
+msgid "Browse for a CalDAV calendar"
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-msgid "No Global Catalog server configured for this account."
-msgstr "Server Katalog Global belum dikonfigurasikan untuk akun ini."
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CallDAV"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
-msgid "No mailbox for user {0} on {1}."
-msgstr "Kotak surat penggguna {0} pada {1} tidak ada."
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:92
+msgid "_URL:"
+msgstr "_URL:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
-msgid "No such user {0}"
-msgstr "Pengguna {0} tidak ada"
+#: ../plugins/caldav/caldav-source.c:220
+#: ../plugins/google-account-setup/google-contacts-source.c:305
+msgid "Use _SSL"
+msgstr "Gunakan _SSL"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "Password successfully changed."
-msgstr "Sandi berhasil diubah."
+#: ../plugins/caldav/caldav-source.c:229
+msgid "Brows_e server for a calendar"
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Please make sure the Global Catalog Server name is correct."
-msgstr "Tolong pastikan nama Server Katalog Global adalah benar."
+#: ../plugins/caldav/caldav-source.c:241
+#: ../plugins/calendar-file/calendar-file.c:182
+#: ../plugins/calendar-http/calendar-http.c:111
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:323
+#: ../plugins/google-account-setup/google-source.c:627
+#, fuzzy
+msgid "Re_fresh:"
+msgstr "Pe_rbarui:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Silakan jalankan ulang Evolution supaya perubahan diterapkan"
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "Add CalDAV support to Evolution."
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
-msgid "Please select a user."
-msgstr "Silakan pilih penggunanya."
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+#, fuzzy
+msgid "CalDAV Support"
+msgstr "CallDAV"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-msgid "Server rejected password because it is too weak."
-msgstr "Sandi tidak diterima oleh server sebab terlalu mudah."
+#: ../plugins/calendar-file/calendar-file.c:116
+#, fuzzy
+msgid "_Customize options"
+msgstr "_Sesuaikan pesan pemberitahuan"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "Akun Exchange akan dimatikan saat Anda keluar dari Evolution"
+#: ../plugins/calendar-file/calendar-file.c:135
+#, fuzzy
+msgid "File _name:"
+msgstr "Nama file:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "Akun Exchange ini akan dihapus saat Anda keluar dari Evolution."
+#: ../plugins/calendar-file/calendar-file.c:139
+#, fuzzy
+msgid "Choose calendar file"
+msgstr "Pilih file"
+
+#: ../plugins/calendar-file/calendar-file.c:187
+#, fuzzy
+msgid "On open"
+msgstr "Buka"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
-msgid "The Exchange server is not compatible with Exchange Connector."
+#: ../plugins/calendar-file/calendar-file.c:188
+msgid "On file change"
 msgstr ""
-"Server Exchange ini tidak dapat digunakan oleh program Konektor Exchange "
-"Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
-msgid ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
+#: ../plugins/calendar-file/calendar-file.c:189
+#, fuzzy
+msgid "Periodically"
+msgstr "Pribadi"
+
+#: ../plugins/calendar-file/calendar-file.c:204
+msgid "Force read _only"
 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:59
-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."
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Add local calendars to Evolution."
 msgstr ""
-"Ini kemungkinan berarti server anda memerlukan \n"
-"nama domain Windows sebagia bagian dari nama anda \n"
-"(mis: &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"Atau mungkin anda salah mengetikkan password anda."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
-msgid "Try again with a different password."
-msgstr "Silakan coba lagi dengan sandi yang lain."
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Local Calendars"
+msgstr "Kalender Lokal"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
-msgid "Unable to add user to access control list:"
-msgstr "Pengguna tidak dapat dimasukkan dalam daftar kendali akses:"
+#: ../plugins/calendar-http/calendar-http.c:126
+msgid "_Secure connection"
+msgstr "_Sambungan aman"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
-msgid "Unable to edit delegates."
-msgstr "Delegasi tidak dapat diubah."
+#: ../plugins/calendar-http/calendar-http.c:186
+#, fuzzy
+msgid "Userna_me:"
+msgstr "Pengg_una:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-msgid "Unknown error looking up {0}"
-msgstr "Error tak dikenal saat mencari {0}"
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+msgid "Add web calendars to Evolution."
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "Unknown error."
-msgstr "Error tak dikenal."
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+#, fuzzy
+msgid "Web Calendars"
+msgstr "Kalender"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "Unknown type"
-msgstr "Jenis tidak dikenal"
+#: ../plugins/calendar-weather/calendar-weather.c:60
+msgid "Weather: Fog"
+msgstr "Cuaca: Berkabut"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "Unsupported operation"
-msgstr "Operasi tidak dapat dilakukan"
+#: ../plugins/calendar-weather/calendar-weather.c:61
+msgid "Weather: Cloudy"
+msgstr "Cuaca: Mendung"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-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/calendar-weather/calendar-weather.c:62
+#, fuzzy
+msgid "Weather: Cloudy Night"
+msgstr "Cuaca: Mendung"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "You cannot make yourself your own delegate"
-msgstr "Anda tidak boleh membuat delegasi untuk Anda sendiri"
+#: ../plugins/calendar-weather/calendar-weather.c:63
+#, fuzzy
+msgid "Weather: Overcast"
+msgstr "Cuaca: Hujan"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "You have exceeded your quota for storing mail on this server."
-msgstr "Anda telah melampaui batas quota pada server ini."
+#: ../plugins/calendar-weather/calendar-weather.c:64
+#, fuzzy
+msgid "Weather: Showers"
+msgstr "Cuaca: Bersalju"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You may only configure a single Exchange account."
-msgstr "Anda hanya dapat melakukan konfigurasi pada satu akun Exchange saja."
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Snow"
+msgstr "Cuaca: Bersalju"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
+#: ../plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Sunny"
+msgstr "Cuaca: Cerah"
+
+#: ../plugins/calendar-weather/calendar-weather.c:67
+#, fuzzy
+msgid "Weather: Clear Night"
+msgstr "Kalender Cuaca"
+
+#: ../plugins/calendar-weather/calendar-weather.c:68
+msgid "Weather: Thunderstorms"
+msgstr "Cuaca: Badai"
+
+#: ../plugins/calendar-weather/calendar-weather.c:222
+msgid "Select a location"
+msgstr "Pilih lokasi"
+
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
+#, fuzzy
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "Tak Ada"
+
+#: ../plugins/calendar-weather/calendar-weather.c:448
+msgid "_Units:"
+msgstr "_Unit:"
+
+#: ../plugins/calendar-weather/calendar-weather.c:455
+msgid "Metric (Celsius, cm, etc)"
+msgstr "Satuan metrik (Celcius, cm, dsb)"
+
+#: ../plugins/calendar-weather/calendar-weather.c:456
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr "Satuan imperial (Fahrenheit, inci, dsb)"
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Add weather calendars to Evolution."
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Weather Calendars"
+msgstr "Kalender Cuaca"
+
+#: ../plugins/contacts-map/contacts-map.c:55
+#: ../plugins/contacts-map/contacts-map.c:201
+#, fuzzy
+msgid "Contacts map"
+msgstr "Kontak: "
+
+#: ../plugins/contacts-map/contacts-map.c:56
+#, fuzzy
+msgid "Show a map of all the contacts"
+msgstr "Kirim pesan email ke kontak-kontak yang sudah dipilih."
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
 msgstr ""
-"Total pemakaian anda: {0} KB. Hapuslah surat yang tidak diperlukan untuk "
-"menambah tempat."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+#, fuzzy
+msgid "Map for contacts"
+msgstr "Tidak ada kontak"
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Memeriksa apakah Evolution adalah program email utama"
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "Setiap saat Evolution mulai, periksa apakah dia merupakan penyurat default."
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
+#, fuzzy
+msgid "Check whether Evolution is the default mail client on startup."
+msgstr "Memeriksa pada saat mulai dijalankan apakah Evolution adalah program email utama."
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
+#, fuzzy
+msgid "Default Mail Client"
+msgstr "Pemakai Surat Awal "
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
+msgid "Do you want to make Evolution your default e-mail client?"
+msgstr "Jadikan Evolution sebagai program email utama?"
+
+#: ../plugins/default-source/default-source.c:75
+#, fuzzy
+msgid "Mark as _default address book"
+msgstr "Tandai sebagai fol_der awal"
+
+#: ../plugins/default-source/default-source.c:88
+msgid "A_utocomplete with this address book"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:97
+#, fuzzy
+msgid "Mark as _default calendar"
+msgstr "Tandai sebagai fol_der awal"
+
+#: ../plugins/default-source/default-source.c:98
+#, fuzzy
+msgid "Mark as _default task list"
+msgstr "Tandai sebagai fol_der awal"
+
+#: ../plugins/default-source/default-source.c:99
+#, fuzzy
+msgid "Mark as _default memo list"
+msgstr "Tandai sebagai fol_der awal"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr "Sumber Awal"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid "Mark your preferred address book and calendar as default."
+msgstr ""
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr ""
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:316
+#, fuzzy
+msgid "Security:"
+msgstr "Keamanan"
+
+#: ../plugins/email-custom-header/email-custom-header.c:321
+#, fuzzy
+msgid "Unclassified"
+msgstr "Belum terklasifikasi"
+
+#: ../plugins/email-custom-header/email-custom-header.c:322
+#, fuzzy
+msgid "Protected"
+msgstr "Dibuat"
+
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../widgets/misc/e-send-options.ui.h:18
+#, fuzzy
+msgid "Secret"
+msgstr "Rahasia"
+
+#: ../plugins/email-custom-header/email-custom-header.c:325
+#, fuzzy
+msgid "Top secret"
+msgstr "Sangat Rahasia"
+
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
+#. indicating the header will not be added to a mail message
+#: ../plugins/email-custom-header/email-custom-header.c:379
+#, fuzzy
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "Tak Ada"
+
+#: ../plugins/email-custom-header/email-custom-header.c:571
+#, fuzzy
+msgid "_Custom Header"
+msgstr "_Tampilan Disesuaikan"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:950
+#, fuzzy
+msgid "Key"
+msgstr "Kunci"
+
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
+msgid "Values"
 msgstr ""
-"Total pemakaian anda: {0} KB. Anda sudah tidak dapat mengirim atau menerima "
-"email sekarang."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Add custom headers to outgoing mail messages."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+#, fuzzy
+msgid "Custom Header"
+msgstr "Cantu_mkan pesan"
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+msgstr ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:118
+#, fuzzy
+msgid "Automatically launch when a new mail is edited"
+msgstr "Periksa otomatis email baru _setiap"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
+#, fuzzy
+msgid "Default External Editor"
+msgstr "Pemakai Surat Awal "
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
+msgid "The default command that must be used as the editor."
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:107
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:108
 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."
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
 msgstr ""
-"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:78
-msgid "Your password has expired."
-msgstr "Sandi Anda sudah kadaluwarsa."
+#: ../plugins/external-editor/external-editor.c:374
+#: ../plugins/external-editor/external-editor.c:376
+#, fuzzy
+msgid "Compose in External Editor"
+msgstr "Lebar standar Jendela Penulis"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid "{0} cannot be added to an access control list"
-msgstr "{0} tidak dapat dimasukkan dalam daftar kontrol akses"
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+#, fuzzy
+msgid "External Editor"
+msgstr "Penyunting Kontak"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid "{0} is already a delegate"
-msgstr "{0} sudah merupakan delegasi"
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#, fuzzy
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "Buka jendela untuk menulis email baru"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
-msgid "{0} is already in the list"
-msgstr "{0} sudah ada dalam daftar"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+#, fuzzy
+msgid "Cannot create Temporary File"
+msgstr "Tidak dapat membuat direktori penyimpanan sementara."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
-msgid "Subscribe to Other User's Tasks"
-msgstr "Daftar ke Tugas Pengguna Lain"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-msgid "Check folder permissions"
-msgstr "Periksa hak akses"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
+msgstr ""
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Stop berlangganan folder \"%s\""
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+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."
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor is active."
 msgstr ""
-"Aktifkan pilihan berlangganan folder surat pada menu konteks pohon folder."
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid "Unsubscribe Folders"
-msgstr "Stop Langganan Folder"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different editor."
+msgstr ""
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "_Berhenti langganan"
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+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 "Catatan"
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
+msgid "Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens."
+msgstr ""
+
+#: ../plugins/face/face.c:286
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
+msgstr ""
+
+#: ../plugins/face/face.c:296
+#, fuzzy
+msgid "Image files"
+msgstr "Foto"
+
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr ""
+
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr ""
+
+#: ../plugins/face/face.c:415
+#, fuzzy
+msgid "Include _Face"
+msgstr "Termasuk:"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+#, fuzzy
+msgid "Failed Read"
+msgstr "Kepala tabel"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+#, fuzzy
+msgid "Invalid Image Size"
+msgstr "Argumen invalid"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+#, fuzzy
+msgid "Not an image"
+msgstr "Ta_npa gambar"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+#, fuzzy
+msgid "Please select an image of size 48 * 48"
+msgstr "Pilih foto untuk orang ini"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+#, fuzzy
+msgid "The file cannot be read"
+msgstr "Item ini tidak dapat dikirim!\n"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr ""
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:82
+#, fuzzy
+msgid "Google"
+msgstr "ganti"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:273
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
+#, fuzzy
+msgid "<b>Server</b>"
+msgstr "_Server:"
+
+#: ../plugins/google-account-setup/google-source.c:439
+#, fuzzy, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Tambahkan folder ini ke daftar folder langganan Anda"
+
+#: ../plugins/google-account-setup/google-source.c:545
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+
+#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
+msgid "Unknown error."
+msgstr "Error tak dikenal."
+
+#: ../plugins/google-account-setup/google-source.c:631
+#, fuzzy
+msgid "Cal_endar:"
+msgstr "_Kalender:"
+
+#: ../plugins/google-account-setup/google-source.c:666
+#, fuzzy
+msgid "Retrieve _list"
+msgstr "Mengambil '%s'"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "Add Google Calendars to Evolution."
+msgstr ""
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+#, fuzzy
+msgid "Google Calendars"
+msgstr "Gnome Calendar"
+
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Daftar cek"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "Groupwise Account Setup"
-msgstr "Konfigurasi Akun Groupwise"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
-msgid "Junk Settings"
-msgstr "Pengaturan Spam"
+#: ../plugins/groupwise-features/gw-ui.c:112
+msgid "New _Shared Folder..."
+msgstr "Buat Folder Kong_si..."
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
-msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>Pengaturan Email Spam</b>"
+#: ../plugins/groupwise-features/gw-ui.c:119
+msgid "_Proxy Login..."
+msgstr "Login _Proksi..."
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#: ../plugins/groupwise-features/gw-ui.c:170
 msgid "Junk Mail Settings..."
 msgstr "Pengaturan Email Spam..."
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b>Daftar Sampah:</b>"
+#: ../plugins/groupwise-features/gw-ui.c:177
+msgid "Track Message Status..."
+msgstr "Telusuri Status Pesan..."
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
-msgid "Email:"
-msgstr "Email:"
+#: ../plugins/groupwise-features/gw-ui.c:183
+msgid "Retract Mail"
+msgstr "Mengambil Email"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#: ../plugins/groupwise-features/gw-ui.c:338
+msgid "Accept Tentatively"
+msgstr "Terima Untuk Sementara"
+
+#: ../plugins/groupwise-features/gw-ui.c:352
+#, fuzzy
+msgid "Rese_nd Meeting..."
+msgstr "Kembalikan Pengaturan..."
+
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
+msgid "Create folder"
+msgstr "Buat folder"
+
+#: ../plugins/groupwise-features/install-shared.c:219
+#, c-format
+msgid ""
+"The user '%s' has shared a folder with you\n"
+"\n"
+"Message from '%s'\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"Click 'Apply' to install the shared folder\n"
+"\n"
+msgstr ""
+
+#: ../plugins/groupwise-features/install-shared.c:231
+#, fuzzy
+msgid "Install the shared folder"
+msgstr "Ganti nama folder terpilih"
+
+#: ../plugins/groupwise-features/install-shared.c:235
+#, fuzzy
+msgid "Shared Folder Installation"
+msgstr "Notifikasi Folder Kongsian"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
+msgid "Junk Settings"
+msgstr "Pengaturan Spam"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
+#: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Pengaturan Email Spam"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/groupwise-features/junk-settings.ui.h:1
+msgid "Email:"
+msgstr "Email:"
+
+#: ../plugins/groupwise-features/junk-settings.ui.h:2
+#, fuzzy
+msgid "Junk List:"
+msgstr "<b>Daftar Sampah:</b>"
+
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "_Disable"
 msgstr "_Matikan"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:6
+#: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "_Aktifkan"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#: ../plugins/groupwise-features/junk-settings.ui.h:7
 msgid "_Junk List"
 msgstr "Daftar _Spam"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/junk-settings.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "_Buang"
+
+#: ../plugins/groupwise-features/mail-retract.c:81
+#, fuzzy
+msgid "Message Retract"
+msgstr "Kepala Pesan"
+
+#: ../plugins/groupwise-features/mail-retract.c:90
+msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "Pesan telah ditarik kembali dengan sukses"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
-msgid "Retract Mail"
-msgstr "Mengambil Email"
+#: ../plugins/groupwise-features/mail-send-options.c:202
+#, fuzzy
+msgid "Insert Send options"
+msgstr "Sisipkan pilihan kirim lebih lanjutan"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
+#, fuzzy
+msgid "Add Send Options to GroupWise messages"
 msgstr "Tambahkan Pilihan Pengiriman pada pesan groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Pilihan Pengiriman"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+#, fuzzy
+msgid "Fine-tune your GroupWise accounts."
 msgstr "Plugin untuk pilihan akun Groupwise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+#, fuzzy
+msgid "GroupWise Features"
 msgstr "Fitur Groupwise"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
-msgid "Accept Tentatively"
-msgstr "Terima Untuk Sementara"
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
+#, fuzzy
+msgid "Message retract failed"
+msgstr "Pesan telah ditarik kembali dengan sukses"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
+#, fuzzy
+msgid "The server did not allow the selected message to be retracted."
+msgstr "Ubah pesan terpilih menjadi tugas baru"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+#, fuzzy
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "Folder dengan nama &quot;{1}&quot; sudah ada. Silakan gunakan nama lain."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+#, fuzzy
+msgid "Account Already Exists"
+msgstr "Tanda tangan Sudah Ada"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
+#, fuzzy
+msgid "Invalid user"
+msgstr "Tanda tangan tidak sah"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
+msgstr ""
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
+#, fuzzy
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "Tidak dapat menyimpan ke berkas &quot;{0}&quot;."
+
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
+#, fuzzy
+msgid "Specify User"
+msgstr "Pilih Pengguna"
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
+msgid "You have already given proxy permissions to this user."
+msgstr ""
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+#, fuzzy
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "Tidak dapat menyimpan ke berkas autosave &quot;{0}&quot;."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#, fuzzy
+msgid "Do you want to resend the meeting?"
+msgstr "Apakah Anda ingin menghapus pertemuan ini?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#, fuzzy
+msgid "Do you want to resend the recurring meeting?"
+msgstr "Apakah Anda ingin menghapus pertemuan ini?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#, fuzzy
+msgid "Do you want to retract the original item?"
+msgstr "Teruskan email yang belum selesai?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#, fuzzy
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "_Hapus objek ini dari seluruh kotak surat penerima yang lain?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
+#, fuzzy
+msgid "This is a recurring meeting"
+msgstr "Buat ini sebagai acara berulang"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid "This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered."
+msgstr ""
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
+#, fuzzy
+msgid "Would you like to accept it?"
+msgstr "Apakah Anda ingin menyimpan semua perubahan yang telah dilakukan?"
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
+#, fuzzy
+msgid "Would you like to decline it?"
+msgstr "Apakah Anda ingin menyimpan semua perubahan yang telah dilakukan?"
+
+#: ../plugins/groupwise-features/properties.ui.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Pengguna:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:509
-msgid "Message"
-msgstr "Pesan"
+#: ../plugins/groupwise-features/properties.ui.h:2
+#, fuzzy
+msgid "C_ustomize notification message"
+msgstr "_Sesuaikan pesan pemberitahuan"
+
+#: ../plugins/groupwise-features/properties.ui.h:3
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kon_tak"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.ui.h:6
 msgid "Shared Folder Notification"
 msgstr "Notifikasi Folder Kongsian"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Para peserta akan menerima notifikasi berikut.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontak..."
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-msgid "_Customize notification message"
-msgstr "_Sesuaikan pesan pemberitahuan"
-
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Tidak Dibagi"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
-msgid "_Shared With ..."
+#: ../plugins/groupwise-features/properties.ui.h:14
+#, fuzzy
+msgid "_Shared With..."
 msgstr "Kong_sikan Dengan..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
 msgstr "_Berbagi"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-msgid "<b>Name</b>"
-msgstr "<b>Nama</b>"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "Hak Akses"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
 msgid "Add/Edit"
 msgstr "Tambah/Ubah"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
 msgid "Con_tacts"
 msgstr "Kon_tak"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
 msgid "Modify _folders/options/rules/"
 msgstr "Ubah _folder/pilihan/aturan/"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
 msgid "Read items marked _private"
 msgstr "Baca objek ditandai _pribadi"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
 msgid "Reminder Notes"
 msgstr "Catatan Pengingat"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
 msgstr "Langganan _alarm"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
 msgstr "Langganan _notifikasi"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "Sudah _Dibaca"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
 msgstr "_Tulis"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
+#, fuzzy
+msgid "permission to read|_Read"
+msgstr "Hak akses ditolak"
+
+#: ../plugins/groupwise-features/proxy-listing.ui.h:1
 msgid "Proxy"
 msgstr "Proksi"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>Nama Akun</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "Login Proksi"
 
-#: ../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
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%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
-msgid "_Proxy Login..."
-msgstr "Login _Proksi..."
-
-#: ../plugins/groupwise-features/proxy.c:697
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:690
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Tab Proksi hanya tersedia apabila akun ini online."
 
-#: ../plugins/groupwise-features/proxy.c:702
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Tab Proksi hanya tersedia apabila akun ini dimatikan."
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+#, fuzzy
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Proksi"
+
+#: ../plugins/groupwise-features/proxy.c:929
+#: ../plugins/groupwise-features/share-folder.c:701
+msgid "Add User"
+msgstr "Tambah Pengguna"
+
+#: ../plugins/groupwise-features/send-options.c:212
+#, fuzzy
+msgid "Advanced send options"
+msgstr "Sisipkan pilihan kirim lebih lanjutan"
+
+#: ../plugins/groupwise-features/share-folder-common.c:313
+#: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "Pengguna"
 
-#: ../plugins/groupwise-features/share-folder-common.c:323
+#: ../plugins/groupwise-features/share-folder-common.c:314
 msgid "Enter the users and set permissions"
 msgstr "Isi informasi pengguna dan hak aksesnya"
 
-#: ../plugins/groupwise-features/share-folder-common.c:342
-msgid "New _Shared Folder..."
-msgstr "Buat Folder Kong_si..."
-
-#: ../plugins/groupwise-features/share-folder-common.c:450
+#: ../plugins/groupwise-features/share-folder-common.c:412
 msgid "Sharing"
 msgstr "Berbagi"
 
-#: ../plugins/groupwise-features/status-track.c:242
-msgid "Track Message Status..."
+#: ../plugins/groupwise-features/share-folder.c:529
+#, fuzzy
+msgid "Custom Notification"
+msgstr "Rata"
+
+#: ../plugins/groupwise-features/share-folder.c:741
+#, fuzzy
+msgid "Add   "
+msgstr "T_ambah..."
+
+#: ../plugins/groupwise-features/status-track.c:123
+#, fuzzy
+msgid "Message Status"
 msgstr "Telusuri Status Pesan..."
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "Plugin untuk mengkonfigurasi sumber kalender hula."
+#. Subject
+#: ../plugins/groupwise-features/status-track.c:137
+#, fuzzy
+msgid "Subject:"
+msgstr "Judul"
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "Konfigurasi Akun Hula"
+#: ../plugins/groupwise-features/status-track.c:151
+#, fuzzy
+msgid "From:"
+msgstr "Dari:"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Calendar"
-msgstr "_Import ke Kalender"
+#: ../plugins/groupwise-features/status-track.c:166
+#, fuzzy
+msgid "Creation date:"
+msgstr "Tanggal penyelesaian"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:88
-msgid "_Import to Tasks"
-msgstr "_Import ke Tugas"
+#: ../plugins/groupwise-features/status-track.c:206
+#, fuzzy
+msgid "Recipient: "
+msgstr "Penerima"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:198
-msgid "Import ICS"
-msgstr "Import ICS"
+#: ../plugins/groupwise-features/status-track.c:213
+#, fuzzy
+msgid "Delivered: "
+msgstr "Saat _terkirim"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:226
-msgid "Select Task List"
-msgstr "Pilih Daftar Tugas"
+#: ../plugins/groupwise-features/status-track.c:219
+#, fuzzy
+msgid "Opened: "
+msgstr "Buka"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:230
-msgid "Select Calendar"
-msgstr "Pilih Kalender"
+#: ../plugins/groupwise-features/status-track.c:224
+#, fuzzy
+msgid "Accepted: "
+msgstr "Terima"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
-msgid "_Import"
-msgstr "_Impor"
+#: ../plugins/groupwise-features/status-track.c:229
+#, fuzzy
+msgid "Deleted: "
+msgstr "%s '%s' telah dihapus"
 
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
-msgid "iCalendar format (.ics)"
-msgstr "Bentuk iCalendar (.ics)"
+#: ../plugins/groupwise-features/status-track.c:234
+#, fuzzy
+msgid "Declined: "
+msgstr "Ditolak"
 
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "Sinkronkan tugas/kalender/buku alamat terpilih dengan iPod Apple"
+#: ../plugins/groupwise-features/status-track.c:239
+#, fuzzy
+msgid "Completed: "
+msgstr "Selesai"
 
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
-msgstr "Sinkronkan ke iPod"
+#: ../plugins/groupwise-features/status-track.c:244
+#, fuzzy
+msgid "Undelivered: "
+msgstr "Saat _terkirim"
 
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "Sinkronisasi iPod"
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline Image"
+msgstr "Biasa"
 
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "Tanpa direktori keluaran!"
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+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."
+#: ../plugins/imap-features/imap-headers.c:325
+#: ../plugins/imap-features/imap-headers.ui.h:2
+#, fuzzy
+msgid "Custom Headers"
+msgstr "Cantu_mkan pesan"
+
+#: ../plugins/imap-features/imap-headers.c:338
+#: ../plugins/imap-features/imap-headers.ui.h:5
+#, fuzzy
+msgid "IMAP Headers"
+msgstr "Kepala Surat"
+
+#: ../plugins/imap-features/imap-headers.ui.h:1
+msgid "Basic and _Mailing List Headers (Default)"
 msgstr ""
-"Direktori keluaran tidak ditemukan pada iPod! Coba pastikan iPod sudah di "
-"konfigurasikan dengan benar dan coba lagi."
 
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "Tidak dapat mengexport data!"
+#: ../plugins/imap-features/imap-headers.ui.h:3
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
 
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "Mengimpor data gagal."
+#: ../plugins/imap-features/imap-headers.ui.h:6
+msgid ""
+"Select your IMAP Header Preferences. \n"
+"The more headers you have the more time it will take to download."
+msgstr ""
 
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "Buku alamat tidak dapat dibuka!"
+#: ../plugins/imap-features/imap-headers.ui.h:8
+msgid ""
+"_Basic Headers - (Fastest) \n"
+"Use this if you do not have filters based on mailing lists"
+msgstr ""
 
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "Tidak bisa membuka buku alamat Evolution untuk mengexport data."
+#: ../plugins/imap-features/imap-headers.ui.h:10
+#, fuzzy
+msgid "_Fetch All Headers"
+msgstr "Judul Penuh"
 
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "Tidak dapat membuka kalender/tugas!"
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
+msgid "Fine-tune your IMAP accounts."
+msgstr ""
 
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "IMAP Features"
 msgstr ""
-"Tidak dapat membuka daftar kalender/tugas Evolution untuk mengeksport data."
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:391
+#: ../plugins/itip-formatter/itip-formatter.c:475
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Tidak dapat membuka kalender '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:411
+#: ../plugins/itip-formatter/itip-formatter.c:641
 #, 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:437
+#: ../plugins/itip-formatter/itip-formatter.c:677
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Menemukan pertemuan pada kalender '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:513
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Unable to find any calendars"
 msgstr "Gagal menemukan kalender apapun"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find this meeting in any calendar"
 msgstr "Gagal menemukan pertemuan ini pada kelender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find this task in any task list"
 msgstr "Gagal menemukan tugas ini pada daftar tugas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
-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:791
+#, fuzzy
+msgid "Unable to find this memo in any memo list"
+msgstr "Gagal menemukan tugas ini pada daftar tugas"
+
+#: ../plugins/itip-formatter/itip-formatter.c:862
+#, fuzzy
+msgid "Opening the calendar. Please wait.."
+msgstr "Buka kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:601
+#: ../plugins/itip-formatter/itip-formatter.c:865
 msgid "Searching for an existing version of this appointment"
 msgstr "Mencari versi yang ada untuk pertemuan ini"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:1046
 msgid "Unable to parse item"
 msgstr "Data tidak dapat diuraikan"
 
-#: ../plugins/itip-formatter/itip-formatter.c:853
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, 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:864
+#: ../plugins/itip-formatter/itip-formatter.c:1145
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Terima kalender '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:1149
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Terkirim sebagai tentatif pada kalender '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:1154
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Tolak kalender '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:878
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Kirim ke kalender '%s' sebagai dibatalkan"
 
-#: ../plugins/itip-formatter/itip-formatter.c:971
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Pengatur telah menghapus delegasi %s."
 
-#: ../plugins/itip-formatter/itip-formatter.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Kirimkan nota pembatalan pada delegasi"
 
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:1262
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Nota pembatalan tidak dapat dikirimkan pada delegasi"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:1373
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-"Status peserta tidak dapat diperbarui karena berisi status yang tidak "
-"dikenal!"
+msgstr "Status peserta tidak dapat diperbarui karena berisi status yang tidak dikenal!"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1402
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Data peserta %s tidak dapat diperbarui"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Attendee status updated"
 msgstr "Status peserta diperbarui"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1432
+#, fuzzy
+msgid "Meeting information sent"
+msgstr "Informasi Pertemuan"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#, fuzzy
+msgid "Task information sent"
+msgstr "Informasi tugas"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1438
+#, fuzzy
+msgid "Memo information sent"
+msgstr "Tidak Ada Informasi"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1447
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1450
+#, fuzzy
+msgid "Unable to send task information, the task does not exist"
+msgstr "Gagal menemukan tugas ini pada daftar tugas"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1453
+msgid "Unable to send memo information, the memo does not exist"
+msgstr ""
+
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1518
+#, fuzzy
+msgid "calendar.ics"
+msgstr "Kalender"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1523
+#, fuzzy
+msgid "Save Calendar"
+msgstr "Kalender Baru"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1587
 msgid "The calendar attached is not valid"
 msgstr "Data kalender berikut salah"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1224
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
-msgstr ""
-"Pesan ini katanya berisi kalender, tapi kalendernya bukan merupakan "
-"iCalendar yang benar"
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
+msgstr "Pesan ini katanya berisi kalender, tapi kalendernya bukan merupakan iCalendar yang benar"
 
-#: ../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:1628
+#: ../plugins/itip-formatter/itip-formatter.c:1656
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "The item in the calendar is not valid"
 msgstr "Objek dalam kalender ini tidak benar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
-#: ../plugins/itip-formatter/itip-formatter.c:1278
-#: ../plugins/itip-formatter/itip-formatter.c:1356
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-msgstr ""
-"Email ini berisi kalender, tapi ternyata tidak terdapat informasi tentang "
-"acara, tugas atau informasi jadwal sibuk/bebasnya"
+#: ../plugins/itip-formatter/itip-formatter.c:1629
+#: ../plugins/itip-formatter/itip-formatter.c:1657
+#: ../plugins/itip-formatter/itip-formatter.c:1763
+msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
+msgstr "Email ini berisi kalender, tapi ternyata tidak terdapat informasi tentang acara, tugas atau informasi jadwal sibuk/bebasnya"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1670
 msgid "The calendar attached contains multiple items"
 msgstr "Kalender yang terlampir terdiri dari banyak objek"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr ""
-"Untuk memproses seluruh objek, berkas harus disimpan dan kalender telah "
-"diimport."
+#: ../plugins/itip-formatter/itip-formatter.c:1671
+msgid "To process all of these items, the file should be saved and the calendar imported"
+msgstr "Untuk memproses seluruh objek, berkas harus disimpan dan kalender telah diimport."
+
+#: ../plugins/itip-formatter/itip-formatter.c:2436
+#, fuzzy
+msgid "This meeting recurs"
+msgstr "Pertemuan ini ber_ulang"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2439
+#, fuzzy
+msgid "This task recurs"
+msgstr "Pertemuan ini ber_ulang"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2442
+#, fuzzy
+msgid "This memo recurs"
+msgstr "Pertemuan ini ber_ulang"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2063
+#: ../plugins/itip-formatter/itip-formatter.c:2676
 msgid "_Delete message after acting"
 msgstr "_Hapus pesan setelah beraksi"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:2105
+#: ../plugins/itip-formatter/itip-formatter.c:2686
+#: ../plugins/itip-formatter/itip-formatter.c:2719
 msgid "Conflict Search"
 msgstr "Pencarian Bermasalah"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../plugins/itip-formatter/itip-formatter.c:2701
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Cari adanya jadwal pertemuan yang bentrok pada kalender"
 
-#. 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
-msgid "Today"
-msgstr "Hari ini"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Hari ini %Hl:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Hari ini %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:209
 msgid "Today %l:%M:%S %p"
 msgstr "Hari ini %H:%M:%s"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:214
-msgid "Tomorrow"
-msgstr "Besok"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Besok %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Besok %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:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Besok %H:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Besok %H:%M"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:251
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%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:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %H:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B %Y %H:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:526
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:528
+#, c-format
+msgid "Received on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> telah memublikasikan informasi rapat berikut melalui %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> telah memublikasikan informasi rapat berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> telah mendelegasikan rapat berikut pada Anda:"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> melalui %s mengharapkan kehadiran Anda pada rapat berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> mengharapkan kehadiran Anda pada rapat berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr ""
-"<b>%s</b> melalui %s berniat untuk menambah agenda pada rapat yang sudah ada:"
+msgstr "<b>%s</b> melalui %s berniat untuk menambah agenda pada rapat yang sudah ada:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> berniat untuk menambah informasi pada rapat:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:382
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> meminta informasi terakhir berkenaan dengan rapat berikut:"
+
+#: ../plugins/itip-formatter/itip-view.c:384
 #, 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> meminta informasi terakhir berkenaan dengan rapat berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:388
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr "<b>%s</b> telah membalas respon untuk rapat berikut:"
+
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> telah membalas respon untuk rapat berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> melalui %s telah membatalkan rapat berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> telah membatalkan rapat berikut."
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:400
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr "<b>%s</b> telah mengusulkan perubahan berikut pada rapat."
+
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> telah mengusulkan perubahan berikut pada rapat."
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> melalui %s menolak usulan perubahan berikut pada rapat:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b>  menolak perubahan berikut pada rapat."
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b>melalui %s telah memublikasikan informasi tugas berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> telah memublikasikan informasi tugas berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> mengharapkan penugasan %s untuk tugas-tugas berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> melalui %s telah memberikan penugasan:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> telah memberikan tugas berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr ""
-"<b>%s</b> melalui %s berniat untuk menambah sesuatu pada tugas yang ada:"
+msgstr "<b>%s</b> melalui %s berniat untuk menambah sesuatu pada tugas yang ada:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> berniat untuk menambah sesuatu pada tugas yang ada:"
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:470
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> meminta informasi terakhir berkenaan dengan tugas berikut:"
+
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
+msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> meminta informasi terakhir berkenaan dengan tugas berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:476
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "<b>%s</b> membalas respon tugas berikut:"
+
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> membalas respon tugas berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> melalui %s telah membatalkan tugas berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> telah membatalkan tugas berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:488
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "<b>%s</b> telah mengusulkan perubahan pada tugas:"
+
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> telah mengusulkan perubahan pada tugas:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr ""
-"<b>%s</b> melalui %s telah menolak serangkaian tugas yang telah ditetapkan:"
+msgstr "<b>%s</b> melalui %s telah menolak serangkaian tugas yang telah ditetapkan:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> telah menolak penugasan berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> melalui %s telah menerbitkan memo berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> telah menerbitkan memo berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:540
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> melalui %s berniat untuk menambah pada memo yang sudah ada:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> berniat untuk menambah pada memo yang telah ada:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> melalui %s telah membatalkan memo berbagi berikut:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> telah membatalkan memo berbagi berikut:"
 
+#: ../plugins/itip-formatter/itip-view.c:672
+#, fuzzy
+msgid "All day:"
+msgstr "Sehari Penuh"
+
+#: ../plugins/itip-formatter/itip-view.c:682
+#, fuzzy
+msgid "Start day:"
+msgstr "Tanggal _mulai:"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:682
+#: ../plugins/itip-formatter/itip-view.c:1037
+msgid "Start time:"
+msgstr "Waktu mulai:"
+
+#: ../plugins/itip-formatter/itip-view.c:694
+#, fuzzy
+msgid "End day:"
+msgstr "%d hari"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:694
+#: ../plugins/itip-formatter/itip-view.c:1048
+msgid "End time:"
+msgstr "Waktu berakhir:"
+
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:753
+#: ../plugins/itip-formatter/itip-view.c:827
 msgid "_Open Calendar"
 msgstr "B_uka kalender"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:865
 msgid "_Decline"
 msgstr "_Tolak"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:867
 msgid "_Accept"
 msgstr "Terim_a"
 
-#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:837
 msgid "_Decline all"
 msgstr "Tolak _semua"
 
-#: ../plugins/itip-formatter/itip-view.c:764
+#: ../plugins/itip-formatter/itip-view.c:838
 msgid "_Tentative all"
 msgstr "Semen_tara smua"
 
-#: ../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:838
+#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Tentative"
 msgstr "Semen_tara"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:839
 msgid "_Accept all"
 msgstr "Terim_a semua"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:776
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Send Information"
 msgstr "Kirim Informa_si"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:780
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Update Attendee Status"
 msgstr "Perbar_ui Status Responden"
 
-#: ../plugins/itip-formatter/itip-view.c:783
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Update"
 msgstr "Pembar_uan"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:942
-msgid "Start time:"
-msgstr "Waktu mulai:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:951
-msgid "End time:"
-msgstr "Waktu berakhir:"
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:967
-#: ../plugins/itip-formatter/itip-view.c:1017
+#: ../plugins/itip-formatter/itip-view.c:1068
+#: ../plugins/itip-formatter/itip-view.c:1122
 msgid "Comment:"
 msgstr "Keterangan: "
 
-#: ../plugins/itip-formatter/itip-view.c:1031
-msgid "Send u_pdates to attendees"
+#: ../plugins/itip-formatter/itip-view.c:1107
+#, fuzzy
+msgid "Send _reply to sender"
+msgstr "Balas ke pengi_rim"
+
+#: ../plugins/itip-formatter/itip-view.c:1137
+#, fuzzy
+msgid "Send _updates to attendees"
 msgstr "Kirim pembar_uan ke peserta"
 
-#: ../plugins/itip-formatter/itip-view.c:1040
-msgid "A_pply to all instances"
+#: ../plugins/itip-formatter/itip-view.c:1146
+#, fuzzy
+msgid "_Apply to all instances"
 msgstr "Tera_pkan keseluruh kejadian"
 
-#: ../plugins/itip-formatter/itip-view.c:1709
-msgid "_Tasks :"
-msgstr "_Tugas :"
+#: ../plugins/itip-formatter/itip-view.c:1155
+#, fuzzy
+msgid "Show time as _free"
+msgstr "Tampilkan waktu sebagai waktu si_buk"
 
-#: ../plugins/itip-formatter/itip-view.c:1711
-msgid "Memos :"
-msgstr "Memo :"
+#: ../plugins/itip-formatter/itip-view.c:1158
+msgid "_Preserve my reminder"
+msgstr ""
+
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1164
+#, fuzzy
+msgid "_Inherit reminder"
+msgstr "_Ingatkan"
+
+#: ../plugins/itip-formatter/itip-view.c:1907
+msgid "_Tasks:"
+msgstr "_Tugas:"
+
+#: ../plugins/itip-formatter/itip-view.c:1909
+#, fuzzy
+msgid "_Memos:"
+msgstr "Memo"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
+#, fuzzy
+msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Tampilkan bagian teks/kalender dalam pesan."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
@@ -16729,135 +17849,392 @@ msgid "Itip Formatter"
 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;?"
-msgstr ""
-"&quot;{0}&quot; telah mendelegasikan pertemuan. Anda ingin memasukkan "
-"delegasi &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; telah mendelegasikan pertemuan. Anda ingin memasukkan delegasi &quot;{1}&quot;?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr "Rapat ini telah didelegasikan"
 
 #: ../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 "Balasan diperoleh bukan dari peserta. Tambahkan beliau sebagai peserta?"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+#, fuzzy
+msgid "Beep or play sound file."
+msgstr "Pilih berkas suara"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Blink icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable D-Bus messages."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Enable icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#, fuzzy
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "Buat pesan D-BUS saat email baru datang"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Notify new messages for Inbox only."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Putar berkas suara saat ada email _datang"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Popup message together with the icon."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#, fuzzy
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "Dapatkan pengiriman pemberitahuan ketika pesan anda dibaca"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#, fuzzy
+msgid "Sound file name to be played."
+msgstr "Nama file belum diberikan."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#, fuzzy
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "Mainkan suara saat email datang."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#, fuzzy
+msgid "Use sound theme"
+msgstr "Gunakan garis bawah"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#, fuzzy
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "Putar berkas suara saat ada email _datang"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether show message over the icon when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
+#, fuzzy
+msgid "Whether the icon should blink or not."
+msgstr "Tentukan apakah panel samping kelihatan atau tidak."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:343
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "Notifikasi Email Baru"
+
+#: ../plugins/mail-notification/mail-notification.c:365
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "Notifikasi Email Baru"
+
+#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:496
+#, c-format
 msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] ""
+
+#. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
+#: ../plugins/mail-notification/mail-notification.c:507
+#, fuzzy, c-format
+msgid "From: %s"
+msgstr "Dari:"
+
+#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:519
+#, fuzzy, c-format
+msgid "Subject: %s"
+msgstr "Judul"
+
+#: ../plugins/mail-notification/mail-notification.c:528
+#, c-format
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] ""
+
+#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:551
+#, fuzzy
+msgid "New email"
+msgstr "Memo baru"
+
+#: ../plugins/mail-notification/mail-notification.c:605
+#, fuzzy
+msgid "Show icon in _notification area"
+msgstr "Tampilkan alaram pada bagian pemberitahuan"
+
+#: ../plugins/mail-notification/mail-notification.c:633
+#, fuzzy
+msgid "B_link icon in notification area"
+msgstr "_Sesuaikan pesan pemberitahuan"
+
+#: ../plugins/mail-notification/mail-notification.c:643
+msgid "Popup _message together with the icon"
 msgstr ""
-"Balasan diperoleh bukan dari peserta. Tambahkan beliau sebagai peserta?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
-msgid "Proxy _Logout"
-msgstr "Ke_luar dari Proxy"
+#: ../plugins/mail-notification/mail-notification.c:828
+#, fuzzy
+msgid "_Play sound when new messages arrive"
+msgstr "Putar berkas suara saat ada email _datang"
 
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "Bolehkan untuk menonaktifkan akun."
+#: ../plugins/mail-notification/mail-notification.c:857
+#, fuzzy
+msgid "_Beep"
+msgstr "Bunyi Bip"
 
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-msgid "Disable Account"
-msgstr "Matikan Akun"
+#: ../plugins/mail-notification/mail-notification.c:870
+#, fuzzy
+msgid "Use sound _theme"
+msgstr "Gunakan garis bawah"
+
+#: ../plugins/mail-notification/mail-notification.c:889
+#, fuzzy
+msgid "Play _file:"
+msgstr "Saringan _pencarian:"
+
+#: ../plugins/mail-notification/mail-notification.c:900
+msgid "Select sound file"
+msgstr "Pilih berkas suara"
+
+#: ../plugins/mail-notification/mail-notification.c:958
+msgid "Notify new messages for _Inbox only"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:967
+#, fuzzy
+msgid "Generate a _D-Bus message"
+msgstr "Buat daftar email"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+#, fuzzy
+msgid "Mail Notification"
+msgstr "Notifikasi Email Baru"
 
-#: ../plugins/mail-remote/client.c:30
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#, fuzzy
+msgid "Notifies you when new mail messages arrive."
+msgstr "Mainkan suara saat email datang."
+
+#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
-msgid "System error: %s"
-msgstr "Error sistem: %s"
+msgid "Created from a mail by %s"
+msgstr ""
 
-#: ../plugins/mail-remote/client.c:32
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
-msgid "Camel error: %s"
-msgstr "Error camel: %s"
+msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
+msgstr ""
 
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
-msgstr "Akun tidak boleh mengirim email"
+#: ../plugins/mail-to-task/mail-to-task.c:492
+#, c-format
+msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
+msgstr ""
 
-#: ../plugins/mail-remote/evolution-mail-store.c:605
-msgid "No store available"
-msgstr "Tidak ada tempat penyimpanan"
+#: ../plugins/mail-to-task/mail-to-task.c:495
+#, c-format
+msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
+msgstr ""
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+#: ../plugins/mail-to-task/mail-to-task.c:512
+msgid "Selected calendar contains some events for the given mails already. Would you like to create new events anyway?"
 msgstr ""
-"Plugin yang mengimplementasikan antarmuka CORBA untuk mengakses email dari "
-"jarak jauh."
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-msgid "Mail Remote"
-msgstr "Email Server"
+#: ../plugins/mail-to-task/mail-to-task.c:515
+msgid "Selected task list contains some tasks for the given mails already. Would you like to create new tasks anyway?"
+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 "Plugin yang dapat membuat jadwal pertemuan berdasarkan isi email."
+#: ../plugins/mail-to-task/mail-to-task.c:518
+msgid "Selected memo list contains some memos for the given mails already. Would you like to create new memos anyway?"
+msgstr ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "_Jadikan Jadwal Pertemuan"
+#: ../plugins/mail-to-task/mail-to-task.c:536
+msgid "Selected calendar contains an event for the given mail already. Would you like to create new event anyway?"
+msgid_plural "Selected calendar contains events for the given mails already. Would you like to create new events anyway?"
+msgstr[0] ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "Email jadi jadwal rapat"
+#: ../plugins/mail-to-task/mail-to-task.c:542
+msgid "Selected task list contains a task for the given mail already. Would you like to create new task anyway?"
+msgid_plural "Selected task list contains tasks for the given mails already. Would you like to create new tasks anyway?"
+msgstr[0] ""
 
-#: ../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 "Plugin yang dapat membuat daftar tugas berdasarkan isi email."
+#: ../plugins/mail-to-task/mail-to-task.c:548
+msgid "Selected memo list contains a memo for the given mail already. Would you like to create new memo anyway?"
+msgid_plural "Selected memo list contains memos for the given mails already. Would you like to create new memos anyway?"
+msgstr[0] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:607
+#, fuzzy
+msgid "[No Summary]"
+msgstr "Tidak ada judul"
+
+#: ../plugins/mail-to-task/mail-to-task.c:618
+msgid "Invalid object returned from a server"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:689
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#, fuzzy, c-format
+msgid "Cannot open calendar. %s"
+msgstr "Tidak dapat membuka file"
+
+#: ../plugins/mail-to-task/mail-to-task.c:725
+msgid "Selected source is read only, thus cannot create event there. Select other source, please."
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:728
+msgid "Selected source is read only, thus cannot create task there. Select other source, please."
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:731
+msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:934
+#, fuzzy, c-format
+msgid "Cannot get source list. %s"
+msgstr ""
+"Tidak dapat membuat file output: %s:\n"
+"%s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1053
+#, fuzzy
+msgid "Create an _Event"
+msgstr "_Buat tampilan baru"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1055
+#, fuzzy
+msgid "Create a new event from the selected message"
+msgstr "Tulis balasan pada pengirim email ini"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1060
+#, fuzzy
+msgid "Create a Mem_o"
+msgstr "Buat memo baru"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1062
+#, fuzzy
+msgid "Create a new memo from the selected message"
+msgstr "Tulis balasan pada pengirim email ini"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1067
+#, fuzzy
+msgid "Create a _Task"
+msgstr "Buat tugas baru"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1069
+#, fuzzy
+msgid "Create a new task from the selected message"
+msgstr "Tulis balasan pada pengirim email ini"
 
-#: ../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 "Ubah Menjadi _Tugas"
+#: ../plugins/mail-to-task/mail-to-task.c:1077
+#, fuzzy
+msgid "Create a _Meeting"
+msgstr "Perte_muan Baru"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "Email jadi penugasan"
+#: ../plugins/mail-to-task/mail-to-task.c:1079
+#, fuzzy
+msgid "Create a new meeting from the selected message"
+msgstr "Buat usulan pertemuan"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#, fuzzy
+msgid "Convert a mail message to a task."
 msgstr "Ubah pesan terpilih menjadi tugas baru"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Contact list _owner"
-msgstr "Hubungi _pemilik milis"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:279
+msgid "Get List _Archive"
+msgstr "Dapatkan _Arsip Daftar"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Get list _archive"
-msgstr "Buka _arsip milis"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:281
+msgid "Get an archive of the list this message belongs to"
+msgstr "Dapatkan arsip dari pesan daftar ini milik siapa"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-msgid "Get list _usage information"
-msgstr "Informasi Perat_uran Milis"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
+msgid "Get List _Usage Information"
+msgstr "Dapatkan Informasi Pengg_unaan Daftar"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-msgid "Mailing List Actions"
-msgstr "Tindakan Untuk Milis"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "Cari informasi tentang milis ini"
 
-#: ../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 "Mi_lis"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+msgid "Contact List _Owner"
+msgstr "Hubungi _Pemilik Daftar"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, "
-"unsubscribe, ...)."
-msgstr "Menyediakan aksi untuk perintah milis umum (daftar, lepas ...)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "Hubungi pemilik milis ini"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-msgid "_Post message to list"
-msgstr "_Kirim email ke milis"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+msgid "_Post Message to List"
+msgstr "_Kirim pesan ke Daftar"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-msgid "_Subscribe to list"
-msgstr "_Berlangganan"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "Kirim email ke milis ini"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-msgid "_Un-subscribe to list"
-msgstr "_Berhenti langganan"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+msgid "_Subscribe to List"
+msgstr "_Berlangganan ke Daftar"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Langganan milis ini"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+msgid "_Unsubscribe from List"
+msgstr "_Stop langganan dari daftar"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
+#, fuzzy
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "Keluar dari mailing list pesan ini"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
+msgid "Mailing _List"
+msgstr "Mi_lis"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "Tindakan Untuk Milis"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+#, fuzzy
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "Menyediakan aksi untuk perintah milis umum (daftar, lepas ...)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -16865,14 +18242,11 @@ msgstr "Tidak ada tindakan"
 
 #: ../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 ""
-"Email akan dikirim ke URL \"{0}\". Anda dapat langsung mengirimnya secara "
-"otomatis atau lihat dan mengubahnya terlebih dahulu.\n"
+"Email akan dikirim ke URL \"{0}\". Anda dapat langsung mengirimnya secara otomatis atau lihat dan mengubahnya terlebih dahulu.\n"
 "\n"
 "Jawaban dari milis akan segera Anda peroleh setelah email ini terkirim."
 
@@ -16889,26 +18263,21 @@ msgid "Posting not allowed"
 msgstr "Tidak boleh mengirim email"
 
 #: ../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 ""
-"Anda tidak diperbolehkan mengirim email ke milis ini. Mungkin karena ini "
-"adalah milis satu arah. Silakan kontak pemilik milis untuk lebih jelasnya."
+msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
+msgstr "Anda tidak diperbolehkan mengirim email ke milis ini. Mungkin karena ini adalah milis satu arah. Silakan kontak pemilik milis untuk lebih jelasnya."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
 msgstr "Kirim email ke milis ini?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"Proses tidak dapat diteruskan. Bagian kepala email tidak berisikan "
-"keterangan yang diperlukan untuk diproses.\n"
+"Proses tidak dapat diteruskan. Bagian kepala email tidak berisikan keterangan yang diperlukan untuk diproses.\n"
 "\n"
 "Bagian: {0}"
 
@@ -16923,11 +18292,8 @@ msgstr ""
 "Bagian: {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."
-msgstr ""
-"Email ini tidak berisi kepala informasi yang dibutuhkan untuk tindakan ini."
+msgid "This message does not contain the header information required for this action."
+msgstr "Email ini tidak berisi kepala informasi yang dibutuhkan untuk tindakan ini."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -16937,481 +18303,573 @@ msgstr "Ubah _email"
 msgid "_Send message"
 msgstr "_Kirim email"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "Hubungi _Pemilik Daftar"
-
-#: ../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 "Hubungi pemilik milis ini"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Dapatkan _Arsip Daftar"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "Dapatkan Informasi Pengg_unaan Daftar"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
-msgid "Get an archive of the list this message belongs to"
-msgstr "Dapatkan arsip dari pesan daftar ini milik siapa"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-msgid "Get information about the usage of the list this message belongs to"
-msgstr "Cari informasi tentang milis ini"
-
-#: ../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 "Kirim email ke milis ini"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Langganan milis ini"
+#: ../plugins/mark-all-read/mark-all-read.c:41
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "Tandai semua pesa dalam subfolder dengan terbaca?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "Keluar dari mailing list pesan ini"
+#: ../plugins/mark-all-read/mark-all-read.c:43
+#, fuzzy
+msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
+msgstr "Akan menandai seluruh pesan sebagai terbaca pada folder terpilih dan subfoldernya."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "_Kirim pesan ke Daftar"
+#: ../plugins/mark-all-read/mark-all-read.c:168
+#, fuzzy
+msgid "In Current Folder and _Subfolders"
+msgstr "Buat subfolder"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "_Berlangganan ke Daftar"
+#: ../plugins/mark-all-read/mark-all-read.c:182
+#, fuzzy
+msgid "In Current _Folder Only"
+msgstr "Folder Saat ini"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "_Stop langganan dari daftar"
+#: ../plugins/mark-all-read/mark-all-read.c:402
+msgid "Mark Me_ssages as Read"
+msgstr "Anggap Pe_san sudah Dibaca"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 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"
-
-#: ../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 "Dipergunakan untuk menandai seluruh pesan dalam folder sebagai dibaca"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Tandai kalender offline"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Tandai kalender untuk keperluan pemakaian tanpa sambungan jaringan."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
-msgstr "_Jangan buat ini tersedia offline"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
-msgstr "Tandai Kalender untuk dapat digunakan pada kondisi tidak tersa_mbung"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "Plugin yang mengimplementasikan plugin mono."
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-msgid "Mono Loader"
-msgstr "Pembuka Mono"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-msgid "Generates a D-BUS message when new mail arrives."
-msgstr "Buat pesan D-BUS saat email baru datang"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
-msgstr "Notifikasi Email Baru"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-msgid "New mail notify"
-msgstr "Pemberitahuan adanya email baru"
+#, fuzzy
+msgid "Mark all messages in a folder as read."
+msgstr "Tandai semua pesa dalam subfolder dengan terbaca?"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "Plugin untuk mengelola aktif tidaknya suatu plugin."
+#, fuzzy
+msgid "Manage your Evolution plugins."
+msgstr "Atur Evolution"
 
-#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:180
+#: ../plugins/plugin-manager/plugin-manager.c:244
 msgid "Plugin Manager"
 msgstr "Pengatur Plugin"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
-msgid "Enable and disable plugins"
-msgstr "Aktifkan dan matikan plugin"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "_Plugins"
-msgstr "_Plugin"
-
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
 msgstr "Pembuat"
 
-#: ../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 "Keterangan"
-
-#: ../plugins/plugin-manager/plugin-manager.c:193
+#: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
-msgstr ""
-"Catatan: Ada perubahan yang tidak langsung aktif hingga Anda menjalankan "
-"ulang Evolution"
+msgstr "Catatan: Ada perubahan yang tidak langsung aktif hingga Anda menjalankan ulang Evolution"
 
-#: ../plugins/plugin-manager/plugin-manager.c:202
-#: ../plugins/plugin-manager/plugin-manager.c:262
+#: ../plugins/plugin-manager/plugin-manager.c:285
+#, fuzzy
+msgid "Overview"
+msgstr "Tinjau"
+
+#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:418
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"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"
+#: ../plugins/plugin-manager/plugin-manager.c:430
+msgid "_Plugins"
+msgstr "_Plugin"
+
+#: ../plugins/plugin-manager/plugin-manager.c:432
+msgid "Enable and disable plugins"
+msgstr "Aktifkan dan matikan plugin"
 
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "Moda Teks"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+#, fuzzy
+msgid "Prefer Plain Text"
 msgstr "Pilih teks biasa"
 
-#: ../plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "Sajikan HTML bila ada"
 
-#: ../plugins/prefer-plain/prefer-plain.c:106
-msgid "Prefer PLAIN"
-msgstr "Pilih SEDERHANA"
+#: ../plugins/prefer-plain/prefer-plain.c:198
+msgid "Let Evolution choose the best part to show."
+msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:107
-msgid "Only ever show PLAIN"
-msgstr "Hanya tampilkan SEDERHANA"
+#: ../plugins/prefer-plain/prefer-plain.c:199
+#, fuzzy
+msgid "Show plain text if present"
+msgstr "Sajikan HTML bila ada"
 
-#: ../plugins/prefer-plain/prefer-plain.c:150
-msgid "HTML Mode"
-msgstr "Moda HTML"
+#: ../plugins/prefer-plain/prefer-plain.c:199
+msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
+msgstr ""
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print mail from composer"
-msgstr "Aktifkan pilihan untuk mencetak email dari program penulis email"
+#: ../plugins/prefer-plain/prefer-plain.c:200
+#, fuzzy
+msgid "Only ever show plain text"
+msgstr "Hanya tampilkan SEDERHANA"
 
-#: ../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 "Tampilan _Cetak"
+#: ../plugins/prefer-plain/prefer-plain.c:200
+msgid "Always show plain text part and make attachments from other parts, if requested."
+msgstr ""
 
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Cetak pesan"
+#: ../plugins/prefer-plain/prefer-plain.c:247
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:267
+#, fuzzy
+msgid "HTML _Mode"
+msgstr "Moda HTML"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Pemprofil Evolution"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "Tulis log dari profil data kejadian."
+msgid "Profile data events in Evolution (for developers only)."
+msgstr ""
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "Bolehkan kalender untuk diterbitkan di web"
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#, fuzzy
+msgid "Import Outlook messages from PST file"
+msgstr "Impor dari Pine"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook PST import"
+msgstr "CSV Outlook dan Pengimpor Tab"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr ""
+
+#: ../plugins/pst-import/pst-importer.c:296
+msgid "_Mail"
+msgstr "E_mail"
+
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:314
+#, fuzzy
+msgid "_Address Book"
+msgstr "_Buku Alamat"
+
+#. Appointments
+#: ../plugins/pst-import/pst-importer.c:321
+#, fuzzy
+msgid "A_ppointments"
+msgstr "Jadwal Pertemuan"
+
+#. Tasks
+#: ../plugins/pst-import/pst-importer.c:327
+#: ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tugas"
+
+#. Journal
+#: ../plugins/pst-import/pst-importer.c:333
+#, fuzzy
+msgid "_Journal entries"
+msgstr "Isi jurmal - %s"
+
+#: ../plugins/pst-import/pst-importer.c:348
+#, fuzzy
+msgid "Importing Outlook data"
+msgstr "Mengimpor data Elm"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../plugins/publish-calendar/publish-calendar.c:146
+#: ../plugins/publish-calendar/publish-calendar.c:153
 msgid "Calendar Publishing"
 msgstr "Penerbitan Kalender"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Lokasi"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#, fuzzy
+msgid "Publish calendars to the web."
+msgstr "Bolehkan kalender untuk diterbitkan di web"
+
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
+#, fuzzy, c-format
+msgid "Could not open %s:"
+msgstr "Tidak dapat membuka asal"
+
+#: ../plugins/publish-calendar/publish-calendar.c:210
+#, fuzzy, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "Tidak dapat membuka pesan S/MIME: Error tidak diketahui"
+
+#: ../plugins/publish-calendar/publish-calendar.c:230
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:232
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:276
+#, c-format
+msgid "Mount of %s failed:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "Aktifka_n"
+
+#: ../plugins/publish-calendar/publish-calendar.c:739
+#, fuzzy
+msgid "Are you sure you want to remove this location?"
+msgstr "Apakah Anda ingin menghapus URL ini?"
+
+#. To Translators: This is shown to a user when creation of a new thread,
+#. where the publishing should be done, fails. Basically, this shouldn't
+#. ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1051
+#, fuzzy
+msgid "Could not create publish thread."
+msgstr "Tidak dapat membuat pesan email."
+
+#: ../plugins/publish-calendar/publish-calendar.c:1059
 msgid "_Publish Calendar Information"
 msgstr "_Terbitkan Informasi Kalender"
 
-#: ../plugins/publish-calendar/publish-calendar.c:399
-msgid "Are you sure you want to remove this URL?"
-msgstr "Apakah Anda ingin menghapus URL ini?"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+#, fuzzy
+msgid "Custom Location"
+msgstr "Lokasi Lain"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:2
-msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">Lokasi</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+#, fuzzy
+msgid "Daily"
+msgstr "Harian"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">Sumber</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+#, fuzzy
+msgid "FTP (with login)"
+msgstr "FTP (dengan login)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#, fuzzy
+msgid "Manual (via Actions menu)"
 msgstr ""
 "Harian\n"
 "Mingguan\n"
 "Manual (melalui menu Aksi)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
 msgstr "P_ort:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#, fuzzy
+msgid "Public FTP"
+msgstr "FTP publik"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
 msgstr "Lokasi Publikasi"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
 msgstr "_Frekuensi Publikasi:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"SSH\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-msgstr ""
-"SSH\n"
-"Publik FTP\n"
-"FTP (dengan login)\n"
-"Windows berbagi\n"
-"WebDAV (HTTP)\n"
-"WebDAV Aman (HTTPS)\n"
-"Penyesuaian Lokasi"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#, fuzzy
+msgid "Secure WebDAV (HTTPS)"
+msgstr "WebDAV Terenkripsi (HTTPS)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
 msgstr "_Tipe Server:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+#, fuzzy
+msgid "Sources"
+msgstr "Sumber"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
+#, fuzzy
+msgid "Time _duration:"
+msgstr "_Zona waktu:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+#, fuzzy
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+#, fuzzy
+msgid "Weekly"
+msgstr "Mingguan"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+#, fuzzy
+msgid "Windows share"
+msgstr "Share Windows"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "_Berkas:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+msgid "_Password:"
+msgstr "_Sandi:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "_Terbitkan sebagai:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
-msgid ""
-"iCal\n"
-"Free/Busy"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+msgid "_Remember password"
+msgstr "Ingat _sandi"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
+msgid "_Username:"
+msgstr "Pengg_una:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+#, fuzzy
+msgid "iCal"
+msgstr "Panggil"
+
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
-"iCal\n"
-"Bebas/Sibuk"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:101
-msgid "Spamassassin (built-in)"
-msgstr "Spamassassin (built-in)"
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
+#, fuzzy
+msgid "New Location"
+msgstr "Lokasi Baru..."
 
-#: ../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."
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#, fuzzy
+msgid "Edit Location"
+msgstr "Sunting Lokasi"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
+#, c-format
+msgid "SpamAssassin not found, code: %d"
 msgstr ""
-"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"
-msgstr "Plugin sampah Spamassassin"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#, fuzzy, c-format
+msgid "Failed to create pipe: %s"
+msgstr "Gagal saat membuat penyimpanan surat lokal '%s': %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
+#, fuzzy, c-format
+msgid "Error after fork: %s"
+msgstr ""
+"Error pada %s:\n"
+"%s"
 
-#: ../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 "Plugin untuk menyimpan semua atau bagian lampiran sekaligus."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
 
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-msgid "Save attachments"
-msgstr "Simpan lampiran"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
+#, c-format
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
+msgstr ""
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments ..."
-msgstr "Simpan Lampiran..."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "Simpan semua lampiran"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
+#, c-format
+msgid "SpamAssassin is not available. Please install it first."
+msgstr ""
 
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "Select save base name"
-msgstr "Pilih basis nama penyimpanan"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
+#, fuzzy
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr "<small>Ini akan membuat filter lebih baik walaupun kerjanya lambat</small>"
 
-#: ../plugins/save-attachments/save-attachments.c:359
-msgid "MIME Type"
-msgstr "Tipe MIME"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
+msgid "I_nclude remote tests"
+msgstr "Lakuka_n penyaringan dari server"
 
-#: ../plugins/save-attachments/save-attachments.c:367
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Simpan"
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+msgid "Filter junk messages using SpamAssassin."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+#, fuzzy
+msgid "SpamAssassin Junk Filter"
+msgstr "Plugin sampah Spamassassin"
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+#, fuzzy
+msgid "SpamAssassin Options"
+msgstr "Spamassassin (built-in)"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:171
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Description List"
 msgstr "Daftar Keterangan"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Categories List"
 msgstr "Daftar Kategori"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Comment List"
 msgstr "Daftar Keterangan"
 
-#: ../plugins/save-calendar/csv-format.c:391
-msgid "Created"
-msgstr "Dibuat"
-
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Contact List"
 msgstr "Daftar Kontak"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Start"
 msgstr "Awal"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "End"
 msgstr "Akhir"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "persen Selesai"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:399
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Attendees List"
 msgstr "Daftar Peserta"
 
-#: ../plugins/save-calendar/csv-format.c:401
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Modified"
 msgstr "Diubah"
 
-#: ../plugins/save-calendar/csv-format.c:552
-msgid "Advanced options for the CSV format"
+#: ../plugins/save-calendar/csv-format.c:530
+#, fuzzy
+msgid "A_dvanced options for the CSV format"
 msgstr "Pilihan lengkap untuk bentuk CSV"
 
-#: ../plugins/save-calendar/csv-format.c:559
-msgid "Prepend a header"
+#: ../plugins/save-calendar/csv-format.c:537
+#, fuzzy
+msgid "Prepend a _header"
 msgstr "Tambahkan judul"
 
-#: ../plugins/save-calendar/csv-format.c:568
-msgid "Value delimiter:"
+#: ../plugins/save-calendar/csv-format.c:546
+#, fuzzy
+msgid "_Value delimiter:"
 msgstr "Pembatas nilai:"
 
-#: ../plugins/save-calendar/csv-format.c:574
-msgid "Record delimiter:"
+#: ../plugins/save-calendar/csv-format.c:553
+#, fuzzy
+msgid "_Record delimiter:"
 msgstr "Pembatas baris:"
 
-#: ../plugins/save-calendar/csv-format.c:580
-msgid "Encapsulate values with:"
+#: ../plugins/save-calendar/csv-format.c:560
+#, fuzzy
+msgid "_Encapsulate values with:"
 msgstr "Bungkus nilai dengan:"
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Bentuk kolom berkoma (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:162
+msgid "iCalendar format (.ics)"
+msgstr "Bentuk iCalendar (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Simpan Pilihan"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
+#, fuzzy
+msgid "Save a calendar or task list to disk."
 msgstr "Simpan kalender atau daftar tugas pilihan dalam disk."
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-msgid "_Save to Disk"
-msgstr "_Simpan ke Disk"
-
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:158
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:396
+#: ../plugins/save-calendar/rdf-format.c:369
 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:111
+#, fuzzy
+msgid "_Format:"
+msgstr "_Format:"
+
+#: ../plugins/save-calendar/save-calendar.c:172
 msgid "Select destination file"
 msgstr "Pilih berkas tujuan"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "Pilih satu sumber"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "Pilih kalender tunggal atau sumber tugas."
+#: ../plugins/save-calendar/save-calendar.c:325
+#, fuzzy
+msgid "Save the selected calendar to disk"
+msgstr "Simpan kalender atau daftar tugas pilihan dalam disk."
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "Show _only this Calendar"
-msgstr "Tampilkan Kalender ini _saja"
+#: ../plugins/save-calendar/save-calendar.c:356
+#, fuzzy
+msgid "Save the selected memo list to disk"
+msgstr "Simpan kalender atau daftar tugas pilihan dalam disk."
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "Show _only this Task List"
-msgstr "Tampilkan hanya Daftar Tuga_s ini saja"
+#: ../plugins/save-calendar/save-calendar.c:387
+#, fuzzy
+msgid "Save the selected task list to disk"
+msgstr "Simpan kalender atau daftar tugas pilihan dalam disk."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "Plugin yang menangani Mulai Ajaib."
+msgid "Guides you through your initial account setup."
+msgstr ""
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Program Bantu Konfigurasi Awal"
+#, fuzzy
+msgid "Setup Assistant"
+msgstr "Asisten"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:110
 msgid "Evolution Setup Assistant"
 msgstr "Program Bantu Pengaturan Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Welcome"
 msgstr "Selamat datang di %h"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:118
 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 ""
@@ -17421,25 +18879,34 @@ 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:153
+#: ../widgets/misc/e-import-assistant.c:385
 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:168
+#: ../widgets/misc/e-import-assistant.c:542
 #, 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:185
+#, fuzzy
+msgid "Importing files"
+msgstr "Mengimpor _satu file"
+
+#: ../plugins/startup-wizard/startup-wizard.c:251
 msgid "Importing data."
 msgstr "Mengimpor data."
 
+#: ../plugins/startup-wizard/startup-wizard.c:257
+msgid "Please wait"
+msgstr "Silakan tunggu sebentar"
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr "Indikasikan jika pengaturan pesan harus kembali ke subjek."
+#, fuzzy
+msgid "Sort mail message threads by subject."
+msgstr "Atur pesan sesuai subjek"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -17450,400 +18917,772 @@ msgid "Thread messages by subject"
 msgstr "Atur pesan sesuai subjek"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
-msgid "Fall back to threading messages by sub_ject"
+#: ../plugins/subject-thread/subject-thread.c:56
+#, fuzzy
+msgid "F_all back to threading messages by subject"
 msgstr "Kembali ke ulir diskusi berdasarkan _judul"
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Shell Evolution"
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
+msgstr ""
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "Pabrik Konfigurasi Shell Evolution"
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Tes Evolution"
+#: ../plugins/templates/templates.c:613
+#, fuzzy
+msgid "No Title"
+msgstr "Jabatan"
+
+#: ../plugins/templates/templates.c:684
+#, fuzzy
+msgid "Save as _Template"
+msgstr "Simpan draf"
+
+#: ../plugins/templates/templates.c:686
+#, fuzzy
+msgid "Save as Template"
+msgstr "Simpan draf"
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Decoder"
+msgstr ""
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline vCards"
+msgstr "VCard Ganda"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr ""
+
+#: ../plugins/vcard-inline/vcard-inline.c:157
+#: ../plugins/vcard-inline/vcard-inline.c:242
+#, fuzzy
+msgid "Show Full vCard"
+msgstr "Tampilkan Keseluruhan Isi VCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:160
+#, fuzzy
+msgid "Show Compact vCard"
+msgstr "Tampilkan Ringkasan VCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:221
+#, fuzzy
+msgid "There is one other contact."
+msgstr "Ada satu %d kontak lainnya."
+
+#: ../plugins/vcard-inline/vcard-inline.c:230
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Ada satu %d kontak lainnya."
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Komponen Tes Evolution"
+#: ../plugins/vcard-inline/vcard-inline.c:251
+#, fuzzy
+msgid "Save in Address Book"
+msgstr "Simpan dalam buku alamat"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "A GNOME Print description of the current printer settings"
-msgstr "Deskripsi pencetakan GNOME untuk pengaturan pencetak aktif"
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "Add WebDAV contacts to Evolution."
+msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+#, fuzzy
+msgid "WebDAV contacts"
+msgstr "Tidak ada kontak"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+msgid "WebDAV"
+msgstr ""
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#, fuzzy
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "Authenticate proxy server connections"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:2
+#, fuzzy
+msgid "Automatic proxy configuration URL"
+msgstr "Pengenalan smiley otomatis"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Versi Evolution"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "Lebar panel samping awal"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+#, fuzzy
+msgid "Default window X coordinate"
+msgstr "Lebar jendela awal"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+#, fuzzy
+msgid "Default window Y coordinate"
+msgstr "Lebar jendela awal"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "Tinggi jendela awal"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
 msgstr "Lebar jendela awal"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
 msgstr "Lebar jendela awal"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+#, fuzzy
+msgid "Enable express mode"
+msgstr "Aktifkan/matikan mode caret"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+#, fuzzy
+msgid "HTTP proxy password"
+msgstr "Masukkan kata sandi"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid "HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "HTTP proxy username"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID atau alias komponen yang ditampilkan pada saat mulai dijalankan."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+#, fuzzy
+msgid "Initial attachment view"
+msgstr "Sisipkan Lampiran"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Initial file chooser folder"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "Versi konfigurasi Evolution terakhir yang diupgrade."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+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.h:25
+msgid "Non-proxy hosts"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+#, fuzzy
+msgid "Proxy configuration mode"
+msgstr "Atur konfigurasi Pilot"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "SOCKS proxy host name"
 msgstr ""
-"Daftar path folder yang akan disinkronkan ke disk untuk keperluan offline"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Printer settings"
-msgstr "Pengaturan pencetak"
+#: ../shell/apps_evolution_shell.schemas.in.h:29
+msgid "SOCKS proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Secure HTTP proxy host name"
+msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+msgid "Secure HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
 msgstr "Panel samping kelihatan"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 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.h:35
+#: ../shell/main.c:305
 msgid "Start in offline mode"
 msgstr "Jalankan dalam moda offline"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
 msgstr "Panel status kelihatan"
 
-#: ../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 ""
-"Versi konfigurasi Evolution, dengan tingkat utama/kecil/konfigurasi "
-"(contohnya \"2.6.0\")."
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgstr "Versi konfigurasi Evolution, dengan tingkat utama/kecil/konfigurasi (contohnya \"2.6.0\")."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+#, fuzzy
+msgid "The default X coordinate for the main window."
+msgstr "Lebar default untuk jendela utama, dalam piksel."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+#, fuzzy
+msgid "The default Y coordinate for the main window."
+msgstr "Lebar default untuk jendela utama, dalam piksel."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 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.h:41
 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.h:42
 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
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgstr "Versi peningkatan terakhir Evolution, dengan tingkat utama/kecil/konfigurasi (contohnya \"2.6.0\")."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "The machine name to proxy HTTP through."
 msgstr ""
-"Versi peningkatan terakhir Evolution, dengan tingkat utama/kecil/konfigurasi "
-"(contohnya \"2.6.0\")."
 
-#: ../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."
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "The machine name to proxy socks through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
 msgstr ""
-"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.h:48
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:50
+msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
+msgstr "Gaya tombol jendela. Bisa \"text\" (teks), \"icons\" (ikon), \"both\" (keduanya), \"toolbar\". Jika \"toolbar\", gaya tombol ditentukan oleh setingan toolbar GNOME."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
 msgstr "Batang tombol kelihatan"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:53
+#, fuzzy
+msgid "URL that provides proxy configuration values."
+msgstr "Versi konfigurasi Evolution terakhir yang diupgrade."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:54
+msgid "Use HTTP proxy"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:55
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Apakah Evolution akan dimulai dalam mode offline atau online."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 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.h:58
 msgid "Whether the sidebar should be visible."
 msgstr "Tentukan apakah panel samping kelihatan atau tidak."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 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.h:60
 msgid "Whether the toolbar should be visible."
 msgstr "Tentukan apakah batang tombol kelihatan atau tidak"
 
-#: ../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.h:61
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Apakah kotak peringatan versi development Evolution akan dilewatkan."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 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.h:63
 msgid "Window button style"
 msgstr "Gaya tombol jendela"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:64
 msgid "Window buttons are visible"
 msgstr "Tombol jendela kelihatan"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Koneksi Aktif</b>"
+#: ../shell/e-shell-content.c:502
+#: ../shell/e-shell-content.c:503
+msgid "Searches"
+msgstr "Pencarian"
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Koneksi Aktif"
+#: ../shell/e-shell-content.c:545
+msgid "Save Search"
+msgstr "Simpan Pencarian"
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Klik OK untuk menutup koneksi ini dan masuk ke moda offline"
+#. Translators: The "Show:" label precedes a combo box that
+#. * allows the user to filter the current view.  Examples of
+#. * items that appear in the combo box are "Unread Messages",
+#. * "Important Messages", or "Active Appointments".
+#: ../shell/e-shell-searchbar.c:918
+#, fuzzy
+msgid "Sho_w:"
+msgstr "_Tampilkan: "
 
-#: ../shell/e-shell-folder-title-bar.c:584
-#: ../shell/e-shell-folder-title-bar.c:585
-msgid "(Untitled)"
-msgstr "(Tidak berjudul)"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:949
+#, fuzzy
+msgid "Sear_ch:"
+msgstr "_Cari: "
 
-#: ../shell/e-shell-importer.c:137
-msgid "Choose the type of importer to run:"
-msgstr "Pilih jenis program impor yang akan dijalankan:"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:1010
+#, fuzzy
+msgid "i_n"
+msgstr " dala_m "
 
-#: ../shell/e-shell-importer.c:140
-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 ""
-"Pilih file yang hendak diimpor ke dalam Evolution, dan pilih jenis filenya "
-"dari dalam daftar.\n"
-"\n"
-"Anda boleh memilih \"Otomatis\" bila Anda tidak tahu, dan Evolution akan "
-"mencoba menebaknya."
+#: ../shell/e-shell-utils.c:253
+#, fuzzy
+msgid "vCard (.vcf)"
+msgstr "VCard (.vcf, .gcrd)"
 
-#: ../shell/e-shell-importer.c:146
-msgid "Choose the destination for this import"
-msgstr "Pilih tujuan impor ini"
+#: ../shell/e-shell-utils.c:255
+#, fuzzy
+msgid "iCalendar (.ics)"
+msgstr "File iCalendar (.ics)"
 
-#: ../shell/e-shell-importer.c:152
-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"
+#: ../shell/e-shell-utils.c:276
+#, fuzzy
+msgid "All Files (*)"
+msgstr "Semua Berkas"
+
+#. The translator-credits string is for translators to list
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-actions.c:645
+msgid "translator-credits"
 msgstr ""
-"Evolution dapat mengimpor konfigurasi dari aplikasi\n"
-"berikut ini: Pine, Netscape, Elm, iCalendar. Namun Evolution\n"
-"tidak mendeteksi adanya konfigurasi tersebut.\n"
-"Bila hendak mencoba lagi, klik pada tombol \"Mundur\".\n"
+"Ahmad Riza H Nst  <rizahnst@gnome.org>\n"
+"Mohammad DAMT <mdamt@gnome.org>\n"
+"http://id.gnome.org/"
 
-#: ../shell/e-shell-importer.c:291
-msgid "F_ilename:"
-msgstr "Nama f_ile:"
+#: ../shell/e-shell-window-actions.c:656
+#, fuzzy
+msgid "Evolution Website"
+msgstr "Tes Evolution"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
-msgid "Select a file"
-msgstr "Pilih sebuah file"
+#: ../shell/e-shell-window-actions.c:1228
+#, fuzzy
+msgid "Bug Buddy is not installed."
+msgstr "Bug buddy belum diinstal."
 
-#: ../shell/e-shell-importer.c:313
-msgid "File _type:"
-msgstr "_Tipe file:"
+#: ../shell/e-shell-window-actions.c:1230
+#, fuzzy
+msgid "Bug Buddy could not be run."
+msgstr "Bug buddy tidak dapat dijalankan."
 
-#: ../shell/e-shell-importer.c:349
-msgid "Import data and settings from _older programs"
-msgstr "Impor data dan pengaturan dari pr_ogram-program lama"
+#: ../shell/e-shell-window-actions.c:1347
+#, fuzzy
+msgid "GNOME Pilot is not installed."
+msgstr "Bug buddy belum diinstal."
 
-#: ../shell/e-shell-importer.c:352
-msgid "Import a _single file"
-msgstr "Mengimpor _satu file"
+#: ../shell/e-shell-window-actions.c:1349
+#, fuzzy
+msgid "GNOME Pilot could not be run."
+msgstr "Bug buddy tidak dapat dijalankan."
 
-#: ../shell/e-shell-settings-dialog.c:318
-msgid "Evolution Preferences"
-msgstr "Pengaturan Evolution"
+#: ../shell/e-shell-window-actions.c:1443
+msgid "Show information about Evolution"
+msgstr "Tampilkan informasi tentang Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Nama folder belum ditulis."
+#: ../shell/e-shell-window-actions.c:1448
+msgid "_Close Window"
+msgstr "Tutup _Jendela"
 
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Nama folder tidak boleh berisi karakter Return."
+#: ../shell/e-shell-window-actions.c:1455
+#, fuzzy
+msgid "_Contents"
+msgstr "Daftar _Isi"
 
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Nama fodler tidak boleh berisi karakter \"/\"."
+#: ../shell/e-shell-window-actions.c:1457
+#, fuzzy
+msgid "Open the Evolution User Guide"
+msgstr "Periksa arsip Evolution"
 
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Nama folder tidak boleh berisi karakter \"#\"."
+#: ../shell/e-shell-window-actions.c:1483
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
 
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "\".\" dan \"..\" tidak boleh digunakan dalam nama folder."
+#: ../shell/e-shell-window-actions.c:1485
+msgid "Open the Frequently Asked Questions webpage"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:71
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Program GNOME Pilot tidak terinstall pada sistem."
+#: ../shell/e-shell-window-actions.c:1490
+msgid "_Forget Passwords"
+msgstr "_Lupa Kata sandi"
 
-#: ../shell/e-shell-window-commands.c:79
-#, c-format
-msgid "Error executing %s."
-msgstr "Error saat menjalankan %s."
+#: ../shell/e-shell-window-actions.c:1492
+#, fuzzy
+msgid "Forget all remembered passwords"
+msgstr "Apakah Anda ingin menghapus semua sandi?"
 
-#: ../shell/e-shell-window-commands.c:128
-msgid "Bug buddy is not installed."
-msgstr "Bug buddy belum diinstal."
+#: ../shell/e-shell-window-actions.c:1497
+msgid "I_mport..."
+msgstr "I_mpor..."
 
-#: ../shell/e-shell-window-commands.c:136
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy tidak dapat dijalankan."
+#: ../shell/e-shell-window-actions.c:1499
+msgid "Import data from other programs"
+msgstr "Impor data dari program lain"
 
-#. 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"
+#: ../shell/e-shell-window-actions.c:1504
+msgid "New _Window"
+msgstr "_Jendela Baru"
+
+#: ../shell/e-shell-window-actions.c:1506
+#, fuzzy
+msgid "Create a new window displaying this view"
+msgstr "Buat jendela baru untuk menampilkan folder ini"
+
+#: ../shell/e-shell-window-actions.c:1520
+#, fuzzy
+msgid "Configure Evolution"
+msgstr "Versi Evolution"
+
+#: ../shell/e-shell-window-actions.c:1525
+msgid "_Quick Reference"
+msgstr "_Jalur Cepat"
+
+#: ../shell/e-shell-window-actions.c:1527
+#, fuzzy
+msgid "Show Evolution's shortcut keys"
+msgstr "Atur Evolution"
+
+#: ../shell/e-shell-window-actions.c:1534
+msgid "Exit the program"
+msgstr "Keluar dari Evolution"
+
+#: ../shell/e-shell-window-actions.c:1539
+msgid "_Advanced Search..."
+msgstr "Penc_arian Detil..."
+
+#: ../shell/e-shell-window-actions.c:1541
+msgid "Construct a more advanced search"
 msgstr ""
-"Ahmad Riza H Nst  <rizahnst@gnome.org>\n"
-"Mohammad DAMT <mdamt@gnome.org>\n"
-"http://id.gnome.org/"
 
-#: ../shell/e-shell-window-commands.c:806
-msgid "_Work Online"
-msgstr "_Kerja Online"
+#: ../shell/e-shell-window-actions.c:1548
+#, fuzzy
+msgid "Clear the current search parameters"
+msgstr " proses email yang sedang berjalan"
+
+#: ../shell/e-shell-window-actions.c:1553
+msgid "_Edit Saved Searches..."
+msgstr "Ubah P_encarian Tersimpan..."
+
+#: ../shell/e-shell-window-actions.c:1555
+msgid "Manage your saved searches"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-actions.c:1562
+#, fuzzy
+msgid "Click here to change the search type"
+msgstr "Klik di sini untuk melampirkan berkas"
+
+#: ../shell/e-shell-window-actions.c:1567
+msgid "_Find Now"
+msgstr "_Cari"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1569
+#, fuzzy
+msgid "Execute the current search parameters"
+msgstr " proses email yang sedang berjalan"
+
+#: ../shell/e-shell-window-actions.c:1574
+msgid "_Save Search..."
+msgstr "_Simpan Pencarian..."
+
+#: ../shell/e-shell-window-actions.c:1576
+#, fuzzy
+msgid "Save the current search parameters"
+msgstr "Simpan file aktif sekarang"
+
+#: ../shell/e-shell-window-actions.c:1588
+msgid "Send / _Receive"
+msgstr "Ki_rim / Terima"
+
+#: ../shell/e-shell-window-actions.c:1590
+msgid "Send queued items and retrieve new items"
+msgstr "Kirim antrian email dan ambil email baru"
+
+#: ../shell/e-shell-window-actions.c:1595
+#, fuzzy
+msgid "Submit _Bug Report..."
+msgstr "Kirimkan Laporan Bug"
+
+#: ../shell/e-shell-window-actions.c:1597
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Kirim laporan bug dengan menggunakan program Bug Buddy"
+
+#: ../shell/e-shell-window-actions.c:1602
+#, fuzzy
+msgid "GNOME Pilot _Synchronization..."
+msgstr "Sinkronisasi iPod"
+
+#: ../shell/e-shell-window-actions.c:1604
+#, fuzzy
+msgid "Set up GNOME Pilot configuration"
+msgstr "Atur konfigurasi Pilot"
+
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Work Offline"
 msgstr "_Matikan Sambungan"
 
-#: ../shell/e-shell-window-commands.c:832
-msgid "Work Offline"
-msgstr "Kerja Offline"
+#: ../shell/e-shell-window-actions.c:1611
+#, fuzzy
+msgid "Put Evolution into offline mode"
+msgstr "Jalankan dalam moda offline"
 
-#: ../shell/e-shell-window.c:371
-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-actions.c:1616
+msgid "_Work Online"
+msgstr "_Kerja Online"
 
-#: ../shell/e-shell-window.c:379
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution dalam proses offline."
+#: ../shell/e-shell-window-actions.c:1618
+#, fuzzy
+msgid "Put Evolution into online mode"
+msgstr "Jalankan dalam moda online"
 
-#: ../shell/e-shell-window.c:386
-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-actions.c:1646
+msgid "Lay_out"
+msgstr "Su_sunan"
 
-#: ../shell/e-shell-window.c:786
-#, c-format
-msgid "Switch to %s"
-msgstr "Ubah ke %s"
+#: ../shell/e-shell-window-actions.c:1653
+msgid "_New"
+msgstr "Buat Bar_u"
 
-#: ../shell/e-shell.c:634
-msgid "Uknown system error."
-msgstr "Error sistem tidak diketahui."
+#: ../shell/e-shell-window-actions.c:1660
+msgid "_Search"
+msgstr "_Cari"
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+#: ../shell/e-shell-window-actions.c:1667
+msgid "_Switcher Appearance"
+msgstr "_Tampilan Modul"
 
-#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:257
-msgid "OK"
-msgstr "OK"
+#: ../shell/e-shell-window-actions.c:1681
+msgid "_Window"
+msgstr "_Jendela"
 
-#: ../shell/e-shell.c:1264
-msgid "Invalid arguments"
-msgstr "Argumen invalid"
+#: ../shell/e-shell-window-actions.c:1710
+msgid "Show Side _Bar"
+msgstr "Tampilkan Panel _Samping"
 
-#: ../shell/e-shell.c:1266
-msgid "Cannot register on OAF"
-msgstr "Tidak dapat registrasi OAF"
+#: ../shell/e-shell-window-actions.c:1712
+#, fuzzy
+msgid "Show the side bar"
+msgstr "Tampilkan Panel _Samping"
 
-#: ../shell/e-shell.c:1268
-msgid "Configuration Database not found"
-msgstr "Konfigurasi Database tidak ada"
+#: ../shell/e-shell-window-actions.c:1718
+#, fuzzy
+msgid "Show _Buttons"
+msgstr "Tampilkan Animasi"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-msgid "New"
-msgstr "Baru"
+#: ../shell/e-shell-window-actions.c:1720
+#, fuzzy
+msgid "Show the switcher buttons"
+msgstr "Tampilkan waktu sebagai waktu si_buk"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr " Baru "
+#: ../shell/e-shell-window-actions.c:1726
+msgid "Show _Status Bar"
+msgstr "Tampilkan Panel _Status"
 
-#: ../shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "Tes Baru"
+#: ../shell/e-shell-window-actions.c:1728
+#, fuzzy
+msgid "Show the status bar"
+msgstr "Tampilkan Panel _Status"
 
-#: ../shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "Test..."
+#: ../shell/e-shell-window-actions.c:1734
+#, fuzzy
+msgid "Show _Tool Bar"
+msgstr "Tampilkan Kotak _peralatan"
 
-#: ../shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Pilih data tes baru"
+#: ../shell/e-shell-window-actions.c:1736
+#, fuzzy
+msgid "Show the tool bar"
+msgstr "Tampilkan Kotak _peralatan"
+
+#: ../shell/e-shell-window-actions.c:1758
+#, fuzzy
+msgid "_Icons Only"
+msgstr "Hanya icon"
+
+#: ../shell/e-shell-window-actions.c:1760
+msgid "Display window buttons with icons only"
+msgstr "Tampilkan tombol-tombol pada jendela menggunakan ikon saja"
+
+#: ../shell/e-shell-window-actions.c:1765
+#, fuzzy
+msgid "_Text Only"
+msgstr "Hanya teks"
+
+#: ../shell/e-shell-window-actions.c:1767
+msgid "Display window buttons with text only"
+msgstr "Tampilkan tombol-tombol pada jendela menggunakan teks saja"
 
-#: ../shell/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#: ../shell/e-shell-window-actions.c:1772
+#, fuzzy
+msgid "Icons _and Text"
+msgstr "Ikon d_an teks"
+
+#: ../shell/e-shell-window-actions.c:1774
+msgid "Display window buttons with icons and text"
+msgstr "Tampilkan tombol-tombol pada jendela menggunakan ikon dan teks"
+
+#: ../shell/e-shell-window-actions.c:1779
+#, fuzzy
+msgid "Tool_bar Style"
+msgstr "Seperti kotak peralatan"
+
+#: ../shell/e-shell-window-actions.c:1781
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "Tampilkan tombol pada jendela dengan menggunakan setelan kotak tombol desktop"
+
+#: ../shell/e-shell-window-actions.c:1789
+msgid "Define Views..."
+msgstr "Definisikan Tampilan..."
+
+#: ../shell/e-shell-window-actions.c:1791
+#, fuzzy
+msgid "Create or edit views"
+msgstr "_Buat tampilan baru"
+
+#: ../shell/e-shell-window-actions.c:1796
+msgid "Save Custom View..."
+msgstr "Simpan Tampilan Ini..."
+
+#: ../shell/e-shell-window-actions.c:1798
+#, fuzzy
+msgid "Save current custom view"
+msgstr "Simpan Tampilan Sekarang"
+
+#: ../shell/e-shell-window-actions.c:1805
+msgid "C_urrent View"
+msgstr "T_ampilan Saat Ini"
+
+#: ../shell/e-shell-window-actions.c:1815
+msgid "Custom View"
+msgstr "Tampilan Sendiri"
+
+#: ../shell/e-shell-window-actions.c:1817
+msgid "Current view is a customized view"
 msgstr ""
-"Klik tombol \"Impor\" untuk segera melakukan impor file lama ke Evolution."
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Program Bantu Impor Evolution"
+#: ../shell/e-shell-window-actions.c:1827
+#, fuzzy
+msgid "Change the page settings for your current printer"
+msgstr "Sesuaikan pengaturan halaman dengan printer Anda"
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "Impor File"
+#: ../shell/e-shell-window-actions.c:2204
+#, c-format
+msgid "Switch to %s"
+msgstr "Ubah ke %s"
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "Impor dari Lokasi"
+#: ../shell/e-shell-window-actions.c:2417
+msgid "Execute these search parameters"
+msgstr ""
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "Jenis Impor"
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:573
+#, fuzzy, c-format
+msgid "%s - Evolution"
+msgstr "Evolution"
 
-#: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "Pilih Jenis Impor"
+#: ../shell/e-shell-window.c:382
+msgid "New"
+msgstr "Baru"
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "Ambil file"
+#: ../shell/e-shell.c:218
+msgid "Preparing to go offline..."
+msgstr ""
 
-#: ../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."
+#: ../shell/e-shell.c:268
+msgid "Preparing to go online..."
+msgstr ""
+
+#: ../shell/e-shell.c:336
+msgid "Preparing to quit..."
 msgstr ""
-"Selamat datang pada Program Bantu Impor Evolution.\n"
-"Dengan program ini Anda akan dipandu dalam melakukan\n"
-"kegiatan impor file-file lama Anda ke dalam Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:164
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17864,20 +19703,16 @@ msgid ""
 msgstr ""
 "Hi.  Terima kasih untuk mencoba pra terbitan Evolution Groupwise ini.\n"
 "\n"
-"Versi Evolution ini belum selesai. Sudah hampir, tetapi beberapa fasilitas "
-"belum selesai ataupun belum bekerja sebagaimana mestinya.\n"
+"Versi Evolution ini belum selesai. Sudah hampir, tetapi beberapa fasilitas belum selesai ataupun belum bekerja sebagaimana mestinya.\n"
 "\n"
-"Jika anda ingin versi stabil Evolution, kami sarankan anda membuang versi "
-"ini, dan memasang versi %s saja.\n"
+"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"
+"Kami harap anda menikmati hasil kerja keras kami, dan kami dengan sabar menanti kontribusi dari anda!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:188
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17885,39 +19720,57 @@ msgstr ""
 "Terima kasih\n"
 "Tim Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:195
 msgid "Do not tell me again"
 msgstr "Jangan beritahu saya lagi"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:301
 msgid "Start Evolution activating the specified component"
 msgstr "Jalankan Evolution sambil mengaktifkan komponen tersebut"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:303
+msgid "Apply the given geometry to the main window"
+msgstr ""
+
+#: ../shell/main.c:307
 msgid "Start in online mode"
 msgstr "Jalankan dalam moda online"
 
-#: ../shell/main.c:475
-msgid "Forcibly shut down all Evolution components"
-msgstr "Matikan semua komponen Evolution dengan paksa"
+#: ../shell/main.c:309
+#, fuzzy
+msgid "Start in \"express\" mode"
+msgstr "Jalankan dalam moda online"
 
-#: ../shell/main.c:479
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Lakukan migrasi ulang dari Evolution 1.4 secara paksa"
+#: ../shell/main.c:312
+#, fuzzy
+msgid "Forcibly shut down Evolution"
+msgstr "Matikan semua komponen Evolution dengan paksa"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:315
 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:317
 msgid "Disable loading of any plugins."
 msgstr "Jangan buka plugin."
 
-#: ../shell/main.c:515
+#: ../shell/main.c:319
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr ""
+
+#: ../shell/main.c:323
+msgid "Import URIs or file names given as rest of arguments."
+msgstr ""
+
+#: ../shell/main.c:325
+msgid "Request a running Evolution process to quit"
+msgstr ""
+
+#: ../shell/main.c:440
 msgid "- The Evolution PIM and Email Client"
 msgstr "  Pemakai Surat dan PIM Evolution"
 
-#: ../shell/main.c:526
+#: ../shell/main.c:466
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17931,135 +19784,138 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Apakah Anda ingin menghapus semua sandi?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Lanjutkan"
+#, fuzzy
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Hapus data lama dari versi {0}?"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Hapus data lama dari versi {0}?"
+#, fuzzy
+msgid "Continue Anyway"
+msgstr "Jalankan S_aja"
 
 #: ../shell/shell.error.xml.h:4
-msgid "Evolution can not start."
-msgstr "Evolution tidak dapat dijalankan"
+msgid "Evolution no longer supports upgrading directly from version {0}. However as a workaround you might try first upgrading to Evolution 2, and then upgrading to Evolution 3."
+msgstr ""
 
 #: ../shell/shell.error.xml.h:5
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"Melupakan kata sandi anda akan menghapus seluruh kata sandi yang telah "
-"diingat. Nanti anda akan dimintai kata sandi apabila perlu."
+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."
 
 #: ../shell/shell.error.xml.h:7
-msgid "Insufficient disk space for upgrade."
-msgstr "Kapasitas disk tersedia tidak cukup untuk melakukan upgrade."
+#, fuzzy
+msgid "Quit Now"
+msgstr "_Keluar"
 
 #: ../shell/shell.error.xml.h:8
-msgid "Really delete old data?"
-msgstr "Benar ingin menghapus data lama?"
+#, fuzzy
+msgid "Upgrade from previous version failed:"
+msgstr "Upgrade dari versi sebelumnya mengalami kegagalan: {0}"
 
 #: ../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 ""
-"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"
-"\n"
-"Apabila data lama sudah dihapus, Anda tidak dapat menurunkan versi Evolution "
-"Anda kembali ke versi lama secara otomatis.\n"
+msgid "_Forget"
+msgstr "_Hapus"
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:10
+#, fuzzy
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"{0}\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 continue, you may not have access to some of your old data.\n"
 msgstr ""
-"Evolution versi sebelumnya menyimpan data dalam tempat lain.\n"
+"{1}\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"
+"Bila Anda ingin melanjutkan, mungkin tidak semua data lama Anda dapat diakses.\n"
 
-#: ../shell/shell.error.xml.h:19
-msgid "Upgrade from previous version failed: {0}"
-msgstr "Upgrade dari versi sebelumnya mengalami kegagalan: {0}"
+#: ../shell/test/e-test-shell-backend.c:60
+#, fuzzy
+msgctxt "New"
+msgid "_Test Item"
+msgstr "Test..."
 
-#: ../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 ""
-"Memperbarui data dan seting anda membutuhkan ruangan disk sebesar {0}, tapi "
-"hanya tersedia {1}.\n"
-"\n"
-"Anda perlu mengosongkan ruangan pada direktori home Anda sebelum dapat "
-"melanjutkan proses ini."
+#: ../shell/test/e-test-shell-backend.c:62
+msgid "Create a new test item"
+msgstr "Pilih data tes baru"
 
-#: ../shell/shell.error.xml.h:23
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-msgstr ""
-"Konfigurasi sistem Anda tidak cocok dengan konfigurasi Evolution.\n"
-"\n"
-"Silakan klik pada tombol bantuan untuk informasi lengkapnya"
+#: ../shell/test/e-test-shell-backend.c:70
+#, fuzzy
+msgctxt "New"
+msgid "Test _Source"
+msgstr "Sumber"
 
-#: ../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 ""
-"Konfigurasi sistem Anda tidak cocok dengan konfigurasi Evolution.\n"
-"\n"
-"{0}\n"
-"\n"
-"Silakan klik pada tombol bantuan untuk informasi lengkapnya"
+#: ../shell/test/e-test-shell-backend.c:72
+#, fuzzy
+msgid "Create a new test source"
+msgstr "Pilih data tes baru"
 
-#: ../shell/shell.error.xml.h:31
-msgid "_Forget"
-msgstr "_Hapus"
+#: ../smclient/eggdesktopfile.c:165
+#, fuzzy, c-format
+msgid "File is not a valid .desktop file"
+msgstr "Ini bukan berkas .desktop yang valid"
+
+#: ../smclient/eggdesktopfile.c:188
+#, fuzzy, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "Berkas desktop tak dikenal Versi '%s'"
+
+#: ../smclient/eggdesktopfile.c:958
+#, fuzzy, c-format
+msgid "Starting %s"
+msgstr "Memulai %s"
+
+#: ../smclient/eggdesktopfile.c:1100
+#, fuzzy, c-format
+msgid "Application does not accept documents on command line"
+msgstr "Aplikasi tak menerima dokumen pada baris perintah"
+
+#: ../smclient/eggdesktopfile.c:1168
+#, fuzzy, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "Opsi peluncuran tak dikenal: %d"
+
+#: ../smclient/eggdesktopfile.c:1373
+#, fuzzy, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr "Tak bisa melewatkan URI dokumen ke suatu entri desktop 'Type=Link'"
+
+#: ../smclient/eggdesktopfile.c:1394
+#, fuzzy, c-format
+msgid "Not a launchable item"
+msgstr "Bukan item yang dapat diluncurkan"
+
+#: ../smclient/eggsmclient.c:227
+#, fuzzy
+msgid "Disable connection to session manager"
+msgstr "Matikan sambungan ke manajer sesi"
 
-#: ../shell/shell.error.xml.h:32
-msgid "_Keep Data"
-msgstr "_Simpan Data"
+#: ../smclient/eggsmclient.c:230
+#, fuzzy
+msgid "Specify file containing saved configuration"
+msgstr "Nyatakan berkas yang memuat konfigurasi tersimpan"
 
-#: ../shell/shell.error.xml.h:33
-msgid "_Remind Me Later"
-msgstr "Ingatkan _Saya Lagi Nanti"
+#: ../smclient/eggsmclient.c:230
+#, fuzzy
+msgid "FILE"
+msgstr "FILE"
 
-#: ../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 ""
-"{1}\n"
-"\n"
-"Bila Anda ingin melanjutkan, mungkin tidak semua data lama Anda dapat "
-"diakses.\n"
+#: ../smclient/eggsmclient.c:233
+#, fuzzy
+msgid "Specify session management ID"
+msgstr "Nyatakan ID manajemen sesi"
+
+#: ../smclient/eggsmclient.c:233
+#, fuzzy
+msgid "ID"
+msgstr "ID"
+
+#: ../smclient/eggsmclient.c:254
+#, fuzzy
+msgid "Session management options:"
+msgstr "Opsi manajemen sesi:"
+
+#: ../smclient/eggsmclient.c:255
+#, fuzzy
+msgid "Show session management options"
+msgstr "Tampilkan opsi manajemen sesi"
 
 #: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
@@ -18072,80 +19928,92 @@ msgstr ""
 "\n"
 "Ubah pengaturan trust:"
 
-#: ../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 ""
-"Karena Anda sudah mempercayai otoritas sertifikat yang mengeluarkan "
-"sertifikat ini, maka secara otomatis sertifikat ini berarti otentik, kecuali "
-"bila disebut lain."
+#: ../smime/gui/cert-trust-dialog.c:144
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Karena Anda sudah mempercayai otoritas sertifikat yang mengeluarkan sertifikat ini, maka secara otomatis sertifikat ini berarti otentik, kecuali bila disebut lain."
 
-#: ../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 ""
-"Karena Anda tidak mempercayai otoritas sertifikat yang mengeluarkan "
-"sertifikat ini, maka secara otomatis sertifikat ini berarti tidak otentik, "
-"kecuali bila disebut lain."
+#: ../smime/gui/cert-trust-dialog.c:148
+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 "Karena Anda tidak mempercayai otoritas sertifikat yang mengeluarkan sertifikat ini, maka secara otomatis sertifikat ini berarti tidak otentik, kecuali bila disebut lain."
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:144
-#: ../smime/gui/certificate-manager.c:375
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:595
-#: ../smime/gui/certificate-manager.c:603
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "Impor sertifikat..."
 
-#: ../smime/gui/certificate-manager.c:267
-#: ../smime/gui/certificate-manager.c:472
-#: ../smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:144
+#, fuzzy
+msgid "All PKCS12 files"
+msgstr "Sandi File PKCS12"
+
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
+#, fuzzy
+msgid "All files"
+msgstr "Semua berkas"
+
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "Nama Sertifikat"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "Kegunaan"
 
-#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/gui/certificate-manager.c:292
+#: ../smime/gui/smime-ui.ui.h:34
+#: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Nomor Seri"
 
-#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "Kadaluwarsa"
 
-#: ../smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:391
+#, fuzzy
+msgid "All email certificate files"
+msgstr "Otoritas Sertifikat Email"
+
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "Alamat E-Mail"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-manager.c:619
+#, fuzzy
+msgid "All CA certificate files"
+msgstr "Detil sertifikat"
+
+#: ../smime/gui/certificate-manager.c:1052
+msgid "Certificates"
+msgstr "Sertifikat"
+
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Pembuka Sertifikat: %s"
 
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Masukkan kata sandi untuk '%s'"
+#: ../smime/gui/component.c:46
+#, fuzzy, c-format
+msgid "Enter the password for '%s'"
+msgstr "Masukkan kata sandi %s"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "Masukkan kata sandi untuk database sertifikat"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Masukkan sandi baru"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -18154,7 +20022,7 @@ msgstr ""
 "Dikeluarkan kepada:\n"
 "  Subyek: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -18163,347 +20031,357 @@ msgstr ""
 "Dikeluarkan oleh:\n"
 "  Subyek: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Pilih sertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Bukan Bagian Sertifikat>"
 
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b>Kolom Sertifikat</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>Hirarki Sertifikat</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b>Isi Kolom</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>Sidikjari</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>Diterbitkan oleh</b>"
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-msgstr "<b>Diterbitkan Untuk</b>"
-
-#: ../smime/gui/smime-ui.glade.h:8
-msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>Sertifikat ini telah diperiksa untuk kegunaan berikut ini:</b>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>Validitas</b>"
-
-#: ../smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "Otoritas"
 
-#: ../smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "Backup"
 msgstr "Backup"
 
-#: ../smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Backup All"
 msgstr "Backup Semua"
 
-#: ../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 ""
-"Sebelum mempercayai CA ini untuk keperluan apa saja, silakan periksa "
-"sertifikat ini dan kebijakan dan prosedurnya (bila ada)."
+#: ../smime/gui/smime-ui.ui.h:5
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+msgstr "Sebelum mempercayai CA ini untuk keperluan apa saja, silakan periksa sertifikat ini dan kebijakan dan prosedurnya (bila ada)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.ui.h:6
+#: ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "Sertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Authority Trust"
 msgstr "Otoritas Pengelola Sertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.ui.h:8
+#, fuzzy
+msgid "Certificate Fields"
+msgstr "<b>Kolom Sertifikat</b>"
+
+#: ../smime/gui/smime-ui.ui.h:9
+#, fuzzy
+msgid "Certificate Hierarchy"
+msgstr "<b>Hirarki Sertifikat</b>"
+
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificate details"
 msgstr "Detil sertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Certificates Table"
 msgstr "Tabel Sertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Common Name (CN)"
 msgstr "Common Name (CN)"
 
-#: ../smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Contact Certificates"
 msgstr "Sertifikat Kontak"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Jangan percayai keabsahan sertifikat ini"
 
-#: ../smime/gui/smime-ui.glade.h:22
-msgid "Dummy window only"
-msgstr "Window dummy saja"
-
-#: ../smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Edit"
 msgstr "Edit"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Certificate Trust Settings"
 msgstr "Pengaturan Sertifikat Email"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Recipient Certificate"
 msgstr "Sertifikat Penerima Email"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Signer Certificate"
 msgstr "Penandatangan Email Sertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Expires On"
 msgstr "Kadaluwarsa Pada"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.ui.h:21
+#, fuzzy
+msgid "Field Value"
+msgstr "<b>Isi Kolom</b>"
+
+#: ../smime/gui/smime-ui.ui.h:22
+#, fuzzy
+msgid "Fingerprints"
+msgstr "<b>Sidikjari</b>"
+
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Import"
 msgstr "Impor"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:25
+#, fuzzy
+msgid "Issued By"
+msgstr "<b>Diterbitkan oleh</b>"
+
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Issued On"
 msgstr "Dikeluarkan Pada"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:27
+#, fuzzy
+msgid "Issued To"
+msgstr "<b>Diterbitkan Untuk</b>"
+
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "MD5 Fingerprint"
 msgstr "Sidikjari MD5"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Organization (O)"
 msgstr "Organisasi (O)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organizational Unit (OU)"
 msgstr "Unit Organisasi (OU)"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "SHA1 Fingerprint"
 msgstr "Sidikjari SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:32
+#: ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "Sertifikat Klien SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.ui.h:33
+#: ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "Sertifikat Server SSL"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:35
+#, fuzzy
+msgid "This certificate has been verified for the following uses:"
+msgstr "<b>Sertifikat ini telah diperiksa untuk kegunaan berikut ini:</b>"
+
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust the authenticity of this certificate"
 msgstr "Percaya pada keabsahan sertifikat ini"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:37
 msgid "Trust this CA to identify email users."
 msgstr "Percaya pada CA ini untuk mengidentifikasi pengirim email"
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify software developers."
 msgstr "Percaya pada CA ini untuk mengidentifikasi pembuat perangkat lunak"
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify web sites."
 msgstr "Percaya pada CA ini untuk mengidentifikasi situs web"
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.ui.h:40
+#, fuzzy
+msgid "Validity"
+msgstr "<b>Validitas</b>"
+
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "View"
 msgstr "Tampilan"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Anda memiliki sertifikat dari pengelola berikut ini:"
 
-#: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"Anda memiliki sertifikat pada file yang mengidentifikasi otoritas sertifikat "
-"ini:"
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "You have certificates on file that identify these certificate authorities:"
+msgstr "Anda memiliki sertifikat pada file yang mengidentifikasi otoritas sertifikat ini:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "You have certificates on file that identify these people:"
-msgstr ""
-"Anda memiliki sertifikat pada file yang mengidentifikasi orang-orang ini:"
+msgstr "Anda memiliki sertifikat pada file yang mengidentifikasi orang-orang ini:"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "Your Certificates"
 msgstr "Sertifikat Anda"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:46
 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:711
 msgid "Certificate already exists"
 msgstr "Sertifikat sudah ada"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:228
+#: ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "Tandatangani"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "Enkripsi"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:527
 msgid "Version"
 msgstr "Versi"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:542
 msgid "Version 1"
 msgstr "Versi 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:545
 msgid "Version 2"
 msgstr "Versi 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:548
 msgid "Version 3"
 msgstr "Versi 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 Dengan Enkripsi RSA"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 Dengan Enkripsi RSA"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA1 Dengan Enkripsi RSA"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:663
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 Enkripsi RSA"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:666
 msgid "Certificate Key Usage"
 msgstr "Penggunaan Kunci Sertifikat"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:669
 msgid "Netscape Certificate Type"
 msgstr "Tipe Sertifikat Netscape"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:672
 msgid "Certificate Authority Key Identifier"
 msgstr "Pengenal Kunci Otoritas Sertifikat"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:684
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Pengenal Obyek (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:735
 msgid "Algorithm Identifier"
 msgstr "Algoritma Pengenal"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:743
 msgid "Algorithm Parameters"
 msgstr "Parameter Algoritma"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:765
 msgid "Subject Public Key Info"
 msgstr "Info Kunci Publik Subyek"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:770
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritma Kunci Publik Subyek"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:785
 msgid "Subject's Public Key"
 msgstr "Kunci Publik Subyek"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:806
+#: ../smime/lib/e-cert.c:855
 msgid "Error: Unable to process extension"
 msgstr "Error: Tidak dapat memroses ekstensi"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:827
+#: ../smime/lib/e-cert.c:839
 msgid "Object Signer"
 msgstr "Penandatangan Obyek"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:831
 msgid "SSL Certificate Authority"
 msgstr "Otoritas Sertifikat SSL"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:835
 msgid "Email Certificate Authority"
 msgstr "Otoritas Sertifikat Email"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:863
 msgid "Signing"
 msgstr "Menandatangani"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:867
 msgid "Non-repudiation"
 msgstr "Tidak-menolak"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:871
 msgid "Key Encipherment"
 msgstr "Enkripsi Kunci"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:875
 msgid "Data Encipherment"
 msgstr "Enkripsi Data"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:879
 msgid "Key Agreement"
 msgstr "Persetujuan Kunci"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:883
 msgid "Certificate Signer"
 msgstr "Penandatangan Sertifikat"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:887
 msgid "CRL Signer"
 msgstr "Penanda CRL"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:935
 msgid "Critical"
 msgstr "Penting"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:937
+#: ../smime/lib/e-cert.c:940
 msgid "Not Critical"
 msgstr "Tidak Penting"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:961
 msgid "Extensions"
 msgstr "Ekstensi"
 
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
 #: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1091
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritma Tandatangan Sertifikat"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Yang Mengeluarkan"
 
@@ -18515,1808 +20393,22 @@ msgstr "ID Unik Yang Mengeluarkan"
 msgid "Subject Unique ID"
 msgstr "ID Unik Subyek"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1220
 msgid "Certificate Signature Value"
 msgstr "Nilai Tandatangan Sertifikat"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
 msgstr "Sandi File PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:251
 msgid "Enter password for PKCS12 file:"
 msgstr "Silakan masukkan kata sandi untuk file PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
 msgstr "Sertifikat Yang Diimpor"
 
-#: ../tools/evolution-launch-composer.c:321
-msgid "An attachment to add."
-msgstr "Lampiran yang hendak disisipkan."
-
-#: ../tools/evolution-launch-composer.c:322
-msgid "Content type of the attachment."
-msgstr "Jenis isi lampiran."
-
-#: ../tools/evolution-launch-composer.c:323
-msgid "The filename to display in the mail."
-msgstr "Nama file yang ditampilkan dalam email."
-
-#: ../tools/evolution-launch-composer.c:324
-msgid "Description of the attachment."
-msgstr "Keterangan mengenai lampiran."
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Mark attachment to be shown inline by default."
-msgstr "Tandai lampiran agar langsung ditampilkan dalam pesan."
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "Default subject for the message."
-msgstr "Judul awal pesan email."
-
-#. 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 "Tidak dapat menjalankan '%s': %s\n"
-
-#: ../tools/killev.c:76
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "Mematikan %s (%s)\n"
-
-#: ../ui/evolution-addressbook.xml.h:1
-msgid "Address _Book Properties"
-msgstr "Pengaturan _Buku Alamat"
-
-#: ../ui/evolution-addressbook.xml.h:3
-msgid "Change the properties of the selected folder"
-msgstr "Ganti pengaturan dari folder terpilih"
-
-#: ../ui/evolution-addressbook.xml.h:4
-msgid "Co_py All Contacts To..."
-msgstr "Sa_lin Seluruh Alamat Ke..."
-
-#: ../ui/evolution-addressbook.xml.h:5
-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..."
-
-#: ../ui/evolution-addressbook.xml.h:8
-msgid "Copy the contacts of the selected folder into another folder"
-msgstr "Salin alamat folder terpilih ke folder lain"
-
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "Salin bagian yang dipilih"
-
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Copy to Folder..."
-msgstr "Salin ke Folder..."
-
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
-msgstr "Buat folder buku alamat baru"
-
-#: ../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 "Potong"
-
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "Potong bagian yang dipilih"
-
-#: ../ui/evolution-addressbook.xml.h:14
-msgid "Del_ete Address Book"
-msgstr "Hap_us Buku Alamat"
-
-#: ../ui/evolution-addressbook.xml.h:16
-msgid "Delete selected contacts"
-msgstr "Hapus kontak yang terpilih"
-
-#: ../ui/evolution-addressbook.xml.h:17
-msgid "Delete the selected folder"
-msgstr "Hapus folder terpilih"
-
-#: ../ui/evolution-addressbook.xml.h:18
-msgid "Forward Contact"
-msgstr "Mengirimkan Kontak"
-
-#: ../ui/evolution-addressbook.xml.h:19
-msgid "Mo_ve All Contacts To..."
-msgstr "Pin_dahkan Seluruh Alamat Ke..."
-
-#: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
-msgstr "Pindahkan Alamat Terpilih ke Folder Lain..."
-
-#: ../ui/evolution-addressbook.xml.h:21
-msgid "Move the contacts of the selected folder into another folder"
-msgstr "Pindahkan alamat folder terpilih ini ke folder lain"
-
-#: ../ui/evolution-addressbook.xml.h:22
-msgid "Move to Folder..."
-msgstr "Pindahkan ke Folder..."
-
-#: ../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 "Tempel"
-
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "Tempel isi clipboard"
-
-#: ../ui/evolution-addressbook.xml.h:25
-msgid "Previews the contacts to be printed"
-msgstr "Lihat contoh hasil jadi kontak yang akan dicetak"
-
-#: ../ui/evolution-addressbook.xml.h:28
-msgid "Print selected contacts"
-msgstr "Cetak kontak yang sudah dipilih"
-
-#: ../ui/evolution-addressbook.xml.h:29
-msgid "Rename the selected folder"
-msgstr "Ganti nama folder terpilih"
-
-#: ../ui/evolution-addressbook.xml.h:30
-msgid "S_ave Address Book As VCard"
-msgstr "Simp_an Buku Sebagai VCard"
-
-#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
-msgstr "Simpan kontak-kontak yang sudah dipilih dalam bentuk VCard."
-
-#: ../ui/evolution-addressbook.xml.h:33
-msgid "Save the contacts of the selected folder as VCard"
-msgstr "Simpan alamat folder terpilih dalam bentuk VCard"
-
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
-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-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "Pilih semu_a"
-
-#: ../ui/evolution-addressbook.xml.h:36
-msgid "Select all contacts"
-msgstr "Pilih semua kontak"
-
-#: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
-msgstr "Kirim pesan email ke kontak-kontak yang sudah dipilih."
-
-#: ../ui/evolution-addressbook.xml.h:38
-msgid "Send message to contact"
-msgstr "Kirim pesan email ke kontak"
-
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
-msgstr "Kirim kontak yang sudah dipilih kepada orang lain."
-
-#: ../ui/evolution-addressbook.xml.h:40
-msgid "Show contact preview window"
-msgstr "Tampilkan jendela contoh kontak"
-
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "St_op"
-msgstr "Berh_enti"
-
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "Stop"
-msgstr "Berhenti"
-
-#: ../ui/evolution-addressbook.xml.h:43
-msgid "Stop Loading"
-msgstr "Hentikan Pembukaan"
-
-#: ../ui/evolution-addressbook.xml.h:44
-msgid "View the current contact"
-msgstr "Lihat kontak saat ini"
-
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Actions"
-msgstr "Tind_akan"
-
-#: ../ui/evolution-addressbook.xml.h:47
-msgid "_Copy Contact to..."
-msgstr "_Salin Alamat ke..."
-
-#: ../ui/evolution-addressbook.xml.h:48
-msgid "_Copy Folder Contacts To"
-msgstr "_Salin Alamat Folder Ke"
-
-#: ../ui/evolution-addressbook.xml.h:50
-msgid "_Delete Contact"
-msgstr "_Hapus Kontak"
-
-#: ../ui/evolution-addressbook.xml.h:52
-msgid "_Forward Contact..."
-msgstr "_Kirimkan Info Kontak..."
-
-#: ../ui/evolution-addressbook.xml.h:53
-msgid "_Move Contact to..."
-msgstr "_Pindahkan Alamat ke..."
-
-#: ../ui/evolution-addressbook.xml.h:54
-msgid "_Move Folder Contacts To"
-msgstr "_Pindahkan Folder Alamat Ke"
-
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
-msgid "_New"
-msgstr "Buat Bar_u"
-
-#: ../ui/evolution-addressbook.xml.h:60
-msgid "_Rename"
-msgstr "_Ganti nama"
-
-#: ../ui/evolution-addressbook.xml.h:61
-msgid "_Save Contact as VCard..."
-msgstr "_Simpan Alamat sebagai VCard..."
-
-#: ../ui/evolution-addressbook.xml.h:62
-msgid "_Save Folder Contacts As VCard"
-msgstr "_Simpan Alamat Folder Sebagai VCard"
-
-#: ../ui/evolution-addressbook.xml.h:63
-msgid "_Send Message to Contact..."
-msgstr "Kirim Pe_san Email kepada Kontak Ini..."
-
-#: ../ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "Hari"
-
-#: ../ui/evolution-calendar.xml.h:6
-msgid "Delete _all Occurrences"
-msgstr "Hapus Semu_a Kejadian"
-
-#: ../ui/evolution-calendar.xml.h:7
-msgid "Delete all occurrences"
-msgstr "Hapus Semua Kejadian"
-
-#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete the appointment"
-msgstr "Hapus jadwal pertemuan"
-
-#: ../ui/evolution-calendar.xml.h:10
-msgid "Delete this occurrence"
-msgstr "Hapus kejadian ini"
-
-#: ../ui/evolution-calendar.xml.h:11
-msgid "Go To"
-msgstr "Buka"
-
-#: ../ui/evolution-calendar.xml.h:12
-msgid "Go back"
-msgstr "Mundur"
-
-#: ../ui/evolution-calendar.xml.h:13
-msgid "Go forward"
-msgstr "Maju"
-
-#: ../ui/evolution-calendar.xml.h:14
-msgid "List"
-msgstr "Daftar"
-
-#: ../ui/evolution-calendar.xml.h:15
-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"
-
-#: ../ui/evolution-calendar.xml.h:18
-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
-msgid "Previous"
-msgstr "Sebelum"
-
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Print this calendar"
-msgstr "Cetak kalender ini"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
-msgid "Purg_e"
-msgstr "_Hapus"
-
-#: ../ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr "Hapus jadwal pertemuan dan rapat yang sudah lewat"
-
-#: ../ui/evolution-calendar.xml.h:25
-msgid "Select _Date"
-msgstr "Pilih _Tanggal"
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Pilih _Hari Ini"
-
-#: ../ui/evolution-calendar.xml.h:27
-msgid "Select a specific date"
-msgstr "Pilih tanggal yang diinginkan"
-
-#: ../ui/evolution-calendar.xml.h:28
-msgid "Select today"
-msgstr "Pilih hari ini"
-
-#: ../ui/evolution-calendar.xml.h:29
-msgid "Show as list"
-msgstr "Tampilkan dalam daftar"
-
-#: ../ui/evolution-calendar.xml.h:30
-msgid "Show one day"
-msgstr "Tampilkan dalam satu hari"
-
-#: ../ui/evolution-calendar.xml.h:31
-msgid "Show one month"
-msgstr "Tampilkan dalam satu bulan"
-
-#: ../ui/evolution-calendar.xml.h:32
-msgid "Show one week"
-msgstr "Tampilkan dalam satu minggu"
-
-#: ../ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
-msgstr "Tampilkan minggu kerja"
-
-#: ../ui/evolution-calendar.xml.h:35
-msgid "View the current appointment"
-msgstr "Lihat jadwal pertemuan mendatang"
-
-#: ../ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Minggu"
-
-#: ../ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Minggu Kerja"
-
-#: ../ui/evolution-calendar.xml.h:42
-msgid "_Open Appointment"
-msgstr "B_uka Jadwal Pertemuan"
-
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Salin teks yang sudah dipilih ke dalam klipbod"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Salin pilihan ke papan tempel"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Ambil teks yang sudah dipilih ke dalam klipbod"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "Pindahkan pilihan ke papan tempel"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "Tempel dari papan tempel"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Tempelkan teks dari klipbod"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Pilih semua teks"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Lampirkan"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Klik di sini untuk melampirkan berkas"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Klik di sini untuk menutup jendela ini"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Klik di sini untuk menyimpan jendela ini"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Klik di sini untuk menampilkan bantuan tersedia"
-
-#.
-#. <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 "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
-msgid "_Attachment..."
-msgstr "L_ampiran..."
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Tutup"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Berkas"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
-msgid "_Help"
-msgstr "Ba_ntuan"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Pilihan"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Acara Sehari Penuh"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Acara _Sehari Penuh"
-
-#: ../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 "Ditentukan sebagai Rahasia"
-
-#: ../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 "Ditentukan sebagai Pribadi"
-
-#: ../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 "Ditentukan sebagai Umum"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Klik di sini untuk mengatur alarm acara ini"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Sisipkan pilihan kirim lebih lanjutan"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Buat ini sebagai acara berulang"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pu_blik"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Berikan informasi bebas / sibuk untuk peserta"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "D_aerah Pesan"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Show time as _busy"
-msgstr "Tampilkan waktu sebagai waktu si_buk"
-
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "_Zona waktu"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Apakah daerah pengetikan para peserta ditampilkan"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Apakah daerah RSVP ditampilkan"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Apakah daerah peran diampilkan"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Apakah menampilkan daerah Status"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Apakah menampilkan daerah zona waktu"
-
-#: ../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 "Apakah akan menampilkan kategori"
-
-#: ../ui/evolution-event-editor.xml.h:24
-msgid "Toggles whether to have All Day Event"
-msgstr "Apakah akan mengadakan Acara Satu Harian"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to show time as busy"
-msgstr "Apakah menampilkan waktu sebagai sibuk"
-
-#: ../ui/evolution-event-editor.xml.h:26
-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"
-msgstr "K_lasifikasi"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Rahasia"
-
-#: ../ui/evolution-event-editor.xml.h:30
-msgid "_Free/Busy"
-msgstr "_Luang/Sibuk"
-
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Pribadi"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:33
-msgid "_Recurrence"
-msgstr "_Pengulangan"
-
-#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Daerah _Status"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Daerah Ke_tik"
-
-#: ../ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr " proses email yang sedang berjalan"
-
-#: ../ui/evolution-mail-global.xml.h:3
-msgid "Copy the selected folder into another folder"
-msgstr "Salin folder terpilih ke folder lain"
-
-#: ../ui/evolution-mail-global.xml.h:4
-msgid "Create a new folder for storing mail"
-msgstr "Buat folder baru untuk menyimpan surat"
-
-#: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit Search Folder definitions"
-msgstr "Buat atau sunting penentuan Pencarian Folder"
-
-#: ../ui/evolution-mail-global.xml.h:6
-msgid "Create or edit rules for filtering new mail"
-msgstr "Buat atau ganti seting penyaring email baru"
-
-#: ../ui/evolution-mail-global.xml.h:7
-msgid "Empty _Trash"
-msgstr "Kosongkan _Tong Sampah"
-
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
-msgid "F_older"
-msgstr "F_older"
-
-#: ../ui/evolution-mail-global.xml.h:9
-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
-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
-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
-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
-msgid "_Copy Folder To..."
-msgstr "_Salin Folder..."
-
-#: ../ui/evolution-mail-global.xml.h:20
-msgid "_Message Filters"
-msgstr "Penyar_ingan Pesan"
-
-#: ../ui/evolution-mail-global.xml.h:21
-msgid "_Move Folder To..."
-msgstr "_Pindahkan Folder..."
-
-#: ../ui/evolution-mail-global.xml.h:22
-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
-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"
-
-#: ../ui/evolution-mail-list.xml.h:2
-msgid "Change the properties of this folder"
-msgstr "Atur folder ini"
-
-#: ../ui/evolution-mail-list.xml.h:3
-msgid "Collapse All _Threads"
-msgstr "Runtuhkan Seluruh _Topik"
-
-#: ../ui/evolution-mail-list.xml.h:4
-msgid "Collapse all message threads"
-msgstr "Runtuh seluruh topik pesan"
-
-#: ../ui/evolution-mail-list.xml.h:5
-msgid "Copy selected message(s) to the clipboard"
-msgstr "Salin email-email yang sudah terpilih ke dalam klipbod"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Cut selected message(s) to the clipboard"
-msgstr "Ambil email-email yang sudah terpilih ke dalam klipbod"
-
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "E_xpand All Threads"
-msgstr "Kembangkan Seluruh Susunan"
-
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "E_xpunge"
-msgstr "_Hapus"
-
-#: ../ui/evolution-mail-list.xml.h:10
-msgid "Expand all message threads"
-msgstr "Perlihatkan seluruh topik pesan"
-
-#: ../ui/evolution-mail-list.xml.h:12
-msgid "Hide S_elected Messages"
-msgstr "Sembunyikan _Email Terpilih"
-
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Hide _Deleted Messages"
-msgstr "Sembunyikan Email _Terhapus"
-
-#: ../ui/evolution-mail-list.xml.h:14
-msgid "Hide _Read Messages"
-msgstr "Sembunyikan Ema_il Terbaca"
-
-#: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Sembunyikan email-email yang sudah dihapus bila tidak ingin menampilkannya "
-"dalam keadaan tercoret"
-
-#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k All Messages as Read"
-msgstr "Tan_dai Seluruh Surat Sudah Dibaca"
-
-#: ../ui/evolution-mail-list.xml.h:17
-msgid "Paste message(s) from the clipboard"
-msgstr "Tempel pesan email dari klipbod"
-
-#: ../ui/evolution-mail-list.xml.h:18
-msgid "Permanently remove all deleted messages from this folder"
-msgstr ""
-"Hapus semua pesan yang telah ditandai untuk dihapus dari dalam folder ini"
-
-#: ../ui/evolution-mail-list.xml.h:19
-msgid "Permanently remove this folder"
-msgstr "Hapus folder ini selamanya"
-
-#: ../ui/evolution-mail-list.xml.h:20
-msgid "Select Message _Thread"
-msgstr "Pilih _Topik Pesan"
-
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Select _All Messages"
-msgstr "Pilih Semua Email"
-
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Select all and only the messages that are not currently selected"
-msgstr "Pilih semua dan pesan-pesan yang belum dipilih"
-
-#: ../ui/evolution-mail-list.xml.h:23
-msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"Pilih semua pesan dalam thread yang sama dengan pesan yang sedang dipilih"
-
-#: ../ui/evolution-mail-list.xml.h:24
-msgid "Select all visible messages"
-msgstr "Pilih semua pesan yang dapat Anda lihat sekarang"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Show Hidde_n Messages"
-msgstr "Tampilkan Pesa_n Tersembunyi"
-
-#: ../ui/evolution-mail-list.xml.h:26
-msgid "Show messages that have been temporarily hidden"
-msgstr "Tampilkan semua pesan yang sedang disembunyikan sementara"
-
-#: ../ui/evolution-mail-list.xml.h:27
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Sembunyikan sementara semua pesan-pesan yang telah dibaca"
-
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "Temporarily hide the selected messages"
-msgstr "Sembunyikan sementara semua pesan yang dipilih"
-
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "Threaded Message list"
-msgstr "daftar Pesan dalam Thread"
-
-#: ../ui/evolution-mail-list.xml.h:31
-msgid "_Group By Threads"
-msgstr "_Kelompokkan Oleh Topik"
-
-#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
-msgid "_Message"
-msgstr "_Pesan"
-
-#: ../ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Address Book"
-msgstr "Masukkan Pengirim ke _Dalam Buku Alamat"
-
-#: ../ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "Lakukan _Penyaringan"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
-msgid "Add Sender to Address Book"
-msgstr "Masukkan Pengirim ke Buku Alamat"
-
-#: ../ui/evolution-mail-message.xml.h:5
-msgid "All Message _Headers"
-msgstr "Semua Bagian _Kepala Email"
-
-#: ../ui/evolution-mail-message.xml.h:6
-msgid "Apply filter rules to the selected messages"
-msgstr "Lakukan penyaringan dengan filter pesan-pesan yang sedang dipilih"
-
-#: ../ui/evolution-mail-message.xml.h:7
-msgid "Check for _Junk"
-msgstr "Saring _Spam"
-
-#: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message"
-msgstr "_Buat Email Baru"
-
-#: ../ui/evolution-mail-message.xml.h:9
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Tulis balasan ke semua penerima email ini"
-
-#: ../ui/evolution-mail-message.xml.h:10
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Tulis balasan ke milis pada pesan email ini"
-
-#: ../ui/evolution-mail-message.xml.h:11
-msgid "Compose a reply to the sender of the selected message"
-msgstr "Tulis balasan pada pengirim email ini"
-
-#: ../ui/evolution-mail-message.xml.h:12
-msgid "Copy selected messages to another folder"
-msgstr "Salin email yang dipilih ke folder lain"
-
-#: ../ui/evolution-mail-message.xml.h:13
-msgid "Copy selected messages to the clipboard"
-msgstr "Salin pesan terpilih ke papan tempel"
-
-#: ../ui/evolution-mail-message.xml.h:14
-msgid "Create R_ule"
-msgstr "At_uran Penyaringan"
-
-#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a Search Folder for these recipients"
-msgstr "Buat Folder Pencarian untuk penerima ini"
-
-#: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a Search Folder for this mailing list"
-msgstr "Buat Folder Pencarian untuk mailing list ini"
-
-#: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a Search Folder for this sender"
-msgstr "Buat Folder Pencarian untuk pengirim ini"
-
-#: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a Search Folder for this subject"
-msgstr "Buat Folder Pencarian untuk subjek ini"
-
-#: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a rule to filter messages from this sender"
-msgstr "Buat aturan filter berdasarkan pengirim email ini"
-
-#: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Buat aturan filter berdasarkan penerima email ini"
-
-#: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Buat aturan filter berdasarkan milis pada email ini"
-
-#: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a rule to filter messages with this subject"
-msgstr "Buat aturan filter berdasarkan judul email ini"
-
-#: ../ui/evolution-mail-message.xml.h:23
-msgid "Cut selected messages to the clipboard"
-msgstr "Pindahkan pesan terpilih ke papan tempel"
-
-#: ../ui/evolution-mail-message.xml.h:24
-msgid "Decrease the text size"
-msgstr "Kecilkan ukuran teks"
-
-#: ../ui/evolution-mail-message.xml.h:26
-msgid "Display the next important message"
-msgstr "Buka pesan email penting berikutnya"
-
-#: ../ui/evolution-mail-message.xml.h:27
-msgid "Display the next message"
-msgstr "Buka pesan email berikutnya"
-
-#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next thread"
-msgstr "Tampilkan topik selanjutnya"
-
-#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread message"
-msgstr "Buka pesan email berikutnya yang belum dibaca"
-
-#: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the previous important message"
-msgstr "Buka pesan email penting sebelumnya"
-
-#: ../ui/evolution-mail-message.xml.h:31
-msgid "Display the previous message"
-msgstr "Buka pesan email sebelumnya"
-
-#: ../ui/evolution-mail-message.xml.h:32
-msgid "Display the previous unread message"
-msgstr "Buka pesan email sebelumnya yang belum dibaca"
-
-#: ../ui/evolution-mail-message.xml.h:33
-msgid "F_orward As..."
-msgstr "Ter_uskan Sebagai..."
-
-#: ../ui/evolution-mail-message.xml.h:34
-msgid "Filter on Mailing _List..."
-msgstr "Saring Berdasarkan Mi_lis..."
-
-#: ../ui/evolution-mail-message.xml.h:35
-msgid "Filter on Se_nder..."
-msgstr "Saring Berdasarka_n  Pengirim..."
-
-#: ../ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Recipients..."
-msgstr "Saring Berdasarkan Pene_rima..."
-
-#: ../ui/evolution-mail-message.xml.h:37
-msgid "Filter on _Subject..."
-msgstr "Saring Berda_sarkan Judul..."
-
-#: ../ui/evolution-mail-message.xml.h:38
-msgid "Filter the selected messages for junk status"
-msgstr "Saring pesan-pesan email yang telah dipilih dari spam"
-
-#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected messages for follow-up"
-msgstr "Tandai pesan terpilih untuk kelanjutan"
-
-#: ../ui/evolution-mail-message.xml.h:40
-msgid "Follow _Up..."
-msgstr "Tindak-lanj_uti..."
-
-#: ../ui/evolution-mail-message.xml.h:41
-msgid "Force images in HTML mail to be loaded"
-msgstr "Tampilkan gambar pada email HTML"
-
-#: ../ui/evolution-mail-message.xml.h:43
-msgid "Forward the selected message in the body of a new message"
-msgstr ""
-"Kirimkan pesan email yang sedang dibaca ini dalam bentuk sisipan pada badan "
-"email baru"
-
-#: ../ui/evolution-mail-message.xml.h:44
-msgid "Forward the selected message quoted like a reply"
-msgstr ""
-"Kirimkan pesan email yang sedang dibaca ini dalam bentuk kutipan seperti "
-"balasan surat"
-
-#: ../ui/evolution-mail-message.xml.h:45
-msgid "Forward the selected message to someone"
-msgstr "Teruskan email ini ke orang lain"
-
-#: ../ui/evolution-mail-message.xml.h:46
-msgid "Forward the selected message to someone as an attachment"
-msgstr "Teruskan email ini ke orang lain dalam bentuk lampiran"
-
-#: ../ui/evolution-mail-message.xml.h:47
-msgid "Increase the text size"
-msgstr "Perbesar ukuran teks"
-
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Mar_k as"
-msgstr "Angga_p Email Ini"
-
-#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as having been read"
-msgstr "Tandai pesan terpilih sebagai telah dibaca"
-
-#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages as important"
-msgstr "Tandai pesan terpilih sebagai penting"
-
-#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected messages as junk"
-msgstr "Tandai pesan terpilih sebagai sampah"
-
-#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected messages as not being junk"
-msgstr "Tandai pesan terpilih sebagai bukan sampah"
-
-#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected messages as not having been read"
-msgstr "Tandai pesan terpilih sebagai belum lagi dibaca"
-
-#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected messages as unimportant"
-msgstr "Tandai pesan terpilih sebagai tidak penting"
-
-#: ../ui/evolution-mail-message.xml.h:56
-msgid "Mark the selected messages for deletion"
-msgstr "Tandai pesan terpilih sebagai dihapus"
-
-#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected messages to another folder"
-msgstr "Pindahkan pesan terpilih ke folder lain"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Next _Important Message"
-msgstr "Pesan Tak Pent_ing Berikutnya"
-
-#: ../ui/evolution-mail-message.xml.h:60
-msgid "Next _Thread"
-msgstr "Ulir Diskusi Beriku_tnya"
-
-#: ../ui/evolution-mail-message.xml.h:61
-msgid "Next _Unread Message"
-msgstr "Pesan Bel_um Dibaca Berikutnya"
-
-#: ../ui/evolution-mail-message.xml.h:62
-msgid "Not Junk"
-msgstr "Bukan Spam"
-
-#: ../ui/evolution-mail-message.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "Buka jendela untuk menulis email baru"
-
-#: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected messages in a new window"
-msgstr "Bukan email yang sudah dipilih ini dalam jendela baru"
-
-#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected messages in the composer for editing"
-msgstr "Buka pesan yang dipilih ini di tulis surat untuk diubah isinya"
-
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "P_revious Unread Message"
-msgstr "_Pesan Belum Dibaca Sebelumnya"
-
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Paste messages from the clipboard"
-msgstr "Tempel pesan dari papan tempel"
-
-#: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "_Kirim Email pada Folder"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "Kirimkan Ba_lasan"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "Kirim email ke folder Publik"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "Kirimkan balasan dalam folder Publik"
-
-#: ../ui/evolution-mail-message.xml.h:72
-msgid "Pr_evious Important Message"
-msgstr "Pesan P_enting Berikutnya"
-
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Preview the message to be printed"
-msgstr "Lihat contoh jadi hasil cetakan pesan email ini"
-
-#: ../ui/evolution-mail-message.xml.h:77
-msgid "Print this message"
-msgstr "Cetak pesan email ini"
-
-#: ../ui/evolution-mail-message.xml.h:78
-msgid "Re_direct"
-msgstr "_Mental"
-
-#: ../ui/evolution-mail-message.xml.h:79
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "Pentalkan (bounce) pesan yang dipilih ini kepada orang lain"
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Reset the text to its original size"
-msgstr "Kembalikan ukuran teks kembali semula"
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Save the selected messages as a text file"
-msgstr "Simpan pesan terpilih dalam bentuk teks"
-
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Search Folder from Mailing _List..."
-msgstr "Saring Folder berdasarkan Mi_lis..."
-
-#: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipients..."
-msgstr "Saring Folder berdasarkan Pene_rima..."
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Search Folder from S_ubject..."
-msgstr "Saring Folder berdasarkan _Judul..."
-
-#: ../ui/evolution-mail-message.xml.h:89
-msgid "Search Folder from Sen_der..."
-msgstr "Saring Folder berdasarkan Pe_ngirim..."
-
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "Search for text in the body of the displayed message"
-msgstr "Cari pada badan teks email yang sedang dibuka"
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "Select _All Text"
-msgstr "Pilih Semu_a Teks"
-
-#: ../ui/evolution-mail-message.xml.h:92
-msgid "Select all the text in a message"
-msgstr "Pilih seluruh teks dalam sebuah pesan"
-
-#: ../ui/evolution-mail-message.xml.h:93
-msgid "Set up the page settings for your current printer"
-msgstr "Sesuaikan pengaturan halaman dengan printer Anda"
-
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Tampilkan kursor berkedip dalam badan pesan yang sedang dibuka ini"
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Tampilkan pesan dalam gaya normal"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show messages with all email headers"
-msgstr "Tampilkan pesan dengan seluruh judul surat"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "Show the raw email source of the message"
-msgstr "Tampilkan isi email dalam bentuk aslinya"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "Undelete the selected messages"
-msgstr "Jangan hapus pesan terpilih"
-
-#: ../ui/evolution-mail-message.xml.h:99
-msgid "Uni_mportant"
-msgstr "Tidak Pe_nting"
-
-#: ../ui/evolution-mail-message.xml.h:100
-msgid "Zoom _Out"
-msgstr "P_erkecil"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Attached"
-msgstr "Terl_ampir"
-
-#: ../ui/evolution-mail-message.xml.h:102
-msgid "_Caret Mode"
-msgstr "_Modus Caret"
-
-#: ../ui/evolution-mail-message.xml.h:103
-msgid "_Clear Flag"
-msgstr "Hap_us Tanda"
-
-#: ../ui/evolution-mail-message.xml.h:106
-msgid "_Delete Message"
-msgstr "_Hapus Pesan"
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Find in Message..."
-msgstr "Cari _dalam Email..."
-
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Flag Completed"
-msgstr "_Tanda Selesai"
-
-#: ../ui/evolution-mail-message.xml.h:111
-msgid "_Go To"
-msgstr "_Buka"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Important"
-msgstr "_Penting"
-
-#: ../ui/evolution-mail-message.xml.h:113
-msgid "_Inline"
-msgstr "Sebar_is"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Junk"
-msgstr "_Sampah"
-
-#: ../ui/evolution-mail-message.xml.h:115
-msgid "_Load Images"
-msgstr "Tampi_lkan Gambar"
-
-#: ../ui/evolution-mail-message.xml.h:117
-msgid "_Message Source"
-msgstr "Kode Asli Pesa_n"
-
-#: ../ui/evolution-mail-message.xml.h:119
-msgid "_Next Message"
-msgstr "Pesa_n Berikutnya"
-
-#: ../ui/evolution-mail-message.xml.h:120
-msgid "_Normal Size"
-msgstr "Ukuran _Normal"
-
-#: ../ui/evolution-mail-message.xml.h:121
-msgid "_Not Junk"
-msgstr "Buka_n Spam"
-
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Open in New Window"
-msgstr "Buka dalam Je_ndela Baru"
-
-#: ../ui/evolution-mail-message.xml.h:123
-msgid "_Previous Message"
-msgstr "_Pesan Sebelumnya"
-
-#: ../ui/evolution-mail-message.xml.h:125
-msgid "_Quoted"
-msgstr "Di_kutip"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Save Message..."
-msgstr "_Simpan Pesan..."
-
-#: ../ui/evolution-mail-message.xml.h:129
-msgid "_Undelete Message"
-msgstr " Penghap_usan"
-
-#: ../ui/evolution-mail-message.xml.h:130
-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"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Tutup jendela ini"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
-msgid "Main toolbar"
-msgstr "Kotak perkakas utama"
-
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "Salin memo yang Dipilih"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "Pindah memo yang dipilih"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "Hapus memo yang dipilih"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "Tempelkan memo dari papan tempel"
-
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "Pracetak daftar memo yang mau dicetak"
-
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "Cetak daftar memo"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "Tampilkan memo terpilih"
-
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "B_uka Memo"
-
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Lampirkan berkas"
-
-#.
-#. <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 "Tutup berkas yang aktif sekarang"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Hapus semua kecuali tanda-tangan"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Acak pesan email ini dengan PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Acak email ini dengan Sertifikat Enkripsi S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "For_mat"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "Dapatkan pengiriman pemberitahuan ketika pesan anda dibaca"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:13
-msgid "Open a file"
-msgstr "Buka berkas"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "PGP Encrypt"
-msgstr "Enkripsi PGP"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Sign"
-msgstr "Tanda tangani PGP"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "R_equest Read Receipt"
-msgstr "Minta P_enerimaan Baca"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "S/MIME Encrypt"
-msgstr "Enkripsi S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "S/MIME Sign"
-msgstr "Tanda tangani S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "Simpan Sebagai"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "Save Draft"
-msgstr "Simpan Draf"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "Save _As..."
-msgstr "Simpan Seb_agai..."
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "Save _Draft"
-msgstr "Simpan _Draf"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "Save as draft"
-msgstr "Simpan draf"
-
-#: ../ui/evolution-message-composer.xml.h:25
-msgid "Save in folder..."
-msgstr "Simpan dalam folder..."
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save the current file"
-msgstr "Simpan file aktif sekarang"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save the current file with a different name"
-msgstr "Simpan file aktif sekarang dengan nama yang berbeda"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save the message in a specified folder"
-msgstr "Simpan pesan email dalam folder tertentu"
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Send"
-msgstr "Kirim"
-
-#: ../ui/evolution-message-composer.xml.h:30
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Kirimkan email dalam bentuk HTML"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Send this message"
-msgstr "Kirim pesan email ini"
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Set the message priority to high"
-msgstr "Buat prioritas pesan tinggi"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Tanda tangani pesan email ini dengan kunci PGP Anda"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Tanda tangani pesan email ini dengan Sertifikat Tanda Tangan S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Atur untuk menampilkan/menyembunyikan kolom Bcc"
-
-#: ../ui/evolution-message-composer.xml.h:36
-msgid "Toggles whether the CC field is displayed"
-msgstr "Atur untuk menampilkan/menyembunyikan kolom Tembusan"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Atur untuk menampilkan kotak pemilih alamat untuk kolom From"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Atur untuk menampilkan/menyembunyikan kolom Post-To"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Atur untuk menampilkan/menyembunyikan kolom Reply-To"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Toggles whether the To field is displayed"
-msgstr "Atur untuk menampilkan/menyembunyikan kolom To"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "_Bcc Field"
-msgstr "Kolom _Bcc"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "_Cc Field"
-msgstr "Kolom _Tembusan"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "_Delete all"
-msgstr "Hapus _Semua"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_From Field"
-msgstr "Kolom _Dari"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Open..."
-msgstr "_Buka..."
-
-#: ../ui/evolution-message-composer.xml.h:50
-msgid "_Post-To Field"
-msgstr "Kolom _Post-To"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Prioritize Message"
-msgstr "_Prioritaskan Pesan"
-
-#: ../ui/evolution-message-composer.xml.h:52
-msgid "_Reply-To Field"
-msgstr "Kolom _Alamat Balasan"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Keamanan"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_To Field"
-msgstr "Kolom Un_tuk"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Tutup"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Simpan dan Tutup"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Simpan dan _Tutup"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Simpan file ini dan tutup jendela"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Tambahkan folder ini ke daftar folder langganan Anda"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Perbarui Daftar"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Perbarui Daftar Folder"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Hapus folder dari dalam daftar langganan"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Langganan"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Berhenti langganan"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Bal_ik Pilihan"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Klik ganti / tampil status rincian dari tugas"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Rincian Status"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Zona Waktu"
-
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Pilihan Pengiriman"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Rincian _Status"
-
-#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected tasks"
-msgstr "Salin Tugas Terpilih"
-
-#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected tasks"
-msgstr "Potong tugas terpilih"
-
-#: ../ui/evolution-tasks.xml.h:7
-msgid "Delete completed tasks"
-msgstr "Hapus tugas yang telah dilaksanakan"
-
-#: ../ui/evolution-tasks.xml.h:8
-msgid "Delete selected tasks"
-msgstr "Hapus tugas yang dipilih"
-
-#: ../ui/evolution-tasks.xml.h:9
-msgid "Mar_k as Complete"
-msgstr "Tandai _Tugas Telah Selesai"
-
-#: ../ui/evolution-tasks.xml.h:10
-msgid "Mark selected tasks as complete"
-msgstr "Tandai bahwa tugas ini telah selesai dilaksanakan"
-
-#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste tasks from the clipboard"
-msgstr "Ambil tugas dari papan tempel"
-
-#: ../ui/evolution-tasks.xml.h:13
-msgid "Previews the list of tasks to be printed"
-msgstr "Lihat contoh jadi daftar tugas yang akan dicetak"
-
-#: ../ui/evolution-tasks.xml.h:16
-msgid "Print the list of tasks"
-msgstr "Cetak daftar tugas"
-
-#: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "Tampilkan jendela pracetak tugas"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "_Pracetak Tugas"
-
-#: ../ui/evolution-tasks.xml.h:20
-msgid "View the selected task"
-msgstr "Lihat tugas-tugas yang dipilih"
-
-#: ../ui/evolution-tasks.xml.h:27
-msgid "_Open Task"
-msgstr "_Buka Tugas"
-
-#: ../ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Tentang Evolution..."
-
-#: ../ui/evolution.xml.h:2
-msgid "Change Evolution's settings"
-msgstr "Atur Evolution"
-
-#: ../ui/evolution.xml.h:3
-msgid "Change the visibility of the toolbar"
-msgstr "Ubah penampakan kotak perkakas"
-
-#: ../ui/evolution.xml.h:5
-msgid "Create a new window displaying this folder"
-msgstr "Buat jendela baru untuk menampilkan folder ini"
-
-#: ../ui/evolution.xml.h:6
-msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"Tampilkan tombol pada jendela dengan menggunakan setelan kotak tombol desktop"
-
-#: ../ui/evolution.xml.h:7
-msgid "Display window buttons with icons and text"
-msgstr "Tampilkan tombol-tombol pada jendela menggunakan ikon dan teks"
-
-#: ../ui/evolution.xml.h:8
-msgid "Display window buttons with icons only"
-msgstr "Tampilkan tombol-tombol pada jendela menggunakan ikon saja"
-
-#: ../ui/evolution.xml.h:9
-msgid "Display window buttons with text only"
-msgstr "Tampilkan tombol-tombol pada jendela menggunakan teks saja"
-
-#: ../ui/evolution.xml.h:10
-msgid "Exit the program"
-msgstr "Keluar dari Evolution"
-
-#: ../ui/evolution.xml.h:11
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Hapus semua sandi yang tersimpan di komputer"
-
-#: ../ui/evolution.xml.h:12
-msgid "Hide window buttons"
-msgstr "Sembunyikan tombol jendela"
-
-#: ../ui/evolution.xml.h:13
-msgid "I_mport..."
-msgstr "I_mpor..."
-
-#: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
-msgstr "Ikon d_an teks"
-
-#: ../ui/evolution.xml.h:15
-msgid "Import data from other programs"
-msgstr "Impor data dari program lain"
-
-#: ../ui/evolution.xml.h:16
-msgid "Lay_out"
-msgstr "Su_sunan"
-
-#: ../ui/evolution.xml.h:18
-msgid "New _Window"
-msgstr "_Jendela Baru"
-
-#: ../ui/evolution.xml.h:19
-msgid "Prefere_nces"
-msgstr "Pe_ngaturan"
-
-#: ../ui/evolution.xml.h:20
-msgid "Send / Receive"
-msgstr "Kirim / Terima"
-
-#: ../ui/evolution.xml.h:21
-msgid "Send / _Receive"
-msgstr "Ki_rim / Terima"
-
-#: ../ui/evolution.xml.h:22
-msgid "Send queued items and retrieve new items"
-msgstr "Kirim antrian email dan ambil email baru"
-
-#: ../ui/evolution.xml.h:23
-msgid "Set up Pilot configuration"
-msgstr "Atur konfigurasi Pilot"
-
-#: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Tampilkan Panel _Samping"
-
-#: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Tampilkan 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"
-
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:33
-msgid "Submit _Bug Report"
-msgstr "Kirim Laporan _Bug"
-
-#: ../ui/evolution.xml.h:34
-msgid "Submit a bug report using Bug Buddy"
-msgstr "Kirim laporan bug dengan menggunakan program Bug Buddy"
-
-#: ../ui/evolution.xml.h:35
-msgid "Toggle whether we are working offline."
-msgstr "Atur apakah ingin offline atau online"
-
-#: ../ui/evolution.xml.h:36
-msgid "Tool_bar style"
-msgstr "Seperti kotak peralatan"
-
-#: ../ui/evolution.xml.h:37
-msgid "View/Hide the Side Bar"
-msgstr "Tampil/Sembunyi Panel Samping"
-
-#: ../ui/evolution.xml.h:38
-msgid "View/Hide the Status Bar"
-msgstr "Tampil/Sembunyikan Panel Status"
-
-#: ../ui/evolution.xml.h:39
-msgid "_About"
-msgstr "Tent_ang"
-
-#: ../ui/evolution.xml.h:40
-msgid "_Close Window"
-msgstr "Tutup _Jendela"
-
-#: ../ui/evolution.xml.h:43
-msgid "_Forget Passwords"
-msgstr "_Lupa Kata sandi"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Hide buttons"
-msgstr "_Sembunyikan tombol"
-
-#: ../ui/evolution.xml.h:46
-msgid "_Icons only"
-msgstr "_Ikon saja"
-
-#: ../ui/evolution.xml.h:48
-msgid "_Quick Reference"
-msgstr "_Jalur Cepat"
-
-#: ../ui/evolution.xml.h:49
-msgid "_Quit"
-msgstr "_Keluar"
-
-#: ../ui/evolution.xml.h:50
-msgid "_Switcher Appearance"
-msgstr "_Tampilan Modul"
-
-#: ../ui/evolution.xml.h:51
-msgid "_Synchronization Options..."
-msgstr "Pilihan _Sinkronisasi..."
-
-#: ../ui/evolution.xml.h:52
-msgid "_Text only"
-msgstr "_Teks saja"
-
-#: ../ui/evolution.xml.h:54
-msgid "_Window"
-msgstr "_Jendela"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Berdasarkan _Perusahaan"
@@ -20326,8 +20418,9 @@ msgid "_Address Cards"
 msgstr "K_artu Alamat"
 
 #: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "Daftar Tele_pon"
+#: ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "Tampi_lan Daftar"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -20337,10 +20430,6 @@ msgstr "Tampilan P_erminggu"
 msgid "_Day View"
 msgstr "Tampilan Per_hari"
 
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr "Tampi_lan Daftar"
-
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Ta_mpilan Perbulan"
@@ -20393,904 +20482,930 @@ 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
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>Zona Waktu</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "<b>_Selection</b>"
-msgstr "<b>_Pilihan</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
 msgstr "Pilih Zona Waktu"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "Kotak Kombo Zona Waktu"
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr "<b>Zona Waktu</b>"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+msgid "Timezone drop-down combination box"
+msgstr ""
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the 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 ""
-"Gunakan tombol kiri mouse untuk memperbesar area pada peta dan pilih zona "
-"waktunya\n"
+"Gunakan tombol kiri mouse untuk memperbesar area pada peta dan pilih zona waktunya\n"
 "Gunakan tombol kanan mouse untuk mengembalikan ukuran semula."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:188
-msgid "Collection"
-msgstr "Kumpulan"
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+#, fuzzy
+msgid "_Selection"
+msgstr "_Yang Dipilih: "
 
-#: ../widgets/menus/gal-define-views-dialog.c:325
-#: ../widgets/menus/gal-define-views.glade.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:339
+#: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definisikan Tampilan %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-define-views-dialog.c:349
 msgid "Define Views"
 msgstr "Definisikan Tampilan"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
+#: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "Tentukan Tampilan untuk \"%s\""
 
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit..."
-msgstr "_Ubah..."
-
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
-#: ../widgets/table/e-table-scrolled.c:222
-#: ../widgets/table/e-table-scrolled.c:223
+#: ../widgets/menus/gal-view-factory-etable.c:113
 msgid "Table"
 msgstr "Tinggi"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
-msgid "Instance"
-msgstr "Kejadian"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Simpan Tampilan Sekarang"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "_Buat tampilan baru"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "_Ganti tampilan saat ini"
 
-#. 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 "Tampilan Sendiri"
-
-#: ../widgets/menus/gal-view-instance.c:588
-msgid "Save Custom View"
-msgstr "Simpan Tampilan Disesuaikan"
-
-#: ../widgets/menus/gal-view-instance.c:592
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "Definisikan Tampilan..."
-
-#: ../widgets/menus/gal-view-menus.c:291
-msgid "C_urrent View"
-msgstr "T_ampilan Saat Ini"
-
-#: ../widgets/menus/gal-view-menus.c:359
-msgid "Save Custom View..."
-msgstr "Simpan Tampilan Ini..."
-
-#: ../widgets/menus/gal-view-new-dialog.c:80
-msgid "Factory"
-msgstr "Pabrikan"
-
-#: ../widgets/menus/gal-view-new-dialog.c:115
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "Definisikan Tampilan Baru"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "Nama tampilan baru:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
 msgstr "Jenis Tampilan"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "Jenis tampilan:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Gunakan fasilitas penampilan lampiran otomatis"
+#: ../widgets/misc/e-account-manager.c:348
+msgid "De_fault"
+msgstr "_Standar"
 
-#. 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 "SSRKJSM"
+#: ../widgets/misc/e-account-tree-view.c:224
+#, fuzzy
+msgid "Account Name"
+msgstr "Nama _akunt:"
 
-#. 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"
+#: ../widgets/misc/e-account-tree-view.c:255
+msgid "Protocol"
+msgstr "Protokol"
 
-#: ../widgets/misc/e-calendar.c:226
-msgid "Month Calendar"
-msgstr "Kalender Bulan"
+#: ../widgets/misc/e-attachment-dialog.c:305
+msgid "Attachment Properties"
+msgstr "Pengaturan Lampiran"
 
-#: ../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
-msgid "Fill color"
-msgstr "Isi warna"
-
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:465
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3588
-#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3596
-#: ../widgets/text/e-text.c:3597
-msgid "GDK fill color"
-msgstr "Isi warna 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
-msgid "Fill stipple"
-msgstr "Isi stipple"
-
-#: ../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 "Lebar minimal"
-
-#: ../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 "Lebar minimal"
-
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
-msgid "Spacing"
-msgstr "Rongga"
-
-#: ../widgets/misc/e-cell-date-edit.c:233
-msgid "Now"
-msgstr "Saat Ini"
+#: ../widgets/misc/e-attachment-dialog.c:328
+#, fuzzy
+msgid "_Filename:"
+msgstr "nama berkas"
 
-#: ../widgets/misc/e-cell-date-edit.c:793
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "Waktu harus dalam bentuk: %s"
+#: ../widgets/misc/e-attachment-dialog.c:363
+#, fuzzy
+msgid "MIME Type:"
+msgstr "Jenis MIME"
 
-#: ../widgets/misc/e-cell-percent.c:76
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Nilai persen harus di antara 0 dan 100"
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "_Suggest automatic display of attachment"
+msgstr "_Sarankan fasilitas penampilan lampiran otomatis"
 
-#: ../widgets/misc/e-charset-picker.c:64
-msgid "Baltic"
-msgstr "Balkan"
+#: ../widgets/misc/e-attachment-handler-image.c:97
+#, fuzzy
+msgid "Could not set as background"
+msgstr "Set jadi Latar _Belakang"
 
-#: ../widgets/misc/e-charset-picker.c:65
-msgid "Central European"
-msgstr "Eropa Tengah"
+#: ../widgets/misc/e-attachment-handler-image.c:149
+msgid "Set as _Background"
+msgstr "Set jadi Latar _Belakang"
 
-#: ../widgets/misc/e-charset-picker.c:66
-msgid "Chinese"
-msgstr "Bahasa Mandarin"
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#, fuzzy
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Tidak dapat membuka asal"
 
-#: ../widgets/misc/e-charset-picker.c:67
-msgid "Cyrillic"
-msgstr "Cyrillic"
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#, fuzzy
+msgid "_Send To..."
+msgstr "Kirim Ke..."
 
-#: ../widgets/misc/e-charset-picker.c:68
-msgid "Greek"
-msgstr "Yunani"
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#, fuzzy
+msgid "Send the selected attachments somewhere"
+msgstr "Pilih folder untuk menyimpan lampiran ini..."
 
-#: ../widgets/misc/e-charset-picker.c:69
-msgid "Hebrew"
-msgstr "Ibrani"
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+#, fuzzy
+msgid "Loading"
+msgstr "Sedang membuka..."
 
-#: ../widgets/misc/e-charset-picker.c:70
-msgid "Japanese"
-msgstr "Jepang"
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+#, fuzzy
+msgid "Saving"
+msgstr "Bayangan"
 
-#: ../widgets/misc/e-charset-picker.c:71
-msgid "Korean"
-msgstr "Korea"
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide Attachment _Bar"
+msgstr "Sem_bunyikan Panel Lampiran"
 
-#: ../widgets/misc/e-charset-picker.c:72
-msgid "Thai"
-msgstr "Thai"
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:636
+msgid "Show Attachment _Bar"
+msgstr "Tam_pilkan Panel Lampiran"
 
-#: ../widgets/misc/e-charset-picker.c:73
-msgid "Turkish"
-msgstr "Turki"
+#: ../widgets/misc/e-attachment-store.c:538
+#, fuzzy
+msgid "Add Attachment"
+msgstr "T_ambah lampiran..."
 
-#: ../widgets/misc/e-charset-picker.c:74
-msgid "Unicode"
-msgstr "Unicode"
+#: ../widgets/misc/e-attachment-store.c:541
+msgid "A_ttach"
+msgstr "_Lampirkan"
 
-#: ../widgets/misc/e-charset-picker.c:75
-msgid "Western European"
-msgstr "Eropa Barat"
+#: ../widgets/misc/e-attachment-store.c:604
+#, fuzzy
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Simpan lampiran"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:633
+#: ../widgets/misc/e-attachment.c:1773
+#: ../widgets/misc/e-attachment.c:2313
+#, fuzzy
+msgid "attachment.dat"
+msgstr "lampiran"
 
-#: ../widgets/misc/e-charset-picker.c:76
-msgid "Western European, New"
-msgstr "Eropa Barat, Gaya Baru"
+#: ../widgets/misc/e-attachment-view.c:299
+msgid "S_ave All"
+msgstr "Simp_an Semua"
 
-#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
-#: ../widgets/misc/e-charset-picker.c:95
-msgid "Traditional"
-msgstr "Tradisional"
+#: ../widgets/misc/e-attachment-view.c:325
+#, fuzzy
+msgid "A_dd Attachment..."
+msgstr "T_ambah lampiran..."
 
-#: ../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 "Sederhana"
+#: ../widgets/misc/e-attachment-view.c:349
+msgid "_Hide"
+msgstr "_Cari"
 
-#: ../widgets/misc/e-charset-picker.c:102
-msgid "Ukrainian"
-msgstr "Ukrania"
+#: ../widgets/misc/e-attachment-view.c:356
+msgid "_View Inline"
+msgstr "_Lihat Langsung"
 
-#: ../widgets/misc/e-charset-picker.c:105
-msgid "Visual"
-msgstr "Visual"
+#: ../widgets/misc/e-attachment-view.c:638
+#, fuzzy, c-format
+msgid "Open with \"%s\""
+msgstr "Buka dengan \"%s\""
 
-#: ../widgets/misc/e-charset-picker.c:174
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "Gugus karakter tidak dikenal: %s"
+#: ../widgets/misc/e-attachment-view.c:641
+#, fuzzy, c-format
+msgid "Open this attachment in %s"
+msgstr "Simpan lampiran"
+
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../widgets/misc/e-attachment.c:994
+#, fuzzy
+msgid "Attached message"
+msgstr "%d pesan terlampir"
+
+#: ../widgets/misc/e-attachment.c:1814
+#: ../widgets/misc/e-attachment.c:2615
+msgid "A load operation is already in progress"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1822
+#: ../widgets/misc/e-attachment.c:2623
+msgid "A save operation is already in progress"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1914
+#, fuzzy, c-format
+msgid "Could not load '%s'"
+msgstr "Buku alamat tidak dapat dibuka"
+
+#: ../widgets/misc/e-attachment.c:1917
+#, fuzzy, c-format
+msgid "Could not load the attachment"
+msgstr "Jenis isi lampiran."
+
+#: ../widgets/misc/e-attachment.c:2193
+#, fuzzy, c-format
+msgid "Could not open '%s'"
+msgstr "Tidak dapat membuka asal"
+
+#: ../widgets/misc/e-attachment.c:2196
+#, fuzzy, c-format
+msgid "Could not open the attachment"
+msgstr "Jenis isi lampiran."
 
-#: ../widgets/misc/e-charset-picker.c:219
+#: ../widgets/misc/e-attachment.c:2631
+#, fuzzy
+msgid "Attachment contents not loaded"
+msgstr "Lampiran yang hendak disisipkan."
+
+#: ../widgets/misc/e-attachment.c:2707
+#, fuzzy, c-format
+msgid "Could not save '%s'"
+msgstr "Tidak dapat menjalankan '%s': %s\n"
+
+#: ../widgets/misc/e-attachment.c:2710
+#, fuzzy, c-format
+msgid "Could not save the attachment"
+msgstr "Jenis isi lampiran."
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
+#: ../widgets/misc/e-buffer-tagger.c:359
+#, fuzzy
+msgid "Ctrl-click to open a link"
+msgstr "Klik untuk membuka %s"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1254
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../widgets/misc/e-calendar.c:217
+msgid "Month Calendar"
+msgstr "Kalender Bulan"
+
+#: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Pengkodean Karakter"
 
-#: ../widgets/misc/e-charset-picker.c:234
+#: ../widgets/misc/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "Masukkan karakter yang hendak digunakan"
 
-#: ../widgets/misc/e-charset-picker.c:341
+#: ../widgets/misc/e-charset-combo-box.c:336
 msgid "Other..."
 msgstr "Lainnya..."
 
-#: ../widgets/misc/e-charset-picker.c:482
-msgid "Ch_aracter Encoding"
-msgstr "Pengkodean K_arakter"
-
-#: ../widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
-
-#: ../widgets/misc/e-dateedit.c:321
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Tanggal dan Waktu"
 
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Isian teks untuk mengisi tanggal"
 
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Klik tombol ini untuk menampilkan kalender"
 
-#: ../widgets/misc/e-dateedit.c:384
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:591
+#, fuzzy
+msgid "Drop-down combination box to select time"
 msgstr "Kotak kombo untuk memilih waktu"
 
-#: ../widgets/misc/e-dateedit.c:385
-msgid "Time"
-msgstr "Waktu"
-
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "Saa_t Ini"
 
-#: ../widgets/misc/e-dateedit.c:467
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "THari ini"
 
-#. 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"
-
-#. 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
-msgid "Expanded"
-msgstr "Terbuka"
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:677
+msgid "_None"
+msgstr "_Tidak ada"
 
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "Apakah ingin mengembangkan"
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../widgets/misc/e-dateedit.c:1682
+#: ../widgets/misc/e-dateedit.c:1914
+#, fuzzy
+msgctxt "date"
+msgid "None"
+msgstr "Tak Ada"
 
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "Teks pada bingkai label"
+#: ../widgets/misc/e-dateedit.c:1809
+#, fuzzy
+msgid "Invalid Date Value"
+msgstr "Tanda tangan tidak sah"
 
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "Gunakan garis bawah"
+#: ../widgets/misc/e-dateedit.c:1853
+#, fuzzy
+msgid "Invalid Time Value"
+msgstr "Tanda tangan tidak sah"
 
-#: ../widgets/misc/e-expander.c:199
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
+#: ../widgets/misc/e-import-assistant.c:238
+#, fuzzy
+msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the list."
 msgstr ""
-"Bila diset, karakter yang diberi garis bawah adalah karakter kunci "
-"akselerator mnemonik."
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "Ruangan antara label dan anak"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "Widget label"
+"Pilih file yang hendak diimpor ke dalam Evolution, dan pilih jenis filenya dari dalam daftar.\n"
+"\n"
+"Anda boleh memilih \"Otomatis\" bila Anda tidak tahu, dan Evolution akan mencoba menebaknya."
 
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "Widget yang ditampilkan pada label expander"
+#: ../widgets/misc/e-import-assistant.c:255
+msgid "F_ilename:"
+msgstr "Nama f_ile:"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
-msgid "Expander Size"
-msgstr "Ukuran ekspander"
+#: ../widgets/misc/e-import-assistant.c:265
+msgid "Select a file"
+msgstr "Pilih sebuah file"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
-msgid "Size of the expander arrow"
-msgstr "Ukuran panah ekspander"
+#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:455
+msgid "File _type:"
+msgstr "_Tipe file:"
 
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "Jarak Indikator"
+#: ../widgets/misc/e-import-assistant.c:322
+msgid "Choose the destination for this import"
+msgstr "Pilih tujuan impor ini"
 
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "Ruangan di sekeliling indikator"
+#: ../widgets/misc/e-import-assistant.c:347
+msgid "Choose the type of importer to run:"
+msgstr "Pilih jenis program impor yang akan dijalankan:"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
-msgid "Advanced Search"
-msgstr "Pencarian Detil"
+#: ../widgets/misc/e-import-assistant.c:355
+msgid "Import data and settings from _older programs"
+msgstr "Impor data dan pengaturan dari pr_ogram-program lama"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Simpan Pencarian"
+#: ../widgets/misc/e-import-assistant.c:363
+msgid "Import a _single file"
+msgstr "Mengimpor _satu file"
 
-#: ../widgets/misc/e-filter-bar.c:247
-msgid "_Searches"
-msgstr "_Pencarian"
+#: ../widgets/misc/e-import-assistant.c:439
+msgid "Select what type of file you want to import from the list."
+msgstr ""
 
-#: ../widgets/misc/e-filter-bar.c:249
-msgid "Searches"
-msgstr "Pencarian"
+#: ../widgets/misc/e-import-assistant.c:516
+#, fuzzy
+msgid "Evolution checked for settings to import from the following applications: Pine, Netscape, Elm, iCalendar. No importable settings found. If you would like to try again, please click the \"Back\" button."
+msgstr ""
+"Evolution dapat mengimpor konfigurasi dari aplikasi\n"
+"berikut ini: Pine, Netscape, Elm, iCalendar. Namun Evolution\n"
+"tidak mendeteksi adanya konfigurasi tersebut.\n"
+"Bila hendak mencoba lagi, klik pada tombol \"Mundur\".\n"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
-msgid "_Save Search..."
-msgstr "_Simpan Pencarian..."
+#: ../widgets/misc/e-import-assistant.c:1187
+#: ../widgets/misc/e-import-assistant.c:1214
+msgid "Evolution Import Assistant"
+msgstr "Program Bantu Impor Evolution"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
-msgid "_Edit Saved Searches..."
-msgstr "Ubah P_encarian Tersimpan..."
+#: ../widgets/misc/e-import-assistant.c:1196
+#: ../widgets/misc/e-import-assistant.c:1248
+msgid "Import Location"
+msgstr "Impor dari Lokasi"
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
-msgid "_Advanced Search..."
-msgstr "Penc_arian Detil..."
+#: ../widgets/misc/e-import-assistant.c:1207
+#, fuzzy
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing external files into Evolution."
+msgstr ""
+"Selamat datang pada Program Bantu Impor Evolution.\n"
+"Dengan program ini Anda akan dipandu dalam melakukan\n"
+"kegiatan impor file-file lama Anda ke dalam Evolution."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Seluruh Account"
+#: ../widgets/misc/e-import-assistant.c:1223
+msgid "Importer Type"
+msgstr "Jenis Impor"
 
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Akun Saat ini"
+#: ../widgets/misc/e-import-assistant.c:1232
+#, fuzzy
+msgid "Select Information to Import"
+msgstr "Pilih folder tujuan impor"
 
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Folder Saat ini"
+#: ../widgets/misc/e-import-assistant.c:1240
+msgid "Select a File"
+msgstr "Ambil file"
 
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Pesan Saat ini"
+#: ../widgets/misc/e-import-assistant.c:1255
+#, fuzzy
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Klik tombol \"Impor\" untuk segera melakukan impor file lama ke Evolution."
 
-#: ../widgets/misc/e-image-chooser.c:172
-msgid "Choose Image"
-msgstr "Pilih Gambar"
+#: ../widgets/misc/e-import-assistant.c:1261
+#: ../widgets/misc/e-import-assistant.c:1271
+#, fuzzy
+msgid "Import Data"
+msgstr "Penting"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "Peta Dunia"
 
-#: ../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."
-msgstr ""
-"Widget peta untuk memilih zona waktu menggunakan mouse. Bila Anda hanya "
-"menggunakan papan ketik, pilihlah zona waktu dari kotak kombo di bawah ini."
+#: ../widgets/misc/e-map.c:626
+#, fuzzy
+msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
+msgstr "Widget peta untuk memilih zona waktu menggunakan mouse. Bila Anda hanya menggunakan papan ketik, pilihlah zona waktu dari kotak kombo di bawah ini."
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-online-button.c:27
+#, fuzzy
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr "Evolution sekarang online. Klik tombol ini untuk offline."
+
+#: ../widgets/misc/e-online-button.c:30
+#, fuzzy
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr "Evolution saat ini offline. Klik tombol ini untuk online."
+
+#: ../widgets/misc/e-online-button.c:33
+#, fuzzy
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr "Evolution saat ini offline. Klik tombol ini untuk online."
+
+#: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Sync dengan:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync Private Records:"
 msgstr "Sync Record Rahasia:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:112
 msgid "Sync Categories:"
 msgstr "Kategori sync:"
 
-#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
-msgid "Empty message"
-msgstr "Email kosong"
-
-#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
-msgid "Reflow model"
-msgstr "Alirkan ulang model"
-
-#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
-msgid "Column width"
-msgstr "Lebar kolom"
-
-#: ../widgets/misc/e-search-bar.c:535
-msgid "_Search"
-msgstr "_Cari"
-
-#: ../widgets/misc/e-search-bar.c:541
-msgid "_Find Now"
-msgstr "_Cari"
+#: ../widgets/misc/e-preferences-window.c:218
+msgid "Evolution Preferences"
+msgstr "Pengaturan Evolution"
 
-#: ../widgets/misc/e-search-bar.c:542
-msgid "_Clear"
-msgstr "_Kosongkan"
+#: ../widgets/misc/e-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "Jumlah Kecocokan: %d"
 
-#: ../widgets/misc/e-search-bar.c:793
-msgid "Item ID"
-msgstr "ID Item"
+#: ../widgets/misc/e-search-bar.c:554
+#, fuzzy
+msgid "Close the find bar"
+msgstr "Tutup jendela ini"
 
-#: ../widgets/misc/e-search-bar.c:800 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3503
-#: ../widgets/text/e-text.c:3504
-msgid "Text"
-msgstr "Teks"
+#: ../widgets/misc/e-search-bar.c:562
+#, fuzzy
+msgid "Fin_d:"
+msgstr "Temu_kan:"
 
-#. 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:922
-msgid "Sho_w: "
-msgstr "_Tampilkan: "
+#: ../widgets/misc/e-search-bar.c:574
+#, fuzzy
+msgid "Clear the search"
+msgstr "Selalu cari"
 
-#. 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:939
-msgid "Sear_ch: "
-msgstr "_Cari: "
+#: ../widgets/misc/e-search-bar.c:597
+#, fuzzy
+msgid "_Previous"
+msgstr "Sebelum"
 
-#. 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:951
-msgid " i_n "
-msgstr " dala_m "
+#: ../widgets/misc/e-search-bar.c:603
+msgid "Find the previous occurrence of the phrase"
+msgstr ""
 
-#: ../widgets/misc/e-selection-model-array.c:547
-#: ../widgets/table/e-tree-selection-model.c:811
-msgid "Cursor Row"
-msgstr "Baris kursor"
+#: ../widgets/misc/e-search-bar.c:613
+#, fuzzy
+msgid "_Next"
+msgstr "_Berikutnya"
 
-#: ../widgets/misc/e-selection-model-array.c:554
-#: ../widgets/table/e-tree-selection-model.c:818
-msgid "Cursor Column"
-msgstr "Kolom Kursor"
+#: ../widgets/misc/e-search-bar.c:619
+msgid "Find the next occurrence of the phrase"
+msgstr ""
 
-#: ../widgets/misc/e-selection-model.c:214
-msgid "Sorter"
-msgstr "Urutan"
+#: ../widgets/misc/e-search-bar.c:629
+#, fuzzy
+msgid "Mat_ch case"
+msgstr "Cocok _huruf"
 
-#: ../widgets/misc/e-selection-model.c:221
-msgid "Selection Mode"
-msgstr "Modus Pemilihan"
+#: ../widgets/misc/e-search-bar.c:657
+msgid "Reached bottom of page, continued from top"
+msgstr ""
 
-#: ../widgets/misc/e-selection-model.c:229
-msgid "Cursor Mode"
-msgstr "Modus Kursor"
+#: ../widgets/misc/e-search-bar.c:679
+msgid "Reached top of page, continued from bottom"
+msgstr ""
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Saat _dihapus:"
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>Pilihan Pengiriman</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>Balasan</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>Notifikasi Retur</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>Pelacakan Status</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
 msgstr "Hapus catatan secara _otomatis"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Klasifikasi"
-
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
 msgstr "Catat informasi pengiriman untuk melacak"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
 msgstr "Saat ter_kirim dan dibuka"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.ui.h:5
+#, fuzzy
+msgid "Delivery Options"
+msgstr "<b>Pilihan Pengiriman</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgid "For Your Eyes Only"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
 msgstr "Pengatu_ran Umum"
 
-#: ../widgets/misc/e-send-options.glade.h:10
-msgid ""
-"None\n"
-"Mail Receipt"
+#: ../widgets/misc/e-send-options.ui.h:10
+#, fuzzy
+msgid "Mail Receipt"
 msgstr ""
 "Tidak Ada\n"
 "Nota Terima Email"
 
-#: ../widgets/misc/e-send-options.glade.h:12
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
-msgstr ""
-"Normal\n"
-"Proprietary\n"
-"Rahasia\n"
-"Rahasia\n"
-"Sangat Rahasia\n"
-"Hanya Untuk Anda Saja"
-
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.ui.h:14
+#, fuzzy
+msgid "Proprietary"
+msgstr "Prioritas"
+
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "Harap _dibalas:"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.ui.h:17
+#, fuzzy
+msgid "Return Notification"
+msgstr "<b>Notifikasi Retur</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Sta_tus Tracking"
 msgstr "Pelacakan Sta_tus"
 
-#: ../widgets/misc/e-send-options.glade.h:21
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"Tidak Jelas\n"
-"Tinggi\n"
-"Standar\n"
-"Rendah"
+#: ../widgets/misc/e-send-options.ui.h:21
+#, fuzzy
+msgid "Standard"
+msgstr "Standard"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+#, fuzzy
+msgid "Status Tracking"
+msgstr "<b>Pelacakan Status</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:23
+#, fuzzy
+msgid "Top Secret"
+msgstr "Sangat Rahasia"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When acce_pted:"
 msgstr "Saat di_terima:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "When co_mpleted:"
 msgstr "Saat _selesai:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "When decli_ned:"
 msgstr "Saat di_tolak:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "_Dalam"
 
-#: ../widgets/misc/e-send-options.glade.h:29
-msgid "_After:"
-msgstr "Setel_ah"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+#, fuzzy
+msgid "_After"
+msgstr "Setel_ah:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "Semu_a informasi"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
+#, fuzzy
+msgid "_Classification:"
+msgstr "K_lasifikasi"
+
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "_Tunda pengiriman email"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "Saat _terkirim"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "Tentukan tanggal kadaluwar_sa"
 
-#: ../widgets/misc/e-send-options.glade.h:35
-msgid "_Until:"
-msgstr "_Sampai:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+#, fuzzy
+msgid "_Until"
+msgstr "hingga"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "_Sebisanya"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "_Saat dibuka:"
 
-#: ../widgets/misc/e-task-widget.c:208
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#: ../widgets/misc/e-signature-editor.c:133
+#: ../widgets/misc/e-signature-editor.c:549
+#: ../widgets/misc/e-signature-manager.c:349
+#: ../widgets/misc/e-signature-script-dialog.c:218
+msgid "Unnamed"
+msgstr "Belum diberi nama"
 
-#: ../widgets/misc/e-task-widget.c:213
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% selesai)"
+#: ../widgets/misc/e-signature-editor.c:210
+#, fuzzy
+msgid "_Save and Close"
+msgstr "Simpan dan Tutup"
+
+#: ../widgets/misc/e-signature-editor.c:389
+#, fuzzy
+msgid "Edit Signature"
+msgstr "Ubah tanda tangan"
+
+#: ../widgets/misc/e-signature-editor.c:404
+#, fuzzy
+msgid "_Signature Name:"
+msgstr "Tabel Tanda Tangan"
+
+#: ../widgets/misc/e-signature-manager.c:294
+#, fuzzy
+msgid "Add Signature Script"
+msgstr "Tambahkan skrip tanda tangan"
+
+#: ../widgets/misc/e-signature-manager.c:359
+#, fuzzy
+msgid "Edit Signature Script"
+msgstr "Tambahkan skrip tanda tangan"
+
+#: ../widgets/misc/e-signature-manager.c:576
+msgid "Add _Script"
+msgstr "Tambahkan _Skrip"
+
+#: ../widgets/misc/e-signature-script-dialog.c:266
+#, 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 ""
+"Output skrip ini akan digunakan sebagai tanda tangan.\n"
+"Nama yang diberikan akan digunakan untuk keperluan\n"
+"tampilan saja. "
+
+#: ../widgets/misc/e-signature-script-dialog.c:311
+#, fuzzy
+msgid "S_cript:"
+msgstr "_Skrip:"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-signature-script-dialog.c:342
+#, fuzzy
+msgid "Script file must be executable."
+msgstr "File skrip harus ada dan harus dapat dijalankan."
+
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "Klik di sini untuk ke URL"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "Ubah Daftar Kategori Induk..."
+#: ../widgets/misc/e-web-view.c:359
+msgid "_Copy Link Location"
+msgstr "_Salin Lokasi Link"
+
+#: ../widgets/misc/e-web-view.c:361
+#, fuzzy
+msgid "Copy the link to the clipboard"
+msgstr "Salin pilihan ke papan tempel"
+
+#: ../widgets/misc/e-web-view.c:369
+msgid "_Open Link in Browser"
+msgstr "Buka Link dalam Br_owser"
+
+#: ../widgets/misc/e-web-view.c:371
+#, fuzzy
+msgid "Open the link in a web browser"
+msgstr "Buka Link dalam Br_owser"
+
+#: ../widgets/misc/e-web-view.c:379
+#, fuzzy
+msgid "_Copy Email Address"
+msgstr "_Salin Alamat Surat"
+
+#: ../widgets/misc/e-web-view.c:408
+#: ../widgets/misc/e-web-view.c:1063
+#, fuzzy
+msgid "Select all text and images"
+msgstr "Pilih seluruh teks dalam sebuah pesan"
+
+#: ../widgets/misc/e-web-view.c:840
+#: ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
+#, fuzzy, c-format
+msgid "Click to call %s"
+msgstr "Klik untuk mengirim email kepada %s"
+
+#: ../widgets/misc/e-web-view.c:846
+msgid "Click to hide/unhide addresses"
+msgstr "Klik untuk sembunyi/tampilkan alamat"
 
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "Termasuk ke dalam _kategori berikut:"
+#: ../widgets/misc/e-web-view.c:848
+#, c-format
+msgid "Click to open %s"
+msgstr "Klik untuk membuka %s"
 
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "K_ategori Tersedia:"
+#: ../widgets/misc/ea-calendar-item.c:299
+#: ../widgets/misc/ea-calendar-item.c:308
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../widgets/misc/ea-calendar-item.c:311
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Kalender: dari %s hingga %s"
 
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "kategori"
+#: ../widgets/misc/ea-calendar-item.c:347
+msgid "evolution calendar item"
+msgstr "objek kalender evolution"
 
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "daftar popup"
 
-#: ../widgets/table/e-cell-date.c:64
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
+#: ../widgets/table/e-cell-date-edit.c:303
+msgid "Now"
+msgstr "Saat Ini"
 
-#: ../widgets/table/e-cell-pixbuf.c:397
-msgid "Selected Column"
-msgstr "Kolom Terpilih"
+#. Translators: "None" as a label of a button to unset date in a date table cell
+#: ../widgets/table/e-cell-date-edit.c:320
+#, fuzzy
+msgctxt "table-date"
+msgid "None"
+msgstr "Tak Ada"
+
+#: ../widgets/table/e-cell-date-edit.c:328
+msgid "OK"
+msgstr "OK"
+
+#: ../widgets/table/e-cell-date-edit.c:872
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "Waktu harus dalam bentuk: %s"
 
-#: ../widgets/table/e-cell-pixbuf.c:404
-msgid "Focused Column"
-msgstr "Kolom Terfokus"
+#: ../widgets/table/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Nilai persen harus di antara 0 dan 100"
 
-#: ../widgets/table/e-cell-pixbuf.c:411
-msgid "Unselected Column"
-msgstr "Kolum Tak Terpilih"
+#: ../widgets/table/e-table-click-to-add.c:595
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
+msgid "click to add"
+msgstr "klik untuk menambah"
 
-#: ../widgets/table/e-cell-text.c:1813
-msgid "Strikeout Column"
-msgstr "Kolom Tercoret"
+#: ../widgets/table/e-table-config.c:381
+#: ../widgets/table/e-table-config.c:423
+msgid "(Ascending)"
+msgstr "(Naik)"
 
-#: ../widgets/table/e-cell-text.c:1820
-msgid "Underline Column"
-msgstr "Kolom Bergaris Bawah"
+#: ../widgets/table/e-table-config.c:381
+#: ../widgets/table/e-table-config.c:423
+msgid "(Descending)"
+msgstr "(Turun)"
 
-#: ../widgets/table/e-cell-text.c:1827
-msgid "Bold Column"
-msgstr "Kolom Tebal"
+#: ../widgets/table/e-table-config.c:388
+msgid "Not sorted"
+msgstr "Tak terurut"
 
-#: ../widgets/table/e-cell-text.c:1834
-msgid "Color Column"
-msgstr "Kolom Warna"
+#: ../widgets/table/e-table-config.c:429
+msgid "No grouping"
+msgstr "Tak ada kelompok"
 
-#: ../widgets/table/e-cell-text.c:1848
-msgid "BG Color Column"
-msgstr "Kolom Warna Latar"
+#: ../widgets/table/e-table-config.c:647
+#: ../widgets/table/e-table-config.ui.h:11
+msgid "Show Fields"
+msgstr "Tampilkan Kolom"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-msgid "<- _Remove"
-msgstr "<- _Buang"
+#: ../widgets/table/e-table-config.c:667
+msgid "Available Fields"
+msgstr "Kolom Tersedia"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:2
-#: ../widgets/table/e-table-config.glade.h:1
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "A_vailable Fields:"
 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
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "Naik"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:4
-#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
 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
+#: ../widgets/table/e-table-config.ui.h:4
+#, fuzzy
+msgid "Clear _All"
+msgstr "Hapus Semua"
+
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "Turun"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:8
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "Kelompokkan Berdasarkan"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.ui.h:9
 msgid "Move _Down"
 msgstr "_Turunkan"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.ui.h:10
 msgid "Move _Up"
 msgstr "N_aikkan"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr "Tampilkan k_olom ini dalam urutan:"
+#: ../widgets/table/e-table-config.ui.h:12
+#, fuzzy
+msgid "Show _field in View"
+msgstr "Tampilkan kolom pada Tampilan"
 
-#: ../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 "Tampilkan Kolom"
+#: ../widgets/table/e-table-config.ui.h:13
+#, fuzzy
+msgid "Show field i_n View"
+msgstr "Tampilkan kolom pada Tampilan"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
+#: ../widgets/table/e-table-config.ui.h:14
+#, fuzzy
+msgid "Show field in _View"
 msgstr "Tampilkan kolom pada Tampilan"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "Urutan"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:15
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "Urutkan Data Berdasarkan"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:16
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:17
 msgid "Then By"
 msgstr "Lalu Berdasarkan"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-msgid "_Add ->"
-msgstr "T_ambah ->"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:18
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
 msgstr "_Kolom yang Tampak..."
 
-#: ../widgets/table/e-table-config-no-group.glade.h:19
-#: ../widgets/table/e-table-config.glade.h:20
-msgid "_Sort..."
-msgstr "_Urutkan..."
-
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Kondisi"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Ascending)"
-msgstr "(Naik)"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Descending)"
-msgstr "(Turun)"
-
-#: ../widgets/table/e-table-config.c:314
-msgid "Not sorted"
-msgstr "Tak terurut"
-
-#: ../widgets/table/e-table-config.c:355
-msgid "No grouping"
-msgstr "Tak ada kelompok"
-
-#: ../widgets/table/e-table-config.c:584
-msgid "Available Fields"
-msgstr "Kolom Tersedia"
-
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
 msgstr "_Kelompokkan Berdasarkan..."
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:22
+#, fuzzy
+msgid "_Show field in View"
+msgstr "Tampilkan kolom pada Tampilan"
+
+#: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
 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
-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
-msgid "Full Header"
-msgstr "Judul Penuh"
+#: ../widgets/table/e-table-config.ui.h:24
+msgid "_Sort..."
+msgstr "_Urutkan..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
-msgid "Add a column..."
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
+#, fuzzy
+msgid "Add a Column"
 msgstr "Sisipkan kolom..."
 
-#: ../widgets/table/e-table-field-chooser.glade.h:1
-msgid "Field Chooser"
-msgstr "Pemilih Kolom"
-
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -21298,828 +21413,143 @@ msgstr ""
 "Untuk menambahkan kolom dalam tabel, ambil\n"
 "kolom yang diinginkan dan letakkan pada lokasi yang Anda inginkan."
 
-#: ../widgets/table/e-table-group-container.c:345
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d objek)"
-
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
 #: ../widgets/table/e-table-group-container.c:351
+#, fuzzy, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%'u objek"
+
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d objek)"
 
-#: ../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 "Warna Baris Lain"
-
-#: ../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 "Garis Gambar Horisontal"
-
-#: ../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 "Garis Gambar Vertikal"
-
-#: ../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 "Fokus gambar"
-
-#: ../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 "Modus kursor"
-
-#: ../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 "Model pilihan"
-
-#: ../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 "Rentang Panjang"
-
-#: ../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 "Tinggi baris seragam"
-
-#: ../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 "Beku"
-
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
-msgstr "Sesuaikan Tampilan"
+msgstr "Gubah Tampilan Kini"
 
-#: ../widgets/table/e-table-header-item.c:1491
-msgid "Sort Ascending"
+#: ../widgets/table/e-table-header-item.c:1562
+#, fuzzy
+msgid "Sort _Ascending"
 msgstr "Urutkan Ascending"
 
-#: ../widgets/table/e-table-header-item.c:1492
-msgid "Sort Descending"
+#: ../widgets/table/e-table-header-item.c:1565
+#, fuzzy
+msgid "Sort _Descending"
 msgstr "Urutkan Descending"
 
-#: ../widgets/table/e-table-header-item.c:1493
-msgid "Unsort"
+#: ../widgets/table/e-table-header-item.c:1568
+#, fuzzy
+msgid "_Unsort"
 msgstr "Jangan urutkan"
 
-#: ../widgets/table/e-table-header-item.c:1495
-msgid "Group By This Field"
+#: ../widgets/table/e-table-header-item.c:1571
+#, fuzzy
+msgid "Group By This _Field"
 msgstr "Kelompokkan sesuai dengan daerah ini"
 
-#: ../widgets/table/e-table-header-item.c:1496
-msgid "Group By Box"
+#: ../widgets/table/e-table-header-item.c:1574
+#, fuzzy
+msgid "Group By _Box"
 msgstr "Kelompokkan Sesuai Kotak"
 
-#: ../widgets/table/e-table-header-item.c:1498
-msgid "Remove This Column"
+#: ../widgets/table/e-table-header-item.c:1578
+#, fuzzy
+msgid "Remove This _Column"
 msgstr "Hapus Kolom"
 
-#: ../widgets/table/e-table-header-item.c:1499
-msgid "Add a Column..."
+#: ../widgets/table/e-table-header-item.c:1581
+#, fuzzy
+msgid "Add a C_olumn..."
 msgstr "Sisipkan Kolom..."
 
-#: ../widgets/table/e-table-header-item.c:1501
-msgid "Alignment"
+#: ../widgets/table/e-table-header-item.c:1585
+#, fuzzy
+msgid "A_lignment"
 msgstr "Penyesuaian"
 
-#: ../widgets/table/e-table-header-item.c:1502
-msgid "Best Fit"
+#: ../widgets/table/e-table-header-item.c:1588
+#, fuzzy
+msgid "B_est Fit"
 msgstr "Penempatan terbaik"
 
-#: ../widgets/table/e-table-header-item.c:1503
-msgid "Format Columns..."
+#: ../widgets/table/e-table-header-item.c:1591
+#, fuzzy
+msgid "Format Column_s..."
 msgstr "Format Kolom..."
 
-#: ../widgets/table/e-table-header-item.c:1505
-msgid "Customize Current View..."
+#: ../widgets/table/e-table-header-item.c:1595
+#, fuzzy
+msgid "Custo_mize Current View..."
 msgstr "Ubah Tampilan..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
+#: ../widgets/table/e-table-header-item.c:1654
+#, fuzzy
+msgid "_Sort By"
 msgstr "Urutkan"
 
-#: ../widgets/table/e-table-header-item.c:1899 ../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-sorter.c:175
-msgid "Sort Info"
-msgstr "Info urutan"
-
-#: ../widgets/table/e-table-header-item.c:1934
-#: ../widgets/table/e-tree-scrolled.c:221
-#: ../widgets/table/e-tree-scrolled.c:222
-msgid "Tree"
-msgstr "Tree"
-
-#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
-msgid "Table header"
-msgstr "Kepala tabel"
-
-#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
-msgid "Table model"
-msgstr "Model tabel"
-
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-msgid "Cursor row"
-msgstr "Baris kursor"
-
-#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
-#: ../widgets/table/e-tree.c:3299
-msgid "Always search"
-msgstr "Selalu cari"
-
-#: ../widgets/table/e-table.c:3322
-msgid "Use click to add"
-msgstr "Gunakan klik untuk menambah"
-
-#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
-msgid "ETree table adapter"
-msgstr "Tabel adapter ETree"
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1672
+#, fuzzy
+msgid "_Custom"
+msgstr "Gubahan"
 
-#: ../widgets/table/e-tree.c:3305
-msgid "Retro Look"
-msgstr "Tampil Retro"
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+msgid "popup a child"
+msgstr "popup kan sebuah anak"
 
-#: ../widgets/table/e-tree.c:3306
-msgid "Draw lines and +/- expanders."
-msgstr "Gambar gari dan tanda +/-"
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
+msgid "begin editing this cell"
+msgstr "mulai menyunting sel ini"
 
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr "Percobaan Minicard"
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
+msgid "toggle the cell"
+msgstr "jungkit sel"
 
-#: ../widgets/text/e-entry-test.c:50
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Hak Cipta (C) 2000, Helix Code, Inc"
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
+msgid "expands the row in the ETree containing this cell"
+msgstr "kembangkan baris pada ETree yang mengandung sel ini"
 
-#: ../widgets/text/e-entry-test.c:52
-msgid "This should test the minicard canvas item"
-msgstr "Ini akan mencoba objek kanvas minicard"
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
+msgid "collapses the row in the ETree containing this cell"
+msgstr "runtuhkan baris dalam ETree yang mengandung sel ini"
 
-#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
-msgid "Event Processor"
-msgstr "Kejadian Prosessor"
+#: ../widgets/table/gal-a11y-e-cell.c:119
+msgid "Table Cell"
+msgstr ""
 
-#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
-msgid "Font"
-msgstr "Fonta"
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "klik"
 
-#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-msgid "GDKFont"
-msgstr "GDKFont"
+#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+msgid "sort"
+msgstr "urutkan"
 
-#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
-msgid "Justification"
-msgstr "Rata"
+#: ../widgets/text/e-text.c:2474
+msgid "Select All"
+msgstr "Pilih semua"
 
-#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
-msgid "Use ellipsis"
-msgstr "Pergunakan bentuk ellips"
-
-#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
-msgid "Ellipsis"
-msgstr "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
-msgid "Line wrap"
-msgstr "potong baris"
-
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
-msgid "Break characters"
-msgstr "Potong karakter"
-
-#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
-msgid "Max lines"
-msgstr "Baris Maksimal"
-
-#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
-msgid "Allow newlines"
-msgstr "Bolehkan baris baru"
-
-#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
-msgid "Draw borders"
-msgstr "Gambar garis"
-
-#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
-msgid "Draw background"
-msgstr "Gambar latar belakang"
-
-#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
-msgid "Draw button"
-msgstr "Gambar tombol"
-
-#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
-msgid "Cursor position"
-msgstr "Posisi kursor"
-
-#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
-msgid "Emulate label resize"
-msgstr "Emulasikan perubahan ukuran label"
-
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "Metode input"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
-msgid "Bold"
-msgstr "Tebal"
-
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
-msgid "Strikeout"
-msgstr "Coret"
-
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
-msgid "Anchor"
-msgstr "Anchor"
-
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
-msgid "Clip Width"
-msgstr "Lebar potongan"
-
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
-msgid "Clip Height"
-msgstr "Tinggi potongan"
-
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
-msgid "Clip"
-msgstr "Potongan"
-
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
-msgid "Fill clip rectangle"
-msgstr "Isi kotak potongan"
-
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
-msgid "X Offset"
-msgstr "Offset X"
-
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
-msgid "Y Offset"
-msgstr "Offset Y"
-
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
-msgid "Text width"
-msgstr "Lebar teks"
-
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
-msgid "Text height"
-msgstr "Tinggi teks"
-
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
-msgid "IM Context"
-msgstr "Konteks IM"
-
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
-msgid "Handle Popup"
-msgstr "Tangani Popup"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "work"
-#~ msgstr "kantor"
-
-#~ msgid "personal"
-#~ msgstr "pribadi"
-
-#~ msgid "The calendar you have selected is read-only"
-#~ msgstr "Kalender yang anda pilih hanya dapat dibaca saja"
-
-#~ msgid "Cale_ndar:"
-#~ msgstr "Kale_nder:"
-
-#~ msgid "Memo:"
-#~ msgstr "Memo:"
-
-#~ msgid "_Memo"
-#~ msgstr "_Memo"
-
-#~ msgid "      "
-#~ msgstr "......"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Langganan"
-
-#~ msgid "Mark all messages as read in the selected folder"
-#~ msgstr "Tandai seluruh pesan menjadi terbaca pada folder terpilih"
-
-#~ msgid "C_lassification"
-#~ msgstr "K_lasifikasi"
-
-#~ msgid ""
-#~ "Public\n"
-#~ "Private\n"
-#~ "Confidential\n"
-#~ msgstr ""
-#~ "Publik\n"
-#~ "Pribadi\n"
-#~ "Rahasia\n"
-
-#~ msgid "%s : %s (%d items)"
-#~ msgstr "%s : %s (%d objek)"
-
-#~ msgid "%s (%d items)"
-#~ msgstr "%s (%d objek)"
-
-#~ 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"
-
-#~ 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 ""
-#~ "Pilihan ini berarti Evolution akan hanya mencoba untuk menggunakan SSL/"
-#~ "TSL apabila Anda berada pada lingkungan yang tidak aman. Misalnya, "
-#~ "apabila Anda dan server LDAP berada di belakang firewall di kantor, "
-#~ "Evolution tidak akan menggunakan SSL/TLS karena koneksi Anda sudah aman."
-
-#~ msgid "Advanced..."
-#~ msgstr "Detil..."
-
-#~ msgid "Select target addressbook."
-#~ msgstr "Pilih buku alamat tujuan"
-
-#~ msgid "(none)"
-#~ msgstr "(tidak ada)"
-
-#~ msgid "Primary Email"
-#~ msgstr "Email Utama"
-
-#~ msgid "Select an Action"
-#~ msgstr "Pilih Aksi"
-
-#~ msgid "Create a new contact \"%s\""
-#~ msgstr "Buat kontak baru \"%s\""
-
-#~ msgid "Add address to existing contact \"%s\""
-#~ msgstr "Tambahkan alamt ke dalam kontak \"%s\" yang sudah ada"
-
-#~ msgid "Merge E-Mail Address"
-#~ msgstr "Gabungkan Alamat Email"
-
-#~ msgid "Discard Changes"
-#~ msgstr "Abaikan"
-
-#~ msgid ""
-#~ "<big><b>%s</b></big>\n"
-#~ "%s until %s"
-#~ msgstr ""
-#~ "<big><b>%s</b></big>\n"
-#~ "%s hingga %s"
-
-#~ msgid "description of appointment"
-#~ msgstr "keterangan tentang pertemuan"
-
-#~ msgid "Dismiss"
-#~ msgstr "Tutup"
-
-#~ msgid "Dismiss All"
-#~ msgstr "Tutup Semua"
-
-#~ msgid ""
-#~ "Alarm on %s\n"
-#~ "%s\n"
-#~ "Starting at %s\n"
-#~ "Ending at %s"
-#~ msgstr ""
-#~ "Nyalakan alarm pada %s\n"
-#~ "%s\n"
-#~ "Awal %s\n"
-#~ "Akhir %s"
-
-#~ msgid "Remove"
-#~ msgstr "Hapus"
-
-#~ msgid "Don't Remove"
-#~ msgstr "Jangan Hapus"
-
-#~ msgid "05 minutes"
-#~ msgstr "05 menit"
-
-#~ msgid "10 minutes"
-#~ msgstr "10 menit"
-
-#~ msgid "15 minutes"
-#~ msgstr "15 menit"
-
-#~ msgid "30 minutes"
-#~ msgstr "30 menit"
-
-#~ msgid "60 minutes"
-#~ msgstr "60 menit"
-
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Peringatan</b>"
-
-#~ msgid "<b>Default Free/Busy Server</b>"
-#~ msgstr "<b>Server Luang/Sibuk Utama</b>"
-
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Umum</b>"
-
-#~ msgid "<b>Publishing</b>"
-#~ msgstr "<b>Lokasi Publikasi</b>"
-
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>Daftar Tugas</b>"
-
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>Waktu</b>"
-
-#~ msgid "<b>Work Week</b>"
-#~ msgstr "<b>Minggu Kerja</b>"
-
-#~ msgid "Calendar and Tasks Settings"
-#~ msgstr "Pengaturan Kalender dan Tugas"
-
-#~ msgid "Color for overdue tasks"
-#~ msgstr ""
-#~ "Warna untuk tugas yang seharusnya sudah selesai namun kenyataannya belum "
-#~ "selesai"
-
-#~ msgid "Color for tasks due today"
-#~ msgstr "Warna tugas yang harus sudah selesai hari ini"
-
-#~ msgid "Days"
-#~ msgstr "Hari"
-
-#~ msgid "Hours"
-#~ msgstr "Jam"
-
-#~ msgid "Minutes"
-#~ msgstr "Menit"
-
-#~ msgid "_Add URL"
-#~ msgstr "M_asukkan URL"
-
-#~ msgid "_Attachment Bar (drop attachments here)"
-#~ msgstr "Kot_ak Lampiran (silakan letakkan lampiran ke sini)"
-
-#~ msgid "Scheduling"
-#~ msgstr "Penjadwalan"
-
-#~ msgid "Invitations"
-#~ msgstr "Undangan"
-
-#~ msgid "<b>Basics</b>"
-#~ msgstr "<b>Dasar</b>"
-
-#~ msgid "<b>Date and Time</b>"
-#~ msgstr "<b>Tanggal dan Waktu</b>"
-
-#~ msgid "<b>Send Options</b>"
-#~ msgstr "<b>Pilihan Pengiriman</b>"
-
-#~ msgid "A_ll day event"
-#~ msgstr "Acara se_hari penuh"
-
-#~ msgid "Classi_fication:"
-#~ msgstr "Klasi_fikasi:"
-
-#~ msgid "This appointment has customized alarms"
-#~ msgstr "Jadwal pertemuan ini dilengkapi alarm"
-
-#~ msgid "_Description:"
-#~ msgstr "Keterangan:"
-
-#~ msgid "<b>Dele_gatees</b>"
-#~ msgstr "<b>Dele_gasi</b>"
-
-#~ msgid "<b>From:</b>"
-#~ msgstr "<b>Dari:</b>"
-
-#~ msgid "_Delegate To..."
-#~ msgstr "_Delegasikan Ke..."
-
-#~ msgid "Con_tacts..."
-#~ msgstr "Kon_tak..."
-
-#~ msgid "Assignment"
-#~ msgstr "Penugasan"
-
-#~ msgid "Task Table"
-#~ msgstr "Tabel Tugas"
-
-#~ msgid "_Publish Free/Busy Information"
-#~ msgstr "Informasi _Publikasi Luang/Sibuk"
-
-#~ msgid "Removal Complete"
-#~ msgstr "Penghapusan Selesai"
-
-#~ msgid "Timezone Button"
-#~ msgstr "Tombol Zona Waktu"
-
-#~ msgid "The Evolution Groupware Suite"
-#~ msgstr "The Evolution Groupware Suite"
-
-#~ msgid "%a %m/%d/%Y %I:%M %p"
-#~ msgstr "%a %d/%m/%Y %H:%M"
-
-#~ 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 %H"
-
-#~ 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 "Nama atu_ran:"
-
-#~ msgid "If"
-#~ msgstr "Jika"
-
-#~ msgid "Execute actions"
-#~ msgstr "Jalankan aksi"
-
-#~ msgid "Mail Accounts Table"
-#~ msgstr "Tabel Akun Email"
-
-#~ msgid "Attachment Button"
-#~ msgstr "Tombol Lampiran"
-
-#~ msgid "Filters"
-#~ msgstr "Filter"
-
-#~ msgid "Execute Command..."
-#~ msgstr "Jalankan Perintah..."
-
-#~ msgid "T_erminal Font:"
-#~ msgstr "Jenis Huruf T_erminal:"
-
-#~ msgid "_Show animated images"
-#~ msgstr "Tampilkan anima_si gambar"
-
-#~ msgid "Server: %s, Type: %s"
-#~ msgstr "Server: %s, Tipe: %s"
-
-#~ msgid "Path: %s, Type: %s"
-#~ msgstr "Path: %s, Tipe: %s"
-
-#~ msgid "Type: %s"
-#~ msgstr "Tipe: %s"
-
-#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Kontak Otomatis</span>"
-
-#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Kontak dari Program Pesan Instan</span>"
-
-#~ msgid "Automatic contacts"
-#~ msgstr "Kontak otomatis"
-
-#~ msgid "Exchange Connector access error."
-#~ msgstr "Ada kesalahan akses Konektor Exchange."
-
-#~ msgid "dialog1"
-#~ msgstr "dialog1"
-
-#~ msgid "Meetings and Tasks"
-#~ msgstr "Kalender dan Tugas"
-
-#~ msgid "<span weight=\"bold\">Conflict Search</span>"
-#~ msgstr "<span weight=\"bold\">Pencarian Jadwal Bentrok</span>"
-
-#~ msgid "Plugin manager"
-#~ msgstr "Pengatur plugin"
-
-#~ msgid "Id"
-#~ msgstr "Kode"
-
-#~ msgid "Path"
-#~ msgstr "Path"
-
-#~ msgid "learns junk messages using spamd."
-#~ msgstr "Pelajari pesan spam menggunakan 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 ""
-#~ "Nama akhiran berkas yang disarankan untuk jenis berkas ini (%s) tidak "
-#~ "digunakan pada nama berkas yang Anda pilih. Tetap teruskan?"
-
-#~ msgid "Evolution Settings"
-#~ msgstr "Pengaturan 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 "E"
-
-#~ msgid "_Preview Pane"
-#~ msgstr "Panel _Pratinjau"
-
-#~ msgid "_Select All"
-#~ msgstr "Pilih _Semua"
-
-#~ msgid "Delete this Occurrence"
-#~ msgstr "Hapus Kejadian Ini"
-
-#~ msgid "Customize My Evolution"
-#~ msgstr "Atur Evolution"
-
-#~ msgid "Move"
-#~ msgstr "Pindahkan"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "Tent_ang Evolution..."
-
-#~ msgid "_Send / Receive"
-#~ msgstr "_Kirim / Terima"
-
-#~ msgid "Previous Button"
-#~ msgstr "Tombol Sebelumnya"
-
-#~ msgid "Text Date Entry"
-#~ msgstr "Isian Tanggal Teks"
-
-#~ msgid "Date Button"
-#~ msgstr "Tombol Tanggal"
-
-#~ msgid "Time Combo Box"
-#~ msgstr "Kotak Kombo Waktu"
-
-#~ msgid "Search Text Entry"
-#~ msgstr "Kotak Teks Pencarian"
-
-#~ msgid "Always Search"
-#~ msgstr "Selalu Cari"
diff --git a/po/kn.po b/po/kn.po
index d758784c48..c5e786f481 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -2,14 +2,14 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-#: ../shell/main.c:479
+#: ../shell/main.c:454
 # Shankar Prasad <svenkate@redhat.com>, 2008, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.gnome-2-28.kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 13:53+0530\n"
-"PO-Revision-Date: 2010-04-22 14:00+0530\n"
+"POT-Creation-Date: 2010-04-21 23:24+0530\n"
+"PO-Revision-Date: 2010-04-22 00:58+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
 "Language-Team: kn-IN <>\n"
 "MIME-Version: 1.0\n"
@@ -95,7 +95,7 @@ msgstr "LDAP ಪರಿಚಾರಕದೊಂದಿಗೆ ದೃಢೀಕರಿಸ
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1267
 msgid "Failed to delete contact"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಅಳಿಸಿ ಹಾಕ�ವಲ�ಲಿ ವಿಫಲತೆ ಉಂಟಾಗಿದೆ"
 
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Evolution ಮರಳಿ ಆರಂಭಗೊಳಿಸದೆ {0} ಗಾಗಿನ ನಿಮ�ಮ ಸಂಪರ�ಕವಿಳಾಸಗಳ� ಲಭ�ಯವಿರ�ವ�ದಿಲ�ಲ."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -226,16 +226,6 @@ msgstr "ಗಾತ�ರ ಬದಲಾಯಿಸ�(_R)"
 msgid "_Use as it is"
 msgstr "ಇದ�ದ ಹಾಗೆ ಬಳಸ�(_U)"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಸಿಂಕ� ವಿಳಾಸ:"
@@ -252,7 +242,7 @@ msgstr "ಪೈಲಟ�‌ನ ವಿಳಾಸ ಅನ�ವಯ ಬ�ಲಾಕ�
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2005
 msgid "Anniversary"
 msgstr "ವಾರ�ಷಿಕೋತ�ಸವ"
 
@@ -263,37 +253,39 @@ msgstr "ವಾರ�ಷಿಕೋತ�ಸವ"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2004 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:107
 msgid "Birthday"
 msgstr "ಹ�ಟ�ಟಿದದಿನ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "ಬ�ಲಾಗ�:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "ವರ�ಗಗಳ�(_t)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "ಕ�ಯಾಲೆಂಡರ�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
 msgid "Contact"
 msgstr "ಸಂಪರ�ಕ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2568
 msgid "Contact Editor"
 msgstr "ಸಂಪರ�ಕ ಸಂಪಾದಕ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
@@ -302,221 +294,190 @@ msgstr "ಸಂಪರ�ಕ ಸಂಪಾದಕ"
 msgid "Email"
 msgstr "ಇಮೇಲ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "ಪೂರ�ಣ ಹೆಸರ� (_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "ನೆಲೆ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "ನೆಲೆ ಪ�ಟ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "ಚಿತ�ರ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "ಇನ�‌ಸ�ಟಂಟ� ಮೆಸೇಜಿಂಗ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "ಕಾರ�ಯ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "ಅಂಚೆ ವಿಳಾಸ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "ಇತರೆ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "ಉಪನಾಮ(_c):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "ಟಿಪ�ಪಣಿಗಳ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1711
 msgid "Other"
 msgstr "ಇತರೆ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "ವೈಯಕ�ತಿಕ ಮಾಹಿತಿ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "ದೂರವಾಣಿ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "ವಿಡಿಯೋ ಸಂಭಾಷಣೆ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "ಜಾಲ ವಿಳಾಸ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "ಜಾಲ ಲಾಗ�:"
-
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "ಕೆಲಸ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "ವಿಳಾಸ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "ವಾರ�ಷಿಕೋತ�ಸವ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "ಸಹಾಯಕ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "ಹ�ಟ�ಟಿದ ದಿನ(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#, fuzzy
+msgid "_Blog:"
+msgstr "ಬ�ಲಾಗ�"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 #: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "ಕ�ಯಾಲೆಂಡರ�(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "ಊರ�(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "ಕಂಪನಿ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "ದೇಶ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "ವಿಭಾಗ(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "ಇಲ�ಲಿ ನಮೂದಿಸ�(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "ಹೋಂ ಪೇಜ�(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "ಮ�ಯಾನೇಜರ�(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "ಕಛೇರಿ(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "ಅಂಚೆಪೆಟ�ಟಿಗೆ(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "ಉದ�ಯೋಗ(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "ಗಂಡ ಅಥವ ಹೆಂಡತಿ(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "ರಾಜ�ಯ/ಪ�ರಾಂತ�ಯ(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "ಶೀರ�ಷಿಕೆ(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "ವಿಡಿಯೋ ಸಂಭಾಷಣೆ(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "HTML ಮೈಲ��ಗಳನ�ನ� ಸ�ವೀಕರಿಸಲ� ಬಯಸಲಾಗಿದೆ(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "ಜಾಲದ ದಾಖಲೆ(_W):"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "ಎಲ�ಲಿ(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/ಅಂಚೆ ಕೋಡ�:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:320
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "ಹೆಸರ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "ಸಂಪಾದಿಸಬಲ�ಲ"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -558,7 +519,7 @@ msgid "Skype"
 msgstr "ಸ�ಕೈಪ�‌"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "Error adding contact"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಸೇರಿಸ�ವಲ�ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
@@ -570,45 +531,21 @@ msgstr "ಸಂಪರà³�ಕವಿಳಾಸವನà³�ನà³� ಮಾರà³�ಪಡಿà²
 msgid "Error removing contact"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ತೆಗೆದ�ಹಾಕ�ವಲ�ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "ಮೂಲದ ಪ�ಸ�ತಕ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "ಉದ�ದೇಶಿತ ಪ�ಸ�ತಕ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "ಇದ� ಹೊಸ ಸಂಪರ�ಕವಿಳಾಸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "ಬರೆಯಬಹ�ದಾದ ಜಾಗಗಳ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "ಅಗತ�ಯ ಜಾಗಗಳ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "ಬದಲಾಯಿಸಲಾದ"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2563
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸ ಸಂಪಾದಕ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2971
 msgid "Please select an image for this contact"
 msgstr "ಈ ಸಂಪರ�ಕ ವಿಳಾಸಕ�ಕಾಗಿ ದಯವಿಟ�ಟ� ಒಂದ� ಚಿತ�ರವನ�ನ� ಆರಿಸಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2972
 msgid "_No image"
 msgstr "ಯಾವ�ದೆ ಚಿತ�ರವಿಲ�ಲ(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -616,56 +553,46 @@ msgstr ""
 "ಸಂಪರ�ಕ ದತ�ತಾಂಶವ� ಮಾನ�ಯವಾಗಿಲ�ಲ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3249
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ವ� ಒಂದ� ಅಮಾನ�ಯ ವಿನ�ಯಾಸವನ�ನ� ಹೊಂದಿದೆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3256
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ವ� ಒಂದ� ಅಮಾನ�ಯ ವಿನ�ಯಾಸವನ�ನ� ಹೊಂದಿದೆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3282
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ವ� ಖಾಲಿ ಇದೆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3296
 msgid "Invalid contact."
 msgstr "ಅಮಾನ�ಯ ಸಂಪರ�ಕ ವಿಳಾಸ."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ತಕ�ಷಣ ಸೇರಿಸ�ವಿಕೆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "ಎಲ�ಲವನ�ನೂ ಸಂಪಾದಿಸ�(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "ಪೂರ�ಣ ಹೆಸರ�(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "ಇಮೇಲ�(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕವನ�ನ� ಆರಿಸ�(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "ಶೆಲ�"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr ""
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "ಡಾ."
@@ -732,7 +659,7 @@ msgid "_Suffix:"
 msgstr "ಸಫಿಕ�ಸ��(_S):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:676
 msgid "Contact List Editor"
 msgstr "ಸಂಪರ�ಕ ವಿಳಾಸ ಪಟ�ಟಿ ಸಂಪಾದಕ"
 
@@ -749,7 +676,7 @@ msgid "_List name:"
 msgstr "ಕೊನೆಯ ಹೆಸರ�(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:155
 msgid "_Select..."
 msgstr "ಆರಿಸ�(_S)..."
 
@@ -759,39 +686,27 @@ msgstr ""
 "ಒಂದ� ಇಮೈಲ� ವಿಳಾಸವನ�ನ� ಟೈಪಿಸಿ ಅಥವ ಒಂದ� ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಈ ಕೆಳಗಿನ ಪಟ�ಟಿಗೆ ಎಳೆದ� "
 "ಸೇರಿಸಿ(_T):"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:769
 msgid "Contact List Members"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸ ಪಟ�ಟಿಯ ಸದಸ�ಯರ�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:917
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1333
 msgid "_Members"
 msgstr "ಸದಸ�ಯರ�(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error adding list"
 msgstr "ಪಟ�ಟಿಗೆ ಸೇರಿಸ�ವಲ�ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error modifying list"
 msgstr "ಪಟ�ಟಿಯನ�ನ� ಮಾರ�ಪಡಿಸ�ವಲ�ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1200
 msgid "Error removing list"
 msgstr "ಪಟ�ಟಿಯನ�ನ� ತೆಗೆದ�ಹಾಕ�ವಲ�ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "ಪ�ಸ�ತಕ"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "ಇದ� ಹೊಸ ಪಟ�ಟಿ"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "ಬದಲಾಯಿಸಲಾದ ಸಂಪರ�ಕವಿಳಾಸ:"
@@ -830,31 +745,31 @@ msgstr ""
 "  ಆದರೂ ನೀವದನ�ನ� ಸೇರಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "ವಿಲೀನಗೊಳಿಸ�(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 msgid "Merge Contact"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ವಿಲೀನಗೊಳಿಸ�"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Any field contains"
 msgstr "ಯಾವ�ದೆ ಕ�ಷೇತ�ರವ� ಇದನ�ನ� ಹೊಂದಿರ�ತ�ತದೆ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "ಹೀಗೆ ಆರಂಭಗೊಳ�ಳ�ವ ಇಮೇಲ�"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "ಹೆಸರ� ಇದನ�ನ� ಹೊಂದಿದೆ"
 
@@ -873,113 +788,83 @@ msgstr[1] "%d ಸಂಪರ�ಕವಿಳಾಸಗಳ�"
 msgid "Error getting book view"
 msgstr "ಪ�ಸ�ತಕ ನೋಟದಲ�ಲಿ ಕಾಣಿಸ�ವಲ�ಲಿ ದೋಷ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "ಸಂದೇಹ"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:706
 #, fuzzy
 msgid "Search Interrupted"
 msgstr "ಹ�ಡ�ಕ� ಫಿಲ�ಟರ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "ಮಾದರಿ"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "ಕಾರ�ಡನ�ನ� ಮಾರ�ಪಡಿಸ�ವಲ�ಲಿ ದೋಷ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
 #, fuzzy
 msgid "Cut selected contacts to the clipboard"
 msgstr "ಆರಿಸಲಾದ ಪಠ�ಯಗಳನ�ನ� ಕ�ಲಿಪ��ಬೋರ�ಡಿಗಾಗಿ ಕತ�ತರಿಸ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 #, fuzzy
 msgid "Copy selected contacts to the clipboard"
 msgstr "ಆಯ�ದ ಪಠ�ಯವನ�ನ� ಕ�ಲಿಪ��ಬೋರ�ಡ��ಗೆ  ಅಂಟಿಸ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 #, fuzzy
 msgid "Paste contacts from the clipboard"
 msgstr "ಕ�ಲಿಪ��ಬೋರ�ಡಿನಿಂದ ಕಾರ�ಯಗಳನ�ನ� ಅಂಟಿಸ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "ಆಯ�ದ ಸಂಪರ�ಕ ವಿಳಾಸಗಳನ�ನ� ಅಳಿಸ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 #, fuzzy
 msgid "Select all visible contacts"
 msgstr "ಎಲ�ಲಾ ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಆರಿಸ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-#, fuzzy
-msgid "Shell View"
-msgstr "ನೋಟವನ�ನ� ಆರಿಸ�: %s"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "ಆಕರ"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
 #, fuzzy
 msgid "Are you sure you want to delete these contact lists?"
 msgstr ""
 "ನೀವ� ಖಚಿತವಾಗಿಯೂ ಈ ವಿಳಾಸ\n"
 "ಪಟ�ಟಿಗಳನ�ನ� ಅಳಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1289
 #, fuzzy
 msgid "Are you sure you want to delete this contact list?"
 msgstr ""
 "ನೀವ� ಖಚಿತವಾಗಿಯೂ ಈ ವಿಳಾಸ\n"
 "ಪಟ�ಟಿಗಳನ�ನ� ಅಳಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1293
 #, fuzzy, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr ""
 "ನೀವ� ಖಚಿತವಾಗಿಯೂ ವಿಳಾಸ\n"
 "ಪಟ�ಟಿಯನ�ನ� (%s) ಅಳಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 #, fuzzy
 msgid "Are you sure you want to delete these contacts?"
 msgstr ""
 "ನೀವ� ಖಚಿತವಾಗಿಯೂ ಈ ವಿಳಾಸಗಳನ�ನ�\n"
 "ಅಳಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, fuzzy
 msgid "Are you sure you want to delete this contact?"
 msgstr ""
 "ನೀವ� ಖಚಿತವಾಗಿಯೂ ಈ ವಿಳಾಸಗಳನ�ನ�\n"
 "ಅಳಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
 #, fuzzy, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr ""
 "ನೀವ� ಖಚಿತವಾಗಿಯೂ ವಿಳಾಸವನ�ನ� (%s)\n"
 "ಅಳಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1462
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -988,11 +873,11 @@ msgstr ""
 "%d ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ತೆರೆದಾಗ %d ಹೊಸ ವಿಂಡೋಗಳನ�ನೂ ಸಹ ತೆರೆಯ�ತ�ತದೆ.\n"
 "ನೀವ� ನಿಜವಾಗಲೂ ಈ ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ತೆರೆಯಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1467
 msgid "_Don't Display"
 msgstr "ತೋರಿಸಬೇಡ(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 msgid "Display _All Contacts"
 msgstr "ಎಲ�ಲಾ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ತೋರಿಸ�(_A)"
 
@@ -1152,7 +1037,6 @@ msgid "Telex"
 msgstr "ಟೆಲೆಕ�ಸ��"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:825
 msgid "Title"
 msgstr "ಶೀರ�ಷಿಕೆ"
 
@@ -1164,59 +1048,7 @@ msgstr "ಘಟಕ"
 msgid "Web Site"
 msgstr "ಜಾಲ ತಾಣ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "ಅಗಲ"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "ಉದ�ದ"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-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:140
-msgid "Column Width"
-msgstr "ಕಾಲಂ ಅಗಲ"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1226,7 +1058,7 @@ msgstr ""
 "\n"
 "ಸಂಪರ�ಕವಿಳಾಸಕ�ಕಾಗಿ ಹ�ಡ�ಕಲಾಗ�ತ�ತಿದೆ..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1240,7 +1072,7 @@ msgstr ""
 "\n"
 "ಅಥವ ಒಂದ� ಹೊಸ ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ರಚಿಸಲ� ಇಲ�ಲಿ ಎರಡ� ಬಾರಿ ಕ�ಲಿಕ�ಕಿಸಿ."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1254,7 +1086,7 @@ msgstr ""
 "\n"
 "ಒಂದ� ಹೊಸ ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ರಚಿಸಲ� ಇಲ�ಲಿ ಎರಡ� ಬಾರಿ ಕ�ಲಿಕ�ಕಿಸಿ."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1264,7 +1096,7 @@ msgstr ""
 "\n"
 "ಸಂಪರ�ಕವಿಳಾಸಕ�ಕಾಗಿ ಹ�ಡ�ಕ�."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1274,10 +1106,6 @@ msgstr ""
 "\n"
 "ಈ ನೋಟದಲ�ಲಿ ತೋರಿಸಲ� ಯಾವ�ದೆ ಅಂಶಗಳಿಲ�ಲ."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "ಅಡಾಪ�ಟರ�"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "ಕೆಲಸದ ಇಮೇಲ�"
@@ -1287,18 +1115,10 @@ msgid "Home Email"
 msgstr "ಮನೆಯ ಇಮೇಲ�"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "ಇತರೆ ಇಮೇಲ�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "ಆರಿಸಲಾದ"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "ತೆರೆಸೂಚಕವನ�ನ� ಹೊಂದಿದೆ"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1341,18 +1161,18 @@ msgid "Copy _Email Address"
 msgstr "ಇಮೇಲ� ವಿಳಾಸವನ�ನ� ಕಾಪಿ ಮಾಡ�(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:381
 #, fuzzy
 msgid "Copy the email address to the clipboard"
 msgstr "ವಿಷಯಗಳನ�ನ� ಕ�ಲಿಪ��ಬೋರ�ಡ��ಗೆ  ಅಂಟಿಸ�."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:386
 msgid "_Send New Message To..."
 msgstr "ಹೊಸ ಸಂದೇಶವನ�ನ� ಇಲ�ಲಿಗೆ ಕಳ�ಹಿಸ�(_S)..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:388
 #, fuzzy
 msgid "Send a mail message to this address"
 msgstr "ಮೈಲ� ಸಂದೇಶವನ�ನ� ಒಂದ� ಕಾರ�ಯಕ�ಕೆ ಬದಲಾಯಿಸ�."
@@ -1389,22 +1209,21 @@ msgid "Video Chat"
 msgstr "ವಿಡಿಯೋ ಸಂಭಾಷಣೆ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:496
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "ಕ�ಯಾಲೆಂಡರ�"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:116
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ"
@@ -1432,21 +1251,19 @@ msgid "Web Log"
 msgstr "ಜಾಲ ಲಾಗ�"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:346 ../mail/e-mail-migrate.c:962
+#: ../capplet/settings/mail-capplet-shell.c:350
 #: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/addressbook/e-book-shell-migrate.c:134
 #: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "ವೈಯಕ�ತಿಕ"
@@ -1463,8 +1280,8 @@ msgstr "ನೆಲೆ ಪ�ಟ"
 msgid "Blog"
 msgstr "ಬ�ಲಾಗ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
 #, c-format
 msgid "Click to mail %s"
 msgstr "%s ಗೆ ಮೈಲ� ಮಾಡಲ� ಕ�ಲಿಕ�ಕಿಸಿ"
@@ -1521,11 +1338,11 @@ msgstr "ಪà³�ರೊಟೊಕಾಲà³� ಬೆಂಬಲಿತವಾಗಿಲà³�à²
 #. To Translators: This is task status
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2659
 msgid "Canceled"
 msgstr "ರದ�ದ� ಮಾಡಲಾಗಿದೆ"
 
@@ -1656,27 +1473,27 @@ msgstr "ಸಂದೇಹವà³� ಯಶಸà³�ವಿಯಾಗಿ ಪೂರà³�ಣಗà
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕವನ�ನ� ಆರಿಸ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "ಪಟ�ಟಿ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಇಲ�ಲಿಗೆ ಸ�ಥಳಾಂತರಿಸ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಇಲ�ಲಿಗೆ ಕಾಪಿ ಮಾಡ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಇಲ�ಲಿಗೆ ಸ�ಥಳಾಂತರಿಸ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಇಲ�ಲಿಗೆ ಕಾಪಿ ಮಾಡ�"
 
@@ -1688,7 +1505,7 @@ msgstr "ಕಾರ�ಡ� ನೋಟ"
 #: ../addressbook/importers/evolution-ldif-importer.c:516
 #: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ಆಮದ� ಮಾಡಿಕೊಳ�ಳಲಾಗ�ತ�ತಿದೆ..."
 
@@ -1809,20 +1626,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP ಪರಿಚಾರಕವನ�ನ� ಅನಾಮಧೇಯವಾಗಿ ನಿಲ�ಕಿಸಿಕೊಳ�ಳ�ವ�ದ�"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "ದೃಢೀಕರಿಸ�ವಲ�ಲಿ ವಿಫಲವಾಗಿದೆ.\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s ಕ�ಕಾಗಿ ಗ�ಪ�ತಪದವನ�ನ� ನಮೂದಿಸಿ (ಬಳಕೆದಾರ %s)"
 
 #: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/caldav/caldav-browse-server.c:808
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1962,46 +1779,42 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "ನೀವ� ಈ ಕಾರ�ಯವನ�ನ� ಖಚಿತವಾಗಿಯೂ ಸಾರಾಂಶವಿಲ�ಲದೆ ಕಳ�ಹಿಸಲ� ಬಯಸ�ತ�ತೀರಾ?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "ರೆಪೊಸಿಟರಿಯ� ಜಾಲದ ಹೊರಗಿದೆ."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "ಒಂದ� ಹೊಸ ಕಾರ�ಯಕ�ರಮವನ�ನ� ಉಳಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "ಕಾರ�ಯಕ�ರಮವನ�ನ� ಉಳಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "'{0}' ಕ�ಯಾಲೆಂಡರನ�ನ� ಅಳಿಸ�?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "'{0}' ಮೆಮೊ ಪಟ�ಟಿಯನ�ನ� ಅಳಿಸ�?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "'{0}' ಕಾರ�ಯ ಪಟ�ಟಿಯನ�ನ� ಅಳಿಸ�?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "ಕಳ�ಹಿಸಬೇಡ(_n)"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ಡೌನ��ಲೋಡ� ಚಾಲನೆಯಲ�ಲಿದೆ. ನೀವ� ಈ ಅಪಾಯಿಂಟ��ಮೆಂಟನ�ನ� ಉಳಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ಡೌನ��ಲೋಡ� ಚಾಲನೆಯಲ�ಲಿದೆ. ನೀವ� ಈ ಕಾರ�ಯವನ�ನ� ಉಳಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "ಸಂಪಾದಕವನ�ನ� ಲೋಡ� ಮಾಡಲಾಗಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -2009,30 +1822,25 @@ msgstr ""
 "ಪಾಲ�ಗೊಳ�ಳ�ವ ಎಲ�ಲರಿಗೂ ಇಮೈಲ� ಆಹ�ವಾನವನ�ನ� ಕಳ�ಹಿಸಲಾಗ�ತ�ತದೆ ಹಾಗ� ಅವರಿಗೆ ಈ ಕಾರ�ಯವನ�ನ� "
 "ಅಂಗೀಕರಿಸಲ� ಅವಕಾಶ ಒದಗಿಸಲಾಗ�ತ�ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:39
 msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "ಪಾಲ�ಗೊಳ�ಳ�ವ ಎಲ�ಲರಿಗೂ ಇಮೈಲ� ಆಹ�ವಾನವನ�ನ� ಕಳ�ಹಿಸಲಾಗ�ತ�ತದೆ ಹಾಗ� ಅವರಿಗೆ ಮಾರ�ತ�ತರಿಸಲ� "
 "ಅವಕಾಶ ಒದಗಿಸಲಾಗ�ತ�ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "ಕ�ಯಾಲೆಂಡರನ�ನ� ಲೋಡ� ಮಾಡ�ವಲ�ಲಿ ದೋಷ"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "ಮೆಮೊ ಪಟ�ಟಿಯನ�ನ� ಲೋಡ� ಮಾಡ�ವಲ�ಲಿ ದೋಷ"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "ಕಾರ�ಯಪಟ�ಟಿಯನ�ನ� ಲೋಡ� ಮಾಡ�ವಲ�ಲಿ ದೋಷ"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "{0} ನಲ�ಲಿ ದೋಷ"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2040,7 +1848,7 @@ msgstr ""
 "ನೀವ� ಒಂದ� ರದ�ದತಿ ಸೂಚನೆಯನ�ನ� ಕಳ�ಹಿಸದೆ ಹೋದಲ�ಲಿ, ಮೀಟಿಂಗ� ರದ�ದಾಗಿದ�ದ� ಪಾಲ�ಗೊಳ�ಳ�ವ "
 "ಇತರರಿಗೆ ತಿಳಿಯ�ವ�ದಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2048,7 +1856,7 @@ msgstr ""
 "ನೀವ� ಒಂದ� ರದ�ದತಿ ಸೂಚನೆಯನ�ನ� ಕಳ�ಹಿಸದೆ ಹೋದಲ�ಲಿ, ಮೆಮೊ ಅಳಿಸಲ�ಪಟ�ಟಿದ�ದ� ಪಾಲ�ಗೊಳ�ಳ�ವ "
 "ಇತರರಿಗೆ ತಿಳಿಯ�ವ�ದಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2056,11 +1864,7 @@ msgstr ""
 "ನೀವ� ಒಂದ� ರದ�ದತಿ ಸೂಚನೆಯನ�ನ� ಕಳ�ಹಿಸದೆ ಹೋದಲ�ಲಿ, ಕಾರ�ಯವ� ಅಳಿಸಲ�ಪಟ�ಟಿದ�ದ� ಪಾಲ�ಗೊಳ�ಳ�ವ "
 "ಇತರರಿಗೆ ತಿಳಿಯ�ವ�ದಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "ಪರಿಚಾರಕದಿಂದ ಯಾವ�ದೆ ಪ�ರತ�ಯ�ತ�ತರ ಬಂದಿಲ�ಲ."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2068,7 +1872,7 @@ msgstr ""
 "ಅಪ�ಡೇಟ� ಆದ ಮಾಹಿತಿಯನ�ನ� ಕಳ�ಹಿಸ�ವ�ದರಿಂದ ಪಾಲ�ಗೊಳ�ಳ�ವ ಇತರರಿಗೆ ತಮ�ಮ ಕ�ಯಾಲೆಂಡರ�ಗಳನ�ನ� "
 "ಅಪ�ಡೇಟ� ಮಾಡಿರಿಸಿಕೊಳ�ಳಲ� ಸಹಾಯಕವಾಗ�ತ�ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2076,7 +1880,7 @@ msgstr ""
 "ಅಪ�ಡೇಟ� ಆದ ಮಾಹಿತಿಯನ�ನ� ಕಳ�ಹಿಸ�ವ�ದರಿಂದ ಪಾಲ�ಗೊಳ�ಳ�ವ ಇತರರಿಗೆ ತಮ�ಮ ಕಾರ�ಯಗಳನ�ನ� ಅಪ�ಡೇಟ� "
 "ಮಾಡಿರಿಸಿಕೊಳ�ಳಲ� ಸಹಾಯಕವಾಗ�ತ�ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2084,7 +1888,7 @@ msgstr ""
 "ಕೆಲವೊಂದ� ಲಗತ�ತ�ಗಳನ�ನ� ಡೌನ��ಲೋಡ� ಆಗ�ತ�ತಿವೆ. ಅಪಾಯಿಂಟ��ಮೆಂಟನ�ನ� ಉಳಿಸಿದಲ�ಲಿ ಈ ಲಗತ�ತ�ಗಳ� "
 "ಕಾಣೆಯಾಗಲ� ಕಾರಣವಾಗ�ತ�ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2092,96 +1896,92 @@ msgstr ""
 "ಕೆಲವೊಂದ� ಲಗತ�ತ�ಗಳ� ಡೌನ��ಲೋಡ� ಆಗ�ತ�ತಿವೆ. ಕಾರ�ಯವನ�ನ� ಉಳಿಸಿದಲ�ಲಿ ಈ ಲಗತ�ತ�ಗಳ� ಕಾಣೆಯಾಗಲ� "
 "ಕಾರಣವಾಗ�ತ�ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr "ನಿಮ�ಮ ಪ�ರಸಕ�ತ ಪರಿಚಾರಕದಲ�ಲಿ ಕೆಲವೊಂದ� ವೈಶಿಷ�ಟ�ಯಗಳ� ಕೆಲಸ ಮಾಡ�ವ�ದಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution ಕ�ಯಾಲೆಂಡರ� ಅನಿರೀಕ�ಷಿತವಾಗಿ ನಿರ�ಗಮಿಸಿದೆ."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution ಕ�ಯಾಲೆಂಡರ� ಅನಿರೀಕ�ಷಿತವಾಗಿ ನಿರ�ಗಮಿಸಿದೆ."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution ಮೆಮೊ ಅನಿರೀಕ�ಷಿತವಾಗಿ ನಿರ�ಗಮಿಸಿದೆ."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolutionಕಾರ�ಯಗಳ� ಅನಿರೀಕ�ಷಿತವಾಗಿ ನಿರ�ಗಮಿಸಿದೆ."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:55
 msgid "The calendar is not marked for offline usage."
 msgstr "ಕ�ಯಾಲೆಂಡರನ�ನ� ಜಾಲದ ಹೊರಗೆ ಬಳಸಲ� ಗ�ರ�ತ� ಹಾಕಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:56
 msgid "The memo list is not marked for offline usage."
 msgstr "ಮೆಮೊ ಪಟ�ಟಿಯನ�ನ� ಆಫ�‌ಲೈನ�‌ ಬಳಕಗೆ ಗ�ರ�ತ� ಹಾಕಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "ಕಾರ�ಯಗಳ ಪಟ�ಟಿಯನ�ನ� ಜಾಲದ ಹೊರಗೆ ಬಳಸಲ� ಗ�ರ�ತ� ಹಾಕಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "ಕ�ಯಾಲೆಂಡರ� ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ�ಹಾಕಲ�ಪಡ�ತ�ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "ಮೆಮೊ ಪಟ�ಟಿಯ� ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ�ಹಾಕಲ�ಪಡ�ತ�ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "ಕಾರ�ಯಗಳ ಪಟ�ಟಿ ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ�ಹಾಕಲ�ಪಡ�ತ�ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "ಕ�ಯಾಲೆಂಡರನ�ನ� ಲೋಡ� ಮಾಡ�ವಲ�ಲಿ ಸಾಧ�ಯವಾಗಿಲ�ಲ"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "ನೀವ� ಮಾಡಿದ ಬದಲಾವಣೆಗಳನ�ನ� ಈ ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗೆ ಉಳಿಸಲ� ಬಯಸ�ತ�ತೀರಾ?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:62
 #, fuzzy
 msgid "Would you like to save your changes to this meeting?"
 msgstr "ನೀವ� ಮಾಡಿದ ಬದಲಾವಣೆಗಳನ�ನ� ಈ ಮೆಮೊಗೆ ಉಳಿಸಲ� ಬಯಸ�ತ�ತೀರಾ?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "ನೀವ� ಮಾಡಿದ ಬದಲಾವಣೆಗಳನ�ನ� ಈ ಮೆಮೊಗೆ ಉಳಿಸಲ� ಬಯಸ�ತ�ತೀರಾ?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "ನೀವ� ಮಾಡಿದ ಬದಲಾವಣೆಗಳನ�ನ� ಈ ಕಾರ�ಯಕ�ಕೆ ಉಳಿಸಲ� ಬಯಸ�ತ�ತೀರಾ?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "ಈ ಮೆಮೊಗೆ ರದ�ದತಿ ಸೂಚನೆಯನ�ನ� ಕಳ�ಹಿಸಲ� ಬಯಸ�ತ�ತೇರೆ?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವ ಎಲ�ಲರಿಗೂ ಈ ರದ�ದತಿ ಸೂಚನೆಯನ�ನ� ಕಳ�ಹಿಸಲ� ಬಯಸ�ತ�ತೇರೆ?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವ ಎಲ�ಲರಿಗೂ ಮೀಟಿಂಗ� ಆಹ�ವಾನವನ�ನ� ಕಳ�ಹಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವ ಎಲ�ಲರಿಗೂ ಕಾರ�ಯವನ�ನ� ಕಳ�ಹಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವ ಎಲ�ಲರಿಗೂ ಅಪ�ಡೇಟ� ಆದ ಮೀಟಿಂಗ� ಮಾಹಿತಿಯನ�ನ� ಕಳ�ಹಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವ ಎಲ�ಲರಿಗೂ ಅಪ�ಡೇಟ� ಆದ ಕಾರ�ಯದ ಮಾಹಿತಿಯನ�ನ� ಕಳ�ಹಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2191,62 +1991,58 @@ msgstr ""
 "Evolution ಬಳಸ�ವಾಗ ತೊಂದರೆಗಳನ�ನ� ಎದ�ರಿಸಬಹ�ದ�. ಉತ�ತಮ ಫಲಿತಾಂಶಕ�ಕಾಗಿ ಪರಿಚಾರಕವನ�ನ� "
 "ಒಂದ� ಬೆಂಬಲಿತ ಆವೃತ�ತಿಗೆ ನವೀಕರಿಸಿ."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:72
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "ನೀವ� ಈ ಅಪಾಯಿಂಟ��ಮೆಂಟನ�ನ� ಬದಲಾಯಿಸಿದ�ದೀರಿ, ಆದರೆ ಇನ�ನೂ ಉಳಿಸಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:73
 #, fuzzy
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "ನೀವ� ಈ ಕಾರ�ಯವನ�ನ� ಬದಲಾಯಿಸಿದ�ದೀರಿ, ಆದರೆ ಇನ�ನೂ ಉಳಿಸಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "ನೀವ� ಈ ಕಾರ�ಯವನ�ನ� ಬದಲಾಯಿಸಿದ�ದೀರಿ, ಆದರೆ ಇನ�ನೂ ಉಳಿಸಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "ನೀವ� ಈ ಮೆಮೋಗೆ ಬದಲಾವಣೆಗಳನ�ನ� ಮಾಡಿದ�ದೀರಿ, ಆದರೆ ಇನ�ನೂ ಉಳಿಸಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Evolutionನ�ನ� ಮರಳಿ ಆರಂಭಿಸದೆ ನಿಮ�ಮ ಕ�ಯಾಲೆಂಡರ�ಗಳ� ಲಭ�ಯವಿರ�ವ�ದಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr " Evolution ಅನ�ನ� ಮರಳಿ ಆರಂಭಿಸದೆ ನಿಮ�ಮ ಮೆಮೊಗಳ� ಲಭ�ಯವಿರ�ವ�ದಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Evolution ಅನ�ನ� ಮರಳಿ ಆರಂಭಿಸದೆ ನಿಮ�ಮ ಕಾರ�ಯಗಳ� ಲಭ�ಯವಿರ�ವ�ದಿಲ�ಲ."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "ಬದಲಾವಣೆಗಳನ�ನ� ತಿರಸ�ಕರಿಸ�(_D)"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "ಉಳಿಸ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "ಬದಲಾವಣೆಗಳನ�ನ� ಉಳಿಸ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "ಕಳ�ಹಿಸ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "ಸೂಚನೆಯನ�ನ� ಕಳ�ಹಿಸ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "ಅನೇಕ-ದಿನದ ಕಾರ�ಯಕ�ರಮವನ�ನ� ಪ�ರತ�ಯೇಕಿಸ�:"
@@ -2301,7 +2097,7 @@ msgid_plural "hours"
 msgstr[0] "ಗಂಟೆ"
 msgstr[1] "ಗಂಟೆಗಳ�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "ಆರಂಭದ ಸಮಯ"
 
@@ -2319,7 +2115,7 @@ msgstr "ಎಲ�ಲವನ�ನೂ ವಜಾಗೊಳಿಸ�(_A)"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1573
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 #: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../plugins/itip-formatter/itip-view.c:1027
 msgid "Location:"
 msgstr "ಸ�ಥಳ:"
 
@@ -2332,11 +2128,11 @@ msgid "_Dismiss"
 msgstr "ವಜಾಗೊಳಿಸ�(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1025
+#: ../calendar/gui/dialogs/comp-editor.c:1015
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1625
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ಸಂಪಾದಿಸ�(_E)"
@@ -2346,8 +2142,8 @@ msgid "_Snooze"
 msgstr "ತೂಕಡಿಕೆ(_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 msgid "hours"
@@ -2357,9 +2153,10 @@ msgstr "ಗಂಟೆಗಳ�"
 msgid "location of appointment"
 msgstr "ಅಪಾಯಿಂಟ��ಮೆಂಟ��ನ ಸ�ಥಳ"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "minutes"
@@ -2384,13 +2181,13 @@ msgstr "ಯಾವ�ದೆ ಸ�ಥಳ ಮಾಹಿತಿಯ� ಲಭ�ಯವ
 msgid "You have %d alarms"
 msgstr "ನೀವ� %d ಅಲಾರಂಗಳನ�ನ� ಹೊಂದಿದ�ದೀರಿ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "ಎಚ�ಚರಿಕೆ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2402,7 +2199,7 @@ msgstr ""
 "ಸಂರಚಿಸಲಾಗಿದೆ.  ಬದಲಿಗೆ Evolution ಒಂದ� ಸಾಮಾನ�ಯವಾದ \n"
 "ಜ�ಞಾಪನಾ ಸಂವಾದ ಪೆಟ�ಟಿಗೆಯನ�ನ� ತೋರಿಸ�ತ�ತದೆ."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2419,7 +2216,7 @@ msgstr ""
 "\n"
 "ಈ ಪ�ರೊಗ�ರಾಂ ಅನ�ನ� ಚಲಾಯಿಸಲ� ನೀವ� ಖಚಿತವೆ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "ಈ ಪ�ರೋಗ�ರಾಂನ ಬಗ�ಗೆ ನನ�ನನ�ನ� ಪ�ನಃ ಕೇಳಬೇಡ."
 
@@ -2461,7 +2258,7 @@ msgid "Alarm programs"
 msgstr "ಅಲಾರಂ ಪ�ರೋಗ�ರಾಂಗಳ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "ಸ�ಥಿತಿ ಪಟ�ಟಿಯಲ�ಲಿ ದೋಷವನ�ನ� ತೋರಿಸಬೇಕಿರ�ವ ಸಮಯದ ಪ�ರಮಾಣ, ಸೆಕೆಂಡ�ಗಳಲ�ಲಿ."
 
@@ -3076,7 +2873,7 @@ msgid "Classification"
 msgstr "ವರ�ಗೀಕರಣ"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:571 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3120,19 +2917,19 @@ msgid "Organizer"
 msgstr "ಆಯೋಜಕರ�"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:569 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ಖಾಸಗಿ"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-cal-model.c:567
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ಸಾರ�ವಜನಿಕ"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:299
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "ಪ�ನರಾವೃತ�ತಿ"
@@ -3215,7 +3012,7 @@ msgstr "ನಿಮ�ಮ ಇಚ�ಛೆಯ ಅಲಾರಂ ಶಬ�ಧ"
 msgid "Mes_sage:"
 msgstr "ಸಂದೇಶ(_s):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:77
 msgid "Options"
 msgstr "ಆಯ�ಕೆಗಳ�"
 
@@ -3262,11 +3059,12 @@ msgstr "ದಿನ(ಗಳ�)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
 #: ../plugins/google-account-setup/google-contacts-source.c:333
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "ದಿನಗಳ�"
 
@@ -3274,19 +3072,20 @@ msgstr "ದಿನಗಳ�"
 msgid "end of appointment"
 msgstr "ಅಪಾಯಿಂಟ��ಮೆಂಟಿನ ಕೊನೆ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "ಪ�ರತಿ ಹೆಚ�ಚ�ವರಿ ಸಮಯ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "ಗಂಟೆ(ಗಳ�)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "ನಿಮಿಷ(ಗಳ�)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "ಅಪಾಯಿಂಟ��ಮೆಂಟಿನ ಆರಂಭ"
 
@@ -3314,7 +3113,7 @@ msgstr "ಯಾವ�ದೂ ಇಲ�ಲ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "ಆರಿಸ�..."
 
@@ -3323,11 +3122,13 @@ msgid "Selected Calendars for Alarms"
 msgstr "ಅಲಾರಂಗಳಿಗಾಗಿ ಆರಿಸಲಾದ ಕ�ಯಾಲೆಂಡರ�ಗಳ�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
+#, fuzzy
+msgid "Ti_me and date:"
 msgstr "ಸಮಯ ಹಾಗ� ದಿನಾಂಕ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
+#, fuzzy
+msgid "_Date only:"
 msgstr "ದಿನಾಂಕ ಮಾತ�ರ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
@@ -3361,12 +3162,12 @@ msgstr "೩೦ ನಿಮಿಷಗಳ�"
 msgid "60 minutes"
 msgstr "೬೦ ನಿಮಿಷಗಳ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "ಎಚ�ಚರಿಕೆಗಳ�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "ದಿನಾಂಕ/ಸಮಯದ ವಿನ�ಯಾಸ"
@@ -3392,20 +3193,20 @@ msgid "Display alarms in _notification area only"
 msgstr "ಸೂಚನಾ ಸ�ಥಳದಲ�ಲಿ ಮಾತ�ರ ಅಲಾರಂಗಳನ�ನ� ತೋರಿಸ�(_n)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "ಶ�ಕ�ರವಾರ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../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:278 ../mail/mail-config.ui.h:54
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2660
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "ಸಾಮಾನ�ಯ"
 
@@ -3418,7 +3219,7 @@ msgid "Minutes"
 msgstr "ನಿಮಿಷಗಳ�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "ಸೋಮವಾರ"
@@ -3432,182 +3233,194 @@ msgid "None"
 msgstr "ಯಾವ�ದೂ ಇಲ�ಲ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "Pick a color"
 msgstr "ಒಂದ� ಬಣ�ಣವನ�ನ� ಆರಿಸಿ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "ಭಾನ�(_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "ಶನಿವಾರ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "ತಿಂಗಳ ನೋಟವನ�ನ� ಒಂದ� ವಾರ ಜರ�ಗಿಸ�(_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "ಎರಡನೆ ವಲಯ(_c):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "ಅಲಾರಂ ಸೂಚನೆಗಳಿಂದ ಕ�ಯಾಲೆಂಡರ�ಗಳನ�ನ� ಆರಿಸ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "ಒಂದ� ಜ�ಞಾಪನೆಯನ�ನ� ತೋರಿಸ�(_o)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "ಒಂದ� ಜ�ಞಾಪನೆಯನ�ನ� ತೋರಿಸ�(_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "ದಿನಾಂಕ ನ�ಯಾವಿಗೇಟರಿನಲ�ಲಿ ವಾರದ ಸಂಖ�ಯೆಯನ�ನ� ತೋರಿಸ�(_n)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "ದಿನಾಂಕ ನ�ಯಾವಿಗೇಟರಿನಲ�ಲಿ ವಾರದ ಸಂಖ�ಯೆಗಳನ�ನ� ತೋರಿಸ�(_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "ಭಾನ�ವಾರ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "ಇಂದಿಗೆ ಬಾಕಿ ಇರ�ವ ಕಾರ�ಯಗಳ�(_a):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "ಗ�ರ�(_h)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "ಕಾರ�ಯಗಳ ಪಟ�ಟಿ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "ವಿನ�ಯಾಸ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "ಗ�ರ�ವಾರ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "ಸಮಯ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "ಕಾಲವಲಯ(_z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "ಕಾಲದ ಮಾದರಿ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "ಮಂಗಳವಾರ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "ವ�ಯವಸ�ಥೆಯ ಕಾಲವಲಯವನ�ನ� ಬಳಸ�(_y)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "ಬ�ಧವಾರ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "ವಾರವ� ಆರಂಭಗೊಳ�ಳ�ವ ದಿನ(_k):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Work Week"
 msgstr "ಕೆಲಸದ ವಾರ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "ಕೆಲಸದ ದಿನಗಳ�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ಗಂಟೆ (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 ಗಂಟೆ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "ಅಂಶಗಳನ�ನ� ಅಳಿಸ�ವ ಮೊದಲ� ನನ�ನ ಅನ�ಮತಿಯನ�ನ� ಕೇಳ�(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "ತಿಂಗಳ ನೋಟದಲ�ಲಿ ವಾರದಕೊನೆಯನ�ನ� ಕ�ಗ�ಗಿಸ�(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "ದಿನವ� ಆರಂಭಗೊಳ�ಳ�ವ ಸಮಯ(_D):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "ಶ�ಕ�ರ(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "ಮ�ಗಿದ ಕಾರ�ಯಗಳನ�ನ� ಅಡಗಿಸ�(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "ಸೋಮ(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "ಅವಧಿ ಮೀರಿದ ಕಾರ�ಯಗಳ�(_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "ಶನಿ(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "ಅಪಾಯಿಂಟ�‌ಮೆಂಟ�ಗಳ� ಮ�ಗಿಯ�ವ ಸಮಯಗಳನ�ನ� ವಾರ ಹಾಗ� ತಿಂಗಳ ನೋಟದಲ�ಲಿ ತೋರಿಸ�(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "ಕಾಲ ವರ�ಗಗಳ�(_T):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "ಮಂಗಳ(_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "ಬ�ಧ(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "ಪ�ರತಿ ವಾರ�ಷಿಕೋತ�ಸವ/ಹ�ಟ�ಟಿದ ದಿನದ ಮೊದಲ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "ಪ�ರತಿ ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗೂ ಮೊದಲ�"
 
@@ -3616,12 +3429,12 @@ msgid "Type:"
 msgstr "ಪ�ರಕಾರ:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "ಬಗೆ(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:147
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3640,35 +3453,35 @@ msgstr "ಆಫà³�‌ಲೈನà³�‌ ಕೆಲಸಗಳಿಗಾಗಿ ಕಾರà
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ಆಫ�‌ಲೈನ�‌ ಕೆಲಸಗಳಿಗಾಗಿ ಮೆಮೊ ಪಟ�ಟಿಯನ�ನ� ಸ�ಥಳೀಯವಾಗಿ ಕಾಪಿ ಮಾಡ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "ಬಣ�ಣ(_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "ಮೆಮೊ ಪಟ�ಟಿ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "ಕ�ಯಾಲೆಂಡರ� ಗ�ಣಲಕ�ಷಣಗಳ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "ಹೊಸ ಕ�ಯಾಲೆಂಡರ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "ಕಾರ�ಯ ಪಟ�ಟಿಯ ಗ�ಣಲಕ�ಷಣಗಳ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "ಹೊಸ ಕಾರ�ಯ ಪಟ�ಟಿ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "ಮೆಮೊ ಪಟ�ಟಿಯ ಗ�ಣಲಕ�ಷಣಗಳ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "ಹೊಸ ಮೆಮೊ ಪಟ�ಟಿ"
 
@@ -3723,253 +3536,233 @@ msgstr "%s  ನೀವà³� ಯಾವ ಬದಲಾವಣೆಗಳನà³�ನೂ ಮà²
 msgid "Validation error: %s"
 msgstr "ಊರ�ಜಿತಗೊಳಿಕಾ ದೋಷ: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " ಗೆ "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (ಪೂರ�ಣಗೊಂಡಿದೆ "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "ಪೂರ�ಣಗೊಂಡಿದೆ "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (ಬಾಕಿ "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "ಬಾಕಿ "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:237
 msgid "Could not save attachments"
 msgstr "ಲಗತ�ತ�ಗಳನ�ನ� ಉಳಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:515
+#: ../calendar/gui/dialogs/comp-editor.c:505
 msgid "Could not update object"
 msgstr "ಆಬ�ಜೆಕ�ಟನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡಲಾಗಿಲ�ಲ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "ಅಪಾಂಯಿಂಟ�‌ಮೆಂಟ� ಅನ�ನ� ಸಂಪಾದಿಸ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "ಮೀಟಿಂಗ� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "ಅಪಾಯಿಂಟ��ಮೆಂಟ�� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:629
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ನಿಯೋಜಿಸಲಾದ ಕಾರ�ಯ- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:631
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "ಕಾರ�ಯ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:636
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "ಮೆಮೊ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "ಯಾವ�ದೆ ಸಾರಾಂಶವಿಲ�ಲ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:761
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "ಮೂಲ ಅಂಶವನ�ನ� ಉಳಿಸಿಕೊಳ�ಳಬೇಕೆ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:948
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "ಪ�ರಸಕ�ತ ವಿಂಡೋವನ�ನ� ಮ�ಚ�ಚಲ� ಇಲ�ಲಿ ಕ�ಲಿಕ� ಮಾಡಿ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1464
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "ಆಯ�ದದ�ದನ�ನ� ಕಾಪಿ ಮಾಡ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:962 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1471
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "ಆಯ�ದದ�ದನ�ನ� ಕತ�ತರಿಸ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:969
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 #, fuzzy
 msgid "Delete the selection"
 msgstr "ಆಯ�ದದ�ದನ�ನ� ಕತ�ತರಿಸ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "ಲಭ�ಯವಿರ�ವ ಸಹಾಯವನ�ನ� ನೋಡಲ� ಕ�ಲಿಕ� ಮಾಡಿ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1513
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "ಕ�ಲಿಪ��ಬೋರ�ಡನ�ನ� ಅಂಟಿಸ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "ಪ�ರಸಕ�ತ ವಿಂಡೋವನ�ನ� ಉಳಿಸಲ� ಇಲ�ಲಿ ಕ�ಲಿಕ� ಮಾಡಿ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "ಎಲ�ಲಾ ಪಠ�ಯವನ�ನ� ಆರಿಸ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "ವರ�ಗೀಕರಣ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1032 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1632
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "ಕಡತ(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Help"
 msgstr "ಸಹಾಯ(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "ಸೇರಿಸ�(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "ಆಯ�ಕೆಗಳ�(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1674 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "ನೋಟ(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1070
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "ಅಟ�ಯಾಚ��ಮೆಂಟ�(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
 msgstr "ಒಂದ� ಕಡತವನ�ನ� ಲಗತ�ತಿಸಲ� ಇಲ�ಲಿ ಕ�ಲಿಕ� ಮಾಡಿ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "ವರ�ಗಗಳ�(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "ಕ�ಷೇತ�ರವ� ತೋರಿಸಲಾಗ�ತ�ತಿದೆಯೆ ಎಂದ� ಟೋಗಲ� ಮಾಡ�ತ�ತದೆ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "ಕಾಲ ವಲಯ(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "ಕಾಲ ವಲಯವ� ತೋರಿಸಲಾಗ�ತ�ತಿದೆಯೆ ಎಂದ� ಟೋಗಲ� ಮಾಡ�ತ�ತದೆ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "ಸಾರ�ವಜನಿಕ(_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "ಸಾರ�ವಜನಿಕ ಎಂದ� ವರ�ಗೀಕರಿಸ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "ಖಾಸಗಿ(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "ಖಾಸಗಿ ಎಂದ� ವರ�ಗೀಕರಿಸ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "ಗೌಪ�ಯವಾದ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "ಗೌಪ�ಯ ಎಂದ� ವರ�ಗೀಕರಿಸ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "ರೋಲ� ಕ�ಷೇತ�ರ(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "ರೋಲ� ಕ�ಷೇತ�ರವ� ತೋರಿಸಲಾಗ�ತ�ತಿದೆಯೆ ಎಂದ� ಟೋಗಲ� ಮಾಡ�ತ�ತದೆ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1133
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP ಕ�ಷೇತ�ರವ� ತೋರಿಸಲಾಗ�ತ�ತಿದೆಯೆ ಎಂದ� ಟೋಗಲ� ಮಾಡ�ತ�ತದೆ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "ಸ�ಥಿತಿ ಕ�ಷೇತ�ರ(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "ಸ�ಥಿತಿ ಕ�ಷೇತ�ರವ� ತೋರಿಸಲಾಗ�ತ�ತಿದೆಯೆ ಎಂದ� ಟೋಗಲ� ಮಾಡ�ತ�ತದೆ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "ಟೈಪಿಸ�ವ ಕ�ಷೇತ�ರ(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1149
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ ಬಗೆಯ� ತೋರಿಸಲಾಗ�ತ�ತಿದೆಯೆ ಎಂದ� ಟೋಗಲ� ಮಾಡ�ತ�ತದೆ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "ಇತ�ತೀಚಿನ ದಸ�ತಾವೇಜ�ಗಳ�(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1693
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:477
 msgid "Attach"
 msgstr "ಲಗತ�ತಿಸ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1748
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "ಉಳಿಸ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2025
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2965
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2958
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ಒಂದ� ಅಪ�ಡೇಟ� ಬಂದಾಗ ಈ ಅಂಶಕ�ಕೆ ಮಾಡಲಾದ ಬದಲಾವಣೆಗಳನ�ನ� ರದ�ದ�ಗೊಳಿಸಲಾಗ�ತ�ತದೆ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2933
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "ಲಗತ�ತ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2995
+#: ../calendar/gui/dialogs/comp-editor.c:2988
 msgid "Unable to use current version!"
 msgstr "ಪ�ರಸಕ�ತ ಆವೃತ�ತಿಯನ�ನ� ಬಳಸಲಾಗಿಲ�ಲ!"
 
@@ -3989,6 +3782,11 @@ msgstr "ಉದà³�ದೇಶಿತ ಸà³�ಥಳವà³� ಕೇವಲ ಓದಲ ಮà²
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "ಈ ಅಂಶವನ�ನ� ಇದನ�ನ� ಪಡೆಯ�ವ ಇನ�ನಿತರರ ಅಂಚೆಪೆಟ�ಟಿಗೆಗಳಿಂದ ಅಳಿಸಿಹಾಕಬೇಕೆ(_D)?"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+#, fuzzy
+msgid "_Retract comment"
+msgstr "ಪೂರ�ಣಗೊಂಡ ಪ�ರತಿಶತ(_e):"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "ಒಂದ� ಕೋರ�ಬಾ ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಕಾರ�ಯಕ�ರಮವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ"
@@ -4049,59 +3847,59 @@ msgstr "ಇವರಿಗೆ ಡೆಲಿಗೇಟ� ಮಾಡ�:"
 msgid "Enter Delegate"
 msgstr "ಡೆಲಿಗೇಟ� ಅನ�ನ� ನಮೂದಿಸ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Alarms"
 msgstr "ಅಲರಾಂಗಳ�(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Click here to set or unset alarms for this event"
 msgstr "ಈ ಕಾರ�ಯಕ�ರಮಕ�ಕೆ ಅಲಾರಂಗಳನ�ನ� ಹೊಂದಿಸಲ� ಅಥವ ಹೊಂದಿಸದಿರಲ� ಇಲ�ಲಿ ಕ�ಲಿಕ�ಕಿಸಿ"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Recurrence"
 msgstr "ಮರ�ಕಳಿಸ�ವಿಕೆ(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Make this a recurring event"
 msgstr "ಇದನ�ನ� ಒಂದ� ಪ�ನರಾವರ�ತಿತ ಕಾರ�ಯಕ�ರಮವಾಗಿಸ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:219
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "ಕಳ�ಹಿಸ�ವ ಆಯ�ಕೆಗಳ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:221
 #: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "ಸ�ಧಾರಿತ ಕಳ�ಹಿಸ�ವ ಆಯ�ಕೆಗಳನ�ನ� ಸೇರಿಸ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:229
 msgid "All _Day Event"
 msgstr "ದಿನಪೂರ�ತಿಯ ಕಾರ�ಯಕ�ರಮ(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:231
 msgid "Toggles whether to have All Day Event"
 msgstr "ನೀವ� ದಿನಪೂರ�ತಿ ಕಾರ�ಯಕ�ರಮವನ�ನ� ಹೊಂದಿದ�ದೇರೆ ಎಂದ� ಟೋಗಲ� ಮಾಡ�ತ�ತದೆ"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "Show Time as _Busy"
 msgstr "ಸಮಯವನ�ನ� ಬಿಡ�ವಿಲ�ಲ ಎಂದ� ತೋರಿಸ�(_b)"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Toggles whether to show time as busy"
 msgstr "ಸಮಯವನ�ನ� ಬಿಡ�ವಿಲ�ಲ ಎಂದ� ತೋರಿಸಬೇಕೆ ಎಂದ� ಟೋಗಲ� ಮಾಡ�ತ�ತದೆ"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:248
 msgid "_Free/Busy"
 msgstr "ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "Query free / busy information for the attendees"
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ ಬಿಡ�ವಾಗಿರ�ವ/ಕಾರ�ಯನಿರತವಾಗಿರ�ವ ಮಾಹಿತಿಗೆ ಮನವಿ ಸಲ�ಲಿಸ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗಳ�(_m)"
 
@@ -4115,7 +3913,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ಕಾರ�ಯಕ�ರಮವನ�ನ� ಸಂಪೂರ�ಣವಾಗಿ ಸಂಪಾದಿಸಲ� ಸಾಧ�ಯವಿಲ�ಲ, �ಕೆಂದರೆ ನೀವ� ಆಯೋಜಕರಾಗಿಲ�ಲ"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "ಈ ಕಾರ�ಯಕ�ರಮವ� ಅಲಾರಂಗಳನ�ನ� ಹೊಂದಿದೆ"
 
@@ -4142,7 +3940,7 @@ msgid "Event with no end date"
 msgstr "ಮ�ಗಿಯ�ವ ದಿನಾಂಕವನ�ನ� ಹೊಂದಿರದ ಕಾರ�ಯಕ�ರಮ"
 
 #: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/memo-page.c:657
 #: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "ಆರಂಭ ದಿನಾಂಕವ� ತಪ�ಪಾಗಿದೆ"
@@ -4160,13 +3958,13 @@ msgid "End time is wrong"
 msgstr "ಮ�ಕ�ತಾಯ ಸಮಯವ� ತಪ�ಪಾಗಿದೆ"
 
 #: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/memo-page.c:698
 #: ../calendar/gui/dialogs/task-page.c:921
 msgid "The organizer selected no longer has an account."
 msgstr "ಆಯ�ದ ಆಯೋಜಕರ� ಒಂದ� ಖಾತೆಯನ�ನ� ಹೊಂದಿಲ�ಲ."
 
 #: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/memo-page.c:704
 #: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "ಒಬ�ಬ ಆಯೋಜಕನ ಅಗತ�ಯವಿದೆ."
@@ -4176,7 +3974,7 @@ msgstr "ಒಬ�ಬ ಆಯೋಜಕನ ಅಗತ�ಯವಿದೆ."
 msgid "At least one attendee is required."
 msgstr "ಪಾಲ�ಗೊಳ�ಳಲ� ಕನಿಷ�ಟ ಒಬ�ಬನಾದದರೂ ಇರಬೇಕ�."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ಕ�ಯಾಲೆಂಡರನ�ನ� ತೆರೆಯಲಾಗಿಲ�ಲ."
@@ -4187,40 +3985,40 @@ msgstr "'%s' ಕ�ಯಾಲೆಂಡರನ�ನ� ತೆರೆಯಲಾಗಿ
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:917
 #: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ನೀವ� %s ಪರವಾಗಿ ಕೆಲಸ ಮಾಡ�ತ�ತಿದ�ದೀರಿ"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, 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:2947
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, 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:2953
+#: ../calendar/gui/dialogs/event-page.c:2949
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗೆ %d ನಿಮಿಷ ಮೊದಲ�"
 msgstr[1] "ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗೆ %d ನಿಮಿಷಗಳ ಮೊದಲ�"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "ಕಸ�ಟಮೈಸ�"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2964
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "ಯಾವ�ದೂ ಇಲ�ಲ"
@@ -4238,8 +4036,10 @@ msgid "15 minutes before appointment"
 msgstr "ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗೆ 15 ನಿಮಿಷ ಮೊದಲ�"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�(_s)..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�(_n)..."
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
 #: ../calendar/gui/e-meeting-list-view.c:148
@@ -4254,28 +4054,27 @@ msgstr "ನಿಮ�ಮ ಇಚ�ಛೆಯ ಅಲಾರಂ:"
 msgid "Event Description"
 msgstr "ಕಾರ�ಯಕ�ರಮದ ವಿವರಣೆ"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "ಸಾರಾಂಶ(_m):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "ಅಲಾರಂ(_A)"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "ವಿವರಣೆ(_D):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "ಸ�ಥಳ(_L):"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#, fuzzy
+msgid "_Summary:"
+msgstr "ಸಾರಾಂಶ:"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "ಸಮಯ(_T):"
@@ -4290,7 +4089,7 @@ msgstr "ಇದಕ�ಕಾಗಿ"
 msgid "until"
 msgstr "ವರೆಗೆ"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2576
 msgid "Memo"
 msgstr "ಮೆಮೊ"
 
@@ -4304,15 +4103,15 @@ msgstr ""
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ಮೆಮೊವನ�ನ� ಸಂಪೂರ�ಣವಾಗಿ ಸಂಪಾದಿಸಲ� ಸಾಧ�ಯವಿಲ�ಲ �ಕೆಂದರೆ ನೀವ� ಆಯೋಜಕರಲ�ಲಿ ಒಬ�ಬರಾಗಿಲ�ಲ"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:878
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' ನಲ�ಲಿ ಮೆಮೊಗಳನ�ನ� ತೆರೆಯಲಾಗಿಲ�ಲ."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2246
-#: ../mail/em-format-html.c:2305 ../mail/em-format-html.c:2329
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1045 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:78
 msgid "To"
 msgstr "ಗೆ"
 
@@ -4321,6 +4120,11 @@ msgstr "ಗೆ"
 msgid "Sta_rt date:"
 msgstr "ಆರಂಭದ ದಿನಾಂಕ(_r):"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "ಸಾರಾಂಶ(_m):"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "ಗೆ(_o):"
@@ -4331,65 +4135,65 @@ msgstr "ಗೆ(_o):"
 msgid "_Group:"
 msgstr "ಸಮೂಹ(_G):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "ಪ�ನರಾವರ�ತನೆಗೊಳ�ಳ�ವ ಒಂದ� ಕಾರ�ಯಕ�ರಮವನ�ನ� ನೀವ� ಮಾರ�ಪಡಿಸ�ತ�ತಿದ�ದೀರಿ. �ನನ�ನ� ಮಾರ�ಪಡಿಸಲ� "
 "ಬಯಸಿದ�ದೀರಿ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 "ನಿಮ�ಮನ�ನ� ಒಂದ� ಪ�ನರಾವರ�ತಿತಗೊಳ�ಳ�ವ ಕಾರ�ಯಕ�ರಮಕ�ಕೆ ಡೆಲಿಗೇಟ� ಮಾಡಲಾಗಿದೆ. ನೀವ� ಡೆಲಿಗೇಟ� "
 "ಆಗಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 "ಪ�ನರಾವರ�ತನೆಗೊಳ�ಳ�ವ ಒಂದ� ಕಾರ�ಯವನ�ನ� ನೀವ� ಮಾರ�ಪಡಿಸ�ತ�ತಿದ�ದೀರಿ. �ನನ�ನ� ಮಾರ�ಪಡಿಸಲ� "
 "ಬಯಸಿದ�ದೀರಿ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "ಪ�ನರಾವರ�ತನೆಗೊಳ�ಳ�ವ ಒಂದ� ಮೆಮೊವನ�ನ� ನೀವ� ಮಾರ�ಪಡಿಸ�ತ�ತಿದ�ದೀರಿ. �ನನ�ನ� ಮಾರ�ಪಡಿಸಲ� "
 "ಬಯಸಿದ�ದೀರಿ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "ಈ ಸನ�ನಿವೇಶಕ�ಕೆ ಮಾತ�ರ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "ಇದ� ಹಾಗ� ಇದಕ�ಕೂ ಮ�ಂಚಿನ ಸನ�ನಿವೇಶಗಳಿಗೆ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "ಇದ� ಹಾಗ� ಮ�ಂದಿನ ಸನ�ನಿವೇಶಗಳಿಗೆ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "ಎಲ�ಲಾ ಸನ�ನಿವೇಶಗಳಿಗೆ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ಈ ಅಪಾಯಿಂಟ�‌ಮೆಂಟ� Evolution ಸಂಪಾದಿಸದೆ ಇರ�ವಂತಹ ಪ�ನರಾವರ�ತನೆಯನ�ನ� ಹೊಂದಿದೆ."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "ಪ�ನರಾವರ�ತನೆಯ ದಿನಾಂಕ ಮಾನ�ಯವಾದ�ದಲ�ಲ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "ಕಾರ�ಯಕ�ರಮವ� ಪ�ರಾರಂಭಗೊಳ�ಳ�ವ ಮೊದಲ� ಪ�ನರಾವರ�ತನೆಯ� ಪೂರ�ಣಗೊಳ�ಳ�ವ ಸಮಯ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:963
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "ನಲ�ಲಿನ"
 
@@ -4397,7 +4201,7 @@ msgstr "ನಲ�ಲಿನ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1020
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "ಮೊದಲ"
 
@@ -4406,7 +4210,7 @@ msgstr "ಮೊದಲ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "ಎರಡನೆಯ"
 
@@ -4414,7 +4218,7 @@ msgstr "ಎರಡನೆಯ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "ಮೂರನೆ"
 
@@ -4422,7 +4226,7 @@ msgstr "ಮೂರನೆ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "ನಾಲ�ಕನೆಯ"
 
@@ -4430,7 +4234,7 @@ msgstr "ನಾಲ�ಕನೆಯ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "�ದನೆ"
 
@@ -4438,13 +4242,13 @@ msgstr "�ದನೆ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "ಇತರೆ ದಿನಾಂಕ"
 
@@ -4452,7 +4256,7 @@ msgstr "ಇತರೆ ದಿನಾಂಕ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1076
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "೧ ರಿಂದ ೧೦ ನೆಯ"
 
@@ -4460,7 +4264,7 @@ msgstr "೧ ರಿಂದ ೧೦ ನೆಯ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "೧೧ ರಿಂದ ೨೦ ನೆಯ"
 
@@ -4468,45 +4272,45 @@ msgstr "೧೧ ರಿಂದ ೨೦ ನೆಯ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "೨೧ ರಿಂದ ೩೧ ನೆಯ"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "ದಿನ"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1242
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "ನಲ�ಲಿನ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "ಸಂಗತಿಗಳ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2122
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "ವಿನಾಯಿತಿಯನ�ನ� ಸೇರಿಸಿ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2163
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "ಮಾರ�ಪಡಸಲ� ಯಾವ�ದನ�ನೂ ಆಯ�ಕೆ ಮಾಡಿಲ�ಲ."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "ವಿನಾಯಿತಿಯನ�ನ� ಮಾರ�ಪಡಿಸ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2213
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "ಅಳಿಸಲ� �ನ�ನನ�ನೂ ಆಯ�ಕೆ ಮಾಡಲಾಗಿಲ�ಲ."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2352
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "ದಿನಾಂಕ/ಸಮಯ"
 
@@ -4518,7 +4322,7 @@ msgstr "ಪ�ರತಿ"
 msgid "Exceptions"
 msgstr "ವಿನಾಯಿತಿಗಳ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:85
 msgid "Preview"
 msgstr "ಮ�ನ�ನೋಟ"
 
@@ -4542,11 +4346,11 @@ msgstr "ವಾರ(ಗಳ�)"
 msgid "year(s)"
 msgstr "ವರ�ಷ(ಗಳ�)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "ಈ ಕಾರ�ಯಕ�ರಮದೊಂದಿಗೆ ನನ�ನ ಅಲಾರಂಗಳನ�ನ� ಇದರೊಂದಿಗೆ ಕಳ�ಹಿಸ�"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "ಹೊಸದಾಗಿ ಭಾಗವಹಿಸ�ವವರಿಗೆ ಮಾತ�ರ ಸೂಚಿಸ�(_o)"
 
@@ -4555,66 +4359,66 @@ msgstr "ಹೊಸದಾಗಿ ಭಾಗವಹಿಸà³�ವವರಿಗೆ ಮಾà
 msgid "Completed date is wrong"
 msgstr "ಪೂರ�ಣಗೊಂಡ ದಿನಾಂಕ ತಪ�ಪಾಗಿದೆ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "ಜಾಲ ಪ�ಟ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2656 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "ಪೂರ�ಣಗೊಂಡ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1132 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "ಉತ�ತಮ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2653
 msgid "In Progress"
 msgstr "ಪ�ರಗತಿಯಲ�ಲಿದೆ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1130 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1121 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "ಕೆಳ ಮಟ�ಟದ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1315 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1131
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1122
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "ಸಾಮಾನ�ಯ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2650 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "ಆರಂಭಗೊಂಡಿಲ�ಲ"
 
@@ -4630,7 +4434,7 @@ msgstr "ಸ�ತಿತಿ(_u):"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1759
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4640,7 +4444,7 @@ msgstr "ಸ�ತಿತಿ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "ವಿವರಿಸದೆ ಇರ�ವ"
@@ -4650,7 +4454,7 @@ msgid "_Date completed:"
 msgstr "ಪೂರ�ಣಗೊಂಡ ದಿನಾಂಕ(_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "ಆದ�ಯತೆ(_P):"
 
@@ -4671,11 +4475,11 @@ msgstr "ಕಾರ�ಯದ ಸ�ಥಿತಿಯ ವಿವರಗಳನ�ನ�
 msgid "_Send Options"
 msgstr "ಕಳ�ಹಿಸ�ವ ಆಯ�ಕೆಗಳ�(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "_Task"
 msgstr "ಕಾರ�ಯ(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:325
 msgid "Task Details"
 msgstr "ಕಾರ�ಯ ವಿವರಗಳ�"
 
@@ -4703,10 +4507,6 @@ msgstr "ಕೊನೆಯ ದಿನಾಂಕವ� ತಪ�ಪಾಗಿದೆ"
 msgid "Unable to open tasks in '%s'."
 msgstr "ಕಾರ�ಯಗಳನ�ನ� '%s' ನಲ�ಲಿ ತೆರೆಯ�ವಲ�ಲಿ ವಿಫಲತೆ ಎದ�ರಾಗಿದೆ."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�(_n)..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "ವರ�ಗಗಳ�(_i)..."
@@ -4795,46 +4595,46 @@ msgstr "%s  %s"
 msgid "%s for an unknown trigger type"
 msgstr "ಒಂದ� ಗೊತ�ತಿರದ ಪ�ರಚೋದನಾ ಬಗೆಗಾಗಿ %s"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:191 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "ಶೀರ�ಷಿಕೆ ಇಲ�ಲದ"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:197
 msgid "Categories:"
 msgstr "ವರ�ಗಗಳ�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "ಸಾರಾಂಶ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:258
 msgid "Start Date:"
 msgstr "ಆರಂಭ ದಿನಾಂಕ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "ಕೊನೆಯ ದಿನಾಂಕ:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-cal-component-preview.c:284
 #: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../plugins/itip-formatter/itip-view.c:1058
 msgid "Status:"
 msgstr "ಸ�ಥಿತಿ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "ಆದ�ಯತೆ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-cal-component-preview.c:336
 #: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Description:"
 msgstr "ವಿವರಣೆ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:367
 msgid "Web Page:"
 msgstr "ಜಾಲ ಪ�ಟ:"
 
@@ -4861,16 +4661,16 @@ msgid "Start Date"
 msgstr "ಆರಂಭ ದಿನಾಂಕ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "ಬಿಡ�ವ�"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "ಕಾರ�ಯನಿರತ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4881,66 +4681,49 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "ಯಾವ�ದೂ ಇಲ�ಲ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ಹೌದ�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "ಇಲ�ಲ"
 
-#: ../calendar/gui/e-cal-model.c:378
-#, fuzzy
-msgid "Default Client"
-msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಮೈಲ� ಕ�ಲೈಂಟ�"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:551
-#: ../shell/e-shell.c:868
-#, fuzzy
-msgid "Shell Settings"
-msgstr "ಸಿದ�ಧತೆಗಳ�"
-
-#: ../calendar/gui/e-cal-model.c:389 ../calendar/gui/gnome-cal.c:552
-#: ../shell/e-shell.c:869
-#, fuzzy
-msgid "Application-wide settings"
-msgstr "ಸ�ವಯಂಪೂರ�ಣಗೊಳಿಕೆಯ ಸಿದ�ಧತೆಗಳ�"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:573 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:976
+#: ../plugins/itip-formatter/itip-formatter.c:450
+#: ../plugins/itip-formatter/itip-formatter.c:2327
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "ಗೊತ�ತಿರದ"
 
-#: ../calendar/gui/e-cal-model.c:1317
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "ಮರ�ಕಳಿಸ�ವ"
 
-#: ../calendar/gui/e-cal-model.c:1319
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "ನಿಯೋಜಿಸಲಾದ"
 
-#: ../calendar/gui/e-cal-model.c:2225
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "%s ಅನ�ನ� ತೆರೆಯಲಾಗ�ತ�ತಿದೆ"
@@ -4984,94 +4767,94 @@ msgstr "ಆರಂಭದ ದಿನಾಂಕ"
 msgid "Type"
 msgstr "ಬಗೆ"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:404
 #, fuzzy
 msgid "Cut selected events to the clipboard"
 msgstr "ಆರಿಸಲಾದ ಪಠ�ಯಗಳನ�ನ� ಕ�ಲಿಪ��ಬೋರ�ಡಿಗಾಗಿ ಕತ�ತರಿಸ�"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:410
 #, fuzzy
 msgid "Copy selected events to the clipboard"
 msgstr "ಆಯ�ದ ಪಠ�ಯವನ�ನ� ಕ�ಲಿಪ��ಬೋರ�ಡ��ಗೆ  ಅಂಟಿಸ�"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:416
 #, fuzzy
 msgid "Paste events from the clipboard"
 msgstr "ಕ�ಲಿಪ��ಬೋರ�ಡಿನಿಂದ ಪಠ�ಯವನ�ನ� ಅಂಟಿಸ�"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:422
 #, fuzzy
 msgid "Delete selected events"
 msgstr "ಆರಿಸಲಾದ ಮೆಮೋವನ�ನ� ಅಳಿಸ�"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "ಆರಿಸಲಾದ ವಸ�ತ�ಗಳನ�ನ� ಅಳಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
 msgid "Updating objects"
 msgstr "ವಸ�ತ�ಗಳನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1706
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2315
 msgid "Accepted"
 msgstr "ಅಂಗೀಕರಿಸಲಾಗಿದೆ"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1707
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2321
 msgid "Declined"
 msgstr "ತಿರಸ�ಕರಿಸಲ�ಪಟ�ಟಿದೆ"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1708
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "ಪ�ರಾಯಶಃ"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1709
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2324
 msgid "Delegated"
 msgstr "ಡೆಲಿಗೇಟ� ಮಾಡಲಾಗಿದೆ"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1710
 msgid "Needs action"
 msgstr "ಕ�ರಮ ತೆಗೆದ�ಕೊಳ�ಳ�ವ ಅಗತ�ಯವಿದೆ"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ಆಯೋಜಕರ�: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1856 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "ಆಯೋಜಕರ�: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/print.c:2608
 #, c-format
 msgid "Location: %s"
 msgstr "ಸ�ಥಳ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1903
 #, c-format
 msgid "Time: %s %s"
 msgstr "ಕಾಲ: %s %s"
@@ -5114,8 +4897,8 @@ msgstr "ಎರಡನೆ ಕಾಲವಲಯವನ�ನ� ತೋರಿಸ�"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1883
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:865 ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5125,10 +4908,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1900
-#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/e-day-view-top-item.c:869 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:990
+#: ../modules/calendar/e-cal-shell-view-private.c:913
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5137,27 +4920,27 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1916
-#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../calendar/gui/e-day-view-top-item.c:873 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1026
+#: ../modules/calendar/e-cal-shell-view-private.c:949
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1116 ../calendar/gui/e-week-view.c:750
+#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1119 ../calendar/gui/e-week-view.c:753
+#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2613
+#: ../calendar/gui/e-day-view.c:2609
 #, c-format
 msgid "Week %d"
 msgstr "ವಾರ %d"
@@ -5254,11 +5037,11 @@ msgstr "�ಕ�ಯಾಲೆಂಡರ� ದೋಷ"
 
 #: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
 #: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "ಒಬ�ಬ ಅಜ�ಞಾತ ವ�ಯಕ�ತಿ"
 
@@ -5272,13 +5055,13 @@ msgstr ""
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../plugins/itip-formatter/itip-formatter.c:2302
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ಯಾವ�ದೂ ಇಲ�ಲ"
 
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgid "Tentatively Accepted"
 msgstr "ಪ�ರಾಯಶಃ ಅಂಗೀಕರಿಸಲಾಗಿದೆ"
 
@@ -5496,7 +5279,7 @@ msgid "Attendee status updated\n"
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ ಸ�ಥಿತಿಯ� ಅಪ�ಡೇಟ�‌ ಆಗಿದೆ\n"
 
 #: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "ಒಂದ� ಅಂಶವ� ಅಸ�ತಿತ�ವದಲ�ಲಿರದ ಕಾರಣದಿಂದಾಗಿ ಪಾಲ�ಗೊಳ�ಳ�ವವರ ಸ�ಥಿತಿಯನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡಲಾಗಿಲ�ಲ"
@@ -5551,8 +5334,8 @@ msgid "Send Latest Information"
 msgstr "ಇತ�ತೀಚಿನ ಮಾಹಿತಿಯನ�ನ� ಕಳ�ಹಿಸ�"
 
 #: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../modules/mail/e-mail-shell-view-actions.c:970
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "ರದ�ದ� ಮಾಡ�"
 
@@ -5601,56 +5384,56 @@ msgid "Resources"
 msgstr "ಸಂಪನ�ಮೂಲಗಳ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "ವೈಯಕ�ತಿಕ"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "ಸಮೂಹ"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "ಸಂಪನ�ಮೂಲ"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "ಕೋಣೆ"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "ಖ�ರ�ಚಿ"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "ಭಾಗವಹಿಸ�ವವರ ಅಗತ�ಯವಿದೆ"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "�ಚ�ಛಿಕ ಭಾಗವಹಿಸ�ವವರ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "ಭಾಗವಹಿಸದೆ ಇರವವರ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "ಕ�ರಮ ತೆಗೆದ�ಕೊಳ�ಳ�ವ ಅಗತ�ಯವಿದೆ"
 
@@ -5659,14 +5442,14 @@ msgstr "ಕà³�ರಮ ತೆಗೆದà³�ಕೊಳà³�ಳà³�ವ ಅಗತà³�ಯವà
 msgid "Attendee                          "
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -5675,7 +5458,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:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -5685,67 +5468,63 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "ಕಛೇರಿಯಿಂದ ಹೊರಕ�ಕೆ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "ಯಾವ�ದೆ ಮಾಹಿತಿ ಇಲ�ಲ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�(_t)..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "ಆಯ�ಕೆಗಳ�(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "ಕೆಲಸದ ವೇಳೆಯನ�ನ� ಮಾತ�ರ ತೋರಿಸ�(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "ಹಿಗ�ಗಿಸಿ ತೋರಿಸ�(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತವನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡ�(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "ತಾನಾಗಿಯೆ ಆರಿಸ�(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "ಎಲ�ಲಾ ಜನರ� ಹಾಗ� ಸಂಪನ�ಮೂಲಗಳ�(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "ಎಲ�ಲಾ ಜನರ� ಹಾಗ� ಒಂದ� ಸಂಪನ�ಮೂಲ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "ಅಗತ�ಯ ಜನರ�(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "ಅಗತ�ಯವಿರ�ವ ಜನರ� ಹಾಗ� ಒಂದ� ಸಂಪನ�ಮೂಲ(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "ಆರಂಭದ ಸಮಯ(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "ಮ�ಕ�ತಾಯದ ಸಮಯ(_E):"
 
@@ -5774,47 +5553,49 @@ msgid "Member"
 msgstr "ಸದಸ�ಯ"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:456
+#: ../modules/calendar/e-cal-shell-content.c:461
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "ಮೆಮೊಗಳ�"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
 msgid "* No Summary *"
 msgstr "*ಯಾವ�ದೆ ಸಾರಾಂಶವಿಲ�ಲ*"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
 msgid "Start: "
 msgstr "ಆರಂಭ: "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
 msgid "Due: "
 msgstr "ಬಾಕಿ: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:709
 #, fuzzy
 msgid "Cut selected memos to the clipboard"
 msgstr "ಆರಿಸಲಾದ ಸಂದೇಶಗಳನ�ನ� ಕ�ಲಿಪ��ಬೋರ�ಡಿಗಾಗಿ ಕತ�ತರಿಸ�"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:715
 #, fuzzy
 msgid "Copy selected memos to the clipboard"
 msgstr "ಆಯ�ದ ಸಂದೇಶವನ�ನ� ಕ�ಲಿಪ��ಬೋರ�ಡ��ಗೆ  ಅಂಟಿಸ�"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:721
 #, fuzzy
 msgid "Paste memos from the clipboard"
 msgstr "ಮೆಮೊವನ�ನ� ಕ�ಲಿಪ��ಬೋರ�ಡಿನಿಂದ ಅಂಟಿಸ�"
 
-#: ../calendar/gui/e-memo-table.c:725
+#: ../calendar/gui/e-memo-table.c:727
 #: ../modules/calendar/e-memo-shell-view-actions.c:556
 msgid "Delete selected memos"
 msgstr "ಆರಿಸಲಾದ ಮೆಮೋವನ�ನ� ಅಳಿಸ�"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:733
 #, fuzzy
 msgid "Select all visible memos"
 msgstr "ಗೋಚರಿಸ�ತ�ತಿರ�ವ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಆರಿಸ�"
@@ -5823,96 +5604,61 @@ msgstr "ಗೋಚರಿಸà³�ತà³�ತಿರà³�ವ ಎಲà³�ಲಾ ಸಂದೇà
 msgid "Click to add a memo"
 msgstr "ಒಂದ� ಮೆಮೊವನ�ನ� ಸೇರಿಸಲ� ಕ�ಲಿಕ� ಮಾಡಿ"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:418
+#: ../modules/calendar/e-cal-shell-content.c:423
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "ಕಾರ�ಯಗಳ�"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:932
 #, fuzzy
 msgid "Cut selected tasks to the clipboard"
 msgstr "ಆರಿಸಲಾದ ಪಠ�ಯಗಳನ�ನ� ಕ�ಲಿಪ��ಬೋರ�ಡಿಗಾಗಿ ಕತ�ತರಿಸ�"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:938
 #, fuzzy
 msgid "Copy selected tasks to the clipboard"
 msgstr "ಆಯ�ದ ಪಠ�ಯವನ�ನ� ಕ�ಲಿಪ��ಬೋರ�ಡ��ಗೆ  ಅಂಟಿಸ�"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:944
 msgid "Paste tasks from the clipboard"
 msgstr "ಕ�ಲಿಪ��ಬೋರ�ಡಿನಿಂದ ಕಾರ�ಯಗಳನ�ನ� ಅಂಟಿಸ�"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "Delete selected tasks"
 msgstr "ಆರಿಸಲಾದ ಕಾರ�ಯಗಳನ�ನ� ಅಳಿಸ�"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:956
 #, fuzzy
 msgid "Select all visible tasks"
 msgstr "ಗೋಚರಿಸ�ತ�ತಿರ�ವ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಆರಿಸ�"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "ಕಾಲವಲಯವನ�ನ� ಆರಿಸ�"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -5941,7 +5687,7 @@ msgstr "ಕà³�ಯಾಲೆಂಡರà³� ಕಾರà³�ಯಕà³�ರಮ: ಇದà³� à²
 msgid "calendar view event"
 msgstr "ಕ�ಯಾಲೆಂಡರ� ಕಾರ�ಯಕ�ರಮವನ�ನ� ನೋಡ�"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:541
 msgid "Grab Focus"
 msgstr "ಗಮನ ಸೆಳೆ"
 
@@ -5970,7 +5716,7 @@ msgstr "ದಿನಾಂಕಕ�ಕೆ ತೆರಳ�"
 msgid "a table to view and select the current time range"
 msgstr "ಪ�ರಸ�ತ�ತ ಸಮಯ ಹಾಗ� ವ�ಯಾಪ�ತಿಯನ�ನ� ನೋಡಲ� ಹಾಗ� ಆರಿಸಲ� ಒಂದ� ಪಟ�ಟಿ"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5979,14 +5725,14 @@ msgstr[1] "ಇದà³� %d ಕಾರà³�ಯಕà³�ರಮಗಳನà³�ನà³� ಹೊಂà
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 msgid "It has no events."
 msgstr "ಇದ� ಯಾವ�ದೆ ಕಾರ�ಯಕ�ರಮವನ�ನ� ಹೊಂದಿದೆ."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "ಕೆಲಸದ ವಾರದರ�ಶಿಕೆ: %s. %s"
@@ -5994,16 +5740,16 @@ msgstr "ಕೆಲಸದ ವಾರದರ�ಶಿಕೆ: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "ದಿನ ದರ�ಶಿಕೆ: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "ಒಂದ� ಕೆಲಸದ ವಾರದ ಕ�ಯಾಲೆಂಡರ� ದರ�ಶಿಕೆ"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "ಒಂದ� ಅಥವ ಹೆಚ�ಚಿನ ದಿನಗಳಿಗಾಗಿನ ಕ�ಯಾಲೆಂಡರ� ದರ�ಶಿಕೆ"
 
@@ -6014,16 +5760,16 @@ msgid "Gnome Calendar"
 msgstr "ಗ�ನೋಮ� ಕ�ಯಾಲೆಂಡರ�"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:986
+#: ../modules/calendar/e-cal-shell-view-private.c:909
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:993
-#: ../modules/calendar/e-cal-shell-view-private.c:999
-#: ../modules/calendar/e-cal-shell-view-private.c:1002
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -6031,10 +5777,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1019
-#: ../modules/calendar/e-cal-shell-view-private.c:1030
-#: ../modules/calendar/e-cal-shell-view-private.c:1037
-#: ../modules/calendar/e-cal-shell-view-private.c:1040
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -6046,25 +5792,25 @@ msgstr "ಹಾರ� ಗ�ಂಡಿ"
 msgid "Click here, you can find more events."
 msgstr "ಇಲ�ಲಿ ಕ�ಲಿಕ�ಕಿಸಿ, ಇನ�ನಷ�ಟ� ಕಾರ�ಯಕ�ರಮಗಳನ�ನ� ಕಾಣಬಹ�ದ�."
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "ತಿಂಗಳ� ದರ�ಶಿಕೆ: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "ವಾರ ದರ�ಶಿಕೆ: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:188
 msgid "calendar view for a month"
 msgstr "ಒಂದ� ತಿಂಗಳಿಗಾಗಿನ ಕ�ಯಾಲೆಂಡರ� ದರ�ಶಿಕೆ"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:190
 msgid "calendar view for one or more weeks"
 msgstr "ಒಂದ� ಅಥವ ಹೆಚ�ಚಿನ ವಾರಗಳಿಗಾಗಿನ ಕ�ಯಾಲೆಂಡರ� ದರ�ಶಿಕೆ"
 
-#: ../calendar/gui/gnome-cal.c:2299
+#: ../calendar/gui/gnome-cal.c:2242
 msgid "Purging"
 msgstr "ಹೊರದಬ�ಬಲಾಗ�ತ�ತಿದೆ"
 
@@ -6117,39 +5863,40 @@ msgid "Select Date"
 msgstr "ದಿನಾಂಕವನ�ನ� ಆರಿಸ�"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "ಸಪ�ಟೆಂಬರ�"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "Select _Today"
+msgstr "ಇಂದಿನ ದಿನವನ�ನ� ಆರಿಸ�(_T)"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "ಇಂದಿನ ದಿನಾಂಕವನ�ನ� ಆರಿಸ�(_S)"
+msgid "September"
+msgstr "ಸಪ�ಟೆಂಬರ�"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "ಒಬ�ಬ ಆಯೋಜಕರನ�ನ� ಹೊಂದಿಸಬೇಕಿದೆ."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "ಪಾಲ�ಗೊಳ�ಳಲ� ಕನಿಷ�ಟ ಒಬ�ಬರ ಅಗತ�ಯವಿದೆ"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "ಕಾರ�ಯಕ�ರಮದ ಮಾಹಿತಿ"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "ಕಾರ�ಯದ ಮಾಹಿತಿ"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "ಮೆಮೊ ಮಾಹಿತಿ"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ ಮಾಹಿತಿ"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "ಕ�ಯಾಲೆಂಡರ� ಮಾಹಿತಿ"
 
@@ -6157,7 +5904,7 @@ msgstr "ಕ�ಯಾಲೆಂಡರ� ಮಾಹಿತಿ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ಅಂಗೀಕರಿಸಲಾಗಿದೆ"
@@ -6166,7 +5913,7 @@ msgstr "ಅಂಗೀಕರಿಸಲಾಗಿದೆ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "ಪ�ರಾಯಶಃ ಅಂಗೀಕರಿಸಲಾಗಿದೆ"
@@ -6178,7 +5925,7 @@ msgstr "ಪ�ರಾಯಶಃ ಅಂಗೀಕರಿಸಲಾಗಿದೆ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "ತಿರಸ�ಕರಿಸಲ�ಪಟ�ಟಿದೆ"
@@ -6187,7 +5934,7 @@ msgstr "ತಿರಸ�ಕರಿಸಲ�ಪಟ�ಟಿದೆ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ಡೆಲಿಗೇಟ� ಮಾಡಲಾಗಿದೆ"
@@ -6195,7 +5942,7 @@ msgstr "ಡೆಲಿಗೇಟ� ಮಾಡಲಾಗಿದೆ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ಅಪ�ಡೇಟ� ಆಗಿದ"
@@ -6203,7 +5950,7 @@ msgstr "ಅಪ�ಡೇಟ� ಆಗಿದ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ರದ�ದ� ಮಾಡ�"
@@ -6211,7 +5958,7 @@ msgstr "ರದ�ದ� ಮಾಡ�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ಪ�ನಶ�ಚೇತನಗೊಳಿಸ�"
@@ -6219,29 +5966,29 @@ msgstr "ಪ�ನಶ�ಚೇತನಗೊಳಿಸ�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ಪ�ರತಿ-ಯೋಜನೆ"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ಬಿಡ�ವ�/ಕಾರ�ಯನಿರತ ಮಾಹಿತಿ (%s ಯಿಂದ %s ವರೆಗೆ)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "�ಕ�ಯಾಲೆಂಡರ� ಮಾಹಿತಿ"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "ನೀವ� ಈ ಕಾರ�ಯಕ�ರಮದಲ�ಲಿ ಪಾಲ�ಗೊಳ�ಳ�ವವರಲ�ಲಿ ಒಬ�ಬರಾಗಿರಲೇ ಬೇಕ�."
 
@@ -6397,49 +6144,74 @@ msgstr "ಶ�ಕ�ರ"
 msgid "Sa"
 msgstr "ಶನಿ"
 
-#: ../calendar/gui/print.c:2564
+#. Translators: This is part of "START to END" text, where START and END are date/times
+#: ../calendar/gui/print.c:2419
+msgid " to "
+msgstr " ಗೆ "
+
+#. Translators: This is part of "START to END (Completed COMPLETED)", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2425
+msgid " (Completed "
+msgstr " (ಪೂರ�ಣಗೊಂಡಿದೆ "
+
+#. Translators: This is part of "Completed COMPLETED", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2428
+msgid "Completed "
+msgstr "ಪೂರ�ಣಗೊಂಡಿದೆ "
+
+#. Translators: This is part of "START (Due DUE)", where START and DUE are dates/times
+#: ../calendar/gui/print.c:2435
+msgid " (Due "
+msgstr " (ಬಾಕಿ "
+
+#. Translators: This is part of "Due DUE", where DUE is a date/time due the event should be finished
+#: ../calendar/gui/print.c:2438
+msgid "Due "
+msgstr "ಬಾಕಿ "
+
+#: ../calendar/gui/print.c:2572
 msgid "Appointment"
 msgstr "ಅಪಾಯಿಂಟ��ಮೆಂಟ�"
 
-#: ../calendar/gui/print.c:2566
+#: ../calendar/gui/print.c:2574 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "ಕಾರ�ಯ"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2599
 #, c-format
 msgid "Summary: %s"
 msgstr "ಸಾರಾಂಶ: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2623
 msgid "Attendees: "
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2666
 #, c-format
 msgid "Status: %s"
 msgstr "ಸ�ಥಿತಿ: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2681
 #, c-format
 msgid "Priority: %s"
 msgstr "ಆದ�ಯತೆ: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2699
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ಪೂರ�ಣಗೊಂಡ ಪ�ರತಿಶತ: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2710
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2723
 #, c-format
 msgid "Categories: %s"
 msgstr "ವರ�ಗಗಳ�: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2734
 msgid "Contacts: "
 msgstr "ಸಂಪರ�ಕವಿಳಾಸಗಳ�: "
 
@@ -6470,7 +6242,7 @@ msgstr "ಅಪಾಯಿಂಟà³�â€�ಮೆಂಟà³�â€�ಗಳà³� ಹಾಗà³� ಮà
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Opening calendar"
 msgstr "ಕ�ಯಾಲೆಂಡರನ�ನ� ತೆರೆಯಲಾಗ�ತ�ತಿದೆ"
 
@@ -8051,157 +7823,157 @@ msgstr "ಪೆಸಿಫಿಕ�/ವಾಲಿಸ�"
 msgid "Pacific/Yap"
 msgstr "ಪೆಸಿಫಿಕ�/ಯಾಪ�"
 
-#: ../composer/e-composer-actions.c:79
+#: ../composer/e-composer-actions.c:81
 msgid "Untitled Message"
 msgstr "ಶೀರ�ಷಿಕೆ ಇಲ�ಲದ ಸಂದೇಶ"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "ಹೀಗೆ ಉಳಿಸ�..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:283
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "ಒಂದ� ಕಡತವನ�ನ� ಲಗತ�ತಿಸ�"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:288
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "ಮ�ಚ�ಚ�(_C)"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "ಪ�ರಸಕ�ತ ಕಡತವನ�ನ� ಮ�ಚ�ಚ�"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "ಮ�ದ�ರಿಸ�(_P)..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "ಮ�ದ�ರಣ ಮ�ನ�ನೋಟ(_v)"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "ಸಕ�ತ ಕಡತವನ�ನ� ಉಳಿಸ�"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "ಹೀಗೆ ಉಳಿಸ�(_A)..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "ಪ�ರಸಕ�ತ ಕಡತವನ�ನ� ಒಂದ� ಬೇರೆ ಹೆಸರಿನಲ�ಲಿ ಉಳಿಸ�"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "ಡ�ರಾಫ�ಟ�� ಆಗಿ ಉಳಿಸ�"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "ಡ�ರಾಫ�ಟ�� ಆಗಿ ಉಳಿಸ�"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "ಕಳ�ಹಿಸ�(_e)"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "ಈ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "ಹೊಸ ಸಂದೇಶ(_M)"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "ಹೊಸ ಸಂದೇಶ ವಿಂಡೋವನ�ನ� ತೆರೆ"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "ಅಕ�ಷರಗಳ ಎನ�ಕೋಡಿಂಗ�(_E)"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:363
 msgid "PGP _Encrypt"
 msgstr "PGP ಗೂಢಲಿಪೀಕರಣ(_E)"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:365
 msgid "Encrypt this message with PGP"
 msgstr "PGP ಯೊಂದಿಗೆ ಗೂಢಲಿಪೀಕರಿಸಿ"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:371
 msgid "PGP _Sign"
 msgstr "PGP ಸಹಿ(_S)"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:373
 msgid "Sign this message with your PGP key"
 msgstr "ಈ ಸಂದೇಶವನ�ನ� ನಿಮ�ಮ PGP ಕೀಲಿಯಿಂದ ಸಹಿ ಮಾಡಿ"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "ಸಂದೇಶವನ�ನ� ಆದ�ಯತೆಗೊಳಿಸ�(_P)"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "ಸಂದೇಶದ ಆದ�ಯತೆಯನ�ನ� ಉಚ�ಛ ಎಂದ� ಗ�ರ�ತ�ಹಾಕ�"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "ಓದಿದ ಖಾತರಿಗಾಗಿನ ಮನವಿ ಸಲ�ಲಿಕೆ(_e)"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:389
 msgid "Get delivery notification when your message is read"
 msgstr "ನಿಮ�ಮ ಸಂದೇಶವ� ಓದಲ�ಪಟ�ಟಾಗ ತಲ�ಪಿದ ಸೂಚನೆಯನ�ನ� ಪಡೆಯಿರಿ"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "S/MIME ಗೂಢಲಿಪೀಕರಣ(_c)"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:397
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ಈ ಸಂದೇಶವನ�ನ� ನಿಮ�ಮ S/MIME ಗೂಢಲಿಪೀಕರಣ ಪ�ರಮಾಣಪತ�ರದಿಂದ ಗೂಢಲಿಪೀಕರಿಸಿ"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ಸಹಿ(_n)"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:405
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ಈ ಸಂದೇಶವನ�ನ� ನಿಮ�ಮ S/MIME ಸಹಿ ಪ�ರಮಾಣಪತ�ರದಿಂದ ಸಹಿ ಮಾಡಿ"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:411
 msgid "_Bcc Field"
 msgstr "_Bcc ಕ�ಷೇತ�ರ"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:413
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸಲಾಗ�ತ�ತಿದೆಯೆ ಎಂದ� ಟಾಗಲ� ಮಾಡ�ತ�ತದೆ"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "_Cc ಕ�ಷೇತ�ರ"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸಲಾಗ�ತ�ತಿದೆಯೆ ಎಂದ� ಟಾಗಲ� ಮಾಡ�ತ�ತದೆ"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:427
 msgid "_From Field"
 msgstr "ಕ�ಷೇತ�ರದಿಂದ(_F)"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:429
 msgid "Toggles whether the From chooser is displayed"
 msgstr "ಇಂದ ಆಯ�ಕೆಗಾರನನ�ನ� ತೋರಿಸಲಾಗ�ತ�ತಿದೆಯೆ ಎಂದ� ಟಾಗಲ� ಮಾಡ�ತ�ತದೆ"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "'ಇವರಿಗೆ ಉತ�ತರಿಸ�' ಕ�ಷೇತ�ರ(_R)"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ಇವರಿಗೆ ಉತ�ತರಿಸ� ಕ�ಷೇತ�ರವನ�ನ� ತೋರಿಸಲಾಗ�ತ�ತಿದೆಯೆ ಎಂದ� ಟಾಗಲ� ಮಾಡ�ತ�ತದೆ"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:480
 msgid "Save Draft"
 msgstr "ಡ�ರಾಫ�ಟ�� ಆಗಿ ಉಳಿಸ�(_D)"
 
@@ -8213,15 +7985,15 @@ msgstr "ತೋರಿಸ�"
 msgid "Hide"
 msgstr "ಅಡಗಿಸ�"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "ಸಂದೇಶವನ�ನ� ಸ�ವೀಕರಿಸಬೇಕಿರ�ವವರನ�ನ� ನಮೂದಿಸಿ"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "ಈ ಸಂದೇಶದ ಒಂದ� ಕಾರ�ಬನ� ಕಾಪಿಯನ�ನ� ಪಡೆಯಬೇಕಿರ�ವವರ ವಿಳಾಸವನ�ನ� ನಮೂದಿಸಿ"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8229,58 +8001,58 @@ msgstr ""
 "ಸ�ವೀಕರಿಸ�ವವರ ಪಟ�ಟಿಯಲ�ಲಿ ಕಾಣಿಸಿಕೊಳ�ಳದೆ, ಈ ಸಂದೇಶದ ಒಂದ� ಕಾರ�ಬನ� ಕಾಪಿಯನ�ನ� "
 "ಪಡೆಯಬೇಕಿರ�ವವರ ವಿಳಾಸವನ�ನ� ನಮೂದಿಸಿ"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "ಇಂದ(_o):"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
+#: ../modules/mail/em-mailer-prefs.c:76
 msgid "From"
 msgstr "ಯಿಂದ"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "ಇವರಿಗೆ ಉತ�ತರಿಸ�(_R):"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "ಗೆ(_T):"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "CC"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "ಇಲ�ಲಿಗೆ ಪೋಸ�ಟ�� ಮಾಡ�(_P):"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "ವಿಷಯ(_u):"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "ಸಹಿ(_g):"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕಕ�ಕಾಗಿ ಇಲ�ಲಿ ಕ�ಲಿಕ�ಕಿಸಿ"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "ಯಾವ ಫೋಲ�ಡರ�ಗಳಿಗೆ ಕಳ�ಹಿಸಬೇಕ� ಎಂದ� ಆರಿಸಲ� ಇಲ�ಲಿ ಕ�ಲಿಕ�ಕಿಸಿ"
 
@@ -8305,18 +8077,18 @@ msgid "Save draft"
 msgstr "ಡ�ರಾಫ�ಟ�� ಆಗಿ ಉಳಿಸಿ"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:188 ../mail/em-utils.c:152
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "ಈ ಸಂದೇಶವನ�ನ� ಪ�ನಃ ತೋರಿಸಬೇಡ(_D)."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:988
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "ಹೊರ ಹೋಗ�ವ ಸಂದೇಶಗಳನ�ನ� ಸಹಿ ಮಾಡಲಾಗಿಲ�ಲ. ಈ ಖಾತೆಗಾಗಿ ಯಾವ�ದೆ ಸಹಿ ಮಾಡ�ವ ಪ�ರಮಾಣಪತ�ರವನ�ನ� "
 "ಹೊಂದಿಸಲಾಗಿಲ�ಲ"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:995
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8324,16 +8096,16 @@ msgstr ""
 "ಹೊರ ಹೋಗ�ವ ಸಂದೇಶಗಳನ�ನ� ಸಹಿ ಮಾಡಲಾಗಿಲ�ಲ. ಈ ಖಾತೆಗಾಗಿ ಯಾವ�ದೆ ಗೂಢಲಿಪೀಕರಣ "
 "ಪ�ರಮಾಣಪತ�ರವನ�ನ� ಹೊಂದಿಸಲಾಗಿಲ�ಲ"
 
-#: ../composer/e-msg-composer.c:1381
+#: ../composer/e-msg-composer.c:1386
 #, fuzzy
 msgid "Unable to reconstruct message from autosave file"
 msgstr "ಸಂಪಾದಕದಿಂದ ಸಂದೇಶವನ�ನ� ಮರಳಿ ಪಡೆಯಲಾಗಲಿಲ�ಲ"
 
-#: ../composer/e-msg-composer.c:1447 ../composer/e-msg-composer.c:1643
+#: ../composer/e-msg-composer.c:1452 ../composer/e-msg-composer.c:1648
 msgid "Compose Message"
 msgstr "ಸಂದೇಶವನ�ನ� ರಚಿಸ�"
 
-#: ../composer/e-msg-composer.c:3312
+#: ../composer/e-msg-composer.c:3313
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8418,8 +8190,8 @@ msgstr ""
 "ಸಂದೇಶವನ�ನ� ಮರಳಿ ಪಡೆದ�ಕೊಂಡರೆ, ನೀವ� ಎಲ�ಲಿ ನಿಲ�ಲಿಸಿದ�ದೀರಿ ಅಲ�ಲಿಂದ ಆರಂಭಿಸಬಹ�ದಾಗಿದೆ."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "`{0}' ಕಡತವ� ಒಂದ� ಸಾಮಾನ�ಯ ಕಡತವಲ�ಲ ಆದ�ದರಿಂದ ಒಂದ� ಸಂದೇಶದಲ�ಲಿ ಕಳ�ಹಿಸಲಾಗ�ವ�ದಿಲ�ಲ."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr "'{0}' ಕಡತವ� ಒಂದ� ಸಾಮಾನ�ಯ ಕಡತವಲ�ಲ ಆದ�ದರಿಂದ ಒಂದ� ಸಂದೇಶದಲ�ಲಿ ಕಳ�ಹಿಸಲಾಗ�ವ�ದಿಲ�ಲ."
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
@@ -8438,7 +8210,8 @@ msgid "Unable to activate the address selector control."
 msgstr "ವಿಳಾಸ ಆಯ�ಕೆಗಾರ ನಿಯಂತ�ರಣವನ�ನ� ಸಕ�ರಿಯಗೊಳಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "ಈ ಸಂದೇಶಕ�ಕೆ `{0}' ಕಡತವನ�ನ� ನೀವ� ಲಗತ�ತಿಸಲಾಗ�ವ�ದಿಲ�ಲ."
 
 #: ../composer/mail-composer.error.xml.h:22
@@ -8582,8 +8355,8 @@ msgid ""
 msgstr ""
 
 #: ../capplet/settings/mail-account-view.c:332
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2191
+#: ../mail/mail-config.ui.h:59
 msgid "Identity"
 msgstr "ಗ�ರ�ತ�"
 
@@ -8644,7 +8417,7 @@ msgid "Back - Receiving options"
 msgstr "ಪಡೆಯ�ವ ಆಯ�ಕೆಗಳ�"
 
 #: ../capplet/settings/mail-account-view.c:337
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../mail/em-account-editor.c:2770 ../mail/mail-config.ui.h:32
 msgid "Defaults"
 msgstr "ಪೂರ�ವನಿಯೋಜಿತಗಳ�"
 
@@ -8667,12 +8440,12 @@ msgstr "ಮ�ಗಿಸ�"
 msgid "Back - Sending"
 msgstr "�ರಿಕೆ ಕ�ರಮದಲ�ಲಿ"
 
-#: ../capplet/settings/mail-account-view.c:671
-#: ../capplet/settings/mail-settings-view.c:262
+#: ../capplet/settings/mail-account-view.c:673
+#: ../capplet/settings/mail-settings-view.c:264
 msgid "Close Tab"
 msgstr "ಹಾಳೆಯನ�ನ� ಮ�ಚ�ಚ�"
 
-#: ../capplet/settings/mail-account-view.c:681
+#: ../capplet/settings/mail-account-view.c:683
 #, fuzzy
 msgid "Account Wizard"
 msgstr "ಖಾತೆ ಸಂಪಾದಕ"
@@ -8682,20 +8455,20 @@ msgid "Evolution account assistant"
 msgstr "Evolution ಖಾತೆ ಸಹಾಯಕ"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:2948
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1614
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:675
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:212
+#: ../mail/message-list.c:1605
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/addressbook/e-book-shell-migrate.c:126
 #: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-cal-shell-migrate.c:141
 #: ../modules/calendar/e-memo-shell-backend.c:108
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-migrate.c:109
 msgid "On This Computer"
 msgstr "ಈ ಗಣಕದಲ�ಲಿ"
 
@@ -8713,7 +8486,7 @@ msgstr "ಒಂದ� ಕಾಲಂ ಅನ�ನ� ಸೇರಿಸ�..."
 msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
 msgstr "<span size=\"large\" weight=\"bold\">ಖಾತೆಯ ನಿರ�ವಹಣೆ</span>"
 
-#: ../capplet/settings/mail-settings-view.c:272
+#: ../capplet/settings/mail-settings-view.c:274
 msgid "Settings"
 msgstr "ಸಿದ�ಧತೆಗಳ�"
 
@@ -8727,7 +8500,7 @@ msgstr "ಕ�ಯಾಲೆಂಡರ� ಮಾಹಿತಿ"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution Elm ಆಮದ�ಗಾರ"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:825
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:821
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8855,33 +8628,37 @@ msgstr "ವೆಸ�ಟರ�ನ� ಯ�ರೋಪಿಯನ�"
 msgid "Western European, New"
 msgstr "ವೆಸ�ಟರ�ನ� ಯ�ರೋಪಿಯನ�, ನ�ಯೂ"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "ಟ�ರೆಡಿಶನಲ�"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "ಸಿಂಪ�ಲಿಫೈಡ�"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "ಉಕ�ರೇನಿಯನ�"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "ದೃಷ�ಟಿಗೋಚರ"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "ಇಂದ�"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "ನಾಳೆ"
 
@@ -8889,22 +8666,28 @@ msgstr "ನಾಳೆ"
 msgid "Yesterday"
 msgstr "ನಿನ�ನೆ"
 
-#: ../e-util/e-datetime-format.c:210
-#, c-format
-msgid "%d days from now"
-msgstr "ಇಂದಿನಿಂದ %d ದಿನಗಳ�"
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
+#, fuzzy, c-format
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "ಇಂದಿನಿಂದ %d ದಿನಗಳ�"
+msgstr[1] "ಇಂದಿನಿಂದ %d ದಿನಗಳ�"
 
-#: ../e-util/e-datetime-format.c:212
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "%d ದಿನಗಳ ಹಿಂದೆ"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d ದಿನದ ಹಿಂದೆ"
+msgstr[1] "%d ದಿನಗಳ ಹಿಂದೆ"
 
-#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
-#: ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "ಗಣಕದ ಪೂರ�ವನಿಯೋಜಿತ ಅನ�ನ� ಬಳಸ�"
 
-#: ../e-util/e-datetime-format.c:499
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "ವಿನ�ಯಾಸ:"
 
@@ -8926,20 +8709,6 @@ msgstr "%s ಅನà³�ನà³� ಪಿಂಗà³� ಮಾಡಲಾಗà³�ತà³�ತಿದà
 msgid "Writing \"%s\" to %s"
 msgstr "`%s' ಅನ�ನ� `%s' ಗೆ ಕಾಪಿ ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../e-util/e-logger.c:175
-#, fuzzy
-msgid "Name of the logger"
-msgstr "ದಾಖಲಿಸಲಾಗ�ತ�ತಿರ�ವ ಘಟಕದ ಹೆಸರ�"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "ಕಡತದ ಹೆಸರ�"
-
-#: ../e-util/e-module.c:189
-#, fuzzy
-msgid "The filename of the module"
-msgstr "ಈ ಫೋಲ�ಡರಿನ ಹೆಸರನ�ನ� ಬದಲಾಯಿಸ�"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "ದೋಷನಿವಾರಣ ದಾಖಲೆಗಳ�"
@@ -8962,13 +8731,13 @@ msgstr "ದಾಖಲೆ ಸಂದೇಶಗಳ�:"
 msgid "Log Level"
 msgstr "ದಾಖಲೆ ಹಂತ"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2687
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2677
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ಸಂದೇಶಗಳ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "ಈ ವಿಂಡೋವನ�ನ� ಮ�ಚ�ಚ�"
 
@@ -8992,18 +8761,7 @@ msgstr "ದೋಷನಿವಾರಣೆಎ"
 msgid "Error, Warnings and Debug messages"
 msgstr "ದೋಷ, ಎಚ�ಚರಿಕೆಗಳ� ಹಾಗ� ದೋಷನಿವಾರಣಾ ಸಂದೇಶಗಳ�"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "ಸಕ�ರಿಯಗೊಂಡ"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "ಪ�ಲಗ�‌ಇನ� ಶಕ�ತಗೊಳಿಸಲ�ಪಟ�ಟಿದೆಯೆ"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:334
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
@@ -9025,7 +8783,7 @@ msgstr "ಮ�ದ�ರಣಾ ವ�ಯವಸ�ಥೆಯ� ದೋಷದ ಬಗ
 msgid "Autogenerated"
 msgstr "ತಾನಾಗಿಯೆ ಉತ�ಪತ�ತಿಯಾದ"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "�ಕೆಂದರೆ \"{1}\"."
 
@@ -9045,235 +8803,235 @@ msgstr "ನೀವದನà³�ನà³� ತಿದà³�ದಿಬರೆಯಲà³� ಬಯಸà
 msgid "File exists \"{0}\"."
 msgstr "\"{0}\" ಕಡತವ� ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "ತಿದ�ದಿಬರೆ(_O)"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:169
 msgid "Could not open the link."
 msgstr "ಕೊಂಡಿಯನ�ನ� ತೆರಯಲಾಗಲಿಲ�ಲ."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:219
 msgid "Could not display help for Evolution."
 msgstr "Evolution-ದತ�ತಾಂಶ-ಪರಿಚಾರಕವನ�ನ� ಆರಂಭಿಸಲಾಗಿಲ�ಲ."
 
-#: ../e-util/gconf-bridge.c:1307
+#: ../e-util/gconf-bridge.c:1303
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf ದೋಷ: %s"
 
-#: ../e-util/gconf-bridge.c:1318
+#: ../e-util/gconf-bridge.c:1314
 msgid "All further errors shown only on terminal."
 msgstr "ಮ�ಂದಿನ ಎಲ�ಲಾ ದೋಷಗಳನ�ನ� ಟರ�ಮಿನಲ�‌ನಲ�ಲಿ ತೋರಿಸಲಾಗ�ತ�ತದೆ."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "ಇವರಿಗೆ ಉತ�ತರಿಸ�"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2247 ../mail/em-format-html.c:2309
-#: ../mail/em-format-html.c:2332 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2248 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2335 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:81
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "ವಿಷಯ"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2429
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1137
 msgid "Mailer"
 msgstr "ಮೈಲರ�"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ಫಾರ�ವಾರ�ಡ� ಮಾಡಲಾದ ಸಂದೇಶ --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:82 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "ದಿನಾಂಕ"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "ಸ�ದ�ದಿಸಮೂಹಗಳ�"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:84
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "ಚಹರೆ"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1302
 #, c-format
 msgid "%s attachment"
 msgstr "%s ಲಗತ�ತ�"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1361
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME ಸಂದೇಶವನ�ನ� ಪಾರ�ಸ� ಮಾಡಲಾಗಿಲ�ಲ: ಅಜ�ಞಾತ ದೋಷ"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ಸಂದೇಶವನ�ನ� ಪಾರ�ಸ� ಮಾಡಲಾಗಿಲ�ಲ. ಆಕರವಾಗಿ ತೋರಿಸಲಾಗ�ತ�ತಿದೆ."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ಮಲ�ಟಿಪಾರ�ಟ�/ಗೂಢಲಿಪೀಕರಣಗೊಂಡಿದ�ದಕ�ಕಾಗಿ ಬೆಂಬಲವಿರದ ಬಗೆಯ ಗೂಢಲಿಪೀಕರಣ ಬಗೆ"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME ಸಂದೇಶವನ�ನ� ಪಾರ�ಸ� ಮಾಡಲಾಗಿಲ�ಲ"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME ಸಂದೇಶವನ�ನ� ಪಾರ�ಸ� ಮಾಡಲಾಗಿಲ�ಲ: ಅಜ�ಞಾತ ಸಂದೇಶ"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "ಬೆಂಬಲವಿರದ ಸಹಿಯ ವಿನ�ಯಾಸ"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 msgid "Error verifying signature"
 msgstr "ಸಹಿಯನ�ನ� ಪರಿಶೀಲಿಸ�ವಲ�ಲಿ ದೋಷ"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "ಸಹಿಯನ�ನ� ಪರಿಶೀಲಿಸ�ವಾಗ ಅಜ�ಞಾತ ದೋಷ"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message"
 msgstr "PGP ಸಂದೇಶವನ�ನ� ಪಾರ�ಸ� ಮಾಡಲಾಗಿಲ�ಲ"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP ಸಂದೇಶವನ�ನ� ಪಾರ�ಸ� ಮಾಡಲಾಗಿಲ�ಲ: ಅಜ�ಞಾತ ದೋಷ"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ಸೆಕೆಂಡ� ಮೊದಲ�"
 msgstr[1] "%d ಸೆಕೆಂಡ��ಗಳ ಮೊದಲ�"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "ಭವಿಷ�ಯದ ಒಂದ� ಸೆಕೆಂಡ�"
 msgstr[1] "ಭವಿಷ�ಯದ %d ಸೆಕೆಂಡ��ಗಳ�"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 ನಿಮಿಷದ ಮೊದಲ�"
 msgstr[1] "%d ನಿಮಿಷಗಳ ಮೊದಲ�"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "ಭವಿಷ�ಯದ 1 ನಿಮಿಷ"
 msgstr[1] "ಭವಿಷ�ಯದ %d ನಿಮಿಷಗಳ�"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "೧ ಗಂಟೆಯ ಮೊದಲ�"
 msgstr[1] "%d ಗಂಟೆಗಳ ಮೊದಲ�"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "ಮ�ಂದಿನ ೧ ಗಂಟೆ"
 msgstr[1] "ಮ�ಂದಿನ %d ಗಂಟೆಗಳ�"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "೧ ದಿನದ ಹಿಂದೆ"
 msgstr[1] "%d ದಿನಗಳ ಹಿಂದೆ"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "ಭವಿಷ�ಯದ 1 ದಿನ"
 msgstr[1] "ಭವಿಷ�ಯದ %d ದಿನಗಳ�"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 ವಾರದ ಮೊದಲ�"
 msgstr[1] "%d ವಾರಗಳ ಮೊದಲ�"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "ಭವಿಷ�ಯದಲ�ಲಿ 1 ವಾರ"
 msgstr[1] "ಭವಿಷ�ಯದಲ�ಲಿ %d ವಾರಗಳ�"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 ತಿಂಗಳ ಮೊದಲ�"
 msgstr[1] "%d ತಿಂಗಳ�ಗಳ ಮೊದಲ�"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "ಭವಿಷ�ಯದಲ�ಲಿ 1 ತಿಂಗಳ�"
 msgstr[1] "ಭವಿಷ�ಯದಲ�ಲಿ %d ತಿಂಗಳ�ಗಳ�"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 ವರ�ಷದ ಮೊದಲ�"
 msgstr[1] "%d ವರ�ಷಗಳ ಮೊದಲ�"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "ಮ�ಂದಿನ ೧ ವರ�ಷ"
 msgstr[1] "ಮ�ಂದಿನ %d ವರ�ಷಗಳ�"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<ಒಂದ� ದಿನಾಂಕವನ�ನ� ಆರಿಸಲ� ಇಲ�ಲಿ ಕ�ಲಿಕ�ಕಿಸಿ>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "ಈಗ"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "ಹೋಲಿಸಲ� ಒಂದ� ಸಮಯವನ�ನ� ಆಯ�ಕೆ ಮಾಡಿ"
 
@@ -9326,11 +9084,11 @@ msgid "I_nclude threads"
 msgstr "ತ�ರೆಡ�‌ಗಳನ�ನ� ಸೇರಿಸ�(_n)"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "ಒಳಬರ�ವ"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "ಹೊರಹೋಗ�ವ"
 
@@ -9362,7 +9120,7 @@ msgstr "ಕಾಣೆಯಾದ ದಿನಾಂಕ."
 msgid "Missing file name."
 msgstr "ಕಾಣೆಯಾದ ಕಡತದ ಹೆಸರ�."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "ಕಾಣೆಯಾದ ಹೆಸರ�."
 
@@ -9439,7 +9197,7 @@ msgstr "ಮ�ಂದೆ"
 msgid "months"
 msgstr "ತಿಂಗಳ�ಗಳ�"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:171
 msgid "seconds"
 msgstr "ಸೆಕೆಂಡ��ಗಳ�"
 
@@ -9456,7 +9214,7 @@ msgid "years"
 msgstr "ವರ�ಷಗಳ�"
 
 #: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
+#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
 #: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
@@ -9464,37 +9222,19 @@ msgid_plural "Attachments"
 msgstr[0] "ಲಗತ�ತ�"
 msgstr[1] "ಲಗತ�ತ�ಗಳ�"
 
-#: ../mail/e-mail-attachment-bar.c:621
+#: ../mail/e-mail-attachment-bar.c:617
 #: ../widgets/misc/e-attachment-paned.c:612
 msgid "Icon View"
 msgstr "ಲಾಂಛನ ನೋಟ"
 
-#: ../mail/e-mail-attachment-bar.c:622
+#: ../mail/e-mail-attachment-bar.c:618
 #: ../widgets/misc/e-attachment-paned.c:613
 msgid "List View"
 msgstr "ಪಟ�ಟಿ ನೋಟ"
 
-#: ../mail/e-mail-browser.c:769 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr ""
-
-#: ../mail/e-mail-browser.c:779
-msgid "Shell Module"
-msgstr ""
-
-#: ../mail/e-mail-browser.c:780 ../mail/message-list.c:2580
-msgid "The mail shell backend"
-msgstr ""
-
-#: ../mail/e-mail-browser.c:790
-#, fuzzy
-msgid "Show Deleted"
-msgstr "ಅಳಿಸಲಾದ"
-
-#: ../mail/e-mail-browser.c:791
-#, fuzzy
-msgid "Show deleted messages"
-msgstr "ಅಳಿಸಲಾದ ಸಂದೇಶಗಳನ�ನ� ಅಡಗಿಸಿಡ�(_D)"
+#: ../mail/e-mail-browser.c:262
+msgid "(No Subject)"
+msgstr "(ಯಾವ�ದೆ ವಿಷಯವಿಲ�ಲ)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9543,7 +9283,7 @@ msgid "_Later"
 msgstr "ನಂತರ(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:519
+#: ../modules/mail/e-mail-shell-view-actions.c:472
 msgid "Add Label"
 msgstr "ಲೇಬಲ� ಅನ�ನ� ಸೇರಿಸ�"
 
@@ -9564,115 +9304,57 @@ msgstr ""
 msgid "Color"
 msgstr "ಬಣ�ಣ"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2671
-#: ../modules/mail/e-mail-shell-view-private.c:964
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1158
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "ಹೆಸರ�"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:363
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2674
+#: ../modules/mail/e-mail-shell-view-private.c:953
 msgid "Inbox"
 msgstr "ಇನ��ಬಾಕ�ಸ��"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
 msgid "Drafts"
 msgstr "ಡ�ರಾಫ�ಟ��ಗಳ�"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
 msgid "Outbox"
 msgstr "ಔಟ��ಬಾಕ�ಸ��"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
 msgid "Sent"
 msgstr "ಕಳ�ಹಿಸಲಾಗಿದೆ"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:570
 msgid "Templates"
 msgstr "ಮಾದರಿಗಳ�"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "ಪ�ರಮ�ಖ"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "ಮಾಡಬೇಕಿರ�ವ"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "ನಂತರ"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:147
 msgid "Migrating..."
 msgstr "ರವಾನಿಸಲಾಗ�ತ�ತಿದೆ..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:180
 msgid "Migration"
 msgstr "ರವಾನಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:220
 #, c-format
 msgid "Migrating '%s':"
 msgstr "`%s' ಅನ�ನ� ರವಾನಿಸಲಾಗ�ತ�ತಿದೆ:"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "ಹೊಸ ಫೋಲ�ಡರ� `%s' ಅನ�ನ� ನಿರ�ಮಿಸಲಾಗಿಲ�ಲ: %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "ಫೋಲ�ಡರ� `%s' ಅನ�ನ� `%s' ಗೆ ಕಾಪಿ ಮಾಡಲಾಗಿಲ�ಲ: %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "`%s' ಯಲ�ಲಿ ಈಗಿರ�ವ ಅಂಚೆಪೆಟ�ಟಿಗೆಗಳನ�ನ� ಶೋಧಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ: %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2932
+#: ../mail/e-mail-migrate.c:659
 msgid "Migrating Folders"
 msgstr "ಫೋಲ�ಡರ�ಗಳನ�ನ� ರವಾನಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution ೧.x ನಿಂದ ಈಚೆಗೆ Evolution�ನ ಅಂಚೆ ಪೆಟ�ಟಿಗೆ ಕೋಶಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� "
-"ಬದಲಾಗಿವೆ.\n"
-"\n"
-"Evolution ನಿಮ�ಮ ಫೋಲ�ಡರ�ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "ಹಳೆಯ POP ಪರಿಚಾರಕದಲ�ಲಿ-ಇರಿಸಿಕೋ ಮಾಹಿತಿ `%s' ಅನ�ನ� ತೆರೆಯಲಾಗಿಲ�ಲ: %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "POP3 ಪರಿಚಾರಕದಲ�ಲಿ-ಇರಿಸಿಕೋ ಮಾಹಿತಿ ಕೋಶ `%s' ಅನ�ನ� ನಿರ�ಮಿಸಲಾಗಿಲ�ಲ: %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "POP3 ಪರಿಚಾರಕದಲ�ಲಿ-ಇರಿಸಿಕೋ ಕೋಶ `%s' ಅನ�ನ� ಕಾಪಿ ಮಾಡಲಾಗಿಲ�ಲ: %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "ಸ�ಥಳೀಯ ಮೈಲ� ಶೇಖರಣೆ `%s' ಅನ�ನ� ರಚಿಸಲ� ವಿಫಲಗೊಂಡಿದೆ: %s"
-
-#: ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:660
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9684,25 +9366,16 @@ msgstr ""
 "\n"
 "Evolution ನಿಮ�ಮ ಫೋಲ�ಡರ�ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
 
-#: ../mail/e-mail-migrate.c:3030
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "ಸ�ಥಳೀಯ ಮೈಲ� ಫೋಲ�ಡರ�ಗಳ ಶೇಖರಣೆ `%s' ಅನ�ನ� ರಚಿಸಲ� ವಿಫಲಗೊಂಡಿದೆ: %s"
-
-#: ../mail/e-mail-migrate.c:3048
+#: ../mail/e-mail-migrate.c:756
 #, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"ಹಿಂದಿನ Evolutionನಿಂದ ಸಿದ�ಧತೆಗಳನ�ನ� ಓದಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ, `evolution/config.xmldb' "
-"ಯ� ಅಸ�ತಿತ�ವದಲ�ಲಿಲ�ಲ ಅಥವ ಭ�ರಷ�ಟಗೊಂಡಿದೆ."
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "ಸ�ಥಳೀಯ ಮೈಲ� ಫೋಲ�ಡರ�ಗಳ ಶೇಖರಣೆ '%s' ಅನ�ನ� ರಚಿಸಲ� ವಿಫಲಗೊಂಡಿದೆ: %s"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:103
+#: ../modules/calendar/e-task-shell-view-actions.c:561
 #, fuzzy
 msgid "Do not ask me again"
 msgstr "ಪ�ನಃ ನನ�ನನ�ನ� ಕೇಳಬೇಡ."
@@ -9711,7 +9384,7 @@ msgstr "ಪ�ನಃ ನನ�ನನ�ನ� ಕೇಳಬೇಡ."
 msgid "Copy to Folder"
 msgstr "ಫೋಲ�ಡರಿಗೆ ಕಾಪಿ ಮಾಡ�"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "ಕಾಪಿ ಮಾಡ�(_o)"
 
@@ -9719,7 +9392,7 @@ msgstr "ಕಾಪಿ ಮಾಡ�(_o)"
 msgid "Move to Folder"
 msgstr "ಫೋಲ�ಡರಿಗೆ ಸ�ಥಳಾಂತರಿಸ�"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "ಜರ�ಗಿಸ�(_M)"
 
@@ -9736,7 +9409,6 @@ msgstr[1] "ಸಂದೇಶವನ�ನ� ಉಳಿಸ�..."
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
 #: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "ಸಂದೇಶ"
@@ -10049,8 +9721,8 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "ಆರಿಸಲಾದ ಸಂದೇಶವನ�ನ� ಬೇರೊಬ�ಬರಿಗೆ ಮರಳಿ ನಿರ�ದೇಶಿಸ�(ಬೌನ�ಸ��)"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "ಎಲ�ಲರಿಗೂ ಉತ�ತರಿಸ�(_R)"
 
@@ -10068,7 +9740,7 @@ msgid "Compose a reply to the mailing list of the selected message"
 msgstr "ಆರಿಸಲಾದ ಸಂದೇಶದ ಮೈಲಿಂಗ� ಲಿಸ�ಟ��ಗೆ ಒಂದ� ಮಾರ�ತ�ತರವನ�ನ� ಬರೆ"
 
 #: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "ಕಳ�ಹಿಸಿದವರಿಗೆ ಮಾರ�ತ�ತರಿಸ�(_R)"
 
@@ -10231,53 +9903,53 @@ msgstr "ಎಲ�ಲಾ ಸಂದೇಶ ಹೆಡರ�‌ಗಳ�(_H)"
 msgid "Show messages with all email headers"
 msgstr "ಎಲ�ಲಾ ಇಮೇಲ� ಹೆಡರ�‌ಗಳನ�ನ� ಹೊಂದಿದ ಸಂದೇಶಗಳನ�ನ� ತೋರಿಸ�"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1878
 msgid "Unable to retrieve message"
 msgstr "ಸಂದೇಶವನ�ನ� ಮರಳಿಪಡೆಯಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1939
+#: ../mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "ಸಂದೇಶ '%s' ಅನ�ನ� ಮರಳಿ ಪಡೆಯಲಾಗ�ತ�ತಿದೆ"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2471
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2453
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "ಪೂರ�ವನಿಯೋಜಿತ"
 
-#: ../mail/e-mail-reader.c:2592
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2574
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "ರವಾನಿಸ�(_F)"
 
-#: ../mail/e-mail-reader.c:2593
+#: ../mail/e-mail-reader.c:2575
 msgid "Forward the selected message to someone"
 msgstr "ಆರಿಸಲಾದ ಸಂದೇಶವನ�ನ� ಬೇರೊಬ�ಬರಿಗೆ ಕಳ�ಹಿಸ�"
 
-#: ../mail/e-mail-reader.c:2637 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2619 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "ಅಳಿಸ�"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "ಮ�ಂದಿನ"
 
-#: ../mail/e-mail-reader.c:2645
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "ಹಿಂದಿನ"
 
-#: ../mail/e-mail-reader.c:2649 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2631 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "ಉತ�ತರಿಸ�"
 
@@ -10287,24 +9959,24 @@ msgstr "ಗಮನವಿರಿಸಲ� ಗ�ರ�ತ�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:73
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "ಯಾವ�ದೆ ಗೂಢಲಿಪೀಕರಣವಿಲ�ಲ"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:121
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS ಗೂಢಲಿಪೀಕರಣ"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL ಗೂಢಲಿಪೀಕರಣ"
 
@@ -10327,34 +9999,34 @@ msgstr ""
 "ಅದನ�ನ� ಒಪ�ಪಿಕೊಳ�ಳಲ� ಅಲ�ಲಿರ�ವ ಚೆಕ�‌ ಬಾಕ�ಸಿನಲ�ಲಿ ಗ�ರ�ತ� ಹಾಕಿ\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "ಯಾವ�ದೂ ಇಲ�ಲ"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "ಎಂದೂ ಬೇಡ"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "ಯಾವಾಗಲೂ"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "ಪ�ರತಿ ಸಂದೇಕ�ಕೂ ಕೇಳ�"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "ಯಾವ�ದೂ ಇಲ�ಲ"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "ಮೈಲ� ಸಂರಚನೆ"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10364,7 +10036,7 @@ msgstr ""
 "\n"
 "ಆರಂಭಿಸಲ� \"ಮ�ಂದಕ�ಕೆ\" ಅನ�ನ� ಕ�ಲಿಕ� ಮಾಡಿ."
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2060
 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 "
@@ -10374,20 +10046,20 @@ msgstr ""
 "ಕ�ಷೇತ�ರಗಳ ಮಾಹಿತಿಯನ�ನ� ನೀವ� ಕಳ�ಹಿಸ�ವ ಇಮೈಲ�‌ನಲ�ಲಿ ಒಳಗೊಳ�ಳಿಸಲ� ಬಯಸದೆ ಇದ�ದಲ�ಲಿ ಅವನ�ನ� "
 "ತ�ಂಬಿಸಲೇ ಬೇಕಾದ ಅಗತ�ಯವಿರ�ವ�ದಿಲ�ಲ."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2228
+#: ../mail/mail-config.ui.h:91
 msgid "Receiving Email"
 msgstr "ಇಮೈಲನ�ನ� ಸ�ವೀಕರಿಸಲಾಗ�ತ�ತದೆ"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "ದಯವಿಟ�ಟ� ಈ ಕೆಳಗಿನ ಖಾತೆಯ ಸಿದ�ಧತೆಗಳನ�ನ� ಸಂರಚಿಸಿ."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2706
 msgid "Sending Email"
 msgstr "ಇಮೈಲನ�ನ� ಕಳ�ಹಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10395,11 +10067,11 @@ msgstr ""
 "ದಯವಿಟ�ಟ� ನೀವ� ಇಮೈಲ� ಅನ�ನ� ಯಾವ ಬಗೆಯಲ�ಲಿ ಕಳ�ಹಿಸ�ತ�ತೀರಿ ಎಂದ� ನಮೂದಿಸಿ. ಈ ಮಾಹಿತಿಯ� "
 "ನಿಮಗೆ ತಿಳಿಯದೆ ಇದ�ದಲ�ಲಿ ನಿಮ�ಮ ಗಣಕ ವ�ಯವಸ�ಥಾಪಕರನ�ನ� ಅಥವ ಅಂತರ�ಜಾಲ ಸೇವಾ ಕರ�ತರನ�ನ� ಸಂಪರ�ಕಿಸಿ."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "ಖಾತೆಯ ನಿರ�ವಹಣೆ"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2069
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10407,11 +10079,11 @@ msgstr ""
 "ದಯವಿಟ�ಟ� ಈ ಖಾತೆಗಾಗಿ ಒಂದ� ವಿವರಣಾತ�ಮಕವಾದ ಹೆಸರನ�ನ� ಈ ಕೆಳಗಿನ ಜಾಗದಲ�ಲಿ ಒದಗಿಸಿ.\n"
 "ಈ ಹೆಸರ� ಕೇವಲ ತೋರಿಸ�ವ ಉದ�ಧೇಶಕ�ಕೆ ಮಾತ�ರ ಬಳಸಲಾಗ�ತ�ತದೆ."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "ಆಯಿತ�"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10421,61 +10093,61 @@ msgid ""
 msgstr ""
 "ಶ�ಭಾಶಯಗಳ�, ನಿಮ�ಮ ಮೈಲ� ಸಂರಚನೆಯ� ಸಂಪೂರ�ಣಗೊಂಡಿದೆ.\n"
 "\n"
-"ನೀವ� ಈಗ Evolution�ನ�ನ� ಬಳಸಿಕೊಂಡ� ಮೈಲ��ಗಳನ�ನ� ಕಳ�ಹಿಸಲ�ಹಾಗ� ಸ�ವೀಕರಿಸಲ� "
-"ಶಕ�ತರಾಗಿದ�ದೀರಿ.\n"
+"ನೀವ� ಈಗ Evolution�ನ�ನ� ಬಳಸಿಕೊಂಡ� ಮೈಲ��ಗಳನ�ನ� ಕಳ�ಹಿಸಲ�"
+"ಹಾಗ� ಸ�ವೀಕರಿಸಲ� ಶಕ�ತರಾಗಿದ�ದೀರಿ.\n"
 "\n"
 "ನಿಮ�ಮ ಸಿದ�ಧತೆಗಳನ�ನ� ಉಳಿಸಲ� \"ಅನ�ವಯಿಸ�\" ಅನ�ನ� ಕ�ಲಿಕ� ಮಾಡಿ."
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2515
 msgid "Check for _new messages every"
 msgstr "ಪ�ರತಿ ಹೊಸ ಸಂದೇಶಗಳಿಗೂ ಪರೀಕ�ಷಿಸಿ(_n)"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2523
 msgid "minu_tes"
 msgstr "ನಿಮಿಷಗಳ�(_t)"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "ಸ�ರಕ�ಷತೆ"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
 msgid "Receiving Options"
 msgstr "ಪಡೆಯ�ವ ಆಯ�ಕೆಗಳ�"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2878 ../mail/em-account-editor.c:2946
 msgid "Checking for New Messages"
 msgstr "ಹೊಸ ಸಂದೇಶಗಳಿಗಾಗಿ ಪರಿಶೀಲಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3414
 msgid "Account Editor"
 msgstr "ಖಾತೆ ಸಂಪಾದಕ"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3414
 msgid "Evolution Account Assistant"
 msgstr "Evolution ಖಾತೆ ಸಹಾಯಕ"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1570
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr ""
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1618
 #, fuzzy, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ಮೈಲ� ಸೂಚನೆಯ ಗ�ಣಲಕ�ಷಣಗಳ�"
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1942
 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:1997
+#: ../mail/em-composer-utils.c:1989
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10483,19 +10155,19 @@ msgstr ""
 "${AbbrevWeekdayName} ದಂದ�, ${Year}-${Month}-${Day} ನ ${24Hour} ಗೆ :${Minute} "
 "${TimeZone}, ${Sender} ಹೀಗೆ ಬರೆದಿದ�ದಾರೆ:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2133
 msgid "-----Original Message-----"
 msgstr "-----ಮೂಲ ಸಂದೇಶ-----"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2314
 msgid "Posting destination"
 msgstr "ಕಳ�ಹಿಸಬೇಕಿರ�ವ ಜಾಗ"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2315
 msgid "Choose folders to post the message to."
 msgstr "ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸಬೇಕಿರ�ವ ಫೋಲ�ಡರ�ಗಳನ�ನ� ಆರಿಸಿ."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "ಫೋಲ�ಡರನ�ನ� ಆರಿಸಿ"
 
@@ -10576,6 +10248,10 @@ msgstr "ಗಮನವಿರಿಸ�"
 msgid "Forward to"
 msgstr "ಇಲ�ಲಿಗೆ ಫಾರ�ವಾರ�ಡ� ಮಾಡ�"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "ಪ�ರಮ�ಖ"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "ಇದರ ನಂತರ"
@@ -10600,7 +10276,7 @@ msgstr "ಇದನ�ನ� ಹೊಂದಿಸಲಾಗಿಲ�ಲ"
 msgid "is set"
 msgstr "ಇದನ�ನ� ಹೊಂದಿಸಲಾಗಿದೆ"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:62
 msgid "Junk"
 msgstr "ರದ�ದಿ"
 
@@ -10649,7 +10325,7 @@ msgid "Play Sound"
 msgstr "ಶಬ�ಧವನ�ನ� ಪ�ಲೇ ಮಾಡ�"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "ಓದ�"
 
@@ -10730,16 +10406,16 @@ msgid "Unset Status"
 msgstr "ಹೊಂದಿಸಲಾದ ಸ�ಥಿತಿಯನ�ನ� ತೆಗೆ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "ನಂತರ"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "ಕ�ರಮವನ�ನ� ಸೇರಿಸ�(_t)"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:169
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "ಓದದೆ ಇರ�ವ ಸಂದೇಶಗಳ�:"
@@ -10747,23 +10423,23 @@ msgstr[1] "ಓದದೆ ಇರ�ವ ಸಂದೇಶಗಳ�:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:173
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "ಒಟ�ಟ� ಸಂದೇಶಗಳ�:"
 msgstr[1] "ಒಟ�ಟ� ಸಂದೇಶಗಳ�:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:191
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "ಕೋಟಾ ಬಳಕೆ(%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:193
 #, c-format
 msgid "Quota usage"
 msgstr "ಕೋಟಾ ಬಳಕೆ"
 
-#: ../mail/em-folder-properties.c:399
+#: ../mail/em-folder-properties.c:395
 #: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "ಫೋಲ�ಡರ� ಗ�ಣಲಕ�ಷಣಗಳ�"
@@ -10772,37 +10448,37 @@ msgstr "ಫೋಲ�ಡರ� ಗ�ಣಲಕ�ಷಣಗಳ�"
 msgid "<click here to select a folder>"
 msgstr "<ಒಂದ� ಫೋಲ�ಡರನ�ನ� ಆರಿಸಲ� ಇಲ�ಲಿ ಕ�ಲಿಕ�ಕಿಸಿ>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "ರಚಿಸ�(_r)"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "ಫೋಲ�ಡರಿನ ಹೆಸರ�(_n):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1073 ../mail/mail-vfolder.c:1138
 msgid "Search Folders"
 msgstr "ಕಡತಕೋಶಗಳನ�ನ� ಹ�ಡ�ಕ�"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1080
 msgid "Loading..."
 msgstr "ಲೋಡ� ಮಾಡಲಾಗ�ತ�ತಿದೆ..."
 
-#: ../mail/em-folder-tree.c:192
+#: ../mail/em-folder-tree.c:183
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ಯಲ�ಲಿ ಕೋಶಗಳನ�ನ� ಶೋಧಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/em-folder-tree.c:605
+#: ../mail/em-folder-tree.c:596
 msgid "Folder names cannot contain '/'"
 msgstr "ಫೋಲ�ಡರ� ಹೆಸರ�ಗಳ� '/' ಅನ�ನ� ಹೊಂದಿರ�ವಂತಿಲ�ಲ"
 
@@ -10824,86 +10500,86 @@ msgstr "ಫೋಲà³�ಡರà³� ಹೆಸರà³�ಗಳà³� '/' ಅನà³�ನà³� ಹà³
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1087
+#: ../mail/em-folder-tree.c:1078
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1295
+#: ../mail/em-folder-tree.c:1286
 msgid "Mail Folder Tree"
 msgstr "ಮೈಲ� ಫೋಲ�ಡರ� ಟ�ರೀ"
 
-#: ../mail/em-folder-tree.c:1578 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1575 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s ಫೋಲ�ಡರನ�ನ� ಸ�ಥಳಾಂತರಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/em-folder-tree.c:1580 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1577 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s ಫೋಲ�ಡರನ�ನ� ಕಾಪಿ ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/em-folder-tree.c:1587 ../mail/message-list.c:2100
+#: ../mail/em-folder-tree.c:1584 ../mail/message-list.c:2098
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ಸಂದೇಶಗಳನ�ನ� %s ಫೋಲ�ಡರಿಗೆ ಸ�ಥಳಾಂತರಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/em-folder-tree.c:1589 ../mail/message-list.c:2102
+#: ../mail/em-folder-tree.c:1586 ../mail/message-list.c:2100
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ಸಂದೇಶಗಳನ�ನ� %s ಫೋಲ�ಡರಿಗೆ ಕಾಪಿ ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/em-folder-tree.c:1604
+#: ../mail/em-folder-tree.c:1601
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ಸಂದೇಶವನ�ನ�(ಗಳನ�ನ�) ಮೇಲ�ಮಟ�ಟದ ಶೇಖರಣೆಗೆ ಬೀಳಿಸಲಾಗಿಲ�ಲ"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 #, fuzzy
 msgid "Move Folder To"
 msgstr "ಫೋಲ�ಡರನ�ನ� ಇಲ�ಲಿಗೆ ವರ�ಗಾಯಿಸ�(_M)..."
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 #, fuzzy
 msgid "Copy Folder To"
 msgstr "ಫೋಲ�ಡರನ�ನ� ಇಲ�ಲಿಗೆ ಕಾಪಿ ಮಾಡ�(_M)..."
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:500
+#: ../plugins/groupwise-features/share-folder-common.c:136
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "`%s' ಫೋಲ�ಡರನ�ನ� ರಚಿಸಲಾಗ�ತ�ತಿದೆ"
+msgid "Creating folder '%s'"
+msgstr "'%s' ಫೋಲ�ಡರನ�ನ� ರಚಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:663
 msgid "Create Folder"
 msgstr "ಫೋಲ�ಡರನ�ನ� ರಚಿಸ�"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:664
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Specify where to create the folder:"
 msgstr "ಫೋಲ�ಡರನ�ನ� ಎಲ�ಲಿ ರಚಿಸಬೇಕ� ಎಂದ� ನಿಗದಿಪಡಿಸಿ:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:680
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "ಫೋಲ�ಡರ� \"%s\" ದ ಚಂದಾದಾರಿಕೆಯನ�ನ� ರದ�ದ�ಗೊಳಿಸ�"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1540
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "ಸಹಿ ಮಾಡದೆ ಇರ�ವ"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "ಈ ಸಂದೇಶವನ�ನ� ಸಹಿ ಮಾಡಲಾಗಿಲ�ಲ. ಈ ಸಂದೇಶವ� ದೃಢೀಕರಿಸಲ�ಪಟ�ಟಿದೆ ಎಂದ� ಯಾವ�ದೆ ಖಚಿತತೆ ಇಲ�ಲ."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1541
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "ಮಾನ�ಯವಾದ ಸಹಿ"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10911,11 +10587,11 @@ msgstr ""
 "ಈ ಸಂದೇಶವನ�ನ� ಸಹಿ ಮಾಡಲಾಗಿದೆ ಹಾಗ� ಅದ� ಮಾನ�ಯವಾದ�ದಾಗಿದೆ ಅಂದರೆ ಈ ಸಂದೇಶವ� "
 "ದೃಢೀಕೃತವಾಗಿರ�ವ ಸಾಧ�ಯತೆ ಬಹಳಷ�ಟಿದೆ."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1542
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "ಅಮಾನ�ಯವಾದ ಸಹಿ"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10923,11 +10599,11 @@ msgstr ""
 "ಈ ಸಂದೇಶದ ಸಹಿಯನ�ನ� ದೃಢಪಡಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ, ಬಹ�ಷಃ ಅದ� ರವಾನೆಯ ಸಮಯದಲ�ಲಿ "
 "ಬದಲಾಯಿಸಲ�ಪಟ�ಟಿರಬಹ�ದ�."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1543
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
 msgid "Valid signature, but cannot verify sender"
 msgstr "ಮಾನ�ಯವಾದ ಸಹಿ, ಆದರೆ ಕಳ�ಹಿಸಿದವರನ�ನ� ದೃಢಪಡಿಸಲಾಗಿಲ�ಲ"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10935,11 +10611,11 @@ msgstr ""
 "ಈ ಸಂದೇಶವ� ಒಂದ� ಮಾನ�ಯವಾದ ಸಹಿಯನ�ನ� ಹೊಂದಿದೆ, ಆದರೆ ಕಳ�ಹಿಸಿದವರನ�ನ� ದೃಢಪಡಿಸಲ� "
 "ಸಾಧ�ಯವಾಗಿಲ�ಲ."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1544
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
 msgid "Signature exists, but need public key"
 msgstr "ಸಹಿಯ� ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ, ಆದರೆ ಖಾಸಗಿ ಕೀಲಿಯ ಅಗತ�ಯವಿದೆ"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -10947,11 +10623,11 @@ msgstr ""
 "ಈ ಸಹಿಯ� ಒಂದ� ಸಿಗ�ನೇಚರಿನಿಂದ ಸಹಿ ಮಾಡಲ�ಪಟ�ಟಿದೆ, ಆದರೆ ಅದಕ�ಕೆ ಹೊಂದಿಕೊಳ�ಳ�ವ ಯಾವ�ದೆ "
 "ಖಾಸಗಿ ಕೀಲಿ ಇಲ�ಲ."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1550
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
 msgid "Unencrypted"
 msgstr "ಗೂಢಲಿಪೀಕರಣಗೊಳ�ಳದ"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10959,11 +10635,11 @@ msgstr ""
 "ಸಂದೇಶವ� ಗೂಢಲಿಪೀಕರಣಗೊಂಡಿಲ�ಲ. ಇದರಲ�ಲಿನ ವಿಷಯಗಳನ�ನ� ರವಾನೆಯ ಸಮಯದಲ�ಲಿ ಬೇರೊಬ�ಬರ� ನೋಡಿರ�ವ "
 "ಸಾಧ�ಯತೆ ಇದೆ."
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1551
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "ಗೂಢಲಿಪೀಕರಣಗೊಂಡಿದೆ, ದ�ರ�ಭಲವಾಗಿದೆ"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -10973,21 +10649,21 @@ msgstr ""
 "ಹೊಂದಿದೆ. ಬೇರೊಬ�ಬರ� ಒಂದ� ನಿಗದಿತ ಮೊತ�ತದ ಸಮಯದಲ�ಲಿ ಈ ಸಂದೇಶದಲ�ಲಿನ ವಿಷಯವನ�ನ� ನೋಡ�ವ�ದ� "
 "ಕಷ�ಟವಾಗಿದ�ದರೂ ಅಸಾಧ�ಯವೆಂದ� ಹೇಳಲಾಗ�ವ�ದಿಲ�ಲ."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1552
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "ಗೂಢಲಿಪೀಕರಣಗೊಂಡ"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 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:117 ../mail/em-format-html.c:1553
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "ಗೂಢಲಿಪೀಕರಣಗೊಂಡಿದೆ, ದೃಢವಾದ"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -10996,15 +10672,15 @@ msgstr ""
 "ಒಂದ� ದೃಢವಾದ ಗೂಢಲಿಪೀಕರಣ ಅಲ�ಗಾರಿತಮ�‌ನೊಂದಿಗೆ ಈ ಸಂದೇಶವ� ಗೂಢಲಿಪೀಕರಣಗೊಂಡಿದೆ. ಒಂದ� "
 "ನಿಗದಿತ ಮೊತ�ತದ ಸಮಯದಲ�ಲಿ ಬೇರೊಬ�ಬರ� ಈ ಸಂದೇಶದಲ�ಲಿನ ವಿಷಯವನ�ನ� ನೋಡ�ವ�ದ� ಬಹಳ ಕಷ�ಟಸಾಧ�ಯ."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "ಪ�ರಮಾಣಪತ�ರವನ�ನ� ವೀಕ�ಷಿಸ�(_V)"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "ಈ ಪ�ರಮಾಣಪತ�ರವನ�ನ� ವೀಕ�ಷಿಸಲಾಗ�ವ�ದಿಲ�ಲ"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -11013,28 +10689,28 @@ msgstr ""
 "ಸಾಧ�ಯವಾಗದೆ ಇರ�ವಷ�ಟ� ದೊಡ�ಡದಾಗಿದೆ. ನೀವ� ಇದನ�ನ� ರೂಪಿಸದೆ ಇರ�ವಂತೆ ಅಥವ ಬೇರೊಂದ� ಪಠ�ಯ "
 "ಸಂಪಾದಕದಲ�ಲಿ ನೋಡಬಹ�ದಾಗಿದೆ."
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:726
 msgid "Completed on"
 msgstr "ಪೂರ�ಣಗೊಳಿಸಿದ�ದ�"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:734
 msgid "Overdue:"
 msgstr "ಅವಧಿ ಮೀರಿದ:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:738
 msgid "by"
 msgstr "ಯಲ�ಲಿ"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
 msgid "View _Unformatted"
 msgstr "ಅನ�‌ಫಾರ�ಮಾಟ� ಆದ�ದನ�ನ� ನೋಡ� (_U)"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:950
 msgid "Hide _Unformatted"
 msgstr "ಅನ�‌ಫಾರ�ಮಾಟ� ಆದ�ದನ�ನ� ಅಡಗಿಸ�(_U)"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1012
 msgid "O_pen With"
 msgstr "ಇದರೊಂದಿಗೆ ತೆರೆ(_p)"
 
@@ -11043,48 +10719,48 @@ msgstr "ಇದರೊಂದಿಗೆ ತೆರೆ(_p)"
 msgid "Page %d of %d"
 msgstr "ಪ�ಟ %d, (%d ರಲ�ಲಿ)"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:147
 msgid "Formatting message"
 msgstr "ಸಂದೇಶವನ�ನ� ಫಾರ�ಮ�ಯಾಟ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:338
 msgid "Formatting Message..."
 msgstr "ಸಂದೇಶವನ�ನ� ಫಾರ�ಮ�ಯಾಟ� ಮಾಡಲಾಗ�ತ�ತಿದೆ..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "`%s' ಅನ�ನ� ಮರಳಿ ಪಡೆಯಲಾಗ�ತ�ತಿದೆ"
+msgid "Retrieving '%s'"
+msgstr "'%s' ಅನ�ನ� ಮರಳಿ ಪಡೆಯಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/em-format-html.c:1859
+#: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
 msgstr "ಅಜ�ಞಾತ ಬಾಹ�ಯ-ಮ�ಖ�ಯ ಭಾಗ."
 
-#: ../mail/em-format-html.c:1867
+#: ../mail/em-format-html.c:1862
 msgid "Malformed external-body part."
 msgstr "ಸಮರ�ಪಕವಲ�ಲದ ಬಾಹ�ಯ-ಮ�ಖ�ಯ ಭಾಗ."
 
-#: ../mail/em-format-html.c:1897
+#: ../mail/em-format-html.c:1892
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ತಾಣಕ�ಕಾಗಿನ (%s) ಸೂಚಕ"
 
-#: ../mail/em-format-html.c:1908
+#: ../mail/em-format-html.c:1903
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ಸ�ಥಳೀಯ ಕಡತಕ�ಕಾಗಿನ (%s) ಸೂಚಕವ� ತಾಣ \"%s\" ದಲ�ಲಿ ಮಾನ�ಯವಾಗಿದೆ"
 
-#: ../mail/em-format-html.c:1910
+#: ../mail/em-format-html.c:1905
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ಸ�ಥಳೀಯ ಕಡತಕ�ಕಾಗಿನ (%s) ಸೂಚಕ"
 
-#: ../mail/em-format-html.c:1931
+#: ../mail/em-format-html.c:1926
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ದೂರಸ�ಥ ದತ�ತಾಂಶಕ�ಕಾಗಿನ (%s) ಸೂಚಕ"
 
-#: ../mail/em-format-html.c:1942
+#: ../mail/em-format-html.c:1937
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ಗೊತ�ತಿರದ ಬಾಹ�ಯ ದತ�ತಾಂಶಕ�ಕಾಗಿನ ಸೂಚಕ (\"%s\" ಬಗೆ)"
@@ -11092,38 +10768,48 @@ msgstr "ಗೊತà³�ತಿರದ ಬಾಹà³�ಯ ದತà³�ತಾಂಶಕà³�ಕà
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:2602
+#: ../mail/em-format-html.c:2598
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "ಈ ಸಂದೇಶವನ�ನ� <b>%s</b> ಇಂದ <b>%s</b> ಪರವಾಗಿ ಕಳ�ಹಿಸಲಾಗಿದೆ"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "ಈ ಶೇಖರಣೆಯ� ಚಂದಾದಾರಿಕೆಗಳನ�ನ� ಬೆಂಬಲಿಸ�ವ�ದಿಲ�ಲ, ಅಥವ ಅವ� ಶಕ�ತಗೊಂಡಿಲ�ಲ."
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "ಚಂದಾದಾರಗೊಳಿಸಲಾಗಿದೆ"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "ಫೋಲ�ಡರ�"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:837
 msgid "Please select a server."
 msgstr "ದಯವಿಟ�ಟ� ಒಂದ� ಪರಿಚಾರಕವನ�ನ� ಆರಿಸಿ."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "ಯಾವ�ದೆ ಪರಿಚಾರಕವನ�ನ� ಆರಿಸಲಾಗಿಲ�ಲ"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, fuzzy, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "{0} ಸಂದೇಶಗಳನ�ನ� ಒಂದೇ ಬಾರಿಗೆ ತೆಗೆಯಲ� ನೀವ� ಖಾತ�ರಿಯೆ?"
+msgstr[1] "{0} ಸಂದೇಶಗಳನ�ನ� ಒಂದೇ ಬಾರಿಗೆ ತೆಗೆಯಲ� ನೀವ� ಖಾತ�ರಿಯೆ?"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "ಸಂದೇಶ ಫಿಲ�ಟರ�ಗಳ�"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:852
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ಇಂದ ಬಂದ ಸಂದೇಶ"
@@ -11132,9 +10818,10 @@ msgstr "%s ಇಂದ ಬಂದ ಸಂದೇಶ"
 msgid "Search _Folders"
 msgstr "ಹ�ಡ�ಕ� ಫೋಲ�ಡರ�ಗಳ�(_F)"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:521
+#, fuzzy
 msgid "Add Folder"
-msgstr "ಕಡತಕೋಶವನ�ನ� ಸೇರಿಸ�"
+msgstr "ಫೋಲ�ಡರ�"
 
 #: ../mail/evolution-mail.schemas.in.h:1
 #, fuzzy
@@ -11179,50 +10866,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "\"ಮೈಲನ�ನ� ಕಳ�ಹಿಸ� ಹಾಗ� ಸ�ವೀಕರಿಸ�\" ವಿಂಡೋದ ಅಗಲ"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "ನಿಯಮಿತ ಗಾತ�ರದ ಪಠ�ಯದ ಭಾಗವನ�ನ� ತೋರಿಸಲ� Evolutionಗೆ ಅನ�ಮತಿಸ�"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "ಯಾವಾಗಲೂ 'ಓದಲಾಗಿದೆ' ರಸೀತಿಗಾಗಿ ಮನವಿ ಮಾಡ�"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "ಸ�ವಯಂಚಾಲಿತ ಎಮೋಟಿಕಾನ� ಗ�ರ�ತಿಸ�ವಿಕೆ"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "ಸ�ವಯಂಚಾಲಿತ ಕೊಂಡಿ ಗ�ರ�ತಿಸ�ವಿಕೆ"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "ಒಳಬರ�ವ ಮೈಲ� ರದ�ದಿ ಆಗಿದೆಯೆ ಎಂದ� ಪರಿಶೀಲಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "ಉಲ�ಲೇಖ ಸ�ಪ�ರಕಾಶದ ಬಣ�ಣ"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "ಉಲ�ಲೇಖ ಸ�ಪ�ರಕಾಶದ ಬಣ�ಣ."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "ರಚನೆಗಾರ ವಿಂಡೋದ ಪೂರ�ವನಿಯೋಜಿತ ಉದ�ದ"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "ರಚನೆಗಾರ ವಿಂಡೋದ ಪೂರ�ವನಿಯೋಜಿತ ಅಗಲ"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "ರಚನಾಕಾರ ಲೋಡ� ಮಾಡಲಾದ/ಲಗತ�ತಿಸಲಾದ ಕೋಶ"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "ಗೆ/CC/BCC ಯಲ�ಲಿ ತೋರಿಸಲಾಗ�ವ ವಿಳಾಸವನ�ನ� ಚಿಕ�ಕದಾಗಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11230,7 +10913,7 @@ msgstr ""
 "ಗೆ/CC/BCC ಯಲ�ಲಿ ತೋರಿಸಲಾಗ�ವ ವಿಳಾಸಗಳನ�ನ� address_count ನಲ�ಲಿ ಸೂಚಿಸಲಾದಂತಹ "
 "ಸಂಖ�ಯೆಗಳಿಗೆ ಸಂಕ�ಚನಗೊಳಿಸ�ತ�ತದೆ."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11238,11 +10921,11 @@ msgstr ""
 "ಸ�ಥಳೀಯ ಬದಲಾವಣೆಗಳನ�ನ� ದೂರಸ�ಥ ಮೈಲ�‌ ಪರಿಚಾರಕದೊಂದಿಗೆ ಎಷ�ಟ� ಬಾರಿ(ಪ�ನರಾವರ�ತಿತ) ಮೇಳೈಸಬೇಕ� "
 "ಎಂಬ�ದನ�ನ� ನಿಯಂತ�ರಿಸ�ತ�ತದೆ. ಅವಧಿಯ� ಕನಿಷ�ಟ ೩೦ ನಿಮಷವಾಗಿರಬೇಕ�."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "ರದ�ದಿ ಅನ�ನ� ಪರಿಶೀಲಿಸ�ವಾಗ ಪರಿಶಿಲಿಸಬೇಕಿರ�ವ ಬಳಸಬೇಕಿರ�ವ ಕಸ�ಟಮ� ಹೆಡರ�."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11250,66 +10933,66 @@ msgstr ""
 "ರದ�ದಿಗಾಗಿ ಪರಿಶೀಲಿಸಲ� ಬಳಸಬೇಕಿರ�ವ ಇಚ�ಛೆಯ ಹೆಡರ�ಗಳ�. ಈ ಪಟ�ಟಿ ಅಂಶಗಳ� ವಾಕ�ಯಗಳಾಗಿದ�ದ� "
 "\"headername=value\" ನಮೂನೆಯಲ�ಲಿರ�ತ�ತದೆ."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "ಸಂದೇಶಗಳನ�ನ� ರಚಿಸಲ� ಬಳಸಬೇಕಿರ�ವ ಪೂರ�ವನಿಯೋಜಿತ ಕ�ಯಾರ�ಸೆಟ�"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "ಸಂದೇಶಗಳನ�ನ� ರಚಿಸಲ� ಬಳಸಬೇಕಿರ�ವ ಪೂರ�ವನಿಯೋಜಿತ ಕ�ಯಾರ�ಸೆಟ�."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "ಸಂದೇಶಗಳನ�ನ� ತೋರಿಸಲ� ಬಳಸಬೇಕಿರ�ವ ಪೂರ�ವನಿಯೋಜಿತ ಕ�ಯಾರ�ಸೆಟ�"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "ಸಂದೇಶಗಳನ�ನ� ತೋರಿಸಲ� ಬಳಸಬೇಕಿರ�ವ ಪೂರ�ವನಿಯೋಜಿತ ಕ�ಯಾರ�ಸೆಟ�."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಫಾರ�ವಾರ�ಡ ಶೈಲಿ"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "ರಚನೆಗಾರ ವಿಂಡೋದ ಪೂರ�ವನಿಯೋಜಿತ ಉದ�ದ."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 #, fuzzy
 msgid "Default height of the mail browser window."
 msgstr "ರಚನೆಗಾರ ವಿಂಡೋದ ಪೂರ�ವನಿಯೋಜಿತ ಉದ�ದ."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "ಚಂದಾದಾರಿಕೆ ಸಂವಾದದ ಪೂರ�ವನಿಯೋಜಿತ ಉದ�ದ."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 #, fuzzy
 msgid "Default maximized state of the mail browser window."
 msgstr "ರಚನೆಗಾರ ವಿಂಡೋದ ಪೂರ�ವನಿಯೋಜಿತ ಅಗಲ."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಪ�ರತ�ಯ�ತ�ತರ ಶೈಲಿ"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "ತ�ರೆಡ� ವಿಸ�ತರಿಸಲಾದ ಸ�ಥಿತಿಯ ಪೂರ�ವನಿಯೋಜಿತ ಮೌಲ�ಯ"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "ರಚನೆಗಾರ ವಿಂಡೋದ ಪೂರ�ವನಿಯೋಜಿತ ಅಗಲ."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 #, fuzzy
 msgid "Default width of the mail browser window."
 msgstr "ರಚನೆಗಾರ ವಿಂಡೋದ ಪೂರ�ವನಿಯೋಜಿತ ಅಗಲ."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "ಚಂದಾದಾರಿಕೆ ಸಂವಾದದ ಪೂರ�ವನಿಯೋಜಿತ ಅಗಲ."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11317,11 +11000,11 @@ msgstr ""
 "ರದ�ದಿ ಶೋಧನೆಗಾಗಿ ಕೇವಲ ಸ�ಥಳೀಯ ವಿಳಾಸ ಪ�ಸ�ತಕದಲ�ಲಿ ಮಾತ�ರ ವಿಳಾಸಕ�ಕಾಗಿ ನೋಡಬೇಕೆ ಎಂದೆ "
 "ನಿರ�ಧರಿಸ�ತ�ತದೆ"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "ಕಳ�ಹಿಸಿದವರ ಇಮೈಲ�‌ಗಾಗಿ ವಿಳಾಸ ಪ�ಸ�ತಕದಲ�ಲಿ ನೋಡಬೇಕೆ ಎಂದೆ ನಿರ�ಧರಿಸ�ತ�ತದೆ"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11333,11 +11016,11 @@ msgstr ""
 "ಹಾಕಲಾದ ಪ�ಸ�ತಕಗಳಲ�ಲಿ ಹ�ಡ�ಕ�ತ�ತದೆ. ಎಲ�ಲಿಯಾದರೂ ದೂರಸ�ಥ ವಿಳಾಸ ಪ�ಸ�ತಕಗಳನ�ನ� (LDAP ನಂತಹ) "
 "ಸ�ವಯಂಪೂರ�ಣಗೊಳಿಕೆಗಾಗಿ ಗ�ರ�ತ� ಹಾಕಲಾಗಿದ�ದರೆ, ಈ ಕಾರ�ಯಕ�ಕೆ ಒಂದಿಷ�ಟ� ಸಮಯ ಹಿಡಿಯಬಹ�ದ�."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "ರದ�ದಿಗಾಗಿ ಪರಿಶೀಲಿಸಲ� ಇಚ�ಛೆಯ ಹೆಡರ�ಗಳನ�ನ� ಬಳಸಬೇಕೆ ಎಂದ� ನಿರ�ಧರಿಸ�ತ�ತದೆ"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11347,7 +11030,7 @@ msgstr ""
 "ಶಕ�ತಗೊಳಿಸಲಾಗಿದ�ದರೆ ಹಾಗ� ಹೆಡರ�ಗಳನ�ನ� ಶಕ�ತಗೊಳಿಸಲಾಗಿದ�ದರೆ, ಇದ� ರದ�ದಿ ಪರಿಶೀಲನಾ ವೇಗವನ�ನ� "
 "ಹೆಚ�ಚಿಸ�ತ�ತದೆ."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11355,20 +11038,24 @@ msgstr ""
 "\"ಸಂದೇಶಗಳ�\" ಲಂಬಸಾಲಿನ ಲಂಬ ನೋಟದಲ�ಲಿನ \"ಇಂದ\" ಹಾಗ� \"ವಿಷಯ\" ಸಾಲ�ಗಳಲ�ಲಿ ಒಂದೇ ಬಗೆಯ "
 "ಅಕ�ಷರಶೈಲಿಯನ�ನ� ಬಳಸಬೇಕೆ ಎಂದ� ನಿರ�ಧರಿಸ�ತ�ತದೆ."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "ರಚನಾಕಾರನಿಗೆ ಲೋಡ� ಮಾಡಬೇಕಿರ�ವ/ಲಗತ�ತಿಸಬೇಕಿರ�ವ ಕಡತಗಳನ�ನ� ಹೊಂದಿರ�ವ ಕೋಶ."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "ಮೈಲ� ಘಟಕಗಳ ಕಡತಗಳನ�ನ� ಉಳಿಸಲ� ಇರ�ವ ಕೋಶ."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "ಬದಿಯ ಪಟ�ಟಿಯಲ�ಲಿ ಕಡತಕೋಶದ ಹೆಸರ�ಗಳನ�ನ� ದೀರ�ಘವೃತ�ತವಾಗಿಸ�ವಿಕೆಯನ�ನ� ಅಶಕ�ತಗೊಳಿಸ� ಅಥವ "
 "ಶಕ�ತಗೊಳಿಸ�"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+
 #: ../mail/evolution-mail.schemas.in.h:49
 #, fuzzy
 msgid "Do not add signature delimiter"
@@ -11444,14 +11131,16 @@ msgstr ""
 "ಶಕ�ತಗೊಳಿಸ�."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "ನಿರ�ದಿಷ�ಟ ಗಾತ�ರದ ಸಂದೇಶ ಪಠ�ಯದ ಭಾಗವನ�ನ� ರೆಂಡರ� ಮಾಡ�ವಂತೆ ಶಕ�ತಗೊಳಿಸ�."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "ಕ�ಯಾರಟ� ಕ�ರಮವನ�ನ� ಶಕ�ತಗೊಳಿಸ�/ಅಶಕ�ತಗೊಳಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:46
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "ಕಡತದ ಹೆಸರ�ಗಳನ�ನ� Outlook/GMail ರೀತಿಯಲ�ಲಿ ಎನ�‌ಕೋಡ� ಮಾಡ�"
 
@@ -11602,11 +11291,11 @@ msgstr ""
 "ಅಶಕ�ತಗೊಳಿಸ�ತ�ತದೆ."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
 msgstr "ಕಡೆಯ ಬಾರಿಗೆ ರದ�ದಿ ಅನ�ನ� ಖಾಲಿ ಮಾಡಿದ�ದ�"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
 msgstr "ಕಡೆಯ ಬಾರಿಗೆ ಕಸದಬ�ಟ�ಟಿಯನ�ನ� ಖಾಲಿ ಮಾಡಿದ�ದ�"
 
 #: ../mail/evolution-mail.schemas.in.h:85
@@ -11718,58 +11407,62 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "ಸಂದೇಶ \"ಮ�ನ�ನೋಟ\"ದಲ�ಲಿನ ಉಲ�ಲೇಖಗಳನ�ನ� ಗ�ರ�ತ�ಹಾಕ�."
 
 #: ../mail/evolution-mail.schemas.in.h:109
+msgid "Message text limit for display"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "ಸಂದೇಶ-ತೋರಿಸ�ವ ಶೈಲಿ (\"ಸಾಮಾನ�ಯ\", \"ಸಂಪೂರ�ಣ ಹೆಡರ�ಗಳ�\", \"ಆಕರ\")"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ನಿರ�ಗಮಿಸಿದ ನಂತರ ರದ�ದಿ ಅನ�ನ� ಖಾಲಿ ಮಾಡ�ವ ನಡ�ವಿನ ಕನಿಷ�ಟ ದಿನಗಳ�"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ನಿರ�ಗಮಿಸಿದ ನಂತರ ಕಸದಬ�ಟ�ಟಿಯನ�ನ� ಖಾಲಿ ಮಾಡ�ವ ನಡ�ವಿನ ಕನಿಷ�ಟ ದಿನಗಳ�"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "ನಿರ�ಗಮಿಸಿದ ನಂತರ ರದ�ದಿ ಅನ�ನ� ಖಾಲಿ ಮಾಡ�ವ ನಡ�ವಿನ ಕನಿಷ�ಟ ಸಮಯ, ದಿನಗಳಲ�ಲಿ."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ನಿರ�ಗಮಿಸಿದ ನಂತರ ಕಸದಬ�ಟ�ಟಿಯನ�ನ� ಖಾಲಿ ಮಾಡ�ವ ನಡ�ವಿನ ಕನಿಷ�ಟ ಸಮಯ, ದಿನಗಳಲ�ಲಿ."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "TO/CC/BCC ನಲ�ಲಿ ತೋರಿಸಬೇಕಿರ�ವ ವಿಳಾಸಗಳ ಸಂಖ�ಯೆ"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "ವಿಷಯ ಖಾಲಿ ಇದ�ದಲ�ಲಿ ತಿಳಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ಬಳಕೆದಾರರ� ಒಂದ� ಕಡತಕೋಶವನ�ನ� ತೆಗೆದ� ಹಾಕಲ� ಪ�ರಯತ�ನಿಸಿದಾಗ ತಿಳಿಸ�."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ಬಳಕೆದಾರರ� ಒಂದ� ವಿಷಯವನ�ನ� ನಮೂದಿಸದೆ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸಲ� ಪ�ರಯತ�ನಿಸಿದಾಗ ತಿಳಿಸ�."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "ಹ�ಡ�ಕ� ಕಡತಕೋಶದಲ�ಲಿನ ಸಂದೇಶಗಳನ�ನ� ಅಳಿಸಿದಾಗ ತಿಳಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "ಬಳಕೆದಾರರ� ತೆಗೆದ� ಹಾಕಿದಲ�ಲಿ ತಿಳಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "ಬಳಕೆದಾರರ� ಕೇವಲ Bcc ಅನ�ನ� ಮಾತ�ರ ನಮೂದಿಸಿದರೆ ತಿಳಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ಬಳಕೆದಾರರ� ಒಂದೇ ಬಾರಿಗೆ 10 ಅಥವ ಹೆಚ�ಚಿನ ಸಂದೇಶಗಳನ�ನ� ತೆರೆಯಲ� ಪ�ರಯತ�ನಿಸಿದಾಗ ತಿಳಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11777,133 +11470,133 @@ msgstr ""
 "ಬಳಕೆದಾರನ� HTML ಮೈಲನ�ನ� ಪಡೆಯಲ� ಬಯಸದೆ ಇರ�ವವರಿಗೆ HTML ಮೈಲನ�ನ� ಕಳ�ಹಿಸಲ� "
 "ಪ�ರಯತ�ನಿಸಿದಾಗ ತಿಳಿಸ�."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "ಒಬ�ಬ ಬಳಕೆದಾರನ� 'ಗೆ' ಅಥವ 'Cc' ಸ�ವೀಕರಿಸ�ವವರ ಪಟ�ಟಿ ಇಲ�ಲದೆ ಒಂದ� ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸಲ� "
 "ಪ�ರಯತ�ನಿಸಿದಾಗ ತಿಳಿಸ�."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ಬಳಕೆದಾರರ� ಅಗತ�ಯವಿರದ HTML ಅನ�ನ� ಕಳ�ಹಿಸಲ� ಪ�ರಯತ�ನಿಸಿದಾಗ ನನಗೆ ತಿಳಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "ಅನೇಕ ಸಂದೇಶಗಳನ�ನ� ಗ�ರ�ತ� ಹಾಕ�ವಾಗ ನನ�ನನ�ನ� ಕೇಳ�"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr "ಪ�ರತ�ಯ�ತ�ತರಗಳ ಮೇಲ�ಭಾಗದಲ�ಲಿ ವೈಯಕ�ತಿಕ ಸಹಿಯನ�ನ� ಹಾಕ�"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "ಪ�ರತ�ಯ�ತ�ತರಗ ಕೆಳಭಾಗದಲ�ಲಿ ತೆರೆಸೂಚಕವನ�ನ� ಇರಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "ಪಠ�ಯದಲ�ಲಿನ ಎಮೋಟಿಕಾನ�‌ಗಳನ�ನ� ಪತ�ತೆಹಚ�ಚ� ಹಾಗ� ಅವನ�ನ� ಚಿತ�ರದಿಂದ ಬದಲಾಯಿಸ�."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "ಕೊಂಡಿಗಳ� ಹಾಗ� ಪಠ�ಯವನ�ನ� ಗ�ರ�ತಿಸ� ಹಾಗ� ಅವನ�ನ� ಬದಲಾಯಿಸ�."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "ಒಳಬರ�ವ ಮೈಲ�‌ಗಳಿಗೆ ರದ�ದಿ ಪರೀಕ�ಷೆಯನ�ನ� ಮಾಡ�."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "ಉಳಿಸ�ವ ಕೋಶ"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "ಸ�ಥಳೀಯ ವಿಳಾಸ ಪ�ಸ�ತಕಗಳಲ�ಲಿ ಕಳ�ಹಿಸಿದವರ ಭಾವಚಿತ�ರಕ�ಕಾಗಿ ಹ�ಡ�ಕ�"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಆಗಿ HTML ಮೈಲನ�ನ� ಕಳ�ಹಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಆಗಿ HTML ಮೈಲನ�ನ� ಕಳ�ಹಿಸ�."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "ಸಂದೇಶ ಪಟ�ಟಿಯಲ�ಲಿ ಕಳ�ಹಿಸಿದವರ ಇಮೈಲ� ವಿಳಾಸವನ�ನ� ತೋರಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "ಪರಿಚಾರಕ ಹೊಂದಿಸ�ವ ಕಾಲಾವಧಿ"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "ಒಂದ� ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ \"Bcc\" ಸ�ಥಳವನ�ನ� ತೋರಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "ಒಂದ� ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ \"Cc\" ಸ�ಥಳವನ�ನ� ತೋರಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "ಒಂದ� ಸ�ದ�ದಿಸಮೂಹಕ�ಕೆ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ \"ಇಂದ\" ಸ�ಥಳವನ�ನ� ತೋರಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"From\" field when sending a mail message"
 msgstr "ಒಂದ� ಮೈಲ� ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ \"ಇಂದ\" ಸ�ಥಳವನ�ನ� ತೋರಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "ಒಂದ� ಸ�ದ�ದಿಸಮೂಹಕ�ಕೆ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ \"ಇಲ�ಲಿಗೆ ಉತ�ತರಿಸ�\" ಸ�ಥಳವನ�ನ� ತೋರಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "ಒಂದ� ಮೈಲ� ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ \"ಇಲ�ಲಿಗೆ ಉತ�ತರಿಸ�\" ಸ�ಥಳವನ�ನ� ತೋರಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "ಸಜೀವನಗಳನ�ನ�(ಎನಿಮೇಶನ�‌) ತೋರಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 #, fuzzy
 msgid "Show all message headers"
 msgstr "ಎಲ�ಲಾ ಸಂದೇಶ ತ�ರೆಡ�‌ಗಳನ�ನ� ಅಡಗಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 #, fuzzy
 msgid "Show all the headers when viewing a messages."
 msgstr "ಒಂದ� ಮೈಲ� ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ \"ಇಲ�ಲಿಗೆ ಉತ�ತರಿಸ�\" ಸ�ಥಳವನ�ನ� ತೋರಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "ಸಜೀವನ(ಎನಿಮೇಶನ�‌)ಗಳಲ�ಲಿ ಸಜೀವ ಚಿತ�ರಗಳನ�ನ� ತೋರಿಸ�."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "ಸಂದೇಶ-ಪಟ�ಟಿಯಲ�ಲಿ ಅಳಿಸಲಾದ ಸಂದೇಶಗಳನ�ನ� (ಹೊಡೆದ� ಹಾಕಲಾದಂತೆ) ತೋರಿಸ�."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr "ಸಂದೇಶ-ಪಟ�ಟಿಯಲ�ಲಿ ಅಳಿಸಲಾದ ಸಂದೇಶಗಳನ�ನ� ತೋರಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show image animations"
 msgstr "ಚಿತ�ರ ಸಜೀವನಗಳನ�ನ�(ಎನಿಮೇಶನ�) ತೋರಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show original \"Date\" header value."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "ಕಳ�ಹಿಸಿದರ ಭಾವಚಿತ�ರವನ�ನ� ತೋರಿಸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11911,7 +11604,7 @@ msgstr ""
 "ಒಂದ� ಮೈಲ� ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ \"Bcc\" ಸ�ಥಳವನ�ನ� ತೋರಿಸ�. ಒಂದ� ಮೈಲ� ಖಾತೆಯನ�ನ� "
 "ಆರಿಸಿದಾಗ ನೋಟ ಮೆನ�ವಿನಿಂದ ಇದನ�ನ� ನಿಯಂತ�ರಿಸಬಹ�ದಾಗಿದೆ."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11919,7 +11612,7 @@ msgstr ""
 "ಒಂದ� ಮೈಲ� ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ \"Cc\" ಸ�ಥಳವನ�ನ� ತೋರಿಸ�. ಒಂದ� ಮೈಲ� ಖಾತೆಯನ�ನ� "
 "ಆರಿಸಿದಾಗ ನೋಟ ಮೆನ�ವಿನಿಂದ ಇದನ�ನ� ನಿಯಂತ�ರಿಸಬಹ�ದಾಗಿದೆ."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11927,7 +11620,7 @@ msgstr ""
 "ಒಂದ� ಸ�ದ�ದಿಸಮೂಹಕ�ಕೆ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ \"ಇಂದ\" ಸ�ಥಳವನ�ನ� ತೋರಿಸ�. ಒಂದ� ಸ�ದ�ದಿಗಳ "
 "ಖಾತೆಯನ�ನ� ಆರಿಸಿದಾಗ ನೋಟ ಮೆನ�ವಿನಿಂದ ಇದನ�ನ� ನಿಯಂತ�ರಿಸಬಹ�ದಾಗಿದೆ."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11935,7 +11628,7 @@ msgstr ""
 "ಒಂದ� ಮೈಲ� ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ \"ಇಂದ\" ಸ�ಥಳವನ�ನ� ತೋರಿಸ�. ಒಂದ� ಮೈಲ� ಖಾತೆಯನ�ನ� "
 "ಆರಿಸಿದಾಗ ನೋಟ ಮೆನ�ವಿನಿಂದ ಇದನ�ನ� ನಿಯಂತ�ರಿಸಬಹ�ದಾಗಿದೆ."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11943,7 +11636,7 @@ msgstr ""
 "ಒಂದ� ಸ�ದ�ದಿಸಮೂಹಕ�ಕೆ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ \"ಇಲ�ಲಿಗೆ ಉತ�ತರಿಸ�\" ಸ�ಥಳವನ�ನ� ತೋರಿಸ�. "
 "ಒಂದ� ಸ�ದ�ದಿಗಳ ಖಾತೆಯನ�ನ� ಆರಿಸಿದಾಗ ನೋಟ ಮೆನ�ವಿನಿಂದ ಇದನ�ನ� ನಿಯಂತ�ರಿಸಬಹ�ದಾಗಿದೆ."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11951,61 +11644,59 @@ msgstr ""
 "ಒಂದ� ಮೈಲ� ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ \"ಇಲ�ಲಿಗೆ ಉತ�ತರಿಸ�\" ಸ�ಥಳವನ�ನ� ತೋರಿಸ�. ಒಂದ� ಮೈಲ� "
 "ಖಾತೆಯನ�ನ� ಆರಿಸಿದಾಗ ನೋಟ ಮೆನ�ವಿನಿಂದ ಇದನ�ನ� ನಿಯಂತ�ರಿಸಬಹ�ದಾಗಿದೆ."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "ಸಂದೇಶ ಪಟ�ಟಿಯಲ�ಲಿ ಒಂದ� ಪ�ರತ�ಯೇಕ ಕಾಲಂನಲ�ಲಿ ಕಳ�ಹಿಸಿದವರ ಇಮೈಲ� ವಿಳಾಸಗಳನ�ನ� ತೋರಿಸ�."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "ಸಂದೇಶ ಓದ�ವ ಫಲಕದಲ�ಲಿ ಕಳ�ಹಿಸಿದವರ ಭಾವಚಿತ�ರವನ�ನ� ತೋರಿಸ�."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "ಸಾಲಿನಲ�ಲಿನ ಕಾಗ�ಣಿತ ಪರೀಕ�ಷೆ"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "ಕಾಗ�ಣಿತ ಪರೀಕ�ಷೆಯ ಬಣ�ಣ"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "ಕಾಗ�ಣಿತ ಪರೀಕ�ಷೆಯ ಭಾಷೆ"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "ಚಂದಾದಾರ ಸಂವಾದದ ಪೂರ�ವನಿಯೋಜಿತ ಉದ�ದ"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "ಚಂದಾದಾರ ಸಂವಾದದ ಪೂರ�ವನಿಯೋಜಿತ ಅಗಲ"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "ಟರ�ಮಿನಲ� ಅಕ�ಷರಶೈಲಿ"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "ಪಠ�ಯ ಸಂದೇಶದ ಭಾಗದ ಮಿತಿ"
-
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "ರದ�ದಿ ಹ�ಕ�‌ಗಾಗಿನ ಪೂರ�ವನಿಯೋಜಿತ ಪ�ಲಗ�ಇನ�"
 
 #: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
+#, fuzzy
+msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ರದ�ದಿ ಅನ�ನ� ಕಡೆಯ ಬಾರಿಗೆ ಖಾಲಿ ಮಾಡಲಾಗಿದ�ದ�, ಪ�ರಥಮ ಬಾರಿಗೆ ಆರಂಭಗೊಂಡ ನಂತರ."
 
 #: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
+#, fuzzy
+msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ಕಸದಬ�ಟ�ಟಿಯನ�ನ� ಕಡೆಯ ಬಾರಿಗೆ ಖಾಲಿ ಮಾಡಲಾಗಿದ�ದ�, ಪ�ರಥಮ ಬಾರಿಗೆ ಆರಂಭಗೊಂಡ ನಂತರ."
 
 #: ../mail/evolution-mail.schemas.in.h:172
@@ -12033,9 +11724,11 @@ msgstr ""
 "ದೋಷನಿವಾರಣಾ ಸಂದೇಶಗಳಿಗಾಗಿ \"2\" ಆಗಿರ�ತ�ತದೆ."
 
 #: ../mail/evolution-mail.schemas.in.h:176
+#, fuzzy
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
 "Evolution ಅಡಿಯಲ�ಲಿ ಫಾರ�ಮಾಟ� ಮಾಡಬಹ�ದಾದ ಪಠ�ಯದ ಭಾಗದ ಗರಿಷ�ಟ ಗಾತ�ರವನ�ನ� ಇದ� "
 "ನಿರ�ಧರಿಸ�ತ�ತದೆ. ಪೂರ�ವನಿಯೋಜಿತವ� 4MB / 4096 KB ಆಗಿದೆ ಹಾಗ� ಇದನ�ನ� KB ಯಲ�ಲಿ "
@@ -12208,357 +11901,378 @@ msgstr "ಸಂದೇಶ-ಪಟ�ಟಿ ಫಲಕದ ಅಗಲ"
 msgid "Width of the message-list pane."
 msgstr "ಸಂದೇಶ-ಪಟ�ಟಿ ಫಲಕದ ಅಗಲ."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Elm ಮಾಹಿತಿಯನ�ನ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "ಮೈಲ�"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:365
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm ಆಮದ�ಗಾರ"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:366
 msgid "Import mail from Elm."
 msgstr "Elm ನಿಂದ ಮೈಲ� ಅನ�ನ� ಆಮದ� ಮಾಡಿಕೊ."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
+#: ../mail/importers/evolution-mbox-importer.c:114
+#, fuzzy
+msgid "_Destination folder:"
 msgstr "ನಿರ�ದೇಶಿತ ಫೋಲ�ಡರ�:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder"
 msgstr "ಫೋಲ�ಡರನ�ನ� ಆರಿಸ�"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder to import into"
 msgstr "ಯಾವ ಫೋಲ�ಡರಿಗೆ ಆಮದ� ಮಾಡಬೇಕ� ಎಂದ� ಸೂಚಿಸಿ"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:245
+#: ../mail/importers/evolution-mbox-importer.c:262
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "ಬರ�ಕ�-ಲೇ ಅಂಚೆಪೆಟ�ಟಿಗೆ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:263
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "ಬರ�ಕ�-ಲೇ ಅಂಚೆಪೆಟ�ಟಿಗೆ ವಿನ�ಯಾಸದ ಫೋಲ�ಡರ�ಗಳನ�ನ� ಆಮದ� ಮಾಡಿಕೊ"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "ಅಂಚೆಪೆಟ�ಟಿಗೆಯನ�ನ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳಲಾಗ�ತ�ತಿದೆ"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:148
+#: ../plugins/pst-import/pst-importer.c:453
+#: ../plugins/pst-import/pst-importer.c:559
 #, c-format
-msgid "Importing `%s'"
-msgstr "`%s' ಅನ�ನ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳಲಾಗ�ತ�ತಿದೆ"
+msgid "Importing '%s'"
+msgstr "'%s' ಅನ�ನ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:291
 #, c-format
 msgid "Scanning %s"
 msgstr "%s ಅನ�ನ� ಶೋಧಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "ಪೈನ� ಮಾಹಿತಿಯನ�ನ� ಆಮದ� ಮಾಡಿಕೊ"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕ"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:418
 msgid "Evolution Pine importer"
 msgstr "Evolution ಪೈನ� ಆಮದ�ಗಾರ"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:419
 msgid "Import mail from Pine."
 msgstr "ಪೈನ�‌ನಿಂದ ಮೈಲನ�ನ� ಆಮದ� ಮಾಡಿಕೊ."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "%s ಗೆ ಕಳ�ಹಿಸಲಾದ ಮೈಲ�"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "%s ನಿಂದ ಬಂದ ಮೈಲ�"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "ವಿಷಯವ� %s ಆಗಿದೆ"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s ಮೈಲಿಂಗ� ಲಿಸ�ತ��"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "ಫಿಲ�ಟರ� ನಿಯಮವನ�ನ� ಸೇರಿಸ�"
 
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(ಸೂಚನೆ: ಅನ�ವಯವ� ಆರಂಭಗೊಳ�ಳ�ವ ಅಗತ�ಯವಿದೆ)"
 
-#: ../mail/mail-config.ui.h:2
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:3
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>ಮೇಲೆ ಹಚ�ಚ�ವ ಆಯ�ಕೆ</b> (ಇದನ�ನ� ಸಲಹೆ ಮಾಡ�ವ�ದಿಲ�ಲ)"
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "ಖಾತೆಯ ಮಾಹಿತಿ"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "ಹೊಸ ಸಹಿಯನ�ನ� ಸೇರಿಸ�(_w)..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "ಈ ಖಾತೆಯನ�ನ� ಬಳಸ�ವಾಗ, ಹೊರಹೋಗ�ವ ಸಂದೇಶಗಳನ�ನ� ಸಹಿ ಮಾಡ�(_w)"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಸಂದೇಶಗಳನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ ಸ�ವಂತಕ�ಕೂ ಸಹ ಗೂಢಲಿಪೀಕರಿಸ�(_f)"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ಯಾವಾಗಲೂ ಇದಕ�ಕೆ ಕಾರ�ಬನ� ಕಾಪಿ (cc)ಮಾಡ�(_s):"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "ಯಾವಾಗಲೂ ಇದಕ�ಕೆ ಬ�ಲೈಂಡ�‌ ಕಾರ�ಬನ� ಕಾಪಿ(_bcc) ಮಾಡ�:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "ಗೂಢಲಿಪೀಕರಿಸ�ವಾಗ ಕೇವಲ ನನ�ನ ಕೀಲಿ ಸ�ರ�ಳಿಯ ಕೀಲಿಗಳನ�ನ� ನಂಬ�(_t)"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಸಂದೇಶಗಳನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ ನನಗೂ ಸಹ ಗೂಢಲಿಪೀಕರಿಸ�(_f)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "ಯಾವಗಲೂ ಓದಿದ�ದರ ರಸೀತಿಗಾಗಿ ಮನವಿ ಸಲ�ಲಿಸ�(_d)"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "ದೃಢೀಕರಣ"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "ಸ�ವಯಂಚಾಲಿತವಾಗಿ ಎಮೋಟಿಕಾನ� ಚಿತ�ರಗಳನ�ನ� ಸೇರಿಸ�(_e)"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "ಕ�ಯಾರೆಕ�ಟರ� ಸೆಟ�(_h):"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "ಬೆಂಬಲವಿರದ ಬಗೆಗಳಿಗಾಗಿ ಪರೀಕ�ಷಿಸ�(_e)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "ರದ�ದಿ‌ಗಾಗಿ ಕಸ�ಟಮ� ಹೆಡರ�ಗಳನ�ನ� ಪರೀಕ�ಷಿಸ�(_s)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
 msgstr "ಒಳಬರ�ವ ಸಂದೇಶಗಳಲ�ಲಿ ರದ�ದಿ‌ಗಾಗಿ ಪರೀಕ�ಷಿಸ�(_m)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "ನಾನ� ನಮೂದಿಸ�ತ�ತಾ ಹೋದಂತೆಲ�ಲಾ ಅಕ�ಷರಗಳನ�ನ� ಪರಿಶೀಲಿಸ�(_t)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "ಒಳಬರ�ವ ಮೈಲ� ಸಂದೇಶಗಳ� ರದ�ದಿಯೆ ಎಂದ� ಪರೀಕ�ಷಿಸ�"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "ಅಳಿಸ�(_a)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "ಅಳಿಸ�(_r)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "ಕಾಗ�ಣಿತ ತಪ�ಪಾದ ಅಕ�ಷರಗಳ ಬಣ�ಣ(_m):"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "ಸಂದೇಶಗಳನ�ನ� ರಚಿಸ�ವ�ದ�"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "ಸಂರಚನೆ"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "ಒಂದ� ಕಡತಕೋಶವನ�ನ� ತೆಗೆದ� ಹಾಕ�ವಾಗ ಖಚಿತಪಡಿಸ�(_w)"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Default Behavior"
 msgstr "ಪೂರ�ವನಿಯೋಜಿತ ವರ�ತನೆ"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಕ�ಯಾರೆಕ�ಟರ� ಎನ�ಕೋಡಿಂಗ��ಗಳ�(_n):"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Delete Mail"
 msgstr "ಮೈಲನ�ನ� ಅಳಿಸ�"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Delete junk messages on e_xit"
 msgstr "ನಿರ�ಗಮಿಸಿದಾಗ ರದ�ದಿ ಸಂದೇಶಗಳನ�ನ� ಅಳಿಸಿ ಹಾಕ�(_x)"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ಹೊರಹೋಗ�ವ ಸಂದೇಶವನ�ನ� ಡಿಜಿಟಲಿ ಸಹಿ ಮಾಡ� (ಪೂರ�ವನಿಯೋಜಿತ ಆಗಿ)(_u)"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:37
 #, fuzzy
-msgid "Displayed Message _Headers"
+msgid "Displayed Message Headers"
 msgstr "ಎಲ�ಲಾ ಸಂದೇಶ ಹೆಡರ�‌ಗಳ�(_H)"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
+#: ../mail/mail-config.ui.h:38
+#, fuzzy
+msgid "Do not display messages when text si_ze exceeds"
 msgstr "ಪಠ�ಯದ ಗಾತ�ರವ� ಮೀರಿದಾಗ ಸಂದೇಶಗಳನ�ನ� ಫಾರ�ಮಾಟ� ಮಾಡಬೇಡ(_z)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "ಕಳ�ಹಿಸಿದವರ� ನನ�ನ ವಿಳಾಸ ಪ�ಸ�ತಕದಲ�ಲಿ ಇದ�ದಲ�ಲಿ ಸಂದೇಶಗಳನ�ನ� ರದ�ದಿ ಎಂದ� ಗ�ರ�ತ� ಹಾಕಬೇಡ(_k)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not quote"
 msgstr "ಕೋಟ� ಮಾಡಬೇಡ"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "ಡ�ರಾಫ�ಟ�� ಫೋಲ�ಡರ�(_F):"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "ಇಮೈಲ� ವಿಳಾಸ (_A):"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "ನಿರ�ಗಮಿಸಿದ ನಂತರ ಕಸದಬ�ಟ�ಟಿಯನ�ನ� ಖಾಲಿ ಮಾಡ�(_x)"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Magic S_pacebar"
 msgstr "ಮಾಂತ�ರಿಕ ಸ�ಪೇಸ�‌ಬಾರನ�ನ� ಶಕ�ತಗೊಳಿಸ�(_p)"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Sea_rch Folders"
 msgstr "ಹ�ಡ�ಕ� ಫೋಲ�ಡರ�ಗಳನ�ನ� ಶಕ�ತಗೊಳಿಸ�(_r)"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "ಗೂಢಲಿಪೀಕರಣ ಪ�ರಮಾಣಪತ�ರ(_p):"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "ಹೊರ ಹೋಗ�ವ ಸಂದೇಶಗಳನ�ನ� ಗೂಢಲಿಪೀಕರಿಸ�(ಪೂರ�ವನಿಯೋಜಿತ ಆಗಿ)(_g)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fi_xed-width:"
 msgstr "ನಿಗದಿತ-ಅಗಲ(_x):"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Fix_ed width Font:"
 msgstr "ನಿಗದಿತ ಅಗಲದ ಅಕ�ಷರಶೈಲಿ(_e):"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Font Properties"
 msgstr "ಅಕ�ಷರಶೈಲಿಯ ಗ�ಣಲಕ�ಷಣಗಳ�"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Format messages in _HTML"
 msgstr "ಸಂದೇಶಗಳನ�ನ� _HTML ನಲ�ಲಿ ಫಾರ�ಮ�ಯಾಟ� ಮಾಡ�"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "ಸಂಪೂರ�ಣ ಹೆಸರ�(_e):"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "HTML Messages"
 msgstr "HTML ಸಂದೇಶಗಳ�"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ಪ�ರಾಕ�ಸಿ:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Headers"
 msgstr "ಹೆಡರ�‌ಗಳ�"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "Highlight _quotations with"
 msgstr "ಉಲ�ಲೇಖಗಳನ�ನ� ಇದರೊಂದಿಗೆ ಹೈಲೈಟ� ಮಾಡಿ(_q)"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:60
 msgid "Inline"
 msgstr "ಇನ�‌ಲೈನ�"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 msgid "Inline (Outlook style)"
 msgstr "ಇನ�‌ಲೈನ� (ಔಟ�‌ಲ�ಕ� ಶೈಲಿ)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:63
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ಲೇಬಲ�‌ಗಳ�"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "ಭಾಷೆಗಳ ಪಟ�ಟಿ"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "ಚಿತ�ರಗಳನ�ನ� ಲೋಡ� ಮಾಡ�ವ�ದ�"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "ಮೈಲ� ಹೆಡರ�‌ಗಳ ಟೇಬಲ�"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "ಅಂಚೆಪೆಟ�ಟಿಗೆಯ ಸ�ಥಳ"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "ಸಂದೇಶದ ಪ�ರದರ�ಶನ"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 msgid "Message Fonts"
 msgstr "ಸಂದೇಶದ ಅಕ�ಷರಶೈಲಿ"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "Message Receipts"
 msgstr "ಸಂದೇಶ ರಸೀತಿಗಳ�"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "No _Proxy for:"
 msgstr "ಇದಕ�ಕೆ ಯಾವ�ದೆ ಪ�ರಾಕ�ಸಿ ಇಲ�ಲ(_P):"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:74
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12566,172 +12280,172 @@ msgstr ""
 "ಸೂಚನೆ: ನೀವ� ಮೊದಲ ಬಾರಿಗೆ ಸಂಪರ�ಕ ಜೋಡಿಸಿದಾಗ ಮಾತ�ರ ಗ�ಪ�ತಪದವನ�ನ� ನಮೂದಿಸ�ವಂತೆ ನಿಮ�ಮನ�ನ� "
 "ಕೇಳ�ಲಾಗ�ತ�ತದೆ"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:75
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "ಕಸ�ಟಮ� ರದ�ದಿ ಹೆಡರ�ಗಳಿಗಾಗಿ ಒಂದ� ತಾಳೆಯ� ಕಂಡ�ಬಂದಲ�ಲಿ ಈ ಆಯ�ಕೆಯ� ಆಲಕ�ಷಿಸಲ�ಪಡ�ತ�ತದೆ."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:76
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "�ಚ�ಛಿಕ ಮಾಹಿತಿ"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 msgid "Or_ganization:"
 msgstr "ಸಂಸ�ಥೆ(_g):"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:79
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG ಕೀಲಿ ID (_K):"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Pass_word:"
 msgstr "ಗ�ಪ�ತಪದ(_w):"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Port:"
 msgstr "ಸಂಪರ�ಕಸ�ಥಾನ:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ಕೇವಲ Bcc ಸ�ವೀಕರಿಸ�ವವರನ�ನ� ಸೂಚಿಸಿ ಸಂದೇಶಗಳನ�ನ� ಕಳ�ಹಿಸ�ವಾಗ ನನಗೆ ತಿಳಿಸ�(_o)"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "ಪ�ರೆಟಿ ಗ�ಡ� ಪ�ರೈವೆಸಿ (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Printed Fonts"
 msgstr "ಮ�ದ�ರಿಸಲಾದ ಅಕ�ಷರಶೈಲಿಗಳ�"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Proxy Settings"
 msgstr "ಪ�ರಾಕ�ಸಿ ಸಿದ�ಧತೆಗಳ�"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Quoted"
 msgstr "ಕೋಟ�‌ ಮಾಡಲಾದ"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "Re_member password"
 msgstr "ಗ�ಪ�ತಪದವನ�ನ� ನೆನಪಿಟ�ಟ�ಕೊ(_m)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "Re_ply-To:"
 msgstr "ಇಲ�ಲಿಗೆ ಉತ�ತರಿಸ�(_p):"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "Remember _password"
 msgstr "ಗ�ಪ�ತಪದವನ�ನ� ನೆನಪಿಟ�ಟ�ಕೊ(_p)"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "Required Information"
 msgstr "ಅಗತ�ಯ ಮಾಹಿತಿ"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "Evolutionನ ಈ ನಿರ�ಮಾಣದಲ�ಲಿ SSL ಬೆಂಬಲಿತವಾಗಿಲ�ಲ"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ಕಳ�ಹಿಸಿದವರ ಭಾವಚಿತ�ರವನ�ನ� ಕೇವಲ ಸ�ಥಳೀಯ ವಿಳಾಸ ಪ�ಸ�ತಕಗಳಲ�ಲಿ ಮಾತ�ರ ಹ�ಡ�ಕ�(_e)"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "ಆರಿಸ�(_e)..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "ಕಳ�ಹಿಸಲಾದ ಸಂದೇಶದ ರಸೀತಿಗಳ�(_e):"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "ರೂಢಿಗತ ಅಕ�ಷರಶೈಲಿ(_t):"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "ಸ�ರಕ�ಷಿತ MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "Select Drafts Folder"
 msgstr "ಡ�ರಾಫ�ಟ�ಗಳ ಫೋಲ�ಡರನ�ನ� ಆರಿಸಿ"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "HTML ನಿಗದಿತ ಅಗಲದ ಅಕ�ಷರಶೈಲಿಯನ�ನ� ಆರಿಸಿ"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "ಮ�ದ�ರಣಕ�ಕಾಗಿ HTML ನಿಗದಿತ ಅಗಲದ ಅಕ�ಷರಶೈಲಿಯನ�ನ� ಆರಿಸಿ"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font"
 msgstr "HTML ವೇರಿಯೇಬಲ� ಅಗಲ ಅಕ�ಷರಶೈಲಿಯನ�ನ� ಆರಿಸಿ"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "ಮ�ದ�ರಿಸಲ� HTML ವೇರಿಯೇಬಲ� ಅಗಲ ಅಕ�ಷರಶೈಲಿಯನ�ನ� ಆರಿಸಿ"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "Select Sent Folder"
 msgstr "ಕಳ�ಹಿಸ�ವ ಫೋಲ�ಡರನ�ನ� ಆರಿಸಿ"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 msgid "Sender Photograph"
 msgstr "ಕಳ�ಹಿಸಿದವರ ಚಿತ�ರ"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Sending Mail"
 msgstr "ಮೈಲನ�ನ� ಕಳ�ಹಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "ಕಳ�ಹಿಸಲಾದ ಸಂದೇಶಗಳ ಫೋಲ�ಡರ�(_M):"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Sent and Draft Messages"
 msgstr "ಕಳ�ಹಿಸಲಾದ ಹಾಗ� ಡ�ರಾಫ�ಟ�� ಸಂದೇಶಗಳ�"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:112
 msgid "Ser_ver requires authentication"
 msgstr "ಪರಿಚಾರಕಕ�ಕೆ ದೃಢೀಕರಣದ ಅಗತ�ಯವಿದೆ(_v)"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 msgid "Server Configuration"
 msgstr "ಪರಿಚಾರಕ ಸಂರಚನೆ"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:114
 msgid "Server _Type:"
 msgstr "ಪರಿಚಾರಕದ ಬಗೆ(_T):"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_natures"
 msgstr "ಸಹಿಗಳ�(_n)"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "ಸಹಿ ಮಾಡ�ವ ಪ�ರಮಾಣಪತ�ರ(_n):"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "ಸಹಿ(_u):"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "ಸಹಿಗಳ�"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "ಕಾಗ�ಣಿತ ಪರೀಕ�ಷೆ"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "ಪ�ರತ�ಯ�ತ�ತರಿಸ�ವಾಗ ಕೆಳಭಾಗದಲ�ಲಿ ಟೈಪ� ಮಾಡ�ವ�ದನ�ನ� ಆರಂಭಿಸ�(_t)"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "ಬಗೆ(_y):"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12739,7 +12453,7 @@ msgstr ""
 "ಇಲ�ಲಿ ತೋರಿಸಲಾಗ�ವ ಭಾಷೆಗಳ ಪಟ�ಟಿಯ� ನಿಮ�ಮ ಗಣಕದಲ�ಲಿ ಯಾವ ಭಾಷೆಯ ಶಬ�ಧಕೋಶಗಳ� "
 "ಅನ�ಸ�ಥಾಪಿಸಲಾಗಿದೆಯೆ ಅವ�ಗಳನ�ನ� ಮಾತ�ರ ಹೊಂದಿರ�ತ�ತದೆ."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12749,7 +12463,7 @@ msgstr ""
 "ನೀವ� ಸೂಚಿಸ�ವ ಹೆಸರನ�ನ� ಕೇವಲ ತೋರಿಸ�ವ ಉದ�ದೇಶಕ�ಕೆ ಮಾತ�ರವೆ\n"
 "ಬಳಸಲಾಗ�ವ�ದ�. "
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12757,244 +12471,242 @@ msgstr ""
 "ಈ ಖಾತೆಯನ�ನ� ಉಲ�ಲೇಖಿಸಲ� ನೀವ� ಬಯಸ�ವ ಹೆಸರನ�ನ� ನಮೂದಿಸಿ.\n"
 "ಉದಾಹರಣೆಗೆ: \"ಕೆಲಸ\" ಅಥವ \"ಖಾಸಗಿ\""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:129
 msgid "Us_ername:"
 msgstr "ಬಳಕೆದಾರ ಹೆಸರ�(_e):"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:130
 msgid "Use Authe_ntication"
 msgstr "ದೃಢೀಕರಣವನ�ನ� ಬಳಸ�(_n)"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../mail/mail-config.ui.h:131 ../plugins/caldav/caldav-source.c:222
 #: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
+#: ../plugins/google-account-setup/google-source.c:623
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "ಬಳಕೆದಾರ ಹೆಸರ�(_n):"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:132
 msgid "V_ariable-width:"
 msgstr "ಬದಲಾಯಿಸಬಹ�ದಾದ ಅಗಲ(_a):"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "ಸಹಿಯನ�ನ� ಸೇರಿಸ�(_A)"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "ಯಾವಾಗಲೂ ಅಂತರ�ಜಾಲದಿಂದ ಚಿತ�ರಗಳನ�ನ� ಲೋಡ� ಮಾಡ�(_A)"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:135
 msgid "_Authentication Type"
 msgstr "ದೃಢೀಕರಣದ ಬಗೆ(_A)"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:136
 msgid "_Default junk plugin:"
 msgstr "ಪೂರ�ವನಿಯೋಜಿತ ರದ�ದಿ ಪ�ಲಗ�‌ಇನ�(_D):"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:137
 msgid "_Direct connection to the Internet"
 msgstr "ಅಂತರ�ಜಾಲಕ�ಕೆ ನೇರವಾದ ಸಂಪರ�ಕ(_D)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:138
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ಮೀಟಿಂಗ� ಮನವಿಗಳಿಗೆ ಸಹಿ ಮಾಡಬೇಡ (ಔಟ�‌ಲ�ಕ�‌ಗೆ ಹೊಂದಿಕೊಳ�ಳಲ�)(_D)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "ಫಾರ�ವಾರ�ಡ� ಶೈಲಿ(_F):"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:140
 msgid "_Keep Signature above the original message on replying"
 msgstr "ಉತ�ತರಿಸ�ವಾಗ ಮೂಲ ಸಂದೇಶದ ಮೇಲ�ಭಾಗದಲ�ಲಿ ಸಹಿಯನ�ನ� ಇರಿಸ�(_K)"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:141
 msgid "_Languages"
 msgstr "ಭಾಷೆಗಳ�(_L)"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:142
 msgid "_Load images in messages from contacts"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸಗಳಿಂದ ಸಂದೇಶಗಳಲ�ಲಿ ಚಿತ�ರಗಳನ�ನ� ಲೋಡ� ಮಾಡ�(_L)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:143
 msgid "_Lookup in local address book only"
 msgstr "ಸ�ಥಳೀಯ ವಿಳಾಸ ಪ�ಸ�ತಕದಲ�ಲಿ ನೋಡ�(_L)"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:144
 msgid "_Make this my default account"
 msgstr "ಇದನ�ನ� ನನ�ನ ಪೂರ�ವನಿಯೋಜಿತ ಖಾತೆಯಾಗಿ ಮಾಡ�(_M)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:145
 msgid "_Manual proxy configuration:"
 msgstr "ಕೈಯಾರೆ ಮಾಡಲಾದ ಪ�ರಾಕ�ಸಿ ಸಂರಚನೆ(_M):"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:146
 msgid "_Mark messages as read after"
 msgstr "ಓದಿದ ನಂತರ ಸಂದೇಶಗಳನ�ನ� ಗ�ರ�ತ� ಹಾಕ�(_M)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "ಅಂತರ�ಜಾಲದಿಂದ ಎಂದಿಗೂ ಚಿತ�ರಗಳನ�ನ� ಲೋಡ� ಮಾಡಬೇಡ(_N)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "ಪಥ(_P):"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ಮೈಲನ�ನ� ಪಡೆಯಲ� ಬಯಸದ ಸಂಪರ�ಕಗಳಿಗೆ ಅದನ�ನ� ಕಳ�ಹಿಸಿದಾಗ ನನಗೆ ತಿಳಿಸ�(_P)"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:151
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ವಿಷಯದ ಸಾಲನ�ನ� ಸೇರಿಸದೆ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸಲ� ಪ�ರಯತ�ನಿಸಿದಾಗ ನನಗೆ ತಿಳಿಸ�(_P)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:152
 msgid "_Reply style:"
 msgstr "ಪ�ರತ�ಯ�ತ�ತರದ ಶೈಲಿ(_R):"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:153
 msgid "_Script:"
 msgstr "ಸ�ಕ�ರಿಪ�ಟ��(_S):"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:154
 msgid "_Secure HTTP Proxy:"
 msgstr "ಸ�ರಕ�ಷಿತ HTTP ಪ�ರಾಕ�ಸಿ(_S):"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:156 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "ಪರಿಚಾರಕ(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:158
 msgid "_Show image animations"
 msgstr "ಚಿತ�ರ ಎನಿಮೇಶನ� ಅನ�ನ� ತೋರಿಸ�(_S)"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:159
 msgid "_Show the photograph of sender in the message preview"
 msgstr "ಸಂದೇಶದ ಮ�ನ�ನೋಟದಲ�ಲಿ ಕಳ�ಹಿಸಿದವರ ಭಾವಚಿತ�ರವನ�ನ� ತೋರಿಸ�(_S)"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:161
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ಗೆ / Cc / Bcc ಹೆಡರ�‌ಗಳನ�ನ� ಹೀಗೆ ಕ�ಗ�ಗಿಸ�(_S)"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:162
 msgid "_Use Secure Connection:"
 msgstr "ಸ�ರಕ�ಷಿತ ಸಂಪರ�ಕವನ�ನ� ಬಳಸ�(_U):"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:163
 msgid "_Use system defaults"
 msgstr "ಗಣಕದ ಪೂರ�ವನಿಯೋಜಿತ ಅನ�ನ� ಬಳಸ�(_U)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:164
 msgid "_Use the same fonts as other applications"
 msgstr "ಇತರೆ ಅನ�ವಯದಲ�ಲಿ ಬಳಸಲಾದಂತಹ ಅಕ�ಷರಶೈಲಿಗಳನ�ನ� ಬಳಸ�(_U)"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:167
 msgid "addresses"
 msgstr "ವಿಳಾಸಗಳ�"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:169
 msgid "color"
 msgstr "ಬಣ�ಣ"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:170
 msgid "description"
 msgstr "ವಿವರಣೆ"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "ಎಲ�ಲಾ ಸಕ�ರಿಯ ದೂರಸ�ಥ ಫೋಲ�ಡರ�ಗಳ�"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "ಎಲ�ಲಾ ಸ�ಥಳೀಯ ಹಾಗ� ಸಕ�ರಿಯ ದೂರಸ�ಥ ಫೋಲ�ಡರ�ಗಳ�"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "ಎಲ�ಲಾ ಸ�ಥಳೀಯ ಫೋಲ�ಡರ�ಗಳ�"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "ಕರೆ ಮಾಡ�"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "ಪೂರ�ಣಗೊಂಡಿದೆ(_m)"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Digital Signature"
 msgstr "ಡಿಜಿಟಲ� ಸಹಿ"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "ಫಾರ�ವಾರ�ಡ� ಮಾಡಬೇಡ"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "ಗೂಢಲಿಪೀಕರಣ"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Folder Subscriptions"
 msgstr "ಫೋಲ�ಡರ� ಚಂದಾದಾರಿಕೆಗಳ�"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "ಗಮನವಿರಿಸ�"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "ನಿಮ�ಮ ಮಾಹಿತಿಗಾಗಿ"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "ಫಾರ�ವಾರ�ಡ�"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "ಲೈಸೆನ�ಸ�� ಒಡಂಬಡಿಕೆ"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "ಯಾವ�ದೆ ಮಾರ�ತ�ತರದ ಅಗತ�ಯವಿಲ�ಲ"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "ಎಲ�ಲರಿಗೂ ಉತ�ತರಿಸ�"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "ಅವಲೋಕಿಸ�"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:20
 msgid "S_erver:"
 msgstr "ಪರಿಚಾರಕ(_e):"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Search Folder Sources"
 msgstr "ಹ�ಡ�ಕ� ಕಡತಕೋಶದ ಆಕರಗಳ�"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Security Information"
 msgstr "ಸ�ರಕ�ಷತಾ ಮಾಹಿತಿ"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Specific folders"
 msgstr "ನಿಗದಿತ ಫೋಲ�ಡರ�ಗಳ�"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:24
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13002,170 +12714,170 @@ msgstr ""
 "ನೀವ� ಜಾಡ� ಇರಿಸಲ� ಆರಿಸಿದ ಸಂದೇಶಗಳ ಪಟ�ಟಿ ಈ ಕೆಳಗಿನಂತಿದೆ.\n"
 "ದಯವಿಟ�ಟ� \"ಗ�ರ�ತ�\" ಮೆನ�ವಿನಿಂದ ಒಂದ� ಗಮನವಿರಿಸ�ವ ಕಾರ�ಯವನ�ನ� ಆರಿಸಿ."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Accept License"
 msgstr "ಲೈಸೆನ�ಸನ�ನ� ಅಂಗೀಕರಿಸಿ(_A)"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Due By:"
 msgstr "ಕಾಲಾವಧಿ ಅಂತ�ಯ(_D):"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Flag:"
 msgstr "ಗ�ರ�ತ�(_F):"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Tick this to accept the license agreement"
 msgstr "ಲೈಸೆನ�ಸ�� ಒಡಂಬಡಿಕೆಯನ�ನ� ಒಪ�ಪಿಕೊಳ�ಳಲ� ಇದನ�ನ� ಗ�ರ�ತ� ಹಾಕಿ(_T)"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:891
 #, c-format
 msgid "Pinging %s"
 msgstr "%s ಅನ�ನ� ಪಿಂಗ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "ಆಯ�ದ ಸಂದೇಶಗಳನ�ನ� ಫಿಲ�ಟರ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "ಮೈಲನ�ನ� ಪಡೆದ�ಕೊಳ�ಳಲಾಗ�ತ�ತಿದೆ"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:574
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ಹೊರಹೋಗ�ವ ಫೀಲ�ಟರ�ಗಳಿಗೆ ಅನ�ವಯಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:586 ../mail/mail-ops.c:613
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "%s ಗೆ ಸೇರಿಸ�ವಲ�ಲಿ ವಿಫಲತೆ ಉಂಟಾಗಿದೆ: %s\n"
 "ಬದಲಿಗೆ ಸ�ಥಳೀಯ `ಕಳ�ಹಿಸಲಾದ' ಫೋಲ�ಡರಿಗೆ ಸೇರಿಸಲಾಗ�ತ�ತಿದೆ."
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:630
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ಸ�ಥಳೀಯ `ಕಳ�ಹಿಸಲಾದ' ಫೋಲ�ಡರಿಗೆ ಸೇರಿಸ�ವಲ�ಲಿ ವಿಫಲತೆ ಉಂಟಾಗಿದೆ: %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:741 ../mail/mail-ops.c:822
 msgid "Sending message"
 msgstr "ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:751
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d (%d ರಲ�ಲಿ) ಸಂದೇಶಗಳನ�ನ� ಕಳ�ಹಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:778
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d (%d ರಲ�ಲಿ) ಸಂದೇಶಗಳನ�ನ� ಕಳ�ಹಿಸ�ವಲ�ಲಿ ವಿಫಲತೆ ಉಂಟಾಗಿದೆ"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:780 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "ರದ�ದ� ಮಾಡಲಾಗಿದೆ."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:782 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "ಪೂರ�ಣಗೊಂಡಿದೆ."
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:894
 #, fuzzy, c-format
 msgid "Saving message to folder '%s'"
 msgstr "ಸಂದೇಶವನ�ನ� ಫೋಲ�ಡರಿಗೆ ಉಳಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "'%s' ಗೆ ಸಂದೇಶಗಳನ�ನ� ಸ�ಥಳಾಂತರಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "'%s' ಗೆ ಸಂದೇಶಗಳನ�ನ� ಕಾಪಿ ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1080
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "\"%s\" ಯಲ�ಲಿ ಕೋಶಗಳನ�ನ� ಶೋಧಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1188
 msgid "Forwarded messages"
 msgstr "ಫಾರ�ವರ�ಡ� ಮಾಡಲಾದ ಸಂದೇಶಗಳ�"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1229
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "'%s' ಫೋಲ�ಡರನ�ನ� ತೆರೆಯಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1295
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "'%s' ಫೋಲ�ಡರಿಗಾಗಿ ಕೋಟಾ ಮಾಹಿತಿಯನ�ನ� ಮರಳಿ ಪಡೆಯಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1367
 #, c-format
 msgid "Opening store '%s'"
 msgstr "'%s' ಸಂಗ�ರಹವನ�ನ� ತೆರೆ"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1438
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "'%s' ಫೋಲ�ಡರನ�ನ� ತೆಗೆದ� ಹಾಕಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1556
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ಫೋಲ�ಡರ '%s' ಅನ�ನ� ಶೇಖರಿಸಿಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1619
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ತೆಗೆದ� ಹಾಕ�ವ ಹಾಗ� ಶೇಖರಣಾ ಖಾತೆ '%s'"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1620
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' ಖಾತೆಯನ�ನ� ಉಳಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1674
 #, fuzzy, c-format
 msgid "Refreshing folder '%s'"
 msgstr "ಫೋಲ�ಡರನ�ನ� ಪ�ನಶ�ಚೇತನಗೊಳಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1714
 #, fuzzy, c-format
 msgid "Expunging folder '%s'"
 msgstr "ಫೋಲ�ಡರನ�ನ� ತೆಗೆದ� ಹಾಕಿ"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1759
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ನಲ�ಲಿ ಕಸದ ಬ�ಟ�ಟಿಯನ�ನ� ಖಾಲಿ ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1760
 msgid "Local Folders"
 msgstr "ಸ�ಥಳೀಯ ಫೋಲ�ಡರ�"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1956
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d ಸಂದೇಶವನ�ನ� ಮರಳಿ ಪಡೆಯಲಾಗ�ತ�ತಿದೆ"
 msgstr[1] "%d ಸಂದೇಶಗಳನ�ನ� ಮರಳಿ ಪಡೆಯಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2045
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d ಸಂದೇಶವನ�ನ� ಉಳಿಸಲಾಗ�ತ�ತಿದೆ"
 msgstr[1] "%d ಸಂದೇಶಗಳನ�ನ� ಉಳಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2126
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13174,11 +12886,11 @@ msgstr ""
 "ಇಲ�ಲಿಗೆ ಸಂದೇಶವನ�ನ� ಉಳಿಸ�ವಲ�ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2198
 msgid "Saving attachment"
 msgstr "ಲಗತ�ತನ�ನ� ಉಳಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2216 ../mail/mail-ops.c:2224
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13187,35 +12899,35 @@ msgstr ""
 "ಔಟ�‌ಪ�ಟ� ಕಡತವನ�ನ� ರಚಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2239
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ದತ�ತಾಂಶವನ�ನ� ಬರೆಯಲಾಗಲಿಲ�ಲ: %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "'%s' ನಿಂದ ಸಂಪರ�ಕ ಕಡಿದ�ಕೊಳ�ಳಲಾಗ�ತ�ತಿದೆ'"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "'%s' ನೊಂದಿಗೆ ಮರಳಿ ಸಂಪರ�ಕ ಹೊಂದಲಾಗ�ತ�ತಿದೆ'"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2480
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "ಜಾಲದಿಂದ ಹೊರಗೆ ಬಳಸಲ� '%s' ಖಾತೆಯನ�ನ� ತಯಾರ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2566
 msgid "Checking Service"
 msgstr "ಸೇವೆಯನ�ನ� ಪರೀಕ�ಷಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "ರದ�ದ�ಗೊಳಿಸಲಾಗ�ತ�ತಿದೆ..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "ಮೈಲನ�ನ� ಕಳ�ಹಿಸ� ಹಾಗ� ಸ�ವೀಕರಿಸ�"
 
@@ -13223,109 +12935,138 @@ msgstr "ಮೈಲನ�ನ� ಕಳ�ಹಿಸ� ಹಾಗ� ಸ�ವೀಕ
 msgid "Cancel _All"
 msgstr "ಎಲ�ಲವನ�ನೂ ರದ�ದ�ಗೊಳಿಸ�(_A)"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "ಅಪ�ಡೇಟ� ಮಾಡಲಾಗ�ತ�ತಿದೆ..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "ಕಾಯಲಾಗ�ತ�ತಿದೆ..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "ಹೊಸ ಮೈಲ��ಗಾಗಿ ಕಾಯಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:217
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s ಗಾಗಿ ಗ�ಪ�ತನ�ಡಿಯನ�ನ� ನಮೂದಿಸಿ"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:219
 msgid "Enter Passphrase"
 msgstr "ಗ�ಪ�ತನ�ಡಿಯನ�ನ� ನಮೂದಿಸಿ"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:222
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s ಗಾಗಿ ಗ�ಪ�ತಪದವನ�ನ� ನಮೂದಿಸಿ"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:224
 msgid "Enter Password"
 msgstr "ಗ�ಪ�ತಪದವನ�ನ� ನಮೂದಿಸಿ"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:266
 msgid "User canceled operation."
 msgstr "ಬಳಕೆದಾರ ರದ�ದ�ಪಡಿಸಿದ ಕಾರ�ಯಾಚರಣೆ."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:660
 msgid "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "ಯಾವ�ದೆ ನಿರ�ದೇಶಿತ ವಿಳಾಸವನ�ನ� ಒದಗಿಸಲಾಗಿಲ�ಲ, ಸಂದೇಶದ ಫಾರ�ವಾರ�ಡ� ಮಾಡ�ವಿಕೆಯನ�ನ� ರದ�ದ� "
 "ಮಾಡಲಾಗಿದೆ."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:666
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "ಯಾವ�ದೆ ಖಾತೆಯನ�ನ� ಬಳಸ�ತ�ತಿರ�ವಂತೆ ಕಾಣಿಸ�ತ�ತಿಲ�ಲ, ಸಂದೇಶದ ಫಾರ�ವಾರ�ಡ� ಮಾಡ�ವಿಕೆಯನ�ನ� ರದ�ದ� "
 "ಮಾಡಲಾಗಿದೆ."
 
-#: ../mail/mail-tools.c:123
-#, fuzzy, c-format
-msgid "Could not create spool directory `%s': %s"
+#: ../mail/mail-tools.c:119
+#, c-format
+msgid "Could not create spool directory '%s': %s"
 msgstr "ಸ�ಪೂಲ�‌ಕೋಶ '%s' ಅನ�ನ� ರಚಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ: %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:149
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "ಒಂದ� non-mbox ಆಕರ `%s' ಅನ�ನ� ಮೂವ�‌ಮೈಲ� ಮಾಡಲ� ಪ�ರಯತ�ನಿಸಲಾಗ�ತ�ತಿದೆ"
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "ಒಂದ� non-mbox ಆಕರ '%s' ಅನ�ನ� ಮೂವ�‌ಮೈಲ� ಮಾಡಲ� ಪ�ರಯತ�ನಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "ಫಾರ�ವಾರ�ಡ� ಮಾಡಲಾದ ಸಂದೇಶ - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "ಫಾರ�ವಾರ�ಡ� ಮಾಡಲಾದ ಸಂದೇಶ"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:297
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "ಅಮಾನ�ಯವಾದ ಫೋಲ�ಡರ�:`%s'"
+msgid "Invalid folder: '%s'"
+msgstr "ಅಮಾನ�ಯವಾದ ಫೋಲ�ಡರ�:'%s'"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "ಹ�ಡ�ಕ� ಕಡತಕೋಶವನ�ನ� ಅಣಿಗೊಳಿಸಲಾಗ�ತ�ತಿದೆ: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:229
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "%s:%s' ಗಾಗಿನ ಹ�ಡ�ಕ� ಕಡತಕೋಶವನ�ನ� ಅಪ�‌ಡೇಟ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:236
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' ಗಾಗಿನ ಹ�ಡ�ಕ� ಕಡತಕೋಶವನ�ನ� ಅಪ�‌ಡೇಟ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:679
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-vfolder.c:1191
 msgid "Edit Search Folder"
 msgstr "ಹ�ಡ�ಕ� ಕಡತಕೋಶವನ�ನ� ಸಂಪಾದಿಸ�"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1296
 msgid "New Search Folder"
 msgstr "ಹೊಸ ಹ�ಡ�ಕ� ಕಡತಕೋಶ"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "\"ರದ�ದಿ�ಗಾಗಿ ಹ�ಡ�ಕ�ವ�ದ�\" ವಿಫಲಗೊಂಡಿದೆ(_J)"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "\"ರದ�ದಿ ಎಂದ� ವರದಿ ಮಾಡ�ವ�ದ�\" ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "\"ರದ�ದಿ ಅಲ�ಲ ಎಂದ� ವರದಿ ಮಾಡ�ವ�ದ�\" ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "\"{0}\" ಎಂಬ ಹೆಸರಿನ ಕೋಶವ� ಈಗಾಗಲೆ ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ. ದಯವಿಟ�ಟ� ಬೇರೊಂದ� ಹೆಸರನ�ನ� ಬಳಸಿ."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "\"{1}\" ಎಂಬ ಹೆಸರಿನ ಕೋಶವ� ಈಗಾಗಲೆ ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ. ದಯವಿಟ�ಟ� ಬೇರೊಂದ� ಹೆಸರನ�ನ� ಬಳಸಿ."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13337,7 +13078,7 @@ msgstr ""
 "ನೀವ� ಈ ಕಡತಕೋಶವನ�ನ� ಅಲಕ�ಷಿಸಬಹ�ದ�, ಅದರ ವಿಷಯಗಳನ�ನ� ತಿದ�ದಿಬರೆಯಬಹ�ದ� ಅಥವ ಸೇರಿಸಬಹ�ದ� "
 "ಇಲ�ಲವೆ ನಿರ�ಗಮಿಸಬಹ�ದಾಗಿದೆ."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13345,13 +13086,13 @@ msgstr ""
 "\"{1}\" ಗಾಗಿನ ಓದಲಾಗಿದೆ ಎನ�ನ�ವ ರಸೀತಿಗಾಗಿ ಮನವಿ ಸಲ�ಲಿಸಲಾಗಿದೆ. {0} ಗೆ ರಸೀತಿಯನ�ನ� "
 "ಕಳ�ಹಿಸಬೇಕೆ?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr "\"{0}\" ಎಂಬ ಹೆಸರಿನ ಸಹಿಯ� ಈಗಾಗಲೆ ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ. ದಯವಿಟ�ಟ� ಬೇರೊಂದ� ಹೆಸರನ�ನ� ಸೂಚಿಸಿ."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13359,25 +13100,21 @@ msgstr ""
 "ನಿಮ�ಮ ಸಂದೇಶಗಳಿಗೆ ಒಂದ� ಅರ�ಥವತ�ತಾದ ವಿಷಯದ ಸಾಲನ�ನ� ಸೇರಿಸ�ವ�ದರಿಂದ ಆ ಮೈಲ� ಅನ�ನ� "
 "ಸ�ವೀಕರಿಸ�ವವರಿಗೆ ಅದ� ಯಾವ�ದರ ಬಗ�ಗೆ ಎಂದ� ಸ�ಪಷ�ಟ ಚಿತ�ರಣ ದೊರೆಯ�ತ�ತದೆ."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 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:13
 msgid "Are you sure you want to delete this account?"
 msgstr "ನಿಮ�ಮ ಖಾತೆಯನ�ನ� ಖಚಿತವಾಗಿಯೂ ಅಳಿಸಲ� ಬಯಸ�ತ�ತೀರೇನ�?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "ನಿಮ�ಮ ಖಾತೆಯನ�ನ� ಹಾಗ� ಅದರ ಎಲ�ಲಾ ಪ�ರಾಕ�ಸಿಗಳನ�ನ� ಖಚಿತವಾಗಿಯೂ ನಿಷ�ಕ�ರಿಯಗೊಳಿಸಲ� "
 "ಬಯಸ�ತ�ತೀರೇನ�?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "{0} ಸಂದೇಶಗಳನ�ನ� ಒಂದೇ ಬಾರಿಗೆ ತೆಗೆಯಲ� ನೀವ� ಖಾತ�ರಿಯೆ?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13385,7 +13122,7 @@ msgstr ""
 "ಎಲ�ಲಾ ಫೋಲ�ಡರಿನಿಂದ ಅಳಿಸಿ ಹಾಕಲಾದ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ�ಹಾಕಲ� ನೀವ� "
 "ಖಾತ�ರಿಯೆ?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13393,95 +13130,87 @@ msgstr ""
 "\"{0}\" ಫೋಲ�ಡರಿನಿಂದ ಅಳಿಸಿ ಹಾಕಲಾದ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ�ಹಾಕಲ� ನೀವ� "
 "ಖಾತ�ರಿಯೆ?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 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:18
 #, fuzzy
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr ""
 "ಕೇವಲ BCC ಸ�ವೀಕರಿಸ�ವವರನ�ನ� ಹೊಂದಿರ�ವ ಒಂದ� ಸಂದೇಶವನ�ನ� ನೀವ� ಖಚಿತವಾಗಿಯೂ ಕಳ�ಹಿಸಲ� "
 "ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 #, fuzzy
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr ""
 "ಕೇವಲ BCC ಸ�ವೀಕರಿಸ�ವವರನ�ನ� ಹೊಂದಿರ�ವ ಒಂದ� ಸಂದೇಶವನ�ನ� ನೀವ� ಖಚಿತವಾಗಿಯೂ ಕಳ�ಹಿಸಲ� "
 "ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "ಕೇವಲ BCC ಸ�ವೀಕರಿಸ�ವವರನ�ನ� ಹೊಂದಿರ�ವ ಒಂದ� ಸಂದೇಶವನ�ನ� ನೀವ� ಖಚಿತವಾಗಿಯೂ ಕಳ�ಹಿಸಲ� "
 "ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "ಒಂದ� ವಿಷಯವನ�ನ� ಹೊಂದಿರದ ಒಂದ� ಸಂದೇಶವನ�ನ� ನೀವ� ಖಚಿತವಾಗಿಯೂ ಕಳ�ಹಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "�ಕೆಂದರೆ \"{0}\"."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "�ಕೆಂದರೆ \"{2}\"."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "ಖಾಲಿ ಸಹಿ"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "\"{0}\" ಹ�ಡ�ಕ� ಕಡತಕೋಶವನ�ನ� ಸೇರಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ಕೋಶವನ�ನ� \"{1}\" ಗೆ ಕಾಪಿ ಮಾಡಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "\"{0}\" ಕೋಶವನ�ನ� ರಚಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "ತಾತ�ಕಾಲಿಕ ಉಳಿಕೆಗಾಗಿ ಕೋಶವನ�ನ� ನಿರ�ಮಿಸಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "ಉಳಿಸ�ವ ಕೋಶವನ�ನ� ನಿರ�ಮಿಸಲ� ಸಾಧ�ಯವಿಲ�ಲ, �ಕೆಂದರೆ \"{1}\""
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "\"{0}\" ಫೋಲ�ಡರನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "\"{0}\" ವ�ಯವಸ�ಥೆ ಕೋಶವನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "\"{0}\" ಹ�ಡ�ಕ� ಕಡತಕೋಶವನ�ನ� ಸಂಪಾದಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ �ಕೆಂದರೆ ಅದ� ಅಸ�ತಿತ�ವದಲ�ಲಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ಫೋಲ�ಡರನ�ನ� \"{1}\" ಗೆ ಸ�ಥಳಾಂತರಿಸಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
-msgstr "ಆಕರ \"{1}\" ಅನ�ನ� ತೆರೆಯಲಾಗಿಲ�ಲ"
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "ಆಕರ \"{1}\" ಅನ�ನ� ತೆರೆಯಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "ಆಕರ \"{2}\" ಅನ�ನ� ತೆರೆಯಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಜರ�ಗಿಸಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13489,37 +13218,33 @@ msgstr ""
 "ಒಂದ� ಅನ�ಸ�ಥಾಪನ ತೊಂದರೆಯಿಂದ ಲೈಸೆನ�ಸ�� ಕಡತ \"{0}\" ಅನ�ನ� ಓದಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ. ನೀವ� ಈ "
 "ಸೇವಾಕರ�ತರ ಲೈಸನ�ಸನ�ನ� ಅಂಗೀಕರಿಸಿದೆ ಅದನ�ನ� ಬಳಸಲಾಗ�ವ�ದಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ನ ಹೆಸರನ�ನ� \"{1}\" ಗೆ ಬದಲಾಯಿಸಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr ""
 "ಗಣಕ ಫೋಲ�ಡರ� \"{0}\" ಅನ�ನ� ಹೆಸರನ�ನ� ಬದಲಾಯಿಸದಾಗಲಿ ಅಥವ ಸ�ಥಳಾಂತರಿಸಲಾಗಲಿ ಮಾಡಲ� "
 "ಸಾಧ�ಯವಾಗಲಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "ಬದಲಾವಣೆಗಳನ�ನ� ಖಾತೆಗೆ ಉಳಿಸಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "ಕೋಶ \"{0}\" ಅನ�ನ� ಉಳಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "\"{0}\"ಕಡತಕ�ಕೆ ಉಳಿಸಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "\"{0}\" ಸಿಗ�ನೇಚರ� ಸ�ಕ�ರಿಪ�ಟನ�ನ� ಹೊಂದಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "ರದ�ದಿ�ಗಾಗಿ ಹ�ಡ�ಕ�ವ�ದ� ವಿಫಲಗೊಂಡಿದೆ(_J)"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13527,88 +13252,91 @@ msgstr ""
 "ನಿಮ�ಮ ಗ�ಪ�ತಪದದ ಕಾಗ�ಣಿತವ� ಸರಿಯಾಗಿದೆಯೆ ಎಂದ� ಪರಿಶೀಲಿಸಿ. ಹೆಚ�ಚಿನ ಗ�ಪ�ತಪದಗಳ� ಕೇಸ�‌ "
 "ಸಂವೇದಿಯಾಗಿರ�ತ�ತವೆ; ನಿಮ�ಮ ಕ�ಯಾಪ�ಸ�� ಲಾಕ� ಆನ� ಆಗಿರಬಹ�ದ�."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "ಸಹಿ ಕಡತವನ�ನ� ಉಳಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "ಹ�ಡ�ಕ� ಕಡತಕೋಶ \"{0}\" ನಲ�ಲಿನ ಸಂದೇಶಗಳನ�ನ� ಅಳಿಸಬೇಕೆ?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Do not d_elete"
 msgstr "ಅಳಿಸಬೇಡ(_e)"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "ಅಳಿಸಬೇಡ"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "ಅಶಕ�ತಗೊಳಿಸಬೇಡ"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "ಆಫ�‌ಲೈನ� ಬಳಕೆ ಎಂದ� ಗ�ರ�ತ� ಹಾಕಲಾದ ಫೋಲ�ಡರ�ಗಳನ�ನ� ಸ�ಥಳೀಯವಾಗಿ ಮೇಳೈಸಬೇಕೆ?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಓದಲಾಗಿದೆ ಎಂದ� ಗ�ರ�ತ� ಹಾಕಲ� ನೀವ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "ನೀವ� ಬದಲಾವಣೆಗಳನ�ನ� ಉಳಿಸಲ� ಬಯಸ�ತ�ತೀರೇನ�?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "ಗ�ಪ�ತಪದವನ�ನ� ನಮೂದಿಸಿ."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "ಫಿಲ�ಟರ� ವಿವರಣೆಗಳನ�ನ� ಲೋಡ� ಮಾಡ�ವಾಗ ದೋಷ ಉಂಟಾಗಿದೆ."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "ಕೆಲಸವನ�ನ� ನಿರ�ವಹಿಸ�ವಾಗ ದೋಷ ಉಂಟಾಗಿದೆ."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "{0} ಸಮಯದಲ�ಲಿ ದೋಷ."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "ಕಡತವ� ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ ಆದರೆ ಅದನ�ನ� ತಿದ�ದಿಬರೆಯಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "ಕಡತವ� ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ ಆದರೆ ಅದ� ಒಂದ� ಸಾಮಾನ�ಯ ಕಡತವಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "ನೀವ� ಮ�ಂದ�ವರೆದರೆ, ಈ ಸಂದೇಶವನ�ನ� ನೀವ� ಮರ�ಗಳಿಸಲ� ಸಾಧ�ಯವಾಗ�ವ�ದಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
-"ನೀವ� ಫೋಲ�ಡರನ�ನ� ಅಳಿಸಿ ಹಾಕಿದಲ�ಲಿ, ಅದರಲ�ಲಿನ ಎಲ�ಲಾ ವಿಷಯಗಳ� ಹಾಗ� ಉಪಫೋಲ�ಡರ�ಗಳ� "
-"ಶಾಶ�ವತವಾಗಿ ಅಳಿಸಿಹಾಕಲಾಗ�ತ�ತದೆ."
+"ನೀವ� ಫೋಲ�ಡರನ�ನ� ಅಳಿಸಿ ಹಾಕಿದಲ�ಲಿ, ಅದರಲ�ಲಿನ ಎಲ�ಲಾ ವಿಷಯಗಳ� ಹಾಗ� ಉಪಫೋಲ�ಡರ�ಗಳ� ಶಾಶ�ವತವಾಗಿ "
+"ಅಳಿಸಿಹಾಕಲಾಗ�ತ�ತದೆ."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 #, fuzzy
 msgid "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "ನೀವ� ಫೋಲ�ಡರನ�ನ� ಅಳಿಸಿ ಹಾಕಿದಲ�ಲಿ, ಅದರಲ�ಲಿನ ಎಲ�ಲಾ ವಿಷಯಗಳ� ಹಾಗ� ಉಪಫೋಲ�ಡರ�ಗಳ� "
 "ಶಾಶ�ವತವಾಗಿ ಅಳಿಸಿಹಾಕಲಾಗ�ತ�ತದೆ."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "ನೀವ� ಮ�ಂದ�ವರೆದರೆ, ಎಲ�ಲಾ ಪ�ರಾಕ�ಸಿ ಖಾತೆಗಳ� ಶಾಶ�ವತವಾಗಿ ಅಳಿಸಿಹಾಕಲ�ಪಡ�ತ�ತದೆ."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13616,11 +13344,11 @@ msgstr ""
 "ನೀವ� ಮ�ಂದ�ವರೆದರೆ, ಖಾತೆಯ ಮಾಹಿತಿ ಹಾಗ� ಎಲ�ಲಾ ಪ�ರಾಕ�ಸಿ ಖಾತೆಯ\n"
 " ಮಾಹಿತಿಯ� ಶಾಶ�ವತವಾಗಿ ಅಳಿಸಿಹಾಕಲ�ಪಡ�ತ�ತದೆ."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "ನೀವ� ಮ�ಂದ�ವರೆದರೆ, ಖಾತೆಯ ಮಾಹಿತಿ ಶಾಶ�ವತವಾಗಿ ಅಳಿಸಿಹಾಕಲ�ಪಡ�ತ�ತದೆ."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13628,23 +13356,23 @@ msgstr ""
 "ನೀವ� ನಿರ�ಗಮಿಸಿದಲ�ಲಿ, Evolution ಅನ�ನ� ಇನ�ನೊಮ�ಮೆ ಆರಂಭಿಸ�ವವರೆಗೂ ಈ ಸಂದೇಶಗಳ� "
 "ಕಳ�ಹಿಸಲ�ಪಡ�ವ�ದಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "ಅಲಕ�ಷಿಸ�"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "ಅಮಾನ�ಯ ದೃಢೀಕರಣ"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "ಮೈಲ� ಅಳಿಸ�ವ�ದ� ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "ಮೈಲ� ಫಿಲ�ಟರ�ಗಳ� ತಾನಾಗಿಯೆ ಅಪ�‌ಡೇಟ� ಆಗ�ತ�ತವೆ."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13656,27 +13384,27 @@ msgstr ""
 "ಸ�ವೀಕರಿಸ�ವವರ ವಿಳಾಸಗಳನ�ನ� ಪಟ�ಟಿ ಮಾಡ�ತ�ತದೆ. ಇದನ�ನ� ತಪ�ಪಿಸಲ�ಕನಿಷ�ಟ ಒಂದ� ಗೆ: ಅಥವ CC: "
 "ಸ�ವೀಕರಿಸ�ವವರ ವಿಳಾಸವನ�ನ� ಸೇರಿಸಬೇಕ�."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "ಕಾಣೆಯಾಗಿರ�ವ ಫೋಲ�ಡರ�."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "ಯಾವ�ದೆ ಆಕರಗಳನ�ನ� ಆರಿಸಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "Opening too many messages at once may take a long time."
 msgstr "ಒಂದೇ ಬಾರಿಗೆ ಹಲವಾರ� ಸಂದೇಶಗಳನ�ನ� ತೆಗೆಯಲ� ಬಹಳಷ�ಟ� ಹೊತ�ತ� ಹಿಡಿಯಬಹ�ದ�."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Please check your account settings and try again."
 msgstr "ದಯವಿಟ�ಟ� ನಿಮ�ಮ ಖಾತೆಯ ಸಿದ�ಧತೆಗಳನ�ನ� ಪರಿಶೀಲಿಸಿ ನಂತರ ಪ�ನಃ ಪ�ರಯತ�ನಿಸಿ."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Please enable the account or send using another account."
 msgstr "ದಯವಿಟ�ಟ� ಖಾತೆಯನ�ನ� ಸಕ�ರಿಯಗೊಳಿಸಿ ಅಥವ ಬೇರೊಂದ� ಖಾತೆಯನ�ನ� ಬಳಸಿಕೊಂಡ� ಕಳ�ಹಿಸಿ."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 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."
@@ -13684,7 +13412,7 @@ msgstr ""
 "ದಯವಿಟ�ಟ� ಗೆ: ಕ�ಷೇತ�ರದಲ�ಲಿ ಒಂದ� ಮಾನ�ಯವಾದ ಇಮೈಲ� ವಿಳಾಸವನ�ನ� ನಮೂದಿಸಿ. ನಮೂದ� ಜಾಗದ "
 "ಪಕ�ಕದಲ�ಲಿರ�ವ ಗೆ: ಗ�ಂಡಿಯ ಮೇಲೆ ಕ�ಲಿಕ�ಕಿಸಿ."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13694,64 +13422,56 @@ msgstr ""
 "ಸಾಮರ�ಥ�ಯವನ�ನ� ಹೊಂದಿದ�ದಾರೆ ಎಂದ� ಖಚಿತಪಡಿಸಿಕೊಳ�ಳಿ:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "ಈ ಸಹಿಯನ�ನ� ಗ�ರ�ತಿಸಲ� ದಯವಿಟ�ಟ� ಒಂದ� ವಿಶಿಷ�ಟವಾದ ಹೆಸರನ�ನ� ಒದಗಿಸಿ."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "ದಯವಿಟ�ಟ� ಕಾಯಿರಿ."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "ಹಳೆಯ ಮೈಲ� ಫೋಲ�ಡರ� \"{0}\" ಅನ�ನ� ಸ�ಥಳಾಂತರಿಸ�ವಲ�ಲಿ ದೋಷ ಎದ�ರಾಗಿದೆ."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ಬೆಂಬಲವಿರ�ವ ದೃಢೀಕರಣ ರಚನೆಗಳ ಒಂದ� ಪಟ�ಟಿಗಾಗಿ ಪರಿಚಾರಕಕ�ಕೆ ಮನವಿ ಸಲ�ಲಿಸಲಾಗ�ತ�ತಿದೆ."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "ಓದಲಾಗಿದೆ ಎನ�ನ�ವ ರಸೀತಿಗೆ ಮನವಿ ಸಲ�ಲಿಸಲಾಗಿದೆ."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "ಫೋಲ�ಡರ� \"{0}\" ಹಾಗ� ಅದರ ಎಲ�ಲಾ ಉಪಫೋಲ�ಡರ�ಗಳನ�ನ� ನೀವ� ನಿಜವಾಗಿಯೂ ಅಳಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 #, fuzzy
 msgid "Really delete folder \"{0}\"?"
 msgstr "\"{0}\" ಫೋಲ�ಡರನ�ನ� ಅಳಿಸಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "ರದ�ದಿ ಎಂದ� ವರದಿ ಮಾಡ�ವ�ದ� ವಿಫಲಗೊಂಡಿದೆ"
-
 #: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "ರದ�ದಿ ಅಲ�ಲ ಎಂದ� ವರದಿ ಮಾಡ�ವ�ದ� ವಿಫಲಗೊಂಡಿದೆ"
-
-#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "ಹ�ಡ�ಕ� ಕಡತಕೋಶಗಳ� ತಾನಾಗಿಯೆ ಅಪ�‌ಡೇಟ� ಮಾಡಲಾಗ�ತ�ತವೆ."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "ಕಳ�ಹಿಸಿದ ರಸೀತಿ"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "ಸಹಿಯ� ಈಗಾಗಲೆ ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "ಮೇಳೈಸ�"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "ಆಫ�‌ಲೈನ� ಬಳಕೆಗಾಗಿ ಫೋಲ�ಡರ�ಗಳನ�ನ� ಸ�ಥಳೀಯವಾಗಿ ಮೇಳೈಸಬೇಕೆ?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13759,7 +13479,7 @@ msgstr ""
 "Evolution ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡಲ� ಗಣಕದ ಕಡತಕೋಶಗಳ ಅಗತ�ಯವಿರ�ತ�ತದೆ ಹಾಗ� ಅವ�ಗಳ ಹೆಸರ� "
 "ಬದಲಾಯಿಸ�ವ�ದಾಗಲಿ, ಸ�ಥಳಾಂತರಿಸ�ವ�ದಾಗಲಿ ಅಥವ ಅಳಿಸ�ವದಾಗಲಿ ಮಾಡ�ವಂತಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13776,51 +13496,23 @@ msgstr ""
 "ಸ�ವೀಕರಿಸ�ವವರ ವಿಳಾಸಗಳನ�ನ� ಪಟ�ಟಿ ಮಾಡ�ತ�ತದೆ. ಇದನ�ನ� ತಪ�ಪಿಸಲ�ಕನಿಷ�ಟ ಒಂದ� ಗೆ: ಅಥವ CC: "
 "ಸ�ವೀಕರಿಸ�ವವರ ವಿಳಾಸವನ�ನ� ಸೇರಿಸಬೇಕ�. "
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"ಈ ಕೆಳಗಿನ ಹ�ಡ�ಕ� ಕಡತಕೋಶವನ�ನ�(ಗಳನ�ನ�) ಬಳಸಿ:\n"
-"{0}\n"
-"ಈಗ ತೆಗೆದ� ಹಾಕಲಾದ ಫೋಲ�ಡರನ�ನ� ಬಳಸಲಾಗಿದೆ:\n"
-"    \"{1}\"\n"
-"ಹಾಗ� ಅಪ�‌ಡೇಟ� ಮಾಡಲಾಗಿದೆ."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"ಈ ಕೆಳಗಿನ ಫಿಲ�ಟರ� ನಿಯಮವನ�ನ�(ಗಳನ�ನ�) ಬಳಸಿ:\n"
-"{0}\n"
-"ಈಗ ತೆಗೆದ� ಹಾಕಲಾದ ಫೋಲ�ಡರನ�ನ� ಬಳಸಲಾಗಿದೆ:\n"
-"    \"{1}\"\n"
-"ಹಾಗ� ಅಪ�‌ಡೇಟ� ಮಾಡಲಾಗಿದೆ."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "ಸ�ಕ�ರಿಪ�ಟ�� ಅಸ�ತಿತ�ವದಲ�ಲಿಲ�ಲಿರಬೇಕ� ಹಾಗ� ಕಾರ�ಯಗತಗೊಳಿಸ�ವಂತಿರಬೇಕ�."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13828,17 +13520,17 @@ msgstr ""
 "ಈ ಫೋಲ�ಡರನ�ನ� ಸೂಚ�ಯವಾಗಿ ಸೇರಿಸಿರಬಹ�ದ�,\n"
 "ಅಗತ�ಯವಿದ�ದಲ�ಲಿ, ಹ�ಡ�ಕ� ಕಡತಕೋಶ ಸಂಪಾದಕಕ�ಕೆ ಹೋಗಿ ನಂತರ ಇದನ�ನ� ಸ�ಪಷ�ಟವಾಗಿ ಸೇರಿಸಿ."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "ಈ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ �ಕೆಂದರೆ ನೀವ� ಕಳ�ಹಿಸಲ� ಆಯ�ದ ಖಾತೆಯ� ಶಕ�ತಗೊಂಡಿಲ�ಲ"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:106
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "ಈ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ �ಕೆಂದರೆ ನೀವ� ಯಾವ�ದೆ ಸ�ವೀಕರಿಸ�ವವರನ�ನ� ಸೂಚಿಸಿಲ�ಲ"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13846,11 +13538,11 @@ msgstr ""
 "ಈ ಪರಿಚಾರಕವ� ಈ ಬಗೆಯ ದೃಢೀಕರಣವನ�ನ� ಬೆಂಬಲಿಸ�ವ�ದಿಲ�ಲ ಹಾಗ� ದೃಢೀಕರಣವನ�ನೇ "
 "ಬೆಂಬಲಿಸದಿರಬಹ�ದ�."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "ಈ ಸಹಿಯನ�ನ� ಬದಲಾಯಿಸಲಾಗಿದೆ, ಆದರೆ ಅದನ�ನ� ಉಳಿಸಲಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13858,11 +13550,11 @@ msgstr ""
 "ಇದ� ಆರಿಸಲಾದ ಫೋಲ�ಡರಿನಲ�ಲಿ ಹಾಗ� ಅದರ ಉಪ ಫೋಲ�ಡರಿನಲ�ಲಿನ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಓದಲಾಗಿದೆ ಎಂದ� "
 "ಗ�ರ�ತ� ಹಾಕ�ತ�ತದೆ."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise ಪರಿಚಾರಕಕ�ಕೆ ಸಂಪರ�ಕ ಸಾಧಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13870,19 +13562,19 @@ msgstr ""
 "ಈ ಖಾತೆಯ ಡ�ರಾಫ�ಟ�� ಫೋಲ�ಡರನ�ನ� ತೆಗೆಯಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ. ಬದಲಿಗೆ ಗಣಕದ ಡ�ರಾಫ�ಟ�� ಫೋಲ�ಡರನ�ನ� "
 "ಬಳಸಬೇಕೆ?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "ಲೈಸನ�ಸ�‌ ಕಡತವನ�ನ� ಓದಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಅನ�ನ� ಬಳಸ�(_D)"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಡ�ರಾಫ�ಟ�� ಫೋಲ�ಡರ� ಅನ�ನ� ಬಳಸಬೇಕೆ?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13892,31 +13584,31 @@ msgstr ""
 "ಫೋಲ�ಡರಿನಿಂದ ನಿಜವಾದ ಸಂದೇಶವನ�ನ� ಅಳಿಸಿಹಾಕ�ತ�ತದೆ.\n"
 "ನೀವ� ಖಚಿತವಾಗಿಯೂ ಹೀಗೆ ಮಾಡಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:117
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ಈ ಮೈಲನ�ನ� ಅಳಿಸಲ� ನಿಮಗೆ ಸಾಕಷ�ಟ� ಅನ�ಮತಿಗಳಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:118
 msgid "You have not filled in all of the required information."
 msgstr "ನೀವ� ಅಗತ�ಯವಿರ�ವ ಎಲ�ಲಾ ಮಾಹಿತಿಯನ�ನ� ನೀಡಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:119
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "ಕಳ�ಹಿಸದೆ ಬಾಕಿ ಉಳಿದ ಸಂದೇಶಗಳಿವೆ, ನೀವ ನಿಜವಾಗಲೂ ನಿರ�ಗಮಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:120
 msgid "You may not create two accounts with the same name."
 msgstr "ನೀವ� ಒಂದೆ ಹೆಸರಿನ ಎರಡ� ಖಾತೆಯನ�ನ� ತೆರೆಯ�ವಂತಿಲ�ಲ."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "ಈ ಹ�ಡ�ಕ� ಕಡತಕೋಶವನ�ನ� ನೀವ� ಹೆಸರಿಸಬೇಕ�."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "ಒಂದ� ಫೋಲ�ಡರನ�ನ� ನೀವ� ಸೂಚಿಸಬೇಕ�."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13926,115 +13618,111 @@ msgstr ""
 "ಕಡತಕೋಶವನ�ನ� ಪ�ರತ�ಯೇಕವಾಗಿ ಆರಿಸ�ವ ಮೂಲಕ, ಹಾಗ�/ಅಥವ ಎಲ�ಲಾ ಸ�ಥಳೀಯ ಕಡತಕೋಶಗಳನ�ನ� "
 "ಆರಿಸ�ವ�ದರಿಂದ, ಎಲ�ಲಾ ದೂರಸ�ಥ ಕಡತಕೋಶಗಳನ�ನ� ಆರಿಸ�ವದರಿಂದ ಅಥವ ಎರಡನ�ನೂ ಆರಿಸ�ವ�ದರ ಮೂಲಕ."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:125
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr " \"{0}\" ಪರಿಚಾರಕಕ�ಕೆ \"{0}\" ಆಗಿ ನೀವ� ಪ�ರವೇಶಿಸ�ವ�ದ� ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "ಸೇರಿಸ�(_A)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "ಬದಲಾವಣೆಗಳನ�ನ� ತಿರಸ�ಕರಿಸ�(_D)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:128
 msgid "_Do not Synchronize"
 msgstr "ಮೇಳೈಸಬೇಡ(_D)"
 
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:866
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:821
 msgid "_Empty Trash"
 msgstr "ಕಸದ ಬ�ಟ�ಟಿಯನ�ನ� ಖಾಲಿ ಮಾಡ�(_E)"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "ತೆಗೆದ�ಹಾಕ�(_E)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "ಸಂದೇಶಗಳನ�ನ� ತೆರೆ(_O)"
 
-#: ../mail/message-list.c:1119
+#: ../mail/message-list.c:1110
 msgid "Unseen"
 msgstr "ನೋಡದೆ ಇರ�ವ"
 
-#: ../mail/message-list.c:1120
+#: ../mail/message-list.c:1111
 msgid "Seen"
 msgstr "ನೋಡಲಾದ"
 
-#: ../mail/message-list.c:1121
+#: ../mail/message-list.c:1112
 msgid "Answered"
 msgstr "ಉತ�ತರಿಸಲಾದ"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1113
 msgid "Forwarded"
 msgstr "ಫಾರ�ವಾರ�ಡ� ಮಾಡಲಾಗಿದೆ"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1114
 msgid "Multiple Unseen Messages"
 msgstr "ನೋಡದೆ ಇರ�ವ ಅನೇಕ ಸಂದೇಶಗಳ�"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1115
 msgid "Multiple Messages"
 msgstr "ಅನೇಕ ಸಂದೇಶಗಳ�"
 
-#: ../mail/message-list.c:1128
+#: ../mail/message-list.c:1119
 msgid "Lowest"
 msgstr "ಅತಿ ಕೆಳಗಿನ"
 
-#: ../mail/message-list.c:1129
+#: ../mail/message-list.c:1120
 msgid "Lower"
 msgstr "ಕೆಳಗಿನ"
 
-#: ../mail/message-list.c:1133
+#: ../mail/message-list.c:1124
 msgid "Higher"
 msgstr "ಹೆಚ�ಚಿನ"
 
-#: ../mail/message-list.c:1134
+#: ../mail/message-list.c:1125
 msgid "Highest"
 msgstr "ಅತಿ ಹೆಚ�ಚಿನ"
 
-#: ../mail/message-list.c:1744 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1735 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1751 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1742 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "ಇಂದ� %l:%M %p"
 
-#: ../mail/message-list.c:1760
+#: ../mail/message-list.c:1751
 msgid "Yesterday %l:%M %p"
 msgstr "ನಿನ�ನೆ %l:%M %p"
 
-#: ../mail/message-list.c:1772
+#: ../mail/message-list.c:1763
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1780
+#: ../mail/message-list.c:1771
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1782
+#: ../mail/message-list.c:1773
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2528
+#: ../mail/message-list.c:2518
 msgid "Select all visible messages"
 msgstr "ಗೋಚರಿಸ�ತ�ತಿರ�ವ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಆರಿಸ�"
 
-#: ../mail/message-list.c:2579 ../shell/e-shell-view.c:729
-msgid "Shell Backend"
-msgstr ""
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4434 ../mail/message-list.c:4932
+#: ../mail/message-list.c:4199 ../mail/message-list.c:4595
 msgid "Generating message list"
 msgstr "ಸಂದೇಶ ಪಟ�ಟಿಯನ�ನ� ಉತ�ಪಾದಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../mail/message-list.c:4763
+#: ../mail/message-list.c:4432
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14042,15 +13730,7 @@ msgstr ""
 "ಯಾವ�ದೆ ಸಂದೇಶವ� ನೀವ� ಹ�ಡ�ಕ�ತ�ತಿರ�ವ�ದಕ�ಕೆ ತಾಳೆಯಾಗ�ತ�ತಿಲ�ಲ. ಹ�ಡ�ಕಲಾಗ�ತ�ತಿರ�ವ�ದನ�ನ� "
 "ಹ�ಡ�ಕ�->ಅಳಿಸ� ಮೆನ� ಅಂಶದಿಂದ ಅಳಿಸಿ ಅಥವ ಅದನ�ನ� ಬದಲಾಯಿಸಿ."
 
-#: ../mail/message-list.c:4765
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"ಈ ಫೋಲ�ಡರಿನಲ�ಲಿ ಕೇವಲ ಅಡಗಿಸಲಾದ ಸಂದೇಶಗಳಿವೆ. ಅವ�ಗಳನ�ನ� ತೋರಿಸಲ� ನೋಟ->ಅಡಗಿಸಲಾದ "
-"ಸಂದೇಶಗಳನ�ನ� ತೋರಿಸ� ಅನ�ನ� ಬಳಸಿ."
-
-#: ../mail/message-list.c:4767
+#: ../mail/message-list.c:4434
 msgid "There are no messages in this folder."
 msgstr "ಈ ಫೋಲ�ಡರಿನಲ�ಲಿ ಯಾವ�ದೆ ಸಂದೇಶಗಳಿಲ�ಲ."
 
@@ -14088,27 +13768,27 @@ msgid "Subject - Trimmed"
 msgstr "ವಿಷಯ -  (_S)"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Body contains"
 msgstr "ಮ�ಖ�ಯಭಾಗ ಇದನ�ನ� ಹೊಂದಿದೆ"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Message contains"
 msgstr "ಸಂದೇಶ ಇದನ�ನ� ಹೊಂದಿದೆ"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Recipients contain"
 msgstr "'ಸ�ವೀಕರಿಸ�ವವರ�' ಇದನ�ನ� ಹೊಂದಿದೆ"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Sender contains"
 msgstr "'ಕಳ�ಹಿಸಿದವರ�' ಇದನ�ನ� ಹೊಂದಿದೆ"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Subject contains"
 msgstr "'ವಿಷಯ' ಇದನ�ನ� ಹೊಂದಿದೆ"
 
@@ -14142,16 +13822,16 @@ msgstr ""
 "ಎಂದರ�ಥ. ಅಂದರೆ ನಿಮ�ಮ ಸಂಪರ�ಕವ� ಅಸ�ರಕ�ಷಿತ, ಹಾಗ� ನಿಮ�ಮ ಗಣಕವ� ಸ�ರಕ�ಷತೆಯನ�ನ� ಬಳಸ�ವಲ�ಲಿ "
 "ದ�ರ�ಭಲವಾಗಿರ�ತ�ತದೆ ಎಂದಾಗ�ತ�ತದೆ."
 
-#: ../modules/addressbook/addressbook-config.c:592
+#: ../modules/addressbook/addressbook-config.c:602
 #, fuzzy
-msgid "Use in _Birthday & Anniversaries calendar"
+msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "ಹ�ಟ�ಟ�ಹಬ�ಬಗಳ� ಹಾಗ� ವಾರ�ಷಿಕೋತ�ಸವಗಳ�"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "ಅಂತರ�ಜಾಲದ ಹೊರಗಿನ ಕೆಲಸಗಳಿಗಾಗಿ ಪ�ಸ�ತಕದ ವಿಷಯಗಳನ�ನ� ಕಾಪಿ ಮಾಡ�(_b)"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -14161,7 +13841,7 @@ msgstr ""
 "ಒಂದ� ಪಟ�ಟಿಯನ�ನ� ಇಲ�ಲಿ ಒದಗಿಸಲಾಗಿದೆ. ಯಾವ ನಿಶ�ಚಿತ ಸಂಪರ�ಕಸ�ಥಾನವನ�ನ� ಬಳಸಬೇಕೆಂದ� ತಿಳಿಯಲ� "
 "ನಿಮ�ಮ ಗಣಕ ವ�ಯವಸ�ಥಾಪಕರನ�ನ� ಸಂಪರ�ಕಿಸಿ."
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14170,7 +13850,7 @@ msgstr ""
 "ನಿಮ�ಮನ�ನ� ದೃಢೀಕರಿಸಲ� Evolution ಈ ಕ�ರಮವನ�ನ� ಅನ�ಸರಿಸ�ತ�ತದೆ. ಇದನ�ನ� \"ಇಮೈಲ� ವಿಳಾಸ\" "
 "ಕ�ಕೆ ಹೊಂದಿಸಲ� ನಿಮ�ಮ LDAP ಪರಿಚಾರಕಕ�ಕೆ ಅನಾಮಿಕ ನಿಲ�ಕಿನ ಅಗತ�ಯವಿರ�ತ�ತದೆ."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -14182,29 +13862,29 @@ msgstr ""
 "ಮೂಲಕ�ಕಿಂತ ಕೆಳಗಿನ ಎಲ�ಲಾ ನಮೂದ�ಗಳನ�ನ� ಒಳಗೊಂಡಿರ�ತ�ತದೆ. \"one\" ನ ಒಂದ� ಹ�ಡ�ಕ� "
 "ವ�ಯಾಪ�ತಿಯ� ನಿಮ�ಮ ಹ�ಡ�ಕ� ಮೂಲಕ�ಕಿಂತ ಒಂದ� ಹಂತ ಕೆಳಗಿನದನ�ನ� ಮಾತ�ರ ಒಳಗೊಂಡಿರ�ತ�ತದೆ."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "ಪರಿಚಾರಕದ ಮಾಹಿತಿ"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "ವಿವರಗಳ�"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "ಹ�ಡ�ಕಲಾಗ�ತ�ತಿದೆ"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "ಡೌನ��ಲೋಡ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕದ ಗ�ಣಲಕ�ಷಣಗಳ�"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "ಹೊಸ ಸಂಪರ�ಕವಿಳಾಸ ಪ�ಸ�ತಕ"
 
@@ -14286,8 +13966,11 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "ಮ�ನ�ನೋಟ ಫಲಕವನ�ನ� ತೋರಿಸಬೇಕೆ."
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
+#: ../modules/mail/em-mailer-prefs.c:1158
+#, fuzzy
+msgid "_Table column:"
 msgstr "ಟೇಬಲ� ಲಂಬಸಾಲ�:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
@@ -14300,7 +13983,7 @@ msgstr "ಯಾವಾಗಲೂ ಸà³�ವಯಂಪೂರà³�ಣಗೊಂಡ ಸಂà
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "LDAP ಪರಿಚಾರಕಗಳಲ�ಲಿ"
 
@@ -14310,7 +13993,7 @@ msgid "_Contact"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸ(_C)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "ಹೊಸ ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ನಿರ�ಮಿಸಿ"
 
@@ -14320,7 +14003,7 @@ msgid "Contact _List"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸ ಪಟ�ಟಿ(_L)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "ಒಂದ� ಹೊಸ ಸಂಪರ�ಕವಿಳಾಸ ಪಟ�ಟಿಯನ�ನ� ನಿರ�ಮಿಸ�"
 
@@ -14330,7 +14013,7 @@ msgid "Address _Book"
 msgstr "ಹೊಸ ಸಂಪರ�ಕವಿಳಾಸ(_B)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "ಒಂದ� ಹೊಸ ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ನಿರ�ಮಿಸ�"
 
@@ -14338,361 +14021,248 @@ msgstr "ಒಂದ� ಹೊಸ ಸಂಪರ�ಕವಿಳಾಸವನ�ನ�
 #: ../modules/addressbook/e-book-shell-backend.c:376
 #: ../modules/addressbook/e-book-shell-view.c:394
 #: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸಗಳ�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-#, fuzzy
-msgid "Source List"
-msgstr "ಆಕರಗಳ�"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-#, fuzzy
-msgid "The registry of address books"
-msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕಗಳ ಪಟ�ಟಿಯನ�ನ� ಪಡೆಯಲಾಗಿಲ�ಲ"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-#, fuzzy
-msgid "Current View"
-msgstr "ಪ�ರಸಕ�ತ ನೋಟ(_u)"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-#, fuzzy
-msgid "The currently selected address book view"
-msgstr "ಆಯ�ದ ಫೋಲ�ಡರನ�ನ� ಅಳಿಸ�"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-#, fuzzy
-msgid "Previewed Contact"
-msgstr "ಹೊಸ ಸಂಪರ�ಕವಿಳಾಸ"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-#, fuzzy
-msgid "The contact being shown in the preview pane"
-msgstr "ಮ�ನ�ನೋಟ ಫಲಕವನ�ನ� ತೋರಿಸಬೇಕೆ."
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-#, fuzzy
-msgid "Preview is Visible"
-msgstr "ಬದಿಯ ಪಟ�ಟಿಯ� ಕಾಣ�ತ�ತಿದೆ"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-#, fuzzy
-msgid "Whether the preview pane is visible"
-msgstr "ಮ�ನ�ನೋಟ ಫಲಕವನ�ನ� ತೋರಿಸಬೇಕೆ."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP ಪರಿಚಾರಕಗಳ�"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "ಸ�ವಯಂಪೂರ�ಣಗೊಳಿಕೆಯ ಸಿದ�ಧತೆಗಳ�"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-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 ""
-"Evolution ೧.x ನ ಈಚೆಗೆ Evolution�ನ ಸಂಪರ�ಕವಿಳಾಸ ಫೋಲ�ಡರ�ಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� "
-"ಬದಲಾಗಿವೆ.\n"
-"\n"
-"Evolution ನಿಮ�ಮ ಫೋಲ�ಡರ��ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ಮೈಲಿಂಗ� ಲಿಸ�ಟ��ನ ಸಂಪರ�ಕ ವಿಳಾಸದ ವಿನ�ಯಾಸವ� ಬದಲಾಗಿದೆ.\n"
-"\n"
-"Evolution ನಿಮ�ಮ ಫೋಲ�ಡರ��ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ಇವಲೂಶನ� ಕೆಲವ� ದೂರವಾಣಿ ಸಂಖ�ಯೆಗಳನ�ನ� ಶೇಖರಿಸ�ವ ವಿಧಾನವನ�ನ� ಬದಲಾಯಿಸಿದೆ.\n"
-"\n"
-"Evolution ನಿಮ�ಮ ಫೋಲ�ಡರ��ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolution�ನ Palm Sync changelog ಹಾಗ� ಮ�ಯಾಪ� ಕಡತಗಳ� ಬದಲಾಯಿಸಲ�ಪಟ�ಟಿದೆ.\n"
-"\n"
-"Evolution ನಿಮ�ಮ Pilot Sync ದತ�ತಾಂಶವನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:763
-#: ../modules/calendar/e-memo-shell-sidebar.c:689
-#: ../modules/calendar/e-task-shell-sidebar.c:689
-#, fuzzy
-msgid "Source Selector Widget"
-msgstr "ಮೂಲ ಆಯ�ಕೆಗಾರನನ�ನ� ಸಂಪರ�ಕಿಸ�"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-#, fuzzy
-msgid "This widget displays groups of address books"
-msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕಗಳ ಪಟ�ಟಿಯನ�ನ� ಪಡೆಯಲಾಗಿಲ�ಲ"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "ವಿಕಾರ�ಡ� ಆಗಿ ಉಳಿಸ� "
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "ಎಲ�ಲಾ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇಲ�ಲಿಗೆ ಕಾಪಿ ಮಾಡ�(_p)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 #, fuzzy
 msgid "Copy the contacts of the selected address book to another"
 msgstr "ಆಯ�ದ ಫೋಲ�ಡರಿನಲ�ಲಿನ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇನ�ನೊಂದ� ಫೋಲ�ಡರಿಗೆ ಕಾಪಿ ಮಾಡ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 #, fuzzy
 msgid "D_elete Address Book"
 msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕವನ�ನ� ಅಳಿಸ�(_e)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 #, fuzzy
 msgid "Delete the selected address book"
 msgstr "ಆಯ�ದ ಫೋಲ�ಡರನ�ನ� ಅಳಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "ಎಲ�ಲಾ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇಲ�ಲಿಗೆ ವರ�ಗಾಯಿಸ�(_v)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 #, fuzzy
 msgid "Move the contacts of the selected address book to another"
 msgstr "ಆರಿಸಲಾದ ಫೋಲ�ಡರಿನಲ�ಲಿನ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇನ�ನೊಂದ� ಫೋಲ�ಡರಿಗೆ ವರ�ಗಾಯಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "ಹೊಸ ವಿಳಾಸ ಪ�ಸ�ತಕ(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕದ ಗ�ಣಲಕ�ಷಣಗಳ�(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 #, fuzzy
 msgid "Show properties of the selected address book"
 msgstr "ಆರಿಸಲಾದ ಫೋಲ�ಡರಿನ ಗ�ಣಲಕ�ಷಣಗಳನ�ನ� ಬದಲಾಯಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/mail/e-mail-shell-view-actions.c:905
 msgid "_Rename..."
 msgstr "ಹೆಸರನ�ನ� ಬದಲಾಯಿಸ�(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 #, fuzzy
 msgid "Rename the selected address book"
 msgstr "ಆಯ�ದ ಫೋಲ�ಡರಿನ ಹೆಸರನ�ನ� ಬದಲಾಯಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕವನ�ನ� ವಿಕಾರ�ಡ� ಆಗಿ ಉಳಿಸ�(_a)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 #, fuzzy
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "ಆರಿಸಲಾದ ಫೋಲ�ಡರಿನ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ವಿಕಾರ�ಡ� ಆಗಿ ಉಳಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "ಲೋಡ� ಮಾಡ�ವ�ದನ�ನ� ನಿಲ�ಲಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "ಸಂಪರ�ಕ ವಿಳಾಸವನ�ನ� ಇಲ�ಲಿಗೆ ಕಾಪಿ ಮಾಡ�(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 #, fuzzy
 msgid "Copy selected contacts to another address book"
 msgstr "ಆಯ�ದ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇನ�ನೊಂದ� ಫೋಲ�ಡರಿಗೆ ಕಾಪಿ ಮಾಡ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "ಸಂಪರ�ಕ ವಿಳಾಸವನ�ನ� ಅಳಿಸ�(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 #, fuzzy
 msgid "_Find in Contact..."
 msgstr "ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಕಳ�ಹಿಸ�(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 #, fuzzy
 msgid "Search for text in the displayed contact"
 msgstr "ತೋರಿಸಲಾದ ಸಂದೇಶದ ಮ�ಖ�ಯಭಾಗದಲ�ಲಿರ�ವ ಪಠ�ಯಕ�ಕಾಗಿ ಹ�ಡ�ಕ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಕಳ�ಹಿಸ�(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "ಆರಿಸಲಾದ ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಬೇರೊಬ�ಬರಿಗೆ ಕಳ�ಹಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "ಸಂಪರ�ಕ ವಿಳಾಸವನ�ನ� ಇಲ�ಲಿಗೆ ಸ�ಥಳಾಂತರಿಸ�(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 #, fuzzy
 msgid "Move selected contacts to another address book"
 msgstr "ಆರಿಸಲಾದ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ಇನ�ನೊಂದ� ಫೋಲ�ಡರಿಗೆ ವರ�ಗಾಯಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "ಹೊಸ ಸಂಪರ�ಕವಿಳಾಸ(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "ಹೊಸ ಸಂಪರ�ಕವಿಳಾಸ ಪಟ�ಟಿ(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 #, fuzzy
 msgid "_Open Contact"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸ(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "ಪ�ರಸಕ�ತ ಸಂಪರ�ಕ ವಿಳಾಸವನ�ನ� ನೋಡ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "ವಿಳಾಸಕ�ಕೆ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "ಆಯ�ದ ವಿಳಾಸಗಳಿಗೆ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "_Actions"
 msgstr "ಕೆಲಸಗಳ�(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 #: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1094
+#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "_Preview"
 msgstr "ಮ�ನ�ನೋಟ(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "_Delete"
 msgstr "ಅಳಿಸಿ ಹಾಕ�(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "ಗ�ಣಲಕ�ಷಣಳ�K_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "ವಿಕಾರ�ಡ� ಆಗಿ ಉಳಿಸ�(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸದ ಮ�ನ�ನೋಟ(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸದ ಮ�ನ�ನೋಟ ವಿಂಡೋವನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 #: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/calendar/e-task-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Classic View"
 msgstr "ಸಾಂಪ�ರದಾಯಿಕ ನೋಟ(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 #, fuzzy
 msgid "Show contact preview below the contact list"
 msgstr "ಸಂದೇಶ ಪಟ�ಟಿಯ ಕೆಳಗಡೆಯಲ�ಲೆ ಸಂದೇಶ ಮ�ನ�ನೋಟವನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 #: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/calendar/e-task-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Vertical View"
 msgstr "ಲಂಬ ನೋಟ(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 #, fuzzy
 msgid "Show contact preview alongside the contact list"
 msgstr "ಸಂಪರ�ಕವಿಳಾಸದ ಮ�ನ�ನೋಟ ವಿಂಡೋವನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Any Category"
 msgstr "ಯಾವ�ದೆ ವರ�ಗ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/calendar/e-task-shell-view-actions.c:941
 msgid "Unmatched"
 msgstr "ತಾಳೆಯಾಗದ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
-#: ../shell/e-shell-content.c:516
+#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../shell/e-shell-content.c:441
 msgid "Advanced Search"
 msgstr "ಸ�ಧಾರಿತ ಹ�ಡ�ಕಾಟ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 #, fuzzy
 msgid "Print all shown contacts"
 msgstr "ಆರಿಸಲಾದ ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಮ�ದ�ರಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 #, fuzzy
 msgid "Preview the contacts to be printed"
 msgstr "ಮ�ದ�ರಿತಗೊಳ�ಳಲಿರ�ವ ಸಂಪರ�ಕವಿಳಾಸಗಳ ಮ�ನ�ನೋಟವನ�ನ� ತೋರಿಸ�ತ�ತದೆ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "ಆರಿಸಲಾದ ಸಂಪರ�ಕವಿಳಾಸವನ�ನ� ಮ�ದ�ರಿಸ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "ವಿಕಾರ�ಡ� ಆಗಿ ಉಳಿಸ� ..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "ಆರಿಸಲಾದ ಸಂಪರ�ಕವಿಳಾಸಗಳನ�ನ� ವಿಕಾರ�ಡ� ಆಗಿ ಉಳಿಸ�"
 
@@ -14738,57 +14308,47 @@ msgstr "ಸಂಪರ�ಕ ಮಾಹಿತಿ"
 msgid "Contact information for %s"
 msgstr "%s ಗಾಗಿನ ಸಂಪರ�ಕ ಮಾಹಿತಿ"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr ""
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr ""
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr ""
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "ಅನಾಮಧೇಯವಾಗಿ"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "ಮಿತಿಯ� ತಲ�ಪ�ವವರೆಗೂ ಈ ಪ�ಸ�ತಕವನ�ನ� ವೀಕ�ಷಿಸ�(_r)"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "ಪ�ರವೇಶ(_g):"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "ಒಂದ�"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "ಹ�ಡ�ಕ� ಫಿಲ�ಟರ�"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "ಹ�ಡ�ಕ� ಮೂಲಗಳ�(_b):"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "ಹ�ಡ�ಕ� ಫಿಲ�ಟರ�(_f):"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14798,55 +14358,56 @@ msgstr ""
 "ನಿರ�ವಹಿಸಲಾಗ�ತ�ತದೆ."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "ಉಪ"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "ಬೆಂಬಲಿತವಾಗಿರ� ಹ�ಡ�ಕ� ಮೂಲಗಳ�"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "ವಿಶಿಷ�ಟವಾದ ಹೆಸರನ�ನ� (DN) ಬಳಸಿಕೊಂಡ�"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "ಇಮೇಲ� ವಿಳಾಸವನ�ನ� ಬಳಸಿಕೊಂಡ�"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "ಡೌನ��ಲೋಡ� ಮಿತಿ(_D):"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "ಸಾಧ�ಯವಿರ�ವ ಹ�ಡ�ಕ� ಮೂಲಗಳನ�ನ� ಪತ�ತೆಮಾಡ�(_F)"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "ಪ�ರವೇಶ ವಿಧಾನ(_L):"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "ಸಂಪರ�ಕಸ�ಥಾನ(_P):"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "ಹ�ಡ�ಕ� ವ�ಯಾಪ�ತಿ(_S):"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "ಮೀರಿದ ಸಮಯ(_T):"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "ಸ�ರಕ�ಷಾ ಸಂಪರ�ಕವನ�ನ� ಬಳಸ�(_U):"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "ಕಾರ�ಡ�ಗಳ�"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "ಆಮದ� ಮಾಡಿಕೊ (_m)"
 
@@ -14868,11 +14429,11 @@ msgstr "ಕಾರ�ಯಕ�ಕೆ ಆಮದ� ಮಾಡಿಕೊ(_m)"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-migrate.c:176
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "ಜಾಲದಲ�ಲಿ"
 
@@ -14882,7 +14443,7 @@ msgid "Weather"
 msgstr "ಹವಾಮಾನ"
 
 #: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "ಹ�ಟ�ಟ�ಹಬ�ಬಗಳ� ಹಾಗ� ವಾರ�ಷಿಕೋತ�ಸವಗಳ�"
 
@@ -14892,7 +14453,7 @@ msgid "_Appointment"
 msgstr "ಅಪಾಯಿಂಟ��ಮೆಟ�(_A)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "ಒಂದ� ಹೊಸ ಅಪಾಯಿಂಟ��ಮೆಟನ�ನ� ನಿರ�ಮಿಸ�"
 
@@ -14920,45 +14481,15 @@ msgid "Cale_ndar"
 msgstr "ಕ�ಯಾಲೆಂಡರ�(_n)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "ಒಂದ� ಹೊಸ ಕ�ಯಾಲೆಂಡರನ�ನ� ನಿರ�ಮಿಸ�"
 
 #: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../plugins/itip-formatter/itip-formatter.c:2651
 msgid "Calendar and Tasks"
 msgstr "ಕ�ಯಾಲೆಂಡರ� ಹಾಗ� ಕಾರ�ಯಗಳ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-#, fuzzy
-msgid "The registry of calendars"
-msgstr "ಪ�ರಾಥಮಿಕ ಕ�ಯಾಲೆಂಡರ�"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-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 ""
-"Evolution ೧.x ನಿಂದ ಈಚೆಗೆ Evolution�ನ ಕ�ಯಾಲೆಂಡರ� ಕೋಶಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� "
-"ಬದಲಾಗಿವೆ.\n"
-"\n"
-"Evolution ನಿಮ�ಮ ಫೋಲ�ಡರ�ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "evolution/config.xmldb ಯಿಂದ ಹಳೆಯ ಸಿದ�ಧತೆಗಳನ�ನ� ವರ�ಗಾಯಿಸಲಾಗಿಲ�ಲ"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "`%s' ಕ�ಯಾಲೆಂಡರನ�ನ� ವರ�ಗಾಯಿಸಲಾಗಿಲ�ಲ"
-
 #: ../modules/calendar/e-cal-shell-sidebar.c:168
 #: ../modules/calendar/e-memo-shell-sidebar.c:163
 #: ../modules/calendar/e-task-shell-sidebar.c:163
@@ -14980,27 +14511,6 @@ msgstr "ಕà³�ಯಾಲೆಂಡರನà³�ನà³� ಲೋಡà³� ಮಾಡಲಾಗà
 msgid "Calendar Selector"
 msgstr "ಕ�ಯಾಲೆಂಡರ� ಮೂಲದ ಆಯ�ಕೆಗಾರ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:743
-msgid "Date Navigator Widget"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:744
-msgid "This widget displays a miniature calendar"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:753
-#, fuzzy
-msgid "Default Calendar Client"
-msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಮೈಲ� ಕ�ಲೈಂಟ�"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:754
-msgid "Default client for calendar operations"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:764
-msgid "This widget displays groups of calendars"
-msgstr ""
-
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-cal-shell-sidebar.c:952
 #, fuzzy, c-format
@@ -15045,260 +14555,260 @@ msgstr "ಸಂದರ�ಭ(ಎವೆಂಟ�)"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
 #: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-task-shell-view-actions.c:612
 #, fuzzy
 msgid "Save as iCalendar"
 msgstr "ಒಂದ� ಕ�ಯಾಲೆಂಡರನ�ನ� ಆರಿಸಿ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "ಕಾಪಿ ಮಾಡ�(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 #, fuzzy
 msgid "D_elete Calendar"
 msgstr "ಒಂದ� ಕ�ಯಾಲೆಂಡರನ�ನ� ಆರಿಸಿ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 #, fuzzy
 msgid "Delete the selected calendar"
 msgstr "ಆಯ�ದ ಫೋಲ�ಡರನ�ನ� ಅಳಿಸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Go Back"
 msgstr "ಹಿಂದಕ�ಕೆ ತೆರಳ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Go Forward"
 msgstr "ಮ�ಂದೆ ತೆರಳ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "ಇಂದಿನ ದಿನವನ�ನ� ಆರಿಸ�(_T)"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "ಇಂದಿನ ದಿನವನ�ನ� ಆರಿಸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "ದಿನಾಂಕವನ�ನ� ಆರಿಸ�(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "ಒಂದ� ನಿಗದಿತ ದಿನಾಂಕವನ�ನ� ಆರಿಸಿ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "ಹೊಸ ಕ�ಯಾಲೆಂಡರ�(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Purg_e"
 msgstr "ತೆಗೆದ�ಹಾಕ�(_e)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Purge old appointments and meetings"
 msgstr "ಹಳೆಯ ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗಳನ�ನ� ಹಾಗ� ಮೀಟಿಂಗ��ಗಳನ�ನ� ತೆಗೆದ�ಹಾಕ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Re_fresh"
 msgstr "ಪ�ನಶ�ಚೇತನಗೊಳಿಸ�(_f)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 #, fuzzy
 msgid "Refresh the selected calendar"
 msgstr "ಆಯ�ದ ಫೋಲ�ಡರಿನ ಹೆಸರನ�ನ� ಬದಲಾಯಿಸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 #, fuzzy
 msgid "Rename the selected calendar"
 msgstr "ಆಯ�ದ ಫೋಲ�ಡರಿನ ಹೆಸರನ�ನ� ಬದಲಾಯಿಸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Show _Only This Calendar"
 msgstr "ಕೇವಲ ಈ ಕ�ಯಾಲೆಂಡರನ�ನ� ತೋರಿಸ�(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Cop_y to Calendar..."
 msgstr "ಕ�ಯಾಲೆಂಡರಿಗೆ ಕಾಪಿ ಮಾಡ�(_y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "ಮೀಟಿಂಗ ಅನ�ನ� ಡೆಲಿಗೇಟ� ಮಾಡ�(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 #, fuzzy
 msgid "_Delete Appointment"
 msgstr "ಈ ಅಪಾಯಿಂಟ��ಮೆಂಟನ�ನ� ಅಳಿಸಿಹಾಕ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 #, fuzzy
 msgid "Delete selected appointments"
 msgstr "ಈ ಅಪಾಯಿಂಟ��ಮೆಂಟನ�ನ� ಅಳಿಸಿಹಾಕ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete This _Occurrence"
 msgstr "ಈ ಸಂಗತಿಯನ�ನ� ಅಳಿಸಿ ಹಾಕ�(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "ಈ ಪ�ನರಾವರ�ತನೆಯನ�ನ� ಅಳಿಸಿಹಾಕ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 #, fuzzy
 msgid "Delete All Occ_urrences"
 msgstr "ಎಲ�ಲಾ ಸಂಗತಿಗಳನ�ನ� ಅಳಿಸಿ ಹಾಕ�(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "ಎಲ�ಲಾ ಪ�ನರಾವರ�ತನೆಗಳನ�ನ� ಅಳಿಸಿಹಾಕ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "New All Day _Event..."
 msgstr "ಹೊಸದಾದ ದಿನ ಪೂರ�ತಿ ಕಾರ�ಯಕ�ರಮ(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 #, fuzzy
 msgid "Create a new all day event"
 msgstr "ಒಂದ� ದಿನಪೂರ�ತಿಯ ಅಪಾಯಿಂಟ��ಮೆಂಟ� ಅನ�ನ� ರಚಿಸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "_Forward as iCalendar..."
 msgstr "�ಕ�ಯಾಲೆಂಡರ� ಆಗಿ ರವಾನಿಸ�(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "New _Meeting..."
 msgstr "ಹೊಸ ಮೀಟಿಂಗ�(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 #, fuzzy
 msgid "Create a new meeting"
 msgstr "ಒಂದ� ಹೊಸ ಮೀಟಿಂಗ� ಮನವಿಯನ�ನ� ನಿರ�ಮಿಸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "ಕ�ಯಾಲೆಂಡರಿಗೆ ಸ�ಥಳಾಂತರಿಸ�(_v)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "ಹೊಸ ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗಳ�(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "ಈ ಸಂಗತಿಯನ�ನ� ಸ�ಥಳಾಂತರಗೊಳ�ಳ�ವಂತೆ ಮಾಡ�(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "ಅಪಾಯಿಂಟ��ಮೆಂಟನ�ನ� ತೆರೆ(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "ಪ�ರಸಕ�ತ ಅಪಾಯಿಂಟ��ಮೆಂಟನ�ನ� ನೋಡ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "ಉತ�ತರಿಸ�(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 #, fuzzy
 msgid "Save as iCalendar..."
 msgstr "ವಿಕಾರ�ಡ� ಆಗಿ ಉಳಿಸ� ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "ಮೀಟಿಂಗ� ಅನ�ನ� ನಿಗದಿಪಡಿಸ�(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 #, fuzzy
 msgid "Converts an appointment to a meeting"
 msgstr "ಹಳೆಯ ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗಳನ�ನ� ಹಾಗ� ಮೀಟಿಂಗ��ಗಳನ�ನ� ತೆಗೆದ�ಹಾಕ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 #, fuzzy
 msgid "Conv_ert to Appointment..."
 msgstr "ಹೊಸ ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗಳ�(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 #, fuzzy
 msgid "Converts a meeting to an appointment"
 msgstr "ಅಪಾಯಿಂಟ�‌ಮೆಂಟ� ಮ�ಗಿದಾಗ %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+msgid "Quit"
+msgstr "ತ�ಯಜಿಸ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "ದಿನ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "ಒಂದ� ದಿನವನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "ಪಟ�ಟಿ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "ಪಟ�ಟಿಯಾಗಿ ತೋರಿಸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "ತಿಂಗಳ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "ಒಂದ� ತಿಂಗಳನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "ವಾರ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "ಒಂದ� ವಾರವನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 #, fuzzy
 msgid "Show one work week"
 msgstr "ಒಂದ� ವಾರವನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "ಸಕ�ರಿಯ ಅಪಾಯಿಂಟ��ಮೆಂಟ�ಗಳ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "ಮ�ಂದಿನ �ಳ� ದಿನಗಳ ಅಪಾಯಿಂಟ��ಮೆಂಟ�ಗಳ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Description contains"
 msgstr "ವಿವರವ� ಇದನ�ನ� ಹೊಂದಿದೆ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Summary contains"
 msgstr "ಸಾರಾಂಶವ� ಇದನ�ನ� ಹೊಂದಿದೆ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "ಈ ಕ�ಯಾಲೆಂಡರನ�ನ� ಮ�ದ�ರಿಸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 #, fuzzy
 msgid "Preview the calendar to be printed"
 msgstr "ಮ�ದ�ರಿಸಬೇಕಿರ�ವ ಕ�ಯಾಲೆಂಡರನ�ನ� ಅವಲೋಕಿಸ�ತ�ತದೆ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "ಇಲ�ಲಿಗೆ ತೆರಳ�"
 
@@ -15334,7 +14844,7 @@ msgstr "ಆರಿಸಲಾದ ಮೆಮೋವನ�ನ� ನೋಡ�"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 #: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Open _Web Page"
 msgstr "ಜಾಲ ಪ�ಟವನ�ನ� ತೆರೆ(_W)"
 
@@ -15349,22 +14859,22 @@ msgstr "ಆರಿಸಲಾದ ಮೆಮೋವನ�ನ� ನೋಡ�"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:610
 msgid "task"
 msgstr "ಕಾರ�ಯ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:672
 msgid "_Assign Task"
 msgstr "ಕಾರ�ಯವನ�ನ� ನಿಯೋಜಿಸ�(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "_Mark as Complete"
 msgstr "ಪೂರ�ಣಗೊಂಡಿದೆ ಎಂದ� ಗ�ರ�ತ� ಹಾಕ�(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Mark selected tasks as complete"
 msgstr "ಆರಿಸಲಾದ ಕಾರ�ಯಗಳನ�ನ� ಪೂರ�ಣಗೊಂಡಿದೆ ಎಂದ� ಗ�ರ�ತ� ಹಾಕ�"
 
@@ -15373,41 +14883,41 @@ msgid "_Mark as Incomplete"
 msgstr "ಪೂರ�ಣಗೊಂಡಿಲ�ಲ ಎಂದ� ಗ�ರ�ತ� ಹಾಕ�(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 #, fuzzy
 msgid "Mark selected tasks as incomplete"
 msgstr "ಆರಿಸಲಾದ ಕಾರ�ಯಗಳನ�ನ� ಪೂರ�ಣಗೊಂಡಿದೆ ಎಂದ� ಗ�ರ�ತ� ಹಾಕ�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "New _Task"
 msgstr "ಹೊಸ ಕಾರ�ಯ(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Create a new task"
 msgstr "ಒಂದ� ಹೊಸ ಕಾರ�ಯವನ�ನ� ರಚಿಸ�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "_Open Task"
 msgstr "ತೆರೆಯಲ�ಪಟ�ಟ ಕಾರ�ಯ(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "View the selected task"
 msgstr "ಆರಿಸಲಾದ ಕಾರ�ಯಗಳನ�ನ� ನೋಡ�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
 #: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 #, fuzzy
 msgid "_Save as iCalendar..."
 msgstr "�ಕ�ಯಾಲೆಂಡರ� ಆಗಿ ರವಾನಿಸ�(_F)..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:998
 #, fuzzy
 msgid "Print the selected task"
 msgstr "ಆರಿಸಲಾದ ಕಾರ�ಯಗಳನ�ನ� ನೋಡ�"
@@ -15437,16 +14947,6 @@ msgstr "ಮೆಮೊ ಪಟ�ಟಿ(_s)"
 msgid "Create a new memo list"
 msgstr "ಒಂದ� ಹೊಸ ಮೆಮೊ ಪಟ�ಟಿಯನ�ನ� ರಚಿಸಿ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-#, fuzzy
-msgid "The registry of memo lists"
-msgstr "ಪ�ರಾಥಮಿಕ ಮೆಮೊ ಪಟ�ಟಿ"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-#, fuzzy
-msgid "The memo table model"
-msgstr "ಟೇಬಲ� ಮಾದರಿ"
-
 #: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "ಮೆಮೊಗಳನ�ನ� ಲೋಡ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
@@ -15456,20 +14956,6 @@ msgstr "ಮೆಮೊಗಳನà³�ನà³� ಲೋಡà³� ಮಾಡಲಾಗà³�ತà³�à
 msgid "Memo List Selector"
 msgstr "ಮೆಮೊ ಸಂಪನ�ಮೂಲ ಆಯ�ಕೆಗಾರ"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:679
-#, fuzzy
-msgid "Default Memo Client"
-msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಮೈಲ� ಕ�ಲೈಂಟ�"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:680
-#, fuzzy
-msgid "Default client for memo operations"
-msgstr "ಕಾರ�ಯವನ�ನ� ನಡೆಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ."
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:690
-msgid "This widget displays groups of memo lists"
-msgstr ""
-
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-memo-shell-sidebar.c:870
 #, c-format
@@ -15596,37 +15082,10 @@ msgid "Tas_k List"
 msgstr "ಕಾರ�ಯ ಪಟ�ಟಿ(_k)"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "Create a new task list"
 msgstr "ಒಂದ� ಹೊಸ ಕಾರ�ಯ ಪಟ�ಟಿಯನ�ನ� ರಚಿಸ�"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-#, fuzzy
-msgid "The registry of task lists"
-msgstr "ಪ�ರಾಥಮಿಕ ಕಾರ�ಯ ಪಟ�ಟಿ"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-#, fuzzy
-msgid "The task table model"
-msgstr "ಟೇಬಲ� ಮಾದರಿ"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution ೧.x ನಿಂದ ಈಚೆಗೆ Evolution�ನ ಕಾರ�ಯ ಕೋಶಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� ಬದಲಾಗಿದೆ.\n"
-"\n"
-"Evolution ನಿಮ�ಮ ಫೋಲ�ಡರ�ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "`%s' ಕಾರ�ಯಗಳನ�ನ� ವರ�ಗಾಯಿಸಲಾಗಿಲ�ಲ"
-
 #: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "ಕಾರ�ಯಗಳನ�ನ� ಲೋಡ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
@@ -15636,20 +15095,6 @@ msgstr "ಕಾರà³�ಯಗಳನà³�ನà³� ಲೋಡà³� ಮಾಡಲಾಗà³�ತà
 msgid "Task List Selector"
 msgstr "ಕಾರ�ಯ ಆಕರ ಆಯ�ಕೆಗಾರ"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:679
-#, fuzzy
-msgid "Default Task Client"
-msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಮೈಲ� ಕ�ಲೈಂಟ�"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:680
-#, fuzzy
-msgid "Default client for task operations"
-msgstr "ತ�ರೆಡ� ವಿಸ�ತರಿಸಲಾದ ಸ�ಥಿತಿಯ ಪೂರ�ವನಿಯೋಜಿತ ಮೌಲ�ಯ"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:690
-msgid "This widget displays groups of task lists"
-msgstr ""
-
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-task-shell-sidebar.c:870
 #, c-format
@@ -15661,7 +15106,7 @@ msgstr "%s ನಲà³�ಲಿ ಕಾರà³�ಯಗಳನà³�ನà³� ತೆರೆಯಲà
 msgid "Print Tasks"
 msgstr "ಕಾರ�ಯಗಳನ�ನ� ಮ�ದ�ರಿಸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:554
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15673,106 +15118,106 @@ msgstr ""
 "\n"
 "ನಿಜವಾಗಲೂ ಈ ಕಾರ�ಯಗಳನ�ನ� ಅಳಿಸಿಹಾಕಬೇಕೆ?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:679
 #, fuzzy
 msgid "_Delete Task"
 msgstr "ಅಳಿಸಿ ಹಾಕ�(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 #, fuzzy
 msgid "_Find in Task..."
 msgstr "ಸಂದೇಶದಲ�ಲಿ ಹ�ಡ�ಕ�(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 #, fuzzy
 msgid "Search for text in the displayed task"
 msgstr "ತೋರಿಸಲಾದ ಸಂದೇಶದ ಮ�ಖ�ಯಭಾಗದಲ�ಲಿರ�ವ ಪಠ�ಯಕ�ಕಾಗಿ ಹ�ಡ�ಕ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:700
 msgid "Copy..."
 msgstr "ಕಾಪಿ ಮಾಡ�..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:707
 #, fuzzy
 msgid "D_elete Task List"
 msgstr "ಒಂದ� ಕಾರ�ಯ ಪಟ�ಟಿಯನ�ನ� ಆರಿಸಿ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 #, fuzzy
 msgid "Delete the selected task list"
 msgstr "ಆರಿಸಲಾದ ಕಾರ�ಯಗಳನ�ನ� ಅಳಿಸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "_New Task List"
 msgstr "ಹೊಸ ಕಾರ�ಯ ಪಟ�ಟಿ(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 #, fuzzy
 msgid "Refresh the selected task list"
 msgstr "ಆರಿಸಲಾದ ಕಾರ�ಯಗಳನ�ನ� ಅಳಿಸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 #, fuzzy
 msgid "Rename the selected task list"
 msgstr "ಆಯ�ದ ಫೋಲ�ಡರಿನ ಹೆಸರನ�ನ� ಬದಲಾಯಿಸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Show _Only This Task List"
 msgstr "ಕೇವಲ ಈ ಕಾರ�ಯ ಪಟ�ಟಿಯನ�ನ� ತೋರಿಸ�(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:756
 #, fuzzy
 msgid "Mar_k as Incomplete"
 msgstr "ಪೂರ�ಣಗೊಂಡಿಲ�ಲ ಎಂದ� ಗ�ರ�ತ� ಹಾಕ�(_M)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Delete completed tasks"
 msgstr "ಪೂರ�ಣಗೊಂಡ ಕಾರ�ಯಗಳನ�ನ� ಅಳಿಸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:861
 msgid "Task _Preview"
 msgstr "ಕಾರ�ಯದ ಮ�ನ�ನೋಟ(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:863
 #, fuzzy
 msgid "Show task preview pane"
 msgstr "ಮ�ನ�ನೋಟ ಫಲಕವನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:884
 #, fuzzy
 msgid "Show task preview below the task list"
 msgstr "ಸಂದೇಶ ಪಟ�ಟಿಯ ಕೆಳಗಡೆಯಲ�ಲೆ ಸಂದೇಶ ಮ�ನ�ನೋಟವನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 #, fuzzy
 msgid "Show task preview alongside the task list"
 msgstr "ಸಂದೇಶ ಪಟ�ಟಿಯ ಕೆಳಗಡೆಯಲ�ಲೆ ಸಂದೇಶ ಮ�ನ�ನೋಟವನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Active Tasks"
 msgstr "ಸಕ�ರಿಯ ಕಾರ�ಯಗಳ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Completed Tasks"
 msgstr "ಪೂರ�ಣಗೊಂಡ ಕಾರ�ಯಗಳ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Next 7 Days' Tasks"
 msgstr "ಮ�ಂದಿನ �ಳ� ದಿನಗಳ ಕಾರ�ಯಗಳ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:927
 msgid "Overdue Tasks"
 msgstr "ಅವಧಿ ಮೀರಿದ ಕಾರ�ಯಗಳ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:934
 msgid "Tasks with Attachments"
 msgstr "ಲಗತ�ತ�ಗಳನ�ನ� ಒಳಗೊಂಡ ಕಾರ�ಯಗಳ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:984
 msgid "Print the list of tasks"
 msgstr "ಕಾರ�ಯಗಳ ಪಟ�ಟಿಯನ�ನ� ಮ�ದ�ರಿಸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:991
 #, fuzzy
 msgid "Preview the list of tasks to be printed"
 msgstr "ಮ�ದ�ರಿಸಬೇಕಿರ�ವ ಕಾರ�ಯಗಳ ಪಟ�ಟಿಯ ಮ�ನ�ನೋಟಗಳ�"
@@ -15799,410 +15244,379 @@ msgid "Delete Task"
 msgstr "ಇವರಿಗೆ ಡೆಲಿಗೇಟ�‌ ಮಾಡ�"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, c-format
 msgid "%d attached messages"
 msgstr "%d ಲಗತ�ತಿಸಲಾದ ಸಂದೇಶಗಳ�"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "ಯಾವ�ದೂ ಇಲ�ಲ"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:164
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ಮೈಲ� ಸಂದೇಶ(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:166
 msgid "Compose a new mail message"
 msgstr "ಒಂದ� ಹೊಸ ಮೈಲ� ಸಂದೇಶವನ�ನ� ರಚಿಸ�"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:174
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "ಮೈಲ� ಫೋಲ�ಡರ�(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:176
 msgid "Create a new mail folder"
 msgstr "ಒಂದ� ಹೊಸ ಮೈಲ� ಫೋಲ�ಡರನ�ನ� ರಚಿಸ�"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Mail Accounts"
 msgstr "ಮೈಲ� ಖಾತೆಗಳ�"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:203
 msgid "Mail Preferences"
 msgstr "ಮೈಲ��ನ ಆದ�ಯತೆಗಳ�"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgid "Composer Preferences"
 msgstr "ರಚನೆಗಾರನ ಆದ�ಯತೆಗಳ�"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:219
 msgid "Network Preferences"
 msgstr "ಜಾಲಬಂಧ ಆದ�ಯತೆಗಳ�"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-#, fuzzy
-msgid "Group by Threads"
-msgstr "ತ�ರೆಡ�‌ಗಳಿಗೆ ಅನ�ಗ�ಣವಾಗಿ ಗ�ಂಪ�ಮಾಡ�(_G)"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr ""
-
-#: ../modules/mail/e-mail-shell-view-actions.c:859
+#: ../modules/mail/e-mail-shell-view-actions.c:814
 #: ../modules/mail/e-mail-shell-view.c:875
 #, fuzzy
 msgid "_Disable Account"
 msgstr "ಖಾತೆಯನ�ನ� ನಿಷ�ಕ�ರಿಯಗೊಳಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:861
+#: ../modules/mail/e-mail-shell-view-actions.c:816
 #, fuzzy
 msgid "Disable this account"
 msgstr "ಖಾತೆಯನ�ನ� ನಿಷ�ಕ�ರಿಯಗೊಳಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:868
+#: ../modules/mail/e-mail-shell-view-actions.c:823
 #, fuzzy
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "ಈ ಫೋಲ�ಡರನಿಂದ ಅಳಿಸಿ ಹಾಕಲಾದ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ�ಹಾಕ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:873
+#: ../modules/mail/e-mail-shell-view-actions.c:828
 msgid "C_reate Search Folder From Search..."
 msgstr "ಹ�ಡ�ಕಲಾಗಿದ�ದರಿಂದ ಹ�ಡ�ಕ� ಕಡತಕೋಶವನ�ನ� ನಿರ�ಮಿಸ� (_r)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view-actions.c:835
 msgid "_Download Messages for Offline Usage"
 msgstr "ಜಾಲದ ಹೊರಗೆ ಬಳಸಲ� ಸಂದೇಶಗಳನ�ನ� ಡೌನ��ಲೋಡ� ಮಾಡ�(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:837
 #, fuzzy
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "ಜಾಲದ ಹೊರಕ�ಕೆ ಎಂದ� ಗ�ರ�ತ�ಹಾಕಲಾದ ಖಾತೆಗಳ/ಫೋಲ�ಡರ�ಗಳ ಸಂದೇಶಗಳನ�ನ� ಡೌನ��ಲೋಡ� ಮಾಡ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../modules/mail/e-mail-shell-view-actions.c:842
 msgid "Fl_ush Outbox"
 msgstr "ಔಟ�‌ಬಾಕ�ಸನ�ನ� ಸ�ವಚ�ಛಗೊಳಿಸ�(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:849
 msgid "_Copy Folder To..."
 msgstr "ಫೋಲ�ಡರನ�ನ� ಇಲ�ಲಿಗೆ ಕಾಪಿ ಮಾಡ�(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:896
+#: ../modules/mail/e-mail-shell-view-actions.c:851
 msgid "Copy the selected folder into another folder"
 msgstr "ಆಯ�ದ ಫೋಲ�ಡರನ�ನ� ಇನ�ನೊಂದ� ಫೋಲ�ಡರಿಗೆ ಕಾಪಿ ಮಾಡ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:858
 msgid "Permanently remove this folder"
 msgstr "ಈ ಫೋಲ�ಡರನ�ನ� ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ�ಹಾಕ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:908
+#: ../modules/mail/e-mail-shell-view-actions.c:863
 msgid "E_xpunge"
 msgstr "ತೆಗೆದ� ಹಾಕ�(E_xpunge)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:910
+#: ../modules/mail/e-mail-shell-view-actions.c:865
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ಈ ಫೋಲ�ಡರನಿಂದ ಅಳಿಸಿ ಹಾಕಲಾದ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ�ಹಾಕ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:870
 msgid "Mar_k All Messages as Read"
 msgstr "ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಓದಲಾಗಿದೆ ಎಂದ� ಗ�ರ�ತ� ಹಾಕ�(_k)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:872
 msgid "Mark all messages in the folder as read"
 msgstr "ಫೋಲ�ಡರಿನ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಓದಲಾಗಿದೆ ಎಂದ� ಗ�ರ�ತ� ಹಾಕ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:922
+#: ../modules/mail/e-mail-shell-view-actions.c:877
 msgid "_Move Folder To..."
 msgstr "ಫೋಲ�ಡರನ�ನ� ಇಲ�ಲಿಗೆ ವರ�ಗಾಯಿಸ�(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:879
 msgid "Move the selected folder into another folder"
 msgstr "ಆರಿಸಲಾದ ಫೋಲ�ಡರನ�ನ� ಇನ�ನೊಂದ� ಫೋಲ�ಡರಿಗೆ ವರ�ಗಾಯಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:884
 msgid "_New..."
 msgstr "ಹೊಸ(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:886
 msgid "Create a new folder for storing mail"
 msgstr "ಮೈಲ� ಅನ�ನ� ಸಂಗ�ರಹಿಸಿಡಲ� ಒಂದ� ಹೊಸ ಫೋಲ�ಡರನ�ನ� ರಚಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:893
 msgid "Change the properties of this folder"
 msgstr "ಈ ಫೋಲ�ಡರಿನ ಗ�ಣಲಕ�ಷಣಗಳನ�ನ� ಬದಲಾಯಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:900
 msgid "Refresh the folder"
 msgstr "ಫೋಲ�ಡರನ�ನ� ಪ�ನಶ�ಚೇತನಗೊಳಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:907
 msgid "Change the name of this folder"
 msgstr "ಈ ಫೋಲ�ಡರಿನ ಹೆಸರನ�ನ� ಬದಲಾಯಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:912
 msgid "Select Message _Thread"
 msgstr "ಸಂದೇಶ ತ�ರೆಡ�‌ ಅನ�ನ� ಆರಿಸ�(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:914
 msgid "Select all messages in the same thread as the selected message"
 msgstr "ಒಂದೇ ತ�ರೆಡ�‌ನ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಆರಿಸಲಾದ ಸಂದೇಶದಂತೆ ಆಯ�ಕೆ ಮಾಡ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:964
+#: ../modules/mail/e-mail-shell-view-actions.c:919
 msgid "Select Message S_ubthread"
 msgstr "ಸಂದೇಶ ಉಪತ�ರೆಡ�‌ ಅನ�ನ� ಆರಿಸ�(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:921
 msgid "Select all replies to the currently selected message"
 msgstr "ಪ�ರಸಕ�ತ ಆರಿಸಲಾದ ಎಲ�ಲಾ ಸಂದೇಶಗಳ ಉತ�ತರಗಳನ�ನ� ಆಯ�ಕೆ ಮಾಡ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:926
 msgid "_Unsubscribe"
 msgstr "ಚಂದಾದಾರಿಕೆಯನ�ನ� ರದ�ದ�ಗೊಳಿಸ�(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:928
 #, fuzzy
 msgid "Unsubscribe from the selected folder"
 msgstr "ಆಯ�ದ ಫೋಲ�ಡರಿನ ಹೆಸರನ�ನ� ಬದಲಾಯಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:933
 msgid "Empty _Trash"
 msgstr "ಕಸಬ�ಟ�ಟಿಯನ�ನ� ಖಾಲಿ ಮಾಡ�(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:935
 #, fuzzy
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ಈ ಫೋಲ�ಡರನಿಂದ ಅಳಿಸಿ ಹಾಕಲಾದ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ�ಹಾಕ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:940
 msgid "_New Label"
 msgstr "ಹೊಸ ಲೇಬಲ�(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:994
+#: ../modules/mail/e-mail-shell-view-actions.c:949
 msgid "N_one"
 msgstr "ಯಾವ�ದೂ ಇಲ�ಲ(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
-msgid "Hide _Read Messages"
-msgstr "ಓದಲಾದ ಸಂದೇಶಗಳನ�ನ� ಅಡಗಿಸಿಡ�(_R)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1003
-msgid "Temporarily hide all messages that have already been read"
-msgstr "ಈಗಾಗಲೆ ಓದಲಾದ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ತಾತ�ಕಾಲಿಕವಾಗಿ ಅಡಗಿಸಿಡ�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1008
-msgid "Hide S_elected Messages"
-msgstr "ಆರಿಸಲಾದ ಸಂದೇಶಗಳನ�ನ� ಅಡಗಿಸಿಡ�(_e)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1010
-msgid "Temporarily hide the selected messages"
-msgstr "ಆರಿಸಲಾದ ಸಂದೇಶಗಳನ�ನ� ತಾತ�ಕಾಲಿಕವಾಗಿ ಅಡಗಿಸಿಡ�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
-msgid "Show Hidde_n Messages"
-msgstr "ಅಡಗಿಸಿಡಲಾದ ಸಂದೇಶಗಳನ�ನ� ತೋರಿಸ�(_n)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1017
-msgid "Show messages that have been temporarily hidden"
-msgstr "ತಾತ�ಕಾಲಿಕವಾಗಿ ಅಡಗಿಸಿಡಲಾದ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ತೋರಿಸ�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:972
 msgid "Cancel the current mail operation"
 msgstr "ಪ�ರಸಕ�ತ ಮೈಲ� ಕಾರ�ಯವನ�ನ� ರದ�ದ� ಮಾಡ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:977
 msgid "Collapse All _Threads"
 msgstr "ಎಲ�ಲಾ ಸಂದೇಶ ತ�ರೆಡ�‌ಗಳನ�ನ� ಅಡಗಿಸ�(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:979
 msgid "Collapse all message threads"
 msgstr "ಎಲ�ಲಾ ಸಂದೇಶ ತ�ರೆಡ�‌ಗಳನ�ನ� ಅಡಗಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:984
 msgid "E_xpand All Threads"
 msgstr "ಎಲ�ಲಾ ತ�ರೆಡ�‌ಗಳ ವಿಸ�ತೃತ ರೂಪಗಳನ�ನ� ತೋರಿಸ�(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:986
 msgid "Expand all message threads"
 msgstr "ಎಲ�ಲಾ ಸಂದೇಶ ತ�ರೆಡ�‌ಗಳ ವಿಸ�ತೃತ ರೂಪಗಳನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:991
 msgid "_Message Filters"
 msgstr "ಸಂದೇಶ ಫಿಲ�ಟರ�ಗಳ�(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:993
 msgid "Create or edit rules for filtering new mail"
 msgstr "ಹೊಸ ಮೈಲ�� ಅನ�ನ� ಫಿಲ�ಟರ� ಮಾಡಲ� ನಿಯಮಗಳನ�ನ� ರಚಿಸ� ಅಥವ ಸಂಪಾದಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:998
 msgid "Search F_olders"
 msgstr "ಫೋಲ�ಡರಿನಲ�ಲಿ ಹ�ಡ�ಕ�(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
 msgid "Create or edit search folder definitions"
 msgstr "ಹ�ಡ�ಕ� ಕಡತಕೋಶದ ವಿವರಣೆಗಳನ�ನ� ರಚಿಸ� ಅಥವ ಸಂಪಾದಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
 msgid "_Subscriptions..."
 msgstr "ಚಂದಾದಾರಿಕೆಗಳ�(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ದೂರಸ�ಥ ಪರಿಚಾರಕಗಳಿಗೆ ಫೋಲ�ಡರ�ಗಳನ�ನ� ಚಂದಾದಾರನಾಗಿಸ� ಅಥವ ಚಂದಾದಾರಿಕೆಯನ�ನ� ರದ�ದ�ಗೊಳಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
 msgid "F_older"
 msgstr "ಫೋಲ�ಡರ�(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "_Label"
 msgstr "ಲೇಬಲ�(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "_New Folder..."
 msgstr "ಹೊಸ ಫೋಲ�ಡರ�(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
-msgid "Hide _Deleted Messages"
-msgstr "ಅಳಿಸಲಾದ ಸಂದೇಶಗಳನ�ನ� ಅಡಗಿಸಿಡ�(_D)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "ಅಳಿಸಲಾದ ಸಂದೇಶಗಳ ಮೇಲೆ ಒಂದ� ಗೆರೆ ಎಳೆದ� ತೋರಿಸ�ವ�ದರ ಬದಲ� ಅಡಗಿಸ�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Show Message _Preview"
 msgstr "ಸಂದೇಶ ಮ�ನ�ನೋಟವನ�ನ� ತೋರಿಸ�(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 #, fuzzy
 msgid "Show message preview pane"
 msgstr "ಸಂದೇಶ ಮ�ನ�ನೋಟ ವಿಂಡೋವನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#, fuzzy
+msgid "Show _Deleted Messages"
+msgstr "ಅಳಿಸಲಾದ ಸಂದೇಶಗಳನ�ನ� ಅಡಗಿಸಿಡ�(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#, fuzzy
+msgid "Show deleted messages with a line through them"
+msgstr "ಸಂದೇಶ-ಪಟ�ಟಿಯಲ�ಲಿ ಅಳಿಸಲಾದ ಸಂದೇಶಗಳನ�ನ� (ಹೊಡೆದ� ಹಾಕಲಾದಂತೆ) ತೋರಿಸ�."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "_Group By Threads"
 msgstr "ತ�ರೆಡ�‌ಗಳಿಗೆ ಅನ�ಗ�ಣವಾಗಿ ಗ�ಂಪ�ಮಾಡ�(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Threaded message list"
 msgstr "ತ�ರೆಡ�‌ ಮಾಡಲಾದ ಸಂದೇಶ ಪಟ�ಟಿ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Show message preview below the message list"
 msgstr "ಸಂದೇಶ ಪಟ�ಟಿಯ ಕೆಳಗಡೆಯಲ�ಲೆ ಸಂದೇಶ ಮ�ನ�ನೋಟವನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 #, fuzzy
 msgid "Show message preview alongside the message list"
 msgstr "ಸಂದೇಶ ಪಟ�ಟಿಯ ಕೆಳಗಡೆಯಲ�ಲೆ ಸಂದೇಶ ಮ�ನ�ನೋಟವನ�ನ� ತೋರಿಸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
 msgid "All Messages"
 msgstr "ಎಲ�ಲಾ ಸಂದೇಶಗಳ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
 msgid "Important Messages"
 msgstr "ಪ�ರಮ�ಖ ಸಂದೇಶಗಳ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Last 5 Days' Messages"
 msgstr "5 ದಿನಗಳ ಹಿಂದಿನ ಸಂದೇಶಗಳ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Messages Not Junk"
 msgstr "ಸಂದೇಶವ� ರದ�ದಿ ಅಲ�ಲ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "Messages with Attachments"
 msgstr "ಲಗತ�ಯಗಳನ�ನ� ಹೊಂದಿದ ಸಂದೇಶಗಳ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
 msgid "No Label"
 msgstr "ಯಾವ�ದೆ ಲೇಬಲ� ಇಲ�ಲ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1248
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Read Messages"
 msgstr "ಓದಲಾದ ಸಂದೇಶಗಳ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1255
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "Recent Messages"
 msgstr "ಇತ�ತೀಚಿನ ಸಂದೇಶಗಳ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "Unread Messages"
 msgstr "ಓದದೆ ಇರ�ವ ಸಂದೇಶಗಳ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 #, fuzzy
 msgid "Subject or Addresses contain"
 msgstr "ವಿಷಯ ಅಥವ ವಿಳಾಸಗಳ� ಇದನ�ನ� ಹೊಂದಿವೆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "All Accounts"
 msgstr "ಎಲ�ಲಾ ಖಾತೆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Current Account"
 msgstr "ಪ�ರಸ�ತ�ತ ಖಾತೆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Current Folder"
 msgstr "ಪ�ರಸ�ತ�ತ ಫೋಲ�ಡರ�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:892
+#: ../modules/mail/e-mail-shell-view-private.c:881
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "ಆರಿಸಲಾದ %d,"
 msgstr[1] "ಆರಿಸಲಾದ %d,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:903
+#: ../modules/mail/e-mail-shell-view-private.c:892
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "ಅಳಿಸಲ�ಪಟ�ಟ %d"
 msgstr[1] "ಅಳಿಸಲ�ಪಟ�ಟ %d"
 
-#: ../modules/mail/e-mail-shell-view-private.c:909
-#: ../modules/mail/e-mail-shell-view-private.c:916
+#: ../modules/mail/e-mail-shell-view-private.c:898
+#: ../modules/mail/e-mail-shell-view-private.c:905
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "ರದ�ದಿ %d"
 msgstr[1] "ರದ�ದಿ %d"
 
-#: ../modules/mail/e-mail-shell-view-private.c:922
+#: ../modules/mail/e-mail-shell-view-private.c:911
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "ಡ�ರಾಫ�ಟ�� %d"
 msgstr[1] "ಡ�ರಾಫ�ಟ�� %d"
 
-#: ../modules/mail/e-mail-shell-view-private.c:928
+#: ../modules/mail/e-mail-shell-view-private.c:917
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "ಕಳ�ಹಿಸದೆ ಇರ�ವ %d"
 msgstr[1] "ಕಳ�ಹಿಸದೆ ಇರ�ವ %d"
 
-#: ../modules/mail/e-mail-shell-view-private.c:934
+#: ../modules/mail/e-mail-shell-view-private.c:923
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "ಕಳ�ಹಿಸಿದ %d"
 msgstr[1] "ಕಳ�ಹಿಸಿದ %d"
 
-#: ../modules/mail/e-mail-shell-view-private.c:946
+#: ../modules/mail/e-mail-shell-view-private.c:935
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "ಓದದೆ ಇರ�ವ %d, "
 msgstr[1] "ಓದದೆ ಇರ�ವ %d, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:949
+#: ../modules/mail/e-mail-shell-view-private.c:938
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16221,77 +15635,76 @@ msgstr "ಖಾತೆಯ ಹ�ಡ�ಕಾಟ"
 msgid "Proxy _Logout"
 msgstr "ಪ�ರಾಕ�ಸಿ ಲಾಗ�ಔಟ�(_L)"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "ಸಕ�ರಿಯಗೊಂಡ"
+
+#: ../modules/mail/em-composer-prefs.c:476
 msgid "Language(s)"
 msgstr "ಭಾಷೆ(ಗಳ�)"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "ಪ�ರತಿ ಬಾರಿ"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "ದಿನದಲ�ಲಿ ಒಂದ� ಬಾರಿ"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "ವಾರದಲ�ಲಿ ಒಂದ� ಬಾರಿ"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "ತಿಂಗಳಲ�ಲಿ ಒಂದ� ಬಾರಿ"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:223
 msgid "Add Custom Junk Header"
 msgstr "ನಿಮ�ಮ ಇಚ�ಛೆಯ ರದ�ದಿ ಹೆಡರ�‌ಗಳ� ಸೇರಿಸ�"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:231
 msgid "Header Name:"
 msgstr "ಹೆಡರ� ಹೆಸರ�:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:232
 msgid "Header Value Contains:"
 msgstr "ಹೆಡರ� ಮೌಲ�ಯವ� ಇದನ�ನ� ಹೊಂದಿದೆ:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:332
 msgid "Header"
 msgstr "ಹೆಡರ�"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:336
 msgid "Contains Value"
 msgstr "ಈ ಮೌಲ�ಯವನ�ನ� ಹೊಂದಿದೆ"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:729 ../modules/mail/em-mailer-prefs.c:800
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s ಪ�ಲಗ�‌ಇನ� ಅನ�ಸ�ಥಾಪಿತಗೊಂಡಿದೆ ಹಾಗ� ಬೈನರಿಯ� ಅನ�ಸ�ಥಾಪಿತಗೊಂಡಿದೆ."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:737 ../modules/mail/em-mailer-prefs.c:809
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s ಪ�ಲಗ�ಇನ� ಲಭ�ಯವಿಲ�ಲ.  ದಯವಿಟ�ಟ� ಆ ಪ�ಯಾಕೇಜ� ಅನ�ಸ�ಥಾಪಿತಗೊಂಡಿದೆಯೆ ಎಂದ� ಪರಿಶೀಲಿಸಿ."
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:773
 msgid "No junk plugin available"
 msgstr "ಯಾವ�ದೆ ರದ�ದಿ ಪ�ಲಗ�ಇನ� ಲಭ�ಯವಿಲ�ಲ"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-#, fuzzy
-msgid "_Table column:"
-msgstr "ಟೇಬಲ� ಲಂಬಸಾಲ�:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1160
 #, fuzzy
 msgid "_Date header:"
 msgstr "ದಿನಾಂಕದ ಹೆಡರ�:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1161
 #, fuzzy
 msgid "Show _original header value"
 msgstr "ಮೂಲ ಗಾತ�ರವನ�ನ� ತೋರಿಸ�(_O)"
@@ -16327,16 +15740,8 @@ msgid ""
 msgstr ""
 "ಒಂದ� ಸಂದೇಶದ ಮ�ಖ�ಯಭಾಗದಲ�ಲಿ ಹ�ಡ�ಕಲ� ಲಗತ�ತ� ಜ�ಞಾಪನಾ ಪ�ಲಗ�ಇನ�‌ಗೆ ನೀಡಬೇಕಿರ�ವ ಸ�ಳಿವ�ಗಳ ಪಟ�ಟಿ"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"ಒಂದ� ಸಂದೇಶದ ಮ�ಖ�ಯಭಾಗದಲ�ಲಿ ಹ�ಡ�ಕಲ� ಲಗತ�ತ� ಜ�ಞಾಪನಾ ಪ�ಲಗ�ಇನ�‌ಗೆ ನೀಡಬೇಕಿರ�ವ ಸ�ಳಿವ�ಗಳ "
-"ಪಟ�ಟಿ."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "ಮ�ಖ�ಯಪದಗಳ�"
 
@@ -16421,7 +15826,8 @@ msgid "Restore from backup"
 msgstr "ಬ�ಯಾಕ�ಅಪ�‌ನಿಂದ ಮರಳಿ ಸ�ಥಾಪಿಸ�"
 
 #: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
+#, fuzzy
+msgid "_Backup Evolution Settings..."
 msgstr "ಬ�ಯಾಕ�ಅಪ� ಸಿದ�ಧತೆಗಳ�(_B)..."
 
 #: ../plugins/backup-restore/backup-restore.c:355
@@ -16430,7 +15836,8 @@ msgid "Backup Evolution data and settings to an archive file"
 msgstr "Evolution ಮಾಹಿತಿ ಹಾಗ� ಸಿದ�ಧತೆಗಳನ�ನ� ಬ�ಯಾಕ�ಅಪ� ಮಾಡ� ಹಾಗ� ಮರಳಿ ಸ�ಥಾಪಿಸ�"
 
 #: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
+#, fuzzy
+msgid "R_estore Evolution Settings..."
 msgstr "ಸಿದ�ಧತೆಗಳನ�ನ� ಮರಳಿ ಸ�ಥಾಪಿಸ�(_e)..."
 
 #: ../plugins/backup-restore/backup-restore.c:362
@@ -16484,7 +15891,8 @@ msgid "Restarting Evolution"
 msgstr "Evolution ಅನ�ನ� ಮರಳಿಸ�ಥಾಪಿಸಲಾಗ�ತ�ತಿದೆ"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+#, fuzzy
+msgid "Back up current Evolution data"
 msgstr "ಪ�ರಸಕ�ತ Evolution ದತ�ತಾಂಶವನ�ನ� ಬ�ಯಾಕ�‌ಅಪ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
 #: ../plugins/backup-restore/backup.c:260
@@ -16514,31 +15922,31 @@ msgid "Restoring from the folder %s"
 msgstr "%s ಫೋಲ�ಡರಿನಿಂದ ಮರಳಿಸ�ಥಾಪಿಸಲಾಗ�ತ�ತಿದೆ"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Evolution ಬ�ಯಾಕ�ಅಪ�"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Evolution ಮರಳಿಸ�ಥಾಪನೆ"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "Evolution ದತ�ತಾಂಶವನ�ನ� ಬ�ಯಾಕ�ಅಪ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "ದಯವಿಟ�ಟ� Evolution ದತ�ತಾಂಶವನ�ನ� ಬ�ಯಾಕ�ಅಪ�‌ ಮಾಡ�ವವರೆಗೂ ಕಾಯಿರಿ."
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "Evolution ಮಾಹಿತಿಯನ�ನ� ಮರಳಿ ಸ�ಥಾಪಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "ದಯವಿಟ�ಟ� Evolution ದತ�ತಾಂಶವನ�ನ� ಮರಳಿ ಸ�ಥಾಪಿಸ�ವವರೆಗೂ ಕಾಯಿರಿ."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "ನಿಮ�ಮ ಖಾತೆಯಲ�ಲಿನ ದತ�ತಾಂಶದ ಪ�ರಮಾಣಕ�ಕೆ ಅನ�ಗ�ಣವಾಗಿ ಇದಕ�ಕಾಗಿ ಸ�ವಲ�ಪ ಸಮಯ ಹಿಡಿಯಬಹ�ದ�."
 
@@ -16601,35 +16009,36 @@ msgstr ""
 "ಇರ�ವ ವಿಂಡೋಗಳನ�ನ� ಮ�ಚ�ಚಿ. Evolution ಅನ�ನ� ಮರಳಿ ಸ�ಥಾಪಿಸಿದ ನಂತರ ಸ�ವಯಂಚಾಲಿತವಾಗಿ "
 "ಆರಂಭಗೊಳ�ಳಲ� ನೀವ� ಬಯಸಿದರೆ, ದಯವಿಟ�ಟ� ಟಾಗಲ� ಗ�ಂಡಿಯನ�ನ� ಶಕ�ತಗೊಳಿಸಿ."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "ಸ�ವಯಂಚಾಲಿತ ಸಂಪರ�ಕವಿಳಾಸಗಳ�"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "ಸಂದೇಶಗಳಿಗೆ ಮಾರ�ತ�ತರಿಸ�ವಾಗ ವಿಳಾಸ ಪ�ಸ�ತಕದ ನಮೂದ�ಗಳನ�ನ� ರಚಿಸ� (_a)"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "ಸ�ವಯಂಚಾಲಿತ ಸಂಪರ�ಕವಿಳಾಸಗಳಿಗಾಗಿ ವಿಳಾಸ ಪ�ಸ�ತಕವನ�ನ� ಆರಿಸಿ"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "ತಕ�ಷಣದ ಸಂದೇಶ ಕಳ�ಹಿಸ�ವ ಸಂಪರ�ಕವಿಳಾಸಗಳ�"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+#, fuzzy
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "ಪಿಡ�ಜಿನ� ಗೆಳೆಯರ ಪಟ�ಟಿಯಿಂದ ಸಂಪರ�ಕ ಮಾಹಿತಿ ಹಾಗ� ಚಿತ�ರಗಳನ�ನ� ಮೇಳೈಸಿ"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "ಪಿಡ�ಜಿನ� ಗೆಳೆಯರ ಪಟ�ಟಿಗಾಗಿ ವಿಳಾಸ ಪ�ಸ�ತಕವನ�ನ� ಆರಿಸಿ"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "ಗೆಳೆಯರ ಪಟ�ಟಿಯೊಂದಿಗೆ ಮೇಳೈಸ�(_b)"
 
@@ -16652,33 +16061,33 @@ msgstr ""
 "ಇಮೈಲ� ವಿಳಾಸಗಳಿಂದ ತ�ಂಬಿಸ�ತ�ತಾ ಹೋಗ�ತ�ತದೆ. ನಿಮ�ಮ ಗೆಳೆಯರ ಪಟ�ಟಿಗಳಿಂದ �ಎಮ� ಸಂಪರ�ಕ "
 "ಮಾಹಿತಿಯನ�ನೂ ಸಹ ತ�ಂಬಿಸ�ತ�ತದೆ."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr ""
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "%s ಅನ�ನ� ಸ�ಪಾನ� ಮಾಡ�ವಾಗ ದೋಷ ಕಂಡ� ಬಂದಿದೆ: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter ಉಪ ಪ�ರಕ�ರಿಯೆಯ� ಪ�ರತಿಕ�ರಿಯಿಸ�ತ�ತಿಲ�ಲ, ಕೊಲ�ಲಲಾಗ�ತ�ತಿದೆ..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Bogofilter ಉಪಪ�ರಕ�ರಿಯೆಗಾಗಿ ಕಾಯ�ವ�ದಕ�ಕೆ ತಡೆಯ�ಂಟಾಗಿದೆ, ಅಂತ�ಯಗೊಳಿಸಲಾಗ�ತ�ತಿದೆ..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Bogofilter ಗೆ ಪೈಪ� ಮಾಡ�ವ�ದ� ವಿಫಲಗೊಂಡಿದೆ, ದೋಷ ಸಂಜ�ಞೆ: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
 msgid "Convert message text to _Unicode"
 msgstr "ಸಂದೇಶ ಪಠ�ಯವನ�ನ� ಯ�ನಿಕೋಡ��ಗೆ ಬದಲಾಯಿಸ�(_U)"
 
@@ -16706,49 +16115,49 @@ msgstr "Bogofilter ಆದ�ಯತೆಗಳ�"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Bogofilter ಅನ�ನ� ಬಳಸಿಕೊಂಡ� ರದ�ದಿ ಸಂದೇಶಗಳನ�ನ� ಫಿಲ�ಟರ� ಮಾಡಿ."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
 "%d - %s"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
 msgid "Unknown error"
 msgstr "ಗೊತ�ತಿಲ�ಲದ ದೋಷ"
 
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 #, fuzzy
 msgid "Failed to parse server response."
 msgstr "ಡೆಲಿಗೇಟ�‌ಗಳನ�ನ� ಅಪ�‌ಡೇಟ�‌ಗಳನ�ನ� ಮಾಡಲ� ವಿಫಲವಾಗಿದೆ:"
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "ಘಟನೆಗಳ�"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 #, fuzzy
 msgid "User's calendars"
 msgstr "ಹೊಸ ಕ�ಯಾಲೆಂಡರ�"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 #, fuzzy
 msgid "Failed to get server URL."
 msgstr "LDAP ಪರಿಚಾರಕದೊಂದಿಗೆ ದೃಢೀಕರಿಸ�ವಲ�ಲಿ ವಿಫಲವಾಗಿದೆ."
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
 #: ../plugins/caldav/caldav-browse-server.c:1272
 #, fuzzy
 msgid "Searching for user's calendars..."
@@ -16757,27 +16166,27 @@ msgstr ""
 "\n"
 "ಸಂಪರ�ಕವಿಳಾಸಕ�ಕಾಗಿ ಹ�ಡ�ಕಲಾಗ�ತ�ತಿದೆ..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 #, fuzzy
 msgid "Could not find any user calendar."
 msgstr "ಯಾವ�ದೆ ಕ�ಯಾಲೆಂಡರ�ಗಳ� ಕಂಡ� ಬಂದಿಲ�ಲ"
 
-#: ../plugins/caldav/caldav-browse-server.c:794
+#: ../plugins/caldav/caldav-browse-server.c:793
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:796
+#: ../plugins/caldav/caldav-browse-server.c:795
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:798
 #, fuzzy, c-format
 msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
 msgstr "%s ಕ�ಕಾಗಿ ಗ�ಪ�ತಪದವನ�ನ� ನಮೂದಿಸಿ (ಬಳಕೆದಾರ %s)"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:855
 #, fuzzy, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr ""
@@ -16785,7 +16194,7 @@ msgstr ""
 " %s"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1090
 #, fuzzy
 msgid "Searching folder content..."
 msgstr ""
@@ -16793,12 +16202,12 @@ msgstr ""
 "\n"
 "ಸಂಪರ�ಕವಿಳಾಸಕ�ಕಾಗಿ ಹ�ಡ�ಕಲಾಗ�ತ�ತಿದೆ..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1133
 #, fuzzy
 msgid "List of available calendars:"
 msgstr "ಸ�ಥಳೀಯ ಕ�ಯಾಲೆಂಡರ�ಗಳ�"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1170
 msgid "Supports"
 msgstr "ಬೆಂಬಲಿಸ�ತ�ತದೆ"
 
@@ -16820,26 +16229,26 @@ msgstr ""
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/caldav/caldav-source.c:216
 #: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
+#: ../plugins/caldav/caldav-source.c:220
 #: ../plugins/google-account-setup/google-contacts-source.c:305
 msgid "Use _SSL"
 msgstr "_SSL ಅನ�ನ� ಬಳಸ�"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:229
 msgid "Brows_e server for a calendar"
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
+#: ../plugins/caldav/caldav-source.c:241
+#: ../plugins/calendar-file/calendar-file.c:182
 #: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
+#: ../plugins/calendar-weather/calendar-weather.c:395
 #: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "ಪ�ನಶ�ಚೇತನಗೊಳಿಸ�(_f):"
 
@@ -16851,31 +16260,31 @@ msgstr "Evolution ಗೆ CalDAV ಬೆಂಬಲವನà³�ನà³� ಸೇರಿಸà²
 msgid "CalDAV Support"
 msgstr "CalDAV ಬೆಂಬಲ"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:116
 msgid "_Customize options"
 msgstr "ಕಸ�ಟಮೈಸ� ಆಯ�ಕೆಗಳ�(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:135
 msgid "File _name:"
 msgstr "ಕಡತದ ಹೆಸರ�(_n):"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:139
 msgid "Choose calendar file"
 msgstr "ಒಂದ� ಕ�ಯಾಲೆಂಡರ� ಕಡತವನ�ನ� ಆರಿಸಿ"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:187
 msgid "On open"
 msgstr "ತೆರೆದಾಗ"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:188
 msgid "On file change"
 msgstr "ಕಡತ ಬದಲಾಯಿಸಿದಾಗ"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:189
 msgid "Periodically"
 msgstr "ವೈಯಕ�ತಿಕ"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:204
 msgid "Force read _only"
 msgstr "ಓದಲ� ಮಾತ�ರ ಎಂದ� ಒತ�ತಾಯಿಸ�(_o)"
 
@@ -16939,26 +16348,26 @@ msgstr "ಹವಾಮಾನ: ಸ�ವಚ�ಛ ರಾತ�ರಿ"
 msgid "Weather: Thunderstorms"
 msgstr "ಹವಾಮಾನ: ಮಿಂಚ�ಗ�ಡ�ಗ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "ಒಂದ� ಸ�ಥಳವನ�ನ� ಆರಿಸ�"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "ಯಾವ�ದೂ ಇಲ�ಲ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "ಘಟಕಗಳ�(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "ಮೆಟ�ರಿಕ� (ಸೆಲ�ಸಿಯಸ�, ಸೆ.ಮಿ., ಇತರೆ)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "ಇಂಪೀರಿಯಲ� (ಫ�ಯಾರೆನ��ಹೀಟ�, ಇಂಚ�ಗಳ�, ಇತರೆ)"
 
@@ -17083,12 +16492,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "ಯಾವ�ದೂ ಇಲ�ಲ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "ಕಸ�ಟಮ� ಹೆಡರ�(_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17096,12 +16505,12 @@ msgstr ""
 "ನಿಮ�ಮ ಇಚ�ಛೆಯ ಹೆಡರ� ಕೀಲಿ ಮೌಲ�ಯವನ�ನ� ಸೂಚಿಸ�ವ ಒಂದ� ವಿನ�ಯಾಸವ�:\n"
 "ನಿಮ�ಮ ಇಚ�ಛೆಯ ಹೆಡರ� ಕೀಲಿಯ ಮೌಲ�ಯಗಳ ಹೆಸರ�ಗಳ� \";\" ಇಂದ ಪ�ರತ�ಯೇಕಿಸಲ�ಪಟ�ಟಿರ�ತ�ತದೆ."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:950
 msgid "Key"
 msgstr "ಕೀ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "ಮೌಲ�ಯಗಳ�"
 
@@ -17123,7 +16532,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "ಮೈಲ� ರಚನಾಕಾರನಲ�ಲಿ ಕೀಲಿಯನ�ನ� ಒತ�ತಿದಾಗ ತಾನಾಗಿಯೆ ಸಂಪಾದಕವನ�ನ� ಆರಂಭಿಸ�"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:118
 msgid "Automatically launch when a new mail is edited"
 msgstr "ಹೊಸ ಮೈಲ� ಅನ�ನ� ಸಂಪಾದಿಸಿದಾಗ ಸ�ವಯಂಚಾಲಿತವಾಗಿ ಆರಂಭಿಸ�"
 
@@ -17135,11 +16544,11 @@ msgstr "ಪೂರà³�ವನಿಯೋಜಿತ ಹೊರಗಿನ ಸಂಪಾದà
 msgid "The default command that must be used as the editor."
 msgstr "ಸಂಪಾದಕವಾಗಿ ಬಳಸಬೇಕಿರ�ವ ಪೂರ�ವನಿಯೋಜಿತ ಆಜ�ಞೆ."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:107
 msgid "Command to be executed to launch the editor: "
 msgstr "ಸಂಪಾದಕವನ�ನ� ಆರಂಭಿಸಲ� ಕಾರ�ಯಗತಗೊಳಿಸಬೇಕಿರ�ವ ಆಜ�ಞೆ: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:108
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17147,8 +16556,8 @@ msgstr ""
 "ಎಮಾಕ�ಸಿಗಾಗಿ \"xemacs\" ಅನ�ನ� ಬಳಸಿ\n"
 "VI ಗೆ \"gvim -f\" ಅನ�ನ� ಬಳಸಿ"
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:374
+#: ../plugins/external-editor/external-editor.c:376
 msgid "Compose in External Editor"
 msgstr "ಹೊರಗಿನ ಸಂಪಾದಕದಲ�ಲಿ ರಚಿಸ�"
 
@@ -17263,7 +16672,7 @@ msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
 
 #: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
+#: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "ಗೂಗಲ�"
 
@@ -17272,14 +16681,14 @@ msgstr "ಗೂಗಲ�"
 msgid "<b>Server</b>"
 msgstr "<b>ಪರಿಚಾರಕ</b>"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "ಚಂದಾದಾರನಾದ ಕ�ಯಾಲೆಂಡರ�ಗಳ ಪಟ�ಟಿಯನ�ನ� ನಿಲ�ಕಿಸಿಕೊಳ�ಳಲ� ಬಳಕೆದಾರ %s ಗಾಗಿ ಗ�ಪ�ತಪದವನ�ನ� "
 "ನಮೂದಿಸ�."
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17288,19 +16697,18 @@ msgstr ""
 "ಗೂಗಲ� ಪರಿಚಾರಕದಿಂದ ಮಾಹಿತಿಯನ�ನ� ಓದಲಾಗಿಲ�ಲ.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
 msgid "Unknown error."
 msgstr "ಗೊತ�ತಿರದ ದೋಷ."
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "ಕ�ಯಾಲೆಂಡರ�(_e):"
 
-#: ../plugins/google-account-setup/google-source.c:666
-#, fuzzy
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
 msgstr "ಪಟ�ಟಿಯನ�ನ� ಮರಳಿ ಪಡೆ(_l)"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
@@ -17311,7 +16719,7 @@ msgstr "Evolution ಗೆ ಗೂಗಲ� ಕ�ಯಾಲೆಂಡರ�ಗಳನ
 msgid "Google Calendars"
 msgstr "ಗೂಗಲ� ಕ�ಯಾಲೆಂಡರ�ಗಳ�"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "ತಾಳೆಪಟ�ಟಿ"
 
@@ -17343,12 +16751,12 @@ msgstr "ತಾತ�ಕಾಲಿಕವಾಗಿ ಒಪ�ಪಿಕೊ"
 msgid "Rese_nd Meeting..."
 msgstr "ಮೀಟಿಂಗನ�ನ� ಮರಳಿ ಕಳ�ಹಿಸ�(_n)..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Create folder"
 msgstr "ಫೋಲ�ಡರನ�ನ� ರಚಿಸ�"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:219
 #, fuzzy, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17373,19 +16781,19 @@ msgstr ""
 "ಹಂಚಲಾದ ಕಡತವನ�ನ� ಅನ�ಸ�ಥಾಪಿಸಲ� 'ಮ�ಂದಕ�ಕೆ' ಅನ�ನ� ಕ�ಲಿಕ�ಕಿಸಿ\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "ಹಂಚಲಾದ ಫೋಲ�ಡರನ�ನ� ಅನ�ಸ�ಥಾಪಿಸ�"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "ಹಂಚಲಾದ ಫೋಲ�ಡರ� ಅನ�ಸ�ಥಾಪನೆ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "ರದ�ದಿ ಸಿದ�ಧತೆಗಳ�"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "ರದ�ದಿ ಮೈಲ� ಸಿದ�ಧತೆಗಳ�"
@@ -17421,7 +16829,7 @@ msgstr "ತೆಗೆದ� ಹಾಕ�(_R)"
 msgid "Message Retract"
 msgstr "ಸಂದೇಶ ಹೆಡರ�"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -17429,7 +16837,7 @@ msgstr ""
 "ಸಂದೇಶವನ�ನ� ಹಿಂದಕ�ಕೆ ಪಡೆದಾಗ ಅದನ�ನ� ಕಳ�ಹಿಸಲಾದವರ ಅಂಚೆಪೆಟ�ಟಿಗೆಯಿಂದ ತೆಗೆದ� "
 "ಹಾಕಲ�ಪಡಬಹ�ದ�. ಹೀಗೆ ಮಾಡಬೇಕೆಂದ� ನೀವ� ಖಚಿತವೆ?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "ಸಂದೇಶವನ�ನ� ಯಶಸ�ವಿಯಾಗಿ ಹಿಂದಕ�ಕೆ ಪಡೆಯಲಾಯಿತ�"
 
@@ -17635,43 +17043,49 @@ msgstr "<b>ಖಾತೆಯ ಹೆಸರ�</b>"
 msgid "Proxy Login"
 msgstr "ಪ�ರಾಕ�ಸಿ ಪ�ರವೇಶ"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s %s ಗಾಗಿ ಗ�ಪ�ತಪದವನ�ನ� ನಮೂದಿಸಿ (ಬಳಕೆದಾರ %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:690
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "ಖಾತೆಯ� ಆನ�‌ಲೈನ�‌ನಲ�ಲಿದ�ದಾಗ ಮಾತ�ರ ಪ�ರಾಕ�ಸಿ ಟ�ಯಾಬ� ಲಭ�ಯವಾಗಿರ�ತ�ತದೆ."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "ಖಾತೆಯ� ಶಕ�ತಗೊಂಡಿದ�ದಾಗ ಮಾತ�ರ ಪ�ರಾಕ�ಸಿ ಟ�ಯಾಬ� ಲಭ�ಯವಾಗಿರ�ತ�ತದೆ."
 
-#: ../plugins/groupwise-features/proxy.c:931
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+msgctxt "GW"
+msgid "Proxy"
+msgstr "ಪ�ರಾಕ�ಸಿ"
+
+#: ../plugins/groupwise-features/proxy.c:929
 #: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "ಬಳಕೆದಾರನನ�ನ� ಸೇರಿಸಿ"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "ಸ�ಧಾರಿತ ಕಳ�ಹಿಸ�ವ ಆಯ�ಕೆಗಳ�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:313
 #: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "ಬಳಕೆದಾರರ�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:314
 msgid "Enter the users and set permissions"
 msgstr "ಬಳಕೆದಾರನನ�ನ� ನಮೂದಿಸಿ ಹಾಗ� ಅನ�ಮತಿಗಳನ�ನ� ಹೊಂದಿಸಿ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:412
 msgid "Sharing"
 msgstr "ಹಂಚಿಕೆ"
 
@@ -17683,63 +17097,55 @@ msgstr "ಕಸ�ಟಮ� ಸೂಚನೆ"
 msgid "Add   "
 msgstr "ಸೇರಿಸ�   "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "ಸಂದೇಶದ ಸ�ಥಿತಿ"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "ವಿಷಯ:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "ಯಿಂದ:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "ರಚಿಸಿದ ದಿನಾಂಕ:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "ಸ�ವೀಕರಿಸ�ವವ: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "ತಲ�ಪಿಸಲಾಗಿದೆ: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "ತೆರೆಯಲಾಗಿದೆ: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "ಅಂಗೀಕರಿಸಲ�ಪಟ�ಟಿದೆ: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "ಅಳಿಸಲಾಗಿದೆ: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "ತಿರಿಸ�ಕರಿಸಲ�ಪಟ�ಟಿದೆ: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "ಪೂರ�ಣಗೊಂಡಿದೆ: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "ತಲ�ಪಿಸಲಾಗಿಲ�ಲ: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Evolution ಗೆ ಹ�ಲಾ ಬೆಂಬಲವನ�ನ� ಸೇರಿಸಿ."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "ಹ�ಲಾ ಬೆಂಬಲ"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 #, fuzzy
 msgid "Inline Image"
@@ -17750,12 +17156,12 @@ msgstr "ಸಾಲಿನೊಳಗಿನ ವಿಕಾರ�ಡ�ಗಳ�"
 msgid "View image attachments directly in mail messages."
 msgstr "ಮೈಲ� ಸಂದೇಶಗಳಲ�ಲಿ ನೇರವಾಗಿ ವಿಕಾರ�ಡ�ಗಳನ�ನ� ಅನ�ನ� ತೋರಿಸ�."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:325
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "ಕಸ�ಟಮ� ಹೆಡರ�‌ಗಳ�"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:338
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP ಹೆಡರ�‌ಗಳ�"
@@ -17801,142 +17207,142 @@ msgstr "ನಿಮà³�ಮ IMAP ಖಾತೆಗಳನà³�ನà³� ಸರಿಪಡಿà²
 msgid "IMAP Features"
 msgstr "IMAP ವೈಶಿಷ�ಟ�ಯಗಳ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/itip-formatter/itip-formatter.c:475
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "'%s' ಕ�ಯಾಲೆಂಡರನ�ನ� ಲೋಡ� ಮಾಡ�ವಲ�ಲಿ ವಿಫಲವಾಗಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:641
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "'%s' ಕ�ಯಾಲೆಂಡರಿನಲ�ಲಿನ ಒಂದ� ಅಪಾಯಿಂಟ�‌ಮೆಂಟ�‌ ಈ ಮೀಟಿಂಗಿಗೆ ತೊಡಕಾಗ�ತ�ತಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:677
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' ಕ�ಯಾಲೆಂಡರಿನಲ�ಲಿ ಅಪಾಯಿಂಟ�‌ಮೆಂಟ�‌ ಕಂಡ�ಬಂದಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Unable to find any calendars"
 msgstr "ಯಾವ�ದೆ ಕ�ಯಾಲೆಂಡರ�ಗಳ� ಕಂಡ� ಬಂದಿಲ�ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find this meeting in any calendar"
 msgstr "ಈ ಮೀಟಿಂಗ� ಯಾವ�ದೆ ಕ�ಯಾಲೆಂಡರಿನಲ�ಲಿ ಕಂಡ�ಬಂದಿಲ�ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find this task in any task list"
 msgstr "ಈ ಕಾರ�ಯವ� ಯಾವ�ದೆ ಕಾರ�ಯ ಪಟ�ಟಿಯಲ�ಲಿ ಕಂಡ�ಬಂದಿಲ�ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this memo in any memo list"
 msgstr "ಈ ಮೆಮೊ ಯಾವ�ದೆ ಮೆಮೊ ಪಟ�ಟಿಯಲ�ಲಿ ಕಂಡ�ಬಂದಿಲ�ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:862
 msgid "Opening the calendar. Please wait.."
 msgstr "ಕ�ಯಾಲೆಂಡರನ�ನ� ತೆರೆಯಲಾಗ�ತ�ತಿದೆ. ದಯವಿಟ�ಟ� ಕಾಯಿರಿ.."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:865
 msgid "Searching for an existing version of this appointment"
 msgstr "ಈ ಅಪಾಯಿಂಟ�‌ಮೆಂಟಿನ ಈಗಿನ ಒಂದ� ಆವೃತ�ತಿಗಾಗಿ ಹ�ಡ�ಕಲಾಗ�ತ�ತಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1046
 msgid "Unable to parse item"
 msgstr "ಅಂಶವನ�ನ� ಪಾರ�ಸ� ಮಾಡಲಾಗಿಲ�ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "'%s' ಕ�ಯಾಲೆಂಡರಿಗೆ ಅಂಶವನ�ನ� ಕಳ�ಹಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1145
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "'%s' ಕ�ಯಾಲೆಂಡರಿಗೆ ಕಳ�ಹಿಸಿದ�ದ� ಅಂಗೀಕರಿಸಲ�ಪಟ�ಟಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1149
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ಕ�ಯಾಲೆಂಡರ� '%s' ಅನ�ನ� ತಾತ�ಕಾಲಿಕ ಎಂದ� ಕಳ�ಹಿಸಲಾಗಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1154
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "'%s' ಕ�ಯಾಲೆಂಡರಿಗೆ ಕಳ�ಹಿಸಿದ�ದ� ತಿರಸ�ಕರಿಸಲ�ಪಟ�ಟಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' ಕ�ಯಾಲೆಂಡರಿಗೆ ಕಳ�ಹಿಸಿದ�ದ� ರದ�ದ� ಮಾಡಲ�ಪಟ�ಟಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ವ�ಯವಸ�ಥಾಪಕರ� ಪ�ರತಿನಿಧಿ %s ಅನ�ನ� ತೆಗೆದ� ಹಾಕಿದ�ದಾರೆ "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ಡೆಲಿಗೇಟ�‌ಗೆ ರದ�ದತಿ ಸೂಚನೆಯನ�ನ� ಕಳ�ಹಿಸಲಾಗಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1262
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ಡೆಲಿಗೇಟ�‌ಗೆ ರದ�ದತಿ ಸೂಚನೆಯನ�ನ� ಕಳ�ಹಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1373
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ ಸ�ಥಿತಿಯನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡಲಾಗಲಿಲ�ಲ �ಕೆಂದರೆ ಸ�ಥಿತಿಯ� ಅಮಾನ�ಯವಾಗಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1402
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರನ�ನ� ಅಪ�ಡೇಟ�‌ ಮಾಡಲಾಗಲಿಲ�ಲ. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Attendee status updated"
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ ಸ�ಥಿತಿಯನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡಲಾಗಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 msgid "Meeting information sent"
 msgstr "ಮೀಟಿಂಗ� ಮಾಹಿತಿಯನ�ನ� ಕಳ�ಹಿಸಲಾಗಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1435
 msgid "Task information sent"
 msgstr "ಕಾರ�ಯ ಮಾಹಿತಿಯನ�ನ� ಕಳ�ಹಿಸಲಾಗಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1438
 msgid "Memo information sent"
 msgstr "ಮೆಮೊ ಮಾಹಿತಿಯನ�ನ� ಕಳ�ಹಿಸಲಾಗಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ಮೀಟಿಂಗ� ಮಾಹಿತಿಯನ�ನ� ಕಳ�ಹಿಸಲಾಗಿಲ�ಲ, ಮೀಟಿಂಗ� ಅಸ�ತಿತ�ವದಲ�ಲಿ ಇಲ�ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1450
 msgid "Unable to send task information, the task does not exist"
 msgstr "ಕಾರ�ಯ ಮಾಹಿತಿಯನ�ನ� ಕಳ�ಹಿಸಲಾಗಿಲ�ಲ, ಕಾರ�ಯವ� ಅಸ�ತಿತ�ವದಲ�ಲಿ ಇಲ�ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ಮೆಮೊ ಮಾಹಿತಿಯನ�ನ� ಕಳ�ಹಿಸಲಾಗಿಲ�ಲ, ಮೆಮೊ ಅಸ�ತಿತ�ವದಲ�ಲಿ ಇಲ�ಲ"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 #, fuzzy
 msgid "calendar.ics"
 msgstr "ಕ�ಯಾಲೆಂಡರ�ಗಳ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1523
 #, fuzzy
 msgid "Save Calendar"
 msgstr "ಹೊಸ ಕ�ಯಾಲೆಂಡರ�"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 #: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "ಲಗತ�ತಿಸಲಾದ ಕ�ಯಾಲೆಂಡರ� ಸರಿಯಾದ�ದಲ�ಲ"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 #: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17944,25 +17350,25 @@ msgstr ""
 "ಸಂದೇಶವ� ಒಂದ� ಕ�ಯಾಲೆಂಡರ� ಅನ�ನ� ಹೊಂದಿದೆ ಎಂದ� ಹೇಳ�ತ�ತಿದೆ, ಆದರೆ ಕ�ಯಾಲೆಂಡರ� ಒಂದ� "
 "ಮಾನ�ಯವಾದ �ಕ�ಯಾಲೆಂಡರ� ಆಗಿಲ�ಲ."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1628
+#: ../plugins/itip-formatter/itip-formatter.c:1656
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "The item in the calendar is not valid"
 msgstr "ಕ�ಯಾಲೆಂಡರಿನಲ�ಲಿನ ಅಂಶವ� ಮಾನ�ಯವಾದ�ದಲ�ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1629
+#: ../plugins/itip-formatter/itip-formatter.c:1657
+#: ../plugins/itip-formatter/itip-formatter.c:1763
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "ಬಿಡ�ವಿರ�ವ/ಕಾರ�ಯನಿರತ(_F)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1670
 msgid "The calendar attached contains multiple items"
 msgstr "ಲಗತ�ತಿಸಲಾದ ಕ�ಯಾಲೆಂಡರ� ಅನೇಕ ಅಂಶಗಳನ�ನ� ಒಳಗೊಂಡಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1671
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17970,216 +17376,216 @@ msgstr ""
 "ಈ ಎಲ�ಲಾ ಅಂಶಗಳನ�ನ� ಸಂಸ�ಕರಿಸಲ�, ಕಡತವನ�ನ� ಉಳಿಸಬೇಕ� ಹಾಗ� ಕ�ಯಾಲೆಂಡರ� ಅನ�ನ� ಆಮದ� "
 "ಮಾಡಿಕೊಳ�ಳಬೇಕ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2436
 msgid "This meeting recurs"
 msgstr "ಈ ಮೀಟಿಂಗ� ಪ�ನರಾವರ�ತಿತಗೊಳ�ಳ�ತ�ತದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2439
 msgid "This task recurs"
 msgstr "ಈ ಕಾರ�ಯ ಪ�ನರಾವರ�ತಿತಗೊಳ�ಳ�ತ�ತದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2442
 msgid "This memo recurs"
 msgstr "ಈ ಮೆಮೊ ಪ�ನರಾವರ�ತಿತಗೊಳ�ಳ�ತ�ತದೆ"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2676
 msgid "_Delete message after acting"
 msgstr "ಕಾರ�ಯಾಚರಣೆಯ ನಂತರ ಸಂದೇಶವನ�ನ� ಅಳಿಸಿ ಹಾಕ�(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2686
+#: ../plugins/itip-formatter/itip-formatter.c:2719
 msgid "Conflict Search"
 msgstr "ತೊಡಕಿಗಾಗಿ ಹ�ಡ�ಕ�"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2701
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ಮೀಟಿಂಗ�‌ಗಳ ನಡ�ವಿನ ತೊಡಕಿಗಾಗಿ ಹ�ಡ�ಕಲ� ಕ�ಯಾಲೆಂಡರ�ಗಳನ�ನ� ಆರಿಸಿ"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "ಇಂದ� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "ಇಂದ� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "ಇಂದ� %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "ನಾಳೆ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "ನಾಳೆ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "ನಾಳೆ %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "ನಾಳೆ %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "ದಯವಿಟ�ಟ� <b>%s</b> ಪರವಾಗಿ ಮಾರ�ತ�ತರಿಸ�"
 
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "<b>%s</b> ನ ಪರವಾಗಿ ಸ�ವೀಕರಿಸಲಾಗಿದೆ"
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:358
 #, 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:364
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಮಾಹಿತಿಯನ�ನ� <b>%s</b> ಪ�ರಕಟಿಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಅನ�ನ� ನಿಮಗೆ ನಿಯೋಜಿಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:368
 #, 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:374
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ�‌ನಲ�ಲಿ ನೀವ� ಇರಬೇಕೆಂದ� <b>%s</b> ಮನವಿ ಮಾಡಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, 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:382
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "ಈಗಿರ�ವ ಒಂದ� ಮೀಟಿಂಗ�‌ಗೆ <b>%s</b> ಸೇರಿಸಲ� ಬಯಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18188,87 +17594,87 @@ msgstr ""
 "ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ�‌ನ ಬಗ�ಗೆ <b>%s</b> %s ಮೂಲಕ ಇತ�ತೀಚಿನ ಮಾಹಿತಿಯನ�ನ� ಪಡೆದ�ಕೊಳ�ಳಲ� "
 "ಬಯಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:384
 #, 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:392
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> %s ಮೂಲಕ ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಮಾರ�ತ�ತರವನ�ನ� ಹಿಂದಕ�ಕೆ ಕಳ�ಹಿಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಮಾರ�ತ�ತರವನ�ನ� ಹಿಂದಕ�ಕೆ ಕಳ�ಹಿಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> %s ಮೂಲಕ ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗನ�ನ� ರದ�ದ� ಮಾಡಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗನ�ನ� ರದ�ದ� ಮಾಡಿದ�ದಾರೆ."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> ವ� %s ನ ಮೂಲಕ ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಬದಲಾವಣೆಗಳನ�ನ� ಪ�ರಸ�ತಾಪಿಸಿದ�ದಾರೆ."
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಮೀಟಿಂಗ� ಬದಲಾವಣೆಗಳನ�ನ� ಪ�ರಸ�ತಾಪಿಸಿದ�ದಾರೆ."
 
-#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:406
 #, 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:412
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ವ� ಈ ಕೆಳಗಿನ ಬದಲಾವಣೆಗಳನ�ನ� ತಿರಸ�ಕರಿಸಿದ�ದಾರೆ."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> %s ಮೂಲಕ ಈ ಕೆಳಗಿನ ಕಾರ�ಯವನ�ನ� ಪ�ರಕಟಿಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಕಾರ�ಯವನ�ನ� ಪ�ರಕಟಿಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:453
 #, 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:460
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "ನಿಮಗೆ <b>%s</b> %s ಮೂಲಕ ಒಂದ� ಕಾರ�ಯವನ�ನ� ನಿಯೋಜಿಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> ನಿಮಗೆ ಒಂದ� ಕಾರ�ಯವನ�ನ� ಸೂಚಿಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, 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:470
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ಈಗಿರ�ವ ಒಂದ� ಕಾರ�ಯಕ�ಕೆ ಸೇರಿಸಲ� ಬಯಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18277,7 +17683,7 @@ msgstr ""
 "ನಿಯೋಜಿಸಲಾದ ಈ ಕೆಳಗಿನ ಕಾರ�ಯದ ಬಗ�ಗೆ <b>%s</b> %s ಮೂಲಕ ಇತ�ತೀಚಿನ ಮಾಹಿತಿಯನ�ನ� "
 "ಪಡೆದ�ಕೊಳ�ಳಲ� ಬಯಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18286,192 +17692,194 @@ msgstr ""
 "ನಿಯೋಜಿಸಲಾದ ಈ ಕೆಳಗಿನ ಕಾರ�ಯದ ಬಗ�ಗೆ <b>%s</b> ಇತ�ತೀಚಿನ ಮಾಹಿತಿಯನ�ನ� ಪಡೆದ�ಕೊಳ�ಳಲ� "
 "ಬಯಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> %s ಮೂಲಕ ನಿಯೋಜಿಸಲಾದ ಈ ಕೆಳಗಿನ ಕಾರ�ಯಗಳ ಮಾರ�ತ�ತರವನ�ನ� ತಿರಸ�ಕರಿಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ನಿಯೋಜಿಸಲಾದ ಈ ಕೆಳಗಿನ ಕಾರ�ಯಗಳ ಮಾರ�ತ�ತರವನ�ನ� ತಿರಸ�ಕರಿಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:482
 #, 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:488
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "ನಿಯೋಜಿಸಲಾದ ಈ ಕೆಳಗಿನ ಕಾರ�ಯವನ�ನ� <b>%s</b> ರದ�ದ� ಮಾಡಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> %s ಮೂಲಕ ಈ ಕೆಳಗಿನ ಕಾರ�ಯ ಕಾರ�ಯ ನಿಯೋಜನೆಯ ಬದಲಾವಣೆಗಳನ�ನ� ಮ�ಂದಿಟ�ಟಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಕಾರ�ಯ ಕಾರ�ಯ ನಿಯೋಜನೆಯ ಬದಲಾವಣೆಗಳನ�ನ� ಮ�ಂದಿಟ�ಟಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:494
 #, 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:500
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "ನಿಯೋಜಿಸಲಾದ ಈ ಕೆಳಗಿನ ಕಾರ�ಯವನ�ನ� <b>%s</b> ತಿರಸ�ಕರಿಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> %s ಮೂಲಕ ಈ ಕೆಳಗಿನ ಮೆಮೊವನ�ನ� ಪ�ರಕಟಿಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಮೆಮೊವನ�ನ� ಪ�ರಕಟಿಸಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:540
 #, 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:546
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> ಈಗಿರ�ವ ಒಂದ� ಮೆಮೊಗೆ ಸೇರಿಸಲ� ಬಯಸ�ತ�ತಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:546
 #, 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:552
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ಈ ಕೆಳಗಿನ ಹಂಚಲಾದ ಮೆಮೊವನ�ನ� ರದ�ದ� ಮಾಡಿದ�ದಾರೆ:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:672
 msgid "All day:"
 msgstr "ದಿನ ಪೂರ�ತಿ:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:682
 #, fuzzy
 msgid "Start day:"
 msgstr "ಆರಂಭದ ದಿನಾಂಕ(_r):"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:682
+#: ../plugins/itip-formatter/itip-view.c:1037
 msgid "Start time:"
 msgstr "ಆರಂಭದ ಸಮಯ:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:694
 #, fuzzy
 msgid "End day:"
 msgstr "%d ದಿನ"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:694
+#: ../plugins/itip-formatter/itip-view.c:1048
 msgid "End time:"
 msgstr "ಮ�ಗಿಯ�ವ ಸಮಯ:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:827
 msgid "_Open Calendar"
 msgstr "ಕ�ಯಾಲೆಂಡರನ�ನ� ತೆರೆ(_O)"
 
+#: ../plugins/itip-formatter/itip-view.c:833
 #: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:865
 msgid "_Decline"
 msgstr "ತಿರಸ�ಕರಿಸ�(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
-#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "ಅಂಗೀಕರಿಸ�(_A)"
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:867
+#, fuzzy
+msgid "A_ccept"
+msgstr "ಅಂಗೀಕರಿಸ�"
 
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:837
 msgid "_Decline all"
 msgstr "ಎಲ�ಲವನ�ನೂ ತಿರಸ�ಕರಿಸ�(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:838
 msgid "_Tentative all"
 msgstr "ಎಲ�ಲಾ ತಾತ�ಕಾಲಿಕ(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Tentative"
 msgstr "ತಾತ�ಕಾಲಿಕ(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:839
+#, fuzzy
+msgid "A_ccept all"
 msgstr "ಎಲ�ಲವನ�ನೂ ಅಂಗೀಕರಿಸ�(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Send Information"
 msgstr "ಮಾಹಿತಿಯನ�ನ� ಕಳ�ಹಿಸ�(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Update Attendee Status"
 msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ ಸ�ಥಿತಿಯನ�ನ� ಅಪ�ಡೇಟ� ಮಾಡ�(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Update"
 msgstr "ಅಪ�ಡೇಟ� ಮಾಡ�(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1068
+#: ../plugins/itip-formatter/itip-view.c:1122
 msgid "Comment:"
 msgstr "ಟಿಪ�ಪಣಿ:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1107
 msgid "Send _reply to sender"
 msgstr "ಕಳ�ಹಿಸಿದವರಿಗೆ ಮಾರ�ತ�ತರವನ�ನ� ಕಳ�ಹಿಸ�(_r)"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1137
 msgid "Send _updates to attendees"
 msgstr "ಅಪ�ಡೇಟ�ಗಳನ�ನ� ಪಾಲ�ಗೊಳ�ಳ�ವವರಿಗೆ ಕಳ�ಹಿಸ�(_u)"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1146
 msgid "_Apply to all instances"
 msgstr "ಎಲ�ಲಾ ಸಂದರ�ಭಗಳಿಗೂ ಅನ�ವಯಿಸ�(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1155
 msgid "Show time as _free"
 msgstr "ಸಮಯವನ�ನ� ಬಿಡ�ವ� ಎಂದ� ತೋರಿಸ�(_f)"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1158
 msgid "_Preserve my reminder"
 msgstr "ನನ�ನ ಜ�ಞಾಪನೆಯನ�ನ� ಉಳಿಸಿಕೊ (_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1164
 msgid "_Inherit reminder"
 msgstr "ಪಾರಂಪರಿಕ ಜ�ಞಾಪನೆ(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1907
 msgid "_Tasks:"
 msgstr "ಕಾರ�ಯಗಳ�(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1909
 msgid "_Memos:"
 msgstr "ಮೆಮೋಗಳ�(_M):"
 
@@ -18578,16 +17986,16 @@ msgstr "ಚಿಹ�ನೆಯ� ಮಿನ�ಗಬೇಕೆ ಅಥವ ಬೇಡ
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "ಕೇವಲ ಇನ�‌ಬಾಕ�ಸ�� ಫೋಲ�ಡರಿನಲ�ಲಿ ಮಾತ�ರ ಹೊಸ ಸಂದೇಶವನ�ನ� ಸೂಚಿಸಬೇಕೆ."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:343
 msgid "Evolution's Mail Notification"
 msgstr "Evolutionನ ಮೈಲ� ಸೂಚನೆ"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:365
 msgid "Mail Notification Properties"
 msgstr "ಮೈಲ� ಸೂಚನೆಯ ಗ�ಣಲಕ�ಷಣಗಳ�"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:496
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18603,67 +18011,67 @@ msgstr[1] ""
 "%s ನಲ�ಲಿ ಬಂದಿವೆ."
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:507
 #, fuzzy, c-format
 msgid "From: %s"
 msgstr "%s ನಿಂದ:"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#: ../plugins/mail-notification/mail-notification.c:519
 #, fuzzy, c-format
 msgid "Subject: %s"
 msgstr "ವಿಷಯ:"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:528
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "ನಿಮಗೆ %d ಹೊಸ ಸಂದೇಶವ� ಬಂದಿದೆ."
 msgstr[1] "ನಿಮಗೆ %d ಹೊಸ ಸಂದೇಶವ� ಬಂದಿದೆ."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:551
 msgid "New email"
 msgstr "ಹೊಸ ಇಮೇಲ�"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:605
 msgid "Show icon in _notification area"
 msgstr "ಸೂಚನಾ ಜಾಗದಲ�ಲಿ ಚಿಹ�ನೆಯನ�ನ� ತೋರಿಸ�(_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:633
 msgid "B_link icon in notification area"
 msgstr "ಸೂಚನಾ ಜಾಗದಲ�ಲಿ ಚಿಹ�ನೆಯನ�ನ� ಮಿನ�ಗಿಸ�(_l)"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:643
 msgid "Popup _message together with the icon"
 msgstr "ಸಂದೇಶವನ�ನ� ಚಿಹ�ನೆಯೊಂದಿಗೆ ಪ�ಟಿಸ�(ಪಾಪ�ಅಪ�)(_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:828
 msgid "_Play sound when new messages arrive"
 msgstr "ಹೊಸ ಸಂದೇಶವ� ಬಂದಾಗ ಶಬ�ಧವನ�ನ� ಪ�ಲೇ ಮಾಡ�(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:857
 msgid "_Beep"
 msgstr "ಬೀಪ�(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:870
 msgid "Use sound _theme"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:889
 #, fuzzy
 msgid "Play _file:"
 msgstr "ಶಬ�ಧ ಕಡತವನ�ನ� ಪ�ಲೇ ಮಾಡ�(_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:900
 msgid "Select sound file"
 msgstr "ಶಬ�ಧ ಕಡತವನ�ನ� ಆಯ�ಕೆ ಮಾಡಿ"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:958
 msgid "Notify new messages for _Inbox only"
 msgstr "ಹೊಸ ಸಂದೇಶಗಳ� ಇನ�‌ಬಾಕ�ಸಿಗೆ ಬಂದಾಗ ಮಾತ�ರ ಸೂಚಿಸ�(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:967
 msgid "Generate a _D-Bus message"
 msgstr "ಒಂದ� ಡಿ-ಬಸ� ಸಂದೇಶವನ�ನ� ನಿರ�ಮಿಸ�(_D)"
 
@@ -18676,12 +18084,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "ಹೊಸ ಸಂದೇಶಗಳ� ಬಂದಾಗ ನಿಮಗೆ ಸೂಚಿಸಲಾಗ�ವ�ದ�."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18690,7 +18098,7 @@ msgstr ""
 "ಆಯ�ಕೆ ಮಾಡಲಾದ ಕ�ಯಾಲೆಂಡರಿನಲ�ಲಿ ಈಗಾಗಲೆ %s ಕಾರ�ಯಕ�ರಮ ಇದೆ. ನೀವ� ಹಳೆಯ ಕಾರ�ಯಕ�ರಮವನ�ನ� "
 "ಸಂಪಾದಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18699,7 +18107,7 @@ msgstr ""
 "ಆಯ�ಕೆ ಮಾಡಲಾದ ಕಾರ�ಯ ಪಟ�ಟಿಯಲ�ಲಿ ಈಗಾಗಲೆ %s ಕಾರ�ಯ ಇದೆ. ನೀವ� ಹಳೆಯ ಕಾರ�ಯವನ�ನ� ಸಂಪಾದಿಸಲ� "
 "ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18708,7 +18116,7 @@ msgstr ""
 "ಆಯ�ಕೆ ಮಾಡಲಾದ ಮೆಮೊ ಪಟ�ಟಿಯಲ�ಲಿ ಈಗಾಗಲೆ %s ಮೆಮೊ ಇದೆ. ನೀವ� ಹಳೆಯ ಮೆಮೊವನ�ನ� ಸಂಪಾದಿಸಲ� "
 "ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#: ../plugins/mail-to-task/mail-to-task.c:512
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18716,7 +18124,7 @@ msgstr ""
 "ಆಯ�ಕೆ ಮಾಡಲಾದ ಕ�ಯಾಲೆಂಡರಿನಲ�ಲಿ ಒದಗಿಸಲಾದ ಮೈಲ�‌ಗಳಿಗಾಗಿ ಈಗಾಗಲೆ ಕೆಲವ� ಕಾರ�ಯಕ�ರಮಗಳ� ಇವೆ. "
 "ಆದರೂ ಸಹ ನೀವ� ಹೊಸ ಕಾರ�ಯಕ�ರಮಗಳನ�ನ� ರಚಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18724,7 +18132,7 @@ msgstr ""
 "ಆಯ�ಕೆ ಮಾಡಲಾದ ಕಾರ�ಯ ಪಟ�ಟಿಯಲ�ಲಿ ಒದಗಿಸಲಾದ ಮೈಲ�‌ಗಳಿಗಾಗಿ ಈಗಾಗಲೆ ಕೆಲವ� ಕಾರ�ಯಗಳ� ಇವೆ. ಆದರೂ "
 "ಸಹ ನೀವ� ಹೊಸ ಕಾರ�ಯಗಳನ�ನ� ರಚಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#: ../plugins/mail-to-task/mail-to-task.c:518
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18732,7 +18140,7 @@ msgstr ""
 "ಆಯ�ಕೆ ಮಾಡಲಾದ ಮೆಮೊ ಪಟ�ಟಿಯಲ�ಲಿ ಒದಗಿಸಲಾದ ಮೈಲ�‌ಗಳಿಗಾಗಿ ಈಗಾಗಲೆ ಕೆಲವ� ಮೆಮೊಗಳ� ಇವೆ. ಆದರೂ "
 "ಸಹ ನೀವ� ಹೊಸ ಮೆಮೊಗಳನ�ನ� ರಚಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#: ../plugins/mail-to-task/mail-to-task.c:536
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18746,7 +18154,7 @@ msgstr[1] ""
 "ಆಯ�ಕೆ ಮಾಡಲಾದ ಕ�ಯಾಲೆಂಡರಿನಲ�ಲಿ ಒದಗಿಸಲಾದ ಮೈಲ�‌ಗಳಿಗಾಗಿ ಈಗಾಗಲೆ ಕಾರ�ಯಕ�ರಮಗಳ� ಇವೆ. ಆದರೂ ಸಹ "
 "ನೀವ� ಹೊಸ ಕಾರ�ಯಕ�ರಮಗಳನ�ನ� ರಚಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:542
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18760,7 +18168,7 @@ msgstr[1] ""
 "ಆಯ�ಕೆ ಮಾಡಲಾದ ಕಾರ�ಯ ಪಟ�ಟಿಯಲ�ಲಿ ಒದಗಿಸಲಾದ ಮೈಲ�‌ಗಳಿಗಾಗಿ ಈಗಾಗಲೆ ಕಾರ�ಯಗಳ� ಇವೆ. ಆದರೂ ಸಹ "
 "ನೀವ� ಹೊಸ  ಕಾರ�ಯಗಳನ�ನ� ರಚಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18774,25 +18182,25 @@ msgstr[1] ""
 "ಆಯ�ಕೆ ಮಾಡಲಾದ ಮೆಮೊ ಪಟ�ಟಿಯಲ�ಲಿ ಒದಗಿಸಲಾದ ಮೈಲ�‌ಗಳಿಗಾಗಿ ಈಗಾಗಲೆ ಮೆಮೊಗಳ� ಇವೆ. ಆದರೂ ಸಹ "
 "ನೀವ� ಹೊಸ ಮೆಮೊಗಳನ�ನ� ರಚಿಸಲ� ಬಯಸ�ತ�ತೀರೆ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:607
 msgid "[No Summary]"
 msgstr "[ಯಾವ�ದೆ ಸಾರಾಂಶವಿಲ�ಲ]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:618
 msgid "Invalid object returned from a server"
 msgstr "ಪರಿಚಾರಕದಿಂದ ಅಮಾನ�ಯವಾದ ವಸ�ತ�ವ� ಮರಳಿದೆ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:689
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "ಸಂಸ�ಕರಿಸ�ವಾಗ ಒಂದ� ದೋಷ ಕಂಡ� ಬಂದಿದೆ: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:718
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ಕ�ಯಾಲೆಂಡರನ�ನ� ತೆಗೆಯಲಾಗಿಲ�ಲ. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:725
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18800,7 +18208,7 @@ msgstr ""
 "ಆರಿಸಲಾದ ಆಕರವ� ಕೇವಲ ಓದಲ� ಮಾತ�ರವಾಗಿದೆ, ಆದ�ದರಿಂದ ಅಲ�ಲಿ ಒಂದ� ಕಾರ�ಯಕ�ರಮವನ�ನ� ರಚಿಸಲ� "
 "ಸಾಧ�ಯವಿಲ�ಲ. ದಯವಿಟ�ಟ� ಬೇರೊಂದ� ಆಕರವನ�ನ� ಆಯ�ಕೆ ಮಾಡಿ."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18808,7 +18216,7 @@ msgstr ""
 "ಆರಿಸಲಾದ ಆಕರವ� ಕೇವಲ ಓದಲ� ಮಾತ�ರವಾಗಿದೆ, ಆದ�ದರಿಂದ ಅಲ�ಲಿ ಒಂದ� ಕಾರ�ಯವನ�ನ� ರಚಿಸಲ� "
 "ಸಾಧ�ಯವಿಲ�ಲ. ದಯವಿಟ�ಟ� ಬೇರೊಂದ� ಆಕರವನ�ನ� ಆಯ�ಕೆ ಮಾಡಿ."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:731
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18816,40 +18224,40 @@ msgstr ""
 "ಆರಿಸಲಾದ ಆಕರವ� ಕೇವಲ ಓದಲ� ಮಾತ�ರವಾಗಿದೆ, ಆದ�ದರಿಂದ ಅಲ�ಲಿ ಒಂದ� ಮೆಮೊವನ�ನ� ರಚಿಸಲ� "
 "ಸಾಧ�ಯವಿಲ�ಲ. ದಯವಿಟ�ಟ� ಬೇರೊಂದ� ಆಕರವನ�ನ� ಆಯ�ಕೆ ಮಾಡಿ."
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:934
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "ಆಕರ ಪಟ�ಟಿಯನ�ನ� ರಚಿಸಲಾಗಿಲ�ಲ. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1053
 msgid "Create an _Event"
 msgstr "ಒಂದ� ಕಾರ�ಯಕ�ರಮವನ�ನ� ರಚಿಸ�(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1055
 msgid "Create a new event from the selected message"
 msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ಸಂದೇಶದಿಂದ ಒಂದ� ಹೊಸ ಕಾರ�ಯಕ�ರಮವನ�ನ� ರಚಿಸ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create a Mem_o"
 msgstr "ಒಂದ� ಮೆಮೊವನ�ನ� ರಚಿಸ�(_o)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new memo from the selected message"
 msgstr "ಆರಿಸಲಾದ ಸಂದೇಶದಿಂದ ಒಂದ� ಹೊಸ ಮೆಮೊವನ�ನ� ರಚಿಸ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a _Task"
 msgstr "ಒಂದ� ಕಾರ�ಯವನ�ನ� ರಚಿಸ�(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new task from the selected message"
 msgstr "ಆರಿಸಲಾದ ಸಂದೇಶದಿಂದ ಒಂದ� ಹೊಸ ಕಾರ�ಯವನ�ನ� ರಚಿಸ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a _Meeting"
 msgstr "ಒಂದ� ಮೀಟಿಂಗ� ಅನ�ನ� ರಚಿಸ�(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a new meeting from the selected message"
 msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ಸಂದೇಶದಿಂದ ಒಂದ� ಹೊಸ ಮೀಟಿಂಗ� ಅನ�ನ� ರಚಿಸ�"
 
@@ -18857,56 +18265,56 @@ msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ಸಂದೇಶದಿಂದ ಒಂದ
 msgid "Convert a mail message to a task."
 msgstr "ಮೈಲ� ಸಂದೇಶವನ�ನ� ಒಂದ� ಕಾರ�ಯಕ�ಕೆ ಬದಲಾಯಿಸ�."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:279
 msgid "Get List _Archive"
 msgstr "ಲಿಸ�ಟಿನ ಆರ�ಕೈವನ�ನ� ಪಡೆದ�ಕೊ(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:281
 msgid "Get an archive of the list this message belongs to"
 msgstr "ಈ ಸಂದೇಶವ� ಯಾವ ಮೈಲಿಂಗ� ಲಿಸ�ಟಿಗೆ ಸೇರಿದೆಯೊ ಅದರ ಒಂದ� ಆರ�ಕೈವನ�ನ� ಪಡೆದ�ಕೊ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Usage Information"
 msgstr "ಲಿಸ�ಟಿನ ಬಳಕೆಯ ಮಾಹಿತಿಯನ�ನ� ಪಡೆದ�ಕೊ(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "ಈ ಸಂದೇಶವ� ಯಾವ ಮೈಲಿಂಗ� ಲಿಸ�ಟಿಗೆ ಸೇರಿದೆಯೊ ಅದರ ಬಗ�ಗೆ ಮಾಹಿತಿಯನ�ನ� ಪಡೆದ�ಕೊ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Contact List _Owner"
 msgstr "ಲಿಸ�ಟಿನ ಮಾಲಿಕನನ�ನ� ಸಂಪರ�ಕಿಸ�(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "ಈ ಸಂದೇಶವ� ಯಾವ ಮೈಲಿಂಗ� ಲಿಸ�ಟಿಗೆ ಸೇರಿದೆಯೊ ಅದರ ಒಂದ� ಮಾಲಿಕನನ�ನ� ಸಂಪರ�ಕಿಸ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "_Post Message to List"
 msgstr "ಲಿಸ�ಟಿಗೆ ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ� (_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "ಈ ಸಂದೇಶವ� ಯಾವ ಮೈಲಿಂಗ� ಲಿಸ�ಟಿಗೆ ಸೇರಿದೆಯೊ ಅದಕ�ಕೆ ಒಂದ� ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Subscribe to List"
 msgstr "ಲಿಸ�ಟಿಗೆ ಚಂದಾದಾರನಾಗಿಸ�(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "ಈ ಸಂದೇಶವ� ಯಾವ ಮೈಲಿಂಗ� ಲಿಸ�ಟಿಗೆ ಸೇರಿದೆಯೊ ಅದಕ�ಕೆ ಚಂದಾದಾರನಾಗ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Unsubscribe from List"
 msgstr "ಲಿಸ�ಟಿಂದ ಚಂದಾದಾರಿಕೆಯನ�ನ� ತ�ಯಜಿಸ�(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 #, fuzzy
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "ಈ ಸಂದೇಶವ� ಯಾವ ಮೈಲಿಂಗ� ಲಿಸ�ಟಿಗೆ ಸಂಬಂಧಿಸಿದೆಯೊ ಅದರ ಚಂದಾದಾರಿಕೆಯನ�ನ� ರದ�ದ�ಗೊಳಿಸ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Mailing _List"
 msgstr "ಮೈಲಿಂಗ� ಲಿಸ�ಟ��(_L)"
 
@@ -18997,11 +18405,11 @@ msgstr "ಸಂದೇಶವನ�ನ� ಸಂಪಾದಿಸ�(_E)"
 msgid "_Send message"
 msgstr "ಸಂದೇಶವನ�ನ� ಕಳ�ಹಿಸ�(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mark-all-read/mark-all-read.c:41
 msgid "Also mark messages in subfolders?"
 msgstr "ಉಪಕೋಶದಲ�ಲಿನ ಸಂದೇಶಗಳನ�ನೂ ಸಹ ಗ�ರ�ತ�ಹಾಕ�?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:44
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19076,41 +18484,41 @@ msgstr "ಸರಳ ಪಠ�ಯಕ�ಕೆ ಆದ�ಯತೆ"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "ಮೈಲ� ಸಂದೇಶಗಳ� HTML ವಿಷಯಗಳನ�ನ� ಹೊಂದಿದ�ದರೂ ಸಹ ಅವ�ಗಳನ�ನ� ಸರಳ ಪಠ�ಯವಾಗಿ ನೋಡಿ."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "HTML ಇದ�ದಲ�ಲಿ ಅದನ�ನ� ತೋರಿಸ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 #, fuzzy
 msgid "Show plain text if present"
 msgstr "HTML ಇದ�ದಲ�ಲಿ ಅದನ�ನ� ತೋರಿಸ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 #, fuzzy
 msgid "Only ever show plain text"
 msgstr "ಯಾವಗಲೂ PLAIN ಅನ�ನ� ಮಾತ�ರ ತೋರಿಸ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "HT_ML ಬಗೆ"
 
@@ -19134,31 +18542,35 @@ msgstr "Outlook PST ಆಮದ�"
 msgid "Outlook personal folders (.pst)"
 msgstr "ಔಟ�‌ಲ�ಕ� ವೈಯಕ�ತಿಕ ಕಡತಕೋಶಗಳ� (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:296
 msgid "_Mail"
 msgstr "ಮೈಲ�(_M)"
 
+#: ../plugins/pst-import/pst-importer.c:308
+msgid "Destination folder:"
+msgstr "ನಿರ�ದೇಶಿತ ಫೋಲ�ಡರ�:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "_Address Book"
 msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕ(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:321
 msgid "A_ppointments"
 msgstr "ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗಳ�(_A)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:327 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "ಕಾರ�ಯಗಳ�(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:333
 msgid "_Journal entries"
 msgstr "ಜರ�ನಲ� ನಮೂದ�ಗಳ�(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "Importing Outlook data"
 msgstr "ಔಟ�‌ಲ�ಕ�‌ ಮಾಹಿತಿಯನ�ನ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳಲಾಗ�ತ�ತಿದೆ"
 
@@ -19321,55 +18733,55 @@ msgstr "ಕರೆ ಮಾಡ�"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "ಕ�ಯಾಲೆಂಡರ� ಅನ�ನ� ಪ�ರಕಟಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ: ಕ�ಯಾಲೆಂಡರ� ಬ�ಯಾಕೆಂಡ� ಅಸ�ತಿತ�ವದಲ�ಲಿಲ�ಲ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "ಹೊಸ ಸ�ಥಳ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "ಸ�ಥಳವನ�ನ� ಸಂಪಾದಿಸಿ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "ಸ�ಪ�ಯಾಮ�‌ಅಸಾಸಿನ� ಕಂಡ� ಬರ�ತ�ತಿಲ�ಲ, ಕೋಡ�: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "ಪೈಪನ�ನ� ನಿರ�ಮಿಸ�ವಲ�ಲಿ ವಿಫಲವಾಗಿದೆ :%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 #, c-format
 msgid "Error after fork: %s"
 msgstr "ಫೋರ�ಕಿನ ನಂತರ ದೋಷ ಉಂಟಾಗಿದೆ: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "ಸ�ಪ�ಯಾಮ�‌ಅಸಾಸಿನ� ಉಪ ಪ�ರಕ�ರಿಯೆಯ� ಪ�ರತಿಕ�ರಿಯಿಸ�ತ�ತಿಲ�ಲ, ನಿಲ�ಲಿಸಲಾಗ�ತ�ತಿದೆ..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "ಸ�ಪ�ಯಾಮ�‌ಅಸಾಸಿನ� ಉಪ ಪ�ರಕ�ರಿಯೆಗಾಗಿ ಕಾಯ�ವಲ�ಲಿ ತಡೆಯ�ಂಟಾಗಿದೆ, ಅಂತ�ಯಗೊಳಿಸಲಾಗ�ತ�ತಿದೆ..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "ಪೈಪ�‌ಗೆ ಸ�ಪ�ಯಾಮ�‌ಅಸಾಸಿನ� ಮಾಡ�ವ�ದ� ವಿಫಲಗೊಂಡಿದೆ, ದೋಷ ಕೋಡ�: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
 #, fuzzy, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "ಸ�ಪ�ಯಾಮ�‌ಅಸಾಸಿನ� ಲಭ�ಯವಿಲ�ಲ."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "ಇದ� ಸ�ಪ�ಯಾಮ�‌ಅಸಾಸಿನ� ಅನ�ನ� ಇನ�ನಷ�ಟ� ನಂಬ�ವಂತೆ ಮಾಡ�ತ�ತದೆ, ಆದರೆ ವೇಗವ� ತಗ�ಗ�ತ�ತದೆ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
 msgid "I_nclude remote tests"
 msgstr "ದೂರಸ�ಥ ಪರೀಕ�ಷೆಗಳನ�ನ� ಒಳಗೊಳ�ಳಿಸ�(_n)"
 
@@ -19553,11 +18965,11 @@ msgstr "%s ನಿಂದ:"
 msgid "Importing files"
 msgstr "ಕಡತವನ�ನ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳಲಾಗ�ತ�ತಿದೆ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:248
+#: ../plugins/startup-wizard/startup-wizard.c:251
 msgid "Importing data."
 msgstr "ದತ�ತಾಂಶವನ�ನ� ಆಮದ� ಮಾಡಿಕೊಳ�ಳಲಾಗ�ತ�ತಿದೆ."
 
-#: ../plugins/startup-wizard/startup-wizard.c:250
+#: ../plugins/startup-wizard/startup-wizard.c:257
 msgid "Please wait"
 msgstr "ದಯವಿಟ�ಟ� ಕಾಯಿರಿ"
 
@@ -19590,15 +19002,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "ಡ�ರಾಫ�ಟ� ಆಧರಿತವಾದ ಮಾದರಿ ಪ�ಲಗ�ಇನ�"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:613
 msgid "No Title"
 msgstr "ಯಾವ�ದೆ ಶೀರ�ಷಿಕೆ ಇಲ�ಲ"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:684
 msgid "Save as _Template"
 msgstr "ಮಾದರಿಯಾಗಿ ಆಗಿ ಉಳಿಸ�(_T)"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:686
 msgid "Save as Template"
 msgstr "ಮಾದರಿಯಾಗಿ ಆಗಿ ಉಳಿಸ�"
 
@@ -19618,27 +19030,27 @@ msgstr "ಸಾಲಿನೊಳಗಿನ ವಿಕಾರ�ಡ�ಗಳ�"
 msgid "Show vCards directly in mail messages."
 msgstr "ಮೈಲ� ಸಂದೇಶಗಳಲ�ಲಿ ನೇರವಾಗಿ ವಿಕಾರ�ಡ�ಗಳನ�ನ� ಅನ�ನ� ತೋರಿಸ�."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:157
+#: ../plugins/vcard-inline/vcard-inline.c:242
 msgid "Show Full vCard"
 msgstr "ಸಂಪೂರ�ಣ ವಿಕಾರ�ಡನ�ನ� ತೋರಿಸ�"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:160
 msgid "Show Compact vCard"
 msgstr "ಚಿಕ�ಕದಾದ ವಿಕಾರ�ಡನ�ನ� ತೋರಿಸ�"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:221
 msgid "There is one other contact."
 msgstr "ಒಂದ� ಇತರೆ ಸಂಪರ�ಕವಿಳಾಸವಿದೆ."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:230
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "%d ಇತರೆ ಸಂಪರ�ಕವಿಳಾಸವಿದೆ."
 msgstr[1] "%d ಇತರೆ ಸಂಪರ�ಕವಿಳಾಸಗಳಿವೆ."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:251
 msgid "Save in Address Book"
 msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕದಲ�ಲಿ ಉಳಿಸಿ"
 
@@ -19823,7 +19235,7 @@ msgstr "ಬದಿಯ ಪಟ�ಟಿಯ� ಕಾಣ�ತ�ತಿದೆ"
 msgid "Skip development warning dialog"
 msgstr "ವಿಕಸನಾ ಎಚ�ಚರಿಕೆಯ ಸಂವಾದವನ�ನ� ಉಪೇಕ�ಷಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:305
 msgid "Start in offline mode"
 msgstr "ಆಫ�‌ಲೈನ�‌ ವಿಧಾನದಲ�ಲಿ ಆರಂಭಿಸ�"
 
@@ -19980,156 +19392,48 @@ msgstr "ವಿಂಡೋ ಗ�ಂಡಿಯ ಶೈಲಿ"
 msgid "Window buttons are visible"
 msgstr "ವಿಂಡೋ ಗ�ಂಡಿಗಳ� ಕಾಣಿಸ�ತ�ತಿವೆ"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
 msgid "Searches"
 msgstr "ಹ�ಡ�ಕಾಟಗಳ�"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:545
 msgid "Save Search"
 msgstr "ಹ�ಡ�ಕಿದ�ದನ�ನ� ಉಳಿಸ�"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "ತೋರಿಸ�(_w):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "ಹ�ಡ�ಕ�(_c):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr "ಇದರೊಳಗೆ(_n)"
 
-#: ../shell/e-shell-switcher.c:448
-#, fuzzy
-msgid "Toolbar Style"
-msgstr "ಉಪಕರಣ ಪಟ�ಟಿಯ ಶೈಲಿ(_b)"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr ""
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-#, fuzzy
-msgid "Toolbar Visible"
-msgstr "ಉಪಕರಣ ಪಟ�ಟಿಯ� ಕಾಣಿಸ�ತ�ತಿದೆ"
-
-#: ../shell/e-shell-switcher.c:466
-#, fuzzy
-msgid "Whether the switcher is visible"
-msgstr "ಬದಿಯ� ಪಟ�ಟಿಯ� ಕಾಣಿಸಿಕೊಳ�ಳಬೇಕೆ."
-
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:253
 #, fuzzy
 msgid "vCard (.vcf)"
 msgstr "ವಿಕಾರ�ಡ� (.vcf, .gcrd)"
 
-#: ../shell/e-shell-utils.c:249
+#: ../shell/e-shell-utils.c:255
 #, fuzzy
 msgid "iCalendar (.ics)"
 msgstr "�ಕ�ಯಾಲೆಂಡರ� ಕಡತಗಳ� (.ics)"
 
-#: ../shell/e-shell-utils.c:270
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "ಎಲ�ಲಾ ಕಡತಗಳ� (*)"
 
-#: ../shell/e-shell-view.c:681
-#, fuzzy
-msgid "Switcher Action"
-msgstr "%s ಗೆ ಬದಲಾಯಿಸ�"
-
-#: ../shell/e-shell-view.c:682
-msgid "The switcher action for this shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:697
-#, fuzzy
-msgid "Page Number"
-msgstr "ಅನ�ಕ�ರಮ ಸಂಖ�ಯೆ"
-
-#: ../shell/e-shell-view.c:698
-msgid "The notebook page number of the shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:714
-#, fuzzy
-msgid "Search Rule"
-msgstr "ಹ�ಡ�ಕ� ಫಿಲ�ಟರ�"
-
-#: ../shell/e-shell-view.c:715
-#, fuzzy
-msgid "Criteria for the current search results"
-msgstr "ಹ�ಡ�ಕನ�ನ� ತೆರವ�ಗೊಳಿಸ�"
-
-#: ../shell/e-shell-view.c:730
-msgid "The EShellBackend for this shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:745
-msgid "Shell Content Widget"
-msgstr ""
-
-#: ../shell/e-shell-view.c:746
-msgid "The content widget appears in a shell window's right pane"
-msgstr ""
-
-#: ../shell/e-shell-view.c:762
-#, fuzzy
-msgid "Shell Sidebar Widget"
-msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಆದ ಬದಿಯ ಪಟ�ಟಿಯ ಅಗಲ"
-
-#: ../shell/e-shell-view.c:763
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
-
-#: ../shell/e-shell-view.c:778
-msgid "Shell Taskbar Widget"
-msgstr ""
-
-#: ../shell/e-shell-view.c:779
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
-
-#: ../shell/e-shell-view.c:794
-#, fuzzy
-msgid "Shell Window"
-msgstr "ಹೊಸ ವಿಂಡೋ(_W)"
-
-#: ../shell/e-shell-view.c:795
-msgid "The window to which the shell view belongs"
-msgstr ""
-
-#: ../shell/e-shell-view.c:811
-msgid "The key file holding widget state data"
-msgstr ""
-
-#: ../shell/e-shell-view.c:826
-msgid "The title of the shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:840
-#, fuzzy
-msgid "Current View ID"
-msgstr "ಪ�ರಸಕ�ತ ನೋಟ(_u)"
-
-#: ../shell/e-shell-view.c:841
-#, fuzzy
-msgid "The current GAL view ID"
-msgstr "ಪ�ರಸಕ�ತ ಸಮಯ"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -20141,444 +19445,341 @@ msgstr "ಶಂಕರ� ಪ�ರಸಾದ� <svenkate@redhat.com>"
 msgid "Evolution Website"
 msgstr "Evolution ಜಾಲತಾಣ"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "ಬಗ� ಬಡ�ಡಿ ಅನ�ಸ�ಥಾಪಿತವಾಗಿಲ�ಲ."
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "ಬಗ� ಬಡ�ಡಿಯನ�ನ� ಚಲಾಯಿಸಲಾಗಿಲ�ಲ."
 
-#: ../shell/e-shell-window-actions.c:1343
+#: ../shell/e-shell-window-actions.c:1347
 #, fuzzy
 msgid "GNOME Pilot is not installed."
 msgstr "ಬಗ� ಬಡ�ಡಿ ಅನ�ಸ�ಥಾಪಿತವಾಗಿಲ�ಲ."
 
-#: ../shell/e-shell-window-actions.c:1345
+#: ../shell/e-shell-window-actions.c:1349
 #, fuzzy
 msgid "GNOME Pilot could not be run."
 msgstr "ಬಗ� ಬಡ�ಡಿಯನ�ನ� ಚಲಾಯಿಸಲಾಗಿಲ�ಲ."
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1443
 msgid "Show information about Evolution"
 msgstr "Evolution ಬಗೆಗಿನ ಮಾಹಿತಿಯನ�ನ� ತೋರಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "ವಿಂಡೋವನ�ನ� ಮ�ಚ�ಚ�(_C)"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1455
+#, fuzzy
 msgid "_Contents"
-msgstr "ವಿಷಯಗಳ�(_C)"
+msgstr "ಅಪಾಯಿಂಟ��ಮೆಂಟ��ಗಳ�(_A)"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1457
 #, fuzzy
 msgid "Open the Evolution User Guide"
 msgstr "ಇತರೆ ಬಳಕೆದಾರದ ಫೋಲ�ಡರನ�ನ� ತೆರೆಯಿರಿ"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "ಹೆಚ�ಚಾಗಿ ಕೇಳಲಾಗ�ವ ಪ�ರಶ�ನೆಗಳ ಜಾಲಪ�ಟವನ�ನ� ತೆರೆ"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1490
 msgid "_Forget Passwords"
 msgstr "ಗ�ಪ�ತಪದಗಳನ�ನ� ಮರೆತ�ಬಿಡ�(_F)"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1492
 #, fuzzy
 msgid "Forget all remembered passwords"
 msgstr "ನೆನಪಿಟ�ಟ�ಕೊಂಡ ಎಲ�ಲಾ ಗ�ಪ�ತಪದಗಳನ�ನ� ನೀವ� ಖಚಿತವಾಗಿಯೂ ಮರೆಯಲ� ಬಯಸ�ತ�ತೀರೇ?"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1497
 msgid "I_mport..."
 msgstr "ಆಮದ� ಮಾಡಿಕೊ(_m)..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Import data from other programs"
 msgstr "ಇತರೆ ಪ�ರೊಗ�ರಾಂಗಳಿಂದ ದತ�ತಾಂಶವನ�ನ� ಆಮದ� ಮಾಡಿಕೋ"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1504
 msgid "New _Window"
 msgstr "ಹೊಸ ವಿಂಡೋ(_W)"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1506
 #, fuzzy
 msgid "Create a new window displaying this view"
 msgstr "ಈ ಫೋಲ�ಡರನ�ನ� ತೋರಿಸ�ವ ಒಂದ� ಹೊಸ ವಿಂಡೋ ಅನ�ನ� ತೋರಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1520
 #, fuzzy
 msgid "Configure Evolution"
 msgstr "ಸಂರಚನೆ"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "ಕ�ಷಿಪ�ರ ಉಲ�ಲೇಖ(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1527
 #, fuzzy
 msgid "Show Evolution's shortcut keys"
 msgstr "Evolution�ನ ಸಿದ�ಧತೆಗಳನ�ನ� ಬದಲಾಯಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "ಪ�ರೋಗ�ರಾಂನಿಂದ ನಿರ�ಗಮಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "ಸ�ಧಾರಿತ ಹ�ಡ�ಕಾಟ(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1548
 #, fuzzy
 msgid "Clear the current search parameters"
 msgstr "ಹ�ಡ�ಕನ�ನ� ತೆರವ�ಗೊಳಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1553
 msgid "_Edit Saved Searches..."
 msgstr "ಉಳಿಸಲಾದ ಹ�ಡ�ಕಾಟಗಳನ�ನ� ಸಂಪಾದಿಸ�(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1555
 #, fuzzy
 msgid "Manage your saved searches"
 msgstr "ನಿಮ�ಮ ಇಮೈಲ�‌, ಸಂಪರ�ಕ ವಿಳಾಸಗಳನ�ನ� ಹಾಗ� ಕಾರ�ಯಕ�ರಮಗಳನ�ನ� ನಿರ�ವಹಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "ಹ�ಡ�ಕ�ವ ರೀತಿಯನ�ನ� ಬದಲಾಯಿಸಲ� ಇಲ�ಲಿ ಕ�ಲಿಕ�ಕಿಸಿ"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "ಈಗಲೆ ಹ�ಡ�ಕ�(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1569
 #, fuzzy
 msgid "Execute the current search parameters"
 msgstr "ಪ�ರಸಕ�ತ ಮೈಲ� ಕಾರ�ಯವನ�ನ� ರದ�ದ� ಮಾಡ�"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "ಹ�ಡ�ಕಿದ�ದನ�ನ� ಉಳಿಸ�(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1576
 #, fuzzy
 msgid "Save the current search parameters"
 msgstr "ಸಕ�ತ ಕಡತವನ�ನ� ಉಳಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Send / _Receive"
 msgstr "ಕಳ�ಹಿಸ� / ಸ�ವೀಕರಿಸ�(_R)"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Send queued items and retrieve new items"
 msgstr "ಸರತಿಯಲ�ಲಿನ ಅಂಶಗಳನ�ನ� ಕಳ�ಹಿಸ� ಹಾಗ� ಹೊಸ ಅಂಶಗಳನ�ನ� ಮರಳಿ ಪಡೆ"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Submit _Bug Report..."
 msgstr "ಒಂದ� ದೋಷವರದಿಯನ�ನ� ಸಲ�ಲಿಸಿ(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ಬಗ� ಬಡ�ಡಿಯನ�ನ� ಬಳಸಿಕೊಂಡ� ಒಂದ� ದೋಷ ವರದಿಯನ�ನ� ಸಲ�ಲಿಸಿ"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1602
 #, fuzzy
 msgid "GNOME Pilot _Synchronization..."
 msgstr "�ಪೋಡಿಗೆ ಮೇಳೈಸ�ವಿಕೆ"
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1604
 #, fuzzy
 msgid "Set up GNOME Pilot configuration"
 msgstr "ಪೈಲಟ� ಸಂರಚನೆಯನ�ನ� ತಯಾರ�ಗೊಳಿಸಿ"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Work Offline"
 msgstr "ಜಾಲದ ಹೊರಗೆ ಕೆಲಸ ಮಾಡ�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1611
 #, fuzzy
 msgid "Put Evolution into offline mode"
 msgstr "ಆಫ�‌ಲೈನ�‌ ವಿಧಾನದಲ�ಲಿ ಆರಂಭಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Work Online"
 msgstr "ಜಾಲದ ಒಳಗೆ ಕೆಲಸ ಮಾಡ�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1618
 #, fuzzy
 msgid "Put Evolution into online mode"
 msgstr "ಆನ�‌ಲೈನ�‌ ವಿಧಾನದಲ�ಲಿ ಆರಂಭಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1646
 msgid "Lay_out"
 msgstr "ಲೇಔಟ�(_o)"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_New"
 msgstr "ಹೊಸ(_N)"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Search"
 msgstr "ಹ�ಡ�ಕ�(_S)"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Switcher Appearance"
 msgstr "ಸ�ವಿಚರಿನ ಗೋಚರಿಕೆ(_S)"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Window"
 msgstr "ವಿಂಡೊ(_W)"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show Side _Bar"
 msgstr "ಬದಿಯ ಪಟ�ಟಿಯನ�ನ� ತೋರಿಸ�(_B)"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1712
 #, fuzzy
 msgid "Show the side bar"
 msgstr "ಬದಿಯ ಪಟ�ಟಿಯನ�ನ� ತೋರಿಸ�(_B)"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1718
 #, fuzzy
 msgid "Show _Buttons"
 msgstr "ಸಜೀವನಗಳನ�ನ�(ಎನಿಮೇಶನ�‌) ತೋರಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1720
 #, fuzzy
 msgid "Show the switcher buttons"
 msgstr "ಎರಡನೆ ಕಾಲವಲಯವನ�ನ� ತೋರಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1726
 msgid "Show _Status Bar"
 msgstr "ಸ�ಥಿತಿ ಪಟ�ಟಿಯನ�ನ� ತೋರಿಸ�(_S)"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1728
 #, fuzzy
 msgid "Show the status bar"
 msgstr "ಸ�ಥಿತಿ ಪಟ�ಟಿಯನ�ನ� ತೋರಿಸ�(_S)"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1734
 #, fuzzy
 msgid "Show _Tool Bar"
 msgstr "ಉಪಕರಣಪಟ�ಟಿಯನ�ನ� ತೋರಿಸ�(_T)"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1736
 #, fuzzy
 msgid "Show the tool bar"
 msgstr "ಉಪಕರಣಪಟ�ಟಿಯನ�ನ� ತೋರಿಸ�(_T)"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1758
 msgid "_Icons Only"
 msgstr "ಚಿಹ�ನೆಗಳ� ಮಾತ�ರ(_I)"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Display window buttons with icons only"
 msgstr "ವಿಂಡೋ ಗ�ಂಡಿಗಳನ�ನ� ಕೇವಲ ಚಿಹ�ನೆಗಳೊಂದಿಗೆ ಮಾತ�ರ ತೋರಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1765
 msgid "_Text Only"
 msgstr "ಪಠ�ಯ ಮಾತ�ರ(_T)"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1767
 msgid "Display window buttons with text only"
 msgstr "ವಿಂಡೋ ಗ�ಂಡಿಗಳನ�ನ� ಕೇವಲ ಪಠ�ಯದೊಂದಿಗೆ ಮಾತ�ರ ತೋರಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Icons _and Text"
 msgstr "ಚಿಹ�ನೆಗಳ� ಮತ�ತ� ಪಠ�ಯ(_a)"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Display window buttons with icons and text"
 msgstr "ವಿಂಡೋ ಗ�ಂಡಿಗಳನ�ನ� ಚಿಹ�ನೆಗಳಿಂದ ಹಾಗ� ಪಠ�ಯದಿಂದ ತೋರಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Tool_bar Style"
 msgstr "ಉಪಕರಣ ಪಟ�ಟಿಯ ಶೈಲಿ(_b)"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "ವಿಂಡೋ ಗ�ಂಡಿಗಳನ�ನ� ಉಪಕರಣಪಟ�ಟಿ ಸಿದ�ಧತೆಗಳನ�ನ� ಬಳಸಿಕೊಂಡ� ತೋರಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Define Views..."
 msgstr "ನೋಟಗಳನ�ನ� ವಿವರಿಸ�..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1791
 msgid "Create or edit views"
 msgstr "ನೋಟಗಳನ�ನ� ನಿರ�ಮಿಸ� ಅಥವ ಸಂಪಾದಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Save Custom View..."
 msgstr "ಕಸ�ಟಮ� ನೋಟವನ�ನ� ಉಳಿಸ�..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Save current custom view"
 msgstr "ಪ�ರಸಕ�ತ ಕಸ�ಟಮ� ನೋಟವನ�ನ� ಉಳಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1805
 msgid "C_urrent View"
 msgstr "ಪ�ರಸಕ�ತ ನೋಟ(_u)"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Custom View"
 msgstr "ಕಸ�ಟಮ� ನೋಟ"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Current view is a customized view"
 msgstr "ಪ�ರಸಕ�ತ ನೋಟವ� ಕಸ�ಟಮ� ನೋಟವಾಗಿದೆ"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1827
 #, fuzzy
 msgid "Change the page settings for your current printer"
 msgstr "ನಿಮ�ಮ ಪ�ರಸಕ�ತ ಮ�ದ�ರಕಕ�ಕೆ ಪ�ಟ ಸಿದ�ಧತೆಗಳನ�ನ� ಹೊಂದಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2204
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ಗೆ ಬದಲಾಯಿಸ�"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2417
 msgid "Execute these search parameters"
 msgstr ""
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:571
+#: ../shell/e-shell-window-private.c:573
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "ಹೊಸ"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr ""
-
-#: ../shell/e-shell-window.c:617
-#, fuzzy
-msgid "Name of the active shell view"
-msgstr "ಹೊಸ ನೋಟದ ಹೆಸರ�:"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr ""
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:804
-msgid "Geometry"
-msgstr ""
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:805
-msgid "Initial window geometry string"
-msgstr ""
-
-#: ../shell/e-shell-window.c:662
-#, fuzzy
-msgid "Safe Mode"
-msgstr "ಕ�ಯಾರೆಟ�(_Caret) ಕ�ರಮ"
-
-#: ../shell/e-shell-window.c:663
-#, fuzzy
-msgid "Whether the shell window is in safe mode"
-msgstr "ಪ�ಲಗ�‌ಇನ� ಶಕ�ತಗೊಳಿಸಲ�ಪಟ�ಟಿದೆಯೆ"
-
-#: ../shell/e-shell-window.c:694
-#, fuzzy
-msgid "Sidebar Visible"
-msgstr "ಬದಿಯ ಪಟ�ಟಿಯ� ಕಾಣ�ತ�ತಿದೆ"
-
-#: ../shell/e-shell-window.c:695
-#, fuzzy
-msgid "Whether the shell window's side bar is visible"
-msgstr "ವಿಂಡೋ ಗ�ಂಡಿಗಳ� ಕಾಣಿಸಿಕೊಳ�ಳಬೇಕೆ."
-
-#: ../shell/e-shell-window.c:709
-#, fuzzy
-msgid "Switcher Visible"
-msgstr "ಬದಿಯ ಪಟ�ಟಿಯ� ಕಾಣ�ತ�ತಿದೆ"
-
-#: ../shell/e-shell-window.c:710
-#, fuzzy
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "ವಿಂಡೋ ಗ�ಂಡಿಗಳ� ಕಾಣಿಸಿಕೊಳ�ಳಬೇಕೆ."
-
-#: ../shell/e-shell-window.c:725
-#, fuzzy
-msgid "Taskbar Visible"
-msgstr "ಸ�ಥಿತಿ ಪಟ�ಟಿಯ� ಕಾಣ�ತ�ತಿದೆ"
-
-#: ../shell/e-shell-window.c:726
-#, fuzzy
-msgid "Whether the shell window's task bar is visible"
-msgstr "ಸ�ಥಿತಿ ಪಟ�ಟಿಯ� ಕಾಣಿಸಿಕೊಳ�ಳಬೇಕೆ."
-
-#: ../shell/e-shell-window.c:741
-#, fuzzy
-msgid "Whether the shell window's tool bar is visible"
-msgstr "ವಿಂಡೋ ಗ�ಂಡಿಗಳ� ಕಾಣಿಸಿಕೊಳ�ಳಬೇಕೆ."
-
-#: ../shell/e-shell-window.c:755
-#, fuzzy
-msgid "UI Manager"
-msgstr "ಮ�ಯಾನೇಜರ�"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr ""
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 #, fuzzy
 msgid "Preparing to go offline..."
 msgstr "ಜಾಲದಿಂದ ಹೊರಗೆ ಬಳಸಲ� '%s' ಖಾತೆಯನ�ನ� ತಯಾರ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 #, fuzzy
 msgid "Preparing to go online..."
 msgstr "ಜಾಲದಿಂದ ಹೊರಗೆ ಬಳಸಲ� '%s' ಖಾತೆಯನ�ನ� ತಯಾರ� ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr ""
 
-#: ../shell/e-shell.c:820
-#, fuzzy
-msgid "Module Directory"
-msgstr "ಉಳಿಸ�ವ ಕೋಶ"
-
-#: ../shell/e-shell.c:821
-msgid "The directory from which to load EModules"
-msgstr ""
-
-#: ../shell/e-shell.c:836
-#, fuzzy
-msgid "Network Available"
-msgstr "TLS ಲಭ�ಯವಿಲ�ಲ"
-
-#: ../shell/e-shell.c:837
-#, fuzzy
-msgid "Whether the network is available"
-msgstr "ಪ�ಲಗ�‌ಇನ� ಶಕ�ತಗೊಳಿಸಲ�ಪಟ�ಟಿದೆಯೆ"
-
-#: ../shell/e-shell.c:852 ../widgets/misc/e-online-button.c:134
-#, fuzzy
-msgid "Online"
-msgstr "ಇನ�‌ಲೈನ�"
-
-#: ../shell/e-shell.c:853
-#, fuzzy
-msgid "Whether the shell is online"
-msgstr "ಪ�ಲಗ�‌ಇನ� ಶಕ�ತಗೊಳಿಸಲ�ಪಟ�ಟಿದೆಯೆ"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:164
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20616,7 +19817,7 @@ msgstr ""
 "ನಿಮ�ಮ\n"
 "ಕೊಡ�ಗೆಗಾಗಿ ಉತ�ಸ�ಕತೆಯಿಂದ ಕಾಯ�ತ�ತಿದ�ದೇವೆ!\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:188
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20624,62 +19825,58 @@ msgstr ""
 "ಧನ�ಯವಾದಗಳ�\n"
 "Evolution ತಂಡ\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:195
 msgid "Do not tell me again"
 msgstr "ಪ�ನಃ ನನಗೆ ಹೇಳಬೇಡ"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:301
 msgid "Start Evolution activating the specified component"
 msgstr "ಸೂಚಿಸಲಾದ ಘಟಕವನ�ನ� ಸಕ�ರಿಯಗೊಳಿಸಿ Evolution ಅನ�ನ� ಆರಂಭಿಸ�"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:303
 msgid "Apply the given geometry to the main window"
 msgstr ""
 
-#: ../shell/main.c:328
+#: ../shell/main.c:307
 msgid "Start in online mode"
 msgstr "ಆನ�‌ಲೈನ�‌ ವಿಧಾನದಲ�ಲಿ ಆರಂಭಿಸ�"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:309
 #, fuzzy
 msgid "Start in \"express\" mode"
 msgstr "ಆನ�‌ಲೈನ�‌ ವಿಧಾನದಲ�ಲಿ ಆರಂಭಿಸ�"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:312
 #, fuzzy
 msgid "Forcibly shut down Evolution"
 msgstr "ಎಲ�ಲಾ Evolution ಘಟಕಗಳನ�ನ� ಬಲವಂತವಾಗಿ ಮ�ಚ�ಚ�"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Evolution 1.4 ರಿಂದ ಬಲವಂತವಾಗಿ ಮರಳಿ-ವರ�ಗಾಯಿಸ�"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:315
 msgid "Send the debugging output of all components to a file."
 msgstr "ಎಲ�ಲಾ ಘಟಕಗಳ ದೋಷನಿವಾರಣಾ ಓಟ�‌ಪ�ಟ� ಅನ�ನ� ಒಂದ� ಕಡತಕ�ಕೆ ಕಳ�ಹಿಸ�."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:317
 msgid "Disable loading of any plugins."
 msgstr "ಯಾವ�ದೆ ಪ�ಲಗ�‌ಇನ�‌ಗಳನ�ನ� ಲೋಡ� ಮಾಡ�ವ�ದನ�ನ� ನಿಷ�ಕ�ರಿಯಗೊಳಿಸ�."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:319
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ಮೈಲ�, ಸಂಪರ�ಕ ವಿಳಾಸಗಳ� ಹಾಗ� ಕಾರ�ಯಗಳ ಮ�ನ�ನೋಟವನ�ನ� ಅಶಕ�ತಗೊಳಿಸ�."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:323
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:350
+#: ../shell/main.c:325
 #, fuzzy
 msgid "Request a running Evolution process to quit"
 msgstr "Evolution ಅನ�ನ� ಮರಳಿಸ�ಥಾಪಿಸಲಾಗ�ತ�ತಿದೆ"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:440
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM ಹಾಗ� ಇಮೈಲ� ಕ�ಲೈಂಟ�"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:466
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20694,100 +19891,43 @@ msgstr "ನೆನಪಿಟà³�ಟà³�ಕೊಂಡ ಎಲà³�ಲಾ ಗà³�ಪà³�ತà
 
 #: ../shell/shell.error.xml.h:2
 #, fuzzy
-msgid "Continue"
-msgstr "ಈ ಮೌಲ�ಯವನ�ನ� ಹೊಂದಿದೆ"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "ಆವೃತ�ತಿ {0} ಇಂದ ಹಳೆಯ ದತ�ತಾಂಶವನ�ನ� ಅಳಿಸಬೇಕೆ?"
 
 #: ../shell/shell.error.xml.h:3
 #, fuzzy
-msgid "Delete old data from version {0}?"
-msgstr "ಆವೃತ�ತಿ {0} ಇಂದ ಹಳೆಯ ದತ�ತಾಂಶವನ�ನ� ಅಳಿಸಬೇಕೆ?"
+msgid "Continue Anyway"
+msgstr "ಮ�ಂದ�ವರೆ"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "ನಿಮ�ಮ ಗ�ಪ�ತಪದಗಳನ�ನ� ಮರೆಯ�ವ�ದರಿಂದ ನೆನಪಿಟ�ಟ�ಕೊಂಡ ಎಲ�ಲಾ ಗ�ಪ�ತಪದಗಳ� ಅಳಿಸಿ ಹೋಗ�ತ�ತದೆ. "
 "ಮ�ಂದಿನ ಬಾರಿ ಅವ�ಗಳ ಅಗತ�ಯವಿದ�ದಾಗ ನಿಮ�ಮನ�ನ� ಕೇಳಲಾಗ�ವ�ದ�."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "ಅಪ�ಗ�ರೇಡ� ಮಾಡಲ� ಡಿಸ�ಕ��ನಲ�ಲಿ ಸಾಕಷ�ಟ� ಸ�ಥಳಾವಕಾಶವಿಲ�ಲ."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "ಹಳೆಯ ದತ�ತಾಂಶವನ�ನ� ಖಚಿತವಾಗಿಯೂ ಅಳಿಸಬೇಕೆ?"
+#, fuzzy
+msgid "Quit Now"
+msgstr "ನಿರ�ಗಮಿಸ�(_Q)"
 
 #: ../shell/shell.error.xml.h:8
-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 ""
-"&quot;Evolution&quot; ಕೋಶದಲ�ಲಿರ�ವ ಸಂಪೂರ�ಣ ಮಾಹಿತಿಗಳ� ಈಗ ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ� "
-"ಹಾಕಲ�ಪಡಲಿದೆ.\n"
-"\n"
-"ಹಳೆಯ ದತ�ತಾಂಶವನ�ನ� ಅಳಿಸ�ವ ಮೊದಲ� ನಿಮ�ಮ ಎಲ�ಲಾ ಮೈಲ�, ಸಂಪರ�ಕ ವಿಳಾಸ, ಹಾಗ� ಕ�ಯಾಲೆಂಡರ� "
-"ಮಾಹಿತಿಯ� ಇವೆಯೆಂದ� ಮತ�ತ� ಈ Evolutionನ ಆವೃತ�ತಿಯ� ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡ�ತ�ತಿದೆ ಎಂದ� "
-"ಪರಿಶೀಲಿಸಿ.\n"
-"\n"
-"ಒಮ�ಮೆ ಅಳಿಸಲಾಯಿತೆಂದರೆ, ನಿಮ�ಮ ಹಸ�ತಕ�ಷೇಪದ ಹೊರತ� ನೀವ� Evolutionನ ಈ ಹಿಂದಿನ ಆವೃತ�ತಿಗೆ "
-"ಮರಳಲ� ಸಾಧ�ಯವಿರ�ವ�ದಿಲ�ಲ.\n"
-
-#: ../shell/shell.error.xml.h:14
-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 ""
-"Evolution ನ ಈ ಹಿಂದಿನ ಆವೃತ�ತಿಯ� ದತ�ತಾಂಶವನ�ನ� ಬೇರೊಂದ� ಪ�ರತ�ಯೇಕ ಸ�ಥಳದಲ�ಲಿ "
-"ಶೇಖರಿಸಿಟ�ಟಿದೆ.\n"
-"\n"
-"ನೀವ� ಈ ದತ�ತಾಂಶವನ�ನ� ತೆಗೆದ� ಹಾಕಲ� ಬಯಸಿದಲ�ಲಿ, &quot;evolution&quot; ಕೋಶದಲ�ಲಿರ�ವ "
-"ಎಲ�ಲಾ ಮಾಹಿತಿಗಳ� ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ� ಹಾಕಲ�ಪಡ�ತ�ತವೆ. ನೀವ� ಈ ದತ�ತಾಂಶವನ�ನ� ಇರಿಸಿಕೊಳ�ಳಲ� "
-"ಬಯಸಿದಲ�ಲಿ, ನಿಮ�ಮ ಸಮಯದ ಅನೂಕೂಲಕ�ಕೆ ತಕ�ಕಂತೆ ನಂತರ ನೀವೆ ಕೈಯಾರೆ &quot;evolution&quot; "
-"ಹೊಂದಿರ�ವ ಮಾಹಿತಿಗಳನ�ನ� ತೆಗೆದ� ಹಾಕಬಹ�ದ�.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "ಈ ಹಿಂದಿನ ಆವೃತ�ತಿಯಿಂದ ನವೀಕರಿಸ�ವ�ದ� ವಿಫಲಗೊಂಡಿದೆ:"
 
-#: ../shell/shell.error.xml.h:19
-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 ""
-"ನಿಮ�ಮಲ�ಲಿನ ಮಾಹಿತಿ ಹಾಗ� ಸಿದ�ಧತೆಗಳನ�ನ� ನವೀಕರಿಸಲ� {0} ವರೆಗೆ ಡಿಸ�ಕ�� ಜಾಗದ ಅಗತ�ಯವಿದೆ, "
-"ಆದರೆ ನಿಮ�ಮಲ�ಲಿ ಕೇವಲ {1} ಲಭ�ಯವಿದೆ.\n"
-"\n"
-"ಮ�ಂದ�ವರೆಯ� ಮೊದಲ� ನಿಮ�ಮ ನೆಲೆ ಕಡತಕೋಶದಲ�ಲಿ ಒಂದಿಷ�ಟ� ಹೆಚ�ಚಿನ ಜಾಗವನ�ನ� ತೆರವ�ಗೊಳಿಸ�ವ�ದ� "
-"ಅಗತ�ಯವಾಗ�ತ�ತದೆ."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "ಮರೆತ�ಬಿಡ�(_F)"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "ದತ�ತಾಂಶವನ�ನ� ಇರಿಸಿಕೋ(_K)"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "ನನಗೆ ಆಮೇಲೆ ನೆನಪಿಸ�(_R)"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20886,7 +20026,7 @@ msgstr ""
 msgid "Show session management options"
 msgstr "ಚಿತ�ರ ಸಜೀವನಗಳನ�ನ�(ಎನಿಮೇಶನ�) ತೋರಿಸ�"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20942,7 +20082,7 @@ msgstr "ಪ�ರಮಾಣಪತ�ರದ ಹೆಸರ�"
 msgid "Purposes"
 msgstr "ಕಾರಣಗಳ�"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "ಅನ�ಕ�ರಮ ಸಂಖ�ಯೆ"
@@ -20963,19 +20103,19 @@ msgstr "ಇ-ಮೈಲ� ವಿಳಾಸ"
 msgid "All CA certificate files"
 msgstr "ಎಲ�ಲಾ CA ಪ�ರಮಾನಪತ�ರ ಕಡತಗಳ�"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:1052
 msgid "Certificates"
 msgstr "ಪ�ರಮಾಣಪತ�ರಗಳ�"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ಪ�ರಮಾಣಪತ�ರ ವೀಕ�ಷಕ: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "`%s' ಗಾಗಿ ಗ�ಪ�ತಪದವನ�ನ� ನಮೂದಿಸಿ"
+msgid "Enter the password for '%s'"
+msgstr "'%s' ಗಾಗಿ ಗ�ಪ�ತಪದವನ�ನ� ನಮೂದಿಸಿ"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -21005,7 +20145,7 @@ msgstr ""
 "ಒದಗಿಸಿದವರ�:\n"
 "  ವಿಷಯ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "ಪ�ರಮಾಣಪತ�ರವನ�ನ� ಆರಿಸ�"
 
@@ -21018,14 +20158,11 @@ msgid "Authorities"
 msgstr "ಅಥಾರಿಟಿಗಳ�"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "ಬ�ಯಾಕ�ಅಪ�"
-
-#: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
+#, fuzzy
+msgid "Backup _All"
 msgstr "ಎಲ�ಲವನ�ನೂ ಬ�ಯಾಕ�ಅಪ� ಮಾಡ�"
 
-#: ../smime/gui/smime-ui.ui.h:5
+#: ../smime/gui/smime-ui.ui.h:4
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -21033,155 +20170,149 @@ msgstr ""
 "ಈ CA ಅನ�ನ� ಯಾವ�ದೆ ಬಳಕೆಗೆ ನಂಬ�ವ ಮೊದಲ�, ನೀವ� ಅದರ ಪ�ರಮಾಣಪತ�ರವನ�ನ� ಹಾಗ� ಅದರ ನೀತಿ "
 "ಮತ�ತ� ನಿಯಮಗಳನ�ನ� (ಲಭ�ಯವಿದ�ದಲ�ಲಿ) ಪರಿಶೀಲಿಸಬೇಕ�."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "ಪ�ರಮಾಣಪತ�ರ"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "ಪ�ರಮಾಣಪತ�ರ ಅಥಾರಿಟಿ ನಂಬಿಕೆ"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "ಪ�ರಮಾಣಪತ�ರ ಕ�ಷೇತ�ರಗಳ�"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "ಪ�ರಮಾಣಪತ�ರ ಕ�ರಮಾಗತ"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "ಪ�ರಮಾಣಪತ�ರ ವಿವರಗಳ�"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "ಪ�ರಮಾಣಪತ�ರ ಟೇಬಲ�"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "ಸಾಮಾನ�ಯ ಹೆಸರ� (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "ಸಂಪರ�ಕ ಪ�ರಮಾಣಪತ�ರಗಳ�"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "ಈ ಪ�ರಮಾಣಪತ�ರದ ವಿಶ�ವಾಸಾರ�ಹತೆಯನ�ನ� ನಂಬಬೇಡ"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "ಸಂಪಾದಿಸ�"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "ಇಮೈಲ� ಪ�ರಮಾಣಪತ�ರ ನಂಬಿಕೆಯ ಸಿದ�ಧತೆಗಳ�"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "ಇಮೈಲ� ಪಡೆಯ�ವವರ ಪ�ರಮಾಣಪತ�ರ"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "ಇಮೈಲ� ಸೈನರ� ಪ�ರಮಾಣಪತ�ರ"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "ಅವಧಿ ಮ�ಗಿಯ�ವ ದಿನಾಂಕ"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "ಕ�ಷೇತ�ರ ಮೌಲ�ಯ"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "ಫಿಂಗರ�-ಪ�ರಿಂಟ�‌ಗಳ�"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "ಆಮದ�"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "ಒದಗಿಸಿದವರ�"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "ಒದಗಿಸಲಾದ ದಿನಾಂಕ"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "ಇವರಿಗೆ ಒದಗಿಸಲಾಗಿದೆ"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "MD5 ಫಿಂಗರ�-ಪ�ರಿಂಟ�"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "ಸಂಸ�ಥೆ (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "ಸಂಸ�ಥೆಯ ಘಟಕ (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 ಫಿಂಗರ�-ಪ�ರಿಂಟ�"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "SSL ಕ�ಲೈಂಟ� ಪ�ರಮಾಣಪತ�ರ"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "SSL ಪರಿಚಾರಕ ಪ�ರಮಾಣಪತ�ರ"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "ಈ ಪ�ರಮಾಣ ಪತ�ರವ� ಈ ಕೆಳಗಿನ ಬಳಕೆಗಾಗಿ ಪರಿಶೀಲಿಸಲ�ಪಟ�ಟಿದೆ:"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "ಈ ಪ�ರಮಾಣಪತ�ರದ ನಂಬಿಕಾರ�ಹತೆಯನ�ನ� ನಂಬ�"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "ಈ CA ಅನ�ನ� ಇಮೈಲ� ಬಳಕೆದಾರರನ�ನ� ಗ�ರ�ತ�ಹಚ�ಚಲ� ನಂಬ�."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "ಈ CA ಅನ�ನ� ತಂತ�ರಾಂಶ ಅಭಿವೃದ�ಧಿಗಾರರನ�ನ� ಗ�ರ�ತ�ಹಚ�ಚಲ� ನಂಬ�."
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+#, fuzzy
+msgid "Trust this CA to identify websites."
 msgstr "ಈ CA ಅನ�ನ� ಜಾಲತಾಣಗಳನ�ನ� ಪತ�ತೆಹಚ�ಚಲ� ನಂಬ�."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "ಕಾಲಾವಧಿ"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "ನೋಡ�"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "ನಿಮ�ಮನ�ನ� ಗ�ರ�ತಿಸ�ವ ಈ ಸಂಸ�ಥೆಗಳ ಪ�ರಮಾಣಪತ�ರಗಳ� ನಿಮಗಾಗಿ ಕಡತದಲ�ಲಿ ಇವೆ:"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "ಈ ಪ�ರಮಾಣಪತ�ರ ಅಥಾರಿಟಿಗಳನ�ನ� ಗ�ರ�ತಿಸ�ವ ಪ�ರಮಾಣಪತ�ರಗಳ� ನಿಮಗಾಗಿ ಕಡತದಲ�ಲಿ ಇವೆ:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "ಈ ಜನರನ�ನ� ಗ�ರ�ತಿಸ�ವ ಪ�ರಮಾಣಪತ�ರಗಳ� ನಿಮಗಾಗಿ ಕಡತದಲ�ಲಿ ಇವೆ:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "ನಿಮ�ಮ ಪ�ರಮಾಣಪತ�ರಗಳ�"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+#, fuzzy
+msgid "_Backup"
+msgstr "ಬ�ಯಾಕ�ಅಪ�"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "CA ಟ�ರಸ�ಟನ�ನ� ಸಂಪಾದಿಸ� (_E)"
 
@@ -21328,28 +20459,34 @@ msgstr "ಸಂದಿಗ�ಧವಲ�ಲದ"
 msgid "Extensions"
 msgstr "ಎಕ�ಸ��ಟೆನ�ಶನ��ಗಳ�"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Algorithm"
 msgstr "ಪ�ರಮಾಣಪತ�ರ ಸಿಗ�ನೇಚರ� ಅಲ�ಗಾರಿತಮ�"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "ಒದಗಿಸಿದವರ�"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "ಒದಗಿಸಿದವರ ವಿಶಿಷ�ಟ�ಯ �ಡಿ"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "ವಿಷಯದ ವಿಶಿಷ�ಟ�ಯ �ಡಿ"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1220
 msgid "Certificate Signature Value"
 msgstr "ಪ�ರಮಾಣಪತ�ರ ಸಿಗ�ನೇಚರ� ಮೌಲ�ಯ"
 
@@ -21438,11 +20575,11 @@ msgid "With _Status"
 msgstr "ಸ�ಥಿತಿಯೊಂದಿಗೆ(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -21472,19 +20609,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "ಆಯ�ಕೆ(_S)"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "ಸಂಗ�ರಹ"
-
-#: ../widgets/menus/gal-define-views-dialog.c:332
+#: ../widgets/menus/gal-define-views-dialog.c:339
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%s ಗಾಗಿ ನೋಟಗಳನ�ನ� ವಿವರಿಸ�"
 
-#: ../widgets/menus/gal-define-views-dialog.c:340
-#: ../widgets/menus/gal-define-views-dialog.c:342
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-define-views-dialog.c:349
 msgid "Define Views"
 msgstr "ನೋಟಗಳನ�ನ� ವಿವರಿಸ�"
 
@@ -21497,11 +20629,7 @@ msgstr "\"%s\" ಗಾಗಿನ ನೋಟಗಳನ�ನ� ವಿವರಿಸ�
 msgid "Table"
 msgstr "ಕೋಷ�ಟಕ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "ಇನ��ಸ�ಟೆನ�ಸ��"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "ಪ�ರಸಕ�ತ ನೋಟವನ�ನ� ಉಳಿಸ�"
 
@@ -21513,11 +20641,7 @@ msgstr "ಒಂದ� ಹೊಸ ನೋಟವನ�ನ� ರಚಿಸ�(_C)"
 msgid "_Replace existing view"
 msgstr "ಪ�ರಸಕ�ತ ನೋಟವನ�ನ� ಬದಲಾಯಿಸ�(_R)"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "ಫ�ಯಾಕ�ಟರಿ"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "ಹೊಸ ನೋಟವನ�ನ� ವಿವರಿಸಿ"
 
@@ -21545,14 +20669,6 @@ msgstr "ಖಾತೆಯ ಹೆಸರ�"
 msgid "Protocol"
 msgstr "ಪ�ರೊಟೋಕಾಲ�"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "ಕ�ರಿಯೆ"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "ಒಂದ� GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "ಅಟ�ಯಾಚ��ಮೆಂಟ��ನ ಗ�ಣಲಕ�ಷಣಗಳ�"
@@ -21570,11 +20686,11 @@ msgstr "MIME ಬಗೆ:"
 msgid "_Suggest automatic display of attachment"
 msgstr "ತಾನಾಗಿಯೆ ಲಗತ�ತನ�ನ� ತೋರಿಸಲ� ಸಲಹೆ ಮಾಡ�(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "ಹಿನ�ನಲೆಯಾಗಿ ಬಳಸಿ"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "ಹಿನ�ನಲೆಯಾಗಿ ಬಳಸ�(_B)"
 
@@ -21607,12 +20723,8 @@ msgid "Hide Attachment _Bar"
 msgstr "ಲಗತ�ತ� ಪಟ�ಟಿಯನ�ನ� ಅಡಗಿಸ�(_B)"
 
 #: ../widgets/misc/e-attachment-paned.c:89
-msgid "Show Attachment _Bar"
-msgstr "ಲಗತ�ತ� ಪಟ�ಟಿಯನ�ನ� ತೋರಿಸ�(_B)"
-
 #: ../widgets/misc/e-attachment-paned.c:636
-#, fuzzy
-msgid "Show _Attachment Bar"
+msgid "Show Attachment _Bar"
 msgstr "ಲಗತ�ತ� ಪಟ�ಟಿಯನ�ನ� ತೋರಿಸ�(_B)"
 
 #: ../widgets/misc/e-attachment-store.c:538
@@ -21631,32 +20743,32 @@ msgstr[1] "ಲಗತ�ತ�ಗಳನ�ನ� ಉಳಿಸ�"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "ಎಲ�ಲವನ�ನೂ ಉಳಿಸ�(_a)"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "ಲಗತ�ತನ�ನ� ಸೇರಿಸ�(_d)..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "ಅಡಗಿಸ�(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:356
 msgid "_View Inline"
 msgstr "ಸಾಲಿನೊಳಗೆ ನೋಡ�(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "\"%s\" ನೊಂದಿಗೆ ತೆರೆ"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "ಈ ಲಗತ�ತ�ಗಳನ�ನ� %s ನಲ�ಲಿ ತೆರೆ"
@@ -21665,60 +20777,60 @@ msgstr "ಈ ಲಗತ�ತ�ಗಳನ�ನ� %s ನಲ�ಲಿ ತೆರೆ
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "ಲಗತ�ತಿಸಲಾದ ಸಂದೇಶ"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 msgid "A load operation is already in progress"
 msgstr "ಒಂದ� ಲೋಡ� ಕಾರ�ಯವ� ಈಗಾಗಲೆ ಪ�ರಗತಿಯಲ�ಲಿದೆ"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 msgid "A save operation is already in progress"
 msgstr "ಉಳಿಸ�ವ ಕಾರ�ಯವ� ಈಗಾಗಲೆ ಪ�ರಗತಿಯಲ�ಲಿದೆ"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s' ಅನ�ನ� ಲೋಡ� ಮಾಡಲಾಗಿಲ�ಲ"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "ಕೊಂಡಿಯನ�ನ� ಲೋಡ�‌ ಮಾಡಲಾಗಲಿಲ�ಲ"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2193
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s' ಅನ�ನ� ತೆರೆಯಲಾಗಲಿಲ�ಲ"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2196
 #, c-format
 msgid "Could not open the attachment"
 msgstr "ಲಗತ�ತನ�ನ� ತೆರೆಯಲ� ಸಾಧ�ಯವಾಗಲಿಲ�ಲ"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "ಲಗತ�ತಿನ ಅಂಶಗಳನ�ನ� ಲೋಡ� ಮಾಡಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2707
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s' ಅನ�ನ� ಉಳಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2710
 #, c-format
 msgid "Could not save the attachment"
 msgstr "ಲಗತ�ತನ�ನ� ಉಳಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 #, fuzzy
 msgid "Ctrl-click to open a link"
 msgstr "%s ಅನ�ನ� ತೆರೆಯಲ� ಕ�ಲಿಕ� ಮಾಡಿ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21726,65 +20838,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "ತಿಂಗಳ ಕ�ಯಾಲೆಂಡರ�"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "ಬಣ�ಣವನ�ನ� ತ�ಂಬಿಸ�"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK ಬಣ�ಣವನ�ನ� ತ�ಂಬಿಸ�"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "ಸ�ಟಿಪ�ಪಲ��ನಿಂದ ತ�ಂಬಿಸ�"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "ಕನಿಷ�ಟ ಅಗಲ"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "ಕನಿಷ�ಟ ಅಗಲ"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "ಜಾಗ ನೀಡಿಕೆ"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "ಕ�ಯಾರೆಕ�ಟರ� ಎನ�ಕೋಡಿಂಗ�"
@@ -21797,48 +20850,48 @@ msgstr "ಬಳಸಲ� ಕ�ಯಾರೆಕ�ಟರ� ಸೆಟ� ಅನ�
 msgid "Other..."
 msgstr "ಇತರೆ..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "ದಿನಾಂಕ ಹಾಗ� ಸಮಯ"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "ದಿನಾಂಕವನ�ನ� ದಾಖಲಿಸಲ� ಪಠ�ಯ ನಮೂದ�"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "ಒಂದ� ಕ�ಯಾಲೆಂಡರನ�ನ� ತೋರಿಸಲ� ಇದನ�ನ� ಕ�ಲಿಕ�ಕಿಸಿ"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "ಸಮಯವನ�ನ� ಆರಿಸಲ�  ಡ�ರಾಪ�‌-ಡೌನ� ಕಾಮಬಿನೇಶನ� ಬಾಕ�ಸ��"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "ಈಗ(_w)"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "ಇಂದ�(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "ಯಾವ�ದೂ ಇಲ�ಲ(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "ಯಾವ�ದೂ ಇಲ�ಲ"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "ಅಮಾನ�ಯವಾದ ದಿನಾಂಕದ ಮೌಲ�ಯ"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "ಅಮಾನ�ಯವಾದ ಸಮಯದ ಮೌಲ�ಯ"
 
@@ -21941,11 +20994,11 @@ msgstr ""
 msgid "Import Data"
 msgstr "ಪ�ರಮ�ಖ"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "ಜಾಗತಿಕ ನಕ�ಷೆ"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21974,46 +21027,6 @@ msgstr ""
 "Evolution ಈಗ ಆಫ�‌ಲೈನ�‌ನಲ�ಲಿದೆ.\n"
 "ಆನ�‌ಲೈನ�‌ನಲ�ಲಿ ಕೆಲಸ ಮಾಡಲ� ಈ ಗ�ಂಡಿಯ ಮೇಲೆ ಕ�ಲಿಕ�ಕಿಸಿ."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "ಗ�ಂಡಿಯ ಸ�ಥಿತಿಯ� ಆನ�‌ಲೈನ�‌ನಲ�ಲಿದೆ"
-
-#: ../widgets/misc/e-paned.c:306
-#, fuzzy
-msgid "Horizontal Position"
-msgstr "ಅಡ�ಡ ಫಲಕ ಸ�ಥಾನ"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr ""
-
-#: ../widgets/misc/e-paned.c:318
-#, fuzzy
-msgid "Vertical Position"
-msgstr "ಫಲಕದ ಲಂಬ ಸ�ಥಾನ"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr ""
-
-#: ../widgets/misc/e-paned.c:330
-#, fuzzy
-msgid "Proportion"
-msgstr "ಸ�ಥಾನ"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr ""
-
-#: ../widgets/misc/e-paned.c:342
-#, fuzzy
-msgid "Fixed Resize"
-msgstr "ಗಾತ�ರ ಬದಲಾಯಿಸ�(_R)"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr ""
-
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "ಇದರೊಂದಿಗೆ ಸಮೀಕರಿಸ�:"
@@ -22035,68 +21048,46 @@ msgstr "Evolution ಆದ�ಯತೆಗಳ�"
 msgid "Matches: %d"
 msgstr "ತಾಳೆಗಳ�: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "ಈ ಹ�ಡ�ಕ� ಪಟ�ಟಿಕೆಯನ�ನ� ಮ�ಚ�ಚ�"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "ಪತ�ತೆಮಾಡ�(_d):"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "ಹ�ಡ�ಕನ�ನ� ತೆರವ�ಗೊಳಿಸ�"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "ಹಿಂದಿನ(_P)"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "ಪದಪ�ಂಜವ� ಈ ಹಿಂದೆ ಎಲ�ಲಿದೆ ಎಂದ� ಪತ�ತೆ ಹಚ�ಚ�"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "ಮ�ಂದಿನ(_N)"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "ಪದಪ�ಂಜವ� ಈ ಮ�ಂದೆ ಎಲ�ಲಿದೆ ಎಂದ� ಪತ�ತೆ ಹಚ�ಚ�"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "ಕೇಸನ�ನ� ಹೊಂದಿಸ�(_c)"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr "ಪ�ಟದ ಕೊನೆಯನ�ನ� ತಲ�ಪಿದೆ, ಮೇಲಿನಿಂದ ಮ�ಂದ�ವರಿಸಲಾಗಿದೆ"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "ಪ�ಟದ ಮೇಲ�ಭಾಗವನ�ನ� ತಲ�ಪಿದೆ, ಕೆಳಗಿನಿಂದ ಮ�ಂದ�ವರಿಸಲಾಗಿದೆ"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "ತೆರೆಸೂಚಕ ಸಾಲ�"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "ತೆರೆಸೂಚಕ ಕಾಲಂ"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "ವಿಂಗಡಕ"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "ಆಯ�ಕಾ ಕ�ರಮ"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "ತೆರೆಸೂಚಕ ಕ�ರಮ"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "ಯಾವಾಗ ಅಳಿಸಲ�ಪಟ�ಟಿದೆ(_l):"
@@ -22173,43 +21164,46 @@ msgstr "ಪೂರ�ಣಗೊಂಡಿದ�ದ�(_m):"
 msgid "When decli_ned:"
 msgstr "ತಿರಸ�ಕೃತಗೊಂಡಿದ�ದ�(_n):"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "ಇದರ ಒಳಗೆ(_t)"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "ನಂತರ(_A):"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_After"
+msgstr "ನಂತರ(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "ಎಲ�ಲಾ ಮಾಹಿತಿ(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "ವರ�ಗೀಕರಣ(_C):"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "ಸಂದೇಶ ತಲ�ಪಿಸ�ವ�ದನ�ನ� ವಿಳಂಬಗೊಳಿಸ�(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "ತಲ�ಪಿಸಲಾಗಿದೆ(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "ಅವಧಿ ಅಂತ�ಯಗೊಳ�ಳ�ವ ದಿನಾಂಕವನ�ನ� ಹೊಂದಿಸಿ(_S)"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "ಇಲ�ಲಿಯವರೆಗೆ(_U):"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "_Until"
+msgstr "ಇಲ�ಲಿಯವರೆಗೆ(_U)"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "ಅನ�ಕೂಲವಾದಾಗ(_W)"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "ತೆರೆದಾಗ(_W):"
 
@@ -22246,6 +21240,7 @@ msgid "Add _Script"
 msgstr "ಸ�ಕ�ರಿಪ�ಟನ�ನ� ಸೇರಿಸ�(_S)"
 
 #: ../widgets/misc/e-signature-script-dialog.c:266
+#, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -22269,44 +21264,44 @@ msgstr "ಸà³�ಕà³�ರಿಪà³�ಟà³�â€� ಅಸà³�ತಿತà³�ವದಲà³�ಲà²
 msgid "Click here to go to URL"
 msgstr "URL ಗೆ ತೆರಳಲ� ಇಲ�ಲಿ ಕ�ಲಿಕ� ಮಾಡಿ"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:359
 msgid "_Copy Link Location"
 msgstr "ಕೊಂಡಿಯ ತಾಣವನ�ನ� ಕಾಪಿ ಮಾಡ� (_C)"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:361
 #, fuzzy
 msgid "Copy the link to the clipboard"
 msgstr "ವಿಷಯಗಳನ�ನ� ಕ�ಲಿಪ��ಬೋರ�ಡ��ಗೆ  ಅಂಟಿಸ�."
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Open Link in Browser"
 msgstr "ಕೊಂಡಿಯನ�ನ�ನ� ವೀಕ�ಷಕದಲ�ಲಿ ತೆರೆ(_O)"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:371
 #, fuzzy
 msgid "Open the link in a web browser"
 msgstr "ಕೊಂಡಿಯನ�ನ�ನ� ವೀಕ�ಷಕದಲ�ಲಿ ತೆರೆ(_O)"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Copy Email Address"
 msgstr "ಇಮೇಲ� ವಿಳಾಸವನ�ನ� ನಕಲಿಸ�(_C)"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
 #, fuzzy
 msgid "Select all text and images"
 msgstr "ಒಂದ� ಸಂದೇಶದಲ�ಲಿನ ಎಲ�ಲಾ ಪಠ�ಯವನ�ನ� ಆರಿಸ�"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ಗೆ ಕರೆ ಮಾಡಲ� ಕ�ಲಿಕ�ಕಿಸಿ"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:846
 msgid "Click to hide/unhide addresses"
 msgstr "ವಿಳಾಸಗಳನ�ನ� ಅಡಗಿಸಲ�/ಅಡಗಿಸದಿರಲ� ಕ�ಲಿಕ� ಮಾಡಿ"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ಅನ�ನ� ತೆರೆಯಲ� ಕ�ಲಿಕ� ಮಾಡಿ"
@@ -22325,7 +21320,7 @@ msgstr "ಕ�ಯಾಲೆಂಡರ�: %s ನಿಂದ %s ವರೆಗೆ"
 msgid "evolution calendar item"
 msgstr "Evolution ಕ�ಯಾಲೆಂಡರ� ಅಂಶ"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "ಪ�ಟಿಕೆ ಪಟ�ಟಿ"
 
@@ -22343,7 +21338,7 @@ msgstr "ಯಾವ�ದೂ ಇಲ�ಲ"
 msgid "OK"
 msgstr "ಸರಿ"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "ಸಮಯವ� ಈ ಮಾದರಿಯಲ�ಲಿ ಇರಬೇಕ�: %s"
@@ -22352,48 +21347,12 @@ msgstr "ಸಮಯವ� ಈ ಮಾದರಿಯಲ�ಲಿ ಇರಬೇಕ�: %
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ಪ�ರತಿಶತವ� 0 ಯಿಂದ 100 ರ ನಡ�ವಿನ, ಅವನ�ನೂ ಒಳಗೊಂಡಿರ�ವ ಮೌಲ�ಯವಾಗಿರಬೇಕ�"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "ಆರಿಸಲಾದ ಕಾಲಂ"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "ಕೇಂದ�ರೀಕರಿಸಲಾದ ಕಾಲಂ"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "ಆರಿಸದೆ ಇರ�ವ ಕಾಲಂ"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "ಕಾಲಂ ಅನ�ನ� ಹೊಡೆದ� ಹಾಕ�"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "ಕಾಲಂನ ಕೆಳಗೆ ಗೆರೆಯನ�ನ� ಎಳೆ"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "ಬೋಲ�ಡ�� ಕಾಲಂ"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "ಬಣ�ಣ ಕಾಲಂ"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "BG ಬಣ�ಣ ಕಾಲಂ"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "ಸೇರಿಸಲ� ಕ�ಲಿಕ� ಮಾಡಿ"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "ಸ�ಥಿತಿ"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(�ರಿಕೆ ಕ�ರಮದಲ�ಲಿ)"
@@ -22410,12 +21369,12 @@ msgstr "ವಿಂಗಡಿಸದೆ ಇರ�ವ"
 msgid "No grouping"
 msgstr "ಯಾವ�ದೆ ಗ�ಂಪ�ಗೊಳಿಕೆ ಇಲ�ಲ"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "ಕ�ಷೇತ�ರಗಳನ�ನ� ತೋರಿಸ�"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "ಲಭ�ಯ ಕ�ಷೇತ�ರಗಳ�"
 
@@ -22424,7 +21383,7 @@ msgid "A_vailable Fields:"
 msgstr "ಲಭ�ಯ ಕ�ಷೇತ�ರಗಳ�(_v):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "�ರಿಕೆ ಕ�ರಮದಲ�ಲಿ"
 
@@ -22437,7 +21396,7 @@ msgid "Clear _All"
 msgstr "ಎಲ�ಲವನ�ನೂ ಅಳಿಸ�(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "ಇಳಿಕೆ ಕ�ರಮದಲ�ಲಿ"
 
@@ -22497,7 +21456,7 @@ msgstr "ಈ ಕà³�ಷೇತà³�ರಗಳನà³�ನà³� ಅನà³�ಕà³�ರಮದಲà
 msgid "_Sort..."
 msgstr "ವಿಂಗಡಿಸ�(_S)..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "ಒಂದ� ಕಾಲಂ ಅನ�ನ� ಸೇರಿಸ�"
 
@@ -22509,248 +21468,112 @@ msgstr ""
 "ನಿಮ�ಮ ಕೋಷ�ಟಕಕ�ಕೆ ಒಂದ� ಕಾಲಂ ಅನ�ನ� ಸೇರಿಸಲ�, ಅದ� ಎಲ�ಲಿ\n"
 " ಕಾಣಿಸಿಕೊಳ�ಳಬೇಕೊ ಆ ಸ�ಥಳಕ�ಕೆ ಎಳೆದೊಯ�ದ� ಹಾಕಿರಿ."
 
-#: ../widgets/table/e-table-group-container.c:342
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
 #, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s : %s (%d ಅಂಶ)"
 msgstr[1] "%s : %s (%d ಅಂಶಗಳ�)"
 
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d ಅಂಶ)"
 msgstr[1] "%s (%d ಅಂಶಗಳ�)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "ಸಾಲಿನ ಪರ�ಯಾಯ ಬಣ�ಣಗಳ�"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "ಅಡ�ಡವಾಗಿ ಎಳೆಯಲಾದ ಗ�ರಿಡ�"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "ಲಂಬವಾಗಿ ಎಳೆಯಲಾದ ಗ�ರಿಡ�"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "ಗಮನ ಸೆಳೆ"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "ತೆರೆ ಸೂಚಕ ಕ�ರಮ"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "ಆಯ�ಕಾ ಮಾದರಿ"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "ಉದ�ದದ ಮಿತಿ"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "ಸಾಲಿನ �ಕಪ�ರಕಾರದ ಉದ�ದ"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "ಸ�ಥಬ�ದಗೊಂಡ"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
 msgstr "ಪ�ರಸಕ�ತ ನೋಟವನ�ನ� ಕಸ�ಟಮ� ಮಾಡ�"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Sort _Ascending"
 msgstr "�ರಿಕೆ ಕ�ರಮದಲ�ಲಿ ವಿಂಗಡಿಸ�(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1565
 msgid "Sort _Descending"
 msgstr "ಇಳಿಕೆ ಕ�ರಮದಲ�ಲಿ ವಿಂಗಡಿಸ�(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1568
 msgid "_Unsort"
 msgstr "ವಿಂಗಡಿಸದಿರ�(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1571
 msgid "Group By This _Field"
 msgstr "ಈ ಕ�ಷೇತ�ರಕ�ಕೆ ಅನ�ಗ�ಣವಾಗಿ ಗ�ಂಪ� ಮಾಡ�(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Group By _Box"
 msgstr "ಬಾಕ�ಸಿಗೆ ಅನ�ಗ�ಣವಾಗಿ ಗ�ಂಪ� ಮಾಡ�(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Remove This _Column"
 msgstr "ಈ ಕಾಲಂ ಅನ�ನ� ತೆಗೆದ� ಹಾಕ�(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Add a C_olumn..."
 msgstr "ಒಂದ� ಕಾಲಂ ಅನ�ನ� ಸೇರಿಸ�(_o)..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "A_lignment"
 msgstr "ವಾಲಿಕೆ(_l)"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "B_est Fit"
 msgstr "ಉತ�ತಮವಾಗಿ ಸರಿಹೊಂದ�ವ(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Format Column_s..."
 msgstr "ಕಾಲಂಗಳನ�ನ� ಫಾರ�ಮಾಟ� ಮಾಡ�(_s)..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Custo_mize Current View..."
 msgstr "ಪ�ರಸಕ�ತ ನೋಟವನ�ನ� ಕಸ�ಟಮ� ಮಾಡ�(_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Sort By"
 msgstr "ಹೀಗೆ ವಿಂಗಡಿಸ�(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1672
 msgid "_Custom"
 msgstr "ಕಸ�ಟಮ�(_C)"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "ಟೇಬಲ� ಹೆಡರ�"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "ಟೇಬಲ� ಮಾದರಿ"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "ತೆರೆಸೂಚಕ ಸಾಲ�"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "ವಿಂಗಡಣಾ ಮಾಹಿತಿ"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "ಪ�ರತಿಬಾರಿಯೂ ಹ�ಡ�ಕ�"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "ಸೇರ�ಪಡಿಸಲ� ಕ�ಲಿಕ� ಅನ�ನ� ಬಳಸಿ"
-
-#: ../widgets/table/e-table.c:3374
-#, fuzzy
-msgid "Vertical Row Spacing"
-msgstr "ಲಂಬವಾಗಿ ಎಳೆಯಲಾದ ಗ�ರಿಡ�"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr ""
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ಇಟ�ರೀ ಟೇಬಲ� ಅಡಾಪ�ಟರ�"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "ಪ�ರಾತನ ನೋಟ (ರೆಟ�ರೋ ಲ�ಕ�)"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "ಸಾಲ�ಗಳನ�ನ� ಹಾಗ� +/- ವಿಸ�ತಾರಕಗಳನ�ನ� (ಎಕ�ಸ��ಪ�ಯಾಂಡರ�) ಎಳೆಯಿರಿ."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "ವಿಸ�ತಾರಕ ಗಾತ�ರ"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "ವಿಸ�ತಾರಕ ಬಾಣದ ಗಾತ�ರ"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "ಪ�ಟಿಕೆ(ಪಾಪ�ಅಪ�)"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "ಒಂದ� ಚೈಲ�ಡನ�ನ� ಪ�ಟಿಕೆ ಮಾಡ�"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "ಸಂಪಾದಿಸ�"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "ಈ ಕೋಶವನ�ನ� ಸಂಪಾದಿಸಲ� ತೊಡಗ�"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "ಹೊರಳಿಸ�"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "ಕೋಶವನ�ನ� ಹೊರಳಿಸ�"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "ಹಿಗ�ಗಿಸ�"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "ಈ ಕೋಶವನ�ನ� ಹೊಂದಿರ�ವ ETree ಯಲ�ಲಿನ ಸಾಲನ�ನ� ಹಿಗ�ಗಿಸ�"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "ಬೀಳಿಸ�"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ಈ ಕೋಶವನ�ನ� ಹೊಂದಿರ�ವ ETree ಯಲ�ಲಿನ ಸಾಲನ�ನ� ಬೀಳಿಸ�"
 
@@ -22766,172 +21589,34 @@ msgstr "ಕ�ಲಿಕ�"
 msgid "sort"
 msgstr "ವಿಂಗಡಿಸ�"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "ಎಲ�ಲವನ�ನೂ ಆರಿಸ�"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "ಆದಾನ ಕ�ರಮಗಳ�"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "ಕಾರ�ಯಕ�ರಮ ಪರಿಷ�ಕಾರಕ"
-
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "ಪಠ�ಯ"
-
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "ಬೋಲ�ಡ��"
-
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "ಹೊಡೆದ�ಹಾಕ�"
-
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "ಲಂಗರ�(Anchor)"
-
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "ಜಸ�ತಿಫಿಕೇಶನ�"
-
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "ಕ�ಲಿಪ� ಅಗಲ"
-
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "ಕ�ಲಿಪ� ಉದ�ದ"
-
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "ಕ�ಲಿಪ�"
-
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "ಕ�ಲಿಪ� ಆಯತವನ�ನ� ತ�ಂಬಿಸ�"
-
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "X ಆಫ��ಸೆಟ�"
-
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Y ಆಫ��ಸೆಟ�"
-
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "ಪಠ�ಯದ ಅಗಲ"
-
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "ಪಠ�ಯದ ಉದ�ದ"
-
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "ದೀರ�ಘವೃತ�ತವಾಗಿಸ�ವಿಕೆಯನ�ನ� ಬಳಸಿ"
-
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "ದೀರ�ಘವೃತ�ತವಾಗಿಸ�ವಿಕೆ"
-
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "ಸಾಲ� ಆವರಿಕೆ(wrap)"
-
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "ಬ�ರೇಕ� ಅಕ�ಷರಗಳ�"
-
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "ಮ�ಯಾಕ�ಸ� ಸಾಲ�ಗಳ�"
-
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "ಅಂಚ�ಗಳನ�ನ� ಎಳೆ"
-
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "ಹೊಸಸಾಲ�ಗಳನ�ನ� ಅನ�ಮತಿಸ�"
-
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "ಹಿನ�ನಲೆಯನ�ನ� ಎಳೆ"
-
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "ಗ�ಂಡಿಯನ�ನ� ಎಳೆ"
-
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "ತೆರೆಸೂಚಕದ ಸ�ಥಳ"
-
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "IM ಸನ�ನಿವೇಶ"
-
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
-
-#~ msgid "Blog:"
-#~ msgstr "ಬ�ಲಾಗ�:"
-
-#, fuzzy
-#~ msgid "_Blog:"
-#~ msgstr "ಬ�ಲಾಗ�"
-
-#, fuzzy
-#~ msgid "_Retract comment"
-#~ msgstr "ಪೂರ�ಣಗೊಂಡ ಪ�ರತಿಶತ(_e):"
-
-#, fuzzy
-#~ msgid "_Summary:"
-#~ msgstr "ಸಾರಾಂಶ:"
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid "(No Subject)"
-#~ msgstr "(ಯಾವ�ದೆ ವಿಷಯವಿಲ�ಲ)"
-
-#, fuzzy
-#~ msgid "_Destination folder:"
-#~ msgstr "ನಿರ�ದೇಶಿತ ಫೋಲ�ಡರ�:"
-
-#~ msgid "Quit"
-#~ msgstr "ತ�ಯಜಿಸ�"
-
-#, fuzzy
-#~ msgid "Show deleted messages with a line through them"
-#~ msgstr "ಸಂದೇಶ-ಪಟ�ಟಿಯಲ�ಲಿ ಅಳಿಸಲಾದ ಸಂದೇಶಗಳನ�ನ� (ಹೊಡೆದ� ಹಾಕಲಾದಂತೆ) ತೋರಿಸ�."
+#~ msgid "search bar"
+#~ msgstr "ಹ�ಡ�ಕ� ಪಟ�ಟಿ"
 
-#~ msgctxt "GW"
-#~ msgid "Proxy"
-#~ msgstr "ಪ�ರಾಕ�ಸಿ"
+#~ msgid "evolution calendar search bar"
+#~ msgstr "Evolution ಕ�ಯಾಲೆಂಡರ� ಹ�ಡ�ಕ� ಪಟ�ಟಿ"
 
-#, fuzzy
-#~ msgid "A_ccept"
-#~ msgstr "ಅಂಗೀಕರಿಸ�"
+#~ msgid "popup"
+#~ msgstr "ಪ�ಟಿಕೆ(ಪಾಪ�ಅಪ�)"
 
-#, fuzzy
-#~ msgid "Continue Anyway"
-#~ msgstr "ಮ�ಂದ�ವರೆ"
+#~ msgid "edit"
+#~ msgstr "ಸಂಪಾದಿಸ�"
 
-#, fuzzy
-#~ msgid "Quit Now"
-#~ msgstr "ನಿರ�ಗಮಿಸ�(_Q)"
+#~ msgid "toggle"
+#~ msgstr "ಹೊರಳಿಸ�"
 
-#~ msgid "search bar"
-#~ msgstr "ಹ�ಡ�ಕ� ಪಟ�ಟಿ"
+#~ msgid "expand"
+#~ msgstr "ಹಿಗ�ಗಿಸ�"
 
-#~ msgid "evolution calendar search bar"
-#~ msgstr "Evolution ಕ�ಯಾಲೆಂಡರ� ಹ�ಡ�ಕ� ಪಟ�ಟಿ"
+#~ msgid "collapse"
+#~ msgstr "ಬೀಳಿಸ�"
 
 #~ msgid "Combo Button"
 #~ msgstr "ಕಾಂಬೊ ಗ�ಂಡಿ"
@@ -22948,6 +21633,12 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Server Version"
 #~ msgstr "ಪರಿಚಾರಕ ಆವೃತ�ತಿ"
 
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
 #~ msgid "C_ontacts"
 #~ msgstr "ಸಂಪರ�ಕವಿಳಾಸಗಳ�(_o)"
 
@@ -22984,6 +21675,50 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Base"
 #~ msgstr "ಮೂಲ"
 
+#~ msgid "LDAP Servers"
+#~ msgstr "LDAP ಪರಿಚಾರಕಗಳ�"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "ಸ�ವಯಂಪೂರ�ಣಗೊಳಿಕೆಯ ಸಿದ�ಧತೆಗಳ�"
+
+#~ 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 ""
+#~ "Evolution ೧.x ನ ಈಚೆಗೆ Evolution�ನ ಸಂಪರ�ಕವಿಳಾಸ ಫೋಲ�ಡರ�ಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� "
+#~ "ಬದಲಾಗಿವೆ.\n"
+#~ "\n"
+#~ "Evolution ನಿಮ�ಮ ಫೋಲ�ಡರ��ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "ಮೈಲಿಂಗ� ಲಿಸ�ಟ��ನ ಸಂಪರ�ಕ ವಿಳಾಸದ ವಿನ�ಯಾಸವ� ಬದಲಾಗಿದೆ.\n"
+#~ "\n"
+#~ "Evolution ನಿಮ�ಮ ಫೋಲ�ಡರ��ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "ಇವಲೂಶನ� ಕೆಲವ� ದೂರವಾಣಿ ಸಂಖ�ಯೆಗಳನ�ನ� ಶೇಖರಿಸ�ವ ವಿಧಾನವನ�ನ� ಬದಲಾಯಿಸಿದೆ.\n"
+#~ "\n"
+#~ "Evolution ನಿಮ�ಮ ಫೋಲ�ಡರ��ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Evolution�ನ Palm Sync changelog ಹಾಗ� ಮ�ಯಾಪ� ಕಡತಗಳ� ಬದಲಾಯಿಸಲ�ಪಟ�ಟಿದೆ.\n"
+#~ "\n"
+#~ "Evolution ನಿಮ�ಮ Pilot Sync ದತ�ತಾಂಶವನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
+
 #~ msgid "Rename the \"%s\" folder to:"
 #~ msgstr "\"%s\" ಫೋಲ�ಡರನ�ನ� ಈ ಹೆಸರಿಗೆ ಬದಲಾಯಿಸಿ:"
 
@@ -22993,6 +21728,9 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Save As vCard..."
 #~ msgstr "ವಿಕಾರ�ಡ� ಆಗಿ ಉಳಿಸ�..."
 
+#~ msgid "Contact Source Selector"
+#~ msgstr "ಮೂಲ ಆಯ�ಕೆಗಾರನನ�ನ� ಸಂಪರ�ಕಿಸ�"
+
 #~ msgid ""
 #~ "Position of the vertical pane, between the card and list views and the "
 #~ "preview pane, in pixels."
@@ -23094,6 +21832,30 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "<b>Work</b>"
 #~ msgstr "<b>ಕೆಲಸ</b>"
 
+#~ msgid "_Web Log:"
+#~ msgstr "ಜಾಲದ ದಾಖಲೆ(_W):"
+
+#~ msgid "Editable"
+#~ msgstr "ಸಂಪಾದಿಸಬಲ�ಲ"
+
+#~ msgid "Source Book"
+#~ msgstr "ಮೂಲದ ಪ�ಸ�ತಕ"
+
+#~ msgid "Target Book"
+#~ msgstr "ಉದ�ದೇಶಿತ ಪ�ಸ�ತಕ"
+
+#~ msgid "Is New Contact"
+#~ msgstr "ಇದ� ಹೊಸ ಸಂಪರ�ಕವಿಳಾಸ"
+
+#~ msgid "Writable Fields"
+#~ msgstr "ಬರೆಯಬಹ�ದಾದ ಜಾಗಗಳ�"
+
+#~ msgid "Required Fields"
+#~ msgstr "ಅಗತ�ಯ ಜಾಗಗಳ�"
+
+#~ msgid "Changed"
+#~ msgstr "ಬದಲಾಯಿಸಲಾದ"
+
 #~ msgid ""
 #~ "\n"
 #~ "Mr.\n"
@@ -23129,6 +21891,18 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "<b>Members</b>"
 #~ msgstr "<b>ಸದಸ�ಯರ�</b>"
 
+#~ msgid "Book"
+#~ msgstr "ಪ�ಸ�ತಕ"
+
+#~ msgid "Is New List"
+#~ msgstr "ಇದ� ಹೊಸ ಪಟ�ಟಿ"
+
+#~ msgid "Query"
+#~ msgstr "ಸಂದೇಹ"
+
+#~ msgid "Model"
+#~ msgstr "ಮಾದರಿ"
+
 #~ msgid "Name begins with"
 #~ msgstr "ಹೀಗೆ ಆರಂಭಗೊಳ�ಳ�ವ ಹೆಸರ�"
 
@@ -23153,6 +21927,36 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "P_aste"
 #~ msgstr "ಅಂಟಿಸ�(_a)"
 
+#~ msgid "Width"
+#~ msgstr "ಅಗಲ"
+
+#~ msgid "Height"
+#~ msgstr "ಉದ�ದ"
+
+#~ msgid "Has Focus"
+#~ msgstr "ಗಮನವನ�ನ� ಹೊಂದಿರ�ವ"
+
+#~ msgid "Field"
+#~ msgstr "ಕ�ಷೇತ�ರ"
+
+#~ msgid "Text Model"
+#~ msgstr "ಪಠ�ಯ ಮಾದರಿ"
+
+#~ msgid "Max field name length"
+#~ msgstr "ಕ�ಷೇತ�ರದ ಹೆಸರಿನ ಗರಿಷ�ಟ ಉದ�ದ"
+
+#~ msgid "Column Width"
+#~ msgstr "ಕಾಲಂ ಅಗಲ"
+
+#~ msgid "Adapter"
+#~ msgstr "ಅಡಾಪ�ಟರ�"
+
+#~ msgid "Selected"
+#~ msgstr "ಆರಿಸಲಾದ"
+
+#~ msgid "Has Cursor"
+#~ msgstr "ತೆರೆಸೂಚಕವನ�ನ� ಹೊಂದಿದೆ"
+
 #~ msgid ""
 #~ "%s already exists\n"
 #~ "Do you want to overwrite it?"
@@ -23171,6 +21975,15 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Querying Address Book..."
 #~ msgstr "ವಿಳಾಸ ಪ�ಸ�ತಕವನ�ನ� ವಿಚಾರಿಸಲಾಗ�ತ�ತಿದೆ..."
 
+#~ msgid "Calendar repository is offline."
+#~ msgstr "ರೆಪೊಸಿಟರಿಯ� ಜಾಲದ ಹೊರಗಿದೆ."
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "{0} ನಲ�ಲಿ ದೋಷ"
+
+#~ msgid "No response from the server."
+#~ msgstr "ಪರಿಚಾರಕದಿಂದ ಯಾವ�ದೆ ಪ�ರತ�ಯ�ತ�ತರ ಬಂದಿಲ�ಲ."
+
 #~ msgid "Save Appointment"
 #~ msgstr "ಹೊಸ ಅಪಾಯಿಂಟ��ಮೆಂಟ�‌"
 
@@ -23180,6 +21993,12 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Save Task"
 #~ msgstr "ಕಾರ�ಯವನ�ನ� ಉಳಿಸ�"
 
+#~ msgid "Unable to load the calendar"
+#~ msgstr "ಕ�ಯಾಲೆಂಡರನ�ನ� ಲೋಡ� ಮಾಡ�ವಲ�ಲಿ ಸಾಧ�ಯವಾಗಿಲ�ಲ"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
 #~ msgid "Configure your timezone, Calendar and Task List here "
 #~ msgstr "ನಿಮ�ಮ ಕಾಲಸಮಯ, ಕ�ಯಾಲೆಂಡರ� ಹಾಗ� ಕಾರ�ಯಗಳ ಪಟ�ಟಿಯನ�ನ� ಇಲ�ಲಿ ಸಂರಚಿಸಿ "
 
@@ -23384,6 +22203,9 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ "ಅಪಾಯಿಂಟ��ಮೆಂಟಿಗಿಂತ 1 ಗಂಟೆ ಮೊದಲ�\n"
 #~ "ಅಪಾಯಿಂಟ��ಮೆಂಟಿಗಿಂತ 1 ದಿನದ ಮೊದಲ�"
 
+#~ msgid "Attendee_s..."
+#~ msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�(_s)..."
+
 #~ msgid ""
 #~ "a\n"
 #~ "b"
@@ -23445,6 +22267,39 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ "ಪೂರ�ಣಗೊಂಡಿದೆ\n"
 #~ "ರದ�ದ�ಗೊಂಡಿದೆ"
 
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
 #~ msgid "_Save As..."
 #~ msgstr "ಹೀಗೆ ಉಳಿಸ�(_S)..."
 
@@ -23478,6 +22333,9 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Pri_nt..."
 #~ msgstr "ಮ�ದ�ರಿಸ�(_n)..."
 
+#~ msgid "A_ttendees..."
+#~ msgstr "ಪಾಲ�ಗೊಳ�ಳ�ವವರ�(_t)..."
+
 #~ msgid "_Delete Selected Memos"
 #~ msgstr "ಆರಿಸಲಾದ ಮೆಮೊಗಳನ�ನ� ಅಳಿಸ�(_D)"
 
@@ -23532,6 +22390,9 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ "ನವೆಂಬರ�\n"
 #~ "ಡಿಸೆಂಬರ�"
 
+#~ msgid "_Select Today"
+#~ msgstr "ಇಂದಿನ ದಿನಾಂಕವನ�ನ� ಆರಿಸ�(_S)"
+
 #~ msgid "Failed upgrading memos."
 #~ msgstr "ಮೆಮೊಗಳನ�ನ� ಅಪ�ಗ�ರೇಡ� ಮಾಡ�ವಲ�ಲಿ ವಿಫಲವಾಗಿದೆ."
 
@@ -23552,6 +22413,37 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Memo li_st"
 #~ msgstr "ಮೆಮೊ ಪಟ�ಟಿ(_s)"
 
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution ೧.x ನಿಂದ ಈಚೆಗೆ Evolution�ನ ಕಾರ�ಯ ಕೋಶಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� "
+#~ "ಬದಲಾಗಿದೆ.\n"
+#~ "\n"
+#~ "Evolution ನಿಮ�ಮ ಫೋಲ�ಡರ�ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
+
+#~ 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 ""
+#~ "Evolution ೧.x ನಿಂದ ಈಚೆಗೆ Evolution�ನ ಕ�ಯಾಲೆಂಡರ� ಕೋಶಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� "
+#~ "ಬದಲಾಗಿವೆ.\n"
+#~ "\n"
+#~ "Evolution ನಿಮ�ಮ ಫೋಲ�ಡರ�ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr "evolution/config.xmldb ಯಿಂದ ಹಳೆಯ ಸಿದ�ಧತೆಗಳನ�ನ� ವರ�ಗಾಯಿಸಲಾಗಿಲ�ಲ"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "`%s' ಕ�ಯಾಲೆಂಡರನ�ನ� ವರ�ಗಾಯಿಸಲಾಗಿಲ�ಲ"
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "`%s' ಕಾರ�ಯಗಳನ�ನ� ವರ�ಗಾಯಿಸಲಾಗಿಲ�ಲ"
+
 #~ msgid "Failed upgrading tasks."
 #~ msgstr "ಕಾರ�ಯಗಳನ�ನ� ನವೀಕರಿಸ�ವಲ�ಲಿ ವಿಫಲತೆ."
 
@@ -23613,6 +22505,12 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Component"
 #~ msgstr "ಘಟಕ"
 
+#~ msgid "Name of the component being logged"
+#~ msgstr "ದಾಖಲಿಸಲಾಗ�ತ�ತಿರ�ವ ಘಟಕದ ಹೆಸರ�"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "ಪ�ಲಗ�‌ಇನ� ಶಕ�ತಗೊಳಿಸಲ�ಪಟ�ಟಿದೆಯೆ"
+
 #~ msgid "Overwrite file?"
 #~ msgstr "ಕಡತವನ�ನ� ತಿದ�ದಿ ಬರೆಯಬೇಕೆ?"
 
@@ -23743,6 +22641,48 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "_Fit to Width"
 #~ msgstr "ಗಾತ�ರಕ�ಕೆ ಹೊಂದಿಸ�(_F)"
 
+#~ msgid "To Do"
+#~ msgstr "ಮಾಡಬೇಕಿರ�ವ"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "ಹೊಸ ಫೋಲ�ಡರ� `%s' ಅನ�ನ� ನಿರ�ಮಿಸಲಾಗಿಲ�ಲ: %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "ಫೋಲ�ಡರ� `%s' ಅನ�ನ� `%s' ಗೆ ಕಾಪಿ ಮಾಡಲಾಗಿಲ�ಲ: %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "`%s' ಯಲ�ಲಿ ಈಗಿರ�ವ ಅಂಚೆಪೆಟ�ಟಿಗೆಗಳನ�ನ� ಶೋಧಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ: %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution ೧.x ನಿಂದ ಈಚೆಗೆ Evolution�ನ ಅಂಚೆ ಪೆಟ�ಟಿಗೆ ಕೋಶಗಳ ಸ�ಥಳ ಹಾಗ� ಅನ�ಕ�ರಮವ� "
+#~ "ಬದಲಾಗಿವೆ.\n"
+#~ "\n"
+#~ "Evolution ನಿಮ�ಮ ಫೋಲ�ಡರ�ಗಳನ�ನ� ರವಾನಿಸ�ವವರೆಗೆ ದಯವಿಟ�ಟ� ತಾಳ�ಮೆಯಿಂದ ಕಾಯಿರಿ..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "ಹಳೆಯ POP ಪರಿಚಾರಕದಲ�ಲಿ-ಇರಿಸಿಕೋ ಮಾಹಿತಿ `%s' ಅನ�ನ� ತೆರೆಯಲಾಗಿಲ�ಲ: %s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "POP3 ಪರಿಚಾರಕದಲ�ಲಿ-ಇರಿಸಿಕೋ ಮಾಹಿತಿ ಕೋಶ `%s' ಅನ�ನ� ನಿರ�ಮಿಸಲಾಗಿಲ�ಲ: %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "POP3 ಪರಿಚಾರಕದಲ�ಲಿ-ಇರಿಸಿಕೋ ಕೋಶ `%s' ಅನ�ನ� ಕಾಪಿ ಮಾಡಲಾಗಿಲ�ಲ: %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "ಸ�ಥಳೀಯ ಮೈಲ� ಶೇಖರಣೆ `%s' ಅನ�ನ� ರಚಿಸಲ� ವಿಫಲಗೊಂಡಿದೆ: %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "ಹಿಂದಿನ Evolutionನಿಂದ ಸಿದ�ಧತೆಗಳನ�ನ� ಓದಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ, `evolution/config."
+#~ "xmldb' ಯ� ಅಸ�ತಿತ�ವದಲ�ಲಿಲ�ಲ ಅಥವ ಭ�ರಷ�ಟಗೊಂಡಿದೆ."
+
 #~ msgid "Save As..."
 #~ msgstr "ಹೀಗೆ ಉಳಿಸ�..."
 
@@ -23761,12 +22701,18 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Add address"
 #~ msgstr "ವಿಳಾಸವನ�ನ� ಸೇರಿಸ�"
 
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "ನಿಯಮಿತ ಗಾತ�ರದ ಪಠ�ಯದ ಭಾಗವನ�ನ� ತೋರಿಸಲ� Evolutionಗೆ ಅನ�ಮತಿಸ�"
+
 #~ msgid "Default height of the message window."
 #~ msgstr "ಮ�ಖ�ಯ ವಿಂಡೋದ ಪೂರ�ವನಿಯೋಜಿತ ಉದ�ದ."
 
 #~ msgid "Default width of the message window."
 #~ msgstr "ಸಂದೇಶ ವಿಂಡೋದ ಪೂರ�ವನಿಯೋಜಿತ ಅಗಲ."
 
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "ನಿರ�ದಿಷ�ಟ ಗಾತ�ರದ ಸಂದೇಶ ಪಠ�ಯದ ಭಾಗವನ�ನ� ರೆಂಡರ� ಮಾಡ�ವಂತೆ ಶಕ�ತಗೊಳಿಸ�."
+
 #~ msgid ""
 #~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
 #~ "vertically."
@@ -23789,6 +22735,9 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Prompt to check if the user wants to go offline immediately"
 #~ msgstr "ಬಳಕೆದಾರನ ತಕ�ಷಣ ಜಾಲದ ಹೊರಕ�ಕೆ ಹೋಗಲ� ಬಯಸಿದಲ�ಲಿ ಪರಿಶೀಲಿಸಲ� ತಿಳಿಸ�"
 
+#~ msgid "Text message part limit"
+#~ msgstr "ಪಠ�ಯ ಸಂದೇಶದ ಭಾಗದ ಮಿತಿ"
+
 #~ msgid "Thread the message list."
 #~ msgstr "ಸಂದೇಶ-ಪಟ�ಟಿಯನ�ನ� ತ�ರೆಡ� ಮಾಡಿ."
 
@@ -23915,6 +22864,9 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Signatures Table"
 #~ msgstr "ಸಹಿಗಳ ಟೇಬಲ�"
 
+#~ msgid "    "
+#~ msgstr "    "
+
 #~ msgid "<b>Search Folder Sources</b>"
 #~ msgstr "<b>ಹ�ಡ�ಕ� ಕಡತಕೋಶದ ಆಕರಗಳ�</b>"
 
@@ -23924,6 +22876,12 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "<span weight=\"bold\">Encryption</span>"
 #~ msgstr "<span weight=\"bold\">ಗೂಢಲಿಪೀಕರಣ</span>"
 
+#~ msgid "Because \"{0}\"."
+#~ msgstr "�ಕೆಂದರೆ \"{0}\"."
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "�ಕೆಂದರೆ \"{2}\"."
+
 #~ msgid "Delete \"{0}\"?"
 #~ msgstr "\"{0}\" ಅನ�ನ� ಅಳಿಸಬೇಕೆ?"
 
@@ -23939,12 +22897,52 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Querying server"
 #~ msgstr "ಪರಿಚಾರಕವನ�ನ� ಕೇಳಲಾಗ�ತ�ತಿದೆ"
 
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "ಈ ಕೆಳಗಿನ ಹ�ಡ�ಕ� ಕಡತಕೋಶವನ�ನ�(ಗಳನ�ನ�) ಬಳಸಿ:\n"
+#~ "{0}\n"
+#~ "ಈಗ ತೆಗೆದ� ಹಾಕಲಾದ ಫೋಲ�ಡರನ�ನ� ಬಳಸಲಾಗಿದೆ:\n"
+#~ "    \"{1}\"\n"
+#~ "ಹಾಗ� ಅಪ�‌ಡೇಟ� ಮಾಡಲಾಗಿದೆ."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "ಈ ಕೆಳಗಿನ ಫಿಲ�ಟರ� ನಿಯಮವನ�ನ�(ಗಳನ�ನ�) ಬಳಸಿ:\n"
+#~ "{0}\n"
+#~ "ಈಗ ತೆಗೆದ� ಹಾಕಲಾದ ಫೋಲ�ಡರನ�ನ� ಬಳಸಲಾಗಿದೆ:\n"
+#~ "    \"{1}\"\n"
+#~ "ಹಾಗ� ಅಪ�‌ಡೇಟ� ಮಾಡಲಾಗಿದೆ."
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "ಈ ಫೋಲ�ಡರಿನಲ�ಲಿ ಕೇವಲ ಅಡಗಿಸಲಾದ ಸಂದೇಶಗಳಿವೆ. ಅವ�ಗಳನ�ನ� ತೋರಿಸಲ� ನೋಟ->ಅಡಗಿಸಲಾದ "
+#~ "ಸಂದೇಶಗಳನ�ನ� ತೋರಿಸ� ಅನ�ನ� ಬಳಸಿ."
+
 #~ msgid "Subject or Recipients contains"
 #~ msgstr "'ವಿಷಯ' ಅಥವ 'ಸ�ವೀಕರಿಸ�ವವರ�' ಇದನ�ನ� ಹೊಂದಿವೆ"
 
 #~ msgid "Subject or Sender contains"
 #~ msgstr "'ವಿಷಯ' ಅಥವ 'ಕಳ�ಹಿಸಿದವರ�' ಇದನ�ನ� ಹೊಂದಿವೆ"
 
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr ""
+#~ "ಒಂದ� ಸಂದೇಶದ ಮ�ಖ�ಯಭಾಗದಲ�ಲಿ ಹ�ಡ�ಕಲ� ಲಗತ�ತ� ಜ�ಞಾಪನಾ ಪ�ಲಗ�ಇನ�‌ಗೆ ನೀಡಬೇಕಿರ�ವ ಸ�ಳಿವ�ಗಳ "
+#~ "ಪಟ�ಟಿ."
+
 #~ msgid "Audio Inline"
 #~ msgstr "ಆಡಿಯೋ ಇನ�‌ಲೈನ�"
 
@@ -24373,6 +23371,9 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Cannot display folders."
 #~ msgstr "ಫೋಲ�ಡರ�ಗಳನ�ನ� ತೋರಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ."
 
+#~ msgid "Cannot perform the operation."
+#~ msgstr "ಕಾರ�ಯವನ�ನ� ನಡೆಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ."
+
 #~ msgid ""
 #~ "Changes to options for Exchange account \"{0}\" will only take effect "
 #~ "after restarting Evolution."
@@ -24673,6 +23674,9 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "<b>Name</b>"
 #~ msgstr "<b>ಹೆಸರ�</b>"
 
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "Evolution ಗೆ ಹ�ಲಾ ಬೆಂಬಲವನ�ನ� ಸೇರಿಸಿ."
+
 #~ msgid "<b>Custom Headers</b>"
 #~ msgstr "<b>ಇಚ�ಛೆಯ ಹೆಡರ�ಗಳ�</b>"
 
@@ -24703,6 +23707,9 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Synchronize your data with your Apple iPod."
 #~ msgstr "ನಿಮ�ಮ ದತ�ತಾಂಶವನ�ನ� ಆಪಲ� �ಪೋಡಿಗೆ ಮೇಳೈಸಿ."
 
+#~ msgid "_Accept"
+#~ msgstr "ಅಂಗೀಕರಿಸ�(_A)"
+
 #~ msgid "Disable an account by right-clicking on it in the folder tree."
 #~ msgstr "ಕಡತಕೋಶದ ವೃಕ�ಷದ ಮೇಲೆ ಬಲ ಕ�ಲಿಕ�ಕಿಸ�ವ ಮೂಲಕ ಒಂದ� ಖಾತೆಯನ�ನ� ಅಶಕ�ತಗೊಳಿಸಿ."
 
@@ -24835,6 +23842,9 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Unknown system error."
 #~ msgstr "ಗೊತ�ತಿರದ ವ�ಯವಸ�ಥೆಯ ದೋಷ."
 
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
 #~ msgid "Invalid arguments"
 #~ msgstr "ಅಮಾನ�ಯ ಆರ�ಗ�ಯ�ಮೆಂಟ��ಗಳ�"
 
@@ -24850,12 +23860,72 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Import File"
 #~ msgstr "ಕಡತವನ�ನ� ಆಮದ� ಮಾಡಿಕೊ"
 
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "Evolution 1.4 ರಿಂದ ಬಲವಂತವಾಗಿ ಮರಳಿ-ವರ�ಗಾಯಿಸ�"
+
 #~ msgid "Cannot start Evolution"
 #~ msgstr "Evolution ಅನ�ನ� ಆರಂಭಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ"
 
 #~ msgid "Evolution can not start."
 #~ msgstr "Evolution ಆರಂಭಗೊಳ�ಳ�ವ�ದಿಲ�ಲ."
 
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "ಅಪ�ಗ�ರೇಡ� ಮಾಡಲ� ಡಿಸ�ಕ��ನಲ�ಲಿ ಸಾಕಷ�ಟ� ಸ�ಥಳಾವಕಾಶವಿಲ�ಲ."
+
+#~ msgid "Really delete old data?"
+#~ msgstr "ಹಳೆಯ ದತ�ತಾಂಶವನ�ನ� ಖಚಿತವಾಗಿಯೂ ಅಳಿಸಬೇಕೆ?"
+
+#~ 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 ""
+#~ "&quot;Evolution&quot; ಕೋಶದಲ�ಲಿರ�ವ ಸಂಪೂರ�ಣ ಮಾಹಿತಿಗಳ� ಈಗ ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ� "
+#~ "ಹಾಕಲ�ಪಡಲಿದೆ.\n"
+#~ "\n"
+#~ "ಹಳೆಯ ದತ�ತಾಂಶವನ�ನ� ಅಳಿಸ�ವ ಮೊದಲ� ನಿಮ�ಮ ಎಲ�ಲಾ ಮೈಲ�, ಸಂಪರ�ಕ ವಿಳಾಸ, ಹಾಗ� ಕ�ಯಾಲೆಂಡರ� "
+#~ "ಮಾಹಿತಿಯ� ಇವೆಯೆಂದ� ಮತ�ತ� ಈ Evolutionನ ಆವೃತ�ತಿಯ� ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡ�ತ�ತಿದೆ ಎಂದ� "
+#~ "ಪರಿಶೀಲಿಸಿ.\n"
+#~ "\n"
+#~ "ಒಮ�ಮೆ ಅಳಿಸಲಾಯಿತೆಂದರೆ, ನಿಮ�ಮ ಹಸ�ತಕ�ಷೇಪದ ಹೊರತ� ನೀವ� Evolutionನ ಈ ಹಿಂದಿನ "
+#~ "ಆವೃತ�ತಿಗೆ ಮರಳಲ� ಸಾಧ�ಯವಿರ�ವ�ದಿಲ�ಲ.\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "Evolution ನ ಈ ಹಿಂದಿನ ಆವೃತ�ತಿಯ� ದತ�ತಾಂಶವನ�ನ� ಬೇರೊಂದ� ಪ�ರತ�ಯೇಕ ಸ�ಥಳದಲ�ಲಿ "
+#~ "ಶೇಖರಿಸಿಟ�ಟಿದೆ.\n"
+#~ "\n"
+#~ "ನೀವ� ಈ ದತ�ತಾಂಶವನ�ನ� ತೆಗೆದ� ಹಾಕಲ� ಬಯಸಿದಲ�ಲಿ, &quot;evolution&quot; ಕೋಶದಲ�ಲಿರ�ವ "
+#~ "ಎಲ�ಲಾ ಮಾಹಿತಿಗಳ� ಶಾಶ�ವತವಾಗಿ ತೆಗೆದ� ಹಾಕಲ�ಪಡ�ತ�ತವೆ. ನೀವ� ಈ ದತ�ತಾಂಶವನ�ನ� "
+#~ "ಇರಿಸಿಕೊಳ�ಳಲ� ಬಯಸಿದಲ�ಲಿ, ನಿಮ�ಮ ಸಮಯದ ಅನೂಕೂಲಕ�ಕೆ ತಕ�ಕಂತೆ ನಂತರ ನೀವೆ ಕೈಯಾರೆ &quot;"
+#~ "evolution&quot; ಹೊಂದಿರ�ವ ಮಾಹಿತಿಗಳನ�ನ� ತೆಗೆದ� ಹಾಕಬಹ�ದ�.\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "ನಿಮ�ಮಲ�ಲಿನ ಮಾಹಿತಿ ಹಾಗ� ಸಿದ�ಧತೆಗಳನ�ನ� ನವೀಕರಿಸಲ� {0} ವರೆಗೆ ಡಿಸ�ಕ�� ಜಾಗದ ಅಗತ�ಯವಿದೆ, "
+#~ "ಆದರೆ ನಿಮ�ಮಲ�ಲಿ ಕೇವಲ {1} ಲಭ�ಯವಿದೆ.\n"
+#~ "\n"
+#~ "ಮ�ಂದ�ವರೆಯ� ಮೊದಲ� ನಿಮ�ಮ ನೆಲೆ ಕಡತಕೋಶದಲ�ಲಿ ಒಂದಿಷ�ಟ� ಹೆಚ�ಚಿನ ಜಾಗವನ�ನ� "
+#~ "ತೆರವ�ಗೊಳಿಸ�ವ�ದ� ಅಗತ�ಯವಾಗ�ತ�ತದೆ."
+
 #~ msgid ""
 #~ "Your system configuration does not match your Evolution configuration.\n"
 #~ "\n"
@@ -24878,6 +23948,12 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ "\n"
 #~ "ವಿವರಕ�ಕಾಗಿ ನೆರವನ�ನ� ಕ�ಲಿಕ�ಕಿಸಿ."
 
+#~ msgid "_Keep Data"
+#~ msgstr "ದತ�ತಾಂಶವನ�ನ� ಇರಿಸಿಕೋ(_K)"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "ನನಗೆ ಆಮೇಲೆ ನೆನಪಿಸ�(_R)"
+
 #~ msgid "<b>Field Value</b>"
 #~ msgstr "<b>ಕ�ಷೇತ�ರ ಮೌಲ�ಯ</b>"
 
@@ -24893,6 +23969,15 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Dummy window only"
 #~ msgstr "ಡಮ�ಮಿ ವಿಂಡೋ ಮಾತ�ರ"
 
+#~ msgid "Edit"
+#~ msgstr "ಸಂಪಾದಿಸ�"
+
+#~ msgid "Import"
+#~ msgstr "ಆಮದ�"
+
+#~ msgid "View"
+#~ msgstr "ನೋಡ�"
+
 #~ msgid "Could not execute '%s': %s\n"
 #~ msgstr "'%s' ಅನ�ನ� ಕಾರ�ಯಗತಗೊಳಿಸಲಾಗಿಲ�ಲ: %s\n"
 
@@ -24971,6 +24056,16 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Cut selected message(s) to the clipboard"
 #~ msgstr "ಆರಿಸಲಾದ ಸಂದೇಶವನ�ನ�(ಗಳನ�ನ�) ಕ�ಲಿಪ��ಬೋರ�ಡಿಗಾಗಿ ಕತ�ತರಿಸ�"
 
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "ಆರಿಸಲಾದ ಸಂದೇಶಗಳನ�ನ� ಅಡಗಿಸಿಡ�(_e)"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "ಓದಲಾದ ಸಂದೇಶಗಳನ�ನ� ಅಡಗಿಸಿಡ�(_R)"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "ಅಳಿಸಲಾದ ಸಂದೇಶಗಳ ಮೇಲೆ ಒಂದ� ಗೆರೆ ಎಳೆದ� ತೋರಿಸ�ವ�ದರ ಬದಲ� ಅಡಗಿಸ�"
+
 #~ msgid "Paste message(s) from the clipboard"
 #~ msgstr "ಆಯ�ದ ಸಂದೇಶವನ�ನ�(ಗಳನ�ನ�) ಕ�ಲಿಪ��ಬೋರ�ಡ��ಗೆ  ಅಂಟಿಸ�"
 
@@ -24980,6 +24075,18 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Select all and only the messages that are not currently selected"
 #~ msgstr "ಕೇವಲ ಈಗ ಆಯ�ಕೆ ಮಾಡದೆ ಇರ�ವ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ಆರಿಸ�"
 
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "ಅಡಗಿಸಿಡಲಾದ ಸಂದೇಶಗಳನ�ನ� ತೋರಿಸ�(_n)"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "ತಾತ�ಕಾಲಿಕವಾಗಿ ಅಡಗಿಸಿಡಲಾದ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ತೋರಿಸ�"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "ಈಗಾಗಲೆ ಓದಲಾದ ಎಲ�ಲಾ ಸಂದೇಶಗಳನ�ನ� ತಾತ�ಕಾಲಿಕವಾಗಿ ಅಡಗಿಸಿಡ�"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "ಆರಿಸಲಾದ ಸಂದೇಶಗಳನ�ನ� ತಾತ�ಕಾಲಿಕವಾಗಿ ಅಡಗಿಸಿಡ�"
+
 #~ msgid "Not Junk"
 #~ msgstr "ರದ�ದಿ ಅಲ�ಲ"
 
@@ -25067,9 +24174,51 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "<b>_Selection</b>"
 #~ msgstr "<b>ಆಯ�ಕೆ(_S)</b>"
 
+#~ msgid "Collection"
+#~ msgstr "ಸಂಗ�ರಹ"
+
+#~ msgid "Instance"
+#~ msgstr "ಇನ��ಸ�ಟೆನ�ಸ��"
+
 #~ msgid "Save Custom View"
 #~ msgstr "ಕಸ�ಟಮ� ನೋಟವನ�ನ� ಉಳಿಸ�"
 
+#~ msgid "Select View: %s"
+#~ msgstr "ನೋಟವನ�ನ� ಆರಿಸ�: %s"
+
+#~ msgid "Factory"
+#~ msgstr "ಫ�ಯಾಕ�ಟರಿ"
+
+#~ msgid "Fill color"
+#~ msgstr "ಬಣ�ಣವನ�ನ� ತ�ಂಬಿಸ�"
+
+#~ msgid "GDK fill color"
+#~ msgstr "GDK ಬಣ�ಣವನ�ನ� ತ�ಂಬಿಸ�"
+
+#~ msgid "Fill stipple"
+#~ msgstr "ಸ�ಟಿಪ�ಪಲ��ನಿಂದ ತ�ಂಬಿಸ�"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "ಕನಿಷ�ಟ ಅಗಲ"
+
+#~ msgid "Minimum Width"
+#~ msgstr "ಕನಿಷ�ಟ ಅಗಲ"
+
+#~ msgid "Spacing"
+#~ msgstr "ಜಾಗ ನೀಡಿಕೆ"
+
 #~ msgid "Unknown character set: %s"
 #~ msgstr "ಗೊತ�ತಿರದ ಕ�ಯಾರೆಕ�ಟರ� ಸೆಟ�: %s"
 
@@ -25079,6 +24228,9 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Choose Image"
 #~ msgstr "ಚಿತ�ರವನ�ನ� ಆಯ�ಕೆ ಮಾಡಿ"
 
+#~ msgid "The button state is online"
+#~ msgstr "ಗ�ಂಡಿಯ ಸ�ಥಿತಿಯ� ಆನ�‌ಲೈನ�‌ನಲ�ಲಿದೆ"
+
 #~ msgid "Empty message"
 #~ msgstr "ಖಾಲಿ ಸಂದೇಶ"
 
@@ -25094,6 +24246,21 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ msgid "Item ID"
 #~ msgstr "ಅಂಶ �ಡಿ"
 
+#~ msgid "Text"
+#~ msgstr "ಪಠ�ಯ"
+
+#~ msgid "Cursor Row"
+#~ msgstr "ತೆರೆಸೂಚಕ ಸಾಲ�"
+
+#~ msgid "Cursor Column"
+#~ msgstr "ತೆರೆಸೂಚಕ ಕಾಲಂ"
+
+#~ msgid "Sorter"
+#~ msgstr "ವಿಂಗಡಕ"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "ತೆರೆಸೂಚಕ ಕ�ರಮ"
+
 #~ msgid "<b>Replies</b>"
 #~ msgstr "<b>ಮಾರ�ತ�ತರಗಳ�</b>"
 
@@ -25126,8 +24293,164 @@ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
 #~ "ಸಾಮಾನ�ಯ\n"
 #~ "ಕೆಳಮಟ�ಟದ"
 
+#~ msgid "Selected Column"
+#~ msgstr "ಆರಿಸಲಾದ ಕಾಲಂ"
+
+#~ msgid "Focused Column"
+#~ msgstr "ಕೇಂದ�ರೀಕರಿಸಲಾದ ಕಾಲಂ"
+
+#~ msgid "Unselected Column"
+#~ msgstr "ಆರಿಸದೆ ಇರ�ವ ಕಾಲಂ"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "ಕಾಲಂ ಅನ�ನ� ಹೊಡೆದ� ಹಾಕ�"
+
+#~ msgid "Underline Column"
+#~ msgstr "ಕಾಲಂನ ಕೆಳಗೆ ಗೆರೆಯನ�ನ� ಎಳೆ"
+
+#~ msgid "Bold Column"
+#~ msgstr "ಬೋಲ�ಡ�� ಕಾಲಂ"
+
+#~ msgid "Color Column"
+#~ msgstr "ಬಣ�ಣ ಕಾಲಂ"
+
+#~ msgid "BG Color Column"
+#~ msgstr "BG ಬಣ�ಣ ಕಾಲಂ"
+
+#~ msgid "State"
+#~ msgstr "ಸ�ಥಿತಿ"
+
 #~ msgid "Field Chooser"
 #~ msgstr "ಕ�ಷೇತ�ರದ ಆಯ�ಕೆಗಾರ"
 
+#~ msgid "Alternating Row Colors"
+#~ msgstr "ಸಾಲಿನ ಪರ�ಯಾಯ ಬಣ�ಣಗಳ�"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "ಅಡ�ಡವಾಗಿ ಎಳೆಯಲಾದ ಗ�ರಿಡ�"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "ಲಂಬವಾಗಿ ಎಳೆಯಲಾದ ಗ�ರಿಡ�"
+
+#~ msgid "Draw focus"
+#~ msgstr "ಗಮನ ಸೆಳೆ"
+
+#~ msgid "Cursor mode"
+#~ msgstr "ತೆರೆ ಸೂಚಕ ಕ�ರಮ"
+
+#~ msgid "Selection model"
+#~ msgstr "ಆಯ�ಕಾ ಮಾದರಿ"
+
+#~ msgid "Length Threshold"
+#~ msgstr "ಉದ�ದದ ಮಿತಿ"
+
+#~ msgid "Frozen"
+#~ msgstr "ಸ�ಥಬ�ದಗೊಂಡ"
+
+#~ msgid "Table model"
+#~ msgstr "ಟೇಬಲ� ಮಾದರಿ"
+
+#~ msgid "Cursor row"
+#~ msgstr "ತೆರೆಸೂಚಕ ಸಾಲ�"
+
+#~ msgid "Sort Info"
+#~ msgstr "ವಿಂಗಡಣಾ ಮಾಹಿತಿ"
+
+#~ msgid "Always search"
+#~ msgstr "ಪ�ರತಿಬಾರಿಯೂ ಹ�ಡ�ಕ�"
+
+#~ msgid "Use click to add"
+#~ msgstr "ಸೇರ�ಪಡಿಸಲ� ಕ�ಲಿಕ� ಅನ�ನ� ಬಳಸಿ"
+
 #~ msgid "Tree"
 #~ msgstr "ಟ�ರೀ"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "ಇಟ�ರೀ ಟೇಬಲ� ಅಡಾಪ�ಟರ�"
+
+#~ msgid "Retro Look"
+#~ msgstr "ಪ�ರಾತನ ನೋಟ (ರೆಟ�ರೋ ಲ�ಕ�)"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "ಸಾಲ�ಗಳನ�ನ� ಹಾಗ� +/- ವಿಸ�ತಾರಕಗಳನ�ನ� (ಎಕ�ಸ��ಪ�ಯಾಂಡರ�) ಎಳೆಯಿರಿ."
+
+#~ msgid "Expander Size"
+#~ msgstr "ವಿಸ�ತಾರಕ ಗಾತ�ರ"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "ವಿಸ�ತಾರಕ ಬಾಣದ ಗಾತ�ರ"
+
+#~ msgid "Event Processor"
+#~ msgstr "ಕಾರ�ಯಕ�ರಮ ಪರಿಷ�ಕಾರಕ"
+
+#~ msgid "Bold"
+#~ msgstr "ಬೋಲ�ಡ��"
+
+#~ msgid "Strikeout"
+#~ msgstr "ಹೊಡೆದ�ಹಾಕ�"
+
+#~ msgid "Anchor"
+#~ msgstr "ಲಂಗರ�(Anchor)"
+
+#~ msgid "Justification"
+#~ msgstr "ಜಸ�ತಿಫಿಕೇಶನ�"
+
+#~ msgid "Clip Width"
+#~ msgstr "ಕ�ಲಿಪ� ಅಗಲ"
+
+#~ msgid "Clip Height"
+#~ msgstr "ಕ�ಲಿಪ� ಉದ�ದ"
+
+#~ msgid "Clip"
+#~ msgstr "ಕ�ಲಿಪ�"
+
+#~ msgid "Fill clip rectangle"
+#~ msgstr "ಕ�ಲಿಪ� ಆಯತವನ�ನ� ತ�ಂಬಿಸ�"
+
+#~ msgid "X Offset"
+#~ msgstr "X ಆಫ��ಸೆಟ�"
+
+#~ msgid "Y Offset"
+#~ msgstr "Y ಆಫ��ಸೆಟ�"
+
+#~ msgid "Text width"
+#~ msgstr "ಪಠ�ಯದ ಅಗಲ"
+
+#~ msgid "Text height"
+#~ msgstr "ಪಠ�ಯದ ಉದ�ದ"
+
+#~ msgid "Use ellipsis"
+#~ msgstr "ದೀರ�ಘವೃತ�ತವಾಗಿಸ�ವಿಕೆಯನ�ನ� ಬಳಸಿ"
+
+#~ msgid "Ellipsis"
+#~ msgstr "ದೀರ�ಘವೃತ�ತವಾಗಿಸ�ವಿಕೆ"
+
+#~ msgid "Line wrap"
+#~ msgstr "ಸಾಲ� ಆವರಿಕೆ(wrap)"
+
+#~ msgid "Break characters"
+#~ msgstr "ಬ�ರೇಕ� ಅಕ�ಷರಗಳ�"
+
+#~ msgid "Max lines"
+#~ msgstr "ಮ�ಯಾಕ�ಸ� ಸಾಲ�ಗಳ�"
+
+#~ msgid "Draw borders"
+#~ msgstr "ಅಂಚ�ಗಳನ�ನ� ಎಳೆ"
+
+#~ msgid "Allow newlines"
+#~ msgstr "ಹೊಸಸಾಲ�ಗಳನ�ನ� ಅನ�ಮತಿಸ�"
+
+#~ msgid "Draw background"
+#~ msgstr "ಹಿನ�ನಲೆಯನ�ನ� ಎಳೆ"
+
+#~ msgid "Draw button"
+#~ msgstr "ಗ�ಂಡಿಯನ�ನ� ಎಳೆ"
+
+#~ msgid "Cursor position"
+#~ msgstr "ತೆರೆಸೂಚಕದ ಸ�ಥಳ"
+
+#~ msgid "IM Context"
+#~ msgstr "IM ಸನ�ನಿವೇಶ"
+
+#~ msgid "Handle Popup"
+#~ msgstr "ಪ�ಟಿಕೆಯನ�ನ� ನಿಭಾಯಿಸ�"
diff --git a/po/lv.po b/po/lv.po
index cf0769611d..223d115936 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -2,7 +2,7 @@
 # evolution 1.4 for latvian
 # Copyright (C) 2003, 2006, 2007, 2009 Free Software Foundation, Inc.
 #
-#: ../shell/main.c:479
+#: ../shell/main.c:631
 # Pēteris Krišj�nis <peteris.krisjanis@os.lv>, 2003.
 # Linux Centrs <info@linux.edu.lv>, 2006.
 # Raivis Dejus <orvils@gmail.com>, 2006, 2007, 2009.
@@ -14,10 +14,10 @@ msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=evolution\n"
-"POT-Creation-Date: 2010-04-26 21:29+0000\n"
-"PO-Revision-Date: 2010-05-02 13:09+0300\n"
-"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
-"Language-Team: Latviešu <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2010-03-26 09:17+0000\n"
+"PO-Revision-Date: 2010-04-26 23:38+0300\n"
+"Last-Translator: Peteris Krisjanis <pecisk@gmail.com>\n"
+"Language-Team: Latviešu <lata-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +26,317 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-04 14:02+0000\n"
 "X-Generator: Lokalize 1.0\n"
 
+#: ../a11y/addressbook/ea-addressbook-view.c:94
+#: ../a11y/addressbook/ea-addressbook-view.c:103
+#: ../a11y/addressbook/ea-minicard-view.c:178
+#| msgid "evolution addressbook"
+msgid "evolution address book"
+msgstr "evolution adrešu gr�mata"
+
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:208
+msgid "New Contact"
+msgstr "Jauns kontakts"
+
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:216
+msgid "New Contact List"
+msgstr "Jauns kontaktu saraksts"
+
+#: ../a11y/addressbook/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "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 kontakti"
+
+#: ../a11y/addressbook/ea-minicard.c:31
+msgid "Open"
+msgstr "Atvērt"
+
+#: ../a11y/addressbook/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "Kontaktu saraksts: "
+
+#: ../a11y/addressbook/ea-minicard.c:142
+msgid "Contact: "
+msgstr "Kontakts: "
+
+#: ../a11y/addressbook/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "evolution minikarte"
+
+#: ../a11y/calendar/ea-cal-view-event.c:263
+msgid "It has alarms."
+msgstr "Tam ir trauksmes."
+
+#: ../a11y/calendar/ea-cal-view-event.c:266
+msgid "It has recurrences."
+msgstr "Tam ir atk�rtošan�s."
+
+#: ../a11y/calendar/ea-cal-view-event.c:269
+msgid "It is a meeting."
+msgstr "T� ir san�ksme."
+
+#: ../a11y/calendar/ea-cal-view-event.c:275
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "Kalend�ra notikums: kopsavilkums ir %s."
+
+#: ../a11y/calendar/ea-cal-view-event.c:277
+msgid "Calendar Event: It has no summary."
+msgstr "Kalend�ra notikums: nav kopsavilkuma."
+
+#: ../a11y/calendar/ea-cal-view-event.c:297
+msgid "calendar view event"
+msgstr "kalend�ra skata notikumi"
+
+#: ../a11y/calendar/ea-cal-view-event.c:525
+msgid "Grab Focus"
+msgstr "Paņemt fokusu"
+
+#: ../a11y/calendar/ea-cal-view.c:299
+msgid "New Appointment"
+msgstr "Jauna tikšan�s"
+
+#: ../a11y/calendar/ea-cal-view.c:300
+msgid "New All Day Event"
+msgstr "Jauns visas dienas notikums"
+
+#: ../a11y/calendar/ea-cal-view.c:301
+msgid "New Meeting"
+msgstr "Jauna san�ksme"
+
+#: ../a11y/calendar/ea-cal-view.c:302
+msgid "Go to Today"
+msgstr "Iet uz Å¡odienu"
+
+#: ../a11y/calendar/ea-cal-view.c:303
+msgid "Go to Date"
+msgstr "Iet uz datumu"
+
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
+msgid "a table to view and select the current time range"
+msgstr "tabula pašreizēja laika apskatīšanai un izvēlēš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:148 ../a11y/calendar/ea-week-view.c:147
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Taj� ir %d notikums."
+msgstr[1] "Taj� ir %d notikumi."
+msgstr[2] "Taj� ir %d notikumi."
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
+msgid "It has no events."
+msgstr "Taj� nav notikumu."
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:159
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "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:165
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Dienas apskats: %s. %s"
+
+#: ../a11y/calendar/ea-day-view.c:196
+msgid "calendar view for a work week"
+msgstr "darba nedēļas kalend�ra skats"
+
+#: ../a11y/calendar/ea-day-view.c:198
+msgid "calendar view for one or more days"
+msgstr "vienas vai vair�ku dienu kalend�ra skats"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:776
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../a11y/calendar/ea-gnome-calendar.c:189
+#: ../calendar/gui/calendar-component.c:779
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:368
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../a11y/calendar/ea-gnome-calendar.c:196
+#: ../a11y/calendar/ea-gnome-calendar.c:198
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:788
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:215
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../a11y/calendar/ea-gnome-calendar.c:227
+#: ../a11y/calendar/ea-gnome-calendar.c:229
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/calendar-component.c:807
+#: ../calendar/gui/calendar-component.c:813
+#: ../calendar/gui/calendar-component.c:815
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../a11y/calendar/ea-gnome-calendar.c:219
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-week-view-main-item.c:382
+msgid "%d %b"
+msgstr "%d %b"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:782
+msgid "Gnome Calendar"
+msgstr "Gnome kalend�rs"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:288
+msgid "search bar"
+msgstr "meklēšanas josla"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:289
+msgid "evolution calendar search bar"
+msgstr "evolution kalend�ra meklēšanas josla"
+
+#: ../a11y/calendar/ea-jump-button.c:146
+msgid "Jump button"
+msgstr "P�rlēkšanas taustiņš"
+
+#: ../a11y/calendar/ea-jump-button.c:155
+msgid "Click here, you can find more events."
+msgstr "Spiediet šeit, lai atrastu vair�k notikumus."
+
+#: ../a11y/calendar/ea-week-view.c:154
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Mēneša skats: %s. %s"
+
+#: ../a11y/calendar/ea-week-view.c:158
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Nedēļas skats: %s. %s"
+
+#: ../a11y/calendar/ea-week-view.c:189
+msgid "calendar view for a month"
+msgstr "kalend�ra skats mēnesim"
+
+#: ../a11y/calendar/ea-week-view.c:191
+msgid "calendar view for one or more weeks"
+msgstr "kalend�ra skats vienai vai vair�k�m nedēļ�m"
+
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
+msgid "popup"
+msgstr "uzlecošs"
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
+msgid "popup a child"
+msgstr "par�dīt bērnu"
+
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
+msgid "edit"
+msgstr "rediģēt"
+
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr "s�kt šīs sūnas rediģēšanu"
+
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
+msgid "toggle"
+msgstr "p�rslēgt"
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
+msgid "toggle the cell"
+msgstr "p�rslēgt šūnu"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
+msgid "expand"
+msgstr "izvērst"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
+msgid "expands the row in the ETree containing this cell"
+msgstr "izvērš rindu šo šūnu saturošaj� ETree"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
+msgid "collapse"
+msgstr "sakļaut"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
+msgid "collapses the row in the ETree containing this cell"
+msgstr "sakļauj rindu šo šūnu saturošaj� ETree"
+
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
+msgid "Table Cell"
+msgstr "Tabulas Å¡Å«na"
+
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
+msgid "click to add"
+msgstr "klikšķiniet, lai pievienotu"
+
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "klikšķis"
+
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
+msgid "sort"
+msgstr "k�rtot"
+
+#: ../a11y/widgets/ea-calendar-item.c:295
+#: ../a11y/widgets/ea-calendar-item.c:301
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../a11y/widgets/ea-calendar-item.c:303
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Kalend�rs: no %s līdz %s"
+
+#: ../a11y/widgets/ea-calendar-item.c:338
+msgid "evolution calendar item"
+msgstr "evolution kalend�ra vienība"
+
+#: ../a11y/widgets/ea-combo-button.c:56
+msgid "Combo Button"
+msgstr "Combo poga"
+
+#: ../a11y/widgets/ea-combo-button.c:66
+msgid "Activate Default"
+msgstr "Uzst�dīt noklusētos"
+
+#: ../a11y/widgets/ea-combo-button.c:68
+msgid "Popup Menu"
+msgstr "Uzlecoš� izvēlne"
+
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -48,6 +359,7 @@ msgid "Address '{0}' already exists."
 msgstr "Adrese '{0}' jau eksistē."
 
 #: ../addressbook/addressbook.error.xml.h:5
+#| msgid "Create a new contact"
 msgid "Cannot add new contact"
 msgstr "Nevar pievienot jaunu kontaktu"
 
@@ -74,10 +386,15 @@ msgid "Could not get schema information for LDAP server."
 msgstr "Nevarēju iegūt shēmas inform�ciju par LDAP serveri."
 
 #: ../addressbook/addressbook.error.xml.h:10
+#| msgid "Could not remove addressbook."
 msgid "Could not remove address book."
 msgstr "Nevar izņemt adrešu gr�matu."
 
 #: ../addressbook/addressbook.error.xml.h:11
+#| msgid ""
+#| "Currently you can access only GroupWise System Address Book from "
+#| "Evolution. Please use some other GroupWise mail client once, to get your "
+#| "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
@@ -92,42 +409,53 @@ msgid "Delete address book '{0}'?"
 msgstr "Dzēst adrešu gr�matu '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
+#| msgid "Error loading addressbook."
+msgid "Error loading address book."
+msgstr "Kļūda, iel�dējot adrešu gr�matu."
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Kļūda, saglab�jot {0} uz {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "Neizdev�s autentificēties ar LDAP serveri."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
 msgid "Failed to delete contact"
 msgstr "Neizdev�s dzēst kontaktus"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise adrešu gr�matas veidošana:"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP serveris neatbildēja ar derīgu shēmas inform�ciju."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
+msgid "Server Version"
+msgstr "Servera versija"
+
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr "Dažas iespējas var nestr�d�t ar jūsu pašreizējo serveri"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+#| msgid "The Evolution addressbook has quit unexpectedly."
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution adrešu gr�mata negaidīti aizvēr�s."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "Izvēlētais attēls ir liels. Vai vēlaties mainīt t� izmēru un saglab�t to?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -137,16 +465,20 @@ msgstr ""
 "šo funkcionalit�ti, vai arī tas var būt nepareizi nokonfigurēts. Jaut�jiet "
 "savam administratoram par atbalstītu meklēšanas b�zi."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book could not be opened."
 msgstr "Šo adrešu gr�matu nevarēja atvērt."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:25
+#| msgid "This addressbook server does not have any suggested search bases."
 msgid "This address book 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."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:26
+#| msgid ""
+#| "This addressbook server might be unreachable or the server name may be "
+#| "misspelled or your network connection could be down."
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -154,31 +486,35 @@ msgstr ""
 "Šis adrešu gr�matiņas serveris var būt nepieejams vai servera nosaukums var "
 "būt uzrakstīts nepareizi, vai arī tīkla savienojums nestr�d�."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This address book will be removed permanently."
 msgstr "Šī adrešu gr�mata tiks neatgriezeniski izdzēsta."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Šis serveris neatbalsta LDAPv3 shēmas inform�ciju."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:29
+#| msgid "Unable to open addressbook"
 msgid "Unable to open address book"
 msgstr "Nevar atvērt adrešu gr�matu"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "Nevar veikt meklēšanu."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "Nevar saglab�t {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "Vai vēlaties saglab�t izmaiņas?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:33
+#| msgid ""
+#| "You are attempting to move a contact from one addressbook to another but "
+#| "it cannot be removed from the source. Do you want to save a copy instead?"
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -186,7 +522,7 @@ msgstr ""
 "Jūs mēģin�t p�rvietot kontaktu no vienas adrešu gr�matas uz otru, bet to "
 "nevar izņemt no avota. Varbūt vēlaties saglab�t kopiju?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -196,435 +532,1071 @@ msgstr ""
 "problēmas, lietojot Evolution. Lai iegūtu lab�kus rezult�tus, serveri "
 "vajadzētu atjaunin�t uz atbalstītu versiju"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:35
+#| msgid "You do not have sufficient permissions to delete this mail."
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Jums nav tiesību dzēst kontaktus no šīs adrešu gr�matas."
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Jūs modificēj�t šo kontaktu. Vai vēlaties saglab�t šīs izmaiņas?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:37
 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:36 ../mail/em-vfolder-rule.c:522
-#: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:10
-#: ../widgets/table/e-table-config.ui.h:18
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
+#: ../plugins/groupwise-features/junk-settings.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:18
 msgid "_Add"
 msgstr "_Pievienot"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "_Atmest"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
 msgstr "_Nesaglab�t"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
 msgstr "Mainīt izmē_ru"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "_Use as it is"
 msgstr "_Lietot k� ir"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:597
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "Noklusēt� sinhr. adrese:"
 
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
+#| msgid "Could not load addressbook"
 msgid "Could not load address book"
 msgstr "Nevarēja iel�dēt adrešu gr�matu"
 
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "Nevar nolasīt pilota adrešu lietotnes bloku"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
-msgid "Anniversary"
-msgstr "Ikgadējs"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "C_ontacts"
+msgstr "K_ontakti"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:112
-msgid "Birthday"
-msgstr "Dzimšanas diena"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Certificates"
+msgstr "Sertifik�ti"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#| msgid "Configure autocomplete here"
+msgid "Configure contacts and autocompletion here"
+msgstr "Konfigurējiet kontaktus un autom�tisko pabeigšanu šeit"
+
+#. Create the contacts group
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: ../addressbook/gui/component/addressbook-view.c:1219
+#: ../calendar/gui/calendar-component.c:198 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:585
+msgid "Contacts"
+msgstr "Kontakti"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Address Book"
+msgstr "Evolution adrešu gr�mata"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Address Book address popup"
+msgstr "Evolution adrešu gr�matas logs"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Address Book address viewer"
+msgstr "Evolution adrešu gr�matas skatīt�js"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Address Book card viewer"
+msgstr "Evolution adrešu gr�matas kontaktu skatīt�js"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Address Book component"
+msgstr "Evolution adrešu gr�matas komponente"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Evolution S/MIME sertifik�tu p�rvaldības kontrole"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution mapju iestatījumu konfigur�cijas kontrole"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Manage your S/MIME certificates here"
+msgstr "P�rvaldiet savus S/MIME sertifik�tus šeit"
+
+#. create the local source group
+#. On This Computer is always first and Search Folders is always last
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:197
+#: ../calendar/gui/memos-component.c:157 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:153 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
+msgid "On This Computer"
+msgstr "Šaj� dator�"
+
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "LDAP serverī"
+
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. orange
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:237
+#: ../calendar/gui/calendar-component.c:243
+#: ../calendar/gui/memos-component.c:195 ../calendar/gui/memos-component.c:199
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:191
+#: ../calendar/gui/tasks-component.c:195 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:334
+msgid "Personal"
+msgstr "Personisks"
+
+#: ../addressbook/gui/component/addressbook-component.c:209
+#| msgid "_Contact"
+msgctxt "New"
+msgid "_Contact"
+msgstr "_Kontakts"
+
+#: ../addressbook/gui/component/addressbook-component.c:210
+msgid "Create a new contact"
+msgstr "Izveidot jaunu kontaktu"
+
+#: ../addressbook/gui/component/addressbook-component.c:217
+#| msgid "Contact _List"
+msgctxt "New"
+msgid "Contact _List"
+msgstr "Kontaktu _saraksts"
+
+#: ../addressbook/gui/component/addressbook-component.c:218
+msgid "Create a new contact list"
+msgstr "Izveidot jaunu kontaktu sarakstu"
+
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
+msgid "New Address Book"
+msgstr "Jauna adrešu gr�mata"
+
+#: ../addressbook/gui/component/addressbook-component.c:225
+msgctxt "New"
+msgid "Address _Book"
+msgstr "Adrešu _gr�mata"
+
+#: ../addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new address book"
+msgstr "Izveidot jaunu adrešu gr�matu"
+
+#: ../addressbook/gui/component/addressbook-component.c:389
+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:217
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Izvēloties šo opciju, Evolution savienosies ar LDAP serveri tikai tad, ja "
+"LDAP serveris atbalsta SSL."
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Izvēloties šo opciju, Evolution savienosies ar LDAP serveri tikai tad, ja "
+"LDAP serveris atbalsta TLS."
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+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 ""
+"Izvēloties šo opciju, jūs nor�d�t, ka serveris neizmanto SSL un/vai TLS. "
+"Tas nozīmē, ka jūsu savienojums nebūs drošs, un jūsu dators būs neaizsarg�ts "
+"pret ļaunpr�tīgiem drošības caurumu ekspluat�ciju."
+
+#: ../addressbook/gui/component/addressbook-config.c:346
+msgid "Base"
+msgstr "B�ze"
+
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+msgid "_Type:"
+msgstr "_Tips:"
+
+#: ../addressbook/gui/component/addressbook-config.c:648
+msgid "Copy _book content locally for offline operation"
+msgstr "Kopēt _gr�matas saturu lok�li, darbībai nesaistes režīm�"
+
+#: ../addressbook/gui/component/addressbook-config.c:759
+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 ""
+"Šis ir LDAP servera ports, pie kura Evolution mēģin�s pieslēgties. Tiek "
+"pied�v�ts standarta portu saraksts. Prasiet savam sistēmu administratoram, "
+"k�du portu jums vajadzētu nor�dīt."
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+#| msgid ""
+#| "This is the method Evolution will use to authenticate you.  Note that "
+#| "setting this to \"Email Address\" requires anonymous access to your ldap "
+#| "server."
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"Šī ir metode, kuru Evolution izmantos, lai jūs autentificētu. Atcerieties, "
+"ka iestatot to uz \"E-pasta adrese\", tai ir nepieciešama anonīma pieeja "
+"jūsu "
+"LDAP serverī."
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+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 ""
+"Meklēšanas mērogs definē, cik dziļi jūs vēlaties meklēt direktoriju kok�. "
+"Meklēšanas mērogs \"zem\" iekļaus visus ierakstus zem�k par jūsu ieraksta "
+"b�zi. Meklēšanas mērogs \"viens\" iekļaus ierakstus tikai vienu līmeni zem�k "
+"par jūsu b�zi."
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../smime/gui/smime-ui.glade.h:28
+msgid "General"
+msgstr "Visp�rējs"
+
+#: ../addressbook/gui/component/addressbook-config.c:1021
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../mail/importers/pine-importer.c:383
+msgid "Address Book"
+msgstr "Adrešu gr�mata"
+
+#: ../addressbook/gui/component/addressbook-config.c:1025
+msgid "Server Information"
+msgstr "Servera inform�cija"
+
+#: ../addressbook/gui/component/addressbook-config.c:1027
+msgid "Authentication"
+msgstr "Autentifik�cija"
+
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:20
+msgid "Details"
+msgstr "Detaļas"
+
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1021
+msgid "Searching"
+msgstr "Meklēšana"
+
+#: ../addressbook/gui/component/addressbook-config.c:1033
+msgid "Downloading"
+msgstr "Lejupiel�dēšana"
+
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
+msgid "Address Book Properties"
+msgstr "Adrešu gr�matas īpašības"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:74
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
+msgid "Migrating..."
+msgstr "P�rnes..."
+
+#: ../addressbook/gui/component/addressbook-migrate.c:126
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
+#, c-format
+msgid "Migrating '%s':"
+msgstr "P�rnes '%s':"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:645
+msgid "LDAP Servers"
+msgstr "LDAP serveri"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:760
+msgid "Autocompletion Settings"
+msgstr "Autom�tisk�s pabeigšanas iestatījumi"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution kontaktu mapes atrašan�s vieta un hierarhija ir mainījusies kopš "
+"Evolution 1.x.\n"
+"\n"
+"Lūdzu, esiet pacietīgi, kamēr Evolution p�rnes jūsu mapes..."
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
+msgid ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Pasta kontaktu saraksta form�ts ir mainījies.\n"
+"\n"
+"Lūdzu, esiet pacietīgi, kamēr Evolution p�rnes jūsu mapes..."
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Veids, k�d� Evolution saglab� dažus t�lruņa numurus, ir mainījusies.\n"
+"\n"
+"Lūdzu, esiet pacietīgi, kamēr Evolution p�rceļ jūsu mapes..."
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+"Evolution Palm Sync karšu faili ir mainījušies.\n"
+"\n"
+"Lūdzu, esiet pacietīgi, kamēr Evolution p�rceļ jūsu Pilot Sync datus..."
+
+#: ../addressbook/gui/component/addressbook-view.c:422
+#: ../mail/em-folder-utils.c:456
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "P�rsaukt mapi \"%s\" par:"
+
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:458
+msgid "Rename Folder"
+msgstr "P�rsaukt mapi"
+
+#: ../addressbook/gui/component/addressbook-view.c:430
+#: ../mail/em-folder-utils.c:464
+msgid "Folder names cannot contain '/'"
+msgstr "Mapes nosaukums nevar saturēt '/'"
+
+#: ../addressbook/gui/component/addressbook-view.c:955
+msgid "_New Address Book"
+msgstr "Jau_na adrešu gr�mata"
+
+#: ../addressbook/gui/component/addressbook-view.c:956
+msgid "Save As vCard..."
+msgstr "Saglab�t k� vCard..."
+
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:485 ../calendar/gui/tasks-component.c:477
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "P�_rsaukt..."
+
+#: ../addressbook/gui/component/addressbook-view.c:960
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/e-calendar-table.c:1618
+#: ../calendar/gui/e-calendar-view.c:1833 ../calendar/gui/e-memo-table.c:954
+#: ../calendar/gui/memos-component.c:488 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2124 ../mail/em-folder-view.c:1340
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "_Dzēst"
+
+#: ../addressbook/gui/component/addressbook-view.c:963
+#: ../calendar/gui/calendar-component.c:641
+#: ../calendar/gui/memos-component.c:493 ../calendar/gui/tasks-component.c:485
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "Ī_pašības"
+
+#: ../addressbook/gui/component/addressbook-view.c:1229
+msgid "Contact Source Selector"
+msgstr "Kontaktu avota atlasīt�js"
+
+#: ../addressbook/gui/component/addressbook.c:102
+msgid "Accessing LDAP Server anonymously"
+msgstr "Piekļūst LDAP serverim anonīmi"
+
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
+msgid "Failed to authenticate.\n"
+msgstr "Neizdev�s autentificēties.\n"
+
+#: ../addressbook/gui/component/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Ievadiet paroli %s (lietot�js %s)"
+
+#: ../addressbook/gui/component/addressbook.c:222
+#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:519
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Ievadiet paroli"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "Autom�tisk�s pabeigšanas garums"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "EFolderList XML aizpildes URIs sarakstam"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "EFolderList XML aizpildes URIs sarakstam."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
+msgstr ""
+"Vertik�l�s rūts atrašan�s vieta pikseļos, starp kontaktu un sarakstu "
+"skatiem un priekšskatījuma rūti."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "R�dīt autom�tiski pabeigto v�rdu ar adresi"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+msgid "Show preview pane"
+msgstr "Par�dīt priekšskatījuma rūti"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"Rakstzīmju skaits, kas j�ievada, pirms Evolution mēģin�s autom�tiski pabeigt."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+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.h:9
+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.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+msgid "Vertical pane position"
+msgstr "Vertik�l�s rūts pozīcija"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Vai piespiest r�dīt ierakst� autom�tiski pabeigt� kontakta pasta adresi "
+"ar v�rdu."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
+msgid "Whether to show the preview pane."
+msgstr "Vai r�dīt priekšskatījuma rūti."
+
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Autocompletion"
+msgstr "Autom�tisk� pabeigšana"
+
+#: ../addressbook/gui/component/autocompletion-config.c:177
+msgid "Always _show address of the autocompleted contact"
+msgstr "Vienmēr r�dīt autom�ti_ski pabeigto kontaktu adresi"
+
+#: ../addressbook/gui/component/autocompletion-config.c:182
+#| msgid "Date/Time"
+msgid "Date/Time Format"
+msgstr "Datuma/laika form�ts"
+
+#: ../addressbook/gui/component/autocompletion-config.c:185
+#: ../mail/em-mailer-prefs.c:1456
+#| msgid "Table model"
+msgid "Table column:"
+msgstr "Tabulas kolonna:"
+
+#: ../addressbook/gui/component/autocompletion-config.c:187
+#| msgid "evolution addressbook"
+msgid "Look up in address books"
+msgstr "Uzmeklēt adrešu gr�mat�"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:1
+msgid "1"
+msgstr "1"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:2
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:5
+msgid "5"
+msgstr "5"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:6
+msgid "<b>Authentication</b>"
+msgstr "<b>Autentifik�cija</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:7
+msgid "<b>Downloading</b>"
+msgstr "<b>Lejupiel�dēšana</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:8
+msgid "<b>Searching</b>"
+msgstr "<b>Meklēšana</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:10
+#| msgid "Using distinguished name (DN)"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"Anonīmi\n"
+"Izmantojot e-pasta adresi\n"
+"Izmantojot atšķiramu nosaukumu (DN)"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:14
+msgid "B_rowse this book until limit reached"
+msgstr "P�_rlūkot šo gr�matu, līdz tiek sasniegti limiti"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr "Evolution lietos šo e-pasta adresi, lai jūs autentificētu serverī."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+msgid "Lo_gin:"
+msgstr "_Lietot�jv�rds:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+#| msgid "One"
+msgid ""
+"One\n"
+"Sub"
+msgstr ""
+"Viens\n"
+"Zem"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"SSL šifrēšana\n"
+"TLS šifrēšana\n"
+"Bez šifrēšanas"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+msgid "Search Filter"
+msgstr "Meklēšanas filtrs"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
-#: ../calendar/gui/dialogs/event-page.ui.h:7
-#: ../calendar/gui/dialogs/memo-page.ui.h:1
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+msgid "Search _base:"
+msgstr "Meklēšanas _b�ze:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:26
+msgid "Search _filter:"
+msgstr "Meklēšanas _filtrs:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#| msgid ""
+#| "Search filter is the type of the objects searched for, while performing "
+#| "the search. If this is not modified, by  default search will be performed "
+#| "on objectclass of the type \"person\"."
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"Meklēšanas filtrs ir meklēšanas laik� meklējamo objektu tips. Ja tas netiek "
+"mainīts, pēc noklusējuma tas būs tips \"persona\"."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:28
+msgid "Supported Search Bases"
+msgstr "Atbalstīt�s meklēšanas b�zes"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+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 ""
+"Meklēšanas b�ze ir atšķiramais nosaukums (DN) no ieraksta, kur s�ksies "
+"meklēšana. Ja jūs atst�siet šo tukšu, meklēšana s�ksies no direktoriju "
+"koka saknes."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+#| msgid ""
+#| "This is the full name of your ldap server. For example, \"ldap.mycompany."
+#| "com\"."
+msgid ""
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+"Šis ir pilns LDAP servera nosaukums. Piemēram, \"ldap.manakompanija.com\"."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
+msgstr ""
+"Šis ir maksim�lais lejupiel�dējamo ierakstu skaits. Uzst�dot šo skaitli "
+"p�rlieku lielu, tiks bremzēta jūsu adrešu gr�matas darbība."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:32
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+msgstr ""
+"Šis ir servera nosaukums, kas par�dīsies jūsu Evolution mapju sarakst�. Tas "
+"ir tikai attēlošanas pēc. "
+
+#: ../addressbook/gui/component/ldap-config.glade.h:33
+msgid "_Download limit:"
+msgstr "_Lejupiel�des limits:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:34
+msgid "_Find Possible Search Bases"
+msgstr "_Atrast iespējam�s meklēšanas b�zes"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:35
+msgid "_Login method:"
+msgstr "_Pieteikšan�s metode:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
+#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+msgid "_Name:"
+msgstr "_Nosaukums:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:37
+msgid "_Port:"
+msgstr "_Ports:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+msgid "_Search scope:"
+msgstr "Meklēšana_s mērogs:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Server:"
+msgstr "_Serveris:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:40
+msgid "_Timeout:"
+msgstr "Laika limi_ts:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:41
+msgid "_Use secure connection:"
+msgstr "Lietot droš_u savienojumu:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:42
+msgid "cards"
+msgstr "kartes"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:740
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+msgid "minutes"
+msgstr "minūtes"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "<b>Email</b>"
+msgstr "<b>E-pasts</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+msgid "<b>Home</b>"
+msgstr "<b>M�j�s</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "<b>Instant Messaging</b>"
+msgstr "<b>Tūlītēja ziņojumapmaiņa</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+msgid "<b>Job</b>"
+msgstr "<b>Darb�</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Daž�di</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#| msgid "<b>Home</b>"
+msgid "<b>Notes</b>"
+msgstr "<b>Piezīmes</b>"
+
+#: ../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:8
+msgid "<b>Telephone</b>"
+msgstr "<b>T�lrunis</b>"
+
+#: ../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:10
+msgid "<b>Work</b>"
+msgstr "<b>Darb�</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorijas..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-#| msgid "_Calendar:"
-msgid "Calendar:"
-msgstr "Kalend�rs:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontakts"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "Kontaktu redaktors"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
-#: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
-msgid "Email"
-msgstr "E-pasts"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#| msgid "_Free/Busy:"
-msgid "Free/Busy:"
-msgstr "Brīvs/aizņemts:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "Pilns _v�rds..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:70
-msgid "Home"
-msgstr "M�jas"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
-#| msgid "_Home Page:"
-msgid "Home Page:"
-msgstr "M�jas lapa:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Attēls"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#| msgid "<b>Instant Messaging</b>"
-msgid "Instant Messaging"
-msgstr "Tūlītēja ziņojumapmaiņa"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-msgid "Job"
-msgstr "Darbs"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Mailing Address"
 msgstr "Pasta adrese"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../calendar/gui/dialogs/task-details-page.ui.h:11
-#| msgid "Miscelleneous"
-msgid "Miscellaneous"
-msgstr "Daž�di"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#| msgid "Ni_ckname:"
 msgid "Nic_kname:"
 msgstr "Iesau_ka:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
 msgid "Notes"
 msgstr "Piezīmes"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:71
-#: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
-msgid "Other"
-msgstr "Cits"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "Personīg� inform�cija"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "T�lrunis"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
-#| msgid "_Video Chat:"
-msgid "Video Chat:"
-msgstr "Video tērzēšana:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
-#| msgid "<b>Web Addresses</b>"
-msgid "Web Addresses"
-msgstr "Tīmekļa adreses"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-#| msgid "_Web Log:"
-msgid "Web Log:"
-msgstr "Tīmekļa žurn�ls:"
-
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:69
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
-msgid "Work"
-msgstr "Darb�"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "_Adrese:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "_Laulību jubileja:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "_Asistents:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "_Dzimšanas diena:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "_Kalend�rs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "_Pilsēta:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "_Uzņēmums:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "_Valsts:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "_Nodaļa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "Sagla_b�t k�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "_Brīvs/aizņemts:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "_M�jas lapa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "_Vadīt�js:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Birojs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "_Pasta kastīte:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "_Profesija:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "_Dzīvesbiedrs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "_Rajons/Å¡tats/province:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "_Goda uzruna:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "_Video�ats:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "_Vēlas saņemt pastu HTML form�t�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "_Tīmekļa žurn�ls:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Kur:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/pasta indekss:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:473
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
+#: ../widgets/menus/gal-view-new-dialog.c:61
 msgid "Name"
 msgstr "V�rds"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
+#: ../widgets/table/e-cell-text.c:1829 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Rediģējams"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
-#: ../addressbook/gui/widgets/eab-contact-display.c:539
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#| msgid "Type"
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
-msgid "Error adding contact"
-msgstr "Kļūda, pievienojot kontaktu"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "Darb�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
-msgid "Error modifying contact"
-msgstr "Kļūda, mainot kontaktu"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:58
+msgid "Home"
+msgstr "M�jas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
-msgid "Error removing contact"
-msgstr "Kļūda, noņemot kontaktu"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2294
+msgid "Other"
+msgstr "Cits"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "Avota gr�mata"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "Mērķa gr�mata"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "Ir jauns kontakts"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "Lauki, kuros var rakstīt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "Oblig�ti aizpild�mie lauki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "Izmainīts"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktu redaktors - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 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:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "_Nav attēla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -632,211 +1604,220 @@ msgstr ""
 "Kontakta dati ir nederīgi:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ir nederīg� form�t�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
 #, 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:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ir tukšs"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "Nederīgs kontakts."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "Kontakta �tr� pievienošana"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "Piln� r_ediģēšana"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "_Pilnais v�rds"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "E-_pasts"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "Izvēlietie_s adrešu gr�matu"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-#| msgid "Seychelles"
-msgid "Shell"
-msgstr "ÄŒaula"
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact list (%s)?"
+msgstr ""
+"Vai tieš�m vēlaties dzēst\n"
+"Å¡o kontaktu sarakstu (%s) ?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
+msgid ""
+"Are you sure you want\n"
+"to delete these contact lists?"
+msgstr ""
+"Vai tieš�m vēlaties dzēst\n"
+"Å¡os kontaktu sarakstus?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "EShell singleton"
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact (%s)?"
+msgstr ""
+"Vai jūs tieš�m vēlaties\n"
+"dzēst šo kontaktu (%s)?"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:1
-msgid "Dr."
-msgstr "Dr."
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Vai jūs tieš�m vēlaties\n"
+"dzēst šos kontaktus?"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:2
-msgid "Esq."
-msgstr "Esk."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
+"\n"
+"k-gs\n"
+"k-dze\n"
+"Prof.\n"
+"jaunkundze\n"
+"Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Pilns v�rds"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.ui.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.ui.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.ui.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: ../addressbook/gui/contact-editor/fullname.ui.h:8
-msgid "Miss"
-msgstr "Miss"
-
-#: ../addressbook/gui/contact-editor/fullname.ui.h:9
-msgid "Mr."
-msgstr "Mr."
-
-#: ../addressbook/gui/contact-editor/fullname.ui.h:10
-msgid "Mrs."
-msgstr "Mrs."
-
-#: ../addressbook/gui/contact-editor/fullname.ui.h:11
-msgid "Ms."
-msgstr "Ms."
-
-#: ../addressbook/gui/contact-editor/fullname.ui.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "_V�rds:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "_Uzv�rds:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "_Otrais v�rds:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "_Priev�rds:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#| msgid "<b>Users:</b>"
+msgid "<b>Members</b>"
+msgstr "<b>Dalībnieki</b>"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
 msgstr "Kontaktu saraksta redaktors"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
-msgid "Members"
-msgstr "Biedri"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
+#| msgid "S_elect..."
+msgid "Select..."
+msgstr "Izvēlieties..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Slēpt adreses, sūtot šim sarakstam"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_List name:"
 msgstr "Sara_ksta nosaukums:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
-msgid "_Select..."
-msgstr "Izvēlētie_s..."
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Ievadie_t e-pasta adresi vai p�rvelciet kontaktu uz apakšējo sarakstu:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "Kontaktu saraksta dalībnieki"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
 msgid "_Members"
 msgstr "Dalīb_nieki"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
-msgid "Error adding list"
-msgstr "Kļūda, pievienojot sarakstu"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
-msgid "Error modifying list"
-msgstr "Kļūda, mainot sarakstu"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
-msgid "Error removing list"
-msgstr "Kļūda, noņemot sarakstu"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Gr�mata"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
 msgid "Is New List"
 msgstr "Ir jauns saraksts"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Mainīts kontakts:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Konfliktējošs kontakts:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
+#: ../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 "Atrasts kontakta dublik�ts"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-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?"
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
 msgstr ""
-"V�rds vai e-pasta adrese šim kontaktam jau eksistē šaj� mapē. Vai tomēr "
-"vēlaties pievienot?"
+"V�rds vai e-pasta adrese šim kontaktam jau eksistē šaj� mapē. "
+"Vai tomēr vēlaties pievienot?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Jauns kontakts:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr "S�kotnējais kontakts:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
+#: ../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?"
@@ -844,40 +1825,48 @@ msgstr ""
 "V�rds vai e-pasta adrese šim kontaktam šaj� mapē jau eksistē.\n"
 "Vai tieš�m vēlaties pievienot?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
+#| msgid "Merge"
 msgid "_Merge"
 msgstr "_Apvienot"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "Apvienot kontaktus"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
+msgid "Email"
+msgstr "E-pasts"
+
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Jebkurš lauks satur"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "E-pasts s�kas ar"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#| msgid "contains"
 msgid "Name contains"
 msgstr "v�rds satur"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Kontaktu nav"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -885,32 +1874,24 @@ msgstr[0] "%d kontakts"
 msgstr[1] "%d kontakti"
 msgstr[2] "%d kontaktu"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:307
-msgid "Error getting book view"
-msgstr "Kļūda, veidojot gr�matas skatu"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Vaic�jums"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:706
-#| msgid "Search Filter"
-msgid "Search Interrupted"
-msgstr "Meklēšana p�rtraukta"
-
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
+msgid "Error getting book view"
+msgstr "Kļūda, veidojot gr�matas skatu"
+
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "Modelis"
 
@@ -918,110 +1899,114 @@ msgstr "Modelis"
 msgid "Error modifying card"
 msgstr "Kļūda, mainot karti"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
-#| msgid "Cut selected text to the clipboard"
-msgid "Cut selected contacts to the clipboard"
-msgstr "Izgriezt izvēlēto saturu starpliktuvē"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
-#| msgid "Copy selected text to the clipboard"
-msgid "Copy selected contacts to the clipboard"
-msgstr "Kopēt izvēlētos kontaktus uz starpliktuvi"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
-#| msgid "Paste tasks from the clipboard"
-msgid "Paste contacts from the clipboard"
-msgstr "Ielīmēt kontaktus no starpliktuves"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
-msgid "Delete selected contacts"
-msgstr "Dzēst izvēlētos kontaktus"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
-#| msgid "Select all contacts"
-msgid "Select all visible contacts"
-msgstr "Izvēlēties visus redzamos kontaktus"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-#| msgid "Select View: %s"
-msgid "Shell View"
-msgstr "ÄŒaulas skats"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
+msgid "Name begins with"
+msgstr "V�rds s�kas ar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Avots"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete these contact lists?"
-msgid "Are you sure you want to delete these contact lists?"
-msgstr "Vai tieš�m vēlaties dzēst šos kontaktu sarakstus?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:569
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
+msgid "Type"
+msgstr "Tips"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete these contact lists?"
-msgid "Are you sure you want to delete this contact list?"
-msgstr "Vai tieš�m vēlaties dzēst šo kontaktu sarakstu?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
+#| msgid "Save as VCard..."
+msgid "Save as vCard..."
+msgstr "Saglab�t k� vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
-#, c-format
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete contact list (%s)?"
-msgid "Are you sure you want to delete this contact list (%s)?"
-msgstr "Vai tieš�m vēlaties dzēst šo kontaktu sarakstu (%s) ?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:937
+#: ../ui/evolution-addressbook.xml.h:56
+msgid "_Open"
+msgstr "_Atvērt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete these contacts?"
-msgid "Are you sure you want to delete these contacts?"
-msgstr "Vai jūs tieš�m vēlaties dzēst šos kontaktus?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+msgid "_New Contact..."
+msgstr "Jau_ns kontakts..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete these contacts?"
-msgid "Are you sure you want to delete this contact?"
-msgstr "Vai jūs tieš�m vēlaties dzēst šo kontaktu?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+msgid "New Contact _List..."
+msgstr "Jauns kontaktu _saraksts..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
-#, c-format
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete contact (%s)?"
-msgid "Are you sure you want to delete this contact (%s)?"
-msgstr "Vai jūs tieš�m vēlaties dzēst šo kontaktu (%s)?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#| msgid "_Save as VCard..."
+msgid "_Save as vCard..."
+msgstr "_Saglab�t k� vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
-#, 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?"
-msgid ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr ""
-"%d kontaktu atvēršana atvērs %d jaunus logus.\n"
-"Vai tieš�m vēlaties attēlot visus šos kontaktus?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+msgid "_Forward Contact"
+msgstr "_P�rsūtīt kontaktu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
-msgid "_Don't Display"
-msgstr "_Neattēlot"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+msgid "_Forward Contacts"
+msgstr "_P�rsūtīt kontaktus"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
-msgid "Display _All Contacts"
-msgstr "_Attēlot visus kontaktus..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+msgid "Send _Message to Contact"
+msgstr "Sūtīt vēstuli kontakta_m"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+msgid "Send _Message to List"
+msgstr "Sūtīt vēstuli saraksta_m"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+msgid "Send _Message to Contacts"
+msgstr "Sūtīt vēstuli kontaktie_m"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+msgid "_Print"
+msgstr "_Druk�t"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+msgid "Cop_y to Address Book..."
+msgstr "Kopē_t uz adrešu gr�matu..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+msgid "Mo_ve to Address Book..."
+msgstr "P�r_vietot uz adrešu gr�matu..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+msgid "Cu_t"
+msgstr "Izgiez_t"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../calendar/gui/e-calendar-table.c:1604
+#: ../calendar/gui/e-calendar-view.c:1818 ../calendar/gui/e-memo-table.c:945
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "_Kopēt"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+msgid "P_aste"
+msgstr "I_elīmēt"
+
+#. All, unmatched, separator
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
+msgid "Any Category"
+msgstr "Jebkura kategorija"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
+msgid "Unmatched"
+msgstr "Neatbilstoši"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "Asistents"
 
@@ -1050,7 +2035,8 @@ msgid "Car Phone"
 msgstr "Automašīnas t�lrunis"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../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
@@ -1058,7 +2044,7 @@ msgid "Categories"
 msgstr "Kategorijas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "Uzņēmums"
 
@@ -1107,22 +2093,22 @@ msgid "Journal"
 msgstr "Žurn�ls"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
 msgstr "Vadīt�js"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "Mobilais t�lrunis"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "Iesauka"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "Piezīme"
 
@@ -1151,13 +2137,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:581
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Loma"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:584
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "Dzīvesbiedrs"
 
@@ -1176,7 +2163,6 @@ msgid "Telex"
 msgstr "Telekss"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:825
 msgid "Title"
 msgstr "Nosaukums"
 
@@ -1191,27 +2177,29 @@ msgstr "Tīmekļa vietne"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
+#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "Platums"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Augstums"
 
@@ -1236,11 +2224,15 @@ msgstr "Teksta modelis"
 msgid "Max field name length"
 msgstr "Maksim�lais lauka nosaukuma garums"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Kolonnas platums"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Search for the Contact."
 msgid ""
 "\n"
 "\n"
@@ -1250,7 +2242,7 @@ msgstr ""
 "\n"
 "Meklē kontaktus..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -1264,7 +2256,7 @@ msgstr ""
 "\n"
 "vai arī dubultklikšķiniet šeit, lai izveidotu jaunu kontaktu."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1278,7 +2270,7 @@ msgstr ""
 "\n"
 "Dubultklikšķiniet šeit, lai izveidotu jaunu kontaktu."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -1288,7 +2280,7 @@ msgstr ""
 "\n"
 "Meklēt kontaktu."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1298,7 +2290,7 @@ msgstr ""
 "\n"
 "Nav priekšmetu, ko r�dīt šaj� skat�."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adapteris"
 
@@ -1311,7 +2303,7 @@ msgid "Home Email"
 msgstr "M�jas e-pasts"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "Cits e-pasts"
 
@@ -1323,284 +2315,235 @@ msgstr "Izvēlētais"
 msgid "Has Cursor"
 msgstr "Ir kursors"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
-msgid "evolution address book"
-msgstr "evolution adrešu gr�mata"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:33
-msgid "New Contact"
-msgstr "Jauns kontakts"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:34
-msgid "New Contact List"
-msgstr "Jauns kontaktu saraksts"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "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 kontakti"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:31
-msgid "Open"
-msgstr "Atvērt"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:153
-msgid "Contact List: "
-msgstr "Kontaktu saraksts: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:154
-msgid "Contact: "
-msgstr "Kontakts: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:180
-msgid "evolution minicard"
-msgstr "evolution minikarte"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-msgid "Copy _Email Address"
-msgstr "Kopēt _e-pasta adresi"
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:547
+msgid "_Open Link in Browser"
+msgstr "_Atvērt saiti p�rlūk�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
-#| msgid "Copy things to the clipboard."
-msgid "Copy the email address to the clipboard"
-msgstr "Kopēt e-pasta adreses uz starpliktuvi"
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2694
+msgid "_Copy Link Location"
+msgstr "_Kopēt saites vietu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:548
 msgid "_Send New Message To..."
 msgstr "_Sūtīt jaunu vēstuli..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
-#| msgid "Convert a mail message to a task."
-msgid "Send a mail message to this address"
-msgstr "Sūtīt e-pasta vēstuli uz šo adresi"
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Kopēt _e-pasta adresi"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:258
-#: ../addressbook/gui/widgets/eab-contact-display.c:260
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(karte)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:278
-#: ../addressbook/gui/widgets/eab-contact-display.c:289
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "karte"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:415
-#: ../addressbook/gui/widgets/eab-contact-display.c:778
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "Saraksta dalībnieki"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "Nodaļa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "Profesija"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "Pozīcija"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "Video tērzēšana"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../calendar/gui/gnome-cal.c:2560
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:578
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Kalend�rs"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
-#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Brīvs/aizņemts"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "T�lrunis"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:565
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "Fakss"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Address"
 msgstr "Adrese"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "M�jas lapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "Tīmekļa žurn�ls"
 
-#. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person memo list
-#. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:346 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:154
-#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
-#: ../plugins/email-custom-header/email-custom-header.c:320
-msgid "Personal"
-msgstr "Personisks"
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2585
+msgid "Birthday"
+msgstr "Dzimšanas diena"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:796
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2586
+msgid "Anniversary"
+msgstr "Ikgadējs"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "Amats"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:833
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "M�jas lapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:842
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Emu�rs"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
-#, c-format
-msgid "Click to mail %s"
-msgstr "Klikšķiniet, lai sūtītu %s"
-
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Veiksmīgi"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Aizmugure aizņemta"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Kr�tuve ir nesaistē"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "Adrešu gr�mata neeksistē"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "Nav definēti lietot�ja kontakti"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "Atļauja liegta"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Kontakts nav atrasts"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "Kontakts ar š�du ID jau eksistē"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Protokols nav atbalstīts"
 
 #. E_BOOK_ERROR_CANCELLED
-#. To Translators: This is task status
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:633
+#: ../calendar/gui/e-calendar-table.c:243
+#: ../calendar/gui/e-calendar-table.c:666 ../calendar/gui/print.c:2591
 msgid "Canceled"
 msgstr "Atcelts"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "Nevarēja atcelt"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:437
 msgid "Authentication Failed"
 msgstr "Autentifik�cija neizdev�s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:431
 msgid "Authentication Required"
 msgstr "Nepieciešama autentifik�cija"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS nav pieejams"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Nav t�da avota"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "Nav pieejams nesaistes režīm�"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "Cita kļūda"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "Nederīga servera versija"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#| msgid "Unsupported operation"
 msgid "Unsupported authentication method"
 msgstr "Neatbalstīta autentifik�cijas metode"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#| 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"
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1610,8 +2553,11 @@ msgstr ""
 "lietošanai nesaistes režīm� vai nav vēl lejupiel�dēta. Lūdzu, iel�dējiet "
 "adrešu gr�matu, kad esat tiešsaistes režīm�, lai lejupiel�dētu t�s saturu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
+#| msgid ""
+#| "We were unable to open this addressbook.  Please check that the path %s "
+#| "exists and that you have permission to access it."
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
@@ -1619,7 +2565,11 @@ msgstr ""
 "Nevar atvērt šo adrešu gr�matu. Lūdzu, p�rbaudiet, vai ceļš %s eksistē un "
 "vai jums ir pieejas atļauja ceļa mērķim."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#| 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."
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1628,19 +2578,30 @@ msgstr ""
 "LDAP lietotnē Evolution, jums ir j�uzst�da Evolution versija ar LDAP "
 "atbalstu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#| msgid ""
+#| "We were unable to open this addressbook.  This either means you have "
+#| "entered an incorrect URI, or the server is unreachable."
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
 msgstr ""
 "Nevar atvērt šo adrešu gr�matu. Tas nozīmē, ka esat ievadījuši nepareizu "
-"URI, vai arī serveris ir nesasniedzams."
+"URI, "
+"vai arī serveris ir nesasniedzams."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#| msgid "Total messages:"
+#| msgid_plural "Total messages:"
 msgid "Detailed error message:"
 msgstr "Detalizēts kļūdas paziņojums:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#| msgid ""
+#| "More cards matched this query than either the server is \n"
+#| "configured to return or Evolution is configured to display.\n"
+#| "Please make your search more specific or raise the result limit in\n"
+#| "the directory server preferences for this addressbook."
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1652,7 +2613,12 @@ msgstr ""
 "Lūdzu, padariet jūsu meklējumu precīz�ku, vai arī palieliniet rezult�ta\n"
 "limitu direktorijas servera iestatījumos šai adrešu gr�matai."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#| msgid ""
+#| "The time to execute this query exceeded the server limit or the limit\n"
+#| "you have configured for this addressbook.  Please make your search\n"
+#| "more specific or raise the time limit in the directory server\n"
+#| "preferences for this addressbook."
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1664,96 +2630,205 @@ msgstr ""
 "vai arī palieliniet laika limitu direktorijas servera iestatījumos\n"
 "šai adrešu gr�matai."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#| msgid "The backend for this addressbook was unable to parse this query."
 msgid "The backend for this address book was unable to parse this query."
 msgstr "Šīs adrešu gr�matas aizmugure nespēja apstr�d�t šo pieprasījumu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#| msgid "The backend for this addressbook refused to perform this query."
 msgid "The backend for this address book refused to perform this query."
 msgstr "Šīs adrešu gr�matas aizmugure atteic�s izpildīt šo vaic�jumu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "Šis vaic�jums netika izpildīts veiksmīgi."
 
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid "Error adding list"
+msgstr "Kļūda, pievienojot sarakstu"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
+msgid "Error adding contact"
+msgstr "Kļūda, pievienojot kontaktu"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
+msgid "Error modifying list"
+msgstr "Kļūda, mainot sarakstu"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
+msgid "Error modifying contact"
+msgstr "Kļūda, mainot kontaktu"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+msgid "Error removing list"
+msgstr "Kļūda, noņemot sarakstu"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Error removing contact"
+msgstr "Kļūda, noņemot kontaktu"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+#, 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] ""
+"%d kontakta atvēršana atvērs %d jaunus logus.\n"
+"Vai jūs tieš�m vēlaties attēlot šo kontaktu?"
+msgstr[1] ""
+"%d kontaktu atvēršana atvērs %d jaunus logus.\n"
+"Vai jūs tieš�m vēlaties attēlot visus šos kontaktus?"
+msgstr[2] ""
+"%d kontaktu atvēršana atvērs %d jaunus logus.\n"
+"Vai jūs tieš�m vēlaties attēlot visus šos kontaktus?"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#| msgid "Display"
+msgid "_Don't Display"
+msgstr "_Neattēlot"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#| msgid "Co_py All Contacts To..."
+msgid "Display _All Contacts"
+msgstr "_Attēlot visus kontaktus..."
+
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s jau eksistē.\n"
+"Vai vēlies to p�rrakstīt?"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
+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:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
+msgid "contact"
+msgid_plural "contacts"
+msgstr[0] "kontakts"
+msgstr[1] "kontakti"
+msgstr[2] "kontaktu"
+
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "Izvēlēties adrešu gr�matu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "saraksts"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "P�rvietot kontaktu uz"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "Kopēt kontaktu uz"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "P�rvietot kontaktus uz"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "Kopēt kontaktus uz"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
+#| msgid "Multiple VCards"
+msgid "Multiple vCards"
+msgstr "Vair�kas vCard"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
+#, c-format
+#| msgid "VCard for %s"
+msgid "vCard for %s"
+msgstr "%s vCard"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
+#, c-format
+msgid "Contact information"
+msgstr "Kontaktinform�cija"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
+#, c-format
+msgid "Contact information for %s"
+msgstr "%s kontaktinform�cija"
+
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
+msgid "Querying Address Book..."
+msgstr "Izpilda vaic�jumu adrešu gr�mat�..."
+
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Karšu skats"
 
-#: ../addressbook/importers/evolution-csv-importer.c:654
-#: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
+#: ../addressbook/importers/evolution-vcard-importer.c:252
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Notiek importēšana..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV vai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV un Tab failu importēt�js"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV vai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV un Tab failu importēt�js"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV vai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV un Tab failu importēt�js"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP datu apmaiņas form�ts (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importēšana"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:548
+#| msgid "VCard (.vcf, .gcrd)"
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:549
+#| msgid "Evolution VCard Importer"
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard importēt�js"
 
@@ -1764,6 +2839,7 @@ msgid "Can not open file"
 msgstr "Nevar atvērt failu"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
+#| msgid "Couldn't get list of addressbooks"
 msgid "Couldn't get list of address books"
 msgstr "Nevarēja saņemt adrešu gr�matas sarakstu"
 
@@ -1780,12 +2856,13 @@ msgid "OUTPUTFILE"
 msgstr "IZEJASFAILS"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:49
+#| msgid "List local addressbook folders"
 msgid "List local address book folders"
 msgstr "Par�dīt lok�l�s adrešu gr�matas mapes"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
-msgstr "R�dīt kartes k� vcard vai csv failu"
+msgstr "Par�dīt kartes k� vcard vai csv failu"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
@@ -1796,6 +2873,9 @@ msgid "Export in asynchronous mode"
 msgstr "Eksportēt asinhron� režīm�"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:59
+#| msgid ""
+#| "The number of cards in out output file in asynchronous mode, default size "
+#| "100."
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -1830,30 +2910,6 @@ msgstr "Parastaj� režīm� izmēra opcija nav vajadzīga."
 msgid "Unhandled error"
 msgstr "Neapstr�d�ta kļūda"
 
-#: ../addressbook/util/addressbook.c:103
-msgid "Accessing LDAP Server anonymously"
-msgstr "Piekļūst LDAP serverim anonīmi"
-
-#: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
-msgid "Failed to authenticate.\n"
-msgstr "Neizdev�s autentificēties.\n"
-
-#: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Ievadiet paroli %s (lietot�js %s)"
-
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
-#: ../plugins/publish-calendar/publish-calendar.c:328
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "Ievadiet paroli"
-
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -1865,6 +2921,9 @@ msgstr ""
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
+#| msgid ""
+#| "You have a read-only calendar source selected. Change to Calendar View "
+#| "and highlight a calendar that can accept appointments."
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -1885,10 +2944,12 @@ msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
-"Jēgpilna uzdevuma kopsavilkuma pievienošana dos taviem saņēmējiem iespēju "
-"lab�k saprast, par ko ir šis uzdevums."
+"Jēgpilna uzdevuma kopsavilkuma pievienošana dos taviem saņēmējiem "
+"iespēju lab�k saprast, par ko ir šis uzdevums."
 
 #: ../calendar/calendar.error.xml.h:7
+#| msgid ""
+#| "All information on these tasks will be deleted and can not be restored."
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr "Visa inform�cija šajos memo tiks dzēsta un to nevarēs atjaunot."
 
@@ -1918,6 +2979,8 @@ msgid ""
 msgstr "Visa inform�cija par šo tikšanos tiks dzēsta un to nevarēs atjaunot."
 
 #: ../calendar/calendar.error.xml.h:13
+#| msgid ""
+#| "All information on this meeting will be deleted and can not be restored."
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr "Visa inform�cija par šo memo tiks dzēsta un to nevarēs atjaunot."
 
@@ -1934,101 +2997,101 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Vai tieš�m vēlaties dzēst tikšanos '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:17
-#| msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "Vai tieš�m vēlaties dzēst tikšanos '{0}'?"
-
-#: ../calendar/calendar.error.xml.h:18
+#| msgid "Are you sure you want to delete the '{0}' task?"
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Vai tieš�m vēlaties dzēst memo '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Vai tieš�m vēlaties dzēst šīs {0} tikšan�s?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:19
+#| msgid "Are you sure you want to delete these {0} tasks?"
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Vai tieš�m vēlaties dzēst šos {0} memo?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Vai tieš�m vēlaties dzēst šos {0} uzdevumus?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Vai tieš�m vēlaties dzēst šo tikšanos?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:191
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Vai tieš�m vēlaties dzēst šo san�ksmi?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:197
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
+#| msgid "Are you sure you want to delete this meeting?"
 msgid "Are you sure you want to delete this memo?"
 msgstr "Vai tieš�m vēlaties dzēst šo memo?"
 
-#: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:194
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Vai tieš�m vēlaties dzēst šo uzdevumu?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Vai tieš�m vēlaties saglab�t memo, nenor�dot kopsavilkumu?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Vai tieš�m vēlaties sūtīt tikšanos, nenor�dot kopsavilkumu?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Vai tieš�m vēlaties sūtīt uzdevumu, nenor�dot kopsavilkumu?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:28
+#| msgid "Repository offline"
 msgid "Calendar repository is offline."
 msgstr "Kalend�ra kr�tuve ir nesaistē."
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "Nevar izveidot jaunu notikumu"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
+#| msgid "Cannot create a new event"
 msgid "Cannot save event"
 msgstr "Nevar saglab�t notikumu"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Dzēst kalend�ru '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Dzēst memo sarakstu '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Dzēst uzdevumu sarakstu '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "_Nesūtīt"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Notiek lejupiel�de. Vai vēlies saglab�t tikšanos?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Notiek lejupiel�de. Vai vēlies saglab�t uzdevumu?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "Nevar iel�dēt redaktoru."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -2036,31 +3099,32 @@ msgstr ""
 "E-pasta uzaicin�jumi tiks nosūtīti visiem dalībniekiem, un atļaut viņiem "
 "apstiprin�t šo uzdevumu."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-pasta uzaicin�jumi tiks nosūtīti visiem dalībniekiem, un atļaut viņiem "
 "atbildēt."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Kļūda, iel�dējot kalend�ru"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Kļūda, iel�dējot memo sarakstu"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Kļūda, iel�dējot uzdevumu sarakstu"
 
 #. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:44
+#| msgid "Error while {0}."
 msgid "Error on '{0}'"
 msgstr "Kļūda uz '{0}'."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2068,15 +3132,18 @@ msgstr ""
 "Ja nenosūtīsiet atcelšanas ziņu, citi dalībnieki var nezin�t, ka šī tikšan�s "
 "ir atcelta."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:46
+#| msgid ""
+#| "If you do not send a cancelation notice, the other participants may not "
+#| "know the task has been deleted."
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr ""
-"Ja nenosūtīsiet atcelšanas ziņu, citi dalībnieki var nezin�t, ka šis memo ir "
-"izdzēsts."
+"Ja nenosūtīsiet atcelšanas ziņu, citi dalībnieki var nezin�t, ka šis memo "
+"ir izdzēsts."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2084,11 +3151,26 @@ msgstr ""
 "Ja nenosūtīsiet atcelšanas ziņu, citi dalībnieki var nezin�t, ka šis "
 "uzdevums ir izdzēsts."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:48
 msgid "No response from the server."
 msgstr "Nav atbildes no servera."
 
+#: ../calendar/calendar.error.xml.h:49
+#| msgid "New Appointment"
+msgid "Save Appointment"
+msgstr "Saglab�t tikšanos"
+
 #: ../calendar/calendar.error.xml.h:50
+#| msgid "_Shared memo"
+msgid "Save Memo"
+msgstr "Saglab�t memo"
+
+#: ../calendar/calendar.error.xml.h:51
+#| msgid "Save As"
+msgid "Save Task"
+msgstr "Saglab�t uzdevumu"
+
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2096,7 +3178,7 @@ msgstr ""
 "Jaun�k�s inform�cijas nosūtīšana ļauj p�rējiem dalībniekiem uzturēt savus "
 "kalend�rus aktu�lus."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2104,7 +3186,7 @@ msgstr ""
 "Jaun�k�s inform�cijas nosūtīšana ļauj p�rējiem dalībniekiem uzturēt savus "
 "uzdevumu sarakstus aktu�lus."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2112,7 +3194,7 @@ msgstr ""
 "Daži pielikumi pašlaik tiek lejupl�dēti. Saglab�jot tikšanos, šie pielikumi "
 "tiks pazaudēti."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2120,98 +3202,96 @@ msgstr ""
 "Daži pielikumi pašlaik tiek lejupl�dēti. Saglab�jot uzdevumu, šie pielikumi "
 "tiks pazaudēti."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr "Dažas iespējas var nedarboties ar pašreizējo serveri."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution kalend�rs negaidīti aizvēr�s."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
+#| msgid "The Evolution calendar has quit unexpectedly."
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution kalend�ri negaidīti aizvēr�s."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution memo negaidīti aizvēr�s."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution uzdevumi negaidīti aizvēr�s."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalend�rs nav atzīmēts lietošanai nesaistē."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
+#| msgid "The memo list is not marked for offline usage"
 msgid "The memo list is not marked for offline usage."
 msgstr "Memo nav atzīmēta lietošanai nesaistē."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "Uzdevumu saraksts nav atzīmēts lietošanai nesaistē."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "Kalend�rs tiks neatgriezeniski dzēsts."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Memo saraksts tiks neatgriezeniski dzēsts."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "Uzdevumu saraksts tiks neatgriezeniski dzēsts."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
+#| msgid "Failed to load the calendar '%s'"
 msgid "Unable to load the calendar"
 msgstr "Neizdev�s iel�dēt kalend�ru"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Vai vēlaties saglab�t šīs tikšan�s izmaiņas?"
 
-#: ../calendar/calendar.error.xml.h:67
-#| msgid "Would you like to save your changes to this memo?"
-msgid "Would you like to save your changes to this meeting?"
-msgstr "Vai vēlaties saglab�t šīs tikšan�s izmaiņas?"
-
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "Vai vēlaties saglab�t šī memo izmaiņas?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "Vai vēlaties saglab�t šī uzdevuma izmaiņas?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Vai vēlaties nosūtīt šī memo atsaukšanas ziņu?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Vai vēlaties visiem dalībniekiem nosūtīt atsaukšanas ziņu?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vai vēlaties nosūtīt tikšan�s ielūgumus visiem dalībniekiem?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "Vai jūs vēlaties nosūtīt šo uzdevumu visiem dalībniekiem?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "Vai vēlaties nosūtīt atjaunotu tikšan�s inform�ciju visiem dalībniekiem?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "Vai vēlaties nosūtīt atjaunotu uzdevumu inform�ciju visiem dalībniekiem?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:78
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2221,212 +3301,282 @@ msgstr ""
 "lietojot Evolution. Lai t� nebūtu, serveris būtu j�atjauno uz versiju, kas "
 "tiek atbalstīta."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Jūs esat izmainījis šo tikšanos, bet neesat to saglab�jis."
 
-#: ../calendar/calendar.error.xml.h:78
-#| msgid "You have changed this task, but not yet saved it."
-msgid "You have changed this meeting, but not yet saved it."
-msgstr "Jūs esat izmainījis šo san�ksmi, bet neesat to saglab�jis."
-
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr "Jūs esat izmainījis šo uzdevumu, bet neesat to saglab�jis."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:81
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Jūs esat izmainījis šo memo, bet neesat to saglab�jis."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Jūsu kalend�ri nebūs pieejami līdz Evolution nebūs p�rstartēts."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Jūsu memo nebūs pieejams līdz Evolution p�rstartēšanai."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Jūsu uzdevumi nebūs pieejami līdz Evolution nebūs p�rstartēts."
 
-#: ../calendar/calendar.error.xml.h:84
-#: ../composer/mail-composer.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:85
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Atmest izmaiņas"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:345
 msgid "_Save"
 msgstr "_Saglab�t"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "_Saglab�t izmaiņas"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:88
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Sūtīt"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "_Sūtīt paziņojumu"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "Sadalīt vair�ku dienu notikumus:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
+#: ../calendar/conduits/calendar/calendar-conduit.c:1519
+#: ../calendar/conduits/calendar/calendar-conduit.c:1520
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1008
+#: ../calendar/conduits/todo/todo-conduit.c:1009
 msgid "Could not start evolution-data-server"
 msgstr "Nevar palaist evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
+#: ../calendar/conduits/calendar/calendar-conduit.c:1627
+#: ../calendar/conduits/calendar/calendar-conduit.c:1630
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nevar nolasīt Pilot kalend�ra lietotnes bloku"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "Nevar nolasīt pilot memo lietotnes bloku"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "Nevar ierakstīt pilot memo lietotnes bloku"
 
-#: ../calendar/conduits/todo/todo-conduit.c:231
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "Noklusēt� priorit�te:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
+#: ../calendar/conduits/todo/todo-conduit.c:1092
+#: ../calendar/conduits/todo/todo-conduit.c:1095
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nevar nolasīt pilot dar�mo sarakstu lietotnes bloku"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
+#: ../calendar/conduits/todo/todo-conduit.c:1137
+#: ../calendar/conduits/todo/todo-conduit.c:1140
 msgid "Could not write pilot's ToDo application block"
 msgstr "Nevar ierakstīt pilot dar�mo sarakstu lietotnes bloku"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:2549
+msgid "Calendar and Tasks"
+msgstr "Kalend�rs un uzdevumi"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:824
+#: ../calendar/gui/calendar-component.c:1243
+msgid "Calendars"
+msgstr "Kalend�ri"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurējiet laika joslu, kalend�ru un uzdevumu sarakstu šeit"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalend�rs un uzdevumi"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution kalend�ra konfigur�cijas kontrole"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalend�ra grafika ziņu p�rlūks"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalend�ra/uzdevumu redaktors"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalend�ra komponente"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Memos component"
+msgstr "Evolution memo komponente"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Tasks component"
+msgstr "Evolution uzdevumu komponente"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Memo_s"
+msgstr "Mem_o"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/e-memo-table.c:298 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1853 ../calendar/gui/memos-component.c:570
+#: ../calendar/gui/memos-component.c:888 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
+msgid "Memos"
+msgstr "Memo"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/e-calendar-table.c:730 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1721 ../calendar/gui/print.c:2016
+#: ../calendar/gui/tasks-component.c:562 ../calendar/gui/tasks-component.c:884
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
+msgid "Tasks"
+msgstr "Uzdevumi"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+msgid "_Calendars"
+msgstr "_Kalend�ri"
+
+#. Tasks
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Uzdevumi"
+
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution kalend�ra trauksmes paziņojumu serviss"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 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:117
-#| msgid "hours"
-#| msgid_plural "hours"
-msgid "hour"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:294
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:741
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+msgid "hours"
 msgid_plural "hours"
 msgstr[0] "stunda"
 msgstr[1] "stundas"
 msgstr[2] "stundu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "S�kuma laiks"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 msgid "Appointments"
 msgstr "Tikšan�s"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Dismiss _All"
-msgstr "_Atcelt visas"
+msgstr "Atcelt visas"
 
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "Atrašan�s vieta:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "Snooze _time:"
 msgstr "Snaudas _laiks:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "_Dismiss"
 msgstr "_Atcelt"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1025
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
-#: ../widgets/menus/gal-define-views.ui.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "R_ediģēt"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "_Snooze"
 msgstr "_Snauda"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
-#: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
-#| msgid "hours"
-#| msgid_plural "hours"
-msgid "hours"
-msgstr "stundas"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 msgid "location of appointment"
 msgstr "tikšan�s vieta"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
-#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
-msgid "minutes"
-msgstr "minūtes"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1444
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1566
 msgid "No summary available."
 msgstr "Kopsavilkums nav pieejams."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
 msgid "No description available."
 msgstr "Apraksts nav pieejams."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
 msgid "No location information available."
 msgstr "Atrašan�s vieta nav pieejama."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1506
 #, c-format
 msgid "You have %d alarms"
 msgstr "Jums ir %d trauksmes"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1666
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "Brīdin�jums"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1670
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2438,7 +3588,7 @@ msgstr ""
 "nokonfigurēts nosūtīt e-pastu. Evolution t� viet�\n"
 "attēlos norm�lu atg�din�juma dialoga logu."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1700
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2448,17 +3598,29 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Evolution kalend�ra atg�din�jums drīz nostr�d�s. Tas ir konfigurēts, lai "
-"startētu sekojošu programmu:\n"
+"Evolution kalend�ra atg�din�jums drīz nostr�d�s. Tas ir "
+"konfigurēts, lai startētu sekojošu programmu:\n"
 "\n"
 "        %s\n"
 "\n"
 "Vai tieš�m vēlaties palaist šo programmu?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1714
 msgid "Do not ask me about this program again."
 msgstr "Neprasīt vair�k man par šo programmu."
 
+#: ../calendar/gui/alarm-notify/notify-main.c:141
+msgid "Could not initialize Bonobo"
+msgstr "Nevar inicializēt Bonobo"
+
+#: ../calendar/gui/alarm-notify/notify-main.c:154
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
+msgstr ""
+"Neizdev�s izveidot trauksmes paziņošanas servisa ražotni, varbūt t� "
+"jau ir palaista..."
+
 #: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "nederīgs laiks"
@@ -2500,7 +3662,7 @@ msgid "Alarm programs"
 msgstr "Trauksmes programmas"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Laiks sekundēs, cik ilgi kļūdai j�būt redzamai statusa josl�."
 
@@ -2521,137 +3683,134 @@ msgid "Calendars to run alarms for"
 msgstr "Kalend�ri, kuriem izmantot trauksmes"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
+msgstr "Atzīmējiet šo, lai Evolution izmantotu laika joslas."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Kr�sa, k�d� zīmēt Markusa Baina līnija laika josl� (tukša pēc noklusējuma)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Kr�sa, k�d� zīmēt Markusa Baina līnija dienas skat�."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "Saspiest nedēļas nogales mēneša skat�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "Apstiprin�t dzēšanu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr "Noklusētais jauno notikumu atk�rtošan�s skaits. -1 nozīmē mūžīgi."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Dienas, kur�s darba stund�m būtu j�r�da s�kuma un beigu laiki."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Noklusētais tikšan�s atg�din�jumus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#| msgid "Default reminder units"
 msgid "Default recurrence count"
 msgstr "Noklusētais atk�rtošan�s skaits"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
 msgstr "Noklusēt�s atg�din�t�ja mērvienības"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "Noklusēt� atg�din�t�ja vērtība"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "Mape, trauksmes skaņu failu glab�šanai"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "Notikuma kr�su p�reja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "Notikuma caurspīdība"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "Brīvs/aizņemts servera adrese"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "Brīvs/aizņemts veidnes adrese"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "Notikumu kr�su p�reja kalend�ra skatos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
 msgstr "Slēpt izpildītos uzdevumus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
 msgstr "Slēpt uzdevumu priekšmetus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
 msgstr "Slēpt uzdevumu vērtību"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
-msgstr "Horizont�lais rūts novietojums"
+msgstr "Horizont�lais paneļa novietojums"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 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.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 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.h:29
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "Ja \"patiess\", r�dīt memo galven� loga priekšskatījuma rūtī."
-
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
-msgid "If \"true\", show the task preview pane in the main window."
-msgstr "Ja \"patiess\", r�dīt uzdevumu galven� loga priekšskatījuma rūtī."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Interv�li, kas tiek r�dīti dienu un darba nedēļu skatos, minūtēs."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Last alarm time"
 msgstr "Pēdējais trauksmes laiks"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Level beyond which the message should be logged."
 msgstr "Līmenis, pēc kura ziņojums ir j�reģistrē."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "List of recently used second time zones in a Day View."
 msgstr "Saraksts ar nesen izmantotaj�m otraj�m laika zon�m dienas skat�."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of server URLs for free/busy publishing."
 msgstr "Serveru adrešu saraksts brīvs/aizņemts publicēšanai."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line"
 msgstr "Markusa Baina līnija"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Markusa Baina līnijas kr�sa - dienas skats"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Markusa Baina līnijas kr�sa - laika josla"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -2659,210 +3818,186 @@ msgstr ""
 "Maksim�lais nesen izmantoto laika joslu skaits, ko saglab�t "
 "'day_second_zones' sarakst�."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Maksim�lais nesen izmantoto laika joslu skaits, ko saglab�t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-#| msgid "_Reply style:"
-msgid "Memo layout style"
-msgstr "Memo izk�rtojuma stils:"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
-msgid "Memo preview pane position (horizontal)"
-msgstr "Memo priekšskatījuma rūts novietojums (horizont�li)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
-#| msgid "Month view vertical pane position"
-msgid "Memo preview pane position (vertical)"
-msgstr "Memo priekšskatījuma rūts novietojums (vertik�li)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 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.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 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.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Month view horizontal pane position"
-msgstr "Mēneša skata horizont�l�s rūts atrašan�s vieta"
+msgstr "Mēneša skata horizont�l� paneļa atrašan�s vieta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view vertical pane position"
-msgstr "Mēneša skata vertik�l�s rūts atrašan�s vieta"
+msgstr "Mēneša skata vertik�l� paneļa atrašan�s vieta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 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.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining when to hide tasks."
 msgstr "Mērvienību skaits, lai zin�tu, kad slēpt uzdevumus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Overdue tasks color"
 msgstr "Nokavēto uzdevumu kr�sa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
-"Horizont�l�s rūts atrašan�s vieta starp datu navig�cijas kalend�ru un "
+"Horizont�l� paneļa atrašan�s vieta starp datu navig�cijas kalend�ru un "
 "uzdevumu sarakstu, kamēr neatrodas mēneša skat�, pikseļos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"Horizont�l�s rūts atrašan�s vieta starp skatu un datu navig�cijas kalend�ru "
-"un uzdevumu sarakstu mēneša skatījum�, pikseļos."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr "Memo priekšskatījuma rūts novietojums, kad ir orientēts vertik�li."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr ""
-"Uzdevuma priekšskatījuma rūts novietojums, kad ir orientēts horizont�li."
+"Horizont�l� paneļa atrašan�s vieta starp skatu un datu navig�cijas "
+"kalend�ru un uzdevumu sarakstu mēneša skatījum�, pikseļos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
-msgid "Position of the task preview pane when oriented vertically."
-msgstr "Uzdevuma priekšskatījuma rūts novietojums, kad ir orientēts vertik�li."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr ""
-"Vertik�l�s rūts novietojums starp kalend�ra sarakstu datumu navigatora "
+"Vertik�l� paneļa atrašan�s, starp kalend�ra sarakstu datumu navigatora "
 "kalend�ru."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+msgid ""
+"Position of the vertical pane, between the task list and the task preview "
+"pane, in pixels."
+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.h:51
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"Vertik�l�s rūts novietojums starp skatījumu un datu navig�cijas "
+"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.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 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 ""
-"Vertik�l�s rūts novietojums starp datu navig�cijas kalend�ra un "
+"Vertik�l� paneļa atrašan�s vieta starp datu navig�cijas kalend�ra un "
 "uzdevumu sarakstu, kamēr neatrodas mēneša skat�, pikseļos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#| msgid "Print this calendar"
 msgid "Primary calendar"
 msgstr "Galvenais kalend�rs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#| msgid "New memo list"
 msgid "Primary memo list"
 msgstr "Galvenais memo saraksts"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#| msgid "New task list"
 msgid "Primary task list"
 msgstr "Galvenais uzdevumu saraksts"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programmas, kuras trauksmes drīkst palaist."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Recently used second time zones in a Day View"
 msgstr "Nesen izmantot�s laika zonas dienas skat�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Save directory for alarm audio"
 msgstr "Trauksmes skaņu glab�šanas mape"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Scroll Month View by a week"
 msgstr "Ritin�t mēneša skatu pa nedēļ�m"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "R�dīt RSVP lauku notikuma/uzdevuma/tikšan�s redaktor�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "R�dīt Lomas lauku notikuma/uzdevuma/tikšan�s redaktor�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 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.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "R�dīt kategorijas lauku notikuma/uzdevuma/tikšan�s redaktor�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show display alarms in notification tray"
 msgstr "R�dīt ekr�na trauksmes paziņojumu josl�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Show status field in the event/task/meeting editor"
 msgstr "R�dīt statusa lauku notikuma/uzdevuma/tikšan�s redaktor�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
-#| msgid "Show the \"Preview\" pane"
-msgid "Show the memo preview pane"
-msgstr "R�dīt memo priekšskatījuma rūti"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "Show the \"Preview\" pane"
+msgstr "R�dīt \"Priekšskatījums\" paneli"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-#| msgid "Show the \"Preview\" pane"
-msgid "Show the task preview pane"
-msgstr "R�dīt uzdevumu priekšskatījuma rūti"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid "Show the \"Preview\" pane."
+msgstr "R�dīt \"Priekšskatījums\" paneli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 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.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show type field in the event/task/meeting editor"
 msgstr "R�dīt tipa lauku notikuma/uzdevuma/tikšan�s redaktor�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#| msgid "Show week numbers in date navigator"
 msgid "Show week number in Day and Work Week View"
 msgstr "R�dīt nedēļu numurus dienas un darba nedēļas skat�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show week numbers in date navigator"
 msgstr "R�dīt nedēļu numurus datuma navigator�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr ""
 "Dienas skat� r�da otru laika joslu, ja iestatīts. Vērtība ir līdzīga tai, "
-"kuru izmanto 'laika josla' atslēgai."
+"kuru "
+"izmanto 'laika josla' atslēgai."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid "Task layout style"
-msgstr "Uzdevumu izk�rtojuma stils"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
-#| msgid "Tasks vertical pane position"
-msgid "Task preview pane position (horizontal)"
-msgstr "Uzdevumu priekšskatījumu rūts novietojums (horizont�li)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
-#| msgid "Tasks vertical pane position"
-msgid "Task preview pane position (vertical)"
-msgstr "Uzdevumu priekšskatījumu rūts novietojums (vertik�li)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Tasks due today color"
 msgstr "Šodien izpild�mo darbu kr�sa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+msgid "Tasks vertical pane position"
+msgstr "Uzdevumu vertik�l� paneļa novietojums"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2871,42 +4006,20 @@ msgstr ""
 "URL veidne, ko lietot k� brīvo/aizņemto datu atk�pšanos, %u ir aizvietos ar "
 "lietot�ja daļu no pasta adreses un %d ir aizvietos ar domēnu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 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 ""
 "Noklusēt� laika josla, ko lietot datumiem un laikam kalend�r�, k� "
-"nep�rtulkotu Olsena laika zonas datub�zes atrašan�s vietu piemēram \"America/"
-"New York\"."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-"Izvietojuma stils nosaka, kur novietot priekšskatījuma rūti attiecīb� pret "
-"memo sarakstu. \"0\" (Klasiskais skats) novieto priekšskatījuma rūti zem "
-"memo saraksta. \"1\" (Vertik�lais skats) novieto priekšskatījuma rūti pie "
-"memo saraksta."
+"nep�rtulkotu "
+"Olsena laika zonas datub�zes atrašan�s vietu piemēram \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
-"Izvietojuma stils nosaka, kur novietot priekšskatījuma rūti attiecīb� pret "
-"uzdevumu sarakstu. \"0\" (Klasiskais skats) novieto priekšskatījuma rūti zem "
-"uzdevumu saraksta. \"1\" (Vertik�lais skats) novieto priekšskatījuma rūti "
-"pie uzdevumu saraksta."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "The second timezone for a Day View"
 msgstr "Otra laika josla dienas skatam"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -2914,19 +4027,19 @@ msgstr ""
 "Tam var būt trīs iespējam�s vērtības. 0 - kļūd�m. 1 - brīdin�jumiem. 2 - "
 "atkļūdošanas ziņojumiem."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Time divisions"
 msgstr "Laika vienības"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Time the last alarm ran, in time_t."
 msgstr "Laiks, kad pēdējo reizi tika palaista trauksme, time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Timezone"
 msgstr "Laika josla"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -2934,68 +4047,64 @@ msgstr ""
 "Notikumu caurspīdība kalend�ra skatos, vērtība no 0 (caurspīdīgs) līdz 1 "
 "(aptumšots)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
 msgstr "24 stundu laika form�ts"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "Izcelt� (\"galvenais\") kalend�ra URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "Izcelt� (\"galvenais\") memo saraksta URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "Izcelt� (\"galvenais\") uzdevumu saraksta URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Noklusēt� atg�din�t�ja vienības, \"minūtes\", \"stundas\" vai \"dienas\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 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.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Use system timezone"
 msgstr "Izmantot sistēmas laika joslu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr "Izmantot sistēmas laika joslu, nevis Evolution iestatīto laika joslu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
-msgid "Vertical pane position"
-msgstr "Vertik�l�s rūts pozīcija"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Week start"
 msgstr "Nedēļas s�kums"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 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)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 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.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Vai prasīt apstiprin�jumu, kad dzēš tikšanos vai uzdevumu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Vai prasīt apstiprin�jumu, kad izsvītro tikšanos vai uzdevumu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -3003,106 +4112,299 @@ msgstr ""
 "Vai saspiest nedēļ�s nogales mēneša skat�, kas novietos sestdienu un "
 "svētdienu vienas nedēļas dienas izmēr�."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Vai r�dīt tikšanos beigu laikus nedēļas un mēneša skatos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Vai zīmēt Markusa Baina līniju (pašreizēj� laika līnija) kalend�r�."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Vai slēpt izpildītos uzdevumus uzdevumu skat�."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "Vai ritin�t mēneša skatu pa nedēļ�m, bet ne mēnešiem."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Whether to set a default reminder for appointments."
 msgstr "Vai iestatīt noklusēto tikšan�s atg�din�jumu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Vai r�dīt RSVP lauku notikumu/uzdevumu/tikšanos redaktor�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Vai r�dīt kategoriju lauku notikumu/tikšanos redaktor�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Vai r�dīt lomu lauku notikumu/uzdevumu/tikšanos redaktor�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Vai r�dīt statusa lauku notikumu/uzdevumu/tikšanos redaktor�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Vai r�dīt laiku 24 stundu form�t�, nevis am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Vai r�dīt laika joslas lauku notikumu/tikšanos redaktor�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Vai r�dīt tipa lauku notikumu/uzdevumu/tikšanos redaktor�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#| msgid "Whether to show week numbers in the date navigator."
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "Vai r�dīt nedēļas numurus dienas un darba nedēļas skat�."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Vai r�dīt nedēļas numurus datuma navigator�."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Work days"
 msgstr "Darba dienas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Workday end hour"
 msgstr "Darba dienas beigu stunda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Workday end minute"
 msgstr "Darba dienas beigu minūte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Workday start hour"
 msgstr "Darba dienas s�kuma stunda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Workday start minute"
 msgstr "Darba dienas s�kuma minūte"
 
 #: ../calendar/gui/cal-editor-utils.c:105
+#| msgid "Invalid contact."
 msgid "Invalid object"
 msgstr "Nederīgs objekts"
 
-#: ../calendar/gui/calendar-view-factory.c:117
+#: ../calendar/gui/cal-search-bar.c:74
+msgid "Summary contains"
+msgstr "Kopsavilkums satur"
+
+#: ../calendar/gui/cal-search-bar.c:75
+msgid "Description contains"
+msgstr "Apraksts satur"
+
+#: ../calendar/gui/cal-search-bar.c:76
+msgid "Category is"
+msgstr "Kategorija ir"
+
+#: ../calendar/gui/cal-search-bar.c:77
+msgid "Comment contains"
+msgstr "Koment�ri satur"
+
+#: ../calendar/gui/cal-search-bar.c:78
+msgid "Location contains"
+msgstr "Atrašan�s vieta satur"
+
+#: ../calendar/gui/cal-search-bar.c:636
+msgid "Next 7 Days' Tasks"
+msgstr "N�kamo 7 dienu uzdevumi"
+
+#: ../calendar/gui/cal-search-bar.c:640
+msgid "Active Tasks"
+msgstr "Aktīvie uzdevumi"
+
+#: ../calendar/gui/cal-search-bar.c:644
+msgid "Overdue Tasks"
+msgstr "Nokavētie uzdevumi"
+
+#: ../calendar/gui/cal-search-bar.c:648
+msgid "Completed Tasks"
+msgstr "Izpildītie uzdevumi"
+
+#: ../calendar/gui/cal-search-bar.c:652
+msgid "Tasks with Attachments"
+msgstr "Uzdevumi ar pielikumiem"
+
+#: ../calendar/gui/cal-search-bar.c:698
+msgid "Active Appointments"
+msgstr "Aktīv�s tikšan�s"
+
+#: ../calendar/gui/cal-search-bar.c:702
+msgid "Next 7 Days' Appointments"
+msgstr "N�kamo 7 dienu tikšan�s"
+
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Druk�t"
+
+#: ../calendar/gui/calendar-commands.c:331
+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 ""
+"Šī darbība pilnīb� izdzēsīs visus notikumus, kuri ir vec�ki par par nor�dīto "
+"laiku. Ja turpin�siet, jūs vairs nevarēsiet atjaunot šos notikumus."
+
+#: ../calendar/gui/calendar-commands.c:337
+msgid "Purge events older than"
+msgstr "Dzēš notikumus vec�kus par"
+
+#: ../calendar/gui/calendar-commands.c:342
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:742
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../widgets/misc/e-send-options.glade.h:39
+msgid "days"
+msgstr "dienas"
+
+#. Create the Webcal source group
+#: ../calendar/gui/calendar-component.c:199
+#: ../calendar/gui/memos-component.c:158 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:154
+msgid "On The Web"
+msgstr "Tīmeklī"
+
+#: ../calendar/gui/calendar-component.c:200
+#: ../plugins/calendar-weather/calendar-weather.c:126
+msgid "Weather"
+msgstr "Laikapst�kļi"
+
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:294
+#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "Dzimšanas dienas & gadadienas"
+
+#: ../calendar/gui/calendar-component.c:631
+msgid "_New Calendar"
+msgstr "Jau_ns kalend�rs"
+
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:476
+#: ../mail/em-folder-tree.c:2119
+msgid "_Copy..."
+msgstr "_Kopēt..."
+
+#: ../calendar/gui/calendar-component.c:637
+#: ../calendar/gui/memos-component.c:489 ../calendar/gui/tasks-component.c:481
+msgid "_Make available for offline use"
+msgstr "_Padarīt pieejamu lietošanai nesaistē"
+
+#: ../calendar/gui/calendar-component.c:638
+#: ../calendar/gui/memos-component.c:490 ../calendar/gui/tasks-component.c:482
+msgid "_Do not make available for offline use"
+msgstr "_Nepadarīt pieejamu lietošanai nesaistē"
+
+#: ../calendar/gui/calendar-component.c:966
+msgid "Failed upgrading calendars."
+msgstr "Neizdev�s uzlabot kalend�ru."
+
+#: ../calendar/gui/calendar-component.c:1094
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr "Nevar atvērt kalend�ru '%s', lai ievietotu notikumus un tikšan�s"
+
+#: ../calendar/gui/calendar-component.c:1110
+msgid "There is no calendar available for creating events and meetings"
+msgstr "Nav pieejams kalend�rs notikumu un tikšanos izveidošanai"
+
+#: ../calendar/gui/calendar-component.c:1223
+msgid "Calendar Source Selector"
+msgstr "Kalend�ra avota selektors"
+
+#: ../calendar/gui/calendar-component.c:1438
+msgid "New appointment"
+msgstr "Jauna tikšan�s"
+
+#: ../calendar/gui/calendar-component.c:1439
+#| msgid "_Appointment"
+msgctxt "New"
+msgid "_Appointment"
+msgstr "Tikš_an�s"
+
+#: ../calendar/gui/calendar-component.c:1440
+msgid "Create a new appointment"
+msgstr "Izveidot jaunu tikšanos"
+
+#: ../calendar/gui/calendar-component.c:1446
+msgid "New meeting"
+msgstr "Jauna san�ksme"
+
+#: ../calendar/gui/calendar-component.c:1447
+#| msgid "M_eeting"
+msgctxt "New"
+msgid "M_eeting"
+msgstr "San�ksm_e"
+
+#: ../calendar/gui/calendar-component.c:1448
+msgid "Create a new meeting request"
+msgstr "Izveidot jaunu san�ksmes pieprasījumu"
+
+#: ../calendar/gui/calendar-component.c:1454
+msgid "New all day appointment"
+msgstr "Jauna tikšan�s visai dienai"
+
+#: ../calendar/gui/calendar-component.c:1455
+#| msgid "All Day A_ppointment"
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "Visas dienas _tikšan�s"
+
+#: ../calendar/gui/calendar-component.c:1456
+msgid "Create a new all-day appointment"
+msgstr "Izveidot jaunu tikšanos visai dienai"
+
+#: ../calendar/gui/calendar-component.c:1462
+msgid "New calendar"
+msgstr "Jauns kalend�rs"
+
+#: ../calendar/gui/calendar-component.c:1463
+#| msgid "Cale_ndar"
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "Kale_nd�rs"
+
+#: ../calendar/gui/calendar-component.c:1464
+msgid "Create a new calendar"
+msgstr "Izveidot jaunu kalend�ru"
+
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Dienas skats"
 
-#: ../calendar/gui/calendar-view-factory.c:120
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Darba nedēļas skats"
 
-#: ../calendar/gui/calendar-view-factory.c:123
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Nedēļas skats"
 
-#: ../calendar/gui/calendar-view-factory.c:126
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Mēneša skats"
 
 #: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
+#| msgid "Field"
 msgid "Any Field"
 msgstr "Jebkurš lauks"
 
@@ -3119,6 +4421,7 @@ msgstr "Apmeklēt�js"
 
 #: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
+#| msgid "Category is"
 msgid "Category"
 msgstr "Kategorija"
 
@@ -3126,19 +4429,18 @@ msgstr "Kategorija"
 msgid "Classification"
 msgstr "Klasifik�cija"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:571 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:570
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:323
-#: ../widgets/misc/e-send-options.ui.h:2
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Confidential"
 msgstr "Konfidenci�ls"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/misc/e-attachment-tree-view.c:496
-#: ../widgets/table/e-table-config.ui.h:6
+#: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Apraksts"
 
@@ -3159,9 +4461,8 @@ msgstr "Eksistē"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/publish-calendar/publish-calendar.c:722
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Location"
 msgstr "Atrašan�s vieta"
 
@@ -3170,21 +4471,20 @@ msgstr "Atrašan�s vieta"
 msgid "Organizer"
 msgstr "Organizēt�js"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:569 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:569
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Priv�ts"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-cal-model.c:567
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Publisks"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
+#: ../calendar/gui/dialogs/event-editor.c:304
 msgid "Recurrence"
 msgstr "Atk�rtošan�s"
 
@@ -3193,7 +4493,7 @@ msgstr "Atk�rtošan�s"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Summary"
 msgstr "Kopsavilkums"
 
@@ -3222,460 +4522,499 @@ msgstr "ir"
 msgid "is not"
 msgstr "nav"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:626
+#: ../calendar/gui/comp-editor-factory.c:413
+msgid "Error while opening the calendar"
+msgstr "Kļūda, atverot kalend�ru"
+
+#: ../calendar/gui/comp-editor-factory.c:419
+msgid "Method not supported when opening the calendar"
+msgstr "Metode nav atbalstīta, atverot kalend�ru"
+
+#: ../calendar/gui/comp-editor-factory.c:425
+msgid "Permission denied to open the calendar"
+msgstr "Atļauja atvērt kalend�ru ir liegta"
+
+#: ../calendar/gui/comp-editor-factory.c:443 ../shell/e-shell.c:1261
+msgid "Unknown error"
+msgstr "Nezin�ma kļūda"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "Rediģēt trauksmes"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:817
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "R�dīt trauksmi"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:818
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
 #: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Spēlēt skaņu"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:819
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
 #: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Palaist programmu"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:820
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
 #: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Sūtīt epastu"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
+msgid "<b>Alarm</b>"
+msgstr "<b>Trauksme</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
+msgid "<b>Options</b>"
+msgstr "<b>Opcijas</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
+msgid "<b>Repeat</b>"
+msgstr "<b>Atk�rtot</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "Add Alarm"
 msgstr "Pievienot trauksmi"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#| msgid "Alarms"
-msgid "Alarm"
-msgstr "Trauksme"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Custom _message"
 msgstr "Piel�gots ziņoju_ms"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
 msgstr "Piel�gota trauksmes skaņa"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
 msgstr "Ziņojum_s:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
-msgid "Options"
-msgstr "Opcijas"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-#| msgid "<b>Repeat</b>"
-msgid "Repeat"
-msgstr "Atk�rtot"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
 msgid "Select A File"
 msgstr "Izvēlēties failu"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "Kam sūtīt:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "_Argumenti:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "_Programma:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "_Atk�rtot trauksmi"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "_Skaņa:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "after"
-msgstr "pēc"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
-#| msgid "is before"
-msgid "before"
-msgstr "pirms"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
-msgid "day(s)"
-msgstr "diena(-s)"
-
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
-msgid "days"
-msgstr "dienas"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "end of appointment"
-msgstr "tikšan�s beigas"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#| msgid "before"
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"pirms\n"
+"pēc"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "papildus laiki katru"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "hour(s)"
-msgstr "stunda(s)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#| msgid ""
+#| "Minutes\n"
+#| "Hours\n"
+#| "Days"
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"minūti(-es)\n"
+"stundu(-as)\n"
+"dienu(-as)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-msgid "minute(s)"
-msgstr "minūte(s)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#| msgid ""
+#| "Minutes\n"
+#| "Hours\n"
+#| "Days"
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"minūtes\n"
+"stundas\n"
+"dienas"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#| msgid "location of appointment"
-msgid "start of appointment"
-msgstr "tikšan�s s�kums"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#| msgid "start of appointment"
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"tikšan�s s�kums\n"
+"tikšan�s beigas"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Darbība/trigeris"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
 msgstr "P_ievienot"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Trauksmes"
 
-#. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
-#: ../calendar/gui/e-day-view-time-item.c:797
-#| msgid "None"
-msgctxt "cal-second-zone"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
+msgid "_Suggest automatic display of attachment"
+msgstr "Ieteikt autom�ti_sku pielikumu attēlošanu"
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
+msgid "Attach file(s)"
+msgstr "Pievienot failu(s)"
+
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/e-cal-model-tasks.c:625
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:946
+#: ../mail/em-account-editor.c:723 ../mail/em-account-editor.c:1457
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:333
+#: ../plugins/calendar-weather/calendar-weather.c:387
+#: ../plugins/email-custom-header/email-custom-header.c:391
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
+#: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "Nekas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
-#: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
-msgid "Select..."
-msgstr "Izvēlieties..."
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
 msgid "Selected Calendars for Alarms"
 msgstr "Trauksmēm izvēlētie kalend�ri"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#| msgid "Time zone:"
 msgid "Time and date:"
 msgstr "Laiks un datums:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+#| msgid "Date:"
 msgid "Date only:"
 msgstr "Tikai datums:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
-#, no-c-format
-#| msgid ""
-#| "<i>%u and %d will be replaced by user and domain from the email address.</"
-#| "i>"
-msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "%u un %d tiks aizvietoti ar lietot�ju un domēnu no e-pasta adreses."
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "(Shown in a Day View)"
 msgstr "(R�dīt dienas skat�)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
-#| msgid "minutes"
-msgid "05 minutes"
-msgstr "05 minūtes"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
+"60 minūtes\n"
+"30 minūtes\n"
+"15 minūtes\n"
+"10 minūtes\n"
+"05 minūtes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
-#| msgid "minutes"
-msgid "10 minutes"
-msgstr "10 minūtes"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, 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 aizvietoti ar lietot�ju un domēnu no e-pasta adreses.</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
-#| msgid "minutes"
-msgid "15 minutes"
-msgstr "15 minūtes"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#| msgid "<span weight=\"bold\">Alerts</span>"
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">Trauksmes</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
-#| msgid "minutes"
-msgid "30 minutes"
-msgstr "30 minūtes"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">Trauksmes</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
-#| msgid "minutes"
-msgid "60 minutes"
-msgstr "60 minūtes"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../mail/mail-config.glade.h:13
+#| msgid "<span weight=\"bold\">Time</span>"
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">Laika/datuma form�ts</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
-#| msgid "Alarms"
-msgid "Alerts"
-msgstr "Trauksmes"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<span weight=\"bold\">Noklusētais brīvs/aizņemts serveris</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
-#: ../modules/addressbook/autocompletion-config.c:153
-msgid "Date/Time Format"
-msgstr "Datuma/laika form�ts"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../mail/mail-config.glade.h:17
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">Visp�rējs</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
-msgid "Day _ends:"
-msgstr "Diena b_eidzas:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">Uzdevumu saraksts</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
-#| msgid "Day"
-msgid "Days"
-msgstr "Dienas"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">Laiks</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
-#| msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgid "Default Free/Busy Server"
-msgstr "Noklusētais brīvs/aizņemts serveris"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">Darba nedēļa</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Day _ends:"
+msgstr "Diena b_eidzas:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "Attēlot"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#| msgid "Show display alarms in notification tray"
 msgid "Display alarms in _notification area only"
 msgstr "R�dīt _trauksmes tikai paziņojumu josl�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Piektdien�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "General"
-msgstr "Visp�rējs"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
-#| msgid "hours"
-#| msgid_plural "hours"
-msgid "Hours"
-msgstr "Stundas"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
-#| msgid "minutes"
-msgid "Minutes"
-msgstr "Minūtes"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"Minūtes\n"
+"Stundas\n"
+"Dienas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Pirmdien�"
 
-#. Translators: "None" for not including threads;
-#. * part of "Include threads: None"
-#. Translators: Used in send options dialog
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
-msgid "None"
-msgstr "Nekas"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"Pirmdiena\n"
+"Otrdiena\n"
+"Trešdiena\n"
+"Ceturtdiena\n"
+"Piektdiena\n"
+"Sestdiena\n"
+"Svētdiena"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "Izvēlies kr�su"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "S_v"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Sestdien�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sc_roll Month View by a week"
 msgstr "_Ritin�t mēneša skatu pa nedēļai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#| msgid "Send To:"
 msgid "Se_cond zone:"
 msgstr "_Otr� josla:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Select the calendars for alarm notification"
 msgstr "Izvēlieties kalend�rus trauksmju paziņošanai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Sh_ow a reminder"
 msgstr "R�_dīt atg�din�jumu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#| msgid "Sh_ow a reminder"
 msgid "Show a _reminder"
 msgstr "_R�dīt atg�din�jumu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week _numbers in date navigator"
 msgstr "R�dīt nedēļas _numurus datuma navigator�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#| msgid "Show week numbers in date navigator"
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "R�dīt nedēļu numurus dienu un darba nedēļas skat�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Svētdien�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "T_asks due today:"
 msgstr "Šodien izpild�mie uz_devumi:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "_C"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-msgid "Task List"
-msgstr "Uzdevumu saraksts"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr "Veidne:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Ceturdien�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
-#: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
-msgid "Time"
-msgstr "Laiks"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "Laika _josla:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "Laika form�ts:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Otrdien�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Use s_ystem time zone"
 msgstr "_Izmantot sistēmas laika joslu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Trešdien�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Wee_k starts on:"
 msgstr "Nedēļa s�_kas ar:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
-msgid "Work Week"
-msgstr "Darba nedēļa"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "Work days:"
 msgstr "Darba dienas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "_12 stundu (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "_24 stundu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Prasīt apstiprin�jumu, kad dzēš priekšmetus"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr "_Saspiest nedēļas mēneša skat�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Day begins:"
 msgstr "_Diena s�kas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "_Pk"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
 msgstr "_Slēpt izpildītos uzdevumus pēc"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "_P"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Overdue tasks:"
 msgstr "_Nokavētie uzdevumi:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "_S"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Show appointment end times in week and month view"
 msgstr "R�dīt tikšano_s beigu laikus nedēļas un mēneša skatos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "_Time divisions:"
 msgstr "_Laika dalījumi:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "_O"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "_T"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
 msgid "before every anniversary/birthday"
 msgstr "pirms katras gadadienas/dzimšanas dienas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
 msgstr "pirms katras tikšan�s"
 
@@ -3683,19 +5022,6 @@ msgstr "pirms katras tikšan�s"
 msgid "Type:"
 msgstr "Tips:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
-msgid "_Type:"
-msgstr "_Tips:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
-#: ../plugins/groupwise-features/properties.ui.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:282
-msgid "_Name:"
-msgstr "_Nosaukums:"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Kopē_t kalend�ra saturu lok�li darbam nesaistē"
@@ -3709,9 +5035,14 @@ msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Kopēt memo saraksta saturu lok�li darbam nesaistē"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:344
+#| msgid "C_olor:"
 msgid "Colo_r:"
 msgstr "K_r�sa:"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+msgid "Task List"
+msgstr "Uzdevumu saraksts"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Memo saraksts"
@@ -3729,10 +5060,12 @@ msgid "Task List Properties"
 msgstr "Uzdevumu saraksta īpašības"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:531
+#| msgid "_New Task List"
 msgid "New Task List"
 msgstr "Jauns uzdevumu saraksts"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:587
+#| msgid "Task List Properties"
 msgid "Memo List Properties"
 msgstr "Memo saraksta īpašības"
 
@@ -3749,6 +5082,7 @@ msgid "This task has been deleted."
 msgstr "Šis uzdevums ir izdzēsts."
 
 #: ../calendar/gui/dialogs/changed-comp.c:67
+#| msgid "This event has been deleted."
 msgid "This memo has been deleted."
 msgstr "Šis memo ir izdzēsts."
 
@@ -3772,6 +5106,7 @@ msgid "This task has been changed."
 msgstr "Uzdevums tika izmainīts."
 
 #: ../calendar/gui/dialogs/changed-comp.c:91
+#| msgid "This event has been changed."
 msgid "This memo has been changed."
 msgstr "Memo tika izmainīts."
 
@@ -3791,271 +5126,263 @@ msgstr "%s  Jūs neesat veicis izmaiņas, atjaunin�t redaktoru?"
 msgid "Validation error: %s"
 msgstr "Valid�cijas kļūda: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
+#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2392
 msgid " to "
 msgstr " uz "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2396
 msgid " (Completed "
 msgstr " (Izpildīts "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2398
 msgid "Completed "
 msgstr "Izpildīts "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2403
 msgid " (Due "
 msgstr " (LÄ«dz "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2405
 msgid "Due "
 msgstr "LÄ«dz "
 
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:229
+#| msgid "Save attachments"
 msgid "Could not save attachments"
 msgstr "Nevar saglab�t pielikumus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:515
+#: ../calendar/gui/dialogs/comp-editor.c:492
 msgid "Could not update object"
 msgstr "Nevarēju atjaunin�t objektu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:587
 msgid "Edit Appointment"
 msgstr "Rediģēt tikšanos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:594
 #, c-format
 msgid "Meeting - %s"
 msgstr "San�ksme - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:596
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tikšan�s - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:629
+#: ../calendar/gui/dialogs/comp-editor.c:602
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Piešķirtais uzdevums - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:631
+#: ../calendar/gui/dialogs/comp-editor.c:604
 #, c-format
 msgid "Task - %s"
 msgstr "Uzdevums - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:636
+#: ../calendar/gui/dialogs/comp-editor.c:609
 #, c-format
+#| msgid "Memos"
 msgid "Memo - %s"
 msgstr "Memo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:625
+#| msgid "No summary"
 msgid "No Summary"
 msgstr "Nav kopsavilkuma"
 
-#: ../calendar/gui/dialogs/comp-editor.c:761
+#: ../calendar/gui/dialogs/comp-editor.c:767
 msgid "Keep original item?"
 msgstr "Paturēt s�kotnējo priekšmetu?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:948
+#: ../calendar/gui/dialogs/comp-editor.c:973
 msgid "Click here to close the current window"
 msgstr "Klikšķiniet, lai aizvērtu pašreizējo logu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
-msgid "Copy the selection"
-msgstr "Kopēt izvēli"
+#: ../calendar/gui/dialogs/comp-editor.c:980
+msgid "Copy selected text to the clipboard"
+msgstr "Kopēt izvēlēto tekstu uz starpliktuvi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:962 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
-msgid "Cut the selection"
-msgstr "Izgriezt izvēlēto"
+#: ../calendar/gui/dialogs/comp-editor.c:987
+msgid "Cut selected text to the clipboard"
+msgstr "Izgriezt izvēlēto tekstu starpliktuvē"
 
-#: ../calendar/gui/dialogs/comp-editor.c:969
-#: ../shell/e-shell-window-actions.c:1474
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
-#| msgid "Cut the selection"
-msgid "Delete the selection"
-msgstr "Dzēst izvēlēto"
-
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to view help available"
 msgstr "Klikšķiniet, lai skatītu pieejamo palīdzību"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
-msgid "Paste the clipboard"
-msgstr "Ielīmēt starpliktuvi"
+#: ../calendar/gui/dialogs/comp-editor.c:1001
+msgid "Paste text from the clipboard"
+msgstr "Ielīmēt tekstu no starpliktuves"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../calendar/gui/dialogs/comp-editor.c:1022
 msgid "Click here to save the current window"
 msgstr "Klikšķiniet, lai saglab�tu pašreizējo logu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1029
 msgid "Select all text"
 msgstr "Izvēlēties visu tekstu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Classification"
 msgstr "_Klasifik�cija"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1032 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1050
+#: ../mail/mail-signature-editor.c:209
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Fails"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1057
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Palīdzība"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:1064
+#| msgid "I_nsert"
 msgid "_Insert"
 msgstr "_Ielīmēt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1071
 msgid "_Options"
 msgstr "_Opcijas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1078 ../mail/em-folder-tree.c:2111
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Skats"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1070
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../composer/e-composer-actions.c:317
 msgid "_Attachment..."
 msgstr "_Pielikums..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 msgid "Click here to attach a file"
 msgstr "Klikšķiniet šeit, lai pievienotu failu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "_Categories"
 msgstr "_Kategorijas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1100
 msgid "Toggles whether to display categories"
 msgstr "P�rslēdz, vai r�dīt kategorijas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1106
 msgid "Time _Zone"
 msgstr "Laika _josla"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1108
 msgid "Toggles whether the time zone is displayed"
 msgstr "P�rslēdz, vai r�dīt laika joslu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Pu_blic"
 msgstr "Pu_blisks"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "Classify as public"
 msgstr "Klasificēt k� publisku"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1124
 msgid "_Private"
 msgstr "_Priv�ts"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../calendar/gui/dialogs/comp-editor.c:1126
+#| msgid "Classify as Private"
 msgid "Classify as private"
 msgstr "Klasificēt k� priv�tu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "_Confidential"
 msgstr "_Konfidenci�ls"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1133
+#| msgid "Classify as Confidential"
 msgid "Classify as confidential"
 msgstr "Klasificēt k� konfidenci�lu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "R_ole Field"
 msgstr "L_omas lauks"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Toggles whether the Role field is displayed"
 msgstr "P�rslēdz, vai r�dīt lomas lauku"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1149
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1133
+#: ../calendar/gui/dialogs/comp-editor.c:1151
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "P�rslēdz, vai r�dīt RSVP lauku"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1157
 msgid "_Status Field"
 msgstr "_Statusa lauks"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1159
 msgid "Toggles whether the Status field is displayed"
 msgstr "P�rslēdz, vai r�dīt statusa lauku"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1165
 msgid "_Type Field"
 msgstr "_Tipa lauks"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1149
+#: ../calendar/gui/dialogs/comp-editor.c:1167
+#| msgid "Toggles whether the Attendee Type field is displayed"
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "P�rslēdz, vai r�dīt dalībnieka tipa lauku"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1173
-#: ../composer/e-composer-private.c:70
+#: ../calendar/gui/dialogs/comp-editor.c:1191
+#: ../composer/e-composer-private.c:69
+#| msgid "percent Done"
 msgid "Recent _Documents"
 msgstr "Nesenie _dokumenti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1693
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1631
+#: ../composer/e-composer-actions.c:520
 msgid "Attach"
 msgstr "Pievienot"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1748
+#: ../calendar/gui/dialogs/comp-editor.c:1686
 msgid "Save"
 msgstr "Saglab�t"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2025
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2965
+#: ../calendar/gui/dialogs/comp-editor.c:1940
+#: ../calendar/gui/dialogs/comp-editor.c:1989
+#: ../calendar/gui/dialogs/comp-editor.c:2856
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Šaj� dokument� veikt�s izmaiņas varētu tikt atmestas, ja ierodas "
 "atjaunin�jums"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2933
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2824 ../mail/em-utils.c:373
+#: ../plugins/prefer-plain/prefer-plain.c:91
 msgid "attachment"
 msgstr "pielikums"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2995
+#: ../calendar/gui/dialogs/comp-editor.c:2885
 msgid "Unable to use current version!"
 msgstr "Nevar lietot pašreizējo versiju!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "Nevar atvērt avotu"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "Nevar atvērt galamērķi"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "Galamērķis ir tikai las�ms"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Dzest šo inform�ciju no citu saņēmēju pasta kastēm?"
 
@@ -4068,6 +5395,7 @@ msgid "The task could not be deleted due to a corba error"
 msgstr "Cobra kļūdas dēļ uzdevumu nevar izdzēst"
 
 #: ../calendar/gui/dialogs/delete-error.c:61
+#| msgid "The item could not be deleted due to a corba error"
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Cobra kļūdas dēļ memo nevar izdzēst"
 
@@ -4084,6 +5412,7 @@ msgid "The task could not be deleted because permission was denied"
 msgstr "Uzdevumu nevar izdzēst, jo nav atļaujas"
 
 #: ../calendar/gui/dialogs/delete-error.c:77
+#| msgid "The item could not be deleted because permission was denied"
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Memo nevar izdzēst, jo nav atļaujas"
 
@@ -4100,6 +5429,7 @@ msgid "The task could not be deleted due to an error"
 msgstr "Kļūdas dēļ uzdevumu nevar izdzēst"
 
 #: ../calendar/gui/dialogs/delete-error.c:93
+#| msgid "The item could not be deleted due to an error"
 msgid "The memo could not be deleted due to an error"
 msgstr "Kļūdas dēļ memo nevar izdzēst"
 
@@ -4107,145 +5437,160 @@ msgstr "Kļūdas dēļ memo nevar izdzēst"
 msgid "The item could not be deleted due to an error"
 msgstr "Kļūdas dēļ priekšmetu nevar izdzēst"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "Kontakti..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "Deleģēt:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
 msgstr "Ievadīt deleg�tu"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "_Trauksmes"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr "Klikšķiniet, lai iestatītu vai anulētu trauksmi šim notikumam"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "_Atk�rtošan�s"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "P�rveidot par atk�rtojošos notikumu"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../plugins/groupwise-features/send-options.c:212
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "Sūtīšanas parametri"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Ievietot paplašin�tas nosūtīšanas iespējas"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "Visas _dienas notikums"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "P�rslēdz, vai ir visas dienas notikums"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:234
+#| msgid "Show time as _busy"
 msgid "Show Time as _Busy"
 msgstr "R�dīt laiku k� '_aizņemts'"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "P�rslēdz, vai r�dīt laiku k� 'aizņemts'"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "_brīvs/aizņemts"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "Vaic�t brīvs/aizņemts inform�ciju dalībniekiem"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "Tikš_an�s"
 
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-page.c:748
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Nevar rediģēt notikumu, jo izvēlētais kalend�rs ir tikai las�ms"
 
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:752
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Notikumu nevar pilnīb� rediģēt, jo neesat t� organizēt�js"
 
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:2769
 msgid "This event has alarms"
 msgstr "Å im notikumam ir trauksmes"
 
-#: ../calendar/gui/dialogs/event-page.c:830
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizēt�js:"
 
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:874
 msgid "_Delegatees"
 msgstr "_Deleg�ti"
 
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "Atte_ndees"
 msgstr "Dalīb_nieki"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1062
 msgid "Event with no start date"
 msgstr "Notikums bez s�kuma datuma"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1065
 msgid "Event with no end date"
 msgstr "Notikums bez beigu datuma"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:830
 msgid "Start date is wrong"
 msgstr "S�kuma datums ir nepareizs"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1246
 msgid "End date is wrong"
 msgstr "Beigu datums ir nepareizs"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "Start time is wrong"
 msgstr "S�kuma laiks ir nepareizs"
 
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "End time is wrong"
 msgstr "Beigu laiks ir nepareizs"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:890
 msgid "The organizer selected no longer has an account."
 msgstr "Izvēlētajam organizatoram vairs nav konta."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "An organizer is required."
 msgstr "Nepieciešams organizators."
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1469
+#: ../calendar/gui/dialogs/task-page.c:920
 msgid "At least one attendee is required."
 msgstr "Ir nepieciešams vismaz viens apmeklēt�js."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:1912
+#: ../calendar/gui/dialogs/task-page.c:1219
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "_Noņemt"
+
+#: ../calendar/gui/dialogs/event-page.c:1913
+#: ../calendar/gui/dialogs/task-page.c:1220
+msgid "_Add "
+msgstr "_Pievienot "
+
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nevar atvērt kalend�ru '%s'."
@@ -4256,14 +5601,15 @@ msgstr "Nevar atvērt kalend�ru '%s'."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1825
 #, c-format
+#| msgid "Received on behalf of <b>%s</b>"
 msgid "You are acting on behalf of %s"
 msgstr "Jūs darbojaties %s v�rd�"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2967
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -4271,7 +5617,7 @@ msgstr[0] "%d diena pirms tikšan�s"
 msgstr[1] "%d dienas pirms tikšan�s"
 msgstr[2] "%d dienu pirms tikšan�s"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2973
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -4279,7 +5625,7 @@ msgstr[0] "%d stunda pirms tikšan�s"
 msgstr[1] "%d stundas pirms tikšan�s"
 msgstr[2] "%d stundu pirms tikšan�s"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2979
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -4287,121 +5633,123 @@ msgstr[0] "%d minūti pirms tikšan�s"
 msgstr[1] "%d minūtes pirms tikšan�s"
 msgstr[2] "%d minūšu pirms tikšan�s"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2992
 msgid "Customize"
 msgstr "Piel�got"
 
-#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
-#| msgid "None"
-msgctxt "cal-alarms"
-msgid "None"
-msgstr "Nekas"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-msgid "1 day before appointment"
-msgstr "1 dienu pirms tikšan�s"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-msgid "1 hour before appointment"
-msgstr "1 stundu pirms tikšan�s"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-msgid "15 minutes before appointment"
-msgstr "15 minūtes pirms tikšan�s"
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
+"15 minūtes pirms tikšan�s\n"
+"1 stundu pirms tikšan�s\n"
+"1 dienu pirms tikšan�s"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "_Dalībnieki..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "Dalībnieki"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Piel�gota trauksme:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Notikuma apraksts"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Kopsavilku_ms:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "_Trauksme"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Apraksts:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "_Atrašan�s vieta:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 msgid "_Time:"
 msgstr "_Laiks:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-msgid "for"
-msgstr "priekš"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"a\n"
+"b"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
-#| msgid ""
-#| "for\n"
-#| "until"
-msgid "until"
-msgstr "līdz"
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+#| msgid "until"
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"uz\n"
+"līdz"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2512
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-page.c:347
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Nevar rediģēt memo, jo izvēlētais memo saraksts ir tikai las�ms"
 
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:351
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Memo nevar pilnīb� rediģēt, jo neesat organizēt�js"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:871
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Nevar atvērt '%s' memo."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2246
-#: ../mail/em-format-html.c:2305 ../mail/em-format-html.c:2329
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
+#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1572
+#: ../mail/em-format-html.c:1630 ../mail/em-format-html.c:1655
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:932
+#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Kam"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.ui.h:5
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Sta_rt date:"
 msgstr "S�k_uma datums:"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:5
+#: ../calendar/gui/dialogs/memo-page.glade.h:5
 msgid "T_o:"
 msgstr "Ka_m:"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:380
-#: ../calendar/gui/dialogs/task-page.ui.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupa:"
 
@@ -4422,6 +5770,7 @@ msgstr "Jūs main�t atk�rtojošos uzdevumu. Ko jūs vēlēties modificēt?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
+#| msgid "You are modifying a recurring event. What would you like to modify?"
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Jūs main�t atk�rtojošos memo. Ko jūs vēlētos modificēt?"
 
@@ -4441,21 +5790,21 @@ msgstr "Šīs un n�kam�s instances"
 msgid "All Instances"
 msgstr "Visas instances"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Šī tikšan�s satur atk�rtošan�s, ko Evolution nevar rediģēt."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Atk�rtošanas datums ir nederīgs"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "Atk�rtošan�s beigu datums ir pirms s�kuma datuma"
 
 #. 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:963
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr " "
 
@@ -4463,7 +5812,7 @@ msgstr " "
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1020
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "pirmaj�"
 
@@ -4472,7 +5821,7 @@ msgstr "pirmaj�"
 #. * (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:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "otraj�"
 
@@ -4480,7 +5829,7 @@ msgstr "otraj�"
 #. * (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:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "trešaj�"
 
@@ -4488,7 +5837,7 @@ msgstr "trešaj�"
 #. * (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:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "ceturtaj�"
 
@@ -4496,7 +5845,8 @@ msgstr "ceturtaj�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#| msgid "Width"
 msgid "fifth"
 msgstr "piektaj�"
 
@@ -4504,13 +5854,13 @@ msgstr "piektaj�"
 #. * (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:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "pēdēj�"
 
 #. 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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Cits datums"
 
@@ -4518,7 +5868,7 @@ msgstr "Cits datums"
 #. * 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:1076
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "No pirm� līdz desmitajam"
 
@@ -4526,7 +5876,7 @@ msgstr "No pirm� līdz desmitajam"
 #. * 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:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "No 11-t� līdz 20-tajam"
 
@@ -4534,81 +5884,96 @@ msgstr "No 11-t� līdz 20-tajam"
 #. * 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:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "No 21-m� līdz 31-majam"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "diena"
 
 #. 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:1242
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr " "
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "reizes"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2122
+#: ../calendar/gui/dialogs/recurrence-page.c:2105
 msgid "Add exception"
 msgstr "Pievienot izņēmumu"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2163
+#: ../calendar/gui/dialogs/recurrence-page.c:2146
 msgid "Could not get a selection to modify."
 msgstr "Nevarēja iegūt main�mo izvēli."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Modify exception"
 msgstr "Mainīt izņēmumu"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2213
+#: ../calendar/gui/dialogs/recurrence-page.c:2196
 msgid "Could not get a selection to delete."
 msgstr "Nevarēja iegūt dzēšamo izvēli."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2352
+#: ../calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "Datums/laiks"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
-msgid "Every"
-msgstr "katru"
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "<b>Exceptions</b>"
+msgstr "<b>Izņēmumi</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-#| msgid "<b>Exceptions</b>"
-msgid "Exceptions"
-msgstr "Izņēmumi"
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
+#: ../mail/mail-config.glade.h:2
+msgid "<b>Preview</b>"
+msgstr "<b>Priekšskatījums</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
-#| msgid "_Preview"
-msgid "Preview"
-msgstr "Priekšskatījums"
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
+msgid "<b>Recurrence</b>"
+msgstr "<b>Atk�rtošan�s</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.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:5
+msgid "Every"
+msgstr "katru"
+
+#. 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:7
 msgid "This appointment rec_urs"
 msgstr "Šī tikšan�s _atk�rtojas"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
-msgid "forever"
-msgstr "visu laiku"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-msgid "month(s)"
-msgstr "mēnesis(ši)"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-msgid "week(s)"
-msgstr "nedēļa(s)"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
+"dienu(-as)\n"
+"nedēļu(-as)\n"
+"mēnesi(-šus)\n"
+"gadu(-us)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
-msgid "year(s)"
-msgstr "gads(i)"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
+" \n"
+"līdz\n"
+"mūžīgi"
 
 #: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
@@ -4618,132 +5983,87 @@ msgstr "Sūtīt manas trauksmes ar šo elementu"
 msgid "Notify new attendees _only"
 msgstr "Paziņot _tikai jaunajiem dalībniekiem"
 
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "Izpildīšanas datums ir nepareizs"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "Tīmekļa lappuse"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Completed"
-msgstr "Izpildīts"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1132 ../widgets/misc/e-send-options.ui.h:8
-msgid "High"
-msgstr "Augsta"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "<span weight=\"bold\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\">Daž�di</span>"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
-msgid "In Progress"
-msgstr "Tiek izpildīts"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Statuss</span>"
 
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1130 ../widgets/misc/e-send-options.ui.h:9
-msgid "Low"
-msgstr "Zema"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1315 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1131
-#: ../widgets/misc/e-send-options.ui.h:13
-msgid "Normal"
-msgstr "Norm�la"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
+"Augsts\n"
+"Norm�ls\n"
+"Zems\n"
+"Nedefinēts"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "Nav s�kts"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:7
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
+"Nav s�kts\n"
+"Tiek izpildīts\n"
+"Izpildīts\n"
+"Atcelts"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "Izpildīts proc_entos:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:17
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "Stat_uss:"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/dialogs/task-details-page.ui.h:18
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
-#: ../calendar/gui/e-meeting-list-view.c:603
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Statuss"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:24
-msgid "Undefined"
-msgstr "Nedefinēts"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:21
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "Pabeigšanas _datums:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "_Priorit�te:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:23
+#: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Tīmekļa lappuse:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "_St�vokļa detaļas"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:115
+#| msgid "Click change / view the status details of the task"
 msgid "Click to change or view the status details of the task"
 msgstr "Klikšķiniet, lai mainītu/aplūkotu uzdevuma st�vokļa inform�ciju"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
-#: ../plugins/groupwise-features/mail-send-options.c:200
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:373
 msgid "_Send Options"
 msgstr "_Sūtīšanas iespējas"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Uzdevums"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Uzdevuma detaļas"
 
@@ -4753,36 +6073,40 @@ msgstr ""
 "Uzdevumu nevar rediģēt, jo izvēlētais uzdevumu saraksts ir tikai las�ms"
 
 #: ../calendar/gui/dialogs/task-page.c:340
+#| msgid ""
+#| "This message cannot be sent because you have not specified any recipients"
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Uzdevumu nevar pilnīb� rediģēt, jo neesat t� organizēt�js"
 
 #: ../calendar/gui/dialogs/task-page.c:388
-#: ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+#| msgid "Organizer:"
 msgid "Organi_zer:"
 msgstr "Organi_zēt�js:"
 
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:803
 msgid "Due date is wrong"
 msgstr "Izpildes datums ir nepareizs"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1782
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nevar atvērt '%s' uzdevumu."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
 msgstr "Dalīb_nieki..."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "Kategor_ijas..."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+#| msgid "_Due date:"
 msgid "D_ue date:"
 msgstr "Izpil_des datums:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Laika zona:"
 
@@ -4864,54 +6188,136 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s nezin�ma trigera tipam"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+#| msgid "Import"
+msgid "I_mport"
+msgstr "I_mpotrēt"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+#| msgid "Select Calendar"
+msgid "Select a Calendar"
+msgstr "Izvēlies kalend�ru"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+#| msgid "Select Task List"
+msgid "Select a Task List"
+msgstr "Izvēlieties uzdevumu sarakstu"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+#| msgid "Import to Calendar"
+msgid "I_mport to Calendar"
+msgstr "I_mportēt kalend�r�"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+#| msgid "_Import to Tasks"
+msgid "I_mport to Tasks"
+msgstr "I_mportēt uzdevumu sarakst�"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3220
+#, c-format
+msgid "Click to open %s"
+msgstr "Klikšķin�t, lai atvērtu %s"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:863
 msgid "Untitled"
 msgstr "Nenosaukts"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
-#| msgid "Categories"
-msgid "Categories:"
-msgstr "Kategorijas:"
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
+msgid "Start Date:"
+msgstr "S�kuma datums:"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
+msgid "Description:"
+msgstr "Apraksts:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:309
+msgid "Web Page:"
+msgstr "Tīmekļa lappuse:"
+
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Kopsavilkums:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
-msgid "Start Date:"
-msgstr "S�kuma datums:"
-
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "Izpildes datums:"
 
+#. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "Statuss:"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:629
+#: ../calendar/gui/e-cal-model-tasks.c:706
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2585
+msgid "In Progress"
+msgstr "Tiek izpildīts"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:631
+#: ../calendar/gui/e-calendar-table.c:241
+#: ../calendar/gui/e-calendar-table.c:665 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2588 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "Izpildīts"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/print.c:2582
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Nav s�kts"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "Priorit�te:"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
-msgid "Description:"
-msgstr "Apraksts:"
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "Augsta"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
-msgid "Web Page:"
-msgstr "Tīmekļa lappuse:"
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1114 ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "Norm�la"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:592 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "Zema"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Created"
 msgstr "Izveidots"
 
@@ -4922,6 +6328,7 @@ msgstr "Beigu datums"
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
+#| msgid "Modified"
 msgid "Last modified"
 msgstr "Modificēts"
 
@@ -4931,16 +6338,17 @@ msgid "Start Date"
 msgstr "S�kuma datums"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-calendar-table.c:642
 msgid "Free"
 msgstr "Brīvs"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-calendar-table.c:643
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Aizņemts"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:579
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4950,81 +6358,213 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
-#| msgid "None"
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "Nekas"
-
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
-#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-cal-model-tasks.c:981 ../calendar/gui/e-cal-model.c:1120
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "J�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-cal-model-tasks.c:981 ../calendar/gui/e-cal-model.c:1120
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "NÄ“"
 
-#: ../calendar/gui/e-cal-model.c:378
-#| msgid "Default Mail Client"
-msgid "Default Client"
-msgstr "Noklusētais klients"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:551
-#: ../shell/e-shell.c:868
-#| msgid "Exchange Settings"
-msgid "Shell Settings"
-msgstr "Čaulas iestatījumi"
-
-#: ../calendar/gui/e-cal-model.c:389 ../calendar/gui/gnome-cal.c:552
-#: ../shell/e-shell.c:869
-#| msgid "Autocompletion Settings"
-msgid "Application-wide settings"
-msgstr "Visas lietotnes iestatījumi"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:573 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1381
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Nezin�ms"
 
-#: ../calendar/gui/e-cal-model.c:1317
+#: ../calendar/gui/e-cal-model.c:1116
 msgid "Recurring"
 msgstr "Periodisks"
 
-#: ../calendar/gui/e-cal-model.c:1319
+#: ../calendar/gui/e-cal-model.c:1118
 msgid "Assigned"
 msgstr "Piešķirts"
 
-#: ../calendar/gui/e-cal-model.c:2225
+#: ../calendar/gui/e-calendar-table.c:340
+#| msgid "No summary"
+msgid "* No Summary *"
+msgstr "* Nav kopsavilkuma *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2434
 #, c-format
-msgid "Opening %s"
-msgstr "Atver %s"
+msgid "Organizer: %s <%s>"
+msgstr "Organizēt�js: %s <%s>"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% izpildīts"
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:379
+#: ../calendar/gui/e-calendar-view.c:2438
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizēt�js: %s"
+
+#: ../calendar/gui/e-calendar-table.c:410
+#| msgid "Start"
+msgid "Start: "
+msgstr "S�kums: "
 
+#: ../calendar/gui/e-calendar-table.c:422
+#| msgid "Due "
+msgid "Due: "
+msgstr "LÄ«dz: "
+
+#: ../calendar/gui/e-calendar-table.c:593 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "Nedefinēts"
+
+#: ../calendar/gui/e-calendar-table.c:612
+msgid "0%"
+msgstr "0%"
+
+#: ../calendar/gui/e-calendar-table.c:613
+msgid "10%"
+msgstr "10%"
+
+#: ../calendar/gui/e-calendar-table.c:614
+msgid "20%"
+msgstr "20%"
+
+#: ../calendar/gui/e-calendar-table.c:615
+msgid "30%"
+msgstr "30%"
+
+#: ../calendar/gui/e-calendar-table.c:616
+msgid "40%"
+msgstr "40%"
+
+#: ../calendar/gui/e-calendar-table.c:617
+msgid "50%"
+msgstr "50%"
+
+#: ../calendar/gui/e-calendar-table.c:618
+msgid "60%"
+msgstr "60%"
+
+#: ../calendar/gui/e-calendar-table.c:619
+msgid "70%"
+msgstr "70%"
+
+#: ../calendar/gui/e-calendar-table.c:620
+msgid "80%"
+msgstr "80%"
+
+#: ../calendar/gui/e-calendar-table.c:621
+msgid "90%"
+msgstr "80%"
+
+#: ../calendar/gui/e-calendar-table.c:622
+msgid "100%"
+msgstr "100%"
+
+#: ../calendar/gui/e-calendar-table.c:902
+#: ../calendar/gui/e-calendar-view.c:664 ../calendar/gui/e-memo-table.c:454
+msgid "Deleting selected objects"
+msgstr "Dzēš izvēlētos objektus"
+
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:878 ../calendar/gui/e-memo-table.c:659
+msgid "Updating objects"
+msgstr "Atjaunina objektus"
+
+#: ../calendar/gui/e-calendar-table.c:1369
+#: ../calendar/gui/e-calendar-view.c:1338 ../calendar/gui/e-memo-table.c:833
+#: ../composer/e-composer-actions.c:221
+msgid "Save as..."
+msgstr "Saglab�t k�..."
+
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1794
+msgid "New _Task"
+msgstr "Jauns _uzdevums"
+
+#: ../calendar/gui/e-calendar-table.c:1597 ../calendar/gui/e-memo-table.c:938
+msgid "Open _Web Page"
+msgstr "Atvērt _tīmekļa lappusi"
+
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:496
+msgid "_Save As..."
+msgstr "_Saglab�t k�..."
+
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940
+#| msgid "_Print..."
+msgid "P_rint..."
+msgstr "D_ruk�t..."
+
+#: ../calendar/gui/e-calendar-table.c:1603
+#: ../calendar/gui/e-calendar-view.c:1817 ../calendar/gui/e-memo-table.c:944
+#: ../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:1605
+#: ../calendar/gui/e-calendar-view.c:1800
+#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:946
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+msgid "_Paste"
+msgstr "_Ielīmēt"
+
+#: ../calendar/gui/e-calendar-table.c:1609 ../ui/evolution-tasks.xml.h:22
+msgid "_Assign Task"
+msgstr "_Piešķirt uzdevumu"
+
+#: ../calendar/gui/e-calendar-table.c:1610 ../calendar/gui/e-memo-table.c:950
+#: ../ui/evolution-tasks.xml.h:26
+msgid "_Forward as iCalendar"
+msgstr "_P�rsūtīt k� iCalendar"
+
+#: ../calendar/gui/e-calendar-table.c:1611
+msgid "_Mark as Complete"
+msgstr "_Atzīmēt k� izpildītu"
+
+#: ../calendar/gui/e-calendar-table.c:1612
+msgid "_Mark Selected Tasks as Complete"
+msgstr "_Atzīmēt izvēlētos uzdevumus k� izpildītus"
+
+#: ../calendar/gui/e-calendar-table.c:1613
+msgid "_Mark as Incomplete"
+msgstr "_Atzīmēt k� nepabeigtu"
+
+#: ../calendar/gui/e-calendar-table.c:1614
+msgid "_Mark Selected Tasks as Incomplete"
+msgstr "_Atzīmēt izvēlētos uzdevumus k� nepabeigtus"
+
+#: ../calendar/gui/e-calendar-table.c:1619
+msgid "_Delete Selected Tasks"
+msgstr "_Dzēst izvēlētos uzdevumus"
+
+#: ../calendar/gui/e-calendar-table.c:1854
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klikšķin�t, lai pievienotu uzdevumu"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% izpildīts"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Izpildīts"
@@ -5039,7 +6579,7 @@ msgstr "LÄ«dz datumam"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "Priorit�te"
 
@@ -5047,117 +6587,155 @@ msgstr "Priorit�te"
 msgid "Start date"
 msgstr "S�kuma datums"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
-msgid "Type"
-msgstr "Tips"
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2342
+#: ../calendar/gui/e-meeting-list-view.c:606
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Statuss"
 
-#: ../calendar/gui/e-calendar-view.c:392
-#| msgid "Cut selected text to the clipboard"
-msgid "Cut selected events to the clipboard"
-msgstr "Izgriezt izvēlētos notikumus uz starpliktuvi"
+#: ../calendar/gui/e-calendar-view.c:1483
+msgid "Moving items"
+msgstr "P�rvieto priekšmetus"
 
-#: ../calendar/gui/e-calendar-view.c:398
-#| msgid "Copy selected text to the clipboard"
-msgid "Copy selected events to the clipboard"
-msgstr "Kopēt izvēlētos notikumus uz starpliktuvi"
+#: ../calendar/gui/e-calendar-view.c:1485
+msgid "Copying items"
+msgstr "Kopē priekšmetus"
 
-#: ../calendar/gui/e-calendar-view.c:404
-#| msgid "Paste text from the clipboard"
-msgid "Paste events from the clipboard"
-msgstr "Ielīmēt notikumus no starpliktuves"
+#: ../calendar/gui/e-calendar-view.c:1791
+msgid "New _Appointment..."
+msgstr "J_auna tikšan�s..."
 
-#: ../calendar/gui/e-calendar-view.c:410
-#| msgid "Delete selected memos"
-msgid "Delete selected events"
-msgstr "Dzēst izvēlētos notikumus"
+#: ../calendar/gui/e-calendar-view.c:1792
+msgid "New All Day _Event"
+msgstr "Jauns visas di_enas notikums"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
-msgid "Deleting selected objects"
-msgstr "Dzēš izvēlētos objektus"
+#: ../calendar/gui/e-calendar-view.c:1793
+msgid "New _Meeting"
+msgstr "Jauna san�ks_me"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
-msgid "Updating objects"
-msgstr "Atjaunina objektus"
+#. FIXME: hook in this somehow
+#: ../calendar/gui/e-calendar-view.c:1804
+msgid "_Current View"
+msgstr "_Pašreizējais skats"
+
+#: ../calendar/gui/e-calendar-view.c:1806
+msgid "Select T_oday"
+msgstr "Izvēlēties š_odienu"
+
+#: ../calendar/gui/e-calendar-view.c:1807
+msgid "_Select Date..."
+msgstr "Izvēlietie_s datumu..."
+
+#: ../calendar/gui/e-calendar-view.c:1813
+#| msgid "_Print..."
+msgid "Pri_nt..."
+msgstr "_Druk�t..."
+
+#: ../calendar/gui/e-calendar-view.c:1823
+msgid "Cop_y to Calendar..."
+msgstr "Kopē_t uz kalend�ru..."
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-calendar-view.c:1824
+msgid "Mo_ve to Calendar..."
+msgstr "P�r_vietot uz kalend�ru..."
+
+#: ../calendar/gui/e-calendar-view.c:1825
+msgid "_Delegate Meeting..."
+msgstr "_Deleģēt san�ksmi..."
+
+#: ../calendar/gui/e-calendar-view.c:1826
+msgid "_Schedule Meeting..."
+msgstr "_Pl�not san�ksmi..."
+
+#: ../calendar/gui/e-calendar-view.c:1827
+msgid "_Forward as iCalendar..."
+msgstr "_P�rsūtīt k� iCalendar..."
+
+#: ../calendar/gui/e-calendar-view.c:1828
+msgid "_Reply"
+msgstr "_Atbildēt"
+
+#: ../calendar/gui/e-calendar-view.c:1829
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:78
+msgid "Reply to _All"
+msgstr "_Atbildēt visiem"
+
+#: ../calendar/gui/e-calendar-view.c:1834
+msgid "Make this Occurrence _Movable"
+msgstr "Padarīt šo notikumu p�rvietoja_mu"
+
+#: ../calendar/gui/e-calendar-view.c:1835 ../ui/evolution-calendar.xml.h:9
+msgid "Delete this _Occurrence"
+msgstr "Izdzēst šo n_otikumu"
+
+#: ../calendar/gui/e-calendar-view.c:1836
+msgid "Delete _All Occurrences"
+msgstr "Dzēst _visus notikumus"
+
+#: ../calendar/gui/e-calendar-view.c:2289
+#: ../calendar/gui/e-itip-control.c:1183
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "Pieņemts"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-calendar-view.c:2290
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "Noraidīts"
 
-#: ../calendar/gui/e-calendar-view.c:1692
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-calendar-view.c:2291
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "Pagaidu"
 
-#: ../calendar/gui/e-calendar-view.c:1693
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-calendar-view.c:2292
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "Deleģēts"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:2293
+#| msgid "Needs Action"
 msgid "Needs action"
 msgstr "Vajag darbību"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizēt�js: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organizēt�js: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:2454 ../calendar/gui/print.c:2544
 #, 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:1886
+#: ../calendar/gui/e-calendar-view.c:2485
 #, c-format
 msgid "Time: %s %s"
 msgstr "Laiks: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:160
+#: ../calendar/gui/e-cell-date-edit-text.c:102
 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:163
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:171
+#: ../calendar/gui/e-cell-date-edit-text.c:113
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5170,12 +6748,13 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:759
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minūšu sadaļas"
 
-#: ../calendar/gui/e-day-view-time-item.c:780
+#: ../calendar/gui/e-day-view-time-item.c:768
+#| msgid "Show the \"Preview\" pane"
 msgid "Show the second time zone"
 msgstr "R�dīt otru laika joslu"
 
@@ -5185,59 +6764,35 @@ msgstr "R�dīt otru laika joslu"
 #. 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:864 ../calendar/gui/e-day-view.c:1883
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1709
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1900
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:990
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1916
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1026
-msgid "%d %b"
-msgstr "%d %b"
-
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1116 ../calendar/gui/e-week-view.c:750
-#: ../calendar/gui/print.c:819
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1119 ../calendar/gui/e-week-view.c:753
-#: ../calendar/gui/print.c:821
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2613
+#: ../calendar/gui/e-day-view.c:2309
 #, c-format
+#| msgid "Week"
 msgid "Week %d"
 msgstr "Nedēļa %d"
 
-#: ../calendar/gui/e-itip-control.c:765
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "J�. (Sarežģīta atk�rtošan�s)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -5245,7 +6800,7 @@ msgstr[0] "Katru %d dienu"
 msgstr[1] "Katras %d dienas"
 msgstr[2] "Katras %d dienas"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -5253,7 +6808,7 @@ msgstr[0] "Katru %d nedēļu"
 msgstr[1] "Katras %d nedēļas"
 msgstr[2] "Katras %d nedēļas"
 
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -5262,21 +6817,21 @@ msgstr[1] "Katras %d nedēļas "
 msgstr[2] "Katras %d nedēļas "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " un "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "%s. dien� "
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s no "
 
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -5284,7 +6839,7 @@ msgstr[0] "katru %d mēnesi"
 msgstr[1] "katrus %d mēnešus"
 msgstr[2] "katrus %d mēnešus"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -5292,8 +6847,10 @@ msgstr[0] "Katru %d gadu"
 msgstr[1] "Katrus %d gadus"
 msgstr[2] "Katrus %d gadus"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:867
 #, c-format
+#| msgid "a total of %d time"
+#| msgid_plural " a total of %d times"
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
 msgstr[0] "kop� %d reizi"
@@ -5301,451 +6858,444 @@ msgstr[1] "kop� %d reizes"
 msgstr[2] "kop� %d reizes"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr ", beidzoties "
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:906
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "S�kas"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:916
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "Beidzas"
 
-#: ../calendar/gui/e-itip-control.c:943
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "LÄ«dz"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "iCalendar inform�cija"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "iCalendar kļūda"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "Nezin�ma persona"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#. Describe what the user can do
+#: ../calendar/gui/e-itip-control.c:1135
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Lūdzu, caurskatiet sekojošo inform�ciju un pēc tam izvēlieties darbību "
-"no izvēlnes zem�k."
-
-#. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
-#| msgid "None"
-msgctxt "cal-itip"
-msgid "None"
-msgstr "Nekas"
+"no "
+"izvēlnes zem�k."
 
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "Pagaid�m pieņemts"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1274
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "San�ksme ir atcelta, bet tas varētu būt neredzams jūsu kalend�r�"
 
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1276
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "Uzdevums ir atcelts, bet tas varētu būt neredzams jūsu uzdevumu sarakst�"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ir publicējis inform�ciju par san�ksmi."
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "Inform�cija par san�ksmi"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1360
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> pieprasa %s kl�tbūtni san�ksmē."
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pieprasa jūsu kl�tbūtni san�ksmē."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "San�ksmes iemesls"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> vēlas pievienoties esošajai san�ksmei."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
 msgstr "Atjaunin�ta inform�cija par san�ksmi"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> vēlas saņemt jaun�ko inform�ciju par san�ksmi."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
 msgstr "Inform�cijas par san�ksmi atjaunin�šanas pieprasījums"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1382
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ir atbildējis uz san�ksmes pieprasījumu."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "Atbilde par san�ksmi"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> ir atcēlis san�ksmi."
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Cancelation"
 msgstr "San�ksmes atcelšana"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ir nosūtījis nesaprotamu vēstuli."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "Slikts ziņojums par san�ksmi"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ir publicējis inform�ciju par uzdevumu."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
 msgstr "Uzdevuma inform�cija"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1437
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pieprasa %s izpildīt uzdevumu."
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> pieprasa jums izpildīt uzdevumu."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
 msgstr "Uzdevuma priekšlikums"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> vēlas pievienoties esošam uzdevumam."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
 msgstr "Uzdevuma atjaunin�šana"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> vēlas saņemt jaun�ko inform�ciju par uzdevumu."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
 msgstr "Uzdevuma atjaunin�šanas pieprasījums"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ir atbildējis uz uzdevuma piešķiršanu."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
 msgstr "Uzdevuma atbilde"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ir atcēlis uzdevumu."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Cancelation"
 msgstr "Uzdevuma atsaukums"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "Slikts uzdevuma ziņojums"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ir publicējis brīvs/aizņemts inform�ciju."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "Brīvs/aizņemts inform�cija"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pieprasa tavu brīvs/aizņemts inform�ciju."
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "Brīvs/aizņemts pieprasījums"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ir atbildējis uz brīvs/aizņemts inform�ciju."
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "Brīvs/aizņemts atbilde"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "Slikta brīvs/aizņemts ziņa"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr "Ziņa neizskat�s pareizi noformēta"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "Ziņa satur tikai neatbalstītus pieprasījumus."
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Pielikums nesatur atļautu kalend�ra ziņu"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr "Pielikumam nav skat�mu kalend�ra priekšmetu"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "Atjaunin�šana izpildīta\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekts ir nederīgs un nevar tikt atjaunin�ts\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Šī atbilde nav no pašreizēj� dalībnieka. Pievienot k� dalībnieku?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Dalībnieka statuss nevar tikt atjaunin�ts, jo statuss nav derīgs!\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
 msgstr "Dalībnieka status ir atjaunin�ts\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Dalībnieka statuss nevar tikt atjaunin�ts, t�pēc ka priekšmets vair�k "
 "neeksistē"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "Priekšmets nosūtīts!\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr "Priekšmetu nevar nosūtīt!\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "Izvēlieties darbību:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "Atjaunin�t"
 
-#: ../calendar/gui/e-itip-control.c:2353
-#: ../plugins/groupwise-features/gw-ui.c:331
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "Pieņemt"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "Pagaid�m pieņemt"
 
-#: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/gw-ui.c:345
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "Noraidīt"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "Nosūtīt brīvs/aizņemts inform�ciju"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "Atjaunin�t respondenta statusu"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "Sūtīt jaun�ko inform�ciju"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: ../calendar/gui/e-itip-control.ui.h:1
+#: ../calendar/gui/e-itip-control.glade.h:1
 msgid "--to--"
 msgstr "--uz--"
 
-#: ../calendar/gui/e-itip-control.ui.h:2
+#: ../calendar/gui/e-itip-control.glade.h:2
 msgid "Calendar Message"
 msgstr "Kalend�ra ziņojums"
 
-#: ../calendar/gui/e-itip-control.ui.h:3
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "Date:"
 msgstr "Datums:"
 
-#: ../calendar/gui/e-itip-control.ui.h:5
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Loading Calendar"
 msgstr "Iel�dē kalend�ru"
 
-#: ../calendar/gui/e-itip-control.ui.h:6
+#: ../calendar/gui/e-itip-control.glade.h:6
 msgid "Loading calendar..."
 msgstr "Iel�dē Kalend�ru..."
 
-#: ../calendar/gui/e-itip-control.ui.h:7
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organizēt�js:"
 
-#: ../calendar/gui/e-itip-control.ui.h:8
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Servera ziņojums:"
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Vadīt�ji"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Pieprasītie dalībnieki"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Iespējamie dalībnieki"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Resursi"
 
-#: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "Individu�li"
 
-#: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupa"
 
-#: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "Resurss"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "Istaba"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "Vadīt�js"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "Pieprasītais dalībnieks"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "Iespējamais dalībnieks"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "Nepiedal�s"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "Vajag darbību"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:549
 msgid "Attendee                          "
 msgstr "Dalībnieks                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 msgid "In Process"
 msgstr "Notiek"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -5754,7 +7304,7 @@ msgstr "%A, %d. %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
@@ -5764,67 +7314,67 @@ msgstr "%a %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Neatrodas biroj�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Nav inform�cijas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "Da_lībnieki..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "O_pcijas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "R�dīt _tikai darba stundas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "R�dīt _t�lin�tu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "_Atjaunin�t brīvs/aizņemts inform�ciju"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "_Autom�tiksa izvēle"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "_Visi cilvēki un resursi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "Visi _cilvēki un viens resurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "Piep_rasītie cilvēki"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "Pieprasītie cilvēki un _viens resurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "_S�kuma laiks:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "B_eigu laiks:"
 
@@ -5852,384 +7402,163 @@ msgstr "Valoda"
 msgid "Member"
 msgstr "Biedrs"
 
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:456
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
-msgid "Memos"
-msgstr "Memo"
-
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
-msgid "* No Summary *"
-msgstr "* Nav kopsavilkuma *"
-
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
-msgid "Start: "
-msgstr "S�kums: "
-
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
-msgid "Due: "
-msgstr "LÄ«dz: "
-
-#: ../calendar/gui/e-memo-table.c:707
-#| msgid "Cut selected messages to the clipboard"
-msgid "Cut selected memos to the clipboard"
-msgstr "Izgriezt izvēlētos memo uz starpliktuvi"
+#: ../calendar/gui/e-memo-table.c:955
+msgid "_Delete Selected Memos"
+msgstr "_Dzēst izvēlētos memo"
 
-#: ../calendar/gui/e-memo-table.c:713
-#| msgid "Copy selected messages to the clipboard"
-msgid "Copy selected memos to the clipboard"
-msgstr "Kopēt izvēlētos memo uz starpliktuvi"
-
-#: ../calendar/gui/e-memo-table.c:719
-#| msgid "Paste memo from the clipboard"
-msgid "Paste memos from the clipboard"
-msgstr "Ielīmēt memo no starpliktuves"
-
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
-msgid "Delete selected memos"
-msgstr "Dzēst izvēlētos memo"
-
-#: ../calendar/gui/e-memo-table.c:731
-#| msgid "Select all visible messages"
-msgid "Select all visible memos"
-msgstr "Izvēlēties visus redzamos memo"
-
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1104 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Klikšķiniet, lai pievienotu memo"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "80%"
+#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
+#, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr ""
+"Kļūda %s:\n"
+" %s"
 
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#: ../calendar/gui/e-memos.c:806
+msgid "Loading memos"
+msgstr "Iel�dē memo"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:418
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
-msgid "Tasks"
-msgstr "Uzdevumi"
+#: ../calendar/gui/e-memos.c:897
+#, c-format
+msgid "Opening memos at %s"
+msgstr "Atver memo no %s"
 
-#: ../calendar/gui/e-task-table.c:928
-#| msgid "Cut selected text to the clipboard"
-msgid "Cut selected tasks to the clipboard"
-msgstr "Izgriezt izvēlētos uzdevumus uz starpliktuvi"
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
+msgid "Deleting selected objects..."
+msgstr "Dzēš izvēlētos objektus..."
 
-#: ../calendar/gui/e-task-table.c:934
-#| msgid "Copy selected text to the clipboard"
-msgid "Copy selected tasks to the clipboard"
-msgstr "Kopēt izvēlētos uzdevumus uz starpliktuvi"
+#: ../calendar/gui/e-tasks.c:955
+msgid "Loading tasks"
+msgstr "Iel�dē uzdevumus"
 
-#: ../calendar/gui/e-task-table.c:940
-msgid "Paste tasks from the clipboard"
-msgstr "Ielīmēt uzdevumus no starpliktuves"
+#: ../calendar/gui/e-tasks.c:1052
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Atver uzdevumus uz %s"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
-msgid "Delete selected tasks"
-msgstr "Dzēst izvēlētos uzdevumus"
+#: ../calendar/gui/e-tasks.c:1295
+msgid "Completing tasks..."
+msgstr "Izpilda uzdevumus..."
 
-#: ../calendar/gui/e-task-table.c:952
-#| msgid "Select all visible messages"
-msgid "Select all visible tasks"
-msgstr "Izvēlēties visus redzamos uzdevumus"
+#: ../calendar/gui/e-tasks.c:1345
+msgid "Expunging"
+msgstr "Izsvītro"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 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:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1690
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
-msgid "It has alarms."
-msgstr "Tam ir trauksmes."
+#: ../calendar/gui/gnome-cal.c:2685
+msgid "_Custom View"
+msgstr "_Piel�gots skats"
 
-#: ../calendar/gui/ea-cal-view-event.c:279
-msgid "It has recurrences."
-msgstr "Tam ir atk�rtošan�s."
+#: ../calendar/gui/gnome-cal.c:2686
+msgid "_Save Custom View"
+msgstr "_Saglab�t piel�gotu skatu"
 
-#: ../calendar/gui/ea-cal-view-event.c:282
-msgid "It is a meeting."
-msgstr "T� ir san�ksme."
+#: ../calendar/gui/gnome-cal.c:2691
+msgid "_Define Views..."
+msgstr "_Definēt skatus..."
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/gnome-cal.c:2928
 #, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "Kalend�ra notikums: kopsavilkums ir %s."
-
-#: ../calendar/gui/ea-cal-view-event.c:290
-msgid "Calendar Event: It has no summary."
-msgstr "Kalend�ra notikums: nav kopsavilkuma."
-
-#: ../calendar/gui/ea-cal-view-event.c:312
-msgid "calendar view event"
-msgstr "kalend�ra skata notikumi"
-
-#: ../calendar/gui/ea-cal-view-event.c:540
-msgid "Grab Focus"
-msgstr "Paņemt fokusu"
-
-#: ../calendar/gui/ea-cal-view.c:300
-msgid "New Appointment"
-msgstr "Jauna tikšan�s"
-
-#: ../calendar/gui/ea-cal-view.c:301
-msgid "New All Day Event"
-msgstr "Jauns visas dienas notikums"
-
-#: ../calendar/gui/ea-cal-view.c:302
-msgid "New Meeting"
-msgstr "Jauna san�ksme"
-
-#: ../calendar/gui/ea-cal-view.c:303
-msgid "Go to Today"
-msgstr "Iet uz Å¡odienu"
+msgid "Loading appointments at %s"
+msgstr "Iel�dē tikšan�s no %s"
 
-#: ../calendar/gui/ea-cal-view.c:304
-msgid "Go to Date"
-msgstr "Iet uz datumu"
-
-#: ../calendar/gui/ea-day-view-main-item.c:308
-#: ../calendar/gui/ea-week-view-main-item.c:340
-msgid "a table to view and select the current time range"
-msgstr "tabula pašreizēja laika apskatīšanai un izvēlēšanai"
-
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/gnome-cal.c:2943
 #, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "Taj� ir %d notikums."
-msgstr[1] "Taj� ir %d notikumi."
-msgstr[2] "Taj� ir %d notikumi."
+msgid "Loading tasks at %s"
+msgstr "Iel�dē uzdevumus no %s"
 
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
-msgid "It has no events."
-msgstr "Taj� nav notikumu."
-
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/gnome-cal.c:2952
 #, c-format
-msgid "Work Week View: %s. %s"
-msgstr "Darba nedēļas apskats: %s. %s"
+msgid "Loading memos at %s"
+msgstr "Iel�dē memo no %s"
 
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/gnome-cal.c:3064
 #, c-format
-msgid "Day View: %s. %s"
-msgstr "Dienas apskats: %s. %s"
-
-#: ../calendar/gui/ea-day-view.c:201
-msgid "calendar view for a work week"
-msgstr "darba nedēļas kalend�ra skats"
-
-#: ../calendar/gui/ea-day-view.c:203
-msgid "calendar view for one or more days"
-msgstr "vienas vai vair�ku dienu kalend�ra skats"
-
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
-msgid "Gnome Calendar"
-msgstr "Gnome kalend�rs"
-
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:986
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
-
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:993
-#: ../modules/calendar/e-cal-shell-view-private.c:999
-#: ../modules/calendar/e-cal-shell-view-private.c:1002
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1019
-#: ../modules/calendar/e-cal-shell-view-private.c:1030
-#: ../modules/calendar/e-cal-shell-view-private.c:1037
-#: ../modules/calendar/e-cal-shell-view-private.c:1040
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
-
-#: ../calendar/gui/ea-jump-button.c:147
-msgid "Jump button"
-msgstr "P�rlēkšanas taustiņš"
-
-#: ../calendar/gui/ea-jump-button.c:156
-msgid "Click here, you can find more events."
-msgstr "Spiediet šeit, lai atrastu vair�k notikumus."
-
-#: ../calendar/gui/ea-week-view.c:157
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "Mēneša skats: %s. %s"
-
-#: ../calendar/gui/ea-week-view.c:161
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "Nedēļas skats: %s. %s"
-
-#: ../calendar/gui/ea-week-view.c:192
-msgid "calendar view for a month"
-msgstr "kalend�ra skats mēnesim"
-
-#: ../calendar/gui/ea-week-view.c:194
-msgid "calendar view for one or more weeks"
-msgstr "kalend�ra skats vienai vai vair�k�m nedēļ�m"
+msgid "Opening %s"
+msgstr "Atver %s"
 
-#: ../calendar/gui/gnome-cal.c:2299
+#: ../calendar/gui/gnome-cal.c:4032
 msgid "Purging"
 msgstr "Dzēš"
 
-#: ../calendar/gui/goto-dialog.ui.h:1
-msgid "April"
-msgstr "Aprīlis"
-
-#: ../calendar/gui/goto-dialog.ui.h:2
-msgid "August"
-msgstr "Augusts"
-
-#: ../calendar/gui/goto-dialog.ui.h:3
-msgid "December"
-msgstr "Decembris"
-
-#: ../calendar/gui/goto-dialog.ui.h:4
-msgid "February"
-msgstr "Febru�ris"
-
-#: ../calendar/gui/goto-dialog.ui.h:5
-msgid "January"
-msgstr "Janv�ris"
-
-#: ../calendar/gui/goto-dialog.ui.h:6
-msgid "July"
-msgstr "JÅ«lijs"
-
-#: ../calendar/gui/goto-dialog.ui.h:7
-msgid "June"
-msgstr "JÅ«nijs"
-
-#: ../calendar/gui/goto-dialog.ui.h:8
-msgid "March"
-msgstr "Marts"
-
-#: ../calendar/gui/goto-dialog.ui.h:9
-msgid "May"
-msgstr "Maijs"
-
-#: ../calendar/gui/goto-dialog.ui.h:10
-msgid "November"
-msgstr "Novembris"
-
-#: ../calendar/gui/goto-dialog.ui.h:11
-msgid "October"
-msgstr "Oktobris"
-
-#: ../calendar/gui/goto-dialog.ui.h:12
+#: ../calendar/gui/goto-dialog.glade.h:1
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"Janv�ris\n"
+"Febru�ris\n"
+"Marts\n"
+"Aprīlis\n"
+"Maijs\n"
+"JÅ«nijs\n"
+"JÅ«lijs\n"
+"Augusts\n"
+"Septembris\n"
+"Oktobris\n"
+"Novembris\n"
+"Decembris"
+
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "Izvēlieties datumu"
 
-#: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "Septembris"
-
-#: ../calendar/gui/goto-dialog.ui.h:14
+#: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "Izvēlētie_s šodienu"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:553
 msgid "An organizer must be set."
 msgstr "J�būt nor�dītam organizēt�jam."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:453
 msgid "At least one attendee is necessary"
 msgstr "Ir nepieciešams vismaz viens dalībnieks"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
 msgid "Event information"
 msgstr "Notikuma inform�cija"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
 msgid "Task information"
 msgstr "Uzdevuma inform�cija"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
+#| msgid "No Information"
 msgid "Memo information"
 msgstr "Memo inform�cija"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "Brīvs/aizņemts inform�cija"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "Kalend�ra inform�cija"
 
@@ -6237,7 +7566,8 @@ msgstr "Kalend�ra inform�cija"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:677
+#| msgid "Accepted"
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Pieņemts"
@@ -6246,7 +7576,8 @@ msgstr "Pieņemts"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:684
+#| msgid "Tentatively Accepted"
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Pagaid�m pieņemts"
@@ -6258,7 +7589,8 @@ msgstr "Pagaid�m pieņemts"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
+#| msgid "Declined"
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Noraidīts"
@@ -6267,7 +7599,8 @@ msgstr "Noraidīts"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:698
+#| msgid "Delegated"
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Deleģēts"
@@ -6275,7 +7608,8 @@ msgstr "Deleģēts"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:711
+#| msgid "Updated"
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Atjaunin�ts"
@@ -6283,7 +7617,8 @@ msgstr "Atjaunin�ts"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:718
+#| msgid "Cancel"
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Atcelt"
@@ -6291,7 +7626,8 @@ msgstr "Atcelt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:725
+#| msgid "Refresh"
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Atsvaidzin�t"
@@ -6299,153 +7635,271 @@ msgstr "Atsvaidzin�t"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:732
+#| msgid "Counter-proposal"
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Pretpied�v�jums"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:802
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Brīvs/aizņemts inform�cija (%s uz %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "iCalendar inform�cija"
 
-#: ../calendar/gui/itip-utils.c:832
-msgid "Unable to book a resource, the new event collides with some other."
-msgstr "Nevar rezervēt resursu, jaunais notikums konfliktē ar k�du citu."
-
-#: ../calendar/gui/itip-utils.c:834
-msgid "Unable to book a resource, error: "
-msgstr "Nevar rezervēt resursu, kļūda: "
-
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:981
 msgid "You must be an attendee of the event."
 msgstr "Jums j�būt šī notikuma dalībniekam."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/memos-component.c:483
+msgid "_New Memo List"
+msgstr "Jau_ns memo saraksts"
+
+#: ../calendar/gui/memos-component.c:566
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d memo"
+msgstr[1] "%d memo"
+msgstr[2] "%d memo"
+
+#: ../calendar/gui/memos-component.c:568 ../calendar/gui/tasks-component.c:560
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d izvēlēts"
+msgstr[1] ", %d izvēlētas"
+msgstr[2] ", %d izvēlētas"
+
+#: ../calendar/gui/memos-component.c:615
+msgid "Failed upgrading memos."
+msgstr "Neizdev�s uzlabot memo."
+
+#: ../calendar/gui/memos-component.c:745
+#, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr "Nevar atvērt memo sarakstu '%s', lai izveidotu notikumu vai tikšanos"
+
+#: ../calendar/gui/memos-component.c:758
+msgid "There is no calendar available for creating memos"
+msgstr "Nav pieejamu kalend�ru memo izveidei"
+
+#: ../calendar/gui/memos-component.c:868
+msgid "Memo Source Selector"
+msgstr "Memo avota selektors"
+
+#: ../calendar/gui/memos-component.c:1047
+msgid "New memo"
+msgstr "Jauns memo"
+
+#: ../calendar/gui/memos-component.c:1048
+#| msgid "Mem_o"
+msgctxt "New"
+msgid "Mem_o"
+msgstr "Mem_o"
+
+#: ../calendar/gui/memos-component.c:1049
+msgid "Create a new memo"
+msgstr "Izveidot jaunu memo"
+
+#: ../calendar/gui/memos-component.c:1055
+msgid "New shared memo"
+msgstr "Jauns koplietošanas memo"
+
+#: ../calendar/gui/memos-component.c:1056
+#| msgid "_Shared memo"
+msgctxt "New"
+msgid "_Shared memo"
+msgstr "_Koplietošanas memo"
+
+#: ../calendar/gui/memos-component.c:1057
+msgid "Create a shared new memo"
+msgstr "Izveidot jaunu koplietošanas memo"
+
+#: ../calendar/gui/memos-component.c:1063
+msgid "New memo list"
+msgstr "Jaunus memo saraksts"
+
+#: ../calendar/gui/memos-component.c:1064
+#| msgid "Memo li_st"
+msgctxt "New"
+msgid "Memo li_st"
+msgstr "Memo _saraksts"
+
+#: ../calendar/gui/memos-component.c:1065
+msgid "Create a new memo list"
+msgstr "Izveidot jaunu memo sarakstu"
+
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
+msgid "Print Memos"
+msgstr "Izdruk�t memo"
+
+#: ../calendar/gui/migration.c:157
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution uzdevumu mapju atrašan�s vieta un hierarhija ir mainījusies kopš "
+"Evolution 1.x.\n"
+"\n"
+"Lūdzu, uzgaidiet, kamēr Evolution p�rceļ jūsu mapes..."
+
+#: ../calendar/gui/migration.c:161
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution kalend�ru mapju atrašan�s vieta un hierarhija ir mainījusies kopš "
+"Evolution 1.x.\n"
+"\n"
+"Lūdzu, uzgaidiet, kamēr Evolution p�rceļ jūsu mapes"
+
+#. FIXME: set proper domain/code
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
+#, c-format
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr "Nevar p�rcelt vecos iestatījumus no evolution/config.xmldb"
+
+#. FIXME: domain/code
+#: ../calendar/gui/migration.c:803
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "Nevar p�rcelt kalend�ru `%s'"
+
+#. FIXME: domain/code
+#: ../calendar/gui/migration.c:971
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Nevar p�rcelt uzdevumus `%s'"
+
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "31."
 
@@ -6477,62 +7931,158 @@ msgstr "P"
 msgid "Sa"
 msgstr "S"
 
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2508
 msgid "Appointment"
 msgstr "Tikšan�s"
 
-#: ../calendar/gui/print.c:2566
+#: ../calendar/gui/print.c:2510
 msgid "Task"
 msgstr "Uzdevums"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2535
 #, c-format
 msgid "Summary: %s"
 msgstr "Kopsavilkums: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2558
+#| msgid "Attendees"
 msgid "Attendees: "
 msgstr "Dalībnieki: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2598
 #, c-format
 msgid "Status: %s"
 msgstr "Statuss: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2612
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorit�te: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2627
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procenti izpildīti: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2638
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2651
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorijas: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2662
 msgid "Contacts: "
 msgstr "Kontakti: "
 
+#: ../calendar/gui/tasks-component.c:475
+msgid "_New Task List"
+msgstr "Jau_ns uzdevumu saraksts"
+
+#: ../calendar/gui/tasks-component.c:558
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d uzdevums"
+msgstr[1] "%d uzdevumi"
+msgstr[2] "%d uzdevumi"
+
+#: ../calendar/gui/tasks-component.c:607
+msgid "Failed upgrading tasks."
+msgstr "Neizdev�s uzlabojot uzdevumus."
+
+#: ../calendar/gui/tasks-component.c:740
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr "Nevar atvērt uzdevumu sarakstu '%s' notikumu un tikšanos izveidei"
+
+#: ../calendar/gui/tasks-component.c:753
+msgid "There is no calendar available for creating tasks"
+msgstr "Nav pieejams kalend�rs uzdevumu izveidei"
+
+#: ../calendar/gui/tasks-component.c:864
+msgid "Task Source Selector"
+msgstr "Uzdevuma avota selektors"
+
+#: ../calendar/gui/tasks-component.c:1118
+msgid "New task"
+msgstr "Jauns uzdevums"
+
+#: ../calendar/gui/tasks-component.c:1119
+#| msgid "_Task"
+msgctxt "New"
+msgid "_Task"
+msgstr "_Uzdevums"
+
+#: ../calendar/gui/tasks-component.c:1120
+msgid "Create a new task"
+msgstr "Izveidot jaunu uzdevumu"
+
+#: ../calendar/gui/tasks-component.c:1126
+msgid "New assigned task"
+msgstr "Jauns piešķirtais uzdevums"
+
+#: ../calendar/gui/tasks-component.c:1127
+#| msgid "Assigne_d Task"
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "Piešķirtais uz_devums"
+
+#: ../calendar/gui/tasks-component.c:1128
+msgid "Create a new assigned task"
+msgstr "Izveidot jaunu piešķirtu uzdevumu"
+
+#: ../calendar/gui/tasks-component.c:1134
+msgid "New task list"
+msgstr "Jauns uzdevumu saraksts"
+
+#: ../calendar/gui/tasks-component.c:1135
+#| msgid "Tas_k list"
+msgctxt "New"
+msgid "Tas_k list"
+msgstr "Uzdevumu sara_ksts"
+
+#: ../calendar/gui/tasks-component.c:1136
+msgid "Create a new task list"
+msgstr "Izveidot jaunu uzdevumu sarakstu"
+
+#: ../calendar/gui/tasks-control.c:484
+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 ""
+"Šī darbība pilnīb� izdzēsīs visus uzdevumus, kuri ir atzīmēti k� izpildīti. "
+"Ja "
+"jūs turpin�siet, jūs vairs nevarēsiet atgūt šos uzdevumus.\n"
+"\n"
+"Tieš�m izdzēst šos uzdevumus?"
+
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
+msgid "Do not ask me again."
+msgstr "Neprasiet man vēlreiz."
+
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
+msgid "Print Tasks"
+msgstr "Druk�t uzdevumus"
+
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
+#| msgid "% Complete"
 msgid "% Completed"
 msgstr "% izpildīti"
 
 #: ../calendar/gui/tasktypes.xml.h:7
+#| msgid "Canceled"
 msgid "Cancelled"
 msgstr "Atsaukts"
 
 #: ../calendar/gui/tasktypes.xml.h:15
+#| msgid "In Progress"
 msgid "In progress"
 msgstr "Tiek izpildīts"
 
@@ -6549,8 +8099,8 @@ msgid "Appointments and Meetings"
 msgstr "Tikšan�s un san�ksmes"
 
 #: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "Atver kalend�ru"
 
@@ -6574,11 +8124,11 @@ msgstr "vCalendar faili (.vcf)"
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importēt�js"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "Kalend�ra notikumi"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution Calendar inteliģentais importēt�js"
 
@@ -7131,7 +8681,7 @@ msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "Amerika/Å…ujorka"
 
@@ -8131,177 +9681,193 @@ msgstr "Klusais/Wallis"
 msgid "Pacific/Yap"
 msgstr "Klusais/Yap"
 
-#: ../composer/e-composer-actions.c:79
+#: ../composer/e-composer-actions.c:85
 msgid "Untitled Message"
 msgstr "Nenosaukta vēstule"
 
-#: ../composer/e-composer-actions.c:202
-msgid "Save as..."
-msgstr "Saglab�t k�..."
-
-#: ../composer/e-composer-actions.c:281
+#: ../composer/e-composer-actions.c:319
 #: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "Pievienot failu"
 
-#: ../composer/e-composer-actions.c:286
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:324 ../mail/mail-signature-editor.c:195
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Aizvērt"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:326
 msgid "Close the current file"
 msgstr "Aizvērt pašreizējo failu"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:331 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Druk�t..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:338 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Drukas priekšskatījums"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:347
 msgid "Save the current file"
 msgstr "Saglab�t pašreizējo failu"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:352
 msgid "Save _As..."
 msgstr "S_aglab�t k�..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:354
 msgid "Save the current file with a different name"
 msgstr "Saglab�t pašreizējo failu ar citu nosaukumu"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:359
+#| msgid "Save as draft"
 msgid "Save as _Draft"
 msgstr "Saglab�t k� _melnrakstu"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:361
 msgid "Save as draft"
 msgstr "Saglab�t k� melnrakstu"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:366 ../composer/e-composer-private.c:199
 msgid "S_end"
 msgstr "Sū_tīt"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:368
 msgid "Send this message"
 msgstr "Sūtīt šo vēstuli"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:375
+msgid "Insert Send options"
+msgstr "Ievietot sūtīšanas iespējas"
+
+#: ../composer/e-composer-actions.c:380
+#| msgid "_Message"
 msgid "New _Message"
 msgstr "Jauna _vēstule"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:382
+#| msgid "_Send New Message To..."
 msgid "Open New Message window"
 msgstr "Atvērt jaunu vēstules logu"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:389
+#| msgid "Character Encoding"
 msgid "Character _Encoding"
 msgstr "Rakstzīmju _kodējums"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:396
+msgid "_Security"
+msgstr "_Drošība"
+
+#: ../composer/e-composer-actions.c:406
 msgid "PGP _Encrypt"
 msgstr "PGP ši_frēšana"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:408
 msgid "Encrypt this message with PGP"
 msgstr "Šifrēt šo vēstuli ar PGP"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:414
 msgid "PGP _Sign"
 msgstr "PGP parak_sts"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:416
 msgid "Sign this message with your PGP key"
 msgstr "Parakstīt šo vēstuli ar jūsu PGP atslēgu"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:422
 msgid "_Prioritize Message"
 msgstr "_Piešķirt vēstulei priorit�ti"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:424
 msgid "Set the message priority to high"
 msgstr "Piešķirt vēstulei augstu priorit�ti"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:430
+#| msgid "R_equest Read Receipt"
 msgid "Re_quest Read Receipt"
 msgstr "_Pieprasīt izlasīšanas paziņojumu"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:432
 msgid "Get delivery notification when your message is read"
 msgstr "Saņemt pieg�des paziņojumu, kad jūsu vēstule ir izlasīta"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:438
 msgid "S/MIME En_crypt"
 msgstr "S/MIME ši_frēšana"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:440
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Šifrēt šo ziņojumu ar savu S/MIME šifrēšanas sertifik�tu"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:446
 msgid "S/MIME Sig_n"
 msgstr "S/MIME _paraksts"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:448
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Parakstīt šo vēstuli ar savu S/MIME paraksta sertifik�tu"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:454
 msgid "_Bcc Field"
 msgstr "_Bcc lauks"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:456
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Nor�da, vai BCC lauks tiek attēlots"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:462
 msgid "_Cc Field"
 msgstr "_CC lauks"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:464
 msgid "Toggles whether the CC field is displayed"
 msgstr "P�rslēdz, vai CC lauks tiek attēlots"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:470
 msgid "_From Field"
 msgstr "'_No' lauks"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:472
 msgid "Toggles whether the From chooser is displayed"
-msgstr "P�rslēdz, vai 'No' lauks tiek attēlots"
+msgstr "P�rslēdz, vai 'No' izvēlne tiek par�dīta"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:478
 msgid "_Reply-To Field"
 msgstr "'_Atbildēt' lauks"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:480
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr "P�rslēdz, vai 'Atbildēt' lauks tiek attēlots"
+msgstr "P�rslēdz, vai 'Atbildēt' lauks tiek par�dīts"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:523
 msgid "Save Draft"
 msgstr "Saglab�t melnrakstu"
 
-#: ../composer/e-composer-header.c:129
+#: ../composer/e-composer-header.c:120
+#| msgid "Sho_w: "
 msgid "Show"
 msgstr "R�dīt"
 
-#: ../composer/e-composer-header.c:137
+#: ../composer/e-composer-header.c:123
+#| msgid "_Hide"
 msgid "Hide"
 msgstr "Slēpt"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Ievadiet vēstules adres�tus"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ievadiet adreses kuras saņems vēstules kopiju"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8309,99 +9875,81 @@ msgstr ""
 "Ievadiet adreses, kas saņems vēstules kopiju, nepar�doties vēstules saņēmēju "
 "sarakst�."
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:945
 msgid "Fr_om:"
 msgstr "N_o:"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:76
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
 msgid "From"
 msgstr "No"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:954
 msgid "_Reply-To:"
 msgstr "A_tibldēt:"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:959
 msgid "_To:"
 msgstr "_Kam:"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:965
 msgid "_Cc:"
 msgstr "_CC:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "CC"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:971
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:976
 msgid "_Post To:"
 msgstr "_Novietot:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:980
 msgid "S_ubject:"
 msgstr "T_emats:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:989
 msgid "Si_gnature:"
 msgstr "Para_ksts:"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
 msgstr "Uz adrešu gr�matu"
 
-#: ../composer/e-composer-post-header.c:116
-msgid "Click here to select folders to post to"
-msgstr "Klikšķiniet šeit, lai izvēlētos mapes"
-
-#: ../composer/e-composer-private.c:199
-#| msgid "Copy the selection"
-msgid "Undo the last action"
-msgstr "Atcelt iepriekšējo darbību"
-
-#: ../composer/e-composer-private.c:203
-#| msgid "Send Latest Information"
-msgid "Redo the last undone action"
-msgstr "Atk�rtot pēdējo atcelto darbību"
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "Novietošanas mērķis"
 
-#: ../composer/e-composer-private.c:207
-#| msgid "Search filter"
-msgid "Search for text"
-msgstr "Meklēt tekstu"
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "Izvēlieties mapi, kur novietot ziņojumu."
 
-#: ../composer/e-composer-private.c:211
-#| msgid "Search for an iPod failed"
-msgid "Search for and replace text"
-msgstr "Meklēt un aizvietot tekstu"
+#: ../composer/e-composer-post-header.c:172
+msgid "Click here to select folders to post to"
+msgstr "Klikšķiniet šeit, lai izvēlētos mapes"
 
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:216
+#| msgid "Save Draft"
 msgid "Save draft"
 msgstr "Saglab�t melnrakstu"
 
-#. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
-msgid "_Do not show this message again."
-msgstr "Ner�_dīt šo ziņojumu vēlreiz."
-
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:807
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Nevar parakstīt izejošo vēstuli: paraksta sertifik�ts šim kontam nav "
 "iestatīts"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:814
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8409,16 +9957,15 @@ msgstr ""
 "Nevar nošifrēt izejošo vēstuli: šifrēšanas sertifik�ts šim kontam nav "
 "iestatīts"
 
-#: ../composer/e-msg-composer.c:1381
-#| msgid "Unable to retrieve message from editor"
-msgid "Unable to reconstruct message from autosave file"
-msgstr "Nevar atjaunot vēstuli no autom�tisk�s saglab�šanas faila"
+#: ../composer/e-msg-composer.c:1292
+msgid "Unable to retrieve message from editor"
+msgstr "Nevar saņemt vēstuli no redaktora"
 
-#: ../composer/e-msg-composer.c:1447 ../composer/e-msg-composer.c:1643
+#: ../composer/e-msg-composer.c:1366 ../composer/e-msg-composer.c:2153
 msgid "Compose Message"
 msgstr "Rakstīt vēstuli"
 
-#: ../composer/e-msg-composer.c:3312
+#: ../composer/e-msg-composer.c:3311
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8460,8 +10007,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 ""
-"Šī rakstīšanas loga aizvēršana izraisīs ziņas neatgriezenisku zudumu, ja "
-"vien jūs neizvēlēsieties saglab�t to sav� melnrakstu mapē. Tas ļaus jums "
+"Šī rakstīšanas loga aizvēršana izraisīs ziņas neatgriezenisku zudumu, "
+"ja vien jūs neizvēlēsieties saglab�t to sav� melnrakstu mapē. Tas ļaus jums "
 "turpin�t vēstuli vēl�k."
 
 #: ../composer/mail-composer.error.xml.h:7
@@ -8485,18 +10032,22 @@ msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "Neizdev�s saglab�t autom�tisk�s saglab�šanas fail� &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:12
+msgid "Directories can not be attached to Messages."
+msgstr "Vēstulēm nevar pievienot mapes."
+
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "Vai vēlaties atjaunot nepabeigtos ziņojumus?"
 
-#: ../composer/mail-composer.error.xml.h:13
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "Notiek lejupiel�de. Vai vēlaties nosūtīt vēstuli?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:15
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Kļūda, saglab�jot autom�tiskaj� saglab�šan�, t�dēļ ka &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../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."
@@ -8504,11 +10055,34 @@ msgstr ""
 "Evolution negaidot beidza darbu, kamēr rakstīj�t jaunu vēstuli. Vēstules "
 "atjaunošana ļaus jums turpin�t no vietas, kur jūs tik�t."
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:17
+#| msgid ""
+#| "Send options available only for Novell Groupwise and Microsoft Exchange "
+#| "accounts."
+msgid ""
+"Send options available only for Novell GroupWise and Microsoft Exchange "
+"accounts."
+msgstr ""
+"Sūtīšanas iestatījumi ir pieejami tikai Novell Groupwise un Microsoft "
+"Exchange kontiem."
+
+#: ../composer/mail-composer.error.xml.h:18
+msgid "Send options not available."
+msgstr "Sūtīšanas opcija nav pieejama."
+
+#: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Fails `{0}' nav parasts fails un to nevar nosūtīt kop� ar vēstuli."
 
-#: ../composer/mail-composer.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:20
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
+msgstr ""
+"Lai pievienotu Å¡Ä«s mapes saturu, vai nu pievienojiet katru failu "
+"atsevišķi, vai izveidojiet mapes arhīvu un pievienojiet to."
+
+#: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -8519,351 +10093,64 @@ msgstr ""
 "\n"
 "Lūdzu, p�rliecinieties, ka ir uzinstalēta īst� gtkhtml un libgtkhtml versija."
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:24
 msgid "Unable to activate the address selector control."
 msgstr "Nevar aktivizēt adreses selektoru."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:25
+msgid "Unfinished messages found"
+msgstr "Atrastas nepabeigtas vēstules"
+
+#: ../composer/mail-composer.error.xml.h:26
+msgid "Warning: Modified Message"
+msgstr "Brīdin�jums: mainīta vēstule"
+
+#: ../composer/mail-composer.error.xml.h:27
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Nevarat pievienot failu `{0}' šai vēstulei."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
 msgstr "Lai varētu rakstīt vēstuli, jums vispirms j�nokonfigurē konts."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:29
+#| msgid "Continue"
 msgid "_Continue Editing"
 msgstr "_Turpin�t rediģēt"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Neatjaunot"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Atjaunot"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:33
+#| msgid "Save Draft"
 msgid "_Save Draft"
 msgstr "_Saglab�t melnrakstu"
 
-#: ../capplet/anjal-settings-main.c:199
-msgid "Run Anjal in a window"
-msgstr "Palaist Anjal log�"
-
-#: ../capplet/anjal-settings-main.c:200
-#| msgid "Mark as _default memo list"
-msgid "Make Anjal the default email client"
-msgstr "Padarīt Anjal par noklusēto klientu"
-
-#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:207
-msgid "ID of the socket to embed in"
-msgstr "Ligzdas ID, kur� iegult"
-
-#: ../capplet/anjal-settings-main.c:208
-#| msgid "sort"
-msgid "socket"
-msgstr "ligzda"
-
-#: ../capplet/anjal-settings-main.c:221
-#| msgid "Default Mail Client"
-msgid "Anjal email client"
-msgstr "Anjal e-pasta klients"
-
-#: ../capplet/settings/mail-account-view.c:56
-#| msgid "Please choose another name."
-msgid "Please enter your full name."
-msgstr "Lūdzu, ievadiet savu v�rdu."
-
-#: ../capplet/settings/mail-account-view.c:57
-#| msgid "Using email address"
-msgid "Please enter your email address."
-msgstr "LÅ«dzu, ievadiet savu e-pasta adresi."
-
-#: ../capplet/settings/mail-account-view.c:58
-msgid "The email address you have entered is invalid."
-msgstr "Ievadīt� e-pasta adrese nav derīga."
-
-#: ../capplet/settings/mail-account-view.c:181
-#| msgid "<span weight=\"bold\">Delete Mail</span>"
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Personīg� inform�cija:</span>"
-
-#: ../capplet/settings/mail-account-view.c:186
-msgid "Name:"
-msgstr "Nosaukums:"
-
-#: ../capplet/settings/mail-account-view.c:195
-#| msgid "Email address"
-msgid "Email address:"
-msgstr "E-pasta adrese:"
-
-#: ../capplet/settings/mail-account-view.c:205
-#| msgid "<span weight=\"bold\">General</span>"
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Saņemšanas inform�cija:</span>"
-
-#: ../capplet/settings/mail-account-view.c:210
-#: ../capplet/settings/mail-account-view.c:258
-#| msgid "Server _Type:"
-msgid "Server type:"
-msgstr "Servera tips:"
-
-#: ../capplet/settings/mail-account-view.c:219
-#: ../capplet/settings/mail-account-view.c:267
-#| msgid "Server Message:"
-msgid "Server address:"
-msgstr "Servera adrese:"
-
-#: ../capplet/settings/mail-account-view.c:228
-#: ../capplet/settings/mail-account-view.c:276
-#| msgid "Us_ername:"
-msgid "Username:"
-msgstr "Lietot�jv�rds:"
-
-#: ../capplet/settings/mail-account-view.c:237
-#: ../capplet/settings/mail-account-view.c:285
-#| msgid "No encryption"
-msgid "Use encryption:"
-msgstr "Lietot šifrēšanu:"
-
-#: ../capplet/settings/mail-account-view.c:242
-#: ../capplet/settings/mail-account-view.c:290
-#| msgid "Never"
-msgid "never"
-msgstr "nekad"
-
-#: ../capplet/settings/mail-account-view.c:253
-#| msgid "<span weight=\"bold\">General</span>"
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Sūtīšanas inform�cija:</span>"
-
-#: ../capplet/settings/mail-account-view.c:309
-msgid ""
-"To use the email application you'll need to setup an account. Put your email "
-"address and password in below and we'll try and work out all the settings. "
-"If we can't do it automatically you'll need your server details as well."
-msgstr ""
-"Lai izmantotu e-pasta lietotni, jums vajadzēs izveidot kontu. Ievadiet savu "
-"e-pasta adresi un paroli zem�k un mēs mēģin�sim izdom�t visus iestatījumus. "
-"Ja mums tas neizdosies autom�tiski, jums vajadzēs ievadīt arī servera "
-"detaļas."
-
-#: ../capplet/settings/mail-account-view.c:311
-msgid ""
-"Sorry, we can't work out the settings to get your mail automatically. Please "
-"enter them below. We've tried to make a start with the details you just "
-"entered but you may need to change them."
-msgstr ""
-"Piedodiet, bet mēs nevaram autom�tiski izdom�t, k�di ir jūsu pasta "
-"iestatījumi. Lūdzu, ievadiet tos zem�k. Mēs jau s�k�m no inform�cijas, kuru "
-"jūs jau ievadīj�t, bet to varētu vajadzēt mainīt."
-
-#: ../capplet/settings/mail-account-view.c:313
-#| msgid "You may only configure a single Exchange account."
-msgid "You can specify more options to configure the account."
-msgstr "Jūs varat nor�dīt vair�k opciju, lai konfigurētu kontu."
-
-#: ../capplet/settings/mail-account-view.c:315
-msgid ""
-"Now we need your settings for sending mail. We've tried to make some guesses "
-"but you should check them over to make sure."
-msgstr ""
-"Tagad mums vajag pasta sūtīšanas iestatījumus. Mēs tos mēģin�j�m uzminēt, "
-"bet jums tos vajadzētu p�rbaudīt."
-
-#: ../capplet/settings/mail-account-view.c:316
-msgid "You can specify your default settings for your account."
-msgstr "Jūs varat nor�dīt sava konta noklusētos iestatījumus."
-
-#: ../capplet/settings/mail-account-view.c:317
-msgid ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
-msgstr ""
-"Laiks p�rbaudīt lietas, pirms mēģin�m savienoties ar serveri un saņemt pastu."
-
-#: ../capplet/settings/mail-account-view.c:332
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
-msgid "Identity"
-msgstr "Identit�te"
-
-#: ../capplet/settings/mail-account-view.c:332
-#| msgid "Receiving Email"
-msgid "Next - Receiving mail"
-msgstr "N�kamais – saņem e-pastu"
-
-#: ../capplet/settings/mail-account-view.c:333
-#| msgid "Receiving Email"
-msgid "Receiving mail"
-msgstr "Saņem e-pastu"
-
-#: ../capplet/settings/mail-account-view.c:333
-#: ../capplet/settings/mail-account-view.c:334
-#| msgid "Sending Email"
-msgid "Next - Sending mail"
-msgstr "N�kamais – sūta e-pastu"
-
-#: ../capplet/settings/mail-account-view.c:333
-#| msgid "Identity"
-msgid "Back - Identity"
-msgstr "Atpakaļ – identit�te"
-
-#: ../capplet/settings/mail-account-view.c:333
-#| msgid "Receiving Options"
-msgid "Next - Receiving options"
-msgstr "N�kamais – saņemšanas opcijas"
-
-#: ../capplet/settings/mail-account-view.c:334
-#| msgid "Receiving Options"
-msgid "Receiving options"
-msgstr "Saņemšanas opcijas"
-
-#: ../capplet/settings/mail-account-view.c:334
-#: ../capplet/settings/mail-account-view.c:336
-#| msgid "Receiving Email"
-msgid "Back - Receiving mail"
-msgstr "Atpakaļ – saņem e-pastu"
-
-#: ../capplet/settings/mail-account-view.c:336
-#| msgid "Sending Email"
-msgid "Sending mail"
-msgstr "SÅ«ta e-pastu"
-
-#: ../capplet/settings/mail-account-view.c:336
-#: ../capplet/settings/mail-account-view.c:337
-#| msgid "Delete account?"
-msgid "Next - Review account"
-msgstr "N�kamais – caurskatīt kontu"
-
-#: ../capplet/settings/mail-account-view.c:336
-#| msgid "Defaults"
-msgid "Next - Defaults"
-msgstr "N�kamais – noklusētie"
-
-#: ../capplet/settings/mail-account-view.c:336
-#| msgid "Receiving Options"
-msgid "Back - Receiving options"
-msgstr "Atpakaļ – saņemšanas opcijas"
-
-#: ../capplet/settings/mail-account-view.c:337
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
-msgid "Defaults"
-msgstr "Noklusētie"
-
-#: ../capplet/settings/mail-account-view.c:337
-#| msgid "Sending Email"
-msgid "Back - Sending mail"
-msgstr "Atpakaļ – sūta e-pastu"
-
-#: ../capplet/settings/mail-account-view.c:339
-#| msgid "Delete account?"
-msgid "Review account"
-msgstr "Caurskatīt kontu"
-
-#: ../capplet/settings/mail-account-view.c:339
-#| msgid "Fiji"
-msgid "Finish"
-msgstr "Pabeigt"
-
-#: ../capplet/settings/mail-account-view.c:339
-#| msgid "Ascending"
-msgid "Back - Sending"
-msgstr "Atpakaļ – sūta"
-
-#: ../capplet/settings/mail-account-view.c:671
-#: ../capplet/settings/mail-settings-view.c:262
-#| msgid "Close"
-msgid "Close Tab"
-msgstr "Aizvērt cilni"
-
-#: ../capplet/settings/mail-account-view.c:681
-#| msgid "Account Editor"
-msgid "Account Wizard"
-msgstr "Kontu vednis"
-
-#: ../capplet/settings/mail-capplet-shell.c:208
-#| msgid "Evolution Account Assistant"
-msgid "Evolution account assistant"
-msgstr "Evolution kontu asistents"
-
-#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:2948
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1614
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
-msgid "On This Computer"
-msgstr "Šaj� dator�"
-
-#: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:747
-msgid "Modify"
-msgstr "P�rveidot"
-
-#: ../capplet/settings/mail-settings-view.c:148
-#| msgid "Add IM Account"
-msgid "Add a new account"
-msgstr "Pievienot jaunu kontu"
-
-#: ../capplet/settings/mail-settings-view.c:183
-#| msgid "<span weight=\"bold\">Account Information</span>"
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Konta p�rvaldība</span>"
-
-#: ../capplet/settings/mail-settings-view.c:272
-#| msgid "Junk Settings"
-msgid "Settings"
-msgstr "Iestatījumi"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-#| msgid "Calendar information"
-msgid "Calendar event notifications"
-msgstr "Kalend�ra notikumu paziņošana"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
-#| msgid "Evolution Elm importer"
-msgid "Evolution Alarm Notify"
-msgstr "Evolution trauksmes paziņošana"
-
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:827
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "Evolution"
 
 #: ../data/evolution.desktop.in.in.h:2
+#| msgid "Evolution Mail component"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution pasts un kalend�rs"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-commands.c:1035
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
 #: ../data/evolution.desktop.in.in.h:4
+#| msgid "Configure your email accounts here"
 msgid "Manage your email, contacts and schedule"
 msgstr "P�rvaldiet savu e-pastu, kontaktus un grafiku"
 
-#: ../data/evolution-settings.desktop.in.in.h:1
-#| msgid "Configure your email accounts here"
-msgid "Configure email accounts"
-msgstr "Konfigurēt e-pasta kontus"
-
-#: ../data/evolution-settings.desktop.in.in.h:2
-#| msgid "Junk Mail Settings"
-msgid "Email Settings"
-msgstr "E-pasta iestatījumi"
-
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "adreses karte"
@@ -8872,285 +10159,177 @@ msgstr "adreses karte"
 msgid "calendar information"
 msgstr "kalend�ra inform�cija"
 
-#. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:224
-#, c-format
-#| msgid "Cancelled"
-msgid "%s (cancelled)"
-msgstr "%s (atcelts)"
-
-#. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:227
-#, c-format
-#| msgid "%s (%d%% complete)"
-msgid "%s (completed)"
-msgstr "%s (izpildīts)"
-
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../e-util/e-activity.c:231
-#, c-format
-#| msgid "%s (...)"
-msgid "%s..."
-msgstr "%s..."
-
-#: ../e-util/e-activity.c:236
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% izpildīts)"
-
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
-msgid "Evolution Error"
-msgstr "Evolution kļūda"
-
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
-msgid "Evolution Warning"
-msgstr "Evolution brīdin�jums"
-
-#: ../e-util/e-alert.c:634
-#, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "Iekšēja kļūda, pieprasīta nezin�ma kļūda '%s'"
-
-#: ../e-util/e-charset.c:53
-msgid "Arabic"
-msgstr "Ar�bu"
-
-#: ../e-util/e-charset.c:54
-msgid "Baltic"
-msgstr "Baltu"
-
-#: ../e-util/e-charset.c:55
-msgid "Central European"
-msgstr "Centr�leiropas"
-
-#: ../e-util/e-charset.c:56
-msgid "Chinese"
-msgstr "Ķīniešu"
-
-#: ../e-util/e-charset.c:57
-msgid "Cyrillic"
-msgstr "Kirilica"
-
-#: ../e-util/e-charset.c:58
-msgid "Greek"
-msgstr "GrieÄ·u"
-
-#: ../e-util/e-charset.c:59
-msgid "Hebrew"
-msgstr "Ivrits"
-
-#: ../e-util/e-charset.c:60
-msgid "Japanese"
-msgstr "Jap�ņu"
-
-#: ../e-util/e-charset.c:61
-msgid "Korean"
-msgstr "Korejiešu"
-
-#: ../e-util/e-charset.c:62
-msgid "Thai"
-msgstr "Taju"
-
-#: ../e-util/e-charset.c:63
-msgid "Turkish"
-msgstr "Turku"
-
-#: ../e-util/e-charset.c:64
-msgid "Unicode"
-msgstr "Unikods"
-
-#: ../e-util/e-charset.c:65
-msgid "Western European"
-msgstr "Rietumeiropas"
-
-#: ../e-util/e-charset.c:66
-msgid "Western European, New"
-msgstr "Rietumeiropas, jauns"
-
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
-msgid "Traditional"
-msgstr "Tradicion�l�"
-
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
-msgid "Simplified"
-msgstr "Vienk�rš�"
-
-#: ../e-util/e-charset.c:94
-msgid "Ukrainian"
-msgstr "Ukraiņu"
-
-#: ../e-util/e-charset.c:97
-msgid "Visual"
-msgstr "Vizu�l�"
-
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
-#: ../widgets/table/e-cell-date-edit.c:311
+#: ../e-util/e-datetime-format.c:193 ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
 msgid "Today"
 msgstr "Å odien"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "RÄ«t"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:204
+#| msgid "Yesterday %l:%M %p"
 msgid "Yesterday"
 msgstr "Vakar"
 
-#: ../e-util/e-datetime-format.c:210
+#: ../e-util/e-datetime-format.c:207
 #, c-format
 msgid "%d days from now"
 msgstr "%d no Å¡odienas"
 
-#: ../e-util/e-datetime-format.c:212
+#: ../e-util/e-datetime-format.c:209
 #, c-format
+#| msgid "1 day ago"
+#| msgid_plural "%d days ago"
 msgid "%d days ago"
 msgstr "Pirms %d dien�m"
 
-#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
-#: ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
+#: ../e-util/e-datetime-format.c:302
+#| msgid "Use _Default"
 msgid "Use locale default"
 msgstr "Lietot lok�les noklusēto"
 
-#: ../e-util/e-datetime-format.c:499
+#: ../e-util/e-datetime-format.c:496
+#| msgid "Format"
 msgid "Format:"
 msgstr "Form�ts:"
 
-#: ../e-util/e-file-utils.c:136
-#| msgid "Unknown reason"
-msgid "(Unknown Filename)"
-msgstr "(Nezin�ms faila nosaukums)"
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
+msgid "Evolution Error"
+msgstr "Evolution kļūda"
 
-#. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:140
-#, c-format
-#| msgid "Pinging %s"
-msgid "Writing \"%s\""
-msgstr "Raksta %s"
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
+msgid "Evolution Warning"
+msgstr "Evolution brīdin�jums"
 
-#. Translators: The first string value is the basename of a
-#. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:145
-#, c-format
-#| msgid "Copying `%s' to `%s'"
-msgid "Writing \"%s\" to %s"
-msgstr "Raksta \"%s\" uz %s"
+#: ../e-util/e-error.c:118
+msgid "Evolution Information"
+msgstr "Evolution inform�cija"
 
-#: ../e-util/e-logger.c:175
-#| msgid "Name of the component being logged"
-msgid "Name of the logger"
-msgstr "Reģistrēt�ja nosaukums"
+#: ../e-util/e-error.c:120
+msgid "Evolution Query"
+msgstr "Evolution vaic�jums"
 
-#: ../e-util/e-module.c:188
-#| msgid "F_ilename:"
-msgid "Filename"
-msgstr "Faila nosaukums"
+#. setup a dummy error
+#: ../e-util/e-error.c:448
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Iekšēja kļūda, pieprasīta nezin�ma kļūda '%s'"
+
+#: ../e-util/e-logger.c:161
+#| msgid "Complete"
+msgid "Component"
+msgstr "Komponente"
 
-#: ../e-util/e-module.c:189
-#| msgid "Change the name of this folder"
-msgid "The filename of the module"
-msgstr "Moduļa faila nosaukums"
+#: ../e-util/e-logger.c:162
+msgid "Name of the component being logged"
+msgstr "Reģistrēt�s komponentes nosaukums"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:194
+#: ../e-util/e-non-intrusive-error-dialog.c:191
+#| msgid "Web Log"
 msgid "Debug Logs"
 msgstr "Atkļūdošanas žurn�ls"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:208
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 msgid "Show _errors in the status bar for"
 msgstr "R�dīt _kļūdas statusa josl�"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:226
+#: ../e-util/e-non-intrusive-error-dialog.c:223
+#| msgid "seconds"
 msgid "second(s)."
 msgstr "sekundi(-es)."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:232
+#: ../e-util/e-non-intrusive-error-dialog.c:229
+#| msgid "Messages"
 msgid "Log Messages:"
 msgstr "Žurn�la ziņojums:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:279
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr "Reģistrēšanas līmenis"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2687
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:380
+msgid "Time"
+msgstr "Laiks"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Ziņojumi"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:301
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Aizvērt šo logu"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:38
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Error"
 msgstr "Kļūda"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:38
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Errors"
 msgstr "Kļūdas"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warnings and Errors"
 msgstr "Brīdin�jumi un kļūdas"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Debug"
 msgstr "Atkļūdot"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Error, Warnings and Debug messages"
 msgstr "Kļūdas, brīdin�jumi un atkļūdošanas ziņojumi"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
+#: ../plugins/plugin-manager/plugin-manager.c:355
+#: ../plugins/publish-calendar/publish-calendar.c:718
 msgid "Enabled"
 msgstr "Aktivizēts"
 
-#: ../e-util/e-plugin.c:296
+#: ../e-util/e-plugin.c:309
+#| msgid "Whether or not the expander is expanded"
 msgid "Whether the plugin is enabled"
 msgstr "Vai spraudnis ir aktivizēts"
 
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-msgid "weeks"
-msgstr "nedēļas"
-
-#: ../e-util/e-print.c:161
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Druk�šanas laik� gadīj�s kļūda"
 
-#: ../e-util/e-print.c:168
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "Druk�šanas sistēma atgrieza sekojošas detaļas par kļūdu:"
 
-#: ../e-util/e-print.c:174
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Druk�šanas sistēma neatgrieza papildus kļūdas detaļas."
 
-#: ../e-util/e-signature.c:701
+#: ../e-util/e-signature.c:695
 msgid "Autogenerated"
 msgstr "Autom�tiski ģenerēts"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#| msgid "Because &quot;{1}&quot;."
 msgid "Because \"{1}\"."
 msgstr "T�dēļ, ka \"{1}\"."
 
 #: ../e-util/e-system.error.xml.h:2
+#| msgid "Can not open file"
 msgid "Cannot open file \"{0}\"."
 msgstr "Nevar atvērt \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:3
+#| msgid "Cannot save file &quot;{0}&quot;."
 msgid "Cannot save file \"{0}\"."
 msgstr "Nevar saglab�t \"{0}\"."
 
@@ -9159,126 +10338,88 @@ msgid "Do you wish to overwrite it?"
 msgstr "Vai vēlaties to p�rrakstīt?"
 
 #: ../e-util/e-system.error.xml.h:5
+#| msgid "File exists &quot;{0}&quot;."
 msgid "File exists \"{0}\"."
 msgstr "Fails eksistē \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6
+msgid "Overwrite file?"
+msgstr "P�rrakstīt failu?"
+
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "_P�rrakstīt"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:133
+#| msgid "Could not open file"
 msgid "Could not open the link."
 msgstr "Nevar atvērt saiti."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:183
+#| msgid "Could not update folder permissions."
 msgid "Could not display help for Evolution."
 msgstr "Nevar par�dīt Evolution palīdzību."
 
-#: ../e-util/gconf-bridge.c:1307
-#, c-format
-msgid "GConf error: %s"
-msgstr "GConf kļūda: %s"
-
-#: ../e-util/gconf-bridge.c:1318
-msgid "All further errors shown only on terminal."
-msgstr "Visas turpm�k�s kļūdas tiks r�dītas tikai termin�lī."
+#: ../e-util/e-util-labels.c:45
+msgid "I_mportant"
+msgstr "_Svarīgs"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
-#: ../modules/mail/em-mailer-prefs.c:79
-msgid "Reply-To"
-msgstr "Atbildēt uz"
+#. red
+#: ../e-util/e-util-labels.c:46
+msgid "_Work"
+msgstr "_Darbs"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2247 ../mail/em-format-html.c:2309
-#: ../mail/em-format-html.c:2332 ../modules/mail/em-mailer-prefs.c:81
-msgid "Cc"
-msgstr "Cc"
+#. orange
+#: ../e-util/e-util-labels.c:47
+msgid "_Personal"
+msgstr "_Personisks"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2248 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2335 ../modules/mail/em-mailer-prefs.c:82
-msgid "Bcc"
-msgstr "Bcc"
+#. green
+#: ../e-util/e-util-labels.c:48
+msgid "_To Do"
+msgstr "_Dar�mais"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
-#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
-msgid "Subject"
-msgstr "Temats"
+#. blue
+#: ../e-util/e-util-labels.c:49
+msgid "_Later"
+msgstr "Vē_l�k"
 
-#. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2429
-#: ../modules/mail/em-mailer-prefs.c:1131
-msgid "Mailer"
-msgstr "Pastnieks"
+#: ../e-util/e-util-labels.c:320
+#| msgid "_Name:"
+msgid "Label _Name:"
+msgstr "EtiÄ·etes _nosaukums:"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
-msgid "-------- Forwarded Message --------"
-msgstr "--------P�rsūtīta vēstule----------"
+#: ../e-util/e-util-labels.c:343
+#| msgid "Editable"
+msgid "Edit Label"
+msgstr "Rediģēt etiķeti"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
-msgid "Date"
-msgstr "Datums"
+#: ../e-util/e-util-labels.c:343
+#| msgid "Label"
+msgid "Add Label"
+msgstr "Pievienot etiÄ·eti"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:85
-msgid "Newsgroups"
-msgstr "Intereškopa"
+#: ../e-util/e-util-labels.c:362
+msgid "Label name cannot be empty."
+msgstr "Etiķetes nosaukums nevar būt tukšs."
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:86
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Seja"
+#: ../e-util/e-util-labels.c:367
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr ""
+"Etiķete ar t�du pašu birku jau atrodas uz servera. Lūdzu, p�rsauciet etiķeti."
 
-#: ../em-format/em-format.c:1319
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
-msgid "%s attachment"
-msgstr "%s pielikums"
-
-#: ../em-format/em-format.c:1374
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nevarēja apstr�d�t S/MIME vēstuli: nezin�ma kļūda"
-
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nevarēja apstr�d�t MIME vēstuli. Attēlo k� avotu."
-
-#: ../em-format/em-format.c:1520
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Neatbalstīts šifrēšanas veids vair�kdaļīgai šifrēšanai"
-
-#: ../em-format/em-format.c:1532
-msgid "Could not parse PGP/MIME message"
-msgstr "Nevarēja apstr�d�t PGP/MIME vēstuli"
-
-#: ../em-format/em-format.c:1532
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "Nevarēja apstr�d�t PGP/MIME vēstuli: nezin�ma kļūda"
-
-#: ../em-format/em-format.c:1698
-msgid "Unsupported signature format"
-msgstr "Neatbalstīta paraksta forma"
-
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
-msgid "Error verifying signature"
-msgstr "Kļūda, p�rbaudot parakstu"
-
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
-msgid "Unknown error verifying signature"
-msgstr "Nezin�ma kļūta, p�rbaudot parakstu"
-
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message"
-msgstr "Neizdev�s apstr�d�t PGP ziņojumu"
+msgid "GConf error: %s"
+msgstr "GConf kļūda: %s"
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message: Unknown error"
-msgstr "Nevarēja apstr�d�t PGP vēstuli: nezin�ma kļūda"
+#: ../e-util/gconf-bridge.c:1233
+msgid "All further errors shown only on terminal."
+msgstr "Visas turpm�k�s kļūdas tiks r�dītas tikai termin�lī."
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -9286,7 +10427,7 @@ msgstr[0] "Pirms %d sekundes"
 msgstr[1] "Pirms %d sekundēm"
 msgstr[2] "Pirms %d sekundēm"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -9294,7 +10435,7 @@ msgstr[0] "PÄ“c %d sekundes"
 msgstr[1] "Pēc %d sekundēm"
 msgstr[2] "Pēc %d sekundēm"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -9302,7 +10443,7 @@ msgstr[0] "Pirms %d minūtes"
 msgstr[1] "Pirms %d minūtēm"
 msgstr[2] "Pirms %d minūtēm"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -9310,7 +10451,7 @@ msgstr[0] "Pēc %d minūtes"
 msgstr[1] "Pēc %d sekundēm"
 msgstr[2] "Pēc %d sekundēm"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -9318,7 +10459,7 @@ msgstr[0] "Pirms %d stundas"
 msgstr[1] "Pirms %d stund�m"
 msgstr[2] "Pirms %d stund�m"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -9326,7 +10467,7 @@ msgstr[0] "PÄ“c %d stundas"
 msgstr[1] "Pēc %d stund�m"
 msgstr[2] "Pēc %d stund�m"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -9334,7 +10475,7 @@ msgstr[0] "Pirms %d dienas"
 msgstr[1] "Pirms %d dien�m"
 msgstr[2] "Pirms %d dien�m"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -9342,7 +10483,7 @@ msgstr[0] "PÄ“c %d dienas"
 msgstr[1] "Pēc %d dien�m"
 msgstr[2] "Pēc %d dien�m"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -9350,7 +10491,7 @@ msgstr[0] "Pirms %d nedēļas"
 msgstr[1] "Pirms %d nedēļ�m"
 msgstr[2] "Pirms %d nedēļ�m"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -9358,7 +10499,7 @@ msgstr[0] "Pēc %d nedēļas"
 msgstr[1] "Pēc %d nedēļ�m"
 msgstr[2] "Pēc %d nedēļ�m"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -9366,7 +10507,7 @@ msgstr[0] "Pirms %d mēneša"
 msgstr[1] "Pirms %d mēnešiem"
 msgstr[2] "Pirms %d mēnešiem"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -9374,7 +10515,7 @@ msgstr[0] "Pēc %d mēneša"
 msgstr[1] "Pēc %d mēnešiem"
 msgstr[2] "Pēc %d mēnešiem"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -9382,7 +10523,7 @@ msgstr[0] "Pirms %d gada"
 msgstr[1] "Pirms %d gadiem"
 msgstr[2] "Pirms %d gadiem"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -9390,90 +10531,90 @@ msgstr[0] "PÄ“c %d gada"
 msgstr[1] "PÄ“c %d gadiem"
 msgstr[2] "PÄ“c %d gadiem"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<klikšķini šeit, lai izvēlētos datumu>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "tagad"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "Izvēlieties laiku ar ko salīdzin�t"
 
-#: ../filter/e-filter-file.c:184
-#| msgid "Choose a file"
-msgid "Choose a File"
+#: ../filter/filter-file.c:281
+msgid "Choose a file"
 msgstr "Izvēlieties failu"
 
-#: ../filter/e-filter-rule.c:659
+#: ../filter/filter-part.c:528
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Tests"
+
+#: ../filter/filter-rule.c:858
+#| msgid "Rule name"
 msgid "R_ule name:"
 msgstr "K�rtulas nosauk_ums:"
 
-#: ../filter/e-filter-rule.c:689
+#: ../filter/filter-rule.c:886
+#| msgid "Find items that meet the following criteria"
 msgid "Find items that meet the following conditions"
 msgstr "Atrast priekšmetus, kas atbilst sekojošiem kritērijiem"
 
-#: ../filter/e-filter-rule.c:723
+#: ../filter/filter-rule.c:920
 msgid "A_dd Condition"
 msgstr "_Pievienot k�rtulu"
 
-#: ../filter/e-filter-rule.c:732
+#: ../filter/filter-rule.c:926
+#| msgid "If all criteria are met"
 msgid "If all conditions are met"
 msgstr "Ja visi kritēriji izpild�s"
 
-#: ../filter/e-filter-rule.c:733
+#: ../filter/filter-rule.c:926
+#| msgid "If any criteria are met"
 msgid "If any conditions are met"
 msgstr "Ja k�ds no kritērijiem izpild�s"
 
-#: ../filter/e-filter-rule.c:736
+#: ../filter/filter-rule.c:928
 msgid "_Find items:"
 msgstr "_Atrast priekšmetus:"
 
-#: ../filter/e-filter-rule.c:760
+#: ../filter/filter-rule.c:946
 msgid "All related"
 msgstr "Visi saistītie"
 
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/filter-rule.c:946
 msgid "Replies"
 msgstr "Atbildes"
 
-#: ../filter/e-filter-rule.c:762
+#: ../filter/filter-rule.c:946
 msgid "Replies and parents"
 msgstr "Atbildes un vec�ki"
 
-#: ../filter/e-filter-rule.c:763
+#: ../filter/filter-rule.c:946
 msgid "No reply or parent"
 msgstr "Bez atbildes vai vec�ka"
 
-#: ../filter/e-filter-rule.c:766
+#: ../filter/filter-rule.c:948
 msgid "I_nclude threads"
 msgstr "Iekļaut pavedie_nus"
 
-#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../filter/filter-rule.c:1042 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Ien�košais"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/filter-rule.c:1042 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Izejošais"
 
-#: ../filter/e-rule-editor.c:265
-msgid "Add Rule"
-msgstr "Pievienot k�rtulu"
-
-#: ../filter/e-rule-editor.c:352
-msgid "Edit Rule"
-msgstr "Rediģēt k�rtulu"
-
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "Nepareiza regul�r� izteiksme &quot;{0}&quot;."
@@ -9494,7 +10635,7 @@ msgstr "Trūkst datuma."
 msgid "Missing file name."
 msgstr "Trūkst faila nosaukuma."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Trūkst nosaukuma."
 
@@ -9518,15 +10659,19 @@ msgstr "Jums j�nosauc šis filtrs."
 msgid "You must specify a file name."
 msgstr "Jums ir j�nor�da faila nosaukums."
 
-#: ../filter/filter.ui.h:1
+#: ../filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>_Filtra k�rtulas</b>"
+
+#: ../filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Salīdzin�t ar"
 
-#: ../filter/filter.ui.h:3
+#: ../filter/filter.glade.h:4
 msgid "Show filters for mail:"
 msgstr "R�dīt e-pasta filtrus:"
 
-#: ../filter/filter.ui.h:4
+#: ../filter/filter.glade.h:5
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -9534,7 +10679,7 @@ msgstr ""
 "Vēstules datums tiks salīdzin�ts ar\n"
 "plkst. 00:00 nor�dītaj� datum�."
 
-#: ../filter/filter.ui.h:6
+#: ../filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -9542,7 +10687,7 @@ msgstr ""
 "Vēstules datums tiks salīdzin�ts ar\n"
 "relatīvo laiku, kad notiks filtrēšana."
 
-#: ../filter/filter.ui.h:8
+#: ../filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -9550,928 +10695,251 @@ msgstr ""
 "Vēstules datums tiks salīdzin�ts ar\n"
 "pašreizējo laiku, kad notiks filtrēšana."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
-msgid "_Filter Rules"
-msgstr "_Filtra k�rtulas"
-
-#: ../filter/filter.ui.h:12
-#| msgid ""
-#| "the current time\n"
-#| "the time you specify\n"
-#| "a time relative to the current time"
-msgid "a time relative to the current time"
-msgstr "laiks attiecīb� pret pašreizējo laiku"
-
-#: ../filter/filter.ui.h:13
-#| msgid "Tag"
-msgid "ago"
-msgstr "pirms"
-
-#: ../filter/filter.ui.h:16
-#| msgid ""
-#| "ago\n"
-#| "in the future"
-msgid "in the future"
-msgstr "pēc"
-
-#: ../filter/filter.ui.h:18
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-msgid "months"
-msgstr "mēneši"
-
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
-msgid "seconds"
-msgstr "sekundes"
-
-#: ../filter/filter.ui.h:20
-msgid "the current time"
-msgstr "pašreizējais laiks"
-
-#: ../filter/filter.ui.h:21
-msgid "the time you specify"
-msgstr "laiks, kuru jūs nor�diet"
-
-#: ../filter/filter.ui.h:23
-msgid "years"
-msgstr "gadi"
-
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Pielikums"
-msgstr[1] "Pielikumi"
-msgstr[2] "Pielikumi"
-
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
-msgid "Icon View"
-msgstr "Ikonu skats"
-
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
-msgid "List View"
-msgstr "Sarakstu skats"
-
-#: ../mail/e-mail-browser.c:771 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Fokusa sekot�js"
-
-#: ../mail/e-mail-browser.c:781
-#| msgid "Selection Mode"
-msgid "Shell Module"
-msgstr "Čaulas režīms"
-
-#: ../mail/e-mail-browser.c:782 ../mail/message-list.c:2580
-msgid "The mail shell backend"
-msgstr "Pasta �aulas aizmugure"
-
-#: ../mail/e-mail-browser.c:792
-#| msgid "Deleted"
-msgid "Show Deleted"
-msgstr "R�dīt dzēst�s"
-
-#: ../mail/e-mail-browser.c:793
-#| msgid "Forwarded messages"
-msgid "Show deleted messages"
-msgstr "R�dīt dzēst�s vēstules"
-
-#: ../mail/e-mail-display.c:66
-#| msgid "_Add to Address Book"
-msgid "_Add to Address Book..."
-msgstr "Pievienot _adrešu gr�matai..."
-
-#: ../mail/e-mail-display.c:73
-#| msgid "_To this Address"
-msgid "_To This Address"
-msgstr "_Uz Å¡o adresi"
-
-#: ../mail/e-mail-display.c:80
-#| msgid "_From this Address"
-msgid "_From This Address"
-msgstr "_No Å¡Ä«s adreses"
-
-#: ../mail/e-mail-display.c:89
-#| msgid "Create _Search Folder"
-msgid "Create Search _Folder"
-msgstr "Izveidot meklēšana_s mapi"
-
-#: ../mail/e-mail-label-dialog.c:220
-#| msgid "Label _Name:"
-msgid "_Label name:"
-msgstr "EtiÄ·etes _nosaukums:"
-
-#: ../mail/e-mail-label-list-store.c:41
-msgid "I_mportant"
-msgstr "_Svarīgs"
-
-#. red
-#: ../mail/e-mail-label-list-store.c:42
-msgid "_Work"
-msgstr "_Darbs"
-
-#. orange
-#: ../mail/e-mail-label-list-store.c:43
-msgid "_Personal"
-msgstr "_Personisks"
-
-#. green
-#: ../mail/e-mail-label-list-store.c:44
-msgid "_To Do"
-msgstr "_Dar�mais"
-
-#. blue
-#: ../mail/e-mail-label-list-store.c:45
-msgid "_Later"
-msgstr "Vē_l�k"
-
-#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:519
-msgid "Add Label"
-msgstr "Pievienot etiÄ·eti"
-
-#: ../mail/e-mail-label-manager.c:216
-msgid "Edit Label"
-msgstr "Rediģēt etiķeti"
-
-#: ../mail/e-mail-label-manager.c:349
-#| msgid ""
-#| "Note: Underscore in the label name is used as mnemonic identifier in menu."
+#: ../filter/filter.glade.h:12
+#| msgid "in the future"
 msgid ""
-"Note: Underscore in the label name is used\n"
-"as mnemonic identifier in menu."
+"ago\n"
+"in the future"
 msgstr ""
-"Piezīme: apakšsvītra etiķešu nosaukumos tiek izmantota \n"
-"k� mnemoniskais identifikators izvēlnē."
-
-#: ../mail/e-mail-label-tree-view.c:86
-msgid "Color"
-msgstr "Kr�sa"
+"pirms\n"
+"pēc"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2671
-#: ../modules/mail/e-mail-shell-view-private.c:964
-msgid "Inbox"
-msgstr "Iesūtne"
-
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
-msgid "Drafts"
-msgstr "Melnraksti"
-
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
-msgid "Outbox"
-msgstr "Izsūtne"
-
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
-msgid "Sent"
-msgstr "Nosūtīt�s"
-
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
-msgid "Templates"
-msgstr "Veidnes"
-
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Svarīgs"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "Izdarīt"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Vēl�k"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
-msgid "Migrating..."
-msgstr "P�rnes..."
-
-#: ../mail/e-mail-migrate.c:1143
-msgid "Migration"
-msgstr "Migr�cija"
-
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
-#, c-format
-msgid "Migrating '%s':"
-msgstr "P�rnes '%s':"
-
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Nevar izveidot jaunu mapi `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Nevar nokopēt mapi `%s' uz `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Nevar sameklēt eksistējošas pastkastītes iekš `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2932
-msgid "Migrating Folders"
-msgstr "P�rceļ mapes"
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
+"sekundēm\n"
+"minūtēm\n"
+"stund�m\n"
+"dien�m\n"
+"nedēļ�m\n"
+"mēnešiem\n"
+"gadiem"
 
-#: ../mail/e-mail-migrate.c:1824
+#: ../filter/filter.glade.h:21
+#| msgid "a time relative to the current time"
 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..."
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
 msgstr ""
-"Atrašan�s vieta un hierarhija Evolution pastkaste ir mainījusies kopš "
-"Evolution 1.x\n"
-"\n"
-"Lūdzu, uzgaidiet kamēr Evolution p�rceļ tavas mapes..."
+"pašreizējais laiks\n"
+"nor�dītais laiks\n"
+"laiks attiecīb� pret pašreizējo"
 
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Neizdev�s atvērt vec� POP servera datus `%s': %s"
+#: ../filter/rule-editor.c:381
+msgid "Add Rule"
+msgstr "Pievienot k�rtulu"
 
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Neizdev�s atvērt POP3 datu mapi `%s': %s"
+#: ../filter/rule-editor.c:462
+msgid "Edit Rule"
+msgstr "Rediģēt k�rtulu"
 
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Neizdev�s nokopēt POP3 servera datus `%s': %s"
+#: ../filter/rule-editor.c:808
+msgid "Rule name"
+msgstr "K�rtulas nosaukums"
 
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Neizdev�s izveidot lok�lo pasta glab�tuvi `%s': %s"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Redaktora iestatījumi"
 
-#: ../mail/e-mail-migrate.c:2933
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
+"Configure mail preferences, including security and message display, here"
 msgstr ""
-"Evolution pastkastīšu kopsavilkuma form�ts ir p�rcelts uz SQLite kopš  "
-"Evolution 2.24\n"
-"\n"
-"Lūdzu, uzgaidiet kamēr Evolution p�rceļ tavas mapes..."
+"Konfigurējiet pasta iestatījumus, ieskaitot drošību un vēstuļu attēlošanu "
+"Å¡eit"
 
-#: ../mail/e-mail-migrate.c:3030
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Neizdev�s izveidot lok�l� pasta mapes iekš `%s': %s"
-
-#: ../mail/e-mail-migrate.c:3048
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
-"Nevar nolasīt iestatījumus no iepriekšēj�s Evolution instal�cijas, "
-"`evolution/config.xmldb' vairs neeksistē vai ir boj�ts."
-
-#. XXX e-error should provide a widget layout and API suitable
-#. *     for packing additional widgets to the right of the alert
-#. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:107
-#: ../modules/calendar/e-task-shell-view-actions.c:559
-#| msgid "Do not ask me again."
-msgid "Do not ask me again"
-msgstr "Vairs man neprasīt"
-
-#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "Kopēt uz mapi"
-
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
-msgid "C_opy"
-msgstr "K_opēt"
-
-#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
-msgid "Move to Folder"
-msgstr "P�rvietot uz mapi"
-
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
-msgid "_Move"
-msgstr "_P�rvietot"
-
-#: ../mail/e-mail-reader.c:864
-#| msgid "_Save Message"
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "Saglab�t vēstuli"
-msgstr[1] "Saglab�t vēstules"
-msgstr[2] "Saglab�t vēstules"
-
-#. Translators: This is a part of a suggested file name
-#. * used when saving a message or multiple messages to an
-#. * mbox format, when the first message doesn't have a
-#. * Subject. The extension ".mbox" is appended to this
-#. * string, thus it will be something like "Message.mbox"
-#. * at the end.
-#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
-#| msgid "Message"
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "VÄ“stule"
-msgstr[1] "VÄ“stules"
-msgstr[2] "Vēstuļu"
-
-#: ../mail/e-mail-reader.c:1143
-msgid "A_dd Sender to Address Book"
-msgstr "Pievienot sūtīt�ju a_drešu gr�matai"
-
-#: ../mail/e-mail-reader.c:1145
-#| msgid "Add Sender to Address Book"
-msgid "Add sender to address book"
-msgstr "Pievienot sūtīt�ju adrešu gr�matai"
-
-#: ../mail/e-mail-reader.c:1150
-msgid "Check for _Junk"
-msgstr "P�rbaudīt, vai ir _mēstules"
-
-#: ../mail/e-mail-reader.c:1152
-msgid "Filter the selected messages for junk status"
-msgstr "Filtrēt izvēlētos ziņojumus pēc mēstules statusa"
-
-#: ../mail/e-mail-reader.c:1157
-msgid "_Copy to Folder..."
-msgstr "_Kopēt uz mapi..."
-
-#: ../mail/e-mail-reader.c:1159
-msgid "Copy selected messages to another folder"
-msgstr "Kopēt izvēlēt�s vēstules uz citu mapi"
-
-#: ../mail/e-mail-reader.c:1164
-msgid "_Delete Message"
-msgstr "_Dzēst vēstuli"
-
-#: ../mail/e-mail-reader.c:1166
-msgid "Mark the selected messages for deletion"
-msgstr "Atzīmēt izvēlēt�s vēstules dzēšanai"
-
-#: ../mail/e-mail-reader.c:1171
-msgid "Filter on Mailing _List..."
-msgstr "Fi_ltrs uz adres�tu sarakstu..."
-
-#: ../mail/e-mail-reader.c:1173
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Izveidot k�rtulu, lai filtrētu vēstules šim adres�tu sarakstam"
-
-#: ../mail/e-mail-reader.c:1178
-msgid "Filter on _Recipients..."
-msgstr "Filtrs uz _adres�tiem..."
-
-#: ../mail/e-mail-reader.c:1180
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Izveidot k�rtulu, lai filtrētu vēstules šiem adres�tiem"
-
-#: ../mail/e-mail-reader.c:1185
-msgid "Filter on Se_nder..."
-msgstr "Filtrs _uz sūtīt�ju..."
-
-#: ../mail/e-mail-reader.c:1187
-msgid "Create a rule to filter messages from this sender"
-msgstr "Izveidot k�rtulu, lai filtrētu vēstules no šī saņēmēja"
-
-#: ../mail/e-mail-reader.c:1192
-msgid "Filter on _Subject..."
-msgstr "Filtr_s uz tematu..."
-
-#: ../mail/e-mail-reader.c:1194
-msgid "Create a rule to filter messages with this subject"
-msgstr "Izveidot filtra k�rtulu vēstulēm ar š�du tematu"
-
-#: ../mail/e-mail-reader.c:1199
-msgid "A_pply Filters"
-msgstr "_Pielietot filtrus"
-
-#: ../mail/e-mail-reader.c:1201
-msgid "Apply filter rules to the selected messages"
-msgstr "Attiecin�t filtru k�rtulas uz izvēlētaj�m vēstulēm"
-
-#: ../mail/e-mail-reader.c:1206
-msgid "_Find in Message..."
-msgstr "_Meklēt vēstulē..."
-
-#: ../mail/e-mail-reader.c:1208
-msgid "Search for text in the body of the displayed message"
-msgstr "Meklēt tekstu attēlot�s vēstules ķermenī"
-
-#: ../mail/e-mail-reader.c:1213
-msgid "_Clear Flag"
-msgstr "_Noņemt atzīmi"
-
-#: ../mail/e-mail-reader.c:1215
-#| msgid "Create a new task from the selected message"
-msgid "Remove the follow-up flag from the selected messages"
-msgstr "Izņemt sekojuma atzīmi no izvēlēt�s vēstules"
-
-#: ../mail/e-mail-reader.c:1220
-msgid "_Flag Completed"
-msgstr "_Atzīme veikta"
-
-#: ../mail/e-mail-reader.c:1222
-#| msgid "Select all messages in the same thread as the selected message"
-msgid "Set the follow-up flag to completed on the selected messages"
-msgstr "Iestatīt sekojuma atzīmi uz \"izpildīts\" izvēlētaj�m vēstulēm"
+"Konfigurējiet pareizrakstības p�rbaudi, parakstus un vēstuļu redaktoru šeit"
 
-#: ../mail/e-mail-reader.c:1227
-msgid "Follow _Up..."
-msgstr "Se_kojums..."
-
-#: ../mail/e-mail-reader.c:1229
-#| msgid "Flag selected messages for follow-up"
-msgid "Flag the selected messages for follow-up"
-msgstr "Atzīmēt izvēlēt�s vēstules sekojumam"
-
-#: ../mail/e-mail-reader.c:1234
-msgid "_Attached"
-msgstr "_Pievienots"
-
-#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
-msgid "Forward the selected message to someone as an attachment"
-msgstr "P�rsūtīt izvēlēto vēstuli k�dam k� pielikumu"
-
-#: ../mail/e-mail-reader.c:1241
-#| msgid "_Forward as iCalendar"
-msgid "Forward As _Attached"
-msgstr "_P�rsūtīt k� pielikumu"
-
-#: ../mail/e-mail-reader.c:1248
-msgid "_Inline"
-msgstr "_Iekļauts"
-
-#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
-msgid "Forward the selected message in the body of a new message"
-msgstr "P�rsūtīt izvēlēto vēstuli jaunas vēstules ķermenī"
-
-#: ../mail/e-mail-reader.c:1255
-#| msgid "_Forward style:"
-msgid "Forward As _Inline"
-msgstr "P�rsūtīt _iekļautu"
-
-#: ../mail/e-mail-reader.c:1262
-msgid "_Quoted"
-msgstr "_Citēts"
-
-#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
-msgid "Forward the selected message quoted like a reply"
-msgstr "P�rsūtīt izvēlēto vēstuli citētu k� atbildi"
-
-#: ../mail/e-mail-reader.c:1269
-#| msgid "_Forward style:"
-msgid "Forward As _Quoted"
-msgstr "P�rsūtīt k� _cit�tu"
-
-#: ../mail/e-mail-reader.c:1276
-msgid "_Load Images"
-msgstr "Ie_l�dēt attēlus"
-
-#: ../mail/e-mail-reader.c:1278
-msgid "Force images in HTML mail to be loaded"
-msgstr "Piespiest iel�dēt attēlus HTML past�"
-
-#: ../mail/e-mail-reader.c:1283
-msgid "_Important"
-msgstr "_Svarīgs"
-
-#: ../mail/e-mail-reader.c:1285
-msgid "Mark the selected messages as important"
-msgstr "Atzīmēt izvēlēt�s vēstules k� svarīgas"
-
-#: ../mail/e-mail-reader.c:1290
-msgid "_Junk"
-msgstr "_MÄ“stule"
-
-#: ../mail/e-mail-reader.c:1292
-msgid "Mark the selected messages as junk"
-msgstr "Atzīmēt izvēlēt�s vēstules k� mēstules"
-
-#: ../mail/e-mail-reader.c:1297
-msgid "_Not Junk"
-msgstr "_Nav mēstule"
-
-#: ../mail/e-mail-reader.c:1299
-msgid "Mark the selected messages as not being junk"
-msgstr "Atzīmēt izvēlēt�s vēstules k� ne mēstules"
-
-#: ../mail/e-mail-reader.c:1304
-msgid "_Read"
-msgstr "_Lasīt"
-
-#: ../mail/e-mail-reader.c:1306
-msgid "Mark the selected messages as having been read"
-msgstr "Atzīmēt izvēlēt�s vēstules k� lasītas"
-
-#: ../mail/e-mail-reader.c:1311
-msgid "Uni_mportant"
-msgstr "Nes_varīgs"
-
-#: ../mail/e-mail-reader.c:1313
-msgid "Mark the selected messages as unimportant"
-msgstr "Atzīmēt izvēlēt�s vēstules k� nesvarīgas"
-
-#: ../mail/e-mail-reader.c:1318
-msgid "_Unread"
-msgstr "_Nelasīts"
-
-#: ../mail/e-mail-reader.c:1320
-msgid "Mark the selected messages as not having been read"
-msgstr "Atzīmēt izvēlēt�s vēstules k� nelasītas"
-
-#: ../mail/e-mail-reader.c:1325
-msgid "_Edit as New Message..."
-msgstr "R_ediģēt k� jaunu ziņojumu..."
-
-#: ../mail/e-mail-reader.c:1327
-msgid "Open the selected messages in the composer for editing"
-msgstr "Atvērt izvēlēt�s vēstules sacerēt�j� rediģēšanai"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Konfigurējiet savus e-pasta kontus šeit"
 
-#: ../mail/e-mail-reader.c:1332
-msgid "Compose _New Message"
-msgstr "Sacerēt jau_nu vēstuli"
-
-#: ../mail/e-mail-reader.c:1334
-msgid "Open a window for composing a mail message"
-msgstr "Atvērt logu, lai sacerētu vēstuli"
-
-#: ../mail/e-mail-reader.c:1339
-msgid "_Open in New Window"
-msgstr "Atvērt jaun� l_og�"
-
-#: ../mail/e-mail-reader.c:1341
-msgid "Open the selected messages in a new window"
-msgstr "Atvērt izvēlēt�s vēstules jaun� log�"
-
-#: ../mail/e-mail-reader.c:1346
-msgid "_Move to Folder..."
-msgstr "P�rvietot uz _mapi..."
-
-#: ../mail/e-mail-reader.c:1348
-msgid "Move selected messages to another folder"
-msgstr "P�rvietot izvēlēt�s vēstules uz citu mapi"
-
-#: ../mail/e-mail-reader.c:1353
-msgid "_Next Message"
-msgstr "_N�kam� vēstule"
-
-#: ../mail/e-mail-reader.c:1355
-msgid "Display the next message"
-msgstr "Par�dīt n�kamo vēstuli"
-
-#: ../mail/e-mail-reader.c:1360
-msgid "Next _Important Message"
-msgstr "N�kam� _svarīg� vēstule"
-
-#: ../mail/e-mail-reader.c:1362
-msgid "Display the next important message"
-msgstr "Par�dīt n�kamo svarīgo vēstuli"
-
-#: ../mail/e-mail-reader.c:1367
-msgid "Next _Thread"
-msgstr "N�kamais _pavediens"
-
-#: ../mail/e-mail-reader.c:1369
-msgid "Display the next thread"
-msgstr "Attēlot n�kamo pavedienu"
-
-#: ../mail/e-mail-reader.c:1374
-msgid "Next _Unread Message"
-msgstr "N�kam� _neizlasīt� vēstule"
-
-#: ../mail/e-mail-reader.c:1376
-msgid "Display the next unread message"
-msgstr "Par�dīt n�kamo neizlasīto vēstuli"
-
-#: ../mail/e-mail-reader.c:1381
-msgid "_Previous Message"
-msgstr "Ie_priekšēj� vēstule"
-
-#: ../mail/e-mail-reader.c:1383
-msgid "Display the previous message"
-msgstr "Par�dīt iepriekšējo vēstuli"
-
-#: ../mail/e-mail-reader.c:1388
-msgid "Pr_evious Important Message"
-msgstr "I_epriekšēj� svarīg� vēstule"
-
-#: ../mail/e-mail-reader.c:1390
-msgid "Display the previous important message"
-msgstr "Par�dīt iepriekšējo svarīgo vēstuli"
-
-#: ../mail/e-mail-reader.c:1395
-msgid "P_revious Unread Message"
-msgstr "Iep_riekšēj� neizlasīt� vēstule"
-
-#: ../mail/e-mail-reader.c:1397
-msgid "Display the previous unread message"
-msgstr "Par�dīt iepriekšējo neizlasīto vēstuli"
-
-#: ../mail/e-mail-reader.c:1404
-msgid "Print this message"
-msgstr "Druk�t šo vēstuli"
-
-#: ../mail/e-mail-reader.c:1411
-msgid "Preview the message to be printed"
-msgstr "Priekšskatīt vēstuli pirms druk�šanas"
-
-#: ../mail/e-mail-reader.c:1416
-msgid "Re_direct"
-msgstr "P�ra_dresēt"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+#| msgid "Configure your email accounts here"
+msgid "Configure your network connection settings here"
+msgstr "Konfigurējiet savus tīkla savienojumu iestatījumus šeit"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution pasts"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution pasta kontu konfigur�cijas vadīkla"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution pasta komponente"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution pasta redaktors"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution pasta redaktora konfigur�cijas vadīkla"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution pasta iestatījumu vadīkla"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#| msgid "Evolution Calendar configuration control"
+msgid "Evolution Network configuration control"
+msgstr "Evolution tīkla konfigur�cijas vadīkla"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:793
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+msgid "Mail"
+msgstr "Pasts"
 
-#: ../mail/e-mail-reader.c:1418
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "P�radresēt izvēlēto vēstuli k�dam"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:490
+msgid "Mail Accounts"
+msgstr "Pasta konti"
 
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
-msgid "Reply to _All"
-msgstr "_Atbildēt visiem"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:108
+msgid "Mail Preferences"
+msgstr "Pasta iestatījumi"
 
-#: ../mail/e-mail-reader.c:1425
-#| msgid "Compose a reply to all of the recipients of the selected message"
-msgid "Compose a reply to all the recipients of the selected message"
-msgstr "Sacerēt atbildi visiem izvēlēt�s vēstules adres�tiem"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+#| msgid "Composer Preferences"
+msgid "Network Preferences"
+msgstr "Tīkla iestatījumi"
 
-#: ../mail/e-mail-reader.c:1430
-msgid "Reply to _List"
-msgstr "Atbi_ldēt uz sarakstu"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+#: ../plugins/pst-import/pst-importer.c:297
+msgid "_Mail"
+msgstr "_Pasts"
 
-#: ../mail/e-mail-reader.c:1432
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Sacerēt atbildi uz izvēlēt�s vēstules adres�tu sarakstu"
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:503 ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "_P�rsūtīt"
 
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Reply to Sender"
 msgstr "_Atbildēt sūtīt�jam"
 
-#: ../mail/e-mail-reader.c:1439
-msgid "Compose a reply to the sender of the selected message"
-msgstr "Sacerēt atbildi izvēlēt�s vēstules sūtīt�jam"
-
-#: ../mail/e-mail-reader.c:1444
-#| msgid "Save as..."
-msgid "_Save as mbox..."
-msgstr "_Saglab�t k� mbox..."
-
-#: ../mail/e-mail-reader.c:1446
-#| msgid "Save the selected messages as a text file"
-msgid "Save selected messages as an mbox file"
-msgstr "Saglab�t izvēlētas vēstules k� mbox failu"
-
-#: ../mail/e-mail-reader.c:1451
-msgid "Search Folder from Mailing _List..."
-msgstr "Mek_lēšanas mape no adres�tu saraksta..."
-
-#: ../mail/e-mail-reader.c:1453
-#| msgid "Create a Search Folder for this mailing list"
-msgid "Create a search folder for this mailing list"
-msgstr "Izveidot meklēšanas mapi šim adres�tu sarakstam"
-
-#: ../mail/e-mail-reader.c:1458
-msgid "Search Folder from Recipien_ts..."
-msgstr "Meklēšanas mape no adres�_tiem..."
-
-#: ../mail/e-mail-reader.c:1460
-#| msgid "Create a Search Folder for these recipients"
-msgid "Create a search folder for these recipients"
-msgstr "Izveidot meklēšanas mapi šiem saņēmējiem"
-
-#: ../mail/e-mail-reader.c:1465
-msgid "Search Folder from Sen_der..."
-msgstr "Meklēšanas mape no sū_tīt�jia..."
-
-#: ../mail/e-mail-reader.c:1467
-#| msgid "Create a Search Folder for this sender"
-msgid "Create a search folder for this sender"
-msgstr "Izveidot meklēšanas mapi šim sūtīt�jam"
-
-#: ../mail/e-mail-reader.c:1472
-msgid "Search Folder from S_ubject..."
-msgstr "Meklēšanas mape no t_emata..."
-
-#: ../mail/e-mail-reader.c:1474
-#| msgid "Create a Search Folder for this subject"
-msgid "Create a search folder for this subject"
-msgstr "Izveidot meklēšanas mapi šim tematam"
-
-#: ../mail/e-mail-reader.c:1479
-msgid "_Message Source"
-msgstr "_VÄ“stules avots"
-
-#: ../mail/e-mail-reader.c:1481
-msgid "Show the raw email source of the message"
-msgstr "R�dīt vēstules pirmkodu"
-
-#: ../mail/e-mail-reader.c:1493
-msgid "_Undelete Message"
-msgstr "_Atjaunot vēstuli"
-
-#: ../mail/e-mail-reader.c:1495
-msgid "Undelete the selected messages"
-msgstr "Atjaunot izvēlēt�s vēstules"
-
-#: ../mail/e-mail-reader.c:1500
-msgid "_Normal Size"
-msgstr "_Norm�ls izmērs"
-
-#: ../mail/e-mail-reader.c:1502
-msgid "Reset the text to its original size"
-msgstr "Atjaunot tekstu s�kotnēj� izmēr�"
-
-#: ../mail/e-mail-reader.c:1507
-msgid "_Zoom In"
-msgstr "_Tuvin�t"
-
-#: ../mail/e-mail-reader.c:1509
-msgid "Increase the text size"
-msgstr "Palielin�t teksta izmēru"
-
-#: ../mail/e-mail-reader.c:1514
-msgid "Zoom _Out"
-msgstr "T�_lin�t"
-
-#: ../mail/e-mail-reader.c:1516
-msgid "Decrease the text size"
-msgstr "Samazin�t teksta izmēru"
-
-#: ../mail/e-mail-reader.c:1523
-msgid "Create R_ule"
-msgstr "Izveidot k�rt_ulu"
-
-#: ../mail/e-mail-reader.c:1530
-msgid "Ch_aracter Encoding"
-msgstr "R_akstzīmju kodējums"
-
-#: ../mail/e-mail-reader.c:1537
-#| msgid "F_orward As..."
-msgid "F_orward As"
-msgstr "P�_rsūtīt k�"
-
-#: ../mail/e-mail-reader.c:1544
-msgid "_Go To"
-msgstr "_Iet uz"
-
-#: ../mail/e-mail-reader.c:1551
-#| msgid "Mar_k as"
-msgid "Mar_k As"
-msgstr "Atzīmēt _k�"
-
-#: ../mail/e-mail-reader.c:1558
-msgid "_Message"
-msgstr "_VÄ“stule"
-
-#: ../mail/e-mail-reader.c:1565
-msgid "_Zoom"
-msgstr "_T�lummaiņa"
-
-#: ../mail/e-mail-reader.c:1590
-msgid "Mark for Follo_w Up..."
-msgstr "Atzīmēt sekojumam..."
-
-#: ../mail/e-mail-reader.c:1598
-msgid "Mark as _Important"
-msgstr "Atzīmēt k� _svarīgu"
-
-#: ../mail/e-mail-reader.c:1602
-msgid "Mark as _Junk"
-msgstr "Atzīmēt k� _mēstuli"
-
-#: ../mail/e-mail-reader.c:1606
-msgid "Mark as _Not Junk"
-msgstr "Atzīmēt k� _ne mēstuli"
-
-#: ../mail/e-mail-reader.c:1610
-msgid "Mar_k as Read"
-msgstr "Atzīmēt _k� lasītu"
-
-#: ../mail/e-mail-reader.c:1614
-#| msgid "Mark as Un_important"
-msgid "Mark as Uni_mportant"
-msgstr "Atzīmēt k� _mazsvarīgu"
-
-#: ../mail/e-mail-reader.c:1618
-msgid "Mark as _Unread"
-msgstr "Atzīmēt k� _nelasītu"
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
+#, c-format
+#| msgid "Attached message"
+#| msgid_plural "%d attached messages"
+msgid "%d attached messages"
+msgstr "Pievienoti %d ziņojumi"
 
-#: ../mail/e-mail-reader.c:1654
-msgid "_Caret Mode"
-msgstr "_Caret režīms"
+#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:1642
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+#| msgid "Attachment"
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Pielikums"
+msgstr[1] "Pielikumi"
+msgstr[2] "Pielikumi"
 
-#: ../mail/e-mail-reader.c:1656
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Attēlot mirgojošu kursoru attēloto vēstuļu ķermenī"
+#: ../mail/e-mail-attachment-bar.c:614
+#: ../widgets/misc/e-attachment-paned.c:607
+#| msgid "Month View"
+msgid "Icon View"
+msgstr "Ikonu skats"
 
-#: ../mail/e-mail-reader.c:1662
-msgid "All Message _Headers"
-msgstr "Visu ziņojumu _galvas"
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:608
+#| msgid "_List View"
+msgid "List View"
+msgstr "Sarakstu skats"
 
-#: ../mail/e-mail-reader.c:1664
-msgid "Show messages with all email headers"
-msgstr "R�dīt vēstules ar vis�m e-pasta galv�m"
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "Atbilstības: %d"
 
-#: ../mail/e-mail-reader.c:1897
-msgid "Unable to retrieve message"
-msgstr "Nevar saņemt vēstuli"
+#: ../mail/e-mail-search-bar.c:520
+#| msgid "Close this window"
+msgid "Close the find bar"
+msgstr "Aizvērt meklēšanas joslu"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
-#, c-format
-#| msgid "Retrieving message %s"
-msgid "Retrieving message '%s'"
-msgstr "Saņem vēstuli '%s'"
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "_Meklēt:"
 
-#. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2471
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
-#: ../widgets/misc/e-account-tree-view.c:234
-msgid "Default"
-msgstr "Noklusētais"
+#: ../mail/e-mail-search-bar.c:540
+#| msgid "Always search"
+msgid "Clear the search"
+msgstr "Attīrīt meklēšanu"
 
-#: ../mail/e-mail-reader.c:2592
-#: ../modules/mail/e-mail-attachment-handler.c:134
-msgid "_Forward"
-msgstr "_P�rsūtīt"
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "Ie_priekšējais"
 
-#: ../mail/e-mail-reader.c:2593
-msgid "Forward the selected message to someone"
-msgstr "P�rsūtīt izvēlēto vēstuli k�dam"
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr "Iet uz iepriekšējo meklēšanas rezult�tu"
 
-#: ../mail/e-mail-reader.c:2637 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
-msgid "Delete"
-msgstr "Dzēst"
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "_N�kamais"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
-#: ../widgets/misc/e-calendar.c:193
-msgid "Next"
-msgstr "N�kamais"
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr "Iet uz n�kamo meklēšanas rezult�tu"
 
-#: ../mail/e-mail-reader.c:2645
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
-#: ../widgets/misc/e-calendar.c:169
-msgid "Previous"
-msgstr "Iepriekšējais"
+#: ../mail/e-mail-search-bar.c:587
+#| msgid "M_atch case"
+msgid "Mat_ch case"
+msgstr "Reģis_trjutīgs"
 
-#: ../mail/e-mail-reader.c:2649 ../mail/mail-dialogs.ui.h:18
-msgid "Reply"
-msgstr "Atbildēt"
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr "Sasniedza lapas beigas, turpina no s�kuma"
 
-#: ../mail/e-mail-tag-editor.c:292
-msgid "Flag to Follow Up"
-msgstr "Karogs sekojumam"
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr "Sasniedza lapas s�kumu, turpina no beig�m"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:315
 msgid "No encryption"
 msgstr "Bez šifrēšanas"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:319
 msgid "TLS encryption"
 msgstr "TLS šifrēšana"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:323
 msgid "SSL encryption"
 msgstr "SSL šifrēšana"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:414
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s licences vienošan�s"
 
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:421
 #, c-format
 msgid ""
 "\n"
@@ -10484,169 +10952,123 @@ msgstr ""
 "%s licences vienošanos\n"
 "un atķeksējiet rūtiņu, ja piekrītiet tiem\n"
 
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
-#| msgid "None"
-msgctxt "mail-signature"
-msgid "None"
-msgstr "Nekas"
+#: ../mail/em-account-editor.c:493 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-vfolder-rule.c:513
+msgid "Select Folder"
+msgstr "Izvēlēties mapi"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:803
 msgid "Never"
 msgstr "Nekad"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:804
 msgid "Always"
 msgstr "Vienmēr"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:805
 msgid "Ask for each message"
 msgstr "Jaut�t pēc katra paziņojuma"
 
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
-#| msgid "None"
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "Nekas"
-
-#: ../mail/em-account-editor.c:2061
-msgid "Mail Configuration"
-msgstr "Pasta konfigur�cija"
-
-#: ../mail/em-account-editor.c:2062
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"Laipni lūdzam Evolution pasta konfigur�cijas asistent�.\n"
-"\n"
-"Spiediet \"N�kamais\", lai s�ktu."
-
-#: ../mail/em-account-editor.c:2065
-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 ""
-"Lūdzu, ievadiet zem�k savu v�rdu un e-pasta adresi. \"Izvēles\" lauki var "
-"tikt neaizpildīti, ja vien nevēlaties iekļaut šo inform�ciju e-past�, kuru "
-"sūtat."
+#: ../mail/em-account-editor.c:1883 ../mail/mail-config.glade.h:100
+msgid "Identity"
+msgstr "Identit�te"
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:1934 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "Saņem e-pastu"
 
-#: ../mail/em-account-editor.c:2068
-msgid "Please configure the following account settings."
-msgstr "Lūdzu, konfigurējiet sekojošos konta iestatījumus."
-
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
-msgid "Sending Email"
-msgstr "SÅ«ta e-pastu"
-
-#: ../mail/em-account-editor.c:2071
-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 ""
-"Lūdzu, ievadiet inform�ciju par veidu, k�d� jūs sūtīsiet pastu. Ja jūs "
-"neesat p�rliecin�ti, prasiet sistēmu administratoram vai Internet servisa "
-"pieg�d�t�jam."
-
-#: ../mail/em-account-editor.c:2073
-msgid "Account Management"
-msgstr "Kontu p�rvaldība"
-
-#: ../mail/em-account-editor.c:2074
-#| msgid ""
-#| "Please enter a descriptive name for this account in the space below. This "
-#| "name will be used for display purposes only."
-msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"Lūdzu, apakšēj� lauk� ierakstiet aprakstošu nosaukumu šim kontam.\n"
-"Šis nosaukums tiks lietots tikai attēlošanai."
-
-#: ../mail/em-account-editor.c:2078
-msgid "Done"
-msgstr "Izdarīts"
-
-#: ../mail/em-account-editor.c:2079
-#| 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."
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Apsveicu, jūsu pasta konfigurēšana ir pabeigta.\n"
-"\n"
-"Jūs tagad varat saņemt un sūtīt epastu, lietojot Evolution. \n"
-"\n"
-"Spiediet \"Pielietot\", lai saglab�tu iestatījumus."
-
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2222
 msgid "Check for _new messages every"
 msgstr "P�rbaudīt, vai nav jau_nas vēstules katras"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2230
+#| msgid "minutes"
 msgid "minu_tes"
 msgstr "minū_tes"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2426 ../mail/mail-config.glade.h:138
+msgid "Sending Email"
+msgstr "SÅ«ta e-pastu"
+
+#: ../mail/em-account-editor.c:2485 ../mail/mail-config.glade.h:73
+msgid "Defaults"
+msgstr "Noklusētie"
+
+#. Security settings
+#: ../mail/em-account-editor.c:2551 ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
 msgid "Security"
 msgstr "Drošība"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2588 ../mail/em-account-editor.c:2683
 msgid "Receiving Options"
 msgstr "Saņemšanas opcijas"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2589 ../mail/em-account-editor.c:2684
 msgid "Checking for New Messages"
 msgstr "P�rbauda, vai ir jaunas vēstules"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3155 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontu redaktors"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3155 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontu asistents"
 
-#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
-#, c-format
-msgid "Your message to %s about \"%s\" on %s has been read."
-msgstr "Jūsu vēstule adres�tam %s par \"%s\" %s ir izlasīta."
+#. translators: default account indicator
+#: ../mail/em-account-prefs.c:426
+msgid "[Default]"
+msgstr "[Noklusētais]"
 
-#. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
-#, c-format
-#| msgid "Mail Notification Properties"
-msgid "Delivery Notification for: \"%s\""
-msgstr "Pieg�des paziņojums tematam \"%s\""
+#: ../mail/em-account-prefs.c:483
+msgid "Account name"
+msgstr "Konta nosaukums"
+
+#: ../mail/em-account-prefs.c:485
+msgid "Protocol"
+msgstr "Protokols"
+
+#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
+msgid "Unnamed"
+msgstr "Nenosaukts"
+
+#: ../mail/em-composer-prefs.c:961
+msgid "Language(s)"
+msgstr "Valoda(-s)"
+
+#: ../mail/em-composer-prefs.c:994
+msgid "Add signature script"
+msgstr "Pievienot paraksta skriptu"
+
+#: ../mail/em-composer-prefs.c:1036
+msgid "Signature(s)"
+msgstr "Paraksts(-i)"
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1137 ../mail/em-format-quote.c:415
+msgid "-------- Forwarded Message --------"
+msgstr "--------P�rsūtīta vēstule----------"
+
+#: ../mail/em-composer-utils.c:1592
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "Nav nor�dīta mērķa adrese, vēstules p�rsūtīšana ir atcelta."
+
+#: ../mail/em-composer-utils.c:1598
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "Nav atrasts konts, kuru izmantot, vēstules p�rsūtīšana ir atcelta."
+
+#: ../mail/em-composer-utils.c:2065
 msgid "an unknown sender"
 msgstr "nezin�ms sūtīt�js"
 
 #. 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:1997
+#: ../mail/em-composer-utils.c:2112
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10654,21 +11076,13 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} rakstīja:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2255
 msgid "-----Original Message-----"
 msgstr "--------P�rsūtīta vēstule----------"
 
-#: ../mail/em-composer-utils.c:2322
-msgid "Posting destination"
-msgstr "Novietošanas mērķis"
-
-#: ../mail/em-composer-utils.c:2323
-msgid "Choose folders to post the message to."
-msgstr "Izvēlieties mapi, kur novietot ziņojumu."
-
-#: ../mail/em-filter-folder-element.c:258
-msgid "Select Folder"
-msgstr "Izvēlēties mapi"
+#: ../mail/em-filter-editor.c:172
+msgid "_Filter Rules"
+msgstr "_Filtra k�rtulas"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -10688,9 +11102,14 @@ msgid "Beep"
 msgstr "PÄ«kstiens"
 
 #: ../mail/em-filter-i18n.h:9
+#| msgid "Completed "
 msgid "Completed On"
 msgstr "Izpildīts"
 
+#: ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "Kopēt uz mapi"
+
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Saņemšanas datums"
@@ -10699,6 +11118,14 @@ msgstr "Saņemšanas datums"
 msgid "Date sent"
 msgstr "Nosūtīšanas datums"
 
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:765
+#: ../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 "Dzēst"
+
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Dzēsts"
@@ -10744,9 +11171,14 @@ msgid "Follow Up"
 msgstr "Sekojums"
 
 #: ../mail/em-filter-i18n.h:29
+#| msgid "Forward"
 msgid "Forward to"
 msgstr "P�rsūtīt"
 
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
+msgid "Important"
+msgstr "Svarīgs"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "ir pēc"
@@ -10764,14 +11196,17 @@ msgid "is not Flagged"
 msgstr "nav atzīmēts"
 
 #: ../mail/em-filter-i18n.h:39
+#| msgid "is not"
 msgid "is not set"
 msgstr "nav iestatīts"
 
 #: ../mail/em-filter-i18n.h:40
+#| msgid "is not"
 msgid "is set"
 msgstr "ir iestatīts"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "MÄ“stules"
 
@@ -10808,9 +11243,14 @@ msgid "Message is not Junk"
 msgstr "Vēstule nav mēstule"
 
 #: ../mail/em-filter-i18n.h:50
+#| msgid "Message contains"
 msgid "Message Location"
 msgstr "VÄ“stules vieta"
 
+#: ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "P�rvietot uz mapi"
+
 #: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Programmkanalēt uz programmu"
@@ -10819,8 +11259,8 @@ msgstr "Programmkanalēt uz programmu"
 msgid "Play Sound"
 msgstr "Atskaņot skaņu"
 
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#. Translators: "Read" as in "has been read" (message-tag-followup.c)
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "Lasīt"
 
@@ -10865,6 +11305,7 @@ msgid "Sender or Recipients"
 msgstr "Sūtīt�js vai saņēmēji"
 
 #: ../mail/em-filter-i18n.h:65
+#| msgid "Label"
 msgid "Set Label"
 msgstr "Iestatīt etiķeti"
 
@@ -10896,19 +11337,77 @@ msgstr "s�kas ar"
 msgid "Stop Processing"
 msgstr "Apturēt apstr�di"
 
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:935 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1112
+msgid "Subject"
+msgstr "Temats"
+
 #: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "Noņemt statusu"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:528
+#| msgid "Then By"
 msgid "Then"
 msgstr "Tad"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:559
+#| msgid "Add exception"
 msgid "Add Ac_tion"
 msgstr "Pievieno_t darbību"
 
+#: ../mail/em-folder-browser.c:194
+msgid "C_reate Search Folder From Search..."
+msgstr "_Izveidot meklējuma mapi no meklējuma..."
+
+#: ../mail/em-folder-browser.c:219
+msgid "All Messages"
+msgstr "Visas vēstules"
+
+#: ../mail/em-folder-browser.c:220
+msgid "Unread Messages"
+msgstr "Neizlasīt�s vēstules"
+
+#: ../mail/em-folder-browser.c:222
+msgid "No Label"
+msgstr "Bez marÄ·Ä“juma"
+
+#: ../mail/em-folder-browser.c:229
+msgid "Read Messages"
+msgstr "Lasīt�s vēstules"
+
+#: ../mail/em-folder-browser.c:230
+msgid "Recent Messages"
+msgstr "Nesen�s vēstules"
+
+#: ../mail/em-folder-browser.c:231
+msgid "Last 5 Days' Messages"
+msgstr "Pēdējo 5 dienu vēstules"
+
+#: ../mail/em-folder-browser.c:232
+msgid "Messages with Attachments"
+msgstr "VÄ“stules ar pielikumu"
+
+#: ../mail/em-folder-browser.c:233
+msgid "Important Messages"
+msgstr "Svarīg�s vēstules"
+
+#: ../mail/em-folder-browser.c:234
+msgid "Messages Not Junk"
+msgstr "Ne mēstules"
+
+#: ../mail/em-folder-browser.c:1194
+msgid "Account Search"
+msgstr "Kontu meklēšana"
+
+#: ../mail/em-folder-browser.c:1256
+msgid "All Account Search"
+msgstr "Visu kontu meklēšana"
+
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
@@ -10928,56 +11427,76 @@ msgstr[2] "Vēstules kop�:"
 
 #: ../mail/em-folder-properties.c:196
 #, c-format
+#| msgid "Total messages:"
+#| msgid_plural "Total messages:"
 msgid "Quota usage (%s):"
 msgstr "Kvotas izmantojums (%s):"
 
 #: ../mail/em-folder-properties.c:198
 #, c-format
+#| msgid "Total messages:"
+#| msgid_plural "Total messages:"
 msgid "Quota usage"
 msgstr "Kvotas izmantojums:"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2642 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:599
+msgid "Inbox"
+msgstr "Iesūtne"
+
+#: ../mail/em-folder-properties.c:390
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Mapes iestatījumi"
 
-#: ../mail/em-folder-selection-button.c:75
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<klikšķiniet, lai izvēlētos mapi>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "Iz_veidot"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "Mapes _nosaukums:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "Meklēšanas mape"
 
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#. UNMATCHED is always last
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "NEATBILSTOÅ S"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
-msgid "Loading..."
-msgstr "Iel�dē..."
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
+msgid "Drafts"
+msgstr "Melnraksti"
 
-#: ../mail/em-folder-tree.c:192
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Skenē \"%s\" mapes"
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#| msgid "Template:"
+msgid "Templates"
+msgstr "Veidnes"
 
-#: ../mail/em-folder-tree.c:605
-msgid "Folder names cannot contain '/'"
-msgstr "Mapes nosaukums nevar saturēt '/'"
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
+msgid "Outbox"
+msgstr "Izsūtne"
+
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
+msgid "Sent"
+msgstr "Nosūtīt�s"
+
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
+msgid "Loading..."
+msgstr "Iel�dē..."
 
 #. Translators: This is the string used for displaying the
 #. * folder names in folder trees. The first "%s" will be
@@ -10993,81 +11512,282 @@ msgstr "Mapes nosaukums nevar saturēt '/'"
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1087
+#: ../mail/em-folder-tree.c:318
 #, c-format
+#| msgid "%s = %s"
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1295
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "Pasta mapes koks"
 
-#: ../mail/em-folder-tree.c:1578 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:886 ../mail/em-folder-utils.c:100
 #, c-format
 msgid "Moving folder %s"
 msgstr "P�rvieto mapi %s"
 
-#: ../mail/em-folder-tree.c:1580 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:888 ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopē mapi %s"
 
-#: ../mail/em-folder-tree.c:1587 ../mail/message-list.c:2100
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "P�rvieto vēstules uz mapi  %s"
 
-#: ../mail/em-folder-tree.c:1589 ../mail/message-list.c:2102
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopē vēstules uz mapi %s"
 
-#: ../mail/em-folder-tree.c:1604
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nevar nomest vēstuli(-es) virsēj� līmeņa glab�tuvē"
 
-#: ../mail/em-folder-utils.c:386
-#| msgid "_Move Folder To..."
-msgid "Move Folder To"
-msgstr "P�rvietot mapi uz"
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
+msgid "_Copy to Folder"
+msgstr "_Kopēt uz mapi"
+
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
+msgid "_Move to Folder"
+msgstr "_P�rvietot uz mapi"
+
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
+msgid "_Move"
+msgstr "_P�rvietot"
+
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
+msgid "Cancel _Drag"
+msgstr "Atcelt _vilkšanu"
+
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1066
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Skenē \"%s\" mapes"
+
+#: ../mail/em-folder-tree.c:2112
+msgid "Open in _New Window"
+msgstr "Atvērt jau_n� log�"
+
+#. FIXME: need to disable for nochildren folders
+#: ../mail/em-folder-tree.c:2117
+msgid "_New Folder..."
+msgstr "Jau_na mape..."
+
+#: ../mail/em-folder-tree.c:2120
+msgid "_Move..."
+msgstr "_P�rvietot..."
 
-#: ../mail/em-folder-utils.c:386
-#| msgid "_Copy Folder To..."
-msgid "Copy Folder To"
-msgstr "Kopēt mapi uz"
+#: ../mail/em-folder-tree.c:2128 ../ui/evolution-mail-list.xml.h:21
+msgid "Re_fresh"
+msgstr "_Atsvaidzin�t"
+
+#: ../mail/em-folder-tree.c:2129
+msgid "Fl_ush Outbox"
+msgstr "Iztukšot izsūt_ni"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-tree.c:2134 ../mail/mail.error.xml.h:138
+msgid "_Empty Trash"
+msgstr "_Iztīrīt atkritumus"
+
+#: ../mail/em-folder-tree.c:2237
+#| msgid "Create _Search Folder"
+msgid "_Unread Search Folder"
+msgstr "Nelasīt_o meklēšanas mape"
+
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:302
+msgid "Select folder"
+msgstr "Izvēlieties mapi"
+
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
+msgid "C_opy"
+msgstr "K_opēt"
+
+#: ../mail/em-folder-utils.c:540
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Veido mapi `%s'"
 
-#: ../mail/em-folder-utils.c:670
-#| msgid "Create folder"
-msgid "Create Folder"
+#: ../mail/em-folder-utils.c:698
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
+msgid "Create folder"
 msgstr "Izveidot mapi"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:698
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Nor�dīt, kur izveidot mapi:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
+msgstr "Neizdev�s dzēst vēstuli"
+
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "Jums nav pietiekamas tiesības, lai dzēstu šo vēstuli."
+
+#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
+msgid "_Edit as New Message..."
+msgstr "R_ediģēt k� jaunu ziņojumu..."
+
+#: ../mail/em-folder-view.c:1341
+msgid "U_ndelete"
+msgstr "Atjau_not"
+
+#: ../mail/em-folder-view.c:1342
+msgid "_Move to Folder..."
+msgstr "P�rvietot uz _mapi..."
+
+#: ../mail/em-folder-view.c:1343
+msgid "_Copy to Folder..."
+msgstr "_Kopēt uz mapi..."
+
+#: ../mail/em-folder-view.c:1346
+msgid "Mar_k as Read"
+msgstr "Atzīmēt _k� lasītu"
+
+#: ../mail/em-folder-view.c:1347
+msgid "Mark as _Unread"
+msgstr "Atzīmēt k� _nelasītu"
+
+#: ../mail/em-folder-view.c:1348
+msgid "Mark as _Important"
+msgstr "Atzīmēt k� _svarīgu"
+
+#: ../mail/em-folder-view.c:1349
+msgid "Mark as Un_important"
+msgstr "Atzīmēt k� _mazsvarīgu"
+
+#: ../mail/em-folder-view.c:1350
+msgid "Mark as _Junk"
+msgstr "Atzīmēt k� _mēstuli"
+
+#: ../mail/em-folder-view.c:1351
+msgid "Mark as _Not Junk"
+msgstr "Atzīmēt k� _ne mēstuli"
+
+#: ../mail/em-folder-view.c:1352
+msgid "Mark for Follo_w Up..."
+msgstr "Atzīmēt sekojumam..."
+
+#: ../mail/em-folder-view.c:1354
+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:1355 ../widgets/misc/e-dateedit.c:469
+msgid "_None"
+msgstr "_Nekas"
+
+#: ../mail/em-folder-view.c:1358
+#| msgid "No Label"
+msgid "_New Label"
+msgstr "Jau_na etiÄ·ete"
+
+#: ../mail/em-folder-view.c:1362
+msgid "Fla_g Completed"
+msgstr "Atzīmēt k� pabei_gts"
+
+#: ../mail/em-folder-view.c:1363
+msgid "Cl_ear Flag"
+msgstr "Notīrī_t atzīmējumu"
+
+#: ../mail/em-folder-view.c:1366
+msgid "Crea_te Rule From Message"
+msgstr "Izveidot k�r_tulu no vēstules"
+
+#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
+#: ../mail/em-folder-view.c:1368
+msgid "Search Folder based on _Subject"
+msgstr "Meklēšana_s mape no temata"
+
+#: ../mail/em-folder-view.c:1369
+msgid "Search Folder based on Se_nder"
+msgstr "Meklēša_nas mape no sūtīt�ja"
+
+#: ../mail/em-folder-view.c:1370
+msgid "Search Folder based on _Recipients"
+msgstr "Meklēšanas ma_pe no saņēmējiem"
+
+#: ../mail/em-folder-view.c:1371
+msgid "Search Folder based on Mailing _List"
+msgstr "Mek_lēšanas mape no adres�tu saraksta"
+
+#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
+#: ../mail/em-folder-view.c:1376
+msgid "Filter based on Sub_ject"
+msgstr "Filtrs no _temata"
+
+#: ../mail/em-folder-view.c:1377
+msgid "Filter based on Sen_der"
+msgstr "Filt_rs no sūtīt�ja"
+
+#: ../mail/em-folder-view.c:1378
+msgid "Filter based on Re_cipients"
+msgstr "Fil_trs no sūtīt�ja"
+
+#: ../mail/em-folder-view.c:1379
+msgid "Filter based on _Mailing List"
+msgstr "Filtrs no a_dres�tu saraksta"
+
+#. default charset used in mail view
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:613
+#: ../plugins/google-account-setup/google-source.c:784
+msgid "Default"
+msgstr "Noklusētais"
+
+#: ../mail/em-folder-view.c:2493
+msgid "Unable to retrieve message"
+msgstr "Nevar saņemt vēstuli"
+
+#: ../mail/em-folder-view.c:2696
+msgid "Create _Search Folder"
+msgstr "Izveidot meklēšana_s mapi"
+
+#: ../mail/em-folder-view.c:2697
+msgid "_From this Address"
+msgstr "_No Å¡Ä«s adreses"
+
+#: ../mail/em-folder-view.c:2698
+msgid "_To this Address"
+msgstr "_Uz Å¡o adresi"
+
+#: ../mail/em-folder-view.c:3201
 #, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Atrakstīties no mapes \"%s\""
+msgid "Click to mail %s"
+msgstr "Klikšķiniet, lai sūtītu %s"
+
+#: ../mail/em-folder-view.c:3213
+#, c-format
+msgid "Click to call %s"
+msgstr "Klikšķiniet, lai zvanītu %s"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1540
+#: ../mail/em-folder-view.c:3218
+msgid "Click to hide/unhide addresses"
+msgstr "Klikšķiniet, lai par�dītu/paslēptu adreses"
+
+#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr "Neparakstīts"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:560
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11075,22 +11795,22 @@ msgstr ""
 "Šī vēstule nav digit�li parakstīta. Nav garantijas, ka šī vēstule ir "
 "autentiska."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1541
+#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr "Derīgs paraksts"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:561
 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 autentiska."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1542
+#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr "Nederīgs paraksts"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:562
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11098,11 +11818,11 @@ msgstr ""
 "Šīs vēstules parakstu nevar p�rbaudīt, iespējams, t� ir izmainīta sūtīšanas "
 "laik�."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1543
+#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
 msgid "Valid signature, but cannot verify sender"
 msgstr "Paraksts korekts, ta�u nevar p�rbaudīt sūtīt�ju"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:563
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11110,22 +11830,25 @@ msgstr ""
 "Šī vēstule ir parakstīta ar autentisku parakstu, bet nevar p�rbaudīt šīs "
 "vēstules sūtīt�ju."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1544
+#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
 msgid "Signature exists, but need public key"
 msgstr "Paraksts eksistē, bet ir vajadzīga publisk� atslēga"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:564
+#| msgid ""
+#| "This message is signed with a valid signature, but the sender of the "
+#| "message cannot be verified."
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 "Šī vēstule ir parakstīta ar parakstu, bet nav atbilstošas publisk�s atslēgas."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1550
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr "Nešifrēts"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:571
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11133,11 +11856,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:115 ../mail/em-format-html.c:1551
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
 msgid "Encrypted, weak"
 msgstr "Šifrēts, v�ji."
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:572
 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 "
@@ -11146,257 +11869,560 @@ msgstr ""
 "Šī vēstule ir šifrēta, ta�u ar v�ju šifrēšanas algoritmu. Nepiederošiem būs "
 "grūti, bet ne neiespējami apskatīt šīs vēstules saturu p�rskat�m� n�kotnē."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1552
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr "Šifrēts"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:573
 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."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1553
+#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:667
 msgid "Encrypted, strong"
 msgstr "Šifrēts, spēcīgi"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:574
 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 ""
-"Šī vēstule ir šifrēta ar spēcīgu šifrēšanas algoritmu. Nepiederošai personai "
-"būs ļoti grūti apskatīt šīs vēstules saturu p�rskat�m� n�kotnē."
+"Šī vēstule ir šifrēta ar spēcīgu šifrēšanas algoritmu. Nepiederošai "
+"personai būs ļoti grūti apskatīt šīs vēstules saturu p�rskat�m� n�kotnē."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Skatīt sertifik�tu"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:690
 msgid "This certificate is not viewable"
 msgstr "Sertifik�ts nav apskat�ms"
 
-#: ../mail/em-format-html-display.c:509
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolution nespēj atvērt šo e-pastu, jo tas ir p�r�k liels. Jūs varat to "
-"apskatīt neformatētu vai izmantot �rēju teksts redaktoru."
-
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:980
+#| msgid "Completed "
 msgid "Completed on"
 msgstr "Pabeigts"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:988
 msgid "Overdue:"
 msgstr "Nokavēts:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:992
 msgid "by"
 msgstr "par"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:1071
+#: ../widgets/misc/e-attachment-view.c:357
+msgid "_View Inline"
+msgstr "_Skatīt iekļauti"
+
+#: ../mail/em-format-html-display.c:1072
+#: ../widgets/misc/e-attachment-view.c:350
+msgid "_Hide"
+msgstr "Slē_pt"
+
+#: ../mail/em-format-html-display.c:1073
+msgid "_Fit to Width"
+msgstr "Piel�got _platumam"
+
+#: ../mail/em-format-html-display.c:1074
+msgid "Show _Original Size"
+msgstr "R�dīt s�k_otnējo izmēru"
+
+#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
 msgid "View _Unformatted"
 msgstr "Skatīt neformatēt_u"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:1577
 msgid "Hide _Unformatted"
 msgstr "Slēpt _neformatēt�s"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1634
 msgid "O_pen With"
 msgstr "At_vērt ar"
 
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-display.c:1711
+#| msgid ""
+#| "Evolution cannot render this email as it is too large to handle. You can "
+#| "view it unformatted or with an external text editor."
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Evolution nespēj atvērt šo e-pastu, jo tas ir p�r�k liels. Jūs varat to "
+"apskatīt neformatētu vai izmantot �rēju teksts redaktoru."
+
+#: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
 msgstr "Lapa no %d līdz %d"
 
-#: ../mail/em-format-html.c:165
-msgid "Formatting message"
-msgstr "Formatē vēstuli"
-
-#: ../mail/em-format-html.c:356
-msgid "Formatting Message..."
-msgstr "Formatē vēstuli..."
-
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Atgūstu `%s'"
 
-#: ../mail/em-format-html.c:1859
+#: ../mail/em-format-html.c:935
+#| msgid "Malformed external-body part."
 msgid "Unknown external-body part."
 msgstr "Nezin�ma �rēj� ķermeņa daļa."
 
-#: ../mail/em-format-html.c:1867
+#: ../mail/em-format-html.c:943
 msgid "Malformed external-body part."
 msgstr "Slikti formēta �rēj� ķermeņa daļa."
 
-#: ../mail/em-format-html.c:1897
+#: ../mail/em-format-html.c:973
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Nor�de uz FTP vietni (%s)"
 
-#: ../mail/em-format-html.c:1908
+#: ../mail/em-format-html.c:984
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Nor�de uz lok�lu failu (%s) derīgu vietnē \"%s\""
 
-#: ../mail/em-format-html.c:1910
+#: ../mail/em-format-html.c:986
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Nor�de uz lok�lu failu (%s)"
 
-#: ../mail/em-format-html.c:1931
+#: ../mail/em-format-html.c:1007
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Nor�de uz att�lin�tiem datiem (%s)"
 
-#: ../mail/em-format-html.c:1942
+#: ../mail/em-format-html.c:1018
 #, 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:1246
+msgid "Formatting message"
+msgstr "Formatē vēstuli"
+
+#: ../mail/em-format-html.c:1420
+#| msgid "Formatting message"
+msgid "Formatting Message..."
+msgstr "Formatē vēstuli..."
+
+#: ../mail/em-format-html.c:1573 ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1658 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:933 ../mail/em-mailer-prefs.c:79
+msgid "Cc"
+msgstr "Cc"
+
+#: ../mail/em-format-html.c:1574 ../mail/em-format-html.c:1643
+#: ../mail/em-format-html.c:1661 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:934 ../mail/em-mailer-prefs.c:80
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: ../mail/em-format-html.c:1753 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1435
+msgid "Mailer"
+msgstr "Pastnieks"
+
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:2602
+#: ../mail/em-format-html.c:1925
 #, c-format
+#| msgid "Please respond on behalf of <b>%s</b>"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Vēstuli nosūtīja <b>%s</b> <b>%s</b> v�rd�"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:931
+#: ../mail/em-mailer-prefs.c:77
+msgid "Reply-To"
+msgstr "Atbildēt uz"
+
+#: ../mail/em-format.c:936 ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
+msgid "Date"
+msgstr "Datums"
+
+#: ../mail/em-format.c:937 ../mail/em-mailer-prefs.c:83
+msgid "Newsgroups"
+msgstr "Intereškopa"
+
+#: ../mail/em-format.c:938 ../mail/em-mailer-prefs.c:84
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
+#| msgid "France"
+msgid "Face"
+msgstr "Seja"
+
+#: ../mail/em-format.c:1208
+#, c-format
+msgid "%s attachment"
+msgstr "%s pielikums"
+
+#: ../mail/em-format.c:1246
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nevarēja apstr�d�t S/MIME vēstuli: nezin�ma kļūda"
+
+#: ../mail/em-format.c:1383 ../mail/em-format.c:1540
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nevarēja apstr�d�t MIME vēstuli. Attēlo k� avotu."
+
+#: ../mail/em-format.c:1391
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Neatbalstīts šifrēšanas veids vair�kdaļīgai šifrēšanai"
+
+#: ../mail/em-format.c:1401
+msgid "Could not parse PGP/MIME message"
+msgstr "Nevarēja apstr�d�t PGP/MIME vēstuli"
+
+#: ../mail/em-format.c:1401
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Nevarēja apstr�d�t PGP/MIME vēstuli: nezin�ma kļūda"
+
+#: ../mail/em-format.c:1559
+msgid "Unsupported signature format"
+msgstr "Neatbalstīta paraksta forma"
+
+#: ../mail/em-format.c:1567 ../mail/em-format.c:1705
+msgid "Error verifying signature"
+msgstr "Kļūda, p�rbaudot parakstu"
+
+#: ../mail/em-format.c:1567 ../mail/em-format.c:1696 ../mail/em-format.c:1705
+msgid "Unknown error verifying signature"
+msgstr "Nezin�ma kļūta, p�rbaudot parakstu"
+
+#: ../mail/em-format.c:1779
+msgid "Could not parse PGP message"
+msgstr "Neizdev�s apstr�d�t PGP ziņojumu"
+
+#: ../mail/em-format.c:1779
+msgid "Could not parse PGP message: Unknown error"
+msgstr "Nevarēja apstr�d�t PGP vēstuli: nezin�ma kļūda"
+
+#: ../mail/em-mailer-prefs.c:95
+msgid "Every time"
+msgstr "Katru reizi"
+
+#: ../mail/em-mailer-prefs.c:96
+msgid "Once per day"
+msgstr "Reizi dien�"
+
+#: ../mail/em-mailer-prefs.c:97
+msgid "Once per week"
+msgstr "Reizi nedēļ�"
+
+#: ../mail/em-mailer-prefs.c:98
+msgid "Once per month"
+msgstr "Reizi mēnesī"
+
+#: ../mail/em-mailer-prefs.c:332
+#| msgid "Custom Headers"
+msgid "Add Custom Junk Header"
+msgstr "Pievienot piel�gotu mēstules galvu"
+
+#: ../mail/em-mailer-prefs.c:336
+#| msgid "_Folder Name:"
+msgid "Header Name:"
+msgstr "Galvas nosaukums:"
+
+#: ../mail/em-mailer-prefs.c:337
+#| msgid "Sender contains"
+msgid "Header Value Contains:"
+msgstr "Galvas vērtība satur:"
+
+#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Galva"
+
+#: ../mail/em-mailer-prefs.c:442
+#| msgid "Continue"
+msgid "Contains Value"
+msgstr "Satur vērtību"
+
+#: ../mail/em-mailer-prefs.c:465
+msgid "Color"
+msgstr "Kr�sa"
+
+#: ../mail/em-mailer-prefs.c:468
+#| msgid "ago"
+msgid "Tag"
+msgstr "Birka"
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr "%s spraudnis ir pieejams un bin�rais fails ir uzinstalēts."
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+"%s spraudnis nav pieejams. Lūdzu, p�rbaudiet, vai ir uzinstalēta atbilstoš� "
+"pakotne."
+
+#: ../mail/em-mailer-prefs.c:1092
+msgid "No Junk plugin available"
+msgstr "Nav pieejams neviens mēstuļu spraudnis"
+
+#: ../mail/em-mailer-prefs.c:1455
+#| msgid "Table header"
+msgid "Date header:"
+msgstr "Datuma galva:"
+
+#. green
+#: ../mail/em-migrate.c:961
+msgid "To Do"
+msgstr "Izdarīt"
+
+#. blue
+#: ../mail/em-migrate.c:962
+msgid "Later"
+msgstr "Vēl�k"
+
+#: ../mail/em-migrate.c:1128
+#| msgid "Migrating..."
+msgid "Migration"
+msgstr "Migr�cija"
+
+#: ../mail/em-migrate.c:1573
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Nevar izveidot jaunu mapi `%s': %s"
+
+#: ../mail/em-migrate.c:1599
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Nevar nokopēt mapi `%s' uz `%s': %s"
+
+#: ../mail/em-migrate.c:1784
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Nevar sameklēt eksistējošas pastkastītes iekš `%s': %s"
+
+#: ../mail/em-migrate.c:1789
+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 ""
+"Atrašan�s vieta un hierarhija Evolution pastkaste ir mainījusies kopš "
+"Evolution 1.x\n"
+"\n"
+"Lūdzu, uzgaidiet kamēr Evolution p�rceļ tavas mapes..."
+
+#: ../mail/em-migrate.c:1990
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Neizdev�s atvērt vec� POP servera datus `%s': %s"
+
+#: ../mail/em-migrate.c:2004
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "Neizdev�s atvērt POP3 datu mapi `%s': %s"
+
+#: ../mail/em-migrate.c:2033
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "Neizdev�s nokopēt POP3 servera datus `%s': %s"
+
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
+#, 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:2874
+#| msgid "Creating folder `%s'"
+msgid "Migrating Folders"
+msgstr "P�rceļ mapes"
+
+#: ../mail/em-migrate.c:2874
+#| 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..."
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution pastkastīšu kopsavilkuma form�ts ir p�rcelts uz SQLite kopš  "
+"Evolution 2.24\n"
+"\n"
+"Lūdzu, uzgaidiet kamēr Evolution p�rceļ tavas mapes..."
+
+#: ../mail/em-migrate.c:2955
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "Neizdev�s izveidot lok�l� pasta mapes iekš `%s': %s"
+
+#: ../mail/em-migrate.c:2974
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"Nevar nolasīt iestatījumus no iepriekšēj�s Evolution instal�cijas, "
+"`evolution/config.xmldb' vairs neeksistē vai ir boj�ts."
+
+#: ../mail/em-popup.c:366
+msgid "Save As..."
+msgstr "Saglab�t k�..."
+
+#: ../mail/em-popup.c:391
+#, c-format
+msgid "untitled_image.%s"
+msgstr "nenosaukts_attēls.%s"
+
+#: ../mail/em-popup.c:497 ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Ielikt k� _fona attēlu"
+
+#: ../mail/em-popup.c:499
+msgid "_Reply to sender"
+msgstr "_Atbildēt sūtīt�jam"
+
+#: ../mail/em-popup.c:500 ../ui/evolution-mail-message.xml.h:79
+msgid "Reply to _List"
+msgstr "Atbildēt uz _sarakstu"
+
+#. make it first item
+#: ../mail/em-popup.c:549 ../mail/em-popup.c:748
+msgid "_Add to Address Book"
+msgstr "Pievienot _adrešu gr�matai"
+
+#: ../mail/em-popup.c:727
+#, c-format
+msgid "Open in %s..."
+msgstr "Atvērt ar %s..."
+
+#: ../mail/em-subscribe-editor.c:606
 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:619
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "Pierakstīt�s"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "Mape"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "Lūdzu, izvēlieties serveri."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "Nav izvēlēts serveris"
 
-#: ../mail/em-utils.c:310
+#. Check buttons
+#: ../mail/em-utils.c:123
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
+msgid "_Do not show this message again."
+msgstr "Ner�_dīt šo ziņojumu vēlreiz."
+
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Vēstuļu filtri"
 
+#: ../mail/em-utils.c:371
+msgid "message"
+msgstr "vēstule"
+
+#: ../mail/em-utils.c:654
+msgid "Save Message..."
+msgstr "Saglab�t vēstuli..."
+
+#: ../mail/em-utils.c:717
+msgid "Add address"
+msgstr "Pievienot adresi"
+
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:1265
 #, c-format
 msgid "Messages from %s"
 msgstr "VÄ“stules no %s"
 
-#: ../mail/em-vfolder-editor.c:126
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "Meklēšanas _mapes"
 
-#: ../mail/em-vfolder-rule.c:522
-#| msgid "Folder"
-msgid "Add Folder"
-msgstr "Pievienot mapi"
+#: ../mail/em-vfolder-rule.c:592
+msgid "Search Folder source"
+msgstr "Meklēšanas mapes avots"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-#| msgid "Default window height"
-msgid "\"Filter Editor\" window height"
-msgstr "\"Filtra redaktors\" loga augstums"
-
-#: ../mail/evolution-mail.schemas.in.h:2
-#| msgid "\"Send and Receive Mail\" window maximize state"
-msgid "\"Filter Editor\" window maximize state"
-msgstr "\"Filtra redaktors\" loga maksimiz�cijas st�voklis"
-
-#: ../mail/evolution-mail.schemas.in.h:3
-#| msgid "Default window width"
-msgid "\"Filter Editor\" window width"
-msgstr "\"Filtra redaktors\" loga platums"
-
-#: ../mail/evolution-mail.schemas.in.h:4
-#| msgid "Default window height"
-msgid "\"Search Folder Editor\" window height"
-msgstr "\"Meklēšanas mapes redaktors\" loga augstums"
-
-#: ../mail/evolution-mail.schemas.in.h:5
-#| msgid "\"Send and Receive Mail\" window maximize state"
-msgid "\"Search Folder Editor\" window maximize state"
-msgstr "\"Meklēšanas mapes redaktors\" loga maksimiz�cijas st�voklis"
-
-#: ../mail/evolution-mail.schemas.in.h:6
-#| msgid "Search Folder based on Mailing _List"
-msgid "\"Search Folder Editor\" window width"
-msgstr "\"Meklēšanas mapes redaktors\" loga platums"
-
-#: ../mail/evolution-mail.schemas.in.h:7
+#| msgid "Send & Receive Mail"
 msgid "\"Send and Receive Mail\" window height"
 msgstr "\"Sūtīt un saņemt pastu\" loga augstums"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "\"Sūtīt un saņemt pastu\" loga maksimiz�cijas st�voklis"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:3
+#| msgid "Send & Receive Mail"
 msgid "\"Send and Receive Mail\" window width"
 msgstr "\"Sūtīt un saņemt pastu\" loka platums"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:4
+#| msgid "Allows evolution to display text part of limited size"
 msgid "Allows Evolution to display text part of limited size"
 msgstr "Ļauj Evolution attēlot noteikta izmēra teksta daļu"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:5
+#| msgid "R_equest Read Receipt"
 msgid "Always request read receipt"
 msgstr "Vienmēr pieprasīt izlasīšanas paziņojumu"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:7
+#| msgid "Automatic link recognition"
 msgid "Automatic emoticon recognition"
 msgstr "Autom�tiska smaidiņu atpazīšana"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "Autom�tiska saites noteikšana"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "P�rbaudīt, vai ien�košais pasts nav mēstule"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Cit�ta izgaismošanas kr�sa"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Cit�ta izgaismošanas kr�sa."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Vēstules sacerēt�ja loga noklusētais augstums"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Vēstules sacerēt�ja loga noklusētais platums"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "Sacerēt�ja iel�dēšanas/pievienošanas mape"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Saspiest KAM/CC/BCC adreses"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11404,7 +12430,7 @@ msgstr ""
 "Saspiest KAM/CC/BCC adreses līdz address_count mainīgaj� nor�dītajam adrešu "
 "skaitam."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11412,11 +12438,11 @@ msgstr ""
 "Kontrolē, cik bieži lok�l�s izmaiņas ir j�sinhronizē ar att�lin�to pasta "
 "serveri. Interv�lam ir j�būt vismaz 30 sekundēm."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Izmantojam� piel�got� galva, kamēr p�rbauda mēstules."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11424,77 +12450,70 @@ msgstr ""
 "Piel�got�s galvas, kuras izmantot p�rbaudot mēstules. Saraksta elementi ir "
 "virknes form� \"headername=value\"."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Noklusēt� rakstzīmju kopa, kur� rakstīt vēstules"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Noklusēt� rakstzīmju kopa, kur� rakstīt vēstules."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Noklusēt� rakstzīmju kopa, kur� attēlot vēstules"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Noklusēt� rakstzīmju kopa, kur� attēlot vēstules."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Noklusētais p�rsūtīšanas stils"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Sacerēt�ja loga noklusētais augstums."
 
-#: ../mail/evolution-mail.schemas.in.h:32
-#| msgid "Default height of the Composer Window."
-msgid "Default height of the mail browser window."
-msgstr "Pasta p�rlūka loga noklusētais augstums."
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default height of the message window."
+msgstr "Vēstules loga noklusētais augstums."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Pierakstīšan�s dialoga noklusētais augstums."
 
-#: ../mail/evolution-mail.schemas.in.h:34
-#| msgid "Default width of the Composer Window."
-msgid "Default maximized state of the mail browser window."
-msgstr "Pasta p�rlūka loga noklusētais maksimiz�cijas st�voklis."
-
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Noklusētais atbildes stils"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Pavedienu izvēršanas st�vokļa noklusēt� vērtība"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Sacerēt�ja loga noklusētais platums."
 
-#: ../mail/evolution-mail.schemas.in.h:38
-#| msgid "Default width of the Composer Window."
-msgid "Default width of the mail browser window."
-msgstr "Pasta p�rlūka loga noklusētais platums."
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Default width of the message window."
+msgstr "Vēstules loga noklusētais platums."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Pierakstīšan�s dialoga noklusētais platums."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
 "Nosaka, vai mēstuļu filtrēšanai adreses meklēt tikai lok�laj� adrešu gr�mat�"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Nosaka, vai sūtīt�ja e-pastu meklēt adrešu gr�mat�"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11506,11 +12525,11 @@ msgstr ""
 "autom�tikai pabeigšanai. Tas var būt lēni, ja att�lin�ta adrešu gr�mata "
 "(piemēram, LDAP) ir atzīmētas autom�tiskai pabeigšanai."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Nosaka, vai izmantot piel�gotas galvas, lai p�rbaudītu mēstules"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11518,9 +12537,10 @@ msgid ""
 msgstr ""
 "Nosaka, vai izmantot piel�got�s galvas, lai p�rbaudītu mēstules. Ja šī "
 "opcija ir ieslēgta un galvas ir pieminētas, tas uzlabos mēstuļu "
-"p�rbaudīšanas �trumu."
+"p�rbaudīšanas "
+"�trumu."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11528,44 +12548,39 @@ msgstr ""
 "Nosaka, vai izmantot vienus un tos pašus fontus gan \"No\", gan \"Temats\" "
 "rind�m \"Vēstules\" kolonn� vertik�laj� skat�."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Mapes sacerēt�ja iel�dēšanas/pievienošanas failiem"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Mape pasta komponenšu failu saglab�šanai."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Atslēgt vai ieslēgt mapju nosaukumu saīsin�šanu s�nu josl�"
 
-#: ../mail/evolution-mail.schemas.in.h:49
-#| msgid "Could not save signature file."
-msgid "Do not add signature delimiter"
-msgstr "Nepievienot paraksta atdalītaju."
-
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Zīmēt pareizrakstības kļūdu pasvītrojumu uzreiz pie teksta ievades."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Izejot iztukšot mēstuļu mapi"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Izejot iztukšot atkritumu mapi"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Izejot no Evolution iztukšot visas mēstuļu mapes."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Izejot no Evolution iztukšot visas atkritumu mapes."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -11573,31 +12588,34 @@ msgstr ""
 "Ieslēgt kustīgas bildes HTML past�. Daudzus lietot�jus kustīgas bildes "
 "kaitina, un viņi labpr�t�k redzētu statiskas bildes."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:48
 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.h:57
+#: ../mail/evolution-mail.schemas.in.h:49
+#| msgid "Enable or disable type ahead search feature"
 msgid "Enable or disable magic space bar"
 msgstr "Ieslēgt vai izslēgt maģisko atstarpes taustiņu"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:50
+#| msgid "It disables/enables the prompt while marking multiple messages."
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Ieslēgt vai izslēgt uzvedni, kad atzīmē vair�kas vēstules."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable or disable type ahead search feature"
 msgstr "Ieslēgt vai izslēgt autom�tisk�s pabeigšanas funkciju meklēšanai"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:52
+#| msgid "Search Folders"
 msgid "Enable search folders"
 msgstr "Ieslēgt meklēšanas mapes"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable search folders on startup."
 msgstr "Ieslēgt meklēšanas mapes palaižoties."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -11605,27 +12623,28 @@ msgstr ""
 "Ieslēgt s�nu joslas meklēšanas iespēju, lai ļautu mapju nosaukumu "
 "interaktīvo meklēšanu."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr ""
 "Ieslēgt to, lai ar atstarpes taustiņu ritin�tu vēstuļu priekšskatījumu, "
-"vētuļu sarakstu un mapes"
+"vētuļu "
+"sarakstu un mapes"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable to render message text part of limited size."
 msgstr "Ieslēdziet, lai par�dītu noteikta izmēra vēstuļu daļas."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable/disable caret mode"
 msgstr "Ieslēgt/izslēgt caret režīmu"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Kodēt failu nosaukumus Outlook/GMail veid�"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11633,22 +12652,23 @@ msgid ""
 "standard."
 msgstr ""
 "Kodēt failu nosaukumus pasta galv� t�pat k� Outlook vai GMail, lai ļautu "
-"tiem pareizi attēlot Evolution sūtītos failu nosaukumus ar UTF-8 burtiem, jo "
-"tie neseko RFC 2231, bet gan izmanto nepareizo RFC 2047 standartu."
+"tiem "
+"pareizi attēlot Evolution sūtītos failu nosaukumus ar UTF-8 burtiem, jo tie "
+"neseko RFC 2231, bet gan izmanto nepareizo RFC 2047 standartu."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane"
-msgstr "Vēstuļu saraksta rūts augstums"
+msgstr "Vēstuļu saraksta izvēlnes augstums"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Height of the message-list pane."
-msgstr "Vēstuļu saraksta rūts augstums."
+msgstr "Vēstuļu saraksta izvēlnes augstums."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Slēpj priekšskatījumu katrai mapei un izņem izvēlēto."
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -11656,7 +12676,20 @@ 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.h:72
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid ""
+"If the \"Preview\" pane is on, then show it side-by-side rather than "
+"vertically."
+msgstr ""
+"Ja ir aktivizēts \"Priekšskatījums\" panelis, r�dīt to malu-pie-malas nevis "
+"vertik�li."
+
+#: ../mail/evolution-mail.schemas.in.h:65
+#| msgid ""
+#| "If there isn't a builtin viewer for a particular mime-type inside "
+#| "Evolution, any mime-types appearing in this list which map to a bonobo-"
+#| "component viewer in GNOME's mime-type database may be used for displaying "
+#| "content."
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -11666,30 +12699,7 @@ msgstr ""
 "jebkuri 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 attēlotu saturu."
 
-#: ../mail/evolution-mail.schemas.in.h:73
-#| msgid ""
-#| "Initial height of the \"Send and Receive Mail\" window. The value updates "
-#| "as the user resizes the window vertically."
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
-msgstr ""
-"S�kotnējais \"Filtra redaktors\" loga augstums. Vērtība atjaunin�s, kad "
-"lietot�js vertik�li maina loga izmēru."
-
-#: ../mail/evolution-mail.schemas.in.h:74
-#| msgid ""
-#| "Initial height of the \"Send and Receive Mail\" window. The value updates "
-#| "as the user resizes the window vertically."
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"S�kotnējais \"Meklēšanas mapes redaktors\" loga augstums. Vērtība "
-"atjaunin�s, kad "
-"lietot�js vertik�li maina loga izmēru."
-
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11697,44 +12707,7 @@ msgstr ""
 "S�kotnējais \"Sūtīt un saņemt pastu\" loga augstums. Vērtība atjaunin�s, kad "
 "lietot�js vertik�li maina loga izmēru."
 
-#: ../mail/evolution-mail.schemas.in.h:76
-#| msgid ""
-#| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
-#| "updates when the user maximizes or unmaximizes the window. Note, this "
-#| "particular value is not used by Evolution since the \"Send and Receive "
-#| "Mail\" window cannot be maximized. This key exists only as an "
-#| "implementation detail."
-msgid ""
-"Initial maximize state of the \"Filter Editor\" window. The value updates "
-"when the user maximizes or unmaximizes the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximized. This key exists only as an implementation detail."
-msgstr ""
-"S�kotnējais \"Filtra redaktors\" loga maksimiz�cijas st�voklis. Vērtība "
-"atjaunin�s katru reizi, kad lietot�js maksimizē vai atjauno logu. Ņemiet "
-"vēr�, ka šo vērtību Evolution neizmanto, jo \"Filtra redaktors\" logu "
-"nevar maksimizēt. Šī vērtība eksistē tikai ka implement�cijas detaļa."
-
-#: ../mail/evolution-mail.schemas.in.h:77
-#| msgid ""
-#| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
-#| "updates when the user maximizes or unmaximizes the window. Note, this "
-#| "particular value is not used by Evolution since the \"Send and Receive "
-#| "Mail\" window cannot be maximized. This key exists only as an "
-#| "implementation detail."
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"S�kotnējais \"Meklēšanas mapes redaktors\" loga maksimiz�cijas st�voklis. "
-"Vērtība atjaunin�s katru reizi, kad lietot�js maksimizē vai atjauno logu. "
-"Ņemiet vēr�, ka šo vērtību Evolution neizmanto, jo \"Meklēšanas mapes "
-"redaktors\" logu nevar maksimizēt. Šī vērtība eksistē tikai ka "
-"implement�cijas detaļa."
-
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11744,32 +12717,11 @@ msgid ""
 msgstr ""
 "S�kotnējais \"Sūtīt un saņemt pastu\" loga maksimiz�cijas st�voklis. Vērtība "
 "atjaunin�s katru reizi, kad lietot�js maksimizē vai atjauno logu. Ņemiet "
-"vēr�, ka šo vērtību Evolution neizmanto, jo \"Sūtīt un saņemt pastu\" logu "
-"nevar maksimizēt. Šī vērtība eksistē tikai ka implement�cijas detaļa."
+"vēr�, "
+"ka šo vērtību Evolution neizmanto, jo \"Sūtīt un saņemt pastu\" logu nevar "
+"maksimizēt. Šī vērtība eksistē tikai ka implement�cijas detaļa."
 
-#: ../mail/evolution-mail.schemas.in.h:79
-#| msgid ""
-#| "Initial width of the \"Send and Receive Mail\" window. The value updates "
-#| "as the user resizes the window horizontally."
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
-msgstr ""
-"S�kotnējais \"Filtra redaktors\" loga platums. Vērtība atjaunin�s, kad "
-"lietot�js horizont�li maina loga izmēru."
-
-#: ../mail/evolution-mail.schemas.in.h:80
-#| msgid ""
-#| "Initial width of the \"Send and Receive Mail\" window. The value updates "
-#| "as the user resizes the window horizontally."
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"S�kotnējais \"Meklēšanas mapes redaktors\" loga platums. Vērtība atjaunin�s, "
-"kad lietot�js horizont�li maina loga izmēru."
-
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11777,7 +12729,15 @@ msgstr ""
 "S�kotnējais \"Sūtīt un saņemt pastu\" loga platums. Vērtība atjaunin�s, kad "
 "lietot�js horizont�li maina loga izmēru."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
+msgstr ""
+"Tas ieslēdz/izslēdz atk�rtotus vaic�jumus par to, vai nesaistes "
+"sinhroniz�cija ir nepieciešama pirms ieiešanas nesaistes režīm�."
+
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -11787,36 +12747,32 @@ msgstr ""
 "no meklēšanas mapēm vēstules izdzēsīs pilnība, nevis tikai izņemts no "
 "meklēšanas rezult�tiem."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty junk was run"
 msgstr "Pēdēj� mēstuļu tīrīšanas reize"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Last time empty trash was run"
 msgstr "Pēdēj� atkritumu tīrīšanas reize"
 
-#: ../mail/evolution-mail.schemas.in.h:85
-#| msgid "Lay_out"
-msgid "Layout style"
-msgstr "Izk�rtojuma stils"
-
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of Labels and their associated colors"
 msgstr "Etiķešu saraksts, ar t�m pievienotaj�m kr�s�m"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:75
+#| msgid "List of mime types to check for bonobo component viewers"
 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.h:89
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accepted licenses"
 msgstr "Apstiprin�to licen�u saraksts"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of accounts"
 msgstr "Pasta kontu saraksts"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11824,16 +12780,16 @@ msgstr ""
 "Evolution vēstuļu sacerēt�jam zin�mo kontu saraksts. Saraksts iekļauj "
 "apakšmapes zem /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of custom headers and whether they are enabled."
 msgstr "Saraksts ar piel�gotaj�m galv�m un vai t�s ir aktivizētas."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Saraksts ar v�rdnīcu valodu kodiem, kuras izmanto pareizrakstības p�rbaudei."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:81
 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."
@@ -11841,15 +12797,20 @@ msgstr ""
 "Evolution vēstuļu komponentei zin�mo etiķešu saraksts. Saraksts iekļauj "
 "virknes ar saturu nosaukums:kr�sa, kur kr�sa izmanto HTML hex kodējumu."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "List of protocol names whose license has been accepted."
 msgstr "Protokolu nosaukumu saraksts, kuru licences ir apstiprin�tas."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:83
+#| msgid "Load images for HTML messages over http"
 msgid "Load images for HTML messages over HTTP"
 msgstr "Iel�dēt HTML attēlus caur HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:84
+#| 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"
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -11859,112 +12820,113 @@ msgstr ""
 "neiel�dēt attēlus no tīkla. \"1\" - Iel�dēt attēlus vēstulēm no kontaktiem "
 "\"2\" - Vienmēr iel�dēt attēlus no tīkla."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
 msgstr "Reģistrēt filtra darbības"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
 msgstr "Reģistrēt filtra darbības nor�dītaj� log fail�."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
 msgstr "Log faila uz log filtru darbības"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
 msgstr "Log faila uz log filtru darbības."
 
-#: ../mail/evolution-mail.schemas.in.h:102
-#| msgid "Uniform row height"
-msgid "Mail browser height"
-msgstr "Pasta p�rlūka augstums"
-
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid "Mail browser maximized"
-msgstr "Pasta p�rlūks maksimizēts"
-
-#: ../mail/evolution-mail.schemas.in.h:104
-#| msgid "Email begins with"
-msgid "Mail browser width"
-msgstr "Pasta p�rlūka platums"
-
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "Atzīmēt k� \"Apskatīts\" pēc nor�dīt� laika interv�la"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "Atzīmēt k� \"Apskatīts\" pēc nor�dīt� laika interv�la."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\""
 msgstr "Atzīmēt cit�tus vēstule \"Priekšskatījum�\""
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Atzīmēt cit�tus vēstule \"Priekšskatījum�\"."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Message Window default height"
+msgstr "Vēstules loga noklusētais augstums"
+
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid "Message Window default width"
+msgstr "Vēstules loga noklusētais platums"
+
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Vēstules attēlošanas stils (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minim�lais dienu skaits starp mēstuļu izmešanu izejot"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minim�lais dienu skaits starp atkritumu izmešanu izejot"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minim�lais dienu skaits starp mēstuļu izmešanu izejot, dien�s."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minim�lais dienu skaits starp atkritumu izmešanu izejot, dien�s."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:100
 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.h:115
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt on empty subject"
 msgstr "Prasīt apstiprin�jumu, ja vēstules temats ir atst�ts tukšs"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Prasīt apstiprin�jumu, ja lietot�js vēlas iztīrīt mapē esoš�s dzēst�s "
 "vēstules."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:103
 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.h:118
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr ""
+"Prasīt apstiprin�jumu, ja lietot�js vēlas nekavējoties ieslēgt nesaistes "
+"režīmu"
+
+#: ../mail/evolution-mail.schemas.in.h:105
+#| msgid "_Prompt when sending messages with an empty subject line"
 msgid "Prompt when deleting messages in search folder"
 msgstr "Prasīt apstiprin�jumu, ja dzēš vēstules meklēšanas mapē"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user expunges"
 msgstr "Prasīt apstiprin�jumu, ja lietot�js vēlas iztīrīt dzēst�s vēstules"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user only fills Bcc"
 msgstr "Prasīt apstiprin�jumu, ja lietot�js aizpilda tikai Bcc lauku"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Prasīt apstiprin�jumu, ja lietot�js mēģina atvērt vair�k par 10 vēstulēm "
 "vienlaicīgi"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11972,145 +12934,126 @@ msgstr ""
 "Prasīt apstiprin�jumu, ja lietot�js mēģina sūtīt vēstules HTML form�t� "
 "kontaktiem, kuri to nevēlas."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Prasīt apstiprin�jumu, ja lietot�js mēģina sūtīt vēstules bez nor�dītiem "
 "galvenajiem (Kam) vai CC saņēmējiem."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Prasīt apstiprin�jumu, ja lietot�js mēģina sūtīt vēstules HTML form�t� "
 "kontaktiem, kuri to nevēlas"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:112
 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.h:126
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Put personalized signatures at the top of replies"
 msgstr "Novietot personalizētus parakstus virs atbildēm"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Put the cursor at the bottom of replies"
 msgstr "Novietot kursoru zem atbildēm"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Atpazīt emociju ikonas tekst� un aizvietot t�s ar attēliem."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Recognize links in text and replace them."
 msgstr "Atpazīt saites tekst� un aizvietot t�s."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Run junk test on incoming mail."
 msgstr "P�rbaudīt, vai ien�košaj� past� ir mēstules."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Save directory"
 msgstr "Saglab�šanas mape"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Search for the sender photo in local address books"
 msgstr "Meklēt sūtīt�ja foto lok�laj� adrešu gr�mat�"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
 msgstr "Pēc noklusējuma sūtīt pastu HTML form�t�"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Send HTML mail by default."
 msgstr "Pēc noklusējuma sūtīt pastu HTML form�t�."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Sender email-address column in the message list"
 msgstr "Sūtīt�ja e-pasta adrešu kolonna vēstuļu sarakst�"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:123
+#| msgid "_Synchronization Options..."
 msgid "Server synchronization interval"
 msgstr "Interv�ls sinhroniz�cijai ar serveri"
 
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
-msgstr ""
-"Iestatiet k� PATIESS, ja nevēlaties pievienot paraksta atdalīt�ju pirms "
-"paraksta, kad sacer vēstuli."
-
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Sūtot e-pastu, r�dīt \"Bcc\" lauku"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Sūtot e-pastu, r�dīt \"Cc\" lauku"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "R�dīt \"No\" lauku, kad sūta uz intereškopu"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show \"From\" field when sending a mail message"
 msgstr "R�dīt \"No\" lauku, kad sūta vēstuli"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "R�dīt \"Atbildēt uz\" lauku, kad sūta uz intereškopu"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "R�dīt \"Atbildēt uz\" lauku, kad sūta vēstuli"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show Animations"
 msgstr "R�dīt kustīgos attēlus"
 
-#: ../mail/evolution-mail.schemas.in.h:145
-#| msgid "Collapse all message threads"
-msgid "Show all message headers"
-msgstr "R�dīt visas vēstules galvas"
-
-#: ../mail/evolution-mail.schemas.in.h:146
-#| msgid "Show \"Reply To\" field when sending a mail message"
-msgid "Show all the headers when viewing a messages."
-msgstr "R�dīt visas galvas, kas skata vēstules."
-
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show animated images as animations."
 msgstr "R�dīt kustīgos attēlus."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:132
 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.h:149
+#: ../mail/evolution-mail.schemas.in.h:133
 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.h:150
+#: ../mail/evolution-mail.schemas.in.h:134
+#| msgid "_Show image animations"
 msgid "Show image animations"
 msgstr "R�dīt kustīgos attēlus"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Show original \"Date\" header value."
-msgstr "R�dīt s�kotnējo \"Date\" galvas vērtību."
-
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Show photo of the sender"
 msgstr "R�dīt sūtīt�ja foto"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 "Kad sūta vēstuli, r�dīt \"Bcc\" lauku. To kontrolē no \"Skats\" izvēlnes, "
-"kad izvēlas pasta kontu."
+"kad "
+"izvēlas pasta kontu."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12118,15 +13061,16 @@ msgstr ""
 "Kad sūta vēstuli, r�dīt \"Cc\" lauku. To kontrolē no \"Skats\" izvēlnes, kad "
 "izvēlas pasta kontu."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
 "Kad sūta uz intreškopu, r�dīt \"No\" lauku. To kontrolē no \"Skats\" "
-"izvēlnes, kad izvēlas pasta kontu."
+"izvēlnes, kad "
+"izvēlas pasta kontu."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12134,103 +13078,85 @@ msgstr ""
 "Kad sūta vēstuli, r�dīt \"No\" lauku. To kontrolē no \"Skats\" izvēlnes, kad "
 "izvēlas pasta kontu."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 msgstr ""
-"Kad sūta uz intreškopu, r�dīt \"Atbildēt uz\" lauku. To kontrolē no \"Skats"
-"\" izvēlnes, kad izvēlas pasta kontu."
+"Kad sūta uz intreškopu, r�dīt \"Atbildēt uz\" lauku. To kontrolē no "
+"\"Skats\" "
+"izvēlnes, kad izvēlas pasta kontu."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
 "Kad sūta vēstuli, r�dīt \"Atbildēt uz\" lauku. To kontrolē no \"Skats\" "
-"izvēlnes, kad izvēlas pasta kontu."
+"izvēlnes, "
+"kad izvēlas pasta kontu."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
-msgstr "R�dīt sūtīt�ja e-pasta adresi atsevišķ� kolonn� vēstuļu sarakst�."
-
-#: ../mail/evolution-mail.schemas.in.h:160
-msgid ""
-"Show the original \"Date\" header (with a local time only if the time zone "
-"differs). Otherwise always show \"Date\" header value in a user preferred "
-"format and local time zone."
-msgstr ""
-"R�dīt s�kotnējo \"Date\" galvu (ar lok�lo laiku tikai tad, ja laika zonas "
-"atšķiras). Cit�di r�dīt \"Date\" galvas vērtības lietot�jam vēlam� form�t� "
-"un lok�laj� laika zon�."
+msgstr "Par�dīt sūtīt�ja e-pasta adresi atsevišķ� kolonn� vēstuļu sarakst�."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show the photo of the sender in the message reading pane."
-msgstr "R�dīt sūtīt�ja foto vēstules lasīšanas rūtī."
+msgstr "R�dīt sūtīt�ja foto vēstules lasīšanas lauk�."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Spell check inline"
 msgstr "Pareizrakstības p�rbaude rakstot"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:147
+#| msgid "Spell Checking"
 msgid "Spell checking color"
 msgstr "Pareizrakstības p�rbaudes kr�sa"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:148
+#| msgid "Spell check inline"
 msgid "Spell checking languages"
 msgstr "Pareizrakstības p�rbaudes valoda"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Subscribe dialog default height"
 msgstr "Pierakstīšan�s loga noklusētais augstums"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Subscribe dialog default width"
 msgstr "Pierakstīšan�s loga noklusētais platums"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Terminal font"
 msgstr "Termin�la fonts"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Text message part limit"
 msgstr "Teksta vēstules daļas izmērs"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The default plugin for Junk hook"
 msgstr "Noklusētais mēstuļu spraudnis"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Pēdēj� mēstuļu tīrīšanas reize, dien�s kopš datoru laika s�kuma."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Pēdēj� atkritumu tīrīšanas reize, dien�s kopš datoru laika s�kuma."
 
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the message list. \"0\" (Classic View) places the preview pane below the "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
-msgstr ""
-"Izvietojuma stils nosaka, kur novietot priekšskatījuma rūti attiecīb� pret "
-"vēstuļu sarakstu. \"0\" (Klasiskais skats) novieto priekšskatījuma rūti zem "
-"vēstuļu saraksta. \"1\" (Vertik�lais skats) novieto priekšskatījuma rūti "
-"pie vēstuļu saraksta."
-
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "The terminal font for mail display."
 msgstr "Termin�la fonti pasta attēlošanai."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "The variable width font for mail display."
 msgstr "Mainīg� platuma fonti pasta attēlošanai."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -12238,7 +13164,10 @@ msgstr ""
 "Tam var būt trīs iespējam�s vērtības. \"0\" - kļūd�m, \"1\" - brīdin�jumiem, "
 "\"2\" - atkļūdošanas ziņojumiem."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:159
+#| msgid ""
+#| "This decides the max size of the text part that can be formatted under "
+#| "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
@@ -12246,7 +13175,7 @@ msgstr ""
 "Šis nosaka formatējam�s teksta daļas maksim�lo izmēru. Pēc noklusējuma tas "
 "ir 4 MB / 4096 KB un ir nor�dīts KB."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12256,16 +13185,16 @@ msgstr ""
 "spraudņi. Ja noklusēti uzr�dītais spraudnis ir deaktivizēts, programma "
 "neizmantos citus pieejamos spraudņus."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 msgstr ""
 "Šo atslēgu nolasa tikai vienu reizi un to iestata uz \"aplams\" pēc "
-"nolasīšanas. Tas atceļ izvēli pastam sarakst� un noņem priekšskatījumu tai "
-"mapei."
+"nolasīšanas. "
+"Tas atceļ izvēli pastam sarakst� un noņem priekšskatījumu tai mapei."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:162
 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;"
@@ -12276,7 +13205,7 @@ msgstr ""
 "un nor�da kad tie t�s būtu j�r�da. XML struktūras form�ts ir &lt;galva "
 "ieslēgta&gt; - ieslēgta, ja galva būs redzama pasta skat�."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -12286,19 +13215,19 @@ msgstr ""
 "noteiktu, vai adreses meklēt tikai lok�laj� adrešu gr�mat�, lai neiekļautu "
 "pastu, kuru sūtījuši zin�mi kontakti no mēstuļu filtrēšanas."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "This option would help in improving the speed of fetching."
 msgstr "Šī opcija varētu palīdzēt uzlabot saņemšanas �trumu."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr ""
-"Šī iestata noklusēto adrešu skaitu, kas tiks r�dītas vēstuļu saraksta skat�, "
-"pēc šīm adresēm tiek r�dīts '...'."
+"Šī iestata noklusēto adrešu skaitu, kas tiks r�dītas vēstuļu saraksta "
+"skat�, pēc šīm adresēm tiek r�dīts '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12307,7 +13236,7 @@ msgstr ""
 "st�voklī pēc noklusējuma. Evolution, pēc šī iestatījuma mainīšanas, ir "
 "j�p�rstartē."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -12317,53 +13246,65 @@ msgstr ""
 "vēstulēm katr� pavedien�, nevis pēc vēstules datuma. Evolution, pēc šī "
 "iestatījuma mainīšanas, ir j�p�rstartē."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:168
+msgid "Thread the message list."
+msgstr "R�dīt vēstules pavedien�."
+
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "Thread the message-list"
+msgstr "R�dīt vēstules pavedien�."
+
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Thread the message-list based on Subject"
 msgstr "R�dīt vēstules pavedien� pēc temata"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Timeout for marking message as seen"
 msgstr "Iztecēšanas laiks, lai atzīmētu vēstuli k� redzētu"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Timeout for marking message as seen."
 msgstr "Iztecēšanas laiks, lai atzīmētu vēstuli k� redzētu."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "UID string of the default account."
 msgstr "UID rinda par noklusēto kontu."
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Pasvītrošanas kr�sa nepareizi uzrakstītiem v�rdiem, kad p�rbauda "
 "pareizrakstību rakstīšanas laik�."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use SpamAssassin daemon and client"
 msgstr "Lietot SpamAssassin servisu un klientu"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Izmantot SpamAssassin dēmonu un klientu (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use custom fonts"
 msgstr "Lietot piel�gotus fontus"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Use custom fonts for displaying mail."
 msgstr "Izmantot piel�gotus fontus pasta attēlošanai."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Use only local spam tests."
 msgstr "Lietot tikai lok�li pieejamos mēstuļu testus."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Lietot tikai lok�li pieejamos mēstuļu testus (ne DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:181
+msgid "Use side-by-side or wide layout"
+msgstr "Lietot malu-pie-malas vai plato izkl�jumu"
+
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -12372,7 +13313,7 @@ msgstr ""
 "Daudziem cilvēkiem ir ļoti svarīgi, kur tiek novietots kursors, kad atbild "
 "uz vēstuli. Tas nosaka, vai kursors ir vēstules augš� vai apakš�."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -12381,21 +13322,21 @@ msgstr ""
 "Daudziem cilvēkiem ir ļoti svarīgi, kur tiek novietots paraksts, kad atbild "
 "uz vēstuli. Tas nosaka, vai paraksts ir vēstules augš� vai apakš�."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "Variable width font"
 msgstr "Mainīga platuma fonts"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
-"Vai vēstulei pēc noklusējuma pievienot izlasīšanas paziņošanas pieprasījumu."
+"Vai vēstulei pēc noklusējuma pievienot saņemšanas paziņošanas pieprasījumu."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Vai atslēgt nosaukumu saīsin�šanas iespēju mapju nosaukumiem s�nu josl�."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12403,28 +13344,22 @@ msgstr ""
 "P�riet vai nep�riet uz pavedienu veidošanu pēc temata, ja vēstules galva  "
 "nesatur atbildes pazīmes."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Vai k�rtot pavedienus pēc jaun�k�s vēstules pavedien�"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Width of the message-list pane"
-msgstr "Vēstuļu saraksta rūts platums"
+msgstr "Vēstuļu saraksta paneļa platums"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Width of the message-list pane."
-msgstr "Vēstuļu saraksta rūts platums."
+msgstr "Vēstuļu saraksta paneļa platums."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Importē Elm datus"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
-#: ../modules/mail/e-mail-shell-view.c:952
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-msgid "Mail"
-msgstr "Pasts"
-
 #: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm importēt�js"
@@ -12433,534 +13368,736 @@ msgstr "Evolution Elm importēt�js"
 msgid "Import mail from Elm."
 msgstr "Importē vēstules no Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
+#: ../mail/importers/evolution-mbox-importer.c:79
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "MÄ“rÄ·a mape:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
-msgid "Select folder"
-msgstr "Izvēlieties mapi"
-
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "Izvēlieties mapi, kur� ievietot importētos failus"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:245
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley pasta kaste (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importēt Berkeley pasta kastu form�ta mapes"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Importē pasta kasti"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:231
+#: ../plugins/pst-import/pst-importer.c:454
+#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importē `%s'"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Skenē %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "Importē Pine datus"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
-msgid "Address Book"
-msgstr "Adrešu gr�mata"
-
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine importēt�js"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "Importēt pastu no Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Pasts uz %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "Pasts no %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "Temats ir %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s pasta sarakste"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Pievienot filtra k�rtulu"
 
-#: ../mail/mail-config.ui.h:1
+#: ../mail/mail-component.c:573
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d izvēlēts, "
+msgstr[1] "%d izvēlēti, "
+msgstr[2] "%d izvēlētu, "
+
+#: ../mail/mail-component.c:577
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d dzēsts"
+msgstr[1] "%d dzēsti"
+msgstr[2] "%d dzēstu"
+
+#: ../mail/mail-component.c:584
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d mēstule"
+msgstr[1] "%d mēstules"
+msgstr[2] "%d mēstuļu"
+
+#: ../mail/mail-component.c:587
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d melnraksts"
+msgstr[1] "%d melnraksti"
+msgstr[2] "%d melnrakstu"
+
+#: ../mail/mail-component.c:589
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d nosūtīta"
+msgstr[1] "%d nosūtītas"
+msgstr[2] "%d nosūtītu"
+
+#: ../mail/mail-component.c:591
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d nenosūtīts"
+msgstr[1] "%d nenosūtītas"
+msgstr[2] "%d nenosūtītu"
+
+#: ../mail/mail-component.c:597
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d nelasīta, "
+msgstr[1] "%d nelasītas, "
+msgstr[2] "%d nelasītu, "
+
+#: ../mail/mail-component.c:598
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d kop�"
+msgstr[1] "%d kop�"
+msgstr[2] "%d kop�"
+
+#: ../mail/mail-component.c:956
+msgid "New Mail Message"
+msgstr "Jauna pasta vēstule"
+
+#: ../mail/mail-component.c:957
+#| msgid "_Mail Message"
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "_Pasta vēstule"
+
+#: ../mail/mail-component.c:958
+msgid "Compose a new mail message"
+msgstr "Sacerēt jaunu pasta vēstuli"
+
+#: ../mail/mail-component.c:964
+msgid "New Mail Folder"
+msgstr "Jauna vēstuļu mape"
+
+#: ../mail/mail-component.c:965
+#| msgid "Mail _Folder"
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "Vēstuļu _mape"
+
+#: ../mail/mail-component.c:966
+msgid "Create a new mail folder"
+msgstr "Izveidot jaunu vēstuļu mapi"
+
+#: ../mail/mail-component.c:1113
+msgid "Failed upgrading Mail settings or folders."
+msgstr "Neizdev�s vēstuļu iestatījumu vai mapju uzlabošana."
+
+#: ../mail/mail-config.glade.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(Piezīme: būs nepieciešama lietotnes p�rstartēšana)"
 
-#: ../mail/mail-config.ui.h:2
+#: ../mail/mail-config.glade.h:3
+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
+#| msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
+msgstr "<b>Sūtīt�ja fotogr�fija</b>"
+
+#: ../mail/mail-config.glade.h:5
+msgid "<b>Sig_natures</b>"
+msgstr "<b>_Paraksti</b>"
+
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Virsēj�s rakstīšanas opcija</b> (Netiek rekomendēta)"
 
-#: ../mail/mail-config.ui.h:3
-#| msgid "No Information"
-msgid "Account Information"
-msgstr "Konta inform�cija"
+#: ../mail/mail-config.glade.h:7
+msgid "<b>_Languages</b>"
+msgstr "<b>Va_lodas</b>"
+
+#: ../mail/mail-config.glade.h:8
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr "<span weight=\"bold\">Konta inform�cija</span>"
+
+#: ../mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr "<span weight=\"bold\">Autentifik�cija</span>"
+
+#: ../mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr "<span weight=\"bold\">Vēstuļu sacerēšana</span>"
+
+#: ../mail/mail-config.glade.h:12
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr "<span weight=\"bold\">Konfigur�cija</span>"
+
+#: ../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.ui.h:4
+#: ../mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr "<span weight=\"bold\">Dzēst pastu</span>"
+
+#: ../mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+msgstr "<span weight=\"bold\">R�dīt�s vēstules _galvas</span>"
+
+#: ../mail/mail-config.glade.h:18
+#| msgid "<span weight=\"bold\">Alerts</span>"
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">EtiÄ·etes</span>"
+
+#: ../mail/mail-config.glade.h:19
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr "<span weight=\"bold\">Iel�dē attēlus</span>"
+
+#: ../mail/mail-config.glade.h:20
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr "<span weight=\"bold\">Vēstulēs attēlošana</span>"
+
+#: ../mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr "<span weight=\"bold\">VÄ“stules fonti</span>"
+
+#: ../mail/mail-config.glade.h:22
+msgid "<span weight=\"bold\">Message Receipts</span>"
+msgstr "<span weight=\"bold\">Vēstules saņēmēji</span>"
+
+#: ../mail/mail-config.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr "<span weight=\"bold\">Papildus inform�cija</span>"
+
+#: ../mail/mail-config.glade.h:24
+msgid "<span weight=\"bold\">Options</span>"
+msgstr "<span weight=\"bold\">Opcijas</span>"
+
+#: ../mail/mail-config.glade.h:25
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+
+#: ../mail/mail-config.glade.h:26
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr "<span weight=\"bold\">Druk�tie fonti</span>"
+
+#: ../mail/mail-config.glade.h:27
+#| msgid "<span weight=\"bold\">Status</span>"
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">Starpnieka iestatījumi</span>"
+
+#: ../mail/mail-config.glade.h:28
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr "<span weight=\"bold\">Oblig�t� inform�cija</span>"
+
+#: ../mail/mail-config.glade.h:29
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+
+#: ../mail/mail-config.glade.h:30
+msgid "<span weight=\"bold\">Security</span>"
+msgstr "<span weight=\"bold\">Drošība</span>"
+
+#: ../mail/mail-config.glade.h:31
+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
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr "<span weight=\"bold\">Servera konfigur�cija</span>"
+
+#: ../mail/mail-config.glade.h:33
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">_Autentifik�cijas veids</span>"
+
+#: ../mail/mail-config.glade.h:35
+msgid "Account Management"
+msgstr "Kontu p�rvaldība"
+
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Pievienot _jaunu parakstu..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.glade.h:37
+msgid "Add _Script"
+msgstr "Pievienot _skriptu"
+
+#: ../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.ui.h:7
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Ši_frēt arī sev, sūtot šifrētas vēstules"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Vienmēr no_sūtīt kopiju (cc) uz:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../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.ui.h:10
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Šifrējot vienmēr _uzticēties atslēg�m man� atslēgu saišķī"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Vienmēr ši_frēt sev, sūtot šifrētas vēstules"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.glade.h:44
+#| msgid "R_equest Read Receipt"
 msgid "Always request rea_d receipt"
 msgstr "Vienmēr pieprasīt i_zlasīšanas paziņojumu"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
-msgid "Authentication"
-msgstr "Autentifik�cija"
+#: ../mail/mail-config.glade.h:45
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"Pielikums\n"
+"Iekļauts\n"
+"Citēts"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+"Pielikums\n"
+"Iekļauts (Outlook stils)\n"
+"Citēts\n"
+"Necitēt"
+
+#: ../mail/mail-config.glade.h:52
 msgid "Automatically insert _emoticon images"
 msgstr "Autom�tiski ievietot _emociju ikonu attēlus"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.glade.h:53
+msgid "Baltic (ISO-8859-13)"
+msgstr "Baltijas (ISO-8859-13)"
+
+#: ../mail/mail-config.glade.h:54
+msgid "Baltic (ISO-8859-4)"
+msgstr "Baltijas (ISO-8859-4)"
+
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "Rakst_zīmju kopa:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.glade.h:56
+#: ../plugins/exchange-operations/exchange-account-setup.c:1017
 msgid "Ch_eck for Supported Types"
 msgstr "P�rbaudīt atbalstītos _tipus"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.glade.h:57
 msgid "Check cu_stom headers for junk"
 msgstr "P�rbaudīt piel�gotaj�_s galv�s, vai nav mēstule"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.glade.h:58
 msgid "Check incoming _messages for junk"
 msgstr "P�rbaudīt, vai ien�košaj� past� nav _mēstules"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "P�rbaudī_t pareizrakstību kamēr es rakstu"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "P�rbauda, vai ien�košaj�s vēstulēs ir mēstules"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "_Attīrīt"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "Attī_rīt"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "Kr�sa _kļūdainajiem v�rdiem:"
 
-#: ../mail/mail-config.ui.h:25
-#| msgid "Compose Message"
-msgid "Composing Messages"
-msgstr "Vēstuļu rakstīšana"
-
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
-msgid "Configuration"
-msgstr "Konfigur�cija"
-
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "Apstiprin�t, _iztīrot mapi"
 
-#: ../mail/mail-config.ui.h:29
-#| msgid "Default Priority:"
-msgid "Default Behavior"
-msgstr "Noklusēt� uzvedība"
+#: ../mail/mail-config.glade.h:65
+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 ""
+"Apsveicu, jūsu pasta konfigurēšana ir pabeigta.\n"
+"\n"
+"Jūs tagad varat saņemt un sūtīt epastu, \n"
+"lietojot Evolution. \n"
+"\n"
+"Spiediet \"Pielietot\", lai saglab�tu jūsu iestatījumus."
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.glade.h:71
+msgid "De_fault"
+msgstr "Nokl_usētais"
+
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "Noklusētais rakstzīmju ko_dējums:"
 
-#: ../mail/mail-config.ui.h:32
-#| msgid "_Delete all"
-msgid "Delete Mail"
-msgstr "Dzēst pastu"
-
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
 msgstr "Ize_jot dzēst mēstules"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Digit�li parakstīt i_zejoš�s vēstules (pēc noklusējuma)"
 
-#: ../mail/mail-config.ui.h:36
-#| msgid "All Message _Headers"
-msgid "Displayed Message _Headers"
-msgstr "R�dīt vēstuļu _galvas"
-
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.glade.h:77
+#| msgid "Do not format text contents in mails if the text si_ze exceeds"
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "Neformatēt tekstu vēstulē, ja t� i_zmērs p�rsniedz"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ja vēstules sūtīt�js ir man� adrešu gr�mat�, neatzīmēt to k� mēstuli"
 
-#: ../mail/mail-config.ui.h:39
-#| msgid "Do not delete"
-msgid "Do not quote"
-msgstr "Necitēt"
+#: ../mail/mail-config.glade.h:79
+msgid "Done"
+msgstr "Izdarīts"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr "Melnrakstu _mape:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.glade.h:81
+msgid "Email Accounts"
+msgstr "E-pasta konti"
+
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "E-pasta _adrese:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "I_zejot iztukšot atkritumu mapes"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
 msgstr "Ieslēgt maģisko atstar_pes taustiņu"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.glade.h:85
+#| msgid "Search Folders"
 msgid "Enable Sea_rch Folders"
 msgstr "Ieslēgt mek_lēšanas mapes"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "Šifrēšanas _sertifik�ts:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "Ši_frēt izejoš�s vēstules (pēc noklusējuma)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
 msgstr "Fiksē_ta platums:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "Fi_ksēt� platuma fonts:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr "Fonta īpašības"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "Formatēt vēstules _HTML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "Pilns v�r_ds:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.glade.h:96
+#| msgid "Messages"
 msgid "HTML Messages"
 msgstr "HTML vēstules"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.glade.h:97
+#| msgid "_PO Box:"
 msgid "H_TTP Proxy:"
 msgstr "H_TTP starpnieks:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "Galva"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "Izcelt _cit�tus ar"
 
-#: ../mail/mail-config.ui.h:59
-#| msgid "_Inline"
-msgid "Inline"
-msgstr "Iekļauts"
-
-#: ../mail/mail-config.ui.h:60
-msgid "Inline (Outlook style)"
-msgstr "Iekļaut (Outlook stils)"
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
+msgstr ""
+"Ja serveris izmanto nestandarta portu, tad nor�diet servera adresi form� "
+"\"servera_v�rds:porta_numurs\""
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
+#| msgid "Label"
 msgid "Labels"
 msgstr "EtiÄ·etes"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "Valodu tabula"
 
-#: ../mail/mail-config.ui.h:65
-#| msgid "_Load Images"
-msgid "Loading Images"
-msgstr "Iel�dē attēlus"
+#: ../mail/mail-config.glade.h:106
+msgid "Mail Configuration"
+msgstr "Pasta konfigur�cija"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "Pasta galvu tabula"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "Pasta kastes atrašan�s vieta"
 
-#: ../mail/mail-config.ui.h:68
-#| msgid "Messages"
-msgid "Message Display"
-msgstr "Vēstuļu attēlošana"
+#: ../mail/mail-config.glade.h:110
+msgid "Message Composer"
+msgstr "Vēstuļu sacerēt�js"
 
-#: ../mail/mail-config.ui.h:69
-#| msgid "Message contains"
-msgid "Message Fonts"
-msgstr "VÄ“stules fonts"
-
-#: ../mail/mail-config.ui.h:70
-#| msgid "Message Retract"
-msgid "Message Receipts"
-msgstr "Vēstules saņemšanas paziņojums"
-
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "Neizmantot star_pnieku:"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.glade.h:112
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr ""
+"Piezīme: apakšsvītra etiķešu nosaukumos tiek izmantota k� mnemoniskais "
+"identifikators izvēlnē."
+
+#: ../mail/mail-config.glade.h:113
 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"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.glade.h:114
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Opcija tiek ignorēta, ja atrasta atbilstība piel�gotajai mēstules galvai."
 
-#: ../mail/mail-config.ui.h:75
-#: ../plugins/publish-calendar/publish-calendar.ui.h:10
-#| msgid "Personal Information"
-msgid "Optional Information"
-msgstr "Papildus inform�cija"
-
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "Or_ganiz�cija:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _atslēgas ID:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.glade.h:117
+#| msgid "_Password:"
 msgid "Pass_word:"
 msgstr "Pa_role:"
 
-#: ../mail/mail-config.ui.h:81
-msgid "Port:"
-msgstr "Ports:"
+#: ../mail/mail-config.glade.h:119
+#| msgid "Please select among the following options"
+msgid "Please configure the following account settings."
+msgstr "Lūdzu, konfigurējiet sekojošos konta iestatījumus."
 
-#: ../mail/mail-config.ui.h:82
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+#: ../mail/mail-config.glade.h:120
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below.\n"
+#| "This name will be used for display purposes only."
+msgid ""
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
-"Prasīt apstiprin�jumu, kad sūta vēstuli tikai ar n_or�dītiem Bcc adres�tiem"
+"Lūdzu, apakšēj� lauk� ierakstiet aprakstošu nosaukumu šim kontam.\n"
+"Šis nosaukums tiks lietots tikai attēlošanai."
 
-#: ../mail/mail-config.ui.h:83
-#| msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
+#: ../mail/mail-config.glade.h:121
+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 ""
+"Lūdzu, ievadiet inform�ciju par veidu, k�d� jūs sūtīsiet pastu. Ja jūs "
+"neesat "
+"p�rliecin�ti, prasiet sistēmu administratoram vai Internet servisa "
+"pieg�d�t�jam."
 
-#: ../mail/mail-config.ui.h:85
-#| msgid "Print Memos"
-msgid "Printed Fonts"
-msgstr "Druk�tie fonti"
+#: ../mail/mail-config.glade.h:122
+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 ""
+"Lūdzu, ievadiet zem�k savu v�rdu un e-pasta adresi. \"Izvēles\" lauki var "
+"tikt "
+"neaizpildīti, ja vien nevēlaties iekļaut šo inform�ciju e-past�, kuru sūtat."
 
-#: ../mail/mail-config.ui.h:86
-#| msgid "Junk Settings"
-msgid "Proxy Settings"
-msgstr "Starpnieka iestatījumi"
+#: ../mail/mail-config.glade.h:123
+#| msgid "_Port:"
+msgid "Port:"
+msgstr "Ports:"
 
-#: ../mail/mail-config.ui.h:87
-msgid "Quoted"
-msgstr "Citēts"
+#: ../mail/mail-config.glade.h:124
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr ""
+"Prasīt apstiprin�jumu, kad sūta vēstuli tikai ar n_or�dītiem Bcc adres�tiem"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "A_tcerēties paroli"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "At_bildēt-Uz:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "Atcerēties _paroli"
 
-#: ../mail/mail-config.ui.h:92
-#| msgid "Server Information"
-msgid "Required Information"
-msgstr "Pieprasīt� inform�cija"
-
-#: ../mail/mail-config.ui.h:94
-#| msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgid "SSL is not supported in this build of Evolution"
-msgstr "SSL vēl nav atbalstīts šaj� Evolution versij�"
-
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.glade.h:129
+#| msgid "Provides core functionality for local address books."
 msgid "S_earch for sender photograph only in local address books"
 msgstr "M_eklēt sūtīt�ja fotogr�fiju tikai lok�laj� adrešu gr�mat�"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "I_zvēlēties..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
 msgstr "Sūtīt saņ_emšanas paziņojumu:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr "S_tandarta fonts:"
 
-#: ../mail/mail-config.ui.h:99
-msgid "Secure MIME (S/MIME)"
-msgstr "Secure MIME (S/MIME)"
-
-#: ../mail/mail-config.ui.h:101
-#| msgid "Select Folder"
-msgid "Select Drafts Folder"
-msgstr "Izvēlēties melnrakstu mapi"
-
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Izvēlieties HTML fiksēta platuma fontu"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "Izvēlieties HTML fiksēta platuma fontu druk�šanai"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "Izvēlieties HTML mainīga platuma fontu"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "Izvēlieties HTML mainīga platuma fontu druk�šanai"
 
-#: ../mail/mail-config.ui.h:106
-#| msgid "Select Folder"
-msgid "Select Sent Folder"
-msgstr "Izvēlēties nosūtīto vēstuļu mapi"
-
-#: ../mail/mail-config.ui.h:107
-#| msgid "<b>Sender Photograph</b>"
-msgid "Sender Photograph"
-msgstr "Sūtīt�ja fotogr�fija"
-
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "SÅ«ta pastu"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
-msgstr "Nosūtīto vēstuļu _mape:"
-
-#: ../mail/mail-config.ui.h:110
-#| msgid "Sent Messages"
-msgid "Sent and Draft Messages"
-msgstr "Sūtīt�s un melnrakstu vēstules"
+msgstr "Nosūtīto ziņu _mape:"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris pieprasa autentifik�ciju"
 
-#: ../mail/mail-config.ui.h:112
-#| msgid "Server Information"
-msgid "Server Configuration"
-msgstr "Servera konfigur�cija"
-
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.glade.h:142
+#| msgid "Server _Type: "
 msgid "Server _Type:"
 msgstr "Servera _tips:"
 
-#: ../mail/mail-config.ui.h:114
-#| msgid "Signatures"
-msgid "Sig_natures"
-msgstr "Pa_raksti"
-
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "Para_kstīšana sertifik�ts:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "_Paraksts:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Paraksti"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.glade.h:146
+msgid "Signatures Table"
+msgstr "Parakstu tabula"
+
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Pareizrakstības p�rbaude"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "S�kt raks_tīt atbildes apakš�"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.glade.h:149
+#| msgid "T_ype: "
 msgid "T_ype:"
 msgstr "T_ips:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12968,20 +14105,19 @@ msgstr ""
 "Valodu saraksts šeit r�da tikai t�s valodas, kur�m jums ir uzst�dīta "
 "v�rdnīca."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.glade.h:151
 #| msgid ""
 #| "The output of this script will be used as your\n"
-#| "signature. The name you specify will be used for display purposes only."
+#| "signature. The name you specify will be used\n"
+#| "for display purposes only. "
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 "Skripta izvads tiks izmantots k� jūsu paraksts.\n"
-"Nosaukums, kuru nor�dīsiet, tiks izmantots \n"
-"tikai attēlošanas nolūkos. "
+"Nosaukums, kuru nor�dīsiet, tiks izmantots tikai attēlošanas nolūkos. "
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12989,251 +14125,225 @@ msgstr ""
 "Ievadiet nosaukumu, k�du jūs gribētu piešķirt šim kontam.\n"
 "Piemēram: \"Darbs\" vai \"Personīgi\""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.glade.h:155
+#| msgid "User_name:"
 msgid "Us_ername:"
 msgstr "_Lietot�jv�rds:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.glade.h:156
+#| msgid "Authentication"
 msgid "Use Authe_ntication"
 msgstr "Izmanto aute_ntifik�ciju"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:701
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "_Lietot�jv�rds:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "M_ainīgs platums:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.glade.h:159
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Forward\" to begin. "
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"Laipni lūdzam Evolution pasta konfigur�cijas asistent�.\n"
+"\n"
+"Spiediet \"N�kamais\", lai s�ktu."
+
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "Pievienot p_arakstu"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "Vienmēr iel�dēt _attēlus no interneta"
 
-#: ../mail/mail-config.ui.h:134
-msgid "_Authentication Type"
-msgstr "_Autentifik�cijas tips"
-
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "Noklusētais mēstuļu sprau_dnis:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "Tiešs _savienojums ar Internetu"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Neparakstīt _san�ksmju pieprasījumus (savietojamībai ar Outlook)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_P�rsūtīšanas stils:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "Atbildot _izvietot parakstu virs oriģin�l�s vēstules teksta"
 
-#: ../mail/mail-config.ui.h:140
-#| msgid "Language"
-msgid "_Languages"
-msgstr "Va_lodas"
-
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "Ie_l�dēt bildes vēstulēs no kontaktiem"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.glade.h:171
+#| msgid "List local addressbook folders"
 msgid "_Lookup in local address book only"
 msgstr "Meklēt tikai lok�laj�s adrešu gr�mat�s"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "Padarīt šo par _manu noklusēto kontu"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.glade.h:173
+#| msgid "Mail Configuration"
 msgid "_Manual proxy configuration:"
 msgstr "_Pašrocīg� starpnieka konfigur�cija"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "Atzī_mēt vēstules k� lasītas pēc"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Nekad neiel�dēt attēlus no Interneta"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Ceļš:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.glade.h:178
+#| msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "_Prasīt apstiprin�jumu, kad sūta HTML vēstules kontaktiem, kuri to nevēlas"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Prasīt apstiprin�jumu, kad sūta vēstules ar tukšu temata rindu"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_Atbildes stils:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Skripts:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "Drošs HTTP _starpnieks:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
-#: ../plugins/publish-calendar/publish-calendar.ui.h:28
-msgid "_Server:"
-msgstr "_Serveris:"
+#: ../mail/mail-config.glade.h:183
+#| msgid "S_elect..."
+msgid "_Select..."
+msgstr "Izvēlētie_s..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_R�dīt kustīgos attēlus"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_R�dīt sūtīt�ja foto vēstules priekšskatījum�"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Samazin�t Kam / Cc / Bcc galvas līdz "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "Lietot droš_u savienojumu:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.glade.h:190
+#| msgid "Use _Default"
 msgid "_Use system defaults"
 msgstr "Lietot sistēmas _noklusēto"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "Lietot tos paš_us fontus ko cit�s lietotnēs"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
-#| msgid "am"
-msgid "a"
-msgstr "a"
-
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "adreses"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
-#| msgid "by"
-msgid "b"
-msgstr "b"
-
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "kr�sa"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "apraksts"
 
-#: ../mail/mail-dialogs.ui.h:1
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "sekundes"
+
+#: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
 
-#: ../mail/mail-dialogs.ui.h:2
+#: ../mail/mail-dialogs.glade.h:2
+msgid "<b>Search Folder Sources</b>"
+msgstr "<b>Meklēšanas mapes avoti</b>"
+
+#: ../mail/mail-dialogs.glade.h:3
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Ciparu paraksts</span>"
+
+#: ../mail/mail-dialogs.glade.h:4
+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 aktīvaj�m att�lin�taj�m mapēm"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../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.ui.h:4
+#: ../mail/mail-dialogs.glade.h:7
 msgid "All local folders"
 msgstr "Vis�m lok�l�m mapēm"
 
-#: ../mail/mail-dialogs.ui.h:5
-msgid "Call"
-msgstr "Izsaukums"
-
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.glade.h:8
 msgid "Co_mpleted"
 msgstr "Pa_beigts"
 
-#: ../mail/mail-dialogs.ui.h:7
-#| msgid "Edit Signature"
-msgid "Digital Signature"
-msgstr "Digit�lais paraksts"
-
-#: ../mail/mail-dialogs.ui.h:8
-msgid "Do Not Forward"
-msgstr "Nep�rsūtīt"
-
-#: ../mail/mail-dialogs.ui.h:9
-#| msgid "Encrypt"
-msgid "Encryption"
-msgstr "Šifrēšana"
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
+msgid "Flag to Follow Up"
+msgstr "Karogs sekojumam"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "Mapes abonēšana"
 
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Follow-Up"
-msgstr "Sekot"
-
-#: ../mail/mail-dialogs.ui.h:12
-msgid "For Your Information"
-msgstr "Jūsu zin�šanai"
-
-#: ../mail/mail-dialogs.ui.h:13
-msgid "Forward"
-msgstr "P�rsūtīt"
-
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "Licences nosacījumi"
 
-#: ../mail/mail-dialogs.ui.h:15
-msgid "No Response Necessary"
-msgstr "Nav nepieciešama atbilde"
-
-#: ../mail/mail-dialogs.ui.h:19
-msgid "Reply to All"
-msgstr "Atbildēt visiem"
-
-#: ../mail/mail-dialogs.ui.h:20
-msgid "Review"
-msgstr "Apskats"
-
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "S_erveris:"
 
-#: ../mail/mail-dialogs.ui.h:22
-#| msgid "Search Folder source"
-msgid "Search Folder Sources"
-msgstr "Meklēšanas mapes avoti"
-
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "Drošības inform�cija"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "Specifiskas mapes"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13241,42 +14351,42 @@ 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.ui.h:27
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "_Pieņemt licenci"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "_LÄ«dz:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "Ka_rodziņš:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "A_tzīmējiet šo, lai apstiprin�tu licences vienošanos"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Ehotestē %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "Filtrēt izvēlēt�s vēstules"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "Pasta saņemšana"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neizdev�s saglab�t izejošos filtrus: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13285,122 +14395,111 @@ msgstr ""
 "Neizdev�s pievienot pie %s: %s\n"
 "T� viet� pievienoju lok�lajai `Nosūtītie' mapei."
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:618
 #, 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:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:727 ../mail/mail-ops.c:808
+#| msgid "_Send message"
 msgid "Sending message"
 msgstr "Sūta vēstuli"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:737
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sūta %d. vēstuli no %d"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:764
 #, 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:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:701
 msgid "Canceled."
 msgstr "Atcelts."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:768 ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr "Izpildīts."
 
-#: ../mail/mail-ops.c:905
-#, c-format
-#| msgid "Saving message to folder"
-msgid "Saving message to folder '%s'"
-msgstr "Saglab� vēstuli mapē '%s'"
+#: ../mail/mail-ops.c:880
+msgid "Saving message to folder"
+msgstr "Saglab� vēstuli mapē"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:957
 #, c-format
-#| msgid "Moving messages to %s"
-msgid "Moving messages to '%s'"
-msgstr "P�rvieto vēstules uz '%s'"
+msgid "Moving messages to %s"
+msgstr "P�rvieto vēstules uz %s"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:957
 #, c-format
-#| msgid "Copying messages to %s"
-msgid "Copying messages to '%s'"
-msgstr "Kopē vēstules uz '%s'"
+msgid "Copying messages to %s"
+msgstr "Kopē vēstules uz %s"
 
-#: ../mail/mail-ops.c:1091
-#, c-format
-#| msgid "Scanning folders in \"%s\""
-msgid "Scanning folders in '%s'"
-msgstr "Skenē \"%s\" mapes"
-
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1174
 msgid "Forwarded messages"
 msgstr "P�rsūtīt�s vēstules"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1215
 #, c-format
-#| msgid "Opening folder %s"
-msgid "Opening folder '%s'"
-msgstr "Atver mapi '%s'"
+msgid "Opening folder %s"
+msgstr "Atver mapi %s"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1280
 #, c-format
-#| msgid "Retrieving quota information for folder %s"
-msgid "Retrieving quota information for folder '%s'"
-msgstr "Saņem mapes '%s' kvotu inform�ciju"
+#| msgid "Contact information for %s"
+msgid "Retrieving quota information for folder %s"
+msgstr "Saņem mapes %s kvotu inform�ciju"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1349
 #, c-format
-#| msgid "Opening store %s"
-msgid "Opening store '%s'"
-msgstr "Atver glab�tuvi '%s'"
+msgid "Opening store %s"
+msgstr "Atver glab�tuvi %s"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1420
 #, c-format
-#| msgid "Removing folder %s"
-msgid "Removing folder '%s'"
-msgstr "Izņem mapi '%s'"
+msgid "Removing folder %s"
+msgstr "Izņem mapi %s"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1538
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Glab� mapi '%s'"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1601
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Izsvītroju un saglab�ju kontu '%s'"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1602
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Uzglab� kontu '%s'"
 
-#: ../mail/mail-ops.c:1685
-#, c-format
-#| msgid "Refreshing folder"
-msgid "Refreshing folder '%s'"
-msgstr "Atsvaidzina mapi '%s'"
+#: ../mail/mail-ops.c:1656
+msgid "Refreshing folder"
+msgstr "Atsvaidzina mapi"
 
-#: ../mail/mail-ops.c:1725
-#, c-format
-#| msgid "Expunging folder"
-msgid "Expunging folder '%s'"
-msgstr "Iztīra mapi '%s'"
+#: ../mail/mail-ops.c:1696 ../mail/mail-ops.c:1746
+msgid "Expunging folder"
+msgstr "Iztīra mapi"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1743
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Iztukšo '%s' atkritumus"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1744
 msgid "Local Folders"
 msgstr "Lok�l�s mapes"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1825
+#, c-format
+msgid "Retrieving message %s"
+msgstr "Saņem vēstuli %s"
+
+#: ../mail/mail-ops.c:1934
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -13408,15 +14507,17 @@ msgstr[0] "Saņem %d vēstuli"
 msgstr[1] "Saņem %d vēstules"
 msgstr[2] "Saņem %d vēstules"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2019
 #, c-format
+#| msgid "Saving %d message"
+#| msgid_plural "Saving %d messsages"
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Saglab� %d vēstuli"
 msgstr[1] "Saglab� %d vēstules"
 msgstr[2] "Saglab� %d vēstules"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2099
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13425,11 +14526,11 @@ msgstr ""
 "Kļūda, glab�jot vēstules uz: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2171
 msgid "Saving attachment"
 msgstr "Saglab� pielikumu"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2189 ../mail/mail-ops.c:2197
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13438,144 +14539,160 @@ msgstr ""
 "Nevar izveidot izejas failu: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2212
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nevarēja ierakstīt datus: %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2357
 #, c-format
-#| msgid "Disconnecting from %s"
-msgid "Disconnecting from '%s'"
-msgstr "Atvienojas no '%s'"
+msgid "Disconnecting from %s"
+msgstr "Atvienojas no %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2357
 #, c-format
-#| msgid "Reconnecting to %s"
-msgid "Reconnecting to '%s'"
-msgstr "Atkal savienojas ar '%s'"
+msgid "Reconnecting to %s"
+msgstr "Atkal savienojas ar %s"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2453
 #, c-format
 msgid "Preparing account '%s' for offline"
-msgstr "Sagatavo kontu '%s' nesaistes režīmam"
+msgstr "Sagatavo kontu %s nesaistes režīmam"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2539
 msgid "Checking Service"
 msgstr "P�rbauda servisu"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Atceļ..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Sūtīt un saņemt pastu"
 
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "_Atcelt Visu"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "Atjaunina..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Gaida..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:814
 #, c-format
 msgid "Checking for new mail"
 msgstr "P�rbauda jauno pastu"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Ievadiet %s paroli"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "Ievadiet paroli"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ievadiet %s paroli"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "Ievadiet paroli"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr "Lietot�js atcēla darbību."
 
-#: ../mail/mail-session.c:663
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr "Nav nor�dīta mērķa adrese, vēstules p�rsūtīšana ir atcelta."
+#: ../mail/mail-signature-editor.c:202
+#| msgid "Save and Close"
+msgid "_Save and Close"
+msgstr "_Saglab�t un aizvērt"
 
-#: ../mail/mail-session.c:669
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "Nav atrasts konts, kuru izmantot, vēstules p�rsūtīšana ir atcelta."
+#: ../mail/mail-signature-editor.c:356
+#| msgid "Edit signature"
+msgid "Edit Signature"
+msgstr "Rediģēt parakstu"
+
+#: ../mail/mail-signature-editor.c:371
+#| msgid "Signatures Table"
+msgid "_Signature Name:"
+msgstr "Paraksta no_saukums:"
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:134
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Nevarēja izveidot mapi `%s': %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:164
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "MÄ“Ä£inu movemail, kas nav mbox avots `%s'"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:270
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "P�rsūtīta vēstule - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:272
 msgid "Forwarded message"
 msgstr "P�rsūtīta vēstule"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:312
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Nederīga mape: `%s'"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Iestata meklēšanas mapi: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Atjaunina '%s:%s' meklēšanas mapes"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Atjaunina '%s' meklēšanas mapes"
 
-#: ../mail/mail-vfolder.c:1172
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "Rediģēt meklēšanas mapi"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Jauna meklēšanas mape"
 
 #: ../mail/mail.error.xml.h:1
+#| msgid ""
+#| "A folder named &quot;{0}&quot; already exists. Please use a different "
+#| "name."
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Mape ar nosaukumu \"{0}\" jau eksistē. Lūdzu, izmantojiet citu v�rdu."
 
 #: ../mail/mail.error.xml.h:2
+#| msgid ""
+#| "A folder named &quot;{1}&quot; already exists. Please use a different "
+#| "name."
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Mape ar nosaukumu \"{1}\" jau eksistē. Lūdzu, izmantojiet citu v�rdu."
 
 #: ../mail/mail.error.xml.h:3
+#| 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."
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13587,6 +14704,9 @@ msgstr ""
 "Jūs varat ignorēt šo mapi, p�rrakstīt vai pievienot tai saturu, vai iziet."
 
 #: ../mail/mail.error.xml.h:6
+#| msgid ""
+#| "A read receipt notification has been requested for &quot;{1}&quot;. Send "
+#| "the receipt notification to {0}?"
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13631,6 +14751,9 @@ msgstr ""
 "Vai tieš�m vēlaties pilnīb� izmest visas dzēst�s vēstules no vis�m mapēm?"
 
 #: ../mail/mail.error.xml.h:14
+#| msgid ""
+#| "Are you sure you want to permanently remove all the deleted messages in "
+#| "all folders?"
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13642,84 +14765,91 @@ msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Vai tieš�m vēlaties sūtīt vēstuli HTML form�?"
 
 #: ../mail/mail.error.xml.h:16
-#| msgid "Are you sure you want to send a message with only BCC recipients?"
-msgid "Are you sure you want to send a message with invalid address?"
-msgstr "Vai tieš�m vēlaties sūtīt vēstuli nederīgai adresei?"
-
-#: ../mail/mail.error.xml.h:17
-#| msgid "Are you sure you want to send a message with only BCC recipients?"
-msgid "Are you sure you want to send a message with invalid addresses?"
-msgstr "Vai tieš�m vēlaties sūtīt vēstuli nederīg�m adresēm?"
-
-#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Vai tieš�m vēlaties sūtīt vēstuli tikai ar BCC saņēmējiem?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Vai tieš�m vēlaties sūtīt vēstuli bez temata?"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:18
+#| msgid "Because &quot;{0}&quot;."
 msgid "Because \"{0}\"."
 msgstr "T�pēc ka \"{0}\"."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:20
+#| msgid "Because &quot;{2}&quot;."
 msgid "Because \"{2}\"."
 msgstr "T�pēc ka \"{2}\"."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Tukšs paraksts"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:22
+#| msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Nevar pievienot meklēšanas mapi \"{0}\"."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:23
+#| msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Nevar nokopēt mapi \"{0}\" uz \"{1}\"."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:24
+#| msgid "Cannot create folder &quot;{0}&quot;."
 msgid "Cannot create folder \"{0}\"."
 msgstr "Nevar izveidot mapi \"{0}\"."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Nevar izveidot pagaidu saglab�šanas mapi."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:26
+#| msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Nevar izveidot mapi, jo \"{1}\""
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:27
+#| msgid "Cannot delete folder &quot;{0}&quot;."
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Nevar izdzēst mapi \"{0}\"."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:28
+#| msgid "Cannot delete system folder &quot;{0}&quot;."
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Nevar izdzēst sistēmas mapi \"{0}\"."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:29
+#| msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Nevar rediģēt meklēšanas mapi \"{0}\", jo t� neeksistē."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:30
+#| msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Nevar p�rvietot mapi \"{0}\" uz \"{1}\"."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:31
+#| msgid "Cannot open source &quot;{1}&quot;"
 msgid "Cannot open source \"{1}\""
 msgstr "Nevar atvērt avotu \"{1}\""
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:32
+#| msgid "Cannot open source &quot;{2}&quot;."
 msgid "Cannot open source \"{2}\"."
 msgstr "Nevar atvērt avotu \"{2}\"."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:33
+#| msgid "Cannot open target &quot;{2}&quot;."
 msgid "Cannot open target \"{2}\"."
 msgstr "Nevar atvērt mērķi \"{2}\"."
 
-#: ../mail/mail.error.xml.h:36
+#: ../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."
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13727,35 +14857,41 @@ msgstr ""
 "Instalēšanas problēmu dēļ nevar par�dīt licences failu \"{0}\". Jūs nevarat "
 "lietot šo pieg�d�t�ju, pirms neesat apstiprin�jis licenci."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:35
+#| msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Nevar p�rsaukt \"{0}\" uz \"{1}\"."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:36
+#| msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Nevar p�rsaukt vai p�rvietot sistēmas mapi \"{0}\"."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Nevar saglab�t izmaiņas šaj� kont�."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:38
+#| msgid "Cannot save to directory &quot;{0}&quot;."
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nevar saglab�t mapi \"{0}\"."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:39
+#| msgid "Cannot save to file &quot;{0}&quot;."
 msgid "Cannot save to file \"{0}\"."
 msgstr "Nevar saglab�t fail� \"{0}\"."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:40
+#| msgid "Cannot set signature script &quot;{0}&quot;."
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Nevar iestatīt paraksta skriptu \"{0}\"."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:41
+#| msgid "Check for _Junk"
 msgid "Check Junk Failed"
 msgstr "Neizdev�s mēstuļu p�rbaude"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13763,90 +14899,101 @@ msgstr ""
 "P�rbaudiet, vai esat sast�dījis paroli pareizi. Daudzas paroles ir "
 "reģistrjutīgas. P�rbaudiet vai nav ieslēgts caps lock."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Nevarēja saglab�t paraksta failu."
 
+#: ../mail/mail.error.xml.h:44
+#| msgid "Deleted: "
+msgid "Delete \"{0}\"?"
+msgstr "Dzēst \"{0}\"?"
+
+#: ../mail/mail.error.xml.h:45
+msgid "Delete account?"
+msgstr "Dzēst kontu?"
+
 #: ../mail/mail.error.xml.h:46
+#| msgid "Copy selected messages to another folder"
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Dzēst vēstules meklēšanas mapē \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:47
+#| msgid "Copy selected messages to another folder"
+msgid "Delete messages in Search Folder?"
+msgstr "Dzēst vēstules meklēšanas mapē?"
+
+#: ../mail/mail.error.xml.h:48
+msgid "Discard changes?"
+msgstr "Atmest izmaiņas?"
+
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "N_edzēst"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Nedzēst"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Neatslēgt"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr ""
-"Vai vēlaties lok�li sinhronizēt mapes, kuras esat atzīmējis/-usi lietošanai "
-"nesaistes režīm�?"
+"Vai vēlaties lok�li sinhronizēt mapes, kuras esat atzīmējis/-usi "
+"lietošanai nesaistes režīm�?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
 msgstr "Vai vēlaties atzīmēt visas vēstules k� lasītas?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
 msgstr "Vai vēlaties saglab�t izmaiņas?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "Enter password."
 msgstr "Ievadiet paroli."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr "Kļūda, iel�dējot filtra inform�ciju."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr "Kļūda, izpildot darbību."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Kļūda, kamēr {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "Fails eksistē, bet to nevar p�rrakstīt."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "Fails eksistē, bet tas nav regul�rs fails."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Ja turpin�siet, jūs nevarēsiet atgūt vēstules."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr ""
 "Ja izdzēsīsiet mapi, tad visi faili un apakšmapes arī tiks pilnīb� izdzēstas."
 
-#: ../mail/mail.error.xml.h:61
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders contents "
-#| "will be deleted permanently."
-msgid ""
-"If you delete the folder, all of its contents will be deleted permanently."
-msgstr "Ja izdzēsīsiet mapi, tad viss t�s saturs tiks pilnīb� izdzēsts."
-
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Ja turpin�siet, visi starpnieka konti tiks pilnīb� izdzēsti."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13854,141 +15001,144 @@ msgstr ""
 "Ja turpin�siet, visa konta inform�cija un visa\n"
 "starpnieku inform�cija tiks pilnīb� izdzēsta."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Ja turpin�siet, visa konta inform�cija tiks pilnīb� izdzēsta."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
 "Ja iziesiet, šī vēstule netiks aizsūtīta, līdz Evolution tiks atkal palaists."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Ignorēt"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Nederīga autentifik�cija"
 
-#: ../mail/mail.error.xml.h:69
-msgid "Mail Deletion Failed"
-msgstr "Neizdev�s dzēst vēstuli"
-
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Pasta filtri autom�tiski atjaunin�s."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
-"Daudzas e-pastu sistēmas pievieno Apparently-To galvu vēstulēm, kam ir tikai "
-"BCC saņēmēji. Ja pievienota šī galva, t�pat saturēs visus jūsu ziņojuma "
-"saņēmējus. Lai no t� izvairītos, jums būtu j�pievieno vismaz viens Kam: vai "
-"CC: saņēmējs."
+"Daudzas e-pastu sistēmas pievieno Apparently-To galvu vēstulēm, kam ir "
+"tikai BCC saņēmēji. Ja pievienota šī galva, t�pat saturēs visus jūsu "
+"ziņojuma saņēmējus. Lai no t� izvairītos, jums būtu j�pievieno vismaz viens "
+"Kam: vai CC: saņēmējs."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
+msgid "Mark all messages as read"
+msgstr "Atzīmēt visas vēstules k� lasītas"
+
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Trūkstoša mape."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Nav izvēlēts avots."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "P�r�k daudz vēstuļu atvēršana aizņemt ilgu laiku."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Lūdzu, p�rbaudiet jūsu konta iestatījumus un mēģiniet vēlreiz."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Lūdzu, ieslēdziet kontu vai sūtiet, lietojot citu kontu."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr ""
-"Lūdzu, ievadiet derīgu pasta adresi lauk� \"Kam:\". Jūs varat sameklēt e-"
-"pasta adresi spiežot uz \"Kam:\" pogas."
+"Lūdzu, ievadiet derīgu pasta adresi lauk� \"Kam:\". Jūs varat sameklēt "
+"e-pasta adresi spiežot uz \"Kam:\" pogas."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
 "{0}"
 msgstr ""
 "Lūdzu, p�rliecinieties, vai sekojoši adres�ti vēl�s un ir spējīgi saņemt "
-"HTML e-pastu:\n"
+"HTML "
+"e-pastu:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Ievadiet nosaukumu Å¡im parakstam."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "LÅ«dzu, uzgaidiet."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
+#| msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problēma, migrējot veco pasta mapi \"{0}\"."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
+msgid "Querying server"
+msgstr "Vaic� serveri"
+
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Vaic� serverim atbalstīto autentifik�cijas meh�nismu sarakstu."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Pieprasīts saņemšanas apstiprin�jums."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
+#| msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Tieš�m dzēst mapi \"{0}\" un visas apakšmapes?"
 
-#: ../mail/mail.error.xml.h:87
-#| msgid "Cannot delete folder \"{0}\"."
-msgid "Really delete folder \"{0}\"?"
-msgstr "Tieš�m dzēst mapi \"{0}\"?"
-
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:90
+#| msgid "Import File"
 msgid "Report Junk Failed"
 msgstr "Neizdev�s ziņot par mēstulēm"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:91
 msgid "Report Not Junk Failed"
 msgstr "Neizdev�s ziņot par ne mēstulēm"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "Meklēšanas mapes autom�tiski atjaunin�tas."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "Sūtīt apstiprin�jumu"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "Paraksts jau eksistē"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:95
 msgid "Synchronize"
 msgstr "Sinhronizēt"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Sinhronizēt mapes lok�li, lietošanai nesaistes režīm�?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13996,7 +15146,7 @@ msgstr ""
 "Sistēmas mapei vajadzīgs Evolution, lai funkcionētu pareizi un to nevar "
 "p�rsaukt, p�rvietot vai izdzēst."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14013,7 +15163,13 @@ msgstr ""
 "izvairītos no š�das ziņojuma saņēmēju atkl�šanas, pievienojiet vismaz vienu "
 "Kam: vai CC: lauku. "
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:101
+#| msgid ""
+#| "The following Search Folder(s):\n"
+#| "{0}\n"
+#| "Used the now removed folder:\n"
+#| "    &quot;{1}&quot;\n"
+#| "And have been updated."
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14027,7 +15183,13 @@ msgstr ""
 "    \"{1}\"\n"
 "Un ir atjaunin�ta(-s)."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:106
+#| msgid ""
+#| "The following filter rule(s):\n"
+#| "{0}\n"
+#| "Used the now removed folder:\n"
+#| "    &quot;{1}&quot;\n"
+#| "And have been updated."
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14041,27 +15203,11 @@ msgstr ""
 "    \"{1}\"\n"
 "Un ir atjaunin�ta(-s)."
 
-#: ../mail/mail.error.xml.h:109
-msgid ""
-"The following recipient was not recognized as a valid mail address:\n"
-"{0}"
-msgstr ""
-"Sekojošais saņēmējs nav atpazīts k� derīga e-pasta adrese:\n"
-"{0}"
-
 #: ../mail/mail.error.xml.h:111
-msgid ""
-"The following recipients were not recognized as valid mail addresses:\n"
-"{0}"
-msgstr ""
-"Sekojošie saņēmēji nav atpazīti k� derīgas e-pasta adreses:\n"
-"{0}"
-
-#: ../mail/mail.error.xml.h:113
 msgid "The script file must exist and be executable."
 msgstr "Skripta failam j�eksistē, un tam ir j�būt izpild�mam."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14070,19 +15216,19 @@ msgstr ""
 "Ejiet uz meklēšanas mapju redaktoru, lai nepieciešamības gadījum� pievienotu "
 "to tieši."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:114
 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"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:115
 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:118
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14090,21 +15236,21 @@ msgstr ""
 "Šis serveris neatbalsta šo autentifik�cijas metodi vai neatbalsta "
 "autentifik�ciju k� t�du."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "Šis paraksts ir izmainīts, bet nav saglab�ts."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "Atzīmēt vēstules k� lasītas šaj� mapē un t� apakšmapēs."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "Nespēj savienoties ar GroupWise serveri."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14112,19 +15258,19 @@ msgstr ""
 "Nevar atvērt melnraksta mapi šim kontam. Vai vēlaties izmantot noklusēto "
 "melnrakstu mapi?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "Nevar nolasīt licences failu."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "Lietot _noklusēto"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "Lietot noklusēto melnrakstu mapi?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -14134,31 +15280,27 @@ msgstr ""
 "lok�l�s vai att�lin�t�s mapes.\n"
 "Vai tieš�m vēlaties to darīt?"
 
-#: ../mail/mail.error.xml.h:128
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "Jums nav pietiekamas tiesības, lai dzēstu šo vēstuli."
-
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "Jūs neesat aizpildījis visu nepieciešamo inform�ciju."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Jums ir nenosūtītas vēstules, vai tomēr vēlaties iziet?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "Nevar izveidot divus kontus ar vien�diem nosaukumiem."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "Jums j�nosauc šī meklēšanas mape."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "Jums ir j�nor�da mape."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14168,115 +15310,104 @@ msgstr ""
 "To var izdarīt izvēloties atsevišķas mapes, un/vai izvēloties visas lok�l�s, "
 "att�lin�t�s vai abu divu veidu mapes."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:134
+#| msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Neizdev�s pieteikties serverim \"{0}\" k� \"{0}\"."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "_Pievienot"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Atmest izmaiņas"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:137
 msgid "_Do not Synchronize"
 msgstr "_Nesinhronizēt"
 
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:866
-msgid "_Empty Trash"
-msgstr "_Iztīrīt atkritumus"
-
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "_Iztīrīt"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "_Atvērt vēstules"
 
-#: ../mail/message-list.c:1119
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Neredzēta"
 
-#: ../mail/message-list.c:1120
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Redzēta"
 
-#: ../mail/message-list.c:1121
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Atbildēta"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1054
+#| msgid "Forward"
 msgid "Forwarded"
 msgstr "P�rsūtīta"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Vair�kas neredzētas vēstules"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Vair�kas vēstules"
 
-#: ../mail/message-list.c:1128
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Zem�k�"
 
-#: ../mail/message-list.c:1129
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Zem�ka"
 
-#: ../mail/message-list.c:1133
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Augst�ka"
 
-#: ../mail/message-list.c:1134
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Augst�k�"
 
-#: ../mail/message-list.c:1744 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1751 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Å odien %l:%M %p"
 
-#: ../mail/message-list.c:1760
+#: ../mail/message-list.c:1670
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %l:%M %p"
 
-#: ../mail/message-list.c:1772
+#: ../mail/message-list.c:1682
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1780
+#: ../mail/message-list.c:1690
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1782
+#: ../mail/message-list.c:1692
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2528
-msgid "Select all visible messages"
-msgstr "Izvēlēties visas redzam�s vēstules"
-
-#: ../mail/message-list.c:2579 ../shell/e-shell-view.c:729
-msgid "Shell Backend"
-msgstr "ÄŒaulas aizmugure"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4434 ../mail/message-list.c:4932
+#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
 msgid "Generating message list"
 msgstr "Izveido vēstuļu sarakstu"
 
-#: ../mail/message-list.c:4763
+#: ../mail/message-list.c:4299
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14284,7 +15415,7 @@ msgstr ""
 "Neviena vēstule neatbilst meklēšanas kritērijiem. Vai nu noņemiet meklēšanu "
 "izvēlnē Meklēt->Attīrīt, vai arī mainiet kritērijus."
 
-#: ../mail/message-list.c:4765
+#: ../mail/message-list.c:4301
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
@@ -14292,7 +15423,11 @@ msgstr ""
 "Šaj� mapē ir tikai slēptas vēstules. Izmantojiet Skats->R�dīt slēpt�s "
 "vēstules, lai t�s par�dītu."
 
-#: ../mail/message-list.c:4767
+#: ../mail/message-list.c:4303
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "There are no items to show in this view."
 msgid "There are no messages in this folder."
 msgstr "Šaj� mapē nav vēstuļu."
 
@@ -14321,2299 +15456,88 @@ msgid "Sent Messages"
 msgstr "Sūtītie ziņojumi"
 
 #: ../mail/message-list.etspec.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 #: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "Izmērs"
 
 #: ../mail/message-list.etspec.h:19
+#| msgid "Subject Threading"
 msgid "Subject - Trimmed"
 msgstr "Temats - apcirsts"
 
+#: ../mail/message-tag-followup.c:54
+msgid "Call"
+msgstr "Izsaukums"
+
+#: ../mail/message-tag-followup.c:55
+msgid "Do Not Forward"
+msgstr "Nep�rsūtīt"
+
+#: ../mail/message-tag-followup.c:56
+msgid "Follow-Up"
+msgstr "Sekot"
+
+#: ../mail/message-tag-followup.c:57
+msgid "For Your Information"
+msgstr "Jūsu zin�šanai"
+
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
+msgid "Forward"
+msgstr "P�rsūtīt"
+
+#: ../mail/message-tag-followup.c:59
+msgid "No Response Necessary"
+msgstr "Nav nepieciešama atbilde"
+
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
+msgid "Reply"
+msgstr "Atbildēt"
+
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
+msgid "Reply to All"
+msgstr "Atbildēt visiem"
+
+#: ../mail/message-tag-followup.c:64
+msgid "Review"
+msgstr "Apskats"
+
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
 msgid "Body contains"
 msgstr "Ķermenis satur"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
 msgid "Message contains"
 msgstr "VÄ“stule satur"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
 msgid "Recipients contain"
 msgstr "Adres�ti satur"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
 msgid "Sender contains"
 msgstr "Sūtīt�js satur"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
 msgid "Subject contains"
 msgstr "Vēstules tēma satur"
 
 #: ../mail/searchtypes.xml.h:6
+#| msgid "Subject or Sender contains"
 msgid "Subject or Addresses contains"
 msgstr "Vēstules tēma vai adres�ti satur"
 
-#: ../modules/addressbook/addressbook-config.c:206
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Izvēloties šo opciju, Evolution savienosies ar LDAP serveri tikai tad, ja "
-"LDAP serveris atbalsta SSL."
-
-#: ../modules/addressbook/addressbook-config.c:208
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Izvēloties šo opciju, Evolution savienosies ar LDAP serveri tikai tad, ja "
-"LDAP serveris atbalsta TLS."
-
-#: ../modules/addressbook/addressbook-config.c:210
-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 ""
-"Izvēloties šo opciju, jūs nor�d�t, ka serveris neizmanto SSL un/vai TLS. Tas "
-"nozīmē, ka jūsu savienojums nebūs drošs, un jūsu dators būs neaizsarg�ts "
-"pret ļaunpr�tīgiem drošības caurumu ekspluat�ciju."
-
-#: ../modules/addressbook/addressbook-config.c:592
-#| msgid "Birthdays & Anniversaries"
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "Izmantot _dzimšanas dienu & gadadienu kalend�r�"
-
-#: ../modules/addressbook/addressbook-config.c:628
-msgid "Copy _book content locally for offline operation"
-msgstr "Kopēt _gr�matas saturu lok�li, darbībai nesaistes režīm�"
-
-#: ../modules/addressbook/addressbook-config.c:736
-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 ""
-"Šis ir LDAP servera ports, pie kura Evolution mēģin�s pieslēgties. Tiek "
-"pied�v�ts standarta portu saraksts. Prasiet savam sistēmu administratoram, "
-"k�du portu jums vajadzētu nor�dīt."
-
-#: ../modules/addressbook/addressbook-config.c:810
-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 ""
-"Šī ir metode, kuru Evolution izmantos, lai jūs autentificētu. Atcerieties, "
-"ka iestatot to uz \"E-pasta adrese\", tai ir nepieciešama anonīma pieeja "
-"jūsu LDAP serverī."
-
-#: ../modules/addressbook/addressbook-config.c:885
-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 ""
-"Meklēšanas mērogs definē, cik dziļi jūs vēlaties meklēt direktoriju kok�. "
-"Meklēšanas mērogs \"zem\" iekļaus visus ierakstus zem�k par jūsu ieraksta "
-"b�zi. Meklēšanas mērogs \"viens\" iekļaus ierakstus tikai vienu līmeni zem�k "
-"par jūsu b�zi."
-
-#: ../modules/addressbook/addressbook-config.c:991
-msgid "Server Information"
-msgstr "Servera inform�cija"
-
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
-msgid "Details"
-msgstr "Detaļas"
-
-#: ../modules/addressbook/addressbook-config.c:997
-#: ../modules/mail/e-mail-shell-view.c:54
-msgid "Searching"
-msgstr "Meklēšana"
-
-#: ../modules/addressbook/addressbook-config.c:999
-msgid "Downloading"
-msgstr "Lejupiel�dēšana"
-
-#: ../modules/addressbook/addressbook-config.c:1205
-msgid "Address Book Properties"
-msgstr "Adrešu gr�matas īpašības"
-
-#: ../modules/addressbook/addressbook-config.c:1207
-msgid "New Address Book"
-msgstr "Jauna adrešu gr�mata"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "Autom�tisk�s pabeigšanas garums"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-#| msgid "Contact Print Test"
-msgid "Contact layout style"
-msgstr "Kontaktu izk�rtojuma stils"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
-msgid "Contact preview pane position (horizontal)"
-msgstr "Kontaktu priekšskatījuma rūts novietojums (horizont�li)"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
-#| msgid "Month view vertical pane position"
-msgid "Contact preview pane position (vertical)"
-msgstr "Kontaktu priekšskatījuma rūts novietojums (vertik�li)"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList XML aizpildes URIs sarakstam"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList XML aizpildes URIs sarakstam."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
-msgid "Position of the contact preview pane when oriented horizontally."
-msgstr "Kontaktu priekšskatījuma rūts novietojums, kad orientēts horizont�li."
+#: ../mail/searchtypes.xml.h:7
+#| msgid "Subject or Sender contains"
+msgid "Subject or Recipients contains"
+msgstr "Vēstules tēma vai saņēmējs satur"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
-msgid "Position of the contact preview pane when oriented vertically."
-msgstr "Kontaktu priekšskatījuma rūts novietojums, kad orientēts vertik�li."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-msgid "Show autocompleted name with an address"
-msgstr "R�dīt autom�tiski pabeigto v�rdu ar adresi"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
-msgid "Show preview pane"
-msgstr "R�dīt priekšskatījuma rūti"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
-msgstr ""
-"Izvietojuma stils nosaka, kur novietot priekšskatījuma rūti attiecīb� pret "
-"kontaktu sarakstu. \"0\" (Klasiskais skats) novieto priekšskatījuma rūti zem "
-"kontaktu saraksta. \"1\" (Vertik�lais skats) novieto priekšskatījuma rūti "
-"pie kontaktu saraksta."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"Rakstzīmju skaits, kas j�ievada, pirms Evolution mēģin�s autom�tiski pabeigt."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
-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"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
-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."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-"Vai piespiest r�dīt ierakst� autom�tiski pabeigt� kontakta pasta adresi ar "
-"v�rdu."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
-msgid "Whether to show the preview pane."
-msgstr "Vai r�dīt priekšskatījuma rūti."
-
-#: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Tabulas kolonna:"
-
-#: ../modules/addressbook/autocompletion-config.c:162
-msgid "Autocompletion"
-msgstr "Autom�tisk� pabeigšana"
-
-#: ../modules/addressbook/autocompletion-config.c:165
-msgid "Always _show address of the autocompleted contact"
-msgstr "Vienmēr r�dīt autom�ti_ski pabeigto kontaktu adresi"
-
-#. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
-msgid "On LDAP Servers"
-msgstr "LDAP serverī"
-
-#: ../modules/addressbook/e-book-shell-backend.c:340
-msgctxt "New"
-msgid "_Contact"
-msgstr "_Kontakts"
-
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
-msgid "Create a new contact"
-msgstr "Izveidot jaunu kontaktu"
-
-#: ../modules/addressbook/e-book-shell-backend.c:347
-msgctxt "New"
-msgid "Contact _List"
-msgstr "Kontaktu _saraksts"
-
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
-msgid "Create a new contact list"
-msgstr "Izveidot jaunu kontaktu sarakstu"
-
-#: ../modules/addressbook/e-book-shell-backend.c:357
-msgctxt "New"
-msgid "Address _Book"
-msgstr "Adrešu _gr�mata"
-
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
-msgid "Create a new address book"
-msgstr "Izveidot jaunu adrešu gr�matu"
-
-#. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
-msgid "Contacts"
-msgstr "Kontakti"
-
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-#| msgid "Source"
-msgid "Source List"
-msgstr "Avotu saraksts"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-#| msgid "Couldn't get list of address books"
-msgid "The registry of address books"
-msgstr "Adrešu gr�matas reģistrs"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-#| msgid "_Current View"
-msgid "Current View"
-msgstr "Pašreizējais skats"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "Pašlaik izvēlēto adrešu gr�matu skats"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-#| msgid "New Contact"
-msgid "Previewed Contact"
-msgstr "Priekšskatītais kontakts"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-#| msgid "Whether to show the preview pane."
-msgid "The contact being shown in the preview pane"
-msgstr "Kontakts, kuru r�da priekšskatījuma rūtī"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:692
-#| msgid "Sidebar is visible"
-msgid "Preview is Visible"
-msgstr "Priekšskatījums ir redzams"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:693
-#| msgid "Whether to show the preview pane."
-msgid "Whether the preview pane is visible"
-msgstr "Vai priekšskatījuma rūts ir redzama"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP serveri"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "Autom�tisk�s pabeigšanas iestatījumi"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-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 ""
-"Evolution kontaktu mapes atrašan�s vieta un hierarhija ir mainījusies kopš "
-"Evolution 1.x.\n"
-"\n"
-"Lūdzu, esiet pacietīgi, kamēr Evolution p�rnes jūsu mapes..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Pasta kontaktu saraksta form�ts ir mainījies.\n"
-"\n"
-"Lūdzu, esiet pacietīgi, kamēr Evolution p�rnes jūsu mapes..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Veids, k�d� Evolution saglab� dažus t�lruņa numurus, ir mainījusies.\n"
-"\n"
-"Lūdzu, esiet pacietīgi, kamēr Evolution p�rceļ jūsu mapes..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolution Palm Sync karšu faili ir mainījušies.\n"
-"\n"
-"Lūdzu, esiet pacietīgi, kamēr Evolution p�rceļ jūsu Pilot Sync datus..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:763
-#: ../modules/calendar/e-memo-shell-sidebar.c:689
-#: ../modules/calendar/e-task-shell-sidebar.c:689
-#| msgid "Memo Source Selector"
-msgid "Source Selector Widget"
-msgstr "Avota selektors logrīks"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-#| msgid "Couldn't get list of address books"
-msgid "This widget displays groups of address books"
-msgstr "Šis logrīks attēlo grupas un adrešu gr�matas"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
-#| msgid "Save as vCard..."
-msgid "Save as vCard"
-msgstr "Saglab�t k� vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
-msgid "Co_py All Contacts To..."
-msgstr "Ko_pēt visus kontaktus..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
-#| msgid "Copy the contacts of the selected folder into another folder"
-msgid "Copy the contacts of the selected address book to another"
-msgstr "Kopēt kontaktus no izvēlētas adrešu gr�matas cit�"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
-#| msgid "Del_ete Address Book"
-msgid "D_elete Address Book"
-msgstr "Dzēst adr_ešu gr�matu"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
-#| msgid "Delete the selected folder"
-msgid "Delete the selected address book"
-msgstr "Dzēst izvēlēto adrešu gr�matu"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
-msgid "Mo_ve All Contacts To..."
-msgstr "P�r_vietot visus kontaktus uz..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
-#| msgid "Move the contacts of the selected folder into another folder"
-msgid "Move the contacts of the selected address book to another"
-msgstr "P�rvietot kontaktus no izvēlēt�s adrešu gr�matas cit�"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
-msgid "_New Address Book"
-msgstr "Jau_na adrešu gr�mata"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
-msgid "Address _Book Properties"
-msgstr "Adrešu _gr�matas īpašības"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
-#| msgid "Change the properties of the selected folder"
-msgid "Show properties of the selected address book"
-msgstr "R�dīt izvēlēt�s adrešu gr�matas īpašības"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:950
-msgid "_Rename..."
-msgstr "P�_rsaukt..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
-#| msgid "Rename the selected folder"
-msgid "Rename the selected address book"
-msgstr "P�rsaukt izvēlēto adrešu gr�matu"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
-#| msgid "S_ave Address Book As VCard"
-msgid "S_ave Address Book as vCard"
-msgstr "S_aglab�t adrešu gr�matu k� vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
-#| msgid "Save the contacts of the selected folder as VCard"
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr "Saglab�t kontaktus no izvēlētas adrešu gr�matas k� vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
-#| msgid "Stop Loading"
-msgid "Stop loading"
-msgstr "Apst�din�t iel�di"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
-#| msgid "_Copy Contact to..."
-msgid "_Copy Contact To..."
-msgstr "_Kopēt kontaktu uz..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
-#| msgid "Copy selected contacts to another folder"
-msgid "Copy selected contacts to another address book"
-msgstr "Kopēt izvēlētos kontaktus uz citu adrešu gr�matu"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
-msgid "_Delete Contact"
-msgstr "_Dzēst kontaktu"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
-#| msgid "_Forward Contact..."
-msgid "_Find in Contact..."
-msgstr "_Atrast kontakt�..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
-#| msgid "Search for text in the body of the displayed message"
-msgid "Search for text in the displayed contact"
-msgstr "Meklēt tekstu attēlotaj� kontakt�"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
-msgid "_Forward Contact..."
-msgstr "_P�rsūtīt kontaktu..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
-msgid "Send selected contacts to another person"
-msgstr "Sūtīt izvēlētos kontaktus citai personai"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
-#| msgid "_Move Contact to..."
-msgid "_Move Contact To..."
-msgstr "_P�rvietot kontaktu uz..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
-#| msgid "Move selected contacts to another folder"
-msgid "Move selected contacts to another address book"
-msgstr "P�rvietot izvēlētos kontaktus uz citu adrešu gr�matu"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
-msgid "_New Contact..."
-msgstr "Jau_ns kontakts..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
-msgid "New Contact _List..."
-msgstr "Jauns kontaktu _saraksts..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
-#| msgctxt "New"
-#| msgid "_Contact"
-msgid "_Open Contact"
-msgstr "Atvērt k_ontaktu"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
-msgid "View the current contact"
-msgstr "Skatīt pašreizējo kontaktu"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
-msgid "_Send Message to Contact..."
-msgstr "_Sūtīt vēstuli kontaktam..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
-msgid "Send a message to the selected contacts"
-msgstr "Sūtīt ziņojumu izvēlētajiem kontaktiem."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
-msgid "_Actions"
-msgstr "D_arbības"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1094
-msgid "_Preview"
-msgstr "_Priekšskatījums"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
-msgid "_Delete"
-msgstr "_Dzēst"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
-msgid "_Properties"
-msgstr "Ī_pašības"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
-msgid "_Save as vCard..."
-msgstr "_Saglab�t k� vCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
-msgid "Contact _Preview"
-msgstr "Kontaktu _priekšskatījums"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
-msgid "Show contact preview window"
-msgstr "R�dīt kontaktu priekšskatījuma logu"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
-msgid "_Classic View"
-msgstr "_Klasiskais skats"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
-#| msgid "Show message preview below the message list"
-msgid "Show contact preview below the contact list"
-msgstr "R�dīt kontaktu priekšskatījumu zem kontaktu saraksta"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
-msgid "_Vertical View"
-msgstr "_Vertik�lais skats"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
-#| msgid "Show contact preview window"
-msgid "Show contact preview alongside the contact list"
-msgstr "R�dīt kontaktu priekšskatījumu pie kontaktu saraksta"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
-msgid "Any Category"
-msgstr "Jebkura kategorija"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
-msgid "Unmatched"
-msgstr "Neatbilstoši"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
-#: ../shell/e-shell-content.c:516
-msgid "Advanced Search"
-msgstr "Paplašin�t� meklēšana"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
-#| msgid "Print selected contacts"
-msgid "Print all shown contacts"
-msgstr "Druk�t visus redzamos kontaktus"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
-#| msgid "Previews the contacts to be printed"
-msgid "Preview the contacts to be printed"
-msgstr "Druk�jamo kontaktu priekšskatījums"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
-msgid "Print selected contacts"
-msgstr "Druk�t izvēlētos kontaktus"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Saglab�t k� vCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
-#| msgid "Save selected contacts as a VCard"
-msgid "Save selected contacts as a vCard"
-msgstr "Saglab�t izvēlētos kontaktus k� vCard"
-
-#: ../modules/addressbook/e-book-shell-view.c:338
-msgid "_Forward Contacts"
-msgstr "_P�rsūtīt kontaktus"
-
-#: ../modules/addressbook/e-book-shell-view.c:340
-msgid "_Forward Contact"
-msgstr "_P�rsūtīt kontaktu"
-
-#: ../modules/addressbook/e-book-shell-view.c:371
-#| msgid "Send _Message to Contacts"
-msgid "_Send Message to Contacts"
-msgstr "_Sūtīt vēstuli kontaktiem"
-
-#: ../modules/addressbook/e-book-shell-view.c:373
-#| msgid "Send _Message to List"
-msgid "_Send Message to List"
-msgstr "_Sūtīt vēstuli sarakstam"
-
-#: ../modules/addressbook/e-book-shell-view.c:375
-#| msgid "Send _Message to Contact"
-msgid "_Send Message to Contact"
-msgstr "_Sūtīt vēstuli kontaktam"
-
-#: ../modules/addressbook/eab-composer-util.c:137
-msgid "Multiple vCards"
-msgstr "Vair�kas vCard"
-
-#: ../modules/addressbook/eab-composer-util.c:145
-#, c-format
-msgid "vCard for %s"
-msgstr "%s vCard"
-
-#: ../modules/addressbook/eab-composer-util.c:157
-#: ../modules/addressbook/eab-composer-util.c:184
-#, c-format
-msgid "Contact information"
-msgstr "Kontaktinform�cija"
-
-#: ../modules/addressbook/eab-composer-util.c:186
-#, c-format
-msgid "Contact information for %s"
-msgstr "%s kontaktinform�cija"
-
-#: ../modules/addressbook/ldap-config.ui.h:1
-msgid "1"
-msgstr "1"
-
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
-#: ../modules/addressbook/ldap-config.ui.h:4
-msgid "5"
-msgstr "5"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
-msgid "Anonymously"
-msgstr "Anonīmi"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
-msgid "B_rowse this book until limit reached"
-msgstr "P�_rlūkot šo gr�matu, līdz tiek sasniegti limiti"
-
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "Lo_gin:"
-msgstr "_Lietot�jv�rds:"
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
-#| msgid "Online"
-msgid "One"
-msgstr "Viens"
-
-#: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Search Filter"
-msgstr "Meklēšanas filtrs"
-
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Search _base:"
-msgstr "Meklēšanas _b�ze:"
-
-#: ../modules/addressbook/ldap-config.ui.h:16
-msgid "Search _filter:"
-msgstr "Meklēšanas _filtrs:"
-
-#: ../modules/addressbook/ldap-config.ui.h:17
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-"Meklēšanas filtrs ir meklēšanas laik� meklējamo objektu tips. Ja tas netiek "
-"mainīts, pēc noklusējuma tas būs tips \"persona\"."
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
-msgid "Sub"
-msgstr "Zem"
-
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "Supported Search Bases"
-msgstr "Atbalstīt�s meklēšanas b�zes"
-
-#: ../modules/addressbook/ldap-config.ui.h:22
-#| msgid "Distinguished name"
-msgid "Using distinguished name (DN)"
-msgstr "Izmanto atšķiramo v�rdu (DN)"
-
-#: ../modules/addressbook/ldap-config.ui.h:23
-msgid "Using email address"
-msgstr "Izmanto e-pasta adresi"
-
-#: ../modules/addressbook/ldap-config.ui.h:24
-msgid "_Download limit:"
-msgstr "_Lejupiel�des limits:"
-
-#: ../modules/addressbook/ldap-config.ui.h:25
-msgid "_Find Possible Search Bases"
-msgstr "_Atrast iespējam�s meklēšanas b�zes"
-
-#: ../modules/addressbook/ldap-config.ui.h:26
-msgid "_Login method:"
-msgstr "_Pieteikšan�s metode:"
-
-#: ../modules/addressbook/ldap-config.ui.h:28
-msgid "_Port:"
-msgstr "_Ports:"
-
-#: ../modules/addressbook/ldap-config.ui.h:29
-msgid "_Search scope:"
-msgstr "Meklēšana_s mērogs:"
-
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Timeout:"
-msgstr "Laika limi_ts:"
-
-#: ../modules/addressbook/ldap-config.ui.h:32
-msgid "_Use secure connection:"
-msgstr "Lietot droš_u savienojumu:"
-
-#: ../modules/addressbook/ldap-config.ui.h:33
-msgid "cards"
-msgstr "kartes"
-
-#: ../modules/calendar/e-cal-attachment-handler.c:259
-msgid "I_mport"
-msgstr "I_mpotrēt"
-
-#: ../modules/calendar/e-cal-attachment-handler.c:341
-msgid "Select a Calendar"
-msgstr "Izvēlies kalend�ru"
-
-#: ../modules/calendar/e-cal-attachment-handler.c:368
-msgid "Select a Task List"
-msgstr "Izvēlieties uzdevumu sarakstu"
-
-#: ../modules/calendar/e-cal-attachment-handler.c:378
-msgid "I_mport to Calendar"
-msgstr "I_mportēt kalend�r�"
-
-#: ../modules/calendar/e-cal-attachment-handler.c:385
-msgid "I_mport to Tasks"
-msgstr "I_mportēt uzdevumu sarakst�"
-
-#. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:110
-#: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
-msgid "On The Web"
-msgstr "Tīmeklī"
-
-#: ../modules/calendar/e-cal-shell-backend.c:127
-#: ../plugins/calendar-weather/calendar-weather.c:117
-msgid "Weather"
-msgstr "Laikapst�kļi"
-
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
-msgid "Birthdays & Anniversaries"
-msgstr "Dzimšanas dienas & gadadienas"
-
-#: ../modules/calendar/e-cal-shell-backend.c:446
-msgctxt "New"
-msgid "_Appointment"
-msgstr "Tikš_an�s"
-
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
-msgid "Create a new appointment"
-msgstr "Izveidot jaunu tikšanos"
-
-#: ../modules/calendar/e-cal-shell-backend.c:453
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "Visas dienas _tikšan�s"
-
-#: ../modules/calendar/e-cal-shell-backend.c:455
-msgid "Create a new all-day appointment"
-msgstr "Izveidot jaunu tikšanos visai dienai"
-
-#: ../modules/calendar/e-cal-shell-backend.c:460
-msgctxt "New"
-msgid "M_eeting"
-msgstr "San�ksm_e"
-
-#: ../modules/calendar/e-cal-shell-backend.c:462
-msgid "Create a new meeting request"
-msgstr "Izveidot jaunu san�ksmes pieprasījumu"
-
-#: ../modules/calendar/e-cal-shell-backend.c:470
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "Kale_nd�rs"
-
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
-msgid "Create a new calendar"
-msgstr "Izveidot jaunu kalend�ru"
-
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
-msgid "Calendar and Tasks"
-msgstr "Kalend�rs un uzdevumi"
-
-#: ../modules/calendar/e-cal-shell-backend.c:778
-#| msgid "Primary calendar"
-msgid "The registry of calendars"
-msgstr "Kalend�ru reģistrs"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-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 ""
-"Evolution kalend�ru mapju atrašan�s vieta un hierarhija ir mainījusies kopš "
-"Evolution 1.x.\n"
-"\n"
-"Lūdzu, uzgaidiet, kamēr Evolution p�rceļ jūsu mapes"
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "Nevar p�rcelt vecos iestatījumus no evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Nevar p�rcelt kalend�ru `%s'"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:168
-#: ../modules/calendar/e-memo-shell-sidebar.c:163
-#: ../modules/calendar/e-task-shell-sidebar.c:163
-#, c-format
-#| msgid ""
-#| "Error on %s:\n"
-#| " %s"
-msgid ""
-"Error on %s\n"
-"%s"
-msgstr ""
-"Kļūda uz %s:\n"
-" %s"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:227
-#| msgid "Loading Calendar"
-msgid "Loading calendars"
-msgstr "Iel�dē kalend�rus"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:617
-#| msgid "Calendar Source Selector"
-msgid "Calendar Selector"
-msgstr "Kalend�ra selektors"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:743
-msgid "Date Navigator Widget"
-msgstr "Datu navig�cijas logrīks"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:744
-msgid "This widget displays a miniature calendar"
-msgstr "Šis logrīks attēlo miniatūras kalend�ru"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:753
-#| msgid "Default Mail Client"
-msgid "Default Calendar Client"
-msgstr "Noklusētais kalend�ra klients"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:754
-msgid "Default client for calendar operations"
-msgstr "Kalend�ra darbību noklusētais klients"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:764
-msgid "This widget displays groups of calendars"
-msgstr "Šis logrīks attēlo kalend�ru grupas"
-
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:952
-#, c-format
-#| msgid "Opening calendar"
-msgid "Opening calendar at %s"
-msgstr "Atver kalend�ru %s"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
-msgid "Print"
-msgstr "Druk�t"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:306
-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 ""
-"Šī darbība pilnīb� izdzēsīs visus notikumus, kuri ir vec�ki par par nor�dīto "
-"laiku. Ja turpin�siet, jūs vairs nevarēsiet atjaunot šos notikumus."
-
-#. Translators: This is the first part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
-msgid "Purge events older than"
-msgstr "Dzēš notikumus vec�kus par"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:534
-#| msgid "Copying items"
-msgid "Copying Items"
-msgstr "Kopē priekšmetus"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
-#| msgid "Moving items"
-msgid "Moving Items"
-msgstr "P�rvieto priekšmetus"
-
-#. Translators: Default filename part saving an event to a file when
-#. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1098
-#| msgid "Sent"
-msgid "event"
-msgstr "notikums"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
-#| msgid "Select a Calendar"
-msgid "Save as iCalendar"
-msgstr "Saglab�t k� iCalendar"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
-msgid "_Copy..."
-msgstr "_Kopēt..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
-#| msgid "Select a Calendar"
-msgid "D_elete Calendar"
-msgstr "Dzēst kal_end�ru"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
-#| msgid "Delete the selected folder"
-msgid "Delete the selected calendar"
-msgstr "Dzēst izvēlēto kalend�ru"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
-#| msgid "Go back"
-msgid "Go Back"
-msgstr "Iet atpakaļ"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
-#| msgid "Go forward"
-msgid "Go Forward"
-msgstr "Iet uz priekšu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "Izvēlē_ties šodienu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
-msgid "Select today"
-msgstr "Izvēlēties šodienu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
-msgid "Select _Date"
-msgstr "Izvēlēties _datumu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
-msgid "Select a specific date"
-msgstr "Izvēlēties noteiktu datumu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
-msgid "_New Calendar"
-msgstr "Jau_ns kalend�rs"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
-msgid "Purg_e"
-msgstr "Iztīrī_t"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
-msgid "Purge old appointments and meetings"
-msgstr "Iztīrīt vecos norīkojumus un tikšan�s"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
-msgid "Re_fresh"
-msgstr "_Atsvaidzin�t"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
-#| msgid "Rename the selected folder"
-msgid "Refresh the selected calendar"
-msgstr "Atsvaidzin�t izvēlēto kalend�ru"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
-#| msgid "Rename the selected folder"
-msgid "Rename the selected calendar"
-msgstr "P�rsaukt izvēlēto kalend�ru"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
-#| msgid "Show _only this Calendar"
-msgid "Show _Only This Calendar"
-msgstr "R�dīt tikai š_o kalend�ru"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
-msgid "Cop_y to Calendar..."
-msgstr "Kopē_t uz kalend�ru..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
-msgid "_Delegate Meeting..."
-msgstr "_Deleģēt san�ksmi..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
-#| msgid "Delete the appointment"
-msgid "_Delete Appointment"
-msgstr "_Dzēst tikšanos"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
-#| msgid "Delete the appointment"
-msgid "Delete selected appointments"
-msgstr "Dzēst izvēlēt�s tikšan�s"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
-#| msgid "Delete this _Occurrence"
-msgid "Delete This _Occurrence"
-msgstr "Dzēst šo n_otikumu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
-msgid "Delete this occurrence"
-msgstr "Dzēst šo gadījumu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
-#| msgid "Delete _All Occurrences"
-msgid "Delete All Occ_urrences"
-msgstr "Dzēst visus notik_umus"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
-msgid "Delete all occurrences"
-msgstr "Dzēst visus gadījumus"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
-#| msgid "New All Day _Event"
-msgid "New All Day _Event..."
-msgstr "Jauns visas di_enas notikums..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
-#| msgid "Create a new all-day appointment"
-msgid "Create a new all day event"
-msgstr "Izveidot jaunu visas dienas notikumu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
-msgid "_Forward as iCalendar..."
-msgstr "_P�rsūtīt k� iCalendar..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
-#| msgid "New _Meeting"
-msgid "New _Meeting..."
-msgstr "Jauna san�ks_me..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
-#| msgid "Create a new meeting request"
-msgid "Create a new meeting"
-msgstr "Izveidot jaunu san�ksmi"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
-msgid "Mo_ve to Calendar..."
-msgstr "P�r_vietot uz kalend�ru..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
-msgid "New _Appointment..."
-msgstr "J_auna tikšan�s..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
-msgid "Make this Occurrence _Movable"
-msgstr "Padarīt šo notikumu p�rvietoja_mu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
-msgid "_Open Appointment"
-msgstr "Atvērt norīk_ojumu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
-msgid "View the current appointment"
-msgstr "R�dīt pašreizējo norīkojumu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
-msgid "_Reply"
-msgstr "_Atbildēt"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#| msgid "Save as vCard..."
-msgid "Save as iCalendar..."
-msgstr "Saglab�t k� iCalendar..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
-msgid "_Schedule Meeting..."
-msgstr "_Pl�not san�ksmi..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
-#| msgid "Purge old appointments and meetings"
-msgid "Converts an appointment to a meeting"
-msgstr "P�rveido tikšanos par san�ksmi"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
-#| msgid "New _Appointment..."
-msgid "Conv_ert to Appointment..."
-msgstr "P�rv_eidot par tikšanos..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
-#| msgid "%s at the end of the appointment"
-msgid "Converts a meeting to an appointment"
-msgstr "P�rveido san�ksmi par tikšanos"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
-msgid "Day"
-msgstr "Diena"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
-msgid "Show one day"
-msgstr "R�dīt vienu dienu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
-msgid "List"
-msgstr "Saraksts"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
-msgid "Show as list"
-msgstr "R�dīt k� sarakstu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
-msgid "Month"
-msgstr "MÄ“nesis"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
-msgid "Show one month"
-msgstr "R�dīt vienu mēnesi"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
-msgid "Week"
-msgstr "Nedēļa"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
-msgid "Show one week"
-msgstr "R�dīt vienu nedēļu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
-#| msgid "Show one week"
-msgid "Show one work week"
-msgstr "R�dīt vienu darba nedēļu"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
-msgid "Active Appointments"
-msgstr "Aktīv�s tikšan�s"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
-msgid "Next 7 Days' Appointments"
-msgstr "N�kamo 7 dienu tikšan�s"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
-msgid "Description contains"
-msgstr "Apraksts satur"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
-msgid "Summary contains"
-msgstr "Kopsavilkums satur"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
-msgid "Print this calendar"
-msgstr "Druk�t šo kalend�ru"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
-#| msgid "Previews the calendar to be printed"
-msgid "Preview the calendar to be printed"
-msgstr "Priekšskatījums druk�jamajam kalend�ram"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
-msgid "Go To"
-msgstr "Iet uz"
-
-#. Translators: Default filename part saving a memo to a file when
-#. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
-#| msgid "Memo"
-msgid "memo"
-msgstr "memo"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
-#| msgid "New memo"
-msgid "New _Memo"
-msgstr "Jauns _memo"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
-msgid "Create a new memo"
-msgstr "Izveidot jaunu memo"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
-msgid "_Open Memo"
-msgstr "Atvērt mem_o"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
-msgid "View the selected memo"
-msgstr "Skatīt izvēlēto memo"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
-msgid "Open _Web Page"
-msgstr "Atvērt _tīmekļa lappusi"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
-#| msgid "View the selected memo"
-msgid "Print the selected memo"
-msgstr "Druk�t izvēlētos memo"
-
-#. Translators: Default filename part saving a task to a file when
-#. * no summary is filed, the '.ics' extension is concatenated to it.
-#. Translators: Default filename part saving a task to a file when
-#. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
-#| msgid "Task"
-msgid "task"
-msgstr "uzdevums"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
-msgid "_Assign Task"
-msgstr "_Piešķirt uzdevumu"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
-msgid "_Mark as Complete"
-msgstr "_Atzīmēt k� izpildītu"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
-msgid "Mark selected tasks as complete"
-msgstr "Atzīmēt izvēlētos uzdevumus k� izpildītus"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-msgid "_Mark as Incomplete"
-msgstr "_Atzīmēt k� nepabeigtu"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
-#| msgid "Mark selected tasks as complete"
-msgid "Mark selected tasks as incomplete"
-msgstr "Atzīmēt izvēlētos uzdevumus k� nepabeigtus"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
-msgid "New _Task"
-msgstr "Jauns _uzdevums"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
-msgid "Create a new task"
-msgstr "Izveidot jaunu uzdevumu"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
-msgid "_Open Task"
-msgstr "_Atvērt uzdevumu"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
-msgid "View the selected task"
-msgstr "Skatīt izvēlēto uzdevumu"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
-#| msgid "_Forward as iCalendar..."
-msgid "_Save as iCalendar..."
-msgstr "_Saglab�t k� iCalendar..."
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
-#| msgid "View the selected task"
-msgid "Print the selected task"
-msgstr "Druk�t izvēlēto uzdevumu"
-
-#: ../modules/calendar/e-memo-shell-backend.c:318
-msgctxt "New"
-msgid "Mem_o"
-msgstr "Mem_o"
-
-#: ../modules/calendar/e-memo-shell-backend.c:325
-#| msgctxt "New"
-#| msgid "_Shared memo"
-msgctxt "New"
-msgid "_Shared Memo"
-msgstr "Koplietošana_s memo"
-
-#: ../modules/calendar/e-memo-shell-backend.c:327
-#| msgid "Create a shared new memo"
-msgid "Create a new shared memo"
-msgstr "Izveidot jaunu koplietošanas memo"
-
-#: ../modules/calendar/e-memo-shell-backend.c:335
-#| msgid "Memo List"
-msgctxt "New"
-msgid "Memo Li_st"
-msgstr "Memo _saraksts"
-
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
-msgid "Create a new memo list"
-msgstr "Izveidot jaunu memo sarakstu"
-
-#: ../modules/calendar/e-memo-shell-backend.c:588
-#| msgid "Primary memo list"
-msgid "The registry of memo lists"
-msgstr "Memo sarakstu reģistrs"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-#| msgid "Table model"
-msgid "The memo table model"
-msgstr "Memo tabulas modelis"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:222
-msgid "Loading memos"
-msgstr "Iel�dē memo"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:571
-#| msgid "Memo Source Selector"
-msgid "Memo List Selector"
-msgstr "Memo saraksta selektors"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:679
-#| msgid "Default Mail Client"
-msgid "Default Memo Client"
-msgstr "Noklusētais memo klients"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:680
-#| msgid "Cannot perform the operation."
-msgid "Default client for memo operations"
-msgstr "Memo darbību noklusētais klients"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:690
-msgid "This widget displays groups of memo lists"
-msgstr "Šis logrīks attēlo memo sarakstu grupas"
-
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:870
-#, c-format
-msgid "Opening memos at %s"
-msgstr "Atver memo no %s"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-msgid "Print Memos"
-msgstr "Izdruk�t memo"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
-#| msgid "_Delete Message"
-msgid "_Delete Memo"
-msgstr "_Dzēst memo"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
-#| msgid "_Find in Message..."
-msgid "_Find in Memo..."
-msgstr "_Meklēt iekš memo..."
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
-#| msgid "Search for text in the body of the displayed message"
-msgid "Search for text in the displayed memo"
-msgstr "Meklēt tekstu attēlotaj� memo"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
-#| msgid "_New Memo List"
-msgid "D_elete Memo List"
-msgstr "Dzēst m_emo sarakstu"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
-#| msgid "Delete selected memos"
-msgid "Delete the selected memo list"
-msgstr "Dzēst izvēlēto memo sarakstu"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
-msgid "_New Memo List"
-msgstr "Jau_ns memo saraksts"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
-#| msgid "Delete selected memos"
-msgid "Refresh the selected memo list"
-msgstr "Atsvaidzin�t izvēlēto memo sarakstu"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
-#| msgid "Rename the selected folder"
-msgid "Rename the selected memo list"
-msgstr "P�rsaukt izvēlēto memo sarakstu"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
-#| msgid "Show _only this Memo List"
-msgid "Show _Only This Memo List"
-msgstr "R�dīt tikai š_o memo sarakstu"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
-#| msgid "_Preview"
-msgid "Memo _Preview"
-msgstr "Memo _priekšskatījums"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
-#| msgid "Show preview pane"
-msgid "Show memo preview pane"
-msgstr "R�dīt memo priekšskatījuma rūti"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
-#| msgid "Show message preview below the message list"
-msgid "Show memo preview below the memo list"
-msgstr "R�dīt memo priekšskatījumu zem memo saraksta"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
-#| msgid "Show message preview below the message list"
-msgid "Show memo preview alongside the memo list"
-msgstr "R�dīt memo priekšskatījumu pie memo saraksta"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
-msgid "Print the list of memos"
-msgstr "Druk�t memo sarakstu"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
-#| msgid "Previews the list of memos to be printed"
-msgid "Preview the list of memos to be printed"
-msgstr "Priekšskatīt druk�jamo memo sarakstu"
-
-#: ../modules/calendar/e-memo-shell-view-private.c:416
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d memo"
-msgstr[1] "%d memo"
-msgstr[2] "%d memo"
-
-#: ../modules/calendar/e-memo-shell-view-private.c:420
-#: ../modules/calendar/e-task-shell-view-private.c:569
-#, c-format
-#| msgid ", %d selected"
-#| msgid_plural ", %d selected"
-msgid "%d selected"
-msgstr "%d izvēlēti"
-
-#: ../modules/calendar/e-memo-shell-view.c:223
-#| msgid "_Delete Message"
-msgid "Delete Memos"
-msgstr "Dzēst memo"
-
-#: ../modules/calendar/e-memo-shell-view.c:225
-#| msgid "Delegate To"
-msgid "Delete Memo"
-msgstr "Dzēst memo"
-
-#: ../modules/calendar/e-task-shell-backend.c:322
-msgctxt "New"
-msgid "_Task"
-msgstr "_Uzdevums"
-
-#: ../modules/calendar/e-task-shell-backend.c:329
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "Piešķirtais uz_devums"
-
-#: ../modules/calendar/e-task-shell-backend.c:331
-msgid "Create a new assigned task"
-msgstr "Izveidot jaunu piešķirtu uzdevumu"
-
-#: ../modules/calendar/e-task-shell-backend.c:339
-#| msgid "Task List"
-msgctxt "New"
-msgid "Tas_k List"
-msgstr "Uzdevumu sara_ksts"
-
-#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
-msgid "Create a new task list"
-msgstr "Izveidot jaunu uzdevumu sarakstu"
-
-#: ../modules/calendar/e-task-shell-backend.c:598
-#| msgid "Primary task list"
-msgid "The registry of task lists"
-msgstr "Uzdevumu saraksta reģistrs"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-#| msgid "Table model"
-msgid "The task table model"
-msgstr "Uzdevumu tabulas modelis"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution uzdevumu mapju atrašan�s vieta un hierarhija ir mainījusies kopš "
-"Evolution 1.x.\n"
-"\n"
-"Lūdzu, uzgaidiet, kamēr Evolution p�rceļ jūsu mapes..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Nevar p�rcelt uzdevumus `%s'"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:222
-msgid "Loading tasks"
-msgstr "Iel�dē uzdevumus"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:571
-#| msgid "Task Source Selector"
-msgid "Task List Selector"
-msgstr "Uzdevuma saraksta selektors"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:679
-#| msgid "Default Mail Client"
-msgid "Default Task Client"
-msgstr "Noklusētais uzdevumu klients"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:680
-#| msgid "Default value for thread expand state"
-msgid "Default client for task operations"
-msgstr "Uzdevumu darbību noklusētais klients"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:690
-msgid "This widget displays groups of task lists"
-msgstr "Šis logrīks attēlo uzdevumu sarakstu grupas"
-
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:870
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Atver uzdevumus uz %s"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-msgid "Print Tasks"
-msgstr "Druk�t uzdevumus"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:553
-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 ""
-"Šī darbība pilnīb� izdzēsīs visus uzdevumus, kuri ir atzīmēti k� izpildīti. "
-"Ja jūs turpin�siet, jūs vairs nevarēsiet atgūt šos uzdevumus.\n"
-"\n"
-"Tieš�m izdzēst šos uzdevumus?"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:678
-#| msgid "_Delete all"
-msgid "_Delete Task"
-msgstr "_Dzēst uzdevumu"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:685
-#| msgid "_Find in Message..."
-msgid "_Find in Task..."
-msgstr "_Meklēt uzdevum�..."
-
-#: ../modules/calendar/e-task-shell-view-actions.c:687
-#| msgid "Search for text in the body of the displayed message"
-msgid "Search for text in the displayed task"
-msgstr "Meklēt tekstu attēlotaj� uzdevum�"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:699
-#| msgid "_Copy..."
-msgid "Copy..."
-msgstr "Kopēt..."
-
-#: ../modules/calendar/e-task-shell-view-actions.c:706
-#| msgid "Select a Task List"
-msgid "D_elete Task List"
-msgstr "Dzēst uzd_evumu sarakstu"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:708
-#| msgid "Delete selected tasks"
-msgid "Delete the selected task list"
-msgstr "Dzēst izvēlēto uzdevumu sarakstu"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:713
-msgid "_New Task List"
-msgstr "Jau_ns uzdevumu saraksts"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:729
-#| msgid "Delete selected tasks"
-msgid "Refresh the selected task list"
-msgstr "Atsvaidzin�t izvēlēto uzdevumu sarakstu"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:736
-#| msgid "Rename the selected folder"
-msgid "Rename the selected task list"
-msgstr "P�rsaukt izvēlēto uzdevumu sarakstu"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:741
-#| msgid "Show _only this Task List"
-msgid "Show _Only This Task List"
-msgstr "R�dīt tikai š_o uzdevumu sarakstu"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:755
-#| msgid "_Mark as Incomplete"
-msgid "Mar_k as Incomplete"
-msgstr "Atzīmēt _k� nepabeigtu"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:785
-msgid "Delete completed tasks"
-msgstr "Dzēst izpildītos uzdevumus"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:860
-msgid "Task _Preview"
-msgstr "Uzdevuma _priekšskatījums"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:862
-#| msgid "Show preview pane"
-msgid "Show task preview pane"
-msgstr "R�dīt uzdevuma priekšskatījuma rūti"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:883
-#| msgid "Show message preview below the message list"
-msgid "Show task preview below the task list"
-msgstr "R�dīt uzdevumu priekšskatījumu zem uzdevumu saraksta"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:890
-#| msgid "Show message preview below the message list"
-msgid "Show task preview alongside the task list"
-msgstr "R�dīt uzdevumu priekšskatījumu pie uzdevumu saraksta"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:898
-msgid "Active Tasks"
-msgstr "Aktīvie uzdevumi"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:912
-msgid "Completed Tasks"
-msgstr "Izpildītie uzdevumi"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:919
-msgid "Next 7 Days' Tasks"
-msgstr "N�kamo 7 dienu uzdevumi"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:926
-msgid "Overdue Tasks"
-msgstr "Nokavētie uzdevumi"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:933
-msgid "Tasks with Attachments"
-msgstr "Uzdevumi ar pielikumiem"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:983
-msgid "Print the list of tasks"
-msgstr "Druk�t uzdevumu sarakstu"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:990
-#| msgid "Previews the list of tasks to be printed"
-msgid "Preview the list of tasks to be printed"
-msgstr "Druk�jam� uzdevumu saraksta priekšskatījums"
-
-#: ../modules/calendar/e-task-shell-view-private.c:463
-msgid "Expunging"
-msgstr "Izsvītro"
-
-#: ../modules/calendar/e-task-shell-view-private.c:565
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d uzdevums"
-msgstr[1] "%d uzdevumi"
-msgstr[2] "%d uzdevumi"
-
-#: ../modules/calendar/e-task-shell-view.c:351
-#| msgid "Completed Tasks"
-msgid "Delete Tasks"
-msgstr "Dzēst uzdevumus"
-
-#: ../modules/calendar/e-task-shell-view.c:353
-#| msgid "Delegate To"
-msgid "Delete Task"
-msgstr "Dzēst uzdevumu"
-
-#. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
-#, c-format
-msgid "%d attached messages"
-msgstr "Pievienoti %d ziņojumi"
-
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
-#| msgid "None"
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "Nekas"
-
-#: ../modules/mail/e-mail-shell-backend.c:168
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "_Pasta vēstule"
-
-#: ../modules/mail/e-mail-shell-backend.c:170
-msgid "Compose a new mail message"
-msgstr "Sacerēt jaunu pasta vēstuli"
-
-#: ../modules/mail/e-mail-shell-backend.c:178
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "Vēstuļu _mape"
-
-#: ../modules/mail/e-mail-shell-backend.c:180
-msgid "Create a new mail folder"
-msgstr "Izveidot jaunu vēstuļu mapi"
-
-#: ../modules/mail/e-mail-shell-backend.c:199
-msgid "Mail Accounts"
-msgstr "Pasta konti"
-
-#: ../modules/mail/e-mail-shell-backend.c:207
-msgid "Mail Preferences"
-msgstr "Pasta iestatījumi"
-
-#: ../modules/mail/e-mail-shell-backend.c:215
-msgid "Composer Preferences"
-msgstr "Redaktora iestatījumi"
-
-#: ../modules/mail/e-mail-shell-backend.c:223
-msgid "Network Preferences"
-msgstr "Tīkla iestatījumi"
-
-#: ../modules/mail/e-mail-shell-content.c:682
-#| msgid "_Group By Threads"
-msgid "Group by Threads"
-msgstr "Grupēt pēc pavedieniem"
-
-#: ../modules/mail/e-mail-shell-content.c:683
-msgid "Whether to group messages by threads"
-msgstr "Vai grupēt vēstules pēc pavedieniem"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:859
-#: ../modules/mail/e-mail-shell-view.c:875
-#| msgid "Disable Account"
-msgid "_Disable Account"
-msgstr "_Deaktivizēt kontu"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:861
-#| msgid "Disable Account"
-msgid "Disable this account"
-msgstr "Deaktivizēt šo kontu"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:868
-#| msgid "Permanently remove all deleted messages from all folders"
-msgid "Permanently remove all the deleted messages from all folders"
-msgstr "Pilnīb� izmest visas dzēst�s vēstules no vis�m mapēm"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:873
-msgid "C_reate Search Folder From Search..."
-msgstr "_Izveidot meklējuma mapi no meklējuma..."
-
-#: ../modules/mail/e-mail-shell-view-actions.c:880
-msgid "_Download Messages for Offline Usage"
-msgstr "_Lejupiel�dēt vēstules lietošanai nesaistes režīm�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:882
-#| msgid "Download messages of accounts/folders marked for offline"
-msgid "Download messages of accounts and folders marked for offline usage"
-msgstr ""
-"Lejupiel�dēt vēstules no kontiem/mapēm, kas atzīmētas darbībai nesaistes "
-"režīm�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:887
-msgid "Fl_ush Outbox"
-msgstr "Iztukšot izsūt_ni"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:894
-msgid "_Copy Folder To..."
-msgstr "_Kopēt mapi uz..."
-
-#: ../modules/mail/e-mail-shell-view-actions.c:896
-msgid "Copy the selected folder into another folder"
-msgstr "Kopēt izvēlēto mapi cit� mapē"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:903
-msgid "Permanently remove this folder"
-msgstr "Pilnīb� izdzēst šo mapi"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:908
-msgid "E_xpunge"
-msgstr "I_zsvītrot"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:910
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Pilnīgi izdzēst visas dzēst�s vēstules šaj� mapē"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:915
-msgid "Mar_k All Messages as Read"
-msgstr "Atzīmē_t visas vēstules k� lasītas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:917
-msgid "Mark all messages in the folder as read"
-msgstr "Atzīmēt visas vēstules šaj� mapē k� lasītas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:922
-msgid "_Move Folder To..."
-msgstr "P�rvietot _mapi uz..."
-
-#: ../modules/mail/e-mail-shell-view-actions.c:924
-msgid "Move the selected folder into another folder"
-msgstr "P�rvietot izvēlēto mapi cit� mapē"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:929
-msgid "_New..."
-msgstr "Jau_ns..."
-
-#: ../modules/mail/e-mail-shell-view-actions.c:931
-msgid "Create a new folder for storing mail"
-msgstr "Izveidot jaunu mapi pasta glab�šanai"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:938
-msgid "Change the properties of this folder"
-msgstr "Mainīt šīs mapes īpašības"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:945
-msgid "Refresh the folder"
-msgstr "Atsvaidzin�t mapi"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:952
-msgid "Change the name of this folder"
-msgstr "Mainīt šīs mapes nosaukumu"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:957
-msgid "Select Message _Thread"
-msgstr "Izvēlē_ties vēstules pavedienu"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:959
-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"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:964
-msgid "Select Message S_ubthread"
-msgstr "Izvēlēties vēst_ules apakšpavedienu"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:966
-msgid "Select all replies to the currently selected message"
-msgstr "Izvēlēties visas atbildes pašlaik izvēlētajai vēstulei"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:971
-msgid "_Unsubscribe"
-msgstr "_Atrakstīties"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:973
-#| msgid "Rename the selected folder"
-msgid "Unsubscribe from the selected folder"
-msgstr "Atrakstīties no izvēlēt�s mapes"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:978
-msgid "Empty _Trash"
-msgstr "Iz_tukšot atkritumu kasti"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:980
-#| msgid "Permanently remove all deleted messages from all folders"
-msgid "Permanently remove all the deleted messages from all accounts"
-msgstr "Pilnīb� izmest visas dzēst�s vēstules no visiem kontiem"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:985
-msgid "_New Label"
-msgstr "Jau_na etiÄ·ete"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:994
-#| msgid "None"
-msgid "N_one"
-msgstr "N_ekas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
-msgid "Hide _Read Messages"
-msgstr "Slēpt _lasīt�s vēstules"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1003
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Uz laiku slēpt vēstules, kas jau ir izlasītas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1008
-msgid "Hide S_elected Messages"
-msgstr "Slēpt i_zvēlēt�s vēstules"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1010
-msgid "Temporarily hide the selected messages"
-msgstr "Uz laiku slēpt izvēlēt�s vēstules"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
-msgid "Show Hidde_n Messages"
-msgstr "R�dīt _slēpt�s vēstules"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1017
-msgid "Show messages that have been temporarily hidden"
-msgstr "R�dīt vēstules, kas ir uz laiku slēptas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
-msgid "Cancel the current mail operation"
-msgstr "Atcelt pašreizējo pasta darbību"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
-msgid "Collapse All _Threads"
-msgstr "Sakļau_t visus pavedienus"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
-msgid "Collapse all message threads"
-msgstr "Sakļaut visas vēstules pavedien�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
-msgid "E_xpand All Threads"
-msgstr "I_zvērst visus pavedienus"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
-msgid "Expand all message threads"
-msgstr "Izvērst visus vēstuļu pavedienus"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
-msgid "_Message Filters"
-msgstr "_Vēstuļu filtrs"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
-msgid "Create or edit rules for filtering new mail"
-msgstr "Izveidot vai rediģēt jaun� pasta filtrēšanas k�rtulas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
-msgid "Search F_olders"
-msgstr "Meklēšanas m_apes"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
-#| msgid "Create or edit Search Folder definitions"
-msgid "Create or edit search folder definitions"
-msgstr "Izveidot vai rediģēt meklēšanas mapes definīcijas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
-msgid "_Subscriptions..."
-msgstr "_Abonomenti..."
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Pierakstīties vai atrakstīties uz/no mapēm uz att�lin�tajiem serveriem"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1080
-msgid "F_older"
-msgstr "M_ape"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
-msgid "_Label"
-msgstr "_EtiÄ·ete"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
-msgid "_New Folder..."
-msgstr "Jau_na mape..."
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
-msgid "Hide _Deleted Messages"
-msgstr "Slēpt _dzēst�s vēstules"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
-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"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
-msgid "Show Message _Preview"
-msgstr "R�dīt vēstules _priekšskatījumu"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
-#| msgid "Show message preview window"
-msgid "Show message preview pane"
-msgstr "R�dīt vēstules priekšskatījuma rūti"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
-msgid "_Group By Threads"
-msgstr "_Grupēt pēc pavedieniem"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
-#| msgid "Threaded Message list"
-msgid "Threaded message list"
-msgstr "Pavedienos sadalīts vēstuļu saraksts"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
-msgid "Show message preview below the message list"
-msgstr "R�dīt vēstuļu priekšskatījumu zem vēstuļu saraksta"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
-#| msgid "Show message preview below the message list"
-msgid "Show message preview alongside the message list"
-msgstr "R�dīt vēstuļu priekšskatījumu pie vēstuļu saraksta"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
-msgid "All Messages"
-msgstr "Visas vēstules"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
-msgid "Important Messages"
-msgstr "Svarīg�s vēstules"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
-msgid "Last 5 Days' Messages"
-msgstr "Pēdējo 5 dienu vēstules"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
-msgid "Messages Not Junk"
-msgstr "Ne mēstules"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
-msgid "Messages with Attachments"
-msgstr "VÄ“stules ar pielikumu"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
-msgid "No Label"
-msgstr "Bez marÄ·Ä“juma"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1248
-msgid "Read Messages"
-msgstr "Lasīt�s vēstules"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1255
-msgid "Recent Messages"
-msgstr "Nesen�s vēstules"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
-msgid "Unread Messages"
-msgstr "Neizlasīt�s vēstules"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
-#| msgid "Subject or Addresses contains"
-msgid "Subject or Addresses contain"
-msgstr "Vēstules temats vai adres�ti satur"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
-msgid "All Accounts"
-msgstr "Visi konti"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
-msgid "Current Account"
-msgstr "Pašreizējais konts"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
-msgid "Current Folder"
-msgstr "Pašreizēj� mape"
-
-#: ../modules/mail/e-mail-shell-view-private.c:892
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "%d izvēlēts, "
-msgstr[1] "%d izvēlēti, "
-msgstr[2] "%d izvēlētu, "
-
-#: ../modules/mail/e-mail-shell-view-private.c:903
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d dzēsts"
-msgstr[1] "%d dzēsti"
-msgstr[2] "%d dzēstu"
-
-#: ../modules/mail/e-mail-shell-view-private.c:909
-#: ../modules/mail/e-mail-shell-view-private.c:916
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d mēstule"
-msgstr[1] "%d mēstules"
-msgstr[2] "%d mēstuļu"
-
-#: ../modules/mail/e-mail-shell-view-private.c:922
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d melnraksts"
-msgstr[1] "%d melnraksti"
-msgstr[2] "%d melnrakstu"
-
-#: ../modules/mail/e-mail-shell-view-private.c:928
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d nenosūtīts"
-msgstr[1] "%d nenosūtītas"
-msgstr[2] "%d nenosūtītu"
-
-#: ../modules/mail/e-mail-shell-view-private.c:934
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d nosūtīta"
-msgstr[1] "%d nosūtītas"
-msgstr[2] "%d nosūtītu"
-
-#: ../modules/mail/e-mail-shell-view-private.c:946
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d nelasīta, "
-msgstr[1] "%d nelasītas, "
-msgstr[2] "%d nelasītu, "
-
-#: ../modules/mail/e-mail-shell-view-private.c:949
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d kop�"
-msgstr[1] "%d kop�"
-msgstr[2] "%d kop�"
-
-#: ../modules/mail/e-mail-shell-view.c:548
-msgid "All Account Search"
-msgstr "Visu kontu meklēšana"
-
-#: ../modules/mail/e-mail-shell-view.c:685
-msgid "Account Search"
-msgstr "Kontu meklēšana"
-
-#: ../modules/mail/e-mail-shell-view.c:873
-msgid "Proxy _Logout"
-msgstr "Starpnieka _atteikšan�s"
-
-#: ../modules/mail/em-composer-prefs.c:473
-msgid "Language(s)"
-msgstr "Valoda(-s)"
-
-#: ../modules/mail/em-mailer-prefs.c:97
-msgid "Every time"
-msgstr "Katru reizi"
-
-#: ../modules/mail/em-mailer-prefs.c:98
-msgid "Once per day"
-msgstr "Reizi dien�"
-
-#: ../modules/mail/em-mailer-prefs.c:99
-msgid "Once per week"
-msgstr "Reizi nedēļ�"
-
-#: ../modules/mail/em-mailer-prefs.c:100
-msgid "Once per month"
-msgstr "Reizi mēnesī"
-
-#: ../modules/mail/em-mailer-prefs.c:222
-msgid "Add Custom Junk Header"
-msgstr "Pievienot piel�gotu mēstules galvu"
-
-#: ../modules/mail/em-mailer-prefs.c:226
-msgid "Header Name:"
-msgstr "Galvas nosaukums:"
-
-#: ../modules/mail/em-mailer-prefs.c:227
-msgid "Header Value Contains:"
-msgstr "Galvas vērtība satur:"
-
-#: ../modules/mail/em-mailer-prefs.c:326
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "Galva"
-
-#: ../modules/mail/em-mailer-prefs.c:330
-msgid "Contains Value"
-msgstr "Satur vērtību"
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:794
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "%s spraudnis ir pieejams un bin�rais fails ir uzinstalēts."
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:803
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
-"%s spraudnis nav pieejams. Lūdzu, p�rbaudiet, vai ir uzinstalēta atbilstoš� "
-"pakotne."
-
-#: ../modules/mail/em-mailer-prefs.c:767
-#| msgid "No Junk plugin available"
-msgid "No junk plugin available"
-msgstr "Nav pieejams neviens mēstuļu spraudnis"
-
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1152
-#| msgid "Table column:"
-msgid "_Table column:"
-msgstr "_Tabulas kolonna:"
-
-#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1154
-#| msgid "Date header:"
-msgid "_Date header:"
-msgstr "_Datuma galva:"
-
-#: ../modules/mail/em-mailer-prefs.c:1155
-#| msgid "Show _Original Size"
-msgid "Show _original header value"
-msgstr "R�dīt s�k_otnējo galvas izmēru"
-
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "Hello Python"
-
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr "Python spraudņu iel�dēt�ja tests"
-
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Python testa spraudnis"
-
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Python EPlugin testa spraudņa iel�dēt�js."
+#: ../mail/searchtypes.xml.h:8
+msgid "Subject or Sender contains"
+msgstr "Vēstules tēma vai sūtīt�js satur"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+#| msgid "List local addressbook folders"
 msgid "Add local address books to Evolution."
 msgstr "Pievienot Evolution lok�l�s adrešu gr�matas"
 
@@ -16637,12 +15561,22 @@ msgstr ""
 "Saraksts ar nor�dēm, kuras pielikuma atg�din�t�ja spraudnim meklēt vēstules "
 "ķermenī."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "Atslēgv�rdi"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#| msgid "Attachment Bar"
+msgid "Attachment Reminder"
+msgstr "Pielikumu atg�din�t�js"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "Atg�dina, kad neesat pielicis vēstulei pielikumu."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
@@ -16650,207 +15584,186 @@ msgstr ""
 "Evolution ir atradis dažus atslēgv�rdus, kuri nor�da, ka šai vēstulei "
 "vajadzētu būt pielikumiem, bet to nav."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#| msgid "Messages with Attachments"
 msgid "Message has no attachments"
 msgstr "VÄ“stulei nav pielikumu"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Pievienot pielikumu..."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#| msgid "_Edit message"
 msgid "_Edit Message"
 msgstr "R_ediģēt vēstuli"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
-msgid "Attachment Reminder"
-msgstr "Pielikumu atg�din�t�js"
-
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid "Reminds you when you forgot to add an attachment to a mail message."
-msgstr "Atg�dina, kad neesat pielicis vēstulei pielikumu."
-
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#| msgid "Inline vCards"
-msgid "Inline Audio"
+#| msgid "Audio inline plugin"
+msgid "Audio Inline"
 msgstr "Iekļauts audio"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-#| msgid "Play audio attachments directly from Evolution."
-msgid "Play audio attachments directly in mail messages."
-msgstr "Atskaņot audio pielikumu no pašas vēstules."
+msgid "Play audio attachments directly from Evolution."
+msgstr "Atskaņot audio pielikumu no Evolution tieši."
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:143
 msgid "Select name of the Evolution backup file"
 msgstr "Izvēlieties Evolution rezerves kopiju faila nosaukumu"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:171
 msgid "_Restart Evolution after backup"
 msgstr "P�_rstartēt Evolution pēc rezerves kopiju izveidošanas"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:194
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Izvēlieties Evolution rezerves kopiju faila nosaukumu atjaunošanai"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:218
 msgid "_Restart Evolution after restore"
 msgstr "P�_rstartēt Evolution pēc atjaunošanas"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:291
+msgid "Restore from backup"
+msgstr "Atjaunot no rezerves kopij�m"
+
+#: ../plugins/backup-restore/backup-restore.c:293
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
 "Jūs varat atjaunot Evolution no rezerves kopij�m. Tas var atjaunot visus "
-"pastus, kalend�rus, uzdevumus, memo un kontaktus. Tas arī atjaunos visus "
-"jūsu personīgos iestatījumus, pasta filtrus, u.t.t."
+"pastus, kalend�rus, uzdevumus, memo un kontaktus. "
+"Tas arī atjaunos visus jūsu personīgos iestatījumus, pasta filtrus, u.t.t."
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:301
 msgid "_Restore Evolution from the backup file"
 msgstr "_Atjaunot Evolution no rezerves kopiju faila"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:308
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Lūdzu, izvēlieties arhīvu, no kura atjaunot Evolution:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:311
 msgid "Choose a file to restore"
 msgstr "Izvēlieties failu, no kura atjaunot"
 
-#: ../plugins/backup-restore/backup-restore.c:315
-msgid "Restore from backup"
-msgstr "Atjaunot no rezerves kopij�m"
-
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "Rezerves kopiju veidošanas iestatījumi..."
-
-#: ../plugins/backup-restore/backup-restore.c:355
-#| msgid "Backup and restore Evolution data and settings"
-msgid "Backup Evolution data and settings to an archive file"
-msgstr ""
-"Izveidot Evolution rezerves kopijas datiem un iestatījumiem arhīva fail�"
-
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "Atjaunošanas i_estatījumi..."
-
-#: ../plugins/backup-restore/backup-restore.c:362
-#| msgid "Backup and restore Evolution data and settings"
-msgid "Restore Evolution data and settings from an archive file"
-msgstr "Atjaunot Evolution datus un iestatījumus no arhīva faila"
-
-#: ../plugins/backup-restore/backup.c:63
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "Izveidot Evolution mapes rezerves kopiju"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "Atjaunot Evolution mapi"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:66
+#| msgid "Evolution Backup"
 msgid "Check Evolution Backup"
 msgstr "P�rbaudīt Evolution rezerves kopiju"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "P�rstartēt Evolution"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "Ar grafisko lietot�ja saskarni"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "Izslēdz Evolution"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "Veido Evolution kontu un iestatījumu rezerves kopijas"
 
-#: ../plugins/backup-restore/backup.c:202
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Veido Evolution datu (vēstules, kontakti, kalend�rs, uzdevumi, memo) "
 "rezerves kopijas"
 
-#: ../plugins/backup-restore/backup.c:213
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "Rezerves kopijas izveidotas"
 
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "P�rstartē Evolution"
 
-#: ../plugins/backup-restore/backup.c:255
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "Veidot Evolution datu rezerves kopijas"
 
-#: ../plugins/backup-restore/backup.c:260
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "Atarhivē failus no rezerves kopijas"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "Iel�dē Evolution iestatījumus"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "Dzēš pagaidu rezerves kopiju failus"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "Nodrošina lok�los avotus"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Veido rezerves kopijas mapē %s"
 
-#: ../plugins/backup-restore/backup.c:433
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Atjauno no mapes %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Evolution rezerves kopija"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Evolution atjaunojums"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:489
+#| msgid "Backup current Evolution data"
 msgid "Backing up Evolution Data"
 msgstr "Veidot Evolution datu rezerves kopijas"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Lūdzu, uzgaidiet, kamēr Evolution veido jūsu datu rezerves kopijas."
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:492
+#| msgid "Restarting Evolution"
 msgid "Restoring Evolution Data"
 msgstr "Atjauno Evolution datus"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Lūdzu, uzgaidiet, kamēr Evolution atjauno jūsu datus."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Tas var būt atkarīgs no datu apjoma jūsu kont�."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#| msgid "Backup and restore plugin"
 msgid "Backup and Restore"
 msgstr "Veidot rezerves kopijas un atjaunot"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#| msgid "Backup and restore Evolution data and settings"
 msgid "Backup and restore your Evolution data and settings."
 msgstr "Veidot rezerves kopijas un atjaunot Evolution datus un iestatījumus."
 
@@ -16878,6 +15791,7 @@ msgstr ""
 "lūdzu, ieslēdziet šo pogu."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#| msgid "Delegate Permissions"
 msgid "Insufficient Permissions"
 msgstr "Nepietiekamas atļaujas"
 
@@ -16890,6 +15804,7 @@ msgid "Please select a valid backup file to restore."
 msgstr "Lūdzu, izvēlieties derīgu rezerves kopiju failu, ko atjaunot."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#| msgid "Copy the selected folder into another folder"
 msgid "The selected folder is not writable."
 msgstr "Izvēlētaj� mapē nevar rakstīt."
 
@@ -16904,38 +15819,56 @@ msgstr ""
 "Šis izdzēsīs visus jūsu pašreizējos Evolution datus un iestatījumus un "
 "atjaunos tos no jūsu rezerves kopijas. Evolution atjaunošana no rezerves "
 "kopij�m var s�kties tikai tad, kad Evolution ir izslēgts. P�rliecinieties, "
-"ka esat saglab�juši visus atvērtos logus. Ja vēlaties, lai Evolution "
-"autom�tiski palaistos pēc procesa beig�m, lūdzu, ieslēdziet šo pogu."
+"ka "
+"esat saglab�juši visus atvērtos logus. Ja vēlaties, lai Evolution "
+"autom�tiski "
+"palaistos pēc procesa beig�m, lūdzu, ieslēdziet šo pogu."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+msgid "Backup and restore Evolution data and settings"
+msgstr "Izveidot rezerves kopijas un atjaunot Evolution datus un iestatījumus"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "R_estore Settings..."
+msgstr "Atjaunošanas i_estatījumi..."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+msgid "_Backup Settings..."
+msgstr "Rezerves kopiju veidošanas iestatījumi..."
+
+#: ../plugins/bbdb/bbdb.c:638 ../plugins/bbdb/bbdb.c:647
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Autom�tiskie kontakti"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:662
+#| msgid "_Hide addresses when sending mail to this list"
 msgid "Create _address book entries when sending mails"
 msgstr "Izveidot _adrešu gr�matas ierakstus, kad sūta pastu"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:668
 msgid "Select Address book for Automatic Contacts"
 msgstr "Izvēlieties autom�tisko kontaktu adrešu gr�matu"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:683
 msgid "Instant Messaging Contacts"
 msgstr "Tūlītēj�s ziņojumapmaiņas kontakti"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
+#: ../plugins/bbdb/bbdb.c:698
+#| msgid ""
+#| "Periodically synchronize contact information and images from gaim buddy "
+#| "list"
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Sinhronizēt kontaktu inform�ciju un bildes ar Pidgin draugu sarakstu"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:704
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Izvēlieties adrešu gr�matu Pidgin draugu sarakstam"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Synchronize with _buddy list now"
 msgstr "Sinhronizēt ar _draugu sarakstu tagad"
 
@@ -16944,6 +15877,10 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#| msgid ""
+#| "Automatically fills your addressbook with names and email addresses as "
+#| "you reply to messages. Also fills in IM contact information from your "
+#| "buddy lists."
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
@@ -16957,33 +15894,29 @@ msgstr ""
 "jūs atbildat uz ziņ�m. Aizpilda arī IM kontaktu inform�ciju no jūsu draugu "
 "sarakstiem."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
-#, c-format
-msgid "Bogofilter is not available. Please install it first."
-msgstr "Bogofilter nav pieejams. Lūdzu, vispirms to uzinstalējiet."
-
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
+#| msgid "An error occurred while printing"
 msgid "Error occurred while spawning %s: %s."
 msgstr "Gadīj�s kļūda, izveidojot %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter bērna process neatbild, aptur..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Gaidīšana uz Bogofilter bērna procesu apturēta, p�rtrauc..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Neizdev�s programmkan�ls uz Bogofilter, kļūdas kods: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "P�rveidot vēstules tekstu uz _Unicode"
 
@@ -17004,6 +15937,7 @@ msgid "Bogofilter Junk Filter"
 msgstr "Bogofilter mēstuļu filtrs"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+#| msgid "Log filter actions"
 msgid "Bogofilter Options"
 msgstr "Bogofilter opcijas"
 
@@ -17011,183 +15945,78 @@ msgstr "Bogofilter opcijas"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filtrēt mēstules izmantojot Bogofilter."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
-msgid "Authentication failed. Server requires correct login."
-msgstr "Autentifik�cija neizdev�s. Serveris pieprasa pareizu pieteikšanos."
-
-#: ../plugins/caldav/caldav-browse-server.c:200
-msgid "Given URL cannot be found."
-msgstr "Nevar atrast doto URL."
-
-#: ../plugins/caldav/caldav-browse-server.c:204
-#, c-format
-msgid ""
-"Server returned unexpected data.\n"
-"%d - %s"
-msgstr ""
-"Serveris atgrieza negaidītus datus.\n"
-"%d - %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "Nezin�ma kļūda"
-
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
-#| msgid "Failed to update delegates:"
-msgid "Failed to parse server response."
-msgstr "Neizdev�s saprast servera atbildi."
-
-#: ../plugins/caldav/caldav-browse-server.c:428
-#| msgid "Ends"
-msgid "Events"
-msgstr "Notikumi"
-
-#: ../plugins/caldav/caldav-browse-server.c:450
-#| msgid "New calendar"
-msgid "User's calendars"
-msgstr "Lietot�ja kalend�ri"
-
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
-#| msgid "Failed to authenticate with LDAP server."
-msgid "Failed to get server URL."
-msgstr "Neizdev�s iegūt servera URL."
-
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Searching for the Contacts..."
-msgid "Searching for user's calendars..."
-msgstr "Meklē lietot�ja kalend�rus..."
-
-#: ../plugins/caldav/caldav-browse-server.c:666
-#| msgid "Unable to find any calendars"
-msgid "Could not find any user calendar."
-msgstr "Nevar atrast nevienu lietot�ja kalend�ru."
-
-#: ../plugins/caldav/caldav-browse-server.c:794
-#, c-format
-msgid "Previous attempt failed: %s"
-msgstr "Iepriekšējais mēģin�jums neizdev�s: %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:796
-#, c-format
-msgid "Previous attempt failed with code %d"
-msgstr "Iepriekšējais mēģin�jums neizdev�s ar kodu %d"
-
-#: ../plugins/caldav/caldav-browse-server.c:799
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr "Ievadiet paroli lietot�jam<b>%s</b> uz servera <b>%s</b>"
-
-#: ../plugins/caldav/caldav-browse-server.c:856
-#, c-format
-#| msgid ""
-#| "Cannot create output file: %s:\n"
-#| " %s"
-msgid "Cannot create soup message for URL '%s'"
-msgstr "Nevar izveidot soup ziņojumu priekš URL '%s'"
-
-#. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Searching for the Contacts..."
-msgid "Searching folder content..."
-msgstr "Meklē mapes satur�..."
-
-#: ../plugins/caldav/caldav-browse-server.c:1134
-#| msgid "Local Calendars"
-msgid "List of available calendars:"
-msgstr "Pieejamo kalend�ru saraksts:"
-
-#: ../plugins/caldav/caldav-browse-server.c:1171
-#| msgid "Hula Support"
-msgid "Supports"
-msgstr "Atbalsta"
-
-#: ../plugins/caldav/caldav-browse-server.c:1249
-#, c-format
-#| msgid "Failed to create pipe: %s"
-msgid "Failed to create thread: %s"
-msgstr "Neizdev�s izveidot pavedienu: %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:1357
-#, c-format
-msgid "Server URL '%s' is not a valid URL"
-msgstr "Servera URL '%s' nav derīgs URL"
-
-#: ../plugins/caldav/caldav-browse-server.c:1363
-msgid "Browse for a CalDAV calendar"
-msgstr "P�rlūkot CalDAV, lai atrastu kalend�ru"
-
-#: ../plugins/caldav/caldav-source.c:66
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "Lietot _SSL"
 
-#: ../plugins/caldav/caldav-source.c:228
-msgid "Brows_e server for a calendar"
-msgstr "P�rlūkot s_erveri, lai atrastu kalend�ru"
-
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-contacts-source.c:322
+#| msgid "Re_fresh"
 msgid "Re_fresh:"
 msgstr "At_jaunin�t:"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:743
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "nedēļas"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "Add CalDAV support to Evolution."
 msgstr "Evolution pievienot CalDAV atbalstu."
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+#| msgid "CalDAV sources"
 msgid "CalDAV Support"
 msgstr "CalDAV atbalsts"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:208
 msgid "_Customize options"
 msgstr "Piel�gošanas op_cijas"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:227
+#| msgid "File name:"
 msgid "File _name:"
 msgstr "Faila _nosaukums:"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:231
+#| msgid "Choose a file"
 msgid "Choose calendar file"
 msgstr "Izvēlieties kalend�ra failu"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:279
+#| msgid "Open"
 msgid "On open"
 msgstr "Atverot"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:280
 msgid "On file change"
 msgstr "Mainoties failam"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:281
+#| msgid "Personal"
 msgid "Periodically"
 msgstr "Personiski"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:308
 msgid "Force read _only"
 msgstr "Uzspiest tikai _las�mu"
 
@@ -17199,11 +16028,12 @@ msgstr "Pievienot Evolution lok�los kalend�rus."
 msgid "Local Calendars"
 msgstr "Lok�lie kalend�ri"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "Drošs _savienojumus"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:455
+#| msgid "User_name:"
 msgid "Userna_me:"
 msgstr "_Lietot�jv�rds:"
 
@@ -17212,66 +16042,63 @@ msgid "Add web calendars to Evolution."
 msgstr "Pievienot Evolution tīmekļa kalend�rus."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+#| msgid "Calendars"
 msgid "Web Calendars"
 msgstr "Tīmekļa kalend�ri"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "Laikapst�kļi: migla"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy"
 msgstr "Laikapst�kļi: m�koņains"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:63
+#| msgid "Weather: Cloudy"
 msgid "Weather: Cloudy Night"
 msgstr "Laikapst�kļi: m�koņaina nakts"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:64
+#| msgid "Weather: Rain"
 msgid "Weather: Overcast"
 msgstr "Laikapst�kļi: apm�cies"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:65
+#| msgid "Weather: Snow"
 msgid "Weather: Showers"
 msgstr "Laikapst�kļi: smidzina"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "Laikapst�kļi: sniegs"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "Laikapst�kļi: saulains"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:68
+#| msgid "Weather Calendars"
 msgid "Weather: Clear Night"
 msgstr "Laikapst�kļi: skaidra nakts"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "Laikapst�kļi: pērkona negaiss"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "Izvēlieties atrašan�s vietu"
 
-#. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
-#| msgid "None"
-msgctxt "weather-cal-location"
-msgid "None"
-msgstr "Nekas"
-
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "_Mērvienības:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrisk� (Celsijs, cm, utt)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperi�l� (F�renheits, collas, utt)"
 
@@ -17283,26 +16110,15 @@ msgstr "Pievienot Evolution laikapst�kļu kalend�rus."
 msgid "Weather Calendars"
 msgstr "Laikpst�kļu kalend�rs"
 
-#: ../plugins/contacts-map/contacts-map.c:55
-#: ../plugins/contacts-map/contacts-map.c:201
-#| msgid "Contacts: "
-msgid "Contacts map"
-msgstr "Kontaktu karte"
-
-#: ../plugins/contacts-map/contacts-map.c:56
-#| msgid "Send a message to the selected contacts"
-msgid "Show a map of all the contacts"
-msgstr "R�dīt visu kontaktu karti"
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
-msgid "Add a map showing the location of contacts when possible."
-msgstr ""
-"Kad vien iespējams, pievienot karti, kur� redzamas kontaktu atrašan�s vietas"
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
+#| msgid "Copy tool"
+msgid "Copy Tool"
+msgstr "Kopēšanas rīks"
 
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-#| msgid "No contacts"
-msgid "Map for contacts"
-msgstr "Kontaktu karte"
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
+#| msgid "Copy selection to clipboard"
+msgid "Copy things to the clipboard."
+msgstr "Kopēt lietas uz starpliktuvi"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -17316,10 +16132,12 @@ msgstr ""
 "sūtīt�js."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
+#| msgid "Checks whether Evolution is the default mail client on startup."
 msgid "Check whether Evolution is the default mail client on startup."
 msgstr "P�rbaudīt, vai Evolution ir noklusētais pasta klients palaižoties."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
+#| msgid "Default Mail Client "
 msgid "Default Mail Client"
 msgstr "Noklusētais pasta klients "
 
@@ -17327,24 +16145,23 @@ msgstr "Noklusētais pasta klients "
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Vai vēlaties padarīt Evolution par jūsu noklusēto e-pasta klientu?"
 
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:80
+#| msgid "Mark as _default folder"
 msgid "Mark as _default address book"
 msgstr "Atzīmēt k� noklusēto a_drešu gr�matu"
 
-#: ../plugins/default-source/default-source.c:88
-#| msgid "Show autocompleted name with an address"
-msgid "A_utocomplete with this address book"
-msgstr "Autom�tiski pabeigt ar šo adrešu gr�matu"
-
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:101
+#| msgid "Mark as _default folder"
 msgid "Mark as _default calendar"
 msgstr "Atzīmēt k� noklusēto kalen_d�ru"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:102
+#| msgid "Mark as _default folder"
 msgid "Mark as _default task list"
 msgstr "Atzīmēt k� noklusēto uz_devumu sarakstu"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:103
+#| msgid "Mark as _default folder"
 msgid "Mark as _default memo list"
 msgstr "Atzīmēt k� _noklusēto memo sarakstu"
 
@@ -17357,55 +16174,47 @@ msgid "Mark your preferred address book and calendar as default."
 msgstr ""
 "Atzīmējiet savas iecienītas adrešu gr�matas un kalend�rus k� noklusētos."
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "Piel�gotu galvu saraksts"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"Atslēga nor�da piel�goto galvu sarakstu, kuru varat pievienot izejošaj�m "
-"vēstulēm. Form�ts, lai nor�dītu galvu un galvas vērtību, ir: piel�got�s "
-"galvas nosaukums, pēc kuras seko \"=\" un vērtības tiek atdalītas ar \";\""
-
-#: ../plugins/email-custom-header/email-custom-header.c:316
+#: ../plugins/email-custom-header/email-custom-header.c:330
+#| msgid "Security"
 msgid "Security:"
 msgstr "Drošība:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
+#: ../plugins/email-custom-header/email-custom-header.c:335
+#| msgid "Unsigned"
 msgid "Unclassified"
 msgstr "Visp�rpieejams"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:336
+#| msgid "Created"
 msgid "Protected"
 msgstr "Aizsarg�ts"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../plugins/email-custom-header/email-custom-header.c:338
+#| msgid "Score"
 msgid "Secret"
 msgstr "Slepens"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Top secret"
 msgstr "Pilnīgi slepens"
 
-#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
-#. indicating the header will not be added to a mail message
-#: ../plugins/email-custom-header/email-custom-header.c:379
-#| msgid "None"
-msgctxt "email-custom-header"
-msgid "None"
-msgstr "Nekas"
-
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:581
+#| msgid "Custom Headers"
 msgid "_Custom Header"
 msgstr "_Piel�gota galva"
 
+#: ../plugins/email-custom-header/email-custom-header.c:906
+#| msgid "Kenya"
+msgid "Key"
+msgstr "Atslēga"
+
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:395
+msgid "Values"
+msgstr "Vērtības"
+
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17413,14 +16222,10 @@ msgstr ""
 "Form�ts, lai nor�dītu piel�got�s galvas atslēgas vērtību, ir:\n"
 "Piel�got�s galvas atslēgas vērtības nosaukums, atdalīts ar \";\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
-msgid "Key"
-msgstr "Atslēga"
-
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
-msgid "Values"
-msgstr "Vērtības"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+#| msgid "Custom Headers"
+msgid "Email Custom Header"
+msgstr "Piel�gota e-pasta galva"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
@@ -17431,9 +16236,974 @@ msgstr "Pievienot piel�gotu galvu izejošaj�m vēstulēm."
 msgid "Custom Header"
 msgstr "Piel�gota galva"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
-msgid "Email Custom Header"
-msgstr "Piel�gota e-pasta galva"
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+#| msgid "Custom Headers"
+msgid "List of Custom Headers"
+msgstr "Piel�gotu galvu saraksts"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"Atslēga nor�da piel�goto galvu sarakstu, kuru varat pievienot izejošaj�m "
+"vēstulēm. Form�ts, lai nor�dītu galvu un galvas vērtību, ir: piel�got�s "
+"galvas nosaukums, pēc kuras seko \"=\" un vērtības tiek atdalītas ar \";\""
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Atvērt cita lietot�ja mapi"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Konts:"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Mapes nosaukums:"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Lietot�s:"
+
+#. i18n: "Secure Password Authentication" is an Outlookism
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
+msgid "Secure Password"
+msgstr "Droša parole"
+
+#. 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 ""
+"Šī opcija savienosies ar Exchange serveri, lietojot drošas paroles (NTLM) "
+"autentificēšanu."
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
+msgid "Plaintext Password"
+msgstr "Parasta teksta parole"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
+msgstr ""
+"Å Ä« opcija savienosies ar Exchange serveri, lietojot standarta parasta "
+"teksta paroles autentificēšanu."
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
+msgid "Out Of Office"
+msgstr "Ä€rpus biroja"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
+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 ""
+"Ziņa nor�dīta zem�k tiks autom�tiski sūtīta \n"
+"katrai personai, kas sūta jums pastu, kamēr jūs esat �rpus biroja."
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
+msgid "I am out of the office"
+msgstr "Es esmu �rpus biroja"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
+msgid "I am in the office"
+msgstr "Es esmu biroj�"
+
+#. Change Password
+#: ../plugins/exchange-operations/exchange-account-setup.c:341
+msgid "Change the password for Exchange account"
+msgstr "Mainīt paroli Exchange kontam"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+msgid "Change Password"
+msgstr "Mainīt paroli"
+
+#. Delegation Assistant
+#: ../plugins/exchange-operations/exchange-account-setup.c:348
+msgid "Manage the delegate settings for Exchange account"
+msgstr "P�rvaldīt deleg�tu iestatījumus Exchange kontam"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
+msgid "Delegation Assistant"
+msgstr "Pilnvaru nodošanas asistents"
+
+#. Miscelleneous settings
+#: ../plugins/exchange-operations/exchange-account-setup.c:362
+msgid "Miscelleneous"
+msgstr "Jaukts"
+
+#. Folder Size
+#: ../plugins/exchange-operations/exchange-account-setup.c:372
+msgid "View the size of all Exchange folders"
+msgstr "Skatīt izmēru vis�m Exchange mapēm"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
+msgid "Folders Size"
+msgstr "Mapju izmērs"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:381
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
+msgid "Exchange Settings"
+msgstr "Exchange iestatījumi"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:727
+msgid "_OWA URL:"
+msgstr "_OWA URL:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:753
+msgid "A_uthenticate"
+msgstr "A_utentificēt"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:775
+msgid "Mailbox name is _different than user name"
+msgstr "Pasta kastes nosaukums _atšķiras no lietot�jv�rda"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:788
+#| msgid "_Mail"
+msgid "_Mailbox:"
+msgstr "_Pasta kaste:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1003
+msgid "_Authentication Type"
+msgstr "_Autentifik�cijas tips"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
+#: ../plugins/exchange-operations/exchange-contacts.c:217
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-contacts.c:219
+#, c-format
+msgid "0 KB"
+msgstr "0 KB"
+
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1139
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "Izmērs:"
+
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
+msgid ""
+"Evolution is in offline mode. You cannot create or modify folders now.\n"
+"Please switch to online mode for such operations."
+msgstr ""
+"Evolution ir nesaistes režīm�. Jūs pašlaik nevarat izveidot vai mainīt "
+"mapes.\n"
+"Lai veiktu šīs darbības, lūdzu, p�rslēdzieties tiešsaistes režīm�."
+
+#. User entered a wrong existing
+#. * password. Prompt him again.
+#.
+#: ../plugins/exchange-operations/exchange-change-password.c:114
+msgid ""
+"The current password does not match the existing password for your account. "
+"Please enter the correct password"
+msgstr ""
+"Pašreizēj� parole neatbilst jūsu konta eksistējošai parolei. Lūdzu, ievadiet "
+"pareizo paroli"
+
+#: ../plugins/exchange-operations/exchange-change-password.c:121
+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
+msgid "Confirm Password:"
+msgstr "Apstiprin�t paroli:"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+msgid "Current Password:"
+msgstr "Pašreizēj� parole:"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+msgid "New Password:"
+msgstr "Jaun� parole:"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+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."
+
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr "Jūsu paroles termiņš beigsies pēc %d dien�m"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
+msgid "Custom"
+msgstr "Piel�gots"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
+msgid "Editor (read, create, edit)"
+msgstr "Redaktors (lasīt, izveidot, rediģēt)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
+msgid "Author (read, create)"
+msgstr "Autors (lasīt, izveidot)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
+msgid "Reviewer (read-only)"
+msgstr "Recenzents (lasīšanas režīms)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+msgid "Delegate Permissions"
+msgstr "Deleg�ta atļauja"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
+#, c-format
+msgid "Permissions for %s"
+msgstr "Atļaujas priekš %s"
+
+#. To translators: This is a part of the message to be sent to the delegatee
+#. summarizing the permissions assigned to him.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
+msgid ""
+"This message was sent automatically by Evolution to inform you that you have "
+"been designated as a delegate. You can now send messages on my behalf."
+msgstr ""
+"Šo vēstuli Evolution autom�tiski ir nosūtījis, lai informētu jūs, ka "
+"esat izraudzīts/-a par deleg�tu. Jūs tagad varat sūtīt vēstules man� v�rd�."
+
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
+msgid "You have been given the following permissions on my folders:"
+msgstr "Jums ir dotas sekojoš�s tiesības man�m mapēm:"
+
+#. To translators: This message is included if the delegatee has been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
+msgid "You are also permitted to see my private items."
+msgstr "Jums ir arī dota iespēja redzēt manas priv�t�s lietas."
+
+#. To translators: This message is included if the delegatee has not been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+msgid "However you are not permitted to see my private items."
+msgstr "Ta�u jums nav atļauts redzēt manas priv�t�s lietas."
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr "Jūs esat izraudzīts k� %s deleg�ts"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:416
+msgid "Delegate To"
+msgstr "Deleģēt uz"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:581
+#, c-format
+msgid "Remove the delegate %s?"
+msgstr "Izņemt deleg�tu %s?"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:698
+msgid "Could not access Active Directory"
+msgstr "Nevarēja piekļūt aktīvai direktorijai"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:710
+msgid "Could not find self in Active Directory"
+msgstr "Nevarēja atrast sevi aktīv� direktorij�"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:723
+#, c-format
+msgid "Could not find delegate %s in Active Directory"
+msgstr "Nevarēja atrast deleg�tu %s aktīv� direktorij�"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:735
+#, c-format
+msgid "Could not remove delegate %s"
+msgstr "Nevarēja izņemt deleg�tu %s"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:795
+msgid "Could not update list of delegates."
+msgstr "Nevarēja atjaunin�t deleg�tu sarakstu."
+
+#: ../plugins/exchange-operations/exchange-delegates.c:813
+#, c-format
+msgid "Could not add delegate %s"
+msgstr "Nevarēja pievienot deleg�tu %s"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:980
+msgid "Error reading delegates list."
+msgstr "Kļūda, nolasot deleg�tu sarakstu."
+
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+msgid "C_alendar:"
+msgstr "K_alend�rs:"
+
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
+msgid "Co_ntacts:"
+msgstr "Ko_ntakti:"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegates"
+msgstr "Deleg�ti"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+"Nav\n"
+"Recenzents (lasīšanas režīms)\n"
+"Autors (lasīt, izveidot)\n"
+"Redaktors (lasīt, izveidot, rediģēt)"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Permissions for"
+msgstr "Atļaujas priekš"
+
+#: ../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 ""
+"Šie lietot�ji varēs sūtīt pastu jūsu v�rd�\n"
+"un piekļūt jūsu mapēm ar jūsu dotaj�m tiesīb�m."
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+msgid "_Delegate can see private items"
+msgstr "_Deleg�ts var redzēt priv�tas lietas"
+
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
+msgid "_Inbox:"
+msgstr "_Iesūtne:"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+msgid "_Summarize permissions"
+msgstr "_Kopsavilkt atļaujas"
+
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
+msgid "_Tasks:"
+msgstr "_Uzdevumi:"
+
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
+msgid "Permissions..."
+msgstr "Atļaujas..."
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
+msgid "Folder Name"
+msgstr "Mapes nosaukums"
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
+msgid "Folder Size"
+msgstr "Mapes izmērs"
+
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
+#| msgid "_User"
+msgid "User"
+msgstr "Lietot�js"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr "Parakstīties uz cita lietot�ja mapi"
+
+#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
+msgid "Exchange Folder Tree"
+msgstr "Exchange mapju koku"
+
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:239
+#: ../plugins/exchange-operations/exchange-folder.c:249
+msgid "Unsubscribe Folder..."
+msgstr "Atrakstīt mapi..."
+
+#: ../plugins/exchange-operations/exchange-folder.c:469
+#: ../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:481
+#: ../plugins/exchange-operations/exchange-folder.c:536
+#, c-format
+msgid "Unsubscribe from \"%s\""
+msgstr "Atrakstīties no \"%s\""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+"<b>Pašlaik jūsu status ir \"�rpus biroja\". </b>\n"
+"\n"
+"Vai jūs vēlaties nomainīt savu statusu uz \"Biroj�\"? "
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>Ārpus biroja ziņojums:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>Statuss:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+"<small>Šis ziņojums tiks autom�tiski nosūtīts visiem, \n"
+"kas sūtu jums vēstuli, kamēr jūs esat �rpus biroja.</small>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "Es pašlaik atrodos biroj�"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "Es pašlaik atrodos �rpus biroja"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "Nē, nemainīt statusu"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "Ä€rpus biroja asistents"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "J�, nomainīt statusu"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr "Paroles termiņa izbeigšan�s brīdin�jums..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr "Jūsu paroles termiņš beigsies pēc 7 dien�m..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+msgid "_Change Password"
+msgstr "_Mainīt paroli"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
+msgid "(Permission denied.)"
+msgstr "(Atļauja liegta.)"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
+msgid "Add User:"
+msgstr "Pievienot lietot�ju:"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
+#: ../plugins/exchange-operations/exchange-send-options.c:410
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
+msgid "Add User"
+msgstr "Pievienot lietot�ju"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+msgid "<b>Permissions</b>"
+msgstr "<b>Atļaujas</b>"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+msgid "Cannot Delete"
+msgstr "Nevar izdzēst"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+msgid "Cannot Edit"
+msgstr "Nevar rediģēt"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+msgid "Create items"
+msgstr "Izveidot vienības"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+msgid "Create subfolders"
+msgstr "Izveidot apakšmapes"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+msgid "Delete Any Items"
+msgstr "Dzēst jebkuru vienību"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+msgid "Delete Own Items"
+msgstr "Dzēst paša vienības"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+msgid "Edit Any Items"
+msgstr "Rediģēt jebkuru vienību"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+msgid "Edit Own Items"
+msgstr "Rediģēt paša vienības"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+msgid "Folder contact"
+msgstr "Mapes kontakts"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+msgid "Folder owner"
+msgstr "Mapes īpašnieks"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+msgid "Folder visible"
+msgstr "Mape redzama"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+msgid "Read items"
+msgstr "Lasītas vienības"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+msgid "Role: "
+msgstr "Loma: "
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
+msgid "<b>Message Settings</b>"
+msgstr "<b>Vēstules iestatījumi</b>"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
+msgid "<b>Tracking Options</b>"
+msgstr "<b>Sekošanas iestatījumi</b>"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
+msgid "Exchange - Send Options"
+msgstr "Exchange  - nosūtīt iestatījumi"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
+msgid "I_mportance: "
+msgstr "Svarīgu_ms: "
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
+msgid ""
+"Normal\n"
+"High\n"
+"Low"
+msgstr ""
+"Norm�la\n"
+"Augsta\n"
+"Zema"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
+msgid ""
+"Normal\n"
+"Personal\n"
+"Private\n"
+"Confidential"
+msgstr ""
+"Parasta\n"
+"Personiska\n"
+"Priv�ta\n"
+"Slepena"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
+msgid "Request a _delivery receipt for this message"
+msgstr "_Pieprasīt saņemšanas apstiprin�jumu šai vēstulei"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
+msgid "Request a _read receipt for this message"
+msgstr "_Pieprasīt izlasīšanas apstiprin�jumu šai vēstulei"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+msgid "Send as Delegate"
+msgstr "Sūtīt k� deleg�tu"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
+msgid "_Sensitivity: "
+msgstr "Jūtīgum_s: "
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+msgid "_User"
+msgstr "_Lietot�js"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
+msgid "Select User"
+msgstr "Izvēlieties lietot�ju"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
+msgid "Address Book..."
+msgstr "Adrešu gr�mata..."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
+msgid "Subscribe to Other User's Contacts"
+msgstr "Pierakstīties uz cita lietot�ja kontaktiem"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
+msgid "Subscribe to Other User's Calendar"
+msgstr "Pierakstīties uz cita lietot�ja kalend�ru"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid "Activates the Evolution-Exchange extension package."
+msgstr "Aktivit�tes Evolution-Exchange paplašin�jumu pakotnē."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+msgid "Exchange Operations"
+msgstr "Exchange darbības"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+msgstr "Nevar piekļūt \"Exchange iestatījumu\" cilnei nesaistes režīm�."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+msgid "Cannot change password due to configuration problems."
+msgstr "Nevar mainīt paroli konfigur�cijas problēmu dēļ."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+msgid "Cannot display folders."
+msgstr "Nevar par�dīt mapes."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+msgid "Cannot perform the operation."
+msgstr "Kļūda, izpildot darbību."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+msgid ""
+"Changes to options for Exchange account \"{0}\" will only take effect after "
+"restarting Evolution."
+msgstr ""
+"Izmaiņas Exchange konta \"{0}\" konfigur�cij� st�sies spēka pēc tam, kad jūs "
+"iziesiet un p�rstartēsiet Evolution."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+msgid "Could not authenticate to server."
+msgstr "Nevarēja autentificēties ar serveri."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+msgid "Could not change password."
+msgstr "Nevarēja nomainīt paroli."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
+msgid ""
+"Could not configure Exchange account because \n"
+"an unknown error occurred. Check the URL, \n"
+"username, and password, and try again."
+msgstr ""
+"Nevarēja konfigurēt Exchange kontu, jo \n"
+"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:11
+msgid "Could not connect to Exchange server."
+msgstr "Nevarēja savienoties ar Exchange serveri."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+msgid "Could not connect to server {0}."
+msgstr "Nevarēja savienoties ar serveri {0}."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+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:14
+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:15
+msgid "Could not locate server {0}."
+msgstr "Nevarēja atrast serveri {0}."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+msgid "Could not make {0} a delegate"
+msgstr "Nevarēja izveidot {0} k� deleg�tu"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+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
+msgid "Could not read folder permissions."
+msgstr "Nevarēja nolasīt mapes atļaujas."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+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:20
+msgid "Could not update folder permissions."
+msgstr "Nevarēja atjaunin�t mapes atļaujas."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+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:22
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+"Vajag p�rstartēt Evolution, lai iel�dētu pierakstīto lietot�ju pasta kastes"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+msgid "Exchange Account is offline."
+msgstr "Exchange konts ir nesaistē."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
+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 ""
+"Exchange savienot�js pieprasa pieeju noteiktai\n"
+"funkcionalit�tei uz Exchange servera, kas par�d�s\n"
+"k� atslēgts vai bloķēts. (Tas parasti\n"
+"ir bez nodoma.) jūsu Exchange administratoram ir\n"
+"j�aktivizē šī funkcionalit�te, lai jūs spētu lietot\n"
+"Evolution Exchange savienot�ju.\n"
+"\n"
+"Lai iegūtu sīk�ki inform�ciju, ko nodot savam\n"
+"Exchange administratoram, sekojiet saitei:\n"
+"\n"
+"{0}\n"
+"  "
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+msgid "Failed to update delegates:"
+msgstr "Neizdev�s atjaunin�t deleg�tus:"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+msgid "Folder already exists"
+msgstr "Mape jau eksistē"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+msgid "Folder does not exist"
+msgstr "Mape neeksistē"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+msgid "Folder offline"
+msgstr "Mape nesaistē"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1259
+msgid "Generic error"
+msgstr "Visp�rēja kļūda"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+msgid "Global Catalog Server is not reachable"
+msgstr "Glob�lais kataloga serveris nav sasniedzams"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+msgid ""
+"If OWA is running on a different path, you must specify that in the account "
+"configuration dialog."
+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:43
+msgid "Mailbox for {0} is not on this server."
+msgstr "{0} pastkastīte  nav uz šī servera."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+msgid "Make sure the URL is correct and try again."
+msgstr "P�rliecinieties, ka URL ir pareizs un mēģiniet vēlreiz."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+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."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+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."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+msgid "No Global Catalog server configured for this account."
+msgstr "Šim kontam nav konfigurēts glob�lais kataloga serveris."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "No mailbox for user {0} on {1}."
+msgstr "Nav pastkastīte lietot�jam {0} uz {1}."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+msgid "No such user {0}"
+msgstr "Nav t�d� lietot�ja {0}"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Password successfully changed."
+msgstr "Parole veiksmīgi nomainīta."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+msgstr "Lūdzu, ievadiet deleg�ta ID vai atceliet izvēli \"sūtīt k� deleg�tu\"."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+msgid "Please make sure the Global Catalog Server name is correct."
+msgstr "Lūdzu, p�rliecinieties, ka glob�l� kataloga servera v�rds ir pareizs."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+msgid "Please restart Evolution for changes to take effect"
+msgstr "Lūdzu, p�rstartējiet Evolution, lai izmaiņas st�tos spēk�"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+msgid "Please select a user."
+msgstr "Lūdzu, izvēlieties lietot�ju."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+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:57
+msgid "The Exchange account will be disabled when you quit Evolution"
+msgstr "Exchange konts tiks atslēgts, kad jūs iziesiet no Evolution"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+msgid "The Exchange account will be removed when you quit Evolution"
+msgstr "Exchange konts tiks dzēsts, kad jūs iziesiet no Evolution"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+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:60
+msgid ""
+"The server is running Exchange 5.5. Exchange Connector \n"
+"supports Microsoft Exchange 2000 and 2003 only."
+msgstr ""
+"Serveris darbojas ar Exchange 5.5. Savienot�js atbalsta\n"
+"tikai Microsoft Exchange 2000 un 2003."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+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 ""
+"Tas laikam nozīmē, ka jūsu serveris pieprasa, \n"
+"lai tiktu nor�dīts Windows domēna v�rds \n"
+"k� jūsu lietot�ja v�rda daļa (piemēram, &quot;DOMAIN\\user&quot;).\n"
+"\n"
+"Vai arī jūs esat ievadījis nepareizu paroli."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+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:68
+msgid "Unable to add user to access control list:"
+msgstr "Nevar pievienot lietot�ju piekļūšanas kontrolsarakstam:"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+msgid "Unable to edit delegates."
+msgstr "Nevar rediģēt deleg�tus."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+msgid "Unknown error looking up {0}"
+msgstr "Nezin�ma kļūda, uzmeklējot {0}"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:624
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:821
+msgid "Unknown error."
+msgstr "Nezin�ma kļūda."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+msgid "Unknown type"
+msgstr "Nezin�ms tips"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid "Unsupported operation"
+msgstr "Neatbalstīta darbība"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+msgid "You are nearing your quota available for storing mail on this server."
+msgstr "Jūs tuvojaties atvēlēt�s vietas kvotai uz šī servera."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
+msgstr ""
+"Jums ir atļauts sūtīt vēstules tikai viena deleģēt�ja v�rd� vienlaicīgi."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+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:77
+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 šī servera."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+msgid "You may only configure a single Exchange account."
+msgstr "Jūs varat konfigurēt tikai vienu vienīgu Exchange kontu."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+msgid ""
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
+msgstr ""
+"Jūsu pašreizējais izmantojums ir: {0} KB. Mēģiniet atbrīvot vietu, "
+"izdzēšot k�du vēstuli."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+msgid ""
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
+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:81
+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 ""
+"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:82
+msgid "Your password has expired."
+msgstr "Jūsu parolei ir beidzies termiņš."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+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:85
+msgid "{0} is already a delegate"
+msgstr "{0} jau ir deleg�ts"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
+msgid "{0} is already in the list"
+msgstr "{0} ir jau sarakst�"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
+msgid "Subscribe to Other User's Tasks"
+msgstr "Pierakstīties uz citu lietot�ju uzdevumiem"
+
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
+msgid "Check folder permissions"
+msgstr "P�rbaudu mapes atļaujas"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Automatically launch editor when key is pressed in the mail composer"
@@ -17441,11 +17211,12 @@ msgstr ""
 "Autom�tiski palaist redaktoru, kad pasta sacerēt�j� ir nospiests taustiņš."
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:120
 msgid "Automatically launch when a new mail is edited"
 msgstr "Palaist autom�tiski, kad rediģē jaunu pastu"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
+#| msgid "Default Mail Client "
 msgid "Default External Editor"
 msgstr "Noklusētais �rējais redaktors"
 
@@ -17453,32 +17224,18 @@ msgstr "Noklusētais �rējais redaktors"
 msgid "The default command that must be used as the editor."
 msgstr "Noklusēt� komanda, kuru j�izmanto k� redaktoru."
 
-#: ../plugins/external-editor/external-editor.c:108
-msgid "Command to be executed to launch the editor: "
-msgstr "Komanda, ar kuru palaist redaktoru: "
-
-#: ../plugins/external-editor/external-editor.c:109
-msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
-msgstr ""
-"Emacs izmanto \"xemacs\"\n"
-"VI izmanto \"gvim -f\""
-
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
-msgid "Compose in External Editor"
-msgstr "Sacerēt �rēj� redaktor�"
-
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+#| msgid "Contact Editor"
 msgid "External Editor"
 msgstr "Ārējais redaktors"
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#| msgid "Open a window for composing a mail message"
 msgid "Use an external editor to compose plain-text mail messages."
 msgstr "Izmantot �rējo redaktoru, lai sacerētu vienk�rša teksta vēstuli"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+#| msgid "Cannot create temporary save directory."
 msgid "Cannot create Temporary File"
 msgstr "Nevar izveidot pagaidu failu"
 
@@ -17514,92 +17271,85 @@ msgstr ""
 "Ārējo redaktoru, kurš ir iestatīts spraudņa iestatījumos, nevar palaist. "
 "Pamēģiniet citu redaktoru."
 
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
-msgid "Insert Face picture by default"
-msgstr "Ievietot sejas bildi pēc noklusējuma"
+#: ../plugins/external-editor/external-editor.c:109
+msgid "Command to be executed to launch the editor: "
+msgstr "Komanda, ar kuru palaist redaktoru: "
 
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:110
 msgid ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
 msgstr ""
-"Vai izejošaj�m vēstulēm pievienot sejas bildi pēc noklusējuma. Pirms šī "
-"ieķeksēšanas vajadzētu iestatīt bildi, cit�di nekas nenotiks."
-
-#: ../plugins/face/face.c:286
-#| msgid "Select a (48*48) png of size < 700bytes"
-msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
-msgstr "Izvēlieties png bildi (vislab�k 48*48 ar izmēru zem 720 baitiem)"
+"Emacs izmanto \"xemacs\"\n"
+"VI izmanto \"gvim -f\""
 
-#: ../plugins/face/face.c:296
-#| msgid "Importing files"
-msgid "Image files"
-msgstr "Attēlu faili"
+#: ../plugins/external-editor/external-editor.c:354
+#: ../plugins/external-editor/external-editor.c:356
+#| msgid "Composer Window default width"
+msgid "Compose in External Editor"
+msgstr "Sacerēt �rēj� redaktor�"
 
-#: ../plugins/face/face.c:355
-msgid "_Insert Face picture by default"
-msgstr "_Ievietot sejas bildi pēc noklusēšanas"
+#: ../plugins/face/face.c:59
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr "Izvēlieties (48*48) png ar izmēru < 700 baiti"
 
-#: ../plugins/face/face.c:366
-msgid "Load new _Face picture"
-msgstr "Iel�dēt jaunu _sejas bildi"
+#: ../plugins/face/face.c:69
+#| msgid "All files"
+msgid "PNG files"
+msgstr "PNG faili"
 
-#: ../plugins/face/face.c:415
-#| msgid "Include:"
-msgid "Include _Face"
-msgstr "Iekļaut _seju"
+#: ../plugins/face/face.c:126
+#| msgid "France"
+msgid "_Face"
+msgstr "_Seja"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid "Attach a small picture of your face to outgoing messages."
-msgstr "Izejošaj�m vēstulēm pievienot mazu savas sejas bildi."
+msgid ""
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
+msgstr ""
+"Pievienot mazu bildi ar savu seju izejošaj�m vēstulēm.\n"
+"\n"
+"Vispirms lietot�jam j�izveido 48x48 PNG bilde. Tai ir j�būt ar kodējumu "
+"Base-64 un novietotai ~/.evolution/faces mapē. T� tiks izmantota turpm�k "
+"sūtītaj�s vēstulēs."
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Atrakstīties no mapes \"%s\""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
+msgid "Unsubscribe Folders"
+msgstr "Atrakstīties no mapēm"
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid ""
+"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr "Atraksties no IMAP mapes, uzklikšķinot ar labo pogu uz t�s mapju kok�."
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "_Atrakstīties"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:1
-#| msgid "Table header"
-msgid "Failed Read"
-msgstr "Neizdev�s nolasīt"
-
-#: ../plugins/face/org-gnome-face.error.xml.h:2
-#| msgid "Invalid Date Value"
-msgid "Invalid Image Size"
-msgstr "Nederīgs attēla izmērs"
-
-#: ../plugins/face/org-gnome-face.error.xml.h:3
-#| msgid "_No image"
-msgid "Not an image"
-msgstr "Nav attēls"
-
-#: ../plugins/face/org-gnome-face.error.xml.h:4
-#| msgid "Please select an image for this contact"
-msgid "Please select an image of size 48 * 48"
-msgstr "Lūdzu, izvēlieties attēlu ar izmēru 48*48"
-
-#: ../plugins/face/org-gnome-face.error.xml.h:5
-#| msgid "The item could not be sent!\n"
-msgid "The file cannot be read"
-msgstr "Nevar nolasīt failu"
-
-#: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid "The file you selected does not look like a valid .png image. Error: {0}"
-msgstr "Izvēlētais fails neizskat�s pēc derīga .png attēla. Kļūda: {0}"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:53
 #: ../plugins/google-account-setup/google-source.c:82
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+#| msgid "toggle"
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>Serveris</b>"
-
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:518
 #, c-format
+#| msgid "Add folder to your list of subscribed folders"
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
-"Ievadiet lietot�ja %s paroli, lai piekļūtu kalend�ru saraksta, kuriem tas ir "
-"pierakstījies."
+"Ievadiet lietot�ja %s paroli, lai piekļūtu kalend�ru saraksta, kuriem "
+"tas ir pierakstījies."
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:624
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17608,78 +17358,46 @@ msgstr ""
 "Nevar nolasīt datus no Google servera.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
-msgid "Unknown error."
-msgstr "Nezin�ma kļūda."
-
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:759
+#| msgid "_Calendar:"
 msgid "Cal_endar:"
 msgstr "Kal_end�rs:"
 
-#: ../plugins/google-account-setup/google-source.c:666
+#: ../plugins/google-account-setup/google-source.c:794
+#| msgid "Retrieving `%s'"
 msgid "Retrieve _list"
 msgstr "_Saņemt sarakstu"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+#| msgid "<b>Preview</b>"
+msgid "<b>Server</b>"
+msgstr "<b>Serveris</b>"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
 msgstr "Pievienot Google kalend�rus pie Evolution."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+#| msgid "Gnome Calendar"
 msgid "Google Calendars"
 msgstr "Google kalend�rs"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr "Kontrolsaraksts"
 
-#: ../plugins/groupwise-features/gw-ui.c:112
-msgid "New _Shared Folder..."
-msgstr "Jauna koplietošana_s mape..."
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "Pievienot Novell GroupWise atbalstu pie Evolution."
 
-#: ../plugins/groupwise-features/gw-ui.c:119
-msgid "_Proxy Login..."
-msgstr "Star_pnieka pieteikšan�s..."
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
+#| msgid "Groupwise Account Setup"
+msgid "GroupWise Account Setup"
+msgstr "GroupWise konta iestatīšana"
 
-#: ../plugins/groupwise-features/gw-ui.c:170
-msgid "Junk Mail Settings..."
-msgstr "Mēstuļu iestatījumi..."
-
-#: ../plugins/groupwise-features/gw-ui.c:177
-msgid "Track Message Status..."
-msgstr "Sekot ziņas statusam..."
-
-#: ../plugins/groupwise-features/gw-ui.c:183
-msgid "Retract Mail"
-msgstr "Atsaukt pastu"
-
-#: ../plugins/groupwise-features/gw-ui.c:338
-msgid "Accept Tentatively"
-msgstr "Pieņemt īslaicīgi"
-
-#: ../plugins/groupwise-features/gw-ui.c:352
-msgid "Rese_nd Meeting..."
-msgstr "Atkal _nosūtīt san�ksmi..."
-
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
-msgid "Create folder"
-msgstr "Izveidot mapi"
-
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
-#| msgid ""
-#| "The user '%s' has shared a folder with you\n"
-#| "\n"
-#| "Message from '%s'\n"
-#| "\n"
-#| "\n"
-#| "%s\n"
-#| "\n"
-#| "\n"
-#| "Click 'Forward' to install the shared folder\n"
-#| "\n"
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -17689,7 +17407,7 @@ msgid ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Apply' to install the shared folder\n"
+"Click 'Forward' to install the shared folder\n"
 "\n"
 msgstr ""
 "Lietot�js '%s' koplieto ar jums mapi\n"
@@ -17700,108 +17418,113 @@ msgstr ""
 "%s\n"
 "\n"
 "\n"
-"Spiediet 'N�kamais', lai instalētu koplietoto mapi\n"
+"Nospiediet 'N�kamais', lai instalētu koplietoto mapi\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "Instalēt koplietoto mapi"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "Koplietot�s mapes instalēšana"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Mēstuļu iestatījumi"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
-#: ../plugins/groupwise-features/junk-settings.ui.h:3
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
 msgstr "Mēstuļu iestatījumi"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:1
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
+msgid "Junk Mail Settings..."
+msgstr "Mēstuļu iestatījumi..."
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:1
+msgid "<b>Junk List:</b>"
+msgstr "<b>Mēstuļu saraksts:</b>"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:2
 msgid "Email:"
 msgstr "E-pasts:"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:2
-#| msgid "_Junk List"
-msgid "Junk List:"
-msgstr "Mēstuļu saraksts"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/groupwise-features/junk-settings.glade.h:5
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Deaktivizēt"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:6
+#: ../plugins/groupwise-features/junk-settings.glade.h:6
 msgid "_Enable"
 msgstr "_Aktivizēt"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:7
+#: ../plugins/groupwise-features/junk-settings.glade.h:7
 msgid "_Junk List"
 msgstr "_Mēstuļu saraksts"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:13
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "_Noņemt"
-
-#: ../plugins/groupwise-features/mail-retract.c:81
+#: ../plugins/groupwise-features/mail-retract.c:52
+#| msgid "Message Status"
 msgid "Message Retract"
 msgstr "Vēstules atsaukšana"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
-#| msgid ""
-#| "Retracting a message may remove it from the recipient's mailbox. Are you "
-#| "sure you want to do this ?"
+#: ../plugins/groupwise-features/mail-retract.c:57
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this?"
+"sure you want to do this ?"
 msgstr ""
 "Vēstules atsaukšana var izņemt vēstuli no saņēmēja pasta kastes. Vai tieš�m "
 "vēlaties to darīt?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "Vēstule veiksmīgi atsaukta"
 
-#: ../plugins/groupwise-features/mail-send-options.c:202
-msgid "Insert Send options"
-msgstr "Ievietot sūtīšanas iespējas"
+#: ../plugins/groupwise-features/mail-retract.c:86
+msgid "Retract Mail"
+msgstr "Atsaukt pastu"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
+#| msgid "Add Send Options to groupwise messages"
 msgid "Add Send Options to GroupWise messages"
 msgstr "Pievienojiet sūtīšanas iespējas GroupWise vēstulēm"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
+#| msgid "A plugin for the features in Groupwise accounts."
 msgid "Fine-tune your GroupWise accounts."
 msgstr "Skaņot GroupWise kontus."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
+#| msgid "Groupwise Features"
 msgid "GroupWise Features"
 msgstr "GroupWise iespējas"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
+#| msgid "Message retracted successfully"
 msgid "Message retract failed"
 msgstr "Neizdev�s atsaukt vēstuli"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
+#| msgid "Convert the selected message to a new task"
 msgid "The server did not allow the selected message to be retracted."
 msgstr "Serveris neļ�va atsaukt izvēlēto vēstuli."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+#| msgid ""
+#| "A folder named &quot;{0}&quot; already exists. Please use a different "
+#| "name."
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
 msgstr "Konts &quot;{1}&quot; jau eksistē. Lūdzu, p�rbaudiet mapju koku."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+#| msgid "Signature Already Exists"
 msgid "Account Already Exists"
 msgstr "Konts jau eksistē"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
+#| msgid "Invalid signature"
 msgid "Invalid user"
 msgstr "Nederīgs lietot�js"
 
@@ -17815,16 +17538,19 @@ msgstr ""
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
+#| msgid "Cannot save to file &quot;{0}&quot;."
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Lietot�jam &quot;{0}&quot; nevar piešķirt starpnieka pieeju."
 
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
+#| msgid "Select User"
 msgid "Specify User"
 msgstr "Nor�diet lietot�ju"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
+#| msgid "You do not have sufficient permissions to delete this mail."
 msgid "You have already given proxy permissions to this user."
 msgstr "Jūs šīm lietot�jam jau esat piešķīris starpnieka tiesības."
 
@@ -17835,6 +17561,7 @@ msgstr ""
 "Jums ir j�nor�da derīgs lietot�js, lai tam piešķirtu starpnieka tiesības."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+#| msgid "Could not save to autosave file &quot;{0}&quot;."
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "Jūs nevarat koplietot šo mapi ar nor�dīto lietot�ju &quot;{0}&quot;."
 
@@ -17843,25 +17570,26 @@ msgid "You have to specify a user name which you want to add to the list"
 msgstr "Jums ir j�nor�da lietot�ja v�rds, kuru vēlaties pievienot sarakstam"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-#| msgid "Do you want to resend the meeting ?"
-msgid "Do you want to resend the meeting?"
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the meeting ?"
 msgstr "Vai vēlaties p�rsūtīt san�ksmi?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-#| msgid "Do you want to resend the recurring meeting ?"
-msgid "Do you want to resend the recurring meeting?"
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the recurring meeting ?"
 msgstr "Vai vēlaties p�rsūtīt atk�rtojošos san�ksmi?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-#| msgid "Do you want to retract the original item ?"
-msgid "Do you want to retract the original item?"
-msgstr "Vai vēlaties atsaukt oriģin�lo priekšmetu?"
+msgid "Do you want to retract the original item ?"
+msgstr "Vai tieš�m vēlaties atsaukt oriģin�lo priekšmetu?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#| msgid "_Delete this item from all other recipient's mailboxes?"
 msgid "The original will be removed from the recipient's mailbox."
 msgstr "Oriģin�ls tiks izņemts no saņēmēja pasta kastes."
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
+#| msgid "Make this a recurring event"
 msgid "This is a recurring meeting"
 msgstr "T� ir atk�rtojoš�s san�ksme"
 
@@ -17875,199 +17603,243 @@ msgid ""
 "recurrence rule needs to be re-entered."
 msgstr ""
 "Tas izveidos jaunu san�ksmi ar esoš�s san�ksmes detaļ�m. Atk�rtošan�s "
-"k�rtulas vajadzēs ievadīt atk�rtoti."
+"k�rtulas "
+"vajadzēs ievadīt atk�rtoti."
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
+#| msgid "Would you like to save your changes?"
 msgid "Would you like to accept it?"
 msgstr "Vai vēlaties to pieņemt?"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
+#| msgid "Would you like to save your changes?"
 msgid "Would you like to decline it?"
 msgstr "Vai vēlaties to noraidīt?"
 
-#: ../plugins/groupwise-features/properties.ui.h:1
+#: ../plugins/groupwise-features/process-meeting.c:53
+msgid "Accept Tentatively"
+msgstr "Pieņemt īslaicīgi"
+
+#: ../plugins/groupwise-features/process-meeting.c:319
+#| msgid "_Delegate Meeting..."
+msgid "Rese_nd Meeting..."
+msgstr "Atkal _nosūtīt san�ksmi..."
+
+#: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Lietot�ji:</b>"
 
-#: ../plugins/groupwise-features/properties.ui.h:2
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "C_ustomize notification message"
 msgstr "Piel�got paziņojuma tekst_u"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.glade.h:3
+#| msgid "Contacts..."
 msgid "Con_tacts..."
 msgstr "Kon_takti..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:514
+msgid "Message"
+msgstr "VÄ“stule"
+
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Koplietošanas mapes paziņojums"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../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.ui.h:12
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "_Nav koplietošan�"
 
-#: ../plugins/groupwise-features/properties.ui.h:14
+#: ../plugins/groupwise-features/properties.glade.h:14
 msgid "_Shared With..."
 msgstr "Koplieot_s ar..."
 
-#: ../plugins/groupwise-features/properties.ui.h:15
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Sharing"
 msgstr "_Koplietošana"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
+msgid "<b>Name</b>"
+msgstr "<b>V�rds</b>"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
 msgid "Access Rights"
 msgstr "Piekļūšanas tiesības"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
 msgid "Add/Edit"
 msgstr "Pievienot/rediģēt"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
 msgid "Con_tacts"
 msgstr "Kon_takti"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
 msgid "Modify _folders/options/rules/"
 msgstr "Modificēt _mapes/opcijas/k�rtulas/"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
 msgid "Read items marked _private"
 msgstr "Lasīt priekšmetus, kas atzīmēti k� _priv�ti"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
 msgid "Reminder Notes"
 msgstr "Atg�din�juma piezīmes"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
 msgid "Subscribe to my _alarms"
 msgstr "_Pierakstīties uz trauksmēm"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
 msgid "Subscribe to my _notifications"
 msgstr "_Parakstīties uz ziņojumiem"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
 msgid "_Write"
 msgstr "_Rakstīt"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#| msgid "Permission denied"
 msgid "permission to read|_Read"
 msgstr "_Lasīt"
 
-#: ../plugins/groupwise-features/proxy-listing.ui.h:1
+#. 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-listing.glade.h:2
 msgid "Proxy"
 msgstr "Starpnieks"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>Konta nosaukums</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Starpnieka pieteikšan�s"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIevadiet %s paroli (lietot�js %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:512
+msgid "_Proxy Login..."
+msgstr "Star_pnieka pieteikšan�s..."
+
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Starpnieka cilne būs pieejama tikai tad, kad konts būs tiešsaistē."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Starpnieka cilne būs pieejama tikai tad, kad konts būs aktivizēts."
 
-#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:701
-msgid "Add User"
-msgstr "Pievienot lietot�ju"
-
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:214
+#| msgid "Insert advanced send options"
 msgid "Advanced send options"
 msgstr "Paplašin�tas nosūtīšanas iespējas"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "Lietot�ji"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "Ievadiet lietot�jus un iestatiet atļaujas"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:340
+msgid "New _Shared Folder..."
+msgstr "Jauna koplietošana_s mape..."
+
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "Koplietošana"
 
-#: ../plugins/groupwise-features/share-folder.c:529
+#: ../plugins/groupwise-features/share-folder.c:531
+#| msgid "Justification"
 msgid "Custom Notification"
 msgstr "Piel�got� paziņošana"
 
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "Pievienot   "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/share-folder.c:759
+msgid "Modify"
+msgstr "P�rveidot"
+
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "VÄ“stules statuss"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:108
+#| msgid "S_ubject:"
 msgid "Subject:"
 msgstr "Temats:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:122
+#| msgid "Fr_om:"
 msgid "From:"
 msgstr "No:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "Izveidošanas datums:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "Adres�ts: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "Pieg�d�ta: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "Atvērta: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "Pieņemta: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "Dzēsta: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "Noraidīta: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "Izpildīta: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "Nenosūtīta: "
 
+#: ../plugins/groupwise-features/status-track.c:238
+msgid "Track Message Status..."
+msgstr "Sekot ziņas statusam..."
+
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "Add Hula support to Evolution."
 msgstr "Pievienot Hula atbalstu pie Evolution."
@@ -18076,31 +17848,27 @@ msgstr "Pievienot Hula atbalstu pie Evolution."
 msgid "Hula Support"
 msgstr "Hula atbalsts"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-#| msgid "Inline vCards"
-msgid "Inline Image"
-msgstr "Iekļauts attēls"
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-#| msgid "Show vCards directly in mail messages."
-msgid "View image attachments directly in mail messages."
-msgstr "R�dīt vCards paš� vēstules satur�."
-
-#: ../plugins/imap-features/imap-headers.c:328
-#: ../plugins/imap-features/imap-headers.ui.h:2
+#: ../plugins/imap-features/imap-headers.c:332
 msgid "Custom Headers"
 msgstr "Piel�gotas galvas"
 
-#: ../plugins/imap-features/imap-headers.c:341
-#: ../plugins/imap-features/imap-headers.ui.h:5
+#: ../plugins/imap-features/imap-headers.c:345
 msgid "IMAP Headers"
 msgstr "IMAP galva"
 
-#: ../plugins/imap-features/imap-headers.ui.h:1
+#: ../plugins/imap-features/imap-headers.glade.h:1
+msgid "<b>Custom Headers</b>"
+msgstr "<b>Piel�gotas galvas</b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:2
+msgid "<b>IMAP Headers</b>"
+msgstr "<b>IMAP galvas</b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:3
 msgid "Basic and _Mailing List Headers (Default)"
 msgstr "Pa_mata un vēstkopu galvas (noklusēts)"
 
-#: ../plugins/imap-features/imap-headers.ui.h:3
+#: ../plugins/imap-features/imap-headers.glade.h:4
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -18110,7 +17878,7 @@ msgstr ""
 "galv�m. \n"
 "Jūs šo varat ignorēt, ja izvēlaties \"Visas galvas\"."
 
-#: ../plugins/imap-features/imap-headers.ui.h:6
+#: ../plugins/imap-features/imap-headers.glade.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18118,7 +17886,7 @@ msgstr ""
 "Izvēlieties jūsu IMAP galvu iestatījumus. \n"
 "Jo vair�k galvu izvēlēsities, jo vair�k laika būs nepieciešams lejupiel�dei."
 
-#: ../plugins/imap-features/imap-headers.ui.h:8
+#: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18126,7 +17894,8 @@ msgstr ""
 "Pamata galvas - (�tr�kie) \n"
 "Izmantojiet šo, ja jums nav vēstkopu pasta filtru"
 
-#: ../plugins/imap-features/imap-headers.ui.h:10
+#: ../plugins/imap-features/imap-headers.glade.h:10
+#| msgid "Fetch A_ll Headers"
 msgid "_Fetch All Headers"
 msgstr "_Saņemt visas galvas"
 
@@ -18138,156 +17907,194 @@ msgstr "Skaņot IMAP kontus."
 msgid "IMAP Features"
 msgstr "IMAP iespējas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
+msgid "Hardware Abstraction Layer not loaded"
+msgstr "Hardware Abstraction Layer nav iel�dēts"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
+msgid ""
+"The \"hald\" service is required but not currently running. Please enable "
+"the service and rerun this program, or contact your system administrator."
+msgstr ""
+"\"hald\" ir pieprasīts, bet pašlaik nedarbojas. Lūdzu, palaidiet servisu un "
+"atkal palaidiet šo programmu, vai sazinieties ar sistēmas administratoru."
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
+msgid "Search for an iPod failed"
+msgstr "iPod meklēšana neizdev�s"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
+msgid ""
+"Evolution could not find an iPod to synchronize with. Either the iPod is not "
+"connected to the system or it is not powered on."
+msgstr ""
+"Evolution nevarēja atrast iPod, ar ko sinhronizēties. Vai nu iPod nav "
+"savienots ar sistēmu, vai arī tas nav ieslēgts."
+
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar form�ts (.ics)"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid "Synchronize to iPod"
+msgstr "Sinhronizēt ar iPod"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+#| msgid "Synchronize to iPod"
+msgid "Synchronize your data with your Apple iPod."
+msgstr "Sinhronizēt datus ar Apple iPod"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+msgid "iPod Synchronization"
+msgstr "iPod sinhroniz�cija"
+
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Neizdev�s iel�dēt kalend�ru '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, 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:688
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Atrasta tikšan�s kalend�r� '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find any calendars"
 msgstr "Nevar atrast kalend�rus"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
 msgstr "Nevar atrast tikšanos nevien� kalend�r�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
 msgstr "Nevar atrast uzdevumu nevien� uzdevumu sarakst�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:768
+#| msgid "Unable to find this task in any task list"
 msgid "Unable to find this memo in any memo list"
 msgstr "Nevar atrast memo nevien� memo sarakst�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:839
+#| msgid "Opening calendar"
 msgid "Opening the calendar. Please wait.."
 msgstr "Atver kalend�ru. Lūdzu, uzgaidiet..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
 msgstr "Meklē šīs tikšan�s esošo versiju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
 msgstr "Nevar analizēt elementu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, 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:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Aizsūtīt uz kalend�ru '%s' k� akceptētu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Aizsūtīt uz kalend�ru '%s' k� nenoteiktu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Aizsūtīt uz kalend�ru '%s' k� noraidītu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Aizsūtīt uz kalend�ru '%s' k� atceltu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizators ir izņēmis deleg�tus %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Aizsūtīt deleg�tam anulēšanas ziņu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 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:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 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:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Nevar atjaunin�t dalībnieku. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
 msgstr "Apmeklēt�ja statuss atjaunots"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1407
+#| msgid "Meeting Information"
 msgid "Meeting information sent"
 msgstr "Inform�cija par san�ksmi ir nosūtīta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1410
+#| msgid "Task information"
 msgid "Task information sent"
 msgstr "Uzdevuma inform�cija ir nosūtīta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1413
+#| msgid "No Information"
 msgid "Memo information sent"
 msgstr "Memo inform�cijas ir nosūtīta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Nevar nosūtīt san�ksmes inform�ciju, san�ksme neeksistē"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1425
+#| msgid "Unable to find this task in any task list"
 msgid "Unable to send task information, the task does not exist"
 msgstr "Nevar nosūtīt uzdevuma inform�ciju, uzdevums neeksistē"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Nevar nosūtīt memo inform�ciju, memo neeksistē"
 
-#. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
-#| msgid "Calendars"
-msgid "calendar.ics"
-msgstr "kalend�rs.ics"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1534
-#| msgid "New Calendar"
-msgid "Save Calendar"
-msgstr "Saglab�t kalend�ru"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 msgid "The calendar attached is not valid"
 msgstr "Pievienotais kalend�rs nav derīgs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 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 iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
 msgstr "Inform�cija kalend�r� nav derīga"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18295,11 +18102,11 @@ msgstr ""
 "Ziņ� ir ietverts kalend�rs, bet kalend�rs nesatur notikumus, uzdevumus vai "
 "brīvs/aizņemts inform�ciju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "Pievienotais kalend�rs satur vair�kus elementus"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18307,216 +18114,219 @@ msgstr ""
 "Lai apstr�d�tu visu šo inform�ciju, failu vajadzētu saglab�t un kalend�ru "
 "importēt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2335
+#| msgid "This appointment rec_urs"
 msgid "This meeting recurs"
 msgstr "Šī tikšan�s atk�rtojas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2338
+#| msgid "This appointment rec_urs"
 msgid "This task recurs"
 msgstr "Šis uzdevums atk�rtojas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2341
+#| msgid "This appointment rec_urs"
 msgid "This memo recurs"
 msgstr "Šis memo atk�rtojas"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr "_Dzēst vēstuli pēc darbības"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "Konflikta meklēšana"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Izvēlieties kalend�rus, lai sameklētu tikšanos konfliktus"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Å odien %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Å odien %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Å odien %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "RÄ«t %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "RÄ«t %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "RÄ«t %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "RÄ«t %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Lūdzu, atbildiet <b>%s</b> v�rd�"
 
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Saņemts <b>%s</b> v�rd�"
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> caur %s ir publicējis inform�ciju par san�ksmi:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ir publicējis inform�ciju par sekojošo san�ksmi:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ir deleģējis jums sekojošo san�ksmi:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> caur %s pieprasa jūsu kl�tbūtni sekojošaj� san�ksmē:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> pieprasa jūsu kl�tbūtni sekojošaj� san�ksmē:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> caur %s vēlas pievienot jau eksistējošai san�ksmei:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> vēlas pievienot jau eksistējošai san�ksmei:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18524,88 +18334,88 @@ msgid ""
 msgstr ""
 "<b>%s</b> caur %s vēlas saņemt jaun�ko inform�ciju par sekojošo san�ksmi:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 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šo san�ksmi:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> caur %s ir nosūtījis sekojošo atbildes vēstuli:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ir nosūtījis sekojošo atbildes vēstuli:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> caur %s ir atsaucis sekojošo san�ksmi:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ir atsaucis sekojošo san�ksmi."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> caur  %s ir ierosin�jis sekojoš�s izmaiņas par san�ksmi."
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ir ierosin�jis sekojoš�s izmaiņas par san�ksmi."
 
-#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> caur %s ir noraidījis sekojoš�s izmaiņas san�ksmē:"
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ir noraidījis sekojoš�s izmaiņas uz san�ksmē."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> caur %s ir publicējis inform�ciju par sekojošo uzdevumu:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ir publicējis sekojošo uzdevumu:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> pieprasa %s piešķiršanu sekojošajam uzdevumam:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> caur %s ir uzdevis jums uzdevumu:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> ir uzdevis jums uzdevumu:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> caur %s vēlas pievienot jau eksistējošam uzdevumam:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> vēlas pievienot jau eksistējošam uzdevumam:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18614,7 +18424,7 @@ msgstr ""
 "<b>%s</b> caur %s vēlas saņemt jaun�ko inform�ciju par sekojošo uzdoto "
 "uzdevumu:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18622,200 +18432,183 @@ msgid ""
 msgstr ""
 "<b>%s</b> vēlas saņemt jaun�ko inform�ciju par sekojošo uzdoto uzdevumu:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> caur %s ir nosūtījis/-usi sekojošu atbildi uz piešķirto uzdevumu:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ir nosūtījis sekojošu atbildi par uzdoto uzdevumu:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> caur %s ir atcēlis sekojošo uzdoto uzdevumu:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ir atcēlis sekojošo uzdoto uzdevumu:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> caur %s ir ierosin�jis sekojoš�s izmaiņas uzdevum�:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ir ierosin�jis sekojoš�s izmaiņas uzdevum�:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> caur %s ir noraidījis izmaiņas sekojošaj� uzdevum�:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ir noraidījis sekojošo uzdoto uzdevumu:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> caur %s ir publicējis sekojošu memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> ir publicējis sekojošu memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> caur %s vēlas pievienot jau esošu memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> vēlas pievienot jau esošu memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> caur %s ir atsaucis sekojošo kopīgo memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ir atcēlis sekojošu kopīgo memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
-msgid "All day:"
-msgstr "Visu dienu:"
-
-#: ../plugins/itip-formatter/itip-view.c:686
-#| msgid "Sta_rt date:"
-msgid "Start day:"
-msgstr "S�k_uma diena:"
-
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
-msgid "Start time:"
-msgstr "S�kuma laiks:"
-
-#: ../plugins/itip-formatter/itip-view.c:698
-#| msgid "%d day"
-#| msgid_plural "%d days"
-msgid "End day:"
-msgstr "Beigu diena:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
-msgid "End time:"
-msgstr "Beigu laiks:"
-
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "_Atvērt kalend�ru"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Decline"
 msgstr "Norai_dīt"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
-#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "_Apstiprin�t"
 
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "Norai_dīt visu"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "_Neskaidri visi"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "_Neskaidrs"
 
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "_Apstiprin�t visus"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "_Sūtīt inform�ciju"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "Atja_unin�t dalībnieka statusu"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "Atja_unin�t"
 
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:1033
+msgid "Start time:"
+msgstr "S�kuma laiks:"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:1044
+msgid "End time:"
+msgstr "Beigu laiks:"
+
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "Koment�ri:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "_Atbildēt sūtīt�jam"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
 msgstr "Nosūtīt atja_unin�jumus dalībniekiem"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "Pielietot vis�m inst_ancēm"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1151
+#| msgid "Show time as _busy"
 msgid "Show time as _free"
 msgstr "Attēlot laiku k� _brīvs"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
 msgstr "_Saglab�t manu atg�din�jumu"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1160
+#| msgid "Sh_ow a reminder"
 msgid "_Inherit reminder"
 msgstr "Mantot atg�d_in�jumu"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
-msgid "_Tasks:"
-msgstr "_Uzdevumi:"
-
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1914
+#| msgid "_Memos"
 msgid "_Memos:"
 msgstr "_Memo:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+#| msgid "Displays text/calendar parts in messages."
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Attēlot \"text/calendar\" MIME daļas vēstulēs."
 
@@ -18828,8 +18621,8 @@ msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot;?"
 msgstr ""
-"&quot;{0}&quot; ir deleģējis tikšanos. Vai vēlaties pievienot deleg�tu &quot;"
-"{1}&quot;?"
+"&quot;{0}&quot; ir deleģējis tikšanos. Vai vēlaties pievienot "
+"deleg�tu &quot;{1}&quot;?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -18841,7 +18634,20 @@ msgid ""
 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:46
+msgid "Proxy _Logout"
+msgstr "Starpnieka _atteikšan�s"
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
+msgid "Disable Account"
+msgstr "Deaktivizēt kontu"
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr "Deaktivizēt kontu ar labo klikšķi uz t�, mapju kok�."
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+#| msgid "Select sound file"
 msgid "Beep or play sound file."
 msgstr "Pīkstiens vai atskaņot skaņas failu"
 
@@ -18867,7 +18673,8 @@ msgid ""
 "arrive."
 msgstr ""
 "Ja \"patiess\", tad pīkstiens, cit�di atskaņos skaņas failu, kad pien�k "
-"jauna vēstule."
+"jauna "
+"vēstule."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -18878,61 +18685,57 @@ msgid "Play sound when new messages arrive."
 msgstr "Atskaņot skaņu, kad pien�k jaunas vēstules."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-#| msgid ""
-#| "Sound file to be played when new messages arrive, if not in beep mode."
-msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr ""
-"Atskaņot tēmas skaņu, kad pien�k jaunas vēstules, ja nav pīkstēšanas režīm�."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
 msgstr "Par�dīt paziņojumu kop� ar ikonu."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "R�dīt jauna pasta ikonu ziņojumu lauk�, kad ir saņemta jauna vēstule."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
 msgstr "Skaņas fails, kuru atskaņot."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Skaņas fails, kuru atskaņot, kad pien�k jaunas vēstules, cit�di tiks "
 "izmantots pīkstiens."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
-#| msgid "Use underline"
-msgid "Use sound theme"
-msgstr "Lietot skaņas tēmu"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "Atskaņot skaņu, kad pien�k jaunas vēstules."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "Vai r�dīt ziņojumu p�ri ikonai, kad pien�k jaunas vēstules."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#| msgid "Whether the sidebar should be visible."
 msgid "Whether the icon should blink or not."
 msgstr "Vai ikonai būtu j�mirkšķina."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Vai ziņot par jaun�m vēstulēm tikai iesūtnē."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:245
+#| msgid "Generating message list"
+msgid "Generate a _D-Bus message"
+msgstr "Izveidot D-Bus ziņojumu"
+
+#: ../plugins/mail-notification/mail-notification.c:368
+#| msgid "Mail Notification"
 msgid "Evolution's Mail Notification"
 msgstr "Evolution pasta paziņošana"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:389
+#| msgid "Mail Notification"
 msgid "Mail Notification Properties"
 msgstr "Pasta paziņošanas īpašības"
 
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:498
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18950,21 +18753,7 @@ msgstr[2] ""
 "Jūs esat saņēmis %d jaunu vēstules\n"
 "mapē %s."
 
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:506
-#, c-format
-#| msgid "From %s:"
-msgid "From: %s"
-msgstr "No: %s"
-
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
-#, c-format
-#| msgid "Subject:"
-msgid "Subject: %s"
-msgstr "Temats: %s"
-
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:503
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18972,53 +18761,55 @@ msgstr[0] "Jūs esat saņēmis %d jaunu vēstuli."
 msgstr[1] "Jūs esat saņēmis %d jaunas vēstules."
 msgstr[2] "Jūs esat saņēmis %d jaunas vēstules."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:521
+#: ../plugins/mail-notification/mail-notification.c:526
 msgid "New email"
 msgstr "Jauns e-pasts"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:590
+#| msgid "Show display alarms in notification tray"
 msgid "Show icon in _notification area"
 msgstr "R�dīt iko_nu ziņojumu lauk�"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:593
 msgid "B_link icon in notification area"
 msgstr "Mirkšķin�t ikonu ziņojumu _lauk�"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:595
 msgid "Popup _message together with the icon"
 msgstr "Par�dīt ziņoju_mu kop� ar ikonu"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:776
 msgid "_Play sound when new messages arrive"
 msgstr "Atskaņot skaņu, kad _pien�k jaunas vēstules"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:782
+#| msgid "Beep"
 msgid "_Beep"
 msgstr "_PÄ«kstiens"
 
-#: ../plugins/mail-notification/mail-notification.c:869
-#| msgid "Use underline"
-msgid "Use sound _theme"
-msgstr "Lietot skaņas _tēmu"
+#: ../plugins/mail-notification/mail-notification.c:783
+#| msgid "Select sound file"
+msgid "Play _sound file"
+msgstr "Atskaņot _skaņas failu"
 
-#: ../plugins/mail-notification/mail-notification.c:888
-#| msgid "Play _sound file"
-msgid "Play _file:"
-msgstr "Atskaņot _failu:"
+#: ../plugins/mail-notification/mail-notification.c:794
+msgid "Specify _filename:"
+msgstr "Nor�diet _faila nosaukumu:"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:795
 msgid "Select sound file"
 msgstr "Izvēlieties skaņas failu"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:796
+#| msgid "Palau"
+msgid "Pl_ay"
+msgstr "_Atskaņot"
+
+#: ../plugins/mail-notification/mail-notification.c:853
 msgid "Notify new messages for _Inbox only"
 msgstr "Paziņot par jaun�m vēstulēm tikai _iesūtnē"
 
-#: ../plugins/mail-notification/mail-notification.c:966
-msgid "Generate a _D-Bus message"
-msgstr "Izveidot D-Bus ziņojumu"
-
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "Paziņojums par jaunu vēstuli"
@@ -19027,13 +18818,7 @@ msgstr "Paziņojums par jaunu vēstuli"
 msgid "Notifies you when new mail messages arrive."
 msgstr "Paziņo, kad pien�k jaunas vēstules."
 
-#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
-#, c-format
-msgid "Created from a mail by %s"
-msgstr "No pasta izveidojis %s"
-
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:376
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19042,7 +18827,7 @@ msgstr ""
 "Izvēlētais kalend�rs jau satur notikumu '%s'. Vai vēlaties rediģēt veco "
 "notikumu?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:379
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19051,7 +18836,7 @@ msgstr ""
 "Izvēlētais uzdevumu saraksts jau satur uzdevumu '%s'. Vai vēlaties rediģēt "
 "veco uzdevumu?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:382
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19059,7 +18844,7 @@ msgid ""
 msgstr ""
 "Izvēlētais memo saraksts jau satur memo '%s'. Vai vēlaties rediģēt veco memo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#: ../plugins/mail-to-task/mail-to-task.c:399
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -19067,7 +18852,7 @@ msgstr ""
 "Izvēlētais kalend�rs jau satur dažus notikumus dotajiem pastiem. Vai tomēr "
 "vēlaties izveidot jaunus notikumus?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:402
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -19075,15 +18860,15 @@ msgstr ""
 "Izvēlētais uzdevumu saraksts jau satur dažus uzdevumus dotajiem pastiem. Vai "
 "tomēr vēlaties izveidot jaunus uzdevumus?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#: ../plugins/mail-to-task/mail-to-task.c:405
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
 msgstr ""
-"Izvēlētais memo saraksts jau satur dažus memo dotajiem pastiem. Vai tomēr "
-"vēlaties izveidot jaunus memo?"
+"Izvēlētais memo saraksts jau satur dažus memo dotajiem pastiem. Vai "
+"tomēr vēlaties izveidot jaunus memo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#: ../plugins/mail-to-task/mail-to-task.c:423
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -19091,8 +18876,8 @@ msgid_plural ""
 "Selected calendar contains events for the given mails already. Would you "
 "like to create new events anyway?"
 msgstr[0] ""
-"Izvēlētais kalend�rs jau satur notikumu dotajam pastam. Vai tomēr vēlaties "
-"izveidot jaunu notikumu?"
+"Izvēlētais kalend�rs jau satur notikumu dotajam pastam. Vai tomēr "
+"vēlaties izveidot jaunu notikumu?"
 msgstr[1] ""
 "Izvēlētais kalend�rs jau satur notikumus dotajiem pastiem. Vai tomēr "
 "vēlaties izveidot jaunus notikumus?"
@@ -19100,7 +18885,7 @@ msgstr[2] ""
 "Izvēlētais kalend�rs jau satur notikumus dotajiem pastiem. Vai tomēr "
 "vēlaties izveidot jaunus notikumus?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:429
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -19108,16 +18893,16 @@ msgid_plural ""
 "Selected task list contains tasks for the given mails already. Would you "
 "like to create new tasks anyway?"
 msgstr[0] ""
-"Izvēlētais uzdevumu saraksts jau satur uzdevumu dotajam pastam. Vai tomēr "
-"vēlaties izveidot jaunu uzdevumu?"
+"Izvēlētais uzdevumu saraksts jau satur uzdevumu dotajam pastam. Vai "
+"tomēr vēlaties izveidot jaunu uzdevumu?"
 msgstr[1] ""
-"Izvēlētais uzdevumu saraksts jau satur uzdevumus dotajiem pastiem. Vai tomēr "
-"vēlaties izveidot jaunus uzdevumus?"
+"Izvēlētais uzdevumu saraksts jau satur uzdevumus dotajiem pastiem. Vai "
+"tomēr vēlaties izveidot jaunus uzdevumus?"
 msgstr[2] ""
-"Izvēlētais uzdevumu saraksts jau satur uzdevumus dotajiem pastiem. Vai tomēr "
-"vēlaties izveidot jaunus uzdevumus?"
+"Izvēlētais uzdevumu saraksts jau satur uzdevumus dotajiem pastiem. Vai "
+"tomēr vēlaties izveidot jaunus uzdevumus?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/mail-to-task/mail-to-task.c:435
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -19125,34 +18910,37 @@ msgid_plural ""
 "Selected memo list contains memos for the given mails already. Would you "
 "like to create new memos anyway?"
 msgstr[0] ""
-"Izvēlētais memo saraksts jau satur memo dotajam pastam. Vai tomēr vēlaties "
-"izveidot jaunu memo?"
+"Izvēlētais memo saraksts jau satur memo dotajam pastam. Vai "
+"tomēr vēlaties izveidot jaunu memo?"
 msgstr[1] ""
-"Izvēlētais memo saraksts jau satur memo dotajam pastam. Vai tomēr vēlaties "
-"izveidot jaunus memo?"
+"Izvēlētais memo saraksts jau satur memo dotajam pastam. Vai "
+"tomēr vēlaties izveidot jaunus memo?"
 msgstr[2] ""
-"Izvēlētais memo saraksts jau satur memo dotajam pastam. Vai tomēr vēlaties "
-"izveidot jaunus memo?"
+"Izvēlētais memo saraksts jau satur memo dotajam pastam. Vai "
+"tomēr vēlaties izveidot jaunus memo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:494
+#| msgid "No summary"
 msgid "[No Summary]"
 msgstr "[Nav kopsavilkuma]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:505
 msgid "Invalid object returned from a server"
 msgstr "No servera atgriezts nederīgs objekts"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:570
 #, c-format
+#| msgid "An error occurred while printing"
 msgid "An error occurred during processing: %s"
 msgstr "Gadīj�s kļūda, apstr�d�jot: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:599
 #, c-format
+#| msgid "Can not open file"
 msgid "Cannot open calendar. %s"
 msgstr "Nevar atvērt kalend�ru. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:606
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -19160,7 +18948,7 @@ msgstr ""
 "Izvēlētais avots ir tikai las�ms, t�pēc taj� nevar izveidot notikumu. Lūdzu, "
 "izvēlieties citu avotu."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:609
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19168,7 +18956,7 @@ msgstr ""
 "Izvēlētais avots ir tikai las�ms, t�pēc taj� nevar izveidot uzdevumu. Lūdzu, "
 "izvēlieties citu avotu."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:612
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19176,109 +18964,109 @@ msgstr ""
 "Izvēlētais avots ir tikai las�ms, t�pēc taj� nevar izveidot memo. Lūdzu, "
 "izvēlieties citu avotu."
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:821
 #, c-format
+#| msgid ""
+#| "Cannot create output file: %s:\n"
+#| " %s"
 msgid "Cannot get source list. %s"
 msgstr "Nevar iegūt avotu sarakstu. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
-msgid "Create an _Event"
-msgstr "Izv_eidot notikumu"
-
-#: ../plugins/mail-to-task/mail-to-task.c:1062
-msgid "Create a new event from the selected message"
-msgstr "Izveidot jaunu notikumu no izvēlēt�s vēstules"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#| msgid "Convert the selected message to a new task"
+msgid "Convert a mail message to a task."
+msgstr "P�rveidot vēstuli par uzdevumu"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../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 "Create a new memo"
 msgid "Create a Mem_o"
 msgstr "Izveidot mem_o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
-msgid "Create a new memo from the selected message"
-msgstr "Izveidot jaunu memo no izvēlēt�s vēstules"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+#| msgid "New _Meeting"
+msgid "Create a _Meeting"
+msgstr "Izveidot san�ks_mi"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+#| msgid "Create a new task"
 msgid "Create a _Task"
 msgstr "Izveido_t uzdevumu"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
-msgid "Create a new task from the selected message"
-msgstr "Izveidot jaunu uzdevumu no izvēlēt�s vēstules"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+#| msgid "_Create new view"
+msgid "Create an _Event"
+msgstr "Izv_eidot notikumu"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
-msgid "Create a _Meeting"
-msgstr "Izveidot san�ks_mi"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+#| msgid "Mail to task"
+msgid "Mail-to-Task"
+msgstr "Pasts par uzdevumu"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new event from the selected message"
+msgstr "Izveidot jaunu notikumu no izvēlēt�s vēstules"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+#| msgid "Create a new meeting request"
 msgid "Create a new meeting from the selected message"
 msgstr "Izveidot jaunu san�ksmi no izvēlēt�s vēstules"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid "Convert a mail message to a task."
-msgstr "P�rveidot vēstuli par uzdevumu"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
-msgid "Get List _Archive"
-msgstr "Iegūt saraksta _arhīvu"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
-msgid "Get an archive of the list this message belongs to"
-msgstr "Iegūt šī ziņojuma saraksta arhīvu"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
-msgid "Get List _Usage Information"
-msgstr "Iegūt saraksta izmantošanas inform�cij_u"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
-msgid "Get information about the usage of the list this message belongs to"
-msgstr "Saņemt inform�ciju par saraksta lietojumu, kuram pieder šis ziņojums"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
-msgid "Contact List _Owner"
-msgstr "K_ontaktu saraksta _pašnieks"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "Sazinieties ar adres�tu saraksta īpašnieku, kuram pieder šis ziņojums"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
-msgid "_Post Message to List"
-msgstr "_Sūtīt ziņojumu sarakstam"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new memo from the selected message"
+msgstr "Izveidot jaunu memo no izvēlēt�s vēstules"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
-msgid "Post a message to the mailing list this message belongs to"
-msgstr "Pievienot ziņojumu tam adres�tu sarakstam, kuram pieder šis ziņojums"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new task from the selected message"
+msgstr "Izveidot jaunu uzdevumu no izvēlēt�s vēstules"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
-msgid "_Subscribe to List"
-msgstr "Pierak_stīties sarakstam"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Contact list _owner"
+msgstr "K_ontaktu saraksta īpašnieks"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Pierakstīties adres�tu sarakst�, kuram pieder šis ziņojums"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Get list _archive"
+msgstr "Iegūt saraksta _arhīvu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
-msgid "_Unsubscribe from List"
-msgstr "_Atrakstīties no saraksta"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+msgid "Get list _usage information"
+msgstr "Iegūt saraksta izmantošanas inform�cij_u"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
-#| msgid "Unsubscribe to the mailing list this message belongs to"
-msgid "Unsubscribe from the mailing list this message belongs to"
-msgstr "Atrakstīties no adres�tu saraksta, kuram pieder šī vēstule"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
+msgid "Mailing List Actions"
+msgstr "Adres�tu saraksta darbības"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../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 "Adres�tu _saraksts"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Mailing List Actions"
-msgstr "Adres�tu saraksta darbības"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+#| msgid ""
+#| "Provide actions for common mailing list commands (subscribe, "
+#| "unsubscribe...)."
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr ""
 "Veic tipisk�s adres�tu saraksta darbības (pierakstīties, atrakstīties, ...)."
 
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+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
+msgid "_Subscribe to list"
+msgstr "_Pierakstīties sarakstam"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+msgid "_Un-subscribe to list"
+msgstr "_Atrakstīties no saraksta"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "Darbība nav pieejama"
@@ -19322,6 +19110,11 @@ msgid "Send e-mail message to mailing list?"
 msgstr "Sūtīt e-pasta ziņojumu adres�tu sarakstam?"
 
 #: ../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}"
 msgid ""
 "The action could not be performed. The header for this action did not "
 "contain any action that could be processed.\n"
@@ -19357,11 +19150,62 @@ msgstr "R_ediģēt vēstuli"
 msgid "_Send message"
 msgstr "_Sūtīt vēstuli"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+msgid "Contact List _Owner"
+msgstr "K_ontaktu 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 "Sazinieties ar adres�tu saraksta īpašnieku, kuram pieder š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�cij_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 "Iegūt šī ziņojuma saraksta arhīvu"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "Saņemt inform�ciju par saraksta lietojumu, 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"
+msgstr "Pievienot ziņojumu tam adres�tu sarakstam, kuram pieder šis ziņojums"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Pierakstīties adres�tu sarakst�, kuram pieder šis ziņojums"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr "Atrakstīties no 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 "Pierak_stī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/mark-all-read.c:39
 msgid "Also mark messages in subfolders?"
 msgstr "Atzīmēt arī vēstules apakšmapēs?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:44
+#: ../plugins/mark-all-read/mark-all-read.c:41
+#| msgid ""
+#| "This will mark all messages as read in the selected folder and its "
+#| "subfolders."
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19369,66 +19213,85 @@ msgstr ""
 "Atzīmēt vēstules k� lasītas tikai šaj� mapē, vai arī šaj� mapē un t� "
 "apakšmapēs?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:166
+#| msgid "Create subfolders"
 msgid "In Current Folder and _Subfolders"
 msgstr "Šaj� mapē un apakšmapē_s"
 
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:180
+#| msgid "Current Folder"
 msgid "In Current _Folder Only"
 msgstr "Tikai šaj� _mapē"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
-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:1
 msgid "Mark All Read"
 msgstr "Atzīmēt visas k� lasītas"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+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
 msgid "Mark all messages in a folder as read."
 msgstr "Atzīmēt visas vēstules šaj� mapē k� lasītas."
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
+msgid "Mono Loader"
+msgstr "Mono iel�dēt�js"
+
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr "Atbalstīt spraudņus, kas ir rakstīti Mono."
+
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
+#| msgid "Change Evolution's settings"
 msgid "Manage your Evolution plugins."
 msgstr "P�rvaldiet Evolution spraudņus."
 
+#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:244
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Spraudņu p�rvaldnieks"
 
-#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+msgid "Enable and disable plugins"
+msgstr "Ieslēgt un izslēgt spraudņus"
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+msgid "_Plugins"
+msgstr "S_praudņi"
+
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Autors(-i)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:259
+#: ../plugins/plugin-manager/plugin-manager.c:146
+#| msgid "Mail Configuration"
+msgid "Configuration"
+msgstr "Konfigur�cija"
+
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Piezīme: dažas izmaiņas nebūs pielietotas pirms p�rstartēšanas"
 
-#: ../plugins/plugin-manager/plugin-manager.c:285
+#: ../plugins/plugin-manager/plugin-manager.c:291
+#| msgid "Review"
 msgid "Overview"
 msgstr "P�rskats"
 
-#: ../plugins/plugin-manager/plugin-manager.c:356
-#: ../plugins/plugin-manager/plugin-manager.c:418
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Spraudnis"
 
-#: ../plugins/plugin-manager/plugin-manager.c:430
-msgid "_Plugins"
-msgstr "S_praudņi"
-
-#: ../plugins/plugin-manager/plugin-manager.c:432
-msgid "Enable and disable plugins"
-msgstr "Ieslēgt un izslēgt spraudņus"
-
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "Vienk�rša teksta režīms"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+#| msgid "Prefer plain-text"
 msgid "Prefer Plain Text"
 msgstr "Dod priekšroku vienk�ršam tekstam"
 
@@ -19437,45 +19300,19 @@ msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 "Skatīt visas vēstules k� vienk�ršu tekstu, pat ja t�s satur HTML saturu."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
-msgstr "R�dīt HTML, ja ir pieejams"
-
-#: ../plugins/prefer-plain/prefer-plain.c:201
-msgid "Let Evolution choose the best part to show."
-msgstr "Ļaut Evolution izvēlēties lab�ko daļu, ko r�dīt."
+msgstr "J�dīt HTML, ja ir pieejams"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
-#| msgid "Show HTML if present"
-msgid "Show plain text if present"
-msgstr "R�dīt vienk�ršu tekstu, ja ir pieejams"
-
-#: ../plugins/prefer-plain/prefer-plain.c:202
-msgid ""
-"Show plain text part, if present, otherwise let Evolution choose the best "
-"part to show."
-msgstr ""
-"R�dīt vienk�rš� teksta daļu, ja t�da ir, vai arī ļaut Evolution izvēlēties "
-"lab�ko daļu, kuru r�dīt."
-
-#: ../plugins/prefer-plain/prefer-plain.c:203
-#| msgid "Only ever show PLAIN"
-msgid "Only ever show plain text"
-msgstr "R�dīt tikai vienk�ršu tekstu"
-
-#: ../plugins/prefer-plain/prefer-plain.c:203
-msgid ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
-msgstr ""
-"Vienmēr r�dīt vienk�rš� teksta daļu un izveidot pielikumus no cit�m daļ�m, "
-"ja pieprasa."
+#: ../plugins/prefer-plain/prefer-plain.c:190
+msgid "Prefer PLAIN"
+msgstr "Izvēlas parasto"
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
-msgid "Show s_uppressed HTML parts as attachments"
-msgstr "Paslēpt�s HTML daļas r�dīt k� pielikumus"
+#: ../plugins/prefer-plain/prefer-plain.c:191
+msgid "Only ever show PLAIN"
+msgstr "R�da tikai parasto"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "HT_ML režīms"
 
@@ -19488,10 +19325,12 @@ msgid "Profile data events in Evolution (for developers only)."
 msgstr "Profilēt Evolution datu notikumus (tikai izstr�d�t�jiem)."
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#| msgid "Import mail from Pine."
 msgid "Import Outlook messages from PST file"
 msgstr "Importēt Outlook vēstules no PST faila"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#| msgid "Outlook CSV and Tab Importer"
 msgid "Outlook PST import"
 msgstr "Outlook PST imports"
 
@@ -19499,37 +19338,30 @@ msgstr "Outlook PST imports"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook person�l�s mapes (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
-msgid "_Mail"
-msgstr "_Pasts"
-
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:315
+#| msgid "Address Book"
 msgid "_Address Book"
 msgstr "_Adrešu gr�mata"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:322
+#| msgid "Appointments"
 msgid "A_ppointments"
 msgstr "_Tikšan�s"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Uzdevumi"
-
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:334
+#| msgid "Journal entry - %s"
 msgid "_Journal entries"
 msgstr "Žurn�la ie_raksti"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:349
+#| msgid "Importing Elm data"
 msgid "Importing Outlook data"
 msgstr "Importē Outlook datus"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:153
 msgid "Calendar Publishing"
 msgstr "Kalend�ru publicēšana"
 
@@ -19538,154 +19370,158 @@ msgid "Locations"
 msgstr "Atrašan�s vietas"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#| msgid "Allows calendars to be published to the web"
 msgid "Publish calendars to the web."
 msgstr "Publicēt kalend�rus tīmeklī."
 
-#: ../plugins/publish-calendar/publish-calendar.c:208
-#: ../plugins/publish-calendar/publish-calendar.c:449
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+msgid "_Publish Calendar Information"
+msgstr "_Publicēt kalend�ra inform�ciju"
+
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
 #, c-format
+#| msgid "Could not open source"
 msgid "Could not open %s:"
 msgstr "Nevar atvērt %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:210
+#: ../plugins/publish-calendar/publish-calendar.c:97
 #, c-format
+#| msgid "Could not parse PGP message: Unknown error"
 msgid "Could not open %s: Unknown error"
 msgstr "Nevar atvērt %s: Nezin�ma kļūda"
 
-#: ../plugins/publish-calendar/publish-calendar.c:230
+#: ../plugins/publish-calendar/publish-calendar.c:117
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Gadīj�s kļūda, publicējot uz %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:232
+#: ../plugins/publish-calendar/publish-calendar.c:119
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Veiksmīgi publicēts uz %s"
 
-#: ../plugins/publish-calendar/publish-calendar.c:276
+#: ../plugins/publish-calendar/publish-calendar.c:164
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "%s montēšana neizdev�s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
-#: ../plugins/publish-calendar/publish-calendar.ui.h:4
-msgid "E_nable"
-msgstr "A_ktivizēt"
-
-#: ../plugins/publish-calendar/publish-calendar.c:739
+#: ../plugins/publish-calendar/publish-calendar.c:624
+#| msgid "Are you sure you want to remove this URL?"
 msgid "Are you sure you want to remove this location?"
 msgstr "Vai tieš�m vēlaties izņemt šo atrašan�s vietu?"
 
-#. To Translators: This is shown to a user when creation of a new thread,
-#. where the publishing should be done, fails. Basically, this shouldn't
-#. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1051
+#: ../plugins/publish-calendar/publish-calendar.c:788
+#| msgid "Could not create message."
 msgid "Could not create publish thread."
 msgstr "Neizdev�s izveidot publicēšanas pavedienu."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1059
-msgid "_Publish Calendar Information"
-msgstr "_Publicēt kalend�ra inform�ciju"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-#| msgid "Custom Notification"
-msgid "Custom Location"
-msgstr "Piel�got� vieta"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">Atrašan�s vieta</span>"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:3
-#| msgid "Day"
-msgid "Daily"
-msgstr "Ik dienu"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">Avoti</span>"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:5
-msgid "FTP (with login)"
-msgstr "FTP (ar pieteikšanos)"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+"Ik dienu\n"
+"Ik nedēļu\n"
+"Pašrocīgi (caur \"Darbības\" izvēlni)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:9
-#| msgid ""
-#| "Daily\n"
-#| "Weekly\n"
-#| "Manual (via Actions menu)"
-msgid "Manual (via Actions menu)"
-msgstr "Pašrocīgi (caur \"Darbības\" izvēlni)"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "A_ktivizēt"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
 msgstr "P_orts:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:12
-#| msgid "Public"
-msgid "Public FTP"
-msgstr "Publisks FTP"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
 msgid "Publishing Location"
 msgstr "Publicēšanas vieta"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:14
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
 msgid "Publishing _Frequency:"
 msgstr "Publicēšanas _biežums:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Secure FTP (SSH)"
-msgstr "Drošs FTP (SSH)"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
-msgid "Secure WebDAV (HTTPS)"
-msgstr "Drošs WebDAV (HTTPS)"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:17
+#: ../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"
+msgid ""
+"Secure FTP (SSH)\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+"Drošs FTP SSH\n"
+"Publisks FTP\n"
+"FTP (ar pieteikšanos)\n"
+"Windows koplietošanas mape\n"
+"WebDAV (HTTP)\n"
+"Drošais WebDAV (HTTPS)\n"
+"Piel�gota vieta"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
 msgstr "Servisa _tips:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:18
-#| msgid "Source"
-msgid "Sources"
-msgstr "Avoti"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:19
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#| msgid "Time _zone:"
 msgid "Time _duration:"
 msgstr "_Darbības laiks:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:20
-#| msgid "WebDAV"
-msgid "WebDAV (HTTP)"
-msgstr "WebDAV (HTTP)"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-#| msgid "Week"
-msgid "Weekly"
-msgstr "Ir nedēļu"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#| msgid "_Window"
-msgid "Windows share"
-msgstr "Windows koplietošanas mape"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "_Fails:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "_Parole:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "_Publicēt k�:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "_Atcerēties paroli"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "_Lietot�jv�rds:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:31
-#| msgid "Call"
-msgid "iCal"
-msgstr "iCal"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"dienas\n"
+"nedēļas\n"
+"mēneši"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr ""
+"iCal\n"
+"Brīvs/aizņemts"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
@@ -19693,30 +19529,65 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Nevar publicēt kalend�ru: kalend�ra aizmugure vairs neeksistē"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#| msgid "Location"
 msgid "New Location"
 msgstr "Jauna atrašan�s vieta"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#| msgid "Location"
 msgid "Edit Location"
 msgstr "Rediģēt atrašan�s vietu"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#| msgid "Home Phone"
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Python spraudņu iel�dēt�ja tests"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python testa spraudnis"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Python EPlugin testa spraudņa iel�dēt�js."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using Python."
+msgstr ""
+"Spraudnis, kurš iel�dē citus spraudņus, kuri ir rakstīti izmantojot Python."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+#| msgid "Mono Loader"
+msgid "Python Loader"
+msgstr "Python iel�dēt�js"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
+#| msgid "SpamAssassin junk plugin"
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin nav atrasts, kods: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:134
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
+#| msgid "Failed to create local mail storage `%s': %s"
 msgid "Failed to create pipe: %s"
 msgstr "Neizdev�s izveidot programmkan�lu: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
+#| msgid ""
+#| "Error on %s:\n"
+#| " %s"
 msgid "Error after fork: %s"
 msgstr "Kļūda pēc zarošan�s: %s"
 
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
@@ -19732,29 +19603,35 @@ msgstr "Gaidīšana uz SpamAssassin bērna procesu apturēta, p�rtrauc..."
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Programmkanalēšana uz SpamAssassin neizdev�s, kļūdas kods: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
-#| msgid "SpamAssassin is not available."
-msgid "SpamAssassin is not available. Please install it first."
-msgstr "SpamAssassin nav pieejams. Lūdzu, vispirms to uzinstalējiet."
+#| msgid "Send options not available."
+msgid "SpamAssassin is not available."
+msgstr "SpamAssassin nav pieejams."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
+#| msgid "This will make Spamassasin more reliable, but slower"
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Tas padarīs Spamassasin uzticam�ku, bet lēn�ku"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 msgid "I_nclude remote tests"
 msgstr "Ie_kļaut att�lin�tu testu"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+#| msgid ""
+#| "Filters junk messages using SpamAssassin. This plugin requires "
+#| "SpamAssassin to be installed."
 msgid "Filter junk messages using SpamAssassin."
 msgstr "Filtrē mēstules, lietojot SpamAssassin filtru."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+#| msgid "SpamAssassin junk plugin"
 msgid "SpamAssassin Junk Filter"
 msgstr "SpamAssassin mēstuļu filtrs"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+#| msgid "SpamAssassin (built-in)"
 msgid "SpamAssassin Options"
 msgstr "SpamAssassin opcijas"
 
@@ -19762,178 +19639,198 @@ msgstr "SpamAssassin opcijas"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:161
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
 msgstr "Aprakstu saraksts"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "Kategoriju saraksts"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
 msgstr "Koment�ru saraksts"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "Kontaktu saraksts"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "S�kums"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "Beigas"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "procenti izdarīts"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "Apmeklēt�ju saraksts"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "Mainīts"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:523
+#| msgid "Advanced options for the CSV format"
 msgid "A_dvanced options for the CSV format"
 msgstr "_Paplašin�tas opcijas CSV form�tam"
 
-#: ../plugins/save-calendar/csv-format.c:537
+#: ../plugins/save-calendar/csv-format.c:530
+#| msgid "Prepend a header"
 msgid "Prepend a _header"
 msgstr "S�kum� pievienot _galvu"
 
-#: ../plugins/save-calendar/csv-format.c:546
+#: ../plugins/save-calendar/csv-format.c:539
+#| msgid "Value delimiter:"
 msgid "_Value delimiter:"
 msgstr "_Vērtību atdalītajs:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:546
+#| msgid "Record delimiter:"
 msgid "_Record delimiter:"
 msgstr "Ie_rakstu atdalīt�js:"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:553
+#| msgid "Encapsulate values with:"
 msgid "_Encapsulate values with:"
 msgstr "I_ekapsulēt vērtības ar:"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:575
 msgid "Comma separated value format (.csv)"
 msgstr "Komatu atdalītu vērtību form�ts (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:162
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar form�ts (.ics)"
-
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Saglab�t izvēlēto"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+#| msgid "Saves selected calendar or tasks list to disk."
 msgid "Save a calendar or task list to disk."
 msgstr "Saglab�t kalend�ru vai uzdevumu sarakstu disk�."
 
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "_Save to Disk"
+msgstr "_Saglab�t disk�"
+
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:369
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "RDF form�ts (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:104
+#| msgid "Format"
 msgid "_Format:"
 msgstr "_Form�ts:"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:165
 msgid "Select destination file"
 msgstr "Izvēlieties gala mērķa failu"
 
-#: ../plugins/save-calendar/save-calendar.c:325
-#| msgid "Save the selected messages as a text file"
-msgid "Save the selected calendar to disk"
-msgstr "Saglab�t izvēlēto kalend�ru disk�"
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
+#| msgid "Selects a single calendar or task source for viewing."
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "Ātri izvēlas kalend�ru vai uzdevumu, ko apskatīt."
 
-#: ../plugins/save-calendar/save-calendar.c:356
-#| msgid "Save the selected messages as a text file"
-msgid "Save the selected memo list to disk"
-msgstr "Saglab�t izvēlēto memo sarakstu disk�"
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
+#| msgid "Select one source"
+msgid "Select One Source"
+msgstr "Izvēlieties vienu avotu"
 
-#: ../plugins/save-calendar/save-calendar.c:387
-#| msgid "Save a calendar or task list to disk."
-msgid "Save the selected task list to disk"
-msgstr "Saglab�t izvēlēto uzdevumu sarakstu disk�"
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
+msgid "Show _only this Calendar"
+msgstr "R�dīt tikai š_o kalend�ru"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+#| msgid "Show _only this Task List"
+msgid "Show _only this Memo List"
+msgstr "R�dīt tikai š_o memo sarakstu"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
+msgid "Show _only this Task List"
+msgstr "R�dīt tikai š_o uzdevumu sarakstu"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
 msgstr "Vada jūs caur s�kotnējai konta iestatīšanai."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
+#| msgid "Assistant"
 msgid "Setup Assistant"
 msgstr "Iestatīšanas asistents"
 
-#: ../plugins/startup-wizard/startup-wizard.c:110
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Evolution iestatīšanas asistents"
 
-#: ../plugins/startup-wizard/startup-wizard.c:115
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "Laipni lūdzam"
 
-#: ../plugins/startup-wizard/startup-wizard.c:118
+#: ../plugins/startup-wizard/startup-wizard.c:88
 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 ""
-"Laipni lūdzam Evolution. Daži n�košie ekr�ni jums ļaus Evolution pieslēgt "
-"jūsu epasta kontiem, un importēt failus no cit�m lietotnēm.\n"
+"Laipni lūdzam Evolution. Daži n�košie ekr�ni jums ļaus Evolution "
+"pieslēgt jūsu epasta kontiem, un importēt failus no cit�m lietotnēm.\n"
 "\n"
 "Lūdzu, spiediet \"Uz priekšu\" pogu, lai turpin�tu. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
+#: ../plugins/startup-wizard/startup-wizard.c:115
+msgid "Importing files"
+msgstr "Importē failus"
+
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 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:168
-#: ../widgets/misc/e-import-assistant.c:542
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "No %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:185
-msgid "Importing files"
-msgstr "Importē failus"
-
-#: ../plugins/startup-wizard/startup-wizard.c:248
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:548
+#, c-format
 msgid "Importing data."
 msgstr "Importē datus."
 
-#: ../plugins/startup-wizard/startup-wizard.c:250
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:562
 msgid "Please wait"
 msgstr "LÅ«dzu, uzgaidiet"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
+#| msgid "Thread messages by subject"
 msgid "Sort mail message threads by subject."
 msgstr "Sak�rtot vēstules pavedienos pēc to tematiem."
 
@@ -19956,25 +19853,28 @@ msgid ""
 "message body."
 msgstr ""
 "Saraksts ar atslēgas v�rdu/vērtību p�riem sagatavju spraudnim, lai "
-"aizvietotu vēstules ķermenī."
+"aizvietotu "
+"vēstules ķermenī."
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "Uz melnrakstiem balstītu sagatavju spraudni"
-
-#: ../plugins/templates/templates.c:617
-#| msgid "No title"
-msgid "No Title"
+#: ../plugins/templates/templates.c:601
+#| msgid "Job Title"
+msgid "No title"
 msgstr "Nav virsraksta"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:709
+#| msgid "Send as Delegate"
 msgid "Save as _Template"
 msgstr "Saglab�t k� saga_tavi"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:711
+#| msgid "Save as draft"
 msgid "Save as Template"
 msgstr "Saglab�t k� sagatavi"
 
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Uz melnrakstiem balstītu sagatavju spraudni"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
 msgstr "Atkodēt TNEF (winmail.dat) pielikumus no Microsoft Outlook."
@@ -19984,6 +19884,7 @@ msgid "TNEF Decoder"
 msgstr "TNEF dekodēt�js"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+#| msgid "Multiple VCards"
 msgid "Inline vCards"
 msgstr "Iekļauts iCard"
 
@@ -19991,28 +19892,35 @@ msgstr "Iekļauts iCard"
 msgid "Show vCards directly in mail messages."
 msgstr "R�dīt vCards paš� vēstules satur�."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+#| msgid "Show Full VCard"
 msgid "Show Full vCard"
 msgstr "R�dīt pilnu vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:162
+#| msgid "Show Compact VCard"
 msgid "Show Compact vCard"
 msgstr "R�dīt kompaktu vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:222
+#| msgid "There is one other contact."
+#| msgid_plural "There are %d other contacts."
 msgid "There is one other contact."
 msgstr "Nav citu kontaktu."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:231
 #, c-format
+#| msgid "There is one other contact."
+#| msgid_plural "There are %d other contacts."
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Ir vēl %d kontakts."
 msgstr[1] "Ir vēl %d kontakti."
 msgstr[2] "Ir vēl %d kontakti."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:252
+#| msgid "Save in addressbook"
 msgid "Save in Address Book"
 msgstr "Saglab�t adrešu gr�mat�"
 
@@ -20021,6 +19929,7 @@ msgid "Add WebDAV contacts to Evolution."
 msgstr "Pievienot WebDAV kontaktus pie Evolution."
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+#| msgid "No contacts"
 msgid "WebDAV contacts"
 msgstr "WebDAV kontakti"
 
@@ -20028,14 +19937,31 @@ msgstr "WebDAV kontakti"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
+#| msgid "_URL:"
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Izv_airīties no IfMatch (vajadzīgs uz Apache < 2.2.8)"
 
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution �aula"
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell Config factory"
+msgstr "Evolution �aulas konfigur�cijas ražotne"
+
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution tests"
+
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution testa komponente"
+
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
 msgstr "Autentificēt starpnieka servera savienojumus"
@@ -20053,64 +19979,46 @@ msgid "Default sidebar width"
 msgstr "Noklusētais s�nu joslas platums"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
-#| msgid "Default window state"
-msgid "Default window X coordinate"
-msgstr "Noklusēt� loga X koordin�ta"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:6
-#| msgid "Default window state"
-msgid "Default window Y coordinate"
-msgstr "Noklusēt� loga Y koordin�ta"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "Noklusētais loga augstums"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Noklusētais loga st�voklis"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Noklusētais loga platums"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-#| msgid "Enable search folders"
-msgid "Enable express mode"
-msgstr "Ieslēgt ekspress režīmu"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "Ieslēgt starpnieka iestatījumus, kad izmanto HTTP/HTTPS caur Internetu."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-msgid "Flag that enables a much simplified user interface."
-msgstr "Atzīme, kura ieslēdz daudz vienk�ršot�ku lietot�ja saskarni."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "HTTP starpniekserveria v�rds"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+#| msgid "Enter password"
 msgid "HTTP proxy password"
 msgstr "HTTP starpnieka parole"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "HTTP starpnieka ports"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "HTTP starpnieka lietot�jv�rds"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 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�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -20119,68 +20027,72 @@ msgid ""
 msgstr ""
 "Ja patiess, savienojumiem ar starpniekserveri vajag autentifik�ciju. "
 "Lietot�jv�rds tiek ņemts no \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf atslēgas, un parole tiek ņemta vai nu no gnome-"
-"keyring vai ~/.gnome2_private/Evolution paroļu faila."
+"authentication_user\" GConf atslēgas, un parole tiek ņemta vai nu no "
+"gnome-keyring vai ~/.gnome2_private/Evolution paroļu faila."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+#| msgid "Insert Attachment"
 msgid "Initial attachment view"
 msgstr "S�kotnējais pielikumu skats"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+#| msgid "Install the shared folder"
 msgid "Initial file chooser folder"
 msgstr "S�kotnēj� failu izvēlēt�ja mape"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "S�kotnēj� mape GtkFileChooser dialogiem."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
 msgstr ""
-"S�kotnējais skats pielikumu joslas logrīkam. \"0\" ir ikonu skats, \"1\" ir "
+"S�kotnējais skats pielikumu joslas logdaļai. \"0\" ir ikonu skats, \"1\" ir "
 "saraksta skats."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Last upgraded configuration version"
 msgstr "Pēdēj� uzlabot� konfigur�cijas versija"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
-"Ceļu saraksts mapēm, kur�m ir j�sinhronizējas ar disku nesaistes lietošanai"
+"Ceļu saraksts mapēm, kur�m ir j�sinhronizējas ar disku nesaistes "
+"lietošanai"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Non-proxy hosts"
 msgstr "Ne starpnieku resursdatori"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Parole, lai tiktu cauri autentifik�cijai, kad izmanto HTTP starpnieku."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+#| msgid "Set up Pilot configuration"
 msgid "Proxy configuration mode"
 msgstr "Starpnieka konfigur�cijas režīms"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "SOCKS proxy host name"
 msgstr "SOCKS starpniekservera v�rds"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "SOCKS proxy port"
 msgstr "SOCKS starpnieka ports"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Secure HTTP proxy host name"
 msgstr "Droš� HTTP starpniekservera v�rds"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Secure HTTP proxy port"
 msgstr "Droš� HTTP starpnieka ports"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -20192,23 +20104,23 @@ msgstr ""
 "konfigur�ciju\" un \"izmantot starpnieka konfigur�ciju, kuru pied�v� "
 "autom�tisk�s konfigur�cijas url\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
 msgstr "S�nu josla ir redzama"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Skip development warning dialog"
 msgstr "Izlaist izstr�des brīdin�juma dialogam"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "Palaist nesaistes režīm�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
 msgstr "Statusa josla ir redzama"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20216,29 +20128,19 @@ msgstr ""
 "Evolution konfigur�cijas versija, ar lieliem/maziem/konfigur�cijas līmeņiem "
 "(piemēram \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
-#| msgid "The default width for the main window, in pixels."
-msgid "The default X coordinate for the main window."
-msgstr "Noklusēt� X koordin�ta galvenajam logam."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-#| msgid "The default width for the main window, in pixels."
-msgid "The default Y coordinate for the main window."
-msgstr "Noklusēt� Y koordin�ta galvenajam logam."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
 msgstr "Galven� loga noklusētais augstums pikseļos."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the main window, in pixels."
 msgstr "Loga noklusētais platums pikseļos."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default width for the sidebar, in pixels."
 msgstr "S�nu joslas noklusētais platums pikseļos."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20246,19 +20148,19 @@ msgstr ""
 "Evolution pēdēja uzlabot� konfigur�cijas versija, ar lielo/mazo/"
 "konfigur�cijas līmeni (piemēram \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
 msgstr "Datora v�rds, caur kuru sūtīt HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Datora v�rds, caur kuru sūtīt HTTPS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy socks through."
 msgstr "Datora v�rds, caur kuru sūtīt socks."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20266,7 +20168,7 @@ msgstr ""
 "Starpnieka datora ports, kurš ir noteikts  \"/apps/evolution/shell/"
 "network_config/http_host\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20274,7 +20176,7 @@ msgstr ""
 "Starpnieka datora ports, kurš ir noteikts  \"/apps/evolution/shell/"
 "network_config/secure_host\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20282,16 +20184,16 @@ msgstr ""
 "Starpnieka datora ports, kurš ir noteikts  \"/apps/evolution/shell/"
 "network_config/socks_host\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 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 ""
-"Loga pogu stils. Var būt \"text\", \"icons\", \"both\", \"toolbar\". Ja ir "
-"iestatīts \"toolbar\", pogu stilu noteiks GNOME."
+"Loga pogu stils. Var būt \"text\", \"icons\", \"both\", \"toolbar\". Ja "
+"ir iestatīts \"toolbar\", pogu stilu noteiks GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -20301,226 +20203,176 @@ msgstr ""
 "Šī atslēga satur datoru sarakstu, ar kuriem savienoties tieši, nevis caur "
 "starpnieku (ja t�s ir). Vērtības var būt datoru v�rdi, domēni (izmantojot "
 "s�kotnējo aizst�jējzīmi, piemēram, *.foo.com), IP adreses (gan IPv4, gan "
-"IPv6) un tīkla adreses ar tīkla masku (teiksim 192.168.0.0/24)."
+"IPv6) "
+"un tīkla adreses ar tīkla masku (teiksim 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
 msgstr "RÄ«kjosla ir redzama"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+#| msgid "Last upgraded configuration version"
 msgid "URL that provides proxy configuration values."
 msgstr "URL, kur� ir starpnieka konfigur�cijas vērtības."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Use HTTP proxy"
 msgstr "Izmantot HTTP starpnieku"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Lietot�jv�rds, kuru izmantot, kad izmanto HTTP starpnieku."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Vai Evolution palaidīsies nesaistes nevis tiešsaistes režīm�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether or not the window should be maximized."
 msgstr "Vai logam būtu j�būt maksimizētam."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
 msgstr "Vai s�nu joslai būtu j�būt redzamai."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
 msgstr "Vai statusa joslai j�būt redzamai."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:60
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr "Vai rīkjoslai j�būt redzamai."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:61
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Vai brīdin�juma dialogs Evolution izstr�des versij�s tiek izlaists."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:62
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Vai logu pog�m ir j�būt redzam�m."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:63
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Loga pogu stils"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:64
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Logu pogas ir redzamas"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
-msgid "Searches"
-msgstr "Meklēšanas"
+#: ../shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Aktīvie savienojumi</b>"
 
-#: ../shell/e-shell-content.c:619
-msgid "Save Search"
-msgstr "Saglab�t meklēšanu"
+#: ../shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktīvie savienojumi"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+#: ../shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+"Spiediet 'Labi', lai aizvērtu šos savienojumus un ietu nesaistes režīm�"
 
-#. Translators: The "Show:" label precedes a combo box that
-#. * allows the user to filter the current view.  Examples of
-#. * items that appear in the combo box are "Unread Messages",
-#. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
-#| msgid "Sho_w: "
-msgid "Sho_w:"
-msgstr "R�dī_t:"
-
-#. Translators: This is part of the quick search interface.
-#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
-#| msgid "Sear_ch: "
-msgid "Sear_ch:"
-msgstr "M_eklēt:"
-
-#. Translators: This is part of the quick search interface.
-#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
-#| msgid " i_n "
-msgid "i_n"
-msgstr "i_ekš"
-
-#: ../shell/e-shell-switcher.c:448
-#| msgid "Tool_bar Style"
-msgid "Toolbar Style"
-msgstr "RÄ«kjoslas stils"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "P�rslēdzēja rīkjoslas stils"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-#| msgid "Toolbar is visible"
-msgid "Toolbar Visible"
-msgstr "RÄ«kjosla ir redzama"
+#: ../shell/e-shell-importer.c:128
+msgid "Choose the type of importer to run:"
+msgstr "Izvēlieties importēt�ja veidu:"
 
-#: ../shell/e-shell-switcher.c:466
-#| msgid "Whether the sidebar should be visible."
-msgid "Whether the switcher is visible"
-msgstr "Vai p�rslēdzējam būtu j�būt redzamam."
+#: ../shell/e-shell-importer.c:131
+#| 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."
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Izvēlieties failu, ko jūs vēlaties importēt Evolution, un tad no saraksta "
+"izvēlieties, k�da tipa fails tas ir."
 
-#: ../shell/e-shell-utils.c:247
-#| msgid "vCard (.vcf, .gcrd)"
-msgid "vCard (.vcf)"
-msgstr "vCard (.vcf)"
+#: ../shell/e-shell-importer.c:135
+msgid "Choose the destination for this import"
+msgstr "Izvēlieties šīs importēšanas galamērķi"
 
-#: ../shell/e-shell-utils.c:249
-#| msgid "iCalendar files (.ics)"
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
+#: ../shell/e-shell-importer.c:141
+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 ""
+"Evolution p�rbaudīja iestatījumus, lai importētu no sekojošaj�m\n"
+"lietotnēm: Pine, Netscape, Elm, iCalendar. Importējami iestatījumi\n"
+"netika atrasti. Ja vēlaties mēģin�t vēlreiz, spiediet pogu \"Atpakaļ\".\n"
 
-#: ../shell/e-shell-utils.c:270
-#| msgid "All files"
-msgid "All Files (*)"
-msgstr "Visi faili (*)"
-
-#: ../shell/e-shell-view.c:681
-#| msgid "Switch to %s"
-msgid "Switcher Action"
-msgstr "P�rslēdzēja darbība"
-
-#: ../shell/e-shell-view.c:682
-msgid "The switcher action for this shell view"
-msgstr "P�rslēdzēja darbība šim �aulas skatam"
-
-#: ../shell/e-shell-view.c:697
-#| msgid "Serial Number"
-msgid "Page Number"
-msgstr "Lapas numurs"
-
-#: ../shell/e-shell-view.c:698
-msgid "The notebook page number of the shell view"
-msgstr "Čaulas skata piezīmju gr�matas lapas numurs"
-
-#: ../shell/e-shell-view.c:714
-#| msgid "Search Filter"
-msgid "Search Rule"
-msgstr "Meklēšanas k�rtula"
-
-#: ../shell/e-shell-view.c:715
-msgid "Criteria for the current search results"
-msgstr "Esošo meklēšanas rezult�tu kritērijs"
-
-#: ../shell/e-shell-view.c:730
-msgid "The EShellBackend for this shell view"
-msgstr "EShellBackend šim �aulas skatam"
-
-#: ../shell/e-shell-view.c:745
-msgid "Shell Content Widget"
-msgstr "Čaulas satura logrīks"
-
-#: ../shell/e-shell-view.c:746
-msgid "The content widget appears in a shell window's right pane"
-msgstr "Satura logrīks par�d�s �aulas loga labaj� rūtī"
-
-#: ../shell/e-shell-view.c:762
-#| msgid "Default sidebar width"
-msgid "Shell Sidebar Widget"
-msgstr "Čaulas s�nu joslas logrīks"
-
-#: ../shell/e-shell-view.c:763
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "S�nu joslas logrīks par�d�s �aulas loga kreisaj� rūtī"
-
-#: ../shell/e-shell-view.c:778
-msgid "Shell Taskbar Widget"
-msgstr "Čaulas uzdevumu joslas logrīks"
-
-#: ../shell/e-shell-view.c:779
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "Uzdevumu joslas logrīks par�d�s �aulas loga apakš�"
-
-#: ../shell/e-shell-view.c:794
-#| msgid "New _Window"
-msgid "Shell Window"
-msgstr "ÄŒaulas logs"
-
-#: ../shell/e-shell-view.c:795
-msgid "The window to which the shell view belongs"
-msgstr "Logs, kuram pieder �aulas skats"
-
-#: ../shell/e-shell-view.c:811
-msgid "The key file holding widget state data"
-msgstr "Atslēgas fails, kurš satur logrīka st�vokļa datus"
-
-#: ../shell/e-shell-view.c:826
-msgid "The title of the shell view"
-msgstr "ÄŒaulas skata virsraksts"
-
-#: ../shell/e-shell-view.c:840
-#| msgid "_Current View"
-msgid "Current View ID"
-msgstr "Pašreizēj� skata ID"
-
-#: ../shell/e-shell-view.c:841
-#| msgid "the current time"
-msgid "The current GAL view ID"
-msgstr "Pašreizēj� GAL skata ID"
+#: ../shell/e-shell-importer.c:295
+msgid "F_ilename:"
+msgstr "Fa_ila nosaukums:"
+
+#: ../shell/e-shell-importer.c:300
+msgid "Select a file"
+msgstr "Izvēlieties failu"
+
+#: ../shell/e-shell-importer.c:309
+msgid "File _type:"
+msgstr "Faila _tips:"
+
+#: ../shell/e-shell-importer.c:357
+msgid "Import data and settings from _older programs"
+msgstr "Importēt datus un iestatījumus n_o vec�k�m programm�m"
+
+#: ../shell/e-shell-importer.c:360
+msgid "Import a _single file"
+msgstr "Importēt _vienu failu"
+
+#: ../shell/e-shell-importer.c:743
+msgid "_Import"
+msgstr "_Importēt"
+
+#: ../shell/e-shell-settings-dialog.c:312
+msgid "Evolution Preferences"
+msgstr "Evolution iestatījumi"
+
+#. To translators: This is the window title and %s is the
+#. component name. Most translators will want to keep it as is.
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
+#, c-format
+#| msgid "Evolution"
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
+
+#: ../shell/e-shell-window-commands.c:69
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "Izskat�s, ka GNOME Pilot rīki nav instalēti šaj� sistēm�."
+
+#: ../shell/e-shell-window-commands.c:78
+#, c-format
+#| msgid "Error executing %s."
+msgid "Error executing %s. (%s)"
+msgstr "Kļūda, izpildot %s. (%s)"
+
+#: ../shell/e-shell-window-commands.c:135
+msgid "Bug buddy is not installed."
+msgstr "Bug buddy nav uzinstalēts."
+
+#: ../shell/e-shell-window-commands.c:138
+msgid "Bug buddy could not be run."
+msgstr "Bug buddy nevar tikt palaists."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:645
+#: ../shell/e-shell-window-commands.c:1026
 msgid "translator-credits"
 msgstr ""
 "Raivis Dejus <orvils@gmail.com>; RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>; "
 "Jeljena Vlasenko[jv05006]<vlasenko.elena@gmail.com>; RÅ«dolfs Bundulis "
 "<rudolfs.bundulis@gmail.com>; M�ris Rucis mr05005@lu.lv; Peteris Bodnieks "
 "pb05003 <urka77@inbox.lv>; J�nis Timma <dactyl@inbox.lv>; Krišj�nis "
-"Žuravļevs kz05014 <kz05014@lanet.lv>; Janis Mancevics <nijamzzz@yahoo.com>; "
-"J�nis Krēsliņš  jancisauns@inbox.lv; Rihards Adovi�s <rihards_fox@inbox.lv>; "
+"Žuravļevs "
+"kz05014 <kz05014@lanet.lv>; Janis Mancevics <nijamzzz@yahoo.com>; J�nis "
+"Krēsliņš  jancisauns@inbox.lv; Rihards Adovi�s <rihards_fox@inbox.lv>; "
 "Ingrīda Irguļska ii05006 <ingrida.irgulska@gmail.com>; Gatis Zalcmanis "
 "gz05012  <wokers@inbox.lv>; Dmitrijs Rasjuks <dmitrijs.rasjuks@inbox.lv>\n"
 "\n"
@@ -20536,449 +20388,134 @@ msgstr ""
 "  Raivis Dejus https://launchpad.net/~orvils\n"
 "  Vladislavs Kupc�ns https://launchpad.net/~vladislavs-kupcans"
 
-#: ../shell/e-shell-window-actions.c:656
+#: ../shell/e-shell-window-commands.c:1037
 msgid "Evolution Website"
 msgstr "Evolution m�jaslapa"
 
-#: ../shell/e-shell-window-actions.c:1224
-#| msgid "Bug buddy is not installed."
-msgid "Bug Buddy is not installed."
-msgstr "Bug Buddy nav uzinstalēts."
-
-#: ../shell/e-shell-window-actions.c:1226
-#| msgid "Bug buddy could not be run."
-msgid "Bug Buddy could not be run."
-msgstr "Nevar palaist Bug Buddy."
-
-#: ../shell/e-shell-window-actions.c:1343
-#| msgid "Bug buddy is not installed."
-msgid "GNOME Pilot is not installed."
-msgstr "GNOME Pilot nav uzinstalēts."
-
-#: ../shell/e-shell-window-actions.c:1345
-#| msgid "Bug buddy could not be run."
-msgid "GNOME Pilot could not be run."
-msgstr "Nevar palaist GNOME Pilot."
-
-#: ../shell/e-shell-window-actions.c:1439
-msgid "Show information about Evolution"
-msgstr "R�dīt inform�ciju par Evolution"
-
-#: ../shell/e-shell-window-actions.c:1444
-msgid "_Close Window"
-msgstr "_Aizvērt logu"
-
-#: ../shell/e-shell-window-actions.c:1451
-#| msgid "A_ppointments"
-msgid "_Contents"
-msgstr "_Saturs"
-
-#: ../shell/e-shell-window-actions.c:1453
-msgid "Open the Evolution User Guide"
-msgstr "Atvērt Evolution lietot�ja rokasgr�matu"
-
-#: ../shell/e-shell-window-actions.c:1479
-msgid "Evolution _FAQ"
-msgstr "Evolution _BUJ"
-
-#: ../shell/e-shell-window-actions.c:1481
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "Atvērt biež�k uzdoto jaut�jumu m�jas lapu"
-
-#: ../shell/e-shell-window-actions.c:1486
-msgid "_Forget Passwords"
-msgstr "_Aizmirst paroles"
-
-#: ../shell/e-shell-window-actions.c:1488
-#| msgid "Are you sure you want to forget all remembered passwords?"
-msgid "Forget all remembered passwords"
-msgstr "Aizmirst visas paroles"
-
-#: ../shell/e-shell-window-actions.c:1493
-msgid "I_mport..."
-msgstr "I_mportēt..."
-
-#: ../shell/e-shell-window-actions.c:1495
-msgid "Import data from other programs"
-msgstr "Importēt datus no cit�m programm�m"
-
-#: ../shell/e-shell-window-actions.c:1500
-msgid "New _Window"
-msgstr "Jauns _logs"
-
-#: ../shell/e-shell-window-actions.c:1502
-#| msgid "Create a new window displaying this folder"
-msgid "Create a new window displaying this view"
-msgstr "Izveidot jaunu logu, kurš attēlo šo skatu"
-
-#: ../shell/e-shell-window-actions.c:1516
-#| msgid "Configuration"
-msgid "Configure Evolution"
-msgstr "Konfigurēt Evolution"
-
-#: ../shell/e-shell-window-actions.c:1521
-msgid "_Quick Reference"
-msgstr "_Ātr� atsauce"
-
-#: ../shell/e-shell-window-actions.c:1523
-#| msgid "Change Evolution's settings"
-msgid "Show Evolution's shortcut keys"
-msgstr "R�dīt Evolution īsin�jumtaustiņus"
-
-#: ../shell/e-shell-window-actions.c:1530
-msgid "Exit the program"
-msgstr "Iziet no programmas"
-
-#: ../shell/e-shell-window-actions.c:1535
-msgid "_Advanced Search..."
-msgstr "P_aplašin�t� meklēšana..."
-
-#: ../shell/e-shell-window-actions.c:1537
-msgid "Construct a more advanced search"
-msgstr "Veidot izvērst�ku meklēšanu"
-
-#: ../shell/e-shell-window-actions.c:1544
-#| msgid "Clear the search"
-msgid "Clear the current search parameters"
-msgstr "Attīrīt pašreizējos meklēšanas parametrus"
-
-#: ../shell/e-shell-window-actions.c:1549
-msgid "_Edit Saved Searches..."
-msgstr "R_ediģēt saglab�tos meklējumus..."
-
-#: ../shell/e-shell-window-actions.c:1551
-#| msgid "Manage your email, contacts and schedule"
-msgid "Manage your saved searches"
-msgstr "P�rvaldiet savus meklēšanas rezult�tus"
-
-#: ../shell/e-shell-window-actions.c:1558
-msgid "Click here to change the search type"
-msgstr "Klikšķiniet šeit, lai mainītu meklēšanas tipu"
-
-#: ../shell/e-shell-window-actions.c:1563
-msgid "_Find Now"
-msgstr "_Meklēt tagad"
-
-#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
-#| msgid "Cancel the current mail operation"
-msgid "Execute the current search parameters"
-msgstr "Izpildīt pašreizējos meklēšanas parametrus"
-
-#: ../shell/e-shell-window-actions.c:1570
-msgid "_Save Search..."
-msgstr "_Saglab�t meklējumu..."
-
-#: ../shell/e-shell-window-actions.c:1572
-#| msgid "Save the current file"
-msgid "Save the current search parameters"
-msgstr "Saglab�t pašreizējos meklēšanas parametrus"
-
-#: ../shell/e-shell-window-actions.c:1584
-msgid "Send / _Receive"
-msgstr "Nosūtīt / _saņemt"
-
-#: ../shell/e-shell-window-actions.c:1586
-msgid "Send queued items and retrieve new items"
-msgstr "Sūtīt sarindotos priekšmetus un saņemt jaunus priekšmetus"
-
-#: ../shell/e-shell-window-actions.c:1591
-#| msgid "Submit _Bug Report"
-msgid "Submit _Bug Report..."
-msgstr "Nosūtīt _kļūdu ziņojumu..."
-
-#: ../shell/e-shell-window-actions.c:1593
-msgid "Submit a bug report using Bug Buddy"
-msgstr "Nosūtīt kļūdas ziņojumu izmantojot Bug Buddy"
-
-#: ../shell/e-shell-window-actions.c:1598
-#| msgid "iPod Synchronization"
-msgid "GNOME Pilot _Synchronization..."
-msgstr "GNOME Pilot _sinhroniz�cija..."
-
-#: ../shell/e-shell-window-actions.c:1600
-#| msgid "Set up Pilot configuration"
-msgid "Set up GNOME Pilot configuration"
-msgstr "Iestatīt GNOME Pilot konfigur�ciju"
-
-#: ../shell/e-shell-window-actions.c:1605
-msgid "_Work Offline"
-msgstr "_Str�d�t nesaistē"
-
-#: ../shell/e-shell-window-actions.c:1607
-#| msgid "Start in offline mode"
-msgid "Put Evolution into offline mode"
-msgstr "P�rlikt Evolution nesaistes režīm�"
-
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-commands.c:1251
 msgid "_Work Online"
 msgstr "_Str�d�t tiešsaistē"
 
-#: ../shell/e-shell-window-actions.c:1614
-#| msgid "Start in online mode"
-msgid "Put Evolution into online mode"
-msgstr "P�rlikt Evolution tiešsaistes režīm�"
-
-#: ../shell/e-shell-window-actions.c:1642
-msgid "Lay_out"
-msgstr "Izk�rt_ojums"
-
-#: ../shell/e-shell-window-actions.c:1649
-msgid "_New"
-msgstr "Jau_ns"
-
-#: ../shell/e-shell-window-actions.c:1656
-msgid "_Search"
-msgstr "_Meklēt"
-
-#: ../shell/e-shell-window-actions.c:1663
-msgid "_Switcher Appearance"
-msgstr "_P�rslēdzēja izskats"
-
-#: ../shell/e-shell-window-actions.c:1677
-msgid "_Window"
-msgstr "_Logs"
-
-#: ../shell/e-shell-window-actions.c:1706
-msgid "Show Side _Bar"
-msgstr "R�dīt s�nu _joslu"
-
-#: ../shell/e-shell-window-actions.c:1708
-#| msgid "Show Side _Bar"
-msgid "Show the side bar"
-msgstr "R�dīt s�nu joslu"
-
-#: ../shell/e-shell-window-actions.c:1714
-#| msgid "Show Animations"
-msgid "Show _Buttons"
-msgstr "R�dīt _pogas"
-
-#: ../shell/e-shell-window-actions.c:1716
-#| msgid "Show the second time zone"
-msgid "Show the switcher buttons"
-msgstr "R�dīt p�rslēdzēja pogas"
-
-#: ../shell/e-shell-window-actions.c:1722
-msgid "Show _Status Bar"
-msgstr "R�dīt _statusa joslu"
-
-#: ../shell/e-shell-window-actions.c:1724
-#| msgid "Show _Status Bar"
-msgid "Show the status bar"
-msgstr "R�dīt statusa joslu"
-
-#: ../shell/e-shell-window-actions.c:1730
-#| msgid "Show _Toolbar"
-msgid "Show _Tool Bar"
-msgstr "R�dī_t rīkjoslu"
-
-#: ../shell/e-shell-window-actions.c:1732
-#| msgid "Show _Toolbar"
-msgid "Show the tool bar"
-msgstr "R�dīt rīkjoslu"
-
-#: ../shell/e-shell-window-actions.c:1754
-msgid "_Icons Only"
-msgstr "Tikai _ikonas"
-
-#: ../shell/e-shell-window-actions.c:1756
-msgid "Display window buttons with icons only"
-msgstr "R�dīt logu pogas tikai ar ikon�m"
-
-#: ../shell/e-shell-window-actions.c:1761
-msgid "_Text Only"
-msgstr "Tikai _teksts"
-
-#: ../shell/e-shell-window-actions.c:1763
-msgid "Display window buttons with text only"
-msgstr "R�dīt logu pogas tikai ar tekstu"
-
-#: ../shell/e-shell-window-actions.c:1768
-msgid "Icons _and Text"
-msgstr "Ikon_as un teksts"
-
-#: ../shell/e-shell-window-actions.c:1770
-msgid "Display window buttons with icons and text"
-msgstr "R�dīt logu pogas ar ikon�m un tekstu"
-
-#: ../shell/e-shell-window-actions.c:1775
-msgid "Tool_bar Style"
-msgstr "RÄ«k_joslas stils"
-
-#: ../shell/e-shell-window-actions.c:1777
-msgid "Display window buttons using the desktop toolbar setting"
-msgstr "R�dīt logu pogas lietot darbvirsma rīkjoslas iestatījumus"
-
-#: ../shell/e-shell-window-actions.c:1785
-msgid "Define Views..."
-msgstr "Definēt skatus..."
-
-#: ../shell/e-shell-window-actions.c:1787
-msgid "Create or edit views"
-msgstr "Izveidot vai rediģēt skatus"
-
-#: ../shell/e-shell-window-actions.c:1792
-msgid "Save Custom View..."
-msgstr "Saglab�t piel�goto skatu..."
-
-#: ../shell/e-shell-window-actions.c:1794
-msgid "Save current custom view"
-msgstr "Saglab�t pašreizējo piel�goto skatu"
+#: ../shell/e-shell-window-commands.c:1264 ../ui/evolution.xml.h:57
+msgid "_Work Offline"
+msgstr "_Str�d�t nesaistē"
 
-#: ../shell/e-shell-window-actions.c:1801
-msgid "C_urrent View"
-msgstr "P_ašreizējais skats"
+#: ../shell/e-shell-window-commands.c:1277
+msgid "Work Offline"
+msgstr "Str�d�t nesaistē"
 
-#: ../shell/e-shell-window-actions.c:1811
-msgid "Custom View"
-msgstr "Piel�gots skats"
+#: ../shell/e-shell-window.c:372
+#| msgid "Evolution is currently online. Click on this button to work offline."
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+"Evolution pašreiz ir tiešsaistē. \n"
+"Spiediet šo pogu, lai str�d�tu nesaistē."
 
-#: ../shell/e-shell-window-actions.c:1813
-msgid "Current view is a customized view"
-msgstr "Pašreizējais skats ir piel�gots"
+#: ../shell/e-shell-window.c:379
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution ieiet nesaistes režīm�."
 
-#: ../shell/e-shell-window-actions.c:1823
-#| msgid "Set up the page settings for your current printer"
-msgid "Change the page settings for your current printer"
-msgstr "Mainīt lapas iestatījumus jūsu esošajam printerim"
+#: ../shell/e-shell-window.c:386
+#| msgid "Evolution is currently offline. Click on this button to work online."
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+"Evolution pašlaik ir nesaistes režīm�. \n"
+"Spiediet šo pogu, lai str�d�tu tiešsaistē."
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "P�rslēgties uz %s"
 
-#: ../shell/e-shell-window-actions.c:2413
-msgid "Execute these search parameters"
-msgstr "Izpildīt šos meklēšanas parametrus"
+#: ../shell/e-shell.c:634
+msgid "Unknown system error."
+msgstr "Nezin�ma sistēmas kļūda."
 
-#. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:571
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
-msgid "%s - Evolution"
-msgstr "%s - Evolution"
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
+msgid "OK"
+msgstr "Labi"
+
+#: ../shell/e-shell.c:1253
+msgid "Invalid arguments"
+msgstr "Nederīgi argumenti"
+
+#: ../shell/e-shell.c:1255
+msgid "Cannot register on OAF"
+msgstr "Nevar reģistrēties uz OAF"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell.c:1257
+msgid "Configuration Database not found"
+msgstr "Konfigur�cijas datub�ze nav atrasta"
+
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "Jauns"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "Aktīv�s �aulas skats"
+#: ../shell/test/evolution-test-component.c:103
+msgid "New Test"
+msgstr "Jauns tests"
 
-#: ../shell/e-shell-window.c:617
-#| msgid "Name of new view:"
-msgid "Name of the active shell view"
-msgstr "Aktīv�s �aulas skata nosaukums"
+#: ../shell/test/evolution-test-component.c:104
+#| msgid "_Test"
+msgctxt "New"
+msgid "_Test"
+msgstr "_Tests"
 
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "ÄŒaulas loga EFocusTracker"
+#: ../shell/test/evolution-test-component.c:105
+msgid "Create a new test item"
+msgstr "Izveidot jaunu testa vienību"
 
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:804
-msgid "Geometry"
-msgstr "Ä¢eometrija"
+#: ../shell/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr "Spiediet \"Importēt\", lai s�ktu faila importēšanu uz Evolution. "
 
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:805
-msgid "Initial window geometry string"
-msgstr "S�kotnēj� loga ģeometrijas virkne"
+#: ../shell/import.glade.h:2
+msgid "Evolution Import Assistant"
+msgstr "Evolution importēšanas asistents"
 
-#: ../shell/e-shell-window.c:662
-#| msgid "_Caret Mode"
-msgid "Safe Mode"
-msgstr "Drošais režīms"
+#: ../shell/import.glade.h:3
+msgid "Import File"
+msgstr "Importēt failu"
 
-#: ../shell/e-shell-window.c:663
-#| msgid "Whether the plugin is enabled"
-msgid "Whether the shell window is in safe mode"
-msgstr "Vai loga �aula ir drošaj� režīm�"
+#: ../shell/import.glade.h:4
+msgid "Import Location"
+msgstr "Importa atrašan�s vieta"
 
-#: ../shell/e-shell-window.c:694
-#| msgid "Sidebar is visible"
-msgid "Sidebar Visible"
-msgstr "S�nu josla ir redzama"
+#: ../shell/import.glade.h:5
+msgid "Importer Type"
+msgstr "Importēt�ja tips"
 
-#: ../shell/e-shell-window.c:695
-#| msgid "Whether the window buttons should be visible."
-msgid "Whether the shell window's side bar is visible"
-msgstr "Vai �aulas loga s�nu josla ir redzama"
-
-#: ../shell/e-shell-window.c:709
-#| msgid "Sidebar is visible"
-msgid "Switcher Visible"
-msgstr "P�rslēdzējs ir redzams"
-
-#: ../shell/e-shell-window.c:710
-#| msgid "Whether the window buttons should be visible."
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Vai �aulas loga p�rslēdzēj pogas ir redzamas"
-
-#: ../shell/e-shell-window.c:725
-#| msgid "Statusbar is visible"
-msgid "Taskbar Visible"
-msgstr "Uzdevumu josla ir redzama"
-
-#: ../shell/e-shell-window.c:726
-#| msgid "Whether the status bar should be visible."
-msgid "Whether the shell window's task bar is visible"
-msgstr "Vai �aulas loga uzdevumu josla ir redzama"
-
-#: ../shell/e-shell-window.c:741
-#| msgid "Whether the window buttons should be visible."
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Vai �aulas loga rīku josla ir redzama"
-
-#: ../shell/e-shell-window.c:755
-#| msgid "Manager"
-msgid "UI Manager"
-msgstr "UI p�rvaldnieks"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "ÄŒaulas loga GtkUIManager"
-
-#: ../shell/e-shell.c:212
-#| msgid "Preparing account '%s' for offline"
-msgid "Preparing to go offline..."
-msgstr "Gatavojas doties nesaistē..."
-
-#: ../shell/e-shell.c:262
-#| msgid "Preparing account '%s' for offline"
-msgid "Preparing to go online..."
-msgstr "Gatavojas doties tiešsaistē..."
-
-#: ../shell/e-shell.c:330
-msgid "Preparing to quit..."
-msgstr "Gatavojas iziet..."
-
-#: ../shell/e-shell.c:820
-#| msgid "Save directory"
-msgid "Module Directory"
-msgstr "Moduļu mape"
-
-#: ../shell/e-shell.c:821
-msgid "The directory from which to load EModules"
-msgstr "Mape, no kuras iel�dēt EModules"
-
-#: ../shell/e-shell.c:836
-msgid "Network Available"
-msgstr "TÄ«kls ir pieejams"
-
-#: ../shell/e-shell.c:837
-#| msgid "Whether the plugin is enabled"
-msgid "Whether the network is available"
-msgstr "Vai tīkls ir pieejams"
-
-#: ../shell/e-shell.c:852 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "Tiešsaistē"
+#: ../shell/import.glade.h:6
+#| msgid "Select folder to import into"
+msgid "Select Information to Import"
+msgstr "Izvēlieties inform�ciju, kuru importēt"
 
-#: ../shell/e-shell.c:853
-#| msgid "Whether the plugin is enabled"
-msgid "Whether the shell is online"
-msgstr "Vai �aula ir tiešsaistē"
+#: ../shell/import.glade.h:7
+msgid "Select a File"
+msgstr "Izvēlieties failu"
+
+#: ../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 ""
+"Sveicin�ti Evolution importēšanas asistent�.\n"
+"Šis asistents vadīs jūs cauri �rējo failu importēšanai uz Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -21013,7 +20550,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:192
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -21021,62 +20558,43 @@ msgstr ""
 "Paldies\n"
 "Evolution Komanda\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "Turpm�k vairs neatg�din�t"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "S�kt Evolution aktivēšanu nor�dītajai komponentei"
 
-#: ../shell/main.c:324
-msgid "Apply the given geometry to the main window"
-msgstr "Pielietot doto ģeometriju galvenajam logam"
-
-#: ../shell/main.c:328
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "S�kt tiešsaistes režīm�"
 
-#: ../shell/main.c:330
-#| msgid "Start in online mode"
-msgid "Start in \"express\" mode"
-msgstr "S�kt \"ekspress\" režīm�"
+#: ../shell/main.c:494
+msgid "Forcibly shut down all Evolution components"
+msgstr "Piespiedu k�rt� aizvērt visas Evolution komponentes"
 
-#: ../shell/main.c:333
-#| msgid "Forcibly shut down all Evolution components"
-msgid "Forcibly shut down Evolution"
-msgstr "Piespiedu k�rt� aizvērt Evolution"
-
-#: ../shell/main.c:337
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Piespiedu k�rt� atkal migrēt no Evolution 1.4"
 
-#: ../shell/main.c:340
+#: ../shell/main.c:501
 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:342
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr "Atslēgt jebk�du spraudņu iel�di."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "Atslēgt priekšskatījuma rūti pastam, kontaktiem un uzdevumiem."
-
-#: ../shell/main.c:348
-msgid "Import URIs or file names given as rest of arguments."
-msgstr "Importēt failu nosaukumu URI, ko nor�da k� atlikušos argumentus."
+msgstr "Atslēgt priekšskatījumu paneli pastam, kontaktiem un uzdevumiem."
 
-#: ../shell/main.c:350
-#| msgid "Restarting Evolution"
-msgid "Request a running Evolution process to quit"
-msgstr "Pieprasīt ejošajam Evolution procesam iziet"
-
-#: ../shell/main.c:465
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM un e-pasta klients"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21090,30 +20608,39 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Vai jūs esat p�rliecin�ts, ka vēlaties aizmirst visas paroles?"
 
 #: ../shell/shell.error.xml.h:2
+#| msgid "Restart Evolution"
+msgid "Cannot start Evolution"
+msgstr "Nevar palaist Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Turpin�t"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Dzēst veco inform�ciju no versijas {0}?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
+msgid "Evolution can not start."
+msgstr "Nevar palaist Evolution."
+
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
-"Jūsu paroļu aizmiršana dzēsīs visas paroles, kuras Evolution atceras. T�s "
-"prasīs n�kamaj� reizē, kad t�s vajadzēs."
+"Jūsu paroļu aizmiršana dzēsīs visas paroles, kuras Evolution atceras. "
+"T�s prasīs n�kamaj� reizē, kad t�s vajadzēs."
 
-#: ../shell/shell.error.xml.h:6
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Uzlabojumiem ir nepietiek diska vietas."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Patieš�m izdzēst vecos datus?"
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -21134,7 +20661,15 @@ msgstr ""
 "Vienreiz dzēšot, jūs nevarēsiet atjaunot veco Evolution versiju bez papildus "
 "iejaukšan�s.\n"
 
-#: ../shell/shell.error.xml.h:14
+#: ../shell/shell.error.xml.h:16
+#| msgid ""
+#| "The previous version of evolution stored its data in a different "
+#| "location.\n"
+#| "\n"
+#| "If you choose to remove this data, the entire contents of the &quot;"
+#| "evolution&quot; directory will be removed permanently. If you choose to "
+#| "keep this data, then you may manually remove the contents of &quot;"
+#| "evolution&quot; at your convenience.\n"
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -21145,17 +20680,16 @@ msgid ""
 msgstr ""
 "Iepriekšēj� Evolution versija glab�ja t�s datus daž�d�s atrašan�s viet�s.\n"
 "\n"
-"Ja vēlaties šos datus izņemt, viss &quot;evolution&quot; mapes saturs tiks "
-"nekavējoties izdzēsts. Ja izvēlēsieties saglab�t šos datus, tad varat "
-"pašrocīgi izdzēst &quot;evolution&quot; saturu, uzņemoties personisku "
-"atbildību.\n"
+"Ja vēlaties šos datus izņemt, viss &quot;evolution&quot; mapes "
+"saturs tiks nekavējoties izdzēsts. Ja izvēlēsieties saglab�t šos datus, "
+"tad varat pašrocīgi izdzēst &quot;evolution&quot; saturu, uzņemoties "
+"personisku atbildību.\n"
 
-#: ../shell/shell.error.xml.h:18
-#| msgid "Upgrade from previous version failed: {0}"
-msgid "Upgrade from previous version failed:"
-msgstr "Iepriekšēj�s versijas uzlabošana nav izdevusies:"
+#: ../shell/shell.error.xml.h:20
+msgid "Upgrade from previous version failed: {0}"
+msgstr "Iepriekšēj�s versijas uzlabošana nav izdevusies: {0}"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:21
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -21166,130 +20700,58 @@ msgstr ""
 "Uzlabojot jūsu inform�ciju un iestatījumus, tiks aizņemti {0} no diska "
 "vietas, bet jums ir pieejami tikai {1}.\n"
 "\n"
-"Jums būs nepieciešams iegūt liel�ku brīvo vietu jūsu m�jas mapē, pirms varat "
-"turpin�t."
+"Jums būs nepieciešams iegūt liel�ku brīvo vietu jūsu m�jas mapē, "
+"pirms varat turpin�t."
+
+#: ../shell/shell.error.xml.h:24
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+"Jūsu sistēmas konfigur�cija neatbilst jūsu Evolution konfigur�cijai.\n"
+"\n"
+"Spiediet uz palīdzības, lai iegūtu sīk�ku inform�ciju"
+
+#: ../shell/shell.error.xml.h:27
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+"Jūsu sistēmas konfigur�cija neatbilst jūsu Evolution konfigur�cijai:\n"
+"\n"
+"{0}\n"
+"\n"
+"Spiediet palīdzību, lai iegūtu sīk�ku inform�ciju."
 
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_Aizmirst"
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Saglab�t datus"
 
-#: ../shell/shell.error.xml.h:24
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Atg�din�t man vēl�k"
 
-#: ../shell/shell.error.xml.h:25
-#| msgid ""
-#| "{1}\n"
-#| "\n"
-#| "If you choose to continue, you may not have access to some of your old "
-#| "data.\n"
+#: ../shell/shell.error.xml.h:35
 msgid ""
-"{0}\n"
+"{1}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 msgstr ""
-"{0}\n"
+"{1}\n"
 "\n"
 "Ja jūs izvēlēsieties turpin�t, jūs varat nepiekļūt k�diem jūsu vecajiem "
 "datiem.\n"
 
-#: ../shell/test/e-test-shell-backend.c:60
-#| msgctxt "New"
-#| msgid "_Test"
-msgctxt "New"
-msgid "_Test Item"
-msgstr "_Testēt priekšmetus"
-
-#: ../shell/test/e-test-shell-backend.c:62
-msgid "Create a new test item"
-msgstr "Izveidot jaunu testa vienību"
-
-#: ../shell/test/e-test-shell-backend.c:70
-#| msgid "Resource"
-msgctxt "New"
-msgid "Test _Source"
-msgstr "Test avot_s"
-
-#: ../shell/test/e-test-shell-backend.c:72
-#| msgid "Create a new test item"
-msgid "Create a new test source"
-msgstr "Izveidot jaunu testa avotu"
-
-#: ../smclient/eggdesktopfile.c:165
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr "Fails nav derīgs .desktop fails"
-
-#: ../smclient/eggdesktopfile.c:188
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "Neatpazīta desktop faila versija '%s'"
-
-#: ../smclient/eggdesktopfile.c:958
-#, c-format
-#| msgid "Scanning %s"
-msgid "Starting %s"
-msgstr "Palaiž %s"
-
-#: ../smclient/eggdesktopfile.c:1100
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "Lietotne nepieņem dokumentus no komandrindas"
-
-#: ../smclient/eggdesktopfile.c:1168
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "Neatpazīta palaišanas opcija: %d"
-
-#: ../smclient/eggdesktopfile.c:1373
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "Nevar padot dokumenta URI uz 'Type=Link' darbvirsmas ierakstu"
-
-#: ../smclient/eggdesktopfile.c:1394
-#, c-format
-#| msgid "Editor not launchable"
-msgid "Not a launchable item"
-msgstr "Nav palaižams priekšmets"
-
-#: ../smclient/eggsmclient.c:227
-#| msgid "_Direct connection to the Internet"
-msgid "Disable connection to session manager"
-msgstr "Atslēgt savienojumu ar sesijas p�rvaldnieku"
-
-#: ../smclient/eggsmclient.c:230
-#| msgid "Set up Pilot configuration"
-msgid "Specify file containing saved configuration"
-msgstr "Nor�dīt failu, kurš satur saglab�to konfigur�ciju"
-
-#: ../smclient/eggsmclient.c:230
-msgid "FILE"
-msgstr "FAILS"
-
-#: ../smclient/eggsmclient.c:233
-msgid "Specify session management ID"
-msgstr "Nor�dīt sesijas vadības ID"
-
-#: ../smclient/eggsmclient.c:233
-#| msgid "UID"
-msgid "ID"
-msgstr "ID"
-
-#: ../smclient/eggsmclient.c:254
-msgid "Session management options:"
-msgstr "Sesijas vadības opcijas:"
-
-#: ../smclient/eggsmclient.c:255
-#| msgid "Show image animations"
-msgid "Show session management options"
-msgstr "R�dīt sesija vadības opcijas"
-
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21300,7 +20762,7 @@ msgstr ""
 "\n"
 "Rediģēt uzticamības uzst�dījumus:"
 
-#: ../smime/gui/cert-trust-dialog.c:144
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -21309,7 +20771,7 @@ msgstr ""
 "Jūs uzticaties šī sertifik�ta autentiskumam, jo jūs uzticaties sertifik�ta "
 "īpašniekam, kas radīja šo sertifik�tu, ja nav vien nav nor�dīts cit�di"
 
-#: ../smime/gui/cert-trust-dialog.c:148
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -21319,59 +20781,55 @@ msgstr ""
 "sertifik�ta īpašniekam, kas radīja šo sertifik�tu, ja nav vien nav nor�dīts "
 "cit�di"
 
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr "Izvēlēties importējamo sertifik�tu..."
 
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:145
 msgid "All PKCS12 files"
 msgstr "Visi PKCS12 faili"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:625
 msgid "All files"
 msgstr "Visi faili"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr "Sertifik�ta nosaukums"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 msgid "Purposes"
 msgstr "MÄ“rÄ·i"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
-#: ../smime/lib/e-cert.c:566
+#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "SÄ“rijas numurs"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "Derīguma termiņš"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:392
 msgid "All email certificate files"
 msgstr "Visi e-pasta sertifik�ta faili"
 
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "E-pasta adrese"
 
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:620
 msgid "All CA certificate files"
 msgstr "Visi CA sertifik�ta faili"
 
-#: ../smime/gui/certificate-manager.c:1050
-msgid "Certificates"
-msgstr "Sertifik�ti"
-
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifik�ta skatīt�js:%s"
@@ -21391,7 +20849,7 @@ msgid "Enter new password"
 msgstr "Ievadiet jauno paroli"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -21400,7 +20858,7 @@ msgstr ""
 "Izdots:\n"
 "  Temats:%s\n"
 
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -21409,27 +20867,59 @@ msgstr ""
 "Izdevis:\n"
 "  Temats:%s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Izvēlieties sertifik�tu"
 
-#: ../smime/gui/smime-ui.ui.h:1
+#: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Nav sertifik�ta daļa>"
 
-#: ../smime/gui/smime-ui.ui.h:2
+#: ../smime/gui/smime-ui.glade.h:2
+msgid "<b>Certificate Fields</b>"
+msgstr "<b>Sertifik�ta lauki</b>"
+
+#: ../smime/gui/smime-ui.glade.h:3
+msgid "<b>Certificate Hierarchy</b>"
+msgstr "<b>Sertifik�ta hierarhija</b>"
+
+#: ../smime/gui/smime-ui.glade.h:4
+msgid "<b>Field Value</b>"
+msgstr "<b>Lauka vērtība</b>"
+
+#: ../smime/gui/smime-ui.glade.h:5
+msgid "<b>Fingerprints</b>"
+msgstr "<b>Nospiedumi</b>"
+
+#: ../smime/gui/smime-ui.glade.h:6
+msgid "<b>Issued By</b>"
+msgstr "<b>Izdevējs:</b>"
+
+#: ../smime/gui/smime-ui.glade.h:7
+msgid "<b>Issued To</b>"
+msgstr "<b>Izdots:</b>"
+
+#: ../smime/gui/smime-ui.glade.h:8
+msgid "<b>This certificate has been verified for the following uses:</b>"
+msgstr "<b>Šis sertifik�ts ir p�rbaudīts sekojošiem mērķiem:</b>"
+
+#: ../smime/gui/smime-ui.glade.h:9
+msgid "<b>Validity</b>"
+msgstr "<b>Derīgums</b>"
+
+#: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
 msgstr "Institūcijas"
 
-#: ../smime/gui/smime-ui.ui.h:3
+#: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
 msgstr "Rezerves kopija"
 
-#: ../smime/gui/smime-ui.ui.h:4
+#: ../smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
 msgstr "Veidot rezerves kopijas visam"
 
-#: ../smime/gui/smime-ui.ui.h:5
+#: ../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)."
@@ -21437,347 +20927,1631 @@ msgstr ""
 "Pirms uzticēties šim CA jebk�dam mērķim, jums vajadzētu p�rbaudīt t� "
 "sertifik�tu, t� drošības polisi un procedūras (ja ir pieejamas)."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "Sertifik�ts"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
 msgstr "Sertifik�ta autorit�tes uzticamība"
 
-#: ../smime/gui/smime-ui.ui.h:8
-#| msgid "<b>Certificate Fields</b>"
-msgid "Certificate Fields"
-msgstr "Sertifik�ta lauki"
-
-#: ../smime/gui/smime-ui.ui.h:9
-#| msgid "<b>Certificate Hierarchy</b>"
-msgid "Certificate Hierarchy"
-msgstr "Sertifik�ta hierarhija"
-
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
 msgstr "Sertifik�ta detaļas"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.glade.h:17
 msgid "Certificates Table"
 msgstr "Sertifik�ta tabula"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
 msgstr "Kopējais v�rds (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.glade.h:19
 msgid "Contact Certificates"
 msgstr "Kontakta sertifik�ti"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.glade.h:21
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Neuzticieties šī sertifik�ta autentiskumam"
 
-#: ../smime/gui/smime-ui.ui.h:16
+#: ../smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr "Tikai maketa logam"
+
+#: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Rediģēt"
 
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
 msgstr "E-pasta sertifik�ta uzticamības iestatījumi"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
 msgstr "E-pasta saņēmēja sertifik�ts"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
 msgstr "E-pasta parakstīt�ja sertifik�ts"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
 msgstr "Beidzas"
 
-#: ../smime/gui/smime-ui.ui.h:21
-#| msgid "Field Name"
-msgid "Field Value"
-msgstr "Lauka vērtība"
-
-#: ../smime/gui/smime-ui.ui.h:22
-#| msgid "MD5 Fingerprint"
-msgid "Fingerprints"
-msgstr "Nospiedumi"
-
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../smime/gui/smime-ui.glade.h:29
 msgid "Import"
 msgstr "Importēt"
 
-#: ../smime/gui/smime-ui.ui.h:25
-#| msgid "Issued On"
-msgid "Issued By"
-msgstr "Izdevējs"
-
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.glade.h:30
 msgid "Issued On"
 msgstr "Izsniegts"
 
-#: ../smime/gui/smime-ui.ui.h:27
-#| msgid "Issued On"
-msgid "Issued To"
-msgstr "Izdots"
-
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.glade.h:31
 msgid "MD5 Fingerprint"
 msgstr "MD5 nospiedums"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
 msgstr "Organiz�cija (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.glade.h:33
 msgid "Organizational Unit (OU)"
 msgstr "Organiz�cijas struktūrvienība (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.glade.h:34
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 nospiedums"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "SSL klienta sertifik�ts"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL servera sertifik�ts"
 
-#: ../smime/gui/smime-ui.ui.h:35
-#| msgid "<b>This certificate has been verified for the following uses:</b>"
-msgid "This certificate has been verified for the following uses:"
-msgstr "Šis sertifik�ts ir p�rbaudīts sekojošiem mērķiem:"
-
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust the authenticity of this certificate"
 msgstr "Uzticieties šī sertifik�ta autentiskumam"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
 msgstr "Uzticieties šim CA, lai atpazītu e-pasta lietot�jus."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
 msgstr "Uzticieties šim CA, lai atpazītu programmatūras izstr�d�t�jus."
 
-#: ../smime/gui/smime-ui.ui.h:39
+#: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
 msgstr "Uzticieties šim CA, lai atpazītu m�jas lapas."
 
-#: ../smime/gui/smime-ui.ui.h:40
-#| msgid "<b>Validity</b>"
-msgid "Validity"
-msgstr "Derīgums"
-
-#: ../smime/gui/smime-ui.ui.h:41
+#: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "Skats"
 
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.glade.h:43
 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.ui.h:43
+#: ../smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Jūsu fail� ir sertifik�ti, kas atpazīst šo sertifik�tu autorus:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "Jūsu fail� ir sertifik�ti, kas atpazīst šīs personas:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr "Jūsu sertifik�ti"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
 msgstr "R_ediģēt CA uzticamību"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "Sertifik�ts jau eksistē"
 
-#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:414
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "Paraksts"
 
-#: ../smime/lib/e-cert.c:415
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "Šifrēt"
 
-#: ../smime/lib/e-cert.c:527
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "Versija"
 
-#: ../smime/lib/e-cert.c:542
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "Versija 1"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "Versija 2"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "Versija 3"
 
-#: ../smime/lib/e-cert.c:630
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 ar RSA šifrējumu"
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 ar RSA šifrējumu"
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 ar RSA šifrējumu"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA šifrējums"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "Sertifik�ta atslēgas izmantošana"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Netscape sertifik�ta tips"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "Sertifik�ta institūcijas atslēgas identifikators"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objekta identifikators(%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "Algoritma identifikators"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "Algoritma parametri"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "Subjekta publisk�s atslēgas inform�cija"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "Subjekta pieejam�s atslēgas algoritms"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "Subjekta publisk� atslēga"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "Kļūda: nevar apstr�d�t paplašin�jumu"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "Objekta parakstīt�js"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "SSL sertifik�ta institūcija"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "E-pasta sertifik�ta institūcija"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "Parakstīšana"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "Nenoliedzams"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "Atslēgas šifrējums"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "Datu šifrējums"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "Atslēgas vienošan�s"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "Sertifik�ta parakstīt�js"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL parakstīt�js"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "Kritisks"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "Nav kritisks"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "Paplašin�jumi"
 
-#: ../smime/lib/e-cert.c:1030
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifik�ta paraksta algoritms"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "Izdevējs"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "Izdevēja unik�lais ID"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "Subjekta unik�lais ID"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "Sertifik�ta paraksta vērtība"
 
-#: ../smime/lib/e-pkcs12.c:250
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "PKCS12 faila parole"
 
-#: ../smime/lib/e-pkcs12.c:251
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "Ievadiet paroli PKCS12 failam:"
 
-#: ../smime/lib/e-pkcs12.c:353
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "Importēts sertifik�ts"
 
+#. 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 "Nevarēja izpildīt '%s': %s\n"
+
+#: ../tools/killev.c:76
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr "Izslēdz %s(%s)\n"
+
+#: ../ui/evolution-addressbook.xml.h:1
+msgid "Address _Book Properties"
+msgstr "Adrešu _gr�matas īpašības"
+
+#: ../ui/evolution-addressbook.xml.h:3
+msgid "Change the properties of the selected folder"
+msgstr "Mainīt izvēlēt�s mapes īpašības"
+
+#: ../ui/evolution-addressbook.xml.h:4
+msgid "Co_py All Contacts To..."
+msgstr "Ko_pēt visus kontaktus..."
+
+#: ../ui/evolution-addressbook.xml.h:5
+msgid "Contact _Preview"
+msgstr "Kontaktu _priekšskatījums"
+
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopēt"
+
+#: ../ui/evolution-addressbook.xml.h:7
+#| msgid "Copy Selected Contacts to Another Folder..."
+msgid "Copy selected contacts to another folder"
+msgstr "Kopēt izvēlētos kontaktus uz citu mapi"
+
+#: ../ui/evolution-addressbook.xml.h:8
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr "Kopēt kontaktus no izvēlētas mapes cit� mapē"
+
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
+msgid "Copy the selection"
+msgstr "Kopēt izvēli"
+
+#: ../ui/evolution-addressbook.xml.h:10
+msgid "Copy to Folder..."
+msgstr "Kopēt uz mapi..."
+
+#: ../ui/evolution-addressbook.xml.h:11
+#| msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
+msgstr "Izveidot jaunu adrešu gr�matu"
+
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Izgriezt"
+
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+msgid "Cut the selection"
+msgstr "Izgriezt izvēlēto"
+
+#: ../ui/evolution-addressbook.xml.h:14
+msgid "Del_ete Address Book"
+msgstr "Dzē_st adrešu gr�matu"
+
+#: ../ui/evolution-addressbook.xml.h:16
+msgid "Delete selected contacts"
+msgstr "Dzēst izvēlētos kontaktus"
+
+#: ../ui/evolution-addressbook.xml.h:17
+msgid "Delete the selected folder"
+msgstr "Dzēst izvēlēto mapi"
+
+#: ../ui/evolution-addressbook.xml.h:18
+msgid "Forward Contact"
+msgstr "P�rsūtīt kontaktu"
+
+#: ../ui/evolution-addressbook.xml.h:19
+msgid "Mo_ve All Contacts To..."
+msgstr "P�r_vietot visus kontaktus uz..."
+
+#: ../ui/evolution-addressbook.xml.h:20
+#| msgid "Move Selected Contacts to Another Folder..."
+msgid "Move selected contacts to another folder"
+msgstr "P�rvietot izvēlētos kontaktus uz citu mapi"
+
+#: ../ui/evolution-addressbook.xml.h:21
+msgid "Move the contacts of the selected folder into another folder"
+msgstr "P�rvietot kontaktus no izvēlēt�s mapes cit� mapē"
+
+#: ../ui/evolution-addressbook.xml.h:22
+msgid "Move to Folder..."
+msgstr "P�rvietot uz mapi..."
+
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Ielīmēt"
+
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Ielīmēt starpliktuvi"
+
+#: ../ui/evolution-addressbook.xml.h:25
+msgid "Previews the contacts to be printed"
+msgstr "Priekšskatījumi druk�jamos kontaktos"
+
+#: ../ui/evolution-addressbook.xml.h:28
+msgid "Print selected contacts"
+msgstr "Druk�t izvēlētos kontaktus"
+
+#: ../ui/evolution-addressbook.xml.h:29
+msgid "Rename the selected folder"
+msgstr "P�rsaukt izvēlēto mapi"
+
+#: ../ui/evolution-addressbook.xml.h:30
+msgid "S_ave Address Book As VCard"
+msgstr "S_aglab�t adrešu gr�matu k� VCard"
+
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "Saglab�t k� VCard..."
+
+#: ../ui/evolution-addressbook.xml.h:32
+#| msgid "Save selected contacts as a VCard."
+msgid "Save selected contacts as a VCard"
+msgstr "Saglab�t izvēlētos kontaktus k� VCard"
+
+#: ../ui/evolution-addressbook.xml.h:33
+msgid "Save the contacts of the selected folder as VCard"
+msgstr "Saglab�t kontaktus no izvēlētas mapes k� VCard"
+
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
+msgid "Select All"
+msgstr "Izvēlēties visus"
+
+#: ../ui/evolution-addressbook.xml.h:35
+msgid "Select _All"
+msgstr "Izvēlēties _visus"
+
+#: ../ui/evolution-addressbook.xml.h:36
+msgid "Select all contacts"
+msgstr "Izvēlēties visus kontaktus"
+
+#: ../ui/evolution-addressbook.xml.h:37
+#| msgid "Send a message to the selected contacts."
+msgid "Send a message to the selected contacts"
+msgstr "Sūtīt ziņojumu izvēlētajiem kontaktiem."
+
+#: ../ui/evolution-addressbook.xml.h:38
+msgid "Send message to contact"
+msgstr "Sūtīt vēstuli kontaktam"
+
+#: ../ui/evolution-addressbook.xml.h:39
+#| msgid "Send selected contacts to another person."
+msgid "Send selected contacts to another person"
+msgstr "Sūtīt izvēlētos kontaktus citai personai"
+
+#: ../ui/evolution-addressbook.xml.h:40
+msgid "Show contact preview window"
+msgstr "Par�dīt kontaktu priekšskatījuma logu"
+
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "St_op"
+msgstr "Ap_st�din�t"
+
+#: ../ui/evolution-addressbook.xml.h:42
+msgid "Stop"
+msgstr "Apst�din�t"
+
+#: ../ui/evolution-addressbook.xml.h:43
+msgid "Stop Loading"
+msgstr "Apst�din�t iel�di"
+
+#: ../ui/evolution-addressbook.xml.h:44
+msgid "View the current contact"
+msgstr "Skatīt pašreizējo kontaktu"
+
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-tasks.xml.h:21
+msgid "_Actions"
+msgstr "D_arbības"
+
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr "_Kopēt kontaktu uz..."
+
+#: ../ui/evolution-addressbook.xml.h:48
+msgid "_Copy Folder Contacts To"
+msgstr "_Kopēt mapes kontaktus uz"
+
+#: ../ui/evolution-addressbook.xml.h:50
+msgid "_Delete Contact"
+msgstr "_Dzēst kontaktu"
+
+#: ../ui/evolution-addressbook.xml.h:52
+msgid "_Forward Contact..."
+msgstr "_P�rsūtīt kontaktu..."
+
+#: ../ui/evolution-addressbook.xml.h:53
+msgid "_Move Contact to..."
+msgstr "_P�rvietot kontaktu uz..."
+
+#: ../ui/evolution-addressbook.xml.h:54
+msgid "_Move Folder Contacts To"
+msgstr "P�rvietot _mapes kontaktus uz"
+
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
+msgid "_New"
+msgstr "Jau_ns"
+
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr "P�_rsaukt"
+
+#: ../ui/evolution-addressbook.xml.h:61
+msgid "_Save Contact as VCard..."
+msgstr "_Saglab�t kontaktu k� VCard..."
+
+#: ../ui/evolution-addressbook.xml.h:62
+msgid "_Save Folder Contacts As VCard"
+msgstr "_Saglab�t mapes kontaktus k� VCard"
+
+#: ../ui/evolution-addressbook.xml.h:63
+msgid "_Send Message to Contact..."
+msgstr "_Sūtīt vēstuli kontaktam..."
+
+#: ../ui/evolution-calendar.xml.h:4
+msgid "Day"
+msgstr "Diena"
+
+#: ../ui/evolution-calendar.xml.h:6
+msgid "Delete _all Occurrences"
+msgstr "Dzēst visus g_adījumus"
+
+#: ../ui/evolution-calendar.xml.h:7
+msgid "Delete all occurrences"
+msgstr "Dzēst visus gadījumus"
+
+#: ../ui/evolution-calendar.xml.h:8
+msgid "Delete the appointment"
+msgstr "Dzēst šo tikšanos"
+
+#: ../ui/evolution-calendar.xml.h:10
+msgid "Delete this occurrence"
+msgstr "Dzēst šo gadījumu"
+
+#: ../ui/evolution-calendar.xml.h:11
+msgid "Go To"
+msgstr "Iet uz"
+
+#: ../ui/evolution-calendar.xml.h:12
+msgid "Go back"
+msgstr "Iet atpakaļ"
+
+#: ../ui/evolution-calendar.xml.h:13
+msgid "Go forward"
+msgstr "Iet uz priekšu"
+
+#: ../ui/evolution-calendar.xml.h:14
+msgid "List"
+msgstr "Saraksts"
+
+#: ../ui/evolution-calendar.xml.h:15
+msgid "Month"
+msgstr "MÄ“nesis"
+
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "N�kamais"
+
+#: ../ui/evolution-calendar.xml.h:18
+msgid "Previews the calendar to be printed"
+msgstr "Priekšskatījums druk�jamajiem kalend�riem"
+
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "Iepriekšējais"
+
+#: ../ui/evolution-calendar.xml.h:22
+msgid "Print this calendar"
+msgstr "Druk�t šo kalend�ru"
+
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+msgid "Purg_e"
+msgstr "Iztīrī_t"
+
+#: ../ui/evolution-calendar.xml.h:24
+msgid "Purge old appointments and meetings"
+msgstr "Iztīrīt vecos norīkojumus un tikšan�s"
+
+#: ../ui/evolution-calendar.xml.h:25
+msgid "Select _Date"
+msgstr "Izvēlēties _datumu"
+
+#: ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
+msgstr "Izvēlē_ties šodienu"
+
+#: ../ui/evolution-calendar.xml.h:27
+msgid "Select a specific date"
+msgstr "Izvēlēties noteiktu datumu"
+
+#: ../ui/evolution-calendar.xml.h:28
+msgid "Select today"
+msgstr "Izvēlēties šodienu"
+
+#: ../ui/evolution-calendar.xml.h:29
+msgid "Show as list"
+msgstr "R�dīt k� sarakstu"
+
+#: ../ui/evolution-calendar.xml.h:30
+msgid "Show one day"
+msgstr "R�dīt vienu dienu"
+
+#: ../ui/evolution-calendar.xml.h:31
+msgid "Show one month"
+msgstr "R�dīt vienu mēnesi"
+
+#: ../ui/evolution-calendar.xml.h:32
+msgid "Show one week"
+msgstr "R�dīt vienu nedēļu"
+
+#: ../ui/evolution-calendar.xml.h:33
+msgid "Show the working week"
+msgstr "R�dīt darba nedēļu"
+
+#: ../ui/evolution-calendar.xml.h:35
+msgid "View the current appointment"
+msgstr "R�dīt pašreizējo norīkojumu"
+
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "Atkļūdošans konsolē skatīties žurn�la ziņojumus"
+
+#: ../ui/evolution-calendar.xml.h:37
+msgid "Week"
+msgstr "Nedēļa"
+
+#: ../ui/evolution-calendar.xml.h:38
+msgid "Work Week"
+msgstr "Darba nedēļa"
+
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+#| msgid "_Web Log:"
+msgid "_Debug Logs"
+msgstr "Atkļū_došanas žurn�ls:"
+
+#: ../ui/evolution-calendar.xml.h:45
+msgid "_Open Appointment"
+msgstr "Atvērt norīk_ojumu"
+
+#: ../ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "Atcelt pašreizējo pasta darbību"
+
+#: ../ui/evolution-mail-global.xml.h:3
+msgid "Copy the selected folder into another folder"
+msgstr "Kopēt izvēlēto mapi cit� mapē"
+
+#: ../ui/evolution-mail-global.xml.h:4
+msgid "Create a new folder for storing mail"
+msgstr "Izveidot jaunu mapi pasta glab�šanai"
+
+#: ../ui/evolution-mail-global.xml.h:5
+msgid "Create or edit Search Folder definitions"
+msgstr "Izveidot vai rediģēt meklēšanas mapes ierakstus"
+
+#: ../ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr "Izveidot vai rediģēt jaun� pasta filtrēšanas k�rtulas"
+
+#: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages of accounts/folders marked for offline"
+msgstr ""
+"Lejupiel�dēt vēstules no kontiem/mapēm, kas atzīmētas darbībai nesaistes "
+"režīm�"
+
+#: ../ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Iz_tukšot atkritumu kasti"
+
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
+msgid "F_older"
+msgstr "M_ape"
+
+#: ../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:12
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Nekavējoties izmest visas dzēst�s vēstules no vis�m mapēm"
+
+#: ../ui/evolution-mail-global.xml.h:13
+msgid "Search F_olders"
+msgstr "Meklēšanas m_apes"
+
+#: ../ui/evolution-mail-global.xml.h:14
+msgid "Show Message _Preview"
+msgstr "R�dīt vēstules _priekšskatījumu"
+
+#: ../ui/evolution-mail-global.xml.h:15
+msgid "Show message preview below the message list"
+msgstr "R�dīt vēstuļu priekšskatījumu zem vēstuļu saraksta"
+
+#: ../ui/evolution-mail-global.xml.h:16
+msgid "Show message preview side-by-side with the message list"
+msgstr "R�dīt vēstuļu priekšskatījumu s�nu pie s�na ar vēstuļu sarakstu"
+
+#: ../ui/evolution-mail-global.xml.h:17
+msgid "Show message preview window"
+msgstr "Par�dīt vēstules priekšskatījuma logu"
+
+#: ../ui/evolution-mail-global.xml.h:18
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Pierakstīties vai atrakstīties uz/no mapēm uz att�lin�tajiem serveriem"
+
+#: ../ui/evolution-mail-global.xml.h:20
+msgid "_Classic View"
+msgstr "_Klasiskais skats"
+
+#: ../ui/evolution-mail-global.xml.h:21
+msgid "_Copy Folder To..."
+msgstr "_Kopēt mapi uz..."
+
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Download Messages for Offline Usage"
+msgstr "_Lejupiel�dēt vēstules lietošanai nesaistes režīm�"
+
+#: ../ui/evolution-mail-global.xml.h:25
+msgid "_Message Filters"
+msgstr "_Vēstuļu filtrs"
+
+#: ../ui/evolution-mail-global.xml.h:26
+msgid "_Move Folder To..."
+msgstr "P�rvietot _mapi uz..."
+
+#: ../ui/evolution-mail-global.xml.h:27
+msgid "_New..."
+msgstr "Jau_ns..."
+
+#: ../ui/evolution-mail-global.xml.h:28
+msgid "_Preview"
+msgstr "_Priekšskatījums"
+
+#.
+#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
+#.
+#: ../ui/evolution-mail-global.xml.h:32
+#| msgid "_Subscriptions"
+msgid "_Subscriptions..."
+msgstr "_Abonomenti..."
+
+#: ../ui/evolution-mail-global.xml.h:33
+msgid "_Vertical View"
+msgstr "_Vertik�lais skats"
+
+#: ../ui/evolution-mail-list.xml.h:1
+msgid "Change the name of this folder"
+msgstr "Mainīt šīs mapes nosaukumu"
+
+#: ../ui/evolution-mail-list.xml.h:2
+msgid "Change the properties of this folder"
+msgstr "Mainīt šīs mapes īpašības"
+
+#: ../ui/evolution-mail-list.xml.h:3
+msgid "Collapse All _Threads"
+msgstr "Sakļau_t visus pavedienus"
+
+#: ../ui/evolution-mail-list.xml.h:4
+msgid "Collapse all message threads"
+msgstr "Sakļaut visas vēstules pavedien�"
+
+#: ../ui/evolution-mail-list.xml.h:5
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kopēt izvēlēto(-�s) vēstuli(-es) uz starpliktuvi"
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-list.xml.h:7
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Izgriezt izvēlēto(-�s) vēstuli(-es) uz starpliktuvi"
+
+#: ../ui/evolution-mail-list.xml.h:8
+msgid "E_xpand All Threads"
+msgstr "I_zvērst visus pavedienus"
+
+#: ../ui/evolution-mail-list.xml.h:9
+msgid "E_xpunge"
+msgstr "I_zsvītrot"
+
+#: ../ui/evolution-mail-list.xml.h:10
+msgid "Expand all message threads"
+msgstr "Izvērst visus vēstuļu pavedienus"
+
+#: ../ui/evolution-mail-list.xml.h:12
+msgid "Hide S_elected Messages"
+msgstr "Slēpt i_zvēlēt�s vēstules"
+
+#: ../ui/evolution-mail-list.xml.h:13
+msgid "Hide _Deleted Messages"
+msgstr "Slēpt _dzēst�s vēstules"
+
+#: ../ui/evolution-mail-list.xml.h:14
+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"
+msgstr "Slēpt dzēst�s vēstules, nevis attēlot k� p�rsvītrotas"
+
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
+msgstr "Atzīmē_t visas vēstules k� lasītas"
+
+#: ../ui/evolution-mail-list.xml.h:17
+msgid "Mark all messages in the folder as read"
+msgstr "Atzīmēt visas vēstules šaj� mapē k� lasītas"
+
+#: ../ui/evolution-mail-list.xml.h:18
+msgid "Paste message(s) from the clipboard"
+msgstr "Ielīmēt vēstuli(-es) no starpliktuves"
+
+#: ../ui/evolution-mail-list.xml.h:19
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Pilnīgi izdzēst visas dzēst�s vēstules šaj� mapē"
+
+#: ../ui/evolution-mail-list.xml.h:20
+msgid "Permanently remove this folder"
+msgstr "Pilnīb� izdzēst šo mapi"
+
+#: ../ui/evolution-mail-list.xml.h:22
+msgid "Refresh the folder"
+msgstr "Atsvaidzin�t mapi"
+
+#: ../ui/evolution-mail-list.xml.h:23
+#| msgid "Select Message _Thread"
+msgid "Select Message S_ubthread"
+msgstr "Izvēlēties vēst_ules apakšpavedienu"
+
+#: ../ui/evolution-mail-list.xml.h:24
+msgid "Select Message _Thread"
+msgstr "Izvēlē_ties vēstules pavedienu"
+
+#: ../ui/evolution-mail-list.xml.h:25
+msgid "Select _All Messages"
+msgstr "Izvēlēties _visas vēstules"
+
+#: ../ui/evolution-mail-list.xml.h:26
+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"
+
+#: ../ui/evolution-mail-list.xml.h:27
+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"
+
+#: ../ui/evolution-mail-list.xml.h:28
+#| msgid "Select all messages in the same thread as the selected message"
+msgid "Select all replies to the currently selected message"
+msgstr "Izvēlēties visas atbildes pašlaik izvēlētajai vēstulei"
+
+#: ../ui/evolution-mail-list.xml.h:29
+msgid "Select all visible messages"
+msgstr "Izvēlēties visas redzam�s vēstules"
+
+#: ../ui/evolution-mail-list.xml.h:30
+msgid "Show Hidde_n Messages"
+msgstr "R�dīt _slēpt�s vēstules"
+
+#: ../ui/evolution-mail-list.xml.h:31
+msgid "Show messages that have been temporarily hidden"
+msgstr "R�dīt vēstules, kas ir uz laiku slēptas"
+
+#: ../ui/evolution-mail-list.xml.h:32
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Uz laiku slēpt vēstules, kas jau ir izlasītas"
+
+#: ../ui/evolution-mail-list.xml.h:33
+msgid "Temporarily hide the selected messages"
+msgstr "Uz laiku slēpt izvēlēt�s vēstules"
+
+#: ../ui/evolution-mail-list.xml.h:34
+msgid "Threaded Message list"
+msgstr "Pavedienos sadalīts vēstuļu saraksts"
+
+#: ../ui/evolution-mail-list.xml.h:36
+msgid "_Group By Threads"
+msgstr "_Grupēt pēc pavedieniem"
+
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+msgid "_Message"
+msgstr "_VÄ“stule"
+
+#: ../ui/evolution-mail-message.xml.h:1
+msgid "A_dd Sender to Address Book"
+msgstr "P_ievienot sūtīt�ju adrešu gr�matai"
+
+#: ../ui/evolution-mail-message.xml.h:2
+msgid "A_pply Filters"
+msgstr "_Pielietot filtrus"
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-message.xml.h:4
+msgid "Add Sender to Address Book"
+msgstr "Pievienot sūtīt�ju adrešu gr�matai"
+
+#: ../ui/evolution-mail-message.xml.h:5
+msgid "All Message _Headers"
+msgstr "Visu ziņojumu _galvas"
+
+#: ../ui/evolution-mail-message.xml.h:6
+msgid "Apply filter rules to the selected messages"
+msgstr "Attiecin�t filtru k�rtulas uz izvēlētaj�m vēstulēm"
+
+#: ../ui/evolution-mail-message.xml.h:7
+msgid "Check for _Junk"
+msgstr "P�rbaudīt, vai ir _mēstules"
+
+#: ../ui/evolution-mail-message.xml.h:8
+msgid "Compose _New Message"
+msgstr "Sacerēt jau_nu vēstuli"
+
+#: ../ui/evolution-mail-message.xml.h:9
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Sacerēt atbildi visiem izvēlēt�s vēstules adres�tiem"
+
+#: ../ui/evolution-mail-message.xml.h:10
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Sacerēt atbildi uz izvēlēt�s vēstules adres�tu sarakstu"
+
+#: ../ui/evolution-mail-message.xml.h:11
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Sacerēt atbildi izvēlēt�s vēstules sūtīt�jam"
+
+#: ../ui/evolution-mail-message.xml.h:12
+msgid "Copy selected messages to another folder"
+msgstr "Kopēt izvēlēt�s vēstules uz citu mapi"
+
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr "Kopēt izvēlēt�s vēstules uz starpliktuvi"
+
+#: ../ui/evolution-mail-message.xml.h:14
+msgid "Create R_ule"
+msgstr "Izveidot k�rt_ulu"
+
+#: ../ui/evolution-mail-message.xml.h:15
+msgid "Create a Search Folder for these recipients"
+msgstr "Izveidot meklēšanas mapi šiem saņēmējiem"
+
+#: ../ui/evolution-mail-message.xml.h:16
+msgid "Create a Search Folder for this mailing list"
+msgstr "Izveidot meklēšanas mapi šim adres�tu sarakstam"
+
+#: ../ui/evolution-mail-message.xml.h:17
+msgid "Create a Search Folder for this sender"
+msgstr "Izveidot meklēšanas mapi šim sūtīt�jam"
+
+#: ../ui/evolution-mail-message.xml.h:18
+msgid "Create a Search Folder for this subject"
+msgstr "Izveidot meklēšanas mapi šim tematam"
+
+#: ../ui/evolution-mail-message.xml.h:19
+msgid "Create a rule to filter messages from this sender"
+msgstr "Izveidot k�rtulu, lai filtrētu vēstules no šī saņēmēja"
+
+#: ../ui/evolution-mail-message.xml.h:20
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Izveidot k�rtulu, lai filtrētu vēstules šiem adres�tiem"
+
+#: ../ui/evolution-mail-message.xml.h:21
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Izveidot k�rtulu, lai filtrētu vēstules šim adres�tu sarakstam"
+
+#: ../ui/evolution-mail-message.xml.h:22
+msgid "Create a rule to filter messages with this subject"
+msgstr "Izveidot filtra k�rtulu vēstulēm ar š�du tematu"
+
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr "Izgriezt izvēlētos ziņojumus uz starpliktuvi"
+
+#: ../ui/evolution-mail-message.xml.h:24
+msgid "Decrease the text size"
+msgstr "Samazin�t teksta izmēru"
+
+#: ../ui/evolution-mail-message.xml.h:26
+msgid "Display the next important message"
+msgstr "Par�dīt n�kamo svarīgo vēstuli"
+
+#: ../ui/evolution-mail-message.xml.h:27
+msgid "Display the next message"
+msgstr "Par�dīt n�kamo vēstuli"
+
+#: ../ui/evolution-mail-message.xml.h:28
+msgid "Display the next thread"
+msgstr "Attēlot n�kamo pavedienu"
+
+#: ../ui/evolution-mail-message.xml.h:29
+msgid "Display the next unread message"
+msgstr "Par�dīt n�kamo neizlasīto vēstuli"
+
+#: ../ui/evolution-mail-message.xml.h:30
+msgid "Display the previous important message"
+msgstr "Par�dīt iepriekšējo svarīgo vēstuli"
+
+#: ../ui/evolution-mail-message.xml.h:31
+msgid "Display the previous message"
+msgstr "Par�dīt iepriekšējo vēstuli"
+
+#: ../ui/evolution-mail-message.xml.h:32
+msgid "Display the previous unread message"
+msgstr "Par�dīt iepriekšējo neizlasīto vēstuli"
+
+#: ../ui/evolution-mail-message.xml.h:33
+msgid "F_orward As..."
+msgstr "P_�rsūtīt k�..."
+
+#: ../ui/evolution-mail-message.xml.h:34
+msgid "Filter on Mailing _List..."
+msgstr "Fi_ltrs uz adres�tu sarakstu..."
+
+#: ../ui/evolution-mail-message.xml.h:35
+msgid "Filter on Se_nder..."
+msgstr "Filtrs _uz sūtīt�ju..."
+
+#: ../ui/evolution-mail-message.xml.h:36
+msgid "Filter on _Recipients..."
+msgstr "Filtrs uz _adres�tiem..."
+
+#: ../ui/evolution-mail-message.xml.h:37
+msgid "Filter on _Subject..."
+msgstr "Filtr_s uz tematu..."
+
+#: ../ui/evolution-mail-message.xml.h:38
+msgid "Filter the selected messages for junk status"
+msgstr "Filtrēt izvēlētos ziņojumus pēc mēstules statusa"
+
+#: ../ui/evolution-mail-message.xml.h:39
+msgid "Flag selected messages for follow-up"
+msgstr "Atzīmēt izvēlēt�s vēstules sekojumam"
+
+#: ../ui/evolution-mail-message.xml.h:40
+msgid "Follow _Up..."
+msgstr "Se_kojums..."
+
+#: ../ui/evolution-mail-message.xml.h:41
+msgid "Force images in HTML mail to be loaded"
+msgstr "Piespiest iel�dēt attēlus HTML past�"
+
+#: ../ui/evolution-mail-message.xml.h:43
+msgid "Forward the selected message in the body of a new message"
+msgstr "P�rsūtīt izvēlēto vēstuli jaunas vēstules ķermenī"
+
+#: ../ui/evolution-mail-message.xml.h:44
+msgid "Forward the selected message quoted like a reply"
+msgstr "P�rsūtīt izvēlēto vēstuli citētu k� atbildi"
+
+#: ../ui/evolution-mail-message.xml.h:45
+msgid "Forward the selected message to someone"
+msgstr "P�rsūtīt izvēlēto vēstuli k�dam"
+
+#: ../ui/evolution-mail-message.xml.h:46
+msgid "Forward the selected message to someone as an attachment"
+msgstr "P�rsūtīt izvēlēto vēstuli k�dam k� pielikumu"
+
+#: ../ui/evolution-mail-message.xml.h:47
+msgid "Increase the text size"
+msgstr "Palielin�t teksta izmēru"
+
+#: ../ui/evolution-mail-message.xml.h:49
+msgid "Mar_k as"
+msgstr "Atzīmēt _k�"
+
+#: ../ui/evolution-mail-message.xml.h:50
+msgid "Mark the selected messages as having been read"
+msgstr "Atzīmēt izvēlēt�s vēstules k� lasītas"
+
+#: ../ui/evolution-mail-message.xml.h:51
+msgid "Mark the selected messages as important"
+msgstr "Atzīmēt izvēlēt�s vēstules k� svarīgas"
+
+#: ../ui/evolution-mail-message.xml.h:52
+msgid "Mark the selected messages as junk"
+msgstr "Atzīmēt izvēlēt�s vēstules k� mēstules"
+
+#: ../ui/evolution-mail-message.xml.h:53
+msgid "Mark the selected messages as not being junk"
+msgstr "Atzīmēt izvēlēt�s vēstules k� ne mēstules"
+
+#: ../ui/evolution-mail-message.xml.h:54
+msgid "Mark the selected messages as not having been read"
+msgstr "Atzīmēt izvēlēt�s vēstules k� nelasītas"
+
+#: ../ui/evolution-mail-message.xml.h:55
+msgid "Mark the selected messages as unimportant"
+msgstr "Atzīmēt izvēlēt�s vēstules k� nesvarīgas"
+
+#: ../ui/evolution-mail-message.xml.h:56
+msgid "Mark the selected messages for deletion"
+msgstr "Atzīmēt izvēlēt�s vēstules dzēšanai"
+
+#: ../ui/evolution-mail-message.xml.h:57
+msgid "Move selected messages to another folder"
+msgstr "P�rvietot izvēlēt�s vēstules uz citu mapi"
+
+#: ../ui/evolution-mail-message.xml.h:59
+msgid "Next _Important Message"
+msgstr "N�kam� _svarīg� vēstule"
+
+#: ../ui/evolution-mail-message.xml.h:60
+msgid "Next _Thread"
+msgstr "N�kamais _pavediens"
+
+#: ../ui/evolution-mail-message.xml.h:61
+msgid "Next _Unread Message"
+msgstr "N�kam� _neizlasīt� vēstule"
+
+#: ../ui/evolution-mail-message.xml.h:62
+msgid "Not Junk"
+msgstr "Nav mēstule"
+
+#: ../ui/evolution-mail-message.xml.h:63
+msgid "Open a window for composing a mail message"
+msgstr "Atvērt logu, lai sacerētu vēstuli"
+
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open the selected messages in a new window"
+msgstr "Atvērt izvēlēt�s vēstules jaun� log�"
+
+#: ../ui/evolution-mail-message.xml.h:65
+msgid "Open the selected messages in the composer for editing"
+msgstr "Atvērt izvēlēt�s vēstules sacerēt�j� rediģēšanai"
+
+#: ../ui/evolution-mail-message.xml.h:66
+msgid "P_revious Unread Message"
+msgstr "Iep_riekšēj� neizlasīt� vēstule"
+
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr "Ielīmēt vēstules no starpliktuves"
+
+#: ../ui/evolution-mail-message.xml.h:68
+msgid "Pr_evious Important Message"
+msgstr "I_epriekšēj� svarīg� vēstule"
+
+#: ../ui/evolution-mail-message.xml.h:69
+msgid "Preview the message to be printed"
+msgstr "Priekšskatīt vēstuli pirms druk�šanas"
+
+#: ../ui/evolution-mail-message.xml.h:73
+msgid "Print this message"
+msgstr "Druk�t šo vēstuli"
+
+#: ../ui/evolution-mail-message.xml.h:74
+msgid "Re_direct"
+msgstr "P�ra_dresēt"
+
+#: ../ui/evolution-mail-message.xml.h:75
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "P�radresēt izvēlēto vēstuli k�dam"
+
+#: ../ui/evolution-mail-message.xml.h:80
+msgid "Reset the text to its original size"
+msgstr "Atjaunot tekstu s�kotnēj� izmēr�"
+
+#: ../ui/evolution-mail-message.xml.h:81
+msgid "Save the selected messages as a text file"
+msgstr "Saglab�t izvēlētas vēstules k� teksta failu"
+
+#: ../ui/evolution-mail-message.xml.h:82
+msgid "Search Folder from Mailing _List..."
+msgstr "Mek_lēšanas mape no adres�tu saraksta..."
+
+#: ../ui/evolution-mail-message.xml.h:83
+msgid "Search Folder from Recipien_ts..."
+msgstr "Meklēšanas mape no adres�_tiem..."
+
+#: ../ui/evolution-mail-message.xml.h:84
+msgid "Search Folder from S_ubject..."
+msgstr "Meklēšanas mape no t_emata..."
+
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Search Folder from Sen_der..."
+msgstr "Meklēšanas mape no sū_tīt�jia..."
+
+#: ../ui/evolution-mail-message.xml.h:86
+msgid "Search for text in the body of the displayed message"
+msgstr "Meklēt tekstu attēlot�s vēstules ķermenī"
+
+#: ../ui/evolution-mail-message.xml.h:87
+msgid "Select _All Text"
+msgstr "Izvēlēties _visu tekstu"
+
+#: ../ui/evolution-mail-message.xml.h:88
+msgid "Select all the text in a message"
+msgstr "Izvēlēties visu vēstules saturu"
+
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
+msgid "Set up the page settings for your current printer"
+msgstr "Iestatīt lapas iestatījumus jūsu esošajam printerim"
+
+#: ../ui/evolution-mail-message.xml.h:90
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Attēlot mirgojošu kursoru attēloto vēstuļu ķermenī"
+
+#: ../ui/evolution-mail-message.xml.h:91
+msgid "Show messages with all email headers"
+msgstr "R�dīt vēstules ar vis�m e-pasta galv�m"
+
+#: ../ui/evolution-mail-message.xml.h:92
+msgid "Show the raw email source of the message"
+msgstr "Par�dīt vēstules pirmkodu"
+
+#: ../ui/evolution-mail-message.xml.h:93
+msgid "Undelete the selected messages"
+msgstr "Atjaunot izvēlēt�s vēstules"
+
+#: ../ui/evolution-mail-message.xml.h:94
+msgid "Uni_mportant"
+msgstr "Nes_varīgs"
+
+#: ../ui/evolution-mail-message.xml.h:95
+msgid "Zoom _Out"
+msgstr "T�_lin�t"
+
+#: ../ui/evolution-mail-message.xml.h:96
+msgid "_Attached"
+msgstr "_Pievienots"
+
+#: ../ui/evolution-mail-message.xml.h:97
+msgid "_Caret Mode"
+msgstr "_Caret režīms"
+
+#: ../ui/evolution-mail-message.xml.h:98
+msgid "_Clear Flag"
+msgstr "_Noņemt atzīmi"
+
+#: ../ui/evolution-mail-message.xml.h:101
+msgid "_Delete Message"
+msgstr "_Dzēst vēstuli"
+
+#: ../ui/evolution-mail-message.xml.h:103
+msgid "_Find in Message..."
+msgstr "_Meklēt vēstulē..."
+
+#: ../ui/evolution-mail-message.xml.h:104
+msgid "_Flag Completed"
+msgstr "_Atzīme veikta"
+
+#: ../ui/evolution-mail-message.xml.h:106
+msgid "_Go To"
+msgstr "_Iet uz"
+
+#: ../ui/evolution-mail-message.xml.h:107
+msgid "_Important"
+msgstr "_Svarīgs"
+
+#: ../ui/evolution-mail-message.xml.h:108
+msgid "_Inline"
+msgstr "_Iekļauts"
+
+#: ../ui/evolution-mail-message.xml.h:109
+msgid "_Junk"
+msgstr "_MÄ“stule"
+
+#: ../ui/evolution-mail-message.xml.h:110
+msgid "_Load Images"
+msgstr "Ie_l�dēt attēlus"
+
+#: ../ui/evolution-mail-message.xml.h:112
+msgid "_Message Source"
+msgstr "_VÄ“stules avots"
+
+#: ../ui/evolution-mail-message.xml.h:114
+msgid "_Next Message"
+msgstr "_N�kam� vēstule"
+
+#: ../ui/evolution-mail-message.xml.h:115
+msgid "_Normal Size"
+msgstr "_Norm�ls izmērs"
+
+#: ../ui/evolution-mail-message.xml.h:116
+msgid "_Not Junk"
+msgstr "_Nav mēstule"
+
+#: ../ui/evolution-mail-message.xml.h:117
+msgid "_Open in New Window"
+msgstr "Atvērt jaun� l_og�"
+
+#: ../ui/evolution-mail-message.xml.h:118
+msgid "_Previous Message"
+msgstr "Ie_priekšēj� vēstule"
+
+#: ../ui/evolution-mail-message.xml.h:120
+msgid "_Quoted"
+msgstr "_Citēts"
+
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:122
+msgid "_Read"
+msgstr "_Lasīt"
+
+#: ../ui/evolution-mail-message.xml.h:124
+msgid "_Save Message..."
+msgstr "_Saglab�t vēstuli..."
+
+#: ../ui/evolution-mail-message.xml.h:125
+msgid "_Undelete Message"
+msgstr "_Atjaunot vēstuli"
+
+#: ../ui/evolution-mail-message.xml.h:126
+msgid "_Unread"
+msgstr "_Nelasīts"
+
+#: ../ui/evolution-mail-message.xml.h:127
+msgid "_Zoom"
+msgstr "_T�lummaiņa"
+
+#: ../ui/evolution-mail-message.xml.h:128
+msgid "_Zoom In"
+msgstr "_Tuvin�t"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Aizvērt"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
+msgid "Main toolbar"
+msgstr "Galven� rīkjosla"
+
+#: ../ui/evolution-memos.xml.h:3
+msgid "Copy selected memo"
+msgstr "Kopēt iezīmēto memo"
+
+#: ../ui/evolution-memos.xml.h:5
+msgid "Cut selected memo"
+msgstr "Izgriezt izvēlēto memo"
+
+#: ../ui/evolution-memos.xml.h:7
+msgid "Delete selected memos"
+msgstr "Dzēst izvēlētos memo"
+
+#: ../ui/evolution-memos.xml.h:9
+msgid "Paste memo from the clipboard"
+msgstr "Ielīmēt memo no starpliktuves"
+
+#: ../ui/evolution-memos.xml.h:10
+msgid "Previews the list of memos to be printed"
+msgstr "Druk�jamo memo saraksta priekšskatījums"
+
+#: ../ui/evolution-memos.xml.h:13
+msgid "Print the list of memos"
+msgstr "Druk�t memo sarakstu"
+
+#: ../ui/evolution-memos.xml.h:14
+msgid "View the selected memo"
+msgstr "Skatīt izvēlēto memo"
+
+#: ../ui/evolution-memos.xml.h:18
+msgid "_Open Memo"
+msgstr "Atvērt mem_o"
+
+#: ../ui/evolution-tasks.xml.h:3
+msgid "Copy selected tasks"
+msgstr "Kopēt izvēlētos uzdevumus"
+
+#: ../ui/evolution-tasks.xml.h:5
+msgid "Cut selected tasks"
+msgstr "Izgriezt izvēlētos uzdevumus"
+
+#: ../ui/evolution-tasks.xml.h:7
+msgid "Delete completed tasks"
+msgstr "Dzēst izpildītos uzdevumus"
+
+#: ../ui/evolution-tasks.xml.h:8
+msgid "Delete selected tasks"
+msgstr "Dzēst izvēlētos uzdevumus"
+
+#: ../ui/evolution-tasks.xml.h:9
+msgid "Mar_k as Complete"
+msgstr "A_tzīmēt k� izpildītus"
+
+#: ../ui/evolution-tasks.xml.h:10
+msgid "Mark selected tasks as complete"
+msgstr "Atzīmēt izvēlētos uzdevumus k� izpildītus"
+
+#: ../ui/evolution-tasks.xml.h:12
+msgid "Paste tasks from the clipboard"
+msgstr "Ielīmēt uzdevumus no starpliktuves"
+
+#: ../ui/evolution-tasks.xml.h:13
+msgid "Previews the list of tasks to be printed"
+msgstr "Druk�jamo uzdevumu sarakstu priekšskatījums"
+
+#: ../ui/evolution-tasks.xml.h:16
+msgid "Print the list of tasks"
+msgstr "Druk�t uzdevumu sarakstu"
+
+#: ../ui/evolution-tasks.xml.h:18
+msgid "Show task preview window"
+msgstr "R�dīt uzdevumus priekšskatījuma log�"
+
+#: ../ui/evolution-tasks.xml.h:19
+msgid "Task _Preview"
+msgstr "Uzdevuma _priekšskatījums"
+
+#: ../ui/evolution-tasks.xml.h:20
+msgid "View the selected task"
+msgstr "Skatīt izvēlēto uzdevumu"
+
+#: ../ui/evolution-tasks.xml.h:27
+msgid "_Open Task"
+msgstr "_Atvērt uzdevumu"
+
+#: ../ui/evolution.xml.h:1
+msgid "About Evolution..."
+msgstr "Par Evolution..."
+
+#: ../ui/evolution.xml.h:2
+msgid "Change Evolution's settings"
+msgstr "Mainīt Evolution iestatījumus"
+
+#: ../ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr "Mainīt rīkjoslas redzamību"
+
+#: ../ui/evolution.xml.h:5
+msgid "Create a new window displaying this folder"
+msgstr "Izveidot jaunu logu Å¡ai mapei"
+
+#: ../ui/evolution.xml.h:6
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "R�dīt logu pogas lietot darbvirsma rīkjoslas iestatījumus"
+
+#: ../ui/evolution.xml.h:7
+msgid "Display window buttons with icons and text"
+msgstr "R�dīt logu pogas ar ikon�m un tekstu"
+
+#: ../ui/evolution.xml.h:8
+msgid "Display window buttons with icons only"
+msgstr "R�dīt logu pogas tikai ar ikon�m"
+
+#: ../ui/evolution.xml.h:9
+msgid "Display window buttons with text only"
+msgstr "R�dīt logu pogas tikai ar tekstu"
+
+#: ../ui/evolution.xml.h:10
+#| msgid "Evolution"
+msgid "Evolution _FAQ"
+msgstr "Evolution _BUJ"
+
+#: ../ui/evolution.xml.h:11
+msgid "Exit the program"
+msgstr "Iziet no programmas"
+
+#: ../ui/evolution.xml.h:12
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "Aizmirst atcerēt�s paroles, t� k� t�s tiks vēlreiz pieprasītas"
+
+#: ../ui/evolution.xml.h:13
+msgid "Hide window buttons"
+msgstr "Slēpt loga pogas"
+
+#: ../ui/evolution.xml.h:14
+msgid "I_mport..."
+msgstr "I_mportēt..."
+
+#: ../ui/evolution.xml.h:15
+msgid "Icons _and Text"
+msgstr "Ikon_as un teksts"
+
+#: ../ui/evolution.xml.h:16
+msgid "Import data from other programs"
+msgstr "Importēt datus no cit�m programm�m"
+
+#: ../ui/evolution.xml.h:17
+msgid "Lay_out"
+msgstr "Izk�rt_ojums"
+
+#: ../ui/evolution.xml.h:19
+msgid "New _Window"
+msgstr "Jauns _logs"
+
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "Atvērt biež�k uzdoto jaut�jumu m�jas lapu"
+
+#: ../ui/evolution.xml.h:21
+msgid "Page Set_up..."
+msgstr "Lapas iestatīj_umi..."
+
+#: ../ui/evolution.xml.h:22
+msgid "Prefere_nces"
+msgstr "Iesta_tījumi"
+
+#: ../ui/evolution.xml.h:23
+msgid "Send / Receive"
+msgstr "Sūtīt / saņemt"
+
+#: ../ui/evolution.xml.h:24
+msgid "Send / _Receive"
+msgstr "Nosūtīt / _saņemt"
+
+#: ../ui/evolution.xml.h:25
+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:26
+msgid "Set up Pilot configuration"
+msgstr "Iestatīt Pilot konfigur�ciju"
+
+#: ../ui/evolution.xml.h:28
+msgid "Show Side _Bar"
+msgstr "R�dīt s�nu _joslu"
+
+#: ../ui/evolution.xml.h:29
+msgid "Show _Status Bar"
+msgstr "R�dīt _statusa joslu"
+
+#: ../ui/evolution.xml.h:30
+msgid "Show _Toolbar"
+msgstr "R�dī_t rīkjoslu"
+
+#: ../ui/evolution.xml.h:31
+msgid "Show information about Evolution"
+msgstr "R�dīt inform�ciju par Evolution"
+
+#: ../ui/evolution.xml.h:32
+msgid "Submit Bug Report"
+msgstr "Nosūtīt kļūdas ziņojumu"
+
+#: ../ui/evolution.xml.h:33
+msgid "Submit _Bug Report"
+msgstr "Nosūtīt _kļūdu ziņojumu"
+
+#: ../ui/evolution.xml.h:34
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Nosūtīt kļūdas ziņojumu izmantojot Bug Buddy"
+
+#: ../ui/evolution.xml.h:35
+msgid "Toggle whether we are working offline."
+msgstr "P�rslēgt, vai mēs str�d�jam nesaistes režīm�."
+
+#: ../ui/evolution.xml.h:36
+msgid "Tool_bar Style"
+msgstr "RÄ«k_joslas stils"
+
+#: ../ui/evolution.xml.h:37
+msgid "View/Hide the Side Bar"
+msgstr "Radīt/slēpt s�nu joslu"
+
+#: ../ui/evolution.xml.h:38
+msgid "View/Hide the Status Bar"
+msgstr "Radīt/slēpt statusa joslu"
+
+#: ../ui/evolution.xml.h:39
+#| msgid "Work Offline"
+msgid "Work _Offline"
+msgstr "Str�d�t _nesaistē"
+
+#: ../ui/evolution.xml.h:40
+msgid "_About"
+msgstr "_Par"
+
+#: ../ui/evolution.xml.h:41
+msgid "_Close Window"
+msgstr "_Aizvērt logu"
+
+#: ../ui/evolution.xml.h:44
+msgid "_Forget Passwords"
+msgstr "_Aizmirst paroles"
+
+#: ../ui/evolution.xml.h:45
+msgid "_Frequently Asked Questions"
+msgstr "_Bieži uzdotie jaut�jumi"
+
+#: ../ui/evolution.xml.h:47
+msgid "_Hide Buttons"
+msgstr "_Slēpt pogas"
+
+#: ../ui/evolution.xml.h:48
+msgid "_Icons Only"
+msgstr "Tikai _ikonas"
+
+#: ../ui/evolution.xml.h:50
+msgid "_Quick Reference"
+msgstr "_Ātr� atsauce"
+
+#: ../ui/evolution.xml.h:51
+msgid "_Quit"
+msgstr "_Iziet"
+
+#: ../ui/evolution.xml.h:52
+msgid "_Switcher Appearance"
+msgstr "_P�rslēdzēja izskats"
+
+#: ../ui/evolution.xml.h:53
+msgid "_Synchronization Options..."
+msgstr "_Sinhroniz�cijas opcijas..."
+
+#: ../ui/evolution.xml.h:54
+msgid "_Text Only"
+msgstr "Tikai _teksts"
+
+#: ../ui/evolution.xml.h:56
+msgid "_Window"
+msgstr "_Logs"
+
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "PÄ“_c firmas"
@@ -21851,64 +22625,64 @@ 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:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "<b>Time Zones</b>"
+msgstr "<b>Laika joslas</b>"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "<b>_Selection</b>"
+msgstr "<b>_Izvēle</b>"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "Select a Time Zone"
 msgstr "Izvēlieties laika joslu"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
-#| msgid "Time Zone"
-msgid "Time Zones"
-msgstr "Laika joslas"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Timezone drop-down combination box"
 msgstr "Laika joslas nolaižamais kombinētais lodziņš"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Lietojiet kreiso peles taustiņu uz kartes, lai tuvin�tu un izvēlietos laika "
-"joslu.\n"
+"Lietojiet kreiso peles taustiņu uz kartes, lai tuvin�tu un izvēlietos "
+"laika joslu.\n"
 "Lietojiet labo peles taustiņu, lai t�lin�tu."
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
-#| msgid "_Select"
-msgid "_Selection"
-msgstr "_Izvēle"
-
 #: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Kolekcija"
 
-#: ../widgets/menus/gal-define-views-dialog.c:332
-#: ../widgets/menus/gal-define-views.ui.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:356
+#: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definēt %s skatus"
 
-#: ../widgets/menus/gal-define-views-dialog.c:340
-#: ../widgets/menus/gal-define-views-dialog.c:342
+#: ../widgets/menus/gal-define-views-dialog.c:364
+#: ../widgets/menus/gal-define-views-dialog.c:366
 msgid "Define Views"
 msgstr "Definēt skatus"
 
-#: ../widgets/menus/gal-define-views.ui.h:2
+#: ../widgets/menus/gal-define-views.glade.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "Definēt \"%s\" skatus"
 
-#: ../widgets/menus/gal-view-factory-etable.c:113
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-scrolled.c:215
+#: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "Tabula"
 
@@ -21916,86 +22690,160 @@ msgstr "Tabula"
 msgid "Instance"
 msgstr "Instance"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "Saglab�t pašreizējo skatu"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "_Create new view"
 msgstr "_Izveidot jaunu skatu"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Replace existing view"
 msgstr "_Aizvietot esošo skatu"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
+msgid "Custom View"
+msgstr "Piel�gots skats"
+
+#: ../widgets/menus/gal-view-instance.c:581
+msgid "Save Custom View"
+msgstr "Saglab�t piel�goto skatu"
+
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
+msgid "Define Views..."
+msgstr "Definēt skatus..."
+
+#: ../widgets/menus/gal-view-menus.c:304
+msgid "C_urrent View"
+msgstr "P_ašreizējais skats"
+
+#: ../widgets/menus/gal-view-menus.c:327
+#, c-format
+msgid "Select View: %s"
+msgstr "Izvēlieties skatu: %s"
+
+#: ../widgets/menus/gal-view-menus.c:370
+msgid "Current view is a customized view"
+msgstr "Pašreizējais skats ir piel�gots"
+
+#: ../widgets/menus/gal-view-menus.c:374
+msgid "Save Custom View..."
+msgstr "Saglab�t piel�goto skatu..."
+
+#: ../widgets/menus/gal-view-menus.c:379
+msgid "Save current custom view"
+msgstr "Saglab�t pašreizējo piel�goto skatu"
+
+#: ../widgets/menus/gal-view-menus.c:393
+msgid "Create or edit views"
+msgstr "Izveidot vai rediģēt skatus"
+
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "Ražotne"
 
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "Definēt jaunu skatu"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:1
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
 msgid "Name of new view:"
 msgstr "Jaun� skata nosaukums:"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Type of View"
 msgstr "Skata tips"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of view:"
 msgstr "Skata tips:"
 
-#: ../widgets/misc/e-account-manager.c:348
-msgid "De_fault"
-msgstr "Nokl_usētais"
+#: ../widgets/misc/e-attachment.c:991
+#| msgid "Attached message"
+#| msgid_plural "%d attached messages"
+msgid "Attached message"
+msgstr "Pievienota vēstule"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-#| msgid "Account name"
-msgid "Account Name"
-msgstr "Konta nosaukums"
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1774 ../widgets/misc/e-attachment.c:2333
+#: ../widgets/misc/e-attachment-store.c:636
+#| msgid "attachment"
+msgid "attachment.dat"
+msgstr "pielikums.dat"
 
-#: ../widgets/misc/e-account-tree-view.c:255
-msgid "Protocol"
-msgstr "Protokols"
+#: ../widgets/misc/e-attachment.c:1823 ../widgets/misc/e-attachment.c:2639
+msgid "A load operation is already in progress"
+msgstr "Jau notiek iel�des darbība"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-#| msgid "_Actions"
-msgid "Action"
-msgstr "Darbība"
+#: ../widgets/misc/e-attachment.c:1831 ../widgets/misc/e-attachment.c:2647
+msgid "A save operation is already in progress"
+msgstr "Jau notiek saglab�šanas darbība"
 
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "GtkRadioAction"
+#: ../widgets/misc/e-attachment.c:1924
+#, c-format
+#| msgid "Could not load addressbook"
+msgid "Could not load '%s'"
+msgstr "Nevar iel�dēt '%s'"
+
+#: ../widgets/misc/e-attachment.c:1927
+#, c-format
+#| msgid "Could not add delegate %s"
+msgid "Could not load the attachment"
+msgstr "Nevar iel�dēt pielikumu"
+
+#: ../widgets/misc/e-attachment.c:2210
+#, c-format
+#| msgid "Could not open source"
+msgid "Could not open '%s'"
+msgstr "Nevar atvērt '%s'"
+
+#: ../widgets/misc/e-attachment.c:2213
+#, c-format
+#| msgid "Could not open destination"
+msgid "Could not open the attachment"
+msgstr "Nevar atvērt pielikumu"
+
+#: ../widgets/misc/e-attachment.c:2655
+msgid "Attachment contents not loaded"
+msgstr "Pielikuma saturs nav iel�dēts"
+
+#: ../widgets/misc/e-attachment.c:2732
+#, c-format
+#| msgid "Could not execute '%s': %s\n"
+msgid "Could not save '%s'"
+msgstr "Nevar saglab�t '%s'"
+
+#: ../widgets/misc/e-attachment.c:2735
+#, c-format
+#| msgid "Select folder to save all attachments"
+msgid "Could not save the attachment"
+msgstr "Nevar saglab�t pielikumu"
 
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Pielikuma īpašības"
 
 #: ../widgets/misc/e-attachment-dialog.c:328
+#| msgid "F_ilename:"
 msgid "_Filename:"
 msgstr "_Faila nosaukums:"
 
 #: ../widgets/misc/e-attachment-dialog.c:363
+#| msgid "MIME Type"
 msgid "MIME Type:"
 msgstr "MIME tips:"
 
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:550
-msgid "_Suggest automatic display of attachment"
-msgstr "Ieteikt autom�ti_sku pielikumu attēlošanu"
-
 #: ../widgets/misc/e-attachment-handler-image.c:95
+#| msgid "Set as _Background"
 msgid "Could not set as background"
 msgstr "Nevarēja ielikt k� fona attēlu"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
-msgid "Set as _Background"
-msgstr "Ielikt k� _fona attēlu"
-
 #: ../widgets/misc/e-attachment-handler-sendto.c:87
+#| msgid "Could not open source"
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "Nevar nosūtīt pielikumu"
@@ -22003,140 +22851,76 @@ msgstr[1] "Nevar nosūtīt pielikumus"
 msgstr[2] "Nevar nosūtīt pielikumus"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:129
+#| msgid "Send To:"
 msgid "_Send To..."
 msgstr "_Sūtīt uz:"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:131
+#| msgid "Select folder to save selected attachments..."
 msgid "Send the selected attachments somewhere"
 msgstr "Sūtīt izvēlētos pielikumus kaut kur"
 
 #: ../widgets/misc/e-attachment-icon-view.c:480
 #: ../widgets/misc/e-attachment-tree-view.c:517
+#| msgid "Loading..."
 msgid "Loading"
 msgstr "Iel�dē"
 
 #: ../widgets/misc/e-attachment-icon-view.c:492
 #: ../widgets/misc/e-attachment-tree-view.c:529
+#| msgid "Shading"
 msgid "Saving"
 msgstr "Saglab�"
 
 #: ../widgets/misc/e-attachment-paned.c:87
-msgid "Hide Attachment _Bar"
-msgstr "Paslēpt Piesaistnes _joslu"
+msgid "Hide _Attachment Bar"
+msgstr "Slēpt pielikum_a joslu"
 
 #: ../widgets/misc/e-attachment-paned.c:89
-msgid "Show Attachment _Bar"
-msgstr "R�dīt pielikumu _joslu"
-
-#: ../widgets/misc/e-attachment-paned.c:636
+#: ../widgets/misc/e-attachment-paned.c:626
 msgid "Show _Attachment Bar"
 msgstr "R�dīt pielikum_a joslu"
 
-#: ../widgets/misc/e-attachment-store.c:538
+#: ../widgets/misc/e-attachment-store.c:541
+#| msgid "No Attachment"
 msgid "Add Attachment"
 msgstr "Pievienot pielikumu"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:544
 msgid "A_ttach"
 msgstr "Pievieno_t"
 
-#: ../widgets/misc/e-attachment-store.c:604
+#: ../widgets/misc/e-attachment-store.c:607
+#| msgid "Save attachments"
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Saglab�t pielikumu"
 msgstr[1] "Saglab�t pielikumus"
 msgstr[2] "Saglab�t pielikumus"
 
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
-msgid "attachment.dat"
-msgstr "pielikums.dat"
-
 #: ../widgets/misc/e-attachment-view.c:300
 msgid "S_ave All"
 msgstr "S_aglab�t visu"
 
 #: ../widgets/misc/e-attachment-view.c:326
+#| msgid "_Add attachment..."
 msgid "A_dd Attachment..."
 msgstr "_Pievienot pielikumu..."
 
-#: ../widgets/misc/e-attachment-view.c:350
-msgid "_Hide"
-msgstr "Slē_pt"
-
-#: ../widgets/misc/e-attachment-view.c:357
-msgid "_View Inline"
-msgstr "_Skatīt iekļauti"
-
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:643
 #, c-format
+#| msgid "Open in %s..."
 msgid "Open with \"%s\""
 msgstr "Atvērt ar \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:646
 #, c-format
+#| msgid "Save attachment as"
 msgid "Open this attachment in %s"
 msgstr "Saglab�t pielikumus %s"
 
-#. To Translators: This text is set as a description of an attached
-#. * message when, for example, attaching it to a composer. When the
-#. * message to be attached has also filled Subject, then this text is
-#. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
-msgid "Attached message"
-msgstr "Pievienota vēstule"
-
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
-msgid "A load operation is already in progress"
-msgstr "Jau notiek iel�des darbība"
-
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
-msgid "A save operation is already in progress"
-msgstr "Jau notiek saglab�šanas darbība"
-
-#: ../widgets/misc/e-attachment.c:1920
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Nevar iel�dēt '%s'"
-
-#: ../widgets/misc/e-attachment.c:1923
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Nevar iel�dēt pielikumu"
-
-#: ../widgets/misc/e-attachment.c:2199
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Nevar atvērt '%s'"
-
-#: ../widgets/misc/e-attachment.c:2202
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Nevar atvērt pielikumu"
-
-#: ../widgets/misc/e-attachment.c:2637
-msgid "Attachment contents not loaded"
-msgstr "Pielikuma saturs nav iel�dēts"
-
-#: ../widgets/misc/e-attachment.c:2713
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Nevar saglab�t '%s'"
-
-#: ../widgets/misc/e-attachment.c:2716
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Nevar saglab�t pielikumu"
-
-#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:363
-#| msgid "Click to open %s"
-msgid "Ctrl-click to open a link"
-msgstr "Labais klikšķis, lai atvērtu saiti"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -22144,58 +22928,58 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Mēneša kalend�rs"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "Aizpildījuma kr�sa"
 
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
+#: ../widgets/misc/e-canvas-background.c:461
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "GDK aizpildīšanas kr�sa"
 
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "Aizpildīt gravieri"
 
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
+#: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
+#: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
+#: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
+#: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Minim�lais platums"
 
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Minim�lais platums"
 
@@ -22203,171 +22987,202 @@ msgstr "Minim�lais platums"
 msgid "Spacing"
 msgstr "Atstarpe"
 
-#: ../widgets/misc/e-charset-combo-box.c:93
+#: ../widgets/misc/e-cell-date-edit.c:296
+msgid "Now"
+msgstr "Tagad"
+
+#: ../widgets/misc/e-cell-date-edit.c:846
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "Laikam j�būt š�d� form�t�: %s"
+
+#: ../widgets/misc/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Procentu vērtībai j�būt starp 0 un 100, ieskaitot"
+
+#: ../widgets/misc/e-charset-picker.c:57
+msgid "Arabic"
+msgstr "Ar�bu"
+
+#: ../widgets/misc/e-charset-picker.c:58
+msgid "Baltic"
+msgstr "Baltu"
+
+#: ../widgets/misc/e-charset-picker.c:59
+msgid "Central European"
+msgstr "Centr�leiropas"
+
+#: ../widgets/misc/e-charset-picker.c:60
+msgid "Chinese"
+msgstr "Ķīniešu"
+
+#: ../widgets/misc/e-charset-picker.c:61
+msgid "Cyrillic"
+msgstr "Kirilica"
+
+#: ../widgets/misc/e-charset-picker.c:62
+msgid "Greek"
+msgstr "GrieÄ·u"
+
+#: ../widgets/misc/e-charset-picker.c:63
+msgid "Hebrew"
+msgstr "Ivrits"
+
+#: ../widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr "Jap�ņu"
+
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr "Korejiešu"
+
+#: ../widgets/misc/e-charset-picker.c:66
+msgid "Thai"
+msgstr "Taju"
+
+#: ../widgets/misc/e-charset-picker.c:67
+msgid "Turkish"
+msgstr "Turku"
+
+#: ../widgets/misc/e-charset-picker.c:68
+msgid "Unicode"
+msgstr "Unikods"
+
+#: ../widgets/misc/e-charset-picker.c:69
+msgid "Western European"
+msgstr "Rietumeiropas"
+
+#: ../widgets/misc/e-charset-picker.c:70
+msgid "Western European, New"
+msgstr "Rietumeiropas, jauns"
+
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
+msgid "Traditional"
+msgstr "Tradicion�l�"
+
+#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+msgid "Simplified"
+msgstr "Vienk�rš�"
+
+#: ../widgets/misc/e-charset-picker.c:98
+msgid "Ukrainian"
+msgstr "Ukraiņu"
+
+#: ../widgets/misc/e-charset-picker.c:101
+msgid "Visual"
+msgstr "Vizu�l�"
+
+#: ../widgets/misc/e-charset-picker.c:170
+#, c-format
+msgid "Unknown character set: %s"
+msgstr "Nezin�ma rakstzīmju kopa: %s"
+
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Rakstzīmju šifrēšana"
 
-#: ../widgets/misc/e-charset-combo-box.c:117
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Ievadiet, k�du rakstzīmju kopu lietot"
 
-#: ../widgets/misc/e-charset-combo-box.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Cita..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-charset-picker.c:599
+msgid "Ch_aracter Encoding"
+msgstr "R_akstzīmju kodējums"
+
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "Datums un laiks"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "Teksta ieraksts, lai ievadīt datumu"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
-msgstr "Spiediet šo pogu, lai r�dītu kalend�ru"
+msgstr "Spiediet šo pogu, lai par�dītu kalend�ru"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:379
+#| msgid "Combo box to select time"
 msgid "Drop-down combination box to select time"
 msgstr "Nolaižamais kombin�cijlodziņš, lai izvēlētos laiku"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "Ta_gad"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "Å o_dien"
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
-msgid "_None"
-msgstr "_Nekas"
-
-#. Translators: "None" for date field of a date edit, shown when
-#. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
-#| msgid "None"
-msgctxt "date"
-msgid "None"
-msgstr "Nekas"
-
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "Nederīga datuma vērtība"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
 msgstr "Nederīga laika vērtība"
 
-#: ../widgets/misc/e-import-assistant.c:238
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr ""
-"Izvēlieties failu, ko jūs vēlaties importēt Evolution, un tad no saraksta "
-"izvēlieties, k�da tipa fails tas ir."
-
-#: ../widgets/misc/e-import-assistant.c:255
-msgid "F_ilename:"
-msgstr "Fa_ila nosaukums:"
-
-#: ../widgets/misc/e-import-assistant.c:265
-msgid "Select a file"
-msgstr "Izvēlieties failu"
-
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
-msgid "File _type:"
-msgstr "Faila _tips:"
-
-#: ../widgets/misc/e-import-assistant.c:322
-msgid "Choose the destination for this import"
-msgstr "Izvēlieties šīs importēšanas galamērķi"
-
-#: ../widgets/misc/e-import-assistant.c:347
-msgid "Choose the type of importer to run:"
-msgstr "Izvēlieties importēt�ja veidu:"
-
-#: ../widgets/misc/e-import-assistant.c:355
-msgid "Import data and settings from _older programs"
-msgstr "Importēt datus un iestatījumus n_o vec�k�m programm�m"
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:181
+#: ../widgets/misc/e-filter-bar.c:309 ../widgets/misc/e-filter-bar.c:742
+msgid "Advanced Search"
+msgstr "Paplašin�t� meklēšana"
 
-#: ../widgets/misc/e-import-assistant.c:363
-msgid "Import a _single file"
-msgstr "Importēt _vienu failu"
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:232
+msgid "Save Search"
+msgstr "Saglab�t meklēšanu"
 
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr "Izvēlieties, k�du faila tipu vēlaties importēt no saraksta."
+#: ../widgets/misc/e-filter-bar.c:269
+msgid "_Searches"
+msgstr "Meklēšana_s"
 
-#: ../widgets/misc/e-import-assistant.c:516
-#| msgid ""
-#| "Evolution checked for settings to import from the following\n"
-#| "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
-#| "settings found. If you would like to\n"
-#| "try again, please click the \"Back\" button.\n"
-msgid ""
-"Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
-msgstr ""
-"Evolution p�rbaudīja iestatījumus, lai importētu no sekojošaj�m "
-"lietotnēm: Pine, Netscape, Elm, iCalendar. Importējami iestatījumi "
-"netika atrasti. Ja vēlaties mēģin�t vēlreiz, spiediet pogu \"Atpakaļ\"."
-
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
-msgid "Evolution Import Assistant"
-msgstr "Evolution importēšanas asistents"
+#: ../widgets/misc/e-filter-bar.c:271
+msgid "Searches"
+msgstr "Meklēšanas"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
-msgid "Import Location"
-msgstr "Importa atrašan�s vieta"
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
+msgid "_Save Search..."
+msgstr "_Saglab�t meklējumu..."
 
-#: ../widgets/misc/e-import-assistant.c:1207
-#| msgid ""
-#| "Welcome to the Evolution Import Assistant.\n"
-#| "With this assistant you will be guided through the process of\n"
-#| "importing external files into Evolution."
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
-msgstr ""
-"Sveicin�ti Evolution importēšanas asistent�.\n"
-"Šis asistents vadīs jūs cauri �rējo failu importēšanai uz Evolution."
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
+msgid "_Edit Saved Searches..."
+msgstr "R_ediģēt saglab�tos meklējumus..."
 
-#: ../widgets/misc/e-import-assistant.c:1223
-msgid "Importer Type"
-msgstr "Importēt�ja tips"
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
+msgid "_Advanced Search..."
+msgstr "P_aplašin�t� meklēšana..."
 
-#: ../widgets/misc/e-import-assistant.c:1232
-msgid "Select Information to Import"
-msgstr "Izvēlieties inform�ciju, kuru importēt"
+#: ../widgets/misc/e-filter-bar.h:103
+msgid "All Accounts"
+msgstr "Visi konti"
 
-#: ../widgets/misc/e-import-assistant.c:1240
-msgid "Select a File"
-msgstr "Izvēlieties failu"
+#: ../widgets/misc/e-filter-bar.h:104
+msgid "Current Account"
+msgstr "Pašreizējais konts"
 
-#: ../widgets/misc/e-import-assistant.c:1255
-#| msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "Spiediet \"Pielietot\", lai s�ktu faila importēšanu uz Evolution. "
+#: ../widgets/misc/e-filter-bar.h:105
+msgid "Current Folder"
+msgstr "Pašreizēj� mape"
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-#| msgid "Important"
-msgid "Import Data"
-msgstr "Importēt datus"
+#: ../widgets/misc/e-image-chooser.c:168
+msgid "Choose Image"
+msgstr "Izvēlieties attēlu"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "Pasaules karte"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:607
+#| msgid ""
+#| "Mouse-based interactive map widget for selecting timezone. Keyboard users "
+#| "should select the timezone from the below combo box instead."
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22376,129 +23191,88 @@ msgstr ""
 "lietot�jiem ir j�izvēlas laika joslu no zem�k redzam� kombinēt� lodziņa "
 "lauka."
 
-#: ../widgets/misc/e-online-button.c:27
-#| msgid ""
-#| "Evolution is currently online.\n"
-#| "Click on this button to work offline."
-msgid "Evolution is currently online.  Click this button to work offline."
-msgstr ""
-"Evolution pašreiz ir tiešsaistē. Spiediet šo pogu, lai str�d�tu nesaistē."
-
-#: ../widgets/misc/e-online-button.c:30
-#| msgid ""
-#| "Evolution is currently offline.\n"
-#| "Click on this button to work online."
-msgid "Evolution is currently offline.  Click this button to work online."
-msgstr ""
-"Evolution pašlaik ir nesaistē. Spiediet šo pogu, lai str�d�tu tiešsaistē."
-
-#: ../widgets/misc/e-online-button.c:33
-#| msgid ""
-#| "Evolution is currently offline.\n"
-#| "Click on this button to work online."
-msgid "Evolution is currently offline because the network is unavailable."
-msgstr "Evolution pašlaik ir nesaistē, jo nav pieejams tīkls."
+#: ../widgets/misc/e-online-button.c:106
+#| msgid "Inline"
+msgid "Online"
+msgstr "Tiešsaistē"
 
-#: ../widgets/misc/e-online-button.c:135
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr "Pogas st�voklis ir tiešsaistē"
 
-#: ../widgets/misc/e-paned.c:306
-#| msgid "Horizontal pane position"
-msgid "Horizontal Position"
-msgstr "Horizont�lais novietojums"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "Rūts novietojums, kad orientēts horizont�li"
-
-#: ../widgets/misc/e-paned.c:318
-#| msgid "Vertical pane position"
-msgid "Vertical Position"
-msgstr "Vertik�lais novietojums"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "Rūts novietojums, kad orientēts vertik�li"
-
-#: ../widgets/misc/e-paned.c:330
-#| msgid "_Properties"
-msgid "Proportion"
-msgstr "Proporcijas"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "2. rūts izmēra proporcijas"
-
-#: ../widgets/misc/e-paned.c:342
-#| msgid "_Resize"
-msgid "Fixed Resize"
-msgstr "Fiksēta izmēra maiņa"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Mainot izmēru, turēt 2. rūti fiksētu"
-
-#: ../widgets/misc/e-pilot-settings.c:95
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "Sinhronizēt ar:"
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "Sinh. priv�tos ierakstus:"
 
-#: ../widgets/misc/e-pilot-settings.c:112
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "Sinh. kategorijas:"
 
-#: ../widgets/misc/e-preferences-window.c:218
-msgid "Evolution Preferences"
-msgstr "Evolution iestatījumi"
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
+msgid "Empty message"
+msgstr "Tukša vēstule"
 
-#: ../widgets/misc/e-search-bar.c:77
-#, c-format
-msgid "Matches: %d"
-msgstr "Atbilstības: %d"
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
+msgid "Reflow model"
+msgstr "P�rpildīt modeli"
 
-#: ../widgets/misc/e-search-bar.c:558
-msgid "Close the find bar"
-msgstr "Aizvērt meklēšanas joslu"
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
+msgid "Column width"
+msgstr "Kolonnas platums"
 
-#: ../widgets/misc/e-search-bar.c:566
-msgid "Fin_d:"
-msgstr "_Meklēt:"
+#: ../widgets/misc/e-search-bar.c:94 ../widgets/misc/e-search-bar.c:355
+#: ../widgets/misc/e-search-bar.c:499 ../widgets/misc/e-search-bar.c:501
+#: ../widgets/misc/e-search-bar.c:1017
+#| msgid "_Search"
+msgid "Search"
+msgstr "Meklēt"
 
-#: ../widgets/misc/e-search-bar.c:578
-msgid "Clear the search"
-msgstr "Attīrīt meklēšanu"
+#: ../widgets/misc/e-search-bar.c:355 ../widgets/misc/e-search-bar.c:499
+#: ../widgets/misc/e-search-bar.c:501
+#| msgid "Click here to attach a file"
+msgid "Click here to change the search type"
+msgstr "Klikšķiniet šeit, lai mainītu meklēšanas tipu"
 
-#: ../widgets/misc/e-search-bar.c:601
-msgid "_Previous"
-msgstr "Ie_priekšējais"
+#: ../widgets/misc/e-search-bar.c:633
+msgid "_Search"
+msgstr "_Meklēt"
 
-#: ../widgets/misc/e-search-bar.c:607
-msgid "Find the previous occurrence of the phrase"
-msgstr "Iet uz iepriekšējo meklēšanas rezult�tu"
+#: ../widgets/misc/e-search-bar.c:639
+msgid "_Find Now"
+msgstr "_Meklēt tagad"
 
-#: ../widgets/misc/e-search-bar.c:617
-msgid "_Next"
-msgstr "_N�kamais"
+#: ../widgets/misc/e-search-bar.c:640
+msgid "_Clear"
+msgstr "_Attīrīt"
 
-#: ../widgets/misc/e-search-bar.c:623
-msgid "Find the next occurrence of the phrase"
-msgstr "Iet uz n�kamo meklēšanas rezult�tu"
+#: ../widgets/misc/e-search-bar.c:895
+msgid "Item ID"
+msgstr "Priekšmeta id"
 
-#: ../widgets/misc/e-search-bar.c:633
-msgid "Mat_ch case"
-msgstr "Reģis_trjutīgs"
+#: ../widgets/misc/e-search-bar.c:902 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
+msgid "Text"
+msgstr "Teksts"
 
-#: ../widgets/misc/e-search-bar.c:661
-msgid "Reached bottom of page, continued from top"
-msgstr "Sasniedza lapas beigas, turpina no s�kuma"
+#. 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:1049
+msgid "Sho_w: "
+msgstr "R�dī_t: "
 
-#: ../widgets/misc/e-search-bar.c:683
-msgid "Reached top of page, continued from bottom"
-msgstr "Sasniedza lapas s�kumu, turpina no beig�m"
+#: ../widgets/misc/e-search-bar.c:1068
+msgid "Sear_ch: "
+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:1084
+msgid " i_n "
+msgstr " iekš "
 
 #: ../widgets/misc/e-selection-model-array.c:593
 #: ../widgets/table/e-tree-selection-model.c:803
@@ -22510,435 +23284,322 @@ msgstr "Kursora rinda"
 msgid "Cursor Column"
 msgstr "Kursora kolonna"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "K�rtot�js"
 
-#: ../widgets/misc/e-selection-model.c:223
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "Izvēles režīms"
 
-#: ../widgets/misc/e-selection-model.c:231
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "Kursora režīms"
 
-#: ../widgets/misc/e-send-options.c:515
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "Kad izdzēs_ts:"
 
-#: ../widgets/misc/e-send-options.ui.h:1
+#: ../widgets/misc/e-send-options.glade.h:1
+msgid "<b>Delivery Options</b>"
+msgstr "<b>Pieg�des opcijas</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:2
+msgid "<b>Replies</b>"
+msgstr "<b>Atbildes</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:3
+msgid "<b>Return Notification</b>"
+msgstr "<b>Atgriezt paziņojumu</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:4
+msgid "<b>Status Tracking</b>"
+msgstr "<b>Statusa izsekošana</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
 msgstr "Auto_matiski izdzēst nosūtīto vienību"
 
-#: ../widgets/misc/e-send-options.ui.h:3
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
 msgstr "Izveid_ot nosūtīto vienību, lai izsekot inform�cijai"
 
-#: ../widgets/misc/e-send-options.ui.h:4
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "Pieg�d�ts un at_vērts"
 
-#: ../widgets/misc/e-send-options.ui.h:5
-#| msgid "<b>Delivery Options</b>"
-msgid "Delivery Options"
-msgstr "Pieg�des opcijas"
-
-#: ../widgets/misc/e-send-options.ui.h:6
-msgid "For Your Eyes Only"
-msgstr "Tikai jums"
-
-#: ../widgets/misc/e-send-options.ui.h:7
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "Visp�rē_j�s opcijas"
 
-#: ../widgets/misc/e-send-options.ui.h:10
-#| msgid ""
-#| "None\n"
-#| "Mail Receipt"
-msgid "Mail Receipt"
-msgstr "Pasta saņemšanas apstiprin�jums"
+#: ../widgets/misc/e-send-options.glade.h:9
+msgid ""
+"None\n"
+"Mail Receipt"
+msgstr ""
+"Neviens\n"
+"Pasta saņēmējs"
 
-#: ../widgets/misc/e-send-options.ui.h:14
-#| msgid "Priority"
-msgid "Proprietary"
-msgstr "Īpašnieka"
+#: ../widgets/misc/e-send-options.glade.h:11
+msgid ""
+"Normal\n"
+"Proprietary\n"
+"Confidential\n"
+"Secret\n"
+"Top Secret\n"
+"For Your Eyes Only"
+msgstr ""
+"Norm�la\n"
+"Komerci�la\n"
+"Konfidenci�la\n"
+"Slepena\n"
+"Īpaši slepena\n"
+"Tikai tev un nevienam citam"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "Ir pi_eprasīta atbilde"
 
-#: ../widgets/misc/e-send-options.ui.h:17
-#| msgid "<b>Return Notification</b>"
-msgid "Return Notification"
-msgstr "Atgriezt paziņojumu"
-
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "Sta_tusa izsekošana"
 
-#: ../widgets/misc/e-send-options.ui.h:21
-#| msgid "S_tandard Font:"
-msgid "Standard"
-msgstr "Standarta"
-
-#: ../widgets/misc/e-send-options.ui.h:22
-#| msgid "Sta_tus Tracking"
-msgid "Status Tracking"
-msgstr "Statusa izsekošana"
-
-#: ../widgets/misc/e-send-options.ui.h:23
-#| msgid "Top secret"
-msgid "Top Secret"
-msgstr "Pilnīgi slepens"
+#: ../widgets/misc/e-send-options.glade.h:20
+msgid ""
+"Undefined\n"
+"High\n"
+"Standard\n"
+"Low"
+msgstr ""
+"Nedefinēts\n"
+"Augsts\n"
+"Standarts\n"
+"Zems"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "Kad apsti_prin�ts:"
 
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "Kad pa_beigts:"
 
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "Kad _noraidīts:"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "Ro_bež�s"
 
-#: ../widgets/misc/e-send-options.ui.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "_PÄ“c:"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "_Visa inform�cija"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.glade.h:30
+#| msgid "_Classification"
 msgid "_Classification:"
 msgstr "_Klasifik�cija:"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
 msgstr "_Aizkavēt ziņojuma pieg�di"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_Pieg�dats"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "Ie_statīt izbeigšan�s datumu"
 
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_LÄ«dz:"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "_Kad Ä“rti"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "_Kad atvērts:"
 
-#: ../widgets/misc/e-signature-editor.c:133
-#: ../widgets/misc/e-signature-editor.c:549
-#: ../widgets/misc/e-signature-manager.c:349
-#: ../widgets/misc/e-signature-script-dialog.c:218
-msgid "Unnamed"
-msgstr "Nenosaukts"
-
-#: ../widgets/misc/e-signature-editor.c:210
-msgid "_Save and Close"
-msgstr "_Saglab�t un aizvērt"
-
-#: ../widgets/misc/e-signature-editor.c:389
-msgid "Edit Signature"
-msgstr "Rediģēt parakstu"
-
-#: ../widgets/misc/e-signature-editor.c:404
-msgid "_Signature Name:"
-msgstr "Paraksta no_saukums:"
-
-#: ../widgets/misc/e-signature-manager.c:294
-#| msgid "Add signature script"
-msgid "Add Signature Script"
-msgstr "Pievienot paraksta skriptu"
-
-#: ../widgets/misc/e-signature-manager.c:359
-#| msgid "Edit Signature"
-msgid "Edit Signature Script"
-msgstr "Rediģēt paraksta skriptu"
-
-#: ../widgets/misc/e-signature-manager.c:576
-msgid "Add _Script"
-msgstr "Pievienot _skriptu"
-
-#: ../widgets/misc/e-signature-script-dialog.c:266
-#| msgid ""
-#| "The output of this script will be used as your\n"
-#| "signature. The name you specify will be used for display purposes only."
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only."
-msgstr ""
-"Skripta izvads tiks izmantots k� jūsu paraksts.\n"
-"Nosaukums, kuru nor�dīsiet, tiks izmantots \n"
-"tikai attēlošanas nolūkos."
-
-#: ../widgets/misc/e-signature-script-dialog.c:311
-#| msgid "_Script:"
-msgid "S_cript:"
-msgstr "S_kripts:"
-
-#: ../widgets/misc/e-signature-script-dialog.c:342
-#| msgid "The script file must exist and be executable."
-msgid "Script file must be executable."
-msgstr "Skriptam ir j�būt izpild�mam."
-
-#: ../widgets/misc/e-url-entry.c:105
-msgid "Click here to go to URL"
-msgstr "Klikšķiniet, lai atvērtu adresi"
-
-#: ../widgets/misc/e-web-view.c:348
-msgid "_Copy Link Location"
-msgstr "_Kopēt saites vietu"
-
-#: ../widgets/misc/e-web-view.c:350
-#| msgid "Copy things to the clipboard."
-msgid "Copy the link to the clipboard"
-msgstr "Kopēt saiti uz starpliktuvi"
-
-#: ../widgets/misc/e-web-view.c:358
-msgid "_Open Link in Browser"
-msgstr "_Atvērt saiti p�rlūk�"
-
-#: ../widgets/misc/e-web-view.c:360
-#| msgid "_Open Link in Browser"
-msgid "Open the link in a web browser"
-msgstr "Atvērt saiti tīmekļa p�rlūk�"
-
-#: ../widgets/misc/e-web-view.c:368
-#| msgid "Copy _Email Address"
-msgid "_Copy Email Address"
-msgstr "_Kopēt e-pasta adresi"
-
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
-#| msgid "Select all the text in a message"
-msgid "Select all text and images"
-msgstr "Izvēlēties visu tekstu un attēlus"
-
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
-msgid "Click to call %s"
-msgstr "Klikšķiniet, lai zvanītu %s"
-
-#: ../widgets/misc/e-web-view.c:758
-msgid "Click to hide/unhide addresses"
-msgstr "Klikšķiniet, lai par�dītu/paslēptu adreses"
-
-#: ../widgets/misc/e-web-view.c:760
-#, c-format
-msgid "Click to open %s"
-msgstr "Klikšķin�t, lai atvērtu %s"
-
-#: ../widgets/misc/ea-calendar-item.c:299
-#: ../widgets/misc/ea-calendar-item.c:308
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
+msgid "%s (...)"
+msgstr "%s (...)"
 
-#: ../widgets/misc/ea-calendar-item.c:311
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
+#. %d is a number between 0 and 100, describing the percentage of operation complete
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Kalend�rs: no %s līdz %s"
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% izpildīts)"
 
-#: ../widgets/misc/ea-calendar-item.c:347
-msgid "evolution calendar item"
-msgstr "evolution kalend�ra vienība"
+#: ../widgets/misc/e-url-entry.c:103
+msgid "Click here to go to URL"
+msgstr "Klikšķiniet, lai atvērtu adresi"
 
 #: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "izlecošo logu saraksts"
 
-#: ../widgets/table/e-cell-date-edit.c:303
-msgid "Now"
-msgstr "Tagad"
-
-#. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:320
-#| msgid "None"
-msgctxt "table-date"
-msgid "None"
-msgstr "Nekas"
-
-#: ../widgets/table/e-cell-date-edit.c:328
-msgid "OK"
-msgstr "Labi"
-
-#: ../widgets/table/e-cell-date-edit.c:878
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "Laikam j�būt š�d� form�t�: %s"
-
-#: ../widgets/table/e-cell-percent.c:76
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Procentu vērtībai j�būt starp 0 un 100, ieskaitot"
-
-#: ../widgets/table/e-cell-pixbuf.c:357
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Izvēlēta kolonna"
 
-#: ../widgets/table/e-cell-pixbuf.c:364
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "Fokusēta kolonna"
 
-#: ../widgets/table/e-cell-pixbuf.c:371
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "Neizvēlēta kolonna"
 
-#: ../widgets/table/e-cell-text.c:1631
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Strikeout Column"
 msgstr "Caursvītrota kolonna"
 
-#: ../widgets/table/e-cell-text.c:1638
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Underline Column"
 msgstr "Pasvītrot kolonnu"
 
-#: ../widgets/table/e-cell-text.c:1645
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Bold Column"
 msgstr "Trekna kolonna"
 
-#: ../widgets/table/e-cell-text.c:1652
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Color Column"
 msgstr "Kr�sas kolonna"
 
-#: ../widgets/table/e-cell-text.c:1666
+#: ../widgets/table/e-cell-text.c:1836
 msgid "BG Color Column"
 msgstr "Fona kr�sas kolonna"
 
-#: ../widgets/table/e-table-click-to-add.c:586
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
-msgid "click to add"
-msgstr "klikšķiniet, lai pievienotu"
-
-#: ../widgets/table/e-table-config.c:150
+#: ../widgets/table/e-table-config.c:152
 msgid "State"
 msgstr "St�voklis"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(Augoši)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(Dilstoši)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "Nav sak�rtots"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "Nav grupēšanas"
 
-#: ../widgets/table/e-table-config.c:638
-#: ../widgets/table/e-table-config.ui.h:11
+#: ../widgets/table/e-table-config.c:642
+#: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "R�dīt laukus"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "Pieejamie lauki"
 
-#: ../widgets/table/e-table-config.ui.h:1
+#: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
 msgstr "Pie_ejamie lauki:"
 
-#: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-config.glade.h:2
+#: ../widgets/table/e-table-header-item.c:1575
 msgid "Ascending"
 msgstr "Augoši"
 
-#: ../widgets/table/e-table-config.ui.h:3
+#: ../widgets/table/e-table-config.glade.h:3
 msgid "Clear All"
 msgstr "Notīrīt visu"
 
-#: ../widgets/table/e-table-config.ui.h:4
+#: ../widgets/table/e-table-config.glade.h:4
+#| msgid "Clear All"
 msgid "Clear _All"
 msgstr "Notīrīt _visu"
 
-#: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1575
 msgid "Descending"
 msgstr "Dilstoši"
 
-#: ../widgets/table/e-table-config.ui.h:8
+#: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
 msgstr "Grupēt vienības pēc"
 
-#: ../widgets/table/e-table-config.ui.h:9
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
 msgstr "P�rvietot _lejup"
 
-#: ../widgets/table/e-table-config.ui.h:10
+#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
 msgstr "P�rvietot augš_up"
 
-#: ../widgets/table/e-table-config.ui.h:12
+#: ../widgets/table/e-table-config.glade.h:12
 msgid "Show _field in View"
 msgstr "R�dīt la_uku skat�"
 
-#: ../widgets/table/e-table-config.ui.h:13
+#: ../widgets/table/e-table-config.glade.h:13
 msgid "Show field i_n View"
 msgstr "R�dīt la_uku skat�"
 
-#: ../widgets/table/e-table-config.ui.h:14
+#: ../widgets/table/e-table-config.glade.h:14
 msgid "Show field in _View"
 msgstr "_R�dīt lauku skat�"
 
-#: ../widgets/table/e-table-config.ui.h:15
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
 msgstr "K�rtot"
 
-#: ../widgets/table/e-table-config.ui.h:16
+#: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
 msgstr "K�rtot priekšmetus pēc"
 
-#: ../widgets/table/e-table-config.ui.h:17
+#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
 msgstr "tad pēc"
 
-#: ../widgets/table/e-table-config.ui.h:19
+#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
 msgstr "_Attēlotie lauki..."
 
-#: ../widgets/table/e-table-config.ui.h:20
+#: ../widgets/table/e-table-config.glade.h:20
 msgid "_Group By..."
 msgstr "_Grupēt pēc..."
 
-#: ../widgets/table/e-table-config.ui.h:22
+#: ../widgets/table/e-table-config.glade.h:22
 msgid "_Show field in View"
 msgstr "R�dīt lauku _skat�"
 
-#: ../widgets/table/e-table-config.ui.h:23
+#: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
 msgstr "R�dīt šo_s laukus secīgi:"
 
-#: ../widgets/table/e-table-config.ui.h:24
+#: ../widgets/table/e-table-config.glade.h:24
 msgid "_Sort..."
 msgstr "_K�rtot..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:114
-#| msgid "Add a C_olumn..."
-msgid "Add a Column"
-msgstr "Pievienot kolonnu"
+msgid "Add a column..."
+msgstr "Pievienot kolonnu..."
+
+#: ../widgets/table/e-table-field-chooser.glade.h:1
+msgid "Field Chooser"
+msgstr "Lauka izvēlēt�js"
 
-#: ../widgets/table/e-table-field-chooser.c:151
+#: ../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."
@@ -22946,7 +23607,7 @@ msgstr ""
 "Lai pievienotu kolonnu jūsu tabulai, velciet to uz\n"
 "vietu, kur jūs gribat novietot kolonnu."
 
-#: ../widgets/table/e-table-group-container.c:342
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
@@ -22954,7 +23615,7 @@ msgstr[0] "%s : %s (%d priekšmets)"
 msgstr[1] "%s : %s (%d priekšmeti)"
 msgstr[2] "%s : %s (%d priekšmetu)"
 
-#: ../widgets/table/e-table-group-container.c:348
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -22962,2672 +23623,297 @@ msgstr[0] "%s (%d vienība)"
 msgstr[1] "%s (%d vienības)"
 msgstr[2] "%s (%d vienību)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Mainīgas rindu kr�sas"
 
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "Horizont�lais zīmēšanas režģis"
 
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "Vertik�lais zīmēšanas režģis"
 
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "Zīmēšanas fokuss"
 
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Kursora režīms"
 
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Izvēles modelis"
 
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "Garuma Slieksnis"
 
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "Vienots rindas augstums"
 
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "Sasalis"
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1445
 msgid "Customize Current View"
 msgstr "P�rveidot pašreizējo skatu"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1465
 msgid "Sort _Ascending"
 msgstr "Sak�rtot _augoši"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Sort _Descending"
 msgstr "Sak�rtot _dilstoši"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1467
 msgid "_Unsort"
 msgstr "_Nek�rtot"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Group By This _Field"
 msgstr "Grupēt pēc šī _lauka"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Group By _Box"
 msgstr "Grupēt pēc _kastītes"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Remove This _Column"
 msgstr "Izņemt šo _kolonnu"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Add a C_olumn..."
 msgstr "Pievienot k_olonnu..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "A_lignment"
 msgstr "_Līdzin�jums"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "B_est Fit"
 msgstr "L_ab�kais izmērs"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Format Column_s..."
 msgstr "Formatēt kolonna_s..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Custo_mize Current View..."
 msgstr "P�r_veidot pašreizējo skatu..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1535
 msgid "_Sort By"
 msgstr "_K�rtot pēc"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1553
+#| msgid "Custom"
 msgid "_Custom"
 msgstr "_Piel�gots"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "Tabulas galva"
 
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "Tabulas modelis"
 
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "Kursora rinda"
 
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "K�rtošanas inform�cija"
 
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "Vienmēr meklēt"
 
-#: ../widgets/table/e-table.c:3360
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "Lietojiet klikšķi, lai pievienotu"
 
-#: ../widgets/table/e-table.c:3374
-#| msgid "Indicator Spacing"
-msgid "Vertical Row Spacing"
-msgstr "Vertik�l� atstarpe rind�m"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "Vertik�l� atstarpe starp rind�m. T�s pievieno rindas augš� un apakš�"
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "Koks"
 
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "ETree tabulu adapteris"
 
-#: ../widgets/table/e-tree.c:3413
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "Retro izskats"
 
-#: ../widgets/table/e-tree.c:3414
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "Zīmēt līnijas un +/- izvērsējus."
 
-#: ../widgets/table/e-tree.c:3420
+#: ../widgets/table/e-tree.c:3386
 msgid "Expander Size"
 msgstr "Izversēja izmērs"
 
-#: ../widgets/table/e-tree.c:3421
+#: ../widgets/table/e-tree.c:3387
 msgid "Size of the expander arrow"
 msgstr "Izvērsēja bultas izmērs"
 
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "uzlecošs"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
-msgid "popup a child"
-msgstr "par�dīt bērnu"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "rediģēt"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
-msgid "begin editing this cell"
-msgstr "s�kt šīs sūnas rediģēšanu"
-
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "p�rslēgt"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
-msgid "toggle the cell"
-msgstr "p�rslēgt šūnu"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "izvērst"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
-msgid "expands the row in the ETree containing this cell"
-msgstr "izvērš rindu šo šūnu saturošaj� ETree"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "sakļaut"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
-msgid "collapses the row in the ETree containing this cell"
-msgstr "sakļauj rindu šo šūnu saturošaj� ETree"
-
-#: ../widgets/table/gal-a11y-e-cell.c:119
-msgid "Table Cell"
-msgstr "Tabulas Å¡Å«na"
-
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
-msgid "click"
-msgstr "klikšķis"
-
-#: ../widgets/table/gal-a11y-e-table-column-header.c:154
-msgid "sort"
-msgstr "k�rtot"
-
-#: ../widgets/text/e-text.c:2486
-msgid "Select All"
-msgstr "Izvēlēties visus"
-
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "Ievades metodes"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "Notikumu apstr�d�t�js"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Teksts"
-
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Treknraksts"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "Nosvītrot"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "Enkurs"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "Izlīdzin�šana"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "Saspraudes platums"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "Saspraudes augstums"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "Saspraude"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "Aizpildīt saspraudes taisnstūri"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "X nobīde"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Y nobīde"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "Testa platums"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "Teksta augstums"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "Lietot daudzpunkti"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "Daudzpunkte"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "Rindu aplaušana"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "Atdalīt�ja rakstzīmes"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "Maksimums līniju"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "Zīmēt malas"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "Atļaut jaun�s rindas"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "Zīmēt fonu"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "Zīmēt pogu"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "Kursora pozīcija"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "IM konteksts"
 
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "Vadīt izlecošo logu"
 
-#~ msgid "search bar"
-#~ msgstr "meklēšanas josla"
-
-#~ msgid "evolution calendar search bar"
-#~ msgstr "evolution kalend�ra meklēšanas josla"
-
-#~ msgid "Combo Button"
-#~ msgstr "Combo poga"
-
-#~ msgid "Activate Default"
-#~ msgstr "Uzst�dīt noklusētos"
-
-#~ msgid "Popup Menu"
-#~ msgstr "Uzlecoš� izvēlne"
-
-#~| msgid "Error loading addressbook."
-#~ msgid "Error loading address book."
-#~ msgstr "Kļūda, iel�dējot adrešu gr�matu."
-
-#~ msgid "Server Version"
-#~ msgstr "Servera versija"
-
-#~ msgid "C_ontacts"
-#~ msgstr "K_ontakti"
-
-#~| msgid "Configure autocomplete here"
-#~ msgid "Configure contacts and autocompletion here"
-#~ msgstr "Konfigurējiet kontaktus un autom�tisko pabeigšanu šeit"
-
-#~ msgid "Evolution Address Book"
-#~ msgstr "Evolution adrešu gr�mata"
-
-#~ msgid "Evolution Address Book address popup"
-#~ msgstr "Evolution adrešu gr�matas logs"
-
-#~ msgid "Evolution Address Book address viewer"
-#~ msgstr "Evolution adrešu gr�matas skatīt�js"
-
-#~ msgid "Evolution Address Book card viewer"
-#~ msgstr "Evolution adrešu gr�matas kontaktu skatīt�js"
-
-#~ msgid "Evolution Address Book component"
-#~ msgstr "Evolution adrešu gr�matas komponente"
-
-#~ msgid "Evolution S/MIME Certificate Management Control"
-#~ msgstr "Evolution S/MIME sertifik�tu p�rvaldības kontrole"
-
-#~ msgid "Evolution folder settings configuration control"
-#~ msgstr "Evolution mapju iestatījumu konfigur�cijas kontrole"
-
-#~ msgid "Manage your S/MIME certificates here"
-#~ msgstr "P�rvaldiet savus S/MIME sertifik�tus šeit"
-
-#~ msgid "Failed upgrading Address Book settings or folders."
-#~ msgstr "Neizdev�s uzlabot adrešu gr�matas iestatījumus vai mapes."
-
-#~ msgid "Base"
-#~ msgstr "B�ze"
-
-#~ msgid "Rename the \"%s\" folder to:"
-#~ msgstr "P�rsaukt mapi \"%s\" par:"
-
-#~ msgid "Rename Folder"
-#~ msgstr "P�rsaukt mapi"
-
-#~ msgid "Save As vCard..."
-#~ msgstr "Saglab�t k� vCard..."
-
-#~ msgid "Contact Source Selector"
-#~ msgstr "Kontaktu avota atlasīt�js"
-
-#~ msgid ""
-#~ "Position of the vertical pane, between the card and list views and the "
-#~ "preview pane, in pixels."
-#~ msgstr ""
-#~ "Vertik�l�s rūts atrašan�s vieta pikseļos, starp kontaktu un sarakstu "
-#~ "skatiem un priekšskatījuma rūti."
-
-#~| msgid "evolution addressbook"
-#~ msgid "Look up in address books"
-#~ msgstr "Uzmeklēt adrešu gr�mat�"
-
-#~ msgid ""
-#~ "389\n"
-#~ "636\n"
-#~ "3268"
-#~ msgstr ""
-#~ "389\n"
-#~ "636\n"
-#~ "3268"
-
-#~ msgid "<b>Authentication</b>"
-#~ msgstr "<b>Autentifik�cija</b>"
-
-#~ msgid "<b>Downloading</b>"
-#~ msgstr "<b>Lejupiel�dēšana</b>"
-
-#~ msgid "<b>Searching</b>"
-#~ msgstr "<b>Meklēšana</b>"
-
-#~| msgid "Using distinguished name (DN)"
-#~ msgid ""
-#~ "Anonymously\n"
-#~ "Using email address\n"
-#~ "Using distinguished name (DN)"
-#~ msgstr ""
-#~ "Anonīmi\n"
-#~ "Izmantojot e-pasta adresi\n"
-#~ "Izmantojot atšķiramu nosaukumu (DN)"
-
-#~ msgid ""
-#~ "Evolution will use this email address to authenticate you with the server."
-#~ msgstr "Evolution lietos šo e-pasta adresi, lai jūs autentificētu serverī."
-
-#~| msgid "One"
-#~ msgid ""
-#~ "One\n"
-#~ "Sub"
-#~ msgstr ""
-#~ "Viens\n"
-#~ "Zem"
-
-#~ msgid ""
-#~ "SSL encryption\n"
-#~ "TLS encryption\n"
-#~ "No encryption"
-#~ msgstr ""
-#~ "SSL šifrēšana\n"
-#~ "TLS šifrēšana\n"
-#~ "Bez šifrēšanas"
-
-#~ 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 ""
-#~ "Meklēšanas b�ze ir atšķiramais nosaukums (DN) no ieraksta, kur s�ksies "
-#~ "meklēšana. Ja jūs atst�siet šo tukšu, meklēšana s�ksies no direktoriju "
-#~ "koka saknes."
-
-#~| msgid ""
-#~| "This is the full name of your ldap server. For example, \"ldap.mycompany."
-#~| "com\"."
-#~ msgid ""
-#~ "This is the full name of your LDAP server. For example, \"ldap.mycompany."
-#~ "com\"."
-#~ msgstr ""
-#~ "Šis ir pilns LDAP servera nosaukums. Piemēram, \"ldap.manakompanija.com\"."
-
-#~ msgid ""
-#~ "This is the maximum number of entries to download. Setting this number to "
-#~ "be too large will slow down your address book."
-#~ msgstr ""
-#~ "Šis ir maksim�lais lejupiel�dējamo ierakstu skaits. Uzst�dot šo skaitli "
-#~ "p�rlieku lielu, tiks bremzēta jūsu adrešu gr�matas darbība."
-
-#~ msgid ""
-#~ "This is the name for this server that will appear in your Evolution "
-#~ "folder list. It is for display purposes only. "
-#~ msgstr ""
-#~ "Šis ir servera nosaukums, kas par�dīsies jūsu Evolution mapju sarakst�. "
-#~ "Tas ir tikai attēlošanas pēc. "
-
-#~ msgid "<b>Email</b>"
-#~ msgstr "<b>E-pasts</b>"
-
-#~ msgid "<b>Home</b>"
-#~ msgstr "<b>M�j�s</b>"
-
-#~ msgid "<b>Job</b>"
-#~ msgstr "<b>Darb�</b>"
-
-#~ msgid "<b>Miscellaneous</b>"
-#~ msgstr "<b>Daž�di</b>"
-
-#~| msgid "<b>Home</b>"
-#~ msgid "<b>Notes</b>"
-#~ msgstr "<b>Piezīmes</b>"
-
-#~ msgid "<b>Other</b>"
-#~ msgstr "<b>Cits</b>"
-
-#~ msgid "<b>Telephone</b>"
-#~ msgstr "<b>T�lrunis</b>"
-
-#~ msgid "<b>Work</b>"
-#~ msgstr "<b>Darb�</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mr.\n"
-#~ "Mrs.\n"
-#~ "Ms.\n"
-#~ "Miss\n"
-#~ "Dr."
-#~ msgstr ""
-#~ "\n"
-#~ "k-gs\n"
-#~ "k-dze\n"
-#~ "Prof.\n"
-#~ "jaunkundze\n"
-#~ "Dr."
-
-#~ msgid ""
-#~ "\n"
-#~ "Sr.\n"
-#~ "Jr.\n"
-#~ "I\n"
-#~ "II\n"
-#~ "III\n"
-#~ "Esq."
-#~ msgstr ""
-#~ "\n"
-#~ "Sr.\n"
-#~ "Jr.\n"
-#~ "I\n"
-#~ "II\n"
-#~ "III\n"
-#~ "Esq."
-
-#~| msgid "<b>Users:</b>"
-#~ msgid "<b>Members</b>"
-#~ msgstr "<b>Dalībnieki</b>"
-
-#~ msgid "Name begins with"
-#~ msgstr "V�rds s�kas ar"
-
-#~ msgid "_Open"
-#~ msgstr "_Atvērt"
-
-#~ msgid "_Print"
-#~ msgstr "_Druk�t"
-
-#~ msgid "Cop_y to Address Book..."
-#~ msgstr "Kopē_t uz adrešu gr�matu..."
-
-#~ msgid "Mo_ve to Address Book..."
-#~ msgstr "P�r_vietot uz adrešu gr�matu..."
-
-#~ msgid "Cu_t"
-#~ msgstr "Izgiez_t"
-
-#~ msgid "_Copy"
-#~ msgstr "_Kopēt"
-
-#~ msgid "P_aste"
-#~ msgstr "I_elīmēt"
-
-#~ msgid ""
-#~ "%s already exists\n"
-#~ "Do you want to overwrite it?"
-#~ msgstr ""
-#~ "%s jau eksistē.\n"
-#~ "Vai vēlies to p�rrakstīt?"
-
-#~ msgid "Overwrite"
-#~ msgstr "P�rrakstīt"
-
-#~ msgid "contact"
-#~ msgid_plural "contacts"
-#~ msgstr[0] "kontakts"
-#~ msgstr[1] "kontakti"
-#~ msgstr[2] "kontaktu"
-
-#~ msgid "Querying Address Book..."
-#~ msgstr "Izpilda vaic�jumu adrešu gr�mat�..."
-
-#~| msgid "New Appointment"
-#~ msgid "Save Appointment"
-#~ msgstr "Saglab�t tikšanos"
-
-#~| msgid "_Shared memo"
-#~ msgid "Save Memo"
-#~ msgstr "Saglab�t memo"
-
-#~| msgid "Save As"
-#~ msgid "Save Task"
-#~ msgstr "Saglab�t uzdevumu"
-
-#~ msgid "Configure your timezone, Calendar and Task List here "
-#~ msgstr "Konfigurējiet laika joslu, kalend�ru un uzdevumu sarakstu šeit"
-
-#~ msgid "Evolution Calendar and Tasks"
-#~ msgstr "Evolution kalend�rs un uzdevumi"
-
-#~ msgid "Evolution Calendar configuration control"
-#~ msgstr "Evolution kalend�ra konfigur�cijas kontrole"
-
-#~ msgid "Evolution Calendar scheduling message viewer"
-#~ msgstr "Evolution kalend�ra grafika ziņu p�rlūks"
-
-#~ msgid "Evolution Calendar/Task editor"
-#~ msgstr "Evolution kalend�ra/uzdevumu redaktors"
-
-#~ msgid "Evolution's Calendar component"
-#~ msgstr "Evolution kalend�ra komponente"
-
-#~ msgid "Evolution's Memos component"
-#~ msgstr "Evolution memo komponente"
-
-#~ msgid "Evolution's Tasks component"
-#~ msgstr "Evolution uzdevumu komponente"
-
-#~ msgid "Memo_s"
-#~ msgstr "Mem_o"
-
-#~ msgid "_Calendars"
-#~ msgstr "_Kalend�ri"
-
-#~ msgid "Evolution Calendar alarm notification service"
-#~ msgstr "Evolution kalend�ra trauksmes paziņojumu serviss"
-
-#~ msgid "Could not initialize Bonobo"
-#~ msgstr "Nevar inicializēt Bonobo"
-
-#~ msgid ""
-#~ "Could not create the alarm notify service factory, maybe it's already "
-#~ "running..."
-#~ msgstr ""
-#~ "Neizdev�s izveidot trauksmes paziņošanas servisa ražotni, varbūt t� jau "
-#~ "ir palaista..."
-
-#~ msgid "Check this to use system timezone in Evolution."
-#~ msgstr "Atzīmējiet šo, lai Evolution izmantotu laika joslas."
-
-#~ msgid ""
-#~ "Position of the vertical pane, between the task list and the task preview "
-#~ "pane, in pixels."
-#~ msgstr ""
-#~ "Vertik�l� paneļa atrašan�s vieta uzdevumu sarakstu un uzdevuma "
-#~ "priekšskatījuma paneli, pikseļos."
-
-#~ msgid "Show the \"Preview\" pane."
-#~ msgstr "R�dīt \"Priekšskatījums\" paneli."
-
-#~ msgid "Category is"
-#~ msgstr "Kategorija ir"
-
-#~ msgid "Comment contains"
-#~ msgstr "Koment�ri satur"
-
-#~ msgid "Location contains"
-#~ msgstr "Atrašan�s vieta satur"
-
-#~ msgid "_Make available for offline use"
-#~ msgstr "_Padarīt pieejamu lietošanai nesaistē"
-
-#~ msgid "_Do not make available for offline use"
-#~ msgstr "_Nepadarīt pieejamu lietošanai nesaistē"
-
-#~ msgid "Failed upgrading calendars."
-#~ msgstr "Neizdev�s uzlabot kalend�ru."
-
-#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
-#~ msgstr "Nevar atvērt kalend�ru '%s', lai ievietotu notikumus un tikšan�s"
-
-#~ msgid "There is no calendar available for creating events and meetings"
-#~ msgstr "Nav pieejams kalend�rs notikumu un tikšanos izveidošanai"
-
-#~ msgid "New appointment"
-#~ msgstr "Jauna tikšan�s"
-
-#~ msgid "New meeting"
-#~ msgstr "Jauna san�ksme"
-
-#~ msgid "New all day appointment"
-#~ msgstr "Jauna tikšan�s visai dienai"
-
-#~ msgid "Error while opening the calendar"
-#~ msgstr "Kļūda, atverot kalend�ru"
-
-#~ msgid "Method not supported when opening the calendar"
-#~ msgstr "Metode nav atbalstīta, atverot kalend�ru"
-
-#~ msgid "Permission denied to open the calendar"
-#~ msgstr "Atļauja atvērt kalend�ru ir liegta"
-
-#~ msgid "<b>Alarm</b>"
-#~ msgstr "<b>Trauksme</b>"
-
-#~ msgid "<b>Options</b>"
-#~ msgstr "<b>Opcijas</b>"
-
-#~| msgid "before"
-#~ msgid ""
-#~ "before\n"
-#~ "after"
-#~ msgstr ""
-#~ "pirms\n"
-#~ "pēc"
-
-#~| msgid ""
-#~| "Minutes\n"
-#~| "Hours\n"
-#~| "Days"
-#~ msgid ""
-#~ "minute(s)\n"
-#~ "hour(s)\n"
-#~ "day(s)"
-#~ msgstr ""
-#~ "minūti(-es)\n"
-#~ "stundu(-as)\n"
-#~ "dienu(-as)"
-
-#~| msgid ""
-#~| "Minutes\n"
-#~| "Hours\n"
-#~| "Days"
-#~ msgid ""
-#~ "minutes\n"
-#~ "hours\n"
-#~ "days"
-#~ msgstr ""
-#~ "minūtes\n"
-#~ "stundas\n"
-#~ "dienas"
-
-#~| msgid "start of appointment"
-#~ msgid ""
-#~ "start of appointment\n"
-#~ "end of appointment"
-#~ msgstr ""
-#~ "tikšan�s s�kums\n"
-#~ "tikšan�s beigas"
-
-#~ msgid "Attach file(s)"
-#~ msgstr "Pievienot failu(s)"
-
-#~ msgid ""
-#~ "60 minutes\n"
-#~ "30 minutes\n"
-#~ "15 minutes\n"
-#~ "10 minutes\n"
-#~ "05 minutes"
-#~ msgstr ""
-#~ "60 minūtes\n"
-#~ "30 minūtes\n"
-#~ "15 minūtes\n"
-#~ "10 minūtes\n"
-#~ "05 minūtes"
-
-#~| msgid "<span weight=\"bold\">Alerts</span>"
-#~ msgid "<span weight=\"bold\">Alarms</span>"
-#~ msgstr "<span weight=\"bold\">Trauksmes</span>"
-
-#~ msgid "<span weight=\"bold\">Alerts</span>"
-#~ msgstr "<span weight=\"bold\">Trauksmes</span>"
-
-#~| msgid "<span weight=\"bold\">Time</span>"
-#~ msgid "<span weight=\"bold\">Date/Time Format</span>"
-#~ msgstr "<span weight=\"bold\">Laika/datuma form�ts</span>"
-
-#~ msgid "<span weight=\"bold\">Task List</span>"
-#~ msgstr "<span weight=\"bold\">Uzdevumu saraksts</span>"
-
-#~ msgid "<span weight=\"bold\">Time</span>"
-#~ msgstr "<span weight=\"bold\">Laiks</span>"
-
-#~ msgid "<span weight=\"bold\">Work Week</span>"
-#~ msgstr "<span weight=\"bold\">Darba nedēļa</span>"
-
-#~ msgid ""
-#~ "Minutes\n"
-#~ "Hours\n"
-#~ "Days"
-#~ msgstr ""
-#~ "Minūtes\n"
-#~ "Stundas\n"
-#~ "Dienas"
-
-#~ msgid ""
-#~ "Monday\n"
-#~ "Tuesday\n"
-#~ "Wednesday\n"
-#~ "Thursday\n"
-#~ "Friday\n"
-#~ "Saturday\n"
-#~ "Sunday"
-#~ msgstr ""
-#~ "Pirmdiena\n"
-#~ "Otrdiena\n"
-#~ "Trešdiena\n"
-#~ "Ceturtdiena\n"
-#~ "Piektdiena\n"
-#~ "Sestdiena\n"
-#~ "Svētdiena"
-
-#~ msgid "_Add "
-#~ msgstr "_Pievienot "
-
-#~ msgid ""
-#~ "15 minutes before appointment\n"
-#~ "1 hour before appointment\n"
-#~ "1 day before appointment"
-#~ msgstr ""
-#~ "15 minūtes pirms tikšan�s\n"
-#~ "1 stundu pirms tikšan�s\n"
-#~ "1 dienu pirms tikšan�s"
-
-#~ msgid ""
-#~ "a\n"
-#~ "b"
-#~ msgstr ""
-#~ "a\n"
-#~ "b"
-
-#~ msgid "<b>Preview</b>"
-#~ msgstr "<b>Priekšskatījums</b>"
-
-#~ msgid "<b>Recurrence</b>"
-#~ msgstr "<b>Atk�rtošan�s</b>"
-
-#~ msgid ""
-#~ "day(s)\n"
-#~ "week(s)\n"
-#~ "month(s)\n"
-#~ "year(s)"
-#~ msgstr ""
-#~ "dienu(-as)\n"
-#~ "nedēļu(-as)\n"
-#~ "mēnesi(-šus)\n"
-#~ "gadu(-us)"
-
-#~ msgid ""
-#~ "for\n"
-#~ "until\n"
-#~ "forever"
-#~ msgstr ""
-#~ " \n"
-#~ "līdz\n"
-#~ "mūžīgi"
-
-#~ msgid "<span weight=\"bold\">Miscellaneous</span>"
-#~ msgstr "<span weight=\"bold\">Daž�di</span>"
-
-#~ msgid "<span weight=\"bold\">Status</span>"
-#~ msgstr "<span weight=\"bold\">Statuss</span>"
-
-#~ msgid ""
-#~ "High\n"
-#~ "Normal\n"
-#~ "Low\n"
-#~ "Undefined"
-#~ msgstr ""
-#~ "Augsts\n"
-#~ "Norm�ls\n"
-#~ "Zems\n"
-#~ "Nedefinēts"
-
-#~ msgid ""
-#~ "Not Started\n"
-#~ "In Progress\n"
-#~ "Completed\n"
-#~ "Canceled"
-#~ msgstr ""
-#~ "Nav s�kts\n"
-#~ "Tiek izpildīts\n"
-#~ "Izpildīts\n"
-#~ "Atcelts"
-
-#~ msgid "_Save As..."
-#~ msgstr "_Saglab�t k�..."
-
-#~| msgid "_Print..."
-#~ msgid "P_rint..."
-#~ msgstr "D_ruk�t..."
-
-#~ msgid "C_ut"
-#~ msgstr "I_zgriezt"
-
-#~ msgid "_Paste"
-#~ msgstr "_Ielīmēt"
-
-#~ msgid "_Mark Selected Tasks as Complete"
-#~ msgstr "_Atzīmēt izvēlētos uzdevumus k� izpildītus"
-
-#~ msgid "_Mark Selected Tasks as Incomplete"
-#~ msgstr "_Atzīmēt izvēlētos uzdevumus k� nepabeigtus"
-
-#~ msgid "_Delete Selected Tasks"
-#~ msgstr "_Dzēst izvēlētos uzdevumus"
-
-#~ msgid "Select T_oday"
-#~ msgstr "Izvēlēties š_odienu"
-
-#~ msgid "_Select Date..."
-#~ msgstr "Izvēlietie_s datumu..."
-
-#~| msgid "_Print..."
-#~ msgid "Pri_nt..."
-#~ msgstr "_Druk�t..."
-
-#~ msgid "_Delete Selected Memos"
-#~ msgstr "_Dzēst izvēlētos memo"
-
-#~ msgid "Deleting selected objects..."
-#~ msgstr "Dzēš izvēlētos objektus..."
-
-#~ msgid "Completing tasks..."
-#~ msgstr "Izpilda uzdevumus..."
-
-#~ msgid "_Custom View"
-#~ msgstr "_Piel�gots skats"
-
-#~ msgid "_Save Custom View"
-#~ msgstr "_Saglab�t piel�gotu skatu"
-
-#~ msgid "_Define Views..."
-#~ msgstr "_Definēt skatus..."
-
-#~ msgid "Loading appointments at %s"
-#~ msgstr "Iel�dē tikšan�s no %s"
-
-#~ msgid "Loading tasks at %s"
-#~ msgstr "Iel�dē uzdevumus no %s"
-
-#~ msgid "Loading memos at %s"
-#~ msgstr "Iel�dē memo no %s"
-
-#~ msgid ""
-#~ "January\n"
-#~ "February\n"
-#~ "March\n"
-#~ "April\n"
-#~ "May\n"
-#~ "June\n"
-#~ "July\n"
-#~ "August\n"
-#~ "September\n"
-#~ "October\n"
-#~ "November\n"
-#~ "December"
-#~ msgstr ""
-#~ "Janv�ris\n"
-#~ "Febru�ris\n"
-#~ "Marts\n"
-#~ "Aprīlis\n"
-#~ "Maijs\n"
-#~ "JÅ«nijs\n"
-#~ "JÅ«lijs\n"
-#~ "Augusts\n"
-#~ "Septembris\n"
-#~ "Oktobris\n"
-#~ "Novembris\n"
-#~ "Decembris"
-
-#~ msgid "Failed upgrading memos."
-#~ msgstr "Neizdev�s uzlabot memo."
-
-#~ msgid "Unable to open the memo list '%s' for creating events and meetings"
-#~ msgstr ""
-#~ "Nevar atvērt memo sarakstu '%s', lai izveidotu notikumu vai tikšanos"
-
-#~ msgid "There is no calendar available for creating memos"
-#~ msgstr "Nav pieejamu kalend�ru memo izveidei"
-
-#~ msgid "New shared memo"
-#~ msgstr "Jauns koplietošanas memo"
-
-#~ msgid "New memo list"
-#~ msgstr "Jaunus memo saraksts"
-
-#~| msgid "Memo li_st"
-#~ msgctxt "New"
-#~ msgid "Memo li_st"
-#~ msgstr "Memo _saraksts"
-
-#~ msgid "Failed upgrading tasks."
-#~ msgstr "Neizdev�s uzlabojot uzdevumus."
-
-#~ msgid "Unable to open the task list '%s' for creating events and meetings"
-#~ msgstr "Nevar atvērt uzdevumu sarakstu '%s' notikumu un tikšanos izveidei"
-
-#~ msgid "There is no calendar available for creating tasks"
-#~ msgstr "Nav pieejams kalend�rs uzdevumu izveidei"
-
-#~ msgid "New task"
-#~ msgstr "Jauns uzdevums"
-
-#~ msgid "New assigned task"
-#~ msgstr "Jauns piešķirtais uzdevums"
-
-#~ msgid "New task list"
-#~ msgstr "Jauns uzdevumu saraksts"
-
-#~| msgid "Tas_k list"
-#~ msgctxt "New"
-#~ msgid "Tas_k list"
-#~ msgstr "Uzdevumu sara_ksts"
-
-#~ msgid "_Security"
-#~ msgstr "_Drošība"
-
-#~ msgid "Directories can not be attached to Messages."
-#~ msgstr "Vēstulēm nevar pievienot mapes."
-
-#~| msgid ""
-#~| "Send options available only for Novell Groupwise and Microsoft Exchange "
-#~| "accounts."
-#~ msgid ""
-#~ "Send options available only for Novell GroupWise and Microsoft Exchange "
-#~ "accounts."
-#~ msgstr ""
-#~ "Sūtīšanas iestatījumi ir pieejami tikai Novell Groupwise un Microsoft "
-#~ "Exchange kontiem."
-
-#~ msgid "Send options not available."
-#~ msgstr "Sūtīšanas opcija nav pieejama."
-
-#~ 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 ""
-#~ "Lai pievienotu Å¡Ä«s mapes saturu, vai nu pievienojiet katru failu "
-#~ "atsevišķi, vai izveidojiet mapes arhīvu un pievienojiet to."
-
-#~ msgid "Unfinished messages found"
-#~ msgstr "Atrastas nepabeigtas vēstules"
-
-#~ msgid "Warning: Modified Message"
-#~ msgstr "Brīdin�jums: mainīta vēstule"
-
-#~ msgid "Evolution Information"
-#~ msgstr "Evolution inform�cija"
-
-#~ msgid "Evolution Query"
-#~ msgstr "Evolution vaic�jums"
-
-#~| msgid "Complete"
-#~ msgid "Component"
-#~ msgstr "Komponente"
-
-#~ msgid "Overwrite file?"
-#~ msgstr "P�rrakstīt failu?"
-
-#~ msgid "Label name cannot be empty."
-#~ msgstr "Etiķetes nosaukums nevar būt tukšs."
-
-#~ msgid ""
-#~ "A label having the same tag already exists on the server. Please rename "
-#~ "your label."
-#~ msgstr ""
-#~ "Etiķete ar t�du pašu birku jau atrodas uz servera. Lūdzu, p�rsauciet "
-#~ "etiÄ·eti."
-
-#~ msgid "Test"
-#~ msgstr "Tests"
-
-#~ msgid "<b>_Filter Rules</b>"
-#~ msgstr "<b>_Filtra k�rtulas</b>"
-
-#~ msgid ""
-#~ "seconds\n"
-#~ "minutes\n"
-#~ "hours\n"
-#~ "days\n"
-#~ "weeks\n"
-#~ "months\n"
-#~ "years"
-#~ msgstr ""
-#~ "sekundēm\n"
-#~ "minūtēm\n"
-#~ "stund�m\n"
-#~ "dien�m\n"
-#~ "nedēļ�m\n"
-#~ "mēnešiem\n"
-#~ "gadiem"
-
-#~ msgid "Rule name"
-#~ msgstr "K�rtulas nosaukums"
-
-#~ msgid ""
-#~ "Configure mail preferences, including security and message display, here"
-#~ msgstr ""
-#~ "Konfigurējiet pasta iestatījumus, ieskaitot drošību un vēstuļu attēlošanu "
-#~ "Å¡eit"
-
-#~ msgid "Configure spell-checking, signatures, and the message composer here"
-#~ msgstr ""
-#~ "Konfigurējiet pareizrakstības p�rbaudi, parakstus un vēstuļu redaktoru "
-#~ "Å¡eit"
-
-#~| msgid "Configure your email accounts here"
-#~ msgid "Configure your network connection settings here"
-#~ msgstr "Konfigurējiet savus tīkla savienojumu iestatījumus šeit"
-
-#~ msgid "Evolution Mail"
-#~ msgstr "Evolution pasts"
-
-#~ msgid "Evolution Mail accounts configuration control"
-#~ msgstr "Evolution pasta kontu konfigur�cijas vadīkla"
-
-#~ msgid "Evolution Mail component"
-#~ msgstr "Evolution pasta komponente"
-
-#~ msgid "Evolution Mail composer"
-#~ msgstr "Evolution pasta redaktors"
-
-#~ msgid "Evolution Mail composer configuration control"
-#~ msgstr "Evolution pasta redaktora konfigur�cijas vadīkla"
-
-#~ msgid "Evolution Mail preferences control"
-#~ msgstr "Evolution pasta iestatījumu vadīkla"
-
-#~| msgid "Evolution Calendar configuration control"
-#~ msgid "Evolution Network configuration control"
-#~ msgstr "Evolution tīkla konfigur�cijas vadīkla"
-
-#~ msgid "[Default]"
-#~ msgstr "[Noklusētais]"
-
-#~ msgid "Signature(s)"
-#~ msgstr "Paraksts(-i)"
-
-#~ msgid "_Copy to Folder"
-#~ msgstr "_Kopēt uz mapi"
-
-#~ msgid "_Move to Folder"
-#~ msgstr "_P�rvietot uz mapi"
-
-#~ msgid "Cancel _Drag"
-#~ msgstr "Atcelt _vilkšanu"
-
-#~ msgid "Open in _New Window"
-#~ msgstr "Atvērt jau_n� log�"
-
-#~ msgid "_Move..."
-#~ msgstr "_P�rvietot..."
-
-#~| msgid "Create _Search Folder"
-#~ msgid "_Unread Search Folder"
-#~ msgstr "Nelasīt_o meklēšanas mape"
-
-#~ msgid "U_ndelete"
-#~ msgstr "Atjau_not"
-
-#~ msgid "Fla_g Completed"
-#~ msgstr "Atzīmēt k� pabei_gts"
-
-#~ msgid "Cl_ear Flag"
-#~ msgstr "Notīrī_t atzīmējumu"
-
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "Izveidot k�r_tulu no vēstules"
-
-#~ msgid "Search Folder based on _Subject"
-#~ msgstr "Meklēšana_s mape no temata"
-
-#~ msgid "Search Folder based on Se_nder"
-#~ msgstr "Meklēša_nas mape no sūtīt�ja"
-
-#~ msgid "Search Folder based on _Recipients"
-#~ msgstr "Meklēšanas ma_pe no saņēmējiem"
-
-#~ msgid "Filter based on Sub_ject"
-#~ msgstr "Filtrs no _temata"
-
-#~ msgid "Filter based on Sen_der"
-#~ msgstr "Filt_rs no sūtīt�ja"
-
-#~ msgid "Filter based on Re_cipients"
-#~ msgstr "Fil_trs no sūtīt�ja"
-
-#~ msgid "Filter based on _Mailing List"
-#~ msgstr "Filtrs no a_dres�tu saraksta"
-
-#~ msgid "_Fit to Width"
-#~ msgstr "Piel�got _platumam"
-
-#~ msgid "Save As..."
-#~ msgstr "Saglab�t k�..."
-
-#~ msgid "untitled_image.%s"
-#~ msgstr "nenosaukts_attēls.%s"
-
-#~ msgid "_Reply to sender"
-#~ msgstr "_Atbildēt sūtīt�jam"
-
-#~ msgid "Open in %s..."
-#~ msgstr "Atvērt ar %s..."
-
-#~ msgid "message"
-#~ msgstr "vēstule"
-
-#~ msgid "Save Message..."
-#~ msgstr "Saglab�t vēstuli..."
-
-#~ msgid "Add address"
-#~ msgstr "Pievienot adresi"
-
-#~ msgid "Default height of the message window."
-#~ msgstr "Vēstules loga noklusētais augstums."
-
-#~ msgid "Default width of the message window."
-#~ msgstr "Vēstules loga noklusētais platums."
-
-#~ msgid ""
-#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
-#~ "vertically."
-#~ msgstr ""
-#~ "Ja ir aktivizēts \"Priekšskatījums\" panelis, r�dīt to malu-pie-malas "
-#~ "nevis vertik�li."
-
-#~ msgid ""
-#~ "It disables/enables the repeated prompts to ask if offline sync is "
-#~ "required before going into offline mode."
-#~ msgstr ""
-#~ "Tas ieslēdz/izslēdz atk�rtotus vaic�jumus par to, vai nesaistes "
-#~ "sinhroniz�cija ir nepieciešama pirms ieiešanas nesaistes režīm�."
-
-#~ msgid "Message Window default height"
-#~ msgstr "Vēstules loga noklusētais augstums"
-
-#~ msgid "Message Window default width"
-#~ msgstr "Vēstules loga noklusētais platums"
-
-#~ msgid "Prompt to check if the user wants to go offline immediately"
-#~ msgstr ""
-#~ "Prasīt apstiprin�jumu, ja lietot�js vēlas nekavējoties ieslēgt nesaistes "
-#~ "režīmu"
-
-#~ msgid "Thread the message list."
-#~ msgstr "R�dīt vēstules pavedien�."
-
-#~ msgid "Thread the message-list"
-#~ msgstr "R�dīt vēstules pavedien�."
-
-#~ msgid "Use side-by-side or wide layout"
-#~ msgstr "Lietot malu-pie-malas vai plato izkl�jumu"
-
-#~ msgid "New Mail Message"
-#~ msgstr "Jauna pasta vēstule"
-
-#~ msgid "New Mail Folder"
-#~ msgstr "Jauna vēstuļu mape"
-
-#~ msgid "Failed upgrading Mail settings or folders."
-#~ msgstr "Neizdev�s vēstuļu iestatījumu vai mapju uzlabošana."
-
-#~ msgid "<b>Sig_natures</b>"
-#~ msgstr "<b>_Paraksti</b>"
-
-#~ msgid "<b>_Languages</b>"
-#~ msgstr "<b>Va_lodas</b>"
-
-#~ msgid "<span weight=\"bold\">Authentication</span>"
-#~ msgstr "<span weight=\"bold\">Autentifik�cija</span>"
-
-#~ msgid "<span weight=\"bold\">Composing Messages</span>"
-#~ msgstr "<span weight=\"bold\">Vēstuļu sacerēšana</span>"
-
-#~ msgid "<span weight=\"bold\">Configuration</span>"
-#~ msgstr "<span weight=\"bold\">Konfigur�cija</span>"
-
-#~ msgid "<span weight=\"bold\">Default Behavior</span>"
-#~ msgstr "<span weight=\"bold\">Noklusēt� uzvedība</span>"
-
-#~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-#~ msgstr "<span weight=\"bold\">R�dīt�s vēstules _galvas</span>"
-
-#~| msgid "<span weight=\"bold\">Alerts</span>"
-#~ msgid "<span weight=\"bold\">Labels</span>"
-#~ msgstr "<span weight=\"bold\">EtiÄ·etes</span>"
-
-#~ msgid "<span weight=\"bold\">Loading Images</span>"
-#~ msgstr "<span weight=\"bold\">Iel�dē attēlus</span>"
-
-#~ msgid "<span weight=\"bold\">Message Display</span>"
-#~ msgstr "<span weight=\"bold\">Vēstulēs attēlošana</span>"
-
-#~ msgid "<span weight=\"bold\">Message Fonts</span>"
-#~ msgstr "<span weight=\"bold\">VÄ“stules fonti</span>"
-
-#~ msgid "<span weight=\"bold\">Message Receipts</span>"
-#~ msgstr "<span weight=\"bold\">Vēstules saņēmēji</span>"
-
-#~ msgid "<span weight=\"bold\">Optional Information</span>"
-#~ msgstr "<span weight=\"bold\">Papildus inform�cija</span>"
-
-#~ msgid "<span weight=\"bold\">Options</span>"
-#~ msgstr "<span weight=\"bold\">Opcijas</span>"
-
-#~ msgid "<span weight=\"bold\">Printed Fonts</span>"
-#~ msgstr "<span weight=\"bold\">Druk�tie fonti</span>"
-
-#~| msgid "<span weight=\"bold\">Status</span>"
-#~ msgid "<span weight=\"bold\">Proxy Settings</span>"
-#~ msgstr "<span weight=\"bold\">Starpnieka iestatījumi</span>"
-
-#~ msgid "<span weight=\"bold\">Required Information</span>"
-#~ msgstr "<span weight=\"bold\">Oblig�t� inform�cija</span>"
-
-#~ msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-#~ msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-
-#~ msgid "<span weight=\"bold\">Security</span>"
-#~ msgstr "<span weight=\"bold\">Drošība</span>"
-
-#~ msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-#~ msgstr "<span weight=\"bold\">Nosūtīt�s un melnraksta vēstules</span>"
-
-#~ msgid "<span weight=\"bold\">Server Configuration</span>"
-#~ msgstr "<span weight=\"bold\">Servera konfigur�cija</span>"
-
-#~ msgid "<span weight=\"bold\">_Authentication Type</span>"
-#~ msgstr "<span weight=\"bold\">_Autentifik�cijas veids</span>"
-
-#~ msgid ""
-#~ "Attachment\n"
-#~ "Inline\n"
-#~ "Quoted"
-#~ msgstr ""
-#~ "Pielikums\n"
-#~ "Iekļauts\n"
-#~ "Citēts"
-
-#~ msgid ""
-#~ "Attachment\n"
-#~ "Inline (Outlook style)\n"
-#~ "Quoted\n"
-#~ "Do not quote"
-#~ msgstr ""
-#~ "Pielikums\n"
-#~ "Iekļauts (Outlook stils)\n"
-#~ "Citēts\n"
-#~ "Necitēt"
-
-#~ msgid "Baltic (ISO-8859-13)"
-#~ msgstr "Baltijas (ISO-8859-13)"
-
-#~ msgid "Baltic (ISO-8859-4)"
-#~ msgstr "Baltijas (ISO-8859-4)"
-
-#~ msgid "Email Accounts"
-#~ msgstr "E-pasta konti"
-
-#~ msgid ""
-#~ "If the server uses a non-standard port then specify the server address as "
-#~ "\"server-name:port-number\""
-#~ msgstr ""
-#~ "Ja serveris izmanto nestandarta portu, tad nor�diet servera adresi form� "
-#~ "\"servera_v�rds:porta_numurs\""
-
-#~ msgid "Message Composer"
-#~ msgstr "Vēstuļu sacerēt�js"
-
-#~ msgid "Signatures Table"
-#~ msgstr "Parakstu tabula"
-
-#~ msgid "<b>Search Folder Sources</b>"
-#~ msgstr "<b>Meklēšanas mapes avoti</b>"
-
-#~ msgid "<span weight=\"bold\">Digital Signature</span>"
-#~ msgstr "<span weight=\"bold\">Ciparu paraksts</span>"
-
-#~ msgid "<span weight=\"bold\">Encryption</span>"
-#~ msgstr "<span weight=\"bold\">Šifrēšana</span>"
-
-#~| msgid "Deleted: "
-#~ msgid "Delete \"{0}\"?"
-#~ msgstr "Dzēst \"{0}\"?"
-
-#~| msgid "Copy selected messages to another folder"
-#~ msgid "Delete messages in Search Folder?"
-#~ msgstr "Dzēst vēstules meklēšanas mapē?"
-
-#~ msgid "Discard changes?"
-#~ msgstr "Atmest izmaiņas?"
-
-#~ msgid "Mark all messages as read"
-#~ msgstr "Atzīmēt visas vēstules k� lasītas"
-
-#~ msgid "Querying server"
-#~ msgstr "Vaic� serveri"
-
-#~| msgid "Subject or Sender contains"
-#~ msgid "Subject or Recipients contains"
-#~ msgstr "Vēstules tēma vai saņēmējs satur"
-
-#~ msgid "Subject or Sender contains"
-#~ msgstr "Vēstules tēma vai sūtīt�js satur"
-
-#~| msgid "Audio inline plugin"
-#~ msgid "Audio Inline"
-#~ msgstr "Iekļauts audio"
-
-#~| msgid "Copy tool"
-#~ msgid "Copy Tool"
-#~ msgstr "Kopēšanas rīks"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Atvērt cita lietot�ja mapi"
-
-#~ msgid "_Account:"
-#~ msgstr "_Konts:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Mapes nosaukums:"
-
-#~ msgid "_User:"
-#~ msgstr "_Lietot�s:"
-
-#~ msgid "Secure Password"
-#~ msgstr "Droša parole"
-
-#~ msgid ""
-#~ "This option will connect to the Exchange server using secure password "
-#~ "(NTLM) authentication."
-#~ msgstr ""
-#~ "Šī opcija savienosies ar Exchange serveri, lietojot drošas paroles (NTLM) "
-#~ "autentificēšanu."
-
-#~ msgid "Plaintext Password"
-#~ msgstr "Parasta teksta parole"
-
-#~ msgid ""
-#~ "This option will connect to the Exchange server using standard plaintext "
-#~ "password authentication."
-#~ msgstr ""
-#~ "Å Ä« opcija savienosies ar Exchange serveri, lietojot standarta parasta "
-#~ "teksta paroles autentificēšanu."
-
-#~ msgid "Out Of Office"
-#~ msgstr "Ä€rpus biroja"
-
-#~ 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 ""
-#~ "Ziņa nor�dīta zem�k tiks autom�tiski sūtīta \n"
-#~ "katrai personai, kas sūta jums pastu, kamēr jūs esat �rpus biroja."
-
-#~ msgid "I am out of the office"
-#~ msgstr "Es esmu �rpus biroja"
-
-#~ msgid "I am in the office"
-#~ msgstr "Es esmu biroj�"
-
-#~ msgid "Change the password for Exchange account"
-#~ msgstr "Mainīt paroli Exchange kontam"
-
-#~ msgid "Change Password"
-#~ msgstr "Mainīt paroli"
-
-#~ msgid "Manage the delegate settings for Exchange account"
-#~ msgstr "P�rvaldīt deleg�tu iestatījumus Exchange kontam"
-
-#~ msgid "Delegation Assistant"
-#~ msgstr "Pilnvaru nodošanas asistents"
-
-#~ msgid "View the size of all Exchange folders"
-#~ msgstr "Skatīt izmēru vis�m Exchange mapēm"
-
-#~ msgid "Folders Size"
-#~ msgstr "Mapju izmērs"
-
-#~ msgid "_OWA URL:"
-#~ msgstr "_OWA URL:"
-
-#~ msgid "A_uthenticate"
-#~ msgstr "A_utentificēt"
-
-#~ msgid "Mailbox name is _different than user name"
-#~ msgstr "Pasta kastes nosaukums _atšķiras no lietot�jv�rda"
-
-#~| msgid "_Mail"
-#~ msgid "_Mailbox:"
-#~ msgstr "_Pasta kaste:"
-
-#~ msgid "%s KB"
-#~ msgstr "%s KB"
-
-#~ msgid "0 KB"
-#~ msgstr "0 KB"
-
-#~ msgid "Size:"
-#~ msgstr "Izmērs:"
-
-#~ msgid ""
-#~ "Evolution is in offline mode. You cannot create or modify folders now.\n"
-#~ "Please switch to online mode for such operations."
-#~ msgstr ""
-#~ "Evolution ir nesaistes režīm�. Jūs pašlaik nevarat izveidot vai mainīt "
-#~ "mapes.\n"
-#~ "Lai veiktu šīs darbības, lūdzu, p�rslēdzieties tiešsaistes režīm�."
-
-#~ msgid ""
-#~ "The current password does not match the existing password for your "
-#~ "account. Please enter the correct password"
-#~ msgstr ""
-#~ "Pašreizēj� parole neatbilst jūsu konta eksistējošai parolei. Lūdzu, "
-#~ "ievadiet pareizo paroli"
-
-#~ msgid "The two passwords do not match. Please re-enter the passwords."
-#~ msgstr "Paroles nesakrīt. Lūdzu, ievadiet paroli atk�rtoti."
-
-#~ msgid "Confirm Password:"
-#~ msgstr "Apstiprin�t paroli:"
-
-#~ msgid "Current Password:"
-#~ msgstr "Pašreizēj� parole:"
-
-#~ msgid "New Password:"
-#~ msgstr "Jaun� parole:"
-
-#~ 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."
-
-#~ msgid "Your password will expire in the next %d days"
-#~ msgstr "Jūsu paroles termiņš beigsies pēc %d dien�m"
-
-#~ msgid "Custom"
-#~ msgstr "Piel�gots"
-
-#~ msgid "Editor (read, create, edit)"
-#~ msgstr "Redaktors (lasīt, izveidot, rediģēt)"
-
-#~ msgid "Author (read, create)"
-#~ msgstr "Autors (lasīt, izveidot)"
-
-#~ msgid "Reviewer (read-only)"
-#~ msgstr "Recenzents (lasīšanas režīms)"
-
-#~ msgid "Delegate Permissions"
-#~ msgstr "Deleg�ta atļauja"
-
-#~ msgid "Permissions for %s"
-#~ msgstr "Atļaujas priekš %s"
-
-#~ msgid ""
-#~ "This message was sent automatically by Evolution to inform you that you "
-#~ "have been designated as a delegate. You can now send messages on my "
-#~ "behalf."
-#~ msgstr ""
-#~ "Šo vēstuli Evolution autom�tiski ir nosūtījis, lai informētu jūs, ka esat "
-#~ "izraudzīts/-a par deleg�tu. Jūs tagad varat sūtīt vēstules man� v�rd�."
-
-#~ msgid "You have been given the following permissions on my folders:"
-#~ msgstr "Jums ir dotas sekojoš�s tiesības man�m mapēm:"
-
-#~ msgid "You are also permitted to see my private items."
-#~ msgstr "Jums ir arī dota iespēja redzēt manas priv�t�s lietas."
-
-#~ msgid "However you are not permitted to see my private items."
-#~ msgstr "Ta�u jums nav atļauts redzēt manas priv�t�s lietas."
-
-#~ msgid "You have been designated as a delegate for %s"
-#~ msgstr "Jūs esat izraudzīts k� %s deleg�ts"
-
-#~ msgid "Remove the delegate %s?"
-#~ msgstr "Izņemt deleg�tu %s?"
-
-#~ msgid "Could not access Active Directory"
-#~ msgstr "Nevarēja piekļūt aktīvai direktorijai"
-
-#~ msgid "Could not find self in Active Directory"
-#~ msgstr "Nevarēja atrast sevi aktīv� direktorij�"
-
-#~ msgid "Could not find delegate %s in Active Directory"
-#~ msgstr "Nevarēja atrast deleg�tu %s aktīv� direktorij�"
-
-#~ msgid "Could not remove delegate %s"
-#~ msgstr "Nevarēja izņemt deleg�tu %s"
-
-#~ msgid "Could not update list of delegates."
-#~ msgstr "Nevarēja atjaunin�t deleg�tu sarakstu."
-
-#~ msgid "Could not add delegate %s"
-#~ msgstr "Nevarēja pievienot deleg�tu %s"
-
-#~ msgid "Error reading delegates list."
-#~ msgstr "Kļūda, nolasot deleg�tu sarakstu."
-
-#~ msgid "C_alendar:"
-#~ msgstr "K_alend�rs:"
-
-#~ msgid "Co_ntacts:"
-#~ msgstr "Ko_ntakti:"
-
-#~ msgid "Delegates"
-#~ msgstr "Deleg�ti"
-
-#~ msgid ""
-#~ "None\n"
-#~ "Reviewer (read-only)\n"
-#~ "Author (read, create)\n"
-#~ "Editor (read, create, edit)"
-#~ msgstr ""
-#~ "Nav\n"
-#~ "Recenzents (lasīšanas režīms)\n"
-#~ "Autors (lasīt, izveidot)\n"
-#~ "Redaktors (lasīt, izveidot, rediģēt)"
-
-#~ msgid "Permissions for"
-#~ msgstr "Atļaujas priekš"
-
-#~ msgid ""
-#~ "These users will be able to send mail on your behalf\n"
-#~ "and access your folders with the permissions you give them."
-#~ msgstr ""
-#~ "Šie lietot�ji varēs sūtīt pastu jūsu v�rd�\n"
-#~ "un piekļūt jūsu mapēm ar jūsu dotaj�m tiesīb�m."
-
-#~ msgid "_Delegate can see private items"
-#~ msgstr "_Deleg�ts var redzēt priv�tas lietas"
-
-#~ msgid "_Inbox:"
-#~ msgstr "_Iesūtne:"
-
-#~ msgid "_Summarize permissions"
-#~ msgstr "_Kopsavilkt atļaujas"
-
-#~ msgid "Permissions..."
-#~ msgstr "Atļaujas..."
-
-#~ msgid "Folder Name"
-#~ msgstr "Mapes nosaukums"
-
-#~ msgid "Folder Size"
-#~ msgstr "Mapes izmērs"
-
-#~| msgid "_User"
-#~ msgid "User"
-#~ msgstr "Lietot�js"
-
-#~ msgid "Subscribe to Other User's Folder"
-#~ msgstr "Parakstīties uz cita lietot�ja mapi"
-
-#~ msgid "Exchange Folder Tree"
-#~ msgstr "Exchange mapju koku"
-
-#~ msgid "Unsubscribe Folder..."
-#~ msgstr "Atrakstīt mapi..."
-
-#~ msgid "Really unsubscribe from folder \"%s\"?"
-#~ msgstr "Tieš�m atrakstīties no mapes \"%s\"?"
-
-#~ msgid "Unsubscribe from \"%s\""
-#~ msgstr "Atrakstīties no \"%s\""
-
-#~ msgid ""
-#~ "<b>Currently, your status is \"Out of the Office\". </b>\n"
-#~ "\n"
-#~ "Would you like to change your status to \"In the Office\"? "
-#~ msgstr ""
-#~ "<b>Pašlaik jūsu status ir \"�rpus biroja\". </b>\n"
-#~ "\n"
-#~ "Vai jūs vēlaties nomainīt savu statusu uz \"Biroj�\"? "
-
-#~ msgid "<b>Out of Office Message:</b>"
-#~ msgstr "<b>Ārpus biroja ziņojums:</b>"
-
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>Statuss:</b>"
-
-#~ msgid ""
-#~ "<small>The message specified below will be automatically sent to each "
-#~ "person who sends\n"
-#~ "mail to you while you are out of the office.</small>"
-#~ msgstr ""
-#~ "<small>Šis ziņojums tiks autom�tiski nosūtīts visiem, \n"
-#~ "kas sūtu jums vēstuli, kamēr jūs esat �rpus biroja.</small>"
-
-#~ msgid "I am currently in the office"
-#~ msgstr "Es pašlaik atrodos biroj�"
-
-#~ msgid "I am currently out of the office"
-#~ msgstr "Es pašlaik atrodos �rpus biroja"
-
-#~ msgid "No, Don't Change Status"
-#~ msgstr "Nē, nemainīt statusu"
-
-#~ msgid "Out of Office Assistant"
-#~ msgstr "Ä€rpus biroja asistents"
-
-#~ msgid "Yes, Change Status"
-#~ msgstr "J�, nomainīt statusu"
-
-#~ msgid "Password Expiry Warning..."
-#~ msgstr "Paroles termiņa izbeigšan�s brīdin�jums..."
-
-#~ msgid "Your password will expire in 7 days..."
-#~ msgstr "Jūsu paroles termiņš beigsies pēc 7 dien�m..."
-
-#~ msgid "_Change Password"
-#~ msgstr "_Mainīt paroli"
-
-#~ msgid "(Permission denied.)"
-#~ msgstr "(Atļauja liegta.)"
-
-#~ msgid "Add User:"
-#~ msgstr "Pievienot lietot�ju:"
-
-#~ msgid "<b>Permissions</b>"
-#~ msgstr "<b>Atļaujas</b>"
-
-#~ msgid "Cannot Delete"
-#~ msgstr "Nevar izdzēst"
-
-#~ msgid "Cannot Edit"
-#~ msgstr "Nevar rediģēt"
-
-#~ msgid "Create items"
-#~ msgstr "Izveidot vienības"
-
-#~ msgid "Create subfolders"
-#~ msgstr "Izveidot apakšmapes"
-
-#~ msgid "Delete Any Items"
-#~ msgstr "Dzēst jebkuru vienību"
-
-#~ msgid "Delete Own Items"
-#~ msgstr "Dzēst paša vienības"
-
-#~ msgid "Edit Any Items"
-#~ msgstr "Rediģēt jebkuru vienību"
-
-#~ msgid "Edit Own Items"
-#~ msgstr "Rediģēt paša vienības"
-
-#~ msgid "Folder contact"
-#~ msgstr "Mapes kontakts"
-
-#~ msgid "Folder owner"
-#~ msgstr "Mapes īpašnieks"
-
-#~ msgid "Folder visible"
-#~ msgstr "Mape redzama"
-
-#~ msgid "Read items"
-#~ msgstr "Lasītas vienības"
-
-#~ msgid "Role: "
-#~ msgstr "Loma: "
-
-#~ msgid "<b>Message Settings</b>"
-#~ msgstr "<b>Vēstules iestatījumi</b>"
-
-#~ msgid "<b>Tracking Options</b>"
-#~ msgstr "<b>Sekošanas iestatījumi</b>"
-
-#~ msgid "Exchange - Send Options"
-#~ msgstr "Exchange  - nosūtīt iestatījumi"
-
-#~ msgid "I_mportance: "
-#~ msgstr "Svarīgu_ms: "
-
-#~ msgid ""
-#~ "Normal\n"
-#~ "High\n"
-#~ "Low"
-#~ msgstr ""
-#~ "Norm�la\n"
-#~ "Augsta\n"
-#~ "Zema"
-
-#~ msgid ""
-#~ "Normal\n"
-#~ "Personal\n"
-#~ "Private\n"
-#~ "Confidential"
-#~ msgstr ""
-#~ "Parasta\n"
-#~ "Personiska\n"
-#~ "Priv�ta\n"
-#~ "Slepena"
-
-#~ msgid "Request a _delivery receipt for this message"
-#~ msgstr "_Pieprasīt saņemšanas apstiprin�jumu šai vēstulei"
-
-#~ msgid "Request a _read receipt for this message"
-#~ msgstr "_Pieprasīt izlasīšanas apstiprin�jumu šai vēstulei"
-
-#~ msgid "Send as Delegate"
-#~ msgstr "Sūtīt k� deleg�tu"
-
-#~ msgid "_Sensitivity: "
-#~ msgstr "Jūtīgum_s: "
-
-#~ msgid "_User"
-#~ msgstr "_Lietot�js"
-
-#~ msgid "Select User"
-#~ msgstr "Izvēlieties lietot�ju"
-
-#~ msgid "Address Book..."
-#~ msgstr "Adrešu gr�mata..."
-
-#~ msgid "Subscribe to Other User's Contacts"
-#~ msgstr "Pierakstīties uz cita lietot�ja kontaktiem"
-
-#~ msgid "Subscribe to Other User's Calendar"
-#~ msgstr "Pierakstīties uz cita lietot�ja kalend�ru"
-
-#~ msgid "Activates the Evolution-Exchange extension package."
-#~ msgstr "Aktivit�tes Evolution-Exchange paplašin�jumu pakotnē."
-
-#~ msgid "Exchange Operations"
-#~ msgstr "Exchange darbības"
-
-#~ msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-#~ msgstr "Nevar piekļūt \"Exchange iestatījumu\" cilnei nesaistes režīm�."
-
-#~ msgid "Cannot change password due to configuration problems."
-#~ msgstr "Nevar mainīt paroli konfigur�cijas problēmu dēļ."
-
-#~ msgid "Cannot display folders."
-#~ msgstr "Nevar par�dīt mapes."
-
-#~ msgid ""
-#~ "Changes to options for Exchange account \"{0}\" will only take effect "
-#~ "after restarting Evolution."
-#~ msgstr ""
-#~ "Izmaiņas Exchange konta \"{0}\" konfigur�cij� st�sies spēka pēc tam, kad "
-#~ "jūs iziesiet un p�rstartēsiet Evolution."
-
-#~ msgid "Could not authenticate to server."
-#~ msgstr "Nevarēja autentificēties ar serveri."
-
-#~ msgid "Could not change password."
-#~ msgstr "Nevarēja nomainīt paroli."
-
-#~ msgid ""
-#~ "Could not configure Exchange account because \n"
-#~ "an unknown error occurred. Check the URL, \n"
-#~ "username, and password, and try again."
-#~ msgstr ""
-#~ "Nevarēja konfigurēt Exchange kontu, jo \n"
-#~ "notika nezin�m� kļūda. P�rbaudiet URL, \n"
-#~ "lietot�jv�rdu un paroli un mēģiniet vēlreiz."
-
-#~ msgid "Could not connect to Exchange server."
-#~ msgstr "Nevarēja savienoties ar Exchange serveri."
-
-#~ msgid "Could not connect to server {0}."
-#~ msgstr "Nevarēja savienoties ar serveri {0}."
-
-#~ msgid "Could not determine folder permissions for delegates."
-#~ msgstr "Nevarēja noteikt mapes atļauju deleg�tiem."
-
-#~ msgid "Could not find Exchange Web Storage System."
-#~ msgstr "Nevarēja atrast Exchange tīmekļa atmiņas sistēmu."
-
-#~ msgid "Could not locate server {0}."
-#~ msgstr "Nevarēja atrast serveri {0}."
-
-#~ msgid "Could not make {0} a delegate"
-#~ msgstr "Nevarēja izveidot {0} k� deleg�tu"
-
-#~ msgid "Could not read folder permissions"
-#~ msgstr "Nevarēja nolasīt mapes atļaujas"
-
-#~ msgid "Could not read folder permissions."
-#~ msgstr "Nevarēja nolasīt mapes atļaujas."
-
-#~ msgid "Could not read out-of-office state"
-#~ msgstr "Nevarēja nolasīt \"�rpus biroja\" st�vokli"
-
-#~ msgid "Could not update folder permissions."
-#~ msgstr "Nevarēja atjaunin�t mapes atļaujas."
-
-#~ msgid "Could not update out-of-office state"
-#~ msgstr "Nevarēja atjaunin�t \"�rpus biroja\" st�vokli"
-
-#~ msgid "Evolution requires a restart to load the subscribed user's mailbox"
-#~ msgstr ""
-#~ "Vajag p�rstartēt Evolution, lai iel�dētu pierakstīto lietot�ju pasta "
-#~ "kastes"
-
-#~ msgid "Exchange Account is offline."
-#~ msgstr "Exchange konts ir nesaistē."
-
-#~ 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 ""
-#~ "Exchange savienot�js pieprasa pieeju noteiktai\n"
-#~ "funkcionalit�tei uz Exchange servera, kas par�d�s\n"
-#~ "k� atslēgts vai bloķēts. (Tas parasti\n"
-#~ "ir bez nodoma.) jūsu Exchange administratoram ir\n"
-#~ "j�aktivizē šī funkcionalit�te, lai jūs spētu lietot\n"
-#~ "Evolution Exchange savienot�ju.\n"
-#~ "\n"
-#~ "Lai iegūtu sīk�ki inform�ciju, ko nodot savam\n"
-#~ "Exchange administratoram, sekojiet saitei:\n"
-#~ "\n"
-#~ "{0}\n"
-#~ "  "
-
-#~ msgid "Folder already exists"
-#~ msgstr "Mape jau eksistē"
-
-#~ msgid "Folder does not exist"
-#~ msgstr "Mape neeksistē"
-
-#~ msgid "Folder offline"
-#~ msgstr "Mape nesaistē"
-
-#~ msgid "Generic error"
-#~ msgstr "Visp�rēja kļūda"
-
-#~ msgid "Global Catalog Server is not reachable"
-#~ msgstr "Glob�lais kataloga serveris nav sasniedzams"
-
-#~ msgid ""
-#~ "If OWA is running on a different path, you must specify that in the "
-#~ "account configuration dialog."
-#~ msgstr ""
-#~ "Ja OWA darbojas uz cita ceļa, jums tas ir j�nor�da konta konfigur�cijas "
-#~ "dialog�."
-
-#~ msgid "Mailbox for {0} is not on this server."
-#~ msgstr "{0} pastkastīte  nav uz šī servera."
-
-#~ msgid "Make sure the URL is correct and try again."
-#~ msgstr "P�rliecinieties, ka URL ir pareizs un mēģiniet vēlreiz."
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "No Global Catalog server configured for this account."
-#~ msgstr "Šim kontam nav konfigurēts glob�lais kataloga serveris."
-
-#~ msgid "No mailbox for user {0} on {1}."
-#~ msgstr "Nav pastkastīte lietot�jam {0} uz {1}."
-
-#~ msgid "No such user {0}"
-#~ msgstr "Nav t�d� lietot�ja {0}"
-
-#~ msgid "Password successfully changed."
-#~ msgstr "Parole veiksmīgi nomainīta."
-
-#~ msgid ""
-#~ "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-#~ msgstr ""
-#~ "Lūdzu, ievadiet deleg�ta ID vai atceliet izvēli \"sūtīt k� deleg�tu\"."
-
-#~ msgid "Please make sure the Global Catalog Server name is correct."
-#~ msgstr ""
-#~ "Lūdzu, p�rliecinieties, ka glob�l� kataloga servera v�rds ir pareizs."
-
-#~ msgid "Please restart Evolution for changes to take effect"
-#~ msgstr "Lūdzu, p�rstartējiet Evolution, lai izmaiņas st�tos spēk�"
-
-#~ msgid "Please select a user."
-#~ msgstr "Lūdzu, izvēlieties lietot�ju."
-
-#~ msgid "Server rejected password because it is too weak."
-#~ msgstr "Serveris noraidīja paroli, jo t� ir p�r�k nedroša."
-
-#~ msgid "The Exchange account will be disabled when you quit Evolution"
-#~ msgstr "Exchange konts tiks atslēgts, kad jūs iziesiet no Evolution"
-
-#~ msgid "The Exchange account will be removed when you quit Evolution"
-#~ msgstr "Exchange konts tiks dzēsts, kad jūs iziesiet no Evolution"
-
-#~ msgid "The Exchange server is not compatible with Exchange Connector."
-#~ msgstr "Exchange serveris nav savietojams ar Exchange savienot�ju."
-
-#~ msgid ""
-#~ "The server is running Exchange 5.5. Exchange Connector \n"
-#~ "supports Microsoft Exchange 2000 and 2003 only."
-#~ msgstr ""
-#~ "Serveris darbojas ar Exchange 5.5. Savienot�js atbalsta\n"
-#~ "tikai Microsoft Exchange 2000 un 2003."
-
-#~ msgid ""
-#~ "This probably means that your server requires \n"
-#~ "you to specify the Windows domain name \n"
-#~ "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
-#~ "\n"
-#~ "Or you might have just typed your password wrong."
-#~ msgstr ""
-#~ "Tas laikam nozīmē, ka jūsu serveris pieprasa, \n"
-#~ "lai tiktu nor�dīts Windows domēna v�rds \n"
-#~ "k� jūsu lietot�ja v�rda daļa (piemēram, &quot;DOMAIN\\user&quot;).\n"
-#~ "\n"
-#~ "Vai arī jūs esat ievadījis nepareizu paroli."
-
-#~ msgid "Try again with a different password."
-#~ msgstr "Pamēģini vēlreiz ar citu paroli."
-
-#~ msgid "Unable to add user to access control list:"
-#~ msgstr "Nevar pievienot lietot�ju piekļūšanas kontrolsarakstam:"
-
-#~ msgid "Unable to edit delegates."
-#~ msgstr "Nevar rediģēt deleg�tus."
-
-#~ msgid "Unknown error looking up {0}"
-#~ msgstr "Nezin�ma kļūda, uzmeklējot {0}"
-
-#~ msgid "Unknown type"
-#~ msgstr "Nezin�ms tips"
-
-#~ msgid "Unsupported operation"
-#~ msgstr "Neatbalstīta darbība"
-
-#~ msgid ""
-#~ "You are nearing your quota available for storing mail on this server."
-#~ msgstr "Jūs tuvojaties atvēlēt�s vietas kvotai uz šī servera."
-
-#~ msgid ""
-#~ "You are permitted to send a message on behalf of only one delegator at a "
-#~ "time."
-#~ msgstr ""
-#~ "Jums ir atļauts sūtīt vēstules tikai viena deleģēt�ja v�rd� vienlaicīgi."
-
-#~ msgid "You cannot make yourself your own delegate"
-#~ msgstr "Jūs nevarat iecelt sevi par deleg�tu"
-
-#~ 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 šī servera."
-
-#~ msgid ""
-#~ "Your current usage is: {0} KB. Try to clear up some space by deleting "
-#~ "some mail."
-#~ msgstr ""
-#~ "Jūsu pašreizējais izmantojums ir: {0} KB. Mēģiniet atbrīvot vietu, "
-#~ "izdzēšot k�du vēstuli."
-
-#~ msgid ""
-#~ "Your current usage is: {0} KB. You will not be able to either send or "
-#~ "receive mail now."
-#~ 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."
-
-#~ 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 ""
-#~ "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."
-
-#~ msgid "Your password has expired."
-#~ msgstr "Jūsu parolei ir beidzies termiņš."
-
-#~ msgid "{0} cannot be added to an access control list"
-#~ msgstr "{0} nevar pievienot piekļuves kontrolsarakstam"
-
-#~ msgid "{0} is already a delegate"
-#~ msgstr "{0} jau ir deleg�ts"
-
-#~ msgid "{0} is already in the list"
-#~ msgstr "{0} ir jau sarakst�"
-
-#~ msgid "Subscribe to Other User's Tasks"
-#~ msgstr "Pierakstīties uz citu lietot�ju uzdevumiem"
-
-#~ msgid "Check folder permissions"
-#~ msgstr "P�rbaudu mapes atļaujas"
-
-#~| msgid "All files"
-#~ msgid "PNG files"
-#~ msgstr "PNG faili"
-
-#~| msgid "France"
-#~ msgid "_Face"
-#~ msgstr "_Seja"
-
-#~ msgid ""
-#~ "Attach a small picture of your face to outgoing messages.\n"
-#~ "\n"
-#~ "First time the user needs to configure a 48x48 PNG image. It is Base-64 "
-#~ "encoded and stored in ~/.evolution/faces. This will be used in subsequent "
-#~ "sent messages."
-#~ msgstr ""
-#~ "Pievienot mazu bildi ar savu seju izejošaj�m vēstulēm.\n"
-#~ "\n"
-#~ "Vispirms lietot�jam j�izveido 48x48 PNG bilde. Tai ir j�būt ar kodējumu "
-#~ "Base-64 un novietotai ~/.evolution/faces mapē. T� tiks izmantota turpm�k "
-#~ "sūtītaj�s vēstulēs."
-
-#~ msgid "Unsubscribe Folders"
-#~ msgstr "Atrakstīties no mapēm"
-
-#~ msgid ""
-#~ "Unsubscribe from an IMAP folder by right-clicking on it in the folder "
-#~ "tree."
-#~ msgstr ""
-#~ "Atraksties no IMAP mapes, uzklikšķinot ar labo pogu uz t�s mapju kok�."
-
-#~ msgid "Add Novell GroupWise support to Evolution."
-#~ msgstr "Pievienot Novell GroupWise atbalstu pie Evolution."
-
-#~| msgid "Groupwise Account Setup"
-#~ msgid "GroupWise Account Setup"
-#~ msgstr "GroupWise konta iestatīšana"
-
-#~ msgid "<b>Junk List:</b>"
-#~ msgstr "<b>Mēstuļu saraksts:</b>"
-
-#~ msgid "<b>Name</b>"
-#~ msgstr "<b>V�rds</b>"
-
-#~ msgid "<b>Custom Headers</b>"
-#~ msgstr "<b>Piel�gotas galvas</b>"
-
-#~ msgid "<b>IMAP Headers</b>"
-#~ msgstr "<b>IMAP galvas</b>"
-
-#~ msgid "Hardware Abstraction Layer not loaded"
-#~ msgstr "Hardware Abstraction Layer nav iel�dēts"
-
-#~ msgid ""
-#~ "The \"hald\" service is required but not currently running. Please enable "
-#~ "the service and rerun this program, or contact your system administrator."
-#~ msgstr ""
-#~ "\"hald\" ir pieprasīts, bet pašlaik nedarbojas. Lūdzu, palaidiet servisu "
-#~ "un atkal palaidiet šo programmu, vai sazinieties ar sistēmas "
-#~ "administratoru."
-
-#~ msgid ""
-#~ "Evolution could not find an iPod to synchronize with. Either the iPod is "
-#~ "not connected to the system or it is not powered on."
-#~ msgstr ""
-#~ "Evolution nevarēja atrast iPod, ar ko sinhronizēties. Vai nu iPod nav "
-#~ "savienots ar sistēmu, vai arī tas nav ieslēgts."
-
-#~ msgid "Synchronize to iPod"
-#~ msgstr "Sinhronizēt ar iPod"
-
-#~| msgid "Synchronize to iPod"
-#~ msgid "Synchronize your data with your Apple iPod."
-#~ msgstr "Sinhronizēt datus ar Apple iPod"
-
-#~ msgid "Disable an account by right-clicking on it in the folder tree."
-#~ msgstr "Deaktivizēt kontu ar labo klikšķi uz t�, mapju kok�."
-
-#~ msgid "Specify _filename:"
-#~ msgstr "Nor�diet _faila nosaukumu:"
-
-#~| msgid "Palau"
-#~ msgid "Pl_ay"
-#~ msgstr "_Atskaņot"
-
-#~| msgid "Mail to task"
-#~ msgid "Mail-to-Task"
-#~ msgstr "Pasts par uzdevumu"
-
-#~ msgid "Contact list _owner"
-#~ msgstr "K_ontaktu saraksta īpašnieks"
-
-#~ msgid "Get list _archive"
-#~ msgstr "Iegūt saraksta _arhīvu"
-
-#~ msgid "Get list _usage information"
-#~ msgstr "Iegūt saraksta izmantošanas inform�cij_u"
-
-#~ msgid "_Post message to list"
-#~ msgstr "_Sūtīt ziņojumu uz sarakstam"
-
-#~ msgid "_Subscribe to list"
-#~ msgstr "_Pierakstīties sarakstam"
-
-#~ msgid "_Un-subscribe to list"
-#~ msgstr "_Atrakstīties no saraksta"
-
-#~ msgid "Mono Loader"
-#~ msgstr "Mono iel�dēt�js"
-
-#~ msgid "Support plugins written in Mono."
-#~ msgstr "Atbalstīt spraudņus, kas ir rakstīti Mono."
-
-#~ msgid "Prefer PLAIN"
-#~ msgstr "Izvēlas parasto"
-
-#~ msgid "<span weight=\"bold\">Location</span>"
-#~ msgstr "<span weight=\"bold\">Atrašan�s vieta</span>"
-
-#~ msgid "<span weight=\"bold\">Sources</span>"
-#~ msgstr "<span weight=\"bold\">Avoti</span>"
-
-#~| msgid ""
-#~| "SSH\n"
-#~| "Public FTP\n"
-#~| "FTP (with login)\n"
-#~| "Windows share\n"
-#~| "WebDAV (HTTP)\n"
-#~| "Secure WebDAV (HTTPS)\n"
-#~| "Custom Location"
-#~ msgid ""
-#~ "Secure FTP (SSH)\n"
-#~ "Public FTP\n"
-#~ "FTP (with login)\n"
-#~ "Windows share\n"
-#~ "WebDAV (HTTP)\n"
-#~ "Secure WebDAV (HTTPS)\n"
-#~ "Custom Location"
-#~ msgstr ""
-#~ "Drošs FTP SSH\n"
-#~ "Publisks FTP\n"
-#~ "FTP (ar pieteikšanos)\n"
-#~ "Windows koplietošanas mape\n"
-#~ "WebDAV (HTTP)\n"
-#~ "Drošais WebDAV (HTTPS)\n"
-#~ "Piel�gota vieta"
-
-#~ msgid ""
-#~ "days\n"
-#~ "weeks\n"
-#~ "months"
-#~ msgstr ""
-#~ "dienas\n"
-#~ "nedēļas\n"
-#~ "mēneši"
-
-#~ msgid ""
-#~ "iCal\n"
-#~ "Free/Busy"
-#~ msgstr ""
-#~ "iCal\n"
-#~ "Brīvs/aizņemts"
-
-#~ msgid "A plugin which loads other plugins written using Python."
-#~ msgstr ""
-#~ "Spraudnis, kurš iel�dē citus spraudņus, kuri ir rakstīti izmantojot "
-#~ "Python."
-
-#~| msgid "Mono Loader"
-#~ msgid "Python Loader"
-#~ msgstr "Python iel�dēt�js"
-
-#~ msgid "_Save to Disk"
-#~ msgstr "_Saglab�t disk�"
-
-#~| msgid "Selects a single calendar or task source for viewing."
-#~ msgid "Quickly select a single calendar or task list for viewing."
-#~ msgstr "Ātri izvēlas kalend�ru vai uzdevumu, ko apskatīt."
-
-#~| msgid "Select one source"
-#~ msgid "Select One Source"
-#~ msgstr "Izvēlieties vienu avotu"
-
-#~ msgid "Evolution Shell"
-#~ msgstr "Evolution �aula"
-
-#~ msgid "Evolution Shell Config factory"
-#~ msgstr "Evolution �aulas konfigur�cijas ražotne"
-
-#~ msgid "Evolution Test"
-#~ msgstr "Evolution tests"
-
-#~ msgid "Evolution Test component"
-#~ msgstr "Evolution testa komponente"
-
-#~ msgid "<b>Active Connections</b>"
-#~ msgstr "<b>Aktīvie savienojumi</b>"
-
-#~ msgid "Active Connections"
-#~ msgstr "Aktīvie savienojumi"
-
-#~ msgid "Click OK to close these connections and go offline"
-#~ msgstr ""
-#~ "Spiediet 'Labi', lai aizvērtu šos savienojumus un ietu nesaistes režīm�"
-
-#~ msgid "_Import"
-#~ msgstr "_Importēt"
-
-#~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
-#~ msgstr "Izskat�s, ka GNOME Pilot rīki nav instalēti šaj� sistēm�."
-
-#~| msgid "Error executing %s."
-#~ msgid "Error executing %s. (%s)"
-#~ msgstr "Kļūda, izpildot %s. (%s)"
-
-#~ msgid "Work Offline"
-#~ msgstr "Str�d�t nesaistē"
-
-#~ msgid "Evolution is in the process of going offline."
-#~ msgstr "Evolution ieiet nesaistes režīm�."
-
-#~ msgid "Unknown system error."
-#~ msgstr "Nezin�ma sistēmas kļūda."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Nederīgi argumenti"
-
-#~ msgid "Cannot register on OAF"
-#~ msgstr "Nevar reģistrēties uz OAF"
-
-#~ msgid "Configuration Database not found"
-#~ msgstr "Konfigur�cijas datub�ze nav atrasta"
-
-#~ msgid "New Test"
-#~ msgstr "Jauns tests"
-
-#~ msgid "Import File"
-#~ msgstr "Importēt failu"
-
-#~| msgid "Restart Evolution"
-#~ msgid "Cannot start Evolution"
-#~ msgstr "Nevar palaist Evolution"
-
-#~ msgid "Evolution can not start."
-#~ msgstr "Nevar palaist Evolution."
-
-#~ msgid ""
-#~ "Your system configuration does not match your Evolution configuration.\n"
-#~ "\n"
-#~ "Click help for details"
-#~ msgstr ""
-#~ "Jūsu sistēmas konfigur�cija neatbilst jūsu Evolution konfigur�cijai.\n"
-#~ "\n"
-#~ "Spiediet uz palīdzības, lai iegūtu sīk�ku inform�ciju"
-
-#~ msgid ""
-#~ "Your system configuration does not match your Evolution configuration:\n"
-#~ "\n"
-#~ "{0}\n"
-#~ "\n"
-#~ "Click help for details."
-#~ msgstr ""
-#~ "Jūsu sistēmas konfigur�cija neatbilst jūsu Evolution konfigur�cijai:\n"
-#~ "\n"
-#~ "{0}\n"
-#~ "\n"
-#~ "Spiediet palīdzību, lai iegūtu sīk�ku inform�ciju."
-
-#~ msgid "<b>Field Value</b>"
-#~ msgstr "<b>Lauka vērtība</b>"
-
-#~ msgid "<b>Fingerprints</b>"
-#~ msgstr "<b>Nospiedumi</b>"
-
-#~ msgid "<b>Issued By</b>"
-#~ msgstr "<b>Izdevējs:</b>"
-
-#~ msgid "<b>Issued To</b>"
-#~ msgstr "<b>Izdots:</b>"
-
-#~ msgid "Dummy window only"
-#~ msgstr "Tikai maketa logam"
-
-#~ msgid "Could not execute '%s': %s\n"
-#~ msgstr "Nevarēja izpildīt '%s': %s\n"
-
-#~ msgid "Shutting down %s (%s)\n"
-#~ msgstr "Izslēdz %s(%s)\n"
-
-#~ msgid "Copy"
-#~ msgstr "Kopēt"
-
-#~ msgid "Copy to Folder..."
-#~ msgstr "Kopēt uz mapi..."
-
-#~| msgid "Create a new addressbook folder"
-#~ msgid "Create a new address book folder"
-#~ msgstr "Izveidot jaunu adrešu gr�matu"
-
-#~ msgid "Cut"
-#~ msgstr "Izgriezt"
-
-#~ msgid "Forward Contact"
-#~ msgstr "P�rsūtīt kontaktu"
-
-#~ msgid "Move to Folder..."
-#~ msgstr "P�rvietot uz mapi..."
-
-#~ msgid "Paste"
-#~ msgstr "Ielīmēt"
-
-#~ msgid "Save as VCard..."
-#~ msgstr "Saglab�t k� VCard..."
-
-#~ msgid "Select _All"
-#~ msgstr "Izvēlēties _visus"
-
-#~ msgid "Send message to contact"
-#~ msgstr "Sūtīt vēstuli kontaktam"
-
-#~ msgid "St_op"
-#~ msgstr "Ap_st�din�t"
-
-#~ msgid "Stop"
-#~ msgstr "Apst�din�t"
-
-#~ msgid "_Copy Folder Contacts To"
-#~ msgstr "_Kopēt mapes kontaktus uz"
-
-#~ msgid "_Move Folder Contacts To"
-#~ msgstr "P�rvietot _mapes kontaktus uz"
-
-#~ msgid "_Rename"
-#~ msgstr "P�_rsaukt"
-
-#~ msgid "_Save Contact as VCard..."
-#~ msgstr "_Saglab�t kontaktu k� VCard..."
-
-#~ msgid "_Save Folder Contacts As VCard"
-#~ msgstr "_Saglab�t mapes kontaktus k� VCard"
-
-#~ msgid "Delete _all Occurrences"
-#~ msgstr "Dzēst visus g_adījumus"
-
-#~ msgid "Show the working week"
-#~ msgstr "R�dīt darba nedēļu"
-
-#~ msgid "View the debug console for log messages"
-#~ msgstr "Atkļūdošans konsolē skatīties žurn�la ziņojumus"
-
-#~| msgid "_Web Log:"
-#~ msgid "_Debug Logs"
-#~ msgstr "Atkļū_došanas žurn�ls:"
-
-#~ msgid "Show message preview side-by-side with the message list"
-#~ msgstr "R�dīt vēstuļu priekšskatījumu s�nu pie s�na ar vēstuļu sarakstu"
-
-#~ msgid "Copy selected message(s) to the clipboard"
-#~ msgstr "Kopēt izvēlēto(-�s) vēstuli(-es) uz starpliktuvi"
-
-#~ msgid "Cut selected message(s) to the clipboard"
-#~ msgstr "Izgriezt izvēlēto(-�s) vēstuli(-es) uz starpliktuvi"
-
-#~ msgid "Paste message(s) from the clipboard"
-#~ msgstr "Ielīmēt vēstuli(-es) no starpliktuves"
-
-#~ msgid "Select _All Messages"
-#~ msgstr "Izvēlēties _visas vēstules"
-
-#~ 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"
-
-#~ msgid "Not Junk"
-#~ msgstr "Nav mēstule"
-
-#~ msgid "Paste messages from the clipboard"
-#~ msgstr "Ielīmēt vēstules no starpliktuves"
-
-#~ msgid "Select _All Text"
-#~ msgstr "Izvēlēties _visu tekstu"
-
-#~ msgid "_Save Message..."
-#~ msgstr "_Saglab�t vēstuli..."
-
-#~ msgid "Main toolbar"
-#~ msgstr "Galven� rīkjosla"
-
-#~ msgid "Copy selected memo"
-#~ msgstr "Kopēt iezīmēto memo"
-
-#~ msgid "Cut selected memo"
-#~ msgstr "Izgriezt izvēlēto memo"
-
-#~ msgid "Copy selected tasks"
-#~ msgstr "Kopēt izvēlētos uzdevumus"
-
-#~ msgid "Cut selected tasks"
-#~ msgstr "Izgriezt izvēlētos uzdevumus"
-
-#~ msgid "Mar_k as Complete"
-#~ msgstr "A_tzīmēt k� izpildītus"
-
-#~ msgid "Show task preview window"
-#~ msgstr "R�dīt uzdevumus priekšskatījuma log�"
-
-#~ msgid "About Evolution..."
-#~ msgstr "Par Evolution..."
-
-#~ msgid "Change the visibility of the toolbar"
-#~ msgstr "Mainīt rīkjoslas redzamību"
-
-#~ msgid "Forget remembered passwords so you will be prompted for them again"
-#~ msgstr "Aizmirst atcerēt�s paroles, t� k� t�s tiks vēlreiz pieprasītas"
-
-#~ msgid "Hide window buttons"
-#~ msgstr "Slēpt loga pogas"
-
-#~ msgid "Page Set_up..."
-#~ msgstr "Lapas iestatīj_umi..."
-
-#~ msgid "Prefere_nces"
-#~ msgstr "Iesta_tījumi"
-
-#~ msgid "Send / Receive"
-#~ msgstr "Sūtīt / saņemt"
-
-#~ msgid "Submit Bug Report"
-#~ msgstr "Nosūtīt kļūdas ziņojumu"
-
-#~ msgid "Toggle whether we are working offline."
-#~ msgstr "P�rslēgt, vai mēs str�d�jam nesaistes režīm�."
-
-#~ msgid "View/Hide the Side Bar"
-#~ msgstr "Radīt/slēpt s�nu joslu"
-
-#~ msgid "View/Hide the Status Bar"
-#~ msgstr "Radīt/slēpt statusa joslu"
-
-#~| msgid "Work Offline"
-#~ msgid "Work _Offline"
-#~ msgstr "Str�d�t _nesaistē"
-
-#~ msgid "_About"
-#~ msgstr "_Par"
-
-#~ msgid "_Frequently Asked Questions"
-#~ msgstr "_Bieži uzdotie jaut�jumi"
-
-#~ msgid "_Hide Buttons"
-#~ msgstr "_Slēpt pogas"
-
-#~ msgid "_Quit"
-#~ msgstr "_Iziet"
-
-#~ msgid "_Synchronization Options..."
-#~ msgstr "_Sinhroniz�cijas opcijas..."
-
-#~ msgid "<b>Time Zones</b>"
-#~ msgstr "<b>Laika joslas</b>"
-
-#~ msgid "<b>_Selection</b>"
-#~ msgstr "<b>_Izvēle</b>"
-
-#~ msgid "Save Custom View"
-#~ msgstr "Saglab�t piel�goto skatu"
-
-#~ msgid "Hide _Attachment Bar"
-#~ msgstr "Slēpt pielikum_a joslu"
-
-#~ msgid "Unknown character set: %s"
-#~ msgstr "Nezin�ma rakstzīmju kopa: %s"
-
-#~ msgid "_Searches"
-#~ msgstr "Meklēšana_s"
-
-#~ msgid "Choose Image"
-#~ msgstr "Izvēlieties attēlu"
-
-#~ msgid "Empty message"
-#~ msgstr "Tukša vēstule"
-
-#~ msgid "Reflow model"
-#~ msgstr "P�rpildīt modeli"
-
-#~ msgid "Column width"
-#~ msgstr "Kolonnas platums"
-
-#~| msgid "_Search"
-#~ msgid "Search"
-#~ msgstr "Meklēt"
-
-#~ msgid "_Clear"
-#~ msgstr "_Attīrīt"
-
-#~ msgid "Item ID"
-#~ msgstr "Priekšmeta id"
-
-#~ msgid "<b>Replies</b>"
-#~ msgstr "<b>Atbildes</b>"
-
-#~ msgid "<b>Status Tracking</b>"
-#~ msgstr "<b>Statusa izsekošana</b>"
-
-#~ msgid ""
-#~ "Normal\n"
-#~ "Proprietary\n"
-#~ "Confidential\n"
-#~ "Secret\n"
-#~ "Top Secret\n"
-#~ "For Your Eyes Only"
-#~ msgstr ""
-#~ "Norm�la\n"
-#~ "Komerci�la\n"
-#~ "Konfidenci�la\n"
-#~ "Slepena\n"
-#~ "Īpaši slepena\n"
-#~ "Tikai tev un nevienam citam"
-
-#~ msgid ""
-#~ "Undefined\n"
-#~ "High\n"
-#~ "Standard\n"
-#~ "Low"
-#~ msgstr ""
-#~ "Nedefinēts\n"
-#~ "Augsts\n"
-#~ "Standarts\n"
-#~ "Zems"
-
-#~ msgid "Add a column..."
-#~ msgstr "Pievienot kolonnu..."
-
-#~ msgid "Field Chooser"
-#~ msgstr "Lauka izvēlēt�js"
-
-#~ msgid "Tree"
-#~ msgstr "Koks"
-
 #~ msgid "Toggle Attachment Bar"
 #~ msgstr "P�rslēgt pielikuma joslu"
 
@@ -25643,6 +23929,15 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "_Properties..."
 #~ msgstr "_Rekvizīti..."
 
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
 #, fuzzy
 #~ msgid "<b>Display</b>"
 #~ msgstr "<b>E-Pasts</b>"
@@ -25657,12 +23952,30 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Add Address Book"
 #~ msgstr "Pievienot adrešu gr�matu"
 
+#~ msgid "Anonymously"
+#~ msgstr "Anonīmi"
+
 #~ msgid "Basic"
 #~ msgstr "Pamata"
 
+#~ msgid "Distinguished name"
+#~ msgstr "Atšķiramais v�rds"
+
+#~ msgid "Email address"
+#~ msgstr "Epasta adrese"
+
 #~ msgid "Find Possible Search Bases"
 #~ msgstr "Atrast atbalstīt�s meklēšanas b�zes"
 
+#~ msgid "Search filter"
+#~ msgstr "Meklēšanas filtrs"
+
+#~ msgid "Sub"
+#~ msgstr "Zem"
+
+#~ msgid "Using email address"
+#~ msgstr "Izmantoju epasta adresi"
+
 #~ msgid "Whenever Possible"
 #~ msgstr "Kad iespējams"
 
@@ -25894,6 +24207,9 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Faroe Islands"
 #~ msgstr "Faroe Salas"
 
+#~ msgid "Fiji"
+#~ msgstr "Fidži"
+
 #~ msgid "Finland"
 #~ msgstr "Somija"
 
@@ -26242,6 +24558,9 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Serbia And Montenegro"
 #~ msgstr "Serbija un Melnkalne"
 
+#~ msgid "Seychelles"
+#~ msgstr "Seišelu salas"
+
 #~ msgid "Sierra Leone"
 #~ msgstr "Sjerraleone"
 
@@ -26422,6 +24741,42 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "_ZIP Code:"
 #~ msgstr "_Pasta indekss:"
 
+#~ msgid "Dr."
+#~ msgstr "Dr."
+
+#~ msgid "Esq."
+#~ msgstr "Esk."
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "II"
+#~ msgstr "II"
+
+#~ msgid "III"
+#~ msgstr "III"
+
+#~ msgid "Jr."
+#~ msgstr "Jr."
+
+#~ msgid "Miss"
+#~ msgstr "Miss"
+
+#~ msgid "Mr."
+#~ msgstr "Mr."
+
+#~ msgid "Mrs."
+#~ msgstr "Mrs."
+
+#~ msgid "Ms."
+#~ msgstr "Ms."
+
+#~ msgid "Sr."
+#~ msgstr "Sr."
+
+#~ msgid "Add IM Account"
+#~ msgstr "Pievienot IM kontu"
+
 #~ msgid "_Account name:"
 #~ msgstr "_Konta nosaukums:"
 
@@ -26437,6 +24792,12 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Insert email addresses from Address Book"
 #~ msgstr "Izvēlieties kontaktus no adrešu gr�matas"
 
+#~ msgid "Members"
+#~ msgstr "Biedri"
+
+#~ msgid "_Select"
+#~ msgstr "Izvēlietie_s"
+
 #~ msgid ""
 #~ "The changed email or name of this contact already\n"
 #~ "exists in this folder.  Would you like to add it anyway?"
@@ -26493,6 +24854,9 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Immediately follow each other"
 #~ msgstr "Nep�rtraukti seko viena otrai"
 
+#~ msgid "Include:"
+#~ msgstr "Iekļaut:"
+
 #~ msgid "Landscape"
 #~ msgstr "Horizont�li"
 
@@ -26508,6 +24872,9 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Number of columns:"
 #~ msgstr "Kolonu skaits:"
 
+#~ msgid "Options"
+#~ msgstr "Opcijas"
+
 #~ msgid "Orientation"
 #~ msgstr "Novietojums"
 
@@ -26565,6 +24932,9 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "This should test the contact print style editor widget"
 #~ msgstr "Šim būtu j�p�rbauda kontaktu druk�šanas stila redaktora komponentu"
 
+#~ msgid "Contact Print Test"
+#~ msgstr "Kontaktu Druk�šanas P�rbaude"
+
 #~ msgid "This should test the contact print code"
 #~ msgstr "Šim butu j�p�rbauda kontaktu druk�šanas kods"
 
@@ -26606,6 +24976,21 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "daylight savings time"
 #~ msgstr "dienasgasmas taupīšanas laiks"
 
+#~ msgid "after"
+#~ msgstr "pēc"
+
+#~ msgid "day(s)"
+#~ msgstr "diena(s)"
+
+#~ msgid "end of appointment"
+#~ msgstr "tikšan�s beigas"
+
+#~ msgid "hour(s)"
+#~ msgstr "stunda(s)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minūte(s)"
+
 #~ msgid "Adjust for daylight sa_ving time"
 #~ msgstr "Piel�got lai tau_pītu dienasgaismu"
 
@@ -26626,6 +25011,12 @@ msgstr "Vadīt izlecošo logu"
 #~ msgstr[1] "<b>%d</b> Piesaistnes"
 #~ msgstr[2] "<b>%d</b> Piesaistņu"
 
+#~ msgid "Hide Attachment _Bar"
+#~ msgstr "Paslēpt Piesaistnes _joslu"
+
+#~ msgid "Show Attachment _Bar"
+#~ msgstr "Par�dīt Piesaistnes _joslu"
+
 #~ msgid "Show Attachments"
 #~ msgstr "Par�dīt piesaistnes"
 
@@ -26644,9 +25035,21 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "The journal entry could not be deleted due to an error"
 #~ msgstr "Notikums nevar tikt izdzēsts sakar� ar kļūdu"
 
+#~ msgid "1 day before appointment"
+#~ msgstr "1 dienu pirms tikšan�s"
+
+#~ msgid "1 hour before appointment"
+#~ msgstr "1 stundu pirms tikšan�s"
+
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 minūtes pirms tikšan�s"
+
 #~ msgid "D_escription:"
 #~ msgstr "A_praksts:"
 
+#~ msgid "for"
+#~ msgstr "priekš"
+
 #~ msgid "<b>Att_endees</b>"
 #~ msgstr "<b>Apme_klēt�js:</b>"
 
@@ -26662,6 +25065,18 @@ msgstr "Vadīt izlecošo logu"
 #~ "modify?"
 #~ msgstr "Jūs modificējat atk�rtojošos notikumu. Ko jūs vēlētos modificēt?"
 
+#~ msgid "forever"
+#~ msgstr "visu laiku"
+
+#~ msgid "month(s)"
+#~ msgstr "mēnesis(ši)"
+
+#~ msgid "week(s)"
+#~ msgstr "nedēļa(s)"
+
+#~ msgid "year(s)"
+#~ msgstr "gads(i)"
+
 #~ msgid "De_scription:"
 #~ msgstr "Aprak_sts:"
 
@@ -26683,6 +25098,42 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Updating query"
 #~ msgstr "Atjaunoju pieprasījumu"
 
+#~ msgid "April"
+#~ msgstr "Aprīlis"
+
+#~ msgid "August"
+#~ msgstr "Augusts"
+
+#~ msgid "December"
+#~ msgstr "Decembris"
+
+#~ msgid "February"
+#~ msgstr "Febru�ris"
+
+#~ msgid "January"
+#~ msgstr "Janv�ris"
+
+#~ msgid "July"
+#~ msgstr "JÅ«lijs"
+
+#~ msgid "June"
+#~ msgstr "JÅ«nijs"
+
+#~ msgid "March"
+#~ msgstr "Marts"
+
+#~ msgid "May"
+#~ msgstr "Maijs"
+
+#~ msgid "November"
+#~ msgstr "Novembris"
+
+#~ msgid "October"
+#~ msgstr "Oktobris"
+
+#~ msgid "September"
+#~ msgstr "Septembris"
+
 #, fuzzy
 #~ msgid "Journal information"
 #~ msgstr "Kontaktinform�cija"
@@ -26697,9 +25148,15 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Post To:"
 #~ msgstr "_Ziņot uz:"
 
+#~ msgid "Unknown reason"
+#~ msgstr "Nezin�ms iemesls"
+
 #~ msgid "Open File"
 #~ msgstr "Atvērt failu"
 
+#~ msgid "_Save Message"
+#~ msgstr "_Saglab�t vēstuli"
+
 #, fuzzy
 #~ msgid "The Evolution PIM and Email Client"
 #~ msgstr "- Evolution PIM un Epasta klients"
@@ -26711,6 +25168,18 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "_Search name:"
 #~ msgstr "Meklēšanas _b�ze:"
 
+#~ msgid "months"
+#~ msgstr "mēneši"
+
+#~ msgid "the current time"
+#~ msgstr "pašreizējais laiks"
+
+#~ msgid "the time you specify"
+#~ msgstr "laiks, kuru jūs nor�diet"
+
+#~ msgid "years"
+#~ msgstr "gadi"
+
 #, fuzzy
 #~ msgid "Di_sable"
 #~ msgstr "_Atslēgt"
@@ -26722,6 +25191,9 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "folder-display|%s (%u)"
 #~ msgstr "%s (%u)"
 
+#~ msgid "Copying `%s' to `%s'"
+#~ msgstr "Kopēju no '%s' uz '%s'"
+
 #, fuzzy
 #~ msgid "<b>Retrieving Message...</b>"
 #~ msgstr "Saņemu ziņu..."
@@ -26840,6 +25312,9 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Quote original message"
 #~ msgstr "Citēt oriģin�lo vēstuli"
 
+#~ msgid "Quoted"
+#~ msgstr "Citēts"
+
 #, fuzzy
 #~ msgid "Se_lect..."
 #~ msgstr "Izvēlieties.."
@@ -26863,6 +25338,9 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Enter a name for this signature."
 #~ msgstr "Ievadiet nosaukumu Å¡im parakstam."
 
+#~ msgid "Name:"
+#~ msgstr "Nosaukums:"
+
 #~ msgid ""
 #~ "Are you sure you want to permanently remove all the deleted messages in "
 #~ "folder &quot;{0}&quot;?"
@@ -26892,6 +25370,10 @@ msgstr "Vadīt izlecošo logu"
 #~ "jums tos atskaņot tieši no Evolution."
 
 #, fuzzy
+#~ msgid "Check Evolution archive"
+#~ msgstr "P�rbaudīt Evolution dublējumu"
+
+#, fuzzy
 #~ msgid "With GUI"
 #~ msgstr "Platums"
 
@@ -27018,6 +25500,10 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Account cannot send e-mail"
 #~ msgstr "Konts nevar aizsūtīt e-pastu"
 
+#, fuzzy
+#~ msgid "No store available"
+#~ msgstr "Kopsavilkums nav pieejams."
+
 #~ msgid ""
 #~ "A plugin which implements a CORBA interface for accessing mail data "
 #~ "remotely."
@@ -27213,6 +25699,9 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Toggles whether the To field is displayed"
 #~ msgstr "P�rslēdz, kur attēlots adres�ta lauks"
 
+#~ msgid "_Delete all"
+#~ msgstr "_Dzēst visu"
+
 #~ msgid "_Open..."
 #~ msgstr "_Atvērt..."
 
@@ -27255,6 +25744,9 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Status Details"
 #~ msgstr "St�vokļa inform�cija"
 
+#~ msgid "Time Zone"
+#~ msgstr "Laika josla"
+
 #, fuzzy
 #~ msgid "_Phone List"
 #~ msgstr "_Surog�tpasta saraksts"
@@ -27283,6 +25775,9 @@ msgstr "Vadīt izlecošo logu"
 #~ msgid "Text of the expander's label"
 #~ msgstr "Izvērsēja etiķetes teksts"
 
+#~ msgid "Use underline"
+#~ msgstr "Lietot pasvītrojumu"
+
 #~ msgid ""
 #~ "If set, an underline in the text indicates the next character should be "
 #~ "used for the mnemonic accelerator key"
@@ -27299,6 +25794,9 @@ msgstr "Vadīt izlecošo logu"
 #~ 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�"
 
+#~ msgid "Indicator Spacing"
+#~ msgstr "Indikatora atstarpe"
+
 #~ msgid "Spacing around expander arrow"
 #~ msgstr "Atstarpes pie izvērsēja bultas"
 
diff --git a/po/nb.po b/po/nb.po
index 6e890c5240..f71226797c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,13 @@
 # Terance Edward Sola <terance@lyse.net>, 2005.
 #
 #
-#: ../shell/main.c:479
+#: ../shell/main.c:497
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.29.x\n"
+"Project-Id-Version: evolution 2.30.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-27 10:56+0100\n"
-"PO-Revision-Date: 2010-03-27 11:08+0100\n"
+"POT-Creation-Date: 2010-05-24 16:12+0200\n"
+"PO-Revision-Date: 2010-05-24 16:18+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -93,7 +93,7 @@ msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1268
 msgid "Failed to delete contact"
 msgstr "Klarte ikke å slette kontakt"
 
@@ -204,7 +204,7 @@ msgstr ""
 "Dine kontakter for {0} vil ikke være tilgjengelige før Evolution startes på "
 "nytt."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -227,16 +227,6 @@ msgstr "End_re størrelse"
 msgid "_Use as it is"
 msgstr "Br_uk som den er"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Forvalgt synkroniseringsadresse:"
@@ -253,7 +243,7 @@ msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2020
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
@@ -264,260 +254,231 @@ msgstr "Bryllupsdag"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2019 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:115
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "Blogg:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Kate_gorier..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "Kalender:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:916
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2570
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "E-post"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "Ledig/opptatt:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "Fullt _navn..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "Hjemme"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "Hjemmeside:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Bilde"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "Øyeblikksmeldinger"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Jobb"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Postadresse"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "_Kallenavn:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Notater"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1723
 msgid "Other"
 msgstr "Andre"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "Videoprat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Nettadresser"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "Weblogg:"
-
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "_Bryllupsdag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "_Assistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "_Fødselsdag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+msgid "_Blog:"
+msgstr "_Blogg:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "_By:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "F_irma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "_Land:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "Av_deling:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "_Lagre under:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "_Ledig/opptatt:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "_Hjemmeside:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "_Leder:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "K_ontor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "_Yrke:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "_Ektefelle:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "_Videoprat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "_Ønsker å motta HTML-formatert e-post"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "_Weblogg:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Where:"
 msgstr "_Hvor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/postnummer:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Navn"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "Redigerbar"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -559,7 +520,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
@@ -571,45 +532,21 @@ msgstr "Feil under endring av kontakt"
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Kildebok"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "MÃ¥lbok"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "Er ny kontakt"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Skrivbare felter"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Obligatoriske felt"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Endret"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2565
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2973
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2974
 msgid "_No image"
 msgstr "_Uten bilde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3247
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -617,56 +554,46 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3258
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3284
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» er tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "_Fullt navn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "_Velg adressebok"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Skall"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "EShell-komponent"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr."
@@ -733,7 +660,7 @@ msgid "_Suffix:"
 msgstr "_Suffiks:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:676
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
@@ -750,47 +677,35 @@ msgid "_List name:"
 msgstr "_Listenavn:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
-msgid "_Select..."
-msgstr "_Velg..."
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+msgctxt "yes"
+msgid "_Select..."
+msgstr "_Velg..."
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:769
 msgid "Contact List Members"
 msgstr "Kontaktlistemedlemmer"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:917
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1333
 msgid "_Members"
 msgstr "_Medlemmer"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1200
 msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Bok"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "Er ny liste"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Endret kontakt:"
@@ -829,31 +744,31 @@ msgstr ""
 "i denne mappen. Vil du legge den til likevel?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "_Flett"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 msgid "Merge Contact"
 msgstr "Flett kontakt"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "Navn inneholder"
 
@@ -872,91 +787,62 @@ msgstr[1] "%d kontakter"
 msgid "Error getting book view"
 msgstr "Feil under henting av bokvisning"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "Spør"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
 msgstr "Søk avbrutt"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Modell"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
 msgid "Cut selected contacts to the clipboard"
 msgstr "Klipp ut valgte kontakter til utklippstavlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopier valgte kontakter til utklippstavlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Paste contacts from the clipboard"
 msgstr "Lim inn kontakter fra utklippstavlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "Slett valgte kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 msgid "Select all visible contacts"
 msgstr "Velg alle synlige kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Skallvisning"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Kilde"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1286
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Er du sikker på at du vil slette disse kontaktlistene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1290
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Er du sikker på at du vil slette denne kontaktlisten?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1294
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Er du sikker på at du vil slette denne kontaktlisten (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Er du sikker på at du vil slette disse kontaktene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete this contact?"
 msgstr "Er du sikker på at du vil slette denne kontakten?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Er du sikker på at du vil slette denne kontakten (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1463
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -965,11 +851,11 @@ msgstr ""
 "Åpning av %d kontakter vil medføre at %d nye vinduer vil\n"
 "vises på skjermen. Vil du virkelig vise alle disse kontaktene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 msgid "_Don't Display"
 msgstr "Ikke _vis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1469
 msgid "Display _All Contacts"
 msgstr "Vis _alle kontakter"
 
@@ -1129,7 +1015,6 @@ msgid "Telex"
 msgstr "Teleks"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "Tittel"
 
@@ -1141,59 +1026,7 @@ msgstr "Enhet"
 msgid "Web Site"
 msgstr "Nettside"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Bredde"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Høyde"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "Har fokus"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Felt"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Feltnavn"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Tekstmodell"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Maksimal lengde på feltnavn"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Kolonnebredde"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1203,7 +1036,7 @@ msgstr ""
 "\n"
 "Søker etter kontakter..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1217,7 +1050,7 @@ msgstr ""
 "\n"
 "eller dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1231,7 +1064,7 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1241,7 +1074,7 @@ msgstr ""
 "\n"
 "Søk etter kontakten."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1251,10 +1084,6 @@ msgstr ""
 "\n"
 "Ingen oppføringer i denne visningen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Adapter"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "E-post på arbeid"
@@ -1264,18 +1093,10 @@ msgid "Home Email"
 msgstr "E-post hjemme"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "Annen e-post"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Valgt"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "Har markør"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1318,17 +1139,17 @@ msgid "Copy _Email Address"
 msgstr "Kopier _e-postadresse"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:381
 msgid "Copy the email address to the clipboard"
 msgstr "Kopier e-postadresser til utklippstavlen"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:386
 msgid "_Send New Message To..."
 msgstr "_Send ny melding til..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:388
 msgid "Send a mail message to this address"
 msgstr "Send en e-postmelding til denne adressen"
 
@@ -1364,22 +1185,21 @@ msgid "Video Chat"
 msgstr "Videosamtale"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:498
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "Kalender"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:116
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
@@ -1407,21 +1227,19 @@ msgid "Web Log"
 msgstr "Nettdagbok"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:176
+#: ../modules/addressbook/e-book-shell-migrate.c:134
+#: ../modules/calendar/e-cal-shell-backend.c:180
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Personlig"
@@ -1438,8 +1256,8 @@ msgstr "Hjemmeside"
 msgid "Blog"
 msgstr "Weblogg"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
@@ -1497,10 +1315,10 @@ msgstr "Protokollen er ikke støttet"
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2675
 msgid "Canceled"
 msgstr "Avbrutt"
 
@@ -1631,27 +1449,27 @@ msgstr "Denne spørringen ble ikke fullført."
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "Velg adressebok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
@@ -1661,52 +1479,59 @@ msgstr "Kortvisning"
 
 #: ../addressbook/importers/evolution-csv-importer.c:654
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importerer..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:937
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:938
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:946
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:947
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:955
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:956
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "LDIF-import for Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard-import"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:733
+#, c-format
+msgid "Page %d"
+msgstr "Side %d"
+
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1783,20 +1608,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Aksesserer LDAP-tjener anonymt"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Oppgi passord for %s (bruker %s)"
 
 #: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1822,18 +1647,18 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 msgstr ""
-"Hvis du gir dine avtaler en meningsfylt emnelinje vil mottakerene lettere "
+"Hvis du gir dine avtaler et meningsfylt sammendrag vil gjøre det lettere "
 "forstå hva avtalen gjelder."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr ""
-"Hvis du gir dine oppgaver et meningsfylt sammendrag vil mottakerene lettere "
+"Hvis du gir oppgaver et meningsfylt sammendrag vil det gjøre det lettere å "
 "forstå hva oppgaven gjelder."
 
 #: ../calendar/calendar.error.xml.h:7
@@ -1931,58 +1756,54 @@ msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på at du vil slette denne oppgaven?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Er du sikker på at du vil lagre notatet uten sammendrag?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "Er du sikker på at du vil lagre avtalen uten et sammendrag?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Er du sikker på at du vil sende en avtelen uten emne?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Er du sikker på at du vil lagre notatet uten sammendrag?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "Er du sikker på at du vil sende oppgaven uten sammendrag?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "Er du sikker på at du vil lagre oppgaven uten et sammendrag?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "Kalenderlager er frakoblet."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Kan ikke opprette en ny hendelse"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Kan ikke lagre hendelse"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Slett kalender «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Slett notatliste «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Slett oppgaveliste «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "Ikke se_nd"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Nedlasting pågår. Vil du lagre avtalen?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Nedlasting pågår. Vil du lagre oppgaven?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "Redigeringskomponenten kunne ikke lastes."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -1990,30 +1811,25 @@ msgstr ""
 "Invitasjoner vil sendes til alle deltakere via e-post slik at de kan godta "
 "denne oppgaven."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Invitasjoner vil sendes til alle deltakere via e-post slik at de kan gi svar."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Feil under lasting av kalender"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Feil under lasting av notatliste"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Feil under lasting av oppgaveliste"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "Feil på «{0}»"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2021,7 +1837,7 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke deltakerene vite at møtet "
 "er avlyst."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2029,7 +1845,7 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
 "at notatet er slettet."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2037,11 +1853,7 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
 "at oppgaven er slettet."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "Ingen svar fra tjeneren."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2049,7 +1861,7 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine kalendere "
 "oppdatert."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2057,7 +1869,7 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine "
 "oppgavelister oppdatert."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2065,7 +1877,7 @@ msgstr ""
 "Noen vedlegg blir lastet ned. Avtalen vil bli lagret uten disse vedleggene "
 "hvis den blir lagret nå."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2073,95 +1885,91 @@ msgstr ""
 "Noen vedlegg blir lastet ned. Oppgaven vil bli lagret uten disse vedleggene "
 "hvis den blir lagret nå."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr "Noen funksjoner vil kanskje ikke fungere med denne tjeneren."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution-notater har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-oppgaver har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:55
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalenderen er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:56
 msgid "The memo list is not marked for offline usage."
 msgstr "Notatlisten er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "Oppgavelisten er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalenderen vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "Denne notatlisten vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Denne oppgavelisten vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "Kan ikke laste kalender"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Vil du lagre dine endringer i denne avtalen?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Vil du lagre dine endringer i dette møtet?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "Vil du lagre dine endringer i dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "Vil du lagre dine endringer i denne oppgaven?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Vil du sende en avlysingsmelding for dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Vil du sende en avlysningsmelding til alle deltakere?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vil du sende møteinvitasjoner til deltakerene?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "Vil du sende denne oppgaven til deltakere?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Vil du sende oppdatert møteinformasjon til alle deltakere?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
 msgstr "Vil du sende oppdatert oppgaveinformasjon til deltakere?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2171,64 +1979,60 @@ msgstr ""
 "muligens støte på problemer. Tjeneren bør oppgraderes til en støttet versjon "
 "for å unngå problemer."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:72
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Du har endret denne avtalen, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Du har endret dette møtet, men ikke lagret det."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Du har endret denne oppgaven, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Du har endret dette notatet, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Kalenderene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Notatene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Oppgavene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Lagre endringer"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:134
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Send"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Send melding"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendelser som går over flere dager:"
@@ -2283,7 +2087,7 @@ msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "Starttid"
 
@@ -2300,8 +2104,8 @@ msgstr "Avvis _alle"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1573
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "Sted:"
 
@@ -2316,9 +2120,9 @@ msgstr "A_vvis"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
 #: ../calendar/gui/dialogs/comp-editor.c:1016
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1625
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "R_ediger"
@@ -2328,10 +2132,10 @@ msgid "_Snooze"
 msgstr "_Utsett"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "timer"
 
@@ -2339,11 +2143,12 @@ msgstr "timer"
 msgid "location of appointment"
 msgstr "sted for avtalen"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "minutter"
 
@@ -2366,13 +2171,13 @@ msgstr "Stedsinformasjon er ikke tilgjengelig."
 msgid "You have %d alarms"
 msgstr "Du har %d alarmer"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2384,7 +2189,7 @@ msgstr ""
 "er konfigurert til å sende e-post. Evolution vil vise\n"
 "en vanlig dialog med påminnelsen i stedet."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2400,7 +2205,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil kjøre dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
@@ -2442,7 +2247,7 @@ msgid "Alarm programs"
 msgstr "Varslingsprogrammer"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Antall sekunder feilen skal vises i statuslinjen."
 
@@ -2463,141 +2268,137 @@ msgid "Calendars to run alarms for"
 msgstr "Kalendere det skal kjøres alarmer for"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "Kryss av her for å bruke systemets tidssone i Evolution."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "Farge på Marcus Bains-linjen i tidslinjen (tom for forvalg)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Farge på Marcus Bains-linjen i dagsvisningen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "Komprimer helger i månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Bekreft tømming av mappe"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr ""
 "Antall forvalgt gjeninntreffelse for en ny hendelse. -1 betyr for alltid."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Dager som starten og slutten på arbeidstid skal være indikert."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "Forvalgt påminnelse for avtale"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "Forvalgt antall gjentakelser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Forvalgt enhet for påminnelser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Forvalgt verdi for påminnelse"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "Katalog for lagring av lydfiler for alarm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "Gradient for hendelse"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "Gjennomsiktighet for hendelse"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "Tjener-URLer for ledig/opptatt-informasjon"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "Ledig/opptatt mal-URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "Gradient for hendelser i kalendervisninger."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "Skjul fullførte oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "Skjul enheter for oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "Skjul oppgaveverdi"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "Plassering på horisontalt felt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Klokkeslett arbeidsdagen slutter på i 24-timers format, 0 til 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Klokkeslett arbeidsdagen starter i 24-timers format, 0 til 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervaller i minutter som vises i dag- og arbeidsukevisningene."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "Siste varslingstid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "Over dette nivået skal meldingen logges."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr "Liste med nylig brukte sekundærtidssoner i en dagvisning."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "Liste over tjener-URLer for publisering av ledig/opptatt tid."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-linje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Farge på Marcus Bains-linje - Dagsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Farge på Marcus Bains-linje - tidslinje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -2605,51 +2406,51 @@ msgstr ""
 "Maksimalt antall nylig brukte tidssoner som skal huskes i en liste med "
 "«day_second_zones»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Maksimalt antall nylig brukte tidssoner som skal huskes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "Stil for utforming av notat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "Plassering av vertikalt felt for forhåndsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minutt arbeidsdagen slutter på fra 0 til 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minutt arbeidsdagen starter på fra 0 til 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "Plassering på horisontal månedsvisningsfelt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "Plassering av vertikalt felt for månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "Antall enheter for å bestemme en forvalgt påminnelse."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "Antall enheter for å bestemme når oppgaver skal skjules"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "Farge for utgåtte oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -2657,7 +2458,7 @@ msgstr ""
 "Posisjonen til det horisontale feltet mellom minikalenderen og oppgavelisten "
 "utenom månedsvisning, i piksler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2665,25 +2466,25 @@ msgstr ""
 "Posisjonen til det horisontale feltet mellom visning, minikalender og "
 "oppgavelisten i månedsvisning, i piksler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "Plassering av vertikalt felt mellom kalenderlisten og minikalenderen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2691,7 +2492,7 @@ msgstr ""
 "Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
 "oppgavelisten i månedsvisning, i piksler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -2699,83 +2500,83 @@ msgstr ""
 "Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
 "oppgavelisten utenom månedsvisning, i piksler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "Primær kalender"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "Primær notatliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "Primær oppgaveliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programmer som er tillat å kjøres av alarmer."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "Sist brukte sekundærtidssoner i en dagvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "Katalog for lagring av alarmlyd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "Rull månedsvisning en uke om gangen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Vis RSVP-feltet i redigering av hendelser/oppgaver/møter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Vis rollefelt i redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr "Vis tid for avtalers slutt i ukes- og månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Vis kategorifelt ved redigering av hendelse/møte/oppgave"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "Vis alarmer i varslingsområdet på panelet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Vis statusfelt ved redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "Vis forhåndsvisningsvinduet for notat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "Vis forhåndsvisningsområdet for oppgave"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Vis tidssonefelt ved redigering av hendelse/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Vis typefelt ved redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show week number in Day and Work Week View"
 msgstr "Vis ukenummer i dag- og arbeidsukevisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week numbers in date navigator"
 msgstr "Vis ukenummer i datovelger"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -2783,23 +2584,23 @@ msgstr ""
 "Viser sekundærtidssone i en dagvisning hvis den er satt. Verdien er lik den "
 "som brukes i nøkkelen «tidssone»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
 msgstr "Stil for utforming av oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (horizontal)"
 msgstr "Posisjon for forhåndsvisning av oppgaver (horisontal)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Task preview pane position (vertical)"
 msgstr "Posisjon for forhåndsvisning av oppgaver (vertikal)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Tasks due today color"
 msgstr "Farge for oppgaver som går ut i dag"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2808,7 +2609,7 @@ msgstr ""
 "URL-mal som brukes som reserveløsning for ledig/opptatt, %u er erstattet med "
 "brukerdelen av e-postadressen og %d er erstattet med domenet."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2816,25 +2617,25 @@ msgstr ""
 "Den forvalgte tidssonen å bruke for datoer og tidspunkt i kalenderen som en "
 "uoversatt Olsen tidssonedatabaselokasjon som «America/New York»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "The second timezone for a Day View"
 msgstr "Sekundær tidssone for dagvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -2842,19 +2643,19 @@ msgstr ""
 "Denne har tre mulige verdier. 0 for feil. 1 for advarsler. 2 for "
 "feilsøkingsmeldinger."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time divisions"
 msgstr "Oppdeling av tid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time the last alarm ran, in time_t."
 msgstr "Tid for forrige alarm, som time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -2862,70 +2663,70 @@ msgstr ""
 "Gjennomsiktighet for hendelser i kalendervisningen (En verdi mellom 0 "
 "(gjennomsiktig) og 1 (ugjennomsiktig)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Twenty four hour time format"
 msgstr "24-timers tidsformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "URI for merket («primær») kalender"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "URI for uthevet («primær») notatliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "URI for uthevet («primær») oppgaveliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Enhet for forvalgt påminnelse. «minutes», «hours», eller «days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Enheter for å bestemme når oppgaver skal skjules. «minutes», «hours» eller "
 "«days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
 msgstr "Bruk systemets tidssone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "Bruk systemets tidssone i stedet for tidssonen som er valgt i Evolution."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Vertical pane position"
 msgstr "Posisjon til vertikalt felt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "Ukestart"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dag uken starter på. Fra søndag (0) til lørdag (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Om varslingsfeltet skal brukes for alarmer."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr ""
 "Om det skal spørres etter bekreftelse ved sletting av en avtale eller "
 "oppgave."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 "Om det skal spørres etter bekreftelse ved tømming av avtaler eller oppgaver."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -2933,83 +2734,83 @@ msgstr ""
 "Komprimere helger i månedsvisningen slik at lørdag og søndag bruker plassen "
 "til en ukedag."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Om tidspunktet en hendelse slutter på skal vises i uke- og månedsvisninger."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Om Marcus Bains-linjen (linjen på nåværende tid) skal vises i kalenderen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Om fullførte oppgaver skal skjules i oppgavevisningen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "Om månedsvisning skal rulles per uke, og ikke per måned."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to set a default reminder for appointments."
 msgstr "Om en forvalgt påminnelse skal bli satt for avtaler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Om RSVP-feltet skal vises redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Om kategorifeltet skal vises i redigering av hendelse/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Om rollefeltet skal vises i redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Om statusfeltet skal vises i redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Om tider skal vises i 24-timers format i stedet for å bruke AM/PM."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Om felt for tidssone skal vises i redigering av hendelse/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Om typefelt skal vises i redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "Om ukenummer skal vises i dag- og arbeidsukevisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Om ukenummer skal vises i minikalenderen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "Arbeidsdager"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "Hvilken time arbeidsdagen slutter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "Hvilket minutt arbeidsdagen slutter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "Hvilken time arbeidsdagen starter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "Hvilket minutt arbeidsdagen starter"
 
@@ -3059,17 +2860,17 @@ msgid "Classification"
 msgstr "Klassifisering"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:514
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Beskrivelse"
@@ -3090,7 +2891,7 @@ msgid "Exist"
 msgstr "Eksisterer"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
@@ -3103,25 +2904,25 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Offentlig"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:305
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
@@ -3198,7 +2999,7 @@ msgstr "Egendefinert lyd for varsel"
 msgid "Mes_sage:"
 msgstr "Be_skjed:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:78
 msgid "Options"
 msgstr "Alternativer"
 
@@ -3245,11 +3046,10 @@ msgstr "dag(er)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
 msgid "days"
 msgstr "dager"
 
@@ -3257,19 +3057,20 @@ msgstr "dager"
 msgid "end of appointment"
 msgstr "slutt på avtalen"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "ekstra ganger hver"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "minutt(er)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "ved avtalens start"
 
@@ -3290,6 +3091,7 @@ msgstr "Varsel"
 #. Translators: "None" indicates no second time zone set for a day view
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
@@ -3297,7 +3099,7 @@ msgstr "Ingen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Velg..."
 
@@ -3305,13 +3107,13 @@ msgstr "Velg..."
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendere valgt for varsel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "Tid og dato:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+msgid "Ti_me and date:"
+msgstr "T_id og dato:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "Kun dato:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:791
+msgid "_Date only:"
+msgstr "Kun _dato:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3342,12 +3144,12 @@ msgstr "30 minutter"
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "Varsel"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "Fromat for dato ogklokkeslett"
@@ -3373,20 +3175,20 @@ msgid "Display alarms in _notification area only"
 msgstr "Vis alarmer kun i varsli_ngsområdet"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Fredag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:55
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2675
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Generelt"
 
@@ -3399,30 +3201,23 @@ msgid "Minutes"
 msgstr "Minutter"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Mandag"
 
-#. Translators: "None" for not including threads;
-#. * part of "Include threads: None"
-#. Translators: Used in send options dialog
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
-msgid "None"
-msgstr "Ingen"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
 msgid "Pick a color"
 msgstr "Velg en farge"
 
+#. Sunday
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "S_ø."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Lørdag"
@@ -3439,156 +3234,167 @@ msgstr "Se_kundær sone:"
 msgid "Select the calendars for alarm notification"
 msgstr "Velg kalendere for varsling"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Sh_ow a reminder"
 msgstr "_Vis en påminnelse"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 msgid "Show a _reminder"
 msgstr "Vis en _påminnelse"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uke_nummer i datonavigasjon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Vis uken_ummer i dag- og arbeidsukevisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Søndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 msgid "T_asks due today:"
 msgstr "Oppg_aver som går ut i dag:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 msgid "T_hu"
 msgstr "T_o."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Oppgaveliste"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 msgid "Template:"
 msgstr "Mal:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Tid"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "Tids_sone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 msgid "Use s_ystem time zone"
 msgstr "Bruk s_ystemets tidssone"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "Wee_k starts on:"
 msgstr "Uk_en starter på:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Work Week"
 msgstr "Arbeidsuke"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "Work days:"
 msgstr "Arbeidsdager:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Ask for confirmation when deleting items"
 msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i månedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Day begins:"
 msgstr "_Dagen begynner:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Fri"
 msgstr "_Fr."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utførte oppgaver etter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Mon"
 msgstr "_Ma."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Overdue tasks:"
 msgstr "Utgåtte _oppgaver:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Sat"
 msgstr "L_ø."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Show appointment end times in week and month view"
 msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Time divisions:"
 msgstr "Oppdeling av _tid:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
 msgid "_Tue"
 msgstr "_Ti."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
 msgid "_Wed"
 msgstr "_On."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
 msgid "before every anniversary/birthday"
 msgstr "før hvert jubileum/bursdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 msgid "before every appointment"
 msgstr "før hver avtale"
 
@@ -3597,12 +3403,12 @@ msgid "Type:"
 msgstr "Type:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:156
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3621,35 +3427,35 @@ msgstr "Kopier oppgavelisten lokalt for frakoblet operasjon"
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Kopier notatlisten lokalt for frakoblet operasjon"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "Fa_rge:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Notatliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Kalenderegenskaper"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "Egenskaper for oppgaveliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "Ny oppgaveliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "Egenskaper for notatliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "Ny notatliste"
 
@@ -3704,31 +3510,11 @@ msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " til "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (Fullført "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "Fullført "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (Ferdig "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "Ferdig "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:238
 msgid "Could not save attachments"
 msgstr "Kunne ikke lagre vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:506
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
@@ -3773,22 +3559,22 @@ msgstr "Behold opprinnelig oppføring?"
 msgid "Click here to close the current window"
 msgstr "Klikk her for å lukke dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1464
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1471
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
 #: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Slett utvalget"
@@ -3797,10 +3583,10 @@ msgstr "Slett utvalget"
 msgid "Click here to view help available"
 msgstr "klikk her for å vise tilgjengelig hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1513
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
@@ -3808,8 +3594,8 @@ msgstr "Lim inn fra utklippstavlen"
 msgid "Click here to save the current window"
 msgstr "Klikk her for å lagre dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Velg all tekst"
@@ -3818,14 +3604,14 @@ msgstr "Velg all tekst"
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1632
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Fil"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -3834,17 +3620,17 @@ msgid "_Insert"
 msgstr "Sett _inn"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1674 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "_Vis"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "_Vedlegg..."
 
@@ -3929,29 +3715,29 @@ msgstr "Slår av/på visning av deltakertype-feltet"
 msgid "Recent _Documents"
 msgstr "Siste _dokumenter"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1692
+#: ../composer/e-composer-actions.c:477
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
+#: ../calendar/gui/dialogs/comp-editor.c:1747
 msgid "Save"
 msgstr "Lagre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2031
+#: ../calendar/gui/dialogs/comp-editor.c:2080
+#: ../calendar/gui/dialogs/comp-editor.c:2974
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2942
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:3004
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
@@ -3971,6 +3757,10 @@ msgstr "Destinasjonen er skrivebeskyttet"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Slett denne oppføringen fra andre mottakere's postbokser?"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "T_rekk tilbake kommentar"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Hendelsen kunne ikke slettes pga en CORBA-feil"
@@ -4031,59 +3821,59 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Alarms"
 msgstr "V_arsel"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Click here to set or unset alarms for this event"
 msgstr "Klikk her for å sette eller fjerne varsling for denne hendelsen"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:215
+msgid "Show Time as _Busy"
+msgstr "Vis tiden som _opptatt"
+
+#: ../calendar/gui/dialogs/event-editor.c:217
+msgid "Toggles whether to show time as busy"
+msgstr "Slår av/på visning av tid som opptatt"
+
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "_Recurrence"
 msgstr "Gjeninnt_reffelse"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Make this a recurring event"
 msgstr "Gjør denne hendelsen til repeterende"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:233
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../plugins/groupwise-features/send-options.c:210
+#: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "Alternativer for sending"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:235
 #: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "Sett inn avanserte alternativer for sending"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:243
 msgid "All _Day Event"
 msgstr "Avtale som varer hele _dagen"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "Toggles whether to have All Day Event"
 msgstr "Slår av/på hendelser som varer hele dagen"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
-msgid "Show Time as _Busy"
-msgstr "Vis tiden som _opptatt"
-
-#: ../calendar/gui/dialogs/event-editor.c:235
-msgid "Toggles whether to show time as busy"
-msgstr "Slår av/på visning av tid som opptatt"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "_Free/Busy"
 msgstr "_Ledig/opptatt"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Query free / busy information for the attendees"
 msgstr "Slå opp ledig/opptatt informasjon for deltakerene"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
+#: ../calendar/gui/dialogs/event-editor.c:302
 msgid "Appoint_ment"
 msgstr "Av_tale"
 
@@ -4096,68 +3886,68 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Hendelsen kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2721
 msgid "This event has alarms"
 msgstr "Denne hendelsen har varsel"
 
-#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.c:833
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:880
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:882
 msgid "Atte_ndees"
 msgstr "De_ltakere"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1100
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1271
+#: ../calendar/gui/dialogs/memo-page.c:660
+#: ../calendar/gui/dialogs/task-page.c:864
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1281
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1304
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1311
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:924
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1479
+#: ../calendar/gui/dialogs/memo-page.c:707
+#: ../calendar/gui/dialogs/task-page.c:930
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1504
+#: ../calendar/gui/dialogs/task-page.c:954
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2594
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke åpne kalender «%s»."
@@ -4168,40 +3958,40 @@ msgstr "Kunne ikke åpne kalender «%s»."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2638
+#: ../calendar/gui/dialogs/memo-page.c:920
+#: ../calendar/gui/dialogs/task-page.c:1746
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer på vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag før avtalen"
 msgstr[1] "%d dager før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2946
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time før avtalen"
 msgstr[1] "%d timer før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2952
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutt før avtalen"
 msgstr[1] "%d minutter før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2965
 msgid "Customize"
 msgstr "Tilpass"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2967
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ingen"
@@ -4219,7 +4009,9 @@ msgid "15 minutes before appointment"
 msgstr "15 minutter før avtalen"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
 msgstr "De_ltakere..."
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
@@ -4235,28 +4027,26 @@ msgstr "Egendefinert varsel:"
 msgid "Event Description"
 msgstr "Beskrivelse av hendelse"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "Sa_mmendrag:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "_Varsel"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_Sted:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_Sammendrag:"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "_Tid:"
@@ -4271,7 +4061,7 @@ msgstr "i"
 msgid "until"
 msgstr "til"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
 msgid "Memo"
 msgstr "Notat"
 
@@ -4283,14 +4073,14 @@ msgstr "Notatet kan ikke redigeres fordi valgt notatliste er skrivebeskyttet"
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Notatet kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:881
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke åpne notater i «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
+#: ../calendar/gui/dialogs/memo-page.c:1048 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Til"
@@ -4300,68 +4090,73 @@ msgstr "Til"
 msgid "Sta_rt date:"
 msgstr "Sta_rtdato:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "Sa_mmendrag:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "T_il:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:383
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Du endrer en repeterende hendelse. Hva ønsker du å endre?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Du delegerer en repeterende hendelse. Hva ønsker du å delegere?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Du endrer en repeterende oppgave. Hva ønsker du å endre?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Du endrer et repeterende notat. Hva ønsker du å endre?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Kun denne instansen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Denne og tidligere instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Denne og fremtidige instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Alle instanser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Gjenintreffingsdato er ugyldig"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "Tid for slutt av gjentakelse var før hendelsens start"
 
 #. 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:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "på"
 
@@ -4369,7 +4164,7 @@ msgstr "på"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "første"
 
@@ -4378,7 +4173,7 @@ msgstr "første"
 #. * (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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "sekund"
 
@@ -4386,7 +4181,7 @@ msgstr "sekund"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "tredje"
 
@@ -4394,7 +4189,7 @@ msgstr "tredje"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "fjerde"
 
@@ -4402,7 +4197,7 @@ msgstr "fjerde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "femte"
 
@@ -4410,13 +4205,13 @@ msgstr "femte"
 #. * (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:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "siste"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Annen dato"
 
@@ -4424,7 +4219,7 @@ msgstr "Annen dato"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "Første til tiende"
 
@@ -4432,7 +4227,7 @@ msgstr "Første til tiende"
 #. * 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:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "ellevte til tjuende"
 
@@ -4440,45 +4235,45 @@ msgstr "ellevte til tjuende"
 #. * 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:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "tjueførste til trettiførste"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "dag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "Legg til unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "Fant ikke et utvalg å endre."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "Endre unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "Fant ikke et utvalg å slette."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -4490,7 +4285,7 @@ msgstr "Hver"
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:86
 msgid "Preview"
 msgstr "Forhåndsvis"
 
@@ -4514,11 +4309,11 @@ msgstr "uke(r)"
 msgid "year(s)"
 msgstr "Ã¥r"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "Send mine alarmer med denne hendelsen"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "Varsle _kun nye deltakere"
 
@@ -4527,19 +4322,19 @@ msgstr "Varsle _kun nye deltakere"
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "Nettside"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Fullført"
@@ -4547,46 +4342,46 @@ msgstr "Fullført"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1125 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Høy"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2669
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Lav"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1124
+#: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normal"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -4602,7 +4397,7 @@ msgstr "Stat_us:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1771
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4612,8 +4407,8 @@ msgstr "Status"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "Udefinert"
 
@@ -4622,7 +4417,7 @@ msgid "_Date completed:"
 msgstr "Fullført _dato:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
@@ -4643,11 +4438,11 @@ msgstr "Klikk for å endre/vise detaljer om status for oppgaven"
 msgid "_Send Options"
 msgstr "Alternativer for _sending"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:325
 msgid "Task Details"
 msgstr "Oppgavedetaljer"
 
@@ -4660,24 +4455,20 @@ msgstr ""
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Oppgaven kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:391
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:837
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1703
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "De_ltakere..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Kategor_ier..."
@@ -4775,7 +4566,7 @@ msgid "Categories:"
 msgstr "Kategorier:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -4790,8 +4581,8 @@ msgstr "Ferdig-dato:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "Status:"
 
@@ -4800,8 +4591,8 @@ msgid "Priority:"
 msgstr "Prioritet:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -4816,32 +4607,32 @@ msgstr "Nettside:"
 msgid "Created"
 msgstr "Opprettet"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "Sist endret"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Startdato"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4852,63 +4643,49 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nei"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "Forvalgt klient"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Innstillinger for skall"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Innstillinger for programmet"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "Ã…pner %s"
@@ -4948,94 +4725,94 @@ msgstr "Startdato"
 #: ../calendar/gui/e-meeting-list-view.c:566
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Type"
 msgstr "Type"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:407
 msgid "Cut selected events to the clipboard"
 msgstr "Klipp ut valgte hendelser til utklippstavlen"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:413
 msgid "Copy selected events to the clipboard"
 msgstr "Kopier valgte hendelser til utklippstavlen"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:419
 msgid "Paste events from the clipboard"
 msgstr "Lim inn hendelser fra utklippstavlen"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:425
 msgid "Delete selected events"
 msgstr "Slett valgte hendelser"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2330
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2336
 msgid "Declined"
 msgstr "Avslått"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1720
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1721
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "Delegated"
 msgstr "Delegert"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1722
 msgid "Needs action"
 msgstr "Krever handling"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1867 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1871 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1887 ../calendar/gui/print.c:2624
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1918
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
@@ -5078,8 +4855,8 @@ msgstr "Vis den andre tidssonen"
 #. 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:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:878 ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5089,10 +4866,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/e-day-view-top-item.c:882 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:916
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5101,34 +4878,38 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../calendar/gui/e-day-view-top-item.c:886 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:952
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2638
 #, c-format
 msgid "Week %d"
 msgstr "Uke %d"
 
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "Repeterende:"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
-msgstr "Ja (enkel gjeninntreffelse)"
+msgstr "Ja. (enkel repetisjon)"
 
 #: ../calendar/gui/e-itip-control.c:782
 #, c-format
@@ -5207,7 +4988,7 @@ msgstr "Slutter"
 msgid "Due"
 msgstr "Ferdig"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
@@ -5216,306 +4997,305 @@ msgstr "iCalendar-informasjon"
 msgid "iCalendar Error"
 msgstr "iCalendar-feil"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "En ukjent person"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+"Please review the following information, and then select an action from the "
+"menu below."
 msgstr ""
-"<br>Vennligst sjekk følgende informasjon og velg så en handling fra menyen "
-"under."
+"Vennligst sjekk følgende informasjon og velg så en handling fra menyen under."
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2317
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2333
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "Møtet er avlyst, men det ble ikke funnet i dine kalendere."
 
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "Oppgaven er avlyst men den ble ikke funnet i dine oppgavelister"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> har publisert møteinformasjon."
+msgid "%s has published meeting information."
+msgstr "%s har publisert møteinformasjon."
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> forespør at %s er tilstede i et møte."
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s ber om at %s er tilstede i et møte."
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> forespør din tilstedeværelse i et møte."
+msgid "%s requests your presence at a meeting."
+msgstr "%s ber om din tilstedeværelse i et møte."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "Møteforslag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> ønsker å være med på et eksisterende møte."
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s ønsker å være med på et eksisterende møte."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> ønsker å motta seneste møteinformasjon."
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s ønsker å motta sist oppdaterte møteinformasjon."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "Forespørsel om møteoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> har svart på en møteforespørsel."
+msgid "%s has replied to a meeting request."
+msgstr "%s har svart på en møteforespørsel."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> har avlyst et møte."
+msgid "%s has canceled a meeting."
+msgstr "%s har avlyst et møte."
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "Møteavlysing"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> har sendt en uforståelig melding."
+msgid "%s has sent an unintelligible message."
+msgstr "%s har sendt en uforståelig melding."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "Ugyldig møtemelding"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> har publisert informasjon om en oppgave."
+msgid "%s has published task information."
+msgstr "%s har publisert informasjon om en oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> forespør at %s utfører en oppgave."
+msgid "%s requests %s to perform a task."
+msgstr "%s ber om at %s utfører en oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> forespør at du utfører en oppgave."
+msgid "%s requests you perform a task."
+msgstr "%s ber om at du utfører en oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "Forslag til oppgave"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> ønsker å være med på en eksisterende oppgave."
+msgid "%s wishes to be added to an existing task."
+msgstr "%s ønsker å være med på en eksisterende oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "Oppgaveoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> ønsker å motta den seneste informasjon om oppgaven."
+msgid "%s wishes to receive the latest task information."
+msgstr "%s ønsker å motta sist oppdatert informasjon om oppgaven."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "Forespørsel om oppgaveoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> har svart på en oppgavetildeling."
+msgid "%s has replied to a task assignment."
+msgstr "%s har svart på en oppgavetildeling."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "Svar på oppgave"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> har avlyst en oppgave."
+msgid "%s has canceled a task."
+msgstr "%s har avlyst en oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "Avlysning av oppgave"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgavemelding"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> har publisert ledig/opptatt-informasjon."
+msgid "%s has published free/busy information."
+msgstr "%s har publisert ledig/opptatt-informasjon."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> forespør din ledig/opptatt-informasjon."
+msgid "%s requests your free/busy information."
+msgstr "%s ber om å se din ledig/opptatt-informasjon."
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "Ledig/opptatt forespørsel"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> har svart på en forespørsel etter ledig/opptatt-informasjon."
+msgid "%s has replied to a free/busy request."
+msgstr "%s har svart på en forespørsel om ledig/opptatt-informasjon."
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "Ledig/opptatt svar"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/opptatt-melding"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "Meldingen ser ikke ut til å være riktig utformet"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingen inneholder forespørsler som ikke er støttet."
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "Oppdatering fullført\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikke oppdateres\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Dette svaret er ikke fra en aktiv deltaker. Legg til som deltaker?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../calendar/gui/e-itip-control.c:2084
+#: ../plugins/itip-formatter/itip-formatter.c:1420
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kunne ikke sendes!\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "Velg en handling:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-itip-control.c:2302
 #: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Godta"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "Godta tentativt"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/opptatt-informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "Oppdater status for respondent"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -5564,56 +5344,56 @@ msgid "Resources"
 msgstr "Ressurser"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Ressurs"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Rom"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Styremedlem"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "Trenger handling"
 
@@ -5622,14 +5402,14 @@ msgstr "Trenger handling"
 msgid "Attendee                          "
 msgstr "Deltaker                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "Under arbeid"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -5638,7 +5418,7 @@ msgstr "%A, %d %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
@@ -5648,67 +5428,63 @@ msgstr "%a %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "Borte fra kontoret"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "Del_takere..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "Al_ternativer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "K_un vis arbeidstid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ut"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_Alle personer og ressurser"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "Alle _personer og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "_Obligatoriske personer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "Obligatoriske personer _og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
@@ -5737,44 +5513,46 @@ msgid "Member"
 msgstr "Medlem"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../modules/calendar/e-cal-shell-content.c:465
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "Notater"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
 msgid "* No Summary *"
 msgstr "* Ingen sammendrag *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
 msgid "Start: "
 msgstr "Start: "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
 msgid "Due: "
 msgstr "Ferdig: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:709
 msgid "Cut selected memos to the clipboard"
 msgstr "Klipp ut valgte notater til utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:715
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopier valgte notater til utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:721
 msgid "Paste memos from the clipboard"
 msgstr "Lim inn notater fra utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:727
+#: ../modules/calendar/e-memo-shell-view-actions.c:565
 msgid "Delete selected memos"
 msgstr "Slett valgt notat"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Select all visible memos"
 msgstr "Velg alle synlige notater"
 
@@ -5782,122 +5560,87 @@ msgstr "Velg alle synlige notater"
 msgid "Click to add a memo"
 msgstr "Klikk for å legge til et notat"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2052
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:427
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Oppgaver"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:932
 msgid "Cut selected tasks to the clipboard"
 msgstr "Klipp ut valgte oppgaver til utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:938
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopier valgte oppgaver til utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:944
 msgid "Paste tasks from the clipboard"
 msgstr "Lim inn oppgaver fra utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "Slett valgte oppgaver"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:956
 msgid "Select all visible tasks"
 msgstr "Velg alle synlige oppgaver"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Velg tidssone"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "Har alarmer."
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "Har gjeninntreffelse"
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "Er et møte."
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalenderhendelse: Sammendraget er %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenderhendlelse: Har ikke sammendrag."
 
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "vis kalenderhendelse"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "Ta fokus"
 
@@ -5926,7 +5669,7 @@ msgstr "GÃ¥ til dato"
 msgid "a table to view and select the current time range"
 msgstr "en tabell som viser og velger aktivt tidsområde"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5935,14 +5678,14 @@ msgstr[1] "Har %d hendelser."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 msgid "It has no events."
 msgstr "Har ingen hendelser."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Arbeidsukevisning: %s. %s"
@@ -5950,36 +5693,36 @@ msgstr "Arbeidsukevisning: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Dagvisning: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "kalendervisning for en arbeidsuke"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "kalendervisning for en eller flere dager"
 
 #: ../calendar/gui/ea-gnome-calendar.c:46
 #: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:912
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:919
+#: ../modules/calendar/e-cal-shell-view-private.c:925
+#: ../modules/calendar/e-cal-shell-view-private.c:928
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -5987,10 +5730,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:945
+#: ../modules/calendar/e-cal-shell-view-private.c:956
+#: ../modules/calendar/e-cal-shell-view-private.c:963
+#: ../modules/calendar/e-cal-shell-view-private.c:966
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -6002,25 +5745,25 @@ msgstr "Hoppeknapp"
 msgid "Click here, you can find more events."
 msgstr "Klikk her for å finne flere hendelser."
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "MÃ¥nedsvisning: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Ukevisning: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:188
 msgid "calendar view for a month"
 msgstr "kalendervisning for en måned"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:190
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "Purging"
 msgstr "Tømmer"
 
@@ -6073,39 +5816,40 @@ msgid "Select Date"
 msgstr "Velg dato"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "September"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
+msgid "Select _Today"
+msgstr "Velg i _dag"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_Velg i dag"
+msgid "September"
+msgstr "September"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Informasjon om notat"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
@@ -6113,7 +5857,7 @@ msgstr "Kalenderinformasjon"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Godtatt"
@@ -6122,7 +5866,7 @@ msgstr "Godtatt"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
@@ -6134,7 +5878,7 @@ msgstr "Akseptert tentativt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Avslått"
@@ -6143,7 +5887,7 @@ msgstr "Avslått"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegert"
@@ -6151,7 +5895,7 @@ msgstr "Delegert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Oppdatert"
@@ -6159,7 +5903,7 @@ msgstr "Oppdatert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Avbryt"
@@ -6167,7 +5911,7 @@ msgstr "Avbryt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Oppdater"
@@ -6175,30 +5919,30 @@ msgstr "Oppdater"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Klarer ikke å booke en ressurs. Den nye hendelsen er i konflikt med en annen."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "Kan ikke booke en ressurs. Feil: "
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
@@ -6354,49 +6098,81 @@ msgstr "Fr."
 msgid "Sa"
 msgstr "Lø."
 
-#: ../calendar/gui/print.c:2564
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2429
+msgid " to "
+msgstr " til "
+
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2437
+msgid " (Completed "
+msgstr " (Fullført "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2441
+msgid "Completed "
+msgstr "Fullført "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2449
+msgid " (Due "
+msgstr " (Ferdig "
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2454
+msgid "Due "
+msgstr "Ferdig "
+
+#: ../calendar/gui/print.c:2588
 msgid "Appointment"
 msgstr "Avtale"
 
-#: ../calendar/gui/print.c:2566
+#: ../calendar/gui/print.c:2590 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammendrag: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2639
 msgid "Attendees: "
 msgstr "Deltakere: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2682
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2697
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2726
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2739
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2750
 msgid "Contacts: "
 msgstr "Kontakter: "
 
@@ -6421,44 +6197,189 @@ msgstr "er større enn"
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "Avtaler og møter"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
+#: ../plugins/itip-formatter/itip-formatter.c:1832
 msgid "Opening calendar"
 msgstr "Ã…pner kalender"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-filer (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar-import"
 
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "PÃ¥minnelse!"
 
-#: ../calendar/importers/icalendar-importer.c:583
+#: ../calendar/importers/icalendar-importer.c:662
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar-import"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "Hendlelser i kalenderen"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligent import for Evolution kalender"
 
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1237
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "Møte"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1237
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "Hendelse"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1238
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Oppgave"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1239
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Notat"
+
+#: ../calendar/importers/icalendar-importer.c:941
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "har gjeninntreffelse"
+
+#: ../calendar/importers/icalendar-importer.c:946
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "er en instans"
+
+#: ../calendar/importers/icalendar-importer.c:951
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "har alarmer"
+
+#: ../calendar/importers/icalendar-importer.c:956
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "har vedlegg"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "Offentlig"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Privat"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Konfidensiell"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "Klassifisering"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1278
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Sammendrag"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "Lokasjon"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1274
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "Start"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "Ferdig"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Slutt"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "Kategorier"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Fullført"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Organisator"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Deltakere"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1270
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Type"
+
 #.
 #. *
 #. * This program is free software; you can redistribute it and/or
@@ -8008,157 +7929,157 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: ../composer/e-composer-actions.c:79
+#: ../composer/e-composer-actions.c:81
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:283
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:288
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "L_agre som..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "Lagre som ut_kast"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "Lagre som utkast"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "Ny _melding"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "Ã…pne nytt meldingsvindu"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "T_egnkoding"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:363
 msgid "PGP _Encrypt"
 msgstr "Krypt_er med PGP"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:365
 msgid "Encrypt this message with PGP"
 msgstr "Krypter denne meldingen med PGP"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:371
 msgid "PGP _Sign"
 msgstr "_Signer med PGP"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:373
 msgid "Sign this message with your PGP key"
 msgstr "Signer denne meldingen med din PGP-nøkkel"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "_Prioriter melding"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "Sett meldingsprioritet til høy"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "S_pør om lesekvittering"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:389
 msgid "Get delivery notification when your message is read"
 msgstr "Motta leveringsmelding når meldingen blir lest"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "_Krypter med S/MIME"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:397
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Krypter denne meldingen med ditt S/MIME-krypteringssertifikat"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "Sig_ner med S/MIME"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:405
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signer denne meldingen med ditt S/MIME signatursertifikat"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:411
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:413
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Slå av/på visning av BCC-feltet"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "Slå av/på visning av CC-feltet"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:427
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:429
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Slå av/på visning av Fra-feltet"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Slå av/på visning av Svar-til feltet"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:480
 msgid "Save Draft"
 msgstr "Lagre utkast"
 
@@ -8170,15 +8091,15 @@ msgstr "Vis"
 msgid "Hide"
 msgstr "Skjul"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8186,58 +8107,58 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten å vises i "
 "mottakerlisten for meldingen."
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "Fra"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "Cc"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Bcc"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "Em_ne:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
@@ -8262,19 +8183,19 @@ msgid "Save draft"
 msgstr "Lagre utkast"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:188
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "Ikke vis _denne meldingen igjen."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:1005
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:1012
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8282,21 +8203,19 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1405
 msgid "Unable to reconstruct message from autosave file"
 msgstr "Kunne ikke gjenopprette melding fra automatisk lagret fil"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1471 ../composer/e-msg-composer.c:1678
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:3310
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#: ../composer/e-msg-composer.c:3334
+msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
-"<b>(Redigering inneholder en meldingskropp som ikke er tekst, og som ikke "
-"kan redigeres.)<b>"
+"Redigering inneholder en meldingskropp som ikke er tekst, og som ikke kan "
+"redigeres."
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -8377,7 +8296,7 @@ msgstr ""
 "meldingen vil la deg fortsette der du slapp."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "Filen «{0}» er ikke en vanlig fil og kan ikke sendes i en melding."
 
 #: ../composer/mail-composer.error.xml.h:17
@@ -8396,8 +8315,8 @@ msgid "Unable to activate the address selector control."
 msgstr "Klarte ikke å aktivere kontroll for adressevelger."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "Du kan ikke legge ved filen «{0}» i denne meldingen."
+msgid "You cannot attach the file n{0}' to this message."
+msgstr "Du kan ikke legge ved filen «n{0}» i denne meldingen."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8419,34 +8338,30 @@ msgstr "Gjenopp_rett"
 msgid "_Save Draft"
 msgstr "L_agre skisse"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:199
 msgid "Run Anjal in a window"
 msgstr "Kjør Anjal i et vindu"
 
-#: ../capplet/anjal-settings-main.c:203
+#: ../capplet/anjal-settings-main.c:200
 msgid "Make Anjal the default email client"
-msgstr "Bruk Anjal som forvalgt e-postklient"
+msgstr "Bruk Anjal som _forvalgt e-postklient"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:207
 msgid "ID of the socket to embed in"
-msgstr ""
+msgstr "ID for pluggen vi skal koble til"
 
-#: ../capplet/anjal-settings-main.c:211
+#: ../capplet/anjal-settings-main.c:208
 msgid "socket"
 msgstr "plugg"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:221
 msgid "Anjal email client"
-msgstr "Anjal e-postklient"
-
-#: ../capplet/settings/mail-view.c:244
-msgid "New Tab"
-msgstr "Ny fane"
+msgstr "Anjal e-postprogram"
 
 #: ../capplet/settings/mail-account-view.c:56
 msgid "Please enter your full name."
-msgstr "Vennligst oppgi fullt navn."
+msgstr "Vennligst oppgi ditt fulle navn."
 
 #: ../capplet/settings/mail-account-view.c:57
 msgid "Please enter your email address."
@@ -8456,213 +8371,215 @@ msgstr "Vennligst oppgi din e-postadresse."
 msgid "The email address you have entered is invalid."
 msgstr "E-postadressen du oppga er ugyldig."
 
-#: ../capplet/settings/mail-account-view.c:224
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Personlige detaljer:</span>"
+#: ../capplet/settings/mail-account-view.c:182
+msgid "Personal details:"
+msgstr "Personlige detaljer:"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:189
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../capplet/settings/mail-account-view.c:238
+#: ../capplet/settings/mail-account-view.c:198
 msgid "Email address:"
 msgstr "E-postadresse:"
 
-#: ../capplet/settings/mail-account-view.c:248
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detaljer for mottak:</span>"
+#: ../capplet/settings/mail-account-view.c:208
+msgid "Receiving details:"
+msgstr "Detaljer for mottak:"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
+#: ../capplet/settings/mail-account-view.c:215
+#: ../capplet/settings/mail-account-view.c:265
 msgid "Server type:"
-msgstr "Type tjener:"
+msgstr "Tjenertype:"
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
+#: ../capplet/settings/mail-account-view.c:224
+#: ../capplet/settings/mail-account-view.c:274
 msgid "Server address:"
-msgstr "Adresse til tjener:"
+msgstr "Tjeneradresse:"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:233
+#: ../capplet/settings/mail-account-view.c:283
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:292
 msgid "Use encryption:"
 msgstr "Bruk kryptering:"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:247
+#: ../capplet/settings/mail-account-view.c:297
 msgid "never"
 msgstr "aldri"
 
-#: ../capplet/settings/mail-account-view.c:298
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detaljer for sending:</span>"
+#: ../capplet/settings/mail-account-view.c:258
+msgid "Sending details:"
+msgstr "Detaljer for utsendelse:"
 
-#: ../capplet/settings/mail-account-view.c:355
+#: ../capplet/settings/mail-account-view.c:316
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
 "If we can't do it automatically you'll need your server details as well."
-msgstr "For å bruke e-postprogrammet må du konfigurere en konto. Oppgi din e-postadresse og passord under så skal vi prøve å finne ut alle innstillingene. Hvis vi ikke klarer å gjøre dette automatisk vil du trenge detaljene for tjeneren også."
+msgstr ""
+"Du må sette opp en konto for å bruke e-postprogrammet. Oppgi din e-"
+"postadresse og passord under så skal vi prøve ut alle innstillingene. Hvis "
+"det ikke lar seg gjøre automatisk må du oppgi detaljer for tjeneren også."
 
-#: ../capplet/settings/mail-account-view.c:357
+#: ../capplet/settings/mail-account-view.c:318
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
-msgstr "Beklager, vi klarte ikke å finne ut innstillingene for å hente e-post automatisk. Vennligst oppgi disse under. Vi har prøvd å starte med detaljene du nettopp oppga, men du vil kanskje måtte endre dem."
+msgstr ""
+"Beklager - kan ikke finne ut av innstillingene for å hente din e-post "
+"automatisk. Vennligst oppgi dem nedenfor. Har forsøkt å lage et utgangspunkt "
+"med detaljene du nettopp oppga, men du må kanskje endre dem."
 
-#: ../capplet/settings/mail-account-view.c:359
+#: ../capplet/settings/mail-account-view.c:320
 msgid "You can specify more options to configure the account."
 msgstr "Du kan oppgi flere alternativer for å konfigurere kontoen."
 
-#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:322
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
-msgstr "Oppgi nå dine innstillinger for sending av e-post. Vi har prøvd noen gjetninger men du bør se over dem for å være sikker."
+msgstr ""
+"Nå trengs innstillingene for å sende e-post. Har prøvd å gjette litt men du "
+"bør se over dem for å være sikker."
 
-#: ../capplet/settings/mail-account-view.c:362
+#: ../capplet/settings/mail-account-view.c:323
 msgid "You can specify your default settings for your account."
-msgstr "Du kan oppgi dine forvalgte innstillinger for kontoen."
+msgstr "Du kan oppgi forvalgte innstillinger for kontoen."
 
-#: ../capplet/settings/mail-account-view.c:363
+#: ../capplet/settings/mail-account-view.c:324
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
-msgstr "Se over informasjonen før vi prøver å koble til tjeneren for å hente din e-post."
+msgstr ""
+"Se over innstillingene før forsøk på å koble til tjeneren for å hente e-"
+"posten din."
 
-#: ../capplet/settings/mail-account-view.c:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:339
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2190
+#: ../mail/mail-config.ui.h:60
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../capplet/settings/mail-account-view.c:378
+#: ../capplet/settings/mail-account-view.c:339
 msgid "Next - Receiving mail"
-msgstr "Neste - Innkommende e-post"
+msgstr "Neste - mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
 msgid "Receiving mail"
 msgstr "Mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:340
+#: ../capplet/settings/mail-account-view.c:341
 msgid "Next - Sending mail"
-msgstr "Neste - Sending av e-post"
+msgstr "Neste - Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
 msgid "Back - Identity"
 msgstr "Tilbake - Identitet"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:340
 msgid "Next - Receiving options"
 msgstr "Neste - Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:341
 msgid "Receiving options"
 msgstr "Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:341
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Back - Receiving mail"
 msgstr "Tilbake - Mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Sending mail"
-msgstr "Sending av e-post"
+msgstr "Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:343
+#: ../capplet/settings/mail-account-view.c:344
 msgid "Next - Review account"
 msgstr "Neste - Se over konto"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Next - Defaults"
 msgstr "Neste - Forvalg"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:343
 msgid "Back - Receiving options"
 msgstr "Tilbake - Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:344
+#: ../mail/em-account-editor.c:2769 ../mail/mail-config.ui.h:33
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:344
 msgid "Back - Sending mail"
-msgstr "Tilbake - Sending av e-post"
+msgstr "Tilbake - Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
 msgid "Review account"
 msgstr "Se over konto"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
 msgid "Finish"
 msgstr "Fullfør"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:346
 msgid "Back - Sending"
-msgstr "Tilbake - Sending"
+msgstr "Tilbake - Utsendelse"
 
-#: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
+#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "Lukk fane"
 
-#: ../capplet/settings/mail-account-view.c:729
+#: ../capplet/settings/mail-account-view.c:690
 msgid "Account Wizard"
-msgstr "Kontoassistent"
+msgstr "Kontoveiviser"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "Evolution kontoassistent"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "Innstillinger for e-post"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-msgid "Quit"
-msgstr "Avslutt"
-
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1617
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:659
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:211
+#: ../mail/message-list.c:1607
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/addressbook/e-book-shell-migrate.c:126
 #: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-cal-shell-backend.c:133
+#: ../modules/calendar/e-cal-shell-migrate.c:141
 #: ../modules/calendar/e-memo-shell-backend.c:108
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-migrate.c:109
 msgid "On This Computer"
 msgstr "PÃ¥ denne datamaskinen"
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:146
 #: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "Endre"
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
-msgstr "Legg til ny konto"
+msgstr "Legg til en ny konto"
 
-#: ../capplet/settings/mail-settings-view.c:185
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Kontohåndtering</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "HÃ¥ndtering av konti"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "Innstillinger"
 
@@ -8674,7 +8591,7 @@ msgstr "Varsling om kalenderhendelser"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution varslingstjeneste"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:823
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8693,15 +8610,11 @@ msgstr "HÃ¥ndter e-post, kontakter og kalender"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
 msgid "Configure email accounts"
-msgstr "Konfigurer e-postkontoer"
+msgstr "Konfigurer e-postkonti"
 
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "adressekort"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "kalenderinformasjon"
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "Innstillinger for e-post"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:224
@@ -8796,56 +8709,66 @@ msgstr "Vest-europeisk"
 msgid "Western European, New"
 msgstr "Vest-europeisk, ny"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "Tradisjonell"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "Forenklet"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "Synlig"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1788
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "I dag"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "I morgen"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "I går"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "%d dager fra nå"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "%d dag fra nå"
+msgstr[1] "%d dager fra nå"
 
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "%d dager siden"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d dag siden"
+msgstr[1] "%d dager siden"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "Bruk forvalg for locale"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "Format:"
 
@@ -8866,18 +8789,6 @@ msgstr "Skriver «%s»"
 msgid "Writing \"%s\" to %s"
 msgstr "Skriver «%s» til %s"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Navn på logger"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "Filnavn"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "Filnavn på modulen"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Feilsøkingslogger"
@@ -8900,13 +8811,13 @@ msgstr "Loggmeldinger:"
 msgid "Log Level"
 msgstr "Loggnivå"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2686
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
@@ -8930,32 +8841,21 @@ msgstr "Feilsøk"
 msgid "Error, Warnings and Debug messages"
 msgstr "Feil, advarsler og feilsøkingsmeldinger"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "Aktivert"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Om tillegget er aktivert"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "uker"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "En feil oppsto under utskrift"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "Utskriftssystemet rapporterte følgende detaljer om feilen:"
 
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Utskriftssystemet rapporterte ingen detaljer om feilen."
@@ -8964,7 +8864,7 @@ msgstr "Utskriftssystemet rapporterte ingen detaljer om feilen."
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "Fordi «{1}»."
 
@@ -8984,235 +8884,235 @@ msgstr "Vil du overskrive den?"
 msgid "File exists \"{0}\"."
 msgstr "Filen «{0}» eksisterer."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:133
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:170
 msgid "Could not open the link."
 msgstr "Kunne ikke åpne lenken."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:220
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjelp for Evolution."
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1304
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf-feil: %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1315
 msgid "All further errors shown only on terminal."
 msgstr "Alle videre feil blir kun vist på konsollet."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Emne"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1138
 msgid "Mailer"
 msgstr "E-postprogram"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Dato"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:84
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:85
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Ansikt"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1302
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1361
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message"
 msgstr "Kunne ikke lese PGP/MIME-melding"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Kunne ikke lese PGP/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "Ustøttet signaturformat"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 msgid "Error verifying signature"
 msgstr "Feil under verifisering av signatur"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message"
 msgstr "Kunne ikke lese PGP-melding"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Kunne ikke lese PGP-melding: Ukjent feil"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekund i fremtiden"
 msgstr[1] "%d sekunder i fremtiden"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minutt siden"
 msgstr[1] "%d minutter siden"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "om 1 minutt"
 msgstr[1] "om %d minutter"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 time siden"
 msgstr[1] "%d timer siden"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "om 1 time"
 msgstr[1] "om %d timer"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dag siden"
 msgstr[1] "%d dager siden"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "om 1 dag"
 msgstr[1] "om %d dager"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 uke siden"
 msgstr[1] "%d uker siden"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 uke i fremtiden"
 msgstr[1] "%d uker i fremtiden"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "om 1 måned"
 msgstr[1] "om %d måneder"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 år siden"
 msgstr[1] "%d år siden"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "Om 1 år"
 msgstr[1] "Om %d år"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "nå"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Velg en tid å sammenligne mot"
 
@@ -9244,11 +9144,17 @@ msgstr "Hvis noe kriterie er møtt"
 msgid "_Find items:"
 msgstr "_Finn oppføringer:"
 
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:759
+msgid "None"
+msgstr "Ingen"
+
 #: ../filter/e-filter-rule.c:760
 msgid "All related"
 msgstr "Alle relaterte"
 
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Svar"
 
@@ -9265,11 +9171,11 @@ msgid "I_nclude threads"
 msgstr "Ta _med tråder"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Utgående"
 
@@ -9301,7 +9207,7 @@ msgstr "Mangler dato."
 msgid "Missing file name."
 msgstr "Mangler filnavn."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "Mangler navn."
 
@@ -9378,7 +9284,7 @@ msgstr "i fremtiden"
 msgid "months"
 msgstr "måneder"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:180
 msgid "seconds"
 msgstr "sekunder"
 
@@ -9394,44 +9300,28 @@ msgstr "tiden du oppgir"
 msgid "years"
 msgstr "Ã¥r"
 
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
+#: ../widgets/misc/e-attachment-paned.c:123
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Vedlegg"
 msgstr[1] "Vedlegg"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:586
+#: ../widgets/misc/e-attachment-paned.c:581
 msgid "Icon View"
 msgstr "Ikonvisning"
 
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:587
+#: ../widgets/misc/e-attachment-paned.c:582
 msgid "List View"
 msgstr "Listevisning"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Fokussporing"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "Skallmodul"
-
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "Skallmotor for e-post"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "Vis slettede"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "Vis slettede meldinger"
+#: ../mail/e-mail-browser.c:262
+msgid "(No Subject)"
+msgstr "(Uten emne)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9478,7 +9368,7 @@ msgid "_Later"
 msgstr "_Senere"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:476
 msgid "Add Label"
 msgstr "Legg til etikett"
 
@@ -9498,118 +9388,57 @@ msgstr ""
 msgid "Color"
 msgstr "Farge"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Navn"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2706
+#: ../modules/mail/e-mail-shell-view-private.c:953
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
 msgid "Drafts"
 msgstr "Skisser"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
 msgid "Sent"
 msgstr "Sendt"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:572
 msgid "Templates"
 msgstr "Maler"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Viktig"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "Oppgaver"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Senere"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "Flytter..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "Flytting"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Flytter «%s»:"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Kan ikke opprette ny mappe «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Kan ikke kopiere mappe «%s» til «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Kan ikke søke etter eksisterende postbokser på «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:643
 msgid "Migrating Folders"
 msgstr "Flytter mapper"
 
-#: ../mail/e-mail-migrate.c:1824
-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 ""
-"Lokasjon og hierarki for Evolutions e-postmapper er endret siden Evolution 1."
-"x.\n"
-"\n"
-"Vennligst vent mens Evolution migrere dine mapper..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr ""
-"Kunne ikke åpne gamle data om meldinger som er beholdt på tjeneren for POP-"
-"tjener «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr ""
-"Klarte ikke å opprette katalog for bevaring av data på POP3-tjener «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Kan ikke kopiere data for bevaring på POP3-tjener: «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Klarte ikke å opprette lokalt e-postlager «%s»: %s"
-
-#: ../mail/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:644
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9621,45 +9450,36 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:740
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
+msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
 
-#: ../mail/e-mail-migrate.c:3049
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Kan ikke lese innstillinger fra tidligere Evolution-installasjon. «evolution/"
-"config.xmldb» er korrupt eller ser ikke ut til å eksistere."
-
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:108
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "Ikke spør meg igjen"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:260 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:260 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "K_opier"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:634 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:634 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../mail/e-mail-reader.c:864
+#: ../mail/e-mail-reader.c:860
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -9671,539 +9491,538 @@ msgstr[1] "Lagre meldinger"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:881 ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1139
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1141
 msgid "Add sender to address book"
 msgstr "Legg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1146
 msgid "Check for _Junk"
 msgstr "Sjekk etter _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1148
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter uønsket e-poststatus"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1153
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1155
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1160
 msgid "_Delete Message"
 msgstr "_Slett melding"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1162
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1167
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer på e-post_liste..."
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1169
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1174
 msgid "Filter on _Recipients..."
 msgstr "Filtrer på mottake_re..."
 
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1176
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Lag en regel for å filtrere meldinger til disse mottakerene"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1181
 msgid "Filter on Se_nder..."
 msgstr "Filtrer på se_nder..."
 
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1183
 msgid "Create a rule to filter messages from this sender"
 msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1188
 msgid "Filter on _Subject..."
 msgstr "Filtrer på e_mne..."
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1190
 msgid "Create a rule to filter messages with this subject"
 msgstr "Lag en regel for filtrering av meldinger med dette emnet"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1195
 msgid "A_pply Filters"
 msgstr "_Påfør filtre"
 
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1197
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler på de valgte meldingene"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1202
 msgid "_Find in Message..."
 msgstr "_Finn i melding..."
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1204
 msgid "Search for text in the body of the displayed message"
 msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1209
 msgid "_Clear Flag"
 msgstr "F_jern flagg"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1211
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Fjern flagg for oppfølging fra valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1216
 msgid "_Flag Completed"
 msgstr "Merk som _fullført"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1218
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Sett flagg for oppfølging til fullført på valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1223
 msgid "Follow _Up..."
 msgstr "Følg _opp..."
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1225
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfølging"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1230
 msgid "_Attached"
 msgstr "L_agt ved"
 
-#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1232 ../mail/e-mail-reader.c:1239
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1237
 msgid "Forward As _Attached"
 msgstr "Videresend s_om vedlegg"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1244
 msgid "_Inline"
 msgstr "_I meldingen"
 
-#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1246 ../mail/e-mail-reader.c:1253
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1251
 msgid "Forward As _Inline"
 msgstr "V_ideresend som vedlegg"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1258
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1260 ../mail/e-mail-reader.c:1267
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1265
 msgid "Forward As _Quoted"
 msgstr "Videresend s_om sitat"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1272
 msgid "_Load Images"
 msgstr "_Last bilder"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1274
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1279
 msgid "_Important"
 msgstr "V_iktig"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1281
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1286
 msgid "_Junk"
 msgstr "_Uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1288
 msgid "Mark the selected messages as junk"
 msgstr "Merk valgte meldinger som uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1293
 msgid "_Not Junk"
 msgstr "_Ikke uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1295
 msgid "Mark the selected messages as not being junk"
 msgstr "Merk valgte meldinger som ønsket e-post"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1300
 msgid "_Read"
 msgstr "_Les"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1302
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1307
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1309
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1314
 msgid "_Unread"
 msgstr "_Ulest"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1316
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1321
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1323
 msgid "Open the selected messages in the composer for editing"
 msgstr "Ã…pne valgte meldinger i redigeringskomponenten"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1328
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1330
 msgid "Open a window for composing a mail message"
 msgstr "Åpne et vindu for å skrive en e-post melding"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1335
 msgid "_Open in New Window"
 msgstr "_Ã…pne i _nytt vindu"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1337
 msgid "Open the selected messages in a new window"
 msgstr "Ã…pne valgte meldinger i et nytt vindu"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1342
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1344
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1349
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1351
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1356
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1358
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1363
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1365
 msgid "Display the next thread"
 msgstr "Vis neste tråd"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1370
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1372
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1377
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1379
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1384
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1386
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1391
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1393
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1400
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1407
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1412
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1414
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1421
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1426
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1428
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1433
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1435
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv et svar til avsender av den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1440
 msgid "_Save as mbox..."
 msgstr "Lagre _som mbox..."
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1442
 msgid "Save selected messages as an mbox file"
 msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1447
 msgid "Search Folder from Mailing _List..."
 msgstr "Søkemappe på e-post_liste..."
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1449
 msgid "Create a search folder for this mailing list"
 msgstr "Lag en søkemappe for denne e-postlisten"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1454
 msgid "Search Folder from Recipien_ts..."
 msgstr "Søkemappe fra mo_ttakere..."
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1456
 msgid "Create a search folder for these recipients"
 msgstr "Lag en søkemappe for disse mottakerene"
 
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1461
 msgid "Search Folder from Sen_der..."
 msgstr "Søkemappe for avsen_der..."
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1463
 msgid "Create a search folder for this sender"
 msgstr "Lag en søkemappe for denne avsenderen"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1468
 msgid "Search Folder from S_ubject..."
 msgstr "Søkemappe for _emne..."
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1470
 msgid "Create a search folder for this subject"
 msgstr "Lag en søkemappe for dette emnet"
 
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1475
 msgid "_Message Source"
 msgstr "_Meldingskilde"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1477
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin råe form"
 
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1489
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1491
 msgid "Undelete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1496
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1498
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1503
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1505
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1510
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1512
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1519
 msgid "Create R_ule"
 msgstr "Opprett _regel"
 
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1526
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1533
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1540
 msgid "_Go To"
 msgstr "_GÃ¥ til"
 
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1547
 msgid "Mar_k As"
 msgstr "Mer_k som"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1554
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1561
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1586
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging..."
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1594
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1598
 msgid "Mark as _Junk"
 msgstr "Merk som _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1602
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1606
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1610
 msgid "Mark as Uni_mportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1614
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/e-mail-reader.c:1654
+#: ../mail/e-mail-reader.c:1650
 msgid "_Caret Mode"
 msgstr "Markør_modus"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:1652
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Vis en blinkende markør i kroppen av meldinger som vises"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1658
 msgid "All Message _Headers"
 msgstr "Alle meldings_hoder"
 
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:1660
 msgid "Show messages with all email headers"
 msgstr "Vis meldinger med alle meldingshoder"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1882
 msgid "Unable to retrieve message"
 msgstr "Kunne ikke hente ut melding"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1886 ../mail/e-mail-reader.c:1946
+#: ../mail/mail-ops.c:1843
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Henter melding «%s»"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2462 ../mail/mail-config.ui.h:30
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2583
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2584
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2629 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Neste"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2637
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2641 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "Svar"
 
@@ -10213,24 +10032,24 @@ msgstr "Merk for oppfølging"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:74
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Ingen kryptering"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:128
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:99
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
@@ -10253,34 +10072,34 @@ msgstr ""
 "og kryss av i ruten for å akseptere den\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "Spør for hver melding"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10290,7 +10109,7 @@ msgstr ""
 "\n"
 "Klikk «Framover» for å begynne."
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2060
 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 "
@@ -10300,20 +10119,20 @@ msgstr ""
 "må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2227
+#: ../mail/mail-config.ui.h:92
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "Vennligst konfigurer følgende kontoinnstillinger."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2705
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10321,11 +10140,11 @@ msgstr ""
 "Vennligst skriv inn informasjon om måten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "HÃ¥ndtering av konti"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2069
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10333,11 +10152,11 @@ msgstr ""
 "Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
 "Dette navnet vil kun bli brukt som et visningsnavn."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10351,56 +10170,56 @@ msgstr ""
 "\n"
 "Klikk «Bruk» for å lagre dine innstillinger."
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2514
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2522
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2892 ../mail/mail-config.ui.h:106
 msgid "Security"
 msgstr "Sikkerhet"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2937 ../mail/em-account-editor.c:3005
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2938 ../mail/em-account-editor.c:3006
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3474
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3474
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1570
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
-msgstr "Din melding til %s om «%s» den %s har blitt lest."
+msgstr "Din melding til %s om «%s» den %s er har blitt lest."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1618
 #, c-format
 msgid "Delivery Notification for: \"%s\""
-msgstr "Varsling om levering for: «%s»"
+msgstr "Varsling om ny e-post for «%s»"
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1947
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. 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:1997
+#: ../mail/em-composer-utils.c:1994
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10408,19 +10227,19 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2138
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2319
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2320
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "Velg mappe"
 
@@ -10501,6 +10320,10 @@ msgstr "Følg opp"
 msgid "Forward to"
 msgstr "Videresend til"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Viktig"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "er etter"
@@ -10525,7 +10348,7 @@ msgstr "er ikke satt"
 msgid "is set"
 msgstr "er satt"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "Uønsket e-post"
 
@@ -10574,7 +10397,7 @@ msgid "Play Sound"
 msgstr "Spill lyd"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "Les"
 
@@ -10655,16 +10478,16 @@ msgid "Unset Status"
 msgstr "Nullstill status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "SÃ¥ etter"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "Legg til hand_ling"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ulest melding:"
@@ -10672,24 +10495,24 @@ msgstr[1] "Uleste meldinger:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Totalt antall melding:"
 msgstr[1] "Totalt antall meldinger:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Bruk av kvote (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "Bruk av kvote"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "Egenskaper for mappe"
 
@@ -10697,37 +10520,37 @@ msgstr "Egenskaper for mappe"
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "Opp_rett"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1070 ../mail/mail-vfolder.c:1135
 msgid "Search Folders"
 msgstr "Søkemapper"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1086
 msgid "Loading..."
 msgstr "Laster..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:183
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:596
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavn kan ikke inneholde tegnet «/»"
 
@@ -10749,74 +10572,74 @@ msgstr "Mappenavn kan ikke inneholde tegnet «/»"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1078
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1286
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1583 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1585 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1592 ../mail/message-list.c:2106
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1594 ../mail/message-list.c:2108
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1609
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Move Folder To"
 msgstr "Flytt mappe til"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Copy Folder To"
 msgstr "Kopier mappe til"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:509
+#: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
-msgid "Creating folder `%s'"
+msgid "Creating folder '%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:672
 msgid "Create Folder"
 msgstr "Opprett mappe"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:673
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:693
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Fjerner abonnement på mappe «%s»"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10824,11 +10647,11 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10836,11 +10659,11 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10848,11 +10671,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kan ikke verifisere avsender"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10860,11 +10683,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
 msgid "Signature exists, but need public key"
 msgstr "Signatur eksisterer, men trenger offentlig nøkkel"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -10872,11 +10695,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men det finnes ingen "
 "tilhørende offentlig nøkkel."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10884,11 +10707,11 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overføring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -10898,11 +10721,11 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10910,11 +10733,11 @@ msgstr ""
 "Denne meldingen er kryptert. Det vil være vanskelig for en utenforstående å "
 "se innholdet i denne meldingen."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -10923,15 +10746,15 @@ msgstr ""
 "Denne meldingen er kryptert med en sterk algoritme. Det vil være meget "
 "vanskelig for en utenforstående å se innholdet i denne meldingen på kort tid."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10939,28 +10762,28 @@ msgstr ""
 "Evolution kan ikke rendre denne e-posten da den er for stor. Du kan vise den "
 "uformattert eller åpne den i et eksternt redigeringsprogram."
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:726
 msgid "Completed on"
 msgstr "Fullført"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:734
 msgid "Overdue:"
 msgstr "Utgått:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:738
 msgid "by"
 msgstr "innen"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
 msgid "View _Unformatted"
 msgstr "Vis uformattert"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:950
 msgid "Hide _Unformatted"
 msgstr "Skjul _uformatterte"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1012
 msgid "O_pen With"
 msgstr "Ã…_pne med"
 
@@ -10969,17 +10792,17 @@ msgstr "Ã…_pne med"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:147
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:338
 msgid "Formatting Message..."
 msgstr "Formatterer melding..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
 #, c-format
-msgid "Retrieving `%s'"
+msgid "Retrieving '%s'"
 msgstr "Henter «%s»"
 
 #: ../mail/em-format-html.c:1854
@@ -11017,40 +10840,53 @@ msgstr "Peker til ukjente eksterne data («%s»-type)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#.
-#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2600
 #, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "Denne meldingen ble sendt av <b>%s</b> på vegne av <b>%s</b>"
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Denne meldingen ble sendt av %s på vegne av %s"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:668
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Dette lageret støtter ikke abonnering, eller så er dette ikke aktivert."
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:719
 msgid "Subscribed"
 msgstr "Abonnert"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:723
 msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1111
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1157
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "Er du sikker på at du vil åpne %d melding samtidig?"
+msgstr[1] "Er du sikker på at du vil åpne %d meldinger samtidig?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "_Do not show this message again"
+msgstr "Ikke vis _denne meldingen igjen"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Meldingsfiltre"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:853
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
@@ -11059,7 +10895,7 @@ msgstr "Meldinger fra %s"
 msgid "Search _Folders"
 msgstr "Søke_mapper"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:521
 msgid "Add Folder"
 msgstr "Legg til mappe"
 
@@ -11100,50 +10936,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Bredde på «Send & motta e-post»-vindu"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Lar evolution vise tekstdel av begrenset størrelse"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Alltid be om lesekvittering"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "Automatisk gjenkjenning av smilefjes"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "Automatisk gjenkjenning av lenker"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Sjekk om innkommende meldinger er uønsket e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Farge for utheving av sitattekst"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Farge for utheving av sitattekst."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Forvalgt høyde for skrivevindu"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Forvalgt bredde for skrivevindu"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "Katalog for å laste/legge ved vedlegg i redigeringsprogrammet"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Komprimer visning av adresser i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11151,7 +10983,7 @@ msgstr ""
 "Komprimer visning av adresser i Til/Cc/Bcc til antall oppgitt i "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11159,11 +10991,11 @@ msgstr ""
 "Kontrollerer hvor ofte lokale endringer synkroniseres med ekstern e-"
 "posttjener. Intervallet må være minst 30 sekunder."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "Egendefinert meldingshode som skal sjekkes for uønsket e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11171,63 +11003,63 @@ msgstr ""
 "Egendefinerte meldingshoder som brukes ved sjekk etter uønsket e-post. "
 "Formatet for listeelementene er «headername=value»."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Forvalgt tegnsett for nye meldinger"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Forvalgt tegnsett for nye meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Forvalgt tegnsett for visning av meldinger"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Forvalgt tegnsett for visning av meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Forvalgt videresendingsstil"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Forvalgt høyde for redigeringsvinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Forvalgt høyde for e-postleservinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Forvalgt høyde for dialog for abonnering."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "Forvalgt maksimert tilstand for e-postleservinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Forvalgt svarstil"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Forvalgt verdi for trådutvidelsestilstand"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Forvalgt bredde for redigeringsvinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Forvalgt bredde for e-postleservinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Forvalgt bredde for abonneringsdialogen."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11235,11 +11067,11 @@ msgstr ""
 "Bestemmer om oppslag for filtrering av uønsket e-post kun skal slås opp i "
 "lokale adressebøker"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Bestemmer om avsenders e-post skal slås opp i adresseboken"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11251,13 +11083,13 @@ msgstr ""
 "som er merket for automatisk fullføring. Operasjonen kan være treg hvils "
 "eksterne adressebøker som LDAP er merket for automatisk fullføring."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Bestemmer om egendefinerte meldingshoder skal brukes for å se etter uønsket "
 "e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11267,7 +11099,7 @@ msgstr ""
 "post. Hvis dette alternativet er aktivert og meldingshodene finnes vil  "
 "dette forbedre hastigheten for denne sjekken."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11275,18 +11107,22 @@ msgstr ""
 "Bestemmer om samme skrift skal brukes for både «Fra» og «Emne»-linjene i "
 "«Meldinger»-kolonnen i vertikal visning."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "Katalog for å laste/legge ved filer i redigering av ny e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "Katalog for å lagre komponentfiler for e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Slå av eller på bruk av ellipse for mappenavn i sidelinjen"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "Ikke legg til skillelinje for signatur"
@@ -11361,14 +11197,16 @@ msgstr ""
 "meldingsvisning, meldingsliste og mapper."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "Vis tekstdel av melding med begrenset størrelse."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "Aktiver/deaktiver markørmodus"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:47
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Bruk samme koding for filnavn som Outlook/GMail"
 
@@ -11497,11 +11335,13 @@ msgstr ""
 "søkeresultatene."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+#, fuzzy
+msgid "Last time Empty Junk was run"
 msgstr "Sist gang mapper for uønsket e-post ble tømt"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+#, fuzzy
+msgid "Last time Empty Trash was run"
 msgstr "Sist gang papirkurven ble tømt"
 
 #: ../mail/evolution-mail.schemas.in.h:85
@@ -11613,64 +11453,69 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "Merk sitat in e-posten «Forhåndsvisning»."
 
 #: ../mail/evolution-mail.schemas.in.h:109
+#, fuzzy
+msgid "Message text limit for display"
+msgstr "Meldingsvisning"
+
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Stil på e-postvisning («normal», «full headers», «source»)"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimum antall dager mellom tømming av mapper for uønsket e-post ved "
 "avslutting"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum antall dager mellom tømming av papirkurven ved avslutting"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tømming av mapper for uønsket e-post ved "
 "avslutting, i dager."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tømming av papirkurven ved avslutting, i dager."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Antall adresser som skal vises i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "Stopp og spør ved tomt emne"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Stopp og spør før en mappe blir tømt."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Stopp og spør når en en e-post uten emne skal bli sendt."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "Spør ved sletting av meldinger fra søkemappe"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "Stopp og spør før tømming"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "Stopp og spør når bare «Bcc» er utfylt"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Spør når bruker prøver å åpne 10 eller flere meldinger samtidig"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11678,130 +11523,130 @@ msgstr ""
 "Spør når bruker prøver å sende HTML-meldinger til mottakere som ikke ønsker "
 "Ã¥ motta HTML-meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Spør når bruker prøver å sende en melding uten Til- eller Cc-mottakere."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Spør når bruker prøver å sende uønsket HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "Spør ved merking av flere meldinger"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr "Plasser personlige signaturer på toppen av svar"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "Plasser markør ved bunnen av svar"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Gjenkjenn smilefjes i tekst og erstatt dem med bilder."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "Gjenkjenn lenker i tekst og erstatt dem."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "Sjekk om innkommende e-post er uønsket."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "Lagre katalog"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "Søk etter bilde av avsender i lokale adressebøker"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "Send HTML e-post som forvalg"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "Send HTML e-post som forvalg."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "Kolonne for avsenders e-postadresse i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "Intervall for serversynkronisering"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Vis «Bcc» feltet når meldinger sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Vis «Cc» feltet når meldinger sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Vis «Fra» feltet når du poster til en nyhetsgruppe"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"From\" field when sending a mail message"
 msgstr "Vis «Fra» feltet når meldinger sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Vis «Svar-til» feltet når du poster til en nyhetsgruppe"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Vis «Svar-til» feltet når meldinger sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "Vis animasjoner"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show all message headers"
 msgstr "Vis alle meldingshoder"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show all the headers when viewing a messages."
 msgstr "Vis alle meldingshoder når en melding vises."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilder som animasjoner."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Vis slettede meldinger i meldingslisten (gjennomstreket)."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede meldinger i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show image animations"
 msgstr "Vis bildeanimasjoner"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show original \"Date\" header value."
 msgstr "Vis opprinnelig verdi for «Date»-meldingshode."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "Vis bilde av avsender"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11809,7 +11654,7 @@ msgstr ""
 "Vis «Bcc»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-menyen "
 "når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11817,7 +11662,7 @@ msgstr ""
 "Vis «Cc»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-menyen når "
 "en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11825,7 +11670,7 @@ msgstr ""
 "Vis «Fra»-feltet når en melding sendes til en nyhetsgruppe. Dette "
 "kontrolleres fra «Vis»-menyen når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11833,7 +11678,7 @@ msgstr ""
 "Vis «Fra»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-menyen "
 "når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11841,7 +11686,7 @@ msgstr ""
 "Vis «Svar-til»-feltet når en melding sendes til en nyhetsgruppe. Dette "
 "kontrolleres fra «Vis»-menyen når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11849,61 +11694,61 @@ msgstr ""
 "Vis «Svar-til»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-"
 "menyen når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Vis avsenders e-postadresse i en egen kolonne i meldingslisten."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Vis bilde av avsender i meldingsområdet."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "Farge for stavekontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "Språk for stavekontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "Forvalgt høyde på abonneringsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "Forvalgt bredde på abonneringsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "Grense for tekstdel av melding"
-
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "Forvalgt tillegg for uønsket e-post"
 
 #: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
+#, fuzzy
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Sist gang mapper for uønsket e-post ble tømt i dager siden epoch."
 
 #: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
+#, fuzzy
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Sist gang papirkurven ble tømt i dager."
 
 #: ../mail/evolution-mail.schemas.in.h:172
@@ -11931,9 +11776,11 @@ msgstr ""
 "feilsøkingsmeldinger."
 
 #: ../mail/evolution-mail.schemas.in.h:176
+#, fuzzy
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
 "Bestemmer maksimal størrelse for tekstdelen som kan formatteres i evolution. "
 "Forvalg er 4MB / 4096 KB og oppgis i KB."
@@ -12098,529 +11945,584 @@ msgstr "Bredde på e-postlistefeltet"
 msgid "Width of the message-list pane."
 msgstr "Bredde på e-postlistefeltet."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "E-post"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
 msgstr "Import fra Elm for Evolution"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
 msgstr "Importer e-post fra Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "MÃ¥lmappe:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+msgid "_Destination folder:"
+msgstr "_MÃ¥lmappe:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder to import into"
 msgstr "Velg mappe å importere til"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Emne"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
+msgctxt "mboxImp"
+msgid "From"
+msgstr "Fra"
+
+#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:413
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer mapper i Berkeley Mailbox format"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Importerer postboks"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:149
+#: ../plugins/pst-import/pst-importer.c:453
+#: ../plugins/pst-import/pst-importer.c:559
 #, c-format
-msgid "Importing `%s'"
+msgid "Importing '%s'"
 msgstr "Importerer «%s»"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:293
 #, c-format
 msgid "Scanning %s"
 msgstr "Søker i %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "Importerer data fra Pine"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:419
 msgid "Evolution Pine importer"
 msgstr "Import fra Pine for Evolutions"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:420
 msgid "Import mail from Pine."
 msgstr "Importer e-post fra Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(NB! Krever omstart av programmet)"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
 
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>Alternativ for topp-posting</b> (Ikke anbefalt)"
+msgid "(Not Recommended)"
+msgstr "(Ikke anbefalt)"
 
 #: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(NB! Krever omstart av programmet)"
+
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "Legg til n_y signatur..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "All_tid signer utgående meldinger når denne kontoen brukes"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Send krypterte me_ldinger til meg selv når kryptert e-post sendes"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "All_tid _kopi (cc) til:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid _blindkopi (bcc) til:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Alltid s_tol på nøkler i min nøkkelring ved kryptering"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Alltid krypter til _meg selv ved sending av krypterte meldinger"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "Allti_d be om lesekvittering"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "S_ett inn smilefjes automatisk"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "Sj_ekk støttede typer"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "_Sjekk egendefinerte meldingshoder for uønsket e-post"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
 msgstr "Sjekk om innkommende _meldinger er uønsket"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sjekker om innkommende e-post er uønsket"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "_Tøm"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "Tø_m"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "Skriver meldinger"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekreft ved tømming av en mappe"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:31
 msgid "Default Behavior"
 msgstr "Forvalgt oppførsel"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:32
 msgid "Default character e_ncoding:"
 msgstr "Forvalgt teg_nkoding:"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:34
 msgid "Delete Mail"
 msgstr "Slett e-post"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
 msgid "Delete junk messages on e_xit"
 msgstr "Slett uønsket e-post når programmet a_vsluttes"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:37
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer _utgående meldinger digitalt (som forvalg)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "Viste meldings_hoder"
+#: ../mail/mail-config.ui.h:38
+msgid "Displayed Message Headers"
+msgstr "Viste meldingshoder"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "Ikke formater meldinger når st_ørrelsen overstiger"
+#: ../mail/mail-config.ui.h:39
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "Ikke vis meldinger når tekstst_ørrelsen overstiger"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:40
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ikke mer_k meldinger som uønsket hvis avsender finnes i adresseboken"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "Ikke siter"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "_Tøm papirkurven når programmet avsluttes"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Magic S_pacebar"
 msgstr "Aktiver magi_sk mellomromtast"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Sea_rch Folders"
 msgstr "Aktiver søkemappe_r"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:48
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat for kry_ptering:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
 msgid "Encrypt out_going messages (by default)"
 msgstr "Krypter ut_gående meldinger (som forvalg)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
 msgid "Fi_xed-width:"
 msgstr "Fast _bredde:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:51
 msgid "Fix_ed width Font:"
 msgstr "Skrift med fast br_edde:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:52
 msgid "Font Properties"
 msgstr "Egenskaper for skrift"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:53
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:54
 msgid "Full Nam_e:"
 msgstr "_Fullt navn:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:56
 msgid "HTML Messages"
 msgstr "HTML-meldinger"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:57
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-proxy:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "I meldingen"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "I meldingen (som i Outlook)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:64
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:65 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiketter"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:66
 msgid "Languages Table"
 msgstr "Språktabell"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:67
 msgid "Loading Images"
 msgstr "Laster bilder"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:68
 msgid "Mail Headers Table"
 msgstr "Tabell med meldingshoder"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:69
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:70
 msgid "Message Display"
 msgstr "Meldingsvisning"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:71
 msgid "Message Fonts"
 msgstr "Skrift for melding"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:72
 msgid "Message Receipts"
 msgstr "Meldingsmottakere"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:73
 msgid "No _Proxy for:"
 msgstr "Ingen _proxy for:"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:75
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Merk: du vil ikke bli spurt etter et passord før du kobler til første gang"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:76
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Alternativet vil ignoreres hvis det finnes treff for egendefinerte "
 "meldingshoder for uønsket e-post."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:77
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Valgfri informasjon"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:79
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av meldinger med kun Bcc-mottakere definert"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:85
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:87
 msgid "Printed Fonts"
 msgstr "Skrifter på utskrift"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:88
 msgid "Proxy Settings"
 msgstr "Innstillinger for proxy"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:89
 msgid "Quoted"
 msgstr "Sitert"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:90
 msgid "Re_member password"
 msgstr "_Husk passord"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:91
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:93
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94
 msgid "Required Information"
 msgstr "Nødvendig informasjon"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:96
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:97
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:98
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:100
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL er ikke støttet i denne versjonen av Evolution  "
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:101
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Kun søk etter bilde av avs_ender i lokale adressebøker"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:102
 msgid "S_elect..."
 msgstr "V_elg..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:103
 msgid "S_end message receipts:"
 msgstr "Send kvittering for m_eldinger:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:104
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:107
 msgid "Select Drafts Folder"
 msgstr "Velg mappe for skisser"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:108
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:109
 msgid "Select HTML fixed width font for printing"
 msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:110
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:111
 msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:112
 msgid "Select Sent Folder"
 msgstr "Velg mappe for sendte meldinger"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:113
 msgid "Sender Photograph"
 msgstr "Bilde av avsender"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:114
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:116
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:118
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:119
 msgid "Server _Type:"
 msgstr "Tjener_type:"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:120
+msgid "Si_gning algorithm:"
+msgstr "Si_gneringsalgoritme:"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "Sig_naturer"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:125
+msgid "Signing _algorithm:"
+msgstr "Signerings_algoritme:"
+
+#: ../mail/mail-config.ui.h:126
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:127
 msgid "Start _typing at the bottom on replying"
 msgstr "S_tart skriving under meldingen ved svar"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:129
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:130
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12628,7 +12530,7 @@ msgstr ""
 "Språklisten som vises her reflekterer kun de språkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:131
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12638,7 +12540,12 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes\n"
 "for visning på skjermen."
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:135
+msgid "Top Posting Option"
+msgstr "Alternativ for «topp-posting»"
+
+#: ../mail/mail-config.ui.h:136
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12646,183 +12553,189 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:138
 msgid "Us_ername:"
 msgstr "Bruk_ernavn:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:139
 msgid "Use Authe_ntication"
 msgstr "Bruk aute_ntisering"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:140 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:141
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "_Autentiseringstype"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:145
 msgid "_Default junk plugin:"
 msgstr "_Forvalgt tillegg for uønsket e-post:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte tilkobling til internett"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:147
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:148
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Behold signaturen over opprinnelig melding ved svar"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "_Språk"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images in messages from contacts"
 msgstr "_Last bilder i meldinger fra kontakter"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "S_lå kun opp i lokale adressebokmapper"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "_Manuell konfigurasjon av proxy:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:155
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:157
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:158
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:160
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S_pør ved sending av meldinger med tomt emnefelt"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:161
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:162
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:163
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sikker HTTP-proxy:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:164
+msgid "_Select..."
+msgstr "_Velg..."
+
+#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "Tj_ener:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:167
 msgid "_Show image animations"
 msgstr "Vi_s animasjoner"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:168
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Vi_s bilde av avsender i forhåndsvisning av meldingen"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:170
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Slå sammen Til/Cc/Bcc-hoder til "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:171
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:172
 msgid "_Use system defaults"
 msgstr "Br_uk systemets forvalg"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:173
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre programmer"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:176
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:177 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:178
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:179
 msgid "description"
 msgstr "beskrivelse"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Alle aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "Alle lokale og aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "Alle lokale mapper"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Ring"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "Fu_llført"
 
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Collapse _all"
+msgstr "Slå sammen _alle"
+
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Digital signatur"
@@ -12832,58 +12745,66 @@ msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
 #: ../mail/mail-dialogs.ui.h:9
+msgid "E_xpand all"
+msgstr "Ut_vid alle"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "Abonnement på mapper"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "Følg opp"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "Videresend"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "Gjennomgå"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "Tj_ener:"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr "V_is kun oppføringer som inneholder:"
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr "Kilder for søkemapper"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "Spesifikke mapper"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12891,170 +12812,170 @@ msgstr ""
 "Meldingene du har valgt for oppfølging er listet under.\n"
 "Vennligst velg en handling for oppfølging fra menyen «Flagg»."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:754
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Filtrerer valgte meldinger"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:576
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:588 ../mail/mail-ops.c:616
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:633
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:744 ../mail/mail-ops.c:825
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:754
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:781
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:783 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:785 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:897
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Lagrer melding til mappe «%s»"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:974
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Flytter meldinger til «%s»"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:974
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopierer meldinger til «%s»"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1083
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Skanner mapper i «%s»"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1191
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1232
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Åpner mappe «%s»"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1298
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Henter kvoteinformasjon for mappe «%s»"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1370
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Åpner lager «%s»"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1441
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Fjerner mappe «%s»"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1561
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1624
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1625
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1679
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Oppdaterer mappe «%s»"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1719
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Tømmer mappe «%s»"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1764
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1765
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1961
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2050
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d meldinger"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2131
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13063,11 +12984,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2203
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2221 ../mail/mail-ops.c:2229
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13076,35 +12997,35 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2244
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2389
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Kobler fra «%s»"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2389
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Kobler til «%s» på nytt"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2485
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto «%s» for frakoblet bruk"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2571
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "Avbryter..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
@@ -13112,108 +13033,137 @@ msgstr "Send & motta e-post"
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "Oppdaterer..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:208
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:210
 msgid "Enter Passphrase"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:213
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:215
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:257
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:667
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "Ingen måladresse oppgitt. Videresending av meldingen ble avbrutt."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:673
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Fant ingen konto å bruke. Videresending av meldingen ble avbrutt."
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:119
 #, c-format
-msgid "Could not create spool directory `%s': %s"
+msgid "Could not create spool directory '%s': %s"
 msgstr "Kan ikke opprette spool-katalog «%s»: %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:149
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Prøver å bruke movemail på en kilde som ikke er i mbox-format «%s»"
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "Prøver å bruke movemail på en kilde, «%s», som ikke er i mbox-format"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:297
 #, c-format
-msgid "Invalid folder: `%s'"
+msgid "Invalid folder: '%s'"
 msgstr "Ugyldig mappe: «%s»"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setter opp søkemappe: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:228
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Oppdaterer søkemapper for «%s:%s»"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Oppdaterer søkemapper for «%s»"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:678
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-vfolder.c:1188
 msgid "Edit Search Folder"
 msgstr "Rediger søkemappe"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1293
 msgid "New Search Folder"
 msgstr "Ny søkemappe"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "Sjekk etter uønsket e-post feilet"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "Feil under rapportering av uønsket e-post"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "Feil under rapportering av e-post som ønsket"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 "En mappe med navn «{0}» eksisterer allerede. Vennligst bruk et annet navn."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 "En mappe med navn «{1}» eksisterer allerede. Vennligst bruk et annet navn."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13225,7 +13175,7 @@ msgstr ""
 "Du kan velge å ignorere denne mappen, overskrive eller legge til innhold "
 "der, eller avslutte."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13233,14 +13183,14 @@ msgstr ""
 "En lesekvittering er forespurt for «{1}». Vil du sende leveringskvittering "
 "til {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr ""
 "En signatur med navn «{0}» eksisterer allerede. Vennligst bruk et annet navn."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13248,26 +13198,22 @@ msgstr ""
 "Hvis du gir dine meldinger en meningsfylt emnelinje vil mottakerene lettere "
 "forstå hva meldingen din handler om."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr ""
 "Er du sikker på at du vil slette denne kontoen med alle stedfortredere?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne kontoen?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Er du sikker på at du vil slette denne kontoen med alle stedfortredere?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Er du sikker på at du vil åpne {0} meldinger samtidig?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13275,7 +13221,7 @@ msgstr ""
 "Er du sikker på at du vil fjerne alle slettede meldinger fra alle mapper "
 "permanent?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13283,87 +13229,79 @@ msgstr ""
 "Er du sikker på at du vil fjerne alle slettede meldinger fra mappe «{0}» "
 "permanent?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Er du sikker på at du vil sende en melding i HTML-format?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Er du sikker på at du vil sende en melding med ugyldig adresse?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Er du sikker på at du vil sende en melding med ugyldige adresser?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Er du sikker på at du ønsker å sende en melding med kun BCB-mottakere?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Er du sikker på at du vil sende en melding uten emne?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "Fordi «{0}»."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "Fordi «{2}»."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Tom signatur"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Kan ikke legge til søkemappe «{0}»."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kan ikke kopiere mappe «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "Kan ikke opprette mappe «{0}»."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "Kan ikke opprette midlertidig katalog."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Kan ikke opprette katalog for lagring fordi «{1}»"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Kunne ikke slette mappe «{0}»."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Kan ikke slette systemmappe «{0}»."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Kan ikke redigere søkemappe «{0}» da den ikke eksisterer."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kunne ikke flytte mappe «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
-msgstr "Kan ikke åpne kilde «{1}»"
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "Kan ikke åpne kilde «{1}»."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "Kan ikke åpne kilde «{2}»."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "Kan ikke åpne mål «{2}»."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13371,35 +13309,31 @@ msgstr ""
 "Kan ikke lese lisensfil «{0}» pga et installasjonsproblem. Du vil ikke kunne "
 "bruke denne tilbyderen før du har mulighet til å godta lisensen."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Kan ikke endre navn på «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Kan ikke endre navn på eller flytte systemmappe «{0}»."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "Kan ikke lagre endringer for kontoen."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan ikke lagre til katalog «{0}»."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "Kan ikke lagre til fil «{0}»."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Kan ikke sette signaturskript «{0}»."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Sjekk etter uønsket e-post feilet"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13407,86 +13341,89 @@ msgstr ""
 "Sjekk at passordet ditt er skrevet korrekt. Husk at mange passord skiller "
 "mellom store og små bokstaver. Caps lock kan være på."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Kunne ikke lagre signaturfil."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Slett meldinger i søkemappe «{0}»?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Do not d_elete"
 msgstr "Ikke sl_ett"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "Ikke slett"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "Ikke deaktiver"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "Vil du synkronisere mapper som er merket for frakoblet bruk lokalt?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "Vil du merke alle meldinger som lest?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Oppgi passord."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Feil under lasting av filterdefinisjoner."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Feil under utføring av operasjon."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "Feil under {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "Filen eksisterer men kan ikke overskrives."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "Filen eksisterer, men den er ikke en vanlig fil."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Hvis du fortsetter vil du ikke kunne gjenopprette disse meldingene."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
 "Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
 "permanent."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Hvis du sletter mappen vil alt innhold i denne bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Hvis du fortsetter vil stedfortrederkontoer bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13494,11 +13431,11 @@ msgstr ""
 "Hvis du fortsetter vil all kontoinformasjon og\n"
 "mellomtjenerinformasjon bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13506,23 +13443,23 @@ msgstr ""
 "Hvis du avslutter vil ikke disse meldingene sendes før Evolution startes "
 "igjen."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Ugyldig autentisering"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "E-postfiltre oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13534,27 +13471,27 @@ msgstr ""
 "meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
 "Til: eller Cc:."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "Mangler mappe."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "Ingen kilder valgt."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "Opening too many messages at once may take a long time."
 msgstr "Hvis du åpner for mange meldinger på en gang kan dette ta lang tid."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Please check your account settings and try again."
 msgstr "Vennligst sjekk innstillingene for kontoen og prøv igjen."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Please enable the account or send using another account."
 msgstr "Vennligst sjekk kontoen eller send fra en annen konto."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 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."
@@ -13562,7 +13499,7 @@ msgstr ""
 "Vennligst oppgi en gyldig e-postadresse i Til:-feltet. Du kan søke etter e-"
 "postadresser ved å klikke på Til:-knappen ved siden av inntastingsfeltet."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13571,63 +13508,55 @@ msgstr ""
 "Sjekk at følgende mottakere kan og ønsker å motta e-post som HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "Oppgi et unikt navn for å identifisere denne signaturen."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "Vennligst vent."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Det oppsto et problem under migrering av gammel meldingsmappe «{0}»."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Spør tjener etter en liste med støttede autentiseringsmekanismer."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "Lesekvittering etterspurt."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Vil du virkelig slette mappen «{0}» og alle undermapper?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\"?"
 msgstr "Vil du virkelig slette mappen «{0}»?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "Feil under rapportering av uønsket e-post"
-
 #: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "Feil under rapportering av e-post som ønsket"
-
-#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "Søkemapper oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "Send kvittering"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "Signaturen eksisterer allerede"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "Synkroniser"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synkroniser mapper lokalt for frakoblet bruk?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13635,7 +13564,7 @@ msgstr ""
 "Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
 "endre navn på, flytte eller slette disse."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13651,35 +13580,7 @@ msgstr ""
 "meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
 "Til: eller Cc:."
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Følgende søkemapper:\n"
-"{0}\n"
-"brukte fjernet mappe:\n"
-"    «{1}»\n"
-"og er nå oppdatert."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Følgende filterregler:\n"
-"{0}\n"
-"brukte fjernet mappe:\n"
-"    «{1}»\n"
-"og er nå oppdatert."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13687,7 +13588,7 @@ msgstr ""
 "Følgende mottaker ble ikke gjenkjent som en gyldig e-postadresse:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13695,11 +13596,11 @@ msgstr ""
 "Følgende mottakere ble ikke gjenkjent som gyldige e-postadresser:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "Skriptfilen må eksistere og være kjørbar."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13707,20 +13608,20 @@ msgstr ""
 "Denne mappen er lagt til implisitt. Gå til redigering av søkemapper og legg "
 "den inn eksplisitt hvis det er nødvendig."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 "Denne meldingen kan ikke sendes fordi kontoen du sender med ikke er aktiv"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Denne meldingen kan ikke sendes fordi du ikke har oppgitt noen mottakere"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13728,21 +13629,25 @@ msgstr ""
 "Tjener støtter ikke denne typen autentisering. Det kan hende den ikke "
 "støtter autentisering i det hele tatt."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "Denne signaturen er endret, men er ikke lagret."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "Dette vil merke alle meldinger i valgt mappe med undermapper som lest."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:110
+msgid "This will mark all messages as read in the selected folder."
+msgstr "Dette vil merke alle meldinger i valgt mappe som lest."
+
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "Kunne ikke koble til GroupWise-tjener."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13750,19 +13655,19 @@ msgstr ""
 "Kan ikke åpne skisse-mappen for denne kontoen. Vil du bruke forvalgt mappe "
 "for skisser i stedet?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Kan ikke lese lisensfilen."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Bruk _forvalg"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Bruk forvalgt mappe for skisser?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13772,31 +13677,31 @@ msgstr ""
 "meldingene fra dine lokale eller eksterne mapper.\n"
 "Vil du virkelig gjøre dette?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:118
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har ikke tilstrekkelige rettigheter til å slette denne meldingen."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:119
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:120
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:121
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:122
 msgid "You must name this Search Folder."
 msgstr "Du må gi navn til denne søkemappen."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:123
 msgid "You must specify a folder."
 msgstr "Du må oppgi en mappe."
 
-#: ../mail/mail.error.xml.h:134
+#: ../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 "
@@ -13806,115 +13711,111 @@ msgstr ""
 "Enten ved å velge mappene individuelt og/eller å velge alle lokale mapper, "
 "alle eksterne mapper eller begge deler."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:126
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Din pålogging på tjener «{0}» som «{0}» feilet."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:127
 msgid "_Append"
 msgstr "_Legg til"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:128
 msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:129
 msgid "_Do not Synchronize"
 msgstr "I_kke synkroniser"
 
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:130
+#: ../modules/mail/e-mail-shell-view-actions.c:825
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurven"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:131
 msgid "_Expunge"
 msgstr "T_øm"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:132
 msgid "_Open Messages"
 msgstr "_Ã…pne meldinger"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1112
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1113
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1114
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1115
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1116
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1117
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1121
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1122
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1126
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1127
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1737 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1744 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1753
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1765
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1773
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1775
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2527
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "Skallmotor"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4212 ../mail/message-list.c:4606
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4445
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13922,15 +13823,7 @@ msgstr ""
 "Ingen meldinger passer dine søkekriterier. Du kan enten tømme søket med "
 "menyoppføringen Søk->Tøm eller endre det."
 
-#: ../mail/message-list.c:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"Det finnes kun skjulte meldinger i denne mappen. Bruk Vis->Vis skjulte "
-"meldinger for å vise dem."
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4447
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -13959,7 +13852,7 @@ msgid "Sent Messages"
 msgstr "Sendte meldinger"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:560
 msgid "Size"
 msgstr "Størrelse"
 
@@ -13968,27 +13861,27 @@ msgid "Subject - Trimmed"
 msgstr "Forkortet emne"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1216
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1223
 msgid "Message contains"
 msgstr "Melding inneholder"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1230
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1237
 msgid "Sender contains"
 msgstr "Avsender inneholder"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1244
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
@@ -14022,15 +13915,15 @@ msgstr ""
 "eller TLS. Dette betyr at din tilkobling vil være usikker, og at du vil være "
 "sårbar for sikkerhetshull. "
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "Bruk i kalender for _fødselsdager og jubileum"
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "Bruk i kalender for fød_selsdager og jubileum"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopier innholdet i adresse_boken lokalt for frakoblet operasjon"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -14040,7 +13933,7 @@ msgstr ""
 "liste med standardporter er gitt. Spør din systemadministrator hvilken port "
 "du skal bruke."
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14049,7 +13942,7 @@ msgstr ""
 "Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du "
 "setter denne til «E-post-adresse» kreves anonym tilgang til din LDAP-tjener."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -14061,29 +13954,29 @@ msgstr ""
 "søkebase. Et søkeområde som «one» vil kun ta med oppføringer ett nivå under "
 "basen."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "Tjenerinformasjon"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Søker"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
@@ -14163,9 +14056,11 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "Om forhåndsvisningsområdet skal vises."
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Kolonne i tabell:"
+#: ../modules/mail/em-mailer-prefs.c:1159
+msgid "_Table column:"
+msgstr "Kolonne i _tabell:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -14176,394 +14071,291 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "Alltid vi_s adresse for automatisk fullført kontakt"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:191
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "PÃ¥ LDAP-tjenere"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:341
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:343
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:350
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:358
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Adresse_bok"
 
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:360
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "Opprett en ny adressebok"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
+#: ../modules/addressbook/e-book-shell-backend.c:377
+#: ../modules/addressbook/e-book-shell-view.c:398
 #: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Kildeliste"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "Register med adressebøker"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "Aktiv visning"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "Valgt adressebokvisning"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Forhåndsvist kontakt"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "Kontakten som vises i forhåndsvisningsområdet"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "Forhåndsvisning er synlig"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "Om forhåndsvisningsområdet er synlig"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP-tjenere"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "Innstillinger for autofullføring"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-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 ""
-"Lokasjon og hierarki for kontaktmappene i Evolution er endret siden "
-"Evolution 1.x.\n"
-"\n"
-"Vennligst vent mens Evolution migrerer dine mapper..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Format for kontaktlister er endret.\n"
-"\n"
-"Vennligst vent mens Evolution migrerer dine mapper..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"MÃ¥ten Evolution lagrer noen telefonnumre er endret.\n"
-"\n"
-"Vennligst vent mens Evolution migrerer dine mapper..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Endringslogg og tilordningsfiler for Palm-synkronisering er endret.\n"
-"\n"
-"Vennligst vent mens Evolution migrerer dine mapper..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "Komponent for valg av kilde"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "Denne komponenten viser grupper med adressebøker"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "Lagre som vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pier alle kontakter til..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Kopier kontakter fra valgt adressebok til en annen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "Sl_ett adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "Slett valgt adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "Fl_ytt alle kontakter til..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "Flytt kontakter fra valgt adressebok til en annen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "_Ny adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "Egenskaper for adresse_bok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "Vis egenskaper for valgt adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:909
 msgid "_Rename..."
 msgstr "End_re navn..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "Endre navn på valgt adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "L_agre adressebok som vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Lagre kontakter i valgt adressebok som vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "Stopp lasting"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "_Kopier kontakt til..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "Kopier valgte kontakter til en annen adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "_Slett kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "_Finn i kontakt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "Søk etter tekst i innholdet av vist kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "Send valgte kontakter til en annen person"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "_Flytt kontakt til..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "Flytt valgte kontakter til en annen adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "_Ny kontakt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "Ny kontakt_liste..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "_Ã…pne kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "Vis aktiv kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "_Send melding til kontakt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "Send en melding til valgte kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1494
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1032
 msgid "_Preview"
 msgstr "_Forhåndsvis"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-memo-shell-view-actions.c:669
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "Egenska_per..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "Lagre _som vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "_Forhåndsvisning av kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "Vis vindu for forhåndsvisning av kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "_Classic View"
 msgstr "_Klassisk visning"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "Vis forhåndsvisning av kontakt under kontaktlisten"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "Vis forhåndsvisning av kontakt ved siden av kontaktlisten"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../modules/calendar/e-memo-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../shell/e-shell-content.c:441
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "Skriv ut alle viste kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "Forhåndsvis kontaktene som skal skrives ut"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "Skriv ut valgte kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Lagre som vCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "Lagre valgte kontakter som et vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:342
 msgid "_Forward Contacts"
 msgstr "_Videresend kontakter"
 
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:344
 msgid "_Forward Contact"
 msgstr "_Videresend kontakt"
 
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:375
 msgid "_Send Message to Contacts"
 msgstr "_Send melding til kontakter"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:377
 msgid "_Send Message to List"
 msgstr "_Send melding til liste"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:379
 msgid "_Send Message to Contact"
 msgstr "_Send melding til kontakt"
 
@@ -14587,57 +14379,47 @@ msgstr "Kontaktinformasjon"
 msgid "Contact information for %s"
 msgstr "Kontaktinformasjon for %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "Anonymt"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "B_la gjennom denne boken til grensen nås"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "Lo_gin"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "En"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Søkefilter"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "Søke_base:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "Søke_filter:"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14646,55 +14428,56 @@ msgstr ""
 "dette ikke endres vil søket bruke objektklassen «person» som forvalg."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "Sub"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "Støttede søkebaser"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "Bruk distinguished name (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "Bruker e-postadresse"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "_Finn mulige søkebaser"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "Metode for på_logging:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "_Søkeområde:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_Tidsavbrudd:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "kort"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mporter"
 
@@ -14716,11 +14499,11 @@ msgstr "I_mporter til oppgaver"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-migrate.c:176
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "PÃ¥ nettet"
 
@@ -14729,86 +14512,57 @@ msgstr "PÃ¥ nettet"
 msgid "Weather"
 msgstr "Vær"
 
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:251
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Fødselsdager og jubileum"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Avtale"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:457
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:462
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Avtale for hele _dagen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:464
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:469
 msgctxt "New"
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:471
 msgid "Create a new meeting request"
 msgstr "Opprett en ny møteforespørsel"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:479
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-backend.c:481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../modules/calendar/e-cal-shell-backend.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:2666
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "Register med kalendere"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-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 ""
-"Lokasjon og hierarki for Evolutions kalendermapper er endret siden Evolution "
-"1.x.\n"
-"\n"
-"Vennligst vent mens Evolution migrere dine mapper..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "Kan ikke migrere gamle innstillinger fra evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Kan ikke migrere kalender «%s»"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14817,36 +14571,16 @@ msgstr ""
 "Feil på %s\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
 msgid "Loading calendars"
 msgstr "Laster kalendere"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:633
 msgid "Calendar Selector"
 msgstr "Kalendervelger"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "Komponent for datovisning"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "Denne komponenten viser en miniatyrkalender"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "Forvalgt kalenderklient"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "Forvalgt klient for kalenderoperasjoner"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "Denne komponenten viser en gruppe med kalendere"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:974
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Åpner kalender på %s"
@@ -14875,298 +14609,298 @@ msgstr "Slett hendelser eldre enn"
 msgid "Copying Items"
 msgstr "Kopierer oppføringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 msgid "Moving Items"
 msgstr "Flytter oppføringer"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
 msgstr "hendelse"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:503
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "Lagre som iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "D_elete Calendar"
 msgstr "Sl_ett kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "Delete the selected calendar"
 msgstr "Slett valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 msgid "Go Back"
 msgstr "GÃ¥ tilbake"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 msgid "Go Forward"
 msgstr "GÃ¥ fremover"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "Velg i _dag"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Select today"
 msgstr "Velg i dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Select _Date"
 msgstr "Velg _dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select a specific date"
 msgstr "Velg en spesifikk dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "Fj_ern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
 msgid "Purge old appointments and meetings"
 msgstr "Fjern gamle avtaler og møter"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "O_ppdater"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Refresh the selected calendar"
 msgstr "Oppdater valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
 msgid "Rename the selected calendar"
 msgstr "Endre navn på valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "Show _Only This Calendar"
 msgstr "Vis k_un denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Delegate Meeting..."
 msgstr "_Deleger møte..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Delete Appointment"
 msgstr "_Slett avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Delete selected appointments"
 msgstr "Slett valgte avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "Delete This _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete this occurrence"
 msgstr "Slett denne oppføringen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Delete All Occ_urrences"
 msgstr "Slett alle oppf_øringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete all occurrences"
 msgstr "Slett alle oppføringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "New All Day _Event..."
 msgstr "Ny avtale som varer h_ele dagen..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Create a new all day event"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
 msgid "New _Meeting..."
 msgstr "Nytt _møte..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "Create a new meeting"
 msgstr "Lag et nytt møte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1429
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Make this Occurrence _Movable"
 msgstr "Gjør denne hendelsen _flyttbar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "_Open Appointment"
 msgstr "_Ã…pne avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "View the current appointment"
 msgstr "Vis denne avtalen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1450
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1464
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Lagre som iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "Converts an appointment to a meeting"
 msgstr "Konverter en avtale til et møte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1478
 msgid "Conv_ert to Appointment..."
 msgstr "Konv_erter til avtale..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Converts a meeting to an appointment"
 msgstr "Konverterer et møte til en avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+msgid "Quit"
+msgstr "Avslutt"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Day"
 msgstr "Dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1616
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Show as list"
 msgstr "Vis som liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1623
 msgid "Month"
 msgstr "MÃ¥ned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Show one month"
 msgstr "Vis en måned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Week"
 msgstr "Uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one week"
 msgstr "Vis en uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show one work week"
 msgstr "Vis en arbeidsuke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
 msgid "Active Appointments"
 msgstr "Aktive avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1661
 msgid "Next 7 Days' Appointments"
 msgstr "Avtaler for de neste 7 dagene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1711
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Preview the calendar to be printed"
 msgstr "Forhåndsvis kalenderen som skal skrives ut"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1791
 msgid "Go To"
 msgstr "GÃ¥ til"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-memo-shell-view-actions.c:501
 msgid "memo"
 msgstr "notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "New _Memo"
 msgstr "Nytt _notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
 #: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 msgid "Create a new memo"
 msgstr "Lag et nytt notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
 msgid "_Open Memo"
 msgstr "_Ã…pne notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "View the selected memo"
 msgstr "Vis valgt notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "_Ã…pne nettside"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-memo-shell-view-actions.c:807
 msgid "Print the selected memo"
 msgstr "Skriv ut valgt notat"
 
@@ -15175,22 +14909,22 @@ msgstr "Skriv ut valgt notat"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
 msgstr "oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "_Merk som fullført"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "Merk valgte oppgaver som fullført"
 
@@ -15199,39 +14933,39 @@ msgid "_Mark as Incomplete"
 msgstr "_Merk som ikke fullført"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "Merk valgte oppgaver som ikke fullført"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "Ny _oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "_Ã…pne oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "Vis valgt oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "_Lagre som iCalendar..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "Skriv ut valgt oppgave"
 
@@ -15255,40 +14989,20 @@ msgid "Memo Li_st"
 msgstr "Notatli_ste"
 
 #: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Create a new memo list"
 msgstr "Lag en ny notatliste"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "Register med notatlister"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "Modell for tabell for notat"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "Laster notater"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:587
 msgid "Memo List Selector"
 msgstr "Valgt av notatliste"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "Forvalgt notatklient"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "Forvalgt klient for notatoperasjoner"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "Denne komponenten viser grupper med notatlister"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:892
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Åpner notat på %s"
@@ -15298,63 +15012,63 @@ msgstr "Åpner notat på %s"
 msgid "Print Memos"
 msgstr "Skriv ut notater"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:563
 msgid "_Delete Memo"
 msgstr "_Slett notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Find in Memo..."
 msgstr "_Finn i notat..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Search for text in the displayed memo"
 msgstr "Søk etter tekst i kroppen av vist notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "D_elete Memo List"
 msgstr "Sl_ett notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "Delete the selected memo list"
 msgstr "Slett valgt notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
 msgid "_New Memo List"
 msgstr "_Ny notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Refresh the selected memo list"
 msgstr "Oppdater valgt notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Rename the selected memo list"
 msgstr "Endre navn på valgt notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
 msgid "Show _Only This Memo List"
 msgstr "Vis k_un denne notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:705
 msgid "Memo _Preview"
 msgstr "_Forhåndsvisning av notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:707
 msgid "Show memo preview pane"
 msgstr "Vis forhåndsvisningsområde for notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Show memo preview below the memo list"
 msgstr "Vis forhåndsvisning av notat under notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:735
 msgid "Show memo preview alongside the memo list"
 msgstr "Vis forhåndsvisning av notat ved siden av notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:793
 msgid "Print the list of memos"
 msgstr "Skriv ut denne listen med notater"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:800
 msgid "Preview the list of memos to be printed"
 msgstr "Forhåndsvis listen med notater som skal skrives ut"
 
@@ -15399,58 +15113,20 @@ msgid "Tas_k List"
 msgstr "_Oppgaveliste"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "Register for oppgavelister"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "Modell for oppgavetabell"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-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 ""
-"Lokasjon og hierarki for Evolutions oppgavemapper er endret siden Evolution "
-"1.x.\n"
-"\n"
-"Vennligst vent mens Evolution migrere dine mapper..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Kan ikke migrere oppgaver «%s»"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:587
 msgid "Task List Selector"
 msgstr "Valg av oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "Forvalgt oppgaveklient"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "Forvalgt klient for oppgaveoperasjoner"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "Denne komponenten viser grupper med oppgavelister"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:892
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
@@ -15460,7 +15136,7 @@ msgstr "Åpner oppgaver på %s"
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15472,95 +15148,95 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "_Slett oppgave"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
 msgstr "_Finn i oppgave..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
 msgstr "Søk etter tekst i vist oppgave"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "Kopier..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
 msgstr "Sl_ett oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
 msgstr "Slett valgt oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "_Ny oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
 msgstr "Oppdater valgt oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "Endre navn på valgt oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "Vis k_un denne oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "Merk som _ikke fullført"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "Slett fullførte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "Forhåndsvisning av _oppgave"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "Vis forhåndsvisningsområde for oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr "Vis forhåndsvisning av oppgave under oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr "Vis forhåndsvisning av oppgave ved siden av oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "Aktive oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "Fullførte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "Oppgaver for de neste 7 dagene"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "Utgåtte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "Oppgaver med vedlegg"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "Skriv ut denne listen over oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "Forhåndsvis listen over oppgaver som skal skrives ut"
 
@@ -15584,402 +15260,369 @@ msgid "Delete Task"
 msgstr "Slett oppgave"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, c-format
 msgid "%d attached messages"
 msgstr "%d vedlagte meldinger"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "Ingen"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:169
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "E-post_melding"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:179
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-post_mappe"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:200
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:208
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:216
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:224
 msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "Grupper etter tråder"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "Om meldinger skal grupperes etter tråder"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:818
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "_Deaktiver konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:820
 msgid "Disable this account"
 msgstr "Deaktiver denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:827
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:832
 msgid "C_reate Search Folder From Search..."
 msgstr "Opp_rett søkemappe fra søk..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:839
 msgid "_Download Messages for Offline Usage"
 msgstr "Last ne_d meldinger for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:841
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Last ned meldinger fra kontoer og mapper som er merket for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:846
 msgid "Fl_ush Outbox"
 msgstr "T_øm utboks"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:853
 msgid "_Copy Folder To..."
 msgstr "_Kopier mappe til..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:855
 msgid "Copy the selected folder into another folder"
 msgstr "Kopier valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:862
 msgid "Permanently remove this folder"
 msgstr "Fjern denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:867
 msgid "E_xpunge"
 msgstr "T_øm"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:874
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_k alle meldinger som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "Mark all messages in the folder as read"
 msgstr "Merk alle meldinger i en mappe som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:881
 msgid "_Move Folder To..."
 msgstr "Flytt _mappe til..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "Move the selected folder into another folder"
 msgstr "Flytt valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:888
 msgid "_New..."
 msgstr "_Ny..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "Create a new folder for storing mail"
 msgstr "Lag en ny mappe for lagring av meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:897
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:904
 msgid "Refresh the folder"
 msgstr "Oppdater mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:911
 msgid "Change the name of this folder"
 msgstr "Endre navn på denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:916
 msgid "Select Message _Thread"
 msgstr "Velg meldings_tråd"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Velg alle meldinger i samme tråd som den valgte meldingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:923
 msgid "Select Message S_ubthread"
 msgstr "Velg _undertråd for melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "Select all replies to the currently selected message"
 msgstr "Velg alle svar til den valgt melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:930
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:932
 msgid "Unsubscribe from the selected folder"
 msgstr "Fjern abonnement på valgt mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:937
 msgid "Empty _Trash"
 msgstr "Tøm _papirkurven"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:939
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Fjern alle slettede meldinger fra alle kontoer permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:944
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:953
 msgid "N_one"
 msgstr "_Ingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "Skjul _leste meldinger"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Skjul alle leste meldinger midlertidig"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "Skjul valgt_e meldinger"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "Skjul valgte meldinger midlertidig"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "Vis skjulte meldi_nger"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "Vis meldinger som er midlertidig skjult"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:976
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:981
 msgid "Collapse All _Threads"
 msgstr "Slå sammen alle _tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "Collapse all message threads"
 msgstr "Slå sammen alle meldingstråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:988
 msgid "E_xpand All Threads"
 msgstr "Ut_vid alle tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "Expand all message threads"
 msgstr "Utvid alle meldingstråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:995
 msgid "_Message Filters"
 msgstr "_Meldingsfiltre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "Create or edit rules for filtering new mail"
 msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1002
 msgid "Search F_olders"
 msgstr "Søk i _mapper"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Create or edit search folder definitions"
 msgstr "Opprett eller rediger søkemappedefinisjoner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1009
 msgid "_Subscriptions..."
 msgstr "_Abonnement..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonner eller fjern abonnement på mapper på eksterne tjenere"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1018
 msgid "F_older"
 msgstr "M_appe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1025
 msgid "_Label"
 msgstr "_Etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1065
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "Skjul slette_de meldinger"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "Skjul slettede meldinger heller enn å vise dem gjennomstreket"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1089
 msgid "Show Message _Preview"
 msgstr "Vis _forhåndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Show message preview pane"
 msgstr "Vis område for forhåndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1097
+msgid "Show _Deleted Messages"
+msgstr "Vis slette_de meldinger"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+msgid "Show deleted messages with a line through them"
+msgstr "Vis slettede meldinger som gjennomstreket i meldingslisten."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
 msgid "_Group By Threads"
 msgstr "_Grupper etter tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "Threaded message list"
 msgstr "Meldingsliste med tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
 msgid "Show message preview below the message list"
 msgstr "Vis meldingen under meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "Show message preview alongside the message list"
 msgstr "Vis meldingen ved siden av meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "All Messages"
 msgstr "Alle meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1150
 msgid "Important Messages"
 msgstr "Viktige meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "Last 5 Days' Messages"
 msgstr "Meldinger fra de siste 5 dagene"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uønsket e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "Messages with Attachments"
 msgstr "Meldinger med vedlegg"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "Read Messages"
 msgstr "Leste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
 msgid "Recent Messages"
 msgstr "Nye meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "Unread Messages"
 msgstr "Uleste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
 msgid "Subject or Addresses contain"
 msgstr "Emne eller adresser inneholder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "All Accounts"
 msgstr "Alle konti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "Current Account"
 msgstr "Denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Current Folder"
 msgstr "Denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:881
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valgt, "
 msgstr[1] "%d valgt, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:892
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:898
+#: ../modules/mail/e-mail-shell-view-private.c:905
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d uønsket e-post"
 msgstr[1] "%d uønsket e-poster"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:911
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:917
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:923
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:935
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ulest, "
 msgstr[1] "%d uleste, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:938
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -15998,7 +15641,14 @@ msgstr "Søk i konto"
 msgid "Proxy _Logout"
 msgstr "_Logg ut proxy"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "Aktivert"
+
+#: ../modules/mail/em-composer-prefs.c:476
 msgid "Language(s)"
 msgstr "Språk"
 
@@ -16018,60 +15668,67 @@ msgstr "En gang i uken"
 msgid "Once per month"
 msgstr "En gang i måneden"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:224
 msgid "Add Custom Junk Header"
 msgstr "Legg til egendefinert meldingshoder for uønsket e-post"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:232
 msgid "Header Name:"
 msgstr "Navn på meldingshode:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Value Contains:"
 msgstr "Verdi i meldingshode inneholder:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:333
 msgid "Header"
 msgstr "Topptekst"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:337
 msgid "Contains Value"
 msgstr "Inneholder verdi"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:801
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Tillegg %s er tilgjengelig og filen er installert."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:738 ../modules/mail/em-mailer-prefs.c:810
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "%s-tillegg er ikke tilgjengelig. Vennligst sjekk om pakken er installert."
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:774
 msgid "No junk plugin available"
 msgstr "Ingen tillegg for uønsket e-post tilgjengelig"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "Kolonne i _tabell:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1161
 msgid "_Date header:"
 msgstr "_Datohode:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1162
 msgid "Show _original header value"
 msgstr "Vis _opprinnelig verdi for hode"
 
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Undersøk om Evolution er den forvalgte e-postklienten"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Undersøk om Evolution er den forvalgte e-postklienten ved hver oppstart."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+msgid "Do you want to make Evolution your default email client?"
+msgstr "Vil du sette Evolution som forvalgt e-postprogram?"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hallo Python"
@@ -16104,16 +15761,8 @@ msgstr ""
 "Liste med hint om ting å se etter i meldingskroppen for tillegg for "
 "vedleggspåminnelse"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Liste med hint om ting å se etter i meldingskroppen for tillegg for "
-"påminnelse om vedlegg."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "Nøkkelord"
 
@@ -16153,23 +15802,23 @@ msgstr "Lyd i e-post"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Spill av lyd-vedlegg direkte i e-postmeldinger."
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "Velg navn på sikkerhetskopi for Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "Sta_rt Evolution på nytt etter sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Velg navn på sikkerhetskopi for Evolution som skal gjenopprettes"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "Sta_rt Evolution på nytt etter gjenoppretting"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16179,35 +15828,35 @@ msgstr ""
 "kalendere, oppgaver, notater og adressebøker kan gjenopprettes. Du kan også "
 "gjenopprette alle dine personlige innstillinger, filtre etc."
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "Gjenopp_rett Evolution fra sikkerhetskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Velg Evolution-arkiv som skal gjenopprettes:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "Velg en fil som skal gjenopprettes"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "Gjenopprett fra sikkerhetskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "_Innstillinger for sikkerhetskopiering..."
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "_Backup Evolution Settings..."
+msgstr "_Innstillinger for sikkerhetskopiering avv Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "Sikkerhetskopier data og innstillinger til en arkivfil"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "Gj_enopprett innstillinger..."
+#: ../plugins/backup-restore/backup-restore.c:368
+msgid "R_estore Evolution Settings..."
+msgstr "Gj_enopprett innstillinger for Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Gjenopprett data og innstillinger fra en arkivfil"
 
@@ -16256,7 +15905,7 @@ msgid "Restarting Evolution"
 msgstr "Starter Evolution på nytt"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
 #: ../plugins/backup-restore/backup.c:260
@@ -16286,31 +15935,31 @@ msgid "Restoring from the folder %s"
 msgstr "Gjenoppretter fra mappe %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Evolution sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Evolution gjenoppretting"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Vennligst vent mens Evolution tar sikkerhetskopi av dine data."
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "Gjenoppretter data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Vennligst vent mens Evolution gjenoppretter dine data."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Dette kan ta en stund avhengig av hvor mye data du har i din konto."
 
@@ -16376,35 +16025,35 @@ msgstr ""
 "ikke-lagrede data før du fortsetter. Hvis du ønsker at Evolution skal starte "
 "automatisk etter gjenoppretting kan du velge det her."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatiske kontakter"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "Opprett oppføringer i adresseboken _automatisk når du sender e-post"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "Velg adressebok for automatiske kontakter"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Kontakter for lynmeldinger"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "Synkroniser kontaktinformasjon og bilder fra vennelisten i Pidgin"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "_Synkroniser kontaktinformasjon og bilder fra vennelisten i Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Velg adressebok for venneliste fra Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Synkroniser med _vennelisten nå"
 
@@ -16426,33 +16075,33 @@ msgstr ""
 "som du svarer på meldinger. Fyller også ut IM-kontaktinformasjon fra dine "
 "vennelister."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter er ikke tilgjengelig. Vennligst installer programmet først."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "En feil oppsto under start av %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Underprosess til Bogofilter svarer ikke. Terminerer..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Venting på underprosess til Bogofilter avbrutt. Terminerer..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Rør til Bogofilter feilet. Feilkode: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
 msgid "Convert message text to _Unicode"
 msgstr "Konverter tekst i meldinger til _Unicode"
 
@@ -16480,15 +16129,15 @@ msgstr "Alternativer for Bogofilter"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filtrer uønsket e-post med Bogofilter."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr "Autentisering feilet. Tjener krever gyldig pålogging."
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "Oppgitt URL ble ikke funnet."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16497,36 +16146,36 @@ msgstr ""
 "Tjener returnerte uventede data.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "Klarte ikke å tolke svar fra tjener."
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "Brukers kalendere"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "Kunne ikke hente URL til tjener."
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "Søker etter brukers kalendere..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "Fant ingen kalender for bruker."
 
@@ -16540,40 +16189,40 @@ msgstr "Forrige forsøk feilet: %s"
 msgid "Previous attempt failed with code %d"
 msgstr "Forrige forsøk feilet med kode %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr "Oppgi passord for bruker <b>%s</b> på tjener <b>%s</b>"
+msgid "Enter password for user %s on server %s"
+msgstr "Oppgi passord for bruker %s på tjener %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "Kunne ikke opprette soup-melding for URL «%s»"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "Søker i mappeinnhold..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "Liste med tilgjengelige kalendere:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "Støtter"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Klarte ikke å opprette tråd: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "Tjener-URL «%s» er ikke en gyldig URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "Se etter en CalDAV-kalender"
 
@@ -16581,26 +16230,26 @@ msgstr "Se etter en CalDAV-kalender"
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "Bruk _SSL"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "Bla gj_ennom tjener etter en kalender"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "O_ppdater"
 
@@ -16612,31 +16261,31 @@ msgstr "Legg til støtte for CalDAV i Evolution."
 msgid "CalDAV Support"
 msgstr "CalDAV-støtte"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "_Tilpass alternativer"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "Fil_navn:"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "Velg kalenderfil"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "Ved åpning"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "Ved endring av fil"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "Periodisk"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "Tvungen _skrivebeskyttelse"
 
@@ -16648,11 +16297,11 @@ msgstr "Legg til lokale kalendere i Evolution."
 msgid "Local Calendars"
 msgstr "Lokale kalendere"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "_Sikker tilkobling"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "Bruker_navn:"
 
@@ -16700,26 +16349,26 @@ msgstr "Vær: klar natt"
 msgid "Weather: Thunderstorms"
 msgstr "Vær: tordenvær"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "Velg en lokasjon"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Ingen"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_Enheter:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrisk (celcius, cm, osv)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imerisk (Fahrenheit, tommer, osv)"
 
@@ -16748,45 +16397,23 @@ msgstr "Legg til et kart som viser lokasjonen for kontaktene når mulig."
 msgid "Map for contacts"
 msgstr "Kart for kontakter"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Undersøk om Evolution er den forvalgte e-postklienten"
-
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Undersøk om Evolution er den forvalgte e-postklienten ved hver oppstart."
-
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "Sjekker om Evolution er forvalgt e-postklient ved oppstart."
-
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "Forvalgt e-postprogram"
-
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "Vil du bruke Evolution som forvalgt e-postprogram?"
-
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "Merk som _forvalgt adressebok"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
 msgstr "Bruk a_utomatisk fullføring med denne adresseboken"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "Merk som _forvalgt kalender"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "Merk som _forvalgt oppgaveliste"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "Merk som _forvalgt notatliste"
 
@@ -16826,7 +16453,7 @@ msgid "Protected"
 msgstr "Beskyttet"
 
 #: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../widgets/misc/e-send-options.ui.h:21
 msgid "Secret"
 msgstr "Hemmelig"
 
@@ -16841,12 +16468,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ingen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "E_gendefinert meldingshode"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16854,12 +16481,12 @@ msgstr ""
 "Format for spesifisering av nøkkelvedi for egendefinert meldingshode er:\n"
 "Navn på nøkkelverdi for egendefinert meldingshode delt med «;»."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:950
 msgid "Key"
 msgstr "Nøkkel"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "Verdier"
 
@@ -16882,7 +16509,7 @@ msgstr ""
 "Start redigeringsprogram automatisk når tasten trykkes i e-postredigering"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "Start automatisk når en ny e-post redigeres"
 
@@ -16894,11 +16521,11 @@ msgstr "Forvalgt eksternt redigeringsprogram"
 msgid "The default command that must be used as the editor."
 msgstr "Forvalgt kommando som må brukes som redigeringsprogram."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "Kommando som skal kjøres for å starte redigering: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16906,8 +16533,8 @@ msgstr ""
 "Bruk «xemacs» for Emacs\n"
 "Bruk «gvim -f» for VI"
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "Skriv i eksternt redigeringsprogram"
 
@@ -16983,7 +16610,7 @@ msgstr "Sett _inn ansiktsbilde som forvalg"
 msgid "Load new _Face picture"
 msgstr "Last nytt ansikts_bilde"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "Ta _med ansikt"
 
@@ -17016,21 +16643,21 @@ msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "Filen du valgte ser ikke ut som et gyldig .png-bilde. Feil: {0}"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
+#: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>Tjener</b> "
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+msgid "Server"
+msgstr "Tjener"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Oppgi passord for %s for å aksessere liste med abonnerte kalendere."
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17039,18 +16666,18 @@ msgstr ""
 "Kan ikke lese data fra Google-tjener.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "Kal_ender:"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
 msgstr "Hent _liste"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
@@ -17061,7 +16688,7 @@ msgstr "Legg til kalendere fra Google i Evolution."
 msgid "Google Calendars"
 msgstr "Google kalendere"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Sjekkliste"
 
@@ -17093,12 +16720,12 @@ msgstr "Godta tentativt"
 msgid "Rese_nd Meeting..."
 msgstr "Se_nd møte på nytt..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17123,19 +16750,19 @@ msgstr ""
 "Klikk «Bruk» for å installere den delte mappen\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "Installer delt mappe"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "Installering av delt mappe"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "Innstillinger for uønsket e-post"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Innstillinger for uønsket e-post"
@@ -17171,7 +16798,7 @@ msgstr "Fje_rn"
 msgid "Message Retract"
 msgstr "Trekk tilbake melding"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -17179,7 +16806,7 @@ msgstr ""
 "Tilbaketrekking av en melding kan fjerne den fra en mottakers postboks. Er "
 "du sikker på at du vil gjøre dette?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "Melding kalt tilbake"
 
@@ -17302,25 +16929,25 @@ msgid "Would you like to decline it?"
 msgstr "Vil du avslå det?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>Brukere:</b> "
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "_Tilpass varslingsmelding"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "Kon_takter..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "Melding om delte mapper"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "Deltakerene vil motta følgende varsel.\n"
 
+#: ../plugins/groupwise-features/properties.ui.h:9
+msgid "Users:"
+msgstr "Brukere:"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Ikke delt"
@@ -17378,50 +17005,57 @@ msgid "Proxy"
 msgstr "Proxy"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Kontonavn</b>"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "Kontonavn"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "Proxy-innlogging"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (bruker %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:690
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Proxy-fanen vil kun være tilgjengelig når kontoen er tilkoblet."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Proxyfanen vil kun være tilgjengelig når kontoen er aktivert."
 
-#: ../plugins/groupwise-features/proxy.c:931
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../plugins/groupwise-features/proxy.c:929
 #: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "Legg til bruker"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "Avanserte alternativer for sending"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:315
 #: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "Brukere"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:316
 msgid "Enter the users and set permissions"
 msgstr "Oppgi brukere og sett rettigheter"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:416
 msgid "Sharing"
 msgstr "Deling"
 
@@ -17433,63 +17067,55 @@ msgstr "Egendefinert varsling"
 msgid "Add   "
 msgstr "Legg til"
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Meldingsstatus"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Emne:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "Fra:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Dato for opprettelse:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "Levert: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "Ã…pnet: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "Godtatt: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "Slettet: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "Avslått: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "Fullført: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "Ikke levert: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Legg til støtte for Hula i Evolution."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Støtte for Hula"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Bilde i e-postmeldingen"
@@ -17498,12 +17124,12 @@ msgstr "Bilde i e-postmeldingen"
 msgid "View image attachments directly in mail messages."
 msgstr "Vis bildevedlegg direkte i e-postmeldinger."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:332
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Egendefinerte meldingshoder"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:345
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP-meldingshoder"
@@ -17552,140 +17178,140 @@ msgstr "Endre innstillinger for dine IMAP-kontoer."
 msgid "IMAP Features"
 msgstr "IMAP-funksjoner"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/itip-formatter/itip-formatter.c:482
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Kunne ikke åpne kalender «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:648
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "En avtale i kalender «%s» er i konflikt med dette møtet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:684
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fant avtalen i kalender «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find any calendars"
 msgstr "Kan ikke finne noen kalendere"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:790
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kan ikke finne dette møtet i noen kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this task in any task list"
 msgstr "Kan ikke finne denne oppgaven i noen oppgaveliste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this memo in any memo list"
 msgstr "Kan ikke finne dette notatet i noen notatliste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:872
 msgid "Opening the calendar. Please wait.."
 msgstr "Ã…pner kalender. Vennligst vent..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:875
 msgid "Searching for an existing version of this appointment"
 msgstr "Søker etter en eksisterende versjon av denne avtalen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1056
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppføring"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1143
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kunne ikke sende oppføring til kalender «%s». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1155
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender «%s» som godtatt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender «%s» som tentativ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1164
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender «%s» som avslått"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1169
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender «%s» som avlyst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1263
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1270
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1272
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1383
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1442
 msgid "Meeting information sent"
 msgstr "Informasjon om møte sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1457
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kan ikke sende møteinformasjon. Møtet eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1460
 msgid "Unable to send task information, the task does not exist"
 msgstr "Kan ikke sende informasjon om oppgave. Oppgaven eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Kan ikke sende informasjon om notat. Notatet eksisterer ikke"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "calendar.ics"
 msgstr "kalender.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1533
 msgid "Save Calendar"
 msgstr "Lagre kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1597
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17693,15 +17319,15 @@ msgstr ""
 "Meldingen påstår at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1638
+#: ../plugins/itip-formatter/itip-formatter.c:1666
+#: ../plugins/itip-formatter/itip-formatter.c:1772
 msgid "The item in the calendar is not valid"
 msgstr "Oppføringen i kalenderen er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17709,11 +17335,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1680
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppføringer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17721,511 +17347,503 @@ msgstr ""
 "Du må lagre filen og importere kalenderen for å prosessere alle disse "
 "oppføringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2451
 msgid "This meeting recurs"
 msgstr "Dettee møtet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2691
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2701
+#: ../plugins/itip-formatter/itip-formatter.c:2734
 msgid "Conflict Search"
 msgstr "Søk etter konflikter"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2716
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "I dag %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "I dag %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "I dag %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "I morgen %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "I morgen %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "I morgen %l.%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "I morgen %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H.%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l.%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B %Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l.%M.%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "Vennligst svar på vegne av <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "Mottatt på vegne av <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> har via %s publisert følgende møteinformasjon:"
-
-#: ../plugins/itip-formatter/itip-view.c:364
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> har publisert følgende møteinformasjon:"
+msgid "Please respond on behalf of %s"
+msgstr "Vennligst svar på vegne av %s"
 
 #: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> har delegert følgende møte til deg:"
+msgid "Received on behalf of %s"
+msgstr "Mottatt på vegne av %s"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> forespør via %s din tilstedeværelse i et møte."
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s har publisert følgende møteinformasjon gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> forespør din tilstedeværelse i følgende møte:"
+msgid "%s has published the following meeting information:"
+msgstr "%s har publisert følgende møteinformasjon:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr ""
-"<b>%s</b> ønsker via %s å legge til informasjon i et eksisterende møte:"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s har delegert følgende møte til deg:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte:"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s ber om din tilstedeværelse i et møte gjennom %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> ønsker å motta den seneste informasjon for følgende møte via %s:"
-
-#: ../plugins/itip-formatter/itip-view.c:388
-#, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> ønsker å motta den seneste informasjon for følgende møte:"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s ber om din tilstedeværelse i følgende møte:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> har sendt tilbake følgende svar på møteinnkalling via %s:"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s ønsker å legge til informasjon i et eksisterende møte gjennom %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> har sendt tilbake følgende svar på møteinnkalling:"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s ønsker å legge til informasjon i et eksisterende møte:"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> har via %s avlyst følgende møte:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr ""
+"%s ønsker å motta den seneste informasjon for følgende møte gjennom %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> har avlyst følgende møte:"
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s ønsker å motta den seneste informasjon for følgende møte:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> har foreslått følgende endringer i møte via %s:"
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s har sendt tilbake følgende svar på møteinnkalling gjennom %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> har foreslått følgende endringer i møte:"
+msgid "%s has sent back the following meeting response:"
+msgstr "%s har sendt tilbake følgende svar på møteinnkalling:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> har via %s avslått følgende endringer for møte:"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s har avlyst følgende møte gjennom %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> har avslått følgende endringer for møte:"
+msgid "%s has canceled the following meeting."
+msgstr "%s har avlyst følgende møte."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
-msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> har via %s publisert følgende oppgave:"
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s har foreslått følgende endringer i møte gjennom %s."
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> har publisert følgende oppgave:"
+msgid "%s has proposed the following meeting changes."
+msgstr "%s har foreslått følgende endringer i møte."
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> forespør at %s tildeles følgende oppgave:"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s har avslått følgende endringer for møte gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> har via %s tildelt deg en oppgave:"
+msgid "%s has declined the following meeting changes."
+msgstr "%s har avslått følgende endringer for møte."
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> har tildelt deg en oppgave:"
+msgid "%s through %s has published the following task:"
+msgstr "%s har publisert følgende oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr ""
-"<b>%s</b> forespør via %s å legge til informasjon i eksisterende oppgave:"
+msgid "%s has published the following task:"
+msgstr "%s har publisert følgende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave:"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s ber om at %s tildeles følgende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> ønsker å motta den seneste informasjon for følgende tildelt "
-"oppgave via %s:"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s har tildelt deg en oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> ønsker å motta den seneste informasjon for følgende tildelt "
-"oppgave:"
+msgid "%s has assigned you a task:"
+msgstr "%s har tildelt deg en oppgave:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> har sendt tilbake følgende svar på tildelt oppgave via %s:"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s forespør å legge til informasjon i eksisterende oppgave gjennom %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> har sendt tilbake følgende svar på tildelt oppgave:"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s ønsker å legge til informasjon i en eksisterende oppgave:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> har via %s avlyst følgende tildelt oppgave:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"%s ønsker å motta den seneste informasjon for følgende tildelt oppgave "
+"gjennom %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> har avlyst følgende tildelt oppgave:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr ""
+"%s ønsker å motta den seneste informasjon for følgende tildelt oppgave:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> har foreslått følgende endringer i oppgavetildeling via %s:"
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%s har sendt tilbake følgende svar på tildelt oppgave gjennom %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> har foreslått følgende endringer i oppgavetildeling:"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s har sendt tilbake følgende svar på tildelt oppgave:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> har via %s avslått følgende tildelt oppgave:"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s har avlyst følgende tildelt oppgave gjennom %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> har avslått følgende tildelt oppgave:"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s har avlyst følgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:504
 #, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> har via %s publisert følgende notat:"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%s har foreslått følgende endringer i oppgavetildeling gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> har publisert følgende notat:"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s har foreslått følgende endringer i oppgavetildeling:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:510
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr ""
-"<b>%s</b> ønsker via %s å legge til informasjon i et eksisterende notat:"
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s har avslått følgende tildelt oppgave gjennom %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s har avslått følgende tildelt oppgave:"
+
+#: ../plugins/itip-formatter/itip-view.c:549
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "%s har publisert følgende notat gjennom %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:551
+#, c-format
+msgid "%s has published the following memo:"
+msgstr "%s har publisert følgende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende notat:"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s ønsker å legge til informasjon i et eksisterende notat gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> har via %s avlyst følgende delt notat:"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s ønsker å legge til informasjon i et eksisterende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:562
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> har avlyst følgende delt notat:"
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s har avlyst følgende delt notat gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:564
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "%s har avlyst følgende delt notat:"
+
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "Hele dagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "Startdag:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "Start-tid:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "Sluttdag:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "Slutt-tid:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "_Ã…pne kalender"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "Av_slå"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "Godt_a"
-
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+msgid "A_ccept"
+msgstr "_Godta"
+
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "A_vslå alle"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "Gjør alle _tentative"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "_Tentativ"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
-msgstr "Godta _alle"
+#: ../plugins/itip-formatter/itip-view.c:855
+msgid "A_ccept all"
+msgstr "_Godta alle"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "_Send informasjon"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "_Oppdater status for deltaker"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "_Oppdater"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "Send sva_r til avsender"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "Send _oppdateringer til deltakere"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "B_ruk på alle instanser"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "Vis tid som _ledig"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "_Bevar min påminnelse"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "Arv påm_innelse"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "_Oppgaver:"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "_Notater:"
 
@@ -18332,16 +17950,16 @@ msgstr "Om ikonet skal blinke eller ikke."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Im nye meldinger kun skal varsles i innboksen."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:346
 msgid "Evolution's Mail Notification"
 msgstr "Varsling om ny e-post for Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Mail Notification Properties"
 msgstr "Egenskaper for varsling om ny e-post"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:499
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18357,66 +17975,66 @@ msgstr[1] ""
 "i %s."
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:510
 #, c-format
 msgid "From: %s"
 msgstr "Fra: %s"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#: ../plugins/mail-notification/mail-notification.c:522
 #, c-format
 msgid "Subject: %s"
 msgstr "Emne: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:531
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Du har mottatt %d ny melding."
 msgstr[1] "Du har mottatt %d nye meldinger."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:554
 msgid "New email"
 msgstr "Ny e-post"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:608
 msgid "Show icon in _notification area"
 msgstr "Vis ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:636
 msgid "B_link icon in notification area"
 msgstr "B_linkende ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:646
 msgid "Popup _message together with the icon"
 msgstr "Vis _melding sammen med ikonet"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:831
 msgid "_Play sound when new messages arrive"
 msgstr "S_pill en lydfil når nye meldinger ankommer"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:860
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:873
 msgid "Use sound _theme"
 msgstr "Bruk lyd_tema"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:892
 msgid "Play _file:"
 msgstr "Spill av lyd_fil:"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:903
 msgid "Select sound file"
 msgstr "Velg en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:961
 msgid "Notify new messages for _Inbox only"
 msgstr "Varslingsmelding kun for _innboks"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:970
 msgid "Generate a _D-Bus message"
 msgstr "Genererer en _D-Bus-melding"
 
@@ -18429,12 +18047,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Varsler når nye meldinger ankommer."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Opprettet av en e-post fra %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18443,7 +18061,7 @@ msgstr ""
 "Valgt kalender inneholder hendelsen «%s» allerede. Vil du redigere den gamle "
 "hendelsen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18452,7 +18070,7 @@ msgstr ""
 "Valgt oppgaveliste inneholder oppgave «%s» allerede. Vil du redigere den "
 "gamle oppgaven?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18461,7 +18079,7 @@ msgstr ""
 "Valgt notatliste inneholder notatet «%s» allerede. Vil du redigere det gamle "
 "notatet?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#: ../plugins/mail-to-task/mail-to-task.c:512
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18469,7 +18087,7 @@ msgstr ""
 "Valgt kalender inneholder noen hendelser for disse e-postene allerede. Vil "
 "du lage nye hendelser likevel?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18477,7 +18095,7 @@ msgstr ""
 "Valgt oppgaveliste inneholder noen oppgaver for disse meldingene allerede. "
 "Vil du lage nye oppgaver likevel?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#: ../plugins/mail-to-task/mail-to-task.c:518
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18485,7 +18103,7 @@ msgstr ""
 "Valgt notatliste inneholder noen notater for disse meldingene allerede. Vil "
 "du lage nye notater likevel?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#: ../plugins/mail-to-task/mail-to-task.c:536
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18495,7 +18113,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:542
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18505,7 +18123,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18515,25 +18133,25 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:607
 msgid "[No Summary]"
 msgstr "[Ingen sammendrag]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:618
 msgid "Invalid object returned from a server"
 msgstr "Ugyldig objekt returnert fra en tjener"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:689
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "En feil oppsto under prosessering: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:718
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kan ikke åpne kalender. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:725
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18541,7 +18159,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og hendelser kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18549,7 +18167,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og oppgaver kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:731
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18557,40 +18175,40 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og notater kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:934
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Fant ikke kildeliste %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1053
 msgid "Create an _Event"
 msgstr "Lag en h_endelse"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1055
 msgid "Create a new event from the selected message"
 msgstr " Lag en ny hendelse fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create a Mem_o"
 msgstr "Lag et n_otat"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new memo from the selected message"
 msgstr "Lag et nytt notat fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a _Task"
 msgstr "Lag en o_ppgave"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new task from the selected message"
 msgstr "Lag en ny oppgave fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a _Meeting"
 msgstr "Lag et _møte"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a new meeting from the selected message"
 msgstr "Lag et nytt møte fra den valgte meldingen"
 
@@ -18598,55 +18216,55 @@ msgstr "Lag et nytt møte fra den valgte meldingen"
 msgid "Convert a mail message to a task."
 msgstr "Konverter en e-postmelding til en oppgave."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Archive"
 msgstr "Hent liste_arkiv"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get an archive of the list this message belongs to"
 msgstr "Få et arkiv av listen denne e-posten hører til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get List _Usage Information"
 msgstr "Hent informasjon om br_uk av liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Få informasjon om bruken av e-postlisten som denne e-posten hører til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Contact List _Owner"
 msgstr "Eier av k_ontaktliste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Kontakt eieren til e-postlisten som denne e-posten hører til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Post Message to List"
 msgstr "_Skriv e-post til liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Skriv en e-post til e-postlisten som denne e-posten hører til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Subscribe to List"
 msgstr "_Abonner på listen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Abonner på e-postlisten som denne e-posten hører til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "_Unsubscribe from List"
 msgstr "_Fjern abonnement på listen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Avslutt abonnementet på e-postlisten som denne meldingen tilhører"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
 msgid "Mailing _List"
 msgstr "E-post_liste"
 
@@ -18750,15 +18368,15 @@ msgstr ""
 "Vil du merke meldinger som lest kun i denne mappen, eller i valgt mappe og "
 "undermapper i tillegg?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:181
 msgid "In Current Folder and _Subfolders"
 msgstr "I denne mappen og _undermapper"
 
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:195
 msgid "In Current _Folder Only"
 msgstr "Kun i _denne mappen"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:418
 msgid "Mark Me_ssages as Read"
 msgstr "Merk meldinger _som lest"
 
@@ -18819,19 +18437,19 @@ msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 "Vis e-postmeldinger som vanlig tekst, selv om de inneholder HTML-innhold."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "Vis HTML hvis det finnes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "La Evolution velge den beste delen å vise."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "Vis ren tekst hvis det finnes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18839,22 +18457,22 @@ msgstr ""
 "Vis tekstdelen hvis den finnes. La Evolution velge hvilken del som skal "
 "vises ellers."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "Vis kun ren tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
 "Alltid vis ren tekst delen og vis de andre delene som vedlegg hvis forespurt."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Vis _undertrykte HTML-deler som vedlegg"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "HTML-_modus"
 
@@ -18878,31 +18496,35 @@ msgstr "Outlook PST-import"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personlige mapper (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:296
 msgid "_Mail"
 msgstr "_E-post"
 
+#: ../plugins/pst-import/pst-importer.c:308
+msgid "Destination folder:"
+msgstr "MÃ¥lmappe:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "_Address Book"
 msgstr "_Adressebok"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:321
 msgid "A_ppointments"
 msgstr "A_vtaler"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:327 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Oppgaver"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:333
 msgid "_Journal entries"
 msgstr "_Journaloppføringer"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "Importing Outlook data"
 msgstr "Importerer data fra Outlook"
 
@@ -19060,56 +18682,56 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Kunne ikke publisere kalender: Kalendermotor eksisterer ikke lenger"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "Ny lokasjon"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "Rediger lokasjon"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin ble ikke funnet, kode: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Klarte ikke å opprette rør: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Feil etter kjøring av fork(): %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "Underprosess til SpamAssassin svarer ikke. Terminerer..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Venting på underprosess til SpamAssassin avbrutt. Terminerer..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Rør til SpamAssassin feilet. Feilkode: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr ""
 "SpamAssassin er ikke tilgjengelig. Vennligst installer programmet først."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Dette vil gjøre SpamAssassin mer pålitelig, men tregere"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
 msgid "I_nclude remote tests"
 msgstr "Inkluder eksterne tester"
 
@@ -19226,23 +18848,23 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF-format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Velg målfil"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "Lagre valgt kalender til disk"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "Lagre valgt notatliste til disk"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "Lagre valgt oppgaveliste til disk"
 
@@ -19254,15 +18876,15 @@ msgstr "Leder deg gjennom første oppsett av kontoen."
 msgid "Setup Assistant"
 msgstr "Veiviser for oppsett"
 
-#: ../plugins/startup-wizard/startup-wizard.c:110
+#: ../plugins/startup-wizard/startup-wizard.c:117
 msgid "Evolution Setup Assistant"
 msgstr "Konfigurasjonsassistent for Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:115
+#: ../plugins/startup-wizard/startup-wizard.c:122
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:118
+#: ../plugins/startup-wizard/startup-wizard.c:125
 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"
@@ -19275,26 +18897,26 @@ msgstr ""
 "\n"
 "Vennligst klikk «Fremover» for å fortsette. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
+#: ../plugins/startup-wizard/startup-wizard.c:160
+#: ../widgets/misc/e-import-assistant.c:389
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du ønsker å importere:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:168
-#: ../widgets/misc/e-import-assistant.c:542
+#: ../plugins/startup-wizard/startup-wizard.c:175
+#: ../widgets/misc/e-import-assistant.c:545
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:185
+#: ../plugins/startup-wizard/startup-wizard.c:192
 msgid "Importing files"
 msgstr "Importerer filer"
 
-#: ../plugins/startup-wizard/startup-wizard.c:248
+#: ../plugins/startup-wizard/startup-wizard.c:258
 msgid "Importing data."
 msgstr "Importerer data."
 
-#: ../plugins/startup-wizard/startup-wizard.c:250
+#: ../plugins/startup-wizard/startup-wizard.c:264
 msgid "Please wait"
 msgstr "Vennligst vent"
 
@@ -19311,7 +18933,7 @@ msgid "Thread messages by subject"
 msgstr "Vis meldingstråder etter emne"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "F_all tilbake til tråding av meldinger etter emne"
 
@@ -19327,15 +18949,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Tillegg for å lage maler av skisser"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:615
 msgid "No Title"
 msgstr "Ingen tittel"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:686
 msgid "Save as _Template"
 msgstr "Lagre som _mal"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:688
 msgid "Save as Template"
 msgstr "Lagre som mal"
 
@@ -19355,27 +18977,27 @@ msgstr "vCard i e-post"
 msgid "Show vCards directly in mail messages."
 msgstr "Vis vCard-vedlegg direkte i e-postmeldinger."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
 msgid "Show Full vCard"
 msgstr "Vis alle data i vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:167
 msgid "Show Compact vCard"
 msgstr "Vis kompakt vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:228
 msgid "There is one other contact."
 msgstr "Det finnes en annen kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:237
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Det finnes %d annen kontakt."
 msgstr[1] "Det finnes %d andre kontakter."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:258
 msgid "Save in Address Book"
 msgstr "Lagre i adressebok"
 
@@ -19391,11 +19013,11 @@ msgstr "WebDAV-kontakter"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Unngå IfMatch (kreves med Apache < 2.2.8)"
 
@@ -19437,7 +19059,7 @@ msgstr "Forvalgt vindubredde"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "Enable express mode"
-msgstr "Aktiver ekspressmodus"
+msgstr "Slå på ekspressmodus"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
@@ -19553,7 +19175,7 @@ msgstr "Sidelinjen er synlig"
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:321
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
@@ -19704,143 +19326,46 @@ msgstr "Knappestil for vindu"
 msgid "Window buttons are visible"
 msgstr "Vindusknapper er synlige"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
 msgid "Searches"
 msgstr "Søk"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:545
 msgid "Save Search"
 msgstr "Lagre søk"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "_Vis:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "Sø_k:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr " _i"
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "Stil for verktøylinje"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "Verktøylinjestil for bytter"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "Verktøylinjen er synlig"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "Om bytter er synlig"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Alle filer (*)"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "Handling for bytter"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "Byttehandling for denne skallvisningen"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "Sidenummer"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr "Sidenummer for notatbok i skallvisning"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "Søkeregel"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "Kriterie for aktive søkeresultater"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "EShellBackend for denne skallvisningen"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "Komponent med innhold i skallet"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr "Innholdskomponenten vises i høyre område for et skallvindu"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "Sidelinjekomponent for skallet"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "Sidelinjekomponenten vises i venstre område av et skallvindu"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "Oppvavelinjekomponent for skallet"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "Oppgavelinjekomponenten vises nederst i et skallvindu"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "Skallvindu"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "Vindu skallvisningen tilhører"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "Nøkkelfil som inneholder tilstandsdata for komponenten"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "Tittel for skallvisningen"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "Aktiv visnings-ID"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "Aktiv visnings-ID for GAL"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -19852,405 +19377,317 @@ msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 msgid "Evolution Website"
 msgstr "Evolution nettsted"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy er ikke installert."
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy kunne ikke kjøres."
 
-#: ../shell/e-shell-window-actions.c:1343
+#: ../shell/e-shell-window-actions.c:1347
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME Pilot er ikke installert."
 
-#: ../shell/e-shell-window-actions.c:1345
+#: ../shell/e-shell-window-actions.c:1349
 msgid "GNOME Pilot could not be run."
 msgstr "GNOME Pilot kunne ikke kjøres."
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1443
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "_Lukk vindu"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1455
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1457
 msgid "Open the Evolution User Guide"
 msgstr "Ã…pne Evolutions brukermanual"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Evolution _FAQ"
 msgstr "Evolution _OSS"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Åpne nettside med ofte stilte spørsmål"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1490
 msgid "_Forget Passwords"
 msgstr "_Glem passord"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1492
 msgid "Forget all remembered passwords"
 msgstr "Glem alle lagrede passord"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1497
 msgid "I_mport..."
 msgstr "I_mporter..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1504
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1506
 msgid "Create a new window displaying this view"
 msgstr "Opprett et nytt vindu med denne visningen"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Configure Evolution"
 msgstr "Konfigurer Evolution"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "_Hurtigreferanse"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Show Evolution's shortcut keys"
 msgstr "Vis snarveitaster for Evolution"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "_Avansert søk..."
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr "Sett sammen et mer avansert søk"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Clear the current search parameters"
 msgstr "Tøm aktive søkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1553
 msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede søk..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Manage your saved searches"
 msgstr "Håndter dine lagrede søk"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "Klikk her for å endre søketype"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "_Finn nå "
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Execute the current search parameters"
 msgstr "Kjør aktive søkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "_Lagre søk..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Save the current search parameters"
 msgstr "Lagre aktive søkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Send / _Receive"
 msgstr "Send / _motta"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Send queued items and retrieve new items"
 msgstr "Send kølagte oppføringer og hent nye oppføringer"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Submit _Bug Report..."
 msgstr "Sen_d inn feilrapport..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1602
 msgid "GNOME Pilot _Synchronization..."
 msgstr "GNOME-pilot-_synkronisering..."
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1604
 msgid "Set up GNOME Pilot configuration"
 msgstr "Konfigurer konfigurasjon av GNOME-pilot"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1611
 msgid "Put Evolution into offline mode"
 msgstr "Sett Evolution i frakoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1618
 msgid "Put Evolution into online mode"
 msgstr "Sett Evolution i tilkoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1646
 msgid "Lay_out"
 msgstr "Utf_orming"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_New"
 msgstr "_Ny"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Switcher Appearance"
 msgstr "Ut_seende for bytter"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Window"
 msgstr "_Vindu"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show Side _Bar"
 msgstr "Vis si_delinje"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1712
 msgid "Show the side bar"
 msgstr "Vis sidelinjen"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show _Buttons"
 msgstr "Vis _knapper"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1720
 msgid "Show the switcher buttons"
 msgstr "Vis knapper for bytter"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1726
 msgid "Show _Status Bar"
 msgstr "Vis _statuslinje"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Show the status bar"
 msgstr "Vis statuslinjen"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1734
 msgid "Show _Tool Bar"
 msgstr "Vis verk_tøylinjen"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1736
 msgid "Show the tool bar"
 msgstr "Vis verktøylinjen"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1758
 msgid "_Icons Only"
 msgstr "Kun _ikoner"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Display window buttons with icons only"
 msgstr "Vis bare ikoner på vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1765
 msgid "_Text Only"
 msgstr "Kun _tekst"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1767
 msgid "Display window buttons with text only"
 msgstr "Vis bare tekst på vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Icons _and Text"
 msgstr "Ikoner _og tekst"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Display window buttons with icons and text"
 msgstr "Vis tekst og ikoner på vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Tool_bar Style"
 msgstr "S_til for verktøylinje"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Vis vinduknapper ved å bruke instillinger for verktøylinjen på skrivebordet"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Define Views..."
 msgstr "Definer visninger..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1791
 msgid "Create or edit views"
 msgstr "Opprett eller rediger visninger"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Save current custom view"
 msgstr "Lagre aktiv egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1805
 msgid "C_urrent View"
 msgstr "A_ktiv visning"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Current view is a customized view"
 msgstr "Aktiv visning er en egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1827
 msgid "Change the page settings for your current printer"
 msgstr "Endre sideinnstillingene for din skriver"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2204
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2417
 msgid "Execute these search parameters"
 msgstr "Kjør disse søkeparameterene"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:573
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "Ny"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "Aktiv skallvisning"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "Navn på aktiv skallvisning"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "Skallvinduets EFocusTracker"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "Geometri"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "Initiell geometristreng for vindu"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Trygg modus"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Om tillegget er i sikker modus"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "Sidelinjen er synlig"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "Om sidelinjen i skallvinduet skal være synlig"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "Bytter er synlig"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Om skallvinduets bytteknapper skal være synlige."
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "Oppgaveliste er synlig"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "Om skallvinduets oppgavelinje skal være synlig"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Om skallvinduets verktøylinje skal være synlig"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "UI-håndterer"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "Skallvinduets GtkUIManager"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "Forbereder frakoblet bruk..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "Forbereder tilkoblet bruk..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "Forbereder avslutting..."
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "Modulkatalog"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "Katalog for lasting av EModuler"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "Nettverk tilgjengelig"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "Om nettverket er tilgjengelig"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "Tilkoblet"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "Om skallet er tilkoblet"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:172
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20285,7 +19722,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:196
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20293,59 +19730,55 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:203
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:317
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:319
 msgid "Apply the given geometry to the main window"
 msgstr "Bruk oppgitt geometri på hovedvinduet"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:323
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:325
 msgid "Start in \"express\" mode"
 msgstr "Start i «ekspress»-modus"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:328
 msgid "Forcibly shut down Evolution"
 msgstr "Tvungen nedstenging av Evolution"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Tvungen ommigrering fra Evolution 1.4"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:331
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:333
 msgid "Disable loading of any plugins."
 msgstr "Slå av lasting av tillegg."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:335
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Deaktiver forhåndsvisningsområdet for e-post, kontakter og oppgaver."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:339
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importer URIer eller filnavn gitt som argumenter."
 
-#: ../shell/main.c:350
+#: ../shell/main.c:341
 msgid "Request a running Evolution process to quit"
 msgstr "Be en kjørende Evolution-prosess om å stenge ned"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:458
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshåndterer og e-postklient"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:509
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20359,97 +19792,43 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Er du sikker på at du vil glemme alle lagrede passord?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Fortsett"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Kan ikke oppgradere direkte fra versjon {0}?"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Slett gamle data fra versjon {0}?"
+msgid "Continue Anyway"
+msgstr "Fortsett likevel"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+"Evolution støtter ikke lenger å oppgradere direkte fra versjon {0}. Du kan "
+"prøve å oppgradere til Evolution 2 for så å oppgradere til Evolution 3."
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "Glemming av passord tømmer alle passord som huskes av programmet. Du vil bli "
 "spurt igjen neste gang de kreves."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "Ikke nok diskplass for oppgraderingen."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "Vil du virkelig slette gamle data?"
+msgid "Quit Now"
+msgstr "Avslutt nå"
 
 #: ../shell/shell.error.xml.h:8
-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 ""
-"Hele innholdet i &quot;evolution&quot;-katalogen er i ferd med å bli fjernet "
-"permanent.\n"
-"\n"
-"Det anbefales at du verifiserer manuelt at alle dine meldinger, kontakter og "
-"kalenderdata er på plass, og at Evolution fungerer riktig før du sletter "
-"gamle data.\n"
-"\n"
-"NÃ¥r disse er slettet kan du ikke nedgradere til forrige versjon av Evolution "
-"uten å gjøre manuelle inngrep.\n"
-
-#: ../shell/shell.error.xml.h:14
-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 ""
-"Forrige versjon av Evolution lagret sine data på en annen lokasjon.\n"
-"\n"
-"Hvis du velger å fjerne disse dataene vil hele innholdet i &quot;"
-"evolution&quot;-katalogen bli fjernet permanent. Hvis du velger å beholde "
-"dataene vil du kunne fjerne innholdet i &quot;evolution&quot; manuelt når du "
-"ønsker det.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "Oppgradering fra forrige versjon feilet:"
 
-#: ../shell/shell.error.xml.h:19
-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 ""
-"Oppgradering av dine data og innstillinger vil kreve opptil {0} diskplass, "
-"men du har kun {1} tilgjengelig.\n"
-"\n"
-"Du må gjøre mer plass tilgjengelig i din hjemmekatalog før du kan fortsette."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "_Glem"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_Behold data"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_Vis påminnelse senere"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20543,7 +19922,7 @@ msgstr "Alternativer for sesjonshåndtering:"
 msgid "Show session management options"
 msgstr "Vis alternativer for sesjonshåndtering"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20601,7 +19980,7 @@ msgstr "Navn på sertifikat"
 msgid "Purposes"
 msgstr "Hensikter"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Serienummer"
@@ -20622,18 +20001,18 @@ msgstr "E-postadresse"
 msgid "All CA certificate files"
 msgstr "Alle CA-sertifikatfiler"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:1052
 msgid "Certificates"
 msgstr "Sertifikater"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikatvisning: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
+msgid "Enter the password for '%s'"
 msgstr "Oppgi passord for «%s»"
 
 #. we're setting the password initially
@@ -20664,7 +20043,7 @@ msgstr ""
 "Utstedt av:\n"
 "  Subjekt: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Velg sertifikat"
 
@@ -20677,14 +20056,10 @@ msgid "Authorities"
 msgstr "Autoriteter"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "Sikkerhetskopier"
+msgid "Backup _All"
+msgstr "Ta sikkerhetskopi av _alle"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "Sikkerhetskopier alle"
-
-#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20692,157 +20067,149 @@ msgstr ""
 "Før du stoler på denne CAen for noe formål bør du undersøke sertifikatet og "
 "dets regelsett og prosedyrer (hvis tilgjengelig)."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "Sertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "Tillit til sertifikatmyndighet"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "Sertifikatfelt"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "Sertifikathierarki"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "Detaljer om sertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "Tabell med sertifikater"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "Vanlig navn (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Kontaktsertifikater"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ikke stol på at dette sertifikatet er autentisk"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "Rediger"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "Innstillinger for tillit til e-postsertifikater"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "Sertifikat for e-postmottaker"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "Sertifikat for signering av e-post"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Utgår"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "Feltverdi"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "Fingeravtrykk"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "Importer"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "Utstedt av"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Utstedt"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "Utstedt til"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "MD5-fingeravtrykk"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "Organisasjon (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "Organisasjonsenhet (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-fingeravtrykk"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "SSL-klientsertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "SSL-tjenersertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "Dette sertifikatet er verifisert for følgende bruk:"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "Stol på at dette sertifikatet er autentisk"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "Stol på denne CAen for å identifisere e-postbrukere."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "Stol på denne CAen for å identifisere programvareutviklere."
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
 msgstr "Stol på denne CAen for identifisering av nettsteder."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "Gyldighet"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "Vis"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Du har sertifikater som identifiserer deg fra disse organisasjonene:"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Du har sertifikater på lager som identifiserer disse sertifikatmyndighetene:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "Du har sertifikater som identifiserer disse menneskene på lager:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "Dine sertifikater"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_Backup"
+msgstr "_Sikkerhetskopier"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "R_ediger tillit til CA"
 
@@ -20892,125 +20259,143 @@ msgstr "PKCS #1 MD5 med RSA-kryptering"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 med RSA-kryptering"
+
+#: ../smime/lib/e-cert.c:642
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 med RSA-kryptering"
+
+#: ../smime/lib/e-cert.c:645
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 med RSA-kryptering"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "Bruksområde for sertifikatnøkkel"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Netscape sertifikattype"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "Nøkkelidentifikator for sertifikatmyndighet"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objektidentifikator (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "Algoritmeidentifikator"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "Parametere for algoritme"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "Informasjon om subjektets offentlige nøkkel"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritme for subjektets offentlige nøkkel"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "Subjektets offentlige nøkkel"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "Feil: Kan ikke prosessere utvidelse"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "Signeringspart for objekt"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "SSL-sertifikatmyndighet"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "Sertifikatmyndighet for e-post"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "Signering"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "Ikke-benekting"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "Nøkkelchiffer"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "Datachiffer"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "Nøkkelavtale"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "Sertifikatsignerer"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "CRL-signerer"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "Ikke-kritisk"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "Utvidelser"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "Signeringsalgoritme for sertifikat"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "Utsteder"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "Unik ID for utsteder"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "Unik ID for subjekt"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "Signaturverdi for sertifikat"
 
@@ -21099,11 +20484,11 @@ msgid "With _Status"
 msgstr "Med _status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -21133,19 +20518,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_Utvalg"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "Samling"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:347
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definer visninger for %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:355
+#: ../widgets/menus/gal-define-views-dialog.c:357
 msgid "Define Views"
 msgstr "Definer visninger"
 
@@ -21158,11 +20538,7 @@ msgstr "Definer visninger for «%s»"
 msgid "Table"
 msgstr "Tabell"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Instans"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Lagre aktiv visning"
 
@@ -21174,11 +20550,7 @@ msgstr "_Opprett en ny visning"
 msgid "_Replace existing view"
 msgstr "E_rstatt eksisterende visning"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "Factory"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "Definer ny visning"
 
@@ -21198,22 +20570,10 @@ msgstr "Type visning:"
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "Kontonavn"
-
 #: ../widgets/misc/e-account-tree-view.c:255
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "Handling"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "En GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Egenskaper for vedlegg"
@@ -21231,11 +20591,11 @@ msgstr "MIME-type:"
 msgid "_Suggest automatic display of attachment"
 msgstr "Fore_slå automatisk visning av vedlegg"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "Kunne ikke sette som bakgrunn"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
@@ -21253,13 +20613,13 @@ msgstr "_Send til:"
 msgid "Send the selected attachments somewhere"
 msgstr "Send valgte vedlegg til noen"
 
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:495
+#: ../widgets/misc/e-attachment-tree-view.c:535
 msgid "Loading"
 msgstr "Laster"
 
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:507
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Saving"
 msgstr "Lagrer"
 
@@ -21268,13 +20628,10 @@ msgid "Hide Attachment _Bar"
 msgstr "Skjul ve_dleggsfelt"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:605
 msgid "Show Attachment _Bar"
 msgstr "Vis ve_dleggsfelt"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "Vis ve_dleggsfelt"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "Legg til vedlegg"
@@ -21291,32 +20648,32 @@ msgstr[1] "Lagre vedlegg"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "vedlegg.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "L_agre alle"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "Legg til ve_dlegg..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:356
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Åpne med «%s»"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Ã…pne dette vedlegget i %s"
@@ -21325,59 +20682,59 @@ msgstr "Ã…pne dette vedlegget i %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "Vedlagt melding"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 msgid "A load operation is already in progress"
 msgstr "En lasteoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 msgid "A save operation is already in progress"
 msgstr "En lagreoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Kunne ikke laste «%s»"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Kunne ikke laste vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2193
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Kunne ikke åpne «%s»"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2196
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Kunne ikke åpne vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "Vedleggets innhold ble ikke lastet"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2707
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Kunne ikke lagre «%s»"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2710
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Kunne ikke lagre vedlegget"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-klikk for å åpne en lenke"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1255
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21385,65 +20742,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "MÃ¥nedskalender"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Fyllfarge"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "Fyllfarge for GDK"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Fyll stiplet"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Minste bredde"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Minste bredde"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Mellomrom"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Tegnkoding"
@@ -21456,52 +20754,52 @@ msgstr "Skriv inn tegnsett som skal brukes"
 msgid "Other..."
 msgstr "Andre..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Dato og klokkeslett"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Tekstfelt for å oppgi dato"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Klikk på denne knappen for å vise en kalender"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Kombinasjonsboks med nedtrekksmeny for å velge tid"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "N_Ã¥"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "I _dag"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "I_ngen"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "Ingen"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "Ugyldig datoverdi"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "Ugyldig verdi for tid"
 
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:242
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21509,40 +20807,37 @@ msgstr ""
 "Velg filen du ønsker å importere til Evolution og velg hvilken type fil det "
 "er fra listen."
 
-#: ../widgets/misc/e-import-assistant.c:255
+#: ../widgets/misc/e-import-assistant.c:259
 msgid "F_ilename:"
 msgstr "F_ilnavn:"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:283
+#: ../widgets/misc/e-import-assistant.c:458
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:326
+#: ../widgets/misc/e-import-assistant.c:875
 msgid "Choose the destination for this import"
 msgstr "Velg mål det skal importeres til"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:351
 msgid "Choose the type of importer to run:"
 msgstr "Velg type importerer som skal kjøres:"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:359
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og innstillinger fra _eldre programmer"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:367
 msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr "Velg hvilken type fil du vil importere fra listen."
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:519
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21552,17 +20847,34 @@ msgstr ""
 "Netscape, Elm, iCalendar. Fant ingen innstillinger som kunne importeres. "
 "Hvis du vil prøve igjen kan du klikke på «Tilbake»-knappen."
 
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#: ../widgets/misc/e-import-assistant.c:874
+msgid "Preview data to be imported"
+msgstr "Forhåndsvis data som skal importeres"
+
+#: ../widgets/misc/e-import-assistant.c:879
+#: ../widgets/misc/e-import-assistant.c:888
+#: ../widgets/misc/e-import-assistant.c:1265
+#: ../widgets/misc/e-import-assistant.c:1338
+#: ../widgets/misc/e-import-assistant.c:1348
+msgid "Import Data"
+msgstr "Importer data"
+
+#. multiple importers found, be able to choose from them
+#: ../widgets/misc/e-import-assistant.c:884
+msgid "Select what type of file you want to import from the list."
+msgstr "Velg hvilken type fil du vil importere fra listen."
+
+#: ../widgets/misc/e-import-assistant.c:1256
+#: ../widgets/misc/e-import-assistant.c:1291
 msgid "Evolution Import Assistant"
 msgstr "Importeringsassistent for Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1273
+#: ../widgets/misc/e-import-assistant.c:1325
 msgid "Import Location"
 msgstr "Importer lokasjon"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1284
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21572,32 +20884,27 @@ msgstr ""
 "Gjennom denne veiviseren vil du ledes gjennom import av eksterne filer til "
 "Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1300
 msgid "Importer Type"
 msgstr "Type import"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1309
 msgid "Select Information to Import"
 msgstr "Velg informasjon som skal importeres"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1317
 msgid "Select a File"
 msgstr "Velg en fil"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1332
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Klikk på «Bruk» for å starte import av filen til Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "Importer data"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "Verdenskart"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21619,42 +20926,6 @@ msgstr ""
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution er frakoblet fordi nettverket ikke er tilgjengelig."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "Knappetilstanden er tilkoblet"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "Horisontal posisjon"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "Posisjon for området ved horisontal orientering"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "Vertikal posisjon"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "Posisjon for området ved vertikal orientering"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "Proporsjon"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "Andel av størrelsen for det andre området"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "Fast endring av størrelse"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Behold andre området fast under endring av størrelse"
-
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Synkroniser med:"
@@ -21676,68 +20947,46 @@ msgstr "Evolution brukervalg"
 msgid "Matches: %d"
 msgstr "Treff på: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "Lukk søkelinjen"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "Fin_n:"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "Tøm søket"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "_Forrige"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "Finn forrige oppføring av teksten"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "_Neste"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "Finn neste oppføring av teksten"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "Tre_ff på små/store bokstaver"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr "NÃ¥dde bunnen av siden og fortsatte fra toppen"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "NÃ¥dde toppen av siden og fortsatte fra bunnen"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "Markørrad"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Markørkolonne"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Sorterer"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Utvalgsmodus"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Markørmodus"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "NÃ¥r s_lettet:"
@@ -21759,89 +21008,102 @@ msgid "Delivery Options"
 msgstr "Alternativer for levering"
 
 #: ../widgets/misc/e-send-options.ui.h:6
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Inntil"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Etter"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "dager"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "I_nnen"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "dager"
+
+#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr "Kun for dine øyne"
 
-#: ../widgets/misc/e-send-options.ui.h:7
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
 msgstr "Gene_relle alternativer"
 
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "Mail Receipt"
 msgstr "E-postkvittering"
 
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:17
 msgid "Proprietary"
 msgstr "Proprietær"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
 msgstr "Svar for_espurt"
 
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
 msgstr "Returvarsling"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "Sta_tusoppfølging"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Standard"
 msgstr "Standard"
 
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "Status Tracking"
 msgstr "Statusoppfølging"
 
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "Top Secret"
 msgstr "Topphemmelig"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
 msgstr "Ved go_dkjenning:"
 
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
 msgstr "Ved full_føring:"
 
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
 msgstr "Ved _avslag:"
 
-#: ../widgets/misc/e-send-options.ui.h:28
-msgid "Wi_thin"
-msgstr "I_nnen"
-
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "_Etter:"
-
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_All information"
 msgstr "_All informasjon"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Classification:"
 msgstr "_Klassifisering:"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delay message delivery"
 msgstr "_Utsett meldingslevering"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delivered"
 msgstr "_Levert"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
 msgstr "_Sett utløpsdato"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "_Inntil:"
-
 #: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "_NÃ¥r det passer"
@@ -21850,6 +21112,12 @@ msgstr "_NÃ¥r det passer"
 msgid "_When opened:"
 msgstr "_Ved åpning:"
 
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+msgctxt "send-options"
+msgid "None"
+msgstr "Ingen"
+
 #: ../widgets/misc/e-signature-editor.c:133
 #: ../widgets/misc/e-signature-editor.c:549
 #: ../widgets/misc/e-signature-manager.c:349
@@ -21903,41 +21171,41 @@ msgstr "Skriptfilen må være kjørbar."
 msgid "Click here to go to URL"
 msgstr "Klikk her for å vise URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:359
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:361
 msgid "Copy the link to the clipboard"
 msgstr "Kopier lenken til utklippstavlen"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Open Link in Browser"
 msgstr "_Ã…pne lenke i nettleser"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:371
 msgid "Open the link in a web browser"
 msgstr "Ã…pne lenken i en nettleser"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Copy Email Address"
 msgstr "_Kopier e-postadresse"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
 msgid "Select all text and images"
 msgstr "Velg all tekst og alle bilder"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for å ringe %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:846
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for å skjule/vise adresser"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
@@ -21956,7 +21224,7 @@ msgstr "Kalender (fra %s til %s)"
 msgid "evolution calendar item"
 msgstr "Evolution kalenderoppføring"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "oppsprettliste"
 
@@ -21974,7 +21242,7 @@ msgstr "Ingen"
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen må skrives inn på formatet: %s"
@@ -21983,48 +21251,12 @@ msgstr "Datoen må skrives inn på formatet: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Valgt kolonne"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Kolonne med fokus"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Ikke-valgt kolonne"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Uthev kolonne"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "Understrek kolonne"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Fet kolonne"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Farget kolonne"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Kolonne for bakgrunnsfarge"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "klikk for å legge til"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Tilstand"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Stigende)"
@@ -22041,12 +21273,12 @@ msgstr "Ikke sortert"
 msgid "No grouping"
 msgstr "Ingen gruppering"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Vis felter"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "Tilgjengelige felt"
 
@@ -22055,7 +21287,7 @@ msgid "A_vailable Fields:"
 msgstr "T_ilgjengelige felter:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "Stigende"
 
@@ -22068,7 +21300,7 @@ msgid "Clear _All"
 msgstr "Fjern _alt"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "Synkende"
 
@@ -22128,7 +21360,7 @@ msgstr "_Vis disse feltene i rekkefølge:"
 msgid "_Sort..."
 msgstr "_Sorter..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "Legg til en kolonne"
 
@@ -22140,247 +21372,112 @@ msgstr ""
 "For å legge til en kolonne i din tabell kan\n"
 "du dra den til lokasjonen du vil ha den."
 
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d oppføring)"
-msgstr[1] "%s : %s (%d oppføringer)"
-
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s: %s (%d oppføring)"
+msgstr[1] "%s: %s (%d oppføringer)"
+
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d oppføring)"
 msgstr[1] "%s (%d oppføringer)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Skiftende farger på rader"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Horisontalt rutenett for tegning"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Vertikalt rutenett for tegning"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Tegn fokus"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Markørmodus"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Utvalgsmodell"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "Lengdeterskel"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Enhetlig høyde på rad"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "Frosset"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
 msgstr "Tilpass aktiv visning"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Sort _Ascending"
 msgstr "Sorter s_tigende"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1565
 msgid "Sort _Descending"
 msgstr "Sorter s_ynkende"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1568
 msgid "_Unsort"
 msgstr "_Fjern sortering"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1571
 msgid "Group By This _Field"
 msgstr "Grupper etter dette _feltet"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Group By _Box"
 msgstr "Grupper etter _boks"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Remove This _Column"
 msgstr "Fjern denne _kolonnen"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Add a C_olumn..."
 msgstr "Legg til en k_olonne..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "A_lignment"
 msgstr "_Justering"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "B_est Fit"
 msgstr "B_este tilpasning"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Format Column_s..."
 msgstr "For_mater kolonner..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Custo_mize Current View..."
 msgstr "T_ilpass aktiv visning..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Sort By"
 msgstr "_Sorter etter"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1672
 msgid "_Custom"
 msgstr "E_gendefinert"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "Tabellhode"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Modell for tabell"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Pekerrad"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Sorteringsinformasjon"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Alltid søk"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Bruk klikk for å legge til"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "Vertikalt mellomrom for rader"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "Vertikalt mellomrom mellom rader. Legges til topp og bunn på en rad"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree tabelladapter"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Gammeldags utseende"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Tegn linjer og +/- utvidere."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "Størrelse på utvider"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "Størrelse på utviderpilen"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "oppsprett"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "vis et avkom"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "rediger"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "start redigering av denne cellen"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "vend"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "vend cellen"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "utvid"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "utvider raden i ETree som inneholder denne cellen"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "slå sammen"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "slår sammen raden i ETree som inneholder denne cellen"
 
@@ -22396,115 +21493,10 @@ msgstr "klikk"
 msgid "sort"
 msgstr "sortere"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "Inndatametoder"
-
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Hendelsesprosessor"
-
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Tekst"
-
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Fet"
-
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Uthevet"
-
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Anker"
-
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "Justering"
-
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Bredde på utklipp"
-
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Høyde på utklipp"
-
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Utklipp"
-
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Fyll utklippsrektangel"
-
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "X-avstand"
-
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Y-avstand"
-
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Tekstbredde"
-
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Teksthøyde"
-
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Bruk ellipse"
-
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Ellipse"
-
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Linjebryting"
-
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Brytingstegn"
-
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "Maks antall linjer"
-
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Tegn kanter"
-
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Tillat linjeskift"
-
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Tegn bakgrunn"
-
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Tegn knapp"
-
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "Markørposisjon"
-
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "IM-kontekst"
-
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "HÃ¥ndter sprettopp"
diff --git a/po/or.po b/po/or.po
index 83e733c1f5..e581ef9c96 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1,21 +1,22 @@
-# translation of or.po to Oriya
+# translation of evolution.master.or.po to Oriya
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-#: ../shell/main.c:605
+#: ../shell/main.c:454
 # Subhransu Behera <arya_subhransu@yahoo.co.in>, 2006.
-# Manoj Kumar Giri <mgiri@redhat.com>, 2009.
+# Manoj Kumar Giri <mgiri@redhat.com>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: or\n"
+"Project-Id-Version: evolution.master.or\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n"
-"POT-Creation-Date: 2009-06-09 07:43+0000\n"
-"PO-Revision-Date: 2009-06-18 19:23+0530\n"
+"POT-Creation-Date: 2010-05-07 06:01+0000\n"
+"PO-Revision-Date: 2010-05-11 13:25+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
-"Language-Team: Oriya <oriya-it@googlegroups.com>\n"
+"Language-Team: Oriya <Translation-team-or@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\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
 "\n"
 "\n"
 "\n"
@@ -48,314 +49,6 @@ msgstr ""
 "\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution address book"
-msgstr "evolution ଠିକଣା ବହି"
-
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:208
-msgid "New Contact"
-msgstr "ନୂତନ ସମ�ପର�କ"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:216
-msgid "New Contact List"
-msgstr "ନୂତନ ସମ�ପର�କ ତାଲିକା"
-
-#: ../a11y/addressbook/ea-minicard-view.c:162
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "ଉପସ�ଥିତ %s ଠିକଣା ପ�ସ�ତିକା ଫୋଲଡରରେ %d କାର�ଡ ଅଛି"
-msgstr[1] "ଉପସ�ଥିତ %s ଠିକଣା ପ�ସ�ତିକା ଫୋଲଡରରେ %d କାର�ଡ ଗ�ଡିକ ଅଛି"
-
-#: ../a11y/addressbook/ea-minicard.c:31
-msgid "Open"
-msgstr "ଖୋଲନ�ତ�"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "ସମ�ପର�କ ତାଲିକା:"
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "ସମ�ପର�କ:"
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "evolution ମିନିକାର�ଡ"
-
-#: ../a11y/calendar/ea-cal-view-event.c:268
-msgid "It has alarms."
-msgstr "�ଥିରେ ସତର�କ ଘଣ�ଟି ଅଛି।"
-
-#: ../a11y/calendar/ea-cal-view-event.c:271
-msgid "It has recurrences."
-msgstr "�ଥିରେ ପ�ନରାବ�ର�ତ�ତି ଅଛି।"
-
-#: ../a11y/calendar/ea-cal-view-event.c:274
-msgid "It is a meeting."
-msgstr "�ହା ଗୋଟି� ସଭା ଅଟେ।"
-
-#: ../a11y/calendar/ea-cal-view-event.c:280
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "କ�ଯାଲେଣ�ଡର ଘଟଣା: %s ସାରାଂଶ ଅଟେ।"
-
-#: ../a11y/calendar/ea-cal-view-event.c:282
-msgid "Calendar Event: It has no summary."
-msgstr "କ�ଯାଲେଣ�ଡର ଘଟଣା: �ହାର କୌଣସି ସାରାଂଶ ନାହି�।"
-
-#: ../a11y/calendar/ea-cal-view-event.c:302
-msgid "calendar view event"
-msgstr "କ�ଯାଲେଣ�ଡର ଦ�ର�ଶ�ଯ ଘଟଣା"
-
-#: ../a11y/calendar/ea-cal-view-event.c:530
-msgid "Grab Focus"
-msgstr "ଫୋକସକ� ନିଅନ�ତ�"
-
-#: ../a11y/calendar/ea-cal-view.c:299
-msgid "New Appointment"
-msgstr "ନୂତନ ନିଯ�କ�ତି"
-
-#: ../a11y/calendar/ea-cal-view.c:300
-msgid "New All Day Event"
-msgstr "ନୂତନ ପୂର�ଣ�ଣ ଦିବସ ଘଟଣା"
-
-#: ../a11y/calendar/ea-cal-view.c:301
-msgid "New Meeting"
-msgstr "ନୂତନ ସଭା"
-
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "Go to Today"
-msgstr "ଆଜିକ� ଯାଆନ�ତ�"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "Go to Date"
-msgstr "ଦିନକ� ଯାଆନ�ତ�"
-
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
-msgid "a table to view and select the current time range"
-msgstr "ଉପସ�ଥିତ ସମୟ ପରିସରକ� ଦେଖିବା ପାଇ� �ବଂ ଚୟନ କରିବା ପାଇ� ଗୋଟି� ସାରଣୀ"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "�ଥିରେ %d ଘଟଣା ଅଛି।"
-msgstr[1] "�ଥିରେ %d ଘଟଣା ଅଛି।"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
-msgid "It has no events."
-msgstr "�ଥିରେ କୌଣସି ଘଟଣା ନାହି�।"
-
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:159
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "କାର�ଯ�ଯ ସପ�ତାହ ଦ�ର�ଶ�ଯ: %s. %s"
-
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:165
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "ଦିନ ଦ�ର�ଶ�ଯ: %s. %s"
-
-#: ../a11y/calendar/ea-day-view.c:196
-msgid "calendar view for a work week"
-msgstr "ଗୋଟି� କାର�ଯ�ଯ ସପ�ତାହ ପାଇ� କ�ଯାଲେଣ�ଡର ଦ�ର�ଶ�ଯ"
-
-#: ../a11y/calendar/ea-day-view.c:198
-msgid "calendar view for one or more days"
-msgstr "ଗୋଟି� �ବଂ ଅଧିକ ଦିବସ ପାଇ� କ�ଯାଲେଣ�ଡର ଦ�ର�ଶ�ଯ"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:772
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:775
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1598
-#: ../calendar/gui/e-week-view-main-item.c:335
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../a11y/calendar/ea-gnome-calendar.c:196
-#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:777
-#: ../calendar/gui/calendar-component.c:782
-#: ../calendar/gui/calendar-component.c:784
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:215
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../a11y/calendar/ea-gnome-calendar.c:227
-#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:796
-#: ../calendar/gui/calendar-component.c:803
-#: ../calendar/gui/calendar-component.c:809
-#: ../calendar/gui/calendar-component.c:811
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:801
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1614
-#: ../calendar/gui/e-week-view-main-item.c:349
-msgid "%d %b"
-msgstr "%d %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:245
-#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:782
-msgid "Gnome Calendar"
-msgstr "ନୋମ କ�ଯାଲେଣ�ଡର"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:288
-msgid "search bar"
-msgstr "ସନ�ଧାନ ପଟି"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:289
-msgid "evolution calendar search bar"
-msgstr "evolution କ�ଯାଲେଣ�ଡର ସନ�ଧାନ ପଟି"
-
-#: ../a11y/calendar/ea-jump-button.c:147
-msgid "Jump button"
-msgstr "ଡେଇ�ବା ବଟନ"
-
-#: ../a11y/calendar/ea-jump-button.c:156
-msgid "Click here, you can find more events."
-msgstr "�ଠାରେ ଦବାନ�ତ�, ଆପଣ ଅଧିକ ଘଟଣା ପାଇ ପାରିବେ।"
-
-#: ../a11y/calendar/ea-week-view.c:154
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "ମାସ ଦ�ର�ଶ�ଯ: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:158
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "ସପ�ତାହ ଦ�ର�ଶ�ଯ: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:189
-msgid "calendar view for a month"
-msgstr "ଗୋଟି� ସପ�ତାହ ପାଇ� କ�ଯାଲେଣ�ଡର ଦ�ର�ଶ�ଯ"
-
-#: ../a11y/calendar/ea-week-view.c:191
-msgid "calendar view for one or more weeks"
-msgstr "ଅଧିକ କିମ�ବା ସପ�ତାହ ପାଇ� କ�ଯାଲେଣ�ଡର ଦ�ର�ଶ�ଯ"
-
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "ପପ-ଅପ"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
-msgid "popup a child"
-msgstr "ଗୋଟି� ନିର�ଭରକକ� ପପ-ଅପ କରନ�ତ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
-msgid "edit"
-msgstr "ସମ�ପାଦନ କରନ�ତ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
-msgid "begin editing this cell"
-msgstr "�ହି କକ�ଷକ� ସମ�ପାଦନ କରିବା ପ�ରାରମ�ଭ କରନ�ତ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
-msgid "toggle"
-msgstr "ଅଦଳବଦଳ କରନ�ତ�"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
-msgid "toggle the cell"
-msgstr "କକ�ଷ ପରିବର�ତ�ତନ କରନ�ତ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "ସମ�ପ�ରସାରଣ କରନ�ତ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
-msgid "expands the row in the ETree containing this cell"
-msgstr "�ହି କକ�ଷକ� ଧାରଣ କରିଥିବା ETree ରେ ଧାଡିକ� ସମ�ପ�ରସାରିତ କରିଥା�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "ସଙ�କୋଚନ କରନ�ତ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
-msgid "collapses the row in the ETree containing this cell"
-msgstr "�ହି କକ�ଷକ� ଧାରଣ କରିଥିବା ETree ରେ ଧାଡିକ� ସଙ�କୋଚିତ କରନ�ତ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
-msgid "Table Cell"
-msgstr "ସାରଣୀ କକ�ଷ"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:579
-msgid "click to add"
-msgstr "ଯୋଗ କରିବା ପାଇ� ଦବାନ�ତ�"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
-msgid "click"
-msgstr "ଦବାନ�ତ�"
-
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
-msgid "sort"
-msgstr "ସଜାଡନ�ତ�"
-
-#: ../a11y/widgets/ea-calendar-item.c:295
-#: ../a11y/widgets/ea-calendar-item.c:301
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
-
-#: ../a11y/widgets/ea-calendar-item.c:303
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "କ�ଯାଲେଣ�ଡର: %s ର� %s କ�"
-
-#: ../a11y/widgets/ea-calendar-item.c:338
-msgid "evolution calendar item"
-msgstr "evolution କ�ଯାଲେଣ�ଡର ବସ�ତ�"
-
-#: ../a11y/widgets/ea-combo-button.c:56
-msgid "Combo Button"
-msgstr "ସମ�ମଳିତ ବଟନ"
-
-#: ../a11y/widgets/ea-combo-button.c:66
-msgid "Activate Default"
-msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତକ� ସକ�ରିୟ କରନ�ତ�"
-
-#: ../a11y/widgets/ea-combo-button.c:68
-msgid "Popup Menu"
-msgstr "ପପ-ଅପ ତାଲିକା"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -413,55 +106,49 @@ msgid ""
 "Evolution. Please use some other GroupWise mail client once to get your "
 "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
+"ବର�ତ�ତମାନ ଆପଣ Evolution ର� କେବଳ GroupWise ତନ�ତ�ର ଠିକଣା ବହିକ� ଅଭିଗମ�ୟ କରିପାରିବେ। ଦୟାକରି "
+"ଅନ�ୟ କିଛି GroupWise ମେଲ ଗ�ରାହକକ� GroupWise ପ�ନପୌନିକ ସମ�ପର�କ �ବଂ ବ�ୟକ�ତିଗତ ସମ�ପର�କ ଫୋଲଡରଗ�ଡ଼ିକ� "
+"ପାଇଲା ପରେ ବ�ୟବହାର କରନ�ତ�।"
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "ଠିକଣା ପ�ସ�ତିକା '{0}' କ� ଅପସାରଣ କରନ�ତ�"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading address book."
-msgstr "ଠିକଣା ପ�ସ�ତିକାକ� ଧାରଣ କରିବାରେ ତ�ର�ଟି।"
-
-#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0} କ� {1} ରେ ସଂରକ�ଷଣ କରିବା ସମୟରେ ତ�ର�ଟି: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Failed to authenticate with LDAP server."
 msgstr "LDAP ସେବକ ସହିତ ବୈଧିକରଣ କରିବା ସମୟରେ ତ�ର�ଟି।"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1268
 msgid "Failed to delete contact"
 msgstr "ଖାତାକ� ଅପସାରଣ କରିବା ସମୟରେ ତ�ର�ଟି"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "GroupWise Address book creation:"
 msgstr "ସମୂହ ଅନ�ସାରେ ଠିକଣା ପ�ସ�ତିକା ପ�ରସ�ତ�ତି:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP ସେବକ ବୈଧ ବିବରଣିକା ସୂଚନା ସହିତ ଉତ�ତର ଦେଲାନାହି�"
 
-#: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:54
-msgid "Server Version"
-msgstr "ସେବକ ସଂସ�କରଣ"
-
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr "ଆପଣଙ�କର ସାମ�ପ�ରତିକ ସେବକ ସହିତ କିଛି ଗ�ଣ ସଠିକ ରୂପରେ କାର�ଯ�ଯ କରି ନ ପାରେ"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "evolution ଠିକଣା ପ�ସ�ତିକାଟି ଅପ�ରତ�ଯାଶିତ ଭାବରେ ବନ�ଦ ହୋଇଗଲା।"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "ଆପଣ ବାଛିଥିବା ପ�ରତିଛବିଟି ବଡ଼ଅଛି। ଆପଣ �ହାର ଆକାର ବଦଳାଇ ସଂରକ�ଷଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:21
 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 "
@@ -471,15 +158,15 @@ msgstr ""
 "କରିନପାରେ ଅଥବା �ହା ଭ�ଲ ଭାବରେ ବିନ�ୟାସିତ ହୋଇଥା�ପାରେ। ସମର�ଥିତ ସନ�ଧାନ ଆଧାର ପାଇ� ଆପଣଙ�କର "
 "ପ�ରଶାସକଙ�କ� ପଚାରନ�ତ�।"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book could not be opened."
 msgstr "ଠିକଣା ପ�ସ�ତିକାକ� ଖୋଲି ହେଲାନାହି�।"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book server does not have any suggested search bases."
 msgstr "ଠିକଣା ପ�ସ�ତିକା ସେବକ ନିକଟରେ କୌଣସି ପରାମର�ଶିତ ସନ�ଧାନ ଆଧାର ନାହି�।"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:24
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -487,31 +174,31 @@ msgstr ""
 "�ହି ଠିକଣା ପ�ସ�ତିକା ସେବକକ� ପହଞ�ଚି ହେବନାହି� କିମ�ବା ସେବକ ନାମକ� ସଠିକ ଭାବରେ ବନାନ କରାଯାଇ ନାହି� "
 "କିମ�ବା ଆପଣଙ�କ ନେଟୱର�କ ସଂଯୋଗଟି ଅକାମି ହୋଇଯାଇଛି।"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "ଠିକଣା ପ�ସ�ତିକାଟି ଚିରସ�ଥାୟୀ ପାଇ� ଅପସାରିତ ହୋଇଯିବ।"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This server does not support LDAPv3 schema information."
 msgstr "ସେବକଟି LDAPv3 ବିବରଣିକା ସୂଚନାକ� ସମର�ଥ କରେନାହି�।"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open address book"
 msgstr "ଠିକଣା ପ�ସ�ତିକାକ� ଖୋଲିବାରେ ଅସମର�ଥ"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "ସନ�ଧାନ କରିବାରେ ଅସମର�ଥ।"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "{0} କ� ସଂରକ�ଷଣ କରିବାରେ ଅସମର�ଥ।"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "ଆପଣ ଆପଣଙ�କ ପରିବର�ତ�ତନ ମାନଙ�କ� ସଂରକ�ଷଣ କରିବା ପାଇ� ଚାହି�ବେ କି ?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:31
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -519,7 +206,7 @@ msgstr ""
 "ଆପଣ ଗୋଟି� ସମ�ପର�କକ� ଗୋଟି� ଠିକଣାର� ଅନ�ୟ ଗୋଟିକ� ସ�ଥାନାନ�ତରିତ କରିବା ପାଇ� ଚେଷ�ଟାକର�ଛନ�ତି କିନ�ତ� �ହାକ� "
 "ଉତ�ସର� କଢ଼ାଯାଇପାରିବ ନାହି�। �ହା ପରିବର�ତ�ତେ ଆପଣ ଗୋଟି� ନକଲକ� ସଂରକ�ଷଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -528,1020 +215,380 @@ msgstr ""
 "ଆପଣ ଗୋଟି� ଅସମର�ଥିତ ଶ�ରେଣୀ ଅନ�ଯାୟୀ ସର�ଭର ସହିତ ସଂଯ�କ�ତ ହେଉଛନ�ତି �ବଂ Evolution ବ�ୟବହାର କରି "
 "ସମସ�ୟାର ସମ�ମ�ଖିନ ହୋଇପାରନ�ତି। ଉତ�ତମ ଫଳାଫଳ ପାଇ� ସର�ଭରକ� ସମର�ଥିତ ସଂସ�କରଣକ� ଉନ�ନୟନ କରାଯିବା ଉଚିତ"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "�ହି ଠିକଣା ବହିର� ସମ�ପର�କଗ�ଡ଼ିକ� ଅପସାରଣ କରିବା ପାଇ� ଆପଣଙ�କ ପାଖରେ ଅନ�ମତି ନାହି�।"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "ଆପଣ �ହି ସମ�ପର�କରେ ପରିବର�ତ�ତନ କରିଛନ�ତି। ଆପଣ �ହି ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ସଂରକ�ଷଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ପ�ନର�ଚାଳନ ହେବା ପର�ଯ�ୟନ�ତ {0} ପାଇ� ଆପଣଙ�କର ସମ�ପର�କ ଉପଲବ�ଧ ହେବ ନାହି�।"
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
+#: ../plugins/groupwise-features/junk-settings.ui.h:4
+#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "ଯୋଗ କରନ�ତ� (_A)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "_Discard"
 msgstr "ବାତିଲ କରନ�ତ� (_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Do not save"
 msgstr "ସଂରକ�ଷଣ କରନ�ତ� ନାହି� (_D)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Resize"
 msgstr "ଆକାର ବଦଳନ�ତ� (_R)"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Use as it is"
 msgstr "ଯେପରି ଅଛି ସେହିପରି ବ�ୟବହାର କରନ�ତ� (_U)"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:46
-msgid "{1}"
-msgstr "{1}"
-
-#: ../addressbook/conduit/address-conduit.c:591
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ �କକାଳୀନ ଠିକଣା:"
 
-#: ../addressbook/conduit/address-conduit.c:1614
-#: ../addressbook/conduit/address-conduit.c:1615
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
 msgstr "ଠିକଣା ପ�ସ�ତିକାକ� ଧାରଣ କରିପାରିଲା ନାହି�"
 
-#: ../addressbook/conduit/address-conduit.c:1692
-#: ../addressbook/conduit/address-conduit.c:1695
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
 msgstr "ଚାଳକର ଠିକଣା ପ�ରୟୋଗ ଖଣ�ଡକ� ପଢି ପାରିଲା ନାହି�"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#: ../addressbook/gui/component/autocompletion-config.c:173
-msgid "Autocompletion"
-msgstr "ସ�ବତଃସମ�ପନ�ନ"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "C_ontacts"
-msgstr "ସମ�ପର�କ (_o)"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Certificates"
-msgstr "ପ�ରମାଣପତ�ର"
-
-#: ../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:1213
-#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:583
-msgid "Contacts"
-msgstr "ସମ�ପର�କ"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book"
-msgstr "Evolution ଠିକଣା ପ�ସ�ତିକା"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address popup"
-msgstr "Evolution ଠିକଣା ପ�ସ�ତିକା ଠିକଣା ପପ-ଅପ"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book address viewer"
-msgstr "Evolution ଠିକଣା ପ�ସ�ତିକା ଠିକଣା ପ�ରଦର�ଶକ"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book card viewer"
-msgstr "Evolution ଠିକଣା ପ�ସ�ତିକା କାର�ଡ ପ�ରଦର�ଶକ"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Address Book component"
-msgstr "Evolution ଠିକଣା ପ�ସ�ତିକା ଉପାଦାନ"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/MIME Certificate Management Control"
-msgstr "Evolution �ସ/ମାଇମ ପ�ରମାଣପତ�ର ପରିଚାଳନା ବ�ଯବସ�ଥା ନିୟନ�ତ�ରଣ"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution ଫୋଲଡର ସଂଯୋଜନା ବିନ�ଯାସ ନିୟନ�ତ�ରଣ"
-
-#: ../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:97
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:192
-#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:192
-#: ../mail/em-folder-tree-model.c:194 ../mail/em-migrate.c:2891
-#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
-#: ../mail/message-list.c:1517
-msgid "On This Computer"
-msgstr "�ହି କମ�ପ�ଟରରେ"
-
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:98
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "LDAP ସେବକରେ"
-
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. orange
-#: ../addressbook/gui/component/addressbook-component.c:135
-#: ../addressbook/gui/component/addressbook-component.c:138
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
-#: ../calendar/gui/calendar-component.c:232
-#: ../calendar/gui/calendar-component.c:238
-#: ../calendar/gui/memos-component.c:190 ../calendar/gui/memos-component.c:194
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:187
-#: ../calendar/gui/tasks-component.c:191 ../mail/em-migrate.c:960
-#: ../plugins/email-custom-header/email-custom-header.c:338
-msgid "Personal"
-msgstr "ବ�ଯକ�ତିଗତ"
-
-#: ../addressbook/gui/component/addressbook-component.c:209
-msgctxt "New"
-msgid "_Contact"
-msgstr "ସମ�ପର�କ (_C)"
-
-#: ../addressbook/gui/component/addressbook-component.c:210
-msgid "Create a new contact"
-msgstr "ଗୋଟି� ନୂତନ ସମ�ପର�କ ସ�ର�ଷ�ଟି କରନ�ତ�"
-
-#: ../addressbook/gui/component/addressbook-component.c:217
-msgctxt "New"
-msgid "Contact _List"
-msgstr "ସମ�ପର�କ ତାଲିକା (_L)"
-
-#: ../addressbook/gui/component/addressbook-component.c:218
-msgid "Create a new contact list"
-msgstr "ଗୋଟି� ନୂତନ ସମ�ପର�କ ତାଲିକା ସ�ର�ଷ�ଟି କରନ�ତ�"
-
-#: ../addressbook/gui/component/addressbook-component.c:224
-#: ../addressbook/gui/component/addressbook-config.c:1247
-msgid "New Address Book"
-msgstr "ନୂତନ ଠିକଣା ପ�ସ�ତିକା"
-
-#: ../addressbook/gui/component/addressbook-component.c:225
-msgctxt "New"
-msgid "Address _Book"
-msgstr "ଠିକଣା ପ�ସ�ତିକା (_B)"
-
-#: ../addressbook/gui/component/addressbook-component.c:226
-msgid "Create a new address book"
-msgstr "ଗୋଟି� ନୂତନ ଠିକଣା ପ�ସ�ତିକା ସ�ର�ଷ�ଟି କରନ�ତ�"
-
-#: ../addressbook/gui/component/addressbook-component.c:389
-msgid "Failed upgrading Address Book settings or folders."
-msgstr "ଠିକଣା ପ�ସ�ତିକା ସଂଯୋଜନା କିମ�ବା ଫୋଲଡରକ� ଉନ�ନୟନ କରିବାରେ ବିଫଳ।"
-
-#: ../addressbook/gui/component/addressbook-config.c:217
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"�ହି ବିକଳ�ପକ� ବାଛିବା ମାନେ ହେଉଛି Evolution ଆପଣଙ�କର LDAP ସର�ଭର ସହିତ ସଂଯ�କ�ତ ହେବ ଯଦି ଆପଣଙ�କର "
-"LDAP ସର�ଭର SSLକ� ସମର�ଥନ କରିଥା�।"
-
-#: ../addressbook/gui/component/addressbook-config.c:219
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"�ହି ବିକଳ�ପକ� ବାଛିବା ମାନେ ହେଉଛି Evolution ଆପଣଙ�କର LDAP ସର�ଭର ସହିତ ସଂଯ�କ�ତ ହେବ ଯଦି ଆପଣଙ�କର "
-"LDAP ସର�ଭର TLSକ� ସମର�ଥନ କରିଥା�।"
-
-#: ../addressbook/gui/component/addressbook-config.c:221
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"�ହି ବିକଳ�ପକ� ବାଛିବା ମାନେ ହେଉଛି ଆପଣଙ�କର ସର�ଭର SSL କିମ�ବା TLS କ� ସମର�ଥନ କରେନାହି�।�ହା ମାନେ "
-"ହେଉଛି ଆପଣଙ�କର ସଂଯୋଗ ଅସ�ରକ�ଷିତ ହେବ, �ବଂ ଆପଣ ସ�ରକ�ଷା ସମସ�ୟାର ସମ�ମ�ଖିନ ହେବେ।"
-
-#: ../addressbook/gui/component/addressbook-config.c:346
-msgid "Base"
-msgstr "ଆଧାର"
-
-#: ../addressbook/gui/component/addressbook-config.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "_Type:"
-msgstr "ପ�ରକାର (_T):"
-
-#: ../addressbook/gui/component/addressbook-config.c:649
-msgid "Copy _book content locally for offline operation"
-msgstr "ଅଫଲାଇନ କାର�ଯ�ଯକଳାପ ପାଇ� ପ�ସ�ତିକା ବିଷୟ ବସ�ତ�କ� ସ�ଥାନୀୟ ଭାବରେ ନକଲ କରନ�ତ�"
-
-#: ../addressbook/gui/component/addressbook-config.c:761
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"�ହା ହେଉଛି LDAP ସର�ଭରରେ ଥିବା ସଂଯୋଗିକୀ ଯାହାକ�କି Evolution ସଂଯୋଗ କରିବା ପାଇ� ଚେଷ�ଟାକରିଥା�। "
-"ମାନକ ସଂଯୋଗିକୀର ଗୋଟି� ତାଲିକା ପ�ରଦାନ କରାଯାଇଛି। କେଉ� ସଂଯୋଗିକୀକ� ଉଲ�ଲେଖ କରିବା ଉଚିତ ତାହା ପାଇ� "
-"ଆପଣଙ�କର ତନ�ତ�ର ପ�ରଶାସକଙ�କ ସହିତ ଯୋଗାଯୋଗ କରନ�ତ�।"
-
-#: ../addressbook/gui/component/addressbook-config.c:839
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"�ହା ହେଉଛି ଆପଣଙ�କ� ବୈଧିକୃତ କରିବା ପାଇ� Evolution ବ�ୟବହାର କର�ଥିବା ପଦ�ଧତି।  ମନେରଖନ�ତ� ଯେ �ହାକ� "
-"\"ଇମେଲ ଠିକଣା\" ଭାବରେ ବିନ�ୟାସ କରିବା ପାଇ� ଆପଣଙ�କର LDAP ସର�ଭରରେ ଅଜ�ଞାତ ଅଭିଗମ�ୟତା ଆବଶ�ୟକ "
-"କରିଥା�।"
-
-#: ../addressbook/gui/component/addressbook-config.c:918
-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/addressbook-config.c:1022
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
-#: ../plugins/itip-formatter/itip-formatter.c:2545
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "ସାଧାରଣ"
-
-#: ../addressbook/gui/component/addressbook-config.c:1023
-#: ../addressbook/gui/widgets/e-addressbook-view.c:553
-#: ../mail/importers/pine-importer.c:383
-msgid "Address Book"
-msgstr "ଠିକଣା ପ�ସ�ତିକା"
-
-#: ../addressbook/gui/component/addressbook-config.c:1027
-msgid "Server Information"
-msgstr "ସେବକ ସୂଚନା"
-
-#: ../addressbook/gui/component/addressbook-config.c:1029
-msgid "Authentication"
-msgstr "ବୈଧିକରଣ"
-
-#: ../addressbook/gui/component/addressbook-config.c:1032
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../smime/gui/smime-ui.glade.h:20
-msgid "Details"
-msgstr "ବିସ�ତ�ର�ତ ବିବରଣୀ"
-
-#: ../addressbook/gui/component/addressbook-config.c:1033
-#: ../mail/em-folder-browser.c:1024
-msgid "Searching"
-msgstr "ସନ�ଧାନ କର�ଅଛି"
-
-#: ../addressbook/gui/component/addressbook-config.c:1035
-msgid "Downloading"
-msgstr "ଆହରଣ କର�ଅଛି"
-
-#: ../addressbook/gui/component/addressbook-config.c:1245
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "Address Book Properties"
-msgstr "ଠିକଣା ପ�ସ�ତିକା ଗ�ଣଧର�ମ"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1110
-msgid "Migrating..."
-msgstr "ସ�ଥାନ ପରିବର�ତ�ତନ କର�ଅଛି ..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1169
-#, c-format
-msgid "Migrating '%s':"
-msgstr "`%s' ର ସ�ଥାନ ପରିବର�ତ�ତନ କର�ଅଛି:"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:646
-msgid "LDAP Servers"
-msgstr "LDAP ସେବକ"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:761
-msgid "Autocompletion Settings"
-msgstr "ସ�ବତଃସମ�ପନ�ନ ବିନ�ଯାସ"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution ସମ�ପର�କ ଫୋଲଡରଗ�ଡ଼ିକର ଅବସ�ଥାନ �ବଂ ଅନ�କ�ରମ Evolution 1.x ପରଠାର� ପରିବର�ତ�ତନ "
-"ହୋଇଛି।\n"
-"\n"
-"ଦୟାକରି Evolution ଆପଣଙ�କର ଫୋଲଡରଗ�ଡ଼ିକ� ସ�ଥାନାନ�ତରଣ କରିବା ସମୟରେ ଧୈର�ଯ�ୟ ରଖନ�ତ�..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ମେଲିଙ�ଗ ତାଲିକା ସମ�ପର�କଗ�ଡ଼ିକର ସଜ�ଜିକରଣ ଶୈଳୀ ପରିବର�ତ�ତନ ହୋଇଛି।\n"
-"\n"
-"Evolution ଆପଣଙ�କର ଫୋଲଡରଗ�ଡ଼ିକ� ସ�ଥାନାନ�ତରିତ କରିବା ପର�ଯ�ୟନ�ତ ଦୟାକରି ଧୈର�ଯ�ୟ ରଖନ�ତ�..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution ସଂରକ�ଷଣ କର�ଥିବା କିଛି ଫୋନ କ�ରମ ସଂଖ�ୟା ପରିବର�ତ�ତନ ହୋଇଛି।\n"
-"\n"
-"Evolution ଆପଣଙ�କର ଫୋଲଡରଗ�ଡ଼ିକ� ସ�ଥାନାନ�ତରିତ କରିବା ସମୟରେ ଧୈର�ଯ�ୟ ରଖନ�ତ�..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolutionର Palm Sync changelog �ବଂ ମାନଚିତ�ର ଫାଇଲଗ�ଡ଼ିକ� ପରିବର�ତ�ତନ କରାଯାଇଛି।\n"
-"\n"
-"Evolution ଆପଣଙ�କର Pilot Sync ତଥ�ୟ ସହିତ ସ�ଥାନାନ�ତରିତ ହେବା ସମୟରେ ଦୟାକରି ଧୈର�ଯ�ୟ ରଖନ�ତ�..."
-
-#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:453
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "\"%s\" ଫୋଲଡରର ନାମକ� ବଦଳାନ�ତ�:"
-
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:455
-msgid "Rename Folder"
-msgstr "ଫୋଲଡରର ନାମ ବଦଳାନ�ତ�"
-
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:461
-msgid "Folder names cannot contain '/'"
-msgstr "ଫୋଲଡରର ନାମ ଗୋଟି� '/' ଧାରଣ କରିପାରିବ ନାହି�"
-
-#: ../addressbook/gui/component/addressbook-view.c:949
-msgid "_New Address Book"
-msgstr "ନୂତନ ଠିକଣା ପ�ସ�ତିକା (_N)"
-
-#: ../addressbook/gui/component/addressbook-view.c:950
-msgid "Save As vCard..."
-msgstr "vCard ଭାବରେ ସଂରକ�ଷଣ କରନ�ତ�..."
-
-#: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:629
-#: ../calendar/gui/memos-component.c:481 ../calendar/gui/tasks-component.c:473
-#: ../mail/em-folder-tree.c:2105 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "ନାମ ବଦଳାନ�ତ� ... (_R)"
-
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/calendar-component.c:632
-#: ../calendar/gui/e-calendar-table.c:1614
-#: ../calendar/gui/e-calendar-view.c:1833 ../calendar/gui/e-memo-table.c:952
-#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:476
-#: ../mail/em-folder-tree.c:2102 ../mail/em-folder-view.c:1341
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "ଅପସାରଣ କରନ�ତ� (_D)"
-
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:637
-#: ../calendar/gui/memos-component.c:489 ../calendar/gui/tasks-component.c:481
-#: ../mail/em-folder-tree.c:2111 ../ui/evolution-addressbook.xml.h:59
-#: ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "ଗ�ଣଧର�ମ (_P)"
-
-#: ../addressbook/gui/component/addressbook-view.c:1223
-msgid "Contact Source Selector"
-msgstr "ସମ�ପର�କ ଉତ�ସ ଚୟକ"
-
-#: ../addressbook/gui/component/addressbook.c:102
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP ସେବକକ� ଅଜ�ଞାତ ଭାବରେ ଅଭିଗମ କର�ଅଛି"
-
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
-msgid "Failed to authenticate.\n"
-msgstr "ବୈଧିକ�ର�ତ କରିବାରେ ବିଫଳ।\n"
-
-#: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s (%s ଚାଳକ) ପାଇ� ପ�ରବେଶ ସଙ�କେତ ଭରଣ କରନ�ତ�"
-
-#: ../addressbook/gui/component/addressbook.c:222
-#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:423
-#: ../plugins/publish-calendar/publish-calendar.c:208
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "ପ�ରବେଶ ସଙ�କେତ ଭରଣ କରନ�ତ�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "ସ�ବତଃସମ�ପନ�ନ ଦୈର�ଘ�ଯ"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "URIଗ�ଡ଼ିକର ସମ�ପୂର�ଣ�ଣ ତାଲିକା ପାଇ� EFolderList XML"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "URIଗ�ଡ଼ିକର ସମ�ପୂର�ଣ�ଣ ତାଲିକା ପାଇ�  EFolderList XML।"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"କାର�ଡ �ବଂ ତାଲିକା ଦୃଶ�ୟଗ�ଡ଼ିକ ମଧ�ଯରେ �ବଂ ପ�ରାକଦର�ଶନ ପଟ�ଟିକା ମଧ�ଯରେ,ଭୂଲମ�ବ ପଟ�ଟିକର ଅବସ�ଥାନ, "
-"ପିକସେଲରେ।"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr "ଠିକଣା ସହିତ ସ�ୱୟଂ ସମ�ପୂର�ଣ�ଣ ନାମକ� ଦର�ଶାନ�ତ�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
-msgid "Show preview pane"
-msgstr "ପୂର�ବାଲୋକନ ଫଳକକ� ଦେଖାନ�ତ�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr "Evolution ସ�ୱୟଂସମ�ପୂର�ଣ�ଣ ହେବାକ� ଚେଷ�ଟାକରିବା ପୂର�ବର� ଟାଇପ ହେବାକ� ଥିବା ଅକ�ଷର ସଂଖ�ଯା।"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
-msgid "URI for the folder last used in the select names dialog"
-msgstr "ନାମ ଚୟନ ସଂଳାପରେ ଶେଷଥର ବ�ୟବହୃତ ଫୋଲଡର ପାଇ� URI"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-msgid "URI for the folder last used in the select names dialog."
-msgstr "URI ପାଇ� ବଚ�ଛିତ ନାମ ସଂଳାପରେ ଅନ�ତିମ ବ�ଯବହୃତ ଫୋଲଡର।"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
-msgid "Vertical pane position"
-msgstr "ଭୂଲମ�ବ ଫଳକ ଅବସ�ଥିତି"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr "ଭରଣରେ ସ�ୱୟଂ ସମ�ପୂର�ଣ�ଣ ସମ�ପର�କ ତାଲିକାର ନାମ ସହିତ ମେଲ ଠିକଣାକ� ଦର�ଶାଉଅଛି କି ନାହି�।"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
-msgid "Whether to show the preview pane."
-msgstr "ପୂର�ବାଲୋକନ ଫଳକକ� ଦେଖାଯିବକି ନାହି�।"
-
-#: ../addressbook/gui/component/autocompletion-config.c:175
-msgid "Always _show address of the autocompleted contact"
-msgstr "ସ�ୱୟଂ ସମ�ପୂର�ଣ�ଣ ସମ�ପର�କ ପାଇ� ସର�ବଦା ଠିକଣା ଦର�ଶାନ�ତ� (_s)"
-
-#: ../addressbook/gui/component/autocompletion-config.c:180
-msgid "Look up in address books"
-msgstr "ଠିକଣା ପ�ସ�ତିକାରେ ଅବଲୋକନ କରନ�ତ�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:1
-msgid "1"
-msgstr "à­§"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid ""
-"389\n"
-"636\n"
-"3268"
-msgstr ""
-"389\n"
-"636\n"
-"3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "5"
-msgstr "à­«"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>ବୈଧିକରଣ</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>ଆହରଣ କର�ଅଛି</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>ସନ�ଧାନ କର�ଅଛି</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid ""
-"Anonymously\n"
-"Using email address\n"
-"Using distinguished name (DN)"
-msgstr ""
-"ଅଜ�ଞାତ ଭାବରେ\n"
-"ଇମେଲ ଠିକଣା ବ�ୟବହାର କରି\n"
-"ପ�ରଖ�ଯାତ ନାମ (DN) କ� ବ�ଯବହାର କର�ଅଛି"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-msgid "B_rowse this book until limit reached"
-msgstr "ସୀମା ପହଞ�ଚିବା ପର�ଯ�ୟନ�ତ �ହି ବହିକ� ବ�ରାଉଜ କରନ�ତ� (_r)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "ଆପଣଙ�କ� ସେବକରେ ବୈଧିକ�ର�ତ କରିବା ପାଇ� Evolution �ହି ଇ-ଡାକ ଠିକଣାକ� ବ�ଯବହାର କରିବ।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Lo_gin:"
-msgstr "ଲଗଇନ (_g):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid ""
-"One\n"
-"Sub"
-msgstr ""
-"�କ\n"
-"ଉପ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid ""
-"SSL encryption\n"
-"TLS encryption\n"
-"No encryption"
-msgstr ""
-"SSL ସଂଗ�ପ�ତ କରଣ\n"
-"TLS ସଂଗ�ପ�ତ କରଣ\n"
-"କୌଣସି ସଂଗ�ପ�ତ କରଣ ନାହି�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-msgid "Search Filter"
-msgstr "ଫିଲଟର ଖୋଜନ�ତ�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-msgid "Search _base:"
-msgstr "ଆଧାର ଖୋଜନ�ତ� (_b):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "Search _filter:"
-msgstr "ଫିଲଟର ଖୋଜନ�ତ� (_f):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Supported Search Bases"
-msgstr "ସମର�ଥିତ ସନ�ଧାନ ଆଧାର"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"ସନ�ଧାନ ଆଧାରଟି ହୋଉଛି ଭରଣର ଚିହ�ନିତ ନାମ (DN) ଯେଉ�ଠି ସନ�ଧାନ ଆରମ�ଭ ହୋଇଥା�। "
-"ଯଦି ଆପଣ �ହାକ� ଖାଲି ରଖନ�ତି, ତେବେ ସନ�ଧାନ କାର�ଯ�ୟ ଡିରେକ�ଟୋରୀ ଟ�ରୀର ମୂଳରେ "
-"ଆରମ�ଭ ହୋଇଥା�।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr "�ହା ଆପଣଙ�କର LDAP ସର�ଭରର ସମ�ପୂର�ଣ�ଣ ନାମ। ଉଦାହରଣ ସ�ୱରୂପ, \"ldap.mycompany.com\"।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-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:32
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"ଆପଣଙ�କ Evolution ଫୋଲଡର ତାଲିକାରେ ଦର�ଶାଯିବାକ� ଥିବା ସର�ଭରର ନାମ। �ହା କେବଳ ପ�ରଦର�ଶନ ଉଦ�ଦେଶ�ୟ "
-"ପାଇ�।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid "_Download limit:"
-msgstr "ଆହରଣ ସୀମା (_D):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid "_Find Possible Search Bases"
-msgstr "ସମ�ଭାବ�ଯ ସନ�ଧାନ ଆଧାରକ� ଖୋଜନ�ତ� (_F)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid "_Login method:"
-msgstr "ଲଗଇନ ପଦ�ଧତି (_L):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:176
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-msgid "_Name:"
-msgstr "ନାମ (_N):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "_Port:"
-msgstr "ସଂଯୋଗିକୀ (_P):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-msgid "_Search scope:"
-msgstr "ସନ�ଧାନ ସ�ଯୋଗ (_S):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-#: ../mail/mail-config.glade.h:185
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Server:"
-msgstr "ସେବକ (_S):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid "_Timeout:"
-msgstr "ସମୟ ସମାପ�ତି (_T):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "_Use secure connection:"
-msgstr "ସ�ରକ�ଷିତ ସଂଯୋଗକ� ବ�ଯବହାର କରନ�ତ� (_U):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid "cards"
-msgstr "କାର�ଡ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-#: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:523
-#: ../plugins/google-account-setup/google-source.c:653
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-msgid "minutes"
-msgstr "ମିନିଟ"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>ଇ-ଡାକ</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>ମୂଳସ�ଥାନ</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>ତତ�କାଳ ସନ�ଦେଶ</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>କାର�ଯ�ଯ</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>ବିବିଧ</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "<b>Other</b>"
-msgstr "<b>ଅନ�ଯାନ�ଯ</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Telephone</b>"
-msgstr "<b>ଟେଲିଫୋନ</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../calendar/gui/e-calendar-view.c:2005
+msgid "Anniversary"
+msgstr "ବାର�ଷିକୀ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Web Addresses</b>"
-msgstr "<b>ଓ�ବେବ ଠିକଣା</b>"
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../calendar/gui/e-calendar-view.c:2004 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:107
+msgid "Birthday"
+msgstr "ଜନ�ମଦିନ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Work</b>"
-msgstr "<b>କାର�ଯ�ଯ</b>"
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#, fuzzy
+#| msgid "Blog"
+msgid "Blog:"
+msgstr "ବ�ଲୋଗ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "ବିଭାଗ... (_t)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#, fuzzy
+#| msgid "_Calendar:"
+msgid "Calendar:"
+msgstr "କ�ଯାଲେଣ�ଡର (_C):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
 msgid "Contact"
 msgstr "ସମ�ପର�କ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2443
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2570
 msgid "Contact Editor"
 msgstr "ସମ�ପର�କ ସମ�ପାଦକ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+msgid "Email"
+msgstr "ଇ-ଡାକ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#, fuzzy
+#| msgid "_Free/Busy:"
+msgid "Free/Busy:"
+msgstr "ମ�କ�ତ/ବ�ଯସ�ତ (_F):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "ପୂରା ନାମ (_N) ..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:70
+msgid "Home"
+msgstr "ମୂଳସ�ଥାନ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#, fuzzy
+#| msgid "_Home Page:"
+msgid "Home Page:"
+msgstr "ମୂଳସ�ଥାନ ପ�ର�ଷ�ଠ (_H):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "ପ�ରତିଛବି"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#, fuzzy
+#| msgid "<b>Instant Messaging</b>"
+msgid "Instant Messaging"
+msgstr "<b>ତତ�କାଳ ସନ�ଦେଶ</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+msgid "Job"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "ଚିଠି ପଠାଇବା ଠିକଣା"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+#, fuzzy
+#| msgid "Miscelleneous"
+msgid "Miscellaneous"
+msgstr "ବିବିଧ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "ଡାକ ନାମ (_k):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
+msgid "Notes"
+msgstr "ଟିପ�ପଣୀ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:71
+#: ../addressbook/gui/widgets/eab-contact-display.c:460
+#: ../calendar/gui/e-calendar-view.c:1711
+msgid "Other"
+msgstr "ଅନ�ଯାନ�ଯ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "ବ�ଯକ�ତିଗତ ସୂଚନା"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "ଟେଲିଫୋନ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+#, fuzzy
+#| msgid "_Video Chat:"
+msgid "Video Chat:"
+msgstr "ଭିଡିଓ ଗପସପ (_V):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#, fuzzy
+#| msgid "<b>Web Addresses</b>"
+msgid "Web Addresses"
+msgstr "<b>ଓ�ବେବ ଠିକଣା</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
+msgid "Work"
+msgstr "କାର�ଯ�ଯ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "ଠିକଣା (_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "ବାର�ଷିକୀ (_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "ସହକାରୀ (_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "ଜନ�ମଦିନ (_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../calendar/gui/dialogs/event-page.c:805
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#, fuzzy
+#| msgid "Blog"
+msgid "_Blog:"
+msgstr "ବ�ଲୋଗ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "କ�ଯାଲେଣ�ଡର (_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "ସହର (_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "କମ�ପାନୀ (_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "ଦେଶ (_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "ବିଭାଗ (_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "ଫାଇଲକ� �ହା ଅନ�ତର�ଭୂକ�ତ କରନ�ତ� (_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "ମ�କ�ତ/ବ�ଯସ�ତ (_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "ମୂଳସ�ଥାନ ପ�ର�ଷ�ଠ (_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "ପରିଚାଳକ (_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Notes:"
-msgstr "ଟିପ�ପଣୀ (_N):"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "କାର�ଯ�ଯାଳୟ (_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "ପି.ଓ. ବାକ�ସ (_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "ବ�ର�ତ�ତି (_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "ଜୀବନସାଥୀ (_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "ରାଜ�ଯ/ପ�ରଦେଶ (_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
-#: ../addressbook/gui/contact-editor/fullname.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "ଶୀର�ଷକ (_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "ଭିଡିଓ ଗପସପ (_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "HTML ଡାକ ପାଇବା ପାଇ� ଚାହି�ଥା� (_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
-msgid "_Web Log:"
-msgstr "ଓ�ବେବ ଲଗ (_W):"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "କେଉ�ଠାରେ (_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "ଜିପ/ପୋଷ�ଟାଲ କୋଡ (_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:475
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:706
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../widgets/menus/gal-define-views-dialog.c:344
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:61
-msgid "Name"
-msgstr "ନାମ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:290
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1828 ../widgets/text/e-text.c:3689
-#: ../widgets/text/e-text.c:3690
-msgid "Editable"
-msgstr "ସମ�ପାଦନ ଯୋଗ�ଯ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "ସମୂହ ଅନ�ସାରେ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:613
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#. red
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../mail/em-migrate.c:959
-msgid "Work"
-msgstr "କାର�ଯ�ଯ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
-msgid "Home"
-msgstr "ମୂଳସ�ଥାନ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2296
-msgid "Other"
-msgstr "ଅନ�ଯାନ�ଯ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:248
-msgid "Source Book"
-msgstr "ଉତ�ସ ପ�ସ�ତିକା"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:255
-msgid "Target Book"
-msgstr "ଲକ�ଷ�ଯ ପ�ସ�ତିକା"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-msgid "Is New Contact"
-msgstr "ନୂତନ ସମ�ପର�କ ଅଟେ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:276
-msgid "Writable Fields"
-msgstr "ଲିଖନୀୟ କ�ଷେତ�ର"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
+msgid "Error adding contact"
+msgstr "ସମ�ପର�କ ଯୋଗ କରିବା ସମୟରେ ତ�ର�ଟି"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:283
-msgid "Required Fields"
-msgstr "ଆବଶ�ଯକୀୟ କ�ଷେତ�ର"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+msgid "Error modifying contact"
+msgstr "ସମ�ପର�କ ପରିବର�ତ�ତିତ କରିବା ସମୟରେ ତ�ର�ଟି"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:297
-msgid "Changed"
-msgstr "ପରିବର�ତ�ତିତ"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+msgid "Error removing contact"
+msgstr "ସମ�ପର�କ ଅପସାରଣ କରିବା ସମୟରେ ତ�ର�ଟି"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2438
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2565
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ସମ�ପର�କ ସମ�ପାଦକ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2973
 msgid "Please select an image for this contact"
 msgstr "ଦୟାକରି �ହି ସମ�ପର�କ ପାଇ� ଗୋଟି� ପ�ରତିଛବି ଚୟନ କରନ�ତ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2974
 msgid "_No image"
 msgstr "କୌଣସି ପ�ରତିଛବି ନାହି� (_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3247
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1549,199 +596,176 @@ msgstr ""
 "ସମ�ପର�କ ତଥ�ଯଟି ଅବୈଧ ଅଟେ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ଗୋଟି� ଅବୈଧ ପଦ�ଧତି ଅଟେ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3258
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ରେ ଗୋଟି� ଅବୈଧ ପଦ�ଧତି ଅଛି"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3284
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ଖାଲି ଅଛି"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3161
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
 msgid "Invalid contact."
 msgstr "ଅବୈଧ ସମ�ପର�କ।"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "ଶୀଘ�ର-ଯୋଗ ସହିତ ଯୋଗାଯୋଗ କରନ�ତ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "ସମ�ପୂର�ଣ�ଣ ସମ�ପାଦନ କରନ�ତ� (_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "ପୂରା ନାମ (_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "ଇ-ଡାକ (_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "ଠିକଣା ପ�ସ�ତିକାକ� ଚୟନ କରନ�ତ� (_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+msgid "Dr."
 msgstr ""
-"ଆପଣ ନିଶ�ଚିତ କି ଆପଣ\n"
-"(%s) ସମ�ପର�କ ତାଲିକାକ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+msgid "Esq."
 msgstr ""
-"ଆପଣ ନିଶ�ଚିତ କି ଆପଣ �ହି\n"
-"ସମ�ପର�କ ତାଲିକା ଗ�ଡିକ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Full Name"
+msgstr "ପୂରା ନାମ"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+msgid "I"
 msgstr ""
-"ଆପଣ ନିଶ�ଚିତ କି ଆପଣ\n"
-"(%s) ସମ�ପର�କକ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+msgid "II"
 msgstr ""
-"ଆପଣ ନିଶ�ଚିତ କି ଆପଣ �ହି\n"
-"ସମ�ପର�କ ଗ�ଡିକ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+msgid "III"
 msgstr ""
-"\n"
-"ଶ�ରୀମାନ\n"
-"ଶ�ରୀମତୀ\n"
-"କ�ମାରୀ\n"
-"କ�ମାରୀ\n"
-"ଡ଼."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+msgid "Jr."
 msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Full Name"
-msgstr "ପୂରା ନାମ"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+#, fuzzy
+#| msgid "is"
+msgid "Miss"
+msgstr "ଅଟେ"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+msgid "Mr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+msgid "Mrs."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+msgid "Ms."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
+msgid "Sr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "ପ�ରଥମ (_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "ଅନ�ତିମ (_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "ମଧ�ଯମ (_M):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "ଉପସର�ଗ (_S):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "<b>Members</b>"
-msgstr "<b>ସଦସ�ୟମାନେ</b>"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:676
 msgid "Contact List Editor"
 msgstr "ସମ�ପର�କ ତାଲିକା ସମ�ପାଦକ"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:213
-#: ../calendar/gui/e-day-view-time-item.c:816
-#: ../calendar/gui/e-timezone-entry.c:121
-msgid "Select..."
-msgstr "ଚୟନ କରନ�ତ�..."
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+#, fuzzy
+#| msgid "_Members"
+msgid "Members"
+msgstr "ସଦସ�ଯ (_M)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
 msgstr "�ହି ଗୋଷ�ଠୀକ� ଡାକ ପଠାଇବା ପୂର�ବର� ଠିକଣା ମାନଙ�କ� ଲ�କ�କାୟିତ କରନ�ତ� (_H)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "ତାଲିକା ନାମ (_L):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:157
+msgid "_Select..."
+msgstr "ଚୟନ କରନ�ତ� (_S)..."
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "ଗୋଟି� ଇ-ଡାକ ଠିକଣାକ� ଟାଇପ କରନ�ତ� �ବଂ ଗୋଟି� ସମ�ପର�କକ� ନିମ�ନଲିଖିତ ତାଲିକା ନିକଟକ� ଟାଣି ଆଣନ�ତ� (_T):"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:769
 msgid "Contact List Members"
 msgstr "ସମ�ପର�କ ତାଲିକା ସଦସ�ଯ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:917
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1333
 msgid "_Members"
 msgstr "ସଦସ�ଯ (_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:210
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
-msgid "Book"
-msgstr "ପ�ସ�ତକ"
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
+msgid "Error adding list"
+msgstr "ତାଲିକା ଯୋଗ କରିବା ସମୟରେ ତ�ର�ଟି"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
+msgid "Error modifying list"
+msgstr "ତାଲିକା ପରିବର�ତ�ତିତ କରିବା ସମୟରେ ତ�ର�ଟି"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
-msgid "Is New List"
-msgstr "ନୂତନ ତାଲିକା ଅଟେ"
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1200
+msgid "Error removing list"
+msgstr "ତାଲିକା ଅପସାରଣ କରିବା ସମୟରେ ତ�ର�ଟି"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "ପରିବର�ତ�ତିତ ସମ�ପର�କ:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.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
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "ନକଲି ସମ�ପର�କ ମିଳିଲା"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
@@ -1749,15 +773,15 @@ msgstr ""
 "�ହି ସମ�ପର�କର ପରିବର�ତ�ତିନ ଇ-ଡାକ କିମ�ବା ନାମ ପୂର�ବର� �ହି ଫୋଲଡରରେ ରହିଛି।\n"
 "ଆପଣ ତଥାପି �ହାର� ଯୋଗ କରିବା ପାଇ� ଚାହା�ନ�ତି କି?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
 msgstr "ନୂତନ ସମ�ପର�କ:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid "Original Contact:"
 msgstr "ପ�ରାଥମିକ ସମ�ପର�କ:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -1765,183 +789,174 @@ msgstr ""
 "�ହି ସମ�ପର�କର ପରିବର�ତ�ତିତ ଇ-ଡାକ କିମ�ବା ନାମ ପୂର�ବର� �ହି ଫୋଲଡରରେ ରହିଛି।\n"
 "ଆପଣ ତଥାପି �ହାର� ଯୋଗ କରିବା ପାଇ� ଚାହା�ନ�ତି କି?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "ମିଶାନ�ତ� (_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 msgid "Merge Contact"
 msgstr "ସମ�ପର�କ ମିଶାନ�ତ�"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:584
-#: ../addressbook/gui/widgets/eab-contact-display.c:589
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:872
-#: ../plugins/groupwise-features/junk-settings.c:421 ../smime/lib/e-cert.c:810
-msgid "Email"
-msgstr "ଇ-ଡାକ"
-
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Any field contains"
 msgstr "ଯେ କୌଣସି କ�ଷେତ�ର �ହାକ� ଧାରଣ କରିଥା�"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "ଇ-ଡାକ �ହା ସହିତ ପ�ରାରମ�ଭ ହୋଇଥା�"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "ନାମ ଧାରଣ କରିଥା�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No contacts"
 msgstr "କୌଣସି ସମ�ପର�କ ନାହି�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:146
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d ସମ�ପର�କ"
 msgstr[1] "%d ସମ�ପର�କ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
-msgid "Query"
-msgstr "ପ�ରଶ�ନ"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:307
 msgid "Error getting book view"
 msgstr "ପ�ସ�ତକ ଦ�ର�ଶ�ଯ ପାଇବା ସମୟରେ ତ�ର�ଟି"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:508
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3352
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3553
-#: ../widgets/text/e-text.c:3554
-msgid "Model"
-msgstr "ମୋଡେଲ"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#, fuzzy
+#| msgid "Search Filter"
+msgid "Search Interrupted"
+msgstr "ଫିଲଟର ଖୋଜନ�ତ�"
 
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "କାର�ଡରେ ସଂଶୋଧନ କରିବା ସମୟରେ ତ�ର�ଟି"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:157
-msgid "Name begins with"
-msgstr "ନାମ �ହା ସହିତ ପ�ରାରମ�ଭ ହୋଇଥା�"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-msgid "Source"
-msgstr "ଉତ�ସ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
+#, fuzzy
+#| msgid "Cut selected text to the clipboard"
+msgid "Cut selected contacts to the clipboard"
+msgstr "କ�ଲିପବୋର�ଡରେ ବଚ�ଛିତ ପାଠ�ୟକ� କାଟନ�ତ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:567
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
-msgid "Type"
-msgstr "ପ�ରକାର"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
+#, fuzzy
+#| msgid "Copy selected text to the clipboard"
+msgid "Copy selected contacts to the clipboard"
+msgstr "କ�ଲିପବୋର�ଡରେ ବଚ�ଛିତ ପାଠ�ୟକ� ନକଲ କରନ�ତ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:811
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
-msgid "Save as vCard..."
-msgstr "vCard ଭାବରେ ସଂରକ�ଷଣ କରନ�ତ�..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
+#, fuzzy
+#| msgid "Paste tasks from the clipboard"
+msgid "Paste contacts from the clipboard"
+msgstr "କ�ଲିପବୋର�ଡର� କାର�ଯ�ୟ ଲଗାନ�ତ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-#: ../calendar/gui/e-calendar-table.c:1592
-#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:935
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "ଖୋଲନ�ତ� (_O)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
+msgid "Delete selected contacts"
+msgstr "ବିଲୋପ କର ଚୟିତ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-msgid "_New Contact..."
-msgstr "ନୂତନ ସମ�ପର�କ (_N) ..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
+#, fuzzy
+#| msgid "Select all contacts"
+msgid "Select all visible contacts"
+msgstr "ସମସ�ତ ସମ�ପର�କକ� ବାଛନ�ତ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-msgid "New Contact _List..."
-msgstr "ନୂତନ ସମ�ପର�କ ତାଲିକା (_L) ..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1286
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete these contact lists?"
+msgid "Are you sure you want to delete these contact lists?"
+msgstr ""
+"ଆପଣ ନିଶ�ଚିତ କି ଆପଣ �ହି\n"
+"ସମ�ପର�କ ତାଲିକା ଗ�ଡିକ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "_Save as vCard..."
-msgstr "vCard ଭାବରେ ସଂରକ�ଷଣ କରନ�ତ� (_S)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1290
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete these contact lists?"
+msgid "Are you sure you want to delete this contact list?"
+msgstr ""
+"ଆପଣ ନିଶ�ଚିତ କି ଆପଣ �ହି\n"
+"ସମ�ପର�କ ତାଲିକା ଗ�ଡିକ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "_Forward Contact"
-msgstr "ସମ�ପର�କ ଅଗ�ରସରିତ କରନ�ତ� (_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1294
+#, fuzzy, c-format
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete contact list (%s)?"
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr ""
+"ଆପଣ ନିଶ�ଚିତ କି ଆପଣ\n"
+"(%s) ସମ�ପର�କ ତାଲିକାକ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "_Forward Contacts"
-msgstr "ସମ�ପର�କ ମାନଙ�କ� ଅଗ�ରସରିତ କରନ�ତ� (_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete these contacts?"
+msgid "Are you sure you want to delete these contacts?"
+msgstr ""
+"ଆପଣ ନିଶ�ଚିତ କି ଆପଣ �ହି\n"
+"ସମ�ପର�କ ଗ�ଡିକ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send _Message to Contact"
-msgstr "ସମ�ପର�କକ� ସନ�ଦେଶ ପଠାନ�ତ� (_M)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete these contacts?"
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+"ଆପଣ ନିଶ�ଚିତ କି ଆପଣ �ହି\n"
+"ସମ�ପର�କ ଗ�ଡିକ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "Send _Message to List"
-msgstr "ଗୋଷ�ଠୀକ� ସନ�ଦେଶ ପଠାନ�ତ� (_M)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
+#, fuzzy, c-format
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete contact (%s)?"
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr ""
+"ଆପଣ ନିଶ�ଚିତ କି ଆପଣ\n"
+"(%s) ସମ�ପର�କକ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
-msgid "Send _Message to Contacts"
-msgstr "ସମ�ପର�କ ମାନଙ�କ� ସନ�ଦେଶ ପଠାନ�ତ� (_M)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1463
+#, fuzzy, 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?"
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"%d ସମ�ପର�କକ� ଖୋଲିବା ଦ�ୱାରା ନୂତନ ୱିଣ�ଡୋ %d ମଧ�ଯ ଖୋଲିହୋଇଥା�।\n"
+"ଆପଣ ପ�ରକୃତରେ �ହି ସମ�ପର�କକ� ଦର�ଶାଇବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-msgid "_Print"
-msgstr "ମୂଦ�ରଣ କରନ�ତ� (_P)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
-msgid "Cop_y to Address Book..."
-msgstr "ଠିକଣା ପ�ସ�ତିକାରେ ନକଲ କରନ�ତ� (_y) ..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
-msgid "Mo_ve to Address Book..."
-msgstr "ଠିକଣା ପ�ସ�ତିକାକ� ପଠାନ�ତ� (_v) ..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-msgid "Cu_t"
-msgstr "କାଟନ�ତ� (_t)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1818 ../calendar/gui/e-memo-table.c:943
-#: ../mail/em-folder-tree.c:972 ../mail/em-folder-view.c:1326
-#: ../mail/message-list.c:2105 ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "ନକଲ କରନ�ତ� (_C)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-msgid "P_aste"
-msgstr "ଲଗାନ�ତ� (_a)"
-
-#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
-msgid "Any Category"
-msgstr "ଯେ କୌଣସି ବିଭାଗ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
+msgid "_Don't Display"
+msgstr "ପ�ରଦର�ଶନ କରନ�ତ� ନାହି� (_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
-msgid "Unmatched"
-msgstr "ଅମେଳ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1469
+msgid "Display _All Contacts"
+msgstr "ସମସ�ତ ସମ�ପର�କଗ�ଡ଼ିକ� ଦର�ଶାନ�ତ�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "ସହକାରୀ"
 
@@ -1970,8 +985,7 @@ msgid "Car Phone"
 msgstr "କାର ଫୋନ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/dialogs/event-page.ui.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
@@ -1979,7 +993,7 @@ msgid "Categories"
 msgstr "ବିଭାଗ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "Company"
 msgstr "କମ�ପାନୀ "
 
@@ -2028,22 +1042,22 @@ msgid "Journal"
 msgstr "ପତ�ରିକା"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
 msgstr "ପରିଚାଳକ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Mobile Phone"
 msgstr "ମୋବାଇଲ ଫୋନ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "Nickname"
 msgstr "ଡାକ ନାମ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "ଟିପ�ପଣୀ"
 
@@ -2072,14 +1086,13 @@ msgid "Radio"
 msgstr "ରେଡିଓ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:579
+#: ../calendar/gui/e-meeting-list-view.c:578
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:710
 msgid "Role"
 msgstr "ଭୂମିକା"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 msgid "Spouse"
 msgstr "ଜୀବନସାଥୀ"
 
@@ -2107,63 +1120,9 @@ msgstr "�କକ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
-msgstr "ଓ�ବେବ ସାଇଟ"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/misc/e-reflow.c:1423 ../widgets/misc/e-reflow.c:1424
-#: ../widgets/table/e-table-click-to-add.c:522
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-container.c:997
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3731 ../widgets/text/e-text.c:3732
-msgid "Width"
-msgstr "ପ�ରସ�ଥ"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/misc/e-reflow.c:1431 ../widgets/misc/e-reflow.c:1432
-#: ../widgets/table/e-table-click-to-add.c:529
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-container.c:990
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3739 ../widgets/text/e-text.c:3740
-msgid "Height"
-msgstr "ଉଚ�ଚତା"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-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 "ପାଠ�ଯ ନମ�ନା"
+msgstr "ୱେବ ସାଇଟ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "ସର�ବାଧିକ କ�ଷେତ�ର ନାମ ଦୈର�ଘ�ଯ"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
-msgid "Column Width"
-msgstr "ସ�ତମ�ଭ ପ�ରସ�ଥ"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -2173,7 +1132,7 @@ msgstr ""
 "\n"
 "ସମ�ପର�କଗ�ଡ଼ିକ� ଖୋଜ�ଅଛି..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -2187,7 +1146,7 @@ msgstr ""
 "\n"
 "ଗୋଟି� ନୂତନ ସମ�ପର�କ ସ�ର�ଷ�ଟି କରିବା ପାଇ� �ଠାରେ ଦ�ଇଥର ଦବାନ�ତ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -2201,7 +1160,7 @@ msgstr ""
 "\n"
 "ଗୋଟି� ନୂତନ ସମ�ପର�କ ସ�ର�ଷ�ଟି କରିବା ପାଇ� �ଠାରେ ଦ�ଇଥର ଦବାନ�ତ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -2211,7 +1170,7 @@ msgstr ""
 "\n"
 "ସମ�ପର�କ ପାଇ� ଖୋଜନ�ତ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -2221,10 +1180,6 @@ msgstr ""
 "\n"
 "�ହି ଦ�ର�ଶ�ଯରେ ପ�ରଦର�ଶନ କରିବା ପାଇ� କୌଣସି ବସ�ତ� ନାହି�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
-msgid "Adapter"
-msgstr "�ଡେପ�ଟର"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "କାର�ଯ�ଯ ଇ-ଡାକ"
@@ -2234,242 +1189,286 @@ msgid "Home Email"
 msgstr "ମୂଳସ�ଥାନ ଇ-ଡାକ"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "ଅନ�ଯାନ�ଯ ଇ-ଡାକ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "ଚୟିତ"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "evolution ଠିକଣା ବହି"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "ଦର�ଶିକା ଅଛି"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "ନୂତନ ସମ�ପର�କ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
-msgid "_Open Link in Browser"
-msgstr "ବ�ରାଉଜରରେ ସଂଯୋଗକ� ଖୋଲନ�ତ� (_O)"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "ନୂତନ ସମ�ପର�କ ତାଲିକା"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2698
-msgid "_Copy Link Location"
-msgstr "ସଂଯୋଗ ଅବସ�ଥାନକ� ନକଲ କରନ�ତ� (_C)"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "ଉପସ�ଥିତ %s ଠିକଣା ପ�ସ�ତିକା ଫୋଲଡରରେ %d କାର�ଡ ଅଛି"
+msgstr[1] "ଉପସ�ଥିତ %s ଠିକଣା ପ�ସ�ତିକା ଫୋଲଡରରେ %d କାର�ଡ ଅଛି"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
-msgid "_Send New Message To..."
-msgstr "ପାଖକ� ନୂତନ ସଂଦେଶ ପଠାନ�ତ� (_S)..."
+#: ../addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "ଖୋଲନ�ତ�"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:153
+msgid "Contact List: "
+msgstr "ସମ�ପର�କ ତାଲିକା:"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:154
+msgid "Contact: "
+msgstr "ସମ�ପର�କ:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../addressbook/gui/widgets/ea-minicard.c:180
+msgid "evolution minicard"
+msgstr "evolution ମିନିକାର�ଡ"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
 msgstr "ଇ-ଡାକ ଠିକଣାକ� ନକଲ କରନ�ତ� (_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:381
+#, fuzzy
+#| msgid "Copy things to the clipboard."
+msgid "Copy the email address to the clipboard"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� କ�ଲିପବୋର�ଡରେ ନକଲ କରନ�ତ�"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:386
+msgid "_Send New Message To..."
+msgstr "ପାଖକ� ନୂତନ ସଂଦେଶ ପଠାନ�ତ� (_S)..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:388
+#, fuzzy
+#| msgid "Convert a mail message to a task."
+msgid "Send a mail message to this address"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶକ� ଗୋଟି� ନୂତନ ତାଲିକାରେ ରୂପାନ�ତର କରନ�ତ�"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:258
+#: ../addressbook/gui/widgets/eab-contact-display.c:260
 msgid "(map)"
 msgstr "(ନକ�ସା)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:278
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
 msgid "map"
 msgstr "ନକ�ସା"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:839
+#: ../addressbook/gui/widgets/eab-contact-display.c:415
+#: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
 msgstr "ସଦସ�ଯ ମାନଙ�କ� ସୂଚୀବଦ�ଧ କରନ�ତ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "ବିଭାଗ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "ବ�ର�ତ�ତି"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "ଅବସ�ଥାନ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Video Chat"
 msgstr "ଭିଡିଓ ଗପସପ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2523
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view.c:498
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "କ�ଯାଲେଣ�ଡର"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
 #: ../calendar/gui/dialogs/event-editor.c:116
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ମ�କ�ତ/ବ�ଯସ�ତ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Phone"
 msgstr "ଫୋନ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "ଫ�ଯାକ�ସ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
 msgid "Address"
 msgstr "ଠିକଣା"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Home Page"
 msgstr "ମୂଳସ�ଥାନ ପ�ର�ଷ�ଠା"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:644
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
-msgstr "ଓ�ବେବ ଲଗ"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2587
-msgid "Birthday"
-msgstr "ଜନ�ମଦିନ"
+msgstr "ୱେବ ଲଗ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
-#: ../calendar/gui/e-calendar-view.c:2588
-msgid "Anniversary"
-msgstr "ବାର�ଷିକୀ"
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:175
+#: ../modules/addressbook/e-book-shell-migrate.c:134
+#: ../modules/calendar/e-cal-shell-backend.c:171
+#: ../modules/calendar/e-cal-shell-migrate.c:151
+#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:158
+#: ../modules/calendar/e-task-shell-migrate.c:119
+#: ../plugins/email-custom-header/email-custom-header.c:320
+msgid "Personal"
+msgstr "ବ�ଯକ�ତିଗତ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:857
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "କାର�ଯ�ଯ ଶୀର�ଷକ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:893
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "ମୂଳସ�ଥାନ ପ�ର�ଷ�ଠା"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:901
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "ବ�ଲୋଗ"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
+#, c-format
+msgid "Click to mail %s"
+msgstr "ମେଲ କରିବା ପାଇ� କ�ଲିକ କରନ�ତ� %s"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Success"
 msgstr "ସଫଳତା"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Backend busy"
 msgstr "ପ�ର�ଷ�ଠଭାଗ ବ�ଯସ�ତ"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Repository offline"
 msgstr "ଭଣ�ଡାର ଅଫ-ଲାଇନ"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Address Book does not exist"
 msgstr "ଠିକଣା ପ�ସ�ତିକା ଅନ�ପଲବ�ଧ"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 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:66
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Permission denied"
 msgstr "ଅନ�ମତି ନିଷିଦ�ଧ"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact not found"
 msgstr "ସମ�ପର�କ ମିଳିଲା ନାହି�"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
 msgstr "ସମ�ପର�କ ପରିଚୟ ପୂର�ବର� ରହିଛି"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Protocol not supported"
 msgstr "ପ�ରୋଟୋକଲ ସମର�ଥିତ ନ�ହେ�"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2571
+#. To Translators: This is task status
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2666
 msgid "Canceled"
 msgstr "ବାତିଲ କରାଗଲା"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Could not cancel"
 msgstr "ବାତିଲ କରିପାରିଲା ନାହି�"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Failed"
 msgstr "ବୈଧିକରଣ ବିଫଳ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Authentication Required"
 msgstr "ବୈଧିକରଣ ଆବଶ�ଯକ"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "TLS not Available"
 msgstr "TLS ଅବସ�ଥିତ ନାହି�"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "No such source"
 msgstr "ସେପରି କୌଣସି ଉତ�ସ ନାହି�"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Not available in offline mode"
 msgstr "ଅଫ-ଲାଇନ ଧାରାରେ ଉପଲବ�ଧ ନାହି�"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Other error"
 msgstr "ଅନ�ଯାନ�ଯ ତ�ର�ଟି"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Invalid server version"
 msgstr "ଅବୈଧ ସେବକ ସଂସ�କରଣ"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Unsupported authentication method"
 msgstr "ଅସମର�ଥିତ ପ�ରାଧିକରଣ ପଦ�ଧତି"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -2479,7 +1478,7 @@ msgstr ""
 "କରାଯାଇନାହି� ଅଥବା �ପର�ଯ�ୟନ�ତ ଆହରଣ କରାଯାଇନାହି�। ଦୟାକରି �ହାର ବିଷୟବସ�ତ�ଗ�ଡ଼ିକ� ଆହରଣ କରିବା ପାଇ� "
 "ଠିକଣା ବହିକ� ଅନଲାଇନ ଧାରାରେ ଥରେ ଧାରଣ କରନ�ତ�।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -2488,7 +1487,7 @@ msgstr ""
 "�ହି ଠିକଣା ବହିକ� ଖୋଲାଯାଇପାରିବ ନାହି�। ଦୟାକରି ଯାଞ�ଚକରନ�ତ� ଯେ ପଥ %s ଅବସ�ଥିତ �ବଂ ସେହି ଅନ�ମତିଗ�ଡ଼ିକ� "
 "ଅଭିଗମ�ୟ କରିବା ପାଇ� ଅନ�ମତି ସେଟ କରାଯାଇଛି।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -2496,7 +1495,7 @@ msgstr ""
 "Evolutionର �ହି ସଂସ�କରଣରେ LDAP ସମର�ଥନ ନାହି�। LDAP କ� Evolution ରେ ବ�ୟବହାର କରିବା ପାଇ� "
 "LDAP-ସକ�ରିୟ Evolution ପ�ୟାକେଜକ� ନିଶ�ଚିତ ଭାବରେ ସ�ଥାପନ କରିବା ଉଚିତ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -2504,11 +1503,11 @@ msgstr ""
 "�ହି ଠିକଣା ବହିକ� ଖୋଲାଯାଇପାରିବ ନାହି�। �ହା ମାନେ ହେଉଛି ଗୋଟି� ଭ�ଲ URI ଭରଣ ହୋଇଛି, ଅଥବା ସର�ଭରଟି "
 "ଅପହଞ�ଚ ଅଟେ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
 msgstr "ବିସ�ତୃତ ତ�ର�ଟି ସନ�ଦେଶ:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2520,210 +1519,121 @@ msgstr ""
 "ଦୟାକରି ନିଶ�ଚିତ କରନ�ତ� ଯେ ଆପଣଙ�କର ସନ�ଧାନ ଯନ�ତ�ରଟି ଅତ�ୟଧିକ ନିର�ଦ�ଦିଷ�ଟ କିମ�ବା ଫଳାଫଳ ସୀମାକ�\n"
 "ଡ଼ିରେକ�ଟୋରୀ ସର�ଭର ପସନ�ଦରେ �ହି ଠିକଣା ପ�ସ�ତକ ପାଇ� ଦର�ଶାଇଥା�।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
 "preferences for this address book."
 msgstr ""
-"�ହି ପ�ରଶ�ନକ� ନିଷ�ପାଦନ କରିବା ସମୟ ସର�ଭର ସୀମାକ� ଅତିକ�ରମ କରିଛି କିମ�ବା ସୀମାଟି �ହି ଠିକଣା "
-"ବହିକ� ବିନ�ୟାସିତ ହୋଇଛି।  ଦୟାକରି ନିଶ�ଚିତ କରନ�ତ� ଯେ ଆପଣଙ�କର ସନ�ଧାନଟି\n"
+"�ହି ପ�ରଶ�ନକ� ନିଷ�ପାଦନ କରିବା ସମୟ ସର�ଭର ସୀମାକ� ଅତିକ�ରମ କରିଛି କିମ�ବା ସୀମାଟି �ହି ଠିକଣା ବହିକ� ବିନ�ୟାସିତ "
+"ହୋଇଛି।  ଦୟାକରି ନିଶ�ଚିତ କରନ�ତ� ଯେ ଆପଣଙ�କର ସନ�ଧାନଟି\n"
 "ଅଧିକ ବିଶିଷ�ଟ ଅଥବା ସମୟ ସୀମାକ� ଡିରେକ�ଟୋରୀ ସର�ଭରର\n"
 "ପସନ�ଦରେ ଠିକଣା ପ�ସ�ତକ ପାଇ� ବୃଦ�ଧିକରିଥା�।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book was unable to parse this query."
 msgstr "�ହି ଠିକଣା ପ�ସ�ତିକାର ପ�ର�ଷ�ଠଭାଗ �ହି ପ�ରଶ�ନକ� ବିଶ�ଳେଷଣ କରିବାରେ ଅସମର�ଥ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book refused to perform this query."
 msgstr "�ହି ଠିକଣା ପ�ସ�ତିକାର ପ�ର�ଷ�ଠଭାଗ �ହି ପ�ରଶ�ନକ� ସଂସାଧନ କରିବାର� ମନା କରିଦେଲା।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "ପ�ରଶ�ନଟି ସଫଳତାର ସହିତ ପଚରା ଗଲାନାହି�।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid "Error adding list"
-msgstr "ତାଲିକା ଯୋଗ କରିବା ସମୟରେ ତ�ର�ଟି"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
-msgid "Error adding contact"
-msgstr "ସମ�ପର�କ ଯୋଗ କରିବା ସମୟରେ ତ�ର�ଟି"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying list"
-msgstr "ତାଲିକା ପରିବର�ତ�ତିତ କରିବା ସମୟରେ ତ�ର�ଟି"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying contact"
-msgstr "ସମ�ପର�କ ପରିବର�ତ�ତିତ କରିବା ସମୟରେ ତ�ର�ଟି"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-msgid "Error removing list"
-msgstr "ତାଲିକା ଅପସାରଣ କରିବା ସମୟରେ ତ�ର�ଟି"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
-msgid "Error removing contact"
-msgstr "ସମ�ପର�କ ଅପସାରଣ କରିବା ସମୟରେ ତ�ର�ଟି"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-#, 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] ""
-"%d ସମ�ପର�କକ� ଖୋଲିବା ଦ�ୱାରା ନୂତନ ୱିଣ�ଡୋ %d ମଧ�ଯ ଖୋଲିହୋଇଥା�।\n"
-"ଆପଣ ପ�ରକୃତରେ �ହି ସମ�ପର�କକ� ଦର�ଶାଇବାକ� ଚାହ��ଛନ�ତି କି?"
-msgstr[1] ""
-"%d ସମ�ପର�କକ� ଖୋଲିବା ଦ�ୱାରା ନୂତନ ୱିଣ�ଡୋଗ�ଡ଼ିକ %d ମଧ�ଯ ଖୋଲିହୋଇଥା�।\n"
-"ଆପଣ ପ�ରକୃତରେ �ହି ସମ�ପର�କଗ�ଡ଼ିକ� ଦର�ଶାଇବାକ� ଚାହ��ଛନ�ତି କି?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
-msgid "_Don't Display"
-msgstr "ପ�ରଦର�ଶନ କରନ�ତ� ନାହି� (_D)"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
-msgid "Display _All Contacts"
-msgstr "ସମସ�ତ ସମ�ପର�କଗ�ଡ଼ିକ� ଦର�ଶାନ�ତ�"
-
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s ପୂର�ବର� ରହିଛି\n"
-"ଆପଣ �ହାକି ନବଲିଖନ କରିବା ପାଇ� ଚାହ��ଛନ�ତି କି?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
-msgid "Overwrite"
-msgstr "ନବଲିଖନ କରନ�ତ�"
-
-#. more than one, finding the total number of contacts might
-#. * hit performance while saving large number of contacts
-#.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
-msgid "contact"
-msgid_plural "contacts"
-msgstr[0] "ସମ�ପର�କ"
-msgstr[1] "ସମ�ପର�କ ମାନ"
-
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "ଠିକଣା ପ�ସ�ତିକାକ� ଚୟନ କରନ�ତ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "ତାଲିକା"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "�ଠାକ� ସମ�ପର�କକ� ଘ�ଞ�ଚାନ�ତ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "�ଠାରେ ସମ�ପର�କକ� ନକଲ କରନ�ତ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "�ଠାକ� ସମ�ପର�କ ମାନଙ�କ� ଘ�ଞ�ଚାନ�ତ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "�ଠାରେ ସମ�ପର�କ ମାନଙ�କ� ନକଲ କରନ�ତ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:903
-msgid "Multiple vCards"
-msgstr "�କାଧିକ vCards"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:910
-#, c-format
-msgid "vCard for %s"
-msgstr "%s ପାଇ� vCard"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:922
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
-#, c-format
-msgid "Contact information"
-msgstr "ସମ�ପର�କ ସୂଚନା"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:950
-#, c-format
-msgid "Contact information for %s"
-msgstr "%s ପାଇ� ସମ�ପର�କ ସୂଚନା"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:292
-msgid "Querying Address Book..."
-msgstr "ଠିକଣା ପ�ସ�ତିକାକ� ପ�ରଶ�ନ ପଚାର�ଛି ..."
-
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
 msgid "Card View"
 msgstr "କାର�ଡ ଦ�ର�ଶ�ଯ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
-#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ଆୟତ କର�ଅଛି ..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:858
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "ଆଉଟଲ�କ CSV କିମ�ବା ଟ�ଯାବ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:859
 msgid "Outlook CSV and Tab Importer"
 msgstr "ଆଉଟଲ�କ CSV �ବଂ ଟ�ଯାବ ଆୟତକ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:867
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "ମୋଜିଲା CSV କିମ�ବା ଟ�ଯାବ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:868
 msgid "Mozilla CSV and Tab Importer"
 msgstr "ମୋଜିଲା CSV �ବଂ ଟ�ଯାବ ଆୟତକ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:876
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV କିମ�ବା ଟ�ଯାବ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:877
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV �ବଂ ଟ�ଯାବ ଆୟତକ"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:689
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ତଥ�ଯ ବିନିମୟ ଶୈଳୀ (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:690
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF ଆୟତକ"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:556
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:557
 msgid "Evolution vCard Importer"
 msgstr "Evolution VCard ଆୟତକ"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:733
+#, fuzzy, c-format
+#| msgid "Page %d of %d"
+msgid "Page %d"
+msgstr "ପୃଷ�ଠା %d ର %d"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "ଫାଇଲ ଖୋଲି ପାରିବ ନାହି�"
@@ -2770,36 +1680,60 @@ msgstr "ଗୋଟି� ନିର�ଗମ ଫାଇଲରେ ତାଳହୀନ
 msgid "NUMBER"
 msgstr "ସଂଖ�ଯା"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:99
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "ପାଠ�ଯ ନିର�ଦ�ଦେଶ ସ�ବତନ�ତ�ରଚର ତ�ର�ଟି, ବ�ଯବହାର ବିଧିକ� ଦେଖିବା ପାଇ� ଦୟାକରି --help ବିକଲ�ପକ� ବ�ଯବହାର "
 "କରନ�ତ�।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:113
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "କେବଳ csv କିମ�ବା vcard ଶୈଳୀକ� ସହାୟତା ପ�ରଦାନ କରନ�ତ�।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "ତାଳହୀନ ଧାରାରେ, ନିର�ଗମ ଗୋଟି� ଫାଇଲ ହେବା ଉଚିତ।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:130
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "ସାଧାରଣ ଧାରାରେ, ସେଠାରେ ଆକାର ବିକଲ�ପର କୌଣସି ଆବଶ�ଯକତା ନାହି�।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "ଅନିୟନ�ତ�ରିତ ତ�ର�ଟି"
 
+#: ../addressbook/util/addressbook.c:103
+msgid "Accessing LDAP Server anonymously"
+msgstr "LDAP ସେବକକ� ଅଜ�ଞାତ ଭାବରେ ଅଭିଗମ କର�ଅଛି"
+
+#: ../addressbook/util/addressbook.c:210
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
+msgid "Failed to authenticate.\n"
+msgstr "ବୈଧିକ�ର�ତ କରିବାରେ ବିଫଳ।\n"
+
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "%s (%s ଚାଳକ) ପାଇ� ପ�ରବେଶ ସଙ�କେତ ଭରଣ କରନ�ତ�"
+
+#: ../addressbook/util/addressbook.c:225
+#: ../calendar/common/authentication.c:51
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
+#: ../plugins/publish-calendar/publish-calendar.c:328
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "ପ�ରବେଶ ସଙ�କେତ ଭରଣ କରନ�ତ�"
+
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}' ଟି କେବଳ ପଠନୀୟ ଅଟେ �ବଂ �ହାକ� ପରିବର�ତ�ତନ କରିହେବ ନାହି�। ଦୟାକରି ଭିନ�ନ�କ "
-"କ�ୟାଲେଣ�ଡରକ� କ�ୟାଲେଣ�ଡର ଦୃଶ�ୟର ପାର�ଶ�ୱପଟିର� ବାଛନ�ତ�।"
+"'{0}' ଟି କେବଳ ପଠନୀୟ ଅଟେ �ବଂ �ହାକ� ପରିବର�ତ�ତନ କରିହେବ ନାହି�। ଦୟାକରି ଭିନ�ନ�କ କ�ୟାଲେଣ�ଡରକ� "
+"କ�ୟାଲେଣ�ଡର ଦୃଶ�ୟର ପାର�ଶ�ୱପଟିର� ବାଛନ�ତ�।"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
@@ -2807,24 +1741,32 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
-"'{0}' ଟି କେବଳ ପଠନୀୟ ଅଟେ �ବଂ �ହାକ� ପରିବର�ତ�ତନ କରିହେବ ନାହି�। ଦୟାକରି ଭିନ�ନ�କ "
-"କ�ୟାଲେଣ�ଡରକ� ବାଛନ�ତ� ଯାହାକି ସାକ�ଷାତକାରଗ�ଡ଼ିକ� ଗ�ରହଣ କରିଥା�।"
+"'{0}' ଟି କେବଳ ପଠନୀୟ ଅଟେ �ବଂ �ହାକ� ପରିବର�ତ�ତନ କରିହେବ ନାହି�। ଦୟାକରି ଭିନ�ନ�କ କ�ୟାଲେଣ�ଡରକ� "
+"ବାଛନ�ତ� ଯାହାକି ସାକ�ଷାତକାରଗ�ଡ଼ିକ� ଗ�ରହଣ କରିଥା�।"
 
 #: ../calendar/calendar.error.xml.h:5
+#, fuzzy
+#| msgid ""
+#| "Adding a meaningful summary to your appointment will give your recipients "
+#| "an idea of what your appointment is about."
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 msgstr ""
-"ଆପଣଙ�କର ସାକ�ଷାତକାରରେ ଗୋଟି� ମୂଲ�ୟବାନ ସାରାଂଶ ଯୋଗ କରିବା ଦ�ୱାରା ଗ�ରହଣ "
-"କର�ତ�ତାମାନଙ�କ� ସାକ�ଷାତକାର ବିଷୟରେ ଗୋଟି� ବିଚାର ପ�ରଦାନ କରିଥା�।"
+"ଆପଣଙ�କର ସାକ�ଷାତକାରରେ ଗୋଟି� ମୂଲ�ୟବାନ ସାରାଂଶ ଯୋଗ କରିବା ଦ�ୱାରା ଗ�ରହଣ କର�ତ�ତାମାନଙ�କ� "
+"ସାକ�ଷାତକାର ବିଷୟରେ ଗୋଟି� ବିଚାର ପ�ରଦାନ କରିଥା�।"
 
 #: ../calendar/calendar.error.xml.h:6
+#, fuzzy
+#| msgid ""
+#| "Adding a meaningful summary to your task will give your recipients an "
+#| "idea of what your task is about."
 msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr ""
-"ଆପଣଙ�କର କାର�ଯ�ୟରେ ଗୋଟି� ମୂଲ�ୟବାନ ସାରାଂଶ ଯୋଗ କରିବା ଦ�ୱାରା ଗ�ରହଣ "
-"କର�ତ�ତାମାନଙ�କ� ସାକ�ଷାତକାର ବିଷୟରେ ଗୋଟି� ବିଚାର ପ�ରଦାନ କରିଥା�।"
+"ଆପଣଙ�କର କାର�ଯ�ୟରେ ଗୋଟି� ମୂଲ�ୟବାନ ସାରାଂଶ ଯୋଗ କରିବା ଦ�ୱାରା ଗ�ରହଣ କର�ତ�ତାମାନଙ�କ� ସାକ�ଷାତକାର "
+"ବିଷୟରେ ଗୋଟି� ବିଚାର ପ�ରଦାନ କରିଥା�।"
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -2869,58 +1811,64 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "'{0}' ନାମକ ନିଯ�କ�ତିକ� ଅପସାରଣ କରିବେ ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
 
 #: ../calendar/calendar.error.xml.h:17
+#, fuzzy
+#| msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "'{0}' ନାମକ ନିଯ�କ�ତିକ� ଅପସାରଣ କରିବେ ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
+
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "ଆପଣ ନିଶ�ଚିତ କି ଆପଣ �ହି memo '{0}' କ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "�ହି {0} ନିଯ�କ�ତିଗ�ଡ଼ିକ� ଅପସାରଣ କରିବେ ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "ଆପଣ ନିଶ�ଚିତ କି ଆପଣ �ହି memo '{0}'କ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "�ହି {0} କାର�ଯ�ୟସୂଚୀକ� ଅପସାରଣ କରିବେ ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this appointment?"
 msgstr "�ହି ନିଯ�କ�ତିଗ�ଡ଼ିକ� ଅପସାରଣ କରିବେ ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "�ହି ସାକ�ଷାତକାରକ� ଅପସାରଣ କରିବାକ� ଚାହ��ଛନ�ତି ବୋଲି ଆପଣ ନିଶ�ଚିତକି?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:188
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "ଆପଣ ନିଶ�ଚିତ କି ଆପଣ �ହି memo କ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "�ହି କାର�ଯ�ୟଟିକ� ଅପସାରଣ କରିବାକ� ଚାହ��ଛନ�ତି ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
 
-#: ../calendar/calendar.error.xml.h:25
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "ଆପଣ ନିଶ�ଚିତ କି ଆପଣ �ହି memo ଡିକ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
-
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to send the appointment without a summary?"
+#, fuzzy
+#| msgid "Are you sure you want to send the appointment without a summary?"
+msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "�ହି ନିଯ�କ�ତିଗ�ଡ଼ିକ� ବିନା ସାରାଂଶରେ ପଠାଇବେ ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "�ହି କାର�ଯ�ୟସୂଚୀକ� ବିନା ସାରାଂଶରେ ପଠାଇବେ ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "ଆପଣ ନିଶ�ଚିତ କି ଆପଣ �ହି memo ଡିକ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Calendar repository is offline."
-msgstr "କ�ୟାଲେଣ�ଡର ସଂଗ�ରହାଳୟ ଅଫ-ଲାଇନ ଅଛି।"
+#, fuzzy
+#| msgid "Are you sure you want to send the task without a summary?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "�ହି କାର�ଯ�ୟସୂଚୀକ� ବିନା ସାରାଂଶରେ ପଠାଇବେ ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
 
 #: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
@@ -2984,354 +1932,246 @@ msgstr "memo ତାଲିକା ଧାରଣ କରିବାରେ ତà­�ରà­�à
 msgid "Error loading task list"
 msgstr "କାର�ଯ�ୟତାଲିକା ଧାରଣ କରିବାରେ ତ�ର�ଟି"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:44
-msgid "Error on '{0}'"
-msgstr "'{0}'ରେ ତ�ର�ଟି"
-
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
-"ଯଦି ଆପଣ ଗୋଟି� ବାତିଲ ବିଜ�ଞପ�ତି ନପଠାନ�ତି, ତେବେ ଅନ�ୟ ଅଂଶଗ�ରହଣକାରୀମାନେ ସଭା "
-"ବାତିଲ ହୋଇଛି ବୋଲି ଜାଣିପାରିବେ ନାହି�।"
+"ଯଦି ଆପଣ ଗୋଟି� ବାତିଲ ବିଜ�ଞପ�ତି ନପଠାନ�ତି, ତେବେ ଅନ�ୟ ଅଂଶଗ�ରହଣକାରୀମାନେ ସଭା ବାତିଲ ହୋଇଛି ବୋଲି "
+"ଜାଣିପାରିବେ ନାହି�।"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr ""
-"ଯଦି ଆପଣ ଗୋଟି� ବାତିଲ ବିଜ�ଞପ�ତି ନପଠାନ�ତି, ତେବେ ଅନ�ୟ ଅଂଶଗ�ରହଣକାରୀମାନେ ମେମୋଟି"
-"ଅପସାରଣ ହୋଇଛି ବୋଲି ଜାଣିପାରିବେ ନାହି�।"
+"ଯଦି ଆପଣ ଗୋଟି� ବାତିଲ ବିଜ�ଞପ�ତି ନପଠାନ�ତି, ତେବେ ଅନ�ୟ ଅଂଶଗ�ରହଣକାରୀମାନେ ମେମୋଟିଅପସାରଣ ହୋଇଛି ବୋଲି "
+"ଜାଣିପାରିବେ ନାହି�।"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:45
 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:48
-msgid "No response from the server."
-msgstr "ସର�ଭରର� କୌଣସି ଉତ�ତର ନାହି�।"
-
-#: ../calendar/calendar.error.xml.h:49
-msgid "Save Appointment"
-msgstr "ନିଯ�କ�ତି ସଂରକ�ଷଣ କରନ�ତ�"
-
-#: ../calendar/calendar.error.xml.h:50
-msgid "Save Memo"
-msgstr "Memo ସଂରକ�ଷଣ କରନ�ତ�"
+"ଯଦି ଆପଣ ଗୋଟି� ବାତିଲ ବିଜ�ଞପ�ତି ନପଠାନ�ତି, ତେବେ ଅନ�ୟ ଅଂଶଗ�ରହଣକାରୀମାନେ କାର�ଯ�ୟଟିକ�ଅପସାରଣ "
+"କରାଯାଇଛି ବୋଲି ଜାଣିପାରିବେ ନାହି�।"
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "Save Task"
-msgstr "କାର�ଯ�ୟ ସଂରକ�ଷଣ କରନ�ତ�"
-
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
-msgstr ""
-"ଅଦ�ୟତିତ ସୂଚନା ପଠାଇବା ଦ�ୱାରା ଅନ�ୟ ଅଂଶଗ�ରହଣକାରୀ ମାନେ ସେମାନଙ�କର "
-"କ�ୟାଲେଣ�ଡରକ� ଅଦ�ୟତିତ ରଖନ�ତି।"
+msgstr "ଅଦ�ୟତିତ ସୂଚନା ପଠାଇବା ଦ�ୱାରା ଅନ�ୟ ଅଂଶଗ�ରହଣକାରୀ ମାନେ ସେମାନଙ�କର କ�ୟାଲେଣ�ଡରକ� ଅଦ�ୟତିତ ରଖନ�ତି।"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
-msgstr ""
-"ଅଦ�ୟତିତ ସୂଚନା ପଠାଇବା ଦ�ୱାରା ଅନ�ୟ ଅଂଶଗ�ରହଣକାରୀ ମାନେ ସେମାନଙ�କର "
-"କାର�ଯ�ୟକ� ଅଦ�ୟତିତ ରଖନ�ତି।"
+msgstr "ଅଦ�ୟତିତ ସୂଚନା ପଠାଇବା ଦ�ୱାରା ଅନ�ୟ ଅଂଶଗ�ରହଣକାରୀ ମାନେ ସେମାନଙ�କର କାର�ଯ�ୟକ� ଅଦ�ୟତିତ ରଖନ�ତି।"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
-"କିଛି ସଂଲଗ�ନକ ଗ�ଡ଼ିକ� ଆହରଣ କରାଯାଇଛି। ସାକ�ଷାତକାରମାନଙ�କ� ସଂରକ�ଷଣ କରିବା "
-"ଦ�ୱାରା �ହି ସଂଲଗ�ନକରେ ଫଳାଫଳ ନଷ�ଟକ� ଦର�ଶାଇଥା�।"
+"କିଛି ସଂଲଗ�ନକ ଗ�ଡ଼ିକ� ଆହରଣ କରାଯାଇଛି। ସାକ�ଷାତକାରମାନଙ�କ� ସଂରକ�ଷଣ କରିବା ଦ�ୱାରା �ହି ସଂଲଗ�ନକରେ "
+"ଫଳାଫଳ ନଷ�ଟକ� ଦର�ଶାଇଥା�।"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
-msgstr ""
-"କିଛି ସଂଲଗ�ନକଗ�ଡ଼ିକ� ଆହରଣ କରାଯାଇଛି। କାର�ଯ�ୟକ� ସଂରକ�ଷଣ କରିବା ଦ�ୱାରା "
-"�ହି ସଂଲଗ�ନକଗ�ଡ଼ିକ ନଷ�ଟ ହୋଇଥା�।"
+msgstr "କିଛି ସଂଲଗ�ନକଗ�ଡ଼ିକ� ଆହରଣ କରାଯାଇଛି। କାର�ଯ�ୟକ� ସଂରକ�ଷଣ କରିବା ଦ�ୱାରା �ହି ସଂଲଗ�ନକଗ�ଡ଼ିକ ନଷ�ଟ ହୋଇଥା�।"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr "ଆପଣଙ�କର ପ�ରଚଳିତ ସର�ଭର ସହିତ କିଛି ବିଶେଷଗ�ଣ ସଠିକ ଭାବରେ କାର�ଯ�ୟ କରିନପାରେ।"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution କ�ୟାଲେଣ�ଡର ଅପ�ରତ�ୟାଶିତ ଭାବରେ ବିଦାୟ ନେଇଛି।"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution ଠିକଣା ପ�ସ�ତିକାଟି ଅପ�ରତ�ଯାଶିତ ଭାବରେ ବନ�ଦ ହୋଇଗଲା।"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution memo ଅପ�ରତ�ଯାଶିତ ଭାବରେ ବନ�ଦହୋଇଛି।"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution କାର�ଯ�ୟଗ�ଡ଼ିକ ଅପ�ରତ�ଯାଶିତ ଭାବରେ ବନ�ଦ ହୋଇଛି।"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:55
 msgid "The calendar is not marked for offline usage."
 msgstr "ଅଫଲାଇନ ବ�ୟବହାର ପାଇ� କ�ୟାଲେଣ�ଡରଟିକ� ଚିହ�ନଟ କରାଯାଇନାହି�।"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:56
 msgid "The memo list is not marked for offline usage."
 msgstr "ଅଫଲାଇନ ବ�ୟବହାର ପାଇ� memo ତାଲିକାଟି ଚିହ�ନଟ ହୋଇନାହି�।"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "ଅଫଲାଇନ ବ�ୟବହାର ପାଇ� କାର�ଯ�ୟତାଲିକାଟି ଚିହ�ନଟ ହୋଇନାହି�।"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "କ�ୟାଲେଣ�ଡରଟି ସବ�ଦିନ ପାଇ� କଢାଯାଇଛି।"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "memo ତାଲିକାକ� ସଦା ସର�ବଦା ପାଇ� କଢ଼ାଯାଇଛି।"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "�ହି କାର�ଯ�ୟତାଲିକାକ� ସଦା ସର�ବଦା ପାଇ� କଢ଼ାଯାଇଛି।"
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "Unable to load the calendar"
-msgstr "କ�ଯାଲେଣ�ଡର ଧାରଣ କରିବାରେ ଅସମର�ଥ"
-
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "�ହି ସାକ�ଷାତକାର ପାଇ� ଆପଣ ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ସଂରକ�ଷଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:62
+#, fuzzy
+#| msgid "Would you like to save your changes to this memo?"
+msgid "Would you like to save your changes to this meeting?"
+msgstr "�ହି memo ପାଇ� ଆପଣ ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ସଂରକ�ଷଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
+
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "�ହି memo ପାଇ� ଆପଣ ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ସଂରକ�ଷଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "�ହି କାର�ଯ�ୟ ପାଇ� ଆପଣ ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ସଂରକ�ଷଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "�ହି ସ�ମାରକପତ�ର ପାଇ� ଆପଣ ଗୋଟି� ବାତିଲ ବିଜ�ଞପ�ତି ପଠାଇବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "ସମସ�ତ ଅଂଶଗ�ରହଣକାରୀଙ�କ� ଆପଣ ବାତିଲ ବିଜ�ଞପ�ତି ପଠାଇବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "ଅଂଶଗ�ରହଣକାରୀଙ�କ� ଆପଣ ସାକ�ଷାତକାର ଆମନ�ତ�ରଣ ପତ�ର ପଠାଇବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "ଅଂଶଗ�ରହଣକାରୀଙ�କ� ଆପଣ �ହି କାର�ଯ�ୟସୂଚୀ ପଠାଇବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "ଅଂଶଗ�ରହଣକାରୀଙ�କ� ଆପଣ ଅଦ�ୟତିତ ସାକ�ଷାତକାର ସୂଚନା ପଠାଇବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
 msgstr "ଅଂଶଗ�ରହଣକାରୀଙ�କ� ଆପଣ ଅଦ�ୟତିତ କାର�ଯ�ୟସୂଚୀ ସୂଚନା ପଠାଇବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:71
 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 ""
 "ଆପଣ ଗୋଟି� ଅସମର�ଥିତ ଶ�ରେଣୀ ଅନ�ଯାୟୀ ସର�ଭର ସହିତ ସଂଯ�କ�ତ ହେଉଛନ�ତି �ବଂ Evolution ବ�ୟବହାର କରି "
-"ସମସ�ୟାର ସମ�ମ�ଖିନ ହୋଇପାରନ�ତି। ଉତ�ତମ ଫଳାଫଳ ପାଇ� ସର�ଭରକ� ସମର�ଥିତ ସଂସ�କରଣକ� "
-"ଉନ�ନୟନ କରାଯିବା ଉଚିତ।"
+"ସମସ�ୟାର ସମ�ମ�ଖିନ ହୋଇପାରନ�ତି। ଉତ�ତମ ଫଳାଫଳ ପାଇ� ସର�ଭରକ� ସମର�ଥିତ ସଂସ�କରଣକ� ଉନ�ନୟନ କରାଯିବା ଉଚିତ।"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:72
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "ଆପଣ �ହି ସାକ�ଷାତକାରକ� ପରିବର�ତ�ତନ କରିଛନ�ତି, କିନ�ତ� �ପର�ଯ�ୟନ�ତ ସଂରକ�ଷିତ ହୋଇନାହି�।"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:73
+#, fuzzy
+#| msgid "You have changed this task, but not yet saved it."
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "ଆପଣ �ହି କାର�ଯ�ୟକ� ପରିବର�ତ�ତନ କରିଛନ�ତି, କିନ�ତ� �ପର�ଯ�ୟନ�ତ ସଂରକ�ଷଣ କରିନାହାନ�ତି।"
+
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "ଆପଣ �ହି କାର�ଯ�ୟକ� ପରିବର�ତ�ତନ କରିଛନ�ତି, କିନ�ତ� �ପର�ଯ�ୟନ�ତ ସଂରକ�ଷଣ କରିନାହାନ�ତି।"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "ଆପଣ �ହି memo ପାଇ� ପରିବର�ତ�ତନ କରିଛନ�ତି, କିନ�ତ� �ପର�ଯ�ୟନ�ତ ସେମାନଙ�କ� ସଂରକ�ଷଣ କରିନାହାନ�ତି।"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Evolution ପ�ନର�ଚାଳନ ନହେବା ପର�ଯ�ୟନ�ତଆପଣଙ�କର କ�ୟାଲେଣ�ଡର ଉପଲବ�ଧ ହେବ ନାହି�।"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Evolution ପ�ନଃଚାଳନ ନହେବା ପର�ଯ�ୟନ�ତ ଆପଣଙ�କର memo ଉପଲବ�ଧ ହେବ ନାହ�।"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Evolution ପ�ନଃଚାଳନ ନହେବା ପର�ଯ�ୟନ�ତ ଆପଣଙ�କର କାର�ଯ�ୟ ଉପଲବ�ଧ ହେବ ନାହ�।"
 
-#: ../calendar/calendar.error.xml.h:85
-#: ../composer/mail-composer.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:79
+#: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ପ�ରତ�ୟାଖାନ କରନ�ତ� (_D)"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "ସଂରକ�ଷଣ କରନ�ତ� (_S)"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "ପରିବର�ତ�ତନ କ� ସଂରକ�ଷଣ କର (_S)"
 
-#: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "ପଠାନ�ତ� (_S)"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "ବିଜ�ଞପ�ତି ପଠାନ�ତ� (_S)"
 
-#: ../calendar/calendar.error.xml.h:90
-msgid "{0}."
-msgstr "{0}।"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:249
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "�କାଧିକ ଦିନ ଘଟଣାଗ�ଡିକ� ପୃଥକ କରନ�ତ�:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1515
-#: ../calendar/conduits/calendar/calendar-conduit.c:1516
-#: ../calendar/conduits/memo/memo-conduit.c:810
-#: ../calendar/conduits/memo/memo-conduit.c:811
-#: ../calendar/conduits/todo/todo-conduit.c:1009
-#: ../calendar/conduits/todo/todo-conduit.c:1010
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1533
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/memo/memo-conduit.c:822
+#: ../calendar/conduits/todo/todo-conduit.c:1022
+#: ../calendar/conduits/todo/todo-conduit.c:1023
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server କ� ଆରମ�ଭ କରିପାରିଲା ନାହି�"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1623
-#: ../calendar/conduits/calendar/calendar-conduit.c:1626
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
 msgstr "pilotର କ�ୟାଲେଣ�ଡର ପ�ରୟୋଗ ବ�ଲକକ� ପଢ଼ିପାରିଲା ନାହି�"
 
-#: ../calendar/conduits/memo/memo-conduit.c:904
-#: ../calendar/conduits/memo/memo-conduit.c:907
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "pilotର ସ�ମାରକପତ�ର ପ�ରୟୋଗ ବ�ଲକକ� ପଢ଼ିପାରିଲା ନାହି�"
 
-#: ../calendar/conduits/memo/memo-conduit.c:951
-#: ../calendar/conduits/memo/memo-conduit.c:954
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "pilotର ସ�ମାରକପତ�ର ପ�ରୟୋଗ ବ�ଲକକ� ଲେଖିପାରିଲା ନାହି�"
 
-#: ../calendar/conduits/todo/todo-conduit.c:229
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
 msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ ପ�ରାଥମିକତା:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1093
-#: ../calendar/conduits/todo/todo-conduit.c:1096
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
 msgid "Could not read pilot's ToDo application block"
 msgstr "pilotର କାର�ଯ�ୟସୂଚୀ ପ�ରୟୋଗ ବ�ଲକକ� ପଢ଼ିପାରିଲା ନାହି�"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1138
-#: ../calendar/conduits/todo/todo-conduit.c:1141
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
 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:2536
-msgid "Calendar and Tasks"
-msgstr "କ�ୟାଲେଣ�ଡର �ବଂ କାର�ଯ�ୟଗ�ଡ଼ିକ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:820
-#: ../calendar/gui/calendar-component.c:1242
-msgid "Calendars"
-msgstr "କ�ୟାଲେଣ�ଡର"
-
-#: ../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 "Evolution କ�ୟାଲେଣ�ଡର �ବଂ କାର�ଯ�ୟ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution କ�ୟାଲେଣ�ଡର ବିନ�ୟାସ ନିୟନ�ତ�ରଣ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution କ�ୟାଲେଣ�ଡର Calendar ନିର�ଘଣ�ଟ ସନ�ଦେଶ ପ�ରଦର�ଶକ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution କ�ୟାଲେଣ�ଡର/କାର�ଯ�ୟ ସମ�ପାଦକ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Evolutionର କ�ୟାଲେଣ�ଡର ଉପାଦାନ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Evolutionର Memos ଉପାଦାନ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "Evolutionର କାର�ଯ�ୟ ଉପାଦାନ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "Memos (_s)"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:291 ../calendar/gui/e-memos.c:1132
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:566
-#: ../calendar/gui/memos-component.c:884 ../calendar/gui/memos-control.c:389
-#: ../calendar/gui/memos-control.c:405
-msgid "Memos"
-msgstr "Memos"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:723 ../calendar/gui/e-tasks.c:1436
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1991
-#: ../calendar/gui/tasks-component.c:558 ../calendar/gui/tasks-component.c:880
-#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:751
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:590
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "କାର�ଯ�ଯ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "କ�ଯାଲେଣ�ଡର (_C)"
-
-#. Tasks
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "କାର�ଯ�ଯ (_T)"
-
-#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution କ�ଯାଲେଣ�ଡର ସତର�କ ଧ�ବନୀ ସେବା"
-
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
@@ -3339,95 +2179,108 @@ msgstr[0] "ମିନିଟ"
 msgstr[1] "ମିନିଟ"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:22
-#: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:654
-#: ../plugins/google-account-setup/google-contacts-source.c:331
-msgid "hours"
+#, fuzzy
+#| msgid "hours"
+#| msgid_plural "hours"
+msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ଘଣ�ଟା"
 msgstr[1] "ଘଣ�ଟା"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:295
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "ପ�ରାରମ�ଭିକ ସମୟ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "ନିୟ�କ�ତି"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
 msgstr "ସମସ�ତଙ�କ� ଅସ�ୱୀକାର କରନ�ତ� (_A)"
 
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
-#: ../calendar/gui/e-itip-control.c:1165
-#: ../plugins/itip-formatter/itip-view.c:1024
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "ଅବସ�ଥାନ:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
 msgid "Snooze _time:"
 msgstr "ସ�ବଲ�ପ ସମୟ ବିରତି ଅବଧି (_t):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
 msgid "_Dismiss"
 msgstr "ଅସ�ୱୀକାର କରନ�ତ� (_D)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1029
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:168
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
-#: ../widgets/menus/gal-define-views.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:151
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1625
+#: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ସମ�ପାଦନ କରନ�ତ� (_E)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "ସ�ବଲ�ପ ସମୟ ବିରତି (_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:335
+#, fuzzy
+#| msgid "hours"
+#| msgid_plural "hours"
+msgid "hours"
+msgstr "ଘଣ�ଟା"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "ନିଯ�କ�ତିର ଅବସ�ଥାନ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1587
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:334
+msgid "minutes"
+msgstr "ମିନିଟ"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
 msgid "No summary available."
 msgstr "କୌଣସି ସାରାଂଶ ଉପଲବ�ଧ ନାହି�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1471
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
 msgid "No description available."
 msgstr "କୌଣସି ବର�ଣ�ଣନା ଉପଲବ�ଧ ନାହି�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
 msgid "No location information available."
 msgstr "କୌଣସି ଅବସ�ଥାନ ସୂଚନା ଉପଲବ�ଧ ନାହି�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
 #, c-format
 msgid "You have %d alarms"
 msgstr "ଆପଣଙ�କ ନିକଟରେ %d ସତର�କ ଅଛି"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "ଚେତାବନୀ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3439,7 +2292,7 @@ msgstr ""
 "ଇମେଲ ପଠାଇବା ପାଇ� ବିନ�ୟାସ କରାଯାଇଛି।  Evolution\n"
 "�ହା ପରିବର�ତ�ତେ ଗୋଟି� ସାଧାରଣ ସ�ମରଣକାରୀ ସଂଳାପ ବାକ�ସକ� ଦର�ଶାଇଥା�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3456,20 +2309,10 @@ msgstr ""
 "\n"
 "ଆପଣ ନିଶ�ଚିତକି ଆପଣ �ହି ପ�ରଗ�ରାମକ� ଚଲାଇବାକ� ଚାହ��ଛନ�ତି?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1736
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "�ହି ପ�ରୋଗ�ରାମ ବିଷୟରେ ମୋତେ ପ�ନର�ବାର ପଚାରନ�ତ� ନାହି�।"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:141
-msgid "Could not initialize Bonobo"
-msgstr "ବୋନୋବୋକ� ପ�ରାରମ�ଭିକ�ର�ତ କରିପାରିଲା ନାହି�"
-
-#: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
-msgstr "ସତର�କ ଧ�ବନୀ ସେବା କାରଖାନାକ� ସ�ର�ଷ�ଟି କରିପାରିଲା ନାହି�, ହ��ତ �ହା ପୂର�ବର� ଚାଲ�ଅଛି..."
-
 #: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "ଅବୈଧ ସମୟ"
@@ -3508,7 +2351,7 @@ msgid "Alarm programs"
 msgstr "ସତର�କ ପ�ରୋଗ�ରାମ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "ସ�ଥିତିପଟିରେ ତ�ର�ଟି ଦର�ଶାଇବା ପାଇ� ଲାଗ�ଥିବା ସମୟ ସେକଣ�ଡରେ।"
 
@@ -3529,25 +2372,25 @@ msgid "Calendars to run alarms for"
 msgstr "ସତର�କ ସୂଚନାକ� ଚାଲ�କରିବା ପାଇ� କ�ୟାଲେଣ�ଡର"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "Evolution ରେ ତନ�ତ�ର ସମୟ ମଣ�ଡଳକ� ବ�ୟବହାର କରିବା ପାଇ� ଯାଞ�ଚ କରନ�ତ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "ସମୟ ପଟିରେ Marcus Bains Line ଆଙ�କିବା ପାଇ� ରଙ�ଗ (ପୂର�ବନିର�ଦ�ଧାରିତ ପାଇ� ଖାଲି)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "ଦିନ ଦୃଶ�ୟରେ Marcus Bains Line ଆଙ�କିବା ପାଇ� ରଙ�ଗ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "ମାସ ଦୃଶ�ୟରେ ସପ�ତାହାନ�ତକ� ଚାପିରଖନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "expungeକ� ନିଶ�ଚିତ କରନ�ତ�"
 
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr "ନୂତନ ଘଟଣା ପାଇ� ପୂର�ବନିର�ଦ�ଧାରିତ ଗଣନା। -1 ମାନେ ସବ�ଦିନପାଇ�।"
+
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "ଯେଉ� ଦିନ କାର�ଯ�ୟର ଆରମ�ଭ �ବଂ ସମାପ�ତିକ� ଦର�ଶାଯାଇଥା�।"
@@ -3557,143 +2400,173 @@ msgid "Default appointment reminder"
 msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ ସାକ�ଷାତକାର ଅନ�ସ�ମାରକ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#, fuzzy
+#| msgid "Default reminder units"
+msgid "Default recurrence count"
+msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ ପ�ନରାବୃତ�ତି ଗଣନା"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ ଅନ�ସ�ମାରକ �କକ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ ଅନ�ସ�ମାରକ ମୂଲ�ୟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "ସତର�କ ସୂଚନା ଅଡିଓ ଫାଇଲଗ�ଡ଼ିକ� ସଂରକ�ଷଣ କରିବା ପାଇ� ଡିରେକ�ଟୋରୀ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "ଘଟଣା ଅନ�ପାତ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "ଘଟଣା ସ�ୱଚ�ଛତା"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "ମ�କ�ତ/ବ�ୟସ�ତ ସର�ଭର URLs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "ମ�କ�ତ/ବ�ୟସ�ତ ନମ�ନା URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "କାଲେଣ�ଡର.ଦୃଶ�ୟରେ ଘଟଣାଗ�ଡ଼ିକର ଅନ�ପାତ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "ସମ�ପୂର�ଣ�ଣ କାର�ଯ�ୟକ� ଲ�ଚାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "କାର�ଯ�ୟ �କକଗ�ଡ଼ିକ� ଲ�ଚାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "କାର�ଯ�ୟ ମୂଲ�ୟକ� ଲ�ଚାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "ସମାନ�ତରାଳ ପ�ୟାନ ଅବସ�ଥାନ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "କାର�ଯ�ୟଦିବସର ସମୟ (ଘଣ�ଟାରେ) ସମାପ�ତ ହୋଇଥା�, ଚବିଶ ଘଣ�ଟା ଶୈଳୀରେ, 0 ର� 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "କାର�ଯ�ୟଦିବସର ସମୟ (ଘଣ�ଟାରେ) ଆରମ�ଭ ହୋଇଥା�, ଚବିଶ ଘଣ�ଟା ଶୈଳୀରେ, 0 ର� 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "ଦିନ �ବଂ କାର�ଯ�ୟ ସପ�ତାହ ଦୃଶ�ୟଗ�ଡ଼ିକରେ ଦର�ଶାଯାଇଥିବା ଅନ�ତରାଳ, ମିନଟରେ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "ଅନ�ତିମ ସତର�କ ସୂଚନା ସମୟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "ନାମପଟି ଯାହା ପଛରେ ସନ�ଦେଶ ଲଗ ହୋଇଥିବା ଉଚିତ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr "ଦିନ ଦୃଶ�ୟରେ ସାମ�ପ�ରତିକ ବ�ୟବହୃତ ଦ�ୱିତୀୟ ସମୟ ମଣ�ଡଳର ତାଲିକା।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "ମ�କ�ତ/ବ�ୟସ�ତ ପ�ରକାଶନ ପାଇ� URLଗ�ଡ଼ିକର ତାଲିକା।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains Line"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains Line Color - Day View"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains Line Color - Time bar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr ""
-"'day_second_zones' ତାଲିକାରେ ମନେରଖିବା ପାଇ� ସାମ�ପ�ରତିକ ବ�ୟବହୃତ ସମୟ "
-"ମଣ�ଡଳଗ�ଡ଼ିକର ସର�ବାଧିକ ସଂଖ�ୟା।"
+"'day_second_zones' ତାଲିକାରେ ମନେରଖିବା ପାଇ� ସାମ�ପ�ରତିକ ବ�ୟବହୃତ ସମୟ ମଣ�ଡଳଗ�ଡ଼ିକର ସର�ବାଧିକ "
+"ସଂଖ�ୟା।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "ମନେରଖିବା ପାଇ� ସାମ�ପ�ରତିକ ବ�ୟବହୃତ ସମୟ ମଣ�ଡଳର ସର�ବାଧିକ ସଂଖ�ୟା।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#, fuzzy
+#| msgid "_Reply style:"
+msgid "Memo layout style"
+msgstr "ଉତ�ତର ଦେବା ଶୈଳୀ (_R):"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#, fuzzy
+#| msgid "Month view vertical pane position"
+msgid "Memo preview pane position (vertical)"
+msgstr "ଭୂଲମ�ବ ପଟ�ଟିକା ସ�ଥାନ ମାସ ଦୃଶ�ୟ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "କାର�ଯ�ୟ ଦିବସ ସମାପ�ତ ହେଉଥିବା ମିନଟ, 0 ର� 59।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "କାର�ଯ�ୟ ଦିବସ ଆରମ�ଭ ହେଉଥିବା ମିନଟ, 0 ର� 59।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "ସମାନ�ତରାଳ ପଟ�ଟିକା ସ�ଥାନ ମାସ ଦୃଶ�ୟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "ଭୂଲମ�ବ ପଟ�ଟିକା ସ�ଥାନ ମାସ ଦୃଶ�ୟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ ସ�ମାରକ ନିର�ଦ�ଧାରଣ ପାଇ� �କକର ସଂଖ�ୟା। "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "କାର�ଯ�ୟସୂଚୀକ� ଲ�ଚାଇବା ପାଇ� ନିର�ଦ�ଧାରଣ କରାଯାଇଥିବା �କକର ସଂଖ�ୟା।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "ବକୟା କାର�ଯ�ୟ ରଙ�ଗ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
-"ତାରିଖ ସଞ�ଚାଳକ କ�ୟାଲେଣ�ଡର �ବଂ କାର�ଯ�ୟ ତାଲିକା ମଧ�ଯରେ ଥିବା ସମାନ�ତରାଳ ପଟ�ଟିକାର "
-"ଅବସ�ଥାନ ମାସ ଦୃସ�ୟରେ ନାହି�, ପିକସେଲରେ।"
+"ତାରିଖ ସଞ�ଚାଳକ କ�ୟାଲେଣ�ଡର �ବଂ କାର�ଯ�ୟ ତାଲିକା ମଧ�ଯରେ ଥିବା ସମାନ�ତରାଳ ପଟ�ଟିକାର ଅବସ�ଥାନ ମାସ "
+"ଦୃସ�ୟରେ ନାହି�, ପିକସେଲରେ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -3701,485 +2574,376 @@ msgstr ""
 "ଦୃଶ�ୟ �ବଂ ତାରିଖ ସଞ�ଚାଳକ କ�ୟାଲେଣ�ଡର �ବଂ କାର�ଯ�ୟ ତାଲିକା ମଧ�ଯରେ ଥିବା ସମାନ�ତରାଳ ପଟ�ଟିକାର "
 "ଅବସ�ଥାନ ମାସ ଦୃସ�ୟରେ ନାହି�, ପିକସେଲରେ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
-"କ�ୟାଲେଣ�ଡର ତାଲିକା �ବଂ ତାରିଖ ସଞ�ଚାଳକ କ�ୟାଲେଣ�ଡର ମଧ�ଯରେ ଥିବା "
-"ଭୂଲମ�ବ ପଟ�ଟିକାର ଅବସ�ଥାନ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-msgstr "ର ମଧ�ଯରେ ତାଲିକା �ବଂ ଇଞ�ଚ ପିକ�ସେଲ."
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr "କ�ୟାଲେଣ�ଡର ତାଲିକା �ବଂ ତାରିଖ ସଞ�ଚାଳକ କ�ୟାଲେଣ�ଡର ମଧ�ଯରେ ଥିବା ଭୂଲମ�ବ ପଟ�ଟିକାର ଅବସ�ଥାନ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"ଦୃଶ�ୟ �ବଂ ତାରିଖ ସଞ�ଚାଳକ କ�ୟାଲେଣ�ଡର �ବଂ କାର�ଯ�ୟ ତାଲିକା ମଧ�ଯରେ ଥିବା ଭୂଲମ�ବ ପଟ�ଟିକାର "
-"ଅବସ�ଥାନ ମାସ ଦୃଶ�ୟରେ ନାହି�, ପିକସେଲରେ।"
+"ଦୃଶ�ୟ �ବଂ ତାରିଖ ସଞ�ଚାଳକ କ�ୟାଲେଣ�ଡର �ବଂ କାର�ଯ�ୟ ତାଲିକା ମଧ�ଯରେ ଥିବା ଭୂଲମ�ବ ପଟ�ଟିକାର ଅବସ�ଥାନ "
+"ମାସ ଦୃଶ�ୟରେ ନାହି�, ପିକସେଲରେ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
-"ଦୃଶ�ୟ �ବଂ ତାରିଖ ସଞ�ଚାଳକ କ�ୟାଲେଣ�ଡର �ବଂ କାର�ଯ�ୟ ତାଲିକା ମଧ�ଯରେ ଥିବା ଭୂଲମ�ବ ପଟ�ଟିକାର "
-"ଅବସ�ଥାନ ମାସ ଦୃଶ�ୟରେ ନାହି�, ପିକସେଲରେ।"
+"ଦୃଶ�ୟ �ବଂ ତାରିଖ ସଞ�ଚାଳକ କ�ୟାଲେଣ�ଡର �ବଂ କାର�ଯ�ୟ ତାଲିକା ମଧ�ଯରେ ଥିବା ଭୂଲମ�ବ ପଟ�ଟିକାର ଅବସ�ଥାନ "
+"ମାସ ଦୃଶ�ୟରେ ନାହି�, ପିକସେଲରେ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#, fuzzy
+#| msgid "Print this calendar"
+msgid "Primary calendar"
+msgstr "ପ�ରାଥମିକ କାଲେଣ�ଡର"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#, fuzzy
+#| msgid "New memo list"
+msgid "Primary memo list"
+msgstr "ପ�ରାଥମିକ ମେମୋ ତାଲିକା"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#, fuzzy
+#| msgid "New task list"
+msgid "Primary task list"
+msgstr "ପ�ରାଥମିକ କାର�ଯ�ଯ ତାଲିକା"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "ଚେତାବନୀଗ�ଡ଼ିକ ଦ�ୱାରା ଚାଲ�ଥିବା ପ�ରଗ�ରାମଗ�ଡ଼ିକ� ଅନ�ମତି ଦିଅନ�ତ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "ଦିନ ଦୃଶ�ୟରେ ସାମ�ପ�ରତିକ ବ�ୟବହୃତ ସମୟ ମଣ�ଡଳ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "ସତର�କ ଧ�ୱନି ପାଇ� ଡିରେକ�ଟୋରୀ ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
-msgstr ""
+msgstr "ମାସ ଦୃଶ�ୟକ� ସପ�ତାହ ଦ�ୱାରା ଟାଣନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "ଘଟଣା/ସାକ�ଷାତକାର ସମ�ପାଦକରେ RSVP କ�ଷେତ�ର ଦର�ଶାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "ଭୂମିକା କ�ଷେତ�ରକ� ଘଟଣା/କାର�ଯ�ୟ/ସଭା ସମ�ପାଦକରେ ଦର�ଶାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr "ସାକ�ଷାତକାର ଶେଷ ସମୟ ସପ�ତାହ �ବଂ ମାସ ଦୃଶ�ୟ ଆକାରରେ ଦର�ଶାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "ବିଭାଗ କ�ଷେତ�ରକ� ଘଟଣା/କାର�ଯ�ୟ/ସଭା ସମ�ପାଦକରେ ଦର�ଶାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "ବିଜ�ଞପ�ତି ଟ�ରେରେ ପ�ରଦର�ଶକ ଚେତାବନୀଗ�ଡ଼ିକ� ଦର�ଶାଉଥିବା ଦୃଶ�ୟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "ଘଟଣା/କାର�ଯ�ୟସୂଚୀ/ସାକ�ଷାତକାର ସମ�ପାଦକରେ ଅବସ�ଥିତ କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
-#: ../mail/evolution-mail.schemas.in.h:136
-msgid "Show the \"Preview\" pane"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#, fuzzy
+#| msgid "Show the \"Preview\" pane"
+msgid "Show the memo preview pane"
 msgstr "\"Preview\" ପ�ୟାନ ଦର�ଶାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid "Show the \"Preview\" pane."
-msgstr "\"Preview\" ପ�ୟାନ ଦର�ଶାନ�ତ�।"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#, fuzzy
+#| msgid "Show the \"Preview\" pane"
+msgid "Show the task preview pane"
+msgstr "\"Preview\" ପ�ୟାନ ଦର�ଶାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "ଘଟଣା/ସାକ�ଷାତକାର ସମ�ପାଦକରେ ସମୟ ମଣ�ଡଳ କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "ଘଟଣା/କାର�ଯ�ୟ/ସାକ�ଷାତକାର ସମ�ପାଦକରେ ପ�ରକାର କ�ଷେତ�ର ଦର�ଶାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show week number in Day and Work Week View"
 msgstr "ଦିନ �ବଂ ତାରିଖ ପ�ରଦର�ଶିକାରେ ସପ�ତାହ ସଂଖ�ଯା ମାନଙ�କ� ଦେଖାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week numbers in date navigator"
 msgstr "ତାରିଖ ପଥପ�ରଦର�ଶକରେ ସପ�ତାହ ସଂଖ�ୟାଗ�ଡ଼ିକ� ଦର�ଶାନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr ""
-"ଦ�ୱିତୀୟ ସମୟ ମଣ�ଡଳକ� ଦିବସ ଦୃଶ�ୟ ଆକାରରେ ଦର�ଶାନ�ତ�, ଯଦି ସେଟକରାଯାଇଛି। ମୂଲ�ୟଟି "
-"'ସମୟ ମଣ�ଡଳ' କି ରେ ବ�ୟବହୃତ ସଦୃଶ।"
+"ଦ�ୱିତୀୟ ସମୟ ମଣ�ଡଳକ� ଦିବସ ଦୃଶ�ୟ ଆକାରରେ ଦର�ଶାନ�ତ�, ଯଦି ସେଟକରାଯାଇଛି। ମୂଲ�ୟଟି 'ସମୟ ମଣ�ଡଳ' କି ରେ "
+"ବ�ୟବହୃତ ସଦୃଶ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
-msgid "Tasks due today color"
-msgstr "ଆଜିର ରଙ�ଗରେ ବାକିଥିବା କାର�ଯ�ୟଗ�ଡ଼ିକ"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid "Tasks vertical pane position"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#, fuzzy
+#| msgid "Tasks vertical pane position"
+msgid "Task preview pane position (horizontal)"
 msgstr "କାର�ଯ�ୟଗ�ଡ଼ିକର ଭୂଲମ�ବ ପ�ୟାନ ଅବସ�ଥାନ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#, fuzzy
+#| msgid "Tasks vertical pane position"
+msgid "Task preview pane position (vertical)"
+msgstr "କାର�ଯ�ୟଗ�ଡ଼ିକର ଭୂଲମ�ବ ପ�ୟାନ ଅବସ�ଥାନ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+msgid "Tasks due today color"
+msgstr "ଆଜିର ରଙ�ଗରେ ବାକିଥିବା କାର�ଯ�ୟଗ�ଡ଼ିକ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"ମ�କ�ତ/ବ�ୟସ�ତ ତଥ�ୟ ପଛ�ଆ ପରି ବ�ୟବହାର କରିବାକ� ଥିବା URL ନାମପଟି, %u କ� ଇମେଲ ଠିକଣା �ବଂ "
-"ପରିସର ଦ�ୱାରା ସ�ଥାନାନ�ତରିତ %dର ଚାଳକ ଅଂଶ ପାଇ� ବଦଳାଯାଇଛି।"
+"ମ�କ�ତ/ବ�ୟସ�ତ ତଥ�ୟ ପଛ�ଆ ପରି ବ�ୟବହାର କରିବାକ� ଥିବା URL ନାମପଟି, %u କ� ଇମେଲ ଠିକଣା �ବଂ ପରିସର "
+"ଦ�ୱାରା ସ�ଥାନାନ�ତରିତ %dର ଚାଳକ ଅଂଶ ପାଇ� ବଦଳାଯାଇଛି।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 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\" ପରି ଅନ�ବାଦ ହୋଇନଥିବା Olsen ସମୟ ମଣ�ଡଳ ତଥ�ୟାଧାର ଅବସ�ଥାନ।"
+"କ�ୟାଲେଣ�ଡରରେ ତାରିଖ �ବଂ ସମୟ ଭାବରେ ବ�ୟବହାର କରିବା ପାଇ� ପୂର�ବନିର�ଦ�ଧାରିତ ସମୟ ମଣ�ଡଳ,\"America/"
+"New York\" ପରି ଅନ�ବାଦ ହୋଇନଥିବା Olsen ସମୟ ମଣ�ଡଳ ତଥ�ୟାଧାର ଅବସ�ଥାନ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "The second timezone for a Day View"
 msgstr "ଦିନ ଦୃଶ�ୟ ପାଇ� ଦ�ୱିତୀୟ ସମୟ ମଣ�ଡଳ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr ""
-"�ହାର ତିନୋଟି ସମ�ଭାବ�ୟ ମୂଲ�ୟ ଥାଇପାରେ। ତ�ର�ଟି ପାଇ� 0। ଚେତାବନୀ ପାଇ� 1। "
-"ତ�ର�ଟି ନିବାରଣ ସନ�ଦେଶଗ�ଡ଼ିକ ପାଇ� 2।"
+"�ହାର ତିନୋଟି ସମ�ଭାବ�ୟ ମୂଲ�ୟ ଥାଇପାରେ। ତ�ର�ଟି ପାଇ� 0। ଚେତାବନୀ ପାଇ� 1। ତ�ର�ଟି ନିବାରଣ ସନ�ଦେଶଗ�ଡ଼ିକ "
+"ପାଇ� 2।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time divisions"
 msgstr "ସମୟ ବିଭାଜନ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time the last alarm ran, in time_t."
 msgstr "ଶେଷଥର ବାଜିଥିବା ଚେତାବନୀର ସମୟ, t ସମୟରେ (_t)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Timezone"
 msgstr "ସମୟ ମଣ�ଡଳ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
-msgstr ""
-"କ�ୟାଲେମ�ଡାର ଦୃଶ�ୟରେ ଘଟଣାଗ�ଡ଼ିକର ସ�ୱଚ�ଛତା, 0 (ସ�ୱଚ�ଛ) �ବଂ 1 (ଅସ�ୱଚ�ଛ) "
-"ମଧ�ଯରେ ଥିବା ଗୋଟି� ମୂଲ�ୟ।"
+msgstr "କ�ୟାଲେମ�ଡାର ଦୃଶ�ୟରେ ଘଟଣାଗ�ଡ଼ିକର ସ�ୱଚ�ଛତା, 0 (ସ�ୱଚ�ଛ) �ବଂ 1 (ଅସ�ୱଚ�ଛ) ମଧ�ଯରେ ଥିବା ଗୋଟି� ମୂଲ�ୟ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Twenty four hour time format"
 msgstr "ଚବିଶ ଘଣ�ଟା ସମୟ ସଜ�ଜିକରଣ ଶୈଳୀ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr "ଆଲୋକିତ (\"ପ�ରାଥମିକ\") କ�ୟାଲେଣ�ଡରର URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr "ଆଲୋକିତ (\"ପ�ରାଥମିକ\") ମେମୋ ତାଲିକାର URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr "ଆଲୋକିତ (\"ପ�ରାଥମିକ\") କାର�ଯ�ୟ ତାଲିକାର URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ ସ�ଣରଣକର�ତ�ତା, \"ମିନଟ\", \"ଘଣ�ଟା\" କିମ�ବା \"ଦିନ\"।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "ଲ�ଚାଇବାକ� ଥିବା କାର�ଯ�ୟକ� ନିର�ଦ�ଧାରଣ କରିବା ପାଇ� �କକ \"ମିନଟ\", \"ଘଣ�ଟା\" କିମ�ବା \"ଦିନ\"।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
 msgstr "ତନ�ତ�ର ସମୟମଣ�ଡଳକ� ବ�ଯବହାର କରନ�ତ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#, fuzzy
+#| msgid "Check this to use system timezone in Evolution."
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "Evolution ରେ ବଚ�ଛିତ ସମୟ ମଣ�ଡଳ ପରିବର�ତ�ତେ ତନ�ତ�ର ସମୟ ମଣ�ଡଳ ବ�ୟବହାର କରନ�ତ�।"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr "ଭୂଲମ�ବ ଫଳକ ଅବସ�ଥିତି"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "ସପ�ତାହ ଆରମ�ଭ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "ସପ�ତାହ ଆରମ�ଭ ହେଉଥିବା ସପ�ତାହ, ରବିବାର (0) ର� ଶନିବାର (6)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "ସତର�କ ସୂଚନାଗ�ଡ଼ିକ� ଦର�ଶାଇବା ପାଇ� ବିଜ�ଞପ�ତି ଟ�ରେ ବ�ୟବହାର କରାଯିବ କି ନାହି�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "ଗୋଟି� ସାକ�ଷାତକାର କିମ�ବା କାର�ଯ�ୟ ଅପସାରଣ କରିବା ସମୟରେ ନିଶ�ଚିତକରଣ ପାଇ� ପଚରାଯିବ କି।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "ସାକ�ଷାତକାର �ବଂ କାର�ଯ�ୟଗ�ଡ଼ିକ� କାଟିବା ସମୟରେ ନିଶ�ଚିତକରଣ ପାଇ� ପଚାରିବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
-"ସପ�ତାହାନ�ତକ� ମାସ ଦୃଶ�ୟରେ ସଙ�କୋଚନ କରିବା ଉଚିତ କି ନ�ହ�, ଯାହାକି ଶନିବାର "
-"�ବଂ ରବିବାରକ� ଗୋଟି� କାର�ଯ�ୟ ଦିବସରେ ରଖିଥା�।"
+"ସପ�ତାହାନ�ତକ� ମାସ ଦୃଶ�ୟରେ ସଙ�କୋଚନ କରିବା ଉଚିତ କି ନ�ହ�, ଯାହାକି ଶନିବାର �ବଂ ରବିବାରକ� ଗୋଟି� କାର�ଯ�ୟ "
+"ଦିବସରେ ରଖିଥା�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "ସପ�ତାହ �ବଂ ମାସ ଦୃଶ�ୟରେ ଘଟଣାଗ�ଡ଼ିକର ଅନ�ତିମ ସମୟକ� ଦର�ଶାଇଥା�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "କ�ୟାଲେଣ�ଡରରେ Marcus Bains Line (ପ�ରଚଳିତ ସମୟରେ) ଅଙ�କାଯିବ କି।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "କାର�ଯ�ୟ ଦୃଶ�ୟରେ ସମ�ପୂର�ଣ�ଣ କାର�ଯ�ୟକ� ଲ�ଚାଇବା କଥା କି।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to scroll a Month View by a week, not by a month."
-msgstr ""
+msgstr "ଗୋଟି� ମାସ ଦୃଶ�ୟକ� ସପ�ତାହଟେ ଆଗାନ�ତ�, ମାସରେ ନ�ହ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to set a default reminder for appointments."
 msgstr "ସାକ�ଷାତକାର ପାଇ� ପୂର�ବନିର�ଦ�ଧାରିତ ସ�ମରଣକର�ତ�ତା ସେଟ କରିବେ କି।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "RSVP କ�ଷେତ�ରକ� ଘଟଣା/କାର�ୟ�ୟ/ସଭା ସମ�ପାଦକରେ ଦର�ଶାଇବା ଉଚିତ କି ନ�ହ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "ବିଭାଗ କ�ଷେତ�ରକ� ଘଟଣା/ସଭା ସମ�ପାଦକରେ ଦର�ଶାଇବା ଉଚିତ କି ନ�ହ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "ଭୂମିକା କ�ଷେତ�ରକ� ଘଟଣା/କାର�ୟ�ୟ/ସଭା ସମ�ପାଦକରେ ଦର�ଶାଇବା ଉଚିତ କି ନ�ହ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "ସ�ଥିତି କ�ଷେତ�ରକ� ଘଟଣା/କାର�ୟ�ୟ/ସଭା ସମ�ପାଦକରେ ଦର�ଶାଇବା ଉଚିତ କି ନ�ହ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "ପୂର�ବାହ�ନ/ଅପରାହ�ନ ବ�ୟବହାର କରିବା ପରିବର�ତ�ତେ ଚବିଶ ଘଣ�ଟା ଶୈଳୀରେ ଦର�ଶାଇବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "ସମୟ ମଣ�ଡଳ କ�ଷେତ�ରକ� ଘଟଣା/ସଭା ସମ�ପାଦକରେ ଦର�ଶାଇବା ଉଚିତ କି ନ�ହ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "ପ�ରକାର କ�ଷେତ�ରକ� ଘଟଣା/କାର�ୟ�ୟ/ସଭା ସମ�ପାଦକରେ ଦର�ଶାଇବା ଉଚିତ କି ନ�ହ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "ସପ�ତାହ ସଂଖ�ୟାକ� ଦିବସ �ବଂ କାର�ୟ�ୟ ସପ�ତାହ ଦୃଶ�ୟ ଆକାରରେ ଦର�ଶାଇବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week numbers in the date navigator."
 msgstr "ତାରିଖ ସଞ�ଚାଳକରେ ସପ�ତାହ ସଂଖ�ଯାକ� ଦର�ଶାଇବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "କାର�ଯ�ଯଦିବସ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "କାର�ଯ�ଯଦିବସ ଅନ�ତିମ ଘଣ�ଟା"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "କାର�ଯ�ଯଦିବସ ଅନ�ତିମ ମିନିଟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "କାର�ଯ�ଯଦିବସ ପ�ରାରମ�ଭିକ ଘଣ�ଟା"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "କାର�ଯ�ଯଦିବସ ପ�ରାରମ�ଭିକ ମିନିଟ"
 
-#: ../calendar/gui/cal-search-bar.c:75
-msgid "Summary contains"
-msgstr "ସାରଂଶ ବିଷୟ"
-
-#: ../calendar/gui/cal-search-bar.c:76
-msgid "Description contains"
-msgstr "ବର�ଣ�ଣନା ବିଷୟ"
-
-#: ../calendar/gui/cal-search-bar.c:77
-msgid "Category is"
-msgstr "ବିଭାଗ �ହା ଅଟେ"
-
-#: ../calendar/gui/cal-search-bar.c:78
-msgid "Comment contains"
-msgstr "ମନ�ତବ�ଯ ବିଷୟ"
-
-#: ../calendar/gui/cal-search-bar.c:79
-msgid "Location contains"
-msgstr "ଅବସ�ଥାନ ବିଷୟ"
-
-#: ../calendar/gui/cal-search-bar.c:640
-msgid "Next 7 Days' Tasks"
-msgstr "ପରବର�ତ�ତି 7 ଦିନର କାର�ଯ�ୟ"
-
-#: ../calendar/gui/cal-search-bar.c:644
-msgid "Active Tasks"
-msgstr "ସକ�ରିୟ କାର�ଯ�ଯପନ�ଥା"
-
-#: ../calendar/gui/cal-search-bar.c:648
-msgid "Overdue Tasks"
-msgstr "ସମୟାତିକ�ରାନ�ତ କାର�ଯ�ଯ"
+#: ../calendar/gui/cal-editor-utils.c:105
+#, fuzzy
+#| msgid "Invalid contact."
+msgid "Invalid object"
+msgstr "ଅବୈଧ ବସ�ତ�"
 
-#: ../calendar/gui/cal-search-bar.c:652
-msgid "Completed Tasks"
-msgstr "ସମାପ�ତ ହୋଇଥିବା କାର�ଯ�ୟ"
-
-#: ../calendar/gui/cal-search-bar.c:656
-msgid "Tasks with Attachments"
-msgstr "ସଂଲଗ�ନଗ�ଡ଼ିକ ସହିତ କାର�ଯ�ୟ"
-
-#: ../calendar/gui/cal-search-bar.c:702
-msgid "Active Appointments"
-msgstr "ସକ�ରିୟ ନିଯ�କ�ତି"
-
-#: ../calendar/gui/cal-search-bar.c:706
-msgid "Next 7 Days' Appointments"
-msgstr "ପରବର�ତ�ତି 7 ଦିନର ସାକ�ଷାତକାର"
-
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "ମୂଦ�ରଣ କରନ�ତ�"
-
-#: ../calendar/gui/calendar-commands.c:315
-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:321
-msgid "Purge events older than"
-msgstr "�ହା ପୂର�ବବର�ତ�ତୀ ଘଟଣା ମାନଙ�କ� ନିଷ�କାସିତ କରନ�ତ�"
-
-#: ../calendar/gui/calendar-commands.c:326
-#: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "ଦିନ"
-
-#. Create the Webcal source group
-#: ../calendar/gui/calendar-component.c:194
-#: ../calendar/gui/memos-component.c:153 ../calendar/gui/migration.c:505
-#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:150
-msgid "On The Web"
-msgstr "ୱେବରେ"
-
-#: ../calendar/gui/calendar-component.c:195
-#: ../plugins/calendar-weather/calendar-weather.c:126
-msgid "Weather"
-msgstr "ପାଣିପାଗ"
-
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:289
-#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "ଜନ�ମଦିନ �ବଂ ବାର�ଷିକୀ"
-
-#: ../calendar/gui/calendar-component.c:627
-msgid "_New Calendar"
-msgstr "ନୂତନ କ�ଯାଲେଣ�ଡର (_N)"
-
-#: ../calendar/gui/calendar-component.c:628
-#: ../calendar/gui/memos-component.c:480 ../calendar/gui/tasks-component.c:472
-#: ../mail/em-folder-tree.c:2097
-msgid "_Copy..."
-msgstr "ନକଲ କରନ�ତ� (_C)..."
-
-#: ../calendar/gui/calendar-component.c:633
-#: ../calendar/gui/memos-component.c:485 ../calendar/gui/tasks-component.c:477
-msgid "_Make available for offline use"
-msgstr "ଅଫ-ଲାଇନ ଧାରାରେ ବ�ୟବହାର ପାଇ� ଉପଲବ�ଧ କରନ�ତ� (_M)"
-
-#: ../calendar/gui/calendar-component.c:634
-#: ../calendar/gui/memos-component.c:486 ../calendar/gui/tasks-component.c:478
-msgid "_Do not make available for offline use"
-msgstr "ଅଫ-ଲାଇନ ଧାରାରେ ବ�ୟବହାର ପାଇ� ଉପଲବ�ଧ କରନ�ତ� ନାହି� (_D)"
-
-#: ../calendar/gui/calendar-component.c:964
-msgid "Failed upgrading calendars."
-msgstr "କ�ଯାଲେଣ�ଡର ଉନ�ନୟନ କରିବା ସମୟରେ ବିଫଳ।"
-
-#: ../calendar/gui/calendar-component.c:1093
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "ଘଟଣା �ବଂ ସାକ�ଷାତକାର ସ�ର�ଷ�ଟି କରିବା ପାଇ� '%s' କ�ଯାଲେଣ�ଡର ଖୋଲିବାରେ ଅସମର�ଥ"
-
-#: ../calendar/gui/calendar-component.c:1109
-msgid "There is no calendar available for creating events and meetings"
-msgstr "ଘଟଣା �ବଂ ସାକ�ଷାତକାର ସ�ର�ଷ�ଟି କରିବା ପାଇ� କୌଣସି କ�ଯାଲେଣ�ଡର ଉପଲବ�ଧ ନାହି�"
-
-#: ../calendar/gui/calendar-component.c:1222
-msgid "Calendar Source Selector"
-msgstr "କ�ଯାଲେଣ�ଡର ଉତ�ସ ଚୟକ"
-
-#: ../calendar/gui/calendar-component.c:1438
-msgid "New appointment"
-msgstr "ନୂତନ ସାକ�ଷାତକାର"
-
-#: ../calendar/gui/calendar-component.c:1439
-msgctxt "New"
-msgid "_Appointment"
-msgstr "ସାକ�ଷାତକାର (_A)"
-
-#: ../calendar/gui/calendar-component.c:1440
-msgid "Create a new appointment"
-msgstr "ଗୋଟି� ନୂତନ ସାକ�ଷାତକାର ସ�ର�ଷ�ଟି କରନ�ତ�"
-
-#: ../calendar/gui/calendar-component.c:1446
-msgid "New meeting"
-msgstr "ନୂତନ ସାକ�ଷାତକାର"
-
-#: ../calendar/gui/calendar-component.c:1447
-msgctxt "New"
-msgid "M_eeting"
-msgstr "ସାକ�ଷାତକାର (_e)"
-
-#: ../calendar/gui/calendar-component.c:1448
-msgid "Create a new meeting request"
-msgstr "ଗୋଟି� ନୂତନ ସାକ�ଷାତକାର ନିବେଦନ"
-
-#: ../calendar/gui/calendar-component.c:1454
-msgid "New all day appointment"
-msgstr "ନୂତନ ସମ�ପୂର�ଣ ଦିବସ ବ�ଯାପି ସାକ�ଷାତକାର"
-
-#: ../calendar/gui/calendar-component.c:1455
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "ସମ�ପୂର�ଣ ଦିବସ ବ�ଯାପି ସାକ�ଷାତକାର (_p)"
-
-#: ../calendar/gui/calendar-component.c:1456
-msgid "Create a new all-day appointment"
-msgstr "ଗୋଟି� ନୂତନ ସମ�ପୂର�ଣ ଦିବସ ବ�ଯାପି ସାକ�ଷାତକାର"
-
-#: ../calendar/gui/calendar-component.c:1462
-msgid "New calendar"
-msgstr "ନୂତନ କ�ଯାଲେଣ�ଡର"
-
-#: ../calendar/gui/calendar-component.c:1463
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "କ�ଯାଲେଣ�ଡର (_n)"
-
-#: ../calendar/gui/calendar-component.c:1464
-msgid "Create a new calendar"
-msgstr "ଗୋଟି� ନୂତନ କ�ଯାଲେଣ�ଡର ସ�ର�ଷ�ଟି କରନ�ତ�"
-
-#: ../calendar/gui/calendar-view-factory.c:113
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Day View"
 msgstr "ଦିବସ ଦ�ର�ଶ�ଯ"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Work Week View"
 msgstr "କାର�ଯ�ଯ ସପ�ତାହ ଦ�ର�ଶ�ଯ"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:123
 msgid "Week View"
 msgstr "ସପ�ତାହ ଦ�ର�ଶ�ଯ"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:126
 msgid "Month View"
 msgstr "ମାନ ଦ�ର�ଶ�ଯ"
 
@@ -4208,18 +2972,19 @@ msgstr "ବିଭାଗ"
 msgid "Classification"
 msgstr "ବିଭାଗୀକରଣ"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:566
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "ଗୋପନୀୟ"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
+#: ../plugins/plugin-manager/plugin-manager.c:60
 #: ../widgets/misc/e-attachment-tree-view.c:496
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "ବର�ଣ�ଣନା"
 
@@ -4239,9 +3004,10 @@ msgid "Exist"
 msgstr "ଅବସ�ଥିତ"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:710
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "ଅବସ�ଥାନ"
 
@@ -4250,29 +3016,30 @@ msgstr "ଅବସ�ଥାନ"
 msgid "Organizer"
 msgstr "ସଙ�ଗଠକ"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:565
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ବ�ଯକ�ତିଗତ"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:246
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:564 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ସାର�ବଜନୀନ"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:304
+#: ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "ପ�ନଃପୌନିକତା"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "ସାରଂଶ"
 
@@ -4301,459 +3068,510 @@ msgstr "ଅଟେ"
 msgid "is not"
 msgstr "ଅଟେ ନାହି�"
 
-#: ../calendar/gui/comp-editor-factory.c:409
-msgid "Error while opening the calendar"
-msgstr "କ�ଯାଲେଣ�ଡରକ� ଖୋଲିବା ସମୟରେ ତ�ର�ଟି"
-
-#: ../calendar/gui/comp-editor-factory.c:415
-msgid "Method not supported when opening the calendar"
-msgstr "କ�ଯାଲେଣ�ଡରକ� ଖୋଲିବା ସମୟରେ ପଦ�ଧତି ସମର�ଥିତ ନ�ହେ�"
-
-#: ../calendar/gui/comp-editor-factory.c:421
-msgid "Permission denied to open the calendar"
-msgstr "କ�ଯାଲେଣ�ଟରକ� ଖୋଲିବା ପାଇ� ଅନ�ମତି ନିଷିଦ�ଧ"
-
-#: ../calendar/gui/comp-editor-factory.c:439
-#: ../plugins/mail-to-task/mail-to-task.c:455 ../shell/e-shell.c:1270
-msgid "Unknown error"
-msgstr "ଅଜଣା ତ�ର�ଟି"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:611
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "ସତର�କ ଧ�ବନୀକ� ସମ�ପାଦନ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "ଗୋଟି� ସତର�କକ� ପପ-ଅପ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
 #: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "ଗୋଟି� ଶବ�ଦ ବଜାନ�ତ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
 #: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "ଗୋଟି� ପ�ରୋଗ�ରାମକ� ଚାଳନ�ତ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
 #: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "ଗୋଟି� ଇ-ଡାକ ପଠାନ�ତ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>ସତର�କ ଧ�ବନୀ</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>ବିକଲ�ପ</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>ପ�ନରାବ�ର�ତ�ତି କରନ�ତ�</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
 msgstr "ସତର�କ ଧ�ବନୀ ଯୋଗ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#, fuzzy
+#| msgid "Alarms"
+msgid "Alarm"
+msgstr "ସତର�କ ଧ�ବନୀ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "ସନ�ଦେଶକ� ଇଚ�ଛାରୂପଣ କରନ�ତ� (_m)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
 msgstr "ସତର�କ ଧ�ବନୀକ� ଇଚ�ଛାରୂପଣ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "ସନ�ଦେଶ (_s):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:77
+#, fuzzy
+#| msgid "_Options"
+msgid "Options"
+msgstr "ବିକଲ�ପ (_O)"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+#, fuzzy
+#| msgid "<b>Repeat</b>"
+msgid "Repeat"
+msgstr "<b>ପ�ନରାବ�ର�ତ�ତି କରନ�ତ�</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
 msgstr "ଗୋଟି� ଫାଇଲ ଚୟନ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "�ଠାକ� ପଠାନ�ତ�:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "ସ�ବତନ�ତ�ରଚର (_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "ପ�ରୋଗ�ରାମ (_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "ସତର�କ ଧ�ବନୀକ� ପ�ନର�ବାର ବଜାନ�ତ� (_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "ଧ�ବନୀ (_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-msgid ""
-"before\n"
-"after"
-msgstr ""
-"ପୂର�ବର�\n"
-"ପରେ"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#, fuzzy
+#| msgid "Later"
+msgid "after"
+msgstr "ପରବର�ତ�ତି"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+#, fuzzy
+#| msgid "is before"
+msgid "before"
+msgstr "ପୂର�ବର� ଅଟେ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+#, fuzzy
+#| msgid "days"
+msgid "day(s)"
+msgstr "ଦିନ"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:336
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:43
+msgid "days"
+msgstr "ଦିନ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#, fuzzy
+#| msgid "New appointment"
+msgid "end of appointment"
+msgstr "ନୂତନ ସାକ�ଷାତକାର"
+
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "ଅତିରିକ�ତ ସମୟ ପ�ରାପ�ତି"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
-msgid ""
-"minute(s)\n"
-"hour(s)\n"
-"day(s)"
-msgstr ""
-"ମିନିଟ\n"
-"ଘଣ�ଟା\n"
-"ଦିନ"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-msgid ""
-"minutes\n"
-"hours\n"
-"days"
-msgstr ""
-"ମିନିଟ\n"
-"ଘଣ�ଟା\n"
-"ଦିନ"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#, fuzzy
+#| msgid "hours"
+#| msgid_plural "hours"
+msgid "hour(s)"
+msgstr "ଘଣ�ଟା"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#, fuzzy
+#| msgid "minutes"
+msgid "minute(s)"
+msgstr "ମିନିଟ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-msgid ""
-"start of appointment\n"
-"end of appointment"
-msgstr ""
-"ସାକ�ଷାତକାରର ପ�ରାରମ�ଭ\n"
-"ସାକ�ଷାତକାରର ସମାପ�ତି"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
+#, fuzzy
+#| msgid "location of appointment"
+msgid "start of appointment"
+msgstr "ନିଯ�କ�ତିର ଅବସ�ଥାନ"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "କାର�ଯ�ଯ/ଟ�ରଗର"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 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/event-page.glade.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "Alarms"
 msgstr "ସତର�କ ଧ�ବନୀ"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:553
-msgid "_Suggest automatic display of attachment"
-msgstr "ସଂଲଗ�ନକର ସ�ବତଃ ପ�ରଦର�ଶନକ� ପରାମର�ଶ କରନ�ତ� (_S)"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
-msgid "Attach file(s)"
-msgstr "ଫାଇଲ ସଂଲଗ�ନ କରନ�ତ�"
-
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:137
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:186
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/event-page.c:2968
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:789
-#: ../calendar/gui/e-itip-control.c:1151 ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:705 ../mail/em-account-editor.c:1434
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:333
-#: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:181
-#: ../plugins/itip-formatter/itip-formatter.c:2192
-#: ../widgets/misc/e-cell-date-edit.c:316 ../widgets/misc/e-dateedit.c:1510
-#: ../widgets/misc/e-dateedit.c:1726
-#: ../widgets/misc/e-signature-combo-box.c:74
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/e-day-view-time-item.c:797
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-second-zone"
 msgid "None"
 msgstr "କିଛି ନ�ହେ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:637
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/e-day-view-time-item.c:824
+#: ../calendar/gui/e-timezone-entry.c:319
+msgid "Select..."
+msgstr "ଚୟନ କରନ�ତ�..."
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
 msgid "Selected Calendars for Alarms"
 msgstr "ସତର�କ ଧ�ବନୀ ପାଇ� କ�ଯାଲେଣ�ଡର ଚୟନ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "(Shown in a Day View)"
-msgstr "(ଗୋଟି� ଦିନର ଦୃଶ�ୟରେ ଦର�ଶାଯାଇଛି)"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
+#, fuzzy
+#| msgid "D_ue date:"
+msgid "Ti_me and date:"
+msgstr "ଦେୟ ତାରିଖ (_u):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-msgstr ""
-"୬୦ ମିନିଟ\n"
-"୩୦ ମିନିଟ\n"
-"୧୫ ମିନିଟ\n"
-"୧୦ ମିନିଟ\n"
-"୦୫ ମିନିଟ"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
+#, fuzzy
+#| msgid "_Date completed:"
+msgid "_Date only:"
+msgstr "ସମ�ପନ�ନ ତାରିଖ (_D):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<i>%u and %d will be replaced by user and domain from the email address.</"
+#| "i>"
+msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "<i>%u �ବଂ %d କ� ଇମେଲ ଠିକଣାର ଚାଳକ �ବଂ ପରିସର ଦ�ୱାରା ସ�ଥାନାନ�ତରିତ କରାଯିବ।</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">ସତର�କ ଧ�ବନୀ</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(ଗୋଟି� ଦିନର ଦୃଶ�ୟରେ ଦର�ଶାଯାଇଛି)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">ପୂର�ବ ନିର�ଦ�ଧାରିତ ମ�କ�ତ/ବ�ଯସ�ତ ସେବକ</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+#, fuzzy
+#| msgid "minutes"
+msgid "05 minutes"
+msgstr "ମିନିଟ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:17
-#: ../plugins/publish-calendar/publish-calendar.glade.h:1
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">ସାଧାରଣ</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
+#, fuzzy
+#| msgid "minutes"
+msgid "10 minutes"
+msgstr "ମିନିଟ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">କାର�ଯ�ଯ ତାଲିକା</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+#, fuzzy
+#| msgid "minutes"
+msgid "15 minutes"
+msgstr "ମିନିଟ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+#, fuzzy
+#| msgid "minutes"
+msgid "30 minutes"
+msgstr "ମିନିଟ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+#, fuzzy
+#| msgid "minutes"
+msgid "60 minutes"
+msgstr "ମିନିଟ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">ସମୟ</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
+#, fuzzy
+#| msgid "Alarms"
+msgid "Alerts"
+msgstr "ସତର�କ ଧ�ବନୀ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">କାର�ଯ�ଯ ସପ�ତାହ</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
+#: ../mail/mail-config.ui.h:29
+#: ../modules/addressbook/autocompletion-config.c:153
+#, fuzzy
+#| msgid "Date/Time"
+msgid "Date/Time Format"
+msgstr "ଦିନ/ତାରିଖ ଶୈଳୀ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
 msgstr "ଦିବସ ସମାପ�ତି (_e):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
+#, fuzzy
+#| msgid "Day"
+msgid "Days"
+msgstr "ଦିନ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
+#, fuzzy
+#| msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgid "Default Free/Busy Server"
+msgstr "<span weight=\"bold\">ପୂର�ବ ନିର�ଦ�ଧାରିତ ମ�କ�ତ/ବ�ଯସ�ତ ସେବକ</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
 msgstr "ପ�ରଦର�ଶନ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1107
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
+#, fuzzy
+#| msgid "Show display alarms in notification tray"
+msgid "Display alarms in _notification area only"
+msgstr "କେବଳ ବିଜ�ଞପ�ତି କ�ଷେତ�ରରେ ସତର�କ ସୂଚନାଗ�ଡ଼ିକ� ଦର�ଶାନ�ତ� (_n)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "ଶ�କ�ରବାର"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"ମିିନିଟ\n"
-"ଘଣ�ଟା\n"
-"ଦିନ"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:54
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2675
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "ସାଧାରଣ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
+#, fuzzy
+#| msgid "hours"
+#| msgid_plural "hours"
+msgid "Hours"
+msgstr "ଘଣ�ଟା"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
+#, fuzzy
+#| msgid "minutes"
+msgid "Minutes"
+msgstr "ମିନିଟ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1103
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "ସୋମବାର"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"ସୋମବାର\n"
-"ମଙ�ଗଳବାର\n"
-"ବ�ଧବାର\n"
-"ଗ�ର�ବାର\n"
-"ଶ�କ�ରବାର\n"
-"ଶନିବାର\n"
-"ରବିବାର"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../mail/mail-config.glade.h:117
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#. Translators: Used in send options dialog
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
+msgid "None"
+msgstr "କିଛି ନ�ହେ�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
+#: ../mail/mail-config.ui.h:81
 msgid "Pick a color"
 msgstr "ଗୋଟି� ରଙ�ଗ ଚୟନ କରନ�ତ�"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "ରବି (_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../calendar/gui/dialogs/recurrence-page.c:1108
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "ଶନିବାର"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
-msgstr ""
+msgstr "ମାସ ଦୃଶ�ୟକ� ସପ�ତାହ ଅନ�ସାରେ ଟାଣନ�ତ� (_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "ଦ�ୱିତିୟ କ�ଷେତ�ର (_c):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "ସତର�କ ସୂଚନା ପାଇ� କ�ଯାଲଣ�ଡର ଚୟନ କରନ�ତ�"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "ଗୋଟି� ସ�ମାରକପତ�ର ଦେଖାନ�ତ� (_o)"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "ଗୋଟି� ସ�ମାରକପତ�ର ଦେଖାନ�ତ� (_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "ତାରିଖ ପ�ରଦର�ଶକରେ ସପ�ତାହ ସଂଖ�ଯା ମାନଙ�କ� ଦେଖାନ�ତ� (_n)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "ତାରିଖ ପ�ରଦର�ଶକରେ ସପ�ତାହ ସଂଖ�ଯା ମାନଙ�କ� ଦେଖାନ�ତ� (_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: ../calendar/gui/dialogs/recurrence-page.c:1109
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "ରବିବାର"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "ଆଜି କାର�ଯ�ଯ ସମାପ�ତ କରିବାର ଅନ�ତିମ ଦିବସ (_a):"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "ଗ�ର� (_h)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Task List"
+msgstr "କାର�ଯ�ଯ ତାଲିକା"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "ଛାଞ�ଚ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: ../calendar/gui/dialogs/recurrence-page.c:1106
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "ଗ�ର�ବାର"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../e-util/e-non-intrusive-error-dialog.c:287
+#: ../widgets/misc/e-dateedit.c:592
+msgid "Time"
+msgstr "ସମୟ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "ସମୟ ମଣ�ଡଳ (_z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "ସମୟ ପ�ରାରୂପ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: ../calendar/gui/dialogs/recurrence-page.c:1104
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "ମଙ�ଗଳବାର"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "ତନ�ତ�ର ସମୟ ମଣ�ଡଳକ� ବ�ୟବହାର କରନ�ତ� (_y)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: ../calendar/gui/dialogs/recurrence-page.c:1105
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "ବ�ଧବାର"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "ସପ�ତାହ �ହି ବାରରେ ଆରମ�ଭ ହ�� (_k):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
+msgid "Work Week"
+msgstr "କାର�ଯ�ଯ ସପ�ତାହ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "କାର�ଯ�ଯ ଦିବସ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "୧୨ ଘଣ�ଟା (ପୂର�ବାହ�ନ/ଅପରାହ�ନ) (_1)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "୨୪ ଘଣ�ଟା (_2)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "ବସ�ତ�ଗ�ଡ଼ିକ� ଅପସାରଣ କରିବା ସମୟରେ ନିଶ�ଚିତକରଣ ପାଇ� ପଚାରନ�ତ� (_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "ମାସ ଦୃଶ�ୟରେ ସପ�ତାହ ଶେଷକ� ଚାପନ�ତ� (_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "ଦିନ ପ�ରାରମ�ଭ ହୋଇଥା� (_D):"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "ଶ�କ�ର (_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "ସମ�ପନ�ନ କାର�ଯ�ଯକ� ପରେ ଲ�କ�କୟିତ କରନ�ତ� (_H)"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "ସୋମ (_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "ସମୟାତିକ�ରାନ�ତ କାର�ଯ�ଯ (_O):"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "ଶନି (_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "ସାକ�ଷାତକାର ଅନ�ତିମ ସମୟକ� ସପ�ତାହ �ବଂ ମାସ ଦୃଶ�ୟ ଆକାରରେ ଦର�ଶାନ�ତ� (_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "ସମୟ ବିଭାଜନ (_T):"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "ମଙ�ଗଳ (_T)"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "ବ�ଧ (_W)"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "ପ�ରତ�ୟେକ ବାର�ଷିକ/ଜନ�ମଦିନ ପୂର�ବର�"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "ପ�ରତ�ଯେକ ସାକ�ଷାତକାର ପୂର�ବର�"
 
@@ -4761,6 +3579,19 @@ msgstr "ପà­�ରତà­�ଯେକ ସାକà­�ଷାତକାର ପୂରà­�ବà
 msgid "Type:"
 msgstr "ପ�ରକାର:"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../modules/addressbook/addressbook-config.c:510
+msgid "_Type:"
+msgstr "ପ�ରକାର (_T):"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:149
+#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
+#: ../widgets/misc/e-signature-script-dialog.c:282
+msgid "_Name:"
+msgstr "ନାମ (_N):"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ଅଫଲାଇନ ପ�ରୟୋଗ ପାଇ� କ�ୟାଲେଣ�ଡର ସୂଚୀକ� ନକଲ କରନ�ତ� (_y)"
@@ -4773,39 +3604,35 @@ msgstr "ଅଫଲାଇନ ପ�ରୟୋଗ ପାଇ� କାର�ଯ�ୟ
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ଅଫଲାଇନ ପ�ରୟୋଗ ପାଇ� ଜ�ଞାପନ ପ�ରୟୋଗକ� ନକଲ କରନ�ତ� (_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "ରଙ�ଗ (_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-msgid "Task List"
-msgstr "କାର�ଯ�ଯ ତାଲିକା"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "ସନ�ଦେଶ ସୂଚୀ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "କ�ଯାଲେଣ�ଡର ଗ�ଣଧର�ମ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "ନୂତନ କ�ଯାଲେଣ�ଡର"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "କାର�ଯ�ଯ ତାଲିକା ଗ�ଣଧର�ମ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "ନୂତନ କାର�ଯ�ଯ ତାଲିକା"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "Memo ତାଲିକା ଗ�ଣଧର�ମ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "ନୂତନ ସନ�ଦେଶ ସୂଚୀ"
 
@@ -4858,252 +3685,261 @@ msgstr "%s  ଆପଣ କୌଣସି ପରିବରà­�ତà­�ତନ କରିà¬
 msgid "Validation error: %s"
 msgstr "ବୈଧିକରଣ ତ�ର�ଟି: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2372
-msgid " to "
-msgstr "�ଠାକ�"
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2376
-msgid " (Completed "
-msgstr " (ସମାପ�ତ"
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2378
-msgid "Completed "
-msgstr "ସମାପ�ତ"
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2383
-msgid " (Due "
-msgstr " (Due "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2385
-msgid "Due "
-msgstr "ବାକି"
-
-#: ../calendar/gui/dialogs/comp-editor.c:221
+#: ../calendar/gui/dialogs/comp-editor.c:237
 msgid "Could not save attachments"
 msgstr "ସଂଲଗ�ନକକ� ସଂରକ�ଷଣ କରିପାରିଲା ନାହି�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:484
+#: ../calendar/gui/dialogs/comp-editor.c:505
 msgid "Could not update object"
 msgstr "ବସ�ତ�କ� ଅଦ�ଯତିତ କରିପାରିଲା ନାହି�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:573
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "ସାକ�ଷାତକାରକ� ସମ�ପାଦନ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:580
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "ସଭା - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:582
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "ସାକ�ଷାତକାର - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:588
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ହସ�ତାନ�ତରିତ କାର�ଯ�ଯ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:590
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "କାର�ଯ�ଯ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:595
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:611
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "କୌଣସି ସାରାଂଶ ନାହି�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:753
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "ପ�ରକୃତ ବସ�ତ�କ� ରଖିବେ କି?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "ପ�ରଚଳିତ ୱିଣ�ଡୋକ� ବନ�ଦ କରିବା ପାଇ� �ଠାରେ କ�ଲିକ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:966
-msgid "Copy selected text to the clipboard"
-msgstr "କ�ଲିପବୋର�ଡରେ ବଚ�ଛିତ ପାଠ�ୟକ� ନକଲ କରନ�ତ�"
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1464
+#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
+msgid "Copy the selection"
+msgstr "ବଛାକ� ନକଲ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:973
-msgid "Cut selected text to the clipboard"
-msgstr "କ�ଲିପବୋର�ଡରେ ବଚ�ଛିତ ପାଠ�ୟକ� କାଟନ�ତ�"
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1471
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:1045
+msgid "Cut the selection"
+msgstr "ବଛାକ� କାଟନ�ତ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1478
+#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#, fuzzy
+#| msgid "Cut the selection"
+msgid "Delete the selection"
+msgstr "ବଛାକ� କାଟନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "ଉପଲବ�ଧ ସହାୟତାକ� ଦେଖିବା ପାଇ� �ଠାରେ କ�ଲିକ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:987
-msgid "Paste text from the clipboard"
-msgstr "କ�ଲିପବୋର�ଡର� ପାଠ�ୟ ଲଗାନ�ତ�"
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1513
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:1057
+msgid "Paste the clipboard"
+msgstr "କ�ଲିପବୋର�ଡକ� ଲଗାନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "ପ�ରଚଳିତ ୱିଣ�ଡୋକ� ସଂରକ�ଷଣ କରିବା ପାଇ� �ଠାରେ କ�ଲିକ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1583
+#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "ସମସ�ତ ପାଠ�ୟକ� ବାଛନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1022
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "ବିଭାଜନ (_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1036
-#: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1632
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "ଫାଇଲ (_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1043
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Help"
 msgstr "ସହାୟତା (_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1050
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "ଭର�ତ�ତି କରନ�ତ� (_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1057
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "ବିକଲ�ପ (_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1064 ../mail/em-folder-tree.c:2089
-#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1674 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "ଦ�ର�ଶ�ଯ (_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "ସଂଲଗ�ନ (_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
 msgstr "ଗୋଟି� ଫାଇଲ ସଂଲଗ�ନ କରିବା ପାଇ� �ଠାରେ କ�ଲିକ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1084
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "ବିଭାଗ (_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "ବିଭାଗଗ�ଡ଼ିକ� ଦର�ଶାଇବା ପାଇ� ଆଗପଛକରନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "ସମୟ ମଣ�ଡଳ (_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1094
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "ସମୟ ମଣ�ଡଳ ଦର�ଶାଯାଇଛି କି ନାହି� ତାହା ପାଇ� ଆଗପଛ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "ସାର�ବଜନିକ (_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "ସାର�ବଜନିକ ଭାବରେ ବିଭକ�ତ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "ବ�ୟକ�ତିଗତ (_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1112
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "ବ�ୟକ�ତିଗତ ଭାବରେ ଶ�ରେଣୀବିଭାଗ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "ଗ�ପ�ତ (_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "ଗୋପନୀୟତା ଭାବରେ ଶ�ରେଣୀବିଭାଗ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "ଭୂମିକା କ�ଷେତ�ର (_o)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "ଭୂମିର"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "RSVP (_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP କ�ଷେତ�ରକ� ଦର�ଶାଯିବ କି ନାହି� ତାହାପାଇ� ଆଗପଛ କରିଥା�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "ସ�ଥିତି କ�ଷେତ�ର (_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "ସ�ଥିତି କ�ଷେତ�ର ଦର�ଶାଯାଇଛି କି ନାହି� ତାହା ପାଇ� ଆଗପଛ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1151
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "ପ�ରକାର କ�ଷେତ�ର (_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ଉପସ�ଥିତ ବ�ୟକ�ତି ପ�ରକାର ଦର�ଶାଯାଇଛି କି ନାହି� ତାହା ପାଇ� ଆଗପଛ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1177
-#: ../composer/e-composer-private.c:66
+#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "ପ�ରଚଳିତ ଦଲିଲ (_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1603
-#: ../composer/e-composer-actions.c:518
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:477
 msgid "Attach"
 msgstr "ସଂଯ�କ�ତ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1866
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2765
+#: ../calendar/gui/dialogs/comp-editor.c:1738
+#, fuzzy
+#| msgid "_Save"
+msgid "Save"
+msgstr "ସଂରକ�ଷଣ କରନ�ତ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2958
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "�ହି ବସ�ତ�ରେ ପ�ରୟୋଗ କରାଯାଇଥିବା ପରିବର�ତ�ତନକ� ପରିତ�ୟାଗ କରାଯାଇପାରେ ଯଦି କୌଣସି ଅଦ�ୟତନ ଆସିଥା�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2734 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "ସଂଲଗ�ନକ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2794
+#: ../calendar/gui/dialogs/comp-editor.c:2988
 msgid "Unable to use current version!"
 msgstr "ପ�ରଚଳିତ ସଂସ�କରଣକ� ବ�ୟବହାର କରିବାରେ ଅସମର�ଥ!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:64
+#: ../calendar/gui/dialogs/copy-source-dialog.c:91
 msgid "Could not open source"
 msgstr "ଉତ�ସକ� ଖୋଲିପାରିଲା ନାହି�"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:72
+#: ../calendar/gui/dialogs/copy-source-dialog.c:99
 msgid "Could not open destination"
 msgstr "ଲକ�ଷ�ୟସ�ଥଳ ଖୋଲିପାରିଲା ନାହି�"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:81
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Destination is read only"
 msgstr "ଲକ�ଷ�ୟସ�ଥଳଟି କେବଳ ପଠନୀୟ"
 
-#: ../calendar/gui/dialogs/delete-comp.c:205
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "�ହି ବସ�ତ�କ� ଅନ�ୟ ସମସ�ତ ଗ�ରହଣକାରୀଙ�କ ମେଲବାକ�ସର� ଅପସାରଣ କରନ�ତ� (_D)?"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+#, fuzzy
+#| msgid "P_ercent complete:"
+msgid "_Retract comment"
+msgstr "ସମ�ପନ�ନ ପ�ରତିଶତ (_e)"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "corba ତ�ର�ଟି ହେତ� ଘଟଣାକ� ଅପସାରଣ କରିହେବ ନାହି�"
@@ -5152,335 +3988,374 @@ msgstr "କୌଣସି ତ�ର�ଟି ବଶତଃ ଜ�ଞାପନକ�
 msgid "The item could not be deleted due to an error"
 msgstr "କୌଣସି ତ�ର�ଟି ବଶତଃ ଘଟଣାକ� ଅପସାରଣ କରିହେଲା ନାହି�"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
 msgstr "ସମ�ପର�କ..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "କ� ପ�ରତିନିଧି:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
 msgstr "ପ�ରତିନିଧି ଭରଣ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Alarms"
 msgstr "ସତର�କ ସୂଚନା (_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Click here to set or unset alarms for this event"
 msgstr "�ହି ଘଟଣା ପାଇ� ସତର�କ ସୂଚନାକ� ସେଟକରିବା କିମ�ବା ନକରିବା ପାଇ� �ଠାରେ କ�ଲିକ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Recurrence"
 msgstr "ପ�ନରାବୃତ�ତି (_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Make this a recurring event"
 msgstr "�ହାକ� ଗୋଟି� ପ�ନରାବୃତ�ତି ଘଟଣା କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:219
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:213
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../plugins/groupwise-features/send-options.c:210
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "ବିକଳ�ପଗ�ଡ଼ିକ� ପଠାନ�ତ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "ଉନ�ନତ ପଠାନ�ତ� ବିକଳ�ପଗ�ଡ଼ିକ� ଭର�ତ�ତିକରନ�ତ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:229
 msgid "All _Day Event"
 msgstr "ସମ�ପୂର�ଣ�ଣ ଦିନର ଘଟଣା (_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:231
 msgid "Toggles whether to have All Day Event"
 msgstr "ସାରା ଦିନର ଘଟଣାକ� ପାଇବା ପାଇ� ଆଗପଛ ହେଉଥା�"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "Show Time as _Busy"
 msgstr "ସମୟକ� ବ�ୟସ�ତ ଭାବରେ ପ�ରଦର�ଶନ କରନ�ତ� (_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Toggles whether to show time as busy"
 msgstr "ସମୟକ� ବ�ୟସ�ତ ଭାବରେ ଦର�ଶାଇବା ପାଇ� ଆଗପଛ ହେଉଥା�"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:248
 msgid "_Free/Busy"
 msgstr "ମ�କ�ତ/ବ�ୟସ�ତ (_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "Query free / busy information for the attendees"
 msgstr "ଅଂଶଗ�ରହଣକାରୀମାନଙ�କ ପାଇ� ପ�ରଶ�ନ ମ�କ�ତ / ବ�ୟସ�ତ ସୂଚନା"
 
-#: ../calendar/gui/dialogs/event-editor.c:301
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "ସାକ�ଷାତକାର (_m)"
 
-#: ../calendar/gui/dialogs/event-page.c:749
-#: ../calendar/gui/dialogs/event-page.c:2743
+#: ../calendar/gui/dialogs/event-page.c:751
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "ଘଟଣାକ� ସମ�ପାଦନ କରିପାରିବେ ନାହି�, କାରଣ ବଚ�ଛିତ କ�ୟାଲେଣ�ଡରଟି କେବଳ ପଠନୀୟ"
+
+#: ../calendar/gui/dialogs/event-page.c:755
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "ଘଟଣାକ� ସମ�ପୂର�ଣ�ଣ ଭାବରେ ସମ�ପାଦନ କରିହେବ ନାହି�, କାରଣ ଆପଣ ସଙ�ଗଠକ ନ�ହ�ନ�ତି"
+
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "�ହି ଘଟଣାର ସତର�କଧ�ବନୀ ଅଛି"
 
-#: ../calendar/gui/dialogs/event-page.c:812
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "ସଙ�ଗଠକ (_g):"
 
-#: ../calendar/gui/dialogs/event-page.c:859
+#: ../calendar/gui/dialogs/event-page.c:877
 msgid "_Delegatees"
 msgstr "ନିର�ବାଚିତ ପ�ରତିନିଧୀ (_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:879
 msgid "Atte_ndees"
 msgstr "ଶ�ରୋତା (_n)"
 
-#: ../calendar/gui/dialogs/event-page.c:1046
+#: ../calendar/gui/dialogs/event-page.c:1094
 msgid "Event with no start date"
 msgstr "ପ�ରାରମ�ଭିକ ତାରିଖ ସହିତ କୌଣସି ଘଟଣା ନାହି�"
 
-#: ../calendar/gui/dialogs/event-page.c:1049
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no end date"
 msgstr "ଅନ�ତିମ ତାରିଖ ସହିତ କୌଣସି ଘଟଣା ନାହି�"
 
-#: ../calendar/gui/dialogs/event-page.c:1218
-#: ../calendar/gui/dialogs/memo-page.c:640
-#: ../calendar/gui/dialogs/task-page.c:814
+#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/memo-page.c:657
+#: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "ପ�ରାରମ�ଭିକ ତାରିଖ ଭୂଲ ଅଟେ"
 
-#: ../calendar/gui/dialogs/event-page.c:1228
+#: ../calendar/gui/dialogs/event-page.c:1278
 msgid "End date is wrong"
 msgstr "ଅନ�ତିମ ତାରିଖ ଭୂଲ ଅଟେ"
 
-#: ../calendar/gui/dialogs/event-page.c:1251
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Start time is wrong"
 msgstr "ପ�ରାରମ�ଭିକ ସମୟ ଭୂଲ ଅଟେ"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
+#: ../calendar/gui/dialogs/event-page.c:1308
 msgid "End time is wrong"
 msgstr "ଅନ�ତିମ ସମୟ ଭୂଲ ଅଟେ"
 
-#: ../calendar/gui/dialogs/event-page.c:1421
-#: ../calendar/gui/dialogs/memo-page.c:681
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/memo-page.c:698
+#: ../calendar/gui/dialogs/task-page.c:921
 msgid "The organizer selected no longer has an account."
 msgstr "ବଚ�ଛିତ ଆୟୋଜକଙ�କର �ବେ ଆଉ ଖାତା ନାହି�।"
 
-#: ../calendar/gui/dialogs/event-page.c:1427
-#: ../calendar/gui/dialogs/memo-page.c:687
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/memo-page.c:704
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "ଗୋଟି� ଆୟୋଜକ ଆବଶ�ୟକ"
 
-#: ../calendar/gui/dialogs/event-page.c:1452
-#: ../calendar/gui/dialogs/task-page.c:904
+#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/task-page.c:951
 msgid "At least one attendee is required."
 msgstr "ଅତିକମରେ ଜଣେ ଉପସ�ଥିତ ବ�ୟକ�ତି ଆବଶ�ୟକ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1892
-#: ../calendar/gui/dialogs/task-page.c:1202
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "ଅପସାରଣ କରନ�ତ� (_R)"
-
-#: ../calendar/gui/dialogs/event-page.c:1893
-#: ../calendar/gui/dialogs/task-page.c:1203
-msgid "_Add "
-msgstr "ଯୋଗ କରନ�ତ� (_A)"
-
-#: ../calendar/gui/dialogs/event-page.c:2619
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "କ�ୟାଲେଣ�ଡର '%s'କ� ଖୋଲିବାରେ ଅସମର�ଥ।"
 
-#: ../calendar/gui/dialogs/event-page.c:2663
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1810
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:917
+#: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ଆପଣ %s ବଦଳରେ କାର�ଯ�ୟକର�ଛନ�ତି"
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "ସାକ�ଷାତକାରର %d ଦିନ ପୂର�ବେ"
-msgstr[1] "ସାକ�ଷାତକାରର %d ଦିନ ପୂର�ବେd ଦିନ ପୂର�ବର�"
+msgstr[1] "ସାକ�ଷାତକାରର %d ଦିନ ପୂର�ବେ"
 
-#: ../calendar/gui/dialogs/event-page.c:2948
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, 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:2954
+#: ../calendar/gui/dialogs/event-page.c:2949
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d ମିନିଟ ପୂର�ବର� ସାକ�ଷାତକାର"
 msgstr[1] "%d ମିନିଟ ପୂର�ବର� ସାକ�ଷାତକାର"
 
-#: ../calendar/gui/dialogs/event-page.c:2967
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "ଇଚ�ଛାରୂପଣ"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid ""
-"15 minutes before appointment\n"
-"1 hour before appointment\n"
-"1 day before appointment"
-msgstr ""
+#. Translators: "None" for "No alarm set"
+#: ../calendar/gui/dialogs/event-page.c:2964
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-alarms"
+msgid "None"
+msgstr "କିଛି ନ�ହେ�"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+#, fuzzy
+#| msgid "%d day before appointment"
+#| msgid_plural "%d days before appointment"
+msgid "1 day before appointment"
+msgstr "ସାକ�ଷାତକାରର %d ଦିନ ପୂର�ବେ"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#, fuzzy
+#| msgid "%d hour before appointment"
+#| msgid_plural "%d hours before appointment"
+msgid "1 hour before appointment"
+msgstr "ନିଯ�କ�ତି ପୂର�ବର� %d ଘଣ�ଟା"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+#, fuzzy
+#| msgid "%d minute before appointment"
+#| msgid_plural "%d minutes before appointment"
+msgid "15 minutes before appointment"
+msgstr "%d ମିନିଟ ପୂର�ବର� ସାକ�ଷାତକାର"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "ଉପସ�ଥିତ... (_n)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
-msgstr "ଶ�ରୋତା... (_s)"
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "ଉପସ�ଥିତ ବ�ୟକ�ତି"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "ସତର�କ ଧ�ବନୀକ� ଉଚ�ଛାରୂପଣ କରନ�ତ�:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "ଘଟଣା ବର�ଣ�ଣନା"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
-msgid "Su_mmary:"
-msgstr "ସାରାଂଶ (_m):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "ସତର�କ ଧ�ବନୀ (_A)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "ବର�ଣ�ଣନା (_D):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:240
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "ଅବସ�ଥାନ (_L):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#, fuzzy
+#| msgid "Summary:"
+msgid "_Summary:"
+msgstr "ସାରାଂଶ:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "ସମୟ (_T)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:193 ../mail/mail-dialogs.glade.h:21
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
-#: ../smime/gui/smime-ui.glade.h:49
-msgid ""
-"a\n"
-"b"
-msgstr ""
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#, fuzzy
+#| msgid "fourth"
+msgid "for"
+msgstr "ଚତ�ର�ଥ"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-msgid ""
-"for\n"
-"until"
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#, fuzzy
+#| msgid ""
+#| "for\n"
+#| "until"
+msgid "until"
 msgstr ""
 "ପାଇ�\n"
 "ଯେ ପର�ଯ�ଯନ�ତ"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2492
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2583
 msgid "Memo"
 msgstr "ସ�ମାରକପତ�ର"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:350
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "ମେମୋକ� ସମ�ପାଦନ କରିପାରିବେ ନାହି�, କାରଣ ବଚ�ଛିତ ମେମୋ ତାଲିକାଟି କେବଳ ପଠନୀୟ"
+
+#: ../calendar/gui/dialogs/memo-page.c:354
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "ମେମୋକ� ସମ�ପୂର�ଣ�ଣ ଭାବରେ ସମ�ପାଦନ କରିପାରିବେ ନାହି�, କାରଣ ଆପଣ ଆୟୋଜକ ନ�ହ�ନ�ତି"
+
+#: ../calendar/gui/dialogs/memo-page.c:878
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' ରେ ସ�ମାରକପତ�ରକ� ଖୋଲିବାରେ ଅସମର�ଥ।"
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1045 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "�ଠାକ�"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
 msgstr "ତାରିଖ ପ�ରାରମ�ଭ କରନ�ତ� (_r):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "ସାରାଂଶ (_m):"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "�ଠାକ� (_o):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "ସମୂହ (_G):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "ଆପଣ ଗୋଟି� ପ�ନଃପୌନିକ ଘଟଣାକ� ପରିବର�ତ�ତନ କର�ଛନ�ତି। ଆପଣ କଣ ପରିବର�ତ�ତନ କରିବାକ� ଚାହ��ଛନ�ତି?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "ଆପଣ ଗୋଟି� ପ�ନଃପୌନିକ ଘଟଣାର ପ�ରତିନିଧିତ�ତ�ୱ କର�ଛନ�ତି। ଆପଣ କଣ ପ�ରତିନିଧିତ�ତ�ୱ କରିବାକ� ଚାହ��ଛନ�ତି?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "ଆପଣ ଗୋଟି� ପ�ନଃପୌନିକ କାର�ଯ�ୟକ� ପରିବର�ତ�ତନ କର�ଛନ�ତି। ଆପଣ କଣ ପରିବର�ତ�ତନ କରିବାକ� ଚାହ��ଛନ�ତି?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "ଆପଣ ଗୋଟି� ପ�ନଃପୌନିକ ମେମୋକ� ପରିବର�ତ�ତନ କର�ଛନ�ତି। ଆପଣ କଣ ପରିବର�ତ�ତନ କରିବାକ� ଚାହ��ଛନ�ତି?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "କେବଳ �ହି ଦ�ର�ଷ�ଟାନ�ତ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "�ହା �ବଂ �ହା ପୂର�ବର ଦ�ର�ଷ�ଟାନ�ତ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "�ହା �ବଂ ଭବିଷ�ଯତ ଦ�ର�ଷ�ଟାନ�ତ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "ସମସ�ତ ଦ�ର�ଷ�ଟାନ�ତ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:559
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "�ହି ସାକ�ଷାତକାରରେ ପ�ନଃ ପ�ରତିଫଳନ ହେଉଛି ଯାହାକ�କି Evolution ସମ�ପାଦନ କରିପାରିବ ନାହି�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:888
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "ପ�ନଃପୌନିକ ତାରିଖ ଅବୈଧ ଅଟେ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "ପ�ନଃ ପ�ରତିଫଳନର ସମାପ�ତ ସମୟ ଘଟଣା ଆରମ�ଭ ହେବା ପୂର�ବର� ଥିଲା"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:957
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "ଚାଲ�"
 
@@ -5488,7 +4363,7 @@ msgstr "ଚାଲ�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "ପ�ରଥମ"
 
@@ -5497,7 +4372,7 @@ msgstr "ପ�ରଥମ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1020
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "ଦ�ବିତୀୟ"
 
@@ -5505,7 +4380,7 @@ msgstr "ଦ�ବିତୀୟ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "ତ�ର�ତୀୟ"
 
@@ -5513,21 +4388,31 @@ msgstr "ତ�ର�ତୀୟ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "ଚତ�ର�ଥ"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#, fuzzy
+#| msgid "Width"
+msgid "fifth"
+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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "ଅନ�ଯାନ�ଯ ତାରିଖ"
 
@@ -5535,7 +4420,7 @@ msgstr "ଅନ�ଯାନ�ଯ ତାରିଖ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1065
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "ପ�ରଥମର� ଦଶମ"
 
@@ -5543,7 +4428,7 @@ msgstr "ପ�ରଥମର� ଦଶମ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1071
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "�କାଦଶର� ବିଂଶତମ"
 
@@ -5551,196 +4436,263 @@ msgstr "�କାଦଶର� ବିଂଶତମ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1077
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "�କବିଂଶର� �କତିଂଶ"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1102
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "ଦିନ"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1231
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "�ହା ଉପରେ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1401
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "ଘଟଣା"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2096
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "ବ�ୟତିକ�ରମ ଯୋଗ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2137
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "ପରିବର�ତ�ତନ ପାଇ� ଗୋଟି� ଚୟନ ପାଇଲା ନାହି�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2143
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "ବ�ୟତିକ�ରମ ପରିବର�ତ�ତନ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2187
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "ଅରସାରଣ କରିବା ପାଇ� କୌଣସି ଚୟନ ପାଇଲା ନାହି�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2311
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "ଦିନ/ତାରିଖ"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>ବ�ଯତିକ�ରମ</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
-msgid "<b>Preview</b>"
-msgstr "<b>ପୂର�ବାବଲୋକନ</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Recurrence</b>"
-msgstr "<b>ପ�ନଃପୌନିକ</b>"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
 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:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+#, fuzzy
+#| msgid "<b>Exceptions</b>"
+msgid "Exceptions"
+msgstr "<b>ବ�ଯତିକ�ରମ</b>"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:85
+#, fuzzy
+#| msgid "_Preview"
+msgid "Preview"
+msgstr "ପ�ରାକ� ଦର�ଶନ (_P)"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
 msgstr "�ହି ସାକ�ଷାତକାରଟି ପ�ଣି ଘଟିଥା� (_u)"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid ""
-"day(s)\n"
-"week(s)\n"
-"month(s)\n"
-"year(s)"
-msgstr ""
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#, fuzzy
+#| msgid "Never"
+msgid "forever"
+msgstr "କେବେ ନ�ହେ�"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
-msgid ""
-"for\n"
-"until\n"
-"forever"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#, fuzzy
+#| msgid "Month"
+msgid "month(s)"
+msgstr "ମାସ"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#, fuzzy
+#| msgid "weeks"
+msgid "week(s)"
+msgstr "ସପ�ତାହ"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+msgid "year(s)"
 msgstr ""
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "�ହି ଘଟମା ସହିତ ମୋର ସତର�କ ସୂଚନା ପଠନ�ତ�"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/send-comp.c:164
+#, fuzzy
+#| msgid "Notify new messages for _Inbox only"
+msgid "Notify new attendees _only"
+msgstr "କେବଳ ନୂତନ ଅଂଶଗ�ରହଣକାରୀମାନଙ�କ� ସୂଚୀତ କରନ�ତ� (_o)"
+
+#: ../calendar/gui/dialogs/task-details-page.c:379
+#: ../calendar/gui/dialogs/task-details-page.c:399
 msgid "Completed date is wrong"
 msgstr "ସମ�ପନ�ନ ତାରିଖ ଭୂଲ ଅଟେ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "ୱେବ ପ�ର�ଷ�ଠା"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">ବିବିଧ</span>"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2663 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
+msgid "Completed"
+msgstr "ସମାପ�ତ"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">ସ�ଥିତି</span>"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:8
+msgid "High"
+msgstr "ବ�ର�ହତ"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-"Undefined"
-msgstr ""
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2660
+msgid "In Progress"
+msgstr "ପ�ରଗତି ପଥରେ"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Canceled"
-msgstr ""
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1121 ../widgets/misc/e-send-options.ui.h:9
+msgid "Low"
+msgstr "ଧୀର"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1122
+#: ../widgets/misc/e-send-options.ui.h:13
+msgid "Normal"
+msgstr "ସାଧାରଣ"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2657 ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "ପ�ରାରମ�ଭ କରାଯାଇ ନାହି�"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
 msgstr "ସମ�ପନ�ନ ପ�ରତିଶତ (_e)"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 msgid "Stat_us:"
 msgstr "ସ�ଥିତି (_u)"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/dialogs/task-details-page.ui.h:18
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:1759
+#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "ଅବସ�ଥିତି"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:24
+msgid "Undefined"
+msgstr "ଅପରିଭାଷିତ"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "ସମ�ପନ�ନ ତାରିଖ (_D):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "ଅଗ�ରାଧିକାର (_P):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "ୱେବ ପ�ର�ଷ�ଠା (_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "ସ�ଥିତି ବିବରଣୀ (_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "Click to change or view the status details of the task"
 msgstr "କାର�ଯ�ୟର ଅବସ�ଥିତି ବିବରଣୀକ� ପରିବର�ତ�ତନ କରିବାକ� ଅଥବା ଦେଖିବା ପାଇ� କ�ଲିକ କରନ�ତ�"
 
-#: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:371
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "ପଠାଯାଇଥିବା ବିକଳ�ପଗ�ଡ଼ିକ (_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "_Task"
 msgstr "କାର�ଯ�ଯ (_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:325
 msgid "Task Details"
 msgstr "କାର�ଯ�ଯ ବିବରଣୀ"
 
-#: ../calendar/gui/dialogs/task-page.c:373
-#: ../calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "କାର�ଯ�ୟକ� ସମ�ପାଦନ କରିପାରିବେ ନାହି�, କାରଣ ବଚ�ଛିତ କାର�ଯ�ୟ ତାଲିକାଟି କେବଳ ପଠନୀୟ"
+
+#: ../calendar/gui/dialogs/task-page.c:340
+#, fuzzy
+#| msgid ""
+#| "This message cannot be sent because you have not specified any recipients"
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "�ହି କାର�ଯ�ୟକ� ସମ�ପୂର�ଣ�ଣ ଭାବରେ ସମ�ପାଦନ କରିପାରିବେ ନାହି�, କାରଣ ଆପଣ ଆୟୋଜକ ନ�ହ�ନ�ତି"
+
+#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "ସଙ�ଗଠକ (_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:787
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ତାରିଖ ଭୂଲ ଅଟେ"
 
-#: ../calendar/gui/dialogs/task-page.c:1767
+#: ../calendar/gui/dialogs/task-page.c:1700
 #, c-format
 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
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "ବିଭାଗ... (_i)"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "ଦେୟ ତାରିଖ (_u):"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:7
 msgid "Time zone:"
 msgstr "ସମୟ ମଣ�ଡଳ:"
 
@@ -5820,161 +4772,84 @@ msgstr "%s %s ରେ"
 msgid "%s for an unknown trigger type"
 msgstr "ଗୋଟି� ଅଜଣା ଟ�ରିଗର ପ�ରକାର ପାଇ� %s"
 
-#: ../calendar/gui/e-attachment-handler-calendar.c:258
-msgid "I_mport"
-msgstr "ଆମଦାନୀ କରନ�ତ� (_m)"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:340
-msgid "Select a Calendar"
-msgstr "ଗୋଟି� କ�ଯାଲେଣ�ଡର ବାଛନ�ତ�"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:367
-msgid "Select a Task List"
-msgstr "ଗୋଟି� କାର�ଯ�ୟସୂଚୀ ବାଛନ�ତ�"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:377
-msgid "I_mport to Calendar"
-msgstr "କ�ଯାଲେଣ�ଡର ମଧ�ଯକ� ଆମଦାନୀ କରନ�ତ� (_m)"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:384
-msgid "I_mport to Tasks"
-msgstr "କାର�ଯ�ୟଗ�ଡ଼ିକ ମଧ�ଯକ� ଆମଦାନୀ କରନ�ତ� (_m)"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3214
-#, c-format
-msgid "Click to open %s"
-msgstr "%s କ� ଖୋଲିବା ପାଇ� ଦବାନ�ତ�"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:859
+#: ../calendar/gui/e-cal-component-preview.c:191 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "ଶୀର�ଷକ ବିହୀନ"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
-msgid "Start Date:"
-msgstr "ପ�ରାରମ�ଭିକ ତାରିଖ:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
-#: ../calendar/gui/e-cal-component-preview.c:287
-#: ../calendar/gui/e-itip-control.c:1211
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
-msgid "Description:"
-msgstr "ବର�ଣ�ଣନା:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
-#: ../calendar/gui/e-cal-component-preview.c:311
-msgid "Web Page:"
-msgstr "ୱେବ ପ�ର�ଷ�ଠା:"
+#: ../calendar/gui/e-cal-component-preview.c:197
+#, fuzzy
+#| msgid "Categories"
+msgid "Categories:"
+msgstr "ବିଭାଗ"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1155
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "ସାରାଂଶ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:258
+msgid "Start Date:"
+msgstr "ପ�ରାରମ�ଭିକ ତାରିଖ:"
+
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ତାରିଖ:"
 
-#. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1179
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1055
+#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "ଅବସ�ଥିତି:"
 
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/print.c:2565
-msgid "In Progress"
-msgstr "ପ�ରଗତି ପଥରେ"
-
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/e-itip-control.c:939
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2568 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-msgid "Completed"
-msgstr "ସମାପ�ତ"
-
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:231
-#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2562
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "ପ�ରାରମ�ଭ କରାଯାଇ ନାହି�"
-
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "ଅଗ�ରାଧିକାର:"
 
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:586 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-msgid "High"
-msgstr "ବ�ର�ହତ"
-
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1058 ../calendar/gui/e-calendar-table.c:587
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-msgid "Normal"
-msgstr "ସାଧାରଣ"
+#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:35
+msgid "Description:"
+msgstr "ବର�ଣ�ଣନା:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-msgid "Low"
-msgstr "ଧୀର"
+#: ../calendar/gui/e-cal-component-preview.c:367
+msgid "Web Page:"
+msgstr "ୱେବ ପ�ର�ଷ�ଠା:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Created"
 msgstr "ସୃଷ�ଟିହୋଇଥିବା"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "ସମାପ�ତ ତାରିଖ"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "ଶେଷଥର ପରିବର�ତ�ତିତ"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "ପ�ରାରମ�ଭିକ ତାରିଖ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:638
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "ମ�କ�ତ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:639
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "ବ�ଯସ�ତ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5984,209 +4859,65 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:709
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "କିଛି ନ�ହେ�"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ହ�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../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:354 ../calendar/gui/e-itip-control.c:1196
-#: ../calendar/gui/e-itip-control.c:1336
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:448
-#: ../plugins/itip-formatter/itip-formatter.c:2217
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "ଅଜଣା"
 
-#: ../calendar/gui/e-cal-model.c:1060
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "ପ�ନଃପୌନିକ"
 
-#: ../calendar/gui/e-cal-model.c:1062
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "ନ�ଯସ�ତ"
 
-#: ../calendar/gui/e-calendar-table.c:334
-msgid "* No Summary *"
-msgstr "* କୌଣସି ସାରାଂଶ ନାହି� *"
-
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:370
-#: ../calendar/gui/e-calendar-view.c:2436
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
-msgid "Organizer: %s <%s>"
-msgstr "ସଙ�ଗଠକ: %s <%s>"
-
-#. With SunOne accounts, there may be no ':' in organiser.value
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2440
-#, c-format
-msgid "Organizer: %s"
-msgstr "ସଙ�ଗଠକ: %s"
-
-#: ../calendar/gui/e-calendar-table.c:404
-msgid "Start: "
-msgstr "ଆରମ�ଭ:"
-
-#: ../calendar/gui/e-calendar-table.c:416
-msgid "Due: "
-msgstr "ଦୋୟ: "
-
-#: ../calendar/gui/e-calendar-table.c:589 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "ଅପରିଭାଷିତ"
-
-#: ../calendar/gui/e-calendar-table.c:608
-msgid "0%"
-msgstr "à­¦%"
-
-#: ../calendar/gui/e-calendar-table.c:609
-msgid "10%"
-msgstr "୧୦%"
-
-#: ../calendar/gui/e-calendar-table.c:610
-msgid "20%"
-msgstr "୨୦%"
-
-#: ../calendar/gui/e-calendar-table.c:611
-msgid "30%"
-msgstr "à­©à­¦%"
-
-#: ../calendar/gui/e-calendar-table.c:612
-msgid "40%"
-msgstr "୪୦%"
-
-#: ../calendar/gui/e-calendar-table.c:613
-msgid "50%"
-msgstr "à­«à­¦%"
-
-#: ../calendar/gui/e-calendar-table.c:614
-msgid "60%"
-msgstr "୬୦%"
-
-#: ../calendar/gui/e-calendar-table.c:615
-msgid "70%"
-msgstr "à­­à­¦%"
-
-#: ../calendar/gui/e-calendar-table.c:616
-msgid "80%"
-msgstr "୮୦%"
-
-#: ../calendar/gui/e-calendar-table.c:617
-msgid "90%"
-msgstr "୯୦%"
-
-#: ../calendar/gui/e-calendar-table.c:618
-msgid "100%"
-msgstr "୧୦୦%"
-
-#: ../calendar/gui/e-calendar-table.c:898
-#: ../calendar/gui/e-calendar-view.c:658 ../calendar/gui/e-memo-table.c:450
-msgid "Deleting selected objects"
-msgstr "ଚୟିତ ବସ�ତ� ମାନଙ�କ� ଅପସାରିଥ କର�ଅଛି"
-
-#: ../calendar/gui/e-calendar-table.c:1177
-#: ../calendar/gui/e-calendar-view.c:872 ../calendar/gui/e-memo-table.c:655
-msgid "Updating objects"
-msgstr "ବସ�ତ� ମାନଙ�କ� ଅଦ�ଯତିତ କର�ଅଛି"
-
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1334 ../calendar/gui/e-memo-table.c:831
-#: ../composer/e-composer-actions.c:219
-msgid "Save as..."
-msgstr "�ପରି ଭାବରେ ସଂରକ�ଷିତ କରନ�ତ�..."
-
-#: ../calendar/gui/e-calendar-table.c:1589
-#: ../calendar/gui/e-calendar-view.c:1794
-msgid "New _Task"
-msgstr "ନୂତନ କାର�ଯ�ଯ (_T)"
-
-#: ../calendar/gui/e-calendar-table.c:1593 ../calendar/gui/e-memo-table.c:936
-msgid "Open _Web Page"
-msgstr "ୱେବ ପ�ର�ଷ�ଠାକ� ଖୋଲନ�ତ� (_W)"
-
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:937
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:494
-msgid "_Save As..."
-msgstr "�ପରି ଭାବରେ ସଂରକ�ଷିତ କରନ�ତ�... (_S)"
-
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:938
-msgid "P_rint..."
-msgstr "ମୂଦ�ରଣ କରନ�ତ� (_r)..."
-
-#: ../calendar/gui/e-calendar-table.c:1599
-#: ../calendar/gui/e-calendar-view.c:1817 ../calendar/gui/e-memo-table.c:942
-#: ../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:1601
-#: ../calendar/gui/e-calendar-view.c:1800
-#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
-msgid "_Paste"
-msgstr "ଲଗାନ�ତ� (_P)"
-
-#: ../calendar/gui/e-calendar-table.c:1605 ../ui/evolution-tasks.xml.h:22
-msgid "_Assign Task"
-msgstr "କାର�ଯ�ଯ ନ�ଯସ�ତ କରନ�ତ� (_A)"
-
-#: ../calendar/gui/e-calendar-table.c:1606 ../calendar/gui/e-memo-table.c:948
-#: ../ui/evolution-tasks.xml.h:26
-msgid "_Forward as iCalendar"
-msgstr "iCalendar ଭାବରେ ଅଗ�ରସରିତ କରନ�ତ� (_F)"
-
-#: ../calendar/gui/e-calendar-table.c:1607
-msgid "_Mark as Complete"
-msgstr "ସମ�ପୂର�ଣ�ଣ ବୋଲି ଘୋଷିତ କରନ�ତ� (_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1608
-msgid "_Mark Selected Tasks as Complete"
-msgstr "ଚୟିତ କାର�ଯ�ଯକ� ବୋଲି ଘୋଷିତ କରନ�ତ� (_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1609
-msgid "_Mark as Incomplete"
-msgstr "ଅସମ�ପୂର�ଣ�ଣ ବୋଲି ଘୋଷିତ କରନ�ତ� (_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1610
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "ଚୟିତ କାର�ଯ�ଯକ� ସମ�ପୂର�ଣ�ଣ ବୋଲି ଘୋଷିତ କରନ�ତ� (_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1615
-msgid "_Delete Selected Tasks"
-msgstr "ଚୟିତ କାର�ଯ�ଯକ� ଅପସାରଣ କରନ�ତ� (_D)"
-
-#: ../calendar/gui/e-calendar-table.c:1852
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "ଗୋଟି� କାର�ଯ�ଯକ� ଯୋଗ କରିବା ପାଇ� ଦବାନ�ତ�"
+msgid "Opening %s"
+msgstr "%s କ� ଖୋଲ�ଅଛି"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% ସମାପ�ତ"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "ଗୋଟି� କାର�ଯ�ଯକ� ଯୋଗ କରିବା ପାଇ� ଦବାନ�ତ�"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "ସମାପ�ତ"
@@ -6201,7 +4932,7 @@ msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ତାରିଖ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Priority"
 msgstr "ଅଗ�ରାଧିକାର"
 
@@ -6209,153 +4940,121 @@ msgstr "ଅଗ�ରାଧିକାର"
 msgid "Start date"
 msgstr "ପ�ରାରମ�ଭିକ ତାରିଖ"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/e-meeting-list-view.c:604
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "ଅବସ�ଥିତି"
-
-#: ../calendar/gui/e-calendar-view.c:1480
-msgid "Moving items"
-msgstr "ବସ�ତ� ମାନଙ�କ� ସ�ଥାନାନ�ତରିତ କର�ଅଛି"
-
-#: ../calendar/gui/e-calendar-view.c:1482
-msgid "Copying items"
-msgstr "ବସ�ତ� ମାନଙ�କ� ନକଲ କର�ଅଛି"
-
-#: ../calendar/gui/e-calendar-view.c:1791
-msgid "New _Appointment..."
-msgstr "ନୂତନ ସାକ�ଷାତକାର... (_A)"
-
-#: ../calendar/gui/e-calendar-view.c:1792
-msgid "New All Day _Event"
-msgstr "ନୂତନ ସମଗ�ର ଦିବସ ଘଟଣା (_E)"
-
-#: ../calendar/gui/e-calendar-view.c:1793
-msgid "New _Meeting"
-msgstr "ନୂତନ ସଭା (_M)"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1804
-msgid "_Current View"
-msgstr "ସାମ�ପ�ରତିକ ଦ�ର�ଶ�ଯ (_C)"
-
-#: ../calendar/gui/e-calendar-view.c:1806
-msgid "Select T_oday"
-msgstr "ଅଜିର ତାରିଖ ଚୟନ କରନ�ତ� (_o)"
-
-#: ../calendar/gui/e-calendar-view.c:1807
-msgid "_Select Date..."
-msgstr "ତାରିଖ ଚୟନ କରନ�ତ�... (_S)"
-
-#: ../calendar/gui/e-calendar-view.c:1813
-msgid "Pri_nt..."
-msgstr "ମୂଦ�ରଣ କରନ�ତ� (_n)..."
-
-#: ../calendar/gui/e-calendar-view.c:1823
-msgid "Cop_y to Calendar..."
-msgstr "କ�ଯାଲେଣ�ଡରକ� ନକଲ କରନ�ତ�... (_y)"
-
-#: ../calendar/gui/e-calendar-view.c:1824
-msgid "Mo_ve to Calendar..."
-msgstr "କ�ଯାଲେଣ�ଡରକ� ସ�ଥାନାନ�ତରିତ କରନ�ତ�... (_v)"
-
-#: ../calendar/gui/e-calendar-view.c:1825
-msgid "_Delegate Meeting..."
-msgstr "ନିର�ବାଚିତ ପ�ରାର�ଥୀ ମାନଙ�କର ସଭା... (_D)"
-
-#: ../calendar/gui/e-calendar-view.c:1826
-msgid "_Schedule Meeting..."
-msgstr "ସଭାର ଅନ�ସୂଚୀ ସ�ଥିର କରନ�ତ�... (_S)"
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
+msgid "Type"
+msgstr "ପ�ରକାର"
 
-#: ../calendar/gui/e-calendar-view.c:1827
-msgid "_Forward as iCalendar..."
-msgstr "iCalendar ଭାବରେ ଅଗ�ରସରିତ କରନ�ତ�... (_F)"
+#: ../calendar/gui/e-calendar-view.c:404
+#, fuzzy
+#| msgid "Cut selected text to the clipboard"
+msgid "Cut selected events to the clipboard"
+msgstr "କ�ଲିପବୋର�ଡରେ ବଚ�ଛିତ ପାଠ�ୟକ� କାଟନ�ତ�"
 
-#: ../calendar/gui/e-calendar-view.c:1828
-msgid "_Reply"
-msgstr "ଉତ�ତର ଦିଅନ�ତ� (_R)"
+#: ../calendar/gui/e-calendar-view.c:410
+#, fuzzy
+#| msgid "Copy selected text to the clipboard"
+msgid "Copy selected events to the clipboard"
+msgstr "କ�ଲିପବୋର�ଡରେ ବଚ�ଛିତ ପାଠ�ୟକ� ନକଲ କରନ�ତ�"
 
-#: ../calendar/gui/e-calendar-view.c:1829
-#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1331
-#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
-msgid "Reply to _All"
-msgstr "ସମସ�ତଙ�କ� ଉତ�ତର ଦିଅନ�ତ� (_A)"
+#: ../calendar/gui/e-calendar-view.c:416
+#, fuzzy
+#| msgid "Paste text from the clipboard"
+msgid "Paste events from the clipboard"
+msgstr "କ�ଲିପବୋର�ଡର� ପାଠ�ୟ ଲଗାନ�ତ�"
 
-#: ../calendar/gui/e-calendar-view.c:1834
-msgid "Make this Occurrence _Movable"
-msgstr "�ହି ଘଟଣାକ� ଗତିଶୀଳ ଭାବରେ ଚିହ�ନିତ କରନ�ତ� (_M)"
+#: ../calendar/gui/e-calendar-view.c:422
+#, fuzzy
+#| msgid "Delete selected memos"
+msgid "Delete selected events"
+msgstr "ଚୟିତ ସ�ମାରକପତ�ରଗ�ଡ଼ିକ� ବିଲୋପ କରନ�ତ�"
 
-#: ../calendar/gui/e-calendar-view.c:1835 ../ui/evolution-calendar.xml.h:9
-msgid "Delete this _Occurrence"
-msgstr "�ହି ଘଟଣାକ� ଅପସାରିତ କରନ�ତ� (_O)"
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
+msgid "Deleting selected objects"
+msgstr "ଚୟିତ ବସ�ତ� ମାନଙ�କ� ଅପସାରିଥ କର�ଅଛି"
 
-#: ../calendar/gui/e-calendar-view.c:1836
-msgid "Delete _All Occurrences"
-msgstr "ସମସ�ତ ଘଟଣାକ� ଅପସାରିତ କରନ�ତ� (_A)"
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
+msgid "Updating objects"
+msgstr "ବସ�ତ� ମାନଙ�କ� ଅଦ�ଯତିତ କର�ଅଛି"
 
-#: ../calendar/gui/e-calendar-view.c:2291
-#: ../calendar/gui/e-itip-control.c:1184
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2205
+#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2330
 msgid "Accepted"
 msgstr "ସ�ବୀକୃତ"
 
-#: ../calendar/gui/e-calendar-view.c:2292
-#: ../calendar/gui/e-itip-control.c:1192
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2211
+#: ../calendar/gui/e-calendar-view.c:1707
+#: ../calendar/gui/e-itip-control.c:1205
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2336
 msgid "Declined"
 msgstr "ଅସ�ବୀକୃତ"
 
-#: ../calendar/gui/e-calendar-view.c:2293
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:396
+#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "ଚେଷ�ଟାକୃତ"
 
-#: ../calendar/gui/e-calendar-view.c:2294
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2214
+#: ../calendar/gui/e-calendar-view.c:1709
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "Delegated"
 msgstr "ପ�ରତିନିଧିତ�ତ�ୱ"
 
-#: ../calendar/gui/e-calendar-view.c:2295
+#: ../calendar/gui/e-calendar-view.c:1710
 msgid "Needs action"
 msgstr "କାର�ଯ�ଯ କରିବା ଆବଶ�ୟକ"
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "ସଙ�ଗଠକ: %s <%s>"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:1856 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
+#, c-format
+msgid "Organizer: %s"
+msgstr "ସଙ�ଗଠକ: %s"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2456 ../calendar/gui/print.c:2524
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/print.c:2615
 #, c-format
 msgid "Location: %s"
 msgstr "ଅବସ�ଥାନ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2487
+#: ../calendar/gui/e-calendar-view.c:1903
 #, c-format
 msgid "Time: %s %s"
 msgstr "ସମୟ: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:171
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6368,12 +5067,12 @@ 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:751
+#: ../calendar/gui/e-day-view-time-item.c:759
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i ମିନିଟ ବିଭାଜନ"
 
-#: ../calendar/gui/e-day-view-time-item.c:772
+#: ../calendar/gui/e-day-view-time-item.c:780
 msgid "Show the second time zone"
 msgstr "ଦ�ୱିତିୟ ସମୟ ମଣ�ଡଳ ଦର�ଶାନ�ତ�"
 
@@ -6383,48 +5082,79 @@ msgstr "ଦ�ୱିତିୟ ସମୟ ମଣ�ଡଳ ଦର�ଶାନ�ତ
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1581
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1681
+#: ../calendar/gui/e-day-view-top-item.c:865 ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:869 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:913
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:873 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../modules/calendar/e-cal-shell-view-private.c:949
+msgid "%d %b"
+msgstr "%d %b"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:804 ../calendar/gui/e-week-view.c:542
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
+#: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "ପୂର�ବାହ�ନ"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:807 ../calendar/gui/e-week-view.c:545
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
+#: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "ଅପରାହ�ନ"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2320
+#: ../calendar/gui/e-day-view.c:2609
 #, c-format
 msgid "Week %d"
 msgstr "ସପ�ତାହ %d"
 
-#: ../calendar/gui/e-itip-control.c:758
+#: ../calendar/gui/e-itip-control.c:761
+#, fuzzy
+#| msgid "Recurring"
+msgid "Recurring:"
+msgstr "ପ�ନଃପୌନିକ"
+
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "ହ�। (ଜଟିଳ ଆବ�ର�ତି)"
 
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "ପ�ରତି ଦିନ"
 msgstr[1] "ପ�ରତି %d ଦିନ"
 
-#: ../calendar/gui/e-itip-control.c:788
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "ପ�ରତି ସପ�ତାହ"
 msgstr[1] "ପ�ରତି %d ସପ�ତାହ"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -6432,35 +5162,35 @@ msgstr[0] "ପ�ରତି ସପ�ତାହରେ"
 msgstr[1] "ପ�ରତି %d ସପ�ତାହରେ"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " �ବଂ "
 
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "�ହାର %s ଦିନ"
 
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "�ହାର %s %s"
 
-#: ../calendar/gui/e-itip-control.c:842
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ପ�ରତି ମାସ"
 msgstr[1] "ପ�ରତି %d ମାସ"
 
-#: ../calendar/gui/e-itip-control.c:854
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ପ�ରତି ବର�ଷ"
 msgstr[1] "ପ�ରତି %d ବର�ଷ"
 
-#: ../calendar/gui/e-itip-control.c:867
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -6468,441 +5198,468 @@ msgstr[0] "%d ସମୟର ଗୋଟି� ସମଷ�ଟି"
 msgstr[1] "%d ସମୟର ଗୋଟି� ସମଷ�ଟି"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:878
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", �ହି ଦିନରେ ସମାପ�ତ ହେବ"
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:900
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:906
 msgid "Starts"
 msgstr "ପ�ରାରମ�ଭ ହୋଇଥା�"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:914
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "ସମାପ�ତ ହ��"
 
-#: ../calendar/gui/e-itip-control.c:954
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:943
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
 msgstr "ଅନ�ତିମ ଦିବସ"
 
-#: ../calendar/gui/e-itip-control.c:996 ../calendar/gui/e-itip-control.c:1053
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "ଆଇ-କ�ଯାଲେଣ�ଡର ସୂଚନା"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1013
+#: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Error"
 msgstr "ଆଇ-କ�ଯାଲେଣ�ଡର ତୃଟି"
 
-#: ../calendar/gui/e-itip-control.c:1085 ../calendar/gui/e-itip-control.c:1101
-#: ../calendar/gui/e-itip-control.c:1112 ../calendar/gui/e-itip-control.c:1129
-#: ../plugins/itip-formatter/itip-view.c:346
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:434
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
-#: ../plugins/itip-formatter/itip-view.c:523
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "ଜଣେ ଅଜ�ଞାତ ବ�ଯକ�ତି"
 
-#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1145
+#, fuzzy
+#| msgid ""
+#| "<br> Please review the following information, and then select an action "
+#| "from the menu below."
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+"Please review the following information, and then select an action from the "
+"menu below."
 msgstr "<br> ଦୟାକରି ନିମ�ନଲିଖିତ ସୂଚନା, �ବଂ ତାପରେ ନିମ�ନ ତାଲିକାର� ଗୋଟି� କାର�ଯ�ୟ ମନୋନୀତ କରନ�ତ�।"
 
-#: ../calendar/gui/e-itip-control.c:1188
-#: ../plugins/itip-formatter/itip-formatter.c:2208
+#. Translators: "None" used as a default value for events without Summary received by mail
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2317
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-itip"
+msgid "None"
+msgstr "କିଛି ନ�ହେ�"
+
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2333
 msgid "Tentatively Accepted"
 msgstr "ସାମୟିକଭାବେ ସ�ବୀକୃତ"
 
-#: ../calendar/gui/e-itip-control.c:1276
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "ସାକ�ଷାତକାରଟି ବାତିଲ ହୋଇଯାଇଛି, ଯଦିଚ �ହା ଆପଣଙ�କ କ�ୟାଲେଣ�ଡରରେ ମିଳ�ନାହି�"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1292
 msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "କାର�ଯ�ୟଟି ବାତିଲ ହୋଇଯାଇଛି, ଯଦିଚ �ହା ଆପଣଙ�କ କାର�ଯ�ୟ ତାଲିକା ମିଳ�ନାହି�"
 
-#: ../calendar/gui/e-itip-control.c:1356
-#, c-format
-msgid "<b>%s</b> has published meeting information."
+#: ../calendar/gui/e-itip-control.c:1369
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published meeting information."
+msgid "%s has published meeting information."
 msgstr "<b>%s</b> ନିକଟରେ ପ�ରକାଶିତ ସଭା ସୂଚନା ଅଛି।"
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "ସଭା ସୂଚନା"
 
-#: ../calendar/gui/e-itip-control.c:1363
-#, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
+#: ../calendar/gui/e-itip-control.c:1376
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgid "%s requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ଗୋଟି� ସଭାରେ %s ର ଉପସ�ଥିତି ପାଇ� ନିବେଦନ କରିଥା�।"
 
-#: ../calendar/gui/e-itip-control.c:1365
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
+#: ../calendar/gui/e-itip-control.c:1378
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests your presence at a meeting."
+msgid "%s requests your presence at a meeting."
 msgstr "<b>%s</b> ସଭାରେ ଆପଣଙ�କ ଉପସ�ଥିତ ପାଇ� ନିବେଦନ କରିଅଛି।"
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "ସାକ�ଷାତକାର ପ�ରସ�ତାବ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
-#, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
+#: ../calendar/gui/e-itip-control.c:1385
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgid "%s wishes to be added to an existing meeting."
 msgstr "<b>%s</b> ଗୋଟି� ଚାଲ�ଥିବା ସଭାରେ ଯୋଗ ଦେବା ପାଇ� ଇଚ�ଛାପ�ରକାଶ କର�ଅଛି।"
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "ସାକ�ଷାତକାର ଅଦ�ଯତନ"
 
-#: ../calendar/gui/e-itip-control.c:1377
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
+#: ../calendar/gui/e-itip-control.c:1390
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgid "%s wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ନୂତନତମ ସାକ�ଷାତ ସୂଚନା ଗ�ରହଣ କରିବା ପାଇ� ଇଚ�ଛାପ�ରକାଶ କର�ଛନ�ତି।"
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "ସାକ�ଷାତକାର ଅଦ�ଯତନ ଅନ�ରୋଧ"
 
-#: ../calendar/gui/e-itip-control.c:1385
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
+#: ../calendar/gui/e-itip-control.c:1398
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has replied to a meeting request."
+msgid "%s has replied to a meeting request."
 msgstr "<b>%s</b> ଗୋଟି� ସାକ�ଷାତ ଅନ�ରୋଧକ� ଉତ�ତର ଦିଆହୋଇଛି।"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "ସାକ�ଷାତକାର ଉତ�ତର"
 
-#: ../calendar/gui/e-itip-control.c:1393
-#, c-format
-msgid "<b>%s</b> has canceled a meeting."
+#: ../calendar/gui/e-itip-control.c:1406
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled a meeting."
+msgid "%s has canceled a meeting."
 msgstr "<b>%s</b> ଗୋଟି� ସାକ�ଷାତକ� ବାତିଲ କରିଛନ�ତି।"
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "ସାକ�ଷାତ ବାତିଲ ହୋଇଛି"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has sent an unintelligible message."
+msgid "%s has sent an unintelligible message."
 msgstr "<b>%s</b> ଗୋଟି� ଅଜ�ଞାତ ସନ�ଦେଶ ପଠାଇଛି।"
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "ଖରାପ ସାକ�ଷାତ ସନ�ଦେଶ"
 
-#: ../calendar/gui/e-itip-control.c:1432
-#, c-format
-msgid "<b>%s</b> has published task information."
+#: ../calendar/gui/e-itip-control.c:1445
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published task information."
+msgid "%s has published task information."
 msgstr "<b>%s</b> କାର�ଯ�ୟ ସୂଚନା ପ�ରକାଶ କରିଅଛି।"
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "କାର�ଯ�ୟ ସୂଚନା"
 
-#: ../calendar/gui/e-itip-control.c:1440
-#, c-format
-msgid "<b>%s</b> requests %s to perform a task."
+#: ../calendar/gui/e-itip-control.c:1453
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests %s to perform a task."
+msgid "%s requests %s to perform a task."
 msgstr "<b>%s</b> କାର�ଯ�ୟ କରିବା ପାଇ� %s କ� ଅନ�ରୋଧ କରନ�ତ�।"
 
-#: ../calendar/gui/e-itip-control.c:1442
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
+#: ../calendar/gui/e-itip-control.c:1455
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests you perform a task."
+msgid "%s requests you perform a task."
 msgstr "<b>%s</b> କାର�ଯ�ୟ କରିବା ପାଇ� ଅନ�ରୋଧ କରନ�ତ�।"
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "କାର�ଯ�ୟ ପ�ରସ�ତାବ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
-#, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
+#: ../calendar/gui/e-itip-control.c:1462
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to be added to an existing task."
+msgid "%s wishes to be added to an existing task."
 msgstr "<b>%s</b> ଗୋଟି� ଚାଲ�ଥିବା ସଭାରେ ଯୋଗ ଦେବା ପାଇ� ଇଚ�ଛାପ�ରକାଶ କର�ଅଛି।"
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "କାର�ଯ�ୟ ଅଦ�ୟତନ"
 
-#: ../calendar/gui/e-itip-control.c:1454
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
+#: ../calendar/gui/e-itip-control.c:1467
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to receive the latest task information."
+msgid "%s wishes to receive the latest task information."
 msgstr "<b>%s</b> ନୂନତତମ କାର�ଯ�ୟ ସୂଚନା ଗ�ରହଣ କରିବାକ� ଇଚ�ଛାପ�ରକାଶ କର�ଅଛି।"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "କାର�ଯ�ୟ ଅଦ�ୟତନ ଅନ�ରୋଧ"
 
-#: ../calendar/gui/e-itip-control.c:1462
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
+#: ../calendar/gui/e-itip-control.c:1475
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has replied to a task assignment."
+msgid "%s has replied to a task assignment."
 msgstr "<b>%s</b> ଗୋଟି� ନ�ୟସ�ତ କାର�ଯ�ୟଭାରକ� ଉତ�ତର ଦେଇଅଛି।"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "କାର�ୟ�ୟ ଉତ�ତର"
 
-#: ../calendar/gui/e-itip-control.c:1470
-#, c-format
-msgid "<b>%s</b> has canceled a task."
+#: ../calendar/gui/e-itip-control.c:1483
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled a task."
+msgid "%s has canceled a task."
 msgstr "<b>%s</b> ରେ ବାତିଲ ହୋଇଥିବା କାର�ଯ�ୟ ଅଛି।"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "କାର�ୟ�ୟ ବାତିଲ ହୋଇଛି"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "ଖରାପ କାର�ଯ�ୟ ସନ�ଦେଶ"
 
-#: ../calendar/gui/e-itip-control.c:1506
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
+#: ../calendar/gui/e-itip-control.c:1519
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published free/busy information."
+msgid "%s has published free/busy information."
 msgstr "<b>%s</b> ମ�କ�ତ/ବ�ୟସ�ତ ସୂଚନା ପ�ରକାଶ କରିସାରିଛି।"
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "ମ�କ�ତ/ବ�ଯସ�ତ ସୂଚନା"
 
-#: ../calendar/gui/e-itip-control.c:1511
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
+#: ../calendar/gui/e-itip-control.c:1524
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests your free/busy information."
+msgid "%s requests your free/busy information."
 msgstr "<b>%s</b>ଆପଣଙ�କର ମ�କ�ତ/ବ�ୟସ�ତ ସୂଚନା ଅନ�ରୋଧ କରନ�ତ�।"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "ମ�କ�ତ/ବ�ଯସ�ତ ଅନ�ରୋଧ"
 
-#: ../calendar/gui/e-itip-control.c:1516
-#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
+#: ../calendar/gui/e-itip-control.c:1529
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has replied to a free/busy request."
+msgid "%s has replied to a free/busy request."
 msgstr "<b>%s</b>ଆପଣଙ�କର ମ�କ�ତ/ବ�ୟସ�ତ ସୂଚନା ଅନ�ରୋଧର ଉତ�ତର ଦେଇଛି।"
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "ମ�କ�ତ/ବ�ଯସ�ତ ଉତ�ତର"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "ଖରାପ ମ�କ�ତ/ବ�ଯସ�ତ ସନ�ଦେଶ"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "ସନ�ଦେଶଟି ସଠିକ ଭାବରେ ସଜ�ଜିକରଣ ହୋଇଥିବା ପରି ଦୃଶ�ୟମାନ ହେଉନାହି�"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "�ହି ସନ�ଦେଶ କେବଳ ଅସମର�ଥିତ ଅନ�ରୋଧ ଧାରଣ କରିଥା�।"
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "ସଂଲଗ�ନକ ବୈଧ କାଲେଣ�ଡର ସନ�ଦେଶ ଧାରଣ କରିନଥା�"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "ସଂଲଗ�ନକରେ ଦୃଶ�ୟମାନ କାଲେଣ�ଡର ବସ�ତ�ଗ�ଡ଼ିକ ନାହି�"
 
-#: ../calendar/gui/e-itip-control.c:1973
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "ଅଦ�ୟତନ ସମ�ପୂର�ଣ�ଣ ହୋଇଛି\n"
 
-#: ../calendar/gui/e-itip-control.c:2007
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ବସ�ତ�ଟି ଅବୈଧ ଅଟେ �ବଂ �ହାକ� ଅଦ�ୟତନ କରାଯାଇପାରିବ ନାହି�\n"
 
-#: ../calendar/gui/e-itip-control.c:2024
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "�ହି ଉତ�ତରଟି ଜଣେ ପ�ରଚଳିତ ଅଂଶଗ�ରହଣକାରୀଙ�କ ପାଖର� ଆସିନାହି�।  ଅଂଶଗ�ରହଣକାରୀ ଭାବରେ ଯୋଗକରିବେ କି?"
 
-#: ../calendar/gui/e-itip-control.c:2042
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "ଗୋଟି� ଅବୈଧ ସ�ଥିତି ହେତ� ଅଂଶଗ�ରହଣକାରୀ ସ�ଥିତିକ� ଅଦ�ୟତନ କରାଯାଇପାରିଲା ନାହି�!\n"
 
-#: ../calendar/gui/e-itip-control.c:2066
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "ଶ�ରୋତା ସ�ଥିତି ଅଦ�ୟତନ\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../calendar/gui/e-itip-control.c:2084
+#: ../plugins/itip-formatter/itip-formatter.c:1420
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ବସ�ତ�ଟି �ବେ ଅବସ�ଥିତ ନଥିବା ହେତ� ଅଂଶଗ�ରହଣକାରୀ ସ�ଥିତିକ� ଅଦ�ୟତନ କରାଯାଇପାରିଲା ନାହି�"
 
-#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2161
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "ବସ�ତ� ପଠାଯାଇଛି!\n"
 
-#: ../calendar/gui/e-itip-control.c:2110 ../calendar/gui/e-itip-control.c:2169
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "ବସ�ତ�କ� ପଠାଯାଇପାରିବ ନାହି�!\n"
 
-#: ../calendar/gui/e-itip-control.c:2287
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "ଗୋଟି� କାର�ଯ�ୟ ବାଛନ�ତ�:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2316
-#: ../calendar/gui/e-meeting-list-view.c:592
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "ଅପଡେଟ କର"
 
-#: ../calendar/gui/e-itip-control.c:2380
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2366
+#: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "ଗ�ରହଣକର"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "ଅସ�ଥାୟୀ ଭାବରେ ଗ�ରହଣ କରାଯାଇଛି"
 
-#: ../calendar/gui/e-itip-control.c:2382
-#: ../plugins/groupwise-features/process-meeting.c:55
+#: ../calendar/gui/e-itip-control.c:2368
+#: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "ହ�ରାସ କର"
 
-#: ../calendar/gui/e-itip-control.c:2407
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "ମ�କ�ତ/ବ�ଯସ�ତ ସୂଚନା ପଠାନ�ତ�"
 
-#: ../calendar/gui/e-itip-control.c:2431
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "ଅଦ�ୟତନ ଉତ�ତରଦାତା ସ�ଥିତି"
 
-#: ../calendar/gui/e-itip-control.c:2455
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "ନୂତନ ସୂଚନା ପଠାନ�ତ�"
 
-#: ../calendar/gui/e-itip-control.c:2479 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:970
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "ବାତିଲ କରନ�ତ�"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.ui.h:1
 msgid "--to--"
 msgstr "--କ�--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.ui.h:2
 msgid "Calendar Message"
 msgstr "କ�ଯାଲେଣ�ଡର ସନ�ଦେଶ"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.ui.h:3
 msgid "Date:"
 msgstr "ତାରିଖ:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.ui.h:5
 msgid "Loading Calendar"
 msgstr "କ�ଯାଲେଣ�ଡର ଧାରଣ କର�ଅଛି"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
 msgstr "କାଲେଣ�ଡର ଧାରଣ କର�ଅଛି..."
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.ui.h:7
 msgid "Organizer:"
 msgstr "ସଙ�ଗଠକ:"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.ui.h:8
 msgid "Server Message:"
 msgstr "ସର�ଭର ସନ�ଦେଶ:"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "ଅଧ�ଯକ�ଷ"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "ଅଂଶଗ�ରହଣ କାରୀ ଆବଶ�ଯକ"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "ଇଚ�ଛାଧୀନ ଅଂଶଗ�ରହଣ କାରୀ"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "ଉତ�ସଗ�ଡ଼ିକ"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
-msgid "Attendees"
-msgstr "ଉପସ�ଥିତ ବ�ୟକ�ତି"
-
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-list-view.c:159
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "ବ�ୟକ�ତିଗତ"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "ସମୂହ"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "ସାଧନ"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
+#: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "କକ�ଷ"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "ଅଧ�ଯକ�ଷ"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "ଅଂଶଗ�ରହଣ କାରୀ ଆବଶ�ଯକ"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "ଇଚ�ଛାଧୀନ ଅଂଶଗ�ରହଣ କାରୀ"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "ଅଂଶଗ�ରହଣ କାର�ନଥିବା ବ�ୟକ�ତି"
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "କାର�ୟ�ଯ ଆବଶ�ୟକ"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:547
+#: ../calendar/gui/e-meeting-list-view.c:546
 msgid "Attendee                          "
 msgstr "ଶ�ରୋତା                          "
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:467
-#: ../calendar/gui/e-meeting-time-sel.c:2125
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -6910,78 +5667,74 @@ 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:471
-#: ../calendar/gui/e-meeting-time-sel.c:2156
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 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:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "କାର�ଯ�ଯାଳୟ ବାହାରେ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "କୌଣସି ସୂଚନା ନାହି�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
-msgid "A_ttendees..."
-msgstr "ଶ�ରୋତା (_t)..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:435
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "ବିକଳ�ପ_ଗ�ଡିକ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:452
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "କେବଳ କାର�ଯ�ୟରତ ସମୟ ଦର�ଶାନ�ତ� (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "ଛୋଟକରିବା ଦେଖାଅ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "ମ�କ�ତ/ବ�ୟସ�ତ ଅଦ�ୟତନ କରନ�ତ� (_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:492
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:510
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "ସ�ୱୟଂ ଉଠାଣ (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:525
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "ସମସ�ତ ବ�ୟକ�ତି �ବଂ ଉତ�ସଗ�ଡ଼ିକ (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "ସମସ�ତ ବ�ୟକ�ତି �ବଂ ଗୋଟି� ଉତ�ସ (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "ବ�ୟକ�ତି ଆବଶ�ଯକ (_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "ବ�ୟକ�ତି �ବଂ ଗୋଟି� ଉତ�ସ ଆବଶ�ୟକ (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:605
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "ଆରମ�ଭ ସମୟ (_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:632
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "ସମାପ�ତି ସମୟ (_E):"
 
@@ -7009,150 +5762,373 @@ msgstr "ଭାଷା"
 msgid "Member"
 msgstr "ସଦସ�ଯ"
 
-#: ../calendar/gui/e-memo-table.c:953
-msgid "_Delete Selected Memos"
-msgstr "ଚୟିତ Memosକ� ଅପସାରଣ କରନ�ତ� (_D)"
+#: ../calendar/gui/e-memo-table.c:411
+#: ../modules/calendar/e-cal-shell-content.c:465
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view.c:289
+#: ../plugins/caldav/caldav-browse-server.c:431
+msgid "Memos"
+msgstr "Memos"
+
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
+msgid "* No Summary *"
+msgstr "* କୌଣସି ସାରାଂଶ ନାହି� *"
+
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
+msgid "Start: "
+msgstr "ଆରମ�ଭ:"
+
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
+msgid "Due: "
+msgstr "ଦୋୟ: "
+
+#: ../calendar/gui/e-memo-table.c:709
+#, fuzzy
+#| msgid "Cut selected messages to the clipboard"
+msgid "Cut selected memos to the clipboard"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� କ�ଲିପବୋର�ଡକ� କାଟନ�ତ�"
+
+#: ../calendar/gui/e-memo-table.c:715
+#, fuzzy
+#| msgid "Copy selected messages to the clipboard"
+msgid "Copy selected memos to the clipboard"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� କ�ଲିପବୋର�ଡରେ ନକଲ କରନ�ତ�"
+
+#: ../calendar/gui/e-memo-table.c:721
+#, fuzzy
+#| msgid "Paste memo from the clipboard"
+msgid "Paste memos from the clipboard"
+msgstr "କ�ଲିପବୋର�ଡର� ସ�ମାରକପତ�ରକ� ଲଗାନ�ତ�"
+
+#: ../calendar/gui/e-memo-table.c:727
+#: ../modules/calendar/e-memo-shell-view-actions.c:556
+msgid "Delete selected memos"
+msgstr "ଚୟିତ ସ�ମାରକପତ�ରଗ�ଡ଼ିକ� ବିଲୋପ କରନ�ତ�"
 
-#: ../calendar/gui/e-memo-table.c:1104 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:733
+#, fuzzy
+#| msgid "Select all visible messages"
+msgid "Select all visible memos"
+msgstr "ସମସ�ତ ଦୃଶ�ୟମାନ ମନୋନୀତ କରନ�ତ�"
+
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "ଗୋଟି� memo ଯୋଗକରିବା ପାଇ� କ�ଲିକ କରନ�ତ�"
 
-#: ../calendar/gui/e-memos.c:759 ../calendar/gui/e-tasks.c:909
-#, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"%sରେ ତ�ର�ଟି:\n"
-" %s"
-
-#: ../calendar/gui/e-memos.c:811
-msgid "Loading memos"
-msgstr "memo ଧାରଣ କର�ଅଛି"
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
+#: ../calendar/gui/e-task-table.c:538
+#, fuzzy, c-format
+#| msgid "%d %b %Y"
+msgid "%d%%"
+msgstr "%d %b %Y"
 
-#: ../calendar/gui/e-memos.c:902
-#, c-format
-msgid "Opening memos at %s"
-msgstr "%sରେ memos ଖୋଲ�ଅଛି"
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2043
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:427
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view.c:437
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "କାର�ଯ�ଯ"
 
-#: ../calendar/gui/e-memos.c:1074 ../calendar/gui/e-tasks.c:1328
-msgid "Deleting selected objects..."
-msgstr "ବଚ�ଛିତ ବସ�ତ�ଗ�ଡ଼ିକ� ଅପସାରଣ କରନ�ତ�..."
+#: ../calendar/gui/e-task-table.c:932
+#, fuzzy
+#| msgid "Cut selected text to the clipboard"
+msgid "Cut selected tasks to the clipboard"
+msgstr "କ�ଲିପବୋର�ଡରେ ବଚ�ଛିତ ପାଠ�ୟକ� କାଟନ�ତ�"
 
-#: ../calendar/gui/e-tasks.c:962
-msgid "Loading tasks"
-msgstr "କାର�ଯ�ୟ ଧାରଣ କର�ଅଛି"
+#: ../calendar/gui/e-task-table.c:938
+#, fuzzy
+#| msgid "Copy selected text to the clipboard"
+msgid "Copy selected tasks to the clipboard"
+msgstr "କ�ଲିପବୋର�ଡରେ ବଚ�ଛିତ ପାଠ�ୟକ� ନକଲ କରନ�ତ�"
 
-#: ../calendar/gui/e-tasks.c:1060
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "%s ଠାରେ କାର�ଯ�ୟ ଖୋଲ�ଅଛି"
+#: ../calendar/gui/e-task-table.c:944
+msgid "Paste tasks from the clipboard"
+msgstr "କ�ଲିପବୋର�ଡର� କାର�ଯ�ୟ ଲଗାନ�ତ�"
 
-#: ../calendar/gui/e-tasks.c:1305
-msgid "Completing tasks..."
-msgstr "କାର�ଯ�ୟ ସମ�ପୂର�ଣ�ଣ କର�ଅଛି..."
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:681
+msgid "Delete selected tasks"
+msgstr "ଚୟିତ କାର�ଯ�ୟଗ�ଡ଼ିକ� ବିଲୋପ କରନ�ତ�"
 
-#: ../calendar/gui/e-tasks.c:1355
-msgid "Expunging"
-msgstr "କାଟ�ଅଛି"
+#: ../calendar/gui/e-task-table.c:956
+#, fuzzy
+#| msgid "Select all visible messages"
+msgid "Select all visible tasks"
+msgstr "ସମସ�ତ ଦୃଶ�ୟମାନ ମନୋନୀତ କରନ�ତ�"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "ସମୟ ମଣ�ଡଳ ମନୋନୀତ କରନ�ତ�"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1662
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2648
-msgid "_Custom View"
-msgstr "ଇଚ�ଛାରୂପଣ ଦୃଶ�ଯ (_C)"
+#: ../calendar/gui/ea-cal-view-event.c:276
+msgid "It has alarms."
+msgstr "�ଥିରେ ସତର�କ ଘଣ�ଟି ଅଛି।"
 
-#: ../calendar/gui/gnome-cal.c:2649
-msgid "_Save Custom View"
-msgstr "ଇଚ�ଛାରୂପଣ ଦୃଶ�ଯ ସଂରକ�ଷଣ କରନ�ତ� (_S)"
+#: ../calendar/gui/ea-cal-view-event.c:279
+msgid "It has recurrences."
+msgstr "�ଥିରେ ପ�ନରାବ�ର�ତ�ତି ଅଛି।"
 
-#: ../calendar/gui/gnome-cal.c:2654
-msgid "_Define Views..."
-msgstr "ଦୃଶ�ଯ.ବ�ଯାଖ�ଯା କରନ�ତ� (_D)..."
+#: ../calendar/gui/ea-cal-view-event.c:282
+msgid "It is a meeting."
+msgstr "�ହା ଗୋଟି� ସଭା ଅଟେ।"
 
-#: ../calendar/gui/gnome-cal.c:2891
+#: ../calendar/gui/ea-cal-view-event.c:288
 #, c-format
-msgid "Loading appointments at %s"
-msgstr "%sରେ ନିଯ�କ�ତି ଧାରଣ କର�ଅଛି"
+msgid "Calendar Event: Summary is %s."
+msgstr "କ�ଯାଲେଣ�ଡର ଘଟଣା: %s ସାରାଂଶ ଅଟେ।"
+
+#: ../calendar/gui/ea-cal-view-event.c:290
+msgid "Calendar Event: It has no summary."
+msgstr "କ�ଯାଲେଣ�ଡର ଘଟଣା: �ହାର କୌଣସି ସାରାଂଶ ନାହି�।"
 
-#: ../calendar/gui/gnome-cal.c:2906
+#: ../calendar/gui/ea-cal-view-event.c:312
+msgid "calendar view event"
+msgstr "କ�ଯାଲେଣ�ଡର ଦ�ର�ଶ�ଯ ଘଟଣା"
+
+#: ../calendar/gui/ea-cal-view-event.c:541
+msgid "Grab Focus"
+msgstr "ଫୋକସକ� ନିଅନ�ତ�"
+
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Appointment"
+msgstr "ନୂତନ ନିଯ�କ�ତି"
+
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "New All Day Event"
+msgstr "ନୂତନ ପୂର�ଣ�ଣ ଦିବସ ଘଟଣା"
+
+#: ../calendar/gui/ea-cal-view.c:302
+msgid "New Meeting"
+msgstr "ନୂତନ ସଭା"
+
+#: ../calendar/gui/ea-cal-view.c:303
+msgid "Go to Today"
+msgstr "ଆଜିକ� ଯାଆନ�ତ�"
+
+#: ../calendar/gui/ea-cal-view.c:304
+msgid "Go to Date"
+msgstr "ଦିନକ� ଯାଆନ�ତ�"
+
+#: ../calendar/gui/ea-day-view-main-item.c:308
+#: ../calendar/gui/ea-week-view-main-item.c:340
+msgid "a table to view and select the current time range"
+msgstr "ଉପସ�ଥିତ ସମୟ ପରିସରକ� ଦେଖିବା ପାଇ� �ବଂ ଚୟନ କରିବା ପାଇ� ଗୋଟି� ସାରଣୀ"
+
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "%sରେ କାର�ଯ�ୟଗ�ଡ଼ିକ� ଧାରଣ କର�ଅଛି"
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "�ଥିରେ %d ଘଟଣା ଅଛି।"
+msgstr[1] "�ଥିରେ %d ଘଟଣା ଅଛି।"
 
-#: ../calendar/gui/gnome-cal.c:2915
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
+msgid "It has no events."
+msgstr "�ଥିରେ କୌଣସି ଘଟଣା ନାହି�।"
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
-msgid "Loading memos at %s"
-msgstr "%sରେ memos ଧାରଣ କର�ଅଛି"
+msgid "Work Week View: %s. %s"
+msgstr "କାର�ଯ�ଯ ସପ�ତାହ ଦ�ର�ଶ�ଯ: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:3027
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
-msgid "Opening %s"
-msgstr "%s କ� ଖୋଲ�ଅଛି"
+msgid "Day View: %s. %s"
+msgstr "ଦିନ ଦ�ର�ଶ�ଯ: %s. %s"
+
+#: ../calendar/gui/ea-day-view.c:197
+msgid "calendar view for a work week"
+msgstr "ଗୋଟି� କାର�ଯ�ଯ ସପ�ତାହ ପାଇ� କ�ଯାଲେଣ�ଡର ଦ�ର�ଶ�ଯ"
+
+#: ../calendar/gui/ea-day-view.c:199
+msgid "calendar view for one or more days"
+msgstr "ଗୋଟି� �ବଂ ଅଧିକ ଦିବସ ପାଇ� କ�ଯାଲେଣ�ଡର ଦ�ର�ଶ�ଯ"
+
+#: ../calendar/gui/ea-gnome-calendar.c:46
+#: ../calendar/gui/ea-gnome-calendar.c:54
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "ନୋମ କ�ଯାଲେଣ�ଡର"
+
+#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../modules/calendar/e-cal-shell-view-private.c:909
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:226
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:240
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
+
+#: ../calendar/gui/ea-jump-button.c:147
+msgid "Jump button"
+msgstr "ଡେଇ�ବା ବଟନ"
+
+#: ../calendar/gui/ea-jump-button.c:156
+msgid "Click here, you can find more events."
+msgstr "�ଠାରେ ଦବାନ�ତ�, ଆପଣ ଅଧିକ ଘଟଣା ପାଇ ପାରିବେ।"
+
+#: ../calendar/gui/ea-week-view.c:153
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "ମାସ ଦ�ର�ଶ�ଯ: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:3995
+#: ../calendar/gui/ea-week-view.c:157
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "ସପ�ତାହ ଦ�ର�ଶ�ଯ: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:188
+msgid "calendar view for a month"
+msgstr "ଗୋଟି� ସପ�ତାହ ପାଇ� କ�ଯାଲେଣ�ଡର ଦ�ର�ଶ�ଯ"
+
+#: ../calendar/gui/ea-week-view.c:190
+msgid "calendar view for one or more weeks"
+msgstr "ଅଧିକ କିମ�ବା ସପ�ତାହ ପାଇ� କ�ଯାଲେଣ�ଡର ଦ�ର�ଶ�ଯ"
+
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "Purging"
 msgstr "ନିର�ମଳ କର�ଅଛି"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
-msgid ""
-"January\n"
-"February\n"
-"March\n"
-"April\n"
-"May\n"
-"June\n"
-"July\n"
-"August\n"
-"September\n"
-"October\n"
-"November\n"
-"December"
+#: ../calendar/gui/goto-dialog.ui.h:1
+msgid "April"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.ui.h:2
+msgid "August"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.ui.h:3
+#, fuzzy
+#| msgid "Member"
+msgid "December"
+msgstr "ସଦସ�ଯ"
+
+#: ../calendar/gui/goto-dialog.ui.h:4
+msgid "February"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.ui.h:5
+msgid "January"
 msgstr ""
 
-#: ../calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.ui.h:6
+msgid "July"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.ui.h:7
+#, fuzzy
+#| msgid "Junk"
+msgid "June"
+msgstr "Junk"
+
+#: ../calendar/gui/goto-dialog.ui.h:8
+#, fuzzy
+#| msgid "Search"
+msgid "March"
+msgstr "ଖୋଜନ�ତ�"
+
+#: ../calendar/gui/goto-dialog.ui.h:9
+#, fuzzy
+#| msgid "Monday"
+msgid "May"
+msgstr "ସୋମବାର"
+
+#: ../calendar/gui/goto-dialog.ui.h:10
+#, fuzzy
+#| msgid "Member"
+msgid "November"
+msgstr "ସଦସ�ଯ"
+
+#: ../calendar/gui/goto-dialog.ui.h:11
+#, fuzzy
+#| msgid "Other"
+msgid "October"
+msgstr "ଅନ�ଯାନ�ଯ"
+
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "ତାରିଖ ଚୟନ କରନ�ତ�"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
-msgid "_Select Today"
-msgstr "ଆଜିକ� ମନୋନୀତ କରନ�ତ� (_S)"
+#: ../calendar/gui/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "Select _Today"
+msgstr "ଆଜିକ� ମନୋନୀତ କରନ�ତ� (_T)"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/goto-dialog.ui.h:14
+#, fuzzy
+#| msgid "Member"
+msgid "September"
+msgstr "ସଦସ�ଯ"
+
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "ଜଣେ ଆୟୋଜକ ସେଟକରିବା ଉଚିତ।"
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "ଅତିକମରେ ଜଣେ ଶ�ରୋତା ଆବଶ�ୟକ"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "ଘଟଣା ସୂଚନା"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "କାର�ଯ�ୟ ସୂଚନା"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Memo ସୂଚନା"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "ମ�କ�ତ/ବ�ଯସ�ତ ସୂଚନା"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "କ�ଯାଲେଣ�ଡର ସୂଚନା"
 
@@ -7160,19 +6136,19 @@ msgstr "କ�ଯାଲେଣ�ଡର ସୂଚନା"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
-msgstr "ସ�ବୀକୃତିପ�ରାପ�ତ"
+msgstr "ସ�ବୀକୃତ"
 
 #. Translators: This is part of the subject
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
-msgstr "ସାମୟିକଭାବେ ସ�ବୀକୃତିପ�ରାପ�ତ"
+msgstr "ସାମୟିକଭାବେ ସ�ବୀକୃତ"
 
 #. Translators: This is part of the subject
 #. * line of a meeting request or update email.
@@ -7181,7 +6157,7 @@ msgstr "ସାମୟିକଭାବେ ସà­�ବୀକୃତିପà­�ରାପà­
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "ଅସ�ବୀକୃତ"
@@ -7190,7 +6166,7 @@ msgstr "ଅସ�ବୀକୃତ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ପ�ରତିନିଧିତ�ତ�ୱ"
@@ -7198,7 +6174,7 @@ msgstr "ପ�ରତିନିଧିତ�ତ�ୱ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ଅଦ�ଯତିତ"
@@ -7206,15 +6182,15 @@ msgstr "ଅଦ�ଯତିତ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
-msgstr "ବାତିଲ"
+msgstr "ବାତିଲ କରନ�ତ�"
 
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ସତେଜନ କରନ�ତ�"
@@ -7222,434 +6198,262 @@ msgstr "ସତେଜନ କରନ�ତ�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:729
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ଗଣକ-ପ�ରସ�ତାବ"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ମ�କ�ତ/ବ�ଯସ�ତ ସୂଚନା (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "iCalendar ସୂଚନା"
 
-#: ../calendar/gui/itip-utils.c:978
-msgid "You must be an attendee of the event."
-msgstr "ଆପଣ ସେହି ଘଟଣାର ଜଣେ ଶ�ରୋତା ହୋଇଥିବେ।"
-
-#: ../calendar/gui/memos-component.c:479
-msgid "_New Memo List"
-msgstr "ନୂତନ ସ�ମାରକପତ�ର ତାଲିକା (_N)"
-
-#: ../calendar/gui/memos-component.c:562
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d ସ�ମାରକପତ�ର"
-msgstr[1] "%d ସ�ମାରକପତ�ରଗ�ଡ଼ିକ"
-
-#: ../calendar/gui/memos-component.c:564 ../calendar/gui/tasks-component.c:556
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d ବଚ�ଛିତ"
-msgstr[1] ", %d ବଚ�ଛିତ"
-
-#: ../calendar/gui/memos-component.c:611
-msgid "Failed upgrading memos."
-msgstr "ସ�ମାରକପତ�ରଗ�ଡ଼ିକ� ଉନ�ନତତର କରିବାରେ ବିଫଳ ହୋଇଛି।"
-
-#: ../calendar/gui/memos-component.c:741
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "ଘଟଣା �ବଂ ସାକ�ଷାତକାର ନିର�ମାଣ ପାଇ� ସ�ମାରକପତ�ର ତାଲିକା '%s'କ�  ଖୋଲିବାରେ ଅସମର�ଥ"
-
-#: ../calendar/gui/memos-component.c:754
-msgid "There is no calendar available for creating memos"
-msgstr "ସ�ମାରକପତ�ରଗ�ଡ଼ିକ� ନିର�ମାଣ କରିବା ପାଇ� କୌଣସି କାଲେଣ�ଡର ଉପଲବ�ଧ ନାହି�"
-
-#: ../calendar/gui/memos-component.c:864
-msgid "Memo Source Selector"
-msgstr "Memo ଉତ�ସ ଚୟନକର�ତ�ତା"
-
-#: ../calendar/gui/memos-component.c:1043
-msgid "New memo"
-msgstr "ନୂତନ memo"
-
-#: ../calendar/gui/memos-component.c:1044
-msgctxt "New"
-msgid "Mem_o"
-msgstr "Memo (_o)"
-
-#: ../calendar/gui/memos-component.c:1045
-msgid "Create a new memo"
-msgstr "ନୂତନ memo ସୃଷ�ଟି କରନ�ତ�"
-
-#: ../calendar/gui/memos-component.c:1051
-msgid "New shared memo"
-msgstr "ନୂତନ ସହଭାଗୀ memo"
-
-#: ../calendar/gui/memos-component.c:1052
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "ସହଭାଗୀ memo (_S)"
-
-#: ../calendar/gui/memos-component.c:1053
-msgid "Create a shared new memo"
-msgstr "ନୂତନ ସହଭାଗୀ memo ସୃଷ�ଟି କରନ�ତ�"
-
-#: ../calendar/gui/memos-component.c:1059
-msgid "New memo list"
-msgstr "ନୂତନ memo ତାଲିକା"
-
-#: ../calendar/gui/memos-component.c:1060
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "Memo ତାଲିକା (_s)"
-
-#: ../calendar/gui/memos-component.c:1061
-msgid "Create a new memo list"
-msgstr "ନୂତନ memo ତାଲିକା ସୃଷ�ଟି କରନ�ତ�"
-
-#: ../calendar/gui/memos-control.c:389 ../calendar/gui/memos-control.c:405
-msgid "Print Memos"
-msgstr "Memos ମ�ଦ�ରଣ କରନ�ତ�"
-
-#: ../calendar/gui/migration.c:157
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
+#: ../calendar/gui/itip-utils.c:831
+msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
-"Evolution କାର�ଯ�ଯ ଫୋଲଡରର ଅବସ�ଥାନ �ବଂ ଅନ�କ�ରମ Evolution 1.x ପରଠ�� ପରିବର�ତ�ତିତ ହୋଇଛି।\n"
-"\n"
-"Evolution ଆପଣଙ�କର ଫୋଲଡରଗ�ଡ଼ିକ� ସ�ଥାନାନ�ତରିତ କରିବା ସମୟରେ ଧୈର�ଯ�ୟ ରଖନ�ତ�..."
 
-#: ../calendar/gui/migration.c:161
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
+#: ../calendar/gui/itip-utils.c:833
+msgid "Unable to book a resource, error: "
 msgstr ""
-"Evolution କ�ୟାଲେଣ�ଡର ଫୋଲଡରର ଅବସ�ଥାନ �ବଂ ଅନ�କ�ରମ Evolution 1.x ପରଠ�� ପରିବର�ତ�ତିତ ହୋଇଛି।\n"
-"\n"
-"Evolution ଆପଣଙ�କର ଫୋଲଡରଗ�ଡ଼ିକ� ସ�ଥାନାନ�ତରିତ କରିବା ସମୟରେ ଧୈର�ଯ�ୟ ରଖନ�ତ�..."
-
-#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "evolution/config.xmldb ର� ପ�ର�ଣା ସଂରଚନାଗ�ଡ଼ିକ� ସ�ଥାନାନ�ତରିତ କରିବାରେ ଅସମର�ଥ"
 
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "କ�ୟାଲେଣ�ଡର `%s' କ� ସ�ଥାନାନ�ତିରିତ କରିବାରେ ଅସମର�ଥ"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "କାର�ଯ�ୟ `%s'କ� ସ�ଥାନାନ�ତରିତ କରିବାରେ ଅସମର�ଥ"
-
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "ଟିପ�ପଣୀ"
+#: ../calendar/gui/itip-utils.c:986
+msgid "You must be an attendee of the event."
+msgstr "ଆପଣ ସେହି ଘଟଣାର ଜଣେ ଶ�ରୋତା ହୋଇଥିବେ।"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "ପ�ରଥମ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "ଦ�ବିତୀୟ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "ତ�ର�ତୀୟ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "ଚତ�ର�ଥ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "ପଞ�ଚମ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "ଷଷ�ଠ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "ସପ�ତମ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "ଅଷ�ଟମ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "ନବମ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "ଦଶମ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "�କାଦଶ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "ଦ�ବାଦଶ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "ତ�ରୟୋଦଶ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "ଚତ�ର�ଦ�ଦଶ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "ପଞ�ଚଦଶ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "ଷଡୋଶ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "ସପ�ତଦଶ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "ଅଷ�ଟଦଶ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "ଉନବିଂଶ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "ବିଂଶ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "�କବିଂଶ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "ଦ�ବିବିଂଶ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "ତ�ରୟୋବିଂଶ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "ଚତ�ର�ବିଂଶ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "ପଞ�ଚବିଂଶ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "ଷଡବିଂଶ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "ସପ�ତବିଂଶ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "ଅଷ�ଟବିଂଶ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "ନବବିଂଶ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "ତିଂଶ"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:514
 msgid "31st"
 msgstr "�କତିଂଶ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "Tu"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "We"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "Th"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2488
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2420
+msgid " to "
+msgstr "�ଠାକ�"
+
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2428
+msgid " (Completed "
+msgstr " (ସମାପ�ତ"
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2432
+msgid "Completed "
+msgstr "ସମାପ�ତ"
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2440
+msgid " (Due "
+msgstr " (Due "
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2445
+msgid "Due "
+msgstr "ବାକି"
+
+#: ../calendar/gui/print.c:2579
 msgid "Appointment"
 msgstr "ସାକ�ଷାତକାର"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2581 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "ଟାସ�କ"
 
-#: ../calendar/gui/print.c:2515
+#: ../calendar/gui/print.c:2606
 #, c-format
 msgid "Summary: %s"
 msgstr "ସାରାଂଶ: %s"
 
-#: ../calendar/gui/print.c:2538
+#: ../calendar/gui/print.c:2630
 msgid "Attendees: "
 msgstr "ଉପସ�ଥିତ ବ�ୟକ�ତିଗଣ: "
 
-#: ../calendar/gui/print.c:2578
+#: ../calendar/gui/print.c:2673
 #, c-format
 msgid "Status: %s"
 msgstr "ଅବସ�ଥିତି: %s"
 
-#: ../calendar/gui/print.c:2592
+#: ../calendar/gui/print.c:2688
 #, c-format
 msgid "Priority: %s"
 msgstr "ଅଗ�ରାଧିକାର: %s"
 
-#: ../calendar/gui/print.c:2607
+#: ../calendar/gui/print.c:2706
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ଶତକଡା ସମ�ପୂର�ଣ�ଣ: %i"
 
-#: ../calendar/gui/print.c:2619
+#: ../calendar/gui/print.c:2717
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2632
+#: ../calendar/gui/print.c:2730
 #, c-format
 msgid "Categories: %s"
 msgstr "ବିଭାଗ: %s"
 
-#: ../calendar/gui/print.c:2643
+#: ../calendar/gui/print.c:2741
 msgid "Contacts: "
 msgstr "ଯୋଗାଯୋଗ: %s"
 
-#: ../calendar/gui/tasks-component.c:471
-msgid "_New Task List"
-msgstr "ନୂତନ କାର�ଯ�ୟ ତାଲିକା (_N)"
-
-#: ../calendar/gui/tasks-component.c:554
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d କାର�ଯ�ୟ"
-msgstr[1] "%d କାର�ଯ�ୟଗ�ଡ଼ିକ"
-
-#: ../calendar/gui/tasks-component.c:603
-msgid "Failed upgrading tasks."
-msgstr "କାର�ଯ�ୟ ଅଦ�ୟତନ ବିଫଳ ହୋଇଛି।"
-
-#: ../calendar/gui/tasks-component.c:736
-#, c-format
-msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "ଘଟଣା �ବଂ ସାକ�ଷାତକାର ନିର�ମାଣ କରିବା ପାଇ� କାର�ଯ�ୟ ତାଲିକା '%s'କ� ଖୋଲିବାରେ ଅସମର�ଥ"
-
-#: ../calendar/gui/tasks-component.c:749
-msgid "There is no calendar available for creating tasks"
-msgstr "କାର�ଯ�ୟ ନିର�ଧାରଣ କରିବା ପାଇ� କୌଣସି କାଲେଣ�ଡର ଉପଲବ�ଧ ନାହି�"
-
-#: ../calendar/gui/tasks-component.c:860
-msgid "Task Source Selector"
-msgstr "କାର�ଯ�ୟ ଉତ�ସ ଚୟନକର�ତ�ତା"
-
-#: ../calendar/gui/tasks-component.c:1114
-msgid "New task"
-msgstr "ନୂଆ  କାର�ୟ�ଯ"
-
-#: ../calendar/gui/tasks-component.c:1115
-msgctxt "New"
-msgid "_Task"
-msgstr "କାର�ଯ�ଯ (_T)"
-
-#: ../calendar/gui/tasks-component.c:1116
-msgid "Create a new task"
-msgstr "ନୂତନ କାର�ଯ�ୟ ସୃଷ�ଟି କରନ�ତ�"
-
-#: ../calendar/gui/tasks-component.c:1122
-msgid "New assigned task"
-msgstr "ନୂତନ ପ�ରଦତ�ତ କାର�ଯ�ୟ"
-
-#: ../calendar/gui/tasks-component.c:1123
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "ନ�ଯସ�ତ କରାଯାଇଥିବା କାର�ଯ�ଯ (_d)"
-
-#: ../calendar/gui/tasks-component.c:1124
-msgid "Create a new assigned task"
-msgstr "ନୂତନ ପ�ରଦତ�ତ କାର�ଯ�ୟ ସୃଷ�ଟି କରନ�ତ�"
-
-#: ../calendar/gui/tasks-component.c:1130
-msgid "New task list"
-msgstr "ନୂତନ କାର�ଯ�ଯ ତାଲିକା"
-
-#: ../calendar/gui/tasks-component.c:1131
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "କାର�ଯ�ଯ ତାଲିକା (_k)"
-
-#: ../calendar/gui/tasks-component.c:1132
-msgid "Create a new task list"
-msgstr "ନୂତନ କାର�ଯ�ଯ ତାଲିକା ସୃଷ�ଟି କରନ�ତ�"
-
-#: ../calendar/gui/tasks-control.c:488
-msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"�ହି ପ�ରୟୋଗଟି ସମ�ପୂର�ଣ�ଣ ହୋଇଥିବା ପରି ଚିହ�ନିତ ସମସ�ତ କାର�ଯ�ୟକ� ସବ�ଦିନ ପାଇ� ଲ�ପ�ତ କରିଦେବ। ଯଦି ଆପଣ ଅଗ�ରସର "
-"ହ�ଅନ�ତି, ତେବେ ଆପଣ �ହି କାର�ଯ�ୟଗ�ଡ଼ିକ� କାଢ଼ିବାରେ ସକ�ଷମ ହେବେ ନାହି�।।\n"
-"\n"
-"ପ�ରକୃତରେ �ହି କାର�ଯ�ୟଗ�ଡ଼ିକ� ଲିଭାନ�ତ�?"
-
-#: ../calendar/gui/tasks-control.c:491 ../mail/em-folder-view.c:1127
-msgid "Do not ask me again."
-msgstr "ମୋତେ ପ�ଣିଥରେ ପଚାରନ�ତ� ନାହି�।"
-
-#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
-msgid "Print Tasks"
-msgstr "କାର�ଯ�ଯ ମ�ଦ�ରଣ କରନ�ତ�"
-
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
@@ -7676,8 +6480,8 @@ msgid "Appointments and Meetings"
 msgstr "ନିଯ�କ�ତି �ବଂ ସାକ�ଷାତକାର"
 
 #: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:630
-#: ../plugins/itip-formatter/itip-formatter.c:1729
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1832
 msgid "Opening calendar"
 msgstr "କାଲେଣ�ଡର ଖୋଲ�ଅଛି"
 
@@ -7701,11 +6505,11 @@ msgstr "vCalendar ଫାଇଲଗ�ଡ଼ିକ (.vcf)"
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar ଆମଦାନିକର�ତ�ତା"
 
-#: ../calendar/importers/icalendar-importer.c:746
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "ପଞିକା ଘଟଣାଗ�ଡିକ"
 
-#: ../calendar/importers/icalendar-importer.c:783
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution କ�ଯାଲେଣ�ଡର ବ�ଦ�ଧିମାନ ଆମଦାନୀକର�ତ�ତା"
 
@@ -7939,7 +6743,7 @@ msgstr "ଆଫ�ରୀକା/ଟ�ଯୂନିସ"
 
 #: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
-msgstr "ଆଫ�ରୀକା/ଓ�ବିଣ�ଡହୋକ"
+msgstr "ଆଫ�ରୀକା/ୱିଣ�ଡହୋକ"
 
 #: ../calendar/zones.h:78
 msgid "America/Adak"
@@ -8258,7 +7062,7 @@ msgid "America/Nassau"
 msgstr "ଆମେରିକା/ନସୋ"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "ଆମେରିକା/ନ�ଯ�_ୟର�କ"
 
@@ -8408,7 +7212,7 @@ msgstr "ଆମେରିକା/ହ�ବାଇଟହୋର�ସ"
 
 #: ../calendar/zones.h:194
 msgid "America/Winnipeg"
-msgstr "ଆମେରିକା/ଓ�ବିନୀପେଗ"
+msgstr "ଆମେରିକା/ୱିନୀପେଗ"
 
 #: ../calendar/zones.h:195
 msgid "America/Yakutat"
@@ -8448,7 +7252,7 @@ msgstr "ଆଣ�ଟାର�କଟିକା/ସାଉଥ_ପୋଲ"
 
 #: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
-msgstr "ଆଣ�ଟାର�କଟିକା/ସ�ଯୋଓ�ବା"
+msgstr "ଆଣ�ଟାର�କଟିକା/ସ�ଯୋୱା"
 
 #: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
@@ -8828,7 +7632,7 @@ msgstr "ଅଷ�ଟ�ରେଲିୟା/ବ�ରୋକେନ_ହିଲ"
 
 #: ../calendar/zones.h:299
 msgid "Australia/Darwin"
-msgstr "ଅଷ�ଟ�ରେଲିୟା/ଡାରଓ�ବିନ"
+msgstr "ଅଷ�ଟ�ରେଲିୟା/ଡାରୱିନ"
 
 #: ../calendar/zones.h:300
 msgid "Australia/Hobart"
@@ -9044,7 +7848,7 @@ msgstr "ୟ�ରୋପ/ଭିଲନିୟସ"
 
 #: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
-msgstr "ୟ�ରୋପ/ଓ�ବାରସୋ"
+msgstr "ୟ�ରୋପ/ୱାରସୋ"
 
 #: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
@@ -9184,7 +7988,7 @@ msgstr "ପେସୀଫିକ/ମାର�କସାସ"
 
 #: ../calendar/zones.h:388
 msgid "Pacific/Midway"
-msgstr "ପେସୀଫିକ/ମିଡଓ�ବେ"
+msgstr "ପେସୀଫିକ/ମିଡୱେ"
 
 #: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
@@ -9248,187 +8052,182 @@ msgstr "ପେସୀଫିକ/ତ�ର�କ"
 
 #: ../calendar/zones.h:404
 msgid "Pacific/Wake"
-msgstr "ପେସୀଫିକ/ଓ�ବେକ"
+msgstr "ପେସୀଫିକ/ୱେକ"
 
 #: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
-msgstr "ପେସୀଫିକ/ଓ�ବାଲିସ"
+msgstr "ପେସୀଫିକ/ୱାଲିସ"
 
 #: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "ପେସୀଫିକ/ୟାପ"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "ସ�ୱୟଂସଂରକ�ଷଣ ଫାଇଲ ଖୋଲି ପାରିବ ନାହି�"
-
-#: ../composer/e-composer-autosave.c:280
-msgid "Unable to retrieve message from editor"
-msgstr "ସମ�ପାଦକ ପାଖର� ସନ�ଦେଶ କାଢ଼ିବାରେ ଅସମର�ଥ"
-
-#: ../composer/e-composer-actions.c:84
+#: ../composer/e-composer-actions.c:81
 msgid "Untitled Message"
 msgstr "ଶୀର�ଷକ-ହୀନ ସନ�ଦେଶ"
 
-#: ../composer/e-composer-actions.c:317
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:204
+msgid "Save as..."
+msgstr "�ପରି ଭାବରେ ସଂରକ�ଷିତ କରନ�ତ�..."
+
+#: ../composer/e-composer-actions.c:283
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "ଗୋଟି� ଫାଇଲ ସଂଯ�କ�ତ କରନ�ତ�"
 
-#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:288
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "ବନ�ଦ କରନ�ତ� (_C)"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "ସାମ�ପ�ରତିକ ଫାଇଲ ବନ�ଦ କରନ�ତ�"
 
-#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1338
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "ମୂଦ�ରଣ କରନ�ତ� ... (_P)"
 
-#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
-#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "ମ�ଦ�ରଣ ପ�ରାକ�ଦର�ଶନ (_v)"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "ସାମ�ପ�ରତିକ ଫାଇଲକ� ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "ନୂଆ ନାମରେ ସଂରକ�ଷଣ କରନ�ତ�... (_A)"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "ସାମ�ପ�ରତିକ ଫାଇଲକ� �କ ଅଲଗା ନାମରେ ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "ଡ�ରାଫ�ଟ ଭାବରେ ସଂରକ�ଷଣ କରନ�ତ� (_D)..."
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "ଡ�ରାଫ�ଟ ପରି ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:152
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "ପଠାନ�ତ� (_e)"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "�ହି ସନ�ଦେଶକ� ପଠାନ�ତ�"
 
-#: ../composer/e-composer-actions.c:373
-msgid "Insert Send options"
-msgstr "ପଠାଯାଇଥିବା ବିକଳ�ପଗ�ଡ଼ିକ� ଭର�ତ�ତିକରନ�ତ�"
-
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "ନୂତନ ସନ�ଦେଶ (_M)"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "ନୂତନ ସନ�ଦେଶ ୱିଣ�ଡୋକ� ଖୋଲନ�ତ�"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "ଅକ�ଷର ସାଙ�କେତିକରଣ (_E)"
 
-#: ../composer/e-composer-actions.c:394
-msgid "_Security"
-msgstr "ସ�ରକ�ଷା (_S)"
-
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:363
 msgid "PGP _Encrypt"
 msgstr "PGP ସଂଗ�ପ�ତ (_E)"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:365
 msgid "Encrypt this message with PGP"
 msgstr "PGP ସହିତ �ହି ସନ�ଦେଶକ� ସଂଗ�ପ�ତ କରନ�ତ�"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:371
 msgid "PGP _Sign"
 msgstr "PGP ହସ�ତାକ�ଷର (_S)"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:373
 msgid "Sign this message with your PGP key"
 msgstr "ଆପଣଙ�କର PGP କି ସହିତ �ହି ସନ�ଦେଶକ� ହସ�ତକ�ଷର କରନ�ତ�"
 
-#: ../composer/e-composer-actions.c:420
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "ସନ�ଦେଶକ� ପ�ରାଥମିକତା ଦିଅନ�ତ� (_P)"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "ସନ�ଦେଶ ପ�ରାଥମିକତାକ� ଉଚ�ଚ କରନ�ତ�"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "ପଢ଼ାଯାଇଥିବା ରସିଦ ପାଇ� ଅନ�ରୋଧ (_q)"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:389
 msgid "Get delivery notification when your message is read"
 msgstr "ଆପଣଙ�କର ସନ�ଦେଶଟି ପଢ଼ିବା ସମୟରେ ପ�ରେରଣ ବିଜ�ଞପ�ତି ପ�ରାପ�ତ କରନ�ତ�"
 
-#: ../composer/e-composer-actions.c:436
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "S/MIME ସେଗ�ପ�ତ (_c)"
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:397
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ଆପଣଙ�କର S/MIME ସଂଗ�ପ�ତ ପ�ରମାଣପତ�ର ସହିତ �ହି ସନ�ଦେଶକ� ସଂଗ�ପ�ତ କରନ�ତ�"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ହସ�ତାକ�ଷର (_n)"
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:405
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ଆପଣଙ�କର S/MIME ହସ�ତାକ�ଷର ପ�ରମାଣପତ�ର ସହିତ �ହି ସନ�ଦେଶରେ ହସ�ତାକ�ଷର କରନ�ତ�"
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:411
 msgid "_Bcc Field"
 msgstr "Bcc କ�ଷେତ�ର (_B)"
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:413
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC କ�ଷେତ�ରଟି ଆଗପଛ ହେଉଛି କି ନାହି� ଦର�ଶାନ�ତ�"
 
-#: ../composer/e-composer-actions.c:460
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "Cc କ�ଷେତ�ର (_C)"
 
-#: ../composer/e-composer-actions.c:462
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC କ�ଷେତ�ରଟି ଦର�ଶାହୋଇଛି କି ନାହି� ଜାଣିବା ପାଇ� ଆଗପଛ ହେଉଅଛି"
 
-#: ../composer/e-composer-actions.c:468
+#: ../composer/e-composer-actions.c:427
 msgid "_From Field"
 msgstr "ଠାର� କ�ଷେତ�ର (_F)"
 
-#: ../composer/e-composer-actions.c:470
+#: ../composer/e-composer-actions.c:429
 msgid "Toggles whether the From chooser is displayed"
 msgstr "ପ�ରେରକ ଚୟନକର�ତ�ତାଟି ଦର�ଶାହୋଇଛି କି ନାହି� ଜାଣିବା ପାଇ� ଆଗପଛ ହେଉଛି"
 
-#: ../composer/e-composer-actions.c:476
+#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "କ�ଷେତ�ରକ� ଉତ�ତର ଦିଅନ�ତ� (_R)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "କ� ଉତ�ତର ଦିଅନ�ତ� କ�ଷେତ�ରଟି ଦର�ଶାହୋଇକି ନାହି� ଜାଣିବା ପାଇ� ଆଗପଛ ହେଉଛି"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:480
 msgid "Save Draft"
 msgstr "ଡ�ରାଫ�ଟ ସଂରକ�ଷଣ କରନ�ତ�"
 
+#: ../composer/e-composer-header.c:129
+#, fuzzy
+#| msgid "Sho_w: "
+msgid "Show"
+msgstr "ଦର�ଶାନ�ତ�"
+
+#: ../composer/e-composer-header.c:137
+#, fuzzy
+#| msgid "_Hide"
+msgid "Hide"
+msgstr "ଲ�ଚାନ�ତ�"
+
 #: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "ସନ�ଦେଶର ଗ�ରାହକକ� ଭରଣ କରନ�ତ�"
@@ -9443,73 +8242,108 @@ msgid ""
 "appearing in the recipient list of the message"
 msgstr "ଗ�ରାହକ ତାଲିକାରେ ଦୃଶ�ୟମାନ ନହୋଇ ସନ�ଦେଶର ନକଲକ� ଗ�ରହଣ କରିବା ପାଇ� ଠିକଣା ଭରଣ କରନ�ତ�"
 
-#: ../composer/e-composer-header-table.c:927
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "ର� (_o):"
 
-#: ../composer/e-composer-header-table.c:936
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:77
+msgid "From"
+msgstr "ଠାର�"
+
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "କ� ଉତ�ତର ଦିଅନ�ତ� (_R):"
 
-#: ../composer/e-composer-header-table.c:941
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "�ଠାକ� (_T):"
 
-#: ../composer/e-composer-header-table.c:947
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "Cc (_C):"
 
-#: ../composer/e-composer-header-table.c:947 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "CC"
 
-#: ../composer/e-composer-header-table.c:953
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "Bcc (_B):"
 
-#: ../composer/e-composer-header-table.c:953 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
 
-#: ../composer/e-composer-header-table.c:958
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "କ� ପୋଷ�ଟ କରନ�ତ� (_P):"
 
-#: ../composer/e-composer-header-table.c:962
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "ବି_ଷୟ:"
 
-#: ../composer/e-composer-header-table.c:971
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "ହସ�ତାକ�ଷର (_g):"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "ଠିକଣା ପ�ସ�ତକ ପାଇ� �ଠାରେ କ�ଲିକ କରନ�ତ�"
 
-#: ../composer/e-composer-post-header.c:137
-msgid "Posting destination"
-msgstr "ଲକ�ଷ�ୟସ�ଥଳ ଦାଖଲ କରନ�ତ�"
-
-#: ../composer/e-composer-post-header.c:138
-msgid "Choose folders to post the message to."
-msgstr "ସନ�ଦେଶକ� ଦାଖଲ କରିବା ପାଇ� ଫୋଲଡର ବାଛନ�ତ�।"
-
-#: ../composer/e-composer-post-header.c:172
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "ଦାଖଲ କରିବା ପାଇ� ଫୋଲଡର ବାଛିବାକ� �ଠାରେ କ�ଲିକ କରନ�ତ�"
 
-#: ../composer/e-composer-private.c:169
+#: ../composer/e-composer-private.c:199
+#, fuzzy
+#| msgid "Copy the selection"
+msgid "Undo the last action"
+msgstr "ବଛାକ� ନକଲ କରନ�ତ�"
+
+#: ../composer/e-composer-private.c:203
+#, fuzzy
+#| msgid "Send Latest Information"
+msgid "Redo the last undone action"
+msgstr "ନୂତନ ସୂଚନା ପଠାନ�ତ�"
+
+#: ../composer/e-composer-private.c:207
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Search for the Contact."
+msgid "Search for text"
+msgstr ""
+"\n"
+"\n"
+"ସମ�ପର�କ ପାଇ� ଖୋଜନ�ତ�।"
+
+#: ../composer/e-composer-private.c:211
+#, fuzzy
+#| msgid "Search for an iPod failed"
+msgid "Search for and replace text"
+msgstr "iPod ସନ�ଧାନ ବିଫଳ ହୋଇଛି"
+
+#: ../composer/e-composer-private.c:301
 msgid "Save draft"
 msgstr "ଡ�ରାଫ�ଟ ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../composer/e-msg-composer.c:807
+#. Check buttons
+#: ../composer/e-msg-composer.c:188 ../mail/em-utils.c:152
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
+msgid "_Do not show this message again."
+msgstr "�ହି ସନ�ଦେଶକ� ପ�ନର�ବାର ଦର�ଶାନ�ତ� ନାହି�। (_D)"
+
+#: ../composer/e-msg-composer.c:988
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "ଯାଉଥିବା ସନ�ଦେଶଗ�ଡ଼ିକରେ ହସ�ତାକ�ଷର କରିପାରିବେ ନାହି�: କୌଣସି ହସ�ତାକ�ଷର ପ�ରମାଣପତ�ର �ହି ଖାତା ପାଇ� ସେଟ "
 "କରାହୋଇନାହି�"
 
-#: ../composer/e-msg-composer.c:814
+#: ../composer/e-msg-composer.c:995
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9517,14 +8351,22 @@ msgstr ""
 "ଯାଉଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ� ସଂଗ�ପ�ତ କରିପାରିବେ ନାହି�: �ହି ଖାତା ପାଇ� କୌଣସି ସଂଗ�ପ�ତ ପ�ରମାଣପତ�ର ସେଟ "
 "କରାହୋଇନାହି�"
 
-#: ../composer/e-msg-composer.c:1331 ../composer/e-msg-composer.c:2170
+#: ../composer/e-msg-composer.c:1386
+#, fuzzy
+#| msgid "Unable to retrieve message from editor"
+msgid "Unable to reconstruct message from autosave file"
+msgstr "ସମ�ପାଦକ ପାଖର� ସନ�ଦେଶ କାଢ଼ିବାରେ ଅସମର�ଥ"
+
+#: ../composer/e-msg-composer.c:1452 ../composer/e-msg-composer.c:1648
 msgid "Compose Message"
 msgstr "ସନ�ଦେଶ ଲେଖନ�ତ�"
 
-#: ../composer/e-msg-composer.c:3329
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#: ../composer/e-msg-composer.c:3314
+#, fuzzy
+#| msgid ""
+#| "<b>(The composer contains a non-text message body, which cannot be "
+#| "edited.)</b>"
+msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "<b>(ଲେଖକ ପାଠ�ୟ-ଯୋଗ�ୟ ସନ�ଦେଶ ଧାରଣ କରିଥା�, ଯାହାକ�କି ସମ�ପାଦନ କରାଯାଇପାରିବ ନାହି�।)</b>"
 
 #: ../composer/mail-composer.error.xml.h:1
@@ -9584,22 +8426,18 @@ msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "ସ�ୱୟଂସଂରକ�ଷଣ ଫାଇଲ &quot;{0}&quot;କ� ସଂରକ�ଷଣ କରିପାରିଲା ନାହି�"
 
 #: ../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
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "ଆହରଣ ଚାଲ�ଅଛି। ଆପଣ ମେଲ ପଠାଇବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "ସ�ୱୟଂସଂରକ�ଷଣ କରିବାରେ ତ�ର�ଟି କାରଣ &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -9607,31 +8445,14 @@ msgstr ""
 "ଆପଣ ଗୋଟି� ନୂତନ ସନ�ଦେଶ ଲେଖିବା ସମୟରେ Evolution ଅପ�ରତ�ୟାଶିତ ଭାବରେ ପ�ରସ�ଥାନ କରିଥା�। ସନ�ଦେଶ "
 "କାଢ଼ିବା ଦ�ୱାରା ଆପଣ ତ�ୟାଗ କରିବା ସମୟରେ ଅଗ�ରସର ହୋଇଥା�।"
 
-#: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
-"accounts."
-msgstr ""
-"କେବଳ Novell GroupWise �ବଂ Microsoft Exchange ଖାତାଗ�ଡ଼ିକ ପାଇ� ପଠାଇବା ବିକଳ�ପ ଉପଲବ�ଧ "
-"ଅଛି।"
-
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Send options not available."
-msgstr "ପଠାଯାଇଥିବା ବିକଳ�ପଗ�ଡ଼ିକ ଉପଲବ�ଧ ନାହି�।"
-
-#: ../composer/mail-composer.error.xml.h:19
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+#: ../composer/mail-composer.error.xml.h:16
+#, fuzzy
+#| msgid ""
+#| "The file `{0}' is not a regular file and cannot be sent in a message."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "ଫାଇଲ `{0}' ଟି ଗୋଟି� ନିୟମିତ ଫାଇଲ ନ�ହ� �ବଂ �ହାକ� ସନ�ଦେଶଗ�ଡ଼ିକରେ ପଠାଯାଇପାରିବ ନାହି�।"
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"�ହି ଡିରେକ�ଟୋରୀର ବିଷୟବସ�ତ�କ� ସଂଲଗ�ନ କରିବା ପାଇ�, �ହି ଡିରେକ�ଚୋରୀରେ ଫାଇଲଗ�ଡ଼ିକ� ପୃଥକ ଭାବରେ ସଂଲଗ�ନ "
-"କରନ�ତ�, ଅଥବା ସେହି ଡିରେକ�ଟୋରୀର ଗୋଟି� ଅଭିଲେଖ ସୃଷ�ଟି କରି ସଂଲଗ�ନ କରନ�ତ�।"
-
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9642,54 +8463,381 @@ msgstr ""
 "\n"
 "ଦୟାକରି ନିଶ�ଚିତ ହ�ଅନ�ତ� ଯେ ଆପଣଙ�କ ପାଖରେ gtkhtml �ବଂ libgtkhtmlର ସଠିକ ସଂସ�କରଣ ସ�ଥାପିତ ହୋଇଛି।"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
 msgstr "ଠିକଣା ଚୟନକର�ତ�ତା ନିୟନ�ତ�ରଣକ� ସକ�ରିୟ କରିବାରେ ଅସମର�ଥ।"
 
-#: ../composer/mail-composer.error.xml.h:25
-msgid "Unfinished messages found"
-msgstr "ଅସମାପ�ତ ସନ�ଦେଶ ମିଳିଲା"
-
-#: ../composer/mail-composer.error.xml.h:26
-msgid "Warning: Modified Message"
-msgstr "ଚେତାବନୀ: ପରିବର�ତ�ତିତ ସନ�ଦେଶ"
-
-#: ../composer/mail-composer.error.xml.h:27
-msgid "You cannot attach the file `{0}' to this message."
+#: ../composer/mail-composer.error.xml.h:21
+#, fuzzy
+#| msgid "You cannot attach the file `{0}' to this message."
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "ଆପଣ �ହି ସନ�ଦେଶ ସହିତ `{0}' ଫାଇଲକ� ସଲଂଗ�ନ କରିପାରିବେ ନାହି�।"
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr "ମେଲ ଲେଖିବା ପୂର�ବର� ଆପଣଙ�କ� ଗୋଟି� ଖାତା ବିନ�ୟାସ କରିବାକ� ହେବ।"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:23
 msgid "_Continue Editing"
 msgstr "ସମ�ପାଦନ କ�ରିୟାକ� ଅଗ�ରସର କରାନ�ତ� (_C)"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:25
 msgid "_Do not Recover"
 msgstr "କାଢ଼ନ�ତ� ନାହି� (_D)"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:26
 msgid "_Recover"
 msgstr "ପ�ନଃପ�ରାପ�ତ କରନ�ତ� (_R)"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Save Draft"
 msgstr "ଡ�ରାଫ�ଟ ସଂରକ�ଷଣ କରନ�ତ� (_S)"
 
-#: ../data/evolution.desktop.in.in.h:1
+#: ../capplet/anjal-settings-main.c:199
+msgid "Run Anjal in a window"
+msgstr ""
+
+#: ../capplet/anjal-settings-main.c:200
+#, fuzzy
+#| msgid "Mark as _default memo list"
+msgid "Make Anjal the default email client"
+msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ସ�ମାରକପତ�ର ତାଲିକା ପରି ଚିହ�ନଟ କରନ�ତ� (_d)"
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:207
+msgid "ID of the socket to embed in"
+msgstr ""
+
+#: ../capplet/anjal-settings-main.c:208
+#, fuzzy
+#| msgid "sort"
+msgid "socket"
+msgstr "ସଜାଡନ�ତ�"
+
+#: ../capplet/anjal-settings-main.c:221
+#, fuzzy
+#| msgid "Default Mail Client"
+msgid "Anjal email client"
+msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ମେଲ ଗ�ରାହକ "
+
+#: ../capplet/settings/mail-account-view.c:56
+#, fuzzy
+#| msgid "Please choose another name."
+msgid "Please enter your full name."
+msgstr "ଦୟାକରି ଅନ�ୟ�କ ନାମ ବାଛନ�ତ�।"
+
+#: ../capplet/settings/mail-account-view.c:57
+msgid "Please enter your email address."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:58
+msgid "The email address you have entered is invalid."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:182
+#, fuzzy
+#| msgid "Personal"
+msgid "Personal details:"
+msgstr "ବ�ଯକ�ତିଗତ"
+
+#: ../capplet/settings/mail-account-view.c:189
+#, fuzzy
+#| msgid "_Name:"
+msgid "Name:"
+msgstr "ନାମ (_N):"
+
+#: ../capplet/settings/mail-account-view.c:198
+#, fuzzy
+#| msgid "Email _Address:"
+msgid "Email address:"
+msgstr "ଇମେଲ ଠିକଣା (_A):"
+
+#: ../capplet/settings/mail-account-view.c:208
+#, fuzzy
+#| msgid "Receiving Email"
+msgid "Receiving details:"
+msgstr "ଗ�ରହଣ କରିଥିବା ଇମେଲ"
+
+#: ../capplet/settings/mail-account-view.c:215
+#: ../capplet/settings/mail-account-view.c:265
+#, fuzzy
+#| msgid "Server _Type: "
+msgid "Server type:"
+msgstr "ସର�ଭର ପ�ରକାର (_T):"
+
+#: ../capplet/settings/mail-account-view.c:224
+#: ../capplet/settings/mail-account-view.c:274
+#, fuzzy
+#| msgid "Server Message:"
+msgid "Server address:"
+msgstr "ସର�ଭର ସନ�ଦେଶ:"
+
+#: ../capplet/settings/mail-account-view.c:233
+#: ../capplet/settings/mail-account-view.c:283
+#, fuzzy
+#| msgid "Us_ername:"
+msgid "Username:"
+msgstr "ଚାଳକ ନାମ (_e):"
+
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:292
+#, fuzzy
+#| msgid "No encryption"
+msgid "Use encryption:"
+msgstr "କୌଣସି ଗୋପନୀୟତା ନାହି�"
+
+#: ../capplet/settings/mail-account-view.c:247
+#: ../capplet/settings/mail-account-view.c:297
+#, fuzzy
+#| msgid "Never"
+msgid "never"
+msgstr "କେବେ ନ�ହେ�"
+
+#: ../capplet/settings/mail-account-view.c:258
+#, fuzzy
+#| msgid "Sending Mail"
+msgid "Sending details:"
+msgstr "ମେଲ ପଠାଉଛି"
+
+#: ../capplet/settings/mail-account-view.c:316
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:318
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:320
+#, fuzzy
+#| msgid "You may only configure a single Exchange account."
+msgid "You can specify more options to configure the account."
+msgstr "ଆପଣ କେବଳ ଗୋଟି� ପରିବର�ତ�ତନ ଖାତା ବିନ�ୟାସ କରିପାରିବେ।"
+
+#: ../capplet/settings/mail-account-view.c:322
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:323
+msgid "You can specify your default settings for your account."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:324
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:339
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2190
+#: ../mail/mail-config.ui.h:59
+msgid "Identity"
+msgstr "ପରିଚୟ"
+
+#: ../capplet/settings/mail-account-view.c:339
+#, fuzzy
+#| msgid "Receiving Email"
+msgid "Next - Receiving mail"
+msgstr "ଗ�ରହଣ କରିଥିବା ଇମେଲ"
+
+#: ../capplet/settings/mail-account-view.c:340
+#, fuzzy
+#| msgid "Receiving Email"
+msgid "Receiving mail"
+msgstr "ଗ�ରହଣ କରିଥିବା ଇମେଲ"
+
+#: ../capplet/settings/mail-account-view.c:340
+#: ../capplet/settings/mail-account-view.c:341
+#, fuzzy
+#| msgid "Sending Email"
+msgid "Next - Sending mail"
+msgstr "ପଠାଯାଇଥିବା ଇମେଲ"
+
+#: ../capplet/settings/mail-account-view.c:340
+#, fuzzy
+#| msgid "Identity"
+msgid "Back - Identity"
+msgstr "ପରିଚୟ"
+
+#: ../capplet/settings/mail-account-view.c:340
+#, fuzzy
+#| msgid "Receiving Options"
+msgid "Next - Receiving options"
+msgstr "ଗ�ରହଣ କରାଯାଇଥିବା ବିକଳ�ପଗ�ଡ଼ିକ"
+
+#: ../capplet/settings/mail-account-view.c:341
+#, fuzzy
+#| msgid "Receiving Options"
+msgid "Receiving options"
+msgstr "ଗ�ରହଣ କରାଯାଇଥିବା ବିକଳ�ପଗ�ଡ଼ିକ"
+
+#: ../capplet/settings/mail-account-view.c:341
+#: ../capplet/settings/mail-account-view.c:343
+#, fuzzy
+#| msgid "Receiving Email"
+msgid "Back - Receiving mail"
+msgstr "ଗ�ରହଣ କରିଥିବା ଇମେଲ"
+
+#: ../capplet/settings/mail-account-view.c:343
+#, fuzzy
+#| msgid "Sending Email"
+msgid "Sending mail"
+msgstr "ପଠାଯାଇଥିବା ଇମେଲ"
+
+#: ../capplet/settings/mail-account-view.c:343
+#: ../capplet/settings/mail-account-view.c:344
+#, fuzzy
+#| msgid "Delete account?"
+msgid "Next - Review account"
+msgstr "ଖାତା ବିଲୋପ କରନ�ତ�?"
+
+#: ../capplet/settings/mail-account-view.c:343
+#, fuzzy
+#| msgid "Defaults"
+msgid "Next - Defaults"
+msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ"
+
+#: ../capplet/settings/mail-account-view.c:343
+#, fuzzy
+#| msgid "Receiving Options"
+msgid "Back - Receiving options"
+msgstr "ଗ�ରହଣ କରାଯାଇଥିବା ବିକଳ�ପଗ�ଡ଼ିକ"
+
+#: ../capplet/settings/mail-account-view.c:344
+#: ../mail/em-account-editor.c:2769 ../mail/mail-config.ui.h:32
+msgid "Defaults"
+msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ"
+
+#: ../capplet/settings/mail-account-view.c:344
+#, fuzzy
+#| msgid "Sending Email"
+msgid "Back - Sending mail"
+msgstr "ପଠାଯାଇଥିବା ଇମେଲ"
+
+#: ../capplet/settings/mail-account-view.c:346
+#, fuzzy
+#| msgid "Delete account?"
+msgid "Review account"
+msgstr "ଖାତା ବିଲୋପ କରନ�ତ�?"
+
+#: ../capplet/settings/mail-account-view.c:346
+msgid "Finish"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:346
+#, fuzzy
+#| msgid "Ascending"
+msgid "Back - Sending"
+msgstr "ସାନର� ବଡ କ�ରମରେ"
+
+#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-settings-view.c:267
+#, fuzzy
+#| msgid "Close"
+msgid "Close Tab"
+msgstr "ବନ�ଦ କରନ�ତ�"
+
+#: ../capplet/settings/mail-account-view.c:690
+#, fuzzy
+#| msgid "Account Editor"
+msgid "Account Wizard"
+msgstr "ଖାତା ସମ�ପାଦକ"
+
+#: ../capplet/settings/mail-capplet-shell.c:208
+#, fuzzy
+#| msgid "Evolution Account Assistant"
+msgid "Evolution account assistant"
+msgstr "Evolution ଖାତା ସହଯୋଗୀ"
+
+#. create the local source group
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:659
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:211
+#: ../mail/message-list.c:1605
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:126
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:141
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:109
+msgid "On This Computer"
+msgstr "�ହି କମ�ପ�ଟରରେ"
+
+#: ../capplet/settings/mail-settings-view.c:146
+#: ../plugins/groupwise-features/share-folder.c:747
+msgid "Modify"
+msgstr "ପରିବର�ତ�ତନ କରନ�ତ�"
+
+#: ../capplet/settings/mail-settings-view.c:148
+#, fuzzy
+#| msgid "Add a column..."
+msgid "Add a new account"
+msgstr "ଗୋଟି� ସ�ତମ�ଭକ� ଯୋଗ କରନ�ତ�"
+
+#: ../capplet/settings/mail-settings-view.c:184
+#, fuzzy
+#| msgid "Account Management"
+msgid "Account management"
+msgstr "ହିସାବ ଖାତା ପରିଚାଳନା"
+
+#: ../capplet/settings/mail-settings-view.c:277
+#, fuzzy
+#| msgid "Junk Settings"
+msgid "Settings"
+msgstr "Junk ସେଟିଙ�ଗଗ�ଡିକ"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+#, fuzzy
+#| msgid "Calendar information"
+msgid "Calendar event notifications"
+msgstr "କ�ଯାଲେଣ�ଡର ସୂଚନା"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+#, fuzzy
+#| msgid "Evolution Elm importer"
+msgid "Evolution Alarm Notify"
+msgstr "Evolution Elm ଆମଦାନୀକର�ତ�ତା"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:823
+#: ../shell/e-shell-window-private.c:251
+msgid "Evolution"
+msgstr "କ�ରମବିକାଶ "
+
+#: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution କ�ଯାଲେଣ�ଡର ବସ�ତ�"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:948
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Groupware ସମୂହ"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "ଆପଣଙ�କ ମେଲକ� ପରିଚାଳନା କରନ�ତ�, ଯୋଗାଯୋଗ �ବଂ କାର�ଯ�ୟସୂଚୀ"
 
+#: ../data/evolution-settings.desktop.in.in.h:1
+#, fuzzy
+#| msgid "Configure your email accounts here"
+msgid "Configure email accounts"
+msgstr "ଆପଣଙ�କର ମେଲ ଖାତାକ� �ଠାରେ ବିନ�ୟାସ କରନ�ତ�"
+
+#: ../data/evolution-settings.desktop.in.in.h:2
+#, fuzzy
+#| msgid "Junk Mail Settings"
+msgid "Email Settings"
+msgstr "Junk ମେଲ ସେଟିଙ�ଗଗ�ଡିକ"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "ଠିକଣା କାର�ଡ"
@@ -9698,117 +8846,271 @@ msgstr "ଠିକଣା କାର�ଡ"
 msgid "calendar information"
 msgstr "କାଲେଣ�ଡର ସୂଚନା"
 
-#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:224
+#, fuzzy, c-format
+#| msgid "Cancelled"
+msgid "%s (cancelled)"
+msgstr "ବାତିଲ କରାଗଲା"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:227
+#, fuzzy, c-format
+#| msgid "%s (%d%% complete)"
+msgid "%s (completed)"
+msgstr "%s (%d%% ସମାପ�ତ)"
+
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../e-util/e-activity.c:231
+#, fuzzy, c-format
+#| msgid "%s (...)"
+msgid "%s..."
+msgstr "%s (...)"
+
+#: ../e-util/e-activity.c:236
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% ସମାପ�ତ)"
+
+#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
 msgid "Evolution Error"
 msgstr "Evolution ତ�ର�ଟି"
 
-#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
+#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
 msgid "Evolution Warning"
 msgstr "Evolution ଚେତାବନୀ"
 
-#: ../e-util/e-error.c:118
-msgid "Evolution Information"
-msgstr "Evolution ସୂଚନା"
-
-#: ../e-util/e-error.c:120
-msgid "Evolution Query"
-msgstr "Evolution ପ�ରଶ�ନ"
-
-#. setup a dummy error
-#: ../e-util/e-error.c:448
+#: ../e-util/e-alert.c:634
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "ଆଭ�ୟନ�ତରୀଣ ତୃଟି, ଅଜ�ଞାତ ତୃଟି '%s'କ� ଅନ�ରୋଧ କରାଯାଇଛି"
 
-#: ../e-util/e-logger.c:161
-msgid "Component"
-msgstr "ଉପାଦାନ"
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "ଆରବୀ"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "ବାଲଟିକ"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "କେନ�ଦ�ର ୟ�ରୋପୀୟ"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "ଚାଇନୀଜ"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "ସିରୀଲିକ"
 
-#: ../e-util/e-logger.c:162
-msgid "Name of the component being logged"
-msgstr "ଲଗ କରାଯାଇଥିବା ଉପାଦାନଗ�ଡ଼ିକର ନାମ"
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "ଗ�ରୀକ"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "ହିବ�ର�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "ଜାପାନୀ"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "କୋରୀୟାନ "
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "ଥାଈ"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "ତ�ର�କୀ"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "ୟ�ନିକୋଡ"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "ପଶ�ଚିମ ୟ�ରୋପୀୟ"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "ପଶ�ଚିମ ୟ�ରୋପୀୟ, ନୂତନ"
+
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+msgid "Traditional"
+msgstr "ପାରମ�ପରିକ"
+
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
+msgid "Simplified"
+msgstr "ସରଳିକ�ର�ତ"
+
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
+msgid "Ukrainian"
+msgstr "ୟ�କ�ରେନିୟାନ"
+
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
+msgid "Visual"
+msgstr "ଚାକ�ଷ�ଷ"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../widgets/table/e-cell-date-edit.c:311
+msgid "Today"
+msgstr "ଆଜି"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "ଆସନ�ତାକାଲି"
+
+#: ../e-util/e-datetime-format.c:207
+#, fuzzy
+#| msgid "Yesterday %l:%M %p"
+msgid "Yesterday"
+msgstr "ଗତକାଲି"
+
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
+#, fuzzy, c-format
+#| msgid "%d day before appointment"
+#| msgid_plural "%d days before appointment"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "ସାକ�ଷାତକାରର %d ଦିନ ପୂର�ବେ"
+msgstr[1] "ସାକ�ଷାତକାରର %d ଦିନ ପୂର�ବେd ଦିନ ପୂର�ବର�"
+
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
+#, fuzzy, c-format
+#| msgid "1 day ago"
+#| msgid_plural "%d days ago"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "1 ଦିନ ପୂର�ବର�"
+msgstr[1] "%d ଦିନ ପୂର�ବର�"
+
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
+#, fuzzy
+#| msgid "_Use system defaults"
+msgid "Use locale default"
+msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ ଲୋକେଲ ବ�ଯବହାର କରନ�ତ�"
+
+#: ../e-util/e-datetime-format.c:502
+#, fuzzy
+#| msgid "Port:"
+msgid "Format:"
+msgstr "ସଜ�ଜିକରଣ ଶୈଳୀ:"
+
+#: ../e-util/e-file-utils.c:136
+#, fuzzy
+#| msgid "Unknown type"
+msgid "(Unknown Filename)"
+msgstr "ଅଜଣା ପ�ରକାର"
+
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:140
+#, fuzzy, c-format
+#| msgid "Pinging %s"
+msgid "Writing \"%s\""
+msgstr "ପିଙ�ଗ କର�ଅଛି %s"
+
+#. Translators: The first string value is the basename of a
+#. * remote file, the second string value is the hostname.
+#: ../e-util/e-file-utils.c:145
+#, fuzzy, c-format
+#| msgid "Copying `%s' to `%s'"
+msgid "Writing \"%s\" to %s"
+msgstr "`%s' କ� `%s'ରେ ନକଲ କରନ�ତ�"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "ତ�ର�ଟିନିବାରଣ ଲଗଗ�ଡ଼ିକ"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:208
 msgid "Show _errors in the status bar for"
 msgstr "ଅବସ�ଥିତି ପଟିରେ ତ�ର�ଟିଗ�ଡ଼ିକ� ଦର�ଶାନ�ତ� (_e)"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:222
+#: ../e-util/e-non-intrusive-error-dialog.c:226
 msgid "second(s)."
 msgstr "ସେକେଣ�ଡ।"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:232
 msgid "Log Messages:"
 msgstr "ଲଗ ସନ�ଦେଶଗ�ଡ଼ିକ:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:279
 msgid "Log Level"
 msgstr "Log ସ�ତର"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:388
-msgid "Time"
-msgstr "ସମୟ"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2683
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ସନ�ଦେଶଗ�ଡ଼ିକ"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "�ହି ୱିଣ�ଡୋକ� ବନ�ଦ କରନ�ତ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "ତ�ର�ଟି"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "ତୃଟି ଗ�ଡିକ"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "ଚେତାବନୀ �ବଂ ତୃଟି ଗ�ଡିକ"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "ତୃଟିମ�କ�ତ କରନ�ତ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Error, Warnings and Debug messages"
 msgstr "ତ�ର�ଟି, ଚେତାବନୀ �ବଂ ତୃଟିମ�କ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:943
-#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:706
-msgid "Enabled"
-msgstr "ସକ�ରିୟ"
-
-#: ../e-util/e-plugin.c:309
-msgid "Whether the plugin is enabled"
-msgstr "ପ�ଲଗଇନଟି ସକ�ରିୟ ହୋଇଛି କି ନାହି�"
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "ସପ�ତାହ"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "ମ�ଦ�ରଣ କରିବା ସମୟରେ ଗୋଟି� ତ�ର�ଟି ଘଟିଲା"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "ମ�ଦ�ରଣ ତନ�ତ�ରରେ ତ�ର�ଟି ବିଷୟରେ ନିମ�ନଲିଖିତ ବିବରଣୀକ� ଖବର କରାଯାଇଛି:"
 
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
 msgid "The printing system did not report any additional details about the error."
 msgstr "ମ�ଦ�ରଣ ତନ�ତ�ର ତ�ର�ଟି ବିଷୟରେ କୌଣସି ଅତିରିକ�ତ ବିବରଣୀ ଖବର କରିନଥା�।"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-signature.c:701
+msgid "Autogenerated"
+msgstr "ସ�ୱୟଂ ସୃଷ�ଟି"
+
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "କାରଣ \"{1}\"।"
 
@@ -9828,257 +9130,305 @@ msgstr "ଆପଣ à¬�ହାକà­� ନବଲିଖନ କରିବାକà­� ଚà¬
 msgid "File exists \"{0}\"."
 msgstr "ଫାଇଲ ଅବସ�ଥିତ \"{0}\"।"
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "ଫାଇଲକ� ନବଲିଖନ କରନ�ତ�?"
-
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "ନବଲିଖନ କରନ�ତ� (_O)"
 
-#: ../e-util/e-util.c:133
+#: ../e-util/e-util.c:169
 msgid "Could not open the link."
 msgstr "ସଂଯୋଗକ� ଖୋଲିପାରିଲା ନାହି�।"
 
-#: ../e-util/e-util.c:183
+#: ../e-util/e-util.c:219
 msgid "Could not display help for Evolution."
 msgstr "Evolution ପାଇ� ସହାୟତା ଦର�ଶାଇପାରିଲା ନାହି�।"
 
-#: ../e-util/e-util-labels.c:45
-msgid "I_mportant"
-msgstr "ଆବଶ�ୟକୀୟ (_m)"
+#: ../e-util/gconf-bridge.c:1304
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf ତ�ର�ଟି: %s"
 
-#. red
-#: ../e-util/e-util-labels.c:46
-msgid "_Work"
-msgstr "କାର�ଯ�ୟ (_W)"
+#: ../e-util/gconf-bridge.c:1315
+msgid "All further errors shown only on terminal."
+msgstr "ସମସ�ତ ଅତିରିକ�ତ ତ�ର�ଟି ଗ�ଡିକ କେବଳ ଟର�ମିନାଲରେ ପ�ରଦର�ଶିତ।"
 
-#. orange
-#: ../e-util/e-util-labels.c:47
-msgid "_Personal"
-msgstr "ବ�ୟକ�ତିଗତ (_P)"
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../modules/mail/em-mailer-prefs.c:78
+msgid "Reply-To"
+msgstr "କ� ଉତ�ତର ଦିଅନ�ତ�"
 
-#. green
-#: ../e-util/e-util-labels.c:48
-msgid "_To Do"
-msgstr "କାର�ଯ�ୟ କରିବାକ� (_T)"
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:80
+msgid "Cc"
+msgstr "Cc"
 
-#. blue
-#: ../e-util/e-util-labels.c:49
-msgid "_Later"
-msgstr "ପରେ (_L)"
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:81
+msgid "Bcc"
+msgstr "Bcc"
 
-#: ../e-util/e-util-labels.c:321
-msgid "Label _Name:"
-msgstr "ନାମପଟି ନାମ (_N):"
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
+#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "ବିଷୟ"
 
-#: ../e-util/e-util-labels.c:344
-msgid "Edit Label"
-msgstr "ନାମପଟି ସମ�ପାଦନ କରନ�ତ�"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1138
+msgid "Mailer"
+msgstr "ପ�ରେରକ"
 
-#: ../e-util/e-util-labels.c:344
-msgid "Add Label"
-msgstr "ନାମପଟି ଯୋଗକରନ�ତ�"
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
+msgid "-------- Forwarded Message --------"
+msgstr "-------- ପଠାଯାଇଥିବା ସନ�ଦେଶ --------"
 
-#: ../e-util/e-util-labels.c:363
-msgid "Label name cannot be empty."
-msgstr "ନାମପଟିକ� ଖାଲିକରାଯାଇପାରିବ ନାହି�।"
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
+msgid "Date"
+msgstr "ତାରିଖ"
 
-#: ../e-util/e-util-labels.c:368
-msgid ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
-msgstr ""
-"ସମାନ ଟ�ୟାଗ ବିଶିଷ�ଟ ଗୋଟି� ନାମପଟି ସର�ଭରରେ ପୂର�ବର� ଅବସ�ଥିତ। ଦୟାକରି ଆପଣଙ�କର ନାମପଟିକ� ପ�ନଃନାମକରଣ "
-"କରନ�ତ�।"
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:84
+msgid "Newsgroups"
+msgstr "ସମାଚାରସମୂହଗ�ଡିକ"
 
-#: ../e-util/gconf-bridge.c:1222
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "ମ�ଖ"
+
+#: ../em-format/em-format.c:1302
 #, c-format
-msgid "GConf error: %s"
-msgstr "GConf ତ�ର�ଟି: %s"
+msgid "%s attachment"
+msgstr "%s ସଂଲଗ�ନକ"
 
-#: ../e-util/gconf-bridge.c:1233
-msgid "All further errors shown only on terminal."
-msgstr "ସମସ�ତ ଅତିରିକ�ତ ତ�ର�ଟି ଗ�ଡିକ କେବଳ ଟର�ମିନାଲରେ ପ�ରଦର�ଶିତ।"
+#: ../em-format/em-format.c:1361
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "S/MIME ସନ�ଦେଶକ� ବିଶ�ଳେଷଣ କରିପାରିଲା ନାହି�: ଅଜଣା ତ�ର�ଟି"
+
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME ସନ�ଦେଶକ� ବିଶ�ଳେଷଣ କରିପାରିଲା ନାହି�। ଉତ�ସ ଭାବରେ ଦର�ଶାଉଅଛି।"
 
-#: ../filter/filter-datespec.c:73
+#: ../em-format/em-format.c:1523
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "�କାଧିକ ଅଂଶ/ସଂଗ�ପ�ତକରଣ ପାଇ� ଅସମର�ଥିତ ସଂଗ�ପ�ତକରଣ ପ�ରକାର"
+
+#: ../em-format/em-format.c:1535
+msgid "Could not parse PGP/MIME message"
+msgstr "PGP/MIME ସନ�ଦେଶକ� ବିଶ�ଳେଷଣ କରିପାରିଲା ନାହି�"
+
+#: ../em-format/em-format.c:1535
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "PGP/MIME ସନ�ଦେଶକ� ବିଶ�ଳେଷଣ କରିହେଲା ନାହି�: ଅଜଣା ତୃଟି"
+
+#: ../em-format/em-format.c:1709
+msgid "Unsupported signature format"
+msgstr "ଅସମର�ଥିତ ହସ�ତାକ�ଷର ଶୈଳୀ"
+
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
+msgid "Error verifying signature"
+msgstr "ତ�ର�ଟି ଯାଞ�ଚକାରୀ ହସ�ତାକ�ଷର"
+
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
+msgid "Unknown error verifying signature"
+msgstr "ଅଜଣା ତୃଟି ଯାଞ�ଚକାରୀ ହସ�ତାକ�ଷର"
+
+#: ../em-format/em-format.c:1946
+msgid "Could not parse PGP message"
+msgstr "PGP ସନ�ଦେଶକ� ବିଶ�ଳେଷଣ କରିପାରିଲା ନାହି�"
+
+#: ../em-format/em-format.c:1946
+msgid "Could not parse PGP message: Unknown error"
+msgstr "PGP ସନ�ଦେଶକ� ବିଶ�ଳେଷଣ କରିହେଲା ନାହି�: ଅଜଣା ତୃଟି"
+
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ସେକଣ�ଡ ପୂର�ବର�"
 msgstr[1] "%d ସେକଣ�ଡ ପୂର�ବର�"
 
-#: ../filter/filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "ଭବିଷ�ୟତରେ 1 ସେକଣ�ଡ"
 msgstr[1] "ଭବିଷ�ୟତରେ %d ସେକଣ�ଡ"
 
-#: ../filter/filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 ମିନଟ ପୂର�ବର�"
 msgstr[1] "%d ମିନଟ ପୂର�ବର�"
 
-#: ../filter/filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "ଭବିଷ�ୟତରେ 1 ମିନଟ"
-msgstr[1] "ଭବିଷ�ୟତରେ 1 ମିନଟମିନିଟ ଇଞ�ଚଭବିଷ�ୟତରେ %d ମିନଟ"
+msgstr[1] "ଭବିଷ�ୟତରେ %d ମିନଟ"
 
-#: ../filter/filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 ଘଣ�ଟା ପୂର�ବର�"
 msgstr[1] "%d ଘଣ�ଟା ପୂର�ବର�"
 
-#: ../filter/filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "ଭବିଷ�ୟତରେ 1 ଘଣ�ଟା"
 msgstr[1] "ଭବିଷ�ୟତରେ %d ଘଣ�ଟା"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 ଦିନ ପୂର�ବର�"
 msgstr[1] "%d ଦିନ ପୂର�ବର�"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "ଭବିଷ�ୟତରେ 1 ଦିନ"
 msgstr[1] "ଭବିଷ�ୟତରେ %d ଦିନ"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 ସପ�ତାହ ପୂର�ବେ"
-msgstr[1] "1 ସପ�ତାହ ପୂର�ବେସପ�ତାହ ପୂର�ବର�%d ସପ�ତାହ ପୂର�ବର�"
+msgstr[1] "%d ସପ�ତାହ ପୂର�ବେ"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "ଭବିଷ�ୟତରେ 1 ସପ�ତାହ"
-msgstr[1] "ଭବିଷ�ୟତରେ 1 ସପ�ତାହସପ�ତାହ ଇଞ�ଚଭବିଷ�ୟତରେ %d ସପ�ତାହ"
+msgstr[1] "ଭବିଷ�ୟତରେ %d ସପ�ତାହ"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 ମାସ ପୂର�ବର�"
 msgstr[1] "%d ମାସ ପୂର�ବର�"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "ଭବିଷ�ୟତରେ 1 ମାସ"
-msgstr[1] "ଭବିଷ�ୟତରେ %d  ମାସ"
+msgstr[1] "ଭବିଷ�ୟତରେ %d ମାସ"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 ବର�ଷ ପୂର�ବର�"
 msgstr[1] "%d ବର�ଷ ପୂର�ବର�"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "ଭବିଷ�ୟତରେ 1 ବର�ଷ"
 msgstr[1] "ଭବିଷ�ୟତରେ %d ବର�ଷ"
 
-#: ../filter/filter-datespec.c:294
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<click here to select a date>"
 
-#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
-#: ../filter/filter-datespec.c:319
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "ବର�ତ�ତମାନ"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:304
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:448
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "ସହିତ ତ�ଳନା କରିବା ପାଇ� ଗୋଟି� ସମୟ ବାଛନ�ତ�"
 
-#: ../filter/filter-file.c:284
-msgid "Choose a file"
+#: ../filter/e-filter-file.c:184
+#, fuzzy
+#| msgid "Choose a file"
+msgid "Choose a File"
 msgstr "ଗୋଟି� ଫାଇଲ ବାଛନ�ତ�"
 
-#: ../filter/filter-part.c:532
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "ଯାଞ�ଚ କରନ�ତ�"
-
-#: ../filter/filter-rule.c:854
+#: ../filter/e-filter-rule.c:659
 msgid "R_ule name:"
 msgstr "ନିୟମ ନାମ (_u):"
 
-#: ../filter/filter-rule.c:882
+#: ../filter/e-filter-rule.c:689
 msgid "Find items that meet the following conditions"
 msgstr "ନିମ�ନଲିଖିତ ସର�ତ�ତଗ�ଡ଼ିକ� ପ�ରଣ କରିବା ପାଇ� ବସ�ତ�ଗ�ଡ଼ିକ� ଖୋଜନ�ତ�"
 
-#: ../filter/filter-rule.c:916
+#: ../filter/e-filter-rule.c:723
 msgid "A_dd Condition"
 msgstr "ସର�ତ�ତ ଯୋଗକରନ�ତ� (_d)"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:732
 msgid "If all conditions are met"
 msgstr "ଯଦି ସମସ�ତ ସର�ତ�ତଗ�ଡ଼ିକ ପ�ରଣ ହୋଇଥା�"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:733
 msgid "If any conditions are met"
 msgstr "ଯଦି ଯେକୌଣସି ସର�ତ�ତଗ�ଡ଼ିକ ପ�ରଣ ହୋଇଥା�"
 
-#: ../filter/filter-rule.c:924
+#: ../filter/e-filter-rule.c:736
 msgid "_Find items:"
 msgstr "ବସ�ତ�ଗ�ଡ଼ିକ� ଖୋଜନ�ତ� (_F):"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:760
 msgid "All related"
 msgstr "ସମସ�ତ ସମ�ପର�କୀୟ"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "ଉତ�ତର ଦି�"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:762
 msgid "Replies and parents"
 msgstr "ଉତ�ତର �ବଂ ମୂଖ�ୟ ସ�ତର"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:763
 msgid "No reply or parent"
 msgstr "କୌଣସି ଉତ�ତର �ବଂ ମୂଖ�ୟ ସ�ତର ନାହି�"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/e-filter-rule.c:766
 msgid "I_nclude threads"
 msgstr "ସୂତ�ରକ� ଅନ�ତର�ଭ�କ�ତ କରନ�ତ� (_n)"
 
-#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "ଆସ�ଥିବା"
 
-#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:311
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "ଯାଉଥିବା"
 
+#: ../filter/e-rule-editor.c:265
+msgid "Add Rule"
+msgstr "ନିୟମ ୟୋଗକରନ�ତ�"
+
+#: ../filter/e-rule-editor.c:352
+msgid "Edit Rule"
+msgstr "ନିୟମ ସମ�ପାଦନ କରନ�ତ�"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "ଖରାପ ନିୟମିତ ଅଭିବ�ୟକ�ତି &quot;{0}&quot;"
@@ -10099,7 +9449,7 @@ msgstr "ଅନ�ପସ�ଥିତ ତାରିଖ।"
 msgid "Missing file name."
 msgstr "ଅନ�ପସ�ଥିତ ଫାଇଲ ନାମ।"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "ଅନ�ପସ�ଥିତ ନାମ।"
 
@@ -10123,19 +9473,15 @@ msgstr "ଆପଣଙà­�କà­� à¬�ହି ଛାଣକକà­� ନାମକରଣ à¬
 msgid "You must specify a file name."
 msgstr "ଆପଣଙ�କ� ଗୋଟି� ଫାଇଲନାମ ବାଛିବାକ� ହେବ।"
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>ନିୟମଗ�ଡ଼ିକ� ଛାଣନ�ତ� (_F)</b>"
-
-#: ../filter/filter.glade.h:2
+#: ../filter/filter.ui.h:1
 msgid "Compare against"
 msgstr "ବିପକ�ଷରେ ତ�ଳନା କରନ�ତ�"
 
-#: ../filter/filter.glade.h:4
+#: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
 msgstr "ମେଲ ପାଇ� ଛାଣନ�ତ�:"
 
-#: ../filter/filter.glade.h:5
+#: ../filter/filter.ui.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10143,7 +9489,7 @@ msgstr ""
 "ସନ�ଦେଶର ତାରିଖକ� ଉଲ�ଲିଖିତ ତାରିଖର 12:00am\n"
 "ସହିତ ତ�ଳନା କରାଯିବ।"
 
-#: ../filter/filter.glade.h:7
+#: ../filter/filter.ui.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10151,7 +9497,7 @@ msgstr ""
 "ସନ�ଦେଶର ତାରିଖକ� ଛାଣିବା ସମୟର ସମୟ\n"
 "ସହିତ ତ�ଳନା କରାଯିବ।"
 
-#: ../filter/filter.glade.h:9
+#: ../filter/filter.ui.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10159,223 +9505,873 @@ msgstr ""
 "ସନ�ଦେଶର ତାରିଖକ� ଛାଣିବା ସମୟର ସମୟ\n"
 "ସହିତ ତ�ଳନା କରାଯିବ।"
 
-#: ../filter/filter.glade.h:12
-msgid ""
-"ago\n"
-"in the future"
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "ନିୟମ ଛାଣନ�ତ� (_F)"
+
+#: ../filter/filter.ui.h:12
+#, fuzzy
+#| msgid "a table to view and select the current time range"
+msgid "a time relative to the current time"
+msgstr "ଉପସ�ଥିତ ସମୟ ପରିସରକ� ଦେଖିବା ପାଇ� �ବଂ ଚୟନ କରିବା ପାଇ� ଗୋଟି� ସାରଣୀ"
+
+#: ../filter/filter.ui.h:13
+#, fuzzy
+#| msgid "Tag"
+msgid "ago"
+msgstr "ସୂଚକ"
+
+#: ../filter/filter.ui.h:16
+#, fuzzy
+#| msgid ""
+#| "ago\n"
+#| "in the future"
+msgid "in the future"
 msgstr ""
 "ପୂର�ବର�\n"
 "ଭବିଷ�ୟତରେ"
 
-#: ../filter/filter.glade.h:14
-msgid ""
-"seconds\n"
-"minutes\n"
-"hours\n"
-"days\n"
-"weeks\n"
-"months\n"
-"years"
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+#, fuzzy
+#| msgid "Month"
+msgid "months"
+msgstr "ମାସ"
+
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:173
+msgid "seconds"
+msgstr "ସେକେଣ�ଡ"
+
+#: ../filter/filter.ui.h:20
+#, fuzzy
+#| msgid "Save the current file"
+msgid "the current time"
+msgstr "ସାମ�ପ�ରତିକ ଫାଇଲକ� ସଂରକ�ଷଣ କରନ�ତ�"
+
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
 msgstr ""
 
-#: ../filter/filter.glade.h:21
+#: ../filter/filter.ui.h:23
+#, fuzzy
+#| msgid "Headers"
+msgid "years"
+msgstr "ଶୀର�ଷକଗ�ଡିକ"
+
+#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
+#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
+#: ../widgets/misc/e-attachment-paned.c:153
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "ସଂଲଗ�ନ"
+msgstr[1] "ସଂଲଗ�ନ"
+
+#: ../mail/e-mail-attachment-bar.c:617
+#: ../widgets/misc/e-attachment-paned.c:612
+msgid "Icon View"
+msgstr "ଚିତ�ରସଂକେତ ଦ�ର�ଶ�ଯ"
+
+#: ../mail/e-mail-attachment-bar.c:618
+#: ../widgets/misc/e-attachment-paned.c:613
+msgid "List View"
+msgstr "ତାଲିକା ପ�ରଦର�ଶନ"
+
+#: ../mail/e-mail-browser.c:262
+#, fuzzy
+#| msgid "Subject"
+msgid "(No Subject)"
+msgstr "ବିଷୟ"
+
+#: ../mail/e-mail-display.c:66
+#, fuzzy
+#| msgid "_Add to Address Book"
+msgid "_Add to Address Book..."
+msgstr "ଠିକଣା ପ�ସ�ତକରେ ଯୋଗକରନ�ତ� (_A)"
+
+#: ../mail/e-mail-display.c:73
+#, fuzzy
+#| msgid "_To this Address"
+msgid "_To This Address"
+msgstr "�ହି ଠିକଣାକ� (_T)"
+
+#: ../mail/e-mail-display.c:80
+#, fuzzy
+#| msgid "_From this Address"
+msgid "_From This Address"
+msgstr "�ହି ଠିକଣାର� (_F)"
+
+#: ../mail/e-mail-display.c:89
+#, fuzzy
+#| msgid "Create _Search Folder"
+msgid "Create Search _Folder"
+msgstr "ସନ�ଧାନ ଫୋଲଡର ସୃଷ�ଟିକରନ�ତ� (_S)"
+
+#: ../mail/e-mail-label-dialog.c:220
+#, fuzzy
+#| msgid "Label _Name:"
+msgid "_Label name:"
+msgstr "ନାମପଟି ନାମ (_N):"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "ଆବଶ�ୟକୀୟ (_m)"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "କାର�ଯ�ୟ (_W)"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "ବ�ୟକ�ତିଗତ (_P)"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "କାର�ଯ�ୟ କରିବାକ� (_T)"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "ପରେ (_L)"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:472
+msgid "Add Label"
+msgstr "ନାମପଟି ଯୋଗକରନ�ତ�"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "ନାମପଟି ସମ�ପାଦନ କରନ�ତ�"
+
+#: ../mail/e-mail-label-manager.c:349
+#, fuzzy
+#| msgid ""
+#| "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgid ""
-"the current time\n"
-"the time you specify\n"
-"a time relative to the current time"
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr "ଟିପ�ପଣୀ: ନାମପଟିରେ ଅବରେଖନକ� ସ�ମରକ ଚିହ�ନାଇବାରେ ତାଲିକାରେ ବ�ୟବହାର କରାଯାଇଥା�।"
+
+#: ../mail/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "ରଙ�ଗ"
+
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "ନାମ"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2682
+#: ../modules/mail/e-mail-shell-view-private.c:953
+msgid "Inbox"
+msgstr "ଇନବକ�ସ"
+
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
+msgid "Drafts"
+msgstr "ଡ�ରାଫ�ଟଗ�ଡ଼ିକ"
+
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
+msgid "Outbox"
+msgstr "ଆଉଟବକ�ସ"
+
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
+msgid "Sent"
+msgstr "ପଠାଯାଇଛି"
+
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:572
+msgid "Templates"
+msgstr "ନମ�ନାଗ�ଡିକ"
+
+#: ../mail/e-mail-migrate.c:131
+msgid "Migrating..."
+msgstr "ସ�ଥାନ ପରିବର�ତ�ତନ କର�ଅଛି ..."
+
+#: ../mail/e-mail-migrate.c:164
+msgid "Migration"
+msgstr "ସ�ଥାନ ପରିବର�ତ�ତନ"
+
+#: ../mail/e-mail-migrate.c:204
+#, c-format
+msgid "Migrating '%s':"
+msgstr "`%s' ର ସ�ଥାନ ପରିବର�ତ�ତନ କର�ଅଛି:"
+
+#: ../mail/e-mail-migrate.c:643
+msgid "Migrating Folders"
+msgstr "ସ�ଥାନ ପରିବର�ତ�ତନ କର�ଅଛି"
+
+#: ../mail/e-mail-migrate.c:644
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Evolution ଡାକବାକ�ସର ଫୋଲଡରଗ�ଡ଼ିକର ସାରାଂଶ Evolution 2.24 SQLite ପରଠାର� ସ�ଥାନାନ�ତରିତ "
+"ହୋଇଛି।\n"
+"\n"
+"Evolution ଆପଣଙ�କର ଫୋଲଡରଗ�ଡ଼ିକ� ସ�ଥାନାନ�ତରିତ କରିବା ସମୟରେ ଦୟାକରି ଧୈର�ଯ�ୟ ରଖନ�ତ�..."
 
-#: ../filter/rule-editor.c:382
-msgid "Add Rule"
-msgstr "ନିୟମ ୟୋଗକରନ�ତ�"
+#: ../mail/e-mail-migrate.c:740
+#, fuzzy, c-format
+#| msgid "Unable to create local mail folders at `%s': %s"
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "`%s'ରେ ସ�ଥାନୀୟ ମେଲ ଫୋଲଡର ନିର�ମାଣ କରିବାରେ ଅସମର�ଥ: %s"
 
-#: ../filter/rule-editor.c:463
-msgid "Edit Rule"
-msgstr "ନିୟମ ସମ�ପାଦନ କରନ�ତ�"
+#. XXX e-error should provide a widget layout and API suitable
+#. *     for packing additional widgets to the right of the alert
+#. *     icon.  But for now, screw it.
+#: ../mail/e-mail-reader-utils.c:108
+#: ../modules/calendar/e-task-shell-view-actions.c:561
+#, fuzzy
+#| msgid "Do not ask me again."
+msgid "Do not ask me again"
+msgstr "ମୋତେ ପ�ଣିଥରେ ପଚାରନ�ତ� ନାହି�।"
 
-#: ../filter/rule-editor.c:809
-msgid "Rule name"
-msgstr "ନିୟମ ନାମ"
+#: ../mail/e-mail-reader.c:266 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "ଫୋଲଡରକ� ନକଲ କରନ�ତ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "ଲେଖକ ପସନ�ଦ"
+#: ../mail/e-mail-reader.c:266 ../mail/em-folder-utils.c:378
+msgid "C_opy"
+msgstr "ନକଲ କରନ�ତ� (_o)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
-msgstr "�ଠାରେ,ସ�ରକ�ଷା �ବଂ ସନ�ଦେଶ ପ�ରଦର�ଶନକ� ଅନ�ତର�ଭ�କ�ତ କରି ଡାକ ପସନ�ଦ ବିନ�ଯାସ କରନ�ତ�"
+#: ../mail/e-mail-reader.c:640 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "ଫୋଲଡରକ� ପଠାନ�ତ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "ବନାନ-ଯାଞ�ଚ, ହସ�ତାକ�ଷର, �ବଂ ସନ�ଦେଶ ଲେଖକକ� �ଠାରେ ବିନ�ୟାସ କରନ�ତ�"
+#: ../mail/e-mail-reader.c:640 ../mail/em-folder-utils.c:378
+msgid "_Move"
+msgstr "ଘ�ଞ�ଚାନ�ତ� (_M)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "ଆପଣଙ�କର ମେଲ ଖାତାକ� �ଠାରେ ବିନ�ୟାସ କରନ�ତ�"
+#: ../mail/e-mail-reader.c:866
+#, fuzzy
+#| msgid "Save Message..."
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "ସନ�ଦେଶ ସଂରକ�ଷଣ କରନ�ତ�..."
+msgstr[1] "ସନ�ଦେଶ ସଂରକ�ଷଣ କରନ�ତ�..."
+
+#. Translators: This is a part of a suggested file name
+#. * used when saving a message or multiple messages to an
+#. * mbox format, when the first message doesn't have a
+#. * Subject. The extension ".mbox" is appended to this
+#. * string, thus it will be something like "Message.mbox"
+#. * at the end.
+#: ../mail/e-mail-reader.c:887 ../plugins/groupwise-features/properties.ui.h:4
+#, fuzzy
+#| msgid "Message"
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "ସନ�ଦେଶ"
+msgstr[1] "ସନ�ଦେଶ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your network connection settings here"
-msgstr "ଆପଣଙ�କର ନେଟୱର�କ ବିନ�ୟାସକ�ାକ� �ଠାରେ ବିନ�ଯାସ କରନ�ତ�"
+#: ../mail/e-mail-reader.c:1145
+msgid "A_dd Sender to Address Book"
+msgstr "ଠିକଣା ବହିରେ ପ�ରେରକ ଯୋଗ କରନ�ତ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution ମେଲ"
+#: ../mail/e-mail-reader.c:1147
+#, fuzzy
+#| msgid "Add Sender to Address Book"
+msgid "Add sender to address book"
+msgstr "ଠିକଣା ପ�ସ�ତକରେ ପ�ରେରକକ� ମିଶାନ�ତ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution ମେଲ ଖାତା ବିନ�ୟାସ ନିୟନ�ତ�ରଣ"
+#: ../mail/e-mail-reader.c:1152
+msgid "Check for _Junk"
+msgstr "Junk ପାଇ� ଯାଞ�ଚ କରନ�ତ� (_J)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution ମେଲ ଉପାଦାନ"
+#: ../mail/e-mail-reader.c:1154
+msgid "Filter the selected messages for junk status"
+msgstr "ଅଦରକାରୀ ସ�ଥିତି ପାଇ� ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଛାଣନ�ତ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution ମେଲ ରଚୟିତା"
+#: ../mail/e-mail-reader.c:1159
+msgid "_Copy to Folder..."
+msgstr "ଫୋଲଡରେ ନକଲ କରନ�ତ� (_C)..."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution ମେଲ ଲେଖିବା ବିନ�ଯାସ କଣ�ଟ�ରୋଲ"
+#: ../mail/e-mail-reader.c:1161
+msgid "Copy selected messages to another folder"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅନ�ୟ �କ ଫୋଲଡରରେ ନକଲ କରନ�ତ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution ମେଲ ପସନ�ଦ ନିୟନ�ତ�ରଣ"
+#: ../mail/e-mail-reader.c:1166
+msgid "_Delete Message"
+msgstr "ସନ�ଦେଶ ବିଲୋପ କରନ�ତ� (_D)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Network configuration control"
-msgstr "Evolution ଫୋଲଡର ସଂଯୋଜନା ବିନ�ଯାସ ନିୟନ�ତ�ରଣ"
+#: ../mail/e-mail-reader.c:1168
+msgid "Mark the selected messages for deletion"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ ପାଇ� ଚିହ�ନଟ କରନ�ତ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:603
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:601 ../mail/mail-component.c:602
-#: ../mail/mail-component.c:771
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "ଡାକ"
+#: ../mail/e-mail-reader.c:1173
+msgid "Filter on Mailing _List..."
+msgstr "ମେଲିଙ�ଗ ତାଲିକାରେ ଛାଣନ�ତ� (_L)..."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
-msgid "Mail Accounts"
-msgstr "ମେଲ ଖାତା"
+#: ../mail/e-mail-reader.c:1175
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "�ହି ମେଲ ତାଲିକାକ� ସନ�ଦେଶଗ�ଡ଼ିକ� ଛାଣିବା ପାଇ� ଗୋଟି� ନିୟମ ସୃଷ�ଟି କରନ�ତ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:107
-msgid "Mail Preferences"
-msgstr "ମେଲ ପସନ�ଦ"
+#: ../mail/e-mail-reader.c:1180
+msgid "Filter on _Recipients..."
+msgstr "ଗ�ରହଣ କର�ତ�ତା ପାଖରେ ଛାଣନ�ତ� (_R)..."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Network Preferences"
-msgstr "ନେଟୱର�କ ପସନ�ଦ"
+#: ../mail/e-mail-reader.c:1182
+msgid "Create a rule to filter messages to these recipients"
+msgstr "�ହି ଗ�ରାହକମାନଙ�କ ପାଇ� ସନ�ଦେଶଗ�ଡ଼ିକ� ଛାଣିବା ପାଇ� ଗୋଟି� ନିୟମ ସୃଷ�ଟି କରନ�ତ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
-msgid "_Mail"
-msgstr "ମେଲ (_M)"
+#: ../mail/e-mail-reader.c:1187
+msgid "Filter on Se_nder..."
+msgstr "ପ�ରେରକ ଅନ�ସାରେ ଛାଣନ�ତ� (_n)..."
 
-#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
-msgid "_Forward"
-msgstr "ପରବର�ତ�ତୀ (_F)"
+#: ../mail/e-mail-reader.c:1189
+msgid "Create a rule to filter messages from this sender"
+msgstr "�ହି ପ�ରେରକମାନଙ�କ ପାଇ� ସନ�ଦେଶଗ�ଡ଼ିକ� ଛାଣିବା ପାଇ� ଗୋଟି� ନିୟମ ସୃଷ�ଟି କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1194
+msgid "Filter on _Subject..."
+msgstr "ବିଷୟ ଅନ�ସାରେ ଛାଣନ�ତ� (_S)..."
+
+#: ../mail/e-mail-reader.c:1196
+msgid "Create a rule to filter messages with this subject"
+msgstr "�ହି ବିଷୟ ସହିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଛାଣିବା ପାଇ� ଗୋଟି� ନିୟମ ସୃଷ�ଟି କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1201
+msgid "A_pply Filters"
+msgstr "ଛାଣକଗ�ଡ଼ିକ� ପ�ରୟୋଗ କରନ�ତ� (_p)"
+
+#: ../mail/e-mail-reader.c:1203
+msgid "Apply filter rules to the selected messages"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶ ପାଇ� ଛିଣକ ନିୟମ ପ�ରୟୋଗ କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1208
+msgid "_Find in Message..."
+msgstr "ସନ�ଦେଶ ମଧ�ଯରେ ଖୋଜନ�ତ� (_F)..."
+
+#: ../mail/e-mail-reader.c:1210
+msgid "Search for text in the body of the displayed message"
+msgstr "ପ�ରଦର�ଶିତ ସନ�ଦେଶର ଶରୀରରେ ପାଠ�ୟ ଖୋଜନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1215
+msgid "_Clear Flag"
+msgstr "ବିଶେଷ ସୂଚକକ� ସଫା କରନ�ତ� (_C)"
+
+#: ../mail/e-mail-reader.c:1217
+#, fuzzy
+#| msgid "Undelete the selected messages"
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "ଚୟିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ କରନ�ତ� ନାହି�"
+
+#: ../mail/e-mail-reader.c:1222
+msgid "_Flag Completed"
+msgstr "ବିଶେଷ ସୂଚକ ସମ�ପୂର�ଣ�ଣ ହୋଇଛି (_F)"
+
+#: ../mail/e-mail-reader.c:1224
+#, fuzzy
+#| msgid "Select all messages in the same thread as the selected message"
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "�କା ଥ�ରେଡ଼ରେ ଥିବା ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ବଚ�ଛିତ ସନ�ଦେଶ ପରି ଚୟନ କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1229
+msgid "Follow _Up..."
+msgstr "ଅନ�ସରଣ କରନ�ତ� (_U)..."
+
+#: ../mail/e-mail-reader.c:1231
+#, fuzzy
+#| msgid "Flag selected messages for follow-up"
+msgid "Flag the selected messages for follow-up"
+msgstr "ଅନ�ସରଣ କରିବା ପାଇ� ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ସୂଚାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1236
+msgid "_Attached"
+msgstr "ସଂଲଗ�ନ (_A)"
+
+#: ../mail/e-mail-reader.c:1238 ../mail/e-mail-reader.c:1245
+msgid "Forward the selected message to someone as an attachment"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� କାହା ପାଖକ� ସଂଲଗ�ନ କରି ପଠାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1243
+#, fuzzy
+#| msgid "_Forward as iCalendar"
+msgid "Forward As _Attached"
+msgstr "iCalendar ଭାବରେ ଅଗ�ରସରିତ କରନ�ତ� (_F)"
+
+#: ../mail/e-mail-reader.c:1250
+msgid "_Inline"
+msgstr "ଇନଲାଇନ (_I)"
+
+#: ../mail/e-mail-reader.c:1252 ../mail/e-mail-reader.c:1259
+msgid "Forward the selected message in the body of a new message"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଗୋଟି� ନୂତନ ସନ�ଦେଶ ଭିତରେ ପଠାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1257
+#, fuzzy
+#| msgid "_Forward style:"
+msgid "Forward As _Inline"
+msgstr "ଅଗ�ରସର ଶୈଳୀ (_F):"
+
+#: ../mail/e-mail-reader.c:1264
+msgid "_Quoted"
+msgstr "ଉଦ�ଧୃତ (_Q)"
+
+#: ../mail/e-mail-reader.c:1266 ../mail/e-mail-reader.c:1273
+msgid "Forward the selected message quoted like a reply"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଉତ�ତର ପରି ଉଦ�ଧୃତ କରି ପଠାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1271
+#, fuzzy
+#| msgid "_Forward style:"
+msgid "Forward As _Quoted"
+msgstr "ଅଗ�ରସର ଶୈଳୀ (_F):"
+
+#: ../mail/e-mail-reader.c:1278
+msgid "_Load Images"
+msgstr "ପ�ରତିଛବି ଧାରଣ କରନ�ତ� (_L)"
+
+#: ../mail/e-mail-reader.c:1280
+msgid "Force images in HTML mail to be loaded"
+msgstr "HTML ମେଲରେ ଥିବା ପ�ରତିଛବିଗ�ଡ଼ିକ� ଧାରଣ ହେବା ପାଇ� ବାଧ�ଯକରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1285
+msgid "_Important"
+msgstr "ଗ�ର�ତ�ବପୂର�ଣ�ଣ (_I)"
+
+#: ../mail/e-mail-reader.c:1287
+msgid "Mark the selected messages as important"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଦରକାରୀ ପରି ଚିହ�ନଟ କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1292
+msgid "_Junk"
+msgstr "Junk (_J)"
+
+#: ../mail/e-mail-reader.c:1294
+msgid "Mark the selected messages as junk"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅଦରକାରୀ ପରି ଚିହ�ନଟ କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1299
+msgid "_Not Junk"
+msgstr "Junk ନ�ହ� (_N)"
+
+#: ../mail/e-mail-reader.c:1301
+msgid "Mark the selected messages as not being junk"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅଦରକାରୀ ନ�ହ� ପରି ଚିହ�ନଟ କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1306
+msgid "_Read"
+msgstr "ପଢନ�ତ� (_R)"
+
+#: ../mail/e-mail-reader.c:1308
+msgid "Mark the selected messages as having been read"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଢ଼ାହୋଇଥିବା ପରି ଚିହ�ନଟ କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1313
+msgid "Uni_mportant"
+msgstr "ଅଦରକାରୀ (_m)"
+
+#: ../mail/e-mail-reader.c:1315
+msgid "Mark the selected messages as unimportant"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅଦରକାରୀ ପରି ଚିହ�ନଟ କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1320
+msgid "_Unread"
+msgstr "ପଢ଼ାହୋଇନଥିବା (_U)"
+
+#: ../mail/e-mail-reader.c:1322
+msgid "Mark the selected messages as not having been read"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଢ଼ାହୋଇନଥିବା ପରି ଚିହ�ନଟ କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1327
+msgid "_Edit as New Message..."
+msgstr "ନୂତନ ସନ�ଦେଶକ� ସମ�ପାଦନ କରନ�ତ� (_E)..."
+
+#: ../mail/e-mail-reader.c:1329
+msgid "Open the selected messages in the composer for editing"
+msgstr "ସମ�ପାଦନ ପାଇ� ରଚୟିତାରେ ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଖୋଲନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1334
+msgid "Compose _New Message"
+msgstr "ନୂତନ ସନ�ଦେଶ ଲେଖନ�ତ� (_N)"
+
+#: ../mail/e-mail-reader.c:1336
+msgid "Open a window for composing a mail message"
+msgstr "ମେଲ ସନ�ଦେଶ ଲେଖିବା ପାଇ� ଗୋଟି� ୱିଣ�ଡୋ ଖୋଲନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1341
+msgid "_Open in New Window"
+msgstr "ନୂତନ ୱିଣ�ଡୋରେ ଖୋଲନ�ତ� (_O)"
+
+#: ../mail/e-mail-reader.c:1343
+msgid "Open the selected messages in a new window"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଗୋଟି� ନୂତନ ୱିଣ�ଡୋରେ ଖୋଲନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1348
+msgid "_Move to Folder..."
+msgstr "ଫୋଲଡରକ� ଘ�ଞ�ଚାନ�ତ� (_M)..."
+
+#: ../mail/e-mail-reader.c:1350
+msgid "Move selected messages to another folder"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅନ�ୟ �କ ଫୋଲଡରକ� ଘ�ଞ�ଚାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1355
+msgid "_Next Message"
+msgstr "ପରବର�ତ�ତୀ ସନ�ଦେଶ (_N)"
+
+#: ../mail/e-mail-reader.c:1357
+msgid "Display the next message"
+msgstr "ପରବର�ତ�ତି ସନ�ଦେଶକ� ଦର�ଶାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1362
+msgid "Next _Important Message"
+msgstr "ପରବର�ତ�ତୀ ଗ�ର�ତ�ବପୂର�ଣ�ଣ ସନ�ଦେଶ (_I)"
+
+#: ../mail/e-mail-reader.c:1364
+msgid "Display the next important message"
+msgstr "ପରବର�ତ�ତି ଦରକାରୀ ସନ�ଦେଶକ� ଦର�ଶାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1369
+msgid "Next _Thread"
+msgstr "ପରବର�ତ�ତୀ ସ�ତା (_T)"
+
+#: ../mail/e-mail-reader.c:1371
+msgid "Display the next thread"
+msgstr "ପରବର�ତ�ତି ଥ�ରେଡ଼କ� ଦର�ଶାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1376
+msgid "Next _Unread Message"
+msgstr "ପରବର�ତ�ତୀ ପଢ଼ାହୋଇନଥିବା ସନ�ଦେଶ (_U)"
+
+#: ../mail/e-mail-reader.c:1378
+msgid "Display the next unread message"
+msgstr "ପରବର�ତ�ତି ଅପଠିତ ସନ�ଦେଶକ� ଦର�ଶାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1383
+msgid "_Previous Message"
+msgstr "ପୂର�ବବର�ତ�ତୀ ସନ�ଦେଶ (_P)"
+
+#: ../mail/e-mail-reader.c:1385
+msgid "Display the previous message"
+msgstr "ପୂର�ବ ସନ�ଦେଶକ� ଦର�ଶାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1390
+msgid "Pr_evious Important Message"
+msgstr "ପୂର�ବତନ ଗ�ର�ତ�ବପୂର�ଣ�ଣ ସନ�ଦେଶ (_e)"
 
-#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1330
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../mail/e-mail-reader.c:1392
+msgid "Display the previous important message"
+msgstr "ପୂର�ବର ଦରକାରୀ ସନ�ଦେଶକ� ଦର�ଶାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1397
+msgid "P_revious Unread Message"
+msgstr "ପୂର�ବର ପଢ଼ାହୋଇନଥିବା ସନ�ଦେଶ (_r)"
+
+#: ../mail/e-mail-reader.c:1399
+msgid "Display the previous unread message"
+msgstr "ପୂର�ବର� ପଢ଼ାହୋଇନଥିବା ସନ�ଦେଶକ� ଦର�ଶାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1406
+msgid "Print this message"
+msgstr "�ହି ସନ�ଦେଶକ� ମ�ଦ�ରଣ କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1413
+msgid "Preview the message to be printed"
+msgstr "ମ�ଦ�ରଣ କରିବାକ� ଥିବା ସନ�ଦେଶକ� ପ�ରାକଦର�ଶନ କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1418
+msgid "Re_direct"
+msgstr "ପ�ଣି ପଠାନ�ତ� (_d)"
+
+#: ../mail/e-mail-reader.c:1420
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "ଚୟିତ ସନ�ଦେଶକ� କେହି ଜଣକ ପାଖକ� ପ�ଣି ପଠାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-attachment-handler.c:139
+msgid "Reply to _All"
+msgstr "ସମସ�ତଙ�କ� ଉତ�ତର ଦିଅନ�ତ� (_A)"
+
+#: ../mail/e-mail-reader.c:1427
+#, fuzzy
+#| msgid "Compose a reply to all of the recipients of the selected message"
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶର ଗ�ରାହକ ପାଇ� ଗୋଟି� ଉତ�ତର ଲେଖନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1432
+msgid "Reply to _List"
+msgstr "ତାଲିକାକ� ଉତ�ତର ଦିଅନ�ତ� (_L)"
+
+#: ../mail/e-mail-reader.c:1434
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶର ମେଲ ତାଲିକା ପାଇ� ଗୋଟି� ଉତ�ତର ଲେଖନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1439
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "ପ�ରେରକକ� ଉତ�ତର ଦିଅନ�ତ�"
 
-#. Translators: This is only for multiple messages.
-#: ../mail/e-attachment-handler-mail.c:334
-#, c-format
-msgid "%d attached messages"
-msgstr "%d ସଂଲଗ�ନିତ ସନ�ଦେଶ"
+#: ../mail/e-mail-reader.c:1441
+msgid "Compose a reply to the sender of the selected message"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶର ପ�ରେରକଙ�କ ପାଖକ� ଗୋଟି� ଉତ�ତର ଲେଖନ�ତ�"
 
-#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1654
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:140
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "ସଂଲଗ�ନ"
-msgstr[1] "ସଂଲଗ�ନ"
+#: ../mail/e-mail-reader.c:1446
+#, fuzzy
+#| msgid "Save as..."
+msgid "_Save as mbox..."
+msgstr "�ପରି ଭାବରେ ସଂରକ�ଷିତ କରନ�ତ�..."
 
-#: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:599
-msgid "Icon View"
-msgstr "ଚିତ�ରସଂକେତ ଦ�ର�ଶ�ଯ"
+#: ../mail/e-mail-reader.c:1448
+#, fuzzy
+#| msgid "Save the selected messages as a text file"
+msgid "Save selected messages as an mbox file"
+msgstr "ଚୟିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପାଠ�ଯ ଫାଇଲ ଭାବରେ ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../mail/e-mail-attachment-bar.c:616
-#: ../widgets/misc/e-attachment-paned.c:600
-msgid "List View"
-msgstr "ତାଲିକା ପ�ରଦର�ଶନ"
+#: ../mail/e-mail-reader.c:1453
+msgid "Search Folder from Mailing _List..."
+msgstr "ମେଲିଙ�ଗ ତାଲିକାର� ଫୋଲଡର ଖୋଜନ�ତ� (_L)..."
 
-#: ../mail/e-mail-search-bar.c:76
-#, c-format
-msgid "Matches: %d"
-msgstr "ମେଳକଗ�ଡିକ: %d"
+#: ../mail/e-mail-reader.c:1455
+#, fuzzy
+#| msgid "Create a Search Folder for this mailing list"
+msgid "Create a search folder for this mailing list"
+msgstr "�ହି ମେଲ ତାଲିକା ପାଇ� ଗୋଟି� ସନ�ଧାନ ଫୋଲଡର ନିର�ମାଣ କରନ�ତ�"
 
-#: ../mail/e-mail-search-bar.c:520
-msgid "Close the find bar"
-msgstr "�ହି ସନ�ଧାନ ପଟିକ� ବନ�ଦ କରନ�ତ�"
+#: ../mail/e-mail-reader.c:1460
+msgid "Search Folder from Recipien_ts..."
+msgstr "ଗ�ରାହକଙ�କ ପାଖର� ଫୋଲଡର ଖୋଜନ�ତ� (_t)..."
 
-#: ../mail/e-mail-search-bar.c:528
-msgid "Fin_d:"
-msgstr "ଖୋଜନ�ତ� (_d):"
+#: ../mail/e-mail-reader.c:1462
+#, fuzzy
+#| msgid "Create a Search Folder for these recipients"
+msgid "Create a search folder for these recipients"
+msgstr "�ହି ଗ�ରାହକ ପାଇ� ଗୋଟି� ସନ�ଧାନ ଫୋଲଡର ନିର�ମାଣ କରନ�ତ�"
 
-#: ../mail/e-mail-search-bar.c:540
-msgid "Clear the search"
-msgstr "ସନ�ଧାନକ� ସଫା କରନ�ତ�"
+#: ../mail/e-mail-reader.c:1467
+msgid "Search Folder from Sen_der..."
+msgstr "ପ�ରେରକ ପାଖର� ଫୋଲଡ଼ରକ� ସନ�ଧାନ କରନ�ତ� (_d)..."
 
-#: ../mail/e-mail-search-bar.c:559
-msgid "_Previous"
-msgstr "ପୂର�ବବର�ତ�ତୀ (_P)"
+#: ../mail/e-mail-reader.c:1469
+#, fuzzy
+#| msgid "Create a Search Folder for this sender"
+msgid "Create a search folder for this sender"
+msgstr "�ହି ପ�ରେରକ ପାଇ� ଗୋଟି� ସନ�ଧାନ ଫୋଲଡର ନିର�ମାଣ କରନ�ତ�"
 
-#: ../mail/e-mail-search-bar.c:565
-msgid "Find the previous occurrence of the phrase"
-msgstr ""
+#: ../mail/e-mail-reader.c:1474
+msgid "Search Folder from S_ubject..."
+msgstr "ବିଷୟର� ଫୋଲଡର ଖୋଜନ�ତ� (_u)..."
 
-#: ../mail/e-mail-search-bar.c:573
-msgid "_Next"
-msgstr "ପରବର�ତ�ତୀ (_N)"
+#: ../mail/e-mail-reader.c:1476
+#, fuzzy
+#| msgid "Create a Search Folder for this subject"
+msgid "Create a search folder for this subject"
+msgstr "�ହି ବିଷୟ ପାଇ� ଗୋଟି� ସନ�ଧାନ ଫୋଲଡର ନିର�ମାଣ କରନ�ତ�"
 
-#: ../mail/e-mail-search-bar.c:579
-msgid "Find the next occurrence of the phrase"
-msgstr ""
+#: ../mail/e-mail-reader.c:1481
+msgid "_Message Source"
+msgstr "ସନ�ଦେଶ ଉତ�ସ (_M)"
 
-#: ../mail/e-mail-search-bar.c:587
-msgid "Mat_ch case"
-msgstr "�ହି ବିଷୟକ� ମେଳାନ�ତ� (_c)"
+#: ../mail/e-mail-reader.c:1483
+msgid "Show the raw email source of the message"
+msgstr "ସନ�ଦେଶର ଅସମ�ପୂର�ଣ�ଣ ଇମେଲ ଉତ�ସକ� ଦର�ଶାନ�ତ�"
 
-#: ../mail/e-mail-search-bar.c:615
-msgid "Reached bottom of page, continued from top"
-msgstr ""
+#: ../mail/e-mail-reader.c:1495
+msgid "_Undelete Message"
+msgstr "ଅପସାରଣ କରାଯାଇନଥିବା ସନ�ଦେଶ (_U)"
 
-#: ../mail/e-mail-search-bar.c:637
-msgid "Reached top of page, continued from bottom"
-msgstr ""
+#: ../mail/e-mail-reader.c:1497
+msgid "Undelete the selected messages"
+msgstr "ଚୟିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ କରନ�ତ� ନାହି�"
+
+#: ../mail/e-mail-reader.c:1502
+msgid "_Normal Size"
+msgstr "ସାଧାରଣ ଆକାର (_N)"
+
+#: ../mail/e-mail-reader.c:1504
+msgid "Reset the text to its original size"
+msgstr "ପାଠ�ଯକ� ତାହାର ପ�ରକୃତ ଆକାରକ� ପ�ନଃସ�ଥାପନ କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1509
+msgid "_Zoom In"
+msgstr "ବଡ଼ କରନ�ତ� (_Z)"
+
+#: ../mail/e-mail-reader.c:1511
+msgid "Increase the text size"
+msgstr "ପାଠ�ୟର ଆକାର ବୃଦ�ଧି କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1516
+msgid "Zoom _Out"
+msgstr "ସାନ କରନ�ତ� (_O)"
+
+#: ../mail/e-mail-reader.c:1518
+msgid "Decrease the text size"
+msgstr "ପାଠ�ୟର ଆକାର କମ କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1525
+msgid "Create R_ule"
+msgstr "ନିୟମ ସୃଷ�ଟି କରନ�ତ� (_u)"
+
+#: ../mail/e-mail-reader.c:1532
+msgid "Ch_aracter Encoding"
+msgstr "ଅକ�ଷର ସାଙ�କେତିକରଣ (_a)"
+
+#: ../mail/e-mail-reader.c:1539
+#, fuzzy
+#| msgid "F_orward As..."
+msgid "F_orward As"
+msgstr "ପରି ଅଗ�ରସର ହୋଇଛି (_o)..."
+
+#: ../mail/e-mail-reader.c:1546
+msgid "_Go To"
+msgstr "�ଠାକ� ଯାଆନ�ତ� (_G)"
+
+#: ../mail/e-mail-reader.c:1553
+#, fuzzy
+#| msgid "Mar_k as"
+msgid "Mar_k As"
+msgstr "ପରି ଚିହ�ନଟ କରନ�ତ� (_k)"
+
+#: ../mail/e-mail-reader.c:1560
+msgid "_Message"
+msgstr "ସନ�ଦେଶ (_M)"
+
+#: ../mail/e-mail-reader.c:1567
+msgid "_Zoom"
+msgstr "_ଆକାରବୃଦ�ଧିକରଣ"
+
+#: ../mail/e-mail-reader.c:1592
+msgid "Mark for Follo_w Up..."
+msgstr "ଅନ�ସରଣ କରିବା ପାଇ� ଚିହ�ନଟ କରନ�ତ� (_w)..."
+
+#: ../mail/e-mail-reader.c:1600
+msgid "Mark as _Important"
+msgstr "ଗ�ର�ତ�ବପୂର�ଣ�ଣ ପରି ଚିହ�ନଟ କରନ�ତ� (_I)"
+
+#: ../mail/e-mail-reader.c:1604
+msgid "Mark as _Junk"
+msgstr "Junk ପରି ଚିହ�ନଟ କରନ�ତ� (_J)"
+
+#: ../mail/e-mail-reader.c:1608
+msgid "Mark as _Not Junk"
+msgstr "Junk ପରି ଚିହ�ନଟ କରନ�ତ� (_N)"
+
+#: ../mail/e-mail-reader.c:1612
+msgid "Mar_k as Read"
+msgstr "ପଢ଼ାଯାଇଥିବା ପରି ଚିହ�ନଟକରନ�ତ� (_k)"
+
+#: ../mail/e-mail-reader.c:1616
+#, fuzzy
+#| msgid "Mark as Un_important"
+msgid "Mark as Uni_mportant"
+msgstr "ଗ�ର�ତ�ବପୂର�ଣ�ଣ ନ�ହ� ପରି ଚିହ�ନଟ କରନ�ତ� (_i)"
+
+#: ../mail/e-mail-reader.c:1620
+msgid "Mark as _Unread"
+msgstr "ପଢ଼ାହୋଇନଥିବା ପରି ଚିହ�ନଟ କରନ�ତ� (_U)"
+
+#: ../mail/e-mail-reader.c:1656
+msgid "_Caret Mode"
+msgstr "କ�ଯାରେଟ ଧାରା (_C)"
+
+#: ../mail/e-mail-reader.c:1658
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "ଦର�ଶାଯାଇଥିବା ସନ�ଦେଶଗ�ଡ଼ିକର ଶରୀରରେ ଦପଦପ ହେଉଥିବା ସୂଚକକ� ଦର�ଶାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1664
+msgid "All Message _Headers"
+msgstr "ସମସ�ତ ସନ�ଦେଶ ଶୀର�ଷକଗ�ଡିକ (_H)"
+
+#: ../mail/e-mail-reader.c:1666
+msgid "Show messages with all email headers"
+msgstr "ସମସ�ତ ଇମେଲ ଶୀର�ଷକଗ�ଡ଼ିକ ସହିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଦର�ଶାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:1880
+msgid "Unable to retrieve message"
+msgstr "ସନ�ଦେଶ କାଢ଼ିବାରେ ଅସମର�ଥ"
+
+#: ../mail/e-mail-reader.c:1884 ../mail/e-mail-reader.c:1944
+#: ../mail/mail-ops.c:1843
+#, fuzzy, c-format
+#| msgid "Retrieving message %s"
+msgid "Retrieving message '%s'"
+msgstr "ସନ�ଦେଶ %sକ� ପ�ନର�ଦ�ଧାର କର�ଅଛି"
+
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:2460
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
+#: ../widgets/misc/e-account-tree-view.c:234
+msgid "Default"
+msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ"
+
+#: ../mail/e-mail-reader.c:2581
+#: ../modules/mail/e-mail-attachment-handler.c:132
+msgid "_Forward"
+msgstr "ପରବର�ତ�ତୀ (_F)"
+
+#: ../mail/e-mail-reader.c:2582
+msgid "Forward the selected message to someone"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� କାହା ପାଖକ� ପଠାନ�ତ�"
+
+#: ../mail/e-mail-reader.c:2626 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:753
+msgid "Delete"
+msgstr "ଅପସାରଣ କରନ�ତ�"
+
+#: ../mail/e-mail-reader.c:2630
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "ପରବର�ତ�ତୀ"
+
+#: ../mail/e-mail-reader.c:2634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "ପୂର�ବବର�ତ�ତୀ"
+
+#: ../mail/e-mail-reader.c:2638 ../mail/mail-dialogs.ui.h:19
+msgid "Reply"
+msgstr "ଉତ�ତର ଦିଅନ�ତ�"
+
+#: ../mail/e-mail-tag-editor.c:292
+msgid "Flag to Follow Up"
+msgstr "ଅନ�ସରଣ କରିବା ପାଇ� ବିଶେଷ ସୂଚକ"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:308
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:73
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "କୌଣସି ଗୋପନୀୟତା ନାହି�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:312
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:121
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS ଗୋପନୀୟତା"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:316
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL ଗୋପନୀୟତା"
 
-#: ../mail/em-account-editor.c:407
+#: ../mail/em-account-editor.c:594
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ଅନ�ମତି ପତ�ର"
 
-#: ../mail/em-account-editor.c:414
+#: ../mail/em-account-editor.c:601
 #, c-format
 msgid ""
 "\n"
@@ -10388,126 +10384,176 @@ msgstr ""
 "%s ପାଇ� ଭଲ ଭାବରେ ପଢ଼ନ�ତ�\n"
 "�ବଂ �ହାକ� ଗ�ରହଣ କରିବା ପାଇ� ଯାଞ�ଚ ବାକ�ସକ� ଟିକ କରନ�ତ�\n"
 
-#: ../mail/em-account-editor.c:486 ../mail/em-filter-folder-element.c:258
-#: ../mail/em-vfolder-rule.c:513
-msgid "Select Folder"
-msgstr "ଫୋଲଡର ବାଛନ�ତ�"
-
-#: ../mail/em-account-editor.c:610 ../mail/em-account-editor.c:655
-#: ../mail/em-account-editor.c:722 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "ସ�ୱୟଂ ସୃଷ�ଟି"
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
+#, fuzzy
+#| msgid "None"
+msgctxt "mail-signature"
+msgid "None"
+msgstr "କିଛି ନ�ହେ�"
 
-#: ../mail/em-account-editor.c:780
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "କେବେ ନ�ହେ�"
 
-#: ../mail/em-account-editor.c:781
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "ସର�ବଦା"
 
-#: ../mail/em-account-editor.c:782
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "ପ�ରତ�ୟେକ ସନ�ଦେଶ ପାଇ� ପଚାରନ�ତ�"
 
-#: ../mail/em-account-editor.c:1854 ../mail/mail-config.glade.h:100
-msgid "Identity"
-msgstr "ପରିଚୟ"
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
+#, fuzzy
+#| msgid "None"
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "କିଛି ନ�ହେ�"
+
+#: ../mail/em-account-editor.c:2056
+msgid "Mail Configuration"
+msgstr "ମେଲ ସଂରଚନା"
 
-#: ../mail/em-account-editor.c:1905 ../mail/mail-config.glade.h:127
+#: ../mail/em-account-editor.c:2057
+#, fuzzy
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Forward\" to begin. "
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"Evolution ମେଲ ସଂରଚନା ସହାୟକରେ ଆପଣଙ�କ� ସ�ୱାଗତ କର�ଅଛ�।\n"
+"\n"
+"ଆରମ�ଭ କରିବା ପାଇ� \"ଅଗ�ରସର ହ�ଅନ�ତ�\" କ� କ�ଲିକ କରନ�ତ�।"
+
+#: ../mail/em-account-editor.c:2060
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"ଦୟାକରି ତଳେ ଆପଣଙ�କର ନାମ �ବଂ ଇମେଲ ଟିକଣା ଭରଣ କରନ�ତ�। \"ବୈକଳ�ପିକ\" କ�ଷେତ�ରଟିକ� ତଳେ ପ�ରଣ "
+"କରାଯିବା ଆବଶ�ୟକ ନ�ହ�, ଅନ�ୟଥା ଆପଣ �ହି ସୂଚନାକ� ପଠାଇବାକ�ଥିବା ଇମେଲରେ ଅନ�ତର�ଭ�କ�ତ କରିବାକ� "
+"ଇଚ�ଛାପ�ରକାଶ କରନ�ତି।"
+
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2227
+#: ../mail/mail-config.ui.h:91
 msgid "Receiving Email"
 msgstr "ଗ�ରହଣ କରିଥିବା ଇମେଲ"
 
-#: ../mail/em-account-editor.c:2177
+#: ../mail/em-account-editor.c:2063
+#, fuzzy
+#| msgid "Please select among the following options"
+msgid "Please configure the following account settings."
+msgstr "ଦୟାକରି ନିମ�ନଲିଖିତ ଖାତା ସଂରଚନାଗ�ଡ଼ିକ� ମନୋନୀତ କରନ�ତ�।"
+
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2705
+msgid "Sending Email"
+msgstr "ପଠାଯାଇଥିବା ଇମେଲ"
+
+#: ../mail/em-account-editor.c:2066
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"ଦୟାକରି ଆପଣ ପଠାଉଥିବା ମେଲ ବିଷୟରେ ସୂଚନା ଭରଣ କରନ�ତ�। ଯଦି ଆପଣ ନିଶ�ଚିତ ନ�ହ�ନ�ତି, ତେବେ ଆପଣଙ�କର "
+"ତନ�ତ�ର ପ�ରଶାସକ ଅଥବା ଇଣ�ଟର�ନେଟ ସର�ଭିସ ପ�ରଦାତାଙ�କ� ପଚାରନ�ତ�।"
+
+#: ../mail/em-account-editor.c:2068
+msgid "Account Management"
+msgstr "ହିସାବ ଖାତା ପରିଚାଳନା"
+
+#: ../mail/em-account-editor.c:2069
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"�ହି ଖାତା ପାଇ� ନିମ�ନରେ ଦୟାକରି ଗୋଟି� ବର�ଣ�ଣନାତ�ମକ ନାମ ଭରଣ କରନ�ତ�।\n"
+"�ହି ନାମକ� କେବଳ ପ�ରଦର�ଶନ ଉଦ�ଦେଶ�ୟରେ ବ�ୟବାହର କରାଯାଇଥା�।"
+
+#: ../mail/em-account-editor.c:2073
+msgid "Done"
+msgstr "ସମ�ପନ�ନ"
+
+#: ../mail/em-account-editor.c:2074
+#, fuzzy
+#| 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."
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"ଅଭିନନ�ଦନ, ଆପମଙ�କର ମେଲ ସଂରଚନାଟି ସମ�ପୂର�ଣ�ଣ ହୋଇଛି।\n"
+"\n"
+"ଆପଣ ବର�ତ�ତମାନ Evolution ବ�ୟବହାର କରି ଇମେଲ ପଠାଇବା �ବଂ ଗ�ରହଣ\n"
+"କରିବାକ� ପ�ରସ�ତ�ତ ଅଛନ�ତି। \n"
+"\n"
+"ଆପଣଙ�କର ସଂରଚନାକ� ସଂରକ�ଷଣ କରିବା ପାଇ�\"ପ�ରୟୋଗ କରନ�ତ�\" କ� କ�ଲିକ କରନ�ତ�।"
+
+#: ../mail/em-account-editor.c:2514
 msgid "Check for _new messages every"
 msgstr "ନୂତନ ସନ�ଦେଶକ� ଯାଞ�ଚକରନ�ତ� (_n)"
 
-#: ../mail/em-account-editor.c:2185
+#: ../mail/em-account-editor.c:2522
 msgid "minu_tes"
 msgstr "ମିନିଟ (_t)"
 
-#: ../mail/em-account-editor.c:2375 ../mail/mail-config.glade.h:138
-msgid "Sending Email"
-msgstr "ପଠାଯାଇଥିବା ଇମେଲ"
-
-#: ../mail/em-account-editor.c:2434 ../mail/mail-config.glade.h:73
-msgid "Defaults"
-msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ"
-
-#. Security settings
-#: ../mail/em-account-editor.c:2500 ../mail/mail-config.glade.h:133
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2831 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "ସ�ରକ�ଷା"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2537 ../mail/em-account-editor.c:2632
+#: ../mail/em-account-editor.c:2876 ../mail/em-account-editor.c:2944
 msgid "Receiving Options"
 msgstr "ଗ�ରହଣ କରାଯାଇଥିବା ବିକଳ�ପଗ�ଡ଼ିକ"
 
-#: ../mail/em-account-editor.c:2538 ../mail/em-account-editor.c:2633
+#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
 msgid "Checking for New Messages"
 msgstr "ନୂତନ ସନ�ଦେଶଗ�ଡ଼ିକ ପାଇ� ଯାଞ�ଚକରନ�ତ�"
 
-#: ../mail/em-account-editor.c:3097 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3413
 msgid "Account Editor"
 msgstr "ଖାତା ସମ�ପାଦକ"
 
-#: ../mail/em-account-editor.c:3097 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:3413
 msgid "Evolution Account Assistant"
 msgstr "Evolution ଖାତା ସହଯୋଗୀ"
 
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
-msgid "[Default]"
-msgstr "[ପୂର�ବନିର�ଦ�ଧାରିତ]"
-
-#: ../mail/em-account-prefs.c:488
-msgid "Account name"
-msgstr "ଖାତା ନାମ"
-
-#: ../mail/em-account-prefs.c:490
-msgid "Protocol"
-msgstr "ପ�ରୋଟୋକଲ"
-
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1162 ../mail/mail-signature-editor.c:478
-msgid "Unnamed"
-msgstr "ନାମହୀନ"
-
-#: ../mail/em-composer-prefs.c:947
-msgid "Language(s)"
-msgstr "ଭାଷା(ଗ�ଡ଼ିକ)"
-
-#: ../mail/em-composer-prefs.c:980
-msgid "Add signature script"
-msgstr "ହସ�ତାକ�ଷର ସ�କ�ରିପ�ଟ ଯୋଗକରନ�ତ�"
-
-#: ../mail/em-composer-prefs.c:1022
-msgid "Signature(s)"
-msgstr "ହସ�ତାକ�ଷର(ଗ�ଡ଼ିକ)"
-
-#: ../mail/em-composer-utils.c:1108 ../mail/em-format-quote.c:415
-msgid "-------- Forwarded Message --------"
-msgstr "-------- ପଠାଯାଇଥିବା ସନ�ଦେଶ --------"
-
-#: ../mail/em-composer-utils.c:1560
-msgid "No destination address provided, forward of the message has been cancelled."
-msgstr "କୌଣସି ଲକ�ଷ�ଯସ�ଥଳ ଠିକଣା ଦିଆହୋଇନାହି�, ସନ�ଦେଶର ଅଗ�ରସରକ� ବାତିଲ କରାଯାଇଛି।"
+#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
+#: ../mail/em-composer-utils.c:1570
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr ""
 
-#: ../mail/em-composer-utils.c:1566
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "ବ�ୟବହାର କରିବା ପାଇ� କୌଣସି ଖାତା ମିଲିଲା ନାହି�, ସନ�ଦେଶର ଅଗ�ରସରଣକ� ବାତିଲ କରାଯାଇଛି।"
+#. Translators: %s is the subject of the email message
+#: ../mail/em-composer-utils.c:1618
+#, fuzzy, c-format
+#| msgid "Mail Notification Properties"
+msgid "Delivery Notification for: \"%s\""
+msgstr "ମେଲ ବିଜ�ଞପ�ତି ଗ�ଣଧର�ମ"
 
-#: ../mail/em-composer-utils.c:2034
+#: ../mail/em-composer-utils.c:1947
 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:2081
+#: ../mail/em-composer-utils.c:1994
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10515,13 +10561,21 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../mail/em-composer-utils.c:2224
+#: ../mail/em-composer-utils.c:2138
 msgid "-----Original Message-----"
 msgstr "-----ପ�ରକୃତ ସନ�ଦେଶ-----"
 
-#: ../mail/em-filter-editor.c:174
-msgid "_Filter Rules"
-msgstr "ନିୟମ ଛାଣନ�ତ� (_F)"
+#: ../mail/em-composer-utils.c:2319
+msgid "Posting destination"
+msgstr "ଲକ�ଷ�ୟସ�ଥଳ ଦାଖଲ କରନ�ତ�"
+
+#: ../mail/em-composer-utils.c:2320
+msgid "Choose folders to post the message to."
+msgstr "ସନ�ଦେଶକ� ଦାଖଲ କରିବା ପାଇ� ଫୋଲଡର ବାଛନ�ତ�।"
+
+#: ../mail/em-filter-folder-element.c:260
+msgid "Select Folder"
+msgstr "ଫୋଲଡର ବାଛନ�ତ�"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -10544,10 +10598,6 @@ msgstr "ବିପ"
 msgid "Completed On"
 msgstr "ରେ ସମାପ�ତ"
 
-#: ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "ଫୋଲଡରକ� ନକଲ କରନ�ତ�"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "ତାରିଖ ଗ�ରହଣ କରାଯାଇଛି"
@@ -10556,14 +10606,6 @@ msgstr "ତାରିଖ ଗ�ରହଣ କରାଯାଇଛି"
 msgid "Date sent"
 msgstr "ପଠାଯାଇଥିବା ତାରିଖ"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:770
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "ଅପସାରଣ କରନ�ତ�"
-
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "ଅପସାରିତ"
@@ -10612,7 +10654,7 @@ msgstr "ଅନ�ସରଣ"
 msgid "Forward to"
 msgstr "ଆଗକ�"
 
-#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
+#: ../mail/em-filter-i18n.h:30
 msgid "Important"
 msgstr "ଗ�ର�ତ�ବପୂର�ଣ�ଣ"
 
@@ -10640,14 +10682,13 @@ msgstr "ସେଟ କରାଯାଇନାହି�"
 msgid "is set"
 msgstr "ସେଟ ହୋଇଛି"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:101
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:62
 msgid "Junk"
-msgstr "Junk"
+msgstr "ଜଙ�କ"
 
 #: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
-msgstr "Junk ପରୀକ�ଷା"
+msgstr "ଜଙ�କ ପରୀକ�ଷା"
 
 #: ../mail/em-filter-i18n.h:43
 msgid "Label"
@@ -10681,10 +10722,6 @@ msgstr "ସନ�ଦେଶଟି Junk ନ�ହେ�"
 msgid "Message Location"
 msgstr "ସନ�ଦେଶ ଅବସ�ଥିତି"
 
-#: ../mail/em-filter-i18n.h:51
-msgid "Move to Folder"
-msgstr "ଫୋଲଡରକ� ପଠାନ�ତ�"
-
 #: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "ପାଇପ ପାଇ� ପ�ରୋଗ�ରାମ"
@@ -10693,8 +10730,8 @@ msgstr "ପାଇପ ପାଇ� ପ�ରୋଗ�ରାମ"
 msgid "Play Sound"
 msgstr "ଧ�ୱନି ଚଲାନ�ତ�"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:62
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "ପଢନ�ତ�"
 
@@ -10770,77 +10807,21 @@ msgstr "ସହିତ ଆରମ�ଭ ହୋଇଥା�"
 msgid "Stop Processing"
 msgstr "ପ�ରକ�ରିୟା ବନ�ଦକରନ�ତ�"
 
-#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:305
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
-msgid "Subject"
-msgstr "ବିଷୟ"
-
 #: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "ସେଟହୋଇନଥିବା ସ�ଥିତି"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "ତାପରେ"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "କାର�ଯ�ୟ ୟୋଗକରନ�ତ� (_t)"
 
-#: ../mail/em-folder-browser.c:194
-msgid "C_reate Search Folder From Search..."
-msgstr "ସନ�ଧାନର� ସନ�ଧାନ ଫୋଲଡର ସୃଷ�ଟିକରନ�ତ� (_r)..."
-
-#: ../mail/em-folder-browser.c:219
-msgid "All Messages"
-msgstr "ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ"
-
-#: ../mail/em-folder-browser.c:220
-msgid "Unread Messages"
-msgstr "ଅପଠିତ ସଂଦେଶଗ�ଡିକ"
-
-#: ../mail/em-folder-browser.c:222
-msgid "No Label"
-msgstr "ନାହି� ନାମପଟି"
-
-#: ../mail/em-folder-browser.c:229
-msgid "Read Messages"
-msgstr "ସନ�ଦେଶଗ�ଡ଼ିକ� ପଢନ�ତ�"
-
-#: ../mail/em-folder-browser.c:230
-msgid "Recent Messages"
-msgstr "ପ�ରଚଳିତ ସନ�ଦେଶଗ�ଡ଼ିକ"
-
-#: ../mail/em-folder-browser.c:231
-msgid "Last 5 Days' Messages"
-msgstr "ଶେଷ 5 ଦିନର ସନ�ଦେଶ"
-
-#: ../mail/em-folder-browser.c:232
-msgid "Messages with Attachments"
-msgstr "ସଂଲଗ�ନକଗ�ଡ଼ିକ ସହିତ ସନ�ଦେଶ"
-
-#: ../mail/em-folder-browser.c:233
-msgid "Important Messages"
-msgstr "ଗ�ର�ତ�ବପୂର�ଣ�ଣ ସନ�ଦେଶଗ�ଡ଼ିକ"
-
-#: ../mail/em-folder-browser.c:234
-msgid "Messages Not Junk"
-msgstr "Junk ହୋଇନଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ"
-
-#: ../mail/em-folder-browser.c:1201
-msgid "Account Search"
-msgstr "ଖାତା ସନ�ଧାନ"
-
-#: ../mail/em-folder-browser.c:1254
-msgid "All Account Search"
-msgstr "ସମସ�ତ ଖାତା ସନ�ଧାନ"
-
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "ପଢ଼ାହୋଇନଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ:"
@@ -10848,86 +10829,74 @@ msgstr[1] "ପଢ଼ାହୋଇନଥିବା ସନà­�ଦେଶଗà­�ଡ଼à¬
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "ସମ�ଦାୟ ସନ�ଦେଶ:"
-msgstr[1] "ସମ�ଦାୟ ସନ�ଦେଶଗ�ଡ଼ିକ:"
+msgstr[1] "ସମ�ଦାୟ ସନ�ଦେଶ:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "ସଂରକ�ଷିତ ଉପଯୋଗିତା (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "ସଂରକ�ଷିତ ଉପଯୋଗିତା"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:522
-#: ../mail/em-folder-tree.c:2586 ../mail/mail-component.c:168
-#: ../mail/mail-component.c:589
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:597
-msgid "Inbox"
-msgstr "ଇନବକ�ସ"
-
-#: ../mail/em-folder-properties.c:390
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "ଫୋଲଡର ବିଶେଷତାଗ�ଡିକ"
 
-#: ../mail/em-folder-selection-button.c:120
+#: ../mail/em-folder-selection-button.c:75
 msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "ସୃଷ�ଟି କରନ�ତ� (_r)"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "ଫୋଲଡର ନାମ (_n):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:196 ../mail/em-folder-tree-model.c:198
-#: ../mail/mail-vfolder.c:961 ../mail/mail-vfolder.c:1029
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1079 ../mail/mail-vfolder.c:1144
 msgid "Search Folders"
 msgstr "ଫୋଲ�ଡରଗ�ଡ଼ିକ ଖୋଜନ�ତ�"
 
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:515 ../mail/mail-component.c:169
-msgid "Drafts"
-msgstr "ଡ�ରାଫ�ଟଗ�ଡ଼ିକ"
-
-#: ../mail/em-folder-tree-model.c:518 ../mail/mail-component.c:172
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "ନମ�ନାଗ�ଡିକ"
-
-#: ../mail/em-folder-tree-model.c:525 ../mail/mail-component.c:170
-msgid "Outbox"
-msgstr "ଆଉଟବକ�ସ"
-
-#: ../mail/em-folder-tree-model.c:527 ../mail/mail-component.c:171
-msgid "Sent"
-msgstr "ପଠାଯାଇଛି"
-
-#: ../mail/em-folder-tree-model.c:585 ../mail/em-folder-tree-model.c:895
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1080
 msgid "Loading..."
 msgstr "ଧାରଣ କର�ଅଛି..."
 
+#: ../mail/em-folder-tree.c:183
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "\"%s\"ରେ ଫୋଲଡର କ�ରମବୀକ�ଷଣ କର�ଅଛି"
+
+#: ../mail/em-folder-tree.c:596
+msgid "Folder names cannot contain '/'"
+msgstr "ଫୋଲଡରର ନାମ ଗୋଟି� '/' ଧାରଣ କରିପାରିବ ନାହି�"
+
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
@@ -10937,313 +10906,113 @@ msgstr "ଧାରଣ କର�ଅଛି..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:300
-#, c-format
+#: ../mail/em-folder-tree.c:1078
+#, fuzzy, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u)"
 msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:708
+#: ../mail/em-folder-tree.c:1286
 msgid "Mail Folder Tree"
 msgstr "ମେଲ ଫୋଲଡର ବ�ର�କ�ଷ"
 
-#: ../mail/em-folder-tree.c:867
+#: ../mail/em-folder-tree.c:1583 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "ଫୋଲଡର %s କ� ଗତିକରାଉଛି"
 
-#: ../mail/em-folder-tree.c:869
+#: ../mail/em-folder-tree.c:1585 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "ଫୋଲଡର %s କ� ନକଲ କର�ଅଛି"
 
-#: ../mail/em-folder-tree.c:876 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:1592 ../mail/message-list.c:2104
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ଫୋଲଡର %s ମଧ�ଯକ� ସନ�ଦେଶଗ�ଡ଼ିକ� ଗତିକରାଉଛି"
 
-#: ../mail/em-folder-tree.c:878 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:1594 ../mail/message-list.c:2106
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ଫୋଲଡର %s ମଧ�ଯକ� ସନ�ଦେଶଗ�ଡ଼ିକ� ନକଲ କର�ଅଛି"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:1609
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ଉପର ସ�ତରୀୟ ଭଣ�ଡାରରେ ସନ�ଦେଶଗ�ଡ଼ିକ� ପକାଇପାରିବେ ନାହି�"
 
-#: ../mail/em-folder-tree.c:970 ../ui/evolution-mail-message.xml.h:100
-msgid "_Copy to Folder"
-msgstr "ଫୋଲଡରକ� ନକଲ କରନ�ତ� (_C)"
-
-#: ../mail/em-folder-tree.c:971 ../ui/evolution-mail-message.xml.h:113
-msgid "_Move to Folder"
-msgstr "ଫୋଲଡରକ� ଘ�ଞ�ଚାନ�ତ� (_M)"
-
-#: ../mail/em-folder-tree.c:973 ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1187 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "ଘ�ଞ�ଚାନ�ତ� (_M)"
-
-#: ../mail/em-folder-tree.c:975 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "ଟାଣିବା ପ�ରକ�ରିୟାକ� ବାତିଲ କରନ�ତ� (_D)"
-
-#: ../mail/em-folder-tree.c:1685 ../mail/mail-ops.c:1065
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "\"%s\"ରେ ଫୋଲଡର କ�ରମବୀକ�ଷଣ କର�ଅଛି"
-
-#: ../mail/em-folder-tree.c:2090
-msgid "Open in _New Window"
-msgstr "ନୂତନ ୱିଣ�ଡୋରେ ଖୋଲନ�ତ� (_N)"
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2095
-msgid "_New Folder..."
-msgstr "_ନୂତନ ଖ଼ାମ�..."
-
-#: ../mail/em-folder-tree.c:2098
-msgid "_Move..."
-msgstr "_ସ�ଥାନାନ�ତରଣ..."
-
-#: ../mail/em-folder-tree.c:2106 ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh"
-msgstr "ସତେଜନ କରନ�ତ� (_f)"
-
-#: ../mail/em-folder-tree.c:2107
-msgid "Fl_ush Outbox"
-msgstr "ଫ�ଲାସ ଆଉଟବକ�ସ (_u)"
-
-#: ../mail/em-folder-tree.c:2113 ../mail/mail.error.xml.h:138
-msgid "_Empty Trash"
-msgstr "ଆବର�ଜନା ପାତ�ରକ� ଖାଲି କରନ�ତ� (_E)"
-
-#: ../mail/em-folder-tree.c:2216
-msgid "_Unread Search Folder"
-msgstr "ପଢାହୋଇନଥିବା ସନ�ଧାନ ଫଲଡର (_U)"
-
-#: ../mail/em-folder-utils.c:99
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "`%s' କ� `%s'ରେ ନକଲ କରନ�ତ�"
-
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1187
-#: ../mail/em-folder-view.c:1202
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
-msgid "Select folder"
-msgstr "ଫଲଡର ଚୟନ କରନ�ତ�"
+#: ../mail/em-folder-utils.c:379
+#, fuzzy
+#| msgid "_Move Folder To..."
+msgid "Move Folder To"
+msgstr "ଫୋଲଡରକ� ଘ�ଞ�ଚାନ�ତ� (_M)..."
 
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1202
-msgid "C_opy"
-msgstr "ନକଲ କରନ�ତ� (_o)"
+#: ../mail/em-folder-utils.c:379
+#, fuzzy
+#| msgid "_Copy Folder To..."
+msgid "Copy Folder To"
+msgstr "ଫୋଲଡର କ� ନକଲ କରନ�ତ� (_C)..."
 
-#: ../mail/em-folder-utils.c:537
-#: ../plugins/groupwise-features/share-folder-common.c:144
-#, c-format
-msgid "Creating folder `%s'"
+#: ../mail/em-folder-utils.c:509
+#: ../plugins/groupwise-features/share-folder-common.c:138
+#, fuzzy, c-format
+#| msgid "Creating folder `%s'"
+msgid "Creating folder '%s'"
 msgstr "ଫୋଲଡର `%s' ସୃଷ�ଟିକରନ�ତ�"
 
-#: ../mail/em-folder-utils.c:696
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:386
-msgid "Create folder"
+#: ../mail/em-folder-utils.c:672
+#, fuzzy
+#| msgid "Create folder"
+msgid "Create Folder"
 msgstr "ଫୋଲଡର ସୃଷ�ଟିକରନ�ତ�"
 
-#: ../mail/em-folder-utils.c:696
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:386
+#: ../mail/em-folder-utils.c:673
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
 msgid "Specify where to create the folder:"
 msgstr "କେଉ�ଠି ଫୋଲଡର ନିର�ମାଣ କରିବା ତାହା ଉଲ�ଲେଖ କରନ�ତ�:"
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
-msgid "Mail Deletion Failed"
-msgstr "ମେଲ ବିଲୋପ ବିଫଳ ହୋଇଛି"
-
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "�ହି ମେଲକ� ଅପସାରଣ କରିବା ପାଇ� ଆପଣଙ�କ ପାଖରେ ଯଥେଷ�ଟ ଅନ�ମତି ନାହି�।"
-
-#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:102
-msgid "_Edit as New Message..."
-msgstr "ନୂତନ ସନ�ଦେଶକ� ସମ�ପାଦନ କରନ�ତ� (_E)..."
-
-#: ../mail/em-folder-view.c:1342
-msgid "U_ndelete"
-msgstr "ଅପସାରିତ ହୋଇନଥିବା (_n)"
-
-#: ../mail/em-folder-view.c:1343
-msgid "_Move to Folder..."
-msgstr "ଫୋଲଡରକ� ଘ�ଞ�ଚାନ�ତ� (_M)..."
-
-#: ../mail/em-folder-view.c:1344
-msgid "_Copy to Folder..."
-msgstr "ଫୋଲଡରେ ନକଲ କରନ�ତ� (_C)..."
-
-#: ../mail/em-folder-view.c:1347
-msgid "Mar_k as Read"
-msgstr "ପଢ଼ାଯାଇଥିବା ପରି ଚିହ�ନଟକରନ�ତ� (_k)"
-
-#: ../mail/em-folder-view.c:1348
-msgid "Mark as _Unread"
-msgstr "ପଢ଼ାହୋଇନଥିବା ପରି ଚିହ�ନଟ କରନ�ତ� (_U)"
-
-#: ../mail/em-folder-view.c:1349
-msgid "Mark as _Important"
-msgstr "ଗ�ର�ତ�ବପୂର�ଣ�ଣ ପରି ଚିହ�ନଟ କରନ�ତ� (_I)"
-
-#: ../mail/em-folder-view.c:1350
-msgid "Mark as Un_important"
-msgstr "ଗ�ର�ତ�ବପୂର�ଣ�ଣ ନ�ହ� ପରି ଚିହ�ନଟ କରନ�ତ� (_i)"
-
-#: ../mail/em-folder-view.c:1351
-msgid "Mark as _Junk"
-msgstr "Junk ପରି ଚିହ�ନଟ କରନ�ତ� (_J)"
-
-#: ../mail/em-folder-view.c:1352
-msgid "Mark as _Not Junk"
-msgstr "Junk ପରି ଚିହ�ନଟ କରନ�ତ� (_N)"
-
-#: ../mail/em-folder-view.c:1353
-msgid "Mark for Follo_w Up..."
-msgstr "ଅନ�ସରଣ କରିବା ପାଇ� ଚିହ�ନଟ କରନ�ତ� (_w)..."
-
-#: ../mail/em-folder-view.c:1355
-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:1356 ../widgets/misc/e-dateedit.c:477
-msgid "_None"
-msgstr "କିଛି ନାହି� (_N)"
-
-#: ../mail/em-folder-view.c:1359
-msgid "_New Label"
-msgstr "ନୂତନ ନାମପଟି"
-
-#: ../mail/em-folder-view.c:1363
-msgid "Fla_g Completed"
-msgstr "ଚିହ�ନଟ କରିବା ସମାପ�ତ (_g)"
-
-#: ../mail/em-folder-view.c:1364
-msgid "Cl_ear Flag"
-msgstr "ସୂଚକକ� ସଫାକରନ�ତ� (_e)"
-
-#: ../mail/em-folder-view.c:1367
-msgid "Crea_te Rule From Message"
-msgstr "ସନ�ଦେଶର� ନିୟମ ସୃଷ�ଟିକରନ�ତ� (_t)"
-
-#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1369
-msgid "Search Folder based on _Subject"
-msgstr "ବିଷୟ ଉପରେ ଆଧାରିତ ଫୋଲଡର ସନ�ଧାନ କରନ�ତ� (_S)"
-
-#: ../mail/em-folder-view.c:1370
-msgid "Search Folder based on Se_nder"
-msgstr "ଗ�ରାହକ ଉପରେ ଆଧାରିତ ଫୋଲଡର ସନ�ଧାନ କରନ�ତ� (_n)"
-
-#: ../mail/em-folder-view.c:1371
-msgid "Search Folder based on _Recipients"
-msgstr "ପ�ରେରକ ଉପରେ ଆଧାରିତ ଫୋଲଡର ସନ�ଧାନ କରନ�ତ� (_R)"
-
-#: ../mail/em-folder-view.c:1372
-msgid "Search Folder based on Mailing _List"
-msgstr "ମେଲିଙ�ଗ ତାଲିକା ଉପରେ ଆଧାରିତ ଫୋଲଡରକ� ସନ�ଧାନ କରନ�ତ� (_L)"
-
-#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1377
-msgid "Filter based on Sub_ject"
-msgstr "ବିଷୟ ଉପରେ ଆଧାର କରି ଛାଣନ�ତ� (_j)"
-
-#: ../mail/em-folder-view.c:1378
-msgid "Filter based on Sen_der"
-msgstr "ପ�ରେରକ ଉପରେ ଆଧାର କରି ଛାଣନ�ତ� (_d)"
-
-#: ../mail/em-folder-view.c:1379
-msgid "Filter based on Re_cipients"
-msgstr "ଗ�ରାହକ ଉପରେ ଆଧାର କରି ଛାଣନ�ତ� (_c)"
-
-#: ../mail/em-folder-view.c:1380
-msgid "Filter based on _Mailing List"
-msgstr "ମେଲିଙ�ଗ ତାଲିକା ଉପରେ ଆଧାର କରି ଛାଣନ�ତ� (_M)"
-
-#. default charset used in mail view
-#. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2235 ../mail/em-folder-view.c:2278
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:511
-#: ../plugins/google-account-setup/google-source.c:699
-msgid "Default"
-msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ"
-
-#: ../mail/em-folder-view.c:2496
-msgid "Unable to retrieve message"
-msgstr "ସନ�ଦେଶ କାଢ଼ିବାରେ ଅସମର�ଥ"
-
-#: ../mail/em-folder-view.c:2700
-msgid "Create _Search Folder"
-msgstr "ସନ�ଧାନ ଫୋଲଡର ସୃଷ�ଟିକରନ�ତ� (_S)"
-
-#: ../mail/em-folder-view.c:2701
-msgid "_From this Address"
-msgstr "�ହି ଠିକଣାର� (_F)"
-
-#: ../mail/em-folder-view.c:2702
-msgid "_To this Address"
-msgstr "�ହି ଠିକଣାକ� (_T)"
-
-#: ../mail/em-folder-view.c:3195
+#: ../mail/em-folder-utils.c:693
 #, c-format
-msgid "Click to mail %s"
-msgstr "ମେଲ କରିବା ପାଇ� କ�ଲିକ କରନ�ତ� %s"
-
-#: ../mail/em-folder-view.c:3207
-#, c-format
-msgid "Click to call %s"
-msgstr "%s କ� ଡାକିବା ପାଇ� ଦବାନ�ତ�"
-
-#: ../mail/em-folder-view.c:3212
-msgid "Click to hide/unhide addresses"
-msgstr "ଲ�ଚାଇବା ପାଇ� କ�ଲିକ କରନ�ତ�/ଲ�ଚାହୋଇନଥିବା ଠିକଣା"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "ଫୋଲଡର \"%s\"ର� ଅସ�ୱୀରୋକ�ତି ଆଣନ�ତ�"
 
-#: ../mail/em-format-html-display.c:570 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "ହସ�ତାକ�ଷର ହୋଇନଥିବା"
 
-#: ../mail/em-format-html-display.c:570
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "�ହି ସନ�ଦେଶରେ ହସ�ତାକ�ଷର ହୋଇନାହି�। �ହି ସନ�ଦେଶଟି ବୈଧ ବୋଲି ସେଥିରେ କୌଣସି ନିର�ଭରୋକ�ତି ନାହି�।"
 
-#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "ବୈଧ ହସ�ତକ�ଷର"
 
-#: ../mail/em-format-html-display.c:571
+#: ../mail/em-format-html-display.c:91
 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:572 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "ଅବୈଧ ହସ�ତାକ�ଷର"
 
-#: ../mail/em-format-html-display.c:572
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "�ହି ସନ�ଦେଶର ହସ�ତାକ�ଷରକ� ଯାଞ�ଚ କରାଯାଇପାରିବ ନାହି�, �ହାକ� transit ରେ ବଦଳା ଯାଇପାରେ।"
 
-#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
 msgid "Valid signature, but cannot verify sender"
 msgstr "ବୈଧ ହସ�ତାକ�ଷର, କିନ�ତ� ପ�ରେରକକ� ଯାଞ�ଚ କରିପାରିବ ନାହି�"
 
-#: ../mail/em-format-html-display.c:573
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11251,11 +11020,11 @@ msgstr ""
 "�ହି ସନ�ଦେଶକ� ବୈଧ ହସ�ତାକ�ଷର ମାଧ�ୟମରେ ହସ�ତାକ�ଷର କରାଯାଇଛି, କିନ�ତ� ସେହି ସନ�ଦେଶର ପ�ରେରକଙ�କ� ଯାଞ�ଚ "
 "କରାଯାଇପାରିବ ନାହି�।"
 
-#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
 msgid "Signature exists, but need public key"
 msgstr "ହସ�ତାକ�ଷର ଅବସ�ଥିତ, କିନ�ତ� ସାର�ବଜନିକ କି ଆବଶ�ୟକ"
 
-#: ../mail/em-format-html-display.c:574
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -11263,21 +11032,21 @@ msgstr ""
 "�ହି ସନ�ଦେଶକ� ହସ�ତାକ�ଷର ମାଧ�ଯମରେ ହସ�ତାକ�ଷର କରାଯାଇଛି, କିନ�ତ� ସେଠାରେ କୌଣସି ନିର�ଭରଶୀଳ ସାର�ବଜନୀକ "
 "କି ନାହି�।"
 
-#: ../mail/em-format-html-display.c:581 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
 msgid "Unencrypted"
 msgstr "ଅସଂଗ�ପ�ତ"
 
-#: ../mail/em-format-html-display.c:581
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "�ହି ସନ�ଦେଶଟି ସଂଗ�ପ�ତ ନ�ହ�। �ହାର ବିଷୟବସ�ତ�କ� ଇଣ�ଟରନେଟରେ transit ମାଧ�ଯମରେ ଦେଖାଯାଇ ପାରେ।"
 
-#: ../mail/em-format-html-display.c:582 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "ସଂଗ�ପ�ତ, ଦ�ର�ବଳ"
 
-#: ../mail/em-format-html-display.c:582
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -11286,11 +11055,11 @@ msgstr ""
 "�ହି ସନ�ଦେଶଟି ସଂଗ�ପ�ତ ଅଟେ, କିନ�ତ� ଗୋଟି� ଦ�ର�ବଳ ସଂଗ�ପ�ତକରଣ ଆଲଗୋରିଦମ ସହିତ। �ହା କଷ�ଟକର ହୋଇପାରେ, "
 "କିନ�ତ� ଗୋଟି� ବାହ�ୟ ବ�ୟକ�ତି ପାଇ� ଉଚିତ ସମୟରେ �ହି ସନ�ଦେଶର ବିଷୟବସ�ତ� ଦେଖିବା ପାଇ� ଅସମ�ଭବ ନ�ହ�।"
 
-#: ../mail/em-format-html-display.c:583 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "ସଂଗ�ପ�ତ"
 
-#: ../mail/em-format-html-display.c:583
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11298,11 +11067,11 @@ msgstr ""
 "�ହି ସନ�ଦେଶଟି ସଂଗ�ପ�ତ ଅଟେ। �ହି ସନ�ଦେଶର ବିଷୟବସ�ତ�କ� ଦେଖିବା ପାଇ� ବାହାର ବ�ୟକ�ତିଙ�କ ପକ�ଷରେ କଷ�ଟକର "
 "ହୋଇପାରେ।"
 
-#: ../mail/em-format-html-display.c:584 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "ସଂଗ�ପ�ତ, ସବଳ"
 
-#: ../mail/em-format-html-display.c:584
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -11312,524 +11081,255 @@ msgstr ""
 "ହୋଇପାରେ, କିନ�ତ� ଗୋଟି� ବାହ�ୟ ବ�ୟକ�ତି ପାଇ� ଉଚିତ ସମୟରେ �ହି ସନ�ଦେଶର ବିଷୟବସ�ତ� ଦେଖିବା ପାଇ� ଅସମ�ଭବ "
 "ନ�ହ�।"
 
-#: ../mail/em-format-html-display.c:685 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "ଦୃଶ�ଯ ପ�ରମାଣପତ�ର (_V)"
 
-#: ../mail/em-format-html-display.c:700
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "�ହି ପ�ରମାଣପତ�ରକ� ଦେଖିହେବ ନାହି�"
 
-#: ../mail/em-format-html-display.c:992
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%B %d, %Y, %l:%M %pରେ ସମ�ପୂର�ଣ�ଣ"
+#: ../mail/em-format-html-display.c:497
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Evolution �ହି ଇମେଲକ� ଚିତ�ରଣ କରିପାରିବ ନାହି� ଯେହେତ� �ହା କାର�ଯ�ୟକାରୀ କରିବା ଅତ�ୟଧିକ ବଡ଼। ଆପଣ "
+"�ହାକ� ବିନା ସଜ�ଜିକରଣରେ ଦେଖିପାରିବେ ଅଥବା ଗୋଟି� ବାହ�ୟ ପାଠ�ୟ ସମ�ପାଦକ ସହିତ।"
 
-#: ../mail/em-format-html-display.c:1000
+#: ../mail/em-format-html-display.c:726
+#, fuzzy
+#| msgid "Completed On"
+msgid "Completed on"
+msgstr "ରେ ସମାପ�ତ ହୋଇଛି"
+
+#: ../mail/em-format-html-display.c:734
 msgid "Overdue:"
 msgstr "ବକୟା:"
 
-#: ../mail/em-format-html-display.c:1003
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%B %d, %Y, %l:%M %p ଦ�ୱାରା"
-
-#: ../mail/em-format-html-display.c:1083
-#: ../widgets/misc/e-attachment-view.c:357
-msgid "_View Inline"
-msgstr "ଇନଲାଇନ ଦେଖନ�ତ� (_V)"
-
-#: ../mail/em-format-html-display.c:1084
-#: ../widgets/misc/e-attachment-view.c:350
-msgid "_Hide"
-msgstr "ଲ�ଚାନ�ତ� (_H)"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:738
+msgid "by"
+msgstr "ଦ�ବାରା"
 
-#: ../mail/em-format-html-display.c:1085
-msgid "_Fit to Width"
-msgstr "ଓସାର ସହିତ ଖାପ ଖ�ଆନ�ତ� (_F)"
-
-#: ../mail/em-format-html-display.c:1086
-msgid "Show _Original Size"
-msgstr "ମୂଳ ଆକାରକ� ଦର�ଶାନ�ତ� (_O)"
-
-#: ../mail/em-format-html-display.c:1587 ../mail/em-format-html-display.c:1626
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
 msgid "View _Unformatted"
 msgstr "ଅସଜଡ଼ାକ� ଦର�ଶାନ�ତ� (_U)"
 
-#: ../mail/em-format-html-display.c:1589
+#: ../mail/em-format-html-display.c:950
 msgid "Hide _Unformatted"
 msgstr "ଅସଜଡ଼ାକ� ଲ�ଚାନ�ତ� (_U)"
 
-#: ../mail/em-format-html-display.c:1646
+#: ../mail/em-format-html-display.c:1012
 msgid "O_pen With"
 msgstr "ସହିତ ଖୋଲନ�ତ� (_p)"
 
-#: ../mail/em-format-html-display.c:1723
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolution �ହି ଇମେଲକ� ଚିତ�ରଣ କରିପାରିବ ନାହି� ଯେହେତ� �ହା କାର�ଯ�ୟକାରୀ କରିବା ଅତ�ୟଧିକ ବଡ଼। ଆପଣ "
-"�ହାକ� ବିନା ସଜ�ଜିକରଣରେ ଦେଖିପାରିବେ ଅଥବା ଗୋଟି� ବାହ�ୟ ପାଠ�ୟ ସମ�ପାଦକ ସହିତ।"
-
-#: ../mail/em-format-html-print.c:157
+#: ../mail/em-format-html-print.c:163
 #, c-format
 msgid "Page %d of %d"
 msgstr "ପୃଷ�ଠା %d ର %d"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
-#, c-format
-msgid "Retrieving `%s'"
+#: ../mail/em-format-html.c:147
+msgid "Formatting message"
+msgstr "ସନ�ଦେଶକ� ସଜାଡ଼�ଛି"
+
+#: ../mail/em-format-html.c:338
+msgid "Formatting Message..."
+msgstr "ସନ�ଦେଶକ� ସଜାଡ଼�ଛି..."
+
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
+#, fuzzy, c-format
+#| msgid "Retrieving `%s'"
+msgid "Retrieving '%s'"
 msgstr "`%s'କ� ପ�ନର�ଦ�ଧାର କର�ଅଛି"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
 msgstr "ଅଜଣା ବାହ�ୟ ଶରୀର ଅଂଶ।"
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:1862
 msgid "Malformed external-body part."
 msgstr "ତ�ର�ଟିଯ�କ�ତ ବାହ�ୟ ଅଂଶ।"
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:1892
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ସାଇଟ ପାଇ� ସୂଚକ (%s)"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:1903
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ସ�ଥାନୀୟ ଫାଇଲ (%s) ପାଇ� ସୂଚକ \"%s\" ସାଇଟରେ ବୈଧ ଅଟେ"
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:1905
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ସ�ଥାନୀୟ ଫାଇଲ ପାଇ� ସୂଚକ (%s)"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1926
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ସୂଦୂର ତଥ�ୟ ପାଇ� ସୂଚକ (%s)"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1937
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ବାହ�ୟ ଅଜ�ଞାତ ତଥ�ଯ ପାଇ� ସୂଚକ (\"%s\" ପ�ରକାର)"
 
-#: ../mail/em-format-html.c:1241
-msgid "Formatting message"
-msgstr "ସନ�ଦେଶକ� ସଜାଡ଼�ଛି"
-
-#: ../mail/em-format-html.c:1415
-msgid "Formatting Message..."
-msgstr "ସନ�ଦେଶକ� ସଜାଡ଼�ଛି..."
-
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:78
-msgid "Cc"
-msgstr "Cc"
-
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:79
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1439
-msgid "Mailer"
-msgstr "ପ�ରେରକ"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
-msgid " (%a, %R %Z)"
-msgstr " (%a, %R %Z)"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1781
-msgid " (%R %Z)"
-msgstr " (%R %Z)"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#.
-#: ../mail/em-format-html.c:1917
-#, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+#: ../mail/em-format-html.c:2600
+#, fuzzy, c-format
+#| msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgid "This message was sent by %s on behalf of %s"
 msgstr "<b>%s</b> ପାଇ� �ହି ସନ�ଦେଶଟି <b>%s</b> ଦ�ୱାରା ପଠାଯାଇଛି"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:923
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:301
-msgid "From"
-msgstr "ଠାର�"
-
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
-#: ../mail/em-mailer-prefs.c:76
-msgid "Reply-To"
-msgstr "କ� ଉତ�ତର ଦିଅନ�ତ�"
-
-#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:324
-#: ../widgets/misc/e-dateedit.c:346
-msgid "Date"
-msgstr "ତାରିଖ"
-
-#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:82
-msgid "Newsgroups"
-msgstr "ସମାଚାରସମୂହଗ�ଡିକ"
-
-#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:4
-msgid "Face"
-msgstr "ମ�ଖ"
-
-#: ../mail/em-format.c:1201
-#, c-format
-msgid "%s attachment"
-msgstr "%s ସଂଲଗ�ନକ"
-
-#: ../mail/em-format.c:1239
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME ସନ�ଦେଶକ� ବିଶ�ଳେଷଣ କରିପାରିଲା ନାହି�: ଅଜଣା ତ�ର�ଟି"
-
-#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME ସନ�ଦେଶକ� ବିଶ�ଳେଷଣ କରିପାରିଲା ନାହି�। ଉତ�ସ ଭାବରେ ଦର�ଶାଉଅଛି।"
-
-#: ../mail/em-format.c:1384
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "�କାଧିକ ଅଂଶ/ସଂଗ�ପ�ତକରଣ ପାଇ� ଅସମର�ଥିତ ସଂଗ�ପ�ତକରଣ ପ�ରକାର"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message"
-msgstr "PGP/MIME ସନ�ଦେଶକ� ବିଶ�ଳେଷଣ କରିପାରିଲା ନାହି�"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "PGP/MIME ସନ�ଦେଶକ� ବିଶ�ଳେଷଣ କରିହେଲା ନାହି�: ଅଜଣା ତୃଟି"
-
-#: ../mail/em-format.c:1552
-msgid "Unsupported signature format"
-msgstr "ଅସମର�ଥିତ ହସ�ତାକ�ଷର ଶୈଳୀ"
-
-#: ../mail/em-format.c:1560 ../mail/em-format.c:1631
-msgid "Error verifying signature"
-msgstr "ତ�ର�ଟି ଯାଞ�ଚକାରୀ ହସ�ତାକ�ଷର"
-
-#: ../mail/em-format.c:1560 ../mail/em-format.c:1622 ../mail/em-format.c:1631
-msgid "Unknown error verifying signature"
-msgstr "ଅଜଣା ତୃଟି ଯାଞ�ଚକାରୀ ହସ�ତାକ�ଷର"
-
-#: ../mail/em-format.c:1705
-msgid "Could not parse PGP message"
-msgstr "PGP ସନ�ଦେଶକ� ବିଶ�ଳେଷଣ କରିପାରିଲା ନାହି�"
-
-#: ../mail/em-format.c:1705
-msgid "Could not parse PGP message: Unknown error"
-msgstr "PGP ସନ�ଦେଶକ� ବିଶ�ଳେଷଣ କରିହେଲା ନାହି�: ଅଜଣା ତୃଟି"
-
-#: ../mail/em-mailer-prefs.c:94
-msgid "Every time"
-msgstr "ପ�ରତ�ଯେକ ଥର"
-
-#: ../mail/em-mailer-prefs.c:95
-msgid "Once per day"
-msgstr "ଦିନକ� ଥରେ"
-
-#: ../mail/em-mailer-prefs.c:96
-msgid "Once per week"
-msgstr "ସପ�ତାହକ� ଥରେ"
-
-#: ../mail/em-mailer-prefs.c:97
-msgid "Once per month"
-msgstr "ମାସକ� ଥରେ"
-
-#: ../mail/em-mailer-prefs.c:333
-msgid "Add Custom Junk Header"
-msgstr "ଇଚ�ଛାରୂପଣ Junk ଶୀର�ଷକକ� ଯୋଡନ�ତ�"
-
-#: ../mail/em-mailer-prefs.c:337
-msgid "Header Name:"
-msgstr "ଶୀର�ଷକ ନାମ:"
-
-#: ../mail/em-mailer-prefs.c:338
-msgid "Header Value Contains:"
-msgstr "ଶୀର�ଷକ ମୂଲ�ଯ ରହିଅଛି:"
-
-#: ../mail/em-mailer-prefs.c:440 ../widgets/table/e-table-click-to-add.c:501
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "ଶୀର�ଷକ"
-
-#: ../mail/em-mailer-prefs.c:444
-msgid "Contains Value"
-msgstr "ମୂଲ�ୟ ଧାରଣ କରିଥା�"
-
-#: ../mail/em-mailer-prefs.c:467
-msgid "Color"
-msgstr "ରଙ�ଗ"
-
-#: ../mail/em-mailer-prefs.c:470
-msgid "Tag"
-msgstr "ସୂଚକ"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1067 ../mail/em-mailer-prefs.c:1121
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "%s ପ�ଲଗଇନ ଉପଲବ�ଧ ଅଛି �ବଂ ବାଇନାରୀ ସ�ଥାପିତ ହୋଇଛି।"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1075 ../mail/em-mailer-prefs.c:1130
-#, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
-msgstr "%s ପ�ଲଗଇନ ଉପଲବ�ଧ ନାହି�। ଦୟାକରି ପ�ୟାକେଜଟି ସ�ଥାପିତ ହୋଇଛି କି ନାହି� ଯାଞ�ଚକରନ�ତ�।"
-
-#: ../mail/em-mailer-prefs.c:1096
-msgid "No Junk plugin available"
-msgstr "କୌଣସି ଜଙ�କ ପ�ଲଗଇନ ଉପଲବ�ଧ ନାହି�"
-
-#. green
-#: ../mail/em-migrate.c:961
-msgid "To Do"
-msgstr "କରିବାକ�"
-
-#. blue
-#: ../mail/em-migrate.c:962
-msgid "Later"
-msgstr "ପରବର�ତ�ତି"
-
-#: ../mail/em-migrate.c:1129
-msgid "Migration"
-msgstr "ସ�ଥାନ ପରିବର�ତ�ତନ"
-
-#: ../mail/em-migrate.c:1574
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "ନୂତନ ପୋଲଡର `%s' ସୃଷ�ଟିକରିବାରେ ଅସମର�ଥ: %s"
-
-#: ../mail/em-migrate.c:1600
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "ଫୋଲଡର `%s' କ� `%s'ରେ ନକଲ କରିବାରେ ଅସମର�ଥ: %s"
-
-#: ../mail/em-migrate.c:1785
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "ସ�ଥିତବାନ ମେଲବାକ�ସକ� `%s'ରେ କ�ରମବିକ�ଷଣ କରିବାରେ ଅସମର�ଥ: %s"
-
-#: ../mail/em-migrate.c:1790
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution ଡାକବାକ�ସର ଫୋଲଡରଗ�ଡ଼ିକର ଅବସ�ଥାନ �ବଂ ଅନ�କ�ରମ Evolution 1.x ପରଠାର� ପରିବର�ତ�ତିତ "
-"ହୋଇଛି।\n"
-"\n"
-"Evolution ଆପଣଙ�କର ଫୋଲଡରଗ�ଡ଼ିକ� ସ�ଥାନାନ�ତରିତ କରିବା ସମୟରେ ଦୟାକରି ଧୈର�ଯ�ୟ ରଖନ�ତ�..."
-
-#: ../mail/em-migrate.c:1991
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "ପ�ର�ଣା POP ସର�ଭରରେ ଥିବା ତଥ�ୟ `%s'କ� ଖୋଲିବାରେ ଅସମର�ଥ: %s"
-
-#: ../mail/em-migrate.c:2005
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "POP3 ସର�ଭରରେ ଥିବା ତଥ�ୟ ଡିରେକ�ଟୋରୀ `%s'କ� ଖୋଲିବାରେ ଅସମର�ଥ: %s"
-
-#: ../mail/em-migrate.c:2034
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "POP3 ସର�ଭରରେ ଥିବା ତଥ�ୟ `%s'କ� ନକଲ କରିବାରେ ଅସମର�ଥ: %s"
-
-#: ../mail/em-migrate.c:2505 ../mail/em-migrate.c:2517
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "ସ�ଥାନୀୟ ମେଲ ଭଣ�ଡାର `%s'କ� ସୃଷ�ଟି କରିବାରେ ଅସମର�ଥ: %s"
-
-#: ../mail/em-migrate.c:2875
-msgid "Migrating Folders"
-msgstr "ସ�ଥାନ ପରିବର�ତ�ତନ କର�ଅଛି"
-
-#: ../mail/em-migrate.c:2875
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution ଡାକବାକ�ସର ଫୋଲଡରଗ�ଡ଼ିକର ସାରାଂଶ Evolution 2.24 SQLite ପରଠାର� ସ�ଥାନାନ�ତରିତ "
-"ହୋଇଛି।\n"
-"\n"
-"Evolution ଆପଣଙ�କର ଫୋଲଡରଗ�ଡ଼ିକ� ସ�ଥାନାନ�ତରିତ କରିବା ସମୟରେ ଦୟାକରି ଧୈର�ଯ�ୟ ରଖନ�ତ�..."
-
-#: ../mail/em-migrate.c:2957
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "`%s'ରେ ସ�ଥାନୀୟ ମେଲ ଫୋଲଡର ନିର�ମାଣ କରିବାରେ ଅସମର�ଥ: %s"
-
-#: ../mail/em-migrate.c:2976
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"ପୂର�ବ Evolution ସ�ଥାପନାର� ସଂରଚନାକ� ପଢ଼ିବାରେ ଅସମର�ଥ, `evolution/config.xmldb' ପ�ରସ�ଥାନ "
-"କିମ�ବା ତ�ର�ଟିଯ�କ�ତ କରିନଥା�।"
-
-#: ../mail/em-popup.c:364
-msgid "Save As..."
-msgstr "�ପରି ଭାବରେ ସଂରକ�ଷିତ କରନ�ତ�..."
-
-#: ../mail/em-popup.c:389
-#, c-format
-msgid "untitled_image.%s"
-msgstr "ଶୀର�ଷକ ବିହୀନ ପ�ରତିଛବି (_i)। %s"
-
-#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
-msgid "Set as _Background"
-msgstr "ପ�ର�ଷ�ଠଭୂମି ଭାବରେ ବିନ�ଯାସ କରନ�ତ� (_B)"
-
-#: ../mail/em-popup.c:497
-msgid "_Reply to sender"
-msgstr "ପ�ରେରକଙ�କ� ଉତ�ତର ଦିଅନ�ତ� (_R)"
-
-#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
-msgid "Reply to _List"
-msgstr "ତାଲିକାକ� ଉତ�ତର ଦିଅନ�ତ� (_L)"
-
-#. make it first item
-#: ../mail/em-popup.c:547 ../mail/em-popup.c:747
-msgid "_Add to Address Book"
-msgstr "ଠିକଣା ପ�ସ�ତକରେ ଯୋଗକରନ�ତ� (_A)"
-
-#: ../mail/em-popup.c:726
-#, c-format
-msgid "Open in %s..."
-msgstr "%s ରେ ଖୋଲନ�ତ�..."
-
-#: ../mail/em-subscribe-editor.c:606
+#: ../mail/em-subscribe-editor.c:669
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "�ହି ଭଣ�ଡାର ସ�ୱକାରୋକ�ତିକ� ସମର�ଥନ କରିନଥା�, ଅଥବା ସେମାନେ ସକ�ରିୟ ନାହାନ�ତି।"
 
-#: ../mail/em-subscribe-editor.c:639
+#: ../mail/em-subscribe-editor.c:720
 msgid "Subscribed"
 msgstr "ସ�ବୀକାର କରାହୋଇଥିବା  "
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:724
 msgid "Folder"
 msgstr "ଫୋଲଡର"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:859
+#: ../mail/em-subscribe-editor.c:1112
 msgid "Please select a server."
 msgstr "ଦୟାକରି ଗୋଟି� ସର�ଭର ମନୋନୀତ କରନ�ତ�।"
 
-#: ../mail/em-subscribe-editor.c:895
+#: ../mail/em-subscribe-editor.c:1158
 msgid "No server has been selected"
 msgstr "କୌଣସି ସର�ଭର ବଛାହୋଇନାହି�"
 
-#. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:130
-msgid "_Do not show this message again."
-msgstr "�ହି ସନ�ଦେଶକ� ପ�ନର�ବାର ଦର�ଶାନ�ତ� ନାହି�। (_D)"
-
-#: ../mail/em-utils.c:318
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, fuzzy, c-format
+#| msgid "Are you sure you want to open {0} messages at once?"
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "{0} ସନ�ଦେଶଗ�ଡ଼ିକ� �କାଥରେ ଖୋଲିବାକ� ଚାହ��ଛନ�ତି ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
+msgstr[1] "{0} ସନ�ଦେଶଗ�ଡ଼ିକ� �କାଥରେ ଖୋଲିବାକ� ଚାହ��ଛନ�ତି ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "ସନ�ଦେଶ ଛାଣକଗ�ଡ଼ିକ"
 
-#: ../mail/em-utils.c:371
-msgid "message"
-msgstr "ସନ�ଦେଶ"
-
-#: ../mail/em-utils.c:655
-msgid "Save Message..."
-msgstr "ସନ�ଦେଶ ସଂରକ�ଷଣ କରନ�ତ�..."
-
-#: ../mail/em-utils.c:705
-msgid "Add address"
-msgstr "ଠିକଣା ଯୋଗ କରନ�ତ�"
-
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:853
 #, c-format
 msgid "Messages from %s"
 msgstr "%sର� ସନ�ଦେଶଗ�ଡ଼ିକ"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
 msgstr "ଫୋଲଡରଗ�ଡ଼ିକ� ସନ�ଧାନ କରନ�ତ� (_F)"
 
-#: ../mail/em-vfolder-rule.c:593
-msgid "Search Folder source"
-msgstr "ଫୋଲଡର ଉତ�ସକ� ଖୋଜନ�ତ�"
+#: ../mail/em-vfolder-rule.c:521
+#, fuzzy
+#| msgid "Folder"
+msgid "Add Folder"
+msgstr "ଫୋଲଡର"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-msgid "\"Send and Receive Mail\" window height"
-msgstr "\"Send and Receive Mail\" ୱିଣ�ଡୋ ଉଚ�ଚତା"
+#, fuzzy
+#| msgid "Default window height"
+msgid "\"Filter Editor\" window height"
+msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ୱିଣ�ଡୋ ଉଚ�ଚତା"
 
 #: ../mail/evolution-mail.schemas.in.h:2
-msgid "\"Send and Receive Mail\" window maximize state"
+#, fuzzy
+#| msgid "\"Send and Receive Mail\" window maximize state"
+msgid "\"Filter Editor\" window maximize state"
 msgstr "\"Send and Receive Mail\" ୱିଣ�ଡୋ ସର�ବାଧିକ ସ�ଥିତି"
 
 #: ../mail/evolution-mail.schemas.in.h:3
-msgid "\"Send and Receive Mail\" window width"
-msgstr "\"Send and Receive Mail\" ୱିଣ�ଡୋ �ସାର"
+#, fuzzy
+#| msgid "Default window width"
+msgid "\"Filter Editor\" window width"
+msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ୱିଣ�ଡୋ ଓସାର"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Evolution କ� ସୀମିତ ଆକାରର ପାଠ�ୟଅଂଶକ� ଦର�ଶାଇବାକ� ଅନ�ମତି ଦେଇଥା�"
+#, fuzzy
+#| msgid "Default window height"
+msgid "\"Search Folder Editor\" window height"
+msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ୱିଣ�ଡୋ ଉଚ�ଚତା"
 
 #: ../mail/evolution-mail.schemas.in.h:5
+#, fuzzy
+#| msgid "\"Send and Receive Mail\" window maximize state"
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "\"Send and Receive Mail\" ୱିଣ�ଡୋ ସର�ବାଧିକ ସ�ଥିତି"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+#, fuzzy
+#| msgid "Search Folder based on Mailing _List"
+msgid "\"Search Folder Editor\" window width"
+msgstr "ମେଲିଙ�ଗ ତାଲିକା ଉପରେ ଆଧାରିତ ଫୋଲଡରକ� ସନ�ଧାନ କରନ�ତ� (_L)"
+
+#: ../mail/evolution-mail.schemas.in.h:7
+msgid "\"Send and Receive Mail\" window height"
+msgstr "\"Send and Receive Mail\" ୱିଣ�ଡୋ ଉଚ�ଚତା"
+
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "\"Send and Receive Mail\" ୱିଣ�ଡୋ ସର�ବାଧିକ ସ�ଥିତି"
+
+#: ../mail/evolution-mail.schemas.in.h:9
+msgid "\"Send and Receive Mail\" window width"
+msgstr "\"Send and Receive Mail\" ୱିଣ�ଡୋ �ସାର"
+
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Always request read receipt"
 msgstr "ସବ�ବେଳେ ପଢ଼ା ଆଦାନପତ�ରକ� ଅନ�ରୋଧ କରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "ସ�ବଯଂଚାଳିତ emoticon ମାନ�ୟତା"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "ସ�ବୟଂଚାଳିତ ସଂଯୋଗ ମାନ�ୟତା"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
-msgstr "ଆସ�ଥିବା junk ମେଲକ� ଯାଞ�ଚ କରନ�ତ�"
+msgstr "ଆସ�ଥିବା ଅଦରକାରୀ ମେଲକ� ଯାଞ�ଚ କରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "ସାଇଟେସନ ଆଲୋକିତ ରଙ�ଗ"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "ସାଇଟେସନ ଆଲୋକିତ ରଙ�ଗ।"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "ଲୋଖକ ପୂର�ବ ନିର�ଦ�ଧାରିତ ଉଚ�ଚତା ୱିଣ�ଡୋ"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "ଲୋଖକ ପୂର�ବ ନିର�ଦ�ଧାରିତ ଉଚ�ଚତା ୱିଣ�ଡୋ"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "ଲେଖକ ଧାରଣ/ସଂଲଗ�ନ ଡିରେକ�ଟୋରୀ"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "TO/CC/BCC ରେ ଠିକଣା ପ�ରଦର�ଶନକ� ସଙ�କୋଚକରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "TO/CC/BCC ରେ ଠିକଣାଗ�ଡ଼ିକର ସଂକ�ଚିତ ପ�ରଦର�ଶନକ� address_count ସଂଖ�ୟାରେ ଉଲ�ଲେଖ କରିଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11837,11 +11337,11 @@ msgstr ""
 "ସ�ଥାନୀୟ ପରିବର�ତ�ତନଗ�ଡ଼ିକ କେମିତି ସମକାଳିନ ହେବ ତାହାକ� ସ�ଦୂର ମେଲ ସର�ଭର ସହିତ ନିୟନ�ତ�ରଣ କରିଥା�। "
 "ଅନ�ତରାଳଟି ଅତିକମରେ 30 ସେକଣ�ଡ ହେବା ଉଚିତ।"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "ଜଟିଳତା ଯାଞ�ଚ କରିବା ସମୟରେ ଇଚ�ଛାରୂପଣ ଶୀର�ଷକକ� ବ�ୟବହାର ହୋଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11849,69 +11349,79 @@ msgstr ""
 "ଜଟିଳତା ଯାଞ�ଚ କରିବା ସମୟରେ ଇଚ�ଛାରୂପଣ ଶୀର�ଷକକ� ବ�ୟବହାର ହୋଇଥା�। ତାଲିକା ଉପାଦାନଗ�ଡ଼ିକ ଶୈଳୀ "
 "\"ଶୀର�ଷକ ନାମ=ମୂଲ�ୟ\" ବାକ�ୟାଂଶ ଆକାରରେ ଅଛି।"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ଅକ�ଷରସେଟ ଯେଉ�ଥିରେ ସନ�ଦେଶ ଲେଖନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ଅକ�ଷରସେଟ ଯେଉ�ଥିରେ ସନ�ଦେଶ ଲେଖନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ଅକ�ଷରସେଟ ଯେଉ�ଥିରେ ସନ�ଦେଶ ଲେଖନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ଅକ�ଷରସେଟ ଯେଉ�ଥିରେ ସନ�ଦେଶ ଲେଖନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ଅଗ�ରସର ଶୈଳୀ"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "ଲେଖକ ୱିଣ�ଡୋର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଉଚ�ଚତା।"
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default height of the message window."
+#: ../mail/evolution-mail.schemas.in.h:31
+#, fuzzy
+#| msgid "Default height of the Composer Window."
+msgid "Default height of the mail browser window."
 msgstr "ଲେଖକ ୱିଣ�ଡୋର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଉଚ�ଚତା।"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "ଲେଖକ ୱିଣ�ଡୋର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଉଚ�ଚତା।"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:33
+#, fuzzy
+#| msgid "Default width of the Composer Window."
+msgid "Default maximized state of the mail browser window."
+msgstr "ଲେଖକ ୱିଣ�ଡୋର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଓସାର।"
+
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ଉତ�ତର ଶୈଳୀ"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "ଥ�ରେଡ ସମ�ପ�ରସାରଣ ସ�ଥିତି ପାଇ� ପୂର�ବ ନିର�ଦ�ଧାରିତ ମୂଲ�ଯ"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "ଲେଖକ ୱିଣ�ଡୋର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଓସାର।"
 
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid "Default width of the message window."
-msgstr "ସନ�ଦେଶ ୱିଣ�ଡୋର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଓସାର।"
+#: ../mail/evolution-mail.schemas.in.h:37
+#, fuzzy
+#| msgid "Default width of the Composer Window."
+msgid "Default width of the mail browser window."
+msgstr "ଲେଖକ ୱିଣ�ଡୋର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଓସାର।"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "କ�ରେତା ସଂଳାପ ୱିଣ�ଡୋର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଓସାର।"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "ଜଟିଳ ଛଣା ଠିକଣାଗ�ଡ଼ିକ� କେବଳ ସ�ଥାନୀୟ ଠିକଣା ବହିରେ ନିର�ଦ�ଧାରଣ କରିଥା�"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "ଠିକଣାବହିକ� ପ�ରେରକ ଇମେଲ ପାଇ� ନିର�ଦ�ଧାରଣ କରିଥା�"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11922,11 +11432,11 @@ msgstr ""
 "ସ�ୱୟଂସମ�ପୂର�ଣ�ଣ ହେବା ପାଇ� �ହା ଚିହ�ନିତ ହୋଇଥା�। �ହା ମନ�ଥର ହୋଇପାରେ, ଯଦି ସ�ଦୂର ଠିକଣା ବହି (LDAP "
 "ପରି) ସ�ୱୟଂସମ�ପୂର�ଣ�ଣ ହେବା ପାଇ� ଚିହ�ନିତ ହୋଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "ଜଟିଳତା ଯାଞ�ଚ ପାଇ� ଇଚ�ଛାରୂପଣ ଶୀର�ଷକଗ�ଡ଼ିକ� ବ�ୟବହାର କରି ନିର�ଦ�ଧାରଣ କରିଥା�"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11935,7 +11445,7 @@ msgstr ""
 "ଜଟିଳତା ଯାଞ�ଚ ପାଇ� ଇଚ�ଛାରୂପଣ ଶୀର�ଷକଗ�ଡ଼ିକ� ବ�ୟବହାର କରି ନିର�ଦ�ଧାରଣ କରିଥା�। ଯଦି �ହି ବିକଳ�ପକ� ସକ�ରିୟ "
 "କରାଯା� �ବଂ ସେହି ଶୀର�ଷକଗ�ଡ଼ିକ� ସୂଚୀତ କରାଯାଇଥା�, �ହାକ� ଯାଞ�ଚ ଗତିକ� ଉନ�ନତ କରାଯାଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11943,140 +11453,220 @@ msgstr ""
 "ଭୂଲମ�ବ ଦୃଶ�ୟରେ \"ସନ�ଦେଶ\" ସ�ତମ�ଭରେ ଉଭୟ \"ଠାର�\" �ବଂ \"ବିଷୟ\" ସମାନ ଅକ�ଷରରୂପ ପାଇ� ନିର�ଧାରଣ "
 "କରିଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "ଲେଖକରେ ଫାଇଲଗ�ଡ଼ିକ� ଧାରଣ/ସଂଲଗ�ନ କରିବା ପାଇ� ଡିରେକ�ଟୋରୀ। "
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "ମେଲ ଉପାଦାନ ଫାଇଲଗ�ଡ଼ିକ� ସଂରକ�ଷଣ କରିବା ପାଇ� ଡିରେକ�ଟୋରୀ।"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "ପାର�ଶ�ୱପଟିରେ ଫୋଲଡର ନାମଗ�ଡ଼ିକ� ଅଣ�ଡାକାର କରିବାକ� ସକ�ରିୟ କିମ�ବା ନିଷ�କ�ରିୟ କରିଥା�"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:49
+#, fuzzy
+#| msgid "Could not save signature file."
+msgid "Do not add signature delimiter"
+msgstr "ହସ�ତାକ�ଷର ଫାଇଲକ� ସଂରକ�ଷଣ କରିପାରିବେ ନାହି�।"
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
 msgstr "ଆପଣ ଟାଇପା କରିବା ସଙ�ଗେ ସଙ�ଗେ ବନାନ ଯାଞ�ଚ ତ�ର�ଟି ସୂଚକ ଆଙ�କମ କରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Junk folders on exit"
 msgstr "ପ�ରସ�ଥାନ କରିବା ପାଇ� ଖାଲି Junk ଫୋଲଡରଗ�ଡ଼ିକ"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Trash folders on exit"
 msgstr "ପ�ରସ�ଥାନରେ ଖାଲି ଆବର�ଜନା ପାତ�ର ଫୋଲଡର"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Evolutionର� ପ�ରସ�ଥାନ କରିବା ସମୟରେ ସମସ�ତ ଜଟିଳ ଫୋଲଡରଗ�ଡ଼ିକ� ଖାଲିକରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Evolutionର� ପ�ରସ�ଥାନ କରିବା ସମୟରେ ସମସ�ତ ଆବର�ଜନାପାତ�ର ଫୋଲଡରଗ�ଡ଼ିକ� ଖାଲିକରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"ଜୀବନାୟନ ପ�ରତିଛବିଗ�ଡ଼ିକ� HTML ମେଲରେ ସକ�ରିୟ କରନ�ତ�। ଅନେକ ଚାଳକମାନେ ଜୀବନାୟନ ପ�ରତିଛବିଗ�ଡ଼ିକ� "
+"ପାଇଛନ�ତି�ବଂ �ହା ପରିବର�ତ�ତେ ସ�ଥିତିଜ ପ�ରତିଛବି ଦେଖିବାକ� ପସନ�ଦ କରନ�ତି।"
+
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "କ�ୟାରେଟ ଅବସ�ଥାକ� ସକ�ରିୟ କରନ�ତ�, ତେଣ� ଆପଣ ମେଲ ପଢ଼ିବା ସମୟରେ ସୂଚକକ� ଦେଖିପାରିବେ।"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
 msgstr "ମେଜିକ ସ�ପେସ ବାରକ� ସକ�ରିୟ କିମ�ବା ନିଷ�କ�ରିୟ କରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr ""
+msgstr "�କାଧିକ ସନ�ଦେଶଗ�ଡ଼ିକ� ଚିହ�ନଟ କରିବା ସମୟରେ ସୂଚକକ� ସକ�ରିୟ ଅଥବା ନିଷ�କ�ରିୟ କରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "ସନ�ଧାନ ବିଶେଷତା ଉପରେ ପ�ରକାରକ� ସକ�ରିୟ କିମ�ବା ନିଷ�କ�ରିୟ କରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
 msgstr "ସନ�ଧାନ ଫୋଲଡରଗ�ଡ଼ିକ� ସକ�ରିୟ କରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
 msgstr "ଆରମ�ଭରେ ସନ�ଧାନ ଫୋଲଡରଗ�ଡ଼ିକ� ସକ�ରିୟ କରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
-msgstr ""
+msgstr "ଫୋଲଡର ନାମଗ�ଡ଼ିକର ପାରସ�ପରିକ ସନ�ଧାନକ� ଅନ�ମତି ଦେବା ପାଇ� ପାର�ଶ�ୱପଟି ସନ�ଧାନ ବିଶେଷତାକ� ସକ�ରିୟ କରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
-msgstr "ଖାଲିସ�ଥାନ ପଟିକ� ସକ�ରିୟ କରିବା ପାଇ� ସନ�ଦେଶ ପ�ରାକଦର�ଶନକ�, ସନ�ଦେଶ ତାଲିକା �ବଂ ଫୋଲଡରଗ�ଡ଼ିକ� ସକ�ରିୟ କରନ�ତ�।"
+msgstr ""
+"ଖାଲିସ�ଥାନ ପଟିକ� ସକ�ରିୟ କରିବା ପାଇ� ସନ�ଦେଶ ପ�ରାକଦର�ଶନକ�, ସନ�ଦେଶ ତାଲିକା �ବଂ ଫୋଲଡରଗ�ଡ଼ିକ� ସକ�ରିୟ "
+"କରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:55
-msgid "Enable to render message text part of limited size."
-msgstr "ସନ�ଦେଶ ପାଠ�ୟ ଅଂଶ ଚିତ�ରଣକ� ସୀମିତ ଆକାର କରିବା ପାଇ� ସକ�ରିୟ କରନ�ତ�।"
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "କେରେଟ ଧାରାକ� ସକ�ରିୟ/ନିଷ�କ�ରିୟ କରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:57 ../mail/mail-config.glade.h:86
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:46
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Outlook/GMail ପଦ�ଧତିରେ ଫାଇଲ ନାମଗ�ଡ଼ିକ� ସାଙ�କେତିକରଣ କରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
 "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
 "standard."
 msgstr ""
+"ଫାଇଲନାମଗ�ଡ଼ିକ� ମେଲ ଶୀର�ଷକରେ ସାଙ�କେତିକରଣ କରନ�ତ� ଯେପରି Outlook ଅଥବା GMail କରନ�ତି, ସେମାନଙ�କ� "
+"ସଠିକ ଭାବରେ ଦର�ଶାଇବା ପାଇ� UTF-8 ଅକ�ଷର ବିଶିଷ�ଟ ପାଇଲନାମଗ�ଡ଼ିକ� Evolution ଦ�ୱାରା ପଠାଯାଇଥା�, "
+"କାରଣ ସେମାନେ RFC 2231କ� ମାନନ�ତି ନାହି�, କିନ�ତ� ଭ�ଲ RFC 2047 ମାନକକ� ବ�ୟବହାର କରନ�ତି।"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane"
 msgstr "ସନ�ଦେଶ ତାଲିକା ପଟ�ଟିକାର ଉଚ�ଚତା"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Height of the message-list pane."
 msgstr "ସନ�ଦେଶ ତାଲିକା ପଟ�ଟିକାର ଉଚ�ଚତା"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ଫୋଲଡର ପ�ରତି ପ�ରାକଦର�ଶନକ� ଲ�ଚାଇଥା� �ବଂ ଚୟନକ� କାଢ଼ିଥା�"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
-"ଯଦି ଚାଳକ 10 କିମ�ବା ଅଧିକ ସନ�ଦେଶଗ�ଡ଼ିକ� �କ ସମୟରେ ଖାଲିବାକ� ଚେଷ�ଟା କରେ, ତେବେ "
-"ଚାଳକଙ�କ� ପଚାରନ�ତ� ସେମାନେ ପ�ରକୃତରେ �ହା କରିବାକ� ଚାହ��ଛନ�ତି କି।"
+"ଯଦି ଚାଳକ 10 କିମ�ବା ଅଧିକ ସନ�ଦେଶଗ�ଡ଼ିକ� �କ ସମୟରେ ଖାଲିବାକ� ଚେଷ�ଟା କରେ, ତେବେ ଚାଳକଙ�କ� ପଚାରନ�ତ� "
+"ସେମାନେ ପ�ରକୃତରେ �ହା କରିବାକ� ଚାହ��ଛନ�ତି କି।"
 
-#: ../mail/evolution-mail.schemas.in.h:63
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr "ଯଦି \"ପ�ରାକଦର�ଶନ\" ପଟ�ଟିକାଟି ଅନ ଅଛି, ତେବେ �ହାକ� ଭୂଲମ�ବ ପରିବର�ତ�ତେ ପାଖ-କ�-ପାଖ ଦେଖାନ�ତ�।"
-
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
 "in GNOME's MIME type database may be used for displaying content."
 msgstr ""
-"ଯଦି Evolution ଭିତରେ ନିର�ଦ�ଦିଷ�ଟ MIME ପ�ରକାର ପାଇ� ପୂର�ବନିର�ମିତ ପ�ରଦର�ଶକ ନାହି�, "
-"ତେବେ ତାଲିକାରେ ଦୃଶ�ୟମାନ ଯେକୌଣସି MIME ପ�ରକାର ଯାହାକି GNOME ର MIME ପ�ରକାର "
-"ତଥ�ୟାଧାର Bonobo ଉପାଦାନ ପ�ରଦର�ଶକ ସହିତ ମେଳଖାଇଥା�, ତାହାକ� ବିଷୟବସ�ତ� ଦର�ଶାଇବା ପାଇ� "
-"ବ�ୟବହାର କରାଯାଇପାରେ।"
+"ଯଦି Evolution ଭିତରେ ନିର�ଦ�ଦିଷ�ଟ MIME ପ�ରକାର ପାଇ� ପୂର�ବନିର�ମିତ ପ�ରଦର�ଶକ ନାହି�, ତେବେ ତାଲିକାରେ "
+"ଦୃଶ�ୟମାନ ଯେକୌଣସି MIME ପ�ରକାର ଯାହାକି GNOME ର MIME ପ�ରକାର ତଥ�ୟାଧାର Bonobo ଉପାଦାନ "
+"ପ�ରଦର�ଶକ ସହିତ ମେଳଖାଇଥା�, ତାହାକ� ବିଷୟବସ�ତ� ଦର�ଶାଇବା ପାଇ� ବ�ୟବହାର କରାଯାଇପାରେ।"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:73
+#, fuzzy
+#| msgid ""
+#| "Initial height of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window vertically."
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"\"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ପ�ରାରମ�ଭିକ ଉଚ�ଚତା। ଚାଳକ ସେହି ୱିଣ�ଡୋର ଆକାର ପରିବର�ତ�ତନ "
+"କଲେ ମୂଲ�ୟଟି ଅଦ�ୟତିତ ହୋଇଥା�।"
+
+#: ../mail/evolution-mail.schemas.in.h:74
+#, fuzzy
+#| msgid ""
+#| "Initial height of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window vertically."
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"\"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ପ�ରାରମ�ଭିକ ଉଚ�ଚତା। ଚାଳକ ସେହି ୱିଣ�ଡୋର ଆକାର ପରିବର�ତ�ତନ "
+"କଲେ ମୂଲ�ୟଟି ଅଦ�ୟତିତ ହୋଇଥା�।"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"\"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ପ�ରାରମ�ଭିକ ଉଚ�ଚତା। ଚାଳକ ସେହି ୱିଣ�ଡୋର ଆକାର "
-"ପରିବର�ତ�ତନ କଲେ ମୂଲ�ୟଟି ଅଦ�ୟତିତ ହୋଇଥା�।"
+"\"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ପ�ରାରମ�ଭିକ ଉଚ�ଚତା। ଚାଳକ ସେହି ୱିଣ�ଡୋର ଆକାର ପରିବର�ତ�ତନ "
+"କଲେ ମୂଲ�ୟଟି ଅଦ�ୟତିତ ହୋଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:76
+#, fuzzy
+#| msgid ""
+#| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
+#| "updates when the user maximizes or unmaximizes the window. Note, this "
+#| "particular value is not used by Evolution since the \"Send and Receive "
+#| "Mail\" window cannot be maximized. This key exists only as an "
+#| "implementation detail."
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"\"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ପ�ରାରମ�ଭିକ ଉଚ�ଚତା। ଚାଳକ ସେହି ୱିଣ�ଡୋର ଆକାର ପରିବର�ତ�ତନ "
+"କଲେ ମୂଲ�ୟଟି ଅଦ�ୟତିତ ହୋଇଥା�। ମନେରଖନ�ତ�, �ହି ନିର�ଦ�ଦିଷ�ଟ ମୂଲ�ୟଟି Evolution ଦ�ୱାରା ବ�ୟବହୃତ "
+"ହୋଇନଥା�। \"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ଆକାର ବୃଦ�ଧିକରିହେବ ନାହି�। �ହି କିଟି କେବଳ "
+"ଗୋଟି� ପ�ରୟୋଗାତ�ମକ ବିବରଣୀ ଭାବରେ ଅବସ�ଥିତ।"
+
+#: ../mail/evolution-mail.schemas.in.h:77
+#, fuzzy
+#| msgid ""
+#| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
+#| "updates when the user maximizes or unmaximizes the window. Note, this "
+#| "particular value is not used by Evolution since the \"Send and Receive "
+#| "Mail\" window cannot be maximized. This key exists only as an "
+#| "implementation detail."
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"\"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ପ�ରାରମ�ଭିକ ଉଚ�ଚତା। ଚାଳକ ସେହି ୱିଣ�ଡୋର ଆକାର ପରିବର�ତ�ତନ "
+"କଲେ ମୂଲ�ୟଟି ଅଦ�ୟତିତ ହୋଇଥା�। ମନେରଖନ�ତ�, �ହି ନିର�ଦ�ଦିଷ�ଟ ମୂଲ�ୟଟି Evolution ଦ�ୱାରା ବ�ୟବହୃତ "
+"ହୋଇନଥା�। \"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ଆକାର ବୃଦ�ଧିକରିହେବ ନାହି�। �ହି କିଟି କେବଳ "
+"ଗୋଟି� ପ�ରୟୋଗାତ�ମକ ବିବରଣୀ ଭାବରେ ଅବସ�ଥିତ।"
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12084,77 +11674,103 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
-"\"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ପ�ରାରମ�ଭିକ ଉଚ�ଚତା। ଚାଳକ ସେହି ୱିଣ�ଡୋର ଆକାର "
-"ପରିବର�ତ�ତନ କଲେ ମୂଲ�ୟଟି ଅଦ�ୟତିତ ହୋଇଥା�। ମନେରଖନ�ତ�, �ହି ନିର�ଦ�ଦିଷ�ଟ ମୂଲ�ୟଟି Evolution "
-"ଦ�ୱାରା ବ�ୟବହୃତ ହୋଇନଥା�। \"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ଆକାର ବୃଦ�ଧିକରିହେବ "
-"ନାହି�। �ହି କିଟି କେବଳ ଗୋଟି� ପ�ରୟୋଗାତ�ମକ ବିବରଣୀ ଭାବରେ ଅବସ�ଥିତ।"
+"\"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ପ�ରାରମ�ଭିକ ଉଚ�ଚତା। ଚାଳକ ସେହି ୱିଣ�ଡୋର ଆକାର ପରିବର�ତ�ତନ "
+"କଲେ ମୂଲ�ୟଟି ଅଦ�ୟତିତ ହୋଇଥା�। ମନେରଖନ�ତ�, �ହି ନିର�ଦ�ଦିଷ�ଟ ମୂଲ�ୟଟି Evolution ଦ�ୱାରା ବ�ୟବହୃତ "
+"ହୋଇନଥା�। \"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ଆକାର ବୃଦ�ଧିକରିହେବ ନାହି�। �ହି କିଟି କେବଳ "
+"ଗୋଟି� ପ�ରୟୋଗାତ�ମକ ବିବରଣୀ ଭାବରେ ଅବସ�ଥିତ।"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:79
+#, fuzzy
+#| msgid ""
+#| "Initial width of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window horizontally."
 msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+"\"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ପ�ରାରମ�ଭିକ ଓସାର। ଚାଳକ ସେହି ୱିଣ�ଡୋର ଆକାର "
+"ଭୂସମାନ�ତରାଳରେପରିବର�ତ�ତନ କଲେ ମୂଲ�ୟଟି ଅଦ�ୟତିତ ହୋଇଥା�।"
+
+#: ../mail/evolution-mail.schemas.in.h:80
+#, fuzzy
+#| msgid ""
+#| "Initial width of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window horizontally."
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"\"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ପ�ରାରମ�ଭିକ ଓସାର। ଚାଳକ ସେହି ୱିଣ�ଡୋର ଆକାର ଭୂସମାନ�ତରାଳରେ"
-"ପରିବର�ତ�ତନ କଲେ ମୂଲ�ୟଟି ଅଦ�ୟତିତ ହୋଇଥା�।"
+"\"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ପ�ରାରମ�ଭିକ ଓସାର। ଚାଳକ ସେହି ୱିଣ�ଡୋର ଆକାର "
+"ଭୂସମାନ�ତରାଳରେପରିବର�ତ�ତନ କଲେ ମୂଲ�ୟଟି ଅଦ�ୟତିତ ହୋଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr ""
-"ଅଫଲାଇନ ଅବସ�ଥାକ� ଯିବା ପୂର�ବର� ଯଦି ଅଫ ଲାଇନ sync ଆବଶ�ୟକ ହ�� ତେବେ �ହା "
-"ପ�ନଃପୌନିକ ପଚାରିବା ପ�ରମ�ପ�ଟକ� ନିଷ�କ�ରିୟ/ସକ�ରିୟ କରିଥା�।"
+"\"ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣ କରନ�ତ�\" ୱିଣ�ଡୋର ପ�ରାରମ�ଭିକ ଓସାର। ଚାଳକ ସେହି ୱିଣ�ଡୋର ଆକାର "
+"ଭୂସମାନ�ତରାଳରେପରିବର�ତ�ତନ କଲେ ମୂଲ�ୟଟି ଅଦ�ୟତିତ ହୋଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 msgstr ""
-"ସନ�ଧାନ ଫୋଲଡରର� ସନ�ଦେଶକ� ଅପସାରଣ କରିବା ଫଳରେ ତାହା ସବ�ଦିନ ପାଇ� ଅପସାରିତ ହୋଇଥା� ବୋଲି "
-"ଚେତାବନୀ ଦେବା ପ�ରମ�ପ�ଟକ� �ହା ନିଷ�କ�ରିୟ/ସକ�ରିୟ କରିଥା�, କେବଳ �ହାକ� ସନ�ଧାନ ଫଳାଫଳର� ସହଜରେ ନକାଢ଼ି।"
+"ସନ�ଧାନ ଫୋଲଡରର� ସନ�ଦେଶକ� ଅପସାରଣ କରିବା ଫଳରେ ତାହା ସବ�ଦିନ ପାଇ� ଅପସାରିତ ହୋଇଥା� ବୋଲି ଚେତାବନୀ "
+"ଦେବା ପ�ରମ�ପ�ଟକ� �ହା ନିଷ�କ�ରିୟ/ସକ�ରିୟ କରିଥା�, କେବଳ �ହାକ� ସନ�ଧାନ ଫଳାଫଳର� ସହଜରେ ନକାଢ଼ି।"
 
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Last time empty junk was run"
+#: ../mail/evolution-mail.schemas.in.h:83
+#, fuzzy
+#| msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
 msgstr "ଶେଷଥର ପାଇ� ଖାଲି ଜଙ�କକ� ଚଲାଇକରି"
 
-#: ../mail/evolution-mail.schemas.in.h:71
-msgid "Last time empty trash was run"
+#: ../mail/evolution-mail.schemas.in.h:84
+#, fuzzy
+#| msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
 msgstr "ଶେଷଥର ଖାଲି ଆବର�ଜନାପାତ�ରକ� ଚଲାଯାଇଥିଲା"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
+#, fuzzy
+#| msgid "Lay_out"
+msgid "Layout style"
+msgstr "ବିନ�ଯାସ (_o)"
+
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
 msgstr "ନାମପଟିଗ�ଡ଼ିକର ତାଲିକା �ବଂ ସେମାନଙ�କ ସହିତ ସମ�ପୃକ�ତ ରଙ�ଗଗ�ଡ଼ିକ"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "Bonobo ଉପାଦାନ ପ�ରଦର�ଶକଗ�ଡ଼ିକ� ଯାଞ�ଚ କରିବା ପାଇ� MIME ପ�ରକାରଗ�ଡ଼ିକର ତାଲିକା"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
 msgstr "ଗ�ରହଣୀୟ ଅନ�ମତିପତ�ରଗ�ଡ଼ିକର ତାଲିକା"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "ଆକାଉଣ�ଟ ଗ�ଡିକର ତାଲିକା"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
-"Evolutionର ମେଲ ଉପାଦାନକ� ଜଣାଥିବା ଖାତାଗ�ଡ଼ିକର ତାଲିକା। ସେହି ତାଲିକା ବାକ�ୟଖଣ�ଡ ନାମକରଣ "
-"/apps/evolution/mail/accounts ସମ�ପର�କୀୟ ଉପ-ଡିରେକ�ଟୋରୀ ଧାରଣ କରିଥା�।"
+"Evolutionର ମେଲ ଉପାଦାନକ� ଜଣାଥିବା ଖାତାଗ�ଡ଼ିକର ତାଲିକା। ସେହି ତାଲିକା ବାକ�ୟଖଣ�ଡ ନାମକରଣ /apps/"
+"evolution/mail/accounts ସମ�ପର�କୀୟ ଉପ-ଡିରେକ�ଟୋରୀ ଧାରଣ କରିଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
 msgstr "ଇଚ�ଛାରୂପଣ ଶୀର�ଷକଗ�ଡ଼ିକର ତାଲିକା �ବଂ ସେମାନେ ସକ�ରିୟ ଅଛନ�ତି କି ନାହି�।"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ଅଭିଧାନ ଭାଷା ସଂକେତର ତାଲିକା ଯାହାକି ବନାନ ଯାଞ�ଚ ପାଇ� ବ�ୟବହୃତ ହୋଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:94
 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."
@@ -12162,382 +11778,460 @@ msgstr ""
 "Evolutionର ମେଲ ଉପାଦାନକ� ଜଣାଥିବା ନାମପଟିଗ�ଡ଼ିକର ତାଲିକା। ସେହି ତାଲିକା ନାମ:ରଙ�ଗ ବାକ�ୟଖଣ�ଡ "
 "ଧାରଣ କରିଥା� ଯେଉ�ଠି ରଙ�ଗ ହେଉଛି HTML ଶୋହଳମିକ ସାଙ�କେତିକରଣ।"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
 msgstr "ପ�ରୋଟୋକଲ ନାମଗ�ଡ଼ିକର ତାଲିକା ଯାହାର ଅନ�ମତିପତ�ରକ� ଗ�ରହଣକରାଯାଇଛି।"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTML ସନ�ଦେଶ ପାଇ� HTTP ଉପରେ ପ�ରତିଛବି ଧାରଣ କରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
 "HTML ସନ�ଦେଶଗ�ଡ଼ିକର ପ�ରତିଛବିଗ�ଡ଼ିକ� HTTP(S) ଉପରେ ଧାରଣ କରନ�ତ�। ସମ�ଭାବ�ୟ ମୂଲ�ୟଗ�ଡ଼ିକ ହେଉଛି: \"0\" - "
-"ନେଟର ପ�ରତିଛବିକ� କଦାପି ଧାରଣ କରନ�ତ� ନାହି�। \"1\" - ସମ�ପର�କୀୟ ସନ�ଦେଶଗ�ଡ଼ିକର� ପ�ରତିଛବିଗ�ଡ଼ିକ� ଧାରଣ କରନ�ତ�। "
-"\"2\" - ନେଟ ବାହାର� ସର�ବଦା ପ�ରତିଛବିଗ�ଡ଼ିକ� ଧାରଣ କରନ�ତ�।"
+"ନେଟର ପ�ରତିଛବିକ� କଦାପି ଧାରଣ କରନ�ତ� ନାହି�। \"1\" - ସମ�ପର�କୀୟ ସନ�ଦେଶଗ�ଡ଼ିକର� ପ�ରତିଛବିଗ�ଡ଼ିକ� ଧାରଣ "
+"କରନ�ତ�। \"2\" - ନେଟ ବାହାର� ସର�ବଦା ପ�ରତିଛବିଗ�ଡ଼ିକ� ଧାରଣ କରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
 msgstr "ଛାଣକ କାର�ଯ�ୟ ଲଗ କରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Log filter actions to the specified log file."
 msgstr "ନିର�ଦ�ଦିଷ�ଟିତ ଲଗ ଫାଇଲ ପାଇ� ଛାଣକ କାର�ଯ�ୟ ଲଗ କରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Logfile to log filter actions"
 msgstr "ଛାଣକ କାର�ଯ�ୟ ଲଗ କରିବା ପାଇ� ଲଗ ଫାଇଲ"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Logfile to log filter actions."
 msgstr "ଛାଣକ କାର�ଯ�ୟ ଲଗ କରିବା ପାଇ� ଲଗ ଫାଇଲ।"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:102
+#, fuzzy
+#| msgid "Uniform row height"
+msgid "Mail browser height"
+msgstr "�କରୂପ ଧାଡି ଉଚ�ଚତା"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Mail browser maximized"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:104
+#, fuzzy
+#| msgid "Email begins with"
+msgid "Mail browser width"
+msgstr "ଇ-ଡାକ �ହା ସହିତ ପ�ରାରମ�ଭ ହୋଇଥା�"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mark as Seen after specified timeout"
 msgstr "ନିର�ଦ�ଦିଷ�ଟିତ ସମୟ ସମାପ�ତ ପରେ ଦେଖାଯାଇଥିବା ପରି ଚିହ�ନଟକରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mark as Seen after specified timeout."
 msgstr "ନିର�ଦ�ଦିଷ�ଟିତ ସମୟ ସମାପ�ତ ପରେ ଦେଖାଯାଇଥିବା ପରି ଚିହ�ନଟକରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mark citations in the message \"Preview\""
 msgstr "ସନ�ଦେଶ \"Preview\"ରେ ଦୃଷ�ଟାନ�ତ ଚିହ�ନଟ କରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ସନ�ଦେଶ \"Preview\"ରେ ଦୃଷ�ଟାନ�ତ ଚିହ�ନଟ କରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid "Message Window default height"
-msgstr "ସନ�ଦେଶ ୱିଣ�ଡୋ ପୂର�ବ ନିର�ଦ�ଧାରିତ ଉଚ�ଚତା"
-
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Message Window default width"
-msgstr "ସନ�ଦେଶ ୱିଣ�ଡୋ ପୂର�ବ ନିର�ଦ�ଧାରିତ ଓସାର"
+#: ../mail/evolution-mail.schemas.in.h:109
+msgid "Message text limit for display"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "ସନ�ଦେଶ-ପ�ରଦର�ଶନ ଶୈଳୀ (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the junk on exit"
-msgstr "ପ�ରସ�ଥାନରେ junkକ� ଖାଲିକରିବା ମଧ�ଯରେ ଲାଗ�ଥିବା ସର�ବନିମ�ନ ଦିନ"
+msgstr "ପ�ରସ�ଥାନରେ ଅଦରକାରୀକ� ଖାଲିକରିବା ମଧ�ଯରେ ଲାଗ�ଥିବା ସର�ବନିମ�ନ ଦିନ"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum days between emptying the trash on exit"
-msgstr "ପ�ରସ�ଥାନରେ junkକ� ଖାଲିକରିବା ମଧ�ଯରେ ଲାଗ�ଥିବା ସର�ବନିମ�ନ ଦିନ"
+msgstr "ପ�ରସ�ଥାନରେ ଅଦରକାରୀକ� ଖାଲିକରିବା ମଧ�ଯରେ ଲାଗ�ଥିବା ସର�ବନିମ�ନ ଦିନ"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the junk on exit, in days."
-msgstr "ପ�ରସ�ଥାନରେ junkକ� ଖାଲିକରିବା ମଧ�ଯରେ ଲାଗ�ଥିବା ସର�ବନିମ�ନ ସମୟ, ଦିନ ଆକାରରେ।"
+msgstr "ପ�ରସ�ଥାନରେ ଅଦରକାରୀକ� ଖାଲିକରିବା ମଧ�ଯରେ ଲାଗ�ଥିବା ସର�ବନିମ�ନ ସମୟ, ଦିନ ଆକାରରେ।"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "ପ�ରସ�ଥାନରେ junkକ� ଖାଲିକରିବା ମଧ�ଯରେ ଲାଗ�ଥିବା ସର�ବନିମ�ନ ସମୟ, ଦିନ ଆକାରରେ।"
+msgstr "ପ�ରସ�ଥାନରେ ଅଦରକାରୀକ� ଖାଲିକରିବା ମଧ�ଯରେ ଲାଗ�ଥିବା ସର�ବନିମ�ନ ସମୟ, ଦିନ ଆକାରରେ।"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "TO/CC/BCCରେ ଦର�ଶାଇବା ପାଇ� ଠିକଣା ସଂଖ�ୟା"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "ବିଷୟରେ ଖାଲିକରିବା ସମୟରେ ପଚାରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ଫୋଲଡରକ� କାଟିବା ପାଇ� ଚେଷ�ଟା କରିବା ପୂର�ବର� ଚାଳକକ� ପଚାରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ବିନା ବିଷୟରେ ସନ�ଦେଶ ପଠାଇବା ପାଇ� ଚେଷ�ଟାକରିବା ପୂର�ବର� ଚାଳକଙ�କ� ପଚାରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "ଚାଳକ ତ�ରନ�ତ ଅଫ ଲାଇନ ଯିବାକ� ଚାହି�ବା ପୂର�ବର� ପଚାରନ�ତ�"
-
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "ସନ�ଧାନ ଫୋଲଡରରେ ସନ�ଦେଶକ� ଅପସାରଣ କରିବା ପୂର�ବର� ପଚାରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "ଚାଳକ କାଟିବା ପୂର�ବର� ପଚାରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "ଚାଳକ କେବଳ Bcc ପୂରଣ କରିବା ସମୟରେ ପଚାରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ଚାଳକ ଥରକରେ 10 ର� ଅଧିକ ସନ�ଦେଶ ଖୋଲିବାକ� ଚେଷ�ଟା କରିବା ସମୟରେ ପଚାରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
-"ଚାଳକ HTML ମେଲ ପଠାଇବାକ� ଚେଷ�ଟା କରିବା ସମୟରେ ପଚାରନ�ତ� ଯାହାକି "
-"HTML ମେଲ ଗ�ରହଣ କରିବାକ� ଚାହ��ନଥା�।"
+"ଚାଳକ HTML ମେଲ ପଠାଇବାକ� ଚେଷ�ଟା କରିବା ସମୟରେ ପଚାରନ�ତ� ଯାହାକି HTML ମେଲ ଗ�ରହଣ କରିବାକ� "
+"ଚାହ��ନଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ଚାଳକ ବିନା To କିମ�ବା Cc ଗ�ରହଣକର�ତ�ତା ସହିତ ସନ�ଦେଶ ପଠାଉଇବାକ� ଚେଷ�ଟା କରିବା ସମୟରେ ପଚାରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ଅନାବଶ�ୟକ HTML ପଠାଇବା ପାଇ� ଚେଷ�ଟାକରିବା ସମୟରେ ପଚାରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "�କାଧିକ ସନ�ଦେଶକ� ଚିହ�ନଟ କରିବା ସମୟରେ ପଚାରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Put personalized signatures at the top of replies"
+msgstr "ଉତ�ତରଗ�ଡ଼ିକ ଉପରେ ବ�ୟକ�ତିଗତ ହସ�ତାକ�ଷରକ� ରଖନ�ତ� "
+
+#: ../mail/evolution-mail.schemas.in.h:128
+#, fuzzy
+#| msgid "Start _typing at the bottom on replying"
+msgid "Put the cursor at the bottom of replies"
+msgstr "ଉତ�ତର ତଳେ ସୂଚକକ� ରଖନ�ତ�"
+
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "emoticonଗ�ଡ଼ିକ� ପାଠ�ୟରେ ଚିହ�ନନ�ତ� �ବଂ ସେମାନଙ�କ� ପ�ରତିଛବି ଦ�ୱାରା ବଦଳାନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "ପାଠ�ୟଗ�ଡ଼ିକରେ ସଂଯୋଗକ� ଚିହ�ନନ�ତ� �ବଂ ସେମାନଙ�କ� ବଦଳାନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
-msgstr "ଆସ�ଥିବା ମେଲରେ junk ପରୀକ�ଷଣ ଚଲାନ�ତ�।"
+msgstr "ଆସ�ଥିବା ମେଲରେ ଅଦରକାରୀ ପରୀକ�ଷଣ ଚଲାନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "ଡିରେକ�ଟୋରୀ ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "ସ�ଥାନୀୟ ଠିକଣା ବହିରେ ପ�ରେରକର ଫୋଟୋ ଖୋଜନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ଭାବରେ HTML ମେଲ ପଠାନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ଭାବରେ HTML ମେଲ ପଠାନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "ସନ�ଦେଶ ତାଲିକାରେ ପ�ରେରକର ଇ-ଡାକ ଠିକଣା ସ�ତମ�ଭ"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "ସର�ଭର ସମକାଳନ ଅନ�ତରାଳ"
 
-#: ../mail/evolution-mail.schemas.in.h:121
-msgid "Show \"Bcc\" field when sending a mail message"
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "ମେଲ ସନ�ଦେଶ ପଠାଇବା ସମୟରେ \"Bcc\" କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�"
+
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"Cc\" field when sending a mail message"
-msgstr ""
+msgstr "ମେଲ ସନ�ଦେଶ ପଠାଇବା ସମୟରେ \"Cc\" କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when posting to a newsgroup"
-msgstr ""
+msgstr "ଗୋଟି� ଖବରସମ�ହ ପୋଷ�ଟ କରିବା ସମୟରେ \"From\" କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"From\" field when sending a mail message"
-msgstr ""
+msgstr "ମେଲ ସନ�ଦେଶ ପଠାଇବା ସମୟରେ \"From\" କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr ""
+msgstr "ମେଲ ସନ�ଦେଶ ପଠାଇବା ସମୟରେ \"Reply To\" କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "ମେଲ ସନ�ଦେଶ ପଠାଇବା ସମୟରେ \"Reply To\" କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "ଜୀବନ�ତଚିତ�ରଗ�ଡିକ� ଦର�ଶାନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:146
+#, fuzzy
+#| msgid "Collapse all message threads"
+msgid "Show all message headers"
+msgstr "ସମସ�ତ ସନ�ଦେଶ ଥ�ରେଡ଼ଗ�ଡ଼ିକ� ଭାଙ�ଗନ�ତ�"
+
+#: ../mail/evolution-mail.schemas.in.h:147
+#, fuzzy
+#| msgid "Show \"Reply To\" field when sending a mail message"
+msgid "Show all the headers when viewing a messages."
+msgstr "ମେଲ ସନ�ଦେଶ ପଠାଇବା ସମୟରେ \"Reply To\" କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�"
+
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "ଜୀବନ�ତଚିତ�ରଗ�ଡିକ� ଜୀବନାୟନ ପ�ରତିଛବି ଆକାରରେ ଦର�ଶାନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "ସନ�ଦେଶ ତାଲିକାରେ ଅପସାରିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଦର�ଶାନ�ତ� (ରେଖାଙ�କନ ସହିତ)।"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr "ଅପସାରିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ସନ�ଦେଶ ତାଲିକାରେ ଦର�ଶାନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:151
+#, fuzzy
+#| msgid "_Show image animations"
+msgid "Show image animations"
+msgstr "ପ�ରତିଛବି ଜୀବନାୟନଗ�ଡ଼ିକ� ଦର�ଶାନ�ତ�"
+
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid "Show original \"Date\" header value."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "ପ�ରେରକର ଫୋଟୋ ଦର�ଶାନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
+"ମେଲ ସନ�ଦେଶ ପଠାଇବା ସମୟରେ \"Bcc\" କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�। �ହାକ� ଦୃଶ�ୟ ତାଲିକାର� ନିୟନ�ତ�ରଣ "
+"କରାଯାଇଥା� ଯେତେବେଳେ ଗୋଟି� ମେଲ ଗ�ରାହକ ବଛାହୋଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
+"ମେଲ ସନ�ଦେଶ ପଠାଇବା ସମୟରେ \"Cc\" କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�। �ହାକ� ଦୃଶ�ୟ ତାଲିକାର� ନିୟନ�ତ�ରଣ "
+"କରାଯାଇଥା� ଯେତେବେଳେ ଗୋଟି� ମେଲ ଗ�ରାହକ ବଛାହୋଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
+"ଗୋଟି� ଖବରଶ�ରେଣୀ ଦାଖଲ କରିବା ସମୟରେ \"From\" କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�। �ହାକ� ଦୃଶ�ୟ ତାଲିକାର� ନିୟନ�ତ�ରଣ "
+"କରାଯାଇଥା� ଯେତେବେଳେ ଗୋଟି� ଖବର ଖାତା ବଛାହୋଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
+"ମେଲ ସନ�ଦେଶ ପଠାଇବା ସମୟରେ \"From\" କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�। �ହାକ� ଦୃଶ�ୟ ତାଲିକାର� ନିୟନ�ତ�ରଣ "
+"କରାଯାଇଥା� ଯେତେବେଳେ ଗୋଟି� ମେଲ ଗ�ରାହକ ବଛାହୋଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 msgstr ""
+"ଗୋଟି� ଖବରଶ�ରେଣୀ ଦାଖଲ କରିବା ସମୟରେ \"Reply To\" କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�। �ହାକ� ଦୃଶ�ୟ ତାଲିକାର� "
+"ନିୟନ�ତ�ରଣ କରାଯାଇଥା� ଯେତେବେଳେ ଗୋଟି� ଖବର ଖାତା ବଛାହୋଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
+"ମେଲ ସନ�ଦେଶ ପଠାଇବା ସମୟରେ \"Reply To\" କ�ଷେତ�ରକ� ଦର�ଶାନ�ତ�। �ହାକ� ଦୃଶ�ୟ ତାଲିକାର� ନିୟନ�ତ�ରଣ "
+"କରାଯାଇଥା� ଯେତେବେଳେ ଗୋଟି� ମେଲ ଗ�ରାହକ ବଛାହୋଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "ପ�ରେରକଙ�କର ଇମେଲ ଠିକଣାକ� ସନ�ଦେଶ ତାଲିକାର ପୃଥକ ସ�ତମ�ଭରେ ଦର�ଶାନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "ସନ�ଦେଶ ପାଠ ପଟ�ଟିକାରେ ପ�ରେରକଙ�କ ଫୋଟୋ ଦର�ଶାନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "ଇନଲାଇନ ବନାନ ଯାଞ�ଚ"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "ବନାନ ଯାଞ�ଚ ରଙ�ଗ"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "ବନାନ ଯାଞ�ଚକାରୀ ଭାଷାଗ�ଡ଼ିକ"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "ସଂଳାପର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଉଚ�ଚତା କିଣନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "ସଂଳାପର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଉଚ�ଚତା କିଣନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "ଟର�ମିନାଲ ଅକ�ଷରରୂପ"
 
-#: ../mail/evolution-mail.schemas.in.h:148
-msgid "Text message part limit"
-msgstr "ପାଠ�ୟ ସନ�ଦେଶର ଅଂଶ ସୀମା"
-
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "Junk ହ�କ ପାଇ� ପୂର�ବ ନିର�ଦ�ଧାରିତ ପ�ଲଗଇନ"
 
-#: ../mail/evolution-mail.schemas.in.h:150
-msgid "The last time empty junk was run, in days since the epoch."
+#: ../mail/evolution-mail.schemas.in.h:170
+#, fuzzy
+#| msgid "The last time empty junk was run, in days since the epoch."
+msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ଶେଷ ଥର ପାଇ� ଖାଲି ଜଙ�କକ� ଚଲାଯାଇଥିବା ସମୟ. ଦିନ ଆକାରରେ epoch ପରଠାର�।"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "The last time empty trash was run, in days since the epoch."
+#: ../mail/evolution-mail.schemas.in.h:171
+#, fuzzy
+#| msgid "The last time empty trash was run, in days since the epoch."
+msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ଶେଷ ଥର ପାଇ� ଖାଲି ଆବର�ଜନାପାତ�ରକ� ଚଲାଯାଇଥିବା ସମୟ. ଦିନ ଆକାରରେ epoch ପରଠାର�।"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
 msgstr "ମେଲ ପ�ରଦର�ଶନ ପାଇ� ଟର�ମିନାଲ ଅକ�ଷରରୂପ।"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The variable width font for mail display."
 msgstr "ମେଲ ପ�ରଦର�ଶନ ପାଇ� ଚଳ ଓସାର ଅକ�ଷରରୂପ।"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
-"�ହାର ତିନେଟି ସମ�ଭାବ�ୟ ମୂବଲ�ୟ ଥାଇପାରେ। \"0\" ତ�ର�ଟିଗ�ଡ଼ିକ ପାଇ�। \"1\" ଚେତାବନୀ ପାଇ�। "
-"\"2\" ତ�ର�ଟି ନିବାରଣ ସନ�ଦେଶଗ�ଡ଼ିକ ପାଇ�।"
+"�ହାର ତିନେଟି ସମ�ଭାବ�ୟ ମୂବଲ�ୟ ଥାଇପାରେ। \"0\" ତ�ର�ଟିଗ�ଡ଼ିକ ପାଇ�। \"1\" ଚେତାବନୀ ପାଇ�। \"2\" "
+"ତ�ର�ଟି ନିବାରଣ ସନ�ଦେଶଗ�ଡ଼ିକ ପାଇ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:176
+#, fuzzy
+#| msgid ""
+#| "This decides the max size of the text part that can be formatted under "
+#| "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
 "�ହା ପାଠ�ୟର ସର�ବାଧିକ ଆକାରକ� ନିର�ଦ�ଧାରଣ କରିଥା� ଯାହାକ� କି Evolution ସହାୟତାରେ ସଜଡ଼ାଯାଇପାରିବ। "
 "ପୂର�ବନିର�ଦ�ଧାରିତ ଆକାରଟି ହେଉଛି 4MB / 4096 KB �ବଂ �ହାକ� KB ରେ ଉଲ�ଲେଖ କରାଯାଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 msgstr ""
-"�ହା ଗୋଟି� ପୂର�ବନିର�ଦ�ଧାରିତ ଜଙ�କ ପ�ଲଗଇନ, ଯଦିଚ ସେଠାରେ �କାଧିକ ପ�ଲଗଇନ ସକ�ରିୟ ଅଛି। "
-"ଯଦି ସେହି ପୂର�ବନିର�ଦ�ଧାରିତ ତାଲିକାଭ�କ�ତ ପ�ଲଗଇନକ� ନିଷ�କ�ରିୟ କରାଯା�, ତେବେ �ହା ଅନ�ୟାନ�ୟ "
-"ଉପଲବ�ଧ ପ�ଲଗଇନଗ�ଡ଼ିକ ଉପରେ ଖସିପଡ଼ିବ ନାହି�।"
+"�ହା ଗୋଟି� ପୂର�ବନିର�ଦ�ଧାରିତ ଜଙ�କ ପ�ଲଗଇନ, ଯଦିଚ ସେଠାରେ �କାଧିକ ପ�ଲଗଇନ ସକ�ରିୟ ଅଛି। ଯଦି ସେହି "
+"ପୂର�ବନିର�ଦ�ଧାରିତ ତାଲିକାଭ�କ�ତ ପ�ଲଗଇନକ� ନିଷ�କ�ରିୟ କରାଯା�, ତେବେ �ହା ଅନ�ୟାନ�ୟ ଉପଲବ�ଧ ପ�ଲଗଇନଗ�ଡ଼ିକ ଉପରେ "
+"ଖସିପଡ଼ିବ ନାହି�।"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 msgstr ""
-"�ହି କି ଟି କେବଳ ପଠନୀୟ �ବଂ ପଢ଼ାସରିଲା ପରେ \"false\" ଭାବରେ ପ�ଣି ସେଟ କରିଦିଆଯା�। "
-"�ହା ତାଲିକାରେ ଥିବା ମେଲକ� ଅବଛା କରିଥା� �ବଂ ଫୋଲଡର ପାଇ� ପ�ରାକଦର�ଶନକ� କାଢ଼ିଦେଇଥା�।"
+"�ହି କି ଟି କେବଳ ପଠନୀୟ �ବଂ ପଢ଼ାସରିଲା ପରେ \"false\" ଭାବରେ ପ�ଣି ସେଟ କରିଦିଆଯା�। �ହା "
+"ତାଲିକାରେ ଥିବା ମେଲକ� ଅବଛା କରିଥା� �ବଂ ଫୋଲଡର ପାଇ� ପ�ରାକଦର�ଶନକ� କାଢ଼ିଦେଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 msgstr ""
-"�ହି କି ଟି ଇଚ�ଛାରୂପଣ ଶୀର�ଷକଗ�ଡ଼ିକ� ଉଲ�ଲେଖ କରି XML ସଂରଚନାର ଗୋଟି� ତାଲିକା ଧାରଣ କରିଥା�, "
-"�ବଂ ସେମାନଙ�କ� ଦର�ଶାଯିବା ଉଚିତ କି ନ�ହ�। XML ସଂରଚନାର ସଜ�ଜିକରଣ ଶୈଳୀଟି ହେଉଛି &lt; "
-"ଶୀର�ଷକ ସକ�ରିୟ &gt; - ସକ�ରିୟ କରାଯାଇଥା� ଯଦି ଶୀର�ଷକକ� ମେଲ ଦ-ଶ�ୟରେ ଦର�ଶାଯିବ।"
+"�ହି କି ଟି ଇଚ�ଛାରୂପଣ ଶୀର�ଷକଗ�ଡ଼ିକ� ଉଲ�ଲେଖ କରି XML ସଂରଚନାର ଗୋଟି� ତାଲିକା ଧାରଣ କରିଥା�, �ବଂ "
+"ସେମାନଙ�କ� ଦର�ଶାଯିବା ଉଚିତ କି ନ�ହ�। XML ସଂରଚନାର ସଜ�ଜିକରଣ ଶୈଳୀଟି ହେଉଛି &lt; ଶୀର�ଷକ ସକ�ରିୟ &gt; "
+"- ସକ�ରିୟ କରାଯାଇଥା� ଯଦି ଶୀର�ଷକକ� ମେଲ ଦ-ଶ�ୟରେ ଦର�ଶାଯିବ।"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
-"�ହି ବିକଳ�ପଟି କି ଲ�କଅପ-ଠିକଣା ପ�ସ�ତକ ସହିତ ସମ�ପୃକ�ତ �ବଂ ସ�ଥାନୀୟ ଠିକଣା ବହିରେ ଠିକଣାଗ�ଡ଼ିକ� ଦେଖିବା "
-"ଉଚିତ କି ନ�ହ� ତାହା ନିର�ଦ�ଧାରଣ କରିଥା�, କେବଳ ଜଣା ସମ�ପର�କ ମାଧ�ଯମରେ ପଠାଯାଇଥିବା ମେଲ ମାଧ�ଯମରେ "
-"ଜଟିଳ ଛଣା ପାଇ� ବ�ୟବହାର ହୋଇଥା�।"
+"�ହି ବିକଳ�ପଟି କି ଲ�କଅପ-ଠିକଣା ପ�ସ�ତକ ସହିତ ସମ�ପୃକ�ତ �ବଂ ସ�ଥାନୀୟ ଠିକଣା ବହିରେ ଠିକଣାଗ�ଡ଼ିକ� ଦେଖିବା ଉଚିତ କି "
+"ନ�ହ� ତାହା ନିର�ଦ�ଧାରଣ କରିଥା�, କେବଳ ଜଣା ସମ�ପର�କ ମାଧ�ଯମରେ ପଠାଯାଇଥିବା ମେଲ ମାଧ�ଯମରେ ଜଟିଳ ଛଣା "
+"ପାଇ� ବ�ୟବହାର ହୋଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "This option would help in improving the speed of fetching."
 msgstr "�ହି ବିକଳ�ପଟି ଟାଣିବାର ଗତିକ� ଉନ�ନତ କରିବାରେ ସହାୟତା କରିଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr ""
-"�ହା ଠିକଣାଗ�ଡ଼ିକର ସଂଖ�ୟାକ� ପୂର�ବନିର�ଦ�ଧାରିତ ସନ�ଦେଶ ତାଲିକା ଦୃଶ�ୟରେ ଦର�ଶାଇବା ପାଇ� ସେଟ କରିଥା�, "
-"ଯାହା ପରେ ଗୋଟି� '...' ଦର�ଶାଯାଇଥା�।"
+"�ହା ଠିକଣାଗ�ଡ଼ିକର ସଂଖ�ୟାକ� ପୂର�ବନିର�ଦ�ଧାରିତ ସନ�ଦେଶ ତାଲିକା ଦୃଶ�ୟରେ ଦର�ଶାଇବା ପାଇ� ସେଟ କରିଥା�, ଯାହା "
+"ପରେ ଗୋଟି� '...' ଦର�ଶାଯାଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12545,808 +12239,713 @@ msgstr ""
 "�ହି ସଂରଚନାଟି ଉଲ�ଲେଖ କରିଥା� ଯେ ସୂତ�ରଟି ପୂର�ବନିର�ଦ�ଧାରିତ ଭାବେର ପ�ରସାରିତ ଅଥବା ଭାଙ�ଗିପଡ଼ିବା ଉଚିତ। "
 "Evolution ଗୋଟି� ପ�ନଃଚାଳନ ଆବଶ�ୟକ କରେ।"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
-"�ବି ସଂରଚନା ଉଲ�ଲେଖ କରିଥା� କାଳେ ସୂତ�ରଟି ସନ�ଦେଶ ତାରିଖ ବଦଳରେ ନୂତନ ତମ ସନ�ଦେଶ ଉପରେ "
-"ଆଧାର କରି ସଜାହୋଇଥା�। Evolution ପ�ନଃ ଚାଳନ ଆବଶ�ୟକ କରିଥା�।"
-
-#: ../mail/evolution-mail.schemas.in.h:164
-msgid "Thread the message list."
-msgstr "ସନ�ଦେଶ ତାଲିକାକ� ବାନ�ଧନ�ତ�।"
-
-#: ../mail/evolution-mail.schemas.in.h:165
-msgid "Thread the message-list"
-msgstr "ସନ�ଦେଶ ତାଲିକାକ� ବାନ�ଧନ�ତ�।"
+"�ବି ସଂରଚନା ଉଲ�ଲେଖ କରିଥା� କାଳେ ସୂତ�ରଟି ସନ�ଦେଶ ତାରିଖ ବଦଳରେ ନୂତନ ତମ ସନ�ଦେଶ ଉପରେ ଆଧାର କରି "
+"ସଜାହୋଇଥା�। Evolution ପ�ନଃ ଚାଳନ ଆବଶ�ୟକ କରିଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message-list based on Subject"
 msgstr "ସନ�ଦେଶ ତାଲିକାକ� ବିଷୟ ଅନ�ସାରେ ବାନ�ଧନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Timeout for marking message as seen"
 msgstr "ସନ�ଦେଶ ଦେଖାସରିଛି ପରି ଚିହ�ନଟ କରିବା ପାଇ� ସମୟ ସମାପ�ତ"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Timeout for marking message as seen."
 msgstr "ସନ�ଦେଶ ଦେଖାସରିଛି ପରି ଚିହ�ନଟ କରିବା ପାଇ� ସମୟ ସମାପ�ତ"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "UID string of the default account."
 msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ ଖାତାର UID ବାକ�ୟଖଣ�ଡ।"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ଭ�ଲ ବନାନ ଶବ�ଦଗ�ଡ଼ିକ� ରେଖାଙ�କନ କରନ�ତ� ଯେତେବେଳେ ଇନଲାଇନ ବନାନ ବ�ୟବହାର କରାଯା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Use SpamAssassin daemon and client"
 msgstr "SpamAssassin ଡେମନ �ବଂ କ�ଲା�ଣ�ଟ ବ�ୟବହାର କରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAssassin ଡେମନ �ବଂ କ�ଲା�ଣ�ଟ ବ�ୟବହାର କରନ�ତ� (spamc/spamd)।"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use custom fonts"
 msgstr "ଇଚ�ଛାରୂପଣ ଅକ�ଷରରୂପ ବ�ୟବହାର କରନ�ତ�"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use custom fonts for displaying mail."
 msgstr "ମେଲ ଦର�ଶାଇବା ପାଇ� ଇଚ�ଛାରୂପଣ ଅକ�ଷରରୂପ ବ�ୟବହାର କରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use only local spam tests."
 msgstr "କେବଳ ସ�ଥାନୀୟ ସ�ପାମ ପରୀକ�ଷଣ ବ�ୟବହାର କରନ�ତ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use only the local spam tests (no DNS)."
 msgstr "କେବଳ ସ�ଥାନୀୟ ସ�ପାମ ପରୀକ�ଷଣ ବ�ୟବହାର କରନ�ତ� (DNS ନାହି�)।"
 
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Use side-by-side or wide layout"
-msgstr "ପାଖକ� ପାଖ କିମ�ବା ପ�ରସସ�ତ ବିନ�ୟାସ ବ�ୟବହାର କରନ�ତ�"
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
+"ଗୋଟି� ସନ�ଦେଶକ� ଉତ�ତର ଦେବା ସମୟରେ ଚାଳକମାନେ ସମସ�ତଙ�କ� ଉପରକ� ଧରିଥା� ଯେଉ�ଠି ସୂଚକ ଯିବା ଉଚିତ। �ହା "
+"ନିର�ଦ�ଧାରଣ କରିଥା� ଯେ ସୂଚକଟି ସନ�ଦେଶ ଉପରେ କିମ�ବା ତଳେ ରଖାଯାଇଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:197
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
+"ଗୋଟି� ସନ�ଦେଶକ� ଉତ�ତର ଦେବା ସମୟରେ ଚାଳକମାନେ ସମସ�ତଙ�କ� ଉପରକ� ଧରିଥା� ଯେଉ�ଠି ହସ�ତାକ�ଷର ଯିବା ଉଚିତ। "
+"�ହା ନିର�ଦ�ଧାରଣ କରିଥା� ଯେ ହସ�ତାକ�ଷରଟି ସନ�ଦେଶ ଉପରେ କିମ�ବା ତଳେ ରଖାଯାଇଥା�।"
+
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Variable width font"
 msgstr "ପରିବର�ତ�ତନଶୀଳ ଓସାର ଅକ�ଷରରୂପ"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "ଗୋଟି� ପଠନ ଅନ�ରୋଧକ� ପ�ରତି ସନ�ଦେଶରେ ପୂର�ବନିର�ଦ�ଧାରିତ ଭାବରେ ଯୋଗ କରାଯିବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "ପାର�ଶ�ୱପଟିରେ ଫୋଲଡର ନାମର ଅଣ�ଡାକାର ବିଶେଷତାକ� ନିଷ�କ�ରିୟ କରିବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:201
 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 କିମ�ବା "
-"ସନ�ଦର�ଭ ଶୀର�ଷକ ସନ�ଦେଶ ଧାରଣ କରିନଥା�।"
+"ବିଶୟ ବସ�ତ� ମାଧ�ଯମରେ ସୂତ�ର ଫେରି ନଥା� ଯେତେବେଳେ In-Reply-To କିମ�ବା ସନ�ଦର�ଭ ଶୀର�ଷକ ସନ�ଦେଶ "
+"ଧାରଣ କରିନଥା�।"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "ସଂକ�ଷିପ�ତ ବାକ�ୟଖଣ�ଡଗ�ଡ଼ିକ ନୂତନତମ ସନ�ଦେଶ ଉପରେ ଆଧାରିତ ହେବା ଉଚିତ କି ନ�ହ�"
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Width of the message-list pane"
 msgstr "ସନ�ଦେଶ-ତାଲିକା ପଟ�ଟିକାର ଓସାର"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Width of the message-list pane."
 msgstr "ସନ�ଦେଶ-ତାଲିକା ପଟ�ଟିକାର ଓସାର"
 
-#: ../mail/importers/elm-importer.c:182
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Elm ତଥ�ୟ ଆମଦାନି କରନ�ତ�"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
+#: ../modules/mail/e-mail-shell-view.c:952
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
+msgid "Mail"
+msgstr "ଡାକ"
+
+#: ../mail/importers/elm-importer.c:365
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm ଆମଦାନୀକର�ତ�ତା"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:366
 msgid "Import mail from Elm."
 msgstr "Elm ର� ଆମଦାନୀ କରନ�ତ�।"
 
-#: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
-msgid "Destination folder:"
+#: ../mail/importers/evolution-mbox-importer.c:114
+#, fuzzy
+#| msgid "Destination folder:"
+msgid "_Destination folder:"
 msgstr "ଲକ�ଷ ଫୋଲଡର:"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
+msgid "Select folder"
+msgstr "ଫଲଡର ଚୟନ କରନ�ତ�"
+
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder to import into"
 msgstr "ଆମଦାନି କରିବା ପାଇ� ଫୋଲଡର ଆମଦାନି କରନ�ତ�"
 
-#: ../mail/importers/evolution-mbox-importer.c:219
+#: ../mail/importers/evolution-mbox-importer.c:262
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "ବାର�କଲେ ମେଲବାକ�ସ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:263
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "ବାର�କଲେ ମେଲବାକ�ସ ଶୈଳୀ ଫୋଲଡର ଆମଦାନିକର�ତ�ତା"
 
-#: ../mail/importers/mail-importer.c:147
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "ମେଲବାକ�ସ ଆମଦାନୀକର�ଅଛି"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:537
-#, c-format
-msgid "Importing `%s'"
+#: ../mail/importers/mail-importer.c:149
+#: ../plugins/pst-import/pst-importer.c:453
+#: ../plugins/pst-import/pst-importer.c:559
+#, fuzzy, c-format
+#| msgid "Importing `%s'"
+msgid "Importing '%s'"
 msgstr "`%s' ଆମଦାନୀକର�ଅଛି"
 
-#: ../mail/importers/mail-importer.c:371
+#: ../mail/importers/mail-importer.c:293
 #, c-format
 msgid "Scanning %s"
 msgstr "%s କ�ରମବୀକ�ଷଣ କର�ଅଛି"
 
-#: ../mail/importers/pine-importer.c:225
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "Pine ତଥ�ଯ ଆମଦାନୀ କର�ଅଛି"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
+msgid "Address Book"
+msgstr "ଠିକଣା ପ�ସ�ତିକା"
+
+#: ../mail/importers/pine-importer.c:418
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine ଆମଦାନିକର�ତ�ତା"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:419
 msgid "Import mail from Pine."
 msgstr "Pine ଠାର� ଆମଦାନୀ କରନ�ତ�।"
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "%s କ� ମେଲ"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "%s ଠାର� ମେଲ"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "ବିଷୟଟି ହେଉଛି %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s ମେଲିଙ�ଗ ତାଲିକା"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "ଫିଲଟର ନିୟମ ଯୋଗକରନ�ତ�"
 
-#: ../mail/mail-component.c:554
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
 #, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "%d ଚୟିତ, "
-msgstr[1] "%d ଚୟିତ,"
-
-#: ../mail/mail-component.c:558
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d ବିଲୋପ ହୋଇଛି"
-msgstr[1] "%d ବିଲୋପ ହୋଇଛି"
-
-#: ../mail/mail-component.c:565
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d junk"
-msgstr[1] "%d junk"
-
-#: ../mail/mail-component.c:568
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d ଡ�ରାଫ�ଟ"
-msgstr[1] "%d ଡ�ରାଫ�ଟଗ�ଡ଼ିକ"
-
-#: ../mail/mail-component.c:570
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d ପଠାହୋଇଛି"
-msgstr[1] "%d ପଠାହୋଇଛି"
-
-#: ../mail/mail-component.c:572
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d ପଠାହୋଇନାହି�"
-msgstr[1] "%d ପଠାହୋଇନାହି�"
-
-#: ../mail/mail-component.c:578
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d ଅପଠିତ, "
-msgstr[1] "%d ଅପଠିତ, "
-
-#: ../mail/mail-component.c:579
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d ସର�ବମୋଟ"
-msgstr[1] "%d ସର�ବମୋଟ"
-
-#: ../mail/mail-component.c:930
-msgid "New Mail Message"
-msgstr "ନୂତନ ମେଲ ସନ�ଦେଶ"
-
-#: ../mail/mail-component.c:931
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "ମେଲ ସନ�ଦେଶ (_M)"
-
-#: ../mail/mail-component.c:932
-msgid "Compose a new mail message"
-msgstr "ନୂତନ ମେଲ ସନ�ଦେଶ ଲେଖନ�ତ�"
-
-#: ../mail/mail-component.c:938
-msgid "New Mail Folder"
-msgstr "ନୂତନ ମେଲ ଫୋଲଡର"
-
-#: ../mail/mail-component.c:939
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "ମେଲ ଫୋଲଡର (_F)"
-
-#: ../mail/mail-component.c:940
-msgid "Create a new mail folder"
-msgstr "ନୂତନ ଡାକ ସୃଷ�ଟି କରନ�ତ�"
-
-#: ../mail/mail-component.c:1087
-msgid "Failed upgrading Mail settings or folders."
-msgstr "ମେଲ ବିନ�ୟାସ କିମ�ବା ଫୋଲଡରଗ�ଡ଼ିକ� ଉନ�ନତତର କରିବା ବିଫଳ ହୋଇଛି।"
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr "ସମର�ଥିତ ପ�ରକାରଗ�ଡ଼ିକ� ଯାଞ�ଚକର�ଅଛି (_e)"
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
+#: ../mail/mail-config.ui.h:2
+msgid "(Not Recommended)"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.ui.h:3
 msgid "(Note: Requires restart of the application)"
 msgstr "(ଟିପ�ପଣୀ: ପ�ରୟୋଗର ପ�ନର�ଚାଳନ ଆବଶ�ୟକ)"
 
-#: ../mail/mail-config.glade.h:4
-msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>SSL Evolutionର �ହି ନିର�ମାଣରେ ସମର�ଥିତ ନ�ହ�</b>"
-
-#: ../mail/mail-config.glade.h:5
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>ପ�ରେରକ ଫୋଟୋଗ�ରାଫ</b>"
-
-#: ../mail/mail-config.glade.h:6
-msgid "<b>Sig_natures</b>"
-msgstr "<b>ହସ�ତାକ�ଷର (_n)</b>"
-
-#: ../mail/mail-config.glade.h:7
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>ଉପର ପୋଷ�ଟିଙ�ଗ ବିକଳ�ପ</b> (ପରାମର�ଶିତ ନ�ହ�)"
-
-#: ../mail/mail-config.glade.h:8
-msgid "<b>_Languages</b>"
-msgstr "<b> ଭାଷା (_L)</b>"
-
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\"> ହିସାବ ଖାତା ସୂଚନା</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\"> ବୈଧିକରଣ</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">ସନ�ଦେଶଗ�ଡ଼ିକ� ଲେଖ�ଅଛି</span>"
-
-#: ../mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">ସଂରଚନା</span>"
-
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\"> ପୂର�ବ ନିର�ଦ�ଧାରିତ ଆଚରଣ</span>"
-
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">ମେଲକ� ବିଲୋପ କରନ�ତ�</span>"
-
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">ଦର�ଶାଯାଇଥିବା ସନ�ଦେଶ ଶୀର�ଷକ (_H)</span>"
-
-#: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">ନାମପଟି</span>"
-
-#: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">ପ�ରତିଛବି ଧାରଣ କର�ଅଛି</span>"
-
-#: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\"> ସନ�ଦେଶ ପ�ରଦର�ଶନ</span>"
-
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\"> ସନ�ଦେଶ ଅକ�ଷରରୂପ</span>"
-
-#: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">ସନ�ଦେଶ ରସିଦ</span>"
-
-#: ../mail/mail-config.glade.h:23
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">ଇଚ�ଛାଧୀନ ସୂଚନା</span>"
-
-#: ../mail/mail-config.glade.h:24
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">ବିକଳ�ପଗ�ଡିକ</span>"
-
-#: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "<span weight=\"bold\">ଅତି ଉତ�ତମ ଗୋପନୀୟତା (PGP/GPG)</span>"
-
-#: ../mail/mail-config.glade.h:26
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">ମ�ଦ�ରିତ ଅକ�ଷରରୂପ</span>"
-
-#: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">ପ�ରକ�ସି ବିନ�ୟାସ</span>"
-
-#: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">ଆବଶ�ଯକୀୟ ସୂଚନା</span>"
-
-#: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr "<span weight=\"bold\">ସ�ରକ�ଷିତ MIME (S/MIME)</span>"
-
-#: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">ସ�ରକ�ଷା</span>"
-
-#: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\"> ପଠାଯାଇଥିବା �ବଂ ଡ�ରାଫ�ଟ ସନ�ଦେଶଗ�ଡ଼ିକ</span>"
-
-#: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">ସର�ଭର ସଂରଚନା</span>"
-
-#: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">ପ�ରାଧିକରଣ ପ�ରକାର (_A)</span>"
-
-#: ../mail/mail-config.glade.h:35
-msgid "Account Management"
-msgstr "ହିସାବ ଖାତା ପରିଚାଳନା"
+#: ../mail/mail-config.ui.h:4
+#, fuzzy
+#| msgid "No Information"
+msgid "Account Information"
+msgstr "କୌଣସି ସୂଚନା ନାହି�"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "ନୂତନ ହସ�ତାକ�ଷର ଯୋଗକରନ�ତ� (_w)..."
 
-#: ../mail/mail-config.glade.h:37
-msgid "Add _Script"
-msgstr "ସ�କ�ରିପଟ ଯୋଗକରନ�ତ� (_S)"
-
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "�ହି ଖାତାକ� ବ�ୟବହାର କରିବା ସମୟରେ ସର�ବଦା ପଠାଯାଉଥିବା ସନ�ଦେଶଗ�ଡ଼ିକରେ ହସ�ତାକ�ଷର କରନ�ତ�"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "ସଂଗ�ପ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଠାଇବା ସମୟରେ ନିଜ ପ�ରତି ମଧ�ଯ ସଂଗ�ପ�ତ କରନ�ତ�"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ସର�ବଦା (cc) କରନ�ତ� (_s):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "ସର�ବଦା (bcc) କରନ�ତ� (_b):"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "ସର�ବଦା ମୋର କିରିଙ�ଗରେ ଥିବା କିଗ�ଡ଼ିକ� ସଂଗ�ପ�ତ ଭାବରେ ଥିବା ସମୟରେ ବିଶ�ୱାସ କରନ�ତ� (_t)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ସଂଗ�ପ�ତ ସନ�ଦେଶ ପଠାଇବା ସମୟରେ ସର�ବଦା ମୋତେ ସଂଗ�ପ�ତ କରନ�ତ� (_m)"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "ସର�ବଦା ପଢ଼ାଯାଇଥିବା ରସିଦ ପାଇ� ଅନ�ରୋଧ କରନ�ତ� (_d)"
 
-#: ../mail/mail-config.glade.h:45
-msgid ""
-"Attachment\n"
-"Inline\n"
-"Quoted"
-msgstr ""
-"ସଂଲଗ�ନକ\n"
-"ଇନଲାଇନ\n"
-"ଉଦ�ଧୃତ"
-
-#: ../mail/mail-config.glade.h:48
-msgid ""
-"Attachment\n"
-"Inline (Outlook style)\n"
-"Quoted\n"
-"Do not quote"
-msgstr ""
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
+msgid "Authentication"
+msgstr "ବୈଧିକରଣ"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "ସ�ବଯଂଚାଳିତଭାବରେ emoticon ପ�ରତିଛବିକ� ଭର�ତ�ତିକରନ�ତ� (_e)"
 
-#: ../mail/mail-config.glade.h:53
-msgid "Baltic (ISO-8859-13)"
-msgstr "ବାଲଟିକ (ISO-8859-13)"
-
-#: ../mail/mail-config.glade.h:54
-msgid "Baltic (ISO-8859-4)"
-msgstr "ବାଲଟିକ (ISO-8859-4)"
-
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "ବର�ଣ�ଣମାଳା (_h):"
 
-#: ../mail/mail-config.glade.h:56
-msgid "Ch_eck for Supported Types "
-msgstr "ସମର�ଥିତ ପ�ରକାରଗ�ଡିକ ପାଇ� ଯାଞ�ଚ କରନ�ତ� (_e)"
+#: ../mail/mail-config.ui.h:18
+msgid "Ch_eck for Supported Types"
+msgstr "ସମର�ଥିତ ପ�ରକାର ପାଇ� ଯାଞ�ଚ କରନ�ତ� (_e)"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
-msgstr "junk ପାଇ� ଇଚ�ଛାମ�ତାବକ ଶୀର�ଷକ ଯାଞ�ଚ କରନ�ତ� (_s)"
+msgstr "ଅଦରକାରୀ ପାଇ� ଇଚ�ଛାମ�ତାବକ ଶୀର�ଷକ ଯାଞ�ଚ କରନ�ତ� (_s)"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
-msgstr "junk ପାଇ� ଆସ�ଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ� ଯାଞ�ଚ କରନ�ତ� (_m)"
+msgstr "ଅଦରକାରୀ ପାଇ� ଆସ�ଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ� ଯାଞ�ଚ କରନ�ତ� (_m)"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "ମ�� ଟାଇପ କରିବା ସମୟରେ ବନାନ ଯାଞ�ଚକରନ�ତ� (_t)"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "ଆସ�ଥିବା ମେଲ ସନ�ଦେଶଗ�ଡ଼ିକ� Junk ପରି ଚିହ�ନଟ କରନ�ତ�"
 
-#: ../mail/mail-config.glade.h:61
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "ସଫାକରନ�ତ� (_a)"
 
-#: ../mail/mail-config.glade.h:62
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "ସଫାକରନ�ତ� (_r)"
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "ଭ�ଲ ଉଚ�ଚାରିତ ଶବ�ଦଗ�ଡ଼ିକ ପାଇ� ରଙ�ଗ (_m):"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.ui.h:26
+#, fuzzy
+#| msgid "Compose Message"
+msgid "Composing Messages"
+msgstr "ସନ�ଦେଶ ଲେଖନ�ତ�"
+
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "ବିନ�ୟାସ"
+
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "ଗୋଟି� ଫୋଲଡରକ� କାଟିବା ସମୟରେ ନିଶ�ଚିତ କରନ�ତ� (_w)"
 
-#: ../mail/mail-config.glade.h:65
-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 ""
-"ଅଭିନନ�ଦନ, ଆପମଙ�କର ମେଲ ସଂରଚନାଟି ସମ�ପୂର�ଣ�ଣ ହୋଇଛି।\n"
-"\n"
-"ଆପଣ ବର�ତ�ତମାନ Evolution ବ�ୟବହାର କରି ଇମେଲ ପଠାଇବା �ବଂ ଗ�ରହଣ\n"
-"କରିବାକ� ପ�ରସ�ତ�ତ ଅଛନ�ତି। \n"
-"\n"
-"ଆପଣଙ�କର ସଂରଚନାକ� ସଂରକ�ଷଣ କରିବା ପାଇ�\"ପ�ରୟୋଗ କରନ�ତ�\" କ� କ�ଲିକ କରନ�ତ�।"
-
-#: ../mail/mail-config.glade.h:71
-msgid "De_fault"
-msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ (_f)"
+#: ../mail/mail-config.ui.h:30
+#, fuzzy
+#| msgid "Default Priority:"
+msgid "Default Behavior"
+msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ ପ�ରାଥମିକତା:"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ଅକ�ଷର ସାଙ�କେତିକରଣ (_n):"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.ui.h:33
+#, fuzzy
+#| msgid "Delete"
+msgid "Delete Mail"
+msgstr "ଅପସାରଣ କରନ�ତ�"
+
+#: ../mail/mail-config.ui.h:34
 msgid "Delete junk messages on e_xit"
-msgstr "ପ�ରସ�ଥାନ କରିବା ସମୟରେ junk ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ କରନ�ତ� (_x)"
+msgstr "ପ�ରସ�ଥାନ କରିବା ସମୟରେ ଅଦରକାରୀ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ କରନ�ତ� (_x)"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.ui.h:36
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ବାହାର�ଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ� ଦ�ୱିମିକ ଭାବରେ ହସ�ତାକ�ଷର କରନ�ତ� (_u) (ପୂର�ବନିର�ଦ�ଧାରିତ ଭାବରେ)"
 
-#: ../mail/mail-config.glade.h:77
-msgid "Do not format messages when text si_ze exceeds"
+#: ../mail/mail-config.ui.h:37
+#, fuzzy
+#| msgid "All Message _Headers"
+msgid "Displayed Message Headers"
+msgstr "ସମସ�ତ ସନ�ଦେଶ ଶୀର�ଷକଗ�ଡିକ (_H)"
+
+#: ../mail/mail-config.ui.h:38
+#, fuzzy
+#| msgid "Do not format messages when text si_ze exceeds"
+msgid "Do not display messages when text si_ze exceeds"
 msgstr "ପାଠ�ୟ ଆକାର ଅତିକ�ରମ କରିସାରିବା ପରେ ସନ�ଦେଶଗ�ଡ଼ିକ� ସଜାଡ଼ନ�ତ� (_z)"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "ସନ�ଦେଶଗ�ଡ଼ିକ� ଜଟିଳ ଆକାରରେ ଚିହ�ନଟ କରନ�ତ� ନାହି� ଯଦି ପ�ରେରକ ମୋର ଠିକଣା ପ�ସ�ତକରେ ଅଛି (_k)"
 
-#: ../mail/mail-config.glade.h:79
-msgid "Done"
-msgstr "ସମ�ପନ�ନ"
+#: ../mail/mail-config.ui.h:40
+#, fuzzy
+#| msgid "Do not delete"
+msgid "Do not quote"
+msgstr "ଅପସାରଣ କରନ�ତ� ନାହି�"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "ଡ�ରାଫ�ଟ ଫୋଲଡର (_F):"
 
-#: ../mail/mail-config.glade.h:81
-msgid "Email Accounts"
-msgstr "ଇମେଲ ଆକାଉଣ�ଟଗ�ଡିକ"
-
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "ଇମେଲ ଠିକଣା (_A):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "ପ�ରସ�ଥାନ କରିବା ସମୟରେ ଆବର�ଜନା ପାତ�ର ଫୋଲଡରକ� ଖାଲିକରନ�ତ� (_x)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Magic S_pacebar"
 msgstr "ମେଜିକ ସ�ପେସବାରକ� ସକ�ରିୟ କରନ�ତ� (_p)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Sea_rch Folders"
 msgstr "ସନ�ଧାନ ଫୋଲଡରଗ�ଡ଼ିକ� ସକ�ରିୟ କରନ�ତ� (_r)"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "ସଂଗ�ପ�ତ ପ�ରମାଣପତ�ର (_p):"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "ପଠାଯାଉଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ� ସଂଗ�ପ�ତ କରନ�ତ� (ପୂର�ବନିର�ଦ�ଧାରିତ) (_g)"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.ui.h:49
 msgid "Fi_xed-width:"
 msgstr "ସ�ଥିର ଓସାର (_x):"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.ui.h:50
 msgid "Fix_ed width Font:"
 msgstr "ସ�ଥିର ଓସାର ଅକ�ଷରରୂପ (_e):"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.ui.h:51
 msgid "Font Properties"
 msgstr "ଅକ�ଷରରୂପ ବିଶେଷତାଗ�ଡିକ"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.ui.h:52
 msgid "Format messages in _HTML"
 msgstr "HTMLରେ ସନ�ଦେଶଗ�ଡ଼ିକ� ସଜ�ଜିକରଣ କରନ�ତ� (_H)"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "ପ�ରା ନାମ (_e):"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.ui.h:55
 msgid "HTML Messages"
 msgstr "HTML ସନ�ଦେଶ"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:56
 msgid "H_TTP Proxy:"
 msgstr "HTTP ପ�ରକ�ସି (_T):"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.ui.h:57
 msgid "Headers"
 msgstr "ଶୀର�ଷକଗ�ଡିକ"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.ui.h:58
 msgid "Highlight _quotations with"
 msgstr "ସହିତ ଉଦ�ଧୃତକ� ଆଲୋକିତ କରନ�ତ� (_q)"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.ui.h:60
+#, fuzzy
+#| msgid "_Inline"
+msgid "Inline"
+msgstr "ଇନଲାଇନ (_I)"
+
+#: ../mail/mail-config.ui.h:61
+msgid "Inline (Outlook style)"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:63
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:103 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ନାମପଟିଗ�ଡ଼ିକ"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "ଭାଷା ସାରଣୀ"
 
-#: ../mail/mail-config.glade.h:105
-msgid "Mail Configuration"
-msgstr "ମେଲ ସଂରଚନା"
+#: ../mail/mail-config.ui.h:66
+#, fuzzy
+#| msgid "_Load Images"
+msgid "Loading Images"
+msgstr "ପ�ରତିଛବି ଧାରଣ କରନ�ତ� (_L)"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "ମେଲ ଶୀର�ଷକଗ�ଡିକର ସାରଣୀ"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "ମେଲବାକ�ସ ଅବସ�ଥାନ"
 
-#: ../mail/mail-config.glade.h:109
-msgid "Message Composer"
-msgstr "ସନ�ଦେଶ ଲେଖକ"
+#: ../mail/mail-config.ui.h:69
+#, fuzzy
+#| msgid "Messages"
+msgid "Message Display"
+msgstr "ସନ�ଦେଶଗ�ଡ଼ିକ"
+
+#: ../mail/mail-config.ui.h:70
+#, fuzzy
+#| msgid "Message contains"
+msgid "Message Fonts"
+msgstr "ସନ�ଦେଶ ଧାରଣ କରିଥା�"
+
+#: ../mail/mail-config.ui.h:71
+#, fuzzy
+#| msgid "Message Retract"
+msgid "Message Receipts"
+msgstr "ସନ�ଦେଶ ଫେରାଇବା"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.ui.h:72
 msgid "No _Proxy for:"
 msgstr "ପାଇ� ପ�ରକ�ସି ନାହି� (_P):"
 
-#: ../mail/mail-config.glade.h:111
-msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr "ଟିପ�ପଣୀ: ନାମପଟିରେ ଅବରେଖନକ� ସ�ମରକ ଚିହ�ନାଇବାରେ ତାଲିକାରେ ବ�ୟବହାର କରାଯାଇଥା�।"
-
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.ui.h:74
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "ଟିପ�ପଣୀ: ପ�ରଥମ ଥର ପାଇ� ସଂଯୋଗ ନହେଲା ପର�ଯ�ୟନ�ତ ଆପଣଙ�କ� ପ�ରବେଶ ସଂକେତ ପଚରାଯିବା ନାହି�"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.ui.h:75
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "ବିକଳ�ପକ� ଅଗ�ରାହ�ୟ କରାଯାଇଛି ଯଦି ଗୋଟି� ଇଚ�ଛାମ�ତାବକ ଜଙ�କ ଶୀର�ଷକ ମିଳିନଥା�।"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.ui.h:76
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+#, fuzzy
+#| msgid "Personal Information"
+msgid "Optional Information"
+msgstr "ବ�ଯକ�ତିଗତ ସୂଚନା"
+
+#: ../mail/mail-config.ui.h:78
 msgid "Or_ganization:"
 msgstr "ଅନ�ଷ�ଠାନ (_g):"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.ui.h:79
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG କି ID (_K):"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.ui.h:80
 msgid "Pass_word:"
 msgstr "ପ�ରବେଶ ସଙ�କେତ (_w):"
 
-#: ../mail/mail-config.glade.h:118
-msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"�ହି ଖାତା ପାଇ� ନିମ�ନରେ ଦୟାକରି ଗୋଟି� ବର�ଣ�ଣନାତ�ମକ ନାମ ଭରଣ କରନ�ତ�।\n"
-"�ହି ନାମକ� କେବଳ ପ�ରଦର�ଶନ ଉଦ�ଦେଶ�ୟରେ ବ�ୟବାହର କରାଯାଇଥା�।"
-
-#: ../mail/mail-config.glade.h:120
-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:121
-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:122
-msgid "Please select among the following options"
-msgstr "ଦୟାକରି ନିମ�ନଲିଖିତ ବିକଳ�ପ ମାନଙ�କ ମଧ�ଯର� ମନୋନୀତ କରନ�ତ�"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.ui.h:82
 msgid "Port:"
 msgstr "ସଂଯୋଗିକୀ:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:83
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "କେବଳ Bcc ଗ�ରହଣକର�ତ�ତା ସହିତ ସନ�ଦେଶ ପଠାଇବା ସମୟରେ ପଚାରନ�ତ� (_o)"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.ui.h:84
+#, fuzzy
+#| msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "<span weight=\"bold\">ଅତି ଉତ�ତମ ଗୋପନୀୟତା (PGP/GPG)</span>"
+
+#: ../mail/mail-config.ui.h:86
+#, fuzzy
+#| msgid "Print Memos"
+msgid "Printed Fonts"
+msgstr "Memos ମ�ଦ�ରଣ କରନ�ତ�"
+
+#: ../mail/mail-config.ui.h:87
+#, fuzzy
+#| msgid "Junk Settings"
+msgid "Proxy Settings"
+msgstr "Junk ସେଟିଙ�ଗଗ�ଡିକ"
+
+#: ../mail/mail-config.ui.h:88
+#, fuzzy
+#| msgid "_Quoted"
+msgid "Quoted"
+msgstr "ଉଦ�ଧୃତ (_Q)"
+
+#: ../mail/mail-config.ui.h:89
 msgid "Re_member password"
 msgstr "ପ�ରବେଶ ସଂକେତକ� ମନେରଖନ�ତ� (_m)"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:90
 msgid "Re_ply-To:"
 msgstr "କ� ଉତ�ତର ଦିଅନ�ତ� (_p):"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.ui.h:92
 msgid "Remember _password"
 msgstr "ପ�ରବେଶ ସଂକେତ ମନେରଖନ�ତ� (_p)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.ui.h:93
+#, fuzzy
+#| msgid "Server Information"
+msgid "Required Information"
+msgstr "ସେବକ ସୂଚନା"
+
+#: ../mail/mail-config.ui.h:95
+#, fuzzy
+#| msgid "<b>SSL is not supported in this build of Evolution</b>"
+msgid "SSL is not supported in this build of Evolution"
+msgstr "<b>SSL Evolutionର �ହି ନିର�ମାଣରେ ସମର�ଥିତ ନ�ହ�</b>"
+
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "କେବଳ ପ�ରେରକର ଫୋଟଗ�ରାଫକ� ସ�ଥାନୀୟ ଠିକଣା ବହିରେ ସନ�ଧାନ କରନ�ତ� (_e)"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "ବାଛନ�ତ� (_e)..."
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "ସନ�ଦେଶ ରସିଦ ପଠାନ�ତ� (_e):"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "ମାନକ ଅକ�ଷରରୂପ (_t):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.ui.h:100
+msgid "Secure MIME (S/MIME)"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:102
+#, fuzzy
+#| msgid "Select Folder"
+msgid "Select Drafts Folder"
+msgstr "ଫୋଲଡର ବାଛନ�ତ�"
+
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "HTML ସ�ଥିର ଓସାର ମନୋନୀତ କରନ�ତ�"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "ମ�ଦ�ରଣ ପାଇ� HTML ସ�ଥିର ଓସାର ମନୋନୀତ କରନ�ତ�"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font"
 msgstr "HTML ଚଳ ଓସାର ଅକ�ଷରରୂପ ମନୋନୀତ କରନ�ତ�"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.ui.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "ମ�ଦ�ରଣ ପାଇ� HTML ଚଳ ଓସାର ଅକ�ଷରରୂପ ମନୋନୀତ କରନ�ତ�"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.ui.h:107
+#, fuzzy
+#| msgid "Select Folder"
+msgid "Select Sent Folder"
+msgstr "ଫୋଲଡର ବାଛନ�ତ�"
+
+#: ../mail/mail-config.ui.h:108
+#, fuzzy
+#| msgid "<b>Sender Photograph</b>"
+msgid "Sender Photograph"
+msgstr "<b>ପ�ରେରକ ଫୋଟୋଗ�ରାଫ</b>"
+
+#: ../mail/mail-config.ui.h:109
 msgid "Sending Mail"
 msgstr "ମେଲ ପଠାଉଛି"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "ସନ�ଦେଶ ଫୋଲଡର ପଠାଯାଇଛି (_M):"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.ui.h:111
+#, fuzzy
+#| msgid "Sent Messages"
+msgid "Sent and Draft Messages"
+msgstr "ପଠାଇଥିବା ସଂଦେଶଗ�ଡିକ "
+
+#: ../mail/mail-config.ui.h:112
 msgid "Ser_ver requires authentication"
 msgstr "ସର�ଭର ବୈଧିକରଣ ଆବଶ�ୟକ କରେ (_v)"
 
-#: ../mail/mail-config.glade.h:142
-msgid "Server _Type: "
+#: ../mail/mail-config.ui.h:113
+#, fuzzy
+#| msgid "Server Information"
+msgid "Server Configuration"
+msgstr "ସେବକ ସୂଚନା"
+
+#: ../mail/mail-config.ui.h:114
+#, fuzzy
+#| msgid "Server _Type: "
+msgid "Server _Type:"
 msgstr "ସର�ଭର ପ�ରକାର (_T):"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.ui.h:115
+#, fuzzy
+#| msgid "Signatures"
+msgid "Sig_natures"
+msgstr "ହସ�ତାକ�ଷରଗ�ଡ଼ିକ"
+
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "ହସ�ତାକ�ଷର ପ�ରମାଣପତ�ର (_n):"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "ହସ�ତାକ�ଷର (_u):"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "ହସ�ତାକ�ଷରଗ�ଡ଼ିକ"
 
-#: ../mail/mail-config.glade.h:146
-msgid "Signatures Table"
-msgstr "ହସ�ତାକ�ଷର ସାରଣୀ"
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "ବନାନ ଯାଞ�ଚ କରାଯାଉଛି"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "ଉତ�ତର ଦେବା ସମୟରେ ତଳେ ଟାଇପ କରନ�ତ� (_t)"
 
-#: ../mail/mail-config.glade.h:149
-msgid "T_ype: "
+#: ../mail/mail-config.ui.h:122
+#, fuzzy
+#| msgid "T_ype: "
+msgid "T_ype:"
 msgstr "ପ�ରକାର (_y): "
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"ଯେଉ� ଭାଷା ପାଇ� ଆପଣ ଅଭିଧାନ ସ�ଥାପନ କରିଛନ�ତି କେବଳ ସେହି ଭାଷାଗ�ଡ଼ିକର ତାଲିକା "
-"�ଠାରେ ପ�ରତିଫଳିତ ହୋଇଥା�।"
+"ଯେଉ� ଭାଷା ପାଇ� ଆପଣ ଅଭିଧାନ ସ�ଥାପନ କରିଛନ�ତି କେବଳ ସେହି ଭାଷାଗ�ଡ଼ିକର ତାଲିକା �ଠାରେ ପ�ରତିଫଳିତ "
+"ହୋଇଥା�।"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13356,7 +12955,14 @@ msgstr ""
 "ବ�ୟବହୃତ ହୋଇଥା�। ଆପଣ ଉଲ�ଲେଖ କରିଥିବା ନାମଗ�ଡ଼ିକ�\n"
 "କେବଳ ପ�ରଦର�ଶନ ଉଦ�ଦେଶ�ୟରେ ବ�ୟବହାର କରାଯିବ।"
 
-#: ../mail/mail-config.glade.h:154
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:128
+#, fuzzy
+#| msgid "Posting destination"
+msgid "Top Posting Option"
+msgstr "ଲକ�ଷ�ୟସ�ଥଳ ଦାଖଲ କରନ�ତ�"
+
+#: ../mail/mail-config.ui.h:129
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13364,213 +12970,268 @@ msgstr ""
 "�ହି ଖାତାକ� ଅନ�ସରଣ କରିବା ପାଇ� ନାମ ଲେଖନ�ତ�।\n"
 "ଉଦାହରଣ ସ�ୱରୂପ: \"Work\" ଅଥବା \"Personal\""
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.ui.h:131
 msgid "Us_ername:"
 msgstr "ଚାଳକ ନାମ (_e):"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.ui.h:132
 msgid "Use Authe_ntication"
 msgstr "ବୈଧିକରଣ ବ�ୟବହାର କରନ�ତ� (_n)"
 
-#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-source.c:613
-#: ../plugins/google-account-setup/google-contacts-source.c:280
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:308
+#: ../mail/mail-config.ui.h:133 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "ଚାଳକ ନାମ (_n):"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.ui.h:134
 msgid "V_ariable-width:"
 msgstr "ଚଳ-ଓସାର (_a):"
 
-#: ../mail/mail-config.glade.h:160
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin. "
-msgstr ""
-"Evolution ମେଲ ସଂରଚନା ସହାୟକରେ ଆପଣଙ�କ� ସ�ୱାଗତ କର�ଅଛ�।\n"
-"\n"
-"ଆରମ�ଭ କରିବା ପାଇ� \"ଅଗ�ରସର ହ�ଅନ�ତ�\" କ� କ�ଲିକ କରନ�ତ�। "
-
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.ui.h:135
 msgid "_Add Signature"
 msgstr "ହସ�ତାକ�ଷର ଯୋଗକରନ�ତ� (_A)"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:136
 msgid "_Always load images from the Internet"
 msgstr "ସର�ବଦା ଇଣ�ଟରନେଟର� ପ�ରତିଛବିଗ�ଡ଼ିକ� ଧାରଣ କରନ�ତ� (_A)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:137
+msgid "_Authentication Type"
+msgstr "ବୈଧିକରଣ ପ�ରକାର (_A)"
+
+#: ../mail/mail-config.ui.h:138
 msgid "_Default junk plugin:"
-msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ junk ପ�ଲଗଇନ (_D):"
+msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ଅଦରକାରୀ ପ�ଲଗଇନ (_D):"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.ui.h:139
 msgid "_Direct connection to the Internet"
 msgstr "ଇଣ�ଟରନେଟ ସହିତ ସିଧାସଳଖ ସଂଯୋଗ (_D)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.ui.h:140
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ସାକ�ଷାତକାର ଅନ�ରୋଧଗ�ଡ଼ିକରେ ହସ�ତାକ�ଷର କରନ�ତ� ନାହି� (Outlook ସ�ସଂଗତି ପାଇ�) (_D)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:141
 msgid "_Forward style:"
 msgstr "ଅଗ�ରସର ଶୈଳୀ (_F):"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.ui.h:142
 msgid "_Keep Signature above the original message on replying"
 msgstr "ଉତ�ତର ଦେବା ସମୟରେ ପ�ରକୃତ ସନ�ଦେଶ ଉପରେ ହସ�ତାକ�ଷର ରଖନ�ତ� (_K)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.ui.h:143
+#, fuzzy
+#| msgid "Language"
+msgid "_Languages"
+msgstr "ଭାଷା"
+
+#: ../mail/mail-config.ui.h:144
 msgid "_Load images in messages from contacts"
 msgstr "ସମ�ପର�କ ମାନଙ�କ ପାଖର� ଆସ�ଥିବା ସନ�ଦେଶରେ ପ�ରତିଛବି ଧାରଣ କରନ�ତ� (_L)"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.ui.h:145
 msgid "_Lookup in local address book only"
 msgstr "ସ�ଥାନୀୟ ଠିକଣା ପ�ସ�ତିକା ଫୋଲଡର ମାନଙ�କ� ସୂଚୀବଦ�ଧ କରନ�ତ� (_L)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.ui.h:146
 msgid "_Make this my default account"
 msgstr "�ହାକ� ମୋର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଖାତା କରନ�ତ� (_M)"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.ui.h:147
 msgid "_Manual proxy configuration:"
 msgstr "ହସ�ତକୃତ ପ�ରକ�ସି ବିନ�ୟାସ (_M):"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.ui.h:148
 msgid "_Mark messages as read after"
 msgstr "ସନ�ଦେଶଗ�ଡ଼ିକ� ପରେ ପଢ଼ିନ�ତ� ପରି କରନ�ତ� (_M)"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.ui.h:150
 msgid "_Never load images from the Internet"
 msgstr "ଇଣ�ଟରନେଟର� କଦାପି ପ�ରତିଛବି ଧାରଣ କରନ�ତ� ନାହି� (_N)"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.ui.h:151
 msgid "_Path:"
 msgstr "ପଥ (_P):"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.ui.h:152
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ମେଲକ� ଯୋଗାଯୋଗଗ�ଡ଼ିକରେ ପଠାଇବା ସମୟରେ ପଚାରନ�ତ� ଯେଉ�ମାନେ ଚାହାନ�ତି ନାହି� (_P)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.ui.h:153
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ଖାଲି ବିଷୟନାମ ସହିତ ମେଲକ� ପଠାଇବା ସମୟରେ ପଚାରନ�ତ� (_P)"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.ui.h:154
 msgid "_Reply style:"
 msgstr "ଉତ�ତର ଦେବା ଶୈଳୀ (_R):"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.ui.h:155
 msgid "_Script:"
 msgstr "ସ�କ�ରିପଟ (_S):"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.ui.h:156
 msgid "_Secure HTTP Proxy:"
 msgstr "ସ�ରକ�ଷିତ HTTP ପ�ରକ�ସି (_S):"
 
-#: ../mail/mail-config.glade.h:184
-msgid "_Select..."
-msgstr "ଚୟନ କରନ�ତ� (_S)..."
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Server:"
+msgstr "ସେବକ (_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.ui.h:160
 msgid "_Show image animations"
 msgstr "ପ�ରତିଛବି ଜାବନାୟନ ଦର�ଶାନ�ତ� (_S)"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.ui.h:161
 msgid "_Show the photograph of sender in the message preview"
 msgstr "ପ�ରେରକଙ�କର ଫୋଟୋଗ�ରାଫ ସନ�ଦେଶ ପ�ରାକଦର�ଶନରେ ଦର�ଶାନ�ତ� (_S)"
 
-#: ../mail/mail-config.glade.h:189
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:163
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "To / Cc / Bcc ଶୀର�ଷକଗ�ଡ଼ିକ� ସଙ�କ�ଚିତକରନ�ତ� (_S)"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.ui.h:164
 msgid "_Use Secure Connection:"
 msgstr "ସ�ରକ�ଷିତ ବ�ଯବହାର କରନ�ତ� (_U):"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.ui.h:165
 msgid "_Use system defaults"
 msgstr "ତନ�ତ�ର ପୂର�ବନିର�ଦ�ଧାରିତ ବ�ଯବହାର କରନ�ତ� (_U)"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.ui.h:166
 msgid "_Use the same fonts as other applications"
 msgstr "ଅନ�ୟ ପ�ରୟୋଗଗ�ଡ଼ିକ ପରି ସମାନ ଅକ�ଷରରୂପ ବ�ୟବହାର କରନ�ତ� (_U)"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:47
+#, fuzzy
+#| msgid "am"
+msgid "a"
+msgstr "ପୂର�ବାହ�ନ"
+
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:169
 msgid "addresses"
 msgstr "ଠିକଣାଗ�ଡ଼ିକ"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.ui.h:170 ../smime/gui/smime-ui.ui.h:48
+msgid "b"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:171
 msgid "color"
 msgstr "ରଙ�ଗ"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.ui.h:172
 msgid "description"
 msgstr "ବର�ଣ�ଣନା"
 
-#: ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "ସେକେଣ�ଡ"
-
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>ସନ�ଧାନ ଫୋଲଡର ଉତ�ସଗ�ଡ଼ିକ</b>"
-
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">ଡିଜିଟାଲ ହସ�ତାକ�ଷର</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">ସଂଗ�ପ�ତ</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.ui.h:1
 msgid "All active remote folders"
 msgstr "ସମସ�ତ ସକ�ରିୟ ସୂଦୂର ଫୋଲଡରଗ�ଡ଼ିକ"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "ସମସ�ତ ସ�ଥାନୀୟ �ବଂ ସକ�ରିୟ ସୂଦୂର ଫୋଲଡରଗ�ଡ଼ିକ"
 
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "ସମସ�ତ ସ�ଥାନୀୟ ଫୋଲଡରଗ�ଡ଼ିକ"
 
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.ui.h:4
+msgid "Call"
+msgstr "ଡାକରା"
+
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "ସମ�ପୂର�ଣ�ଣ ହୋଇଛି (_m)"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:275
-msgid "Flag to Follow Up"
-msgstr "ଅନ�ସରଣ କରିବା ପାଇ� ବିଶେଷ ସୂଚକ"
+#: ../mail/mail-dialogs.ui.h:6
+#, fuzzy
+#| msgid "collapse"
+msgid "Collapse _all"
+msgstr "ସଙ�କୋଚନ କରନ�ତ�"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.ui.h:7
+#, fuzzy
+#| msgid "Edit Signature"
+msgid "Digital Signature"
+msgstr "ହସ�ତାକ�ଷରକ� ସମ�ପାଦନ କରନ�ତ�"
+
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "ଆଗକ� ବଢ଼ନ�ତ� ନାହି�"
+
+#: ../mail/mail-dialogs.ui.h:9
+#, fuzzy
+#| msgid "E_xpand All Threads"
+msgid "E_xpand all"
+msgstr "ସମସ�ତ ସୂତ�ରକ� କାଟନ�ତ� (_x)"
+
+#: ../mail/mail-dialogs.ui.h:10
+#, fuzzy
+#| msgid "Encrypt"
+msgid "Encryption"
+msgstr "ସଂଗ�ପ�ତ"
+
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "ଫୋଲଡର ସ�ବୀକାରକରଣଗ�ଡିକ"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.ui.h:12
+msgid "Follow-Up"
+msgstr "ଅନ�ସରଣ କରନ�ତ�"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "For Your Information"
+msgstr "ଆପଣଙ�କ ସୂଚନା ପାଇ�"
+
+#: ../mail/mail-dialogs.ui.h:14
+msgid "Forward"
+msgstr "ଆଗକ�"
+
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "ଲାଇସେନ�ସ ରାଜିନାମା"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.ui.h:16
+msgid "No Response Necessary"
+msgstr "କୌଣସି ଉତ�ତର ଆବଶ�ୟ ନାହି�"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Reply to All"
+msgstr "ସମସ�ତଙ�କ� ଉତ�ତର ଦିଅନ�ତ�"
+
+#: ../mail/mail-dialogs.ui.h:21
+msgid "Review"
+msgstr "ସମାଲୋଚନା"
+
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "ସର�ଭର (_e):"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr ""
+
+#: ../mail/mail-dialogs.ui.h:24
+#, fuzzy
+#| msgid "Search Folder source"
+msgid "Search Folder Sources"
+msgstr "ଫୋଲଡର ଉତ�ସକ� ଖୋଜନ�ତ�"
+
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "ସ�ରକ�ଷା ସୂଚନା"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "ନିର�ଦ�ଦିଷ�ଟ ପୋଲଡରଗ�ଡ଼ିକ"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13578,167 +13239,184 @@ msgstr ""
 "ଅନ�ସରଣ ପାଇ� ଆପଣ ବାଛିଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ� ନିମ�ନରେ ତାଲିକାଭ�କ�ତ କରାଯାଇଛି।\n"
 "ଦୟାକରି \"Flag\" ତାଲିକାର� ଗୋଟି� ଅନ�ସରଣ କାର�ଯ�ୟ ବାଛନ�ତ�।"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "ଅନ�ମତି ପତ�ର ଗ�ରହଣକରନ�ତ� (_A)"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "ଅନ�ତିମ ଦିବସ (_D):"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "ସୂଚକ ଚିହ�ନ (_F):"
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "ଅନ�ମତିପତ�ରକ� ଗ�ରହଣ କରିବା ପାଇ� �ହାକ� ଚିହ�ନଟ କରନ�ତ� (_T)"
 
-#: ../mail/mail-folder-cache.c:835
+#: ../mail/mail-folder-cache.c:896
 #, c-format
 msgid "Pinging %s"
 msgstr "ପିଙ�ଗ କର�ଅଛି %s"
 
-#: ../mail/mail-ops.c:107
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "ଚୟିତ ବସ�ତ� ମାନଙ�କ� ଛାଣ�ଅଛି"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "ମେଲ ଆନୟନ"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:562
+#: ../mail/mail-ops.c:576
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ଯାଉଥିବା ଛାଣକକ� ପ�ରୟୋଗ କରିବାରେ ବିଫଳ ହୋଇଛି: %s"
 
-#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:603
-#, c-format
+#: ../mail/mail-ops.c:588 ../mail/mail-ops.c:616
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to append to %s: %s\n"
+#| "Appending to local `Sent' folder instead."
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "%sରେ ଯୋଡ଼ିବା ବିଫଲ ହୋଇଛି: %s\n"
 "�ହା ପରିବର�ତ�ତେ ସ�ଥାନୀୟ `ଫଠାଯାଇଥିବା' ଫୋଲଡରକ� ଯୋଡ଼�ଅଛି।"
 
-#: ../mail/mail-ops.c:620
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+#: ../mail/mail-ops.c:633
+#, fuzzy, c-format
+#| msgid "Failed to append to local `Sent' folder: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ସ�ଥାନୀୟ 'ପଠାଯାଇଥିବା' ଫୋଲଡର ସହିତ ଯୋଡିବାରେ ବିଫଳ ହୋଇଛି: %s "
 
-#: ../mail/mail-ops.c:726 ../mail/mail-ops.c:807
+#: ../mail/mail-ops.c:744 ../mail/mail-ops.c:825
 msgid "Sending message"
 msgstr "ସନ�ଦେଶ ପଠାଉଅଛି"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:754
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%dର ସନ�ଦେଶ %d କ� ପଠାଯାଉଛି"
 
-#: ../mail/mail-ops.c:763
+#: ../mail/mail-ops.c:781
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%dର ସନ�ଦେଶ %d କ� ପଠାଇବାରେ ବିଫଳ"
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:783 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "ବାତିଲ ହୋଇଛି।"
 
-#: ../mail/mail-ops.c:767 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:785 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "ସମ�ପୂର�ଣ�ଣ।"
 
-#: ../mail/mail-ops.c:879
-msgid "Saving message to folder"
+#: ../mail/mail-ops.c:897
+#, fuzzy, c-format
+#| msgid "Saving message to folder"
+msgid "Saving message to folder '%s'"
 msgstr "ସନ�ଦେଶକ� ଫୋଲଡରରେ ସଂରକ�ଷଣ କର�ଅଛି"
 
-#: ../mail/mail-ops.c:956
-#, c-format
-msgid "Moving messages to %s"
+#: ../mail/mail-ops.c:974
+#, fuzzy, c-format
+#| msgid "Moving messages to %s"
+msgid "Moving messages to '%s'"
 msgstr "ସନ�ଦେଶକ� %sରେ ଗତିକରାଉଛି"
 
-#: ../mail/mail-ops.c:956
-#, c-format
-msgid "Copying messages to %s"
+#: ../mail/mail-ops.c:974
+#, fuzzy, c-format
+#| msgid "Copying messages to %s"
+msgid "Copying messages to '%s'"
 msgstr "ସନ�ଦେଶକ� %sରେ ନକଲ କର�ଅଛି"
 
-#: ../mail/mail-ops.c:1173
+#: ../mail/mail-ops.c:1083
+#, fuzzy, c-format
+#| msgid "Scanning folders in \"%s\""
+msgid "Scanning folders in '%s'"
+msgstr "\"%s\"ରେ ଫୋଲଡର କ�ରମବୀକ�ଷଣ କର�ଅଛି"
+
+#: ../mail/mail-ops.c:1191
 msgid "Forwarded messages"
 msgstr "ଅଗ�ରସର କରାଯାଇଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ"
 
-#: ../mail/mail-ops.c:1214
-#, c-format
-msgid "Opening folder %s"
+#: ../mail/mail-ops.c:1232
+#, fuzzy, c-format
+#| msgid "Opening folder %s"
+msgid "Opening folder '%s'"
 msgstr "ଫୋଲଡର %s କ� ଖୋଲ�ଅଛି"
 
-#: ../mail/mail-ops.c:1279
-#, c-format
-msgid "Retrieving quota information for folder %s"
+#: ../mail/mail-ops.c:1298
+#, fuzzy, c-format
+#| msgid "Retrieving quota information for folder %s"
+msgid "Retrieving quota information for folder '%s'"
 msgstr "ଫୋଲଡର %s ପାଇ� କୋଟା ସୂଚନା କାଢ଼�ଅଛି"
 
-#: ../mail/mail-ops.c:1348
-#, c-format
-msgid "Opening store %s"
+#: ../mail/mail-ops.c:1370
+#, fuzzy, c-format
+#| msgid "Opening store %s"
+msgid "Opening store '%s'"
 msgstr "ଭଣ�ଡାର %s କ� ଖୋଲ�ଅଛି"
 
-#: ../mail/mail-ops.c:1419
-#, c-format
-msgid "Removing folder %s"
+#: ../mail/mail-ops.c:1441
+#, fuzzy, c-format
+#| msgid "Removing folder %s"
+msgid "Removing folder '%s'"
 msgstr "ଫୋଲଡର %s କ� କାଢ଼�ଅଛି"
 
-#: ../mail/mail-ops.c:1537
+#: ../mail/mail-ops.c:1561
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ଫୋଲଡର '%s' କ� ସଂରକ�ଷଣ କର�ଅଛି"
 
-#: ../mail/mail-ops.c:1600
+#: ../mail/mail-ops.c:1624
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ଖାତା '%s' କ� କାଟିକରି ସଂରକ�ଷଣ କର�ଅଛି"
 
-#: ../mail/mail-ops.c:1601
+#: ../mail/mail-ops.c:1625
 #, c-format
 msgid "Storing account '%s'"
 msgstr "ଖାତା '%s' କ� ସଂରକ�ଷଣ କର�ଅଛି"
 
-#: ../mail/mail-ops.c:1655
-msgid "Refreshing folder"
+#: ../mail/mail-ops.c:1679
+#, fuzzy, c-format
+#| msgid "Refreshing folder"
+msgid "Refreshing folder '%s'"
 msgstr "ଫୋଲଡରକ� ସତେଜ କର�ଅଛି"
 
-#: ../mail/mail-ops.c:1695 ../mail/mail-ops.c:1745
-msgid "Expunging folder"
+#: ../mail/mail-ops.c:1719
+#, fuzzy, c-format
+#| msgid "Expunging folder"
+msgid "Expunging folder '%s'"
 msgstr "ଫୋଲଡରକ� କାଟ�ଅଛି"
 
-#: ../mail/mail-ops.c:1742
+#: ../mail/mail-ops.c:1764
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ରେ ଆବର�ଜନା ପାତ�ରକ� ଖାଲିକର�ଅଛି"
 
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1765
 msgid "Local Folders"
 msgstr "ସ�ଥାନୀୟ ଫୋଲ�ଡରଗ�ଡ଼ିକ"
 
-#: ../mail/mail-ops.c:1824
-#, c-format
-msgid "Retrieving message %s"
-msgstr "ସନ�ଦେଶ %sକ� ପ�ନର�ଦ�ଧାର କର�ଅଛି"
-
-#: ../mail/mail-ops.c:1933
+#: ../mail/mail-ops.c:1961
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ସନ�ଦେଶ %dକ� ପ�ନର�ଦ�ଧାର କର�ଅଛି"
-msgstr[1] "ସନ�ଦେଶ %dଗ�ଡ଼ିକ� ପ�ନର�ଦ�ଧାର କର�ଅଛି"
+msgstr[1] "ସନ�ଦେଶ %dକ� ପ�ନର�ଦ�ଧାର କର�ଅଛି"
 
-#: ../mail/mail-ops.c:2018
+#: ../mail/mail-ops.c:2050
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d ସନ�ଦେଶକ� ସଂରକ�ଷଣ କର�ଅଛି"
-msgstr[1] "%d ସନ�ଦେଶଗ�ଡ଼ିକ� ସଂରକ�ଷଣ କର�ଅଛି"
+msgstr[1] "%d ସନ�ଦେଶକ� ସଂରକ�ଷଣ କର�ଅଛି"
 
-#: ../mail/mail-ops.c:2096
+#: ../mail/mail-ops.c:2131
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13747,11 +13425,11 @@ msgstr ""
 "ରେ ସନ�ଦେଶଗ�ଡ଼ିକ� ସଂରକ�ଷଣ କରିବାରେ ତ�ର�ଟି: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2168
+#: ../mail/mail-ops.c:2203
 msgid "Saving attachment"
 msgstr "ସଂଲଗ�ନକ� ସଂରକ�ଷଣ କର�ଅଛି"
 
-#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2221 ../mail/mail-ops.c:2229
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13760,146 +13438,181 @@ msgstr ""
 "ଫଳାଫଳ ଫାଇଲ ନିର�ମାଣ କରିପାରିବେ ନାହି�: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2209
+#: ../mail/mail-ops.c:2244
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ତଥ�ଯ ଲେଖିପାରିବେ ନାହି�: %s"
 
-#: ../mail/mail-ops.c:2355
-#, c-format
-msgid "Disconnecting from %s"
+#: ../mail/mail-ops.c:2389
+#, fuzzy, c-format
+#| msgid "Disconnecting from %s"
+msgid "Disconnecting from '%s'"
 msgstr "%s ଠାର� ସଂଯୋଗ ବିଚ�ଛିନ�ନ କର�ଅଛି"
 
-#: ../mail/mail-ops.c:2355
-#, c-format
-msgid "Reconnecting to %s"
+#: ../mail/mail-ops.c:2389
+#, fuzzy, c-format
+#| msgid "Reconnecting to %s"
+msgid "Reconnecting to '%s'"
 msgstr "%s ସହିତ ପ�ନଃସଂଯୋଗ କର�ଅଛି"
 
-#: ../mail/mail-ops.c:2451
+#: ../mail/mail-ops.c:2485
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "ଅଫ ଲାଇନ ପାଇ� ଖାତା '%s' ପ�ରସ�ତ�ତ କର�ଅଛି"
 
-#: ../mail/mail-ops.c:2537
+#: ../mail/mail-ops.c:2571
 msgid "Checking Service"
 msgstr "ସର�ଭିସ ଯାଞ�ଚ କର�ଅଛି"
 
-#: ../mail/mail-send-recv.c:181
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "ବାତିଲ କର�ଅଛି..."
 
-#: ../mail/mail-send-recv.c:383
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "ମେଲ ପଠାନ�ତ� �ବଂ ଗ�ରହଣକରନ�ତ�"
 
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:444
 msgid "Cancel _All"
 msgstr "ସମସ�ତ ବାତିଲ କରନ�ତ� (_A)"
 
-#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "ଅପଡେଟ କର�ଛି ..."
 
-#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "ଅପେକ�ଷା କର�ଅଛି..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "ନୂତନ ମେଲ ଯାଞ�ଚ କର�ଅଛି"
 
-#: ../mail/mail-session.c:211
+#: ../mail/mail-session.c:208
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s ପାଇ� ପ�ରବେଶ କରନ�ତ� ଭରଣ କରନ�ତ�"
 
-#: ../mail/mail-session.c:213
+#: ../mail/mail-session.c:210
 msgid "Enter Passphrase"
 msgstr "ପ�ରବେଶ ସଙ�କେତ ଭରଣ କରନ�ତ�"
 
-#: ../mail/mail-session.c:216
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:213
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s ପାଇ� ପ�ରବେଶ ସଙ�କେତ ଭରଣ କରନ�ତ�"
 
-#: ../mail/mail-session.c:218
+#: ../mail/mail-session.c:215
 msgid "Enter Password"
 msgstr "ପ�ରବେଶ ସଙ�କେତକ� ଭରଣ କରନ�ତ�"
 
-#: ../mail/mail-session.c:260
+#: ../mail/mail-session.c:257
 msgid "User canceled operation."
 msgstr "ଚାଳକ ଦ�ୱାରା ବାତିଲ ହୋଇଥିବା ପ�ରୟୋଗ।"
 
-#: ../mail/mail-signature-editor.c:201
-msgid "_Save and Close"
-msgstr "ସଂରକ�ଷଣ କରନ�ତ� �ବଂ ବନ�ଦକରନ�ତ� (_S)"
-
-#: ../mail/mail-signature-editor.c:355
-msgid "Edit Signature"
-msgstr "ହସ�ତାକ�ଷରକ� ସମ�ପାଦନ କରନ�ତ�"
+#: ../mail/mail-session.c:667
+msgid "No destination address provided, forward of the message has been cancelled."
+msgstr "କୌଣସି ଲକ�ଷ�ଯସ�ଥଳ ଠିକଣା ଦିଆହୋଇନାହି�, ସନ�ଦେଶର ଅଗ�ରସରକ� ବାତିଲ କରାଯାଇଛି।"
 
-#: ../mail/mail-signature-editor.c:370
-msgid "_Signature Name:"
-msgstr "ହସ�ତାକ�ଷର ନାମ (_S):"
+#: ../mail/mail-session.c:673
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "ବ�ୟବହାର କରିବା ପାଇ� କୌଣସି ଖାତା ମିଲିଲା ନାହି�, ସନ�ଦେଶର ଅଗ�ରସରଣକ� ବାତିଲ କରାଯାଇଛି।"
 
-#: ../mail/mail-tools.c:120
-#, c-format
-msgid "Could not create spool directory `%s': %s"
+#: ../mail/mail-tools.c:119
+#, fuzzy, c-format
+#| msgid "Could not create spool directory `%s': %s"
+msgid "Could not create spool directory '%s': %s"
 msgstr "ସ�ପ�ଲ ଡିରେକ�ଟୋରୀ `%s' କ� ନିର�ମାଣ କରିପାରିଲା ନାହି�: %s"
 
-#: ../mail/mail-tools.c:150
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+#: ../mail/mail-tools.c:149
+#, fuzzy, c-format
+#| msgid "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "ଗୋଟି� ବିନା mbox ଉତ�ସ `%s'କ� ମେଲ ପଠାଇବା ପାଇ� ଚେଷ�ଟାକର�ଅଛି"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "ଅଗ�ରସର କରାଯାଇଥିବା ସନ�ଦେଶ - %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "ଅଗ�ରସର କରାଯାଇଥିବା ସନ�ଦେଶ"
 
-#: ../mail/mail-tools.c:298
-#, c-format
-msgid "Invalid folder: `%s'"
+#: ../mail/mail-tools.c:297
+#, fuzzy, c-format
+#| msgid "Invalid folder: `%s'"
+msgid "Invalid folder: '%s'"
 msgstr "ଅବୈଧ ଫୋଲଡର: `%s'"
 
-#: ../mail/mail-vfolder.c:89
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "ସନ�ଧାନ ଫୋଲଡରକ� ସଜାଡ଼�ଛି: %s"
 
-#: ../mail/mail-vfolder.c:234
+#: ../mail/mail-vfolder.c:228
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s ପାଇ� ସନ�ଧାନ ଫୋଲଡରକ� ଅଦ�ୟତନ କର�ଅଛି:%s'"
 
-#: ../mail/mail-vfolder.c:241
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s ପାଇ� ସନ�ଧାନ ଫୋଲଡରକ� ଅଦ�ୟତନ କର�ଅଛି"
 
-#: ../mail/mail-vfolder.c:1068
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:678
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-vfolder.c:1197
 msgid "Edit Search Folder"
 msgstr "ସନ�ଧାନ ଫୋଲଡରକ� ସମ�ପାଦନ କରନ�ତ�"
 
-#: ../mail/mail-vfolder.c:1157
+#: ../mail/mail-vfolder.c:1302
 msgid "New Search Folder"
 msgstr "ନୂତନ ସନ�ଧାନ ଫୋଲଡର"
 
 #: ../mail/mail.error.xml.h:1
+#, fuzzy
+#| msgid "Check Junk Failed"
+msgid "\"Check Junk\" Failed"
+msgstr "Junk ଯାଞ�ଚ ବିଫଳ ହୋଇଛି"
+
+#: ../mail/mail.error.xml.h:2
+#, fuzzy
+#| msgid "Report Junk Failed"
+msgid "\"Report Junk\" Failed"
+msgstr "ରିପୋର�ଟ Junk ବିଫଳ ହୋଇଛି"
+
+#: ../mail/mail.error.xml.h:3
+#, fuzzy
+#| msgid "Report Not Junk Failed"
+msgid "\"Report Not Junk\" Failed"
+msgstr "ରିପୋର�ଟ Junk ବିଫଳ ହୋଇନାହି�"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "\"{0}\" ନାମକ ଫୋଲଡର ନାମ ପୂର�ବର� ଅବସ�ଥିତ ଅଛି। ଦୟାକରି ଭିନ�ନ �କ ନାମ ବ�ୟବହାର କରନ�ତ�।"
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "\"{1}\" ନାମକ ଫୋଲଡର ନାମ ପୂର�ବର� ଅବସ�ଥିତ ଅଛି। ଦୟାକରି ଭିନ�ନ �କ ନାମ ବ�ୟବହାର କରନ�ତ�।"
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13908,173 +13621,165 @@ msgid ""
 msgstr ""
 "\"{1}\" ରେ ଗୋଟି� ଖାଲିନଥିବା ଫୋଲଡର ପୂର�ବର� ଅବସ�ଥିତ।\n"
 "\n"
-"ଆପଣ �ହି ଫୋଲଡରକ� ଅଗ�ରାହ�ୟ କରିବା ପାଇ� ବାଛି ପାରିବେ, �ହାର ବିଷୟବସ�ତ�କ� ନବଲିଖନ ଅଥବା ଯୋଡ଼ିପାରିବେ, କିମ�ବା "
-"ପ�ରସ�ଥାନ କରିପାରିବେ।"
+"ଆପଣ �ହି ଫୋଲଡରକ� ଅଗ�ରାହ�ୟ କରିବା ପାଇ� ବାଛି ପାରିବେ, �ହାର ବିଷୟବସ�ତ�କ� ନବଲିଖନ ଅଥବା ଯୋଡ଼ିପାରିବେ, "
+"କିମ�ବା ପ�ରସ�ଥାନ କରିପାରିବେ।"
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
 msgstr ""
-"ଗୋଟି� ପଢ଼ିବା ରସିଦ ବିଜ�ଞପ�ତିକ� \"{1}\" ପାଇ� ଅନ�ରୋଧ କରାଯାଇଛି। {0} କ� ସେହି "
-"ରସିଦ ବିଜ�ଞପ�ତି ପଠାଇପାରିବେ?"
+"ଗୋଟି� ପଢ଼ିବା ରସିଦ ବିଜ�ଞପ�ତିକ� \"{1}\" ପାଇ� ଅନ�ରୋଧ କରାଯାଇଛି। {0} କ� ସେହି ରସିଦ ବିଜ�ଞପ�ତି "
+"ପଠାଇପାରିବେ?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
-msgstr ""
-"\"{0}\" ନାମ ସହିତ ଗୋଟି� ହସ�ତାକ�ଷର ପୂର�ବର� ଅବସ�ଥିତ। ଦୟାକରି ଭିନ�ନ�କ ନାମ "
-"ଉଲ�ଲେଖ କରନ�ତ�।"
+msgstr "\"{0}\" ନାମ ସହିତ ଗୋଟି� ହସ�ତାକ�ଷର ପୂର�ବର� ଅବସ�ଥିତ। ଦୟାକରି ଭିନ�ନ�କ ନାମ ଉଲ�ଲେଖ କରନ�ତ�।"
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
-"ଆପଣଙ�କର ସନ�ଦେଶଗ�ଡ଼ିକରେ ଗୋଟି� ଯ�କ�ତିଯ�କ�ତ ବିଷୟ ଯୋଗ କରିବା ଦ�ୱାରା ଆପଣଙ�କ ଗ�ରହଣକର�ତ�ତାଙ�କ� "
-"ଆପଣଙ�କ ମେଲ ବିଷୟରେ କିଛି ଯ�କ�ତି ପ�ରଦାନ କରିଥା�। "
+"ଆପଣଙ�କର ସନ�ଦେଶଗ�ଡ଼ିକରେ ଗୋଟି� ଯ�କ�ତିଯ�କ�ତ ବିଷୟ ଯୋଗ କରିବା ଦ�ୱାରା ଆପଣଙ�କ ଗ�ରହଣକର�ତ�ତାଙ�କ� ଆପଣଙ�କ ମେଲ "
+"ବିଷୟରେ କିଛି ଯ�କ�ତି ପ�ରଦାନ କରିଥା�। "
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 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:13
 msgid "Are you sure you want to delete this account?"
 msgstr "�ହି ଖାତାକ� ଅପସାରଣ କରିବେ ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "�ହି ଖାତାକ� ନିଷ�କ�ରିୟ କରି �ବଂ �ହାର ସମସ�ତ ପ�ରକ�ସିଗ�ଡ଼ିକ� ଅପସାରଣ କରିବେ ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "{0} ସନ�ଦେଶଗ�ଡ଼ିକ� �କାଥରେ ଖୋଲିବାକ� ଚାହ��ଛନ�ତି ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr ""
-"ସମସ�ତ ଫୋଲଡରର� ଆପଣ ସବ�ଦିନପାଇ� �ହି ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ କରିବାକ� "
-"ଚାହ��ଛନ�ତି କି?"
+msgstr "ସମସ�ତ ଫୋଲଡରର� ଆପଣ ସବ�ଦିନପାଇ� �ହି ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
-msgstr ""
-"ଫୋଲଡର \"{0}\"ର� ଆପଣ ସବ�ଦିନପାଇ� �ହି ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ କରିବାକ� "
-"ଚାହ��ଛନ�ତି କି?"
+msgstr "ଫୋଲଡର \"{0}\"ର� ଆପଣ ସବ�ଦିନପାଇ� �ହି ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "HTML ଶୈଳୀରେ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଠାଇବା ପାଇ� ଆପଣ ନିଶ�ଚିତକି?"
 
-#: ../mail/mail.error.xml.h:16
-msgid "Are you sure you want to send a message with only BCC recipients?"
+#: ../mail/mail.error.xml.h:18
+#, fuzzy
+#| msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message with invalid address?"
 msgstr "କେବଳ BCC ଗ�ରହଣକର�ତ�ତାମାନଙ�କ ସହିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଠାଇବାକ� ଚାହ��ଛନ�ତି ବୋଲି ନିଶ�ଚିତ କି?"
 
-#: ../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:18
-msgid "Because \"{0}\"."
-msgstr "କାରଣ \"{0}\"।"
+#: ../mail/mail.error.xml.h:19
+#, fuzzy
+#| msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "କେବଳ BCC ଗ�ରହଣକର�ତ�ତାମାନଙ�କ ସହିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଠାଇବାକ� ଚାହ��ଛନ�ତି ବୋଲି ନିଶ�ଚିତ କି?"
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because \"{2}\"."
-msgstr "କାରଣ \"{2}\"।"
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "କେବଳ BCC ଗ�ରହଣକର�ତ�ତାମାନଙ�କ ସହିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଠାଇବାକ� ଚାହ��ଛନ�ତି ବୋଲି ନିଶ�ଚିତ କି?"
 
 #: ../mail/mail.error.xml.h:21
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "ବିନା ବିଷୟରେ ଆପଣ ସନ�ଦେଶ ପଠାଇବାକ� ଚାହ��ଛନ�ତି ବୋଲି ନିଶ�ଚିତ କି?"
+
+#: ../mail/mail.error.xml.h:22
 msgid "Blank Signature"
 msgstr "ଶୂନ�ଯ ହସ�ତାକ�ଷର"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "ସନ�ଧାନ ଫୋଲଡର \"{0}\"କ� ଯୋଡିପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "ଫୋଲଡର \"{0}\" କ� \"{1}\"ରେ ନକଲ କରିପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "ଫୋଲଡର \"{0}\"କ� ସୃଷ�ଟି କରିପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "ଅସ�ଥାୟୀ ସଂରକ�ଷଣ ଡିରେକ�ଟୋରୀ ନିର�ମାଣ କରିପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "ସଂରକ�ଷଣ ଡିରେକ�ଟୋରୀ ନିର�ମାଣ କରିପାରିବେ ନାହି�, କାରଣ \"{1}\""
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "ଫୋଲଡର \"{0}\"କ� ଅପସାରଣ କରିପାରିବ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "ତନ�ତ�ର ଫୋଲଡର \"{0}\"କ� ଅପସାରଣ କରିପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "ସନ�ଧାନ ଫୋଲଡର \"{0}\"କ� ସମ�ପାଦନ କରିପାରିବେ ନାହି� ଯେହେତ� �ହା ଅବସ�ଥିତ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "ଫୋଲଡର \"{0}\" କ� \"{1}\"ରେ ଘ�ଞ�ଚାଇପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:31
-msgid "Cannot open source \"{1}\""
+#: ../mail/mail.error.xml.h:32
+#, fuzzy
+#| msgid "Cannot open source \"{1}\""
+msgid "Cannot open source \"{1}\"."
 msgstr "ଉତ�ସ \"{1}\"କ� ଖୋଲିପାରିବେ ନାହି�"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "ଉତ�ସ \"{2}\"କ� ଖୋଲିପାରିବେ ନାହି�"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "ଲକ�ଷ�ଯ \"{2}\"କ� ଖୋଲିପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
 msgstr ""
-"ସ�ଥାପନ ସମସ�ୟା ହେତ�, ପ�ରମାଣପତ�ର ଫାଇଲ \"{0}\" କ� ପଢ଼ିପାରିବେ ନାହି�। ଆପଣ �ହି ପ�ରଦାତାଙ�କ� "
-"ବ�ୟବହାର କରିପାରିବେ ନାହି� ଯେପର�ଯ�ୟନ�ତ ଆପଣ �ହାର ପ�ରମାଣପତ�ର ଗ�ରହଣ କରିନାହାନ�ତି।"
+"ସ�ଥାପନ ସମସ�ୟା ହେତ�, ପ�ରମାଣପତ�ର ଫାଇଲ \"{0}\" କ� ପଢ଼ିପାରିବେ ନାହି�। ଆପଣ �ହି ପ�ରଦାତାଙ�କ� ବ�ୟବହାର "
+"କରିପାରିବେ ନାହି� ଯେପର�ଯ�ୟନ�ତ ଆପଣ �ହାର ପ�ରମାଣପତ�ର ଗ�ରହଣ କରିନାହାନ�ତି।"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" କ� \"{1}\"ରେ ପ�ନଃନାମକରଣ କରିପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "ତନ�ତ�ର ଫୋଲଡର \"{0}\"କ� ପ�ନଃନାମକରଣ କରିପାରିବେ ନାହି� କିମ�ବା ଘ�ଞ�ଚାଇପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ଖାତାରେ ସଂରକ�ଷଣ କରିପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "ଡିରେକ�ଟୋରୀ \"{0}\" କ� ସଂରକ�ଷଣ କରିପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "ଫାଇଲ \"{0}\"କ� ସଂରକ�ଷଣ କରିପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "ହସ�ତାକ�ଷର ସ�କ�ରିପ�ଟ \"{0}\" କ� ସେଟକରିପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:41
-msgid "Check Junk Failed"
-msgstr "Junk ଯାଞ�ଚ ବିଫଳ ହୋଇଛି"
-
 #: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
@@ -14088,88 +13793,89 @@ msgid "Could not save signature file."
 msgstr "ହସ�ତାକ�ଷର ଫାଇଲକ� ସଂରକ�ଷଣ କରିପାରିବେ ନାହି�।"
 
 #: ../mail/mail.error.xml.h:44
-msgid "Delete \"{0}\"?"
-msgstr "\"{0}\"କ� ଅପସାରଣ କରିବେ କି?"
-
-#: ../mail/mail.error.xml.h:45
-msgid "Delete account?"
-msgstr "ଖାତା ବିଲୋପ କରନ�ତ�?"
-
-#: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "ସନ�ଧାନ ଫୋଲଡର \"{0}\"ରେ ଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ କରିବେ କି?"
 
-#: ../mail/mail.error.xml.h:47
-msgid "Delete messages in Search Folder?"
-msgstr "ସନ�ଧାନ ଫୋଲଡରରେ ଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ କରିବେ କି?"
-
-#: ../mail/mail.error.xml.h:48
-msgid "Discard changes?"
-msgstr "ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ପ�ରତ�ୟାଖାନ କରିବେ କି?"
-
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:45
 msgid "Do not d_elete"
 msgstr "ଅପସାରଣ କରନ�ତ� ନାହି� (_e)"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "ଅପସାରଣ କରନ�ତ� ନାହି�"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "ନିଷ�କ�ରିୟ କରନ�ତ� ନାହି�"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr ""
-"ଆପଣ ସ�ଥାନୀୟ ଭାବରେ ଫୋଲଡରଗ�ଡ଼ିକ� ସମକାଳୀନ କରିବାକ� ଚାହ��ଛନ�ତି କି ଯାହାକି ଅଫଲାଇନ "
-"ବ�ୟବହାର ପାଇ� ଚିହ�ନିତ?"
+"ଆପଣ ସ�ଥାନୀୟ ଭାବରେ ଫୋଲଡରଗ�ଡ଼ିକ� ସମକାଳୀନ କରିବାକ� ଚାହ��ଛନ�ତି କି ଯାହାକି ଅଫଲାଇନ ବ�ୟବହାର ପାଇ� "
+"ଚିହ�ନିତ?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "ଆପଣ ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଢ଼ାଯାଇଥିବା ପରି ଚିହ�ନଟ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "ଆପଣ ଆପଣଙ�କର ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ସଂରକ�ଷଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "ପ�ରବେଶ ସଙ�କେତ ଭରଣ କରନ�ତ�।"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "ଛାଣକ ସଂଜ�ଞାଗ�ଡ଼ିକ� ଧାରଣ କରିବାରେ ତ�ର�ଟି।"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "ପ�ରୟୋଗକ� କାର�ଯ�ୟକାରୀ କରିବା ସମୟରେ ତ�ର�ଟି।"
 
-#: ../mail/mail.error.xml.h:58
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "{0} ସମୟରେ ତ�ର�ଟି।"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "ଫାଇଲ ଅବସ�ଥିତ କିନ�ତ� ନବଲିଖନ କରିପାରିବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "ଫାଇଲ ଅବସ�ଥିତ କିନ�ତ� ନିୟମିତ ଫାଇଲ ନ�ହ�।"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:60
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "ଯଦି ଆପଣ ଅଗ�ରସର ହ�ଅନ�ତି, ତେବେ ଆପଣ �ହି ସନ�ଦେଶଗ�ଡ଼ିକ� କାଢ଼ିବାରେ ସମର�ଥ ହେବେ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
+#, fuzzy
+#| msgid ""
+#| "If you delete the folder, all of its contents and its subfolders contents "
+#| "will be deleted permanently."
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
-"ଯଦି ଆପଣ �ହି ଫୋଲଡରକ� ଅପସାରଣ କରନ�ତି, ତେବେ �ହାର ସମସ�ତ ଉପଫୋଲଡ଼ରର ବିଷୟବସ�ତ�ଗ�ଡ଼ିକ "
-"ସବ�ଦିନପାଇ� ଅପସାରିତ ହୋଇଯିବ।"
+"ଯଦି ଆପଣ �ହି ଫୋଲଡରକ� ଅପସାରଣ କରନ�ତି, ତେବେ �ହାର ସମସ�ତ ଉପଫୋଲଡ଼ରର ବିଷୟବସ�ତ�ଗ�ଡ଼ିକ ସବ�ଦିନପାଇ� "
+"ଅପସାରିତ ହୋଇଯିବ।"
+
+#: ../mail/mail.error.xml.h:62
+#, fuzzy
+#| msgid ""
+#| "If you delete the folder, all of its contents and its subfolders contents "
+#| "will be deleted permanently."
+msgid "If you delete the folder, all of its contents will be deleted permanently."
+msgstr ""
+"ଯଦି ଆପଣ �ହି ଫୋଲଡରକ� ଅପସାରଣ କରନ�ତି, ତେବେ �ହାର ସମସ�ତ ଉପଫୋଲଡ଼ରର ବିଷୟବସ�ତ�ଗ�ଡ଼ିକ ସବ�ଦିନପାଇ� "
+"ଅପସାରିତ ହୋଇଯିବ।"
 
 #: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
@@ -14192,8 +13898,8 @@ msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
-"ଯଦି ଆପଣ ବିଦାୟ ନେବେ, ତେବେ �ହି ସନ�ଦେଶଗ�ଡ଼ିକ� Evolution ଆରମ�ଭ ନହେବ ପର�ଯ�ୟନ�ତ "
-"ପ�ଣିଥରେ ପଠାଯିବା ନାହି�।"
+"ଯଦି ଆପଣ ବିଦାୟ ନେବେ, ତେବେ �ହି ସନ�ଦେଶଗ�ଡ଼ିକ� Evolution ଆରମ�ଭ ନହେବ ପର�ଯ�ୟନ�ତ ପ�ଣିଥରେ ପଠାଯିବା "
+"ନାହି�।"
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -14203,6 +13909,10 @@ msgstr "ଆଗ�ରହ�ଯ କରିଦିଅନ�ତ�"
 msgid "Invalid authentication"
 msgstr "ଅବୈଧ ବୈଧିକରଣ"
 
+#: ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
+msgstr "ମେଲ ବିଲୋପ ବିଫଳ ହୋଇଛି"
+
 #: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "ମେଲ ଛାଣକ ସ�ୱୟଂଚାଳିତ ଭାବରେ ଅଦ�ୟତିତ ହୋଇଛି।"
@@ -14214,110 +13924,100 @@ msgid ""
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
-"ଅଧିକାଂଶ ଇମେଲ ତନ�ତ�ର ସନ�ଦେଶରେ ଅତିକମରେ ଗୋଟି�-To ଶୀର�ଷକ ଯୋଗକରନ�ତି ଯେଉ�ଥିରେ କେବଳ "
-"BCC ଗ�ରହଣକର�ତ�ତା ଥା�। �ହି ଶୀର�ଷକ, ଯଦି ଯୋଗକରାଯା�, ଆପଣଙ�କର ସମସ�ତ ଗ�ରହଣକର�ତ�ତାଙ�କ� ଆପଣଙ�କ "
-"ସନ�ଦେଶରେ ଯେକୌଣସି ପ�ରକାରେ ତାଲିକାଭ�କ�ତ କରିଥା�। �ହାକ� �ଡ଼ାଇବା ପାଇ�, ଆପଣଙ�କ� ଅତିକମରେ "
-"ଗୋଟି� To: କିମ�ବା CC: ଗ�ରହଣକର�ତ�ତା ଯୋଗ କରିବା ଉଚିତ।"
+"ଅଧିକାଂଶ ଇମେଲ ତନ�ତ�ର ସନ�ଦେଶରେ ଅତିକମରେ ଗୋଟି�-To ଶୀର�ଷକ ଯୋଗକରନ�ତି ଯେଉ�ଥିରେ କେବଳ BCC "
+"ଗ�ରହଣକର�ତ�ତା ଥା�। �ହି ଶୀର�ଷକ, ଯଦି ଯୋଗକରାଯା�, ଆପଣଙ�କର ସମସ�ତ ଗ�ରହଣକର�ତ�ତାଙ�କ� ଆପଣଙ�କ ସନ�ଦେଶରେ "
+"ଯେକୌଣସି ପ�ରକାରେ ତାଲିକାଭ�କ�ତ କରିଥା�। �ହାକ� �ଡ଼ାଇବା ପାଇ�, ଆପଣଙ�କ� ଅତିକମରେ ଗୋଟି� To: କିମ�ବା "
+"CC: ଗ�ରହଣକର�ତ�ତା ଯୋଗ କରିବା ଉଚିତ।"
 
 #: ../mail/mail.error.xml.h:73
-msgid "Mark all messages as read"
-msgstr "ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଢାଯାଇଛି ବୋଲି ଚିହ�ନଟ କରନ�ତ�"
-
-#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "ଅନ�ପସ�ଥିତ ଫୋଲଡର।"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "କୌଣସି ଉତ�ସ ବଛାହୋଇନାହି�।"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "Opening too many messages at once may take a long time."
 msgstr "ଅତ�ୟଧିକ ସନ�ଦେଶଗ�ଡ଼ିକ� �କାଥରକେ ଖୋଲିବା ଦ�ୱାରା ଅଧିକ ସମୟ ଲାଗିଥା�।"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:77
 msgid "Please check your account settings and try again."
 msgstr "ଦୟାକରି ଆପଣଙ�କର ଖାତା ସଂରଚନାକ� ଯାଞ�ଚକରନ�ତ� �ବଂ ପ�ଣି ଚେଷ�ଟାକରନ�ତ�।"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:78
 msgid "Please enable the account or send using another account."
 msgstr "ଦୟାକରି ଖାତାକ� ସକ�ରିୟ କରନ�ତ� କିମ�ବା ଅନ�ୟ �କ ଖାତା ବ�ୟବହାର କରି ପଠାନ�ତ�।"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 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 ""
-"To: କ�ଷେତ�ରରେ ଦୟାକରି ଗୋଟି� ବୈଧ ଇମେଲ ଠିକଣା ଭରଣ କରନ�ତ�। ଆପଣ ଇମେଲ ପାଇ� ଭରଣ ବାକ�ସ "
-"ପରେଥିବା To: ବଟନରେ କ�ଲିକ କରି ସନ�ଧାନ କରିପାରିବେ।"
+"To: କ�ଷେତ�ରରେ ଦୟାକରି ଗୋଟି� ବୈଧ ଇମେଲ ଠିକଣା ଭରଣ କରନ�ତ�। ଆପଣ ଇମେଲ ପାଇ� ଭରଣ ବାକ�ସ ପରେଥିବା "
+"To: ବଟନରେ କ�ଲିକ କରି ସନ�ଧାନ କରିପାରିବେ।"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
 "{0}"
 msgstr ""
-"ଦୟାକରି ନିଶ�ଚିତ କରନ�ତ� ଯେ ନିମ�ନଲିଖିତ ଗ�ରହଣକର�ତ�ତାମାନେ HTML ଇମେଲ ଗ�ରହଣ କରିବା ପାଇ� "
-"ଇଚ�ଛ�କ �ବଂ ସମର�ଥ:\n"
+"ଦୟାକରି ନିଶ�ଚିତ କରନ�ତ� ଯେ ନିମ�ନଲିଖିତ ଗ�ରହଣକର�ତ�ତାମାନେ HTML ଇମେଲ ଗ�ରହଣ କରିବା ପାଇ� ଇଚ�ଛ�କ �ବଂ "
+"ସମର�ଥ:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "�ହି ହସ�ତାକ�ଷରକ� ଚିହ�ନିବା ପାଇ� ଦୟାକରି ଗୋଟି� ଅନନ�ୟ ନାମ ପ�ରଦାନ କରନ�ତ�।"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "ଦୟାକରି ଅପେକ�ଷା କରନ�ତ�।"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "ପ�ର�ଣା ମେଲ ଫୋଲଡର \"{0}\"କ� ସ�ଥାନାନ�ତରଣ କରିବା ସମୟରେ ସମସ�ୟା।"
 
-#: ../mail/mail.error.xml.h:86
-msgid "Querying server"
-msgstr "ଅନ�ସନ�ଧାନ ସର�ଭର"
-
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:85
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ସମର�ଥିତ ପ�ରାଧିକରଣ ଯନ�ତ�ରକୌଶଳର ତାଲିକା ପାଇ� ସର�ଭରକ� ପ�ରଶ�ନ କର�ଅଛି।"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "ଅନ�ରୋଧ କରାଯାଇଥିବା ରସିଦ ପଢନ�ତ�।"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "ଫୋଲଡର \"{0}\" �ବଂ �ହାର ସମସ�ତ ଉପପୋଲଡରଗ�ଡ଼ିକ� ପ�ରକୃତରେ ଅପସାରଣ କରିବେ କି?"
 
-#: ../mail/mail.error.xml.h:90
-msgid "Report Junk Failed"
-msgstr "ରିପୋର�ଟ Junk ବିଫଳ ହୋଇଛି"
-
-#: ../mail/mail.error.xml.h:91
-msgid "Report Not Junk Failed"
-msgstr "ରିପୋର�ଟ Junk ବିଫଳ ହୋଇନାହି�"
+#: ../mail/mail.error.xml.h:88
+#, fuzzy
+#| msgid "Cannot delete folder \"{0}\"."
+msgid "Really delete folder \"{0}\"?"
+msgstr "ଫୋଲଡର \"{0}\"କ� ଅପସାରଣ କରିପାରିବ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:89
 msgid "Search Folders automatically updated."
 msgstr "ସନ�ଧାନ ଫୋଲଡରଗ�ଡ଼ିକ ସ�ୱୟଂଚାଳିତ ଭାବରେ ଅଦ�ୟତିତ ହୋଇଛି।"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "ପଠାଯାଇଥିବା ରସିଦ"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "ହସ�ତାକ�ଷର ପୂର�ବର� ଅବସ�ଥିତ ଅଛି"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "ସମକାଳୀନ"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "ଅଫ ଲାଇନ ବ�ୟବହାର ପାଇ� ଫୋଲଡରଗ�ଡ଼ିକ� ସ�ଥାନୀୟ ଭାବରେ ସମକାଳୀନ କରିବେ କି?"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14325,7 +14025,7 @@ msgstr ""
 "Evolution କ� ସଠିକ ଭାବରେ କାର�ଯ�ୟ କରିବା ପାଇ� ତନ�ତ�ର ଫୋଲଡରଗ�ଡ଼ିକ ଆବଶ�ୟକ �ବଂ ପ�ନଃନାମକରଣ, "
 "ଘ�ଞ�ଚାଇବା, ଅଥବା ଅପସାରଣ କରାଯାଇପାରିବ ନାହି�।"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14336,44 +14036,28 @@ msgid ""
 msgstr ""
 "ଆପଣ ପଠାଉଥିବା ଯୋଗାଯୋଗ ତାଲିକାଟି ଗ�ରହଣକର�ତ�ତାମାନଙ�କ� ଲ�ଚାଇବା ପାଇ� ବିନ�ୟାସିତ।\n"
 "\n"
-"ଅନେକ ଇମେଲ ତନ�ତ�ରଗ�ଡ଼ିକ ପାଖାପାଖି To ଶୀର�ଷକକ� ସନ�ଦେଶରେ ଯୋଗ କରିଥା� ଯେଉ�ଥିରେ କେବଳ "
-"BCC ଗ�ରହଣକର�ତ�ତା ଥା�। �ହି ଶୀର�ଷକ, ଯଦି ଯୋଗକରାଯାଇଥା�, ତେବେ ସନ�ଦେଶରେ ସମସ�ତ "
-"ଗ�ରହଣକର�ତ�ତାଙ�କ� ତାଲିକାଭ�କ�ତ କରିଥା�। �ହାକ� �ଡ଼ାଇବା ପାଇ�, ଆପଣଙ�କ� ଅତିକମରେ ଗୋଟି� To: କିମ�ବା CC: "
-"ଗ�ରହଣକର�ତ�ତା ଯୋଗକରିବା ଉଚିତ।"
+"ଅନେକ ଇମେଲ ତନ�ତ�ରଗ�ଡ଼ିକ ପାଖାପାଖି To ଶୀର�ଷକକ� ସନ�ଦେଶରେ ଯୋଗ କରିଥା� ଯେଉ�ଥିରେ କେବଳ BCC "
+"ଗ�ରହଣକର�ତ�ତା ଥା�। �ହି ଶୀର�ଷକ, ଯଦି ଯୋଗକରାଯାଇଥା�, ତେବେ ସନ�ଦେଶରେ ସମସ�ତ ଗ�ରହଣକର�ତ�ତାଙ�କ� "
+"ତାଲିକାଭ�କ�ତ କରିଥା�। �ହାକ� �ଡ଼ାଇବା ପାଇ�, ଆପଣଙ�କ� ଅତିକମରେ ଗୋଟି� To: କିମ�ବା CC: ଗ�ରହଣକର�ତ�ତା "
+"ଯୋଗକରିବା ଉଚିତ।"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:98
 msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
 msgstr ""
-"ନିମ�ନଲିଖିତ ସନ�ଧାନ ଫୋଲଡର(ଗ�ଡ଼ିକ):\n"
-"{0}\n"
-"ବର�ତ�ତମାନ କଢ଼ାଯାଇଥିବା ଫୋଲଡରକ� ବ�ୟବହାର କରିଥା�:\n"
-"    \"{1}\"\n"
-"�ବଂ ଅଦ�ୟତନ କରାଯାଇଥା�।"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:100
 msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
 msgstr ""
-"ନିମ�ନଲିଖିତ ଛାଣକ ନିୟମ(ଗ�ଡ଼ିକ):\n"
-"{0}\n"
-"ବର�ତ�ତମାନ କଢ଼ାଯାଇଥିବା ଫୋଲଡରଗ�ଡ଼ିକ� ବ�ୟବହାର କରିଥା�:\n"
-"    \"{1}\"\n"
-"�ବଂ ଅଦ�ୟତନ କରାଯାଇଥା�।"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "ସ�କ�ରିପଟ ଫାଇଲ ରହିବା ଉଚିତ �ବଂ ନିଷ�ପାଦନ ଯୋଗ�ୟ ହେବା ଉଚିତ।"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14381,193 +14065,204 @@ msgstr ""
 "�ହି ଫୋଲଡରକ� କ�ଷ�ଦ�ରତମ ଆକାରରେ ଯୋଗକରାଯାଇଥା�,\n"
 "ଆବଶ�ୟକ ହେଲେ, �ହାକ� ବୃହତାକାର ଭାବରେ ଯୋଗ କରିବା ପାଇ� ସନ�ଧାନ ଫୋଲଡର ସମ�ପାଦକ ପାଖକ� ଯାଆନ�ତ�।"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "�ହି ସନ�ଦେଶକ� ପଠାଯାଇପାରିବ ନାହି� କାରଣ ଆପଣ ବାଛିଥିବା ଖାତାଟି ସକ�ରିୟ ନାହି�"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:106
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "�ହି ସନ�ଦେଶକ� ପଠାଯାଇପାରିବ ନାହି� କାରଣ ଆପଣ କୌଣସି ଗ�ରହଣକର�ତ�ତା ଉଲ�ଲେଖ କରିନାହାନ�ତି"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "�ହି ସର�ଭର �ହି ପ�ରକାର ପ�ରାଧିକରଣକ� ସମର�ଥନ କରେନାହି� �ବଂ ବୈଧିକରଣକ� କଦାପି ସମର�ଥନ କରିନଥା�।"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "�ହି ହସ�ତାକ�ଷରଟି ବଦଳି ଯାଇଛି, କିନ�ତ� ସଂରକ�ଷିତ ନ�ହ�।"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr ""
-"ବଚ�ଛିତ ଫୋଲଡର �ବଂ ଉପଫୋଲଡରଗ�ଡ଼ିକରେ �ହା ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଢ଼ାଯାଇଥିବା "
-"ପରି ଚିହ�ନଟ କରିଥା�।"
+msgstr "ବଚ�ଛିତ ଫୋଲଡର �ବଂ ଉପଫୋଲଡରଗ�ଡ଼ିକରେ �ହା ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଢ଼ାଯାଇଥିବା ପରି ଚିହ�ନଟ କରିଥା�।"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "ସାମହିକ ସର�ଭର ସହିତ ସଂଯୋଗ କରିବାରେ ଅସମର�ଥ।"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
-msgstr "�ହି ଖାତା ପାଇ� ଡ�ରାଫ�ଟ ଫୋଲଡରକ� ଖୋଲିବାରେ ଅସମର�ଥ। �ହା ପିରବର�ତ�ତେ ତନ�ତ�ର ଡ�ରାଫ�ଟ ଫୋଲଡର ବ�ୟବହାର କରିବେ କି?"
+msgstr ""
+"�ହି ଖାତା ପାଇ� ଡ�ରାଫ�ଟ ଫୋଲଡରକ� ଖୋଲିବାରେ ଅସମର�ଥ। �ହା ପିରବର�ତ�ତେ ତନ�ତ�ର ଡ�ରାଫ�ଟ ଫୋଲଡର ବ�ୟବହାର "
+"କରିବେ କି?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "ଅନ�ମତି ପତ�ର ଫାଇଲକ� ପଢ଼ିବାରେ ଅସମର�ଥ।"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତକ� ବ�ଯବହାର କରନ�ତ� (_D)"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ଡ�ରାଫ�ଟ ଫୋଲଡରକ� ବ�ୟବହାର କରିବେ କି?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"ଚେତାବନୀ: ଗୋଟି� ସନ�ଧାନ ଫୋଲଡରର� ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ କରିବା ଦ�ୱାରା �ହା ପ�ରକୃତ "
-"ସନ�ଦେଶକ� ଆପଣଙ�କର ସ�ଥାନୀୟ ଅଥବା ସୂଦ�ର ଫୋଲଡରର� ଅପସାରଣ କରିଥା�।\n"
+"ଚେତାବନୀ: ଗୋଟି� ସନ�ଧାନ ଫୋଲଡରର� ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ କରିବା ଦ�ୱାରା �ହା ପ�ରକୃତ ସନ�ଦେଶକ� ଆପଣଙ�କର "
+"ସ�ଥାନୀୟ ଅଥବା ସୂଦ�ର ଫୋଲଡରର� ଅପସାରଣ କରିଥା�।\n"
 "ଆପଣ ପ�ରକୃତରେ �ହା କରିବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:117
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "�ହି ମେଲକ� ଅପସାରଣ କରିବା ପାଇ� ଆପଣଙ�କ ପାଖରେ ଯଥେଷ�ଟ ଅନ�ମତି ନାହି�।"
+
+#: ../mail/mail.error.xml.h:118
 msgid "You have not filled in all of the required information."
 msgstr "ଆପଣ ସମସ�ତ ଆବଶ�ୟକୀୟ ସୂଚନା ଭରଣ କରିନାହାନ�ତି।"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:119
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "ଆପଣ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଠାଇନାହାନ�ତି, ଆପଣ ଯେକୌଣସି ଉପାୟରେ ବିଦାୟ ନେବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:120
 msgid "You may not create two accounts with the same name."
 msgstr "ଆପଣ ସମାନ ନାମ ବିଶିଷ�ଟ ଦ�ଇଟି ଖାତା ଖୋଲିନାହାନ�ତି।"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "ଆପଣ �ହି ସନ�ଧାନ ଫୋଲଡରକ� ନାମକରଣ କରିବା ଉଚିତ।"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "ଆପଣ �ହି ଫୋଲଡରକ� ଉଲ�ଲେଖ କରିବା ଉଚିତ।"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 "ଆପଣ ଅତିକମରେ ଗୋଟି� ଉତ�ସ ଉଲ�ଲେଖ କରିବା ଉଚିତ।\n"
-"ଫୋଲଡରକ� ପୃଥକ ଭାବରେ ବାଛିକରି, ଅଥବା ସମସ�ତ ସ�ଥାନୀୟ, "
-"ସୂଦ�ର, କିମ�ବା ଉଭୟ ଫୋଲଡରଗ�ଡ଼ିକ� ବାଛିକରି।"
+"ଫୋଲଡରକ� ପୃଥକ ଭାବରେ ବାଛିକରି, ଅଥବା ସମସ�ତ ସ�ଥାନୀୟ, ସୂଦ�ର, କିମ�ବା ଉଭୟ ଫୋଲଡରଗ�ଡ଼ିକ� ବାଛିକରି।"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:125
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "ସର�ଭର \"{0}\" ରେ \"{0}\" ଭାବରେ ଲଗଇନ କରିବାରେ ଆପଣ ବିଫଳ ହୋଇଛନ�ତି।"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "ଯୋଡନ�ତ� (_A)"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ପ�ରତ�ୟାଖାନ କରନ�ତ� (_D)"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:128
 msgid "_Do not Synchronize"
 msgstr "ସମକାଳୀନ କରନ�ତ� ନାହି� (_D)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:821
+msgid "_Empty Trash"
+msgstr "ଆବର�ଜନା ପାତ�ରକ� ଖାଲି କରନ�ତ� (_E)"
+
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "କାଟନ�ତ� (_E)"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "ସନ�ଦେଶଗ�ଡ଼ିକ� ଖୋଲନ�ତ� (_O)"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1110
 msgid "Unseen"
 msgstr "ଦେଖିନଥିବା"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1111
 msgid "Seen"
 msgstr "ଦେଖିଥିବା"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1112
 msgid "Answered"
 msgstr "ଉତ�ତର ଦେଇଥିବା"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1113
 msgid "Forwarded"
 msgstr "ଅଗ�ରସର ହୋଇଛି"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1114
 msgid "Multiple Unseen Messages"
 msgstr "�କାଧିକ ଦେଖିନଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1115
 msgid "Multiple Messages"
 msgstr "�କାଧିକ ସନ�ଦେଶଗ�ଡ଼ିକ"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1119
 msgid "Lowest"
 msgstr "ନିମ�ନତମ"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1120
 msgid "Lower"
 msgstr "ନିମ�ନତର"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1124
 msgid "Higher"
 msgstr "ଉଚ�ଚତର"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1125
 msgid "Highest"
 msgstr "ଉଚ�ଚତମ"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1735 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:71
+#: ../mail/message-list.c:1742 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "ଆଜି %l:%M %p"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:81
+#: ../mail/message-list.c:1751
 msgid "Yesterday %l:%M %p"
 msgstr "ଗତକାଲି %l:%M %p"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:93
+#: ../mail/message-list.c:1763
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:101
+#: ../mail/message-list.c:1771
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:103
+#: ../mail/message-list.c:1773
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
+#: ../mail/message-list.c:2524
+msgid "Select all visible messages"
+msgstr "ସମସ�ତ ଦୃଶ�ୟମାନ ମନୋନୀତ କରନ�ତ�"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3986 ../mail/message-list.c:4460
+#: ../mail/message-list.c:4204 ../mail/message-list.c:4600
 msgid "Generating message list"
 msgstr "ସନ�ଦେଶ ତାଲିକା ପ�ରସ�ତ�ତ କର�ଅଛି"
 
-#: ../mail/message-list.c:4299
+#: ../mail/message-list.c:4437
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14575,7 +14270,7 @@ msgstr ""
 "କୌଣସି ସନ�ଦେଶ ଆପଣଙ�କର ସନ�ଧାନ ପ�ରକାରକ� ସନ�ତ�ଷ�ଟ କରିପାରିବ ନାହି�। ସନ�ଧାନ->ତାଲିକା ବସ�ତ�କ� ସଫାକରନ�ତ� "
 "କିମ�ବା �ହାକ� ପରିବର�ତ�ତନ କରନ�ତ� ସହାୟତାରେ ସଫାକରନ�ତ�।"
 
-#: ../mail/message-list.c:4301
+#: ../mail/message-list.c:4439
 msgid "There are no messages in this folder."
 msgstr "�ହି ଫୋଲଡରରେ କୌଣସି ସନ�ଦେଶ ନାହି�।"
 
@@ -14604,7 +14299,6 @@ msgid "Sent Messages"
 msgstr "ପଠାଇଥିବା ସଂଦେଶଗ�ଡିକ "
 
 #: ../mail/message-list.etspec.h:16
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 #: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "ଆକାର"
@@ -14613,59 +14307,28 @@ msgstr "ଆକାର"
 msgid "Subject - Trimmed"
 msgstr "ବିଷୟ - ସଜଡ଼ାଯାଇଛି"
 
-#: ../mail/message-tag-followup.c:55
-msgid "Call"
-msgstr "ଡାକରା"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Do Not Forward"
-msgstr "ଆଗକ� ବଢ଼ନ�ତ� ନାହି�"
-
-#: ../mail/message-tag-followup.c:57
-msgid "Follow-Up"
-msgstr "ଅନ�ସରଣ କରନ�ତ�"
-
-#: ../mail/message-tag-followup.c:58
-msgid "For Your Information"
-msgstr "ଆପଣଙ�କ ସୂଚନା ପାଇ�"
-
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
-msgid "Forward"
-msgstr "ଆଗକ�"
-
-#: ../mail/message-tag-followup.c:60
-msgid "No Response Necessary"
-msgstr "କୌଣସି ଉତ�ତର ଆବଶ�ୟ ନାହି�"
-
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:76
-msgid "Reply"
-msgstr "ଉତ�ତର ଦିଅନ�ତ�"
-
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:77
-msgid "Reply to All"
-msgstr "ସମସ�ତଙ�କ� ଉତ�ତର ଦିଅନ�ତ�"
-
-#: ../mail/message-tag-followup.c:65
-msgid "Review"
-msgstr "ସମାଲୋଚନା"
-
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Body contains"
 msgstr "ବିଷୟ ବସ�ତ�"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Message contains"
 msgstr "ସନ�ଦେଶ ଧାରଣ କରିଥା�"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Recipients contain"
 msgstr "ଗ�ରହଣ କର�ତ�ତା ଧାରଣ କରିଥା�"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Sender contains"
 msgstr "ପ�ରେରକ ଧାରଣ କରିଥା�"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Subject contains"
 msgstr "ବିଷୟ ଧାରଣ କରିଥା�"
 
@@ -14673,13 +14336,2099 @@ msgstr "ବିଷୟ ଧାରଣ କରିଥା�"
 msgid "Subject or Addresses contains"
 msgstr "ବିଷୟ କିମ�ବା ଠିକଣା ଧାରଣ କରିଥା�"
 
-#: ../mail/searchtypes.xml.h:7
-msgid "Subject or Recipients contains"
-msgstr "ବିଷୟ କିମ�ବା ଗ�ରାହକ ଧାରଣ କରିଥା�"
+#: ../modules/addressbook/addressbook-config.c:206
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"�ହି ବିକଳ�ପକ� ବାଛିବା ମାନେ ହେଉଛି Evolution ଆପଣଙ�କର LDAP ସର�ଭର ସହିତ ସଂଯ�କ�ତ ହେବ ଯଦି ଆପଣଙ�କର "
+"LDAP ସର�ଭର SSLକ� ସମର�ଥନ କରିଥା�।"
+
+#: ../modules/addressbook/addressbook-config.c:208
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"�ହି ବିକଳ�ପକ� ବାଛିବା ମାନେ ହେଉଛି Evolution ଆପଣଙ�କର LDAP ସର�ଭର ସହିତ ସଂଯ�କ�ତ ହେବ ଯଦି ଆପଣଙ�କର "
+"LDAP ସର�ଭର TLSକ� ସମର�ଥନ କରିଥା�।"
+
+#: ../modules/addressbook/addressbook-config.c:210
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"�ହି ବିକଳ�ପକ� ବାଛିବା ମାନେ ହେଉଛି ଆପଣଙ�କର ସର�ଭର SSL କିମ�ବା TLS କ� ସମର�ଥନ କରେନାହି�।�ହା ମାନେ "
+"ହେଉଛି ଆପଣଙ�କର ସଂଯୋଗ ଅସ�ରକ�ଷିତ ହେବ, �ବଂ ଆପଣ ସ�ରକ�ଷା ସମସ�ୟାର ସମ�ମ�ଖିନ ହେବେ।"
+
+#: ../modules/addressbook/addressbook-config.c:602
+#, fuzzy
+#| msgid "Birthdays & Anniversaries"
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "ଜନ�ମଦିନ �ବଂ ବାର�ଷିକୀ"
+
+#: ../modules/addressbook/addressbook-config.c:638
+msgid "Copy _book content locally for offline operation"
+msgstr "ଅଫଲାଇନ କାର�ଯ�ଯକଳାପ ପାଇ� ପ�ସ�ତିକା ବିଷୟ ବସ�ତ�କ� ସ�ଥାନୀୟ ଭାବରେ ନକଲ କରନ�ତ�"
+
+#: ../modules/addressbook/addressbook-config.c:746
+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 ସଂଯୋଗ କରିବା ପାଇ� ଚେଷ�ଟାକରିଥା�। "
+"ମାନକ ସଂଯୋଗିକୀର ଗୋଟି� ତାଲିକା ପ�ରଦାନ କରାଯାଇଛି। କେଉ� ସଂଯୋଗିକୀକ� ଉଲ�ଲେଖ କରିବା ଉଚିତ ତାହା ପାଇ� "
+"ଆପଣଙ�କର ତନ�ତ�ର ପ�ରଶାସକଙ�କ ସହିତ ଯୋଗାଯୋଗ କରନ�ତ�।"
+
+#: ../modules/addressbook/addressbook-config.c:820
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"�ହା ହେଉଛି ଆପଣଙ�କ� ବୈଧିକୃତ କରିବା ପାଇ� Evolution ବ�ୟବହାର କର�ଥିବା ପଦ�ଧତି।  ମନେରଖନ�ତ� ଯେ �ହାକ� "
+"\"ଇମେଲ ଠିକଣା\" ଭାବରେ ବିନ�ୟାସ କରିବା ପାଇ� ଆପଣଙ�କର LDAP ସର�ଭରରେ ଅଜ�ଞାତ ଅଭିଗମ�ୟତା ଆବଶ�ୟକ "
+"କରିଥା�।"
+
+#: ../modules/addressbook/addressbook-config.c:895
+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"
+"\" ର ଗୋଟି� ସନ�ଧାନ ସ�ଯୋଗ କେବଳ ଆପଣଙ�କର ସନ�ଧାନ ଆଧାରର ତଳେ ଥିବା ଭରଣଗ�ଡ଼ିକ� ଅନ�ତର�ଭ�କ�ତ କରିଥା�।"
+
+#: ../modules/addressbook/addressbook-config.c:1011
+msgid "Server Information"
+msgstr "ସେବକ ସୂଚନା"
+
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "Details"
+msgstr "ବିସ�ତ�ର�ତ ବିବରଣୀ"
+
+#: ../modules/addressbook/addressbook-config.c:1017
+#: ../modules/mail/e-mail-shell-view.c:54
+msgid "Searching"
+msgstr "ସନ�ଧାନ କର�ଅଛି"
+
+#: ../modules/addressbook/addressbook-config.c:1019
+msgid "Downloading"
+msgstr "ଆହରଣ କର�ଅଛି"
+
+#: ../modules/addressbook/addressbook-config.c:1225
+msgid "Address Book Properties"
+msgstr "ଠିକଣା ପ�ସ�ତିକା ଗ�ଣଧର�ମ"
+
+#: ../modules/addressbook/addressbook-config.c:1227
+msgid "New Address Book"
+msgstr "ନୂତନ ଠିକଣା ପ�ସ�ତିକା"
 
-#: ../mail/searchtypes.xml.h:8
-msgid "Subject or Sender contains"
-msgstr "ବିଷଯ କିମ�ବା ପ�ରେରକ ଧାରଣ କରିଥା�"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "ସ�ବତଃସମ�ପନ�ନ ଦୈର�ଘ�ଯ"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+#, fuzzy
+#| msgid "Contact List"
+msgid "Contact layout style"
+msgstr "ସମ�ପର�କ ତାଲିକା"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+#, fuzzy
+#| msgid "Month view vertical pane position"
+msgid "Contact preview pane position (vertical)"
+msgstr "ଭୂଲମ�ବ ପଟ�ଟିକା ସ�ଥାନ ମାସ ଦୃଶ�ୟ"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "URIଗ�ଡ଼ିକର ସମ�ପୂର�ଣ�ଣ ତାଲିକା ପାଇ� EFolderList XML"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "URIଗ�ଡ଼ିକର ସମ�ପୂର�ଣ�ଣ ତାଲିକା ପାଇ�  EFolderList XML।"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr "ଠିକଣା ସହିତ ସ�ୱୟଂ ସମ�ପୂର�ଣ�ଣ ନାମକ� ଦର�ଶାନ�ତ�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show preview pane"
+msgstr "ପୂର�ବାଲୋକନ ଫଳକକ� ଦେଖାନ�ତ�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr "Evolution ସ�ୱୟଂସମ�ପୂର�ଣ�ଣ ହେବାକ� ଚେଷ�ଟାକରିବା ପୂର�ବର� ଟାଇପ ହେବାକ� ଥିବା ଅକ�ଷର ସଂଖ�ଯା।"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "URI for the folder last used in the select names dialog"
+msgstr "ନାମ ଚୟନ ସଂଳାପରେ ଶେଷଥର ବ�ୟବହୃତ ଫୋଲଡର ପାଇ� URI"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "URI for the folder last used in the select names dialog."
+msgstr "URI ପାଇ� ବଚ�ଛିତ ନାମ ସଂଳାପରେ ଅନ�ତିମ ବ�ଯବହୃତ ଫୋଲଡର।"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr "ଭରଣରେ ସ�ୱୟଂ ସମ�ପୂର�ଣ�ଣ ସମ�ପର�କ ତାଲିକାର ନାମ ସହିତ ମେଲ ଠିକଣାକ� ଦର�ଶାଉଅଛି କି ନାହି�।"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Whether to show the preview pane."
+msgstr "ପୂର�ବାଲୋକନ ଫଳକକ� ଦେଖାଯିବକି ନାହି�।"
+
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
+#: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/mail/em-mailer-prefs.c:1159
+#, fuzzy
+#| msgid "Table model"
+msgid "_Table column:"
+msgstr "ସାରଣୀ ନମ�ନା"
+
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "ସ�ବତଃସମ�ପନ�ନ"
+
+#: ../modules/addressbook/autocompletion-config.c:165
+msgid "Always _show address of the autocompleted contact"
+msgstr "ସ�ୱୟଂ ସମ�ପୂର�ଣ�ଣ ସମ�ପର�କ ପାଇ� ସର�ବଦା ଠିକଣା ଦର�ଶାନ�ତ� (_s)"
+
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:190
+#: ../modules/addressbook/e-book-shell-migrate.c:144
+msgid "On LDAP Servers"
+msgstr "LDAP ସେବକରେ"
+
+#: ../modules/addressbook/e-book-shell-backend.c:340
+msgctxt "New"
+msgid "_Contact"
+msgstr "ସମ�ପର�କ (_C)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:342
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
+msgid "Create a new contact"
+msgstr "ଗୋଟି� ନୂତନ ସମ�ପର�କ ସ�ର�ଷ�ଟି କରନ�ତ�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:347
+msgctxt "New"
+msgid "Contact _List"
+msgstr "ସମ�ପର�କ ତାଲିକା (_L)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:349
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
+msgid "Create a new contact list"
+msgstr "ଗୋଟି� ନୂତନ ସମ�ପର�କ ତାଲିକା ସ�ର�ଷ�ଟି କରନ�ତ�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:357
+msgctxt "New"
+msgid "Address _Book"
+msgstr "ଠିକଣା ପ�ସ�ତିକା (_B)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:359
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
+msgid "Create a new address book"
+msgstr "ଗୋଟି� ନୂତନ ଠିକଣା ପ�ସ�ତିକା ସ�ର�ଷ�ଟି କରନ�ତ�"
+
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:376
+#: ../modules/addressbook/e-book-shell-view.c:394
+#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../modules/calendar/e-cal-shell-migrate.c:57
+msgid "Contacts"
+msgstr "ସମ�ପର�କ"
+
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
+#, fuzzy
+#| msgid "Save as vCard..."
+msgid "Save as vCard"
+msgstr "vCard ଭାବରେ ସଂରକ�ଷଣ କରନ�ତ�..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
+msgid "Co_py All Contacts To..."
+msgstr "ସମସ�ତ ଯୋଗାଯୋଗ କ�."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
+#, fuzzy
+#| msgid "Copy the contacts of the selected folder into another folder"
+msgid "Copy the contacts of the selected address book to another"
+msgstr "ନକଲ କରନ�ତ� ର ଚୟିତ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#, fuzzy
+#| msgid "Del_ete Address Book"
+msgid "D_elete Address Book"
+msgstr "କାଢନ�ତ� (Del) ଠିକଣା ପ�ସ�ତକ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
+#, fuzzy
+#| msgid "Delete the selected folder"
+msgid "Delete the selected address book"
+msgstr "ବିଲୋପ କର ଚୟିତ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
+msgid "Mo_ve All Contacts To..."
+msgstr "ସମସ�ତ ଯୋଗାଯୋଗ କ�."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#, fuzzy
+#| msgid "Move the contacts of the selected folder into another folder"
+msgid "Move the contacts of the selected address book to another"
+msgstr "ଘ�ଞ�ଚାଅ ର ଚୟିତ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
+msgid "_New Address Book"
+msgstr "ନୂତନ ଠିକଣା ପ�ସ�ତିକା (_N)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
+msgid "Address _Book Properties"
+msgstr "ଠିକଣା ପ�ସ�ତକ ବିଶେଷତାଗ�ଡିକ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#, fuzzy
+#| msgid "Change the properties of the selected folder"
+msgid "Show properties of the selected address book"
+msgstr "ପରିବର�ତ�ତନକର ଗ�ଣଧର�ମ ର ଚୟିତ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/mail/e-mail-shell-view-actions.c:905
+msgid "_Rename..."
+msgstr "ନାମ ବଦଳାନ�ତ� ... (_R)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Rename the selected address book"
+msgstr "ପ�ନଃନାମ ଦିଅ ଚୟିତ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#, fuzzy
+#| msgid "S_ave Address Book As VCard"
+msgid "S_ave Address Book as vCard"
+msgstr "S ଠିକଣା ପ�ସ�ତକ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#, fuzzy
+#| msgid "Save the contacts of the selected folder as VCard"
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "ସଂରକ�ଷଣ କରନ�ତ� ର ଚୟିତ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
+#, fuzzy
+#| msgid "Stop Loading"
+msgid "Stop loading"
+msgstr " ଲୋର�ଡକ� ବନ�ଦକର"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#, fuzzy
+#| msgid "_Copy Contact to..."
+msgid "_Copy Contact To..."
+msgstr "ନକଲ କରନ�ତ� ସମ�ପର�କ କ�."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
+#, fuzzy
+#| msgid "Copy selected contacts to another folder"
+msgid "Copy selected contacts to another address book"
+msgstr "ନକଲ କରନ�ତ� ଚୟିତ କ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
+msgid "_Delete Contact"
+msgstr "ବିଲୋପ କର ସମ�ପର�କ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#, fuzzy
+#| msgid "_Forward Contact..."
+msgid "_Find in Contact..."
+msgstr "ଆଗକ� ସମ�ପର�କ."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Search for text in the displayed contact"
+msgstr "ପ�ରଦର�ଶିତ ସନ�ଦେଶର ଶରୀରରେ ପାଠ�ୟ ଖୋଜନ�ତ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
+msgid "_Forward Contact..."
+msgstr "ଆଗକ� ସମ�ପର�କ."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
+msgid "Send selected contacts to another person"
+msgstr "ପଠାଅ ଚୟିତ କ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#, fuzzy
+#| msgid "_Move Contact to..."
+msgid "_Move Contact To..."
+msgstr "ଘ�ଞ�ଚାଅ ସମ�ପର�କ କ�."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#, fuzzy
+#| msgid "Move selected contacts to another folder"
+msgid "Move selected contacts to another address book"
+msgstr "ଘ�ଞ�ଚାଅ ଚୟିତ କ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
+msgid "_New Contact..."
+msgstr "ନୂତନ ସମ�ପର�କ (_N) ..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
+msgid "New Contact _List..."
+msgstr "ନୂତନ ସମ�ପର�କ ତାଲିକା (_L) ..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#, fuzzy
+#| msgctxt "New"
+#| msgid "_Contact"
+msgid "_Open Contact"
+msgstr "ସମ�ପର�କ (_C)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
+msgid "View the current contact"
+msgstr "ଦୃଶ�ଯ ସମ�ପର�କ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
+msgid "_Send Message to Contact..."
+msgstr "ପଠାଅ ସନ�ଦେଶ କ� ସମ�ପର�କ."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
+msgid "Send a message to the selected contacts"
+msgstr "ବଚ�ଛିତ ସମ�ପର�କ ମାନଙ�କ� ସନ�ଦେଶ ପଠାନ�ତ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:793
+msgid "_Actions"
+msgstr "କ�ରିୟା (_A)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
+msgid "_Preview"
+msgstr "ପ�ରାକ� ଦର�ଶନ (_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-task-shell-view-actions.c:813
+msgid "_Delete"
+msgstr "ଅପସାରଣ କରନ�ତ� (_D)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
+msgid "_Properties"
+msgstr "ଗ�ଣଧର�ମ (_P)"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
+msgid "_Save as vCard..."
+msgstr "vCard ଭାବରେ ସଂରକ�ଷଣ କରନ�ତ� (_S)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
+msgid "Contact _Preview"
+msgstr "ସମ�ପର�କ ପୂର�ବଦୃଶ�ଯ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
+msgid "Show contact preview window"
+msgstr "ଦେଖାଅ ସମ�ପର�କ ୱିଣ�ଡୋ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
+msgid "_Classic View"
+msgstr "ଚିରପ�ରତିଷ�ଠିତ ଦୃଶ�ଯ (_C)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show contact preview below the contact list"
+msgstr "ସନ�ଦେଶ ପ�ରାକଦର�ଶନକ� ସନ�ଦେଶ ତାଲିକା ତଳେ ଦର�ଶାନ�ତ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
+msgid "_Vertical View"
+msgstr "ଲମ�ବରୂପ ଦୃଶ�ଯ (_V)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
+#, fuzzy
+#| msgid "Show contact preview window"
+msgid "Show contact preview alongside the contact list"
+msgstr "ଦେଖାଅ ସମ�ପର�କ ୱିଣ�ଡୋ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:906
+msgid "Any Category"
+msgstr "ଯେ କୌଣସି ବିଭାଗ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
+#: ../modules/calendar/e-memo-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:941
+msgid "Unmatched"
+msgstr "ଅମେଳ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../shell/e-shell-content.c:441
+msgid "Advanced Search"
+msgstr "ଉନ�ନତ ସନ�ଧାନ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#, fuzzy
+#| msgid "Print selected contacts"
+msgid "Print all shown contacts"
+msgstr "ମ�ଦ�ରଣ ଚୟିତ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#, fuzzy
+#| msgid "Previews the contacts to be printed"
+msgid "Preview the contacts to be printed"
+msgstr "ପ�ରାକ�ଦର�ଶନରାଜି  କ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
+msgid "Print selected contacts"
+msgstr "ମ�ଦ�ରଣ ଚୟିତ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#, fuzzy
+#| msgid "Save selected contacts as a VCard"
+msgid "Save selected contacts as a vCard"
+msgstr "ସଂରକ�ଷଣ କରନ�ତ� ଚୟିତ a"
+
+#: ../modules/addressbook/e-book-shell-view.c:338
+msgid "_Forward Contacts"
+msgstr "ସମ�ପର�କ ମାନଙ�କ� ଅଗ�ରସରିତ କରନ�ତ� (_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:340
+msgid "_Forward Contact"
+msgstr "ସମ�ପର�କ ଅଗ�ରସରିତ କରନ�ତ� (_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:371
+#, fuzzy
+#| msgid "Send _Message to Contacts"
+msgid "_Send Message to Contacts"
+msgstr "ସମ�ପର�କ ମାନଙ�କ� ସନ�ଦେଶ ପଠାନ�ତ� (_M)"
+
+#: ../modules/addressbook/e-book-shell-view.c:373
+#, fuzzy
+#| msgid "Send _Message to List"
+msgid "_Send Message to List"
+msgstr "ଗୋଷ�ଠୀକ� ସନ�ଦେଶ ପଠାନ�ତ� (_M)"
+
+#: ../modules/addressbook/e-book-shell-view.c:375
+#, fuzzy
+#| msgid "Send _Message to Contact"
+msgid "_Send Message to Contact"
+msgstr "ସମ�ପର�କକ� ସନ�ଦେଶ ପଠାନ�ତ� (_M)"
+
+#: ../modules/addressbook/eab-composer-util.c:137
+msgid "Multiple vCards"
+msgstr "�କାଧିକ vCards"
+
+#: ../modules/addressbook/eab-composer-util.c:145
+#, c-format
+msgid "vCard for %s"
+msgstr "%s ପାଇ� vCard"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
+#, c-format
+msgid "Contact information"
+msgstr "ସମ�ପର�କ ସୂଚନା"
+
+#: ../modules/addressbook/eab-composer-util.c:186
+#, c-format
+msgid "Contact information for %s"
+msgstr "%s ପାଇ� ସମ�ପର�କ ସୂଚନା"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
+msgid "1"
+msgstr "à­§"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:4
+msgid "5"
+msgstr "à­«"
+
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "Anonymously"
+msgstr ""
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:7
+msgid "B_rowse this book until limit reached"
+msgstr "ସୀମା ପହଞ�ଚିବା ପର�ଯ�ୟନ�ତ �ହି ବହିକ� ବ�ରାଉଜ କରନ�ତ� (_r)"
+
+#: ../modules/addressbook/ldap-config.ui.h:8
+msgid "Lo_gin:"
+msgstr "ଲଗଇନ (_g):"
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:11
+#, fuzzy
+#| msgid "Online"
+msgid "One"
+msgstr "ଅନ ଲାଇନ"
+
+#: ../modules/addressbook/ldap-config.ui.h:13
+msgid "Search Filter"
+msgstr "ଫିଲଟର ଖୋଜନ�ତ�"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Search _base:"
+msgstr "ଆଧାର ଖୋଜନ�ତ� (_b):"
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Search _filter:"
+msgstr "ଫିଲଟର ଖୋଜନ�ତ� (_f):"
+
+#: ../modules/addressbook/ldap-config.ui.h:16
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"ସନ�ଧାନ କରିବା ପାଇ� ସନ�ଧାନ ଛାଣକ ହେଉଛି ଗୋଟି� ପ�ରକାର ବସ�ତ�। ଯଦି �ହାକ� ପରିବର�ତ�ତନ କରାନଯା�, ତେବେ "
+"ପୂର�ବନିର�ଦ�ଧାରିତ ସନ�ଧାନକ� \"person\" ପ�ରକାରରେ କାର�ଯ�ୟକାରୀ କରାଯିବ।"
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:18
+#, fuzzy
+#| msgid "Su"
+msgid "Sub"
+msgstr "Su"
+
+#: ../modules/addressbook/ldap-config.ui.h:19
+msgid "Supported Search Bases"
+msgstr "ସମର�ଥିତ ସନ�ଧାନ ଆଧାର"
+
+#: ../modules/addressbook/ldap-config.ui.h:21
+#, fuzzy
+#| msgid ""
+#| "Anonymously\n"
+#| "Using email address\n"
+#| "Using distinguished name (DN)"
+msgid "Using distinguished name (DN)"
+msgstr ""
+"ଅଜ�ଞାତ ଭାବରେ\n"
+"ଇମେଲ ଠିକଣା ବ�ୟବହାର କରି\n"
+"ପ�ରଖ�ଯାତ ନାମ (DN) କ� ବ�ଯବହାର କର�ଅଛି"
+
+#: ../modules/addressbook/ldap-config.ui.h:22
+#, fuzzy
+#| msgid "Email _Address:"
+msgid "Using email address"
+msgstr "ଇମେଲ ଠିକଣା (_A):"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "_Download limit:"
+msgstr "ଆହରଣ ସୀମା (_D):"
+
+#: ../modules/addressbook/ldap-config.ui.h:24
+msgid "_Find Possible Search Bases"
+msgstr "ସମ�ଭାବ�ଯ ସନ�ଧାନ ଆଧାରକ� ଖୋଜନ�ତ� (_F)"
+
+#: ../modules/addressbook/ldap-config.ui.h:25
+msgid "_Login method:"
+msgstr "ଲଗଇନ ପଦ�ଧତି (_L):"
+
+#: ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "ସଂଯୋଗିକୀ (_P):"
+
+#: ../modules/addressbook/ldap-config.ui.h:28
+msgid "_Search scope:"
+msgstr "ସନ�ଧାନ ସ�ଯୋଗ (_S):"
+
+#: ../modules/addressbook/ldap-config.ui.h:30
+msgid "_Timeout:"
+msgstr "ସମୟ ସମାପ�ତି (_T):"
+
+#: ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
+msgstr "ସ�ରକ�ଷିତ ସଂଯୋଗକ� ବ�ଯବହାର କରନ�ତ� (_U):"
+
+#: ../modules/addressbook/ldap-config.ui.h:32
+msgid "cards"
+msgstr "କାର�ଡ"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "I_mport"
+msgstr "ଆମଦାନୀ କରନ�ତ� (_m)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Select a Calendar"
+msgstr "ଗୋଟି� କ�ଯାଲେଣ�ଡର ବାଛନ�ତ�"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:368
+msgid "Select a Task List"
+msgstr "ଗୋଟି� କାର�ଯ�ୟସୂଚୀ ବାଛନ�ତ�"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+msgid "I_mport to Calendar"
+msgstr "କ�ଯାଲେଣ�ଡର ମଧ�ଯକ� ଆମଦାନୀ କରନ�ତ� (_m)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+msgid "I_mport to Tasks"
+msgstr "କାର�ଯ�ୟଗ�ଡ଼ିକ ମଧ�ଯକ� ଆମଦାନୀ କରନ�ତ� (_m)"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:125
+#: ../modules/calendar/e-cal-shell-migrate.c:176
+#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-task-shell-backend.c:113
+#: ../modules/calendar/e-task-shell-migrate.c:143
+msgid "On The Web"
+msgstr "ୱେବରେ"
+
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../plugins/calendar-weather/calendar-weather.c:117
+msgid "Weather"
+msgstr "ପାଣିପାଗ"
+
+#: ../modules/calendar/e-cal-shell-backend.c:242
+#: ../modules/calendar/e-cal-shell-migrate.c:60
+msgid "Birthdays & Anniversaries"
+msgstr "ଜନ�ମଦିନ �ବଂ ବାର�ଷିକୀ"
+
+#: ../modules/calendar/e-cal-shell-backend.c:446
+msgctxt "New"
+msgid "_Appointment"
+msgstr "ସାକ�ଷାତକାର (_A)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+msgid "Create a new appointment"
+msgstr "ଗୋଟି� ନୂତନ ସାକ�ଷାତକାର ସ�ର�ଷ�ଟି କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:453
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "ସମ�ପୂର�ଣ ଦିବସ ବ�ଯାପି ସାକ�ଷାତକାର (_p)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:455
+msgid "Create a new all-day appointment"
+msgstr "ଗୋଟି� ନୂତନ ସମ�ପୂର�ଣ ଦିବସ ବ�ଯାପି ସାକ�ଷାତକାର"
+
+#: ../modules/calendar/e-cal-shell-backend.c:460
+msgctxt "New"
+msgid "M_eeting"
+msgstr "ସାକ�ଷାତକାର (_e)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:462
+msgid "Create a new meeting request"
+msgstr "ଗୋଟି� ନୂତନ ସାକ�ଷାତକାର ନିବେଦନ"
+
+#: ../modules/calendar/e-cal-shell-backend.c:470
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "କ�ଯାଲେଣ�ଡର (_n)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+msgid "Create a new calendar"
+msgstr "ଗୋଟି� ନୂତନ କ�ଯାଲେଣ�ଡର ସ�ର�ଷ�ଟି କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:507
+#: ../plugins/itip-formatter/itip-formatter.c:2666
+msgid "Calendar and Tasks"
+msgstr "କ�ୟାଲେଣ�ଡର �ବଂ କାର�ଯ�ୟଗ�ଡ଼ିକ"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
+#, fuzzy, c-format
+#| msgid ""
+#| "Error on %s:\n"
+#| " %s"
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"%sରେ ତ�ର�ଟି:\n"
+" %s"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
+#, fuzzy
+#| msgid "Loading Calendar"
+msgid "Loading calendars"
+msgstr "କ�ଯାଲେଣ�ଡର ଧାରଣ କର�ଅଛି"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:633
+#, fuzzy
+#| msgid "Calendar Source Selector"
+msgid "Calendar Selector"
+msgstr "କ�ଯାଲେଣ�ଡର ଉତ�ସ ଚୟକ"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-cal-shell-sidebar.c:974
+#, fuzzy, c-format
+#| msgid "Opening calendar"
+msgid "Opening calendar at %s"
+msgstr "କାଲେଣ�ଡର ଖୋଲ�ଅଛି"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+msgid "Print"
+msgstr "ମୂଦ�ରଣ କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:306
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"�ହି ପ�ରୟୋଗଟି ବଚ�ଛିତ ସମୟ ସୀମା ଠାର� ପ�ର�ଣା ଘଟଣାଗ�ଡ଼ିକ� ସମ�ପୂର�ଣ�ଣଭାବରେ ଲ�ପ�ତ କରିଦେବ। ଯଦି ଆପଣ ଅଗ�ରସର "
+"ହ�ଅନ�ତି, ତେବେ ଆପଣ ସେହି ଘଟଣାଗ�ଡ଼ିକର ପ�ନର�ଦ�ଧାର କରିପାରିବେ ନାହି�।"
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
+msgid "Purge events older than"
+msgstr "�ହା ପୂର�ବବର�ତ�ତୀ ଘଟଣା ମାନଙ�କ� ନିଷ�କାସିତ କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:534
+#, fuzzy
+#| msgid "Copying items"
+msgid "Copying Items"
+msgstr "ବସ�ତ� ମାନଙ�କ� ନକଲ କର�ଅଛି"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#, fuzzy
+#| msgid "Moving items"
+msgid "Moving Items"
+msgstr "ବସ�ତ� ମାନଙ�କ� ସ�ଥାନାନ�ତରିତ କର�ଅଛି"
+
+#. Translators: Default filename part saving an event to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#, fuzzy
+#| msgid "Sent"
+msgid "event"
+msgstr "ପଠାଯାଇଛି"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1100
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:494
+#: ../modules/calendar/e-task-shell-view-actions.c:612
+#, fuzzy
+#| msgid "Select a Calendar"
+msgid "Save as iCalendar"
+msgstr "ଗୋଟି� କ�ଯାଲେଣ�ଡର ବାଛନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
+msgid "_Copy..."
+msgstr "ନକଲ କରନ�ତ� (_C)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+#, fuzzy
+#| msgid "Select a Calendar"
+msgid "D_elete Calendar"
+msgstr "ଗୋଟି� କ�ଯାଲେଣ�ଡର ବାଛନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#, fuzzy
+#| msgid "Delete the selected folder"
+msgid "Delete the selected calendar"
+msgstr "ବିଲୋପ କର ଚୟିତ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#, fuzzy
+#| msgid "Go back"
+msgid "Go Back"
+msgstr "ପଛକ� ଯାଆନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+#, fuzzy
+#| msgid "Go forward"
+msgid "Go Forward"
+msgstr "ଆଗକ� ଯାଆନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
+msgid "Select today"
+msgstr "ଆଜି ମନୋନୀତ କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+msgid "Select _Date"
+msgstr "ତାରିଖ ମନୋନୀତ କରନ�ତ� (_D)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+msgid "Select a specific date"
+msgstr "ଗୋଟି� ନିର�ଦ�ଦିଷ�ଟ ତାରିଖ ବାଛନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+msgid "_New Calendar"
+msgstr "ନୂତନ କ�ଯାଲେଣ�ଡର (_N)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-task-shell-view-actions.c:784
+msgid "Purg_e"
+msgstr "ସଫାକରନ�ତ� (_e)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+msgid "Purge old appointments and meetings"
+msgstr "ପ�ର�ଣା ସାକ�ଷାତକାର �ବଂ ବୈଠକକ� ସଫାକରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#: ../modules/calendar/e-task-shell-view-actions.c:728
+msgid "Re_fresh"
+msgstr "ସତେଜନ କରନ�ତ� (_f)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Refresh the selected calendar"
+msgstr "ପ�ନଃନାମ ଦିଅ ଚୟିତ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Rename the selected calendar"
+msgstr "ପ�ନଃନାମ ଦିଅ ଚୟିତ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#, fuzzy
+#| msgid "Show _only this Calendar"
+msgid "Show _Only This Calendar"
+msgstr "କେବଳ �ହି କ�ଯାଲେଣ�ଡରକ� ଦର�ଶାନ�ତ� (_o)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+msgid "Cop_y to Calendar..."
+msgstr "କ�ଯାଲେଣ�ଡରକ� ନକଲ କରନ�ତ�... (_y)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+msgid "_Delegate Meeting..."
+msgstr "ନିର�ବାଚିତ ପ�ରାର�ଥୀ ମାନଙ�କର ସଭା... (_D)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#, fuzzy
+#| msgid "Delete the appointment"
+msgid "_Delete Appointment"
+msgstr "�ହି ସାକ�ଷାତକାରକ� ବିଲୋପ କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#, fuzzy
+#| msgid "Delete the appointment"
+msgid "Delete selected appointments"
+msgstr "�ହି ସାକ�ଷାତକାରକ� ବିଲୋପ କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#, fuzzy
+#| msgid "Delete this _Occurrence"
+msgid "Delete This _Occurrence"
+msgstr "�ହି ଘଟଣାକ� ଅପସାରିତ କରନ�ତ� (_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+msgid "Delete this occurrence"
+msgstr "�ହି ଘଟଣାକ� ବିଲୋପ କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#, fuzzy
+#| msgid "Delete _All Occurrences"
+msgid "Delete All Occ_urrences"
+msgstr "ସମସ�ତ ଘଟଣାକ� ଅପସାରିତ କରନ�ତ� (_A)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+msgid "Delete all occurrences"
+msgstr "ସମସ�ତ ଘଟଣାକ� ବିଲୋପ କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+#, fuzzy
+#| msgid "New All Day _Event"
+msgid "New All Day _Event..."
+msgstr "ନୂତନ ସମଗ�ର ଦିବସ ଘଟଣା (_E)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#, fuzzy
+#| msgid "Create a new all-day appointment"
+msgid "Create a new all day event"
+msgstr "ଗୋଟି� ନୂତନ ସମ�ପୂର�ଣ ଦିବସ ବ�ଯାପି ସାକ�ଷାତକାର"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:568
+#: ../modules/calendar/e-task-shell-view-actions.c:693
+msgid "_Forward as iCalendar..."
+msgstr "iCalendar ଭାବରେ ଅଗ�ରସରିତ କରନ�ତ�... (_F)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#, fuzzy
+#| msgid "New _Meeting"
+msgid "New _Meeting..."
+msgstr "ନୂତନ ସଭା (_M)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#, fuzzy
+#| msgid "Create a new meeting request"
+msgid "Create a new meeting"
+msgstr "ଗୋଟି� ନୂତନ ସାକ�ଷାତକାର ନିବେଦନ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+msgid "Mo_ve to Calendar..."
+msgstr "କ�ଯାଲେଣ�ଡରକ� ସ�ଥାନାନ�ତରିତ କରନ�ତ�... (_v)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+msgid "New _Appointment..."
+msgstr "ନୂତନ ସାକ�ଷାତକାର... (_A)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+msgid "Make this Occurrence _Movable"
+msgstr "�ହି ଘଟଣାକ� ଗତିଶୀଳ ଭାବରେ ଚିହ�ନିତ କରନ�ତ� (_M)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+msgid "_Open Appointment"
+msgstr "ସାକ�ଷାତକାର ଖୋଲନ�ତ� (_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+msgid "View the current appointment"
+msgstr "ପ�ରଚଳିତ ସାକ�ଷାତକାରକ� ଦେଖନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+msgid "_Reply"
+msgstr "ଉତ�ତର ଦିଅନ�ତ� (_R)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#, fuzzy
+#| msgid "Save as vCard..."
+msgid "Save as iCalendar..."
+msgstr "vCard ଭାବରେ ସଂରକ�ଷଣ କରନ�ତ�..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+msgid "_Schedule Meeting..."
+msgstr "ସଭାର ଅନ�ସୂଚୀ ସ�ଥିର କରନ�ତ�... (_S)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#, fuzzy
+#| msgid "Purge old appointments and meetings"
+msgid "Converts an appointment to a meeting"
+msgstr "ପ�ର�ଣା ସାକ�ଷାତକାର �ବଂ ବୈଠକକ� ସଫାକରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
+#, fuzzy
+#| msgid "New _Appointment..."
+msgid "Conv_ert to Appointment..."
+msgstr "ନୂତନ ସାକ�ଷାତକାର... (_A)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#, fuzzy
+#| msgid "%s at the end of the appointment"
+msgid "Converts a meeting to an appointment"
+msgstr "ସାକ�ଷାତକାରର ଅନ�ତରେ %s"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#, fuzzy
+#| msgid "_Quit"
+msgid "Quit"
+msgstr "ବିଦାୟ ନିଅନ�ତ� (_Q)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+msgid "Day"
+msgstr "ଦିନ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
+msgid "Show one day"
+msgstr "ଗୋଟି� ଦିନ ଦର�ଶାନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
+msgid "List"
+msgstr "ତାଲିକା"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
+msgid "Show as list"
+msgstr "ତାଲିକା ପରି ଦର�ଶାନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
+msgid "Month"
+msgstr "ମାସ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
+msgid "Show one month"
+msgstr "ଗୋଟି� ମାସ ଦର�ଶାନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
+msgid "Week"
+msgstr "ସପ�ତାହ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
+msgid "Show one week"
+msgstr "ଗୋଟି� ସପ�ତାହ ଦର�ଶାନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
+#, fuzzy
+#| msgid "Show one week"
+msgid "Show one work week"
+msgstr "ଗୋଟି� ସପ�ତାହ ଦର�ଶାନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
+msgid "Active Appointments"
+msgstr "ସକ�ରିୟ ନିଯ�କ�ତି"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
+msgid "Next 7 Days' Appointments"
+msgstr "ପରବର�ତ�ତି 7 ଦିନର ସାକ�ଷାତକାର"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:965
+msgid "Description contains"
+msgstr "ବର�ଣ�ଣନା ବିଷୟ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:972
+msgid "Summary contains"
+msgstr "ସାରଂଶ ବିଷୟ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+msgid "Print this calendar"
+msgstr "�ହି କାଲେଣ�ଡରକ� ମ�ଦ�ରଣ କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
+#, fuzzy
+#| msgid "Previews the calendar to be printed"
+msgid "Preview the calendar to be printed"
+msgstr "ମ�ଦ�ରଣ ହେବାକ� ଥିବା କ�ୟାଲେଣ�ଡରକ� ପ�ରାକଦର�ଶନ କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
+msgid "Go To"
+msgstr " କ� ଯାଆନ�ତ�"
+
+#. Translators: Default filename part saving a memo to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#, fuzzy
+#| msgid "Memo"
+msgid "memo"
+msgstr "ସ�ମାରକପତ�ର"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#, fuzzy
+#| msgid "New memo"
+msgid "New _Memo"
+msgstr "ନୂତନ memo"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../modules/calendar/e-memo-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
+msgid "Create a new memo"
+msgstr "ନୂତନ memo ସୃଷ�ଟି କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
+msgid "_Open Memo"
+msgstr "ସ�ମାରକପତ�ର ଖୋଲନ�ତ� (_O)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+msgid "View the selected memo"
+msgstr "ଚୟିତ ସ�ମାରକପତ�ରକ� ଦେଖନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-task-shell-view-actions.c:777
+msgid "Open _Web Page"
+msgstr "ୱେବ ପ�ର�ଷ�ଠାକ� ଖୋଲନ�ତ� (_W)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#, fuzzy
+#| msgid "View the selected memo"
+msgid "Print the selected memo"
+msgstr "ଚୟିତ ସ�ମାରକପତ�ରକ� ଦେଖନ�ତ�"
+
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:610
+#, fuzzy
+#| msgid "Task"
+msgid "task"
+msgstr "ଟାସ�କ"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:672
+msgid "_Assign Task"
+msgstr "କାର�ଯ�ଯ ନ�ଯସ�ତ କରନ�ତ� (_A)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:749
+msgid "_Mark as Complete"
+msgstr "ସମ�ପୂର�ଣ�ଣ ବୋଲି ଘୋଷିତ କରନ�ତ� (_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:751
+msgid "Mark selected tasks as complete"
+msgstr "ଚୟିତ କାର�ଯ�ୟଗ�ଡ଼ିକ� ସମ�ପୂର�ଣ�ଣ ବୋଲି ଚିହ�ନଟ କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+msgid "_Mark as Incomplete"
+msgstr "ଅସମ�ପୂର�ଣ�ଣ ବୋଲି ଘୋଷିତ କରନ�ତ� (_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:758
+#, fuzzy
+#| msgid "Mark selected tasks as complete"
+msgid "Mark selected tasks as incomplete"
+msgstr "ଚୟିତ କାର�ଯ�ୟଗ�ଡ଼ିକ� ସମ�ପୂର�ଣ�ଣ ବୋଲି ଚିହ�ନଟ କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:763
+msgid "New _Task"
+msgstr "ନୂତନ କାର�ଯ�ଯ (_T)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:765
+msgid "Create a new task"
+msgstr "ନୂତନ କାର�ଯ�ୟ ସୃଷ�ଟି କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:770
+msgid "_Open Task"
+msgstr "କାର�ଯ�ଯକ� ଖୋଲନ�ତ� (_O)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:772
+msgid "View the selected task"
+msgstr "ଚୟିତ କାର�ଯ�ଯକ� ପ�ରଦର�ଶନ କରନ�ତ�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-memo-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#, fuzzy
+#| msgid "_Forward as iCalendar..."
+msgid "_Save as iCalendar..."
+msgstr "iCalendar ଭାବରେ ଅଗ�ରସରିତ କରନ�ତ�... (_F)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-task-shell-view-actions.c:998
+#, fuzzy
+#| msgid "View the selected task"
+msgid "Print the selected task"
+msgstr "ଚୟିତ କାର�ଯ�ଯକ� ପ�ରଦର�ଶନ କରନ�ତ�"
+
+#: ../modules/calendar/e-memo-shell-backend.c:318
+msgctxt "New"
+msgid "Mem_o"
+msgstr "Memo (_o)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:325
+#, fuzzy
+#| msgctxt "New"
+#| msgid "_Shared memo"
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "ସହଭାଗୀ memo (_S)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:327
+#, fuzzy
+#| msgid "Create a shared new memo"
+msgid "Create a new shared memo"
+msgstr "ନୂତନ ସହଭାଗୀ memo ସୃଷ�ଟି କରନ�ତ�"
+
+#: ../modules/calendar/e-memo-shell-backend.c:335
+#, fuzzy
+#| msgid "Memo List"
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "ସନ�ଦେଶ ସୂଚୀ"
+
+#: ../modules/calendar/e-memo-shell-backend.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
+msgid "Create a new memo list"
+msgstr "ନୂତନ memo ତାଲିକା ସୃଷ�ଟି କରନ�ତ�"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
+msgid "Loading memos"
+msgstr "memo ଧାରଣ କର�ଅଛି"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:587
+#, fuzzy
+#| msgid "Memo Source Selector"
+msgid "Memo List Selector"
+msgstr "Memo ଉତ�ସ ଚୟନକର�ତ�ତା"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-memo-shell-sidebar.c:892
+#, c-format
+msgid "Opening memos at %s"
+msgstr "%sରେ memos ଖୋଲ�ଅଛି"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+msgid "Print Memos"
+msgstr "Memos ମ�ଦ�ରଣ କରନ�ତ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#, fuzzy
+#| msgid "_Delete Message"
+msgid "_Delete Memo"
+msgstr "ସନ�ଦେଶ ବିଲୋପ କରନ�ତ� (_D)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#, fuzzy
+#| msgid "_Find in Message..."
+msgid "_Find in Memo..."
+msgstr "ସନ�ଦେଶ ମଧ�ଯରେ ଖୋଜନ�ତ� (_F)..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Search for text in the displayed memo"
+msgstr "ପ�ରଦର�ଶିତ ସନ�ଦେଶର ଶରୀରରେ ପାଠ�ୟ ଖୋଜନ�ତ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#, fuzzy
+#| msgid "_New Memo List"
+msgid "D_elete Memo List"
+msgstr "ନୂତନ ସ�ମାରକପତ�ର ତାଲିକା (_N)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#, fuzzy
+#| msgid "Delete selected memos"
+msgid "Delete the selected memo list"
+msgstr "ଚୟିତ ସ�ମାରକପତ�ରଗ�ଡ଼ିକ� ବିଲୋପ କରନ�ତ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
+msgid "_New Memo List"
+msgstr "ନୂତନ ସ�ମାରକପତ�ର ତାଲିକା (_N)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#, fuzzy
+#| msgid "Delete selected memos"
+msgid "Refresh the selected memo list"
+msgstr "ଚୟିତ ସ�ମାରକପତ�ରଗ�ଡ଼ିକ� ବିଲୋପ କରନ�ତ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Rename the selected memo list"
+msgstr "ପ�ନଃନାମ ଦିଅ ଚୟିତ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#, fuzzy
+#| msgid "Show _only this Memo List"
+msgid "Show _Only This Memo List"
+msgstr "କେବଳ �ହି ସ�ମାରକପତ�ର ତାଲିକାକ� ଦର�ଶାନ�ତ� (_o)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#, fuzzy
+#| msgid "_Preview"
+msgid "Memo _Preview"
+msgstr "ପ�ରାକ� ଦର�ଶନ (_P)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#, fuzzy
+#| msgid "Show preview pane"
+msgid "Show memo preview pane"
+msgstr "ପୂର�ବାଲୋକନ ଫଳକକ� ଦେଖାନ�ତ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show memo preview below the memo list"
+msgstr "ସନ�ଦେଶ ପ�ରାକଦର�ଶନକ� ସନ�ଦେଶ ତାଲିକା ତଳେ ଦର�ଶାନ�ତ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show memo preview alongside the memo list"
+msgstr "ସନ�ଦେଶ ପ�ରାକଦର�ଶନକ� ସନ�ଦେଶ ତାଲିକା ତଳେ ଦର�ଶାନ�ତ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+msgid "Print the list of memos"
+msgstr "ସ�ମାରକପତ�ର ତାଲିକାକ� ମ�ଦ�ରଣ କରନ�ତ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#, fuzzy
+#| msgid "Previews the list of memos to be printed"
+msgid "Preview the list of memos to be printed"
+msgstr "ମ�ଦ�ରଣ କରିବାକ� ଥିବା ସ�ମାରକ ପତ�ରଗ�ଡ଼ିକର ତାଲିକାର ପ�ରାକଦର�ଶନ"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:416
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d ସ�ମାରକପତ�ର"
+msgstr[1] "%d ସ�ମାରକପତ�ର"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-task-shell-view-private.c:569
+#, fuzzy, c-format
+#| msgid ", %d selected"
+#| msgid_plural ", %d selected"
+msgid "%d selected"
+msgstr ", %d ବଚ�ଛିତ"
+
+#: ../modules/calendar/e-memo-shell-view.c:223
+#, fuzzy
+#| msgid "_Delete Message"
+msgid "Delete Memos"
+msgstr "ସନ�ଦେଶ ବିଲୋପ କରନ�ତ� (_D)"
+
+#: ../modules/calendar/e-memo-shell-view.c:225
+#, fuzzy
+#| msgid "Delegate To"
+msgid "Delete Memo"
+msgstr "କ� ପ�ରତିନିଧି"
+
+#: ../modules/calendar/e-task-shell-backend.c:322
+msgctxt "New"
+msgid "_Task"
+msgstr "କାର�ଯ�ଯ (_T)"
+
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "ନ�ଯସ�ତ କରାଯାଇଥିବା କାର�ଯ�ଯ (_d)"
+
+#: ../modules/calendar/e-task-shell-backend.c:331
+msgid "Create a new assigned task"
+msgstr "ନୂତନ ପ�ରଦତ�ତ କାର�ଯ�ୟ ସୃଷ�ଟି କରନ�ତ�"
+
+#: ../modules/calendar/e-task-shell-backend.c:339
+#, fuzzy
+#| msgid "Task List"
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "କାର�ଯ�ଯ ତାଲିକା"
+
+#: ../modules/calendar/e-task-shell-backend.c:341
+#: ../modules/calendar/e-task-shell-view-actions.c:716
+msgid "Create a new task list"
+msgstr "ନୂତନ କାର�ଯ�ଯ ତାଲିକା ସୃଷ�ଟି କରନ�ତ�"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:222
+msgid "Loading tasks"
+msgstr "କାର�ଯ�ୟ ଧାରଣ କର�ଅଛି"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:587
+#, fuzzy
+#| msgid "Task Source Selector"
+msgid "Task List Selector"
+msgstr "କାର�ଯ�ୟ ଉତ�ସ ଚୟନକର�ତ�ତା"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-task-shell-sidebar.c:892
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "%s ଠାରେ କାର�ଯ�ୟ ଖୋଲ�ଅଛି"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+msgid "Print Tasks"
+msgstr "କାର�ଯ�ଯ ମ�ଦ�ରଣ କରନ�ତ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:554
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"�ହି ପ�ରୟୋଗଟି ସମ�ପୂର�ଣ�ଣ ହୋଇଥିବା ପରି ଚିହ�ନିତ ସମସ�ତ କାର�ଯ�ୟକ� ସବ�ଦିନ ପାଇ� ଲ�ପ�ତ କରିଦେବ। ଯଦି ଆପଣ ଅଗ�ରସର "
+"ହ�ଅନ�ତି, ତେବେ ଆପଣ �ହି କାର�ଯ�ୟଗ�ଡ଼ିକ� କାଢ଼ିବାରେ ସକ�ଷମ ହେବେ ନାହି�।।\n"
+"\n"
+"ପ�ରକୃତରେ �ହି କାର�ଯ�ୟଗ�ଡ଼ିକ� ଲିଭାନ�ତ�?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:679
+#, fuzzy
+#| msgid "_Delete"
+msgid "_Delete Task"
+msgstr "ଅପସାରଣ କରନ�ତ� (_D)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:686
+#, fuzzy
+#| msgid "_Find in Message..."
+msgid "_Find in Task..."
+msgstr "ସନ�ଦେଶ ମଧ�ଯରେ ଖୋଜନ�ତ� (_F)..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:688
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Search for text in the displayed task"
+msgstr "ପ�ରଦର�ଶିତ ସନ�ଦେଶର ଶରୀରରେ ପାଠ�ୟ ଖୋଜନ�ତ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:700
+#, fuzzy
+#| msgid "_Copy..."
+msgid "Copy..."
+msgstr "ନକଲ କରନ�ତ� (_C)..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:707
+#, fuzzy
+#| msgid "Select a Task List"
+msgid "D_elete Task List"
+msgstr "ଗୋଟି� କାର�ଯ�ୟସୂଚୀ ବାଛନ�ତ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:709
+#, fuzzy
+#| msgid "Delete selected tasks"
+msgid "Delete the selected task list"
+msgstr "ଚୟିତ କାର�ଯ�ୟଗ�ଡ଼ିକ� ବିଲୋପ କରନ�ତ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:714
+msgid "_New Task List"
+msgstr "ନୂତନ କାର�ଯ�ୟ ତାଲିକା (_N)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:730
+#, fuzzy
+#| msgid "Delete selected tasks"
+msgid "Refresh the selected task list"
+msgstr "ଚୟିତ କାର�ଯ�ୟଗ�ଡ଼ିକ� ବିଲୋପ କରନ�ତ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:737
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Rename the selected task list"
+msgstr "ପ�ନଃନାମ ଦିଅ ଚୟିତ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:742
+#, fuzzy
+#| msgid "Show _only this Task List"
+msgid "Show _Only This Task List"
+msgstr "କେବଳ �ହି କାର�ଯ�ୟ ତାଲିକାକ� ଦର�ଶାନ�ତ� (_o)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:756
+#, fuzzy
+#| msgid "_Mark as Incomplete"
+msgid "Mar_k as Incomplete"
+msgstr "ଅସମ�ପୂର�ଣ�ଣ ବୋଲି ଘୋଷିତ କରନ�ତ� (_M)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:786
+msgid "Delete completed tasks"
+msgstr "ସମ�ପୂର�ଣ�ଣ କାର�ଯ�ୟଗ�ଡ଼ିକ� ବିଲୋପ କରନ�ତ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:861
+msgid "Task _Preview"
+msgstr "କାର�ଯ�ଯକ� ପୂର�ବାବଲୋକନ କରନ�ତ� (_P)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:863
+#, fuzzy
+#| msgid "Show preview pane"
+msgid "Show task preview pane"
+msgstr "ପୂର�ବାଲୋକନ ଫଳକକ� ଦେଖାନ�ତ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:884
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show task preview below the task list"
+msgstr "ସନ�ଦେଶ ପ�ରାକଦର�ଶନକ� ସନ�ଦେଶ ତାଲିକା ତଳେ ଦର�ଶାନ�ତ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show task preview alongside the task list"
+msgstr "ସନ�ଦେଶ ପ�ରାକଦର�ଶନକ� ସନ�ଦେଶ ତାଲିକା ତଳେ ଦର�ଶାନ�ତ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:899
+msgid "Active Tasks"
+msgstr "ସକ�ରିୟ କାର�ଯ�ଯପନ�ଥା"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:913
+msgid "Completed Tasks"
+msgstr "ସମାପ�ତ ହୋଇଥିବା କାର�ଯ�ୟ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:920
+msgid "Next 7 Days' Tasks"
+msgstr "ପରବର�ତ�ତି 7 ଦିନର କାର�ଯ�ୟ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:927
+msgid "Overdue Tasks"
+msgstr "ସମୟାତିକ�ରାନ�ତ କାର�ଯ�ଯ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:934
+msgid "Tasks with Attachments"
+msgstr "ସଂଲଗ�ନଗ�ଡ଼ିକ ସହିତ କାର�ଯ�ୟ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:984
+msgid "Print the list of tasks"
+msgstr "କାର�ଯ�ଯର ତାଲିକାକ� ମୂଦ�ରଣ କରନ�ତ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:991
+#, fuzzy
+#| msgid "Previews the list of tasks to be printed"
+msgid "Preview the list of tasks to be printed"
+msgstr "ମୂଦ�ରଣ କରାଯିବା କାର�ଯ�ଯ ତାଲାକାର ପୂର�ବାବଲୋକନ କରନ�ତ�"
+
+#: ../modules/calendar/e-task-shell-view-private.c:463
+msgid "Expunging"
+msgstr "କାଟ�ଅଛି"
+
+#: ../modules/calendar/e-task-shell-view-private.c:565
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d କାର�ଯ�ୟ"
+msgstr[1] "%d କାର�ଯ�ୟ"
+
+#: ../modules/calendar/e-task-shell-view.c:351
+#, fuzzy
+#| msgid "Completed Tasks"
+msgid "Delete Tasks"
+msgstr "ସମାପ�ତ ହୋଇଥିବା କାର�ଯ�ୟ"
+
+#: ../modules/calendar/e-task-shell-view.c:353
+#, fuzzy
+#| msgid "Delegate To"
+msgid "Delete Task"
+msgstr "କ� ପ�ରତିନିଧି"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:333
+#, c-format
+msgid "%d attached messages"
+msgstr "%d ସଂଲଗ�ନିତ ସନ�ଦେଶ"
+
+#. Translators: "None" for a junk hook name,
+#. * when the junk plugin is not enabled.
+#: ../modules/mail/e-mail-junk-hook.c:89
+#, fuzzy
+#| msgid "None"
+msgctxt "mail-junk-hook"
+msgid "None"
+msgstr "କିଛି ନ�ହେ�"
+
+#: ../modules/mail/e-mail-shell-backend.c:164
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "ମେଲ ସନ�ଦେଶ (_M)"
+
+#: ../modules/mail/e-mail-shell-backend.c:166
+msgid "Compose a new mail message"
+msgstr "ନୂତନ ମେଲ ସନ�ଦେଶ ଲେଖନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-backend.c:174
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "ମେଲ ଫୋଲଡର (_F)"
+
+#: ../modules/mail/e-mail-shell-backend.c:176
+msgid "Create a new mail folder"
+msgstr "ନୂତନ ଡାକ ସୃଷ�ଟି କରନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-backend.c:195
+msgid "Mail Accounts"
+msgstr "ମେଲ ଖାତା"
+
+#: ../modules/mail/e-mail-shell-backend.c:203
+msgid "Mail Preferences"
+msgstr "ମେଲ ପସନ�ଦ"
+
+#: ../modules/mail/e-mail-shell-backend.c:211
+msgid "Composer Preferences"
+msgstr "ଲେଖକ ପସନ�ଦ"
+
+#: ../modules/mail/e-mail-shell-backend.c:219
+msgid "Network Preferences"
+msgstr "ନେଟୱର�କ ପସନ�ଦ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:814
+#: ../modules/mail/e-mail-shell-view.c:875
+#, fuzzy
+#| msgid "Disable Account"
+msgid "_Disable Account"
+msgstr "ଖାତାକ� ନିଷ�କ�ରିୟ କରନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:816
+#, fuzzy
+#| msgid "Disable Account"
+msgid "Disable this account"
+msgstr "ଖାତାକ� ନିଷ�କ�ରିୟ କରନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:823
+#, fuzzy
+#| msgid "Permanently remove all deleted messages from all folders"
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "ସମସ�ତ ଫୋଲଡରର� ସମସ�ତ ଅପସାରିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ସବ�ଦିନ ପାଇ� କାଢ଼ନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:828
+msgid "C_reate Search Folder From Search..."
+msgstr "ସନ�ଧାନର� ସନ�ଧାନ ଫୋଲଡର ସୃଷ�ଟିକରନ�ତ� (_r)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:835
+msgid "_Download Messages for Offline Usage"
+msgstr "ଅଫଲାଇନ ବ�ୟବହାର ବିଧି ପାଇ� ଆହରଣ କରନ�ତ� (_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:837
+#, fuzzy
+#| msgid "Download messages of accounts/folders marked for offline"
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr "ଅଫଲାଇନ ପାଇ� ଚିହ�ନିତ ଖାତା/ଫୋଲଡରଗ�ଡ଼ିକର ସନ�ଦେଶଗ�ଡ଼ିକ� ଆହରଣ କରନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:842
+msgid "Fl_ush Outbox"
+msgstr "ଫ�ଲାସ ଆଉଟବକ�ସ (_u)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:849
+msgid "_Copy Folder To..."
+msgstr "ଫୋଲଡର କ� ନକଲ କରନ�ତ� (_C)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:851
+msgid "Copy the selected folder into another folder"
+msgstr "ବଚ�ଛିତ ଫୋଲଡରକ� ଅନ�ୟ �କ ଫୋଲଡରରେ ନକଲ କରନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:858
+msgid "Permanently remove this folder"
+msgstr "�ହି ଫୋଲଡରକ� ସବ�ଦିନ ପାଇ� କାଢ଼ିଦିଅନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:863
+msgid "E_xpunge"
+msgstr "କାଟନ�ତ� (_x)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:865
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "�ହି ଫୋଲଡରର� ସମସ�ତ ଅପସାରିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ସବ�ଦିନ ପାଇ� କାଢ଼ିଦିଅନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:870
+msgid "Mar_k All Messages as Read"
+msgstr "ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଢ଼ାହୋଇଥିବା ପରି ଚିହ�ନଟ କରନ�ତ� (_k)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:872
+msgid "Mark all messages in the folder as read"
+msgstr "ସନ�ଦେଶ ମାନଙ�କ� ପଢିସାରିଲେ ବୋଲି ଚିହ�ନିତ କରନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:877
+msgid "_Move Folder To..."
+msgstr "ଫୋଲଡରକ� ଘ�ଞ�ଚାନ�ତ� (_M)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:879
+msgid "Move the selected folder into another folder"
+msgstr "ବଚ�ଛିତ ଫୋଲଡରକ� ଅନ�ୟ �କ ଫୋଲଡର ମଧ�ଯକ� ଘ�ଞ�ଚାନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:884
+msgid "_New..."
+msgstr "ନୂତନ (_N)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:886
+msgid "Create a new folder for storing mail"
+msgstr "ମେଲ ସଂରକ�ଷଣ ପାଇ� ନୂତନ ଫୋଲଡର ନିର�ମାଣ କରନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:893
+msgid "Change the properties of this folder"
+msgstr "�ହି ଫୋଲଡରର ଗ�ଣଧର�ମକ� ଲ�ଚାନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:900
+msgid "Refresh the folder"
+msgstr "ଫୋଲଡରକ� ସତେଜନ କରନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:907
+msgid "Change the name of this folder"
+msgstr "�ହି ଫୋଲଡରର ନାମକ� ଲ�ଚାନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:912
+msgid "Select Message _Thread"
+msgstr "ସନ�ଦେଶ ସ�ତାକ� ମନୋନୀତ କରନ�ତ� (_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:914
+msgid "Select all messages in the same thread as the selected message"
+msgstr "�କା ଥ�ରେଡ଼ରେ ଥିବା ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ବଚ�ଛିତ ସନ�ଦେଶ ପରି ଚୟନ କରନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:919
+msgid "Select Message S_ubthread"
+msgstr "ସନ�ଦେଶ ଉପ ଥ�ରେଡ଼କ� ବାଛନ�ତ� (_u)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:921
+msgid "Select all replies to the currently selected message"
+msgstr "ବର�ତ�ତମାନ ବଛାହୋଇଥିବା ସନ�ଦେଶରେ ସମସ�ତଙ�କ� ଉତ�ତର ଦିଅନ�ତ� ବିକଳ�ପକ� ଚୟନ କରନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:926
+msgid "_Unsubscribe"
+msgstr "ଅସ�ବୀକାରକ�ତି (_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:928
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Unsubscribe from the selected folder"
+msgstr "ପ�ନଃନାମ ଦିଅ ଚୟିତ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:933
+msgid "Empty _Trash"
+msgstr "ଆବର�ଜନା ପାତ�ରକ� ଖୋଲନ�ତ� (_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:935
+#, fuzzy
+#| msgid "Permanently remove all deleted messages from all folders"
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "ସମସ�ତ ଫୋଲଡରର� ସମସ�ତ ଅପସାରିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ସବ�ଦିନ ପାଇ� କାଢ଼ନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:940
+msgid "_New Label"
+msgstr "ନୂତନ ନାମପଟି"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:949
+#, fuzzy
+#| msgid "None"
+msgid "N_one"
+msgstr "କିଛି ନ�ହେ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:972
+msgid "Cancel the current mail operation"
+msgstr "ପ�ରଚଳିତ ମେଲ ପ�ରୟୋଗକ� ବାତିଲ କରନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:977
+msgid "Collapse All _Threads"
+msgstr "ସମସ�ତ ଥ�ରେଡ଼ଗ�ଡ଼ିକ� ଭାଙ�ଗନ�ତ� (_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:979
+msgid "Collapse all message threads"
+msgstr "ସମସ�ତ ସନ�ଦେଶ ଥ�ରେଡ଼ଗ�ଡ଼ିକ� ଭାଙ�ଗନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:984
+msgid "E_xpand All Threads"
+msgstr "ସମସ�ତ ସୂତ�ରକ� କାଟନ�ତ� (_x)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:986
+msgid "Expand all message threads"
+msgstr "ସମସ�ତ ସନ�ଦେଶ ସୂତ�ରକ� ବିସ�ତାରକରନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:991
+msgid "_Message Filters"
+msgstr "ସନ�ଦେଶ ଫିଲ�ଟରଗ�ଡିକ (_M)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:993
+msgid "Create or edit rules for filtering new mail"
+msgstr "ସୃଷ�ଟି କର କିମ�ବା ସମ�ପାଦନ କରନ�ତ� ପାଇ� ନୂତନ ଡାକ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:998
+msgid "Search F_olders"
+msgstr "ଫୋଲଡର ଖୋଜନ�ତ� (_o)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
+#, fuzzy
+#| msgid "Create or edit Search Folder definitions"
+msgid "Create or edit search folder definitions"
+msgstr "ସୃଷ�ଟି କର କିମ�ବା ସମ�ପାଦନ କରନ�ତ� ଖୋଜନ�ତ� ଫୋଲଡର"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
+msgid "_Subscriptions..."
+msgstr "କ�ରୟ (_S)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "ସ�ଦୂର ସର�ଭରଗ�ଡ଼ିକରେ ଥିବା ଫୋଲଡରଗ�ଡ଼ିକ� କିଣନ�ତ� ଅଥବା କିଣନ�ତ� ନାହି�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
+msgid "F_older"
+msgstr "ଫୋଲଡର (_o)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
+msgid "_Label"
+msgstr "ସୂଚକ (_L)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
+msgid "_New Folder..."
+msgstr "_ନୂତନ ଖ଼ାମ�..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
+msgid "Show Message _Preview"
+msgstr "ସନ�ଦେଶ ପୂର�ବଦୃଶ�ଯ ଦେଖାନ�ତ� (_P)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#, fuzzy
+#| msgid "Show message preview window"
+msgid "Show message preview pane"
+msgstr "ସନ�ଦେଶ ପ�ରାକଦର�ଶନ ୱିଣ�ଡୋ ଦର�ଶାନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#, fuzzy
+#| msgid "Hide _Deleted Messages"
+msgid "Show _Deleted Messages"
+msgstr "ବିଲୋପ ହୋଇଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ� ଲ�ଚାନ�ତ� (_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#, fuzzy
+#| msgid "Show deleted messages (with a strike-through) in the message-list."
+msgid "Show deleted messages with a line through them"
+msgstr "ସନ�ଦେଶ ତାଲିକାରେ ଅପସାରିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଦର�ଶାନ�ତ� (ରେଖାଙ�କନ ସହିତ)।"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
+msgid "_Group By Threads"
+msgstr "ସୂତ�ର ଦ�ବାରା ସମୂହ (_G)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
+#, fuzzy
+#| msgid "Threaded Message list"
+msgid "Threaded message list"
+msgstr "ସୂତ�ର ସନ�ଦେଶ ତାଲିକା"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
+msgid "Show message preview below the message list"
+msgstr "ସନ�ଦେଶ ପ�ରାକଦର�ଶନକ� ସନ�ଦେଶ ତାଲିକା ତଳେ ଦର�ଶାନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show message preview alongside the message list"
+msgstr "ସନ�ଦେଶ ପ�ରାକଦର�ଶନକ� ସନ�ଦେଶ ତାଲିକା ତଳେ ଦର�ଶାନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
+msgid "All Messages"
+msgstr "ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
+msgid "Important Messages"
+msgstr "ଗ�ର�ତ�ବପୂର�ଣ�ଣ ସନ�ଦେଶଗ�ଡ଼ିକ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
+msgid "Last 5 Days' Messages"
+msgstr "ଶେଷ 5 ଦିନର ସନ�ଦେଶ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
+msgid "Messages Not Junk"
+msgstr "Junk ହୋଇନଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
+msgid "Messages with Attachments"
+msgstr "ସଂଲଗ�ନକଗ�ଡ଼ିକ ସହିତ ସନ�ଦେଶ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
+msgid "No Label"
+msgstr "ନାହି� ନାମପଟି"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
+msgid "Read Messages"
+msgstr "ସନ�ଦେଶଗ�ଡ଼ିକ� ପଢନ�ତ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
+msgid "Recent Messages"
+msgstr "ପ�ରଚଳିତ ସନ�ଦେଶଗ�ଡ଼ିକ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
+msgid "Unread Messages"
+msgstr "ଅପଠିତ ସଂଦେଶଗ�ଡିକ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#, fuzzy
+#| msgid "Subject or Addresses contains"
+msgid "Subject or Addresses contain"
+msgstr "ବିଷୟ କିମ�ବା ଠିକଣା ଧାରଣ କରିଥା�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
+msgid "All Accounts"
+msgstr "ସମସ�ତ ଖାତା"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+msgid "Current Account"
+msgstr "ବର�ତ�ତମାନ ଖାତା"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+msgid "Current Folder"
+msgstr "ବର�ତ�ତମାନ ଫୋଲଡର"
+
+#: ../modules/mail/e-mail-shell-view-private.c:881
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d ଚୟିତ, "
+msgstr[1] "%d ଚୟିତ, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:892
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d ବିଲୋପ ହୋଇଛି"
+msgstr[1] "%d ବିଲୋପ ହୋଇଛି"
+
+#: ../modules/mail/e-mail-shell-view-private.c:898
+#: ../modules/mail/e-mail-shell-view-private.c:905
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d ଅଦରକାରୀ"
+msgstr[1] "%d ଅଦରକାରୀ"
+
+#: ../modules/mail/e-mail-shell-view-private.c:911
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d ଡ�ରାଫ�ଟ"
+msgstr[1] "%d ଡ�ରାଫ�ଟ"
+
+#: ../modules/mail/e-mail-shell-view-private.c:917
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d ପଠାହୋଇନାହି�"
+msgstr[1] "%d ପଠାହୋଇନାହି�"
+
+#: ../modules/mail/e-mail-shell-view-private.c:923
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d ପଠାହୋଇଛି"
+msgstr[1] "%d ପଠାହୋଇଛି"
+
+#: ../modules/mail/e-mail-shell-view-private.c:935
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d ଅପଠିତ, "
+msgstr[1] "%d ଅପଠିତ, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:938
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d ସର�ବମୋଟ"
+msgstr[1] "%d ସର�ବମୋଟ"
+
+#: ../modules/mail/e-mail-shell-view.c:548
+msgid "All Account Search"
+msgstr "ସମସ�ତ ଖାତା ସନ�ଧାନ"
+
+#: ../modules/mail/e-mail-shell-view.c:685
+msgid "Account Search"
+msgstr "ଖାତା ସନ�ଧାନ"
+
+#: ../modules/mail/e-mail-shell-view.c:873
+msgid "Proxy _Logout"
+msgstr "ପ�ରକ�ସି ଲଗଆଉଟ (_L)"
+
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "ସକ�ରିୟ"
+
+#: ../modules/mail/em-composer-prefs.c:476
+msgid "Language(s)"
+msgstr "ଭାଷା(ଗ�ଡ଼ିକ)"
+
+#: ../modules/mail/em-mailer-prefs.c:96
+msgid "Every time"
+msgstr "ପ�ରତ�ଯେକ ଥର"
+
+#: ../modules/mail/em-mailer-prefs.c:97
+msgid "Once per day"
+msgstr "ଦିନକ� ଥରେ"
+
+#: ../modules/mail/em-mailer-prefs.c:98
+msgid "Once per week"
+msgstr "ସପ�ତାହକ� ଥରେ"
+
+#: ../modules/mail/em-mailer-prefs.c:99
+msgid "Once per month"
+msgstr "ମାସକ� ଥରେ"
+
+#: ../modules/mail/em-mailer-prefs.c:224
+msgid "Add Custom Junk Header"
+msgstr "ଇଚ�ଛାରୂପଣ Junk ଶୀର�ଷକକ� ଯୋଡନ�ତ�"
+
+#: ../modules/mail/em-mailer-prefs.c:232
+msgid "Header Name:"
+msgstr "ଶୀର�ଷକ ନାମ:"
+
+#: ../modules/mail/em-mailer-prefs.c:233
+msgid "Header Value Contains:"
+msgstr "ଶୀର�ଷକ ମୂଲ�ଯ ରହିଅଛି:"
+
+#: ../modules/mail/em-mailer-prefs.c:333
+msgid "Header"
+msgstr "ଶୀର�ଷକ"
+
+#: ../modules/mail/em-mailer-prefs.c:337
+msgid "Contains Value"
+msgstr "ମୂଲ�ୟ ଧାରଣ କରିଥା�"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:801
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr "%s ପ�ଲଗଇନ ଉପଲବ�ଧ ଅଛି �ବଂ ବାଇନାରୀ ସ�ଥାପିତ ହୋଇଛି।"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:738 ../modules/mail/em-mailer-prefs.c:810
+#, c-format
+msgid "%s plugin is not available. Please check whether the package is installed."
+msgstr "%s ପ�ଲଗଇନ ଉପଲବ�ଧ ନାହି�। ଦୟାକରି ପ�ୟାକେଜଟି ସ�ଥାପିତ ହୋଇଛି କି ନାହି� ଯାଞ�ଚକରନ�ତ�।"
+
+#: ../modules/mail/em-mailer-prefs.c:774
+#, fuzzy
+#| msgid "No Junk plugin available"
+msgid "No junk plugin available"
+msgstr "କୌଣସି ଜଙ�କ ପ�ଲଗଇନ ଉପଲବ�ଧ ନାହି�"
+
+#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
+#: ../modules/mail/em-mailer-prefs.c:1161
+#, fuzzy
+#| msgid "Table header"
+msgid "_Date header:"
+msgstr "ସାରଣୀ ଶୀର�ଷକ"
+
+#: ../modules/mail/em-mailer-prefs.c:1162
+#, fuzzy
+#| msgid "Show _Original Size"
+msgid "Show _original header value"
+msgstr "ମୂଳ ଆକାରକ� ଦର�ଶାନ�ତ� (_O)"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Python ପ�ଲଗଇନ ଧାରଣକର�ତ�ତା ପରୀକ�ଷଣ"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python ପରୀକ�ଷଣ ପ�ଲଗଇନ"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Python EPlugin ଧାରଣକର�ତ�ତା ପାଇ� ପରୀକ�ଷଣ ପ�ଲଗଇନ।"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
@@ -14695,194 +16444,221 @@ msgid ""
 "body"
 msgstr "ସନ�ଦେଶ ବିଷୟବସ�ତ� ଦେଖିବାକ� ସଂଲଗ�ନ ସ�ମାରକ ପ�ଲଗଇନ ପାଇ� ସୂଚନା ତାଲିକା"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr "ସନ�ଦେଶ ବିଷୟବସ�ତ� ଦେଖିବାକ� ସଂଲଗ�ନ ସ�ମାରକ ପ�ଲଗଇନ ପାଇ� ସୂଚନା ତାଲିକା"
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:478
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "କିଶବ�ଦଗ�ଡିକ"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Attachment Reminder"
-msgstr "ସଂଲଗ�ନକ ସ�ମରଣକର�ତ�ତା"
-
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid "Reminds you when you forgot to add an attachment to a mail message."
-msgstr ""
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 msgstr ""
-"Evolution କିଛି ସୂଚକ ଶବ�ଦ ପାଇଅଛି ଯାହାକି ପ�ରସ�ଥାବ ଦେଇଥା� ଯେ �ହି ସନ�ଦେଶ "
-"ଗୋଟି� ସଂଲଗ�ନକ ଆବଶ�ୟକ କରିଥା�।"
+"Evolution କିଛି ସୂଚକ ଶବ�ଦ ପାଇଅଛି ଯାହାକି ପ�ରସ�ଥାବ ଦେଇଥା� ଯେ �ହି ସନ�ଦେଶ ଗୋଟି� ସଂଲଗ�ନକ ଆବଶ�ୟକ "
+"କରିଥା�।"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid "Message has no attachments"
 msgstr "ସନ�ଦେଶରେ କୌଣସି ସଂଲଗ�ନକ ନାହି�"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add attachment..."
 msgstr "ସଂଲଗ�ନକ ଯୋଗ କରନ�ତ� (_A)..."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "ସନ�ଦେଶ ସମ�ପାଦନକରନ�ତ� (_E)"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "ସଂଲଗ�ନକ ସ�ମରଣକର�ତ�ତା"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "ଗୋଟି� ମେଲ ସନ�ଦେଶରେ ସଂଲଗ�ନକ ଯୋଗ କରିବା ପାଇ� ଭ�ଲିଯାଇଥିଲେ ଆପଣଙ�କ� ମନେ ପକାଇଥା�।"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "Audio Inline"
-msgstr "ଧ�ବନି ଇନଲାଇନ"
+#, fuzzy
+#| msgid "Inline vCards"
+msgid "Inline Audio"
+msgstr "�କାଧିକ vCards"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly from Evolution."
+msgid "Play audio attachments directly in mail messages."
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "Evolution ନକଲ ସଂରକ�ଷଣ ଫାଇଲର ନାମ ବାଛନ�ତ�"
 
-#: ../plugins/backup-restore/backup-restore.c:168
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "ନକଲ ସଂରକ�ଷଣ ପରେ Evolutionକ� ପ�ନଃ ଚାଳନ କରନ�ତ� (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:191
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr "ପ�ନଃସ�ଥାପନ କରିବା ପାଇ� Evolution ନକଲ ସଂରକ�ଷଣ ଫାଇଲର ନାମ ଚୟନ କରନ�ତ�"
 
-#: ../plugins/backup-restore/backup-restore.c:215
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "Evolution ପରେ ପ�ନଃପ�ରାରମ�ଭ କରନ�ତ� (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:288
-msgid "Restore from backup"
-msgstr "ନକଲ ସଂରକ�ଷଣର� ପ�ନଃସ�ଥାପନ କରନ�ତ�"
-
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
+#, fuzzy
+#| msgid ""
+#| "You can restore Evolution from your backup. It can restore all the Mails, "
+#| "Calendars, Tasks, Memos, Contacts. \n"
+#| "It also restores all your personal settings, mail filters etc."
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
-"ଆପଣ ନକଲ ସଂରକ�ଷଣର� Evolution କ� ପ�ନଃସ�ଥାପନ କରିପାରିବେ। �ହା ସମସ�ତ ମେଲ, "
-"କ�ୟାଲେଣ�ଡର, କାର�ଯ�ୟ, ମେମୋ, ସମ�ପର�କକ� ପ�ନଃସ�ଥାପନ କରିଥା�। \n"
-"�ହା ଆପଣଙ�କର ସମସ�ତ ବ�ୟକ�ତିଗତ ସଂରଚନା, ମେଲ ଛାଣକ ଇତ�ୟାଦିକ� ପ�ନଃସ�ଥାପନ କରିଥା�।"
+"ଆପଣ ନକଲ ସଂରକ�ଷଣର� Evolution କ� ପ�ନଃସ�ଥାପନ କରିପାରିବେ। �ହା ସମସ�ତ ମେଲ, କ�ୟାଲେଣ�ଡର, କାର�ଯ�ୟ, "
+"ମେମୋ, ସମ�ପର�କକ� ପ�ନଃସ�ଥାପନ କରିଥା�। �ହା ଆପଣଙ�କର ସମସ�ତ ବ�ୟକ�ତିଗତ ସଂରଚନା, ମେଲ ଛାଣକ ଇତ�ୟାଦିକ� "
+"ପ�ନଃସ�ଥାପନ କରିଥା�।"
 
-#: ../plugins/backup-restore/backup-restore.c:296
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "Evolutionକ� ନକଲସଂରକ�ଷଣ ଫାଇଲର� ପ�ନଃସ�ଥାପନ କରିଥା� (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:303
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "ଦୟାକରି ପ�ନଃସ�ଥାପନ କରିବା ପାଇ� ଗୋଟି� Evolution ଆଲେଖୀ ବାଛନ�ତ�:"
 
-#: ../plugins/backup-restore/backup-restore.c:306
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "ପ�ନଃସ�ଥାପନ କରିବା ପାଇ� ଗୋଟି� ଫାଇଲ ବାଛନ�ତ�"
 
-#: ../plugins/backup-restore/backup.c:62
+#: ../plugins/backup-restore/backup-restore.c:323
+msgid "Restore from backup"
+msgstr "ନକଲ ସଂରକ�ଷଣର� ପ�ନଃସ�ଥାପନ କରନ�ତ�"
+
+#: ../plugins/backup-restore/backup-restore.c:361
+#, fuzzy
+#| msgid "_Backup Settings..."
+msgid "_Backup Evolution Settings..."
+msgstr "ନକଲ ସଂରକ�ଷଣ ବିନ�ୟାସ (_B)..."
+
+#: ../plugins/backup-restore/backup-restore.c:363
+#, fuzzy
+#| msgid "Backup and restore Evolution data and settings"
+msgid "Backup Evolution data and settings to an archive file"
+msgstr "Evolution ତଥ�ୟ �ବଂ ସଂରଚନାଗ�ଡ଼ିକ� ନକଲ ସଂରକ�ଷଣ �ବଂ ପ�ନଃସ�ଥାପନ କରନ�ତ�"
+
+#: ../plugins/backup-restore/backup-restore.c:368
+#, fuzzy
+#| msgid "R_estore Settings..."
+msgid "R_estore Evolution Settings..."
+msgstr "ବିନ�ୟାସଗ�ଡ଼ିକ� ପ�ନଃସ�ଥାପନ କରନ�ତ� (_e)..."
+
+#: ../plugins/backup-restore/backup-restore.c:370
+#, fuzzy
+#| msgid "Backup and restore Evolution data and settings"
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "Evolution ତଥ�ୟ �ବଂ ସଂରଚନାଗ�ଡ଼ିକ� ନକଲ ସଂରକ�ଷଣ �ବଂ ପ�ନଃସ�ଥାପନ କରନ�ତ�"
+
+#: ../plugins/backup-restore/backup.c:63
 msgid "Backup Evolution directory"
 msgstr "ନକଲ ସଂରକ�ଷଣ Evolution ଡିରେକ�ଟୋରୀ"
 
-#: ../plugins/backup-restore/backup.c:64
+#: ../plugins/backup-restore/backup.c:65
 msgid "Restore Evolution directory"
 msgstr "Evolution ଡିରେକ�ଟୋରୀକ� ପ�ନଃସ�ଥାପନ କରନ�ତ�"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:67
 msgid "Check Evolution Backup"
 msgstr "Evolution ନକଲ ସଂରକ�ଷଣକ� ଯାଞ�ଚକରନ�ତ�"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:69
 msgid "Restart Evolution"
 msgstr "Evolutionକ� ପ�ନଃପ�ରାରମ�ଭ କରନ�ତ�"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:71
 msgid "With Graphical User Interface"
 msgstr "ଆଲେଖି ଚାଳକ ଅନ�ତରାପୃଷ�ଠ ସହିତ"
 
-#: ../plugins/backup-restore/backup.c:187
-#: ../plugins/backup-restore/backup.c:235
+#: ../plugins/backup-restore/backup.c:189
+#: ../plugins/backup-restore/backup.c:251
 msgid "Shutting down Evolution"
 msgstr "Evolution ବିଷୟରେ ସୂଚନା ପ�ରଦର�ଶନ କରନ�ତ�"
 
-#: ../plugins/backup-restore/backup.c:194
+#: ../plugins/backup-restore/backup.c:196
 msgid "Backing Evolution accounts and settings"
 msgstr "Evolutionର ବିନ�ଯାସକ� ପରିବର�ତ�ତନ କରନ�ତ�"
 
-#: ../plugins/backup-restore/backup.c:200
+#: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Evolution ତଥ�ୟକ� ନକଲ ସଂରକ�ଷଣ କର�ଅଛି (ମେଲ, ସମ�ପର�କ, କ�ୟାଲେଣ�ଡର, କାର�ଯ�ୟ, ମେମୋ)"
 
-#: ../plugins/backup-restore/backup.c:211
+#: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
 msgstr "ନକଲସଂରକ�ଷଣ ସମ�ପୂର�ଣ�ଣ"
 
-#: ../plugins/backup-restore/backup.c:216
-#: ../plugins/backup-restore/backup.c:269
+#: ../plugins/backup-restore/backup.c:218
+#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:285
 msgid "Restarting Evolution"
 msgstr "Evolution କ� ପ�ନଃପ�ରାରମ�ଭ କର�ଅଛି"
 
-#: ../plugins/backup-restore/backup.c:239
-msgid "Backup current Evolution data"
+#: ../plugins/backup-restore/backup.c:255
+#, fuzzy
+#| msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
 msgstr "ସାମ�ପ�ରତିକ Evolution ତଥ�ୟର ନକଲ ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../plugins/backup-restore/backup.c:244
+#: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
 msgstr "ନକଲ ସଂରକ�ଷଣର� ଫାଇଲଗ�ଡ଼ିକ� କାଢ଼�ଅଛି"
 
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:267
 msgid "Loading Evolution settings"
 msgstr "Evolutionର ବିନ�ଯାସକ� ପରିବର�ତ�ତନ କରନ�ତ�"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:274
 msgid "Removing temporary backup files"
 msgstr "ଅସ�ଥାୟୀ ନକଲ ସଂରକ�ଷଣ ଫାଇଲଗ�ଡ଼ିକ� କାଢ଼�ଅଛି"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:281
 msgid "Ensuring local sources"
 msgstr "ସ�ଥାନୀୟ ଉତ�ସଗ�ଡ଼ିକ� ନିଶ�ଚିତ କର�ଅଛି"
 
-#: ../plugins/backup-restore/backup.c:386
+#: ../plugins/backup-restore/backup.c:428
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "ଫୋଲଡର %sକ� ନକଲ ସଂରକ�ଷଣ କର�ଅଛି"
 
-#: ../plugins/backup-restore/backup.c:391
+#: ../plugins/backup-restore/backup.c:433
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "ଫୋଲଡ଼ର %sର� ପ�ନଃସ�ଥାପନ କର�ଅଛି"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:411
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Evolution ଠିକଣା ପ�ସ�ତିକା"
 
-#: ../plugins/backup-restore/backup.c:411
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Evolution ଠିକଣା ପ�ସ�ତିକା"
 
-#: ../plugins/backup-restore/backup.c:446
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "Evolution ତଥ�ୟକ� ନକଲ ସଂରକ�ଷଣ କର�ଅଛି"
 
-#: ../plugins/backup-restore/backup.c:447
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Evolution ଆପଣଙ�କର ତଥ�ୟର ନକଲ ସଂରକ�ଷଣ କରିବା ସମୟରେ ଦୟାକରି ଅପେକ�ଷା କରନ�ତ�।"
 
-#: ../plugins/backup-restore/backup.c:449
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "Evolution ତଥ�ୟକ� ପ�ନଃସ�ଥାପନ କର�ଅଛି"
 
-#: ../plugins/backup-restore/backup.c:450
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Evolution ଆପଣଙ�କର ତଥ�ୟକ� ପ�ନଃସ�ଥାପନ କରିବା ସମୟରେ ଦୟାକରି ଅପେକ�ଷା କରନ�ତ�।"
 
-#: ../plugins/backup-restore/backup.c:468
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "ଆପଣଙ�କର ଖାତାରେ କେତେ ତଥ�ୟ ଅଛି ତାହା ଉପରେ ନିର�ଭର କରି �ହା କିଛି ସମୟ ନେଇପାରେ।"
 
@@ -14945,47 +16721,37 @@ msgstr ""
 "ପ�ନଃସ�ଥାପନ କରିବା ପୂର�ବର� Evolution ସ�ୱୟଂଚାଳିତ ଭାବରେ ପ�ନଃଚାଳନ ହେବ, ଦୟାକରି ଅଦଳବଦଳ ବଟନକ� "
 "ସକ�ରିୟ କରନ�ତ�।"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup and restore Evolution data and settings"
-msgstr "Evolution ତଥ�ୟ �ବଂ ସଂରଚନାଗ�ଡ଼ିକ� ନକଲ ସଂରକ�ଷଣ �ବଂ ପ�ନଃସ�ଥାପନ କରନ�ତ�"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-msgid "R_estore Settings..."
-msgstr "ବିନ�ୟାସଗ�ଡ଼ିକ� ପ�ନଃସ�ଥାପନ କରନ�ତ� (_e)..."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "_Backup Settings..."
-msgstr "ନକଲ ସଂରକ�ଷଣ ବିନ�ୟାସ (_B)..."
-
-#: ../plugins/bbdb/bbdb.c:624 ../plugins/bbdb/bbdb.c:633
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "ସ�ବଯଂଚାଳିତ ଯୋଗାଯୋଗ"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:648
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "ମେଲ ପଠାଇବା ସମୟରେ ଠିକଣା ପ�ସ�ତକ ନିର�ମାଣ କରନ�ତ� (_a)"
 
-#: ../plugins/bbdb/bbdb.c:654
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "ସ�ବୟଂଚାଳିତ ଯୋଗାଯୋଗ ପାଇ� ଠିକଣା ପ�ସ�ତକ ବାଛନ�ତ�"
 
-#: ../plugins/bbdb/bbdb.c:669
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "ତ�ରନ�ତ ସନ�ଦେଶ ପ�ରବାହ ଯୋଗାଯୋଗ"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:684
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+#, fuzzy
+#| msgid "Synchronize contact info and images from Pidgin buddy list"
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "Pidgin ସାଥି ତାଲିକାର� ଯୋଗାଯୋଗ ସୂଚନା �ବଂ ପ�ରତିଛବିଗ�ଡ଼ିକ� ସମକାଳୀନ କରନ�ତ�"
 
-#: ../plugins/bbdb/bbdb.c:690
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Pidgin ସାଥି ତାଲିକା ପାଇ� ଠିକଣା ବହି ମନୋନୀତ କରନ�ତ�"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:701
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "ସାଥି ତାଲିକା ସହିତ ବର�ତ�ତମାନ ସମକାଳୀନ କରନ�ତ� (_b)"
 
@@ -15001,29 +16767,38 @@ msgid ""
 "reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
+"ଆପଣଙ�କର ଠିକଣା ବହିକ� ପରିଚାଳନା କରିବା ପାଇ� gruntwork କ� ବାହରକ� ନେଇଥା�।\n"
+"\n"
+"ସ�ୱୟଂଚାଳିତ ଭାବରେ ଆପଣଙ�କର ଠିକଣାବହିକ� ନାମ �ବଂ ଇମେଲ ଠିକଣାଗ�ଡ଼ିକ ସହିତ ପ�ରଣ କରିଥା�, ଯେପରି ଆପଣ "
+"ସନ�ଦେଶର ଉତ�ତର ଦେଇଥାନ�ତି। �ବଂ ମଧ�ଯ IM ସମ�ପର�କରେ ସୂଚନାକ� ଆପଣଙ�କର ସାଥୀ ତାଲିକାର� ପ�ରଣ କରିଥା�।"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
+#, c-format
+msgid "Bogofilter is not available. Please install it first."
+msgstr ""
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "%sକ� ସ�ପନିଙ�ଗ କରିବା ସମୟରେ ତ�ର�ଟି ଘଟିଥିଲା: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogoଛାଣକ ନିମ�ନସ�ତରର ପଦ�ଧତି ଉତ�ତର ଦି� ନାହି�, ରଦ�ଦକର�ଅଛି..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Bogoଛାଣକ ନିମ�ନସ�ତର ବାଧାପ�ରାପ�ତ ପାଇ� ଅପେକ�ଷା କରନ�ତ�, ବନ�ଦ କର�ଅଛି..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Bogoଛାଣକ ପାଇ� ପାଇପ ବିଫଳ ହୋଇଛି, ତ�ର�ଟି ସଂକେତ: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
 msgid "Convert message text to _Unicode"
 msgstr "ସନ�ଦେଶ ପାଠ�ଯକ� ୟ�ନିକୋଡରେ ରୂପାନ�ତର କରନ�ତ� (_U)"
 
@@ -15049,137 +16824,326 @@ msgstr "Bogofilter ବିକଳ�ପଗ�ଡିକ"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Bogofilter ବ�ୟବହାର କରି ଜଙ�କ ସନ�ଦେଶଗ�ଡ଼ିକ� ଛାଣନ�ତ�।"
 
-#: ../plugins/caldav/caldav-source.c:64
+#: ../plugins/caldav/caldav-browse-server.c:197
+msgid "Authentication failed. Server requires correct login."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:199
+msgid "Given URL cannot be found."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:203
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "ଅଜଣା ତ�ର�ଟି"
+
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
+#, fuzzy
+#| msgid "Failed to update delegates:"
+msgid "Failed to parse server response."
+msgstr "ପ�ରତିନିଧକ� ଅଦ�ଯତିତ କରିବାରେ ବିଫଳ:"
+
+#: ../plugins/caldav/caldav-browse-server.c:427
+#, fuzzy
+#| msgid "Ends"
+msgid "Events"
+msgstr "ସମାପ�ତ ହ��"
+
+#: ../plugins/caldav/caldav-browse-server.c:449
+#, fuzzy
+#| msgid "New calendar"
+msgid "User's calendars"
+msgstr "ନୂତନ କ�ଯାଲେଣ�ଡର"
+
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
+#, fuzzy
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Failed to get server URL."
+msgstr "LDAP ସେବକ ସହିତ ବୈଧିକରଣ କରିବା ସମୟରେ ତ�ର�ଟି।"
+
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
+msgid "Searching for user's calendars..."
+msgstr ""
+"\n"
+"\n"
+"ସମ�ପର�କଗ�ଡ଼ିକ� ଖୋଜ�ଅଛି..."
+
+#: ../plugins/caldav/caldav-browse-server.c:665
+#, fuzzy
+#| msgid "Unable to find any calendars"
+msgid "Could not find any user calendar."
+msgstr "କୌଣସି କ�ୟାଲେଣ�ଡରକ� ଖୋଜିବାରେ ଅସମର�ଥ"
+
+#: ../plugins/caldav/caldav-browse-server.c:794
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:796
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:801
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for user %s on server %s"
+msgstr "%s (%s ଚାଳକ) ପାଇ� ପ�ରବେଶ ସଙ�କେତ ଭରଣ କରନ�ତ�"
+
+#: ../plugins/caldav/caldav-browse-server.c:860
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot create output file: %s:\n"
+#| " %s"
+msgid "Cannot create soup message for URL '%s'"
+msgstr ""
+"ଫଳାଫଳ ଫାଇଲ ନିର�ମାଣ କରିପାରିବେ ନାହି�: %s:\n"
+" %s"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1095
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
+msgid "Searching folder content..."
+msgstr ""
+"\n"
+"\n"
+"ସମ�ପର�କଗ�ଡ଼ିକ� ଖୋଜ�ଅଛି..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1138
+#, fuzzy
+#| msgid "Local Calendars"
+msgid "List of available calendars:"
+msgstr "ସ�ଥାନୀୟ କ�ୟାଲେଣ�ଡରଗ�ଡ଼ିକ"
+
+#: ../plugins/caldav/caldav-browse-server.c:1175
+#, fuzzy
+#| msgid "Sort"
+msgid "Supports"
+msgstr "ସଜାଡନ�ତ�"
+
+#: ../plugins/caldav/caldav-browse-server.c:1254
+#, fuzzy, c-format
+#| msgid "Failed to create pipe: %s"
+msgid "Failed to create thread: %s"
+msgstr "ପାଇପ ନିର�ମାଣ କରିବାରେ ବିଫଳ: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1362
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1368
+msgid "Browse for a CalDAV calendar"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:366
-#: ../plugins/calendar-http/calendar-http.c:171
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "ୟ�.ଆର.�ଲ. (_U):"
 
-#: ../plugins/caldav/caldav-source.c:390
-#: ../plugins/google-account-setup/google-source.c:606
-#: ../plugins/google-account-setup/google-contacts-source.c:303
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "SSL ବ�ଯବହାର କରନ�ତ� (_S)"
 
-#. add refresh option
-#: ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/caldav/caldav-source.c:235
+msgid "Brows_e server for a calendar"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
 #: ../plugins/google-account-setup/google-source.c:630
-#: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "ସତେଜନ କରନ�ତ� (_f):"
 
-#: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:656
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-msgid "weeks"
-msgstr "ସପ�ତାହ"
-
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "Add CalDAV support to Evolution."
-msgstr ""
+msgstr "Evolution ରେ CalDAV ସମର�ଥନ ଯୋଗ କରନ�ତ�।"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
 msgid "CalDAV Support"
-msgstr ""
+msgstr "CalDAV ସମର�ଥନ"
+
+#: ../plugins/calendar-file/calendar-file.c:125
+#, fuzzy
+#| msgid "Customize"
+msgid "_Customize options"
+msgstr "ଇଚ�ଛାରୂପଣ ବିକଳ�ପଗ�ଡ଼ିକ (_C)"
+
+#: ../plugins/calendar-file/calendar-file.c:144
+#, fuzzy
+#| msgid "F_ilename:"
+msgid "File _name:"
+msgstr "ଫାଇଲ ନାମ (_n):"
+
+#: ../plugins/calendar-file/calendar-file.c:148
+#, fuzzy
+#| msgid "Choose a file"
+msgid "Choose calendar file"
+msgstr "କ�ୟାଲେଣ�ଡର ଫାଇଲ ବାଛନ�ତ�"
+
+#: ../plugins/calendar-file/calendar-file.c:196
+#, fuzzy
+#| msgid "Open"
+msgid "On open"
+msgstr "ଖୋଲାଥିବା ସମୟରେ"
+
+#: ../plugins/calendar-file/calendar-file.c:197
+msgid "On file change"
+msgstr "ଫାଇଲ ପରିବର�ତ�ତନ ସମୟରେ"
+
+#: ../plugins/calendar-file/calendar-file.c:198
+#, fuzzy
+#| msgid "Personal"
+msgid "Periodically"
+msgstr "ଆବଧିକ"
+
+#: ../plugins/calendar-file/calendar-file.c:213
+msgid "Force read _only"
+msgstr "କେବଳ ପଠନୀୟକ� ବାଧ�ଯକରନ�ତ� (_o)"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Add local calendars to Evolution."
-msgstr ""
+msgstr "Evolution ରେ ସ�ଥାନୀୟ କ�ୟାଲେଣ�ଡରକ� ଯୋଗକରନ�ତ�।"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Local Calendars"
 msgstr "ସ�ଥାନୀୟ କ�ୟାଲେଣ�ଡରଗ�ଡ଼ିକ"
 
-#: ../plugins/calendar-http/calendar-http.c:369
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "ସ�ରକ�ଷିତ ସଂଯୋଗ (_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:455
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "ଚାଳକ ନାମ (_m):"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "Add web calendars to Evolution."
-msgstr ""
+msgstr "Evolution ରେ ୱେବ କ�ୟାଲେଣ�ଡରଗ�ଡ଼ିକ� ଯୋଗକରନ�ତ�।"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Web Calendars"
 msgstr "ୱେବ କ�ୟାଲେଣ�ଡରଗ�ଡ଼ିକ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "ପାଣିପାଗ: କ�ହ�ଡି"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "ପାଣିପାଗ: ମେଘ�ଆ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
 msgstr "ପାଣିପାଗ: ମେଘ�ଆ ରାତ�ରି"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
 msgstr "ପାଣିପାଗ: ଘଡଘଡି ସହ ବର�ଷା"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
 msgstr "ପାଣିପାଗ: �ିପି�ିପି ବର�ଷା"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "ପାଣିପାଗ: ବରଫ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "ପାଣିପାଗ: ଖରାପାଗ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
 msgstr "ପାଣିପାଗ: ସଫା ରାତ�ରି"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "ପାଣିପାଗ: ଘଡଘଡି ସହ ବର�ଷା"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "ଗୋଟି� ସ�ଥାନ ମନୋନୀତ କରନ�ତ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:606
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
+#, fuzzy
+#| msgid "None"
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "କିଛି ନ�ହେ�"
+
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "�କକ (_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:613
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metric (ସେଲ�ସିଅସ, ସେମି, ଇତ�ୟାଦି)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:614
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "ଇମ�ପେରୀୟାଲ (ଫାରେନହାଇଟ, ଇଞ�ଚ�ସ, ଇତ�ୟାଦି)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
 msgid "Add weather calendars to Evolution."
-msgstr ""
+msgstr "Evolution ରେ ପାଣିପାଗ କ�ୟାଲେଣ�ଡରଗ�ଡ଼ିକ� ଯୋଗ କରନ�ତ�।"
 
 #: ../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 "Copy Tool"
-msgstr "ଉପକରଣ ନକଲ କରନ�ତ�"
+#: ../plugins/contacts-map/contacts-map.c:55
+#: ../plugins/contacts-map/contacts-map.c:201
+#, fuzzy
+#| msgid "Contacts: "
+msgid "Contacts map"
+msgstr "ଯୋଗାଯୋଗ: %s"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy things to the clipboard."
-msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� କ�ଲିପବୋର�ଡରେ ନକଲ କରନ�ତ�"
+#: ../plugins/contacts-map/contacts-map.c:56
+#, fuzzy
+#| msgid "Send a message to the selected contacts"
+msgid "Show a map of all the contacts"
+msgstr "ବଚ�ଛିତ ସମ�ପର�କ ମାନଙ�କ� ସନ�ଦେଶ ପଠାନ�ତ�"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
+msgstr ""
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+#, fuzzy
+#| msgid "No contacts"
+msgid "Map for contacts"
+msgstr "କୌଣସି ସମ�ପର�କ ନାହି�"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -15201,24 +17165,25 @@ msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ମେଲ ଗ�ରା
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Evolutionକ� ଆପଣଙ�କର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଇ-ମେଲ ଗ�ରହକ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:601
-msgid "Evolution"
-msgstr "କ�ରମବିକାଶ "
-
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ ଠିକଣା ପ�ସ�ତିକାକ� ଚିହ�ନିତ କରନ�ତ� (_d)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:96
+#, fuzzy
+#| msgid "Show autocompleted name with an address"
+msgid "A_utocomplete with this address book"
+msgstr "ଠିକଣା ସହିତ ସ�ୱୟଂ ସମ�ପୂର�ଣ�ଣ ନାମକ� ଦର�ଶାନ�ତ�"
+
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ କ�ୟାଲେଣ�ଡର ଭାବରେ ଚିହ�ନିତ କରନ�ତ� (_d)"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ କାର�ଯ�ୟ ତାଲିକା ପରି ଚିହ�ନଟ କରନ�ତ� (_)"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ସ�ମାରକପତ�ର ତାଲିକା ପରି ଚିହ�ନଟ କରନ�ତ� (_d)"
 
@@ -15228,43 +17193,58 @@ msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ଉତ�ସ"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid "Mark your preferred address book and calendar as default."
+msgstr "ଆପଣଙ�କର ମନପସନ�ଦ ଠିକଣା ବହି �ବଂ କ�ୟାଲେଣ�ଡରକ� ପୂର�ବନିର�ଦ�ଧାରିତ ଭାବରେ ଚିହ�ନଟ କରନ�ତ�।"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "ଇଚ�ଛାରୂପଣ ଶୀର�ଷକଗ�ଡିକର ତାଲିକା"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
+"ଇଚ�ଛାମ�ତାବକ ଶୀର�ଷକ ଯାହାକ�କି ଆପଣ ଯାଉଥିବା ସନ�ଦେଶରେ ବ�ୟବହାର କରିପାରିବେ। ଗୋଟି� ଶୀର�ଷକ �ବଂ "
+"ଶୀର�ଷକ ମୂଲ�ୟକ� ଉଲ�ଲେଖ କରିବା ପାଇ�: ଇଚ�ଛାରୂପଣ ଶୀର�ଷକର ନାମ �ବଂ ତାପରେ \"=\" �ବଂ \";\" "
+"ଦ�ୱାରା ପୃଥକ ହୋଇଥିବା ମୂଲ�ୟ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
 msgstr "ସ�ରକ�ଷା:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:321
 msgid "Unclassified"
 msgstr "ଅବର�ଗୀକ�ର�ତ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgid "Protected"
 msgstr "ସ�ରକ�ଷିତ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "Secret"
 msgstr "ଗ�ପ�ତ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgid "Top secret"
 msgstr "ଅତି ଗୋପନୀୟ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
+#. indicating the header will not be added to a mail message
+#: ../plugins/email-custom-header/email-custom-header.c:379
+#, fuzzy
+#| msgid "None"
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "କିଛି ନ�ହେ�"
+
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "ଶୀର�ଷକକ� ଇଚ�ଛାରୂପଣ କରନ�ତ� (_C)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:907
-msgid "Key"
-msgstr "କି"
-
-#: ../plugins/email-custom-header/email-custom-header.c:918
-#: ../plugins/templates/templates.c:396
-msgid "Values"
-msgstr "ମୂଲ�ଯଗ�ଡିକ"
-
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -15272,9 +17252,14 @@ msgstr ""
 "ଗୋଟି� ଇଚ�ଛାମ�ତାବକ ଶୀର�ଷକ କି ମୂଲ�ୟ ଭାବରେ ଉଲ�ଲେଖ କରିବା ପାଇ� ସଜଡ଼ାଯାଇଥା�:\n"
 "\";\" ଦ�ୱାରା ପୃଥକ ହୋଇଥିବା ଇଚ�ଛାରୂପଣ ଶୀର�ଷକ କି ମୂଲ�ୟଗ�ଡ଼ିକ।"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Email Custom Header"
-msgstr "ଇ-ଡାକ ଇଚ�ଛାରୂପଣ ଶୀର�ଷକ"
+#: ../plugins/email-custom-header/email-custom-header.c:950
+msgid "Key"
+msgstr "କି"
+
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
+msgid "Values"
+msgstr "ମୂଲ�ଯଗ�ଡିକ"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
@@ -15285,976 +17270,18 @@ msgstr "ଯାଉଥିବା ସନà­�ଦେଶରେ ଇଚà­�ଛାରୂପà
 msgid "Custom Header"
 msgstr "ଶୀର�ଷକକ� ଇଚ�ଛାରୂପଣ କରନ�ତ�"
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "ଇଚ�ଛାରୂପଣ ଶୀର�ଷକଗ�ଡିକର ତାଲିକା"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"ଇଚ�ଛାମ�ତାବକ ଶୀର�ଷକ ଯାହାକ�କି ଆପଣ ଯାଉଥିବା ସନ�ଦେଶରେ ବ�ୟବହାର କରିପାରିବେ। "
-"ଗୋଟି� ଶୀର�ଷକ �ବଂ ଶୀର�ଷକ ମୂଲ�ୟକ� ଉଲ�ଲେଖ କରିବା ପାଇ�: ଇଚ�ଛାରୂପଣ ଶୀର�ଷକର ନାମ �ବଂ "
-"ତାପରେ \"=\" �ବଂ \";\" ଦ�ୱାରା ପୃଥକ ହୋଇଥିବା ମୂଲ�ୟ"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "ଅନ�ଯ ଚାଳକ ଫୋଲଡରକ� ଖୋଲନ�ତ�"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-msgid "_Account:"
-msgstr "ହିସାବ ଖାତା (_A):"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "ଫୋଲଡର ନାମ (_F):"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-msgid "_User:"
-msgstr "ଚାଳକ (_U):"
-
-#. 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 ""
-"�ହି ବିକଳ�ପଟି Exchange ସର�ଭର ସହିତ ସ�ରକ�ଷିତ ପ�ରବେଶ ସଂକେତ (NTLM) ବୈଧିକରଣ ବ�ୟବହାର କରି ସଂଯୋଗ "
-"କରିଥା�।"
-
-#: ../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 ""
-"�ହି ବିକଳ�ପଟି Exchange ସର�ଭର ସହିତ ମାନକ ସରଳ ପାଠ�ୟ ପ�ରବେଶ ସଂକେତ ବୈଧିକରଣ ବ�ୟବହାର କରି ସଂଯୋଗ "
-"କରିଥା�।"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
-msgid "Out Of Office"
-msgstr "କାର�ଯ�ଯାଳୟ ବାହାରେ"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
-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 ""
-"ନିମ�ନରେ ଉଲ�ଲେଖ କରାଯାଇଥିବା ସନ�ଦେଶ ସ�ୱୟଂଚାଳିତ ଭାବରେ ପ�ରତ�ୟେକ ବ�ୟକ�ତିଙ�କ ପାଖକ� ପଠାଯାଇଥା� \n"
-"ଯେଉ�ମାନେ ଆପଣଙ�କ ପାଖକ� କାର�ଯ�ୟାଳୟ ବାହାର� ମେଲ ପଠାଇଥାଆନ�ତି।"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
-msgid "I am out of the office"
-msgstr "ମ�� କାର�ଯ�ୟାଳୟ ବାହାରେ ଅଛି"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
-msgid "I am in the office"
-msgstr "ମ�� କାର�ଯ�ୟାଳୟରେ ଅଛି"
-
-#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
-msgid "Change the password for Exchange account"
-msgstr "ପରିବର�ତ�ତନ ଖାତା ପାଇ� ପ�ରବେଶ ସଂକେତକ� ପରିବର�ତ�ତନ କରନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-msgid "Change Password"
-msgstr "ଗ�ପ�ତଶବ�ଦ ବଦଳାଅ"
-
-#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
-msgid "Manage the delegate settings for Exchange account"
-msgstr "ବିନିମୟ ଖାତା ପାଇ� ପ�ରତିନିଧି ବିନ�ୟାସକ� ପରିଚାଳନା କରନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
-msgid "Delegation Assistant"
-msgstr "ସହକାରୀ ପ�ରତିନିଧିତ�ୱ"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
-msgid "Miscelleneous"
-msgstr "ବିବିଧ"
-
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
-msgid "View the size of all Exchange folders"
-msgstr "ସମସ�ତ ପରିବର�ତ�ତନ ଫୋଲଡରଗ�ଡ଼ିକର ଆକାର ଦେଖନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
-msgid "Folders Size"
-msgstr "ଫୋଲଡର ଆକାର"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-msgid "Exchange Settings"
-msgstr "ବିନିମୟ ବିନ�ଯାସ"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
-msgid "_OWA URL:"
-msgstr "_OWA ୟ�.ଆର.�ଲ.:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
-msgid "A_uthenticate"
-msgstr "ବୈଧିକୃତ କରନ�ତ� (_u)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:778
-msgid "Mailbox name is _different than user name"
-msgstr ""
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:791
-msgid "_Mailbox:"
-msgstr "ମେଲବାକ�ସ (_M):"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1006
-msgid "_Authentication Type"
-msgstr "ବୈଧିକରଣ ପ�ରକାର (_A)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1020
-msgid "Ch_eck for Supported Types"
-msgstr "ସମର�ଥିତ ପ�ରକାର ପାଇ� ଯାଞ�ଚ କରନ�ତ� (_e)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1135
-#: ../plugins/exchange-operations/exchange-contacts.c:218
-#, c-format
-msgid "%s KB"
-msgstr "%s କିଲୋ-ବାଇଟ�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1137
-#: ../plugins/exchange-operations/exchange-contacts.c:220
-#, c-format
-msgid "0 KB"
-msgstr "0 KB"
-
-#. FIXME: Take care of i18n
-#: ../plugins/exchange-operations/exchange-account-setup.c:1142
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:223
-msgid "Size:"
-msgstr "ଆକାର:"
-
-#: ../plugins/exchange-operations/exchange-calendar.c:196
-#: ../plugins/exchange-operations/exchange-contacts.c:171
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution ଅଫଲାଇନ ଅବସ�ଥାରେ ଅଛି। ଆପଣ ବର�ତ�ତମାନ କଦାପି ଫୋଲଡର ନିର�ମାଣ କିମ�ବା ପରିବର�ତ�ତନ କରିପାରିବେ ନାହି�।\n"
-"�ହି ପ�ରୟୋଗ ପାଇ� ଦୟାକରି ଅନଲାଇନ ଧାରାକ� ପରିବର�ତ�ତନ କରନ�ତ�।"
-
-#. User entered a wrong existing
-#. * password. Prompt him again.
-#.
-#: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr ""
-"ଆପଣଙ�କ ଖାତା ପାଇ� ପ�ରଚଳିତ ପ�ରବେଶ ସଂକେତଟି ସ�ଥିତବାନ ପ�ରବେଶ ସଂକେତ ସହିତ ମେଳଖାଉନାହି�। ଦୟାକରି "
-"ସଠିକ ପ�ରବେଶ ସଂକେତକ� ଭରଣ କରନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-change-password.c:121
-msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr "ଦ�ଇଟି ପ�ରବେଶ ସଂକେତ ମେଳ ଖାଉନାହି�। ଦୟାକରି ପ�ଣିଥରେ ପ�ରବେଶ ସଂକେତ ଭରଣ କରନ�ତ�।"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-msgid "Confirm Password:"
-msgstr "ପ�ରବେଶ ସଙ�କେତକ� ନିଶ�ଚିତ କରନ�ତ�:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-msgid "Current Password:"
-msgstr "ବର�ତ�ତମାନ ପ�ରବେଶ ସଙ�କେତ:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-msgid "New Password:"
-msgstr "ନୂତନ ପ�ରବେଶ ସଙ�କେତ:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-msgid "Your current password has expired. Please change your password now."
-msgstr ""
-"ଆପଣଙ�କର ପ�ରଚଳିତ ପ�ରବେଶ ସଙ�କେତର ସମୟ ସମାପ�ତ ହୋଇଛି। ଦୟାକରି ଆପଣଙ�କର ପ�ରବେଶ ସଙ�କେତକ� ପରିବର�ତ�ତନ "
-"କରନ�ତ�।"
-
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
-#, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "ଆପଣଙ�କର ପ�ରବେଶ ସଙ�କେତ ପରବର�ତ�ତି %d ଦିନରେ ସମୟ ସମାପ�ତ ହୋଇଯିବ"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:565
-msgid "Custom"
-msgstr "ଇଚ�ଛାରୂପଣ"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:170
-msgid "Editor (read, create, edit)"
-msgstr "ସମ�ପାଦକ (ପଢନ�ତ�, ସୃଷ�ଟି କରନ�ତ�, ସମ�ପାଦନ କରନ�ତ�)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:174
-msgid "Author (read, create)"
-msgstr "ଲେଖକ (ପଢନ�ତ�, ସୃଷ�ଟି କରନ�ତ�)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:178
-msgid "Reviewer (read-only)"
-msgstr "ସମୀକ�ଷକ (କେବଳ ପଠନୀୟ)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:228
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-msgid "Delegate Permissions"
-msgstr "ପ�ରତିନିଧିଙ�କ ଅନ�ମତି"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:239
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
-#, c-format
-msgid "Permissions for %s"
-msgstr "%s ପାଇ� ଅନ�ମତି"
-
-#. To translators: This is a part of the message to be sent to the delegatee
-#. summarizing the permissions assigned to him.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:330
-msgid ""
-"This message was sent automatically by Evolution to inform you that you have "
-"been designated as a delegate. You can now send messages on my behalf."
-msgstr ""
-"ଆପଣଙ�କ� ପ�ରତିନିଧି ଭାବରେ ପଦନ�ୱତ କରାଯାଇଛି ବୋଲି ସୂଚାଇବା ପାଇ� �ହି ସନ�ଦେଶକ� Evolution "
-"ଦ�ୱାରା ସ�ୱୟଂଚାଳିତ ଭାବରେ ପଠାଯାଇଛି। ଆପଣ ବର�ତ�ତମାନ ମୋ ବଦଳରେ ସନ�ଦେଶ ପଠାଇପାରିବେ।"
-
-#. To translators: Another chunk of the same message.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:335
-msgid "You have been given the following permissions on my folders:"
-msgstr "ଆପଣ ମୋର ଫୋଲଡରରେ ନିମ�ନଲିଖିତ ଅନ�ମତି ଦେଇଛନ�ତି:"
-
-#. To translators: This message is included if the delegatee has been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:355
-msgid "You are also permitted to see my private items."
-msgstr "ମୋର ବ�ୟକ�ତିଗତ ବସ�ତ�ଗ�ଡ଼ିକ� ଦେଖିବା ପାଇ� ଆପଣହ�କ ପାଖରେ ଅନ�ମତି ଅଛି।"
-
-#. To translators: This message is included if the delegatee has not been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:362
-msgid "However you are not permitted to see my private items."
-msgstr "ତଥାପି ଆପଣଙ�କ ପାଖରେ ମୋର ବ�ୟକ�ତିଗତ ବସ�ତ�ଗ�ଡ଼ିକ� ଦେଖିବାର ଅନ�ମତି ନାହି�।"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:394
-#, c-format
-msgid "You have been designated as a delegate for %s"
-msgstr "%s ପାଇ� ଆପଣଙ�କ� ପ�ରତିନିଧି ଭାବରେ ନିଯ�କ�ତ କରାଯାଇଛି"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:417
-msgid "Delegate To"
-msgstr "କ� ପ�ରତିନିଧି"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:582
-#, c-format
-msgid "Remove the delegate %s?"
-msgstr "%s ପ�ରତିନିଧିଙ�କ� ଅପସାରଣ କରନ�ତ�?"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:700
-msgid "Could not access Active Directory"
-msgstr "ସକ�ରିୟ ବିବରଣୀପଞ�ଜିକାକ� ଅଭିଗମ କରିପାରିଲା ନାହି�"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:712
-msgid "Could not find self in Active Directory"
-msgstr "ସକ�ରିୟ ବିବରଣୀପଞ�ଜିକାରେ ଥାକ ଖୋଜିପାରିଲା ନାହି�"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:725
-#, c-format
-msgid "Could not find delegate %s in Active Directory"
-msgstr "ସକ�ରିୟ ବିବରଣୀପଞ�ଜିକାରେ ପ�ରତିନିଧି %s କ� ଖୋଜିପାରିଲା ନାହି�"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:737
-#, c-format
-msgid "Could not remove delegate %s"
-msgstr "ପ�ରତିନିଧି %sକ� କାଢ଼ିପାରିଲା ନାହି�"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:797
-msgid "Could not update list of delegates."
-msgstr "ପ�ରତିନିଧିମାନଙ�କର ତାଲିକାକ� ଅଦ�ୟତନ କରିପାରିବେ ନାହି�।"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:815
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "ପ�ରତିନିଧି %sକ� ଯୋଗକରିପାରିଲା ନାହି�"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:983
-msgid "Error reading delegates list."
-msgstr "ପ�ରତିନିଧି ତାଲିକାକ� ପଢ଼ିବାରେ ତ�ର�ଟି।"
-
-#. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
-msgid "C_alendar:"
-msgstr "କ�ଯାଲେଣ�ଡର (_a):"
-
-#. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Co_ntacts:"
-msgstr "ସମ�ପର�କ (_n):"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegates"
-msgstr "ପ�ରତିନିଧି"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-msgid ""
-"None\n"
-"Reviewer (read-only)\n"
-"Author (read, create)\n"
-"Editor (read, create, edit)"
-msgstr ""
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Permissions for"
-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 ""
-"�ହି ଚାଳକ ମାନେ ଆପଣଙ�କ ବଦଳରେ ମେଲ ପଠାଇବାରେ ସମର�ଥ ହେବେ\n"
-"�ବଂ  ଆପଣ ସେମାନଙ�କ� ପ�ରଦାନ କରିଥିବା ଅନ�ମତି ସହିତ ଫୋଲଡରଗ�ଡ଼ିକ� ଅଭିଗମ�ୟ କରନ�ତ�।"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-msgid "_Delegate can see private items"
-msgstr "ପ�ରତିନିଧି ବ�ଯକ�ତିଗତ ବସ�ତ� ମାନଙ�କ� ଦେଖି ପାରିବେ (_D)"
-
-#. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
-msgid "_Inbox:"
-msgstr "ଇନ-ବକ�ସ (_I):"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-msgid "_Summarize permissions"
-msgstr "କ ଅନ�ମକ� ସଂକ�ଷିପ�ତ କରନ�ତ� (_S)ତି"
-
-#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-#: ../plugins/itip-formatter/itip-view.c:1915
-msgid "_Tasks:"
-msgstr "କାର�ଯ�ଯ (_T):"
-
-#: ../plugins/exchange-operations/exchange-folder-permission.c:62
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-msgid "Permissions..."
-msgstr "ଅନ�ମତି..."
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
-msgid "Folder Name"
-msgstr "ଫୋଲଡର ନାମ"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
-msgid "Folder Size"
-msgstr "ଫୋଲଡର ଆକାର"
-
-#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
-msgid "User"
-msgstr "ଚାଳକ"
-
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:311
-#: ../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:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
-msgid "Unsubscribe Folder..."
-msgstr "ଅସ�ବୀକାରକ�ତି ଫୋଲଡର..."
-
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "ପ�ରକୃତରେ ଫୋଲଡର \"%s\"ର� ଅସ�ବୀକାରକ�ତି ଆଣନ�ତ�?"
-
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "\"%s\"ର� ଅସ�ବୀକାରକ�ତି ଆଣନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>ବର�ତ�ତମାନ, ଆପଣଙ�କର ସ�ଥିତି ହେଉଛି \"Out of the Office\"। </b>\n"
-"\n"
-"ଆପଣ ଆପଣଙ�କର ସ�ଥିତିକ� \"In the Office\"କ� ପରିବର�ତ�ତନ କରିବାକ� ଚାହ��ଛନ�ତି କି? "
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>କାର�ଯ�ଯାଳୟ ବାହାରର ସନ�ଦେଶ</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b> ଅବସ�ଥିତି</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>ନିମ�ନରେ ଉଲ�ଲେଖ କରାଯାଇଥିବା ସନ�ଦେଶକ� ସ�ୱୟଂଚାଳିତ ଭାବରେ ପ�ରତ�ୟେକ ବ�ୟକ�ତିଙ�କ ପାଖକ� ପଠାଯିବ\n"
-"ଯେଉ�ମାନେ ଆପଣଙ�କ ପାଖକ� ମେଲ ପଠାନ�ତି ଯେତେବେଳେ ଆପଣ ଅଫିସରେ ଥାଆନ�ତି।</small>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "ମ�� ବର�ତ�ତମାନ କାର�ଯ�ୟାଳୟରେ ଅଛି"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "ମ�� ବର�ତ�ତମାନ କାର�ଯ�ୟାଳୟ ବାହାରେ ଅଛି"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "ନା�, ମୋର ସ�ଥିତିକ� ପରିବର�ତ�ତନ କରନ�ତ� ନାହି�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "କାର�ଯ�ଯାଳୟ ବାହାରେ ସହାୟତା"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "ହ�, ଅବସ�ଥିତି ପରିବର�ତ�ତନକରନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-msgid "Password Expiry Warning..."
-msgstr "ପ�ରବେଶ ସଙ�କେତ ସମୟ ସମାପ�ତି ଚେତାବନୀ..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
-msgstr "ଆପଣଙ�କର ପ�ରବେଶ ସଂକେତ 7 ଦିନରେ ସମୟ ସମାପ�ତ ହୋଇଯିବ..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
-msgstr "ପ�ରବେଶ ସଙ�କେତକ� ବଦଳାନ�ତ� (_C)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
-msgid "(Permission denied.)"
-msgstr "(ଅନ�ମତି ଅସ�ବୀକୃତ।)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
-msgid "Add User:"
-msgstr "ଚାଳକକ� ଯୋଗକରନ�ତ�:"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:936
-#: ../plugins/groupwise-features/share-folder.c:718
-msgid "Add User"
-msgstr "ଚାଳକକ� ଯୋଗ କରନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-msgid "<b>Permissions</b>"
-msgstr "<b>ଅନ�ମତି</b>"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-msgid "Cannot Delete"
-msgstr "ଅପସାରଣ କରିପାରିବ ନାହି�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Edit"
-msgstr "ସମ�ପାଦନ କରିପାରିବ ନାହି�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-msgid "Create items"
-msgstr "ବସ�ତ� ମାନଙ�କ� ସୃଷ�ଟି କରନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-msgid "Create subfolders"
-msgstr "ଉପ-ଫୋଲଡର ସୃଷ�ଟି କରନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-msgid "Delete Any Items"
-msgstr "ଯେ କୌଣସି ବସ�ତ�କ� ଅପସାରଣ କରନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-msgid "Delete Own Items"
-msgstr "ନିଜସ�ବ ବସ�ତ�କ� ଅପସାରଣ କରନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-msgid "Edit Any Items"
-msgstr "ଯେ କୌଣସି ବସ�ତ�କ� ସମ�ପାଦନ କରନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-msgid "Edit Own Items"
-msgstr "ନିଜସ�ବ ବସ�ତ�କ� ସମ�ପାଦନ କରନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-msgid "Folder contact"
-msgstr "ଫୋଲଡର ସମ�ପର�କ"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-msgid "Folder owner"
-msgstr "ଫୋଲଡର ମାଲିକ"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-msgid "Folder visible"
-msgstr "ଫୋଲଡର ଦୃଶ�ଯମାନ"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-msgid "Read items"
-msgstr "ପଠନ ବସ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-msgid "Role: "
-msgstr "କାର�ଯ�ଯ: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
-msgid "<b>Message Settings</b>"
-msgstr "<b>ସନ�ଦେଶ ବିନ�ୟାସ</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
-msgid "<b>Tracking Options</b>"
-msgstr "<b>ଯାଞ�ଚ ବିକଳ�ପଗ�ଡ଼ିକ</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
-msgid "Exchange - Send Options"
-msgstr "ବିନିମୟ କାର�ଯ�ଯ - ପଠାଇବା ବିକଳ�ପଗ�ଡ଼ିକ"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
-msgid "I_mportance: "
-msgstr "ଗ�ର�ତ�ବ (_m):"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
-msgid ""
-"Normal\n"
-"High\n"
-"Low"
-msgstr ""
-"ସାଧାରଣ\n"
-"ଉଚ�ଚ\n"
-"ନିଚ�ଚ"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
-msgid ""
-"Normal\n"
-"Personal\n"
-"Private\n"
-"Confidential"
-msgstr ""
-"ସାଧାରଣ\n"
-"ବ�ୟକ�ତିଗତ\n"
-"ବ�ୟକ�ତିଗତ\n"
-"ଗୋପନୀୟ"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
-msgid "Request a _delivery receipt for this message"
-msgstr "�ହି ସନ�ଦେଶ ପାଇ� ଗୋଟି� ପ�ରାପ�ତି ସୂଚନା ପାଇ� ଅନ�ରୋଧ କରନ�ତ� (_d)"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
-msgid "Request a _read receipt for this message"
-msgstr "�ହି ସନ�ଦେଶ ପାଇ� ଗୋଟି� ପଢ଼ିବା ସୂଚନା ପାଇ� ଅନ�ରୋଧ କରନ�ତ� (_r)"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
-msgid "Send as Delegate"
-msgstr "ପ�ରତିନିଧି ହିସାବରେ ପଠାନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
-msgid "_Sensitivity: "
-msgstr "ସମ�ବେଦନଶୀଳତା (_S):"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-msgid "_User"
-msgstr "ଚାଳକ (_U)"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
-msgid "Select User"
-msgstr "ଚାଳକକ� ଚୟନ କରନ�ତ�"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
-msgid "Address Book..."
-msgstr "ଠିକଣା ପ�ସ�ତିକା..."
-
-#: ../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 "Activates the Evolution-Exchange extension package."
-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 access the \"Exchange settings\" tab in offline mode."
-msgstr "ଅଫ ଲାଇନ ଧାରାରେ \"Exchange settings\" ଟ�ୟାବକ� ଅଭିଗମ କରିପାରିବେ ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-msgid "Cannot change password due to configuration problems."
-msgstr "ବିନ�ୟାସ ସମସ�ୟା ହେତ� ପ�ରବେଶ ସଂକେତକ� ପରିବର�ତ�ତନ କରିପାରିବେ ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot display folders."
-msgstr "ଫୋଲଡରକ� ପ�ରଦର�ଶିତ କରିପାରିବ ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Cannot perform the operation."
-msgstr "କାର�ଯ�ଯକ� ସମ�ପାଦନ କରିପାରିବ ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr ""
-"ବିନିମୟ ଖାତା \"{0}\" ପାଇ� ବିକଳ�ପଗ�ଡ଼ିକ� ପରିବର�ତ�ତନ Evolutionକ� "
-"ପ�ନଃ ଚାଳନ କରିବା ପରେ ହୋଇଥିଲା।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-msgid "Could not authenticate to server."
-msgstr "ସେବକ ସହିତ ବୈଧିକୃତ ହୋଇ ପାରିଲା ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
-msgid "Could not change password."
-msgstr "ପ�ରବେଶ ସଙ�କେତକ� ପରିବର�ତ�ତନ କରିପାରିଲା ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
-msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
-msgstr ""
-"ବିନିମୟ ଖାତାକ� ସଂରଚନା କରିପାରିଲା ନାହି� କାରଣ \n"
-"ଗୋଟି� ଅଜଣା ତ�ର�ଟି ଘଟିଅଛି। URL, \n"
-"ଚାଳକ ନାମ, �ବଂ ପ�ରବେଶ ସଂକେତକ� ଯାଞ�ଚ କରନ�ତ�, �ବଂ ପ�ଣି ଚେଷ�ଟାକରନ�ତ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not connect to Exchange server."
-msgstr "ବିନିମୟ ସେବକ ସହିତ ସମ�ପର�କ ସ�ଥାପନ କରିପାରିଲା ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-msgid "Could not connect to server {0}."
-msgstr "ସେବକ {0} ସହିତ ସମ�ପର�କ ସ�ଥାପନ କରିପାରିଲା ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not determine folder permissions for delegates."
-msgstr "ପ�ରତିନିଧିମାନଙ�କ ପାଇ� ଫୋଲଡର ଅନ�ମତି ନିର�ଦ�ଧାରଣ କରିପାରିଲା ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-msgid "Could not find Exchange Web Storage System."
-msgstr "ପରିବର�ତ�ତନ ୱେବ ସଂରକ�ଷଣ ତନ�ତ�ର ଖୋଜିପାରିଲା ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-msgid "Could not locate server {0}."
-msgstr "ସେବକ {0} ର ସ�ଥାନ ନିରୂପଣ କରିପାରିଲା ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-msgid "Could not make {0} a delegate"
-msgstr "{0}କ� ପ�ରତିନିଧି କରିପାରିଲେ ନାହି�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-msgid "Could not read folder permissions"
-msgstr "ଫୋଲଡର ଅନ�ମତିଗ�ଡ଼ିକ� ପଢ଼ିପାରିଲା ନାହି� "
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-msgid "Could not read folder permissions."
-msgstr "ଫୋଲଡର ଅନ�ମତିଗ�ଡ଼ିକ� ପଢ଼ିପାରିଲା ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Could not read out-of-office state"
-msgstr "କାର�ୟ�ୟାଳୟ ବାହାର ସ�ଥିତିକ� ପଢ଼ିପାରିଲା ନାହି�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Could not update folder permissions."
-msgstr "ଫୋଲଡର ଅନ�ମତିଗ�ଡ଼ିକ� ଅଦ�ୟତନ କରିପାରିଲା ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Could not update out-of-office state"
-msgstr "କାର�ୟ�ୟାଳୟ ବାହାର ସ�ଥିତିକ� ଅଦ�ୟତନ କରିପାରିଲା ନାହି�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
-msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr "ସ�ୱୀକୃତି ପ�ରାପ�ତ ମେଲବାକ�ସକ� ଧାରଣ କରିବା ପାଇ� Evolution କ� ପ�ନଃ ଚାଳନ କରିବାକ� ହେବ"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
-msgid "Exchange Account is offline."
-msgstr "ପରିବର�ତ�ତନ ଖାତାଟି ଅଫ ଲାଇନ ଅଛି।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
-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 ""
-"ବିନିମୟ ସଂଯୋଗିକୀ କିଛି ଫଳନ ପାଇ� Exchange Serverରେ ଅଭିଗମ�ୟତା\n"
-"ଆବଶ�ୟକ କରେ ଯାହାକି ନିଷ�କ�ରିୟ ଅଥବା ଅଟକିଯାଇଥିବା ପରି\n"
-"ଦୃଶ�ୟମାନ ହେଉଛି। (�ହା ସାଧାରଣତଃ \n"
-"ଉଦ�ଦେଶ�ୟ ବିହୀନ ଭାବରେ ହୋଇଥା�।) ଆପଣଙ�କର ବିନିମୟ \n"
-"ପ�ରଶାସକଙ�କ� Evolution ବିନିମୟ ସଂଯୋଗିକୀକ� \n"
-"ବ�ୟବହାର କରିବା ପାଇ� ସକ�ଷମ ହେବାକ� �ହି ଫଳନକ� ସକ�ରିୟ କରିବା ଆବଶ�ୟକ।\n"
-"\n"
-"ଆପଣଙ�କ ବିନିମୟ ପ�ରଶାସକଙ�କ� ସୂଚନା ପ�ରଦାନ କରିବା ପାଇ�, \n"
-"ଦୟାକରି ନିମ�ନରେ ପ�ରଦତ�ତ ସଂଯୋଗକ� ଅନ�ସରଣ କରନ�ତ�:\n"
-"\n"
-"{0}\n"
-"  "
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-msgid "Failed to update delegates:"
-msgstr "ପ�ରତିନିଧକ� ଅଦ�ଯତିତ କରିବାରେ ବିଫଳ:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-msgid "Folder already exists"
-msgstr "ଫୋଲଡର ପୂର�ବର� ରହିଛି"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "Folder does not exist"
-msgstr "ଫୋଲଡର ଅବସ�ଥିତ ନାହି�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Folder offline"
-msgstr "ଫୋଲଡର ଅଫଲାଇନ"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1268
-msgid "Generic error"
-msgstr "ସାଧାରଣ ତ�ର�ଟି"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "Global Catalog Server is not reachable"
-msgstr "ସାମଗ�ରିକ ତାଲିକା ସେବକକ� ପହଞ�ଚି ପାରିଲା ନାହି�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-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:43
-msgid "Mailbox for {0} is not on this server."
-msgstr "{0} ପାଇ� ମେଲବାକ�ସ �ହି ସର�ଭରରେ ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
-msgid "Make sure the URL is correct and try again."
-msgstr "ସେହି URLଟି ସଠିକ ଅଛି ବୋଲି ନିଶ�ଚିତ କରନ�ତ� �ବଂ ପ�ଣି ଚେଷ�ଟାକରନ�ତ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-msgid "Make sure the server name is spelled correctly and try again."
-msgstr "ସର�ଭର ନାମକ� ସଠିକ ଭାବରେ ବନାନ କରାଯାଇଛି ବୋଲି ନିଶ�ଚିତ କରନ�ତ� �ବଂ ପ�ଣିଥରେ ଚେଷ�ଟାକରନ�ତ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
-msgid "Make sure the username and password are correct and try again."
-msgstr "ଚାଳକ ନାମ �ବଂ ପ�ରବେଶ ସଂକେତକ� ସଠିକ ବୋଲି ନିଶ�ଚିତ କରନ�ତ� �ବଂ ପ�ଣିଥରେ ଚେଷ�ଟାକରନ�ତ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
-msgid "No Global Catalog server configured for this account."
-msgstr "�ହି ଖାତା ପାଇ� କୌଣସି ଜାଗତିକ କ�ୟାଟଲଗ ସର�ଭର ବିନ�ୟାସ ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "No mailbox for user {0} on {1}."
-msgstr "{1} ଉପରେ ଚାଳକ {0} ପାଇ� କୌଣସି ମେଲବାକ�ସ ନାହି�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "No such user {0}"
-msgstr "କୌଣସି ଚାଳକ {0} ନାହି�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Password successfully changed."
-msgstr "ପ�ରବେଶ ସଙ�କେତକ� ସଫଳତାର ସହିତ ବଦଳାଗଲା।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
-msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr "ଜଣେ ପ�ରତିନିଧିର ID ଭରଣ କରନ�ତ� କିମ�ବା ପ�ରତିନିଧି ବିକଳ�ପ ଭାବରେ ପଠାଇବାକ� ଅବଚ�ଛିତ କରନ�ତ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-msgid "Please make sure the Global Catalog Server name is correct."
-msgstr "ଜାଗତିକ କ�ୟାଟଲଗ ସର�ଭର ନାମଟି ସଠିକ ବୋଲି ଦୟାକରି ନିଶ�ଚିତ କରନ�ତ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-msgid "Please restart Evolution for changes to take effect"
-msgstr "ପରିବର�ତ�ତନଗ�ଡ଼ିକ� କାର�ଯ�ୟକାରୀ କରିବା ପାଇ� ଦୟାକରି Evolutionକ� ପ�ନଃ ପ�ରାରମ�ଭ କରନ�ତ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
-msgid "Please select a user."
-msgstr "ଦୟାକରି ଗୋଟି� ଚାଳକକ� ଚୟନ କରନ�ତ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
-msgid "Server rejected password because it is too weak."
-msgstr "ପ�ରବେଶ ସଂକେତଟି ଦ�ର�ବଳ ଥିବା ହେତ� ସର�ଭର ତାହାକ� ପ�ରତ�ୟାଖାନ କରିଛି।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
-msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "ଆପଣ Evolutionର� ପ�ରସ�ଥାନ କରିବା ସମୟରେ ପରିବର�ତ�ତନ ଖାତାଟି ନିଷ�କ�ରିୟ ହୋଇଥା�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "ଆପଣ Evolutionର� ପ�ରସ�ଥାନ କରିବା ସମୟରେ ପରିବର�ତ�ତନ ଖାତାକ� ବାହାର କରାଯାଇଥା�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
-msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr "ପରିବର�ତ�ତନ ସର�ଭରଟି ପରିବର�ତ�ତନ ସଂଯୋଗକର�ତ�ତା ସହିତ ସ�ସଂଗତ ନ�ହ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
-msgid ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
-"ସର�ଭରଟି Exchange 5.5କ� ଚଲାଉଅଛି। ବିନିମୟ ସଂଯୋଗିକୀ \n"
-"Microsoft Exchange 2000 �ବଂ 2003 କ� ହି� କେବଳ ସମର�ଥନ କରିଥା�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-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 ""
-"�ହା ସମ�ଭବତଃ ଆପଣଙ�କ ସର�ଭର ଆବଶ�ୟକ କର�ଅଛି ଯେ \n"
-"ଆପଣ Windowsର ପରିସର ନାମକ� ଆପଣଙ�କର ଚାଳକ ନାମ ଭାବରେ \n"
-"ଉଲ�ଲେଖ କରନ�ତ� (ଯେପରି କି, &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"ଅଥବା ଆପଣ ଭ�ଲ ପ�ରବେଶ ସଂକେତ ଟାଇପ କରିଛନ�ତି।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-msgid "Try again with a different password."
-msgstr "ଭିନ�ନ �କ ପ�ରବେଶ ସଂକେତ ସହିତ ପ�ଣିଥରେ ଚେଷ�ଟାକରନ�ତ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "Unable to add user to access control list:"
-msgstr "ନିୟନ�ତ�ରଣ ତାଲିକାକ� ଅଭିଗମ�ୟ କରିବା ପାଇ�ଚାଳକ ୟୋଗ କରିବାରେ ଅସମର�ଥ:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "Unable to edit delegates."
-msgstr "ପ�ରତିନିଧିମାନଙ�କ� ସମ�ପାଦନ କରିବାରେ ଅସମର�ଥ।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "Unknown error looking up {0}"
-msgstr "ଅଜଣା ତୃଟି ଅବଲୋକନ {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:522
-#: ../plugins/mail-to-task/mail-to-task.c:343
-#: ../plugins/mail-to-task/mail-to-task.c:555
-msgid "Unknown error."
-msgstr "ଅଜଣା ତ�ର�ଟି"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Unknown type"
-msgstr "ଅଜଣା ପ�ରକାର"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Unsupported operation"
-msgstr "ଅସହାୟକ ଚାଳନା"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You are nearing your quota available for storing mail on this server."
-msgstr "ଆପଣ �ହି ସର�ଭରରେ ଉପଲବ�ଧ ମେଲ ରଖିବା ସୀମାର ନିକଟତର ହେଉଛନ�ତି।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-msgstr "ଆପଣ �କ ସମୟରେ ପ�ରତିନିଧି ଭାବରେ ଗୋଟି� ସନ�ଦେଶ ପଠାଇ ପାରିବେ।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
-msgid "You cannot make yourself your own delegate"
-msgstr "ଆପଣ ନିଜକ� କଦାପି ନିଜର ପ�ରତିନିଧି କରିପାରିବେ ନାହି�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-msgid "You have exceeded your quota for storing mail on this server."
-msgstr "ଆପଣ �ହି ସର�ଭରରେ ମେଲ ସଂରକ�ଷଣ କରିବାର ସୀମା ଅତିକ�ରମ କରିସାରିଛନ�ତି।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "You may only configure a single Exchange account."
-msgstr "ଆପଣ କେବଳ ଗୋଟି� ପରିବର�ତ�ତନ ଖାତା ବିନ�ୟାସ କରିପାରିବେ।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-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:80
-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:81
-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:82
-msgid "Your password has expired."
-msgstr "ଆପଣଙ�କର ପ�ରବେଶ ସଂକେତର ସମୟ ସମାପ�ତ ହୋଇଛି।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
-msgid "{0} cannot be added to an access control list"
-msgstr "{0}କ� ଅଭିଗମ�ୟ ନିୟନ�ତ�ରଣ ତାଲିକାରେ ଯୋଗ କରାଯାଇପାରିବ ନାହି�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
-msgid "{0} is already a delegate"
-msgstr "{0} ଟି ପୂର�ବର� ଗୋଟି� ପ�ରତିନିଧି ଅଟେ"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
-msgid "{0} is already in the list"
-msgstr "{0} ପୂର�ବର� ତାଲିକାରେ ଅଛି"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
-msgid "Subscribe to Other User's Tasks"
-msgstr "ଅନ�ଯ ଚାଳକର କାର�ଯ�ଯକ� କିଣନ�ତ�"
-
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-msgid "Check folder permissions"
-msgstr "ଫୋଲଡର ଅନ�ମତି ଯାଞ�ଚ କରନ�ତ�"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+msgstr "ଇ-ଡାକ ଇଚ�ଛାରୂପଣ ଶୀର�ଷକ"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Automatically launch editor when key is pressed in the mail composer"
-msgstr ""
+msgstr "ସ�ୱୟଂଚାଳିତଭାବରେ ସମ�ପାଦକଙ�କ� ଆରମ�ଭ କରିଥା� ଯେତେବେଳେ କି କ� ମେଲ ସଂଯୋଜକରେ ଦବାଯାଇଥା�"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:120
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
-msgstr ""
+msgstr "ନୂତନ ମେଲ ସମ�ପାଦିତ ହେବା ସମୟରେ ସ�ୱୟଂଚାଳିତଭାବରେ ଆରମ�ଭ ହୋଇଥା�"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
@@ -16264,6 +17291,23 @@ msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ବାହ�ୟ ସମ
 msgid "The default command that must be used as the editor."
 msgstr "ସମ�ପାଦକ ଭାବରେ ବ�ୟବହୃତ ହେଉଥିବା ପୂର�ବ ନିର�ଦ�ଧାରିତ ନିର�ଦ�ଦେଶ।"
 
+#: ../plugins/external-editor/external-editor.c:115
+msgid "Command to be executed to launch the editor: "
+msgstr "ସମ�ପାଦକଙ�କ� ଆରମ�ଭ କରିବା ପାଇ� ନିଷ�ପାଦନ କରିବାକ� ଥିବା ନିର�ଦ�ଦେଶ: "
+
+#: ../plugins/external-editor/external-editor.c:116
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Emacs ବ�ୟବହାର ପାଇ� \"xemacs\"\n"
+"VI ପାଇ� \"gvim-f\" ବ�ୟବହାର କରନ�ତ�"
+
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
+msgid "Compose in External Editor"
+msgstr "ବାହ�ୟ ସମ�ପାଦକରେ ଲେଖନ�ତ�"
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "ବାହ�ୟ ସମ�ପାଦକ"
@@ -16297,81 +17341,109 @@ msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
 msgstr ""
+"ଗୋଟି� ବାହ�ୟ ସମ�ପାଦକ �ପର�ଯ�ୟନ�ତ ଚାଲିଅଛି। ମେଲ ସଂୟୋଜକ ୱିଣ�ଡୋକ� ସମ�ପାଦକ ସକ�ରିୟ ଥିବା ପର�ଯ�ୟନ�ତ ବନ�ଦ "
+"କରାହୋଇନଥା�।"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
-"ଆପଣଙ�କ ପ�ଲଗଇନ ପସନ�ଦରେ ସେଟ କରାଯାଇଥିବା ବାହ�ୟ ସମ�ପାଦକକ� ଆରମ�ଭ କରାଯାଇପାରିବ ନାହି�। "
-"ଅନ�ୟ �କ ସମ�ପାଦକ ସେଟ କରି ଚେଷ�ଟାକରନ�ତ�।"
+"ଆପଣଙ�କ ପ�ଲଗଇନ ପସନ�ଦରେ ସେଟ କରାଯାଇଥିବା ବାହ�ୟ ସମ�ପାଦକକ� ଆରମ�ଭ କରାଯାଇପାରିବ ନାହି�। ଅନ�ୟ �କ "
+"ସମ�ପାଦକ ସେଟ କରି ଚେଷ�ଟାକରନ�ତ�।"
 
-#: ../plugins/external-editor/external-editor.c:109
-msgid "Command to be executed to launch the editor: "
-msgstr "ସମ�ପାଦକଙ�କ� ଆରମ�ଭ କରିବା ପାଇ� ନିଷ�ପାଦନ କରିବାକ� ଥିବା ନିର�ଦ�ଦେଶ: "
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:110
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
 msgstr ""
-"Emacs ବ�ୟବହାର ପାଇ� \"xemacs\"\n"
-"VI ପାଇ� \"gvim-f\" ବ�ୟବହାର କରନ�ତ�"
-
-#: ../plugins/external-editor/external-editor.c:308
-#: ../plugins/external-editor/external-editor.c:310
-msgid "Compose in External Editor"
-msgstr "ବାହ�ୟ ସମ�ପାଦକରେ ଲେଖନ�ତ�"
 
-#: ../plugins/face/face.c:59
-msgid "Select a (48*48) png of size < 700bytes"
+#: ../plugins/face/face.c:286
+#, fuzzy
+#| msgid "Select a (48*48) png of size < 700bytes"
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
 msgstr "< 700bytes ଆକାର ବିଶିଷ�ଟ ଗୋଟି� (48*48) pngକ� ବାଛନ�ତ�"
 
-#: ../plugins/face/face.c:69
-msgid "PNG files"
-msgstr "PNG ଫାଇଲମାନ"
+#: ../plugins/face/face.c:296
+#, fuzzy
+#| msgid "Importing files"
+msgid "Image files"
+msgstr "ଫାଇଲଗ�ଡ଼ିକ� ଆମଦାନି କର�ଅଛି"
+
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr ""
+
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr ""
 
-#: ../plugins/face/face.c:126
-msgid "_Face"
-msgstr "ମ�ଖ (_F)"
+#: ../plugins/face/face.c:422
+#, fuzzy
+#| msgid "I_nclude threads"
+msgid "Include _Face"
+msgstr "ସୂତ�ରକ� ଅନ�ତର�ଭ�କ�ତ କରନ�ତ� (_n)"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid ""
-"Attach a small picture of your face to outgoing messages.\n"
-"\n"
-"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
-"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
-"sent messages."
+msgid "Attach a small picture of your face to outgoing messages."
 msgstr ""
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "ଫୋଲଡର \"%s\"ର� ଅସ�ୱୀରୋକ�ତି ଆଣନ�ତ�"
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+#, fuzzy
+#| msgid "Table header"
+msgid "Failed Read"
+msgstr "ସାରଣୀ ଶୀର�ଷକ"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Unsubscribe Folders"
-msgstr "ଅସ�ବୀକାରକ�ତି ଫୋଲ�ଡରଗ�ଡ଼ିକ"
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+#, fuzzy
+#| msgid "Invalid Date Value"
+msgid "Invalid Image Size"
+msgstr "ଅବୈଧ ତାରିଖ ସମୟ"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
-msgstr ""
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+#, fuzzy
+#| msgid "_No image"
+msgid "Not an image"
+msgstr "କୌଣସି ପ�ରତିଛବି ନାହି� (_N)"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "ଅସ�ବୀକାରକ�ତି (_U)"
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+#, fuzzy
+#| msgid "Please select an image for this contact"
+msgid "Please select an image of size 48 * 48"
+msgstr "ଦୟାକରି �ହି ସମ�ପର�କ ପାଇ� ଗୋଟି� ପ�ରତିଛବି ଚୟନ କରନ�ତ�"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+#, fuzzy
+#| msgid "The item could not be sent!\n"
+msgid "The file cannot be read"
+msgstr "ବସ�ତ�କ� ପଠାଯାଇପାରିବ ନାହି�!\n"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr ""
 
+#: ../plugins/google-account-setup/google-contacts-source.c:53
 #: ../plugins/google-account-setup/google-source.c:81
-#: ../plugins/google-account-setup/google-contacts-source.c:51
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:422
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+#, fuzzy
+#| msgid "_Server:"
+msgid "Server"
+msgstr "ସେବକ (_S):"
+
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "ଅସ�ୱୀକାରୋକ�ତି କାଲେଣ�ଡର ତାଲିକାକ� ଅଭିଗମ�ୟ କରିବା ପାଇ� ଚାଳକ %s ପାଇ� ପ�ରବେଶ ସଂକେତ ଭରଣ କରନ�ତ�।"
 
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16380,41 +17452,80 @@ msgstr ""
 "Google ସର�ଭରର� ତଥ�ୟକ� ପଢ଼ିପାରିବେ ନାହି�।\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:674
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
+msgid "Unknown error."
+msgstr "ଅଜଣା ତ�ର�ଟି"
+
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "କ�ଯାଲେଣ�ଡର (_e):"
 
-#: ../plugins/google-account-setup/google-source.c:709
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+#, fuzzy
+#| msgid "Retrieve _list"
+msgid "Retrieve _List"
 msgstr "କଢ଼ାଯିବା ତାଲିକା (_l)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
-msgid "<b>Server</b>"
-msgstr "<b>ସର�ଭର</b>"
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
-msgstr ""
+msgstr "Google କ�ୟାଲେଣ�ଡରକ� Evolution ରେ ଯୋଗ କରନ�ତ�।"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google Calendars"
 msgstr "Google କ�ଯାଲେଣ�ଡର"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "ଯାଞ�ଚ ତାଲିକା"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "Add Novell GroupWise support to Evolution."
-msgstr ""
+#: ../plugins/groupwise-features/gw-ui.c:112
+msgid "New _Shared Folder..."
+msgstr "ନୂତନ ସହଭାଗ ଫୋଲଡର (_S)..."
+
+#: ../plugins/groupwise-features/gw-ui.c:119
+msgid "_Proxy Login..."
+msgstr "ପ�ରକ�ସି ଲଗଇନ (_P)..."
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "GroupWise Account Setup"
-msgstr "ସମୂହ ଅନ�ସାରେ ହିସାବ ଖାତା ସେଟଅପ"
+#: ../plugins/groupwise-features/gw-ui.c:170
+msgid "Junk Mail Settings..."
+msgstr "Junk ମେଲ ସେଟିଙ�ଗଗ�ଡିକ..."
 
-#: ../plugins/groupwise-features/install-shared.c:220
-#, c-format
+#: ../plugins/groupwise-features/gw-ui.c:177
+msgid "Track Message Status..."
+msgstr "ସନ�ଦେଶ ଅବସ�ଥିତି ଟ�ରାକ କରନ�ତ�..."
+
+#: ../plugins/groupwise-features/gw-ui.c:183
+msgid "Retract Mail"
+msgstr "ମେଲ ବାହର କରନ�ତ�"
+
+#: ../plugins/groupwise-features/gw-ui.c:338
+msgid "Accept Tentatively"
+msgstr "ମନଇଚ�ଛା ଗ�ରହଣକରନ�ତ�"
+
+#: ../plugins/groupwise-features/gw-ui.c:352
+msgid "Rese_nd Meeting..."
+msgstr "ସାକ�ଷାତକାର କ� ପ�ଣି ପଠାନ�ତ� (_n)..."
+
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
+msgid "Create folder"
+msgstr "ଫୋଲଡର ସୃଷ�ଟିକରନ�ତ�"
+
+#: ../plugins/groupwise-features/install-shared.c:219
+#, fuzzy, c-format
+#| msgid ""
+#| "The user '%s' has shared a folder with you\n"
+#| "\n"
+#| "Message from '%s'\n"
+#| "\n"
+#| "\n"
+#| "%s\n"
+#| "\n"
+#| "\n"
+#| "Click 'Forward' to install the shared folder\n"
+#| "\n"
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -16424,7 +17535,7 @@ msgid ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Forward' to install the shared folder\n"
+"Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
 "ଚାଳକ '%s' ଆପଣଙ�କ ସହିତ ଗୋଟି� ଫୋଲଡର ସହଭାଗ କରିଥା�\n"
@@ -16438,67 +17549,75 @@ msgstr ""
 "ସହଭାଗୀ ଫୋଲଡରକ� ସ�ଥାପନ କରିବା ପାଇ� 'ଅଗ�ରସର କରନ�ତ�' କ� କ�ଲିକ କରନ�ତ�\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "ସହଭାଗୀ ଫୋଲଡରକ� ସ�ଥାପନ କରନ�ତ�"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "ସହଭାଗ ଫୋଲଡର ସ�ଥାପନା"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:80
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "Junk ସେଟିଙ�ଗଗ�ଡିକ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:93
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
+#: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Junk ମେଲ ସେଟିଙ�ଗଗ�ଡିକ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:117
-msgid "Junk Mail Settings..."
-msgstr "Junk ମେଲ ସେଟିଙ�ଗଗ�ଡିକ..."
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b> Junk ତାଲିକା</b>"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#: ../plugins/groupwise-features/junk-settings.ui.h:1
 msgid "Email:"
 msgstr "ଇ-ମେଲ:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:45
+#: ../plugins/groupwise-features/junk-settings.ui.h:2
+#, fuzzy
+#| msgid "_Junk List"
+msgid "Junk List:"
+msgstr "Junk ତାଲିକା (_J)"
+
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "_Disable"
 msgstr "ନିଷ�କ�ରିୟ (_D)"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:6
+#: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "ସକ�ରିୟ (_E)"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#: ../plugins/groupwise-features/junk-settings.ui.h:7
 msgid "_Junk List"
 msgstr "Junk ତାଲିକା (_J)"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/junk-settings.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "ଅପସାରଣ କରନ�ତ� (_R)"
+
+#: ../plugins/groupwise-features/mail-retract.c:81
 msgid "Message Retract"
 msgstr "ସନ�ଦେଶ ଫେରାଇବା"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:90
+#, fuzzy
+#| msgid ""
+#| "Retracting a message may remove it from the recipient's mailbox. Are you "
+#| "sure you want to do this ?"
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this ?"
+"sure you want to do this?"
 msgstr ""
-"ସନ�ଦେଶକ� ପ�ନଃ ଅନ�ସନ�ଧାନ କରିବା ଦ�ୱାରା ତାହା ଗ�ରହଣକର�ତ�ତାଙ�କ ମେଲବାକ�ସର� ଅପସାରିତ ହୋଇଥା�। "
-"�ହା କରିବେ ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
+"ସନ�ଦେଶକ� ପ�ନଃ ଅନ�ସନ�ଧାନ କରିବା ଦ�ୱାରା ତାହା ଗ�ରହଣକର�ତ�ତାଙ�କ ମେଲବାକ�ସର� ଅପସାରିତ ହୋଇଥା�। �ହା "
+"କରିବେ ବୋଲି ଆପଣ ନିଶ�ଚିତ କି?"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "ସଫଳତାର ସହିତ ସନ�ଦେଶ କଢ଼ାଯାଇଛି"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
-msgid "Retract Mail"
-msgstr "ମେଲ ବାହର କରନ�ତ�"
+#: ../plugins/groupwise-features/mail-send-options.c:202
+msgid "Insert Send options"
+msgstr "ପଠାଯାଇଥିବା ବିକଳ�ପଗ�ଡ଼ିକ� ଭର�ତ�ତିକରନ�ତ�"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
@@ -16506,7 +17625,7 @@ msgstr "ପଠାନ�ତ� ବିକଳ�ପଗ�ଡିକ� ସମୂହ
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "Fine-tune your GroupWise accounts."
-msgstr ""
+msgstr "ଆପଣଙ�କର GroupWise ଖାତାଗ�ଡ଼ିକ� ନିଖ�ଣ ଭାବରେ ତାଳକ� ଆଣନ�ତ�।"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
@@ -16520,12 +17639,28 @@ msgstr "ସନ�ଦେଶ କାଢ଼ିବା ବିଫଳ"
 msgid "The server did not allow the selected message to be retracted."
 msgstr "ସର�ଭିର ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅନ�ସନ�ଧାନ କରିବାକ� ଅନ�ମତି ଦେଇନଥିଲା। "
 
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "ହିସାବ ଖାତା &quot;{0}&quot; ପୂର�ବର� ଅବସ�ଥିତ। ଦୟାକରି ଆପଣଙ�କର ଫୋଲଡର ବୃକ�ଷକ� ଯାଞ�ଚକରନ�ତ�।"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "ଖାତା ପୂର�ବର� ରହିଛି"
+
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "ଅବୈଧ ଚାଳକ"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"&quot;{0}&quot; ଭାବରେ ପ�ରକ�ସି ଲଗଇନ ସଫଳ ହୋଇଥିଲା। ଦୟାକରି ଆପଣଙ�କର ଇମେଲ ଠିକଣା ଯାଞ�ଚ କରନ�ତ� "
+"�ବଂ ପ�ଣି ଚେଷ�ଟାକରନ�ତ�।"
+
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
@@ -16546,22 +17681,6 @@ msgstr "ଆପଣ ପୂରà­�ବରà­� à¬�ହି ଚାଳକ ପାଇà¬� ପà
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "ପ�ରକ�ସି ଅଧିକାର ଦେବା ପାଇ� ଆପଣଙ�କ� ଗୋଟି� ବୈଧ ଚାଳକ ନାମ ଉଲ�ଲେଖ କରିବାକ� ହେବ।"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "ହିସାବ ଖାତା &quot;{0}&quot; ପୂର�ବର� ଅବସ�ଥିତ। ଦୟାକରି ଆପଣଙ�କର ଫୋଲଡର ବୃକ�ଷକ� ଯାଞ�ଚକରନ�ତ�।"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "ଖାତା ପୂର�ବର� ରହିଛି"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"&quot;{0}&quot; ଭାବରେ ପ�ରକ�ସି ଲଗଇନ ସଫଳ ହୋଇଥିଲା। ଦୟାକରି ଆପଣଙ�କର ଇମେଲ ଠିକଣା ଯାଞ�ଚ "
-"କରନ�ତ� �ବଂ ପ�ଣି ଚେଷ�ଟାକରନ�ତ�।"
-
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "ଆପଣ �ହି ଫୋଲଡରକ� ଉଲ�ଲିଖିତ ଚାଳକ &quot;{0}&quot; ସହିତ ସହଭାଗ କରିପାରିବେ ନାହି�"
@@ -16570,264 +17689,290 @@ msgstr "ଆପଣ à¬�ହି ଫୋଲଡରକà­� ଉଲà­�ଲିଖିତ ଚà¬
 msgid "You have to specify a user name which you want to add to the list"
 msgstr "ଆପଣଙ�କ� ଗୋଟି� ଚାଳକ ନାମ ଉଲ�ଲେଖ କରିବାକ� ହେବ ଯାହାକ�କି ଆପଣ ତାଲିକାରେ ଯୋଗ କରିବାକ� ଚାହ��ଛନ�ତି"
 
-#: ../plugins/groupwise-features/process-meeting.c:54
-msgid "Accept Tentatively"
-msgstr "ମନଇଚ�ଛା ଗ�ରହଣକରନ�ତ�"
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#, fuzzy
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the meeting?"
+msgstr "�ହି ସାକ�ଷାତକାରକ� ଅପସାରଣ କରିବାକ� ଚାହ��ଛନ�ତି ବୋଲି ଆପଣ ନିଶ�ଚିତକି?"
 
-#: ../plugins/groupwise-features/process-meeting.c:322
-msgid "Rese_nd Meeting..."
-msgstr "ସାକ�ଷାତକାର କ� ପ�ଣି ପଠାନ�ତ� (_n)..."
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#, fuzzy
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the recurring meeting?"
+msgstr "�ହି ସାକ�ଷାତକାରକ� ଅପସାରଣ କରିବାକ� ଚାହ��ଛନ�ତି ବୋଲି ଆପଣ ନିଶ�ଚିତକି?"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
-msgid "<b>Users:</b>"
-msgstr "<b> ଚାଳକମାନେ:</b>"
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#, fuzzy
+#| msgid "Do you want to recover unfinished messages?"
+msgid "Do you want to retract the original item?"
+msgstr "ଆପଣ ଅସମାପ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� କାଢ଼ିବାକ� ଚାହ��ଛନ�ତି କି?"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#, fuzzy
+#| msgid "_Delete this item from all other recipient's mailboxes?"
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "�ହି ପ�ରକୃତ ବସ�ତ�କ� ଅନ�ୟ ସମସ�ତ ଗ�ରହଣକାରୀଙ�କ ମେଲବାକ�ସର� ଅପସାରଣ କରାହେବ।"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
+#, fuzzy
+#| msgid "Make this a recurring event"
+msgid "This is a recurring meeting"
+msgstr "�ହା ଗୋଟି� ପ�ନଃପୌନିକ ସଭା"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr "ସ�ଥିତବାନ ସାକ�ଷାତକାର ବିବରଣୀ ବ�ୟବହାର କରି �ହା ଗୋଟି� ନୂତନ ସାକ�ଷାତକାର ନିର�ମାଣ କରିବ।"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+"ସ�ଥିତବାନ ସାକ�ଷାତକାର ବିବରଣୀ ବ�ୟବହାର କରି �ହା ଗୋଟି� ନୂତନ ସାକ�ଷାତକାର ନିର�ମାଣ କରିବ। �ହି ପ�ନର�ବାର "
+"ସମ�ମ�ଖିନ ହେବା ନିୟମକ� ପ�ନର�ବାର ଭରଣ କରିବା ଆବଶ�ୟକ।"
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
+#, fuzzy
+#| msgid "Would you like to save your changes?"
+msgid "Would you like to accept it?"
+msgstr "ଆପଣ �ହାକ� ଗ�ରହଣ କରିବା ପାଇ� ଚାହି�ବେ କି?"
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
+#, fuzzy
+#| msgid "Would you like to save your changes?"
+msgid "Would you like to decline it?"
+msgstr "ଆପଣ �ହାକ� ପ�ରତ�ୟାଖାନ କରିବା ପାଇ� ଚାହି�ବେ କି?"
+
+#: ../plugins/groupwise-features/properties.ui.h:1
 msgid "C_ustomize notification message"
 msgstr "ବିଜ�ଞପ�ତି ସନ�ଦେଶକ� ଇଚ�ଛାରୂପଣ କରନ�ତ� (_u)"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "ସମ�ପର�କ (_t)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:515
-msgid "Message"
-msgstr "ସନ�ଦେଶ"
-
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "ସହଭାଗ ଫୋଲଡର ବିଜ�ଞାପନ"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "ଅଂଶଗ�ରହଣକାରୀମାନେ ନିମ�ନଲିଖିତ ବିଜ�ଞପ�ତି ଗ�ରହଣ କରିବେ।\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.ui.h:9
+#, fuzzy
+#| msgid "Users"
+msgid "Users:"
+msgstr "ଚାଳକ"
+
+#: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "ସହଭାଗ କରାଯାଇନାହି� (_N)"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.ui.h:14
 msgid "_Shared With..."
 msgstr "ସହିତ ସହଭାଗୀ (_S)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
 msgstr "ସହଭାଗ କର�ଅଛି (_S)"
 
-#: ../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
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "ଅଧିକାର ଅଭିଗମ�ୟତା"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
 msgid "Add/Edit"
 msgstr "ମିଶାନ�ତ�/ସମ�ପାଦନ କରନ�ତ�"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
 msgid "Con_tacts"
 msgstr "ସମ�ପର�କଗ�ଡ଼ିକ (_t)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
 msgid "Modify _folders/options/rules/"
 msgstr "ଫୋଲଡ଼ର/ବିକଳ�ପ/ନିୟମଗ�ଡ଼ିକ�/ ପରିବର�ତ�ତନ କରନ�ତ� (_f)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
 msgid "Read items marked _private"
 msgstr "ବ�ୟକ�ତିଗତ ଭାବରେ ଚିହ�ନିତ ବସ�ତ�ଗ�ଡ଼ିକ� ପଢନ�ତ� (_p)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
 msgid "Reminder Notes"
 msgstr "ସ�ମାରକ ଟିପପ�ଣୀଗ�ଡିକ"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
 msgstr "ମୋର ଚେତାବନୀକ� କିଣନ�ତ� (_a)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
 msgstr "ମୋର ବିଜ�ଞପ�ତିକ� କିଣନ�ତ� (_n)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
 msgstr "ଲେଖନ�ତ� (_W)"
 
-#. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
 msgid "permission to read|_Read"
 msgstr "ପଢ଼ନ�ତ� (_R)"
 
-#. 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-listing.glade.h:2
+#: ../plugins/groupwise-features/proxy-listing.ui.h:1
 msgid "Proxy"
 msgstr "ପ�ରକ�ସି"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>ହିସାବ ଖାତା ନାମ</b>"
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
+#: ../widgets/misc/e-account-tree-view.c:224
+#, fuzzy
+#| msgid "Account name"
+msgid "Account Name"
+msgstr "ଖାତା ନାମ"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "ପ�ରକ�ସି ଲଗଇନ"
 
-#: ../plugins/groupwise-features/proxy-login.c:207
-#: ../plugins/groupwise-features/proxy-login.c:250
-#: ../plugins/groupwise-features/proxy.c:490
-#: ../plugins/groupwise-features/send-options.c:86
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sପ�ରବେଶ ସଂକେତ ଭରଣ କରନ�ତ� %s ପାଇ� (ଚାଳକ %s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:512
-msgid "_Proxy Login..."
-msgstr "ପ�ରକ�ସି ଲଗଇନ (_P)..."
-
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:691
+#: ../plugins/groupwise-features/proxy.c:690
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "ଖାତା ଅନଲାଇନ ଥିବା ସମୟରେ ପ�ରକ�ସି ଟ�ଯାବ ଉପଲବ�ଧ ହେବ।"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:697
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "ଖାତା ସକ�ରିୟ ଥିବା ସମୟରେ ପ�ରକ�ସି ଟ�ଯାବ ଉପଲବ�ଧ ହେବ।"
 
-#: ../plugins/groupwise-features/send-options.c:215
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+#, fuzzy
+#| msgid "Proxy"
+msgctxt "GW"
+msgid "Proxy"
+msgstr "ପ�ରକ�ସି"
+
+#: ../plugins/groupwise-features/proxy.c:929
+#: ../plugins/groupwise-features/share-folder.c:701
+msgid "Add User"
+msgstr "ଚାଳକକ� ଯୋଗ କରନ�ତ�"
+
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "ଉନ�ନତ ପ�ରେରଣ ବିକଳ�ପମାନ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../plugins/groupwise-features/share-folder-common.c:315
+#: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "ଚାଳକ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder-common.c:316
 msgid "Enter the users and set permissions"
 msgstr "ଚାଳକମାନଙ�କ� ପ�ରବେଶ କରାନ�ତ� �ବଂ ଅନ�ମତି ନିର�ଦ�ଧାରଣ କରନ�ତ�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:340
-msgid "New _Shared Folder..."
-msgstr "ନୂତନ ସହଭାଗ ଫୋଲଡର (_S)..."
-
-#: ../plugins/groupwise-features/share-folder-common.c:448
+#: ../plugins/groupwise-features/share-folder-common.c:416
 msgid "Sharing"
 msgstr "ସହଭାଗ"
 
-#: ../plugins/groupwise-features/share-folder.c:536
+#: ../plugins/groupwise-features/share-folder.c:529
 msgid "Custom Notification"
 msgstr "ଇଚ�ଛାମ�ତାବକ ବିଜ�ଞପ�ତି"
 
-#: ../plugins/groupwise-features/share-folder.c:758
+#: ../plugins/groupwise-features/share-folder.c:741
 msgid "Add   "
 msgstr "ଯୋଗ କରନ�ତ�..."
 
-#: ../plugins/groupwise-features/share-folder.c:764
-msgid "Modify"
-msgstr "ପରିବର�ତ�ତନ କରନ�ତ�"
-
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "ସନ�ଦେଶ ସ�ଥିତି"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "ବିଷୟ:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "ଠାର�:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "ନିର�ମାଣ ତାରିଖ:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "ଗ�ରହଣକର�ତ�ତା:"
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "ପଠାଗଲା:"
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "ଖୋଲାଅଛି:"
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "ସ�ବୀକୃତ:"
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "ଅପସାରଣ କରାଯାଇଛି:"
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "ଅସ�ବୀକୃତ: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "ସମାପ�ତ: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "ପଠାଗଲା:"
 
-#: ../plugins/groupwise-features/status-track.c:241
-msgid "Track Message Status..."
-msgstr "ସନ�ଦେଶ ଅବସ�ଥିତି ଟ�ରାକ କରନ�ତ�..."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr ""
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+#, fuzzy
+#| msgid "Inline vCards"
+msgid "Inline Image"
+msgstr "�କାଧିକ vCards"
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
 msgstr ""
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "ଶୀର�ଷକଗ�ଡ଼ିକ� ଇଚ�ଛାମ�ତାବକ କରନ�ତ�"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:345
+#: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP ଶୀର�ଷକଗ�ଡ଼ିକ"
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
-msgid "<b>Custom Headers</b>"
-msgstr "<b>ଶୀର�ଷକଗ�ଡ଼ିକ� ଇଚ�ଛାମ�ତାବକ କରନ�ତ�</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers</b>"
-msgstr "<b>IMAP ଶୀର�ଷକଗ�ଡ଼ିକ</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:3
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid "Basic and _Mailing List Headers (Default)"
 msgstr "ମୌଳିକ �ବଂ ମେଲ ତାଲିକା ଶୀର�ଷକଗ�ଡିକ (ପୂର�ବ ନିର�ଦ�ଧାରିତ) (_M)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "ସମସ�ତ ଶୀର�ଷକଗ�ଡ଼ିକ� ଆଣନ�ତ� (_l)"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
+#: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
-"ଉପର ଲିଖିତ ଶୀର�ଷକଗ�ଡ଼ିକ ସହିତ ଆପଣ କାଢ଼ିବାକ� ଚାହ��ଥିବା ଅତିରିକ�ତ ଶୀର�ଷକଗ�ଡ଼ିକ� "
-"ପ�ରଦାନ କରନ�ତ�। \n"
+"ଉପର ଲିଖିତ ଶୀର�ଷକଗ�ଡ଼ିକ ସହିତ ଆପଣ କାଢ଼ିବାକ� ଚାହ��ଥିବା ଅତିରିକ�ତ ଶୀର�ଷକଗ�ଡ଼ିକ� ପ�ରଦାନ କରନ�ତ�। \n"
 "ଯଦି ଆପଣ \"ସମସ�ତ ଶୀର�ଷକଗ�ଡ଼ିକ\"କ� ବାଛନ�ତି ତେବେ �ହାକ� ଅଗ�ରାହ�ୟ କରିପାରିବେ।"
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -16835,7 +17980,7 @@ msgstr ""
 "ଆପଣଙ�କର IMAP ଶୀର�ଷକ ପସନ�ଦଗ�ଡ଼ିକ� ବାଛନ�ତ�। \n"
 "ଆପଣଙ�କ ପାଖରେ ଯେତେ ଅଧିକ ଶୀର�ଷକ ଅଛି ଆହରଣ କରିବା ପାଇ� ଆପଣଙ�କ� ସେତେ ଅଧିକ ସମୟ ଲାଗିବ।"
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -16843,181 +17988,158 @@ msgstr ""
 "ମୌଳିକ ଶୀର�ଷକଗ�ଡିକ - (ତୀବ�ରତର) (_B) \n"
 "ମେଲ ତାଲିକା ଉପରେ ଆଧାରିତ ଛାଣକ ନଥିଲେ �ହାକ� ବ�ୟବହାର କରନ�ତ�"
 
+#: ../plugins/imap-features/imap-headers.ui.h:10
+#, fuzzy
+#| msgid "Fetch A_ll Headers"
+msgid "_Fetch All Headers"
+msgstr "ସମସ�ତ ଶୀର�ଷକଗ�ଡ଼ିକ� ଆଣନ�ତ� (_F)"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "Fine-tune your IMAP accounts."
-msgstr ""
+msgstr "ଆପଣଙ�କର IMAP ଖାତାଗ�ଡ଼ିକ� ନିଖ�ଣ ତାଳଯ�କ�ତ କରନ�ତ�।"
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP ଲକ�ଷଣଗ�ଡିକ"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
-msgid "Hardware Abstraction Layer not loaded"
-msgstr "ହାର�ଡୱେର ଛାଣିବା ସ�ତରକ� ଧାରଣ କରାଯାଇନାହି�"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"\"hald\" ସର�ଭିସଟି ଆବଶ�ୟକ କିନ�ତ� ବର�ତ�ତମାନ ଚାଲ�ନାହି�। ଦୟାକରି �ହି ସର�ଭିସକ� ସକ�ରିୟ କରନ�ତ� �ବଂ �ହି ପ�ରଗ�ରାମକ� ପ�ଣି ଚଲାନ�ତ�, "
-"କିମ�ବା ଆପଣଙ�କର ତନ�ତ�ର ପ�ରଶାସକଙ�କ ସହିତ ଯୋଗାଯୋଗ କରନ�ତ�।"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:82
-msgid "Search for an iPod failed"
-msgstr "iPod ସନ�ଧାନ ବିଫଳ ହୋଇଛି"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:85
-msgid ""
-"Evolution could not find an iPod to synchronize with. Either the iPod is not "
-"connected to the system or it is not powered on."
-msgstr ""
-"Evolution ସମକାଳନ କରିବା ପାଇ� ଗୋଟି� iPod ପାଇଲା ନାହି�। ହ��ତ ସେହି iPod ଟି ସଂଯ�କ�ତ "
-"ହୋଇନାହି� ଅଥବା �ହାକ� ଶକ�ତି ପ�ରଦାନ କରାହୋଇନାହି�।"
-
-#: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:164
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar ସଜ�ଜିକରଣ ଶୈଳୀ (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize to iPod"
-msgstr "iPod ସହିତ ସମକାଳୀନ କରନ�ତ�"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize your data with your Apple iPod."
-msgstr "Apple iPod ସହିତ ଆପଣଙ�କର ତଥ�ୟକ� ସମକାଳୀନ କରନ�ତ�।"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "iPod ସମକାଳୀନ"
-
 #: ../plugins/itip-formatter/itip-formatter.c:482
-#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "କାଲେଣ�ଡର '%s'କ� ଧାରଣ କରିବାରେ ବିଫଳ ହୋଇଛି"
 
-#: ../plugins/itip-formatter/itip-formatter.c:627
+#: ../plugins/itip-formatter/itip-formatter.c:648
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "କ�ୟାଲେଣ�ଡର '%s' ରେ ଥିବା ଗୋଟି� ସାକ�ଷାତକାର �ହି ସାକ�ଷାକତକାର ସହିତ ଦ�ୱନ�ଦ ସୃଷ�ଟି କର�ଅଛି"
 
-#: ../plugins/itip-formatter/itip-formatter.c:663
+#: ../plugins/itip-formatter/itip-formatter.c:684
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "କ�ୟାଲେଣ�ଡର '%s' ରେ ଗୋଟି� ସାକ�ଷାତକାର ମିଳିଲା"
 
-#: ../plugins/itip-formatter/itip-formatter.c:753
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find any calendars"
 msgstr "କୌଣସି କ�ୟାଲେଣ�ଡରକ� ଖୋଜିବାରେ ଅସମର�ଥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:790
 msgid "Unable to find this meeting in any calendar"
 msgstr "କ�ୟାଲେଣ�ଡରରେ ଯେକୌଣସି ସାକ�ଷାତକାରକ� ଖୋଜିବାରେ ଅସମର�ଥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:764
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this task in any task list"
 msgstr "କୌଣସି କାର�ଯ�ୟ ସୂଚୀରେ �ହି କାର�ଯ�ୟକ� ଖୋଜିବାରେ ଅସମର�ଥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this memo in any memo list"
 msgstr "କୌଣସି ସ�ମାରକପତ�ର ତାଲିକାରେ �ହି ସ�ମାରକପତ�ରକ� ଖୋଜିବାରେ ଅସମର�ଥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:839
+#: ../plugins/itip-formatter/itip-formatter.c:872
 msgid "Opening the calendar. Please wait.."
 msgstr "କାଲେଣ�ଡର ଖୋଲ�ଅଛି। ଦୟାକରି ଅପେକ�ଷା କରନ�ତ�.."
 
-#: ../plugins/itip-formatter/itip-formatter.c:842
+#: ../plugins/itip-formatter/itip-formatter.c:875
 msgid "Searching for an existing version of this appointment"
 msgstr "�ହି ସାକ�ଷାତକାରର ଗୋଟି� ସ�ଥିତବାନ ସଂସ�କରଣକ� ସନ�ଧାନ କର�ଅଛି"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1056
 msgid "Unable to parse item"
 msgstr "ବସ�ତ�କ� ବିଶ�ଳେଷଣ କରିବାରେ ଅସମର�ଥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1111
+#: ../plugins/itip-formatter/itip-formatter.c:1143
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "କାଲେଣ�ଡର '%s'କ� ବସ�ତ� ପଠାଇବାରେ ଅସମର�ଥ।  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1155
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ଗ�ରହଣୀୟ ଭାବରେ କାଲେଣ�ଡର '%s'କ� ପଠାଯାଇଛି"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1127
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ଅସ�ଥାୟୀ ଭାବରେ କାଲେଣ�ଡର '%s'କ� ପଠାଯାଇଛି"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1164
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ଅସ�ୱୀକୃତ ଭାବରେ କାଲେଣ�ଡର '%s'କ� ପଠାଯାଇଛି"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1137
+#: ../plugins/itip-formatter/itip-formatter.c:1169
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ବାତିଲ ଭାବରେ କାଲେଣ�ଡର '%s'କ� ପଠାଯାଇଛି"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1263
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ଆୟୋଜକ ପ�ରତିନିଧି %s କ� କାଢ଼ିଦେଇଛନ�ତି"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1270
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ପ�ରତିନିଧିଙ�କ ପାଖକ� ବାତିଲ ହୋଇଥିବା ବିଜ�ଞପ�ତି ପଠାନ�ତ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
+#: ../plugins/itip-formatter/itip-formatter.c:1272
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ପ�ରତିନିଧିଙ�କ ପାଖକ� ବାତିଲ ହୋଇଥିବା ବିଜ�ଞପ�ତି ପଠାଇ ପାରିଲା ନାହି�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1383
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ଶ�ରୋତାମାନଙ�କ ସ�ଥିତିକ� ଅଦ�ୟତନ କରାଯାଇପାରିଲା ନାହି� କାରଣ ସ�ଥିତିଟି ଅବୈଧ ଅଟେ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ଶ�ରୋତାମାନଙ�କ� ଅଦ�ୟତନ କରିବାରେ ଅସମର�ଥ. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1381
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Attendee status updated"
 msgstr "ଶ�ରୋତାମାନଙ�କ ସ�ଥିତିକ� ଅଦ�ୟତନ କରାଯାଇଛି"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1442
 msgid "Meeting information sent"
 msgstr "ସଭା ସୂଚନା ପଠାଯାଇଛି"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Task information sent"
 msgstr "କାର�ଯ�ୟ ସୂଚନା ପଠାଯାଇଛି"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Memo information sent"
 msgstr "ସ�ମାରକ ପତ�ର ସୂଚନା ପଠାଯାଇଛି"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1457
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ସଭା ସୂଚନା ପଠାଇବାରେ ଅସମର�ଥ, ସଭା ଅବସ�ଥିତ ନାହି�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1425
+#: ../plugins/itip-formatter/itip-formatter.c:1460
 msgid "Unable to send task information, the task does not exist"
 msgstr "କାର�ଯ�ୟ ସୂଚନା ପଠାଇବାରେ ଅସମର�ଥ, କାର�ଯ�ୟ ଅବସ�ଥିତ ନାହି�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ସ�ମାରକପତ�ର ସୂଚନା ପଠାଇବାରେ ଅସମର�ଥ, ସ�ମାରକପତ�ର ଅବସ�ଥିତ ନାହି�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1497
-#: ../plugins/itip-formatter/itip-formatter.c:1508
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1528
+#, fuzzy
+#| msgid "Calendars"
+msgid "calendar.ics"
+msgstr "କ�ୟାଲେଣ�ଡର"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1533
+#, fuzzy
+#| msgid "New Calendar"
+msgid "Save Calendar"
+msgstr "ନୂତନ କ�ଯାଲେଣ�ଡର"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1597
 msgid "The calendar attached is not valid"
 msgstr "ସଂଲଗ�ନ କରାଯାଇଥିବା କାଲେଣ�ଡର ବୈଧ ନ�ହ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1498
-#: ../plugins/itip-formatter/itip-formatter.c:1509
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17025,27 +18147,27 @@ msgstr ""
 "ସନ�ଦେଶଟି ଗୋଟି� କ�ୟାଲେଣ�ଡର ଧାରଣ କରିଅଛି ବୋଲି ଅଭିଯୋଗ କର�ଅଛି, କିନ�ତ� କ�ୟାଲେଣ�ଡରଟି ଗୋଟି� ବୈଧ "
 "iCalendar ନ�ହ�।"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1549
-#: ../plugins/itip-formatter/itip-formatter.c:1577
-#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1638
+#: ../plugins/itip-formatter/itip-formatter.c:1666
+#: ../plugins/itip-formatter/itip-formatter.c:1772
 msgid "The item in the calendar is not valid"
 msgstr "କାଲେଣ�ଡର ଭିତରେ ଥିବା ବସ�ତ�ଟି ବୈଧ ନ�ହ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1550
-#: ../plugins/itip-formatter/itip-formatter.c:1578
-#: ../plugins/itip-formatter/itip-formatter.c:1670
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 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:1589
+#: ../plugins/itip-formatter/itip-formatter.c:1680
 msgid "The calendar attached contains multiple items"
 msgstr "ସଂଲଗ�ନ ହୋଇଥିବା କାଲେଣ�ଡରଟି �କାଧିକ ବସ�ତ� ଧାରଣ କରିଅଛି"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1590
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17053,40 +18175,34 @@ msgstr ""
 "�ହି ସମସ�ତ ବସ�ତ�ଗ�ଡ଼ିକ� କାର�ଯ�ୟକାରୀ କରିବା ପାଇ�, ଫାଇଲକ� ସଂରକ�ଷଣ କରିବା ଉଚିତ �ବଂ କ�ୟାଲେଣ�ଡରକ� "
 "ଆମଦାନୀ କରାଯାଇଥା�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2319
+#: ../plugins/itip-formatter/itip-formatter.c:2451
 msgid "This meeting recurs"
 msgstr "�ହି ସାକ�ଷାତକାରଟି ପ�ଣି ଘଟିଥା�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2322
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "This task recurs"
 msgstr "�ହି କାର�ଯ�ୟଟି ପ�ଣି ଘଟିଥା�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2325
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "This memo recurs"
 msgstr "�ହି ମେମୋଟି ପ�ଣି ଘଟିଥା�"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2561
+#: ../plugins/itip-formatter/itip-formatter.c:2691
 msgid "_Delete message after acting"
 msgstr "କାର�ୟ�ୟ ସମାପ�ତ ହେବା ପରେ ସନ�ଦେଶକ� ଅପସାରଣ କରନ�ତ� (_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2571
-#: ../plugins/itip-formatter/itip-formatter.c:2604
+#: ../plugins/itip-formatter/itip-formatter.c:2701
+#: ../plugins/itip-formatter/itip-formatter.c:2734
 msgid "Conflict Search"
 msgstr "ଦ�ୱନ�ଦ ସନ�ଧାନ"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2586
+#: ../plugins/itip-formatter/itip-formatter.c:2716
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ସାକ�ଷାତକାର ଦ�ୱନ�ଦଗ�ଡ଼ିକ� ସନ�ଧାନ କରିବା ପାଇ� ଗୋଟି� କ�ୟାଲେଣ�ଡର ବାଛନ�ତ�"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:308
-msgid "Today"
-msgstr "ଆଜି"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
@@ -17105,11 +18221,6 @@ msgstr "ଆଜି %H:%M:%S"
 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:219
-msgid "Tomorrow"
-msgstr "ଆସନ�ତାକାଲି"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
@@ -17224,331 +18335,407 @@ msgstr "%A, %B %e, %Y %l:%M %p"
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
+#, fuzzy, c-format
+#| msgid "Please respond on behalf of <b>%s</b>"
+msgid "Please respond on behalf of %s"
 msgstr "<b>%s</b> ପାଇ� ଦୟାକରି ଉତ�ତର ଦିଅନ�ତ�"
 
-#: ../plugins/itip-formatter/itip-view.c:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:529
-#, c-format
-msgid "Received on behalf of <b>%s</b>"
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
+#, fuzzy, c-format
+#| msgid "Received on behalf of <b>%s</b>"
+msgid "Received on behalf of %s"
 msgstr "<b>%s</b> ପାଇ� ଗ�ରହଣ କରିଅଛି"
 
-#: ../plugins/itip-formatter/itip-view.c:358
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
+#: ../plugins/itip-formatter/itip-view.c:374
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s has published the following meeting information:"
+msgid "%s through %s has published the following meeting information:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ସଭା ସୂଚନାକ� ପ�ରକାଶ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:360
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
+#: ../plugins/itip-formatter/itip-view.c:376
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published the following meeting information:"
+msgid "%s has published the following meeting information:"
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ସଭାର ସୂଚନାକ� ପ�ରକାଶ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:365
-#, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
+#: ../plugins/itip-formatter/itip-view.c:381
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has delegated the following meeting to you:"
+msgid "%s has delegated the following meeting to you:"
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ସଭାର ପ�ରତିନିଧିତ�ତ�ୱ ଆପଣଙ�କ� ନ�ୟସ�ତ କରିଛନ�ତି:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
-#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:384
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s requests your presence at the following meeting:"
+msgid "%s through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ସଭାରେ ଆପଣଙ�କର ଉପସ�ଥିତି କାମନା କର�ଛନ�ତି:"
 
-#: ../plugins/itip-formatter/itip-view.c:370
-#, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:386
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests your presence at the following meeting:"
+msgid "%s requests your presence at the following meeting:"
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ସଭାରେ ଆପଣଙ�କର ଉପସ�ଥିତି କାମନା କର�ଛନ�ତି:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+#: ../plugins/itip-formatter/itip-view.c:392
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ଗୋଟି� ସ�ଥିତବାନ ସଭାକ� ଯୋଗକରିବାକ� ଚାହ��ଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
+#: ../plugins/itip-formatter/itip-view.c:394
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgid "%s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ଗୋଟି� ସ�ଥିତବାନ ସଭାକ� ଯୋଗକରିବାକ� ଚାହ��ଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
-#, c-format
+#: ../plugins/itip-formatter/itip-view.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s wishes to receive the latest information for the "
+#| "following meeting:"
 msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ସଭାର ନୂତନତମ ସୂଚନା ଗ�ରହଣ କରିବା ପାଇ� ଆଶା କର�ଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:400
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> wishes to receive the latest information for the following "
+#| "meeting:"
+msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ସଭାର ନୂତନତମ ସୂଚନା ଗ�ରହଣ କରିବା ପାଇ� ଆଶା କର�ଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
-#, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
+#: ../plugins/itip-formatter/itip-view.c:404
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgid "%s through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ସଭା ଉତ�ତରକ� ପଛକ� ପଠାଇଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:390
-#, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
+#: ../plugins/itip-formatter/itip-view.c:406
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has sent back the following meeting response:"
+msgid "%s has sent back the following meeting response:"
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ସଭା ଉତ�ତରକ� ପଛକ� ପଠାଇଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:410
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has canceled the following meeting:"
+msgid "%s through %s has canceled the following meeting:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ସଭାକ� ବାତିଲ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:396
-#, c-format
-msgid "<b>%s</b> has canceled the following meeting."
+#: ../plugins/itip-formatter/itip-view.c:412
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled the following meeting."
+msgid "%s has canceled the following meeting."
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ସଭାକ� ବାତିଲ କରିଅଛି।"
 
-#: ../plugins/itip-formatter/itip-view.c:400
-#, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:416
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgid "%s through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ସଭାର ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ପ�ରସ�ତାବ ଦେଇଅଛି।"
 
-#: ../plugins/itip-formatter/itip-view.c:402
-#, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:418
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has proposed the following meeting changes."
+msgid "%s has proposed the following meeting changes."
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ସଭାର ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ପ�ରସ�ତାବ ଦେଇଅଛି।"
 
-#: ../plugins/itip-formatter/itip-view.c:406
-#, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
+#: ../plugins/itip-formatter/itip-view.c:422
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgid "%s through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ସଭା ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ପ�ରତ�ୟାଖ�ୟାନ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:408
-#, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:424
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has declined the following meeting changes."
+msgid "%s has declined the following meeting changes."
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ସଭା ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ପ�ରତ�ୟାଖ�ୟାନ କରିଅଛି।"
 
-#: ../plugins/itip-formatter/itip-view.c:446
-#, c-format
-msgid "<b>%s</b> through %s has published the following task:"
+#: ../plugins/itip-formatter/itip-view.c:462
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has published the following task:"
+msgid "%s through %s has published the following task:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ କାର�ଯ�ୟକ� ପ�ରକାଶ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:448
-#, c-format
-msgid "<b>%s</b> has published the following task:"
+#: ../plugins/itip-formatter/itip-view.c:464
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published the following task:"
+msgid "%s has published the following task:"
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ କାର�ଯ�ୟକ� ପ�ରକାଶ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
-#, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
+#: ../plugins/itip-formatter/itip-view.c:469
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgid "%s requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ କାର�ଯ�ୟକ� %s ର କାର�ଯ�ୟଭାର ପାଇ� ଅନ�ରୋଧ କରିଥା�:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
-#, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
+#: ../plugins/itip-formatter/itip-view.c:472
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has assigned you a task:"
+msgid "%s through %s has assigned you a task:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ଆପଣଙ�କ� ଗୋଟି� କାର�ଯ�ୟଭାର ନ�ୟସ�ତ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:458
-#, c-format
-msgid "<b>%s</b> has assigned you a task:"
+#: ../plugins/itip-formatter/itip-view.c:474
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has assigned you a task:"
+msgid "%s has assigned you a task:"
 msgstr "<b>%s</b> ଆପଣଙ�କ� ଗୋଟି� କାର�ଯ�ୟଭାର ନ�ୟସ�ତ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
+#: ../plugins/itip-formatter/itip-view.c:480
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgid "%s through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ଗୋଟି� ସ�ଥିତବାନ କାର�ଯ�ୟକ� ଯୋଗ କରିବା ପାଇ� ଇଚ�ଛାପ�ରକାଶ କର�ଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:466
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
+#: ../plugins/itip-formatter/itip-view.c:482
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to add to an existing task:"
+msgid "%s wishes to add to an existing task:"
 msgstr "<b>%s</b> ଗୋଟି� ସ�ଥିତବାନ କାର�ଯ�ୟକ� ଯୋଗ କରିବା ପାଇ� ଇଚ�ଛାପ�ରକାଶ କର�ଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
-#, c-format
+#: ../plugins/itip-formatter/itip-view.c:486
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s wishes to receive the latest information for the "
+#| "following assigned task:"
 msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ନ�ୟସ�ତ କାର�ଯ�ୟର ସାମ�ପ�ରତିକ ସୂଚନା ଗ�ରହଣ କରିବାକ� ଇଚ�ଛାପ�ରକାଶ କର�ଅଛି:"
-
-#: ../plugins/itip-formatter/itip-view.c:472
-#, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
+"%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 msgstr ""
-"<b>%s</b> ନିମ�ନଲିଖିତ ନ�ୟସ�ତ କାର�ଯ�ୟର ସାମ�ପ�ରତିକ ସୂଚନା ଗ�ରହଣ କରିବାକ� "
-"ଇଚ�ଛାପ�ରକାଶ କର�ଅଛି:"
+"<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ନ�ୟସ�ତ କାର�ଯ�ୟର ସାମ�ପ�ରତିକ ସୂଚନା ଗ�ରହଣ କରିବାକ� ଇଚ�ଛାପ�ରକାଶ "
+"କର�ଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
-#, c-format
-msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+#: ../plugins/itip-formatter/itip-view.c:488
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> wishes to receive the latest information for the following "
+#| "assigned task:"
+msgid "%s wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ନ�ୟସ�ତ କାର�ଯ�ୟର ସାମ�ପ�ରତିକ ସୂଚନା ଗ�ରହଣ କରିବାକ� ଇଚ�ଛାପ�ରକାଶ କର�ଅଛି:"
+
+#: ../plugins/itip-formatter/itip-view.c:492
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "%s through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ନ�ୟସ�ତ କାର�ଯ�ୟର ଉତ�ତରକ� ପଛକ� ପଠାଇଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:478
-#, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
+#: ../plugins/itip-formatter/itip-view.c:494
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has sent back the following assigned task response:"
+msgid "%s has sent back the following assigned task response:"
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ନ�ୟସ�ତ କାର�ଯ�ୟର ଉତ�ତରକ� ପଛକ� ପଠାଇଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:498
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgid "%s through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ନ�ୟସ�ତ କାର�ଯ�ଯକ� ବାତିଲ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
-#, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:500
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled the following assigned task:"
+msgid "%s has canceled the following assigned task:"
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ନ�ୟସ�ତ କାର�ଯ�ଯକ� ବାତିଲ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
-#, c-format
-msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+#: ../plugins/itip-formatter/itip-view.c:504
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ନ�ୟସ�ତ କାର�ଯ�ୟଭାର ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ପ�ରସ�ତାବିତ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:490
-#, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
+#: ../plugins/itip-formatter/itip-view.c:506
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgid "%s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ନ�ୟସ�ତ କାର�ଯ�ୟଭାର ପରିବର�ତ�ତନଗ�ଡ଼ିକ� ପ�ରସ�ତାବିତ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
-#, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:510
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgid "%s through %s has declined the following assigned task:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ନ�ୟସ�ତ କାର�ଯ�ୟକ� ପ�ରତ�ୟାଖ�ଯାନ କରିଥା�:"
 
-#: ../plugins/itip-formatter/itip-view.c:496
-#, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:512
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has declined the following assigned task:"
+msgid "%s has declined the following assigned task:"
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ନ�ୟସ�ତ କାର�ଯ�ୟକ� ପ�ରତ�ୟାଖ�ଯାନ କରିଥା�:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
-#, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
+#: ../plugins/itip-formatter/itip-view.c:549
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has published the following memo:"
+msgid "%s through %s has published the following memo:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ମେମୋକ� ପ�ରକାଶିତ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:536
-#, c-format
-msgid "<b>%s</b> has published the following memo:"
+#: ../plugins/itip-formatter/itip-view.c:551
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published the following memo:"
+msgid "%s has published the following memo:"
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ମେମୋକ� ପ�ରକାଶିତ କରିଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+#: ../plugins/itip-formatter/itip-view.c:556
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgid "%s through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ଗୋଟି� ସ�ଥିତବାନ ମେମୋକ� ଯୋଗ କରିବା ପାଇ� ଚାହ��ଅଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:543
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
+#: ../plugins/itip-formatter/itip-view.c:558
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to add to an existing memo:"
+msgid "%s wishes to add to an existing memo:"
 msgstr "<b>%s</b> ଗୋଟି� ସ�ଥିତବାନ ସ�ମାରକ ପତ�ରରେ ଯୋଗ କରିବା ପାଇ� ଇଚ�ଛାକରିଥା�:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
+#: ../plugins/itip-formatter/itip-view.c:562
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgid "%s through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> %s ମାଧ�ଯମରେ ନିମ�ନଲିଖିତ ସହଭାଗୀ ସ�ମାରକପତ�ରକ� ବାତିଲ କରିଛି:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
-#, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
+#: ../plugins/itip-formatter/itip-view.c:564
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled the following shared memo:"
+msgid "%s has canceled the following shared memo:"
 msgstr "<b>%s</b> ନିମ�ନଲିଖିତ ସହଭାଗୀ ମେମୋକ� ବାତିଲ କରିଛି:"
 
+#: ../plugins/itip-formatter/itip-view.c:688
+msgid "All day:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:698
+#, fuzzy
+#| msgid "Sta_rt date:"
+msgid "Start day:"
+msgstr "ତାରିଖ ପ�ରାରମ�ଭ କରନ�ତ� (_r):"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
+msgid "Start time:"
+msgstr "ଆରମ�ଭ ସମୟ:"
+
+#: ../plugins/itip-formatter/itip-view.c:710
+#, fuzzy
+#| msgid "%d day"
+#| msgid_plural "%d days"
+msgid "End day:"
+msgstr "%d ଦିନ"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
+msgid "End time:"
+msgstr "ସମାପ�ତି ସମୟ:"
+
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:824
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "କ�ଯାଲେଣ�ଡର ଖୋଲନ�ତ� (_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "_ଅସ�ବୀକାର"
 
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:836
-#: ../plugins/itip-formatter/itip-view.c:843
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:864
-msgid "_Accept"
-msgstr "_ସ�ବୀକାର କର"
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+#, fuzzy
+#| msgid "Accept"
+msgid "A_ccept"
+msgstr "ଗ�ରହଣକର"
 
-#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "ସମସ�ତଙ�କ� ହ�ରାସ କରନ�ତ� (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "ସମସ�ତ ଚେଷ�ଟାକୃତ (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "ଚେଷ�ଟାକୃତ (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:836
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:855
+#, fuzzy
+#| msgid "_Accept all"
+msgid "A_ccept all"
 msgstr "ସମସ�ତଙ�କ� ଗ�ରହଣକରନ�ତ� (_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:847
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "ସୂଚନା ପଠାନ�ତ� (_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "ଅଂଶଗ�ରହଣକର�ତ�ତା ସ�ଥିତିକ� ଅଦ�ୟତନ କରନ�ତ� (_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "ଅଦ�ଯତନ (_U)"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1034
-msgid "Start time:"
-msgstr "ଆରମ�ଭ ସମୟ:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1045
-msgid "End time:"
-msgstr "ସମାପ�ତି ସମୟ:"
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1065
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "ଟିପ�ପଣୀ:"
 
-#: ../plugins/itip-formatter/itip-view.c:1104
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "ପ�ରେରକଙ�କ ପାଖକ� ଉତ�ତର ପଠାନ�ତ� (_r)"
 
-#: ../plugins/itip-formatter/itip-view.c:1134
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "ଅଂଶଗ�ରହଣକାରୀଙ�କ ପାଖକ� ଅଦ�ୟତନଗ�ଡ଼ିକ� ପଠାନ�ତ� (_u)"
 
-#: ../plugins/itip-formatter/itip-view.c:1143
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "ସମସ�ତ ଦ�ର�ଷ�ଟାନ�ତରେ ପ�ରୟୋଗ କରନ�ତ� (_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
-#| msgid "Show Side _Bar"
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "ପାର�ଶ�ବ ପଟିକ� ପ�ରଦର�ଶନ କରନ�ତ� (_B)"
 
-#: ../plugins/itip-formatter/itip-view.c:1155
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "ମୋର ସ�ମାରକକ� ସଂରକ�ଷଣ କରନ�ତ� (_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1161
-#| msgid "Sh_ow a reminder"
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "ଗୋଟି� ସ�ମାରକପତ�ର ଦେଖାନ�ତ� (_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1923
+msgid "_Tasks:"
+msgstr "କାର�ଯ�ଯ (_T):"
+
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "ସ�ମାରକପତ�ର (_M):"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-#| msgid "Displays text/calendar parts in messages."
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "ପାଠ�ଯ/କାଲେଣ�ଡର ଅଂଶବିଶେଷକ� ସନ�ଦେଶରେ ଦର�ଶାନ�ତ�।"
 
@@ -17572,18 +18759,6 @@ 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:46
-msgid "Proxy _Logout"
-msgstr "ପ�ରକ�ସି ଲଗଆଉଟ (_L)"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Disable Account"
-msgstr "ଖାତାକ� ନିଷ�କ�ରିୟ କରନ�ତ�"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-msgid "Disable an account by right-clicking on it in the folder tree."
-msgstr ""
-
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "ଶବ�ଦ ଫାଇଲକ� ଦପଦପ କରନ�ତ� ଅଥବା ଚଲାନ�ତ�। "
@@ -17619,51 +18794,58 @@ msgid "Play sound when new messages arrive."
 msgstr "ନୂତନ ସନ�ଦେଶ ଆସିବା ସମୟରେ ଧ�ୱନି ଚଲାନ�ତ�।"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#, fuzzy
+#| msgid ""
+#| "Sound file to be played when new messages arrive, if not in beep mode."
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr "ନୂତନ ସନ�ଦେଶ ଆସିବା ସମୟରେ ଚଲାଇବାକ� ଥିବା ଧ�ୱନି ଫାଇଲ ନାମ, ଯଦି ଦପଦପ ଅବସ�ଥାରେ ନାହି�।"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
 msgstr "ଚିତ�ରସଙ�କେତ ସହିତ ପପଅପ ସନ�ଦେଶ।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "ନୂତନ ସନ�ଦେଶ ଆସିବା ସମୟରେ ବିଜ�ଞପ�ତି କ�ଷେତ�ରରେ ନୂତନ ମେଲ ଚିତ�ରସଂକେତକ� ଦର�ଶାନ�ତ�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
 msgstr "ଚଲାଇବା ପାଇ� ଧ�ୱନି ଫାଇଲ ନାମ।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "ନୂତନ ସନ�ଦେଶ ଆସିବା ସମୟରେ ଚଲାଇବାକ� ଥିବା ଧ�ୱନି ଫାଇଲ ନାମ, ଯଦି ଦପଦପ ଅବସ�ଥାରେ ନାହି�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Use sound theme"
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "ନୂତନ ସନ�ଦେଶ ଆସିବା ସମୟରେ ଧ�ୱନି ଅଥବା ଦପଦପ ଚଲାଇବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "ନୂତନ ସନ�ଦେଶ ଆସିବା ସମୟରେ ଚିତ�ରସଂକେତ ଉପରେ ସନ�ଦେଶକ� ଦର�ଶାଇବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
 msgid "Whether the icon should blink or not."
 msgstr "ଚିତ�ରସଙ�କେତ ଦପଦପ ହେବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "କେବଳ ଇନବକ�ସ ଫୋଲଡରରେ ନୂତନ ସନ�ଦେଶଗ�ଡ଼ିକ� ସୂଚାଇବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../plugins/mail-notification/mail-notification.c:256
-msgid "Generate a _D-Bus message"
-msgstr "D-Bus ସନ�ଦେଶ ସୃଷ�ଟି କର�ଅଛି (_D)"
-
-#: ../plugins/mail-notification/mail-notification.c:379
+#: ../plugins/mail-notification/mail-notification.c:346
 msgid "Evolution's Mail Notification"
 msgstr "Evolution ର ମେଲ ବିଜ�ଞପ�ତି"
 
-#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Mail Notification Properties"
 msgstr "ମେଲ ବିଜ�ଞପ�ତି ଗ�ଣଧର�ମ"
 
-#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:479
+#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:499
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17678,185 +18860,341 @@ msgstr[1] ""
 "ଆପଣ %d ଟି ନୂତନ ସନ�ଦେଶ\n"
 "ଗ�ରହଣ କରିଛନ�ତି %s ରେ ।"
 
-#: ../plugins/mail-notification/mail-notification.c:484
+#. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
+#: ../plugins/mail-notification/mail-notification.c:510
+#, fuzzy, c-format
+#| msgid "From %s:"
+msgid "From: %s"
+msgstr "%s ଠାର�:"
+
+#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:522
+#, fuzzy, c-format
+#| msgid "Subject:"
+msgid "Subject: %s"
+msgstr "ବିଷୟ:"
+
+#: ../plugins/mail-notification/mail-notification.c:531
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "ଆପଣ %d ଟି ନୂତନ ସନ�ଦେଶ ଗ�ରହଣ କରିଛନ�ତି।"
 msgstr[1] "ଆପଣ %d ଟି ନୂତନ ସନ�ଦେଶ ଗ�ରହଣ କରିଛନ�ତି।"
 
-#: ../plugins/mail-notification/mail-notification.c:501
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:554
 msgid "New email"
 msgstr "ନୂତନ ମେଲ"
 
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:608
 msgid "Show icon in _notification area"
 msgstr "ବିଜ�ଞପ�ତି କ�ଷେତ�ରରେ ଚିତ�ରସଙ�କେତ ଦର�ଶାନ�ତ� (_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:569
+#: ../plugins/mail-notification/mail-notification.c:636
 msgid "B_link icon in notification area"
 msgstr "ସୂଚନା ପରିସରରେ ଦପଦପ ଚିତ�ରସଙ�କେତ (_l)"
 
-#: ../plugins/mail-notification/mail-notification.c:571
+#: ../plugins/mail-notification/mail-notification.c:646
 msgid "Popup _message together with the icon"
 msgstr "ଚିତ�ରସଙ�କେତ ସହିତ ପପ-ଅପ ସନ�ଦେଶ (_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:831
 msgid "_Play sound when new messages arrive"
 msgstr "ନୂତନ ସନ�ଦେଶ ଆସିବା ସମୟରେ ଧ�ୱନି ଚଲାନ�ତ� (_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:860
 msgid "_Beep"
 msgstr "ଦପଦପ (_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:759
-msgid "Play _sound file"
-msgstr "ଶବ�ଦ ଫାଇଲକ� ଚଲାନ�ତ� (_s)"
+#: ../plugins/mail-notification/mail-notification.c:873
+msgid "Use sound _theme"
+msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:770
-msgid "Specify _filename:"
-msgstr "ଫାଇଲ ନାମକ� ଉଲ�ଲେଖ କରନ�ତ� (_f):"
+#: ../plugins/mail-notification/mail-notification.c:892
+#, fuzzy
+#| msgid "Play _sound file"
+msgid "Play _file:"
+msgstr "ଶବ�ଦ ଫାଇଲକ� ଚଲାନ�ତ� (_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:771
+#: ../plugins/mail-notification/mail-notification.c:903
 msgid "Select sound file"
 msgstr "ଶବ�ଦ ଫାଇଲକ� ଚୟନ କରନ�ତ�"
 
-#: ../plugins/mail-notification/mail-notification.c:772
-msgid "Pl_ay"
-msgstr "ଚଲାନ�ତ� (_a)"
-
-#: ../plugins/mail-notification/mail-notification.c:829
+#: ../plugins/mail-notification/mail-notification.c:961
 msgid "Notify new messages for _Inbox only"
 msgstr "କେବଳ ଇନବକ�ସ ପାଇ� ନୂତନ ସନ�ଦେଶ ସୂଚୀତ କରନ�ତ� (_I)"
 
+#: ../plugins/mail-notification/mail-notification.c:970
+msgid "Generate a _D-Bus message"
+msgstr "D-Bus ସନ�ଦେଶ ସୃଷ�ଟି କର�ଅଛି (_D)"
+
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "ଡାକ ସୂଚନା"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-#| msgid "Play sound when new messages arrive."
 msgid "Notifies you when new mail messages arrive."
 msgstr "ନୂତନ ସନ�ଦେଶ ଆସିବା ସମୟରେ ଧ�ୱନି ଚଲାନ�ତ�।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:343
+#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
+#: ../plugins/mail-to-task/mail-to-task.c:158
+#, c-format
+msgid "Created from a mail by %s"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:489
+#, c-format
+msgid ""
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
+msgstr ""
+"ବଚ�ଛିତ କ�ୟାଲେଣ�ଡର ପୂର�ବର� ଘଟଣା '%s' କ� ଧାରଣ କରିଥା�। ଆପଣ ସେହି ପ�ର�ଣା ଘଟଣାକ� ସମ�ପାଦନ କରିବାକ� "
+"ଚାହ��ଛନ�ତି କି?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:492
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
+"ବଚ�ଛିତ କାର�ଯ�ୟସୂଚୀ କାର�ଯ�ୟ '%s' କ� ପୂର�ବର� ଧାରଣ କରିଅଛି। ଆପଣ ସେହି ପ�ର�ଣା କାର�ଯ�ୟକ� ସମ�ପାଦନ କରିବାକ� "
+"ଚାହ��ଛନ�ତି କି?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:495
+#, c-format
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+msgstr ""
+"ବଚ�ଛିତ ମେମୋ ସୂଚୀ ମେମୋ '%s' କ� ପୂର�ବର� ଧାରଣ କରିଅଛି। ଆପଣ ସେହି ପ�ର�ଣା ମେମୋକ� ସମ�ପାଦନ କରିବାକ� "
+"ଚାହ��ଛନ�ତି କି?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:512
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr ""
+"ପ�ରଦତ�ତ ମେଲ ପାଇ� ବଚ�ଛିତ କ�ୟାଲେଣ�ଡର କିଛି ଘଟଣାକ� ପୂର�ବର� ଧାରଣ କରିଅଛି। ଆପଣ ଯେକୌଣସି ପ�ରକାରେ ନୂତନ "
+"ଘଟଣା ନିର�ମାଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:515
+msgid ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
+msgstr ""
+"ପ�ରଦତ�ତ ମେଲ ପାଇ� ବଚ�ଛିତ କାର�ଯ�ୟ ସୂଚୀ କିଛି କାର�ଯ�ୟକ� ପୂର�ବର� ଧାରଣ କରିଅଛି। ଆପଣ ଯେକୌଣସି ପ�ରକାରେ ନୂତନ "
+"କାର�ଯ�ୟସୂଚୀ ନିର�ମାଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:518
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr ""
+"ପ�ରଦତ�ତ ମେଲଗ�ଡ଼ିକ ପାଇ� ବଚ�ଛିତ ମେମୋ ତାଲିକା କିଛି ମେମୋକ� ପୂର�ବର� ଧାରଣ କରିଅଛି। ଆପଣ ଯେକୌଣସି ପ�ରକାରେ "
+"ନୂତନ ମେମୋ ତାଲିକା ନିର�ମାଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:536
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
+msgstr[0] ""
+"ପ�ରଦତ�ତ ମେଲ ପାଇ� ବଚ�ଛିତ କ�ୟାଲେଣ�ଡର କିଛି ଘଟଣାକ� ପୂର�ବର� ଧାରଣ କରିଅଛି। ଆପଣ ଯେକୌଣସି ପ�ରକାରେ ନୂତନ "
+"ଘଟଣା ନିର�ମାଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
+msgstr[1] ""
+"ପ�ରଦତ�ତ ମେଲ ପାଇ� ବଚ�ଛିତ କ�ୟାଲେଣ�ଡର କିଛି ଘଟଣାକ� ପୂର�ବର� ଧାରଣ କରିଅଛି। ଆପଣ ଯେକୌଣସି ପ�ରକାରେ ନୂତନ "
+"ଘଟଣା ନିର�ମାଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:542
+msgid ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
+msgstr[0] ""
+"ପ�ରଦତ�ତ ମେଲ ପାଇ� ବଚ�ଛିତ କାର�ଯ�ୟସୂଚୀ ଗୋଟି� ଘଟଣାକ� ପୂର�ବର� ଧାରଣ କରିଅଛି। ଆପଣ ଯେକୌଣସି ପ�ରକାରେ ନୂତନ "
+"କାର�ଯ�ୟ ନିର�ମାଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
+msgstr[1] ""
+"ପ�ରଦତ�ତ ମେଲ ପାଇ� ବଚ�ଛିତ କାର�ଯ�ୟସୂଚୀ ଗୋଟି� ଘଟଣାକ� ପୂର�ବର� ଧାରଣ କରିଅଛି। ଆପଣ ଯେକୌଣସି ପ�ରକାରେ ନୂତନ "
+"କାର�ଯ�ୟ ନିର�ମାଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:548
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] ""
+"ପ�ରଦତ�ତ ମେଲ ପାଇ� ବଚ�ଛିତ ମେମୋ ତାଲିକା ଗୋଟି� ମେମୋକ� ପୂର�ବର� ଧାରଣ କରିଅଛି। ଆପଣ ଯେକୌଣସି ପ�ରକାରେ "
+"ନୂତନ ମେମୋ ନିର�ମାଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
+msgstr[1] ""
+"ପ�ରଦତ�ତ ମେଲ ପାଇ� ବଚ�ଛିତ ମେମୋ ତାଲିକା ଗୋଟି� ମେମୋକ� ପୂର�ବର� ଧାରଣ କରିଅଛି। ଆପଣ ଯେକୌଣସି ପ�ରକାରେ "
+"ନୂତନ ମେମୋ ନିର�ମାଣ କରିବାକ� ଚାହ��ଛନ�ତି କି?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:607
+#, fuzzy
+#| msgid "No Summary"
+msgid "[No Summary]"
+msgstr "[କୌଣସି ସାରାଂଶ ନାହି�]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:618
+msgid "Invalid object returned from a server"
+msgstr "ଅବୈଧ ବସ�ତ� ଗୋଟି� ସର�ଭରର� ଫେରିଥା�"
+
+#: ../plugins/mail-to-task/mail-to-task.c:689
+#, fuzzy, c-format
+#| msgid "An error occurred while printing"
+msgid "An error occurred during processing: %s"
+msgstr "କାର�ଯ�ୟକାରୀ କରିବା ସମୟରେ ଗୋଟି� ତ�ର�ଟି ଘଟିଲା: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:718
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "କ�ୟାଲେଣ�ଡର ଖୋଲି ପାରିବେ ନାହି�। %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:350
+#: ../plugins/mail-to-task/mail-to-task.c:725
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr "ଚୟିତ ଉତ�ସ ଅଟେ ପଢନ�ତ� ମନୋନୀତ କର ଅନ�ଯ ଉତ�ସ."
 
-#: ../plugins/mail-to-task/mail-to-task.c:353
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr ""
-"ବଚ�ଛିତ ଉତ�ସଟି କେବଳ ପଠନୀୟ ଅଟେ, ତେଣ� ସେଠାରେ କାର�ଯ�ୟଭାର ସୃଷ�ଟି କରିପାରିବ ନାହି�। ଅନ�ୟାନ�ୟ "
-"ଉତ�ସକ� ଦୟାକରି ବାଛନ�ତ�।"
+"ବଚ�ଛିତ ଉତ�ସଟି କେବଳ ପଠନୀୟ ଅଟେ, ତେଣ� ସେଠାରେ କାର�ଯ�ୟଭାର ସୃଷ�ଟି କରିପାରିବ ନାହି�। ଅନ�ୟାନ�ୟ ଉତ�ସକ� "
+"ଦୟାକରି ବାଛନ�ତ�।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:356
+#: ../plugins/mail-to-task/mail-to-task.c:731
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr "ଚୟିତ ଉତ�ସ ଅଟେ ପଢନ�ତ� ମନୋନୀତ କର ଅନ�ଯ ଉତ�ସ."
 
-#: ../plugins/mail-to-task/mail-to-task.c:455
-#, c-format
-msgid "Could not create object. %s"
-msgstr "ବସ�ତ� ନିର�ମାଣ କରିପାରିଲା ନାହି�। %s"
-
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/mail-to-task/mail-to-task.c:934
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "ଉତ�ସ ତାଲିକାକ� ପ�ରାପ�ତ କରିପାରିବେ ନାହି�। %s"
 
+#: ../plugins/mail-to-task/mail-to-task.c:1053
+#, fuzzy
+#| msgid "Convert to an _Event"
+msgid "Create an _Event"
+msgstr "ଗୋଟି� ଘଟଣା ନିର�ମାଣ କରନ�ତ� (_E)"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1055
+#, fuzzy
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new event from the selected message"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶର� ନୂତନ ଘଟଣା ନିର�ମାଣ କରନ�ତ�"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1060
+#, fuzzy
+#| msgid "Create a new memo"
+msgid "Create a Mem_o"
+msgstr "ଗୋଟି� Memo ସୃଷ�ଟି କରନ�ତ� (_o)"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1062
+#, fuzzy
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new memo from the selected message"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶର� ଗୋଟି� ନୂତନ ମେମୋ ନିର�ମାଣ କରନ�ତ�"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1067
+#, fuzzy
+#| msgid "Create a new task"
+msgid "Create a _Task"
+msgstr "ଗୋଟି� କାର�ଯ�ୟ ସୃଷ�ଟି କରନ�ତ� (_T)"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1069
+#, fuzzy
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new task from the selected message"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶର� ଗୋଟି� ନୂତନ କାର�ଯ�ୟ ସୃଷ�ଟି କରନ�ତ�"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1077
+#, fuzzy
+#| msgid "Convert to a _Meeting"
+msgid "Create a _Meeting"
+msgstr "ଗୋଟି� ସାକ�ଷାତକାର ନିର�ମାଣ କରନ�ତ� (_M)"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1079
+#, fuzzy
+#| msgid "Create a new meeting request"
+msgid "Create a new meeting from the selected message"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶର� ଗୋଟି� ନୂତନ ସାକ�ଷାତକାର ନିର�ମାଣ କରନ�ତ�"
+
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-#| msgid "Convert the selected message to a new task"
 msgid "Convert a mail message to a task."
 msgstr "ବଚ�ଛିତ ସନ�ଦେଶକ� ଗୋଟି� ନୂତନ ତାଲିକାରେ ରୂପାନ�ତର କରନ�ତ�"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
-msgid "Convert to a Mem_o"
-msgstr "ଗୋଟି� ମେମୋରେ ରୂପାନ�ତର କରନ�ତ� (_o)"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
-msgid "Convert to a _Meeting"
-msgstr "ଗୋଟି� ସାକ�ଷାତକାରରେ ରୂପାନ�ତର କରନ�ତ� (_M)"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
-msgid "Convert to a _Task"
-msgstr "ଗୋଟି� କାର�ଯ�ୟକ� ରୂପାନ�ତର କରନ�ତ� (_T)"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
-msgid "Convert to an _Event"
-msgstr "ଗୋଟି� ଘଟଣାକ� ରୂପାନ�ତର କରନ�ତ� (_E)"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
-#| msgid "Mail to task"
-msgid "Mail-to-Task"
-msgstr "କାର�ଯ�ୟକ� ମେଲ"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Convert the selected message to a new event"
-msgstr "ବଚ�ଛିତ ସନ�ଦେଶକ� ଗୋଟି� ନୂତନ ଘଟଣାରେ ରୂପାନ�ତର କରନ�ତ�"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new meeting"
-msgstr "ବଚ�ଛିତ ସନ�ଦେଶକ� ଗୋଟି� ନୂତନ ସାକ�ଷାତକାରରେ ରୂପାନ�ତର କରନ�ତ�"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
-msgid "Convert the selected message to a new memo"
-msgstr "ବଚ�ଛିତ ସନ�ଦେଶକ� ଗୋଟି� ନୂତନ ମେମୋରୋ ରୂପାନ�ତର କରନ�ତ�"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
-msgid "Convert the selected message to a new task"
-msgstr "ବଚ�ଛିତ ସନ�ଦେଶକ� ଗୋଟି� ନୂତନ ତାଲିକାରେ ରୂପାନ�ତର କରନ�ତ�"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
+msgid "Get List _Archive"
+msgstr "ତାଲିକା ଅଭିଲେଖନ ପ�ରାପ�ତ କରନ�ତ� (_A)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Contact list _owner"
-msgstr "ସମ�ପର�କ ତାଲିକା ମାଲିକ (_o)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
+msgid "Get an archive of the list this message belongs to"
+msgstr "�ହି ସନ�ଦେଶଟି ଯେଉ�ଠ� ଆସିଛି ସେହି ମେଲ ତାଲିକାର ଗୋଟି� ଆଲେଖୀ ଗ�ରହଣ କରନ�ତ�"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Get list _archive"
-msgstr "ତାଲିକା ଅଭିଲେଖନ ପ�ରାପ�ତ କରନ�ତ� (_a)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+msgid "Get List _Usage Information"
+msgstr "ବ�ୟବହାର ବିଧି ସୂଚନା ତାଲିକା ପ�ରାପ�ତ କରନ�ତ� (_U)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-msgid "Get list _usage information"
-msgstr "ତାଲିକା ବ�ୟବହାର ପଦ�ଧତି ସୂଚନା ପ�ରାପ�ତ କରନ�ତ� (_u)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "�ହି ସନ�ଦେଶଟି ଯାହାର ତାହାର ବ�ୟବହାର ବିଧି ବିଷୟରେ ସୂଚନା ଗ�ରହଣ କରନ�ତ�"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-msgid "Mailing List Actions"
-msgstr "ମେଲ ତାଲିକା କାର�ଯ�ଯ"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+msgid "Contact List _Owner"
+msgstr "ସମ�ପର�କ ତାଲିକା ମାଲିକ (_O)"
 
-#: ../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
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "ସମ�ପର�କ ର ତାଲିକା �ହା କ�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+msgid "_Post Message to List"
+msgstr "ସୂଚୀବଦ�ଧ କରିବା ପାଇ� ପଠାଯାଇଥିବା ସନ�ଦେଶ (_P)"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "�ହି ସନ�ଦେଶଟି ଯେଉ�ଠ� ଆସିଛି ସେହି ମେଲ ତାଲିକାରେ ଗୋଟି� ସନ�ଦେଶ ଦିଅନ�ତ�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+msgid "_Subscribe to List"
+msgstr "ସମୂହରେ ପଞ�ଜିକୃତ କରନ�ତ� (_S)"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "�ହି ସନ�ଦେଶଟି ଯେଉ�ଠ� ଆସିଛି ସେହି ମେଲ ତାଲିକାକ� ସ�ବୀକାରକ�ତି ଦିଅନ�ତ�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+msgid "_Unsubscribe from List"
+msgstr "ତାଲିକାର� ଅସ�ବୀକାରକ�ତି କରନ�ତ� (_U)"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
+#, fuzzy
+#| msgid "Unsubscribe to the mailing list this message belongs to"
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "�ହି ସନ�ଦେଶଟି ଯେଉ�ଠ� ଆସିଛି ସେହି ମେଲ ତାଲିକାକ� ଅସ�ବୀକାରକ�ତି ଦିଅନ�ତ�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
 msgid "Mailing _List"
 msgstr "ମେଲ ତାଲିକା (_L)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "ମେଲ ତାଲିକା କାର�ଯ�ଯ"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr "ପାଇ� ତାଲିକା."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-msgid "_Post message to list"
-msgstr "ତାଲିକାରେ ସନ�ଦେଶ ପୋଷ�ଟ କରନ�ତ� (_P)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-msgid "_Subscribe to list"
-msgstr "ତାଲିକାକ� କିଣନ�ତ� (_S)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-msgid "_Un-subscribe to list"
-msgstr "ତାଲିକାକ� କିଣନ�ତ� ନାହି� (_U)"
-
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "କାର�ଯ�ୟ ଉପଲବ�ଧ ନାହି�"
@@ -17934,59 +19272,11 @@ 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
-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/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/mark-all-read.c:39
+#: ../plugins/mark-all-read/mark-all-read.c:41
 msgid "Also mark messages in subfolders?"
 msgstr "ଉପ-ଫୋଲଡରରେ ସନ�ଦେଶଗ�ଡ଼ିକ� ଚିହ�ନଟ କରିବେ କି?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -17994,102 +19284,114 @@ msgstr ""
 "ଆପଣ କେବଳ ପ�ରଚଳିତ ଫୋଲଡରରେ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଢ଼ାଯାଇଥିବା ପରି ଚିହ�ନଟ କରିବା ପାଇ� ଚାହ��ଛନ�ତି କି, କିମ�ବା "
 "ପ�ରଚଳିତ ଫୋଲଡରରେ �ବଂ ସମସ�ତ ଉପ ଫୋଲଡରଗ�ଡ଼ିକରେ ମଧ�ଯ?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
-msgstr "ପ�ରଚଳିତ ଫୋଲଡର �ବଂ ଉପ-ଫୋଲଡର"
+#: ../plugins/mark-all-read/mark-all-read.c:175
+#, fuzzy
+#| msgid "Current Folder and _Subfolders"
+msgid "In Current Folder and _Subfolders"
+msgstr "ପ�ରଚଳିତ ଫୋଲଡର �ବଂ ଉପ-ଫୋଲଡରରେ"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
-msgstr "କେବଳ ପ�ରଚଳିତ ଫୋଲଡର (_F)"
+#: ../plugins/mark-all-read/mark-all-read.c:189
+#, fuzzy
+#| msgid "Current _Folder Only"
+msgid "In Current _Folder Only"
+msgstr "କେବଳ ପ�ରଚଳିତ ଫୋଲଡରରେ (_F)"
+
+#: ../plugins/mark-all-read/mark-all-read.c:412
+msgid "Mark Me_ssages as Read"
+msgstr "ସନ�ଦେଶ ମାନଙ�କ� ପଢିସାରିଲେ ବୋଲି ଚିହ�ନିତ କରନ�ତ� (_s)"
 
 #: ../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)"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-#| msgid "Mark all messages in the folder as read"
 msgid "Mark all messages in a folder as read."
 msgstr "ସନ�ଦେଶ ମାନଙ�କ� ପଢିସାରିଲେ ବୋଲି ଚିହ�ନିତ କରନ�ତ�"
 
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "Mono Loader"
-msgstr "ମନୋ ଧାରଣ କର�ତ�ତା"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-msgid "Support plugins written in Mono."
-msgstr ""
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-#| msgid "Change Evolution's settings"
 msgid "Manage your Evolution plugins."
 msgstr "Evolutionର ବିନ�ଯାସକ� ପରିବର�ତ�ତନ କରନ�ତ�"
 
-#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:252
+#: ../plugins/plugin-manager/plugin-manager.c:244
 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 "ପ�ଲଗ-ଇନ (_P)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
 msgstr "ଲେଖକ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:146
-msgid "Configuration"
-msgstr "ବିନ�ୟାସ"
-
-#: ../plugins/plugin-manager/plugin-manager.c:265
+#: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr "ଟିପ�ପଣୀ: ପ�ନର�ଚାଳନ ନ କରିବା ପର�ଯ�ଯନ�ତ କିଛି ପରିବର�ତ�ତନ ଗ�ଡିକ ପ�ରଭାବିତ ହେବେ ନାହି�"
 
-#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:285
 msgid "Overview"
 msgstr "ସମୀକ�ଷା"
 
-#: ../plugins/plugin-manager/plugin-manager.c:362
-#: ../plugins/plugin-manager/plugin-manager.c:424
+#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:418
 msgid "Plugin"
 msgstr "ପ�ଲଗ-ଇନ"
 
+#: ../plugins/plugin-manager/plugin-manager.c:430
+msgid "_Plugins"
+msgstr "ପ�ଲଗ-ଇନ (_P)"
+
+#: ../plugins/plugin-manager/plugin-manager.c:432
+msgid "Enable and disable plugins"
+msgstr "ପ�ଲଗ-ଇନ ମାନଙ�କ� ସକ�ରିୟ �ବଂ ନିଷ�କ�ରିୟ କରନ�ତ�"
+
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "ସାଧାରଣ ପାଠ�ଯ ଧାରା"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-#| msgid "Prefer plain-text"
 msgid "Prefer Plain Text"
 msgstr "ସାଧାରଣ-ପାଠ�ଯକ� ପସନ�ଦ କରନ�ତ�"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr ""
+msgstr "ମେଲ ସନ�ଦେଶଗ�ଡ଼ିକ� ସରଳ ପାଠ�ୟ ଆକାରରେ ଦେଖନ�ତ�, ଯଦିଚ ତାହା HTML ବିଷୟବସ�ତ�କ� ଧାରଣ କରିଥା�।"
 
-#: ../plugins/prefer-plain/prefer-plain.c:189
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "ଉପସ�ଥିତ ଥିଲେ HTML କ� ପ�ରଦର�ଶନ କରନ�ତ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:190
-msgid "Prefer PLAIN"
-msgstr "ସାଧାରଣ ଧାରାକ� ପସନ�ଦ କରନ�ତ�"
+#: ../plugins/prefer-plain/prefer-plain.c:198
+msgid "Let Evolution choose the best part to show."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:199
+#, fuzzy
+#| msgid "Show HTML if present"
+msgid "Show plain text if present"
+msgstr "ଉପସ�ଥିତ ଥିଲେ HTML କ� ପ�ରଦର�ଶନ କରନ�ତ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
-msgid "Only ever show PLAIN"
+#: ../plugins/prefer-plain/prefer-plain.c:199
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:200
+#, fuzzy
+#| msgid "Only ever show PLAIN"
+msgid "Only ever show plain text"
 msgstr "କେବଳ ସାଧାରଣ ଧାରାକ� ପ�ରଦର�ଶନ କରନ�ତ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:234
+#: ../plugins/prefer-plain/prefer-plain.c:200
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:247
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "HTML ଧାରା (_M)"
 
@@ -18099,7 +19401,7 @@ msgstr "Evolution ରେଖାଚିତ�ରଣ"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
 msgid "Profile data events in Evolution (for developers only)."
-msgstr ""
+msgstr "Evolution ରେ ରୂପରେଖା ତଥ�ୟ ଘଟଣାଗ�ଡ଼ିକ (କେବଳ ବିକାଶକାରୀଙ�କ ପାଇ�)।"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -18113,26 +19415,41 @@ msgstr "ଆଉଟଲ�କ PST ଆମଦାନି"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook ବ�ୟକ�ତିଗତ ଫୋଲଡରଗ�ଡ଼ିକ (.pst)"
 
+#: ../plugins/pst-import/pst-importer.c:296
+msgid "_Mail"
+msgstr "ମେଲ (_M)"
+
+#: ../plugins/pst-import/pst-importer.c:308
+msgid "Destination folder:"
+msgstr "ଲକ�ଷ ଫୋଲଡର:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "_Address Book"
 msgstr "ଠିକଣା ପ�ସ�ତିକା (_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:321
 msgid "A_ppointments"
 msgstr "ନିୟ�କ�ତି (_p)"
 
+#. Tasks
+#: ../plugins/pst-import/pst-importer.c:327 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "କାର�ଯ�ଯ (_T)"
+
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:333
 msgid "_Journal entries"
 msgstr "ପତ�ରିକା ପ�ରବିଷ�ଟି (_J)"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "Importing Outlook data"
 msgstr "Outlook ତଥ�ୟକ� ଆମଦାନୀ କର�ଅଛି"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../plugins/publish-calendar/publish-calendar.c:146
+#: ../plugins/publish-calendar/publish-calendar.c:153
 msgid "Calendar Publishing"
 msgstr "କ�ଯାଲେଣ�ଡର ପ�ରକାଶନ କର�ଅଛି"
 
@@ -18141,145 +19458,166 @@ msgid "Locations"
 msgstr "ଅବସ�ଥାନ"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
-#| msgid "Allows calendars to be published to the web"
 msgid "Publish calendars to the web."
 msgstr "କ�ୟାଲେଣ�ଡରକ� ୱେବରେ ପ�ରକାଶନ କରିବା ପାଇ� ଅନ�ମତି ଦିଅନ�ତ�"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
-msgid "_Publish Calendar Information"
-msgstr "କ�ଯାଲେଣ�ଡର ସୂଚନା ପ�ରକାଶନ କରନ�ତ� (_P)"
-
-#: ../plugins/publish-calendar/publish-calendar.c:95
-#: ../plugins/publish-calendar/publish-calendar.c:329
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
 #, c-format
 msgid "Could not open %s:"
 msgstr "%s କ� ଖୋଲିହେଲା ନାହି�:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:97
+#: ../plugins/publish-calendar/publish-calendar.c:210
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "%s କ� ଖୋଲିହେଲା ନାହି�: ଅଜଣା ତ�ର�ଟି"
 
-#: ../plugins/publish-calendar/publish-calendar.c:117
+#: ../plugins/publish-calendar/publish-calendar.c:230
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "%s ରେ ପ�ରକାଶନ କରିବା ସମୟରେ ଗୋଟି� ତ�ର�ଟି ଘଟିଛି:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:119
+#: ../plugins/publish-calendar/publish-calendar.c:232
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "%s କ� ପ�ରକାଶନ ସଫଳତାର ସହିତ ସମାପ�ତ ହୋଇଛି"
 
-#: ../plugins/publish-calendar/publish-calendar.c:160
+#: ../plugins/publish-calendar/publish-calendar.c:276
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "%s ର ସ�ଥାପନା ବିଫଳ ହୋଇଛି:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:612
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "ସକ�ରିୟ କରନ�ତ� (_n)"
+
+#: ../plugins/publish-calendar/publish-calendar.c:739
 msgid "Are you sure you want to remove this location?"
 msgstr "ଆପଣ ନିଶ�ଚିତ କି ଆପଣ �ହି ଅବସ�ଥାନକ� ଅପସାରଣ କରିବା ପାଇ� ଚାହ��ଛନ�ତି?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:776
+#. To Translators: This is shown to a user when creation of a new thread,
+#. where the publishing should be done, fails. Basically, this shouldn't
+#. ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1051
 msgid "Could not create publish thread."
 msgstr "ପ�ରକାଶନ ଥ�ରେଡ ସୃଷ�ଟି କରିହେଲା ନାହି�।"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:2
-msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">ଅବସ�ଥାନ</span>"
+#: ../plugins/publish-calendar/publish-calendar.c:1059
+msgid "_Publish Calendar Information"
+msgstr "କ�ଯାଲେଣ�ଡର ସୂଚନା ପ�ରକାଶନ କରନ�ତ� (_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">ଉତ�ସଗ�ଡ଼ିକ</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+#, fuzzy
+#| msgid "Custom Notification"
+msgid "Custom Location"
+msgstr "ଇଚ�ଛାମ�ତାବକ ବିଜ�ଞପ�ତି"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+#, fuzzy
+#| msgid "Day"
+msgid "Daily"
+msgstr "ଦିନ"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#, fuzzy
+#| msgid ""
+#| "Daily\n"
+#| "Weekly\n"
+#| "Manual (via Actions menu)"
+msgid "Manual (via Actions menu)"
 msgstr ""
 "ପ�ରତିଦିନ\n"
 "ପ�ରତି ସପ�ତାହ\n"
 "ହସ�ତକୃତ (କାର�ଯ�ୟ ତାଲିକା ମାଧ�ଯମରେ)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "ସକ�ରିୟ କରନ�ତ� (_n)"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
 msgstr "ସଂଯୋଗିକୀ (_o):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#, fuzzy
+#| msgid "Public"
+msgid "Public FTP"
+msgstr "ସାର�ବଜନୀନ"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
 msgstr "ଅବସ�ଥାନ ପ�ରକାଶନ କର�ଅଛି"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
 msgstr "ବାରମ�ବାରତା ପ�ରକାଶନ କର�ଅଛି (_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"Secure FTP (SSH)\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-msgstr ""
-"ସ�ରକ�ଷିତ FTP (SSH)\n"
-"ସାର�ବଜନିକ FTP\n"
-"FTP (ଲଗଇନ ସହିତ)\n"
-"ୱିଣ�ଡୋର ସହଭାଗ\n"
-"WebDAV (HTTP)\n"
-"ସ�ରକ�ଷିତ WebDAV (HTTPS)\n"
-"ଇଚ�ଛାମ�ତାବକ ଅବସ�ଥାନ"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
 msgstr "ସେବାର ପ�ରକାର (_t):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+#, fuzzy
+#| msgid "Source"
+msgid "Sources"
+msgstr "ଉତ�ସ"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "ସମୟ ଅବଧି (_d):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+#, fuzzy
+#| msgid "WebDAV"
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+#, fuzzy
+#| msgid "Week"
+msgid "Weekly"
+msgstr "ସପ�ତାହ"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+#, fuzzy
+#| msgid "_Window"
+msgid "Windows share"
+msgstr "ଓ�ବିଣ�ଡୋ (_W)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "ଫାଇଲ (_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
 msgstr "ପ�ରବେଶ ସଂଙ�କେତ (_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "ଭାବରେ ପ�ରକାଶିତ (_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
 msgstr "ପ�ରବେଶ ସଂଙ�କେତକ� ମନେ ରଖିବ (_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "ଚାଳକ ର ନାମ (_U):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
-msgid ""
-"days\n"
-"weeks\n"
-"months"
-msgstr ""
-"ଦିନ\n"
-"ସପ�ତାହ\n"
-"ମାସ"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:32
-msgid ""
-"iCal\n"
-"Free/Busy"
-msgstr ""
-"iCal\n"
-"ମ�କ�ତ/ବ�ୟସ�ତ"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+#, fuzzy
+#| msgid "Call"
+msgid "iCal"
+msgstr "ଡାକରା"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
@@ -18287,89 +19625,64 @@ msgstr ""
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "କ�ୟାଲେଣ�ଡର ପ�ରକାଶନ କରିହେଲା ନାହି�: କ�ୟାଲେଣ�ଡର ପୃଷ�ଠଭୂମି �ବେ ଅବସ�ଥିତ ନାହି�"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "ନୂତନ ଅବସ�ଥାନ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "ଅବସ�ଥାନକ� ସମ�ପାଦନ କରନ�ତ�"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "Hello Python"
-
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr "Python ପ�ଲଗଇନ ଧାରଣକର�ତ�ତା ପରୀକ�ଷଣ"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Python ପରୀକ�ଷଣ ପ�ଲଗଇନ"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Python EPlugin ଧାରଣକର�ତ�ତା ପାଇ� ପରୀକ�ଷଣ ପ�ଲଗଇନ।"
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using Python."
-msgstr "Python ବ�ୟବହାର କରି ଲିଖିତ ଅନ�ୟାନ�ୟ ପ�ଲଗଇନଗ�ଡ଼ିକ� ଧାରଣ କର�ଥିବା ଗୋଟି� ପ�ଲଗଇନ।"
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-msgid "Python Loader"
-msgstr "Python ଧାରଣକର�ତ�ତା"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin ମିଳ�ନାହି�, ସଂକେତ: %d"
 
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "ପାଇପ ନିର�ମାଣ କରିବାରେ ବିଫଳ: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 #, c-format
 msgid "Error after fork: %s"
 msgstr "ବିଭାଜନ ପରେ ତ�ର�ଟି: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin ନିମ�ନସ�ତର ପଦ�ଧତି ଉତ�ତର ଦେଉନାହି�, ବନ�ଦ କର�ଅଛି..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:240
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "SpamAssassin ନିମ�ନସ�ତର ପଦ�ଧତି ବାଧାପ�ରାପ�ତ ପାଇ� ଅପେକ�ଷା କରନ�ତ�, ସମାପ�ତ କର�ଅଛି..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:249
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "SpamAssassin କ� ପାଇପ ବିଫଳ ହୋଇଛି, ତ�ର�ଟି ସଂକେତ: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:512
-#, c-format
-msgid "SpamAssassin is not available."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
+#, fuzzy, c-format
+#| msgid "SpamAssassin is not available."
+msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin ଉପଲବ�ଧ ନାହି�।"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:910
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "�ହା SpamAssassin କ� ଅଧିକ ଭରସାଯୋଗ�ୟ କରିଥା�, କିନ�ତ� ମନ�ଥର"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:916
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
 msgid "I_nclude remote tests"
 msgstr "ସୂଦୂର ପରୀକ�ଷଣକ� ଅନ�ତର�ଭ�କ�ତ କରନ�ତ� (_n)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-#| msgid "Filters junk messages using Bogofilter."
 msgid "Filter junk messages using SpamAssassin."
 msgstr "Bogofilter ବ�ୟବହାର କରି ଜଙ�କ ସନ�ଦେଶଗ�ଡ଼ିକ� ଛାଣନ�ତ�।"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-#| msgid "SpamAssassin junk plugin"
 msgid "SpamAssassin Junk Filter"
 msgstr "SpamAssassin ଜଙ�କ ପ�ଲଗଇନ"
 
@@ -18381,129 +19694,140 @@ msgstr "SpamAssassin ବିକଳ�ପଗ�ଡିକ"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Description List"
 msgstr "ବର�ଣ�ଣନା ତାଲିକା"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Categories List"
 msgstr "ବିଭାଗ ତାଲିକା"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Comment List"
 msgstr "ମନ�ତବ�ଯ ତାଲିକା"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Contact List"
 msgstr "ସମ�ପର�କ ତାଲିକା"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Start"
 msgstr "ଆରମ�ଭ"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "End"
 msgstr "ସମାପ�ତ"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "ପ�ରତିଶତ ସମ�ପୂର�ଣ�ଣ"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "URL"
 msgstr "ୟ�.ଆର.�ଲ."
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Attendees List"
 msgstr "ଉପସ�ଥିତ ବ�ୟକ�ତିମାନଙ�କର ତାଲିକା"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Modified"
 msgstr "ପରିବର�ତ�ତିତ"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
-msgstr "CSV ଶୈଳୀ ପାଇ� ଉନ�ନତ ବିକଳ�ପମାନ"
-
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
-msgstr "ଗୋଟି� ଶୀର�ଷକକ� ପୂର�ବର� ଅଟକାନ�ତ�"
-
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
-msgstr "ମୂଲ�ଯ ପରିସୀମକ:"
-
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
-msgstr "ପରିସୀମକକ� ଲିପିବଦ�ଧ କରନ�ତ�:"
+#: ../plugins/save-calendar/csv-format.c:530
+#, fuzzy
+#| msgid "Advanced options for the CSV format"
+msgid "A_dvanced options for the CSV format"
+msgstr "CSV ଶୈଳୀ ପାଇ� ଉନ�ନତ ବିକଳ�ପମାନ (_d)"
+
+#: ../plugins/save-calendar/csv-format.c:537
+#, fuzzy
+#| msgid "Prepend a header"
+msgid "Prepend a _header"
+msgstr "ଗୋଟି� ଶୀର�ଷକକ� ପୂର�ବର� ଅଟକାନ�ତ� (_h)"
+
+#: ../plugins/save-calendar/csv-format.c:546
+#, fuzzy
+#| msgid "Value delimiter:"
+msgid "_Value delimiter:"
+msgstr "ମୂଲ�ଯ ପରିସୀମକ (_V):"
+
+#: ../plugins/save-calendar/csv-format.c:553
+#, fuzzy
+#| msgid "Record delimiter:"
+msgid "_Record delimiter:"
+msgstr "ପରିସୀମକକ� ଲିପିବଦ�ଧ କରନ�ତ� (_R):"
 
 #: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
-msgstr "ମୂଲ�ୟଗ�ଡ଼ିକ� �ହା ସହିତ ସମ�ପୂଟିତ କରନ�ତ�:"
+#, fuzzy
+#| msgid "Encapsulate values with:"
+msgid "_Encapsulate values with:"
+msgstr "ମୂଲ�ୟଗ�ଡ଼ିକ� �ହା ସହିତ ସମ�ପୂଟିତ କରନ�ତ� (_E):"
 
 #: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "କମା ଦ�ୱାରା ପୃଥକ ହୋଇଥିବା ମୂଲ�ୟର ଶୈଳୀ (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:162
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar ସଜ�ଜିକରଣ ଶୈଳୀ (.ics)"
+
 #: ../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."
 msgid "Save a calendar or task list to disk."
 msgstr "ଚୟିତ କାଲେଣ�ଡର କିମ�ବା କାର�ଯ�ୟ ତାଲିକାକ� ଡିସ�କରେ ସଂରକ�ଷଣ କରିଥା�।"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-msgid "_Save to Disk"
-msgstr "ଡିସ�କରେ ସଂରକ�ଷଣ କରନ�ତ� (_S)"
-
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:150
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
 msgstr "RDF ଶୈଳୀ (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:120
+#, fuzzy
+#| msgid "_Port:"
+msgid "_Format:"
+msgstr "ସଜ�ଜିକରଣ ଶୈଳୀ (_F):"
+
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "ଲକ�ଷ�ଯ ସ�ଥଳ ଫାଇଲ ମନୋନୀତ କରନ�ତ�"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-#| msgid "Selects a single calendar or task source for viewing."
-msgid "Quickly select a single calendar or task list for viewing."
-msgstr "ଦେଖିବା ପାଇ� ଗୋଟି� କ�ୟାଲେଣ�ଡର କିମ�ବା କାର�ଯ�ୟ ଉତ�ସ ବାଛନ�ତ�।"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-#| msgid "Select one source"
-msgid "Select One Source"
-msgstr "ଗୋଟି� ଉତ�ସ ମନୋନୀତ କରନ�ତ�"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "Show _only this Calendar"
-msgstr "କେବଳ �ହି କ�ଯାଲେଣ�ଡରକ� ଦର�ଶାନ�ତ� (_o)"
+#: ../plugins/save-calendar/save-calendar.c:334
+#, fuzzy
+#| msgid "Save the selected messages as a text file"
+msgid "Save the selected calendar to disk"
+msgstr "ଚୟିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପାଠ�ଯ ଫାଇଲ ଭାବରେ ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "Show _only this Memo List"
-msgstr "କେବଳ �ହି ସ�ମାରକପତ�ର ତାଲିକାକ� ଦର�ଶାନ�ତ� (_o)"
+#: ../plugins/save-calendar/save-calendar.c:365
+#, fuzzy
+#| msgid "Save the selected messages as a text file"
+msgid "Save the selected memo list to disk"
+msgstr "ଚୟିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପାଠ�ଯ ଫାଇଲ ଭାବରେ ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
-msgid "Show _only this Task List"
-msgstr "କେବଳ �ହି କାର�ଯ�ୟ ତାଲିକାକ� ଦର�ଶାନ�ତ� (_o)"
+#: ../plugins/save-calendar/save-calendar.c:396
+#, fuzzy
+#| msgid "Save a calendar or task list to disk."
+msgid "Save the selected task list to disk"
+msgstr "ଚୟିତ କାଲେଣ�ଡର କିମ�ବା କାର�ଯ�ୟ ତାଲିକାକ� ଡିସ�କରେ ସଂରକ�ଷଣ କରିଥା�।"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -18513,54 +19837,50 @@ msgstr "ଆପଣଙ�କର ପ�ରାରମ�ଭିକ ଖାତା ବି
 msgid "Setup Assistant"
 msgstr "ବିନ�ୟାସ ସହାୟକ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:117
 msgid "Evolution Setup Assistant"
 msgstr "Evolution ବିନ�ୟାସ ସହକାରୀ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:122
 msgid "Welcome"
 msgstr "ସ�ବାଗତମ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:125
 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 ""
-"Evolutionରେ ଆପଣଙ�କ� ସ�ୱାଗତ କର�ଅଛ�। ପରବର�ତ�ତୀ କିଛି ପରଦା Evolution କ� ଆପଣଙ�କ ଇମେଲ ଖାତା ସହିତ "
-"ସଂଯ�କ�ତ କରିବା ପାଇ� �ବଂ ଅନ�ୟାନ�ୟ ପ�ରୟୋଗର� ଫାଇଲ ଆମଦାନୀ କରିବା ପାଇ� ଅନ�ମତି ଦେବ। \n"
+"Evolutionରେ ଆପଣଙ�କ� ସ�ୱାଗତ କର�ଅଛ�। ପରବର�ତ�ତୀ କିଛି ପରଦା Evolution କ� ଆପଣଙ�କ ଇମେଲ ଖାତା "
+"ସହିତ ସଂଯ�କ�ତ କରିବା ପାଇ� �ବଂ ଅନ�ୟାନ�ୟ ପ�ରୟୋଗର� ଫାଇଲ ଆମଦାନୀ କରିବା ପାଇ� ଅନ�ମତି ଦେବ। \n"
 "\n"
 "ଦୟାକରି ଅଗ�ରସର ହେବା ପାଇ� \"ଆଗକ�\" ବଟନକ� କ�ଲିକ କରନ�ତ�।"
 
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Importing files"
-msgstr "ଫାଇଲଗ�ଡ଼ିକ� ଆମଦାନି କର�ଅଛି"
-
-#: ../plugins/startup-wizard/startup-wizard.c:117
-#: ../shell/e-shell-importer.c:138
+#: ../plugins/startup-wizard/startup-wizard.c:160
+#: ../widgets/misc/e-import-assistant.c:385
 msgid "Please select the information that you would like to import:"
 msgstr "ଆପଣ ଆମଦାନୀ କରିବାକ� ଚାହ��ଥିବା ସୂଚନାକ� ଦୟାକରି ମନୋନୀତ କରନ�ତ�:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:132
-#: ../shell/e-shell-importer.c:420
+#: ../plugins/startup-wizard/startup-wizard.c:175
+#: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "%s ଠାର�:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:203
-#: ../shell/e-shell-importer.c:530
-#, c-format
+#: ../plugins/startup-wizard/startup-wizard.c:192
+msgid "Importing files"
+msgstr "ଫାଇଲଗ�ଡ଼ିକ� ଆମଦାନି କର�ଅଛି"
+
+#: ../plugins/startup-wizard/startup-wizard.c:258
 msgid "Importing data."
 msgstr "ତଥ�ଯ ଆମଦାନୀ କର�ଅଛି।"
 
-#: ../plugins/startup-wizard/startup-wizard.c:205
-#: ../shell/e-shell-importer.c:544
+#: ../plugins/startup-wizard/startup-wizard.c:264
 msgid "Please wait"
 msgstr "ଦଯାକରି  ଅପେକ�ଷାକର"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-#| msgid "Thread messages by subject"
 msgid "Sort mail message threads by subject."
 msgstr "ସନ�ଦେଶଗ�ଡ଼ିକ� ବିଷୟ ଅନ�ସାରେ ବାନ�ଧନ�ତ�"
 
@@ -18573,7 +19893,7 @@ msgid "Thread messages by subject"
 msgstr "ସନ�ଦେଶଗ�ଡ଼ିକ� ବିଷୟ ଅନ�ସାରେ ବାନ�ଧନ�ତ�"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "ସନ�ଦେଶଗ�ଡ଼ିକ� ବିଷୟ ଅନ�ସାରେ ବାନ�ଧିବାରେ ପଛକ� ପଡ଼ିବା (_a)"
 
@@ -18583,71 +19903,65 @@ msgid ""
 "message body."
 msgstr "ଗୋଟି� ସନ�ଦେଶ ଭିତରେ ନମ�ନା ପ�ଲଗଇନକ� ବଦଳାଇବା ପାଇ� ସୂଚକ ଶବ�ଦ/ମୂଲ�ୟର ତାଲିକା।"
 
-#: ../plugins/templates/templates.c:603
-msgid "No title"
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "ଡ�ରାଫ�ଟ ଆଧାରିତ ନମ�ନା ପ�ଲଗଇନ"
+
+#: ../plugins/templates/templates.c:615
+#, fuzzy
+#| msgid "No title"
+msgid "No Title"
 msgstr "କୌଣସି ଶୀର�ଷକ ନାହି�"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:686
 msgid "Save as _Template"
 msgstr "ନମ�ନା ପରି ସଂରକ�ଷଣ କରନ�ତ� (_T)"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:688
 msgid "Save as Template"
 msgstr "ନମ�ନା ପରି ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "ଡ�ରାଫ�ଟ ଆଧାରିତ ନମ�ନା ପ�ଲଗଇନ"
-
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr ""
+msgstr "Microsoft Outlookର� TNEF (winmail.dat) ସଂଲଗ�ନକଗ�ଡ଼ିକ ଅବସଂକେତନ କରନ�ତ�।"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-#| msgid "TNEF Attachment decoder"
 msgid "TNEF Decoder"
 msgstr "TNEF ସଂଲଗ�ନ ସାଙ�କେତିକରଣ"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
-#| msgid "Multiple vCards"
 msgid "Inline vCards"
 msgstr "�କାଧିକ vCards"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
 msgid "Show vCards directly in mail messages."
-msgstr ""
+msgstr "vCard ଗ�ଡ଼ିକ� ସିଧାସଳଖ ଭାବରେ ମେଲ ସନ�ଦେଶଗ�ଡ଼ିକରେ ଦର�ଶାନ�ତ�।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:155
-#: ../plugins/vcard-inline/vcard-inline.c:239
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
 msgid "Show Full vCard"
 msgstr "ସମ�ପୂର�ଣ�ଣ vCard କ� ପ�ରଦର�ଶନ କରନ�ତ�"
 
-#: ../plugins/vcard-inline/vcard-inline.c:158
+#: ../plugins/vcard-inline/vcard-inline.c:167
 msgid "Show Compact vCard"
 msgstr "ସଂକ�ଷିପ�ତ vCard କ� ପ�ରଦର�ଶନ କରନ�ତ�"
 
-#: ../plugins/vcard-inline/vcard-inline.c:218
-#| msgid "There is one other contact."
-#| msgid_plural "There are %d other contacts."
+#: ../plugins/vcard-inline/vcard-inline.c:228
 msgid "There is one other contact."
 msgstr "ସେଠାରେ ଅନ�ଯ ଗୋଟି� ସମ�ପର�କ ଅଛି।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:227
+#: ../plugins/vcard-inline/vcard-inline.c:237
 #, c-format
-#| msgid "There is one other contact."
-#| msgid_plural "There are %d other contacts."
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "ସେଠାରେ %d ଟି ଅନ�ଯାନ�ୟ ଗୋଟି� ସମ�ପର�କ ଅଛି।"
 msgstr[1] "ସେଠାରେ %d ଟି ଅନ�ଯାନ�ୟ ଗୋଟି� ସମ�ପର�କ ଅଛି।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:248
-#| msgid "Save in address book"
+#: ../plugins/vcard-inline/vcard-inline.c:258
 msgid "Save in Address Book"
 msgstr "ଠିକଣା ପ�ସ�ତିକାରେ ସଂରକ�ଷଣ କରନ�ତ�"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-#| msgid "WebDAV contacts"
 msgid "Add WebDAV contacts to Evolution."
 msgstr "WebDAV ସମ�ପର�କ"
 
@@ -18659,30 +19973,14 @@ msgstr "WebDAV ସମ�ପର�କ"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:296
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "IfMatch କ� �ଡ଼ାଇଦିଅନ�ତ� (Apache < 2.2.8ରେ ଆବଶ�ୟକ ହୋଇଥା�) (_A)"
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution ସେଲ"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "Evolution ସେଲ Config କାରଖାନା"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution ପରୀକ�ଷଣ"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution ପରୀକ�ଷଣ ଉପାଦାନ"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
 msgstr "ଛାୟା ସେବକ ସଂଯୋଗଗ�ଡି଼କ ବୈଧ କରନ�ତ�"
@@ -18700,62 +19998,86 @@ msgid "Default sidebar width"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ପାର�ଶ�ୱପଟି ଓସାର"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
+#, fuzzy
+#| msgid "Default window state"
+msgid "Default window X coordinate"
+msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ୱିଣ�ଡୋ ସ�ଥିତି"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+#, fuzzy
+#| msgid "Default window state"
+msgid "Default window Y coordinate"
+msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ୱିଣ�ଡୋ ସ�ଥିତି"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ୱିଣ�ଡୋ ଉଚ�ଚତା"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ୱିଣ�ଡୋ ସ�ଥିତି"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
 msgstr "ପୂର�ବ ନିର�ଦ�ଧାରିତ ୱିଣ�ଡୋ ଓସାର"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+#, fuzzy
+#| msgid "Enable search folders"
+msgid "Enable express mode"
+msgstr "ସନ�ଧାନ ଫୋଲଡରଗ�ଡ଼ିକ� ସକ�ରିୟ କରନ�ତ�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "ଇଣ�ଟରନେଟ ଉପରେ HTTP/ସ�ରକ�ଷିତ HTTP କ� ଅଭିଗମ�ୟ କରିବା ସମୟରେ ପ�ରକ�ସି ବିନ�ୟାସକ� ସକ�ରିୟ କରନ�ତ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
 msgstr "HTTP ପ�ରକ�ସି ଆଧାର ନାମ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
 msgstr "HTTP ପ�ରକ�ସି ପ�ରବେଶ ସଂକେତ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "HTTP proxy port"
 msgstr "HTTP ପ�ରକ�ସି ସଂଯୋଗିକୀ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "HTTP proxy username"
 msgstr "HTTP ପ�ରକ�ସି ଚାଳକନାମ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ଆରମ�ଭ ସମୟରେ ପୂର�ବ ନିର�ଦ�ଧାରିତ ଭାବରେ ଦର�ଶାଇବାକ� ଥିବା ଉପାଦାନର ID କିମ�ବା ଉପନାମ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
 "authentication_user\" GConf key, and the password is retrieved from either "
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
+"true କ� ସରବର� ବୈଧିକରଣ ଅଟେ ଠାର� ନେଟୱାର�କ config ବୈଧିକରଣ ବ�ଯବହାରକାରୀ GConf କି �ବଂ "
+"ଗ�ପ�ତଶବ�ଦ ଅଟେ ଠାର� କିମ�ବା କ�ରମବିକାଶ  ଗ�ପ�ତଶବ�ଦ ଫାଇଲ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
 msgstr "ପ�ରାରମ�ଭିକ ସଂଲଗ�ନକ ଦୃଶ�ୟ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Initial file chooser folder"
 msgstr "ପ�ରାରମ�ଭିକ ଫାଇଲ ଚୟନକାରୀ ଫୋଲଡର"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser ସଂଳାପଗ�ଡ଼ିକ ପାଇ� ପ�ରାରମ�ଭିକ ଫୋଲଡର।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
@@ -18763,111 +20085,121 @@ msgstr ""
 "ସଂଲଗ�ନକ ପଟି ୱିଜେଟ ପାଇ� ପ�ରାରମ�ଭିକ ଦୃଶ�ୟ। \"0\" ଟି ହେଉଛି ଚିତ�ରସଂକେତ ଦୃଶ�ୟ, \"1\" ଟି ହେଉଛି "
 "ତାଲିକା ଦୃଶ�ୟ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "ଶେଷରେ ବିନ�ଯାସିତ ସଂରଚନା ସଂସ�କରଣ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ଅଫଲାଇନ ବ�ୟବହାର ପାଇ� ଫୋଲଡରଗ�ଡ଼ିକର ପଥର ତାଲିକାକ� ଡିସ�କ ସହିତ ସମକାଳୀନ କରାଯାଇଥା�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
 msgstr "ଅଣଛାୟା ଆଧାର"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "�ଚ�.ଟି.ଟି.ପି. ଛାୟାକରଣ ବେଳେ ବୈଧିକରଣ ପାଇ� ପ�ରବେଶ ସଂକେତ "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Proxy configuration mode"
 msgstr "ପ�ରକ�ସି ବିନ�ଯାସ ଅବସ�ଥା"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
 msgstr "�ସ�.ଓ.ସି.କେ.�ସ�.  ଛାୟା ଆଧାର ନାମ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
 msgstr "�ସ�.ଓ.ସି.କେ.�ସ�. ଛାୟା ସଂଯୋଗିକୀ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
 msgstr "ସ�ରକ�ଷିତ �ଚ�.ଟି.ଟି.ପି. ଛାୟା ଆଧାର ନାମ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
 msgstr "ସ�ରକ�ଷିତ �ଚ�.ଟି.ଟି.ପି. ଛାୟା ଆଧାର ସଂଯୋଗିକୀ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
 "configuration\" and \"use proxy configuration provided in the autoconfig url"
 "\" respectively."
 msgstr ""
-"ପ�ରକ�ସି ସଂରଚନା ଅବସ�ଥାକ� ବାଛନ�ତ�। ସମର�ଥିତ ମୂଲ�ୟଗ�ଡ଼ିକ ହେଉଛି 0, 1, 2, �ବଂ 3 "
-"ଯାହାକି ଯଥାକ�ରମେ \"ତନ�ତ�ର ସଂରଚନାକ� ବ�ୟବହାର କରନ�ତ�\", \"କୌଣସି ପ�ରକ�ସି ନାହି�\", \"ହସ�ତକୃତ ପ�ରକ�ସି ସଂରଚନା "
-"ବ�ୟବହାର କରନ�ତ�\" �ବଂ\"autoconfig url ରେ ପ�ରଦାନ କରାଯାଇଥିବା ପ�ରକ�ସି ସଂରଚନାକ� ବ�ୟବହାର କରନ�ତ�\" କ� "
+"ପ�ରକ�ସି ସଂରଚନା ଅବସ�ଥାକ� ବାଛନ�ତ�। ସମର�ଥିତ ମୂଲ�ୟଗ�ଡ଼ିକ ହେଉଛି 0, 1, 2, �ବଂ 3 ଯାହାକି ଯଥାକ�ରମେ "
+"\"ତନ�ତ�ର ସଂରଚନାକ� ବ�ୟବହାର କରନ�ତ�\", \"କୌଣସି ପ�ରକ�ସି ନାହି�\", \"ହସ�ତକୃତ ପ�ରକ�ସି ସଂରଚନା ବ�ୟବହାର "
+"କରନ�ତ�\" �ବଂ\"autoconfig url ରେ ପ�ରଦାନ କରାଯାଇଥିବା ପ�ରକ�ସି ସଂରଚନାକ� ବ�ୟବହାର କରନ�ତ�\" କ� "
 "ଉପସ�ଥାପନ କରିଥା�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
 msgstr "ପାର�ଶ�ୱପଟିଟି ଦୃଶ�ୟମାନ ଅଟେ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Skip development warning dialog"
 msgstr "ବିକାଶ ଚେତାବନୀ ସଂଳାପକ� �ଡ଼ାଇଦିଅନ�ତ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:485
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:305
 msgid "Start in offline mode"
 msgstr "ଅଫ ଲାଇନ ଧାରାରେ ଆରମ�ଭ କରନ�ତ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
 msgstr "ସ�ଥିତିପଟିଟି ଦୃଶ�ୟମାନ ଅଟେ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr ""
-"Evolution ର ସଂରଚନା ସଂସ�କରଣ, ମୂଖ�ୟ/ଗୌଣ/ସଂରଚନା ସ�ତର ସହିତ "
-"(ଉଦାହରଣ ସ�ୱରୂପ \"2.6.0\")।"
+msgstr "Evolution ର ସଂରଚନା ସଂସ�କରଣ, ମୂଖ�ୟ/ଗୌଣ/ସଂରଚନା ସ�ତର ସହିତ (ଉଦାହରଣ ସ�ୱରୂପ \"2.6.0\")।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+#, fuzzy
+#| msgid "The default width for the main window, in pixels."
+msgid "The default X coordinate for the main window."
+msgstr "ମୂଖ�ୟ ୱିଣ�ଡୋର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଓସାର, ପିକ�ସେଲରେ।"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+#, fuzzy
+#| msgid "The default width for the main window, in pixels."
+msgid "The default Y coordinate for the main window."
+msgstr "ମୂଖ�ୟ ୱିଣ�ଡୋର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଓସାର, ପିକ�ସେଲରେ।"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
 msgstr "ମୂଖ�ୟ ୱିଣ�ଡୋର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଉଚ�ଚତା, ପିକ�ସେଲରେ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The default width for the main window, in pixels."
 msgstr "ମୂଖ�ୟ ୱିଣ�ଡୋର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଓସାର, ପିକ�ସେଲରେ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The default width for the sidebar, in pixels."
 msgstr "ପାର�ଶ�ୱପଟିର ପୂର�ବ ନିର�ଦ�ଧାରିତ ଓସାର, ପିକ�ସେଲରେ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 msgstr ""
-"Evolution ର ଅନ�ତିମ ଉନ�ନତ ସଂରଚନାର ସଂସ�କରଣ, ମୂଖ�ୟ/ଗୌଣ/ସଂରଚନା ସ�ତର ସହିତ "
-"(ଉଦାହରଣ ସ�ୱରୂପ \"2.6.0\")।"
+"Evolution ର ଅନ�ତିମ ଉନ�ନତ ସଂରଚନାର ସଂସ�କରଣ, ମୂଖ�ୟ/ଗୌଣ/ସଂରଚନା ସ�ତର ସହିତ (ଉଦାହରଣ ସ�ୱରୂପ "
+"\"2.6.0\")।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
 msgstr "�ଚ�.ଟି.ଟି.ପି. ଛାୟା ପାଇ� ଯନ�ତ�ରର ନାମ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The machine name to proxy secure HTTP through."
 msgstr "ସ�ରକ�ଷିତ �ଚ�.ଟି.ଟି.ପି. ଛାୟା ପାଇ� ଯନ�ତ�ରର ନାମ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "The machine name to proxy socks through."
 msgstr "�ସ�.ଓ.ସି.କେ.�ସ�. ଛାୟା ପାଇ� ଯନ�ତ�ରର ନାମ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -18875,7 +20207,7 @@ msgstr ""
 "\"/apps/evolution/shell/network_config/http_host\" ଦ�ୱାରା ବ�ୟାଖ�ୟା କରାଯାଇଥିବା "
 "ସଂଯୋଗିକୀ ଯାହା ମାଧ�ଯମରେ ଆପଣ ପ�ରକ�ସି କରିଥାନ�ତି।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -18883,7 +20215,7 @@ msgstr ""
 "\"/apps/evolution/shell/network_config/secure_host\" ଦ�ୱାରା ବ�ୟାଖ�ୟା କରାଯାଇଥିବା "
 "ସଂଯୋଗିକୀ ଯାହା ମାଧ�ଯମରେ ଆପଣ ପ�ରକ�ସି କରିଥାନ�ତି।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -18891,7 +20223,7 @@ msgstr ""
 "\"/apps/evolution/shell/network_config/socks_host\" ଦ�ୱାରା ବ�ୟାଖ�ୟା କରାଯାଇଥିବା "
 "ସଂଯୋଗିକୀ ଯାହା ମାଧ�ଯମରେ ଆପଣ ପ�ରକ�ସି କରିଥାନ�ତି।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18901,7 +20233,7 @@ msgstr ""
 "\"toolbar\" କ� ସେଟ କରାଯା�, ତେବେ ବଟନର ଶୈଳୀ GNOME ସାଧନ ପଟି ବିନ�ୟାସ ଦ�ୱାରା ନିର�ଦ�ଧାରଣ "
 "କରାଯାଇଥା�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -18912,281 +20244,487 @@ msgstr ""
 "ହେଲା ଆଧାର ନାମ, ପରିସର (*.foo.com ଭଳି ପ�ରାରମ�ଭିକ ୱାଇଲ�ଡ କାର�ଡ ବ�ଯବହାର କରି), ଆଇ.ପି. ଆଧାର "
 "ଠିକିଣା (ଆଇ.ପି.ଭି.୪ ଓ ଆଇ.ପି.ଭି.୬) ଓ ଜାଲକ ମ�ଖା ସହିତ ଜାଲକ ଠିକଣା (୧୯୨.୧୬୮.୦.୦/୨୪ ଭଳି କିଛି)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
 msgstr "ସାଧନ ପଟିଟି ଦୃଶ�ୟମାନ ଅଛି"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "URL that provides proxy configuration values."
 msgstr "ଛାୟା ବିନ�ଯାସ ମୂଲ�ଯଗ�ଡ଼ିକ ପାଇ� ୟ�.ଆର.�ଲ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Use HTTP proxy"
 msgstr "�ଚ�.ଟି.ଟି.ପି. ଛାୟା ବ�ଯବହାର କରନ�ତ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "�ଚ�.ଟି.ଟି.ପି. ଛାୟାକରଣ ବେଳେ ବୈଧିକରଣ ପାଇ� ଚାଳକ ନାମ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution ଅନଲାଇନ ଧାରା ପରିବର�ତ�ତେ ଅଫଲାଇନ ଧାରାରେ ଆରମ�ଭ ହେବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
 msgstr "ୱିଣ�ଡୋର ଆକାର ବୃଦ�ଧି କରିବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the sidebar should be visible."
 msgstr "ପାର�ଶ�ୱପଟିଟି ଦୃଶ�ୟମାନ ହେବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Whether the status bar should be visible."
 msgstr "ସ�ଥିତିପଟିଟି ଦୃଶ�ୟମାନ ହେବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the toolbar should be visible."
 msgstr "ସାଧନ ପଟିଟି ଦୃଶ�ୟମାନ ହେବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Evolution ର ବିକାଶ ସଂସ�କରଣରେ ଚେତାବନୀ ସଂଳାପକ� ଛାଡ଼ିଦିଆଯିବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
 msgstr "ୱିଣ�ଡୋ ବଟନଗ�ଡ଼ିକ ଦୃଶ�ୟମାନ ହେବା ଉଚିତ କି ନ�ହ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:63
 msgid "Window button style"
 msgstr "ୱିଣ�ଡୋ ବଟନ ଶୈଳୀ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:64
 msgid "Window buttons are visible"
 msgstr "ୱିଣ�ଡୋ ବଟନଗ�ଡ଼ିକ ଦୃଶ�ୟମାନ ହେଉଛି"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b> ସକ�ରିୟ ସଂଯୋଗଗ�ଡ଼ିକ</b>"
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
+msgid "Searches"
+msgstr "ଅନ�ସନ�ଧାନ"
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "ସକ�ରିୟ ସଂଯୋଗଗ�ଡ଼ିକ"
+#: ../shell/e-shell-content.c:545
+msgid "Save Search"
+msgstr "ସନ�ଧାନ ଫଳାଫଳକ� ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "�ହି ସଂଯୋଗଗ�ଡ଼ିକ� ବନ�ଦ କରିବା ପାଇ� OK କ�ଲିକ କରନ�ତ� �ବଂ ଅଫଲାଇନ ଯାଆନ�ତ�"
+#. Translators: The "Show:" label precedes a combo box that
+#. * allows the user to filter the current view.  Examples of
+#. * items that appear in the combo box are "Unread Messages",
+#. * "Important Messages", or "Active Appointments".
+#: ../shell/e-shell-searchbar.c:918
+#, fuzzy
+#| msgid "Sho_w: "
+msgid "Sho_w:"
+msgstr "ପ�ରଦର�ଶନ କରନ�ତ� (_w): "
 
-#: ../shell/e-shell-importer.c:128
-msgid "Choose the type of importer to run:"
-msgstr "ଚଲାଇବା ପାଇ� ଆମଦାନୀ ପ�ରକାରକ� ବାଛନ�ତ�:"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:949
+#, fuzzy
+#| msgid "Sear_ch: "
+msgid "Sear_ch:"
+msgstr "ସନ�ଧାନ କରନ�ତ� (_c): "
 
-#: ../shell/e-shell-importer.c:131
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr "Evolution ମଧ�ଯକ� ଆମଦାନୀ କରିବାକ� ଚାହ��ଥିବା ଫାଇଲକ� ବାଛନ�ତ�, �ବଂ ତାଲିକାର� ଫାଇଲ ପ�ରକାର ବାଛନ�ତ�।"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:1010
+#, fuzzy
+#| msgid " i_n "
+msgid "i_n"
+msgstr "ଚିହ�ନିତ ସ�ଥାନରେ (_n)"
 
-#: ../shell/e-shell-importer.c:135
-msgid "Choose the destination for this import"
-msgstr "�ହି ଆମଦାନୀ ପାଇ� ଲକ�ଷ�ଯ ସ�ଥଳ ବାଛନ�ତ�"
+#: ../shell/e-shell-utils.c:253
+#, fuzzy
+#| msgid "vCard (.vcf, .gcrd)"
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf, .gcrd)"
 
-#: ../shell/e-shell-importer.c:141
-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"
+#: ../shell/e-shell-utils.c:255
+#, fuzzy
+#| msgid "iCalendar files (.ics)"
+msgid "iCalendar (.ics)"
+msgstr "iCalendar ଫାଇଲଗ�ଡ଼ିକ (.ics)"
+
+#: ../shell/e-shell-utils.c:276
+#, fuzzy
+#| msgid "All files"
+msgid "All Files (*)"
+msgstr "ସମସ�ତ ଫାଇଲଗ�ଡ଼ିକ"
+
+#. The translator-credits string is for translators to list
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-actions.c:645
+msgid "translator-credits"
+msgstr "ଶ�ଭ�ରାଂଶ� ବେହେରା <arya_subhransu@yahoo.co.in>"
+
+#: ../shell/e-shell-window-actions.c:656
+msgid "Evolution Website"
+msgstr "Evolution କ�ଯାଲେଣ�ଡର ବସ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:1228
+#, fuzzy
+#| msgid "Bug buddy is not installed."
+msgid "Bug Buddy is not installed."
+msgstr "Bug buddy ସ�ଥାପିତ ହୋଇ ନାହି�।"
+
+#: ../shell/e-shell-window-actions.c:1230
+#, fuzzy
+#| msgid "Bug buddy could not be run."
+msgid "Bug Buddy could not be run."
+msgstr "Bug buddy କ� ଚଲାଇ ପାରିଲା ନାହି�।"
+
+#: ../shell/e-shell-window-actions.c:1347
+#, fuzzy
+#| msgid "Bug buddy is not installed."
+msgid "GNOME Pilot is not installed."
+msgstr "Bug buddy ସ�ଥାପିତ ହୋଇ ନାହି�।"
+
+#: ../shell/e-shell-window-actions.c:1349
+#, fuzzy
+#| msgid "Bug buddy could not be run."
+msgid "GNOME Pilot could not be run."
+msgstr "Bug buddy କ� ଚଲାଇ ପାରିଲା ନାହି�।"
+
+#: ../shell/e-shell-window-actions.c:1443
+msgid "Show information about Evolution"
+msgstr "Evolution ବିଷୟରେ ସୂଚନା ପ�ରଦର�ଶନ କରନ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:1448
+msgid "_Close Window"
+msgstr "ୱିଣ�ଡୋ ବନ�ଦ କରନ�ତ� (_C)"
+
+#: ../shell/e-shell-window-actions.c:1455
+#, fuzzy
+#| msgid "A_ppointments"
+msgid "_Contents"
+msgstr "ନିୟ�କ�ତି (_p)"
+
+#: ../shell/e-shell-window-actions.c:1457
+#, fuzzy
+#| msgid "Open Other User's Folder"
+msgid "Open the Evolution User Guide"
+msgstr "ଅନ�ଯ ଚାଳକ ଫୋଲଡରକ� ଖୋଲନ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:1483
+msgid "Evolution _FAQ"
+msgstr "Evolution FAQ (_F)"
+
+#: ../shell/e-shell-window-actions.c:1485
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "ବାରମ�ବାର ପଚରାଯାଉଥିବା ପ�ରଶ�ନ ୱେବ ପୃଷ�ଠାକ� ଖୋଲନ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:1490
+msgid "_Forget Passwords"
+msgstr "ପ�ରବେଶ ସଂକେତ ଭ�ଲିଯାଇଛନ�ତି (_F)"
+
+#: ../shell/e-shell-window-actions.c:1492
+#, fuzzy
+#| msgid "Are you sure you want to forget all remembered passwords?"
+msgid "Forget all remembered passwords"
+msgstr "ଆପଣ ନିଶ�ଚିତ କି ଯେ ଆପଣ ମନେଥିବା ସମସ�ତ ପ�ରବେଶ ସଂକେତଗ�ଡ଼ିକ� ଭ�ଲିବାକ� ଚାହ��ଛନ�ତି?"
+
+#: ../shell/e-shell-window-actions.c:1497
+msgid "I_mport..."
+msgstr "ଆୟତ କରନ�ତ� (_I) ..."
+
+#: ../shell/e-shell-window-actions.c:1499
+msgid "Import data from other programs"
+msgstr "ଅନ�ଯାନ�ଯ ପ�ରୋଗ�ରାମ ମାନଙ�କ ମଧ�ଯର� ତଥ�ଯ ଆୟତ କରନ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:1504
+msgid "New _Window"
+msgstr "ନୂତନ ୱିଣ�ଡୋ (_W)"
+
+#: ../shell/e-shell-window-actions.c:1506
+#, fuzzy
+#| msgid "Create a new window displaying this folder"
+msgid "Create a new window displaying this view"
+msgstr "�ହି ଫୋଲଡରକ� ପ�ରଦର�ଶନ କର�ଥିବା ଗୋଟି� ନୂତନ ୱିଣ�ଡୋକ� ସୃଷ�ଟି କରନ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:1520
+#, fuzzy
+#| msgid "Configuration"
+msgid "Configure Evolution"
+msgstr "ବିନ�ୟାସ"
+
+#: ../shell/e-shell-window-actions.c:1525
+msgid "_Quick Reference"
+msgstr "ତୀବ�ର ସନ�ଦର�ଭ (_Q)"
+
+#: ../shell/e-shell-window-actions.c:1527
+#, fuzzy
+#| msgid "Change Evolution's settings"
+msgid "Show Evolution's shortcut keys"
+msgstr "Evolutionର ବିନ�ଯାସକ� ପରିବର�ତ�ତନ କରନ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:1534
+msgid "Exit the program"
+msgstr "ପ�ରୋଗ�ରାମକ� ବନ�ଦ କରନ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:1539
+msgid "_Advanced Search..."
+msgstr "ଉନ�ନତ ସନ�ଧାନ (_A) ..."
+
+#: ../shell/e-shell-window-actions.c:1541
+msgid "Construct a more advanced search"
 msgstr ""
-"ନିମ�ନଲିଖିତ ପ�ରୟୋଗ: Pine, Netscape, Elm, iCalendar ଆମଦାନୀ\n"
-"କରିବା ପାଇ� ସଂରଚନାକ� Evolution ଯାଞ�ଜ କରିଥିଲା। କୌଣସି ଆମଦାନୀ ଯୋଗ�ୟ\n"
-"ସଂରଚନା ମିଳିଲା ନାହି�। ଯଦି ଆପଣ ପ�ଣିଥରେ ଚେଷ�ଟାକରିବା ପାଇ� ଚାହ��ଛନ�ତି,\n"
-"ତେବେ ଦୟାକରି \"ପଛକ�\" ବଟନକ� କ�ଲିକ କରନ�ତ�।\n"
 
-#: ../shell/e-shell-importer.c:296
-msgid "F_ilename:"
-msgstr "ଫାଇଲ ନାମ (_i):"
+#: ../shell/e-shell-window-actions.c:1548
+#, fuzzy
+#| msgid "Clear the search"
+msgid "Clear the current search parameters"
+msgstr "ସନ�ଧାନକ� ସଫା କରନ�ତ�"
 
-#: ../shell/e-shell-importer.c:301
-msgid "Select a file"
-msgstr "�କ ଫାଇଲ ମନୋନୀତ କର"
+#: ../shell/e-shell-window-actions.c:1553
+msgid "_Edit Saved Searches..."
+msgstr "ସଂରକ�ଷିତ ସନ�ଧାନ ଫଳାଫଳକ� ସମ�ପାଦନ କରନ�ତ� (_E) ..."
 
-#: ../shell/e-shell-importer.c:310
-msgid "File _type:"
-msgstr "ଫାଇଲ ପ�ରକାର (_t):"
+#: ../shell/e-shell-window-actions.c:1555
+#, fuzzy
+#| msgid "Manage your email, contacts and schedule"
+msgid "Manage your saved searches"
+msgstr "ଆପଣଙ�କ ମେଲକ� ପରିଚାଳନା କରନ�ତ�, ଯୋଗାଯୋଗ �ବଂ କାର�ଯ�ୟସୂଚୀ"
 
-#: ../shell/e-shell-importer.c:358
-msgid "Import data and settings from _older programs"
-msgstr "ପ�ର�ଣା ପ�ରଗ�ରାମଗ�ଡ଼ିକର� ତଥ�ୟ �ବଂ ସଂରଚନାଗ�ଡ଼ିକ� ଆମଦାନୀ କରନ�ତ� (_o)"
+#: ../shell/e-shell-window-actions.c:1562
+msgid "Click here to change the search type"
+msgstr "ସନ�ଧାନ ପ�ରକାର ପରିବର�ତ�ତନ କରିବା ପାଇ� �ଠାରେ ଦବାନ�ତ�"
 
-#: ../shell/e-shell-importer.c:361
-msgid "Import a _single file"
-msgstr "ଗୋଟି� ଫାଇଲ ଆମଦାନୀ କରନ�ତ� (_s)"
+#: ../shell/e-shell-window-actions.c:1567
+msgid "_Find Now"
+msgstr "ବର�ତ�ତମାନ ଖୋଜନ�ତ� (_F)"
 
-#: ../shell/e-shell-importer.c:725
-msgid "_Import"
-msgstr "ଆୟତ କରନ�ତ� (_I)"
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1569
+#, fuzzy
+#| msgid "Cancel the current mail operation"
+msgid "Execute the current search parameters"
+msgstr "ପ�ରଚଳିତ ମେଲ ପ�ରୟୋଗକ� ବାତିଲ କରନ�ତ�"
 
-#: ../shell/e-shell-settings-dialog.c:313
-msgid "Evolution Preferences"
-msgstr "Evolution ପସନ�ଦ"
+#: ../shell/e-shell-window-actions.c:1574
+msgid "_Save Search..."
+msgstr "ସନ�ଧାନ ଫଳାଫଳକ� ସଂରକ�ଷଣ କରନ�ତ� (_S) ..."
 
-#. To translators: This is the window title and %s is the
-#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:326
-#, c-format
-msgid "%s - Evolution"
-msgstr "%s - Evolution"
+#: ../shell/e-shell-window-actions.c:1576
+#, fuzzy
+#| msgid "Save the current file"
+msgid "Save the current search parameters"
+msgstr "ସାମ�ପ�ରତିକ ଫାଇଲକ� ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../shell/e-shell-window-commands.c:69
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "GNOME ପଥପ�ରଦର�ଶକ ସାଧନଗ�ଡ଼ିକ �ହି ତନ�ତ�ରରେ ସ�ଥାପିତ ହେବାପରି ଦୃଶ�ୟମାନ ହେଉନାହି�।"
+#: ../shell/e-shell-window-actions.c:1588
+msgid "Send / _Receive"
+msgstr "ପ�ରେରଣ କରନ�ତ� / ଗ�ରହଣ କରନ�ତ� (_R)"
 
-#: ../shell/e-shell-window-commands.c:78
-#, c-format
-#| msgid "Error executing %s."
-msgid "Error executing %s. (%s)"
-msgstr "%s କ� ନିଷ�ପାଦନ କରିବାରେ ତ�ର�ଟି। (%s)"
+#: ../shell/e-shell-window-actions.c:1590
+msgid "Send queued items and retrieve new items"
+msgstr "ଧାଡ଼ିରେ ଥିବା ବସ�ତ�ଗ�ଡ଼ିକ� ପଠାନ�ତ� �ବଂ ନୂତନ ବସ�ତ�ଗ�ଡ଼ିକ� କାଢ଼ନ�ତ�"
 
-#: ../shell/e-shell-window-commands.c:136
-msgid "Bug buddy is not installed."
-msgstr "Bug buddy ସ�ଥାପିତ ହୋଇ ନାହି�।"
+#: ../shell/e-shell-window-actions.c:1595
+#, fuzzy
+#| msgid "Submit _Bug Report"
+msgid "Submit _Bug Report..."
+msgstr "ତୃଟି ବିବରଣୀ ଦାଖଲ କରନ�ତ� (_B)"
 
-#: ../shell/e-shell-window-commands.c:139
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy କ� ଚଲାଇ ପାରିଲା ନାହି�।"
+#: ../shell/e-shell-window-actions.c:1597
+msgid "Submit a bug report using Bug Buddy"
+msgstr "ବଗ-ବଡି ବ�ଯବହାର କରି ଗୋଟି� ତୃଟି ବିବରଣୀ ଦାଖଲ କରନ�ତ�"
 
-#. The translator-credits string is for translators to list
-#. * per-language credits for translation, displayed in the
-#. * about dialog.
-#: ../shell/e-shell-window-commands.c:939
-msgid "translator-credits"
-msgstr "ଶ�ଭ�ରାଂଶ� ବେହେରା <arya_subhransu@yahoo.co.in>"
+#: ../shell/e-shell-window-actions.c:1602
+#, fuzzy
+#| msgid "iPod Synchronization"
+msgid "GNOME Pilot _Synchronization..."
+msgstr "iPod ସମକାଳୀନ"
 
-#: ../shell/e-shell-window-commands.c:950
-msgid "Evolution Website"
-msgstr "Evolution କ�ଯାଲେଣ�ଡର ବସ�ତ�"
+#: ../shell/e-shell-window-actions.c:1604
+#, fuzzy
+#| msgid "Set up Pilot configuration"
+msgid "Set up GNOME Pilot configuration"
+msgstr "ପଥପ�ରଦର�ଶକ ବିନ�ଯାସକ� ବ�ଯବସ�ଥାପିତ କରନ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:1609
+msgid "_Work Offline"
+msgstr "ଅଫଲାଇନରେ କାର�ଯ�ୟ କରନ�ତ� (_W)"
 
-#: ../shell/e-shell-window-commands.c:1168
+#: ../shell/e-shell-window-actions.c:1611
+#, fuzzy
+#| msgid "Start in offline mode"
+msgid "Put Evolution into offline mode"
+msgstr "ଅଫ ଲାଇନ ଧାରାରେ ଆରମ�ଭ କରନ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Work Online"
 msgstr "ଅନଲାଇନରେ କାର�ଯ�ୟ କରନ�ତ� (_W)"
 
-#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
-msgid "_Work Offline"
-msgstr "ଅଫଲାଇନରେ କାର�ଯ�ୟ କରନ�ତ� (_W)"
+#: ../shell/e-shell-window-actions.c:1618
+#, fuzzy
+#| msgid "Start in online mode"
+msgid "Put Evolution into online mode"
+msgstr "ଅନଲାଇନ ଧାରାରେ ଆରମ�ଭ କରନ�ତ�"
 
-#: ../shell/e-shell-window-commands.c:1194
-msgid "Work Offline"
-msgstr "ଅଫଲାଇନରେ କାର�ଯ�ଯ କରନ�ତ�"
+#: ../shell/e-shell-window-actions.c:1646
+msgid "Lay_out"
+msgstr "ବିନ�ଯାସ (_o)"
 
-#: ../shell/e-shell-window.c:375
-msgid ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
-msgstr ""
-"Evolution ବର�ତ�ତମାନ ଅନଲାଇନ ଅଛି।\n"
-"ଅଫଲାଇନରେ କାର�ଯ�ୟକରିବା ପାଇ� �ହି ବଟନ ଉପରେ କ�ଲିକ କରନ�ତ�।"
+#: ../shell/e-shell-window-actions.c:1653
+msgid "_New"
+msgstr "ନୂତନ (_N)"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution ଅଫଲାଇନରେ ଯିବା ପାଇ� ପ�ରସ�ତ�ତ ହେଉଛି।"
+#: ../shell/e-shell-window-actions.c:1660
+msgid "_Search"
+msgstr "ଖୋଜନ�ତ� (_S)"
 
-#: ../shell/e-shell-window.c:389
-msgid ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
-msgstr ""
-"Evolution ବର�ତ�ତମାନ ଅଫଲାଇନରେ ଅଛି।\n"
-"ଅନଲାଇନରେ କାର�ଯ�ୟକରିବା ପାଇ� �ହି ବଟନ ଉପରେ କ�ଲିକ କରନ�ତ�।"
+#: ../shell/e-shell-window-actions.c:1667
+msgid "_Switcher Appearance"
+msgstr "ପରିବର�ତ�ତନକାରୀର ଦୃଶ�ୟ (_S)"
 
-#: ../shell/e-shell-window.c:783
-#, c-format
-msgid "Switch to %s"
-msgstr "%s କ� ବଦଳାନ�ତ�"
+#: ../shell/e-shell-window-actions.c:1681
+msgid "_Window"
+msgstr "ୱିଣ�ଡୋ (_W)"
 
-#: ../shell/e-shell.c:639
-msgid "Unknown system error."
-msgstr "ଅଜଣା ତନ�ତ�ର ତ�ର�ଟି।"
+#: ../shell/e-shell-window-actions.c:1710
+msgid "Show Side _Bar"
+msgstr "ପାର�ଶ�ବ ପଟିକ� ପ�ରଦର�ଶନ କରନ�ତ� (_B)"
 
-#: ../shell/e-shell.c:837 ../shell/e-shell.c:838
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+#: ../shell/e-shell-window-actions.c:1712
+#, fuzzy
+#| msgid "Show Side _Bar"
+msgid "Show the side bar"
+msgstr "ପାର�ଶ�ବ ପଟିକ� ପ�ରଦର�ଶନ କରନ�ତ� (_B)"
 
-#: ../shell/e-shell.c:1260 ../widgets/misc/e-cell-date-edit.c:324
-msgid "OK"
-msgstr "ଠିକ ଅଛି"
+#: ../shell/e-shell-window-actions.c:1718
+#, fuzzy
+#| msgid "Show Animations"
+msgid "Show _Buttons"
+msgstr "ଜୀବନ�ତଚିତ�ରଗ�ଡିକ� ଦର�ଶାନ�ତ�"
 
-#: ../shell/e-shell.c:1262
-msgid "Invalid arguments"
-msgstr "ଅବୈଧ ସ�ୱତନ�ତ�ରଚର"
+#: ../shell/e-shell-window-actions.c:1720
+#, fuzzy
+#| msgid "Show the second time zone"
+msgid "Show the switcher buttons"
+msgstr "ଦ�ୱିତିୟ ସମୟ ମଣ�ଡଳ ଦର�ଶାନ�ତ�"
 
-#: ../shell/e-shell.c:1264
-msgid "Cannot register on OAF"
-msgstr "OAF ଉପରେ ପଞ�ଜିକରଣ କରିପାରିବେ ନାହି�"
+#: ../shell/e-shell-window-actions.c:1726
+msgid "Show _Status Bar"
+msgstr "ଅବସ�ଥିତି ପଟିକ� ପ�ରଦର�ଶନ କରନ�ତ� (_S)"
 
-#: ../shell/e-shell.c:1266
-msgid "Configuration Database not found"
-msgstr "ସଂରଚନା ତଥ�ୟାଧାର ମିଳିଲାନାହି�"
+#: ../shell/e-shell-window-actions.c:1728
+#, fuzzy
+#| msgid "Show _Status Bar"
+msgid "Show the status bar"
+msgstr "ଅବସ�ଥିତି ପଟିକ� ପ�ରଦର�ଶନ କରନ�ତ� (_S)"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid "New"
-msgstr "ନୂତନ"
+#: ../shell/e-shell-window-actions.c:1734
+#, fuzzy
+#| msgid "Show _Toolbar"
+msgid "Show _Tool Bar"
+msgstr "ସାଧନ ପଟିକ� ପ�ରଦର�ଶନ କରନ�ତ� (_T)"
 
-#: ../shell/test/evolution-test-component.c:105
-msgid "New Test"
-msgstr "ନୂତନ ପରୀକ�ଷଣ"
+#: ../shell/e-shell-window-actions.c:1736
+#, fuzzy
+#| msgid "Show _Toolbar"
+msgid "Show the tool bar"
+msgstr "ସାଧନ ପଟିକ� ପ�ରଦର�ଶନ କରନ�ତ� (_T)"
 
-#: ../shell/test/evolution-test-component.c:106
-msgctxt "New"
-msgid "_Test"
-msgstr "ପରୀକ�ଷଣ (_T)"
+#: ../shell/e-shell-window-actions.c:1758
+msgid "_Icons Only"
+msgstr "କେବଳ ଚିତ�ରସଙ�କେତ (_I)"
 
-#: ../shell/test/evolution-test-component.c:107
-msgid "Create a new test item"
-msgstr "ଗୋଟି� ନୂତନ ପରୀକ�ଷଣ ବସ�ତ� ସୃଷ�ଟି କରନ�ତ�"
+#: ../shell/e-shell-window-actions.c:1760
+msgid "Display window buttons with icons only"
+msgstr "ୱିଣ�ଡୋ ବଟନ ମାନଙ�କ� କେବଳ ଚିତ�ରସଙ�କେତ ସହିତ ପ�ରଦର�ଶନ କରନ�ତ�"
 
-#: ../shell/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Evolution ମଧ�ଯକ� ଫାଇଲ ଆମଦାନୀ କରିବା ଆରମ�ଭ କରିବା ପାଇ� \"Import\" କ� କ�ଲିକ କରନ�ତ�।"
+#: ../shell/e-shell-window-actions.c:1765
+msgid "_Text Only"
+msgstr "କେବଳ ପାଠ�ୟ (_T)"
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Evolution ଆମଦାନୀ ସହାୟକ"
+#: ../shell/e-shell-window-actions.c:1767
+msgid "Display window buttons with text only"
+msgstr "ୱିଣ�ଡୋ ବଟନ ମାନଙ�କ� କେବଳ ପାଠ�ଯ ସହିତ ପ�ରଦର�ଶନ କରନ�ତ�"
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "ପାଇଲ� ଆମଦାନୀକର"
+#: ../shell/e-shell-window-actions.c:1772
+msgid "Icons _and Text"
+msgstr "ଚିତ�ରସଙ�କେତ �ବଂ ପାଠ�ଯ (_a)"
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "ଅବସ�ଥାନ ଆମଦାନୀ କରନ�ତ�"
+#: ../shell/e-shell-window-actions.c:1774
+msgid "Display window buttons with icons and text"
+msgstr "ୱିଣ�ଡୋ ବଟନ ମାନଙ�କ� ପାଠ�ଯ �ବଂ ଚିତ�ରସଙ�କେତ ସହିତ ପ�ରଦର�ଶନ କରନ�ତ�"
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "ଆମଦାନୀର ପ�ରକାର"
+#: ../shell/e-shell-window-actions.c:1779
+msgid "Tool_bar Style"
+msgstr "ସାଧନ ପଟି ଶୈଳୀ (_b)"
 
-#: ../shell/import.glade.h:6
-msgid "Select Information to Import"
-msgstr "ଆମଦାନୀ କରିବା ପାଇ� ସୂଚନା ବାଛନ�ତ�"
+#: ../shell/e-shell-window-actions.c:1781
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "ଡେସ�କଟପ ସାଧନ ପଟି ବିନ�ଯାସକ� ବ�ଯବହାର କରି ୱିଣ�ଡୋ ବଟନକ� ପ�ରଦର�ଶନ କରନ�ତ�"
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "ଗୋଟି� ଫାଇଲ ବାଛନ�ତ�"
+#: ../shell/e-shell-window-actions.c:1789
+msgid "Define Views..."
+msgstr "ପ�ରଦର�ଶନ ମାନଙ�କ� ବ�ଯାଖ�ଯା କରନ�ତ�..."
 
-#: ../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."
+#: ../shell/e-shell-window-actions.c:1791
+msgid "Create or edit views"
+msgstr "ଦୃଶ�ୟଗ�ଡ଼ିକ� ସୃଷ�ଟିକରନ�ତ� କିମ�ବା ସମ�ପାଦନ କରନ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:1796
+msgid "Save Custom View..."
+msgstr "ଇଚ�ଛାରୂପଣ ପ�ରଦର�ଶନକ� ସଂରକ�ଷଣ କରନ�ତ�..."
+
+#: ../shell/e-shell-window-actions.c:1798
+msgid "Save current custom view"
+msgstr "ବର�ତ�ତମାନ ପ�ରଦର�ଶନକ� ସଂରକ�ଷଣ କରନ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:1805
+msgid "C_urrent View"
+msgstr "ବର�ତ�ତମାନ ପ�ରଦର�ଶନ (_u)"
+
+#: ../shell/e-shell-window-actions.c:1815
+msgid "Custom View"
+msgstr "ଇଚ�ଛାରୂପଣ ପ�ରଦର�ଶନ"
+
+#: ../shell/e-shell-window-actions.c:1817
+msgid "Current view is a customized view"
+msgstr "ପ�ରଚଳିତ ଦୃଶ�ୟଟି ଗୋଟି� ଇଚ�ଛାମ�ତାବକ ଦୃଶ�ୟ ଅଟେ"
+
+#: ../shell/e-shell-window-actions.c:1827
+#, fuzzy
+#| msgid "Set up the page settings for your current printer"
+msgid "Change the page settings for your current printer"
+msgstr "ଆପଣଙ�କର ପ�ରଚଳିତ ମ�ଦ�ରଣୀ ପାଇ� ପୃଷ�ଠା ସଂରଚନାକ� ବିନ�ୟାସ କରନ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:2204
+#, c-format
+msgid "Switch to %s"
+msgstr "%s କ� ବଦଳାନ�ତ�"
+
+#: ../shell/e-shell-window-actions.c:2417
+msgid "Execute these search parameters"
+msgstr ""
+
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:573
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
+
+#: ../shell/e-shell-window.c:382
+msgid "New"
+msgstr "ନୂତନ"
+
+#: ../shell/e-shell.c:218
+#, fuzzy
+#| msgid "Preparing account '%s' for offline"
+msgid "Preparing to go offline..."
+msgstr "ଅଫ ଲାଇନ ପାଇ� ଖାତା '%s' ପ�ରସ�ତ�ତ କର�ଅଛି"
+
+#: ../shell/e-shell.c:268
+#, fuzzy
+#| msgid "Preparing account '%s' for offline"
+msgid "Preparing to go online..."
+msgstr "ଅଫ ଲାଇନ ପାଇ� ଖାତା '%s' ପ�ରସ�ତ�ତ କର�ଅଛି"
+
+#: ../shell/e-shell.c:336
+msgid "Preparing to quit..."
 msgstr ""
-"Evolution ଆମଦାନୀ ସହାୟକରେ ଆପଣଙ�କ� ସ�ୱାଗତ କର�ଅଛ�।\n"
-"�ହି ସହାୟତା ସହିତ ଆପଣ ବାହ�ୟ ଫାଇଲକ� Evolution ମଧ�ଯକ�\n"
-"ଆମଦାନୀ କରିବାର ପଦ�ଧତି ବିଷୟରେ ପଥପ�ରଦର�ଶନ କରାଯିବ।"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:164
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19221,7 +20759,7 @@ msgstr ""
 "ଆମେ ଆଶାକର�ଛ� ଯେ ଆପଣ ଆମର କଠିନ ପରିଶ�ରମକ� ଉପଭୋଗ କରନ�ତ�, �ବଂ ଆମେ\n"
 "ଇଚ�ଛା ସହକାରେ ଆପଣଙ�କର ଅବଦାନକ� ଅପେକ�ଷା କରିବ�!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:188
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19229,43 +20767,61 @@ msgstr ""
 "ଧନ�ୟବାଦ\n"
 "Evolution ଦଳ\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:195
 msgid "Do not tell me again"
 msgstr "ମୋତେ ପ�ଣିଥରେ ପଚାରନ�ତ� ନାହି�"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:301
 msgid "Start Evolution activating the specified component"
 msgstr "ଉଲ�ଲିଖିତ ଉପାଦାନଗ�ଡ଼ିକ� ସକ�ରିୟ କରି Evolution କ� ଆରମ�ଭ କରନ�ତ�"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:303
+msgid "Apply the given geometry to the main window"
+msgstr ""
+
+#: ../shell/main.c:307
 msgid "Start in online mode"
 msgstr "ଅନଲାଇନ ଧାରାରେ ଆରମ�ଭ କରନ�ତ�"
 
-#: ../shell/main.c:490
-msgid "Forcibly shut down all Evolution components"
-msgstr "ସମସ�ତ Evolution ଉପାଦାନଗ�ଡ଼ିକ� ବାଧ�ଯତାମୂଳକ ଭାବରେ ବନ�ଦ କରନ�ତ�"
+#: ../shell/main.c:309
+#, fuzzy
+#| msgid "Start in online mode"
+msgid "Start in \"express\" mode"
+msgstr "ଅନଲାଇନ ଧାରାରେ ଆରମ�ଭ କରନ�ତ�"
 
-#: ../shell/main.c:494
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Evolution 1.4 ର� ବାଧ�ୟତାମୂଳକ ଭାବରେ ସ�ଥାନ ପରିବର�ତ�ତନ କରନ�ତ�"
+#: ../shell/main.c:312
+#, fuzzy
+#| msgid "Forcibly shut down all Evolution components"
+msgid "Forcibly shut down Evolution"
+msgstr "ସମସ�ତ Evolution ଉପାଦାନଗ�ଡ଼ିକ� ବାଧ�ଯତାମୂଳକ ଭାବରେ ବନ�ଦ କରନ�ତ�"
 
-#: ../shell/main.c:497
+#: ../shell/main.c:315
 msgid "Send the debugging output of all components to a file."
 msgstr "ସମସ�ତ ଉପାଦାନର ତ�ର�ଟି ନିବାରଣ ଫଳାଫଳକ� ଗୋଟି� ଫାଇଲ ମଧ�ଯକ� ପଠାନ�ତ�।"
 
-#: ../shell/main.c:499
+#: ../shell/main.c:317
 msgid "Disable loading of any plugins."
 msgstr "ଯେକୌଣସି ପ�ଲଗଇନଗ�ଡ଼ିକର ଧାରଣକ� ନିଷ�କ�ରିୟ କରନ�ତ�।"
 
-#: ../shell/main.c:501
+#: ../shell/main.c:319
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ମେଲ, ଯୋଗାଯୋଗ �ବଂ କାର�ଯ�ୟର ପ�ରାକଦର�ଶନ ପଟ�ଟିକାକ� ନିଷ�କ�ରିୟ କରନ�ତ�।"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:323
+msgid "Import URIs or file names given as rest of arguments."
+msgstr ""
+
+#: ../shell/main.c:325
+#, fuzzy
+#| msgid "Restarting Evolution"
+msgid "Request a running Evolution process to quit"
+msgstr "Evolution କ� ପ�ନଃପ�ରାରମ�ଭ କର�ଅଛି"
+
+#: ../shell/main.c:440
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM �ବଂ ଇମେଲ ଗ�ରାହକ"
 
-#: ../shell/main.c:616
+#: ../shell/main.c:466
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19279,22 +20835,25 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "ଆପଣ ନିଶ�ଚିତ କି ଯେ ଆପଣ ମନେଥିବା ସମସ�ତ ପ�ରବେଶ ସଂକେତଗ�ଡ଼ିକ� ଭ�ଲିବାକ� ଚାହ��ଛନ�ତି?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot start Evolution"
-msgstr "Evolution ବିଷୟରେ ..."
+#, fuzzy
+#| msgid "Delete old data from version {0}?"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "ସଂସ�କରଣ {0}ର� ପ�ର�ଣା ତଥ�ୟକ� ଅପସାରଣ କରନ�ତ�?"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Continue"
+#, fuzzy
+#| msgid "Continue"
+msgid "Continue Anyway"
 msgstr "ଆଗକ� ବଢନ�ତ�"
 
 #: ../shell/shell.error.xml.h:4
-msgid "Delete old data from version {0}?"
-msgstr "ସଂସ�କରଣ {0}ର� ପ�ର�ଣା ତଥ�ୟକ� ଅପସାରଣ କରନ�ତ�?"
+msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
 
 #: ../shell/shell.error.xml.h:5
-msgid "Evolution can not start."
-msgstr "Evolution ଆରମ�ଭ କରିପାରିବେ ନାହି�।"
-
-#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -19302,116 +20861,139 @@ msgstr ""
 "ଆପଣଙ�କର ପ�ରବେଶ ସଂକେତ ଭ�ଲିବା ଦ�ୱାରା ମନେ ଥିବା ସମସ�ତ ପ�ରବେଶ ସଂକେତକ� ସଫାକରନ�ତ�। ପରବର�ତ�ତି "
 "ସମୟରେ ଆବଶ�ୟକ ହେଲେ ଆପଣଙ�କ� ପଚରାଯିବ।"
 
+#: ../shell/shell.error.xml.h:7
+#, fuzzy
+#| msgid "_Quit"
+msgid "Quit Now"
+msgstr "ବିଦାୟ ନିଅନ�ତ� (_Q)"
+
 #: ../shell/shell.error.xml.h:8
-msgid "Insufficient disk space for upgrade."
-msgstr "ଉନ�ନୟନ ପାଇ� ଯଥେଷ�ଟ ଖାଲି ସ�ଥାନ ନାହି�।"
+#, fuzzy
+#| msgid "Upgrade from previous version failed: {0}"
+msgid "Upgrade from previous version failed:"
+msgstr "ପୂର�ବ ସଂସ�କରଣର� ଉନ�ନୟନ ବିଫଳ ହୋଇଛି: {0}"
 
 #: ../shell/shell.error.xml.h:9
-msgid "Really delete old data?"
-msgstr "ପ�ରକୃତରେ ପ�ର�ଣା ତଥ�ୟକ� ଅପସାରଣ କରିବେ?"
+msgid "_Forget"
+msgstr "ଭ�ଲିଯା� (_F)"
 
 #: ../shell/shell.error.xml.h:10
+#, fuzzy
+#| msgid ""
+#| "{1}\n"
+#| "\n"
+#| "If you choose to continue, you may not have access to some of your old "
+#| "data.\n"
 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"
+"{0}\n"
 "\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
-"&quot;evolution&quot; ଡିରେକ�ଟୋରୀର ସମସ�ତ ତଥ�ୟ ସବ�ଦିନ ପାଇ� କଢ଼ାହେବାକ� ଯାଉଛି।\n"
-"\n"
-"�ହା ପ�ରସ�ଥାବିତ ଯେ ଆପଣ ହସ�ତକୃତ ଭାବରେ ତାହାକ� ଯାଞ�ଚ କରନ�ତ� ଯେ ଆପଣଙ�କର ସମସ�ତ ମେଲ, ଯୋଗାଯୋଗ, "
-"�ବଂ କ�ୟାଲେଣ�ଡର ତଥ�ୟ ଉପସ�ଥିତ ଅଛି, �ବଂ Evolution ର �ହି ସଂସ�କରଣ ପ�ର�ଣା ତଥ�ୟକ� ଅପସାରଣ କରିବା "
-"ପୂର�ବର� ସଠିକ ଭାବରେ କାର�ଯ�ୟକରିଥା�।\n"
+"{1}\n"
 "\n"
-"ଥରେ ଅପସାରଣ କରିସାରିବା ପରେ, ହସ�ତକୃତ ନିୟନ�ତ�ରଣ ବିନା ଆପଣ Evolutionର ପଛ ସଂସ�କରଣକ� ଯାଇପାରିବେ "
-"ନାହି�।\n"
+"ଯଦି ଆପଣ ଅଗ�ରସର ହେବାକ� ଚାହ��ଛନ�ତି, ତେବେ ଆପଣଙ�କ ପାଖରେ କିଛି ପ�ର�ଣା ତଥ�ୟ ପାଇ� ଅଭିଗମ�ୟତା "
+"ନଥାଇପାରେ।\n"
 
-#: ../shell/shell.error.xml.h:16
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
+#: ../shell/test/e-test-shell-backend.c:60
+#, fuzzy
+#| msgctxt "New"
+#| msgid "_Test"
+msgctxt "New"
+msgid "_Test Item"
+msgstr "ପରୀକ�ଷଣ (_T)"
+
+#: ../shell/test/e-test-shell-backend.c:62
+msgid "Create a new test item"
+msgstr "ଗୋଟି� ନୂତନ ପରୀକ�ଷଣ ବସ�ତ� ସୃଷ�ଟି କରନ�ତ�"
+
+#: ../shell/test/e-test-shell-backend.c:70
+#, fuzzy
+#| msgid "Resource"
+msgctxt "New"
+msgid "Test _Source"
+msgstr "ସାଧନ"
+
+#: ../shell/test/e-test-shell-backend.c:72
+#, fuzzy
+#| msgid "Create a new test item"
+msgid "Create a new test source"
+msgstr "ଗୋଟି� ନୂତନ ପରୀକ�ଷଣ ବସ�ତ� ସୃଷ�ଟି କରନ�ତ�"
+
+#: ../smclient/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
 msgstr ""
-"Evolutionର ପୂର�ବ ସଂସ�କରଣ ଭିନ�ନ �କ ସ�ଥାନରେ �ହାର ତଥ�ୟ ସଂରକ�ଷଣ କରିଥା�।\n"
-"\n"
-"ଯଦି ଆପଣ �ହି ତଥ�ୟକ� କାଢ଼ିଦେବାକ� ଚାହ��ଛନ�ତି, ତେବେ &quot;evolution&quot; ଡିରେକ�ଟୋରୀର ସମସ�ତ "
-"ତଥ�ୟ ସବ�ଦିନ ପାଇ� କଢ଼ାହୋଇଯିବ। ଯଦି ଆପଣ �ହି ତଥ�ୟକ� ରଖିବାକ� ଚାହ��ଛନ�ତି, ତେବେ ଆପଣ ହସ�ତକୃତ ଭାବରେ "
-"&quot;evolution&quot; ର ତଥ�ୟକ� ଆପଣଙ�କ ଇଚ�ଛା ଅନ�ସାରେ କାଢ଼ିପାରିବେ।\n"
 
-#: ../shell/shell.error.xml.h:20
-msgid "Upgrade from previous version failed: {0}"
-msgstr "ପୂର�ବ ସଂସ�କରଣର� ଉନ�ନୟନ ବିଫଳ ହୋଇଛି: {0}"
+#: ../smclient/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr ""
 
-#: ../shell/shell.error.xml.h:21
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
+#: ../smclient/eggdesktopfile.c:958
+#, fuzzy, c-format
+#| msgid "Scanning %s"
+msgid "Starting %s"
+msgstr "%s କ�ରମବୀକ�ଷଣ କର�ଅଛି"
+
+#: ../smclient/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
 msgstr ""
-"ଆପଣଙ�କର ତଥ�ୟକ� ଉନ�ନୟନ କରାଯାଉଛି �ବଂ �ହା ପାଇ� {0} ପର�ଯ�ୟନ�ତ ଡିସ�କ ସ�ଥାନ ଆବଶ�ୟକ କରିଥା�, କିନ�ତ� "
-"ଆପଣଙ�କ ପାଖରେ କେବଳ {1} ଉପଲବ�ଧ ଅଛି।\n"
-"\n"
-"ଆପଣଙ�କ� ଅଗ�ରସର ହେବା ପୂର�ବର� ମୂଳ ଡିରେକ�ଟୋରୀରେ ଅଧିକ ଖାଲି ସ�ଥାନ ସୃଷ�ଟି କରିବାକ� ହେବ।"
 
-#: ../shell/shell.error.xml.h:24
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
+#: ../smclient/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
 msgstr ""
-"ଆପଣଙ�କର ତନ�ତ�ର ସଂରଚନା ଆପଣଙ�କର Evolution ସଂରଚନା ସହିତ ମେଳ ଖାଉନାହି�:\n"
-"\n"
-"ବିସ�ତୃତ ବିବରଣୀ ପାଇ� ସହାୟତାକ� କ�ଲିକ କରନ�ତ�"
 
-#: ../shell/shell.error.xml.h:27
-msgid ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
+#: ../smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
-"ଆପଣଙ�କର ତନ�ତ�ର ସଂରଚନା ଆପଣଙ�କର Evolution ସଂରଚନା ସହିତ ମେଳ ଖାଉନାହି�:\n"
-"\n"
-"{0}\n"
-"\n"
-"ବିସ�ତୃତ ବିବରଣୀ ପାଇ� ସହାୟତାକ� କ�ଲିକ କରନ�ତ�।"
 
-#: ../shell/shell.error.xml.h:32
-msgid "_Forget"
-msgstr "ଭ�ଲିଯା� (_F)"
+#: ../smclient/eggdesktopfile.c:1394
+#, fuzzy, c-format
+#| msgid "Editor not launchable"
+msgid "Not a launchable item"
+msgstr "ସମ�ପାଦକକ� ଆରମ�ଭ କରିବା ଯୋଗ�ୟ ନ�ହ�"
 
-#: ../shell/shell.error.xml.h:33
-msgid "_Keep Data"
-msgstr "ତଥ�ଯ ରଖନ�ତ� (_K)"
+#: ../smclient/eggsmclient.c:227
+#, fuzzy
+#| msgid "_Direct connection to the Internet"
+msgid "Disable connection to session manager"
+msgstr "ଇଣ�ଟରନେଟ ସହିତ ସିଧାସଳଖ ସଂଯୋଗ (_D)"
 
-#: ../shell/shell.error.xml.h:34
-msgid "_Remind Me Later"
-msgstr "ମୋତେ ପରେ ସ�ମରଣ କରାନ�ତ� (_R)"
+#: ../smclient/eggsmclient.c:230
+#, fuzzy
+#| msgid "Set up Pilot configuration"
+msgid "Specify file containing saved configuration"
+msgstr "ପଥପ�ରଦର�ଶକ ବିନ�ଯାସକ� ବ�ଯବସ�ଥାପିତ କରନ�ତ�"
 
-#: ../shell/shell.error.xml.h:35
-msgid ""
-"{1}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+#: ../smclient/eggsmclient.c:230
+msgid "FILE"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:233
+msgid "Specify session management ID"
 msgstr ""
-"{1}\n"
-"\n"
-"ଯଦି ଆପଣ ଅଗ�ରସର ହେବାକ� ଚାହ��ଛନ�ତି, ତେବେ ଆପଣଙ�କ ପାଖରେ କିଛି ପ�ର�ଣା ତଥ�ୟ ପାଇ� ଅଭିଗମ�ୟତା "
-"ନଥାଇପାରେ।\n"
 
-#: ../smime/gui/ca-trust-dialog.c:102
+#: ../smclient/eggsmclient.c:233
+#, fuzzy
+#| msgid "UID"
+msgid "ID"
+msgstr "UID"
+
+#: ../smclient/eggsmclient.c:254
+msgid "Session management options:"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:255
+#, fuzzy
+#| msgid "_Show image animations"
+msgid "Show session management options"
+msgstr "ପ�ରତିଛବି ଜାବନାୟନ ଦର�ଶାନ�ତ� (_S)"
+
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19422,76 +21004,81 @@ msgstr ""
 "\n"
 "ବିଶ�ୱାସ ସଂରଚନାଗ�ଡ଼ିକ� ସମ�ପାଦନ କରନ�ତ�:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:144
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr "�ହା ର �ହା"
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:148
 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:383
-#: ../smime/gui/certificate-manager.c:611
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "ମନୋନୀତ କର a କ�."
 
-#: ../smime/gui/certificate-manager.c:145
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "ସମସ�ତ PKCS12 ଫାଇଲ ମାନ"
 
-#: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:398
-#: ../smime/gui/certificate-manager.c:625
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
 msgid "All files"
 msgstr "ସମସ�ତ ଫାଇଲଗ�ଡ଼ିକ"
 
-#: ../smime/gui/certificate-manager.c:275
-#: ../smime/gui/certificate-manager.c:488
-#: ../smime/gui/certificate-manager.c:713
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "ନାମ"
 
-#: ../smime/gui/certificate-manager.c:284
-#: ../smime/gui/certificate-manager.c:506
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "ଉଦ�ଦେଶ�ୟ"
 
-#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "କ�ରମିକ ସଂଖ�ଯା"
 
-#: ../smime/gui/certificate-manager.c:301
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "ସମୟ ସମାପ�ତ"
 
-#: ../smime/gui/certificate-manager.c:392
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "ସମସ�ତ ଫାଇଲ ମାନ"
 
-#: ../smime/gui/certificate-manager.c:497
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "ଇ-ଡାକ ଠିକଣା ମାନ"
 
-#: ../smime/gui/certificate-manager.c:620
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "ସମସ�ତ CA ପ�ରମାଣପତ�ର ଫାଇଲ"
 
+#: ../smime/gui/certificate-manager.c:1052
+msgid "Certificates"
+msgstr "ପ�ରମାଣପତ�ର"
+
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ଦର�ଶକ: %s"
 
 #: ../smime/gui/component.c:46
-#, c-format
-msgid "Enter the password for `%s'"
+#, fuzzy, c-format
+#| msgid "Enter the password for `%s'"
+msgid "Enter the password for '%s'"
 msgstr "ପ�ରବେଶ କରନ�ତ� (Enter) ଗ�ପ�ତଶବ�ଦ '%s' ପାଇ�"
 
 #. we're setting the password initially
@@ -19504,7 +21091,7 @@ msgid "Enter new password"
 msgstr "ପ�ରବେଶ କରନ�ତ� (Enter) ନୂତନ ଗ�ପ�ତଶବ�ଦ"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19513,7 +21100,7 @@ msgstr ""
 "କ� ନ�ୟସ�ତ:\n"
 "  ବିଷୟ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19522,1671 +21109,380 @@ msgstr ""
 "ଦ�ୱାରା ନ�ୟସ�ତ:\n"
 "  ବିଷୟ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "ମନୋନୀତ କର"
 
-#: ../smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<ପ�ରମାଣପତ�ରର କୌଣସି ଅଂଶ ନାହି�>"
 
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b> କ�ଷେତ�ରଗ�ଡିକ</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>ପ�ରମାଣପତ�ର ଅନ�କ�ରମ</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b> କ�ଷେତ�ର ମୂଲ�ଯ</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>ଅଙ�ଗ�ଳି ଚିହ�ନ</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>ଦ�ୱାରା ପ�ରଦତ�ତ</b>"
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-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>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>ବୈଧତା ତାରିଖ</b>"
-
-#: ../smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "ପ�ରାଧିକାରୀ"
 
-#: ../smime/gui/smime-ui.glade.h:11
-msgid "Backup"
-msgstr "ନକଲ ସଂରକ�ଷଣ"
-
-#: ../smime/gui/smime-ui.glade.h:12
-msgid "Backup All"
+#: ../smime/gui/smime-ui.ui.h:3
+#, fuzzy
+#| msgid "Backup All"
+msgid "Backup _All"
 msgstr "ସମସ�ତ"
 
-#: ../smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.ui.h:4
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 msgstr "ପୂର�ବର� �ହା ପାଇ� କୌଣସି �ବଂ �ବଂ ଉପଲବ�ଧ."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "ପ�ରମାଣପତ�ର"
 
-#: ../smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "ପ�ରମାଣପତ�ର ପ�ରାଧିକରଣ ସଂସ�ଥା"
 
-#: ../smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.ui.h:7
+#, fuzzy
+#| msgid "<b>Certificate Fields</b>"
+msgid "Certificate Fields"
+msgstr "<b> କ�ଷେତ�ରଗ�ଡିକ</b>"
+
+#: ../smime/gui/smime-ui.ui.h:8
+#, fuzzy
+#| msgid "<b>Certificate Hierarchy</b>"
+msgid "Certificate Hierarchy"
+msgstr "<b>ପ�ରମାଣପତ�ର ଅନ�କ�ରମ</b>"
+
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "ପ�ରମାଣପତ�ର ବିସ�ତୃତ ବିବରଣୀ"
 
-#: ../smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "ପ�ରମାଣପତ�ର ଟେବ�ଲ"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "ସାଧାରଣ ନାମ (CN)"
 
-#: ../smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "ସମ�ପର�କ ପ�ରମାଣପତ�ର"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.ui.h:14
 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
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "ଇ-ଡାକ ସେଟିଙ�ଗଗ�ଡିକ"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "ଇ-ଡାକ"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "ଇ-ଡାକ"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "ରେ"
 
-#: ../smime/gui/smime-ui.glade.h:29
-msgid "Import"
-msgstr "ଆୟତ କରନ�ତ�"
+#: ../smime/gui/smime-ui.ui.h:19
+#, fuzzy
+#| msgid "Field Name"
+msgid "Field Value"
+msgstr "କ�ଷେତ�ର ନାମ"
+
+#: ../smime/gui/smime-ui.ui.h:20
+#, fuzzy
+#| msgid "MD5 Fingerprint"
+msgid "Fingerprints"
+msgstr "MD5 ଅଙ�ଗ�ଳି ଚିହ�ନ"
+
+#: ../smime/gui/smime-ui.ui.h:23
+#, fuzzy
+#| msgid "Issued On"
+msgid "Issued By"
+msgstr "ରେ"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "ରେ"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:25
+#, fuzzy
+#| msgid "Issued On"
+msgid "Issued To"
+msgstr "ରେ"
+
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "MD5 ଅଙ�ଗ�ଳି ଚିହ�ନ"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "ସଙ�ଗଠନ O"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "�କକ"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 ଅଙ�ଗ�ଳିଛବି "
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "SSL ଗ�ରାହକ"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "SSL ସେବକ"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:33
+#, fuzzy
+#| msgid "<b>This certificate has been verified for the following uses:</b>"
+msgid "This certificate has been verified for the following uses:"
+msgstr "<b> ପାଇ� ନିମ�ନଲିଖିତ</b>"
+
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "ର �ହା"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "�ହା କ�."
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "�ହା କ�."
 
-#: ../smime/gui/smime-ui.glade.h:41
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+#, fuzzy
+#| msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify websites."
 msgstr "�ହା କ�."
 
-#: ../smime/gui/smime-ui.glade.h:42
-msgid "View"
-msgstr "ଦ�ର�ଶ�ଯ"
+#: ../smime/gui/smime-ui.ui.h:38
+#, fuzzy
+#| msgid "<b>Validity</b>"
+msgid "Validity"
+msgstr "<b>ବୈଧତା ତାରିଖ</b>"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "ଆପଣ ଠାର�:"
 
-#: ../smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.ui.h:40
 msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "ଆପଣ ରେ ଫାଇଲ:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "ଆପଣ ରେ ଫାଇଲ:"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "ପ�ରମାଣପତ�ର"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:43
+#, fuzzy
+#| msgid "Backup"
+msgid "_Backup"
+msgstr "ନକଲ ସଂରକ�ଷଣ"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "CA Trust ସମ�ପାଦନ କରନ�ତ�"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:653
+#: ../smime/lib/e-cert-db.c:711
 msgid "Certificate already exists"
 msgstr "ଅବସ�ଥିତ"
 
-#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "ହସ�ତାକ�ଷର କରନ�ତ�"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "ସଂଗ�ପ�ତ"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:527
 msgid "Version"
 msgstr "ସଂସ�କରଣ"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:542
 msgid "Version 1"
 msgstr "ସଂସ�କରଣ ୧"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:545
 msgid "Version 2"
 msgstr "ସଂସ�କରଣ ୨"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:548
 msgid "Version 3"
 msgstr "ସଂସ�କରଣ 3"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:663
 msgid "PKCS #1 RSA Encryption"
 msgstr "RSA"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:666
 msgid "Certificate Key Usage"
 msgstr "ଚାବି ବ�ୟବହାର ବିଧି"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:669
 msgid "Netscape Certificate Type"
 msgstr "Netscape ପ�ରକାର"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:672
 msgid "Certificate Authority Key Identifier"
 msgstr "ଚାବି ପରିଚାୟକ"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:684
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ବସ�ତ� ପରିଚାୟକ (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:735
 msgid "Algorithm Identifier"
 msgstr "ଆଲଗୋରିଦିମ� ପରିଚାୟକ"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:743
 msgid "Algorithm Parameters"
 msgstr "ଆଲଗୋରିଦିମ� ପାରାମିଟରଗ�ଡିକ"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:765
 msgid "Subject Public Key Info"
 msgstr "ବିଷଯ ସାର�ବଜନୀନ ଚାବି ସୂଚନା"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:770
 msgid "Subject Public Key Algorithm"
 msgstr "ବିଷଯ ସାର�ବଜନୀନ ଚାବି ଆଲଗୋରିଦିମ�"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:785
 msgid "Subject's Public Key"
 msgstr "ବିଷଯ ସାର�ବଜନୀନ ଚାବି"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
 msgid "Error: Unable to process extension"
 msgstr "ତ�ର�ଟି କ�"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
 msgid "Object Signer"
 msgstr "ବସ�ତ�"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:831
 msgid "SSL Certificate Authority"
-msgstr "SSL"
+msgstr "SSL ପ�ରମାଣପତ�ର ଅଧିକାରୀ"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:835
 msgid "Email Certificate Authority"
-msgstr "ଇ-ଡାକ"
+msgstr "ଇ-ଡାକ ପ�ରମାଣପତ�ର ଅଧିକାରୀ"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:863
 msgid "Signing"
 msgstr "ହସ�ତାକ�ଷର କର�ଅଛି"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:867
 msgid "Non-repudiation"
 msgstr "ଅଖଣ�ଡନ"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:871
 msgid "Key Encipherment"
 msgstr "ଚାବି"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:875
 msgid "Data Encipherment"
 msgstr "ତଥ�ଯ"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:879
 msgid "Key Agreement"
 msgstr "କି ଚ�କ�ତିପତ�ର"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:883
 msgid "Certificate Signer"
 msgstr "ପ�ରମାଣପତ�ର ହସ�ତାକ�ଷର କାରୀ"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:887
 msgid "CRL Signer"
 msgstr "CRL ହସ�ତାକ�ଷରକାରୀ"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:935
 msgid "Critical"
 msgstr "ଗ�ର�ତର"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
 msgid "Not Critical"
 msgstr "ଗ�ର�ତର"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:961
 msgid "Extensions"
 msgstr "ଅନ�ଲଗ�ନ"
 
-#: ../smime/lib/e-cert.c:1019
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Algorithm"
 msgstr "ହସ�ତାକ�ଷର ଆଲଗୋରିଦିମ�"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "ନିର�ଗମଦାତା"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "ନିର�ଗମଦାତା "
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "ବିଷଯ ଅନନ�ଯ ID "
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1220
 msgid "Certificate Signature Value"
 msgstr "ହସ�ତାକ�ଷର ମୂଲ�ଯ"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ଫାଇଲ ପ�ରବେଶ ସଙ�କେତ"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:251
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 ଫାଇଲ ପାଇ� ପ�ରବେଶ ସଂକେତ ଭରଣ କରନ�ତ�:"
 
-#: ../smime/lib/e-pkcs12.c:348
+#: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
 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 "Could not execute '%s': %s\n"
-
-#: ../tools/killev.c:76
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "Shutting down %s (%s)\n"
-
-#: ../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:6 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "ନକଲ କରନ�ତ�"
-
-#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy selected contacts to another folder"
-msgstr "ନକଲ କରନ�ତ� ଚୟିତ କ�"
-
-#: ../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 address book folder"
-msgstr "ଗୋଟି� ନୂତନ ଠିକଣା ପ�ସ�ତିକା ସ�ର�ଷ�ଟି କରନ�ତ�"
-
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "କାଟନ�ତ�"
-
-#: ../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 "କାଢନ�ତ� (Del) ଠିକଣା ପ�ସ�ତକ"
-
-#: ../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-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 "S ଠିକଣା ପ�ସ�ତକ"
-
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "VCard ଭାବରେ ସଂରକ�ଷଣ କରନ�ତ� ..."
-
-#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard"
-msgstr "ସଂରକ�ଷଣ କରନ�ତ� ଚୟିତ a"
-
-#: ../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:2725
-msgid "Select All"
-msgstr "ସବ� ମନୋନୀତ କର"
-
-#: ../ui/evolution-addressbook.xml.h:35
-msgid "Select _All"
-msgstr "ସବ�କିଛି ଚୟନ କରନ�ତ� (_A)"
-
-#: ../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 "ଅଟକନ�ତ� (_o)"
-
-#: ../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:39
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Actions"
-msgstr "କ�ରିୟା (_A)"
-
-#: ../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:49
-msgid "_New"
-msgstr "ନୂତନ (_N)"
-
-#: ../ui/evolution-addressbook.xml.h:60
-msgid "_Rename"
-msgstr "ନାମ ବଦଳାନ�ତ� (_R)"
-
-#: ../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
-#: ../widgets/misc/e-calendar.c:195
-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:70
-#: ../widgets/misc/e-calendar.c:171
-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 "ସଫାକରନ�ତ� (_e)"
-
-#: ../ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr "ପ�ର�ଣା ସାକ�ଷାତକାର �ବଂ ବୈଠକକ� ସଫାକରନ�ତ�"
-
-#: ../ui/evolution-calendar.xml.h:25
-msgid "Select _Date"
-msgstr "ତାରିଖ ମନୋନୀତ କରନ�ତ� (_D)"
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "ଆଜିକ� ମନୋନୀତ କରନ�ତ� (_T)"
-
-#: ../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 ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "ଲଗ ସନ�ଦେଶଗ�ଡ଼ିକ ପାଇ� ତ�ର�ଟି ନିବାରଣ କୋନସୋଲକ� ଦେଖନ�ତ�"
-
-#: ../ui/evolution-calendar.xml.h:37
-msgid "Week"
-msgstr "ସପ�ତାହ"
-
-#: ../ui/evolution-calendar.xml.h:38
-msgid "Work Week"
-msgstr "କାର�ଯ�ଯ ସପ�ତାହ"
-
-#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "ଲଗଗ�ଡ଼ିକ� ତ�ର�ଟିମ�କ�ତ କରନ�ତ� (_D)"
-
-#: ../ui/evolution-calendar.xml.h:45
-msgid "_Open Appointment"
-msgstr "ସାକ�ଷାତକାର ଖୋଲନ�ତ� (_O)"
-
-#: ../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 "Download messages of accounts/folders marked for offline"
-msgstr "ଅଫଲାଇନ ପାଇ� ଚିହ�ନିତ ଖାତା/ଫୋଲଡରଗ�ଡ଼ିକର ସନ�ଦେଶଗ�ଡ଼ିକ� ଆହରଣ କରନ�ତ�"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Empty _Trash"
-msgstr "ଆବର�ଜନା ପାତ�ରକ� ଖୋଲନ�ତ� (_T)"
-
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-msgid "F_older"
-msgstr "ଫୋଲଡର (_o)"
-
-#: ../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 "ଫୋଲଡର ଖୋଜନ�ତ� (_o)"
-
-#: ../ui/evolution-mail-global.xml.h:14
-msgid "Show Message _Preview"
-msgstr "ସନ�ଦେଶ ପୂର�ବଦୃଶ�ଯ ଦେଖାନ�ତ� (_P)"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview below the message list"
-msgstr "ସନ�ଦେଶ ପ�ରାକଦର�ଶନକ� ସନ�ଦେଶ ତାଲିକା ତଳେ ଦର�ଶାନ�ତ�"
-
-#: ../ui/evolution-mail-global.xml.h:16
-msgid "Show message preview side-by-side with the message list"
-msgstr "ସନ�ଦେଶ ପ�ରାକଦର�ଶନକ� ସନ�ଦେଶ ତାଲିକା ସହିତ ପାଖକ� ପାଖ ଦର�ଶାନ�ତ�"
-
-#: ../ui/evolution-mail-global.xml.h:17
-msgid "Show message preview window"
-msgstr "ସନ�ଦେଶ ପ�ରାକଦର�ଶନ ୱିଣ�ଡୋ ଦର�ଶାନ�ତ�"
-
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "ସ�ଦୂର ସର�ଭରଗ�ଡ଼ିକରେ ଥିବା ଫୋଲଡରଗ�ଡ଼ିକ� କିଣନ�ତ� ଅଥବା କିଣନ�ତ� ନାହି�"
-
-#: ../ui/evolution-mail-global.xml.h:20
-msgid "_Classic View"
-msgstr "ଚିରପ�ରତିଷ�ଠିତ ଦୃଶ�ଯ (_C)"
-
-#: ../ui/evolution-mail-global.xml.h:21
-msgid "_Copy Folder To..."
-msgstr "ଫୋଲଡର କ� ନକଲ କରନ�ତ� (_C)..."
-
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Download Messages for Offline Usage"
-msgstr "ଅଫଲାଇନ ବ�ୟବହାର ବିଧି ପାଇ� ଆହରଣ କରନ�ତ� (_D)"
-
-#: ../ui/evolution-mail-global.xml.h:25
-msgid "_Message Filters"
-msgstr "ସନ�ଦେଶ ଫିଲ�ଟରଗ�ଡିକ (_M)"
-
-#: ../ui/evolution-mail-global.xml.h:26
-msgid "_Move Folder To..."
-msgstr "ଫୋଲଡରକ� ଘ�ଞ�ଚାନ�ତ� (_M)..."
-
-#: ../ui/evolution-mail-global.xml.h:27
-msgid "_New..."
-msgstr "ନୂତନ (_N)..."
-
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Preview"
-msgstr "ପ�ରାକ� ଦର�ଶନ (_P)"
-
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions..."
-msgstr "କ�ରୟ (_S)..."
-
-#: ../ui/evolution-mail-global.xml.h:33
-msgid "_Vertical View"
-msgstr "ଲମ�ବରୂପ ଦୃଶ�ଯ (_V)"
-
-#: ../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 "ସମସ�ତ ଥ�ରେଡ଼ଗ�ଡ଼ିକ� ଭାଙ�ଗନ�ତ� (_T)"
-
-#: ../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 "ସମସ�ତ ସୂତ�ରକ� କାଟନ�ତ� (_x)"
-
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "E_xpunge"
-msgstr "କାଟନ�ତ� (_x)"
-
-#: ../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 "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଲ�ଚାନ�ତ� (_e)"
-
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Hide _Deleted Messages"
-msgstr "ବିଲୋପ ହୋଇଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ� ଲ�ଚାନ�ତ� (_D)"
-
-#: ../ui/evolution-mail-list.xml.h:14
-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"
-msgstr "ଅପସାରିତ ସନ�ଦେଶଗ�ଡ଼ିକ ମଧ�ଯରେ ଗାର ପକାଇ ଦର�ଶାଇବା ବଦଳରେ ସେମାନଙ�କ� ଲ�ଚାନ�ତ�"
-
-#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k All Messages as Read"
-msgstr "ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପଢ଼ାହୋଇଥିବା ପରି ଚିହ�ନଟ କରନ�ତ� (_k)"
-
-#: ../ui/evolution-mail-list.xml.h:17
-msgid "Mark all messages in the folder as read"
-msgstr "ସନ�ଦେଶ ମାନଙ�କ� ପଢିସାରିଲେ ବୋଲି ଚିହ�ନିତ କରନ�ତ�"
-
-#: ../ui/evolution-mail-list.xml.h:18
-msgid "Paste message(s) from the clipboard"
-msgstr "କ�ଲିପବୋର�ଡର� ସନ�ଦେଶଗ�ଡ଼ିକ� ଲଗାନ�ତ�"
-
-#: ../ui/evolution-mail-list.xml.h:19
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "�ହି ଫୋଲଡରର� ସମସ�ତ ଅପସାରିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ସବ�ଦିନ ପାଇ� କାଢ଼ିଦିଅନ�ତ�"
-
-#: ../ui/evolution-mail-list.xml.h:20
-msgid "Permanently remove this folder"
-msgstr "�ହି ଫୋଲଡରକ� ସବ�ଦିନ ପାଇ� କାଢ଼ିଦିଅନ�ତ�"
-
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Refresh the folder"
-msgstr "ଫୋଲଡରକ� ସତେଜନ କରନ�ତ�"
-
-#: ../ui/evolution-mail-list.xml.h:23
-msgid "Select Message S_ubthread"
-msgstr "ସନ�ଦେଶ ଉପ ଥ�ରେଡ଼କ� ବାଛନ�ତ� (_u)"
-
-#: ../ui/evolution-mail-list.xml.h:24
-msgid "Select Message _Thread"
-msgstr "ସନ�ଦେଶ ସ�ତାକ� ମନୋନୀତ କରନ�ତ� (_T)"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Select _All Messages"
-msgstr "ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ମନୋନୀତ କରନ�ତ� (_A)"
-
-#: ../ui/evolution-mail-list.xml.h:26
-msgid "Select all and only the messages that are not currently selected"
-msgstr "ସମସ�ତ �ବଂ କେବଳ ବର�ତ�ତମାନ ବଛାହୋଇନଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ� ବାଛନ�ତ�"
-
-#: ../ui/evolution-mail-list.xml.h:27
-msgid "Select all messages in the same thread as the selected message"
-msgstr "�କା ଥ�ରେଡ଼ରେ ଥିବା ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ବଚ�ଛିତ ସନ�ଦେଶ ପରି ଚୟନ କରନ�ତ�"
-
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "Select all replies to the currently selected message"
-msgstr "ବର�ତ�ତମାନ ବଛାହୋଇଥିବା ସନ�ଦେଶରେ ସମସ�ତଙ�କ� ଉତ�ତର ଦିଅନ�ତ� ବିକଳ�ପକ� ଚୟନ କରନ�ତ�"
-
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "Select all visible messages"
-msgstr "ସମସ�ତ ଦୃଶ�ୟମାନ ମନୋନୀତ କରନ�ତ�"
-
-#: ../ui/evolution-mail-list.xml.h:30
-msgid "Show Hidde_n Messages"
-msgstr "ଲ�କ�କାଇତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଦର�ଶାନ�ତ� (_n)"
-
-#: ../ui/evolution-mail-list.xml.h:31
-msgid "Show messages that have been temporarily hidden"
-msgstr "ଅସ�ଥାୟୀ ଭାବରେ ଲ�ଚାହୋଇଥିବା ସନ�ଦେଶଗ�ଡ଼ିକ� ଦର�ଶାନ�ତ�"
-
-#: ../ui/evolution-mail-list.xml.h:32
-msgid "Temporarily hide all messages that have already been read"
-msgstr "ସମସ�ତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅସ�ଥାୟୀ ଭାବରେ ଲ�ଚାନ�ତ� ଯାହାକ� ପୂର�ବର� ପଢ଼ାସରିଛି"
-
-#: ../ui/evolution-mail-list.xml.h:33
-msgid "Temporarily hide the selected messages"
-msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅସ�ଥାୟୀ ଭାବରେ ଲ�ଚାନ�ତ�"
-
-#: ../ui/evolution-mail-list.xml.h:34
-msgid "Threaded Message list"
-msgstr "ସୂତ�ର ସନ�ଦେଶ ତାଲିକା"
-
-#: ../ui/evolution-mail-list.xml.h:36
-msgid "_Group By Threads"
-msgstr "ସୂତ�ର ଦ�ବାରା ସମୂହ (_G)"
-
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
-msgid "_Message"
-msgstr "ସନ�ଦେଶ (_M)"
-
-#: ../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 "ଛାଣକଗ�ଡ଼ିକ� ପ�ରୟୋଗ କରନ�ତ� (_p)"
-
-#. 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 "ସମସ�ତ ସନ�ଦେଶ ଶୀର�ଷକଗ�ଡିକ (_H)"
-
-#: ../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 "Junk ପାଇ� ଯାଞ�ଚ କରନ�ତ� (_J)"
-
-#: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message"
-msgstr "ନୂତନ ସନ�ଦେଶ ଲେଖନ�ତ� (_N)"
-
-#: ../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 "ନିୟମ ସୃଷ�ଟି କରନ�ତ� (_u)"
-
-#: ../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 "ପରି ଅଗ�ରସର ହୋଇଛି (_o)..."
-
-#: ../ui/evolution-mail-message.xml.h:34
-msgid "Filter on Mailing _List..."
-msgstr "ମେଲିଙ�ଗ ତାଲିକାରେ ଛାଣନ�ତ� (_L)..."
-
-#: ../ui/evolution-mail-message.xml.h:35
-msgid "Filter on Se_nder..."
-msgstr "ପ�ରେରକ ଅନ�ସାରେ ଛାଣନ�ତ� (_n)..."
-
-#: ../ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Recipients..."
-msgstr "ଗ�ରହଣ କର�ତ�ତା ପାଖରେ ଛାଣନ�ତ� (_R)..."
-
-#: ../ui/evolution-mail-message.xml.h:37
-msgid "Filter on _Subject..."
-msgstr "ବିଷୟ ଅନ�ସାରେ ଛାଣନ�ତ� (_S)..."
-
-#: ../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 "ଅନ�ସରଣ କରନ�ତ� (_U)..."
-
-#: ../ui/evolution-mail-message.xml.h:41
-msgid "Force images in HTML mail to be loaded"
-msgstr "HTML ମେଲରେ ଥିବା ପ�ରତିଛବିଗ�ଡ଼ିକ� ଧାରଣ ହେବା ପାଇ� ବାଧ�ଯକରନ�ତ�"
-
-#: ../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 "ପରି ଚିହ�ନଟ କରନ�ତ� (_k)"
-
-#: ../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 "ପରବର�ତ�ତୀ ଗ�ର�ତ�ବପୂର�ଣ�ଣ ସନ�ଦେଶ (_I)"
-
-#: ../ui/evolution-mail-message.xml.h:60
-msgid "Next _Thread"
-msgstr "ପରବର�ତ�ତୀ ସ�ତା (_T)"
-
-#: ../ui/evolution-mail-message.xml.h:61
-msgid "Next _Unread Message"
-msgstr "ପରବର�ତ�ତୀ ପଢ଼ାହୋଇନଥିବା ସନ�ଦେଶ (_U)"
-
-#: ../ui/evolution-mail-message.xml.h:62
-msgid "Not Junk"
-msgstr "Junk ନ�ହ�"
-
-#: ../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 "ପୂର�ବର ପଢ଼ାହୋଇନଥିବା ସନ�ଦେଶ (_r)"
-
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Paste messages from the clipboard"
-msgstr "କ�ଲିପବୋର�ଡର� ସନ�ଦେଶ ଲଗାନ�ତ�"
-
-#: ../ui/evolution-mail-message.xml.h:68
-msgid "Pr_evious Important Message"
-msgstr "ପୂର�ବତନ ଗ�ର�ତ�ବପୂର�ଣ�ଣ ସନ�ଦେଶ (_e)"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Preview the message to be printed"
-msgstr "ମ�ଦ�ରଣ କରିବାକ� ଥିବା ସନ�ଦେଶକ� ପ�ରାକଦର�ଶନ କରନ�ତ�"
-
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Print this message"
-msgstr "�ହି ସନ�ଦେଶକ� ମ�ଦ�ରଣ କରନ�ତ�"
-
-#: ../ui/evolution-mail-message.xml.h:74
-msgid "Re_direct"
-msgstr "ପ�ଣି ପଠାନ�ତ� (_d)"
-
-#: ../ui/evolution-mail-message.xml.h:75
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "ଚୟିତ ସନ�ଦେଶକ� କେହି ଜଣକ ପାଖକ� ପ�ଣି ପଠାନ�ତ�"
-
-#: ../ui/evolution-mail-message.xml.h:80
-msgid "Reset the text to its original size"
-msgstr "ପାଠ�ଯକ� ତାହାର ପ�ରକୃତ ଆକାରକ� ପ�ନଃସ�ଥାପନ କରନ�ତ�"
-
-#: ../ui/evolution-mail-message.xml.h:81
-msgid "Save the selected messages as a text file"
-msgstr "ଚୟିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ପାଠ�ଯ ଫାଇଲ ଭାବରେ ସଂରକ�ଷଣ କରନ�ତ�"
-
-#: ../ui/evolution-mail-message.xml.h:82
-msgid "Search Folder from Mailing _List..."
-msgstr "ମେଲିଙ�ଗ ତାଲିକାର� ଫୋଲଡର ଖୋଜନ�ତ� (_L)..."
-
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Search Folder from Recipien_ts..."
-msgstr "ଗ�ରାହକଙ�କ ପାଖର� ଫୋଲଡର ଖୋଜନ�ତ� (_t)..."
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Search Folder from S_ubject..."
-msgstr "ବିଷୟର� ଫୋଲଡର ଖୋଜନ�ତ� (_u)..."
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Search Folder from Sen_der..."
-msgstr "ପ�ରେରକ ପାଖର� ଫୋଲଡ଼ରକ� ସନ�ଧାନ କରନ�ତ� (_d)..."
-
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Search for text in the body of the displayed message"
-msgstr "ପ�ରଦର�ଶିତ ସନ�ଦେଶର ଶରୀରରେ ପାଠ�ୟ ଖୋଜନ�ତ�"
-
-#: ../ui/evolution-mail-message.xml.h:87
-msgid "Select _All Text"
-msgstr "ସମସ�ତ ପାଠ�ୟକ� ମନୋନୀତ କରନ�ତ� (_A)"
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Select all the text in a message"
-msgstr "ସନ�ଦେଶରେ ସମସ�ତ ପାଠ�ଯକ� ମନୋନୀତ କରନ�ତ�"
-
-#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
-msgid "Set up the page settings for your current printer"
-msgstr "ଆପଣଙ�କର ପ�ରଚଳିତ ମ�ଦ�ରଣୀ ପାଇ� ପୃଷ�ଠା ସଂରଚନାକ� ବିନ�ୟାସ କରନ�ତ�"
-
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "ଦର�ଶାଯାଇଥିବା ସନ�ଦେଶଗ�ଡ଼ିକର ଶରୀରରେ ଦପଦପ ହେଉଥିବା ସୂଚକକ� ଦର�ଶାନ�ତ�"
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "Show messages with all email headers"
-msgstr "ସମସ�ତ ଇମେଲ ଶୀର�ଷକଗ�ଡ଼ିକ ସହିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଦର�ଶାନ�ତ�"
-
-#: ../ui/evolution-mail-message.xml.h:92
-msgid "Show the raw email source of the message"
-msgstr "ସନ�ଦେଶର ଅସମ�ପୂର�ଣ�ଣ ଇମେଲ ଉତ�ସକ� ଦର�ଶାନ�ତ�"
-
-#: ../ui/evolution-mail-message.xml.h:93
-msgid "Undelete the selected messages"
-msgstr "ଚୟିତ ସନ�ଦେଶଗ�ଡ଼ିକ� ଅପସାରଣ କରନ�ତ� ନାହି�"
-
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Uni_mportant"
-msgstr "ଅଦରକାରୀ (_m)"
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Zoom _Out"
-msgstr "ସାନ କରନ�ତ� (_O)"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "_Attached"
-msgstr "ସଂଲଗ�ନ (_A)"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "_Caret Mode"
-msgstr "କ�ଯାରେଟ ଧାରା (_C)"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "_Clear Flag"
-msgstr "ବିଶେଷ ସୂଚକକ� ସଫା କରନ�ତ� (_C)"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Delete Message"
-msgstr "ସନ�ଦେଶ ବିଲୋପ କରନ�ତ� (_D)"
-
-#: ../ui/evolution-mail-message.xml.h:103
-msgid "_Find in Message..."
-msgstr "ସନ�ଦେଶ ମଧ�ଯରେ ଖୋଜନ�ତ� (_F)..."
-
-#: ../ui/evolution-mail-message.xml.h:104
-msgid "_Flag Completed"
-msgstr "ବିଶେଷ ସୂଚକ ସମ�ପୂର�ଣ�ଣ ହୋଇଛି (_F)"
-
-#: ../ui/evolution-mail-message.xml.h:106
-msgid "_Go To"
-msgstr "�ଠାକ� ଯାଆନ�ତ� (_G)"
-
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Important"
-msgstr "ଗ�ର�ତ�ବପୂର�ଣ�ଣ (_I)"
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Inline"
-msgstr "ଇନଲାଇନ (_I)"
-
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Junk"
-msgstr "Junk (_J)"
-
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Load Images"
-msgstr "ପ�ରତିଛବି ଧାରଣ କରନ�ତ� (_L)"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Message Source"
-msgstr "ସନ�ଦେଶ ଉତ�ସ (_M)"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Next Message"
-msgstr "ପରବର�ତ�ତୀ ସନ�ଦେଶ (_N)"
-
-#: ../ui/evolution-mail-message.xml.h:115
-msgid "_Normal Size"
-msgstr "ସାଧାରଣ ଆକାର (_N)"
-
-#: ../ui/evolution-mail-message.xml.h:116
-msgid "_Not Junk"
-msgstr "Junk ନ�ହ� (_N)"
-
-#: ../ui/evolution-mail-message.xml.h:117
-msgid "_Open in New Window"
-msgstr "ନୂତନ ୱିଣ�ଡୋରେ ଖୋଲନ�ତ� (_O)"
-
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Previous Message"
-msgstr "ପୂର�ବବର�ତ�ତୀ ସନ�ଦେଶ (_P)"
-
-#: ../ui/evolution-mail-message.xml.h:120
-msgid "_Quoted"
-msgstr "ଉଦ�ଧୃତ (_Q)"
-
-#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Read"
-msgstr "ପଢନ�ତ� (_R)"
-
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Save Message..."
-msgstr "ସନ�ଦେଶ ସଂରକ�ଷଣ କରନ�ତ� (_S)..."
-
-#: ../ui/evolution-mail-message.xml.h:125
-msgid "_Undelete Message"
-msgstr "ଅପସାରଣ କରାଯାଇନଥିବା ସନ�ଦେଶ (_U)"
-
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Unread"
-msgstr "ପଢ଼ାହୋଇନଥିବା (_U)"
-
-#: ../ui/evolution-mail-message.xml.h:127
-msgid "_Zoom"
-msgstr "_ଆକାରବୃଦ�ଧିକରଣ"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Zoom In"
-msgstr "ବଡ଼ କରନ�ତ� (_Z)"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "ବନ�ଦ କରନ�ତ�"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
-msgid "Main toolbar"
-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 "ସ�ମାରକପତ�ର ଖୋଲନ�ତ� (_O)"
-
-#: ../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 "ସମ�ପୂର�ଣ�ଣ ହୋଇଛି ବୋଲି ଚିହ�ନଟ କରନ�ତ� (_k)"
-
-#: ../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 "କାର�ଯ�ଯକ� ପୂର�ବାବଲୋକନ କରନ�ତ� (_P)"
-
-#: ../ui/evolution-tasks.xml.h:20
-msgid "View the selected task"
-msgstr "ଚୟିତ କାର�ଯ�ଯକ� ପ�ରଦର�ଶନ କରନ�ତ�"
-
-#: ../ui/evolution-tasks.xml.h:27
-msgid "_Open Task"
-msgstr "କାର�ଯ�ଯକ� ଖୋଲନ�ତ� (_O)"
-
-#: ../ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Evolution ବିଷୟରେ ..."
-
-#: ../ui/evolution.xml.h:2
-msgid "Change Evolution's settings"
-msgstr "Evolutionର ବିନ�ଯାସକ� ପରିବର�ତ�ତନ କରନ�ତ�"
-
-#: ../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 "Evolution _FAQ"
-msgstr "Evolution FAQ (_F)"
-
-#: ../ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "ପ�ରୋଗ�ରାମକ� ବନ�ଦ କରନ�ତ�"
-
-#: ../ui/evolution.xml.h:12
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "ମନେରଖାଯାଇଥିବା ପ�ରବେଶ ସଂକେତଗ�ଡ଼ିକ� ଭ�ଲିଯାଆନ�ତ� ଯାହାଫଳରେ ଆପଣଙ�କ� ପ�ଣିଥରେ ସେମାନଙ�କ ପାଇ� ପଚରାଯିବ"
-
-#: ../ui/evolution.xml.h:13
-msgid "Hide window buttons"
-msgstr "ୱିଣ�ଡୋ ବଟନ ମାନଙ�କ� ଲ�ଚାଇ ରଖନ�ତ�"
-
-#: ../ui/evolution.xml.h:14
-msgid "I_mport..."
-msgstr "ଆୟତ କରନ�ତ� (_I) ..."
-
-#: ../ui/evolution.xml.h:15
-msgid "Icons _and Text"
-msgstr "ଚିତ�ରସଙ�କେତ �ବଂ ପାଠ�ଯ (_a)"
-
-#: ../ui/evolution.xml.h:16
-msgid "Import data from other programs"
-msgstr "ଅନ�ଯାନ�ଯ ପ�ରୋଗ�ରାମ ମାନଙ�କ ମଧ�ଯର� ତଥ�ଯ ଆୟତ କରନ�ତ�"
-
-#: ../ui/evolution.xml.h:17
-msgid "Lay_out"
-msgstr "ବିନ�ଯାସ (_o)"
-
-#: ../ui/evolution.xml.h:19
-msgid "New _Window"
-msgstr "ନୂତନ ୱିଣ�ଡୋ (_W)"
-
-#: ../ui/evolution.xml.h:20
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "ବାରମ�ବାର ପଚରାଯାଉଥିବା ପ�ରଶ�ନ ୱେବ ପୃଷ�ଠାକ� ଖୋଲନ�ତ�"
-
-#: ../ui/evolution.xml.h:21
-msgid "Page Set_up..."
-msgstr "ପୃଷ�ଠା ବିନ�ୟାସ (_u)..."
-
-#: ../ui/evolution.xml.h:22
-msgid "Prefere_nces"
-msgstr "ପସନ�ଦ (_n)"
-
-#: ../ui/evolution.xml.h:23
-msgid "Send / Receive"
-msgstr "ପ�ରେରଣ କରନ�ତ� / ଗ�ରହଣ କରନ�ତ�"
-
-#: ../ui/evolution.xml.h:24
-msgid "Send / _Receive"
-msgstr "ପ�ରେରଣ କରନ�ତ� / ଗ�ରହଣ କରନ�ତ� (_R)"
-
-#: ../ui/evolution.xml.h:25
-msgid "Send queued items and retrieve new items"
-msgstr "ଧାଡ଼ିରେ ଥିବା ବସ�ତ�ଗ�ଡ଼ିକ� ପଠାନ�ତ� �ବଂ ନୂତନ ବସ�ତ�ଗ�ଡ଼ିକ� କାଢ଼ନ�ତ�"
-
-#: ../ui/evolution.xml.h:26
-msgid "Set up Pilot configuration"
-msgstr "ପଥପ�ରଦର�ଶକ ବିନ�ଯାସକ� ବ�ଯବସ�ଥାପିତ କରନ�ତ�"
-
-#: ../ui/evolution.xml.h:28
-msgid "Show Side _Bar"
-msgstr "ପାର�ଶ�ବ ପଟିକ� ପ�ରଦର�ଶନ କରନ�ତ� (_B)"
-
-#: ../ui/evolution.xml.h:29
-msgid "Show _Status Bar"
-msgstr "ଅବସ�ଥିତି ପଟିକ� ପ�ରଦର�ଶନ କରନ�ତ� (_S)"
-
-#: ../ui/evolution.xml.h:30
-msgid "Show _Toolbar"
-msgstr "ସାଧନ ପଟିକ� ପ�ରଦର�ଶନ କରନ�ତ� (_T)"
-
-#: ../ui/evolution.xml.h:31
-msgid "Show information about Evolution"
-msgstr "Evolution ବିଷୟରେ ସୂଚନା ପ�ରଦର�ଶନ କରନ�ତ�"
-
-#: ../ui/evolution.xml.h:32
-msgid "Submit Bug Report"
-msgstr "ତୃଟି ବିବରଣୀ ଦାଖଲ କରନ�ତ�"
-
-#: ../ui/evolution.xml.h:33
-msgid "Submit _Bug Report"
-msgstr "ତୃଟି ବିବରଣୀ ଦାଖଲ କରନ�ତ� (_B)"
-
-#: ../ui/evolution.xml.h:34
-msgid "Submit a bug report using Bug Buddy"
-msgstr "ବଗ-ବଡି ବ�ଯବହାର କରି ଗୋଟି� ତୃଟି ବିବରଣୀ ଦାଖଲ କରନ�ତ�"
-
-#: ../ui/evolution.xml.h:35
-msgid "Toggle whether we are working offline."
-msgstr "ଆମେ ଅଫ ଲାଇନରେ କାମ କର�ଅଛ� କି ନାହି� ସେଥିପାଇ� �ପଟ ସେପଟ ହ�ଅନ�ତ�।"
-
-#: ../ui/evolution.xml.h:36
-msgid "Tool_bar Style"
-msgstr "ସାଧନ ପଟି ଶୈଳୀ (_b)"
-
-#: ../ui/evolution.xml.h:37
-msgid "View/Hide the Side Bar"
-msgstr "ପାର�ଶ�ବ ପଟିକ� ପ�ରଦର�ଶନ କରନ�ତ�/ଲ�କ�କାୟିତ କରନ�ତ�"
-
-#: ../ui/evolution.xml.h:38
-msgid "View/Hide the Status Bar"
-msgstr "ସାଧନ ପଟିକ� ପ�ରଦର�ଶନ କରନ�ତ�/ଲ�କ�କାୟିତ କରନ�ତ�"
-
-#: ../ui/evolution.xml.h:39
-msgid "Work _Offline"
-msgstr "ଅଫଲାଇନରେ କାର�ଯ�ୟକରନ�ତ� (_O)"
-
-#: ../ui/evolution.xml.h:40
-msgid "_About"
-msgstr "ବିବରଣୀ (_A)"
-
-#: ../ui/evolution.xml.h:41
-msgid "_Close Window"
-msgstr "ୱିଣ�ଡୋ ବନ�ଦ କରନ�ତ� (_C)"
-
-#: ../ui/evolution.xml.h:44
-msgid "_Forget Passwords"
-msgstr "ପ�ରବେଶ ସଂକେତ ଭ�ଲିଯାଇଛନ�ତି (_F)"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Frequently Asked Questions"
-msgstr "ବାରମ�ବାର ପଚରାଯାଉଥିବା ପ�ରଶ�ନ (_F)"
-
-#: ../ui/evolution.xml.h:47
-msgid "_Hide Buttons"
-msgstr "ବଟନ ମାନଙ�କ� ଲ�ଚାଇ ରଖନ�ତ� (_H)"
-
-#: ../ui/evolution.xml.h:48
-msgid "_Icons Only"
-msgstr "କେବଳ ଚିତ�ରସଙ�କେତ (_I)"
-
-#: ../ui/evolution.xml.h:50
-msgid "_Quick Reference"
-msgstr "ତୀବ�ର ସନ�ଦର�ଭ (_Q)"
-
-#: ../ui/evolution.xml.h:51
-msgid "_Quit"
-msgstr "ବିଦାୟ ନିଅନ�ତ� (_Q)"
-
-#: ../ui/evolution.xml.h:52
-msgid "_Switcher Appearance"
-msgstr "ପରିବର�ତ�ତନକାରୀର ଦୃଶ�ୟ (_S)"
-
-#: ../ui/evolution.xml.h:53
-msgid "_Synchronization Options..."
-msgstr "ସମକାଳିତ ବିକଲ�ପ (_S) ..."
-
-#: ../ui/evolution.xml.h:54
-msgid "_Text Only"
-msgstr "କେବଳ ପାଠ�ୟ (_T)"
-
-#: ../ui/evolution.xml.h:56
-msgid "_Window"
-msgstr "ଓ�ବିଣ�ଡୋ (_W)"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "କମ�ପାନୀ ଅନ�ଯାୟୀ (_C)"
@@ -21261,30 +21557,28 @@ msgstr "ଅବସ�ଥିତି ସହିତ (_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:426
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:777
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>ସମୟ ମଣ�ଡଳ</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-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.ui.h:2
 msgid "Select a Time Zone"
 msgstr "ଗୋଟି� ସମୟ ମଣ�ଡଳକ� ଚୟନ କରନ�ତ�"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+#, fuzzy
+#| msgid "Time _Zone"
+msgid "Time Zones"
+msgstr "ସମୟ ମଣ�ଡଳ (_Z)"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid "Timezone drop-down combination box"
 msgstr "ସମୟ ମଣ�ଡଳ ଡ�ରପ-ଡାଉନ ଯ�ଗଳ ବାକ�ସ"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -21294,160 +21588,67 @@ msgstr ""
 "ବାଛନ�ତ�।\n"
 "ଛୋଟ କରିବା ପାଇ� ଡାହାଣ ମାଉସ ବଟନକ� ବ�ୟବହାର କରନ�ତ�।"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "ସଂଗ�ରହ"
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+#, fuzzy
+#| msgid "Selection Mode"
+msgid "_Selection"
+msgstr "ଚୟନ ଧାରା"
 
-#: ../widgets/menus/gal-define-views-dialog.c:356
-#: ../widgets/menus/gal-define-views.glade.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:339
+#: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%s ପାଇ� ପ�ରଦର�ଶନ ମାନଙ�କ� ବ�ଯାଖ�ଯା କରନ�ତ�"
 
-#: ../widgets/menus/gal-define-views-dialog.c:364
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-define-views-dialog.c:349
 msgid "Define Views"
 msgstr "ପ�ରଦର�ଶନ ଗ�ଡିକ� ବ�ଯାଖ�ଯା କରନ�ତ�"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
+#: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "\"%s\" ପାଇ� ପ�ରଦର�ଶନ ଗ�ଡିକ� ବ�ଯାଖ�ଯା କରନ�ତ�"
 
-#: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/menus/gal-view-factory-etable.c:113
 msgid "Table"
 msgstr "ସାରଣୀ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
-msgid "Instance"
-msgstr "ଉଦାହରଣ"
-
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "ବର�ତ�ତମାନ ପ�ରଦର�ଶନକ� ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 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.ui.h:3
 msgid "_Replace existing view"
 msgstr "ଅବସ�ଥିତ ପ�ରଦର�ଶନକ� ବଦଳାନ�ତ� (_R)"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
-msgid "Custom View"
-msgstr "ଇଚ�ଛାରୂପଣ ପ�ରଦର�ଶନ"
-
-#: ../widgets/menus/gal-view-instance.c:582
-msgid "Save Custom View"
-msgstr "ଇଚ�ଛାରୂପଣ ପ�ରଦର�ଶନକ� ସଂରକ�ଷଣ କରନ�ତ�"
-
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
-msgid "Define Views..."
-msgstr "ପ�ରଦର�ଶନ ମାନଙ�କ� ବ�ଯାଖ�ଯା କରନ�ତ�..."
-
-#: ../widgets/menus/gal-view-menus.c:304
-msgid "C_urrent View"
-msgstr "ବର�ତ�ତମାନ ପ�ରଦର�ଶନ (_u)"
-
-#: ../widgets/menus/gal-view-menus.c:328
-#, c-format
-msgid "Select View: %s"
-msgstr "ଦ�ର�ଶ�ଯ ବାଛନ�ତ�: %s"
-
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Current view is a customized view"
-msgstr "ପ�ରଚଳିତ ଦୃଶ�ୟଟି ଗୋଟି� ଇଚ�ଛାମ�ତାବକ ଦୃଶ�ୟ ଅଟେ"
-
-#: ../widgets/menus/gal-view-menus.c:377
-msgid "Save Custom View..."
-msgstr "ଇଚ�ଛାରୂପଣ ପ�ରଦର�ଶନକ� ସଂରକ�ଷଣ କରନ�ତ�..."
-
-#: ../widgets/menus/gal-view-menus.c:382
-msgid "Save current custom view"
-msgstr "ବର�ତ�ତମାନ ପ�ରଦର�ଶନକ� ସଂରକ�ଷଣ କରନ�ତ�"
-
-#: ../widgets/menus/gal-view-menus.c:396
-msgid "Create or edit views"
-msgstr "ଦୃଶ�ୟଗ�ଡ଼ିକ� ସୃଷ�ଟିକରନ�ତ� କିମ�ବା ସମ�ପାଦନ କରନ�ତ�"
-
-#: ../widgets/menus/gal-view-new-dialog.c:68
-msgid "Factory"
-msgstr "କାରଖାନା"
-
-#: ../widgets/menus/gal-view-new-dialog.c:103
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "ନୂତନ ପ�ରଦର�ଶନକ� ବ�ଯାଖ�ଯା କରନ�ତ�"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "ନୂତନ ପ�ରଦର�ଶନର ନାମ: "
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
 msgstr "ପ�ରଦର�ଶନ କରିବାର ପ�ରକାର:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "ପ�ରଦର�ଶନ କରିବାର ପ�ରକାର:"
 
-#: ../widgets/misc/e-attachment.c:940
-msgid "Attached message"
-msgstr "ସଂଲଗ�ନିତ ସନ�ଦେଶ"
-
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1723 ../widgets/misc/e-attachment.c:2274
-#: ../widgets/misc/e-attachment-store.c:636
-msgid "attachment.dat"
-msgstr "attachment.dat"
-
-#: ../widgets/misc/e-attachment.c:1770 ../widgets/misc/e-attachment.c:2576
-msgid "A load operation is already in progress"
-msgstr "ଗୋଟି� ଧାରଣ ପ�ରୟୋଗ ପୂର�ବର� ଅଗ�ରସର ହେଉଛି"
-
-#: ../widgets/misc/e-attachment.c:1778 ../widgets/misc/e-attachment.c:2584
-msgid "A save operation is already in progress"
-msgstr ""
-
-#: ../widgets/misc/e-attachment.c:1871
-#, c-format
-msgid "Could not load '%s'"
-msgstr "'%s' କ� ଧାରଣ କରିପାରିଲା ନାହି�"
-
-#: ../widgets/misc/e-attachment.c:1874
-#, c-format
-msgid "Could not load the attachment"
-msgstr "ସଂଲଗ�ନକକ� ଧାରଣ କରିପାରିଲା ନାହି�"
-
-#: ../widgets/misc/e-attachment.c:2151
-#, c-format
-msgid "Could not open '%s'"
-msgstr "'%s' କ� ଖୋଲିପାରିଲା ନାହି�"
-
-#: ../widgets/misc/e-attachment.c:2154
-#, c-format
-msgid "Could not open the attachment"
-msgstr "ସଂଲଗ�ନକକ� ଖୋଲିପାରିଲା ନାହି�"
-
-#: ../widgets/misc/e-attachment.c:2592
-msgid "Attachment contents not loaded"
-msgstr "ସଂଲଗ�ନକ ବିଷୟବସ�ତ�ଗ�ଡ଼ିକ� ଧାରଣ କରାଯାଇନାହି�"
-
-#: ../widgets/misc/e-attachment.c:2669
-#, c-format
-msgid "Could not save '%s'"
-msgstr "'%s' କ� ସଂରକ�ଷଣ କରିପାରିଲା ନାହି�"
+#: ../widgets/misc/e-account-manager.c:348
+msgid "De_fault"
+msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ (_f)"
 
-#: ../widgets/misc/e-attachment.c:2672
-#, c-format
-msgid "Could not save the attachment"
-msgstr "ସଂଲଗ�ନକକ� ସଂରକ�ଷଣ କରିପାରିଲା ନାହି�"
+#: ../widgets/misc/e-account-tree-view.c:255
+msgid "Protocol"
+msgstr "ପ�ରୋଟୋକଲ"
 
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
@@ -21461,339 +21662,338 @@ msgstr "ଫାଇଲ ନାମ (_F):"
 msgid "MIME Type:"
 msgstr "MIME ପ�ରକାର:"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "_Suggest automatic display of attachment"
+msgstr "ସଂଲଗ�ନକର ସ�ବତଃ ପ�ରଦର�ଶନକ� ପରାମର�ଶ କରନ�ତ� (_S)"
+
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "ପୃଷ�ଠଭୂମି ଭାବରେ ବିନ�ଯାସ କରିପାରିଲା ନାହି�"
 
+#: ../widgets/misc/e-attachment-handler-image.c:149
+msgid "Set as _Background"
+msgstr "ପ�ର�ଷ�ଠଭୂମି ଭାବରେ ବିନ�ଯାସ କରନ�ତ� (_B)"
+
 #: ../widgets/misc/e-attachment-handler-sendto.c:87
-#| msgid "Could not open the attachment"
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "ସଂଲଗ�ନକକ� ଖୋଲିପାରିଲା ନାହି�"
 msgstr[1] "ସଂଲଗ�ନକକ� ଖୋଲିପାରିଲା ନାହି�"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:129
-#| msgid "Send To:"
 msgid "_Send To..."
 msgstr "�ଠାକ� ପଠାନ�ତ� (_S)..."
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:131
-#| msgid "Send selected contacts to another person"
 msgid "Send the selected attachments somewhere"
 msgstr "ବଚ�ଛିତ ସଂଲଗ�ନକକ� କୌଣସି ସ�ଥାନକ� ପଠାନ�ତ�"
 
-#: ../widgets/misc/e-attachment-icon-view.c:473
+#: ../widgets/misc/e-attachment-icon-view.c:480
 #: ../widgets/misc/e-attachment-tree-view.c:517
 msgid "Loading"
 msgstr "ଧାରଣ କର�ଅଛି"
 
-#: ../widgets/misc/e-attachment-icon-view.c:485
+#: ../widgets/misc/e-attachment-icon-view.c:492
 #: ../widgets/misc/e-attachment-tree-view.c:529
 msgid "Saving"
 msgstr "ସଂରକ�ଷଣ କର�ଅଛି"
 
-#: ../widgets/misc/e-attachment-paned.c:80
-msgid "Hide _Attachment Bar"
+#: ../widgets/misc/e-attachment-paned.c:87
+#, fuzzy
+#| msgid "Hide _Attachment Bar"
+msgid "Hide Attachment _Bar"
 msgstr "ସଂଲଗ�ନ ପଟିକ� ଲ�ଚାନ�ତ� (_A)"
 
-#: ../widgets/misc/e-attachment-paned.c:82
-#: ../widgets/misc/e-attachment-paned.c:618
-msgid "Show _Attachment Bar"
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:636
+#, fuzzy
+#| msgid "Show _Attachment Bar"
+msgid "Show Attachment _Bar"
 msgstr "ସଂଲଗ�ନ ପଟି ଦେଖାନ�ତ� (_A)"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "ସଂଲଗ�ନକକ� ଯୋଗ କରନ�ତ�"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:541
 msgid "A_ttach"
 msgstr "ସଂଲଗ�ନ କରନ�ତ� (_t)"
 
-#: ../widgets/misc/e-attachment-store.c:607
+#: ../widgets/misc/e-attachment-store.c:604
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "ସଂଲଗ�ନକକ� ସଂରକ�ଷଣ କରନ�ତ�"
-msgstr[1] "ସଂଲଗ�ନକଗ�ଡ଼ିକ� ସଂରକ�ଷଣ କରନ�ତ�"
+msgstr[1] "ସଂଲଗ�ନକକ� ସଂରକ�ଷଣ କରନ�ତ�"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:633
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "ସମସ�ତଙ�କ� ସଂରକ�ଷଣ କରନ�ତ� (_a)"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "ସଂଲଗ�ନକ ଯୋଗ କରନ�ତ� (_d)..."
 
-#: ../widgets/misc/e-attachment-view.c:643
+#: ../widgets/misc/e-attachment-view.c:349
+msgid "_Hide"
+msgstr "ଲ�ଚାନ�ତ� (_H)"
+
+#: ../widgets/misc/e-attachment-view.c:356
+msgid "_View Inline"
+msgstr "ଇନଲାଇନ ଦେଖନ�ତ� (_V)"
+
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
-#| msgid "Opening %s"
 msgid "Open with \"%s\""
 msgstr "\"%s\" ସହିତ ଖୋଲନ�ତ�"
 
-#: ../widgets/misc/e-attachment-view.c:646
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "�ହି ସଂଲଗ�ନକକ� %s ରେ ଖୋଲନ�ତ�"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
-msgid "%B %Y"
-msgstr "%B %Y"
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../widgets/misc/e-attachment.c:994
+msgid "Attached message"
+msgstr "ସଂଲଗ�ନିତ ସନ�ଦେଶ"
 
-#: ../widgets/misc/e-calendar.c:220
-msgid "Month Calendar"
-msgstr "ମାସ ଅନ�ଯାୟୀ କ�ଯାଲେଣ�ଡର"
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
+msgid "A load operation is already in progress"
+msgstr "ଗୋଟି� ଧାରଣ ପ�ରୟୋଗ ପୂର�ବର� ଅଗ�ରସର ହେଉଛି"
 
-#: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3645
-#: ../widgets/text/e-text.c:3646
-msgid "Fill color"
-msgstr "ରଙ�ଗ ପୂରଣକର"
-
-#: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:462
-#: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3652
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3660
-#: ../widgets/text/e-text.c:3661
-msgid "GDK fill color"
-msgstr "GDK ରଙ�ଗ ପୂରଣ"
-
-#: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3667
-#: ../widgets/text/e-text.c:3668
-msgid "Fill stipple"
-msgstr "ବିନ�ଦ�ରୀତିରେ ଭରଣ କରନ�ତ�"
-
-#: ../widgets/misc/e-canvas-background.c:482
-#: ../widgets/misc/e-canvas-background.c:483
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:489
-#: ../widgets/misc/e-canvas-background.c:490
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:496
-#: ../widgets/misc/e-canvas-background.c:497
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:503
-#: ../widgets/misc/e-canvas-background.c:504
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1416
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3070
-msgid "Minimum width"
-msgstr "ସର�ବନିମ�ନ ଓସାର"
-
-#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:1004
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3071
-msgid "Minimum Width"
-msgstr "ସର�ବନିମ�ନ ଓସାର"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "ବ�ଯବଧାନ"
-
-#: ../widgets/misc/e-cell-date-edit.c:300
-msgid "Now"
-msgstr "ବର�ତ�ତମାନ"
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
+msgid "A save operation is already in progress"
+msgstr "ଗୋଟି� ସଂରକ�ଷଣ ପ�ରୟୋଗ ପୂର�ବର� ଚାଲିଅଛି"
 
-#: ../widgets/misc/e-cell-date-edit.c:865
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
-msgid "The time must be in the format: %s"
-msgstr "ସମୟ �ହି ଶୈଳୀରେ ରହିବା ଉଚିତ: %s"
-
-#: ../widgets/misc/e-cell-percent.c:77
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "ପ�ରତିଶତ ମୂଲ�ଯ 0 �ବଂ 100 ମଧ�ଯରେ ହୋଇଥିବା ଉଚିତ, ଅନ�ତର�ନିହିତ"
-
-#: ../widgets/misc/e-charset-picker.c:57
-msgid "Arabic"
-msgstr "ଆରବୀ"
-
-#: ../widgets/misc/e-charset-picker.c:58
-msgid "Baltic"
-msgstr "ବାଲଟିକ"
-
-#: ../widgets/misc/e-charset-picker.c:59
-msgid "Central European"
-msgstr "କେନ�ଦ�ର ୟ�ରୋପୀୟ"
-
-#: ../widgets/misc/e-charset-picker.c:60
-msgid "Chinese"
-msgstr "ଚାଇନୀଜ"
-
-#: ../widgets/misc/e-charset-picker.c:61
-msgid "Cyrillic"
-msgstr "ସିରୀଲିକ"
-
-#: ../widgets/misc/e-charset-picker.c:62
-msgid "Greek"
-msgstr "ଗ�ରୀକ"
-
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Hebrew"
-msgstr "ହିବ�ର�"
-
-#: ../widgets/misc/e-charset-picker.c:64
-msgid "Japanese"
-msgstr "ଜାପାନୀ"
-
-#: ../widgets/misc/e-charset-picker.c:65
-msgid "Korean"
-msgstr "କୋରୀୟାନ "
-
-#: ../widgets/misc/e-charset-picker.c:66
-msgid "Thai"
-msgstr "ଥାଈ"
+msgid "Could not load '%s'"
+msgstr "'%s' କ� ଧାରଣ କରିପାରିଲା ନାହି�"
 
-#: ../widgets/misc/e-charset-picker.c:67
-msgid "Turkish"
-msgstr "ତ�ର�କୀ"
+#: ../widgets/misc/e-attachment.c:1917
+#, c-format
+msgid "Could not load the attachment"
+msgstr "ସଂଲଗ�ନକକ� ଧାରଣ କରିପାରିଲା ନାହି�"
 
-#: ../widgets/misc/e-charset-picker.c:68
-msgid "Unicode"
-msgstr "ୟ�ନିକୋଡ"
+#: ../widgets/misc/e-attachment.c:2193
+#, c-format
+msgid "Could not open '%s'"
+msgstr "'%s' କ� ଖୋଲିପାରିଲା ନାହି�"
 
-#: ../widgets/misc/e-charset-picker.c:69
-msgid "Western European"
-msgstr "ପଶ�ଚିମ ୟ�ରୋପୀୟ"
+#: ../widgets/misc/e-attachment.c:2196
+#, c-format
+msgid "Could not open the attachment"
+msgstr "ସଂଲଗ�ନକକ� ଖୋଲିପାରିଲା ନାହି�"
 
-#: ../widgets/misc/e-charset-picker.c:70
-msgid "Western European, New"
-msgstr "ପଶ�ଚିମ ୟ�ରୋପୀୟ, ନୂତନ"
+#: ../widgets/misc/e-attachment.c:2631
+msgid "Attachment contents not loaded"
+msgstr "ସଂଲଗ�ନକ ବିଷୟବସ�ତ�ଗ�ଡ଼ିକ� ଧାରଣ କରାଯାଇନାହି�"
 
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
-#: ../widgets/misc/e-charset-picker.c:91
-msgid "Traditional"
-msgstr "ପାରମ�ପରିକ"
+#: ../widgets/misc/e-attachment.c:2707
+#, c-format
+msgid "Could not save '%s'"
+msgstr "'%s' କ� ସଂରକ�ଷଣ କରିପାରିଲା ନାହି�"
 
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-msgid "Simplified"
-msgstr "ସରଳିକ�ର�ତ"
+#: ../widgets/misc/e-attachment.c:2710
+#, c-format
+msgid "Could not save the attachment"
+msgstr "ସଂଲଗ�ନକକ� ସଂରକ�ଷଣ କରିପାରିଲା ନାହି�"
 
-#: ../widgets/misc/e-charset-picker.c:98
-msgid "Ukrainian"
-msgstr "ୟ�କ�ରେନିୟାନ"
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
+#: ../widgets/misc/e-buffer-tagger.c:359
+#, fuzzy
+#| msgid "Click to open %s"
+msgid "Ctrl-click to open a link"
+msgstr "%s କ� ଖୋଲିବା ପାଇ� ଦବାନ�ତ�"
 
-#: ../widgets/misc/e-charset-picker.c:101
-msgid "Visual"
-msgstr "ଚାକ�ଷ�ଷ"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1254
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: ../widgets/misc/e-charset-picker.c:170
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "ଅଜଣା ଅକ�ଷରମାଳା:%s"
+#: ../widgets/misc/e-calendar.c:217
+msgid "Month Calendar"
+msgstr "ମାସ ଅନ�ଯାୟୀ କ�ଯାଲେଣ�ଡର"
 
-#: ../widgets/misc/e-charset-picker.c:215
+#: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "ଅକ�ଷର ସାଙ�କେତିକରଣ"
 
-#: ../widgets/misc/e-charset-picker.c:230
+#: ../widgets/misc/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "ବ�ଯବହାର କରାଯିବା ଅକ�ଷରମାଳା ଭରଣ କରନ�ତ�"
 
-#: ../widgets/misc/e-charset-picker.c:337
+#: ../widgets/misc/e-charset-combo-box.c:336
 msgid "Other..."
 msgstr "ଅନ�ଯାନ�ଯ ..."
 
-#: ../widgets/misc/e-charset-picker.c:599
-msgid "Ch_aracter Encoding"
-msgstr "ଅକ�ଷର ସାଙ�କେତିକରଣ (_a)"
-
-#: ../widgets/misc/e-dateedit.c:302
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "ତାରିଖ �ବଂ ସମୟ"
 
-#: ../widgets/misc/e-dateedit.c:323
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "ତାରିଖ ଭରଣ କରିବା ପାଇ� ପାଠ�ଯ ପ�ରବିଷ�ଟି"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "ଗୋଟି� କ�ଯାଲେଣ�ଡର ପ�ରଦର�ଶନ କରିବା ପାଇ� �ହି ବଟନକ� ଦବାନ�ତ�"
 
-#: ../widgets/misc/e-dateedit.c:387
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "ସମୟ ଚୟନ କରିବା ପାଇ� ସମ�ମିଳିତ ବାକ�ସ"
 
-#: ../widgets/misc/e-dateedit.c:463
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "ବର�ତ�ତମାନ (_w)"
 
-#: ../widgets/misc/e-dateedit.c:469
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "ଆଜି (_T)"
 
-#: ../widgets/misc/e-dateedit.c:1634
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:677
+msgid "_None"
+msgstr "କିଛି ନାହି� (_N)"
+
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
+#, fuzzy
+#| msgid "None"
+msgctxt "date"
+msgid "None"
+msgstr "କିଛି ନ�ହେ�"
+
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "ଅବୈଧ ତାରିଖ ସମୟ"
 
-#: ../widgets/misc/e-dateedit.c:1665
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "ଅବୈଧ ସମୟ ମୂଲ�ୟ"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:742
-msgid "Advanced Search"
-msgstr "ଉନ�ନତ ସନ�ଧାନ"
+#: ../widgets/misc/e-import-assistant.c:238
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr "Evolution ମଧ�ଯକ� ଆମଦାନୀ କରିବାକ� ଚାହ��ଥିବା ଫାଇଲକ� ବାଛନ�ତ�, �ବଂ ତାଲିକାର� ଫାଇଲ ପ�ରକାର ବାଛନ�ତ�।"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
-msgid "Save Search"
-msgstr "ସନ�ଧାନ ଫଳାଫଳକ� ସଂରକ�ଷଣ କରନ�ତ�"
+#: ../widgets/misc/e-import-assistant.c:255
+msgid "F_ilename:"
+msgstr "ଫାଇଲ ନାମ (_i):"
 
-#: ../widgets/misc/e-filter-bar.c:268
-msgid "_Searches"
-msgstr "ଅନ�ସନ�ଧାନ (_S)"
+#: ../widgets/misc/e-import-assistant.c:265
+msgid "Select a file"
+msgstr "�କ ଫାଇଲ ମନୋନୀତ କର"
 
-#: ../widgets/misc/e-filter-bar.c:270
-msgid "Searches"
-msgstr "ଅନ�ସନ�ଧାନ"
+#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:455
+msgid "File _type:"
+msgstr "ଫାଇଲ ପ�ରକାର (_t):"
 
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:113
-msgid "_Save Search..."
-msgstr "ସନ�ଧାନ ଫଳାଫଳକ� ସଂରକ�ଷଣ କରନ�ତ� (_S) ..."
+#: ../widgets/misc/e-import-assistant.c:322
+msgid "Choose the destination for this import"
+msgstr "�ହି ଆମଦାନୀ ପାଇ� ଲକ�ଷ�ଯ ସ�ଥଳ ବାଛନ�ତ�"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:114
-msgid "_Edit Saved Searches..."
-msgstr "ସଂରକ�ଷିତ ସନ�ଧାନ ଫଳାଫଳକ� ସମ�ପାଦନ କରନ�ତ� (_E) ..."
+#: ../widgets/misc/e-import-assistant.c:347
+msgid "Choose the type of importer to run:"
+msgstr "ଚଲାଇବା ପାଇ� ଆମଦାନୀ ପ�ରକାରକ� ବାଛନ�ତ�:"
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:115
-msgid "_Advanced Search..."
-msgstr "ଉନ�ନତ ସନ�ଧାନ (_A) ..."
+#: ../widgets/misc/e-import-assistant.c:355
+msgid "Import data and settings from _older programs"
+msgstr "ପ�ର�ଣା ପ�ରଗ�ରାମଗ�ଡ଼ିକର� ତଥ�ୟ �ବଂ ସଂରଚନାଗ�ଡ଼ିକ� ଆମଦାନୀ କରନ�ତ� (_o)"
 
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "All Accounts"
-msgstr "ସମସ�ତ ଖାତା"
+#: ../widgets/misc/e-import-assistant.c:363
+msgid "Import a _single file"
+msgstr "ଗୋଟି� ଫାଇଲ ଆମଦାନୀ କରନ�ତ� (_s)"
 
-#: ../widgets/misc/e-filter-bar.h:107
-msgid "Current Account"
-msgstr "ବର�ତ�ତମାନ ଖାତା"
+#: ../widgets/misc/e-import-assistant.c:439
+msgid "Select what type of file you want to import from the list."
+msgstr ""
 
-#: ../widgets/misc/e-filter-bar.h:108
-msgid "Current Folder"
-msgstr "ବର�ତ�ତମାନ ଫୋଲଡର"
+#: ../widgets/misc/e-import-assistant.c:516
+#, 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"
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"ନିମ�ନଲିଖିତ ପ�ରୟୋଗ: Pine, Netscape, Elm, iCalendar ଆମଦାନୀ\n"
+"କରିବା ପାଇ� ସଂରଚନାକ� Evolution ଯାଞ�ଜ କରିଥିଲା। କୌଣସି ଆମଦାନୀ ଯୋଗ�ୟ\n"
+"ସଂରଚନା ମିଳିଲା ନାହି�। ଯଦି ଆପଣ ପ�ଣିଥରେ ଚେଷ�ଟାକରିବା ପାଇ� ଚାହ��ଛନ�ତି,\n"
+"ତେବେ ଦୟାକରି \"ପଛକ�\" ବଟନକ� କ�ଲିକ କରନ�ତ�।\n"
 
-#: ../widgets/misc/e-image-chooser.c:168
-msgid "Choose Image"
-msgstr "ପ�ରତିଛବି ଚୟନ କରନ�ତ�"
+#: ../widgets/misc/e-import-assistant.c:1187
+#: ../widgets/misc/e-import-assistant.c:1214
+msgid "Evolution Import Assistant"
+msgstr "Evolution ଆମଦାନୀ ସହାୟକ"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-import-assistant.c:1196
+#: ../widgets/misc/e-import-assistant.c:1248
+msgid "Import Location"
+msgstr "ଅବସ�ଥାନ ଆମଦାନୀ କରନ�ତ�"
+
+#: ../widgets/misc/e-import-assistant.c:1207
+#, 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."
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"Evolution ଆମଦାନୀ ସହାୟକରେ ଆପଣଙ�କ� ସ�ୱାଗତ କର�ଅଛ�।\n"
+"�ହି ସହାୟତା ସହିତ ଆପଣ ବାହ�ୟ ଫାଇଲକ� Evolution ମଧ�ଯକ�\n"
+"ଆମଦାନୀ କରିବାର ପଦ�ଧତି ବିଷୟରେ ପଥପ�ରଦର�ଶନ କରାଯିବ।"
+
+#: ../widgets/misc/e-import-assistant.c:1223
+msgid "Importer Type"
+msgstr "ଆମଦାନୀର ପ�ରକାର"
+
+#: ../widgets/misc/e-import-assistant.c:1232
+msgid "Select Information to Import"
+msgstr "ଆମଦାନୀ କରିବା ପାଇ� ସୂଚନା ବାଛନ�ତ�"
+
+#: ../widgets/misc/e-import-assistant.c:1240
+msgid "Select a File"
+msgstr "ଗୋଟି� ଫାଇଲ ବାଛନ�ତ�"
+
+#: ../widgets/misc/e-import-assistant.c:1255
+#, fuzzy
+#| msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Evolution ମଧ�ଯକ� ଫାଇଲ ଆମଦାନୀ କରିବା ଆରମ�ଭ କରିବା ପାଇ� \"Import\" କ� କ�ଲିକ କରନ�ତ�।"
+
+#: ../widgets/misc/e-import-assistant.c:1261
+#: ../widgets/misc/e-import-assistant.c:1271
+#, fuzzy
+#| msgid "Important"
+msgid "Import Data"
+msgstr "ଗ�ର�ତ�ବପୂର�ଣ�ଣ"
+
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "ପୃଥିବୀ ମାନଚିତ�ର"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21801,413 +22001,506 @@ msgstr ""
 "ସମୟ ମଣ�ଡଳ ବାଛିବା ପାଇ� ମାଉସ ଆଧାରିତ ପାରସ�ପରିକ କାର�ଯ�ୟକ�ଷମ ମ�ୟାପ ୱିଜେଟ। କିବୋର�ଡ ଚାଳକମାନେ "
 "ନିମ�ନରେ ଥିବା ଡ�ରପଡାଉନ ସଂଯ�କ�ତ ବାକ�ସର� ସମୟ ମଣ�ଡଳକ� ବାଛିବା ଉଚିତ।"
 
-#: ../widgets/misc/e-online-button.c:106
-msgid "Online"
-msgstr "ଅନ ଲାଇନ"
+#: ../widgets/misc/e-online-button.c:27
+#, fuzzy
+#| msgid ""
+#| "Evolution is currently online.\n"
+#| "Click on this button to work offline."
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"Evolution ବର�ତ�ତମାନ ଅନଲାଇନ ଅଛି।\n"
+"ଅଫଲାଇନରେ କାର�ଯ�ୟକରିବା ପାଇ� �ହି ବଟନ ଉପରେ କ�ଲିକ କରନ�ତ�।"
 
-#: ../widgets/misc/e-online-button.c:107
-msgid "The button state is online"
-msgstr "ବଟନ ସ�ଥିତିଟି ଅନଲାଇନ ଅଛି"
+#: ../widgets/misc/e-online-button.c:30
+#, fuzzy
+#| msgid ""
+#| "Evolution is currently offline.\n"
+#| "Click on this button to work online."
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"Evolution ବର�ତ�ତମାନ ଅଫଲାଇନରେ ଅଛି।\n"
+"ଅନଲାଇନରେ କାର�ଯ�ୟକରିବା ପାଇ� �ହି ବଟନ ଉପରେ କ�ଲିକ କରନ�ତ�।"
+
+#: ../widgets/misc/e-online-button.c:33
+#, fuzzy
+#| msgid ""
+#| "Evolution is currently offline.\n"
+#| "Click on this button to work online."
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr ""
+"Evolution ବର�ତ�ତମାନ ଅଫଲାଇନରେ ଅଛି।\n"
+"ଅନଲାଇନରେ କାର�ଯ�ୟକରିବା ପାଇ� �ହି ବଟନ ଉପରେ କ�ଲିକ କରନ�ତ�।"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "�ହା ଦ�ବାରା ସିଙ�କ କରନ�ତ�:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync Private Records:"
 msgstr "ବ�ଯକ�ତିଗତ ଅନ�ଲିପିକ� ସିଙ�କ କରନ�ତ�"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:112
 msgid "Sync Categories:"
 msgstr "ବିଭାଗ ମାନଙ�କ� ସିଙ�କ କରନ�ତ�:"
 
-#: ../widgets/misc/e-reflow.c:1438 ../widgets/misc/e-reflow.c:1439
-msgid "Empty message"
-msgstr "ଖାଲି ସନ�ଦେଶ"
-
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
-msgid "Reflow model"
-msgstr "ପ�ନଃପ�ରବାହ ନମ�ନା"
-
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
-msgid "Column width"
-msgstr "ସ�ତମ�ଭ ଓସାର"
-
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:475
-#: ../widgets/misc/e-search-bar.c:477
-msgid "Search"
-msgstr "ଖୋଜନ�ତ�"
-
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:475
-#: ../widgets/misc/e-search-bar.c:477
-msgid "Click here to change the search type"
-msgstr "ସନ�ଧାନ ପ�ରକାର ପରିବର�ତ�ତନ କରିବା ପାଇ� �ଠାରେ ଦବାନ�ତ�"
-
-#: ../widgets/misc/e-search-bar.c:608
-msgid "_Search"
-msgstr "ଖୋଜନ�ତ� (_S)"
-
-#: ../widgets/misc/e-search-bar.c:614
-msgid "_Find Now"
-msgstr "ବର�ତ�ତମାନ ଖୋଜନ�ତ� (_F)"
+#: ../widgets/misc/e-preferences-window.c:218
+msgid "Evolution Preferences"
+msgstr "Evolution ପସନ�ଦ"
 
-#: ../widgets/misc/e-search-bar.c:615
-msgid "_Clear"
-msgstr "ସଫା କରନ�ତ� (_C)"
+#: ../widgets/misc/e-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "ମେଳକଗ�ଡିକ: %d"
 
-#: ../widgets/misc/e-search-bar.c:870
-msgid "Item ID"
-msgstr "ବସ�ତ� ପରିଚୟ"
+#: ../widgets/misc/e-search-bar.c:554
+msgid "Close the find bar"
+msgstr "�ହି ସନ�ଧାନ ପଟିକ� ବନ�ଦ କରନ�ତ�"
 
-#: ../widgets/misc/e-search-bar.c:877 ../widgets/text/e-text.c:3567
-#: ../widgets/text/e-text.c:3568
-msgid "Text"
-msgstr "ପାଠ�ଯ"
+#: ../widgets/misc/e-search-bar.c:562
+msgid "Fin_d:"
+msgstr "ଖୋଜନ�ତ� (_d):"
 
-#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
-#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1013
-msgid "Sho_w: "
-msgstr "ପ�ରଦର�ଶନ କରନ�ତ� (_w): "
+#: ../widgets/misc/e-search-bar.c:574
+msgid "Clear the search"
+msgstr "ସନ�ଧାନକ� ସଫା କରନ�ତ�"
 
-#: ../widgets/misc/e-search-bar.c:1032
-msgid "Sear_ch: "
-msgstr "ସନ�ଧାନ କରନ�ତ� (_c): "
+#: ../widgets/misc/e-search-bar.c:597
+msgid "_Previous"
+msgstr "ପୂର�ବବର�ତ�ତୀ (_P)"
 
-#. 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:1048
-msgid " i_n "
-msgstr "ଚିହ�ନିତ ସ�ଥାନରେ (_n)"
+#: ../widgets/misc/e-search-bar.c:603
+msgid "Find the previous occurrence of the phrase"
+msgstr "ବାକ�ୟଖଣ�ଡର ପୂର�ବ ଆଗମନକ� ଖୋଜନ�ତ�"
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
-msgid "Cursor Row"
-msgstr "ଦର�ଶିକା ଧାଡି"
+#: ../widgets/misc/e-search-bar.c:613
+msgid "_Next"
+msgstr "ପରବର�ତ�ତୀ (_N)"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
-msgid "Cursor Column"
-msgstr "ଦର�ଶିକା ସ�ତମ�ଭ"
+#: ../widgets/misc/e-search-bar.c:619
+msgid "Find the next occurrence of the phrase"
+msgstr "ବାକ�ୟଖଣ�ଡର ପରବର�ତ�ତୀ ଆଗମନକ� ଖୋଜନ�ତ�"
 
-#: ../widgets/misc/e-selection-model.c:208
-msgid "Sorter"
-msgstr "ବଛାଳି"
+#: ../widgets/misc/e-search-bar.c:629
+msgid "Mat_ch case"
+msgstr "�ହି ବିଷୟକ� ମେଳାନ�ତ� (_c)"
 
-#: ../widgets/misc/e-selection-model.c:215
-msgid "Selection Mode"
-msgstr "ଚୟନ ଧାରା"
+#: ../widgets/misc/e-search-bar.c:657
+msgid "Reached bottom of page, continued from top"
+msgstr "ପୃଷ�ଠା ତଳେ ପହଞ�ଚି ସାରିଛି, ଉପର� ଆଗମନ କର�ଛି"
 
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Cursor Mode"
-msgstr "ଦର�ଶିକା ଧାରା"
+#: ../widgets/misc/e-search-bar.c:679
+msgid "Reached top of page, continued from bottom"
+msgstr "ପୃଷ�ଠା ଉପରେ ପହଞ�ଚି ସାରିଛି, ତଳ� ଆଗମନ କର�ଛି"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "ଅପସାରଣ କରାଗଲେ (_l):"
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>ହସ�ତାନ�ତର ବିକଲ�ପ</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>ଉତ�ତର</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>ପ�ରତ�ଯାବର�ତ�ତନ ସୂଚନା</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>ଅବସ�ଥିତି ଅନ�ସରଣ</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
 msgstr "ସ�ବତଃ-ଅପସାରଣ ପ�ରେରିତ ବସ�ତ� (_u)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
+#: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
 msgstr "ସୂଚନା ଅନ�ସରଣ କରିବା ପାଇ� ଗୋଟି� ପ�ରେରିତ ବସ�ତ�କ� ସୃଷ�ଟି କରନ�ତ� (_e)"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
 msgstr "ହସ�ତାନ�ତର କରାଗଲା �ବଂ ଖୋଲାଗଲା (_v)"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.ui.h:5
+#, fuzzy
+#| msgid "<b>Delivery Options</b>"
+msgid "Delivery Options"
+msgstr "<b>ହସ�ତାନ�ତର ବିକଲ�ପ</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgid "For Your Eyes Only"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
 msgstr "ସାଧାରଣ ବିକଲ�ପ (_r)"
 
-#: ../widgets/misc/e-send-options.glade.h:9
-msgid ""
-"None\n"
-"Mail Receipt"
+#: ../widgets/misc/e-send-options.ui.h:10
+#, fuzzy
+#| msgid ""
+#| "None\n"
+#| "Mail Receipt"
+msgid "Mail Receipt"
 msgstr ""
 "କିଛି ନ�ହେ�\n"
 "ମେଲ ରସିଦ"
 
-#: ../widgets/misc/e-send-options.glade.h:11
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
-msgstr ""
-"ସାଧାରଣ\n"
-"ନିଜସ�ୱ\n"
-"ଗୋପନୀୟ\n"
-"ଗ�ପ�ତ\n"
-"ଅତି ଗ�ପ�ତ\n"
-"କେବଳ ଆପଣଙ�କ ଆଖି ପାଇ�"
+#: ../widgets/misc/e-send-options.ui.h:14
+#, fuzzy
+#| msgid "Priority"
+msgid "Proprietary"
+msgstr "ଅଗ�ରାଧିକାର"
 
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "ଅନ�ରୋଧକ� ଉତ�ତର ଦିଅନ�ତ� (_e)"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.ui.h:17
+#, fuzzy
+#| msgid "<b>Return Notification</b>"
+msgid "Return Notification"
+msgstr "<b>ପ�ରତ�ଯାବର�ତ�ତନ ସୂଚନା</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Sta_tus Tracking"
 msgstr "ଅବସ�ଥିତି ଅନ�ସରଣ (_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"ଅପରିଭାଷିତ\n"
-"ଉଚ�ଚ\n"
-"ମାନକ\n"
-"ନିମ�ନ"
+#: ../widgets/misc/e-send-options.ui.h:21
+#, fuzzy
+#| msgid "S_tandard Font:"
+msgid "Standard"
+msgstr "ମାନକ ଅକ�ଷରରୂପ (_t):"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+#, fuzzy
+#| msgid "Sta_tus Tracking"
+msgid "Status Tracking"
+msgstr "ଅବସ�ଥିତି ଅନ�ସରଣ (_t)"
+
+#: ../widgets/misc/e-send-options.ui.h:23
+#, fuzzy
+#| msgid "Top secret"
+msgid "Top Secret"
+msgstr "ଅତି ଗୋପନୀୟ"
 
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When acce_pted:"
 msgstr "ଗ�ରହଣ କଲେ (_p):"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "When co_mpleted:"
 msgstr "ସମାପ�ତ ହେଲେ (_m)"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "When decli_ned:"
 msgstr "ପ�ରତ�ଯାଖ�ଯାନ କଲେ (_n):"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "�ହା ମଧ�ଯରେ (_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:28
-msgid "_After:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+#, fuzzy
+#| msgid "_After:"
+msgid "_After"
 msgstr "�ହା ପରେ (_A):"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "ସମସ�ତ ସୂଚନା (_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "ଶ�ରେଣୀ ବିଭାଜନ (_C):"
 
-#. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "ବିଳମ�ବିତ ସନ�ଦେଶକ� ପଠାଗଲା (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "ପଠାଗଲା (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "ଅବସାନ ସମୟକ� ସେଟ କରନ�ତ� (_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:36
-msgid "_Until:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+#, fuzzy
+#| msgid "_Until:"
+msgid "_Until"
 msgstr "ଯେ ପର�ଯ�ଯନ�ତ (_U):"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "ସ�ବିଧା ହେଲେ (_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "ଖୋଲିଲେ (_W)"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#: ../widgets/misc/e-signature-editor.c:133
+#: ../widgets/misc/e-signature-editor.c:549
+#: ../widgets/misc/e-signature-manager.c:349
+#: ../widgets/misc/e-signature-script-dialog.c:218
+msgid "Unnamed"
+msgstr "ନାମହୀନ"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
-#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% ସମାପ�ତ)"
+#: ../widgets/misc/e-signature-editor.c:210
+msgid "_Save and Close"
+msgstr "ସଂରକ�ଷଣ କରନ�ତ� �ବଂ ବନ�ଦକରନ�ତ� (_S)"
+
+#: ../widgets/misc/e-signature-editor.c:389
+msgid "Edit Signature"
+msgstr "ହସ�ତାକ�ଷରକ� ସମ�ପାଦନ କରନ�ତ�"
+
+#: ../widgets/misc/e-signature-editor.c:404
+msgid "_Signature Name:"
+msgstr "ହସ�ତାକ�ଷର ନାମ (_S):"
+
+#: ../widgets/misc/e-signature-manager.c:294
+#, fuzzy
+#| msgid "Add signature script"
+msgid "Add Signature Script"
+msgstr "ହସ�ତାକ�ଷର ସ�କ�ରିପ�ଟ ଯୋଗକରନ�ତ�"
+
+#: ../widgets/misc/e-signature-manager.c:359
+#, fuzzy
+#| msgid "Edit Signature"
+msgid "Edit Signature Script"
+msgstr "ହସ�ତାକ�ଷରକ� ସମ�ପାଦନ କରନ�ତ�"
+
+#: ../widgets/misc/e-signature-manager.c:576
+msgid "Add _Script"
+msgstr "ସ�କ�ରିପଟ ଯୋଗକରନ�ତ� (_S)"
+
+#: ../widgets/misc/e-signature-script-dialog.c:266
+#, 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. "
+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 ""
+"�ହି ସ�କ�ରିପ�ଟର ଫଳାଫଳ ଆପଣଙ�କର ହସ�ତାକ�ଷର ଭାବରେ\n"
+"ବ�ୟବହୃତ ହୋଇଥା�। ଆପଣ ଉଲ�ଲେଖ କରିଥିବା ନାମଗ�ଡ଼ିକ�\n"
+"କେବଳ ପ�ରଦର�ଶନ ଉଦ�ଦେଶ�ୟରେ ବ�ୟବହାର କରାଯିବ।"
+
+#: ../widgets/misc/e-signature-script-dialog.c:311
+#, fuzzy
+#| msgid "_Script:"
+msgid "S_cript:"
+msgstr "ସ�କ�ରିପଟ (_S):"
+
+#: ../widgets/misc/e-signature-script-dialog.c:342
+#, fuzzy
+#| msgid "The script file must exist and be executable."
+msgid "Script file must be executable."
+msgstr "ସ�କ�ରିପଟ ଫାଇଲ ରହିବା ଉଚିତ �ବଂ ନିଷ�ପାଦନ ଯୋଗ�ୟ ହେବା ଉଚିତ।"
 
 #: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "ୟ�.ଆର.�ଲ. କ� ଯିବା ପାଇ� �ଠାରେ ଦବାନ�ତ�"
 
-#: ../widgets/table/e-cell-combo.c:173
-msgid "popup list"
-msgstr "ପପ-ଅପ ତାଲିକା"
+#: ../widgets/misc/e-web-view.c:359
+msgid "_Copy Link Location"
+msgstr "ସଂଯୋଗ ଅବସ�ଥାନକ� ନକଲ କରନ�ତ� (_C)"
+
+#: ../widgets/misc/e-web-view.c:361
+#, fuzzy
+#| msgid "Copy things to the clipboard."
+msgid "Copy the link to the clipboard"
+msgstr "ବଚ�ଛିତ ସନ�ଦେଶଗ�ଡ଼ିକ� କ�ଲିପବୋର�ଡରେ ନକଲ କରନ�ତ�"
+
+#: ../widgets/misc/e-web-view.c:369
+msgid "_Open Link in Browser"
+msgstr "ବ�ରାଉଜରରେ ସଂଯୋଗକ� ଖୋଲନ�ତ� (_O)"
+
+#: ../widgets/misc/e-web-view.c:371
+#, fuzzy
+#| msgid "_Open Link in Browser"
+msgid "Open the link in a web browser"
+msgstr "ବ�ରାଉଜରରେ ସଂଯୋଗକ� ଖୋଲନ�ତ� (_O)"
+
+#: ../widgets/misc/e-web-view.c:379
+#, fuzzy
+#| msgid "Copy _Email Address"
+msgid "_Copy Email Address"
+msgstr "ଇ-ଡାକ ଠିକଣାକ� ନକଲ କରନ�ତ� (_E)"
+
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
+#, fuzzy
+#| msgid "Select all the text in a message"
+msgid "Select all text and images"
+msgstr "ସନ�ଦେଶରେ ସମସ�ତ ପାଠ�ଯକ� ମନୋନୀତ କରନ�ତ�"
+
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
+#, c-format
+msgid "Click to call %s"
+msgstr "%s କ� ଡାକିବା ପାଇ� ଦବାନ�ତ�"
+
+#: ../widgets/misc/e-web-view.c:846
+msgid "Click to hide/unhide addresses"
+msgstr "ଲ�ଚାଇବା ପାଇ� କ�ଲିକ କରନ�ତ�/ଲ�ଚାହୋଇନଥିବା ଠିକଣା"
+
+#: ../widgets/misc/e-web-view.c:848
+#, c-format
+msgid "Click to open %s"
+msgstr "%s କ� ଖୋଲିବା ପାଇ� ଦବାନ�ତ�"
 
-#: ../widgets/table/e-cell-date.c:63
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
+#: ../widgets/misc/ea-calendar-item.c:299
+#: ../widgets/misc/ea-calendar-item.c:308
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
 
-#: ../widgets/table/e-cell-pixbuf.c:360
-msgid "Selected Column"
-msgstr "ଚୟିତ ସ�ତମ�ଭ"
+#: ../widgets/misc/ea-calendar-item.c:311
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "କ�ଯାଲେଣ�ଡର: %s ର� %s କ�"
 
-#: ../widgets/table/e-cell-pixbuf.c:367
-msgid "Focused Column"
-msgstr "କେନ�ଦ�ରୀଭୂତ ସ�ତମ�ଭ"
+#: ../widgets/misc/ea-calendar-item.c:347
+msgid "evolution calendar item"
+msgstr "evolution କ�ଯାଲେଣ�ଡର ବସ�ତ�"
 
-#: ../widgets/table/e-cell-pixbuf.c:374
-msgid "Unselected Column"
-msgstr "ଅଚୟିତ ସ�ତମ�ଭ"
+#: ../widgets/table/e-cell-combo.c:174
+msgid "popup list"
+msgstr "ପପ-ଅପ ତାଲିକା"
 
-#: ../widgets/table/e-cell-text.c:1800
-msgid "Strikeout Column"
-msgstr "ସ�ତମ�ଭକ� ଗାର ପକାଇ କାଟନ�ତ�"
+#: ../widgets/table/e-cell-date-edit.c:303
+msgid "Now"
+msgstr "ବର�ତ�ତମାନ"
 
-#: ../widgets/table/e-cell-text.c:1807
-msgid "Underline Column"
-msgstr "ରେଖାଙ�କିତ ସ�ତମ�ଭ"
+#. Translators: "None" as a label of a button to unset date in a date table cell
+#: ../widgets/table/e-cell-date-edit.c:320
+#, fuzzy
+#| msgid "None"
+msgctxt "table-date"
+msgid "None"
+msgstr "କିଛି ନ�ହେ�"
 
-#: ../widgets/table/e-cell-text.c:1814
-msgid "Bold Column"
-msgstr "ଗାଢ ସ�ତମ�ଭ"
+#: ../widgets/table/e-cell-date-edit.c:328
+msgid "OK"
+msgstr "ଠିକ ଅଛି"
 
-#: ../widgets/table/e-cell-text.c:1821
-msgid "Color Column"
-msgstr "ରଙ�ଗ ସ�ତମ�ଭ"
+#: ../widgets/table/e-cell-date-edit.c:872
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "ସମୟ �ହି ଶୈଳୀରେ ରହିବା ଉଚିତ: %s"
 
-#: ../widgets/table/e-cell-text.c:1835
-msgid "BG Color Column"
-msgstr "BG ରଙ�ଗ ସ�ତମ�ଭ"
+#: ../widgets/table/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "ପ�ରତିଶତ ମୂଲ�ଯ 0 �ବଂ 100 ମଧ�ଯରେ ହୋଇଥିବା ଉଚିତ, ଅନ�ତର�ନିହିତ"
 
-#: ../widgets/table/e-table-config.c:152
-msgid "State"
-msgstr "ରାଜ�ଯ"
+#: ../widgets/table/e-table-click-to-add.c:595
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
+msgid "click to add"
+msgstr "ଯୋଗ କରିବା ପାଇ� ଦବାନ�ତ�"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(ସାନର� ବଡ କ�ରମରେ)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(ବଡର� ସାନ କ�ରମରେ)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:388
 msgid "Not sorted"
 msgstr "ସଜଡା ଯାଇନାହି�"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:429
 msgid "No grouping"
 msgstr "କୌଣସି ସମୂହୀକରଣ ହୋଇନାହି�"
 
-#: ../widgets/table/e-table-config.c:644
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config.c:647
+#: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "କ�ଷେତ�ର ପ�ରଦର�ଶନ କରନ�ତ�"
 
-#: ../widgets/table/e-table-config.c:665
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "ଅବସ�ଥିତ କ�ଷେତ�ର ମାନ"
 
-#: ../widgets/table/e-table-config.glade.h:1
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "A_vailable Fields:"
 msgstr "ଉପଲବ�ଧ କ�ଷେତ�ର ମାନ (_v):"
 
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1581
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "ସାନର� ବଡ କ�ରମରେ"
 
-#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
 msgstr "ସବ�କିଛି ସଫାକରନ�ତ�"
 
-#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-config.ui.h:4
 msgid "Clear _All"
 msgstr "ସବ�କିଛି ସଫାକରନ�ତ� (_A)"
 
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1581
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "ବଡର� ସାନ କ�ରମରେ"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "�ପରି ଭାବରେ ସମୂହୀକ�ର�ତ କରନ�ତ�"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.ui.h:9
 msgid "Move _Down"
 msgstr "ତଳକ� ଯାଆନ�ତ� (_D)"
 
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.ui.h:10
 msgid "Move _Up"
 msgstr "ଉପରକ� ଯାଆନ�ତ� (_U)"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.ui.h:12
 msgid "Show _field in View"
 msgstr "ଦ�ର�ଶ�ଯରେ ପ�ରଦର�ଶିତ କ�ଷେତ�ର (_f)"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "ଦ�ର�ଶ�ଯରେ ପ�ରଦର�ଶିତ କ�ଷେତ�ର (_n)"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "ଦ�ର�ଶ�ଯରେ ପ�ରଦର�ଶିତ କ�ଷେତ�ର (_V)"
 
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "ସଜାଡନ�ତ�"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "ବସ�ତ� ମାନଙ�କ� �ପରି ଭାବରେ ସଜାଡନ�ତ�"
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.ui.h:17
 msgid "Then By"
 msgstr "ତାପରେ �ପରି ଭାବରେ"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
 msgstr "ପ�ରଦର�ଶିତ କ�ଷେତ�ର (_F) ..."
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
 msgstr "�ହା ଦ�ବାରା ସମୂହୀକ�ର�ତ କରନ�ତ� (_G) ..."
 
-#: ../widgets/table/e-table-config.glade.h:22
+#: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "ଦ�ର�ଶ�ଯରେ ପ�ରଦର�ଶିତ କ�ଷେତ�ର (_S)"
 
-#: ../widgets/table/e-table-config.glade.h:23
+#: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
 msgstr "�ହି କ�ଷେତ�ର ମାନଙ�କ� କ�ରମାନ�ବୟରେ ଦେଖାନ�ତ� (_S):"
 
-#: ../widgets/table/e-table-config.glade.h:24
+#: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
 msgstr "ସଜାଡନ�ତ� (_S) ..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
-msgid "Add a column..."
-msgstr "ଗୋଟି� ସ�ତମ�ଭକ� ଯୋଗ କରନ�ତ�"
-
-#: ../widgets/table/e-table-field-chooser.glade.h:1
-msgid "Field Chooser"
-msgstr "କ�ଷେତ�ର ଚୟକ"
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
+#, fuzzy
+#| msgid "Add a C_olumn..."
+msgid "Add a Column"
+msgstr "ଗୋଟି� ସ�ତମ�ଭ ଯୋଗ କରନ�ତ� (_o)..."
 
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22215,307 +22508,134 @@ msgstr ""
 "ଆପଣଙ�କ ସାରଣୀରେ ଗୋଟି� ସ�ତମ�ଭ ଯୋଡ଼ିବା ପାଇ�, ତାହାକ�\n"
 "ଆପଣ ଚାହ��ଥିବା ସ�ଥାନକ� ଟାଣନ�ତ�।"
 
-#: ../widgets/table/e-table-group-container.c:343
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
+#, fuzzy, c-format
+#| msgid "%s : %s (%d item)"
+#| msgid_plural "%s : %s (%d items)"
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s : %s (%d ବସ�ତ�)"
 msgstr[1] "%s : %s (%d ବସ�ତ�)"
 
-#: ../widgets/table/e-table-group-container.c:349
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d ବସ�ତ�)"
 msgstr[1] "%s (%d ବସ�ତ�)"
 
-#: ../widgets/table/e-table-group-container.c:926
-#: ../widgets/table/e-table-group-container.c:927
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
-msgid "Alternating Row Colors"
-msgstr "ପର�ଯ�ଯାୟକ�ରମିକ ଧାଡି ରଙ�ଗ"
-
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-container.c:934
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3342 ../widgets/table/e-tree.c:3343
-msgid "Horizontal Draw Grid"
-msgstr "ଭୂସମାନ�ତର ଅଙ�କନ କ�ଷେତ�ର"
-
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-container.c:941
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3348 ../widgets/table/e-tree.c:3349
-msgid "Vertical Draw Grid"
-msgstr "ଭୂଲମ�ବ ଅଙ�କନ କ�ଷେତ�ର"
-
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-container.c:948
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3354 ../widgets/table/e-tree.c:3355
-msgid "Draw focus"
-msgstr "ଫୋକସ ଅଙ�କନ କରନ�ତ�"
-
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-container.c:955
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
-msgid "Cursor mode"
-msgstr "ଦର�ଶିକା ଅବସ�ଥା"
-
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-container.c:962
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
-msgid "Selection model"
-msgstr "ଚୟନ ନମ�ନା"
-
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-container.c:969
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3336
-#: ../widgets/table/e-tree.c:3337
-msgid "Length Threshold"
-msgstr "ଦୈର�ଘ�ଯ ପ�ରଭାବସୀମା"
-
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-container.c:976
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3368
-#: ../widgets/table/e-tree.c:3369
-msgid "Uniform row height"
-msgstr "�କରୂପ ଧାଡି ଉଚ�ଚତା"
-
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-container.c:983
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "ଫ�ରୋଜେନ"
-
-#: ../widgets/table/e-table-header-item.c:1451
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
 msgstr "ବର�ତ�ତମାନ ଦ�ର�ଶ�ଯକ� ଇଚ�ଛାରୂପଣ କରନ�ତ�"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Sort _Ascending"
 msgstr "ସାନର� ବଡ କ�ରମରେ ସଜାଡନ�ତ� (_A)"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1565
 msgid "Sort _Descending"
 msgstr "ବଡର� ସାନ କ�ରମରେ ସଜାଡନ�ତ� (_D)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1568
 msgid "_Unsort"
 msgstr "ଅସଜଡା (_U)"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1571
 msgid "Group By This _Field"
 msgstr "�ହି କ�ଷେତ�ର ଅନ�ସାରେ ସମୂହରେ ବିଭାଜିତ କରନ�ତ� (_F)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Group By _Box"
 msgstr "ବକ�ସ ଅନ�ସାରେ ସମୂହରେ ବିଭାଜିତ କରନ�ତ� (_B)"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Remove This _Column"
 msgstr "�ହି ସ�ତମ�ଭକ� ଅପସାରଣ କରନ�ତ� (_C)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Add a C_olumn..."
 msgstr "ଗୋଟି� ସ�ତମ�ଭ ଯୋଗ କରନ�ତ� (_o)..."
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "A_lignment"
 msgstr "ପାର�ଶ�ବସଜ�ଜା (_l)"
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "B_est Fit"
 msgstr "ସର�ବତ�କୃଷ�ଟ ଅନ�ରୂପ (_e)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Format Column_s..."
 msgstr "ସ�ତମ�ଭ ମାନଙ�କ� ସଂରୂପିତ କରନ�ତ� (_s)..."
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Custo_mize Current View..."
 msgstr "ବର�ତ�ତମାନ ଦ�ର�ଶ�ଯକ� ଇଚ�ଛାରୂପଣ କରନ�ତ� (_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Sort By"
 msgstr "�ହି ଅନ�ସାରେ ସଜାଡନ�ତ� (_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1559
+#: ../widgets/table/e-table-header-item.c:1672
 msgid "_Custom"
 msgstr "ଇଚ�ଛାରୂପଣ କରନ�ତ� (_C)"
 
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
-msgid "Table header"
-msgstr "ସାରଣୀ ଶୀର�ଷକ"
-
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
-msgid "Table model"
-msgstr "ସାରଣୀ ନମ�ନା"
-
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
-msgid "Cursor row"
-msgstr "ଦର�ଶିକା ଧାଡି"
-
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "ସଜଡା ଯାଇଥିବା ସୂଚନା"
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+msgid "popup a child"
+msgstr "ଗୋଟି� ନିର�ଭରକକ� ପପ-ଅପ କରନ�ତ�"
 
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3375
-#: ../widgets/table/e-tree.c:3376
-msgid "Always search"
-msgstr "ସବ�ବେଳେ ସନ�ଧାନ କରନ�ତ�"
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
+msgid "begin editing this cell"
+msgstr "�ହି କକ�ଷକ� ସମ�ପାଦନ କରିବା ପ�ରାରମ�ଭ କରନ�ତ�"
 
-#: ../widgets/table/e-table.c:3345
-msgid "Use click to add"
-msgstr "ଯୋଗ କରିବା ପାଇ� 'ଦବାନ�ତ�' କ� ବ�ଯବହାର କରନ�ତ�"
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
+msgid "toggle the cell"
+msgstr "କକ�ଷ ପରିବର�ତ�ତନ କରନ�ତ�"
 
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "ବ�ର�କ�ଷ"
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
+msgid "expands the row in the ETree containing this cell"
+msgstr "�ହି କକ�ଷକ� ଧାରଣ କରିଥିବା ETree ରେ ଧାଡିକ� ସମ�ପ�ରସାରିତ କରିଥା�"
 
-#: ../widgets/table/e-tree.c:3361 ../widgets/table/e-tree.c:3362
-msgid "ETree table adapter"
-msgstr "ETree ସାରଣୀ ଅନ�କୂଳକ"
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
+msgid "collapses the row in the ETree containing this cell"
+msgstr "�ହି କକ�ଷକ� ଧାରଣ କରିଥିବା ETree ରେ ଧାଡିକ� ସଙ�କୋଚିତ କରନ�ତ�"
 
-#: ../widgets/table/e-tree.c:3382
-msgid "Retro Look"
-msgstr "ମନୋହର ରୂପ"
+#: ../widgets/table/gal-a11y-e-cell.c:119
+msgid "Table Cell"
+msgstr "ସାରଣୀ କକ�ଷ"
 
-#: ../widgets/table/e-tree.c:3383
-msgid "Draw lines and +/- expanders."
-msgstr "ରେଖା �ବଂ +/- ଆବର�ଦ�ଧକ ଅଙ�କନ କରନ�ତ�।"
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "ଦବାନ�ତ�"
 
-#: ../widgets/table/e-tree.c:3389
-msgid "Expander Size"
-msgstr "ସମ�ପ�ରସାରକ ଆକାର"
+#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+msgid "sort"
+msgstr "ସଜାଡନ�ତ�"
 
-#: ../widgets/table/e-tree.c:3390
-msgid "Size of the expander arrow"
-msgstr "ସମ�ପ�ରସାରକ ତୀରର ଆକାର"
+#: ../widgets/text/e-text.c:2474
+msgid "Select All"
+msgstr "ସବ� ମନୋନୀତ କର"
 
-#: ../widgets/text/e-text.c:2737
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "ନିବେଶ ପ�ରଣାଳୀ"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
-msgid "Event Processor"
-msgstr "ଘଟଣା ସଂସାଧକ"
-
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
-msgid "Bold"
-msgstr "ଗାଢ ଅକ�ଷର"
-
-#: ../widgets/text/e-text.c:3581 ../widgets/text/e-text.c:3582
-msgid "Strikeout"
-msgstr "ଗାର ପକାଇ କାଟନ�ତ�"
-
-#: ../widgets/text/e-text.c:3588 ../widgets/text/e-text.c:3589
-msgid "Anchor"
-msgstr "ସ�ଥିରବିନ�ଦ�"
-
-#: ../widgets/text/e-text.c:3596 ../widgets/text/e-text.c:3597
-msgid "Justification"
-msgstr "ଯଥାର�ଥତା"
-
-#: ../widgets/text/e-text.c:3603 ../widgets/text/e-text.c:3604
-msgid "Clip Width"
-msgstr "ପ�ରସ�ଥ କାଟନ�ତ� "
-
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
-msgid "Clip Height"
-msgstr "ଦୈର�ଘ�ଯ କାଟନ�ତ�"
-
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
-msgid "Clip"
-msgstr "କାଟନ�ତ�"
-
-#: ../widgets/text/e-text.c:3624 ../widgets/text/e-text.c:3625
-msgid "Fill clip rectangle"
-msgstr "କ�ଲିପ ଆୟତକ�ଷେତ�ରକ� ଭରନ�ତ�"
-
-#: ../widgets/text/e-text.c:3631 ../widgets/text/e-text.c:3632
-msgid "X Offset"
-msgstr "�କ�ସ ଅଫସେଟ"
-
-#: ../widgets/text/e-text.c:3638 ../widgets/text/e-text.c:3639
-msgid "Y Offset"
-msgstr "ୟାଇ ଅଫସେଟ"
-
-#: ../widgets/text/e-text.c:3674 ../widgets/text/e-text.c:3675
-msgid "Text width"
-msgstr "ପାଠ�ଯ ପ�ରସ�ଥ"
-
-#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
-msgid "Text height"
-msgstr "ପାଠ�ଯ ଦୈର�ଘ�ଯ"
-
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
-msgid "Use ellipsis"
-msgstr "ପଦଶୂନ�ଯତା ବ�ଯବହାର କରନ�ତ�"
-
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
-msgid "Ellipsis"
-msgstr "ପଦଶୂନ�ଯତା"
-
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
-msgid "Line wrap"
-msgstr "ରେଖାକ� ଆବ�ର�ତ କରନ�ତ�"
-
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
-msgid "Break characters"
-msgstr "ଅକ�ଷର ମାନଙ�କ� ବିଚ�ଛିନ�ନ କରନ�ତ�"
-
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
-msgid "Max lines"
-msgstr "ସର�ବାଧିକ ରେଖା"
-
-#: ../widgets/text/e-text.c:3746 ../widgets/text/e-text.c:3747
-msgid "Draw borders"
-msgstr "ଧାର ଅଙ�କନ କରନ�ତ�"
-
-#: ../widgets/text/e-text.c:3753 ../widgets/text/e-text.c:3754
-msgid "Allow newlines"
-msgstr "ନୂତନ ରେଖା ମାନଙ�କ� ସ�ବୀକାର କରନ�ତ�"
-
-#: ../widgets/text/e-text.c:3760 ../widgets/text/e-text.c:3761
-msgid "Draw background"
-msgstr "ପ�ର�ଷ�ଠଭୂମି ଅଙ�କନ କରନ�ତ�"
-
-#: ../widgets/text/e-text.c:3767 ../widgets/text/e-text.c:3768
-msgid "Draw button"
-msgstr "ବଟନ ଅଙ�କନ କରନ�ତ�"
-
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
-msgid "Cursor position"
-msgstr "ଦର�ଶିକା ଅବସ�ଥିତି"
-
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3782 ../widgets/text/e-text.c:3784
-msgid "IM Context"
-msgstr "IM ପ�ରସଙ�ଗ"
-
-#: ../widgets/text/e-text.c:3790 ../widgets/text/e-text.c:3791
-msgid "Handle Popup"
-msgstr "ପପ-ଅପ ନିୟନ�ତ�ରଣ କରନ�ତ�"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a014c24644..ce8f0887e7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-28 20:52-0300\n"
+"POT-Creation-Date: 2010-03-28 21:09-0300\n"
 "PO-Revision-Date: 2010-03-28 20:51-0300\n"
 "Last-Translator: Rodrigo Flores <rlmflores@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
@@ -272,7 +272,7 @@ msgstr "Não foi possível ler os dados do aplicativo de endereços do PDA"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2000
 msgid "Anniversary"
 msgstr "Bodas"
 
@@ -283,7 +283,7 @@ msgstr "Bodas"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
+#: ../calendar/gui/e-calendar-view.c:1999 ../capplet/anjal-settings-main.c:119
 #: ../shell/main.c:112
 msgid "Birthday"
 msgstr "Aniversário"
@@ -308,7 +308,7 @@ msgstr "Contato"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2553
 msgid "Contact Editor"
 msgstr "Editor de contatos"
 
@@ -377,7 +377,7 @@ msgstr "Notas"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1708
 msgid "Other"
 msgstr "Outro"
 
@@ -615,20 +615,20 @@ msgid "Changed"
 msgstr "Alterado"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2548
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contatos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2945
 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:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2946
 msgid "_No image"
 msgstr "_Sem imagem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3219
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -636,23 +636,23 @@ msgstr ""
 "Os dados do contato são inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3223
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "\"%s\" possui um formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3230
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s\"%s\" possui um formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3256
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s\"%s\" está vazio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3270
 msgid "Invalid contact."
 msgstr "Contato inválido."
 
@@ -677,12 +677,12 @@ msgid "_Select Address Book"
 msgstr "_Selecionar catálogo de endereços"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
+#: ../shell/e-shell-window.c:700
 msgid "Shell"
 msgstr "Shell"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
+#: ../shell/e-shell-window.c:701
 msgid "The EShell singleton"
 msgstr "O EShell singleton"
 
@@ -861,7 +861,7 @@ msgstr "Juntar contatos"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
 #: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Any field contains"
@@ -1149,7 +1149,7 @@ msgid "Telex"
 msgstr "Telex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
+#: ../shell/e-shell-view.c:923
 msgid "Title"
 msgstr "Tratamento"
 
@@ -1338,17 +1338,17 @@ msgid "Copy _Email Address"
 msgstr "Copiar _endereço de e-mail"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:382
 msgid "Copy the email address to the clipboard"
 msgstr "Copia o endereço de e-mail para a área de transferência"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:387
 msgid "_Send New Message To..."
 msgstr "En_viar nova mensagem para..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:389
 msgid "Send a mail message to this address"
 msgstr "Envia uma mensagem para estes endereços"
 
@@ -1387,7 +1387,7 @@ msgstr "Bate-papo com vídeo"
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
+#: ../modules/calendar/e-cal-shell-view.c:495
 #: ../plugins/groupwise-features/camel-gw-listener.c:420
 #: ../plugins/groupwise-features/camel-gw-listener.c:445
 #: ../plugins/groupwise-features/camel-gw-listener.c:560
@@ -1459,7 +1459,7 @@ msgid "Blog"
 msgstr "Blog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../widgets/misc/e-web-view.c:798
 #, c-format
 msgid "Click to mail %s"
 msgstr "Clique para enviar correio para %s"
@@ -1517,8 +1517,8 @@ msgstr "Protocolo sem suporte"
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
 #: ../calendar/gui/print.c:2651
 msgid "Canceled"
@@ -3127,7 +3127,7 @@ msgid "Classification"
 msgstr "Classificação"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3171,13 +3171,13 @@ msgid "Organizer"
 msgstr "Organizador"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Particular"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
 #: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Público"
@@ -3374,11 +3374,13 @@ msgid "Selected Calendars for Alarms"
 msgstr "Agendas que devem ter alarmes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
+#, fuzzy
+msgid "Ti_me and date:"
 msgstr "Horário e data:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
+#, fuzzy
+msgid "_Date only:"
 msgstr "Somente data:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
@@ -3485,178 +3487,190 @@ msgstr "Nenhum"
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 #: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Sábado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Desloca_r visualização mensal por uma semana"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Fuso se_cundário:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Selecione as agendas para notificação por alarme"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "Mostrar um _lembrete"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "Mostrar _um lembrete"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar _números da semana no navegador de datas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Mostrar o número da semana nas Visões de Dia e de Semana Útil"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "T_arefas com prazo para hoje:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "Qu_i"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "Modelo:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
 msgstr "F_uso horário:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "Formato de hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Usar fuso horário do s_istema"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "A sema_na começa na:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Work Week"
 msgstr "Semana útil"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "Dias úteis:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_ação ao excluir itens"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir finais de semana na exibição de mês"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "_O dia começa às:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "Se_x"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "E_sconder tarefas concluídas após"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "_Seg"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "Ta_refas atrasadas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "Sá_b"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "Mostrar _hora de término de compromissos nas exibições de semana e mês"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "_Frações de tempo:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "_Ter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "_Qua"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "antes de cada aniversário"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "antes de cada compromisso"
 
@@ -3847,14 +3861,14 @@ msgstr "Clicar aqui para fechar a janela atual"
 #: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
 #: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:399 ../widgets/misc/e-web-view.c:1023
 msgid "Copy the selection"
 msgstr "Copia a seleção"
 
 #: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
 #: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1017
 msgid "Cut the selection"
 msgstr "Recorta a seleção"
 
@@ -3871,7 +3885,7 @@ msgstr "Clicar aqui para ver a ajuda disponível"
 #: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
 #: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1029
 msgid "Paste the clipboard"
 msgstr "Cola o conteúdo da área de transferência"
 
@@ -4172,7 +4186,7 @@ msgstr ""
 
 # Consistência com outras traduções "This even has..."
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2720
 msgid "This event has alarms"
 msgstr "Este evento tem alarmes."
 
@@ -4233,7 +4247,7 @@ msgstr "É necessário um organizador."
 msgid "At least one attendee is required."
 msgstr "É necessário pelo menos um participante."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2593
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Não é possível abrir a agenda \"%s\"."
@@ -4244,40 +4258,40 @@ msgstr "Não é possível abrir a agenda \"%s\"."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2637
+#: ../calendar/gui/dialogs/memo-page.c:913
+#: ../calendar/gui/dialogs/task-page.c:1741
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Você esta atuando em nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2939
 #, 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:2947
+#: ../calendar/gui/dialogs/event-page.c:2945
 #, 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:2953
+#: ../calendar/gui/dialogs/event-page.c:2951
 #, c-format
 msgid "%d minute before appointment"
 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:2966
+#: ../calendar/gui/dialogs/event-page.c:2964
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2966
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Nenhum"
@@ -4363,14 +4377,14 @@ msgstr ""
 "O memorando não poder ser completamente editado porque você não é o "
 "organizador"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:874
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Não é possível abrir memorandos em \"%s\"."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
+#: ../calendar/gui/dialogs/memo-page.c:1041 ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2253
+#: ../mail/em-format-html.c:2313 ../mail/em-format-html.c:2355
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Para"
@@ -4540,27 +4554,27 @@ msgstr "dia"
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "ocorrências"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2111
 msgid "Add exception"
 msgstr "Adicionar exceção"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Could not get a selection to modify."
 msgstr "não foi possível selecionar para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Modify exception"
 msgstr "Modificar exceção"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2202
 msgid "Could not get a selection to delete."
 msgstr "Não foi possível obter seleção para exclusão."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2329
 msgid "Date/Time"
 msgstr "Data/Hora"
 
@@ -4609,17 +4623,17 @@ msgstr "Notificar s_omente os novos participantes"
 msgid "Completed date is wrong"
 msgstr "A data de conclusão está errada"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:484
 msgid "Web Page"
 msgstr "Página da Web"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
 #: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
 #: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
@@ -4630,16 +4644,16 @@ msgstr "Concluída"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
 #: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../mail/message-list.c:1132 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Alta"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
 #: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
 #: ../calendar/gui/print.c:2645
 msgid "In Progress"
@@ -4649,15 +4663,15 @@ msgstr "Em progresso"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
 #: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../mail/message-list.c:1130 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Baixa"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:509
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1131
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "Normal"
@@ -4665,8 +4679,8 @@ msgstr "Normal"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
 #: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
 #: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
@@ -4684,7 +4698,7 @@ msgstr "_Estado:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1756
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4725,11 +4739,11 @@ msgstr "Clique para alterar ou ver os detalhes de status da tarefa"
 msgid "_Send Options"
 msgstr "Opções de _envio"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "Detalhes da tarefa"
 
@@ -4754,7 +4768,7 @@ msgstr "Organi_zador:"
 msgid "Due date is wrong"
 msgstr "O prazo de conclusão está errado"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1698
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Não é possível abrir tarefas em \"%s\"."
@@ -4922,11 +4936,11 @@ msgid "Free"
 msgstr "Livre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:548 ../calendar/gui/e-task-table.c:561
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4937,47 +4951,37 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sim"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Não"
 
-#: ../calendar/gui/e-cal-model.c:377
+#: ../calendar/gui/e-cal-model.c:325
 msgid "Default Client"
 msgstr "Cliente padrão"
 
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Configurações do Shell"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Configurações de largura do aplicativo"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
 #: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
 #: ../plugins/itip-formatter/itip-formatter.c:461
 #: ../plugins/itip-formatter/itip-formatter.c:2338
@@ -4985,15 +4989,15 @@ msgstr "Configurações de largura do aplicativo"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Repetindo"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Atribuído"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
@@ -5037,69 +5041,69 @@ msgstr "Data de início"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:404
 msgid "Cut selected events to the clipboard"
 msgstr "Recortar os eventos selecionados para a área de transferência"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:410
 msgid "Copy selected events to the clipboard"
 msgstr "Copiar os eventos selecionados para a área de transferência"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:416
 msgid "Paste events from the clipboard"
 msgstr "Colar os eventos da área de transferência"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Delete selected events"
 msgstr "Exclui os eventos selecionados"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:842
 #: ../calendar/gui/e-task-table.c:1063
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1703
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../plugins/itip-formatter/itip-formatter.c:2326
 msgid "Accepted"
 msgstr "Aceito"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1704
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../plugins/itip-formatter/itip-formatter.c:2332
 msgid "Declined"
 msgstr "Recusado"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1705
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Tentative"
 msgstr "Preliminar"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1706
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 #: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Delegated"
 msgstr "Representado"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1707
 msgid "Needs action"
 msgstr "Precisa de ação"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-calendar-view.c:1848 ../calendar/gui/e-memo-table.c:527
 #: ../calendar/gui/e-task-table.c:738
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -5107,20 +5111,20 @@ msgstr "Organizador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:532
 #: ../calendar/gui/e-task-table.c:741
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1868 ../calendar/gui/print.c:2600
 #, c-format
 msgid "Location: %s"
 msgstr "Local: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1899
 #, c-format
 msgid "Time: %s %s"
 msgstr "Data: %s %s"
@@ -5163,7 +5167,7 @@ msgstr "Mostrar o fuso horário secundário"
 #. 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:864 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1843
 #: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -5174,10 +5178,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1860
 #: ../calendar/gui/e-week-view-main-item.c:231
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:907
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5186,27 +5190,27 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
+#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1876
 #: ../calendar/gui/e-week-view-main-item.c:245
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:943
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1074 ../calendar/gui/e-week-view.c:742
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:745
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2573
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -5607,7 +5611,7 @@ msgid "Send Latest Information"
 msgstr "Enviar informação mais recente"
 
 #: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
+#: ../modules/mail/e-mail-shell-view-actions.c:966
 #: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "Cancelar"
@@ -5657,56 +5661,56 @@ msgid "Resources"
 msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Indivíduo"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Moderador"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Participante necessário"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Não participante"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "Necessita de ação"
 
@@ -5715,14 +5719,14 @@ msgstr "Necessita de ação"
 msgid "Attendee                          "
 msgstr "Participante                      "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2305
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -5731,7 +5735,7 @@ msgstr "%A, %d de %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2336
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5741,67 +5745,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Out of Office"
 msgstr "Fora do escritório"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "No Information"
 msgstr "Sem informação"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:565
 msgid "A_ttendees..."
 msgstr "Participa_ntes..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:586
 msgid "O_ptions"
 msgstr "O_pções"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "Mostrar apenas _horas de expediente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _zoomed out"
 msgstr "Mostrar com _menos ampliação"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "_Update free/busy"
 msgstr "_Atualizar disponibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:661
 msgid "_Autopick"
 msgstr "Auto_seleção"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:676
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:693
 msgid "_All people and resources"
 msgstr "Todas as _pessoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "All _people and one resource"
 msgstr "Todas as pessoas e um _recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "_Required people"
 msgstr "Pessoas _necessárias"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:719
 msgid "Required people and _one resource"
 msgstr "Pessoas necessárias e _um recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "_Hora de início:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "Hora de tér_mino:"
 
@@ -5830,7 +5834,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../modules/calendar/e-cal-shell-content.c:402
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5922,7 +5926,7 @@ msgstr "100%"
 #: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../modules/calendar/e-cal-shell-content.c:362
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
@@ -6063,16 +6067,16 @@ msgid "Gnome Calendar"
 msgstr "Agenda do GNOME"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:903
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
 #: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:919
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -6080,10 +6084,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:936
+#: ../modules/calendar/e-cal-shell-view-private.c:947
+#: ../modules/calendar/e-cal-shell-view-private.c:954
+#: ../modules/calendar/e-cal-shell-view-private.c:957
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -6113,7 +6117,7 @@ msgstr "exibição de agenda para um mês"
 msgid "calendar view for one or more weeks"
 msgstr "exibição de agenda para uma ou mais semanas"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2111
 msgid "Purging"
 msgstr "Excluindo permanentemente"
 
@@ -8478,7 +8482,8 @@ msgstr ""
 "parou."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 "O arquivo \"{0}\" não é um arquivo comum e não pode ser enviado em uma "
 "mensagem."
@@ -8500,7 +8505,8 @@ msgid "Unable to activate the address selector control."
 msgstr "Não foi possível ativar o controle seletor de endereços."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "Você não pode anexar o arquivo \"{0}\" à esta mensagem."
 
 #: ../composer/mail-composer.error.xml.h:22
@@ -8744,6 +8750,7 @@ msgid "Email Settings"
 msgstr "Configurações de e-mail"
 
 #: ../capplet/settings/mail-capplet-shell.c:334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "Quit"
 msgstr "Sair"
 
@@ -8753,7 +8760,7 @@ msgstr "Sair"
 #: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
 #: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1617
+#: ../mail/message-list.c:1614
 #: ../modules/addressbook/e-book-shell-backend.c:125
 #: ../modules/addressbook/e-book-shell-migrate.c:499
 #: ../modules/calendar/e-cal-shell-backend.c:121
@@ -8930,38 +8937,38 @@ msgid "Visual"
 msgstr "Visual"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
 #: ../plugins/itip-formatter/itip-view.c:195
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Hoje"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "Amanhã"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Ontem"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:210
 #, c-format
 msgid "%d days from now"
 msgstr "em %d dias"
 
-#: ../e-util/e-datetime-format.c:209
+#: ../e-util/e-datetime-format.c:212
 #, c-format
 msgid "%d days ago"
 msgstr "%d dias atrás"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
+#: ../e-util/e-datetime-format.c:305
 msgid "Use locale default"
 msgstr "Usar localização padrão"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:499
 msgid "Format:"
 msgstr "Formato:"
 
@@ -8986,11 +8993,11 @@ msgstr "Escrevendo \"%s\" para %s"
 msgid "Name of the logger"
 msgstr "Nome do componente logado"
 
-#: ../e-util/e-module.c:188
+#: ../e-util/e-module.c:194
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: ../e-util/e-module.c:189
+#: ../e-util/e-module.c:195
 msgid "The filename of the module"
 msgstr "O nome do arquivo deste módulo"
 
@@ -9016,7 +9023,7 @@ msgstr "Mensagens do log:"
 msgid "Log Level"
 msgstr "Nível do log"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2677
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensagens"
@@ -9105,11 +9112,11 @@ msgstr "Existe o arquivo \"{0}\"."
 msgid "_Overwrite"
 msgstr "S_obrescrever"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:171
 msgid "Could not open the link."
 msgstr "Não foi possível abrir o link."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:221
 msgid "Could not display help for Evolution."
 msgstr "Não foi possível exibir a ajuda do Evolution."
 
@@ -9128,14 +9135,14 @@ msgid "Reply-To"
 msgstr "Responder a"
 
 #: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../mail/em-format-html.c:2254 ../mail/em-format-html.c:2325
+#: ../mail/em-format-html.c:2362 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Cc"
 
 #: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../mail/em-format-html.c:2255 ../mail/em-format-html.c:2336
+#: ../mail/em-format-html.c:2369 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "CCO"
 
@@ -9147,7 +9154,7 @@ msgid "Subject"
 msgstr "Assunto"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2467
 #: ../modules/mail/em-mailer-prefs.c:1130
 msgid "Mailer"
 msgstr "Programa de correio"
@@ -9157,8 +9164,8 @@ msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensagem encaminhada --------"
 
 #: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Data"
 
@@ -9217,119 +9224,119 @@ msgstr "Não foi possível analisar a mensagem PGP"
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Não foi possível analisar a mensagem PGP: Erro desconhecido"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 segundo atrás"
 msgstr[1] "%d segundos atrás"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 segundo no futuro"
 msgstr[1] "%d segundos no futuro"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minuto atrás"
 msgstr[1] "%d minutos atrás"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 minuto no futuro"
 msgstr[1] "%d minutos no futuro"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 hora atrás"
 msgstr[1] "%d horas atrás"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 hora no futuro"
 msgstr[1] "%d horas no futuro"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dia atrás"
 msgstr[1] "%d dias atrás"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 dia no futuro"
 msgstr[1] "%d dias no futuro"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 semana atrás"
 msgstr[1] "%d semanas atrás"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 semana no futuro"
 msgstr[1] "%d semanas no futuro"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 mês atrás"
 msgstr[1] "%d meses atrás"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 mês no futuro"
 msgstr[1] "%d meses no futuro"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 ano atrás"
 msgstr[1] "%d anos atrás"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 ano no futuro"
 msgstr[1] "%d anos no futuro"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<clique aqui para selecionar uma data>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "agora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Selecionar um instante em relação ao qual comparar"
 
@@ -9530,7 +9537,7 @@ msgstr "Visualização de ícones"
 msgid "List View"
 msgstr "Visualização de listas"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
+#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:653
 msgid "Focus Tracker"
 msgstr "Foco do Tracker"
 
@@ -9538,7 +9545,7 @@ msgstr "Foco do Tracker"
 msgid "Shell Module"
 msgstr "Modulo Shell"
 
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
+#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2570
 msgid "The mail shell backend"
 msgstr "O backend do shell de correio"
 
@@ -9595,7 +9602,7 @@ msgid "_Later"
 msgstr "Mais _tarde"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:468
 msgid "Add Label"
 msgstr "Adicionar rótulo"
 
@@ -9673,18 +9680,18 @@ msgid "Migrating '%s':"
 msgstr "Migrando \"%s\":"
 
 #: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
+#, fuzzy, c-format
+msgid "Unable to create new folder '%s': %s"
 msgstr "Não foi possível criar nova pasta \"%s\": %s"
 
 #: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
+#, fuzzy, c-format
+msgid "Unable to copy folder '%s' to '%s': %s"
 msgstr "Não foi possível copiar a pasta \"%s\" para \"%s\": %s"
 
 #: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at '%s': %s"
 msgstr ""
 "Não foi possível varrer a procura de caixas de correio existentes em \"%s\": "
 "%s"
@@ -9706,24 +9713,24 @@ msgstr ""
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
 #: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data '%s': %s"
 msgstr "Não foi possível abrir dados antigos manter-no-servidor POP \"%s\": %s"
 
 #: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory '%s': %s"
 msgstr ""
 "Não foi possível criar diretório de dados manter-no-servidor POP3 \"%s\": %s"
 
 #: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#, fuzzy, c-format
+msgid "Unable to copy POP3 keep-on-server data '%s': %s"
 msgstr "Não foi possível copiar dados manter-no-servidor POP3 \"%s\": %s"
 
 #: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
+#, fuzzy, c-format
+msgid "Failed to create local mail storage '%s': %s"
 msgstr "Falha ao criar repositório local de correio \"%s\": %s"
 
 #: ../mail/e-mail-migrate.c:2934
@@ -9739,14 +9746,14 @@ msgstr ""
 "Por favor seja paciente enquanto o Evolution migra suas pastas..."
 
 #: ../mail/e-mail-migrate.c:3031
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Não foi possível criar pastas locais de correio em \"%s\": %s"
 
 #: ../mail/e-mail-migrate.c:3049
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
+"Unable to read settings from previous Evolution install, 'evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 "Não foi possível ler configurações de uma instalação anterior do Evolution, "
@@ -10096,7 +10103,7 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireciona (bounce) a mensagem selecionada para alguém"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "Responder a _todos"
@@ -10275,11 +10282,11 @@ msgstr "Todos os ca_beçalhos de mensagem"
 msgid "Show messages with all email headers"
 msgstr "Mostra a mensagem com todos os cabeçalhos de e-mail"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1878
 msgid "Unable to retrieve message"
 msgstr "Não foi possível obter a mensagem"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1943
 #: ../mail/mail-ops.c:1849
 #, c-format
 msgid "Retrieving message '%s'"
@@ -10287,7 +10294,7 @@ msgstr "Recuperando mensagem '%s'"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2457
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:534
 #: ../plugins/google-account-setup/google-source.c:656
@@ -10295,33 +10302,33 @@ msgstr "Recuperando mensagem '%s'"
 msgid "Default"
 msgstr "Padrão"
 
-#: ../mail/e-mail-reader.c:2588
+#: ../mail/e-mail-reader.c:2578
 #: ../modules/mail/e-mail-attachment-handler.c:134
 msgid "_Forward"
 msgstr "E_ncaminhar"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2579
 msgid "Forward the selected message to someone"
 msgstr "Encaminha a mensagem selecionada a alguém"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2623 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Excluir"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Próxima"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2635 ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "Responder"
 
@@ -10890,12 +10897,12 @@ msgstr "Movendo pasta %s"
 msgid "Copying folder %s"
 msgstr "Copiando pasta %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2099
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensagens para pasta %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2101
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensagens para pasta %s"
@@ -10914,8 +10921,8 @@ msgstr "Copiar pasta para"
 
 #: ../mail/em-folder-utils.c:507
 #: ../plugins/groupwise-features/share-folder-common.c:141
-#, c-format
-msgid "Creating folder `%s'"
+#, fuzzy, c-format
+msgid "Creating folder '%s'"
 msgstr "Criando pasta \"%s\""
 
 #: ../mail/em-folder-utils.c:670
@@ -10933,7 +10940,7 @@ msgstr "Especificar onde criar a pasta:"
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Cancelando a inscrição da pasta \"%s\""
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1547
 msgid "Unsigned"
 msgstr "Não assinada"
 
@@ -10945,7 +10952,7 @@ msgstr ""
 "Esta mensagem não está assinada. Não há garantias de que esta mensagem seja "
 "autêntica."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1548
 msgid "Valid signature"
 msgstr "Assinatura válida"
 
@@ -10957,7 +10964,7 @@ msgstr ""
 "Esta mensagem está assinada e é válida. É muito provável que esta mensagem "
 "seja autêntica."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1549
 msgid "Invalid signature"
 msgstr "Assinatura inválida"
 
@@ -10969,7 +10976,7 @@ msgstr ""
 "Não é possível verificar a assinatura desta mensagem. Ela pode ter sido "
 "alterada em trânsito."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1550
 msgid "Valid signature, but cannot verify sender"
 msgstr "Assinatura válida, mas não é possível verificar o remetente"
 
@@ -10981,7 +10988,7 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura válida, mas o remetente não "
 "pode ser verificado."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1551
 msgid "Signature exists, but need public key"
 msgstr "A assinatura existe, mas precisa de uma chave pública"
 
@@ -10993,7 +11000,7 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura, mas não há chave pública "
 "correspondente."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1557
 msgid "Unencrypted"
 msgstr "Não criptografada"
 
@@ -11005,7 +11012,7 @@ 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:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1558
 msgid "Encrypted, weak"
 msgstr "Criptografada, fraca"
 
@@ -11019,7 +11026,7 @@ 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:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1559
 msgid "Encrypted"
 msgstr "Criptografada"
 
@@ -11031,7 +11038,7 @@ msgstr ""
 "Esta mensagem está criptografada. Seria difícil que um estranho conseguisse "
 "ver o conteúdo desta mensagem."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1560
 msgid "Encrypted, strong"
 msgstr "Criptografada, forte"
 
@@ -11091,48 +11098,48 @@ msgstr "A_brir com"
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:166
 msgid "Formatting message"
 msgstr "Formatando mensagem"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:357
 msgid "Formatting Message..."
 msgstr "Formatando mensagem..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
-#, c-format
-msgid "Retrieving `%s'"
+#: ../mail/em-format-html.c:1398 ../mail/em-format-html.c:1407
+#, fuzzy, c-format
+msgid "Retrieving '%s'"
 msgstr "Buscando \"%s\""
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1866
 msgid "Unknown external-body part."
 msgstr "Parte external-body malformada."
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1874
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1904
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Ponteiro para site FTP (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1915
 #, 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:1905
+#: ../mail/em-format-html.c:1917
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Ponteiro para arquivo local (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1938
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ponteiro para dados remotos (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1949
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
@@ -11140,7 +11147,7 @@ msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2640
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Esta mensagem foi enviada por <b>%s</b> em nome de <b>%s</b>"
@@ -12288,7 +12295,7 @@ msgid "Select folder to import into"
 msgstr "Selecionar pasta para onde importar"
 
 #: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley mailbox (mbox)"
 
@@ -12304,8 +12311,8 @@ msgstr "Importando caixa de correio"
 #: ../mail/importers/mail-importer.c:155
 #: ../plugins/pst-import/pst-importer.c:456
 #: ../plugins/pst-import/pst-importer.c:562
-#, c-format
-msgid "Importing `%s'"
+#, fuzzy, c-format
+msgid "Importing '%s'"
 msgstr "Importando \"%s\""
 
 #: ../mail/importers/mail-importer.c:298
@@ -12475,7 +12482,8 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Assinar digitalmente mensagens enviadas (por padrão)"
 
 #: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
+#, fuzzy
+msgid "Displayed Message Headers"
 msgstr "Cabeçalhos das men_sagens exibidas"
 
 #: ../mail/mail-config.ui.h:37
@@ -13067,7 +13075,7 @@ msgstr "_Marca:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Marque aqui para acei_tar o acordo de licença"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:898
 #, c-format
 msgid "Pinging %s"
 msgstr "Chamando %s"
@@ -13087,17 +13095,17 @@ msgid "Failed to apply outgoing filters: %s"
 msgstr "Falha ao aplicar filtros de saída: %s"
 
 #: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "Falha ao acrescentar a %s: %s\n"
 "Acrescentando à pasta local \"Enviada\"."
 
 #: ../mail/mail-ops.c:641
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+#, fuzzy, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Falha ao acrescentar à pasta local \"Enviada\": %s"
 
 #: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
@@ -13321,13 +13329,13 @@ msgstr ""
 "mensagem foi cancelado."
 
 #: ../mail/mail-tools.c:123
-#, c-format
-msgid "Could not create spool directory `%s': %s"
+#, fuzzy, c-format
+msgid "Could not create spool directory '%s': %s"
 msgstr "Não foi possível criar o diretório de fila \"%s\": %s"
 
 #: ../mail/mail-tools.c:153
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+#, fuzzy, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Tentando executar movemail sobre uma fonte que não é mbox \"%s\""
 
 #: ../mail/mail-tools.c:259
@@ -13340,8 +13348,8 @@ msgid "Forwarded message"
 msgstr "Mensagem encaminhada"
 
 #: ../mail/mail-tools.c:301
-#, c-format
-msgid "Invalid folder: `%s'"
+#, fuzzy, c-format
+msgid "Invalid folder: '%s'"
 msgstr "Pasta inválida: \"%s\""
 
 #: ../mail/mail-vfolder.c:87
@@ -14010,7 +14018,7 @@ msgid "_Do not Synchronize"
 msgstr "_Não sincronizar"
 
 #: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../modules/mail/e-mail-shell-view-actions.c:817
 msgid "_Empty Trash"
 msgstr "Es_vaziar lixeira"
 
@@ -14022,86 +14030,86 @@ msgstr "_Excluir permanentemente"
 msgid "_Open Messages"
 msgstr "A_brir mensagens"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1119
 msgid "Unseen"
 msgstr "Não lida"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1120
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1121
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1122
 msgid "Forwarded"
 msgstr "Encaminhado"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1123
 msgid "Multiple Unseen Messages"
 msgstr "Várias mensagens não lidas"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1124
 msgid "Multiple Messages"
 msgstr "Várias mensagens"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1128
 msgid "Lowest"
 msgstr "Mínima"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1129
 msgid "Lower"
 msgstr "Menor"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1133
 msgid "Higher"
 msgstr "Maior"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1134
 msgid "Highest"
 msgstr "Máxima"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1744 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1751 ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1760
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1772
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1780
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1782
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2518
 msgid "Select all visible messages"
 msgstr "Seleciona todas as mensagens visíveis"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
+#: ../mail/message-list.c:2569 ../shell/e-shell-view.c:827
 msgid "Shell Backend"
 msgstr "Backend do Shell"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4155 ../mail/message-list.c:4557
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4390
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14109,15 +14117,7 @@ msgstr ""
 "Nenhuma mensagem satisfaz o seu critério de pesquisa. Limpe a pesquisa com o "
 "item de menu Pesquisar->Limpar ou altere-a."
 
-#: ../mail/message-list.c:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"Só existem mensagens ocultas nesta pasta. Use Ver->Mostrar mensagens ocultas "
-"para mostrá-las."
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4392
 msgid "There are no messages in this folder."
 msgstr "Não há mensagens nesta pasta."
 
@@ -14155,27 +14155,27 @@ msgid "Subject - Trimmed"
 msgstr "Assunto - cortado"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Body contains"
 msgstr "Corpo contém"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "Message contains"
 msgstr "Mensagem contém"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "Recipients contain"
 msgstr "Destinatários contêm"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "Sender contains"
 msgstr "Remetente contém"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "Subject contains"
 msgstr "Assunto contém"
 
@@ -14360,9 +14360,11 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "Mostrar o painel de visualização."
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Coluna da tabela:"
+#: ../modules/mail/em-mailer-prefs.c:1151
+msgid "_Table column:"
+msgstr "Coluna da _tabela:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -14446,14 +14448,14 @@ msgstr "O contato sendo exibido no painel de visualização"
 #: ../modules/addressbook/e-book-shell-content.c:384
 #: ../modules/calendar/e-memo-shell-content.c:617
 #: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
+#: ../modules/mail/e-mail-shell-content.c:685
 msgid "Preview is Visible"
 msgstr "A pré-visualização está visível"
 
 #: ../modules/addressbook/e-book-shell-content.c:385
 #: ../modules/calendar/e-memo-shell-content.c:618
 #: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
+#: ../modules/mail/e-mail-shell-content.c:686
 msgid "Whether the preview pane is visible"
 msgstr "Mostrar o painel de visualização"
 
@@ -14562,10 +14564,10 @@ msgid "Show properties of the selected address book"
 msgstr "Exibe as propriedades do catálogo de endereços selecionado"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
 #: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/mail/e-mail-shell-view-actions.c:901
 msgid "_Rename..."
 msgstr "_Renomear..."
 
@@ -14646,7 +14648,7 @@ msgid "Send a message to the selected contacts"
 msgstr "Envia uma mensagem aos contatos selecionados"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
 #: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "_Actions"
 msgstr "Açõe_s"
@@ -14654,12 +14656,12 @@ msgstr "Açõe_s"
 #: ../modules/addressbook/e-book-shell-view-actions.c:790
 #: ../modules/calendar/e-memo-shell-view-actions.c:647
 #: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/mail/e-mail-shell-view-actions.c:1024
 msgid "_Preview"
 msgstr "_Visualização"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
 #: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Delete"
@@ -14684,7 +14686,7 @@ msgstr "Mostra a janela de visualização de contatos"
 #: ../modules/addressbook/e-book-shell-view-actions.c:860
 #: ../modules/calendar/e-memo-shell-view-actions.c:717
 #: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/mail/e-mail-shell-view-actions.c:1118
 msgid "_Classic View"
 msgstr "Visão _clássica"
 
@@ -14695,7 +14697,7 @@ msgstr "Exibe a pré-visualização de contato abaixo da lista de contatos"
 #: ../modules/addressbook/e-book-shell-view-actions.c:867
 #: ../modules/calendar/e-memo-shell-view-actions.c:724
 #: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/mail/e-mail-shell-view-actions.c:1125
 msgid "_Vertical View"
 msgstr "Visão _vertical"
 
@@ -14704,25 +14706,25 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Exibe a pré-visualização de contato ao lado da lista de contatos"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
 #: ../modules/calendar/e-task-shell-view-actions.c:905
 msgid "Any Category"
 msgstr "Qualquer categoria"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
 #: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Unmatched"
 msgstr "Não combinadas"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
 #: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../shell/e-shell-content.c:438
 msgid "Advanced Search"
 msgstr "Pesquisa avançada"
 
@@ -14939,7 +14941,7 @@ msgid "_Appointment"
 msgstr "_Compromisso"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "Cria um novo compromisso"
 
@@ -14967,7 +14969,7 @@ msgid "Cale_ndar"
 msgstr "Age_nda"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "Cria uma nova agenda"
 
@@ -15002,8 +15004,8 @@ msgstr ""
 
 #. FIXME: domain/code
 #: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
+#, fuzzy, c-format
+msgid "Unable to migrate calendar '%s'"
 msgstr "Não é possível migrar agenda \"%s\""
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:167
@@ -15094,115 +15096,115 @@ msgstr "Evento"
 msgid "Save as iCalendar"
 msgstr "Salvar como iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "D_elete Calendar"
 msgstr "_Excluir calendário"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Delete the selected calendar"
 msgstr "Exclui o calendário selecionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Go Back"
 msgstr "Voltar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Go Forward"
 msgstr "Avançar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
 msgid "Select _Today"
 msgstr "Selecionar _hoje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "Seleciona o dia de hoje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "Selecionar _data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "Seleciona uma data específica"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "_Nova agenda"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 #: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Purg_e"
 msgstr "Excluir _permanentemente"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Purge old appointments and meetings"
 msgstr "Exclui permanentemente compromissos e reuniões antigas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
 #: ../modules/calendar/e-task-shell-view-actions.c:727
 msgid "Re_fresh"
 msgstr "Atuali_zar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Refresh the selected calendar"
 msgstr "Atualiza o calendário selecionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Rename the selected calendar"
 msgstr "Renomeia o calendário selecionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Show _Only This Calendar"
 msgstr "M_ostrar somente este calendário"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Cop_y to Calendar..."
 msgstr "Copiar para a A_genda..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reunião..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delete Appointment"
 msgstr "E_xcluir compromisso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete selected appointments"
 msgstr "Exclui os compromissos selecionados"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete This _Occurrence"
 msgstr "Exc_luir esta ocorrência"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "Exclui esta ocorrência"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete All Occ_urrences"
 msgstr "Excl_uir todas as ocorrências"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "Exclui todas as ocorrências"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "New All Day _Event..."
 msgstr "Novo _evento de dia inteiro..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Create a new all day event"
 msgstr "Cria um novo compromisso de dia inteiro"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
@@ -15210,124 +15212,124 @@ msgstr "Cria um novo compromisso de dia inteiro"
 msgid "_Forward as iCalendar..."
 msgstr "_Encaminhar como iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "New _Meeting..."
 msgstr "Nova _reunião..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Create a new meeting"
 msgstr "Cria uma nova reunião"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver para o calendário..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "Tor_nar esta ocorrência móvel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "_Abrir compromisso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "Ver o compromisso atual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Salvar como iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "Agendar _reunião..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Converte um compromisso em reunião"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_erter em compromisso..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Converte um encontro em um compromisso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "Dia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "Mostrar um dia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "Mostrar como uma lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "Mês"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "Mostrar um mês"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "Mostrar uma semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Show one work week"
 msgstr "Mostrar uma semana de trabalho"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "Compromissos ativos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "Compromissos dos próximos 7 dias"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
 #: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Description contains"
 msgstr "Descrição contém"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
 #: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Summary contains"
 msgstr "Resumo contém"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "Imprimir esta agenda"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 msgid "Preview the calendar to be printed"
 msgstr "Pré-visualiza o calendário a ser impresso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "Ir para"
 
@@ -15626,8 +15628,8 @@ msgstr ""
 
 #. FIXME: domain/code
 #: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
+#, fuzzy, c-format
+msgid "Unable to migrate tasks '%s'"
 msgstr "Não é possível migrar tarefas \"%s\""
 
 #: ../modules/calendar/e-task-shell-sidebar.c:221
@@ -15832,303 +15834,280 @@ msgstr "Preferências do redator"
 msgid "Network Preferences"
 msgstr "Preferências de rede"
 
-#: ../modules/mail/e-mail-shell-content.c:679
+#: ../modules/mail/e-mail-shell-content.c:675
 msgid "Group by Threads"
 msgstr "Agrupar por discussão"
 
-#: ../modules/mail/e-mail-shell-content.c:680
+#: ../modules/mail/e-mail-shell-content.c:676
 msgid "Whether to group messages by threads"
 msgstr "Agrupar mensagens por discussão"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:810
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "_Desabilitar conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:812
 msgid "Disable this account"
 msgstr "Desabilitar esta conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:819
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Remove permanentemente todas as mensagens excluídas em todas as pastas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:824
 msgid "C_reate Search Folder From Search..."
 msgstr "_Criar pasta de pesquisa a partir da pesquisa..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:831
 msgid "_Download Messages for Offline Usage"
 msgstr "Baixar mensagens para uso _desconectado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:833
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Baixa mensagens das contas e pastas marcadas como desconectadas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:838
 msgid "Fl_ush Outbox"
 msgstr "Limpar cai_xa de saída"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:845
 msgid "_Copy Folder To..."
 msgstr "_Copiar a pasta para..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:847
 msgid "Copy the selected folder into another folder"
 msgstr "Copia a pasta selecionada em outra pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:854
 msgid "Permanently remove this folder"
 msgstr "Remove permanentemente esta pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:859
 msgid "E_xpunge"
 msgstr "Exc_luir permanentemente"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:861
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Remove permanentemente todas as mensagens excluídas nesta pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:866
 msgid "Mar_k All Messages as Read"
 msgstr "Marcar mensagens como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:868
 msgid "Mark all messages in the folder as read"
 msgstr "Marca todas as mensagens nesta pasta e como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:873
 msgid "_Move Folder To..."
 msgstr "_Mover a pasta para..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:875
 msgid "Move the selected folder into another folder"
 msgstr "Move a pasta selecionada para outra pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:880
 msgid "_New..."
 msgstr "_Nova..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:882
 msgid "Create a new folder for storing mail"
 msgstr "Cria uma nova pasta para armazenar mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:889
 msgid "Change the properties of this folder"
 msgstr "Altera as propriedades desta pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:896
 msgid "Refresh the folder"
 msgstr "Atualiza a pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:903
 msgid "Change the name of this folder"
 msgstr "Altera o nome desta pasta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:908
 msgid "Select Message _Thread"
 msgstr "Selecionar a _discussão da mensagem"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:910
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Seleciona todas as mensagens no mesmo encadeamento que a mensagem selecionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:915
 msgid "Select Message S_ubthread"
 msgstr "Selecionar a _subdiscussão da mensagem"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:917
 msgid "Select all replies to the currently selected message"
 msgstr "Seleciona todas as respostas para a mensagem selecionada atualmente"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:922
 msgid "_Unsubscribe"
 msgstr "_Cancelar a inscrição"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:924
 msgid "Unsubscribe from the selected folder"
 msgstr "Cancela a inscrição da pasta selecionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:929
 msgid "Empty _Trash"
 msgstr "Esvaziar _lixeira"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:931
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Remove permanentemente todas as mensagens excluídas em todas as pastas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:936
 msgid "_New Label"
 msgstr "_novo Rótulo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:945
 msgid "N_one"
 msgstr "N_enhum"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "Oculta_r mensagens lidas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Oculta temporariamente todas as mensagens que já foram lidas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "Ocultar mensagens s_elecionadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "Oculta temporariamente as mensagens selecionadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "Mostrar Me_nsagens Ocultas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "Mostra as mensagens que tinham sido ocultadas temporariamente"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:968
 msgid "Cancel the current mail operation"
 msgstr "Cancela a operação de correio atual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:973
 msgid "Collapse All _Threads"
 msgstr "Agrupar _todas as discussões"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:975
 msgid "Collapse all message threads"
 msgstr "Agrupa todas as discussões"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:980
 msgid "E_xpand All Threads"
 msgstr "E_xpandir todas as discussões"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:982
 msgid "Expand all message threads"
 msgstr "Expande todas as discussões"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:987
 msgid "_Message Filters"
 msgstr "F_iltros de mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:989
 msgid "Create or edit rules for filtering new mail"
 msgstr "Cria ou edita as regras para filtragem de correio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:994
 msgid "Search F_olders"
 msgstr "P_astas de pesquisa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:996
 msgid "Create or edit search folder definitions"
 msgstr "Cria ou editar as definições da pasta de pesquisa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1001
 msgid "_Subscriptions..."
 msgstr "In_scrições..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1003
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Inscreve em ou cancela a inscrição de pastas em servidores remotos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1010
 msgid "F_older"
 msgstr "_Pasta"
 
 # Qualquer tecla de acesso vai colidir com outro item de menu
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1017
 msgid "_Label"
 msgstr "_Rótulo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1057
 msgid "_New Folder..."
 msgstr "_Nova pasta..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "Ocultar mensagens _excluídas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "Oculta as mensagens excluídas ao invés de exibi-las cortadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1081
 msgid "Show Message _Preview"
 msgstr "Visualizar _mensagem"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1083
 msgid "Show message preview pane"
 msgstr "Exibe o painel de pré-visualização de mensagem"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1089
+#, fuzzy
+msgid "Show _Deleted Messages"
+msgstr "Mostra mensagens excluídas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#, fuzzy
+msgid "Show deleted messages with a line through them"
+msgstr "Mostrar mensagens excluídas (com um risco) na lista de mensagens."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1097
 msgid "_Group By Threads"
 msgstr "Agrupar por _discussão"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
 msgid "Threaded message list"
 msgstr "Organiza a lista de mensagens por discussões"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1120
 msgid "Show message preview below the message list"
 msgstr "Visualiza a mensagem abaixo da lista de mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "Show message preview alongside the message list"
 msgstr "Exibe a pré-visualização de mensagem ao lado da lista de mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "All Messages"
 msgstr "Todas as mensagens"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1142
 msgid "Important Messages"
 msgstr "Mensagens importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
 msgid "Last 5 Days' Messages"
 msgstr "Mensagens dos últimos cinco dias"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
 msgid "Messages Not Junk"
 msgstr "Mensagens não spam"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1163
 msgid "Messages with Attachments"
 msgstr "Mensagens com anexo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1170
 msgid "No Label"
 msgstr "Sem rótulo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1177
 msgid "Read Messages"
 msgstr "Mensagens lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1184
 msgid "Recent Messages"
 msgstr "Mensagens recentes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
 msgid "Unread Messages"
 msgstr "Mensagem não lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "Subject or Addresses contain"
 msgstr "Assunto ou endereços contém"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1260
 msgid "Current Account"
 msgstr "Conta atual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1267
 msgid "Current Folder"
 msgstr "Pasta atual"
 
@@ -16262,11 +16241,6 @@ msgstr ""
 msgid "No junk plugin available"
 msgstr "Não há plug-in de Spam disponível"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "Coluna da _tabela:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
 #: ../modules/mail/em-mailer-prefs.c:1153
 msgid "_Date header:"
@@ -16605,7 +16579,8 @@ msgstr "Contatos de mensagem instantânea"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#, fuzzy
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Sincronizar as informações e as imagens dos contatos da lista de amigos do "
 "Pidgin"
@@ -19963,11 +19938,11 @@ msgstr "Estilo dos botões de janela"
 msgid "Window buttons are visible"
 msgstr "Botões de janela são visíveis"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:499 ../shell/e-shell-content.c:500
 msgid "Searches"
 msgstr "Pesquisas"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:541
 msgid "Save Search"
 msgstr "Salvar pesquisa"
 
@@ -19980,129 +19955,129 @@ msgstr "%ld KB"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "M_ostrar: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "Pesquisa_r: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr " em "
 
-#: ../shell/e-shell-switcher.c:448
+#: ../shell/e-shell-switcher.c:463
 msgid "Toolbar Style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../shell/e-shell-switcher.c:449
+#: ../shell/e-shell-switcher.c:464
 msgid "The switcher's toolbar style"
 msgstr "O estilo da barra de ferramenta do alternador"
 
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
+#: ../shell/e-shell-switcher.c:480 ../shell/e-shell-window.c:762
 msgid "Toolbar Visible"
 msgstr "A barra de ferramentas está visível"
 
-#: ../shell/e-shell-switcher.c:466
+#: ../shell/e-shell-switcher.c:481
 msgid "Whether the switcher is visible"
 msgstr "Alternador visível"
 
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Todos os arquivos"
 
-#: ../shell/e-shell-view.c:675
+#: ../shell/e-shell-view.c:779
 msgid "Switcher Action"
 msgstr "Ação do alternador"
 
-#: ../shell/e-shell-view.c:676
+#: ../shell/e-shell-view.c:780
 msgid "The switcher action for this shell view"
 msgstr "A ação do alternador para esta visão do shell"
 
-#: ../shell/e-shell-view.c:691
+#: ../shell/e-shell-view.c:795
 msgid "Page Number"
 msgstr "Número da página"
 
-#: ../shell/e-shell-view.c:692
+#: ../shell/e-shell-view.c:796
 msgid "The notebook page number of the shell view"
 msgstr "O número da página do caderno de notas para esta visão do shell"
 
-#: ../shell/e-shell-view.c:708
+#: ../shell/e-shell-view.c:812
 msgid "Search Rule"
 msgstr "Regra de pesquisa"
 
-#: ../shell/e-shell-view.c:709
+#: ../shell/e-shell-view.c:813
 msgid "Criteria for the current search results"
 msgstr "Critério para os atuais resultados da pesquisa"
 
-#: ../shell/e-shell-view.c:724
+#: ../shell/e-shell-view.c:828
 msgid "The EShellBackend for this shell view"
 msgstr "O EShellBackend para esta visão do shell"
 
-#: ../shell/e-shell-view.c:739
+#: ../shell/e-shell-view.c:843
 msgid "Shell Content Widget"
 msgstr "Shell de controle de conteúdo"
 
-#: ../shell/e-shell-view.c:740
+#: ../shell/e-shell-view.c:844
 msgid "The content widget appears in a shell window's right pane"
 msgstr ""
 "O controle de conteúdo irá aparecer em uma janela do shell no lado direito "
 "no painel"
 
-#: ../shell/e-shell-view.c:756
+#: ../shell/e-shell-view.c:860
 msgid "Shell Sidebar Widget"
 msgstr "Shell de controle da barra lateral"
 
-#: ../shell/e-shell-view.c:757
+#: ../shell/e-shell-view.c:861
 msgid "The sidebar widget appears in a shell window's left pane"
 msgstr ""
 "O controle de barra lateral irá aparecer em uma janela do shell no lado "
 "esquerdo no painel"
 
-#: ../shell/e-shell-view.c:772
+#: ../shell/e-shell-view.c:876
 msgid "Shell Taskbar Widget"
 msgstr "Shell de controle da barra de tarefas"
 
-#: ../shell/e-shell-view.c:773
+#: ../shell/e-shell-view.c:877
 msgid "The taskbar widget appears at the bottom of a shell window"
 msgstr ""
 "O controle de barra de tarefas irá aparecer na parte inferior de uma janela "
 "do shell"
 
-#: ../shell/e-shell-view.c:788
+#: ../shell/e-shell-view.c:892
 msgid "Shell Window"
 msgstr "Janela do shell"
 
-#: ../shell/e-shell-view.c:789
+#: ../shell/e-shell-view.c:893
 msgid "The window to which the shell view belongs"
 msgstr "A janela da qual a visão do shell irá pertencer"
 
-#: ../shell/e-shell-view.c:805
+#: ../shell/e-shell-view.c:909
 msgid "The key file holding widget state data"
 msgstr "O arquivo chave guardando o controle de estado dos dados"
 
-#: ../shell/e-shell-view.c:820
+#: ../shell/e-shell-view.c:924
 msgid "The title of the shell view"
 msgstr "O título da visão do shell"
 
-#: ../shell/e-shell-view.c:834
+#: ../shell/e-shell-view.c:938
 msgid "Current View ID"
 msgstr "Id da visão atual"
 
-#: ../shell/e-shell-view.c:835
+#: ../shell/e-shell-view.c:939
 msgid "The current GAL view ID"
 msgstr "Id da visão GAL atual"
 
@@ -20419,115 +20394,123 @@ msgid "Execute these search parameters"
 msgstr "Executar estes parâmetros de pesquisa"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:568
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/e-shell-window.c:616
+#: ../shell/e-shell-window.c:638
 msgid "Active Shell View"
 msgstr "Visão do shell ativo"
 
-#: ../shell/e-shell-window.c:617
+#: ../shell/e-shell-window.c:639
 msgid "Name of the active shell view"
 msgstr "Nome da visão do shell ativo   "
 
-#: ../shell/e-shell-window.c:632
+#: ../shell/e-shell-window.c:654
 msgid "The shell window's EFocusTracker"
 msgstr "A janela do shell EFocusTracker"
 
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
+#: ../shell/e-shell-window.c:668 ../shell/e-shell.c:802
 msgid "Geometry"
 msgstr "Geometria"
 
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
+#: ../shell/e-shell-window.c:669 ../shell/e-shell.c:803
 msgid "Initial window geometry string"
 msgstr "Expressão inicial da geometria da janela"
 
-#: ../shell/e-shell-window.c:662
+#: ../shell/e-shell-window.c:684
 msgid "Safe Mode"
 msgstr "Modo seguro"
 
-#: ../shell/e-shell-window.c:663
+#: ../shell/e-shell-window.c:685
 msgid "Whether the shell window is in safe mode"
 msgstr "Janela do shell no modo seguro"
 
-#: ../shell/e-shell-window.c:694
+#: ../shell/e-shell-window.c:716
 msgid "Sidebar Visible"
 msgstr "A barra lateral está visível"
 
-#: ../shell/e-shell-window.c:695
+#: ../shell/e-shell-window.c:717
 msgid "Whether the shell window's side bar is visible"
 msgstr "A barra lateral da janela do shell está visível"
 
-#: ../shell/e-shell-window.c:709
+#: ../shell/e-shell-window.c:731
 msgid "Switcher Visible"
 msgstr "o alternador está visível"
 
-#: ../shell/e-shell-window.c:710
+#: ../shell/e-shell-window.c:732
 msgid "Whether the shell window's switcher buttons are visible"
 msgstr "Os botões do alternador da janela do shell estão visíveis"
 
-#: ../shell/e-shell-window.c:725
+#: ../shell/e-shell-window.c:747
 msgid "Taskbar Visible"
 msgstr "Barra de status visível"
 
-#: ../shell/e-shell-window.c:726
+#: ../shell/e-shell-window.c:748
 msgid "Whether the shell window's task bar is visible"
 msgstr "A barra de tarefas da janela do shell está visível"
 
-#: ../shell/e-shell-window.c:741
+#: ../shell/e-shell-window.c:763
 msgid "Whether the shell window's tool bar is visible"
 msgstr "A barra de ferramentas da janela do shell está visível"
 
-#: ../shell/e-shell-window.c:755
+#: ../shell/e-shell-window.c:777
 msgid "UI Manager"
 msgstr "Gerenciador de UI"
 
-#: ../shell/e-shell-window.c:756
+#: ../shell/e-shell-window.c:778
 msgid "The shell window's GtkUIManager"
 msgstr "A janela do shell GtkUIManager"
 
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "Preparando para desconectar..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "Preparando para conectar..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "Preparando para sair..."
 
-#: ../shell/e-shell.c:819
+#: ../shell/e-shell.c:818
 msgid "Module Directory"
 msgstr "Diretório do módulo"
 
-#: ../shell/e-shell.c:820
+#: ../shell/e-shell.c:819
 msgid "The directory from which to load EModules"
 msgstr "O diretório da qual carregar os EModules"
 
-#: ../shell/e-shell.c:835
+#: ../shell/e-shell.c:834
 msgid "Network Available"
 msgstr "Rede disponível"
 
-#: ../shell/e-shell.c:836
+#: ../shell/e-shell.c:835
 msgid "Whether the network is available"
 msgstr "Se a rede está disponível"
 
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
+#: ../shell/e-shell.c:850 ../widgets/misc/e-online-button.c:134
 msgid "Online"
 msgstr "Conectado"
 
-#: ../shell/e-shell.c:852
+#: ../shell/e-shell.c:851
 msgid "Whether the shell is online"
 msgstr "Se o shell está conectado"
 
+#: ../shell/e-shell.c:866
+msgid "Shell Settings"
+msgstr "Configurações do Shell"
+
+#: ../shell/e-shell.c:867
+msgid "Application-wide settings"
+msgstr "Configurações de largura do aplicativo"
+
 # ajustei para ter o mesmo tamanho
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:168
@@ -20917,8 +20900,8 @@ msgid "Certificate Viewer: %s"
 msgstr "Visualizador de certificado: %s"
 
 #: ../smime/gui/component.c:46
-#, c-format
-msgid "Enter the password for `%s'"
+#, fuzzy, c-format
+msgid "Enter the password for '%s'"
 msgstr "Digite a senha para \"%s\""
 
 #. we're setting the password initially
@@ -21517,11 +21500,11 @@ msgstr "Tipo MIME:"
 msgid "_Suggest automatic display of attachment"
 msgstr "_Sugerir exibição automática do anexo"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "Não foi possível definir como imagem de fundo"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "Usar como Imagem de _Fundo"
 
@@ -21663,7 +21646,7 @@ msgid "Ctrl-click to open a link"
 msgstr "Clique pressionando o Ctrl para abrir um atalho"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21742,48 +21725,48 @@ msgstr "Digite o conjunto de caracteres a ser usado"
 msgid "Other..."
 msgstr "Outro..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Entrada de texto para digitar data"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Clique neste botão para mostrar uma agenda"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Caixa desdobrável de seleção para selecionar o horário"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "Agora"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "Hoje"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1918
 msgctxt "date"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1813
 msgid "Invalid Date Value"
 msgstr "Data inválida"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1857
 msgid "Invalid Time Value"
 msgstr "Hora inválida"
 
@@ -22196,41 +22179,41 @@ msgstr "O arquivo de script deve ser executável."
 msgid "Click here to go to URL"
 msgstr "Clicar aqui para ir para URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:360
 msgid "_Copy Link Location"
 msgstr "Copiar local do _link"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:362
 msgid "Copy the link to the clipboard"
 msgstr "Copia coisas para a área de transferência"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:370
 msgid "_Open Link in Browser"
 msgstr "Abrir atalho n_o navegador"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:372
 msgid "Open the link in a web browser"
 msgstr "Abrir o atalho em um navegador"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:380
 msgid "_Copy Email Address"
 msgstr "_Copiar endereço de e-mail"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:409 ../widgets/misc/e-web-view.c:1035
 msgid "Select all text and images"
 msgstr "Seleciona todo o texto e imagens"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:800 ../widgets/misc/e-web-view.c:802
+#: ../widgets/misc/e-web-view.c:804
 #, c-format
 msgid "Click to call %s"
 msgstr "Clique para chamar %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:806
 msgid "Click to hide/unhide addresses"
 msgstr "Clique para ocultar/mostrar endereços"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:808
 #, c-format
 msgid "Click to open %s"
 msgstr "Clique para abrir %s"
@@ -22805,6 +22788,41 @@ msgstr "Contexto do ME"
 msgid "Handle Popup"
 msgstr "Alça do popup"
 
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "Só existem mensagens ocultas nesta pasta. Use Ver->Mostrar mensagens "
+#~ "ocultas para mostrá-las."
+
+#~ msgid "Table column:"
+#~ msgstr "Coluna da tabela:"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Oculta_r mensagens lidas"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "Oculta temporariamente todas as mensagens que já foram lidas"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Ocultar mensagens s_elecionadas"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "Oculta temporariamente as mensagens selecionadas"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "Mostrar Me_nsagens Ocultas"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "Mostra as mensagens que tinham sido ocultadas temporariamente"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Ocultar mensagens _excluídas"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "Oculta as mensagens excluídas ao invés de exibi-las cortadas"
+
 #~ msgid "search bar"
 #~ msgstr "barra de pesquisa"
 
diff --git a/po/ro.po b/po/ro.po
index bf2ce084fa..cbd46059d0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,13 +7,11 @@
 # Mugurel Tudor <mugurelu@gnome.ro>, 2004-2006, 2007.
 # Adi Roiban https://launchpad.net/~adiroiban, 2008, 2009
 # Adi Roiban <adi@roiban.ro>, 2010.
-#: ../shell/main.c:479
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.ro\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=evolution\n"
-"POT-Creation-Date: 2010-03-21 21:02+0000\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n"
+"POT-Creation-Date: 2010-03-20 23:23+0000\n"
 "PO-Revision-Date: 2010-03-21 23:47+0200\n"
 "Last-Translator: Adi Roiban <adi@roiban.ro>\n"
 "Language-Team: GNOME Romanian Team\n"
@@ -21,27 +19,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2);;\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);;\n"
 "X-Generator: Virtaal 0.5.2\n"
 "X-Poedit-Bookmarks: 175,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
-"different address book from the side bar in the Contacts view."
-msgstr ""
-"„{0}� este o agendă doar pentru citire și nu poate fi modificată. Alegeți o "
-"altă agendă din bara laterată din vizualizarea Contacte."
+msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
+msgstr "„{0}� este o agendă doar pentru citire și nu poate fi modificată. Alegeți o altă agendă din bara laterată din vizualizarea Contacte."
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr ""
-"Un contact cu această adresă există deja. Doriți să adăugați totuși un nou "
-"card cu aceeași adresă?"
+msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgstr "Un contact cu această adresă există deja. Doriți să adăugați totuși un nou card cu aceeași adresă?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
@@ -60,15 +49,8 @@ msgid "Category editor not available."
 msgstr "Editorul de categorii nu este disponibil."
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Verificați faptul că parola dumneavoastră este scrisă corect și că utilizați "
-"o metodă de logare suportată. Nu uitați faptul că pentru multe parole "
-"conteaza faptul că sunt scrise cu majuscule sau nu, verificați dacă nu aveți "
-"cumva caps lock apăsat."
+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 "Verificați faptul că parola dumneavoastră este scrisă corect și că utilizați o metodă de logare suportată. Nu uitați faptul că pentru multe parole conteaza faptul că sunt scrise cu majuscule sau nu, verificați dacă nu aveți cumva caps lock apăsat."
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
@@ -79,14 +61,8 @@ msgid "Could not remove address book."
 msgstr "Nu am putut șterge agenda"
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
-"Momentan nu puteți accesa decât Sistemul de agende GroupWise din Evolution. "
-"Folosiți un alt client GroupWise, o singură dată, pentru a obține dosarele "
-"„Contacte frecvente GroupWise� și „Contacte personale GroupWise�."
+msgid "Currently you can only access the GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr "Momentan nu puteți accesa decât Sistemul de agende GroupWise din Evolution. Folosiți un alt client GroupWise, o singură dată, pentru a obține dosarele „Contacte frecvente GroupWise� și „Contacte personale GroupWise�."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -116,28 +92,19 @@ msgstr "Serverul LDAP nu a răspuns cu o schemă validă de informație."
 
 #: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
-msgstr ""
-"Unele facilități ar putea să nu funcționeze corect cu serverul dumneavoastră "
-"curent."
+msgstr "Unele facilități ar putea să nu funcționeze corect cu serverul dumneavoastră curent."
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Agenda Evolution s-a închis pe neașteptate."
 
 #: ../addressbook/addressbook.error.xml.h:20
-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 "Imaginea aleasă este mare. Doriți să o redimensionați și să o stocați?"
 
 #: ../addressbook/addressbook.error.xml.h:21
-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 ""
-"Acest server poate folosi o versiune mai veche de LDAP, ce nu suportă "
-"această funcționalitate, sau a fost configurat greșit. Consultați "
-"administratorul de sistem pentru căutările de bază suportate."
+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 "Acest server poate folosi o versiune mai veche de LDAP, ce nu suportă această funcționalitate, sau a fost configurat greșit. Consultați administratorul de sistem pentru căutările de bază suportate."
 
 #: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book could not be opened."
@@ -148,12 +115,8 @@ msgid "This address book server does not have any suggested search bases."
 msgstr "Acest server de agendă nu are nicio bază de căutare sugerată."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"Acest server de agende să nu poată fi contactat, numele serverului este "
-"ortografiat greșit sau conexiunea la rețea a căzut."
+msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
+msgstr "Acest server de agende să nu poată fi contactat, numele serverului este ortografiat greșit sau conexiunea la rețea a căzut."
 
 #: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
@@ -180,41 +143,27 @@ msgid "Would you like to save your changes?"
 msgstr "Doriți să salvați căutările?"
 
 #: ../addressbook/addressbook.error.xml.h:31
-msgid ""
-"You are attempting to move a contact from one address book to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"Încercați să mutați un contact dintr-o agendă în alta, dar nu poate fi mutat "
-"din sursă. Doriți să îl copiați?"
+msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
+msgstr "Încercați să mutați un contact dintr-o agendă în alta, dar nu poate fi mutat din sursă. Doriți să îl copiați?"
 
 #: ../addressbook/addressbook.error.xml.h:32
-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 ""
-"Vă conectați la un server GroupWise nesuportat și ați putea experimenta "
-"probleme folosind Evolution. Pentru cele mai bune rezultate serverul ar "
-"trebui actualizat la o versiune suportată"
+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 "Vă conectați la un server GroupWise nesuportat și ați putea experimenta probleme folosind Evolution. Pentru cele mai bune rezultate serverul ar trebui actualizat la o versiune suportată"
 
 #: ../addressbook/addressbook.error.xml.h:33
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Nu aveți permisiunea de a șterge contacte din această agendă."
 
 #: ../addressbook/addressbook.error.xml.h:34
-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 "Ați modificat acest contact. Doriți să salvați aceste schimbări?"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
-"Contactele dumneavoastră pentru {0} nu vor fi disponibile până când nu "
-"reporniți Evolution."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgstr "Contactele dumneavoastră pentru {0} nu vor fi disponibile până când nu reporniți Evolution."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:36
+#: ../mail/em-vfolder-rule.c:522
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -238,7 +187,8 @@ msgid "_Use as it is"
 msgstr "_Folosește ca atare"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
+#: ../addressbook/addressbook.error.xml.h:42
+#: ../mail/mail.error.xml.h:145
 msgid "{0}"
 msgstr "{0}"
 
@@ -259,12 +209,11 @@ msgstr "Nu s-a putut deschide agenda"
 #: ../addressbook/conduit/address-conduit.c:1709
 #: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
-msgstr ""
-"Nu s-a putut citi blocul de aplicație al adresei pentru dispozitivul pilot"
+msgstr "Nu s-a putut citi blocul de aplicație al adresei pentru dispozitivul pilot"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:1992
 msgid "Anniversary"
 msgstr "Aniversare"
 
@@ -275,7 +224,8 @@ msgstr "Aniversare"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
+#: ../calendar/gui/e-calendar-view.c:1991
+#: ../capplet/anjal-settings-main.c:119
 #: ../shell/main.c:112
 msgid "Birthday"
 msgstr "Ziua de naștere"
@@ -300,7 +250,7 @@ msgstr "Contact"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2520
 msgid "Contact Editor"
 msgstr "Editor de contacte"
 
@@ -310,7 +260,8 @@ msgstr "Editor de contacte"
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408
+#: ../smime/lib/e-cert.c:823
 msgid "Email"
 msgstr "Email"
 
@@ -369,7 +320,7 @@ msgstr "Note"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1700
 msgid "Other"
 msgstr "Alte"
 
@@ -504,7 +455,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_Zip/Cod poștal:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
+#: ../e-util/e-logger.c:174
+#: ../mail/e-mail-label-tree-view.c:96
 #: ../plugins/caldav/caldav-browse-server.c:1159
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
 #: ../plugins/plugin-manager/plugin-manager.c:58
@@ -524,7 +476,8 @@ msgstr "Nume"
 #: ../addressbook/gui/widgets/e-minicard-view.c:548
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
+#: ../widgets/table/e-cell-text.c:1659
+#: ../widgets/text/e-text.c:3441
 #: ../widgets/text/e-text.c:3442
 msgid "Editable"
 msgstr "Editabil"
@@ -607,20 +560,20 @@ msgid "Changed"
 msgstr "Schimbat"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2515
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contacte - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2912
 msgid "Please select an image for this contact"
 msgstr "Algeți o imagine pentru acest contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2913
 msgid "_No image"
 msgstr "Fără imagi_ne"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3186
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -628,23 +581,23 @@ msgstr ""
 "Datele de contact nu sunt valide:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s� nu are un format valid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3197
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s� nu are un format valid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3212
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3223
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s� este necompletat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3237
 msgid "Invalid contact."
 msgstr "Contact nevalid."
 
@@ -669,12 +622,14 @@ msgid "_Select Address Book"
 msgstr "_Selectați agenda"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
+#: ../shell/e-shell-backend.c:218
+#: ../shell/e-shell-window.c:683
 msgid "Shell"
 msgstr "Interpretor (shell)"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
+#: ../shell/e-shell-backend.c:219
+#: ../shell/e-shell-window.c:684
 msgid "The EShell singleton"
 msgstr "Singletonul EShell"
 
@@ -767,8 +722,7 @@ msgstr "_Alege..."
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"In_troduceți o adresă de email sau trageți contactul în lista de mai jos:"
+msgstr "In_troduceți o adresă de email sau trageți contactul în lista de mai jos:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
 msgid "Contact List Members"
@@ -817,12 +771,8 @@ msgid "Duplicate Contact Detected"
 msgstr "Contact duplicat detectat"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
-msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
-msgstr ""
-"În acest dosar există deja un contact cu acest  nume sau adresa email. "
-"Dorești să îl mai adaugi?"
+msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
+msgstr "În acest dosar există deja un contact cu acest  nume sau adresa email. Dorești să îl mai adaugi?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -850,10 +800,11 @@ msgid "Merge Contact"
 msgstr "Combină Contact"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1648
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
 #: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Any field contains"
@@ -898,13 +849,15 @@ msgstr "Căutare întreruptă"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
 #: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
+#: ../calendar/gui/e-memo-table.c:1053
+#: ../calendar/gui/e-task-table.c:1352
 #: ../modules/calendar/e-memo-shell-content.c:607
 #: ../modules/calendar/e-task-shell-content.c:629
 #: ../widgets/table/e-table-click-to-add.c:511
 #: ../widgets/table/e-table-selection-model.c:302
 #: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
+#: ../widgets/table/e-tree-selection-model.c:817
+#: ../widgets/text/e-text.c:3308
 #: ../widgets/text/e-text.c:3309
 msgid "Model"
 msgstr "Model"
@@ -935,7 +888,8 @@ msgid "Select all visible contacts"
 msgstr "Selectează toate contactele vizibile"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
+#: ../calendar/gui/e-memo-table.c:1070
+#: ../calendar/gui/e-task-table.c:1369
 msgid "Shell View"
 msgstr "Vizualizare shell"
 
@@ -1142,7 +1096,7 @@ msgid "Telex"
 msgstr "Telex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
+#: ../shell/e-shell-view.c:822
 msgid "Title"
 msgstr "Titlu"
 
@@ -1156,28 +1110,34 @@ msgstr "Site web"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-canvas-vbox.c:83
+#: ../widgets/misc/e-canvas-vbox.c:84
 #: ../widgets/table/e-table-click-to-add.c:525
 #: ../widgets/table/e-table-col.c:121
 #: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-container.c:1003
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/table/e-table-item.c:2891
+#: ../widgets/table/e-table-item.c:2892
+#: ../widgets/text/e-text.c:3483
+#: ../widgets/text/e-text.c:3484
 msgid "Width"
 msgstr "Lățime"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-canvas-vbox.c:95
+#: ../widgets/misc/e-canvas-vbox.c:96
 #: ../widgets/table/e-table-click-to-add.c:532
 #: ../widgets/table/e-table-group-container.c:995
 #: ../widgets/table/e-table-group-container.c:996
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
+#: ../widgets/table/e-table-item.c:2897
+#: ../widgets/table/e-table-item.c:2898
+#: ../widgets/text/e-text.c:3490
+#: ../widgets/text/e-text.c:3491
 msgid "Height"
 msgstr "Înălțime"
 
@@ -1381,7 +1341,7 @@ msgstr "Chat video"
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
+#: ../modules/calendar/e-cal-shell-view.c:495
 #: ../plugins/groupwise-features/camel-gw-listener.c:420
 #: ../plugins/groupwise-features/camel-gw-listener.c:445
 #: ../plugins/groupwise-features/camel-gw-listener.c:560
@@ -1427,7 +1387,8 @@ msgstr "Blog"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
+#: ../capplet/settings/mail-capplet-shell.c:461
+#: ../mail/e-mail-migrate.c:962
 #: ../modules/addressbook/e-book-shell-backend.c:175
 #: ../modules/addressbook/e-book-shell-migrate.c:507
 #: ../modules/calendar/e-cal-shell-backend.c:171
@@ -1511,9 +1472,11 @@ msgstr "Protocol nesuportat"
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717
+#: ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230
+#: ../calendar/gui/e-task-table.c:584
 #: ../calendar/gui/print.c:2651
 msgid "Canceled"
 msgstr "Anulat"
@@ -1565,41 +1528,21 @@ msgid "Unsupported authentication method"
 msgstr "Metodă de autentificare nesuportată"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:107
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Această agendă nu poate fi deschisă. Sau agenda nu este marcată pentru "
-"utilizare deconectată, sau nu este încă descărcată pentru utilizare "
-"deconectată. Încărcați din nou agenda în modul conectat pentru a-i descărca "
-"conținutul."
+msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
+msgstr "Această agendă nu poate fi deschisă. Sau agenda nu este marcată pentru utilizare deconectată, sau nu este încă descărcată pentru utilizare deconectată. Încărcați din nou agenda în modul conectat pentru a-i descărca conținutul."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"Această agendă nu poate fi deschisă. Verificați că există calea %s și că "
-"drepturile de acces permit accesarea ei."
+msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
+msgstr "Această agendă nu poate fi deschisă. Verificați că există calea %s și că drepturile de acces permit accesarea ei."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:128
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"Această versiune de Evolution nu are suport de LDAP compilat. Pentru a "
-"folosi LDAP în Evolution trebuie instalat un pachet Evolution cu LDAP "
-"activat."
+msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr "Această versiune de Evolution nu are suport de LDAP compilat. Pentru a folosi LDAP în Evolution trebuie instalat un pachet Evolution cu LDAP activat."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:137
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"Această agendă nu poate fi deschisă. S-a introdus un URI incorect sau nu se "
-"poate contacta serverul."
+msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
+msgstr "Această agendă nu poate fi deschisă. S-a introdus un URI incorect sau nu se poate contacta serverul."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
@@ -1676,7 +1619,8 @@ msgstr "Afișare card"
 #: ../addressbook/importers/evolution-ldif-importer.c:516
 #: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685
+#: ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "Se importă..."
 
@@ -1759,23 +1703,16 @@ msgid "Export in asynchronous mode"
 msgstr "Exportă în mod asincron"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:59
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
-msgstr ""
-"Numărul de cărți dintr-un fișier de ieșiri în mod asincron, dimensiune "
-"implicită 100."
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
+msgstr "Numărul de cărți dintr-un fișier de ieșiri în mod asincron, dimensiune implicită 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "NUMBER"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:101
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Eroare la argumentele din linia de comandă, folosiți opțiunea --help pentru "
-"a vedea utilizarea corectă."
+msgid "Command line arguments error, please use --help option to see the usage."
+msgstr "Eroare la argumentele din linia de comandă, folosiți opțiunea --help pentru a vedea utilizarea corectă."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
@@ -1819,87 +1756,53 @@ msgstr "Introduceți parola"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"'{0}' este un calendar protejat la scriere și nu poate fi modificat. "
-"Selectați un calendar diferit din bara laterală din Calendar."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
+msgstr "'{0}' este un calendar protejat la scriere și nu poate fi modificat. Selectați un calendar diferit din bara laterală din Calendar."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
-msgstr ""
-"'{0}' este un calendar protejat la scriere și nu poate fi modificat. "
-"Selectați un calendar diferit care poate accepta introducerea de întâlniri."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
+msgstr "'{0}' este un calendar protejat la scriere și nu poate fi modificat. Selectați un calendar diferit care poate accepta introducerea de întâlniri."
 
 #: ../calendar/calendar.error.xml.h:5
-msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
-msgstr ""
-"Adăugând un sumar reprezentativ la această întâlnire veți ajuta destinatarii "
-"să înțeleagă scopul acesteia."
+msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
+msgstr "Adăugând un sumar reprezentativ la această întâlnire veți ajuta destinatarii să înțeleagă scopul acesteia."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
-msgstr ""
-"Adăugând un sumar reprezentativ la această sarcină veți ajuta destinatarii "
-"să înțeleagă scopul acesteia."
+msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
+msgstr "Adăugând un sumar reprezentativ la această sarcină veți ajuta destinatarii să înțeleagă scopul acesteia."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
-msgstr ""
-"Toate informațille din aceste notițe vor fi șterse și se vor putea recupera."
+msgstr "Toate informațille din aceste notițe vor fi șterse și se vor putea recupera."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
-msgstr ""
-"Toate informațille din această notiță vor fi șterse și se vor putea recupera."
+msgstr "Toate informațille din această notiță vor fi șterse și se vor putea recupera."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr ""
-"Toate informațiile despre aceste întâlniri vor fi șterse și nu vor mai putea "
-"fi restaurate."
+msgid "All information on these appointments will be deleted and can not be restored."
+msgstr "Toate informațiile despre aceste întâlniri vor fi șterse și nu vor mai putea fi restaurate."
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"Toate informațiile despre aceste sarcini vor fi șterse și nu vor mai putea "
-"fi restaurate."
+msgstr "Toate informațiile despre aceste sarcini vor fi șterse și nu vor mai putea fi restaurate."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"Toate informațiile despre această întâlnire vor fi șterse și nu vor mai "
-"putea fi restaurate."
+msgid "All information on this appointment will be deleted and can not be restored."
+msgstr "Toate informațiile despre această întâlnire vor fi șterse și nu vor mai putea fi restaurate."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr ""
-"Toate informațiile despre această ședință vor fi șterse și nu vor putea fi "
-"restaurate."
+msgid "All information on this meeting will be deleted and can not be restored."
+msgstr "Toate informațiile despre această ședință vor fi șterse și nu vor putea fi restaurate."
 
 #: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
-msgstr ""
-"Toate informațille despre această notiță vor fi șterse și se vor putea "
-"recupera."
+msgstr "Toate informațille despre această notiță vor fi șterse și se vor putea recupera."
 
 #: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
-"Toate informațiile despre această sarcină vor fi șterse și nu vor mai putea "
-"fi restaurate."
+msgstr "Toate informațiile despre această sarcină vor fi șterse și nu vor mai putea fi restaurate."
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
@@ -2004,19 +1907,12 @@ msgid "Editor could not be loaded."
 msgstr "Editorul nu a putut fi încărcat."
 
 #: ../calendar/calendar.error.xml.h:39
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"Invitații vor fi trimise prin email tuturor participanților și li se va "
-"permite să accepte această sarcină."
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgstr "Invitații vor fi trimise prin email tuturor participanților și li se va permite să accepte această sarcină."
 
 #: ../calendar/calendar.error.xml.h:40
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
-msgstr ""
-"Invitațiile vor fi trimise prin email tuturor participanților și li se va "
-"permite să răspundă."
+msgid "Email invitations will be sent to all participants and allow them to reply."
+msgstr "Invitațiile vor fi trimise prin email tuturor participanților și li se va permite să răspundă."
 
 #: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
@@ -2036,70 +1932,40 @@ msgid "Error on '{0}'"
 msgstr "Eroare la '{0}'"
 
 #: ../calendar/calendar.error.xml.h:46
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
-msgstr ""
-"Dacă nu trimiteți o notificare de anulare, ceilalți participanți nu vor afla "
-"că ședința s-a anulat."
+msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+msgstr "Dacă nu trimiteți o notificare de anulare, ceilalți participanți nu vor afla că ședința s-a anulat."
 
 #: ../calendar/calendar.error.xml.h:47
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
-msgstr ""
-"Dacă nu trimiți o notă de anulare, ceilalți participanți nu vor ști de "
-"ștergerea ei."
+msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
+msgstr "Dacă nu trimiți o notă de anulare, ceilalți participanți nu vor ști de ștergerea ei."
 
 #: ../calendar/calendar.error.xml.h:48
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
-msgstr ""
-"Dacă nu trimiteți o notificare de anulare, ceilalți participanți nu vor afla "
-"că sarcina a fost ștearsă."
+msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
+msgstr "Dacă nu trimiteți o notificare de anulare, ceilalți participanți nu vor afla că sarcina a fost ștearsă."
 
 #: ../calendar/calendar.error.xml.h:49
 msgid "No response from the server."
 msgstr "Nici un răspuns de la server."
 
 #: ../calendar/calendar.error.xml.h:50
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr ""
-"Trimiterea informațiilor actualizate va permite celorlalți participanți să "
-"aibă calendarele actualizate."
+msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgstr "Trimiterea informațiilor actualizate va permite celorlalți participanți să aibă calendarele actualizate."
 
 #: ../calendar/calendar.error.xml.h:51
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr ""
-"Trimiterea informațiilor actualizate va permite celorlalți participanți să "
-"aibă lista de sarcini actualizată."
+msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgstr "Trimiterea informațiilor actualizate va permite celorlalți participanți să aibă lista de sarcini actualizată."
 
 #: ../calendar/calendar.error.xml.h:52
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr ""
-"Câteva atașamente se transferă. Salvarea întâlnirii va determina pierderea "
-"acestor atașamente."
+msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+msgstr "Câteva atașamente se transferă. Salvarea întâlnirii va determina pierderea acestor atașamente."
 
 #: ../calendar/calendar.error.xml.h:53
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr ""
-"Câteva atașamente ce transferă. Salvarea sarcinii va determina pierderea "
-"acestor atașamente."
+msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+msgstr "Câteva atașamente ce transferă. Salvarea sarcinii va determina pierderea acestor atașamente."
 
 #: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
-msgstr ""
-"Unele facilități ar putea să nu funcționeze corect cu serverul dumneavoastră "
-"curent."
+msgstr "Unele facilități ar putea să nu funcționeze corect cu serverul dumneavoastră curent."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
@@ -2179,23 +2045,15 @@ msgstr "Doriți să trimiteți această sarcină participanților?"
 
 #: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
-"Doriți să trimiteți participanților informații actualizate despre ședință?"
+msgstr "Doriți să trimiteți participanților informații actualizate despre ședință?"
 
 #: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send updated task information to participants?"
-msgstr ""
-"Doriți să trimiteți participanților informații actualizate despre sarcină?"
+msgstr "Doriți să trimiteți participanților informații actualizate despre sarcină?"
 
 #: ../calendar/calendar.error.xml.h:76
-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 ""
-"Vă conectați la un server GroupWise nesuportat și ați putea experimenta "
-"probleme folosind Evolution. Pentru cele mai bune rezultate serverul ar "
-"trebui actualizat la o versiune suportată."
+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 "Vă conectați la un server GroupWise nesuportat și ați putea experimenta probleme folosind Evolution. Pentru cele mai bune rezultate serverul ar trebui actualizat la o versiune suportată."
 
 #: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this appointment, but not yet saved it."
@@ -2215,28 +2073,23 @@ msgstr "Ați modificat acestă notiță, dar nu ați salvat-o încă."
 
 #: ../calendar/calendar.error.xml.h:81
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr ""
-"Calendarele dumneavoastră nu vor fi disponibile până când Evolution nu va fi "
-"repornit."
+msgstr "Calendarele dumneavoastră nu vor fi disponibile până când Evolution nu va fi repornit."
 
 #: ../calendar/calendar.error.xml.h:82
 msgid "Your memos will not be available until Evolution is restarted."
-msgstr ""
-"Notițe dumneavoastră nu vor fi disponibile până când Evolution nu va fi "
-"repornit."
+msgstr "Notițe dumneavoastră nu vor fi disponibile până când Evolution nu va fi repornit."
 
 #: ../calendar/calendar.error.xml.h:83
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr ""
-"Sarcinile dumneavoastră nu vor fi disponibile până când Evolution nu va fi "
-"repornit."
+msgstr "Sarcinile dumneavoastră nu vor fi disponibile până când Evolution nu va fi repornit."
 
 #: ../calendar/calendar.error.xml.h:84
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "Anulează mo_dificările"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:85
+#: ../composer/e-composer-actions.c:307
 msgid "_Save"
 msgstr "_Salvează"
 
@@ -2245,7 +2098,8 @@ msgid "_Save Changes"
 msgstr "_Salvează modificările"
 
 #: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../composer/mail-composer.error.xml.h:28
+#: ../mail/mail.error.xml.h:144
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Trimite"
@@ -2346,7 +2200,8 @@ msgstr "A_nulează"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
 #: ../calendar/gui/dialogs/comp-editor.c:1016
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
+#: ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:152
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../shell/e-shell-window-actions.c:1621
@@ -2360,7 +2215,8 @@ msgstr "_Amână"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+#: ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 msgid "hours"
@@ -2372,8 +2228,10 @@ msgstr "locația întâlnirii"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
-#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+#: ../e-util/e-plugin-util.c:422
+#: ../filter/filter.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "minutes"
 msgstr "minute"
@@ -2418,15 +2276,13 @@ msgstr ""
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #, 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 ""
-"O reamintire a calendarului Evolution este pe cale de a se declanșa. Această "
-"reamintire este configurată să ruleze următorul program:\n"
+"O reamintire a calendarului Evolution este pe cale de a se declanșa. Această reamintire este configurată să ruleze următorul program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -2441,7 +2297,8 @@ msgid "invalid time"
 msgstr "timp nevalid"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/alarm-notify/util.c:69
+#: ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -2451,7 +2308,8 @@ msgstr[1] "%d ore"
 msgstr[2] "%d de ore"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/alarm-notify/util.c:75
+#: ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2463,7 +2321,8 @@ msgstr[2] "%d de minute"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/alarm-notify/util.c:79
+#: ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2502,11 +2361,8 @@ msgid "Check this to use system timezone in Evolution."
 msgstr "Bifați pentru a folosi în Evolution fusul orar al sistemului."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Culoare pentru desenarea liniei Marcus Bains în bara de timp (implicit "
-"goală)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Culoare pentru desenarea liniei Marcus Bains în bara de timp (implicit goală)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
@@ -2526,9 +2382,7 @@ msgstr "Numărul de recurențe pentru un nou eveniment. -1 înseamnă permanent.
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr ""
-"Zilele pentru care orele de început și sfârșit al perioadei de muncă ar "
-"trebui să fie indicate."
+msgstr "Zilele pentru care orele de început și sfârșit al perioadei de muncă ar trebui să fie indicate."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
@@ -2588,31 +2442,23 @@ msgstr "Poziție orizontală a panoului"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr ""
-"Ora la care se termină ziua de lucru, în formatul de 24 de ore, de la 0 la "
-"23."
+msgstr "Ora la care se termină ziua de lucru, în formatul de 24 de ore, de la 0 la 23."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr ""
-"Ora la care începe ziua de lucru, în formatul de 24 de ore, de la 0 la 23."
+msgstr "Ora la care începe ziua de lucru, în formatul de 24 de ore, de la 0 la 23."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the memo preview pane in the main window."
-msgstr ""
-"Dacă este definit ca „true�, arată panoul de previzualizare notițe în "
-"fereastra principală."
+msgstr "Dacă este definit ca „true�, arată panoul de previzualizare notițe în fereastra principală."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "If \"true\", show the task preview pane in the main window."
-msgstr ""
-"Dacă este definit ca „true�, arată panoul de previzualizare sarcini în "
-"fereastra principală."
+msgstr "Dacă este definit ca „true�, arată panoul de previzualizare sarcini în fereastra principală."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"Intervale afișate în vizualizările zi și săptămână de lucru, în minute."
+msgstr "Intervale afișate în vizualizările zi și săptămână de lucru, în minute."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Last alarm time"
@@ -2644,12 +2490,8 @@ msgid "Marcus Bains Line Color - Time bar"
 msgstr "Culoare linie Marcus Bains - bară de timp"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr ""
-"Numărul maxim de fusuri orare folosite recent reținute într-o listă "
-"„day_second_zones�."
+msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
+msgstr "Numărul maxim de fusuri orare folosite recent reținute într-o listă „day_second_zones�."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Maximum number of recently used timezones to remember."
@@ -2696,60 +2538,36 @@ msgid "Overdue tasks color"
 msgstr "Culoarea pentru sarcini restante"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
-"Poziția panoului orizontal, între calendar și lista de sarcini și când nu "
-"este selectată afișarea lunii, în pixeli."
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+msgstr "Poziția panoului orizontal, între calendar și lista de sarcini și când nu este selectată afișarea lunii, în pixeli."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"Poziția panoului orizontal, între calendar și lista de sarcini și când este "
-"selectată afișarea lunii, în pixeli."
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "Poziția panoului orizontal, între calendar și lista de sarcini și când este selectată afișarea lunii, în pixeli."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the memo preview pane when oriented vertically."
-msgstr ""
-"Poziția panoului de previzualizare notițe, atunci când este orientat "
-"vertical."
+msgstr "Poziția panoului de previzualizare notițe, atunci când este orientat vertical."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented horizontally."
-msgstr ""
-"Poziția panoului de previzualizare sarcini, atunci când este orientat "
-"orizonatl."
+msgstr "Poziția panoului de previzualizare sarcini, atunci când este orientat orizonatl."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Position of the task preview pane when oriented vertically."
-msgstr ""
-"Poziția panoului de previzualizare sarcini, atunci când este orientat "
-"vertical."
+msgstr "Poziția panoului de previzualizare sarcini, atunci când este orientat vertical."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
 msgstr "Poziția panoului vertical, între listele de calendare și calendar."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"Poziția panoului vertical, între calendar și lista de sarcini în afișarea "
-"lunii, în pixeli."
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "Poziția panoului vertical, între calendar și lista de sarcini în afișarea lunii, în pixeli."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-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 ""
-"Poziția panoului vertical, între calendar și lista de sarcini când nu este "
-"selectată afișarea lunii, în pixeli."
+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 "Poziția panoului vertical, între calendar și lista de sarcini când nu este selectată afișarea lunii, în pixeli."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary calendar"
@@ -2789,8 +2607,7 @@ msgstr "Afișează câmpul Rol în editorul evenimente/sarcini/ședințe"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show appointment end times in week and month views"
-msgstr ""
-"Afișează termenul de final al întâlnirilor la afișarea săptămânii și lunii"
+msgstr "Afișează termenul de final al întâlnirilor la afișarea săptămânii și lunii"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show categories field in the event/meeting/task editor"
@@ -2829,12 +2646,8 @@ msgid "Show week numbers in date navigator"
 msgstr "Afișează numărul de săptămâni în navigatorul pentru date"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
-"Arată fusul orar secundar în vizualizare Zi, dacă acesta este definit. "
-"Valoarea este asemănătoare cu cea folosită în cheia „timezone�."
+msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
+msgstr "Arată fusul orar secundar în vizualizare Zi, dacă acesta este definit. Valoarea este asemănătoare cu cea folosită în cheia „timezone�."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task layout style"
@@ -2854,54 +2667,28 @@ msgstr "Culoarea pentru sarcinile scadente azi"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 #, 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 ""
-"Șablonul URL de folosit ca fallback pentru situații de disponibil/ocupat, %u "
-"este înlocuit de partea utilizator a adresei de mail și %d de către domeniu."
+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 "Șablonul URL de folosit ca fallback pentru situații de disponibil/ocupat, %u este înlocuit de partea utilizator a adresei de mail și %d de către domeniu."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
-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 ""
-"Fusul orar implicit folosit pentru date și timpi în calendar, ca o bază de "
-"date de timp netradusă Olsen, de tip „America/New York�."
+msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
+msgstr "Fusul orar implicit folosit pentru date și timpi în calendar, ca o bază de date de timp netradusă Olsen, de tip „America/New York�."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-"Stilul aranjamentului determină locul unde să fie plasat panoul de "
-"previzualizare în relație cu lista de notițe. „0� (vizualizare clasică) "
-"plasează panoul de previzualizare sub lista de notițe. „1� (vizualizare "
-"verticală) plasează panoul de previzualizare lângă lista de notițe."
+msgid "The layout style determines where to place the preview pane in relation to the memo list. \"0\" (Classic View) places the preview pane below the memo list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr "Stilul aranjamentului determină locul unde să fie plasat panoul de previzualizare în relație cu lista de notițe. „0� (vizualizare clasică) plasează panoul de previzualizare sub lista de notițe. „1� (vizualizare verticală) plasează panoul de previzualizare lângă lista de notițe."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
-"Stilul aranjamentului determină locul unde să fie plasat panoul de "
-"previzualizare în relație cu lista de sarcini. „0� (vizualizare clasică) "
-"plasează panoul de previzualizare sub lista de sarcini. „1� (vizualizare "
-"verticală) plasează panoul de previzualizare lângă lista de sarcini."
+msgid "The layout style determines where to place the preview pane in relation to the task list. \"0\" (Classic View) places the preview pane below the task list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr "Stilul aranjamentului determină locul unde să fie plasat panoul de previzualizare în relație cu lista de sarcini. „0� (vizualizare clasică) plasează panoul de previzualizare sub lista de sarcini. „1� (vizualizare verticală) plasează panoul de previzualizare lângă lista de sarcini."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "The second timezone for a Day View"
 msgstr "Al doilea fus orar pentru vizualizarea pe zi"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
-"Aceasta poate avea trei valori. 0 pentru erori. 1 pentru avertizări. 2 "
-"pentru mesaje de depanare."
+msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+msgstr "Aceasta poate avea trei valori. 0 pentru erori. 1 pentru avertizări. 2 pentru mesaje de depanare."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time divisions"
@@ -2916,12 +2703,8 @@ msgid "Timezone"
 msgstr "Fus orar"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
-msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
-msgstr ""
-"Transparența evenimentelor în vizualizarea calendar, o valoare între 0 "
-"(transparent) și 1 (opac)."
+msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
+msgstr "Transparența evenimentelor în vizualizarea calendar, o valoare între 0 (transparent) și 1 (opac)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Twenty four hour time format"
@@ -2944,11 +2727,8 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Unități pentru reamintirea implicită, „minutes�, „hours� sau „days�."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Unități pentru determinarea momentului ascunderii sarcinilor, „minutes�, "
-"„hours� sau „days�."
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "Unități pentru determinarea momentului ascunderii sarcinilor, „minutes�, „hours� sau „days�."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use system timezone"
@@ -2956,8 +2736,7 @@ msgstr "Folosește fusul orar al sistemului"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr ""
-"Folosește fusul orar al sistemului în locul fusului selectat în Evolution."
+msgstr "Folosește fusul orar al sistemului în locul fusului selectat în Evolution."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Vertical pane position"
@@ -2977,34 +2756,23 @@ msgstr "Dacă să folosească sau nu zona de notificare pentru a afișa alarmele
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr ""
-"Dacă să ceară confirmare la ștergerea unei întâlniri sau a unei sarcini."
+msgstr "Dacă să ceară confirmare la ștergerea unei întâlniri sau a unei sarcini."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr ""
-"Dacă să ceară confirmare la ștergerea definitivă a întâlnirilor și "
-"sarcinilor."
+msgstr "Dacă să ceară confirmare la ștergerea definitivă a întâlnirilor și sarcinilor."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"Dacă să comprime weekend-urile în afișarea lunii, punând duminica și sâmbăta "
-"în spațiul unei singure zile."
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+msgstr "Dacă să comprime weekend-urile în afișarea lunii, punând duminica și sâmbăta în spațiul unei singure zile."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to display the end time of events in the week and month views."
-msgstr ""
-"Dacă să afișeze termenul de final al evenimentelor la afișarea săptămânii și "
-"lunii."
+msgstr "Dacă să afișeze termenul de final al evenimentelor la afișarea săptămânii și lunii."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
-"Dacă să afișeze linia Marcus Blains (linie la timpul curent) în calendar."
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr "Dacă să afișeze linia Marcus Blains (linie la timpul curent) în calendar."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to hide completed tasks in the tasks view."
@@ -3024,8 +2792,7 @@ msgstr "Dacă să afișeze câmpul RSVP în editorul evenimente/sarcini/ședinț
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr ""
-"Dacă să afișeze câmpul categorii în editorul evenimente/sarcini/ședințe"
+msgstr "Dacă să afișeze câmpul categorii în editorul evenimente/sarcini/ședințe"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show role field in the event/task/meeting editor"
@@ -3036,26 +2803,20 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Dacă să afișeze câmpul status în editorul evenimente/sarcini/ședințe"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr ""
-"Dacă să afișeze timpul în formatul de 24 de ore în loc să foloseasca am/pm."
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "Dacă să afișeze timpul în formatul de 24 de ore în loc să foloseasca am/pm."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
-"Dacă să afișeze câmpul de fus orar în editorul evenimente/sarcini/ședințe"
+msgstr "Dacă să afișeze câmpul de fus orar în editorul evenimente/sarcini/ședințe"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr ""
-"Dacă să afișeze câmpul pentru tip în editorul evenimente/sarcini/ședințe"
+msgstr "Dacă să afișeze câmpul pentru tip în editorul evenimente/sarcini/ședințe"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week number in the Day and Work Week View."
-msgstr ""
-"Dacă să fie afișat numărul săptămânii în vizualizarea Zi și Săptămână "
-"lucrătoare"
+msgstr "Dacă să fie afișat numărul săptămânii în vizualizarea Zi și Săptămână lucrătoare"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Whether to show week numbers in the date navigator."
@@ -3101,13 +2862,16 @@ msgstr "Afișare săptamână"
 msgid "Month View"
 msgstr "Afișare lună"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "Orice câmp"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Atașamente"
 
@@ -3117,24 +2881,29 @@ msgstr "Atașamente"
 msgid "Attendee"
 msgstr "Participant"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "Categorie"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6
+#: ../calendar/gui/memotypes.xml.h:5
 msgid "Classification"
 msgstr "Clasificare"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/caltypes.xml.h:7
+#: ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:499
+#: ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidențial"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/caltypes.xml.h:8
+#: ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
 #: ../widgets/misc/e-attachment-tree-view.c:496
@@ -3142,43 +2911,55 @@ msgstr "Confidențial"
 msgid "Description"
 msgstr "Descriere"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9
+#: ../calendar/gui/memotypes.xml.h:8
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "Descrierea conține"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#: ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Nu există"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11
+#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Există"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "Locație"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:13
+#: ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Organizator"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/caltypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:497
+#: ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Personal"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15
+#: ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:488
+#: ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:486
+#: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Public"
 
@@ -3191,34 +2972,44 @@ msgstr "Recurență"
 #: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
 #: ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "Rezumat"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:18
+#: ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "Rezumatul conține"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25
+#: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "conține"
 
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26
+#: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "nu conține"
 
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
+#: ../calendar/gui/caltypes.xml.h:21
+#: ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27
+#: ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "este"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "nu este"
 
@@ -3266,7 +3057,8 @@ msgstr "Sunet personalizat pentru alarmă"
 msgid "Mes_sage:"
 msgstr "Me_saj:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../mail/mail-config.ui.h:76
 msgid "Options"
 msgstr "Opțiuni"
 
@@ -3313,8 +3105,10 @@ msgstr "zi(le)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
+#: ../e-util/e-plugin-util.c:424
+#: ../filter/filter.ui.h:14
+#: ../modules/calendar/e-cal-shell-view-actions.c:336
 #: ../plugins/google-account-setup/google-contacts-source.c:333
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 #: ../widgets/misc/e-send-options.ui.h:39
@@ -3384,8 +3178,7 @@ msgstr "Doar dată:"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr ""
-"%u și %d vor fi înlocuite cu un utilizator și un domeniu din adresa de email."
+msgstr "%u și %d vor fi înlocuite cu un utilizator și un domeniu din adresa de email."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
 msgid "(Shown in a Day View)"
@@ -3411,7 +3204,8 @@ msgstr "30 de minute"
 msgid "60 minutes"
 msgstr "60 de minute"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10
+#: ../mail/mail-config.ui.h:6
 msgid "Alerts"
 msgstr "Alerte"
 
@@ -3451,7 +3245,8 @@ msgstr "Vineri"
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/dialogs/calendar-setup.c:378
 #: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
+#: ../mail/em-folder-properties.c:283
+#: ../mail/mail-config.ui.h:53
 #: ../modules/addressbook/addressbook-config.c:985
 #: ../plugins/itip-formatter/itip-formatter.c:2666
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
@@ -3477,7 +3272,8 @@ msgstr "Luni"
 #. * part of "Include threads: None"
 #. Translators: Used in send options dialog
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
+#: ../filter/e-filter-rule.c:759
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "None"
 msgstr "Fără"
 
@@ -3555,7 +3351,7 @@ msgstr "Joi"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Timp"
 
@@ -3589,7 +3385,7 @@ msgid "Wee_k starts on:"
 msgstr "Săptămâna înc_epe:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Work Week"
 msgstr "Săptămână de lucru"
 
@@ -3639,8 +3435,7 @@ msgstr "_Sâm"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Show appointment end times in week and month view"
-msgstr ""
-"_Afișează termenul de final al întâlnirilor la afișarea săptămânii și lunii"
+msgstr "_Afișează termenul de final al întâlnirilor la afișarea săptămânii și lunii"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Time divisions:"
@@ -3671,7 +3466,8 @@ msgstr "Tip:"
 msgid "_Type:"
 msgstr "_Tip:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.ui.h:146
 #: ../modules/addressbook/ldap-config.ui.h:27
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
@@ -3681,18 +3477,15 @@ msgstr "_Nume:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
-msgstr ""
-"Co_piază local conținutul calendarului pentru modul de lucru deconectat"
+msgstr "Co_piază local conținutul calendarului pentru modul de lucru deconectat"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
-msgstr ""
-"Co_piază local conținutul listei de sarcini pentru modul de lucru deconectat"
+msgstr "Co_piază local conținutul listei de sarcini pentru modul de lucru deconectat"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
-msgstr ""
-"Co_piază local conținutul listei de notițe pentru modul de lucru deconectat"
+msgstr "Co_piază local conținutul listei de notițe pentru modul de lucru deconectat"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
@@ -3741,8 +3534,7 @@ msgstr "Această notă a fost ștearsă."
 #: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
-"%s  Ați făcut modificări. Doriți să le ignorați și să închideți editorul?"
+msgstr "%s  Ați făcut modificări. Doriți să le ignorați și să închideți editorul?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
@@ -3764,8 +3556,7 @@ msgstr "Această notă a fost modificată."
 #: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  Ați făcut modificări. Ignorați aceste modificări și actualizați editorul?"
+msgstr "%s  Ați făcut modificări. Ignorați aceste modificări și actualizați editorul?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
@@ -3777,23 +3568,28 @@ msgstr "%s  Nu ați făcut modificări, actualizați editorul?"
 msgid "Validation error: %s"
 msgstr "Eroare de validare: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
+#: ../calendar/gui/dialogs/comp-editor-util.c:191
+#: ../calendar/gui/print.c:2418
 msgid " to "
 msgstr " la "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
+#: ../calendar/gui/dialogs/comp-editor-util.c:195
+#: ../calendar/gui/print.c:2422
 msgid " (Completed "
 msgstr " (Terminat "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
+#: ../calendar/gui/dialogs/comp-editor-util.c:197
+#: ../calendar/gui/print.c:2424
 msgid "Completed "
 msgstr "Terminat "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
+#: ../calendar/gui/dialogs/comp-editor-util.c:202
+#: ../calendar/gui/print.c:2429
 msgid " (Due "
 msgstr " (Scadent la "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
+#: ../calendar/gui/dialogs/comp-editor-util.c:204
+#: ../calendar/gui/print.c:2431
 msgid "Due "
 msgstr "Scadent la "
 
@@ -3846,23 +3642,29 @@ msgstr "Păstrează elementul original?"
 msgid "Click here to close the current window"
 msgstr "Clic aici pentru a închide fereastra curentă"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../mail/e-mail-browser.c:117
 #: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-focus-tracker.c:115
+#: ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:387
+#: ../widgets/misc/e-web-view.c:965
 msgid "Copy the selection"
 msgstr "Copiază selecția"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
+#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../mail/e-mail-browser.c:124
 #: ../shell/e-shell-window-actions.c:1467
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-focus-tracker.c:108
+#: ../widgets/misc/e-focus-tracker.c:545
 #: ../widgets/misc/e-web-view.c:959
 msgid "Cut the selection"
 msgstr "Decupează selecția"
 
 #: ../calendar/gui/dialogs/comp-editor.c:960
 #: ../shell/e-shell-window-actions.c:1474
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-focus-tracker.c:129
+#: ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Șterge acestă selecție"
 
@@ -3870,9 +3672,11 @@ msgstr "Șterge acestă selecție"
 msgid "Click here to view help available"
 msgstr "Clic aici pentru a vizualiza ajutorul disponibil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
+#: ../calendar/gui/dialogs/comp-editor.c:974
+#: ../mail/e-mail-browser.c:131
 #: ../shell/e-shell-window-actions.c:1509
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-focus-tracker.c:122
+#: ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:971
 msgid "Paste the clipboard"
 msgstr "Lipește clipboard-ul"
@@ -3881,9 +3685,11 @@ msgstr "Lipește clipboard-ul"
 msgid "Click here to save the current window"
 msgstr "Clic aici pentru a salva fereastra curentă"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
+#: ../calendar/gui/dialogs/comp-editor.c:1002
+#: ../mail/e-mail-browser.c:138
 #: ../shell/e-shell-window-actions.c:1579
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../widgets/misc/e-focus-tracker.c:136
+#: ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Selectează tot textul"
 
@@ -3891,7 +3697,8 @@ msgstr "Selectează tot textul"
 msgid "_Classification"
 msgstr "_Clasificare"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
+#: ../calendar/gui/dialogs/comp-editor.c:1023
+#: ../mail/e-mail-browser.c:145
 #: ../shell/e-shell-window-actions.c:1628
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
@@ -3911,7 +3718,8 @@ msgstr "_Inserează"
 msgid "_Options"
 msgstr "_Opțiuni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
+#: ../calendar/gui/dialogs/comp-editor.c:1051
+#: ../mail/e-mail-browser.c:159
 #: ../shell/e-shell-window-actions.c:1670
 msgid "_View"
 msgstr "_Vizualizare"
@@ -4015,9 +3823,7 @@ msgstr "Salvează"
 #: ../calendar/gui/dialogs/comp-editor.c:2065
 #: ../calendar/gui/dialogs/comp-editor.c:2956
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
-"Modificările aduse acestui element ar putea fi anulate în cazul apariției "
-"unei actualizări"
+msgstr "Modificările aduse acestui element ar putea fi anulate în cazul apariției unei actualizări"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2924
 #: ../plugins/prefer-plain/prefer-plain.c:67
@@ -4162,18 +3968,14 @@ msgstr "Progra_mare"
 
 #: ../calendar/gui/dialogs/event-page.c:751
 msgid "Event cannot be edited, because the selected calendar is read only"
-msgstr ""
-"Evenimentul nu a putut fi modificat, deoarece calendarul ales este doar "
-"pentru citire"
+msgstr "Evenimentul nu a putut fi modificat, deoarece calendarul ales este doar pentru citire"
 
 #: ../calendar/gui/dialogs/event-page.c:755
 msgid "Event cannot be fully edited, because you are not the organizer"
-msgstr ""
-"Evenimentul nu a putut fi modificat în toatlitate, deoarece nu sunt "
-"organizatorul"
+msgstr "Evenimentul nu a putut fi modificat în toatlitate, deoarece nu sunt organizatorul"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2720
 msgid "This event has alarms"
 msgstr "Acest eveniment are alarme"
 
@@ -4234,7 +4036,7 @@ msgstr "Este necesar un organizator."
 msgid "At least one attendee is required."
 msgstr "Este nevoie de cel puțin un participant."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2593
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nu pot deschide calendarul „%s�."
@@ -4245,14 +4047,14 @@ msgstr "Nu pot deschide calendarul „%s�."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2637
+#: ../calendar/gui/dialogs/memo-page.c:913
+#: ../calendar/gui/dialogs/task-page.c:1741
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Acționezi în numele lui %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2939
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -4260,7 +4062,7 @@ msgstr[0] "%d zi înainte de întâlnire"
 msgstr[1] "%d zile înainte de întâlnire"
 msgstr[2] "%d de zile înainte de întâlnire"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2945
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -4268,7 +4070,7 @@ msgstr[0] "%d oră înainte de programare"
 msgstr[1] "%d ore înainte de programare"
 msgstr[2] "%d de ore înainte de programare"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2951
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -4276,12 +4078,12 @@ msgstr[0] "%d minut înainte de programare"
 msgstr[1] "%d minute înainte de programare"
 msgstr[2] "%d de minute înainte de programare"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2964
 msgid "Customize"
 msgstr "Personalizează"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2966
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Niciuna"
@@ -4351,30 +4153,32 @@ msgstr "pentru"
 msgid "until"
 msgstr "pînă la"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109
+#: ../calendar/gui/print.c:2568
 msgid "Memo"
 msgstr "Notiță"
 
 #: ../calendar/gui/dialogs/memo-page.c:350
 msgid "Memo cannot be edited, because the selected memo list is read only"
-msgstr ""
-"Notița nu a putut fi modificat, deoarece lista aleasă este doar pentru citire"
+msgstr "Notița nu a putut fi modificat, deoarece lista aleasă este doar pentru citire"
 
 #: ../calendar/gui/dialogs/memo-page.c:354
 msgid "Memo cannot be fully edited, because you are not the organizer"
-msgstr ""
-"Notița nu a putut fi modificată în totalitate, deoarece nu sunteți "
-"organizatorul"
+msgstr "Notița nu a putut fi modificată în totalitate, deoarece nu sunteți organizatorul"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:874
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Nu s-au putut deschide notițe în „%s�."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1041
+#: ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:960
+#: ../mail/em-format-html.c:2253
+#: ../mail/em-format-html.c:2313
+#: ../mail/em-format-html.c:2355
+#: ../mail/message-list.etspec.h:20
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Către"
 
@@ -4431,8 +4235,7 @@ msgstr "Toate instanțele"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:558
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Această programare conține recurențe pe care Evolution nu le poate edita."
+msgstr "Această programare conține recurențe pe care Evolution nu le poate edita."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:889
 msgid "Recurrence date is invalid"
@@ -4541,27 +4344,27 @@ msgstr "ziua"
 msgid "on the"
 msgstr "în"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "apariții"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2111
 msgid "Add exception"
 msgstr "Adaugă excepție"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Could not get a selection to modify."
 msgstr "Nu am putut obține o selecție pentru modificare."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Modify exception"
 msgstr "Modifică excepția"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2202
 msgid "Could not get a selection to delete."
 msgstr "Nu am putut obține o selecție pentru ștergere."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2329
 msgid "Date/Time"
 msgstr "Dată/Oră"
 
@@ -4573,7 +4376,8 @@ msgstr "Fiecare"
 msgid "Exceptions"
 msgstr "Excepții"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3
+#: ../mail/mail-config.ui.h:84
 msgid "Preview"
 msgstr "Previzualizare"
 
@@ -4610,19 +4414,23 @@ msgstr "N_otifică doar participanții noi"
 msgid "Completed date is wrong"
 msgstr "Data completată este greșită"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:484
 msgid "Web Page"
 msgstr "Pagină web"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931
+#: ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228
+#: ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/print.c:2648
+#: ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Terminat"
@@ -4630,18 +4438,22 @@ msgstr "Terminat"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:508
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1135
+#: ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Ridicat"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790
+#: ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:582
 #: ../calendar/gui/print.c:2645
 msgid "In Progress"
 msgstr "ÃŽn derulare"
@@ -4649,16 +4461,20 @@ msgstr "ÃŽn derulare"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:510
+#: ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1133
+#: ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Scăzut"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-model.c:1243
+#: ../calendar/gui/e-task-table.c:509
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/message-list.c:1134
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "Normal"
@@ -4666,10 +4482,13 @@ msgstr "Normal"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711
+#: ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224
+#: ../calendar/gui/e-task-table.c:581
+#: ../calendar/gui/print.c:2642
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Nepornit"
 
@@ -4685,17 +4504,19 @@ msgstr "Stat_us:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1748
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Stare"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "Nedefinit"
@@ -4719,33 +4540,28 @@ msgstr "Detalii _stare"
 
 #: ../calendar/gui/dialogs/task-editor.c:114
 msgid "Click to change or view the status details of the task"
-msgstr ""
-"Clic pentru a modifica sau a vedea detaliile de stare ale acestei sarcini"
+msgstr "Clic pentru a modifica sau a vedea detaliile de stare ale acestei sarcini"
 
 #: ../calendar/gui/dialogs/task-editor.c:122
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "Opțiuni _trimitere"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "_Task"
 msgstr "_Sarcină"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "Detalii sarcină"
 
 #: ../calendar/gui/dialogs/task-page.c:336
 msgid "Task cannot be edited, because the selected task list is read only"
-msgstr ""
-"Sarcina nu poate fi modificată, deoarece lista de sarcini selectată este "
-"doar pentru citire"
+msgstr "Sarcina nu poate fi modificată, deoarece lista de sarcini selectată este doar pentru citire"
 
 #: ../calendar/gui/dialogs/task-page.c:340
 msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr ""
-"Sarcina nu poate fi modificată în totalitate, deoarece nu sunt cel care o "
-"organizează"
+msgstr "Sarcina nu poate fi modificată în totalitate, deoarece nu sunt cel care o organizează"
 
 #: ../calendar/gui/dialogs/task-page.c:388
 #: ../calendar/gui/dialogs/task-page.ui.h:4
@@ -4756,7 +4572,7 @@ msgstr "Organi_zator:"
 msgid "Due date is wrong"
 msgstr "Data scadentă este greșită"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1698
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nu pot deschide sarcinile în „%s�."
@@ -4855,7 +4671,8 @@ msgstr "%s la %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s pentru un trigger de tip necunoscut"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192
+#: ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "Fără titlu"
 
@@ -4864,7 +4681,8 @@ msgid "Categories:"
 msgstr "Categorii:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1151
+#: ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Cuprins:"
 
@@ -4889,7 +4707,8 @@ msgid "Priority:"
 msgstr "Prioritate:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
+#: ../calendar/gui/e-itip-control.c:1214
+#: ../calendar/gui/e-itip-control.ui.h:4
 #: ../mail/mail-config.ui.h:34
 msgid "Description:"
 msgstr "Descriere:"
@@ -4926,11 +4745,12 @@ msgid "Free"
 msgstr "Liber"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-task-table.c:561
 msgid "Busy"
 msgstr "Ocupat"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4941,63 +4761,61 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Fără"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065
+#: ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Da"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065
+#: ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nu"
 
-#: ../calendar/gui/e-cal-model.c:377
+#: ../calendar/gui/e-cal-model.c:325
 msgid "Default Client"
 msgstr "Client implicit"
 
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Configurări shell"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Configurări pentru toată aplicația"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:501
+#: ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
+#: ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225
+#: ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989
+#: ../e-util/e-charset.c:52
+#: ../mail/em-utils.c:930
 #: ../plugins/itip-formatter/itip-formatter.c:461
 #: ../plugins/itip-formatter/itip-formatter.c:2338
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Recurent"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Alocat"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "Deschid %s"
@@ -5041,69 +4859,76 @@ msgstr "Data de început"
 msgid "Type"
 msgstr "Tip"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:395
 msgid "Cut selected events to the clipboard"
 msgstr "Taie evenimentele selectate în clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:401
 msgid "Copy selected events to the clipboard"
 msgstr "Copiază evenimentele selectate în clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:407
 msgid "Paste events from the clipboard"
 msgstr "Lipește evenimente din clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:413
 msgid "Delete selected events"
 msgstr "Șterge evenimentele selectate"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:432
+#: ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Se șterg obiectele selectate"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
+#: ../calendar/gui/e-calendar-view.c:620
+#: ../calendar/gui/e-memo-table.c:842
 #: ../calendar/gui/e-task-table.c:1063
 msgid "Updating objects"
 msgstr "Actualizez obiectele"
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1695
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-meeting-store.c:212
 #: ../plugins/itip-formatter/itip-formatter.c:2326
 msgid "Accepted"
 msgstr "Acceptat"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1696
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:214
 #: ../plugins/itip-formatter/itip-formatter.c:2332
 msgid "Declined"
 msgstr "Refuzat"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1697
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Tentative"
 msgstr "Tentativă"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1698
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:195
+#: ../calendar/gui/e-meeting-store.c:218
 #: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Delegated"
 msgstr "Delegat"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1699
 msgid "Needs action"
 msgstr "Necesită o acțiune"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-calendar-view.c:1840
+#: ../calendar/gui/e-memo-table.c:527
 #: ../calendar/gui/e-task-table.c:738
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -5111,20 +4936,22 @@ msgstr "Organizator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-calendar-view.c:1844
+#: ../calendar/gui/e-memo-table.c:532
 #: ../calendar/gui/e-task-table.c:741
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1860
+#: ../calendar/gui/print.c:2600
 #, c-format
 msgid "Location: %s"
 msgstr "Locație: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1891
 #, c-format
 msgid "Time: %s %s"
 msgstr "Timp: %s %s"
@@ -5167,8 +4994,10 @@ msgstr "Arată fusul orar secundar"
 #. 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:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:864
+#: ../calendar/gui/e-day-view.c:1840
+#: ../calendar/gui/e-week-view-main-item.c:222
+#: ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5178,10 +5007,11 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
+#: ../calendar/gui/e-day-view-top-item.c:868
+#: ../calendar/gui/e-day-view.c:1857
 #: ../calendar/gui/e-week-view-main-item.c:231
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:907
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5190,27 +5020,30 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
+#: ../calendar/gui/e-day-view-top-item.c:872
+#: ../calendar/gui/e-day-view.c:1873
 #: ../calendar/gui/e-week-view-main-item.c:245
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:943
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1071
+#: ../calendar/gui/e-week-view.c:739
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1074
+#: ../calendar/gui/e-week-view.c:742
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2570
 #, c-format
 msgid "Week %d"
 msgstr "Săptămâna %d"
@@ -5302,7 +5135,8 @@ msgstr "Se termină"
 msgid "Due"
 msgstr "Scadent"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986
+#: ../calendar/gui/e-itip-control.c:1047
 msgid "iCalendar Information"
 msgstr "Informație iCalendar"
 
@@ -5311,8 +5145,10 @@ msgstr "Informație iCalendar"
 msgid "iCalendar Error"
 msgstr "Eroare iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
+#: ../calendar/gui/e-itip-control.c:1080
+#: ../calendar/gui/e-itip-control.c:1096
+#: ../calendar/gui/e-itip-control.c:1107
+#: ../calendar/gui/e-itip-control.c:1124
 #: ../plugins/itip-formatter/itip-view.c:350
 #: ../plugins/itip-formatter/itip-view.c:351
 #: ../plugins/itip-formatter/itip-view.c:438
@@ -5322,12 +5158,8 @@ msgid "An unknown person"
 msgstr "O persoană necunoscută"
 
 #: ../calendar/gui/e-itip-control.c:1132
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> Verificați următoarele informații, apoi alegeți o acțiune din meniul de "
-"mai jos."
+msgid "<br> Please review the following information, and then select an action from the menu below."
+msgstr "<br> Verificați următoarele informații, apoi alegeți o acțiune din meniul de mai jos."
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1147
@@ -5342,19 +5174,12 @@ msgid "Tentatively Accepted"
 msgstr "Acceptat într-o doară"
 
 #: ../calendar/gui/e-itip-control.c:1277
-msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
-msgstr ""
-"Ședința a fost anulată, dar totuși nu poate fi găsită în calendarele "
-"dumneavoastră"
+msgid "The meeting has been canceled, however it could not be found in your calendars"
+msgstr "Ședința a fost anulată, dar totuși nu poate fi găsită în calendarele dumneavoastră"
 
 #: ../calendar/gui/e-itip-control.c:1279
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr ""
-"Sarcina a fost anulată, dar totuși nu a putut fi găsită în sarcinile "
-"dumneavoastră"
+msgid "The task has been canceled, however it could not be found in your task lists"
+msgstr "Sarcina a fost anulată, dar totuși nu a putut fi găsită în sarcinile dumneavoastră"
 
 #: ../calendar/gui/e-itip-control.c:1356
 #, c-format
@@ -5416,7 +5241,8 @@ msgstr "<b>%s</b> a anulat o ședință."
 msgid "Meeting Cancelation"
 msgstr "Anulare ședință"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
+#: ../calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1481
 #: ../calendar/gui/e-itip-control.c:1521
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
@@ -5547,14 +5373,11 @@ msgstr "Obiectul nu este valid și nu poate fi actualizat\n"
 
 #: ../calendar/gui/e-itip-control.c:2022
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-"Acest răspuns nu a fost trimis de un participant. Îl adăugați ca participant?"
+msgstr "Acest răspuns nu a fost trimis de un participant. Îl adăugați ca participant?"
 
 #: ../calendar/gui/e-itip-control.c:2040
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Starea participantului nu a putut fi actualizat datorită unuei stări "
-"nevalide!\n"
+msgstr "Starea participantului nu a putut fi actualizat datorită unuei stări nevalide!\n"
 
 #: ../calendar/gui/e-itip-control.c:2064
 msgid "Attendee status updated\n"
@@ -5563,15 +5386,15 @@ msgstr "Stare participant actualizat\n"
 #: ../calendar/gui/e-itip-control.c:2071
 #: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Statusul participantului nu a putut fi actualizat deoarece elementul nu mai "
-"există"
+msgstr "Statusul participantului nu a putut fi actualizat deoarece elementul nu mai există"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2102
+#: ../calendar/gui/e-itip-control.c:2159
 msgid "Item sent!\n"
 msgstr "Element trimis!\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2108
+#: ../calendar/gui/e-itip-control.c:2167
 msgid "The item could not be sent!\n"
 msgstr "Elementul nu a putut fi trimis!\n"
 
@@ -5667,56 +5490,68 @@ msgid "Resources"
 msgstr "Resurse"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823
+#: ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/print.c:969
+#: ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grup"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Resursă"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Cameră"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Scaun"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826
+#: ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Participant necesar"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Participant opțional"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Neparticipant"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "Necesită acțiune"
 
@@ -5725,14 +5560,15 @@ msgstr "Necesită acțiune"
 msgid "Attendee                          "
 msgstr "Participant                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "ÃŽn derulare"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2305
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -5741,7 +5577,7 @@ msgstr "%A, %d %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2336
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5751,67 +5587,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Out of Office"
 msgstr "Absent din birou"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "No Information"
 msgstr "Nici o informație"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:565
 msgid "A_ttendees..."
 msgstr "Par_ticipanți..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:586
 msgid "O_ptions"
 msgstr "O_pțiuni"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "Afișează numai _orele de lucru"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _zoomed out"
 msgstr "Afișează _micșorat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "_Update free/busy"
 msgstr "Act_ualizează disponibil/ocupat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:661
 msgid "_Autopick"
 msgstr "_Alege automat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:676
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:693
 msgid "_All people and resources"
 msgstr "To_ate persoanele și resursele"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "All _people and one resource"
 msgstr "Toate _persoanele și o resursă"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "_Required people"
 msgstr "Pe_rsoanele necesare"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:719
 msgid "Required people and _one resource"
 msgstr "Persoanele necesare și _o resursă"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "Tim_pul de început:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "Timpul d_e sfârșit:"
 
@@ -5840,7 +5676,7 @@ msgid "Member"
 msgstr "Membru"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../modules/calendar/e-cal-shell-content.c:402
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5848,15 +5684,18 @@ msgstr "Membru"
 msgid "Memos"
 msgstr "Notițe"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:489
+#: ../calendar/gui/e-task-table.c:702
 msgid "* No Summary *"
 msgstr "* Fără rezumat *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#: ../calendar/gui/e-memo-table.c:573
+#: ../calendar/gui/e-task-table.c:782
 msgid "Start: "
 msgstr "Start: "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#: ../calendar/gui/e-memo-table.c:591
+#: ../calendar/gui/e-task-table.c:800
 msgid "Due: "
 msgstr "Scandență: "
 
@@ -5929,10 +5768,11 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
+#: ../calendar/gui/e-task-table.c:624
+#: ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../modules/calendar/e-cal-shell-content.c:362
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
@@ -5971,7 +5811,8 @@ msgstr "Alegeți fusul orar"
 #. 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:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:239
+#: ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -6029,7 +5870,8 @@ msgstr "Salt la data"
 msgid "a table to view and select the current time range"
 msgstr "un tabel pentru a vizualiza și selecta timpul curent"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:152
+#: ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -6039,7 +5881,8 @@ msgstr[2] "Are %d de evenimente."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:157
+#: ../calendar/gui/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Nu are evenimente."
 
@@ -6074,16 +5917,16 @@ msgid "Gnome Calendar"
 msgstr "Calendar Gnome"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:903
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
 #: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:919
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -6091,10 +5934,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:936
+#: ../modules/calendar/e-cal-shell-view-private.c:947
+#: ../modules/calendar/e-cal-shell-view-private.c:954
+#: ../modules/calendar/e-cal-shell-view-private.c:957
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -6124,7 +5967,7 @@ msgstr "afișare calendar pentru o lună"
 msgid "calendar view for one or more weeks"
 msgstr "afișare calendar pentru una sau mai multe săptămâni"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2111
 msgid "Purging"
 msgstr "Ștergere"
 
@@ -6184,7 +6027,8 @@ msgstr "Septembrie"
 msgid "_Select Today"
 msgstr "_Selectați astăzi"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:409
+#: ../calendar/gui/itip-utils.c:460
 #: ../calendar/gui/itip-utils.c:552
 msgid "An organizer must be set."
 msgstr "Trebuie definit un organizator."
@@ -6193,19 +6037,23 @@ msgstr "Trebuie definit un organizator."
 msgid "At least one attendee is necessary"
 msgstr "Este necesar cel puțin un participant"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:633
+#: ../calendar/gui/itip-utils.c:783
 msgid "Event information"
 msgstr "Informație eveniment"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:636
+#: ../calendar/gui/itip-utils.c:786
 msgid "Task information"
 msgstr "Informație sarcină"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:639
+#: ../calendar/gui/itip-utils.c:789
 msgid "Memo information"
 msgstr "Informații notiță"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:642
+#: ../calendar/gui/itip-utils.c:807
 msgid "Free/Busy information"
 msgstr "Informație disponibil/ocupat"
 
@@ -6238,7 +6086,8 @@ msgstr "Acceptat estimativ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:693
+#: ../calendar/gui/itip-utils.c:741
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Refuzat"
@@ -6295,8 +6144,7 @@ msgstr "Informație iCalendar"
 
 #: ../calendar/gui/itip-utils.c:832
 msgid "Unable to book a resource, the new event collides with some other."
-msgstr ""
-"Nu s-a putut rezerva o resursă, noul eveniment este în conflict cu un altul."
+msgstr "Nu s-a putut rezerva o resursă, noul eveniment este în conflict cu un altul."
 
 #: ../calendar/gui/itip-utils.c:834
 msgid "Unable to book a resource, error: "
@@ -6517,11 +6365,13 @@ msgstr "Anulată"
 msgid "In progress"
 msgstr "ÃŽn curs"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:28
+#: ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "e mai mare decât"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "e mai mic decât"
 
@@ -8162,7 +8012,8 @@ msgstr "Salvează ca _cioarnă"
 msgid "Save as draft"
 msgstr "Salvează ca ciornă"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:328
+#: ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "Trimit_e"
 
@@ -8283,20 +8134,18 @@ msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduceți adresele care vor primi o copie a mesajului"
 
 #: ../composer/e-composer-header-table.c:47
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
-msgstr ""
-"Întroduceți adresele ce vor primi o copia a mesajului fără ca acestea să "
-"apară în lista de destinatari a mesajului."
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
+msgstr "Întroduceți adresele ce vor primi o copia a mesajului fără ca acestea să apară în lista de destinatari a mesajului."
 
 #: ../composer/e-composer-header-table.c:959
 msgid "Fr_om:"
 msgstr "_De la:"
 
 #: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
+#: ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:958
+#: ../mail/e-mail-tag-editor.c:323
+#: ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "De la"
@@ -8313,7 +8162,8 @@ msgstr "_Către:"
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:979
+#: ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "CC"
 
@@ -8321,7 +8171,8 @@ msgstr "CC"
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:985
+#: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
 
@@ -8366,62 +8217,44 @@ msgid "Save draft"
 msgstr "Salvează ciornă"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
+#: ../composer/e-msg-composer.c:187
+#: ../mail/em-utils.c:149
 #: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_Nu mai arătă acest mesaj din nou."
 
 #: ../composer/e-msg-composer.c:983
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Nu s-a putut semna mesajul de trimis: Nici un certificat pentru semnare nu a "
-"fost definit pentru acest cont"
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Nu s-a putut semna mesajul de trimis: Nici un certificat pentru semnare nu a fost definit pentru acest cont"
 
 #: ../composer/e-msg-composer.c:990
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Nu s-a putut cripta mesajul de trimis: Nici un certificat pentru criptare nu "
-"a fost definit pentru acest cont"
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgstr "Nu s-a putut cripta mesajul de trimis: Nici un certificat pentru criptare nu a fost definit pentru acest cont"
 
 #: ../composer/e-msg-composer.c:1379
 msgid "Unable to reconstruct message from autosave file"
 msgstr "Nu s-a putut reconstrui mesajul din fișierul de autosalvare"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1445
+#: ../composer/e-msg-composer.c:1641
 msgid "Compose Message"
 msgstr "Compune un mesaj"
 
 #: ../composer/e-msg-composer.c:3310
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr ""
-"<b>(Fereastra de compunere conține un corp de mesaj non-text, ce nu poate fi "
-"editat.)</b>"
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
+msgstr "<b>(Fereastra de compunere conține un corp de mesaj non-text, ce nu poate fi editat.)</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 ""
-" Mai sunt câteva atașamente ce se transferă. Trimiterea mailului va "
-"determina ca acesta să fie trimis fără atașamentele ce se transferă în acest "
-"moment "
+msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
+msgstr " Mai sunt câteva atașamente ce se transferă. Trimiterea mailului va determina ca acesta să fie trimis fără atașamentele ce se transferă în acest moment "
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "Toate conturile au fost șterse."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr ""
-"Sunteți sigur că doriți să anulați mesajul, intitulat „{0}�, pe care îl "
-"compuneți?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgstr "Sunteți sigur că doriți să anulați mesajul, intitulat „{0}�, pe care îl compuneți?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
@@ -8432,14 +8265,8 @@ msgid "Because &quot;{1}&quot;."
 msgstr "Deoarece „{1}�."
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
-msgstr ""
-"Închizând această fereastră de compunere veți anula mesajul permanent, "
-"exceptând cazul în care alegeți să salvați mesajul în dosarul dumneavoastră "
-"Ciorne. Acest lucru vă va permite să continuați mesajul la o dată ulterioară."
+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 "Închizând această fereastră de compunere veți anula mesajul permanent, exceptând cazul în care alegeți să salvați mesajul în dosarul dumneavoastră Ciorne. Acest lucru vă va permite să continuați mesajul la o dată ulterioară."
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -8474,30 +8301,22 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Eroare la salvarea către autosalvare datorită „{1}�."
 
 #: ../composer/mail-composer.error.xml.h:15
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Evolution s-a terminat neașteptat în timp ce compuneați un mesaj nou."
-"Recuperând mesajul veți putea continua de unde ați fost întrerupt."
+msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+msgstr "Evolution s-a terminat neașteptat în timp ce compuneați un mesaj nou.Recuperând mesajul veți putea continua de unde ați fost întrerupt."
 
 #: ../composer/mail-composer.error.xml.h:16
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"Fisierul „{0}� nu este un fișier obișnuit și nu poate fi trimis într-un "
-"mesaj."
+msgstr "Fisierul „{0}� nu este un fișier obișnuit și nu poate fi trimis într-un mesaj."
 
 #: ../composer/mail-composer.error.xml.h:17
 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 ""
 "Nu am putut activa controlul pentru editorul HTML.\n"
 "\n"
-"Verificați faptul că aveți instalate versiunile corecte de gtkhtml și "
-"libgtkhtml."
+"Verificați faptul că aveți instalate versiunile corecte de gtkhtml și libgtkhtml."
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
@@ -8561,6 +8380,7 @@ msgid "Please enter your email address."
 msgstr "Introduceți adresa dumneavoastră email"
 
 #: ../capplet/settings/mail-account-view.c:58
+#| msgid "The email addres you have entered is invalid."
 msgid "The email address you have entered is invalid."
 msgstr "Adresa de email introdusă nu este validă."
 
@@ -8610,51 +8430,36 @@ msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
 msgstr "<span size=\"large\" weight=\"bold\">Detalii trimitere:</span>"
 
 #: ../capplet/settings/mail-account-view.c:355
-msgid ""
-"To use the email application you'll need to setup an account. Put your email "
-"address and password in below and we'll try and work out all the settings. "
-"If we can't do it automatically you'll need your server details as well."
-msgstr ""
-"Pentru a folosi aplicația de email, va trebui să definiți un cont. "
-"Introduceți mai jos adresa de email și parola pentru a se încerca "
-"configurarea automată. În cazul în care configurarea automată a eșuat, veți "
-"avea nevoie de detaliile serverului."
+msgid "To use the email application you'll need to setup an account. Put your email address and password in below and we'll try and work out all the settings. If we can't do it automatically you'll need your server details as well."
+msgstr "Pentru a folosi aplicația de email, va trebui să definiți un cont. Introduceți mai jos adresa de email și parola pentru a se încerca configurarea automată. În cazul în care configurarea automată a eșuat, veți avea nevoie de detaliile serverului."
 
 #: ../capplet/settings/mail-account-view.c:357
-msgid ""
-"Sorry, we can't work out the settings to get your mail automatically. Please "
-"enter them below. We've tried to make a start with the details you just "
-"entered but you may need to change them."
-msgstr ""
-"Nu s-au putut detecta automat configurările contului de email. Va trebui să "
-"le introduceți mai jos. Ca punct de plecare s-au folosit datele pe care deja "
-"le-ați furnizat, dar s-ar putea să fie nevoie să le schimbați."
+#| msgid ""
+#| "Sorry, we can't work out the settings to get your mail automatically. "
+#| "Please enter them below. We've tried  to make a start with the details "
+#| "you just entered but you may need to change them."
+msgid "Sorry, we can't work out the settings to get your mail automatically. Please enter them below. We've tried to make a start with the details you just entered but you may need to change them."
+msgstr "Nu s-au putut detecta automat configurările contului de email. Va trebui să le introduceți mai jos. Ca punct de plecare s-au folosit datele pe care deja le-ați furnizat, dar s-ar putea să fie nevoie să le schimbați."
 
 #: ../capplet/settings/mail-account-view.c:359
 msgid "You can specify more options to configure the account."
 msgstr "Pentru a configura acest cont, puteți specifica mai multe opțiuni."
 
 #: ../capplet/settings/mail-account-view.c:361
-msgid ""
-"Now we need your settings for sending mail. We've tried to make some guesses "
-"but you should check them over to make sure."
-msgstr ""
-"Acum sunt necesare configurările pentru trimiterea de mesaje. S-a încercat "
-"completarea automată dar va trebui să le verificați pentru a fi siguri de "
-"corectitudinea lor."
+msgid "Now we need your settings for sending mail. We've tried to make some guesses but you should check them over to make sure."
+msgstr "Acum sunt necesare configurările pentru trimiterea de mesaje. S-a încercat completarea automată dar va trebui să le verificați pentru a fi siguri de corectitudinea lor."
 
 #: ../capplet/settings/mail-account-view.c:362
 msgid "You can specify your default settings for your account."
 msgstr "Puteți specifica configurările implicite pentru contul dumneavoastră."
 
 #: ../capplet/settings/mail-account-view.c:363
-msgid ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
+msgid "Time to check things over before we try and connect to the server and fetch your mail."
 msgstr ""
 
 #: ../capplet/settings/mail-account-view.c:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
+#: ../mail/em-account-editor.c:2064
+#: ../mail/em-account-editor.c:2196
 #: ../mail/mail-config.ui.h:58
 msgid "Identity"
 msgstr "Identitate"
@@ -8707,7 +8512,8 @@ msgid "Back - Receiving options"
 msgstr "Înapoi - Opțiuni primire"
 
 #: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../mail/em-account-editor.c:2774
+#: ../mail/mail-config.ui.h:31
 msgid "Defaults"
 msgstr "Implicite"
 
@@ -8746,15 +8552,21 @@ msgid "Email Settings"
 msgstr "Configurări email"
 
 #: ../capplet/settings/mail-capplet-shell.c:334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Quit"
 msgstr "Ieși"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
+#: ../capplet/settings/mail-capplet-shell.c:453
+#: ../mail/e-mail-migrate.c:2949
+#: ../mail/e-mail-store.c:229
+#: ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:165
+#: ../mail/em-folder-tree-model.c:167
+#: ../mail/mail-vfolder.c:215
 #: ../mail/message-list.c:1617
 #: ../modules/addressbook/e-book-shell-backend.c:125
 #: ../modules/addressbook/e-book-shell-migrate.c:499
@@ -8792,7 +8604,8 @@ msgstr "Notificări evenimente calendar"
 msgid "Evolution Alarm Notify"
 msgstr "Notificator alarme Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
+#: ../data/evolution.desktop.in.in.h:1
+#: ../mail/e-mail-browser.c:800
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8801,7 +8614,8 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Calendar și Email Evolution"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:3
+#: ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Suită Groupware"
 
@@ -8845,11 +8659,13 @@ msgstr "%s..."
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:72
+#: ../e-util/e-alert.c:73
 msgid "Evolution Error"
 msgstr "Eroare Evolution"
 
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:74
+#: ../e-util/e-alert.c:75
 msgid "Evolution Warning"
 msgstr "Avertisment Evolution"
 
@@ -8914,11 +8730,15 @@ msgstr "Europeană de vest"
 msgid "Western European, New"
 msgstr "Europeană de vest, nouă"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#: ../e-util/e-charset.c:85
+#: ../e-util/e-charset.c:86
+#: ../e-util/e-charset.c:87
 msgid "Traditional"
 msgstr "Tradițională"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
+#: ../e-util/e-charset.c:88
+#: ../e-util/e-charset.c:89
+#: ../e-util/e-charset.c:90
 #: ../e-util/e-charset.c:91
 msgid "Simplified"
 msgstr "Simplificată"
@@ -8933,14 +8753,15 @@ msgstr "Vizual"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+#: ../modules/calendar/e-cal-shell-view-actions.c:1751
 #: ../plugins/itip-formatter/itip-view.c:195
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Astăzi"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:202
+#: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "Mâine"
 
@@ -8958,7 +8779,8 @@ msgstr "%d zile de acum"
 msgid "%d days ago"
 msgstr "acum %d zile"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
+#: ../e-util/e-datetime-format.c:283
+#: ../e-util/e-datetime-format.c:293
 #: ../e-util/e-datetime-format.c:302
 msgid "Use locale default"
 msgstr "Folosește valorile implicite ale limbii."
@@ -9018,12 +8840,14 @@ msgstr "Mesaje înregistrare:"
 msgid "Log Level"
 msgstr "Nivel înregistrare"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297
+#: ../mail/message-list.c:2696
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mesaje"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../e-util/e-non-intrusive-error-dialog.c:306
+#: ../mail/e-mail-browser.c:110
 #: ../shell/e-shell-window-actions.c:1446
 msgid "Close this window"
 msgstr "Închide această fereastră"
@@ -9048,7 +8872,8 @@ msgstr "Depanare"
 msgid "Error, Warnings and Debug messages"
 msgstr "Mesaje de eroare, de avertizare și de depanare"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
+#: ../e-util/e-plugin.c:295
+#: ../modules/mail/em-composer-prefs.c:469
 #: ../plugins/plugin-manager/plugin-manager.c:349
 #: ../plugins/publish-calendar/publish-calendar.c:827
 #: ../widgets/misc/e-account-tree-view.c:205
@@ -9059,7 +8884,8 @@ msgstr "Activat"
 msgid "Whether the plugin is enabled"
 msgstr "Dacă modulul este activat"
 
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
+#: ../e-util/e-plugin-util.c:425
+#: ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:334
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
@@ -9074,15 +8900,15 @@ msgid "The printing system reported the following details about the error:"
 msgstr "Sistemul de tipările a relatat umătoarele detalii despre eroare:"
 
 #: ../e-util/e-print.c:173
-msgid ""
-"The printing system did not report any additional details about the error."
+msgid "The printing system did not report any additional details about the error."
 msgstr "Sistemul de tipările nu a relatat nici un detaliu despre eroare."
 
 #: ../e-util/e-signature.c:701
 msgid "Autogenerated"
 msgstr "Autogenerată"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "Deoarece „{1}�."
 
@@ -9102,7 +8928,8 @@ msgstr "Doriți să îl suprascrieți?"
 msgid "File exists \"{0}\"."
 msgstr "Fișierul „{0}� există."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6
+#: ../mail/mail.error.xml.h:143
 msgid "_Overwrite"
 msgstr "_Suprascrie"
 
@@ -9123,51 +8950,68 @@ msgstr "Eroare GConf: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Toate erorile următoare vor fi afișare doar în terminal."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:959
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "Răspuns-către"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:961
+#: ../mail/em-format-html.c:2254
+#: ../mail/em-format-html.c:2325
+#: ../mail/em-format-html.c:2362
+#: ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:962
+#: ../mail/em-format-html.c:2255
+#: ../mail/em-format-html.c:2336
+#: ../mail/em-format-html.c:2369
+#: ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
-#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../em-format/em-format-quote.c:355
+#: ../em-format/em-format.c:963
+#: ../mail/e-mail-tag-editor.c:328
+#: ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18
+#: ../modules/mail/em-mailer-prefs.c:82
+#: ../plugins/groupwise-features/properties.ui.h:7
+#: ../smime/lib/e-cert.c:1125
 msgid "Subject"
 msgstr "Subiect"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
+#: ../em-format/em-format-quote.c:366
+#: ../mail/em-format-html.c:2467
 #: ../modules/mail/em-mailer-prefs.c:1130
 msgid "Mailer"
 msgstr "Client"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:431
+#: ../mail/em-composer-utils.c:1228
 msgid "-------- Forwarded Message --------"
 msgstr "---------- Mesaj înaintat ----------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:964
+#: ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83
+#: ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:965
+#: ../modules/mail/em-mailer-prefs.c:84
 msgid "Newsgroups"
 msgstr "Grupuri de știri"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:966
+#: ../modules/mail/em-mailer-prefs.c:85
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Față"
@@ -9181,7 +9025,8 @@ msgstr "atașament %s"
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nu am putut parsa mesajul S/MIME: Eroare necunoscută"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1512
+#: ../em-format/em-format.c:1674
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nu pot parsa mesajul MIME. Afișez ca sursă."
 
@@ -9201,11 +9046,13 @@ msgstr "Nu am putut analiza mesajul PGP/MIME: Eroare necunoscută"
 msgid "Unsupported signature format"
 msgstr "Format nesuportat pentru semnătură"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1706
+#: ../em-format/em-format.c:1847
 msgid "Error verifying signature"
 msgstr "Eroare la verificarea semnăturii"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
+#: ../em-format/em-format.c:1706
+#: ../em-format/em-format.c:1836
 #: ../em-format/em-format.c:1847
 msgid "Unknown error verifying signature"
 msgstr "Eroare necunoscută la verificarea semnăturii"
@@ -9334,7 +9181,8 @@ msgstr[2] "%d de ani în viitor"
 msgid "<click here to select a date>"
 msgstr "<clic aici pentru a selecta o dată>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
+#: ../filter/e-filter-datespec.c:119
+#: ../filter/e-filter-datespec.c:130
 #: ../filter/e-filter-datespec.c:141
 msgid "now"
 msgstr "acum"
@@ -9380,7 +9228,8 @@ msgstr "_Caută elementele:"
 msgid "All related"
 msgstr "Toate asociate"
 
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:761
+#: ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "Răspunsuri"
 
@@ -9396,12 +9245,14 @@ msgstr "Nici un răspuns sau părinte"
 msgid "I_nclude threads"
 msgstr "I_nclude firele de discuții"
 
-#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../filter/e-filter-rule.c:1141
+#: ../filter/filter.ui.h:2
 #: ../mail/em-utils.c:300
 msgid "Incoming"
 msgstr "Primire"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141
+#: ../mail/em-utils.c:301
 msgid "Outgoing"
 msgstr "Trimitere"
 
@@ -9433,7 +9284,8 @@ msgstr "Dată absentă."
 msgid "Missing file name."
 msgstr "Nume fișier absent."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:73
 msgid "Missing name."
 msgstr "Nume absent."
 
@@ -9489,7 +9341,8 @@ msgstr ""
 "Data mesajului va fi comparată cu\n"
 "data curentă la care rulează filtrarea."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11
+#: ../mail/em-filter-editor.c:185
 msgid "_Filter Rules"
 msgstr "Reguli de _filtrare"
 
@@ -9510,7 +9363,8 @@ msgstr "în viitor"
 msgid "months"
 msgstr "luni"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19
+#: ../mail/mail-config.ui.h:168
 msgid "seconds"
 msgstr "secunde"
 
@@ -9526,9 +9380,12 @@ msgstr "data specificată"
 msgid "years"
 msgstr "ani"
 
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
+#: ../mail/e-mail-attachment-bar.c:120
+#: ../mail/e-mail-attachment-bar.c:125
+#: ../mail/em-format-html-display.c:1029
+#: ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1
+#: ../widgets/misc/e-attachment-paned.c:148
 #: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -9546,7 +9403,8 @@ msgstr "Vizualizare iconițe"
 msgid "List View"
 msgstr "Vizualizare listă"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
+#: ../mail/e-mail-browser.c:732
+#: ../shell/e-shell-window.c:636
 msgid "Focus Tracker"
 msgstr ""
 
@@ -9554,7 +9412,8 @@ msgstr ""
 msgid "Shell Module"
 msgstr "Modul interpretor (shell)"
 
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
+#: ../mail/e-mail-browser.c:743
+#: ../mail/message-list.c:2589
 msgid "The mail shell backend"
 msgstr ""
 
@@ -9623,39 +9482,44 @@ msgstr "Modifică etichetă"
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
-msgstr ""
-"Notă: Liniuțele de subliniere din numele eticheteisunt folosite ca "
-"acceleratori în meniu."
+msgstr "Notă: Liniuțele de subliniere din numele eticheteisunt folosite ca acceleratori în meniu."
 
 #: ../mail/e-mail-label-tree-view.c:86
 msgid "Color"
 msgstr "Culoare"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
+#: ../mail/e-mail-local.c:37
+#: ../mail/em-folder-properties.c:367
+#: ../mail/em-folder-tree-model.c:680
+#: ../mail/em-folder-tree.c:2582
 #: ../modules/mail/e-mail-shell-view-private.c:963
 msgid "Inbox"
 msgstr "Inbox"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38
+#: ../mail/em-folder-tree-model.c:673
 msgid "Drafts"
 msgstr "Ciorne"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39
+#: ../mail/em-folder-tree-model.c:683
 msgid "Outbox"
 msgstr "Netrimise"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40
+#: ../mail/em-folder-tree-model.c:685
 msgid "Sent"
 msgstr "Trimise"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41
+#: ../mail/em-folder-tree-model.c:676
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:574
 msgid "Templates"
 msgstr "Șabloane"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
+#: ../mail/e-mail-migrate.c:960
+#: ../mail/em-filter-i18n.h:30
 msgid "Important"
 msgstr "Important"
 
@@ -9703,19 +9567,18 @@ msgstr "Nu am putut copia dosarul „%s� în „%s�: %s"
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Nu am putut scana pentru căsuțe de mail existente pe „%s�: %s"
 
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:1823
+#: ../mail/e-mail-migrate.c:2933
 msgid "Migrating Folders"
 msgstr "Se migrează dosarele"
 
 #: ../mail/e-mail-migrate.c:1824
 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 ""
-"Locația și ierarhia dosarelor de mailuri Evolution s-a modificat de la "
-"Evolution 1.x.\n"
+"Locația și ierarhia dosarelor de mailuri Evolution s-a modificat de la Evolution 1.x.\n"
 "\n"
 "Așteptați în timp ce Evolution convertește dosarele dumneavoastră..."
 
@@ -9734,20 +9597,19 @@ msgstr "Nu am putut crea director de date păstrează-pe-server POP3 „%s�: %
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Nu am putut copia datele POP3 keep-on server „%s�: %s"
 
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
+#: ../mail/e-mail-migrate.c:2546
+#: ../mail/e-mail-migrate.c:2560
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nu am putut crea locația de mail locală „%s�: %s"
 
 #: ../mail/e-mail-migrate.c:2934
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
+"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Formatul rezumatului căsuțelor poștale Evolution a fost mutat la SQLite încă "
-"de la versiunea 2.24.\n"
+"Formatul rezumatului căsuțelor poștale Evolution a fost mutat la SQLite încă de la versiunea 2.24.\n"
 "\n"
 "Așteptați până Evolution migrează dosarele..."
 
@@ -9758,12 +9620,8 @@ msgstr "Nu am putut crea dosarele locate de mail la „%s�: %s"
 
 #: ../mail/e-mail-migrate.c:3049
 #, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Nu s-au putut citi configurările de la instalările anterioare de Evolution, "
-"„evolution/config.xmldb� nu există sau este corupt."
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
+msgstr "Nu s-au putut citi configurările de la instalările anterioare de Evolution, „evolution/config.xmldb� nu există sau este corupt."
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
@@ -9773,19 +9631,23 @@ msgstr ""
 msgid "Do not ask me again"
 msgstr "Nu mă întreba din nou"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:264
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiază în dosar"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:264
+#: ../mail/em-folder-utils.c:385
 msgid "C_opy"
 msgstr "C_opiază"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:638
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mută in dosar"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:638
+#: ../mail/em-folder-utils.c:385
 msgid "_Move"
 msgstr "_Mută"
 
@@ -9802,7 +9664,8 @@ msgstr[2] "Mesaje salvate"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
+#: ../mail/e-mail-reader.c:885
+#: ../plugins/groupwise-features/properties.ui.h:5
 #: ../widgets/table/e-table-click-to-add.c:518
 msgid "Message"
 msgid_plural "Messages"
@@ -9918,7 +9781,8 @@ msgstr "Marchează mesajele selectate pentru urmărire"
 msgid "_Attached"
 msgstr "_Atașate"
 
-#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1236
+#: ../mail/e-mail-reader.c:1243
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Înaintează ca atașament mesajul selectat"
 
@@ -9930,7 +9794,8 @@ msgstr "Înaintează ca _atașament"
 msgid "_Inline"
 msgstr "_Inclus"
 
-#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1250
+#: ../mail/e-mail-reader.c:1257
 msgid "Forward the selected message in the body of a new message"
 msgstr "Înaintează mesajul selectat în corpul unui nou mesaj"
 
@@ -9942,7 +9807,8 @@ msgstr "Înaintează ca _inclus"
 msgid "_Quoted"
 msgstr "_Cotat"
 
-#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1264
+#: ../mail/e-mail-reader.c:1271
 msgid "Forward the selected message quoted like a reply"
 msgstr "Înaintează mesajul selectat cotat ca răspuns"
 
@@ -10111,7 +9977,7 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirectează (bounce) mesajul selectat la altcineva"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "Răspunde la _toți"
@@ -10294,7 +10160,8 @@ msgstr "Afișează mesajele cu toate antetele de email"
 msgid "Unable to retrieve message"
 msgstr "Nu am putut obține mesajul"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1957
 #: ../mail/mail-ops.c:1849
 #, c-format
 msgid "Retrieving message '%s'"
@@ -10302,7 +10169,7 @@ msgstr "Se obține mesajul „%s�"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2471
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:534
 #: ../plugins/google-account-setup/google-source.c:656
@@ -10310,33 +10177,35 @@ msgstr "Se obține mesajul „%s�"
 msgid "Default"
 msgstr "Implicit"
 
-#: ../mail/e-mail-reader.c:2588
+#: ../mail/e-mail-reader.c:2592
 #: ../modules/mail/e-mail-attachment-handler.c:134
 msgid "_Forward"
 msgstr "Îna_intează"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2593
 msgid "Forward the selected message to someone"
 msgstr "Înainteaza mesajul selectat către cineva"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2637
+#: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Șterge"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "ÃŽnainte"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2645
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "ÃŽnapoi"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2649
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "Răspunde"
 
@@ -10347,7 +10216,8 @@ msgstr "Marchează pentru urmare"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
+#: ../mail/em-account-editor.c:499
+#: ../mail/mail-config.ui.h:72
 #: ../modules/addressbook/ldap-config.ui.h:10
 msgid "No encryption"
 msgstr "Fără criptare"
@@ -10355,7 +10225,8 @@ msgstr "Fără criptare"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
+#: ../mail/em-account-editor.c:503
+#: ../mail/mail-config.ui.h:120
 #: ../modules/addressbook/ldap-config.ui.h:21
 msgid "TLS encryption"
 msgstr "Criptare TLS"
@@ -10363,7 +10234,8 @@ msgstr "Criptare TLS"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
+#: ../mail/em-account-editor.c:507
+#: ../mail/mail-config.ui.h:93
 #: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "Criptare SSL"
@@ -10387,7 +10259,8 @@ msgstr ""
 "și bifați căsuța corespunzătoare pentru a o accepta\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:881
+#: ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Niciuna"
@@ -10405,7 +10278,8 @@ msgid "Ask for each message"
 msgstr "Întreabă pentru fiecare mesaj"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1704
+#: ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Niciunul"
@@ -10425,16 +10299,11 @@ msgstr ""
 "Pentru a începe faceți clic pe „Înainte�. "
 
 #: ../mail/em-account-editor.c:2065
-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 ""
-"Introduceți mai jos numele și adresa de email. Câmpurile „opționale� de mai "
-"jos nu necesită a fi completate decât dacă doriți să includeți această "
-"informație în emailul pe care-l trimiteți."
+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 "Introduceți mai jos numele și adresa de email. Câmpurile „opționale� de mai jos nu necesită a fi completate decât dacă doriți să includeți această informație în emailul pe care-l trimiteți."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
+#: ../mail/em-account-editor.c:2067
+#: ../mail/em-account-editor.c:2233
 #: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "Primire mesaje"
@@ -10443,18 +10312,14 @@ msgstr "Primire mesaje"
 msgid "Please configure the following account settings."
 msgstr "Configurați următoarele "
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2070
+#: ../mail/em-account-editor.c:2710
 msgid "Sending Email"
 msgstr "Trimitere mesaje"
 
 #: ../mail/em-account-editor.c:2071
-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 ""
-"Vă rog introduceți informații despre modul în care veți trimite mailuri. "
-"Dacă nu sunteți sigur, contactați administratorul dumneavostră de sistem sau "
-"furnizorul de serviciu Internet."
+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 "Vă rog introduceți informații despre modul în care veți trimite mailuri. Dacă nu sunteți sigur, contactați administratorul dumneavostră de sistem sau furnizorul de serviciu Internet."
 
 #: ../mail/em-account-editor.c:2073
 msgid "Account Management"
@@ -10494,17 +10359,20 @@ msgstr "Verifică mesajele _noi la fiecare"
 msgid "minu_tes"
 msgstr "minu_te"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2836
+#: ../mail/mail-config.ui.h:100
 msgid "Security"
 msgstr "Securitate"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2881
+#: ../mail/em-account-editor.c:2949
 msgid "Receiving Options"
 msgstr "Opțiuni primire"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2882
+#: ../mail/em-account-editor.c:2950
 msgid "Checking for New Messages"
 msgstr "Se verifică mesajele noi"
 
@@ -10536,12 +10404,8 @@ msgstr "un expeditor necunoscut"
 #. * 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:1997
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"ÃŽn data de ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} la ${24Hour}:"
-"${Minute} ${TimeZone}, ${Sender} a scris:"
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr "ÃŽn data de ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} la ${24Hour}:${Minute} ${TimeZone}, ${Sender} a scris:"
 
 #: ../mail/em-composer-utils.c:2141
 msgid "-----Original Message-----"
@@ -10660,7 +10524,8 @@ msgstr "nu este definit"
 msgid "is set"
 msgstr "este definit"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41
+#: ../mail/mail-config.ui.h:61
 msgid "Junk"
 msgstr "Spam"
 
@@ -10709,11 +10574,13 @@ msgid "Play Sound"
 msgstr "Redă sunet"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Read"
 msgstr "Citit"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55
+#: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Destinatari"
 
@@ -10741,11 +10608,13 @@ msgstr "returnează mai puțin decât"
 msgid "Run Program"
 msgstr "Rulează program"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62
+#: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Scor"
 
-#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Expeditor"
 
@@ -10843,19 +10712,25 @@ msgid "Folder _name:"
 msgstr "_Nume dosar:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162
+#: ../mail/em-folder-tree-model.c:169
+#: ../mail/em-folder-tree-model.c:171
+#: ../mail/mail-vfolder.c:1056
+#: ../mail/mail-vfolder.c:1121
 msgid "Search Folders"
 msgstr "Dosare de căutare"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:176
+#: ../mail/em-folder-tree-model.c:178
 msgid "UNMATCHED"
 msgstr "NEPOTRIVIRE"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:748
+#: ../mail/em-folder-tree-model.c:1085
 msgid "Loading..."
 msgstr "Se încarcă..."
 
@@ -10896,22 +10771,26 @@ msgstr "%s (%u%s)"
 msgid "Mail Folder Tree"
 msgstr "Arbore dosare mail"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1489
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Moving folder %s"
 msgstr "Se mută dosarul %s"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1491
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying folder %s"
 msgstr "Se copiază dosarul %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1498
+#: ../mail/message-list.c:2103
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mut mesajele în dosarul %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1500
+#: ../mail/message-list.c:2105
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Se copiază mesajele în dosarul %s"
@@ -10949,119 +10828,89 @@ msgstr "Precizați unde să fie creat dosarul:"
 msgid "Unsubscribing from folder \"%s\""
 msgstr "De dezabonează de la dosarul „%s�"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html.c:1547
 msgid "Unsigned"
 msgstr "Nesemnat"
 
 #: ../mail/em-format-html-display.c:103
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"Acest mesaj nu este semnat. Nu există nici o garanție că acest mesaj este "
-"autentic."
+msgid "This message is not signed. There is no guarantee that this message is authentic."
+msgstr "Acest mesaj nu este semnat. Nu există nici o garanție că acest mesaj este autentic."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html.c:1548
 msgid "Valid signature"
 msgstr "Semnătură validă"
 
 #: ../mail/em-format-html-display.c:104
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Acest mesaj este semnat și valid, înseamnând că este foarte probabil ca "
-"acest mesaj să fie autentic."
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+msgstr "Acest mesaj este semnat și valid, înseamnând că este foarte probabil ca acest mesaj să fie autentic."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html.c:1549
 msgid "Invalid signature"
 msgstr "Semnătură nevalidă"
 
 #: ../mail/em-format-html-display.c:105
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"Semnătura acestui mesaj nu a putut fi verificată, este posibil să fi fost "
-"modificată pe traseu."
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgstr "Semnătura acestui mesaj nu a putut fi verificată, este posibil să fi fost modificată pe traseu."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html.c:1550
 msgid "Valid signature, but cannot verify sender"
 msgstr "Semnătură validă, dar nu pot verifica expeditorul"
 
 #: ../mail/em-format-html-display.c:106
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"Acest mesaj este semnat cu o semnătură validă, dar expeditorul mesajului nu "
-"poate fi verificat."
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+msgstr "Acest mesaj este semnat cu o semnătură validă, dar expeditorul mesajului nu poate fi verificat."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html.c:1551
 msgid "Signature exists, but need public key"
 msgstr "Semnătură existentă, dar am nevoie de cheia publică"
 
 #: ../mail/em-format-html-display.c:107
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr ""
-"Acest mesaj este semnat, dar nu există o cheie publică care să corespundă "
-"semnăturii."
+msgid "This message is signed with a signature, but there is no corresponding public key."
+msgstr "Acest mesaj este semnat, dar nu există o cheie publică care să corespundă semnăturii."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html.c:1557
 msgid "Unencrypted"
 msgstr "Necriptat"
 
 #: ../mail/em-format-html-display.c:114
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"Acest mesaj nu este criptat. Conținutul său poate fi citit în drumul său pe "
-"Internet."
+msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
+msgstr "Acest mesaj nu este criptat. Conținutul său poate fi citit în drumul său pe Internet."
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html.c:1558
 msgid "Encrypted, weak"
 msgstr "Criptat, slab"
 
 #: ../mail/em-format-html-display.c:115
-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 ""
-"Acest mesaj este criptat, dar folosește un algoritm slab de criptare. Va fi "
-"dificil, dar nu imposibil, pentru un atacator să decripteze acest mail, într-"
-"un interval de timp rezonabil."
+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 "Acest mesaj este criptat, dar folosește un algoritm slab de criptare. Va fi dificil, dar nu imposibil, pentru un atacator să decripteze acest mail, într-un interval de timp rezonabil."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html.c:1559
 msgid "Encrypted"
 msgstr "Criptat"
 
 #: ../mail/em-format-html-display.c:116
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-"Acest mesaj este criptat. Citirea sa de către un atacator se poate dovedi "
-"dificilă."
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+msgstr "Acest mesaj este criptat. Citirea sa de către un atacator se poate dovedi dificilă."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html.c:1560
 msgid "Encrypted, strong"
 msgstr "Criptat, puternic"
 
 #: ../mail/em-format-html-display.c:117
-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 ""
-"Acest mesaj este criptat, cu un algoritm puternic de criptare. Va fi foarte "
-"dificil pentru un atacator sa decripteze conținutul acestui mail într-un "
-"interval de timp util."
+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 "Acest mesaj este criptat, cu un algoritm puternic de criptare. Va fi foarte dificil pentru un atacator sa decripteze conținutul acestui mail într-un interval de timp util."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:248
+#: ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Afișează certificatul"
 
@@ -11070,12 +10919,8 @@ msgid "This certificate is not viewable"
 msgstr "Acest certificat nu poate fi afișat"
 
 #: ../mail/em-format-html-display.c:509
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolution nu poate afișa acest email deoarece este prea mare pentru a fi "
-"procesat. Îl puteți vizualiza neformatat sau cu un editor de text extern."
+msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
+msgstr "Evolution nu poate afișa acest email deoarece este prea mare pentru a fi procesat. Îl puteți vizualiza neformatat sau cu un editor de text extern."
 
 #: ../mail/em-format-html-display.c:738
 msgid "Completed on"
@@ -11090,7 +10935,8 @@ msgstr "Restant:"
 msgid "by"
 msgstr "după"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:1001
 msgid "View _Unformatted"
 msgstr "Vizualizează _neformatat"
 
@@ -11107,48 +10953,49 @@ msgstr "_Deschide cu"
 msgid "Page %d of %d"
 msgstr "Pagina %d din %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:166
 msgid "Formatting message"
 msgstr "Formatez mesajul"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:357
 msgid "Formatting Message..."
 msgstr "Formatez Mesajul..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1398
+#: ../mail/em-format-html.c:1407
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Primesc „%s�"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1866
 msgid "Unknown external-body part."
 msgstr "Parte „external-body� necunoscută."
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1874
 msgid "Malformed external-body part."
 msgstr "Corpul extern al mesajului malformat."
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1904
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Indicator către site-ul FTP (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1915
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Indicator către fișierul local (%s) valid pe site-ul „%s�"
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1917
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Indicator către fișierul local (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1938
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Indicator către datele la distanță (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1949
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Indicator către o dată externă necunoscută (tip „%s�)"
@@ -11156,7 +11003,7 @@ msgstr "Indicator către o dată externă necunoscută (tip „%s�)"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2640
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Mesajul a fost trimis de <b>%s</b> în numele lui <b>%s</b>"
@@ -11281,35 +11128,20 @@ msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Comprimă afișarea adreselor în TO/CC/BCC"
 
 #: ../mail/evolution-mail.schemas.in.h:22
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Comprimă afișarea adreselor în TO/CC/BCC la numărul specificat în "
-"address_count."
+msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
+msgstr "Comprimă afișarea adreselor în TO/CC/BCC la numărul specificat în address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:23
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
-msgstr ""
-"Controlează cât de frecvent, schimbările locale sunt sincronizate cu "
-"serverul de email. Acest interval trebuie să fie de cel puțin 30 de secunde."
+msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
+msgstr "Controlează cât de frecvent, schimbările locale sunt sincronizate cu serverul de email. Acest interval trebuie să fie de cel puțin 30 de secunde."
 
 #: ../mail/evolution-mail.schemas.in.h:24
 msgid "Custom headers to use while checking for junk."
-msgstr ""
-"Antetele personalizate ce sunt folosite la verificarea mesajelor "
-"nesolicitate."
+msgstr "Antetele personalizate ce sunt folosite la verificarea mesajelor nesolicitate."
 
 #: ../mail/evolution-mail.schemas.in.h:25
-msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
-msgstr ""
-"Antetele personalizate ce sunt folosite la verificarea mesajelor "
-"nesolicitate. Elementele listei sunt siruri de caractere de forma "
-"�numeantet=valoare�."
+msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
+msgstr "Antetele personalizate ce sunt folosite la verificarea mesajelor nesolicitate. Elementele listei sunt siruri de caractere de forma �numeantet=valoare�."
 
 #: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages"
@@ -11368,9 +11200,7 @@ msgid "Default width of the subscribe dialog."
 msgstr "Lățimea implicită a dialogului de abonare"
 
 #: ../mail/evolution-mail.schemas.in.h:40
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
+msgid "Determines whether to look up addresses for junk filtering in local address book only"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:41
@@ -11378,35 +11208,20 @@ msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:42
-msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
+msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
-msgstr ""
-"Determină pentru verificarea spamului să fie folosite antete personalizate"
+msgstr "Determină pentru verificarea spamului să fie folosite antete personalizate"
 
 #: ../mail/evolution-mail.schemas.in.h:44
-msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
-msgstr ""
-"Determină dacă să fie folosite antete specifice pentru a cauta mesaje "
-"nesolicitate. Dacă acestă opțiune este activată și se specifică antetele, "
-"viteza de verificare a spamurilor va fi îmbunătățită."
+msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
+msgstr "Determină dacă să fie folosite antete specifice pentru a cauta mesaje nesolicitate. Dacă acestă opțiune este activată și se specifică antetele, viteza de verificare a spamurilor va fi îmbunătățită."
 
 #: ../mail/evolution-mail.schemas.in.h:45
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr ""
-"Determină folosirea aceluiași font pentru liniile „De la� și „Subiect� în "
-"coloana „Mesaje� din vizualizarea verticală."
+msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
+msgstr "Determină folosirea aceluiași font pentru liniile „De la� și „Subiect� în coloana „Mesaje� din vizualizarea verticală."
 
 #: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
@@ -11418,8 +11233,7 @@ msgstr "Director în care să fie salvate fișierele componente ale unui email"
 
 #: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr ""
-"Dezactivează sau activează scurtarea numelor dosarelor în bara laterală"
+msgstr "Dezactivează sau activează scurtarea numelor dosarelor în bara laterală"
 
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
@@ -11427,8 +11241,7 @@ msgstr "Nu adăuga delimitatorul de semnătură"
 
 #: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
-msgstr ""
-"Afișează indicatori pentru greșelile de ortografie pe măsură ce scrieți."
+msgstr "Afișează indicatori pentru greșelile de ortografie pe măsură ce scrieți."
 
 #: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Junk folders on exit"
@@ -11447,19 +11260,12 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Golește toate dosarele de gunoi la ieșirea din Evolution."
 
 #: ../mail/evolution-mail.schemas.in.h:55
-msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
-msgstr ""
-"Activează imaginile animate în mesajele HTML. Mulți utilizatori sunt "
-"deranjați de imaginile animate și preferă să vadă o imagine statică în locul "
-"lor."
+msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
+msgstr "Activează imaginile animate în mesajele HTML. Mulți utilizatori sunt deranjați de imaginile animate și preferă să vadă o imagine statică în locul lor."
 
 #: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-"Activează modul cu cursor, în așa fel încât să puteți vedea un cursor în "
-"timp ce citiți mailul."
+msgstr "Activează modul cu cursor, în așa fel încât să puteți vedea un cursor în timp ce citiți mailul."
 
 #: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
@@ -11482,20 +11288,12 @@ msgid "Enable search folders on startup."
 msgstr "Activează dosare de căutare la pornire."
 
 #: ../mail/evolution-mail.schemas.in.h:62
-msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
-msgstr ""
-"Activează funcționalitatea barei de căutare laterale pentru a permite "
-"căutarea interactivă în numele dosarelor."
+msgid "Enable the side bar search feature to allow interactive searching of folder names."
+msgstr "Activează funcționalitatea barei de căutare laterale pentru a permite căutarea interactivă în numele dosarelor."
 
 #: ../mail/evolution-mail.schemas.in.h:63
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-msgstr ""
-"Activează tasta Spațiu pentru derularea previzualizării mesajului, a listei "
-"de mesaje și dosare."
+msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
+msgstr "Activează tasta Spațiu pentru derularea previzualizării mesajului, a listei de mesaje și dosare."
 
 #: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable to render message text part of limited size."
@@ -11505,16 +11303,13 @@ msgstr "Permite randarea textelor din mesaj cu limitare de dimensiune."
 msgid "Enable/disable caret mode"
 msgstr "Activează/dezactivează modul cu cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codifică numele fișierelor în modul Outlook/GMail"
 
 #: ../mail/evolution-mail.schemas.in.h:67
-msgid ""
-"Encode file names in the mail headers same as Outlook or GMail do, to let "
-"them display correctly file names with UTF-8 letters sent by Evolution, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
+msgid "Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:68
@@ -11530,102 +11325,52 @@ msgid "Hides the per-folder preview and removes the selection"
 msgstr "Ascunde previzualizare per-dosar și înlătură selecția"
 
 #: ../mail/evolution-mail.schemas.in.h:71
-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 ""
-"Dacă un utilizator încearcă să deschidă 10 sau mai multe mesaje în același "
-"timp, întreabă utilizatorul dacă dorește într-adevăr acest lucru."
+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 "Dacă un utilizator încearcă să deschidă 10 sau mai multe mesaje în același timp, întreabă utilizatorul dacă dorește într-adevăr acest lucru."
 
 #: ../mail/evolution-mail.schemas.in.h:72
-msgid ""
-"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
-"any MIME types appearing in this list which map to a Bonobo component viewer "
-"in GNOME's MIME type database may be used for displaying content."
+msgid "If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:73
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
-msgstr ""
-"Înălțimea inițială a ferestrei „Editor filtru�. Valoarea este actualizată "
-"atunci când utilizatorul redimensionează vertical fereastra."
+msgid "Initial height of the \"Filter Editor\" window. The value updates as the user resizes the window vertically."
+msgstr "Înălțimea inițială a ferestrei „Editor filtru�. Valoarea este actualizată atunci când utilizatorul redimensionează vertical fereastra."
 
 #: ../mail/evolution-mail.schemas.in.h:74
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Înălțimea inițială a ferestrei „Editor căutare dosar�. Valoarea este "
-"actualizată atunci când utilizatorul redimensionează vertical fereastra."
+msgid "Initial height of the \"Search Folder Editor\" window. The value updates as the user resizes the window vertically."
+msgstr "Înălțimea inițială a ferestrei „Editor căutare dosar�. Valoarea este actualizată atunci când utilizatorul redimensionează vertical fereastra."
 
 #: ../mail/evolution-mail.schemas.in.h:75
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Înălțimea inițială a ferestrei „Trimitere și primire mesaje�. Valoarea este "
-"actualizată atunci când utilizatorul redimensionează vertical fereastra."
+msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
+msgstr "Înălțimea inițială a ferestrei „Trimitere și primire mesaje�. Valoarea este actualizată atunci când utilizatorul redimensionează vertical fereastra."
 
 #: ../mail/evolution-mail.schemas.in.h:76
-msgid ""
-"Initial maximize state of the \"Filter Editor\" window. The value updates "
-"when the user maximizes or unmaximizes the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximized. This key exists only as an implementation detail."
+msgid "Initial maximize state of the \"Filter Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Filter Editor\" window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:77
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
+msgid "Initial maximize state of the \"Search Folder Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Search Folder Editor\" window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:78
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
+msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:79
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
-msgstr ""
-"Lățimea inițială a ferestrei „Editor filtru�. Valoarea este actualizată "
-"atunci când utilizatorul redimensionează orizontal fereastra."
+msgid "Initial width of the \"Filter Editor\" window. The value updates as the user resizes the window horizontally."
+msgstr "Lățimea inițială a ferestrei „Editor filtru�. Valoarea este actualizată atunci când utilizatorul redimensionează orizontal fereastra."
 
 #: ../mail/evolution-mail.schemas.in.h:80
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Lățimea inițială a ferestrei „Editor căuare dosar�. Valoarea este "
-"actualizată atunci când utilizatorul redimensionează orizontal fereastra."
+msgid "Initial width of the \"Search Folder Editor\" window. The value updates as the user resizes the window horizontally."
+msgstr "Lățimea inițială a ferestrei „Editor căuare dosar�. Valoarea este actualizată atunci când utilizatorul redimensionează orizontal fereastra."
 
 #: ../mail/evolution-mail.schemas.in.h:81
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Lățimea inițială a ferestrei „Trimitere și primire mesaje�. Valoarea este "
-"actualizată atunci când utilizatorul redimensionează orizontal fereastra."
+msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
+msgstr "Lățimea inițială a ferestrei „Trimitere și primire mesaje�. Valoarea este actualizată atunci când utilizatorul redimensionează orizontal fereastra."
 
 #: ../mail/evolution-mail.schemas.in.h:82
-msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
-msgstr ""
-"Activează sau dezactivează notificările repetate prin care se atenționează "
-"faptul că ștergerea mesajelor din dosarele de căutare determină ștergerea "
-"permanentă a mesajelor, nu doar înlăturarea lor din rezultatele căutării."
+msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
+msgstr "Activează sau dezactivează notificările repetate prin care se atenționează faptul că ștergerea mesajelor din dosarele de căutare determină ștergerea permanentă a mesajelor, nu doar înlăturarea lor din rezultatele căutării."
 
 #: ../mail/evolution-mail.schemas.in.h:83
 msgid "Last time empty junk was run"
@@ -11645,8 +11390,7 @@ msgstr "Lista de etichete și culorile lor asociate"
 
 #: ../mail/evolution-mail.schemas.in.h:88
 msgid "List of MIME types to check for Bonobo component viewers"
-msgstr ""
-"Lista de tipuri MIME pentru a căuta vizualizatori în componentele Bonobo"
+msgstr "Lista de tipuri MIME pentru a căuta vizualizatori în componentele Bonobo"
 
 #: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
@@ -11657,12 +11401,8 @@ msgid "List of accounts"
 msgstr "Lista conturilor"
 
 #: ../mail/evolution-mail.schemas.in.h:91
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"Lista de conturi cunoscute de componenta de mail a Evolution-ului. Lista "
-"conține nume de subdirectoare relative la /apps/evolution/mail/accounts."
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr "Lista de conturi cunoscute de componenta de mail a Evolution-ului. Lista conține nume de subdirectoare relative la /apps/evolution/mail/accounts."
 
 #: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
@@ -11673,13 +11413,8 @@ msgid "List of dictionary language codes used for spell checking."
 msgstr "Lista cu coduri de dicționare folosite la corectarea ortografică."
 
 #: ../mail/evolution-mail.schemas.in.h:94
-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 etichetelor cunoscute de componenta de mail a Evolution-ului. Lista "
-"conține stringuri de forma nume:culoare, unde culoare folosește codarea "
-"hexazecimală HTML."
+msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
+msgstr "Lista etichetelor cunoscute de componenta de mail a Evolution-ului. Lista conține stringuri de forma nume:culoare, unde culoare folosește codarea hexazecimală HTML."
 
 #: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
@@ -11690,14 +11425,8 @@ msgid "Load images for HTML messages over HTTP"
 msgstr "Încarcă imaginile pentru mesajele HTML via HTTP"
 
 #: ../mail/evolution-mail.schemas.in.h:97
-msgid ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
-msgstr ""
-"Încarcă imaginile pentru mesajele HTML via HTTP(S). Valorile posibile sunt: "
-"„0� - Nu încărca niciodată imagini din rețea. „1� - Încarcă mesaje în "
-"mesajele de la contacte. „2� - Încarcă întotdeauna imaginile din rețea."
+msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
+msgstr "Încarcă imaginile pentru mesajele HTML via HTTP(S). Valorile posibile sunt: „0� - Nu încărca niciodată imagini din rețea. „1� - Încarcă mesaje în mesajele de la contacte. „2� - Încarcă întotdeauna imaginile din rețea."
 
 #: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
@@ -11749,8 +11478,7 @@ msgstr "Stilul de afișare al mesajului („normal�, „full headers�, „so
 
 #: ../mail/evolution-mail.schemas.in.h:110
 msgid "Minimum days between emptying the junk on exit"
-msgstr ""
-"Minimum de zile între golirea la ieșire a dosarelor de Mesaje Nesolicitate"
+msgstr "Minimum de zile între golirea la ieșire a dosarelor de Mesaje Nesolicitate"
 
 #: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the trash on exit"
@@ -11758,9 +11486,7 @@ msgstr "Numărul minim de zile pentru golirea gunoiului la ieșire"
 
 #: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum time between emptying the junk on exit, in days."
-msgstr ""
-"Intervalul minimum între golirea la ieșire a dosarelor de Mesaje "
-"Nesolicitate, în zile."
+msgstr "Intervalul minimum între golirea la ieșire a dosarelor de Mesaje Nesolicitate, în zile."
 
 #: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the trash on exit, in days."
@@ -11776,20 +11502,15 @@ msgstr "Atenționează la subiect gol"
 
 #: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr ""
-"Atenționează utilizatorul când acesta încearcă să șteargă definitiv mesajele "
-"dintr-un dosar."
+msgstr "Atenționează utilizatorul când acesta încearcă să șteargă definitiv mesajele dintr-un dosar."
 
 #: ../mail/evolution-mail.schemas.in.h:117
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
-"Atenționează utilizatorul la încercarea de a trimite un mesaj fără subiect."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgstr "Atenționează utilizatorul la încercarea de a trimite un mesaj fără subiect."
 
 #: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt when deleting messages in search folder"
-msgstr ""
-"Intrebă atunci când urmează să se șteargă mesaje din dosarul de cautare"
+msgstr "Intrebă atunci când urmează să se șteargă mesaje din dosarul de cautare"
 
 #: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when user expunges"
@@ -11801,23 +11522,15 @@ msgstr "Atenționează când utilizatorul completează doar Bcc"
 
 #: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr ""
-"Atenționează când utilizatorul încearcă să deschidă 10 sau mai multe mesaje "
-"în același timp"
+msgstr "Atenționează când utilizatorul încearcă să deschidă 10 sau mai multe mesaje în același timp"
 
 #: ../mail/evolution-mail.schemas.in.h:122
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-"Atenționează când utilizatorul încearcă să trimită mailuri în format HTML "
-"către destinatari ce s-ar putea să nu dorească să primească mailuri HTML."
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+msgstr "Atenționează când utilizatorul încearcă să trimită mailuri în format HTML către destinatari ce s-ar putea să nu dorească să primească mailuri HTML."
 
 #: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"Atenționează când utilizatorul încearcă să trimită un mesaj fără destinatari "
-"în câmpurile Către sau CC."
+msgstr "Atenționează când utilizatorul încearcă să trimită un mesaj fără destinatari în câmpurile Către sau CC."
 
 #: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send unwanted HTML"
@@ -11872,12 +11585,8 @@ msgid "Server synchronization interval"
 msgstr "Interval sincronizare server"
 
 #: ../mail/evolution-mail.schemas.in.h:137
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
-msgstr ""
-"Definița ca „TRUE� în cazul în care la compunerea de mesaje, doriți să "
-"adăugați înaintea semnăturii delimitatorul de semnătură."
+msgid "Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail."
+msgstr "Definița ca „TRUE� în cazul în care la compunerea de mesaje, doriți să adăugați înaintea semnăturii delimitatorul de semnătură."
 
 #: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show \"Bcc\" field when sending a mail message"
@@ -11940,70 +11649,36 @@ msgid "Show photo of the sender"
 msgstr "Afișează fotografia expeditorului"
 
 #: ../mail/evolution-mail.schemas.in.h:153
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Arată câmpul „Bcc� la trimiterea unui mesaj. Aceasta este controlat din "
-"meniul Vizualizare la alegerea unui nou cont."
+msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "Arată câmpul „Bcc� la trimiterea unui mesaj. Aceasta este controlat din meniul Vizualizare la alegerea unui nou cont."
 
 #: ../mail/evolution-mail.schemas.in.h:154
-msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Arată câmpul „Cc� la trimiterea unui mesaj. Aceasta este controlat din "
-"meniul Vizualizare la alegerea unui nou cont."
+msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "Arată câmpul „Cc� la trimiterea unui mesaj. Aceasta este controlat din meniul Vizualizare la alegerea unui nou cont."
 
 #: ../mail/evolution-mail.schemas.in.h:155
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
-msgstr ""
-"Arată câmpul „Expeditor� la publicarea pe un grup de știri. Aceasta este "
-"controlat din meniul Vizualizare la alegerea unui nou cont de știri."
+msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+msgstr "Arată câmpul „Expeditor� la publicarea pe un grup de știri. Aceasta este controlat din meniul Vizualizare la alegerea unui nou cont de știri."
 
 #: ../mail/evolution-mail.schemas.in.h:156
-msgid ""
-"Show the \"From\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Arată câmpul „Expeditor� la trimiterea unui mesaj. Aceasta este controlat "
-"din meniul Vizualizare la alegerea unui nou cont."
+msgid "Show the \"From\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "Arată câmpul „Expeditor� la trimiterea unui mesaj. Aceasta este controlat din meniul Vizualizare la alegerea unui nou cont."
 
 #: ../mail/evolution-mail.schemas.in.h:157
-msgid ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
-msgstr ""
-"Arată câmpul „Răspunde la� la publicarea pe un grup de știri. Aceasta este "
-"controlat din meniul Vizualizare la alegerea unui nou cont de știri."
+msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+msgstr "Arată câmpul „Răspunde la� la publicarea pe un grup de știri. Aceasta este controlat din meniul Vizualizare la alegerea unui nou cont de știri."
 
 #: ../mail/evolution-mail.schemas.in.h:158
-msgid ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
-msgstr ""
-"Arată câmpul „Răspunde la� la trimiterea unui mesaj. Aceasta este controlat "
-"din meniul Vizualizare la alegerea unui nou cont."
+msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "Arată câmpul „Răspunde la� la trimiterea unui mesaj. Aceasta este controlat din meniul Vizualizare la alegerea unui nou cont."
 
 #: ../mail/evolution-mail.schemas.in.h:159
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
-msgstr ""
-"Afișează adresa de email a expeditorului întro coloană separată în lista de "
-"mesaje."
+msgid "Show the email-address of the sender in a separate column in the message list."
+msgstr "Afișează adresa de email a expeditorului întro coloană separată în lista de mesaje."
 
 #: ../mail/evolution-mail.schemas.in.h:160
-msgid ""
-"Show the original \"Date\" header (with a local time only if the time zone "
-"differs). Otherwise always show \"Date\" header value in a user preferred "
-"format and local time zone."
-msgstr ""
-"Arată antetul „Date� original (cu ora locală, doar dacă fusurile orare "
-"diferă). Altfel arată tot timpul valoarea antetului „Date� într-un format și "
-"fus orar definit de utilizator."
+msgid "Show the original \"Date\" header (with a local time only if the time zone differs). Otherwise always show \"Date\" header value in a user preferred format and local time zone."
+msgstr "Arată antetul „Date� original (cu ora locală, doar dacă fusurile orare diferă). Altfel arată tot timpul valoarea antetului „Date� într-un format și fus orar definit de utilizator."
 
 #: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
@@ -12047,20 +11722,11 @@ msgstr "Ultima dată la care a fost șterg spam-ul, în zile de la epoca Unix."
 
 #: ../mail/evolution-mail.schemas.in.h:171
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr ""
-"Data la care s-a golit ultima dată gunoiul, in zile pornind de la epocă."
+msgstr "Data la care s-a golit ultima dată gunoiul, in zile pornind de la epocă."
 
 #: ../mail/evolution-mail.schemas.in.h:172
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the message list. \"0\" (Classic View) places the preview pane below the "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
-msgstr ""
-"Stilul aranjamentului determină locul unde să fie plasat panoul de "
-"previzualizare în relație cu lista de mesaje. „0� (vizualizare clasică) "
-"plasează panoul de previzualizare sub lista de mesaje. „1� (vizualizare "
-"verticală) plasează panoul de previzualizare lângă lista de mesaje."
+msgid "The layout style determines where to place the preview pane in relation to the message list. \"0\" (Classic View) places the preview pane below the message list. \"1\" (Vertical View) places the preview pane next to the message list."
+msgstr "Stilul aranjamentului determină locul unde să fie plasat panoul de previzualizare în relație cu lista de mesaje. „0� (vizualizare clasică) plasează panoul de previzualizare sub lista de mesaje. „1� (vizualizare verticală) plasează panoul de previzualizare lângă lista de mesaje."
 
 #: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
@@ -12071,54 +11737,27 @@ msgid "The variable width font for mail display."
 msgstr "Fontul variabil pentru afișare email."
 
 #: ../mail/evolution-mail.schemas.in.h:175
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
-msgstr ""
-"Aceasta poate avea 3 valori. „0� pentru erori. „1� pentru avertizări. „2� "
-"pentru mesaje de depanre."
+msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
+msgstr "Aceasta poate avea 3 valori. „0� pentru erori. „1� pentru avertizări. „2� pentru mesaje de depanre."
 
 #: ../mail/evolution-mail.schemas.in.h:176
-msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
-msgstr ""
-"Aceasta decide mărimea maximă a părții text care poate fi formatată sub "
-"Evolution. Implicit este 4MB / 4096 KB și este specificată în KB."
+msgid "This decides the max size of the text part that can be formatted under Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+msgstr "Aceasta decide mărimea maximă a părții text care poate fi formatată sub Evolution. Implicit este 4MB / 4096 KB și este specificată în KB."
 
 #: ../mail/evolution-mail.schemas.in.h:177
-msgid ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
-msgstr ""
-"Aceste este modulul implicit pentru spam, chiar dacă sunt mai multe module "
-"activate. Dacă modulul implicit este dezactivat, nu se vor folosi restul de "
-"module disponibile."
+msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
+msgstr "Aceste este modulul implicit pentru spam, chiar dacă sunt mai multe module activate. Dacă modulul implicit este dezactivat, nu se vor folosi restul de module disponibile."
 
 #: ../mail/evolution-mail.schemas.in.h:178
-msgid ""
-"This key is read only once and reset to \"false\" after read. This unselects "
-"the mail in the list and removes the preview for that folder."
+msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:179
-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 ""
-"Această cheie ar trebui să conțină o listă de structuri XML specificând "
-"antetele personalizate, și dacă acestea sunt afișate sau nu. Formatul "
-"structurii XML este „header enabled� - definiți ca enabled dacă antetul va "
-"fi afișat în mail."
+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 "Această cheie ar trebui să conțină o listă de structuri XML specificând antetele personalizate, și dacă acestea sunt afișate sau nu. Formatul structurii XML este „header enabled� - definiți ca enabled dacă antetul va fi afișat în mail."
 
 #: ../mail/evolution-mail.schemas.in.h:180
-msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
+msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:181
@@ -12126,30 +11765,16 @@ msgid "This option would help in improving the speed of fetching."
 msgstr "Această opțiune îmbunătățește viteza de aducere a mesajelor."
 
 #: ../mail/evolution-mail.schemas.in.h:182
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Aceasta definește numărul adreselor afișare în vizualizarea implicită a "
-"listei de mesaje, după care se va afișa un „...�"
+msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
+msgstr "Aceasta definește numărul adreselor afișare în vizualizarea implicită a listei de mesaje, după care se va afișa un „...�"
 
 #: ../mail/evolution-mail.schemas.in.h:183
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
-msgstr ""
-"Această opțiune specifică dacă discuțiile să fie implicit afișate "
-"desfășurate sau pliate. Necesită repornirea Evolution."
+msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
+msgstr "Această opțiune specifică dacă discuțiile să fie implicit afișate desfășurate sau pliate. Necesită repornirea Evolution."
 
 #: ../mail/evolution-mail.schemas.in.h:184
-msgid ""
-"This setting specifies whether the threads should be sorted based on latest "
-"message in each thread, rather than by message's date. Evolution requires a "
-"restart."
-msgstr ""
-"Această opțiune specifică dacă firele de discuții să fie sortate pe baze "
-"ultimului mesaj din acel fir și nu după data mesajului. Necesită repornirea "
-"Evolution."
+msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
+msgstr "Această opțiune specifică dacă firele de discuții să fie sortate pe baze ultimului mesaj din acel fir și nu după data mesajului. Necesită repornirea Evolution."
 
 #: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message-list based on Subject"
@@ -12169,9 +11794,7 @@ msgstr "Stringul UID pentru contul implicit."
 
 #: ../mail/evolution-mail.schemas.in.h:189
 msgid "Underline color for misspelled words when using inline spelling."
-msgstr ""
-"Culoarea de subliniere pentru cuvintele greșite atunci că se folosește "
-"corectarea orografică inclusă."
+msgstr "Culoarea de subliniere pentru cuvintele greșite atunci că se folosește corectarea orografică inclusă."
 
 #: ../mail/evolution-mail.schemas.in.h:190
 msgid "Use SpamAssassin daemon and client"
@@ -12198,17 +11821,11 @@ msgid "Use only the local spam tests (no DNS)."
 msgstr "Folosește doar teste locale pentru spam (fără DNS)."
 
 #: ../mail/evolution-mail.schemas.in.h:196
-msgid ""
-"Users get all up in arms over where the cursor should go when replying to a "
-"message. This determines whether the cursor is placed at the top of the "
-"message or the bottom."
+msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:197
-msgid ""
-"Users get all up in arms over where their signature should go when replying "
-"to a message. This determines whether the signature is placed at the top of "
-"the message or the bottom."
+msgid "Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:198
@@ -12217,21 +11834,15 @@ msgstr "Font cu lățime variabilă"
 
 #: ../mail/evolution-mail.schemas.in.h:199
 msgid "Whether a read receipt request gets added to every message by default."
-msgstr ""
-"Dacă o cerere de confirmare citire să fie adăugată implicit pentru toate "
-"mesajele."
+msgstr "Dacă o cerere de confirmare citire să fie adăugată implicit pentru toate mesajele."
 
 #: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:201
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-msgstr ""
-"Dacă să se revină sau nu la gruparea discuțiilor după subiecte atunci când "
-"mesajul nu conține antetele In-Reply-To sau References."
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+msgstr "Dacă să se revină sau nu la gruparea discuțiilor după subiecte atunci când mesajul nu conține antetele In-Reply-To sau References."
 
 #: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether sort threads based on latest message in that thread"
@@ -12249,7 +11860,8 @@ msgstr "Lățimea panoului cu lista de mesaje."
 msgid "Importing Elm data"
 msgstr "Import date Elm"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:327
+#: ../mail/importers/pine-importer.c:374
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 msgid "Mail"
@@ -12279,7 +11891,7 @@ msgid "Select folder to import into"
 msgstr "Selectați dosarul în care se face importarea"
 
 #: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#: ../shell/e-shell-utils.c:245
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Căsuță de mail Berkeley (mbox)"
 
@@ -12326,7 +11938,8 @@ msgstr "Importă mailuri din Pine."
 msgid "Mail to %s"
 msgstr "Mail către %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:236
+#: ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail de la %s"
@@ -12379,19 +11992,18 @@ msgstr "Definește o copie-către ascu_nsă (bcc) către:"
 
 #: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
-msgstr ""
-"Întotdeauna consideră de î_ncredere cheile din keyring-ul meu la criptare"
+msgstr "Întotdeauna consideră de î_ncredere cheile din keyring-ul meu la criptare"
 
 #: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr ""
-"La trimiterea mesajelor criptate, întotdeauna criptează și pentru _expeditor"
+msgstr "La trimiterea mesajelor criptate, întotdeauna criptează și pentru _expeditor"
 
 #: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Cere întot_deauna confirmare citire"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:993
 msgid "Authentication"
 msgstr "Autentificare"
 
@@ -12439,7 +12051,8 @@ msgstr "Culoarea pentru cuvintele scrise _greșit:"
 msgid "Composing Messages"
 msgstr "Compunere mesaje"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:26
+#: ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Configurare"
 
@@ -12477,8 +12090,7 @@ msgstr "Nu formata mesajele când dimen_siunea textului depășește"
 
 #: ../mail/mail-config.ui.h:38
 msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr ""
-"Nu mar_ca mesajele ca fiind nesolicitate dacă expeditorul se află în agendă"
+msgstr "Nu mar_ca mesajele ca fiind nesolicitate dacă expeditorul se află în agendă"
 
 #: ../mail/mail-config.ui.h:39
 msgid "Do not quote"
@@ -12560,7 +12172,8 @@ msgstr "Inclus (Style Outlook)"
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:63
+#: ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etichete"
 
@@ -12597,17 +12210,12 @@ msgid "No _Proxy for:"
 msgstr "Fără _proxy pentru:"
 
 #: ../mail/mail-config.ui.h:73
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr ""
-"Notă: nu vi se va cere parola decât atunci când vă veți conecta prima dată"
+msgid "Note: you will not be prompted for a password until you connect for the first time"
+msgstr "Notă: nu vi se va cere parola decât atunci când vă veți conecta prima dată"
 
 #: ../mail/mail-config.ui.h:74
 msgid "Option is ignored if a match for custom junk headers is found."
-msgstr ""
-"Opțiunea este ignorată dacă este găsită o potrivire pentru antet "
-"personalizat de mesaj nesolicitat."
+msgstr "Opțiunea este ignorată dacă este găsită o potrivire pentru antet personalizat de mesaj nesolicitat."
 
 #: ../mail/mail-config.ui.h:75
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
@@ -12632,8 +12240,7 @@ msgstr "Port:"
 
 #: ../mail/mail-config.ui.h:82
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
-"A_vertizează-mă la trimiterea mesajelor cu destinatari doar în câmpul Bcc"
+msgstr "A_vertizează-mă la trimiterea mesajelor cu destinatari doar în câmpul Bcc"
 
 #: ../mail/mail-config.ui.h:83
 msgid "Pretty Good Privacy (PGP/GPG)"
@@ -12772,12 +12379,8 @@ msgid "T_ype:"
 msgstr "T_ip: "
 
 #: ../mail/mail-config.ui.h:122
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Lista de aici a limbajelor reflectă doar limbajele pentru care aveți un "
-"dicționar instalat."
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+msgstr "Lista de aici a limbajelor reflectă doar limbajele pentru care aveți un dicționar instalat."
 
 #: ../mail/mail-config.ui.h:123
 msgid ""
@@ -12805,7 +12408,8 @@ msgstr "Num_e utilizator:"
 msgid "Use Authe_ntication"
 msgstr "Folosește aute_ntificare"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../mail/mail-config.ui.h:130
+#: ../plugins/caldav/caldav-source.c:221
 #: ../plugins/google-account-setup/google-contacts-source.c:283
 #: ../plugins/google-account-setup/google-source.c:620
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
@@ -12882,9 +12486,7 @@ msgstr "_Cale:"
 
 #: ../mail/mail-config.ui.h:149
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr ""
-"_Solicită confirmare la trimiterea de mesaje HTML către contactele ce nu "
-"doresc acest lucru"
+msgstr "_Solicită confirmare la trimiterea de mesaje HTML către contactele ce nu doresc acest lucru"
 
 #: ../mail/mail-config.ui.h:150
 msgid "_Prompt when sending messages with an empty subject line"
@@ -12902,7 +12504,8 @@ msgstr "_Script:"
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _securizat:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:155
+#: ../modules/addressbook/ldap-config.ui.h:30
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Server:"
@@ -12932,7 +12535,8 @@ msgstr "Folosește valorile implicite ale sistem_ului"
 msgid "_Use the same fonts as other applications"
 msgstr "_Folosește aceleași fonturi ca și celelalte aplicații"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:163
+#: ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
@@ -12940,7 +12544,8 @@ msgstr "a"
 msgid "addresses"
 msgstr "adrese"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:165
+#: ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
@@ -13079,7 +12684,8 @@ msgstr "Primesc mail"
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Eroare în aplicarea filtrelor la trimitere: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:597
+#: ../mail/mail-ops.c:624
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13093,7 +12699,8 @@ msgstr ""
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Eroare la adăugarea în dosarul local „Trimise�: %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:752
+#: ../mail/mail-ops.c:833
 msgid "Sending message"
 msgstr "Trimitere mesaj"
 
@@ -13107,11 +12714,13 @@ msgstr "Trimit mesajul %d din %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Eroare la trimiterea a %d din %d mesaje"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:791
+#: ../mail/mail-send-recv.c:760
 msgid "Canceled."
 msgstr "Anulat."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:793
+#: ../mail/mail-send-recv.c:762
 msgid "Complete."
 msgstr "Terminat"
 
@@ -13222,7 +12831,8 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Salvez atașamentul"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2226
+#: ../mail/mail-ops.c:2234
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13271,7 +12881,8 @@ msgstr "Anulează _tot"
 msgid "Updating..."
 msgstr "Actualizez..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:630
 msgid "Waiting..."
 msgstr "Aștept..."
 
@@ -13303,17 +12914,12 @@ msgid "User canceled operation."
 msgstr "Operație anulată de utilizator."
 
 #: ../mail/mail-session.c:663
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr ""
-"Nu s-a specificat o adresă de destinație, înaintarea mesajului a fost "
-"anulată."
+msgid "No destination address provided, forward of the message has been cancelled."
+msgstr "Nu s-a specificat o adresă de destinație, înaintarea mesajului a fost anulată."
 
 #: ../mail/mail-session.c:669
 msgid "No account found to use, forward of the message has been cancelled."
-msgstr ""
-"Nu s-a găsit un cont pentru a fi folosit, înaintarea mesajului a fost "
-"anulată."
+msgstr "Nu s-a găsit un cont pentru a fi folosit, înaintarea mesajului a fost anulată."
 
 #: ../mail/mail-tools.c:123
 #, c-format
@@ -13374,70 +12980,47 @@ msgstr "Există deja un dosar numit „{0}. Alegeți alt nume."
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
 "Există deja un doar la „{1}�.\n"
 "\n"
-"Puteți alege să ignorați acest dosar, să îl suprascrieți, să adăugați "
-"conținutul sau să ieșiți."
+"Puteți alege să ignorați acest dosar, să îl suprascrieți, să adăugați conținutul sau să ieșiți."
 
 #: ../mail/mail.error.xml.h:6
-msgid ""
-"A read receipt notification has been requested for \"{1}\". Send the receipt "
-"notification to {0}?"
-msgstr ""
-"O cerere de confirmare a primirii a fost cerută pentru „{1}�. Trimite "
-"notificarea de primire câtre {0}?"
+msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgstr "O cerere de confirmare a primirii a fost cerută pentru „{1}�. Trimite notificarea de primire câtre {0}?"
 
 #: ../mail/mail.error.xml.h:7
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
+msgid "A signature already exists with the name \"{0}\". Please specify a different name."
 msgstr "Există deja o semnătură cu numele „{0}�. Specificați un alt nume."
 
 #: ../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 ""
-"Adăugând un subiect la mesaj veți oferi o șansă destinatarilor de a-și face "
-"o idee despre ce e vorba în mailul dumneavoastră."
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgstr "Adăugând un subiect la mesaj veți oferi o șansă destinatarilor de a-și face o idee despre ce e vorba în mailul dumneavoastră."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr ""
-"Sunteți sigur că doriți să ștergeți acest cont și toate proxy-urile sale?"
+msgstr "Sunteți sigur că doriți să ștergeți acest cont și toate proxy-urile sale?"
 
 #: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
 msgstr "Sunteți sigur că doriți să ștergeți acest cont?"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
-msgstr ""
-"Sunteți sigur că doriți să dezactivați acest cont și să ștergeți toate proxy-"
-"urile sale?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgstr "Sunteți sigur că doriți să dezactivați acest cont și să ștergeți toate proxy-urile sale?"
 
 #: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Sunteți sigur că doriți să deschideți {0} mesaje concomitent?"
 
 #: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr ""
-"Sunteți sigur că doriți să ștergeți permanent toate mesajele șterse anterior "
-"din toate dosarele?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgstr "Sunteți sigur că doriți să ștergeți permanent toate mesajele șterse anterior din toate dosarele?"
 
 #: ../mail/mail.error.xml.h:14
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
-msgstr ""
-"Sigur doriți ștergerea permanentă a tuturor mesajelor din dosarul „{0}�?"
+msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+msgstr "Sigur doriți ștergerea permanentă a tuturor mesajelor din dosarul „{0}�?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -13453,9 +13036,7 @@ msgstr "Sigur doriți să trimiteți un mesaj cu adrese nevalide?"
 
 #: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
-"Sunteți sigur că doriți să trimiteți un mesaj cu destinatari doar în câmpul "
-"BCC?"
+msgstr "Sunteți sigur că doriți să trimiteți un mesaj cu destinatari doar în câmpul BCC?"
 
 #: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message without a subject?"
@@ -13522,12 +13103,8 @@ msgid "Cannot open target \"{2}\"."
 msgstr "Nu s-a putut deschide destinația „{2}�."
 
 #: ../mail/mail.error.xml.h:36
-msgid ""
-"Cannot read the license file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its license."
-msgstr ""
-"Nu s-a putut citi fișierul de licență „{0}�, datorită unei probleme de "
-"instalare. Nu veți putea folosi acest furnizor până ce nu accetați licența."
+msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
+msgstr "Nu s-a putut citi fișierul de licență „{0}�, datorită unei probleme de instalare. Nu veți putea folosi acest furnizor până ce nu accetați licența."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot rename \"{0}\" to \"{1}\"."
@@ -13558,13 +13135,8 @@ msgid "Check Junk Failed"
 msgstr "Verificarea mesajelor nesolicitate a eșuat"
 
 #: ../mail/mail.error.xml.h:44
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Verificați faptul că parola dumneavoastră este scrisă corect. Nu uitați "
-"faptul că multe parole sunt cu majuscule semnificative, poate aveți apăsată "
-"tasta caps lock."
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Verificați faptul că parola dumneavoastră este scrisă corect. Nu uitați faptul că multe parole sunt cu majuscule semnificative, poate aveți apăsată tasta caps lock."
 
 #: ../mail/mail.error.xml.h:45
 msgid "Could not save signature file."
@@ -13587,12 +13159,8 @@ msgid "Do not disable"
 msgstr "Nu dezactiva"
 
 #: ../mail/mail.error.xml.h:50
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
-msgstr ""
-"Dorești să sincronizez local dosarele ce sunt marcate pentru lucrul în modul "
-"deconectat?"
+msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
+msgstr "Dorești să sincronizez local dosarele ce sunt marcate pentru lucrul în modul deconectat?"
 
 #: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
@@ -13631,22 +13199,16 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "În cazul în care continuați, nu veți mai putea recupera aceste mesaje."
 
 #: ../mail/mail.error.xml.h:60
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-"Dacă ștergeți dosarul, tot conținutul său și al subdirectoarelor sale vor fi "
-"șterse permanent."
+msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
+msgstr "Dacă ștergeți dosarul, tot conținutul său și al subdirectoarelor sale vor fi șterse permanent."
 
 #: ../mail/mail.error.xml.h:61
-msgid ""
-"If you delete the folder, all of its contents will be deleted permanently."
+msgid "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Dacă ștergeți dosarul, tot conținutul său va fi șters permanent."
 
 #: ../mail/mail.error.xml.h:62
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr ""
-"În cazul în care continuați, toate conturile proxy vor fi șterse permanent."
+msgstr "În cazul în care continuați, toate conturile proxy vor fi șterse permanent."
 
 #: ../mail/mail.error.xml.h:63
 msgid ""
@@ -13658,17 +13220,11 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:65
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
-"În cazul în care continuați, informațiile despre cont vor fi șterse "
-"permanent."
+msgstr "În cazul în care continuați, informațiile despre cont vor fi șterse permanent."
 
 #: ../mail/mail.error.xml.h:66
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"În cazul în care închideți, aceste mesaje nu vor fi trimise decât după ce "
-"porniți din nou Evolution."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgstr "În cazul în care închideți, aceste mesaje nu vor fi trimise decât după ce porniți din nou Evolution."
 
 #: ../mail/mail.error.xml.h:67
 msgid "Ignore"
@@ -13687,16 +13243,8 @@ msgid "Mail filters automatically updated."
 msgstr "Filtrele de mail au fost actualizate automat."
 
 #: ../mail/mail.error.xml.h:71
-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 ""
-"Multe sisteme adaugă un antent Aparent-Către pentru mesajele care au doar "
-"destinatari în BCC. În cazul în care acest antet este adăugat, el va lista "
-"toți destinatarii din mesaj. Pentru a evita acest lucru, ar trebui să "
-"adăugați un destinantar în câmpul Către: sau CC:."
+msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgstr "Multe sisteme adaugă un antent Aparent-Către pentru mesajele care au doar destinatari în BCC. În cazul în care acest antet este adăugat, el va lista toți destinatarii din mesaj. Pentru a evita acest lucru, ar trebui să adăugați un destinantar în câmpul Către: sau CC:."
 
 #: ../mail/mail.error.xml.h:72
 msgid "Missing folder."
@@ -13708,8 +13256,7 @@ msgstr "Nici o sursă selectată."
 
 #: ../mail/mail.error.xml.h:75
 msgid "Opening too many messages at once may take a long time."
-msgstr ""
-"Deschiderea a prea multor mesaje în același timp ar putea dura foarte mult."
+msgstr "Deschiderea a prea multor mesaje în același timp ar putea dura foarte mult."
 
 #: ../mail/mail.error.xml.h:76
 msgid "Please check your account settings and try again."
@@ -13720,21 +13267,15 @@ msgid "Please enable the account or send using another account."
 msgstr "Activați acest cont sau trimiteți folosind alt cont."
 
 #: ../mail/mail.error.xml.h:78
-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 ""
-"Introduceți o adresă de email validă în câmpul Către:. Puteți căuta adresele "
-"de email printr-un clic pe butonul Către: aflat lângă căsuța de intrare."
+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 "Introduceți o adresă de email validă în câmpul Către:. Puteți căuta adresele de email printr-un clic pe butonul Către: aflat lângă căsuța de intrare."
 
 #: ../mail/mail.error.xml.h:79
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
 msgstr ""
-"Verificați că următorii destinatari doresc și pot primii mesaje în format "
-"HTML:\n"
+"Verificați că următorii destinatari doresc și pot primii mesaje în format HTML:\n"
 "{0}"
 
 #: ../mail/mail.error.xml.h:81
@@ -13751,8 +13292,7 @@ msgstr "Probleme la migrarea dosarului de mesaje vechi „{0}�."
 
 #: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr ""
-"Interoghez serverul pentru o listă de mecanisme de autentificare suportate."
+msgstr "Interoghez serverul pentru o listă de mecanisme de autentificare suportate."
 
 #: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
@@ -13795,28 +13335,17 @@ msgid "Synchronize folders locally for offline usage?"
 msgstr "Sincronizez dosarele pentru lucrul în modul deconectat?"
 
 #: ../mail/mail.error.xml.h:95
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
-"Dosarele de sistem sunt necesare pentru ca Evolution să poată funcționa "
-"corect și nu pot fi redenumite, mutate sau șterse."
+msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
+msgstr "Dosarele de sistem sunt necesare pentru ca Evolution să poată funcționa corect și nu pot fi redenumite, mutate sau șterse."
 
 #: ../mail/mail.error.xml.h:96
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
-"Lista de contacte la care trimiteți este configurată să ascundă lista "
-"destinatarilor.\n"
-"Multe sisteme de mail adaugă un antet Aparent-către pentru mesajele care au "
-"doar destinatari în BCC. În cazul în care acest antet este adăugat, el va "
-"lista toți destinatarii acestui mesaj. Pentru a evita acest lucru, ar trebui "
-"să adaugați un destinatar în câmpul Către: sau CC:. "
+"Lista de contacte la care trimiteți este configurată să ascundă lista destinatarilor.\n"
+"Multe sisteme de mail adaugă un antet Aparent-către pentru mesajele care au doar destinatari în BCC. În cazul în care acest antet este adăugat, el va lista toți destinatarii acestui mesaj. Pentru a evita acest lucru, ar trebui să adaugați un destinatar în câmpul Către: sau CC:. "
 
 #: ../mail/mail.error.xml.h:99
 msgid ""
@@ -13875,50 +13404,32 @@ msgstr ""
 "mergeți la editorul Căutare dosar și adăugați-l explicit, dacă e nevoie."
 
 #: ../mail/mail.error.xml.h:116
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
-msgstr ""
-"Acest mesaj nu poate fi trimis deoarece contul cu care ați încercat să "
-"trimiteți este dezactivat"
+msgid "This message cannot be sent because the account you chose to send with is not enabled"
+msgstr "Acest mesaj nu poate fi trimis deoarece contul cu care ați încercat să trimiteți este dezactivat"
 
 #: ../mail/mail.error.xml.h:117
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
-msgstr ""
-"Acest mesaj nu poate fi trimis deoarece nu ați specificat nici un destinatar"
+msgid "This message cannot be sent because you have not specified any recipients"
+msgstr "Acest mesaj nu poate fi trimis deoarece nu ați specificat nici un destinatar"
 
 #: ../mail/mail.error.xml.h:118
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Acest server nu suportă acest tip de autentificare și s-ar putea să nu "
-"suporte nici un fel de autentificare."
+msgid "This server does not support this type of authentication and may not support authentication at all."
+msgstr "Acest server nu suportă acest tip de autentificare și s-ar putea să nu suporte nici un fel de autentificare."
 
 #: ../mail/mail.error.xml.h:119
 msgid "This signature has been changed, but has not been saved."
 msgstr "Această semnătură a fost modificată, dar n-a fost salvată."
 
 #: ../mail/mail.error.xml.h:120
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr ""
-"Acest lucru va marca toate mesajele ca citite în dosarul selectat și în "
-"subdosarele sale."
+msgid "This will mark all messages as read in the selected folder and its subfolders."
+msgstr "Acest lucru va marca toate mesajele ca citite în dosarul selectat și în subdosarele sale."
 
 #: ../mail/mail.error.xml.h:121
 msgid "Unable to connect to the GroupWise server."
 msgstr "Nu mă pot conecta la serverul GroupWise."
 
 #: ../mail/mail.error.xml.h:122
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Nu pot deschide dosarul cu ciorne pentru acest cont. Doriți să folosiți "
-"dosarul sistem implicit pentru ciorne?"
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+msgstr "Nu pot deschide dosarul cu ciorne pentru acest cont. Doriți să folosiți dosarul sistem implicit pentru ciorne?"
 
 #: ../mail/mail.error.xml.h:123
 msgid "Unable to read license file."
@@ -13934,13 +13445,10 @@ msgstr "Folosește dosarul implicit de ciorne?"
 
 #: ../mail/mail.error.xml.h:126
 msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
+"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"Atenție: Ștergerea mesajelor dintr-un folder de căutare, va determina de "
-"asemenea ștergerea mesajului propriu-zis dintr-unul din dosarele locale sau "
-"la distanță.\n"
+"Atenție: Ștergerea mesajelor dintr-un folder de căutare, va determina de asemenea ștergerea mesajului propriu-zis dintr-unul din dosarele locale sau la distanță.\n"
 "Doriți să faceți acest lucru?"
 
 #: ../mail/mail.error.xml.h:128
@@ -13970,12 +13478,10 @@ msgstr "Trebuie să specificați un dosar."
 #: ../mail/mail.error.xml.h:134
 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 ""
 "Trebuie să specificați cel putin un dosar ca sursă.\n"
-"Fie prin selectarea individuală a dosarelor, sau/și prin selectarea tuturor "
-"dosarelor locale, toate dosarele la distanță, sau amândouă."
+"Fie prin selectarea individuală a dosarelor, sau/și prin selectarea tuturor dosarelor locale, toate dosarele la distanță, sau amândouă."
 
 #: ../mail/mail.error.xml.h:136
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
@@ -14046,13 +13552,15 @@ msgstr "Mai mare"
 msgid "Highest"
 msgstr "Cea mai mare"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1747
+#: ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1754
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M %p"
 msgstr "Astăzi %l:%M %p"
 
@@ -14076,30 +13584,24 @@ msgstr "%b %d %Y"
 msgid "Select all visible messages"
 msgstr "Șterge toate mesajele vizibile"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
+#: ../mail/message-list.c:2588
+#: ../shell/e-shell-view.c:726
 msgid "Shell Backend"
 msgstr ""
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4399
+#: ../mail/message-list.c:4895
 msgid "Generating message list"
 msgstr "Generez lista de mesaje"
 
 #: ../mail/message-list.c:4726
-msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
-msgstr ""
-"Nici un mesaj nu satisface criteriu de căutare. Fie anulați căutare cu "
-"meniul Căutare->Curăță sau o modificați."
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+msgstr "Nici un mesaj nu satisface criteriu de căutare. Fie anulați căutare cu meniul Căutare->Curăță sau o modificați."
 
 #: ../mail/message-list.c:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"În acest dosar există doar mesaje ascunse. Pentru a le vedea folosiți "
-"Vizualizare -> Arată mesaje ascunse"
+msgid "There are only hidden messages in this folder. Use View->Show Hidden Messages to show them."
+msgstr "În acest dosar există doar mesaje ascunse. Pentru a le vedea folosiți Vizualizare -> Arată mesaje ascunse"
 
 #: ../mail/message-list.c:4730
 msgid "There are no messages in this folder."
@@ -14168,30 +13670,16 @@ msgid "Subject or Addresses contains"
 msgstr "Subiectul sau adresele conțin"
 
 #: ../modules/addressbook/addressbook-config.c:206
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Dacă veți selecta această opțiune atunci Evolution se va conecta la serverul "
-"LDAP doar dacă acesta suportă SSL."
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
+msgstr "Dacă veți selecta această opțiune atunci Evolution se va conecta la serverul LDAP doar dacă acesta suportă SSL."
 
 #: ../modules/addressbook/addressbook-config.c:208
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Dacă veți selecta această opțiune atunci Evolution se va conecta la serverul "
-"LDAP doar dacă acesta suportă TLS."
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
+msgstr "Dacă veți selecta această opțiune atunci Evolution se va conecta la serverul LDAP doar dacă acesta suportă TLS."
 
 #: ../modules/addressbook/addressbook-config.c:210
-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 ""
-"Selectând această opțiune înseamnă că serverul dumneavoastră nu suportă nici "
-"SSL nici TLS. Ca atare conexiunea va fi nesigură, iar dumneavoastră veți fi "
-"vulnerabili la atacuri informatice."
+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 "Selectând această opțiune înseamnă că serverul dumneavoastră nu suportă nici SSL nici TLS. Ca atare conexiunea va fi nesigură, iar dumneavoastră veți fi vulnerabili la atacuri informatice."
 
 #: ../modules/addressbook/addressbook-config.c:592
 msgid "Use in _Birthday & Anniversaries calendar"
@@ -14202,35 +13690,16 @@ msgid "Copy _book content locally for offline operation"
 msgstr "Copiază local conținutul _cărții pentru operațiile offline"
 
 #: ../modules/addressbook/addressbook-config.c:736
-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 ""
-"Acesta este portul LDAP la care Evolution va încerca să se conecteze. O "
-"listă de porturi standard v-a fost sugerată. Consultați administratorul "
-"dumneavoastră de sistem pentru ce porturi ar trebui să specificați."
+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 "Acesta este portul LDAP la care Evolution va încerca să se conecteze. O listă de porturi standard v-a fost sugerată. Consultați administratorul dumneavoastră de sistem pentru ce porturi ar trebui să specificați."
 
 #: ../modules/addressbook/addressbook-config.c:810
-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 ""
-"Aceasta este metoda prin care Evolution se va autentifica. Nu uitați că dacă "
-"aceasta este „Adresa de email� aveți nevoie de acces la serverul de LDAP."
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
+msgstr "Aceasta este metoda prin care Evolution se va autentifica. Nu uitați că dacă aceasta este „Adresa de email� aveți nevoie de acces la serverul de LDAP."
 
 #: ../modules/addressbook/addressbook-config.c:885
-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 ""
-"Scopul căutării definește cât de adâncă va fi căutarea în arborele de "
-"directoare. Un scop al căutării „sub� va include toate intrările mai jos de "
-"domeniul de căutare. Un scop al căutării de „unu� va include toate intrările "
-"un nivel mai jos de domeniul dumneavoastră."
+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 "Scopul căutării definește cât de adâncă va fi căutarea în arborele de directoare. Un scop al căutării „sub� va include toate intrările mai jos de domeniul de căutare. Un scop al căutării de „unu� va include toate intrările un nivel mai jos de domeniul dumneavoastră."
 
 #: ../modules/addressbook/addressbook-config.c:991
 msgid "Server Information"
@@ -14284,15 +13753,11 @@ msgstr "Fișier xml EFolderList pentru lista de completări de URI."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "Position of the contact preview pane when oriented horizontally."
-msgstr ""
-"Poziția panoului de previzualizare contacte atunci când este orientat "
-"orizontal."
+msgstr "Poziția panoului de previzualizare contacte atunci când este orientat orizontal."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "Position of the contact preview pane when oriented vertically."
-msgstr ""
-"Poziția panoului de previzualizare contacte atunci când este orientat "
-"vertical."
+msgstr "Poziția panoului de previzualizare contacte atunci când este orientat vertical."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Show autocompleted name with an address"
@@ -14303,24 +13768,12 @@ msgid "Show preview pane"
 msgstr "Afișează panoul de previzualizare"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
-msgstr ""
-"Stilul aranjamentului determină locul unde să fie plasat panoul de "
-"previzualizare în relație cu lista de contacte. „0� (vizualizare clasică) "
-"plasează panoul de previzualizare sub lista de contacte. „1� (vizualizare "
-"verticală) plasează panoul de previzualizare lângă lista de contacte."
+msgid "The layout style determines where to place the preview pane in relation to the contact list. \"0\" (Classic View) places the preview pane below the contact list. \"1\" (Vertical View) places the preview pane next to the contact list."
+msgstr "Stilul aranjamentului determină locul unde să fie plasat panoul de previzualizare în relație cu lista de contacte. „0� (vizualizare clasică) plasează panoul de previzualizare sub lista de contacte. „1� (vizualizare verticală) plasează panoul de previzualizare lângă lista de contacte."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"Numărul de caractere ce trebuie scris înainte ca Evolution să încerce să "
-"completeze."
+msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
+msgstr "Numărul de caractere ce trebuie scris înainte ca Evolution să încerce să completeze."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "URI for the folder last used in the select names dialog"
@@ -14328,16 +13781,11 @@ msgstr "URI pentru ultimul dosar folosit în dialogul pentru selectarea numelor"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid "URI for the folder last used in the select names dialog."
-msgstr ""
-"URI pentru ultimul dosar folosit în dialogul pentru selectarea numelor."
+msgstr "URI pentru ultimul dosar folosit în dialogul pentru selectarea numelor."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-"Dacă să fie afișată permanent adresa de email cu numele contactului "
-"autocompletat."
+msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
+msgstr "Dacă să fie afișată permanent adresa de email cu numele contactului autocompletat."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "Whether to show the preview pane."
@@ -14450,13 +13898,11 @@ msgstr "Preferințe autocompletare"
 
 #: ../modules/addressbook/e-book-shell-migrate.c:1152
 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 ""
-"Locația și ierarhia dosarelor de contact Evolution s-a schimbat de la "
-"Evolution 1.x.\n"
+"Locația și ierarhia dosarelor de contact Evolution s-a schimbat de la Evolution 1.x.\n"
 "\n"
 "Așteptați în timp ce Evolution migrează dosarele dumneavoastră..."
 
@@ -14486,8 +13932,7 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
-"Înregistrările modificărilor pentru Evolution Palm Sync și fișierele hartă s-"
-"au schimbat.\n"
+"Înregistrările modificărilor pentru Evolution Palm Sync și fișierele hartă s-au schimbat.\n"
 "\n"
 "Așteptați în timp ce Evolution migrează datele Pilot Sync..."
 
@@ -14544,7 +13989,7 @@ msgid "Show properties of the selected address book"
 msgstr "Arată proprietățile agendei selectate"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
 #: ../modules/calendar/e-task-shell-view-actions.c:734
 #: ../modules/mail/e-mail-shell-view-actions.c:946
@@ -14628,7 +14073,7 @@ msgid "Send a message to the selected contacts"
 msgstr "Trimite un mesaj contactelor selectate"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
 #: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "_Actions"
 msgstr "_Acțiuni"
@@ -14641,7 +14086,7 @@ msgid "_Preview"
 msgstr "_Previzualizare"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1474
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
 #: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Delete"
@@ -14686,25 +14131,25 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Arată previzualizarea contactului lângă lista de contacte"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1617
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
 #: ../modules/calendar/e-task-shell-view-actions.c:905
 msgid "Any Category"
 msgstr "Orice categorie"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/calendar/e-cal-shell-view-actions.c:1631
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
 #: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Unmatched"
 msgstr "Nici o potrivire"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
 #: ../modules/calendar/e-task-shell-view-actions.c:950
 #: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../shell/e-shell-content.c:494
 msgid "Advanced Search"
 msgstr "Căutare avansată"
 
@@ -14819,13 +14264,8 @@ msgid "Search _filter:"
 msgstr "_Filtru de căutare:"
 
 #: ../modules/addressbook/ldap-config.ui.h:17
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-"Filtrul de căutare este tipul obiectului după care se realizează căutarea. "
-"Dacă aceasta nu este modificată, căutarea se va realiza implicit după tipul "
-"„person�."
+msgid "Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type \"person\"."
+msgstr "Filtrul de căutare este tipul obiectului după care se realizează căutarea. Dacă aceasta nu este modificată, căutarea se va realiza implicit după tipul „person�."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:19
@@ -14922,7 +14362,7 @@ msgid "_Appointment"
 msgstr "În_tâlnire"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Create a new appointment"
 msgstr "Creează o programare nouă"
 
@@ -14950,7 +14390,7 @@ msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Create a new calendar"
 msgstr "Creează un calendar nou"
 
@@ -14965,13 +14405,11 @@ msgstr "Registrul pentru calendare"
 
 #: ../modules/calendar/e-cal-shell-migrate.c:131
 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 ""
-"Locația și ierarhia dosarelor calendar pentru Evolution s-au modificat de la "
-"Evolution 1.x\n"
+"Locația și ierarhia dosarelor calendar pentru Evolution s-au modificat de la Evolution 1.x\n"
 "\n"
 "Așteptați în timp ce Evolution va converti dosarele dumneavoastră..."
 
@@ -15039,14 +14477,8 @@ msgid "Print"
 msgstr "Tipărește"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:306
-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 ""
-"Această operație va șterge permanent toate evenimentele mai vechi decât data "
-"specificată. Dacă veți continua, nu veți mai putea recupera aceste "
-"evenimente."
+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 "Această operație va șterge permanent toate evenimentele mai vechi decât data specificată. Dacă veți continua, nu veți mai putea recupera aceste evenimente."
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
@@ -15076,115 +14508,115 @@ msgstr "eveniment"
 msgid "Save as iCalendar"
 msgstr "Salveză ca iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "_Copiază..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "D_elete Calendar"
 msgstr "Șt_erge calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1254
 msgid "Delete the selected calendar"
 msgstr "Șterge calendarul selectat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1261
 msgid "Go Back"
 msgstr "Mergi înapoi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
 msgid "Go Forward"
 msgstr "Mergi înainte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Select _Today"
 msgstr "Selectează _azi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
 msgid "Select today"
 msgstr "Selectează astăzi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select _Date"
 msgstr "Selectează _dată"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
 msgid "Select a specific date"
 msgstr "Selectează o dată specifică"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "_New Calendar"
 msgstr "Calendar _nou"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
 #: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Purg_e"
 msgstr "Șterge _definitiv"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 msgid "Purge old appointments and meetings"
 msgstr "Șterge definitiv întâlnirile și ședințele vechi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
 #: ../modules/calendar/e-task-shell-view-actions.c:727
 msgid "Re_fresh"
 msgstr "Ac_tualizează"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 msgid "Refresh the selected calendar"
 msgstr "Reîncarcă calendarul selectat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Rename the selected calendar"
 msgstr "Redenumește calendarul selectat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Show _Only This Calendar"
 msgstr "Arată d_oar acest calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1329
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iez în calendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1336
 msgid "_Delegate Meeting..."
 msgstr "_Delegă ședința..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1343
 msgid "_Delete Appointment"
 msgstr "Ș_terge întâlnirea"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "Delete selected appointments"
 msgstr "Șterge întâlnirea selectată"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete This _Occurrence"
 msgstr "Șterge această _apariție"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "Delete this occurrence"
 msgstr "Șterge această apariție"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete All Occ_urrences"
 msgstr "Șterge _toate aparițiile"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "Delete all occurrences"
 msgstr "Șterge toate aparițiile"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "New All Day _Event..."
 msgstr "_Eveniment nou pentru toată ziua..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Create a new all day event"
 msgstr "Creează un eveniment nouă pentru toată ziua"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
@@ -15192,124 +14624,124 @@ msgstr "Creează un eveniment nouă pentru toată ziua"
 msgid "_Forward as iCalendar..."
 msgstr "Î_naintează ca iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "New _Meeting..."
 msgstr "Șe_dință nouă..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "Create a new meeting"
 msgstr "Creează o nouă ședință"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Mo_ve to Calendar..."
 msgstr "M_ut în calendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "New _Appointment..."
 msgstr "_Programare nouă..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Make this Occurrence _Movable"
 msgstr "Fă această apariție _mutabilă"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "_Open Appointment"
 msgstr "_Deschide întâlnire"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "View the current appointment"
 msgstr "Afișează întâlnirea curentă"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "_Reply"
 msgstr "_Răspunde"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1427
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Salvează ca iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
 msgid "_Schedule Meeting..."
 msgstr "Progra_mează ședința..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Converts an appointment to a meeting"
 msgstr "Convertește o întâlnire într-o ședință"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_ertește la întâlnire..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Converts a meeting to an appointment"
 msgstr "Convertește o întâlnire într-o ședință"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1572
 msgid "Day"
 msgstr "Zi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1574
 msgid "Show one day"
 msgstr "Afișează o zi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "List"
 msgstr "Listă"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "Show as list"
 msgstr "Afișează ca listă"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Month"
 msgstr "Lună"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "Show one month"
 msgstr "Afișează o lună"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Week"
 msgstr "Săptămână"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Show one week"
 msgstr "Afișează o săptămână"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Show one work week"
 msgstr "Arată o săptămână de lucru"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1610
 msgid "Active Appointments"
 msgstr "Întâlniri Active"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1624
 msgid "Next 7 Days' Appointments"
 msgstr "Întâlnirile pentru următoarele 7 zile"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1655
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
 #: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Description contains"
 msgstr "Descrierea conține"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1662
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
 #: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Summary contains"
 msgstr "Rezumatul conține"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
 msgid "Print this calendar"
 msgstr "Tipărește acest calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
 msgid "Preview the calendar to be printed"
 msgstr "Previzualizează calendar pentru tipărire"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1754
 msgid "Go To"
 msgstr "Salt la"
 
@@ -15597,13 +15029,11 @@ msgstr "Model tabel sarcină"
 
 #: ../modules/calendar/e-task-shell-migrate.c:98
 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 ""
-"Locația și ierarhia dosarelor de sarcini Evolution s-au modificat de la "
-"Evolution 1.x\n"
+"Locația și ierarhia dosarelor de sarcini Evolution s-au modificat de la Evolution 1.x\n"
 "\n"
 "Așteptați în timp ce Evolution va converti dosarele dumneavoastră..."
 
@@ -15646,13 +15076,11 @@ msgstr "Tipărește sarcinile"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:553
 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 ""
-"Această operație va șterge toate sarcinile marcate drept complete. Dacă veți "
-"continua, nu veți mai putea recupera aceste sarcini.\n"
+"Această operație va șterge toate sarcinile marcate drept complete. Dacă veți continua, nu veți mai putea recupera aceste sarcini.\n"
 "\n"
 "Ștergeți într-adevăr aceste sarcini?"
 
@@ -15846,8 +15274,7 @@ msgstr "_Descarcă mesaje pentru lucrul deconectat"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:878
 msgid "Download messages of accounts and folders marked for offline usage"
-msgstr ""
-"Descarcă mesajele din conturile și dosarele marcate pentru lucrul deconectat"
+msgstr "Descarcă mesajele din conturile și dosarele marcate pentru lucrul deconectat"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "Fl_ush Outbox"
@@ -15915,9 +15342,7 @@ msgstr "Selectează _grupul de mesaje"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"Selectează toate mesajele ce fac parte din aceași discuție cu mesajul "
-"selectat"
+msgstr "Selectează toate mesajele ce fac parte din aceași discuție cu mesajul selectat"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:960
 msgid "Select Message S_ubthread"
@@ -16036,8 +15461,7 @@ msgid "Hide _Deleted Messages"
 msgstr "Ascunde mesajele ș_terse"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1149
-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 "Ascunde mesajele șterse mai degrabă decât afișate tăiate cu o linie"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1156
@@ -16236,16 +15660,17 @@ msgid "Contains Value"
 msgstr "Conține valoare"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:722
+#: ../modules/mail/em-mailer-prefs.c:793
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Modulul %s este disponibil și instalat."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:730
+#: ../modules/mail/em-mailer-prefs.c:802
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "Modulul %s nu este disponibil. Verifică dacă pachetul este instalat."
 
 #: ../modules/mail/em-mailer-prefs.c:766
@@ -16291,20 +15716,12 @@ msgid "Local Address Books"
 msgstr "Agende locale"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
-msgstr ""
-"Lista cu indicii pe care să le caute în conținutul mesajului modulul "
-"atenționare atașament"
+msgid "List of clues for the attachment reminder plugin to look for in a message body"
+msgstr "Lista cu indicii pe care să le caute în conținutul mesajului modulul atenționare atașament"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Lista cu indicii de căutat în conținutul mesajului pentru modului de "
-"atenționarea atașamente."
+msgid "List of clues for the attachment reminder plugin to look for in a message body."
+msgstr "Lista cu indicii de căutat în conținutul mesajului pentru modului de atenționarea atașamente."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:514
 #: ../plugins/templates/templates.c:413
@@ -16312,12 +15729,8 @@ msgid "Keywords"
 msgstr "Cuvinte cheie"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid ""
-"Evolution has found some keywords that suggest that this message should "
-"contain an attachment, but cannot find one."
-msgstr ""
-"Evolution a găsit în acest mesaj cuvinte care sugerează că mesajul ar "
-"trebuie să conțină un atașamanet, dar mesajul nu are nici un atașament."
+msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
+msgstr "Evolution a găsit în acest mesaj cuvinte care sugerează că mesajul ar trebuie să conțină un atașamanet, dar mesajul nu are nici un atașament."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid "Message has no attachments"
@@ -16337,8 +15750,7 @@ msgstr "Atenționare atașament"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid "Reminds you when you forgot to add an attachment to a mail message."
-msgstr ""
-"Vă atenționează atunci când ați uitat să adăugați un atașament mesajului."
+msgstr "Vă atenționează atunci când ați uitat să adăugați un atașament mesajului."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid "Inline Audio"
@@ -16365,14 +15777,8 @@ msgid "_Restart Evolution after restore"
 msgstr "_Restartați Evolution după restaurare"
 
 #: ../plugins/backup-restore/backup-restore.c:290
-msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
-msgstr ""
-"Poți restaura Evolution dintr-o copie de siguranță. Această copie conține "
-"toate mesajele, calendarele, sarcinile, notițele, contactele.De asemenea "
-"sunt restaurate toate configurările, filtrele de mesaje etc."
+msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
+msgstr "Poți restaura Evolution dintr-o copie de siguranță. Această copie conține toate mesajele, calendarele, sarcinile, notițele, contactele.De asemenea sunt restaurate toate configurările, filtrele de mesaje etc."
 
 #: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
@@ -16396,9 +15802,7 @@ msgstr "Configurări _copie de siguranță..."
 
 #: ../plugins/backup-restore/backup-restore.c:355
 msgid "Backup Evolution data and settings to an archive file"
-msgstr ""
-"Realizează copii de siguranță pentru datele și configurări Evolution într-un "
-"fișier arhivă"
+msgstr "Realizează copii de siguranță pentru datele și configurări Evolution într-un fișier arhivă"
 
 #: ../plugins/backup-restore/backup-restore.c:360
 msgid "R_estore Settings..."
@@ -16406,9 +15810,7 @@ msgstr "R_estaurare configurări..."
 
 #: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore Evolution data and settings from an archive file"
-msgstr ""
-"Recuperează copii de siguranță pentru datele și configurările Evolution "
-"dintr-un fișier arhivă"
+msgstr "Recuperează copii de siguranță pentru datele și configurările Evolution dintr-un fișier arhivă"
 
 #: ../plugins/backup-restore/backup.c:63
 msgid "Backup Evolution directory"
@@ -16441,9 +15843,7 @@ msgstr "Se copiază de siguranță conturile și configurările Evolution"
 
 #: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
-"Se copiază de siguranță datele Evolution (masage, contacte, calendare, "
-"sarcini, notițe)"
+msgstr "Se copiază de siguranță datele Evolution (masage, contacte, calendare, sarcini, notițe)"
 
 #: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
@@ -16500,8 +15900,7 @@ msgstr "Se salvează datele evolution"
 
 #: ../plugins/backup-restore/backup.c:489
 msgid "Please wait while Evolution is backing up your data."
-msgstr ""
-"Așteptați în timp ce Evolution salvează de siguranță datele dumneavoastră."
+msgstr "Așteptați în timp ce Evolution salvează de siguranță datele dumneavoastră."
 
 #: ../plugins/backup-restore/backup.c:491
 msgid "Restoring Evolution Data"
@@ -16513,8 +15912,7 @@ msgstr "Așteptați în timp ce Evolution restaurează datele dumneavoastră."
 
 #: ../plugins/backup-restore/backup.c:510
 msgid "This may take a while depending on the amount of data in your account."
-msgstr ""
-"Acestă operație poate dura, în funcție de datele din contul dumneavoastră."
+msgstr "Acestă operație poate dura, în funcție de datele din contul dumneavoastră."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
@@ -16523,29 +15921,19 @@ msgstr "Copie de siguranță și restaurare"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore your Evolution data and settings."
-msgstr ""
-"Realizare de copii de siguranță și restaurare pentru datele și configurările "
-"Evolution."
+msgstr "Realizare de copii de siguranță și restaurare pentru datele și configurările Evolution."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
 msgstr "Dorești să închizi Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "Sigur doriți să restaurați Evolution din copia de sigurantă aleasă?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding.  If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"Restaurarea Evolution poate porni doar când Evolution nu rulează. Înainte de "
-"a continua asigurați-vă că toate mesajele sunt salvate. Dacă doriți "
-"repornirea automată a Evolution, activați butonul de comutare."
+msgid "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding.  If you want Evolution to restart automatically after backup, please enable the toggle button."
+msgstr "Restaurarea Evolution poate porni doar când Evolution nu rulează. Înainte de a continua asigurați-vă că toate mesajele sunt salvate. Dacă doriți repornirea automată a Evolution, activați butonul de comutare."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
@@ -16564,20 +15952,11 @@ msgid "The selected folder is not writable."
 msgstr "Dosarul ales nu poate fi scris."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
-msgstr ""
-"Aceasta va șterge toate datele și configurările curente din Evolution și le "
-"va restaura din copia de siguranță. Restaurarea Evolution poate fi pornită "
-"doar când Evolution este oprit. Înainte de a continua, asigurați-vă că ați "
-"închis toate mesajele nesalvate. Aveți posibilitatea de a porni Evolution "
-"automat după restaurare."
+msgid "This will delete all your current Evolution data and settings and restore them from your backup. Evolution restore can start only when Evolution is not running. Please make sure that you close all your unsaved windows before you proceed. If you want Evolution to restart automatically restart after restore, please enable the toggle button."
+msgstr "Aceasta va șterge toate datele și configurările curente din Evolution și le va restaura din copia de siguranță. Restaurarea Evolution poate fi pornită doar când Evolution este oprit. Înainte de a continua, asigurați-vă că ați închis toate mesajele nesalvate. Aveți posibilitatea de a porni Evolution automat după restaurare."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:686
+#: ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contacte automate"
@@ -16617,15 +15996,11 @@ msgstr "BBDB"
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages.  Also fills in IM contact information from your buddy "
-"lists."
+"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists."
 msgstr ""
 "Vă scapă de povara organizării agendei.\n"
 "\n"
-"Completează automat agenda cu nume și adrese de email când se răspunde "
-"mesajelor. Deasemenea completează contactul de mesagerie instant din lista "
-"de prieteni."
+"Completează automat agenda cu nume și adrese de email când se răspunde mesajelor. Deasemenea completează contactul de mesagerie instant din lista de prieteni."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
@@ -16646,9 +16021,7 @@ msgstr "Procesul copil Bogofilter nu răspunde, se termină..."
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr ""
-"Așteptarea pentru procesul copil Bogofilter a fost întreruptă, se "
-"finalizează..."
+msgstr "Așteptarea pentru procesul copil Bogofilter a fost întreruptă, se finalizează..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
 #, c-format
@@ -16664,12 +16037,8 @@ msgid "Convert mail messages to Unicode"
 msgstr "Conversie text mesaj la Unicode"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"Transformă textul mesajului la Unicode UTF-8 pentru a unifica elementele de "
-"spam/ham provenind din seturi diferite de caractere."
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
+msgstr "Transformă textul mesajului la Unicode UTF-8 pentru a unifica elementele de spam/ham provenind din seturi diferite de caractere."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
 msgid "Bogofilter Junk Filter"
@@ -16701,7 +16070,8 @@ msgstr ""
 "%d - %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/face/face.c:169
 msgid "Unknown error"
 msgstr "Eroare necunoscută"
 
@@ -16746,8 +16116,7 @@ msgstr "Încercarea anterioară a eșuat cu codul %d"
 #: ../plugins/caldav/caldav-browse-server.c:799
 #, c-format
 msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr ""
-"Introduceți parola pentru utilizatorul <b>%s</b> de pe serverul <b>%s</b>"
+msgstr "Introduceți parola pentru utilizatorul <b>%s</b> de pe serverul <b>%s</b>"
 
 #: ../plugins/caldav/caldav-browse-server.c:856
 #, c-format
@@ -16946,8 +16315,7 @@ msgstr "Arată o hartă a tuturor contactelor"
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
 msgid "Add a map showing the location of contacts when possible."
-msgstr ""
-"Atunci când este posibil, adăugă o hartă care să indice locația contactelor."
+msgstr "Atunci când este posibil, adăugă o hartă care să indice locația contactelor."
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
 msgid "Map for contacts"
@@ -16958,11 +16326,8 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Verifică faptul că Evolution este clientul implicit pentru mail"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"La fiecare pornire a Evolution, verifică dacă este sau nu clientul implicit "
-"pentru mail."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "La fiecare pornire a Evolution, verifică dacă este sau nu clientul implicit pentru mail."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Check whether Evolution is the default mail client on startup."
@@ -17009,10 +16374,7 @@ msgid "List of Custom Headers"
 msgstr "Lista antetelor personalizate"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
+msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
 
 #: ../plugins/email-custom-header/email-custom-header.c:316
@@ -17080,8 +16442,7 @@ msgstr "Antet personalizat mesaj"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Automatically launch editor when key is pressed in the mail composer"
-msgstr ""
-"Pornește automat editorul când se apasă o tastă în fereastra de redactare."
+msgstr "Pornește automat editorul când se apasă o tastă în fereastra de redactare."
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 #: ../plugins/external-editor/external-editor.c:119
@@ -17130,45 +16491,28 @@ msgid "Editor not launchable"
 msgstr "Editorul nu poate fi lansat"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
-msgid ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
-msgstr ""
-"Evolution nu poate crea un fișier temporare pentru a salva mesajul. "
-"Reîncearcă mai târziu."
+msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
+msgstr "Evolution nu poate crea un fișier temporare pentru a salva mesajul. Reîncearcă mai târziu."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid "External editor still running"
 msgstr "Editorul extern este încă pornit"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
-msgid ""
-"The external editor is still running. The mail composer window cannot be "
-"closed as long as the editor is active."
-msgstr ""
-"Editorul extern este încă pornit. Fereastra de email nu poate fi închisă "
-"atât timp cât editorul este activ."
+msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor is active."
+msgstr "Editorul extern este încă pornit. Fereastra de email nu poate fi închisă atât timp cât editorul este activ."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr ""
-"Editorul extern definit în preferințele modulului nu poate fi lansat. "
-"Încercați definerea altui editor."
+msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different editor."
+msgstr "Editorul extern definit în preferințele modulului nu poate fi lansat. Încercați definerea altui editor."
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
 msgstr "Introdu implicit poza personală"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
-msgid ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
-msgstr ""
-"Dacă să fie introdusă implicit poza personală mesajelor trimise. Înainte de "
-"a defini această opțiune va trebui să definiți o poză, altfel nu se va "
-"întâmpla nimic."
+msgid "Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens."
+msgstr "Dacă să fie introdusă implicit poza personală mesajelor trimise. Înainte de a defini această opțiune va trebui să definiți o poză, altfel nu se va întâmpla nimic."
 
 #: ../plugins/face/face.c:286
 msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
@@ -17231,9 +16575,7 @@ msgstr "<b>Server</b>"
 #: ../plugins/google-account-setup/google-source.c:439
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr ""
-"Introduceți parola utilizatorului %s pentru a accesa lista calendarelor "
-"abonate."
+msgstr "Introduceți parola utilizatorului %s pentru a accesa lista calendarelor abonate."
 
 #: ../plugins/google-account-setup/google-source.c:545
 #, c-format
@@ -17377,12 +16719,8 @@ msgid "Message Retract"
 msgstr "Retragere mesaj"
 
 #: ../plugins/groupwise-features/mail-retract.c:86
-msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this?"
-msgstr ""
-"Retragerea unui mesaj poate cauza ștergerea lui din căsuța destinatarului. "
-"Doriți să efectuați această operație?"
+msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this?"
+msgstr "Retragerea unui mesaj poate cauza ștergerea lui din căsuța destinatarului. Doriți să efectuați această operație?"
 
 #: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
@@ -17427,12 +16765,8 @@ msgid "Invalid user"
 msgstr "Utilizator nevalid"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"Autentificare proxy ca „{0}� a eșuat. Verificați adresa de email și "
-"încercați din nou."
+msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
+msgstr "Autentificare proxy ca „{0}� a eșuat. Verificați adresa de email și încercați din nou."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
@@ -17460,8 +16794,7 @@ msgstr "Nu puteți partaja acest dosar cu utilizatorul „{0}�"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
 msgid "You have to specify a user name which you want to add to the list"
-msgstr ""
-"Trebui să specificați un nume de utilizator pentru a fi adăugat în listă"
+msgstr "Trebui să specificați un nume de utilizator pentru a fi adăugat în listă"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
 msgid "Do you want to resend the meeting?"
@@ -17488,12 +16821,8 @@ msgid "This will create a new meeting using the existing meeting details."
 msgstr "Aceasta va crea o nouă ședină folosind detaliile ședinței existente."
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid ""
-"This will create a new meeting with the existing meeting details. The "
-"recurrence rule needs to be re-entered."
-msgstr ""
-"Veți crea o nouă ședință folosind detaliile ședinței existente. Regula de "
-"recurență va trebui reintrodusă."
+msgid "This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered."
+msgstr "Veți crea o nouă ședință folosind detaliile ședinței existente. Regula de recurență va trebui reintrodusă."
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
@@ -17718,12 +17047,10 @@ msgstr "Antete obișnuite și pentru liste de _mailuri (implicit)"
 
 #: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
+"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
-"Furnizați antentele suplimentare pentru transfer în plus față de cele "
-"standard.\n"
+"Furnizați antentele suplimentare pentru transfer în plus față de cele standard.\n"
 "Puteți ignora asta dacă ați ales „Toate antetele�."
 
 #: ../plugins/imap-features/imap-headers.ui.h:6
@@ -17837,9 +17164,7 @@ msgstr "Nu am putut trimite notificarea de anulare către delegat"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-"Starea participantului nu a putut fi actualizat deoarece starea nu este "
-"validă"
+msgstr "Starea participantului nu a putut fi actualizat deoarece starea nu este validă"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1413
 #, c-format
@@ -17890,12 +17215,8 @@ msgstr "Calendarul atașat nu este valid"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1588
 #: ../plugins/itip-formatter/itip-formatter.c:1599
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
-msgstr ""
-"Mesajul susține că are un calendar, dar acesta nu este un calendar valid "
-"iCalendar."
+msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
+msgstr "Mesajul susține că are un calendar, dar acesta nu este un calendar valid iCalendar."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 #: ../plugins/itip-formatter/itip-formatter.c:1667
@@ -17906,24 +17227,16 @@ msgstr "Elementul din calendar nu este valid"
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 #: ../plugins/itip-formatter/itip-formatter.c:1668
 #: ../plugins/itip-formatter/itip-formatter.c:1774
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-msgstr ""
-"Mesajul conține un calendar, dar calendarul nu conține evenimente, sarcini "
-"sau informație disponibil/ocupat"
+msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
+msgstr "Mesajul conține un calendar, dar calendarul nu conține evenimente, sarcini sau informație disponibil/ocupat"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "The calendar attached contains multiple items"
 msgstr "Calendarul atașat conține elemente multiple"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1682
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr ""
-"Pentru a procesa toate aceste elemente, fișierul ar trebui salvat și "
-"calendarul importat"
+msgid "To process all of these items, the file should be saved and the calendar imported"
+msgstr "Pentru a procesa toate aceste elemente, fișierul ar trebui salvat și calendarul importat"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2447
 msgid "This meeting recurs"
@@ -18136,19 +17449,13 @@ msgstr "<b>%s</b> dorește să adauge la o ședință existentă:"
 
 #: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> până la %s doresc să primească ultimele informații pentru "
-"următoarele întâlnire:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> până la %s doresc să primească ultimele informații pentru următoarele întâlnire:"
 
 #: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr ""
-"<b>%s</b> dorește să primească ultimele informații despre următoarea ședință:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> dorește să primească ultimele informații despre următoarea ședință:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
@@ -18227,29 +17534,18 @@ msgstr "<b>%s</b> dorește să vă adauge la o sarcină existentă:"
 
 #: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> prin %s dorește să primească ultimele informații pentru "
-"următoarele sarcini desemnate:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> prin %s dorește să primească ultimele informații pentru următoarele sarcini desemnate:"
 
 #: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> dorește să primească ultimele informații referitoare la următoarea "
-"sarcină desemnată:"
+msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> dorește să primească ultimele informații referitoare la următoarea sarcină desemnată:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr ""
-"<b>%s</b> prin %s a trimis înapoi următorul răspuns pentru sarcinile "
-"desemnate:"
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "<b>%s</b> prin %s a trimis înapoi următorul răspuns pentru sarcinile desemnate:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
@@ -18268,10 +17564,8 @@ msgstr "<b>%s</b> a anulat următoarea sarcină desemnată:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr ""
-"<b>%s</b> prin %s a propus următoarele modificări pentru sarcinile desemnate:"
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "<b>%s</b> prin %s a propus următoarele modificări pentru sarcinile desemnate:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
@@ -18444,9 +17738,7 @@ msgid "Itip Formatter"
 msgstr "Formatare itip"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
 msgstr "„{0}� a delegat ședința. Doriți să adăugați delegatul „{1}�?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -18454,10 +17746,8 @@ msgid "This meeting has been delegated"
 msgstr "Ședința a fost delegată"
 
 #: ../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 ""
-"Acest răspuns nu a fost trimis de un participant. Îl adăugați ca participant?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "Acest răspuns nu a fost trimis de un participant. Îl adăugați ca participant?"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
@@ -18480,12 +17770,8 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Generează un mesaj D-Bus la primirea de noi mesaje."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
-msgstr ""
-"Dacă este „true�, se generează bipuri, altfel, la primierea de mesaje, se va "
-"reda un fișier sunet."
+msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
+msgstr "Dacă este „true�, se generează bipuri, altfel, la primierea de mesaje, se va reda un fișier sunet."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -18497,8 +17783,7 @@ msgstr "Redă un sunet la primirea de noi mesaje."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr ""
-"Redă sunet tematic la primirea de mesaje noi, dacă nu este în modul bip."
+msgstr "Redă sunet tematic la primirea de mesaje noi, dacă nu este în modul bip."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
@@ -18506,9 +17791,7 @@ msgstr "Afișează un mesaj împreună cu pictograma."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr ""
-"Afișează o pictograma de mesaje noi în zona de notificare la primirea de noi "
-"mesaje."
+msgstr "Afișează o pictograma de mesaje noi în zona de notificare la primirea de noi mesaje."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
@@ -18516,8 +17799,7 @@ msgstr "Numele fișierului ce va fi redat."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr ""
-"Fișierul ce va fi redat la primirea de mesaje noi, dacă nu este în modul bip."
+msgstr "Fișierul ce va fi redat la primirea de mesaje noi, dacă nu este în modul bip."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Use sound theme"
@@ -18529,8 +17811,7 @@ msgstr "Dacă se redă un sunet sau un bip atunci când sosește un nou mesaj."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
-"Dacă la primirea mesajelor noi să fie afișat mesajul deasupra pictogramei."
+msgstr "Dacă la primirea mesajelor noi să fie afișat mesajul deasupra pictogramei."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
 msgid "Whether the icon should blink or not."
@@ -18648,105 +17929,51 @@ msgstr "Creată dintr-un mesaj de la %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
-msgid ""
-"Selected calendar contains event '%s' already. Would you like to edit the "
-"old event?"
-msgstr ""
-"Calendarul ales conține deja evenimentul „%s�. Doriți să modificați vechiul "
-"eveniment?"
+msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
+msgstr "Calendarul ales conține deja evenimentul „%s�. Doriți să modificați vechiul eveniment?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:499
 #, c-format
-msgid ""
-"Selected task list contains task '%s' already. Would you like to edit the "
-"old task?"
-msgstr ""
-"Lista de sarcini selectată conține deja sarcina „%s�. Doriți să modificați "
-"vechea sarcină?"
+msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
+msgstr "Lista de sarcini selectată conține deja sarcina „%s�. Doriți să modificați vechea sarcină?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:502
 #, c-format
-msgid ""
-"Selected memo list contains memo '%s' already. Would you like to edit the "
-"old memo?"
-msgstr ""
-"Lista de notițe selectată conține deja notița „%s�. Doriți să modificați "
-"vechea notiță?"
+msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
+msgstr "Lista de notițe selectată conține deja notița „%s�. Doriți să modificați vechea notiță?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:519
-msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
-msgstr ""
-"Calendarul selectat deja conține unele evenimente pentru mesajele date. "
-"Doriți să creați oricum evenimente noi?"
+msgid "Selected calendar contains some events for the given mails already. Would you like to create new events anyway?"
+msgstr "Calendarul selectat deja conține unele evenimente pentru mesajele date. Doriți să creați oricum evenimente noi?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:522
-msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
-msgstr ""
-"Lista de sarcini selectată deja conține unele evenimente pentru mesajele "
-"date. Doriți să creați oricum sarcini noi?"
+msgid "Selected task list contains some tasks for the given mails already. Would you like to create new tasks anyway?"
+msgstr "Lista de sarcini selectată deja conține unele evenimente pentru mesajele date. Doriți să creați oricum sarcini noi?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:525
-msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
-msgstr ""
-"Lista de notițe selectată deja conține unele notițe pentru mesajele date. "
-"Doriți să creați oricum notițe noi?"
+msgid "Selected memo list contains some memos for the given mails already. Would you like to create new memos anyway?"
+msgstr "Lista de notițe selectată deja conține unele notițe pentru mesajele date. Doriți să creați oricum notițe noi?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:543
-msgid ""
-"Selected calendar contains an event for the given mail already. Would you "
-"like to create new event anyway?"
-msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
-msgstr[0] ""
-"Calendarul selectat deja conține un eveniment pentru mesajul dat. Doriți să "
-"creați oricum un eveniment nou?"
-msgstr[1] ""
-"Calendarul selectat deja conține evenimente pentru mesajele date. Doriți să "
-"creați oricum evenimente noi?"
-msgstr[2] ""
-"Calendarul selectat deja conține evenimente pentru mesajele date. Doriți să "
-"creați oricum evenimente noi?"
+msgid "Selected calendar contains an event for the given mail already. Would you like to create new event anyway?"
+msgid_plural "Selected calendar contains events for the given mails already. Would you like to create new events anyway?"
+msgstr[0] "Calendarul selectat deja conține un eveniment pentru mesajul dat. Doriți să creați oricum un eveniment nou?"
+msgstr[1] "Calendarul selectat deja conține evenimente pentru mesajele date. Doriți să creați oricum evenimente noi?"
+msgstr[2] "Calendarul selectat deja conține evenimente pentru mesajele date. Doriți să creați oricum evenimente noi?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:549
-msgid ""
-"Selected task list contains a task for the given mail already. Would you "
-"like to create new task anyway?"
-msgid_plural ""
-"Selected task list contains tasks for the given mails already. Would you "
-"like to create new tasks anyway?"
-msgstr[0] ""
-"Lista de sarcini selectată deja conține o sarcină pentru mesajul dat. Doriți "
-"să creați oricum o sarcină nouă?"
-msgstr[1] ""
-"Lista de sarcini selectată deja conține unele evenimente pentru mesajele "
-"date. Doriți să creați oricum sarcini noi?"
-msgstr[2] ""
-"Lista de sarcini selectată deja conține unele evenimente pentru mesajele "
-"date. Doriți să creați oricum sarcini noi?"
+msgid "Selected task list contains a task for the given mail already. Would you like to create new task anyway?"
+msgid_plural "Selected task list contains tasks for the given mails already. Would you like to create new tasks anyway?"
+msgstr[0] "Lista de sarcini selectată deja conține o sarcină pentru mesajul dat. Doriți să creați oricum o sarcină nouă?"
+msgstr[1] "Lista de sarcini selectată deja conține unele evenimente pentru mesajele date. Doriți să creați oricum sarcini noi?"
+msgstr[2] "Lista de sarcini selectată deja conține unele evenimente pentru mesajele date. Doriți să creați oricum sarcini noi?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:555
-msgid ""
-"Selected memo list contains a memo for the given mail already. Would you "
-"like to create new memo anyway?"
-msgid_plural ""
-"Selected memo list contains memos for the given mails already. Would you "
-"like to create new memos anyway?"
-msgstr[0] ""
-"Lista de notițe selectată deja conține o notiță pentru mesajul dat. Doriți "
-"să creați oricum o notiță nouă?"
-msgstr[1] ""
-"Lista de notițe selectată deja conține unele notițe pentru mesajele date. "
-"Doriți să creați oricum notițe noi?"
-msgstr[2] ""
-"Lista de notițe selectată deja conține unele notițe pentru mesajele date. "
-"Doriți să creați oricum notițe noi?"
+msgid "Selected memo list contains a memo for the given mail already. Would you like to create new memo anyway?"
+msgid_plural "Selected memo list contains memos for the given mails already. Would you like to create new memos anyway?"
+msgstr[0] "Lista de notițe selectată deja conține o notiță pentru mesajul dat. Doriți să creați oricum o notiță nouă?"
+msgstr[1] "Lista de notițe selectată deja conține unele notițe pentru mesajele date. Doriți să creați oricum notițe noi?"
+msgstr[2] "Lista de notițe selectată deja conține unele notițe pentru mesajele date. Doriți să creați oricum notițe noi?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:614
 msgid "[No Summary]"
@@ -18767,28 +17994,16 @@ msgid "Cannot open calendar. %s"
 msgstr "Nu s-a putut deschide calendarul. %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:732
-msgid ""
-"Selected source is read only, thus cannot create event there. Select other "
-"source, please."
-msgstr ""
-"Sursa selectată este doar pentru citire, de aceeea nu puteți crea o sarcină "
-"noua. Alegeți altă sursă."
+msgid "Selected source is read only, thus cannot create event there. Select other source, please."
+msgstr "Sursa selectată este doar pentru citire, de aceeea nu puteți crea o sarcină noua. Alegeți altă sursă."
 
 #: ../plugins/mail-to-task/mail-to-task.c:735
-msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
-msgstr ""
-"Sursa selectată este doar pentru citire, de aceeea nu puteți crea o sarcină "
-"noua. Alegeți altă sursă."
+msgid "Selected source is read only, thus cannot create task there. Select other source, please."
+msgstr "Sursa selectată este doar pentru citire, de aceeea nu puteți crea o sarcină noua. Alegeți altă sursă."
 
 #: ../plugins/mail-to-task/mail-to-task.c:738
-msgid ""
-"Selected source is read only, thus cannot create memo there. Select other "
-"source, please."
-msgstr ""
-"Sursa selectată este doar pentru citire, de aceeea nu puteți crea o notiță "
-"noua. Alegeți altă sursă."
+msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
+msgstr "Sursa selectată este doar pentru citire, de aceeea nu puteți crea o notiță noua. Alegeți altă sursă."
 
 #: ../plugins/mail-to-task/mail-to-task.c:941
 #, c-format
@@ -18845,8 +18060,7 @@ msgstr "Obține informații despre _utilizarea listei"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:292
 msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
-"Obțineți informații despre utilizarea listei de care acest mesaj aparține"
+msgstr "Obțineți informații despre utilizarea listei de care acest mesaj aparține"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:297
 msgid "Contact List _Owner"
@@ -18890,8 +18104,7 @@ msgstr "Acțiuni listă email"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr ""
-"Acțiuni pentru comenzi uzuale de liste mesaje (abonare, dezabonare, etc ...)."
+msgstr "Acțiuni pentru comenzi uzuale de liste mesaje (abonare, dezabonare, etc ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -18899,17 +18112,13 @@ msgstr "Acțiunea nu este disponibilă"
 
 #: ../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 ""
-"Un email va fi trimis către URL-ul „{0}�. Puteți fie să trimiteți mesajul "
-"automat, fie să îl vedeți si să îl modificați mai intâi.\n"
+"Un email va fi trimis către URL-ul „{0}�. Puteți fie să trimiteți mesajul automat, fie să îl vedeți si să îl modificați mai intâi.\n"
 "\n"
-"Ar trebui să primiți un răspuns de la lista de mailuri la scurt timp după ce "
-"mesajul a fost trimis."
+"Ar trebui să primiți un răspuns de la lista de mailuri la scurt timp după ce mesajul a fost trimis."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Malformed header"
@@ -18924,12 +18133,8 @@ msgid "Posting not allowed"
 msgstr "Trimisul nu este permis"
 
 #: ../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 ""
-"Trimisul către această listă nu este permis. Posibil, această listă este una "
-"de tip doar-citire. Contactați proprietarul listei pentru detalii."
+msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
+msgstr "Trimisul către această listă nu este permis. Posibil, această listă este una de tip doar-citire. Contactați proprietarul listei pentru detalii."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
@@ -18937,13 +18142,11 @@ msgstr "Trimite mesajul către lista de mailuri?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"Acțiunea nu a putut fi efectuată. Antetul acestei acțiuni nu conține nici o "
-"acțiune care să poată fi executată.\n"
+"Acțiunea nu a putut fi efectuată. Antetul acestei acțiuni nu conține nici o acțiune care să poată fi executată.\n"
 "\n"
 "Antet: {0}"
 
@@ -18958,11 +18161,8 @@ msgstr ""
 "Antet: {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
-msgstr ""
-"Acest mesaj nu conține informația necesară în antet pentru această acțiune."
+msgid "This message does not contain the header information required for this action."
+msgstr "Acest mesaj nu conține informația necesară în antet pentru această acțiune."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -18977,12 +18177,8 @@ msgid "Also mark messages in subfolders?"
 msgstr "Deasemenea marchează mesajele din subdosare?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:44
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-msgstr ""
-"Doriți să marcați mesajele ca citite doar în dosarul curent sau și în "
-"subdosarele lui?"
+msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
+msgstr "Doriți să marcați mesajele ca citite doar în dosarul curent sau și în subdosarele lui?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:168
 msgid "In Current Folder and _Subfolders"
@@ -19064,24 +18260,16 @@ msgid "Show plain text if present"
 msgstr "Arată text simplu dacă este prezent"
 
 #: ../plugins/prefer-plain/prefer-plain.c:202
-msgid ""
-"Show plain text part, if present, otherwise let Evolution choose the best "
-"part to show."
-msgstr ""
-"Arată partea cu text simplu, dacă este prezentă, alfel permite Evolution să "
-"aleagă cea mai bună parte pentru afișare."
+msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
+msgstr "Arată partea cu text simplu, dacă este prezentă, alfel permite Evolution să aleagă cea mai bună parte pentru afișare."
 
 #: ../plugins/prefer-plain/prefer-plain.c:203
 msgid "Only ever show plain text"
 msgstr ""
 
 #: ../plugins/prefer-plain/prefer-plain.c:203
-msgid ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
-msgstr ""
-"Arată întotdeauna partea cu text simplu și fă atașamente din celelalte "
-"părți, dacă este cerut."
+msgid "Always show plain text part and make attachments from other parts, if requested."
+msgstr "Arată întotdeauna partea cu text simplu și fă atașamente din celelalte părți, dacă este cerut."
 
 #: ../plugins/prefer-plain/prefer-plain.c:250
 msgid "Show s_uppressed HTML parts as attachments"
@@ -19097,8 +18285,7 @@ msgstr "Profiler Evolution"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
 msgid "Profile data events in Evolution (for developers only)."
-msgstr ""
-"Urmărește evenimentele de date din Evolution (doar pentru programatori)"
+msgstr "Urmărește evenimentele de date din Evolution (doar pentru programatori)"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19127,7 +18314,8 @@ msgid "A_ppointments"
 msgstr "În_âlniri"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:330
+#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Sarcini"
 
@@ -19292,9 +18480,7 @@ msgstr "iCal"
 #: ../plugins/publish-calendar/publish-format-ical.c:82
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
-msgstr ""
-"Nu s-a putut publica calendarul: Suportul pentru tipul de calendar nu mai "
-"există"
+msgstr "Nu s-a putut publica calendarul: Suportul pentru tipul de calendar nu mai există"
 
 #: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "New Location"
@@ -19328,9 +18514,7 @@ msgstr "Procesul copil SpamAssasin nu răspunde, se termină..."
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr ""
-"Așteptarea pentru procesul copil SpamAssasin a fost întrepuptă, se "
-"finalizează..."
+msgstr "Așteptarea pentru procesul copil SpamAssasin a fost întrepuptă, se finalizează..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
@@ -19500,15 +18684,18 @@ msgid "Welcome"
 msgstr "Bine ați venit"
 
 #: ../plugins/startup-wizard/startup-wizard.c:118
-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"
+#| msgid ""
+#| "ZZZ ! 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. "
+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 ""
-"Bun venit la Evolution. Următoarele ecrane vor permite aplicației Evolution "
-"să se conecteze la conturile dumneavoastră de email și să importe fișiere "
-"din alte aplicații. \n"
+"Bun venit la Evolution. Următoarele ecrane vor permite aplicației Evolution să se conecteze la conturile dumneavoastră de email și să importe fișiere din alte aplicații. \n"
 "\n"
 "Pentru a continua, faceți clic pe „Înainte�. "
 
@@ -19553,9 +18740,7 @@ msgid "F_all back to threading messages by subject"
 msgstr "Recurge l_a gruparea mesajelor după subiect"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
 msgstr ""
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
@@ -19676,11 +18861,8 @@ msgid "Enable express mode"
 msgstr "Activează modul express"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
-"Activează configurările proxy-ului la accesarea HTTP/HTTP Securizat prin "
-"Internet."
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "Activează configurările proxy-ului la accesarea HTTP/HTTP Securizat prin Internet."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Flag that enables a much simplified user interface."
@@ -19707,16 +18889,8 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID sau alias al componentei ce va fi afișată implicit la pornire."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"Dacă este „true�, conexiunile la serverul proxy necesită autentificare. Nume "
-"de utilizator este obținut din cheia GConf „/apps/evolution/shell/"
-"network_config/authentication_user� iar parola fie din gnome-keyring sau "
-"fișierul de parole ~/.gnome2_private/Evolution."
+msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr "Dacă este „true�, conexiunile la serverul proxy necesită autentificare. Nume de utilizator este obținut din cheia GConf „/apps/evolution/shell/network_config/authentication_user� iar parola fie din gnome-keyring sau fișierul de parole ~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
@@ -19731,22 +18905,16 @@ msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Dosar inițial pentru dialogurile GtkFileChooser."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
-msgstr ""
-"Vizualizarea inițială pentru bara de atașamente. „0� vizualizare iconițe, "
-"„1� vizualizare listă"
+msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
+msgstr "Vizualizarea inițială pentru bara de atașamente. „0� vizualizare iconițe, „1� vizualizare listă"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "Versiunea ultimei configurării actualizate"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-"Listă de căi de dosare sincronizate cu discul pentru folosire deconectată"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgstr "Listă de căi de dosare sincronizate cu discul pentru folosire deconectată"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
@@ -19777,16 +18945,8 @@ msgid "Secure HTTP proxy port"
 msgstr "Port proxy HTTP Securizat"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:32
-msgid ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
-msgstr ""
-"Alege modul de configurare proxy. Valorile suportate sunt 0, 1, 2 și 3 "
-"reprezentând „folosește configurările sistemului�, „fără proxy�, „folosește "
-"configuare proxy manuală� și respectiv „folosește configurarea proxy oferită "
-"în URL-ul de autoconfigurare�. "
+msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
+msgstr "Alege modul de configurare proxy. Valorile suportate sunt 0, 1, 2 și 3 reprezentând „folosește configurările sistemului�, „fără proxy�, „folosește configuare proxy manuală� și respectiv „folosește configurarea proxy oferită în URL-ul de autoconfigurare�. "
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
@@ -19796,7 +18956,8 @@ msgstr "Bara laterală este vizibilă"
 msgid "Skip development warning dialog"
 msgstr "Omite dialogul de avertizare al versiunii de dezvoltare"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/main.c:326
 msgid "Start in offline mode"
 msgstr "Pornește în mod deconectat"
 
@@ -19805,12 +18966,8 @@ msgid "Statusbar is visible"
 msgstr "Bara de stare este vizibilă"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-msgstr ""
-"Versiunea de configurare pentru Evolution, cu nivel de configurare major/"
-"minor (de exemplu „2.6.0�)."
+msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgstr "Versiunea de configurare pentru Evolution, cu nivel de configurare major/minor (de exemplu „2.6.0�)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
@@ -19833,12 +18990,8 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "Lățimea implicită a bării laterale, în pixeli."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
-"Ultima versiune actualizată de configurare a Evolution, cu nivel de "
-"configurare major/minor (de exemplu „2.6.0�)."
+msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgstr "Ultima versiune actualizată de configurare a Evolution, cu nivel de configurare major/minor (de exemplu „2.6.0�)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
@@ -19853,50 +19006,24 @@ msgid "The machine name to proxy socks through."
 msgstr "Numele serverului proxy SOCKS."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-"Portul serverului definit de  „/apps/evolution/shell/network_config/"
-"http_host� pe care îl folosiți ca proxy."
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
+msgstr "Portul serverului definit de  „/apps/evolution/shell/network_config/http_host� pe care îl folosiți ca proxy."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-"Portul serverului definit de  „/apps/evolution/shell/network_config/"
-"secure_host� pe care îl folosiți ca proxy."
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
+msgstr "Portul serverului definit de  „/apps/evolution/shell/network_config/secure_host� pe care îl folosiți ca proxy."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-"Portul serverului definit de  „/apps/evolution/shell/network_config/"
-"socks_host� pe care îl folosiți ca proxy."
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
+msgstr "Portul serverului definit de  „/apps/evolution/shell/network_config/socks_host� pe care îl folosiți ca proxy."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-msgstr ""
-"Stilul butoanelor ferestrei. Poate fi „text�, „icons�, „both�, „toolbar�. "
-"Dacă este definit  „toolbar�, stilul butoanelor este determinat din "
-"opțiunile barei de instrumente GNOME."
+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 "Stilul butoanelor ferestrei. Poate fi „text�, „icons�, „both�, „toolbar�. Dacă este definit  „toolbar�, stilul butoanelor este determinat din opțiunile barei de instrumente GNOME."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr ""
-"Această cheie conține o listă a adreselor la care se preferă conectarea "
-"directă, nu prin proxy. Aceste adrese pot fi nume de servere, domenii (cu "
-"caractere „wildcard�, de ex. *.foo.com), adrese IP (atât IPv4, cât și IPv6) "
-"și adrese de rețea cu mască (de ex. 192.168.0.0/16)."
+msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr "Această cheie conține o listă a adreselor la care se preferă conectarea directă, nu prin proxy. Aceste adrese pot fi nume de servere, domenii (cu caractere „wildcard�, de ex. *.foo.com), adrese IP (atât IPv4, cât și IPv6) și adrese de rețea cu mască (de ex. 192.168.0.0/16)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
@@ -19935,11 +19062,8 @@ msgid "Whether the toolbar should be visible."
 msgstr "Dacă bara de unelte să fie vizibilă."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Dacă dialogul de avertisment din versiunile de dezvoltare Evolution să fie "
-"dezactivate."
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgstr "Dacă dialogul de avertisment din versiunile de dezvoltare Evolution să fie dezactivate."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
@@ -19953,15 +19077,17 @@ msgstr "Stil de butoane pentru ferestre"
 msgid "Window buttons are visible"
 msgstr "Butoanele ferestrei sunt vizibile"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:555
+#: ../shell/e-shell-content.c:556
 msgid "Searches"
 msgstr "Căutări"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:597
 msgid "Save Search"
 msgstr "Salvează căutarea"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
+#: ../shell/e-shell-migrate.c:287
+#: ../shell/e-shell-migrate.c:288
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
@@ -19970,123 +19096,124 @@ msgstr "%ld KB"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:887
 msgid "Sho_w:"
 msgstr "Ara_tă: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:914
 msgid "Sear_ch:"
 msgstr "_Caută: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:974
 msgid "i_n"
 msgstr "î_n "
 
-#: ../shell/e-shell-switcher.c:448
+#: ../shell/e-shell-switcher.c:457
 msgid "Toolbar Style"
 msgstr "Stil bară de unelte"
 
-#: ../shell/e-shell-switcher.c:449
+#: ../shell/e-shell-switcher.c:458
 msgid "The switcher's toolbar style"
 msgstr ""
 
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
+#: ../shell/e-shell-switcher.c:474
+#: ../shell/e-shell-window.c:745
 msgid "Toolbar Visible"
 msgstr "Bara de unelte este vizibilă"
 
-#: ../shell/e-shell-switcher.c:466
+#: ../shell/e-shell-switcher.c:475
 msgid "Whether the switcher is visible"
 msgstr ""
 
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:247
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:249
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:270
 msgid "All Files (*)"
 msgstr "Toate fișierele (*)"
 
-#: ../shell/e-shell-view.c:675
+#: ../shell/e-shell-view.c:678
 msgid "Switcher Action"
 msgstr ""
 
-#: ../shell/e-shell-view.c:676
+#: ../shell/e-shell-view.c:679
 msgid "The switcher action for this shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:691
+#: ../shell/e-shell-view.c:694
 msgid "Page Number"
 msgstr "Număr pagină"
 
-#: ../shell/e-shell-view.c:692
+#: ../shell/e-shell-view.c:695
 msgid "The notebook page number of the shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:708
+#: ../shell/e-shell-view.c:711
 msgid "Search Rule"
 msgstr "Criteriu de căutare"
 
-#: ../shell/e-shell-view.c:709
+#: ../shell/e-shell-view.c:712
 msgid "Criteria for the current search results"
 msgstr "Criteriul pentru rezultatele din căutarea"
 
-#: ../shell/e-shell-view.c:724
+#: ../shell/e-shell-view.c:727
 msgid "The EShellBackend for this shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:739
+#: ../shell/e-shell-view.c:742
 msgid "Shell Content Widget"
 msgstr ""
 
-#: ../shell/e-shell-view.c:740
+#: ../shell/e-shell-view.c:743
 msgid "The content widget appears in a shell window's right pane"
 msgstr ""
 
-#: ../shell/e-shell-view.c:756
+#: ../shell/e-shell-view.c:759
 msgid "Shell Sidebar Widget"
 msgstr "Widget bară laterală shell"
 
-#: ../shell/e-shell-view.c:757
+#: ../shell/e-shell-view.c:760
 msgid "The sidebar widget appears in a shell window's left pane"
 msgstr ""
 
-#: ../shell/e-shell-view.c:772
+#: ../shell/e-shell-view.c:775
 msgid "Shell Taskbar Widget"
 msgstr ""
 
-#: ../shell/e-shell-view.c:773
+#: ../shell/e-shell-view.c:776
 msgid "The taskbar widget appears at the bottom of a shell window"
 msgstr ""
 
-#: ../shell/e-shell-view.c:788
+#: ../shell/e-shell-view.c:791
 msgid "Shell Window"
 msgstr "Fereastră shell"
 
-#: ../shell/e-shell-view.c:789
+#: ../shell/e-shell-view.c:792
 msgid "The window to which the shell view belongs"
 msgstr ""
 
-#: ../shell/e-shell-view.c:805
+#: ../shell/e-shell-view.c:808
 msgid "The key file holding widget state data"
 msgstr ""
 
-#: ../shell/e-shell-view.c:820
+#: ../shell/e-shell-view.c:823
 msgid "The title of the shell view"
 msgstr "Titlul vizualizării shell"
 
-#: ../shell/e-shell-view.c:834
+#: ../shell/e-shell-view.c:837
 msgid "Current View ID"
 msgstr "ID vizualizare curentă"
 
-#: ../shell/e-shell-view.c:835
+#: ../shell/e-shell-view.c:838
 msgid "The current GAL view ID"
 msgstr ""
 
@@ -20355,9 +19482,7 @@ msgstr "Stil _bară de unelte"
 
 #: ../shell/e-shell-window-actions.c:1777
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"Afișează butoanele ferestrei folosind configurările pentru bara de "
-"instrumente din deskop"
+msgstr "Afișează butoanele ferestrei folosind configurările pentru bara de instrumente din deskop"
 
 #: ../shell/e-shell-window-actions.c:1785
 msgid "Define Views..."
@@ -20401,76 +19526,78 @@ msgid "Execute these search parameters"
 msgstr "Execută acești parametrii de căutare"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:569
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:372
 msgid "New"
 msgstr "Nou"
 
-#: ../shell/e-shell-window.c:616
+#: ../shell/e-shell-window.c:621
 msgid "Active Shell View"
 msgstr "Vizualizare activă shell"
 
-#: ../shell/e-shell-window.c:617
+#: ../shell/e-shell-window.c:622
 msgid "Name of the active shell view"
 msgstr "Numele vizualizări shell active"
 
-#: ../shell/e-shell-window.c:632
+#: ../shell/e-shell-window.c:637
 msgid "The shell window's EFocusTracker"
 msgstr ""
 
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
+#: ../shell/e-shell-window.c:651
+#: ../shell/e-shell.c:804
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
+#: ../shell/e-shell-window.c:652
+#: ../shell/e-shell.c:805
 msgid "Initial window geometry string"
 msgstr "Text cu geometria inițială a ferestrei"
 
-#: ../shell/e-shell-window.c:662
+#: ../shell/e-shell-window.c:667
 msgid "Safe Mode"
 msgstr "Mod sigur"
 
-#: ../shell/e-shell-window.c:663
+#: ../shell/e-shell-window.c:668
 msgid "Whether the shell window is in safe mode"
 msgstr "Dacă fereastra shell este în modul sigur"
 
-#: ../shell/e-shell-window.c:694
+#: ../shell/e-shell-window.c:699
 msgid "Sidebar Visible"
 msgstr "Bară laterală vizibilă"
 
-#: ../shell/e-shell-window.c:695
+#: ../shell/e-shell-window.c:700
 msgid "Whether the shell window's side bar is visible"
 msgstr "Dacă bara laterală a ferestrei shell este vizibilă"
 
-#: ../shell/e-shell-window.c:709
+#: ../shell/e-shell-window.c:714
 msgid "Switcher Visible"
 msgstr ""
 
-#: ../shell/e-shell-window.c:710
+#: ../shell/e-shell-window.c:715
 msgid "Whether the shell window's switcher buttons are visible"
 msgstr ""
 
-#: ../shell/e-shell-window.c:725
+#: ../shell/e-shell-window.c:730
 msgid "Taskbar Visible"
 msgstr "Bară de unelte vizibilă"
 
-#: ../shell/e-shell-window.c:726
+#: ../shell/e-shell-window.c:731
 msgid "Whether the shell window's task bar is visible"
 msgstr ""
 
-#: ../shell/e-shell-window.c:741
+#: ../shell/e-shell-window.c:746
 msgid "Whether the shell window's tool bar is visible"
 msgstr ""
 
-#: ../shell/e-shell-window.c:755
+#: ../shell/e-shell-window.c:760
 msgid "UI Manager"
 msgstr "Manager UI"
 
-#: ../shell/e-shell-window.c:756
+#: ../shell/e-shell-window.c:761
 msgid "The shell window's GtkUIManager"
 msgstr ""
 
@@ -20486,30 +19613,39 @@ msgstr "Se pregătește conectarea..."
 msgid "Preparing to quit..."
 msgstr "Se pregătește ieșirea..."
 
-#: ../shell/e-shell.c:819
+#: ../shell/e-shell.c:820
 msgid "Module Directory"
 msgstr "Director modul"
 
-#: ../shell/e-shell.c:820
+#: ../shell/e-shell.c:821
 msgid "The directory from which to load EModules"
 msgstr "Dosarul de unde să fie încărcate EModulele."
 
-#: ../shell/e-shell.c:835
+#: ../shell/e-shell.c:836
 msgid "Network Available"
 msgstr "Rețea disponibilă"
 
-#: ../shell/e-shell.c:836
+#: ../shell/e-shell.c:837
 msgid "Whether the network is available"
 msgstr "Dacă rețeaua este disponibilă"
 
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
+#: ../shell/e-shell.c:852
+#: ../widgets/misc/e-online-button.c:134
 msgid "Online"
 msgstr "Conectat"
 
-#: ../shell/e-shell.c:852
+#: ../shell/e-shell.c:853
 msgid "Whether the shell is online"
 msgstr "Dacă shell-ul este conectat"
 
+#: ../shell/e-shell.c:868
+msgid "Shell Settings"
+msgstr "Configurări shell"
+
+#: ../shell/e-shell.c:869
+msgid "Application-wide settings"
+msgstr "Configurări pentru toată aplicația"
+
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:168
 #, no-c-format
@@ -20584,8 +19720,7 @@ msgstr "Migrează forțat de la Evolution 1.4"
 
 #: ../shell/main.c:340
 msgid "Send the debugging output of all components to a file."
-msgstr ""
-"Trimite ieșirile pentru depanare ale tuturor componentelor într-un fișier."
+msgstr "Trimite ieșirile pentru depanare ale tuturor componentelor într-un fișier."
 
 #: ../shell/main.c:342
 msgid "Disable loading of any plugins."
@@ -20593,8 +19728,7 @@ msgstr "Dezactivează încărcarea oricăror module."
 
 #: ../shell/main.c:344
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr ""
-"Dezactivează panoul de previzualizare pentru Mesaje, Contacte și Sarcini."
+msgstr "Dezactivează panoul de previzualizare pentru Mesaje, Contacte și Sarcini."
 
 #: ../shell/main.c:348
 msgid "Import URIs or file names given as rest of arguments."
@@ -20630,12 +19764,8 @@ msgid "Delete old data from version {0}?"
 msgstr "Ștergeți datele vechi din versiunea {0}?"
 
 #: ../shell/shell.error.xml.h:4
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"Uitarea parolelor dumneavoastră va duce la ștergerea tuturor parolelor "
-"memorate. Vi se vor cere din nou data viitoare când va fi nevoie de ele."
+msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
+msgstr "Uitarea parolelor dumneavoastră va duce la ștergerea tuturor parolelor memorate. Vi se vor cere din nou data viitoare când va fi nevoie de ele."
 
 #: ../shell/shell.error.xml.h:6
 msgid "Insufficient disk space for upgrade."
@@ -20647,39 +19777,27 @@ msgstr "Ștergeți într-adevăr datele vechi?"
 
 #: ../shell/shell.error.xml.h:8
 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 ""
 "Întregul conținut al directorului „evolution� va fi șters permanent.\n"
 "\n"
-"Vă sugerăm să verificați manual că toate mailurile, contactele și datele de "
-"calendar sunt prezente, și că această versiune de Evolution funcționează "
-"corect înainte de a șterge aceste date vechi.\n"
+"Vă sugerăm să verificați manual că toate mailurile, contactele și datele de calendar sunt prezente, și că această versiune de Evolution funcționează corect înainte de a șterge aceste date vechi.\n"
 "\n"
-"Odată șterse, nu puteți reveni la versiunea anterioară de Evolution fără o "
-"intervenție manuală.\n"
+"Odată șterse, nu puteți reveni la versiunea anterioară de Evolution fără o intervenție manuală.\n"
 
 #: ../shell/shell.error.xml.h:14
 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 ""
 "Versiunea anterioară de Evolution stoca datele într-un alt loc.\n"
 "\n"
-"Dacă alegeți să ștergeți aceste date, întregul conținut al dosarului "
-"„evolution� va fi șters definitiv. În cazul în care doriți să păstrați "
-"datele, va trebui să ștergeți manual datele din „evolution�.\n"
+"Dacă alegeți să ștergeți aceste date, întregul conținut al dosarului „evolution� va fi șters definitiv. În cazul în care doriți să păstrați datele, va trebui să ștergeți manual datele din „evolution�.\n"
 
 #: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
@@ -20687,17 +19805,13 @@ msgstr "Actualizarea de la versiunea anterioară a eșuat:"
 
 #: ../shell/shell.error.xml.h:19
 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 ""
-"Actualizarea datelor și configurărilior va necesita până la {0} spațiu pe "
-"disc, dar dumneavoastră aveți doar {1} disponibili.\n"
+"Actualizarea datelor și configurărilior va necesita până la {0} spațiu pe disc, dar dumneavoastră aveți doar {1} disponibili.\n"
 "\n"
-"Va trebui să eliberați mai mult spațiu pe disc în directorul acasă înainte "
-"de a putea continua."
+"Va trebui să eliberați mai mult spațiu pe disc în directorul acasă înainte de a putea continua."
 
 #: ../shell/shell.error.xml.h:22
 msgid "_Forget"
@@ -20715,13 +19829,11 @@ msgstr "_Reamintește-mi mai târziu"
 msgid ""
 "{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{0}\n"
 "\n"
-"Dacă alegeți să continuați, s-ar putea să nu mai puteți avea acces la unele "
-"dintre datele dumneavoastră mai vechi.\n"
+"Dacă alegeți să continuați, s-ar putea să nu mai puteți avea acces la unele dintre datele dumneavoastră mai vechi.\n"
 
 #: ../shell/test/e-test-shell-backend.c:60
 msgctxt "New"
@@ -20769,8 +19881,7 @@ msgstr "Opțiune de lansare necunoscută: %d"
 #: ../smclient/eggdesktopfile.c:1373
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-"Nu se poate trimite URI-ul documentului unei intrări desktop „Type=Link�"
+msgstr "Nu se poate trimite URI-ul documentului unei intrări desktop „Type=Link�"
 
 #: ../smclient/eggdesktopfile.c:1394
 #, c-format
@@ -20817,24 +19928,12 @@ msgstr ""
 "Editează opțiunile de încredere:"
 
 #: ../smime/gui/cert-trust-dialog.c:144
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"Deoarece aveți încredere în autoritatea de certificare care a emis acest "
-"certificat, veți avea încredere în autenticitatea acestui certificat, mai "
-"puțin în cazul în care indicați altceva aici"
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Deoarece aveți încredere în autoritatea de certificare care a emis acest certificat, veți avea încredere în autenticitatea acestui certificat, mai puțin în cazul în care indicați altceva aici"
 
 #: ../smime/gui/cert-trust-dialog.c:148
-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 ""
-"Deoarece nu aveți încredere în autoritatea de certificare care a emis acest "
-"certificat, nu veți avea încredere în autenticitatea acestui certificat, mai "
-"puțin în cazul în care indicați altceva aici"
+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 "Deoarece nu aveți încredere în autoritatea de certificare care a emis acest certificat, nu veți avea încredere în autenticitatea acestui certificat, mai puțin în cazul în care indicați altceva aici"
 
 #: ../smime/gui/certificate-manager.c:135
 #: ../smime/gui/certificate-manager.c:382
@@ -20863,7 +19962,8 @@ msgstr "Nume certificat"
 msgid "Purposes"
 msgstr "Scopuri"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:292
+#: ../smime/gui/smime-ui.ui.h:34
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Număr serial"
@@ -20947,15 +20047,11 @@ msgid "Backup All"
 msgstr "Fă o copie de siguranță la tot"
 
 #: ../smime/gui/smime-ui.ui.h:5
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"Înainte de a avea încredere în acest CA în orice scop, ar trebui mai întâi "
-"să îi examinați certificatul și politicile și procedurile sale (dacă sunt "
-"disponibile)."
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+msgstr "Înainte de a avea încredere în acest CA în orice scop, ar trebui mai întâi să îi examinați certificatul și politicile și procedurile sale (dacă sunt disponibile)."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:6
+#: ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "Certificat"
 
@@ -21051,11 +20147,13 @@ msgstr "Unitate organizațională (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Amprentă SHA1"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:32
+#: ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "Certificat SSL client"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:33
+#: ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "Certificat server SSL"
 
@@ -21092,10 +20190,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Aveți certificate de la aceste organizații care vă identifică:"
 
 #: ../smime/gui/smime-ui.ui.h:43
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"Aveți certificate în fișier care identifică aceste autorități de certificare:"
+msgid "You have certificates on file that identify these certificate authorities:"
+msgstr "Aveți certificate în fișier care identifică aceste autorități de certificare:"
 
 #: ../smime/gui/smime-ui.ui.h:44
 msgid "You have certificates on file that identify these people:"
@@ -21114,7 +20210,8 @@ msgstr "_Editare încredere CA"
 msgid "Certificate already exists"
 msgstr "Certificatul deja există"
 
-#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:228
+#: ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
@@ -21196,11 +20293,13 @@ msgstr "Algoritm cheie publică pentru subiect"
 msgid "Subject's Public Key"
 msgstr "Cheia publică a subiectului"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:806
+#: ../smime/lib/e-cert.c:855
 msgid "Error: Unable to process extension"
 msgstr "Eroare: Nu am putut procesa extensia"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:827
+#: ../smime/lib/e-cert.c:839
 msgid "Object Signer"
 msgstr "Semnatar obiect"
 
@@ -21244,7 +20343,8 @@ msgstr "Semnatar CRL"
 msgid "Critical"
 msgstr "Critic"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:937
+#: ../smime/lib/e-cert.c:940
 msgid "Not Critical"
 msgstr "Necritic"
 
@@ -21257,7 +20357,8 @@ msgstr "Extensii"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1085
+#: ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritm semnare certificat"
 
@@ -21297,7 +20398,8 @@ msgstr "De către _companie"
 msgid "_Address Cards"
 msgstr "Cărți de _vizită"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "Afișare _listă"
 
@@ -21384,12 +20486,10 @@ msgstr "Combinație de căsuțe pentru fus orar"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the 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 ""
-"Folosiți butonul din stânga al mausului pentru a mări o zonă de pe hartă și "
-"selectați ora locală.\n"
+"Folosiți butonul din stânga al mausului pentru a mări o zonă de pe hartă și selectați ora locală.\n"
 "Folosiți butonul din dreapta al mausului pentru a micșora."
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
@@ -21556,7 +20656,8 @@ msgstr[2] "Salvează atașamentele"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1779
+#: ../widgets/misc/e-attachment.c:2319
 msgid "attachment.dat"
 msgstr "atașament.dat"
 
@@ -21594,11 +20695,13 @@ msgstr "Deschide acest atașament în %s"
 msgid "Attached message"
 msgstr "Mesaj atașat"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1820
+#: ../widgets/misc/e-attachment.c:2621
 msgid "A load operation is already in progress"
 msgstr "Are loc deja o operație de încărcare"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1828
+#: ../widgets/misc/e-attachment.c:2629
 msgid "A save operation is already in progress"
 msgstr "Are loc deja o operație de salvare"
 
@@ -21642,7 +20745,7 @@ msgid "Ctrl-click to open a link"
 msgstr "Ctrl-clic pentru a deschide o legătură"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21651,7 +20754,8 @@ msgid "Month Calendar"
 msgstr "Calendar lunar"
 
 #: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
+#: ../widgets/misc/e-canvas-background.c:472
+#: ../widgets/text/e-text.c:3399
 #: ../widgets/text/e-text.c:3400
 msgid "Fill color"
 msgstr "Culoare umplere"
@@ -21659,14 +20763,17 @@ msgstr "Culoare umplere"
 #: ../widgets/misc/e-canvas-background.c:478
 #: ../widgets/misc/e-canvas-background.c:479
 #: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
+#: ../widgets/misc/e-canvas-background.c:486
+#: ../widgets/text/e-text.c:3406
+#: ../widgets/text/e-text.c:3407
+#: ../widgets/text/e-text.c:3413
 #: ../widgets/text/e-text.c:3414
 msgid "GDK fill color"
 msgstr "Culoare de umplere GDK"
 
 #: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
+#: ../widgets/misc/e-canvas-background.c:493
+#: ../widgets/text/e-text.c:3420
 #: ../widgets/text/e-text.c:3421
 msgid "Fill stipple"
 msgstr "Condiție umplere"
@@ -21705,7 +20812,8 @@ msgstr "Lungime minimă"
 msgid "Minimum Width"
 msgstr "Lungime minimă"
 
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
+#: ../widgets/misc/e-canvas-vbox.c:101
+#: ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "Spațiere"
 
@@ -21721,58 +20829,55 @@ msgstr "Introduceți setul de caractere pentru utilizare"
 msgid "Other..."
 msgstr "Alte..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Dată și timp"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Intrare text pentru introducere dată"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Clic pe acest buton pentru a afișa un calendar"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Combinație de căsuțe pentru dată"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "Ac_um"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_Astăzi"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Fără"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682
+#: ../widgets/misc/e-dateedit.c:1918
 msgctxt "date"
 msgid "None"
 msgstr "Fără"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1813
 msgid "Invalid Date Value"
 msgstr "Valoare nevalidă pentru dată"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1857
 msgid "Invalid Time Value"
 msgstr "Valoare nevalidă pentru oră"
 
 #: ../widgets/misc/e-import-assistant.c:238
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr ""
-"Alegeți fișierul pe care doriți să îl importați în Evolution și alegeți "
-"tipul fișierului din listă."
+msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the list."
+msgstr "Alegeți fișierul pe care doriți să îl importați în Evolution și alegeți tipul fișierului din listă."
 
 #: ../widgets/misc/e-import-assistant.c:255
 msgid "F_ilename:"
@@ -21808,15 +20913,8 @@ msgid "Select what type of file you want to import from the list."
 msgstr "Alegeți din listă tipul de fișier pe care doriți să îl importați."
 
 #: ../widgets/misc/e-import-assistant.c:516
-msgid ""
-"Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
-msgstr ""
-"Evolution a verificat configurările pentru a importa din următoarele "
-"aplicații: Pine, Netscape, Elm, iCalendar. Nici o configurare care să fie "
-"importată nu a putut fi găsită. Dacă doriți să încercați din nou, dați un "
-"clic pe butonul „Înapoi�."
+msgid "Evolution checked for settings to import from the following applications: Pine, Netscape, Elm, iCalendar. No importable settings found. If you would like to try again, please click the \"Back\" button."
+msgstr "Evolution a verificat configurările pentru a importa din următoarele aplicații: Pine, Netscape, Elm, iCalendar. Nici o configurare care să fie importată nu a putut fi găsită. Dacă doriți să încercați din nou, dați un clic pe butonul „Înapoi�."
 
 #: ../widgets/misc/e-import-assistant.c:1187
 #: ../widgets/misc/e-import-assistant.c:1214
@@ -21831,12 +20929,10 @@ msgstr "Importă locație"
 #: ../widgets/misc/e-import-assistant.c:1207
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
+"With this assistant you will be guided through the process of importing external files into Evolution."
 msgstr ""
 "Bun venit la Asistentul Evolution pentru import.\n"
-"Cu acest asistent veți fi ghidat prin procesul de import al fișierelor "
-"externe în Evolution."
+"Cu acest asistent veți fi ghidat prin procesul de import al fișierelor externe în Evolution."
 
 #: ../widgets/misc/e-import-assistant.c:1223
 msgid "Importer Type"
@@ -21864,29 +20960,20 @@ msgid "World Map"
 msgstr "Harta lumii"
 
 #: ../widgets/misc/e-map.c:631
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
-msgstr ""
-"Widget interactiv bazat pe mouse pentru alegerea fusului orar. Utilizatorii "
-"de tastatură trebui să aleagă fusul orar din combinația de căsuțe de mai jos."
+msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
+msgstr "Widget interactiv bazat pe mouse pentru alegerea fusului orar. Utilizatorii de tastatură trebui să aleagă fusul orar din combinația de căsuțe de mai jos."
 
 #: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
-msgstr ""
-"Evolution este momentat conectat. Clic pe acest buton pentru a lucra "
-"deconectat."
+msgstr "Evolution este momentat conectat. Clic pe acest buton pentru a lucra deconectat."
 
 #: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
-msgstr ""
-"Evolution este momentat deconectat. Clic pe acest buton pentru a lucra "
-"conectat."
+msgstr "Evolution este momentat deconectat. Clic pe acest buton pentru a lucra conectat."
 
 #: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
-msgstr ""
-"Evolution este momentat deconectat deoarece rețeaua nu este disponibilă."
+msgstr "Evolution este momentat deconectat deoarece rețeaua nu este disponibilă."
 
 #: ../widgets/misc/e-online-button.c:135
 msgid "The button state is online"
@@ -22192,11 +21279,13 @@ msgstr "Deschide legătura într-un navigator web"
 msgid "_Copy Email Address"
 msgstr "_Copiază adresele email"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:397
+#: ../widgets/misc/e-web-view.c:977
 msgid "Select all text and images"
 msgstr "Selectează tot textul și imaginile"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
+#: ../widgets/misc/e-web-view.c:752
+#: ../widgets/misc/e-web-view.c:754
 #: ../widgets/misc/e-web-view.c:756
 #, c-format
 msgid "Click to call %s"
@@ -22294,11 +21383,13 @@ msgstr "clic pentru adăugare"
 msgid "State"
 msgstr "Stare"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:381
+#: ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Crescător)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:381
+#: ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(Descrescător)"
 
@@ -22429,7 +21520,8 @@ msgstr[2] "%s (%d de elemente)"
 #: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
+#: ../widgets/table/e-table-item.c:2842
+#: ../widgets/table/e-table-item.c:2843
 msgid "Alternating Row Colors"
 msgstr "Culori de rând alternative"
 
@@ -22437,8 +21529,10 @@ msgstr "Culori de rând alternative"
 #: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
+#: ../widgets/table/e-table-item.c:2849
+#: ../widgets/table/e-table-item.c:2850
+#: ../widgets/table/e-tree.c:3373
+#: ../widgets/table/e-tree.c:3374
 msgid "Horizontal Draw Grid"
 msgstr "Desenează grila orizontal"
 
@@ -22446,8 +21540,10 @@ msgstr "Desenează grila orizontal"
 #: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
+#: ../widgets/table/e-table-item.c:2856
+#: ../widgets/table/e-table-item.c:2857
+#: ../widgets/table/e-tree.c:3379
+#: ../widgets/table/e-tree.c:3380
 msgid "Vertical Draw Grid"
 msgstr "Desenează grila vertical"
 
@@ -22455,8 +21551,10 @@ msgstr "Desenează grila vertical"
 #: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
+#: ../widgets/table/e-table-item.c:2863
+#: ../widgets/table/e-table-item.c:2864
+#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3386
 msgid "Draw focus"
 msgstr "Desenează focus"
 
@@ -22464,7 +21562,8 @@ msgstr "Desenează focus"
 #: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
+#: ../widgets/table/e-table-item.c:2870
+#: ../widgets/table/e-table-item.c:2871
 msgid "Cursor mode"
 msgstr "Mod cursor"
 
@@ -22472,7 +21571,8 @@ msgstr "Mod cursor"
 #: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
+#: ../widgets/table/e-table-item.c:2835
+#: ../widgets/table/e-table-item.c:2836
 msgid "Selection model"
 msgstr "Model selecție"
 
@@ -22480,8 +21580,10 @@ msgstr "Model selecție"
 #: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
+#: ../widgets/table/e-table-item.c:2877
+#: ../widgets/table/e-table-item.c:2878
+#: ../widgets/table/e-table.c:3339
+#: ../widgets/table/e-tree.c:3367
 #: ../widgets/table/e-tree.c:3368
 msgid "Length Threshold"
 msgstr "Prag lungime"
@@ -22490,8 +21592,10 @@ msgstr "Prag lungime"
 #: ../widgets/table/e-table-group-container.c:982
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
+#: ../widgets/table/e-table-item.c:2911
+#: ../widgets/table/e-table-item.c:2912
+#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-tree.c:3399
 #: ../widgets/table/e-tree.c:3400
 msgid "Uniform row height"
 msgstr "Înălțime rând uniformă"
@@ -22560,15 +21664,18 @@ msgstr "_Sortează după"
 msgid "_Custom"
 msgstr "_Personalizat"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
+#: ../widgets/table/e-table-item.c:2821
+#: ../widgets/table/e-table-item.c:2822
 msgid "Table header"
 msgstr "Antet tabel"
 
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
+#: ../widgets/table/e-table-item.c:2828
+#: ../widgets/table/e-table-item.c:2829
 msgid "Table model"
 msgstr "Model tabel"
 
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
+#: ../widgets/table/e-table-item.c:2904
+#: ../widgets/table/e-table-item.c:2905
 msgid "Cursor row"
 msgstr "Linie cursor"
 
@@ -22576,7 +21683,8 @@ msgstr "Linie cursor"
 msgid "Sort Info"
 msgstr "Sortează informații"
 
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
+#: ../widgets/table/e-table.c:3353
+#: ../widgets/table/e-tree.c:3406
 #: ../widgets/table/e-tree.c:3407
 msgid "Always search"
 msgstr "Caută întotdeauna"
@@ -22591,11 +21699,10 @@ msgstr "Spațiere verticală rând"
 
 #: ../widgets/table/e-table.c:3375
 msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr ""
-"Spațiu vertical între rânduri. Este adăugat în partea de sus și de jos a "
-"rândului."
+msgstr "Spațiu vertical între rânduri. Este adăugat în partea de sus și de jos a rândului."
 
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
+#: ../widgets/table/e-tree.c:3392
+#: ../widgets/table/e-tree.c:3393
 msgid "ETree table adapter"
 msgstr "Adaptor tabelă ETree"
 
@@ -22677,141 +21784,157 @@ msgstr "Selectează tot"
 msgid "Input Methods"
 msgstr "Metode de introducere"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
+#: ../widgets/text/e-text.c:3315
+#: ../widgets/text/e-text.c:3316
 msgid "Event Processor"
 msgstr "Procesor evenimente"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
+#: ../widgets/text/e-text.c:3322
+#: ../widgets/text/e-text.c:3323
 msgid "Text"
 msgstr "Text"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
+#: ../widgets/text/e-text.c:3329
+#: ../widgets/text/e-text.c:3330
 msgid "Bold"
 msgstr "Aldin"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
+#: ../widgets/text/e-text.c:3336
+#: ../widgets/text/e-text.c:3337
 msgid "Strikeout"
 msgstr "Tăiat"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
+#: ../widgets/text/e-text.c:3343
+#: ../widgets/text/e-text.c:3344
 msgid "Anchor"
 msgstr "Ancoră"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
+#: ../widgets/text/e-text.c:3350
+#: ../widgets/text/e-text.c:3351
 msgid "Justification"
 msgstr "Aliniere la margini"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
+#: ../widgets/text/e-text.c:3357
+#: ../widgets/text/e-text.c:3358
 msgid "Clip Width"
 msgstr "Lungime suprapunere"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
+#: ../widgets/text/e-text.c:3364
+#: ../widgets/text/e-text.c:3365
 msgid "Clip Height"
 msgstr "Înălțime suprapunere"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
+#: ../widgets/text/e-text.c:3371
+#: ../widgets/text/e-text.c:3372
 msgid "Clip"
 msgstr "Suprapunere"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
+#: ../widgets/text/e-text.c:3378
+#: ../widgets/text/e-text.c:3379
 msgid "Fill clip rectangle"
 msgstr "Dreptunghi de suprapunere"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
+#: ../widgets/text/e-text.c:3385
+#: ../widgets/text/e-text.c:3386
 msgid "X Offset"
 msgstr "Decalaj x"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
+#: ../widgets/text/e-text.c:3392
+#: ../widgets/text/e-text.c:3393
 msgid "Y Offset"
 msgstr "Decalaj y"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
+#: ../widgets/text/e-text.c:3427
+#: ../widgets/text/e-text.c:3428
 msgid "Text width"
 msgstr "Lungime text"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
+#: ../widgets/text/e-text.c:3434
+#: ../widgets/text/e-text.c:3435
 msgid "Text height"
 msgstr "Înălțime text"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
+#: ../widgets/text/e-text.c:3448
+#: ../widgets/text/e-text.c:3449
 msgid "Use ellipsis"
 msgstr "Utilizează elipse"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-text.c:3455
+#: ../widgets/text/e-text.c:3456
 msgid "Ellipsis"
 msgstr "Elipse"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
+#: ../widgets/text/e-text.c:3462
+#: ../widgets/text/e-text.c:3463
 msgid "Line wrap"
 msgstr "Despărțire linii"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
+#: ../widgets/text/e-text.c:3469
+#: ../widgets/text/e-text.c:3470
 msgid "Break characters"
 msgstr "Caractere despărțire"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3476
+#: ../widgets/text/e-text.c:3477
 msgid "Max lines"
 msgstr "Maxim linii"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
+#: ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-text.c:3498
 msgid "Draw borders"
 msgstr "Desenează contururi"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
+#: ../widgets/text/e-text.c:3504
+#: ../widgets/text/e-text.c:3505
 msgid "Allow newlines"
 msgstr "Permite sfârșit de linii"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
+#: ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3512
 msgid "Draw background"
 msgstr "Desenează fundal"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
+#: ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3519
 msgid "Draw button"
 msgstr "Desenează buton"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
+#: ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3526
 msgid "Cursor position"
 msgstr "Poziție cursor"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
+#: ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-text.c:3535
 msgid "IM Context"
 msgstr "Context IM"
 
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
+#: ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Handle Popup"
 msgstr "Gestionează popup"
 
 #~ msgid "Error loading address book."
 #~ msgstr "Eroare la încărcarea agendei"
-
 #~ msgid "Server Version"
 #~ msgstr "Versiune server"
-
 #~ msgid "<b>Email</b>"
 #~ msgstr "<b>Email</b>"
-
 #~ msgid "<b>Home</b>"
 #~ msgstr "<b>Acasă</b>"
-
 #~ msgid "<b>Job</b>"
 #~ msgstr "<b>Sarcină</b>"
-
 #~ msgid "<b>Miscellaneous</b>"
 #~ msgstr "<b>Diverse</b>"
-
 #~ msgid "<b>Notes</b>"
 #~ msgstr "<b>Notițe</b>"
-
 #~ msgid "<b>Other</b>"
 #~ msgstr "<b>Altele</b>"
-
 #~ msgid "<b>Telephone</b>"
 #~ msgstr "<b>Telefon</b>"
-
 #~ msgid "<b>Work</b>"
 #~ msgstr "<b>Servici</b>"
-
 #~ msgid ""
 #~ "\n"
 #~ "Mr.\n"
@@ -22826,48 +21949,37 @@ msgstr "Gestionează popup"
 #~ "Dl.\n"
 #~ "Dra.\n"
 #~ "Dr."
-
 #~ msgid "<b>Members</b>"
 #~ msgstr "<b>Membrii</b>"
-
 #~ msgid ""
 #~ "%s already exists\n"
 #~ "Do you want to overwrite it?"
 #~ msgstr ""
 #~ "%s există deja\n"
 #~ "Doriți să îl suprascrieți?"
-
 #~ msgid "Overwrite"
 #~ msgstr "Suprascriere"
-
 #~ msgid "contact"
 #~ msgid_plural "contacts"
 #~ msgstr[0] "contact"
 #~ msgstr[1] "contacte"
 #~ msgstr[2] "de contacte"
-
 #~ msgid "Save Appointment"
 #~ msgstr "Salvează întâlnirea"
-
 #~ msgid "Save Memo"
 #~ msgstr "Salvează notița"
-
 #~ msgid "Save Task"
 #~ msgstr "Salvează sarcina"
-
 #~ msgid "<b>Alarm</b>"
 #~ msgstr "<b>Alarmă<b>"
-
 #~ msgid "<b>Options</b>"
 #~ msgstr "<b>Opțiuni</b>"
-
 #~ msgid ""
 #~ "before\n"
 #~ "after"
 #~ msgstr ""
 #~ "înainte\n"
 #~ "după"
-
 #~ msgid ""
 #~ "minute(s)\n"
 #~ "hour(s)\n"
@@ -22876,7 +21988,6 @@ msgstr "Gestionează popup"
 #~ "minut(e)\n"
 #~ "oră(e)\n"
 #~ "zi(le)"
-
 #~ msgid ""
 #~ "minutes\n"
 #~ "hours\n"
@@ -22885,17 +21996,14 @@ msgstr "Gestionează popup"
 #~ "minute\n"
 #~ "ore\n"
 #~ "zile"
-
 #~ msgid ""
 #~ "start of appointment\n"
 #~ "end of appointment"
 #~ msgstr ""
 #~ "început întâlnire\n"
 #~ "sfârșit întâlnire"
-
 #~ msgid "Attach file(s)"
 #~ msgstr "Atașează fișier(e)"
-
 #~ msgid ""
 #~ "60 minutes\n"
 #~ "30 minutes\n"
@@ -22908,22 +22016,16 @@ msgstr "Gestionează popup"
 #~ "15 minute\n"
 #~ "10 minute\n"
 #~ "05 minute"
-
 #~ msgid "<span weight=\"bold\">Alarms</span>"
 #~ msgstr "<span weight=\"bold\">Alarme</span>"
-
 #~ msgid "<span weight=\"bold\">Alerts</span>"
 #~ msgstr "<span weight=\"bold\">Alerte</span>"
-
 #~ msgid "<span weight=\"bold\">Date/Time Format</span>"
 #~ msgstr "<span weight=\"bold\">Format dată/oră</span>"
-
 #~ msgid "<span weight=\"bold\">Task List</span>"
 #~ msgstr "<span weight=\"bold\">Listă sarcini</span>"
-
 #~ msgid "<span weight=\"bold\">Time</span>"
 #~ msgstr "<span weight=\"bold\">Timp</span>"
-
 #~ msgid ""
 #~ "Minutes\n"
 #~ "Hours\n"
@@ -22932,7 +22034,6 @@ msgstr "Gestionează popup"
 #~ "Minute\n"
 #~ "Ore\n"
 #~ "Zile"
-
 #~ msgid ""
 #~ "Monday\n"
 #~ "Tuesday\n"
@@ -22949,7 +22050,6 @@ msgstr "Gestionează popup"
 #~ "Vineri\n"
 #~ "Sâmbătă\n"
 #~ "Duminică"
-
 #~ msgid ""
 #~ "15 minutes before appointment\n"
 #~ "1 hour before appointment\n"
@@ -22958,20 +22058,16 @@ msgstr "Gestionează popup"
 #~ "15 minute înainte de întâlnire\n"
 #~ "o oră înainte de întâlnire\n"
 #~ "o zi înainte de întâlnire"
-
 #~ msgid ""
 #~ "a\n"
 #~ "b"
 #~ msgstr ""
 #~ "a\n"
 #~ "b"
-
 #~ msgid "<b>Preview</b>"
 #~ msgstr "<b>Previzualizare</b>"
-
 #~ msgid "<b>Recurrence</b>"
 #~ msgstr "<b>Recurență</b>"
-
 #~ msgid ""
 #~ "day(s)\n"
 #~ "week(s)\n"
@@ -22982,7 +22078,6 @@ msgstr "Gestionează popup"
 #~ "săptămână(i)\n"
 #~ "lună(i)\n"
 #~ "an(i)"
-
 #~ msgid ""
 #~ "for\n"
 #~ "until\n"
@@ -22991,13 +22086,10 @@ msgstr "Gestionează popup"
 #~ "pentru\n"
 #~ "pănâ\n"
 #~ "permanent"
-
 #~ msgid "<span weight=\"bold\">Miscellaneous</span>"
 #~ msgstr "<span weight=\"bold\">Diverse</span>"
-
 #~ msgid "<span weight=\"bold\">Status</span>"
 #~ msgstr "<span weight=\"bold\">Status</span>"
-
 #~ msgid ""
 #~ "High\n"
 #~ "Normal\n"
@@ -23008,7 +22100,6 @@ msgstr "Gestionează popup"
 #~ "Normal\n"
 #~ "Scăzut\n"
 #~ "Nedefinit"
-
 #~ msgid ""
 #~ "Not Started\n"
 #~ "In Progress\n"
@@ -23019,10 +22110,8 @@ msgstr "Gestionează popup"
 #~ "ÃŽn progres\n"
 #~ "Finalizat\n"
 #~ "Anulat"
-
 #~ msgid "Loading appointments at %s"
 #~ msgstr "Se încarcă întâlnirile la %s"
-
 #~ msgid ""
 #~ "January\n"
 #~ "February\n"
@@ -23049,6 +22138,6 @@ msgstr "Gestionează popup"
 #~ "Octombrie\n"
 #~ "Noiembrie\n"
 #~ "Decembrie"
-
 #~ msgid "_Security"
 #~ msgstr "_Securitate"
+
diff --git a/po/ta.po b/po/ta.po
index 123cf20ae2..7d14fd097b 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
-#: ../shell/main.c:512
+#: ../shell/main.c:456
 # Jayaradha N <jaya@pune.redhat.com>, 2004.
 # Felix <ifelix@redhat.com>, 2006.
 # Dr.T.Vasudevan <agnihot3@gmail.com>, 2007, 2008, 2009.
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-11 07:47+0530\n"
-"PO-Revision-Date: 2010-02-11 17:15+0530\n"
+"POT-Creation-Date: 2010-04-15 12:05+0530\n"
+"PO-Revision-Date: 2010-04-15 13:16+0530\n"
 "Last-Translator: Dr,T,Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: American English <Ubuntu-l10n-tam@lists.ubuntu.com>>\n"
 "MIME-Version: 1.0\n"
@@ -104,7 +104,7 @@ msgstr "எலà¯�டிà®�பி(LDAP) சேவகனிலà¯� சானà¯�à®±à
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1267
 msgid "Failed to delete contact"
 msgstr "தொடர�பினை அழிக�க ம�டியவில�லை"
 
@@ -209,7 +209,7 @@ msgstr "இநà¯�த தொடரà¯�பிலà¯� மாறà¯�றமஙà¯�களà
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "எவல�யூஷனை மீண�ட�ம� த�வக�காதவரை {0} க�கான தொடர�ப� கிடைக�க வாய�ப�ப� இல�லை"
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -232,16 +232,6 @@ msgstr "அளவ� மாற�ற� (_R)"
 msgid "_Use as it is"
 msgstr "இர�ப�பத� போலவே பயன�பட�த�த�க (_U)"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:143
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "இயல�பான ஒத�திசைந�த ம�கவரி:"
@@ -258,7 +248,7 @@ msgstr "பைலட� ம�கவரி பயன�பாட�ட� பக
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2005
 msgid "Anniversary"
 msgstr "ஆண�ட� விழாநாள�"
 
@@ -269,36 +259,39 @@ msgstr "ஆண�ட� விழாநாள�"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:111
+#: ../calendar/gui/e-calendar-view.c:2004 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:107
 msgid "Birthday"
 msgstr "பிறந�தநாள�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "வலைப�பூ:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "(_t)வகைகள�..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "நாள�காட�டி:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
 msgid "Contact"
 msgstr "தொடர�ப�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2496
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2568
 msgid "Contact Editor"
 msgstr "தொடர�ப� தொக�ப�பி"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
@@ -307,221 +300,189 @@ msgstr "தொடர�ப� தொக�ப�பி"
 msgid "Email"
 msgstr "மின�னஞ�சல� ம�கவரி"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "ஓய�வ�/பணியில�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "ம�ழ� பெயர�(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "இல�லம�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "ம�தன�மை பக�கம�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "உர�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "உடன�க�க�டன� செய�திஅன�ப�ப�தல�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "வேலை"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "அன�ப�பவேண�டிய ம�கவரி"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "இன�னபிற"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "ப�னைப�பெயர�(_k):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "க�றிப�ப�கள�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1711
 msgid "Other"
 msgstr "மற�றவை"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "சொந�த தகவல�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "தொலைபேசி"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "வீடியோ அரட�டை:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "வலை ம�கவரிகள�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "இணைய பதிவ�:"
-
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "வேலை"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "(_A)ம�கவரி"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "ஆண�ட� விழா: (_A)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "உதவியாளர�: (_A)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "பிறந�தநாள�:(_B)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+msgid "_Blog:"
+msgstr "_B வலைப�பூ:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 #: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1909
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "நாள�காட�டி:(_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "நகரம�: (_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "நிற�வனம�: (_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "நாட�: (_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "த�றை: (_D)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "(_F)கோப�பின� கீழ�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "ஓய�வ�/பணியில�: (_F)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "ம�தன�மை பக�கம�: (_H)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "மேலாளர�: (_M)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "அல�வலகம�: (_O)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "(_P)தபால� பெட�டி எண�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "வேலை: (_P)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "த�ணைவர�: (_S)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "(_S)மாநிலம�/பிரதேசம�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "(_T)தலைப�ப�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "வீடியோ அரட�டை: (_V)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "ஹெச�டிஎம�எல�  மின�னஞ�சலை பெற வேண�ட�மா (_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "இணைய பதிவ�: (_W)"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "(_W) எங�கே:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "அஞ�சல� க�றியீட�: (_Z)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "பெயர�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1655 ../widgets/text/e-text.c:3429
-#: ../widgets/text/e-text.c:3430
-msgid "Editable"
-msgstr "தொக�க�கக�கூடிய"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -563,7 +524,7 @@ msgid "Skype"
 msgstr "ஸ�கைபி"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "Error adding contact"
 msgstr "தொடர�பை சேர�க�க�ம� போத� பிழை"
 
@@ -575,45 +536,21 @@ msgstr "தொடர�பை திர�த�த�ம� போத� பி
 msgid "Error removing contact"
 msgstr "தொடர�பை நீக�க�ம� போத� பிழை"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "மூல ப�த�தகம�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "சேர�ம� ப�த�தகம�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "ப�திய தொடர�ப�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "எழ�தக�கூடிய ப�லங�கள�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "தேவையான ப�லங�கள�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "மாற�றப�பட�டத�"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2491
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2563
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ஆசிரியரை தொடர�ப� கொள�ளவ�ம� - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2888
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2971
 msgid "Please select an image for this contact"
 msgstr "இந�த தொடர�பிலிர�ந�த� படத�தை தேர�வ� செய�யவ�ம�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2972
 msgid "_No image"
 msgstr "படங�கள� இல�லை (_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3162
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -621,56 +558,46 @@ msgstr ""
 "தொடர�பின� தகவல� செல�லாத�:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3249
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ஒர� தவறான வடிவத�தை கொண�ட�ள�ளத�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3256
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' தவறான வடிவத�தை கொண�ட�ள�ளத�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3188
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3282
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' வெற�றாக உள�ளத�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3213
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3296
 msgid "Invalid contact."
 msgstr "செல�லாத தொடர�ப�"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "தொடர�ப� வேகமாக- சேர�"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "(_E)ம�ழ�வத�ம� திர�த�த�"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "ம�ழ�ப� பெயர� (_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "மின�னஞ�சல� (_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "ம�கவரிப�ப�த�தகத�தை தேர�ந�தெட� (_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "ஷெல�"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "தனித�த ஈஷெல�"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "டாக�டர�"
@@ -737,7 +664,7 @@ msgid "_Suffix:"
 msgstr "(_S)கடைசி:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:674
 msgid "Contact List Editor"
 msgstr "தொடர�ப� பட�டியல� தொக�ப�பி"
 
@@ -754,7 +681,7 @@ msgid "_List name:"
 msgstr "(_L)பட�டியல� பெயர�:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:155
 msgid "_Select..."
 msgstr "தேர�ந�தெட�... (_S)"
 
@@ -764,39 +691,27 @@ msgstr ""
 "மின�னஞ�சல� ம�கவரியை தட�டச�ச� செய�யவ�ம� அல�லத� கீழ� உள�ள பட�டியலிர�ந�த� தொடர�பினை இழ�க�கவ�ம�: "
 "(_T)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:767
 msgid "Contact List Members"
 msgstr "தொடர�ப� பட�டியல� உற�ப�பினர�கள�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:915
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1331
 msgid "_Members"
 msgstr "உற�ப�பினர�கள� (_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1170
 msgid "Error adding list"
 msgstr "பட�டியலில� சேர�க�க�ம� போத� பிழை"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1184
 msgid "Error modifying list"
 msgstr "தொடர�பை திர�த�த�ம�போத� பிழை"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1198
 msgid "Error removing list"
 msgstr "பட�டியலை நீக�க�ம� போத� பிழை"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "ப�த�தகம�"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "இத� ப�திய பட�டியல�"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "தொடர�ப� மாற�றப�பட�டத�:"
@@ -814,8 +729,7 @@ msgstr "இதே தொடர�ப� �ற�கெனவே உள�ளத
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
-msgstr ""
-"இந�த தொடர�பின� மின�னஞ�சல� மற�ற�ம� பெயர� �ற�கெனவே அடைவில� உள�ளத�.  மீண�ட�ம� சேர�க�க விர�ப�பமா? "
+msgstr "இந�த தொடர�பின� மின�னஞ�சல� மற�ற�ம� பெயர� �ற�கெனவே அடைவில� உள�ளத�.  மீண�ட�ம� சேர�க�க விர�ப�பமா? "
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -834,31 +748,31 @@ msgstr ""
 " மீண�ட�ம� சேர�க�க விர�ப�பமா? "
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "_ஒன�றாகச� சேர�"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 msgid "Merge Contact"
 msgstr "தொடர�ப�களை ஒன�றாகச� சேர�க"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:970
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Any field contains"
 msgstr "எந�த ப�லத�தில�ம�"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "மின�னஞ�சல� த�வக�கத�தில�"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "பெயரில� உள�ளத�"
 
@@ -877,91 +791,62 @@ msgstr[1] "%d தொடர�ப�கள�"
 msgid "Error getting book view"
 msgstr "ப�த�தக பார�வையில� பிழை"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "கேள�வி"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
 msgstr "தேடல� இடைமறிக�கப�பட�டத� "
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1048 ../calendar/gui/e-task-table.c:1347
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3359
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3296
-#: ../widgets/text/e-text.c:3297
-msgid "Model"
-msgstr "மாதிரி"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "அட�டையை திர�த�த�ம� போத� பிழை"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
 msgid "Cut selected contacts to the clipboard"
 msgstr "தேர�வ� செய�த தொடர�ப�களை ஒட�ட�ப�பலகத�தில� வெட�டி ஒட�ட�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Copy selected contacts to the clipboard"
 msgstr "தேர�வ� செய�த தொடர�ப�களை தற�காலிக நினைவிடத�தில� நகலெட�க�கவ�ம�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Paste contacts from the clipboard"
 msgstr "தற�காலிக நினைவகத�திலிர�ந�த� தொடர�ப�களை ஒட�டவ�ம�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "தேர�வ� செய�யப�பட�ட தொடர�ப�களை நீக�க�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 msgid "Select all visible contacts"
 msgstr "அனைத�த� தொடர�ப�களைய�ம� தேர�வ� செய�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1065 ../calendar/gui/e-task-table.c:1364
-msgid "Shell View"
-msgstr "ஷெல� காட�சி"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "மூலம�"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "நீங�கள� இந�த தொடர�ப� பட�டியல�களை நிச�சயம� அழிக�க வேண�ட�மா?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1289
 msgid "Are you sure you want to delete this contact list?"
 msgstr "நீங�கள� இந�த தொடர�ப� பட�டியலை நிச�சயம� அழிக�க வேண�ட�மா?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1293
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "நீங�கள� (%s) தொடர�ப� பட�டியலை நிச�சயம� அழிக�க வேண�ட�மா ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete these contacts?"
 msgstr "இந�த தொடர�ப�களை நிச�சயம� நீக�க வேண�ட�மா?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 msgid "Are you sure you want to delete this contact?"
 msgstr "இந�த தொடர�பை நிச�சயம� நீக�க வேண�ட�மா?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "நீங�கள� (%s) தொடர�பினை நிச�சயம� அழிக�க வேண�ட�மா ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1462
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -970,11 +855,11 @@ msgstr ""
 "%d தொடர�ப�களை திறக�க�ம� போத�%d ப�திய சாளரங�கள� திறக�கப�பட�ம�.\n"
 "எல�லா தொடர�ப�களைய�ம� நிச�சயம� காட�ட வேண�ட�மா?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1467
 msgid "_Don't Display"
 msgstr "_D காட�டாதே"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 msgid "Display _All Contacts"
 msgstr "_A அனைத�த� தொடர�ப�களைய�ம� காட�ட�"
 
@@ -1134,7 +1019,6 @@ msgid "Telex"
 msgstr "டெலக�ஸ�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:748
 msgid "Title"
 msgstr "தலைப�ப�"
 
@@ -1146,59 +1030,7 @@ msgstr "அலக�"
 msgid "Web Site"
 msgstr "இணைய தளம�"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2879 ../widgets/table/e-table-item.c:2880
-#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
-msgid "Width"
-msgstr "அகலம�"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2885 ../widgets/table/e-table-item.c:2886
-#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
-msgid "Height"
-msgstr "உயரம�"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-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:140
-msgid "Column Width"
-msgstr "நெட�வரிசையின� அகலம�"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1208,7 +1040,7 @@ msgstr ""
 "\n"
 "தொடர�பினை தேட�கிறத�..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1222,7 +1054,7 @@ msgstr ""
 "\n"
 "அல�லத� இங�க� இரட�டை சொட�க�கி ஒர� ப�திய தொடர�பினை உர�வாக�கவ�ம�."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1236,7 +1068,7 @@ msgstr ""
 "\n"
 "ப�திய தொடர�பை உர�வாக�க இங�கே இரண�ட�-ம�றை க�ளிக� செய�யவ�ம�."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1246,7 +1078,7 @@ msgstr ""
 "\n"
 "தொடர�பினை தேடவ�ம�."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1256,10 +1088,6 @@ msgstr ""
 "\n"
 "இதில� காட�ட எந�த பொர�ள�ம� இல�லை."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "�ற�பி"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "பணி மின�னஞ�சல�"
@@ -1269,18 +1097,10 @@ msgid "Home Email"
 msgstr "வீட�ட� மின�னஞ�சல�"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "வேற� மின�னஞ�சல�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "தேர�வ� செய�யப�பட�ட"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "கர�சர� உள�ளத�"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1323,17 +1143,17 @@ msgid "Copy _Email Address"
 msgstr "மின�னஞ�சல� ம�கவரிகளை நகலெட�க�கவ�ம� (_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:381
 msgid "Copy the email address to the clipboard"
 msgstr "மின�னஞ�சல� ம�கவரியை ஒட�ட�ப�பலகைக�க� நகல� எட�க�கவ�ம�."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:386
 msgid "_Send New Message To..."
 msgstr "செய�தியை அன�ப�ப�... (_S)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:388
 msgid "Send a mail message to this address"
 msgstr "ஒர� அஞ�சல� செய�தியை இந�த மின�னஞ�சல� ம�கவரிக�க� அன�ப�ப�"
 
@@ -1369,22 +1189,21 @@ msgid "Video Chat"
 msgstr "வீடியோ அரட�டை"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:496
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "நாள�காட�டி"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:116
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ஓய�வ�/பணியில�"
@@ -1411,21 +1230,20 @@ msgstr "ம�தன�மை பக�கம�"
 msgid "Web Log"
 msgstr "இணைய பதிவ�"
 
-#. orange
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../mail/e-mail-migrate.c:962
+#: ../capplet/settings/mail-capplet-shell.c:350
 #: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/addressbook/e-book-shell-migrate.c:134
 #: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "தனிப�பட�ட"
@@ -1442,8 +1260,8 @@ msgstr "வீட�ட�ப�பக�கம�"
 msgid "Blog"
 msgstr "வலைப�பூ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
 #, c-format
 msgid "Click to mail %s"
 msgstr "%s மின�னஞ�சல�க�க� க�ளிக� செய�யவ�ம�"
@@ -1500,11 +1318,11 @@ msgstr "விதிம�றைக�க� ஆதரவ� இல�லை"
 #. To Translators: This is task status
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2659
 msgid "Canceled"
 msgstr "ரத�த� செய�யப�பட�டத�"
 
@@ -1635,31 +1453,31 @@ msgstr "இந�த கேள�வி ம�ழ�மையாக ம�டி
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:244
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "ம�கவரிப�ப�த�தகத�தை தேர�ந�தெட�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "பட�டியல�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "தொடர�ப�களை இங�க� நகர�த�த�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:434
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "தொடர�ப�களை இங�க� நகலெட�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "தொடர�ப�களை இங�க� நகர�த�த�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "தொடர�ப�களை இங�க� நகலெட�"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
 msgid "Card View"
 msgstr "அட�டை காட�சி"
 
@@ -1667,7 +1485,7 @@ msgstr "அட�டை காட�சி"
 #: ../addressbook/importers/evolution-ldif-importer.c:516
 #: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "�ற�ற�கிறத�...."
 
@@ -1784,19 +1602,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "எல�டி�பி(LDAP) சேவையகத�தை யார�வேண�ட�மால�ம� அண�க ம�டிகிறத�"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "உற�திப�பட�த�த ம�டியவில�லை.\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr " %s க�க� கடவ�ச�சொல�லை உள�ளிடவ�ம� (பயனர� %s)"
 
 #: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
+#: ../plugins/caldav/caldav-browse-server.c:808
 #: ../plugins/google-account-setup/google-source.c:440
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
@@ -1934,75 +1752,66 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "பணியை ச�ர�க�கம� இல�லாமல� அன�ப�ப வேண�ட�மா?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "நாள�காட�டி கிடங�க� இணைப�பில� இல�லை"
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "ஒர� ப�திய நிகழ�வினை உர�வாக�க ம�டியவில�லை"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr " நிகழ�வினை சேமிக�க ம�டியவில�லை"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "நாள�காட�டியை அழிக�க வேண�ட�மா '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "க�றிப�ப� பட�டியலை அழிக�க வேண�ட�மா '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "பணி பட�டியலை அழிக�க வேண�ட�மா '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "அன�ப�ப வேண�டாம� (_n)"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "பதிவிறக�க�ம� நடைபெற�கிறத�. சந�திப�ப�  �ற�பாட�டினை சேமிக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "பதிவிறக�க�ம� நடைபெற�கிறத�. பணியினை சேமிக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "தொக�ப�பியை �ற�ற ம�டியவில�லை."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr "இந�த பணியை �ற�பதற�கான அனைத�த� பங�கேற�பாளர�கள�க�க�ம� அழைப�ப� அன�ப�பபட�ம�"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:39
 msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "மின�னஞ�சல� மூலம� அனைத�த� பங�க� கொள�வோர�க�க�ம� அழைப�ப�கள� அன�ப�பபட�ம�. அவர�கள� பதில� அன�ப�ப "
 "அன�மதிக�கப�பட�வார�கள�."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "நாள�காட�டியை �ற�ற�ம� போத� பிழை"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "க�றிப�ப� பட�டியலை �ற�ற�ம� போத� பிழை"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "பணி பட�டியலை �ற�ற�ம� போத� பிழை"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "{0} போத� பிழை"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2010,7 +1819,7 @@ msgstr ""
 "இரத�த� செய�த தகவலை மற�றவர�கள�க�க� தெரிவிக�காவிட�டால� அவர�கள� கூட�டம� இரத�த� செய�யபட�டதை "
 "அறியமாட�டார�கள�."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2018,7 +1827,7 @@ msgstr ""
 "இரத�த� செய�த தகவலை மற�றவர�கள�க�க� தெரிவிக�காவிட�டால� அவர�கள� க�றிப�ப� நீக�கப�பட�டதை "
 "அறியமாட�டார�கள�."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2026,23 +1835,19 @@ msgstr ""
 "இரத�த� செய�த தகவலை மற�றவர�கள�க�க� தெரிவிக�காவிட�டால� அவர�கள� பணி நீக�கப�பட�டதை "
 "அறியமாட�டார�கள�."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "சேவையகத�தில� இர�ந�த� பதில� இல�லை."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "மாற�றப�பட�ட தகவல�களை பங�கேற�பாளர�களின� நாள�காட�டியில� மாற�றங�கள� செய�ய�ம�"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "திர�த�தப�பட�ட பணி பங�கேற�பாளர�களின� நாள�காட�டியில� தேவையான மாற�றங�கள� செய�ய�ம�."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2050,7 +1855,7 @@ msgstr ""
 "சில இணைப�ப�கள� பதிவிறக�கம� செய�ய வேண�டிய�ள�ளத�. சந�திப�பை சேமித�தால� இந�த இணைப�ப�கள� "
 "இழக�கப�பட�ம�."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2058,95 +1863,91 @@ msgstr ""
 "சில இணைப�ப�கள� பதிவிறக�கம� செய�ய வேண�டிய�ள�ளத�. பணிகளை சேமித�தால� இந�த இணைப�ப�கள� "
 "இழக�கப�பட�ம�."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr "உங�கள� நடப�ப� சேவையகத�தில� சில அம�சங�கள� வேலை செய�யாத�."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "எவல�யூஷன� நாள�காட�டி எதிர�பாராமல� வெளியேறியத�"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "எவல�யூஷன� நாள�காட�டிகள� எதிர�பாராமல� வெளியேறின."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "எவல�யூஷன� க�றிப�ப� எதிர�பாராமல� வெளியேறியத�."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "எதிர�பாராமல� எவல�யூஷன� வெளியேறியத�"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:55
 msgid "The calendar is not marked for offline usage."
 msgstr "நாள�காட�டி இணைப�பில�லாமல� பயன�பட�த�த க�றிக�கப�படவில�லை."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:56
 msgid "The memo list is not marked for offline usage."
 msgstr "க�றிப�ப� பட�டியல� இணைப�பில�லாமல� பயன�பட�த�த க�றிக�கப�படவில�லை."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "பணி பட�டியல� இணைப�பில�லாமல� பயன�பட�த�த க�றிக�கப�படவில�லை."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "இந�த நாள�காட�டி நிரந�தரமாக நீக�கப�பட�ம�"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "இந�த க�றிப�ப� பட�டியல� நிரந�தரமாக நீக�கப�பட�ம�."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "இந�த பணி பட�டியல� நிரந�தரமாக நீக�கப�பட�ம�."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "நாள�காட�டியை �ற�ற ம�டியவில�லை"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "இந�த சந�திப�பில� உள�ள மாற�றங�களை சேமிக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this meeting?"
 msgstr "இந�த சந�திப�பில� உங�கள� மாற�றங�களை சேமிக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "இந�த க�றிப�பில� உங�கள� மாற�றங�களை சேமிக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "இந�த நேர ஒத�க�கத�தில� உள�ள மாற�றங�களை சேமிக�க வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "இந�த க�றிப�ப�க�க� இரத�த� செய�த அறிக�கை அன�ப�ப விர�ம�ப�கிறீர�களா?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "அனைத�த� பங�க� கொள�வோர�க�க�ம� இரத�த� செய�த அறிக�கை அன�ப�ப விர�ம�ப�கிறீர�களா?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "கூட�ட அழைப�பை பங�கீட�டாளர�கள�க�க� அன�ப�ப வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "இந�த பணியை பங�கேற�பாளர�கள�க�க� அன�ப�ப வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "திர�த�தப�பட�ட கூட�டம� பற�றிய தகவல�களை பங�கேற�பாளர�கள�க�க� அன�ப�ப வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
 msgstr "திர�த�தப�பட�ட பணியை பங�கேற�பாளர�கள�க�க� அன�ப�ப வேண�ட�மா?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2155,61 +1956,57 @@ msgstr ""
 "ஆதரவில�லாத க�ரூப�வைஸ� சேவயகத�த�க�க� நீங�கள� இணைகிறீர�கள�. எவல�ஷன� பயன�பட�த�த�வதில� சில "
 "பிரச�சினைகள� நேரலாம�. நல�லபடி நடக�க சேவையகத�தை ஆதரவ�ள�ள பதிப�ப�க�க� மேம�பட�த�தவ�ம�. "
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:72
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "சந�திப�ப�  �ற�பாட�டில� மாற�றங�கள� செய�த�ள�ளீர�கள�, ஆனால� இத�வரை சேமிக�கவில�லை."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "நீங�கள� இந�த சந�திப�பை மாற�றி விட�டீர�கள� ஆனால� சேமிக�கவில�லை"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "நீங�கள� இந�த பணியை மாற�றி விட�டீர�கள� ஆனால� சேமிக�கவில�லை"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "நீங�கள� இந�த க�றிப�பை மாற�றி விட�டீர�கள� ஆனால� சேமிக�கவில�லை."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "எவல�யூஷனை மீண�ட�ம� த�வக�காமல� நாள�காட�டியை பார�க�க ம�டியாத�"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "எவல�யூஷன� மற� த�வங�க�ம� வரை உங�கள� க�றிப�ப�கள� கிடைக�கப�பெறா."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "எவல�யூஷனை மீண�ட�ம� த�வக�க�ம� வரை பணிவிவரம� கிடைக�காத�"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "மாற�றங�களை நிராகரிக�கவ�ம� (_D)"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "(_S)சேமி"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "மாற�றங�களை சேமி (_S)"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:142
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "(_S)அன�ப�ப�"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "அறிவிப�ப� அன�ப�ப� (_S)"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "பல நாட�கள�க�கான நிகழ�வ�களை பிரி"
@@ -2264,7 +2061,7 @@ msgid_plural "hours"
 msgstr[0] "மணி"
 msgstr[1] "மணிகள�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "த�வக�க நேரம�"
 
@@ -2279,10 +2076,10 @@ msgstr "(_A) அனைதà¯�தையà¯�à®®à¯� பணி நீகà¯�கமà¯� à
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1574
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1580
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 #: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1027
 msgid "Location:"
 msgstr "இடம�:"
 
@@ -2299,7 +2096,7 @@ msgstr "(_D) பணிநீக�க�"
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1625
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "திர�த�த� (_E)"
@@ -2309,8 +2106,8 @@ msgid "_Snooze"
 msgstr "தூங�க� (_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 msgid "hours"
@@ -2320,35 +2117,36 @@ msgstr "மணிகள�"
 msgid "location of appointment"
 msgstr "சந�திப�ப� �ற�பாட� இடம�"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "minutes"
 msgstr "நிமிடங�கள�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1435
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1557
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
 msgid "No summary available."
 msgstr "ச�ர�க�கம� இல�லை."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1444
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1446
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
 msgid "No description available."
 msgstr "விளக�கம� இல�லை"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
 msgid "No location information available."
 msgstr "இட விவரம� இல�லை."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
 #, c-format
 msgid "You have %d alarms"
 msgstr "உங�களிடம� %d அலாரங�கள� உள�ளன"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1669
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "எச�சரிக�கை"
@@ -2365,7 +2163,7 @@ msgstr ""
 "அன�ப�ப�ம� வசதி அமைக�கப�பட�ட�ள�ளத�, எவல�யூஷன� \n"
 "சாதாரண நினைவூட�டல� உரையாடல� பெட�டியை காட�ட�ம�."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2381,7 +2179,7 @@ msgstr ""
 "\n"
 "இந�த நிரலை இயக�க விர�ப�பமா?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "இந�த நிரல� பற�றி இனி என�னிடம� கேட�க வேண�டாம�."
 
@@ -2423,7 +2221,7 @@ msgid "Alarm programs"
 msgstr "அலாரம� நிரல�கள�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "நிலைப�பட�டியில� பிழை காட�டப�பட வேண�டிய நேரம� - வினாடிகளில�."
 
@@ -3035,7 +2833,7 @@ msgid "Classification"
 msgstr "வகைப�பட�த�த�தல�"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3079,19 +2877,19 @@ msgid "Organizer"
 msgstr "ஒர�ங�கிணைப�பாளர�"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:486
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "தனிப�பட�ட"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:485 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "பொத�வான"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:299
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "மீண�ட�ம� தோன�ற�கிறத�"
@@ -3174,7 +2972,7 @@ msgstr "ஆயத�த எச�சரிக�கை மணி"
 msgid "Mes_sage:"
 msgstr "(_s)செய�தி:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:77
 msgid "Options"
 msgstr "விர�ப�பங�கள�"
 
@@ -3221,11 +3019,12 @@ msgstr "நாள�(ட�கள�)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
 #: ../plugins/google-account-setup/google-contacts-source.c:333
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "நாட�கள�"
 
@@ -3233,19 +3032,20 @@ msgstr "நாட�கள�"
 msgid "end of appointment"
 msgstr "சந�திப�ப� ம�டிவ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "ஒவ�வொர�ம�றைய�ம� செலவான கூட�தல� நேரம�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "மணி(கள�)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "நிமிடம�(ங�கள�)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "சந�திப�ப� த�வக�கம�"
 
@@ -3277,19 +3077,20 @@ msgstr "எத�வ�மில�லை"
 msgid "Select..."
 msgstr "தேர�ந�தெட�..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
 msgid "Selected Calendars for Alarms"
 msgstr "நாள�காட�டிகளை அலாரங�கள�க�காக தேர�ந�தெட�க�கவ�ம�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
-msgid "Time and date:"
-msgstr "நேரம� மற�ற�ம� தேதி :"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
+msgid "Ti_me and date:"
+msgstr "_m நேரம� மற�ற�ம� தேதி :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
-msgid "Date only:"
-msgstr "தேதி மட�ட�ம�:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
+msgid "_Date only:"
+msgstr "_D தேதி மட�ட�ம�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2, no-c-format
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
+#, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u மற�ற�ம� %d பயனர� மற�ற�ம� களம� மின�னஞ�சல� ம�கவரியிலிர�ந�த� மாற�றப�பட�ம�."
 
@@ -3317,12 +3118,12 @@ msgstr "30 நிமிடங�கள�"
 msgid "60 minutes"
 msgstr "60 நிமிடங�கள�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "எச�சரிக�கைகள�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "தேதி/நேரம� பாங�க� "
@@ -3348,18 +3149,18 @@ msgid "Display alarms in _notification area only"
 msgstr "(_n) அறிவிப�ப� ப�லத�தில� மட�ட�ம� அலாரங�களை காட�ட�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "வெள�ளிக�கிழமை"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2653
+#: ../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:278 ../mail/mail-config.ui.h:54
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2660
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "General"
@@ -3374,7 +3175,7 @@ msgid "Minutes"
 msgstr "நிமிடங�கள�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "திங�கட�கிழமை"
@@ -3388,182 +3189,194 @@ msgid "None"
 msgstr "எத�வ�மில�லை"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "Pick a color"
 msgstr "நிறத�தை தேர�வ� செய�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "(_u)ஞாயிற�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "சனிக�கிழமை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "(_r) மாதம� காட�சியை வாரமாக உர�ட�ட�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "(_c) இரண�டாம� நிலை மண�டலம�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "அலார அறிவிப�ப�க�க� நாள�காட�டிகளை தேர�ந�தெட�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "(_o) நினைவூட�டலை காட�ட�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "(_o) ஒர� நினைவூட�டலை காட�ட�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "(_n) தேதி நகர�த�தியில� வார எண�களை காட�ட�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "(_u) வார எண�களை நாள� மற�ற�ம� வார பார�வையில� காட�ட�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "ஞாயிற�ற�க�கிழமை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "(_a)இன�ற� நில�வையில� உள�ள பணிகள�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "(_h)வியாழன�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "பணிகளின� பட�டியல�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "மாதிரிஉர�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "வியாழக�கிழமை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "நேரம�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "நேரம� காட�டி (_z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "நேரத�தின� அமைப�ப�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "செவ�வாய� கிழமை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "(_y) கணினி நேர மண�டலத�தை பயன�பட�த�த�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "ப�தன� கிழமை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "வாரம� த�வங�க�கிறத�: (_k)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Work Week"
 msgstr "வார வேலை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "வேலை நாட�கள�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 மணி (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 மணி"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "(_A)உர�ப�படிகளை நீக�க�ம� போத� உற�திப�பட�த�த�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "(_C) மாத செய�திகளை காட�ட�ம� போத� வார செய�திகளை ச�ர�க�கி காட�ட�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "(_D) நாள� த�வங�கியத�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "(_F) வெள�ளி"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "(_H) ம�டிந�த பணிகளை மறை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "(_M) திங�கள�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "(_O) நில�வையில� உள�ள பணிகள�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "(_S)சனி"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "(_S) வாரம� மற�ற�ம� மாதம� காட�சியில� சந�திப�பின� ம�டிவ� காட�ட�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "(_T) நேர பக�ப�ப� :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "(_T)செவ�வாய�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "(_W)ப�தன�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "ஒவ�வொர� ஆண�ட� நிறைவ�/ பிறந�த நாள� ம�ன�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "ஒவ�வொர� சந�திப�ப�க�க� ம�ன�ன�ம�"
 
@@ -3572,12 +3385,12 @@ msgid "Type:"
 msgstr "வகை:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "வகை (_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:147
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3596,35 +3409,35 @@ msgstr "_y இணைபà¯�பà¯� விலகிய செயலà¯�களà¯�கà
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "_y இணைப�ப� விலகிய செயல�கள�க�க�  க�றிப�ப� பட�டியல� உள�ளடக�கத�தை நகலெட�."
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "(_r) நிறம�:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "க�றிப�ப�களின� பட�டியல�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "நாள�காட�டி பண�ப�கள�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "ப�திய நாள�காட�டி"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "பணி பட�டியல� பண�ப�கள�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "ப�திய பணிபட�டியல�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "பணி பட�டியல� பண�ப�கள�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "ப�திய க�றிப�ப� பட�டியல�"
 
@@ -3677,31 +3490,11 @@ msgstr "%s நீங�கள� மாற�றம� எத�வ�ம� ச
 msgid "Validation error: %s"
 msgstr "சரிபார�க�க�ம� போத� பிழை: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr "பெற�நர�"
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr "(ம�டிந�தத�"
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "ம�டிந�தத�"
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (நில�வையில�"
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "நில�வையில�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:237
 msgid "Could not save attachments"
 msgstr "இணைப�ப�களை சேமிக�க ம�டியவில�லை "
 
-#: ../calendar/gui/dialogs/comp-editor.c:509
+#: ../calendar/gui/dialogs/comp-editor.c:505
 msgid "Could not update object"
 msgstr "பொர�ளை திர�த�த ம�டியவில�லை"
 
@@ -3747,21 +3540,21 @@ msgid "Click here to close the current window"
 msgstr "நடப�ப� சாளரத�தை மூட இங�க� சொட�க�கவ�ம�"
 
 #: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1464
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "தேர�வ� செய�தவற�றை நகலெட�"
 
 #: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1471
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "தேர�வை வெட�ட�"
 
 #: ../calendar/gui/dialogs/comp-editor.c:959
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "தேர�வை வெட�ட�"
@@ -3771,9 +3564,9 @@ msgid "Click here to view help available"
 msgstr "உதவியை பெற இங�க� சொட�க�கவ�ம�"
 
 #: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1513
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "தற�காலிக நினைவிடத�தில� ஒட�ட�"
 
@@ -3782,7 +3575,7 @@ msgid "Click here to save the current window"
 msgstr "நடப�ப� சாளரத�தை சேமிக�க இங�க� சொட�க�கவ�ம�"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "எல�லா உரையைய�ம� தேர�வ�செய�"
@@ -3792,13 +3585,13 @@ msgid "_Classification"
 msgstr "பிரிவ�கள� (_C)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1632
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "(_F)கோப�ப�"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1029
-#: ../shell/e-shell-window-actions.c:1619
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Help"
 msgstr "(_H)உதவி..."
 
@@ -3807,17 +3600,17 @@ msgid "_Insert"
 msgstr "ந�ழை (_I)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1043
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "விர�ப�பங�கள� (_O)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1654
+#: ../shell/e-shell-window-actions.c:1674
 msgid "_View"
 msgstr "(_V)பார�"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1060
-#: ../composer/e-composer-actions.c:279
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "(_A)இணைப�ப�...."
 
@@ -3903,7 +3696,7 @@ msgid "Recent _Documents"
 msgstr "(_D) அண�மை ஆவணங�கள�"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1683
-#: ../composer/e-composer-actions.c:475
+#: ../composer/e-composer-actions.c:477
 msgid "Attach"
 msgstr "இணைக�கவ�ம�"
 
@@ -3913,16 +3706,16 @@ msgstr "சேமி"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2015
 #: ../calendar/gui/dialogs/comp-editor.c:2064
-#: ../calendar/gui/dialogs/comp-editor.c:2955
+#: ../calendar/gui/dialogs/comp-editor.c:2958
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "இந�த உர�ப�படியில� செய�த மாற�றங�கள� ப�திப�பிக�க�ம� போத� நீக�கப�பட�ம�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2923
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "இணைப�ப�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2985
+#: ../calendar/gui/dialogs/comp-editor.c:2988
 msgid "Unable to use current version!"
 msgstr "தற�போதைய பதிப�பை பயன�பட�த�த�வதற�காக மேம�பட�த�தவ�ம�"
 
@@ -3942,6 +3735,10 @@ msgstr "சேர�ம� இடத�தின� பண�ப� படிக
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "இந�த உர�ப�படியை மற�ற அனைத�த� பெற�நர� அஞ�சல� பெட�டிகளிலிர�ந�த�ம� அழிக�க வேண�டாமா? (_D)"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "(_R) பின�னூட�டத�தை பின�வாங�க�"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "கோப�ரா பிழையால� இந�த நிகழ�வை நீக�க ம�டியாத�"
@@ -4002,59 +3799,59 @@ msgstr "ஒப�ப� கொட�த�தத� :"
 msgid "Enter Delegate"
 msgstr "ம�க�கிய விர�ந�தினர�களை உள�ளிட�"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Alarms"
 msgstr "அலாரங�கள� (_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Click here to set or unset alarms for this event"
 msgstr "இந�த நிகழ�வ�க�க� எச�சரிக�கையை அமைக�க அல�லத� நீக�க இங�க� சொட�க�க�"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Recurrence"
 msgstr "மீண�ட�ம� தோன�றல� (_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Make this a recurring event"
 msgstr "இந�த நிகழ�வை ச�ர�ள� நிகழ�வாகச� செய�"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:219
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "அன�ப�ப� விர�ப�பங�கள�"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:221
 #: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "கூட�தல� அன�ப�ப�ம� விர�ப�பங�களை ந�ழை"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:229
 msgid "All _Day Event"
 msgstr "அனைத�த� நாள� நிகழ�வ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:231
 msgid "Toggles whether to have All Day Event"
 msgstr "அனைத�த� நாள� நிகழ�வ� வைத�த�க�கொள�ளலாமா என�பதை மாற�ற�கிறத�."
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "Show Time as _Busy"
 msgstr "(_b) வேலையில� உள�ள நேரம� எனக�காட�ட�"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Toggles whether to show time as busy"
 msgstr "பெற�வத� நேரத�தை வேலையில� என காட�டலாமா என�பதை மாற�ற�கிறத�."
 
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:248
 msgid "_Free/Busy"
 msgstr "ஓய�வ�/பணியில� (_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "Query free / busy information for the attendees"
 msgstr "பங�கேற�போர�க�க� வேலை அல�லத� ஓய�வ� தகவலை கேட�கவ�ம�"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "சந�திப�ப� �ற�பாட� (_m)"
 
@@ -4140,7 +3937,7 @@ msgstr "நாளà¯�காடà¯�டியை திறகà¯�க à®®à¯�டியà
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
 #: ../calendar/gui/dialogs/event-page.c:2635
-#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/memo-page.c:915
 #: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
@@ -4190,8 +3987,10 @@ msgid "15 minutes before appointment"
 msgstr "சந�திப�ப�க�க� 15 நிமிடங�கள� ம�ன�"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "கலந�த�கொள�பவர�கள�_s..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "கலந�த�கொள�பவர�கள�... (_n)"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
 #: ../calendar/gui/e-meeting-list-view.c:148
@@ -4206,28 +4005,26 @@ msgstr "தனிபயன� அலாரம�:"
 msgid "Event Description"
 msgstr "நிகழ�வ� விவரம�"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "(_m)ச�ர�க�கம�"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "(_A)நினைவூட�டன� மணி"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "(_D)விளக�கம�:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "(_L)இடம�:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_S ச�ர�க�கம�:"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "காலம�: (_T)"
@@ -4242,7 +4039,7 @@ msgstr "ம�றை"
 msgid "until"
 msgstr "வரை"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2576
 msgid "Memo"
 msgstr "க�றிப�ப�"
 
@@ -4254,15 +4051,15 @@ msgstr "நினைவூட�டலை  திர�த�த ம�டிய
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "நினைவூட�டலை ம�ழ�த�ம� திர�த�த ம�டியாத�; �னெனில� நீங�கள� ஒர�ங�கிணைப�பாளர� இல�லை."
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:876
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s'. இல� க�றிப�ப�களை திறக�க ம�டியவில�லை"
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2299 ../mail/em-format-html.c:2324
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1043 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:78
 msgid "To"
 msgstr "பெற�நர�"
 
@@ -4271,6 +4068,11 @@ msgstr "பெற�நர�"
 msgid "Sta_rt date:"
 msgstr "(_r)த�வக�க தேதி:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "(_m)ச�ர�க�கம�"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "ம�ன�னால�_o:"
@@ -4281,60 +4083,59 @@ msgstr "ம�ன�னால�_o:"
 msgid "_Group:"
 msgstr "(_G)க�ழ�:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr ""
-"நீங�கள� மீண�ட�ம� காட�டிய நிகழ�வில� மாற�றம� செய�கிறீர�கள�. என�ன மாற�றம� செய�ய விர�ம�ப�கிறீர�கள�?"
+msgstr "நீங�கள� மீண�ட�ம� காட�டிய நிகழ�வில� மாற�றம� செய�கிறீர�கள�. என�ன மாற�றம� செய�ய விர�ம�ப�கிறீர�கள�?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "நீங�கள� ஒர� நிகழ�வ�க�க� பிரதிநிதி அமைகிறீர�கள�. எதற�க� பிரதிநிதி அமைக�க வேண�ட�ம�?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "நீங�கள� ஒர� ச�ழல� வேலையை மாற�றி அமைகிறீர�கள�. எதை மாற�றி அமைக�க வேண�ட�ம�?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "நீங�கள� மீண�ட�ம� நிகழ�ம� ச�ழல� க�றிப�பில� மாற�றம� செய�கிறீர�கள�. என�ன மாற�றம� செய�ய "
 "விர�ம�ப�கிறீர�கள�?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "இந�த நிகழ�வ� மட�ட�ம�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "இந�த மற�ற�ம� ம�ந�தைய நிகழ�வ�கள�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "இந�த மற�ற�ம� இனிவர�ம� நிகழ�வ�கள�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "எல�லா நிகழ�வ�கள�ம�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "இந�த சந�திப�பில� மீண�ட�ம� வந�த�ள�ளதால� எவல�யூஷனால� திர�த�த ம�டியாத�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "மீண�ட�ம� வந�த தேதி செல�லாத�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "ச�ர�ள� ச�ழற�சி ம�டிய�ம� நேரம� நிகழ�வ� த�வங�க�ம� ம�ன� இர�ந�தத�"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:958
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "இயக�க�"
 
@@ -4342,7 +4143,7 @@ msgstr "இயக�க�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "ம�தல�"
 
@@ -4351,7 +4152,7 @@ msgstr "ம�தல�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1021
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "இரண�டாவத�"
 
@@ -4359,7 +4160,7 @@ msgstr "இரண�டாவத�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "மூன�றாவத�"
 
@@ -4367,7 +4168,7 @@ msgstr "மூன�றாவத�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "நான�காவத�"
 
@@ -4375,7 +4176,7 @@ msgstr "நான�காவத�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "�ந�தாவத�"
 
@@ -4383,13 +4184,13 @@ msgstr "�ந�தாவத�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1065
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "மற�ற தேதிகள�"
 
@@ -4397,7 +4198,7 @@ msgstr "மற�ற தேதிகள�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1071
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1 ம�தல� 10 வரை"
 
@@ -4405,7 +4206,7 @@ msgstr "1 ம�தல� 10 வரை"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1077
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11 ம�தல� 20 வரை"
 
@@ -4413,21 +4214,21 @@ msgstr "11 ம�தல� 20 வரை"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "21 ம�தல� 31 வரை"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "நாள�"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1237
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "மேல�"
 
@@ -4435,23 +4236,23 @@ msgstr "மேல�"
 msgid "occurrences"
 msgstr "நிகழ�வ�கள�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2117
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "விதிவிலக�கை சேர�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2158
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "மாற�ற ஒர� தேர�வ� இல�லை"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2164
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "விதிவிலக�கை மாற�றியமை"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2208
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "நீக�க ஒர� தேர�வ� இல�லை"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2347
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "தேதி/நேரம�"
 
@@ -4463,7 +4264,7 @@ msgstr "அனைத�த�ம�"
 msgid "Exceptions"
 msgstr "தவிர�ப�ப�கள�"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:85
 msgid "Preview"
 msgstr "_P ம�ன�பார�வை"
 
@@ -4487,11 +4288,11 @@ msgstr "வாரம�(ங�கள�)"
 msgid "year(s)"
 msgstr "வர�டம�(ங�கள�)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "இந�த நிகழ�வ�டன� என� எச�சரிக�கைகளை அன�ப�ப�"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "(_o) ப�திய பங�கேற�பாளர�களை மட�ட�ம� அறிவி."
 
@@ -4500,66 +4301,66 @@ msgstr "(_o) பà¯�திய பஙà¯�கேறà¯�பாளரà¯�களை à®®à®
 msgid "Completed date is wrong"
 msgstr "ம�டிந�த தேதியில� தவற�"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "இணைய பக�கம�"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:212
-#: ../calendar/gui/e-task-table.c:227 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2656 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "ம�டிவ�ற�றத�"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:507 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1120 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "அதிக"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2653
 msgid "In Progress"
 msgstr "நடந�த�கொண�டிர�க�கிறத�"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:509 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1118 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "க�றைவாக"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:508
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1119
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "இயல�பாக"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:208
-#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:580
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2650 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "த�வங�கவில�லை"
 
@@ -4575,7 +4376,7 @@ msgstr "நிலை: (_u)"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1759
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4585,7 +4386,7 @@ msgstr "நிலை"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "க�றிப�பில�லா"
@@ -4595,7 +4396,7 @@ msgid "_Date completed:"
 msgstr "(_D) தேதி ம�டிந�தத�"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "(_P)ம�ன�ன�ரிமை"
 
@@ -4616,11 +4417,11 @@ msgstr "பணியின� நிலை விவரங�களை மாற
 msgid "_Send Options"
 msgstr "அன�ப�ப�ம� விர�ப�பங�கள� (_S) "
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "_Task"
 msgstr "(_T)பணி"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:325
 msgid "Task Details"
 msgstr "பணி விவரங�கள�"
 
@@ -4646,10 +4447,6 @@ msgstr "நில�வை தேதி தவறாக உள�ளத�"
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'. இல� பணியை திறக�கம�டியவில�லை"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "கலந�த�கொள�பவர�கள�... (_n)"
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "வகைகள�... (_i)"
@@ -4738,46 +4535,46 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s தெரியாத த�வக�க வகை"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:191 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "தலைப�பில�லா"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:197
 msgid "Categories:"
 msgstr "வகைகள�"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "ச�ர�க�கம�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:258
 msgid "Start Date:"
 msgstr "த�வக�க தேதி:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "நில�வை தேதி:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-cal-component-preview.c:284
 #: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1062
+#: ../plugins/itip-formatter/itip-view.c:1058
 msgid "Status:"
 msgstr "நிலை:"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "ம�ன�ன�ரிமை:"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-cal-component-preview.c:336
 #: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Description:"
 msgstr "விளக�கம�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:367
 msgid "Web Page:"
 msgstr "இணைய பக�கம�:"
 
@@ -4804,16 +4601,16 @@ msgid "Start Date"
 msgstr "த�வக�க தேதி"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:559
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "வேலையில� இல�லை�"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "வேலையில�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4824,63 +4621,49 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "எத�வ�மில�லை"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ஆம�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "இல�லை"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "ம�ன�னிர�ப�ப� சார�ந�தோன�"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:836
-msgid "Shell Settings"
-msgstr "ஷெல� அமைவ�கள�"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:837
-msgid "Application-wide settings"
-msgstr "நிரல� சார� அமைப�ப�கள�"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2325
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:976
+#: ../plugins/itip-formatter/itip-formatter.c:450
+#: ../plugins/itip-formatter/itip-formatter.c:2327
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "தெரியாத�"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "மீண�ட�ம�நடக�கிறத�"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "ஒத�க�கப�பட�ட"
 
-#: ../calendar/gui/e-cal-model.c:2203
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "%s� திறக�கிறத�"
@@ -4924,90 +4707,90 @@ msgstr "த�வக�க தேதி"
 msgid "Type"
 msgstr "வகை"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:404
 msgid "Cut selected events to the clipboard"
 msgstr "தேர�வ� செய�த நிகழ�வ�களை ஒட�ட�ப�பலகத�த�க�க� வெட�ட�"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:410
 msgid "Copy selected events to the clipboard"
 msgstr "தேர�வ� செய�த நிகழ�வ�களை தற�காலிக நினைவிடத�தில� நகலெட�க�கவ�ம�"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:416
 msgid "Paste events from the clipboard"
 msgstr "தற�காலிக நினைவிடத�தில� உள�ள நிகழ�வ�களை ஒட�ட�"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Delete selected events"
 msgstr "தேர�வ� செய�த நிகழ�வ�களை அழி"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:186
-#: ../calendar/gui/e-task-table.c:264
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "தேர�வ� செய�யப�பட�ட பொர�ள� நீக�கப�பட�கிறத�"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:841
-#: ../calendar/gui/e-task-table.c:1062
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
 msgid "Updating objects"
 msgstr "பொர�ள� ப�த�ப�பிக�கப�பட�கிறத�"
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1706
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2315
 msgid "Accepted"
 msgstr "�ற�கப�பட�டத�"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1707
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2319
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2321
 msgid "Declined"
 msgstr "நிராகரிக�கப�பட�டத�"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1708
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "தோராயமாக"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1709
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2322
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2324
 msgid "Delegated"
 msgstr "விர�ந�தினராக"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1710
 msgid "Needs action"
 msgstr "செயல� தேவை"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:526
-#: ../calendar/gui/e-task-table.c:737
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ஒர�ங�கிணைப�பாளர�: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:531
-#: ../calendar/gui/e-task-table.c:740
+#: ../calendar/gui/e-calendar-view.c:1856 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "ஒர�ங�கிணைப�பாளர�: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/print.c:2608
 #, c-format
 msgid "Location: %s"
 msgstr "இடம�: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1903
 #, c-format
 msgid "Time: %s %s"
 msgstr "நேரம�: %s %s"
@@ -5050,7 +4833,7 @@ msgstr "இரண�டாம� நிலை மண�டலத�தை கா
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-day-view-top-item.c:865 ../calendar/gui/e-day-view.c:1879
 #: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -5061,10 +4844,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1901
+#: ../calendar/gui/e-day-view-top-item.c:869 ../calendar/gui/e-day-view.c:1896
 #: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:894
+#: ../modules/calendar/e-cal-shell-view-private.c:913
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5073,27 +4856,27 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1917
+#: ../calendar/gui/e-day-view-top-item.c:873 ../calendar/gui/e-day-view.c:1912
 #: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:930
+#: ../modules/calendar/e-cal-shell-view-private.c:949
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "ம�ப"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "பிப"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2609
 #, c-format
 msgid "Week %d"
 msgstr "வாரம� %d"
@@ -5190,11 +4973,11 @@ msgstr "� நாள�காட�டி பிழை"
 
 #: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
 #: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "தெரியாத நபர�"
 
@@ -5206,13 +4989,13 @@ msgstr "<br> இந�த தகவலை பார�த�த பிறக�
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2300
+#: ../plugins/itip-formatter/itip-formatter.c:2302
 msgctxt "cal-itip"
 msgid "None"
 msgstr "எத�வ�மில�லை"
 
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2316
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgid "Tentatively Accepted"
 msgstr "�ற�கப�படலாம�"
 
@@ -5428,7 +5211,7 @@ msgid "Attendee status updated\n"
 msgstr "பங�கேற�பாளர� நிலை ப�த�ப�பிக�கபட�டத�\n"
 
 #: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1408
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "பங�கேற�பாளர� நிலை ப�த�ப�பிக�கப�படாதற�க� காரணம� இவர� பட�டியலில� இல�லை"
 
@@ -5482,8 +5265,8 @@ msgid "Send Latest Information"
 msgstr "தற�போதைய தகவலை அன�ப�ப�"
 
 #: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1030
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../modules/mail/e-mail-shell-view-actions.c:970
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "ரத�த� செய�"
 
@@ -5532,56 +5315,56 @@ msgid "Resources"
 msgstr "மூலங�கள�"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "தனிநபர�"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "க�ழ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "மூலங�கள�"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "அறை"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "நட�வர�"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "தேவையான பங�கேற�பாளர�கள�"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "பங�கேற�பாளர�கள�"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "பங�கேற�காதவர�கள�"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "செயல� தேவை"
 
@@ -5590,14 +5373,14 @@ msgstr "செயல� தேவை"
 msgid "Attendee                          "
 msgstr "கலந�த� கொள�பவர�கள�                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2284
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -5606,7 +5389,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:462
-#: ../calendar/gui/e-meeting-time-sel.c:2315
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -5616,67 +5399,63 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "அல�வலகத�திற�க� வெளியில�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "தகவல� இல�லை"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "கலந�த�கொள�பவர�கள�... (_t)"
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "விர�ப�பங�கள� (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "வேலை நேரத�தை மட�ட�ம� காட�ட� (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "(_z) பெரிதாக�கபப�ட�டத�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "(_U)வேலை/வேலையில�லை தகவலை ப�த�ப�பி"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "(_A)வேகமாகதேர�வ� செய�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "(_A)எல�லோர�ம� மற�ற�ம� மூலங�கள�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "(_p)எல�லோர�ம� மற�ற�ம� ஒரே ஒர� மூலம� மட�ட�ம�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "(_R)தேவையானவர�கள� மட�ட�ம�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "(_o)தேவையானவர�கள� மற�ற�ம� ஒர� மூலம�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "(_S)த�வக�க நேரம�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "(_E)ம�டிய�ம� நேரம�:"
 
@@ -5704,45 +5483,47 @@ msgstr "மொழி"
 msgid "Member"
 msgstr "உற�ப�பினர�"
 
-#: ../calendar/gui/e-memo-table.c:410
-#: ../modules/calendar/e-cal-shell-content.c:399
+#: ../calendar/gui/e-memo-table.c:411
+#: ../modules/calendar/e-cal-shell-content.c:461
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "க�றிப�ப�கள�"
 
-#: ../calendar/gui/e-memo-table.c:488 ../calendar/gui/e-task-table.c:701
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
 msgid "* No Summary *"
 msgstr "* ச�ர�க�கம� இல�லை *"
 
-#: ../calendar/gui/e-memo-table.c:572 ../calendar/gui/e-task-table.c:781
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
 msgid "Start: "
 msgstr "த�வக�க�:"
 
-#: ../calendar/gui/e-memo-table.c:590 ../calendar/gui/e-task-table.c:799
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
 msgid "Due: "
 msgstr "நில�வை:"
 
-#: ../calendar/gui/e-memo-table.c:706
+#: ../calendar/gui/e-memo-table.c:709
 msgid "Cut selected memos to the clipboard"
 msgstr "தேர�வ� செய�த நினைவூட�டல�களை ஒட�ட�ப�பலகத�தில� வெட�ட�"
 
-#: ../calendar/gui/e-memo-table.c:712
+#: ../calendar/gui/e-memo-table.c:715
 msgid "Copy selected memos to the clipboard"
 msgstr "தேர�ந�தெட�க�கப�பட�ட நினைவூட�டல�களை ஒட�ட�ப�பலகைக�க� நகல� எட�க�கவ�ம�."
 
-#: ../calendar/gui/e-memo-table.c:718
+#: ../calendar/gui/e-memo-table.c:721
 msgid "Paste memos from the clipboard"
 msgstr " ஒட�ட�ப�பலகையில� இர�ந�த� நினைவூட�டல�களை  ஒட�ட�"
 
-#: ../calendar/gui/e-memo-table.c:724
-#: ../modules/calendar/e-memo-shell-view-actions.c:569
+#: ../calendar/gui/e-memo-table.c:727
+#: ../modules/calendar/e-memo-shell-view-actions.c:556
 msgid "Delete selected memos"
 msgstr "தேர�வ� செய�த நினைவூட�டல�களை அழி"
 
-#: ../calendar/gui/e-memo-table.c:730
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Select all visible memos"
 msgstr "ப�லப�பட�ம� அனைத�த� நினைவூட�டல�களைய�ம� தேர�வ� செய�யவ�ம�"
 
@@ -5750,82 +5531,46 @@ msgstr "பà¯�லபà¯�படà¯�à®®à¯� அனைதà¯�தà¯� நினைவூà
 msgid "Click to add a memo"
 msgstr "ஒர� நினைவூட�டலை  சேர�க�க சொட�க�கவ�ம�"
 
-#: ../calendar/gui/e-task-table.c:529
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:530
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-task-table.c:538
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "100%"
-msgstr "100%"
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
+#: ../calendar/gui/e-task-table.c:538, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:623 ../calendar/gui/print.c:2043
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:359
+#: ../modules/calendar/e-cal-shell-content.c:423
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "பணிகள�"
 
-#: ../calendar/gui/e-task-table.c:927
+#: ../calendar/gui/e-task-table.c:932
 msgid "Cut selected tasks to the clipboard"
 msgstr "தேர�வ� செய�த பணிகளை ஒட�ட�ப�பலகத�தில� படியெட�"
 
-#: ../calendar/gui/e-task-table.c:933
+#: ../calendar/gui/e-task-table.c:938
 msgid "Copy selected tasks to the clipboard"
 msgstr "தேர�வ� செய�த பணிகளை ஒட�ட�ப�பலகத�தில� நகலெட�க�கவ�ம�"
 
-#: ../calendar/gui/e-task-table.c:939
+#: ../calendar/gui/e-task-table.c:944
 msgid "Paste tasks from the clipboard"
 msgstr "ஒட�ட�ப�பலகத�தில� இர�ந�த� பணிகளை ஒட�டவ�ம�"
 
-#: ../calendar/gui/e-task-table.c:945
-#: ../modules/calendar/e-task-shell-view-actions.c:693
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "Delete selected tasks"
 msgstr "தேர�வ� செய�த பணிகளை நீக�க�"
 
-#: ../calendar/gui/e-task-table.c:951
+#: ../calendar/gui/e-task-table.c:956
 msgid "Select all visible tasks"
 msgstr "ப�லப�பட�ம� அனைத�த� பணிகளைய�ம� தேர�வ� செய�யவ�ம�"
 
@@ -5865,7 +5610,7 @@ msgstr "நாளà¯�காடà¯�டி நிகழà¯�வà¯�: இதிலà¯� à®
 msgid "calendar view event"
 msgstr "நாள�காட�டி பார�வை நிகழ�வ�"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:541
 msgid "Grab Focus"
 msgstr "ம�ன�னிலையை பற�ற�க"
 
@@ -5938,16 +5683,16 @@ msgid "Gnome Calendar"
 msgstr "க�னோம� நாள�காட�டி"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:890
+#: ../modules/calendar/e-cal-shell-view-private.c:909
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:897
-#: ../modules/calendar/e-cal-shell-view-private.c:903
-#: ../modules/calendar/e-cal-shell-view-private.c:906
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -5955,10 +5700,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:923
-#: ../modules/calendar/e-cal-shell-view-private.c:934
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:944
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -5988,7 +5733,7 @@ msgstr "à®’à®°à¯� மாததà¯�திறà¯�கான நாளà¯�காடà¯�à
 msgid "calendar view for one or more weeks"
 msgstr "ஒன�ற� அல�லத� அதற�க� மேற�பட�ட வாரங�களின� நாள�காட�டி பார�வை"
 
-#: ../calendar/gui/gnome-cal.c:2144
+#: ../calendar/gui/gnome-cal.c:2242
 msgid "Purging"
 msgstr "நிரந�தர நீக�கம�"
 
@@ -6041,39 +5786,40 @@ msgid "Select Date"
 msgstr "தேதியை தேர�வ� செய�"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "செப�டம�பர�"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "Select _Today"
+msgstr "(_T)இன�றைய தேதியை தேர�வ� செய�"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "(_S)இன�றைய தேதியை தேர�வ� செய�"
+msgid "September"
+msgstr "செப�டம�பர�"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "ஒர�ங�கிணைப�பாளர� அமைக�கப�பட வேண�ட�ம�"
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "ஒர� பங�கேற�பாளராவத� தேவை"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "நிகழ�வ� தகவல�"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:787
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "பணி தகவல�"
 
-#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:790
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "க�றிப�ப� இல�லை"
 
-#: ../calendar/gui/itip-utils.c:643 ../calendar/gui/itip-utils.c:808
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "வேலை/வேலையிலில�லை தகவல�"
 
-#: ../calendar/gui/itip-utils.c:646
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "நாள�காட�டி தகவல�"
 
@@ -6081,7 +5827,7 @@ msgstr "நாள�காட�டி தகவல�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:680
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "�ற�கப�பட�டத�"
@@ -6090,7 +5836,7 @@ msgstr "�ற�கப�பட�டத�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:687
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "�ற�கப�படலாம�"
@@ -6102,7 +5848,7 @@ msgstr "�ற�கப�படலாம�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:742
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "நிராகரிக�கப�பட�டத�"
@@ -6111,7 +5857,7 @@ msgstr "நிராகரிக�கப�பட�டத�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:701
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ஒப�ப� கொட�க�கப�பட�டத�"
@@ -6119,7 +5865,7 @@ msgstr "ஒப�ப� கொட�க�கப�பட�டத�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:714
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ப�த�ப�பிக�கப�பட�கிறத�"
@@ -6127,7 +5873,7 @@ msgstr "ப�த�ப�பிக�கப�பட�கிறத�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:721
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ரத�த� செய�"
@@ -6135,7 +5881,7 @@ msgstr "ரத�த� செய�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:728
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ப�த�ப�பி"
@@ -6143,29 +5889,29 @@ msgstr "ப�த�ப�பி"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:735
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "மாற�ற�-கோரிக�கை"
 
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "வேலை/வேலையில�லை தகவல�(%s %s க�க�)"
 
-#: ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "� நாள�காட�டி தகவல�"
 
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "ஒர� மூலத�தை பதிய ம�டியவில�லை, ப�திய நிகழ�வ� வேற� எத�த�டனோ மோத�கிறத�"
 
-#: ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "ஒர� மூலத�தை பதிய ம�டியவில�லை, பிழை:"
 
-#: ../calendar/gui/itip-utils.c:988
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "இந�த நிகழ�வில� நீங�கள� கலந�த�கொள�ள வேண�ட�ம�"
 
@@ -6321,49 +6067,74 @@ msgstr "வெ"
 msgid "Sa"
 msgstr "ச"
 
-#: ../calendar/gui/print.c:2564
+#. Translators: This is part of "START to END" text, where START and END are date/times
+#: ../calendar/gui/print.c:2419
+msgid " to "
+msgstr "பெற�நர�"
+
+#. Translators: This is part of "START to END (Completed COMPLETED)", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2425
+msgid " (Completed "
+msgstr "(ம�டிந�தத�"
+
+#. Translators: This is part of "Completed COMPLETED", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2428
+msgid "Completed "
+msgstr "ம�டிந�தத�"
+
+#. Translators: This is part of "START (Due DUE)", where START and DUE are dates/times
+#: ../calendar/gui/print.c:2435
+msgid " (Due "
+msgstr " (நில�வையில�"
+
+#. Translators: This is part of "Due DUE", where DUE is a date/time due the event should be finished
+#: ../calendar/gui/print.c:2438
+msgid "Due "
+msgstr "நில�வையில�"
+
+#: ../calendar/gui/print.c:2572
 msgid "Appointment"
 msgstr "சந�திப�ப� �ற�பாட�"
 
-#: ../calendar/gui/print.c:2566
+#: ../calendar/gui/print.c:2574 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "பணி"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2599
 #, c-format
 msgid "Summary: %s"
 msgstr "ச�ர�க�கம�: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2623
 msgid "Attendees: "
 msgstr "கலந�த�கொள�பவர�கள�:"
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2666
 #, c-format
 msgid "Status: %s"
 msgstr "நிலை : %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2681
 #, c-format
 msgid "Priority: %s"
 msgstr "ம�ன�ன�ரிமை: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2699
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ம�டிந�த விகிதம� : %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2710
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2723
 #, c-format
 msgid "Categories: %s"
 msgstr "வகைகள�: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2734
 msgid "Contacts: "
 msgstr "தொடர�ப�கள�:"
 
@@ -6394,7 +6165,7 @@ msgstr "சநà¯�திபà¯�பà¯�களà¯� மறà¯�à®±à¯�à®®à¯� கூடà¯�à
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1820
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Opening calendar"
 msgstr "நாள�காட�டியை திறக�கிறத�"
 
@@ -7975,157 +7746,157 @@ msgstr "பசிபிக�/வாலிஸ�"
 msgid "Pacific/Yap"
 msgstr "பசிபிக�/யேப�"
 
-#: ../composer/e-composer-actions.c:79
+#: ../composer/e-composer-actions.c:81
 msgid "Untitled Message"
 msgstr "தலைப�பில�லா செய�தி"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "எனச�சேமி..."
 
-#: ../composer/e-composer-actions.c:281
+#: ../composer/e-composer-actions.c:283
 #: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "கோப�பை இணைக�கவ�ம�"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:288
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "(_C)மூட�"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "தற�போதைய கோப�பை தேர�வ� செய�யவ�ம�"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "(_P)அச�சடி..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "(_v)அச�ச� ம�ன�தோற�றம�"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "தற�போதைய கோப�பை சேமி"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "(_A)எனச�சேமி..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "தற�போதைய கோப�பை வேற� பெயரில� சேமி"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "(_D) வரைவாக சேமி"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "வரைவாக சேமி"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:264
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "_அன�ப�ப�க"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "இந�த செய�தியை அன�ப�ப�"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "ப�திய செய�தி (_M)"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "ப�திய செய�தி சாளரத�தை திறS)"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "(_E) எழ�த�த�ர� க�றிம�றை"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:363
 msgid "PGP _Encrypt"
 msgstr "PGP மறையாக�க�"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:365
 msgid "Encrypt this message with PGP"
 msgstr "PGP யை பயன�பட�த�தி இந�த செய�தியை க�றிம�றையாக�கவ�ம�"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:371
 msgid "PGP _Sign"
 msgstr "PGP கையொப�பம�"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:373
 msgid "Sign this message with your PGP key"
 msgstr "PGP விசையை பயன�பட�த�தி இந�த செய�திக�க� கையொப�பமிடவ�ம�"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "ம�ன�ன�ரிமை செய�தி (_P)"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "செய�தி ம�ன�ன�ரிமையை உயர�ந�ததாக அமை"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "படிக�க பெற�றதற�க� சான�ற� கோரவ�ம� (_q)"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:389
 msgid "Get delivery notification when your message is read"
 msgstr "உங�கள� செய�தியை படித�தவ�டன� பெற�ற அறிவிப�பினை பெற�"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:397
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "S/MIME க�றிம�றையாக�க சான�றிதழை பயன�பட�த�தி இந�த செய�தியை க�றியாக�கவ�ம�"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "S/MIME கையொப�பம�"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:405
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "S/MIME கையொப�ப சான�றிதழ� பயன�பட�த�த� இந�த செய�திக�க� கையொப�பமிடவ�ம�"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:411
 msgid "_Bcc Field"
 msgstr "(_B)மறை நகல� ப�லம�"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:413
 msgid "Toggles whether the BCC field is displayed"
 msgstr "மறைநகல� ப�லம� காட�டப�பட வேண�ட�மா என�பதை மாற�ற"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "(_C)கரிநகல� ப�லம�"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "கரிநகல� ப�லம� காட�டப�படவேண�ட�மா என�பதை மாற�ற"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:427
 msgid "_From Field"
 msgstr "(_F)ப�லத�திலிர�ந�த�"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:429
 msgid "Toggles whether the From chooser is displayed"
 msgstr "அன�ப�ப�நரை தேர�வ� செய�ய வேண�ட�மா ப�லத�தை மாற�ற"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "(_R) இங�க� பதிலளி "
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "பதிலளி நர� ப�லம� காட�டப�படவேண�ட�மா என�பதை மாற�ற�ம�"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:480
 msgid "Save Draft"
 msgstr "வரைவை சேமி"
 
@@ -8137,64 +7908,64 @@ msgstr "காட�ட�:"
 msgid "Hide"
 msgstr "மறை"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "அன�ப�ப�வதற�கான செய�தியை உள�ளிடவ�ம�"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "இதே செய�தியை கரிநகலாக அன�ப�ப வேண�டிய ம�கவரியை உள�ளிடவ�ம�"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr "இதே செய�தியை மறை நகலாக அன�ப�ப வேண�டிய ம�கவரியை உள�ளிடவ�ம�"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "அன�ப�ப�நர�: (_o)"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
+#: ../modules/mail/em-mailer-prefs.c:76
 msgid "From"
 msgstr "அன�ப�ப�நர�"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "பதில� : (_R)"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "பெற�நர�: (_T)"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "நகல�: (_C)"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "நகல�"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "மறைநகல�: (_B)"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "மறை நகல�"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "சமர�பி: (_P)"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "பொர�ள�: (_u)"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "கையொப�பம�: (_g)"
 
@@ -8206,21 +7977,37 @@ msgstr "à®®à¯�கவரி பà¯�தà¯�தகதà¯�தà¯�கà¯�கà¯� இஙà¯�à
 msgid "Click here to select folders to post to"
 msgstr "சமர�ப�பிக�க வேண�டிய அடைவை தேர�வ� செய�ய இங�கே க�ளிக� செய�யவ�ம�"
 
-#: ../composer/e-composer-private.c:284
+#: ../composer/e-composer-private.c:199
+msgid "Undo the last action"
+msgstr "கடைசி செயலை ரத�த� செய�"
+
+#: ../composer/e-composer-private.c:203
+msgid "Redo the last undone action"
+msgstr "கடைசியாக ரத�த� செய�த செயலை திர�ம�ப செய�"
+
+#: ../composer/e-composer-private.c:207
+msgid "Search for text"
+msgstr "உரைக�காக தேட�க"
+
+#: ../composer/e-composer-private.c:211
+msgid "Search for and replace text"
+msgstr "உரையைத� தேடி மாற�ற�க"
+
+#: ../composer/e-composer-private.c:301
 msgid "Save draft"
 msgstr "வரைவை சேமி"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:150
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:188 ../mail/em-utils.c:152
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "(_D) இந�த செய�தியை மீண�ட�ம� காட�டாதே."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:988
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "வெளி செல�லிம� செய�திகளை கையொப�பமிட ம�டியாத�. இந�த கணக�கிற�கென சான�றிதழ� எத�வ�ம� இல�லை"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:995
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8228,15 +8015,15 @@ msgstr ""
 "வெளியில� செல�ல�ம� செய�திகளை க�றிம�றையாக�க ம�டியாத� : இந�த கணக�கிற�க� க�றிம�றையாக�க "
 "சான�றிதழ� எத�வ�மில�லை"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1386
 msgid "Unable to reconstruct message from autosave file"
 msgstr "தானியங�கி கோப�பிலிர�ந�த� செய�தியை மீட�க ம�டியவில�லை"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1452 ../composer/e-msg-composer.c:1648
 msgid "Compose Message"
 msgstr "செய�தியை உர�வாக�க�"
 
-#: ../composer/e-msg-composer.c:3310
+#: ../composer/e-msg-composer.c:3313
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8318,8 +8105,8 @@ msgstr ""
 "உங�கள� செய�தியை மீட�ட� தொடர ம�டிய�ம�."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "கோப�ப� `{0}' இயல�பான கோப�ப� இல�லை அதனால� இந�த செய�திய�டன� அன�ப�ப ம�டியாத�"
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr "கோப�ப�  '{0}'  இயல�பான கோப�ப� இல�லை அதனால� இந�த செய�திய�டன� அன�ப�ப ம�டியாத�"
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
@@ -8337,8 +8124,8 @@ msgid "Unable to activate the address selector control."
 msgstr "ம�கவரி தேர�வ� கர�வியை செயல�பட�த�த ம�டியவில�லை"
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "கோப�ப� `{0}' � இந�த செய�திய�டன� இணைக�க ம�டியாத�"
+msgid "You cannot attach the file n{0}' to this message."
+msgstr "கோப�ப�  '{0}'  � இந�த செய�திய�டன� இணைக�க ம�டியாத�"
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8360,6 +8147,249 @@ msgstr "மீட�கவ�ம� (_R)"
 msgid "_Save Draft"
 msgstr "(_S) வரைவை சேமி"
 
+#: ../capplet/anjal-settings-main.c:199
+msgid "Run Anjal in a window"
+msgstr "அஞ�சல� � ஒர� சாளரத�தில� இயக�கவ�ம�"
+
+#: ../capplet/anjal-settings-main.c:200
+msgid "Make Anjal the default email client"
+msgstr "அஞ�சல� � ம�ன�னிர�ப�ப� மின�னஞ�சல�  சார�ந�தோன� ஆக�க� "
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:207
+msgid "ID of the socket to embed in"
+msgstr "உட�பொதிய பொர�த�த�வாயின� அடையாளம�"
+
+#: ../capplet/anjal-settings-main.c:208
+msgid "socket"
+msgstr "பொர�த�த�வாய�"
+
+#: ../capplet/anjal-settings-main.c:221
+msgid "Anjal email client"
+msgstr "அஞ�சல� மின�னஞ�சல� சார�ந�தோன�"
+
+#: ../capplet/settings/mail-account-view.c:56
+msgid "Please enter your full name."
+msgstr "உங�கள� ம�ழ� பெயரை உள�ளிட�க"
+
+#: ../capplet/settings/mail-account-view.c:57
+msgid "Please enter your email address."
+msgstr "உங�கள� மின�னஞ�சல� ம�கவரியை உள�ளிட�க"
+
+#: ../capplet/settings/mail-account-view.c:58
+msgid "The email address you have entered is invalid."
+msgstr "நீங�கள�  உள�ளிட�ட மின�னஞ�சல� ம�கவரி செல�ல�படியாகாதத�."
+
+#: ../capplet/settings/mail-account-view.c:181
+msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">தனிப�பட�ட விவரங�கள�:</span>"
+
+#: ../capplet/settings/mail-account-view.c:186
+msgid "Name:"
+msgstr "பெயர�:"
+
+#: ../capplet/settings/mail-account-view.c:195
+msgid "Email address:"
+msgstr "மின�னஞ�சல� ம�கவரி"
+
+#: ../capplet/settings/mail-account-view.c:205
+msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">பெற�தல� விவரங�கள�:</span>"
+
+#: ../capplet/settings/mail-account-view.c:210
+#: ../capplet/settings/mail-account-view.c:258
+msgid "Server type:"
+msgstr "சேவையகம� வகை:"
+
+#: ../capplet/settings/mail-account-view.c:219
+#: ../capplet/settings/mail-account-view.c:267
+msgid "Server address:"
+msgstr "சேவையக ம�கவரி:"
+
+#: ../capplet/settings/mail-account-view.c:228
+#: ../capplet/settings/mail-account-view.c:276
+msgid "Username:"
+msgstr "பயனர� பெயர�:"
+
+#: ../capplet/settings/mail-account-view.c:237
+#: ../capplet/settings/mail-account-view.c:285
+msgid "Use encryption:"
+msgstr "மறையாக�கம� பயன�பட�த�த�:"
+
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:290
+msgid "never"
+msgstr "எப�போத�மில�லை"
+
+#: ../capplet/settings/mail-account-view.c:253
+msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">அன�ப�ப�ம� விவரங�கள�:</span>"
+
+#: ../capplet/settings/mail-account-view.c:309
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr ""
+"அஞ�சல�  நிரலை  பயன�பட�த�த  நீங�கள�  ஒ ர� கணக�கை  அமைக�க  வேண�ட�ம�.  கீழே உங�கள�  மின�னஞ�சல� "
+"ம�கவரியைய�ம�  கடவ�ச�சொல�லைய�ம�  உள�ளிட�க.  நாங�கள� அமைப�பை  உர�வாக�க ம�யற�சி  "
+"செய�கிறோம�.  நாங�கள� அதை  தானியங�கியாக  செய�ய  ம�டியவில�லையானால� நீங�கள�  உங�கள�  சேவையக "
+"விவரங�களைய�ம�  உள�ளிட  வேண�டி இர�க�க�ம�."
+
+#: ../capplet/settings/mail-account-view.c:311
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+"மன�னிக�க, உங�கள� அஞ�சல�களை தானியங�கியாகப� பெ ற அமைப�பை அமைக�க  ம�டியவில�லை.  தயை செய� த� "
+"அவற�றை  கீழே   உள�ளிட�க.  நீங�கள� உள�ளிட�ட  தகவல�களைக�கொண�ட� ஒர� த�வக�கம�  செய�தோம�.  ஆனால�  "
+"நீங�கள� அவற�றை  திர�த�த  வேண�டி இர�க�கலா.ம� "
+
+#: ../capplet/settings/mail-account-view.c:313
+msgid "You can specify more options to configure the account."
+msgstr "கணக�கை வடிவமைக�க மேல�ம� தேர�வ�களை  நீங�கள� க�றிப�பிடலாம�.  "
+
+#: ../capplet/settings/mail-account-view.c:315
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+"அஞ�சல�களை   அன�ப�ப உங�கள� கணக�க�க�கான அமைப�ப� தேவை. நாங�கள� சில ஊகங�களை செய�தோம�.  ஆனால� "
+"அவற�றை உற�தி செய�ய உங�கள� உதவி தேவை."
+
+#: ../capplet/settings/mail-account-view.c:316
+msgid "You can specify your default settings for your account."
+msgstr "உங�கள� கண க�க�க�க� உங�கள� ம�ன�னிர�ப�ப� அமைப�பை க�றிக�கலாம� "
+
+#: ../capplet/settings/mail-account-view.c:317
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr "சேவயகத�த�க�க�  இணைத�த� உங�கள�  அஞ�சல�களை பெறூம�ன� சிலதை   சோதிக�க நேரம� வந�த.த� "
+
+#: ../capplet/settings/mail-account-view.c:332
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2191
+#: ../mail/mail-config.ui.h:59
+msgid "Identity"
+msgstr "அடையாளம�"
+
+#: ../capplet/settings/mail-account-view.c:332
+msgid "Next - Receiving mail"
+msgstr "அட�த�த� - அஞ�சல� பெற�தல�"
+
+#: ../capplet/settings/mail-account-view.c:333
+msgid "Receiving mail"
+msgstr "அஞ�சல� பெற�தல�"
+
+#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:334
+msgid "Next - Sending mail"
+msgstr "அட�த�த� - அஞ�சல� அன�ப�ப�தல�"
+
+#: ../capplet/settings/mail-account-view.c:333
+msgid "Back - Identity"
+msgstr "பின�னே - அடையாளம�"
+
+#: ../capplet/settings/mail-account-view.c:333
+msgid "Next - Receiving options"
+msgstr "அட�த�த� - பெற�தல� தேர�வ�கள�"
+
+#: ../capplet/settings/mail-account-view.c:334
+msgid "Receiving options"
+msgstr "அஞ�சல� பெற�தல� தேர�வ�கள�"
+
+#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:336
+msgid "Back - Receiving mail"
+msgstr "பின�னே - அஞ�சல� பெற�தல�"
+
+#: ../capplet/settings/mail-account-view.c:336
+msgid "Sending mail"
+msgstr "மின�னஞ�சல� அன�ப�ப�கிறத�"
+
+#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:337
+msgid "Next - Review account"
+msgstr "அட�த�த� - கணக�க� மற�ஆய�வ�"
+
+#: ../capplet/settings/mail-account-view.c:336
+msgid "Next - Defaults"
+msgstr "அட�த�த� -ம�ன�னிர�ப�ப�கள�"
+
+#: ../capplet/settings/mail-account-view.c:336
+msgid "Back - Receiving options"
+msgstr "பின�னே - பெற�தல� தேர�வ�கள�"
+
+#: ../capplet/settings/mail-account-view.c:337
+#: ../mail/em-account-editor.c:2770 ../mail/mail-config.ui.h:32
+msgid "Defaults"
+msgstr "இயல�பானவைகள�"
+
+#: ../capplet/settings/mail-account-view.c:337
+msgid "Back - Sending mail"
+msgstr "பின�னே - மின�னஞ�சல� அன�ப�ப�கிறத�"
+
+#: ../capplet/settings/mail-account-view.c:339
+msgid "Review account"
+msgstr "கணக�க� மற�ஆய�வ�"
+
+#: ../capplet/settings/mail-account-view.c:339
+msgid "Finish"
+msgstr "ம�டி"
+
+#: ../capplet/settings/mail-account-view.c:339
+msgid "Back - Sending"
+msgstr "பின�னே - அன�ப�ப�கிறத�"
+
+#: ../capplet/settings/mail-account-view.c:673
+#: ../capplet/settings/mail-settings-view.c:264
+msgid "Close Tab"
+msgstr "கீற�ற�  மூடவ�ம�"
+
+#: ../capplet/settings/mail-account-view.c:683
+msgid "Account Wizard"
+msgstr "கணக�க� உதவியாளர�"
+
+#: ../capplet/settings/mail-capplet-shell.c:208
+msgid "Evolution account assistant"
+msgstr "எவல�யூஷன� கணக�க� உதவியாளர�"
+
+#. create the local source group
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:675
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:212
+#: ../mail/message-list.c:1602
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:126
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:141
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:109
+msgid "On This Computer"
+msgstr "இந�த கணிப�பொறியில�"
+
+#: ../capplet/settings/mail-settings-view.c:146
+#: ../plugins/groupwise-features/share-folder.c:747
+msgid "Modify"
+msgstr "மாற�றியமை"
+
+#: ../capplet/settings/mail-settings-view.c:148
+msgid "Add a new account"
+msgstr "ஒர� ப�திய கணக�கை சேர�"
+
+#: ../capplet/settings/mail-settings-view.c:183
+msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+msgstr "<span size=\"large\" weight=\"bold\">கணக�க� மேலாண�மை</span>"
+
+#: ../capplet/settings/mail-settings-view.c:274
+msgid "Settings"
+msgstr "அமைப�ப�கள�"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Calendar event notifications"
 msgstr "நாள�காட�டி நிகழ�வ� அறிவிப�ப�கள�"
@@ -8368,8 +8398,8 @@ msgstr "நாளà¯�காடà¯�டி நிகழà¯�வà¯� அறிவிபà
 msgid "Evolution Alarm Notify"
 msgstr "எவல�யூஷன� எச�சரிக�கை அறிவிப�ப�கள�"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:786
-#: ../shell/e-shell-window-private.c:255
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:821
+#: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "எவல�யூஷன�"
 
@@ -8377,7 +8407,7 @@ msgstr "எவல�யூஷன�"
 msgid "Evolution Mail and Calendar"
 msgstr "எவல�யூஷன� மின�னஞ�சல� மற�ற�ம� நாள�காட�டி"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:653
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "க�ழ�க�கள�க�கான மென�பொர�ள�"
 
@@ -8385,6 +8415,14 @@ msgstr "கà¯�à®´à¯�கà¯�களà¯�கà¯�கான மெனà¯�பொரà¯�ளà¯
 msgid "Manage your email, contacts and schedule"
 msgstr "உங�கள� மின�னஞ�சல� தொடர�ப�கள� மற�ற�ம� கால ஒத�க�கீட�கள� ஆகியவற�றை மேலாளவ�ம�"
 
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Configure email accounts"
+msgstr "மின�னஞ�சல� கணக�க�களை வடிவமை"
+
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "மின�னஞ�சல� அமைவ�கள�"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "ம�கவரி அட�டை"
@@ -8425,7 +8463,7 @@ msgstr "எவல�யூஷன� பிழை"
 msgid "Evolution Warning"
 msgstr "எவல�யூஷன� எச�சரிக�கை"
 
-#: ../e-util/e-alert.c:636
+#: ../e-util/e-alert.c:634
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "உள�ளார�ந�த பிழை, தெரியாத பிழை '%s' கோரப�பட�டத�"
@@ -8486,56 +8524,64 @@ msgstr "மேற�கத�திய �ரோப�பிய"
 msgid "Western European, New"
 msgstr "மேற�கத�திய �ரோப�பிய ,ப�திய"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "பழமையான"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "எளிதாக�கப�பட�ட"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "உக�ரெயின�"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "காட�சி"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "இன�ற�"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "நாளை"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "நேற�ற�"
 
-#: ../e-util/e-datetime-format.c:207
-#, c-format
-msgid "%d days from now"
-msgstr "இப�போதிலிர�ந�த� %d நாட�கள� "
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211, c-format
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "இப�போதிலிர�ந�த� %d நாள� "
+msgstr[1] "இப�போதிலிர�ந�த� %d நாட�கள� "
 
-#: ../e-util/e-datetime-format.c:209
-#, c-format
-msgid "%d days ago"
-msgstr "%d நாட�கள�க�க� ம�ன�"
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d நாளைக�க� ம�ன�"
+msgstr[1] "%d நாட�கள�க�க� ம�ன�"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "கணினி இயல�பானதை பயன�பட�த�த�"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "பாங�க�:"
 
@@ -8556,18 +8602,6 @@ msgstr "\"%s\" � எழ�த�கிறத� "
 msgid "Writing \"%s\" to %s"
 msgstr "\"%s\" � %s க�க� எழ�த�கிறத�"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "உள�ந�ழைபவர� பெயர� "
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "கோப�பின� பெயர�:"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "இந�த கூறின� கோப�ப�ப� பெயர�"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "பிழை நீக�க� பதிவ�"
@@ -8590,13 +8624,13 @@ msgstr "பதிவ� செய�திகள�"
 msgid "Log Level"
 msgstr "உள�ந�ழை நிலை"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2674
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "செய�திகள�"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
-#: ../shell/e-shell-window-actions.c:1430
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "இந�த சாளரத�தை மூடவ�ம�"
 
@@ -8620,18 +8654,7 @@ msgstr "பிழை நீக�க�"
 msgid "Error, Warnings and Debug messages"
 msgstr "பிழை எச�சரிக�கைகள� மற�ற�ம� பிழை நீக�க� செய�திகள�"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "செயலில� உள�ள"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "செர�க� பொதி  செயல�பட�த�தப�பட�டதா இல�லையா"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:334
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
@@ -8653,7 +8676,7 @@ msgstr "அச�ச� அமைப�ப� பிழை க�றித�த
 msgid "Autogenerated"
 msgstr "தானாக உர�வாக�கப�பட�ட"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "�னெனில� \"{1}\"."
 
@@ -8673,235 +8696,235 @@ msgstr "மேலெழ�த விர�ப�பமா?"
 msgid "File exists \"{0}\"."
 msgstr "\"{0}\". கோப�ப� �ற�கனவே உள�ளத�."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "(_O)மேலெழ�த�"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:169
 msgid "Could not open the link."
 msgstr "தொட�ப�பை  திறக�க ம�டியவில�லை"
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:219
 msgid "Could not display help for Evolution."
 msgstr "எவலூஷன�க�க� உதவியை காட�ட ம�டியவில�லை."
 
-#: ../e-util/gconf-bridge.c:1276
+#: ../e-util/gconf-bridge.c:1303
 #, c-format
 msgid "GConf error: %s"
 msgstr "ஜிகான�ஃப� பிழை: %s"
 
-#: ../e-util/gconf-bridge.c:1287
+#: ../e-util/gconf-bridge.c:1314
 msgid "All further errors shown only on terminal."
 msgstr "இனி வர�ம� பிழைகளை ம�னையத�தில� மட�ட�மே காட�டப�பட�ம�"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "பதில�-பெற�நர�"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2306
-#: ../mail/em-format-html.c:2327 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "கரிநகல�"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2312
-#: ../mail/em-format-html.c:2330 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "மறைநகல�"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:81
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "தலைப�ப�"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2422
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1137
 msgid "Mailer"
 msgstr "மின�னஞ�சல�"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1221
 msgid "-------- Forwarded Message --------"
 msgstr "-------- அன�ப�ப�ம� செய�தி --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:82 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "தேதி"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "செய�தி க�ழ�க�கள�"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:84
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "ம�கம�"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1302
 #, c-format
 msgid "%s attachment"
 msgstr "%s இணைப�ப�கள�"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1361
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME செய�தியை பக�க�க ம�டியவில�லை: தெரியாத பிழை"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "மைம� தகவலை பக�க�க ம�டியாத�. நிரலாக காட�ட�கிறத�"
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ஆதரவில�லா க�றிம�றை வகை பலவழி/க�றிம�றை"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/மைம� செய�திகள� � பக�க�க இயலவில�லை"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/மைம� செய�திகள� � பக�க�க இயலவில�லை தெரியாத தவற�"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "ஆதரவ� இல�லாத கையொப�பம�"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 msgid "Error verifying signature"
 msgstr "கையொப�பத�தை சரிபார�க�க�ம� போத� பிழை"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "கையொப�பத�தை சரிபார�க�க�ம� போத�  தெரியாத பிழை"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message"
 msgstr "PGP செய�தியை பக�க�க இயலவில�லை"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP செய�தியை பக�க�க இயலவில�லை தெரியாத தவற�"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 வினாடிக�க� ம�ன�"
 msgstr[1] "%d வினாடிகள�க�க� ம�ன�"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "எதிர�காலத�தில� ஒர� வினாடியில�"
 msgstr[1] "எதிர�காலத�தில� %d வினாடிகளில�"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 நிமிடத�திற�க� ம�ன�"
 msgstr[1] "%d நிமிடங�கள�க�க� ம�ன�"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "எதிர�காலத�தில� ஒர� நிமிடத�தில�"
 msgstr[1] "எதிர�காலத�தில� %d நிமிடங�களில�"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 மணி நேரத�திற�க� ம�ன�"
 msgstr[1] "%d மணிகள� நேரத�திற�க� ம�ன�"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "எதிர�காலத�தில� ஒர� மணியில�"
 msgstr[1] "எதிர�காலத�தில� %d மணிகளில�"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 நாளைக�க� ம�ன�"
 msgstr[1] "%d நாட�கள�க�க� ம�ன�"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "எதிர�காலத�தில� ஒர� நாளில�"
 msgstr[1] "எதிர�காலத�தில� %d நாட�களில�"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "எதிர�காலத�தில� ஒர� வாரத�தில�"
 msgstr[1] "எதிர�காலத�தில� %d வாரங�களில�"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "எதிர�காலத�தில� ஒர� வாரத�தில�"
 msgstr[1] "எதிர�காலத�தில� %d வாரங�களில�"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 மாதத�திற�க� ம�ன�"
 msgstr[1] "%d மாதங�கள�க�க� ம�ன�"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "எதிர�காலத�தில� ஒர� மாதத�தில�"
 msgstr[1] "எதிர�காலத�தில� %d மாதங�களில�"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 வர�டத�திற�க� ம�ன�"
 msgstr[1] "%d வர�டங�கள�க�க� ம�ன�"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "எதிர�காலத�தில� ஒர� வர�டத�தில�"
 msgstr[1] "எதிர�காலத�தில� %d வர�டங�களில�"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<தேதியை தேர�வ� செய�ய இங�கே க�ளிக� செய�யவ�ம�>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "இப�போத�"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "ஒப�பிட வேண�டிய நேரத�தை தேர�வ� செய�யவ�ம�"
 
@@ -8954,11 +8977,11 @@ msgid "I_nclude threads"
 msgstr "_n இழைகளை உள�ளடக�கி"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:301
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "உள�வர�ம�"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:302
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "வெளி செல�ல�ம�"
 
@@ -8990,7 +9013,7 @@ msgstr "தேதி காணவில�லை"
 msgid "Missing file name."
 msgstr "கோப�பின� பெயர� காணவில�லை"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:72
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "பெயர� காணவில�லை"
 
@@ -9067,7 +9090,7 @@ msgstr "எதிர�காலத�தில� "
 msgid "months"
 msgstr "மாதங�கள�"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:171
 msgid "seconds"
 msgstr "நிமிடம�"
 
@@ -9084,7 +9107,7 @@ msgid "years"
 msgstr "வர�டங�கள�"
 
 #: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1025 ../mail/mail-config.ui.h:13
+#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
 #: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
@@ -9102,25 +9125,9 @@ msgstr "சின�னம� காட�சி"
 msgid "List View"
 msgstr "பட�டியல� பார�வை"
 
-#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "க�விப�ப� தொடர�வி"
-
-#: ../mail/e-mail-browser.c:739
-msgid "Shell Module"
-msgstr "ஷெல� கூற�"
-
-#: ../mail/e-mail-browser.c:740 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "அஞ�சல� ஷெல� இன� பின�செயலி"
-
-#: ../mail/e-mail-browser.c:750
-msgid "Show Deleted"
-msgstr "நீக�கப�பட�டதை காட�ட�"
-
-#: ../mail/e-mail-browser.c:751
-msgid "Show deleted messages"
-msgstr "நீக�கப�பட�ட செய�திகளை காட�ட�"
+#: ../mail/e-mail-browser.c:262
+msgid "(No Subject)"
+msgstr "(பொர�ள� இல�லை)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9167,7 +9174,7 @@ msgid "_Later"
 msgstr "பிறக� (_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:472
 msgid "Add Label"
 msgstr "க�றியீட�டை சேர�க�க"
 
@@ -9187,114 +9194,57 @@ msgstr ""
 msgid "Color"
 msgstr "நிறம�"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:658 ../mail/em-folder-tree.c:2570
-#: ../modules/mail/e-mail-shell-view-private.c:961
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1158
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "பெயர�"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:363
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2585
+#: ../modules/mail/e-mail-shell-view-private.c:952
 msgid "Inbox"
 msgstr "உள�பெட�டி"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:651
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
 msgid "Drafts"
 msgstr "வரைவ�கள�"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:661
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
 msgid "Outbox"
 msgstr "செல� அஞ�சல�"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:663
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
 msgid "Sent"
 msgstr "அன�ப�ப�"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:654
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:570
 msgid "Templates"
 msgstr "வார�ப�ப�ர�"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "ம�க�கியம�"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "செய�ய வேண�டியவை"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "பிறக�"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:147
 msgid "Migrating..."
 msgstr "இடம�பெயர�கிறத�..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:180
 msgid "Migration"
 msgstr "இடம�பெயர�கிறத�"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:220
 #, c-format
 msgid "Migrating '%s':"
 msgstr "இடம�பெயர�கிறத� `%s':"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "ப�திய அடைவை உர�வாக�க ம�டியவில�லை `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "அடைவ�`%s'� `%s' இல�  நகலெட�க�க ம�டியவில�லை: %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "�ற�கெனவே உள�ள மின�னஞ�சல� பெட�டியில� தேட ம�டியவில�லை %s': %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2927
+#: ../mail/e-mail-migrate.c:659
 msgid "Migrating Folders"
 msgstr "கோப�ப�களை இடமாற�ற�கிறத�"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"எவல�யூஷன� மின�னஞ�சல� பெட�டியில� வரிசை மற�ற�ம� இடம� மாற�றப�பட�டத� எவல�யூஷன� 1 பதிப�ப�.x.\n"
-"\n"
-"எவல�யூஷன� அடைவ�களை நகர�த�திக�கொண�டிர�க�கிறத�..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "பாப� சேவகனில� வைத�த தகவல�களை திறக�க ம�டியவில�லை`%s': %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "பாப�3 சேவகனில� வைத�த தகவல�களை திறக�க ம�டியவில�லை`%s': %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "பாப�3 keep-on-server தகவலை நகலெட�க�க ம�டியவில�லை `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "உள� மின�னஞ�சல� சேமிப�பை உர�வாக�க�வதில� தோல�வி`%s': %s"
-
-#: ../mail/e-mail-migrate.c:2928
+#: ../mail/e-mail-migrate.c:660
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9306,62 +9256,35 @@ msgstr ""
 "\n"
 "எவல�யூஷன� அடைவ�களை நகர�த�த�கையில� சற�ற� பொற�மையாக இர�க�கவ�ம�..."
 
-#. On This Computer is always first, and Search Folders
-#. * is always last.
-#. create the local source group
-#: ../mail/e-mail-migrate.c:2943 ../mail/e-mail-store.c:229
-#: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
-#: ../mail/mail-vfolder.c:215 ../mail/message-list.c:1617
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
-msgid "On This Computer"
-msgstr "இந�த கணிப�பொறியில�"
-
-#: ../mail/e-mail-migrate.c:3023
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "மின�னஞ�சல� அடைவை `%s' இடத�தில� உர�வாக�க ம�டியவில�லை: %s"
-
-#: ../mail/e-mail-migrate.c:3041
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"ம�ந�தைய எவல�யூஷன� அமைப�பை படிக�க ம�டியவில�லை, `எவல�ஷன�/config.xmldb' இல�லை அல�லத� "
-"சிதைந�தத�"
+#: ../mail/e-mail-migrate.c:756, c-format
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "மின�னஞ�சல� அடைவை '%s' இடத�தில� உர�வாக�க ம�டியவில�லை: %s"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:572
+#: ../mail/e-mail-reader-utils.c:103
+#: ../modules/calendar/e-task-shell-view-actions.c:561
 msgid "Do not ask me again"
 msgstr "என�னிடம� மீண�ட�ம� கேட�காதே"
 
-#: ../mail/e-mail-reader.c:208 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "அடைவில� நகலெட�"
 
-#: ../mail/e-mail-reader.c:208 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "(_o)நகலெட�"
 
-#: ../mail/e-mail-reader.c:582 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "அடைவிற�க� நகர�த�த�"
 
-#: ../mail/e-mail-reader.c:582 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "(_M)நகர�த�த�"
 
-#: ../mail/e-mail-reader.c:808
+#: ../mail/e-mail-reader.c:864
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "செய�தியை சேமி"
@@ -9373,504 +9296,504 @@ msgstr[1] "செய�திகளை சேமி"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:829 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "செய�தி"
 msgstr[1] "செய�திகள�"
 
-#: ../mail/e-mail-reader.c:1087
+#: ../mail/e-mail-reader.c:1143
 msgid "A_dd Sender to Address Book"
 msgstr "(_d)அன�ப�பியவரை ம�கவரி ப�த�தகத�தில� சேர�"
 
-#: ../mail/e-mail-reader.c:1089
+#: ../mail/e-mail-reader.c:1145
 msgid "Add sender to address book"
 msgstr "அன�ப�பியவர� ம�கவரியை ம�கவரி ப�த�தகத�தில� சேர�"
 
-#: ../mail/e-mail-reader.c:1094
+#: ../mail/e-mail-reader.c:1150
 msgid "Check for _Junk"
 msgstr "தேவையற�ற க�ப�பைக�க� சோதிக�கவ�ம�."
 
-#: ../mail/e-mail-reader.c:1096
+#: ../mail/e-mail-reader.c:1152
 msgid "Filter the selected messages for junk status"
 msgstr "தேவையற�ற செய�திகளை பிரிக�க தேர�வ� செய�த செய�தியை வடிகட�ட�"
 
-#: ../mail/e-mail-reader.c:1101
+#: ../mail/e-mail-reader.c:1157
 msgid "_Copy to Folder..."
 msgstr "(_C)அடைவில� நகலெட�..."
 
-#: ../mail/e-mail-reader.c:1103
+#: ../mail/e-mail-reader.c:1159
 msgid "Copy selected messages to another folder"
 msgstr "தேர�வ� செய�யப�பட�ட செய�தியை வேற� அடைவ�க�க� நகர�த�த�"
 
-#: ../mail/e-mail-reader.c:1108
+#: ../mail/e-mail-reader.c:1164
 msgid "_Delete Message"
 msgstr "செய�தியை அழி (_D)"
 
-#: ../mail/e-mail-reader.c:1110
+#: ../mail/e-mail-reader.c:1166
 msgid "Mark the selected messages for deletion"
 msgstr "தேர�வ� செய�த செய�திகளை நீக�க�வதற�காக க�றிக�கவ�ம�"
 
-#: ../mail/e-mail-reader.c:1115
+#: ../mail/e-mail-reader.c:1171
 msgid "Filter on Mailing _List..."
 msgstr "(_L)மின�னஞ�சல� பட�டியல� வரிசையாக வடிகட�ட�..."
 
-#: ../mail/e-mail-reader.c:1117
+#: ../mail/e-mail-reader.c:1173
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "மின�னஞ�சல� பட�டியல�க�காக செய�தி வடிகட�ட விதிம�றையை உர�வாக�க�"
 
-#: ../mail/e-mail-reader.c:1122
+#: ../mail/e-mail-reader.c:1178
 msgid "Filter on _Recipients..."
 msgstr "(_R)பெற�ற�க�கொண�டவர�கள� வரிசையாக வடிகட�ட�"
 
-#: ../mail/e-mail-reader.c:1124
+#: ../mail/e-mail-reader.c:1180
 msgid "Create a rule to filter messages to these recipients"
 msgstr "பெற�ற�க�கொள�பவர�க�க� செய�தி வடிகட�ட விதிம�றையை உர�வாக�க�"
 
-#: ../mail/e-mail-reader.c:1129
+#: ../mail/e-mail-reader.c:1185
 msgid "Filter on Se_nder..."
 msgstr "(_n)அன�ப�பியவர�கள� வாரியாக வடிகட�ட�"
 
-#: ../mail/e-mail-reader.c:1131
+#: ../mail/e-mail-reader.c:1187
 msgid "Create a rule to filter messages from this sender"
 msgstr "அன�ப�ப�பவர�க�க� செய�தி வடிகட�ட விதிம�றையை உர�வாக�க�"
 
-#: ../mail/e-mail-reader.c:1136
+#: ../mail/e-mail-reader.c:1192
 msgid "Filter on _Subject..."
 msgstr "(_S)தலைப�ப� வாரியாக வடிகட�ட�..."
 
-#: ../mail/e-mail-reader.c:1138
+#: ../mail/e-mail-reader.c:1194
 msgid "Create a rule to filter messages with this subject"
 msgstr "தலைப�ப�களோட� செய�தி வடிகட�ட விதிம�றையை உர�வாக�க�"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1199
 msgid "A_pply Filters"
 msgstr "(_p)வடிகட�டியை அமை"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1201
 msgid "Apply filter rules to the selected messages"
 msgstr "தேர�வ� செய�யப�பட�ட செய�திக�க� வடிகட�டி விதிம�றையை உர�வாக�க�"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1206
 msgid "_Find in Message..."
 msgstr "செய�தியில� கண�ட�பிடி... (_F)"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1208
 msgid "Search for text in the body of the displayed message"
 msgstr "காட�டப�பட�ட செய�தியில� க�றிப�பிட�ட உரையை தேட�"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1213
 msgid "_Clear Flag"
 msgstr "கொடியை நீக�க� (_C)"
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1215
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "தேர�ந�தெட�த�த செய�திகளில� இர�ந�த� பின� தொடர�க க�றிப�பை அழி"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1220
 msgid "_Flag Completed"
 msgstr "கொடி ம�டிந�தத� (_F)"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1222
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "தேர�வ� செய�த எல�லா செய�திகளைய�ம� பின� தொடர�க க�றிப�பை ம�டிந�தத� என க�றி"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1227
 msgid "Follow _Up..."
 msgstr "(_U)தொடர�..."
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1229
 msgid "Flag the selected messages for follow-up"
 msgstr "தேர�ந�தெட�க�கப�பட�ட செய�திகள�க�க� பின� தொடர க�றி இட�க"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1234
 msgid "_Attached"
 msgstr "இணைக�கப�பட�ட (_A)"
 
-#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
 msgid "Forward the selected message to someone as an attachment"
 msgstr "தேர�வ� செய�த செய�தியை இணைப�பாக மற�றவர�க�க� அன�ப�ப�"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1241
 msgid "Forward As _Attached"
 msgstr "_A இணத�த� மேலன�ப�ப�க"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1248
 msgid "_Inline"
 msgstr "உள�ளே (_I)"
 
-#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
 msgid "Forward the selected message in the body of a new message"
 msgstr "ப�திய செய�தியில�ள� தேர�வ� செய�த செய�தியை சேர�த�த� ப�திய செய�தியாக அன�ப�ப�"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1255
 msgid "Forward As _Inline"
 msgstr "_I உள�ளடக�கி மேலன�ப�ப�க"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1262
 msgid "_Quoted"
 msgstr "க�றிப�பிடப�பட�ட (_Q)"
 
-#: ../mail/e-mail-reader.c:1208 ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
 msgid "Forward the selected message quoted like a reply"
 msgstr "தேர�வ� செய�த செய�தியை பதில� என க�றித�த� மற�றவர�க�க� அன�ப�ப�"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1269
 msgid "Forward As _Quoted"
 msgstr "_Q மேற�கோள�காட�டி மேலன�ப�ப�க"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1276
 msgid "_Load Images"
 msgstr "படங�களை �ற�ற� (_L)"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1278
 msgid "Force images in HTML mail to be loaded"
 msgstr "சித�திரங�களை ஹெச�டிஎம�எல�  மின�னஞ�சலாக �ற�ற வலிய�ற�த�த�"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1283
 msgid "_Important"
 msgstr "ம�க�கியம� (_I)"
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1285
 msgid "Mark the selected messages as important"
 msgstr "தேர�வ� செய�த செய�திகளை ம�க�கியம� என க�றிக�கவ�ம�"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1290
 msgid "_Junk"
 msgstr "தேவையற�றவை (_J)"
 
-#: ../mail/e-mail-reader.c:1236
+#: ../mail/e-mail-reader.c:1292
 msgid "Mark the selected messages as junk"
 msgstr "தேர�வ� செய�த செய�திகளை தேவையற�றத� என க�றிக�கவ�ம�"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1297
 msgid "_Not Junk"
 msgstr "தேவையற�றதல�ல (_N)"
 
-#: ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1299
 msgid "Mark the selected messages as not being junk"
 msgstr "தேர�வ� செய�த செய�திகளை தேவையற�ற செய�திகள� இல�லை என க�றிப�பிட�"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1304
 msgid "_Read"
 msgstr "படி (_R)"
 
-#: ../mail/e-mail-reader.c:1250
+#: ../mail/e-mail-reader.c:1306
 msgid "Mark the selected messages as having been read"
 msgstr "தேர�வ� செய�த செய�திகளை படிக�கப�பட�டத� என க�றிக�கவ�ம�"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1311
 msgid "Uni_mportant"
 msgstr "ம�க�கியமில�லாத (_m)"
 
-#: ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1313
 msgid "Mark the selected messages as unimportant"
 msgstr "தேர�ந�தெட�க�கப�பட�ட செய�திகளை ம�க�கியமில�லை என க�றி "
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1318
 msgid "_Unread"
 msgstr "படிக�காதவை (_U)"
 
-#: ../mail/e-mail-reader.c:1264
+#: ../mail/e-mail-reader.c:1320
 msgid "Mark the selected messages as not having been read"
 msgstr "தேர�ந�தெட�க�கப�பட�ட செய�திகளை படித�ததாக க�றி "
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1325
 msgid "_Edit as New Message..."
 msgstr "(_E)ப�திய செய�தியாக தொக�..."
 
-#: ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1327
 msgid "Open the selected messages in the composer for editing"
 msgstr "தேர�ந�தெட�க�கப�பட�ட செய�திகளை திர�த�த தொக�ப�பியில� திற"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1332
 msgid "Compose _New Message"
 msgstr "(_N)ப�திய செய�தியை தயாரி"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1334
 msgid "Open a window for composing a mail message"
 msgstr "மின�னஞ�சல� செய�தியை உர�வாக�க சாளரத�தை திறக�கவ�ம�"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1339
 msgid "_Open in New Window"
 msgstr "ப�திய சாளரத�தில� திற (_O)"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1341
 msgid "Open the selected messages in a new window"
 msgstr "தேர�ந�தெட�க�கப�பட�ட செய�திகளை ப�திய சாளரத�தில� திற"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1346
 msgid "_Move to Folder..."
 msgstr "(_M)அடைவிற�க� நகர�த�த�..."
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1348
 msgid "Move selected messages to another folder"
 msgstr "தேர�ந�தெட�க�கப�பட�ட செய�திகளை வேற� அடைவ�க�க� நகர�த�த�"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1353
 msgid "_Next Message"
 msgstr "அட�த�த செய�தி (_N)"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1355
 msgid "Display the next message"
 msgstr "அட�த�த செய�தியை காட�ட�"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1360
 msgid "Next _Important Message"
 msgstr "(_I)அட�த�த ம�க�கியமான செய�தி"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1362
 msgid "Display the next important message"
 msgstr "அட�த�த ம�க�கிய செய�தியை காட�ட�"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1367
 msgid "Next _Thread"
 msgstr "(_T)அட�த�த இழை"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1369
 msgid "Display the next thread"
 msgstr "அட�த�த இழையை காட�ட�க"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1374
 msgid "Next _Unread Message"
 msgstr "(_U)அட�த�த படிக�காத செய�தி"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1376
 msgid "Display the next unread message"
 msgstr "அட�த�த படிக�காத செய�தியை காட�ட�"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1381
 msgid "_Previous Message"
 msgstr "(_P)ம�ந�தைய செய�தி"
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1383
 msgid "Display the previous message"
 msgstr "ம�ந�தைய செய�தியை காட�ட�"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1388
 msgid "Pr_evious Important Message"
 msgstr "(_e)ம�ன�ப� உள�வாங�கிய செய�தி"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1390
 msgid "Display the previous important message"
 msgstr "ம�ந�தைய ம�க�கிய செய�தியை காட�ட�"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1395
 msgid "P_revious Unread Message"
 msgstr "(_r)ம�ந�தைய படிக�காத செய�தி"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1397
 msgid "Display the previous unread message"
 msgstr "ம�ந�தைய படிக�காத செய�தியை காட�ட�"
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1404
 msgid "Print this message"
 msgstr "இந�த செய�தியை அச�சடி"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1411
 msgid "Preview the message to be printed"
 msgstr "அச�சடிக�க வேண�டிய செய�தியை காட�ட�"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1416
 msgid "Re_direct"
 msgstr "(_d)திசைமாற�ற�"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1418
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "தேர�வ� செய�யப�பட�ட செய�தியை வேற�ஒர�வர�க�க� அன�ப�ப�(திசைமாற�ற�)"
 
-#: ../mail/e-mail-reader.c:1367
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "(_A) அனைவர�க�க�ம� பதிலளி "
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1425
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "தேர�வ� செய�யப�பட�ட செய�தி பெற�ற எல�லோர�க�க�ம� பதில� தயார� செய�"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1430
 msgid "Reply to _List"
 msgstr "(_L)க�ழ�விற�க� பதிலளி "
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1432
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "தேர�வ� செய�யப�பட�ட மின�னஞ�சல� பட�டியல� செய�திக�க� பதிலை தயார� செய�."
 
-#: ../mail/e-mail-reader.c:1381
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1437
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "(_R)அன�ப�பியவர�க�க� பதிலளி "
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1439
 msgid "Compose a reply to the sender of the selected message"
 msgstr "இந�த செய�தியை அன�ப�பியவர�க�க� பதிலை தயார� செய�"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1444
 msgid "_Save as mbox..."
 msgstr "_S எம�பாக�ஸ� எனச�சேமி..."
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1446
 msgid "Save selected messages as an mbox file"
 msgstr "தேர�ந�தெட�க�கப�பட�ட செய�திகளை எம�பாக�ஸ� கோப�பாக சேமி"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1451
 msgid "Search Folder from Mailing _List..."
 msgstr "அஞ�சல� பட�டியலில� இர�ந�த� அடைவினை தேட�... (_L)"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1453
 msgid "Create a search folder for this mailing list"
 msgstr "இந�த அஞ�சல� பட�டியல�க�க� தேட�தல� அடைவ� ஒன�ற� உர�வாக�க�க"
 
-#: ../mail/e-mail-reader.c:1402
+#: ../mail/e-mail-reader.c:1458
 msgid "Search Folder from Recipien_ts..."
 msgstr "_t தேட�தல� அடைவ� பெற�னர�களிடமிர�ந�த�..."
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1460
 msgid "Create a search folder for these recipients"
 msgstr "இந�த பெற�னர�கள�க�க� தேட�தல� அடைவ� ஒன�ற� உர�வாக�க�க"
 
-#: ../mail/e-mail-reader.c:1409
+#: ../mail/e-mail-reader.c:1465
 msgid "Search Folder from Sen_der..."
 msgstr "அன�ப�ப�னரிடம� இர�ந�த� அடைவினை தேட�... (_n)"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1467
 msgid "Create a search folder for this sender"
 msgstr "இந�த அன�ப�ப�னர�க�க� தேட�தல� அடைவ� ஒன�ற� உர�வாக�க�க"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1472
 msgid "Search Folder from S_ubject..."
 msgstr "பொர�ளில� இர�ந�த� அடைவினை தேட�... (_u)"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1474
 msgid "Create a search folder for this subject"
 msgstr "இந�த பொர�ள�க�க� தேட�தல� அடைவ� ஒன�ற� உர�வாக�க�க"
 
-#: ../mail/e-mail-reader.c:1423
+#: ../mail/e-mail-reader.c:1479
 msgid "_Message Source"
 msgstr "செய�தி மூலம� (_M)"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1481
 msgid "Show the raw email source of the message"
 msgstr "மின�னஞ�சல� செய�தியின� மூலத�தை காட�ட�"
 
-#: ../mail/e-mail-reader.c:1437
+#: ../mail/e-mail-reader.c:1493
 msgid "_Undelete Message"
 msgstr "அழிக�காத செய�தி (_U)"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1495
 msgid "Undelete the selected messages"
 msgstr "தேர�ந�தெட�த�த செய�திகளை அழிக�க வேண�டாம�"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1500
 msgid "_Normal Size"
 msgstr "இயல�பாக அளவ� (_N)"
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1502
 msgid "Reset the text to its original size"
 msgstr "உரையை இயல�பான அளவில� காட�ட�"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1507
 msgid "_Zoom In"
 msgstr "சிறிதாக�க� (_Z)"
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1509
 msgid "Increase the text size"
 msgstr "உரையின� அளவை பெரிதாக�க�"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1514
 msgid "Zoom _Out"
 msgstr "பெரிதாக�க� (_O)"
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1516
 msgid "Decrease the text size"
 msgstr "உரையின� அளவை சிறிதாக�க�"
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1523
 msgid "Create R_ule"
 msgstr "விதியை உர�வாக�க� (_u)"
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1530
 msgid "Ch_aracter Encoding"
 msgstr "எழ�த�த�ர� க�றிம�றை (_a)"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1537
 msgid "F_orward As"
 msgstr "_o இப�படி மேலன�ப�ப�க"
 
-#: ../mail/e-mail-reader.c:1488
+#: ../mail/e-mail-reader.c:1544
 msgid "_Go To"
 msgstr "(_G) இங�கே செல�"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1551
 msgid "Mar_k As"
 msgstr "இப�படி க�றிக�கவ�ம� (_k)"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1558
 msgid "_Message"
 msgstr "செய�தி (_M)"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1565
 msgid "_Zoom"
 msgstr "அளவிட� (_Z)"
 
-#: ../mail/e-mail-reader.c:1534
+#: ../mail/e-mail-reader.c:1590
 msgid "Mark for Follo_w Up..."
 msgstr "தொடர�தல�க�க� க�றிக�கவ�ம�... (_w)"
 
-#: ../mail/e-mail-reader.c:1542
+#: ../mail/e-mail-reader.c:1598
 msgid "Mark as _Important"
 msgstr "ம�க�கியம� என க�றி (_I)"
 
-#: ../mail/e-mail-reader.c:1546
+#: ../mail/e-mail-reader.c:1602
 msgid "Mark as _Junk"
 msgstr "பயனற�றத� என க�றிக�கவ�ம� (_J)"
 
-#: ../mail/e-mail-reader.c:1550
+#: ../mail/e-mail-reader.c:1606
 msgid "Mark as _Not Junk"
 msgstr "பயனற�றத� இல�லை என க�றிக�கவ�ம� (_N)"
 
-#: ../mail/e-mail-reader.c:1554
+#: ../mail/e-mail-reader.c:1610
 msgid "Mar_k as Read"
 msgstr "(_k) படித�தத� என க�றி"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1614
 msgid "Mark as Uni_mportant"
 msgstr "ம�க�கியமில�லை என க�றிக�கவ�ம� (_m)"
 
-#: ../mail/e-mail-reader.c:1562
+#: ../mail/e-mail-reader.c:1618
 msgid "Mark as _Unread"
 msgstr "படிக�காதவை என க�றி (_U)"
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1654
 msgid "_Caret Mode"
 msgstr "காரட� ம�றை (_C)"
 
-#: ../mail/e-mail-reader.c:1600
+#: ../mail/e-mail-reader.c:1656
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "செய�தியில� சிமிட�ட�ம� நிலைகாட�டியை காட�ட�"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1662
 msgid "All Message _Headers"
 msgstr "அனைத�த� செய�தி தலைப�ப�கள� (_H)"
 
-#: ../mail/e-mail-reader.c:1608
+#: ../mail/e-mail-reader.c:1664
 msgid "Show messages with all email headers"
 msgstr "எல�லா மின�னஞ�சல� தலைப�ப�களோட�ம� செய�திகளை காட�ட�"
 
-#: ../mail/e-mail-reader.c:1831
+#: ../mail/e-mail-reader.c:1878
 msgid "Unable to retrieve message"
 msgstr "செய�தியை பெற ம�டியவில�லை"
 
-#: ../mail/e-mail-reader.c:1876 ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1939
+#: ../mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "'%s' செய�தியை மீட�கிறத� "
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2453
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:534
 #: ../plugins/google-account-setup/google-source.c:656
@@ -9878,33 +9801,33 @@ msgstr "'%s' செய�தியை மீட�கிறத� "
 msgid "Default"
 msgstr "மின�னிர�ப�ப�"
 
-#: ../mail/e-mail-reader.c:2489
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2574
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "(_F)அன�ப�ப�"
 
-#: ../mail/e-mail-reader.c:2490
+#: ../mail/e-mail-reader.c:2575
 msgid "Forward the selected message to someone"
 msgstr "தேர�வ� செய�த செய�தியை மற�றவர�க�க� அன�ப�ப�"
 
-#: ../mail/e-mail-reader.c:2534 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2619 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "நீக�க�"
 
-#: ../mail/e-mail-reader.c:2538
-#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../mail/e-mail-reader.c:2623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "அட�த�த�"
 
-#: ../mail/e-mail-reader.c:2542
-#: ../modules/calendar/e-cal-shell-view-actions.c:1243
+#: ../mail/e-mail-reader.c:2627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "ம�ந�தைய"
 
-#: ../mail/e-mail-reader.c:2546 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2631 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "பதில�"
 
@@ -9914,33 +9837,33 @@ msgstr "தொடர�வதற�காக க�றியிட�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:500 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:73
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "க�றியாக�கம� இல�லை"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:504 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:121
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "டிஎல�எஸ�   க�றியாக�கம�றை"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "எஸ�எஸ�எல�  க�றியாக�கம�"
 
-#: ../mail/em-account-editor.c:595
+#: ../mail/em-account-editor.c:594
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ஒப�பந�தப�பத�திரம�"
 
-#: ../mail/em-account-editor.c:602
+#: ../mail/em-account-editor.c:601
 #, c-format
 msgid ""
 "\n"
@@ -9954,20 +9877,20 @@ msgstr ""
 "சோதனைப�பெட�டியை க�ளிக� செய�த� �ற�க�கவ�ம�\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:882 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "எத�வ�மில�லை"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "எப�போத�மில�லை"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "எப�போத�ம�"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "ஒவ�வொர� செய�திக�க�ம� கேட�கவ�ம�"
 
@@ -9977,11 +9900,11 @@ msgctxt "mail-receiving"
 msgid "None"
 msgstr "எத�வ�மில�லை"
 
-#: ../mail/em-account-editor.c:2055
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "மின�னஞ�சல� அமைப�ப�"
 
-#: ../mail/em-account-editor.c:2056
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9991,12 +9914,7 @@ msgstr ""
 "\n"
 "\"Forward\" என�பதை க�ளிக� செய�த� த�வங�கவ�ம�."
 
-#: ../mail/em-account-editor.c:2058 ../mail/em-account-editor.c:2194
-#: ../mail/mail-config.ui.h:58
-msgid "Identity"
-msgstr "அடையாளம�"
-
-#: ../mail/em-account-editor.c:2059
+#: ../mail/em-account-editor.c:2060
 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 "
@@ -10006,20 +9924,20 @@ msgstr ""
 "செய�ய தேவையில�லை.விர�ப�பப�பட�டால� உங�கள� மின�னஞ�சலோட� செல�லவேண�டிய தகவல�களை பூர�த�தி "
 "செய�யவ�ம�."
 
-#: ../mail/em-account-editor.c:2061 ../mail/em-account-editor.c:2231
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2228
+#: ../mail/mail-config.ui.h:91
 msgid "Receiving Email"
 msgstr "மின�னஞ�சல� பெறப�பட�கிறத�"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "கீழ�ள�ள கணக�க� அமைப�ப�களை அமைக�கவ�ம�"
 
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2708
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2706
 msgid "Sending Email"
 msgstr "மின�னஞ�சல� அன�ப�பப�பட�கிறத�"
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10027,11 +9945,11 @@ msgstr ""
 "நீங�கள� மின�னஞ�சல� அன�ப�ப விர�ம�ப�ம� ம�றையை உள�ளிடவ�ம�தெரியவில�லை என�றால� உங�கள� கணினி "
 "மேலாளரை கேட�கவ�ம�."
 
-#: ../mail/em-account-editor.c:2067
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "கணக�க� மேலாண�மை"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2069
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10039,11 +9957,11 @@ msgstr ""
 "தயவ� செய�த� இந�த கணக�க�க�க� கீழ�ள�ள இடைவெளியில� விவரமான பெயரை உள�ளிட�க. இத� "
 "காட�ட�வதற�க� மட�ட�ம� பயன�பட�ம�."
 
-#: ../mail/em-account-editor.c:2072
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "ம�டிந�தத�"
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10058,48 +9976,56 @@ msgstr ""
 "\n"
 "\"Apply\" என�பதை சொட�க�கி செய�த� சேமிக�கவ�ம�"
 
-#: ../mail/em-account-editor.c:2518
+#: ../mail/em-account-editor.c:2515
 msgid "Check for _new messages every"
 msgstr "ப�திய மின�னஞ�சல�களை கால இடைவெளிக�க�ள� தானாக சோதி"
 
-#: ../mail/em-account-editor.c:2526
+#: ../mail/em-account-editor.c:2523
 msgid "minu_tes"
 msgstr "(_t) நிமிடங�கள�"
 
-#: ../mail/em-account-editor.c:2772 ../mail/mail-config.ui.h:31
-msgid "Defaults"
-msgstr "இயல�பானவைகள�"
-
-#: ../mail/em-account-editor.c:2834 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "பாத�காப�ப�"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2871 ../mail/em-account-editor.c:2939
+#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
 msgid "Receiving Options"
 msgstr "பெற�ம� தேர�வ�கள�"
 
-#: ../mail/em-account-editor.c:2872 ../mail/em-account-editor.c:2940
+#: ../mail/em-account-editor.c:2878 ../mail/em-account-editor.c:2946
 msgid "Checking for New Messages"
 msgstr "ப�திய மின�னஞ�சல�க�காக சோதிக�கிறத�"
 
-#: ../mail/em-account-editor.c:3408
+#: ../mail/em-account-editor.c:3414
 msgid "Account Editor"
 msgstr "கணக�க� தொக�ப�பி"
 
-#: ../mail/em-account-editor.c:3408
+#: ../mail/em-account-editor.c:3414
 msgid "Evolution Account Assistant"
 msgstr "எவல�யூஷன� கணக�க� உதவி"
 
-#: ../mail/em-composer-utils.c:1954
+#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
+#: ../mail/em-composer-utils.c:1571
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr " %s  க�க�  %s இல� \"%s\"  க�றித� த� அன�ப�பிய செய�தி படிக�கப�பட�டத� "
+
+#. Translators: %s is the subject of the email message
+#: ../mail/em-composer-utils.c:1619
+#, c-format
+msgid "Delivery Notification for: \"%s\""
+msgstr "இதற�க� அஞ�சல� சேர�த�த அறிவிப�ப� : \"%s\""
+
+#: ../mail/em-composer-utils.c:1943
 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:2001
+#: ../mail/em-composer-utils.c:1990
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10107,19 +10033,19 @@ msgstr ""
 " ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} அன�ற� "
 "${TimeZone}, ${Sender} எழ�தியத�:"
 
-#: ../mail/em-composer-utils.c:2145
+#: ../mail/em-composer-utils.c:2134
 msgid "-----Original Message-----"
 msgstr "-----மூல செய�தி----"
 
-#: ../mail/em-composer-utils.c:2326
+#: ../mail/em-composer-utils.c:2315
 msgid "Posting destination"
 msgstr "சேர�மிடத�தில� சமர�பிக�கிறத�"
 
-#: ../mail/em-composer-utils.c:2327
+#: ../mail/em-composer-utils.c:2316
 msgid "Choose folders to post the message to."
 msgstr "செய�தியை சமர�பிப�பதற�கான அடைவை தேர�வ� செய�"
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "அடைவை தேர�வ� செய�"
 
@@ -10200,6 +10126,10 @@ msgstr "தொடர�"
 msgid "Forward to"
 msgstr "இவர�க�க� அன�ப�ப�ப�ப�"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "ம�க�கியம�"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "பிறக�"
@@ -10224,7 +10154,7 @@ msgstr "அமைக�கவில�லை"
 msgid "is set"
 msgstr "அமைக�கப�பட�டத�"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:62
 msgid "Junk"
 msgstr "தேவையற�ற"
 
@@ -10273,7 +10203,7 @@ msgid "Play Sound"
 msgstr "ஒலியை இயக�க�"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "படி"
 
@@ -10354,16 +10284,16 @@ msgid "Unset Status"
 msgstr "அமைக�காத நிலை"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "பின�"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "(_t) செயலை சேர�"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:169
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "படிக�காத செய�திகள�:"
@@ -10371,23 +10301,23 @@ msgstr[1] "படிக�காத செய�திகள�:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:173
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "மொத�த செய�திகள�:"
 msgstr[1] "மொத�த செய�திகள�:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:191
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "ஒத�க�கீட� பயன� (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:193
 #, c-format
 msgid "Quota usage"
 msgstr "ஒத�க�கீட� பயன� "
 
-#: ../mail/em-folder-properties.c:399
+#: ../mail/em-folder-properties.c:395
 #: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "அடைவின� பண�ப�கள�"
@@ -10396,35 +10326,37 @@ msgstr "அடைவின� பண�ப�கள�"
 msgid "<click here to select a folder>"
 msgstr "<அடைவை தேர�வ� செய�ய இங�கே க�ளிக� செய�யவ�ம�>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "(_r) உர�வாக�க�"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "(_n) அடைவின� பெயர�"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1073 ../mail/mail-vfolder.c:1138
 msgid "Search Folders"
 msgstr "தேட�ம� அடைவ�கள�"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:726 ../mail/em-folder-tree-model.c:1063
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1080
 msgid "Loading..."
 msgstr "�ற�ற�கிறத�..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:179
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" இல� உள�ள அடைவ�களை சோதிக�கிறத�"
 
-#: ../mail/em-folder-tree.c:589
+#: ../mail/em-folder-tree.c:592
 msgid "Folder names cannot contain '/'"
 msgstr "அடைவ� பெயர� '/'� கொண�டிர�க�கக�கூடாத�"
 
@@ -10446,124 +10378,123 @@ msgstr "அடைவ� பெயர� '/'� கொண�டிர�க�க
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1071
+#: ../mail/em-folder-tree.c:1074
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1277
+#: ../mail/em-folder-tree.c:1280
 msgid "Mail Folder Tree"
 msgstr "மின�னஞ�சல� அடைவ� கிளை"
 
-#: ../mail/em-folder-tree.c:1477 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1486 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s அடைவை நகர�த�த�கிறத�"
 
-#: ../mail/em-folder-tree.c:1479 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1488 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s அடைவை நகலெட�க�கிறத�"
 
-#: ../mail/em-folder-tree.c:1486 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1495 ../mail/message-list.c:2095
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "%s க�க� செய�திகளை நகர�த�த�கிறத�"
 
-#: ../mail/em-folder-tree.c:1488 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1497 ../mail/message-list.c:2097
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "%s இல� செய�திகளை நகலெட�க�கிறத�"
 
-#: ../mail/em-folder-tree.c:1503
+#: ../mail/em-folder-tree.c:1512
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "மேல�மட�ட கிடங�கிற�க� செய�தி(களை) அன�ப�ப ம�டியாத�"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Move Folder To"
 msgstr "அடைவை இங�க� நகர�த�த�க"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Copy Folder To"
 msgstr "அடைவில� நகலெட�..."
 
-#: ../mail/em-folder-utils.c:499
-#: ../plugins/groupwise-features/share-folder-common.c:141
-#, c-format
-msgid "Creating folder `%s'"
-msgstr "`%s' அடைவை உர�வாக�க�கிறத�"
+#: ../mail/em-folder-utils.c:500
+#: ../plugins/groupwise-features/share-folder-common.c:136, c-format
+msgid "Creating folder '%s'"
+msgstr "'%s' அடைவை உர�வாக�க�கிறத�"
 
-#: ../mail/em-folder-utils.c:662
+#: ../mail/em-folder-utils.c:663
 msgid "Create Folder"
 msgstr "அடைவை உர�வாக�க�"
 
-#: ../mail/em-folder-utils.c:663
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:664
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Specify where to create the folder:"
 msgstr "அடைவை உர�வாக�க வேண�ட�மா என க�றிப�பிடவ�ம�"
 
-#: ../mail/em-folder-utils.c:679
+#: ../mail/em-folder-utils.c:680
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "அடைவ� \"%s\"லிர�ந�த� சந�தா நீக�க�கிறத�"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "கையொப�பமிடாத"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "இந�த செய�தி கையொப�பமிடப�படவில�லை, இத� நம�பகமான செய�தி என�பதற�க� உத�திரவாதம� இல�லை"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "சரியான கையொப�பம�"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 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:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "செல�லாத கையொப�பம�"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "இந�த செய�தியில� கையொப�பத�தை  சரிபார�க�க ம�டியாத� இத� யாராலோ மாற�றப�பட�டத�"
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
 msgid "Valid signature, but cannot verify sender"
 msgstr "சரியான கையொப�பம� ஆனால� அன�ப�பியவரை சரிபார�க�க ம�டியவில�லை"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 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:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
 msgid "Signature exists, but need public key"
 msgstr "கையொப�பம� உள�ளத� ஆனால� பொத� விசை இல�லை"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "இத� சரியாக கையொப�பமிடப�பட�ட செய�தி  ஆனால� பொத� விசை இல�லை"
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
 msgid "Unencrypted"
 msgstr "க�றிம�றையாக�கப�படாத"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10571,11 +10502,11 @@ msgstr ""
 "இந�த செய�தி க�றிம�றையாக�கம� செய�யப�படவில�லை. இணைய பரிமாற�றத�தின� போத� அதன� உள�ளடக�கங�களை "
 "பார�க�கலாம�."
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "க�றிம�றையாக�கப�பட�ட, மோசமான"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -10585,21 +10516,21 @@ msgstr ""
 "இத� கடினமானத�, ஆனால� இந�த செய�தியின� உள�ளடக�கங�களை வெளியிலிர�ப�பவர�கள� பார�ப�பத� ஒன�ற�ம� "
 "கடினமான செயல� இல�லை."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "க�றிம�றையாக�கப�பட�ட"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 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:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "சரியாக க�றிம�றையாக�கப�பட�ட"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -10608,15 +10539,15 @@ msgstr ""
 "கடினமான க�றியாக�க கணிம�றையில�, இந�த செய�தி க�றிம�றையாக�கப�படட�ள�ளத�.இந�த செய�தியின� "
 "உள�ளடக�கங�களை வெளியிலிர�ப�பவர�கள� பார�ப�பத� அவ�வளவ� எளிமையானத� இல�லை."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "சான�றிதழை பார�க�கவ�ம� (_V)"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "இந�த சான�றிதழை பார�க�க இயலாத�"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10624,28 +10555,28 @@ msgstr ""
 "இந�த மின�னஞ�சல� மிக பெரியதாக உள�ளதால� எவல�யூஷன� இதை வரைய இயலாத�. இதை ஒழ�ங�க� செய�யாமலோ "
 "அல�லத� ப�ற உரை திர�த�தியாலோ காணலாம�."
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:726
 msgid "Completed on"
 msgstr "ம�டிந�த  தேதி"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:734
 msgid "Overdue:"
 msgstr "நில�வையில�:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:738
 msgid "by"
 msgstr "ஆல� "
 
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html-display.c:997
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
 msgid "View _Unformatted"
 msgstr "_U ஒழ�ங�க� செய�யாத காட�சி"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:950
 msgid "Hide _Unformatted"
 msgstr "_U ஒழ�ங�க� செய�யாததை மறை"
 
-#: ../mail/em-format-html-display.c:1017
+#: ../mail/em-format-html-display.c:1012
 msgid "O_pen With"
 msgstr "_p உடன� திற"
 
@@ -10654,18 +10585,17 @@ msgstr "_p உடன� திற"
 msgid "Page %d of %d"
 msgstr "பக�கம� %d இல� %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:147
 msgid "Formatting message"
 msgstr "செய�தியை ஒழ�ங�க� செய�கிறத�"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:338
 msgid "Formatting Message..."
 msgstr "செய�தியை ஒழ�ங�க� செய�கிறத�..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "பெற�கிறத� `%s'"
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389, c-format
+msgid "Retrieving '%s'"
+msgstr "பெற�கிறத� '%s'"
 
 #: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
@@ -10703,38 +10633,47 @@ msgstr "வெளி தகவலà¯�கà¯�கான சà¯�டà¯�டிகà¯�கà
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:2595
+#: ../mail/em-format-html.c:2598
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "செய�தி <b>%s</b> ஆல� அன�ப�பப�பட�டத� <b>%s</b> சார�பாக"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "இந�த கிடங�க� உற�ப�பினர� சேர�க�கைக�க� ஆதரவ� தராத� அல�லத� இந�த வசதி செயல�பட�த�தப�படவில�லை"
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "உற�ப�பினராக�கப�பட�டீர�"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "அடைவ�"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:837
 msgid "Please select a server."
 msgstr "சேவையகத�தை தேர�வ� செய�யவ�ம�"
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "சேவையகம�  எத�வ�ம� தேர�வ� செய�யப�படவில�லை"
 
-#: ../mail/em-utils.c:311
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "%d செய�தியை உடனே அவசியம�  திறக�க வேண�ட�மா ?"
+msgstr[1] "%d செய�திகள�  � உடனே அவசியம�  திறக�க வேண�ட�மா ?"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "செய�தி வடிப�பிகள�"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:815
+#: ../mail/em-utils.c:852
 #, c-format
 msgid "Messages from %s"
 msgstr " %s லிர�ந�த� செய�தி"
@@ -10743,7 +10682,7 @@ msgstr " %s லிர�ந�த� செய�தி"
 msgid "Search _Folders"
 msgstr "அடைவ�களை தேட� (_F)"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:521
 msgid "Add Folder"
 msgstr "அடைவ� சேர�"
 
@@ -10784,50 +10723,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "\"மின�னஞ�சலை அன�ப�ப� & பெற�\"  சாளர அகலம�"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "அளவான உரையை காட�ட எவலூஷனை அன�மதிக�கிறத�."
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "எப�போத�ம� படிக�க பெற�றவைக�க� ரசீத�  கோரவ�ம�"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "தானியங�கி சிரிப�பான� அடையாளம� காணல� "
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "இணைப�பை தானாக உணர�"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "உள� செய�திகளை சோதிக�கிறக�"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "அழைப�ப� தனிப�பட�த�தி காட�டப�பட�டத�"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "அழைப�ப� தனிப�பட�த�திய நிறம�"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "தொக�ப�பி சாளரத�தின� இயல�பான உயரம�"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "தொக�ப�பி சாளரத�தின� இயல�பான அகலம�"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "தொக�ப�பி �ற�ற /இணைப�ப� அடைவ�"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr " TO/CC/BCCல� உள�ள ம�கவரிகளை க�ற�க�கி காட�ட�"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -10835,7 +10770,7 @@ msgstr ""
 "ம�கவரி எண�ணிக�கையில� க�றிப�பிட�ட எண�ணை கொண�ட�, TO/CC/BCCல� உள�ள ம�கவரிகளை க�ற�க�கி "
 "காட�ட�. (_c)"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -10843,11 +10778,11 @@ msgstr ""
 "தொலை சேவையகத�த�டன� எந�த இடைவெளியில� உள�ளமை மாற�தல�கள� ஒத�திசைக�கப�பட�கின�றன என�பதை "
 "கட�ட�ப�பட�த�த�கிறத�. இடைவெளி  க�றைந�தத� 30 நொடிகளாக இர�க�க வேண�ட�ம�."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "க�ப�பை சோதனைக�க� பயன�பட�த�த  தனிப�பயன� தலைப�ப�கள� "
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -10855,63 +10790,63 @@ msgstr ""
 "க�ப�பை சோதனைக�க� பயன�பட�த�த  தனிப�பயன� தலைப�ப�கள�. பட�டியலில� உர�ப�கள� இந�த சர விதத�தில� "
 "இர�க�க வேண�ட�ம�. \"headername=value\""
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "செய�தி தொக�க�கப�பட வேண�டிய இயல�பான எழ�த�த�ர�"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "செய�தி தொக�க�கப�பட வேண�டிய இயல�பான எழ�த�த�ர�"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "செய�தி காட�டப�படவேண�டிய வேண�டிய இயல�பான எழ�த�த�ர�"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "செய�தி காட�டப�படவேண�டிய வேண�டிய இயல�பான எழ�த�த�ர�"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "இயல�பான ம�ன�னன�ப�ப�ம� பாணி"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "தொக�ப�பி சாளரத�தின� இயல�பான உயரம�."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "அஞ�சல� உலாவி  சாளரத�தின� இயல�பான உயரம�."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "உற�ப�பினர� சேர�க�கை சாளரத�தின� இயல�பான உயரம�"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "அஞ�சல� உலாவி  சாளரத�தின� இயல�பான பெரிதாக�கிய நிலை"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "இயல�பான பதிலளிக�க�ம� பாங�க�"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "இழை விரிவ�க�க� ம�ன�னிர�ப�ப� மதிப�ப�"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "தொக�ப�பி சாளரத�தில� இயல�பான அகலம�"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "அஞ�சல� உலாவி  சாளரத�தின� இயல�பான  அகலம�"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "உற�ப�பினர� சேர�க�கை சாளரத�தின� இயல�பான அகலம�"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -10919,11 +10854,11 @@ msgstr ""
 "உள�ளமை ம�கவரி ப�த�தகத�தில� மட�ட�ம� க�ப�பையை வடிகட�ட ம�கவரிகளை பார�க�க வேண�ட�மா என�பதை "
 "நிர�ணயிக�கிறத�."
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "அன�ப�ப�னர� அஞ�சல�க�க�  ம�கவரி ப�த�தகத�தை பார�க�க வேண�ட�மா என�பதை நிர�ணயிக�கிறத�"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10934,11 +10869,11 @@ msgstr ""
 "இர�ந�தால� அஞ�சல� க�ப�பை அல�ல. தானியங�கி பூர�த�தி ப�த�தகங�களை அத� பார�க�கிறத�.இத� தொலை "
 "ப�த�தகங�களாக இர�ந�தால� மெத�வாக செயல�பட�ம�.."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "தனிப�பயன� தலைப�ப�கலை பயன�பட�த�தி க�ப�பைகளை ஆராய  வேண�ட�மா என�பதை நிர�ணயிக�கிறத�"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -10947,7 +10882,7 @@ msgstr ""
 "தனிப�பயன� தலைப�ப�களை பயன�பட�த�தி க�ப�பைகளை ஆராய  வேண�ட�மா என�பதை நிர�ணயிக�கிறத�.இதை "
 "தேர�வ� செய�த� தலைப�ப�களை தேர�ந�த� எட�த�த� இர�ந�தால� க�ப�பையை அறிவத� வேகமாக�ம�."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -10955,18 +10890,22 @@ msgstr ""
 " செங�க�த�த� பார�வையில� \"Messages\" நிரலில� \"From\" மற�ற�ம� \"Subject\" வரிகளில� "
 "ஒரே எழ�த�த�ர�வை பயன�பட�த�த வேன�ட�மா  என�பதை நிர�ணயிக�கிறத�."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "தொக�ப�பிக�க� �ற�ற/ இணைக�க  கோப�ப�கள�க�க� அடைவ� "
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "அஞ�சல� கூற�கள� கோப�ப�களை சேமிக�க அடைவ� "
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "பக�க பட�டியில�  அடைவ� பெயர�களை அடைப�பில� அமைப�பதை ம�டமாக�க� அல�லத� செயலாக�க�"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "க�றித�த அளவ�க�க� உட�பட�ட செய�திகளின� உரையை மட�ட�ம� காண�பி"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "பின�னூட�ட  மட�ட�ப�பட�த�தலை சேர�க�காதே "
@@ -11038,14 +10977,16 @@ msgstr ""
 "பயன� பட�த�த இதை தேர�வ� செய�க. "
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "அளவான செய�தி உரை பக�தியை வரைவை செயல�பட�த�த�"
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr "'message_text_part_limit' விசையில� வரையற�த�த படி உரை அளவை பொர�த�த� செய�தியை காட�ட�வதை செயலாக�க�."
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "காரட� பாங�கை செயல�பட�த�த�/செயல�பட�த�தாதே"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:46
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "கோப�ப� பெயர�களை அவ�ட�ல�க�/ஜிமெய�ல� பாங�கில� க�றியாக�க�"
 
@@ -11185,12 +11126,12 @@ msgstr ""
 "நீக�க�கிறத� / செயல�பட�த�த�கிறத�"
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
-msgstr "க�ப�பையை காலி செய�த கடைசி நேரம�."
+msgid "Last time Empty Junk was run"
+msgstr "எரிதங�களை காலி செய� கட�டளை இயங�கிய கடைசி நேரம�."
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
-msgstr "கடைசியாக க�ப�பைகாலி இயக�கப�பட�ட நேரம�"
+msgid "Last time Empty Trash was run"
+msgstr "க�ப�பையை காலி செய� கட�டளை இயங�கிய கடைசி நேரம�."
 
 #: ../mail/evolution-mail.schemas.in.h:85
 msgid "Layout style"
@@ -11299,58 +11240,62 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "செய�தி \"Preview\" அழைப�பை க�றி"
 
 #: ../mail/evolution-mail.schemas.in.h:109
+msgid "Message text limit for display"
+msgstr "காட�ட செய�தியின� வரையரை"
+
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "செய�தி தோன�ற�ம� தோற�றம� (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the junk on exit"
 msgstr "வெளியேற�ம�போத� க�ப�பையை காலி செய�ய இடையே க�றைந�தபட�ச தினங�கள� "
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum days between emptying the trash on exit"
 msgstr "வெளியேற�ம� போத� க�ப�பையை காலி செய�ய தேவையான க�றைந�தபட�ச நாட�கள�."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "வெளியேற�ம� போத� க�ப�பையை காலி செய�ய தேவையான க�றைந�தபட�ச நேரம� நாட�களில�."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "வெளியேற�ம� போத� க�ப�பையை காலி செய�ய தேவையான நாட�கள�"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "TO/CC/BCC ல� தெரிய வேண�டிய ம�கவரிகளின� எண�ணிக�கை"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "தலைப�ப� காலியாக இர�ந�தால� தெரியப�பட�த�த�"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "அடைவை ம�ழ�வத�ம� அழிக�க நினைக�க�ம� போத� தெரியப�பட�த�த�"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "தலைப�பில�லாமல� செய�தி அன�ப�ப ம�யல�ம� போத� எச�சரி"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "தேடல� அடைவிலிர�ந�த�  செய�தியை நீக�கினால� நினைவூட�ட�"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "பயனர� ம�ட�வத�ம� அழிக�க�ம� போத� தெரியப�பட�த�த�"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "மறை நகல� அன�ப�ப�ம� போத� தெரியப�பட�த�த� "
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "பயனர� 10 அல�லத� அதற�க� மேற�பட�ட செய�திகளை ஒரே நேரத�தில� அன�ப�ப�ம� போத� தெரியப�பட�த�த�"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11358,135 +11303,135 @@ msgstr ""
 "ஹெச�டிஎம�எல�  மின�னஞ�சலை �ற�க விர�ம�பாதார�கள�க�க�ஹெச�டிஎம�எல�  மின�னஞ�சல� அன�ப�பப�பட�ம� போத� "
 "தெரியப�பட�த�த�."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "பயனர� கரிநகலோட� செய�தி அன�ப�ப�ம� போத� தெரியப�பட�த�த�"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "தேவையற�ற ஹெச�டிஎம�எல�  மின�னஞ�சலை பயனர� அன�ப�ப�ம� போத� தெரியப�பட�த�த�"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "பல செய�திகளை க�றிக�க�ம� போத� தெரிவிக�கவ�ம�"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr "பதில�கள� மேல� தனிப�பயன� கையெழ�த�தை இட�க "
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "பதில�களின� கீழ� நிலைக�காட�டியை வைக�கவ�ம�."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "உரையில� சிரிப�ப� சித�திரங�களை உணர�ந�த� அவற�றை  மாற�ற�"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "உரையில� இணைப�பை உணர�ந�த� அவற�றை  மாற�ற�"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "க�ப�பை சோதனையை உள�வர�ம� மின�னஞ�சலில� இயக�க�"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "அடைவை சேமி"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "உள�ளமை ம�கவரி ப�த�தகத�தில� அன�ப�ப�னர� படத�தை தேட�."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "இயல�பாக ஹெச�டிஎம�எல�  மின�னஞ�சலை அன�ப�ப�"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "இயல�பாக ஹெச�டிஎம�எல�  மின�னஞ�சலை அன�ப�ப�"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "செய�தி பட�டியலில�   அன�ப�ப�னர� மின�னஞ�சல� ம�கவரி  நிரல�"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "சேவையகத�த�டன� ஒர�ங�கிணைக�க�ம� இடைவெளி"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr "அஞ�சல�  செய�தி அன�ப�ப�ம�போத� பின�னொட�ட� ப�லத�தை பிரித�தல� வேண�டாம� எனில� உண�மை என அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "அஞ�சல�  செய�தி அன�ப�ப�ம�போத� \"மறைநகல�\" ப�லத�தை காட�ட�க"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "அஞ�சல�  செய�தி அன�ப�ப�ம�போத� \"கரிநகல�\" ப�லத�தை காட�ட�க"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "அஞ�சல�  மடல�க�ழ�வ�க�க� அன�ப�ப�ம�போத� \"அன�ப�ப�நர� \" ப�லத�தை காட�ட�க"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"From\" field when sending a mail message"
 msgstr "அஞ�சல�  செய�தி அன�ப�ப�ம�போத� \"அன�ப�ப�நர� \" ப�லத�தை காட�ட�க"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "அஞ�சல� மடலாடல� க�ழ�வ�க�க� அன�ப�ப�ம�போத� \"பதில�-இவர�க�க� \" ப�லத�தை காட�ட�க"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "அஞ�சல�  செய�தி அன�ப�ப�ம�போத� \"பதில�-இவர�க�க� \" ப�லத�தை காட�ட�க "
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "இயங�க� சித�திரங�களை காட�ட�"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show all message headers"
 msgstr "அனைத�த�ம� செய�திகள� இழைகளைய�ம� க�ற�க�க�க"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show all the headers when viewing a messages."
 msgstr "அஞ�சல�களை பார�க�க�ம�  போத� எல�லா தலைப�ப�களைய�ம� காட�ட�க "
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "இயங�க� சித�திரங�களை இயங�க� சித�திரங�களாக காட�ட�"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "அழித�த செய�திகளை அடித�த செய�திகளாக பட�டியலில� காட�ட�"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr "நீக�கிய செய�திகளை செய�தி பட�டியலில� காட�ட�"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show image animations"
 msgstr "இயங�க� படத�தை காட�ட� "
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show original \"Date\" header value."
 msgstr "மூல \"Date\" தலைப�ப� மதிப�பை காட�ட�க "
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "அன�ப�ப�னர� உடைய படத�தைக� காட�ட� "
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr "அஞ�சல�  செய�தி அன�ப�ப�ம�போத� \"மறைநகல�  \" ப�லத�தை காட�ட�க"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11494,7 +11439,7 @@ msgstr ""
 "அஞ�சல�  செய�தி அன�ப�ப�ம�போத� \"கரிநகல� \" ப�லத�தை காட�ட�க. இத� ஒர� அஞ�சல� கணக�க� தேர�வ� "
 "செய�யப�பட�ம�போத� பார�வை மென�வால� கட�ட�ப�பட�த�தப�பட�கிறத�."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11502,7 +11447,7 @@ msgstr ""
 "அஞ�சல�  செய�தி அன�ப�ப�ம�போத� \"அன�ப�ப�நர�  \" ப�லத�தை காட�ட�க. இத� ஒர� செய�தி கணக�க� "
 "தேர�வ� செய�யப�பட�ம�போத� பார�வை மென�வால� கட�ட�ப�பட�த�தப�பட�கிறத�."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11510,7 +11455,7 @@ msgstr ""
 "அஞ�சல�  செய�தி அன�ப�ப�ம�போத� \"அன�ப�ப�நர�  \" ப�லத�தை காட�ட�க. இத� ஒர� அஞ�சல� கணக�க� "
 "தேர�வ� செய�யப�பட�ம�போத� பார�வை மென�வால� கட�ட�ப�பட�த�தப�பட�கிறத�."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11518,7 +11463,7 @@ msgstr ""
 "அஞ�சல�  செய�தி அன�ப�ப�ம�போத� \"பதில�-இவர�க�க�  \" ப�லத�தை காட�ட�க. இத� ஒர� செய�தி "
 "கணக�க� தேர�வ� செய�யப�பட�ம�போத� பார�வை மென�வால� கட�ட�ப�பட�த�தப�பட�கிறத�. "
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11526,13 +11471,13 @@ msgstr ""
 "அஞ�சல�  செய�தி அன�ப�ப�ம�போத� \"பதில�-இவர�க�க�  \" ப�லத�தை காட�ட�க. இத� ஒர� அஞ�சல� கணக�க� "
 "தேர�வ� செய�யப�பட�ம�போத� பார�வை மென�வால� கட�ட�ப�பட�த�தப�பட�கிறத�. "
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "செய�திகள� பட�டியலில� தனி பத�தியில� அன�ப�ப�னரின� மின�னஞ�சலை காட�ட�க."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -11542,49 +11487,45 @@ msgstr ""
 "இல�லாவிட�டால�  \"Date\" தலைப�ப� மதிப�பை பயனர� விர�ப�ப ஒழ�ங�கில�ம� உள�ளூர� நேரத�த�டன�ம� "
 "காட�ட�க "
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "செய�திகள� படிக�க�ம� பலகத�தில� அன�ப�ப�னரின� படத�தை காட�ட�க"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "எழ�த�த�ப�பிழையை சோதி"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "எழ�த�த� பிழை திர�த�த வண�ணம�"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "எழ�த�த�ப�பிழை திர�த�த மொழி"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "உரையாடலின� இயல�பான உயரத�தை அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "உரையாடலின� இயல�பான அகலத�தை அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "ம�னைய எழ�த�த�ர�"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "உரை செய�திக�க� வரையளவ�."
-
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "ஜங�க� ஹூக� க�க� ம�ன�னிர�ப�ப� சொர�க�ப�பொர�ள�"
 
 #: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
-msgstr "சகாப�த ஆரம�பத�திலிர�ந�த�. கடைசி நேரம� ஜங�க� காலி செய� இயக�கிய நேரம�, தினங�களில�"
+msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "ஜனவ ரி1, 1970 ( சகாப�த ஆரம�பத�திலிர�ந�த�) கடைசி நேரம� ஜங�க� காலி செய� இயக�கிய நேரம�, தினங�களில�"
 
 #: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
-msgstr "epoch க�க� ம�ன� கடைசியா க�ப�பை காலி இயக�கப�பட�ட நேரம�"
+msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr " ஜனவ ரி1, 1970 ( சகாப�த ஆரம�பத�திலிர�ந�த�) கடைசியாக க�ப�பை காலி இயக�கப�பட�ட நேரம�"
 
 #: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
@@ -11616,11 +11557,12 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
-"எவலூஷனில� ஒழ�ங�க� பட�த�தக�கூடிய அதிகபட�ச  உரை அளவை நிர�ணயிக�கிறத�. ம�ன�னிர�ப�ப�4MB / "
-"4096 KB. KB இல� க�றிக�கப�பட�ம�."
+"இத� எவலூஷனில� காட�டக�கூடிய அதிகபட�ச  உரை அளவை நிர�ணயிக�கிறத�. ம�ன�னிர�ப�ப�4096 (4MB). KB இல� "
+"க�றிக�கப�பட�ம�. 'force_message_limit' விசை  செயலில�  இர�ந�தால� மட�ட�மே  இத� பயக�க�  வர�ம�"
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
@@ -11783,532 +11725,555 @@ msgstr "செயà¯�திகளà¯� படà¯�டியலà¯� பலகதà¯�தà
 msgid "Width of the message-list pane."
 msgstr "செய�தி-பட�டியல� பலகத�தில� அகலம�."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "எல�ம�  தகவலை �ற�ற�கிறத�"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "மின�னஞ�சல�"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:365
 msgid "Evolution Elm importer"
 msgstr "எவல�யூஷன� எல�ம�  �ற�றி"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:366
 msgid "Import mail from Elm."
 msgstr "எல�ம� இலிர�ந�த� அஞ�சலை இறக�க�."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
+#: ../mail/importers/evolution-mbox-importer.c:113
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Destination folder:"
 msgstr "இலக�க� அடைவ�:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../plugins/pst-import/pst-importer.c:294
 msgid "Select folder"
 msgstr "அடைவை தேர�வ� செய�"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../plugins/pst-import/pst-importer.c:294
 msgid "Select folder to import into"
 msgstr "�ற�ற வேண�டிய அடைவை தேர�வ� செய�"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:218
+#: ../mail/importers/evolution-mbox-importer.c:258
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "பெர�க�கேலே அஞ�சல� பெட�டி (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:259
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "இறக�கி பெர�கேலே அஞ�சல� பெட�டி வடிவ அடைவ�கள�"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "மின�னஞ�சல� பெட�டியை �ற�றவ�ம�"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
-#, c-format
-msgid "Importing `%s'"
-msgstr "`%s' �ற�ற�கிறத�"
+#: ../mail/importers/mail-importer.c:148
+#: ../plugins/pst-import/pst-importer.c:446
+#: ../plugins/pst-import/pst-importer.c:552, c-format
+msgid "Importing '%s'"
+msgstr "'%s' � இறக�க�மதி செய�கிறத�"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:291
 #, c-format
 msgid "Scanning %s"
 msgstr "`%s' வர�ட�கிறத�"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "பைன� தகவலை �ற�ற�கிறத�"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "ம�கவரி ப�த�தகம�"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:418
 msgid "Evolution Pine importer"
 msgstr "எவல�யூஷன� பைன� �ற�றி"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:419
 msgid "Import mail from Pine."
 msgstr "பைன� லிர�ந�த� அஞ�சலை இறக�க�."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "%s பெற�நர�"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "%s மின�னஞ�சல� அன�ப�பியவர�"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "%s தலைப�ப�"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s மின�னஞ�சல� பட�டியல�"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "வடிகட�டி விதிம�றையை சேர�"
 
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The filter rules \"%s\" has been updated, because they used just removed "
+"folder\n"
+"\"%s\"."
+msgstr[0] ""
+"வடிப�பி விதி \"%s\" மேம�பட�த�தப�பட�ட�விட�டத�, காரணம� அத� சமீபத�தில� நீக�கிய அடைவ� \n"
+"\"%s\" � பயன�பட�த�தியத�."
+msgstr[1] ""
+"வடிப�பி விதிகள� \"%s\" மேம�பட�த�தப�பட�ட�விட�டன, காரணம� அவை சமீபத�தில� நீக�கிய அடைவ� \n"
+"\"%s\" � பயன�பட�த�தியன."
+
 #: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(க�றிப�ப�:  பயன�பாட� மீள� த�வக�கம� செய�யப�பட வேன�ட�ம�)"
 
-#: ../mail/mail-config.ui.h:2
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:3
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>மேலே பதில� எழ�த�ம� தேர�வ�</b> (பரிந�த�ரைக�கப�படவில�லை)"
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "கணக�க� தகவல�"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "(_w)ப�திய கையொப�பத�தை சேர�"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "எப�போத�ம� இந�த கணக�கில� வெளி போக�ம� செய�திகள�க�க� கையொப�பமிட�க"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "(_f) மறையாக�கம� செய�த அஞ�சல� அன�ப�ப�ம� போத� என� பிரதியைய�ம� மறையாக�கம� செய�க."
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "(_s) எப�போத�ம� கரிநகல� அன�ப�ப�:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "எப�போத�ம� (_b) க�க� மறைநகல� அன�ப�ப�:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "எப�போத�ம� (_t) வலையில� உள�ள விசைகளை க�றிம�றையாக�கத�தின� போத� பயன�பட�த�த�."
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "எப�போத�ம� மறையாக�கம� செய�த அஞ�சல� அன�ப�ப�ம� போத� எனக�க�ம� பிரதியை மறையாக�கம� செய�க (_m)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "எப�போத�ம� படிக�க பெற�றவற�ற�க�க� இரசீத�  கோரவ�ம� (_d)"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "அங�கீகாரம�"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "(_e) தானியங�கியாக க�ற�நகைவி படங�களை ந�ழைக�கவ�ம�"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "(_h)எழ�த�த�ர� வகை:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "_e த�ணையாக உள�ள வகைகளை சரிபார�"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "(_s) தேவையற�ற மின�னஞ�சல�கள�க�க� தனிப�பயன� தலைப�ப�களை சோதிக�கவ�ம�"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
 msgstr "(_m) உள�வர�ம� செய�திகலில� தேவையற�ற மின�னஞ�சல�கள�க�க� சோதிக�கவ�ம�"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "(_t)தட�டச�ச� செய�ய�ம� போதே சொல�பிழை உள�ளதா என சோதி"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "தேவையற�ற மின�னஞ�சல�களை சோதி"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "த�டை (_a)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "த�டை (_r)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "(_m)பிழைய�ள�ள வார�த�தைகளின� நிறம�:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "செய�திகளை உர�வாக�க�தல�"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "வடிவமைப�ப�"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "(_w)அடைவ� ம�ழ�மையாக நீக�கப�பட�ம� போத� நினைவூட�ட�"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Default Behavior"
 msgstr "ம�ன�னிர�ப�ப� நடத�தை:"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "(_n)இயல�பான எழ�த�த�ர� க�றியீட�ட� ம�றை"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Delete Mail"
 msgstr "அஞ�சலை அழி "
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Delete junk messages on e_xit"
 msgstr "(_x) வெளியேற�ம� போத� எரிதங�களை நீக�க�"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "(_u) வெளி செல�ல�ம� செய�திகள�க�க� டிஜிட�டல� ம�றையில� கையொப�பமிட� (ம�ன�னிர�ப�பாக)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "காட�டப�பட�ட செய�தி தலைப�ப�கள� (_H)"
-
 #: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "(_z) உரை அளவ� இதற�க� மேல� போனால� அஞ�சல� உள�ளடக�கத�தை ஒழ�ங�க� செய�யாதே"
+msgid "Displayed Message Headers"
+msgstr "காட�டப�பட�ட செய�தி தலைப�ப�கள�"
 
 #: ../mail/mail-config.ui.h:38
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "(_z) உரை அளவ� இதற�க� மேல� போனால� அஞ�சல� உள�ளடக�கத�தை காட�டாதே "
+
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "(_k)அன�ப�ப�னர� என� ம�கவரி  ப�த�தகத�தில� இர�ந�தால� செய�தியை க�ப�பை என க�றியிடாதே"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not quote"
 msgstr "மேற�கோள� காட�ட வேண�டாம�"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "(_F)வரைவ� அடைவ�:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "(_A)மின�னஞ�சல� ம�கவரிகள�:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "(_x)வெளியேற�ம� போத� க�ப�பை தொட�டி அடைவை காலி செய�"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Magic S_pacebar"
 msgstr "(_p) மாய வெற�ற� இட விசையை செயல�பட�த�த� "
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Sea_rch Folders"
 msgstr "(_r) அடைவ�கள� தேடலை செயலாக�க�."
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "(_p)க�றிம�றையாக�க சான�றிதழ�:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "வெளி செல�ல�ம� செய�திகளை க�றிம�றையாக�க�(ம�ன�னிர�ப�பாக) (_g)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fi_xed-width:"
 msgstr "(_x)நிலையான அகலம�:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Fix_ed width Font:"
 msgstr "_ந நிலையான அகல எழ�த�த�ர�:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Font Properties"
 msgstr "எழ�த�த�ர� பண�ப�கள�"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Format messages in _HTML"
 msgstr "(_H)செய�திகளை ஹெச�டிஎம�எல�  மின�னஞ�சலாக அமை"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "ம�ழ�ப� பெயர�: (_e)"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "HTML Messages"
 msgstr "ஹெச� டிஎம� எல� செய�திகள�"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
 msgid "H_TTP Proxy:"
 msgstr "(_T)ஹெச�டிடிபி பதிலாள�:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Headers"
 msgstr "தலைப�ப�கள�"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "Highlight _quotations with"
 msgstr "(_q)க�றிப�பிட�டவைகலை தனிப�பட�த�தி காட�ட�"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:60
 msgid "Inline"
 msgstr "உள�ளே"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 msgid "Inline (Outlook style)"
 msgstr "உள�ளே (அவ�ட�ல�க� பாணி)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:63
 msgid "KB"
 msgstr "கேபி(KB)"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "விளக�கச�சீட�ட�கள�"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "மொழிகள� அட�டவணை"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "படங�களை �ற�ற�கிறத�"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "அஞ�சல� தலைப�ப�கள� அட�டவணை"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "மின�னஞ�சல� பெட�டி இர�க�க�மிடம�"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "செய�தி காட�டல�"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 msgid "Message Fonts"
 msgstr "செய�தி எழ�த�த�ர�"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "Message Receipts"
 msgstr "செய�தி ரசீத�"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "No _Proxy for:"
 msgstr "(_P) பதிலாள� இல�லை இதற�க�:"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:74
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "க�றிப�ப�: ம�தல� ம�றை இணைக�கப�பட�ம� போத� கடவ�ச�சொல� கேட�க�ம�."
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:75
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "தனிப�பயன� க�ப�பை தலைப�ப� இர�ப�பின� தேர�வ� உதாசீனப�பட�த�தப�பட�ம�.."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:76
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "தேர�வ� தகவல�"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 msgid "Or_ganization:"
 msgstr "(_g)நிற�வனம�:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:79
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG (_K)விசை அடையாளம�:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Pass_word:"
 msgstr "(_w)கடவ�ச�சொல�:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Port:"
 msgstr "த�றை:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "(_o)கரிநகலாக மட�ட�ம� மின�னஞ�சல� அன�ப�பபட�ம� போத� நினைவூட�ட�"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "நல�ல பாத�காப�ப� (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Printed Fonts"
 msgstr "அச�சடித�த எழ�த�த�ர�"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Proxy Settings"
 msgstr "பதிலாள� அமைவ�கள�"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Quoted"
 msgstr "மேற�கோள� காட�டிய"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "Re_member password"
 msgstr "(_m)கடவ�ச�சொல�லை நினைவில� கொள�"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "Re_ply-To:"
 msgstr "(_p)பதில� தர�க:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "Remember _password"
 msgstr "(_p)கடவ�ச�சொல�லை நினைவில� கொள�"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "Required Information"
 msgstr "தேவையான தகவல�"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "இந�த எவல�யூஷன� உர�வாக�கத�தில� எஸ�எஸ�எல�  த�ணை இல�லை"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "(_e) உள�ளமை ம�கவரி ப�த�தகங�களில� மட�ட�ம� அன�ப�ப�னர� படத�தை தேட�க"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "தேர�ந�தெட�... (_e)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "_e செய�திகள� கிடைத�த தகவலை அன�ப�ப�க:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "(_t)நிலையான எழ�த�த�ர�"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "பாத�காப�பான மைம� (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "Select Drafts Folder"
 msgstr "ம�ன� வரைவ� அடைவை தேர�வ� செய�"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "ஹெச�டிஎம�எல�  நிலையான அகலம�ள�ள எழ�த�த�ர�வை தேர�வ� செய�"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "ஹெச�டிஎம�எல�  நிலையான அகலம�ள�ள எழ�த�த�ர�வை அச�சடிப�பதற�காக தேர�வ� செய�"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font"
 msgstr "ஹெச�டிஎம�எல�  அகலம� மாற�ம� எழ�த�த�ர�வை தேர�வ� செய�"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "ஹெச�டிஎம�எல�  அகலம� மாற�ம� எழ�த�த�ர�வை அச�சடிப�பதற�காக தேர�வ� செய�"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "Select Sent Folder"
 msgstr "அன�ப�பியவை அடைவை தேர�வ� செய�"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 msgid "Sender Photograph"
 msgstr "அன�ப�ப�நர� படம�"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Sending Mail"
 msgstr "மின�னஞ�சல� அன�ப�ப�கிறத�"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "(_M)அன�ப�பப�பட�ட செய�தி உள�ள அடைவ�:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Sent and Draft Messages"
 msgstr "அன�ப�பிய மற�ற�ம� ம�ன�வரைவ� செய�திகள�"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:112
 msgid "Ser_ver requires authentication"
 msgstr "(_v)சேவையகத�தை அண�க அன�மதி தேவை"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 msgid "Server Configuration"
 msgstr "சேவையக வடிவமைப�ப�"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:114
 msgid "Server _Type:"
 msgstr "(_T)சேவையகம�  வகை:"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_natures"
 msgstr "_n கையொப�பம�"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "கையொப�பமிட�கிற சான�றிதழ�: (_n)"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "(_u)கையொப�பம�"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "கையொப�பம�"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "எழ�த�த� பிழை திர�த�தம�"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "(_t) பதில� உள�ளிட�ம�போத� கீழிர�ந�த�  த�வக�க� "
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "(_y)வகை"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "நீங�கள� நிற�விய�ள�ள அகராதி மொழிகள� மட�ட�மே இங�க�  பட�டியல� இடப�பட�டன."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12317,7 +12282,7 @@ msgstr ""
 "இந�த நிரலின� விளைவ� உங�கள� கையொப�பமாக கொள�ளப�பட�ம�.\n"
 "இதில� க�றிப�பிட�ம� பெயர� உங�கள� பெயராக காட�ட மட�ட�ம� பயன�பட�ம�."
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12325,246 +12290,244 @@ msgstr ""
 "இந�த கணக�க�க�க� என�ன பெயரிட விர�ப�ப�கிறீர�கள� என�பதை உள�ளிடவ�ம� உதாரணமாக \"Work\" அல�லத� "
 "\"Personal\""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:129
 msgid "Us_ername:"
 msgstr "(_e) பயனீட�டாளர� பெயர�"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:130
 msgid "Use Authe_ntication"
 msgstr "உண�மைபட�த�தலை பயன�செய� (_n)"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../mail/mail-config.ui.h:131 ../plugins/caldav/caldav-source.c:222
 #: ../plugins/google-account-setup/google-contacts-source.c:283
 #: ../plugins/google-account-setup/google-source.c:620
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "(_n)பயனீட�டாளர� பெயர�"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:132
 msgid "V_ariable-width:"
 msgstr "(_a)மாற�ம�-அகலம�"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "(_A)கையொப�பத�தை சேர�"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "(_A)இணையத�திலிர�ந�த� படங�களை பெற�ற�க�கொள�"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:135
 msgid "_Authentication Type"
 msgstr "_A அங�கீகார வகை"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:136
 msgid "_Default junk plugin:"
 msgstr "(_D)ம�ன�னிர�ப�ப� எரித சொர�க�ப�பொர�ள�:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:137
 msgid "_Direct connection to the Internet"
 msgstr "(_D) இணையத�த�க�க� நேரடி இணைப�ப�"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:138
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "சந�திப�ப� பற�றிய கோரிக�கைக�க� கையொப�பம� தேவை இல�லை(அவ�ட�ல�க�கில� வேலை செய�வதற�காக) (_D)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "(_F)ம�ன� அன�ப�ப�ம� பாணி:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:140
 msgid "_Keep Signature above the original message on replying"
 msgstr "பதில� எழ�த�ம� போத� கையெழ�த�தை மூல செய�திக�க� மேலே வைக�கவ�ம�"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:141
 msgid "_Languages"
 msgstr "_L மொழிகள�"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:142
 msgid "_Load images in messages from contacts"
 msgstr "தொடர�ப�களிலிர�ந�த� அஞ�சல�க�க� படங�களை �ற�ற� (_L)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:143
 msgid "_Lookup in local address book only"
 msgstr "(_L) உள� ம�கவரி ப�த�தக த�தில� மட�ட�ம� தேட�"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:144
 msgid "_Make this my default account"
 msgstr "(_M)இதை இயல�பான கணக�காக க�றிக�கவ�ம�"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:145
 msgid "_Manual proxy configuration:"
 msgstr "(_M) கைம�றை பதிலாள� அமைப�ப�"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:146
 msgid "_Mark messages as read after"
 msgstr "(_M) பிறக� படி என க�றிக�கவ�ம�"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "(_N)எப�போத�ம� இணையத�திலிர�ந�த� படங�களை �ற�றாதே"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "(_P)பாதை"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 " ஹெச�டிஎம�எல�  தேவை இல�லை என�போர�க�க� ஹெச�டிஎம�எல�  செய�திகளை அன�ப�ப�ம� போத�  நினைவூட�ட� "
 "(_P)"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:151
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "(_P)தலைப�பில�லாமல� செய�தி அன�ப�பினால� நினைவூட�ட�"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:152
 msgid "_Reply style:"
 msgstr "(_R)பதில� பாணி:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:153
 msgid "_Script:"
 msgstr "(_S)சிற�நிரல�:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:154
 msgid "_Secure HTTP Proxy:"
 msgstr "(_S) பாத�காப�பான ஹெச�டிடிபி பதிலாள�:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:156 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "(_S)சேவையகம� :"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:158
 msgid "_Show image animations"
 msgstr "இயங�க� படத�தை காட�ட� (_S)"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:159
 msgid "_Show the photograph of sender in the message preview"
 msgstr "(_S) மின�னஞ�சல� ம�ன�பார�வையில� அன�ப�ப�னர� படத�தைக� காட�ட�"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:161
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "அன�ப�ப�நர� / நகல� / மறைநகல� தலைப�ப�களை இங�க� இணைக�கவ�ம� (_S)"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:162
 msgid "_Use Secure Connection:"
 msgstr "பாத�காப�பான இணைப�பை பயன�பட�த�த�: (_U)"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:163
 msgid "_Use system defaults"
 msgstr "(_U)கணினி இயல�பானதை பயன�பட�த�த�"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:164
 msgid "_Use the same fonts as other applications"
 msgstr "(_U)மற�ற பயன�பாட�கள� பயன�பட�த�த�ம� எழ�த�த�ர�வையே பயன�பட�த�த�"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "à®…"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:167
 msgid "addresses"
 msgstr "ம�கவரிகள�"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "ஆ"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:169
 msgid "color"
 msgstr "நிறம�"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:170
 msgid "description"
 msgstr "விளக�கம�"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "அனைத�த� செயலில�ள�ள தொலை அடைவ�கள�"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "அனைத�த� உள�ளமை மற�ற�ம� செயல�பட�ம� தொலைநிலை அடைவ�கள�"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "இடஞ�சார�ந�த அடைவ�கள� அனைத�த�ம�"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "அழை"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "ம�டிவ�ற�றத� (_m)"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Digital Signature"
 msgstr "இர�ம கையொப�பம�"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "மேலன�ப�பாதே"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "க�றிம�றை"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Folder Subscriptions"
 msgstr "அடைவ� உற�ப�பினர�கள�"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "தொடரவேண�ட�ம�"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "உங�கள� தகவல�க�காக"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "அன�ப�ப�"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "ஒப�பந�தப�பத�திரம�"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "பதில� தேவை இல�லை"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "அனைவர�க�க�ம� பதிலளி"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "மீள�பார�வை"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:20
 msgid "S_erver:"
 msgstr "(_e)சேவையகம� :"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Search Folder Sources"
 msgstr "அடைவின� மூலங�களை தேட�"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Security Information"
 msgstr "பாத�காப�ப� தகவல�"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Specific folders"
 msgstr "க�றிப�பிட�ட அடைவ�கள�"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:24
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12572,170 +12535,168 @@ msgstr ""
 "தொடந�த� கவனிப�பதற�காக நீங�கள� தேர�வ� செய�த செய�தி பட�டியலிடப�பட�ட�ள�ளத�\n"
 "\"Flag\" பட�டிலிர�ந�த� தொடர� தேர�வை தேர�வ� செய�யவ�ம�"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Accept License"
 msgstr "அங�கீகாரத�தை �ற�ற�க�கொள� (_A)"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Due By:"
 msgstr "(_D)நில�வையில�:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Flag:"
 msgstr "(_F)க�றி:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Tick this to accept the license agreement"
 msgstr "_T ஒப�பந�த பத�திரத�தை �ற�க இங�க� சொட�க�கவ�ம�"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:891
 #, c-format
 msgid "Pinging %s"
 msgstr "தொடர�ப�கொள�கிறத� %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "தேர�ந�தெட�க�கப�பட�டத� செய�திகளை வடிக�கிறத�"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "மின�னஞ�சலை கொணர�கிறத�"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:574
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "வெளிசெல�ல�ம� வடிகட�டிக�க� அன�ப�ப�வதில� தோல�வி : %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
-#, c-format
+#: ../mail/mail-ops.c:586 ../mail/mail-ops.c:613, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
-"பின�னெழ�த�வதில� தோல�வி %s: %s\n"
-"உள� 'அன�ப�ப�' அடைவில� போய� சேர�ந�த�விட�டத�."
+"%s க�க� பின�னெழ�த�வதில� தோல�வி : %s\n"
+" 'அன�ப�பியத�' அடைவில� போய� சேர�ந�த�விட�டத�."
 
-#: ../mail/mail-ops.c:641
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "உள� 'அன�ப�ப�' அடைவில� சேர�க�க�ம� போத� தோல�வி : %s"
+#: ../mail/mail-ops.c:630, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "உள�ளமை  'அன�ப�பியத�' அடைவில� சேர�க�க�ம� போத� தோல�வி : %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:741 ../mail/mail-ops.c:822
 msgid "Sending message"
 msgstr "செய�தி அன�ப�ப�கிறத�"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:751
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d இல� %d அன�ப�பப�பட�கிறத�"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:778
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d இல� %d செய�தி அன�ப�ப�வதில� தோல�வி"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:780 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "ரத�த� செய�யப�பட�டத�."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:782 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "ம�டிந�தத�"
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:894
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "செய�தியை '%s' அடைவில� சேமிக�கிறத�"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "%s க�க� செய�திகளை நகர�த�த�கிறத�"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "%s இல� செய�திகளை நகலெட�க�கிறத�"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1080
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "'%s' இல� உள�ள அடைவ�களை சோதிக�கிறத�"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1188
 msgid "Forwarded messages"
 msgstr "செய�தியை ம�ன� அன�ப�ப�கிறத�"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1229
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "'%s' அடைவை திறக�கிறத� "
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1295
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "அடைவ� '%s' க�க� ஒத�க�கீட�  தகவல� வாங�க�கிறத�"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1367
 #, c-format
 msgid "Opening store '%s'"
 msgstr "கிடங�கை திறக�கிறத� '%s'"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1438
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "அடைவை நீக�க�கிறத� '%s'"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1556
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "அடைவை சேமிக�கிறத�  '%s'"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1619
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "கணக�கை சேர�க�கிறத� மற�ற�ம� அழிக�கிறத� '%s'"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1620
 #, c-format
 msgid "Storing account '%s'"
 msgstr "கணக�கை சேர�க�கிறத� '%s'"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1674
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "'%s' அடைவை ப�த�ப�பிக�கிறத�"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1714
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "'%s' அடைவை அழிக�கிறத�"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1759
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "க�ப�பைதொட�டியை காலி செய�கிறத� '%s'"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1760
 msgid "Local Folders"
 msgstr "உள� அடைவ�கள�"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1956
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d செய�தியை மீட�கிறத�"
 msgstr[1] "%d செய�திகளை மீட�கிறத�"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2045
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d செய�தியை சேமிக�கிறத�"
 msgstr[1] "%d செய�திகளை சேமிக�கிறத�"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2126
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12744,11 +12705,11 @@ msgstr ""
 "செய�தியை சேமிக�க�ம� போத� பிழை: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2198
 msgid "Saving attachment"
 msgstr "இணைப�பை சேமிக�கிறத�"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2216 ../mail/mail-ops.c:2224
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12757,35 +12718,35 @@ msgstr ""
 "விளைவ�க�கோப�பை உர�வாக�க ம�டியவில�லை: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2239
 #, c-format
 msgid "Could not write data: %s"
 msgstr "தகவலை எழ�த ம�டியவில�லை: %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "'%s' லிர�ந�த� த�ண�டிக�கப�பட�கிறத�"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "'%s' இல� மீண�ட�ம� இணைக�கப�பட�கிறத�"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2480
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s'  கணக�க�க�க� தொடர�பில�லாத நிலைக�க� தயாராகிறத� "
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2566
 msgid "Checking Service"
 msgstr "சேவைகளை சோதிக�கிறத�"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "ரத�த� செய�கிறத�..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "மின�னஞ�சலை அன�ப�ப� & பெற�ற�க�கொள�"
 
@@ -12793,105 +12754,137 @@ msgstr "மினà¯�னஞà¯�சலை அனà¯�பà¯�பà¯� & பெறà¯�à®±à¯
 msgid "Cancel _All"
 msgstr "(_A)அனைத�தைய�ம� ரத�த� செய�"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "மேம�பட�த�த�கிறத�..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "காத�திர�க�கிறத�...."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "ப�திய மின�னஞ�சல�க�காக சரிபார�க�கிறத�"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:217
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s க�கான கடவ�ச�சொற�களை உள�ளிடவ�ம�"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:219
 msgid "Enter Passphrase"
 msgstr "கடவ�ச�சொற�களை உள�ளிடவ�ம�"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:222
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s க�கான கடவ�ச�சொல�லை தேர�வ� செய�யவ�ம�"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:224
 msgid "Enter Password"
 msgstr "கடவ�ச�சொல�லை உள�ளிடவ�ம�"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:266
 msgid "User canceled operation."
 msgstr "செயலை பயனீட�டாளர� ரத�த� செய�த�விட�டார�"
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:660
 msgid "No destination address provided, forward of the message has been cancelled."
 msgstr "இலக�க� ம�கவரி �த�ம� தர வில�லை. செய�தியை மேலன�ப�ப�தல� இரத�த� செய�யப�பட�டத�"
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:666
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "பயன�பட�த�த கணக�க� �த�ம� இல�லை. செய�தியை மேலன�ப�ப�தல� இரத�த� செய�யப�பட�டத�"
 
-#: ../mail/mail-tools.c:123
-#, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "ச�ர�ள� அடைவை உர�வாக�க ம�டியவில�லை`%s': %s"
+#: ../mail/mail-tools.c:119, c-format
+msgid "Could not create spool directory '%s': %s"
+msgstr "ச�ர�ள� அடைவை உர�வாக�க ம�டியவில�லை '%s': %s"
 
-#: ../mail/mail-tools.c:153
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "மின�னஞ�சல�களை non-mbox மூலத�திற�க� அன�ப�ப ம�யல�கிறத� `%s'"
+#: ../mail/mail-tools.c:149, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "மின�னஞ�சல�களை non-mbox மூலத�திற�க� அன�ப�ப ம�யல�கிறத� '%s'"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "செய�திகளை அன�ப�ப� - %s "
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "செய�திகளை அன�ப�ப�"
 
-#: ../mail/mail-tools.c:301
-#, c-format
-msgid "Invalid folder: `%s'"
-msgstr "செல�லாத அடைவ�`%s'"
+#: ../mail/mail-tools.c:297, c-format
+msgid "Invalid folder: '%s'"
+msgstr "செல�லாத அடைவ�'%s'"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "தேட� அடைவ�களை அமைக�கிறத� :%s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:229
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s க�கான தேட� அடைவ�களை மேம�பட�த�த�கிறத�:%s'"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:236
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr " '%s' க�கான  தேட� அடைவ�களை �ற�ற�கிறத�"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:679
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The Search Folders \"%s\" have been updated, because they used just removed "
+"folder\n"
+"\"%s\"."
+msgstr[0] ""
+"பின� வர�ம� தேட�தல�  அடைவ�\n"
+"%s மேம�பட�த�தப�பட�டத�. காரணம� அத� சமீபத�தில� நீக�கிய அடைவை பயன�பட�த�தியத�.\n"
+"\"%s\"."
+msgstr[1] ""
+"பின� வர�ம� தேட�தல�  அடைவ�கள�\n"
+"%s மேம�பட�த�தப�பட�டன. காரணம� அவை சமீபத�தில� நீக�கிய அடைவை பயன�பட�த�தின.\n"
+"\"%s\"."
+
+#: ../mail/mail-vfolder.c:1191
 msgid "Edit Search Folder"
 msgstr "தேட� அடைவை தொக�"
 
-#: ../mail/mail-vfolder.c:1265
+#: ../mail/mail-vfolder.c:1296
 msgid "New Search Folder"
 msgstr "ப�திய தேடல� அடைவ�"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "\"க�ப�பைக�க� சோதி\" தோல�வியடைந�த த�"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "\"எரிதங�கள�க� சோதி\" தோல�வியடைந�தத�"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "\"க�ப�பை இல�லை என அறிவி\" தோல�விய�ற�றத�"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "அடைவ� \"{0}\"  �ற�கெனவே உள�ளத� தயவ� செய�த� வேற� பெயர� இடவ�ம�."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "அடைவ�\"{1}\"  �ற�கெனவே உள�ளத� தயவ� செய�த� வேற� பெயர� இடவ�ம�."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -12903,19 +12896,19 @@ msgstr ""
 "நீங�கள� இந�த அடவை உதசீனப�பட�த�தலாம�, அடைவின� மேலெழ�தலாம�, அல�லத� அடக�கத�தை கூட�டலாம� அல�லத� "
 "வெளியேறலாம�."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
 msgstr "படித�ததற�க� இரசீத� \"{1}\" க�க� கேட�கப�பட�கிறத�. {0} க�க� இரசீத� அன�ப�பவா?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr " \"{0}\" பெயர�டன� பின�னூட�டம� �ற�கெனவே உள�ளத� தயவ� செய�த� வேற� பெயர� இடவ�ம�."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -12923,115 +12916,103 @@ msgstr ""
 "பொர�ள� தறக�கூடிய தலைப�பை நீங�கள� அன�ப�ப�ம� மின�னஞ�சல�க�க� தந�தால� பெற�நர�க�க� உங�கள� மின�னஞ�சல� "
 "பற�றி எளிதாக ப�ரிய�ம�."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 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:13
 msgid "Are you sure you want to delete this account?"
 msgstr "இந�த கணக�கை அவசியம� நீக�க வேண�ட�மா?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "இந�த கணக�கை செய�லிழக�கச� செய�த� மற�ற�ம� அனைத�த� பதிலாளைய�ம� அவசியம� நீக�க வேண�ட�மா?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "செய�திகள� {0} � உடனே அவசியம�  திறக�க வேண�ட�மா ?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 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:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr "இந�த \"{0}\"  அடைவில� உள�ள நீக�கப�பட�ட செய�திகளை நிரந�தரமாக அழிக�க விர�ப�பமா?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "ஹெச�டிஎம�எல�  வடிவத�தில� அன�ப�ப விர�ம�ப�கிறீர�களா?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "செல�ல�படியாகாத ம�கவரிய�டன� ஒர� செய�தியை அன�ப�ப விர�ம�ப�கிறீர�களா?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "செல�ல�படியாகாத ம�கவரிகள�டன� ஒர� செய�தியை அன�ப�ப விர�ம�ப�கிறீர�களா?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "மறைநகலாக மட�ட�மே இந�த செய�தியை அன�ப�ப விர�ம�ப�கிறீர�களா?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "தலைப�ப� இல�லாமல� மின�னஞ�சல� அன�ப�ப விர�ப�பமா?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "�னெனில� \"{0}\"."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "�னெனில� \"{2}\"."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "வெற�மையான கையொப�பம�"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "\"{0}\" தேடல� அடைவை சேர�க�க ம�டியவில�லை"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "அடைவ� \"{0}\". � \"{1}\". க�க� நகல� எட�க�க ம�டியவில�லை"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "அடைவ�  \"{0}\"  � உர�வாக�க ம�டியவில�லை"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "தற�காலிக சேமி அடைவை உர�வாக�க ம�டியவில�லை"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "சேமிக�க அடைவை உர�வாக�க ம�டியவில�லை. �னெனில� \"{1}\";"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "அடைவ� \"{0}\" � நீக�க ம�டியவில�லை"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "\"{0}\" கணினி அமைப�ப� அடைவை நீக�க ம�டியவில�லை"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "தேட� அடைவ� \"{0}\" � திர�த�த ம�டியவில�லை. �னெனில� அத� இர�ப�பில� இல�லை."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "அடைவ� \"{0}\" � \"{1}\" க�க� நகர�த�த ம�டியவில�லை"
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
 msgstr "மூலம� \"{1}\" � திறக�க ம�டியவில�லை"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "மூலம� \"{2}\" � திறக�க ம�டியவில�லை"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "இலக�க� \"{2}\" � திறக�க ம�டியவில�லை"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13039,35 +13020,31 @@ msgstr ""
 "நிற�வல� பிரச�சினையால�  \"{0}\"; அன�மதி கோப�பை படிக�க இயலவில�லை.  அன�மதி  கோப�பை "
 "படிக�க�ம� வரை  நீங�கள� இந�த தர�வியை பயன�பட�த�த இயலாத�."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" க�க� \"{1}\" ஆக மாற�ற�ப�பெயர� இட ம�டியவில�லை"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "கணினி அமைப�ப� அடைவ�  \"{0}\" க�க� மாற�ற�ப�பெயர� இடவோ அல�லத� நகர�த�தவோ ம�டியவில�லை"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "கணக�கில� மாற�றம� செய�ய ம�டியாத�."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "அடைவ� \"{0}\" க�க� சேமிக�க இயலாத�"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "கோப�ப� \"{0}\" க�க� சேமிக�க இயலாத�."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "கையெழ�த�த� ஸ�கிரிப�ட� \"{0}\" � அமைக�க ம�டியாத�."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "தேவையற�ற க�ப�பைக�க� சோதிக�கவ�ம�."
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13075,79 +13052,88 @@ msgstr ""
 "கடவ�ச�சொல� சரியாக உள�ளிடப�பட�டதா என  சோதிக�கவ�ம�. பல கடவ�ச�சொற�கள� நிலை உணர�வ� கொண�டவை "
 "என�பதை நினைவ� கொள�க. உயர� நிலை விசை செய�ல�பட�த�தப�ப�ட�ட� இர�க�கலாம�."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "பின�னூட�ட கோப�பை சேமிக�க ம�டியாத�"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "தேடல� அடைவ�  \"{0}\" இல�  உள�ள  செய�திகளை நீக�கவா?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Do not d_elete"
 msgstr "_e நீக�காதே"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "அழிக�க வேண�டாம�"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "செயல� நீக�காதே"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "தொடர�பில�லாத நிலை பயன�க�க� க�றித�த அடைவ�களை உள�ளமை ஒத�திசைவ� செய�ய வேண�ட�மா?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "அனைத�த� செய�திகளைய�ம� படித�ததாக க�றிக�க வேண�ட�மா?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "மாற�றங�களை சேமிக�க வேண�ட�மா?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "கடவ�ச�சொல�லை உள�ளிடவ�ம�"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "வடிகட�டி க�றிப�பை �ற�ற�ம�போத� பிழை"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "செயல�பட�ம� போத� பிழை"
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "{0}.போத� பிழை"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "கோப�ப� �ற�கெனவே உள�ளத� மேலெழ�த ம�டியாத�."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "கோப�ப� உள�ளத� ஆனால� இயல�பான கோப�ப� இல�லை"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "தொடந�தால�, உங�களால� செய�தி எதைய�ம� மீட�க ம�டியாத�."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
-msgstr "இந�த அடைவை நீக�கினால� இதில� உள�ள அனைத�த� கோப�ப�கள�ம� உப அடைவ�கள�ம� நீக�கப�பட�ம�."
+msgstr ""
+"இந�த அடைவை நீக�கினால� இதில� உள�ள அனைத�த� உள�ளடக�கங�கள�ம� உப அடைவ�களின� உள�ளடக�கங�கள�ம� "
+"நீக�கப�பட�ம�."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
+msgid "If you delete the folder, all of its contents will be deleted permanently."
+msgstr "இந�த அடைவை நீக�கினால� இதில� உள�ள அனைத�த� உள�ளடக�கங�கள�ம� நீக�கப�பட�ம�."
+
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "தொடர�ந�தால� அனைத�த� பதிலாள� கணக�க�கள�ம� நிரந�தரமாக நீக�கப�பட�ம�."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13155,33 +13141,33 @@ msgstr ""
 "தொடர�ந�தால� கணக�க� விவரங�கள�ம� அனைத�த�\n"
 "பதிலாள� விவரங�கள�ம� நிரந�தரமாக நீக�கப�பட�ம�."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "தொடர�ந�தால�, இந�த கணக�க� தகவல�கள� நிரந�தரமாக நீக�கப�பட�ம�"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "வெளியேறினால� எவல�யூஷன� மீண�ட�ம� த�வங�க�ம� வரை இந�த செய�தி அன�ப�பப�படாமல� இர�க�க�ம�."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "தவிர�"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "செல�லாத அன�மதி ம�றைமை"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "அஞ�சல� நீக�கல� தோல�விய�ற�றத�"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "மின�னஞ�சல� வடிகட�டி தானாக மேம�பட�த�தப�பட�டத�"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13192,27 +13178,27 @@ msgstr ""
 "தலைப�பை பயன�பட�த�த�ம�. இந�த தலைப�பை தேர�வ� செய�தால� நீங�கள� மின�னஞ�சல� அன�ப�பியவர�களில� பட�டியல� "
 "தெரிய�ம�. இதை தவிர�க�க ஒர� பெற�நர� ம�கவரி மற�ற�ம� ஒர� கரிநகல� ம�கவரியை உள�ளிடவ�ம�."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "அடைவை காணவில�லை"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "மூலம� எத�வ�ம� தேர�வ� செய�யப�படவில�லை"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "Opening too many messages at once may take a long time."
 msgstr "ஒரே நேரத�தில� பல செய�திகளை திறக�க�ம� போத� நீண�ட நேரம� எட�க�க�ம�."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "Please check your account settings and try again."
 msgstr "உங�கள� கணக�க� அமைவ�களை சரிபார�த�த� மீண�ட�ம� ம�யற�சி செய�யவ�ம�."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please enable the account or send using another account."
 msgstr "கணக�கினை செயல�பட�த�தவ�ம� அல�லத� வேற� கணக�க� மூலம� அன�ப�பவ�ம�."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 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."
@@ -13220,7 +13206,7 @@ msgstr ""
 "பெற�நர� ப�லத�தில� சரியான மின�னஞ�சல� ம�கவரியை உள�ளிடவ�ம�. பெற�நர� ப�லத�தின� மேல� க�ளிக� "
 "செய�த� ம�கவரியை தேடலாம�."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13230,59 +13216,55 @@ msgstr ""
 "உற�திப�பட�த�திக�கொள�ளவ�ம�. ஹெச�டிஎம�எல�  மின�னஞ�சல�:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "இந�த கையெழ�த�த�க�க� தயவ� செய�த� தனிப�பட�ட பெயர� தர�க"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "காத�திர�க�கவ�ம�."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "பழைய மின�னஞ�சல� அடைவ� \"{0}\" �  நகர�த�த�வதில� சிக�கல� ."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ஆதரவ�ள�ள உண�மைப�பட�த�தல� இயக�க பட�டியல�க�க� வழங�கனை விசாரிக�கிறத�."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "படித�த இரசீத� கேட�கப�பட�கிறத�."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "உண�மையாகவே \"{0}\" அடைவைய�ம� உப அடைவ�களைய�ம� அழிக�க வேண�ட�மா?"
 
-#: ../mail/mail.error.xml.h:86
-msgid "Report Junk Failed"
-msgstr "க�ப�பை அறிக�கை செயல� தோல�விய�ற�றதாக சொல�"
-
-#: ../mail/mail.error.xml.h:87
-msgid "Report Not Junk Failed"
-msgstr "க�ப�பை இல�லை அறிக�கை செயல� தோல�விய�ற�றதாக சொல�."
-
 #: ../mail/mail.error.xml.h:88
+msgid "Really delete folder \"{0}\"?"
+msgstr "உண�மையாகவே \"{0}\" அடைவை அழிக�க வேண�ட�மா?"
+
+#: ../mail/mail.error.xml.h:89
 msgid "Search Folders automatically updated."
 msgstr "தேட�ம� அடைவ�கள� தானாக மேம�பட�த�தப�பட�டத�"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "ரசீத� அன�ப�ப�"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "கையொப�பம� �ற�கனவே உள�ளத�"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "ஒத�திசைவ�"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "வலை தொடர�பில�லாத பயன�க�க� அடைவ�களை ஒத�திசைவ� செய�யவா?"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13290,7 +13272,7 @@ msgstr ""
 "எவல�யூஷன� சரியாக வேலை செய�ய கணினி அமைப�ப� அடைவ�கள� தேவை. அவற�றை மற�பெயரிட, நகர�த�த "
 "அல�லத� நீக�க இயலாத�."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13305,35 +13287,7 @@ msgstr ""
 "தலைப�பை பயன�பட�த�த�ம�. இந�த தலைப�பை தேர�வ� செய�தால� நீங�கள� மின�னஞ�சல� அன�ப�பியவர�களில� பட�டியல� "
 "தெரிய�ம�. இதை தவிர�க�க ஒர� பெற�நர� ம�கவரி மற�ற�ம� ஒர� கரிநகல� ம�கவரியை உள�ளிடவ�ம�."
 
-#: ../mail/mail.error.xml.h:97
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"கீழ�கண�ட தேட�ம� அடைவ�(கள�):\n"
-"{0}\n"
-"தற�போத� நீக�கப�பட�ட அடைவ�களை பயன�பட�த�த�கிறத�:\n"
-"    \"{1}\"\n"
-"மேல�ம� மேம�பட�த�தப�பட�கிறத�."
-
-#: ../mail/mail.error.xml.h:102
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"கீழ�கண�ட வடிப�பி விதிம�றை(கள�):\n"
-"{0}\n"
-"தற�போத� நீக�கிய அடைவ�களை பயன�பட�த�த�கிறத�\n"
-"    \"{1}\"\n"
-"மற�ற�ம� மேம�பட�த�தப�பட�கிறத�."
-
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13341,7 +13295,7 @@ msgstr ""
 "பின� வர�ம� பெற�னர� செல�ல�படியாக�ம� மின�னஞ�சல� ம�கவரியாக காணப�படவில�லை:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13349,11 +13303,11 @@ msgstr ""
 "பின� வர�ம� பெற�னர�கள� செல�ல�படியாக�ம� மின�னஞ�சல� ம�கவரிகளாக காணப�படவில�லை:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "நிரல� கோப�ப� இர�க�க வேண�ட�ம� மற�ற�ம� இயக�கப�பட வேண�ட�ம�"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13361,17 +13315,17 @@ msgstr ""
 "அடைவ� கர�த�த� தொக�கி சேர�க�கப�பட�ட� இர�க�கலாம�. \n"
 "தேவையானால� தேட�தல� அடைவ� திர�த�திக�க� சென�ற� தெளிவாக சேர�க�கவ�ம�."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "நீங�கள� தேர�ந�தெட�த�த கணக�க� செயல�பட�த�தப�படவில�லை, எனவே செய�தியை அன�ப�ப ம�டியாத�"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:106
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "பெற�நர�கள� ம�கவரி க�றிப�பிடப�படவில�லை, எனவே செய�தியை அன�ப�ப ம�டியாத�"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13379,11 +13333,11 @@ msgstr ""
 "இந�த சேவையகம�  இத� போன�ற அன�மதி ம�றைக�க� ஆதரவ� தராத� அல�லத� எந�த  அன�மதி ம�றைக�க�ம� "
 "ஆதரவ� இல�லை."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "இந�த கையொப�பம� மாற�றப�பட�ட த� ஆனால� சேமிக�கப�படவில�லை"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13391,29 +13345,29 @@ msgstr ""
 "இத� தேர�ந�தெட�க�கப�பட�ட அடைவ� மற�ற�ம� அதன� த�ணை அடைவ�களில� அனைத�த� செய�திகளைய�ம� "
 "படித�ததாக க�றிக�க�ம�."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "க�ரூப�வைஸ� சேவையகத�தினை இணைக�க ம�டியவில�லை."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "இந�த கணக�கிற�க� வரைவ� அடைவை திறக�க ம�டியவில�லை கணினி வரைவ� அடைவை பயன�பட�த�த வேண�ட�மா?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "அங�கீகார கோப�பினை படிக�க ம�டியவில�லை."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "(_D)இயல�பானதை பயன�பட�த�த�"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "இயல�பான வரைவ� அடைவை பயன�பட�த�தவா?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13422,31 +13376,31 @@ msgstr ""
 "எச�சரிக�கை: ஒர� தேடல� அடைவிலிர�ந�த� செய�திகளை நீக�க�வத� உண�மையில� உங�கள�டைய \n"
 " இன�னொர� உள�ளமை / தொலை அடைவிலிர�ந�த� செய�திகளை நீக�க�ம�.  இதை நிச�சயம� செய�ய வேண�ட�மா?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:117
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "நீங�கள�  இந�த அஞ�சலை நீக�க தேவையான அன�மதி இல�லை."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:118
 msgid "You have not filled in all of the required information."
 msgstr "தேவையான அனைத�த� தகவல�களைய�ம� உள�ளிடவ�ம�"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:119
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "அன�ப�பாத செய�தி உள�ளத�, வெளியேற விர�ப�பமா?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:120
 msgid "You may not create two accounts with the same name."
 msgstr "ஒரே பெயரில� இரண�ட� கணக�க�களை உர�வாக�க ம�டியாத�"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "நீங�கள� இந�த தேட�ம� அடைவிற�க� பெயரிட வேண�ட�ம�."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "அடைவின� பெயரை க�றிப�பிட வேண�ட�ம�"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13456,115 +13410,111 @@ msgstr ""
 "அடைவை தனியாக தேர�வ� செய�தோ மற�ற�ம�/அல�லத� அனைத�த� உள� அடைவ�களைய�ம�, தொலை அடைவ�களைய�ம� "
 "அல�லத� அனைத�தைய�ம� தேர�வ� செய�தோ க�றிப�பிடலாம�."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:125
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr " \"{0}\" சேவையகத�தில� \"{0}\" ஆக உள� அன�மதி  உங�கள�க�க� மற�க�கப�பட�டத�."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "(_A)பின� எழ�த�"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "(_D)மாற�றத�தை நிராகரி"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:128
 msgid "_Do not Synchronize"
 msgstr "_ஒத�திசைவ� செய�யாதே"
 
-#: ../mail/mail.error.xml.h:138
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:821
 msgid "_Empty Trash"
 msgstr "(_E)க�ப�பை தொட�டியை காலி செய�"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "(_E)அழிக�கவ�ம�"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "செய�திகளை திற (_O)"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1107
 msgid "Unseen"
 msgstr "பார�க�காத"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1108
 msgid "Seen"
 msgstr "பார�த�த"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1109
 msgid "Answered"
 msgstr "பதிலளி க�கப�பட�டத�"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1110
 msgid "Forwarded"
 msgstr "மேலன�ப�பப�பட�டத�"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1111
 msgid "Multiple Unseen Messages"
 msgstr "பார�காத பல செய�திகள�"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1112
 msgid "Multiple Messages"
 msgstr "பல செய�திகள�"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1116
 msgid "Lowest"
 msgstr "க�றைவான"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1117
 msgid "Lower"
 msgstr "க�றைந�த"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1121
 msgid "Higher"
 msgstr "உயர�ந�த"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1122
 msgid "Highest"
 msgstr "உயரமான"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1732 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1739 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "இன�ற� %l:%M %p"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1748
 msgid "Yesterday %l:%M %p"
 msgstr "நேற�ற� %b %d %l:%M %p"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1760
 msgid "%a %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1768
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1770
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2515
 msgid "Select all visible messages"
 msgstr "ப�லப�பட�ம� அனைத�த� செய�திகளைய�ம� தேர�வ� செய�யவ�ம�"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:652
-msgid "Shell Backend"
-msgstr "ஷெல� பின�இயக�கி"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4887
+#: ../mail/message-list.c:4196 ../mail/message-list.c:4592
 msgid "Generating message list"
 msgstr "செய�தி பட�டியலை உர�வாக�க�கிறத�"
 
-#: ../mail/message-list.c:4722
+#: ../mail/message-list.c:4429
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13572,15 +13522,7 @@ msgstr ""
 "உங�கள� தேடல� க�றிப�ப�கள�க�க� �ற�ற செய�தி �த�ம� இல�லை. தேடலை Search->Clear menu item "
 "கட�டளையால� நிற�த�த�.  அல�லத� அதை மாற�ற�க."
 
-#: ../mail/message-list.c:4724
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"இந�த  அடைவில� மறைந�த�ள�ள செய�திகள� மட�ட�மே உள�ளன. அவற�றை காட�ட காட�சி-> மறைந�த�ள�ள "
-"செய�திகளை காட�ட� பயன�பட�த�த�க."
-
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4431
 msgid "There are no messages in this folder."
 msgstr "இந�த அடைவில� எந�த செய�திய�ம� இல�லை."
 
@@ -13618,27 +13560,27 @@ msgid "Subject - Trimmed"
 msgstr "பொர�ள� கட�டான "
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Body contains"
 msgstr "உள�ளடக�கத�தில�"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Message contains"
 msgstr "செய�தியில� உள�ளத�"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Recipients contain"
 msgstr "பெற�பவரில� உள�ளத�"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1294
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Sender contains"
 msgstr "அன�ப�பியவரில� உள�ளத�"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Subject contains"
 msgstr "தலைப�பில� உள�ளத�"
 
@@ -13672,15 +13614,15 @@ msgstr ""
 "இணைப�ப� பாத�காப�பாக இர�க�காத�. தேவையற�ற மென�பொர�ள�கள� உங�கள� கணினியை தாக�க�ம� வாய�ப�ப� "
 "உள�ளத�."
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "_B பிறந�த நாள� & ஆண�ட� நாள� நாட�காட�டியில� பயன�பட�த�த�"
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "_s பிறந�த நாள� & ஆண�ட� நாள� நாட�காட�டியில� பயன�பட�த�த�"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "(_b) இணைப�பில� இல�லாமல� பணிப�ரிய ப�த�தக உள�ளடக�கங�களை நிலைவட�டில� நகலெட� "
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -13690,7 +13632,7 @@ msgstr ""
 "த�ளையின� பட�டியல� உள�ளத�. நீங�கள� எந�த த�ளையை பயன�பட�த�த வேண�ட�ம� என�பதை உங�கள� கணினி "
 "நிர�வாகியிடம� கேட�ட� தெரிந�த�கொள�ள�ங�கள�.� "
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13699,7 +13641,7 @@ msgstr ""
 "எவல�யூஷன� உங�களை அன�மதிக�க பயன�பட�த�த�ம� ம�றை. இதை \"Email Address\"அமைக�க LDAP "
 "சேவையகத�திற�க� யார�வேண�ட�மானால�ம� அண�க�வதற�கான பெயரில�லா அன�மதியை தரவேண�ட�ம�."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -13710,29 +13652,29 @@ msgstr ""
 "க�றிப�பிட�ம�. \"sub\" இன� எல�லை கீழ�கண�ட பாதைகளில� தேட�ம�. \"one\" ஒரே ஒர� மட�டத�தில� "
 "மட�ட�ம� தேடல� பணியை செய�ய�ம�."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "சேவையக தகவல�"
 
-#: ../modules/addressbook/addressbook-config.c:996
+#: ../modules/addressbook/addressbook-config.c:1016
 #: ../smime/gui/smime-ui.ui.h:14
 msgid "Details"
 msgstr "விவரம�"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "தேட�கிறத�"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "பதிவிறக�க�கிறத�"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "ம�கவரி ப�த�தகத�தின� பண�ப�கள�"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "ப�திய ம�கவரிப�ப�த�தகம�"
 
@@ -13812,9 +13754,11 @@ msgstr "தானியஙà¯�கியாக பூரà¯�தà¯�தியான à
 msgid "Whether to show the preview pane."
 msgstr "ம�ன�பார�வை பலகத�தை காட�ட� வேண�ட�மா."
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "அட�டவணை பத�தி"
+#: ../modules/mail/em-mailer-prefs.c:1158
+msgid "_Table column:"
+msgstr "_T அட�டவணை பத�தி:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -13826,7 +13770,7 @@ msgstr "(_s) எபà¯�போதà¯�à®®à¯� தானியஙà¯�கி பூரà¯
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "எல�டி�பி(LDAP) சேவகனில�"
 
@@ -13837,7 +13781,7 @@ msgid "_Contact"
 msgstr "தொடர�ப� (_C)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "ப�திய தொடர�ப�களை உர�வாக�க�"
 
@@ -13848,7 +13792,7 @@ msgid "Contact _List"
 msgstr "தொடர�ப� பட�டியல� (_L)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "ப�திய தொடர�ப� பட�டியலை உர�வாக�க�"
 
@@ -13859,7 +13803,7 @@ msgid "Address _Book"
 msgstr "ம�கவரி ப�த�தகம� (_B)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "ப�திய ம�கவரி ப�த�தகத�தை உர�வாக�க�"
 
@@ -13867,337 +13811,233 @@ msgstr "ப�திய ம�கவரி ப�த�தகத�தை உர
 #: ../modules/addressbook/e-book-shell-backend.c:376
 #: ../modules/addressbook/e-book-shell-view.c:394
 #: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "தொடர�ப�கள�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "மூலம� பட�டியல�"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "ம�கவரி ப�த�தகங�களின� காப�பகம� "
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "தற�போதைய காட�சி"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "நடப�ப� தேர�வில� உள�ள  ம�கவரி  ப�த�தக காட�சி "
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "ம�ன�கண�ட தொடர�ப�"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "ம�ன�பார�வை பலகத�தில� காட�டப�பட�ம� தொடர�ப�"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:688
-msgid "Preview is Visible"
-msgstr "ம�ன�பார�வை தெரிகிறத�"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Whether the preview pane is visible"
-msgstr "ம�ன�பார�வை பலகத�தை காட�ட� வேண�ட�மா."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "எல�டி�பி(LDAP) சேவையகம� களில�"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "தானியங�கி ம�டிக�க�ம� அமைப�ப�கள�"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-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 ""
-"எவல�யூஷன� தொடர�ப�கள� அடைவில� இடம� மற�ற�ம� அடைவை நிலை எவல�யூஷன� 1.x. இல� உள�ளத� போல� "
-"இல�லாமல� இப�போத� மாற�றப�பட�ட�ள�ளத� .\n"
-"\n"
-"எவல�யூஷன� உங�கள� அடைவ�களை இடம� பெயர�க�க�ம� வரை காத�திர�க�கவ�ம�..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"மின�னஞ�சல� பட�டியலின� அமைப�ப� மாறிவிட�டத�.\n"
-"\n"
-"எவல�யூஷன� உங�கள� அடைவை இடம�பெயர�க�க�ம� வரை காத�திர�க�கவ�ம�..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"தொலைபேசி எண�களை சேமிக�க�ம� விதம� மாற�றப�பட�டத�.\n"
-"\n"
-"எவல�யூஷன� உங�கள� அடைவை இடம�பெயர�க�க�ம� வரை காத�திர�க�கவ�ம�..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"எவல�யீஷனில� கையடக�க கணினி தகவல� ஒத�திசைத�தல� மற�ற�ம� தகவல� க�றித�தலில� மாற�றங�கள� "
-"நிகழ�ந�த�ள�ளத�.\n"
-"\n"
-"எவல�யூஷன� உங�கள� கையடக�க கணினி தகவல� ஒத�திசைதல� இடம�பெயர�க�க�ம� வரை காத�திர�க�கவ�ம�..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:756
-#: ../modules/calendar/e-memo-shell-sidebar.c:682
-#: ../modules/calendar/e-task-shell-sidebar.c:682
-msgid "Source Selector Widget"
-msgstr "க�றிப�ப� மூல தேர�வாளர�"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "இந�த க�ற�நிரல� ம�கவரி ப�த�தகங�களின� க�ழ�க�களை காட�ட�கிறத�"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "விகார�ட� என சேமி"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "அனைத�த� தொடர�ப�களைய�ம� நகலெட�... (_p)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "தேர�ந�தெட�க�கப�பட�ட ம�கவரி ப�த�தகத�தில� உள�ள தொடர�ப�களை வேற� ஒன�ற�க�க�  நகல� எட�க�கவ�ம�."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "ம�கவரிப�ப�த�தகத�தை அழி (_e)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "தேர�ந�தெட�த�த ம�கவரி ப�த�தகத�தை அழி"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "அனைத�த� தொடர�ப�களைய�ம� நகர�த�த�... (_v)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "தேர�ந�தெட�க�கப�பட�ட ம�கவரி ப�த�தகத�தில�  உள�ள தொடர�ப�களை வேற� ஒன�ற�க�க�  நகர�த�தவ�ம�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "_N ப�திய ம�கவரிப�ப�த�தகம�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "ம�கவரி ப�த�தக பண�ப�கள� (_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "தேர�ந�தெட�த�த ம�கவரி ப�த�தகத�தின�  பண�ப�களை காட�ட�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
-#: ../modules/calendar/e-task-shell-view-actions.c:747
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/mail/e-mail-shell-view-actions.c:905
 msgid "_Rename..."
 msgstr "(_R)மற�பெயரிட�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "தேர�ந�தெட�க�கப�பட�ட ம�கவரி ப�த�தகத�தை மற�பெயரிட�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "_a ம�கவரிப�ப�த�தகத�தை விகார�ட� ஆக சேமி"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "தேர�ந�தெட�க�கப�பட�ட ம�கவரி ப�த�தகத�தின�  தொடர�ப�களை வீகார�ட� ஆக சேமிக�கவ�ம�."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "�ற�ற�வதை நிற�த�த�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "_C தொடர�ப�களை இங�க� நகல� எட�க�கவ�ம�..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "தேர�ந�தெட�க�கப�பட�ட தொடர�ப�களை வேற� ம�கவரி ப�த�தகத�த�க�க�  நகல� எட�க�கவ�ம�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "தொடர�ப�களை அழி (_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "(_F)தொடர�பில� தேட�..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "காட�டப�பட�ட தொடர�பில� க�றிப�பிட�ட உரையை தேட�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "(_F)தொடர�பை ரத�த� செய�..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "தேர�வ� செய�யப�பட�ட தொடர�ப�களை மற�றவர�க�க� அன�ப�ப�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "_M தொடர�ப� � இங�க� நகர�த�த�க.."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "தேர�ந�தெட�க�கப�பட�ட தொடர�ப�களை வேற� ம�கவரி ப�த�தகத�த�க�க�  நகர�த�தவ�ம�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "ப�திய தொடர�ப�... (_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "ப�திய தொடர�ப� பட�டியல�... (_L)"
 
 # msgctxt "New"
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "தொடர�பை திற (_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "தற�போதைய தொடர�பை பார�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "(_S)செய�தியை தொடர�ப�கள�க�க� அன�ப�ப�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "ஒர� செய�தியை தேர�வ� செய�த�ள�ளவர�கள�க�க� அன�ப�ப�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-task-shell-view-actions.c:805
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "_Actions"
 msgstr "(_A)செயல�கள�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
-#: ../modules/mail/e-mail-shell-view-actions.c:1088
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "_Preview"
 msgstr "_P ம�ன�பார�வை"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
-#: ../modules/calendar/e-memo-shell-view-actions.c:673
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "_Delete"
 msgstr "_D நீக�க�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "(_P)பண�ப�கள�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "(_S)விகார�ட� ஆக சேமி..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "தொடர�ப� ம�ன�பார�வை (_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "தொடர�ப� ம�ன�காட�சி சாளரத�தை காட�ட�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:730
-#: ../modules/calendar/e-task-shell-view-actions.c:894
-#: ../modules/mail/e-mail-shell-view-actions.c:1183
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Classic View"
 msgstr "_C பழைமையான காட�சி"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "தொடர�ப�கள� பட�டியல� கீழ� தொடர�ப�கள� ம�ன�பார�வையை காட�ட�க"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:737
-#: ../modules/calendar/e-task-shell-view-actions.c:901
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Vertical View"
 msgstr "செங�க�த�த� நிலை காட�சி"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "தொடர�ப� ம�ன�காட�சி சாளரத�தை தொடர�ப�கள� பட�டியல� அர�கில� காட�ட�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1594
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
-#: ../modules/calendar/e-task-shell-view-actions.c:918
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Any Category"
 msgstr "�தாவத� ஒர� வகை"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1608
-#: ../modules/calendar/e-memo-shell-view-actions.c:754
-#: ../modules/calendar/e-task-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
+#: ../modules/calendar/e-memo-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:941
 msgid "Unmatched"
 msgstr "பொர�ந�தவில�லை"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
-#: ../modules/calendar/e-task-shell-view-actions.c:963
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../shell/e-shell-content.c:441
 msgid "Advanced Search"
 msgstr "மேம�பட�ட தேடல�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "காட�டிய அனைத�த� தொடர�ப�களை அச�சடி"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "அச�சடிக�கப�பட வேண�டிய தொடர�ப�களின� ம�ன�பார�வை இட�க"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "தேர�வ� செய�த தொடர�ப�களை அச�சடி"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "விகார�ட� என சேமி..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "தேர�வ� செய�த தொடர�ப�களை விகார�ட� ஆக சேமி."
 
@@ -14241,57 +14081,47 @@ msgstr "தொடர�ப� தகவல�"
 msgid "Contact information for %s"
 msgstr "%sக�க� தொடர�ப� தகவல�"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "அனாமதேயமாக"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "(_r) வரையரை வர�ம� வரை இந�த ப�த�தகத�தை பார�வையிட�"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "_g உள�ந�ழை:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "ஒன�ற�"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "தேட�ம� வடிப�பி"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "_b அடிப�படை தேடல�கள�"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "_f வடிப�பியை தேட�: "
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14300,51 +14130,51 @@ msgstr ""
 "ம�ன�னிர�ப�ப�  தேடல� \"person\" வகை (தனிமனிதன�) ஆகிவிட�ம�."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "பொர�ள�"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "தேடல� அடிப�படைக�கான ஆதரவ�"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "அடையாளம� காண�ம� பெயரை (DN) பயன�பட�த�த�கிறத� "
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "மின�னஞ�சல� ம�கவரியை பயன�பட�த�த�கிறத�"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "(_D)பதிவிறக�க எல�லை:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "(_F)இயன�ற அடிப�படை தேடல� கண�டறி"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "உள� ந�ழைய�ம� ம�றை: (_L)"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "(_P)ம�னையம�:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "(_S)தேடல� எல�லை:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "(_T)கால தாமதம�:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "(_U)பாத�காப�பான இணைப�பை பயன�பட�த�த�:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "அட�டைகள�"
 
@@ -14370,11 +14200,11 @@ msgstr "பணிகள�க�க� இறக�க�மதி செய�
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-migrate.c:176
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "இணையத�தில�"
 
@@ -14384,7 +14214,7 @@ msgid "Weather"
 msgstr "வானிலை"
 
 #: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "பிறந�த நாள� & ஆண�ட� த�வக�க நாள�"
 
@@ -14394,7 +14224,7 @@ msgid "_Appointment"
 msgstr "(_A) சந�திப�ப� �ற�பாட� "
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "ப�திய சந�திப�பை உர�வாக�க�"
 
@@ -14422,46 +14252,18 @@ msgid "Cale_ndar"
 msgstr "(_n)நாள�காட�டி"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "ப�திய நாள�காட�டியை உர�வாக�க�"
 
 #: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2644
+#: ../plugins/itip-formatter/itip-formatter.c:2651
 msgid "Calendar and Tasks"
 msgstr "நாள�காட�டி மற�ற�ம� பணிகள�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "நாட�காட�டிகள� பதிவகம�."
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-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 ""
-"எவல�யூஷன� நாள�காட�டியின� இடம� மற�ற�ம� ம�ன�ன�ரிமை தகவல�கள� மாற�றப�பட�டத� எவல�யூஷன� 1.x.\n"
-"\n"
-"எவல�யூஷன� உங�கள� அடைவ�களை நகர�த�த�ம� வரை காத�திர�க�கவ�ம�"
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "எவல�ஷன�/config.xmldb லிர�ந�த� பழைய அமைப�ப�களை நகர�த�த ம�டியவில�லை"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "`%s' நாள�காட�டியை நகர�த�த ம�டியவில�லை"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:162
-#: ../modules/calendar/e-memo-shell-sidebar.c:157
-#: ../modules/calendar/e-task-shell-sidebar.c:157
+#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14470,35 +14272,16 @@ msgstr ""
 "%s இல� பிழை\n"
 "%s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:221
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
 msgid "Loading calendars"
 msgstr "நாள�காட�டிகள� �ற�றப�பட�கிறன "
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:610
+#: ../modules/calendar/e-cal-shell-sidebar.c:617
 msgid "Calendar Selector"
 msgstr "நாள�காட�டி தேர�வாளர�"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:736
-msgid "Date Navigator Widget"
-msgstr "தேதி உலாவல� க�ற�நிரல�"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:737
-msgid "This widget displays a miniature calendar"
-msgstr "இந�த க�ற�நிரல� ஒர� சிற� நாள�காட�டியை காட�ட�ம�"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:746
-msgid "Default Calendar Client"
-msgstr "ம�ன�னிர�ப�ப� நாள�காட�டி சார�ந�தோன�"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:747
-msgid "Default client for calendar operations"
-msgstr "நாள�காட�டி செயல�கள�க�க� ம�ன�னிர�ப�ப� சார�ந�தோன�"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:757
-msgid "This widget displays groups of calendars"
-msgstr "இந�த க�ற�நிரல� ஒர� தொக�ப�ப�  நாள�காட�டிகளை காட�ட�ம�"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:944
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-cal-shell-sidebar.c:952
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s இல� நாள�காட�டியை திறக�கிறத�"
@@ -14523,302 +14306,302 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "நீக�க வேண�டிய பழைய நிகழ�வ�கள�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:540
+#: ../modules/calendar/e-cal-shell-view-actions.c:534
 msgid "Copying Items"
 msgstr "உர�ப�படிகளை நகலெட�க�கிறத�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:795
+#: ../modules/calendar/e-cal-shell-view-actions.c:796
 msgid "Moving Items"
 msgstr "உர�ப�படிகளை நகர�த�த�கிறத�"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1097
+#: ../modules/calendar/e-cal-shell-view-actions.c:1098
 msgid "event"
 msgstr "நிகழ�வ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1099
+#: ../modules/calendar/e-cal-shell-view-actions.c:1100
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:507
-#: ../modules/calendar/e-task-shell-view-actions.c:624
+#: ../modules/calendar/e-memo-shell-view-actions.c:494
+#: ../modules/calendar/e-task-shell-view-actions.c:612
 msgid "Save as iCalendar"
 msgstr "� நாள�காட�டியாக சேமி"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1229
-#: ../modules/calendar/e-memo-shell-view-actions.c:588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "(_C)நகல�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1236
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "D_elete Calendar"
 msgstr "_e நாள�காட�டியை அழி"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1238
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Delete the selected calendar"
 msgstr "தேர�ந�தெட�க�கப�பட�ட நாள�காட�டியை அழி"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1245
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Go Back"
 msgstr "பின� செல�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1252
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Go Forward"
 msgstr "ம�ன� செல�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1257
-msgid "Select _Today"
-msgstr "(_T)இன�றைய தேதியை தேர�வ� செய�"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "இன�றை தேர�வ� செய�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "(_D)தேதியை தேர�வ� செய�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "க�றிப�பிட�ட தேதியை தேர�வ� செய�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "ப�திய நாள�காட�டி (_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1285
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Purg_e"
 msgstr "(_e)அழி"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Purge old appointments and meetings"
 msgstr "பழைய சந�திப�ப�கள�  மற�ற�ம� கூட�டங�கள� நீக�க�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1292
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Re_fresh"
 msgstr "(_f) ப�த�ப�பி"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Refresh the selected calendar"
 msgstr "தேர�ந�தெட�க�கப�பட�ட நாள�காட�டியை ப�த�ப�பி"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Rename the selected calendar"
 msgstr "தேர�ந�தெட�க�கப�பட�ட நாள�காட�டிக�க�  மற�பெயரிட�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Show _Only This Calendar"
 msgstr "_O இந�த நாள�காட�டியை மட�ட�ம� காட�ட�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Cop_y to Calendar..."
 msgstr "(_y)நாள�காட�டியில� நகலெட�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "பேராளர� சந�திப�ப�... (_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delete Appointment"
 msgstr "_D சந�திப�ப� � நீக�க�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1329
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete selected appointments"
 msgstr "தேர�ந�தெட�க�கப�பட�ட சந�திப�ப�களை நீக�க�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete This _Occurrence"
 msgstr "(_O)இந�த நிகழ�வை நீக�க�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1336
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "இந�த தர�வாயை நீக�க�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete All Occ_urrences"
 msgstr "(_u)எல�லா நிகழ�வ�களைய�ம� நீக�க�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1343
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "அனைத�த� நிகழ�வ�களைய�ம� அழி"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "New All Day _Event..."
 msgstr "(_E)ப�திய எல�லா நாட�கள�க�க�மான நிகழ�வ�கள�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Create a new all day event"
 msgstr "ப�திய ம�ழ� நாள�க�க�மான நிகழ�வை உர�வாக�க�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:581
-#: ../modules/calendar/e-task-shell-view-actions.c:705
+#: ../modules/calendar/e-memo-shell-view-actions.c:568
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "_Forward as iCalendar..."
 msgstr "(_F)� நாள�காட�டியாக அன�ப�ப�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "New _Meeting..."
 msgstr "ப�திய சந�திப�ப� (_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Create a new meeting"
 msgstr "ப�திய சந�திப�பை உர�வாக�க�க"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "(_v)நாள�காட�டிக�க� நகர�த�த�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "(_A)ப�திய நேர ஒத�க�கங�கள�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "(_M)இந�த தர�வாயை நகர�த�தகூடியதாக�க�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "சந�திப�ப�  �ற�பாட�டினை திற (_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "தற�போதைய சந�திப�ப� � பார�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "பதில� (_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "� நாள�காட�டியாக சேமி."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "சந�திப�பினை திட�டமிட�... (_S)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "நேர ஒத�க�கல�களை சந�திப�ப�கள�  ஆக�க�கிறத�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "(_e) நேர ஒத�க�கங�கள� ஆக�க�க..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "சந�திப�ப�களை நேர ஒத�க�கல�கள�  ஆக�க�கிறத�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1549
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+msgid "Quit"
+msgstr "வெளிச�செல�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "நாள�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1551
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "ஒர� நாளை காட�ட�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "பட�டியல�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1558
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "பட�டியலாக காட�ட�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1563
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "மாதம�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1565
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "ஒர� மாதத�தை காட�ட�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1570
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "வாரம�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1572
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "ஒர� வாரத�தை காட�ட�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1579
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Show one work week"
 msgstr "ஒர� வேலை வாரத�தை காட�ட�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "நடப�பில� உள�ள சந�திப�ப� �ற�பாட�கள�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1601
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "அட�த�த 7 நாட�கள� சந�திப�ப� �ற�பாட�கள�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
-#: ../modules/calendar/e-memo-shell-view-actions.c:778
-#: ../modules/calendar/e-task-shell-view-actions.c:977
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Description contains"
 msgstr "விளக�கத�தில�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
-#: ../modules/calendar/e-memo-shell-view-actions.c:785
-#: ../modules/calendar/e-task-shell-view-actions.c:984
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Summary contains"
 msgstr "ச�ர�க�கத�தில�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "இந�த நாள�காட�டியை அச�சடி"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 msgid "Preview the calendar to be printed"
 msgstr "அச�சடிக�கப�பட வேண�டிய நாள�காட�டியில� ம�ன�தோற�றத�தை பார�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1730
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "க�க� செல�"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:505
+#: ../modules/calendar/e-memo-shell-view-actions.c:492
 msgid "memo"
 msgstr "க�றிப�ப�"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
 msgid "New _Memo"
 msgstr "_M ப�திய நினைவூட�டல�"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
 #: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:639
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
 msgid "Create a new memo"
 msgstr "ப�திய நினைவூட�டலை  உர�வாக�க�"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
 msgid "_Open Memo"
 msgstr "நினைவூட�டலை  திற (_O)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:646
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "View the selected memo"
 msgstr "தேர�வ� செய�யப�பட�ட நினைவூட�டலை  பார�வையிட�"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:651
-#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Open _Web Page"
 msgstr "(_W)இணைய பக�கத�தை திற"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:811
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
 msgid "Print the selected memo"
 msgstr "தேர�வ� செய�யப�பட�ட நினைவூட�டலை  அச�சடி"
 
@@ -14827,22 +14610,22 @@ msgstr "தேரà¯�வà¯� செயà¯�யபà¯�படà¯�ட நினைவூà
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:622
+#: ../modules/calendar/e-task-shell-view-actions.c:610
 msgid "task"
 msgstr "பணி"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:684
+#: ../modules/calendar/e-task-shell-view-actions.c:672
 msgid "_Assign Task"
 msgstr "(_A)பணியை ஒத�க�க�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "_Mark as Complete"
 msgstr "(_M)ம�டிவ�ற�றத� என க�றி"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:763
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Mark selected tasks as complete"
 msgstr "தேர�வ� செய�தவைகளை ம�டிந�தவை என க�றி"
 
@@ -14851,39 +14634,39 @@ msgid "_Mark as Incomplete"
 msgstr "ம�டிவ�றாதத� என க�றிக�கவ�ம� (_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:770
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Mark selected tasks as incomplete"
 msgstr "தேர�வ� செய�த பணிகளை ம�டிவ�றாதவை என க�றி"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "New _Task"
 msgstr "ப�திய பணி (_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:777
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Create a new task"
 msgstr "ப�திய பணியை உர�வாக�க�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "_Open Task"
 msgstr "(_O)பணியை திற"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "View the selected task"
 msgstr "தேர�வ� செய�யப�பட�ட பணியை பார�வையிட�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:826
-#: ../modules/calendar/e-task-shell-view-actions.c:1025
+#: ../modules/calendar/e-memo-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "_Save as iCalendar..."
 msgstr "(_S)� நாள�காட�டியாக சேமி.."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:1010
+#: ../modules/calendar/e-task-shell-view-actions.c:998
 msgid "Print the selected task"
 msgstr "தேர�வ� செய�யப�பட�ட பணியை அச�சிட�"
 
@@ -14907,39 +14690,20 @@ msgid "Memo Li_st"
 msgstr "_s க�றிப�ப�களின� பட�டியல�"
 
 #: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:604
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "Create a new memo list"
 msgstr "ஒர� ப�திய க�றிப�ப� பட�டியலை உர�வாக�க�"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "நினைவூட�டல�  பட�டியல�கள�  பதிவகம� "
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "மாதிரி நினைவூட�டல� அட�டவணை "
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:216
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "நினைவூட�டலை  �ற�ற�கிறத�"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:564
+#: ../modules/calendar/e-memo-shell-sidebar.c:571
 msgid "Memo List Selector"
 msgstr "நினைவூட�டல� பட�டியல� தேர�வாளர�"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:672
-msgid "Default Memo Client"
-msgstr "ம�ன�னிர�ப�ப� நினைவூட�டல� சார�ந�தோன�"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:673
-msgid "Default client for memo operations"
-msgstr "நினைவூட�டல�க�க� ம�ன�னிர�ப�ப� சார�ந�தோன�"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:683
-msgid "This widget displays groups of memo lists"
-msgstr "இந�த க�ற�நிரல� நினைவூட�டல� பட�டியல�கள� தொக�ப�பை காட�ட�கிறத�"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:862
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-memo-shell-sidebar.c:870
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s இல� நினைவூட�டலை  திறக�கிறத�"
@@ -14949,75 +14713,75 @@ msgstr "%s இல� நினைவூட�டலை  திறக�கிற
 msgid "Print Memos"
 msgstr "க�றிப�ப�களைஅச�சிட�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:567
+#: ../modules/calendar/e-memo-shell-view-actions.c:554
 msgid "_Delete Memo"
 msgstr "நினைவூட�டலை அழி (_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:574
+#: ../modules/calendar/e-memo-shell-view-actions.c:561
 msgid "_Find in Memo..."
 msgstr "நினைவூட�டலில� கண�ட�பிடி... (_F)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:576
+#: ../modules/calendar/e-memo-shell-view-actions.c:563
 msgid "Search for text in the displayed memo"
 msgstr "காட�டப�பட�ட நினைவூட�டலில� உரையை தேட�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
 msgid "D_elete Memo List"
 msgstr "நினைவூட�டல�களை அழி (_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:597
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "Delete the selected memo list"
 msgstr "தேர�ந�தெட�க�கப�பட�ட நினைவூட�டல� பட�டியலை அழி"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:602
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
 msgid "_New Memo List"
 msgstr "ப�திய நினைவூட�டல� பட�டியல� (_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:618
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "Refresh the selected memo list"
 msgstr "தேர�ந�தெட�க�கப�பட�ட நினைவூட�டல� பட�டியலை ப�த�ப�பி"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:625
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 msgid "Rename the selected memo list"
 msgstr "தேர�ந�தெட�க�கப�பட�ட நினைவூட�டல� பட�டியலை மற�பெயரிட�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:630
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Show _Only This Memo List"
 msgstr "(_o) இந�தப� நினைவூட�ட பட�டியலை மட�ட�ம� காட�ட�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:709
+#: ../modules/calendar/e-memo-shell-view-actions.c:696
 msgid "Memo _Preview"
 msgstr "நினைவூட�டல� _P ம�ன�பார�வை"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:711
+#: ../modules/calendar/e-memo-shell-view-actions.c:698
 msgid "Show memo preview pane"
 msgstr "ம�ன�பார�வை நினைவூட�டல� பலகத�தை காட�ட�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:732
+#: ../modules/calendar/e-memo-shell-view-actions.c:719
 msgid "Show memo preview below the memo list"
 msgstr "நினைவூட�டல� பட�டியல� கீழ� நினைவூட�டல� ம�ன�பார�வையை காட�ட�க"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:739
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
 msgid "Show memo preview alongside the memo list"
 msgstr "நினைவூட�டல� பட�டியல� பக�கத�தில�  நினைவூட�டல� ம�ன�பார�வையை காட�ட�க"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:797
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
 msgid "Print the list of memos"
 msgstr "நினைவூட�டல�கள�  பட�டியலை அச�சிட�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:804
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
 msgid "Preview the list of memos to be printed"
 msgstr "அச�சடிக�க வேண�டிய நினைவூட�டல�கள�  பட�டியலை ம�ன�பார�வையிட�"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:414
+#: ../modules/calendar/e-memo-shell-view-private.c:416
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d க�றிப�ப�"
 msgstr[1] "%d க�றிப�ப�கள�"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:418
-#: ../modules/calendar/e-task-shell-view-private.c:567
+#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-task-shell-view-private.c:569
 #, c-format
 msgid "%d selected"
 msgstr ",%d தேர�வ� செய�யப�பட�டத�"
@@ -15050,56 +14814,20 @@ msgid "Tas_k List"
 msgstr "_k பணிகளின� பட�டியல�"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:728
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "Create a new task list"
 msgstr "ப�திய பணிபட�டியலயை உர�வாக�க�"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "பணி பட�டியல�கள�  பதிவகம� "
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "மாதிரி பணி அட�டவணை "
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-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 ""
-"எவல�யூஷன� பணியின� இடம� மற�ற�ம� ம�ன�ன�ரிமை தகவல�கள� மாற�றப�பட�டத� எவல�யூஷன� 1.x.\n"
-"\n"
-"எவல�யூஷன� உங�கள� அடைவ�களை நகர�த�த�ம� வரை காத�திர�க�கவ�ம�"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "%s' பணியை நகர�த�த ம�டியவில�லை"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:216
+#: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "பணிகளை �ற�ற�கிறத�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:564
+#: ../modules/calendar/e-task-shell-sidebar.c:571
 msgid "Task List Selector"
 msgstr "பணி பட�டியல�  தேர�வாளர�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:672
-msgid "Default Task Client"
-msgstr "ம�ன�னிர�ப�ப� பணி சார�ந�தோன�"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:673
-msgid "Default client for task operations"
-msgstr "பணி செயல�கள�க�க� ம�ன�னிர�ப�ப� சார�ந�தோன�"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:683
-msgid "This widget displays groups of task lists"
-msgstr "இந�த க�ற�நிரல� பணி பட�டியல�கள� தொக�ப�பை காட�ட�கிறத�"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:862
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-task-shell-sidebar.c:870
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s இல� பணியை திறக�கிறத�"
@@ -15109,7 +14837,7 @@ msgstr "%s இல� பணியை திறக�கிறத�"
 msgid "Print Tasks"
 msgstr "பணியை அச�சடி"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:566
+#: ../modules/calendar/e-task-shell-view-actions.c:554
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15121,103 +14849,103 @@ msgstr ""
 "\n"
 "பணிகளை அழிக�க விர�ம�ப�கிறீர�களா?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-view-actions.c:679
 msgid "_Delete Task"
 msgstr "_D பணியை நீக�க�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:698
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "_Find in Task..."
 msgstr "பணியில� கண�ட�பிடி... (_F)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:700
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "Search for text in the displayed task"
 msgstr "காட�டப�பட�ட பணியில�  உரையை தேட�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../modules/calendar/e-task-shell-view-actions.c:700
 msgid "Copy..."
 msgstr "நகலெட�..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../modules/calendar/e-task-shell-view-actions.c:707
 msgid "D_elete Task List"
 msgstr "_e பணி பட�டியலை நீக�க�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:721
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Delete the selected task list"
 msgstr "தேர�ந�தெட�க�கப�பட�ட பணிபட�டியல� � நீக�க�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "_New Task List"
 msgstr "ப�திய பணிபட�டியல� (_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:742
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "Refresh the selected task list"
 msgstr "தேர�ந�தெட�க�கப�பட�ட பணிபட�டியல� � ப�த�ப�பி"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:749
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Rename the selected task list"
 msgstr "தேர�ந�தெட�க�கப�பட�ட பணிபட�டியல� � மற�பெயரிட�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Show _Only This Task List"
 msgstr "(_O) இந�தப� பணி பட�டியலை மட�ட�ம� காட�ட�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:756
 msgid "Mar_k as Incomplete"
 msgstr "ம�டிவ�றாதத� என க�றிக�கவ�ம� (_k)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Delete completed tasks"
 msgstr "ம�டிந�த பணியை நீக�க�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:873
+#: ../modules/calendar/e-task-shell-view-actions.c:861
 msgid "Task _Preview"
 msgstr "பணி ம�ன�பார�வை (_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:875
+#: ../modules/calendar/e-task-shell-view-actions.c:863
 msgid "Show task preview pane"
 msgstr "பணி ம�ன�பார�வை பலகத�தை காட�ட�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:896
+#: ../modules/calendar/e-task-shell-view-actions.c:884
 msgid "Show task preview below the task list"
 msgstr "பணி பட�டியல� கீழ� பணி ம�ன�பார�வையை காட�ட�க"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:903
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 msgid "Show task preview alongside the task list"
 msgstr "பணி பட�டியல� பக�கத�தில� பணி ம�ன�பார�வையை காட�ட�க"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Active Tasks"
 msgstr "நடப�பில� உள�ள பணிகள�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:925
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Completed Tasks"
 msgstr "நிறைவேறிய பணிகள�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:932
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Next 7 Days' Tasks"
 msgstr "அட�த�த 7 தினங�களின� பணிகள�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:939
+#: ../modules/calendar/e-task-shell-view-actions.c:927
 msgid "Overdue Tasks"
 msgstr "நில�வை பணிகள�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:934
 msgid "Tasks with Attachments"
 msgstr "இணைப�ப�கள� உடன� பணிகள�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:996
+#: ../modules/calendar/e-task-shell-view-actions.c:984
 msgid "Print the list of tasks"
 msgstr "பணி பட�டியலை அச�சடி"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1003
+#: ../modules/calendar/e-task-shell-view-actions.c:991
 msgid "Preview the list of tasks to be printed"
 msgstr "அச�சடிக�க வேண�டிய பணிகள� பட�டியலை ம�ன�பார�வையிட�"
 
-#: ../modules/calendar/e-task-shell-view-private.c:461
+#: ../modules/calendar/e-task-shell-view-private.c:463
 msgid "Expunging"
 msgstr "அழிக�கவ�ம�"
 
-#: ../modules/calendar/e-task-shell-view-private.c:563
+#: ../modules/calendar/e-task-shell-view-private.c:565
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -15233,402 +14961,370 @@ msgid "Delete Task"
 msgstr "பணியை நீக�க�"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, c-format
 msgid "%d attached messages"
 msgstr "%d  இணைக�கப�பட�ட செய�திகள�"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "எத�வ�மில�லை"
 
 # msgctxt "New"
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:164
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "மின�னஞ�சல� செய�தி (_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:166
 msgid "Compose a new mail message"
 msgstr "ப�திய மின�னஞ�சல� செய�தியை தொக�"
 
 # msgctxt "New"
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:174
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "மின�னஞ�சல� அடைவ� (_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:176
 msgid "Create a new mail folder"
 msgstr "ப�திய மின�னஞ�சல� அடைவை உர�வாக�க�"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Mail Accounts"
 msgstr "மின�னஞ�சல� கணக�க�"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:203
 msgid "Mail Preferences"
 msgstr "மின�னஞ�சல� ம�ன�ன�ரிமை"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgid "Composer Preferences"
 msgstr "தொக�ப�பியின� ம�ன�ன�ரிமை"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:219
 msgid "Network Preferences"
 msgstr "வலை இணைப�ப� ம�ன�ன�ரிமை"
 
-#: ../modules/mail/e-mail-shell-content.c:678
-msgid "Group by Threads"
-msgstr "ப�ரிகளால� க�ழ�வாக�க�"
-
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Whether to group messages by threads"
-msgstr "செய�திகளை ப�ரிகளால� க�ழ�வாக�க�வதா"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:814
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "_D கணக�கினை செயல�நீக�க�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:816
 msgid "Disable this account"
 msgstr "இந�த கணக�கினை செயல�நீக�க�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:823
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "எல�லா அடைவ�களில�ம� உள�ள எல�லா அழித�த செய�திகளைய�ம� நிரந�தரமாக நீக�க�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:828
 msgid "C_reate Search Folder From Search..."
 msgstr "தேடலிர�ந�த� தேட�ம� அடைவை உர�வாக�க�... (_r)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:835
 msgid "_Download Messages for Offline Usage"
 msgstr "(_D) இணைப�ப� விலகி காண செய�திகளை இறக�க�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:837
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "இணைப�ப� விலகி காண என க�றித�த கணக�க�களின� செய�திகள� மற�ற�ம� அடைவ�களை தரவ� இறக�க� "
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:842
 msgid "Fl_ush Outbox"
 msgstr "_u அஞ�சல� வெளிபெட�டியை காலி செய�க"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:849
 msgid "_Copy Folder To..."
 msgstr "அடைவில� நகலெட�... (_C)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:851
 msgid "Copy the selected folder into another folder"
 msgstr "தேர�வ� செய�யப�பட�ட செய�தியை வேற� அடைவ�க�க� நகர�த�த�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:858
 msgid "Permanently remove this folder"
 msgstr "இந�த அடைவினை நிரந�தரமாக நீக�க�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:863
 msgid "E_xpunge"
 msgstr "(_x)அழிக�கவ�ம�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:865
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "இந�த அடைவில� உள�ள நீக�கிய கோப�ப�களை நிரந�தரமாக நீக�க�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:870
 msgid "Mar_k All Messages as Read"
 msgstr "அனைத�த� செய�திகளைய�ம� படித�ததாக க�றி (_k)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:872
 msgid "Mark all messages in the folder as read"
 msgstr "அடைவில� உள�ள அனைத�த� செய�திகள�ம� படித�ததாக க�றி"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:877
 msgid "_Move Folder To..."
 msgstr "_M அடைவை இங�க� நகர�த�த�க"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:879
 msgid "Move the selected folder into another folder"
 msgstr "தேர�ந�தெட�க�கப�பட�ட அடைவை வேற� அடைவ�க�க� நகர�த�த� "
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:884
 msgid "_New..."
 msgstr "ப�திய... (_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:886
 msgid "Create a new folder for storing mail"
 msgstr "அஞ�சல� சேமிக�க ப�திய அடைவ� உர�வாக�க�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:893
 msgid "Change the properties of this folder"
 msgstr "இந�த அடைவின� க�ணங�களை மாற�ற�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:900
 msgid "Refresh the folder"
 msgstr "அடைவை ப�த�ப�பிக�கவ�ம�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:907
 msgid "Change the name of this folder"
 msgstr "இந�த அடைவ�டைய பெயரை மாற�ற�க"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:912
 msgid "Select Message _Thread"
 msgstr "செய�தி சரத�தை  தேர�ந�தெட� (_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:914
 msgid "Select all messages in the same thread as the selected message"
 msgstr "ஒரே இழையில� உள�ள தேர�வ� செய�த எல�லா செய�திகளைய�ம� தேர�வ� செய�யப�பட�டத� என க�றி"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:919
 msgid "Select Message S_ubthread"
 msgstr "செய�தி த�ணை சரத�தை தேர�ந�தெட� (_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:921
 msgid "Select all replies to the currently selected message"
 msgstr "இப�போத� தேர�வ� செய�த செய�தியின� எல�லா பதில�களைய�ம� தேர�வ� செய�க"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:926
 msgid "_Unsubscribe"
 msgstr "(_U) சந�தா நீக�கம�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:928
 msgid "Unsubscribe from the selected folder"
 msgstr "தேர�ந�தெட�க�கப�பட�ட அடைவ�க�க� சந�தா நீகம� செய�க"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:933
 msgid "Empty _Trash"
 msgstr "(_T)க�ப�பை தொட�டியை காலி செய�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:935
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "எல�லா கணக�க�களில�ம� உள�ள எல�லா அழித�த செய�திகளைய�ம� நிரந�தரமாக நீக�க�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:940
 msgid "_New Label"
 msgstr "(_N)ப�திய  விவரச�சீட�ட� "
 
-#: ../modules/mail/e-mail-shell-view-actions.c:988
+#: ../modules/mail/e-mail-shell-view-actions.c:949
 msgid "N_one"
 msgstr "_o எத�வ�மில�லை"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:995
-msgid "Hide _Read Messages"
-msgstr "படித�த செய�திகளை மறை (_R)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Temporarily hide all messages that have already been read"
-msgstr "�ற�கெனவே படித�த செய�திகளை தற�காலிகமாக மறை"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1002
-msgid "Hide S_elected Messages"
-msgstr "தேர�ந�தெட�த�த செய�திகளை மறை (_e)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Temporarily hide the selected messages"
-msgstr "தேர�வ� செய�யப�பட�ட செய�தியை தற�காலிகமாக மறை"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1009
-msgid "Show Hidde_n Messages"
-msgstr "_n மறைத�த செய�திகளை காட�ட�க"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show messages that have been temporarily hidden"
-msgstr "தற�காலிகமாக மறைக�கப�பட�ட செய�திகளை காட�ட�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
+#: ../modules/mail/e-mail-shell-view-actions.c:972
 msgid "Cancel the current mail operation"
 msgstr "தற�போதைய மின�னஞ�சல� செயலை ரத�த� செய�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1037
+#: ../modules/mail/e-mail-shell-view-actions.c:977
 msgid "Collapse All _Threads"
 msgstr "_T அனைத�த� இழைகளைய�ம� க�ற�க�க�க"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:979
 msgid "Collapse all message threads"
 msgstr "அனைத�த�ம� செய�திகள� இழைகளைய�ம� க�ற�க�க�க"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1044
+#: ../modules/mail/e-mail-shell-view-actions.c:984
 msgid "E_xpand All Threads"
 msgstr "அனைத�த� ப�ரிகளைய�ம� விரிவாக�க� (_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:986
 msgid "Expand all message threads"
 msgstr "அனைத�த� செய�தி ப�ரிகளைய�ம� விரிவாக�க�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1051
+#: ../modules/mail/e-mail-shell-view-actions.c:991
 msgid "_Message Filters"
 msgstr "செய�தி வடிப�பிகள� (_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:993
 msgid "Create or edit rules for filtering new mail"
 msgstr "ப�திய மின�னஞ�சலை வடிகட�ட�வதற�கான விதியை உர�வாக�க� அல�லத� திர�த�த�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1058
+#: ../modules/mail/e-mail-shell-view-actions.c:998
 msgid "Search F_olders"
 msgstr "அடைவ�களை தேட� (_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
 msgid "Create or edit search folder definitions"
 msgstr "தேட�தல� அடைவ� வரையரையை உர�வாக�க� அல�லத� திர�த�த�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1065
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
 msgid "_Subscriptions..."
 msgstr "சந�தாக�கள� (_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "தொலை சேவையகங�களில�ள�ள அடைவ�களை சந�தாப�பட�த�த� அல�லத� சந�தாநீக�க�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1074
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
 msgid "F_older"
 msgstr "(_o)அடைவ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1081
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "_Label"
 msgstr "பெயர� (_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1121
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "_New Folder..."
 msgstr "(_N)ப�திய அடைவ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
-msgid "Hide _Deleted Messages"
-msgstr "(_D)அழித�தத�த செய�திகளை மறை"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "செய�திகளில� அடித�த� காட�ட�வதற�க� பதிலாக அவற�றை மறை"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Show Message _Preview"
 msgstr "செய�தி ம�ன�பார�வையை காட�ட�க"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "Show message preview pane"
 msgstr "செய�தி ம�ன�பார�வை பலகத�தை காட�ட�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+msgid "Show _Deleted Messages"
+msgstr "_D நீக�கப�பட�ட செய�திகளை காட�ட�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+msgid "Show deleted messages with a line through them"
+msgstr "அழித�த செய�திகளை அடித�த செய�திகளாக பட�டியலில� காட�ட�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "_Group By Threads"
 msgstr "ப�ரிகளால� க�ழ�வாக�க� (_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Threaded message list"
 msgstr "இழைய�டன� கூடிய செய�தி பட�டியல�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Show message preview below the message list"
 msgstr "செய�திகள� பட�டியல� கீழ� செய�திகள� ம�ன�பார�வையை காட�ட�க"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Show message preview alongside the message list"
 msgstr "செய�திகள� பட�டியல� பக�கத�தில�  செய�திகள� ம�ன�பார�வையை காட�ட�க"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1200
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
 msgid "All Messages"
 msgstr "ம�ழ�மையான செய�திகள�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1207
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
 msgid "Important Messages"
 msgstr "ம�க�கியமான செய�திகள�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1214
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Last 5 Days' Messages"
 msgstr "கடைசி 5 நாட�களின� செய�திகள�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1221
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Messages Not Junk"
 msgstr "பயனற�ற செய�திகள� எத�வ�ம� இல�லை"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1228
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "Messages with Attachments"
 msgstr "இணைப�ப�டன� கூடிய செய�திகள�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1235
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
 msgid "No Label"
 msgstr "விவரச�சீட�ட� இல�லை"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1242
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Read Messages"
 msgstr "படிக�கப�பட�ட செய�திகள�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "Recent Messages"
 msgstr "ப�திதான செய�திகள�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1256
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "Unread Messages"
 msgstr "படிக�கப�படாத  செய�திகள�:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Subject or Addresses contain"
 msgstr "பொர�ள� அல�லத� ம�கவரிகள� இதை கொண�டிர�ந�தால�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1318
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "All Accounts"
 msgstr "அனைத�த� கணக�கீட�கள�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1325
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Current Account"
 msgstr "நடப�பில�ள�ள கணக�கீட�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1332
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Current Folder"
 msgstr "நடப�பில�ள�ள அடைவ� "
 
-#: ../modules/mail/e-mail-shell-view-private.c:889
+#: ../modules/mail/e-mail-shell-view-private.c:880
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " %d தேர�ந�தெட�க�கப�பட�டத�, "
 msgstr[1] " %d தேர�ந�தெட�க�கப�பட�டத�, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:900
+#: ../modules/mail/e-mail-shell-view-private.c:891
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d நீக�கப�பட�டத�"
 msgstr[1] "%d நீக�கப�பட�டத�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:906
-#: ../modules/mail/e-mail-shell-view-private.c:913
+#: ../modules/mail/e-mail-shell-view-private.c:897
+#: ../modules/mail/e-mail-shell-view-private.c:904
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d க�ப�பை"
 msgstr[1] "%d க�ப�பை"
 
-#: ../modules/mail/e-mail-shell-view-private.c:919
+#: ../modules/mail/e-mail-shell-view-private.c:910
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ஆவணம�"
 msgstr[1] "%d ஆவணம�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:925
+#: ../modules/mail/e-mail-shell-view-private.c:916
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d அன�ப�பப�படவில�லை"
 msgstr[1] "%d அன�ப�பப�படவில�லை"
 
-#: ../modules/mail/e-mail-shell-view-private.c:931
+#: ../modules/mail/e-mail-shell-view-private.c:922
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d அன�ப�பப�பட�டத�"
 msgstr[1] "%d அன�ப�பப�பட�டத�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:943
+#: ../modules/mail/e-mail-shell-view-private.c:934
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d படிக�காதத�"
 msgstr[1] "%d படிக�காதத�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:946
+#: ../modules/mail/e-mail-shell-view-private.c:937
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -15647,75 +15343,75 @@ msgstr "கணக�கின� தேடல�"
 msgid "Proxy _Logout"
 msgstr "பதிலாள� வெளியேற� (_L)"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "செயலில� உள�ள"
+
+#: ../modules/mail/em-composer-prefs.c:476
 msgid "Language(s)"
 msgstr "மொழி(கள�)"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "ஒவ�வொர� ம�றைய�ம�"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "ஒவ�வொர� நாள�ம�  ஒர� ம�றை"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "வாரம� ஒர�ம�றை"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "மாதம� ஒர� ம�றை"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:223
 msgid "Add Custom Junk Header"
 msgstr "தனிப�பயன� க�ப�பை தலைப�ப� சேர�"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:231
 msgid "Header Name:"
 msgstr "தலைப�பின� பெயர�:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:232
 msgid "Header Value Contains:"
 msgstr "தலைப�பின� மதிப�பில� உள�ளத�:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:332
 msgid "Header"
 msgstr "தலைப�ப�"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:336
 msgid "Contains Value"
 msgstr "உள�ள மதிப�ப�"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:729 ../modules/mail/em-mailer-prefs.c:800
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s சொர�க�ப�பொர�ள� இர�ப�பில� உள�ளத�. இர�மம� நிற�வப�பட�டத�."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:737 ../modules/mail/em-mailer-prefs.c:809
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s சொர�க�ப�பொர�ள� இர�ப�பில� இல�லை. தயவ� செய�த� நிற�வப�பட�ட பொதியை சோதிக�க."
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:773
 msgid "No junk plugin available"
 msgstr "க�ப�பையகற�ற�ம� சொர�க�ப�பொர�ள� இல�லை "
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "_T அட�டவணை பத�தி:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1160
 msgid "_Date header:"
 msgstr "_D தேதி தலைப�ப�:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1161
 msgid "Show _original header value"
 msgstr "_o மூல தலைப�ப� மதிப�பை காட�ட�க"
 
@@ -15749,14 +15445,8 @@ msgid ""
 "body"
 msgstr "இணைப�ப� நினைவ�ற�த�தி சொர�கிக�க� செய�தியின� உடலில� தேட சாடைகளின� பட�டியல�"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr "இணைப�ப� நினைவ�ற�த�தி சொர�கிக�க� செய�தியின� உடலில� தேட சாடைகளின� பட�டியல�"
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "திறவ�ச� சொற�கள�"
 
@@ -15839,121 +15529,120 @@ msgid "Restore from backup"
 msgstr "இங�கிர�ந�த� மீளமை"
 
 #: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "அமைப�ப�களளை காப�ப� எட�..."
+msgid "_Backup Evolution Settings..."
+msgstr "_B எவலூஷன�  அமைப�ப�களை காப�ப� எட�..."
 
 #: ../plugins/backup-restore/backup-restore.c:355
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "எவல�யூஷன� தரவ� மற�ற�ம� அமைவ�களை ஆர�கைவ� கோப�ப�க�க� பின�சேமிப�ப�  செய�யவ�ம�"
 
 #: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "அமைப�ப�களை மீட�டெட�..."
+msgid "R_estore Evolution Settings..."
+msgstr "_e எவல�யூஷன� அமைப�ப�களை மீட�டெட�..."
 
 #: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "எவல�யூஷன� தரவ� மற�ற�ம� அமைவ�களை ஆர�கைவ� கோப�[இ; இர�ந�த� மீள� அமை செய�யவ�ம�"
 
-#: ../plugins/backup-restore/backup.c:62
+#: ../plugins/backup-restore/backup.c:63
 msgid "Backup Evolution directory"
 msgstr "எவல�யூஷன� அடைவினை பின�சேமிக�கவ�ம�"
 
-#: ../plugins/backup-restore/backup.c:64
+#: ../plugins/backup-restore/backup.c:65
 msgid "Restore Evolution directory"
 msgstr "எவல�யூஷன� அடைவினை மற� சேமிக�கவ�ம�"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:67
 msgid "Check Evolution Backup"
 msgstr "எவல�யூஷன� காப�பை சோதிக�க"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:69
 msgid "Restart Evolution"
 msgstr "எவல�யூஷனை மீண�ட�ம� தொடங�க�"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:71
 msgid "With Graphical User Interface"
 msgstr "வரைகலை பயனர� இடைம�கம� உடன�"
 
-#: ../plugins/backup-restore/backup.c:188
-#: ../plugins/backup-restore/backup.c:250
+#: ../plugins/backup-restore/backup.c:189
+#: ../plugins/backup-restore/backup.c:251
 msgid "Shutting down Evolution"
 msgstr "எவல�யூஷன� மூடப�பட�கிறத�."
 
-#: ../plugins/backup-restore/backup.c:195
+#: ../plugins/backup-restore/backup.c:196
 msgid "Backing Evolution accounts and settings"
 msgstr "எவல�யூஷன� கணக�க�கள� மற�ற�ம� அமைப�ப�கள� பாத�காக�கப�பட�கிறன."
 
-#: ../plugins/backup-restore/backup.c:201
+#: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
-"எவல�யூஷன� தரவ�கள� பாத�காக�கப�பட�கிறன. (அஞ�சல�கள�, தொடர�ப�கள� நாள�காட�டி பணிகள� க�றிப�ப�கள�)"
+msgstr "எவல�யூஷன� தரவ�கள� பாத�காக�கப�பட�கிறன. (அஞ�சல�கள�, தொடர�ப�கள� நாள�காட�டி பணிகள� க�றிப�ப�கள�)"
 
-#: ../plugins/backup-restore/backup.c:212
+#: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
 msgstr "காப�ப� ம�டிந�தத�"
 
-#: ../plugins/backup-restore/backup.c:217
-#: ../plugins/backup-restore/backup.c:238
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:218
+#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:285
 msgid "Restarting Evolution"
 msgstr "எவல�யூஷன� மற� த�வக�கம� செய�யப�பட�கிறத�."
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:255
 msgid "Backup current Evolution data"
 msgstr "இப�போதைய எவல�யூஷன� தரவ� காப�ப� எட�க�கப�பட�கிறத�."
 
-#: ../plugins/backup-restore/backup.c:259
+#: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
 msgstr "காப�பிலிர�ந�த� கோப�ப�கள� பிரித�தெட�க�கப� பட�கின�றன."
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:267
 msgid "Loading Evolution settings"
 msgstr "எவல�யூஷன� அமைப�ப�கள� �ற�றப�பட�கின�றன."
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:274
 msgid "Removing temporary backup files"
 msgstr "தற�காலிக காப�ப� கோப�ப�கள� நீக�கப�பட�கிறன."
 
-#: ../plugins/backup-restore/backup.c:280
+#: ../plugins/backup-restore/backup.c:281
 msgid "Ensuring local sources"
 msgstr "உள�ளமை மூலங�கள� உற�தி செய�யப�பட�கின�றன "
 
-#: ../plugins/backup-restore/backup.c:427
+#: ../plugins/backup-restore/backup.c:428
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "காப�ப� அடைவ� %s க�க� எட�க�கப�பட�கிறத�."
 
-#: ../plugins/backup-restore/backup.c:432
+#: ../plugins/backup-restore/backup.c:433
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "அடைவ� %s லிர�ந�த� மீட�டெட�க�கப�பட�கிறத�."
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:452
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "எவல�யூஷன� காப�ப�"
 
-#: ../plugins/backup-restore/backup.c:452
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "எவல�யூஷன� மீளமை"
 
-#: ../plugins/backup-restore/backup.c:487
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "எவல�யூஷன� தரவ� காப�ப� எட�க�கப�பட�கிறத�."
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "எவல�யூஷன� தரவ� காப�ப� எட�க�கப�பட�கிறத�. தயவ� செய�த� பொற�த�திர�க�கவ�ம�."
 
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "எவல�யூஷன� தரவ� மீட�கப�பட�கிறத�."
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "எவல�யூஷன� தரவ� மீட�கப�பட�கிறத�.. தயவ� செய�த� எபொற�த�திர�க�கவ�ம�."
 
-#: ../plugins/backup-restore/backup.c:509
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "உங�கள� கணக�கில� உள�ள தரவை பொர�த�த� எட�த�த�க�கொள�ள�ம� நேரம� வேற�பட�ம�.."
 
@@ -16014,35 +15703,35 @@ msgstr ""
 "அனைத�தைய�ம� மூட�க. எவல�யூஷன� தானாக மீண�ட�ம� த�வங�க தயவ� செய�த� மாற�ற� பொத�தானை "
 "செயல�பட�த�தவ�ம�."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "தானியக�க தொடர�ப�கள�"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "(_a) அஞ�சல�க�க� பதில� தர�கையில� தானாகவே ம�கவரிப�ப�த�தகத�தை உர�வாக�க�க"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr " தானியங�கி தொடர�ப�கள� க�க� ம�கவரிப�ப�த�தகம� தேர�ந�தெட�"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "உடனடி செய�தி தொடர�ப�கள�"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "பிட�ஜின� நண�பர� பட�டியல� இலிர�ந�த� தொடர�ப� தகவல� மற�ற�ம� பிம�பங�களை  ஒத�திசைக�கவ�ம�."
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "_S பிட�ஜின� நண�பர� பட�டியல� இலிர�ந�த� தொடர�ப� தகவல� மற�ற�ம� பிம�பங�களை  ஒத�திசைக�கவ�ம�."
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "பிட�ஜின� அரட�டையாளர� பட�டியல�க�க� ம�கவரி ப�த�தகத�தை தேர�ந�தெட�க�கவ�ம�"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "அரட�டையாளர� பட�டியலில� இப�போத� ஒர�ங�கிணைக�கவ�ம� (_b)"
 
@@ -16063,33 +15752,33 @@ msgstr ""
 "பதில� எழ�த�ம� போத� தானாகவே ம�கவரிப�ப�த�தகத�தை பெயர�கள� மற�ற�ம� மின�னஞ�சல� ம�கவரிகள� ஆல� "
 "நிரப�ப�கிறத�.கூடவே  �எம� தொடர�ப� தகவல�களை பட�டியலில� நிரப�ப�கிறத�."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "போகோ பில�டர�  வடிப�பி இர�ப�பில� இல�லை. அதை ம�தலில� நிற�வவ�ம�"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "%s � த�வக�க�ம�போத�  பிழை �ற�பட�ட�ள�ளத�: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "போகோ வடிப�பி சேய� செயல� பதிலளிக�கவில�லை. ம�டிக�கிறத�..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "போகோ வடிப�பி சேய� செயல�க�க� காத�திர�ப�ப� மறிக�கப�பட�டத�.  நிற�த�த�கிறத�... "
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "போகோ வடிப�பிக�க� பைப� தர இயலவில�லை. தவற� க�றிப�ப� : %d. "
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
 msgid "Convert message text to _Unicode"
 msgstr "_U உரையை யூனிக�கோட�க�க� மாற�ற�க"
 
@@ -16117,15 +15806,15 @@ msgstr "போகோவடிகட�டி தேர�வ�கள�"
 msgid "Filter junk messages using Bogofilter."
 msgstr "போகோ வடிப�பியை பயன�பட�த�தி எரித செய�திகளை வடிகட�ட�கிறத�."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr "அன�மதி சோதிப�ப� தோல�விய�ற�றத�. சேவையகத�த�க�க� சரியான உள�ந�ழைவ� தேவை."
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "கொட�த�த யூஆர�எல� � கண�ட� பிடிக�க ம�டியவில�லை"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16134,71 +15823,74 @@ msgstr ""
 "சேவகன� எதிர�பார�க�காத தரவ� � திர�ப�பியத�\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
 msgid "Unknown error"
 msgstr "தெரியாத பிழை."
 
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "சேவையகத�தின� பதிலை பக�க�க இயலவில�லை"
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "நிகழ�வ�கள�"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "பயனரின� நாள�காட�டிகள�"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "சேவகனின� யூஆர�எல� பெற�தல� தோல�வியில� ம�டிந�தத�"
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
 #: ../plugins/caldav/caldav-browse-server.c:1272
 msgid "Searching for user's calendars..."
 msgstr "பயனரின� நாள�காட�டிகளை தேட�கிறத�..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "எந�த பயனர� நாள�காட�டியைய�ம� காண ம�டியவில�லை"
 
-#: ../plugins/caldav/caldav-browse-server.c:794
+#: ../plugins/caldav/caldav-browse-server.c:793
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "ம�ந�தைய ம�யற�சி தோற�றத�:%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:796
+#: ../plugins/caldav/caldav-browse-server.c:795
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "ம�ந�தைய ம�யற�சி க�றிப�ப�  %d உடன� தோற�றத�"
 
-#: ../plugins/caldav/caldav-browse-server.c:799, c-format
+#: ../plugins/caldav/caldav-browse-server.c:798
+#, c-format
 msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
 msgstr "பயனர� <b>%s</b> க�க� சேவையகம� பயனர� <b>%s</b>இல� கடவ�ச�சொல�லை உள�ளிடவ�ம�"
 
-#: ../plugins/caldav/caldav-browse-server.c:856, c-format
+#: ../plugins/caldav/caldav-browse-server.c:855
+#, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "விளைவ�க�கோப�பை உர�வாக�க ம�டியவில�லை: யூஆர�எல� '%s'"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1090
 msgid "Searching folder content..."
 msgstr "அடைவ� உள�ளடக�கத�தை தேட�கிறத�..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1133
 msgid "List of available calendars:"
 msgstr "இர�ப�பில�ள�ள நாள�காட�டிகளின� பட�டியல�:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1170
 msgid "Supports"
 msgstr "ஆதரவ�"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249, c-format
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#, c-format
 msgid "Failed to create thread: %s"
 msgstr "இழையை உர�வாக�க�வதில� தோல�வி: %s"
 
@@ -16215,24 +15907,24 @@ msgstr "கேலà¯�டெவà¯� நாடà¯�காடà¯�டிகà¯�கà¯� உà
 msgid "CalDAV"
 msgstr "கேல�டெவ� "
 
-#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/caldav/caldav-source.c:216
 #: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
+#: ../plugins/caldav/caldav-source.c:220
 #: ../plugins/google-account-setup/google-contacts-source.c:305
 msgid "Use _SSL"
 msgstr "எஸ�எஸ�எல�  பயன�பட�த�த� (_S)"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:229
 msgid "Brows_e server for a calendar"
 msgstr "_e சேவையகத�தில� ஒர� நாட�காட�டிக�க� உலாவிப�பார�"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
+#: ../plugins/caldav/caldav-source.c:241
+#: ../plugins/calendar-file/calendar-file.c:182
 #: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
+#: ../plugins/calendar-weather/calendar-weather.c:395
 #: ../plugins/google-account-setup/google-contacts-source.c:323
 #: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
@@ -16246,31 +15938,31 @@ msgstr "எவலà¯�யூஷனà¯� கà¯�கà¯� கேலà¯�டெவà¯�  ஆà®
 msgid "CalDAV Support"
 msgstr "கேல�டெவ�  ஆதரவ�"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:116
 msgid "_Customize options"
 msgstr "_C தனிபயனாக�க�"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:135
 msgid "File _name:"
 msgstr "(_n)கோப�பின� பெயர�:"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:139
 msgid "Choose calendar file"
 msgstr "நாட�காட�டி கோப�பை தேர�வ� செய�யவ�ம�"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:187
 msgid "On open"
 msgstr "திறந�த போத�"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:188
 msgid "On file change"
 msgstr "கோப�ப� மாறிய போத�"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:189
 msgid "Periodically"
 msgstr "அவ�வப�போத�"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:204
 msgid "Force read _only"
 msgstr "_o படிக�க மட�ட�ம� என வலிய�ற�த�த�"
 
@@ -16334,26 +16026,26 @@ msgstr "வானிலை: தெளிந�த இரவ� "
 msgid "Weather: Thunderstorms"
 msgstr "வானிலை: இடி மழை"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "ஒர� இடத�தை தேர�ந�தெட�"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "எத�வ�மில�லை"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "அலக�கள�: (_U)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "மெட�ரிக� (செல�சியஸ�, செமீ, மற�ற�ம� பல)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "இம�பீரியல� (ஃபாரன�ஹீட�, அங�க�லம�, மற�ற�ம� பல)"
 
@@ -16474,12 +16166,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "எத�வ�மில�லை"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "(_C) தனிப�பயன� தலைப�ப�"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16487,12 +16179,12 @@ msgstr ""
 "தனிப�பயன� தலைப�ப�க�க� ம�க�கிய  விசையை க�றிக�க�ம� ஒழ�ங�க� :\n"
 "தனிப�பயன� தலைப�ப�க�க� ம�க�கிய  விசைகலின� பெயர�கள� இவற�றால� பிரிக�கப�பட�ம� \";\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:950
 msgid "Key"
 msgstr "விசை"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "மதிப�ப�க�கள�"
 
@@ -16514,7 +16206,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "அஞ�சல� எழ�தியில� விசையை அழ�த�தியவ�டன� தானியங�கியாக திர�த�தரை த�வக�க�க."
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:118
 msgid "Automatically launch when a new mail is edited"
 msgstr "ப�திய அஞ�சலை திர�த�தியவ�டன� தானியங�கியாக த�வக�க�க."
 
@@ -16526,11 +16218,11 @@ msgstr "à®®à¯�னà¯�னிரà¯�பà¯�பà¯� வெளியமை திரà¯�à
 msgid "The default command that must be used as the editor."
 msgstr "திர�த�தியாக செயல� பட பயன�பட�த�த வேண�டிய ம�ன�னிர�ப�ப� கட�டளை."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:107
 msgid "Command to be executed to launch the editor: "
 msgstr "திர�த�தியை த�வக�க செயலாக�க கட�டளை: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:108
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16538,8 +16230,8 @@ msgstr ""
 "ஈமாக�ஸ�க�க� இதை பயனாக�க�க  \"xemacs\"\n"
 "வி� க�க� \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:374
+#: ../plugins/external-editor/external-editor.c:376
 msgid "Compose in External Editor"
 msgstr "வெளியமை திர�த�தியில� தொக�க�கவ�ம�."
 
@@ -16672,8 +16364,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
 msgid "Unknown error."
 msgstr "தெரியாத பிழை."
 
@@ -16693,7 +16385,7 @@ msgstr "எவல�யூஷன� க�க� கூக�ள� நாள�
 msgid "Google Calendars"
 msgstr "கூக�ள� நாள�காட�டிகள�"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "சோதனை பட�டியல�"
 
@@ -16725,12 +16417,12 @@ msgstr "தற�காலிகமாக �ற�ற�க�கொள�"
 msgid "Rese_nd Meeting..."
 msgstr "சந�திப�பை மீண�ட�ம� அன�ப�ப�க... (_n)"
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Create folder"
 msgstr "அடைவை உர�வாக�க�கிறத�"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16755,19 +16447,19 @@ msgstr ""
 "பகிர�ந�த அடைவை நிற�வ 'Apply' � சொட�க�கவ�ம�.\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "பகிர�ந�த அடைவை நிற�வ�க."
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "பகிர�ந�த அடைவ� நிற�வல�"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "தேவையற�றவை அமைவ�கள�"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "தேவையற�ற அஞ�சல� அமைவ�கள�"
@@ -16803,7 +16495,7 @@ msgstr "(_R)நீக�க�"
 msgid "Message Retract"
 msgstr "செய�தி பின�வாங�கல�"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -16811,7 +16503,7 @@ msgstr ""
 "செய�தி பின�வாங�கல� பெற�னர� அஞ�சல� பெட�டியிலிர�ந�த� செய�தியை அழித�த�விடலாம�. நிச�சயம� இதை "
 "செய�ய வேண�ட�மா?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "செய�தி வெற�றிகரமாக பின� வாங�கப�பட�டத�."
 
@@ -17015,43 +16707,49 @@ msgstr "<b>கணக�கின� பெயர�</b>"
 msgid "Proxy Login"
 msgstr "பதிலாள� உள�அன�மதி"
 
-#: ../plugins/groupwise-features/proxy-login.c:209
-#: ../plugins/groupwise-features/proxy-login.c:252
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s (பயனர�க�கான %s) %sகடவ�ச�சொல�லை உள�ளிடவ�ம�"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:690
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "கணக�க� இணைப�பில� இர�க�க�ம� போத� மட�ட�மே பதிலாள� தத�தல� இர�க�க�ம�."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "கணக�க� செயல�பட�த�தியிர�க�க�ம� போத� மட�ட�மே பதிலாள� தத�தல� இர�க�க�ம�."
 
-#: ../plugins/groupwise-features/proxy.c:931
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+msgctxt "GW"
+msgid "Proxy"
+msgstr "பதிலாள�"
+
+#: ../plugins/groupwise-features/proxy.c:929
 #: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "பயனரை சேர�"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "கூட�தல� அன�ப�ப�ம� விர�ப�பங�கள�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:313
 #: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "பயனர�கள�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:314
 msgid "Enter the users and set permissions"
 msgstr "பயனர�களை உள�ளிட�ட� அன�மதிகளை அமைக�கவ�ம�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:412
 msgid "Sharing"
 msgstr "பகிர�கிறத�"
 
@@ -17063,67 +16761,55 @@ msgstr "தனிப�பயன� அறிவிப�ப�"
 msgid "Add   "
 msgstr "சேர�   "
 
-#: ../plugins/groupwise-features/share-folder.c:747
-msgid "Modify"
-msgstr "மாற�றியமை"
-
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "செய�தியின� நிலை"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "பொர�ள�:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "அன�ப�ப�நர�:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "உர�வாக�கம� தேதி:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "பெற�நர�: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "வழங�கப�பட�டத�: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "திறக�கப�பட�டத�: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "�ற�கப�பட�டத�: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "நீக�கப�பட�டத�: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "நிராகரிக�கப�பட�டத�: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "நிறைவேறியத�: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "சேர�க�கப�படவில�லை: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "எவல�யூஷன� க�க� ஹ�லா ஆதரவ�  சேர� "
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "ஹ�லா ஆதரவ�"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "உரைய�ள� பிம�பம�"
@@ -17132,12 +16818,12 @@ msgstr "உரைய�ள� பிம�பம�"
 msgid "View image attachments directly in mail messages."
 msgstr "பிம�ப இணைப�ப�களை அஞ�சல� செய�தியிலேயே நேரடியாக காட�ட�"
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:325
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "தனிப�பயன� தலைப�ப�கள�"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:338
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP தலைப�ப�கள�"
@@ -17184,141 +16870,140 @@ msgstr "IMAP கணகà¯�கà¯�களை நà¯�ணà¯� திரà¯�தà¯�தà¯�à®
 msgid "IMAP Features"
 msgstr "IMAP சிறப�ப� அம�சங�கள�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:494
-#: ../plugins/itip-formatter/itip-formatter.c:619
+#: ../plugins/itip-formatter/itip-formatter.c:475
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "நாள�காட�டியை �ற�ற ம�டியவில�லை '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:639
+#: ../plugins/itip-formatter/itip-formatter.c:641
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "நாள�காட�டி '%s'யில� ஒர� சந�திப�ப�  �ற�பாட�, சந�திப�ப�டன� ம�ரணாக உள�ளத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:675
+#: ../plugins/itip-formatter/itip-formatter.c:677
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "நாள�காட�டியில� சந�திப�ப�  கண�ட�பிடிக�கப�பட�டத� '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:774
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Unable to find any calendars"
 msgstr "எந�த நாள�காட�டிகளைய�ம� காண ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:781
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find this meeting in any calendar"
 msgstr "எந�த நாள�காட�டியில�ம� இந�த சந�திப�பினை காண ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:785
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find this task in any task list"
 msgstr "எந�த பணி பட�டியலில�ம� இந�த பணியை காண ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:789
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this memo in any memo list"
 msgstr "எந�த க�றிப�ப� பட�டியலில�ம� இந�த க�றிப�பை காண ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:862
 msgid "Opening the calendar. Please wait.."
 msgstr "நாள�காட�டியை திறக�கிறத�. தயை செய�த� காத�திர�க�கவ�ம�..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:863
+#: ../plugins/itip-formatter/itip-formatter.c:865
 msgid "Searching for an existing version of this appointment"
 msgstr "இந�த சந�திப�ப�க�க� இர�ப�பில� உள�ள வடிவ நிலையை தேட�கிறத�. "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1044
+#: ../plugins/itip-formatter/itip-formatter.c:1046
 msgid "Unable to parse item"
 msgstr "உர�ப�படியை க�றிப�பிட ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "நாள�காட�டிக�க� உர�ப�படியை அன�ப�ப ம�டியவில�லை '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1143
+#: ../plugins/itip-formatter/itip-formatter.c:1145
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "நாள�காட�டி '%s' க�க� �ற�ற�க�கொள�ளப�பட�டத� என அன�ப�ப�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1147
+#: ../plugins/itip-formatter/itip-formatter.c:1149
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "நாள�காட�டி '%s' க�க� தற�காலிகமானத� என அன�ப�ப�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1152
+#: ../plugins/itip-formatter/itip-formatter.c:1154
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "நாள�காட�டி '%s' க�க� நிராகரிக�கப�பட�டத� என அன�ப�ப�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1157
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "நாள�காட�டி '%s' க�க� ரத�தானத� என அன�ப�ப�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ஒர�ங�கிணைப�பாளர� பிரதிநிதியை  நீக�கிவிட�டார� %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1258
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Sent a cancelation notice to the delegate"
 msgstr "பிரதிநிதிக�க� ரத�த� அறிக�கையை அன�ப�பவ�ம�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
+#: ../plugins/itip-formatter/itip-formatter.c:1262
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "பிரதிநிதிக�க� ரத�த� அறிக�கையை அன�ப�ப ம�டியவில�லை?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1373
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "கலந�த� கொள�பவர�கள� நிலை தவறானத� அதனால� மேம�பட�த�த ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1400
+#: ../plugins/itip-formatter/itip-formatter.c:1402
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "கலந�த�கொள�பவர�களை மேம�பட�த�த ம�டியவில�லை. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Attendee status updated"
 msgstr "கலந�த� கொள�பவர�கள� நிலை மேம�பட�த�தப�பட�டத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1430
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 msgid "Meeting information sent"
 msgstr "கூட�டம� பற�றிய தகவல� அன�ப�பப�பட�டத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1433
+#: ../plugins/itip-formatter/itip-formatter.c:1435
 msgid "Task information sent"
 msgstr "பணி தகவல� அன�ப�பப�பட�டத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1438
 msgid "Memo information sent"
 msgstr "க�றிப�ப� தகவல� அன�ப�பப�பட�டத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1445
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "இந�த சந�திப�ப� தகவலை அன�ப�ப இயலவில�லை, சந�திப�பை காண ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1450
 msgid "Unable to send task information, the task does not exist"
 msgstr "இந�த பணி தகவலை அன�ப�ப இயலவில�லை, பணியை காண ம�டியவில�லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "இந�த க�றிப�ப� தகவலை அன�ப�ப இயலவில�லை, க�றிப�பை காண ம�டியவில�லை"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1516
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1523
 msgid "Save Calendar"
 msgstr "நாள�காட�டியை சேமி"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1574
-#: ../plugins/itip-formatter/itip-formatter.c:1585
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1587
 msgid "The calendar attached is not valid"
 msgstr "இணைக�கப�பட�ட நாள�காட�டி தவறானத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
-#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17326,15 +17011,15 @@ msgstr ""
 "இந�த செய�தி ஒர� நாட�காட�டியை உள�ளடக�கியதாக சொல�ல�கிறத� ஆனால� அத� ஒர� செல�ல�படியாக�ம� "
 "�நாள�காட�டி அல�ல "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1626
-#: ../plugins/itip-formatter/itip-formatter.c:1654
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1628
+#: ../plugins/itip-formatter/itip-formatter.c:1656
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "The item in the calendar is not valid"
 msgstr "நாள�காட�டியில� உள�ள உர�ப�படி தவறானத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../plugins/itip-formatter/itip-formatter.c:1655
-#: ../plugins/itip-formatter/itip-formatter.c:1761
+#: ../plugins/itip-formatter/itip-formatter.c:1629
+#: ../plugins/itip-formatter/itip-formatter.c:1657
+#: ../plugins/itip-formatter/itip-formatter.c:1763
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17342,11 +17027,11 @@ msgstr ""
 "இந�த  செய�தியில� ஒர� நாள�காட�டி  உள�ளத�. ஆனால� அதில� எந�த நிகழ�வ�கள�, பணிகள� ஓய�வ�/ வேலை "
 "தகவல�கள� �த�ம� இல�லை........"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1670
 msgid "The calendar attached contains multiple items"
 msgstr "இணைப�பட�ட�ள�ள நாள�காட�டி பல உர�ப�படிகளை கொண�ட�ள�ளத�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1671
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17354,500 +17039,500 @@ msgstr ""
 "அனைத�த� உர�ப�படிகளைய�ம� செயலாக�க கோப�ப� சேமிக�கப�பட�ட� மற�ற�ம� நாள�காட�டி இறக�க�மதி "
 "செய�யப�பட வேண�ட�ம�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2434
+#: ../plugins/itip-formatter/itip-formatter.c:2436
 msgid "This meeting recurs"
 msgstr "இந�த சந�திப�ப� மீண�ட�ம� வந�த�ள�ளத� "
 
-#: ../plugins/itip-formatter/itip-formatter.c:2437
+#: ../plugins/itip-formatter/itip-formatter.c:2439
 msgid "This task recurs"
 msgstr "இந�த பணி மீண�ட�ம� வந�த�ள�ளத� "
 
-#: ../plugins/itip-formatter/itip-formatter.c:2440
+#: ../plugins/itip-formatter/itip-formatter.c:2442
 msgid "This memo recurs"
 msgstr "இந�த க�றிப�ப� மீண�ட�ம� வர�ம�"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2669
+#: ../plugins/itip-formatter/itip-formatter.c:2676
 msgid "_Delete message after acting"
 msgstr "செயல�க�க� பின� செய�தியை அழிக�கவ�ம� (_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2679
-#: ../plugins/itip-formatter/itip-formatter.c:2712
+#: ../plugins/itip-formatter/itip-formatter.c:2686
+#: ../plugins/itip-formatter/itip-formatter.c:2719
 msgid "Conflict Search"
 msgstr "தேடல� ம�ரண�பாட�"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2701
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "சந�திப�ப� ம�ரண�பாட�களை தேட நாள�காட�டிகளை தேர�ந�தெட�க�கவ�ம�"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "இன�ற� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "இன�ற� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "இன�ற� %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "நாளை %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "நாளை %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "நாளை %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "நாளை %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "தயவ� செய�த� <b>%s</b> சார�பாக பதில� தரவ�ம�."
 
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "<b>%s</b> சார�பாக பெற�ற�க�கொள�ளப�பட�டத�"
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:358
 #, 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:364
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> பின�வர�ம� சந�திப�ப� விவரம� வெளியிடப�பட�டத�:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> பின�வர�ம� சந�திப�பினை உங�கள�க�க� வழங�க�கிறத�:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:368
 #, 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:374
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> பின�வர�ம� சந�திப�பில� உங�கள� கவனத�தை கோர�கிறத�:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, 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:382
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ஒர� கூட�தலை சேர�க�க விர�ம�ப�கிறார�:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b> %s வழியாக பின�வர�ம� கூட�டத�தைப�பற�றிய சமீபத�திய செய�தி அறிய விர�ம�ப�கிறார�."
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:384
 #, 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:392
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> %s வழியாக பின�வர�ம� கூட�டத�தைப�பற�றிய பதில� அன�ப�பி உள�ளார�."
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> பின�வர�ம� கூட�டத�தைப�பற�றிய பதில� அன�ப�பி உள�ளார�."
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> %s வழியாக பின�வர�ம� சந�திப�பை இரத�த� செய�த� உள�ளார�."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> பின�வர�ம� சந�திப�பை இரத�த� செய�த� உள�ளார�."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> %s வழியாக பின�வர�ம� கூட�டத�தில� மாற�றம� பரிந�த�ரை செய�த� உள�ளார�."
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> பின�வர�ம� கூட�டத�தில� மாற�றம� பரிந�த�ரை செய�த� உள�ளார�."
 
-#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:406
 #, 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:412
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> பின�வர�ம� கூட�டத�தில� மாற�றங�களை நிராகரித�த�  உள�ளார�."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> %s வழியாக பின�வர�ம� பணியை வெளியிட�ட� உள�ளார�."
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> பின�வர�ம� பணியை வெளியிட�ட� உள�ளார�."
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:453
 #, 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:460
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> %s வழியாக ஒர� பணியை உங�கள�க�க� ஒத�க�கிய�ள�ளார�:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> பணியை ஒத�க�கிய�ள�ளார�:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, 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:470
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> �ற�கெனவே உள�ள பணியில� சேர�க�க வேண�ட�கிறார�:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr "<b>%s</b> %s வழியாக பின�வர�ம� பணியைப�பற�றிய சமீபத�திய செய�தி அறிய விர�ம�ப�கிறார�."
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:472
 #, 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:480
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> %s மூலமாக பின�வர�ம� பணியைப�பற�றிய பதிலை அன�ப�ப�கிறார�."
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> பின�வர�ம� பணியைப�பற�றிய பதிலை அன�ப�ப�கிறார�."
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:482
 #, 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:488
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> பின�வர�ம� அளிக�கப�பட�ட பணியை இரத�த� செய�கிறார�:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> %s வழியாக பின�வர�ம� பணி ஒப�படைப�பில� மாற�றங�கள� பரிந�த�ரைக�கிறார�.:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> பின�வர�ம� பணி ஒப�படைப�பில� மாற�றங�கள� பரிந�த�ரைக�கிறார�.:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:494
 #, 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:500
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> பின�வர�ம� பணி ஒப�படைப�பை மற�த�தளிக�கிறார�."
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> %s வழியாக பின�வர�ம� க�றிப�பை வெளியிட�ட�ள�ளார�:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> பின�வர�ம� க�றிப�பை வெளியிட�ட�ள�ளார�:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:540
 #, 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:546
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> பின�வர�ம� க�றிப�ப�க�க� சேர�க�க விர�ம�ப�கிறார�:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:546
 #, 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:552
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> பின�வர�ம� பகிர�ந�த க�றிப�பை இரத�த� செய�கிறார�:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:672
 msgid "All day:"
 msgstr "நாள� ம�ழ�த�ம�"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:682
 msgid "Start day:"
 msgstr "த�வக�க தேதி:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1041
+#: ../plugins/itip-formatter/itip-view.c:682
+#: ../plugins/itip-formatter/itip-view.c:1037
 msgid "Start time:"
 msgstr "த�வக�க நேரம�:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:694
 msgid "End day:"
 msgstr "நாள� ம�டிவ�"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../plugins/itip-formatter/itip-view.c:694
+#: ../plugins/itip-formatter/itip-view.c:1048
 msgid "End time:"
 msgstr "ம�டிய�ம� நேரம�:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:827
 msgid "_Open Calendar"
 msgstr "நாள�காட�டியை திற (_O)"
 
+#: ../plugins/itip-formatter/itip-view.c:833
 #: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:865
 msgid "_Decline"
 msgstr "நிராகரி (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
-#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:867
 msgid "_Accept"
 msgstr "�ற�ற�க�கொள� (_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:837
 msgid "_Decline all"
 msgstr "அனைத�தைய�ம� நிராகரி (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:838
 msgid "_Tentative all"
 msgstr "அனைத�த� தற�காலிகமான(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Tentative"
 msgstr "தற�காலிகமாக (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:839
 msgid "_Accept all"
 msgstr "அனைத�தைய�ம� �ற�ற�க�கொள� (_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Send Information"
 msgstr "தகவலை அன�ப�ப� (_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Update Attendee Status"
 msgstr "கலந�த� கொள�பவர�கள� நிலையை மேம�பட�த�த� (_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Update"
 msgstr "மேம�பட�த�த� (_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1072
-#: ../plugins/itip-formatter/itip-view.c:1126
+#: ../plugins/itip-formatter/itip-view.c:1068
+#: ../plugins/itip-formatter/itip-view.c:1122
 msgid "Comment:"
 msgstr "க�றிப�ப�:"
 
-#: ../plugins/itip-formatter/itip-view.c:1111
+#: ../plugins/itip-formatter/itip-view.c:1107
 msgid "Send _reply to sender"
 msgstr "_r அன�ப�ப�னர�க�க� பதில� அன�ப�ப�க"
 
-#: ../plugins/itip-formatter/itip-view.c:1141
+#: ../plugins/itip-formatter/itip-view.c:1137
 msgid "Send _updates to attendees"
 msgstr "_u பங�க� கொள�வோர�க�க� இப�போதைய தகவல� அன�ப�ப�க."
 
-#: ../plugins/itip-formatter/itip-view.c:1150
+#: ../plugins/itip-formatter/itip-view.c:1146
 msgid "_Apply to all instances"
 msgstr "_A அனைத�த�ம� நிகழ�வ�கள�க�க�ம� செயல�பட�த�த�க."
 
-#: ../plugins/itip-formatter/itip-view.c:1159
+#: ../plugins/itip-formatter/itip-view.c:1155
 msgid "Show time as _free"
 msgstr "(_f)ஓய�வாக உள�ள நேரம� எனக�காட�ட�"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1158
 msgid "_Preserve my reminder"
 msgstr "(_P) என� நினைவூட�டலை காத�த�விட�."
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1168
+#: ../plugins/itip-formatter/itip-view.c:1164
 msgid "_Inherit reminder"
 msgstr "(_I) நினைவூட�டல� � மரபாக பெற�"
 
-#: ../plugins/itip-formatter/itip-view.c:1911
+#: ../plugins/itip-formatter/itip-view.c:1907
 msgid "_Tasks:"
 msgstr "பணிகள�: (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../plugins/itip-formatter/itip-view.c:1909
 msgid "_Memos:"
 msgstr "நினைவூட�டிகள� (_M)"
 
@@ -17949,16 +17634,16 @@ msgstr "சின�னம� சிமிட�ட  வேண�ட�மா."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "உள�பெட�டிக�க� வர�ம� ப�திய செய�திகளை மட�ட�மே அறிவிக�க வேண�ட�மா."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:343
 msgid "Evolution's Mail Notification"
 msgstr "எவலூஷன� அஞ�சல� அறிவிப�ப�"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:365
 msgid "Mail Notification Properties"
 msgstr "அஞ�சல� அறிவிப�ப� பண�ப�கள�"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:496
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17974,66 +17659,66 @@ msgstr[1] ""
 " %s இல� பெற�ற�ள�ளீர�கள�."
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:507
 #, c-format
 msgid "From: %s"
 msgstr "அன�ப�ப�னர�: %s"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#: ../plugins/mail-notification/mail-notification.c:519
 #, c-format
 msgid "Subject: %s"
 msgstr "பொர�ள�: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:528
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "நீங�கள� %d ப�திய தகவலை பெற�ற�ள�ளீர�கள�."
 msgstr[1] "நீங�கள� %d ப�திய தகவல�களை பெற�ற�ள�ளீர�கள�."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:551
 msgid "New email"
 msgstr "ப�திய மின�னஞ�சல�"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:605
 msgid "Show icon in _notification area"
 msgstr "(_n) அறிவிப�ப� இடத�தில� சின�னத�தை  காட�ட�"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:633
 msgid "B_link icon in notification area"
 msgstr "(_l) அறிவிப�ப� இடத�தில� சின�னத�தை சிமிட�ட� "
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:643
 msgid "Popup _message together with the icon"
 msgstr "(_m) வெளித�த�ள�ளல� செய�திகள� சின�னத�த�டன�."
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:828
 msgid "_Play sound when new messages arrive"
 msgstr "(_P) ப�திய மின�னஞ�சல� வர�ம� போத� ஒலிக�கோப�பை இயக�க�"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:857
 msgid "_Beep"
 msgstr "(_B) பீப�"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:870
 msgid "Use sound _theme"
 msgstr "_t ஒலி கர�த�தை பயன�பட�த�த�க"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:889
 msgid "Play _file:"
 msgstr "(_f) ஒலி கோப�பினை இசை"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:900
 msgid "Select sound file"
 msgstr "ஒலி கோப�பினை தேர�ந�தெட�"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:958
 msgid "Notify new messages for _Inbox only"
 msgstr "(_I) உள�பெட�டிக�க� மட�ட�ம�  ப�திய செய�திகள� வந�தால� அறிவி."
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:967
 msgid "Generate a _D-Bus message"
 msgstr "ஒர�  D-BUS செய�தியை உர�வாக�க� "
 
@@ -18046,12 +17731,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "ப�திய மின�னஞ�சல� வர�ம� போத�  அறிவிக�கிறத�"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "%s இன� அஞ�சலிலிர�ந�த� உர�வாக�கியத�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18060,7 +17745,7 @@ msgstr ""
 "தேர�வ� செய�யப�பட�ட நாள�காட�டியில� நிகழ�வ� '%s' �ற�கெனெவே உள�ளத�. பழைய நிகழ�வை திர�த�த "
 "விர�ப�பமா?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18069,7 +17754,7 @@ msgstr ""
 "தேர�வ� செய�யப�பட�ட நாள�காட�டியில� பணி '%s' �ற�கெனெவே உள�ளத�. பழைய பணியை திர�த�த "
 "விர�ப�பமா?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18078,7 +17763,7 @@ msgstr ""
 "தேர�வ� செய�யப�பட�ட நாள�காட�டியில� நினைவூட�டல� '%s' �ற�கெனெவே உள�ளத�. பழைய நினைவூட�டல� "
 "திர�த�த விர�ப�பமா?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#: ../plugins/mail-to-task/mail-to-task.c:512
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18086,7 +17771,7 @@ msgstr ""
 "தேர�வ� செய�யப�பட�ட நாள�காட�டியில� கொட�க�கப�பட�ட அஞ�சல�கள�க�க� சில நிகழ�வ�கள� �ற�கெனெவே உள�ளன. "
 "எப�படிய�ம� ப�திய நிகழ�வை உர�வாக�க விர�ப�பமா?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18094,7 +17779,7 @@ msgstr ""
 "தேர�வ� செய�யப�பட�ட நாள�காட�டியில� கொட�க�கப�பட�ட அஞ�சல�கள�க�க� சில பணிகள� �ற�கெனெவே உள�ளன. "
 "எப�படிய�ம� ப�திய பணியை உர�வாக�க விர�ப�பமா?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#: ../plugins/mail-to-task/mail-to-task.c:518
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18102,7 +17787,7 @@ msgstr ""
 "தேர�வ� செய�யப�பட�ட நாள�காட�டியில� கொட�க�கப�பட�ட அஞ�சல�கள�க�க� சில நினைவூட�டல�கள� �ற�கெனெவே "
 "உள�ளன. எப�படிய�ம� ப�திய நினைவூட�டல� � உர�வாக�க விர�ப�பமா?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#: ../plugins/mail-to-task/mail-to-task.c:536
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18116,7 +17801,7 @@ msgstr[1] ""
 "தேர�வ� செய�யப�பட�ட நாள�காட�டியில� கொட�க�கப�பட�ட அஞ�சல�கள�க�க�  நிகழ�வ�கள� �ற�கெனெவே உள�ளன. "
 "எப�படிய�ம� ப�திய நிகழ�வ�களை உர�வாக�க விர�ப�பமா?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:542
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18130,7 +17815,7 @@ msgstr[1] ""
 "தேர�வ� செய�யப�பட�ட நாள�காட�டியில� கொட�க�கப�பட�ட அஞ�சல�கள�க�க�  பணிகள� �ற�கெனெவே உள�ளன. "
 "எப�படிய�ம� ப�திய பணிகளை உர�வாக�க விர�ப�பமா?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18144,25 +17829,25 @@ msgstr[1] ""
 "தேர�வ� செய�யப�பட�ட நாள�காட�டியில� கொட�க�கப�பட�ட அஞ�சல�கள�க�க�  நினைவூட�டல�கள� �ற�கெனெவே உள�ளன. "
 "எப�படிய�ம� ப�திய நினைவூட�டல�களை உர�வாக�க விர�ப�பமா?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:607
 msgid "[No Summary]"
 msgstr "[ச�ர�க�கம� இல�லை]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:618
 msgid "Invalid object returned from a server"
 msgstr "சேவையகத�தில� இர�ந�த� செல�ல�படியாகாத பொர�ள� திர�ப�பப�பட�டத�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:689
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "செயலாக�க�ம� போத� பிழை �ற�பட�ட�ள�ளத�: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:718
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "நாள�காட�டியை திறக�க ம�டியவில�லை %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:725
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18170,7 +17855,7 @@ msgstr ""
 "தேர�ந�தெட�க�கப�பட�ட மூலம�  படிக�க மட�ட�மே, அதனால� அங�க� பணி உர�வாக�க ம�டியாத�. வேற� "
 "மூலத�தை தயை செய�த� தேர�ந�தெட�ங�கள�."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18178,7 +17863,7 @@ msgstr ""
 "தேர�ந�தெட�க�கப�பட�ட மூலம�  படிக�க மட�ட�மே, அதனால� அங�க� பணி உர�வாக�க ம�டியாத�. வேற� "
 "மூலத�தை தயை செய�த� தேர�ந�தெட�ங�கள�."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:731
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18186,40 +17871,40 @@ msgstr ""
 "தேர�ந�தெட�க�கப�பட�ட மூலம�  படிக�க மட�ட�மே, அதனால� அங�க� நினைவூட�டியை உர�வாக�க ம�டியாத�. "
 "வேற� மூலத�தை தயை செய�த� தேர�ந�தெட�ங�கள�."
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:934
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "மூல பட�டியலை பெற ம�டியவில�லை %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1053
 msgid "Create an _Event"
 msgstr "சந�திப�ப� ஒன�ற� உர�வாக�க� (_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1055
 msgid "Create a new event from the selected message"
 msgstr "தேர�ந�தெட�த�த செய�தியிலிர�ந�த� ப�திய நிகழ�வ�  ஒன�ற� உர�வாக�க� "
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create a Mem_o"
 msgstr "_o ப�திய நினைவூட�டலை  உர�வாக�க�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new memo from the selected message"
 msgstr "தேர�ந�தெட�த�த செய�தியிலிர�ந�த� ப�திய நினைவூட�டலை தயார� செய�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a _Task"
 msgstr "_T ப�திய பணியை உர�வாக�க�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new task from the selected message"
 msgstr "தேர�ந�தெட�த�த செய�தியிலிர�ந�த� ப�திய பணியை தயார� செய�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a _Meeting"
 msgstr "சந�திப�பை உர�வாக�க� (_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a new meeting from the selected message"
 msgstr "தேர�ந�தெட�த�த செய�தியிலிர�ந�த� ப�திய சந�திப�பை உர�வாக�க�"
 
@@ -18227,55 +17912,55 @@ msgstr "தேரà¯�நà¯�தெடà¯�தà¯�த செயà¯�தியிலிà®
 msgid "Convert a mail message to a task."
 msgstr "ஒர� அஞ�சல� செய�தியை ஒர� பணியாக மாற�ற�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:279
 msgid "Get List _Archive"
 msgstr "_A பட�டியல� காப�பகத�தை கொண�ட� வர�க"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:281
 msgid "Get an archive of the list this message belongs to"
 msgstr "இந�த செய�தி உள�ள பட�டியலின� காப�பகத�தை கொண�ட� வரவ�ம�."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Usage Information"
 msgstr "பட�டியல� பயன�பாட� தகவல� � கொண�ட� வர�க"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "இந�த செய�தி உள�ள பட�டியலின� பயன�பாட� தகவல� � கொண�ட� வர�க"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Contact List _Owner"
 msgstr "_O பட�டியல� உரிமையாளரை தொடர�ப� கொள�ளவ�ம�."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "இந�த செய�தி உள�ள பட�டியலின� உரிமையாளரை தொடர�ப� கொள�ளவ�ம�."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "_Post Message to List"
 msgstr "_P பட�டியல�க�க� ஒர� செய�தியை இட�க."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "இந�த செய�தி உள�ள பட�டியல�க�க� ஒர� செய�தியை இட�க."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Subscribe to List"
 msgstr "_S பட�டியல�க�க� சந�தாதாராக சேர�க"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "இந�த செய�தி உள�ள பட�டியலின� சந�தாதாராக சேர�க"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Unsubscribe from List"
 msgstr "_U பட�டியல�க�க� சந�தாவை நிற�த�த�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "இந�த செய�தியை கொண�ட அஞ�சல� க�ழ�விற�க�  சந�தா நீக�க�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Mailing _List"
 msgstr "மின�னஞ�சல� க�ழ� (_L)"
 
@@ -18364,11 +18049,11 @@ msgstr "செய�தி தொக� (_E)"
 msgid "_Send message"
 msgstr "செய�தி அன�ப�ப� (_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mark-all-read/mark-all-read.c:41
 msgid "Also mark messages in subfolders?"
 msgstr "த�ணை அடைவ�களில�ம�  செய�திகளை க�றிக�கவா?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:44
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18384,7 +18069,7 @@ msgstr "(_S) நடபà¯�பà¯�  அடைவà¯� மறà¯�à®±à¯�à®®à¯� உப à®
 msgid "In Current _Folder Only"
 msgstr "(_F) நடப�பில�ள�ள அடைவில� மட�ட�ம�."
 
-#: ../plugins/mark-all-read/mark-all-read.c:349
+#: ../plugins/mark-all-read/mark-all-read.c:402
 msgid "Mark Me_ssages as Read"
 msgstr "_s செய�திகளை படித�ததாக க�றி"
 
@@ -18443,19 +18128,19 @@ msgstr "வெற�ற� உரையே விர�ப�பம�"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "ஹெச�டிஎம�எல�(ஹெச�டிஎம�எல� ) உள�ளடக�க அஞ�சலாக இர�ப�பின�ம� வெற�ற� உரையாக காண�க"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "இர�ந�தால�, ஹெச�டிஎம�எல� � காட�ட�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "காட�ட�வதற�க� நல�ல பக�தியை எவலூஷன�  தேர�ந�தெட�க�கட�ட�ம�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "இர�ந�தால�, வெற�றி உரை � காட�ட�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18463,21 +18148,21 @@ msgstr ""
 "எப�போத�ம� வெற�ற� உரை இர�ப�பின� அதை காட�ட�. மற�றபடி காட�ட�வதற�க� நல�ல பக�தியை எவலூஷன�  "
 "தேர�ந�தெட�க�கட�ட�ம�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "எப�போத�ம� வெற�ற� உரையை காட�ட�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "எப�போத�ம� வெற�ற� உரையை காட�ட�. மற�ற பக�திகளிலிர�ந�த� வேண�டினால� ஒட�ட�களை செய�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "அம�க�கப�பட�ட ஹெச�டிஎம�எல� பக�திகளை ஒட�டாக காட�டவ�ம�."
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "_M ஹெச�டிஎம�எல�  ம�றை"
 
@@ -18501,31 +18186,31 @@ msgstr "அவà¯�டà¯�லà¯�கà¯� பிஎஸà¯�டி இறகà¯�கà¯�à®®à
 msgid "Outlook personal folders (.pst)"
 msgstr "அவ�ட�ல�க� அந�தரங�க அடைவ�கள� (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:289
 msgid "_Mail"
 msgstr "(_M)மின�னஞ�சல�"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:307
 msgid "_Address Book"
 msgstr "(_A) ம�கவரி ப�த�தகம�"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "A_ppointments"
 msgstr "(_p) சந�திப�ப�கள�"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:320 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "(_T)பணிகள�"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:326
 msgid "_Journal entries"
 msgstr "(_J) இதழ� உள�ளீட�கள�"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:341
 msgid "Importing Outlook data"
 msgstr "அவ�ட�ல�க� தரவை �ற�ற�மதி செய�கிறத�."
 
@@ -18683,55 +18368,55 @@ msgstr "�கால�"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "நாள�காட�டியை வெளியிட ம�டியவில�லை. நாள�காட�டி பின�இயக�கி இர�ப�பில� இல�லை"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:474
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "ப�திய இடம�"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:476
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "இடத�தை திர�த�த�"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "ஸ�பாம� அஸாஸின� � காணவில�லை, க�றி: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "க�ழாயை  உர�வாக�க�வதில� தோல�வி: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 #, c-format
 msgid "Error after fork: %s"
 msgstr "பிளவ�க�க�ப�பின�  பிழை: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "ஸ�பாம� அஸாஸின� சேய� செயல� பதிலளிக�கவில�லை. ம�டிக�கிறத�..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "ஸ�பாம� அஸாஸின� சேய� செயல�க�க� காத�திர�ப�ப� மறிக�கப�பட�டத�.  நிற�த�த�கிறத�..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "ஸ�பாம� அஸாஸின� க�க� க�ழாய� இட  இயலவில�லை. தவற� %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "ஸ�பாம� அஸாஸின�  இர�ப�பில� இல�லை. அதை ம�தலில� நிற�வவ�ம�."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "இத� ஸ�பாம� அஸாஸின� � மேல�ம� நம�பகமாக�க�ம�. ஆனால� மெத�வாக வேலை செய�ய�ம�."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
 msgid "I_nclude remote tests"
 msgstr "(_n)தொலை சோதனையை சேர�"
 
@@ -18876,15 +18561,15 @@ msgstr "உங�கள� ஆரம�ப கணக�க� அமைக�க
 msgid "Setup Assistant"
 msgstr "அமைப�ப� உதவியாள�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:110
 msgid "Evolution Setup Assistant"
 msgstr "எவல�யூஷன� அமைப�ப� உதவி"
 
-#: ../plugins/startup-wizard/startup-wizard.c:92
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Welcome"
 msgstr "நல�வரவ�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:97
+#: ../plugins/startup-wizard/startup-wizard.c:118
 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"
@@ -18896,26 +18581,26 @@ msgstr ""
 "\n"
 "\"Forward\" பொத�தானை சொட�க�கி தொடரவ�ம�."
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:153
 #: ../widgets/misc/e-import-assistant.c:385
 msgid "Please select the information that you would like to import:"
 msgstr "நீங�கள� பெறவிர�ம�ப�ம� தகவலை தேர�வ� செய�யவ�ம�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:168
 #: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "அன�ப�ப�னர� %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:167
+#: ../plugins/startup-wizard/startup-wizard.c:185
 msgid "Importing files"
 msgstr "கோப�ப�களை இறக�க�மதி செய�கிறத�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:251
 msgid "Importing data."
 msgstr "தரவினை �ற�ற�கிறத�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:257
 msgid "Please wait"
 msgstr "தயவ� செய�த� காத�திர�க�கவ�ம�"
 
@@ -18946,15 +18631,15 @@ msgstr "இணைபà¯�பà¯� நினைவà¯�à®±à¯�தà¯�தி சொரà¯�à
 msgid "Drafts based template plugin"
 msgstr "வரைவ�கள� அடிப�படையிலான வார�ர�ப�ர�  சொர�க�ப�பொர�ள�"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:613
 msgid "No Title"
 msgstr "தலைப�ப� இல�லை"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:684
 msgid "Save as _Template"
 msgstr "(_T) வார�ப�ப�ர�வாக  சேமி"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:686
 msgid "Save as Template"
 msgstr "வார�ப�ப�ர�வாக  சேமி"
 
@@ -18974,27 +18659,27 @@ msgstr "உரைய�ள� விகார�ட�கள�"
 msgid "Show vCards directly in mail messages."
 msgstr "அஞ�சல� செய�திகளில� விகார�ட�களை நேரடியாக காட�ட�க"
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:157
+#: ../plugins/vcard-inline/vcard-inline.c:242
 msgid "Show Full vCard"
 msgstr "ம�ழ� விகார�ட� � காட�ட�"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:160
 msgid "Show Compact vCard"
 msgstr "கையடக�க விகார�ட�"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:221
 msgid "There is one other contact."
 msgstr "வேற� ஒர� தொடர�ப� உள�ளத�."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:230
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "வேற�  %d தொடர�ப� உள�ளத�."
 msgstr[1] "%d வேற� தொடர�ப�கள� உள�ளன."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:251
 msgid "Save in Address Book"
 msgstr "ம�கவரி ப�த�தகத�தில� சேமி"
 
@@ -19055,32 +18740,40 @@ msgid "Default window width"
 msgstr "சாளரத�தின� இயல�பான அகலம�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Enable express mode"
+msgstr "விரைவ� ம�றைமையை செயல�பட�த�த�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "இணயத�தில� ஹெச� டிடிபி/ பாத�காப�பான ஹெச� டிடிபி  வழியாக அண�க�ம� போத� பதிலாள� அமைப�பதை "
 "செயல�மை பட�த�த�கிறத�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr "மிகவ�ம�  எளிமையாக�கப�பட�ட பயனர�  இடை ம�கத�தை  இயல�மைப�பட�த�த�ம� க�றி"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
 msgstr "ஹெச� டிடிபி பதிலாள� ப�ரவலன�  பெயர�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
 msgstr "ஹெச� டிடிபி பதிலாள� கடவ�ச�சொல�லை "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "HTTP proxy port"
 msgstr "ஹெச� டிடிபி பதிலாள� த�றை"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "HTTP proxy username"
 msgstr "ஹெச� டிடிபி பதிலாள� பயனர� பெயர� "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "அடையாளம� அல�லத� மாற�ற�ப�பெயராவத� த�வக�கத�தில� காட�டப�படவேண�ட�ம� "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -19093,61 +18786,61 @@ msgstr ""
 "gnome2_private/Evolution password file (எவல�யூஷன� கடவ�ச�சொல� கோப�ப�.) இலிர�ந�தோ "
 "எட�த�த�க�கொள�ளப�பட�ம�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
 msgstr "ஆரம�ப இணைப�ப� பார�வை"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Initial file chooser folder"
 msgstr "ஆரம�ப கோப�ப� தேர�வி அடைவ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "ஜிடிகேபைசூசர� உரையாடல�கள�க�க� ஆரம�ப அடைவ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
 msgstr "பலக விட�செட�ட�கள�க�க� ஆரம�ப பார�வை.  \"0\" சின�ன பார�வைக�க�, \"1\" பட�டியல� பார�வைக�க�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "கடைசியாக மேம�பட�த�தப�பட�ட கட�டமைப�ப� பதிப�ப�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "இணையத�தில� இல�லாமல� வேலை செய�ய ஒத�திசைக�க வேண�டிய பாதைகளின� பட�டியல�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
 msgstr "பதிலாள� இல�லாத ப�ரவலன�கள�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "ஹெச�டிடிபி பதிலாள� மூலம� செயல�பட�கையில� உற�திப�பட�த�தலை கடக�க  கடவ�ச�சொல�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Proxy configuration mode"
 msgstr "பதிலாள� அமைப�பை அமை"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
 msgstr "சாக�ஸ� பதிலாள� ப�ரவலன� பெயர�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
 msgstr "சாக�ஸ� பதிலாள� த�றை"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
 msgstr "பாத�காப�பான ஹெச�டிடிபி பதிலாள� ப�ரவலன� பெயர�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
 msgstr "பாத�காப�பான ஹெச�டிடிபி பதிலாள� த�றை"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19159,23 +18852,23 @@ msgstr ""
 "configuration\" மற�ற�ம� \"use proxy configuration provided in the autoconfig "
 "url\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
 msgstr "பக�கப�பட�டை தெரிகிறத�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Skip development warning dialog"
 msgstr "மேம�பாட� எச�சரிக�கை உரையாடலை தவிர�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:322
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:307
 msgid "Start in offline mode"
 msgstr "இணையம� இல�லாமல� த�வக�க�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
 msgstr "நிலைப�பட�டை தெரிகிறத�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19183,27 +18876,27 @@ msgstr ""
 "major/minor/configuration நிலையில�, எவல�யூஷனின� கட�டமைப�ப� பதிப�ப�(எட�த�த�க�காட�ட� "
 "\"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
 msgstr "ம�தன�மை சாளரத�தின� ம�ன�னிர�ப�ப� எக�ஸ� ஆயத�தொலைவ�, பிக�சல�களில�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default Y coordinate for the main window."
 msgstr "ம�தன�மை சாளரத�தின� ம�ன�னிர�ப�ப� ஒய� ஆயத�தொலைவ�, பிக�சல�களில�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
 msgstr "ம�தன�மை சாளரத�தின� ம�ன�னிர�ப�ப� உயரம�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The default width for the main window, in pixels."
 msgstr "ம�தன�மை சாளரத�தின� ம�ன�னிர�ப�ப� அகலம�, பிக�சல�களில�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The default width for the sidebar, in pixels."
 msgstr "பக�கப�பட�டையின� ம�ன�னிர�ப�ப� அகலம�, பிக�சல�களில�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19211,19 +18904,19 @@ msgstr ""
 "பெர�ம�பால�ம�/க�றைந�த/ கட�டமைப�ப� நிலைகளில� எவல�யூஷனின� கடைசி மேம�பட�த�தப�பட�ட "
 "கட�டமைப�ப� ,  (எட�த�த�க�காட�ட� \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
 msgstr "பதிலாள� ஹெச�டிடிபி தொடர�ப�க�கான கணினி பெயர� ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The machine name to proxy secure HTTP through."
 msgstr "பதிலாள� பாத�காப�பான ஹெச�டிடிபி தொடர�ப�க�கான கணினி பெயர�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "The machine name to proxy socks through."
 msgstr "பதிலாள� சாக�ஸ� தொடர�ப�க�கான கணினி பெயர�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -19231,7 +18924,7 @@ msgstr ""
 "கணினியில� \"/apps/evolution/shell/network_config/http_host\"ஆல� வரையற�க�கப�பட�ட "
 "பதிலாள� வழிக�கான த�றை   ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -19239,7 +18932,7 @@ msgstr ""
 "கணினியில� \"/apps/evolution/shell/network_config/secure_host\"ஆல� வரையற�க�கப�பட�ட "
 "பதிலாள� வழிக�கான த�றை  ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -19247,7 +18940,7 @@ msgstr ""
 "கணினியில� \"/apps/evolution/shell/network_config/socks_host\"ஆல� வரையற�க�கப�பட�ட "
 "பதிலாள� வழிக�கான த�றை  ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19257,7 +18950,7 @@ msgstr ""
 "இர�க�கலாம�. \"toolbar\" ஆக இர�ப�பின� பொத�தான�களின� பாணி க�னோம� கர�விப�பட�டி அமைப�பால� "
 "நிர�ணயிக�கப�பட�ம�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19269,606 +18962,421 @@ msgstr ""
 "களப�பெயர�கள� (டொமெய�ன�),  �பி (�பி 4 மற�ற�ம� �பி6 )  ம�கமூடிய�டனான வலையக ம�கவரிகள� "
 "(192.168.0.0/24 போல )ஆக இர�க�கலாம�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
 msgstr "கர�விப�பட�டி தெரிகிறத�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "URL that provides proxy configuration values."
 msgstr "பதிலாள�  கட�டமைப�ப� மதிப�ப�களை தர�ம� உரல� "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Use HTTP proxy"
 msgstr " ஹெச�டிடிபி பதிலாளை பயன�பட�த�த�க."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "பயனர� பெயர� வரை ஹெச�டிடிபி."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "எவல�யூஷன� இணைப�ப� ம�றையை விட இணைப�பில�லாத ம�றையில� த�வங�க�மா."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
 msgstr "சாளரம� ம�ழ�மையாக�கப�பட வேண�டாம�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the sidebar should be visible."
 msgstr "பக�கப�பட�டை தெரிய வேண�ட�மா."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Whether the status bar should be visible."
 msgstr "நிலைப�பட�டை தெரிய வேண�ட�மா."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the toolbar should be visible."
 msgstr "கர�விப�பட�டி தெரிய வேண�ட�மா"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "எவல�யூஷன� வளர�ச�சி பதிப�ப�களில� எச�சரிக�கை உரையாடல� தவிர�க�கப�படலாமா."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:60
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
 msgstr "சாளரப� பொத�தான� தெரிய வேண�ட�மா."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:61
+#: ../shell/apps_evolution_shell.schemas.in.h:63
 msgid "Window button style"
 msgstr "சாளர பொத�தான� தோற�றம�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:62
+#: ../shell/apps_evolution_shell.schemas.in.h:64
 msgid "Window buttons are visible"
 msgstr "சாளர பொத�தான�கள� தெரிகிறத�"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
 msgid "Searches"
 msgstr "தேடல�கள�"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:545
 msgid "Save Search"
 msgstr "தேடலை சேமி"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "காட�ட� _w:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "தேட� (_c):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr "_n உள�ளே"
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "கர�விப�பட�டை பாங�க� (_b)"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "மாற�றியின� கர�விப�பட�டை பாங�க�"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "கர�விப�பட�டி தெரிகிறத�"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "மாற�றி தெரிய வேண�ட�மா."
-
-#: ../shell/e-shell-utils.c:220
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "விகார�ட� (.vcf)"
 
-#: ../shell/e-shell-utils.c:222
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "� நாள�காட�டி (.ics)"
 
-#: ../shell/e-shell-utils.c:243
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "எல�லா கோப�ப�கள�ம� (*)"
 
-#: ../shell/e-shell-view.c:604
-msgid "Switcher Action"
-msgstr "மாற�றியின� செயல�"
-
-#: ../shell/e-shell-view.c:605
-msgid "The switcher action for this shell view"
-msgstr "இந�த ஷெல� காட�சிக�க� மாற�றியின� செயல�"
-
-#: ../shell/e-shell-view.c:620
-msgid "Page Number"
-msgstr "பக�க எண�"
-
-#: ../shell/e-shell-view.c:621
-msgid "The notebook page number of the shell view"
-msgstr "ஷெல� காட�சியின� க�றிப�ப� ப�த�தக பக�கம� எண� "
-
-#: ../shell/e-shell-view.c:637
-msgid "Search Rule"
-msgstr "தேட�ம� விதி"
-
-#: ../shell/e-shell-view.c:638
-msgid "Criteria for the current search results"
-msgstr "நடப�ப� தேடல� விடைகள�க�க� அளப�ர�கள�"
-
-#: ../shell/e-shell-view.c:653
-msgid "The EShellBackend for this shell view"
-msgstr "இந�த ஷெல� காட�சிக�க� ஈஷெல� பின�இயக�கி"
-
-#: ../shell/e-shell-view.c:668
-msgid "Shell Content Widget"
-msgstr "ஷெல� உள�ளடக�க விட�செட�"
-
-#: ../shell/e-shell-view.c:669
-msgid "The content widget appears in a shell window's right pane"
-msgstr "உள�ளடக�க விட�செட� சாளரத�தின� வலத� பலகத�தில� தென�பட�ம�"
-
-#: ../shell/e-shell-view.c:685
-msgid "Shell Sidebar Widget"
-msgstr "ஷெல� பக�கப�பட�டை விட�செட�"
-
-#: ../shell/e-shell-view.c:686
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "பக�கப�பட�டை விட�செட� சாளரத�தின� இடத� பலகத�தில� தென�பட�ம�"
-
-#: ../shell/e-shell-view.c:701
-msgid "Shell Taskbar Widget"
-msgstr "ஷெல� பணிப�பட�டை விட�செட�"
-
-#: ../shell/e-shell-view.c:702
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "பணிப�பட�டை விட�செட�  ஷெல� சாளரத�தின� கீழ� தென�பட�ம�"
-
-#: ../shell/e-shell-view.c:717
-msgid "Shell Window"
-msgstr "ஷெல� சாளரம�"
-
-#: ../shell/e-shell-view.c:718
-msgid "The window to which the shell view belongs"
-msgstr "ஷெல� காட�சி பொர�ந�த�ம� சாளரம�"
-
-#: ../shell/e-shell-view.c:734
-msgid "The key file holding widget state data"
-msgstr "விட�செட�டின� நிலை தரவை கொண�ட�ள�ள விசை"
-
-#: ../shell/e-shell-view.c:749
-msgid "The title of the shell view"
-msgstr "ஷெல� காட�சியின� தலைப�ப�"
-
-#: ../shell/e-shell-view.c:763
-msgid "Current View ID"
-msgstr "தற�போதைய காட�சியின� �டி"
-
-#: ../shell/e-shell-view.c:764
-msgid "The current GAL view ID"
-msgstr "தற�போதைய ஜி�எல�  காட�சியின� �டி"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:644
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "N. Jayaradha <njayaradha@gmail.com> I. Felix <ifelix@redhat.com>. Dr. T. "
 "Vasudevan <agnihot3@gmail.com>"
 
-#: ../shell/e-shell-window-actions.c:655
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "எவல�யூஷன� வலைத�தளம�"
 
-#: ../shell/e-shell-window-actions.c:1223
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "பக� பட�டி நிற�வப�படவில�லை"
 
-#: ../shell/e-shell-window-actions.c:1225
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "பக� பட�டியை இயக�க ம�டியவில�லை"
 
-#: ../shell/e-shell-window-actions.c:1327
+#: ../shell/e-shell-window-actions.c:1347
 msgid "GNOME Pilot is not installed."
 msgstr "க�னோம� பைலட� நிற�வப�படவில�லை"
 
-#: ../shell/e-shell-window-actions.c:1329
+#: ../shell/e-shell-window-actions.c:1349
 msgid "GNOME Pilot could not be run."
 msgstr "க�னோம� பைலட� � இயக�க ம�டியவில�லை"
 
-#: ../shell/e-shell-window-actions.c:1423
+#: ../shell/e-shell-window-actions.c:1443
 msgid "Show information about Evolution"
 msgstr "எவல�யூஷனை பற�றிய தகவல�களை காட�ட�"
 
-#: ../shell/e-shell-window-actions.c:1428
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "சாளரத�தை மூடவ�ம� (_C)"
 
-#: ../shell/e-shell-window-actions.c:1435
+#: ../shell/e-shell-window-actions.c:1455
 msgid "_Contents"
 msgstr "உள�ளடக�கங�கள� (_C)"
 
-#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:1457
 msgid "Open the Evolution User Guide"
 msgstr "எவலூஷன� பயனர� கையேட�டை திற "
 
-#: ../shell/e-shell-window-actions.c:1463
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Evolution _FAQ"
 msgstr "எவல�யூஷன� அகேகே (FAQ) ( _F)"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "அடிக�கடி கேட�க�ம� கேள�விகள� - இணைய பக�கத�தை திற"
 
-#: ../shell/e-shell-window-actions.c:1470
+#: ../shell/e-shell-window-actions.c:1490
 msgid "_Forget Passwords"
 msgstr "கடவ�ச�சொற�கள� மறந�த�விட�டதா (_F)"
 
-#: ../shell/e-shell-window-actions.c:1472
+#: ../shell/e-shell-window-actions.c:1492
 msgid "Forget all remembered passwords"
 msgstr "நினைவில�ள�ள அனைத�த� கடவ�ச�சொற�களைய�ம� மற"
 
-#: ../shell/e-shell-window-actions.c:1477
+#: ../shell/e-shell-window-actions.c:1497
 msgid "I_mport..."
 msgstr "இறக�க�மதி... (_m)"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Import data from other programs"
 msgstr "மற�ற  நிரலிலிர�ந�த� தகவலை பெற�ற�க�கொள�ளவ�ம�"
 
-#: ../shell/e-shell-window-actions.c:1484
+#: ../shell/e-shell-window-actions.c:1504
 msgid "New _Window"
 msgstr "(_W)ப�திய சாளரம�"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1506
 msgid "Create a new window displaying this view"
 msgstr "இந�த காட�சியை காட�ட�வதற�காக ப�திய சாளரத�தை திறக�கவ�ம�"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Configure Evolution"
 msgstr "எவல�யூஷன� � வடிவமை"
 
-#: ../shell/e-shell-window-actions.c:1505
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "(_Q)வேகமான பார�வைக�க�"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Show Evolution's shortcut keys"
 msgstr "எவல�யூஷன� க�ற�க�க� விசைகளை காட�ட�"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "நிரலிலிர�ந�த� வெளியேற�கிறத�"
 
-#: ../shell/e-shell-window-actions.c:1519
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "கூட�தல� தேடல�... (_A)"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr "மேம�பட�ட தேடல� � செய�க"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Clear the current search parameters"
 msgstr "நடப�ப� தேடல� அளப�ர�களை ச�த�தம� செய�க"
 
-#: ../shell/e-shell-window-actions.c:1533
+#: ../shell/e-shell-window-actions.c:1553
 msgid "_Edit Saved Searches..."
 msgstr "(_E) சேமித�த தேடலை திர�த�த�..."
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Manage your saved searches"
 msgstr "சேமித�த தேடல�களை மேலாள�க"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "தேடல� வகையை மாற�ற இங�க� சொட�க�கவ�ம�"
 
-#: ../shell/e-shell-window-actions.c:1547
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "(_N) இப�போத� தேட�"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Execute the current search parameters"
 msgstr "நடப�ப� தேடல� அளப�ர�களை செயலாக�க�க"
 
-#: ../shell/e-shell-window-actions.c:1554
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "(_S)தேடலை சேமி..."
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Save the current search parameters"
 msgstr "நடப�ப� தேடல� அளப�ர�களை சேமி"
 
-#: ../shell/e-shell-window-actions.c:1568
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Send / _Receive"
 msgstr "அன�ப�ப� / பெற� (_R)"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Send queued items and retrieve new items"
 msgstr "ப�திய உர�ப�படிகளை பெற வரிசையாக உர�ப�படிகளை அன�ப�பவ�ம�"
 
-#: ../shell/e-shell-window-actions.c:1575
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Submit _Bug Report..."
 msgstr "(_B)பிழை அறிக�கை அன�ப�பப�பட�கிறத�..."
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Submit a bug report using Bug Buddy"
 msgstr "பக� பட�டி(Bug buddy)யை பயன�பட�த�தி பிழை அறிக�கை அன�ப�பவ�ம�"
 
-#: ../shell/e-shell-window-actions.c:1582
+#: ../shell/e-shell-window-actions.c:1602
 msgid "GNOME Pilot _Synchronization..."
 msgstr "க�னோம� பைலட� ஒர�ங�கிணைக�க�ம� விர�ப�பங�கள�... (_S)"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1604
 msgid "Set up GNOME Pilot configuration"
 msgstr "க�னோம� பைலட� அமைப�பை அமை"
 
-#: ../shell/e-shell-window-actions.c:1589
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Work Offline"
 msgstr "(_W)இணையத�தொடர�ப� இல�லாமல� வேலை செய�யவ�ம�"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1611
 msgid "Put Evolution into offline mode"
 msgstr "எவல�யூஷன� � இணைப�பில�லா ம�றையில� வை"
 
-#: ../shell/e-shell-window-actions.c:1596
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Work Online"
 msgstr "(_W)இணையத�தில� வேலை செய�யவ�ம�"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1618
 msgid "Put Evolution into online mode"
 msgstr "எவல�யூஷன� � இணைப�ப�ள�ள ம�றையில� வை"
 
-#: ../shell/e-shell-window-actions.c:1626
+#: ../shell/e-shell-window-actions.c:1646
 msgid "Lay_out"
 msgstr "_o அமைப�ப�"
 
-#: ../shell/e-shell-window-actions.c:1633
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_New"
 msgstr "(_N)ப�திய"
 
-#: ../shell/e-shell-window-actions.c:1640
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Search"
 msgstr "(_S)தேட�"
 
-#: ../shell/e-shell-window-actions.c:1647
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Switcher Appearance"
 msgstr "மாற�றி தோற�றம� (_S)"
 
-#: ../shell/e-shell-window-actions.c:1661
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Window"
 msgstr "சாளரம� (_W)"
 
-#: ../shell/e-shell-window-actions.c:1690
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show Side _Bar"
 msgstr "பக�கப� பட�டையை காட�ட� (_B)"
 
-#: ../shell/e-shell-window-actions.c:1692
+#: ../shell/e-shell-window-actions.c:1712
 msgid "Show the side bar"
 msgstr "பக�கப� பட�டையை காட�ட�"
 
-#: ../shell/e-shell-window-actions.c:1698
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show _Buttons"
 msgstr "_B பொத�தான�களை காட�ட�"
 
-#: ../shell/e-shell-window-actions.c:1700
+#: ../shell/e-shell-window-actions.c:1720
 msgid "Show the switcher buttons"
 msgstr "மாற�றி பொத�தான�களை காட�ட�"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1726
 msgid "Show _Status Bar"
 msgstr "நிலைப�பட�டையை காட�ட� (_S)"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Show the status bar"
 msgstr "நிலைப�பட�டையை காட�ட� "
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1734
 msgid "Show _Tool Bar"
 msgstr "கர�விப�பட�டையை காட�ட� (_T)"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1736
 msgid "Show the tool bar"
 msgstr "கர�விப�பட�டையை காட�ட�"
 
-#: ../shell/e-shell-window-actions.c:1738
+#: ../shell/e-shell-window-actions.c:1758
 msgid "_Icons Only"
 msgstr "சின�னங�கள� மட�ட�ம� (_I)"
 
-#: ../shell/e-shell-window-actions.c:1740
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Display window buttons with icons only"
 msgstr "சின�னங�கள�டன� மட�ட�ம� சாளர பொத�தான�களை காட�ட�"
 
-#: ../shell/e-shell-window-actions.c:1745
+#: ../shell/e-shell-window-actions.c:1765
 msgid "_Text Only"
 msgstr "உரை மட�ட�ம� (_T)"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1767
 msgid "Display window buttons with text only"
 msgstr "உரைய�டன� மட�ட�ம� சாளர பொத�தான�களை காட�ட�"
 
-#: ../shell/e-shell-window-actions.c:1752
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Icons _and Text"
 msgstr "சின�னங�கள� மற�ற�ம� உரை (_a)"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Display window buttons with icons and text"
 msgstr "சின�னங�கள� மற�ற�ம� உரைய�டன� சாளர பொத�தான�களை காட�ட�"
 
-#: ../shell/e-shell-window-actions.c:1759
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Tool_bar Style"
 msgstr "கர�விப�பட�டை பாங�க� (_b)"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "பணிமேடை கர�விப�பட�டை அமைவினை பயன�பட�த�தி சாளர பொத�தான�களை காட�ட�"
 
-#: ../shell/e-shell-window-actions.c:1769
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Define Views..."
 msgstr "காட�சியை அறிதியிட�"
 
-#: ../shell/e-shell-window-actions.c:1771
+#: ../shell/e-shell-window-actions.c:1791
 msgid "Create or edit views"
 msgstr "காட�சிகளை உர�வாக�க� அல�லத� திர�த�த�"
 
-#: ../shell/e-shell-window-actions.c:1776
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Save Custom View..."
 msgstr "உங�கள� காட�சியை சேமி..."
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Save current custom view"
 msgstr "தற�போதைய தனிப�பயன� காட�சியை சேமிக�கவ�ம�"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1805
 msgid "C_urrent View"
 msgstr "தற�போதைய பார�வை (_u)"
 
-#: ../shell/e-shell-window-actions.c:1795
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Custom View"
 msgstr "உங�கள� காட�சி..."
 
-#: ../shell/e-shell-window-actions.c:1797
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Current view is a customized view"
 msgstr "நடப�ப� காட�சி ஒர� தனிப�பயன� காட�சி"
 
-#: ../shell/e-shell-window-actions.c:1807
+#: ../shell/e-shell-window-actions.c:1827
 msgid "Change the page settings for your current printer"
 msgstr "தற�போதைய அச�சியந�திரத�திற�காக பக�க அமைப�ப�களை மாற�ற�"
 
-#: ../shell/e-shell-window-actions.c:2127
+#: ../shell/e-shell-window-actions.c:2204
 #, c-format
 msgid "Switch to %s"
 msgstr "%s க�க� மாற�"
 
-#: ../shell/e-shell-window-actions.c:2337
+#: ../shell/e-shell-window-actions.c:2417
 msgid "Execute these search parameters"
 msgstr "இந�த தேடல� அளப�ர�களை செயலாக�கவ�ம�"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:552
+#: ../shell/e-shell-window-private.c:573
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - எவல�யூஷன�"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "ப�திய"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "செயலில� உள�ள ஷெல� காட�சி"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "செயலில� உள�ள ஷெல� காட�சியின� பெயர�:"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "ஷெல� சாளரத�தின� EFocusTracker"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:772
-msgid "Geometry"
-msgstr "ஜியோமிதி"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:773
-msgid "Initial window geometry string"
-msgstr "ஆரம�ப நிலை சாளர சரத�தின� வடிவம� "
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "பாத�காப�ப� பாங�க�"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "ஷெல� சாளரம� பாத�காப�ப� பாங�கில�  உள�ளதா"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "பக�கப�பட�டை தெரிகிறத�"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "ஷெல� சாளர பக�கப�பட�டை  தெரிய வேண�ட�மா."
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "மாற�றி தெரிகிறத�"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "ஷெல� சாளர மாற�றி பொத�தான� தெரிய வேண�ட�மா."
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "பணிப�பட�டி தெரிகிறத�"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "ஷெல� சாளர பணிப�பட�டி  தெரிய வேண�ட�மா"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "ஷெல� சாளர கர�விப�பட�டி  தெரிய வேண�ட�மா."
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "யூ� மேலாளர�"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "ஷெல� சாளரத�தின� (GtkUI) ஜிடிகேயூ�  மேலாளர�"
-
-#: ../shell/e-shell.c:213
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "இணைப�ப� விலகிய நிலைக�க� தயாராகிறத� ..."
 
-#: ../shell/e-shell.c:267
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "இணைப�ப� நிலைக�க� தயாராகிறத� ..."
 
-#: ../shell/e-shell.c:339
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "வெளியேற தயார�பட�த�த�கிறத�..."
 
-#: ../shell/e-shell.c:788
-msgid "Module Directory"
-msgstr "கூற� அடைவ�"
-
-#: ../shell/e-shell.c:789
-msgid "The directory from which to load EModules"
-msgstr "ஈமாட�ல�களை �ற�ற வேண�டிய அடைவ�"
-
-#: ../shell/e-shell.c:804
-msgid "Network Available"
-msgstr "வலையமைப�ப� இர�ப�பில� இல�லை"
-
-#: ../shell/e-shell.c:805
-msgid "Whether the network is available"
-msgstr "வலையமைப�ப� இர�ப�பில� உள�ளதா"
-
-#: ../shell/e-shell.c:820 ../widgets/misc/e-online-button.c:130
-msgid "Online"
-msgstr "இணைப�பில�"
-
-#: ../shell/e-shell.c:821
-msgid "Whether the shell is online"
-msgstr "ஷெல� இணைப�பில� உள�ளதா "
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:167
+#: ../shell/main.c:164
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19902,7 +19410,7 @@ msgstr ""
 "எங�கள� ம�யற�சி உங�கள�க�க� மகிழ�ச�சியை தர�ம� என நம�ப�கிறோம�.\n"
 "உங�கள� ஆதரவை ஆர�வத�த�டன� எதிர� பார�க�கிறோம�.\n"
 
-#: ../shell/main.c:191
+#: ../shell/main.c:188
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19910,55 +19418,55 @@ msgstr ""
 "நன�றி\n"
 "எவல�யூஷன� க�ழ�\n"
 
-#: ../shell/main.c:198
+#: ../shell/main.c:195
 msgid "Do not tell me again"
 msgstr "மீண�ட�ம� சொல�ல வேண�டாம�"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:303
 msgid "Start Evolution activating the specified component"
 msgstr "க�றிப�பிட�ட உர�ப�படியை த�வக�க�வதன� மூலம� எவல�யூஷனை த�வக�க�"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:305
 msgid "Apply the given geometry to the main window"
 msgstr "ம�தன�மை சாளரத�திற�க� கொட�த�த விகிதத�தை அமை"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:309
 msgid "Start in online mode"
 msgstr "உள� அமை பாங�கில� த�வக�க�"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:311
+msgid "Start in \"express\" mode"
+msgstr "\"விரைவ�\"  பாங�கில� த�வக�க�"
+
+#: ../shell/main.c:314
 msgid "Forcibly shut down Evolution"
 msgstr "எவல�யூஷன� � கட�டாயமாக பணிநிற�த�தம� செய�"
 
-#: ../shell/main.c:331
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "எவல�யூஷன� 1.4 லிர�ந�த� மீண�ட�ம� மாற�றப�பட�கிறத�"
-
-#: ../shell/main.c:334
+#: ../shell/main.c:317
 msgid "Send the debugging output of all components to a file."
 msgstr "கோப�பின� எல�லா உர�ப�படிகள�க�க�ம� வழ�நீக�க விளைவை அன�ப�பவ�ம�"
 
-#: ../shell/main.c:336
+#: ../shell/main.c:319
 msgid "Disable loading of any plugins."
 msgstr "எந�த கூட�தல� வசதிகளை �ற�றலைய�ம� செயல�நீக�க�"
 
-#: ../shell/main.c:338
+#: ../shell/main.c:321
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "அஞ�சல� தொடர�ப�கள� மற�ற�ம� பணிகள� இவற�ற�க�க� ம�ன�பார�வை பலகத�தை ம�டக�க�க"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:325
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "யூஆரைகள� அல�லத� கோப�ப�ப�பெயர�கள� � மீதி தர�மதிப�ப�களாக இறக�க�மதி செய�க. "
 
-#: ../shell/main.c:344
+#: ../shell/main.c:327
 msgid "Request a running Evolution process to quit"
 msgstr "நடப�பில�ள�ள எவல�யூஷன� செயலை நிற�த�த வேண�ட�க."
 
-#: ../shell/main.c:498
+#: ../shell/main.c:442
 msgid "- The Evolution PIM and Email Client"
 msgstr "- எவல�யூஷன� PIM மற�ற�ம� மின�னஞ�சல�"
 
-#: ../shell/main.c:524
+#: ../shell/main.c:468
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19972,95 +19480,41 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "நினைவில�ள�ள அனைத�த� கடவ�ச�சொல�லைய�ம� மறக�க வேண�ட�ம�?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "தொடர�க"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "பதிப�ப� {0} லிர�ந�த� மேம�பட�த�த ம�டியாத�"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "பதிப�ப� {0} லிர�ந�த� பழைய தகவலை நீக�க வேண�ட�மா?"
+msgid "Continue Anyway"
+msgstr "எப�படிய�ம� தொடர�க"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr "{0} பதிப�பிலிர�ந�த� நேரடியாக மேம�பட�த�தலை எவலூஷன� இனி ஆதரிப�பதில�லை. ச�ற�ற� வழியாக ம�தலில� 2 ஆம� பதிப�ப�க�க�ம� பின� 3 ஆம� பதிப�ப�க�க�ம� மேம�பட�த�தலாம�."
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "உங�கள� கடவ�ச�சொற�களை மறப�பதென�றால� எல�லா கடவ�ச�சொற�கள�ம� த�ப�ப�ரவாக�கப�பட�ம�. அட�த�த நேரம� "
 "தேவைப�பட�ம� போத� நீங�கள� கேட�கப�பட�வீர�கள�."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "மேம�பட�த�த�வதற�க� வட�டில� இடம� இல�லை"
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "தகவலை நீக�க வேண�ட�மா"
+msgid "Quit Now"
+msgstr "இப�போத� வெளிச�செல�"
 
 #: ../shell/shell.error.xml.h:8
-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 ""
-"&quot;எவல�யூஷன�&quot; அடைவின� அனைத�த� உள�ளடக�கங�கள�ம� நிரந�தரமாக நீக�கப�பட�ம�.\n"
-"\n"
-"பழைய தரவ� அனைத�த�ம� நீக�க� ம�ன� கைம�றையாக உங�கள� அஞ�சல�கள�, தொடர�ப�கள� மற�ற�ம� நாள�காட�டி "
-"தரவ� அனைத�த�ம� இர�ப�பதைய�ம�, இந�த பதிப�ப� எவல�யூஷன� சரியாக வேலை செய�ய�கிறத� என�பதைய�ம� "
-"உற�தி செய�த� கொள�க.\n"
-"\n"
-"நீக�கப�பட�ட பின� பழைய வடிவ நிலை எவல�யூஷன�க�க� கைம�றை அல�லாத� வேற� வழியில� கீழ�பட�த�த "
-"ம�டியாத�.\n"
-
-#: ../shell/shell.error.xml.h:14
-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 ""
-"ம�ந�தைய வடிவ நிலை எவல�யூஷன� அதன� தரவை வேற� இடத�தில� வைத�த� இர�ந�தத�. \n"
-"\n"
-"இந�த தரவை நீக�க ம�டிவ� செய�தால�, &quot;எவல�யூஷன�&quot; அடைவின� அனைத�த� உள�ளடக�கங�கள�ம� "
-"நிரந�தரமாக நீக�கப�பட�ம�. தரவை வைத�த�க�கொள�ள ம�டிவ� செய�தால� பின�னால� வசதிபட�ட போத� &quot;"
-"எவல�யூஷன�&quot; அடைவின� உள�ளடக�கங�களைய�ம� நீக�கிக�கொள�ளலாம�.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "ம�ந�தைய பதிப�பினை மேம�பட�த�த ம�டியவில�லை:"
 
-#: ../shell/shell.error.xml.h:19
-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 ""
-"உங�கள� தரவ� மற�ற�ம� அமைப�ப�களை மேம�பட�த�த {0} வட�ட� இடாம� தேவை ஆனால� {1} இடம� மட�ட�மே "
-"உள�ளத�.\n"
-"\n"
-"மேலே தொடர�ம� ம�ன� உங�கள� இல�லம� அடைவில� அதிக இடம� தயார� செய�ய வேண�ட�ம�."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "மற (_F)"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "(_K)தகவலை அப�படியே வை"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "(_R) பிறக� நினைவூட�ட�."
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20152,7 +19606,7 @@ msgstr "அமர�வ� மேலாண�மை தேர�வ�கள�:
 msgid "Show session management options"
 msgstr "அமர�வ� மேலாணமை தேர�வ�களை காட�ட�"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20229,19 +19683,18 @@ msgstr "மின�னஞ�சல� ம�கவரிகள�"
 msgid "All CA certificate files"
 msgstr "அனைத�த�ம� சி� சான�றிதழ� கோப�ப�கள�"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:1052
 msgid "Certificates"
 msgstr "சான�றிதழ�கள�"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "சான�றிதழ� காட�டி: %s"
 
-#: ../smime/gui/component.c:46
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "`%s' க�கான கடவ�ச�சொல�லை உள�ளிடவ�ம�"
+#: ../smime/gui/component.c:46, c-format
+msgid "Enter the password for '%s'"
+msgstr "'%s' க�கான கடவ�ச�சொல�லை உள�ளிடவ�ம�"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -20271,7 +19724,7 @@ msgstr ""
 "வழங�கியவர�:\n"
 "  தலைப�ப�: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "சான�றிதழை தேர�வ� செய�"
 
@@ -20299,7 +19752,7 @@ msgstr ""
 "இந�த CA வை பயன�பட�த�த�வதற�க� ம�ன� அதன� ம�றை மற�ற�ம� அன�மதி ஆகியவைகளை சோதிக�கவ�ம�"
 "(கிடைத�தால�)"
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "சான�றிதழ�"
 
@@ -20594,28 +20047,34 @@ msgstr "சிக�கல� இல�லை"
 msgid "Extensions"
 msgstr "விரிவாக�கம�"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Algorithm"
 msgstr "சான�றிதழ� கையொப�ப படிம�றை"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "வழங�கியவர�"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "வழங�கியவரின� தனிப�பட�ட அடையாளம�"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "தலைப�பின� தனி அடையாளம�"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1220
 msgid "Certificate Signature Value"
 msgstr "சான�றிதழ� கையொப�ப மதிப�ப�"
 
@@ -20705,10 +20164,10 @@ msgstr "(_S)நிலைய�டன�"
 
 #. Put the "UTC" entry at the top of the combo's list.
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:778
 msgid "UTC"
 msgstr "UTC"
 
@@ -20737,19 +20196,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_S தேர�ந�தெட�த�தல� ம�றை"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "சேகரிப�ப�"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:339
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%s க�க� காட�சிகளை க�றிப�பிட�"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-define-views-dialog.c:349
 msgid "Define Views"
 msgstr "காட�சிகளை க�றிப�பிட�"
 
@@ -20758,15 +20212,11 @@ msgstr "காட�சிகளை க�றிப�பிட�"
 msgid "Define Views for \"%s\""
 msgstr "\"%s\"க�க� காட�சிகளை க�றிப�பிட�"
 
-#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/menus/gal-view-factory-etable.c:113
 msgid "Table"
 msgstr "அட�டவணை"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "நிகழ�வ�கள�"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "நடப�ப� பார�வையை சேமி"
 
@@ -20778,11 +20228,7 @@ msgstr "ப�திய பார�வையை உர�வாக�க� (_C
 msgid "_Replace existing view"
 msgstr "இர�க�க�ம� பார�வையை மாற�ற� (_R)"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "தொழிற�சாலை"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "ப�திய காட�சிகளை வரையற�"
 
@@ -20810,14 +20256,6 @@ msgstr "கணக�கின� பெயர�"
 msgid "Protocol"
 msgstr "விதிம�றை"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "செயல�"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "ஒர� ஜிடிகே ரேடியோ செயல�"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "இணைப�பின� க�ணங�கள�"
@@ -20835,11 +20273,11 @@ msgstr "MIME வகை:"
 msgid "_Suggest automatic display of attachment"
 msgstr "இணைப�பை தானாக காட�ட வலிய�ற�த�த� (_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "பின�னணியாக அமைக�க ம�டியவில�லை"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "(_B)பின�னனியாக அமை"
 
@@ -20872,13 +20310,10 @@ msgid "Hide Attachment _Bar"
 msgstr "இணைப�ப� பட�டையை மறை (_B)"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:636
 msgid "Show Attachment _Bar"
 msgstr "இணைப�ப� பட�டையை காட�ட� (_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "இணைப�ப� பட�டையை காட�ட� (_A)"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "இணைப�ப� � சேர�"
@@ -20895,7 +20330,7 @@ msgstr[1] "இணைப�ப�களை சேமி"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2317
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -20929,48 +20364,48 @@ msgstr "இணைப�பை %s இல� சேமி"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "இணைக�கப�பட�ட செய�தி"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2619
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 msgid "A load operation is already in progress"
 msgstr "ஒர� �ற�றல� செயல� �ற�கெனெவே நடப�பில� உள�ளத�"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2627
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 msgid "A save operation is already in progress"
 msgstr "ஒர� சேமிப�ப� செயல� �ற�கெனெவே நடப�பில� உள�ளத�"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s' �ற�ற ம�டியவில�லை"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "இணைப�பை  �ற�ற ம�டியவில�லை"
 
-#: ../widgets/misc/e-attachment.c:2197
+#: ../widgets/misc/e-attachment.c:2193
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s' � திறக�க ம�டியவில�லை"
 
-#: ../widgets/misc/e-attachment.c:2200
+#: ../widgets/misc/e-attachment.c:2196
 #, c-format
 msgid "Could not open the attachment"
 msgstr "இணைப�பை திறக�க ம�டியவில�லை"
 
-#: ../widgets/misc/e-attachment.c:2635
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "இணைப�ப� உள�ளடக�கங�கள� �ற�றப�படவில�லை"
 
-#: ../widgets/misc/e-attachment.c:2711
+#: ../widgets/misc/e-attachment.c:2707
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s' � சேமிக�க ம�டியவில�லை "
 
-#: ../widgets/misc/e-attachment.c:2714
+#: ../widgets/misc/e-attachment.c:2710
 #, c-format
 msgid "Could not save the attachment"
 msgstr "இணைப�ப� � சேமிக�க ம�டியவில�லை "
@@ -20981,7 +20416,7 @@ msgid "Ctrl-click to open a link"
 msgstr "ஒர� இணைப�பினை திறக�க கண�ட�ரோல�- க�ளிக� செய�யவ�ம�"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20989,65 +20424,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "மாத நாள�காட�டி"
 
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3387
-#: ../widgets/text/e-text.c:3388
-msgid "Fill color"
-msgstr "வண�ண நிரப�பி"
-
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:481
-#: ../widgets/misc/e-canvas-background.c:482 ../widgets/text/e-text.c:3394
-#: ../widgets/text/e-text.c:3395 ../widgets/text/e-text.c:3401
-#: ../widgets/text/e-text.c:3402
-msgid "GDK fill color"
-msgstr "GDK வண�ண நிரப�பி"
-
-#: ../widgets/misc/e-canvas-background.c:488
-#: ../widgets/misc/e-canvas-background.c:489 ../widgets/text/e-text.c:3408
-#: ../widgets/text/e-text.c:3409
-msgid "Fill stipple"
-msgstr "ப�ள�ளிகளால� நிரப�ப�"
-
-#: ../widgets/misc/e-canvas-background.c:495
-#: ../widgets/misc/e-canvas-background.c:496
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:502
-#: ../widgets/misc/e-canvas-background.c:503
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:509
-#: ../widgets/misc/e-canvas-background.c:510
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:516
-#: ../widgets/misc/e-canvas-background.c:517
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2872
-msgid "Minimum width"
-msgstr "க�றைந�தபட�ச அகலம�"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2873
-msgid "Minimum Width"
-msgstr "க�றைந�தபட�ச அகலம�"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "இடைவெளி"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "எழ�த�த�ர� க�றிம�றை"
@@ -21060,48 +20436,48 @@ msgstr "பயனà¯�படà¯�தà¯�தவேணà¯�டிய எழà¯�தà¯�தà¯
 msgid "Other..."
 msgstr "மற�றவை..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "நாள� மற�ற�ம� நேரம�"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "உள�ளீட� தேதிக�கான உரை உள�ளீட�"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "ஒர� நாள�காட�டியை காட�ட இந�தப� பொத�தானை சொட�க�கவ�ம�"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "நேரத�தை தேர�ந�தெட�க�க கீழிறங�க�ம� தொக�ப�ப�  பெட�டி"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "_w இப�போத�"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_T இன�ற�"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "ஒன�ற�மில�லை (_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1935
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "எத�வ�மில�லை"
 
-#: ../widgets/misc/e-dateedit.c:1830
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "செல�லாத தேதி மதிப�ப�"
 
-#: ../widgets/misc/e-dateedit.c:1874
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "செல�லாத நேர மதிப�ப�"
 
@@ -21196,11 +20572,11 @@ msgstr "\"Apply\" எனà¯�பதை கà¯�ளிகà¯� செயà¯�தà¯� எà®
 msgid "Import Data"
 msgstr "தகவலை இறக�க�மதி செய�"
 
-#: ../widgets/misc/e-map.c:621
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "உலக வரைபடம�"
 
-#: ../widgets/misc/e-map.c:623
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21210,8 +20586,7 @@ msgstr ""
 
 #: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
-msgstr ""
-"எவல�யூஷன� தற�சமயம� இணைப�பில� உள�ளத�.  இந�தப� பொத�தானை பயன�பட�த�தி இணைப�பிலிர�ந�த� விலகவ�ம�."
+msgstr "எவல�யூஷன� தற�சமயம� இணைப�பில� உள�ளத�.  இந�தப� பொத�தானை பயன�பட�த�தி இணைப�பிலிர�ந�த� விலகவ�ம�."
 
 #: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
@@ -21221,42 +20596,6 @@ msgstr "எவலà¯�யூஷனà¯� தறà¯�சமயமà¯� இணைபà¯�பà
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "எவல�யூஷன� தற�சமயம� இணைப�பில�லாமல� உள�ளத�. �னெனில� வலைப�பின�னல� இர�ப�ப� இல�லை"
 
-#: ../widgets/misc/e-online-button.c:131
-msgid "The button state is online"
-msgstr "பொத�தான� இணைப�பில� நிலையில� உள�ளத�"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "கிடைமட�ட நிலை"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "கிடைமட�டமாக உள�ள போத� பலகத�தின� இடம�."
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "செங�க�த�த� நிலை"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "செங�க�த�தாக வைத�த போத�  பலகத�தின� இடம� ."
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "விகிதம�"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "இரண�டாம� பலகத�தின� விகிதம�"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "நிலையான அளவ� மாற�றம�"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "அளவ� மாற�ற�ம�போத� இரண�டாம� பலகத�தை நிலையாக வைக�கவ�ம�"
-
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "இதனோட� ஒத�திசை:"
@@ -21318,28 +20657,6 @@ msgstr "பக�கத�தின� கீழ� பக�தியை அட
 msgid "Reached top of page, continued from bottom"
 msgstr "பக�கத�தின� மேல� பக�தியை அடைந�தோம�. இனி கீழிர�ந�த� தொடர�வோம�."
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "நிலைகாட�டி நிரை"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "நிலைகாட�டி நிரல�"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "வரிசைப�பட�த�தி"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "தேர�ந�தெட�த�தல� ம�றை"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "நிலைகாட�டி ம�றை"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "_l நீக�கப�பட�டத�"
@@ -21412,43 +20729,46 @@ msgstr "ம�டிக�கப�பட�ட போத�: (_m)"
 msgid "When decli_ned:"
 msgstr "நிராகரிக�கப�பட�ட போத�: (_n)"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "அதற�க�ள� (_t)"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_After"
 msgstr "பின�: (_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "அனைத�த� தகவல�கள� (_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "பிரிவ�கள� (_C):"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "செய�தி வழங�கலை தாமதி (_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "வழங�கப�பட�டத�(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "ம�டிவ�ற�ம� நாளினை அமை (_S)"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "_Until"
 msgstr "வரை: (_U)"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "�ற�ற போத� (_W)"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "திறந�திர�க�க�ம� போத�: (_W)"
 
@@ -21505,41 +20825,41 @@ msgstr "நிரலà¯� கோபà¯�பà¯� இயகà¯�கபà¯�படவதாà
 msgid "Click here to go to URL"
 msgstr "URLக�க� செல�ல இங�க� சொட�க�கவ�ம�"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:359
 msgid "_Copy Link Location"
 msgstr "(_C)இணைப�பை நகலெட�"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:361
 msgid "Copy the link to the clipboard"
 msgstr "தொட�ப�பை ஒட�ட�ப�பலகைக�க� நகல� எட�க�கவ�ம�."
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Open Link in Browser"
 msgstr "(_O)இணைப�பை உலாவியில� திற"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:371
 msgid "Open the link in a web browser"
 msgstr "இணைப�பை உலாவியில� திற"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Copy Email Address"
 msgstr "மின�னஞ�சல� ம�கவரிகளை நகலெட�க�கவ�ம� (_C)"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
 msgid "Select all text and images"
 msgstr "அனைத�த� உரையைகளைய�ம� பிம�பங�களைய�ம� தேர�ந�தெட�க�கவ�ம�"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 #, c-format
 msgid "Click to call %s"
 msgstr "%s � அழைக�க சொட�க�க�"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:846
 msgid "Click to hide/unhide addresses"
 msgstr "ம�கவரிகளை மறைக�க/மறைநீக�க சொட�க�கவ�ம�"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to open %s"
 msgstr "%s திறக�க க�ளிக� செய�யவ�ம�"
@@ -21558,7 +20878,7 @@ msgstr "நாள�காட�டி: %sலிர�ந�த� %sவரை"
 msgid "evolution calendar item"
 msgstr "எவல�யூஷன� நாள�காட�டி உர�ப�படி"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "மேல�மீட�ப� பட�டியல�"
 
@@ -21576,7 +20896,7 @@ msgstr "எத�வ�மில�லை"
 msgid "OK"
 msgstr "சரி"
 
-#: ../widgets/table/e-cell-date-edit.c:862
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "நேரம� இந�த வடிவத�தில� இர�க�க வேண�ட�ம�: %s"
@@ -21585,48 +20905,12 @@ msgstr "நேரம� இந�த வடிவத�தில� இர�க
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "சதவிகித மதிப�ப� 0 லிர�ந�த� 100 க�க�ள� இர�க�க வேண�ட�ம�"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "தேர�வ� செய�யப�பட�ட நெட�வரிசை"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "க�றிப�பிடப�பட�ட நெட�வரிசை"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "தேர�வ� செய�யப�படாத நெட�வரிசை"
-
-#: ../widgets/table/e-cell-text.c:1627
-msgid "Strikeout Column"
-msgstr "அடிக�கப�பட�ட நெட�வரிசை"
-
-#: ../widgets/table/e-cell-text.c:1634
-msgid "Underline Column"
-msgstr "அடிக�கோடிட�ட நெட�வரிசை"
-
-#: ../widgets/table/e-cell-text.c:1641
-msgid "Bold Column"
-msgstr "பெரிதாக�கப�பட�ட நெட�வரிசை"
-
-#: ../widgets/table/e-cell-text.c:1648
-msgid "Color Column"
-msgstr "நிற நெட�வரிசை"
-
-#: ../widgets/table/e-cell-text.c:1662
-msgid "BG Color Column"
-msgstr "பின�ப�ல நிற நெட�வரிசை"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "சேர�க�க சொட�க�கவ�ம�"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "நிலை"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(�ற�வரிசை)"
@@ -21643,12 +20927,12 @@ msgstr "வரிசையாஇக�கவில�லை"
 msgid "No grouping"
 msgstr "தொக�த�தல� கிடையாத�"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "ப�லங�களை காட�ட�"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "இர�க�க�ம� ப�லங�கள�"
 
@@ -21657,7 +20941,7 @@ msgid "A_vailable Fields:"
 msgstr "இர�க�க�ம� ப�லங�கள�: (_v)"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1637
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "மேலேற�கின�றத�"
 
@@ -21670,7 +20954,7 @@ msgid "Clear _All"
 msgstr "(_A) அனைத�தைய�ம� த�டை"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1637
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "இறங�க�கின�றத�"
 
@@ -21730,7 +21014,7 @@ msgstr "இந�த ப�லங�களை வரிசையாக காட
 msgid "_Sort..."
 msgstr "வரிசைப�பட�த�த�... (_S)"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "ஒர� பத�தியை சேர�க"
 
@@ -21742,247 +21026,111 @@ msgstr ""
 "உங�கள� அட�டவணைக�க� ஒர� பத�தியை கூட�ட\n"
 "தேவையான இடத�த�க�க� அதை இழ�த�த� விடவ�ம�."
 
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s  (%d items)"
-msgstr[1] "%s : %s (%d உர�ப�படி)"
-
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s : %s  (%d உர�ப�படி)"
+msgstr[1] "%s : %s (%d உர�ப�படிகள�)"
+
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d items)"
 msgstr[1] "%s (%d உர�ப�படி)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2830 ../widgets/table/e-table-item.c:2831
-msgid "Alternating Row Colors"
-msgstr "அட�த�தட�த�த வரிசை நிறங�கள�"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2837 ../widgets/table/e-table-item.c:2838
-#: ../widgets/table/e-tree.c:3370 ../widgets/table/e-tree.c:3371
-msgid "Horizontal Draw Grid"
-msgstr "கிடைமட�ட கட�டங�கள�"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2844 ../widgets/table/e-table-item.c:2845
-#: ../widgets/table/e-tree.c:3376 ../widgets/table/e-tree.c:3377
-msgid "Vertical Draw Grid"
-msgstr "மேல�கீழ� கட�டங�கள�"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2851 ../widgets/table/e-table-item.c:2852
-#: ../widgets/table/e-tree.c:3382 ../widgets/table/e-tree.c:3383
-msgid "Draw focus"
-msgstr "க�றிப�பை வரை"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2858 ../widgets/table/e-table-item.c:2859
-msgid "Cursor mode"
-msgstr "கர�சர� பாங�க�"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2823 ../widgets/table/e-table-item.c:2824
-msgid "Selection model"
-msgstr "தேர�வ� மாதிரி"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2865 ../widgets/table/e-table-item.c:2866
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3364
-#: ../widgets/table/e-tree.c:3365
-msgid "Length Threshold"
-msgstr "த�வக�க நீளம�"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2899 ../widgets/table/e-table-item.c:2900
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3396
-#: ../widgets/table/e-tree.c:3397
-msgid "Uniform row height"
-msgstr "ஒத�த வரிசை உயரங�கள�"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "ம�டிவான"
-
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
 msgstr "தற�போதைய காட�சியை தனிப�பயனாக�க�..."
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Sort _Ascending"
 msgstr "_A �ற�வரிசையாக அட�க�க�க"
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1565
 msgid "Sort _Descending"
 msgstr "_D இறங�க� வரிசையாக அட�க�க�க"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1568
 msgid "_Unsort"
 msgstr "_U வரிசைப�பட�த�தல� நீக�க�க"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1571
 msgid "Group By This _Field"
 msgstr "_F இந�த ப�லம� வாரியாக க�ழ� செய�க"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Group By _Box"
 msgstr "_B பெட�டி வாரியாக க�ழ� செய�க"
 
-#: ../widgets/table/e-table-header-item.c:1518
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Remove This _Column"
 msgstr "_C இந�த பத�தியை நீக�க�க"
 
-#: ../widgets/table/e-table-header-item.c:1521
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Add a C_olumn..."
 msgstr "_o ஒர� பத�தியை சேர�க"
 
-#: ../widgets/table/e-table-header-item.c:1525
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "A_lignment"
 msgstr "_l சீர�மை"
 
-#: ../widgets/table/e-table-header-item.c:1528
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "B_est Fit"
 msgstr "_B நல�ல பொர�த�தம�"
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Format Column_s..."
 msgstr "_s நெட�வரிசையை ஒழ�ங�க� செய�க..."
 
-#: ../widgets/table/e-table-header-item.c:1535
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Custo_mize Current View..."
 msgstr "_m நடப�ப� காட�சியை தனிப�பயன� ஆக�க�க..."
 
-#: ../widgets/table/e-table-header-item.c:1594
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Sort By"
 msgstr "(_S) இதனால� வரிசைப�பட�த�த�"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1612
+#: ../widgets/table/e-table-header-item.c:1672
 msgid "_Custom"
 msgstr "(_C) தனிப�பயன�"
 
-#: ../widgets/table/e-table-item.c:2809 ../widgets/table/e-table-item.c:2810
-msgid "Table header"
-msgstr "அட�டவணை தலைப�ப�"
-
-#: ../widgets/table/e-table-item.c:2816 ../widgets/table/e-table-item.c:2817
-msgid "Table model"
-msgstr "அட�டவணை மாதிரி"
-
-#: ../widgets/table/e-table-item.c:2892 ../widgets/table/e-table-item.c:2893
-msgid "Cursor row"
-msgstr "நிலைகாட�டி நிரை"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "வரிசைப�பட�த�திய தகவல�"
-
-#: ../widgets/table/e-table.c:3345 ../widgets/table/e-tree.c:3403
-#: ../widgets/table/e-tree.c:3404
-msgid "Always search"
-msgstr "எப�போத�ம� தேட�"
-
-#: ../widgets/table/e-table.c:3352
-msgid "Use click to add"
-msgstr "சேர�க�க சொட�க�கவ�ம�"
-
-#: ../widgets/table/e-table.c:3366
-msgid "Vertical Row Spacing"
-msgstr "செங�க�த�த� வரி இடைவெளி"
-
-#: ../widgets/table/e-table.c:3367
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "வரிகள�க�க� இடையே செங�க�த�த� இடைவெளி. இத� வரியின� மேல�ம� கீழ�ம� சேர�க�கப�பட�ம�"
-
-#: ../widgets/table/e-tree.c:3389 ../widgets/table/e-tree.c:3390
-msgid "ETree table adapter"
-msgstr "E கிளை அட�டவணை �ற�பி"
-
-#: ../widgets/table/e-tree.c:3410
-msgid "Retro Look"
-msgstr "ப�திய பார�வை"
-
-#: ../widgets/table/e-tree.c:3411
-msgid "Draw lines and +/- expanders."
-msgstr "கோட�கள� +/- விரிவாக�கிகளை வரை"
-
-#: ../widgets/table/e-tree.c:3417
-msgid "Expander Size"
-msgstr "விரிவாக�கியின� அளவ�"
-
-#: ../widgets/table/e-tree.c:3418
-msgid "Size of the expander arrow"
-msgstr "விரிவாக�க அம�ப�க�க�றியின� அளவ�"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "மேல�மீட�ப�"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "ஒர� சேயை மேல�மீட�ப� செய�யவ�ம�"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "திர�த�தவ�ம�"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "இந�த அறையை திர�த�த ஆரம�பிக�கிறத�"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "மாற�ற�"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "அறைகள�க�கிடையே மாற�ற�"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "விரிவ�"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "இந�த அறை உள�ள வரியை ஈடிரீயில� விரிவாக�க�கிறத�."
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "க�ற�க�க�"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "இந�த அறை உள�ள வரியை ஈடிரீயில� க�ற�க�க�கிறத�."
 
@@ -22006,110 +21154,972 @@ msgstr "அனைத�தைய�ம� தேர�வ� செய�"
 msgid "Input Methods"
 msgstr "உள�ளிட�ம� ம�றைகள�"
 
-#: ../widgets/text/e-text.c:3303 ../widgets/text/e-text.c:3304
-msgid "Event Processor"
-msgstr "நிகழ�வ� செயல�ம�றைகள�"
+#~ msgid "{0}"
+#~ msgstr "{0}"
 
-#: ../widgets/text/e-text.c:3310 ../widgets/text/e-text.c:3311
-msgid "Text"
-msgstr "உரை"
+#~ msgid "{1}"
+#~ msgstr "{1}"
 
-#: ../widgets/text/e-text.c:3317 ../widgets/text/e-text.c:3318
-msgid "Bold"
-msgstr "தடிமன�"
+#~ msgid "Web Log:"
+#~ msgstr "இணைய பதிவ�:"
 
-#: ../widgets/text/e-text.c:3324 ../widgets/text/e-text.c:3325
-msgid "Strikeout"
-msgstr "அடிக�கவ�ம�"
+#~ msgid "_Web Log:"
+#~ msgstr "இணைய பதிவ�: (_W)"
 
-#: ../widgets/text/e-text.c:3331 ../widgets/text/e-text.c:3332
-msgid "Anchor"
-msgstr "இணைப�ப�"
+#~ msgid "Editable"
+#~ msgstr "தொக�க�கக�கூடிய"
+
+#~ msgid "Source Book"
+#~ msgstr "மூல ப�த�தகம�"
+
+#~ msgid "Target Book"
+#~ msgstr "சேர�ம� ப�த�தகம�"
+
+#~ msgid "Is New Contact"
+#~ msgstr "ப�திய தொடர�ப�"
+
+#~ msgid "Writable Fields"
+#~ msgstr "எழ�தக�கூடிய ப�லங�கள�"
 
-#: ../widgets/text/e-text.c:3338 ../widgets/text/e-text.c:3339
-msgid "Justification"
-msgstr "சீராக�க�"
+#~ msgid "Required Fields"
+#~ msgstr "தேவையான ப�லங�கள�"
 
-#: ../widgets/text/e-text.c:3345 ../widgets/text/e-text.c:3346
-msgid "Clip Width"
-msgstr "க�ளிப� அகலம�"
+#~ msgid "Changed"
+#~ msgstr "மாற�றப�பட�டத�"
 
-#: ../widgets/text/e-text.c:3352 ../widgets/text/e-text.c:3353
-msgid "Clip Height"
-msgstr "க�ளில� உயரம�"
+#~ msgid "Shell"
+#~ msgstr "ஷெல�"
 
-#: ../widgets/text/e-text.c:3359 ../widgets/text/e-text.c:3360
-msgid "Clip"
-msgstr "க�ளிப�"
+#~ msgid "The EShell singleton"
+#~ msgstr "தனித�த ஈஷெல�"
 
-#: ../widgets/text/e-text.c:3366 ../widgets/text/e-text.c:3367
-msgid "Fill clip rectangle"
-msgstr "க�ளிக� செவ�வகத�தை நிரப�ப�"
+#~ msgid "Book"
+#~ msgstr "ப�த�தகம�"
 
-#: ../widgets/text/e-text.c:3373 ../widgets/text/e-text.c:3374
-msgid "X Offset"
-msgstr "X ஒத�க�கம�"
+#~ msgid "Is New List"
+#~ msgstr "இத� ப�திய பட�டியல�"
 
-#: ../widgets/text/e-text.c:3380 ../widgets/text/e-text.c:3381
-msgid "Y Offset"
-msgstr "Y ஒத�க�கம�"
+#~ msgid "Query"
+#~ msgstr "கேள�வி"
 
-#: ../widgets/text/e-text.c:3415 ../widgets/text/e-text.c:3416
-msgid "Text width"
-msgstr "உரை அகலம�"
+#~ msgid "Model"
+#~ msgstr "மாதிரி"
 
-#: ../widgets/text/e-text.c:3422 ../widgets/text/e-text.c:3423
-msgid "Text height"
-msgstr "உரை உயரம�"
+#~ msgid "Shell View"
+#~ msgstr "ஷெல� காட�சி"
 
-#: ../widgets/text/e-text.c:3436 ../widgets/text/e-text.c:3437
-msgid "Use ellipsis"
-msgstr "நீள�வட�டத�தை பயன�பட�த�த�"
+#~ msgid "Source"
+#~ msgstr "மூலம�"
 
-#: ../widgets/text/e-text.c:3443 ../widgets/text/e-text.c:3444
-msgid "Ellipsis"
-msgstr "நீள�வட�டம�"
+#~ msgid "Width"
+#~ msgstr "அகலம�"
 
-#: ../widgets/text/e-text.c:3450 ../widgets/text/e-text.c:3451
-msgid "Line wrap"
-msgstr "வரி மடக�கி"
+#~ msgid "Height"
+#~ msgstr "உயரம�"
 
-#: ../widgets/text/e-text.c:3457 ../widgets/text/e-text.c:3458
-msgid "Break characters"
-msgstr "எழ�த�த� நிற�த�தம�"
+#~ msgid "Has Focus"
+#~ msgstr "த�வக�கதில�"
 
-#: ../widgets/text/e-text.c:3464 ../widgets/text/e-text.c:3465
-msgid "Max lines"
-msgstr "அதிகபட�ச வரிகள�"
+#~ msgid "Field"
+#~ msgstr "ப�லம�"
 
-#: ../widgets/text/e-text.c:3485 ../widgets/text/e-text.c:3486
-msgid "Draw borders"
-msgstr "ஓரங�களை வரை"
+#~ msgid "Field Name"
+#~ msgstr "ப�லத�தின� பெயர�"
 
-#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
-msgid "Allow newlines"
-msgstr "ப�திய வரிகளை அன�மதி"
+#~ msgid "Text Model"
+#~ msgstr "மாதிரி உரை"
 
-#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
-msgid "Draw background"
-msgstr "பின�னனியை வரை"
+#~ msgid "Max field name length"
+#~ msgstr "ப�லத�தின� பெயரின� அதிக பட�ச நீளம�"
 
-#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
-msgid "Draw button"
-msgstr "பட�டன�களை வரை"
+#~ msgid "Column Width"
+#~ msgstr "நெட�வரிசையின� அகலம�"
 
-#: ../widgets/text/e-text.c:3513 ../widgets/text/e-text.c:3514
-msgid "Cursor position"
-msgstr "கர�சர� நிலை"
+#~ msgid "Adapter"
+#~ msgstr "�ற�பி"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3523
-msgid "IM Context"
-msgstr "IM சூழல�"
+#~ msgid "Selected"
+#~ msgstr "தேர�வ� செய�யப�பட�ட"
 
-#: ../widgets/text/e-text.c:3529 ../widgets/text/e-text.c:3530
-msgid "Handle Popup"
-msgstr "மேல�மீட�பினை கையாள�"
+#~ msgid "Has Cursor"
+#~ msgstr "கர�சர� உள�ளத�"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "நாள�காட�டி கிடங�க� இணைப�பில� இல�லை"
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "{0} போத� பிழை"
+
+#~ msgid "No response from the server."
+#~ msgstr "சேவையகத�தில� இர�ந�த� பதில� இல�லை."
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "நாள�காட�டியை �ற�ற ம�டியவில�லை"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Attendee_s..."
+#~ msgstr "கலந�த�கொள�பவர�கள�_s..."
+
+#~ msgid "Default Client"
+#~ msgstr "ம�ன�னிர�ப�ப� சார�ந�தோன�"
+
+#~ msgid "Shell Settings"
+#~ msgstr "ஷெல� அமைவ�கள�"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "நிரல� சார� அமைப�ப�கள�"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "கலந�த�கொள�பவர�கள�... (_t)"
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "(_S)இன�றைய தேதியை தேர�வ� செய�"
+
+#~ msgid "New Tab"
+#~ msgstr "ப�திய கீற�ற�"
+
+#~ msgid "Name of the logger"
+#~ msgstr "உள�ந�ழைபவர� பெயர� "
+
+#~ msgid "Filename"
+#~ msgstr "கோப�பின� பெயர�:"
+
+#~ msgid "The filename of the module"
+#~ msgstr "இந�த கூறின� கோப�ப�ப� பெயர�"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "செர�க� பொதி  செயல�பட�த�தப�பட�டதா இல�லையா"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "க�விப�ப� தொடர�வி"
+
+#~ msgid "Shell Module"
+#~ msgstr "ஷெல� கூற�"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "அஞ�சல� ஷெல� இன� பின�செயலி"
+
+#~ msgid "Show Deleted"
+#~ msgstr "நீக�கப�பட�டதை காட�ட�"
+
+#~ msgid "To Do"
+#~ msgstr "செய�ய வேண�டியவை"
+
+#~ msgid "Later"
+#~ msgstr "பிறக�"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "ப�திய அடைவை உர�வாக�க ம�டியவில�லை `%s': %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "அடைவ�`%s'� `%s' இல�  நகலெட�க�க ம�டியவில�லை: %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "�ற�கெனவே உள�ள மின�னஞ�சல� பெட�டியில� தேட ம�டியவில�லை %s': %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "எவல�யூஷன� மின�னஞ�சல� பெட�டியில� வரிசை மற�ற�ம� இடம� மாற�றப�பட�டத� எவல�யூஷன� 1 பதிப�ப�.x.\n"
+#~ "\n"
+#~ "எவல�யூஷன� அடைவ�களை நகர�த�திக�கொண�டிர�க�கிறத�..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "பாப� சேவகனில� வைத�த தகவல�களை திறக�க ம�டியவில�லை`%s': %s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "பாப�3 சேவகனில� வைத�த தகவல�களை திறக�க ம�டியவில�லை`%s': %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "பாப�3 keep-on-server தகவலை நகலெட�க�க ம�டியவில�லை `%s': %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "உள� மின�னஞ�சல� சேமிப�பை உர�வாக�க�வதில� தோல�வி`%s': %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "ம�ந�தைய எவல�யூஷன� அமைப�பை படிக�க ம�டியவில�லை, `எவல�ஷன�/config.xmldb' இல�லை அல�லத� "
+#~ "சிதைந�தத�"
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "அளவான உரையை காட�ட எவலூஷனை அன�மதிக�கிறத�."
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "அளவான செய�தி உரை பக�தியை வரைவை செயல�பட�த�த�"
+
+#~ msgid "Text message part limit"
+#~ msgstr "உரை செய�திக�க� வரையளவ�."
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "�னெனில� \"{0}\"."
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "�னெனில� \"{2}\"."
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "கீழ�கண�ட தேட�ம� அடைவ�(கள�):\n"
+#~ "{0}\n"
+#~ "தற�போத� நீக�கப�பட�ட அடைவ�களை பயன�பட�த�த�கிறத�:\n"
+#~ "    \"{1}\"\n"
+#~ "மேல�ம� மேம�பட�த�தப�பட�கிறத�."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "கீழ�கண�ட வடிப�பி விதிம�றை(கள�):\n"
+#~ "{0}\n"
+#~ "தற�போத� நீக�கிய அடைவ�களை பயன�பட�த�த�கிறத�\n"
+#~ "    \"{1}\"\n"
+#~ "மற�ற�ம� மேம�பட�த�தப�பட�கிறத�."
+
+#~ msgid "Shell Backend"
+#~ msgstr "ஷெல� பின�இயக�கி"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "இந�த  அடைவில� மறைந�த�ள�ள செய�திகள� மட�ட�மே உள�ளன. அவற�றை காட�ட காட�சி-> மறைந�த�ள�ள "
+#~ "செய�திகளை காட�ட� பயன�பட�த�த�க."
+
+#~ msgid "Table column:"
+#~ msgstr "அட�டவணை பத�தி"
+
+#~ msgid "Source List"
+#~ msgstr "மூலம� பட�டியல�"
+
+#~ msgid "The registry of address books"
+#~ msgstr "ம�கவரி ப�த�தகங�களின� காப�பகம� "
+
+#~ msgid "Current View"
+#~ msgstr "தற�போதைய காட�சி"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "நடப�ப� தேர�வில� உள�ள  ம�கவரி  ப�த�தக காட�சி "
+
+#~ msgid "Previewed Contact"
+#~ msgstr "ம�ன�கண�ட தொடர�ப�"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "ம�ன�பார�வை பலகத�தில� காட�டப�பட�ம� தொடர�ப�"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "ம�ன�பார�வை தெரிகிறத�"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "ம�ன�பார�வை பலகத�தை காட�ட� வேண�ட�மா."
+
+#~ msgid "LDAP Servers"
+#~ msgstr "எல�டி�பி(LDAP) சேவையகம� களில�"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "தானியங�கி ம�டிக�க�ம� அமைப�ப�கள�"
+
+#~ 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 ""
+#~ "எவல�யூஷன� தொடர�ப�கள� அடைவில� இடம� மற�ற�ம� அடைவை நிலை எவல�யூஷன� 1.x. இல� உள�ளத� போல� "
+#~ "இல�லாமல� இப�போத� மாற�றப�பட�ட�ள�ளத� .\n"
+#~ "\n"
+#~ "எவல�யூஷன� உங�கள� அடைவ�களை இடம� பெயர�க�க�ம� வரை காத�திர�க�கவ�ம�..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "மின�னஞ�சல� பட�டியலின� அமைப�ப� மாறிவிட�டத�.\n"
+#~ "\n"
+#~ "எவல�யூஷன� உங�கள� அடைவை இடம�பெயர�க�க�ம� வரை காத�திர�க�கவ�ம�..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "தொலைபேசி எண�களை சேமிக�க�ம� விதம� மாற�றப�பட�டத�.\n"
+#~ "\n"
+#~ "எவல�யூஷன� உங�கள� அடைவை இடம�பெயர�க�க�ம� வரை காத�திர�க�கவ�ம�..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "எவல�யீஷனில� கையடக�க கணினி தகவல� ஒத�திசைத�தல� மற�ற�ம� தகவல� க�றித�தலில� மாற�றங�கள� "
+#~ "நிகழ�ந�த�ள�ளத�.\n"
+#~ "\n"
+#~ "எவல�யூஷன� உங�கள� கையடக�க கணினி தகவல� ஒத�திசைதல� இடம�பெயர�க�க�ம� வரை காத�திர�க�கவ�ம�..."
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "க�றிப�ப� மூல தேர�வாளர�"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "இந�த க�ற�நிரல� ம�கவரி ப�த�தகங�களின� க�ழ�க�களை காட�ட�கிறத�"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "விகார�ட� என சேமி..."
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "நாட�காட�டிகள� பதிவகம�."
+
+#~ 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 ""
+#~ "எவல�யூஷன� நாள�காட�டியின� இடம� மற�ற�ம� ம�ன�ன�ரிமை தகவல�கள� மாற�றப�பட�டத� எவல�யூஷன� 1.x.\n"
+#~ "\n"
+#~ "எவல�யூஷன� உங�கள� அடைவ�களை நகர�த�த�ம� வரை காத�திர�க�கவ�ம�"
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr "எவல�ஷன�/config.xmldb லிர�ந�த� பழைய அமைப�ப�களை நகர�த�த ம�டியவில�லை"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "`%s' நாள�காட�டியை நகர�த�த ம�டியவில�லை"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "தேதி உலாவல� க�ற�நிரல�"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "இந�த க�ற�நிரல� ஒர� சிற� நாள�காட�டியை காட�ட�ம�"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "ம�ன�னிர�ப�ப� நாள�காட�டி சார�ந�தோன�"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "நாள�காட�டி செயல�கள�க�க� ம�ன�னிர�ப�ப� சார�ந�தோன�"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "இந�த க�ற�நிரல� ஒர� தொக�ப�ப�  நாள�காட�டிகளை காட�ட�ம�"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "நினைவூட�டல�  பட�டியல�கள�  பதிவகம� "
+
+#~ msgid "The memo table model"
+#~ msgstr "மாதிரி நினைவூட�டல� அட�டவணை "
+
+#~ msgid "Default Memo Client"
+#~ msgstr "ம�ன�னிர�ப�ப� நினைவூட�டல� சார�ந�தோன�"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "நினைவூட�டல�க�க� ம�ன�னிர�ப�ப� சார�ந�தோன�"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "இந�த க�ற�நிரல� நினைவூட�டல� பட�டியல�கள� தொக�ப�பை காட�ட�கிறத�"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "பணி பட�டியல�கள�  பதிவகம� "
+
+#~ msgid "The task table model"
+#~ msgstr "மாதிரி பணி அட�டவணை "
+
+#~ 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 ""
+#~ "எவல�யூஷன� பணியின� இடம� மற�ற�ம� ம�ன�ன�ரிமை தகவல�கள� மாற�றப�பட�டத� எவல�யூஷன� 1.x.\n"
+#~ "\n"
+#~ "எவல�யூஷன� உங�கள� அடைவ�களை நகர�த�த�ம� வரை காத�திர�க�கவ�ம�"
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "%s' பணியை நகர�த�த ம�டியவில�லை"
+
+#~ msgid "Default Task Client"
+#~ msgstr "ம�ன�னிர�ப�ப� பணி சார�ந�தோன�"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "பணி செயல�கள�க�க� ம�ன�னிர�ப�ப� சார�ந�தோன�"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "இந�த க�ற�நிரல� பணி பட�டியல�கள� தொக�ப�பை காட�ட�கிறத�"
+
+#~ msgid "Group by Threads"
+#~ msgstr "ப�ரிகளால� க�ழ�வாக�க�"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "செய�திகளை ப�ரிகளால� க�ழ�வாக�க�வதா"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "படித�த செய�திகளை மறை (_R)"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "�ற�கெனவே படித�த செய�திகளை தற�காலிகமாக மறை"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "தேர�ந�தெட�த�த செய�திகளை மறை (_e)"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "தேர�வ� செய�யப�பட�ட செய�தியை தற�காலிகமாக மறை"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "_n மறைத�த செய�திகளை காட�ட�க"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "தற�காலிகமாக மறைக�கப�பட�ட செய�திகளை காட�ட�"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "(_D)அழித�தத�த செய�திகளை மறை"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "செய�திகளில� அடித�த� காட�ட�வதற�க� பதிலாக அவற�றை மறை"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr "இணைப�ப� நினைவ�ற�த�தி சொர�கிக�க� செய�தியின� உடலில� தேட சாடைகளின� பட�டியல�"
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "எவல�யூஷன� க�க� ஹ�லா ஆதரவ�  சேர� "
+
+#~ msgid "Hula Support"
+#~ msgstr "ஹ�லா ஆதரவ�"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "கர�விப�பட�டை பாங�க� (_b)"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "மாற�றியின� கர�விப�பட�டை பாங�க�"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "கர�விப�பட�டி தெரிகிறத�"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "மாற�றி தெரிய வேண�ட�மா."
+
+#~ msgid "Switcher Action"
+#~ msgstr "மாற�றியின� செயல�"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "இந�த ஷெல� காட�சிக�க� மாற�றியின� செயல�"
+
+#~ msgid "Page Number"
+#~ msgstr "பக�க எண�"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "ஷெல� காட�சியின� க�றிப�ப� ப�த�தக பக�கம� எண� "
+
+#~ msgid "Search Rule"
+#~ msgstr "தேட�ம� விதி"
+
+#~ msgid "Criteria for the current search results"
+#~ msgstr "நடப�ப� தேடல� விடைகள�க�க� அளப�ர�கள�"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "இந�த ஷெல� காட�சிக�க� ஈஷெல� பின�இயக�கி"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "ஷெல� உள�ளடக�க விட�செட�"
+
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr "உள�ளடக�க விட�செட� சாளரத�தின� வலத� பலகத�தில� தென�பட�ம�"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "ஷெல� பக�கப�பட�டை விட�செட�"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr "பக�கப�பட�டை விட�செட� சாளரத�தின� இடத� பலகத�தில� தென�பட�ம�"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "ஷெல� பணிப�பட�டை விட�செட�"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr "பணிப�பட�டை விட�செட�  ஷெல� சாளரத�தின� கீழ� தென�பட�ம�"
+
+#~ msgid "Shell Window"
+#~ msgstr "ஷெல� சாளரம�"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "ஷெல� காட�சி பொர�ந�த�ம� சாளரம�"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "விட�செட�டின� நிலை தரவை கொண�ட�ள�ள விசை"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "ஷெல� காட�சியின� தலைப�ப�"
+
+#~ msgid "Current View ID"
+#~ msgstr "தற�போதைய காட�சியின� �டி"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "தற�போதைய ஜி�எல�  காட�சியின� �டி"
+
+#~ msgid "Active Shell View"
+#~ msgstr "செயலில� உள�ள ஷெல� காட�சி"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "செயலில� உள�ள ஷெல� காட�சியின� பெயர�:"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "ஷெல� சாளரத�தின� EFocusTracker"
+
+#~ msgid "Geometry"
+#~ msgstr "ஜியோமிதி"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "ஆரம�ப நிலை சாளர சரத�தின� வடிவம� "
+
+#~ msgid "Safe Mode"
+#~ msgstr "பாத�காப�ப� பாங�க�"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "ஷெல� சாளரம� பாத�காப�ப� பாங�கில�  உள�ளதா"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "பக�கப�பட�டை தெரிகிறத�"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "ஷெல� சாளர பக�கப�பட�டை  தெரிய வேண�ட�மா."
+
+#~ msgid "Switcher Visible"
+#~ msgstr "மாற�றி தெரிகிறத�"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "ஷெல� சாளர மாற�றி பொத�தான� தெரிய வேண�ட�மா."
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "பணிப�பட�டி தெரிகிறத�"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "ஷெல� சாளர பணிப�பட�டி  தெரிய வேண�ட�மா"
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "ஷெல� சாளர கர�விப�பட�டி  தெரிய வேண�ட�மா."
+
+#~ msgid "UI Manager"
+#~ msgstr "யூ� மேலாளர�"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "ஷெல� சாளரத�தின� (GtkUI) ஜிடிகேயூ�  மேலாளர�"
+
+#~ msgid "Module Directory"
+#~ msgstr "கூற� அடைவ�"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "ஈமாட�ல�களை �ற�ற வேண�டிய அடைவ�"
+
+#~ msgid "Network Available"
+#~ msgstr "வலையமைப�ப� இர�ப�பில� இல�லை"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "வலையமைப�ப� இர�ப�பில� உள�ளதா"
+
+#~ msgid "Online"
+#~ msgstr "இணைப�பில�"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "ஷெல� இணைப�பில� உள�ளதா "
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "எவல�யூஷன� 1.4 லிர�ந�த� மீண�ட�ம� மாற�றப�பட�கிறத�"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "மேம�பட�த�த�வதற�க� வட�டில� இடம� இல�லை"
+
+#~ msgid "Really delete old data?"
+#~ msgstr "தகவலை நீக�க வேண�ட�மா"
+
+#~ 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 ""
+#~ "&quot;எவல�யூஷன�&quot; அடைவின� அனைத�த� உள�ளடக�கங�கள�ம� நிரந�தரமாக நீக�கப�பட�ம�.\n"
+#~ "\n"
+#~ "பழைய தரவ� அனைத�த�ம� நீக�க� ம�ன� கைம�றையாக உங�கள� அஞ�சல�கள�, தொடர�ப�கள� மற�ற�ம� நாள�காட�டி "
+#~ "தரவ� அனைத�த�ம� இர�ப�பதைய�ம�, இந�த பதிப�ப� எவல�யூஷன� சரியாக வேலை செய�ய�கிறத� "
+#~ "என�பதைய�ம� உற�தி செய�த� கொள�க.\n"
+#~ "\n"
+#~ "நீக�கப�பட�ட பின� பழைய வடிவ நிலை எவல�யூஷன�க�க� கைம�றை அல�லாத� வேற� வழியில� கீழ�பட�த�த "
+#~ "ம�டியாத�.\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "ம�ந�தைய வடிவ நிலை எவல�யூஷன� அதன� தரவை வேற� இடத�தில� வைத�த� இர�ந�தத�. \n"
+#~ "\n"
+#~ "இந�த தரவை நீக�க ம�டிவ� செய�தால�, &quot;எவல�யூஷன�&quot; அடைவின� அனைத�த� உள�ளடக�கங�கள�ம� "
+#~ "நிரந�தரமாக நீக�கப�பட�ம�. தரவை வைத�த�க�கொள�ள ம�டிவ� செய�தால� பின�னால� வசதிபட�ட போத� "
+#~ "&quot;எவல�யூஷன�&quot; அடைவின� உள�ளடக�கங�களைய�ம� நீக�கிக�கொள�ளலாம�.\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "உங�கள� தரவ� மற�ற�ம� அமைப�ப�களை மேம�பட�த�த {0} வட�ட� இடாம� தேவை ஆனால� {1} இடம� மட�ட�மே "
+#~ "உள�ளத�.\n"
+#~ "\n"
+#~ "மேலே தொடர�ம� ம�ன� உங�கள� இல�லம� அடைவில� அதிக இடம� தயார� செய�ய வேண�ட�ம�."
+
+#~ msgid "_Keep Data"
+#~ msgstr "(_K)தகவலை அப�படியே வை"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "(_R) பிறக� நினைவூட�ட�."
+
+#~ msgid "Collection"
+#~ msgstr "சேகரிப�ப�"
+
+#~ msgid "Instance"
+#~ msgstr "நிகழ�வ�கள�"
+
+#~ msgid "Factory"
+#~ msgstr "தொழிற�சாலை"
+
+#~ msgid "Action"
+#~ msgstr "செயல�"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "ஒர� ஜிடிகே ரேடியோ செயல�"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "இணைப�ப� பட�டையை காட�ட� (_A)"
+
+#~ msgid "Fill color"
+#~ msgstr "வண�ண நிரப�பி"
+
+#~ msgid "GDK fill color"
+#~ msgstr "GDK வண�ண நிரப�பி"
+
+#~ msgid "Fill stipple"
+#~ msgstr "ப�ள�ளிகளால� நிரப�ப�"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "க�றைந�தபட�ச அகலம�"
+
+#~ msgid "Minimum Width"
+#~ msgstr "க�றைந�தபட�ச அகலம�"
+
+#~ msgid "Spacing"
+#~ msgstr "இடைவெளி"
+
+#~ msgid "The button state is online"
+#~ msgstr "பொத�தான� இணைப�பில� நிலையில� உள�ளத�"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "கிடைமட�ட நிலை"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "கிடைமட�டமாக உள�ள போத� பலகத�தின� இடம�."
+
+#~ msgid "Vertical Position"
+#~ msgstr "செங�க�த�த� நிலை"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "செங�க�த�தாக வைத�த போத�  பலகத�தின� இடம� ."
+
+#~ msgid "Proportion"
+#~ msgstr "விகிதம�"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "இரண�டாம� பலகத�தின� விகிதம�"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "நிலையான அளவ� மாற�றம�"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "அளவ� மாற�ற�ம�போத� இரண�டாம� பலகத�தை நிலையாக வைக�கவ�ம�"
+
+#~ msgid "Cursor Row"
+#~ msgstr "நிலைகாட�டி நிரை"
+
+#~ msgid "Cursor Column"
+#~ msgstr "நிலைகாட�டி நிரல�"
+
+#~ msgid "Sorter"
+#~ msgstr "வரிசைப�பட�த�தி"
+
+#~ msgid "Selection Mode"
+#~ msgstr "தேர�ந�தெட�த�தல� ம�றை"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "நிலைகாட�டி ம�றை"
+
+#~ msgid "Selected Column"
+#~ msgstr "தேர�வ� செய�யப�பட�ட நெட�வரிசை"
+
+#~ msgid "Focused Column"
+#~ msgstr "க�றிப�பிடப�பட�ட நெட�வரிசை"
+
+#~ msgid "Unselected Column"
+#~ msgstr "தேர�வ� செய�யப�படாத நெட�வரிசை"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "அடிக�கப�பட�ட நெட�வரிசை"
+
+#~ msgid "Underline Column"
+#~ msgstr "அடிக�கோடிட�ட நெட�வரிசை"
+
+#~ msgid "Bold Column"
+#~ msgstr "பெரிதாக�கப�பட�ட நெட�வரிசை"
+
+#~ msgid "Color Column"
+#~ msgstr "நிற நெட�வரிசை"
+
+#~ msgid "BG Color Column"
+#~ msgstr "பின�ப�ல நிற நெட�வரிசை"
+
+#~ msgid "State"
+#~ msgstr "நிலை"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "அட�த�தட�த�த வரிசை நிறங�கள�"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "கிடைமட�ட கட�டங�கள�"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "மேல�கீழ� கட�டங�கள�"
+
+#~ msgid "Draw focus"
+#~ msgstr "க�றிப�பை வரை"
+
+#~ msgid "Cursor mode"
+#~ msgstr "கர�சர� பாங�க�"
+
+#~ msgid "Selection model"
+#~ msgstr "தேர�வ� மாதிரி"
+
+#~ msgid "Length Threshold"
+#~ msgstr "த�வக�க நீளம�"
+
+#~ msgid "Uniform row height"
+#~ msgstr "ஒத�த வரிசை உயரங�கள�"
+
+#~ msgid "Frozen"
+#~ msgstr "ம�டிவான"
+
+#~ msgid "Table header"
+#~ msgstr "அட�டவணை தலைப�ப�"
+
+#~ msgid "Table model"
+#~ msgstr "அட�டவணை மாதிரி"
+
+#~ msgid "Cursor row"
+#~ msgstr "நிலைகாட�டி நிரை"
+
+#~ msgid "Sort Info"
+#~ msgstr "வரிசைப�பட�த�திய தகவல�"
+
+#~ msgid "Always search"
+#~ msgstr "எப�போத�ம� தேட�"
+
+#~ msgid "Use click to add"
+#~ msgstr "சேர�க�க சொட�க�கவ�ம�"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "செங�க�த�த� வரி இடைவெளி"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr "வரிகள�க�க� இடையே செங�க�த�த� இடைவெளி. இத� வரியின� மேல�ம� கீழ�ம� சேர�க�கப�பட�ம�"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "E கிளை அட�டவணை �ற�பி"
+
+#~ msgid "Retro Look"
+#~ msgstr "ப�திய பார�வை"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "கோட�கள� +/- விரிவாக�கிகளை வரை"
+
+#~ msgid "Expander Size"
+#~ msgstr "விரிவாக�கியின� அளவ�"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "விரிவாக�க அம�ப�க�க�றியின� அளவ�"
+
+#~ msgid "popup"
+#~ msgstr "மேல�மீட�ப�"
+
+#~ msgid "edit"
+#~ msgstr "திர�த�தவ�ம�"
+
+#~ msgid "toggle"
+#~ msgstr "மாற�ற�"
+
+#~ msgid "expand"
+#~ msgstr "விரிவ�"
+
+#~ msgid "collapse"
+#~ msgstr "க�ற�க�க�"
+
+#~ msgid "Event Processor"
+#~ msgstr "நிகழ�வ� செயல�ம�றைகள�"
+
+#~ msgid "Text"
+#~ msgstr "உரை"
+
+#~ msgid "Bold"
+#~ msgstr "தடிமன�"
+
+#~ msgid "Strikeout"
+#~ msgstr "அடிக�கவ�ம�"
+
+#~ msgid "Anchor"
+#~ msgstr "இணைப�ப�"
+
+#~ msgid "Justification"
+#~ msgstr "சீராக�க�"
+
+#~ msgid "Clip Width"
+#~ msgstr "க�ளிப� அகலம�"
+
+#~ msgid "Clip Height"
+#~ msgstr "க�ளில� உயரம�"
+
+#~ msgid "Clip"
+#~ msgstr "க�ளிப�"
+
+#~ msgid "Fill clip rectangle"
+#~ msgstr "க�ளிக� செவ�வகத�தை நிரப�ப�"
+
+#~ msgid "X Offset"
+#~ msgstr "X ஒத�க�கம�"
+
+#~ msgid "Y Offset"
+#~ msgstr "Y ஒத�க�கம�"
+
+#~ msgid "Text width"
+#~ msgstr "உரை அகலம�"
+
+#~ msgid "Text height"
+#~ msgstr "உரை உயரம�"
+
+#~ msgid "Use ellipsis"
+#~ msgstr "நீள�வட�டத�தை பயன�பட�த�த�"
+
+#~ msgid "Ellipsis"
+#~ msgstr "நீள�வட�டம�"
+
+#~ msgid "Line wrap"
+#~ msgstr "வரி மடக�கி"
+
+#~ msgid "Break characters"
+#~ msgstr "எழ�த�த� நிற�த�தம�"
+
+#~ msgid "Max lines"
+#~ msgstr "அதிகபட�ச வரிகள�"
+
+#~ msgid "Draw borders"
+#~ msgstr "ஓரங�களை வரை"
+
+#~ msgid "Allow newlines"
+#~ msgstr "ப�திய வரிகளை அன�மதி"
+
+#~ msgid "Draw background"
+#~ msgstr "பின�னனியை வரை"
+
+#~ msgid "Draw button"
+#~ msgstr "பட�டன�களை வரை"
+
+#~ msgid "Cursor position"
+#~ msgstr "கர�சர� நிலை"
+
+#~ msgid "IM Context"
+#~ msgstr "IM சூழல�"
+
+#~ msgid "Handle Popup"
+#~ msgstr "மேல�மீட�பினை கையாள�"
 
 #~ msgid "Loading appointments at %s"
 #~ msgstr " %s இல� சந�திப�ப� � �ற�ற�கிறத�"
@@ -22281,9 +22291,6 @@ msgstr "மேல�மீட�பினை கையாள�"
 #~ msgid "<span weight=\"bold\">Date/Time Format</span>"
 #~ msgstr "<span weight=\"bold\">தேதி/நேரம� பாங�க�</span>"
 
-#~ msgid "<span weight=\"bold\">General</span>"
-#~ msgstr "<span weight=\"bold\">பொத�வான</span>"
-
 #~ msgid "<span weight=\"bold\">Task List</span>"
 #~ msgstr "<span weight=\"bold\">பணி பட�டியல�</span>"
 
@@ -22483,9 +22490,6 @@ msgstr "மேல�மீட�பினை கையாள�"
 #~ msgid "<b>_Languages</b>"
 #~ msgstr "<b>(_L)மொழிகள�</b>"
 
-#~ msgid "<span weight=\"bold\">Account Information</span>"
-#~ msgstr "<span weight=\"bold\">கணக�க� தகவல�</span>"
-
 #~ msgid "<span weight=\"bold\">Authentication</span>"
 #~ msgstr "<span weight=\"bold\">அன�மதி</span>"
 
@@ -22498,9 +22502,6 @@ msgstr "மேல�மீட�பினை கையாள�"
 #~ msgid "<span weight=\"bold\">Default Behavior</span>"
 #~ msgstr "<span weight=\"bold\">பொத�வான நடத�தை</span>"
 
-#~ msgid "<span weight=\"bold\">Delete Mail</span>"
-#~ msgstr "<span weight=\"bold\">மின�னஞ�சலை நீக�க�</span>"
-
 #~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 #~ msgstr "<span weight=\"bold\">(_H)காட�டப�பட�ட செய�தி  தலைப�ப�கள� </span>"
 
@@ -22752,9 +22753,6 @@ msgstr "மேல�மீட�பினை கையாள�"
 #~ "இயல�பான\n"
 #~ "க�றைந�த"
 
-#~ msgid "Add a column..."
-#~ msgstr "நெட�வரிசையை சேர�..."
-
 #~ msgid "Field Chooser"
 #~ msgstr "ப�லத�தேர�வாளர�"
 
diff --git a/po/te.po b/po/te.po
index f28d8e110e..591f056596 100644
--- a/po/te.po
+++ b/po/te.po
@@ -3,22 +3,24 @@
 # Copyright (C) 2005 Free Software Foundation, Andhra Pradesh.
 # This file is distributed under the same license as the evolution package.
 #
-#: ../shell/main.c:631
 # Prajasakti Localisation Team <localisation@prajasakti.com>, 2005.
 # భరత� క�మార� <bharatfsf@gmail.com>, 2007.
 # Krishna Babu K <kkrothap@redhat.com>, 2008, 2009, 2010.
+#: ../shell/main.c:479
 msgid ""
 msgstr ""
 "Project-Id-Version: te\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n"
-"POT-Creation-Date: 2009-08-28 13:23+0000\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=evolution\n"
+"POT-Creation-Date: 2010-03-26 09:27+0000\n"
 "PO-Revision-Date: 2010-01-04 17:09+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
 "Language-Team: Telugu <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
 "\n"
 "\n"
 "\n"
@@ -26,315 +28,6 @@ msgstr ""
 "\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution address book"
-msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం"
-
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:208
-msgid "New Contact"
-msgstr "కొత�త  పరిచయం"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:216
-msgid "New Contact List"
-msgstr "కొత�త  పరిచయ జాబితా"
-
-#: ../a11y/addressbook/ea-minicard-view.c:161
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "ప�రస�త�త చిర�నామా ప�స�తకం సంచయం %s కలిగిఉంది %d కార�డ�న�"
-msgstr[1] "ప�రస�త�త చిర�నామా ప�స�తకం సంచయం %s కలిగిఉంది %d కార�డ�లన�"
-
-#: ../a11y/addressbook/ea-minicard.c:31
-msgid "Open"
-msgstr "తెర�వ�మ�"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "పరిచయ జాబితా:"
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "పరిచయం: "
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "ఎవల�యూషన�  యొక�క చిన�నపలకం"
-
-#: ../a11y/calendar/ea-cal-view-event.c:263
-msgid "It has alarms."
-msgstr "హెచ�చరిక జారిచెయ� సౌలభ�యం కలద�"
-
-#: ../a11y/calendar/ea-cal-view-event.c:266
-msgid "It has recurrences."
-msgstr "ప�నరావృతి కావటం ఉన�నది"
-
-#: ../a11y/calendar/ea-cal-view-event.c:269
-msgid "It is a meeting."
-msgstr "అది ఒక సమావేశం."
-
-#: ../a11y/calendar/ea-cal-view-event.c:275
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "క�యాలెండర� ఘటన:%s సంక�షిప�తమైనది"
-
-#: ../a11y/calendar/ea-cal-view-event.c:277
-msgid "Calendar Event: It has no summary."
-msgstr "క�యాలెండర� ఘటన : దీనికి సంక�షిప�తమ�లేద�"
-
-#: ../a11y/calendar/ea-cal-view-event.c:297
-msgid "calendar view event"
-msgstr "క�యాలెండర� దర�శన ఘటన"
-
-#: ../a11y/calendar/ea-cal-view-event.c:525
-msgid "Grab Focus"
-msgstr "దృష�టిని లాగ�మ�"
-
-#: ../a11y/calendar/ea-cal-view.c:299
-msgid "New Appointment"
-msgstr "కొత�త నియామకం"
-
-#: ../a11y/calendar/ea-cal-view.c:300
-msgid "New All Day Event"
-msgstr "కొత�త  పూర�తి రోజ� ఘటన"
-
-#: ../a11y/calendar/ea-cal-view.c:301
-msgid "New Meeting"
-msgstr "కొత�త సమావేశం"
-
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "Go to Today"
-msgstr "ఈ రోజ� క� వెళ�ళ�"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "Go to Date"
-msgstr "తారీఖ� క� వెళ�ళ�"
-
-#: ../a11y/calendar/ea-day-view-main-item.c:300
-#: ../a11y/calendar/ea-week-view-main-item.c:297
-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:148 ../a11y/calendar/ea-week-view.c:147
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "%d ఘటన కలిగి ఉంది"
-msgstr[1] "%d ఘటనలన� కలిగి ఉంది"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
-msgid "It has no events."
-msgstr "దీనికి � ఘటనల� లేవ�"
-
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:159
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "పనివారమ� దర�శనం: %s. %s"
-
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:165
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "రోజ� దర�శనం: %s. %s"
-
-#: ../a11y/calendar/ea-day-view.c:196
-msgid "calendar view for a work week"
-msgstr "ఒక వారానికి క�యాలెండర� దర�శనం"
-
-#: ../a11y/calendar/ea-day-view.c:198
-msgid "calendar view for one or more days"
-msgstr "ఒకటి లేదా కొన�ని రోజ�లకి క�యాలెండర� దర�శనం"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:771
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:774
-#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
-#: ../calendar/gui/e-week-view-main-item.c:368
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../a11y/calendar/ea-gnome-calendar.c:196
-#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:783
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:215
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../a11y/calendar/ea-gnome-calendar.c:227
-#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:802
-#: ../calendar/gui/calendar-component.c:808
-#: ../calendar/gui/calendar-component.c:810
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:800
-#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
-#: ../calendar/gui/e-week-view-main-item.c:382
-msgid "%d %b"
-msgstr "%d %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:245
-#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:782
-msgid "Gnome Calendar"
-msgstr "గ�నోమ� క�యాలెండర�"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:288
-msgid "search bar"
-msgstr "వెత�క� పట�టా"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:289
-msgid "evolution calendar search bar"
-msgstr "ఎవల�యూషన� క�యాలెండర� వెత�క� పట�టా"
-
-#: ../a11y/calendar/ea-jump-button.c:146
-msgid "Jump button"
-msgstr "దూక� బటన�"
-
-#: ../a11y/calendar/ea-jump-button.c:155
-msgid "Click here, you can find more events."
-msgstr "ఇక�కడ  నొక�కండి, మీక� మరిన�ని ఘటనల� కనబడతాయి"
-
-#: ../a11y/calendar/ea-week-view.c:154
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "నెల దర�శనం: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:158
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "వారప� దర�శనం: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:189
-msgid "calendar view for a month"
-msgstr "ఒక నెలక� క�యాలెండర� దర�శనం"
-
-#: ../a11y/calendar/ea-week-view.c:191
-msgid "calendar view for one or more weeks"
-msgstr "ఒకటి లేదా మరిన�ని వారాలకి క�యాలెండర� దర�శనం"
-
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr " ప�రత�యక�షమ�"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
-msgid "popup a child"
-msgstr "చైల�డ� న� పాప�‌చేయి"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr " సరిచేయ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
-msgid "begin editing this cell"
-msgstr "ఈ అరన�  సరిచేయడం ప�రారంభించండి"
-
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "మార�ప�"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
-msgid "toggle the cell"
-msgstr "అరన� మార�చ�మ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr " విస�తరించ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
-msgid "expands the row in the ETree containing this cell"
-msgstr "ETree కలిగివ�న�న అర లోని అడ�డపట�టీని విస�తరిస�త�ంది"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "క�ప�పకూల�చ�మ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
-msgid "collapses the row in the ETree containing this cell"
-msgstr "అరన� కలిగిఉన�న ETree లోని అడ�డ�వర�సన� క�ప�పకూల�చ�మ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell.c:120
-msgid "Table Cell"
-msgstr "పట�టికలో  అర"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
-#: ../widgets/table/e-table-click-to-add.c:578
-msgid "click to add"
-msgstr "జతచేయ�టక� నొక�కండి"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
-msgid "click"
-msgstr "మీటన� నొక�క�మ�"
-
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
-msgid "sort"
-msgstr " చక�కదిద�ద�"
-
-#: ../a11y/widgets/ea-calendar-item.c:295
-#: ../a11y/widgets/ea-calendar-item.c:301
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
-
-# ద�, c-format
-#: ../a11y/widgets/ea-calendar-item.c:303
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "క�యాలెండర�: %s న�ండి %s వరక�"
-
-#: ../a11y/widgets/ea-calendar-item.c:338
-msgid "evolution calendar item"
-msgstr "ఎవల�యూషన� క�యాలెండర� అంశమ�"
-
-#: ../a11y/widgets/ea-combo-button.c:56
-msgid "Combo Button"
-msgstr "కాంబో బొత�తం"
-
-#: ../a11y/widgets/ea-combo-button.c:66
-msgid "Activate Default"
-msgstr "అప�రమేయాన�ని క�రియాశీలీకరించ�"
-
-#: ../a11y/widgets/ea-combo-button.c:68
-msgid "Popup Menu"
-msgstr "ప�రత�యక�షమయ�యే జాబితా"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -385,66 +78,55 @@ msgid "Could not remove address book."
 msgstr "చిర�నామా ప�స�తకాన�ని తొలగించలేమ�"
 
 #: ../addressbook/addressbook.error.xml.h:11
-#| msgid ""
-#| "Currently you can access only GroupWise System Address Book from "
-#| "Evolution. Please use some other GroupWise mail client once, to get your "
-#| "GroupWise Frequent Contacts and GroupWise Personal Contacts folders."
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
 "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
 "ప�రస�త�తం మీర� ఎవాల�యూషన� న�ండి సమూహతరహా చిర�నామా ప�స�తకం న� మాత�రమే వాడ�కోగలర�. మీ తరచూ "
-"సమూహతరహా పరిచయాలన� మరియ� సమూహతరహా వ�యక�తిగత పరిచయాల సంచయాలన� పొంద�టక�, దయచేసి వేరొక సమూహతరహా మెయిల� కక�షిదారిని ఒకసారి వ�పయోగించండి."
+"సమూహతరహా పరిచయాలన� మరియ� సమూహతరహా వ�యక�తిగత పరిచయాల సంచయాలన� పొంద�టక�, దయచేసి వేరొక సమూహతరహా "
+"మెయిల� కక�షిదారిని ఒకసారి వ�పయోగించండి."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "చిర�నామా ప�స�తకాన�ని తొలగించండి '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading address book."
-msgstr "చిర�నామా ప�స�తకాన�ని నింపడంలో దోషమ�."
-
-#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0} న� {1} క� దాయ�టలో దోషం: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Failed to authenticate with LDAP server."
 msgstr "LDAP సేవిక తో ప�రామాణీకరించడంలో విఫలమయినది."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
 msgid "Failed to delete contact"
 msgstr "పరిచయాన�ని తొలగించడంలో విఫలమయినది"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "GroupWise Address book creation:"
 msgstr "గ�రూప�ల వారీగా  చిర�నామా ప�స�తక సృష�టి:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP సేవిక    మ�ఖ�యాంశ సూచిక  సమాచారం తో స�పపందించలేద� "
 
-#: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:54
-msgid "Server Version"
-msgstr "సేవిక వివరణమ�"
-
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr "మీ ప�రస�త�త  సేవికతో కొన�ని లక�షణాల� సరిగ�గా పనిచేయవ�"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "ఎవల�యూష�న� చిర�నామా ప�స�తకం ఊహించని విధంగా త�యజించబడినది."
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "The image you have selected is large. Do you want to resize and store it?"
+#: ../addressbook/addressbook.error.xml.h:20
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr "మీర� ఎంచ�క�న�న ప�రతిరూపం చాలా పెద�దది. మీర� దాన�ని మార�చి దాయాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -453,15 +135,15 @@ msgstr ""
 "ఈ LDAP సేవిక పాత LDAP వర�షన� న� ఉపయోగిస�త�ండవచ�చ�, �దైతే ఈ ఫంక�షనాలిటినికి మద�దత� నీయదో లేదా ఇది "
 "తప�ప�గాఆకృతీకరించి ఉండవచ�చ�. మద�దత�నిచ�చ� శోధన ఆధారాల కొరక� మీ నిర�వహణాధికారిని సంప�రదించండి."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book could not be opened."
 msgstr "ఈ చిర�నామా ప�స�తకాన�ని తెర�వలేకపోయింది."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book server does not have any suggested search bases."
 msgstr "ఈ చిర�నామా ప�స�తక సేవికక�  తగ�గ వెత�క� మూలాల� లేవ�"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:24
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -469,31 +151,31 @@ msgstr ""
 "ఈ చిర�నామా ప�స�తక సేవిక అంద�బాట�లో లేద� లేక సేవిక నామమ�ఉచ�ఛారణలో లోపం జరిగింది  లేక మీ అల�లిక బంధం "
 "డౌన� అయినది."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "ఈ చిర�నామా ప�స�తకం శాశ�వతంగా తొలగించబడ�త�ంది."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This server does not support LDAPv3 schema information."
 msgstr "ఈ సేవికక� LDAPv3 మ�ఖ�యాంశ సూచిక  సమాచార సహకారం లేద�"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open address book"
 msgstr "చిర�నామ ప�స�తకాన�ని తెరవలేకపోయింది"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "వెతకలేకపోయింది"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "{0} న� దాయలేమ�."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "మీ మార�ప�లన� దాయాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:31
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -501,7 +183,7 @@ msgstr ""
 "మీర� పరిచయాన�ని ఒక చిర�నామాప�స�తకం న�ండి వేరొక దానికి కద�ల�చ�టక� ప�రయత�నిస�త�న�నార� అయితే ఇది మూలం "
 "న�ండి తొలగించబడద�. మీర� బద�ల�గా ఒక నకల� దాయాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -510,1040 +192,435 @@ msgstr ""
 "మీర� మద�దతీయని సమూహతరహా సేవికక� అన�సంధానించబడ�త�న�నార� మరియ� ఎవాల�యూషన� న� ఉపయోగించ�టలో "
 "సమస�యలన� ఎద�ర�కోవచ�చ�. మంచి ఫలితాలకొరక� సేవిక మద�దతీయబడ� వర�షన� క� నవీకరింబడవలెన�"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "ఈచిర�నామా ప�స�తకంన�ండి పరిచయాలన� తొలగించ�టక� మీర� అన�మతినికలిగిలేర�."
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "ఈ పరిచయానికి మీర� సవరింప�ల� చేసార�. మీర� ఈ మార�ప�లన� దాయాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/addressbook.error.xml.h:37
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+#: ../addressbook/addressbook.error.xml.h:35
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ఎవాల�యూషన� ప�నఃప�రారంభించ�నంతవరక� {0} కొరక� మీ పరిచయాల� అంద�బాట�లోకి రావ�."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../plugins/groupwise-features/junk-settings.ui.h:4
+#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "జతచేయ�(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "_Discard"
 msgstr "తీసివేయ�(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Do not save"
 msgstr "దాయవద�ద�(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Resize"
 msgstr "ప�న: పరిమాణమ�(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Use as it is"
 msgstr "ఎలా ఉందో అలా ఉపయోగించ�మ�(_U)"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:44
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:590
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "అప�రమేయ కాలనియమిత చిర�నామా:"
 
-#: ../addressbook/conduit/address-conduit.c:1613
-#: ../addressbook/conduit/address-conduit.c:1614
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
 msgstr "చిర�నామా ప�స�తకాన�ని నింపలేకపోయింది"
 
-#: ../addressbook/conduit/address-conduit.c:1691
-#: ../addressbook/conduit/address-conduit.c:1694
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
 msgstr "చ�క�కానిల చిర�నామా కార�యక�షేత�ర భాగమ�న� చదవలేకపోయినది"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "C_ontacts"
-msgstr "పరిచయాల�(_o)"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "యోగ�యతా పత�రికల�"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#| msgid "Configure autocomplete here"
-msgid "Configure contacts and autocompletion here"
-msgstr "పరిచయాలన� మరియ� స�వయంచాలకపూర�తివేతన� యిక�కడ ఆకృతీకరించ�మ�"
-
-#. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:579
-msgid "Contacts"
-msgstr "పరిచయాల�"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Address Book"
-msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book address popup"
-msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం చిర�నామా పాప�అప�"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address viewer"
-msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం చిర�నామ దర�శిని"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book card viewer"
-msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం పలక దర�శిని"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book component"
-msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం మూలకం"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution S/MIME Certificate Management Control"
-msgstr "ఎవాల�యూషన� S/Mime దృవీకరణపత�రం నిర�వాహకి నియంత�రిక"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution folder settings configuration control"
-msgstr "ఎవాల�యూషన� సంచయం అమరికల ఆకృతీకరణ నియంత�రిక"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Manage your S/MIME certificates here"
-msgstr "మీ S/MIME దృవీకరణపత�రాలన� ఇక�కడ నిర�వహించండి"
-
-#. create the local source group
-#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:97
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:192
-#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
-#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
-#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
-#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
-#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
-#: ../mail/message-list.c:1515
-msgid "On This Computer"
-msgstr "ఈ కంప�యూటర� పైన"
-
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:98
-#: ../addressbook/gui/component/addressbook-migrate.c:517
-msgid "On LDAP Servers"
-msgstr "LDAP సేవికలపై"
-
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. orange
-#: ../addressbook/gui/component/addressbook-component.c:135
-#: ../addressbook/gui/component/addressbook-component.c:138
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
-#: ../calendar/gui/calendar-component.c:232
-#: ../calendar/gui/calendar-component.c:238
-#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
-#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
-#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
-#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
-#: ../plugins/email-custom-header/email-custom-header.c:337
-msgid "Personal"
-msgstr "వ�యక�తిగత"
-
-#: ../addressbook/gui/component/addressbook-component.c:209
-msgctxt "New"
-msgid "_Contact"
-msgstr "పరిచయం (_C)"
-
-#: ../addressbook/gui/component/addressbook-component.c:210
-msgid "Create a new contact"
-msgstr "కొత�త పరిచయాన�ని సృష�టించ�"
-
-#: ../addressbook/gui/component/addressbook-component.c:217
-msgctxt "New"
-msgid "Contact _List"
-msgstr "పరిచయాల జాబితా (_L)"
-
-#: ../addressbook/gui/component/addressbook-component.c:218
-msgid "Create a new contact list"
-msgstr "కొత�త పరిచయ జాబితాని సృష�టించ�"
-
-#: ../addressbook/gui/component/addressbook-component.c:224
-#: ../addressbook/gui/component/addressbook-config.c:1245
-msgid "New Address Book"
-msgstr "కొత చిర�నామా ప�స�తకం"
-
-#: ../addressbook/gui/component/addressbook-component.c:225
-msgctxt "New"
-msgid "Address _Book"
-msgstr "చిర�నామా ప�స�తకం (_B)"
-
-#: ../addressbook/gui/component/addressbook-component.c:226
-msgid "Create a new address book"
-msgstr "కొత చిర�నామా ప�స�తకాన�ని సృష�టించ�"
-
-#: ../addressbook/gui/component/addressbook-component.c:389
-msgid "Failed upgrading Address Book settings or folders."
-msgstr "చిర�నామా ప�స�తక అమరికల� లేక సంచయాలన� తాజాపర�చ�టలో విఫలం"
-
-#: ../addressbook/gui/component/addressbook-config.c:217
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"ఈ �చ�చికంన� ఎంచ�కొన�ట వలన ఎవాల�యూషన� మీ LDAP సేవికక� అన�సంధానించబడ�త�ంది మీ LDAP సేవిక SSL "
-"క� మద�దతిస�త�ంటే."
-
-#: ../addressbook/gui/component/addressbook-config.c:219
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"ఈ �చ�చికంన� ఎంచ�కొన�ట వలన ఎవాల�యూషన� మీ LDAP సేవికక� అన�సంధానించబడ�త�ంది మీ LDAP సేవిక TLS "
-"క� మద�దతిస�త�ంటే."
-
-#: ../addressbook/gui/component/addressbook-config.c:221
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"ఈ �చ�చికంన� ఎంచ�కొన�ట అర�ధం మీ సేవిక SSl లేదా TLS క� మద�దతీయండంలేద�. దీనర�ధం మీ అన�సంధానంక� "
-"రక�షణలేద�, మరియ� రక�షణ భేద�యమ�లపై మీర� అన�మానించబడతార�."
-
-#: ../addressbook/gui/component/addressbook-config.c:346
-msgid "Base"
-msgstr "మూలం"
-
-#: ../addressbook/gui/component/addressbook-config.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "_Type:"
-msgstr "à°°à°•à°‚(_T):"
-
-#: ../addressbook/gui/component/addressbook-config.c:648
-msgid "Copy _book content locally for offline operation"
-msgstr "ఆఫ�‌లైన� ఆపరేషన�‌కొరక� ప�సక�తం సారమ�న� స�థానికంగా నకల�తీయ�మ� (_b)"
-
-#: ../addressbook/gui/component/addressbook-config.c:759
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"ఎవాల�యూషన� అన�సంధానమగ�టక� ప�రయత�నించే LDAP పోర�ట� ఇదే. ప�రామాణిక పోర�ట�ల జాబితా ఇవ�వబడింది. మీర� � "
-"పోర�ట� న� తెల�పవలెనో మీ సిస�టమ� నిర�వహణాధికారిని అడగండి."
-
-#: ../addressbook/gui/component/addressbook-config.c:837
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"మిమ�మ�లి దృవీకరించ�టక� ఎవాల�యూషన� వాడే పద�దితి ఇదే. దీనిని \" ఈమెయిల� చిర�నామా\" క� అమర�చ�ట వలన మీ "
-"LDAP సేవికక� ఎనానిమస� ప�రవేశం అవసరమౌత�ందని గమనించండి."
-
-#: ../addressbook/gui/component/addressbook-config.c:916
-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/addressbook-config.c:1020
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "సాధారణ"
-
-#: ../addressbook/gui/component/addressbook-config.c:1021
-#: ../addressbook/gui/widgets/e-addressbook-view.c:554
-#: ../mail/importers/pine-importer.c:383
-msgid "Address Book"
-msgstr "చిర�నామా ప�స�తకం"
-
-#: ../addressbook/gui/component/addressbook-config.c:1025
-msgid "Server Information"
-msgstr "సేవిక సమాచారం"
-
-#: ../addressbook/gui/component/addressbook-config.c:1027
-msgid "Authentication"
-msgstr "ప�రామాణీకరణ"
-
-#: ../addressbook/gui/component/addressbook-config.c:1030
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../smime/gui/smime-ui.glade.h:20
-msgid "Details"
-msgstr "వివరాల�"
-
-#: ../addressbook/gui/component/addressbook-config.c:1031
-#: ../mail/em-folder-browser.c:1021
-msgid "Searching"
-msgstr "వెత�క�త�న�నది"
-
-#: ../addressbook/gui/component/addressbook-config.c:1033
-msgid "Downloading"
-msgstr "దిగ�మతి అవ�త�న�నది"
-
-#: ../addressbook/gui/component/addressbook-config.c:1243
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "Address Book Properties"
-msgstr "చిర�నామ ప�స�తకం లక�షణాల�"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
-msgid "Migrating..."
-msgstr "వలసపోతూ వ�న�న..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
-#, c-format
-msgid "Migrating '%s':"
-msgstr "వలసపోతూవ�న�న '%s':"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP సేవికల�"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:760
-msgid "Autocompletion Settings"
-msgstr "స�వయంపూర�తి అమరికల�"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ఎవాల�యూషన� పరిచయ సంచయం యొక�క స�థానమ� మరియ� పారంపర�యం ఎవాల�యూషన� 1.x న�ండి మారినది.\n"
-"\n"
-"ఎవాల�యూషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి ఓర�ప�తోఉండండి..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"మెయిలింగ� జాబితా పరిచయాల యొక�క రూపం మార�చబడింది.\n"
-"\n"
-"ఎవాల�యషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి ఓర�ప�తో ఉండండి..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"కొన�ని ఫోన� సంఖ�యలన� ఎవాల�యూషన� నిల�వచేసే విధానం మారినది.\n"
-"\n"
-"ఎవాల�యషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి ఓర�ప�తో ఉండండి..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"ఎవాల�యూషన� పామ� సింక� చేంజ�‌లాగ� మరియ� మాప� దస�త�రమ�ల� మార�చబడినవి.\n"
-"\n"
-"ఎవాల�యషన� మీ పైలెట� సింక� డాటా న� వలసపంప�త�న�నప�ప�డ� దయచేసి ఓర�ప�తో ఉండండి..."
-
-#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:453
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "\"%s\" సంచయాన�ని దీనికి ప�నఃనామకరణ చేయ�మ�:"
-
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:455
-msgid "Rename Folder"
-msgstr "సంచయాన�నిప�నర�నామకరణ చేయ�మ�"
-
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:461
-msgid "Folder names cannot contain '/'"
-msgstr "సంచయనామమ�ల� '/' న� కలిగిఉండలేవ�"
-
-#: ../addressbook/gui/component/addressbook-view.c:949
-msgid "_New Address Book"
-msgstr "కొత చిర�నామా ప�స�తకం(_N)"
-
-#: ../addressbook/gui/component/addressbook-view.c:950
-msgid "Save As vCard..."
-msgstr "Vకార�డ�� లాగా దాయ�మ�..."
-
-#: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:628
-#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
-#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "ప�నఃనామకరణ(_R)..."
-
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/calendar-component.c:631
-#: ../calendar/gui/e-calendar-table.c:1613
-#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
-#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
-#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "తొలగించ�(_D)"
-
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:636
-#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
-#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
-#: ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "లక�షణాల�(_P)"
-
-#: ../addressbook/gui/component/addressbook-view.c:1223
-msgid "Contact Source Selector"
-msgstr "వనర�ల ఎంపికదార�న�ని సంప�రదించ�మ�"
-
-#: ../addressbook/gui/component/addressbook.c:102
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP సేవికన� అనామకంగా సాంగత�యం చేస�త�న�నది"
-
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
-msgid "Failed to authenticate.\n"
-msgstr "ప�రమాణీకరించడంలో విఫలం.\n"
-
-#: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s (వినియోగదారి %s) కొరక� సంకేతపదాన�ని ప�రవేశపెట�టండి"
-
-#: ../addressbook/gui/component/addressbook.c:222
-#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:500
-#: ../plugins/publish-calendar/publish-calendar.c:216
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "రహస�య పదమ�న� ప�రవేశపెట�టండి"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "పొడవ�న� స�వయంపూర�తి గావించ�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "పూర�తైన URIs జాబితా కొరక� EFolderList XML"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "పూర�తైన URIs జాబితా కొరక� EFolderList XML."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr "కార�డ� మరియ� జాబితా దర�శని మరియ� ఉపదర�శనం తలం క� మద�య, నిల�వ�తలం యొక�క స�థానమ�, పిగ�జెల�స� లో."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr "స�వయంచాలకంగామ�గియ� నామమ�న� వొక చిర�నామాతో చూప�మ�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
-msgid "Show preview pane"
-msgstr "ఉపదర�శన పలకాన�ని చూపించ�మ�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr "ఎవాల�యూషన� స�వయంచాలకమ�గింప� క� ప�రయత�నించ�టక� మ�న�ప� ప�రవెశపెట�టవలిసిన అక�షరమ�ల సంఖ�య."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
-msgid "URI for the folder last used in the select names dialog"
-msgstr "ఎంచ�క�న�న నామమ�ల డైలాగ� నంద� చివరిగా ఉపయోగించిన సంచయం కొరక� URI"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-msgid "URI for the folder last used in the select names dialog."
-msgstr "ఎంచ�క�న�న నామమ�ల డైలాగ� నంద� చివరిగా ఉపయోగించిన సంచయం కొరక� URI."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
-msgid "Vertical pane position"
-msgstr "నిల�వ�గావ�న�న పలక స�థానం"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr "స�వయంచాలకంగామ�గియ� పరిచయం నామమ�తో మెయిల� చిర�నామాన� ప�రవేశమ�నంద� బలవంతంగా చూయించాలా"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
-msgid "Whether to show the preview pane."
-msgstr "ఉపదర�శనం తలంన� చూపించవలెనా."
-
-#: ../addressbook/gui/component/autocompletion-config.c:175
-msgid "Autocompletion"
-msgstr "స�వయంచాలకంగాపూర�తి"
-
-#: ../addressbook/gui/component/autocompletion-config.c:177
-msgid "Always _show address of the autocompleted contact"
-msgstr "స�వయంచాలకంగామ�గియ� పరిచయంయొక�క చిర�నామాన� ఎల�లప�ప�డ� చూప�మ� (_s)"
-
-#: ../addressbook/gui/component/autocompletion-config.c:182
-#| msgid "Date/Time"
-msgid "Date/Time Format"
-msgstr "తారీఖ�/సమయం ఫార�మాట�"
-
-#: ../addressbook/gui/component/autocompletion-config.c:185
-#: ../mail/em-mailer-prefs.c:1456
-#| msgid "Table model"
-msgid "Table column:"
-msgstr "పట�టిక నిల�వ�వర�స:"
-
-#: ../addressbook/gui/component/autocompletion-config.c:187
-msgid "Look up in address books"
-msgstr "చిర�నామా ప�స�తకమ�లనంద� ల�కప�స�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:1
-msgid "1"
-msgstr "1"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid ""
-"389\n"
-"636\n"
-"3268"
-msgstr ""
-"389\n"
-"636\n"
-"3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "5"
-msgstr "5"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>ప�రామాణీకరణ</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>దిగ�మతి అవ�త�న�నది</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>వెత�క�త�న�నది</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-#| msgid "Using distinguished name (DN)"
-msgid ""
-"Anonymously\n"
-"Using email address\n"
-"Using distinguished name (DN)"
-msgstr ""
-"పేర�లేక�ండా\n"
-"ఈ మెయిల� చిర�నామా వ�పయోగించి\n"
-"విభజిత నామమ� వ�పయోగించి (DN)"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-msgid "B_rowse this book until limit reached"
-msgstr "పరిమితిని చేర�దాకా ఈప�స�తకంన� అన�వేషించ�మ� (_r)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "సేవికతో మిమ�మ�లని ప�రామాణీకరించ�టక� ఎవల�యూషన� ఈ ఈ మెయిల� చిర�నామాన� ఉపయోగిస�త�ంది "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Lo_gin:"
-msgstr "ప�రవేశమ�(_g):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-#| msgid "One"
-msgid ""
-"One\n"
-"Sub"
-msgstr ""
-"à°’à°¤\n"
-"ఉప"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid ""
-"SSL encryption\n"
-"TLS encryption\n"
-"No encryption"
-msgstr ""
-"SSL ఎన�క�రిప�షన�\n"
-"TLS ఎన�క�రిప�షన�\n"
-"ఎట�వంటి ఎన�క�రిప�షన� లేద�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-msgid "Search Filter"
-msgstr "శోధన వడపోత"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-msgid "Search _base:"
-msgstr "వెత�క� మూలం(_b):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "Search _filter:"
-msgstr "శోధన వడపోత(_f):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#| msgid ""
-#| "Search filter is the type of the objects searched for, while performing "
-#| "the search. If this is not modified, by  default search will be performed "
-#| "on objectclass of the type \"person\"."
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-"శోధన వడపోత అన�నది దేనికొరకైతే శోధన జరగాలో ఆ ఆబ�జక�ట� రకమైనవ�ంట�ంది. ఇది సవరించిఉండకపోతే, "
-"అప�రమేయంగా శోధన \"వ�యక�తి\" రకం యొక�క అంశప�తరగతి పై జర�గ�త�ంది."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Supported Search Bases"
-msgstr "సహకారం ఉన�న వెత�క� మూలాల�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"శోధన ఆధరం ప�రవేశం యొక�క విభజించబడిన నామమ�(DN) ఎక�కడైతే మీ శోధనల� ప�రారంభం అవ�తాయో. మీర� దీనిని ఖాళీగా "
-"వదిలితే, శోధన సంచయవృక�షం యొక�క రూట� నంద� ప�రారంభం అవ�త�ంది."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr "ఇది మీ LDAP సేవిక యొక�క సంపూర�ణనామమ�, ఉదాహరణక�, \"ldap.mycompany.com\"."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-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:32
-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:33
-msgid "_Download limit:"
-msgstr "దిగ�మతి హద�ద�:(_D)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid "_Find Possible Search Bases"
-msgstr "సాధ�యమైన వెత�క� మూలాలన� కనిపెట�ట�మ�(_F)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid "_Login method:"
-msgstr "ప�రవేశ పద�దతి(_L):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:175
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-msgid "_Name:"
-msgstr "పేర�(_N):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "_Port:"
-msgstr "పోర�ట�(_P):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-msgid "_Search scope:"
-msgstr "వెత�క� లక�ష�యం(_S):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-#: ../mail/mail-config.glade.h:184
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Server:"
-msgstr "సేవిక(_S):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid "_Timeout:"
-msgstr "సమయం మించినది(_T):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "_Use secure connection:"
-msgstr "రక�షిత బంధాన�ని ఉపయోగించ�మ�(U):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid "cards"
-msgstr "పలకాల�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-file/calendar-file.c:293
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:523
-#: ../plugins/google-account-setup/google-source.c:720
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-msgid "minutes"
-msgstr "నిమిషాల�"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>ఈ మెయిల�</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>నివాసం</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>తక�షణ సందేశం</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>నిర�ధిష�టకార�యం</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>వివిధమైన</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-#| msgid "<b>Home</b>"
-msgid "<b>Notes</b>"
-msgstr "<b>గమనికల�</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Other</b>"
-msgstr "<b>ఇతర</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Telephone</b>"
-msgstr "<b>దూర సంవాదక పరికరం</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Web Addresses</b>"
-msgstr "<b>మహాతలంలో చిర�నామాల�</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../calendar/gui/e-calendar-view.c:2000
+msgid "Anniversary"
+msgstr "వార�షీకోత�సవం"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "<b>Work</b>"
-msgstr "<b>పని</b>"
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../calendar/gui/e-calendar-view.c:1999 ../capplet/anjal-settings-main.c:119
+#: ../shell/main.c:112
+msgid "Birthday"
+msgstr "ప�ట�టిన రోజ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "విభాగాల�(_t)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#, fuzzy
+msgid "Calendar:"
+msgstr "క�యాలెండర�(_C):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "చిర�నామా"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2553
 msgid "Contact Editor"
 msgstr "చిర�నామా సరిచేయ�నది"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+msgid "Email"
+msgstr "ఈ-తపాలా"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#, fuzzy
+msgid "Free/Busy:"
+msgstr "ఖాళీ/తీరిక లేని(_F):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 msgid "Full _Name..."
 msgstr "పూర�తి పేర�(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:70
+msgid "Home"
+msgstr "నివాసం"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#, fuzzy
+msgid "Home Page:"
+msgstr "నివాస ప�ట(_H):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Image"
 msgstr "ప�రతిరూపం"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#, fuzzy
+msgid "Instant Messaging"
+msgstr "<b>తక�షణ సందేశం</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+msgid "Job"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Mailing Address"
 msgstr "మెయిల� చేసే చిర�నామా"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "వివిధమైన"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Nic_kname:"
 msgstr "నిక� నేమ� (_k):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../calendar/gui/migration.c:1225
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 msgid "Notes"
 msgstr "గమనికల�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:71
+#: ../addressbook/gui/widgets/eab-contact-display.c:460
+#: ../calendar/gui/e-calendar-view.c:1708
+msgid "Other"
+msgstr "ఇతరమ�ల�"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Personal Information"
 msgstr "వ�యక�తిగత సమాచారం"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Telephone"
 msgstr "దూర సంవాదక యంత�రమ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#, fuzzy
+msgid "Video Chat:"
+msgstr "దృశ�య మాటామంతి(_V):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#, fuzzy
+msgid "Web Addresses"
+msgstr "<b>మహాతలంలో చిర�నామాల�</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+#, fuzzy
+msgid "Web Log:"
+msgstr "మహాతలంలో నమోద�(_W):"
+
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../mail/e-mail-migrate.c:961
+msgid "Work"
+msgstr "పని"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "_Address:"
 msgstr "చిర�నామా(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Anniversary:"
 msgstr "వార�షికోత�సవం(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Assistant:"
 msgstr "సహాయ�డ�(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Birthday:"
 msgstr "ప�ట�టిన రోజ�(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../calendar/gui/dialogs/event-page.c:820
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1910
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Calendar:"
 msgstr "క�యాలెండర�(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_City:"
 msgstr "నగరం(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Company:"
 msgstr "కంపెనీ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_Country:"
 msgstr "దేశం(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Department:"
 msgstr "శాఖ(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_File under:"
 msgstr "దస�త�రం కింద(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Free/Busy:"
 msgstr "ఖాళీ/తీరిక లేని(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Home Page:"
 msgstr "నివాస ప�ట(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Manager:"
 msgstr "అభికర�త(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Office:"
 msgstr "కార�యాలయం(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_PO Box:"
 msgstr "PO డబ�బా(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "వృత�తి(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Spouse:"
 msgstr "జీవిత భాగస�వామి(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_State/Province:"
 msgstr "రాష�త�రం/మండలమ�(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fullname.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "శీర�షిక(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Video Chat:"
 msgstr "దృశ�య మాటామంతి(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "HTML మెయిల� న� తీస�కోవాలన�క�ంట�ంది (_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Web Log:"
 msgstr "మహాతలంలో నమోద�(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "ఎక�కడ(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Zip/Postal Code:"
 msgstr "జిప� కోడ�(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:473
-#: ../plugins/exchange-operations/exchange-delegates.c:951
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
+#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1159
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:315
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:61
+#: ../widgets/menus/gal-view-new-dialog.c:60
 msgid "Name"
 msgstr "నామమ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:324
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
+#: ../addressbook/gui/widgets/e-addressbook-model.c:522
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
+#: ../addressbook/gui/widgets/e-minicard-view.c:548
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
-#: ../widgets/text/e-text.c:3675
+#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
+#: ../widgets/text/e-text.c:3442
 msgid "Editable"
 msgstr "సరిచేయగలిగినది"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:603
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "జాబర�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "యాహూ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "గ�రూప�ల వారీగా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#. red
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../mail/em-migrate.c:959
-msgid "Work"
-msgstr "పని"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:376
+msgid "Error adding contact"
+msgstr "చిర�నామాన� జతపర�చ�టలో దోషం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
-msgid "Home"
-msgstr "నివాసం"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+msgid "Error modifying contact"
+msgstr "చిర�నామా మార�చ�టలో దోషం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:516
-#: ../calendar/gui/e-calendar-view.c:2289
-msgid "Other"
-msgstr "ఇతరమ�ల�"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+msgid "Error removing contact"
+msgstr "చిర�నామా తీసివేయ�టలో దోషం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Source Book"
 msgstr "వనర� ప�స�తకం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 msgid "Target Book"
 msgstr "గమ�య ప�స�తకం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
 msgid "Is New Contact"
 msgstr "ఇది కొత�త  పరిచయం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
 msgid "Writable Fields"
 msgstr "రాయదగ� క�షేత�రాల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
 msgid "Required Fields"
 msgstr "అవసరమైన క�షేత�రాల�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
 msgid "Changed"
 msgstr "మార�చినది"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2548
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "పరిచయాన�ని సరిచేయ�నది-%s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2945
 msgid "Please select an image for this contact"
 msgstr "ఈ పరిచయమ�నక�   దయచేసి ఒక ప�రతిరూపమ�న� ఎంపిక చేయండి"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2946
 msgid "_No image"
 msgstr "ప�రతిరూపం లేద�(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3219
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1551,213 +628,211 @@ msgstr ""
 "పరిచయాల దత�తాంశం నిస�సారమైనది:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3223
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' యొక�క రూపలావణ�యం నిస�సారమైనది"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3230
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' యొక�క రూపలావణ�యం నిస�సారమైనది"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3256
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ఖాళీ గా ఉంది"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3270
 msgid "Invalid contact."
 msgstr "నిస�సారమైన పరిచయం"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
 msgid "Contact Quick-Add"
 msgstr "పరిచయాన�ని త�వరితంగా-జతచేయ�నది"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
 msgid "_Edit Full"
 msgstr "పూర�తిగా సరిచేయ�(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
 msgid "_Full name"
 msgstr "పూర�తి నామం(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "E_mail"
 msgstr "ఈ-తపాలా(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Select Address Book"
 msgstr "కొత చిర�నామా ప�స�తకాన�ని ఎంచ�కొన�మ�(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:167
+#: ../shell/e-shell-window.c:689
+msgid "Shell"
 msgstr ""
-"మీర� ఖచ�చితంగా పరిచయ\n"
-"జాబితాన� తొలగిద�దామన�క�ంట�న�నారా (%s)? "
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:168
+#: ../shell/e-shell-window.c:690
+msgid "The EShell singleton"
 msgstr ""
-"మీర� ఖచ�చితంగా ఈ పరిచయ\n"
-"జాబితాలన� తొలగిద�దామన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+msgid "Dr."
 msgstr ""
-"మీర� ఖచ�చితంగా పరిచయాన�ని\n"
-"తొలగిద�దామ�న�క�ంట�న�నారా (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+msgid "Esq."
 msgstr ""
-"మీక� ఖచ�చితంగా పరిచయాలన�\n"
-"తొలగిద�దామన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
-msgstr ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "పూర�తి  పేర�"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+msgid "I"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+msgid "II"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+msgid "III"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+msgid "Jr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+#, fuzzy
+msgid "Miss"
+msgstr "ఇక"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+msgid "Mr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+msgid "Mrs."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+msgid "Ms."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
+msgid "Sr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "మొదటి(_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "చివరి(_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "నడ�మ(_M):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "అంత�యసర�గ(_S):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "<b>Members</b>"
-msgstr "<b>సభ�య�ల�</b>"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
 msgid "Contact List Editor"
 msgstr "జాబీతా సరిచేయ�వాన�ని సంప�రదించ�మ�"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
-#: ../calendar/gui/e-day-view-time-item.c:812
-#: ../calendar/gui/e-timezone-entry.c:118
-msgid "Select..."
-msgstr "ఎంపికచేయ�..."
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+#, fuzzy
+msgid "Members"
+msgstr "సభ�య�ల�(_M)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
 msgstr "జాబితా క� మెయిల� పంపిస�త�న�నప�ప�డ� చిర�నామాలన� దాయ�మ�(_H)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "జాబితా పేర�(_L):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:154
+msgid "_Select..."
+msgstr "ఎంపికచేయి (_S)..."
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "ఈమెయిల� చిర�నామాన� రాయ�మ� లేదా దాన�ని పరిచయాన�ని క�రింది జాబితాలో కి జరపండి(_T)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
 msgid "Contact List Members"
 msgstr "పరిచయస�త�ల జాబితా సభ�య�ల�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
 msgid "_Members"
 msgstr "సభ�య�ల�(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
-#: ../addressbook/gui/widgets/e-addressbook-view.c:211
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+msgid "Error adding list"
+msgstr "జాబితాన� జతపర�చ�టలో దోషం"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+msgid "Error modifying list"
+msgstr "జాబితాన� మార�చ�టలో దోషం"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+msgid "Error removing list"
+msgstr "జాబితాన� తీసివేయ�టలో దోషం"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+#: ../addressbook/gui/widgets/e-addressbook-model.c:512
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view.c:534
 msgid "Book"
 msgstr "ప�స�తకం"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
 msgid "Is New List"
 msgstr "కొత�త జాబీతా"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "మార�చిన చిర�నామా:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.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
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "పరిచయం యొక�క నకల�న� కనిపెట�టింది"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
-msgstr "ఈపరిచయంయొక�క నామమ� లేదా ఈమెయిల� యిప�పటికే ఈఫోల�డర�‌నంద� వ�ంది.  అయినా మీర�దీనిని జతచేద�దామని అన�క�ంట�న�నారా?"
+msgstr ""
+"ఈపరిచయంయొక�క నామమ� లేదా ఈమెయిల� యిప�పటికే ఈఫోల�డర�‌నంద� వ�ంది.  అయినా మీర�దీనిని జతచేద�దామని అన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
 msgstr "కొత�త చిర�నామా:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid "Original Contact:"
 msgstr "అసల� చిర�నామా:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -1765,70 +840,72 @@ msgstr ""
 "ఈ పరిచయం యొక�క నామమ� లేదా ఈమెయిల� చిర�నామా ఈ సంచయం\n"
 "నంద� ఇప�పటికే ఉంది.  మీర� దీనిని �విధంగానైనా జతచేయాలని అన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:213
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:231
 msgid "_Merge"
 msgstr "విలీనం (_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:198
+#: ../addressbook/gui/merging/eab-contact-merging.c:216
 msgid "Merge Contact"
 msgstr "పరిచయాన�ని విలీనంచేయి"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:266
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../addressbook/gui/widgets/eab-contact-display.c:589
-#: ../addressbook/gui/widgets/eab-contact-display.c:868
-#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
-msgid "Email"
-msgstr "ఈ-తపాలా"
-
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Any field contains"
 msgstr "� క�షేత�రమైన కలిగిఉన�నది "
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Email begins with"
 msgstr "దీనితో ఈ-తపాలా మొదలౌత�ంది"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Name contains"
 msgstr "దీనిని కలిగివ�న�ననామమ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:162
+#: ../addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No contacts"
 msgstr "చిర�నామాల� లేవ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:146
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d చిర�నామా"
 msgstr[1] "%d చిర�నామాల�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:317
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+msgid "Error getting book view"
+msgstr "ప�స�తక దర�శనం తీస�క�వచ�చ�టలో దోషమ�"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:532
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view.c:541
 msgid "Query"
 msgstr "ప�రశ�న"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:460
-msgid "Error getting book view"
-msgstr "ప�స�తక దర�శనం తీస�క�వచ�చ�టలో దోషమ�"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#, fuzzy
+msgid "Search Interrupted"
+msgstr "శోధన వడపోత"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
-#: ../widgets/table/e-table-click-to-add.c:507
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
+#: ../addressbook/gui/widgets/e-addressbook-view.c:758
+#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
+#: ../modules/calendar/e-memo-shell-content.c:607
+#: ../modules/calendar/e-task-shell-content.c:629
+#: ../widgets/table/e-table-click-to-add.c:511
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3344
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
-#: ../widgets/text/e-text.c:3542
+#: ../widgets/table/e-table.c:3367
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
+#: ../widgets/text/e-text.c:3309
 msgid "Model"
 msgstr "ఆకృతి"
 
@@ -1836,112 +913,102 @@ msgstr "ఆకృతి"
 msgid "Error modifying card"
 msgstr "పలకం మార�చ�ట లో దోషం"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
-msgid "Name begins with"
-msgstr "దీనితో నామం మొదలౌత�ంది"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#, fuzzy
+msgid "Cut selected contacts to the clipboard"
+msgstr "ఎంపికచేసిన పాఠ�యమ�న� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
-msgid "Source"
-msgstr "వనర�"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#, fuzzy
+msgid "Copy selected contacts to the clipboard"
+msgstr "ఎంపికైన పాఠ�యాన�ని క�లిప� పలకాన�ని నకల� తీయ�మ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:564
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
-msgid "Type"
-msgstr "à°°à°•à°‚"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#, fuzzy
+msgid "Paste contacts from the clipboard"
+msgstr "క�లిప� పలకం న�ండి కర�తవ�యాలన� అతికించ�మ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
-msgid "Save as vCard..."
-msgstr "Vపలకంగా దాయ�మ�..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
+msgid "Delete selected contacts"
+msgstr "ఎంచ�క�న�న పరిచయాలన� తొలగించ�మ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-#: ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "తెర�వ�మ�(_O)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#, fuzzy
+msgid "Select all visible contacts"
+msgstr "అన�ని పరిచయాలన� ఎంచ�కొన�మ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-msgid "_New Contact..."
-msgstr "కొత�త పరిచయం(_N)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:774
+#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
+#, fuzzy
+msgid "Shell View"
+msgstr "దర�శనంన� ఎంపికచేయ�మ�: %s"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-msgid "New Contact _List..."
-msgstr "కొత�త చిర�నామాల జాబితా(_L)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:785
+msgid "Source"
+msgstr "వనర�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "_Save as vCard..."
-msgstr "Vపలకంగా దాయ�మ�(_S)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#, fuzzy
+msgid "Are you sure you want to delete these contact lists?"
+msgstr ""
+"మీర� ఖచ�చితంగా ఈ పరిచయ\n"
+"జాబితాలన� తొలగిద�దామన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "_Forward Contact"
-msgstr "చిర�నామాన�ని మ�ందికిపంప�(_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#, fuzzy
+msgid "Are you sure you want to delete this contact list?"
+msgstr ""
+"మీర� ఖచ�చితంగా ఈ పరిచయ\n"
+"జాబితాలన� తొలగిద�దామన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "_Forward Contacts"
-msgstr "చిర�నామాలని మ�ంద�క� పంప�(_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#, fuzzy, c-format
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr ""
+"మీర� ఖచ�చితంగా పరిచయ\n"
+"జాబితాన� తొలగిద�దామన�క�ంట�న�నారా (%s)? "
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send _Message to Contact"
-msgstr "చిర�నామాక� సందేశం పంప�(_M)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#, fuzzy
+msgid "Are you sure you want to delete these contacts?"
+msgstr ""
+"మీక� ఖచ�చితంగా పరిచయాలన�\n"
+"తొలగిద�దామన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "Send _Message to List"
-msgstr "జాబితాక� సందేశం పంప�(_M)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#, fuzzy
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+"మీక� ఖచ�చితంగా పరిచయాలన�\n"
+"తొలగిద�దామన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
-msgid "Send _Message to Contacts"
-msgstr "చిర�నామాలక� సందేశం పంప�(_M)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#, fuzzy, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr ""
+"మీర� ఖచ�చితంగా పరిచయాన�ని\n"
+"తొలగిద�దామ�న�క�ంట�న�నారా (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-msgid "_Print"
-msgstr "మ�ద�రణ(_P)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
-msgid "Cop_y to Address Book..."
-msgstr "చిర�నామా ప�స�తకం క� నకల�తీయ�(_y)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
-msgid "Mo_ve to Address Book..."
-msgstr "చిర�నామా ప�స�తకంక� కదిపించ�(_v)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-msgid "Cu_t"
-msgstr "కట�(_t)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/e-calendar-table.c:1599
-#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
-#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
-#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "నకల�(_C)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-msgid "P_aste"
-msgstr "అతికించ�(_a)"
-
-#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
-#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
-#: ../calendar/gui/cal-search-bar.c:686
-msgid "Any Category"
-msgstr "�దైన విభాగం"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#, fuzzy, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"%dచిర�నామాన� తెరచినప�ప�డ�  %dకొత�త గవాక�షం కూడా  తెరచ�క�ంట�ంది.\n"
+"మీర� నిజంగా  ఈ చిర�నామాన� ప�రదర�శించాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
-msgid "Unmatched"
-msgstr "సరిఉజ�జీ కాలేద�"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+msgid "_Don't Display"
+msgstr "ప�రదర�శించ వద�ద�(_D)"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+msgid "Display _All Contacts"
+msgstr "అన�ని పరిచయాలన� ప�రదర�శించ�మ�(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "సహాయక�డ�"
 
@@ -1970,8 +1037,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-component-memo-preview.c:135
+#: ../calendar/gui/dialogs/event-page.ui.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
@@ -1979,7 +1045,7 @@ msgid "Categories"
 msgstr "విభాగాల�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "Company"
 msgstr "కంపెనీ"
 
@@ -2028,22 +1094,22 @@ msgid "Journal"
 msgstr "పత�రిక"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
 msgstr "అభికర�త"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:644
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Mobile Phone"
 msgstr "మొబైల� ఫోన�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "Nickname"
 msgstr "మ�ద�ద� పేర�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "చీటి"
 
@@ -2072,14 +1138,13 @@ msgid "Radio"
 msgstr "రేడియో"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:576
+#: ../calendar/gui/e-meeting-list-view.c:578
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "పాత�ర"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 msgid "Spouse"
 msgstr "జీవిత భాగస�వామి"
 
@@ -2098,6 +1163,7 @@ msgid "Telex"
 msgstr "టెలెక�స�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../shell/e-shell-view.c:828
 msgid "Title"
 msgstr "శీర�షిక"
 
@@ -2112,29 +1178,27 @@ msgstr "మయాతల ప�రదేశం"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
-#: ../widgets/table/e-table-click-to-add.c:521
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-group-container.c:994
-#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-click-to-add.c:525
+#: ../widgets/table/e-table-col.c:121
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-container.c:1003
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
+#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
 msgid "Width"
 msgstr "వెడల�ప�"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-click-to-add.c:528
-#: ../widgets/table/e-table-group-container.c:987
-#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-click-to-add.c:532
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-container.c:996
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
+#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
 msgid "Height"
 msgstr "ఎత�త�"
 
@@ -2159,11 +1223,11 @@ msgstr "పాఠ�య నమూనా"
 msgid "Max field name length"
 msgstr "అత�యధిక క�షేత�ర నామపొడవ�"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
 msgid "Column Width"
 msgstr "నిల�వ� పట�టీ వెడల�ప�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -2173,7 +1237,7 @@ msgstr ""
 "\n"
 "పరిచయాలకొరక� శోధిస�త�న�నది..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -2187,7 +1251,7 @@ msgstr ""
 "\n"
 "కొత�త చిర�నామా సృష�టించ�టక� ఇక�కడ రెండ�సార�ల�-నొక�క�మ�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -2201,7 +1265,7 @@ msgstr ""
 "\n"
 "కొత�త చిర�నామా సృష�టించ�టక� ఇక�కడ రెండ�సార�ల� నొక�క�మ�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -2211,7 +1275,7 @@ msgstr ""
 "\n"
 "చిర�నామా కొరక� వెత�క�మ�."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -2221,7 +1285,7 @@ msgstr ""
 "\n"
 "ఈ దర�శనిలో చూప�టక� అంశాల� లేవ�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
 msgid "Adapter"
 msgstr "ఇమ�డ�చ�నది"
 
@@ -2234,7 +1298,7 @@ msgid "Home Email"
 msgstr "నివాసం ఈమెయిల�"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:825
+#: ../addressbook/gui/widgets/e-minicard.c:797
 msgid "Other Email"
 msgstr "ఇతర ఈమెయిల�"
 
@@ -2246,230 +1310,283 @@ msgstr "ఎంపికచేయబడ�డ"
 msgid "Has Cursor"
 msgstr "మ�ల�క� ఉన�నది"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
-msgid "_Open Link in Browser"
-msgstr "అన�వేషి లో జోడికన� తెర�వ�మ�(_O)"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2694
-msgid "_Copy Link Location"
-msgstr "జోడిక స�థానాన�ని నకల� తీయ�మ�(_C)"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "కొత�త  పరిచయం"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
-msgid "_Send New Message To..."
-msgstr "కొత�త సందేశాన�ని ఇక�కడకి పంపించ�మ�(_S)..."
+#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "కొత�త  పరిచయ జాబితా"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "ప�రస�త�త చిర�నామా ప�స�తకం సంచయం %s కలిగిఉంది %d కార�డ�న�"
+msgstr[1] "ప�రస�త�త చిర�నామా ప�స�తకం సంచయం %s కలిగిఉంది %d కార�డ�లన�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "తెర�వ�మ�"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:153
+msgid "Contact List: "
+msgstr "పరిచయ జాబితా:"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:154
+msgid "Contact: "
+msgstr "పరిచయం: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:180
+msgid "evolution minicard"
+msgstr "ఎవల�యూషన�  యొక�క చిన�నపలకం"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
 msgstr "ఈమెయిల� చిర�నామాన�ని నకల� తీయ�మ�(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:286
-#: ../addressbook/gui/widgets/eab-contact-display.c:360
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:382
+#, fuzzy
+msgid "Copy the email address to the clipboard"
+msgstr "క�లిప�‌బోర�డ�నక� విషయమ�లన� నకల�తీయి."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:387
+msgid "_Send New Message To..."
+msgstr "కొత�త సందేశాన�ని ఇక�కడకి పంపించ�మ�(_S)..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:389
+#, fuzzy
+msgid "Send a mail message to this address"
+msgstr "మెయిల� సందేశాన�ని కర�తవ�యానికి మార�చ�మ�."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:258
+#: ../addressbook/gui/widgets/eab-contact-display.c:260
 msgid "(map)"
 msgstr "(పటం)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
-#: ../addressbook/gui/widgets/eab-contact-display.c:391
+#: ../addressbook/gui/widgets/eab-contact-display.c:278
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
 msgid "map"
 msgstr "పటం"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:475
-#: ../addressbook/gui/widgets/eab-contact-display.c:835
+#: ../addressbook/gui/widgets/eab-contact-display.c:415
+#: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
 msgstr "సభ�య�ల జాబితా"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "శాఖ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "వృత�త"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "'స�థానం"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Video Chat"
 msgstr "దృశ�య మాటామంతి"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
-#: ../calendar/gui/calendar-commands.c:89
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2548
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:572
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
-#: ../plugins/hula-account-setup/camel-hula-listener.c:372
-#: ../plugins/hula-account-setup/camel-hula-listener.c:400
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view.c:495
+#: ../plugins/groupwise-features/camel-gw-listener.c:420
+#: ../plugins/groupwise-features/camel-gw-listener.c:445
+#: ../plugins/groupwise-features/camel-gw-listener.c:560
+#: ../plugins/hula-account-setup/camel-hula-listener.c:371
+#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "Calendar"
 msgstr "క�యాలెండర�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ఖాళీ/తీరిక లేని"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Phone"
 msgstr "ఫోన�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "ఫ�యాక�స�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
 msgid "Address"
 msgstr "చిర�నామా"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Home Page"
 msgstr "నివాస ప�ట"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
 msgstr "మహాతలంలో నమోద�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
-#: ../calendar/gui/e-calendar-view.c:2580
-msgid "Birthday"
-msgstr "ప�ట�టిన రోజ�"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../calendar/gui/e-calendar-view.c:2581
-msgid "Anniversary"
-msgstr "వార�షీకోత�సవం"
+#. Create the default Person addressbook
+#. orange
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
+#: ../modules/addressbook/e-book-shell-backend.c:175
+#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/calendar/e-cal-shell-backend.c:171
+#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:158
+#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../plugins/email-custom-header/email-custom-header.c:320
+msgid "Personal"
+msgstr "వ�యక�తిగత"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:853
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "కార�య శీర�షిక"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "నివాసప�ట"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:897
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "బ�లాగ�"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../widgets/misc/e-web-view.c:798
+#, c-format
+msgid "Click to mail %s"
+msgstr "%s క� మెయిల� చేయ�టక� నొక�క�మ�"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Success"
 msgstr "విజయం"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Backend busy"
 msgstr "పూర�వరంగం తీరిగ�గాలేద�"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Repository offline"
 msgstr "ఉంచ�స�థలమ� లైన�లోలేద�"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Address Book does not exist"
 msgstr "చిర�నామా ప�స�తకం లేద�"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 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:66
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Permission denied"
 msgstr "అన�మతి తిరస�కరించబడినది"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact not found"
 msgstr "చిర�నామా కనబడ�టలేద�"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
 msgstr "చిర�నామా ID ఇదివరకే వ�న�నది"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Protocol not supported"
 msgstr "ఈ ప�రొటోకాల� క� సహకారంలేద�"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-cal-model-tasks.c:363
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
+#. To Translators: This is task status
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2651
 msgid "Canceled"
 msgstr "రద�ద�చేయబడినది"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Could not cancel"
 msgstr "రద�ద� చేయలేకపోయింది"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Failed"
 msgstr "ప�రామాణీకరణ విఫలం చెందింది"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Authentication Required"
 msgstr "ప�రామాణీకరణ అవసరం"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "TLS not Available"
 msgstr "TLS లభ�యంకావడంలేద�"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "No such source"
 msgstr "ఇట�వంటి వనర� లేద�"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Not available in offline mode"
 msgstr "లైన�వెల�పలి సంవిధానం అంద�బాట�లో లేద�"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Other error"
 msgstr "ఇతర దోషమ�"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Invalid server version"
 msgstr "చెల�లని సేవిక వర�షన�"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Unsupported authentication method"
 msgstr "మద�దతివ�వని ధృవీకరణ పద�దతి"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -2479,7 +1596,7 @@ msgstr ""
 "ఉపయోగించ�టక� ఇంకా దిగ�మతికాలేద�. దాని సారమ�లన� నకల�తీయ�టక� దయచేసి చిర�నామా ప�స�తకాన�ని ఒకసారి ఆన�‌లైన� "
 "రీతిలో తెర�వ�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -2488,7 +1605,7 @@ msgstr ""
 "ఈ చిర�నామాప�స�తకాన�ని తెర�వలేమ�.  దయచేసి పాత� %s ఉందేమో మరియ� మీక� వాడ�కొన�టక� అన�మతి ఉందేమో "
 "పరిశీలించ�మ�."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -2496,7 +1613,7 @@ msgstr ""
 "ఈ వర�షన� ఎవాల�యూషన� LDAP సేవిక కంపైలేషన� న� కలిగిలేద�. మీర� ఎవాల�యూషన� న� LDAP నంద� ఉపయోగించాలి "
 "అన�క�ంటే, మీర� LDAP-చేతనపరిచిన ఎవాల�యూషన� న� సంస�థాపించాలి."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -2504,11 +1621,11 @@ msgstr ""
 "మేమ� ఈ చిర�నామా ప�స�తకాన�ని తెర�వలేమ�. దీనర�ధం మీర� సరికాని URI ని ప�రవేశపెట�టి ఉండాలి, లేదా సేవిక "
 "అంద�బాట� లో లేకపోయిఉండాలి."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
 msgstr "దోషమ�యొక�క విశదీకృత సందేశమ�:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2520,7 +1637,7 @@ msgstr ""
 "ప�రత�యేకం చేయాలి లేదా ఫలితాల పరిమితిని సంచయం సేవిక అభీష�టాలంద�\n"
 "ఈ చిర�నామాప�స�తకం కొరక� ఉచ�చమ� చేయండి."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -2532,193 +1649,96 @@ msgstr ""
 "మీ శోధనన� ఎక�క�వ ప�రత�యేకం చేయ�మ� లేదా ఈ చిర�నామా ప�స�తకం కొరక� సంచయం సేవిక\n"
 "అభీష�టాల సమయ పరిమితిని ఉచ�చమ� చేయండి."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book was unable to parse this query."
 msgstr "చిర�నామా ప�స�తకం కొరక� పూర�వరంగం ఈ ప�రశ�నన� నిర�వహించలేకపోయింది."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book refused to perform this query."
 msgstr "చిర�నామా ప�స�తకం కొరక� పూర�వరంగం ఈ ప�రశ�నన� నిర�వహించలేకపోయింది."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "ఈ ప�రశ�న విజయవంతంగా పూర�తికాలేకపోయింది."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid "Error adding list"
-msgstr "జాబితాన� జతపర�చ�టలో దోషం"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:685
-msgid "Error adding contact"
-msgstr "చిర�నామాన� జతపర�చ�టలో దోషం"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying list"
-msgstr "జాబితాన� మార�చ�టలో దోషం"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying contact"
-msgstr "చిర�నామా మార�చ�టలో దోషం"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-msgid "Error removing list"
-msgstr "జాబితాన� తీసివేయ�టలో దోషం"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:635
-msgid "Error removing contact"
-msgstr "చిర�నామా తీసివేయ�టలో దోషం"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-#, 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] ""
-"%dచిర�నామాన� తెరచినప�ప�డ�  %dకొత�త గవాక�షం కూడా  తెరచ�క�ంట�ంది.\n"
-"మీర� నిజంగా  ఈ చిర�నామాన� ప�రదర�శించాలన�క�ంట�న�నారా?"
-msgstr[1] ""
-"%dచిర�నామాలన� తెరచినప�ప�డ�  %dకొత�త గవాక�షాల� కూడా  తెరచ�క�ంటాయి.\n"
-"మీర� నిజంగా  ఈ చిర�నామాలన� ప�రదర�శించాలన�క�ంట�న�నారా?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
-msgid "_Don't Display"
-msgstr "ప�రదర�శించ వద�ద�(_D)"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
-msgid "Display _All Contacts"
-msgstr "అన�ని పరిచయాలన� ప�రదర�శించ�మ�(_A)"
-
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s ఇదివరకే వ�న�నది\n"
-"మీర� చెరిపి రాయాలన�క�ంట�న�నారా?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:354
-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:394
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
-msgid "contact"
-msgid_plural "contacts"
-msgstr[0] "చిర�నామా"
-msgstr[1] "చిర�నామాల�"
-
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:443
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:480
+#: ../addressbook/gui/widgets/eab-gui-util.c:247
 msgid "Select Address Book"
 msgstr "చిర�నామా ప�స�తకాన�ని ఎంచ�కొన�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:310
 msgid "list"
 msgstr "జాబితా"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:746
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 msgid "Move contact to"
 msgstr "చిర�నామాన� ఇక�కడికి జర�ప�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:439
 msgid "Copy contact to"
 msgstr "చిర�నామాన� ఇక�కడికి నకల�తీయ�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:751
+#: ../addressbook/gui/widgets/eab-gui-util.c:442
 msgid "Move contacts to"
 msgstr "చిర�నామాలన� ఇక�కడికి జర�ప�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:444
 msgid "Copy contacts to"
 msgstr "చిర�నామాలన� ఇక�కడికి నకల� తీయ�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
-msgid "Multiple vCards"
-msgstr "బహ�ళ Vకార�డ�స��"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
-#, c-format
-msgid "vCard for %s"
-msgstr "%s కొరక� Vకార�డ��"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
-#, c-format
-msgid "Contact information"
-msgstr "చిర�నామా సమాచారం"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
-#, c-format
-msgid "Contact information for %s"
-msgstr "%s కొరక� చిర�నామా సమాచారం"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:291
-msgid "Querying Address Book..."
-msgstr " చిర�నామా ప�స�తకాన�ని ప�రశ�నిస�త�న�నది......."
-
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
 msgid "Card View"
 msgstr " పలక దర�శనం"
 
-#: ../addressbook/importers/evolution-csv-importer.c:660
-#: ../addressbook/importers/evolution-ldif-importer.c:512
-#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "ఎగ�మతిచేస�త�న�నది..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:858
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "అవ�ట�‌ల�క� CSV లేదా టాబ� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:862
+#: ../addressbook/importers/evolution-csv-importer.c:859
 msgid "Outlook CSV and Tab Importer"
 msgstr "అవ�ట�‌ల�క� CSV మరియ� టాబ� దిగ�మతికారి"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:867
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "మొజిల�లా CSV లేదా టాబ� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:871
+#: ../addressbook/importers/evolution-csv-importer.c:868
 msgid "Mozilla CSV and Tab Importer"
 msgstr "మొజిల�లా CSV మరియ� టాబ� దిగ�మతికారి"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:876
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "ఎవాల�యూషన� CSV లేదా టాబ� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:880
+#: ../addressbook/importers/evolution-csv-importer.c:877
 msgid "Evolution CSV and Tab Importer"
 msgstr "ఎవాల�యూషన� CSV మరియ� టాబ� దిగ�మతికారి"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:679
+#: ../addressbook/importers/evolution-ldif-importer.c:689
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP దత�తాంశ పరస�పరమార�పిడి రూపలావణ�యం (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:690
 msgid "Evolution LDIF importer"
 msgstr "ఎవల�యూషన� LDIF దిగ�మతిచేయ�నది"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:556
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vకార�డ�� (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:557
 msgid "Evolution vCard Importer"
 msgstr "ఎవల�యూషన� Vకార�డ�� దిగ�మతిచేయ�నది"
 
@@ -2770,26 +1790,51 @@ msgstr "అకాలనియమిత విధంలో కార�డ�ల
 msgid "NUMBER"
 msgstr "సంఖ�య"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:99
-msgid "Command line arguments error, please use --help option to see the usage."
+#: ../addressbook/tools/evolution-addressbook-export.c:101
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr "ఆదేశవాక�య క�రమాన�గత సంకేతాల దోషం, దయచేసి వాడకాన�ని చూడటానికి --సహాయ ఇచ�చాపూర�వకాన�ని వాడండి"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:113
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "కేవలం csv లేక vకార�డ� రూపలావణ�యాన�ని సహకారించ�న�."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "అకాలనియమిత విధం లో, దిగ�బడి చేసేది దస�త�రమై ఉండాలి."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:130
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "సాధారణ సంవిధానంలో, పరిమాణ ఇచ�చాపూర�వకాల ఆవశ�యం లేద�"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "సంభాలించని దోషం"
 
+#: ../addressbook/util/addressbook.c:103
+msgid "Accessing LDAP Server anonymously"
+msgstr "LDAP సేవికన� అనామకంగా సాంగత�యం చేస�త�న�నది"
+
+#: ../addressbook/util/addressbook.c:210
+#: ../plugins/groupwise-features/camel-gw-listener.c:525
+msgid "Failed to authenticate.\n"
+msgstr "ప�రమాణీకరించడంలో విఫలం.\n"
+
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "%s (వినియోగదారి %s) కొరక� సంకేతపదాన�ని ప�రవేశపెట�టండి"
+
+#: ../addressbook/util/addressbook.c:225
+#: ../calendar/common/authentication.c:51
+#: ../plugins/caldav/caldav-browse-server.c:809
+#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/publish-calendar/publish-calendar.c:328
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "రహస�య పదమ�న� ప�రవేశపెట�టండి"
+
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -2843,11 +1888,13 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "ఈ కర�తవ�యాలలోని సమాచారం అంతా తొలగించబడ�త�ంది మరియ� తిరిగినిల�వచేయబడద�."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this appointment will be deleted and can not be restored."
-msgstr "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr "ఈ నియామకమ� పైని సమాచారమ� అంతా తొలగించబడ�న� మరియ� తిరిగినిల�వచేయబడద�."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr "ఈ సమావేశాలలోని సమాచారం అంతా తొలగించబడ�త�ంది మరియ� తిరిగినిల�వచేయబడద�."
 
 #: ../calendar/calendar.error.xml.h:13
@@ -2867,266 +1914,267 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "మీర� నియామకం శీర�షిక '{0}' న� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
 #: ../calendar/calendar.error.xml.h:17
+#, fuzzy
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "మీర� నియామకం శీర�షిక '{0}' న� తొలగించ�దామని అన�క�ంట�న�నారా?"
+
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr " మీర� నిజంగా మెమో '{0}' న� తొలగించాలని అక�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "మీర� ఖచ�చితంగా ఈ '{0}' నియామకాలన� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "మీర� ఖచ�చితంగా ఈ '{0}' మెమోలన� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "మీర� ఖచ�చితంగా ఈ '{0}' కర�తవ�యాలన� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this appointment?"
 msgstr "మీర� ఖచ�చితంగా ఈ నియామకాన�ని తొలగించ�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr " మీర� నిజంగా ఈ సమావేశాన�ని రద�ద� చేయాలన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:188
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "మీర� ఖచ�చితంగా ఈ మెమోన� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "మీర� నిజంగా ఈ కర�తవ�యాన�ని రద�ద� చేయాలన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "మీర� ఖచ�చితంగా మెమోన� సంక�షిప�తం లేక�ండా దాయాలన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "మీర� ఖచ�చితంగా సంక�షిప�తం లేక�ండా నియామకాన�ని పంపాలని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "మీర� నిజంగా ఈ కర�తవ�యాన�ని సంక�షిప�తమ� లేక�ండా పంపించాలన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Calendar repository is offline."
 msgstr "క�యాలెండర� రిపోజిటరీ ఆఫ�‌లైన�లోవ�ంది."
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "కొత�త సంఘటనన� సృష�టించలేమ�"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot save event"
 msgstr "ఘటనన� భద�రపరచలేమ�"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete calendar '{0}'?"
 msgstr "క�యాలెండర� న� తొలగించ�మ� '{0}'"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete memo list '{0}'?"
 msgstr "మెమో జాబితా '{0}' న� తొలగించ�మ�?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete task list '{0}'?"
 msgstr "కర�తవ�యాల జాబితాన� తొలగించ�మ� '{0}'"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
 msgstr "పంపించ వద�ద�(_n)"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "దిగ�మతి జర�గ�తోంది. మీర� నియామకాన�ని దాయాలన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
 msgstr "దిగ�మతి ప�రోగమనంలో ఉంది. మీర� ఈ కర�తవ�యాన�ని దాయాలన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
 msgstr "సరికూర�పరి లోడ�కాలేకపోయింది."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr "ఈమెయిల� ఆహ�వానమ�ల� పల�గోనేవారందరికి పంప�మ� మరియ� వాటిని ఆమోదించ�టక� వారిని ఆమోదింప�మ�."
 
-#: ../calendar/calendar.error.xml.h:39
-msgid "Email invitations will be sent to all participants and allow them to reply."
+#: ../calendar/calendar.error.xml.h:40
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr "పాల�గొన�నవారందరికి ఈ మెయిల� ద�వారా ఆహ�వానాల� పంపబడతాయి మరియ� వార�  స�పందించ�టక�  అన�మతి ఉంది."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
 msgstr "క�యాలెండర� లోడింగ� లో దోషం"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading memo list"
 msgstr "మెమో జాబితాన� నింప�టలో దోషం"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid "Error loading task list"
 msgstr "కర�తవ�య జాబితాన� నింప�టలో దోషం"
 
 #. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error on '{0}'"
 msgstr "{0} పై దోషం"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 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:46
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr "మీర� రద�ద� నోటీస� పంపకపోతే, పాల�గోంట�న�న మిగతావారికి మెమో రద�దయిన సంగతి తెలియకపోవచ�చ�."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 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:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "No response from the server."
 msgstr "సేవికన�ండి యెట�వంటి స�పందనలేద�."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "Save Appointment"
-msgstr "నియామకం దాయ�మ�"
-
 #: ../calendar/calendar.error.xml.h:50
-msgid "Save Memo"
-msgstr "మెమో దాయ�మ�"
-
-#: ../calendar/calendar.error.xml.h:51
-msgid "Save Task"
-msgstr "కర�తవ�యం దాయ�మ�"
-
-#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
-msgstr "తాజా సమాచారాన�ని పంప�ట ద�వారా పాల�దొంట�న�న మిగతా వార� వారి క�యాలెండర�లన� ఎప�పటికప�ప�డ� నవీకరించ�తార�."
+msgstr ""
+"తాజా సమాచారాన�ని పంప�ట ద�వారా పాల�దొంట�న�న మిగతా వార� వారి క�యాలెండర�లన� ఎప�పటికప�ప�డ� నవీకరించ�తార�."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
-msgstr "తాజా సమాచారాన�ని పంప�ట ద�వారా పాల�దొంట�న�న మిగతా వార� వారి కర�తవ�య జాబితాలన� ఎప�పటికప�ప�డ� నవీకరించ�తార�."
+msgstr ""
+"తాజా సమాచారాన�ని పంప�ట ద�వారా పాల�దొంట�న�న మిగతా వార� వారి కర�తవ�య జాబితాలన� ఎప�పటికప�ప�డ� నవీకరించ�తార�."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "కొన�ని అన�భందాల� దిగ�మతైనవి. నియామకాల న� దాచ�ట ఈ అన�భందాల నష�టంలో ప�రతిఫలిస�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "కొన�ని అన�భందాల� దిగ�మతైనవి. కర�తవ�యాన�ని దాచ�ట ఈ అన�భందాల నష�టంలో ప�రతిఫలిస�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "మీ ప�రస�త�త సేవికతో కొన�ని లక�షణాల� సరిగ�గా పనిచేయవ�"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ఎవల�యూషన� క�యాలండర� ఊహించని విధంగా త�యజించబడినది."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "ఎవల�యూషన� క�యాలండర� ఊహించని విధంగా నిష�క�రమించెన�."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "ఎవాల�యూషన� మెమో ఊహించని విధంగా త�యజించబడింది."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ఎవల�యూషన� కర�తవ�యాల� ఊహించని విధంగా త�యజించబడ�డాయి."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "The calendar is not marked for offline usage."
 msgstr "లైన� వెల�పలి ఉపయోగానికి క�యాలెండర� గ�ర�తించబడలేద�"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
 msgstr "మెమో జాబితా ఆఫ�‌లైన� వ�పయోగానికి గ�ర�త�ంచబడిలేద�."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
 msgstr "లైన� వెల�పలి ఉపయోగానికి కర�తవ�యాల జాబితా గ�ర�తించబడలేద�"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "ఈ క�యాలెండర� శాశ�వతంగా తొలగించబడ�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "మెమో జాబితా శాశ�వతంగా తొలగించబడ�తోంది."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "ఈ కర�తవ�య జాబితా శాశ�వతంగా తొలగించబడ�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:65
 msgid "Unable to load the calendar"
 msgstr "క�యాలెండర�‌న� లోడ�చేయలేకపోయింది"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this appointment?"
 msgstr "ఈ నియామకానికి మీ మార�ప�లన� దాయాలన� క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:67
+#, fuzzy
+msgid "Would you like to save your changes to this meeting?"
+msgstr "ఈ మెమోక� మీర� చేసిన మార�ప�లన� దాయాలన�క�ంట�న�నారా?"
+
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this memo?"
 msgstr "ఈ మెమోక� మీర� చేసిన మార�ప�లన� దాయాలన�క�ంట�న�నారా?"
 
 #
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this task?"
 msgstr "మీర� ఈ కర�తవ�యానికి మార�ప�లన� దాయదల�చ�క�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "మీర� రద�ద� నోటీస�న� ఈమెమో కొరక� పంప�దామని అన�క�ంట�న�నరా?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "మీర� పాల�గొన�వారందరికి రద�ద� నోటీస�న� పంప�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "పాల�గొన�నవారికి సమావేశానికి ఆహ�వానాలన� పంప�తారా?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send this task to participants?"
 msgstr "పాల�గొన�నవారికి మీర� ఈ  కర�తవ�యాన�ని పంప�తారా? "
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "పాల�గొన�నవారికి తాజా సమావేశ సమాచారాన�ని పంప�తారా?"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send updated task information to participants?"
 msgstr "పాల�గొన�నవారికి తాజా కర�తవ�య సమాచారాన�ని పంప�తారా?"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:76
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -3135,280 +2183,208 @@ msgstr ""
 "మీర� మద�దతీయని సమూహతరహా సేవికక� అన�సంధానించబడ�త�న�నార� మరియ� ఎవాల�యూషన� ఉపయోగించ�టలో సమస�యన� "
 "ఎద�ర�క�ంటార�. మంచి ఫలితాల కొరక�, సేవిక తప�పక మద�దతివ�వబడ� వర�షన� క� నవీకరించబడలి."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "మీర� ఈ నియామకాన�ని మార�చినార�, కాని ఇంతవరక� దాయలేద�."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:78
+#, fuzzy
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "మీర� ఈ  కర�తవ�యాన�ని మార�చార� కాని ఇంకా దాయలేద�."
+
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this task, but not yet saved it."
 msgstr "మీర� ఈ  కర�తవ�యాన�ని మార�చార� కాని ఇంకా దాయలేద�."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "మీర� ఈ మెమోక� మార�ప�ల� చేసినార�, అయితే ఇంతవరక� దాయలేద�."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:81
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ఎవల�యూషన� ప�న:ప�రారంభమయ�యేవరక� మీ క�యాలెండర�స� అంద�బాట�లో ఉండవ�."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "ఎవాల�యూషన� ప�నఃప�రారంభమయ�యేవరక� మీ మెమోల� అంద�బాట�లోకి రావ�."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ఎవల�యూషన� ప�న:ప�రారంభమయ�యేవరక� మీ కర�తవ�యాల� అంద�బాట�లో ఉండవ�."
 
-#: ../calendar/calendar.error.xml.h:85
-#: ../composer/mail-composer.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "మార�ప�లన� తీసివేయ�మ�(_D)"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
+#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
 msgid "_Save"
 msgstr "దాయ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:86
 msgid "_Save Changes"
 msgstr "మార�ప�లన� దాయ�మ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:87
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "పంప�మ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:88
 msgid "_Send Notice"
 msgstr "తాఖీద� ని పంప�మ� (_S)"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:89
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:248
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "బహ�-రోజ� ఘటనలన� విభజించ�:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1513
-#: ../calendar/conduits/calendar/calendar-conduit.c:1514
-#: ../calendar/conduits/memo/memo-conduit.c:807
-#: ../calendar/conduits/memo/memo-conduit.c:808
-#: ../calendar/conduits/todo/todo-conduit.c:1007
-#: ../calendar/conduits/todo/todo-conduit.c:1008
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1533
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/memo/memo-conduit.c:822
+#: ../calendar/conduits/todo/todo-conduit.c:1022
+#: ../calendar/conduits/todo/todo-conduit.c:1023
 msgid "Could not start evolution-data-server"
 msgstr "ఎవల�య�షన�-దతాంశ-సేవిక న� ప�రారంభించలేకపోయింది"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1621
-#: ../calendar/conduits/calendar/calendar-conduit.c:1624
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
 msgstr "చ�క�కానీల క�యాలెండర� కార�యక�షేత�ర భాగమ�న� చదవలేకపోయింది"
 
-#: ../calendar/conduits/memo/memo-conduit.c:901
-#: ../calendar/conduits/memo/memo-conduit.c:904
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "పైలట� యొక�క మెమో అన�వర�తనం భాగమ�న� చద�వలేకపోయింది"
 
-#: ../calendar/conduits/memo/memo-conduit.c:948
-#: ../calendar/conduits/memo/memo-conduit.c:951
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "పైలట� యొక�క మెమో అన�వర�తనం భాగమ�న� వ�రాయలేక పోయింది"
 
-#: ../calendar/conduits/todo/todo-conduit.c:227
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
 msgstr "ఆప�రమేయ ప�రాధాన�యం:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1091
-#: ../calendar/conduits/todo/todo-conduit.c:1094
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
 msgid "Could not read pilot's ToDo application block"
 msgstr "చ�క�కానీల చేయవలసిన కార�యక�షేత�ర భాగమ�న� చదవలేకపోయింది"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1136
-#: ../calendar/conduits/todo/todo-conduit.c:1139
+#: ../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:2549
-msgid "Calendar and Tasks"
-msgstr "క�యాలెండర� మరియ� కర�తవ�యాల�"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:819
-#: ../calendar/gui/calendar-component.c:1238
-msgid "Calendars"
-msgstr "క�యాలెండర� ల�"
-
-#: ../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 "ఎవల�యూషన� క�యాలెండర� మరియ� కర�తవ�యాల�"
-
-#: ../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 "ఎవల�యూషన� క�యాలెండర�/ కర�తవ�య సరికర�త"
-
-#: ../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 "మెమోస�(_s)"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1123
-#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
-#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
-#: ../calendar/gui/memos-control.c:402
-msgid "Memos"
-msgstr "మెమోస�"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
-#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
-#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
-#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:751
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "కర�తవ�యాల�"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "క�యాలెండర�ల�(_C)"
-
-#. Tasks
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "కర�తవ�యాల�(_T)"
-
-#: ../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:100
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "నిమిషం"
 msgstr[1] "నిమిషాల�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-#: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-file/calendar-file.c:294
-#: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:721
-#: ../plugins/google-account-setup/google-contacts-source.c:331
-msgid "hours"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#, fuzzy
+msgid "hour"
 msgid_plural "hours"
 msgstr[0] "à°—à°‚à°Ÿ"
 msgstr[1] "గంటల�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
 msgid "Start time"
 msgstr "ప�రారంభ సమయం"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "నియామకాల�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
 msgstr "అన�నిటిని తృణీకరించ�మ� (_A)"
 
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
-#: ../calendar/gui/e-itip-control.c:1164
-#: ../plugins/itip-formatter/itip-view.c:1023
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/e-itip-control.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "Location:"
 msgstr "స�థానం:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
 msgid "Snooze _time:"
 msgstr "వెళ�ళబ�చ�చ� సమయం(_t):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
 msgid "_Dismiss"
 msgstr "తృణీకరించ�మ� (_D)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1038
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
-#: ../widgets/menus/gal-define-views.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:152
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1621
+#: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "సరిచేయ�(_E)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "వెళ�ళబ�చ�చ�(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#, fuzzy
+msgid "hours"
+msgstr "à°—à°‚à°Ÿ"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "నియామకం యొక�క స�థానమ�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+msgid "minutes"
+msgstr "నిమిషాల�"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
 msgid "No summary available."
 msgstr "సంక�షిప�తమ� అంద�బాట�లో లేద�."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
 msgid "No description available."
 msgstr "వివరణ అంద�బాట�లో లేద�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
 msgid "No location information available."
 msgstr "స�థానమ� యొక�క సమాచారం అంద�బాట� లో లేద�."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
 #, c-format
 msgid "You have %d alarms"
 msgstr "మీక� %d హెచ�చరికల�న�నాయి"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "హెచ�చరిక"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3420,7 +2396,7 @@ msgstr ""
 "పంప�టక� ఆకృతీకరించబడింది.  ఎవాల�యూషన� బద�ల�గా ఒక సాదారణ గర�తించ�దాని\n"
 "డైలాగ� పెట�టె న� ప�రదర�శిస�త�ంది."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3437,20 +2413,10 @@ msgstr ""
 "\n"
 "మీర� ఖచ�చితంగా ఈ ప�రోగ�రామ� న� నడ�పవలెనని అన�క�ంట�న�నారా?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
 msgid "Do not ask me about this program again."
 msgstr "ఈ కార�యక�రమం గ�రించి నన�న� మళ�ళీ అడగద�ద�"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:141
-msgid "Could not initialize Bonobo"
-msgstr "బొనొబొ న� సంసిద�ధపర�చలేక పోయింది"
-
-#: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
-msgstr "అలారం తాఖీద� సేవ గ�ణకాన�ని సృష�టించలేద�, బహశా అది ఇప�పటికే నడ�స�త�ండవచ�చ�..."
-
 #: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "నిస�సార కాలం"
@@ -3489,7 +2455,7 @@ msgid "Alarm programs"
 msgstr "అలారం ప�రోగ�రామ�‌ల�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "దోషంన� స�థితిపట�టీపై చూపించవలిసిన సమయం సెకన�లలో."
 
@@ -3514,7 +2480,8 @@ msgid "Check this to use system timezone in Evolution."
 msgstr "ఎవాల�యూషన� నంద� సిస�టమ� సమయక�షేత�రమ�న� వ�పయోగించ�టక� దీనిని పరిశీలించ�మ�."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "సమయ పట�టీ పై మార�కస� బైన�స� వర�సన� గీయ�టక� వర�ణమ� (అప�రమేయంగా ఖాళీ)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
@@ -3542,7 +2509,6 @@ msgid "Default appointment reminder"
 msgstr "అప�రమేయ నియామకాన�ని గ�ర�తించ�నది"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
-#| msgid "Default reminder units"
 msgid "Default recurrence count"
 msgstr "అప�రమేయ ప�నరావృత లెక�క"
 
@@ -3603,39 +2569,47 @@ msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "పనిరోజ� ప�రారంభమగ� గంట, ఇరవై నాల�గ� గంటల రూపంలో, 0 న�ండి 23"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "రోజ� లో చూపబడ� విరామాల� మరియ� పనివారాల దర�శనంల�, నిమషాలలో."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Last alarm time"
 msgstr "చివరి హెచ�చరిక సమయం"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "� స�థాయి కి క�రింద సందేశం లాగిన� అవ�వాలో."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of recently used second time zones in a Day View."
 msgstr "రోజ� దర�శనంలో యిటీవల వ�పయోగించిన సమయక�షేత�రాల యొక�క జాబితా."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "List of server URLs for free/busy publishing."
 msgstr "ఖాళీ/తీరికలేని పబ�లిషింగ� కొరక� సేవిక URLs యొక�క జాబితా."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line"
 msgstr "మార�కస� బైన�స�  వర�స"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Day View"
 msgstr "మార�కస� బైన�స� వర�స వర�ణమ� - రోజ� దర�శనం"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "మార�కస� బైన�స� వర�స వర�ణం - సమయ పట�టీ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -3643,39 +2617,53 @@ msgstr ""
 "'day_second_zones' జాబితానంద� గ�ర�త�ంచ�కొన�టక� యిటీవల వ�పయోగించిన సమయక�షేత�రమ�లయొక�క గరిష�ట "
 "సంఖ�య."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Maximum number of recently used timezones to remember."
 msgstr "గ�ర�త�ంచ�కొనవలసిన యిటీవలవ�పయోగించిన సమయక�షేత�రమ�ల గరిష�ట సంఖ�య."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#, fuzzy
+msgid "Memo layout style"
+msgstr "ప�రత�య�త�తరమ� శైలి(_R):"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#, fuzzy
+msgid "Memo preview pane position (vertical)"
+msgstr "నిల�వ పలక స�థానమ�లో నెల దర�శనాన�ని చూప�మ�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "పనిరోజ� మ�గియ� నిమషం, 0 న�ండి 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "పనిరోజ� ప�రారంభం మగ� నిమ�షం, 0 న�ండి 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view horizontal pane position"
 msgstr "క�యాలెండర� లో నెల దర�శనాన�ని సమాతల పలక స�థానమ�లో చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Month view vertical pane position"
 msgstr "నిల�వ పలక స�థానమ�లో నెల దర�శనాన�ని చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining a default reminder."
 msgstr "అప�రమేయంగా గర�త�చేయ�దానిని నిర�దారించ�ట కొరక� యూనిట�ల సంఖ�య."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Number of units for determining when to hide tasks."
 msgstr "కర�తవ�యాలన� ఎప�ప�డ� మర�గ�పరచాలో గ�ర�త�చేయ�దాని కొరక� యూనిట�ల సంఖ�య."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Overdue tasks color"
 msgstr "అతక�రమించ� కర�తవ�యం వర�ణమ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -3683,7 +2671,7 @@ msgstr ""
 "సమాంతర తలం యొక�క స�థానమ�, నెల దర�శనిలో లేనప�ప�డ� తేదీ మార�చ� క�యాలెండర� మరియ� కర�తవ�య జాబితా ల మధ�య, "
 "పిక�సెల�స� లో."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -3691,19 +2679,25 @@ msgstr ""
 "సమాంతర తలం యొక�క స�థానమ�, నెల దర�శిని లో దర�శనం మరియ� తేదీ నేవిగేటర� క�యాలెండర� మరియ� కర�తవ�యజాబితా మధ�య, "
 "పిక�సెల�స� లో."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "నిల�వ� తలం యొక�క స�థానమ�, క�యాలెండర� జాబితా మరియ� తేదీ మార�చ� క�యాలెండర� మధ�య."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-msgstr "నిల�వ� తలం యొక�క స�థానమ�, కర�తవ�యప� జాబితా మరియ� కర�తవ�యం ఉపదర�శనం తలం మధ�య, పిక�సెల�స� లో."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -3711,7 +2705,7 @@ msgstr ""
 "నిల�వ� తలం యొక�క స�థానమ�, నెల దర�శనం లో దర�శనం మరియ� తేది మార�చ� క�యాలెండర� మరియ� కర�తవ�యం జాబితా ల "
 "మధ�య, పిక�సెల�స� లో."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 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."
@@ -3719,88 +2713,85 @@ msgstr ""
 "నిల�వ� తలం యొక�క స�థానమ�, నెల దర�శనం లో లేనప�ప�డ� దర�శనం మరియ� తేది మార�చ� క�యాలెండర� మరియ� "
 "కర�తవ�యం జాబితా ల మధ�య, పిక�సెల�స� లో."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#| msgid "Print this calendar"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary calendar"
 msgstr "ప�రాధమిక క�యాలెండర�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#| msgid "New memo list"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary memo list"
 msgstr "ప�రాధమిక మెమో జాబితా"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
-#| msgid "New task list"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Primary task list"
 msgstr "ప�రాధమిక కర�తవ�య జాబితా"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Programs that are allowed to be run by alarms."
 msgstr "హెచ�చరికలచే నడ�చ�టక� కార�యక�రమాల� అన�మతింబడ�డాయి."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Recently used second time zones in a Day View"
 msgstr "రోజ� దర�శనమ�నంద� యిటీవలవ�పయోగించిన రెండవ సమయ క�షేత�రమ�ల�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Save directory for alarm audio"
 msgstr "హెచ�చరిక శ�రవణ క� వివరమ�న� దాయ�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Scroll Month View by a week"
 msgstr "నెల దర�శనమ�న� వారమ� ద�వారా స�క�రాల� చేయ�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "RSVP క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరి లో చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "పాత�ర క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show appointment end times in week and month views"
 msgstr "వారమ� మరియ� నెల దర�శనంలలో నియామకాల మ�గియ� సమయాన�ని చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "వర�గమ�ల క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show display alarms in notification tray"
 msgstr "ప�రకటన ట�రే లో ప�రదర�శన అలారంలన� చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
 msgstr "స�థితి క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరిని చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Show the \"Preview\" pane"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#, fuzzy
+msgid "Show the memo preview pane"
 msgstr "\"ఉపదర�శన\" పలకాన�ని చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show the \"Preview\" pane."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#, fuzzy
+msgid "Show the task preview pane"
 msgstr "\"ఉపదర�శన\" పలకాన�ని చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
 msgstr "సమయక�షేత�ర క�షేత�రమ�న� ఘటన/సమావేశం కూర�పరి నంద� చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show type field in the event/task/meeting editor"
 msgstr "టైప� క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరినంద� చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week number in Day and Work Week View"
 msgstr "వారప� సంఖ�యన� తేదీ మరియ� పని వారప� దర�శనమ�లో చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Show week numbers in date navigator"
 msgstr "వారప� సంఖ�యలన� తేదీ మార�చ�దానిలో చూప�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -3808,15 +2799,25 @@ msgstr ""
 "అమర�చివ�న�నట�లైతే, రోజ�లో రెండవ సమయ క�షేత�రమ�న� చూపమ�. విల�వ 'సమయక�షేత�రమ�' కీనంద� వ�పయోగించిన "
 "దానికి సరిపోల�త�ంది."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-msgid "Tasks due today color"
-msgstr "ఈ రోజ�తో అయిపోవ� కర�తవ�యమ�ల వర�ణమ�"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Task layout style"
+msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-msgid "Tasks vertical pane position"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#, fuzzy
+msgid "Task preview pane position (horizontal)"
 msgstr "నిల�వ� పలక స�థానం యొక�క కర�తవ�యాల�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#, fuzzy
+msgid "Task preview pane position (vertical)"
+msgstr "నిల�వ� పలక స�థానం యొక�క కర�తవ�యాల�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+msgid "Tasks due today color"
+msgstr "ఈ రోజ�తో అయిపోవ� కర�తవ�యమ�ల వర�ణమ�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -3825,7 +2826,7 @@ msgstr ""
 "ఖాళీ/తిరకలేని డాటా ఫాల�‌బ�యాక� గా ఉపయోగించ�టక� URL మాదిరి, %s మెయిల� చిర�నామా యొక�క వినియోగదారి బాగమ� చేత "
 "ప�నఃస�థాపించబడింది మరియ� %d డెమోన� చేత ప�నఃస�థాపించబడింది."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -3833,90 +2834,109 @@ msgstr ""
 "క�యాలెండర� నందలి తేదీల� మరియ� సమయాలక� ఉపయోగించ�టక� అప�రమేయ సమయక�షేత�రం, \"America/New York\" "
 "లాంటి అన�వాదించలేని ఓల�సన� సమయక�షేత�ర డాటాబేస� స�థానమ�."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "The second timezone for a Day View"
 msgstr "రోజ� దర�శనంక� రెండవ సమయక�షేత�రమ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
-msgstr "ఇది మూడ� విల�వ�లన� కలిగివ�ండవచ�చ�. దోషమ�ల కొరక� 0. హెచ�చరికల కొరక� 1. డీబగ� సందేశాల కొరక� 2."
+msgstr ""
+"ఇది మూడ� విల�వ�లన� కలిగివ�ండవచ�చ�. దోషమ�ల కొరక� 0. హెచ�చరికల కొరక� 1. డీబగ� సందేశాల కొరక� 2."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time divisions"
 msgstr "సమయ విభాగమ�ల�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Time the last alarm ran, in time_t."
 msgstr "చివరి అలారం నడ�వవలిసిన సమయం, time_t లో."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Timezone"
 msgstr "సమయక�షేత�రం"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr "క�యాలెండర� దర�శనంలలో ఘటనల యొక�క పారదర�శకత, 0(పారదర�శకం) మరియ� 1 (ఒపాక�యూ) ఒక విల�వ."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Twenty four hour time format"
 msgstr "ఇరవైనాల�గ� గంటల సమయ రూపలావణ�యమ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "ఉద�దీపనం చేసిన (\"ప�రాధమిక\") క�యాలెండర� యొక�క URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "ఉద�దీపనంచేసిన (\"ప�రాధమిక\") మెమో జాబితా యొక�క URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "ఉద�దీపనంచేసిన (\"ప�రాధమిక\") కర�తవ�య జాబితా యొక�క URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "అప�రమేయంగా గ�ర�తించ�దాని యొక�క ప�రమాణంల�, \"నిమ�షాల�\", \"గంటల�\" లేదా \"రోజ�ల�\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "కర�తవ�యాలన� ఎప�ప�డ� మర�గ�పరచాలో నిర�ధారించ�టక� ప�రమాణమ�ల�, \"నిమ�షాల�\", \"గంటల�\" లేదా "
 "\"రోజ�ల�\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
-#| msgid "_Use system defaults"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use system timezone"
 msgstr "సిస�టమ� సమయక�షేత�రమ�న� వ�పయోగించ�మ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr "ఎవాల�యూషన� నంద� యెంపికచేసిన సమయక�షేత�రమ�నక� బద�ల�గా సిస�టమ� సమయక�షేత�రమ�న� వ�పయోగించ�మ�."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+msgid "Vertical pane position"
+msgstr "నిల�వ�గావ�న�న పలక స�థానం"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Week start"
 msgstr "ప�రారంభ వారం"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "వారమ� ప�రారంభంలో వారమ�రోజ�, ఆదివారం (0) న�ండి శనివారం (6) వరక�."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "ప�రదర�శన అలారమ�లక� ప�రకటన ట�రే న� ఉపయోగించాలా వద�దా."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "ఒక నియామకాన�ని లేదా కర�తవ�యాన�ని తొలగిస�త�న�నప�పడ� నిర�దారణ కొరక� అడగవలెనా."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "కర�తవ�యాలన� మరియ� నియామకాలన� కొట�టివేయ�చ�న�నప�పడ� నిర�దారణ కొరక� అడగవలెనా."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -3924,286 +2944,101 @@ msgstr ""
 "నెల దర�శని లో వారాంతమ�లన� క�చించ వలెనా, �దైతే శనివారమ� మరియ� ఆదివారమ�లన� ఒక వారమ�రోజ� స�థలమ�లో "
 "ఉంచ�త�ందో."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "వారమ� మరియ� నెల దర�శనమ�లలో ఘటనల యొక�క మ�గియ�కాలాన�ని ప�రదర�శించవలెనా."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "క�యాలండర� నంద� మార�కస� బైన�స� వర�సన (ప�రస�త�త సమయం వద�ద వర�స) న� గీయవలెనా."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "పూర�తైన కర�తవ�యమ�లన� కర�తవ�య దర�శని లో మర�గ�పరచాలా."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "నెల దర�శనమ�న� నెలన� అన�సరించి కాక, వారమ� ద�వారా స�క�రాల� చేయాలా."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to set a default reminder for appointments."
 msgstr "నియామకాలక� అప�రమేయంగా గ�ర�తించ�దానిని అమర�చాలా."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "RSVP క�షేత�రాన�ని ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూపాలా"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "వర�గమ�ల క�షేత�రాన�ని ఘటన/సమావేశం కూర�పరి నంద� చూపాలా"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "పాత�ర క�షేత�రాన�ని ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూపాలా"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "స�థితి క�షేత�రాన�ని ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూపాలా"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "సమయాన�ని am/pm విధానం బద�ల�గా ఇరవై నాల�గ� గంటల రూపంలో చూపించాలా."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "సమయక�షేత�ర క�షేత�రమ�న� ఘటన/సమావేశం కూర�పరి నంద� చూపాలా"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "టైప� క�షేత�రాన�ని ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూపాలా"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "వారప� సంఖ�యన� తేదీ మరియ� పని వారప� దర�శనంలో చూపాలా."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Whether to show week numbers in the date navigator."
 msgstr "వారప� సంఖ�యలన� తేదీ మార�చ�దానిలో చూపాలా."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Work days"
 msgstr "పనిరోజ�ల�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end hour"
 msgstr "పనిరోజ�లో చివరి గంట"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday end minute"
 msgstr "పనిరోజ� చివరి నిమిషం"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start hour"
 msgstr "పనిరోజ� ప�రారంభ గంట"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
 msgid "Workday start minute"
 msgstr "పనిరోజ� ప�రారంభ నిమిషం"
 
-#: ../calendar/gui/cal-editor-utils.c:100
-#| msgid "Invalid contact."
+#: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
 msgstr "చెల�లని ఆబ�జక�ట�"
 
-#: ../calendar/gui/cal-search-bar.c:74
-msgid "Summary contains"
-msgstr "సంక�షిప�తమ� కలిగివ�ంది"
-
-#: ../calendar/gui/cal-search-bar.c:75
-msgid "Description contains"
-msgstr "వివరణ కలిగివ�ంది"
-
-#: ../calendar/gui/cal-search-bar.c:76
-msgid "Category is"
-msgstr "విభాగం...."
-
-#: ../calendar/gui/cal-search-bar.c:77
-msgid "Comment contains"
-msgstr "వ�యాఖ�య కలిగివ�ంది"
-
-#: ../calendar/gui/cal-search-bar.c:78
-msgid "Location contains"
-msgstr "స�థానం కలిగివ�ంది"
-
-#: ../calendar/gui/cal-search-bar.c:636
-msgid "Next 7 Days' Tasks"
-msgstr "తర�వాతి 7 రోజ�ల' కర�తవ�యాల�"
-
-#: ../calendar/gui/cal-search-bar.c:640
-msgid "Active Tasks"
-msgstr "చేతనమైన కర�తవ�యాల�"
-
-#: ../calendar/gui/cal-search-bar.c:644
-msgid "Overdue Tasks"
-msgstr "సమయంమించిన కర�తవ�యాల�"
-
-#: ../calendar/gui/cal-search-bar.c:648
-msgid "Completed Tasks"
-msgstr "పూర�తయిన కర�తవ�యాల�"
-
-#: ../calendar/gui/cal-search-bar.c:652
-msgid "Tasks with Attachments"
-msgstr "అన�బంధాలతో కర�తవ�యాల�"
-
-#: ../calendar/gui/cal-search-bar.c:698
-msgid "Active Appointments"
-msgstr "చేతనమైన నియామకాల�"
-
-#: ../calendar/gui/cal-search-bar.c:702
-msgid "Next 7 Days' Appointments"
-msgstr "తర�వాతి 7రోజ�ల' నియామకాల�"
-
-#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "మ�ద�రణ"
-
-#: ../calendar/gui/calendar-commands.c:331
-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:337
-msgid "Purge events older than"
-msgstr "దీనికన�నా పాతవైన ఘటనలన� కొట�టివేయ�మ�"
-
-#: ../calendar/gui/calendar-commands.c:342
-#: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-file/calendar-file.c:295
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:722
-#: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "రోజ�ల�"
-
-#. Create the Webcal source group
-#: ../calendar/gui/calendar-component.c:194
-#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
-#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
-#: ../calendar/gui/tasks-component.c:149
-msgid "On The Web"
-msgstr "మహాతలం పైన"
-
-#: ../calendar/gui/calendar-component.c:195
-#: ../plugins/calendar-weather/calendar-weather.c:126
-msgid "Weather"
-msgstr "వాతావరణం"
-
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:289
-#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
-msgid "Birthdays & Anniversaries"
-msgstr "ప�ట�టినరోజ�ల� & వార�షికోత�సవాల�"
-
-#: ../calendar/gui/calendar-component.c:626
-msgid "_New Calendar"
-msgstr "కొత�త క�యాలెండర�(_N)"
-
-#: ../calendar/gui/calendar-component.c:627
-#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
-#: ../mail/em-folder-tree.c:2114
-msgid "_Copy..."
-msgstr "నకల�తీయ�(_C)..."
-
-#: ../calendar/gui/calendar-component.c:632
-#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
-msgid "_Make available for offline use"
-msgstr "ఆఫ�‌లైన� ఉపయోగార�దం అంద�బాట�చేయ�మ� (_M)"
-
-#: ../calendar/gui/calendar-component.c:633
-#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
-msgid "_Do not make available for offline use"
-msgstr "ఆఫ�‌లైన� వ�పయోగం కొరక� అంద�బాట� చేయవద�ద� (_D)"
-
-#: ../calendar/gui/calendar-component.c:961
-msgid "Failed upgrading calendars."
-msgstr "క�యాలెండర� న� తాజాపర�చ�ట లో విఫలం ."
-
-#: ../calendar/gui/calendar-component.c:1089
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "ఘటనల� మరియ� సమావేశాల� సృష�టించ�ట కొరక� క�యాలెండర�'%s' న� తెరవలేకపోయింది"
-
-#: ../calendar/gui/calendar-component.c:1105
-msgid "There is no calendar available for creating events and meetings"
-msgstr "ఘటనల� మరియ� సమావేశాల� సృష�టించ�ట కొరక� క�యాలెండర� అంద�బాట� లొ లేద�"
-
-#: ../calendar/gui/calendar-component.c:1218
-msgid "Calendar Source Selector"
-msgstr "క�యాలెండర� వనర� ఎంపికచేసేది"
-
-#: ../calendar/gui/calendar-component.c:1433
-msgid "New appointment"
-msgstr "కొత�త నియామకం"
-
-#: ../calendar/gui/calendar-component.c:1434
-msgctxt "New"
-msgid "_Appointment"
-msgstr "నియామకం (_A)"
-
-#: ../calendar/gui/calendar-component.c:1435
-msgid "Create a new appointment"
-msgstr "కొత�త నియామకమ�న� సృష�టించ�"
-
-#: ../calendar/gui/calendar-component.c:1441
-msgid "New meeting"
-msgstr "కొత�త సమావేశం"
-
-#: ../calendar/gui/calendar-component.c:1442
-msgctxt "New"
-msgid "M_eeting"
-msgstr "సమావేశం (_e)"
-
-#: ../calendar/gui/calendar-component.c:1443
-msgid "Create a new meeting request"
-msgstr "కొత�త సమావేశ అభ�యర�థన న� సృష�టించ�"
-
-#: ../calendar/gui/calendar-component.c:1449
-msgid "New all day appointment"
-msgstr "కొత�త పూర�తిరోజ� నియామకం"
-
-#: ../calendar/gui/calendar-component.c:1450
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "పూర�తిరోజ� నియామకం (_p)"
-
-#: ../calendar/gui/calendar-component.c:1451
-msgid "Create a new all-day appointment"
-msgstr "కొత�త పూర�తిరోజ� నియామకాన�ని సృష�టించ�"
-
-#: ../calendar/gui/calendar-component.c:1457
-msgid "New calendar"
-msgstr "కొత�త క�యాలెండర�"
-
-#: ../calendar/gui/calendar-component.c:1458
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "క�యాలెండర� (_n)"
-
-#: ../calendar/gui/calendar-component.c:1459
-msgid "Create a new calendar"
-msgstr "కొత�త క�యాలెండర� న� సృష�టించ�"
-
-#: ../calendar/gui/calendar-view-factory.c:113
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Day View"
 msgstr "రోజ� దర�శనం"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Work Week View"
 msgstr "పని వారం దర�శనం"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:123
 msgid "Week View"
 msgstr "వారం దర�శనం"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:126
 msgid "Month View"
 msgstr "నెల దర�శనం"
 
@@ -4232,18 +3067,19 @@ msgstr "వర�గమ�"
 msgid "Classification"
 msgstr "వర�గీకరణ"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "గోప�యమైన"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../plugins/plugin-manager/plugin-manager.c:60
 #: ../widgets/misc/e-attachment-tree-view.c:496
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "విశదీకరణ"
 
@@ -4264,8 +3100,9 @@ msgstr "ఉంది"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:722
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "స�థానమ�"
 
@@ -4274,20 +3111,21 @@ msgstr "స�థానమ�"
 msgid "Organizer"
 msgstr "నిర�వాహక�డ�"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "స�వంత"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
-#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ప�రజా"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:304
+#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "ప�నరావృతి"
 
@@ -4296,7 +3134,7 @@ msgstr "ప�నరావృతి"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:357
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "తాత�పర�యం"
 
@@ -4325,495 +3163,464 @@ msgstr "ఇక"
 msgid "is not"
 msgstr "ఇది కాద�"
 
-#: ../calendar/gui/comp-editor-factory.c:408
-msgid "Error while opening the calendar"
-msgstr "క�యాలెండర� తెర�స�త�ండగా దోషం"
-
-#: ../calendar/gui/comp-editor-factory.c:414
-msgid "Method not supported when opening the calendar"
-msgstr "క�యాలెండర� తెర�స�త�ండగా, పద�దతికి సహకారం లేద�"
-
-#: ../calendar/gui/comp-editor-factory.c:420
-msgid "Permission denied to open the calendar"
-msgstr "క�యాలెండర� తెర�వటక� అన�మతి నిరాకరించబడినది"
-
-#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
-msgid "Unknown error"
-msgstr "అపరిచిత దోషం"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:611
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "అలారమ�న� సరిచేయ�మ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "అప�రమత�తాన�ని ప�రత�యక�షపర�చ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
 #: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "ధ�వనిని ఆడించ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
 #: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "కార�యక�రమాన�ని నడిపించ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
 #: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "ఒక ఈతపాలా పంప�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>హెచ�చరిక</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>ఇచ�ఛాపూర�వకాల�</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>మళ�ళీచేయ�</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
 msgstr "హెచ�చరిక న� జతపర�చ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#, fuzzy
+msgid "Alarm"
+msgstr "హెచ�చరికల�"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "మలచిన సందేశం(_m)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
 msgstr "మలచిన హెచ�చరిక ధ�వని"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "సందేశం(_s):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#, fuzzy
+msgid "Options"
+msgstr "ఇచ�ఛాపూర�వకాల�(_O)"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+#, fuzzy
+msgid "Repeat"
+msgstr "<b>మళ�ళీచేయ�</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
 msgstr "దస�త�రం న� ఎంచ�కొన�మ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "పంపించ�:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "ఆర�గ�మెంట�‌ల�(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "కార�యక�రంమం(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "హెచ�చరిక మళ�ళీ చేయ�(_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "ధ�వని(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-#| msgid "before"
-msgid ""
-"before\n"
-"after"
-msgstr ""
-"మ�ంద�\n"
-"తర�వాత"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#, fuzzy
+msgid "after"
+msgstr "తర�వాత"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+#, fuzzy
+msgid "before"
+msgstr "ఇంతక�మ�ంద�"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+#, fuzzy
+msgid "day(s)"
+msgstr "రోజ�ల�"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "days"
+msgstr "రోజ�ల�"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#, fuzzy
+msgid "end of appointment"
+msgstr "కొత�త నియామకం"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "extra times every"
 msgstr "అధిక సమయాల� ప�రతి"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
-#| msgid ""
-#| "Minutes\n"
-#| "Hours\n"
-#| "Days"
-msgid ""
-"minute(s)\n"
-"hour(s)\n"
-"day(s)"
-msgstr ""
-"నిమ�షమ�(ల�)\n"
-"గంట(ల�)\n"
-"రోజ�(ల�)"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#, fuzzy
+msgid "hour(s)"
+msgstr "à°—à°‚à°Ÿ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#| msgid ""
-#| "Minutes\n"
-#| "Hours\n"
-#| "Days"
-msgid ""
-"minutes\n"
-"hours\n"
-"days"
-msgstr ""
-"నిమిషాల�\n"
-"గంటల�\n"
-"రోజ�ల�"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#, fuzzy
+msgid "minute(s)"
+msgstr "నిమిషాల�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-#| msgid "start of appointment"
-msgid ""
-"start of appointment\n"
-"end of appointment"
-msgstr ""
-"నియామకం యొక�క ప�రారంభం\n"
-"నియామకం యొక�క మ�గింప�"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#, fuzzy
+msgid "start of appointment"
+msgstr "నియామకం యొక�క స�థానమ�"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "క�రియ/క�రియారంభంచేయ�"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 msgid "A_dd"
 msgstr "జతపర�చ�(_d)"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "Alarms"
 msgstr "హెచ�చరికల�"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:553
-msgid "_Suggest automatic display of attachment"
-msgstr "స�వయంచాలక అన�బంధ ప�రదర�శనాన�ని సూచించ�మ�(_S)"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
-msgid "Attach file(s)"
-msgstr "దస�త�రం(ల) న� అన�భందించ�"
-
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/event-page.c:2993
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-day-view-time-item.c:785
-#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
-#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:333
-#: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:394
-#: ../plugins/exchange-operations/exchange-delegates-user.c:179
-#: ../plugins/itip-formatter/itip-formatter.c:2208
-#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
-#: ../widgets/misc/e-dateedit.c:1674
-#: ../widgets/misc/e-signature-combo-box.c:74
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/e-day-view-time-item.c:797
+#, fuzzy
+msgctxt "cal-second-zone"
 msgid "None"
 msgstr "�దికాద�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/e-day-view-time-item.c:824
+#: ../calendar/gui/e-timezone-entry.c:343
+msgid "Select..."
+msgstr "ఎంపికచేయ�..."
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
 msgid "Selected Calendars for Alarms"
 msgstr "హెచ�చరికలక� ఎంచ�క�న�న క�యాలెండర�ల�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
-#| msgid "Time zone:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
 msgid "Time and date:"
 msgstr "సమయం మరియ� తేది:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
-#| msgid "Date:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
 msgid "Date only:"
 msgstr "తేది మాత�రమే:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
+#, fuzzy, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr ""
+"<i>%u మరియ� %d ఈ మెయిల� చిర�నామా న�ండి వినియోగదార�డ� మరియ� అధికారక�షేత�రమ� చేత ప�నఃస�థాపించబడతాయి.</"
+"i>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
 msgid "(Shown in a Day View)"
 msgstr "(రోజ� దర�శనంలో చూప�మ�)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-msgstr ""
-"60 నిమిషాల�\n"
-"30 నిమిషాల�\n"
-"15 నిమిషాల�\n"
-"10 నిమిషాల�\n"
-"05 నిమిషాల�"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+#, fuzzy
+msgid "05 minutes"
+msgstr "నిమిషాల�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#| msgid "<span weight=\"bold\">Alerts</span>"
-msgid "<span weight=\"bold\">Alarms</span>"
-msgstr "<span weight=\"bold\">ఆలారమ�ల�</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../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:11
-#: ../mail/mail-config.glade.h:13
-#| msgid "<span weight=\"bold\">Time</span>"
-msgid "<span weight=\"bold\">Date/Time Format</span>"
-msgstr "<span weight=\"bold\">తేదీ/సమయం ఫార�మాట�</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">అప�రమేయ ఖాళి/తీరకలేని సేవిక</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
+#, fuzzy
+msgid "10 minutes"
+msgstr "నిమిషాల�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: ../mail/mail-config.glade.h:17
-#: ../plugins/publish-calendar/publish-calendar.glade.h:1
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">సాదారణ</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+#, fuzzy
+msgid "15 minutes"
+msgstr "నిమిషాల�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">కర�తవ�యమ� జాబితా</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+#, fuzzy
+msgid "30 minutes"
+msgstr "నిమిషాల�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">సమయం</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+#, fuzzy
+msgid "60 minutes"
+msgstr "నిమిషాల�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">పని వారమ�</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#, fuzzy
+msgid "Alerts"
+msgstr "హెచ�చరికల�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
+#: ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "తారీఖ�/సమయం ఫార�మాట�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
 msgstr "రోజ� పూర�తయినది(_e):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
+#, fuzzy
+msgid "Days"
+msgstr "రోజ�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
+#, fuzzy
+msgid "Default Free/Busy Server"
+msgstr "<span weight=\"bold\">అప�రమేయ ఖాళి/తీరకలేని సేవిక</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
 msgstr "ప�రదర�శించ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#| msgid "Show display alarms in notification tray"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
 msgid "Display alarms in _notification area only"
 msgstr "ప�రకటన ప�రాంతమ�లో మాత�రమే ఆలారమ�లన� ప�రదర�శించ�మ� (_n)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "శ�క�రవారం"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"నిమిషాల�\n"
-"గంటల�\n"
-"రోజ�ల�"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
+#: ../modules/addressbook/addressbook-config.c:985
+#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "General"
+msgstr "సాధారణ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
+#, fuzzy
+msgid "Hours"
+msgstr "à°—à°‚à°Ÿ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
+#, fuzzy
+msgid "Minutes"
+msgstr "నిమిషాల�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "సోమవారం"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"సోమవారం\n"
-"మంగళవారం\n"
-"బ�దవారం\n"
-"గ�ర�వారం\n"
-"శ�క�రవారం\n"
-"శనివారం\n"
-"ఆదివారం"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../mail/mail-config.glade.h:118
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#. Translators: Used in send options dialog
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
+msgid "None"
+msgstr "�దికాద�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
+#: ../mail/mail-config.ui.h:80
 msgid "Pick a color"
 msgstr "వర�ణన� న� తీస�కొన�మ�"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "ఆది(_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "శనివారం"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 msgid "Sc_roll Month View by a week"
 msgstr "నెల దర�శనమ�న� వారమ� ద�వారా స�క�రాల� చేయ�మ� (_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "రెండవ క�షేత�రమ� (_c):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "హెచ�చరిక తాఖీద� ఇచ�చ�టక� క�యాలెండర�లన� ఎంచ�కొన�మ�"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Sh_ow a reminder"
 msgstr "గ�ర�తిచ�దానిని చూప�మ�(_o)"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Show a _reminder"
 msgstr "గ�ర�త�చేయ�దానిని చూపమ� (_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Show week _numbers in date navigator"
 msgstr "వారమ� సంఖ�యలన� తేది మార�చ�దానిలో చూప�మ�(_n)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "వారప� సంఖ�యన� తేదీ మరియ� పని వారప� దర�శనమ�లో చూప�మ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "ఆదివారం"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "T_asks due today:"
 msgstr "ఈ రోజ�క� మిగిలిన కర�తవ�యాల�(_a):"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_hu"
 msgstr "గ�ర�(_h)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+msgid "Task List"
+msgstr "కర�తవ�యం జాబితా"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "Template:"
 msgstr "మాదిది:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "గ�ర�వారం"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../e-util/e-non-intrusive-error-dialog.c:287
+#: ../widgets/misc/e-dateedit.c:592
+msgid "Time"
+msgstr "సమయం"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
 msgstr "కాల క�షేత�రం(_z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Time format:"
 msgstr "కాల రూపకం:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "మంగళవారం"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#| msgid "Show the second time zone"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Use s_ystem time zone"
 msgstr "సిస�టమ� సమయ క�షేత�రమ�న� వ�పయోగించ�మ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "బ�ధవారం"
 
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Wee_k starts on:"
 msgstr "వారమ� ప�రారంభించబడ�త�ంది(_k):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
+msgid "Work Week"
+msgstr "పని వారం"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Work days:"
 msgstr "పని రోజ�ల�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 గంటల�(AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "_24 hour"
 msgstr "_24గంటల�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "అంశాలన� తొలగించేమ�ంద� దృవీకరించ�కొన�మ�(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_Compress weekends in month view"
 msgstr "నెల దర�శనం లో వారాంతమ�లన� క�చింపచేయ�మ�(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_Day begins:"
 msgstr "రోజ� ప�రారంభమయింది(_D):"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Fri"
 msgstr "శ�క�ర(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Hide completed tasks after"
 msgstr "పూర�తయిన కర�తవ�యాలన� తర�వాత అదృశ�యపర�చ�మ�(_H)"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Mon"
 msgstr "సోమ(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Overdue tasks:"
 msgstr "సమయంమించిన కర�తవ�యమ�ల�(_O):"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Sat"
 msgstr "శని(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "వారమ� మరియ� నెల దర�శనమ�లో నియామకం మ�గియ� సమయాన�ని చూప�మ�(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Time divisions:"
 msgstr "సమయ భాగమ�ల�(_T):"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Tue"
 msgstr "మంగళ(_T)"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Wed"
 msgstr "బ�ధ(_W)"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "before every anniversary/birthday"
 msgstr "ప�రతి వార�షికమ�/ప�ట�టినరోజ�క� మ�ంద�"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "before every appointment"
 msgstr "ప�రతి నియామకం మ�ంద�"
 
@@ -4821,6 +3628,19 @@ msgstr "ప�రతి నియామకం మ�ంద�"
 msgid "Type:"
 msgstr "రకమ�:"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../modules/addressbook/addressbook-config.c:500
+msgid "_Type:"
+msgstr "à°°à°•à°‚(_T):"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
+#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
+#: ../widgets/misc/e-signature-script-dialog.c:282
+msgid "_Name:"
+msgstr "పేర�(_N):"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ఆఫ�‌లైన� ఆపరేషన� కొరక� క�యాలెండర� సారమ�లన� నకల� తీయ�మ�(_y)"
@@ -4837,10 +3657,6 @@ msgstr "ఆఫ�‌లైన� ఆపరేషన� కొరక� మెమ
 msgid "Colo_r:"
 msgstr "వర�ణమ� (_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-msgid "Task List"
-msgstr "కర�తవ�యం జాబితా"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "మెమో జాబితా"
@@ -4918,254 +3734,269 @@ msgstr "%s  మీరà±� మారà±�à°ªà±�à°²à±� చేసారà±�, సరిà
 msgid "Validation error: %s"
 msgstr "వర�తింప�చేయ�ట లో దోషం: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
 msgid " to "
 msgstr " దానికి "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
 msgid " (Completed "
 msgstr " (పూర�తి చేయబడ�డ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
 msgid "Completed "
 msgstr "పూర�తి చేయబడ�డ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
 msgid " (Due "
 msgstr " (అర�హమైంది"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
 msgid "Due "
 msgstr "అర�హమైంది"
 
-#: ../calendar/gui/dialogs/comp-editor.c:224
-#| msgid "Save attachments"
+#: ../calendar/gui/dialogs/comp-editor.c:247
 msgid "Could not save attachments"
 msgstr "అన�భందమ�లన� దాయలేక పోయింది"
 
-#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:510
 msgid "Could not update object"
 msgstr "తాత�పర�యాన�ని తాజాపర�చలేకపోయింది"
 
-#: ../calendar/gui/dialogs/comp-editor.c:582
+#: ../calendar/gui/dialogs/comp-editor.c:605
 msgid "Edit Appointment"
 msgstr "నియామకాన�ని సరిచేయ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:589
+#: ../calendar/gui/dialogs/comp-editor.c:612
 #, c-format
 msgid "Meeting - %s"
 msgstr "సమావేశం - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:591
+#: ../calendar/gui/dialogs/comp-editor.c:614
 #, c-format
 msgid "Appointment - %s"
 msgstr "నియామకం- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:597
+#: ../calendar/gui/dialogs/comp-editor.c:620
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "అప�పగించబడిన కర�తవ�యం - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:599
+#: ../calendar/gui/dialogs/comp-editor.c:622
 #, c-format
 msgid "Task - %s"
 msgstr "కార�యం - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:604
+#: ../calendar/gui/dialogs/comp-editor.c:627
 #, c-format
 msgid "Memo - %s"
 msgstr "మెమో - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:643
 msgid "No Summary"
 msgstr "సంక�షిప�తం లేద�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:752
 msgid "Keep original item?"
 msgstr "వాస�తవ అంశమ�న� కలిగివ�ండాలా?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:939
 msgid "Click here to close the current window"
 msgstr "ప�రస�త�త గవాక�షాన�ని మూయ�టక� ఇక�కడ నొక�కండి"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
-msgid "Copy selected text to the clipboard"
-msgstr "ఎంపికైన పాఠ�యాన�ని క�లిప� పలకాన�ని నకల� తీయ�మ�"
+#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1460
+#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:399 ../widgets/misc/e-web-view.c:1013
+msgid "Copy the selection"
+msgstr "ఎంపికన� నకల� తీయ�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:982
-msgid "Cut selected text to the clipboard"
-msgstr "ఎంపికచేసిన పాఠ�యమ�న� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
+#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
+#: ../shell/e-shell-window-actions.c:1467
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:1007
+msgid "Cut the selection"
+msgstr "ఎంపికచేసినదాన�ని కత�తిరించ�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:989
+#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../shell/e-shell-window-actions.c:1474
+#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#, fuzzy
+msgid "Delete the selection"
+msgstr "ఎంపికచేసినదాన�ని కత�తిరించ�మ�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
 msgid "Click here to view help available"
 msgstr "సహాయం అంద�బాట�లో ఉందోలేదో చూడటానికి ఇక�కడ నొక�కండి"
 
-#: ../calendar/gui/dialogs/comp-editor.c:996
-msgid "Paste text from the clipboard"
-msgstr "క�లిప� పలకం న�ండి పాఠ�యాన�ని అతికించ�మ�"
+#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1509
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:1019
+msgid "Paste the clipboard"
+msgstr "క�లిప� పలకాన�ని అతికించ�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1017
+#: ../calendar/gui/dialogs/comp-editor.c:995
 msgid "Click here to save the current window"
 msgstr "ప�రస�త�త గవాక�షాన�ని దాయ�టక� ఇక�కడ నొక�కండి"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1024
+#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1579
+#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "పాఠ�యమొత�తాన�ని ఎంచ�కొన�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1031
+#: ../calendar/gui/dialogs/comp-editor.c:1009
 msgid "_Classification"
 msgstr "వర�గీకరణ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1045
-#: ../mail/mail-signature-editor.c:209
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1628
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "దస�త�రం(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1052
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1030
+#: ../shell/e-shell-window-actions.c:1635
 msgid "_Help"
 msgstr "సహాయం(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1059
+#: ../calendar/gui/dialogs/comp-editor.c:1037
 msgid "_Insert"
 msgstr "చేర�చ�మ� (_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1044
+#: ../composer/e-composer-actions.c:351
 msgid "_Options"
 msgstr "ఇచ�ఛాపూర�వకాల�(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
-#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
+#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1670
 msgid "_View"
 msgstr "దర�శనం(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1061
+#: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "జతపర�చ�మ�(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1085
+#: ../calendar/gui/dialogs/comp-editor.c:1063
 msgid "Click here to attach a file"
 msgstr "దస�త�రాన�ని జతపర�చ�టక� ఇక�కడ నొక�కండి"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1093
+#: ../calendar/gui/dialogs/comp-editor.c:1071
 msgid "_Categories"
 msgstr "విభాగాల�(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1073
 msgid "Toggles whether to display categories"
 msgstr "వర�గీకరణల� ప�రదర�శితమైతే మార�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1079
 msgid "Time _Zone"
 msgstr "కాలక�షేత�రమ�(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1081
 msgid "Toggles whether the time zone is displayed"
 msgstr "సమయ క�షేత�రం ప�రదర�శితమైతే మార�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1112
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 msgid "Pu_blic"
 msgstr "పబ�లిక�(_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 msgid "Classify as public"
 msgstr "ప�రజామైనది గా వర�గీకరించ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1097
 msgid "_Private"
 msgstr "స�వంత(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1099
 msgid "Classify as private"
 msgstr "వ�యక�తిగతమైనదిగా వర�గీకరించ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:1104
 msgid "_Confidential"
 msgstr "గోప�యమైన(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:1106
 msgid "Classify as confidential"
 msgstr "గోప�యమైనదిగా వర�గీకరించ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "R_ole Field"
 msgstr "పాత�ర క�షేత�రం(_o)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1116
 msgid "Toggles whether the Role field is displayed"
 msgstr "పాత�ర క�షేత�రం ప�రదర�శితమైతే మార�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1144
+#: ../calendar/gui/dialogs/comp-editor.c:1122
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1146
+#: ../calendar/gui/dialogs/comp-editor.c:1124
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP క�షేత�రం ప�రదర�శితమైతే మార�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1130
 msgid "_Status Field"
 msgstr "స�స�థితి క�షేత�రం(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1154
+#: ../calendar/gui/dialogs/comp-editor.c:1132
 msgid "Toggles whether the Status field is displayed"
 msgstr "స�థితి క�షేత�రం ప�రదర�శితమైతే మార�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "_Type Field"
 msgstr "క�షేత�ర రకం(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1140
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "హాజరైనవాని రకం ప�రదర�శితమైతే మార�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186
-#: ../composer/e-composer-private.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "ఇటీవలి పత�రమ�ల� (_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../composer/e-composer-actions.c:518
+#: ../calendar/gui/dialogs/comp-editor.c:1684
+#: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "జతపర�చ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1739
 msgid "Save"
 msgstr "దాయ�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1924
-#: ../calendar/gui/dialogs/comp-editor.c:1973
-#: ../calendar/gui/dialogs/comp-editor.c:2833
+#: ../calendar/gui/dialogs/comp-editor.c:2016
+#: ../calendar/gui/dialogs/comp-editor.c:2065
+#: ../calendar/gui/dialogs/comp-editor.c:2956
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ఈ అంశాన�ని తాజాపరిస�తే మార�ప�ల� రద�ద� అవ�తాయి"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../calendar/gui/dialogs/comp-editor.c:2924
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "అన�బంధం"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2862
+#: ../calendar/gui/dialogs/comp-editor.c:2986
 msgid "Unable to use current version!"
 msgstr "వర�తమాన వివరణన� వాడలేకపోత�ంది!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:64
+#: ../calendar/gui/dialogs/copy-source-dialog.c:91
 msgid "Could not open source"
 msgstr "వనర�న� తెరవలేకపోయింది"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:72
+#: ../calendar/gui/dialogs/copy-source-dialog.c:99
 msgid "Could not open destination"
 msgstr "గమ�యాన�ని తెరవలేకపోయింది"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:81
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Destination is read only"
 msgstr "గమ�యం కేవలం చదవదగినది"
 
-#: ../calendar/gui/dialogs/delete-comp.c:205
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "ఇతర స�వీకరణదార�ల మెయిల�‌పెట�టెలన�నింటి న�ండి ఈ అంశమ�న� తొలగించాలా(_D)?"
 
@@ -5217,160 +4048,146 @@ msgstr "à°’à°• దోషం మూలంగా అంశానà±�ని తొà°
 msgid "The item could not be deleted due to an error"
 msgstr "ఒక దోషం మూలంగా అంశాన�ని రద�ద�చేయలేకపోయింది"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
 msgstr "పరిచయాల�..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:416
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "క� ప�రతినిధి:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
 msgstr "ప�రతినిధిని ప�రవేశపెట�ట�మ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Alarms"
 msgstr "అలారమ�ల�(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Click here to set or unset alarms for this event"
 msgstr "ఈ ఘటనక� హెచ�చరికల� అమర�చ�టక� లేదా తీసివేయ�టక� ఇక�కడ నొక�కండి"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 msgid "_Recurrence"
 msgstr "ప�నరావృతి(_R)"
 
 #
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:210
 msgid "Make this a recurring event"
 msgstr "ప�నఃసంభవమిస�త�న�న ఘటనగా దీన�ని చేయ�మ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:215
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../plugins/groupwise-features/send-options.c:211
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "పంపించ� �చ�చికాల�"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "ఉన�నతస�థితిగల పంపించే ఇచ�చాపూర�వకాలన� అమర�చ�మ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "All _Day Event"
 msgstr "పూర�తిరోజ� ఘటన(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Toggles whether to have All Day Event"
 msgstr "రోజ�మెత�తం ఘటన ఉంటే మార�మ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "Show Time as _Busy"
 msgstr "సమయంన� తీరికలేనిదిగా చూప�మ� (_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Toggles whether to show time as busy"
 msgstr "చూపించ� సమంయ తీరికలేక�ంటే మార�మ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "_Free/Busy"
 msgstr "ఖాళీ/తీరిక లేని(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:246
 msgid "Query free / busy information for the attendees"
 msgstr "హాజరైనవారి కొరక� ఖాళీ/తీరికలేని సమాచారం న� ప�రశ�నించ�మ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:301
+#: ../calendar/gui/dialogs/event-editor.c:291
 msgid "Appoint_ment"
 msgstr "నియామకం(_m)"
 
-#: ../calendar/gui/dialogs/event-page.c:748
+#: ../calendar/gui/dialogs/event-page.c:751
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ఘటన సరికూర�చబడలేద�, యెంచేతంటే యెంపికైన క�యాలెండర� చద�వ�టక� మాత�రమే"
 
-#: ../calendar/gui/dialogs/event-page.c:752
+#: ../calendar/gui/dialogs/event-page.c:755
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ఘటన పూర�తిగా సరికూర�చబడలేద�, యెంచేతంటే మీర� నిర�వాహక�ల� కాద�"
 
-#: ../calendar/gui/dialogs/event-page.c:764
-#: ../calendar/gui/dialogs/event-page.c:2769
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2720
 msgid "This event has alarms"
 msgstr "ఈ ఘటన అలారమ�లన� కలిగిఉంది"
 
-#: ../calendar/gui/dialogs/event-page.c:827
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "నిర�వాహక�డ�(_g):"
 
-#: ../calendar/gui/dialogs/event-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:877
 msgid "_Delegatees"
 msgstr "ప�రాతినిధ�యంవహించే(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:876
+#: ../calendar/gui/dialogs/event-page.c:879
 msgid "Atte_ndees"
 msgstr "హాజరైనవార�(_n)"
 
-#: ../calendar/gui/dialogs/event-page.c:1062
+#: ../calendar/gui/dialogs/event-page.c:1094
 msgid "Event with no start date"
 msgstr "ప�రారంభ తారీఖ� లేని ఘటన"
 
-#: ../calendar/gui/dialogs/event-page.c:1065
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no end date"
 msgstr "అంతం తారీఖ� లేని ఘటన"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
-#: ../calendar/gui/dialogs/memo-page.c:654
-#: ../calendar/gui/dialogs/task-page.c:830
+#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "ప�రారంభ తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/event-page.c:1246
+#: ../calendar/gui/dialogs/event-page.c:1278
 msgid "End date is wrong"
 msgstr "అంతం తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Start time is wrong"
 msgstr "ప�రారంభ తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/event-page.c:1276
+#: ../calendar/gui/dialogs/event-page.c:1308
 msgid "End time is wrong"
 msgstr "అంతం తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/event-page.c:1438
-#: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:890
+#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/task-page.c:921
 msgid "The organizer selected no longer has an account."
 msgstr "ఎంపికచేసిన వ�యస�థీకరింపచేసెదానికి ఖాతా లేద� "
 
-#: ../calendar/gui/dialogs/event-page.c:1444
-#: ../calendar/gui/dialogs/memo-page.c:701
-#: ../calendar/gui/dialogs/task-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "వ�యస�థీకరింపచేసెది అవసరం"
 
-#: ../calendar/gui/dialogs/event-page.c:1469
-#: ../calendar/gui/dialogs/task-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/task-page.c:951
 msgid "At least one attendee is required."
 msgstr "కనీసం ఒక హాజరయ�యెవార� అవసరం."
 
-#: ../calendar/gui/dialogs/event-page.c:1912
-#: ../calendar/gui/dialogs/task-page.c:1219
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "తీసివేయ�(_R)"
-
-#: ../calendar/gui/dialogs/event-page.c:1913
-#: ../calendar/gui/dialogs/task-page.c:1220
-msgid "_Add "
-msgstr "కల�ప�మ�(_A)"
-
-#: ../calendar/gui/dialogs/event-page.c:2639
+#: ../calendar/gui/dialogs/event-page.c:2593
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "క�యాలెండర� '%s'న� తెరవలేకపోయింది."
@@ -5381,151 +4198,153 @@ msgstr "క�యాలెండర� '%s'న� తెరవలేకపోయ
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2683
-#: ../calendar/gui/dialogs/memo-page.c:910
-#: ../calendar/gui/dialogs/task-page.c:1825
+#: ../calendar/gui/dialogs/event-page.c:2637
+#: ../calendar/gui/dialogs/memo-page.c:913
+#: ../calendar/gui/dialogs/task-page.c:1741
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "మీర� %s తర�ప�న మీర� చేస�త�న�నార�"
 
-#: ../calendar/gui/dialogs/event-page.c:2967
+#: ../calendar/gui/dialogs/event-page.c:2939
 #, 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:2973
+#: ../calendar/gui/dialogs/event-page.c:2945
 #, 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:2979
+#: ../calendar/gui/dialogs/event-page.c:2951
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d నిమిషం మ�ందరి నియామకం"
 msgstr[1] "%dనిమిషాల మ�ందరి నియామకం"
 
-#: ../calendar/gui/dialogs/event-page.c:2992
+#: ../calendar/gui/dialogs/event-page.c:2964
 msgid "Customize"
 msgstr "మల�చ�కొన�"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid ""
-"15 minutes before appointment\n"
-"1 hour before appointment\n"
-"1 day before appointment"
-msgstr ""
-"నియామకానికి 15 నిమిషాల మ�ంద�\n"
-"నియామకానికి 1 గంట మ�ంద�\n"
-"నియామకానికి 1 రోజ� మ�ంద�"
+#. Translators: "None" for "No alarm set"
+#: ../calendar/gui/dialogs/event-page.c:2966
+#, fuzzy
+msgctxt "cal-alarms"
+msgid "None"
+msgstr "�దికాద�"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "%d రోజ� మ�ందరి నియామకం"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "%d ఘంట మ�ందరి నియామకం"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "%d నిమిషం మ�ందరి నియామకం"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 msgid "Attendee_s..."
 msgstr "హాజరైనవార�(_s)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+#: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "హాజరైనవార�"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "మల�చ�కొన� అలారమ�:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "ఘటన విశదీకరణ"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Su_mmary:"
 msgstr "సంక�షిప�తమ�(_m):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Alarm"
 msgstr "అలారమ�(_A)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "వివరణ(_D):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:356
 msgid "_Location:"
 msgstr "స�థానమ�(_L):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "సమయం(_T):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
-#: ../smime/gui/smime-ui.glade.h:49
-msgid ""
-"a\n"
-"b"
-msgstr ""
-"a\n"
-"b"
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#, fuzzy
+msgid "for"
+msgstr "నాల�గోది"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-#| msgid "until"
-msgid ""
-"for\n"
-"until"
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#, fuzzy
+msgid "until"
 msgstr ""
 "కొరక�\n"
 "వరక�"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
 msgid "Memo"
 msgstr "మెమో"
 
-#: ../calendar/gui/dialogs/memo-page.c:347
+#: ../calendar/gui/dialogs/memo-page.c:350
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "మెమో సరికూర�చ బడలేద�, యెంచేతంటే యెంపికైన మెమో జాబితా చద�వ�టక� మాత�రమే"
 
-#: ../calendar/gui/dialogs/memo-page.c:351
+#: ../calendar/gui/dialogs/memo-page.c:354
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "మెమో పూర�తిగా సరికూర�చబడలేద�, యెంచేతంటే మీర� నిర�వాహక�ల� కాద�"
 
-#: ../calendar/gui/dialogs/memo-page.c:871
+#: ../calendar/gui/dialogs/memo-page.c:874
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s'లో మెమోలన� తెరవలేకపోయింది."
 
-#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
-#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
-#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1041 ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2253
+#: ../mail/em-format-html.c:2313 ../mail/em-format-html.c:2355
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "క�"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
 msgstr "ప�రారంభ తేది(_r):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "క�(_o):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
 #: ../calendar/gui/dialogs/task-page.c:380
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "సమూహం(_G):"
 
@@ -5565,21 +4384,21 @@ msgstr "ఇది మరియ� భవిష�యత�త� ప�రత�
 msgid "All Instances"
 msgstr "అన�ని ప�రత�యేకస�థితిల�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:558
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ఎవల�య�షన� సర�చేయలేని ప�నరావృత�త�ల� ఈ నియామకం కలద�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:889
 msgid "Recurrence date is invalid"
 msgstr "ప�నరావృతి తారీఖ� నిస�సారం"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:933
 msgid "End time of the recurrence was before event's start"
 msgstr "ప�నరావృతమ� యొక�క మ�గింప� సమయం ఘటన ప�రారంభమ�నక� మ�ంద�"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:962
 msgid "on"
 msgstr "పైన"
 
@@ -5587,7 +4406,7 @@ msgstr "పైన"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1019
 msgid "first"
 msgstr "మొదటి"
 
@@ -5596,7 +4415,7 @@ msgstr "మొదటి"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "second"
 msgstr "రెండోది"
 
@@ -5604,7 +4423,7 @@ msgstr "రెండోది"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1030
 msgid "third"
 msgstr "మూడవది"
 
@@ -5612,7 +4431,7 @@ msgstr "మూడవది"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1035
 msgid "fourth"
 msgstr "నాల�గోది"
 
@@ -5620,8 +4439,7 @@ msgstr "నాల�గోది"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
-#| msgid "Width"
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
 msgid "fifth"
 msgstr "�దవ"
 
@@ -5629,13 +4447,13 @@ msgstr "�దవ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "last"
 msgstr "చివరిది"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1069
 msgid "Other Date"
 msgstr "ఇతర తారీఖ�"
 
@@ -5643,7 +4461,7 @@ msgstr "ఇతర తారీఖ�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1075
 msgid "1st to 10th"
 msgstr "1 న�ండి 10 వరక�"
 
@@ -5651,7 +4469,7 @@ msgstr "1 న�ండి 10 వరక�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1081
 msgid "11th to 20th"
 msgstr "11 న�ండి 20 వరక�"
 
@@ -5659,21 +4477,21 @@ msgstr "11 న�ండి 20 వరక�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 msgid "21st to 31st"
 msgstr "21 న�ండి 31 వరక�"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 msgid "day"
 msgstr "రోజ�"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr "పైన"
 
@@ -5681,164 +4499,197 @@ msgstr "పైన"
 msgid "occurrences"
 msgstr "సంభవించనవి"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2105
+#: ../calendar/gui/dialogs/recurrence-page.c:2111
 msgid "Add exception"
 msgstr "అక�షేపణన� కల�ప�మ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2146
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Could not get a selection to modify."
 msgstr "సవరించ�టక� ఎంపికన� పొందలేకపోయింది."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2152
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Modify exception"
 msgstr "ఆక�షేపణన� సవరించ�మ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2196
+#: ../calendar/gui/dialogs/recurrence-page.c:2202
 msgid "Could not get a selection to delete."
 msgstr "తొలగించ�టక� ఎంపికన� పొందలేకపోయింది."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2320
+#: ../calendar/gui/dialogs/recurrence-page.c:2329
 msgid "Date/Time"
 msgstr "తారీఖ�/సమయం"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>ఆక�షేపణల�</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
-msgid "<b>Preview</b>"
-msgstr "<b>ఉపదర�శనం</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Recurrence</b>"
-msgstr "<b>ప�నరావృతం</b>"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
 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:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+#, fuzzy
+msgid "Exceptions"
+msgstr "<b>ఆక�షేపణల�</b>"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#, fuzzy
+msgid "Preview"
+msgstr "ఉపదర�శనం(_P)"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
 msgstr "ఈ నియామకం ప�నరావృతి(_u)"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid ""
-"day(s)\n"
-"week(s)\n"
-"month(s)\n"
-"year(s)"
-msgstr ""
-"రోజ�(ల�)\n"
-"వారమ�(ల�)\n"
-"నెల(ల�)\n"
-"సంవత�సరమ�(ల�)"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#, fuzzy
+msgid "forever"
+msgstr "ఎప�పటికివద�ద�"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
-msgid ""
-"for\n"
-"until\n"
-"forever"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#, fuzzy
+msgid "month(s)"
+msgstr "నెల"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#, fuzzy
+msgid "week(s)"
+msgstr "వారమ�ల�"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+msgid "year(s)"
 msgstr ""
-"కొరక�\n"
-"వరక�\n"
-"ఎప�పటికి"
 
 #: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
 msgstr "ఈ ఘటనతో నా అలారమ�లన� పంప�మ�"
 
 #: ../calendar/gui/dialogs/send-comp.c:162
-#| msgid "Notify new messages for _Inbox only"
 msgid "Notify new attendees _only"
 msgstr "కొత�తగా హాజరైనవారిని మాత�రమే ప�రకటించ�మ� (_o)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:376
-#: ../calendar/gui/dialogs/task-details-page.c:396
+#: ../calendar/gui/dialogs/task-details-page.c:379
+#: ../calendar/gui/dialogs/task-details-page.c:399
 msgid "Completed date is wrong"
 msgstr "పూర�తి చేసిన తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/task-details-page.c:481
+#: ../calendar/gui/dialogs/task-details-page.c:484
 msgid "Web Page"
 msgstr "మహాతల ప�ట"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">చెల�లని</span>"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
+msgid "Completed"
+msgstr "పూర�తిచేయబడిన"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">స�థతి</span>"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+msgid "High"
+msgstr "ఎక�క�వ"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-"Undefined"
-msgstr ""
-"ఎక�క�వ\n"
-"సాధారణ\n"
-"తక�క�వ\n"
-"నిర�వచించని"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:289
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
+#: ../calendar/gui/print.c:2645
+msgid "In Progress"
+msgstr "ప�రోగమనంలొ ఉన�న"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Canceled"
-msgstr ""
-"ప�రారంభించని\n"
-"ప�రోగతిలోవ�న�న\n"
-"పూర�తైన\n"
-"రద�దైన"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+msgid "Low"
+msgstr "తక�క�వ"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:509
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../widgets/misc/e-send-options.ui.h:13
+msgid "Normal"
+msgstr "మామూల�"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
+#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "ప�రారంభం కాలేద�"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
 msgstr "శాతం పూర�తి(_e):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 msgid "Stat_us:"
 msgstr "స�స�థితి(_u):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/dialogs/task-details-page.ui.h:18
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:1756
+#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "స�స�థితి"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:24
+msgid "Undefined"
+msgstr "నిర�వచించబడలేద�"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "తారీఖ� పూర�తి అయినది(_D):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Priority:"
 msgstr "ప�రాధాన�యత(_P):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "మహాతలం ప�ట(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "స�స�థితి వివరాల�(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "Click to change or view the status details of the task"
 msgstr "కర�తవ�యమ� యొక�క స�స�థితి వివరాల� దర�శించ�టక� లేదా మార�చ�టక� నొక�క�మ�"
 
-#: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:371
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "పంప�టక� ఇచ�ఛాపూర�వకాలన�(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "_Task"
 msgstr "కార�యం(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "కర�తవ�యం వివరణల�"
 
@@ -5847,38 +4698,36 @@ msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "కర�తవ�యం సరికూర�చబడలేద�, యెంచేతంటే యెంపికైన కర�తవ�యప� జాబితా చద�వ�టక� మాత�రమే"
 
 #: ../calendar/gui/dialogs/task-page.c:340
-#| msgid ""
-#| "This message cannot be sent because you have not specified any recipients"
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "కర�తవ�యమ� పూర�తిగా సరికూర�చబడలేద�, యెంచేతంటే మీర� నిర�వాహక�ల� కాద�"
 
 #: ../calendar/gui/dialogs/task-page.c:388
-#: ../calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "నిర�వాహక�డ�(_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:803
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "పూర�వనిర�ణిత రోజ� తప�పూ"
 
-#: ../calendar/gui/dialogs/task-page.c:1782
+#: ../calendar/gui/dialogs/task-page.c:1698
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'లో కార�యాలన� తెరవలేకపోయింది."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:1
 msgid "Atte_ndees..."
 msgstr "హాజరైనవార�(_n)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "వర�గాల�(_i)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "నిర�దేశిత తేది (_D):"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:7
 msgid "Time zone:"
 msgstr "సమయ క�షేత�రమ�:"
 
@@ -5958,136 +4807,54 @@ msgstr "%s వద�ద %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s అపరిచిత క�రియారంభ రకం కొరక�"
 
-#: ../calendar/gui/e-attachment-handler-calendar.c:258
-#| msgid "Import"
-msgid "I_mport"
-msgstr "దిగ�మతి (_m)"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:340
-#| msgid "Select Calendar"
-msgid "Select a Calendar"
-msgstr "క�యాలెండర�‌న� ఎంపికచేయ�మ�"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:367
-#| msgid "Select Task List"
-msgid "Select a Task List"
-msgstr "కర�తవ�యం జాబితాన� ఎంపికచేయ�మ�"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:377
-#| msgid "Import to Calendar"
-msgid "I_mport to Calendar"
-msgstr "క�యాలెండర�‌క� దిగ�మతిచేయ�మ� (_m)"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:384
-#| msgid "_Import to Tasks"
-msgid "I_mport to Tasks"
-msgstr "కర�తవ�యమ�లక� దిగ�మతి చేయ�మ� (_m)"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:68
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
-#, c-format
-msgid "Click to open %s"
-msgstr "%s తెర�వ�టక� నొకండి"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:127
-#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "శిర�షిక లేద�"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:178
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../calendar/gui/e-cal-component-preview.c:220
-msgid "Start Date:"
-msgstr "ప�రారంభ తారీఖ�:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:191
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
-msgid "Description:"
-msgstr "విశదీకరణ:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:215
-#: ../calendar/gui/e-cal-component-preview.c:309
-msgid "Web Page:"
-msgstr "మహాతల ప�ట:"
+#: ../calendar/gui/e-cal-component-preview.c:198
+#, fuzzy
+msgid "Categories:"
+msgstr "విభాగాల�"
 
-#: ../calendar/gui/e-cal-component-preview.c:202
-#: ../calendar/gui/e-itip-control.c:1154
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "తాత�పర�యం:"
 
-#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:259
+msgid "Start Date:"
+msgstr "ప�రారంభ తారీఖ�:"
+
+#: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Due Date:"
 msgstr "ప�ర�వనిర�ణిత తారీఖ�:"
 
-#. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:238
-#: ../calendar/gui/e-itip-control.c:1178
-#: ../plugins/exchange-operations/exchange-account-setup.c:283
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1066
 msgid "Status:"
 msgstr "స�స�థితి:"
 
-#: ../calendar/gui/e-cal-component-preview.c:242
-#: ../calendar/gui/e-cal-model-tasks.c:359
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-cal-model-tasks.c:752
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
-msgid "In Progress"
-msgstr "ప�రోగమనంలొ ఉన�న"
-
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-cal-model-tasks.c:361
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:361
-msgid "Completed"
-msgstr "పూర�తిచేయబడిన"
-
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model-tasks.c:357
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "ప�రారంభం కాలేద�"
-
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:312
 msgid "Priority:"
 msgstr "ప�రాధాన�యం:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
-#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1064
-msgid "High"
-msgstr "ఎక�క�వ"
-
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
-msgid "Normal"
-msgstr "మామూల�"
+#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:34
+msgid "Description:"
+msgstr "విశదీకరణ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1062
-msgid "Low"
-msgstr "తక�క�వ"
+#: ../calendar/gui/e-cal-component-preview.c:368
+msgid "Web Page:"
+msgstr "మహాతల ప�ట:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Created"
 msgstr "సృష�టించబడింది"
 
@@ -6098,7 +4865,6 @@ msgstr "అంతం తారీఖ�"
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
-#| msgid "Modified"
 msgid "Last modified"
 msgstr "చివరిగా సవరించిన"
 
@@ -6108,17 +4874,16 @@ msgid "Start Date"
 msgstr " తారీఖ� మొదల�"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:637
+#: ../calendar/gui/e-task-table.c:560
 msgid "Free"
 msgstr "స�వతంత�ర"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:638
-#: ../calendar/gui/e-meeting-time-sel.c:391
+#: ../calendar/gui/e-meeting-time-sel.c:548 ../calendar/gui/e-task-table.c:561
 msgid "Busy"
 msgstr "తీరికలేద�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:625
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6128,209 +4893,69 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/e-meeting-store.c:742
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:709
+#, fuzzy
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "�దికాద�"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "అవ�న�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "కాద�"
 
+#: ../calendar/gui/e-cal-model.c:325
+#, fuzzy
+msgid "Default Client"
+msgstr "అప�రమేయ మెయిల� కక�షిదార�"
+
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
-#: ../calendar/gui/e-itip-control.c:1333
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
-#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
-#: ../plugins/itip-formatter/itip-formatter.c:449
-#: ../plugins/itip-formatter/itip-formatter.c:2233
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
+#: ../plugins/itip-formatter/itip-formatter.c:461
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "అపరిచిత"
 
-#: ../calendar/gui/e-cal-model.c:1078
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "ప�నరావృతికరణ"
 
-#: ../calendar/gui/e-cal-model.c:1080
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "స�థానం ఇవ�వబడినది"
 
-#: ../calendar/gui/e-calendar-table.c:335
-msgid "* No Summary *"
-msgstr "* సంక�షిప�తం లేద� *"
-
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:371
-#: ../calendar/gui/e-calendar-view.c:2429
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "నిర�వాహకి: %s <%s>"
-
-#. With SunOne accounts, there may be no ':' in organiser.value
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2433
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
-msgid "Organizer: %s"
-msgstr "నిర�వాహకి: %s"
-
-#: ../calendar/gui/e-calendar-table.c:405
-msgid "Start: "
-msgstr "ప�రారంభించ�: "
-
-#: ../calendar/gui/e-calendar-table.c:417
-msgid "Due: "
-msgstr "మిగిలివ�న�న: "
-
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "నిర�వచించబడలేద�"
-
-#: ../calendar/gui/e-calendar-table.c:607
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-calendar-table.c:608
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-calendar-table.c:609
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-calendar-table.c:610
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-calendar-table.c:611
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-calendar-table.c:612
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-calendar-table.c:613
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-calendar-table.c:614
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-calendar-table.c:615
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-calendar-table.c:616
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-calendar-table.c:617
-msgid "100%"
-msgstr "100%"
-
-#: ../calendar/gui/e-calendar-table.c:897
-#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
-msgid "Deleting selected objects"
-msgstr "ఎంపికచేసిన అంశాలన� తొలగించ�త�న�నది"
-
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
-msgid "Updating objects"
-msgstr "అంశాలన� తాజా పర�చ�త�న�నది"
-
-#: ../calendar/gui/e-calendar-table.c:1364
-#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
-#: ../composer/e-composer-actions.c:219
-msgid "Save as..."
-msgstr "ఇలా దాయ�..."
-
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1789
-msgid "New _Task"
-msgstr "కొత�త కార�యం(_T)"
-
-#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
-msgid "Open _Web Page"
-msgstr "మహాతల ప�టన� తెర�వ�(_W)"
-
-#: ../calendar/gui/e-calendar-table.c:1593
-#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
-msgid "_Save As..."
-msgstr "ఇలా దాయ�మ�(_S)..."
-
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
-msgid "P_rint..."
-msgstr "మ�ద�రించ�(_r)..."
-
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
-#: ../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:1600
-#: ../calendar/gui/e-calendar-view.c:1795
-#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
-msgid "_Paste"
-msgstr "అతికించ�(_P)"
-
-#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
-msgid "_Assign Task"
-msgstr "కర�తవ�యాన�ని అప�పగించ�మ�(_A)"
-
-#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
-#: ../ui/evolution-tasks.xml.h:26
-msgid "_Forward as iCalendar"
-msgstr "iక�యాలెండర� గా మ�ంద�క� పంపించ�(_F)"
-
-#: ../calendar/gui/e-calendar-table.c:1606
-msgid "_Mark as Complete"
-msgstr "పూర�తయిన�నట� గా గ�ర�త�పెట�ట�(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1607
-msgid "_Mark Selected Tasks as Complete"
-msgstr "ఎంపిక చేసిన కార�యాల� పూర�తయిన�నట� గా గ�ర�త�పెట�ట�(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1608
-msgid "_Mark as Incomplete"
-msgstr "అసంపూర�తిగా గ�ర�త�పెట�ట�(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1609
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "ఎంపిక చేసిన కార�యాల� అసంపూర�తిగా గ�ర�త�పెట�ట�(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1614
-msgid "_Delete Selected Tasks"
-msgstr "ఎంపిక చేసిన కార�యాలన� తీసివేయ�(_D)"
-
-#: ../calendar/gui/e-calendar-table.c:1849
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "కర�తవ�యాన�ని జతపర�చ�టక� నొక�కండి"
+msgid "Opening %s"
+msgstr "%sతెర�స�త�ంది"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% పూర�తి"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "కర�తవ�యాన�ని జతపర�చ�టక� నొక�కండి"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "పూర�తిగా"
@@ -6345,7 +4970,7 @@ msgstr "పూర�వ నిర�ణీత తేది"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Priority"
 msgstr "ప�రాధాన�యత"
 
@@ -6353,154 +4978,117 @@ msgstr "ప�రాధాన�యత"
 msgid "Start date"
 msgstr "ప�రారంభ తేది"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:2337
-#: ../calendar/gui/e-meeting-list-view.c:601
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "స�స�థితి"
-
-#: ../calendar/gui/e-calendar-view.c:1478
-msgid "Moving items"
-msgstr "అంశాలన� జర�ప�త�ంది"
-
-#: ../calendar/gui/e-calendar-view.c:1480
-msgid "Copying items"
-msgstr "అంశాల నకల�తీస�త�ంది"
-
-#: ../calendar/gui/e-calendar-view.c:1786
-msgid "New _Appointment..."
-msgstr "కొత�త నియామకం(_A)..."
-
-#: ../calendar/gui/e-calendar-view.c:1787
-msgid "New All Day _Event"
-msgstr "కొత�త రోజ� ఘటన(_E)"
-
-#: ../calendar/gui/e-calendar-view.c:1788
-msgid "New _Meeting"
-msgstr "కొత�త సమావేశం(_M)"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1799
-msgid "_Current View"
-msgstr "ప�రస�త�త దర�శనం(_C)"
-
-#: ../calendar/gui/e-calendar-view.c:1801
-msgid "Select T_oday"
-msgstr "ఈ రోజ�న� గ�ర�తించ�(_o)"
-
-#: ../calendar/gui/e-calendar-view.c:1802
-msgid "_Select Date..."
-msgstr "తారీఖ� ఎంపికచేయ�(_S)..."
-
-#: ../calendar/gui/e-calendar-view.c:1808
-msgid "Pri_nt..."
-msgstr "మ�ద�రణ(_n)..."
-
-#: ../calendar/gui/e-calendar-view.c:1818
-msgid "Cop_y to Calendar..."
-msgstr "క�యాలెండర� క� నకల�తీయ�(_y)..."
-
-#: ../calendar/gui/e-calendar-view.c:1819
-msgid "Mo_ve to Calendar..."
-msgstr "క�యాలెండర� క� పంప�(_v)..."
-
-#: ../calendar/gui/e-calendar-view.c:1820
-msgid "_Delegate Meeting..."
-msgstr "సమావేశాల కాలాన�ని నియమించ�(_D)..."
-
-#: ../calendar/gui/e-calendar-view.c:1821
-msgid "_Schedule Meeting..."
-msgstr "సమావేశాల కాలాన�ని నియమించ�(_S)..."
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
+msgid "Type"
+msgstr "à°°à°•à°‚"
 
-#: ../calendar/gui/e-calendar-view.c:1822
-msgid "_Forward as iCalendar..."
-msgstr "iక�యాలెండర� గా మ�ంద�క� పంప�(_F)"
+#: ../calendar/gui/e-calendar-view.c:404
+#, fuzzy
+msgid "Cut selected events to the clipboard"
+msgstr "ఎంపికచేసిన పాఠ�యమ�న� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
 
-#: ../calendar/gui/e-calendar-view.c:1823
-msgid "_Reply"
-msgstr "ప�రత�య�త�తరమ�(_R):"
+#: ../calendar/gui/e-calendar-view.c:410
+#, fuzzy
+msgid "Copy selected events to the clipboard"
+msgstr "ఎంపికైన పాఠ�యాన�ని క�లిప� పలకాన�ని నకల� తీయ�మ�"
 
-#: ../calendar/gui/e-calendar-view.c:1824
-#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
-msgid "Reply to _All"
-msgstr "అందరికి ప�రత�య�త�తరమ�ఇవ�వ�(_A)"
+#: ../calendar/gui/e-calendar-view.c:416
+#, fuzzy
+msgid "Paste events from the clipboard"
+msgstr "క�లిప� పలకం న�ండి పాఠ�యాన�ని అతికించ�మ�"
 
-#
-#: ../calendar/gui/e-calendar-view.c:1829
-msgid "Make this Occurrence _Movable"
-msgstr "ఈ సంభవాన�ని కదిపించేది గా చేయ�(_M)"
+#: ../calendar/gui/e-calendar-view.c:422
+#, fuzzy
+msgid "Delete selected events"
+msgstr "ఎంపికచేసిన మెమోన� తొలగించ�మ�"
 
-#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
-msgid "Delete this _Occurrence"
-msgstr "ఈ సంభవాన�ని తీసివేయ�(_O)"
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
+msgid "Deleting selected objects"
+msgstr "ఎంపికచేసిన అంశాలన� తొలగించ�త�న�నది"
 
-#: ../calendar/gui/e-calendar-view.c:1831
-msgid "Delete _All Occurrences"
-msgstr "సంభవాలన�నింటి తీసివేయ�(_A)"
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:842
+#: ../calendar/gui/e-task-table.c:1063
+msgid "Updating objects"
+msgstr "అంశాలన� తాజా పర�చ�త�న�నది"
 
-#: ../calendar/gui/e-calendar-view.c:2284
-#: ../calendar/gui/e-itip-control.c:1183
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../plugins/itip-formatter/itip-formatter.c:2221
+#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2326
 msgid "Accepted"
 msgstr "ఆమొదించబడినది"
 
-#: ../calendar/gui/e-calendar-view.c:2285
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../plugins/itip-formatter/itip-formatter.c:2227
+#: ../calendar/gui/e-calendar-view.c:1704
+#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2332
 msgid "Declined"
 msgstr "తగించబడినది"
 
-#: ../calendar/gui/e-calendar-view.c:2286
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/e-meeting-time-sel.c:390
+#: ../calendar/gui/e-calendar-view.c:1705
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Tentative"
 msgstr "తాత�కాలిక"
 
-#: ../calendar/gui/e-calendar-view.c:2287
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../plugins/itip-formatter/itip-formatter.c:2230
+#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Delegated"
 msgstr "ప�రాతినిధ�యంవహించే"
 
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:1707
 msgid "Needs action"
 msgstr "చర�య అవసరం"
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:1848 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:738
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "నిర�వాహకి: %s <%s>"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:741
+#, c-format
+msgid "Organizer: %s"
+msgstr "నిర�వాహకి: %s"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
+#: ../calendar/gui/e-calendar-view.c:1868 ../calendar/gui/print.c:2600
 #, c-format
 msgid "Location: %s"
 msgstr "స�థానం: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2480
+#: ../calendar/gui/e-calendar-view.c:1899
 #, c-format
 msgid "Time: %s %s"
 msgstr "సమయం: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:102
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a·%m/%d/%Y·%H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:105
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a·%m/%d/%Y·%I:%M:%S·%p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:113
+#: ../calendar/gui/e-cell-date-edit-text.c:171
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6513,12 +5101,12 @@ 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:747
+#: ../calendar/gui/e-day-view-time-item.c:759
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i నిమిష భాగాల�"
 
-#: ../calendar/gui/e-day-view-time-item.c:768
+#: ../calendar/gui/e-day-view-time-item.c:780
 msgid "Show the second time zone"
 msgstr "రెండవ సమయ క�షేత�రాన�ని చూప�మ�"
 
@@ -6528,48 +5116,73 @@ msgstr "రెండవ సమయ క�షేత�రాన�ని చూప
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
-#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1843
+#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A·%d·%B"
 
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1860
+#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:907
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1876
+#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../modules/calendar/e-cal-shell-view-private.c:943
+msgid "%d %b"
+msgstr "%d %b"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:825
+#: ../calendar/gui/e-day-view.c:1074 ../calendar/gui/e-week-view.c:742
+#: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:827
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:745
+#: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2309
+#: ../calendar/gui/e-day-view.c:2573
 #, c-format
 msgid "Week %d"
 msgstr "వారం %d"
 
-#: ../calendar/gui/e-itip-control.c:758
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "అవ�న�. (క�లిష�టమైన ప�నరావృతి)"
 
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "ప�రతి రోజ�"
 msgstr[1] "ప�రతి%d రోజ�ల�"
 
-#: ../calendar/gui/e-itip-control.c:788
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "ప�రతి వారం"
 msgstr[1] "ప�రతి %d వారాల�"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -6577,35 +5190,35 @@ msgstr[0] "ప�రతి వారం మొదల�"
 msgstr[1] "ప�రతి %d వారాల మొదల� "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " మరియ�"
 
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s రోజైన"
 
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr " %s %s అయిన "
 
-#: ../calendar/gui/e-itip-control.c:842
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ప�రతి %d నెల"
 msgstr[1] "ప�రతి %d నెలల�"
 
-#: ../calendar/gui/e-itip-control.c:854
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ప�రతి %d సంవత�సరం"
 msgstr[1] "ప�రతి %d సంవత�సరాల�"
 
-#: ../calendar/gui/e-itip-control.c:867
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -6613,437 +5226,446 @@ msgstr[0] " %d సమయంయొక�క మొత�తమ�"
 msgstr[1] "%d సమయాలయొక�క మొత�తమ�"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:878
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", పైన అంతం "
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:900
+#: ../calendar/gui/e-itip-control.c:906
 msgid "Starts"
 msgstr "మొదలౌత�ంది"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:914
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "అంతమౌత�ంది"
 
-#: ../calendar/gui/e-itip-control.c:954
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../calendar/gui/e-itip-control.c:943
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
 msgstr "పూర�వనిర�ణిత"
 
-#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
 msgid "iCalendar Information"
 msgstr "iక�యాలెండర� సమాచారం"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1012
+#: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Error"
 msgstr "iక�యాలెండర� దోషం"
 
-#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
-#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
-#: ../plugins/itip-formatter/itip-view.c:346
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:434
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
-#: ../plugins/itip-formatter/itip-view.c:523
+#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
+#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:526
 msgid "An unknown person"
 msgstr "అపరిచిత వ�యక�తి"
 
-#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-itip-control.c:1132
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> ఈ సమాచారమ�న� సమీక�షించి, కింది జాబితాన�ంచి క�రియన� ఎంపికచేస�కోండి"
 
+#. Translators: "None" used as a default value for events without Summary received by mail
+#: ../calendar/gui/e-itip-control.c:1147
+#: ../plugins/itip-formatter/itip-formatter.c:2313
+#, fuzzy
+msgctxt "cal-itip"
+msgid "None"
+msgstr "�దికాద�"
+
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2224
+#: ../plugins/itip-formatter/itip-formatter.c:2329
 msgid "Tentatively Accepted"
 msgstr "ప�రయోగాత�మకంగా ఆమొదించబడినది"
 
-#: ../calendar/gui/e-itip-control.c:1274
+#: ../calendar/gui/e-itip-control.c:1277
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "సమావేశం రద�ద� చేయబడినది, కాని అది మీ క�యాలెండర� లో కనిపించలేద� "
 
-#: ../calendar/gui/e-itip-control.c:1276
-msgid "The task has been canceled, however it could not be found in your task lists"
+#: ../calendar/gui/e-itip-control.c:1279
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr " కార�యం రద�ద� చేయబడినది, కాని అది మీ కార�యజాబితా లో కనిపించలేద�"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> సమావేశ సమాచారాన�ని మ�ద�రించినది"
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1357
 msgid "Meeting Information"
 msgstr "సమావేశ సమాచారం"
 
-#: ../calendar/gui/e-itip-control.c:1360
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "%s యొక�క హాజర� ఒక సమావేశం వద�ద <b>%s</b> అభ�యర�ధించింది"
 
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> సమావేశం వద�ద మీ హాజర�న� అభ�యర�ధించింది."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1366
 msgid "Meeting Proposal"
 msgstr "సమావేశ ప�రతిపాదన"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1369
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> అభినందనల� ఉన�న సమావేశానికి కల�పబడతాయి."
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Update"
 msgstr "సమావేశ తాజా వివరం"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1377
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> సమావేశ తాజా సమాచారాన�ని కొర�త�ంది"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1378
 msgid "Meeting Update Request"
 msgstr "సమావేశ తాజా వివరాల అభ�యర�ధన"
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> సమావేశ అభ�యర�ధన క� జవాబ� చెపింది"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Reply"
 msgstr "సమావేశం యొక�క జవాబ�"
 
-#: ../calendar/gui/e-itip-control.c:1390
+#: ../calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> సమావేశాన�ని రద�ద� చేసింది."
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1394
 msgid "Meeting Cancelation"
 msgstr "సమావేశ రద�ద�"
 
-#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
+#: ../calendar/gui/e-itip-control.c:1521
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> అవివేక సందేశాన�ని పంపినది"
 
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Bad Meeting Message"
 msgstr "చెడ�డ సమావేశ సందేశం"
 
-#: ../calendar/gui/e-itip-control.c:1429
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> కార�య సమాచారాన�ని ప�రచ�రించినది"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Information"
 msgstr "కార�య సమాచారం"
 
-#: ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1440
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "%s ఒక కార�యాన�ని నిర�వతించాడినికి<b>%s</b> అభ�యర�ధించినది"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ఒక కార�యాన�ని నిర�వతించాడినికి అభ�యర�ధించినది"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1443
 msgid "Task Proposal"
 msgstr "కార�య ప�రతిపాదన"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1446
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> అభినందనల� ఉన�న కార�యానికి చెంద�తాయి."
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Update"
 msgstr "కార�య తాజా వివరం"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> తాజా కార�య సమాచారాన�ని పొంద దల�చినది"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1455
 msgid "Task Update Request"
 msgstr "కార�యాన�ని తాజాపర�చ�టక� అభ�యర�ధన"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> కార�య కేటాయింప� జవాబ� ఇచ�చింది"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Reply"
 msgstr "కార�య జవాబ�"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b>ఒక కార�తవ�యాన�ని రద�ద� చేసింది."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Task Cancelation"
 msgstr "కర�తవ�యం రద�ద�"
 
-#: ../calendar/gui/e-itip-control.c:1479
+#: ../calendar/gui/e-itip-control.c:1482
 msgid "Bad Task Message"
 msgstr "చెడ�డ కార�య సందేశం"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> తీరక/తీరకలేద� సమాచారాన�ని ప�రచ�రించ�"
 
-#: ../calendar/gui/e-itip-control.c:1504
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Information"
 msgstr "తీరక/తీరకలేద� సమాచారం"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> తీరక/తీరకలేద� సమాచారాన�ని కోర�త�ంది"
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Free/Busy Request"
 msgstr "తీరక/తీరకలేద� కోరండి"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1516
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> తీరక/తీరకలేద� కోరికక� జవాబ� ఇచ�చింది"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1517
 msgid "Free/Busy Reply"
 msgstr "తీరక/తీరకలేద� జవాబ�"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1522
 msgid "Bad Free/Busy Message"
 msgstr "తీరక/తీరకలేద� చెడ�డ సందేశం"
 
-#: ../calendar/gui/e-itip-control.c:1595
+#: ../calendar/gui/e-itip-control.c:1598
 msgid "The message does not appear to be properly formed"
 msgstr "సందేశం సరిగ�గ �ర�పర�చినట�ట�లేద�"
 
-#: ../calendar/gui/e-itip-control.c:1654
+#: ../calendar/gui/e-itip-control.c:1657
 msgid "The message contains only unsupported requests."
 msgstr "సహకారం లేని కోరికల� మాత�రమే సందేశం లో ఉన�నాయి"
 
-#: ../calendar/gui/e-itip-control.c:1687
+#: ../calendar/gui/e-itip-control.c:1690
 msgid "The attachment does not contain a valid calendar message"
 msgstr "అన�బంధం లో వర�తించ� క�యాలెండర� సందేశాల� లేవ�"
 
-#: ../calendar/gui/e-itip-control.c:1725
+#: ../calendar/gui/e-itip-control.c:1728
 msgid "The attachment has no viewable calendar items"
 msgstr "అన�బంధం లో చూడదగ�గ క�యాలెండర� అంశాల� లేవ�"
 
-#: ../calendar/gui/e-itip-control.c:1967
+#: ../calendar/gui/e-itip-control.c:1970
 msgid "Update complete\n"
 msgstr "తాజాపర�చ�ట పూర�తియింది\n"
 
-#: ../calendar/gui/e-itip-control.c:2001
+#: ../calendar/gui/e-itip-control.c:2004
 msgid "Object is invalid and cannot be updated\n"
 msgstr "అంశం వర�తించద� కన�క తాజాపర�చ�ట సాధ�యపడద�\n"
 
-#: ../calendar/gui/e-itip-control.c:2018
+#: ../calendar/gui/e-itip-control.c:2022
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "ఈ సమాధానం వర�తమాన జవాబ�దార�నిన�ండి రాలేద�. జవాబ�దార�నిగా జోడించండి?"
 
-#: ../calendar/gui/e-itip-control.c:2036
+#: ../calendar/gui/e-itip-control.c:2040
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "వర�తించని స�థితి కారణంగా జవాబ�దార�ని స�థితి తాజాపరచబడలేద�!\n"
 
-#: ../calendar/gui/e-itip-control.c:2060
+#: ../calendar/gui/e-itip-control.c:2064
 msgid "Attendee status updated\n"
 msgstr "జవాబ�దార�ని స�థితి తాజాపరచబడినది\n"
 
-#: ../calendar/gui/e-itip-control.c:2067
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../calendar/gui/e-itip-control.c:2071
+#: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "అంశం లేనంద�న జవాబ�దార�ని స�థితి తాజాపరచబడలేద�"
 
-#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
+#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
 msgid "Item sent!\n"
 msgstr "అంశం పంపబడినది!\n"
 
-#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
 msgid "The item could not be sent!\n"
 msgstr "అంశాన�ని పంపిచలేకపోయింది!\n"
 
-#: ../calendar/gui/e-itip-control.c:2281
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Choose an action:"
 msgstr "క�రియన� ఎంచ�కోండ:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2310
-#: ../calendar/gui/e-meeting-list-view.c:589
+#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2350
+#: ../calendar/gui/e-itip-control.c:2329
 msgid "Update"
 msgstr "తాజా పర�చ�"
 
-#: ../calendar/gui/e-itip-control.c:2374
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../calendar/gui/e-itip-control.c:2353
+#: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "ఆమోదించ�"
 
-#: ../calendar/gui/e-itip-control.c:2375
+#: ../calendar/gui/e-itip-control.c:2354
 msgid "Tentatively accept"
 msgstr "తాత�కాలికంగా ఆమొదించ�"
 
-#: ../calendar/gui/e-itip-control.c:2376
-#: ../plugins/groupwise-features/process-meeting.c:54
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "తిరస�కరించ�"
 
-#: ../calendar/gui/e-itip-control.c:2401
+#: ../calendar/gui/e-itip-control.c:2380
 msgid "Send Free/Busy Information"
 msgstr "తీరిక/తీరికలేద� సమాచారాన�ని పంప�"
 
-#: ../calendar/gui/e-itip-control.c:2425
+#: ../calendar/gui/e-itip-control.c:2404
 msgid "Update respondent status"
 msgstr "సమాధనం ఇచ�చెవారి స�ధితిని తాజాపర�చ�"
 
-#: ../calendar/gui/e-itip-control.c:2449
+#: ../calendar/gui/e-itip-control.c:2428
 msgid "Send Latest Information"
 msgstr "తాజా సమాచారాన�ని పంప�"
 
-#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2452
+#: ../modules/mail/e-mail-shell-view-actions.c:1032
+#: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "రద�ద�"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.ui.h:1
 msgid "--to--"
 msgstr "--క�--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.ui.h:2
 msgid "Calendar Message"
 msgstr "క�యాలెండర� సందేశం"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.ui.h:3
 msgid "Date:"
 msgstr "తారీఖ�:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.ui.h:5
 msgid "Loading Calendar"
 msgstr "క�యాలెండర� న� నింప�త�ంది"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
 msgstr "క�యాలెండర� న� నింప�త�ంది..."
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.ui.h:7
 msgid "Organizer:"
 msgstr "నిర�వాహక�డ�:"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.ui.h:8
 msgid "Server Message:"
 msgstr "సేవిక సందేశం:"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "అధ�యక�షవర�య�ల�"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "కావల�సిన పాల�పంచ�కొన�వార�"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "ఇచ�ఛాపూర�వక పాల�గొన�వార�"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "వనర�ల�"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
+#: ../calendar/gui/e-meeting-list-view.c:159
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "స�వతంత�రంగా"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "గ�రూప�"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:976
+#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "వనర�"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:977
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
+#: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "గది"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/print.c:991
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "అధ�యక�ష�ల�"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "పాల�గొన�వార� కావాలి"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/print.c:993
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "ఇచ�ఛాపూర�వకంగా పాల�గొన�వార�"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:994
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "పాల�గొన�వార�-కాద�"
 
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "క�రియ అవసరం"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:544
+#: ../calendar/gui/e-meeting-list-view.c:546
 msgid "Attendee                          "
 msgstr "హాజరైనవ�యక�తి                          "
 
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2083
+#: ../calendar/gui/e-meeting-time-sel.c:2305
 msgid "%A, %B %d, %Y"
 msgstr "%A,·%B·%d,·%Y"
 
@@ -7052,7 +5674,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:462
-#: ../calendar/gui/e-meeting-time-sel.c:2114
+#: ../calendar/gui/e-meeting-time-sel.c:2336
 msgid "%a %m/%d/%Y"
 msgstr "%a·%m/%d/%Y"
 
@@ -7062,67 +5684,67 @@ msgstr "%a·%m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:392
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Out of Office"
 msgstr "కార�యాలయం న�ండి బయటక�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:393
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "No Information"
 msgstr "సమాచారం లేద�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:408
+#: ../calendar/gui/e-meeting-time-sel.c:565
 msgid "A_ttendees..."
 msgstr "హాజరైనవార�(_t)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:429
+#: ../calendar/gui/e-meeting-time-sel.c:586
 msgid "O_ptions"
 msgstr "ఇచ�ఛాపూర�వకాల�(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "పనికాలాన�ని మాత�రమే చూపించ�(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:456
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _zoomed out"
 msgstr "జూమ� తగ�గించ�ట చూప�(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "_Update free/busy"
 msgstr "తీరిక/తీరికలేద� తాజాపర�చ�(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:504
+#: ../calendar/gui/e-meeting-time-sel.c:661
 msgid "_Autopick"
 msgstr "స�వయంఎంపిక(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:676
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:536
+#: ../calendar/gui/e-meeting-time-sel.c:693
 msgid "_All people and resources"
 msgstr "అన�ని వనర�ల� మరియ� ప�రజల�(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "All _people and one resource"
 msgstr "ప�రజలందర� మరియ� ఒక�క వనర�(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:554
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "_Required people"
 msgstr "ప�రజల� కావాలి(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:719
 msgid "Required people and _one resource"
 msgstr "ప�రజల� మరియ� ఒక�క వనర� కావాలి(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "ప�రారంభ సమయం(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:626
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "సమయాంతం(_E):"
 
@@ -7150,162 +5772,390 @@ msgstr "భాష"
 msgid "Member"
 msgstr "సభ�య�డ�"
 
-#: ../calendar/gui/e-memo-table.c:950
-msgid "_Delete Selected Memos"
-msgstr "ఎంపిక చేసిన మెమోలన� తొలగించ�మ�(_D)"
+#: ../calendar/gui/e-memo-table.c:411
+#: ../modules/calendar/e-cal-shell-content.c:402
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view.c:289
+#: ../plugins/caldav/caldav-browse-server.c:432
+msgid "Memos"
+msgstr "మెమోస�"
 
-#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+msgid "* No Summary *"
+msgstr "* సంక�షిప�తం లేద� *"
+
+#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+msgid "Start: "
+msgstr "ప�రారంభించ�: "
+
+#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+msgid "Due: "
+msgstr "మిగిలివ�న�న: "
+
+#: ../calendar/gui/e-memo-table.c:707
+#, fuzzy
+msgid "Cut selected memos to the clipboard"
+msgstr "ఎంపికచేసిన సందేశాలన� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
+
+#: ../calendar/gui/e-memo-table.c:713
+#, fuzzy
+msgid "Copy selected memos to the clipboard"
+msgstr "క�లిప� పలకానికి ఎంచ�క�న�న సందేశాలన� నకల� తీయ�మ�"
+
+#: ../calendar/gui/e-memo-table.c:719
+#, fuzzy
+msgid "Paste memos from the clipboard"
+msgstr "క�లిప�‌బోర�డ�న�ండి మెమోన� అతికించ�మ�"
+
+#: ../calendar/gui/e-memo-table.c:725
+#: ../modules/calendar/e-memo-shell-view-actions.c:556
+msgid "Delete selected memos"
+msgstr "ఎంపికచేసిన మెమోన� తొలగించ�మ�"
+
+#: ../calendar/gui/e-memo-table.c:731
+#, fuzzy
+msgid "Select all visible memos"
+msgstr "కనపడే సందేశాలన�నిటిని ఎంచ�కొన�మ�"
+
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "మెమోన� జతచేయ�టక� నొక�క�మ�"
 
-#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
-#, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"%s పై దోషం:\n"
-" %s"
+#: ../calendar/gui/e-task-table.c:530
+msgid "0%"
+msgstr "0%"
 
-#: ../calendar/gui/e-memos.c:806
-msgid "Loading memos"
-msgstr "మెమోలన� నింప�త�ంది"
+#: ../calendar/gui/e-task-table.c:531
+msgid "10%"
+msgstr "10%"
 
-#: ../calendar/gui/e-memos.c:897
-#, c-format
-msgid "Opening memos at %s"
-msgstr "%s వద�ద మెమోలన� తెర�స�తోంది"
+#: ../calendar/gui/e-task-table.c:532
+msgid "20%"
+msgstr "20%"
 
-#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
-msgid "Deleting selected objects..."
-msgstr "ఎంపిక చేసిన అంశాలన� రద�ద� చేస�తోంది..."
+#: ../calendar/gui/e-task-table.c:533
+msgid "30%"
+msgstr "30%"
 
-#: ../calendar/gui/e-tasks.c:955
-msgid "Loading tasks"
-msgstr "కార�తవ�యాలన� నింప�త�ంది"
+#: ../calendar/gui/e-task-table.c:534
+msgid "40%"
+msgstr "40%"
 
-#: ../calendar/gui/e-tasks.c:1052
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "%s వద�ద కార�తవ�యాలన� తెర�స�తోంది"
+#: ../calendar/gui/e-task-table.c:535
+msgid "50%"
+msgstr "50%"
 
-#: ../calendar/gui/e-tasks.c:1295
-msgid "Completing tasks..."
-msgstr "కర�తవ�యాలన� పూర�తిచేస�తోంది..."
+#: ../calendar/gui/e-task-table.c:536
+msgid "60%"
+msgstr "60%"
 
-#: ../calendar/gui/e-tasks.c:1345
-msgid "Expunging"
-msgstr "కొట�టివేయ�చ�న�నది"
+#: ../calendar/gui/e-task-table.c:537
+msgid "70%"
+msgstr "70%"
+
+#: ../calendar/gui/e-task-table.c:538
+msgid "80%"
+msgstr "80%"
+
+#: ../calendar/gui/e-task-table.c:539
+msgid "90%"
+msgstr "90%"
+
+#: ../calendar/gui/e-task-table.c:540
+msgid "100%"
+msgstr "100%"
+
+#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:362
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view.c:437
+#: ../plugins/caldav/caldav-browse-server.c:430
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "కర�తవ�యాల�"
+
+#: ../calendar/gui/e-task-table.c:928
+#, fuzzy
+msgid "Cut selected tasks to the clipboard"
+msgstr "ఎంపికచేసిన పాఠ�యమ�న� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
+
+#: ../calendar/gui/e-task-table.c:934
+#, fuzzy
+msgid "Copy selected tasks to the clipboard"
+msgstr "ఎంపికైన పాఠ�యాన�ని క�లిప� పలకాన�ని నకల� తీయ�మ�"
 
-#: ../calendar/gui/e-timezone-entry.c:124
+#: ../calendar/gui/e-task-table.c:940
+msgid "Paste tasks from the clipboard"
+msgstr "క�లిప� పలకం న�ండి కర�తవ�యాలన� అతికించ�మ�"
+
+#: ../calendar/gui/e-task-table.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:680
+msgid "Delete selected tasks"
+msgstr "ఎంచ�క�న�న కర�తవ�యాలన� తొలగించ�మ�"
+
+#: ../calendar/gui/e-task-table.c:952
+#, fuzzy
+msgid "Select all visible tasks"
+msgstr "కనపడే సందేశాలన�నిటిని ఎంచ�కొన�మ�"
+
+#: ../calendar/gui/e-timezone-entry.c:354
 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:376 ../calendar/gui/print.c:1647
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d·%B"
 
-#: ../calendar/gui/gnome-cal.c:2673
-msgid "_Custom View"
-msgstr "మల�చ�కొనిన దర�శనం(_C)"
+#: ../calendar/gui/ea-cal-view-event.c:276
+msgid "It has alarms."
+msgstr "హెచ�చరిక జారిచెయ� సౌలభ�యం కలద�"
+
+#: ../calendar/gui/ea-cal-view-event.c:279
+msgid "It has recurrences."
+msgstr "ప�నరావృతి కావటం ఉన�నది"
+
+#: ../calendar/gui/ea-cal-view-event.c:282
+msgid "It is a meeting."
+msgstr "అది ఒక సమావేశం."
+
+#: ../calendar/gui/ea-cal-view-event.c:288
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "క�యాలెండర� ఘటన:%s సంక�షిప�తమైనది"
+
+#: ../calendar/gui/ea-cal-view-event.c:290
+msgid "Calendar Event: It has no summary."
+msgstr "క�యాలెండర� ఘటన : దీనికి సంక�షిప�తమ�లేద�"
+
+#: ../calendar/gui/ea-cal-view-event.c:312
+msgid "calendar view event"
+msgstr "క�యాలెండర� దర�శన ఘటన"
+
+#: ../calendar/gui/ea-cal-view-event.c:540
+msgid "Grab Focus"
+msgstr "దృష�టిని లాగ�మ�"
+
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Appointment"
+msgstr "కొత�త నియామకం"
+
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "New All Day Event"
+msgstr "కొత�త  పూర�తి రోజ� ఘటన"
 
-#: ../calendar/gui/gnome-cal.c:2674
-msgid "_Save Custom View"
-msgstr "మల�చ�కొనిన దర�శనంన� దాయ�మ�(_S)"
+#: ../calendar/gui/ea-cal-view.c:302
+msgid "New Meeting"
+msgstr "కొత�త సమావేశం"
 
-#: ../calendar/gui/gnome-cal.c:2679
-msgid "_Define Views..."
-msgstr "దర�శనాలన� నిర�వచించ�(_D)..."
+#: ../calendar/gui/ea-cal-view.c:303
+msgid "Go to Today"
+msgstr "ఈ రోజ� క� వెళ�ళ�"
 
-#: ../calendar/gui/gnome-cal.c:2916
+#: ../calendar/gui/ea-cal-view.c:304
+msgid "Go to Date"
+msgstr "తారీఖ� క� వెళ�ళ�"
+
+#: ../calendar/gui/ea-day-view-main-item.c:308
+#: ../calendar/gui/ea-week-view-main-item.c:340
+msgid "a table to view and select the current time range"
+msgstr "ప�రస�త�త సమయ విస�తృతిని దర�శించి ఎంచ�కొనే పట�టిక"
+
+#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
 #, c-format
-msgid "Loading appointments at %s"
-msgstr "నియామాకాలన� నింప�త�ంది%s"
+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."
+#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+msgid "It has no events."
+msgstr "దీనికి � ఘటనల� లేవ�"
 
-#: ../calendar/gui/gnome-cal.c:2931
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:164
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "%sకార�యాలన� నింప�త�ంది"
+msgid "Work Week View: %s. %s"
+msgstr "పనివారమ� దర�శనం: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:2940
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:170
 #, c-format
-msgid "Loading memos at %s"
-msgstr "%s వద�ద మెమోలన� నింప�త�ంది"
+msgid "Day View: %s. %s"
+msgstr "రోజ� దర�శనం: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:3052
+#: ../calendar/gui/ea-day-view.c:201
+msgid "calendar view for a work week"
+msgstr "ఒక వారానికి క�యాలెండర� దర�శనం"
+
+#: ../calendar/gui/ea-day-view.c:203
+msgid "calendar view for one or more days"
+msgstr "ఒకటి లేదా కొన�ని రోజ�లకి క�యాలెండర� దర�శనం"
+
+#: ../calendar/gui/ea-gnome-calendar.c:46
+#: ../calendar/gui/ea-gnome-calendar.c:54
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "గ�నోమ� క�యాలెండర�"
+
+#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../modules/calendar/e-cal-shell-view-private.c:903
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../modules/calendar/e-cal-shell-view-private.c:910
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:919
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:226
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:240
+#: ../modules/calendar/e-cal-shell-view-private.c:936
+#: ../modules/calendar/e-cal-shell-view-private.c:947
+#: ../modules/calendar/e-cal-shell-view-private.c:954
+#: ../modules/calendar/e-cal-shell-view-private.c:957
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
+
+#: ../calendar/gui/ea-jump-button.c:147
+msgid "Jump button"
+msgstr "దూక� బటన�"
+
+#: ../calendar/gui/ea-jump-button.c:156
+msgid "Click here, you can find more events."
+msgstr "ఇక�కడ  నొక�కండి, మీక� మరిన�ని ఘటనల� కనబడతాయి"
+
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
-msgid "Opening %s"
-msgstr "%sతెర�స�త�ంది"
+msgid "Month View: %s. %s"
+msgstr "నెల దర�శనం: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:161
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "వారప� దర�శనం: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:192
+msgid "calendar view for a month"
+msgstr "ఒక నెలక� క�యాలెండర� దర�శనం"
+
+#: ../calendar/gui/ea-week-view.c:194
+msgid "calendar view for one or more weeks"
+msgstr "ఒకటి లేదా మరిన�ని వారాలకి క�యాలెండర� దర�శనం"
 
-#: ../calendar/gui/gnome-cal.c:4012
+#: ../calendar/gui/gnome-cal.c:2111
 msgid "Purging"
 msgstr "శాశ�వతంగా తొలగించ�త�ంది"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
-msgid ""
-"January\n"
-"February\n"
-"March\n"
-"April\n"
-"May\n"
-"June\n"
-"July\n"
-"August\n"
-"September\n"
-"October\n"
-"November\n"
-"December"
-msgstr ""
-"జనవరి\n"
-"ఫిబ�రవరి\n"
-"మార�చ�\n"
-"�ప�రిల�\n"
-"మే\n"
-"జూన�\n"
-"జ�లై\n"
-"ఆగస�ట�\n"
-"సెప�టెంబర�\n"
-"అక�టోబర�\n"
-"నవంబర�\n"
-"డిసెంబర�"
-
-#: ../calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.ui.h:1
+msgid "April"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.ui.h:2
+msgid "August"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.ui.h:3
+#, fuzzy
+msgid "December"
+msgstr "సభ�య�డ�"
+
+#: ../calendar/gui/goto-dialog.ui.h:4
+msgid "February"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.ui.h:5
+msgid "January"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.ui.h:6
+msgid "July"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.ui.h:7
+#, fuzzy
+msgid "June"
+msgstr "నిరర�దకమైన"
+
+#: ../calendar/gui/goto-dialog.ui.h:8
+#, fuzzy
+msgid "March"
+msgstr "శోధించ�"
+
+#: ../calendar/gui/goto-dialog.ui.h:9
+#, fuzzy
+msgid "May"
+msgstr "సోమవారం"
+
+#: ../calendar/gui/goto-dialog.ui.h:10
+#, fuzzy
+msgid "November"
+msgstr "సభ�య�డ�"
+
+#: ../calendar/gui/goto-dialog.ui.h:11
+#, fuzzy
+msgid "October"
+msgstr "ఇతరమ�ల�"
+
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "తారీఖ� గ�ర�తించ�"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.ui.h:13
+#, fuzzy
+msgid "September"
+msgstr "సభ�య�డ�"
+
+#: ../calendar/gui/goto-dialog.ui.h:14
 msgid "_Select Today"
 msgstr "ఈ రోజ� న� ఎంచ�కొన�మ�(_S)"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:553
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:552
 msgid "An organizer must be set."
 msgstr "వ�యవస�ధీకరణ చేసేదానిని అమరచాలి"
 
-#: ../calendar/gui/itip-utils.c:453
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "కనీసం ఒక జవాబ�దార�డ� అవసరం"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
 msgid "Event information"
 msgstr "ఘటన సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
 msgid "Task information"
 msgstr "కార�తవ�య సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
 msgid "Memo information"
 msgstr "మెమో సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
 msgid "Free/Busy information"
 msgstr "తీరిక/తీరికలేద� సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:643
+#: ../calendar/gui/itip-utils.c:645
 msgid "Calendar information"
 msgstr "క�యాలెండర� సమాచారం"
 
@@ -7313,7 +6163,7 @@ msgstr "క�యాలెండర� సమాచారం"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:677
+#: ../calendar/gui/itip-utils.c:679
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ఆమొదించబడినది"
@@ -7322,7 +6172,7 @@ msgstr "ఆమొదించబడినది"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:684
+#: ../calendar/gui/itip-utils.c:686
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "ప�రయోగాత�మకంగా ఆమొదించబడినది"
@@ -7334,7 +6184,7 @@ msgstr "à°ªà±�రయోగాతà±�మకంగా ఆమొదించబడà°
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "తిరస�కరించబడినది"
@@ -7343,7 +6193,7 @@ msgstr "తిరస�కరించబడినది"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:700
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ప�రాతినిధ�యంవహించే"
@@ -7351,7 +6201,7 @@ msgstr "ప�రాతినిధ�యంవహించే"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:711
+#: ../calendar/gui/itip-utils.c:713
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "నవీకరించబడిన"
@@ -7359,7 +6209,7 @@ msgstr "నవీకరించబడిన"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:720
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "రద�ద�చేయి"
@@ -7367,7 +6217,7 @@ msgstr "రద�ద�చేయి"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:725
+#: ../calendar/gui/itip-utils.c:727
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ప�నర�వికాసం"
@@ -7375,264 +6225,153 @@ msgstr "ప�నర�వికాసం"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:732
+#: ../calendar/gui/itip-utils.c:734
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ప�రతీకూల-ప�రదిపాదన"
 
-#: ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:804
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "తీరిక/తీరికలేద� సమాచారం(%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:810
+#: ../calendar/gui/itip-utils.c:812
 msgid "iCalendar information"
 msgstr "iక�యాలెండర� సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:981
-msgid "You must be an attendee of the event."
-msgstr "మీర� ఘటన హాజరవ�వాలి"
-
-#: ../calendar/gui/memos-component.c:477
-msgid "_New Memo List"
-msgstr "కొత�త సంపర�క జాబితా(_N)"
-
-#: ../calendar/gui/memos-component.c:560
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d మెమో"
-msgstr[1] "%d మెమోల�"
-
-#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d ఎంపికచేయబడెన�"
-msgstr[1] ", %d ల� ఎంపికచేయబడెన�"
-
-#: ../calendar/gui/memos-component.c:609
-msgid "Failed upgrading memos."
-msgstr "మెమోలన� మెర�గ�పర�చ�ట విఫలమయ�యెన�."
-
-#: ../calendar/gui/memos-component.c:739
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "ఘటనల� మరియ� సమావేశాల� సృష�టించ�టక� '%s' కొరక� మెమో జాబితా తెరవలేక పొయింది"
-
-#: ../calendar/gui/memos-component.c:752
-msgid "There is no calendar available for creating memos"
-msgstr "మెమోలన� సృష�టించ�టక� � క�యాలెండర� అంద�బాట� లో లేద�"
-
-#: ../calendar/gui/memos-component.c:862
-msgid "Memo Source Selector"
-msgstr "మెమో మూలంన� ఎంపికచేయ�నది"
-
-#: ../calendar/gui/memos-component.c:1041
-msgid "New memo"
-msgstr "కొత�త మెమో"
-
-#: ../calendar/gui/memos-component.c:1042
-msgctxt "New"
-msgid "Mem_o"
-msgstr "మెమో (_o)"
-
-#: ../calendar/gui/memos-component.c:1043
-msgid "Create a new memo"
-msgstr "కొత�త మెమోన� సృష�టించ�"
-
-#: ../calendar/gui/memos-component.c:1049
-msgid "New shared memo"
-msgstr "కొత�త భాగస�వామ�య మెమో"
-
-#: ../calendar/gui/memos-component.c:1050
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "భాగస�వామ�య మెమో (_S)"
-
-#: ../calendar/gui/memos-component.c:1051
-msgid "Create a shared new memo"
-msgstr "కొత�త భాగస�వామ�య మెమోన� సృష�టించ�"
-
-#: ../calendar/gui/memos-component.c:1057
-msgid "New memo list"
-msgstr "కొత�త మెమో జాబితా"
-
-#: ../calendar/gui/memos-component.c:1058
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "మెమో జాబితా (_s)"
-
-#: ../calendar/gui/memos-component.c:1059
-msgid "Create a new memo list"
-msgstr "కొత�త మెమోజాబితా న� సృష�టించ�"
-
-#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
-msgid "Print Memos"
-msgstr "మెమోలన� మ�ద�రించ�"
-
-#: ../calendar/gui/migration.c:157
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
+#: ../calendar/gui/itip-utils.c:832
+msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
-"ఎవల�య�షన� 1.x. న�ండి ఎవల�య�షన� కర�తవ�య సంచయాల స�థానమ� మరియ� పారంపర�యంమారినది\n"
-"\n"
-"ఎవల�య�షన� మీ సంచయాలన� వలస పంప�త�ండగా దయచేసి ఆగండి..."
 
-#: ../calendar/gui/migration.c:161
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
+#: ../calendar/gui/itip-utils.c:834
+msgid "Unable to book a resource, error: "
 msgstr ""
-"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..."
 
-#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "పాత అమరికలన� evolution/config.xmldb న�ండి మార�చలేమ�"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:803
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "క�యాలెండర� `%s' న� వలసపంపలేమ�"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:971
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "`%s' కర�తవ�యమ�లన� వలసపంపలేమ�"
+#: ../calendar/gui/itip-utils.c:987
+msgid "You must be an attendee of the event."
+msgstr "మీర� ఘటన హాజరవ�వాలి"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "1à°µ"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "2à°µ"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "౩వ"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "4à°µ"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "5à°µ"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "6à°µ"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "7à°µ"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "8à°µ"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "9à°µ"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "10à°µ"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "11à°µ"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "12à°µ"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "13à°µ"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "14à°µ"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "15à°µ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "16à°µ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "17à°µ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "18à°µ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "19à°µ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "20à°µ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "21à°µ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "22à°µ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "23à°µ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "24à°µ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "25à°µ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "26à°µ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "27à°µ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "28à°µ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "29à°µ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "30à°µ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "31st"
 msgstr "31à°µ"
 
@@ -7664,139 +6403,52 @@ msgstr "శ�క�ర"
 msgid "Sa"
 msgstr "శని"
 
-#: ../calendar/gui/print.c:2465
+#: ../calendar/gui/print.c:2564
 msgid "Appointment"
 msgstr "నియామకం"
 
-#: ../calendar/gui/print.c:2467
+#: ../calendar/gui/print.c:2566
 msgid "Task"
 msgstr "కార�యం"
 
-#: ../calendar/gui/print.c:2492
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Summary: %s"
 msgstr "తాత�పర�యం: %s"
 
-#: ../calendar/gui/print.c:2515
+#: ../calendar/gui/print.c:2615
 msgid "Attendees: "
 msgstr "హాజరైనవార�: "
 
-#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/print.c:2658
 #, c-format
 msgid "Status: %s"
 msgstr "స�స�థితి: %s"
 
-#: ../calendar/gui/print.c:2569
+#: ../calendar/gui/print.c:2673
 #, c-format
 msgid "Priority: %s"
 msgstr "ప�రాధాన�యం: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2691
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "%i: శాతం పూర�తియింది"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2702
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2608
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Categories: %s"
 msgstr "%s: వర�గమ�ల�"
 
-#: ../calendar/gui/print.c:2619
+#: ../calendar/gui/print.c:2726
 msgid "Contacts: "
 msgstr "చిర�నామాల�: "
 
-#: ../calendar/gui/tasks-component.c:470
-msgid "_New Task List"
-msgstr "కొత�త కర�తవ�యంజాబితా(_N)"
-
-#: ../calendar/gui/tasks-component.c:553
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d కర�తవ�యం"
-msgstr[1] "%d కర�తవ�యాల�"
-
-#: ../calendar/gui/tasks-component.c:602
-msgid "Failed upgrading tasks."
-msgstr " కర�తవ�యాల� మెర�గ�పర�చ�ట విఫలమయ�యెన�."
-
-#: ../calendar/gui/tasks-component.c:735
-#, c-format
-msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "ఘటనల� మరియ� సమావేశాల� సృష�టించ�టక� '%s' కొరక� కార�య జాబితా తెరవలేక పొయింది"
-
-#: ../calendar/gui/tasks-component.c:748
-msgid "There is no calendar available for creating tasks"
-msgstr "కార�యాల� సృష�టించ�టక� క�యాలెండర� లేద�"
-
-#: ../calendar/gui/tasks-component.c:859
-msgid "Task Source Selector"
-msgstr "కర�తవ�యం మూల ఎంపికదారి"
-
-#: ../calendar/gui/tasks-component.c:1113
-msgid "New task"
-msgstr "కొత�త కార�యం"
-
-#: ../calendar/gui/tasks-component.c:1114
-msgctxt "New"
-msgid "_Task"
-msgstr "కార�యం(_T)"
-
-#: ../calendar/gui/tasks-component.c:1115
-msgid "Create a new task"
-msgstr "కొత�త కార�యాన�ని సృష�టించ�"
-
-#: ../calendar/gui/tasks-component.c:1121
-msgid "New assigned task"
-msgstr "కొత�తగా స�థానం ఇవ�వబడ�డ కార�యం"
-
-#: ../calendar/gui/tasks-component.c:1122
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "అప�పగించబడిన కార�తవ�యం (_d)"
-
-#: ../calendar/gui/tasks-component.c:1123
-msgid "Create a new assigned task"
-msgstr "కొత�తగా స�థానం ఇవ�వబడ�డ కార�యాన�ని సృష�టించ�"
-
-#: ../calendar/gui/tasks-component.c:1129
-msgid "New task list"
-msgstr "కొత�త కార�యజాబితా"
-
-#: ../calendar/gui/tasks-component.c:1130
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "కార�తవ�యం జాబితా (_k)"
-
-#: ../calendar/gui/tasks-component.c:1131
-msgid "Create a new task list"
-msgstr "కొత�త కార�యజాబితా న� సృష�టించ�"
-
-#: ../calendar/gui/tasks-control.c:484
-msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"పూర�తియినట�ట� గ�ర�త�పెట�టిన అన�ని కార�తవ�యాలన� ఈ కార�యం శాశ�వతంగా తొలిగిస�త�ంది.మీర� మ�ంద�కెళీతే, ఈ "
-"కర�తవ�యాలన� తిరిగి పొందలేర�\n"
-"\n"
-"ఈ కర�తవ�యాలన�ని నింజంగా తొలిగించాలా?"
-
-#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
-msgid "Do not ask me again."
-msgstr "నన�న� మళ�ళీ అడగొద�ద�."
-
-#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
-msgid "Print Tasks"
-msgstr "కార�యాల� మ�ద�రించ�"
-
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
@@ -7823,8 +6475,8 @@ msgid "Appointments and Meetings"
 msgstr "నియామకాల� మరియ� సమావేశాల�"
 
 #: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:630
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1833
 msgid "Opening calendar"
 msgstr "క�యాలెండర�‌న� తెర�చ�చ�న�నది"
 
@@ -7848,11 +6500,11 @@ msgstr "విక�యాలెండర� దస�త�రంల�(.vcf)"
 msgid "Evolution vCalendar importer"
 msgstr "ఎవాల�యాషన� vక�యాలెండర� దిగ�మతిదారి"
 
-#: ../calendar/importers/icalendar-importer.c:746
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "క�యాలెండర� ఘటనల�"
 
-#: ../calendar/importers/icalendar-importer.c:783
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "ఎవాల�యూషన� క�యాలెండర� ఇంటినిజంట� దిగ�మతిదారి"
 
@@ -8405,7 +7057,7 @@ msgid "America/Nassau"
 msgstr "అమెరికా/నస�సావ�"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "అమెరికా/న�యూయార�క� (_Y)"
 
@@ -9405,279 +8057,294 @@ msgstr "ఫసిఫిక�/వాల�లిస�"
 msgid "Pacific/Yap"
 msgstr "ఫసిఫిక�/యప�"
 
-#: ../composer/e-composer-autosave.c:445
-msgid "Unable to retrieve message from editor"
-msgstr "సరికూర�పరిన�ండి సందేశాన�ని వెలికితీయలేద�"
-
-#: ../composer/e-composer-actions.c:84
+#: ../composer/e-composer-actions.c:79
 msgid "Untitled Message"
 msgstr "శీర�షికలేని సందేశం"
 
-#: ../composer/e-composer-actions.c:317
+#: ../composer/e-composer-actions.c:202
+msgid "Save as..."
+msgstr "ఇలా దాయ�..."
+
+#: ../composer/e-composer-actions.c:281
 #: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "ఒక దస�త�రాన�ని జతపర�చ�మ�"
 
-#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:286
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "మూయ�మ�(_C)"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:288
 msgid "Close the current file"
 msgstr "ప�రస�త�త దస�త�రాన�ని మూయ�మ�"
 
-#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../composer/e-composer-actions.c:293
 msgid "_Print..."
 msgstr "మ�ద�రించ�(_P)..."
 
-#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
-#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:300
 msgid "Print Pre_view"
 msgstr "మ�ద�రణ ఉపదర�శనం(_v)"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:309
 msgid "Save the current file"
 msgstr "ప�రస�త�త దస�త�రాన�ని దాయ�మ�"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:314
 msgid "Save _As..."
 msgstr "ఇలా దాయ�మ�(_A)..."
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:316
 msgid "Save the current file with a different name"
 msgstr "ప�రస�త�త దస�త�రాన�ని వేరే పేర�తో దాయ�మ�"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:321
 msgid "Save as _Draft"
 msgstr "డ�రాఫ�ట� గా దాయ�మ� (_D)"
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:323
 msgid "Save as draft"
 msgstr "డ�రాఫ�ట� గా దాయ�మ�"
 
-#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
+#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "పంపించ�(_e)"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:330
 msgid "Send this message"
 msgstr "ఈ సందేశాన�ని పంప�మ�"
 
-#: ../composer/e-composer-actions.c:373
-msgid "Insert Send options"
-msgstr "పంప� ఇచ�చాపూర�వకాలన� అమర�చ�మ�"
-
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:335
 msgid "New _Message"
 msgstr "కొత�త సందేశం (_M)"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:337
 msgid "Open New Message window"
 msgstr "కొత�త సందేశం విండోన� తెర�వ�మ�"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:344
 msgid "Character _Encoding"
 msgstr "అక�షర సంకేతరచన (_E)"
 
-#: ../composer/e-composer-actions.c:394
-msgid "_Security"
-msgstr "రక�షణ(_S)"
-
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PGP ని రహస�యపర�చ�(_E)"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "PGP తో ఈ సందెశాన�ని రహస�యపర�చ�"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "PGP సంతకం(_S)"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "మీ PGP మీటతో ఈ సందేశాన�ని సంతకంచేయ�మ�"
 
-#: ../composer/e-composer-actions.c:420
+#: ../composer/e-composer-actions.c:377
 msgid "_Prioritize Message"
 msgstr "సందేశాన�ని ప�రాధాన�యపర�చ�(_P)"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:379
 msgid "Set the message priority to high"
 msgstr "సందేశ ప�రాధాన�యతన� ఎక�క�వగా అమర�చ�మ�"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:385
 msgid "Re_quest Read Receipt"
 msgstr "చదివినదాని రశీద�న� అభ�యర�దించ� (_q)"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:387
 msgid "Get delivery notification when your message is read"
 msgstr "మీ సందేశం చదవబడిన తర�వాత  చేరినట�ట� తాఖీద� పొంద�మ�"
 
-#: ../composer/e-composer-actions.c:436
+#: ../composer/e-composer-actions.c:393
 msgid "S/MIME En_crypt"
 msgstr "S/MIME ని రహస�యపర�చ�(_c)"
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:395
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "మీ S/MIME ఎన�క�రిప�షన� దృవీకరణపత�రం తో ఈ సందేశంన� ఎన�క�రిప�ట�చేయ�మ�"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME Sig_n"
 msgstr "S/MIME సంతకం(_n)"
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:403
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "మీ S/MIME సంతకం దృవీకరణపత�రం తో ఈ సందేశంన� సంతకంచేయ�మ�"
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:409
 msgid "_Bcc Field"
 msgstr "_Bcc క�షేత�రమ�"
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:411
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC క�షేత�రం ప�రదర�శించబడితే మార�స�త�ంది"
 
-#: ../composer/e-composer-actions.c:460
+#: ../composer/e-composer-actions.c:417
 msgid "_Cc Field"
 msgstr "_Cc క�షేత�రమ�"
 
-#: ../composer/e-composer-actions.c:462
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC క�షేత�రం ప�రదర�శించబడితే మార�స�త�ంది"
 
-#: ../composer/e-composer-actions.c:468
+#: ../composer/e-composer-actions.c:425
 msgid "_From Field"
 msgstr "క�షేత�రమ� న�ండి(_F)"
 
-#: ../composer/e-composer-actions.c:470
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the From chooser is displayed"
 msgstr "ఎంపికదారి న�ండి ప�రదర�శించబడితే మార�మ�"
 
-#: ../composer/e-composer-actions.c:476
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "క�షేత�రానికి సమాధానం(_R)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "వీరికి-ప�రత�య�త�తరమ� క�షేత�రం ప�రదర�శితమైతే మార�మ�"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:478
 msgid "Save Draft"
 msgstr "డ�రాఫ�ట� న� దాయ�మ�"
 
-#: ../composer/e-composer-header.c:120
-#| msgid "Sho_w: "
+#: ../composer/e-composer-header.c:129
 msgid "Show"
 msgstr "చూప�మ�"
 
-#: ../composer/e-composer-header.c:123
-#| msgid "_Hide"
+#: ../composer/e-composer-header.c:137
 msgid "Hide"
 msgstr "మర�గ�పర�చ�"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the recipients of the message"
 msgstr "సందేశం యొక�క స�వీకరణదార�లన� ప�రవేశపెట�టండి"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:44
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "సందేశం యొక�క నకల�న� పొంద� వారి చిర�నామాలన� ప�రవేశపెట�టండి"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:47
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
-msgstr "సందేశం యొక�క నకల�న� స�వీకరణదార�ల జాబితానంద� కనబడక�ండా తీస�క�నే వారి చిర�నామాలన� ప�రవేశపెట�టండి"
+msgstr ""
+"సందేశం యొక�క నకల�న� స�వీకరణదార�ల జాబితానంద� కనబడక�ండా తీస�క�నే వారి చిర�నామాలన� ప�రవేశపెట�టండి"
 
-#: ../composer/e-composer-header-table.c:945
+#: ../composer/e-composer-header-table.c:959
 msgid "Fr_om:"
 msgstr "న�ండి(_o):"
 
-#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
+#: ../composer/e-composer-header-table.c:959
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "న�ండి"
 
-#: ../composer/e-composer-header-table.c:954
+#: ../composer/e-composer-header-table.c:968
 msgid "_Reply-To:"
 msgstr "క�-ప�రత�య�త�తరమ�(_R):"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:973
 msgid "_To:"
 msgstr "క�(_T):"
 
-#: ../composer/e-composer-header-table.c:965
+#: ../composer/e-composer-header-table.c:979
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "CC"
 
-#: ../composer/e-composer-header-table.c:971
+#: ../composer/e-composer-header-table.c:985
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
 
-#: ../composer/e-composer-header-table.c:976
+#: ../composer/e-composer-header-table.c:990
 msgid "_Post To:"
 msgstr "క� పోస�ట� చేయ�మ�(_P):"
 
-#: ../composer/e-composer-header-table.c:980
+#: ../composer/e-composer-header-table.c:994
 msgid "S_ubject:"
 msgstr "సంగతి(_u):"
 
-#: ../composer/e-composer-header-table.c:989
+#: ../composer/e-composer-header-table.c:1003
 msgid "Si_gnature:"
 msgstr "సంతకం(_g):"
 
-#: ../composer/e-composer-name-header.c:116
+#: ../composer/e-composer-name-header.c:134
 msgid "Click here for the address book"
 msgstr "చిర�నామా ప�స�తకం కొరక� ఇక�కడ నొక�క�మ�"
 
-#: ../composer/e-composer-post-header.c:137
-msgid "Posting destination"
-msgstr "గమ�యాన�ని పోస�ట�చేస�త�న�నది"
-
-#: ../composer/e-composer-post-header.c:138
-msgid "Choose folders to post the message to."
-msgstr "సందేశాన�ని పోస�ట�చేయ�టక� సంచయాలన� ఎంచ�కొన�మ�."
-
-#: ../composer/e-composer-post-header.c:172
+#: ../composer/e-composer-post-header.c:116
 msgid "Click here to select folders to post to"
 msgstr "పోస�ట�చేయ�టక� సంచయాలన� ఎంచ�కొన�టక� ఇక�కడ నొక�కండి"
 
-#: ../composer/e-composer-private.c:208
-#| msgid "Save Draft"
+#: ../composer/e-composer-private.c:199
+#, fuzzy
+msgid "Undo the last action"
+msgstr "ఎంపికన� నకల� తీయ�మ�"
+
+#: ../composer/e-composer-private.c:203
+#, fuzzy
+msgid "Redo the last undone action"
+msgstr "తాజా సమాచారాన�ని పంప�"
+
+#: ../composer/e-composer-private.c:207
+#, fuzzy
+msgid "Search for text"
+msgstr ""
+"\n"
+"\n"
+"చిర�నామా కొరక� వెత�క�మ�."
+
+#: ../composer/e-composer-private.c:211
+#, fuzzy
+msgid "Search for and replace text"
+msgstr "iPod కొరక� శోధన విఫలమైంది"
+
+#: ../composer/e-composer-private.c:301
 msgid "Save draft"
 msgstr "డ�రాఫ�ట� న� దాయ�మ�"
 
-#: ../composer/e-msg-composer.c:807
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "బయటక� వెళ�ళ� సందేశానికి సంతకాన�ని పెట�టలేద�: ఈ ఖాతా క� ఎట�వంటి సంతక దృవీకరణపత�రం అమర�చలేద�"
+#. Check buttons
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "ఈ సందేశంన� మళ�ళీ చూపవద�ద� (_D)."
 
-#: ../composer/e-msg-composer.c:814
+#: ../composer/e-msg-composer.c:983
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"బయటక� వెళ�ళ� సందేశానికి సంతకాన�ని పెట�టలేద�: ఈ ఖాతా క� ఎట�వంటి సంతక దృవీకరణపత�రం అమర�చలేద�"
+
+#: ../composer/e-msg-composer.c:990
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
-msgstr "బయటక� వెళ�ళ� సందేశాన�ని ఎన�క�రిప�ట� చేయలేద�: ఈ ఖాతా క� ఎట�వంటి ఎన�క�రిప�షన� దృవీకరణపత�రం అమర�చలేద�"
+msgstr ""
+"బయటక� వెళ�ళ� సందేశాన�ని ఎన�క�రిప�ట� చేయలేద�: ఈ ఖాతా క� ఎట�వంటి ఎన�క�రిప�షన� దృవీకరణపత�రం అమర�చలేద�"
 
-#: ../composer/e-msg-composer.c:1350 ../composer/e-msg-composer.c:2189
+#: ../composer/e-msg-composer.c:1379
+#, fuzzy
+msgid "Unable to reconstruct message from autosave file"
+msgstr "సరికూర�పరిన�ండి సందేశాన�ని వెలికితీయలేద�"
+
+#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
 msgid "Compose Message"
 msgstr "సందేశాన�ని కూర�చ�మ�"
 
-#: ../composer/e-msg-composer.c:3347
+#: ../composer/e-msg-composer.c:3310
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -9739,22 +8406,18 @@ msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "స�వయచాలకంగా దాయ� దస�త�రం &quot;{0}&quot; క� దాయలేకపోయింది."
 
 #: ../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
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "దిగ�మతి జర�గ�త�న�నది. మీర� మెయిల� న� పంపాలన�క�ంట�న�నారా?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "స�వయంచాలకంగా దాయ� దస�త�రంక� దాయ�టలో దోషం ఎంచేతంటే &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -9762,29 +8425,11 @@ msgstr ""
 "మీర� సందేశాన�ని కూర�చ�త�న�నప�ప�డ� ఎవాల�యూషన� అన�కోక�ండా నిష�క�రమించింది. సందేశాన�ని తిరిగిపొంద�ట ద�వారా "
 "మీర� ఎక�కడ వదిలారో అక�కడిన�ండి కొనసాగించవచ�చ�."
 
-#: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
-"accounts."
-msgstr "పంపే �చ�చికాల� Novell సమూహతరహా మరియ� Microsoft మార�పిడి ఖాతాలక� మాత�రమే అంద�బాట�లో ఉంటాయి."
-
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Send options not available."
-msgstr "పంపే �చ�చికాల� అంద�బాట�లో లేవ�."
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:16
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "దస�త�రం `{0} సాదారణ దస�త�రం కాద� మరియ� సందేశంలో పంపబడలేద�."
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"ఈ సంచయం యొక�క సారాలన� అన�భందించ�టక�, సంచయంనందలి దస�త�రాలన� ఒక�కొక�కటే అన�భందించ�మ�, లేదా "
-"సంచయంక� ఆర�చవ�‌న� తయార�చేసి మరియ� అన�భందించ�మ�."
-
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9795,54 +8440,352 @@ msgstr ""
 "\n"
 "దయచేసి మీర� ఖచ�చితమైన gtkhtml మరియ� libgtkhtml న� కిలిగిఉన�నారేమో సరిచూస�కొనండి."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
 msgstr "చిర�నామా ఎంపికదారి నియంత�రిక చేతనం చేయలేద�."
 
-#: ../composer/mail-composer.error.xml.h:25
-msgid "Unfinished messages found"
-msgstr "పూర�తిచేయనట�వంటి సందేశాల� కన�గొనబడినవి."
-
-#: ../composer/mail-composer.error.xml.h:26
-msgid "Warning: Modified Message"
-msgstr "హెచ�చరిక: సవరించబడిన సందేశం"
-
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:21
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "మీర� దస�త�రం `{0}' న� ఈ సందేశంక� అన�భందించలేర�."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr " తపాలా న� రచించ�టక� మ�ంద� మీర� ఒక ఖాతా న� సరిచేయవలెన�."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:23
 msgid "_Continue Editing"
 msgstr "సరికూర�చ�ట కొనసాగించ�(_C)"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:25
 msgid "_Do not Recover"
 msgstr "తిరిగిపొందవద�ద�(_D)"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:26
 msgid "_Recover"
 msgstr "తిరిగిపొంద�మ�(_R)"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Save Draft"
 msgstr "డ�రాప�ట��‌న� దాయ�మ� (_S)"
 
-#: ../data/evolution.desktop.in.in.h:1
+#: ../capplet/anjal-settings-main.c:202
+msgid "Run Anjal in a window"
+msgstr ""
+
+#: ../capplet/anjal-settings-main.c:203
+#, fuzzy
+msgid "Make Anjal the default email client"
+msgstr "అప�రమేయ మెమో జాబితాగా గ�ర�త�ంచ�మ� (_d)"
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:210
+msgid "ID of the socket to embed in"
+msgstr ""
+
+#: ../capplet/anjal-settings-main.c:211
+#, fuzzy
+msgid "socket"
+msgstr " చక�కదిద�ద�"
+
+#: ../capplet/anjal-settings-main.c:225
+#, fuzzy
+msgid "Anjal email client"
+msgstr "అప�రమేయ మెయిల� కక�షిదార�"
+
+#: ../capplet/settings/mail-view.c:244
+#, fuzzy
+msgid "New Tab"
+msgstr "కొత�త కార�యం(_T)"
+
+#: ../capplet/settings/mail-account-view.c:56
+#, fuzzy
+msgid "Please enter your full name."
+msgstr "దయచేసి వేరే నామాన�ని ఎంచ�కొన�మ�."
+
+#: ../capplet/settings/mail-account-view.c:57
+msgid "Please enter your email address."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:58
+msgid "The email address you have entered is invalid."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:224
+#, fuzzy
+msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+msgstr "<span weight=\"bold\">మెయిల� తొలగించ�</span>"
+
+#: ../capplet/settings/mail-account-view.c:229
+#, fuzzy
+msgid "Name:"
+msgstr "పేర�(_N):"
+
+#: ../capplet/settings/mail-account-view.c:238
+#, fuzzy
+msgid "Email address:"
+msgstr "ఈ మెయిల� చిర�నామ(_A):"
+
+#: ../capplet/settings/mail-account-view.c:248
+#, fuzzy
+msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+msgstr "<span weight=\"bold\">సాదారణ</span>"
+
+#: ../capplet/settings/mail-account-view.c:253
+#: ../capplet/settings/mail-account-view.c:303
+#, fuzzy
+msgid "Server type:"
+msgstr "సేవిక రకం (_T):"
+
+#: ../capplet/settings/mail-account-view.c:262
+#: ../capplet/settings/mail-account-view.c:312
+#, fuzzy
+msgid "Server address:"
+msgstr "సేవిక సందేశం:"
+
+#: ../capplet/settings/mail-account-view.c:272
+#: ../capplet/settings/mail-account-view.c:322
+#, fuzzy
+msgid "Username:"
+msgstr "(_e) వినియోగదారి నామమ�:"
+
+#: ../capplet/settings/mail-account-view.c:281
+#: ../capplet/settings/mail-account-view.c:331
+#, fuzzy
+msgid "Use encryption:"
+msgstr "ఎన�క�రిప�షన� లేద�"
+
+#: ../capplet/settings/mail-account-view.c:286
+#: ../capplet/settings/mail-account-view.c:336
+#, fuzzy
+msgid "never"
+msgstr "ఎప�పటికివద�ద�"
+
+#: ../capplet/settings/mail-account-view.c:298
+#, fuzzy
+msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+msgstr "<span weight=\"bold\">సాదారణ</span>"
+
+#: ../capplet/settings/mail-account-view.c:355
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:357
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:359
+#, fuzzy
+msgid "You can specify more options to configure the account."
+msgstr "మీర� ఒక ఎక�సేంజ� ఖాతా మాత�రమే ఆకృతీకరించ గలర�."
+
+#: ../capplet/settings/mail-account-view.c:361
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:362
+msgid "You can specify your default settings for your account."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:363
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:378
+#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
+#: ../mail/mail-config.ui.h:58
+msgid "Identity"
+msgstr "గ�ర�తింప�"
+
+#: ../capplet/settings/mail-account-view.c:378
+#, fuzzy
+msgid "Next - Receiving mail"
+msgstr "మెయిల� న� తీస�క�ంటోంది"
+
+#: ../capplet/settings/mail-account-view.c:379
+#, fuzzy
+msgid "Receiving mail"
+msgstr "మెయిల� న� తీస�క�ంటోంది"
+
+#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:380
+#, fuzzy
+msgid "Next - Sending mail"
+msgstr "ఈమెయిల� పంపిస�త�న�నది"
+
+#: ../capplet/settings/mail-account-view.c:379
+#, fuzzy
+msgid "Back - Identity"
+msgstr "గ�ర�తింప�"
+
+#: ../capplet/settings/mail-account-view.c:379
+#, fuzzy
+msgid "Next - Receiving options"
+msgstr "�చ�చికాలన� తిరిగిపొంద�త�ంది"
+
+#: ../capplet/settings/mail-account-view.c:380
+#, fuzzy
+msgid "Receiving options"
+msgstr "�చ�చికాలన� తిరిగిపొంద�త�ంది"
+
+#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:382
+#, fuzzy
+msgid "Back - Receiving mail"
+msgstr "మెయిల� న� తీస�క�ంటోంది"
+
+#: ../capplet/settings/mail-account-view.c:382
+#, fuzzy
+msgid "Sending mail"
+msgstr "ఈమెయిల� పంపిస�త�న�నది"
+
+#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:383
+#, fuzzy
+msgid "Next - Review account"
+msgstr "ఖాతా తొలగించాలా?"
+
+#: ../capplet/settings/mail-account-view.c:382
+#, fuzzy
+msgid "Next - Defaults"
+msgstr "అప�రమేయాల�"
+
+#: ../capplet/settings/mail-account-view.c:382
+#, fuzzy
+msgid "Back - Receiving options"
+msgstr "�చ�చికాలన� తిరిగిపొంద�త�ంది"
+
+#: ../capplet/settings/mail-account-view.c:383
+#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+msgid "Defaults"
+msgstr "అప�రమేయాల�"
+
+#: ../capplet/settings/mail-account-view.c:383
+#, fuzzy
+msgid "Back - Sending mail"
+msgstr "ఈమెయిల� పంపిస�త�న�నది"
+
+#: ../capplet/settings/mail-account-view.c:385
+#, fuzzy
+msgid "Review account"
+msgstr "ఖాతా తొలగించాలా?"
+
+#: ../capplet/settings/mail-account-view.c:385
+msgid "Finish"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:385
+#, fuzzy
+msgid "Back - Sending"
+msgstr "ఆరోహణాక�రమం"
+
+#: ../capplet/settings/mail-account-view.c:719
+#: ../capplet/settings/mail-settings-view.c:266
+#, fuzzy
+msgid "Close Tab"
+msgstr "మూయ�మ�"
+
+#: ../capplet/settings/mail-account-view.c:729
+#, fuzzy
+msgid "Account Wizard"
+msgstr "ఖాతా కూర�పరి"
+
+#: ../capplet/settings/mail-capplet-shell.c:284
+#, fuzzy
+msgid "Evolution account assistant"
+msgstr "ఎవాల�యూషన� ఖాతా సహాయక�డ�"
+
+#: ../capplet/settings/mail-capplet-shell.c:320
+#: ../data/evolution-settings.desktop.in.in.h:2
+#, fuzzy
+msgid "Email Settings"
+msgstr "నిరర�దక మెయిల� అమరికల�"
+
+#: ../capplet/settings/mail-capplet-shell.c:334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#, fuzzy
+msgid "Quit"
+msgstr "త�యజించ�(_Q)"
+
+#. create the local source group
+#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
+#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
+#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
+#: ../mail/message-list.c:1617
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:501
+msgid "On This Computer"
+msgstr "ఈ కంప�యూటర� పైన"
+
+#: ../capplet/settings/mail-settings-view.c:148
+#: ../plugins/groupwise-features/share-folder.c:747
+msgid "Modify"
+msgstr "సవరించ�"
+
+#: ../capplet/settings/mail-settings-view.c:150
+#, fuzzy
+msgid "Add a new account"
+msgstr "నిల�వ� పట�టీని జతచేయ�..."
+
+#: ../capplet/settings/mail-settings-view.c:185
+#, fuzzy
+msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+msgstr "<span weight=\"bold\">ఖాతా సమాచారం</span>"
+
+#: ../capplet/settings/mail-settings-view.c:276
+#, fuzzy
+msgid "Settings"
+msgstr "నిరర�ధకంక� అమరికల�"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+#, fuzzy
+msgid "Calendar event notifications"
+msgstr "క�యాలెండర� సమాచారం"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+#, fuzzy
+msgid "Evolution Alarm Notify"
+msgstr "ఎవాల�యూషన� Elm దిగ�మతిదారి"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
+#: ../shell/e-shell-window-private.c:251
+msgid "Evolution"
+msgstr "ఎవాల�యూషన�"
+
+#: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
 msgstr "ఎవల�యూషన� క�యాలెండర� మరియ� మెయిల�"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "సమూహతరహా సమసమితి"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "మీ ఈమెయిల� న� నిర�వహించ�మ�, పరిచయాల� మరియ� ప�రణాళిక"
 
+#: ../data/evolution-settings.desktop.in.in.h:1
+#, fuzzy
+msgid "Configure email accounts"
+msgstr "మీ ఈమెయిల� ఖాతాలన� ఇక�కడ ఆకృతీకరించ�మ�"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "చిర�నామా కార�డ�"
@@ -9851,143 +8794,254 @@ msgstr "చిర�నామా కార�డ�"
 msgid "calendar information"
 msgstr "క�యాలెండర� సమాచారం"
 
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:224
+#, fuzzy, c-format
+msgid "%s (cancelled)"
+msgstr "రద�ద�చేయబడినది"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:227
+#, fuzzy, c-format
+msgid "%s (completed)"
+msgstr "%s (%d%% పూర�తి అయినది)"
+
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../e-util/e-activity.c:231
+#, fuzzy, c-format
+msgid "%s..."
+msgstr "%s (...)"
+
+#: ../e-util/e-activity.c:236
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% పూర�తి అయినది)"
+
+#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+msgid "Evolution Error"
+msgstr "ఎవాల�యూషన� దోషం"
+
+#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+msgid "Evolution Warning"
+msgstr "ఎవాల�యూషన� హెచ�చరిక"
+
+#: ../e-util/e-alert.c:634
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "అంతర�గత దోషం, తెలియని దోషం '%s' అభ�యర�దించబడింది"
+
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "అరబిక�"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "బాల�టిక�"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "సెంట�రల� యూరోపియన�"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "చైనీస�"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "సిరిల�లిక�"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "గ�రీక�"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "హెబ�రివ�"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "జపనీస�"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "కొరియన�"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "థాయ�"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "టర�కిష�"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "యూనికోడ�"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "వెస�త�రన� యూరోపియన�"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "వెస�త�రన� యూరోపియన�, కొత�త"
+
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+msgid "Traditional"
+msgstr "సంప�రదాయమైన"
+
+#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
+#: ../e-util/e-charset.c:91
+msgid "Simplified"
+msgstr "సరళీకరించిన"
+
+#: ../e-util/e-charset.c:94
+msgid "Ukrainian"
+msgstr "ఉక�రేనియన�"
+
+#: ../e-util/e-charset.c:97
+msgid "Visual"
+msgstr "దార�శనీక"
+
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:188 ../plugins/itip-formatter/itip-view.c:191
-#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../plugins/itip-formatter/itip-view.c:195
+#: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "ఈరోజ�"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:200 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "మర�నాడ�"
 
-#: ../e-util/e-datetime-format.c:202
-#| msgid "Yesterday %l:%M %p"
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "నిన�న"
 
-#: ../e-util/e-datetime-format.c:205
+#: ../e-util/e-datetime-format.c:210
 #, c-format
 msgid "%d days from now"
 msgstr "ఇప�పడి న�ండి %d రోజ�ల�"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:212
 #, c-format
-#| msgid "1 day ago"
-#| msgid_plural "%d days ago"
 msgid "%d days ago"
 msgstr "%d రోజ�ల క�రితం"
 
-#: ../e-util/e-datetime-format.c:281 ../e-util/e-datetime-format.c:291
-#: ../e-util/e-datetime-format.c:300
-#| msgid "_Use system defaults"
+#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
+#: ../e-util/e-datetime-format.c:305
 msgid "Use locale default"
 msgstr "అప�రమేయ లోకేల�‌న� వ�పయోగించ�మ�"
 
-#: ../e-util/e-datetime-format.c:494
-#| msgid "Format"
+#: ../e-util/e-datetime-format.c:499
 msgid "Format:"
 msgstr "ఫార�మాట�:"
 
-#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
-msgid "Evolution Error"
-msgstr "ఎవాల�యూషన� దోషం"
-
-#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
-msgid "Evolution Warning"
-msgstr "ఎవాల�యూషన� హెచ�చరిక"
+#: ../e-util/e-file-utils.c:136
+#, fuzzy
+msgid "(Unknown Filename)"
+msgstr "అపరిచిత రకమ�"
 
-#: ../e-util/e-error.c:118
-msgid "Evolution Information"
-msgstr "ఎవాల�యూషన� సమాచారం"
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:140
+#, fuzzy, c-format
+msgid "Writing \"%s\""
+msgstr "పింగింగ� %s"
 
-#: ../e-util/e-error.c:120
-msgid "Evolution Query"
-msgstr "ఎవాల�యూషన� క�వరి"
+#. Translators: The first string value is the basename of a
+#. * remote file, the second string value is the hostname.
+#: ../e-util/e-file-utils.c:145
+#, fuzzy, c-format
+msgid "Writing \"%s\" to %s"
+msgstr "`%s' న�ండి `%s' క� నకల�తీయ�చ�న�నది"
 
-#. setup a dummy error
-#: ../e-util/e-error.c:448
-#, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "అంతర�గత దోషం, తెలియని దోషం '%s' అభ�యర�దించబడింది"
+#: ../e-util/e-logger.c:175
+#, fuzzy
+msgid "Name of the logger"
+msgstr "లాగ�అయిన మూలకంయొక�క నామమ�"
 
-#: ../e-util/e-logger.c:161
-msgid "Component"
-msgstr "మూలకం"
+#: ../e-util/e-module.c:194
+#, fuzzy
+msgid "Filename"
+msgstr "దస�త�రనామమ�(_i):"
 
-#: ../e-util/e-logger.c:162
-msgid "Name of the component being logged"
-msgstr "లాగ�అయిన మూలకంయొక�క నామమ�"
+#: ../e-util/e-module.c:195
+#, fuzzy
+msgid "The filename of the module"
+msgstr "ఈ సంచయ నామాన�ని మార�చ�మ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:191
+#: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "డీబగ� లాగ�‌ల�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:205
+#: ../e-util/e-non-intrusive-error-dialog.c:208
 msgid "Show _errors in the status bar for"
 msgstr "దీని కొరక� స�థితపట�టీ నంద� దోషాలన� చూప�మ�(_e)"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:223
+#: ../e-util/e-non-intrusive-error-dialog.c:226
 msgid "second(s)."
 msgstr "సెకన�(ల�)."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:229
+#: ../e-util/e-non-intrusive-error-dialog.c:232
 msgid "Log Messages:"
 msgstr "లాగ� సందేశాల�:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:274
+#: ../e-util/e-non-intrusive-error-dialog.c:279
 msgid "Log Level"
 msgstr "లాగ� స�థాయి"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:282
-#: ../widgets/misc/e-dateedit.c:380
-msgid "Time"
-msgstr "సమయం"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "సందేశాల�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:301
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../shell/e-shell-window-actions.c:1446
 msgid "Close this window"
 msgstr "ఈ గవాక�షాన�ని మూయ�మ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "దోషం"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "దోషాల�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "హెచ�చరికల� మరియ� దోషాల�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "డీబగ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Error, Warnings and Debug messages"
 msgstr "దోషం, హెచ�చరికల� మరియ� డీబగ� సందేశాల�"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
-#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
-#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:718
+#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "క�రియాశీలీకరించిన"
 
-#: ../e-util/e-plugin.c:309
+#: ../e-util/e-plugin.c:296
 msgid "Whether the plugin is enabled"
 msgstr "ప�లగ�‌ఇన� చేతనం చేయాలా"
 
+#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "వారమ�ల�"
+
 #: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "మ�ద�రించ�చ�న�నప�ప�డ� ఒక దోషం ఎద�రైంది"
@@ -9997,14 +9051,15 @@ msgid "The printing system reported the following details about the error:"
 msgstr "మ�ద�రాణా వ�యవస�థ దోషం గ�రించి ఈ క�రింది వివరాలన� నివేదించింది:"
 
 #: ../e-util/e-print.c:173
-msgid "The printing system did not report any additional details about the error."
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr "మ�ద�రణా వ�యవస�థ దోషం గ�రించి � అదనప� వివరాలన� నివేదించలేద�."
 
-#: ../e-util/e-signature.c:690
+#: ../e-util/e-signature.c:701
 msgid "Autogenerated"
 msgstr "స�వయంచాలకంగాఉద�భవించిన"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "ఎంచేతంటే \"{1}\"."
 
@@ -10024,255 +9079,304 @@ msgstr "మీర� దీనిని మరల వ�రాయదల�చ�
 msgid "File exists \"{0}\"."
 msgstr "దస�త�రమ� వ�ంది \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "దస�త�రాన�ని మరలావ�రాయాలా?"
-
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
 msgid "_Overwrite"
 msgstr "మరలావ�రాయండి(_O)"
 
-#: ../e-util/e-util.c:133
+#: ../e-util/e-util.c:171
 msgid "Could not open the link."
 msgstr "లింక�న� తెర�వలేక పోయినది."
 
-#: ../e-util/e-util.c:183
+#: ../e-util/e-util.c:221
 msgid "Could not display help for Evolution."
 msgstr "ఎవాల�యూషన� కొరక� సహాయంన� ప�రదర�శించ లేకపోయింది."
 
-#: ../e-util/e-util-labels.c:45
-msgid "I_mportant"
-msgstr "మ�ఖ�యమైన(_m)"
+#: ../e-util/gconf-bridge.c:1281
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf దోషమ�: %s"
 
-#. red
-#: ../e-util/e-util-labels.c:46
-msgid "_Work"
-msgstr "పని(_W)"
+#: ../e-util/gconf-bridge.c:1292
+msgid "All further errors shown only on terminal."
+msgstr "తద�పరి అన�ని దోషమ�ల� టెర�మినల�‌పై మాత�రమే చూపబడ�న�."
 
-#. orange
-#: ../e-util/e-util-labels.c:47
-msgid "_Personal"
-msgstr "వ�యక�తిగత(_P)"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../modules/mail/em-mailer-prefs.c:78
+msgid "Reply-To"
+msgstr "క�-ప�రత�య�త�తరమ�"
 
-#. green
-#: ../e-util/e-util-labels.c:48
-msgid "_To Do"
-msgstr "చేయ�టక�(_T)"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
+#: ../mail/em-format-html.c:2254 ../mail/em-format-html.c:2325
+#: ../mail/em-format-html.c:2362 ../modules/mail/em-mailer-prefs.c:80
+msgid "Cc"
+msgstr "Cc"
 
-#. blue
-#: ../e-util/e-util-labels.c:49
-msgid "_Later"
-msgstr "తర�వాత(_L)"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
+#: ../mail/em-format-html.c:2255 ../mail/em-format-html.c:2336
+#: ../mail/em-format-html.c:2369 ../modules/mail/em-mailer-prefs.c:81
+msgid "Bcc"
+msgstr "Bcc"
 
-#: ../e-util/e-util-labels.c:320
-msgid "Label _Name:"
-msgstr "లేబ�ల� నామమ�(_N):"
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+msgid "Subject"
+msgstr "సంగతి"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Edit Label"
-msgstr "లేబ�ల� నామమ�"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2467
+#: ../modules/mail/em-mailer-prefs.c:1130
+msgid "Mailer"
+msgstr "మెయిలర�"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Add Label"
-msgstr "లేబ�ల� న� జతచేయ�మ�"
+#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+msgid "-------- Forwarded Message --------"
+msgstr "-------- మ�ంద�క� పంపబడినసందేశం --------"
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label name cannot be empty."
-msgstr "లేబ�ల� నామమ� ఖాళీగా ఉండకూడద�."
+#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
+msgid "Date"
+msgstr "తారీఖ�"
 
-#: ../e-util/e-util-labels.c:367
-msgid ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
-msgstr "సమాన టాగ�‌తో లేబ�ల� యిప�పటికే వ�ంది. దయచేసి మీ లేబ�ల�‌న� ప�నఃనామకరణ చేయ�మ�."
+#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+msgid "Newsgroups"
+msgstr "వార�తాసమూహాల�"
 
-#: ../e-util/gconf-bridge.c:1222
+#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "మ�ఖమ�"
+
+#: ../em-format/em-format.c:1319
 #, c-format
-msgid "GConf error: %s"
-msgstr "GConf దోషమ�: %s"
+msgid "%s attachment"
+msgstr "%s అన�భందమ�"
 
-#: ../e-util/gconf-bridge.c:1233
-msgid "All further errors shown only on terminal."
-msgstr "తద�పరి అన�ని దోషమ�ల� టెర�మినల�‌పై మాత�రమే చూపబడ�న�."
+#: ../em-format/em-format.c:1374
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "S/MIME సందేశంన� పార�శ�  చేయలేకపోయింది: తెలియని దోషం"
+
+#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME సందేశంన� పార�శ� చేయలేకపోయింది. మూలంలాగా ప�రదర�శిస�తోంది."
+
+#: ../em-format/em-format.c:1520
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "మల�టీపార�ట�/ఎన�క�రిప�టెడ� కొరక� మద�దతీయని ఎన�క�రిప�షన� రకం"
+
+#: ../em-format/em-format.c:1532
+msgid "Could not parse PGP/MIME message"
+msgstr "PGP/MIME సందేశాన�ని పార�శ� చేయలేకపోయింది"
+
+#: ../em-format/em-format.c:1532
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "PGP/MIME సందేశాన�ని పార�శ�  చేయలేకపోయింది: తెలియని దోషం"
+
+#: ../em-format/em-format.c:1698
+msgid "Unsupported signature format"
+msgstr "మద�దతీయని సంతకం రూపం"
+
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+msgid "Error verifying signature"
+msgstr "సంతకాన�ని నిర�దారించ�టలో దోషం"
+
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
+#: ../em-format/em-format.c:1847
+msgid "Unknown error verifying signature"
+msgstr "సంతకాన�ని నిర�దారించ�టలో తెలియని దోషం"
 
-#: ../filter/filter-datespec.c:73
+#: ../em-format/em-format.c:1924
+msgid "Could not parse PGP message"
+msgstr "PGP సందేశాన�ని పార�శ� చేయలేకపోయింది"
+
+#: ../em-format/em-format.c:1924
+msgid "Could not parse PGP message: Unknown error"
+msgstr "PGP సందేశాన�ని పార�శ� చేయలేకపోయింది: తెలియని దోషం"
+
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 సెకన�క� మ�ందల"
 msgstr[1] "%d సెకన�లక� మ�ందల"
 
-#: ../filter/filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "ఇంకా 1 సెకన�క�"
 msgstr[1] "ఇంకా %d సెకన�లక�"
 
-#: ../filter/filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 నిమ�షం క� మ�ంద�"
 msgstr[1] "%d నిమిషాలక� మ�ంద�"
 
-#: ../filter/filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "ఇంకా 1 నిమ�షంక�"
 msgstr[1] "ఇంకా %d నిమిషాలక�"
 
-#: ../filter/filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 గంట మ�ంద�"
 msgstr[1] "%d గంటల మ�ంద�"
 
-#: ../filter/filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "ఇంకా 1 గంటక�"
 msgstr[1] "ఇంకా %d గంటలక�"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 రోజ� మ�ంద�"
 msgstr[1] "%d రోజ�ల మ�ంద�"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "ఇంకా 1 రోజ�క�"
 msgstr[1] "ఇంకా %d రోజ�లక�"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 వారం మ�ంద�"
 msgstr[1] "%d వారమ�ల మ�ంద�"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "ఇంకా 1 వారంక�"
 msgstr[1] "ఇంకా %d వారమ�లక�"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 నెలక� మ�ంద�"
 msgstr[1] "%d నెలలక� మ�ంద�"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "ఇంకా 1 నెలక�"
 msgstr[1] "ఇంకా %d నెలలక�"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 సంవత�సరం మ�ంద�"
 msgstr[1] "%d సంవత�సరమ�ల మ�ంద�"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "ఇంకా 1 సంవత�సరంక�"
 msgstr[1] "ఇంకా %d సంవత�సరమ�లక�"
 
-#: ../filter/filter-datespec.c:294
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<ఒక తేదిన� ఎంచ�కొన�టక� ఇక�కడ నొక�కండి>"
 
-#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
-#: ../filter/filter-datespec.c:319
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "ఇప�ప�డ�"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:304
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:447
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "సరిపోల�చ�టక� ఒక సమయాన�ని ఎంచ�కొన�మ�"
 
-#: ../filter/filter-file.c:281
-msgid "Choose a file"
+#: ../filter/e-filter-file.c:184
+#, fuzzy
+msgid "Choose a File"
 msgstr "దస�త�రాన�ని ఎంచ�కొన�మ�"
 
-#: ../filter/filter-part.c:528
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "పరీక�ష"
-
-#: ../filter/filter-rule.c:854
+#: ../filter/e-filter-rule.c:659
 msgid "R_ule name:"
 msgstr "నియమం నామమ�(_u):"
 
-#: ../filter/filter-rule.c:882
+#: ../filter/e-filter-rule.c:689
 msgid "Find items that meet the following conditions"
 msgstr "క�రింది నియమాలన� పోలిఉండ� అంశమ�లన� కన�గొన�మ�"
 
-#: ../filter/filter-rule.c:916
+#: ../filter/e-filter-rule.c:723
 msgid "A_dd Condition"
 msgstr "నియమాన�ని జతచేయ�మ� (_d)"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:732
 msgid "If all conditions are met"
 msgstr "ఒకవేళ అన�ని నియమాల� సరితూగితే"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:733
 msgid "If any conditions are met"
 msgstr "� నియమాల� అయినా సరితూగితే"
 
-#: ../filter/filter-rule.c:924
+#: ../filter/e-filter-rule.c:736
 msgid "_Find items:"
 msgstr "అంశాలన� కన�గొన�మ�(_F):"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:760
 msgid "All related"
 msgstr "సంభందితమ�ల� అన�నీన�"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "ప�రత�య�త�తరమ�ల�"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:762
 msgid "Replies and parents"
 msgstr "మాత�ర�కల� మరియ� ప�రత�య�త�తరమ�ల�"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:763
 msgid "No reply or parent"
 msgstr "� ప�రత�య�తరమ� లేదా మాత�ర�క లేద�"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/e-filter-rule.c:766
 msgid "I_nclude threads"
 msgstr "తంత�లన� చేర�చ�మ�(_n)"
 
-#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:300
 msgid "Incoming"
 msgstr "లోపలికివచ�చ�"
 
-#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
 msgid "Outgoing"
 msgstr "బయటక� వెళ�ళ�"
 
+#: ../filter/e-rule-editor.c:265
+msgid "Add Rule"
+msgstr "నియమాన�ని జతచేయ�మ�"
+
+#: ../filter/e-rule-editor.c:352
+msgid "Edit Rule"
+msgstr "నియమాన�ని సరిచేయ�మ�"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "సరికాని రెగ�య�లర� ఎక�సప�రెషన� &quot;{0}&quot;."
@@ -10293,7 +9397,7 @@ msgstr "తప�పిపోయిన తేది."
 msgid "Missing file name."
 msgstr "తప�పిపోయిన దస�త�రం నామమ�."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
 msgid "Missing name."
 msgstr "తప�పిపోయిన నామమ�."
 
@@ -10317,19 +9421,15 @@ msgstr "మీరà±� à°ˆ వడపోతకà±� నామమà±� ఉంచవలà±
 msgid "You must specify a file name."
 msgstr "మీర� ఒక దస�త�రనామమ�న� తెల�పవలెన�."
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>వడపోత నియమాల�(_F)</b>"
-
-#: ../filter/filter.glade.h:2
+#: ../filter/filter.ui.h:1
 msgid "Compare against"
 msgstr "పోల�చ�మ�"
 
-#: ../filter/filter.glade.h:4
+#: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
 msgstr "మెయిల� క� వడపోతలన� చూప�మ�:"
 
-#: ../filter/filter.glade.h:5
+#: ../filter/filter.ui.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10337,7 +9437,7 @@ msgstr ""
 "సందేశం యొక�క తేది తెలపబడిన తేదీ యొక�క 12:00am\n"
 "తో పోల�చబడ�త�ంది."
 
-#: ../filter/filter.glade.h:7
+#: ../filter/filter.ui.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10345,7 +9445,7 @@ msgstr ""
 "సందేశం యొక�క తేది వడపోత ఎప�ప�డ� అవసరమౌత�ందో\n"
 "దానికి సారూప�య సమయం తో పోల�చబడ�త�ంది."
 
-#: ../filter/filter.glade.h:9
+#: ../filter/filter.ui.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10353,242 +9453,923 @@ msgstr ""
 "సందేశం యొక�క తేది వడపోత ఎప�ప�డ� అవసరమౌత�ందో\n"
 "ఆప�పటి సమయం తో పోల�చబడ�త�ంది."
 
-#: ../filter/filter.glade.h:12
-#| msgid "in the future"
-msgid ""
-"ago\n"
-"in the future"
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "వడపోత నియమాల�(_F)"
+
+#: ../filter/filter.ui.h:12
+#, fuzzy
+msgid "a time relative to the current time"
+msgstr ""
+"ప�రస�త�త సమయం\n"
+"మీర� తెలిపిన సమయం\n"
+"ప�రస�త�త సమయానికి సారూప�యంగా వ�న�న సమయం"
+
+#: ../filter/filter.ui.h:13
+#, fuzzy
+msgid "ago"
+msgstr "టాగ�"
+
+#: ../filter/filter.ui.h:16
+#, fuzzy
+msgid "in the future"
 msgstr ""
 "క�రితం\n"
 "భవిష�యత�త�లో"
 
-#: ../filter/filter.glade.h:14
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+#, fuzzy
+msgid "months"
+msgstr "నెల"
+
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+msgid "seconds"
+msgstr "సెకన�ల�"
+
+#: ../filter/filter.ui.h:20
+#, fuzzy
+msgid "the current time"
+msgstr "ప�రస�త�త దస�త�రాన�ని దాయ�మ�"
+
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
+msgstr ""
+
+#: ../filter/filter.ui.h:23
+#, fuzzy
+msgid "years"
+msgstr "పీఠికల�"
+
+#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
+#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
+#: ../widgets/misc/e-attachment-paned.c:153
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "అన�భందమ�"
+msgstr[1] "అన�భందమ�"
+
+#: ../mail/e-mail-attachment-bar.c:621
+#: ../widgets/misc/e-attachment-paned.c:612
+msgid "Icon View"
+msgstr "ప�రతిమ దర�శనమ�"
+
+#: ../mail/e-mail-attachment-bar.c:622
+#: ../widgets/misc/e-attachment-paned.c:613
+msgid "List View"
+msgstr "జాబితా దర�శనం"
+
+#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:642
+msgid "Focus Tracker"
+msgstr ""
+
+#: ../mail/e-mail-browser.c:742
+#, fuzzy
+msgid "Shell Module"
+msgstr "ఎంపిక సంవిధానం"
+
+#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
+msgid "The mail shell backend"
+msgstr ""
+
+#: ../mail/e-mail-browser.c:753
+#, fuzzy
+msgid "Show Deleted"
+msgstr "తొలగించబడింది"
+
+#: ../mail/e-mail-browser.c:754
+#, fuzzy
+msgid "Show deleted messages"
+msgstr "మ�ంద�క�పంపిన సందేశాల�"
+
+#: ../mail/e-mail-display.c:66
+#, fuzzy
+msgid "_Add to Address Book..."
+msgstr "చిర�నామా ప�స�తకంక� కల�ప�మ�(_A)"
+
+#: ../mail/e-mail-display.c:73
+#, fuzzy
+msgid "_To This Address"
+msgstr "ఈ చిర�నామాక�(_T)"
+
+#: ../mail/e-mail-display.c:80
+#, fuzzy
+msgid "_From This Address"
+msgstr "ఈ చిర�నామా న�ండి(_F)"
+
+#: ../mail/e-mail-display.c:89
+#, fuzzy
+msgid "Create Search _Folder"
+msgstr "శోధన సంచయాన�ని సృష�టించ�మ�(_S)"
+
+#: ../mail/e-mail-label-dialog.c:220
+#, fuzzy
+msgid "_Label name:"
+msgstr "లేబ�ల� నామమ�(_N):"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "మ�ఖ�యమైన(_m)"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "పని(_W)"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "వ�యక�తిగత(_P)"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "చేయ�టక�(_T)"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "తర�వాత(_L)"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:515
+msgid "Add Label"
+msgstr "లేబ�ల� న� జతచేయ�మ�"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "లేబ�ల� నామమ�"
+
+#: ../mail/e-mail-label-manager.c:349
+#, fuzzy
 msgid ""
-"seconds\n"
-"minutes\n"
-"hours\n"
-"days\n"
-"weeks\n"
-"months\n"
-"years"
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
 msgstr ""
-"సెకన�ల�\n"
-"నిమ�షాల�\n"
-"గంటల�\n"
-"రోజ�ల�\n"
-"వారమ�ల�\n"
-"నెలల�\n"
-"సంవత�సరమ�ల�"
+"గమనిక: లేబ�ల� నామమ�నంద� ఉన�న క�రిందిగీత మెనూ నంద� సంభందిత గ�ర�తింప�దారి గా ఉపయోగపడ�త�ంది."
 
-#: ../filter/filter.glade.h:21
-#| msgid "a time relative to the current time"
+#: ../mail/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "వర�ణమ�"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
+#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
+#: ../modules/mail/e-mail-shell-view-private.c:963
+msgid "Inbox"
+msgstr "ఇన�‌బాక�స�"
+
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+msgid "Drafts"
+msgstr "డ�రాఫ�ట�"
+
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+msgid "Outbox"
+msgstr "అవ�ట�‌బాక�స�"
+
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+msgid "Sent"
+msgstr "పంపిన"
+
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:574
+msgid "Templates"
+msgstr "మాదిరిల�"
+
+#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "మ�ఖ�యమైన"
+
+#. green
+#: ../mail/e-mail-migrate.c:963
+msgid "To Do"
+msgstr "చేయ�టక�"
+
+#. blue
+#: ../mail/e-mail-migrate.c:964
+msgid "Later"
+msgstr "తర�వాత"
+
+#: ../mail/e-mail-migrate.c:1110
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+msgid "Migrating..."
+msgstr "వలసపోతూ వ�న�న..."
+
+#: ../mail/e-mail-migrate.c:1143
+msgid "Migration"
+msgstr "వలసపంప�ట"
+
+#: ../mail/e-mail-migrate.c:1183
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#, c-format
+msgid "Migrating '%s':"
+msgstr "వలసపోతూవ�న�న '%s':"
+
+#: ../mail/e-mail-migrate.c:1594
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "కొత�త సంచయం సృష�టించలేక పోయింది `%s': %s"
+
+#: ../mail/e-mail-migrate.c:1622
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "సచయం `%s' న� `%s' క� నకల�తీయలేక పోయింది: %s"
+
+#: ../mail/e-mail-migrate.c:1817
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "`%s' వద�ద ఉన�న మెయిల�‌పెట�టెల కొరక� స�కాన� తీయలేకపోయింది: %s"
+
+#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+msgid "Migrating Folders"
+msgstr "సంచయాలన� వలసపంప�చ�న�నది"
+
+#: ../mail/e-mail-migrate.c:1824
 msgid ""
-"the current time\n"
-"the time you specify\n"
-"a time relative to the current time"
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"ప�రస�త�త సమయం\n"
-"మీర� తెలిపిన సమయం\n"
-"ప�రస�త�త సమయానికి సారూప�యంగా వ�న�న సమయం"
+"ఎనాల�యూషన� 1.x న�ండి ఎవాల�యూషన� మెయిల�‌పెట�టె సంచయాల యొక�క స�థానమ� మరియ� పారంపరమ� మర�చబడింది.\n"
+"\n"
+"ఎవాల�యూషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి ఒర�ప�తో ఉండండి..."
 
-#: ../filter/rule-editor.c:381
-msgid "Add Rule"
-msgstr "నియమాన�ని జతచేయ�మ�"
+#: ../mail/e-mail-migrate.c:2027
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "పాత POP సేవిక-లో-ఉంచ� డాటా `%s' న� తెర�వలేకపోయింది: %s"
 
-#: ../filter/rule-editor.c:462
-msgid "Edit Rule"
-msgstr "నియమాన�ని సరిచేయ�మ�"
+#: ../mail/e-mail-migrate.c:2043
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "POP3 సేవిక-లో-ఉంచ� డాటా సంచయం `%s' న� సృష�టించలేక పోయింది: %s"
 
-#: ../filter/rule-editor.c:808
-msgid "Rule name"
-msgstr "నియమం నామమ�"
+#: ../mail/e-mail-migrate.c:2075
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "POP3 సేవిక-లో-ఉంచ� డాటా `%s' న� నకల�తీయ లోకపోయింది: %s"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "కూర�పరి అభీష�టాల�"
+#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "స�థానిక మెయిల� నిల�వ `%s' న� సృష�టించ�టలో విఫలమైంది: %s"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
-msgstr "మెయిల� అభీష�టాలన� ఆకృతీకరించ�మ�, రక�షణ మరియ� సందశ ప�రదర�శన తో కలిపి, ఇక�కడ"
+#: ../mail/e-mail-migrate.c:2934
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"ఎనాల�యూషన� 2.24 న�ండి ఎవాల�యూషన� మెయిల�‌పెట�టె సంచయాల యొక�క సంక�షిప�త రూపంన� sqliteక� మార�చబడింది.\n"
+"\n"
+"ఎవాల�యూషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి వోర�ప�తో వ�ండండి..."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "స�పెల�-పరిశీలనన� ఆకృతీకరించ�మ�, సంతకాల�, మరియ� సందేశ కూర�పరిని"
+#: ../mail/e-mail-migrate.c:3031
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "స�థానిక మెయిల� సంచయాలన� `%s' వద�ద సృష�టించలేక పోయింది: %s"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "మీ ఈమెయిల� ఖాతాలన� ఇక�కడ ఆకృతీకరించ�మ�"
+#: ../mail/e-mail-migrate.c:3049
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"మ�న�పటి ఎవాల�యూషన� సంస�థాపన న�ండి అమరికలన� చద�వలేక పోయింది. `ఎవాల�య�షన�/ config.xmldb' లేద� "
+"లేదా పాడైనది."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your network connection settings here"
-msgstr "మీనెట�వర�క�� అన�సంధానం అమరికలన� ఆకృతీకరించ�మ�"
+#. XXX e-error should provide a widget layout and API suitable
+#. *     for packing additional widgets to the right of the alert
+#. *     icon.  But for now, screw it.
+#: ../mail/e-mail-reader-utils.c:105
+#: ../modules/calendar/e-task-shell-view-actions.c:559
+#, fuzzy
+msgid "Do not ask me again"
+msgstr "నన�న� మళ�ళీ అడగొద�ద�."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "ఎవాల�యూషన� మెయిల�"
+#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "సంచయాన�ని నకల�తీయ�మ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "ఎవాల�యూషన� మెయిల� ఖాతా ఆకృతీకరణ సాధనమ�ల�"
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+msgid "C_opy"
+msgstr "నకల�తీయ�మ�(_o)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "ఎవాల�యూషన� మెయిల� మూలకం"
+#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "సంచయంక� కద�ప�మ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "ఎవాల�యూషన� మెయిల� కూర�పరి"
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+msgid "_Move"
+msgstr "జర�ప�(_M)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "ఎవాల�యూషన� మెయిల� కూర�పరి ఆకృతీకరణ నియంత�రిక"
+#: ../mail/e-mail-reader.c:864
+#, fuzzy
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "సందేశంన� దాయ�మ�..."
+msgstr[1] "సందేశంన� దాయ�మ�..."
+
+#. Translators: This is a part of a suggested file name
+#. * used when saving a message or multiple messages to an
+#. * mbox format, when the first message doesn't have a
+#. * Subject. The extension ".mbox" is appended to this
+#. * string, thus it will be something like "Message.mbox"
+#. * at the end.
+#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
+#: ../widgets/table/e-table-click-to-add.c:518
+#, fuzzy
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "సందేశం"
+msgstr[1] "సందేశం"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "ఎవాల�యూషన� మెయిల� అభిష�టాల నియంత�రిక"
+#: ../mail/e-mail-reader.c:1143
+msgid "A_dd Sender to Address Book"
+msgstr "చిర�నామా ప�స�తకానికి మెయిల� పంపించ�వాన�ని జతపర�చ�(_d)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Network configuration control"
-msgstr "ఎవల�యూషన� నెట�వర�క�� ఆకృతీకరణ నియంత�రణ"
+#: ../mail/e-mail-reader.c:1145
+#, fuzzy
+msgid "Add sender to address book"
+msgstr "చిర�నామా ప�స�తకానికి మెయిల� పంపించ�వాన�ని జతపర�చ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
-#: ../mail/mail-component.c:793
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "మెయిల�"
+#: ../mail/e-mail-reader.c:1150
+msgid "Check for _Junk"
+msgstr "నిరర�ధకం కొరక� పరిశీలించ�మ�(_J)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:490
-msgid "Mail Accounts"
-msgstr "మెయిల� ఖాతాల�"
+#: ../mail/e-mail-reader.c:1152
+msgid "Filter the selected messages for junk status"
+msgstr "నిరర�ధకమైన వాటి స�థితి కొర� ఎంపికచేసిన సందేశాలన� వడపోయ�మ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:108
-msgid "Mail Preferences"
-msgstr "మెయిల� అభీష�టాల�"
+#: ../mail/e-mail-reader.c:1157
+msgid "_Copy to Folder..."
+msgstr "సంచయంక� నకల�తీయ�మ�(_C)..."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Network Preferences"
-msgstr "నెట�వర�క�� అభీష�టాల�"
+#: ../mail/e-mail-reader.c:1159
+msgid "Copy selected messages to another folder"
+msgstr "ఎంచ�క�న�న సందేశాలన� వేరే సంచయానికి నకల� తీయ�మ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:297
-msgid "_Mail"
-msgstr "మెయిల�(_M)"
+#: ../mail/e-mail-reader.c:1164
+msgid "_Delete Message"
+msgstr "సందేశాన�ని తొలగించ�మ�(_D)"
 
-#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
-#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
-msgid "_Forward"
-msgstr "మ�ంద�క�పంప�(_F)"
+#: ../mail/e-mail-reader.c:1166
+msgid "Mark the selected messages for deletion"
+msgstr "ఎంచ�క�న�న సందేశాలన� తొలగించ�టక� గ�ర�త�పెట�ట�మ�"
 
-#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../mail/e-mail-reader.c:1171
+msgid "Filter on Mailing _List..."
+msgstr "మెయిలింగ� జాబితా పై వడపోత(_L)..."
+
+#: ../mail/e-mail-reader.c:1173
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "ఈ మెయిలింగ� జాబితాక� సందేశాలన� వడపోయ�టక� నియమాన�ని సృష�టించ�మ�"
+
+#: ../mail/e-mail-reader.c:1178
+msgid "Filter on _Recipients..."
+msgstr "స�వీకరించ�వారి పై వడపోత(_R)..."
+
+#: ../mail/e-mail-reader.c:1180
+msgid "Create a rule to filter messages to these recipients"
+msgstr "ఈ స�వీకరణదార�ల క� సందేశాలన� వడపోయ�టక� నియమం సృష�టించ�మ�"
+
+#: ../mail/e-mail-reader.c:1185
+msgid "Filter on Se_nder..."
+msgstr "పంపైవాని పై వడపోత(_n)..."
+
+#: ../mail/e-mail-reader.c:1187
+msgid "Create a rule to filter messages from this sender"
+msgstr "ఈ పంపకందారి న�ండి వచ�చ� సందేశాలన� వడపోయ�టక� నియమాన�ని సృష�టించ�మ�"
+
+#: ../mail/e-mail-reader.c:1192
+msgid "Filter on _Subject..."
+msgstr "సంగతి పై వడపోత(_S)..."
+
+#: ../mail/e-mail-reader.c:1194
+msgid "Create a rule to filter messages with this subject"
+msgstr "ఈ సంగతితో సందేశాలన� వడపోయ�టక� నియమాన�ని సృష�టించ�మ�"
+
+#: ../mail/e-mail-reader.c:1199
+msgid "A_pply Filters"
+msgstr "వడపోతలన� ఆపాదించ�మ�(_p)"
+
+#: ../mail/e-mail-reader.c:1201
+msgid "Apply filter rules to the selected messages"
+msgstr "ఎంపికచేసిన సందేశాలక� వడపోత నియమాలన� ఆపాదించ�మ�"
+
+#: ../mail/e-mail-reader.c:1206
+msgid "_Find in Message..."
+msgstr "సందేశంలో కన�గొన�మ�(_F)..."
+
+#: ../mail/e-mail-reader.c:1208
+msgid "Search for text in the body of the displayed message"
+msgstr "ప�రదర�శించబడిన సందేశం మ�ఖ�యభాగమ�లో పాఠ�యమ�న� వెత�క�మ�"
+
+#: ../mail/e-mail-reader.c:1213
+msgid "_Clear Flag"
+msgstr "ప�లాగ� శ�బ�రంచేయ�మ�(_C)"
+
+#: ../mail/e-mail-reader.c:1215
+#, fuzzy
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "ఎంపికచేసన సందేశం న�ండి కొత�త కర�తవ�యాన�ని సృష�టించండి"
+
+#: ../mail/e-mail-reader.c:1220
+msgid "_Flag Completed"
+msgstr "ఫ�లాగ� పూర�తయినది(_F)"
+
+#: ../mail/e-mail-reader.c:1222
+#, fuzzy
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "ఎంపికచేసిన సందేశం లాగా అదే తంతిలోని అన�ని సందేశాలన� ఎంపికచేయ�మ�"
+
+#: ../mail/e-mail-reader.c:1227
+msgid "Follow _Up..."
+msgstr "అన�సరించ�(_U)..."
+
+#: ../mail/e-mail-reader.c:1229
+#, fuzzy
+msgid "Flag the selected messages for follow-up"
+msgstr "అన�సరించ�టక� ఎంపికచేసిన సందేశాలన� ప�లాగ� చేయ�మ�"
+
+#: ../mail/e-mail-reader.c:1234
+msgid "_Attached"
+msgstr "జతపర�చిన(_A)"
+
+#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+msgid "Forward the selected message to someone as an attachment"
+msgstr "ఎంచ�క�న�న సందేశాన�ని అన�బంధమ�గా ఒకరికి మ�ంద�క� పంప�మ�"
+
+#: ../mail/e-mail-reader.c:1241
+#, fuzzy
+msgid "Forward As _Attached"
+msgstr "iక�యాలెండర� గా మ�ంద�క� పంపించ�(_F)"
+
+#: ../mail/e-mail-reader.c:1248
+msgid "_Inline"
+msgstr "ఇన�‌లైన�(_I)"
+
+#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+msgid "Forward the selected message in the body of a new message"
+msgstr "ఎంచ�క�న�న సందేశాన�ని కొత�త సందేశమ�లో మ�ఖ�యభాగమ�లో మ�ంద�క� పంప�మ�"
+
+#: ../mail/e-mail-reader.c:1255
+#, fuzzy
+msgid "Forward As _Inline"
+msgstr "మ�ంద�క�పంప� శైలి(_F):"
+
+#: ../mail/e-mail-reader.c:1262
+msgid "_Quoted"
+msgstr "కోటెడ�(_Q)"
+
+#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+msgid "Forward the selected message quoted like a reply"
+msgstr "ప�రత�య�త�రరంగా కోట� చేసి ఎంపికచేసిన సందేశాన�ని మ�ంద�క�పంప�"
+
+#: ../mail/e-mail-reader.c:1269
+#, fuzzy
+msgid "Forward As _Quoted"
+msgstr "మ�ంద�క�పంప� శైలి(_F):"
+
+#: ../mail/e-mail-reader.c:1276
+msgid "_Load Images"
+msgstr "చిత�రమ�లన� నింప�మ�(_L)"
+
+#: ../mail/e-mail-reader.c:1278
+msgid "Force images in HTML mail to be loaded"
+msgstr "HTML మెయిల� నంద� నింప�టక� చిత�రమ�లన� బలవంతపెట�ట�మ�"
+
+#: ../mail/e-mail-reader.c:1283
+msgid "_Important"
+msgstr "మ�ఖ�యమైన(_I)"
+
+#: ../mail/e-mail-reader.c:1285
+msgid "Mark the selected messages as important"
+msgstr "ఎంచ�క�న�న సందేశాలన� మ�ఖ�యమైనవిగా గ�ర�త�పెట�ట�మ�"
+
+#: ../mail/e-mail-reader.c:1290
+msgid "_Junk"
+msgstr "నిరర�ధకం(_J)"
+
+#: ../mail/e-mail-reader.c:1292
+msgid "Mark the selected messages as junk"
+msgstr "ఎంచిన సందేశాలన� నిరర�దకమైన వాటిగా గ�ర�త�ంచ�మ�"
+
+#: ../mail/e-mail-reader.c:1297
+msgid "_Not Junk"
+msgstr "నిరర�ధకంకాద�(_N)"
+
+#: ../mail/e-mail-reader.c:1299
+msgid "Mark the selected messages as not being junk"
+msgstr "ఎంచిన సందేశాలన� నిరర�ధకంకాని వాటివలె గ�ర�త�ంచ�మ�"
+
+#: ../mail/e-mail-reader.c:1304
+msgid "_Read"
+msgstr "చద�వ�మ�(_R)"
+
+#: ../mail/e-mail-reader.c:1306
+msgid "Mark the selected messages as having been read"
+msgstr "ఎంచ�క�న�న సందేశాలన� చదవబదినవిగా గ�ర�త�పెట�ట�మ�"
+
+#: ../mail/e-mail-reader.c:1311
+msgid "Uni_mportant"
+msgstr "సాధారణమైన(_m)"
+
+#: ../mail/e-mail-reader.c:1313
+msgid "Mark the selected messages as unimportant"
+msgstr "ఎంచ�క�న�న సందేశాల� మ�ఖ�యమ� కానివిగా గ�ర�త�పెట�ట�"
+
+#: ../mail/e-mail-reader.c:1318
+msgid "_Unread"
+msgstr "చదవక�ండా ఉన�నవి(_U)"
+
+#: ../mail/e-mail-reader.c:1320
+msgid "Mark the selected messages as not having been read"
+msgstr "ఎంచ�క�న�న సందేశాల� చదవబడనివిగా గ�ర�త�పెట�ట�"
+
+#: ../mail/e-mail-reader.c:1325
+msgid "_Edit as New Message..."
+msgstr "కొత�త సందేశం లాగా సరిచేయ�మ�(_E)..."
+
+#: ../mail/e-mail-reader.c:1327
+msgid "Open the selected messages in the composer for editing"
+msgstr "ఎంపికచేసిన సందేశాలన� కూర�పరినంద� సరిచేయ�ట కొరక� తెర�వ�మ�"
+
+#: ../mail/e-mail-reader.c:1332
+msgid "Compose _New Message"
+msgstr "కొత�త సందేశం న� కూర�చ�మ�(_N)"
+
+#: ../mail/e-mail-reader.c:1334
+msgid "Open a window for composing a mail message"
+msgstr "మెయిల� సందేశాన�ని కూర�చ�టక� విండోన� తెర�వ�మ�"
+
+#: ../mail/e-mail-reader.c:1339
+msgid "_Open in New Window"
+msgstr " కొత�త గవాక�షమ� లో తెర�వ�మ�(_O)"
+
+#: ../mail/e-mail-reader.c:1341
+msgid "Open the selected messages in a new window"
+msgstr "ఎంచ�క�న�న సందేశాలన� కొత�త గవాక�షమ�లో తెర�వ�మ�"
+
+#: ../mail/e-mail-reader.c:1346
+msgid "_Move to Folder..."
+msgstr "సంచయంక� కద�ప�మ�(_M)..."
+
+#: ../mail/e-mail-reader.c:1348
+msgid "Move selected messages to another folder"
+msgstr "ఎంచ�క�న�న సందేశాలన� వేరొక సంచయానికి జర�ప�మ�"
+
+#: ../mail/e-mail-reader.c:1353
+msgid "_Next Message"
+msgstr "తర�వాతి సందేశం(_N)"
+
+#: ../mail/e-mail-reader.c:1355
+msgid "Display the next message"
+msgstr "తర�వాతి సందేశాన�ని ప�రదర�శించ�మ�"
+
+#: ../mail/e-mail-reader.c:1360
+msgid "Next _Important Message"
+msgstr "తర�వాతి మ�ఖ�య సందేశం(_I)"
+
+#: ../mail/e-mail-reader.c:1362
+msgid "Display the next important message"
+msgstr "తర�వాతి మ�ఖ�య సందేశాన�ని ప�రదర�శించ�మ�"
+
+#: ../mail/e-mail-reader.c:1367
+msgid "Next _Thread"
+msgstr "తర�వాతి తంతి(_T)"
+
+#: ../mail/e-mail-reader.c:1369
+msgid "Display the next thread"
+msgstr "తర�వాతి తంతికి ప�రదర�శించ�మ�"
+
+#: ../mail/e-mail-reader.c:1374
+msgid "Next _Unread Message"
+msgstr "తర�వాతి చదవబడని సందేశం(_U)"
+
+#: ../mail/e-mail-reader.c:1376
+msgid "Display the next unread message"
+msgstr "తర�వాతి చదవబడని సందేశాన�ని ప�రదర�శించ�మ�"
+
+#: ../mail/e-mail-reader.c:1381
+msgid "_Previous Message"
+msgstr "పూర�వప� సందేశం(_P)"
+
+#: ../mail/e-mail-reader.c:1383
+msgid "Display the previous message"
+msgstr "పూర�వప� సందేశాన�ని ప�రదర�శించ�మ�"
+
+#: ../mail/e-mail-reader.c:1388
+msgid "Pr_evious Important Message"
+msgstr "పూర�వప� మ�ఖ�య సందేశం(_e)"
+
+#: ../mail/e-mail-reader.c:1390
+msgid "Display the previous important message"
+msgstr "పూర�వప� మ�ఖ�య సందేశాన�ని ప�రదర�శించ�మ�"
+
+#: ../mail/e-mail-reader.c:1395
+msgid "P_revious Unread Message"
+msgstr "పూర�వప� చదవబడిన సందేశం(_r)"
+
+#: ../mail/e-mail-reader.c:1397
+msgid "Display the previous unread message"
+msgstr "పూర�వప� చదవబడని సందేశాన�ని ప�రదర�శించ�మ�"
+
+#: ../mail/e-mail-reader.c:1404
+msgid "Print this message"
+msgstr "ఈ సందేశాన�ని మ�ద�రించ�మ�"
+
+#: ../mail/e-mail-reader.c:1411
+msgid "Preview the message to be printed"
+msgstr "మ�ద�రించాల�సిన సందేశాన�ని ప�న:దర�శనం చేయ�మ�"
+
+#: ../mail/e-mail-reader.c:1416
+msgid "Re_direct"
+msgstr "తిరిగినిర�దేశించ�మ�(_d)"
+
+#: ../mail/e-mail-reader.c:1418
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "ఎంపికచేసిన సందేశంన� ఎవరోఒకిరికి తిరిగినిర�దేశించ�మ�(bounce)"
+
+#: ../mail/e-mail-reader.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-attachment-handler.c:141
+msgid "Reply to _All"
+msgstr "అందరికి ప�రత�య�త�తరమ�ఇవ�వ�(_A)"
+
+#: ../mail/e-mail-reader.c:1425
+#, fuzzy
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "ఎంపికచేసిన సందేశం యొక�క స�వీకరణదార�ల క� ఒక ప�రత�య�త�తరమ� కూర�చ�మ�"
+
+#: ../mail/e-mail-reader.c:1430
+msgid "Reply to _List"
+msgstr "జాబితాకి ప�రత�య�త�తరం(_L)"
+
+#: ../mail/e-mail-reader.c:1432
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "ఎంపికచేసిన సందేశం యొక�క మెయిలింగ� జాబితా క� ప�రత�య�త�తరమ� కూర�చ�మ�"
+
+#: ../mail/e-mail-reader.c:1437
+#: ../modules/mail/e-mail-attachment-handler.c:148
 msgid "_Reply to Sender"
 msgstr "పంపకందార�క� ప�రత�య�త�తరం(_R)"
 
-#. Translators: This is only for multiple messages.
-#: ../mail/e-attachment-handler-mail.c:334
-#, c-format
-#| msgid "Attached message"
-#| msgid_plural "%d attached messages"
-msgid "%d attached messages"
-msgstr "%d అన�భందించిన సందేశమ�ల�"
+#: ../mail/e-mail-reader.c:1439
+msgid "Compose a reply to the sender of the selected message"
+msgstr "ఎంపికచేసన సందేశం పంపినవానికి ప�రత�య�త�తరం కూర�చ�మ�"
 
-#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "అన�భందమ�"
-msgstr[1] "అన�భందమ�"
+#: ../mail/e-mail-reader.c:1444
+#, fuzzy
+msgid "_Save as mbox..."
+msgstr "ఇలా దాయ�..."
 
-#: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:607
-#| msgid "Month View"
-msgid "Icon View"
-msgstr "ప�రతిమ దర�శనమ�"
+#: ../mail/e-mail-reader.c:1446
+#, fuzzy
+msgid "Save selected messages as an mbox file"
+msgstr "ఎంచ�క�న�న సందేశాలన� పాఠ�య దస�త�రమ�గా దాయ�మ�"
 
-#: ../mail/e-mail-attachment-bar.c:616
-#: ../widgets/misc/e-attachment-paned.c:608
-#| msgid "_List View"
-msgid "List View"
-msgstr "జాబితా దర�శనం"
+#: ../mail/e-mail-reader.c:1451
+msgid "Search Folder from Mailing _List..."
+msgstr "మెయిలింగ� జాబితా న�ండి సంచయాన�ని వెత�క�మ�..."
 
-#: ../mail/e-mail-search-bar.c:76
-#, c-format
-msgid "Matches: %d"
-msgstr "జోడీల�: %d"
+#: ../mail/e-mail-reader.c:1453
+#, fuzzy
+msgid "Create a search folder for this mailing list"
+msgstr "మెయిల� జాబితాలో వెత�క� సంచయాన�ని సృష�టించ�మ�"
 
-#: ../mail/e-mail-search-bar.c:520
-#| msgid "Close this window"
-msgid "Close the find bar"
-msgstr "కన�గొన� పట�టీన� మూయ�మ�"
+#: ../mail/e-mail-reader.c:1458
+msgid "Search Folder from Recipien_ts..."
+msgstr "తీస�క�న�నవాటి న�ండి సంచయాన�ని వెత�క�మ�(_t).."
 
-#: ../mail/e-mail-search-bar.c:528
-msgid "Fin_d:"
-msgstr "కన�గొన�మ� (_d):"
+#: ../mail/e-mail-reader.c:1460
+#, fuzzy
+msgid "Create a search folder for these recipients"
+msgstr "మెయిల� స�వీకరించ�వారికి వెత�క� సంచయాన�ని సృష�టించ�మ�"
 
-#: ../mail/e-mail-search-bar.c:540
-#| msgid "Always search"
-msgid "Clear the search"
-msgstr "శోధనన� శ�భ�రపరచ�మ�"
+#: ../mail/e-mail-reader.c:1465
+msgid "Search Folder from Sen_der..."
+msgstr "పంపినదాన�ని న�ండి సంచయాన�ని వెత�క�మ�..."
 
-#: ../mail/e-mail-search-bar.c:559
-msgid "_Previous"
-msgstr "మ�ందలి(_P)"
+#: ../mail/e-mail-reader.c:1467
+#, fuzzy
+msgid "Create a search folder for this sender"
+msgstr "మెయిల� పంపించ�దానికి వెత�క� సంచయాన�ని సృష�టించ�మ�"
 
-#: ../mail/e-mail-search-bar.c:565
-msgid "Find the previous occurrence of the phrase"
-msgstr "పదమ�యొక�క మ�న�పటి సంభవాన�ని కన�గొన�మ�"
+#: ../mail/e-mail-reader.c:1472
+msgid "Search Folder from S_ubject..."
+msgstr "సంగతి న�ండి సంచయాన�ని వెత�క�మ�(_u)..."
 
-#: ../mail/e-mail-search-bar.c:573
-msgid "_Next"
-msgstr "తర�వాతి(_N)"
+#: ../mail/e-mail-reader.c:1474
+#, fuzzy
+msgid "Create a search folder for this subject"
+msgstr "ఈ విషయానికి వెత�క� సంచయాన�ని సృష�టించ�మ�"
 
-#: ../mail/e-mail-search-bar.c:579
-msgid "Find the next occurrence of the phrase"
-msgstr "పదమ� యొక�క తర�వాతి సంభవమ�న� కన�గొన�మ�"
+#: ../mail/e-mail-reader.c:1479
+msgid "_Message Source"
+msgstr "సందేశం మూలం(_M)"
 
-#: ../mail/e-mail-search-bar.c:587
-#| msgid "M_atch case"
-msgid "Mat_ch case"
-msgstr "సరిపోల� సందర�భమ� (_c)"
+#: ../mail/e-mail-reader.c:1481
+msgid "Show the raw email source of the message"
+msgstr "సందేశం మ�డివనర�ని ఈ మెయిల� ద�వారా చూప�మ�"
 
-#: ../mail/e-mail-search-bar.c:615
-msgid "Reached bottom of page, continued from top"
-msgstr "పేజీ క�రిందక� చేర�కొన�నది, పైన�ండి కొనసాగిస�త�ంది"
+#: ../mail/e-mail-reader.c:1493
+msgid "_Undelete Message"
+msgstr "సందేశాన�ని తొలగించవద�ద�(_U)"
 
-#: ../mail/e-mail-search-bar.c:637
-msgid "Reached top of page, continued from bottom"
-msgstr "పేజీ పైనక� చేర�కొన�నది, క�రింది న�ండి కొనసాగిస�త�ంది"
+#: ../mail/e-mail-reader.c:1495
+msgid "Undelete the selected messages"
+msgstr "ఎంపిక చేస�క�న�న సందేశాలని తొలగించవద�ద�"
+
+#: ../mail/e-mail-reader.c:1500
+msgid "_Normal Size"
+msgstr "సాధారణ పరిమాణం(_N)"
+
+#: ../mail/e-mail-reader.c:1502
+msgid "Reset the text to its original size"
+msgstr "పాఠ�యమ�న� అసలైన పరిమాణానికి ప�న:అమర�చ�మ�"
+
+#: ../mail/e-mail-reader.c:1507
+msgid "_Zoom In"
+msgstr "జూమ� లోపలికి(_Z)"
+
+#: ../mail/e-mail-reader.c:1509
+msgid "Increase the text size"
+msgstr "పాఠ�య పరిమాణాన�ని పెంచ�మ�"
+
+#: ../mail/e-mail-reader.c:1514
+msgid "Zoom _Out"
+msgstr "జూమ� వెల�పలకి(_O)"
+
+#: ../mail/e-mail-reader.c:1516
+msgid "Decrease the text size"
+msgstr "పాఠ�య పరిమాణాన�ని తగ�గించ�మ�"
+
+#: ../mail/e-mail-reader.c:1523
+msgid "Create R_ule"
+msgstr "సూత�రమ�న� సృష�టించ�మ�(_u)"
+
+#: ../mail/e-mail-reader.c:1530
+msgid "Ch_aracter Encoding"
+msgstr "అక�షర సంకేతరచన(_a)"
+
+#: ../mail/e-mail-reader.c:1537
+#, fuzzy
+msgid "F_orward As"
+msgstr "ఇలా పంప�మ�(_o)..."
+
+#: ../mail/e-mail-reader.c:1544
+msgid "_Go To"
+msgstr "వెళ�ళ�(_G)"
+
+#: ../mail/e-mail-reader.c:1551
+#, fuzzy
+msgid "Mar_k As"
+msgstr "ఇలా గ�ర�త�పెట�ట�(_k)"
+
+#: ../mail/e-mail-reader.c:1558
+msgid "_Message"
+msgstr "సందేశం(_M)"
+
+#: ../mail/e-mail-reader.c:1565
+msgid "_Zoom"
+msgstr "జూమ�(_Z)"
+
+#: ../mail/e-mail-reader.c:1590
+msgid "Mark for Follo_w Up..."
+msgstr "అన�సరించ�ట కొరక� గ�ర�త�ంచ�మ�(_w)..."
+
+#: ../mail/e-mail-reader.c:1598
+msgid "Mark as _Important"
+msgstr "మ�ఖ�యమైన దానివలె గ�ర�తించ�మ�(_I)"
+
+#: ../mail/e-mail-reader.c:1602
+msgid "Mark as _Junk"
+msgstr "నిరర�ధకమైన దానివలె గ�ర�తించ�మ�(_J)"
+
+#: ../mail/e-mail-reader.c:1606
+msgid "Mark as _Not Junk"
+msgstr "నిరర�ధకం కానిదానివలె గ�ర�తించ�మ�(_N)"
+
+#: ../mail/e-mail-reader.c:1610
+msgid "Mar_k as Read"
+msgstr "చదివినదానివలె గ�ర�తించ�మ�(_k)"
+
+#: ../mail/e-mail-reader.c:1614
+#, fuzzy
+msgid "Mark as Uni_mportant"
+msgstr "అమ�ఖ�యమైన దానివలె గ�ర�తించ�మ�(_i)"
+
+#: ../mail/e-mail-reader.c:1618
+msgid "Mark as _Unread"
+msgstr "చదవనిదానివలె గర�తించ�మ�(_U)"
+
+#: ../mail/e-mail-reader.c:1654
+msgid "_Caret Mode"
+msgstr "అక�షరరీతి(_C)"
+
+#: ../mail/e-mail-reader.c:1656
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "ప�రదర�శించబడిన సందేశాల మ�ఖ�యభాగమ�లో మిణ�గ�ర� మ�ల�క�న� చూపించ�మ�"
+
+#: ../mail/e-mail-reader.c:1662
+msgid "All Message _Headers"
+msgstr "అన�ని సందేశ పీఠికల�(_H)"
+
+#: ../mail/e-mail-reader.c:1664
+msgid "Show messages with all email headers"
+msgstr "ఈ మెయిల� పీఠికలతో సందేశాలన� చూప�మ�"
+
+#: ../mail/e-mail-reader.c:1897
+msgid "Unable to retrieve message"
+msgstr "సందేశాన�ని వెలికితీయలేద�."
+
+#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
+#: ../mail/mail-ops.c:1849
+#, fuzzy, c-format
+msgid "Retrieving message '%s'"
+msgstr "%s సందేశాన�ని వెలికితీస�త�ంది"
+
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:2471
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:534
+#: ../plugins/google-account-setup/google-source.c:656
+#: ../widgets/misc/e-account-tree-view.c:234
+msgid "Default"
+msgstr "అప�రమేయం"
+
+#: ../mail/e-mail-reader.c:2592
+#: ../modules/mail/e-mail-attachment-handler.c:134
+msgid "_Forward"
+msgstr "మ�ంద�క�పంప�(_F)"
+
+#: ../mail/e-mail-reader.c:2593
+msgid "Forward the selected message to someone"
+msgstr "ఎంచ�క�న�న సందేశాన�ని ఒకరికి మ�ంద�క� పంప�మ�"
+
+#: ../mail/e-mail-reader.c:2637 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:753
+msgid "Delete"
+msgstr "తొలగించ�"
+
+#: ../mail/e-mail-reader.c:2641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "తర�వాతి"
+
+#: ../mail/e-mail-reader.c:2645
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "పూర�వప�"
+
+#: ../mail/e-mail-reader.c:2649 ../mail/mail-dialogs.ui.h:18
+msgid "Reply"
+msgstr "సమాధానం"
+
+#: ../mail/e-mail-tag-editor.c:292
+msgid "Flag to Follow Up"
+msgstr "అన�సరించ�టక� ప�లాగ�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:309
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
+#: ../modules/addressbook/ldap-config.ui.h:10
 msgid "No encryption"
 msgstr "ఎన�క�రిప�షన� లేద�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:313
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "TLS encryption"
 msgstr "TLS ఎన�క�రిప�షన�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:317
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "SSL ఎన�క�రిప�షన�"
 
-#: ../mail/em-account-editor.c:408
+#: ../mail/em-account-editor.c:594
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s లైసెన�స� ఒప�పందం"
 
-#: ../mail/em-account-editor.c:415
+#: ../mail/em-account-editor.c:601
 #, c-format
 msgid ""
 "\n"
@@ -10600,121 +10381,159 @@ msgstr ""
 "%s కొరక� క�రింద ప�రదర�శించబడిన లైసెన�స� ఒప�పందంన�\n"
 "జాగ�రత�తగా చదవండి మరియ� దానిని ఆమోదించ�టక� చెక�‌బాక�స�న� గ�ర�త�పెట�టండి\n"
 
-#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
-#: ../mail/em-vfolder-rule.c:513
-msgid "Select Folder"
-msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#, fuzzy
+msgctxt "mail-signature"
+msgid "None"
+msgstr "�దికాద�"
 
-#: ../mail/em-account-editor.c:797
+#: ../mail/em-account-editor.c:965
 msgid "Never"
 msgstr "ఎప�పటికివద�ద�"
 
-#: ../mail/em-account-editor.c:798
+#: ../mail/em-account-editor.c:966
 msgid "Always"
 msgstr "యెల�లప�ప�డ�"
 
-#: ../mail/em-account-editor.c:799
+#: ../mail/em-account-editor.c:967
 msgid "Ask for each message"
 msgstr "ప�రతి సందేశం కొరక� అడ�గ�మ�"
 
-#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
-msgid "Identity"
-msgstr "గ�ర�తింప�"
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#, fuzzy
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "�దికాద�"
 
-#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
+#: ../mail/em-account-editor.c:2061
+msgid "Mail Configuration"
+msgstr "మెయిల� ఆకృతీకరణ"
+
+#: ../mail/em-account-editor.c:2062
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"ఎవాల�యూషన� మెయిల� ఆకృతీకరణ సహాయకిక� స�వాగతం.\n"
+"\n"
+"ప�రారంభించ�టక� \"మ�ంద�క�పంప�\"న� నొక�క�మ�. "
+
+#: ../mail/em-account-editor.c:2065
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"దయచేసి క�రింద మీ నామమ� మరియ� ఈమెయిల� చిర�నామాన� ప�రవేశపెట�ట�మ�. క�రిందన ఉన�న \"�చ�చిక\" క�షేత�రాల� "
+"నింపవలిసిన అవసరంలేద�, మీర� ఈ సమాచారంన� కూడా మీర� పంపే ఈమెయిల� నంద� చేర�చాలి అన�క�ంటే తప�ప."
+
+#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
+#: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "మెయిల� న� తీస�క�ంటోంది"
 
-#: ../mail/em-account-editor.c:2216
+#: ../mail/em-account-editor.c:2068
+msgid "Please configure the following account settings."
+msgstr "దయచేసి క�రింది ఖాతా అమరికలన� ఆకృతీకరించ�మ�."
+
+#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+msgid "Sending Email"
+msgstr "ఈమెయిల� పంపిస�త�న�నది"
+
+#: ../mail/em-account-editor.c:2071
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"మీర� మెయిల� పంపించ� విధానం గ�రించి దయచేసి సమాచారంన� ప�రవేశపెట�టండి. మీక� ఖచ�చితంగా తెలియకపోతే, మీ సిస�టమ� "
+"నిర�వాహక�ని గాని లేక ఇంటర�నెట� సేవా దార�నిగాని అడగండి."
+
+#: ../mail/em-account-editor.c:2073
+msgid "Account Management"
+msgstr "ఖాతా నిర�వహణ"
+
+#: ../mail/em-account-editor.c:2074
+#, fuzzy
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"క�రింది ఖాళినంద� ఈ ఖాతా కొరక� దయచేసి విశదీకృత నామమ�న� ప�రవేశపెట�ట�మ�. ఈ నామమ� ప�రదర�శించ�టక� మాత�రమే "
+"వ�పయోగించబడ�త�ంది."
+
+#: ../mail/em-account-editor.c:2078
+msgid "Done"
+msgstr "అయినది"
+
+#: ../mail/em-account-editor.c:2079
+#, fuzzy
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"ధన�యవాదమ�ల�, మీ మెయిల� ఆకృతీకరణ పూర�తైనది.\n"
+"\n"
+"మీర� ఎవాల�యూషన� ఉపయోగించి మెయిల�స� న� పంప�టక� మరియ�\n"
+"స�వీకరించ�టక� ఇప�ప�డ� సిద�దంగా ఉన�నార�.\n"
+"\n"
+"మీ అమరికలన� దాయ�టక� \"ఆపాదించ�\" న� నొక�కండి."
+
+#: ../mail/em-account-editor.c:2520
 msgid "Check for _new messages every"
 msgstr "కొత�త సందేశాల కొరక� వెత�క�మ� (_n)"
 
-#: ../mail/em-account-editor.c:2224
+#: ../mail/em-account-editor.c:2528
 msgid "minu_tes"
 msgstr "నిమిషాల�(_t)"
 
-#: ../mail/em-account-editor.c:2420 ../mail/mail-config.glade.h:138
-msgid "Sending Email"
-msgstr "ఈమెయిల� పంపిస�త�న�నది"
-
-#: ../mail/em-account-editor.c:2479 ../mail/mail-config.glade.h:73
-msgid "Defaults"
-msgstr "అప�రమేయాల�"
-
-#. Security settings
-#: ../mail/em-account-editor.c:2545 ../mail/mail-config.glade.h:133
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
 msgid "Security"
 msgstr "రక�షణ"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2582 ../mail/em-account-editor.c:2677
+#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
 msgid "Receiving Options"
 msgstr "�చ�చికాలన� తిరిగిపొంద�త�ంది"
 
-#: ../mail/em-account-editor.c:2583 ../mail/em-account-editor.c:2678
+#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
 msgid "Checking for New Messages"
 msgstr "కొత�త సందేశాల కొరక� పరిశీలిస�త�న�నది"
 
-#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3418
 msgid "Account Editor"
 msgstr "ఖాతా కూర�పరి"
 
-#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:3418
 msgid "Evolution Account Assistant"
 msgstr "ఎవాల�యూషన� ఖాతా సహాయక�డ�"
 
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:426
-msgid "[Default]"
-msgstr "[అప�రమేయ]"
-
-#: ../mail/em-account-prefs.c:483
-msgid "Account name"
-msgstr "ఖాతా నామమ�"
-
-#: ../mail/em-account-prefs.c:485
-msgid "Protocol"
-msgstr "నియమం"
-
-#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
-#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
-msgid "Unnamed"
-msgstr "నామమ�లేని"
-
-#: ../mail/em-composer-prefs.c:961
-msgid "Language(s)"
-msgstr "భాష(ల�)"
-
-#: ../mail/em-composer-prefs.c:994
-msgid "Add signature script"
-msgstr "సతకం లిపిని జతపర�చ�మ�"
-
-#: ../mail/em-composer-prefs.c:1036
-msgid "Signature(s)"
-msgstr "సంతకమ�(ల�)"
-
-#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
-msgid "-------- Forwarded Message --------"
-msgstr "-------- మ�ంద�క� పంపబడినసందేశం --------"
-
-#: ../mail/em-composer-utils.c:1585
-msgid "No destination address provided, forward of the message has been cancelled."
-msgstr "� గమ�యస�థానప� చిర�నామా అందివ�వలేద�, సందేశమ�యొక�క కొనసాగింప� రద�దైనది."
+#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
+#: ../mail/em-composer-utils.c:1578
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr ""
 
-#: ../mail/em-composer-utils.c:1591
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "ఉపయోగించ�టక� � ఖాతా కనబడలేద�, సందేశమ�యొక�క కొనసాగింప� రద�దైనది."
+#. Translators: %s is the subject of the email message
+#: ../mail/em-composer-utils.c:1626
+#, fuzzy, c-format
+msgid "Delivery Notification for: \"%s\""
+msgstr "మెయిల� ప�రకటన లక�షణాల�"
 
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:1950
 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:2105
+#: ../mail/em-composer-utils.c:1997
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10722,13 +10541,21 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone} నాడ�, ${Sender} వ�రాశార�:"
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2141
 msgid "-----Original Message-----"
 msgstr "-----వాస�తన సందేశం-----"
 
-#: ../mail/em-filter-editor.c:172
-msgid "_Filter Rules"
-msgstr "వడపోత నియమాల�(_F)"
+#: ../mail/em-composer-utils.c:2322
+msgid "Posting destination"
+msgstr "గమ�యాన�ని పోస�ట�చేస�త�న�నది"
+
+#: ../mail/em-composer-utils.c:2323
+msgid "Choose folders to post the message to."
+msgstr "సందేశాన�ని పోస�ట�చేయ�టక� సంచయాలన� ఎంచ�కొన�మ�."
+
+#: ../mail/em-filter-folder-element.c:258
+msgid "Select Folder"
+msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -10751,10 +10578,6 @@ msgstr "బీప�"
 msgid "Completed On"
 msgstr "పై మ�గించబడింది"
 
-#: ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "సంచయాన�ని నకల�తీయ�మ�"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr " తారీఖ� తీస�కొనబడినది"
@@ -10763,14 +10586,6 @@ msgstr " తారీఖ� తీస�కొనబడినది"
 msgid "Date sent"
 msgstr "తారీఖ� పంపబడినది"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:765
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "తొలగించ�"
-
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "తొలగించబడింది"
@@ -10816,14 +10631,9 @@ msgid "Follow Up"
 msgstr "అన�సరించ�"
 
 #: ../mail/em-filter-i18n.h:29
-#| msgid "Forward"
 msgid "Forward to"
 msgstr "దీనికి ఫార�వార�డ�చేయి"
 
-#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
-msgid "Important"
-msgstr "మ�ఖ�యమైన"
-
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "ఇక తర�వాత"
@@ -10848,8 +10658,7 @@ msgstr "అమర�చ లేద�"
 msgid "is set"
 msgstr "అమర�చ బడింది"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
 msgid "Junk"
 msgstr "నిరర�దకమైన"
 
@@ -10886,14 +10695,9 @@ msgid "Message is not Junk"
 msgstr "సందేశం నిరర�ధకమైనది కాద�"
 
 #: ../mail/em-filter-i18n.h:50
-#| msgid "Message contains"
 msgid "Message Location"
 msgstr "సందేశం స�థానమ�"
 
-#: ../mail/em-filter-i18n.h:51
-msgid "Move to Folder"
-msgstr "సంచయంక� కద�ప�మ�"
-
 #: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "ప�రోగ�రామ� క� పైప�"
@@ -10902,8 +10706,8 @@ msgstr "ప�రోగ�రామ� క� పైప�"
 msgid "Play Sound"
 msgstr "సౌండ� న� నడ�ప�మ�"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
 msgid "Read"
 msgstr "చద�వ�మ�"
 
@@ -10979,75 +10783,19 @@ msgstr "తో ప�రారంభం"
 msgid "Stop Processing"
 msgstr "కార�యక�రమాన�ని ఆప�మ�"
 
-#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1112
-msgid "Subject"
-msgstr "సంగతి"
-
 #: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "అమర�చని స�థితి"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:530
 msgid "Then"
 msgstr "అప�ప�డ�"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:561
 msgid "Add Ac_tion"
 msgstr "చర�యన� జతచేయ�మ�(_t)"
 
-#: ../mail/em-folder-browser.c:194
-msgid "C_reate Search Folder From Search..."
-msgstr "శోధన కొరక� శోధన సంచయాన�ని సృష�టించ�మ�(_r)..."
-
-#: ../mail/em-folder-browser.c:219
-msgid "All Messages"
-msgstr "అన�ని సందేశాల�"
-
-#: ../mail/em-folder-browser.c:220
-msgid "Unread Messages"
-msgstr "చద�వని సందేశాల�"
-
-#: ../mail/em-folder-browser.c:222
-msgid "No Label"
-msgstr "లేబ�ల� లేద�"
-
-#: ../mail/em-folder-browser.c:229
-msgid "Read Messages"
-msgstr "చదివిన సందేశాల�"
-
-#: ../mail/em-folder-browser.c:230
-msgid "Recent Messages"
-msgstr "ఇటీవలి సందేశాల�"
-
-#: ../mail/em-folder-browser.c:231
-msgid "Last 5 Days' Messages"
-msgstr "గత 5 రోజ�ల' సందేశాల�"
-
-#: ../mail/em-folder-browser.c:232
-msgid "Messages with Attachments"
-msgstr "అన�భందమ�లతో సందేశాల�"
-
-#: ../mail/em-folder-browser.c:233
-msgid "Important Messages"
-msgstr "మ�ఖ�యమైన సందేశాల�"
-
-#: ../mail/em-folder-browser.c:234
-msgid "Messages Not Junk"
-msgstr "నిరర�ధకమ�కాని సందేశాల�"
-
-#: ../mail/em-folder-browser.c:1194
-msgid "Account Search"
-msgstr "ఖాతా శోధన"
-
-#: ../mail/em-folder-browser.c:1256
-msgid "All Account Search"
-msgstr "అన�ని ఖాతాల శోధన"
-
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
@@ -11073,64 +10821,49 @@ msgstr "కేటాయింప� వినియోగమ� (%s):"
 msgid "Quota usage"
 msgstr "కోటా వ�పయోగం:"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
-#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
-#: ../mail/mail-component.c:608
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "ఇన�‌బాక�స�"
-
-#: ../mail/em-folder-properties.c:390
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../mail/em-folder-properties.c:399
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "సంచయం లక�షణాల�"
 
-#: ../mail/em-folder-selection-button.c:120
+#: ../mail/em-folder-selection-button.c:75
 msgid "<click here to select a folder>"
 msgstr "<సంచయం న� ఎంపికచేస�కొన�టక� ఇక�కడ నొక�కండి>"
 
-#: ../mail/em-folder-selector.c:249
+#: ../mail/em-folder-selector.c:266
 msgid "C_reate"
 msgstr "సృష�టించ�మ� (_r)"
 
-#: ../mail/em-folder-selector.c:253
+#: ../mail/em-folder-selector.c:270
 msgid "Folder _name:"
 msgstr "సంచయం నామమ�(_n):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
-#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
+#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
+#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
 msgid "Search Folders"
 msgstr "సంచయాలన� శోధించ�మ�"
 
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
 msgid "UNMATCHED"
 msgstr "జతకాని"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
-msgid "Drafts"
-msgstr "డ�రాఫ�ట�"
-
-#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "మాదిరిల�"
-
-#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
-msgid "Outbox"
-msgstr "అవ�ట�‌బాక�స�"
-
-#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
-msgid "Sent"
-msgstr "పంపిన"
-
-#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
+#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
 msgid "Loading..."
 msgstr "నింపబడ�త�న�న..."
 
+#: ../mail/em-folder-tree.c:188
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "\"%s\" నందలి సంచయాల స�కానింగ�"
+
+#: ../mail/em-folder-tree.c:601
+msgid "Folder names cannot contain '/'"
+msgstr "సంచయనామమ�ల� '/' న� కలిగిఉండలేవ�"
+
 #. Translators: This is the string used for displaying the
 #. * folder names in folder trees. The first "%s" will be
 #. * replaced by the folder's name and "%u" will be replaced
@@ -11145,346 +10878,142 @@ msgstr "నింపబడ�త�న�న..."
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:318
+#: ../mail/em-folder-tree.c:1083
 #, c-format
-#| msgctxt "folder-display"
-#| msgid "%s (%u)"
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:727
+#: ../mail/em-folder-tree.c:1289
 msgid "Mail Folder Tree"
 msgstr "మెయిల� సంచయం వృక�షం"
 
-#: ../mail/em-folder-tree.c:886
+#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Moving folder %s"
 msgstr "కద�ల�త�న�న సంచయం %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying folder %s"
 msgstr "నకల�తీయ�త�న�న సంచయం %s"
 
-#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
+#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "సందేశాలన� సంచయం %s లోకి కద�ప�త�న�నది"
 
-#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
+#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "సందేశాలన� సంచయం %s లోకి కద�ప�త�న�నది"
 
-#: ../mail/em-folder-tree.c:912
+#: ../mail/em-folder-tree.c:1515
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "సందేశమ�(ల)న� పైస�థాయి నిల�వక� వద�లలేమ�"
 
-#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
-msgid "_Copy to Folder"
-msgstr "సంచయంక� నకల�తీయ�మ�(_C)"
-
-#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
-msgid "_Move to Folder"
-msgstr "సంచయంక� నకల�తీయ�మ�(_M)"
-
-#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
-msgid "_Move"
-msgstr "జర�ప�(_M)"
-
-#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
-msgid "Cancel _Drag"
-msgstr "లాగినదానిని రద�ద�చేయ�మ�(_D)"
-
-#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "\"%s\" నందలి సంచయాల స�కానింగ�"
-
-#: ../mail/em-folder-tree.c:2107
-msgid "Open in _New Window"
-msgstr "కొత�త విండో నంద� తెర�వ�మ�(_N)"
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2112
-msgid "_New Folder..."
-msgstr "కొత�త సంచయం(_N)..."
-
-#: ../mail/em-folder-tree.c:2115
-msgid "_Move..."
-msgstr "కద�ప�మ�(_M)..."
-
-#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh"
-msgstr "రీఫ�రెష�(_f)"
-
-#: ../mail/em-folder-tree.c:2124
-msgid "Fl_ush Outbox"
-msgstr "అవ�ట�‌బాక�స�  న� త�డిచివేయ�మ�(_u)"
-
-#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
-msgid "_Empty Trash"
-msgstr "చెత�తక�ండీని ఖాళీచేయ�మ�(_E)"
-
-#: ../mail/em-folder-tree.c:2232
-msgid "_Unread Search Folder"
-msgstr "చదవని శోధన సంచయం (_U)"
-
-#: ../mail/em-folder-utils.c:99
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "`%s' న�ండి `%s' క� నకల�తీయ�చ�న�నది"
-
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:302
-msgid "Select folder"
-msgstr "సంచయంన� ఎంపికచేస�కొన�మ�"
+#: ../mail/em-folder-utils.c:386
+#, fuzzy
+msgid "Move Folder To"
+msgstr "సంచయం న� ఇక�కడికి జర�ప�మ�(_M)..."
 
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
-msgid "C_opy"
-msgstr "నకల�తీయ�మ�(_o)"
+#: ../mail/em-folder-utils.c:386
+#, fuzzy
+msgid "Copy Folder To"
+msgstr "సంచయాన�ని ఇక�కడికి నకల� తీయ�మ�(_C)"
 
-#: ../mail/em-folder-utils.c:537
-#: ../plugins/groupwise-features/share-folder-common.c:144
+#: ../mail/em-folder-utils.c:507
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "సంచయం `%s' న� సృష�టించ�ట"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
-msgid "Create folder"
+#: ../mail/em-folder-utils.c:670
+#, fuzzy
+msgid "Create Folder"
 msgstr "సంచయంన� సృష�టించ�ట"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../mail/em-folder-utils.c:671
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "సంచయంన� ఎక�కడ సృష�టించాలో తెలియజేయ�మ�:"
 
-#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
-msgid "Mail Deletion Failed"
-msgstr "మెయిల� న� తొలగించ�ట విఫలమైంది"
-
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "ఈ మెయిల� న� తొలగించ�టక� మీర� సరిపోవ�నంత అన�మత�లన� కలిగిలేర�."
-
-#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
-msgid "_Edit as New Message..."
-msgstr "కొత�త సందేశం లాగా సరిచేయ�మ�(_E)..."
-
-#: ../mail/em-folder-view.c:1341
-msgid "U_ndelete"
-msgstr "తొలగించని(_n)"
-
-#: ../mail/em-folder-view.c:1342
-msgid "_Move to Folder..."
-msgstr "సంచయంక� కద�ప�మ�(_M)..."
-
-#: ../mail/em-folder-view.c:1343
-msgid "_Copy to Folder..."
-msgstr "సంచయంక� నకల�తీయ�మ�(_C)..."
-
-#: ../mail/em-folder-view.c:1346
-msgid "Mar_k as Read"
-msgstr "చదివినదానివలె గ�ర�తించ�మ�(_k)"
-
-#: ../mail/em-folder-view.c:1347
-msgid "Mark as _Unread"
-msgstr "చదవనిదానివలె గర�తించ�మ�(_U)"
-
-#: ../mail/em-folder-view.c:1348
-msgid "Mark as _Important"
-msgstr "మ�ఖ�యమైన దానివలె గ�ర�తించ�మ�(_I)"
-
-#: ../mail/em-folder-view.c:1349
-msgid "Mark as Un_important"
-msgstr "అమ�ఖ�యమైన దానివలె గ�ర�తించ�మ�(_i)"
-
-#: ../mail/em-folder-view.c:1350
-msgid "Mark as _Junk"
-msgstr "నిరర�ధకమైన దానివలె గ�ర�తించ�మ�(_J)"
-
-#: ../mail/em-folder-view.c:1351
-msgid "Mark as _Not Junk"
-msgstr "నిరర�ధకం కానిదానివలె గ�ర�తించ�మ�(_N)"
-
-#: ../mail/em-folder-view.c:1352
-msgid "Mark for Follo_w Up..."
-msgstr "అన�సరించ�ట కొరక� గ�ర�త�ంచ�మ�(_w)..."
-
-#: ../mail/em-folder-view.c:1354
-msgid "_Label"
-msgstr "లెబ�ల�(_L)"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
-msgid "_None"
-msgstr "�దికాద�(_N)"
-
-#: ../mail/em-folder-view.c:1358
-msgid "_New Label"
-msgstr "కొత�త లేబ�ల�(_N)"
-
-#: ../mail/em-folder-view.c:1362
-msgid "Fla_g Completed"
-msgstr "ప�లాగ� పూర�తైనది(_g)"
-
-#: ../mail/em-folder-view.c:1363
-msgid "Cl_ear Flag"
-msgstr "ప�లాగ� న� చెరిపివేయ�మ�(_e)"
-
-#: ../mail/em-folder-view.c:1366
-msgid "Crea_te Rule From Message"
-msgstr "సందేశంన�ండి నియమాన�ని సృష�టించ�మ�(_t)"
-
-#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
-msgid "Search Folder based on _Subject"
-msgstr "అట�వంటి సంచయం సంగతి మీద ఆధారపడిఉంట�ంది(_S)"
-
-#: ../mail/em-folder-view.c:1369
-msgid "Search Folder based on Se_nder"
-msgstr "పంపినదాన�ని న�ండి సంచయాన�ని వెత�క�మ�(_n)..."
-
-#: ../mail/em-folder-view.c:1370
-msgid "Search Folder based on _Recipients"
-msgstr "తీస�క�న�నవాటి న�ండి సంచయాన�ని వెత�క�మ�(_R)"
-
-#: ../mail/em-folder-view.c:1371
-msgid "Search Folder based on Mailing _List"
-msgstr "మెయిలింగ� జాబితా న�ండి సంచయాన�ని వెత�క�మ�(_L)"
-
-#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
-msgid "Filter based on Sub_ject"
-msgstr "సంగతి మీద ఆధారపడి వడపోయ�మ�(_j)"
-
-#: ../mail/em-folder-view.c:1377
-msgid "Filter based on Sen_der"
-msgstr "పంపినవాని పై ఆధారపడి వడపోయ�మ�(_d)"
-
-#: ../mail/em-folder-view.c:1378
-msgid "Filter based on Re_cipients"
-msgstr "స�వీకరణదార�ల పై ఆధారపడి వడపోయ�మ�(_c)"
-
-#: ../mail/em-folder-view.c:1379
-msgid "Filter based on _Mailing List"
-msgstr "మెయిలింగ� జాబితా పై ఆధారపడి వడపోయ�మ�(_M)"
-
-#. default charset used in mail view
-#. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:593
-#: ../plugins/google-account-setup/google-source.c:764
-msgid "Default"
-msgstr "అప�రమేయం"
-
-#: ../mail/em-folder-view.c:2493
-msgid "Unable to retrieve message"
-msgstr "సందేశాన�ని వెలికితీయలేద�."
-
-#: ../mail/em-folder-view.c:2696
-msgid "Create _Search Folder"
-msgstr "శోధన సంచయాన�ని సృష�టించ�మ�(_S)"
-
-#: ../mail/em-folder-view.c:2697
-msgid "_From this Address"
-msgstr "ఈ చిర�నామా న�ండి(_F)"
-
-#: ../mail/em-folder-view.c:2698
-msgid "_To this Address"
-msgstr "ఈ చిర�నామాక�(_T)"
-
-#: ../mail/em-folder-view.c:3191
+#: ../mail/em-folder-utils.c:687
 #, c-format
-msgid "Click to mail %s"
-msgstr "%s క� మెయిల� చేయ�టక� నొక�క�మ�"
-
-#: ../mail/em-folder-view.c:3203
-#, c-format
-msgid "Click to call %s"
-msgstr "%s క� కాల�‌చేయ�టక� నొక�క�మ�"
-
-#: ../mail/em-folder-view.c:3208
-msgid "Click to hide/unhide addresses"
-msgstr "చిర�నామాలన� మర�గ�పరచ�టక�/బయల�పరచ�టక� నొక�కమ�"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "సంచయం \"%s\" న�ండి చందాదార�గా విరమించ�కొన�మ�"
 
-#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1547
 msgid "Unsigned"
 msgstr "సంతకంచేయని"
 
-#: ../mail/em-format-html-display.c:560
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "ఈ సందేశం సంతకంచేసినది కాద�. ఈ సందేశం దృవీకరించినదని � హామీ లోద�."
 
-#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1548
 msgid "Valid signature"
 msgstr "విల�వైన సంతకం"
 
-#: ../mail/em-format-html-display.c:561
+#: ../mail/em-format-html-display.c:104
 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:562 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1549
 msgid "Invalid signature"
 msgstr "చెల�లని సంతకం"
 
-#: ../mail/em-format-html-display.c:562
+#: ../mail/em-format-html-display.c:105
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "ఈ సందేశం యొక�క సంతకం నిర�ధారించబడిలేద�, బదిలీకరణలో మర�ప�చేందబడి ఉండవచ�చ�."
 
-#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1550
 msgid "Valid signature, but cannot verify sender"
 msgstr "విల�వైన సంతకం, అయితే పంపకందారిని నిర�దారించలేమ�"
 
-#: ../mail/em-format-html-display.c:563
+#: ../mail/em-format-html-display.c:106
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
-msgstr "ఈ సందేశం విల�వైన సంతంకం తో సంతకంచేయ బడిఉంది, అయితే సందేశం యొక�క పంపకందార� నిర�దారించబడలేద�."
+msgstr ""
+"ఈ సందేశం విల�వైన సంతంకం తో సంతకంచేయ బడిఉంది, అయితే సందేశం యొక�క పంపకందార� నిర�దారించబడలేద�."
 
-#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1551
 msgid "Signature exists, but need public key"
 msgstr "సంతకం ఉంది, అయితే పబ�లిక� కీ అవసరం"
 
-#: ../mail/em-format-html-display.c:564
+#: ../mail/em-format-html-display.c:107
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "ఈ సందేశం సంతకంత పెట�టబడిఉంది, అయితే సభందిత పబ�లిక� కీ లేద�."
 
-#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1557
 msgid "Unencrypted"
 msgstr "అన�‌ఎన�క�రిప�టెడ�"
 
-#: ../mail/em-format-html-display.c:571
+#: ../mail/em-format-html-display.c:114
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "ఈ సందేశం ఎన�క�రిప�టెడ� కాద�. ఇంటర�నెట� నంద� దీని సారం సందర�శించబడి ఉండవచ�చ�."
 
-#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1558
 msgid "Encrypted, weak"
 msgstr "ఎన�క�రిప�టెడ�, బలహీనంగా"
 
-#: ../mail/em-format-html-display.c:572
+#: ../mail/em-format-html-display.c:115
 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 "
@@ -11493,21 +11022,22 @@ msgstr ""
 "ఈ సందేశం ఎన�క�రిప�టెడ�, అయితే బలహీన ఎన�క�రిప�షన� అల�గార�ధెమ� తో. అది కష�టం కావచ�చ�, అయితే బయటివ�యక�తికి ఈ "
 "సందేశం సారాలన� అన�భవసిద�ద సమయంలో దర�శించ�ట అసాధ�యం కాకపోవచ�చ�."
 
-#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1559
 msgid "Encrypted"
 msgstr "ఎన�క�రిప�టెడ�"
 
-#: ../mail/em-format-html-display.c:573
+#: ../mail/em-format-html-display.c:116
 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:574 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1560
 msgid "Encrypted, strong"
 msgstr "ఎన�క�రిప�టెడ�, బలంగా"
 
-#: ../mail/em-format-html-display.c:574
+#: ../mail/em-format-html-display.c:117
 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 "
@@ -11516,513 +11046,239 @@ msgstr ""
 "ఈ సందేశం ఎన�క�రిప�ట� చేయబడింది, గట�టి ఎన�క�రిప�షన� అల�గార�ధెమ� తో, బయటవారికి ఈ సందేశంన� అవ�భవసిద�ద "
 "సమయంలో దర�శించ�ట చాలా కష�టంగా ఉంట�ంది."
 
-#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "దృవీకరణపత�రం న� దర�శించ�(_V)"
 
-#: ../mail/em-format-html-display.c:690
+#: ../mail/em-format-html-display.c:261
 msgid "This certificate is not viewable"
 msgstr "ఈ దృవీకరణపత�రం దర�శించ�నట�ల� లేద�"
 
-#: ../mail/em-format-html-display.c:980
-#| msgid "Completed On"
+#: ../mail/em-format-html-display.c:509
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"సంభాలించ�టక� మరీ పెద�దదిగా ఉండ�టవలన ఈ ఇమెయిల�‌న� ఎవాల�యూషన� చూపించలేక పోయింది. మీర� దీనిని "
+"రూపీకరించనివిధంగా లేదా బాహ�య పాఠ�యకూర�పరి ద�వారా దర�శించవచ�చ�."
+
+#: ../mail/em-format-html-display.c:738
 msgid "Completed on"
 msgstr "ఇంతక� పూర�తైనది"
 
-#: ../mail/em-format-html-display.c:988
+#: ../mail/em-format-html-display.c:746
 msgid "Overdue:"
 msgstr "కాలమ�దాటిన:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:750
 msgid "by"
 msgstr "ద�వారా"
 
-#: ../mail/em-format-html-display.c:1071
-#: ../widgets/misc/e-attachment-view.c:357
-msgid "_View Inline"
-msgstr "ఇన�‌లైన� న� దర�శించ�(_V)"
-
-#: ../mail/em-format-html-display.c:1072
-#: ../widgets/misc/e-attachment-view.c:350
-msgid "_Hide"
-msgstr "మర�గ�పర�చ�(_H)"
-
-#: ../mail/em-format-html-display.c:1073
-msgid "_Fit to Width"
-msgstr "వెడల�ప�క� అమర�చ�మ�(_F)"
-
-#: ../mail/em-format-html-display.c:1074
-msgid "Show _Original Size"
-msgstr "వాస�తవ పరిమాణంన� చూప�మ�(_O)"
-
-#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
 msgid "View _Unformatted"
 msgstr "రూపీకరించని దర�శనం(_U)"
 
-#: ../mail/em-format-html-display.c:1577
+#: ../mail/em-format-html-display.c:964
 msgid "Hide _Unformatted"
 msgstr "రూపీకరించనిదానిని మర�గ�పర�చ�మ�(_U)"
 
-#: ../mail/em-format-html-display.c:1634
+#: ../mail/em-format-html-display.c:1021
 msgid "O_pen With"
 msgstr "దీనితో తెర�వ�మ�(_p)"
 
-#: ../mail/em-format-html-display.c:1711
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"సంభాలించ�టక� మరీ పెద�దదిగా ఉండ�టవలన ఈ ఇమెయిల�‌న� ఎవాల�యూషన� చూపించలేక పోయింది. మీర� దీనిని "
-"రూపీకరించనివిధంగా లేదా బాహ�య పాఠ�యకూర�పరి ద�వారా దర�శించవచ�చ�."
-
-#: ../mail/em-format-html-print.c:157
+#: ../mail/em-format-html-print.c:163
 #, c-format
 msgid "Page %d of %d"
 msgstr "%2$d యొక�క ప�ట %1$d"
 
-#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "రూపీకరిస�త�న�న సందేశం"
+
+#: ../mail/em-format-html.c:357
+msgid "Formatting Message..."
+msgstr "రూపీకరిస�త�న�న సందేశం..."
+
+#: ../mail/em-format-html.c:1398 ../mail/em-format-html.c:1407
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' వెలికితీస�తోంది"
 
-#: ../mail/em-format-html.c:929
+#: ../mail/em-format-html.c:1866
 msgid "Unknown external-body part."
 msgstr "అపరిచిత బాహ�య-మ�ఖ�యమైన భాగమ�."
 
-#: ../mail/em-format-html.c:937
+#: ../mail/em-format-html.c:1874
 msgid "Malformed external-body part."
 msgstr "తప�ప�గాఉన�న బాహ�య-మ�ఖ�యమైన భాగమ�."
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:1904
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP సైట� (%s) క� సూచిక"
 
-#: ../mail/em-format-html.c:978
+#: ../mail/em-format-html.c:1915
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "స�థానిక దస�త�రం(%s)క� సూచిక సైట� \"%s\" వద�ద నిర�ధారించబడింది"
 
-#: ../mail/em-format-html.c:980
+#: ../mail/em-format-html.c:1917
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "స�థానిక దస�త�రం (%s) క� సూచిక"
 
-#: ../mail/em-format-html.c:1001
+#: ../mail/em-format-html.c:1938
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "దూరస�థ డాటా (%s)క� సూచిక"
 
-#: ../mail/em-format-html.c:1012
+#: ../mail/em-format-html.c:1949
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "తెలియని బహిర�గత డాటా క� సూచిక (\"%s\" రకం)"
 
-#: ../mail/em-format-html.c:1240
-msgid "Formatting message"
-msgstr "రూపీకరిస�త�న�న సందేశం"
-
-#: ../mail/em-format-html.c:1414
-msgid "Formatting Message..."
-msgstr "రూపీకరిస�త�న�న సందేశం..."
-
-#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
-msgid "Cc"
-msgstr "Cc"
-
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
-#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1435
-msgid "Mailer"
-msgstr "మెయిలర�"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1910
+#: ../mail/em-format-html.c:2640
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "సందేశం <b>%2$s</b> తర�ప�న <b>%1$s</b> ద�వారా పంపబడింది "
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
-#: ../mail/em-mailer-prefs.c:77
-msgid "Reply-To"
-msgstr "క�-ప�రత�య�త�తరమ�"
-
-#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
-#: ../widgets/misc/e-dateedit.c:338
-msgid "Date"
-msgstr "తారీఖ�"
-
-#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
-msgid "Newsgroups"
-msgstr "వార�తాసమూహాల�"
-
-#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
-#: ../plugins/face/org-gnome-face.eplug.xml.h:4
-msgid "Face"
-msgstr "మ�ఖమ�"
-
-#: ../mail/em-format.c:1201
-#, c-format
-msgid "%s attachment"
-msgstr "%s అన�భందమ�"
-
-#: ../mail/em-format.c:1239
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME సందేశంన� పార�శ�  చేయలేకపోయింది: తెలియని దోషం"
-
-#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME సందేశంన� పార�శ� చేయలేకపోయింది. మూలంలాగా ప�రదర�శిస�తోంది."
-
-#: ../mail/em-format.c:1384
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "మల�టీపార�ట�/ఎన�క�రిప�టెడ� కొరక� మద�దతీయని ఎన�క�రిప�షన� రకం"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message"
-msgstr "PGP/MIME సందేశాన�ని పార�శ� చేయలేకపోయింది"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "PGP/MIME సందేశాన�ని పార�శ�  చేయలేకపోయింది: తెలియని దోషం"
-
-#: ../mail/em-format.c:1552
-msgid "Unsupported signature format"
-msgstr "మద�దతీయని సంతకం రూపం"
-
-#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
-msgid "Error verifying signature"
-msgstr "సంతకాన�ని నిర�దారించ�టలో దోషం"
-
-#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
-msgid "Unknown error verifying signature"
-msgstr "సంతకాన�ని నిర�దారించ�టలో తెలియని దోషం"
-
-#: ../mail/em-format.c:1772
-msgid "Could not parse PGP message"
-msgstr "PGP సందేశాన�ని పార�శ� చేయలేకపోయింది"
-
-#: ../mail/em-format.c:1772
-msgid "Could not parse PGP message: Unknown error"
-msgstr "PGP సందేశాన�ని పార�శ� చేయలేకపోయింది: తెలియని దోషం"
-
-#: ../mail/em-mailer-prefs.c:95
-msgid "Every time"
-msgstr "ప�రతి సారి"
-
-#: ../mail/em-mailer-prefs.c:96
-msgid "Once per day"
-msgstr "రోజ�క� ఒక సారి"
-
-#: ../mail/em-mailer-prefs.c:97
-msgid "Once per week"
-msgstr "వారమ�నక� ఒక సారి"
-
-#: ../mail/em-mailer-prefs.c:98
-msgid "Once per month"
-msgstr "నెలక� ఒక సారి"
-
-#: ../mail/em-mailer-prefs.c:332
-msgid "Add Custom Junk Header"
-msgstr "మ�ల�చ�క�న�న నిరర�దకప� పీఠికన� జతచేయ�మ�"
-
-#: ../mail/em-mailer-prefs.c:336
-msgid "Header Name:"
-msgstr "పీఠిక నామమ�:"
-
-#: ../mail/em-mailer-prefs.c:337
-msgid "Header Value Contains:"
-msgstr "పీఠిక విల�వ కలిగిఉండ�న�:"
-
-#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "పీఠిక"
-
-#: ../mail/em-mailer-prefs.c:442
-msgid "Contains Value"
-msgstr "కలిగిఉండ� విల�వ"
-
-#: ../mail/em-mailer-prefs.c:465
-msgid "Color"
-msgstr "వర�ణమ�"
-
-#: ../mail/em-mailer-prefs.c:468
-msgid "Tag"
-msgstr "టాగ�"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "%s ప�లగ�ఇన� అంద�బాట�లోఉంది మరియ� బైనరీ సంస�థాపించబడెన�."
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
-#, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
-msgstr "%s ప�లగ�ఇన� అంద�బాట�లో లేద�. దయచేసి ప�యాకేజి సంస�థాపించబడిందేమో పరీక�షించండి."
-
-#: ../mail/em-mailer-prefs.c:1092
-msgid "No Junk plugin available"
-msgstr "� నిరర�ధక ప�లగ�ఇన� అంద�బాట�లో లేద�"
-
-#: ../mail/em-mailer-prefs.c:1455
-#| msgid "Table header"
-msgid "Date header:"
-msgstr "తేదీ పీఠిక:"
-
-#. green
-#: ../mail/em-migrate.c:961
-msgid "To Do"
-msgstr "చేయ�టక�"
-
-#. blue
-#: ../mail/em-migrate.c:962
-msgid "Later"
-msgstr "తర�వాత"
-
-#: ../mail/em-migrate.c:1128
-msgid "Migration"
-msgstr "వలసపంప�ట"
-
-#: ../mail/em-migrate.c:1573
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "కొత�త సంచయం సృష�టించలేక పోయింది `%s': %s"
-
-#: ../mail/em-migrate.c:1599
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "సచయం `%s' న� `%s' క� నకల�తీయలేక పోయింది: %s"
-
-#: ../mail/em-migrate.c:1784
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "`%s' వద�ద ఉన�న మెయిల�‌పెట�టెల కొరక� స�కాన� తీయలేకపోయింది: %s"
-
-#: ../mail/em-migrate.c:1789
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ఎనాల�యూషన� 1.x న�ండి ఎవాల�యూషన� మెయిల�‌పెట�టె సంచయాల యొక�క స�థానమ� మరియ� పారంపరమ� మర�చబడింది.\n"
-"\n"
-"ఎవాల�యూషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి ఒర�ప�తో ఉండండి..."
-
-#: ../mail/em-migrate.c:1990
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "పాత POP సేవిక-లో-ఉంచ� డాటా `%s' న� తెర�వలేకపోయింది: %s"
-
-#: ../mail/em-migrate.c:2004
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "POP3 సేవిక-లో-ఉంచ� డాటా సంచయం `%s' న� సృష�టించలేక పోయింది: %s"
-
-#: ../mail/em-migrate.c:2033
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "POP3 సేవిక-లో-ఉంచ� డాటా `%s' న� నకల�తీయ లోకపోయింది: %s"
-
-#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "స�థానిక మెయిల� నిల�వ `%s' న� సృష�టించ�టలో విఫలమైంది: %s"
-
-#: ../mail/em-migrate.c:2874
-msgid "Migrating Folders"
-msgstr "సంచయాలన� వలసపంప�చ�న�నది"
-
-#: ../mail/em-migrate.c:2874
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ఎనాల�యూషన� 2.24 న�ండి ఎవాల�యూషన� మెయిల�‌పెట�టె సంచయాల యొక�క సంక�షిప�త రూపంన� sqliteక� మార�చబడింది.\n"
-"\n"
-"ఎవాల�యూషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి వోర�ప�తో వ�ండండి..."
-
-#: ../mail/em-migrate.c:2955
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "స�థానిక మెయిల� సంచయాలన� `%s' వద�ద సృష�టించలేక పోయింది: %s"
-
-#: ../mail/em-migrate.c:2974
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"మ�న�పటి ఎవాల�యూషన� సంస�థాపన న�ండి అమరికలన� చద�వలేక పోయింది. `ఎవాల�య�షన�/ config.xmldb' లేద� "
-"లేదా పాడైనది."
-
-#: ../mail/em-popup.c:364
-msgid "Save As..."
-msgstr "ఇలా దాచ�..."
-
-#: ../mail/em-popup.c:389
-#, c-format
-msgid "untitled_image.%s"
-msgstr "శీర�షికలేని చిత�రమ�(_i).%s"
-
-#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
-msgid "Set as _Background"
-msgstr "బ�యాక�‌గ�రౌండ� లా అమర�చ�మ�(_B)"
-
-#: ../mail/em-popup.c:497
-msgid "_Reply to sender"
-msgstr "పంపకందార� కి ప�రత�య�త�తరం(_R)"
-
-#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
-msgid "Reply to _List"
-msgstr "జాబితాకి ప�రత�య�త�తరం(_L)"
-
-#. make it first item
-#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
-msgid "_Add to Address Book"
-msgstr "చిర�నామా ప�స�తకంక� కల�ప�మ�(_A)"
-
-#: ../mail/em-popup.c:725
-#, c-format
-msgid "Open in %s..."
-msgstr "%s లో తెర�వ�మ�...."
-
-#: ../mail/em-subscribe-editor.c:606
+#: ../mail/em-subscribe-editor.c:586
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "ఈ నిల�వ చందాలక� మద�దత�నీయద�, లేదా అవి చేతనంకాబడిలేవ�."
 
-#: ../mail/em-subscribe-editor.c:639
+#: ../mail/em-subscribe-editor.c:619
 msgid "Subscribed"
 msgstr "చందాకాబడిన"
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:623
 msgid "Folder"
 msgstr "సంచయం"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:858
+#: ../mail/em-subscribe-editor.c:835
 msgid "Please select a server."
 msgstr "దయచేసి ఒక సేవికన� ఎంపికచేయ�మ�."
 
-#: ../mail/em-subscribe-editor.c:894
+#: ../mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "�సేవిక ఎంపికకాబడలేద�"
 
-#. Check buttons
-#: ../mail/em-utils.c:121
-#: ../plugins/attachment-reminder/attachment-reminder.c:129
-msgid "_Do not show this message again."
-msgstr "ఈ సందేశంన� మళ�ళీ చూపవద�ద� (_D)."
-
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:310
 msgid "Message Filters"
 msgstr "సందేశం వడపోతల�"
 
-#: ../mail/em-utils.c:369
-msgid "message"
-msgstr "సందేశం"
-
-#: ../mail/em-utils.c:652
-msgid "Save Message..."
-msgstr "సందేశంన� దాయ�మ�..."
-
-#: ../mail/em-utils.c:702
-msgid "Add address"
-msgstr "చిర�నామాన� జతచేయ�మ�"
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1223
+#: ../mail/em-utils.c:814
 #, c-format
 msgid "Messages from %s"
 msgstr "%s న�ండి సందేశాల�"
 
-#: ../mail/em-vfolder-editor.c:114
+#: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
 msgstr "సంచయాలన� శోధించ�మ�(_F)"
 
-#: ../mail/em-vfolder-rule.c:592
-msgid "Search Folder source"
-msgstr "సంచయం మూలంన� శోధించ�"
+#: ../mail/em-vfolder-rule.c:522
+#, fuzzy
+msgid "Add Folder"
+msgstr "సంచయం"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+#, fuzzy
+msgid "\"Filter Editor\" window height"
+msgstr "అప�రమేయ విండో ఎత�త�"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+#, fuzzy
+msgid "\"Filter Editor\" window maximize state"
+msgstr "\"మెయిల� పంపించ� మరియ� స�వీకరించ�\" విండో గరిష�ఠ స�థితి"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+#, fuzzy
+msgid "\"Filter Editor\" window width"
+msgstr "అప�రమేయ విండో వెడల�ప�"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+#, fuzzy
+msgid "\"Search Folder Editor\" window height"
+msgstr "అప�రమేయ విండో ఎత�త�"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+#, fuzzy
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "\"మెయిల� పంపించ� మరియ� స�వీకరించ�\" విండో గరిష�ఠ స�థితి"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+#, fuzzy
+msgid "\"Search Folder Editor\" window width"
+msgstr "మెయిలింగ� జాబితా న�ండి సంచయాన�ని వెత�క�మ�(_L)"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
 msgstr "\"మెయిల�‌న� పంపించ� మరియ� స�వీకరించ�\" విండో ఎత�త�"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "\"మెయిల� పంపించ� మరియ� స�వీకరించ�\" విండో గరిష�ఠ స�థితి"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
 msgstr "\"మెయిల� పంపించే మరియ� పొందే\" విండో వెడల�ప�"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Allows Evolution to display text part of limited size"
 msgstr "పరిమిత పరిమాణం యొక�క పాఠ�య భాగమ�న� ప�రదర�శించ�టక� ఎవాల�యూషన� న� అన�మతించ�"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "చదివిన రిసిప�ట�న� ఎల�లప�ప�డ� అభ�యర�దించ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "emoticon న� స�వయంచాలకంగా గ�ర�తించ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Automatic link recognition"
 msgstr "స�వయంచాలక జోడి గ�ర�తింప�"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Check incoming mail being junk"
 msgstr "లోనికవస�త�న�న మెయిల� నిరర�ధకం అగ�టన� పరిశీలించ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color"
 msgstr "సిటేషన� ఉద�దీపన వర�ణమ�"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Citation highlight color."
 msgstr "సిటేషన� ఉద�దీపన వర�ణమ�."
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default height"
 msgstr "కూర�పరి విండో అప�రమేయ ఎత�త�"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer Window default width"
 msgstr "కూర�పరి విండో అప�రమేయ ‌వెడల�ప�"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer load/attach directory"
 msgstr "కూర�పరి నింప�/అన�భందం సంచయం"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "TO/CC/BCC నంద� చిర�నామాల ప�రదర�శనన� క�చింప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "TO/CC/BCC నంద� చిర�నామాల ప�రదర�శనన� address_count నంద� తెలిపినవిధంగా క�చింప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -12030,11 +11286,11 @@ msgstr ""
 "రిమోట� మెయిల� సేవికతో స�థానిక మార�ప�ల� ఎంతతరచ�గా సింక�రనైజ� చేయబడతాయో నియత�రిస�త�ంది. విరామం తప�పక 30 "
 "సెకన�ల� వ�ండాలి."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Custom headers to use while checking for junk."
 msgstr "నిరర�ధకం కొరక� పరిశీలిస�త�న�నప�ప�డ� వ�పయోగించ�టక� కస�టమ� హెడర�స��."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -12042,69 +11298,76 @@ msgstr ""
 "నిరర�ధకం కొరక� పరిశీలిస�త�న�నప�ప�డ� వ�పయోగించ�టక� మల�చ�క�న�న పీఠికల�. \"headername=value\" "
 "రూపకంలో జాబితా మూలకంల� స�ట�రింగ�."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages"
 msgstr "సందేశాలన� దేనితో కూర�చాలో ఆ అప�రమేయ అక�షరసమితి"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to compose messages."
 msgstr "సందేశాలన� దేనితో కూర�చలో ఆ అప�రమేయ అక�షరసమితి."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages"
 msgstr "సందేశాలన� దేనితో ప�రదర�శించాలో ఆ అప�రమేయ అక�షరసమితి"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to display messages."
 msgstr "సందేశాలన� దేనితో ప�రదర�శించాలో ఆ అప�రమేయ అక�షరసమితి."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default forward style"
 msgstr "మ�ంద�క�పంప�టక� అప�రమేయ శైలి"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the Composer Window."
 msgstr "కూర�పరి విండో యొక�క అప�రమేయ ఎత�త�."
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default height of the message window."
-msgstr "సందేశ విండో యొక�క అప�రమేయ ఎత�త�."
+#: ../mail/evolution-mail.schemas.in.h:32
+#, fuzzy
+msgid "Default height of the mail browser window."
+msgstr "కూర�పరి విండో యొక�క అప�రమేయ ఎత�త�."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
 msgstr "సబ�‌స�క�రైబ� డైలాగ� యొక�క అప�రమేయ ఎత�త�."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
+#, fuzzy
+msgid "Default maximized state of the mail browser window."
+msgstr "కూర�పరి విండో యొక�క అప�రమేయ వెడల�ప�."
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default reply style"
 msgstr "అప�రమేయ ప�రత�య�త�తరమ� శైలి"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default value for thread expand state"
 msgstr "తంతి విస�తరింప� స�థితి కొరక� అప�రమేయ విల�వ"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the Composer Window."
 msgstr "కూర�పరి విండో యొక�క అప�రమేయ వెడల�ప�."
 
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid "Default width of the message window."
-msgstr "సందేశం విండో యొక�క అప�రమేయ వెడల�ప�."
+#: ../mail/evolution-mail.schemas.in.h:38
+#, fuzzy
+msgid "Default width of the mail browser window."
+msgstr "కూర�పరి విండో యొక�క అప�రమేయ వెడల�ప�."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the subscribe dialog."
 msgstr "సబ�‌స�క�రైబ� డైలాగ� యొక�క అప�పమేయ వెడల�ప�."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "నిరర�ధకం వడపోతప�రక�రియలో స�థానిక చిర�నామా ప�స�తకంలో మాత�రమే చిర�నామాలన� చూడాలేమో నిర�ణయిస�త�ంది"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "పంపకందార� ఇమెయిల� కొరక� చిర�నామా ప�స�తంకంనంద� చూడాలేమో నిర�ధారిస�త�ంది"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12115,11 +11378,11 @@ msgstr ""
 "స�వయంచాలకమ�గింప�క� గ�ర�త�ంచిన ప�స�తకంలంద� కనిపిస�త�ంది. ఇది నెమ�మది అవ�వచ�చ�, ఒకవేళ దూరస�థ "
 "చిర�నామాప�స�తకాల� (ldap వంటివి) స�వయంచాలకమ�గింప� క� గ�ర�త�ంచబడితే."
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "నిరర�ధకం కొరక� పరిశీలించ�టక� మల�చ�క�న�న పీఠికలన� ఉపయోగించాలేమో నిర�ధారిస�త�ంది"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12128,7 +11391,7 @@ msgstr ""
 "నిరర�ధకం న� పరిశీలించ�ట కొరక� మల�చ�క�న�న పీఠికలన� ఉపయోగించాలేమో నిర�ధారిస�త�ంది. ఈ �చ�చికం చేతనం "
 "అయ�యి పీఠికలన� తెల�పబడితే, ఇది నిరర�ధకం న� పరిశీలించే వేగంన� మెర�గ�పర�స�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12136,80 +11399,83 @@ msgstr ""
 "వర�టికల� దర�శనంలో \"సందేశాల�\" నిల�వ�వర�సనందలి \"న�ండి\" మరియ� \"సంగతి\" రెండ�వర�సలక� వొకే "
 "ఫాంట�లన� వాడవలెనేమో నిర�ణయిస�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "కూర�పరికి దస�త�రాలన� నింప�టక�/అన�భందించ�టక� సంచయం."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "మెయిల� మూలకం దస�త�రాలన� దాయ�టక� సంచయం."
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "ఫోల�డర� ట�రీనంద� ఫోల�డర� నామాలయొక�క ఎలిప�సైజింగ� చేతనం లేదా అచేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
+#, fuzzy
+msgid "Do not add signature delimiter"
+msgstr "సంతకం దస�త�రాన�ని దాయలేకపోయింది."
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
 msgstr "మీర� టైప�చేసిన విధంగా పదమ�లపై స�పెల�లింగ� దోషప� సూచికలన� గీయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Junk folders on exit"
 msgstr "బయటక� వచ�చ�నప�ప�డ� నిరర�ధక సంచయాలన� ఖాళీచేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Trash folders on exit"
 msgstr "బయటక� వచ�చ�నప�ప�డ� చెత�తక�ండీ సంచయాలన� ఖాళీ చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "ఎవాల�య�షన� బయటక� వచ�చ�నప�ప�డ� అన�ని నిరర�ధక సంచయాలన� ఖాళీ చేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ఎవాల�యూషన� బయటక� వచ�చ�నప�ప�డ� అన�ని చెత�తక�ండి సంచయాలన� ఖాళీచేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr ""
-"�నిమేటెడ� ప�రతిబింబమ�లన� HTML మెయిల�‌నంద� చేతనమ�చేయి. చాలామందికి యానిమేటెడ� "
-"ప�రతిబింబమ�ల� విస�గ�కలిగస�తాయి మరియ� వార� స�థిర ప�రతిబింబమ�లన� చూడాలన�కొంటార�."
+"�నిమేటెడ� ప�రతిబింబమ�లన� HTML మెయిల�‌నంద� చేతనమ�చేయి. చాలామందికి యానిమేటెడ� ప�రతిబింబమ�ల� విస�గ�కలిగస�తాయి "
+"మరియ� వార� స�థిర ప�రతిబింబమ�లన� చూడాలన�కొంటార�."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "అక�షరరీతిని చేతనపర�చ�మ�, అలా మీర� మెయిల� చద�వ�త�న�నప�ప�డ� కర�సర� న� చూడగలర�."
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
 msgstr "మాయా స�పేస� పట�టీని చేతనం లేదా అచేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:50
-#| msgid "It disables/enables the prompt while marking multiple messages."
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "బహ�ళ సందేశమ�లన� గ�ర�త�ంచ�నప�ప�డ� అడ�గ�టన� చేతనమ� లేదా అచేతనమ� చేయ�న�."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "టైప�చేయ�దానికి మ�ంది శోధన సౌలబ�యాన�ని చేతనం లేదా అచేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
 msgstr "శోధన సంచయాలన� చేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
 msgstr "శోధన సంచయాలన� ప�రారంభంనంద� చేతనంచేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr ""
-"ఫోల�డర� నామమ�ల కొరక� యింటరాక�టివ� శోధనన� అన�మతించ�టక� ప�రక�క పట�టీ శోధన సౌలభ�యమ�న� "
-"చేతనమ�చేయి."
+"ఫోల�డర� నామమ�ల కొరక� యింటరాక�టివ� శోధనన� అన�మతించ�టక� ప�రక�క పట�టీ శోధన సౌలభ�యమ�న� చేతనమ�చేయి."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12217,45 +11483,42 @@ msgstr ""
 "సందేశం ఉపదర�శనం నంద� స�పేస� బార� కీని స�క�రాల� చేయ�టక� ఉపయోగించ�టక� దీనిని చేతనంచేయ�మ�, సందేశం జాబితా "
 "మరియ� సంచయాల�."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable to render message text part of limited size."
 msgstr "పరిమిత పరిమాణం యొక�క సందేశం పాఠ�య విభాగం చూప�టక� చేతనంచేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "అక�షరరీతిని చేతనం/అచేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Outlook/GMail తరహాలో దస�త�ర నామమ�లన� ఎన�కోడ� చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:59
-#| msgid ""
-#| "Encode file names in the mail headers same as Outlook or GMail does, to "
-#| "let them understand localized file names sent by Evolution, because they "
-#| "do not follow the RFC 2231, but uses incorrect RFC 2047 standard."
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
 "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
 "standard."
 msgstr ""
-"ఎవాల�యూషన� ద�వారా పంపిన UTF-8 అక�షరమ�ల దస�త�రనామమ�లన� వార� సరిగా ప�రదర�శించ�టక�,Outlook లేదా GMail చేయ�నట�ల� మెయిల� పీఠికలనంద� దస�త�ర నామమ�లన� ఎన�కోడ� చేయ�మ�, యెంద�చేతనంటే అవి RFC 2231 "
+"ఎవాల�యూషన� ద�వారా పంపిన UTF-8 అక�షరమ�ల దస�త�రనామమ�లన� వార� సరిగా ప�రదర�శించ�టక�,Outlook లేదా "
+"GMail చేయ�నట�ల� మెయిల� పీఠికలనంద� దస�త�ర నామమ�లన� ఎన�కోడ� చేయ�మ�, యెంద�చేతనంటే అవి RFC 2231 "
 "అన�సరించవ�, అయితే సరికాని RFC 2047 ప�రమాణంన� వ�పయోగిస�తాయి."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane"
 msgstr "సందేశ-జాబితా తలం యొక�క ఎత�త�"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Height of the message-list pane."
 msgstr "సందేశ-జాబితా తలం యొక�క ఎత�త�."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ఒక�కో-సంచయంక� ఉపదర�శనంన� మర�గ�పర�చ�మ� మరియ� ఎంపికన� తీసివేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12263,13 +11526,7 @@ msgstr ""
 "వినియోగదారి 10 లేదా ఎక�క�వ సందేశాలన� ఒక సమయంనంద� తెర�వ�టక� ప�రయత�నిస�తే, వినియోగదారిని నిజంగా "
 "చేయాలన�క�ంట�న�నారేమో అడ�గ�."
 
-#: ../mail/evolution-mail.schemas.in.h:64
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr "ఒకవేళ \"ఉపదర�శనం\" తలం చేతనంగాఉంటే, అప�పడ� దానిని ప�రక�క-ప�రక�కనే చూప�మ� నిల�వ�గా చూప�టకంటే."
-
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:72
 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 "
@@ -12279,7 +11536,25 @@ msgstr ""
 "రకాల� GNOME యొక�క mime-రంకం డాటాబేస� బొనోబొ-మూలకం దర�శని కి సూచించబడినవో దానిని ప�రదర�శనకొరక� "
 "ఉపయోగించ�కొనవచ�చ�."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:73
+#, fuzzy
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ ఎత�త�. వినియోగదారి దానిఎత�త�న� మార�చినట�ల�గా ఈవిల�వ "
+"నవీకరించబడ�త�ంది."
+
+#: ../mail/evolution-mail.schemas.in.h:74
+#, fuzzy
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ ఎత�త�. వినియోగదారి దానిఎత�త�న� మార�చినట�ల�గా ఈవిల�వ "
+"నవీకరించబడ�త�ంది."
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -12287,7 +11562,31 @@ msgstr ""
 "\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ ఎత�త�. వినియోగదారి దానిఎత�త�న� మార�చినట�ల�గా ఈవిల�వ "
 "నవీకరించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:76
+#, fuzzy
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభం గరిష�ఠ స�థితి. వినియోగదారి విండోన� పెద�దది లేదా చిన�నది "
+"చేసినప�ప�డ� ఈవిల�వ నవీకరించబడ�త�ంది. \"మెయిల� పంప� మరియ� పొంద�\" విండో పెద�దది చేయ�నంతవరక� "
+"ఈవిల�వ ఎవాల�యూషన�‌చేత వ�పయోగించబడదని గమనించండి. ఈ కీ అభివృద�ద వివరంగా మాత�రమేవ�ంది."
+
+#: ../mail/evolution-mail.schemas.in.h:77
+#, fuzzy
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభం గరిష�ఠ స�థితి. వినియోగదారి విండోన� పెద�దది లేదా చిన�నది "
+"చేసినప�ప�డ� ఈవిల�వ నవీకరించబడ�త�ంది. \"మెయిల� పంప� మరియ� పొంద�\" విండో పెద�దది చేయ�నంతవరక� "
+"ఈవిల�వ ఎవాల�యూషన�‌చేత వ�పయోగించబడదని గమనించండి. ఈ కీ అభివృద�ద వివరంగా మాత�రమేవ�ంది."
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12299,23 +11598,33 @@ msgstr ""
 "చేసినప�ప�డ� ఈవిల�వ నవీకరించబడ�త�ంది. \"మెయిల� పంప� మరియ� పొంద�\" విండో పెద�దది చేయ�నంతవరక� "
 "ఈవిల�వ ఎవాల�యూషన�‌చేత వ�పయోగించబడదని గమనించండి. ఈ కీ అభివృద�ద వివరంగా మాత�రమేవ�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:79
+#, fuzzy
 msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ వెడల�ప�. వినియోగదారి విండోన� అడ�డంగా ప�నఃపరిమాణం "
+"చేసినట�ల�గా ఈవిల�వ నవీకరించబడ�త�ంది."
+
+#: ../mail/evolution-mail.schemas.in.h:80
+#, fuzzy
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
 "\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ వెడల�ప�. వినియోగదారి విండోన� అడ�డంగా ప�నఃపరిమాణం "
 "చేసినట�ల�గా ఈవిల�వ నవీకరించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr ""
-"ఆఫ�‌లైన� రీతికి వెళ�ళ�టక� మ�న�ప� ఆఫ�‌లైన� సింక� అవసరమేమో అడ�గ�టక� ప�నరావృత ప�రాంప�ట�లన� చేతనం/"
-"అచేతనం చేస�త�ంది."
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ వెడల�ప�. వినియోగదారి విండోన� అడ�డంగా ప�నఃపరిమాణం "
+"చేసినట�ల�గా ఈవిల�వ నవీకరించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12324,31 +11633,36 @@ msgstr ""
 "శోధన సంచయంన�ండి సందేశాలన� శాశ�వతంగా తోలగించ�నప�ప�డ� పర�యాయ హెచ�చరికలన� ఇది చేతనం/అచేతనం "
 "చేస�త�ంది, శోధన ఫలితాలన�ండి సాదారణంగా తొలగిస�త�న�నప�పడ�కాద�."
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Last time empty junk was run"
 msgstr "గతసారి ఖాళీ నిరర�ధకం నడ�పబడింది"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Last time empty trash was run"
 msgstr "చివరిసారి ఖాళీ చెత�తక�ండి నడ�పబడింది"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
+#, fuzzy
+msgid "Layout style"
+msgstr "కూర�ప�(_o)"
+
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
 msgstr "లేబ�ళ�ళ యొక�క జాబితా మరియ� సంభందిత వర�ణమ�ల�"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "బొనాబో మూలకం దర�శక�ల కొరక� పరిశీలించ�టక� mime రకాల జాబితా"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
 msgstr "ఆమోదించిన లైసెన�సెస� యొక�క జాబితా"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "ఖాతాల యొక�క జాబితా"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12356,15 +11670,15 @@ msgstr ""
 "ఎవాల�య�షన� యొక�క మెయిల� మూలకంక� తెలిసిన ఖాతాల జాబితా. ఆ జాబితా /apps/evolution/mail/accounts క� "
 "సారూప�యంగాఉన�న ఉపసంచయాల నామాలన� కలిగిఉంది."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
 msgstr "మల�చ�క�న�న పీఠికల జాబితా మరియ� అవి చేతనంగా ఉన�నాయా."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of dictionary language codes used for spell checking."
 msgstr "స�పెల� పరిశీలనకొరక� పదకోశప� భాషా కొడ�‌ల జాబితా వ�పయోగించబడింది."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:94
 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."
@@ -12372,15 +11686,15 @@ msgstr ""
 "ఎవాల�యూషన� యొక�క మెయిల� మూలకంక� తెలిసిన లేబ�ల�స� యొక�క జాబితా. ఆ జాబితా ఈ నామాలన� కలిగిఉన�న స�ట�రింగ�స�న� "
 "కలిగిఉంట�ంది: వర�ణమ� ల� HTML hex ఎన�కోడింగ� న� వాడతాయో ఆవర�ణాల."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
 msgstr "ఎవరి లైసెన�స� ఆమోదించబడిందో వారి నియమం నామాల జాబితా."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTTP పై HTML సందేశాలకొరక� చిత�రాలన� నింప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -12390,103 +11704,107 @@ msgstr ""
 "న�ండి చిత�రాలన� నింపద�. \"1\" - పరిచయాలన�ండి చిత�రాలన� సందేశాల నంద� నింప�త�ంది. \"2\" - "
 "ఎప�ప�డ� చిత�రాలన� నెట� న�ండి నింప�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
 msgstr "వడపోత చర�యలన� లాగిన�‌చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Log filter actions to the specified log file."
 msgstr "తెల�పబడినట�వంటి లాగ� దస�త�రమ�లక� వడపోత చర�యలన� లాగ� చేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Logfile to log filter actions"
 msgstr "లాగ� వడపోత చర�యలక� లాగ�‌దస�త�రం"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Logfile to log filter actions."
 msgstr "లాగ� వడపోత చర�యలక� లాగ�‌దస�త�రం."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:102
+#, fuzzy
+msgid "Mail browser height"
+msgstr "పొందికగల అడ�డపట�టీ ఎత�త�"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Mail browser maximized"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:104
+#, fuzzy
+msgid "Mail browser width"
+msgstr "దీనితో ఈ-తపాలా మొదలౌత�ంది"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mark as Seen after specified timeout"
 msgstr "తెల�పబడిన సమయనియమితి తర�వాత చూచినట�ల� గ�ర�త�ంచ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mark as Seen after specified timeout."
 msgstr "తెల�పబడిన సమయనియమితి తర�వాత చూచినట�ల� గ�ర�త�ంచ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mark citations in the message \"Preview\""
 msgstr "సందేశం \"ఉపదర�శనం\" లో సిటేషన�లన� గర�త�ంచ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "సందేశం \"ఉపదర�శనం\" లో సిటేషన�లన� గర�త�ంచ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Message Window default height"
-msgstr "సందేశ విండో అప�రమేయ ఎత�త�"
-
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Message Window default width"
-msgstr "సందేశ విండో అప�రమేయ వెడల�ప�"
-
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "సందేశ-ప�రదర�శన శైలి (\"సాదారణ\", \"పూర�తి పీఠికల�\", \"మూలం\")"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Minimum days between emptying the junk on exit"
 msgstr "బయటక�వచ�చిన తర�వాత నిరర�ధకంన� ఖాళీచేయ�టక� మధ�యలో కనీస రోజ�ల�"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the trash on exit"
 msgstr "బయటక�వచ�చిన తర�వాత చెత�తక�ండీన� ఖాళీచేయ�టక� మధ�యలో కనీస రోజ�ల�"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "బయటక�వచ�చిన తర�వాత నిరర�ధకంన� ఖాళీచేయ�టక� మధ�యలో కనీస సమయం, రోజ�లలో."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "బయటక�వచ�చిన తర�వాత చెత�తక�ండీన� ఖాళీచేయ�టక� మధ�యలో కనీస సమయం, రోజ�లలో."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "TO/CC/BCC లో ప�రదర�శితమగ�టక� చిర�నామాల సంఖ�య"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Prompt on empty subject"
 msgstr "ఖాళీ సంగతి పై అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "వినియోగదారిని అడ�గ�మ� ఎప�ప�డైతే అతడ� లేక ఆమె సంచయంన� కొట�టివేయ�టక� ప�రయత�నిస�తారో."
 
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "వినియోగదారిని అడ�గ�మ� ఎప�ప�డైతే అతడ� లేక ఆమె సందేశాన�ని సంగతి లేక�ండా పంప�టక� ప�రయత�నిస�తాడో."
 
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "వినియోగదారి తక�షణమే ఆఫ�‌లైన� క� వెళ�ళాలని అన�క�ంట�న�నాడెమో పరిశీలించ�టక� అడ�గ�మ�"
-
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt when deleting messages in search folder"
 msgstr "శోధన సంచయంలో సందేశాలన� తొలగించ�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when user expunges"
 msgstr "వినియోగదారి కొట�టివేయబడ�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user only fills Bcc"
 msgstr "వినియోగదారి మాత�రమే Bcc ని నింప�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr "వినియోగదారి 10 లేక అంతకన�నా ఎక�క�వ సందేశాలన� ఒకేసారి తెర�చ�టక� ప�రయత�నిస�త�న�నప�ప�డ� అడ�గ�మ�"
+msgstr ""
+"వినియోగదారి 10 లేక అంతకన�నా ఎక�క�వ సందేశాలన� ఒకేసారి తెర�చ�టక� ప�రయత�నిస�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12494,130 +11812,148 @@ msgstr ""
 "HTML మెయిల� న� స�వీకరించనబోనట�వంటి స�వీకరణదార�లక� వినియోగదారి HTML మెయిల� న� పంప�టక� ప�రయత�నిస�త�ంటే "
 "అడ�గ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "వినియోగదారి To లేదా Cc స�వీకరణదార�లన� లేక�ండా సందేశంన� పంప�టక� వినియోగదారి ప�రయత�నిస�త�ంటే అడ�గ�మ�."
+msgstr ""
+"వినియోగదారి To లేదా Cc స�వీకరణదార�లన� లేక�ండా సందేశంన� పంప�టక� వినియోగదారి ప�రయత�నిస�త�ంటే అడ�గ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "వినియోగదారి కొరనట�వంటి HTML న� పంప�టక� ప�రయత�నిస�త�ంటే అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt while marking multiple messages"
 msgstr "బహ�ళ సందేశాలన� గర�తిస�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Put personalized signatures at the top of replies"
 msgstr "ప�రత�య�త�తరమ�ల పైన వక�తిగత సంతకాలన� వ�ంచ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:114
-#| msgid "Start _typing at the bottom on replying"
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put the cursor at the bottom of replies"
 msgstr "కర�సర�‌న� ప�రత�య�త�తరమ�ల క�రిందన వ�ంచ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "పాఠ�యమ�లోని emoticons న� గ�ర�తించి మరియ� వాటిని చిత�రమ�లతో ప�నఃస�థాపించ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize links in text and replace them."
 msgstr "పాఠ�యమ�లోని లింక�లన� గ�ర�తించి మరియ� వాటిని ప�నఃస�థాపించ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Run junk test on incoming mail."
 msgstr "లోనికివస�త�న�న మెయిల� నిరర�ధకమైనదేమో పరిశీలనజర�ప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Save directory"
 msgstr "సంచయంన� దాయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Search for the sender photo in local address books"
 msgstr "స�థానిక చిర�నామాప�స�తకంలంద� పంపకందార� ఛాయాచిత�రం కొరక� శోధించ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Send HTML mail by default"
 msgstr "అప�రమేయంగా HTML మెయిల� న� పంప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default."
 msgstr "అప�రమేయంగా HTML మెయిల� న� పంప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Sender email-address column in the message list"
 msgstr "సందేశ జాబితాలో పంపినవాని ఈమెయిల�-చిర�నామా కాలమ�"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Server synchronization interval"
 msgstr "సేవిక సింక�రనైజేషన� విరామం"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"Bcc\" క�షేత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"Cc\" క�షేత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "న�యూస�‌గ�రూప�‌నక� పోస�ట� చేయ�నప�ప�డ� \"న�ండి\" క�షేత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when sending a mail message"
 msgstr "మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"న�ండి\" క�షేత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "న�యూస�‌గ�రూప�‌నక� పోస�ట�చేయ�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:129
-#| msgid "Also encrypt to sel_f when sending encrypted messages"
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show Animations"
 msgstr "యానిమేషన�లన� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:145
+#, fuzzy
+msgid "Show all message headers"
+msgstr "అన�ని సందేశ తంత�లన� కూల�చ�త�ంది"
+
+#: ../mail/evolution-mail.schemas.in.h:146
+#, fuzzy
+msgid "Show all the headers when viewing a messages."
+msgstr "మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�"
+
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show animated images as animations."
 msgstr "యానిమేషన�లలాగా యానిమేటెడ� చిత�రాలన� చూప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "సందేశ-జాబితా నంద� తొలగించిన సందేశాలన� (కొట�టివేత తో) చూప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages in the message-list"
 msgstr "తొలిగించిన సందేశాలన� సందేశ-జాబితా నంద� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:134
-#| msgid "_Show image animations"
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show image animations"
 msgstr "ప�రతిబింబప� యానిమేషన�లన� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Show original \"Date\" header value."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show photo of the sender"
 msgstr "పంపకందార� యొక�క ఛాయాచిత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"Bcc\" క�షేత�రమ�న� చూప�మ�. మెయిల� ఖాతా యెంచ�కొనబడినప�ప�డ� "
-"దర�శన మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
+"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"Bcc\" క�షేత�రమ�న� చూప�మ�. మెయిల� ఖాతా యెంచ�కొనబడినప�ప�డ� దర�శన "
+"మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"Cc\" క�షేత�రమ�న� చూప�మ�. మెయిల� ఖాతా యెంచ�కొనబడినప�ప�డ� "
-"దర�శన మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
+"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"Cc\" క�షేత�రమ�న� చూప�మ�. మెయిల� ఖాతా యెంచ�కొనబడినప�ప�డ� దర�శన "
+"మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -12625,15 +11961,15 @@ msgstr ""
 "మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"From\" క�షేత�రమ�న� చూప�మ�. వార�తల ఖాతా యెంచ�కొనబడినప�ప�డ� "
 "దర�శన మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"From\" క�షేత�రమ�న� చూప�మ�. మెయిల� ఖాతా యెంచ�కొనబడినప�ప�డ� "
-"దర�శన మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
+"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"From\" క�షేత�రమ�న� చూప�మ�. మెయిల� ఖాతా యెంచ�కొనబడినప�ప�డ� దర�శన "
+"మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -12641,7 +11977,7 @@ msgstr ""
 "మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�. వార�తల ఖాతా "
 "యెంచ�కొనబడినప�ప�డ� దర�శన మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -12649,65 +11985,80 @@ msgstr ""
 "మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�. మెయిల� ఖాతా "
 "యెంచ�కొనబడినప�ప�డ� దర�శన మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "సందేశ జాబితాలో ప�రత�యేక కాలమ�‌నంద� పంపినవానియొక�క ఈమెయిల�-చిర�నామాన� చూప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "సందేశాన�ని చద�వ� తలంలో పంపకందార� యొక�క ఛాయాచిత�రాన�ని చూప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Spell check inline"
 msgstr "ఇన�‌లైన� లో స�పెల�‌ పరిశీలన"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell checking color"
 msgstr "స�పెల� పరిశీలన వర�ణమ�"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking languages"
 msgstr "స�పెల� పరిశీలన భాషల�"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Subscribe dialog default height"
 msgstr "చందా డైలాగ� అప�రమేయ ఎత�త�"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default width"
 msgstr "చందా డైలాగ� అప�రమేయ వెడల�ప�"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Terminal font"
 msgstr "టెర�మినల� ఫాంట�"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Text message part limit"
 msgstr "పాఠ�య సందేశ భాగప� పరిమితి"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "నిరర�ధక హ�క� కొరక� అప�రమేయ ప�లగ�ఇన�"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "గతసారి ఖాళీ నిరర�ధకం నడ�స�త�న�నది, రోజ�లలో epoch న�ండి."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "గతసారి ఖాళీ చెత�తక�ండి నడ�స�త�న�నది, రోజ�లలో epoch న�ండి."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
 msgstr "మెయిల� ప�రదర�శన కొరక� టెర�మినల� ఫాంట�."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The variable width font for mail display."
 msgstr "మెయిల� ప�రదర�శన కొరక� వేరియబ�ల� వెడల�ప� ఫాంట�."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -12715,7 +12066,7 @@ msgstr ""
 "ఇది మూడ� విల�వ�లన� కలిగివ�ండవచ�చ�. దోషమ�ల కొరక� \"0\". హెచ�చరికల కొరక� \"1\". డీబగ� సందేశాల "
 "కొరక� \"2\"."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
@@ -12723,7 +12074,7 @@ msgstr ""
 "ఎవాల�యూషన� క�రింది రూపీకరించబడే పాఠ�యమ� యొక�క గరిష�ట పరిమాణంన� ఇది నిర�ధారిస�త�ంది. అప�రమేయ 4MB / 4096 "
 "KB మరియ� KB ల రూపంలో తెల�పబడింది."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12732,7 +12083,7 @@ msgstr ""
 "ఇది అప�రమేయ నిరర�ధకం ప�లగ�ఇన�, అక�కడ బహ�ళ ప�లగ�ఇన�‌ల� చేతనంచేయబడి వ�న�నాకూడా. అప�రమేయంగా జాబితా చేసిన "
 "ప�లగ�ఇన� అచేతనం చేయబడివ�ంటే, అప�ప�డ� ఇది ఇతర అంద�బాట�లోవ�న�న ప�లగ�ఇన�‌ల కొరక� వెన�కక� వెళ�ళద�."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -12740,7 +12091,7 @@ msgstr ""
 "ఈ కీ ఒకసారికి మాత�రమే చద�వ�టక� మరియ� చదివినతర�వాత \"అసత�యం\"క� అమర�చబడ�త�ంది. ఇది జాబితానందలి "
 "మెయిల� ఎంపికన� తీసివేయ�చ�న�నది మరియ� ఆసంచయంక� వ�పదర�శనంన� తొలగించ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:179
 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;"
@@ -12751,7 +12102,7 @@ msgstr ""
 "XML ఆకృతి యొక�క రూపం &lt;పీఠిత చేతనమైంది&gt; - పీఠిక మెయిల� దర�శనం లో ప�రదర�శించాలంటే చేతనం "
 "అమర�చండి."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -12761,11 +12112,11 @@ msgstr ""
 "determine whether to look up addresses in local addressbook only to exclude "
 "mail sent by known contacts from junk filtering."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "This option would help in improving the speed of fetching."
 msgstr "ఈ �చ�చికం సంగ�రహం యొక�క వేగంన� మెర�గ�పరచ�టక� దోహదపడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12773,7 +12124,7 @@ msgstr ""
 "అప�రమేయ సందేశ జాబితా దర�శనంలో చూపవలిసిన చిర�నామాల సంఖ�యన� ఇది అమర�చ�త�ంది, వెన�క �దైతే '...' "
 "చూపబడ�త�ందో."
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12781,7 +12132,7 @@ msgstr ""
 "తంత�ల� అప�రమేయంగా విస�తరింప�లో వ�ండాలో లేదా కూల�చిన స�థితినంద� వ�ండాలో ఈ అమరిక తెల�ప�త�ంది. "
 "ఎవాల�యూషన�‌క� ప�నఃప�రారంభం అవసరం."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -12790,93 +12141,81 @@ msgstr ""
 "ప�రతి తంతినంద� సందేశమ�ల తేదీలపై ఆధారపడ�ట కన�నా సరికొత�త సందేశం లపై ఆధారపడి తంత�ల� క�రమపరచాలేమో, ఈ "
 "అమర�ప� తెలియజేస�త�ంది. ఎవాల�య�షన� క� ప�నఃప�రారంభం అవసరం."
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Thread the message list."
-msgstr "సందేశ జాబితాన� తంతిచేయ�మ�."
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "Thread the message-list"
-msgstr "సందేశ-జాబితాన� తంతిచేయ�మ"
-
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message-list based on Subject"
 msgstr "సంగతి పై ఆదారపడి సందేశ-జాబితాన� తంతిచేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Timeout for marking message as seen"
 msgstr "సందేశాన�ని చూసినదానిలా గ�ర�త�ంచ�టక� సమయంమించినది"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Timeout for marking message as seen."
 msgstr "చూచినట�ల�గా సందేశాన�ని గ�ర�త�ంచ�టక� సమయం మించిపోయింది."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "UID string of the default account."
 msgstr "అప�రమేయ ఖాతా యొక�క UID స�ట�రింగ�."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ఇన�‌లైన� స�పెల�లింగ�‌న� వ�పయోగిస�త�న�నప�ప�డ� తప�ప�గాస�పెల� చేయబడిన పదమ�ల క�రిందిగీత వర�ణమ�."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Use SpamAssassin daemon and client"
 msgstr "స�పామ�ఎస�సైన� డెమోన� మరియ� కక�షిదార�న� ఉపయోగించ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "స�పామ�ఎస�సైన� డెమోన� మరియ� కక�షిదార� (spamc/spamd)న� వ�పయోగించ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use custom fonts"
 msgstr "మల�చ�క�న�న ఫాంట�లన� ఉపయోగించ�"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use custom fonts for displaying mail."
 msgstr "మెయిల�‌న� ప�రదర�శించ�టక� మల�చ�క�న�న ఫాంట�లన� వ�పయోగించ�."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use only local spam tests."
 msgstr "స�థానిక స�పామ� పరిశీలనలన� మాత�రమే ఉపయోగించ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use only the local spam tests (no DNS)."
 msgstr "స�థానిక స�పామ� పరిశీలనలన� మాత�రమే పరిశీలించ�మ� (DNS కాద�)."
 
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid "Use side-by-side or wide layout"
-msgstr "ప�రక�క-ప�రక�కగా-ఉండ� లేదా వెడల�పాటి వాస�త�న� ఉపయోగించ�"
-
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr ""
-"సందేశమ�నక� ప�రత�య�త�తరమ� యిచ�చ�నప�ప�డ� కర�సర� యెక�కడికి వెళ�ళాలి అన�దానికి వినియోగదార�ల� అన�ని "
-"పై ఆర�మ�స�న� పొంద�తార�. కర�సర� సందేశమ�పైన వ�ంచాలా లేక క�రిందవ�ంచాలా అన�నది యిది నిర�ణయిస�త�ంది."
+"సందేశమ�నక� ప�రత�య�త�తరమ� యిచ�చ�నప�ప�డ� కర�సర� యెక�కడికి వెళ�ళాలి అన�దానికి వినియోగదార�ల� అన�ని పై "
+"ఆర�మ�స�న� పొంద�తార�. కర�సర� సందేశమ�పైన వ�ంచాలా లేక క�రిందవ�ంచాలా అన�నది యిది నిర�ణయిస�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
-"సందేశమ�నక� ప�రత�య�త�తరమ� యిచ�చ�నప�ప�డ� వారి సంతకం యెక�కడికి వెళ�ళాలి అన�దానికి వినియోగదార�ల� అన�ని "
-"పై ఆర�మ�స�న� పొంద�తార�. సంతకం సందేశమ�పైన వ�ంచాలా లేక క�రిందవ�ంచాలా అన�నది యిది నిర�ణయిస�త�ంది."
+"సందేశమ�నక� ప�రత�య�త�తరమ� యిచ�చ�నప�ప�డ� వారి సంతకం యెక�కడికి వెళ�ళాలి అన�దానికి వినియోగదార�ల� అన�ని పై "
+"ఆర�మ�స�న� పొంద�తార�. సంతకం సందేశమ�పైన వ�ంచాలా లేక క�రిందవ�ంచాలా అన�నది యిది నిర�ణయిస�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Variable width font"
 msgstr "వేరియబ�ల� వెడల�ప� ఫాంట�"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "ప�రతి సందేశాని కి అప�రమేయంగా రశీద� న� చద�వ� అభ�యర�దన జతచేయవలెనా."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "పక�కపట�టీ నంద� ఫోల�డర� నామాలయొక�క ఎలిప�సైజింగ� సౌలభ�యాన�ని అచేతనం చేయాలా."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12884,22 +12223,28 @@ msgstr ""
 "సందేశం దీనికి-ప�రత�య�త�తరంగా లేదా సంప�రదించ�చూ పీఠికలన� కలిగిలేనప�ప�డ� సంగత�ల ద�వారా తంతీకరణ పై "
 "వెన�కక� వేళ�ళాలా వద�దా."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "తంతిలోని సరికొత�త సందేశం పై ఆధరపడి తంత�లన� క�రమపరచవలెనా"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Width of the message-list pane"
 msgstr "సందేశ-జాబితా తలం యొక�క వెడల�ప�"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Width of the message-list pane."
 msgstr "సందేశ-జాబితా తలం యొక�క వెడల�ప�."
 
-#: ../mail/importers/elm-importer.c:182
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "Elm డాటాన� దిగ�మతిచేస�తోంది"
 
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../modules/mail/e-mail-shell-view.c:952
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+msgid "Mail"
+msgstr "మెయిల�"
+
 #: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "ఎవాల�యూషన� Elm దిగ�మతిదారి"
@@ -12908,724 +12253,549 @@ msgstr "ఎవాల�యూషన� Elm దిగ�మతిదారి"
 msgid "Import mail from Elm."
 msgstr "Elm న�ండి మెయిల� న� దిగ�మతి చేయ�మ�."
 
-#: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:309
+#: ../mail/importers/evolution-mbox-importer.c:115
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "Destination folder:"
 msgstr "గమ�యస�థాన సంచయం:"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:302
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
+msgid "Select folder"
+msgstr "సంచయంన� ఎంపికచేస�కొన�మ�"
+
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder to import into"
 msgstr "దీనిలోకి దిగ�మతిచేయ�టక� సంచయంన� ఎంపికచేయ�మ�"
 
-#: ../mail/importers/evolution-mbox-importer.c:219
+#: ../mail/importers/evolution-mbox-importer.c:260
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "బెర�కెలి మెయిల�‌బాక�స� (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:261
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "దిగ�మతిదారి బెర�కెలి మెయిల�‌పెట�టె రూపం సంచయాల�"
 
-#: ../mail/importers/mail-importer.c:147
+#: ../mail/importers/mail-importer.c:71
 msgid "Importing mailbox"
 msgstr "మెయిల�‌పెట�టెన� దిగ�మతిచేస�తోంది"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:454
-#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
+#: ../mail/importers/mail-importer.c:155
+#: ../plugins/pst-import/pst-importer.c:456
+#: ../plugins/pst-import/pst-importer.c:562
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' న� దిగ�మతిచేస�తోంది"
 
-#: ../mail/importers/mail-importer.c:371
+#: ../mail/importers/mail-importer.c:298
 #, c-format
 msgid "Scanning %s"
 msgstr "%s న� స�కానింగ� చేస�తోంది"
 
-#: ../mail/importers/pine-importer.c:225
+#: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
 msgstr "పైన� డాటాన� దిగ�మతిచేస�తోంది"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:379
+#: ../modules/addressbook/addressbook-config.c:986
+msgid "Address Book"
+msgstr "చిర�నామా ప�స�తకం"
+
+#: ../mail/importers/pine-importer.c:420
 msgid "Evolution Pine importer"
 msgstr "ఎవాల�యూషన� పైన� దిగ�మతిదారి"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:421
 msgid "Import mail from Pine."
 msgstr "పైన� న�ండి మెయిల� దిగ�మతిచేయ�మ�."
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:73
 #, c-format
 msgid "Mail to %s"
 msgstr "%s క� మెయిల� చేయ�మ�"
 
-#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "%s న�ండి మెయిల�"
 
-#: ../mail/mail-autofilter.c:258
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "సంగతి %s"
 
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s మెయిలింగ� జాబితా"
 
-#: ../mail/mail-autofilter.c:364
+#: ../mail/mail-autofilter.c:366
 msgid "Add Filter Rule"
 msgstr "వడపోత నియమాన�ని జతచేయ�మ�"
 
-#: ../mail/mail-component.c:573
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "%d ఎంపికచేయబడెన�, "
-msgstr[1] "%d ఎంపికచేయబడెన�, "
-
-#: ../mail/mail-component.c:577
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d తొలగించబడెన�"
-msgstr[1] "%d తొలగించబడెన�"
-
-#: ../mail/mail-component.c:584
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d నిరర�ధకమైన"
-msgstr[1] "%d నిరర�ధకమైన"
-
-#: ../mail/mail-component.c:587
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d డ�రాఫ�ట�స�"
-msgstr[1] "%d డ�రాఫ�ట�స�"
-
-#: ../mail/mail-component.c:589
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d పంపిన"
-msgstr[1] "%d పంపిన"
-
-#: ../mail/mail-component.c:591
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d పంపని"
-msgstr[1] "%d పంపని"
-
-#: ../mail/mail-component.c:597
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d చదవని, "
-msgstr[1] "%d చదవని, "
-
-#: ../mail/mail-component.c:598
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d మొత�తం"
-msgstr[1] "%d మొత�తం"
-
-#: ../mail/mail-component.c:952
-msgid "New Mail Message"
-msgstr "సరికొత�త తపాలా సందేశం"
-
-#: ../mail/mail-component.c:953
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "తపాలా సందేశం (_M)"
-
-#: ../mail/mail-component.c:954
-msgid "Compose a new mail message"
-msgstr "కొత�త మెయిల� సందేశం న� కూర�చ�మ�"
-
-#: ../mail/mail-component.c:960
-msgid "New Mail Folder"
-msgstr "కొత�త మెయిల� సంచయం"
-
-#: ../mail/mail-component.c:961
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "మెయిల� ఫోల�డర� (_F)"
-
-#: ../mail/mail-component.c:962
-msgid "Create a new mail folder"
-msgstr "కొత�త మెయిల� సంచయంన� సృష�టించ�మ�"
-
-#: ../mail/mail-component.c:1109
-msgid "Failed upgrading Mail settings or folders."
-msgstr "మెయిల� అమరికలన� లేదా సంచయాలన� నవీకరించ�టలో విఫలమైంది."
-
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(గమనిక: అన�వర�తనం ప�నఃప�రారంభం అవసరం)"
 
-#: ../mail/mail-config.glade.h:3
-msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>SSL ఈ ఎవాల�యూషన� నిర�మాణంలో మద�దత�నీయద�</b>"
-
-#: ../mail/mail-config.glade.h:4
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>పంపకందార� ఛాయాచిత�రం</b>"
-
-#: ../mail/mail-config.glade.h:5
-msgid "<b>Sig_natures</b>"
-msgstr "<b>సంతకాల�(_n)</b>"
-
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.ui.h:2
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>టాప� పోస�టింగ� �చ�చికం</b> (సిఫార�స� చేయలేద�)"
 
-#: ../mail/mail-config.glade.h:7
-msgid "<b>_Languages</b>"
-msgstr "<b>భాషల�(_L)</b>"
-
-#: ../mail/mail-config.glade.h:8
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">ఖాతా సమాచారం</span>"
-
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">దృవీకరణ</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">సందేశాలన� కూర�చ�తోంది</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">ఆకృతీకరణ</span>"
-
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">అప�రమేయ ప�రవర�తన</span>"
-
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">మెయిల� తొలగించ�</span>"
-
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">ప�రదర�శించిన సదేశం పీఠికల� (_H)</span>"
-
-#: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">లేబ�ళ�ళ�</span>"
-
-#: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">చిత�రాలన� నింప�తోంది</span>"
-
-#: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">సందేశం ప�రదర�శన</span>"
-
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">సందేశం ఫాంట�ల�</span>"
-
-#: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">సందేశం స�వీకరణదార�ల�</span>"
-
-#: ../mail/mail-config.glade.h:23
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">�చ�చిక సమాచారం</span>"
-
-#: ../mail/mail-config.glade.h:24
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">�చ�చికాల�</span>"
-
-#: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "<span weight=\"bold\">చాలా మంచి వెస�ల�బాట� (PGP/GPG)</span>"
-
-#: ../mail/mail-config.glade.h:26
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">మ�ద�రించిన ఫాంట�స�</span>"
-
-#: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">ప�రోక�సీ అమరికల�</span>"
-
-#: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">అవసరమగ� సమాచారం</span>"
-
-#: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr "<span weight=\"bold\">రక�షితమైన MIME (S/MIME)</span>"
-
-#: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">రక�షణ</span>"
-
-#: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">పంపిన మరియ� డ�రాఫ�ట�  సందేశాల�</span>"
-
-#: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">సేవిక ఆకృతీకరణ</span>"
-
-#: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">దృవీకరణం రకమ� (_A)</span>"
-
-#: ../mail/mail-config.glade.h:35
-msgid "Account Management"
-msgstr "ఖాతా నిర�వహణ"
+#: ../mail/mail-config.ui.h:3
+#, fuzzy
+msgid "Account Information"
+msgstr "సమాచారం లేద�"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.ui.h:4
 msgid "Add Ne_w Signature..."
 msgstr "కొత�త సంతకాన�ని కల�ప�మ�(_w)..."
 
-#: ../mail/mail-config.glade.h:37
-msgid "Add _Script"
-msgstr "లిపిని కల�ప�మ�(_S)"
-
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.ui.h:5
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "ఈ ఖాతాన� ఉపయోగించ�నప�ప�డ� ఎప�ప�డూ బయటక�వెళ�ళ� సందేశాలన� సంతకంచేయి(_w)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "ఎన�క�రిప�టెడ� సందేశాలన� పంప�త�న�నప�ప�డ� స�వతంక� ఎన�క�రిప�ట� అవ�వ�మ� (_f)"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ఎప�ప�డ� వీరకి కార�బన�-నకలే (cc)(_s):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "(_b) ఎప�ప�డూ బ�లైండ� కార�బన�-నకలే (bcc):"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "ఎన�క�రిప�టింగ� చేయ�చ�న�నప�పడ� ఎప�పడూ నా కీరింగ� లోని కీలన� నమ�మ�మ�(_t)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ఎన�క�రిప�టెడ� సందేశాలన� పంప�త�న�నప�ప�డ� ఎప�ప�డూ నన�నూ ఎన�క�రిప�ట�చేయ�మ� (_m)"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "ఎప�ప�డూ చదివిన రశీద� న� అభ�యర�ధించ�మ�(_d)"
 
-#: ../mail/mail-config.glade.h:45
-#| msgid "Attachment Reminder"
-msgid ""
-"Attachment\n"
-"Inline\n"
-"Quoted"
-msgstr ""
-"అన�బంధమ�\n"
-"లైన�లోపల\n"
-"కోట�‌చేసిన"
-
-#: ../mail/mail-config.glade.h:48
-msgid ""
-"Attachment\n"
-"Inline (Outlook style)\n"
-"Quoted\n"
-"Do not quote"
-msgstr ""
-"అన�భందమ�\n"
-"లైన�లోపల (అవ�ట�‌ల�క� శైలి)\n"
-"కోట�‌చేసిన\n"
-"కోట� చేయవద�ద�"
+#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+msgid "Authentication"
+msgstr "ప�రామాణీకరణ"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "స�వయంచాలకంగా emoticon చిత�రాలన� చేర�చ�మ� (_e)"
 
-#: ../mail/mail-config.glade.h:53
-msgid "Baltic (ISO-8859-13)"
-msgstr "బాల�టిక� (ISO-8859-13)"
-
-#: ../mail/mail-config.glade.h:54
-msgid "Baltic (ISO-8859-4)"
-msgstr "బాల�టిక� (ISO-8859-4)"
-
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "అక�షర సమితి(_h):"
 
-#: ../mail/mail-config.glade.h:56
-#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "మద�దతివ�వబడ� రకమ�ల కొరక� పరిశీలించ�మ�(_e)"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "నిరర�ధకం కొరక� మ�ల�చ�క�న�న పీఠికలన� పరిశీలించ�మ� (_s)"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "లోనిక వస�త�న�న సందేశాలన� నిరర�ధకం కొరక� పరిశీలించ�మ�"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "నేన� టైప� చేస�త�న�నప�ప�డే స�పెల�లింగ� న� పరిశీలించ�మ�(_t)"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.ui.h:21
 msgid "Checks incoming mail messages to be Junk"
 msgstr "లోనకివస�త�న�న సందేశాలలో నిరర�ధకం కొరక� పరిశీలించ�"
 
-#: ../mail/mail-config.glade.h:61
+#: ../mail/mail-config.ui.h:22
 msgid "Cle_ar"
 msgstr "శ�బ�రంచేయ�(_a)"
 
-#: ../mail/mail-config.glade.h:62
+#: ../mail/mail-config.ui.h:23
 msgid "Clea_r"
 msgstr "శ�బ�రంచేయ�బాల�టిక� (_r)"
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.ui.h:24
 msgid "Color for _misspelled words:"
 msgstr "తప�ప�గా స�పెల�‌చేసిన పదాలకొరక� వర�ణమ�(_m):"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.ui.h:25
+#, fuzzy
+msgid "Composing Messages"
+msgstr "సందేశాన�ని కూర�చ�మ�"
+
+#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "ఆకృతీకరణ"
+
+#: ../mail/mail-config.ui.h:27
 msgid "Confirm _when expunging a folder"
 msgstr "ఒక సంచయాన�ని కొట�టివేయ�చ�న�నప�పడ� నిర�ధారించ�కొన�మ�(_w)"
 
-#: ../mail/mail-config.glade.h:65
-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 ""
-"ధన�యవాదమ�ల�, మీ మెయిల� ఆకృతీకరణ పూర�తైనది.\n"
-"\n"
-"మీర� ఎవాల�యూషన� ఉపయోగించి మెయిల�స� న� పంప�టక� మరియ�\n"
-"స�వీకరించ�టక� ఇప�ప�డ� సిద�దంగా ఉన�నార�.\n"
-"\n"
-"మీ అమరికలన� దాయ�టక� \"ఆపాదించ�\" న� నొక�కండి."
-
-#: ../mail/mail-config.glade.h:71
-msgid "De_fault"
-msgstr "అప�రమేయ(_f)"
+#: ../mail/mail-config.ui.h:29
+#, fuzzy
+msgid "Default Behavior"
+msgstr "ఆప�రమేయ ప�రాధాన�యం:"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.ui.h:30
 msgid "Default character e_ncoding:"
 msgstr "అప�రమేయ అక�షర ఎన�కోడింగ�(_n):"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.ui.h:32
+#, fuzzy
+msgid "Delete Mail"
+msgstr "తొలగించ�"
+
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "బయటక�వచ�చ�నప�పడ� నిరర�ధక సందేశాలన� తొలగించ�మ� (_x)"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "బయటక� వెళ�ళ� సందేశాలన� (అప�రమేయంగా) డిజిటల� సంతకంచేయ�మ� (_u)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.ui.h:36
+#, fuzzy
+msgid "Displayed Message _Headers"
+msgstr "అన�ని సందేశ పీఠికల�(_H)"
+
+#: ../mail/mail-config.ui.h:37
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "పాఠ�య పరిమాణం మించితే సందేశాలన� రూపీకరించవద�ద� (_z)"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:38
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "పంపకందార� నాచిర�నామా ప�స�తంకంలో వ�ంటే సందేశాలన� నిరర�ధకంగా గ�ర�తించవద�ద� (_k)"
 
-#: ../mail/mail-config.glade.h:79
-msgid "Done"
-msgstr "అయినది"
+#: ../mail/mail-config.ui.h:39
+#, fuzzy
+msgid "Do not quote"
+msgstr "తొలగించవద�ద�"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.ui.h:40
 msgid "Drafts _Folder:"
 msgstr "డ�రాఫ�ట�  సంచయం(_F):"
 
-#: ../mail/mail-config.glade.h:81
-msgid "Email Accounts"
-msgstr "ఈమెయిల� ఖాతాల�"
-
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.ui.h:41
 msgid "Email _Address:"
 msgstr "ఈ మెయిల� చిర�నామ(_A):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:42
 msgid "Empty trash folders on e_xit"
 msgstr "బయటక� వచ�చ�నప�ప�డ� చెత�తక�ండీ సంచయాలన� ఖాళీచేయ�మ�"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.ui.h:43
 msgid "Enable Magic S_pacebar"
 msgstr "మాయా స�పేస�‌బార� న� చేతనంచేయ�మ� (_p)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Sea_rch Folders"
 msgstr "శోధన సంచయాలన� చేతనంచేయ�మ�(_r)"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "ఎన�క�రిప�షన� దృవీకరణపత�రం(_p):"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "బయటక�వెళ�ళ� సందేశాలన� ఎన�క�రిప�ట�చేయ�మ� (అప�రమేయంగా)"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.ui.h:48
 msgid "Fi_xed-width:"
 msgstr "నిర�దేశిత-వెడల�ప�(_x):"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed width Font:"
 msgstr "నిర�దేశిత వెడల�ప� ఫాంట� (_e):"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.ui.h:50
 msgid "Font Properties"
 msgstr "ఫాంట� లక�షణాల�"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.ui.h:51
 msgid "Format messages in _HTML"
 msgstr "సందేశాలన� _HTML నంద� రూపీకరించ�మ�"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.ui.h:52
 msgid "Full Nam_e:"
 msgstr "పూర�తి నామం(_e):"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML సందేశాల�"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ప�రోక�సీ:"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.ui.h:56
 msgid "Headers"
 msgstr "పీఠికల�"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.ui.h:57
 msgid "Highlight _quotations with"
 msgstr "కొటేషన�లన� వీటితో ఉద�దీపనంచేయ�మ�(_q)"
 
-#: ../mail/mail-config.glade.h:101
-msgid ""
-"If the server uses a non-standard port then specify the server address as "
-"\"server-name:port-number\""
+#: ../mail/mail-config.ui.h:59
+#, fuzzy
+msgid "Inline"
+msgstr "ఇన�‌లైన�(_I)"
+
+#: ../mail/mail-config.ui.h:60
+msgid "Inline (Outlook style)"
 msgstr ""
-"సేవిక ప�రామాణికం-కాని పోర�ట�న� వ�పయోగిస�త�ంటే అప�ప�డ� సేవిక చిర�నామాన� "
-"\"server-name:port-number\" వలె తెల�ప�మ�"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.ui.h:62
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "లేబ�ళ�ళ�"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.ui.h:64
 msgid "Languages Table"
 msgstr "భాషాల పట�టిక"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Mail Configuration"
-msgstr "మెయిల� ఆకృతీకరణ"
+#: ../mail/mail-config.ui.h:65
+#, fuzzy
+msgid "Loading Images"
+msgstr "చిత�రమ�లన� నింప�మ�(_L)"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.ui.h:66
 msgid "Mail Headers Table"
 msgstr "మెయిల� పీఠికల పట�టిక"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.ui.h:67
 msgid "Mailbox location"
 msgstr "మెయిల�‌పెట�టె స�థానమ�"
 
-#: ../mail/mail-config.glade.h:110
-msgid "Message Composer"
-msgstr "సందేశం కూర�పరి"
+#: ../mail/mail-config.ui.h:68
+#, fuzzy
+msgid "Message Display"
+msgstr "సందేశాల�"
+
+#: ../mail/mail-config.ui.h:69
+#, fuzzy
+msgid "Message Fonts"
+msgstr "సందేశం కలిగినది"
+
+#: ../mail/mail-config.ui.h:70
+#, fuzzy
+msgid "Message Receipts"
+msgstr "సందేశం తిప�ప�కొన�ట"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "(_P) దీనికొరక� ప�రోక�సీలేద�:"
 
-#: ../mail/mail-config.glade.h:112
-msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr "గమనిక: లేబ�ల� నామమ�నంద� ఉన�న క�రిందిగీత మెనూ నంద� సంభందిత గ�ర�తింప�దారి గా ఉపయోగపడ�త�ంది."
-
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.ui.h:73
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "గమనిక: మీర� మొదటిసారి అన�సంధానించ బడనంతవరక� మీర� సంకేతపదం కొరక� అడ�గబడర�"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.ui.h:74
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "మల�చ�క�న�న నిరర�ధకం పీఠికలక� జోడి కనబడినట�లైతే ఈ �చ�చికం పట�టించ�కోబడద�."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.ui.h:75
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+#, fuzzy
+msgid "Optional Information"
+msgstr "వ�యక�తిగత సమాచారం"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Or_ganization:"
 msgstr "నిర�వహణాసంస�థ(_g):"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.ui.h:78
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG à°•à±€ ID(_K):"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.ui.h:79
 msgid "Pass_word:"
 msgstr "సంకేతపదం (_w):"
 
-#: ../mail/mail-config.glade.h:119
-#| msgid "Please select among the following options"
-msgid "Please configure the following account settings."
-msgstr "దయచేసి క�రింది ఖాతా అమరికలన� ఆకృతీకరించ�మ�."
-
-#: ../mail/mail-config.glade.h:120
-#| msgid ""
-#| "Please enter a descriptive name for this account in the space below.\n"
-#| "This name will be used for display purposes only."
-msgid ""
-"Please enter a descriptive name for this account in the space below. This "
-"name will be used for display purposes only."
-msgstr ""
-"క�రింది ఖాళినంద� ఈ ఖాతా కొరక� దయచేసి విశదీకృత నామమ�న� ప�రవేశపెట�ట�మ�. ఈ నామమ� ప�రదర�శించ�టక� "
-"మాత�రమే వ�పయోగించబడ�త�ంది."
-
-#: ../mail/mail-config.glade.h:121
-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:122
-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:123
+#: ../mail/mail-config.ui.h:81
 msgid "Port:"
 msgstr "పోర�ట�:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:82
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "సందేశాలన� Bcc స�వీకరణదార�లన� ఉద�దేశించి పంప�త�న�నప�పడ� అడ�గ�మ�(_o)"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.ui.h:83
+#, fuzzy
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "<span weight=\"bold\">చాలా మంచి వెస�ల�బాట� (PGP/GPG)</span>"
+
+#: ../mail/mail-config.ui.h:85
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "మెమోలన� మ�ద�రించ�"
+
+#: ../mail/mail-config.ui.h:86
+#, fuzzy
+msgid "Proxy Settings"
+msgstr "నిరర�ధకంక� అమరికల�"
+
+#: ../mail/mail-config.ui.h:87
+#, fuzzy
+msgid "Quoted"
+msgstr "కోటెడ�(_Q)"
+
+#: ../mail/mail-config.ui.h:88
 msgid "Re_member password"
 msgstr "సంకేతపదాన�ని గ�ర�త�ంచ�కొన�మ�(_m)"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:89
 msgid "Re_ply-To:"
 msgstr "వీరికి-ప�రత�య�త�తరమ�(_p):"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.ui.h:91
 msgid "Remember _password"
 msgstr "సంకేతపదాన�ని గ�ర�త�ంచ�కొన�మ�(_p)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.ui.h:92
+#, fuzzy
+msgid "Required Information"
+msgstr "సేవిక సమాచారం"
+
+#: ../mail/mail-config.ui.h:94
+#, fuzzy
+msgid "SSL is not supported in this build of Evolution"
+msgstr "<b>SSL ఈ ఎవాల�యూషన� నిర�మాణంలో మద�దత�నీయద�</b>"
+
+#: ../mail/mail-config.ui.h:95
 msgid "S_earch for sender photograph only in local address books"
 msgstr "స�థానిక చిర�నామా ప�స�తకమ�లంద� పంపకందార� ఛాయాచిత�రమ�ల కొరక� మాత�రమే శోధించ�మ� (_e)"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.ui.h:96
 msgid "S_elect..."
 msgstr "ఎంపికచేయ�మ�(_e)..."
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.ui.h:97
 msgid "S_end message receipts:"
 msgstr "సందేశ రశీద�లన� పంప�మ�(_e):"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.ui.h:98
 msgid "S_tandard Font:"
 msgstr "ప�రామాణిక ఫాంట�(_t):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.ui.h:99
+msgid "Secure MIME (S/MIME)"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:101
+#, fuzzy
+msgid "Select Drafts Folder"
+msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
+
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "HTML నిర�ధారిత వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font for printing"
 msgstr "మ�ద�రణ కొరక� HTML నిర�ధారిత వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "HTML వేరియబ�ల� వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font for printing"
 msgstr "మ�ద�రణ కొరక� HTML వేరియబ�ల� వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.ui.h:106
+#, fuzzy
+msgid "Select Sent Folder"
+msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
+
+#: ../mail/mail-config.ui.h:107
+#, fuzzy
+msgid "Sender Photograph"
+msgstr "<b>పంపకందార� ఛాయాచిత�రం</b>"
+
+#: ../mail/mail-config.ui.h:108
 msgid "Sending Mail"
 msgstr "మెయిల� న� పంప�త�న�నది"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.ui.h:109
 msgid "Sent _Messages Folder:"
 msgstr "సందేశాల సంచయంన� పంపినది(_M):"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.ui.h:110
+#, fuzzy
+msgid "Sent and Draft Messages"
+msgstr "పంపిన సందేశాల�"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "సేవికక� దృవీకరణ అవసరం(_v)"
 
-#: ../mail/mail-config.glade.h:142
-#| msgid "Server _Type: "
+#: ../mail/mail-config.ui.h:112
+#, fuzzy
+msgid "Server Configuration"
+msgstr "సేవిక సమాచారం"
+
+#: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
 msgstr "సేవిక రకం (_T):"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.ui.h:114
+#, fuzzy
+msgid "Sig_natures"
+msgstr "సంతకాల�"
+
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_ning certificate:"
 msgstr "దృవీకరణపత�రం న� సతకంచేయ�చ�న�నది(_n):"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.ui.h:116
 msgid "Signat_ure:"
 msgstr "సతకం(_u):"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.ui.h:117
 msgid "Signatures"
 msgstr "సంతకాల�"
 
-#: ../mail/mail-config.glade.h:146
-msgid "Signatures Table"
-msgstr "సంతకాల పట�టిక"
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.ui.h:118
 msgid "Spell Checking"
 msgstr "స�పెల� పరిశీలన"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.ui.h:119
 msgid "Start _typing at the bottom on replying"
 msgstr "జవాబ�యిచ�చ�నప�ప�డ� క�రిందన టైప�చేయ�ట ప�రారంభించ�మ� (_t)"
 
-#: ../mail/mail-config.glade.h:149
-#| msgid "T_ype: "
+#: ../mail/mail-config.ui.h:121
 msgid "T_ype:"
 msgstr "రకమ� (_T):"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.ui.h:122
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "మీర� � భాషల కొరకైతే నిఘంట�వ�లన� సంస�థాపించారో ఆ భాషల� మాత�రమే ఈ భాషల జాబితానంద� ప�రతిబింబిస�తాయి."
+msgstr ""
+"మీర� � భాషల కొరకైతే నిఘంట�వ�లన� సంస�థాపించారో ఆ భాషల� మాత�రమే ఈ భాషల జాబితానంద� ప�రతిబింబిస�తాయి."
 
-#: ../mail/mail-config.glade.h:151
-#| msgid ""
-#| "The output of this script will be used as your\n"
-#| "signature. The name you specify will be used\n"
-#| "for display purposes only. "
+#: ../mail/mail-config.ui.h:123
+#, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used for display purposes only."
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
 "ఈ లిపి యొక�క అవ�ట�‌ప�ట� మీ సంతకంలాగా\n"
 "ఉపయోగించబడ�త�ంది. మీర� తెలిపిన నామమ� ప�రదర�శన వినియోగార�దం మాత�రమే ఉపయోగించబడ�త�ంది."
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13633,217 +12803,250 @@ msgstr ""
 "దేనిద�వారా మీర� ఈ ఖాతా న� సంప�రదించాలి అన�క�ంట�న�నారో ఆ నామాన�ని టైప�చేయండి.\n"
 "ఉదాహరణక�: \"పని\" లేదా \"వ�యక�తిగత\""
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.ui.h:128
 msgid "Us_ername:"
 msgstr "(_e) వినియోగదారి నామమ�:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.ui.h:129
 msgid "Use Authe_ntication"
 msgstr "ధృవీకరణన� వ�పయోగించ�మ� (_n)"
 
-#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-source.c:681
-#: ../plugins/google-account-setup/google-contacts-source.c:280
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../plugins/google-account-setup/google-contacts-source.c:283
+#: ../plugins/google-account-setup/google-source.c:620
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "వినియోగదారి నామమ�(_n):"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.ui.h:131
 msgid "V_ariable-width:"
 msgstr "వేరియబ�ల�-వెడల�ప�(_a):"
 
-#: ../mail/mail-config.glade.h:159
-#| msgid ""
-#| "Welcome to the Evolution Mail Configuration Assistant.\n"
-#| "\n"
-#| "Click \"Forward\" to begin. "
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"ఎవాల�యూషన� మెయిల� ఆకృతీకరణ సహాయకిక� స�వాగతం.\n"
-"\n"
-"ప�రారంభించ�టక� \"మ�ంద�క�పంప�\"న� నొక�క�మ�. "
-
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.ui.h:132
 msgid "_Add Signature"
 msgstr "సంతకాన�ని కల�ప�మ�(_A)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.ui.h:133
 msgid "_Always load images from the Internet"
 msgstr "ఎల�లప�ప�డ� చిత�రాలన� ఇంటర�నెట� న�ండి లోడ�చేయ�మ�(_A)"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:134
+msgid "_Authentication Type"
+msgstr "దృవీకరణ రకం (_A)"
+
+#: ../mail/mail-config.ui.h:135
 msgid "_Default junk plugin:"
 msgstr "అప�రమేయ నిరర�ధక ప�లగ�ఇన�(_D):"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:136
 msgid "_Direct connection to the Internet"
 msgstr "ఇంటర�నెట�‌క� నేర�గా అన�సంధానం (_D)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.ui.h:137
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "సమావేశ అభ�యర�దనలన� సతంకం చేయవద�ద�(_D) (అవ�ట�‌ల�క� సారూప�యతకొరక�)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.ui.h:138
 msgid "_Forward style:"
 msgstr "మ�ంద�క�పంప� శైలి(_F):"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:139
 msgid "_Keep Signature above the original message on replying"
 msgstr "ప�రత�య�త�తరమ� ఇచ�చ�నప�ప�డ� సంతకాన�ని వాస�తవ సందేశంపైన ఉంచ�మ�(_K)"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.ui.h:140
+#, fuzzy
+msgid "_Languages"
+msgstr "భాష"
+
+#: ../mail/mail-config.ui.h:141
 msgid "_Load images in messages from contacts"
 msgstr "సందేంశమ�లనంద� చిత�రాలన� పరిచయాలన�ండి నింప�మ� (_L)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.ui.h:142
 msgid "_Lookup in local address book only"
 msgstr "స�థానిక చిర�నామా ప�స�తకంనంద� మాత�రమే చూడ�మ� (_L)"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.ui.h:143
 msgid "_Make this my default account"
 msgstr "దీనిని నా అప�రమేయ ఖాతా లా చేయ�మ�(_M)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.ui.h:144
 msgid "_Manual proxy configuration:"
 msgstr "మానవీయ ప�రోక�సీ ఆకృతీకరణ (_M):"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.ui.h:145
 msgid "_Mark messages as read after"
 msgstr "దీనితర�వాత సందేశాలన� చదివినట�ల� గర�త�ంచ�(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.ui.h:147
 msgid "_Never load images from the Internet"
 msgstr "చిత�రాలన� ఇంటర�నెట� న�ండి ఎప�ప�డ� నింపవద�ద�(_N)"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.ui.h:148
 msgid "_Path:"
 msgstr "పాత�(_P):"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.ui.h:149
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML సందేశాలన� వాటిని కోరని పరిచయాలక� పంప�త�న�నప�ప�డ� అడ�గ�మ� (_P)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "సందేశాలన� ఖాళీ సంగతిపంక�తి తో పంప�త�న�నప�ప�డ� అడ�గ�మ�(_P)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "ప�రత�య�త�తరమ� శైలి(_R):"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "లిపి(_S):"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "రక�షిత HTTP ప�రోక�సీ (_S):"
 
-#: ../mail/mail-config.glade.h:183
-msgid "_Select..."
-msgstr "ఎంపికచేయి (_S)..."
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Server:"
+msgstr "సేవిక(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.ui.h:157
 msgid "_Show image animations"
 msgstr "చిత�రమ� యానిమేషన�‌లన� చూప�మ�(_S)"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
 msgstr "సందేశం ఉపదర�శనంలో పంపకందారి యొక�క ఛాయాచిత�రంన� చూప�మ� (_S)"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.ui.h:159
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "To / Cc / Bcc పీఠికల� కూడా ష�రింక�‌చేయ�మ�(_S)"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "రక�షిత అన�సంధానంన� ఉపయోగించ�మ�(_U):"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "సిస�టమ� అప�రమేయాలన� వ�పయోగించ� (_U)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "ఇతర అన�వర�తనంలలాగా అవే ఫాంట�లన� ఉపయోగించ�మ�(_U)"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#, fuzzy
+msgid "a"
+msgstr "am"
+
+#: ../mail/mail-config.ui.h:164
 msgid "addresses"
 msgstr "చిర�నామాల�"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#, fuzzy
+msgid "b"
+msgstr "ద�వారా"
+
+#: ../mail/mail-config.ui.h:166
 msgid "color"
 msgstr "వర�ణమ�"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.ui.h:167
 msgid "description"
 msgstr "వివరణ"
 
-#: ../mail/mail-config.glade.h:197
-msgid "seconds"
-msgstr "సెకన�ల�"
-
-#: ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-dialogs.ui.h:1
 msgid "    "
 msgstr "    "
 
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>సంచయం మూలాలన� శోధించ�మ�</b>"
-
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">డిజిటల� సంతకం</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">ఎన�క�రిప�షన�</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "అన�ని క�రియాశీల దూరస�థ సంచయంల�"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local and active remote folders"
 msgstr "అన�ని స�థానిక మరియ� క�రియాశీల దూరస�థ సంచయమ�ల�"
 
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local folders"
 msgstr "అన�ని స�థానిక సంచయాల�"
 
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Call"
+msgstr "à°•à°¾"
+
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "పూర�తేనది(_m)"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
-msgid "Flag to Follow Up"
-msgstr "అన�సరించ�టక� ప�లాగ�"
+#: ../mail/mail-dialogs.ui.h:7
+#, fuzzy
+msgid "Digital Signature"
+msgstr "సంతకాన�ని సరిచేయి"
+
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "మ�ంద�క� పంపవద�ద�"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.ui.h:9
+#, fuzzy
+msgid "Encryption"
+msgstr "ఎన�క�రిప�ట�"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Folder Subscriptions"
 msgstr "సచయం చందాల�"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Follow-Up"
+msgstr "అన�సరించ�"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "For Your Information"
+msgstr "మీ సమాచారం కొరక�"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "Forward"
+msgstr "మ�ంద�"
+
+#: ../mail/mail-dialogs.ui.h:14
 msgid "License Agreement"
 msgstr "లైసెన�స� ఒప�పందం"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.ui.h:15
+msgid "No Response Necessary"
+msgstr "� ప�రతిస�పందన అవసరంలేద�"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Reply to All"
+msgstr "అన�నిట�టికి సమాధానం ఇవ�వ�"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Review"
+msgstr "పరిశీలించ�"
+
+#: ../mail/mail-dialogs.ui.h:21
 msgid "S_erver:"
 msgstr "సేవిక(_e):"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.ui.h:22
+#, fuzzy
+msgid "Search Folder Sources"
+msgstr "సంచయం మూలంన� శోధించ�"
+
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "రక�షణ సమాచారం"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Specific folders"
 msgstr "నిర�దేశిత సంచయాల�"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.ui.h:25
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13851,42 +13054,42 @@ msgstr ""
 "అన�సరించ�టక� మీర� ఎంచ�క�న�న సందేశాల� క�రిందన జాబితా చేయబడినవి.\n"
 "\"ఫ�లాగ�\" మెనూ న�ండి అన�సరించవలిసిన చర�యన� దయచేసి ఎంపికచేయ�మ�."
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Accept License"
 msgstr "లైసెన�స� ని ఆమోదించ�(_A)"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Due By:"
 msgstr "పూర�వ నిర�ణీతం(_D):"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Flag:"
 msgstr "ప�లాగ�(_F):"
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Tick this to accept the license agreement"
 msgstr "లైసెన�స� ఒప�పందాన�ని ఆమోదించ�టక� దీనిని టిక�‌చేయ�మ�(_T)"
 
-#: ../mail/mail-folder-cache.c:834
+#: ../mail/mail-folder-cache.c:898
 #, c-format
 msgid "Pinging %s"
 msgstr "పింగింగ� %s"
 
-#: ../mail/mail-ops.c:107
+#: ../mail/mail-ops.c:95
 msgid "Filtering Selected Messages"
 msgstr "ఎంపికచేసిన సందేశాలన� వడపోయ�చ�న�నది"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:254
 msgid "Fetching Mail"
 msgstr "మెయిల� న� సంగ�రహిస�తోంది"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:562
+#: ../mail/mail-ops.c:585
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "బయటక�వెళ�ళ� వడపోతలన� ఆపాదించ�టలో వైఫల�యం: %s"
 
-#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13895,123 +13098,126 @@ msgstr ""
 "%s క� కల�ప�టలో విఫలమైంది: %s\n"
 "బద�ల�గా స�థానిక `పంపినవాటి' సంచయం క� కల�ప�మ�."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:641
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "స�థానిక `పంపినవాటి' సంచయంక� కల�ప�టలో వైఫల�యం: %s"
 
-#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
+#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
 msgid "Sending message"
 msgstr "సందేశాన�ని పంప�త�న�నది"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d యొక�క %1$d సందేశాన�ని పంప�త�న�నది"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:789
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%2$d యొక�క %1$d సందేశాలన� పంప�టలో విఫలమైంది"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
+#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
 msgid "Canceled."
 msgstr "రద�ద�చేయబడిన."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
+#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
 msgid "Complete."
 msgstr "పూర�తయినది."
 
-#: ../mail/mail-ops.c:877
-msgid "Saving message to folder"
+#: ../mail/mail-ops.c:905
+#, fuzzy, c-format
+msgid "Saving message to folder '%s'"
 msgstr "సందేశాన�ని సంచయంక� దాయ�చ�న�నది"
 
-#: ../mail/mail-ops.c:954
-#, c-format
-msgid "Moving messages to %s"
+#: ../mail/mail-ops.c:982
+#, fuzzy, c-format
+msgid "Moving messages to '%s'"
 msgstr "సందేశాలన� %s క� కద�ప�చ�న�నది"
 
-#: ../mail/mail-ops.c:954
-#, c-format
-msgid "Copying messages to %s"
+#: ../mail/mail-ops.c:982
+#, fuzzy, c-format
+msgid "Copying messages to '%s'"
 msgstr "%s క� సందేశాలన� నకల�తీస�త�న�నది"
 
-#: ../mail/mail-ops.c:1171
+#: ../mail/mail-ops.c:1091
+#, fuzzy, c-format
+msgid "Scanning folders in '%s'"
+msgstr "\"%s\" నందలి సంచయాల స�కానింగ�"
+
+#: ../mail/mail-ops.c:1199
 msgid "Forwarded messages"
 msgstr "మ�ంద�క�పంపిన సందేశాల�"
 
-#: ../mail/mail-ops.c:1212
-#, c-format
-msgid "Opening folder %s"
+#: ../mail/mail-ops.c:1240
+#, fuzzy, c-format
+msgid "Opening folder '%s'"
 msgstr "%s సంచయాన�ని తెర�స�త�ంది"
 
-#: ../mail/mail-ops.c:1277
-#, c-format
-msgid "Retrieving quota information for folder %s"
+#: ../mail/mail-ops.c:1306
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder '%s'"
 msgstr "%s ఫోల�డర� కొరక� కోటా సమాచారాన�ని వెలికితీస�తోంది"
 
-#: ../mail/mail-ops.c:1346
-#, c-format
-msgid "Opening store %s"
+#: ../mail/mail-ops.c:1378
+#, fuzzy, c-format
+msgid "Opening store '%s'"
 msgstr "నిల�వ %s న� తెర�స�త�న�నది"
 
-#: ../mail/mail-ops.c:1417
-#, c-format
-msgid "Removing folder %s"
+#: ../mail/mail-ops.c:1449
+#, fuzzy, c-format
+msgid "Removing folder '%s'"
 msgstr "%s సంచయాన�ని తొలగిస�త�న�నది"
 
-#: ../mail/mail-ops.c:1535
+#: ../mail/mail-ops.c:1567
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' సంచయాన�ని దాస�త�ంది"
 
-#: ../mail/mail-ops.c:1598
+#: ../mail/mail-ops.c:1630
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ఖాతా '%s' న� కొట�టివేయ�చ�న�నది మరియ� నిల�వచేయ�చ�న�నది"
 
-#: ../mail/mail-ops.c:1599
+#: ../mail/mail-ops.c:1631
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' ఖాతాని దాస�త�ంది"
 
-#: ../mail/mail-ops.c:1653
-msgid "Refreshing folder"
+#: ../mail/mail-ops.c:1685
+#, fuzzy, c-format
+msgid "Refreshing folder '%s'"
 msgstr "సంచయాన�ని ప�నర�వికాసపర�స�త�ంది"
 
-#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
-msgid "Expunging folder"
+#: ../mail/mail-ops.c:1725
+#, fuzzy, c-format
+msgid "Expunging folder '%s'"
 msgstr "సంచయాన�ని కొట�టివేయ�చ�న�నది"
 
-#: ../mail/mail-ops.c:1740
+#: ../mail/mail-ops.c:1770
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' నందలి చెత�తన� ఖాళీచేస�తోంది"
 
-#: ../mail/mail-ops.c:1741
+#: ../mail/mail-ops.c:1771
 msgid "Local Folders"
 msgstr "స�థానిక సంచయాల�"
 
-#: ../mail/mail-ops.c:1822
-#, c-format
-msgid "Retrieving message %s"
-msgstr "%s సందేశాన�ని వెలికితీస�త�ంది"
-
-#: ../mail/mail-ops.c:1931
+#: ../mail/mail-ops.c:1967
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d సందేశాన�ని వెలికితీస�త�ంది"
 msgstr[1] "%d సందేశాలన� వెలికితీస�త�ంది"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d సందేశాన�ని దాస�త�ంది"
 msgstr[1] "%d సందేశాన�ని దాస�త�ంది"
 
-#: ../mail/mail-ops.c:2096
+#: ../mail/mail-ops.c:2136
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14020,11 +13226,11 @@ msgstr ""
 "సందేశాన�ని దీనికి దాయ�టలో దోషం: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2168
+#: ../mail/mail-ops.c:2208
 msgid "Saving attachment"
 msgstr "అన�బంధాన�ని దాస�త�న�నది"
 
-#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14033,134 +13239,130 @@ msgstr ""
 "అవ�ట�‌ప�ట� దస�త�రాన�ని సృష�టించలేకపోయింది: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2209
+#: ../mail/mail-ops.c:2249
 #, c-format
 msgid "Could not write data: %s"
 msgstr "దత�తాంశాన�ని రాయలేకపోయింది: %s"
 
-#: ../mail/mail-ops.c:2354
-#, c-format
-msgid "Disconnecting from %s"
+#: ../mail/mail-ops.c:2394
+#, fuzzy, c-format
+msgid "Disconnecting from '%s'"
 msgstr "%s న�ండి అనన�సంధానిస�తోంది"
 
-#: ../mail/mail-ops.c:2354
-#, c-format
-msgid "Reconnecting to %s"
+#: ../mail/mail-ops.c:2394
+#, fuzzy, c-format
+msgid "Reconnecting to '%s'"
 msgstr "%s క� తిరిగిఅన�సంధానించబడ�తోంది"
 
-#: ../mail/mail-ops.c:2450
+#: ../mail/mail-ops.c:2490
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "లైన�వెల�పలకి '%s' ఖాతాన�ని తయార�చేస�త�ంది"
 
-#: ../mail/mail-ops.c:2536
+#: ../mail/mail-ops.c:2576
 msgid "Checking Service"
 msgstr "సేవన� పరిశీలిస�తోంది"
 
-#: ../mail/mail-send-recv.c:181
+#: ../mail/mail-send-recv.c:189
 msgid "Canceling..."
 msgstr "రద�ద�చేస�తోంది..."
 
-#: ../mail/mail-send-recv.c:383
+#: ../mail/mail-send-recv.c:431
 msgid "Send & Receive Mail"
 msgstr "మెయిల� న� పంప� & స�వీకరించ�"
 
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:444
 msgid "Cancel _All"
 msgstr "అన�నిటిని రద�ద�చేయి(_A)"
 
-#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:553
 msgid "Updating..."
 msgstr "తాజాపర�చ�మ�..."
 
-#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
 msgid "Waiting..."
 msgstr "వేచిఉంది..."
 
-#: ../mail/mail-send-recv.c:814
+#: ../mail/mail-send-recv.c:873
 #, c-format
 msgid "Checking for new mail"
 msgstr "కొత�త మెయిల� కొరక� పరిశీలిస�తోంది"
 
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:220
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s కొరక� రహస�యపదాన�ని ప�రవేశపెట�టండి"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:222
 msgid "Enter Passphrase"
 msgstr "రహస�యపదమ�న� ప�రవేశపెట�టండి"
 
-#: ../mail/mail-session.c:215
-#: ../plugins/exchange-operations/exchange-config-listener.c:705
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s క� రహస�యపద ప�రవేశ"
 
-#: ../mail/mail-session.c:217
+#: ../mail/mail-session.c:227
 msgid "Enter Password"
 msgstr "రహస�యపదాన�ని ప�రవేశించ�"
 
-#: ../mail/mail-session.c:259
+#: ../mail/mail-session.c:269
 msgid "User canceled operation."
 msgstr "వినియోగదార�డ� రద�ద�చేసిన కార�యం"
 
-#: ../mail/mail-signature-editor.c:202
-msgid "_Save and Close"
-msgstr "దాయి మరియ� మూయ�మ� (_S)"
-
-#: ../mail/mail-signature-editor.c:356
-msgid "Edit Signature"
-msgstr "సంతకాన�ని సరిచేయి"
+#: ../mail/mail-session.c:663
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "� గమ�యస�థానప� చిర�నామా అందివ�వలేద�, సందేశమ�యొక�క కొనసాగింప� రద�దైనది."
 
-#: ../mail/mail-signature-editor.c:371
-msgid "_Signature Name:"
-msgstr "సంతకమ� నామమ� (_S):"
+#: ../mail/mail-session.c:669
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "ఉపయోగించ�టక� � ఖాతా కనబడలేద�, సందేశమ�యొక�క కొనసాగింప� రద�దైనది."
 
-#: ../mail/mail-tools.c:120
+#: ../mail/mail-tools.c:123
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "స�పూల� సంచయం `%s' న� సృష�టించలేకపోయింది: %s"
 
-#: ../mail/mail-tools.c:150
+#: ../mail/mail-tools.c:153
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "non-mbox మూలం `%s' క� మెయిల� న� కద�ప�టక� ప�రయత�నిస�తోంది"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "మ�ంద�క�పంప�త�న�న సందేశం - %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "మ�ంద�క�పంప�త�న�న సందేశం"
 
-#: ../mail/mail-tools.c:298
+#: ../mail/mail-tools.c:301
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "చెల�లని సంచయం: `%s'"
 
-#: ../mail/mail-vfolder.c:89
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "శోధన సంచయాన�ని అమర�చ�తోంది: %s"
 
-#: ../mail/mail-vfolder.c:234
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "శోధన సంచయాలన� '%s:%s' కొరక� నవీకరిస�తోంది"
 
-#: ../mail/mail-vfolder.c:241
+#: ../mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "శోధన సంచయాలన� '%s' కొరక� నవీకరిస�తోంది"
 
-#: ../mail/mail-vfolder.c:1067
+#: ../mail/mail-vfolder.c:1172
 msgid "Edit Search Folder"
 msgstr "శోధన సంచయాన�ని సరిచేస�తోంది"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1274
 msgid "New Search Folder"
 msgstr "కొత�త శోధన సంచయం"
 
@@ -14215,7 +13417,8 @@ msgid "Are you sure you want to delete this account?"
 msgstr "మీర� ఖచ�చితంగా ఈ ఖాతాన� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "మీర� ఖచ�చితంగా ఈ ఖాతాన� అచేతనం మరియ�\n"
 "దీని అన�ని ప�రాక�సీలన� తొలగించ�దామని అన�క�ంట�న�నారా?"
@@ -14241,74 +13444,84 @@ msgid "Are you sure you want to send a message in HTML format?"
 msgstr "మీర� ఖచ�చితంగా సందేశం న� HTML రూపం లో పంప�దామని అన�క�ంట�న�నారా?"
 
 #: ../mail/mail.error.xml.h:16
-msgid "Are you sure you want to send a message with only BCC recipients?"
+#, fuzzy
+msgid "Are you sure you want to send a message with invalid address?"
 msgstr "మీర� ఖచ�చితంగా BCC స�వీకరణదార�లలో మాత�రమే సందేశంన� పంపాలన�క�ంట�న�నారా?"
 
 #: ../mail/mail.error.xml.h:17
+#, fuzzy
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "మీర� ఖచ�చితంగా BCC స�వీకరణదార�లలో మాత�రమే సందేశంన� పంపాలన�క�ంట�న�నారా?"
+
+#: ../mail/mail.error.xml.h:18
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "మీర� ఖచ�చితంగా BCC స�వీకరణదార�లలో మాత�రమే సందేశంన� పంపాలన�క�ంట�న�నారా?"
+
+#: ../mail/mail.error.xml.h:19
 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:20
 msgid "Because \"{0}\"."
 msgstr "ఎంచేతంటే \"{0}\"."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
 msgid "Because \"{2}\"."
 msgstr "ఎంచేతంటే \"{2}\"."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "బ�లింక� సంతకం"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "శోధన సంచయం \"{0}\"న� జతచేయలేక పోయింది."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "సంచయం \"{0}\"న� \"{1}\"క� నకల�తీయలేక పోయింది."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create folder \"{0}\"."
 msgstr "సంచయం \"{0}\"న� సృష�టించలేకపోయింది."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create temporary save directory."
 msgstr "తాత�కాలికంగా దాయ� సంచయాన�ని సృష�టించలేక పోయింది."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "దాయ� సంచయంన� సృష�టించలేక పోయింది, ఎంచేతంటే \"{1}\""
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete folder \"{0}\"."
 msgstr "సంచయం \"{0}\"న� తొలగించలేక పోయింది."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "సిస�టమ� సంచయం \"{0}\"న� తొలగించలేక పోయింది."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "శోధన సంచయం \"{0}\"న� సరికూర�చలేక పోయింది అదిలేని కారణంగా."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "సంచయం \"{0}\"న� \"{1}\"క� కదల�చలేక పోయింది."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{1}\""
 msgstr "మూలం \"{1}\"న� తెర�వలేక పోయింది"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open source \"{2}\"."
 msgstr "మూలం \"{2}\"న� తెర�వలేక పోయింది."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot open target \"{2}\"."
 msgstr "లక�ష�యం \"{2}\"న� తెర�వలేక పోయింది."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -14316,35 +13529,35 @@ msgstr ""
 "లైసెన�స� దస�త�రం \"{0}\"న� చద�వలేక పోయింది, సంస�థాపనా సమస�యవలన. మీర� ఈ ఉత�పాదక�డన� వాని లైసెన�స� "
 "ఆమోదించ�నంతవరకూ వ�పయోగించ�కోలేర�."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\"న� \"{1}\"క� ప�నఃనామకరణ చేయలేమ�."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "సిస�టమ� సంచయం \"{0}\"న� ప�నఃనామకరణ చేయలేమ� లేదా కదల�చలేమ�."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save changes to account."
 msgstr "ఖాతా క� చేసిన మార�ప�లన� దాయలేమ�."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to directory \"{0}\"."
 msgstr "డైరెక�టరి \"{0}\"క� దాయలేమ�."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot save to file \"{0}\"."
 msgstr "దస�త�రం \"{0}\"క� దాయలేద�."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
 msgid "Cannot set signature script \"{0}\"."
 msgstr "సంతకం స�క�రిప�ట� \"{0}\"న� అమర�చలేద�."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Check Junk Failed"
 msgstr "వైఫల�యమైన నిరర�ధకంన� పరిశీలించ�మ�"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14352,95 +13565,87 @@ msgstr ""
 "మీ సంకేతపదం సరిగా స�పెల�‌చేయబడిందేమో పరిశీలించ�మ�. సంకేతపదాల� చిన�నపెద�దబడి తేడాన� కిలిగఉన�నాయని "
 "గర�త�ంచ�కోండి; మీ కాప�స� లాక� ఆన�అయి ఉండవచ�చ�."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 msgid "Could not save signature file."
 msgstr "సంతకం దస�త�రాన�ని దాయలేకపోయింది."
 
-#: ../mail/mail.error.xml.h:44
-msgid "Delete \"{0}\"?"
-msgstr "తొలగించ�మ� \"{0}\"?"
-
-#: ../mail/mail.error.xml.h:45
-msgid "Delete account?"
-msgstr "ఖాతా తొలగించాలా?"
-
 #: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "శోధన సంచయంలో ఉన�న సందేశాలన� తొలగించాలా \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:47
-msgid "Delete messages in Search Folder?"
-msgstr "శోధన సంచయంలో ఉన�న సందేశాలన� తొలగించాలా?"
-
-#: ../mail/mail.error.xml.h:48
-msgid "Discard changes?"
-msgstr "మార�ప�లన� తీసివేయాలా?"
-
-#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "తొలగించవద�ద�(_e)"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Do not delete"
 msgstr "తొలగించవద�ద�"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do not disable"
 msgstr "అచేతన పరచవద�ద�"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "ఆఫ�‌లైన� ఉపయోగార�దం గ�ర�త�ంచబడిన సంచయాలన� మీర� స�థానికంగా కాలనియమత చేద�దామన�క�ంట�న�నారా?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "మీర� అన�ని సందేశాలన� చదివిన వాటిలా గ�ర�త�ంచ�దామని అన�క�ంట�న�నారా?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "మీర� మీ మార�ప�లన� దాయాలన�క�ంట�న�నారా?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "సంకేతపదంన� ప�రవేశపెట�టండి."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "దోషం నింప� వడపోత నిర�వచనాల�."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "ఆపరేషన� జర�ప�త�న�నప�ప�డ� దోషం."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
 msgstr "{0} అప�ప�డ� దోషం."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
 msgstr "దస�త�రం కలద� కాని తిరిగివ�రాయలేమ�."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but is not a regular file."
 msgstr " దస�త�రం కలద� కాని వాడ�కలోలేని దస�త�రం."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "మీర� కొనసాగించితే, మీర� ఈ సందేశాలన� తిరిగిపొందలేర�."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
-msgstr "మీర� సంచయాన�ని తొలగించితే, దానియొక�క అన�ని సారమ�ల� మరియ� దాని ఉపసంచయాల సారమ�ల� శాశ�వతంగా తొలిగించబడతాయి."
+msgstr ""
+"మీర� సంచయాన�ని తొలగించితే, దానియొక�క అన�ని సారమ�ల� మరియ� దాని ఉపసంచయాల సారమ�ల� శాశ�వతంగా తొలిగించబడతాయి."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
+#, fuzzy
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr ""
+"మీర� సంచయాన�ని తొలగించితే, దానియొక�క అన�ని సారమ�ల� మరియ� దాని ఉపసంచయాల సారమ�ల� శాశ�వతంగా తొలిగించబడతాయి."
+
+#: ../mail/mail.error.xml.h:62
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "మీర� కొనసాగితే, అన�ని ప�రాక�సీ ఖాతాల� శాశ�వతంగా తొలగించబడతాయి."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14448,29 +13653,33 @@ msgstr ""
 "మీర� కొనసాగితే, ఖాతా సమాచారం మరియ�\n"
 "ప�రాక�సీ సమాచారం అంతా శాశ�వతంగా తొలగించబడ�త�ంది."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "మీర� కొనసాగితే, ఖాతా సమాచారం శాశ�వతంగా తొలగించబడ�త�ంది."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "మీర� నిష�క�రమించితే, ఈ సందేశాల� ఎవాల�యూషన� తిరగిప�రారంభమగ�వరక� పంపబడబోవ�."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Ignore"
 msgstr "వదిలివేయి"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Invalid authentication"
 msgstr "సరికాని దృవీకరణ"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:69
+msgid "Mail Deletion Failed"
+msgstr "మెయిల� న� తొలగించ�ట విఫలమైంది"
+
+#: ../mail/mail.error.xml.h:70
 msgid "Mail filters automatically updated."
 msgstr "మెయిల� వడపోతల� స�వయంచాలకంగా నవీకరించబడతాయి."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 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 "
@@ -14481,31 +13690,27 @@ msgstr ""
 "పీఠిక, జత చేస�తే, అది మీ స�వీకరణదార�లన� మీ సందేశం క� జాబితాచేస�త�ంది. దీనిని తీసివేయ�టక�, మీర� తప�ప�క "
 "ఒక క�: లేదా CC: స�వీకరణదారిని జతచేయాలి."
 
-#: ../mail/mail.error.xml.h:73
-msgid "Mark all messages as read"
-msgstr "అన�ని సందేశాలన� చదివినవాటిలా గ�ర�తించ�మ�"
-
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:72
 msgid "Missing folder."
 msgstr "కనబడని సంచయం"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:74
 msgid "No sources selected."
 msgstr "� వనర�లన� ఎంచ�కోలేద�"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:75
 msgid "Opening too many messages at once may take a long time."
 msgstr "ఒకేసారి ఎక�క�వ సందేశాలన� తెర�వటవలన చాలాసమయం పట�టవచ�చ�న�."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:76
 msgid "Please check your account settings and try again."
 msgstr "దయచేసి మీ ఖాతా అమరికలన� చూస�కొని మరలా ప�రయత�నించ�మ�"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Please enable the account or send using another account."
 msgstr "దయచేసి ఖాతాన� చేతనం చేయ�మ� లేదా వేరే ఖాతా న� ఉపయోగించి పంప�మ�."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 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."
@@ -14513,7 +13718,7 @@ msgstr ""
 "దయచేసి సరైన ఈమెయిల� చిర�నామాన� క�: క�షేత�రమ�నంద� ప�రవేశపెట�ట�మ�. మీర� ఈమెయిల� చిర�నామా కొరక� "
 "శోధించవచ�చ� దీనిపై నొక�క�ట ద�వారా క�: ప�రవేశ పెట�టెక� తర�వాతనే ఉన�న బటన�."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14523,63 +13728,64 @@ msgstr ""
 "చూస�కొన�మ�:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid "Please provide an unique name to identify this signature."
 msgstr "ఈ సంతకాన�ని గ�ర�తించ�టక� దయచేసి ఒక �కమైన నామమ�న� ప�రవేశపెట�ట�మ�."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:82
 msgid "Please wait."
 msgstr "దయచేసి ఆగ�మ�"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "పాత మెయిల� సంచయం \"{0}\"న� వలసపంప�త�న�నప�ప�డ� సమస�య."
 
-#: ../mail/mail.error.xml.h:86
-msgid "Querying server"
-msgstr "సేవిక న� ప�రశ�నిస�త�న�నది"
-
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "మద�దత�ఇచ�చ�నట�వంటి దృవీకరణ యంత�రమ�ల జాబితా కొరక� సేవికన� ప�రశ�నిస�త�న�నది."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "చదివినదాని రశీద� అభ�యర�దించబడింది."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "నిజంగా సంచయం \"{0}\" మరియ� దానియొక�క అన�ని ఉపసంచయాలన� తొలగించాలా?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:87
+#, fuzzy
+msgid "Really delete folder \"{0}\"?"
+msgstr "సంచయం \"{0}\"న� తొలగించలేక పోయింది."
+
+#: ../mail/mail.error.xml.h:88
 msgid "Report Junk Failed"
 msgstr "వైఫల�యమైన నిరర�ధకాన�ని నివేదించ�మ�"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:89
 msgid "Report Not Junk Failed"
 msgstr "నిరర�ధకం వైఫల�యం కానిదాన�ని నివేదించ�మ�"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "శోధన సంచయాల� స�వయంచాలకంగా నవీకరించబడతాయి."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:91
 msgid "Send Receipt"
 msgstr "రశీద�న� పంప�మ�"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:92
 msgid "Signature Already Exists"
 msgstr "సంతంకం ఇప�పటికే ఉంది"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize"
 msgstr "కాలనియమత"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:94
 msgid "Synchronize folders locally for offline usage?"
 msgstr "సంచయాలన� స�థానికంగా అఫ�‌లైన� ఉపయోగార�దం కాలనియమత చేయాలా?"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14587,7 +13793,7 @@ msgstr ""
 "సిస�టమ� సంచయాల� ఎవాల�యూషన� సరిగా పనిచేయ�టక� కావాలి మరియ� ప�నఃనామకరణ కాబడవ�, కదల�చబడవ�, లేదా "
 "తొలగించబడవ�."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:96
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14602,7 +13808,7 @@ msgstr ""
 "పీఠిక, జత చేస�తే, అది మీ స�వీకరణదార�లన� మీ సందేశం నంద� జాబితాచేస�త�ంది. దీనిని తీసివేయ�టక�, మీర� "
 "తప�ప�క ఒక క�: లేదా CC: స�వీకరణదారిని జతచేయాలి."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14616,7 +13822,7 @@ msgstr ""
 "    \"{1}\"\n"
 "మరియ� నవీకరించబడింది."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14630,11 +13836,23 @@ msgstr ""
 "    \"{1}\"\n"
 "మరియ� నవీకరించబడింది."
 
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+
 #: ../mail/mail.error.xml.h:111
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:113
 msgid "The script file must exist and be executable."
 msgstr "లిపి దస�త�రమ� తప�పక ఉండాలి మరియ� నిర�వర�తించబడ�నట�ల� ఉండాలి."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14642,55 +13860,58 @@ msgstr ""
 "ఈ సంచయం అతర�గతంగా కల�పబడి ఉండవచ�చ�,\n"
 "బహిర�గతంగా కల�ప�టక� శోధన సంచయం కూర�పరికి వెళ�ళ�మ�, అవసరమైతే."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "ఈ సందేశం పంపబడద� ఎంచేతంటే పంప�టక� ఎంచ�క�న�న ఖాతా చేతనంగా లేద�"
 
-#: ../mail/mail.error.xml.h:115
-msgid "This message cannot be sent because you have not specified any recipients"
+#: ../mail/mail.error.xml.h:117
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
 msgstr "ఈ సందేశం పంపబడలేద� ఎంచేతంటే మీర� � స�వీకరణదార�ల నామమ�న� తెల�పలేద�"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "ఈ సేవిక ఈ రకమైన దృవీకరణక� మద�దత�నీయద� మరియ� దృవీకరణన� ఎప�పటికి మద�దత�నీయకపోవచ�చ�."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid "This signature has been changed, but has not been saved."
 msgstr "ఈ సంతకం మార�చబడింది, అయితే దాయబడలేద�."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr "ఇది ఎంచ�క�న�న సంచయంనంద� మరియ� దాని ఉపసంచయాలనంద� అన�ని సందేశాలన� చదివినట�ల� గ�ర�త�ంచ�త�ంది."
+msgstr ""
+"ఇది ఎంచ�క�న�న సంచయంనంద� మరియ� దాని ఉపసంచయాలనంద� అన�ని సందేశాలన� చదివినట�ల� గ�ర�త�ంచ�త�ంది."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to connect to the GroupWise server."
 msgstr "సమూహతరహా సేవికక� అన�సంధానించబడ లేకపోయింది."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
-msgstr "డ�రాఫ�ట�స� సంచయాలన� ఈ ఖాతా కొరక� తెర�వలేక పోయింది. బద�ల�గా సిస�టమ� డ�రాఫ�ట�స� సంచయాలన� ఉపయోగించాలా?"
+msgstr ""
+"డ�రాఫ�ట�స� సంచయాలన� ఈ ఖాతా కొరక� తెర�వలేక పోయింది. బద�ల�గా సిస�టమ� డ�రాఫ�ట�స� సంచయాలన� ఉపయోగించాలా?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
 msgid "Unable to read license file."
 msgstr "లైసెన�స� దస�త�రాన�ని చద�వలేక పోతోంది."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid "Use _Default"
 msgstr "అప�రమేయాన�న ఉపయోగించ�(_D)"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:125
 msgid "Use default drafts folder?"
 msgstr "అప�రమేయ డ�రాఫ�ట�స�  సంచయాన�ని ఉపయోగించ�?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -14700,27 +13921,31 @@ msgstr ""
 "తొలగిస�త�ంది.\n"
 "మీర� ఖచ�చితంగా దీనిని చేద�దామ�ని అన�క�ంట�న�నర�?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:128
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "ఈ మెయిల� న� తొలగించ�టక� మీర� సరిపోవ�నంత అన�మత�లన� కలిగిలేర�."
+
+#: ../mail/mail.error.xml.h:129
 msgid "You have not filled in all of the required information."
 msgstr "కావలిసి సమాచారం అంతటిని మీర� నింపలేద�."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:130
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "మీర� పంపని సందేశాలన� కలిగిఉన�నార�, �మైనా బహిష�కరిద�దామన�క�ంట�న�నారా?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:131
 msgid "You may not create two accounts with the same name."
 msgstr "మీర� ఒకే నామమ�తో రెండ� ఖాతాలన� సృష�టించలేక పోవచ�చ�."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
 msgid "You must name this Search Folder."
 msgstr "మీర� ఈ శోధన సంచయంక� నామకరణం చేయాలి."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:133
 msgid "You must specify a folder."
 msgstr "మీర� తప�పక ఒక సంచయాన�ని తెల�పవలెన�."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:134
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14730,102 +13955,115 @@ msgstr ""
 "సంచయాలన� వేర�వేర� ఎంచ�టద�వారా గాని, మరియ�/లేదా అన�ని స�థానిక సంచయాలన� ఎంచ�టద�వారా, అన�ని దూరస�థ "
 "సంచయాలన� ఎంచ�ట ద�వారా,లేదా రెండూ."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:136
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "మీ సేవిక \"{0}\"క� \"{0}\"లాగా మీలాగిన� విఫలమైంది."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:137
 msgid "_Append"
 msgstr "జతచేయ�మ�(_A)"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:138
 msgid "_Discard changes"
 msgstr "మార�ప�లన� తీసివేయ�మ�(_D)"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:139
 msgid "_Do not Synchronize"
 msgstr "కాలనియమత చేయవద�ద�(_D)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:140
+#: ../modules/mail/e-mail-shell-view-actions.c:862
+msgid "_Empty Trash"
+msgstr "చెత�తక�ండీని ఖాళీచేయ�మ�(_E)"
+
+#: ../mail/mail.error.xml.h:141
 msgid "_Expunge"
 msgstr "కొట�టివేయ�మ�(_E)"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:142
 msgid "_Open Messages"
 msgstr "సందేశాలన� తెర�వ�మ�(_O)"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1122
 msgid "Unseen"
 msgstr "చూడని"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1123
 msgid "Seen"
 msgstr "చూసి"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1124
 msgid "Answered"
 msgstr "సమాధానమిచ�చిన"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1125
 msgid "Forwarded"
 msgstr "పంపబడిన"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1126
 msgid "Multiple Unseen Messages"
 msgstr "చూడనట�వంటి బహ�ళ సందేశాల�"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1127
 msgid "Multiple Messages"
 msgstr "బహ�ళ సందేశాల�"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1131
 msgid "Lowest"
 msgstr "అతితక�క�వ"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1132
 msgid "Lower"
 msgstr "తక�క�వ"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1136
 msgid "Higher"
 msgstr "ఎక�క�వ"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1137
 msgid "Highest"
 msgstr "అతిఎక�క�వ"
 
-#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M %p"
 msgstr "ఈ రోజ�·%l:%M·%p"
 
-#: ../mail/message-list.c:1670
+#: ../mail/message-list.c:1763
 msgid "Yesterday %l:%M %p"
 msgstr "నిన�న·%l:%M·%p"
 
-#: ../mail/message-list.c:1682
+#: ../mail/message-list.c:1775
 msgid "%a %l:%M %p"
 msgstr "%a·%l:%M·%p"
 
-#: ../mail/message-list.c:1690
+#: ../mail/message-list.c:1783
 msgid "%b %d %l:%M %p"
 msgstr "%b·%d·%l:%M·%p"
 
-#: ../mail/message-list.c:1692
+#: ../mail/message-list.c:1785
 msgid "%b %d %Y"
 msgstr "%b·%d·%Y"
 
+#: ../mail/message-list.c:2537
+msgid "Select all visible messages"
+msgstr "కనపడే సందేశాలన�నిటిని ఎంచ�కొన�మ�"
+
+#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:732
+msgid "Shell Backend"
+msgstr ""
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
+#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
 msgid "Generating message list"
 msgstr "సందేశ జాబితాన� సంభనింపచేయ�ట"
 
-#: ../mail/message-list.c:4299
+#: ../mail/message-list.c:4726
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14833,15 +14071,15 @@ msgstr ""
 "మీ శోధన విధానాన�ని � సందేశం తృప�తిపర�చ�టలేద�. శోధన->శ�భ�రంచేయి మెనూ అంశంద�వారా శోధనన� శ�భ�రంచేయ�మ� "
 "లేదా దానిని మార�చ�టద�వారా చేయ�మ�."
 
-#: ../mail/message-list.c:4301
+#: ../mail/message-list.c:4728
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
 msgstr ""
-"ఈ ఫోల�డర�‌నంద� మర�గ�నవ�న�న సందేశమ�ల� మాత�రమే వ�న�నాయి. వాటిని చూప�టక� "
-"దర�శించ�->మర�గ�నవ�న�న సందేశమ�ల� చూప�మ� వ�పయోగించ�మ�."
+"ఈ ఫోల�డర�‌నంద� మర�గ�నవ�న�న సందేశమ�ల� మాత�రమే వ�న�నాయి. వాటిని చూప�టక� దర�శించ�->మర�గ�నవ�న�న "
+"సందేశమ�ల� చూప�మ� వ�పయోగించ�మ�."
 
-#: ../mail/message-list.c:4303
+#: ../mail/message-list.c:4730
 msgid "There are no messages in this folder."
 msgstr "ఈ సంచయంనంద� సందేశాల� లేవ�."
 
@@ -14870,7 +14108,6 @@ msgid "Sent Messages"
 msgstr "పంపిన సందేశాల�"
 
 #: ../mail/message-list.etspec.h:16
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 #: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "పరిమాణం"
@@ -14879,77 +14116,2261 @@ msgstr "పరిమాణం"
 msgid "Subject - Trimmed"
 msgstr "సంగతి - ట�రిమ�మ�డ�"
 
-#: ../mail/message-tag-followup.c:54
-msgid "Call"
-msgstr "à°•à°¾"
-
-#: ../mail/message-tag-followup.c:55
-msgid "Do Not Forward"
-msgstr "మ�ంద�క� పంపవద�ద�"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Follow-Up"
-msgstr "అన�సరించ�"
-
-#: ../mail/message-tag-followup.c:57
-msgid "For Your Information"
-msgstr "మీ సమాచారం కొరక�"
-
-#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
-msgid "Forward"
-msgstr "మ�ంద�"
-
-#: ../mail/message-tag-followup.c:59
-msgid "No Response Necessary"
-msgstr "� ప�రతిస�పందన అవసరంలేద�"
-
-#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
-msgid "Reply"
-msgstr "సమాధానం"
-
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
-msgid "Reply to All"
-msgstr "అన�నిట�టికి సమాధానం ఇవ�వ�"
-
-#: ../mail/message-tag-followup.c:64
-msgid "Review"
-msgstr "పరిశీలించ�"
-
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Body contains"
 msgstr "మ�ఖ�యభాగమ� కలిగినది"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 msgid "Message contains"
 msgstr "సందేశం కలిగినది"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "Recipients contain"
 msgstr "స�వీకరణదార�ల� కలిగిఉంటే"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "Sender contains"
 msgstr "పంపినవార� కలిగిఉంటే"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "Subject contains"
 msgstr "సంగతి కలిగిఉంటే"
 
 #: ../mail/searchtypes.xml.h:6
-#| msgid "Subject or Sender contains"
 msgid "Subject or Addresses contains"
 msgstr "ఇది కలిగివ�న�న సంగతి లేదా చిర�నామాల�"
 
-#: ../mail/searchtypes.xml.h:7
-msgid "Subject or Recipients contains"
-msgstr "సంగతి లేదా పంపినవార� కలిగిఉంటే"
+#: ../modules/addressbook/addressbook-config.c:206
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"ఈ �చ�చికంన� ఎంచ�కొన�ట వలన ఎవాల�యూషన� మీ LDAP సేవికక� అన�సంధానించబడ�త�ంది మీ LDAP సేవిక SSL "
+"క� మద�దతిస�త�ంటే."
+
+#: ../modules/addressbook/addressbook-config.c:208
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"ఈ �చ�చికంన� ఎంచ�కొన�ట వలన ఎవాల�యూషన� మీ LDAP సేవికక� అన�సంధానించబడ�త�ంది మీ LDAP సేవిక TLS "
+"క� మద�దతిస�త�ంటే."
+
+#: ../modules/addressbook/addressbook-config.c:210
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"ఈ �చ�చికంన� ఎంచ�కొన�ట అర�ధం మీ సేవిక SSl లేదా TLS క� మద�దతీయండంలేద�. దీనర�ధం మీ అన�సంధానంక� "
+"రక�షణలేద�, మరియ� రక�షణ భేద�యమ�లపై మీర� అన�మానించబడతార�."
+
+#: ../modules/addressbook/addressbook-config.c:592
+#, fuzzy
+msgid "Use in _Birthday & Anniversaries calendar"
+msgstr "ప�ట�టినరోజ�ల� & వార�షికోత�సవాల�"
+
+#: ../modules/addressbook/addressbook-config.c:628
+msgid "Copy _book content locally for offline operation"
+msgstr "ఆఫ�‌లైన� ఆపరేషన�‌కొరక� ప�సక�తం సారమ�న� స�థానికంగా నకల�తీయ�మ� (_b)"
+
+#: ../modules/addressbook/addressbook-config.c:736
+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 పోర�ట� ఇదే. ప�రామాణిక పోర�ట�ల జాబితా ఇవ�వబడింది. మీర� � "
+"పోర�ట� న� తెల�పవలెనో మీ సిస�టమ� నిర�వహణాధికారిని అడగండి."
+
+#: ../modules/addressbook/addressbook-config.c:810
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"మిమ�మ�లి దృవీకరించ�టక� ఎవాల�యూషన� వాడే పద�దితి ఇదే. దీనిని \" ఈమెయిల� చిర�నామా\" క� అమర�చ�ట వలన మీ "
+"LDAP సేవికక� ఎనానిమస� ప�రవేశం అవసరమౌత�ందని గమనించండి."
+
+#: ../modules/addressbook/addressbook-config.c:885
+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\" యొక�క శోధన వ�యాప�తి మీ శోధన ఆధారం క�రింద ఉన�న ఒక స�థాయి ప�రవేశాలన� మాత�రమే చేర�చ�త�ంది."
+
+#: ../modules/addressbook/addressbook-config.c:991
+msgid "Server Information"
+msgstr "సేవిక సమాచారం"
+
+#: ../modules/addressbook/addressbook-config.c:996
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Details"
+msgstr "వివరాల�"
+
+#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/mail/e-mail-shell-view.c:54
+msgid "Searching"
+msgstr "వెత�క�త�న�నది"
+
+#: ../modules/addressbook/addressbook-config.c:999
+msgid "Downloading"
+msgstr "దిగ�మతి అవ�త�న�నది"
+
+#: ../modules/addressbook/addressbook-config.c:1205
+msgid "Address Book Properties"
+msgstr "చిర�నామ ప�స�తకం లక�షణాల�"
+
+#: ../modules/addressbook/addressbook-config.c:1207
+msgid "New Address Book"
+msgstr "కొత చిర�నామా ప�స�తకం"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "పొడవ�న� స�వయంపూర�తి గావించ�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+#, fuzzy
+msgid "Contact layout style"
+msgstr "పరిచయమ�ల జాబితా"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+#, fuzzy
+msgid "Contact preview pane position (vertical)"
+msgstr "నిల�వ పలక స�థానమ�లో నెల దర�శనాన�ని చూప�మ�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "పూర�తైన URIs జాబితా కొరక� EFolderList XML"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "పూర�తైన URIs జాబితా కొరక� EFolderList XML."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr "స�వయంచాలకంగామ�గియ� నామమ�న� వొక చిర�నామాతో చూప�మ�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show preview pane"
+msgstr "ఉపదర�శన పలకాన�ని చూపించ�మ�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr "ఎవాల�యూషన� స�వయంచాలకమ�గింప� క� ప�రయత�నించ�టక� మ�న�ప� ప�రవెశపెట�టవలిసిన అక�షరమ�ల సంఖ�య."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "URI for the folder last used in the select names dialog"
+msgstr "ఎంచ�క�న�న నామమ�ల డైలాగ� నంద� చివరిగా ఉపయోగించిన సంచయం కొరక� URI"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "URI for the folder last used in the select names dialog."
+msgstr "ఎంచ�క�న�న నామమ�ల డైలాగ� నంద� చివరిగా ఉపయోగించిన సంచయం కొరక� URI."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr "స�వయంచాలకంగామ�గియ� పరిచయం నామమ�తో మెయిల� చిర�నామాన� ప�రవేశమ�నంద� బలవంతంగా చూయించాలా"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Whether to show the preview pane."
+msgstr "ఉపదర�శనం తలంన� చూపించవలెనా."
+
+#: ../modules/addressbook/autocompletion-config.c:159
+msgid "Table column:"
+msgstr "పట�టిక నిల�వ�వర�స:"
+
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "స�వయంచాలకంగాపూర�తి"
+
+#: ../modules/addressbook/autocompletion-config.c:165
+msgid "Always _show address of the autocompleted contact"
+msgstr "స�వయంచాలకంగామ�గియ� పరిచయంయొక�క చిర�నామాన� ఎల�లప�ప�డ� చూప�మ� (_s)"
+
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:190
+#: ../modules/addressbook/e-book-shell-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "LDAP సేవికలపై"
+
+#: ../modules/addressbook/e-book-shell-backend.c:340
+msgctxt "New"
+msgid "_Contact"
+msgstr "పరిచయం (_C)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:342
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
+msgid "Create a new contact"
+msgstr "కొత�త పరిచయాన�ని సృష�టించ�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:347
+msgctxt "New"
+msgid "Contact _List"
+msgstr "పరిచయాల జాబితా (_L)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:349
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
+msgid "Create a new contact list"
+msgstr "కొత�త పరిచయ జాబితాని సృష�టించ�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:357
+msgctxt "New"
+msgid "Address _Book"
+msgstr "చిర�నామా ప�స�తకం (_B)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:359
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
+msgid "Create a new address book"
+msgstr "కొత చిర�నామా ప�స�తకాన�ని సృష�టించ�"
+
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:376
+#: ../modules/addressbook/e-book-shell-view.c:394
+#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../modules/calendar/e-cal-shell-migrate.c:480
+msgid "Contacts"
+msgstr "పరిచయాల�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:596
+#: ../modules/calendar/e-cal-shell-backend.c:777
+#: ../modules/calendar/e-memo-shell-backend.c:587
+#: ../modules/calendar/e-task-shell-backend.c:597
+#, fuzzy
+msgid "Source List"
+msgstr "వనర�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:597
+#, fuzzy
+msgid "The registry of address books"
+msgstr "చిర�నామా ప�స�తకాల జాబితా రాలేద�"
+
+#: ../modules/addressbook/e-book-shell-content.c:364
+#, fuzzy
+msgid "Current View"
+msgstr "ప�రస�త�త దర�శనం(_C)"
+
+#: ../modules/addressbook/e-book-shell-content.c:365
+msgid "The currently selected address book view"
+msgstr ""
+
+#: ../modules/addressbook/e-book-shell-content.c:374
+#, fuzzy
+msgid "Previewed Contact"
+msgstr "కొత�త  పరిచయం"
+
+#: ../modules/addressbook/e-book-shell-content.c:375
+#, fuzzy
+msgid "The contact being shown in the preview pane"
+msgstr "ఉపదర�శనం తలంన� చూపించవలెనా."
+
+#: ../modules/addressbook/e-book-shell-content.c:384
+#: ../modules/calendar/e-memo-shell-content.c:617
+#: ../modules/calendar/e-task-shell-content.c:639
+#: ../modules/mail/e-mail-shell-content.c:689
+#, fuzzy
+msgid "Preview is Visible"
+msgstr "ప�రక�కపట�టి దర�శితం అవ�త�ంది"
 
-#: ../mail/searchtypes.xml.h:8
-msgid "Subject or Sender contains"
-msgstr "ఇది కలిగివ�న�న సంగతి లేదా పంపినవార�"
+#: ../modules/addressbook/e-book-shell-content.c:385
+#: ../modules/calendar/e-memo-shell-content.c:618
+#: ../modules/calendar/e-task-shell-content.c:640
+#: ../modules/mail/e-mail-shell-content.c:690
+#, fuzzy
+msgid "Whether the preview pane is visible"
+msgstr "ఉపదర�శనం తలంన� చూపించవలెనా."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:645
+msgid "LDAP Servers"
+msgstr "LDAP సేవికల�"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:765
+msgid "Autocompletion Settings"
+msgstr "స�వయంపూర�తి అమరికల�"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1152
+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 ""
+"ఎవాల�యూషన� పరిచయ సంచయం యొక�క స�థానమ� మరియ� పారంపర�యం ఎవాల�యూషన� 1.x న�ండి మారినది.\n"
+"\n"
+"ఎవాల�యూషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి ఓర�ప�తోఉండండి..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1166
+msgid ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"మెయిలింగ� జాబితా పరిచయాల యొక�క రూపం మార�చబడింది.\n"
+"\n"
+"ఎవాల�యషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి ఓర�ప�తో ఉండండి..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1175
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"కొన�ని ఫోన� సంఖ�యలన� ఎవాల�యూషన� నిల�వచేసే విధానం మారినది.\n"
+"\n"
+"ఎవాల�యషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి ఓర�ప�తో ఉండండి..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1185
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+"ఎవాల�యూషన� పామ� సింక� చేంజ�‌లాగ� మరియ� మాప� దస�త�రమ�ల� మార�చబడినవి.\n"
+"\n"
+"ఎవాల�యషన� మీ పైలెట� సింక� డాటా న� వలసపంప�త�న�నప�ప�డ� దయచేసి ఓర�ప�తో ఉండండి..."
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:181
+#: ../modules/calendar/e-cal-shell-sidebar.c:761
+#: ../modules/calendar/e-memo-shell-sidebar.c:687
+#: ../modules/calendar/e-task-shell-sidebar.c:687
+#, fuzzy
+msgid "Source Selector Widget"
+msgstr "మెమో మూలంన� ఎంపికచేయ�నది"
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:182
+#, fuzzy
+msgid "This widget displays groups of address books"
+msgstr "చిర�నామా ప�స�తకాల జాబితా రాలేద�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:262
+#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#, fuzzy
+msgid "Save as vCard"
+msgstr "Vపలకంగా దాయ�మ�..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:662
+msgid "Co_py All Contacts To..."
+msgstr "అన�ని పరిచయాలన� నకల�తీయ�మ�(p)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#, fuzzy
+msgid "Copy the contacts of the selected address book to another"
+msgstr "ఎంచ�క�న�న సంచయమ� యొక�క పరిచయాలన� వేరే సంచయమ�క� నకల� తీయ�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#, fuzzy
+msgid "D_elete Address Book"
+msgstr "చిర�నామా ప�స�తకాన�ని తొలగించ�మ�(_e)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#, fuzzy
+msgid "Delete the selected address book"
+msgstr "ఎంచ�క�న�న సంచయాన�ని తొలగించ�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:676
+msgid "Mo_ve All Contacts To..."
+msgstr "అన�ని పరిచయాలన� కద�ప�మ�(_v)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#, fuzzy
+msgid "Move the contacts of the selected address book to another"
+msgstr "ఎంచ�క�న�న సంచయమ� యొక�క పరిచయాలన� వేరే సంచయమ�క� జర�ప�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
+msgid "_New Address Book"
+msgstr "కొత చిర�నామా ప�స�తకం(_N)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:690
+msgid "Address _Book Properties"
+msgstr "చిర�నామా ప�స�తకం లక�షణాల�(_B)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#, fuzzy
+msgid "Show properties of the selected address book"
+msgstr "ఎంచ�క�న�న సంచయమ� యొక�క లక�షణాలన� మార�చ�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:697
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-task-shell-view-actions.c:734
+#: ../modules/mail/e-mail-shell-view-actions.c:946
+msgid "_Rename..."
+msgstr "ప�నఃనామకరణ(_R)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#, fuzzy
+msgid "Rename the selected address book"
+msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#, fuzzy
+msgid "S_ave Address Book as vCard"
+msgstr "చిరనామాప�స�తకాన�ని Vకార�డ� లా దాయ�మ�(_a)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#, fuzzy
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "ఎంపికచేసిన సంచయం పరిచయాలన� Vకార�డ� లాగా దాయ�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#, fuzzy
+msgid "Stop loading"
+msgstr "నింప�టన� ఆప�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#, fuzzy
+msgid "_Copy Contact To..."
+msgstr "పరిచయాన�ని క� నకల�తీయ�మ�(_C)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#, fuzzy
+msgid "Copy selected contacts to another address book"
+msgstr "ఎంచ�క�న�న పరిచయాలన� వేరే సంచయంలోకి నకల� తీయ�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:725
+msgid "_Delete Contact"
+msgstr "పరిచయాన�ని తొలగించ�(_D)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#, fuzzy
+msgid "_Find in Contact..."
+msgstr "పరిచయాన�ని మ�ంద�క� పంప�మ�(_F)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#, fuzzy
+msgid "Search for text in the displayed contact"
+msgstr "ప�రదర�శించబడిన సందేశం మ�ఖ�యభాగమ�లో పాఠ�యమ�న� వెత�క�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:739
+msgid "_Forward Contact..."
+msgstr "పరిచయాన�ని మ�ంద�క� పంప�మ�(_F)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
+msgid "Send selected contacts to another person"
+msgstr "ఎంచ�క�న�న పరిచయాలన� వేరే వ�యక�తికి పంప�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#, fuzzy
+msgid "_Move Contact To..."
+msgstr "పరిచయాలన� దీనికి కద�ప�మ�(_M)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#, fuzzy
+msgid "Move selected contacts to another address book"
+msgstr "ఎంచ�క�న�న పరిచయాలన� వేరే సంచయమ�క� జర�ప�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:753
+msgid "_New Contact..."
+msgstr "కొత�త పరిచయం(_N)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:760
+msgid "New Contact _List..."
+msgstr "కొత�త చిర�నామాల జాబితా(_L)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#, fuzzy
+msgid "_Open Contact"
+msgstr "పరిచయం (_C)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
+msgid "View the current contact"
+msgstr "ప�రస�త�త పరిచయాన�ని దర�శించ�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:774
+msgid "_Send Message to Contact..."
+msgstr "పరిచయానికి సందేశం పంప�మ�(_S)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
+msgid "Send a message to the selected contacts"
+msgstr "ఎంచ�క�న�న పరిచయాలక� సందేశాన�ని పంప�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:792
+msgid "_Actions"
+msgstr "క�రియల�(_A)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/mail/e-mail-shell-view-actions.c:1090
+msgid "_Preview"
+msgstr "ఉపదర�శనం(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-task-shell-view-actions.c:812
+msgid "_Delete"
+msgstr "తొలగించ�(_D)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:803
+msgid "_Properties"
+msgstr "లక�షణాల�(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
+msgid "_Save as vCard..."
+msgstr "Vపలకంగా దాయ�మ�(_S)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
+msgid "Contact _Preview"
+msgstr "పరిచయం ఉపదర�శనం(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:841
+msgid "Show contact preview window"
+msgstr "పరిచయ ఉపదర�శన గవాక�షాన�ని చూప�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/calendar/e-memo-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:881
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
+msgid "_Classic View"
+msgstr "సాంప�రదాయకమైన దర�శనం(_C)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#, fuzzy
+msgid "Show contact preview below the contact list"
+msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:888
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
+msgid "_Vertical View"
+msgstr "నిల�వ� దర�శనం(_V)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#, fuzzy
+msgid "Show contact preview alongside the contact list"
+msgstr "పరిచయ ఉపదర�శన గవాక�షాన�ని చూప�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:905
+msgid "Any Category"
+msgstr "�దైన విభాగం"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
+#: ../modules/calendar/e-memo-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:940
+msgid "Unmatched"
+msgstr "సరిఉజ�జీ కాలేద�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../shell/e-shell-content.c:500
+msgid "Advanced Search"
+msgstr "ఉన�నతమైన వెత�క�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#, fuzzy
+msgid "Print all shown contacts"
+msgstr "ఎంచ�క�న�న పరిచయాలన� మ�ద�రించ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#, fuzzy
+msgid "Preview the contacts to be printed"
+msgstr "మ�ద�రించాల�సిన పరిచయాలన� ఉపదర�శనమిస�త�ంది"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
+msgid "Print selected contacts"
+msgstr "ఎంచ�క�న�న పరిచయాలన� మ�ద�రించ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
+msgid "Save as vCard..."
+msgstr "Vపలకంగా దాయ�మ�..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#, fuzzy
+msgid "Save selected contacts as a vCard"
+msgstr "ఎంపికచేసిన పరిచయాలన� Vకార�డ�లాగా దాయ�మ�."
+
+#: ../modules/addressbook/e-book-shell-view.c:338
+msgid "_Forward Contacts"
+msgstr "చిర�నామాలని మ�ంద�క� పంప�(_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:340
+msgid "_Forward Contact"
+msgstr "చిర�నామాన�ని మ�ందికిపంప�(_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:371
+#, fuzzy
+msgid "_Send Message to Contacts"
+msgstr "చిర�నామాలక� సందేశం పంప�(_M)"
+
+#: ../modules/addressbook/e-book-shell-view.c:373
+#, fuzzy
+msgid "_Send Message to List"
+msgstr "జాబితాక� సందేశం పంప�(_M)"
+
+#: ../modules/addressbook/e-book-shell-view.c:375
+#, fuzzy
+msgid "_Send Message to Contact"
+msgstr "చిర�నామాక� సందేశం పంప�(_M)"
+
+#: ../modules/addressbook/eab-composer-util.c:137
+msgid "Multiple vCards"
+msgstr "బహ�ళ Vకార�డ�స��"
+
+#: ../modules/addressbook/eab-composer-util.c:145
+#, c-format
+msgid "vCard for %s"
+msgstr "%s కొరక� Vకార�డ��"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
+#, c-format
+msgid "Contact information"
+msgstr "చిర�నామా సమాచారం"
+
+#: ../modules/addressbook/eab-composer-util.c:186
+#, c-format
+msgid "Contact information for %s"
+msgstr "%s కొరక� చిర�నామా సమాచారం"
+
+#: ../modules/addressbook/ldap-config.ui.h:1
+msgid "1"
+msgstr "1"
+
+#: ../modules/addressbook/ldap-config.ui.h:2
+msgid "3268"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:3
+msgid "389"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:4
+msgid "5"
+msgstr "5"
+
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "636"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:6
+msgid "Anonymously"
+msgstr ""
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:8
+msgid "B_rowse this book until limit reached"
+msgstr "పరిమితిని చేర�దాకా ఈప�స�తకంన� అన�వేషించ�మ� (_r)"
+
+#: ../modules/addressbook/ldap-config.ui.h:9
+msgid "Lo_gin:"
+msgstr "ప�రవేశమ�(_g):"
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:12
+#, fuzzy
+msgid "One"
+msgstr "ఆన�‌లైన�"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Search Filter"
+msgstr "శోధన వడపోత"
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Search _base:"
+msgstr "వెత�క� మూలం(_b):"
+
+#: ../modules/addressbook/ldap-config.ui.h:16
+msgid "Search _filter:"
+msgstr "శోధన వడపోత(_f):"
+
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"శోధన వడపోత అన�నది దేనికొరకైతే శోధన జరగాలో ఆ ఆబ�జక�ట� రకమైనవ�ంట�ంది. ఇది సవరించిఉండకపోతే, అప�రమేయంగా "
+"శోధన \"వ�యక�తి\" రకం యొక�క అంశప�తరగతి పై జర�గ�త�ంది."
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:19
+#, fuzzy
+msgid "Sub"
+msgstr "ఆది"
+
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "Supported Search Bases"
+msgstr "సహకారం ఉన�న వెత�క� మూలాల�"
+
+#: ../modules/addressbook/ldap-config.ui.h:22
+#, fuzzy
+msgid "Using distinguished name (DN)"
+msgstr ""
+"పేర�లేక�ండా\n"
+"ఈ మెయిల� చిర�నామా వ�పయోగించి\n"
+"విభజిత నామమ� వ�పయోగించి (DN)"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
+#, fuzzy
+msgid "Using email address"
+msgstr "ఈ మెయిల� చిర�నామ(_A):"
+
+#: ../modules/addressbook/ldap-config.ui.h:24
+msgid "_Download limit:"
+msgstr "దిగ�మతి హద�ద�:(_D)"
+
+#: ../modules/addressbook/ldap-config.ui.h:25
+msgid "_Find Possible Search Bases"
+msgstr "సాధ�యమైన వెత�క� మూలాలన� కనిపెట�ట�మ�(_F)"
+
+#: ../modules/addressbook/ldap-config.ui.h:26
+msgid "_Login method:"
+msgstr "ప�రవేశ పద�దతి(_L):"
+
+#: ../modules/addressbook/ldap-config.ui.h:28
+msgid "_Port:"
+msgstr "పోర�ట�(_P):"
+
+#: ../modules/addressbook/ldap-config.ui.h:29
+msgid "_Search scope:"
+msgstr "వెత�క� లక�ష�యం(_S):"
+
+#: ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Timeout:"
+msgstr "సమయం మించినది(_T):"
+
+#: ../modules/addressbook/ldap-config.ui.h:32
+msgid "_Use secure connection:"
+msgstr "రక�షిత బంధాన�ని ఉపయోగించ�మ�(U):"
+
+#: ../modules/addressbook/ldap-config.ui.h:33
+msgid "cards"
+msgstr "పలకాల�"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+msgid "I_mport"
+msgstr "దిగ�మతి (_m)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Select a Calendar"
+msgstr "క�యాలెండర�‌న� ఎంపికచేయ�మ�"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:368
+msgid "Select a Task List"
+msgstr "కర�తవ�యం జాబితాన� ఎంపికచేయ�మ�"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+msgid "I_mport to Calendar"
+msgstr "క�యాలెండర�‌క� దిగ�మతిచేయ�మ� (_m)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+msgid "I_mport to Tasks"
+msgstr "కర�తవ�యమ�లక� దిగ�మతి చేయ�మ� (_m)"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:125
+#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-task-shell-backend.c:113
+#: ../modules/calendar/e-task-shell-migrate.c:535
+msgid "On The Web"
+msgstr "మహాతలం పైన"
+
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../plugins/calendar-weather/calendar-weather.c:117
+msgid "Weather"
+msgstr "వాతావరణం"
+
+#: ../modules/calendar/e-cal-shell-backend.c:242
+#: ../modules/calendar/e-cal-shell-migrate.c:483
+msgid "Birthdays & Anniversaries"
+msgstr "ప�ట�టినరోజ�ల� & వార�షికోత�సవాల�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:446
+msgctxt "New"
+msgid "_Appointment"
+msgstr "నియామకం (_A)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+msgid "Create a new appointment"
+msgstr "కొత�త నియామకమ�న� సృష�టించ�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:453
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "పూర�తిరోజ� నియామకం (_p)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:455
+msgid "Create a new all-day appointment"
+msgstr "కొత�త పూర�తిరోజ� నియామకాన�ని సృష�టించ�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:460
+msgctxt "New"
+msgid "M_eeting"
+msgstr "సమావేశం (_e)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:462
+msgid "Create a new meeting request"
+msgstr "కొత�త సమావేశ అభ�యర�థన న� సృష�టించ�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:470
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "క�యాలెండర� (_n)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+msgid "Create a new calendar"
+msgstr "కొత�త క�యాలెండర� న� సృష�టించ�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:507
+#: ../plugins/itip-formatter/itip-formatter.c:2657
+msgid "Calendar and Tasks"
+msgstr "క�యాలెండర� మరియ� కర�తవ�యాల�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:778
+#, fuzzy
+msgid "The registry of calendars"
+msgstr "ప�రాధమిక క�యాలెండర�"
+
+#: ../modules/calendar/e-cal-shell-migrate.c:131
+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 ""
+"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..."
+
+#. FIXME: set proper domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:664
+#: ../modules/calendar/e-task-shell-migrate.c:591
+#, c-format
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr "పాత అమరికలన� evolution/config.xmldb న�ండి మార�చలేమ�"
+
+#. FIXME: domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:693
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "క�యాలెండర� `%s' న� వలసపంపలేమ�"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:167
+#: ../modules/calendar/e-memo-shell-sidebar.c:162
+#: ../modules/calendar/e-task-shell-sidebar.c:162
+#, fuzzy, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"%s పై దోషం:\n"
+" %s"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#, fuzzy
+msgid "Loading calendars"
+msgstr "క�యాలెండర� న� నింప�త�ంది"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#, fuzzy
+msgid "Calendar Selector"
+msgstr "క�యాలెండర� వనర� ఎంపికచేసేది"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:741
+msgid "Date Navigator Widget"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:742
+msgid "This widget displays a miniature calendar"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:751
+#, fuzzy
+msgid "Default Calendar Client"
+msgstr "అప�రమేయ మెయిల� కక�షిదార�"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:752
+msgid "Default client for calendar operations"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:762
+msgid "This widget displays groups of calendars"
+msgstr ""
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "క�యాలెండర�‌న� తెర�చ�చ�న�నది"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+msgid "Print"
+msgstr "మ�ద�రణ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:306
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"ఎంపికచేసిన సమయ మెత�తానికి పూర�వమైన అన�ని ఘటనలన� ఈ ఆపరెషన� శాశ�వతంగా తొలగించివేస�త�ంది. మీర� "
+"కొనసాగించినట�లైతే, మీర� ఈ ఘటనలన� మరలా తిరిగిపొందలేర�."
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
+msgid "Purge events older than"
+msgstr "దీనికన�నా పాతవైన ఘటనలన� కొట�టివేయ�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:534
+#, fuzzy
+msgid "Copying Items"
+msgstr "అంశాల నకల�తీస�త�ంది"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#, fuzzy
+msgid "Moving Items"
+msgstr "అంశాలన� జర�ప�త�ంది"
+
+#. Translators: Default filename part saving an event to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#, fuzzy
+msgid "event"
+msgstr "పంపిన"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1100
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:494
+#: ../modules/calendar/e-task-shell-view-actions.c:611
+#, fuzzy
+msgid "Save as iCalendar"
+msgstr "క�యాలెండర�‌న� ఎంపికచేయ�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
+msgid "_Copy..."
+msgstr "నకల�తీయ�(_C)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+#, fuzzy
+msgid "D_elete Calendar"
+msgstr "క�యాలెండర�‌న� ఎంపికచేయ�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#, fuzzy
+msgid "Delete the selected calendar"
+msgstr "ఎంచ�క�న�న సంచయాన�ని తొలగించ�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#, fuzzy
+msgid "Go Back"
+msgstr "వెనక�కి వెళ�ళ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+#, fuzzy
+msgid "Go Forward"
+msgstr "మ�ంద�క� వెళ�ళ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "Select _Today"
+msgstr "ఈ రోజ�న� ఎంచ�కొన�మ�(_T)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
+msgid "Select today"
+msgstr "ఈ రోజ�న� ఎంచ�కొన�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+msgid "Select _Date"
+msgstr "తేదీనిఎంచ�కొన�మ�(_D) "
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+msgid "Select a specific date"
+msgstr "నిర�దిష�టమైన తేదీని ఎంచ�కొన�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+msgid "_New Calendar"
+msgstr "కొత�త క�యాలెండర�(_N)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-task-shell-view-actions.c:783
+msgid "Purg_e"
+msgstr "కొట�టివేయ�మ�(_e)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+msgid "Purge old appointments and meetings"
+msgstr "పాత నియామకాలన� మరియ� సమావేశాలన� కొట�టివేయ�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#: ../modules/calendar/e-task-shell-view-actions.c:727
+msgid "Re_fresh"
+msgstr "రీఫ�రెష�(_f)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
+#, fuzzy
+msgid "Refresh the selected calendar"
+msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+#, fuzzy
+msgid "Rename the selected calendar"
+msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#, fuzzy
+msgid "Show _Only This Calendar"
+msgstr "ఈ క�యాలెండర� మాత�రమే చూప�మ�(_o)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+msgid "Cop_y to Calendar..."
+msgstr "క�యాలెండర� క� నకల�తీయ�(_y)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+msgid "_Delegate Meeting..."
+msgstr "సమావేశాల కాలాన�ని నియమించ�(_D)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#, fuzzy
+msgid "_Delete Appointment"
+msgstr "నియామకాన�ని తొలగించ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#, fuzzy
+msgid "Delete selected appointments"
+msgstr "నియామకాన�ని తొలగించ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#, fuzzy
+msgid "Delete This _Occurrence"
+msgstr "ఈ సంభవాన�ని తీసివేయ�(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+msgid "Delete this occurrence"
+msgstr "ఈ సంభవాన�ని తొలగించ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#, fuzzy
+msgid "Delete All Occ_urrences"
+msgstr "సంభవాలన�నింటి తీసివేయ�(_A)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+msgid "Delete all occurrences"
+msgstr "సంభవాలన�నింటి తొలగించ�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+#, fuzzy
+msgid "New All Day _Event..."
+msgstr "కొత�త రోజ� ఘటన(_E)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#, fuzzy
+msgid "Create a new all day event"
+msgstr "కొత�త పూర�తిరోజ� నియామకాన�ని సృష�టించ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:568
+#: ../modules/calendar/e-task-shell-view-actions.c:692
+msgid "_Forward as iCalendar..."
+msgstr "iక�యాలెండర� గా మ�ంద�క� పంప�(_F)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#, fuzzy
+msgid "New _Meeting..."
+msgstr "కొత�త సమావేశం(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#, fuzzy
+msgid "Create a new meeting"
+msgstr "కొత�త సమావేశ అభ�యర�థన న� సృష�టించ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+msgid "Mo_ve to Calendar..."
+msgstr "క�యాలెండర� క� పంప�(_v)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+msgid "New _Appointment..."
+msgstr "కొత�త నియామకం(_A)..."
+
+#
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+msgid "Make this Occurrence _Movable"
+msgstr "ఈ సంభవాన�ని కదిపించేది గా చేయ�(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+msgid "_Open Appointment"
+msgstr "నియామకాన�ని తెర�వ�మ�(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+msgid "View the current appointment"
+msgstr "ప�రస�త�త నియామకాన�ని దర�శించ�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+msgid "_Reply"
+msgstr "ప�రత�య�త�తరమ�(_R):"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#, fuzzy
+msgid "Save as iCalendar..."
+msgstr "Vపలకంగా దాయ�మ�..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+msgid "_Schedule Meeting..."
+msgstr "సమావేశాల కాలాన�ని నియమించ�(_S)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#, fuzzy
+msgid "Converts an appointment to a meeting"
+msgstr "పాత నియామకాలన� మరియ� సమావేశాలన� కొట�టివేయ�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
+#, fuzzy
+msgid "Conv_ert to Appointment..."
+msgstr "కొత�త నియామకం(_A)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#, fuzzy
+msgid "Converts a meeting to an appointment"
+msgstr "%s నియామకం పూర�తయినప�ప�డ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+msgid "Day"
+msgstr "రోజ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
+msgid "Show one day"
+msgstr "ఒక రోజ�న� చూప�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
+msgid "List"
+msgstr "జాబితా"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
+msgid "Show as list"
+msgstr "జాబితాగా చూప�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
+msgid "Month"
+msgstr "నెల"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
+msgid "Show one month"
+msgstr "ఒక నెలన� చూప�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
+msgid "Week"
+msgstr "వారం"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
+msgid "Show one week"
+msgstr "ఒక వారాన�ని చూప�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
+#, fuzzy
+msgid "Show one work week"
+msgstr "ఒక వారాన�ని చూప�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
+msgid "Active Appointments"
+msgstr "చేతనమైన నియామకాల�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
+msgid "Next 7 Days' Appointments"
+msgstr "తర�వాతి 7రోజ�ల' నియామకాల�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:964
+msgid "Description contains"
+msgstr "వివరణ కలిగివ�ంది"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
+msgid "Summary contains"
+msgstr "సంక�షిప�తమ� కలిగివ�ంది"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+msgid "Print this calendar"
+msgstr "ఈ క�యాలెండర� న� మ�ద�రించ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
+#, fuzzy
+msgid "Preview the calendar to be printed"
+msgstr "మ�ద�రించాల�సిన క�యాలెండర� న� ఉపదర�శనమిస�త�ంది"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
+msgid "Go To"
+msgstr "వెళ�ళ�మ�"
+
+#. Translators: Default filename part saving a memo to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#, fuzzy
+msgid "memo"
+msgstr "మెమో"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#, fuzzy
+msgid "New _Memo"
+msgstr "కొత�త మెమో"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../modules/calendar/e-memo-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
+msgid "Create a new memo"
+msgstr "కొత�త మెమోన� సృష�టించ�"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
+msgid "_Open Memo"
+msgstr "మెమోన� తెర�వ�మ�(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+msgid "View the selected memo"
+msgstr "ఎంపికచేసిన మెమోలన� దర�శించ�"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-task-shell-view-actions.c:776
+msgid "Open _Web Page"
+msgstr "మహాతల ప�టన� తెర�వ�(_W)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#, fuzzy
+msgid "Print the selected memo"
+msgstr "ఎంపికచేసిన మెమోలన� దర�శించ�"
+
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:609
+#, fuzzy
+msgid "task"
+msgstr "కార�యం"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:671
+msgid "_Assign Task"
+msgstr "కర�తవ�యాన�ని అప�పగించ�మ�(_A)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:748
+msgid "_Mark as Complete"
+msgstr "పూర�తయిన�నట� గా గ�ర�త�పెట�ట�(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:750
+msgid "Mark selected tasks as complete"
+msgstr "పూర�తయినట�ట� ఎంచ�క�న�న కర�తవ�యాలన� గ�ర�త� పెట�ట�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+msgid "_Mark as Incomplete"
+msgstr "అసంపూర�తిగా గ�ర�త�పెట�ట�(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:757
+#, fuzzy
+msgid "Mark selected tasks as incomplete"
+msgstr "పూర�తయినట�ట� ఎంచ�క�న�న కర�తవ�యాలన� గ�ర�త� పెట�ట�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:762
+msgid "New _Task"
+msgstr "కొత�త కార�యం(_T)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:764
+msgid "Create a new task"
+msgstr "కొత�త కార�యాన�ని సృష�టించ�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:769
+msgid "_Open Task"
+msgstr "కర�తవ�యాన�ని తెర�వ�మ�(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:771
+msgid "View the selected task"
+msgstr "ఎంచ�క�న�న కర�తవ�యాన�ని చూడ�మ�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-memo-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#, fuzzy
+msgid "_Save as iCalendar..."
+msgstr "iక�యాలెండర� గా మ�ంద�క� పంప�(_F)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-task-shell-view-actions.c:997
+#, fuzzy
+msgid "Print the selected task"
+msgstr "ఎంచ�క�న�న కర�తవ�యాన�ని చూడ�మ�"
+
+#: ../modules/calendar/e-memo-shell-backend.c:318
+msgctxt "New"
+msgid "Mem_o"
+msgstr "మెమో (_o)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:325
+#, fuzzy
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "భాగస�వామ�య మెమో (_S)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:327
+#, fuzzy
+msgid "Create a new shared memo"
+msgstr "కొత�త భాగస�వామ�య మెమోన� సృష�టించ�"
+
+#: ../modules/calendar/e-memo-shell-backend.c:335
+#, fuzzy
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "మెమో జాబితా"
+
+#: ../modules/calendar/e-memo-shell-backend.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
+msgid "Create a new memo list"
+msgstr "కొత�త మెమోజాబితా న� సృష�టించ�"
+
+#: ../modules/calendar/e-memo-shell-backend.c:588
+#, fuzzy
+msgid "The registry of memo lists"
+msgstr "ప�రాధమిక మెమో జాబితా"
+
+#: ../modules/calendar/e-memo-shell-content.c:608
+#, fuzzy
+msgid "The memo table model"
+msgstr "పాఠ�య నమూనా"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:221
+msgid "Loading memos"
+msgstr "మెమోలన� నింప�త�ంది"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#, fuzzy
+msgid "Memo List Selector"
+msgstr "మెమో మూలంన� ఎంపికచేయ�నది"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:677
+#, fuzzy
+msgid "Default Memo Client"
+msgstr "అప�రమేయ మెయిల� కక�షిదార�"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:678
+#, fuzzy
+msgid "Default client for memo operations"
+msgstr "ఆపరేషన� న� నడ�పలేమ�."
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:688
+msgid "This widget displays groups of memo lists"
+msgstr ""
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#, c-format
+msgid "Opening memos at %s"
+msgstr "%s వద�ద మెమోలన� తెర�స�తోంది"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+msgid "Print Memos"
+msgstr "మెమోలన� మ�ద�రించ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#, fuzzy
+msgid "_Delete Memo"
+msgstr "సందేశాన�ని తొలగించ�మ�(_D)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#, fuzzy
+msgid "_Find in Memo..."
+msgstr "సందేశంలో కన�గొన�మ�(_F)..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#, fuzzy
+msgid "Search for text in the displayed memo"
+msgstr "ప�రదర�శించబడిన సందేశం మ�ఖ�యభాగమ�లో పాఠ�యమ�న� వెత�క�మ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#, fuzzy
+msgid "D_elete Memo List"
+msgstr "కొత�త సంపర�క జాబితా(_N)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#, fuzzy
+msgid "Delete the selected memo list"
+msgstr "ఎంపికచేసిన మెమోన� తొలగించ�మ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
+msgid "_New Memo List"
+msgstr "కొత�త సంపర�క జాబితా(_N)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#, fuzzy
+msgid "Refresh the selected memo list"
+msgstr "ఎంపికచేసిన మెమోన� తొలగించ�మ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#, fuzzy
+msgid "Rename the selected memo list"
+msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#, fuzzy
+msgid "Show _Only This Memo List"
+msgstr "ఈ మెమో జాబితా మాత�రమే చూప�మ�(_o)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#, fuzzy
+msgid "Memo _Preview"
+msgstr "ఉపదర�శనం(_P)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#, fuzzy
+msgid "Show memo preview pane"
+msgstr "ఉపదర�శన పలకాన�ని చూపించ�మ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#, fuzzy
+msgid "Show memo preview below the memo list"
+msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#, fuzzy
+msgid "Show memo preview alongside the memo list"
+msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+msgid "Print the list of memos"
+msgstr "మెమోల జాబితాన� మ�ద�రిస�త�ంది"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#, fuzzy
+msgid "Preview the list of memos to be printed"
+msgstr "మ�ద�రించవలిసిన మెమోలజాబితాన� ఉపదర�శనంచేస�త�ంది"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:416
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d మెమో"
+msgstr[1] "%d మెమోల�"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-task-shell-view-private.c:569
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr ", %d ఎంపికచేయబడెన�"
+
+#: ../modules/calendar/e-memo-shell-view.c:223
+#, fuzzy
+msgid "Delete Memos"
+msgstr "సందేశాన�ని తొలగించ�మ�(_D)"
+
+#: ../modules/calendar/e-memo-shell-view.c:225
+#, fuzzy
+msgid "Delete Memo"
+msgstr "క� ప�రతినిదిగా"
+
+#: ../modules/calendar/e-task-shell-backend.c:322
+msgctxt "New"
+msgid "_Task"
+msgstr "కార�యం(_T)"
+
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "అప�పగించబడిన కార�తవ�యం (_d)"
+
+#: ../modules/calendar/e-task-shell-backend.c:331
+msgid "Create a new assigned task"
+msgstr "కొత�తగా స�థానం ఇవ�వబడ�డ కార�యాన�ని సృష�టించ�"
+
+#: ../modules/calendar/e-task-shell-backend.c:339
+#, fuzzy
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "కర�తవ�యం జాబితా"
+
+#: ../modules/calendar/e-task-shell-backend.c:341
+#: ../modules/calendar/e-task-shell-view-actions.c:715
+msgid "Create a new task list"
+msgstr "కొత�త కార�యజాబితా న� సృష�టించ�"
+
+#: ../modules/calendar/e-task-shell-backend.c:598
+#, fuzzy
+msgid "The registry of task lists"
+msgstr "ప�రాధమిక కర�తవ�య జాబితా"
+
+#: ../modules/calendar/e-task-shell-content.c:630
+#, fuzzy
+msgid "The task table model"
+msgstr "పాఠ�య నమూనా"
+
+#: ../modules/calendar/e-task-shell-migrate.c:98
+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 ""
+"ఎవల�య�షన� 1.x. న�ండి ఎవల�య�షన� కర�తవ�య సంచయాల స�థానమ� మరియ� పారంపర�యంమారినది\n"
+"\n"
+"ఎవల�య�షన� మీ సంచయాలన� వలస పంప�త�ండగా దయచేసి ఆగండి..."
+
+#. FIXME: domain/code
+#: ../modules/calendar/e-task-shell-migrate.c:620
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "`%s' కర�తవ�యమ�లన� వలసపంపలేమ�"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:221
+msgid "Loading tasks"
+msgstr "కార�తవ�యాలన� నింప�త�ంది"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:569
+#, fuzzy
+msgid "Task List Selector"
+msgstr "కర�తవ�యం మూల ఎంపికదారి"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:677
+#, fuzzy
+msgid "Default Task Client"
+msgstr "అప�రమేయ మెయిల� కక�షిదార�"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:678
+#, fuzzy
+msgid "Default client for task operations"
+msgstr "తంతి విస�తరింప� స�థితి కొరక� అప�రమేయ విల�వ"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:688
+msgid "This widget displays groups of task lists"
+msgstr ""
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-task-shell-sidebar.c:868
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "%s వద�ద కార�తవ�యాలన� తెర�స�తోంది"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+msgid "Print Tasks"
+msgstr "కార�యాల� మ�ద�రించ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:553
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"పూర�తియినట�ట� గ�ర�త�పెట�టిన అన�ని కార�తవ�యాలన� ఈ కార�యం శాశ�వతంగా తొలిగిస�త�ంది.మీర� మ�ంద�కెళీతే, ఈ "
+"కర�తవ�యాలన� తిరిగి పొందలేర�\n"
+"\n"
+"ఈ కర�తవ�యాలన�ని నింజంగా తొలిగించాలా?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:678
+#, fuzzy
+msgid "_Delete Task"
+msgstr "తొలగించ�(_D)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:685
+#, fuzzy
+msgid "_Find in Task..."
+msgstr "సందేశంలో కన�గొన�మ�(_F)..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:687
+#, fuzzy
+msgid "Search for text in the displayed task"
+msgstr "ప�రదర�శించబడిన సందేశం మ�ఖ�యభాగమ�లో పాఠ�యమ�న� వెత�క�మ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:699
+#, fuzzy
+msgid "Copy..."
+msgstr "నకల�తీయ�(_C)..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:706
+#, fuzzy
+msgid "D_elete Task List"
+msgstr "కర�తవ�యం జాబితాన� ఎంపికచేయ�మ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
+#, fuzzy
+msgid "Delete the selected task list"
+msgstr "ఎంచ�క�న�న కర�తవ�యాలన� తొలగించ�మ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:713
+msgid "_New Task List"
+msgstr "కొత�త కర�తవ�యంజాబితా(_N)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:729
+#, fuzzy
+msgid "Refresh the selected task list"
+msgstr "ఎంచ�క�న�న కర�తవ�యాలన� తొలగించ�మ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:736
+#, fuzzy
+msgid "Rename the selected task list"
+msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:741
+#, fuzzy
+msgid "Show _Only This Task List"
+msgstr "ఈ కర�తవ�య జాబితా మాత�రమే చూప�మ�(_o)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:755
+#, fuzzy
+msgid "Mar_k as Incomplete"
+msgstr "అసంపూర�తిగా గ�ర�త�పెట�ట�(_M)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:785
+msgid "Delete completed tasks"
+msgstr "పూర�తయిన కర�తవ�యాలన� తొలగించ�మ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:860
+msgid "Task _Preview"
+msgstr "కర�తవ�య ఉపదర�శనం(_P)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:862
+#, fuzzy
+msgid "Show task preview pane"
+msgstr "ఉపదర�శన పలకాన�ని చూపించ�మ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:883
+#, fuzzy
+msgid "Show task preview below the task list"
+msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:890
+#, fuzzy
+msgid "Show task preview alongside the task list"
+msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+msgid "Active Tasks"
+msgstr "చేతనమైన కర�తవ�యాల�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:912
+msgid "Completed Tasks"
+msgstr "పూర�తయిన కర�తవ�యాల�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:919
+msgid "Next 7 Days' Tasks"
+msgstr "తర�వాతి 7 రోజ�ల' కర�తవ�యాల�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:926
+msgid "Overdue Tasks"
+msgstr "సమయంమించిన కర�తవ�యాల�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Tasks with Attachments"
+msgstr "అన�బంధాలతో కర�తవ�యాల�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:983
+msgid "Print the list of tasks"
+msgstr "కర�తవ�యాల జాబితాన� మ�ద�రించ�మ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:990
+#, fuzzy
+msgid "Preview the list of tasks to be printed"
+msgstr "మ�ద�రించాల�సిన కర�తవ�యాల జాబితాన� ఉపదర�శనమిస�త�ంది "
+
+#: ../modules/calendar/e-task-shell-view-private.c:463
+msgid "Expunging"
+msgstr "కొట�టివేయ�చ�న�నది"
+
+#: ../modules/calendar/e-task-shell-view-private.c:565
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d కర�తవ�యం"
+msgstr[1] "%d కర�తవ�యాల�"
+
+#: ../modules/calendar/e-task-shell-view.c:351
+#, fuzzy
+msgid "Delete Tasks"
+msgstr "పూర�తయిన కర�తవ�యాల�"
+
+#: ../modules/calendar/e-task-shell-view.c:353
+#, fuzzy
+msgid "Delete Task"
+msgstr "క� ప�రతినిదిగా"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:335
+#, c-format
+msgid "%d attached messages"
+msgstr "%d అన�భందించిన సందేశమ�ల�"
+
+#. Translators: "None" for a junk hook name,
+#. * when the junk plugin is not enabled.
+#: ../modules/mail/e-mail-junk-hook.c:90
+#, fuzzy
+msgctxt "mail-junk-hook"
+msgid "None"
+msgstr "�దికాద�"
+
+#: ../modules/mail/e-mail-shell-backend.c:168
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "తపాలా సందేశం (_M)"
+
+#: ../modules/mail/e-mail-shell-backend.c:170
+msgid "Compose a new mail message"
+msgstr "కొత�త మెయిల� సందేశం న� కూర�చ�మ�"
+
+#: ../modules/mail/e-mail-shell-backend.c:178
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "మెయిల� ఫోల�డర� (_F)"
+
+#: ../modules/mail/e-mail-shell-backend.c:180
+msgid "Create a new mail folder"
+msgstr "కొత�త మెయిల� సంచయంన� సృష�టించ�మ�"
+
+#: ../modules/mail/e-mail-shell-backend.c:199
+msgid "Mail Accounts"
+msgstr "మెయిల� ఖాతాల�"
+
+#: ../modules/mail/e-mail-shell-backend.c:207
+msgid "Mail Preferences"
+msgstr "మెయిల� అభీష�టాల�"
+
+#: ../modules/mail/e-mail-shell-backend.c:215
+msgid "Composer Preferences"
+msgstr "కూర�పరి అభీష�టాల�"
+
+#: ../modules/mail/e-mail-shell-backend.c:223
+msgid "Network Preferences"
+msgstr "నెట�వర�క�� అభీష�టాల�"
+
+#: ../modules/mail/e-mail-shell-content.c:679
+#, fuzzy
+msgid "Group by Threads"
+msgstr "సమూహం ద�వారా తంత�ల�(_G)"
+
+#: ../modules/mail/e-mail-shell-content.c:680
+msgid "Whether to group messages by threads"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view.c:875
+#, fuzzy
+msgid "_Disable Account"
+msgstr "ఖాతాన� అచేతనంచేయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:857
+#, fuzzy
+msgid "Disable this account"
+msgstr "ఖాతాన� అచేతనంచేయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:864
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "తొలగించిన సందేశాలని అన�ని సంచయాల న�ండి శాశ�వతంగా తీసివేయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:869
+msgid "C_reate Search Folder From Search..."
+msgstr "శోధన కొరక� శోధన సంచయాన�ని సృష�టించ�మ�(_r)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:876
+msgid "_Download Messages for Offline Usage"
+msgstr "ఆఫ�‌లైన� వ�పయోగమ�ల కొరక� సందేశాల న� దిగ�మతిచేయ�మ� (_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:878
+#, fuzzy
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr "ఆఫ�‌లైన� కొరక� గ�ర�త�ంచిన ఖాతాల/సంచయాల యొక�క సందేశాలన� దిగ�మతి చేయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:883
+msgid "Fl_ush Outbox"
+msgstr "అవ�ట�‌బాక�స�  న� త�డిచివేయ�మ�(_u)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:890
+msgid "_Copy Folder To..."
+msgstr "సంచయాన�ని ఇక�కడికి నకల� తీయ�మ�(_C)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:892
+msgid "Copy the selected folder into another folder"
+msgstr "ఎంచ�క�న�న సంచయాన�ని వేరే సంచయానికి నకల� తీయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:899
+msgid "Permanently remove this folder"
+msgstr "శాశ�వతంగా ఈ సంచయాన�ని తొలగించ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:904
+msgid "E_xpunge"
+msgstr "కొట�టివేయ�మ�(_x)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:906
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "తొలగించిన సందేశాలన� ఈ సంచయమ� న�ండి శాశ�వతంగా తీసివేయ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:911
+msgid "Mar_k All Messages as Read"
+msgstr "అన�ని సందేశాలని చదివినవిగా గ�ర�త� పెట�ట�మ�(_k)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:913
+msgid "Mark all messages in the folder as read"
+msgstr "సంచయంలోనిఅన�ని సందేశాలని చదివినవిగా గ�ర�త� పెట�ట�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:918
+msgid "_Move Folder To..."
+msgstr "సంచయం న� ఇక�కడికి జర�ప�మ�(_M)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:920
+msgid "Move the selected folder into another folder"
+msgstr "ఎంచ�క�న�న సంచయాన�ని వేరే సంచయం లోకి జర�ప�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:925
+msgid "_New..."
+msgstr "కొత�త(_N)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:927
+msgid "Create a new folder for storing mail"
+msgstr "మెయిల� దాయ�టక� కొత�త సంచయాన�ని సృష�టించ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:934
+msgid "Change the properties of this folder"
+msgstr "ఈ సంచయ లక�షణాలన� మార�చ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:941
+msgid "Refresh the folder"
+msgstr "సంచయాన�ని ప�నర�వికాసపర�చ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:948
+msgid "Change the name of this folder"
+msgstr "ఈ సంచయ నామాన�ని మార�చ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:953
+msgid "Select Message _Thread"
+msgstr "సందేశం తంతిని ఎంపికచేయ�మ�(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:955
+msgid "Select all messages in the same thread as the selected message"
+msgstr "ఎంపికచేసిన సందేశం లాగా అదే తంతిలోని అన�ని సందేశాలన� ఎంపికచేయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:960
+msgid "Select Message S_ubthread"
+msgstr "సందేశం ఉపతంతిని ఎంపికచేయ�మ�(_u)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:962
+msgid "Select all replies to the currently selected message"
+msgstr "ప�రస�త�తం ఎంచ�కోబడని సందేశంక� అన�ని ప�రత�య�త�తరమ�లన� ఎంచ�కొన�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:967
+msgid "_Unsubscribe"
+msgstr "చందావిరమించ�మ�(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:969
+#, fuzzy
+msgid "Unsubscribe from the selected folder"
+msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:974
+msgid "Empty _Trash"
+msgstr "చెత�తన� ఖాళీ చేయ�(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "తొలగించిన సందేశాలని అన�ని సంచయాల న�ండి శాశ�వతంగా తీసివేయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:981
+msgid "_New Label"
+msgstr "కొత�త లేబ�ల�(_N)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:990
+#, fuzzy
+msgid "N_one"
+msgstr "�దికాద�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:997
+msgid "Hide _Read Messages"
+msgstr "చదివిన సందేశాలన� అదృశ�యపర�చ�మ�(_R)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:999
+msgid "Temporarily hide all messages that have already been read"
+msgstr "ఇదివరకే చదవబడిన సందేశాలన� తాత�కాలికంగా అదృశ�యపర�చ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
+msgid "Hide S_elected Messages"
+msgstr "ఎంచ�క�న�న సందేశాలన� అదృశ�యపర�చ�మ�(_e)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
+msgid "Temporarily hide the selected messages"
+msgstr "ఎంచ�క�న�న సందేశాలన� తాత�కాలికంగా అదృశ�యపర�చ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
+msgid "Show Hidde_n Messages"
+msgstr "అదృశ�యపర�చిన సందేశాలన� చూప�మ�(_n)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
+msgid "Show messages that have been temporarily hidden"
+msgstr " తాత�కాలికంగా అదృశ�యపర�చిన సందేశాలన� చూప�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
+msgid "Cancel the current mail operation"
+msgstr "ప�రస�త�త మెయిల�  కార�యమ�న� రద�ద�చేయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1039
+msgid "Collapse All _Threads"
+msgstr "అన�ని తంత�లన� కూల�చ�త�ంది(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1041
+msgid "Collapse all message threads"
+msgstr "అన�ని సందేశ తంత�లన� కూల�చ�త�ంది"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1046
+msgid "E_xpand All Threads"
+msgstr "అన�ని తంత�లన� విస�తరించ�మ�(_x)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1048
+msgid "Expand all message threads"
+msgstr "సందేశం అన�ని తంత�లన� వస�తరింప�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1053
+msgid "_Message Filters"
+msgstr "సందేశం వడపోతల�(_M)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1055
+msgid "Create or edit rules for filtering new mail"
+msgstr "కొత�త మెయిల� న� వడపోయ�టక� నియమాలన� సృష�టించ�మ� లేదా సరిచేయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1060
+msgid "Search F_olders"
+msgstr "సంచయాలన� వెత�క�మ�(_o)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#, fuzzy
+msgid "Create or edit search folder definitions"
+msgstr "వెత�క� సంచయం నిర�వచనాలన� సృష�టించ� లేదా సరిచేయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
+msgid "_Subscriptions..."
+msgstr "చందాల�... (_S)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1069
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "దూరస�థ సేవికల సంచయాల తో చందాదార�కండి లేదా చందావిరమించ�కోండి"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1076
+msgid "F_older"
+msgstr "సంచయం(_o)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1083
+msgid "_Label"
+msgstr "లెబ�ల�(_L)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1123
+msgid "_New Folder..."
+msgstr "కొత�త సంచయం(_N)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
+msgid "Hide _Deleted Messages"
+msgstr "తొలగించిన సందేశాలన� అదృశ�యపర�చ�మ�(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "సందేశాలగ�ండా ఒక లైన� కొట�టివేసినట�ల� చూపించటం కన�నా వాటిని మర�గ�పర�చ�మ� తీసివేయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
+msgid "Show Message _Preview"
+msgstr "సందేశ ఉపదర�శనాన�ని చూప�మ�(_P)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#, fuzzy
+msgid "Show message preview pane"
+msgstr "సందేశ ఉపదర�శన గవాక�షాన�ని చూప�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
+msgid "_Group By Threads"
+msgstr "సమూహం ద�వారా తంత�ల�(_G)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#, fuzzy
+msgid "Threaded message list"
+msgstr "తంతీకరణ సందేశ జాబితా"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
+msgid "Show message preview below the message list"
+msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#, fuzzy
+msgid "Show message preview alongside the message list"
+msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1202
+msgid "All Messages"
+msgstr "అన�ని సందేశాల�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1209
+msgid "Important Messages"
+msgstr "మ�ఖ�యమైన సందేశాల�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1216
+msgid "Last 5 Days' Messages"
+msgstr "గత 5 రోజ�ల' సందేశాల�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1223
+msgid "Messages Not Junk"
+msgstr "నిరర�ధకమ�కాని సందేశాల�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1230
+msgid "Messages with Attachments"
+msgstr "అన�భందమ�లతో సందేశాల�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1237
+msgid "No Label"
+msgstr "లేబ�ల� లేద�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1244
+msgid "Read Messages"
+msgstr "చదివిన సందేశాల�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
+msgid "Recent Messages"
+msgstr "ఇటీవలి సందేశాల�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
+msgid "Unread Messages"
+msgstr "చద�వని సందేశాల�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#, fuzzy
+msgid "Subject or Addresses contain"
+msgstr "ఇది కలిగివ�న�న సంగతి లేదా చిర�నామాల�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
+msgid "All Accounts"
+msgstr "అన�ని ఖాతాల�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
+msgid "Current Account"
+msgstr "ప�రస�త�త ఖాతా"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
+msgid "Current Folder"
+msgstr "ప�రస�త�త సంచయం"
+
+#: ../modules/mail/e-mail-shell-view-private.c:891
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d ఎంపికచేయబడెన�, "
+msgstr[1] "%d ఎంపికచేయబడెన�, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:902
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d తొలగించబడెన�"
+msgstr[1] "%d తొలగించబడెన�"
+
+#: ../modules/mail/e-mail-shell-view-private.c:908
+#: ../modules/mail/e-mail-shell-view-private.c:915
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d నిరర�ధకమైన"
+msgstr[1] "%d నిరర�ధకమైన"
+
+#: ../modules/mail/e-mail-shell-view-private.c:921
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d డ�రాఫ�ట�స�"
+msgstr[1] "%d డ�రాఫ�ట�స�"
+
+#: ../modules/mail/e-mail-shell-view-private.c:927
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d పంపని"
+msgstr[1] "%d పంపని"
+
+#: ../modules/mail/e-mail-shell-view-private.c:933
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d పంపిన"
+msgstr[1] "%d పంపిన"
+
+#: ../modules/mail/e-mail-shell-view-private.c:945
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d చదవని, "
+msgstr[1] "%d చదవని, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:948
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d మొత�తం"
+msgstr[1] "%d మొత�తం"
+
+#: ../modules/mail/e-mail-shell-view.c:548
+msgid "All Account Search"
+msgstr "అన�ని ఖాతాల శోధన"
+
+#: ../modules/mail/e-mail-shell-view.c:685
+msgid "Account Search"
+msgstr "ఖాతా శోధన"
+
+#: ../modules/mail/e-mail-shell-view.c:873
+msgid "Proxy _Logout"
+msgstr "ప�రాక�సీ లాగ�అవ�ట�(_L)"
+
+#: ../modules/mail/em-composer-prefs.c:473
+msgid "Language(s)"
+msgstr "భాష(ల�)"
+
+#: ../modules/mail/em-mailer-prefs.c:96
+msgid "Every time"
+msgstr "ప�రతి సారి"
+
+#: ../modules/mail/em-mailer-prefs.c:97
+msgid "Once per day"
+msgstr "రోజ�క� ఒక సారి"
+
+#: ../modules/mail/em-mailer-prefs.c:98
+msgid "Once per week"
+msgstr "వారమ�నక� ఒక సారి"
+
+#: ../modules/mail/em-mailer-prefs.c:99
+msgid "Once per month"
+msgstr "నెలక� ఒక సారి"
+
+#: ../modules/mail/em-mailer-prefs.c:221
+msgid "Add Custom Junk Header"
+msgstr "మ�ల�చ�క�న�న నిరర�దకప� పీఠికన� జతచేయ�మ�"
+
+#: ../modules/mail/em-mailer-prefs.c:225
+msgid "Header Name:"
+msgstr "పీఠిక నామమ�:"
+
+#: ../modules/mail/em-mailer-prefs.c:226
+msgid "Header Value Contains:"
+msgstr "పీఠిక విల�వ కలిగిఉండ�న�:"
+
+#: ../modules/mail/em-mailer-prefs.c:325
+#: ../widgets/table/e-table-click-to-add.c:504
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "పీఠిక"
+
+#: ../modules/mail/em-mailer-prefs.c:329
+msgid "Contains Value"
+msgstr "కలిగిఉండ� విల�వ"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr "%s ప�లగ�ఇన� అంద�బాట�లోఉంది మరియ� బైనరీ సంస�థాపించబడెన�."
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr "%s ప�లగ�ఇన� అంద�బాట�లో లేద�. దయచేసి ప�యాకేజి సంస�థాపించబడిందేమో పరీక�షించండి."
+
+#: ../modules/mail/em-mailer-prefs.c:766
+#, fuzzy
+msgid "No junk plugin available"
+msgstr "� నిరర�ధక ప�లగ�ఇన� అంద�బాట�లో లేద�"
+
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
+#: ../modules/mail/em-mailer-prefs.c:1151
+#, fuzzy
+msgid "_Table column:"
+msgstr "పట�టిక నిల�వ�వర�స:"
+
+#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
+#: ../modules/mail/em-mailer-prefs.c:1153
+#, fuzzy
+msgid "_Date header:"
+msgstr "తేదీ పీఠిక:"
+
+#: ../modules/mail/em-mailer-prefs.c:1154
+#, fuzzy
+msgid "Show _original header value"
+msgstr "వాస�తవ పరిమాణంన� చూప�మ�(_O)"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "హెల�లో పైథాన�"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "పైథాన� ప�లగ�ఇన� లోడర� పరిశీలనల�"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "పైథాన� పరిశీలనా ప�లగ�ఇన�"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "పైథాన� ఈప�లగ�ఇన� లోడర� కొరక� పరిశీలనా ప�లగ�ఇన�."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-#| msgid "List local address book folders"
 msgid "Add local address books to Evolution."
 msgstr "స�థానిక చిర�నామా ప�స�తకమ�లన� ఎవాల�యూషన�‌క� జతచేయి."
 
@@ -14969,21 +16390,12 @@ msgid ""
 "body."
 msgstr "ఆన�భందంన� గ�ర�త�చేయ� ప�లగ�ఇన� సందేశం బాడీ నంద� చూడ�టక� అనవాళ�ళ జాబితా."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:476
-#: ../plugins/templates/templates.c:389
+#: ../plugins/attachment-reminder/attachment-reminder.c:514
+#: ../plugins/templates/templates.c:413
 msgid "Keywords"
 msgstr "కీపదాల�"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Attachment Reminder"
-msgstr "అన�బంధం న� గ�ర�త�చేయ�నది"
-
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid "Reminds you when you forgot to add an attachment to a mail message."
-msgstr "మెయిల� సందేశమ�నక� అన�భందమ�న� జతచేయ�ట మీర� మరచినప�ప�డ� మీక� గర�త�చేస�త�ంది."
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
@@ -14991,59 +16403,61 @@ msgstr ""
 "ఈ సందేశం ఒక అన�భందాన�ని కలిగిఉంది అని సూచించే కొన�ని కీపదాలన� ఎవాల�యూషన� కన�గొంది, అయితే అన�భందాన�ని "
 "కన�గొనలేకపోయింది."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid "Message has no attachments"
 msgstr "సందేశం � అన�భందాలన� కలిగిలేద�"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add attachment..."
 msgstr "అన�భందంన� జతపర�చ�మ�(_A)..."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "సందేశాన�ని సరిచేయి (_E)"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "అన�బంధం న� గ�ర�త�చేయ�నది"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "మెయిల� సందేశమ�నక� అన�భందమ�న� జతచేయ�ట మీర� మరచినప�ప�డ� మీక� గర�త�చేస�త�ంది."
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#| msgid "Audio inline plugin"
-msgid "Audio Inline"
-msgstr "ఆడియో ఇన�‌లైన�"
+#, fuzzy
+msgid "Inline Audio"
+msgstr "ఇన�‌లైన� vకార�డ�ల�"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly from Evolution."
+#, fuzzy
+msgid "Play audio attachments directly in mail messages."
 msgstr "ఆడియో అన�భందమ�లన� నేర�గా ఎవాల�యూషన� న�ండి ప�లే చేయ�మ�."
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
 msgstr "ఎవాల�యూషన� బ�యాక�అప� దస�త�రం యొక�క నామమ�న� ఎంపికచేయ�మ�"
 
-#: ../plugins/backup-restore/backup-restore.c:167
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after backup"
 msgstr "బ�యాక�అప� తర�వాత ఎవాల�యూషన� న� ప�నఃప�రారంభించ�మ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:190
+#: ../plugins/backup-restore/backup-restore.c:209
 msgid "Select name of the Evolution backup file to restore"
 msgstr "ఎవాల�యూషన� బ�యాక�అప� దస�త�రం యొక�క నామమ�న� తిరిగినిల�వఉంచ�టక� ఎంపికచేయ�మ�"
 
-#: ../plugins/backup-restore/backup-restore.c:214
+#: ../plugins/backup-restore/backup-restore.c:222
 msgid "_Restart Evolution after restore"
 msgstr "ఎవాల�యూషన� న� తిరిగినిల�వ చేసినతర�వాత ప�నఃప�రారంభిచ�మ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:287
-msgid "Restore from backup"
-msgstr "బ�యాక�అప� న�ండి తిరిగినిల�వఉంచ�మ�"
-
-#: ../plugins/backup-restore/backup-restore.c:289
-#| msgid ""
-#| "You can restore Evolution from your backup. It can restore all the Mails, "
-#| "Calendars, Tasks, Memos, Contacts. \n"
-#| "It also restores all your personal settings, mail filters etc."
+#: ../plugins/backup-restore/backup-restore.c:290
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
 "మీర� ఎవాల�యూషన� మీ బ�యాక�అప� న�ండి తిరిగినిల�వ చేస�కొనవచ�చ�. ఇది అన�ని మెయిల�స�, క�యాలెండర�ల�, కర�తవ�యాల�, "
-"మెమోస�, పరిచయాలన� తిరిగినిల�వచేస�త�ంది.ఇది మీ వ�యక�తిగత అమరికల�, మెయిల� వడపోతల� మెద. వాటిని తిరిగినిల�వ ఉంచ�త�ంది."
+"మెమోస�, పరిచయాలన� తిరిగినిల�వచేస�త�ంది.ఇది మీ వ�యక�తిగత అమరికల�, మెయిల� వడపోతల� మెద. వాటిని తిరిగినిల�వ "
+"ఉంచ�త�ంది."
 
 #: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
@@ -15057,116 +16471,136 @@ msgstr "దయచేసి ఒక ఎవాల�యూషన� ఆర�చి
 msgid "Choose a file to restore"
 msgstr "తిరిగినిల�వఉంచ�కొన�టక� ఒక దస�త�రాన�ని ఎంచ�కొన�మ�"
 
-#: ../plugins/backup-restore/backup.c:62
+#: ../plugins/backup-restore/backup-restore.c:315
+msgid "Restore from backup"
+msgstr "బ�యాక�అప� న�ండి తిరిగినిల�వఉంచ�మ�"
+
+#: ../plugins/backup-restore/backup-restore.c:353
+msgid "_Backup Settings..."
+msgstr "బ�యాక�అప� అమరికల�(_B)..."
+
+#: ../plugins/backup-restore/backup-restore.c:355
+#, fuzzy
+msgid "Backup Evolution data and settings to an archive file"
+msgstr "ఎవాల�యూషన� డాటా మరియ� అమరికలన� బ�యాక�అప� మరియ� తిరిగినిల�వఉంచ�మ�"
+
+#: ../plugins/backup-restore/backup-restore.c:360
+msgid "R_estore Settings..."
+msgstr "అమరికలన� తిరిగినిల�వఉంచ�(_e)..."
+
+#: ../plugins/backup-restore/backup-restore.c:362
+#, fuzzy
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "ఎవాల�యూషన� డాటా మరియ� అమరికలన� బ�యాక�అప� మరియ� తిరిగినిల�వఉంచ�మ�"
+
+#: ../plugins/backup-restore/backup.c:63
 msgid "Backup Evolution directory"
 msgstr "ఎవాల�యూషన� సంచయాన�ని బ�యాక�అప� తీయ�మ�"
 
-#: ../plugins/backup-restore/backup.c:64
+#: ../plugins/backup-restore/backup.c:65
 msgid "Restore Evolution directory"
 msgstr "ఎవాల�యూషన� సంచయాన�ని తిరిగినిల�వఉంచ�మ�"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:67
 msgid "Check Evolution Backup"
 msgstr "ఎవాల�యూషన� బ�యాక�అప�‌న� పరిశీలించ�మ�"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:69
 msgid "Restart Evolution"
 msgstr "ఎవల�యూషన� న� ప�న:ప�రారంభించ�"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:71
 msgid "With Graphical User Interface"
 msgstr "చిత�రసంభంద వినియోగదారి ఇంటర�‌ఫేస� తో"
 
-#: ../plugins/backup-restore/backup.c:188
-#: ../plugins/backup-restore/backup.c:250
+#: ../plugins/backup-restore/backup.c:189
+#: ../plugins/backup-restore/backup.c:251
 msgid "Shutting down Evolution"
 msgstr "ఎవల�యూషన� న� మూయ�మ�"
 
-#: ../plugins/backup-restore/backup.c:195
+#: ../plugins/backup-restore/backup.c:196
 msgid "Backing Evolution accounts and settings"
 msgstr "ఎవాల�యూషన� ఖాతాలన� మరియ� అమరికలన� వెన�కక�తెస�తోంది"
 
-#: ../plugins/backup-restore/backup.c:201
+#: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "ఎవాల�యూషన� డాటాన� వెన�కక� తెస�తోంది (మెయిల�స�, పరిచయాల�, క�యాలెండర�, కర�తవ�యాల�, మెమోస�)"
 
-#: ../plugins/backup-restore/backup.c:212
+#: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
 msgstr "బ�యాక�అప� పూర�తిఅయినది"
 
-#: ../plugins/backup-restore/backup.c:217
-#: ../plugins/backup-restore/backup.c:238
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:218
+#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:285
 msgid "Restarting Evolution"
 msgstr "ఎవాల�యూషన� న� ప�నఃప�రారంభిస�త�న�నది"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:255
 msgid "Backup current Evolution data"
 msgstr "ప�రస�త�త ఎవాల�యూషన� డాటాన� బ�యాక�అప� తీస�తోంది"
 
-#: ../plugins/backup-restore/backup.c:259
+#: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
 msgstr "దస�త�రాలన� బ�యాక�అప� న�ండి బయటక�తీస�తోంది"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:267
 msgid "Loading Evolution settings"
 msgstr "ఎవాల�యూషన� అమరికలన� నింప�తోంది"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:274
 msgid "Removing temporary backup files"
 msgstr "తాత�కాలికంగా దాయబడిన దస�త�రాలన� తొలగిస�త�న�నది"
 
-#: ../plugins/backup-restore/backup.c:280
+#: ../plugins/backup-restore/backup.c:281
 msgid "Ensuring local sources"
 msgstr "స�థానిక మూలాలన� ఖచ�చితపర�స�త�ంది"
 
-#: ../plugins/backup-restore/backup.c:429
+#: ../plugins/backup-restore/backup.c:428
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "ఫోల�డర� %sక� బ�యాక�అప� తీస�త�ంది"
 
-#: ../plugins/backup-restore/backup.c:434
+#: ../plugins/backup-restore/backup.c:433
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s సంచయం న�ండి తిరిగినిల�వచేస�తోంది"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:453
 msgid "Evolution Backup"
 msgstr "ఎవాల�యూషన� బ�యాక�అప�"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:453
 msgid "Evolution Restore"
 msgstr "ఎవల�యూషన� తిరిగినిల�వచేయ�మ�"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:488
 msgid "Backing up Evolution Data"
 msgstr "ఎవాల�యూషన� డాటాన� బ�యాక�అప� తీస�త�ంది"
 
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:489
 msgid "Please wait while Evolution is backing up your data."
 msgstr "మీడాటాన� ఎవాల�యూషన� బ�యాక�అప� తీస�త�న�నప�ప�డ� దయచేసి వేచివ�ండండి."
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:491
 msgid "Restoring Evolution Data"
 msgstr "ఎవాల�యూషన� డాటాన� తిరిగివ�ంచ�తోంది"
 
-#: ../plugins/backup-restore/backup.c:493
+#: ../plugins/backup-restore/backup.c:492
 msgid "Please wait while Evolution is restoring your data."
 msgstr "ఎవాల�యూషన� మీడాటాన� తిరిగివ�ంచ�త�న�నప�పడ� దయచేసి వేచివ�ండండి."
 
-#: ../plugins/backup-restore/backup.c:511
+#: ../plugins/backup-restore/backup.c:510
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "మీ ఖాతానందలి డాటామొత�తమ�పై ఆధారపడి యిది కొంతసమయం తీస�కొంట�ంది."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-#| msgid "Backup and restore plugin"
 msgid "Backup and Restore"
 msgstr "బ�యాకప�‌తీయి మరియ� తిరిగినిల�వవ�ంచ�"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-#| msgid "Backup and restore Evolution data and settings"
 msgid "Backup and restore your Evolution data and settings."
 msgstr "మీ ఎవాల�యూషన� డాటా మరియ� అమరికలన� బ�యాకప�‌తీచి మరియ� తిరిగినిల�వవ�ంచ�త�ంది."
 
@@ -15175,7 +16609,8 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "మీర� ఖచ�చితంగా ఎవాల�యూషన� మూయాలని అన�క�ంట�న�నారా?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "మీర� ఎంపికచేసిన బ�యాక�అప� దస�త�రంన�ండి ఎవాల�యూషన� న� తిరిగినిల�వ ఉంచ�దామని అన�క�ంట�న�నారా?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
@@ -15218,48 +16653,35 @@ msgstr ""
 "అన�ని దాయని విండోలన� మూయ�మ�. మీర� ఎవాల�యూషన� ప�నఃనిల�వ తర�వాత స�వయంచాలకంగా ప�నఃప�రారంభమవ�వాలంటే , "
 "దయచేసి మార�ప�బటన� చేతనంచేయ�మ�."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup and restore Evolution data and settings"
-msgstr "ఎవాల�యూషన� డాటా మరియ� అమరికలన� బ�యాక�అప� మరియ� తిరిగినిల�వఉంచ�మ�"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-msgid "R_estore Settings..."
-msgstr "అమరికలన� తిరిగినిల�వఉంచ�(_e)..."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "_Backup Settings..."
-msgstr "బ�యాక�అప� అమరికల�(_B)..."
-
-#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "స�వయంచాలక పరిచయాల�"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:646
-#| msgid "_Auto-create address book entries when replying to messages"
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Create _address book entries when sending mails"
 msgstr "సందేశమ�లన� పంప�నప�ప�డ� చిర�నామా ప�స�తకం ప�రవేశాలన� సృష�టిస�త�ంది (_a)"
 
-#: ../plugins/bbdb/bbdb.c:652
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "స�వయంచాలక పరిచయాల కొరక� చిర�నామా ప�స�తంకంన� ఎంపికచేయ�మ�"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "త�వరిత సందేశ పరిచయాల�"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:746
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "పిడిగిన� మిత�ర జాబితాన�ండి పరిచయాల మరియ� చిత�రాల సమాచారాన�ని క�రమంగా కాలనియమత చేయ�మ�"
 
-#: ../plugins/bbdb/bbdb.c:688
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "పిడిగిన� మిత�ర జాబితా కొరక� చిర�నామా ప�స�తకాన�ని ఎంచ�కొన�మ�"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "మిత�ర జాబితా తో ఇప�ప�డ� కాలనియమత చేయ�మ�(_b)"
 
@@ -15268,10 +16690,6 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-#| msgid ""
-#| "Automatically fills your address book with names and email addresses as "
-#| "you reply to messages. Also fills in IM contact information from your "
-#| "buddy lists."
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
@@ -15281,30 +16699,36 @@ msgid ""
 msgstr ""
 "మీ చిర�నామా ప�స�తకం నిర�వహించ�టక� చేయవలసిన పనిని యిదిచేస�త�ంది.\n"
 "\n"
-"మీర� సందేశాలక� ప�రత�య�త�తరమ� ఇచ�చినట�ల�గా మీ చిర�నామాప�స�తకం న� నామమ�ల� మరియ ఈమోయిల� చిర�నామాలతో స�వయంచాలకంగా నింప�త�ంది. మీ మిత�ర జాబితాలన�ండి కూడా IM పరిచయాల సమాచారాన�ని నింప�త�ంది."
+"మీర� సందేశాలక� ప�రత�య�త�తరమ� ఇచ�చినట�ల�గా మీ చిర�నామాప�స�తకం న� నామమ�ల� మరియ ఈమోయిల� చిర�నామాలతో "
+"స�వయంచాలకంగా నింప�త�ంది. మీ మిత�ర జాబితాలన�ండి కూడా IM పరిచయాల సమాచారాన�ని నింప�త�ంది."
 
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
+msgid "Bogofilter is not available. Please install it first."
+msgstr ""
+
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "%s స�పానింగ�‌లో వొకదోషమ� సంభవించింది: %s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "బోగోఫిల�టర� చైల�డ�� కార�యక�రమం స�పందించ�టలేద�, నశింపబడ�తోంది..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "బోగోఫిల�టర� చైల�డ�� కార�యక�రమం అంతరాయంక� వేచివ�ండ�మ�, సమాప�తంచేయబడ�తోంది..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "బోగోఫిల�టర� వైఫల�యానికి పైప�, దోషమ� కోడ�: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
 msgstr "సందేశ పాఠ�యమ�న� యూనికోడ�‌క� మార�చ�మ� (_U)"
 
@@ -15321,7 +16745,6 @@ msgstr ""
 "Unicode UTF-8 క� మార�చ�మ�."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-#| msgid "Bogofilter junk plugin"
 msgid "Bogofilter Junk Filter"
 msgstr "Bogofilter నిరర�ధక ఫిల�టర�"
 
@@ -15330,82 +16753,181 @@ msgid "Bogofilter Options"
 msgstr "Bogofilter �చ�చికాల�"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-#| msgid "Filters junk messages using Bogofilter."
 msgid "Filter junk messages using Bogofilter."
 msgstr "Bogofilterన� ఉపయోగించి నిరర�దక సందేశాలన� వడపోయ�మ�."
 
-#: ../plugins/caldav/caldav-source.c:64
+#: ../plugins/caldav/caldav-browse-server.c:198
+msgid "Authentication failed. Server requires correct login."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:200
+msgid "Given URL cannot be found."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "అపరిచిత దోషం"
+
+#: ../plugins/caldav/caldav-browse-server.c:334
+#: ../plugins/caldav/caldav-browse-server.c:585
+#, fuzzy
+msgid "Failed to parse server response."
+msgstr "ప�రతినిధ�లన� నవీకరించ�ట లో విఫలమైంది:"
+
+#: ../plugins/caldav/caldav-browse-server.c:428
+#, fuzzy
+msgid "Events"
+msgstr "అంతమౌత�ంది"
+
+#: ../plugins/caldav/caldav-browse-server.c:450
+#, fuzzy
+msgid "User's calendars"
+msgstr "కొత�త క�యాలెండర�"
+
+#: ../plugins/caldav/caldav-browse-server.c:558
+#: ../plugins/caldav/caldav-browse-server.c:629
+#, fuzzy
+msgid "Failed to get server URL."
+msgstr "LDAP సేవిక తో ప�రామాణీకరించడంలో విఫలమయినది."
+
+#: ../plugins/caldav/caldav-browse-server.c:627
+#: ../plugins/caldav/caldav-browse-server.c:668
+#: ../plugins/caldav/caldav-browse-server.c:1272
+#, fuzzy
+msgid "Searching for user's calendars..."
+msgstr ""
+"\n"
+"\n"
+"పరిచయాలకొరక� శోధిస�త�న�నది..."
+
+#: ../plugins/caldav/caldav-browse-server.c:666
+#, fuzzy
+msgid "Could not find any user calendar."
+msgstr "� క�యాలెండర�లన� కన�గోనలేకపోయింది"
+
+#: ../plugins/caldav/caldav-browse-server.c:794
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:796
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:799
+#, fuzzy, c-format
+msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgstr "%s (వినియోగదారి %s) కొరక� సంకేతపదాన�ని ప�రవేశపెట�టండి"
+
+#: ../plugins/caldav/caldav-browse-server.c:856
+#, fuzzy, c-format
+msgid "Cannot create soup message for URL '%s'"
+msgstr ""
+"అవ�ట�‌ప�ట� దస�త�రాన�ని సృష�టించలేకపోయింది: %s:\n"
+" %s"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1091
+#, fuzzy
+msgid "Searching folder content..."
+msgstr ""
+"\n"
+"\n"
+"పరిచయాలకొరక� శోధిస�త�న�నది..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1134
+#, fuzzy
+msgid "List of available calendars:"
+msgstr "స�థానిక క�యాలెండర�‌ల�"
+
+#: ../plugins/caldav/caldav-browse-server.c:1171
+#, fuzzy
+msgid "Supports"
+msgstr "హ�లా మద�దత�"
+
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#, fuzzy, c-format
+msgid "Failed to create thread: %s"
+msgstr "పైప� సృష�టించ�టలో విఫలమైంది: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1357
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1363
+msgid "Browse for a CalDAV calendar"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:366
-#: ../plugins/calendar-http/calendar-http.c:171
+#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:390
-#: ../plugins/google-account-setup/google-contacts-source.c:303
+#: ../plugins/caldav/caldav-source.c:219
+#: ../plugins/google-account-setup/google-contacts-source.c:305
 msgid "Use _SSL"
 msgstr "·_SSL న� ఉపయోగించ�మ�"
 
-#. add refresh option
-#: ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-file/calendar-file.c:274
-#: ../plugins/calendar-http/calendar-http.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:508
-#: ../plugins/google-account-setup/google-source.c:698
-#: ../plugins/google-account-setup/google-contacts-source.c:322
+#: ../plugins/caldav/caldav-source.c:228
+msgid "Brows_e server for a calendar"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/calendar-file/calendar-file.c:178
+#: ../plugins/calendar-http/calendar-http.c:111
+#: ../plugins/calendar-weather/calendar-weather.c:393
+#: ../plugins/google-account-setup/google-contacts-source.c:323
+#: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
 msgstr "రీఫ�రెష� (_f):"
 
-#: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-file/calendar-file.c:296
-#: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:723
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-msgid "weeks"
-msgstr "వారమ�ల�"
-
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "Add CalDAV support to Evolution."
 msgstr "ఎవాల�యూషన�‌క� CalDAV మద�దత�న� జతచేయి."
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-#| msgid "CalDAV sources"
 msgid "CalDAV Support"
 msgstr "CalDAV మద�దత�"
 
-#: ../plugins/calendar-file/calendar-file.c:208
-#| msgid "Customize"
+#: ../plugins/calendar-file/calendar-file.c:112
 msgid "_Customize options"
 msgstr "మల�చ�కొనిన �చ�చికమ�ల� (_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:227
-#| msgid "File name:"
+#: ../plugins/calendar-file/calendar-file.c:131
 msgid "File _name:"
 msgstr "దస�త�రం పేర� (_n):"
 
-#: ../plugins/calendar-file/calendar-file.c:231
-#| msgid "Choose a file"
+#: ../plugins/calendar-file/calendar-file.c:135
 msgid "Choose calendar file"
 msgstr "కాలెండర� దస�త�రమ�న� యెంచ�కొన�మ�"
 
-#: ../plugins/calendar-file/calendar-file.c:279
-#| msgid "Open"
+#: ../plugins/calendar-file/calendar-file.c:183
 msgid "On open"
 msgstr "తెర�వ�ట పై"
 
-#: ../plugins/calendar-file/calendar-file.c:280
+#: ../plugins/calendar-file/calendar-file.c:184
 msgid "On file change"
 msgstr "దస�త�రమ� మార�చ�ట పై"
 
-#: ../plugins/calendar-file/calendar-file.c:281
-#| msgid "Personal"
+#: ../plugins/calendar-file/calendar-file.c:185
 msgid "Periodically"
 msgstr "కాలక�రమంగా"
 
-#: ../plugins/calendar-file/calendar-file.c:308
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "Force read _only"
 msgstr "చద�వ�ట మాత�రమే బలవంతంచేయి (_o)"
 
@@ -15417,11 +16939,11 @@ msgstr "ఎవాలà±�యూషనà±�‌కà±� à°¸à±�థానిక కాలà
 msgid "Local Calendars"
 msgstr "స�థానిక క�యాలెండర�‌ల�"
 
-#: ../plugins/calendar-http/calendar-http.c:369
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_Secure connection"
 msgstr "రక�షణ బంధమ�(_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:455
+#: ../plugins/calendar-http/calendar-http.c:186
 msgid "Userna_me:"
 msgstr "వినియోగదారినామమ� (_m):"
 
@@ -15430,59 +16952,66 @@ msgid "Add web calendars to Evolution."
 msgstr "ఎవాల�యూషన�‌క� వెబ� క�యాలెండర�లన� జతచేయి."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-#| msgid "Calendars"
 msgid "Web Calendars"
 msgstr "వెబ� క�యాలెండర�ల�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "వాతావరణ: పొగమంచ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "వాతావరణ: మేఘావృతం"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
 msgstr "వాతావరణం: మేఘావృత రాత�రి"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
 msgstr "వాతావరణం: వర�షం"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
 msgstr "వాతావరణం: మంచ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "వాతావరణం: మంచ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "వాతావరణం: ఎండ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
 msgstr "వాతావరణం: ప�రకాశమైన రాత�రి"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "వాతావరణం: చలిగాల�ల�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:221
 msgid "Select a location"
 msgstr "ఒక స�థానమ�న� ఎంపికచేయ�మ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:606
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:371
+#, fuzzy
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "�దికాద�"
+
+#: ../plugins/calendar-weather/calendar-weather.c:446
 msgid "_Units:"
 msgstr "ప�రామాణాల�(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:613
+#: ../plugins/calendar-weather/calendar-weather.c:453
 msgid "Metric (Celsius, cm, etc)"
 msgstr "మెట�రిక� (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:614
+#: ../plugins/calendar-weather/calendar-weather.c:454
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "ఇంపీరియల� (ఫారెన�‌హీట�, అంగ�ళాల�, మొద.)"
 
@@ -15494,31 +17023,40 @@ msgstr "ఎవాలà±�యూషనà±�‌కà±� వాతావరణ కాలà
 msgid "Weather Calendars"
 msgstr "వాతావరణ క�యాలెండర�‌ల�"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-#| msgid "Copy tool"
-msgid "Copy Tool"
-msgstr "నకల� సాధనమ�"
+#: ../plugins/contacts-map/contacts-map.c:55
+#: ../plugins/contacts-map/contacts-map.c:201
+#, fuzzy
+msgid "Contacts map"
+msgstr "చిర�నామాల�: "
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-#| msgid "Copy selected messages to the clipboard"
-msgid "Copy things to the clipboard."
-msgstr "క�లిప�‌బోర�డ�నక� విషయమ�లన� నకల�తీయి."
+#: ../plugins/contacts-map/contacts-map.c:56
+#, fuzzy
+msgid "Show a map of all the contacts"
+msgstr "ఎంచ�క�న�న పరిచయాలక� సందేశాన�ని పంప�మ�"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
+msgstr ""
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+#, fuzzy
+msgid "Map for contacts"
+msgstr "చిర�నామాల� లేవ�"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "ఎవాల�యూషన� అప�రమేయ మెయిలర� �మో పరిశీలించ�మ�"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.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
-#| msgid "Checks whether Evolution is the default mail client on startup."
 msgid "Check 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 "
 msgid "Default Mail Client"
 msgstr "అప�రమేయ మెయిల� కక�షిదార�"
 
@@ -15526,24 +17064,24 @@ msgstr "అప�రమేయ మెయిల� కక�షిదార�"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "మీర� ఎవాల�యూషన� న� మీ అప�రమేయ ఇ-మెయిల� కక�షిదారిగా చేద�దామన�క�ంట�న�నారా?"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:627
-msgid "Evolution"
-msgstr "ఎవాల�యూషన�"
-
-#: ../plugins/default-source/default-source.c:80
+#: ../plugins/default-source/default-source.c:75
 msgid "Mark as _default address book"
 msgstr "అప�రమేయ చిర�నామా ప�స�తకంగా గ�ర�త�ంచ�మ� (_d)"
 
-#: ../plugins/default-source/default-source.c:101
+#: ../plugins/default-source/default-source.c:88
+#, fuzzy
+msgid "A_utocomplete with this address book"
+msgstr "స�వయంచాలకంగామ�గియ� నామమ�న� వొక చిర�నామాతో చూప�మ�"
+
+#: ../plugins/default-source/default-source.c:97
 msgid "Mark as _default calendar"
 msgstr "అప�రమేయ క�యాలెండర�‌గా గ�ర�త�ంచ�మ� (_d)"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:98
 msgid "Mark as _default task list"
 msgstr "అప�రమేయ కర�తవ�య జాబితాగా గ�ర�త�ంచ�మ� (_d)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:99
 msgid "Mark as _default memo list"
 msgstr "అప�రమేయ మెమో జాబితాగా గ�ర�త�ంచ�మ� (_d)"
 
@@ -15555,41 +17093,55 @@ msgstr "అప�రమేయ మూలాల�"
 msgid "Mark your preferred address book and calendar as default."
 msgstr "మీ అభీష�ట చిర�నామా ప�స�తకం మరియ� కాలెండర�‌న� అప�రమేయంగా గ�ర�త�ంచ�మ�."
 
-#: ../plugins/email-custom-header/email-custom-header.c:333
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "మల�చ�కొనిన పీఠికల జాబితా"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"బయటక�వెళ�ళ� సందేశాలక� జతచేయగల మల�చ�కొనిన పీఠికల జాబితాన� కీ తెల�ప�త�ంది. పీఠికన� మరియ� పీఠిక "
+"విల�వన� తెల�ప�టక� విధానం: మ�లచ�కొనిన పీఠిక నామమ� \"=\" మ�ంద� వ�ండాలి మరియ� విల�వల� \";\" "
+"చేత వేర�చేయబడాలి"
+
+#: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
 msgstr "రక�షణ:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../plugins/email-custom-header/email-custom-header.c:321
 msgid "Unclassified"
 msgstr "వర�గీకరించని"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgid "Protected"
 msgstr "రక�షించబడిన"
 
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "Secret"
 msgstr "రహస�యం"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgid "Top secret"
 msgstr "అత�యంతరహస�యం"
 
-#: ../plugins/email-custom-header/email-custom-header.c:584
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
+#. indicating the header will not be added to a mail message
+#: ../plugins/email-custom-header/email-custom-header.c:379
+#, fuzzy
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "�దికాద�"
+
+#: ../plugins/email-custom-header/email-custom-header.c:569
 msgid "_Custom Header"
 msgstr "మల�చ�కొనిన పీఠిక (_C)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:906
-msgid "Key"
-msgstr "à°•à±€"
-
-#: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:395
-msgid "Values"
-msgstr "విల�వల�"
-
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+#: ../plugins/email-custom-header/email-custom-header.c:894
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -15597,13 +17149,17 @@ msgstr ""
 "మల�చ�కొనిని పీఠిక కీవిల�వక� తెల�పబడిన విధానం:\n"
 "మల�చ�కొనిని పీఠిక కీవిల�వల నామమ� \";\" చేత వేర�చేయబడతాయి."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Email Custom Header"
-msgstr "మల�చ�కొనిన పీఠికన� ఈమెయిల� చేయ�మ�"
+#: ../plugins/email-custom-header/email-custom-header.c:948
+msgid "Key"
+msgstr "à°•à±€"
+
+#: ../plugins/email-custom-header/email-custom-header.c:959
+#: ../plugins/templates/templates.c:419
+msgid "Values"
+msgstr "విల�వల�"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-#| msgid "Adds custom header to outgoing messages."
 msgid "Add custom headers to outgoing mail messages."
 msgstr "బయటక�వెళ�ళ� మెయిల� సందేశాలక� మల�చ�కొన�న పీఠికలన� జతచేస�త�ంది."
 
@@ -15611,961 +17167,16 @@ msgstr "బయటకà±�వెళà±�à°³à±� మెయిలà±� సందేశాà
 msgid "Custom Header"
 msgstr "మల�చ�కొనిన పీఠిక"
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "మల�చ�కొనిన పీఠికల జాబితా"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"బయటక�వెళ�ళ� సందేశాలక� జతచేయగల మల�చ�కొనిన పీఠికల జాబితాన� కీ తెల�ప�త�ంది. పీఠికన� మరియ� పీఠిక "
-"విల�వన� తెల�ప�టక� విధానం: మ�లచ�కొనిన పీఠిక నామమ� \"=\" మ�ంద� వ�ండాలి మరియ� విల�వల� \";\" "
-"చేత వేర�చేయబడాలి"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "వేరే వినియోగదార�ల సంచయాలన� తెర�వ�మ�"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-msgid "_Account:"
-msgstr "ఖాతా(_A):"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "సంచయం నామం(_F):"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-msgid "_User:"
-msgstr "వినియోగదారి(_U):"
-
-#. 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 ""
-"ఈ �చ�చికం ఇచ�చిప�చ�చ�కొన� సేవిక క� రక�షిత సంకేతపదం (NTLM) దృవీకరణన� ఉపయోగించి "
-"అన�సంధానించబడ�త�ంది."
-
-#: ../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:271
-msgid "Out Of Office"
-msgstr "కార�యాలయం న�ండి బయటక�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
-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 ""
-"మీర� ఆఫీస�‌బయట ఉన�నప�ప�డ మీక� ఎవరైతే సందేశం పంపారో వారందరికి\n"
-"క�రిందన తెల�పబడిన సందేశం స�వయంచాలకంగా పంపబడ�త�ంది."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:290
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
-msgid "I am out of the office"
-msgstr "నేన� ఆఫీస� బయట ఉన�నాన�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:294
-msgid "I am in the office"
-msgstr "నేన� కార�యాలయంలో ఉన�నాన�"
-
-#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:340
-msgid "Change the password for Exchange account"
-msgstr "ఖాతాన� ఇచ�చిప�చ�చ�కొన�టక� సంకేతపదాన�ని మార�చ�మ�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:342
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-msgid "Change Password"
-msgstr "సంకేతపదాన�ని మార�చండి"
-
-#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
-msgid "Manage the delegate settings for Exchange account"
-msgstr "ఇచ�చిప�చ�చ�కొన� ఖాతా కొరక� ప�రాతినిధ�య అమరికలన� నిర�వహించ�మ�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
-msgid "Delegation Assistant"
-msgstr "ప�రాతినిధ�యప� సహాయక�డ�"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
-msgid "Miscelleneous"
-msgstr "వివిధమైన"
-
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:371
-msgid "View the size of all Exchange folders"
-msgstr "అన�ని ఇచ�చిప�చ�చ�కొన� సంచయాల పరిమాణంన� దర�శించ�మ�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:373
-msgid "Folders Size"
-msgstr "సంచయాల పరిణామం"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:380
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-msgid "Exchange Settings"
-msgstr "ఇచ�చిప�చ�చ�కొన� అమరికల�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:726
-msgid "_OWA URL:"
-msgstr "_OWA URL:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:752
-msgid "A_uthenticate"
-msgstr "దృవీకరించ�(_u)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:774
-msgid "Mailbox name is _different than user name"
-msgstr "మెయిల�‌బాక�స� నామమ� వినియోగదారి నామమ�క� వేర�గా వ�ంట�ంది (_d)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:787
-msgid "_Mailbox:"
-msgstr "మెయిల�‌బాక�స�� (_M):"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1001
-msgid "_Authentication Type"
-msgstr "దృవీకరణ రకం (_A)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1130
-#: ../plugins/exchange-operations/exchange-contacts.c:217
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1132
-#: ../plugins/exchange-operations/exchange-contacts.c:219
-#, c-format
-msgid "0 KB"
-msgstr "0 KB"
-
-#. FIXME: Take care of i18n
-#: ../plugins/exchange-operations/exchange-account-setup.c:1137
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "పరిమాణమ�:"
-
-#: ../plugins/exchange-operations/exchange-calendar.c:196
-#: ../plugins/exchange-operations/exchange-contacts.c:170
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"ఎవాల�యూషన� ఆఫ�‌లైన� రీతినంద� ఉన�నది. మీర� సంచయాలన� సృష�టించలేర� మరియ�\n"
-"సవరించలేర�. అట�వంటి ఆపరేషన�‌లక� దయచేసి ఆన�‌లైన� రీతికి మార�మ�."
-
-#. User entered a wrong existing
-#. * password. Prompt him again.
-#.
-#: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr ""
-"ప�రస�త�త సంకేతపదం మీ ఖాతాక� ఇప�పటికే ఉన�న సంకేతపదం తో సరిపోలడం లేద�. దయచేసి సరైన సంకేతపదాన�ని "
-"ప�రవేశపెట�టండి"
-
-#: ../plugins/exchange-operations/exchange-change-password.c:121
-msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr "ఆ రెండ� సంకేతపదాల� సరిపోలడం లేద�. దయచేసి సంకేతపదాన�ని మరలా ప�రవేశపెట�టండి."
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-msgid "Confirm Password:"
-msgstr "సంకేతపదాన�ని నిర�ధారించ�మ�:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-msgid "Current Password:"
-msgstr "ప�రస�త�త సంకేతపదం:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-msgid "New Password:"
-msgstr "కొత�త సంకేతపదం:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-msgid "Your current password has expired. Please change your password now."
-msgstr "మీ ప�రస�త�త సంకేతపదం కాలమ�తీరినది. దయచేసి మీ సంకేతపదం న� ఇప�ప�డే మార�చ�మ�."
-
-#: ../plugins/exchange-operations/exchange-config-listener.c:657
-#, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "మీ సంకేతపదం తర�వాతి %d రోజ�లలో కాలమ�తీరబోతోంది"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:142
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
-msgid "Custom"
-msgstr "మలచ�కొన�"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:168
-msgid "Editor (read, create, edit)"
-msgstr "సరికూర�పరి(చద�వ�, సృష�టించ�, సరిచేయ�)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:172
-msgid "Author (read, create)"
-msgstr "ఆథర�(చద�వ�, సృష�టించ�)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:176
-msgid "Reviewer (read-only)"
-msgstr "పరిదర�శక�డ�(చద�వ�ట-మాత�రమే)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:225
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-msgid "Delegate Permissions"
-msgstr "ప�రతినిధి అన�మత�ల�"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:236
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
-#, c-format
-msgid "Permissions for %s"
-msgstr "%s కొరక� అన�మత�ల�"
-
-#. To translators: This is a part of the message to be sent to the delegatee
-#. summarizing the permissions assigned to him.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:326
-msgid ""
-"This message was sent automatically by Evolution to inform you that you have "
-"been designated as a delegate. You can now send messages on my behalf."
-msgstr ""
-"ఈ సందేశం మీర� ప�రతినిధిగా అయ�యారని తెల�ప�టక� ఎవాల�యూషన� ద�వారా స�వయంచాలకంగా పంపబడింది. మీర� సందేశాలన� "
-"ఇక నాక� బద�ల�గా పంపవచ�చ�."
-
-#. To translators: Another chunk of the same message.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:331
-msgid "You have been given the following permissions on my folders:"
-msgstr "మీక� నా సంచయమ�ల పై ఈ క�రింది అన�మత�ల� ఇవ�వబడినవి:"
-
-#. To translators: This message is included if the delegatee has been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:351
-msgid "You are also permitted to see my private items."
-msgstr "మీర� నా వ�యక�తిగత అంశమ�లన� చూడ�టక� కూడా అన�మతించబడినార�."
-
-#. To translators: This message is included if the delegatee has not been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
-msgid "However you are not permitted to see my private items."
-msgstr "�మైనప�పటికి మీర� నా వ�యక�తిగత అంశమ�లన� చూడ�టక� అన�మతింపబడర�."
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:390
-#, c-format
-msgid "You have been designated as a delegate for %s"
-msgstr "మీర� %s కొరక� ప�రతినిధిగా గ�ర�తించబడ�డార�"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:416
-msgid "Delegate To"
-msgstr "క� ప�రతినిదిగా"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:581
-#, c-format
-msgid "Remove the delegate %s?"
-msgstr "ప�రతినిధి %s న� తొలగించాలా?"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:698
-msgid "Could not access Active Directory"
-msgstr "క�రియాశీల సంచయాన�ని వాడ�కొనలేక పోయింది"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:710
-msgid "Could not find self in Active Directory"
-msgstr "క�రియాశీల సంచయంనంద� స�వకీయంన� కన�గొనలేకపోయింది"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:723
-#, c-format
-msgid "Could not find delegate %s in Active Directory"
-msgstr "క�రియాశీల సంచయం నంద� ప�రతినిధి %s న� క�న�గొనలేకపోయింది"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:735
-#, c-format
-msgid "Could not remove delegate %s"
-msgstr "ప�రతినిది %s న� తొలగించలేక పోయింది"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:795
-msgid "Could not update list of delegates."
-msgstr "ప�రతినిధ�ల జాబితాన� నవీకరించలేక పోయింది."
-
-#: ../plugins/exchange-operations/exchange-delegates.c:813
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "ప�రతినిది %s న� చేర�చలేకపోయింది"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:980
-msgid "Error reading delegates list."
-msgstr "ప�రతినిధ�ల జాబితాన� చద�వ�టలో దోషం."
-
-#. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
-msgid "C_alendar:"
-msgstr "క�యాలెండర�(_a):"
-
-#. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Co_ntacts:"
-msgstr "పరిచయాల�(_n):"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegates"
-msgstr "ప�రాతినిధ�యంవహించేవార�"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-msgid ""
-"None\n"
-"Reviewer (read-only)\n"
-"Author (read, create)\n"
-"Editor (read, create, edit)"
-msgstr ""
-"�దీకాద�\n"
-"పరిశీలక�డ� (చద�వ�ట-మాత�రమే)\n"
-"మూలకర�త (చద�వ�ట, సృష�టించ�ట)\n"
-"సంపాదక�డ� (చద�వ�ట, సృష�టించ�ట, సరికూర�చ�ట)"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Permissions for"
-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 ""
-"ఈ వినియోగదార�ల� మీక� బద�ల�గా మెయిల� న� పంపగలర�\n"
-"మరియ� మీర� వారికి ఇచ�చిన అన�మత�లతో మీ సంచయాలన� వాడ�కోగలర�."
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-msgid "_Delegate can see private items"
-msgstr "ప�రతినిధి వ�యక�తిగత అంశమ�లన� చూడగలర�(_D)"
-
-#. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
-msgid "_Inbox:"
-msgstr "ఇన�‌బాక�స�(_I):"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-msgid "_Summarize permissions"
-msgstr "అన�మత�లన� సక�షింప�తంచేయ�మ�(_S)"
-
-#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks:"
-msgstr "కర�తవ�యాల�(_T):"
-
-#: ../plugins/exchange-operations/exchange-folder-permission.c:62
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-msgid "Permissions..."
-msgstr "అన�మత�ల�..."
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
-msgid "Folder Name"
-msgstr "సంచయం నామమ�"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
-msgid "Folder Size"
-msgstr "సంచయం పరిమాణం"
-
-#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
-msgid "User"
-msgstr "వినియోగదారి"
-
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
-#: ../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:65
-#: ../plugins/exchange-operations/exchange-folder.c:233
-#: ../plugins/exchange-operations/exchange-folder.c:243
-msgid "Unsubscribe Folder..."
-msgstr "సంచయానకి చందాదార�కావద�ద�..."
-
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:518
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "నిజంగా సంచయం \"%s\" క� చందాదార�కావ�టలేదా?"
-
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:530
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "\"%s\" న�ండి చందాదార�గా తొలగ�మ�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>ప�రస�త�తం, మీ స�థితి \"ఆఫీస� బయట\".</b>\n"
-"\n"
-"మీర� మీ స�థితిని \"ఆఫీస� లో\" ఉన�నట�ల� మార�చాలన�క�ంట�న�నారా? "
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>ఆఫీస� క� బయట సందేశ:</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>స�థితి:</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>మీర� ఆఫీస� క� బయట ఉన�నప�పడ� మీక� ఎవరైతే సందేశాన�ని పంపారో వారందరికి క�రింద తెలిపిన\n"
-"సందేశం స�వయంచాలకంగా పంపబడ�త�ంది.</small>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "నేన� ప�రస�త�తం ఆఫీస�‌నంద� ఉన�నాన�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "నేన� ప�రస�త�తం కార�యాలయం బయట ఉన�నాన�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "వద�ద�, స�స�థితిని మార�చవద�ద�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "ఆఫీస� క� బయట సహాయక�డ�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "అవ�న�, స�స�థితిని మార�చ�మ�"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-msgid "Password Expiry Warning..."
-msgstr "రహస�యపదం కాలంచెల�లిన హెచ�చరిక..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
-msgstr "ఇంకా 7 రోజ�ల�లో మీ రహస�యపదం కాలంఒచెల�లిపోత�ంది..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
-msgstr "సంకేతపదాన�ని మార�చండి(_C)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
-msgid "(Permission denied.)"
-msgstr "(అన�మతి తిరస�కరించబడినది.)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-msgid "Add User:"
-msgstr "వినియోగదార�డిని జతచేయ�మ�:"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:932
-#: ../plugins/groupwise-features/share-folder.c:713
-msgid "Add User"
-msgstr "వినియోగదార�ని జతచేయ�మ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-msgid "<b>Permissions</b>"
-msgstr "<b>అన�మత�ల�</b>"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-msgid "Cannot Delete"
-msgstr "తొలగించ లేద�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Edit"
-msgstr "సరిచేయ లేద�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-msgid "Create items"
-msgstr "అంశమ�లన� సృష�టించ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-msgid "Create subfolders"
-msgstr "ఉపసంచయాలన� సృష�టించ�మ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-msgid "Delete Any Items"
-msgstr "� అంశాలనైన తొలగించ�మ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-msgid "Delete Own Items"
-msgstr "స�వంత అంశాలన� తొలగించ�మ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-msgid "Edit Any Items"
-msgstr "� అంశాలనైనా సరిచేయ�మ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-msgid "Edit Own Items"
-msgstr "స�వంత అంశాలన� సరిచేయ�మ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-msgid "Folder contact"
-msgstr "సంచయం పరిచయం"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-msgid "Folder owner"
-msgstr "సంచయం యజమాని"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-msgid "Folder visible"
-msgstr "సంచయం దర�శితం"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-msgid "Read items"
-msgstr "చద�వ� అంశాల�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-msgid "Role: "
-msgstr "పాత�ర: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
-msgid "<b>Message Settings</b>"
-msgstr "<b>సందేశం అమరికల�</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
-msgid "<b>Tracking Options</b>"
-msgstr "<b>గమనించ�టక� �చ�చికాల�</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
-msgid "Exchange - Send Options"
-msgstr "ఇచ�చిప�చ�చ�కొన� - పంప�టక� �చ�చికాల�"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
-msgid "I_mportance: "
-msgstr "ప�రామ�ఖ�యత(_m)..."
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
-msgid ""
-"Normal\n"
-"High\n"
-"Low"
-msgstr ""
-"సాదారణ\n"
-"ఎక�క�వ\n"
-"తక�క�వ"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
-msgid ""
-"Normal\n"
-"Personal\n"
-"Private\n"
-"Confidential"
-msgstr ""
-"సాదారణ\n"
-"స�వకీయ\n"
-"వ�యక�తిగత\n"
-"రహస�యమైన"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
-msgid "Request a _delivery receipt for this message"
-msgstr "ఈ సందేశం కొరక� చేరినట�ల� రశీద�న� అభ�యర�దించండి(_d)"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
-msgid "Request a _read receipt for this message"
-msgstr "ఈ సందేశం కొరక� చదివినదాని రశీద�న� అభ�యర�దించ�మ�(_r)"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
-msgid "Send as Delegate"
-msgstr "ప�రతినిధిగా పంప�మ�"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
-msgid "_Sensitivity: "
-msgstr "స�న�నితత�వం(_S): "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-msgid "_User"
-msgstr "వినియోగదారి(_U)"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:134
-msgid "Select User"
-msgstr "వినియోగదారిని ఎంపికచేయ�మ�"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:172
-msgid "Address Book..."
-msgstr "చిర�నామా ప�స�తకం..."
-
-#: ../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 "Activates the Evolution-Exchange extension package."
-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 access the \"Exchange settings\" tab in offline mode."
-msgstr "\"Exchange settings\" టాబ�‌న� ఆఫ�‌లైన� రీతినంద� యాక�సిస� చేయలేద�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-msgid "Cannot change password due to configuration problems."
-msgstr "ఆకృతీకరణ సమస�యవలన సంకేతపదాలన� మార�చలేమ�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot display folders."
-msgstr "సంచయాలన� ప�రదర�శించలేక పోయింది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Cannot perform the operation."
-msgstr "ఆపరేషన� న� నడ�పలేమ�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-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:6
-msgid "Could not authenticate to server."
-msgstr "సేవికక� దృవీకరించలేక పోయింది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
-msgid "Could not change password."
-msgstr "సంకేతపదాన�ని మార�చలేక పోయింది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
-msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
-msgstr ""
-"ఇచ�చిప�చ�చ�కొన� ఖాతాన� ఆకృతీకరించలేక పోయింది \n"
-"ఒక తెలియని దోషం ఎద�రైంది. URL న�, వినియోగదారినామమ� న�,\n"
-"మరియ� సంకేతపదం న� పరిశీలించ�మ� మరియ� తిరిగిప�రయత�నించ�మ�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not connect to Exchange server."
-msgstr "ఇచ�చిప�చ�చ�కొన� సేవికక� అన�సంధానించ బడలకేపోయింది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-msgid "Could not connect to server {0}."
-msgstr "సేవిక {0} క� అన�సంధానించ లేకపోయింది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not determine folder permissions for delegates."
-msgstr "ప�రతినిధ�ల కొరక� సంచయం అన�మత�లన� నిర�ధారించలేకపోయింది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-msgid "Could not find Exchange Web Storage System."
-msgstr "ఇచ�చిప�చ�చ�కొన� వెబ� నిల�వ సిస�టమ� న� కన�గొనలేకపోయింది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-msgid "Could not locate server {0}."
-msgstr "సేవిక {0} న� గ�ర�తించ లేకపోయింది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-msgid "Could not make {0} a delegate"
-msgstr "{0} ఒక ప�రతినిధిని చేయలేకపోయింద"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-msgid "Could not read folder permissions"
-msgstr "సంచయం అన�మత�లన� చదవలేకపోయింది"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-msgid "Could not read folder permissions."
-msgstr "సంచయం అన�మత�లన� చదవలేకపోయింది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Could not read out-of-office state"
-msgstr "ఆఫీస�-క�-బయట స�థితిని చద�వలేక పోయింది"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Could not update folder permissions."
-msgstr "సంచయం అన�మత�లన� నవీకరించలేక పోయింది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Could not update out-of-office state"
-msgstr "ఆఫీస�-క�-బయట స�థితిని నవికరించలేక పోయింది"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
-msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr "సబ�‌స�క�రైబ� అయిన వినియోగదారి మెయిల�‌బాక�స�� లోడ�‌చేయ�టక� ఎవాల�యూషన�‌క� ప�నఃప�రారంభం అవసరమ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
-msgid "Exchange Account is offline."
-msgstr "ఇచ�చిప�చ�చ�కొన� ఖాతా అఫ�‌లైన� గా ఉంది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
-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 ""
-"ఎక�సేంజ� అన�సందాని ఎక�సేంజ� సేవికనంద�\n"
-"అచేతనంగా లేదా బ�లాక�‌డ� గా కనిపిస�త�న�న కార�యక�రమం వాడ�కొన�\n"
-"అవసరంఉంది. (ఇది సారాణంగా అన�కోక�ండా.)\n"
-"మీ ఎక�సేంజ� నిర�వాహక�డ� ఈ ఫంక�షనాలిటిని చేతనం చేయాలి\n"
-"ఎవాల�యూషన� ఎక�సేంజ� అన�సంధాని ఉపయోగించ�టక�.\n"
-"\n"
-"మీ ఎక�సేంజ� నిర�వాహక�నికి ఇవ�వవలిసిన సమాచారం కొరక�\n"
-"దయచేసి, ఈ క�రింది లింక�న� అన�సరించ�మ�:\n"
-"\n"
-"{0}\n"
-"  "
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-msgid "Failed to update delegates:"
-msgstr "ప�రతినిధ�లన� నవీకరించ�ట లో విఫలమైంది:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-msgid "Folder already exists"
-msgstr "సంచయం ఇప�పటికే ఉంది"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "Folder does not exist"
-msgstr "సంచయం లేద�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Folder offline"
-msgstr "సంచయం ఆఫ�‌లైన�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1259
-msgid "Generic error"
-msgstr "సాదారణ దోషం"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "Global Catalog Server is not reachable"
-msgstr "గ�లోబల� వర�గీకరణ సేవిక అంద�బాట�లో లేద�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-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:43
-msgid "Mailbox for {0} is not on this server."
-msgstr "మెయిల�‌పెట�టె {0} కొరక� ఈ సేవికనంద� లేద�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
-msgid "Make sure the URL is correct and try again."
-msgstr "ఆ URL సరైనదేమో పరిశీలించ�కొని మరలా ప�రయత�నించండి."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-msgid "Make sure the server name is spelled correctly and try again."
-msgstr "సేవికనామమ� సరిగా స�పెల� చేసారో లేదో సరిచూస�కోని మరలా ప�రయత�నించండి."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
-msgid "Make sure the username and password are correct and try again."
-msgstr "వినియోగదార�ని నామమ� మరియ� సంకేతపదమ� సరిచూస�కొని మరలా ప�రయత�నించండి."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
-msgid "No Global Catalog server configured for this account."
-msgstr "ఈ ఖాతా కొరక� � గ�లోబల� వర�గీకరణ సేవిక ఆకృతీకరించబడలేద�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "No mailbox for user {0} on {1}."
-msgstr "{1} పైన వినియోగాదారి {0} కొరక� � మెయిల�‌పెట�టె లేద�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "No such user {0}"
-msgstr "ఇట�వంటి వినియోగదారి లేద� {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Password successfully changed."
-msgstr "సంకేతపదం సమర�ధవంతంగా మార�చబడింది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
-msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr "దయచేసి ప�రతినిధి యొక�క ID ని ప�రవేశపెట�టండి లేదా పంపటం న� ప�రతినిధి �చ�చికంగా ఎంపికచేయవద�ద�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-msgid "Please make sure the Global Catalog Server name is correct."
-msgstr "గ�లోబల� వర�గీకరణ సేవిక నామమ� సరైనదేమో దయచేసి పరిశీలించ�మ�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-msgid "Please restart Evolution for changes to take effect"
-msgstr "మార�ప�ల� ప�రభావితం కావ�టక� దయచేసి ఎవాల�యూషన� ప�నఃప�రారంభించ�మ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
-msgid "Please select a user."
-msgstr "దయచేసి వినియోగదారిని ఎంపికచేస�కొన�మ�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
-msgid "Server rejected password because it is too weak."
-msgstr "సేవిక సంకేతపదాన�ని తిరస�కరించింది ఎంచేతంటే అది బలహీనంగా ఉంది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
-msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "మీర� ఎవాల�యూషన� న�ండి బహష�కరించగానే ఇచ�చిప�చ�చకొన� ఖాతా అచేతనం అవ�త�ంది"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "మీర� ఎవాల�యూషన� న�ండి బహష�కరించగానే ఇచ�చిప�చ�చకొన� ఖాతా తీసివేయబడ�త�ంది"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
-msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr "ఇచ�చిప�చ�చ�కొన� సేవిక ఇచ�చిప�చ�చ�కొన� అన�సంధానితో సారూప�యంగా లేద�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
-msgid ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
-"ఈ సేవిక ఎక�సేంజ� 5.5 న� నడ�ప�తోంది. ఎక�సేంజ� అన�సంధాని\n"
-"Microsoft ఎక�సేంజ� 2000 మరియ� 2003 మాత�రమే మద�దతిస�తోంది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-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 ""
-"దీనిర�ధం మీ సేవికక� మీర� కూడా విండోస� డోమైన� నామమ�న�\n"
-"తెల�పవలిసిన అవసరంఉంది మీ వినియోగదార�ని నామమ�లో\n"
-"భాగమ�గా (ఉదా, &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"లేదా మీర� మీ సంకేతపదాన�ని తప�ప�గా టైప�చేసిఉంటార�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-msgid "Try again with a different password."
-msgstr "వేరే సంకేతపదం తో మరలా ప�రయత�నించండి."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "Unable to add user to access control list:"
-msgstr "నియంత�రణ జాబితాన� వాడ�కొన�టక� వినియోగదారిని కల�పలేమ�:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "Unable to edit delegates."
-msgstr "ప�రతినిధ�లన� సరిచేయ లేక పోయింది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "Unknown error looking up {0}"
-msgstr "అపరిచిత దోషం చూడ�టలో {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:604
-#: ../plugins/mail-to-task/mail-to-task.c:599
-#: ../plugins/mail-to-task/mail-to-task.c:821
-msgid "Unknown error."
-msgstr "అపరిచిత దోషం."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Unknown type"
-msgstr "అపరిచిత రకమ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Unsupported operation"
-msgstr "మద�దతివ�వని ఆపరేషన�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You are nearing your quota available for storing mail on this server."
-msgstr "మీర� ఈ సేవికనంద� మెయిల� నిల�వచేస�కొన�టక� కలిగిఉన�న కొటాన� సమీపిస�త�న�నార�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-msgstr "మీర� ఒక సారి ఒక ప�రతినిధి తర�ప�న మాత�రమే సందేశం పంప�టక� అన�మతి కలిగఉన�నార�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
-msgid "You cannot make yourself your own delegate"
-msgstr "మీర� మీఅంతటమీరే మీ స�వతం ప�రతినిధ�లన� తయార�చేయలేర�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-msgid "You have exceeded your quota for storing mail on this server."
-msgstr "ఈ సేవికలో మెయిల� నిల�వచేయ�టక� మీర� మీ కొటాన� మించిపోయార�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "You may only configure a single Exchange account."
-msgstr "మీర� ఒక ఎక�సేంజ� ఖాతా మాత�రమే ఆకృతీకరించ గలర�."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-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:80
-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:81
-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:82
-msgid "Your password has expired."
-msgstr "మీ సంకేతపదం కాలమ�తీరినది."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
-msgid "{0} cannot be added to an access control list"
-msgstr "{0} వాడిక నియంత�రణ జాబితా క� జతచేయలేమ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
-msgid "{0} is already a delegate"
-msgstr "{0} ఇప�పటికే ఒక ప�రతినిధి"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
-msgid "{0} is already in the list"
-msgstr "{0} ఇప�పటికే జాబితా నంద�ఉంది"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
-msgid "Subscribe to Other User's Tasks"
-msgstr "ఇతర వినియోగదార�ల కర�తవ�యాలక� చందాదార�కండి"
-
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-msgid "Check folder permissions"
-msgstr "సంచయం అన�మత�లన� పరిశీలించ�మ�"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+msgstr "మల�చ�కొనిన పీఠికన� ఈమెయిల� చేయ�మ�"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "మెయిల� కూర�పరినంద� కీ వత�తబడినప�ప�డ� సరికూర�పరిని స�వయంచాలకంగా ఆరంభిస�త�ంది"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:120
+#: ../plugins/external-editor/external-editor.c:119
 msgid "Automatically launch when a new mail is edited"
 msgstr "కొత�త మెయిల� సరికూర�చినప�ప�డ� స�వయంచాలకంగా ఆరంభించ�మ�"
 
@@ -16577,14 +17188,28 @@ msgstr "à°…à°ªà±�రమేయ బహిరà±�à°—à°¤ సరికూరà±�పరà
 msgid "The default command that must be used as the editor."
 msgstr "తప�పక సరికూర�పరిలా వ�పయోగించవలసిన అప�రమేయ ఆదేశం."
 
+#: ../plugins/external-editor/external-editor.c:108
+msgid "Command to be executed to launch the editor: "
+msgstr "సరికూర�పరిని దించ�టక� నిర�వర�తించవలసిన సందేశం: "
+
+#: ../plugins/external-editor/external-editor.c:109
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Emacs కొరక� \"xemacs\" వ�పయోగించండి\n"
+"VI కొరక� \"gvim -f\" వ�పయోగించండి"
+
+#: ../plugins/external-editor/external-editor.c:375
+#: ../plugins/external-editor/external-editor.c:377
+msgid "Compose in External Editor"
+msgstr "బాహ�య సరికూర�పరినంద� కూర�చ�మ�"
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "బహిర�గత కూర�పరి"
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
-#| msgid ""
-#| "A plugin for using an external editor as the composer. You can send only "
-#| "plain-text messages."
 msgid "Use an external editor to compose plain-text mail messages."
 msgstr "సాదా-పాఠ�యప� మెయిల� సందేశమ�లన� కూర�చ�టక� బాహ�య సరికూర�పరిని వ�పయోగించ�మ�."
 
@@ -16600,10 +17225,10 @@ msgstr "సరికూరà±�పరి దించదగà±�నది కాదà
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
-msgstr "మీమెయిల�‌న� భద�రపరచ�టక� ఎవాల�యూషన� తాత�కాలిక దస�త�రంన� సృష�టించలేకపోయింది. తర�వాత మరలాప�రయత�నించండి."
+msgstr ""
+"మీమెయిల�‌న� భద�రపరచ�టక� ఎవాల�యూషన� తాత�కాలిక దస�త�రంన� సృష�టించలేకపోయింది. తర�వాత మరలాప�రయత�నించండి."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
-#| msgid "External Editor"
 msgid "External editor still running"
 msgstr "బాహ�య సరికూర�పరి యింకా నడ�చ�చ�న�నది"
 
@@ -16623,84 +17248,88 @@ msgstr ""
 "మీప�లగ�ఇన� ఆభీష�టాలనంద� అమర�చివ�న�న బహిర�గత సరికూర�పరి ప�రారంభింపబడద�. వేరే సరికూర�పరిని అమర�చ�టక� "
 "ప�రయత�నించ�మ�."
 
-#: ../plugins/external-editor/external-editor.c:109
-msgid "Command to be executed to launch the editor: "
-msgstr "సరికూర�పరిని దించ�టక� నిర�వర�తించవలసిన సందేశం: "
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:110
-#| msgid ""
-#| "For Emacs use \"xemacs\"\n"
-#| "For VI use \"gvim\""
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
 msgstr ""
-"Emacs కొరక� \"xemacs\" వ�పయోగించండి\n"
-"VI కొరక� \"gvim -f\" వ�పయోగించండి"
-
-#: ../plugins/external-editor/external-editor.c:354
-#: ../plugins/external-editor/external-editor.c:356
-#| msgid "Compose in _External Editor"
-msgid "Compose in External Editor"
-msgstr "బాహ�య సరికూర�పరినంద� కూర�చ�మ�"
 
-#: ../plugins/face/face.c:59
-msgid "Select a (48*48) png of size < 700bytes"
+#: ../plugins/face/face.c:286
+#, fuzzy
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
 msgstr "(48*48) png పరిమాణం న� ఎంపికచేయ�మ� < 700bytes"
 
-#: ../plugins/face/face.c:69
-msgid "PNG files"
-msgstr "PNG దస�త�రాల�"
+#: ../plugins/face/face.c:296
+#, fuzzy
+msgid "Image files"
+msgstr "దస�త�రాలన� దిగ�మతిచేస�తోంది"
+
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr ""
+
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr ""
 
-#: ../plugins/face/face.c:126
-msgid "_Face"
-msgstr "మ�ఖమ�(_F)"
+#: ../plugins/face/face.c:415
+#, fuzzy
+msgid "Include _Face"
+msgstr "తంత�లన� చేర�చ�మ�(_n)"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-#| msgid ""
-#| "Attach Face header to outgoing messages. First time the user needs to "
-#| "configure a 48*48 png image. It is base64 encoded and stored in ~/."
-#| "evolution/faces This will be used in messages that are sent further."
-msgid ""
-"Attach a small picture of your face to outgoing messages.\n"
-"\n"
-"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
-"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
-"sent messages."
+msgid "Attach a small picture of your face to outgoing messages."
 msgstr ""
-"బయటక� వెళ�ళ� సందేశాలక� మీ ఛాయాచిత�రమ�న� అన�భందించ�మ�.\n"
-"\n"
-"మొదటి సారి వినియోగదారి 48x48 PNG చిత�రాన�ని ఆకృతీకరించవలిసిన అవసరంఉంది. ఇది 64ఆధారిత ఎన�కోడెడ� మరియ� ~/.evolution/faces నంద� నిల�వఉంచబడ�త�ంది. ఇది తర�వాత పంప� సందేశాలనంద� "
-"ఉపయోగపడ�త�ంది."
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "సంచయం \"%s\" న�ండి చందాదార�గా విరమించ�కొన�మ�"
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+#, fuzzy
+msgid "Failed Read"
+msgstr "పట�టీ పీఠిక"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Unsubscribe Folders"
-msgstr "సంచయాలక� చందావిరమించ�మ�"
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+#, fuzzy
+msgid "Invalid Image Size"
+msgstr "నిస�సార తారీఖ� విల�వ"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
-msgstr "ఫోల�డర� ట�రీనంద� IMAP ఫోల�డర�‌పై క�డి-నొక�క� నొక�క�టద�వారా దానిన�ండి అన�‌సబ�‌స�క�రైబ� కావచ�చ�న�."
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+#, fuzzy
+msgid "Not an image"
+msgstr "ప�రతిరూపం లేద�(_N)"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "చందావిరమించ�మ�(_U)"
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+#, fuzzy
+msgid "Please select an image of size 48 * 48"
+msgstr "ఈ పరిచయమ�నక�   దయచేసి ఒక ప�రతిరూపమ�న� ఎంపిక చేయండి"
 
-#: ../plugins/google-account-setup/google-source.c:81
-#: ../plugins/google-account-setup/google-contacts-source.c:51
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+#, fuzzy
+msgid "The file cannot be read"
+msgstr "అంశాన�ని పంపిచలేకపోయింది!\n"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr ""
+
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:82
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:499
+#: ../plugins/google-account-setup/google-contacts-source.c:273
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
+msgid "<b>Server</b>"
+msgstr "<b>సేవిక</b>"
+
+#: ../plugins/google-account-setup/google-source.c:439
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "సబ�‌స�క�రైబ� అయిన క�యాలెండర�స�� జాబితాన� వాడ�కొన�టక� %s వినియోగదారి సంకేతపదమ�న� ప�రవేశపెట�టండి."
 
-#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/google-account-setup/google-source.c:545
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16709,42 +17338,67 @@ msgstr ""
 "గూగ�ల� సేవికన�ండి డాటాన� చద�వలేద�.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:739
+#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:941
+msgid "Unknown error."
+msgstr "అపరిచిత దోషం."
+
+#: ../plugins/google-account-setup/google-source.c:631
 msgid "Cal_endar:"
 msgstr "క�యాలెండర� (_e):"
 
-#: ../plugins/google-account-setup/google-source.c:774
+#: ../plugins/google-account-setup/google-source.c:666
 msgid "Retrieve _list"
 msgstr "జాబితాన� వెలికితీయి (_l)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
-msgid "<b>Server</b>"
-msgstr "<b>సేవిక</b>"
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
 msgstr "ఎవాల�యూషన�‌క� గూగ�ల� కాలెండర�లన� జతచేయ�మ�."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-#| msgid "Gnome Calendar"
 msgid "Google Calendars"
 msgstr "గూగ�ల� కాలెండర�ల�"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
 msgid "Checklist"
 msgstr "పరిశీలనజాబితా"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "Add Novell GroupWise support to Evolution."
-msgstr "ఎవాల�యూషన�‌క� నావెల� సమూహతరహా మద�దత�న� జతచేయ�మ�."
+#: ../plugins/groupwise-features/gw-ui.c:112
+msgid "New _Shared Folder..."
+msgstr "కొత�త భాగస�వామ�య సంచయం(_S)..."
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "GroupWise Account Setup"
-msgstr "సమూహతరహా ఖాతా అమర�ప�"
+#: ../plugins/groupwise-features/gw-ui.c:119
+msgid "_Proxy Login..."
+msgstr "ప�రాక�సీ లాగిన�(_P)..."
 
-#: ../plugins/groupwise-features/install-shared.c:219
-#, c-format
+#: ../plugins/groupwise-features/gw-ui.c:170
+msgid "Junk Mail Settings..."
+msgstr "నిరర�ధకం మెయిల� అమరికల�..."
+
+#: ../plugins/groupwise-features/gw-ui.c:177
+msgid "Track Message Status..."
+msgstr "సందేశం స�థితిని గమనించ�మ�..."
+
+#: ../plugins/groupwise-features/gw-ui.c:183
+msgid "Retract Mail"
+msgstr "మెయిల� న� తిప�ప�కొన�ట"
+
+#: ../plugins/groupwise-features/gw-ui.c:338
+msgid "Accept Tentatively"
+msgstr "పరిశీలనాత�మకంగా ఆమోదించ�మ�"
+
+#: ../plugins/groupwise-features/gw-ui.c:352
+msgid "Rese_nd Meeting..."
+msgstr "సమావేశమ�న� తిరిగిపంప�మ�... (_n)"
+
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
+msgid "Create folder"
+msgstr "సంచయంన� సృష�టించ�ట"
+
+#: ../plugins/groupwise-features/install-shared.c:225
+#, fuzzy, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -16754,7 +17408,7 @@ msgid ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Forward' to install the shared folder\n"
+"Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
 "వినియోగదారి '%s' మీతో ఒక సంచయంన� పంచ�కొన�నాడ�\n"
@@ -16768,74 +17422,77 @@ msgstr ""
 "భాగస�వామ�య సంచయం క� సంస�థాపించ�టక� 'మ�ంద�క�పంప�' నొక�క�మ�\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:237
 msgid "Install the shared folder"
 msgstr "భాగస�వామ�య సంచయంన� సంస�థాపించ�మ�"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:241
 msgid "Shared Folder Installation"
 msgstr "భాగస�వామ�య సంచయం సంస�థాపన"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:80
+#: ../plugins/groupwise-features/junk-mail-settings.c:81
 msgid "Junk Settings"
 msgstr "నిరర�ధకంక� అమరికల�"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:93
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "నిరర�దక మెయిల� అమరికల�"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:117
-msgid "Junk Mail Settings..."
-msgstr "నిరర�ధకం మెయిల� అమరికల�..."
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b>నిరర�ధకం జాబితా:</b>"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#: ../plugins/groupwise-features/junk-settings.ui.h:1
 msgid "Email:"
 msgstr "ఈమెయిల�:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:45
+#: ../plugins/groupwise-features/junk-settings.ui.h:2
+#, fuzzy
+msgid "Junk List:"
+msgstr "నిరర�ధకం జాబితా(_J)"
+
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "_Disable"
 msgstr "అచేతనపర�చ�మ�(_D)"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:6
+#: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "చేతనం(_E)"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#: ../plugins/groupwise-features/junk-settings.ui.h:7
 msgid "_Junk List"
 msgstr "నిరర�ధకం జాబితా(_J)"
 
-#: ../plugins/groupwise-features/mail-retract.c:52
+#: ../plugins/groupwise-features/junk-settings.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "తీసివేయ�(_R)"
+
+#: ../plugins/groupwise-features/mail-retract.c:81
 msgid "Message Retract"
 msgstr "సందేశం తిప�ప�కొన�ట"
 
-#: ../plugins/groupwise-features/mail-retract.c:57
+#: ../plugins/groupwise-features/mail-retract.c:86
+#, fuzzy
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this ?"
+"sure you want to do this?"
 msgstr ""
 "సందేశం తిప�ప�కొన�టవలన అది స�వీకరణదారి మెయిల�‌బాక�స��‌న�ండి తీసివేయబడవచ�చ�. మీర� ఖచ�చితంగా దీనిని "
 "చేద�దామన�క�ంట�న�నారా?"
 
-#: ../plugins/groupwise-features/mail-retract.c:76
+#: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
 msgstr "సందేశం సమర�దవంతంగా తిరిగిగమనించబడింది"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
-msgid "Retract Mail"
-msgstr "మెయిల� న� తిప�ప�కొన�ట"
+#: ../plugins/groupwise-features/mail-send-options.c:202
+msgid "Insert Send options"
+msgstr "పంప� ఇచ�చాపూర�వకాలన� అమర�చ�మ�"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
 msgstr "పంపించ� �చ�చికాలన� సమూహతరహా సందేశాలక� జతచేయ�మ�"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-#| msgid "A plugin for the features in GroupWise accounts."
 msgid "Fine-tune your GroupWise accounts."
 msgstr "మీ సమూహ తరహా ఖాతాలన� బాగా-అమర�చండి."
 
@@ -16869,7 +17526,8 @@ msgstr "చెల�లని వినియోగదారి"
 msgid ""
 "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
 "address and try again."
-msgstr "&quot;{0}&quot;లా ప�రోక�సీ లాగిన� విఫలమైంది. దయచేసి మీఈమెయిల� చిర�నామాన� పరిశీలించి మరలా ప�రయత�నించండి."
+msgstr ""
+"&quot;{0}&quot;లా ప�రోక�సీ లాగిన� విఫలమైంది. దయచేసి మీఈమెయిల� చిర�నామాన� పరిశీలించి మరలా ప�రయత�నించండి."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
@@ -16900,22 +17558,21 @@ msgid "You have to specify a user name which you want to add to the list"
 msgstr "మీర� జాబితాక� జతచేయాలన�క�ంట�న�న వినియోగదారి నామమ�న� తెల�పవలెన�"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-#| msgid "Are you sure you want to delete this meeting?"
-msgid "Do you want to resend the meeting ?"
+#, fuzzy
+msgid "Do you want to resend the meeting?"
 msgstr "మీర� సమావేశమ�న� తిరిగి పంపాలని అన�కొన�చ�న�నారా ?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-#| msgid "Are you sure you want to delete this meeting?"
-msgid "Do you want to resend the recurring meeting ?"
+#, fuzzy
+msgid "Do you want to resend the recurring meeting?"
 msgstr "మీర� ప�నరావృత సమావేశమ�న� తిరిగిపంపాలని అన�కొన�చ�న�నారా?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-#| msgid "Do you want to recover unfinished messages?"
-msgid "Do you want to retract the original item ?"
+#, fuzzy
+msgid "Do you want to retract the original item?"
 msgstr "మీర� వాస�తవ అంశాన�ని బయటక� తేవాలని అన�కొన�చ�న�నారా?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
-#| msgid "_Delete this item from all other recipient's mailboxes?"
 msgid "The original will be removed from the recipient's mailbox."
 msgstr "వాస�తవం అన�నది స�వీకర�తల మెయిల�‌పెట�టెన�ండి తీసివేయబడ�త�ంది."
 
@@ -16933,8 +17590,8 @@ msgid ""
 "This will create a new meeting with the existing meeting details. The "
 "recurrence rule needs to be re-entered."
 msgstr ""
-"ఉన�న సమావేశ వివరమ�లన� వ�పయోగించి యిది కొత�త సమావేశమ�న� సృష�టించ�న�. ప�నరావృత "
-"నియమం తిరిగి-ప�రవేశపెట�టవలసి వ�ంది."
+"ఉన�న సమావేశ వివరమ�లన� వ�పయోగించి యిది కొత�త సమావేశమ�న� సృష�టించ�న�. ప�నరావృత నియమం తిరిగి-"
+"ప�రవేశపెట�టవలసి వ�ంది."
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
@@ -16946,222 +17603,187 @@ msgstr "మీర� దీనిని ఆమోందించ�టక� య
 msgid "Would you like to decline it?"
 msgstr "మీర� దీనిని తిరస�కరించ�టక� యిష�టపడతారా?"
 
-#: ../plugins/groupwise-features/process-meeting.c:53
-msgid "Accept Tentatively"
-msgstr "పరిశీలనాత�మకంగా ఆమోదించ�మ�"
-
-#: ../plugins/groupwise-features/process-meeting.c:319
-#| msgid "_Delegate Meeting..."
-msgid "Rese_nd Meeting..."
-msgstr "సమావేశమ�న� తిరిగిపంప�మ�... (_n)"
-
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.ui.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>వినియోగదార�ల�:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "ప�రకటన సందేశాన�ని మల�చ�కొన�మ� (_u)"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Con_tacts..."
 msgstr "పరిచయాల�(_t)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:514
-msgid "Message"
-msgstr "సందేశం"
-
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.ui.h:6
 msgid "Shared Folder Notification"
 msgstr "భాగస�వామ�య సంచయం ప�రకటన"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "పాల�గోనేవార� ఈ క�రింది ప�రకటనన� పొంద�తార�.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "పంచ�కొనని(_N)"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.ui.h:14
 msgid "_Shared With..."
 msgstr "తొ పంచ�కొన�మ�(_S)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
 msgstr "పంచ�కొన�చ�న�న(_S)"
 
-#: ../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
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "వాడిక హక�క�ల�"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
 msgid "Add/Edit"
 msgstr "జతచేయ�మ�/సరిచేయ�మ�"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
 msgid "Con_tacts"
 msgstr "పరిచయాల�(_t)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
 msgid "Modify _folders/options/rules/"
 msgstr "_folders/options/rules/ న� సవరించ�మ�"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
 msgid "Read items marked _private"
 msgstr "వ�యక�తిగతం గా గ�ర�త�ంచిన అంశమ�లన� చద�వ�మ�(_p)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
 msgid "Reminder Notes"
 msgstr "గ�ర�త�చేయ� గమనికల�"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
 msgstr "నా అలారమ�లక� చందాదార� కమ�మ�(_a)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
 msgstr "నాయొక�క ప�రకటనలక� చందాదార� కమ�మ�(_n)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
 msgstr "వ�రాయ�మ�(_W)"
 
-#. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
 msgid "permission to read|_Read"
 msgstr "చద�వ�టక� అన�మతి|_Read"
 
-#. 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-listing.glade.h:2
+#: ../plugins/groupwise-features/proxy-listing.ui.h:1
 msgid "Proxy"
 msgstr "ప�రాక�సీ"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>ఖాతానామమ�</b>"
 
-#. 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-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "ప�రాక�సీ లాగిన�"
 
-#: ../plugins/groupwise-features/proxy-login.c:207
-#: ../plugins/groupwise-features/proxy-login.c:250
-#: ../plugins/groupwise-features/proxy.c:488
-#: ../plugins/groupwise-features/send-options.c:86
+#: ../plugins/groupwise-features/proxy-login.c:210
+#: ../plugins/groupwise-features/proxy-login.c:253
+#: ../plugins/groupwise-features/proxy.c:495
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s కొరక� రహస�యపదాన�ని ప�రవేశపెట�టండి %s (వినియోగదార� %s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:512
-msgid "_Proxy Login..."
-msgstr "ప�రాక�సీ లాగిన�(_P)..."
-
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:689
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "ఖాతా ఆన�‌లైన� లో ఉన�నప�పడ� మాత�రమే ప�రాక�సీ టాబ� అంద�బాట�లో ఉంట�ంది."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "ఖాతా చేతనంగా ఉన�నప�ప�డ� మాత�రమే ప�రాక�సీ టాబ� అంద�బాట�లో ఉంట�ంది."
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/proxy.c:931
+#: ../plugins/groupwise-features/share-folder.c:701
+msgid "Add User"
+msgstr "వినియోగదార�ని జతచేయ�మ�"
+
+#: ../plugins/groupwise-features/send-options.c:213
 msgid "Advanced send options"
 msgstr "పంప�టక� ఆధ�నిక �చ�చికాల�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
-#: ../plugins/groupwise-features/share-folder.c:748
+#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "వినియోగదార�ల�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "వినియోగదార�లన� ప�రవేశపెట�టండి మరియ� అన�మత�లన� అమర�చండి"
 
-#: ../plugins/groupwise-features/share-folder-common.c:340
-msgid "New _Shared Folder..."
-msgstr "కొత�త భాగస�వామ�య సంచయం(_S)..."
-
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:415
 msgid "Sharing"
 msgstr "పంచ�కొన�చ�న�న"
 
-#: ../plugins/groupwise-features/share-folder.c:531
+#: ../plugins/groupwise-features/share-folder.c:529
 msgid "Custom Notification"
 msgstr "మల�చ�కొనిన నోటీస�"
 
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../plugins/groupwise-features/share-folder.c:741
 msgid "Add   "
 msgstr "జతచేయ�మ�   "
 
-#: ../plugins/groupwise-features/share-folder.c:759
-msgid "Modify"
-msgstr "సవరించ�"
-
-#: ../plugins/groupwise-features/status-track.c:94
+#: ../plugins/groupwise-features/status-track.c:126
 msgid "Message Status"
 msgstr "సందేశం స�థితి"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:108
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Subject:"
 msgstr "సంగతి:"
 
-#: ../plugins/groupwise-features/status-track.c:122
+#: ../plugins/groupwise-features/status-track.c:154
 msgid "From:"
 msgstr "న�ండి:"
 
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:169
 msgid "Creation date:"
 msgstr "సృష�టించిన నాటి తేది:"
 
-#: ../plugins/groupwise-features/status-track.c:176
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Recipient: "
 msgstr "స�వీకరణదారి: "
 
-#: ../plugins/groupwise-features/status-track.c:183
+#: ../plugins/groupwise-features/status-track.c:216
 msgid "Delivered: "
 msgstr "పంపబడింది: "
 
-#: ../plugins/groupwise-features/status-track.c:189
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Opened: "
 msgstr "తెరిచిన: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Accepted: "
 msgstr "ఆమొదించబడినది: "
 
-#: ../plugins/groupwise-features/status-track.c:199
+#: ../plugins/groupwise-features/status-track.c:232
 msgid "Deleted: "
 msgstr "తొలగించబడినది: "
 
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:237
 msgid "Declined: "
 msgstr "తిరస�కరించబడింది: "
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Completed: "
 msgstr "పూర�తైనది: "
 
-#: ../plugins/groupwise-features/status-track.c:214
+#: ../plugins/groupwise-features/status-track.c:247
 msgid "Undelivered: "
 msgstr "పంపబడని: "
 
-#: ../plugins/groupwise-features/status-track.c:238
-msgid "Track Message Status..."
-msgstr "సందేశం స�థితిని గమనించ�మ�..."
-
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "Add Hula support to Evolution."
 msgstr "ఎవాల�యూషన�‌క� హ�లా మద�దత�న� జతేచేయి."
@@ -17170,27 +17792,31 @@ msgstr "ఎవాలà±�యూషనà±�‌కà±� à°¹à±�లా మదà±�దతà±�à
 msgid "Hula Support"
 msgstr "హ�లా మద�దత�"
 
-#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline Image"
+msgstr "ఇన�‌లైన� vకార�డ�ల�"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+#, fuzzy
+msgid "View image attachments directly in mail messages."
+msgstr "మెయిల� సందేశమ�లనంద� vకార�డ�లన� నేర�గా చూప�మ�."
+
+#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "మల�చ�కొనిన పీఠికల�"
 
-#: ../plugins/imap-features/imap-headers.c:345
+#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP పీఠికల�"
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
-msgid "<b>Custom Headers</b>"
-msgstr "<b>మల�చ�క�న�న పీఠికల�</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers</b>"
-msgstr "<b>IMAP పీఠికల�</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:3
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid "Basic and _Mailing List Headers (Default)"
 msgstr "ప�రాధమిక మరియ� మెయిలింగ� జాబితా పీఠికల� (అప�రమేయ)(_M)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
+#: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -17199,7 +17825,7 @@ msgstr ""
 "మీర� సంగ�రహించ�టక� అవసరమైన పీఠికలన� పై ప�రామాణిక పీఠికలక� అదనంగా ఇవ�వ�మ�.\n"
 "మీర� \"పీఠికల� అన�నీ\" ఎంచ�కొని ఉంటే దీనిని వదిలివేయవచ�చ�."
 
-#: ../plugins/imap-features/imap-headers.glade.h:6
+#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -17207,7 +17833,7 @@ msgstr ""
 "మీ IMAP పీఠిక అభీష�టాలన� ఎంచ�కొన�మ�. \n"
 "మీర� ఎక�క�వ పీఠికలన� కలిగఉంటే దిగ�మతి అవ�వటానికి ఎక�క�వ సమయం తీస�క�ంట�ంది."
 
-#: ../plugins/imap-features/imap-headers.glade.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -17215,8 +17841,7 @@ msgstr ""
 "ప�రాధమిక పీఠికల� - (వేగవంతమైన) \n"
 "మీక� మెయిలింగ� జాబితాలపై ఆధారపడి వడపోతల� లేకపోతే ఇది ఉపయోగించండి"
 
-#: ../plugins/imap-features/imap-headers.glade.h:10
-#| msgid "Fetch A_ll Headers"
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "_Fetch All Headers"
 msgstr "అన�ని పీఠికలన� తెమ�మ� (_F)"
 
@@ -17228,189 +17853,156 @@ msgstr "మీ IMAP ఖాతాలన� బాగా-అమర�చ�మ�.
 msgid "IMAP Features"
 msgstr "IMAP సౌలభ�యాల�"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
-msgid "Hardware Abstraction Layer not loaded"
-msgstr "హార�డ�వేర� సరళీకరణి పోర నింపబడలేద�"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"\"హాల�డ�\" సేవ అవసరమైంది అయితే ప�రస�త�తం నడ�వ�టలేద�. దయచేసి ఈ సేవన� చేతనంచేసి మరియ� ఈ ప�రోగ�రామ� న� "
-"తిప�పిపంప�మ�, లేదా మీ సిస�టమ� నిర�వహణాధికారిని సంప�రదించ�మ�."
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
-msgid "Search for an iPod failed"
-msgstr "iPod కొరక� శోధన విఫలమైంది"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid ""
-"Evolution could not find an iPod to synchronize with. Either the iPod is not "
-"connected to the system or it is not powered on."
-msgstr ""
-"ఎవాల�యూషన� iPod న� కన�గొనలేక పోయింది దానితో కాలనియమత అగ�టక�.బహ�శా iPod సిస�టమ� క� అన�సంధానించబడి "
-"ఉండకపోవచ�చ� లేదా దాని పవర� ఆన� చేసి ఉండకపోవచ�చ�."
-
-#: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:164
-msgid "iCalendar format (.ics)"
-msgstr "�క�యాలెండర� రూపం(.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize to iPod"
-msgstr "iPod క� �కకాలంచేయ�మ�"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-#| msgid "Synchronize to iPod"
-msgid "Synchronize your data with your Apple iPod."
-msgstr "మీ డాటాన� మీ ఆపిల� iPodతో �కకాలం చేయ�మ�."
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "iPod కాలనియమత"
-
-#: ../plugins/itip-formatter/itip-formatter.c:482
-#: ../plugins/itip-formatter/itip-formatter.c:607
+#: ../plugins/itip-formatter/itip-formatter.c:486
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "క�యాలెండర� '%s'న� లోడ�చేయలేకపోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:627
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "క�యాలెండర� '%s' నందలి ఒక నియామకం ఈ సమావేశం తో విభేదిస�త�న�నది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:663
+#: ../plugins/itip-formatter/itip-formatter.c:688
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "క�యాలెండర� '%s' నంద� ఒక నియామకాన�ని కన�గొన�మ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:753
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find any calendars"
 msgstr "� క�యాలెండర�లన� కన�గోనలేకపోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this meeting in any calendar"
 msgstr "ఈ సమావేశాన�ని � క�యాలెండర� నందూ కన�గొనలేకపోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:764
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this task in any task list"
 msgstr "� కర�తవ�య జాబితాలోన� ఈ కర�తవ�యమ�న� కన�గొనలేకపోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:802
 msgid "Unable to find this memo in any memo list"
 msgstr "ఈ మెమోన� � మెమో జాబితానంద� కన�గొనలేక పోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:839
-#| msgid "Opening calendar"
+#: ../plugins/itip-formatter/itip-formatter.c:873
 msgid "Opening the calendar. Please wait.."
 msgstr "క�యాలెండర�‌న� తెర�చ�చ�న�నది. దయచేసి వేచివ�ండ�..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:842
+#: ../plugins/itip-formatter/itip-formatter.c:876
 msgid "Searching for an existing version of this appointment"
 msgstr "ఈ నియామకం యొక�క ఉన�న వర�షన� కొరక� శోధిస�త�న�నది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1057
 msgid "Unable to parse item"
 msgstr "అంశమ�న� పార�శ చేయలేకపోతోంది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1111
+#: ../plugins/itip-formatter/itip-formatter.c:1144
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "అంశమ�న� క�యాలెండర� '%s' క� పంపలేకపోయింది.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1156
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ఆమోదించినట�ల�గా క�యాలెండర� '%s' క� పంపినది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1127
+#: ../plugins/itip-formatter/itip-formatter.c:1160
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "పరిశీలించినట�ల�గా క�యాలెండర� '%s' క� పంపింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1165
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "తిరస�కరించినట�ల�గా క�యాలెండర� '%s' క� పంపింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1137
+#: ../plugins/itip-formatter/itip-formatter.c:1170
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "రద�ద�చేసినట�ల�గా క�యాలెండర� '%s' క� పంపింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1264
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "నిర�వాహకి ప�రతినిధి %s న� తీసివేసింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ప�రతినిధికి రద�ద� నొటీస�న� పంపినది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "రద�ద� నోటీస�న� ప�రతినిదికి పంపలేక పోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "హాజరైనవారి స�థితి నవీకరించబడలేద� ఎంచేతంటే ఆ స�థితి చెల�లనిది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "హాజరైనవ�యక�తిని ని నవీకరించలేమ�. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1381
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 msgid "Attendee status updated"
 msgstr "హజరైనవ�యక�తి స�థితి నవీకరించబడింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1443
 msgid "Meeting information sent"
 msgstr " సమావేశ సమాచారం పంపబడింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../plugins/itip-formatter/itip-formatter.c:1446
 msgid "Task information sent"
 msgstr "కర�తవ�య సమాచారం పంపబడింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "Memo information sent"
 msgstr "మెమో సమాచారం పంపబడింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1458
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "సమావేశం సమాచారాన�ని పంపలేక పోయింది, సమావేశం లేద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1425
+#: ../plugins/itip-formatter/itip-formatter.c:1461
 msgid "Unable to send task information, the task does not exist"
 msgstr "కర�తవ�యం సమాచారాన�ని పంపలేకపోయింది, కర�తవ�యం లేద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1464
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "మెమో సమాచరాన�ని పంపలేకపోయింది, మెమో లేద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1496
-#: ../plugins/itip-formatter/itip-formatter.c:1507
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1529
+#, fuzzy
+msgid "calendar.ics"
+msgstr "క�యాలెండర� ల�"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1534
+#, fuzzy
+msgid "Save Calendar"
+msgstr "కొత�త క�యాలెండర�"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "అన�భందించిన క�యాలెండర� విల�వైనది కాద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1497
-#: ../plugins/itip-formatter/itip-formatter.c:1508
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "క�యాలెండర� కలిగిఉండ�టక� సందేశం ఉంది, అయితే క�యాలెండర� విల�వైన �క�యాలెండర� కాద�."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1548
-#: ../plugins/itip-formatter/itip-formatter.c:1576
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 msgid "The item in the calendar is not valid"
 msgstr "క�యాలెండర� నంద� ఉన�న అంశమ� విల�వైనది కాద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1549
-#: ../plugins/itip-formatter/itip-formatter.c:1577
-#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17418,498 +18010,519 @@ msgstr ""
 "సందేశం క�యాలెండర�న� కలిగిఉంది, అయితే క�యాలెండర� � ఘటనలన�, కర�తవ�యాలన� లేదా ఖాళీ/తీరికలేని సమాచారంన� "
 "కలిగిలేద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "The calendar attached contains multiple items"
 msgstr "అన�భందించిన క�యాలెండర� బహ�ళ అంశమ�లన� కలిగిఉంది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1589
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "ఈ అంశమ�లన�నింటిని నడ�ప�టక�, దస�త�రం తప�పక దాయాలి మరియ� క�యాలెండర� దిగ�మతి కావాలి"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../plugins/itip-formatter/itip-formatter.c:2447
 msgid "This meeting recurs"
 msgstr "సమావేశం ప�నరావృతి"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../plugins/itip-formatter/itip-formatter.c:2450
 msgid "This task recurs"
 msgstr "కర�తవ�యం ప�నరావృతి"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2341
+#: ../plugins/itip-formatter/itip-formatter.c:2453
 msgid "This memo recurs"
 msgstr "మెమో ప�నరావృతి"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2574
+#: ../plugins/itip-formatter/itip-formatter.c:2682
 msgid "_Delete message after acting"
 msgstr "సందేశాన�ని స�పందిచిన తర�వాత తొలగించమ�(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2584
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../plugins/itip-formatter/itip-formatter.c:2692
+#: ../plugins/itip-formatter/itip-formatter.c:2725
 msgid "Conflict Search"
 msgstr "విభేందించ� శోధన"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2599
+#: ../plugins/itip-formatter/itip-formatter.c:2707
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "సమావేశ విభేదాలన� శోధించ�టక� క�యాలెండర� న� ఎంపికచేస�కొన�మ�"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M"
 msgstr "ఈరోజ� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %H:%M:%S"
 msgstr "ఈరోజ� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../plugins/itip-formatter/itip-view.c:213
 msgid "Today %l:%M:%S %p"
 msgstr "ఈరోజ� %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M"
 msgstr "మర�నాడ� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:232
 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:233
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M %p"
 msgstr "మర�నాడ� %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:241
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "మర�నాడ� %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:260
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:261
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:270
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:278
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:283
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:289
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:298
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:313
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:322
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:330
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:443
+#: ../plugins/itip-formatter/itip-view.c:530
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "<b>%s</b> తర�ప�న ప�రతిస�పందించ�మ�"
 
-#: ../plugins/itip-formatter/itip-view.c:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:529
+#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "<b>%s</b> తర�ప�న స�వీకరించింది"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:362
 #, 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:360
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశ సమాచారాన�ని ప�రచ�రించినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశాన�ని మీక� ప�రాతినిధ�యవహించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:372
 #, 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:370
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశం వద�ద మీ హాజర�న� అభ�యర�ధించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:380
 #, 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:378
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ఉన�న సమావేశాన�ని జోడించదలచింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమాశం కొరక� తాజా సమాచారాన�ని పొంద దల�చినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:388
 #, 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:388
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమావేశం స�పందనన� వెన�కక� పంపినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:390
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశం స�పందనన� వెన�కక� పంపినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమావేశాన�ని రద�ద� చేసింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> సమావేశాన�ని రద�ద� చేసింది."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమావేశ మార�పలన� ప�రస�తావించింది."
 
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ఈ క�రింది సమావేశ మార�ప�లన� ప�రస�తావించింది."
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:410
 #, 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:408
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ఈ క�రింది సమావేశ మార�ప�లన� తిరస�కరించింది."
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:450
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది కర�తవ�యాన�ని ప�రచ�రించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ఈ క�రింది కర�తవ�యాన�ని ప�రచ�రించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:457
 #, 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:456
+#: ../plugins/itip-formatter/itip-view.c:460
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> గ�ండా %s మీక� ఒక కర�తవ�యాన�ని అప�పగిస�త�ంది:"
 
-#: ../plugins/itip-formatter/itip-view.c:458
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> మీక� ఒక కర�తవ�యాన�ని అప�పగించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:468
 #, 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:466
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ఉన�న కార�తవ�యాన�ని జోడించిదల�చింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది అప�పగించన కర�తవ�యమ�నక� తాజా సమాచారాన�ని పొంద దల�చినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:476
 #, 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:476
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది అప�పగించిన కర�తవ�యం స�పందనన� వెన�కక� పంపినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ఈ క�రింది అప�పగించిన కర�తవ�యం స�పందనన� వెన�కక� పంపినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:486
 #, 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:484
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ఈ క�రింది అప�పగించిన కర�తవ�యం రద�ద�చేసినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది కర�తవ�యం అప�పగింత మార�ప�లన� ప�రస�తావించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ఈ క�రింది కర�తవ�యం అప�పగింత మార�ప�లన� ప�రస�తావించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:498
 #, 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:496
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> క�రింది అప�పగించిన కర�తవ�యాన�ని తిరస�కరించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> న�ండి %s క�రింది మెమోన� ప�రచ�రించినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:536
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> క�రింది మెమోన� ప�రచ�రించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
 #, 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:543
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> ఉన�న మెమో న� జోడించదలచింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
 #, 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:549
+#: ../plugins/itip-formatter/itip-view.c:552
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b>ఈక�రింది భాగస�వామ�య మెమోన� రద�ద�చేసినది:"
 
+#: ../plugins/itip-formatter/itip-view.c:676
+msgid "All day:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:686
+#, fuzzy
+msgid "Start day:"
+msgstr "ప�రారంభ తేది(_r):"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:1045
+msgid "Start time:"
+msgstr "ప�రారంభ సమయం:"
+
+#: ../plugins/itip-formatter/itip-view.c:698
+#, fuzzy
+msgid "End day:"
+msgstr "%d రోజ�"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1056
+msgid "End time:"
+msgstr "మ�గింప� సమయం:"
+
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:823
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Open Calendar"
 msgstr "క�యాలెండర�‌న� తెర�వ�మ�(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:847
+#: ../plugins/itip-formatter/itip-view.c:864
+#: ../plugins/itip-formatter/itip-view.c:869
 msgid "_Decline"
 msgstr "తిరస�కరించ�(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Accept"
 msgstr "ఆమోదించ�(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Decline all"
 msgstr "అన�నీ తిరస�కరించ�(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Tentative all"
 msgstr "అన�నిటిని పరిశీలించ�(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:865
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Tentative"
 msgstr "పరిశీలకంగా(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Accept all"
 msgstr "అన�నీ ఆమోదించ�(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Send Information"
 msgstr "సమాచారాన�ని పంప�(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Update Attendee Status"
 msgstr "హాజరైనవాని స�థితిని నవీకరించ�మ�(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Update"
 msgstr "నవీకరించ�మ�(_U)"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Start time:"
-msgstr "ప�రారంభ సమయం:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1044
-msgid "End time:"
-msgstr "మ�గింప� సమయం:"
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1064
-#: ../plugins/itip-formatter/itip-view.c:1118
+#: ../plugins/itip-formatter/itip-view.c:1076
+#: ../plugins/itip-formatter/itip-view.c:1130
 msgid "Comment:"
 msgstr "వ�యాఖ�య:"
 
-#: ../plugins/itip-formatter/itip-view.c:1103
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _reply to sender"
 msgstr "పంపినవానికి ప�రత�య�త�తరమ� పంప�మ�(_r)"
 
-#: ../plugins/itip-formatter/itip-view.c:1133
+#: ../plugins/itip-formatter/itip-view.c:1145
 msgid "Send _updates to attendees"
 msgstr "హాజరైనవానికి నవీకరణలన� పంప�మ�(_u)"
 
-#: ../plugins/itip-formatter/itip-view.c:1142
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Apply to all instances"
 msgstr "అన�ని ఇన�‌స�టాన�స�లక� ఆపాదించ�మ�(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1151
+#: ../plugins/itip-formatter/itip-view.c:1163
 msgid "Show time as _free"
 msgstr "సమయం న� తీరికగా చూప�మ�(_f)"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1166
 msgid "_Preserve my reminder"
 msgstr "నాక� గ�ర�త�చేయ�దానిని నిల�వవ�ంచ�మ� (_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1160
+#: ../plugins/itip-formatter/itip-view.c:1172
 msgid "_Inherit reminder"
 msgstr "పారంపరంగా గ�ర�త�చేయ�నది (_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1914
-#| msgid "_Memos"
+#: ../plugins/itip-formatter/itip-view.c:1915
+msgid "_Tasks:"
+msgstr "కర�తవ�యాల�(_T):"
+
+#: ../plugins/itip-formatter/itip-view.c:1917
 msgid "_Memos:"
 msgstr "మెమోల� (_M):"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-#| msgid "Displays text/calendar parts in messages."
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "మెయిల� సందేశంలంద� \"పాఠ�యమ�/క�యాలెండర�\" MIME భాగమ�లన� ప�రదర�శించ�మ�."
 
@@ -17930,21 +18543,10 @@ msgid "This meeting has been delegated"
 msgstr "ఈ సమావేశం ప�రాతినిధ�యం వహించబడింది"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "ఈ సమాధానం వర�తమాన జవాబ�దార�నిన�ండి రాలేద�. పంపినవానిని జవాబ�దార�నిగా జోడించండి?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
-msgid "Proxy _Logout"
-msgstr "ప�రాక�సీ లాగ�అవ�ట�(_L)"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Disable Account"
-msgstr "ఖాతాన� అచేతనంచేయ�మ�"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-msgid "Disable an account by right-clicking on it in the folder tree."
-msgstr "ఫోల�డర� ట�రీనంద� ఖాతాపై క�డి-నొక�క నొక�క�టద�వారా దానిని అచేతనమ� చేయి."
-
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "శబ�దప� దస�త�రం న� బీప� లేదా ప�లే చేయ�మ�"
@@ -17980,51 +18582,56 @@ msgid "Play sound when new messages arrive."
 msgstr "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దమ�న� ప�లే చేయ�మ�."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#, fuzzy
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దప� దస�త�రం ప�లేకావాలి, బీప� రీతి నంద� లేకపోతే."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
 msgstr "సందేశంన� ప�రతిమతో కలిపి పాప�అప� చేయ�మ�."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "ప�రకటన ప�రదేశంలో కొత�త సందేశం రాగానే కొత�త మెయిల� ప�రతిమన� చూప�మ�."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
 msgstr "ప�లే చేయ�టక� శబ�దప� దస�త�రం నామమ�."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దప� దస�త�రం ప�లేకావాలి, బీప� రీతి నంద� లేకపోతే."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Use sound theme"
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "కొత�తసందేశం వచ�చనప�ప�డ� శబ�దం ప�లే చేయాలా లేదా బీప� ప�లే చేయాలా."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "కొత�త సందేశం వచ�చినప�ప�డ� ప�రతిమ పై సందేశం చూపాలా."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
 msgid "Whether the icon should blink or not."
 msgstr "ప�రతిమ బ�లింక� కావాలా వద�దా."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "ఇన�‌బాక�స� సంచయం నందలి కొత�త సందేశాలన� మాత�రమే తెల�పాలా."
 
-#: ../plugins/mail-notification/mail-notification.c:245
-msgid "Generate a _D-Bus message"
-msgstr "_D-Bus సందేశాన�ని సంభంవింపచేయ�మ�"
-
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:344
 msgid "Evolution's Mail Notification"
 msgstr "ఎవాల�యూషన�‌యొక�క మెయిల� ప�రకటన"
 
-#: ../plugins/mail-notification/mail-notification.c:389
+#: ../plugins/mail-notification/mail-notification.c:366
 msgid "Mail Notification Properties"
 msgstr "మెయిల� ప�రకటన లక�షణాల�"
 
-#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:498
+#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:495
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18039,77 +18646,94 @@ msgstr[1] ""
 "మీర� %d కొత�త సందేశంన�\n"
 "%sనంద� పొందార�."
 
-#: ../plugins/mail-notification/mail-notification.c:503
+#. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
+#: ../plugins/mail-notification/mail-notification.c:506
+#, fuzzy, c-format
+msgid "From: %s"
+msgstr "%s న�ండి:"
+
+#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:518
+#, fuzzy, c-format
+msgid "Subject: %s"
+msgstr "సంగతి:"
+
+#: ../plugins/mail-notification/mail-notification.c:527
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "మీర� %d కొత�త సందేశాన�ని పొందార�."
 msgstr[1] "మీర� %d కొత�త సందేశాన�ని పొందార�."
 
-#: ../plugins/mail-notification/mail-notification.c:520
-#: ../plugins/mail-notification/mail-notification.c:525
+#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:550
 msgid "New email"
 msgstr "కొత�త ఈమెయిల�"
 
-#: ../plugins/mail-notification/mail-notification.c:588
+#: ../plugins/mail-notification/mail-notification.c:604
 msgid "Show icon in _notification area"
 msgstr "ప�రకటన ప�రదేశంలో ప�రతిమన� చూప�మ�(_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:632
 msgid "B_link icon in notification area"
 msgstr "ప�రకటన ప�రదేశం లో ప�రతిమన� బ�లింక� చేయ�మ�(_l)"
 
-#: ../plugins/mail-notification/mail-notification.c:593
+#: ../plugins/mail-notification/mail-notification.c:642
 msgid "Popup _message together with the icon"
 msgstr "ప�రతిమతో కూడి సందేశాన�ని పాప�అప� చేయ�మ�(_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:827
 msgid "_Play sound when new messages arrive"
 msgstr "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దమ�న� ప�లే చేయ�మ� (_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:780
+#: ../plugins/mail-notification/mail-notification.c:856
 msgid "_Beep"
 msgstr "బీప�(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:781
-msgid "Play _sound file"
-msgstr "శబ�దప� దస�త�రాన�ని ప�లే చేయ�మ�(_s)"
+#: ../plugins/mail-notification/mail-notification.c:869
+msgid "Use sound _theme"
+msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:792
-msgid "Specify _filename:"
-msgstr "దస�త�రనామమ� న� తెలియజేయ�మ�(_f):"
+#: ../plugins/mail-notification/mail-notification.c:888
+#, fuzzy
+msgid "Play _file:"
+msgstr "శబ�దప� దస�త�రాన�ని ప�లే చేయ�మ�(_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:793
+#: ../plugins/mail-notification/mail-notification.c:899
 msgid "Select sound file"
 msgstr "శబ�దప� దస�త�రాన�ని ఎంపికచేయ�మ�"
 
-#: ../plugins/mail-notification/mail-notification.c:794
-msgid "Pl_ay"
-msgstr "ప�లే(_a)"
-
-#: ../plugins/mail-notification/mail-notification.c:851
+#: ../plugins/mail-notification/mail-notification.c:957
 msgid "Notify new messages for _Inbox only"
 msgstr "ఇన�‌బాక�స� క� కొత�త సందేశాలన� మాత�రమే ప�రకటింట�మ�(_I)"
 
+#: ../plugins/mail-notification/mail-notification.c:966
+msgid "Generate a _D-Bus message"
+msgstr "_D-Bus సందేశాన�ని సంభంవింపచేయ�మ�"
+
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "మెయిల� ప�రకటన"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-#| msgid "Play sound when new messages arrive."
 msgid "Notifies you when new mail messages arrive."
 msgstr "కొత�త మెయిల� సందేశమ�ల� వచ�చినప�ప�డ� మీక� తెలియజేస�త�ంది."
 
-#: ../plugins/mail-to-task/mail-to-task.c:376
+#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
+#: ../plugins/mail-to-task/mail-to-task.c:166
+#, c-format
+msgid "Created from a mail by %s"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr ""
-"ఎంపికచేసిన క�యాలెండర� యిప�పటికే ఘటన '%s'న� కలిగివ�ంది. మీర� పాత ఘటనన� సరికూర�చాలని "
-"అన�కొన�చ�న�నారా?"
+"ఎంపికచేసిన క�యాలెండర� యిప�పటికే ఘటన '%s'న� కలిగివ�ంది. మీర� పాత ఘటనన� సరికూర�చాలని అన�కొన�చ�న�నారా?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:379
+#: ../plugins/mail-to-task/mail-to-task.c:499
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18118,24 +18742,23 @@ msgstr ""
 "ఎంపికచేసిన కర�తవ�య జాబితా యిప�పటికే కర�తవ�యం '%s'న� కలిగివ�ంది. మీర� పాత కర�తవ�యాన�ని సరికూర�చ�టక� "
 "యిష�టపడతారా?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:382
+#: ../plugins/mail-to-task/mail-to-task.c:502
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr ""
-"ఎంపికైన మెమో జాబితా యిప�పటికే మెమో '%s'న� కలిగివ�ంది. మీర� పాత మెమోన� సరికూర�చాలని "
-"అన�కొన�చ�న�నారా?"
+"ఎంపికైన మెమో జాబితా యిప�పటికే మెమో '%s'న� కలిగివ�ంది. మీర� పాత మెమోన� సరికూర�చాలని అన�కొన�చ�న�నారా?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:399
+#: ../plugins/mail-to-task/mail-to-task.c:519
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
 msgstr ""
-"ఎంపికచేసిన క�యాలెండర� కొన�ని ఘటనలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
-"ఘటనలన� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+"ఎంపికచేసిన క�యాలెండర� కొన�ని ఘటనలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త ఘటనలన� "
+"సృష�టించ�దామని అన�కొన�చ�న�నరా?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:402
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18143,15 +18766,15 @@ msgstr ""
 "ఎంపికచేసిన కర�తవ�య జాబితా కొన�ని కర�తవ�యాలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
 "కర�తవ�యాలన� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:405
+#: ../plugins/mail-to-task/mail-to-task.c:525
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
 msgstr ""
-"ఎంపికచేసిన మెమో జాబితా కొన�ని మెమోలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
-"మెమోలన� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+"ఎంపికచేసిన మెమో జాబితా కొన�ని మెమోలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త మెమోలన� "
+"సృష�టించ�దామని అన�కొన�చ�న�నరా?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:423
+#: ../plugins/mail-to-task/mail-to-task.c:543
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18159,13 +18782,13 @@ msgid_plural ""
 "Selected calendar contains events for the given mails already. Would you "
 "like to create new events anyway?"
 msgstr[0] ""
-"ఎంపికచేసిన క�యాలెండర� వొక ఘటనన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
-"ఘటనన� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+"ఎంపికచేసిన క�యాలెండర� వొక ఘటనన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త ఘటనన� "
+"సృష�టించ�దామని అన�కొన�చ�న�నరా?"
 msgstr[1] ""
-"ఎంపికచేసిన క�యాలెండర� కొన�ని ఘటనలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
-"ఘటనలన� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+"ఎంపికచేసిన క�యాలెండర� కొన�ని ఘటనలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త ఘటనలన� "
+"సృష�టించ�దామని అన�కొన�చ�న�నరా?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:429
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18179,7 +18802,7 @@ msgstr[1] ""
 "ఎంపికచేసిన కర�తవ�య జాబితా కొన�ని కర�తవ�యాలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
 "కర�తవ�యాలన� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:435
+#: ../plugins/mail-to-task/mail-to-task.c:555
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18187,36 +18810,31 @@ msgid_plural ""
 "Selected memo list contains memos for the given mails already. Would you "
 "like to create new memos anyway?"
 msgstr[0] ""
-"ఎంపికచేసిన మెమో జాబితా వొక మెమోన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
-"మెమోలన� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+"ఎంపికచేసిన మెమో జాబితా వొక మెమోన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త మెమోలన� "
+"సృష�టించ�దామని అన�కొన�చ�న�నరా?"
 msgstr[1] ""
-"ఎంపికచేసిన మెమో జాబితాన� కొన�ని మెమోలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
-"మెమోలన� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+"ఎంపికచేసిన మెమో జాబితాన� కొన�ని మెమోలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త మెమోలన� "
+"సృష�టించ�దామని అన�కొన�చ�న�నరా?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:494
-#| msgid "No Summary"
+#: ../plugins/mail-to-task/mail-to-task.c:614
 msgid "[No Summary]"
 msgstr "[సంక�షిప�తసమాచారమ� లేద�]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:505
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "Invalid object returned from a server"
 msgstr "సేవికన�ండి చెల�లని ఆబ�జక�ట� తిరిగివచ�చింది"
 
-#: ../plugins/mail-to-task/mail-to-task.c:570
+#: ../plugins/mail-to-task/mail-to-task.c:696
 #, c-format
-#| msgid "An error occurred while printing"
 msgid "An error occurred during processing: %s"
 msgstr "ప�రోసెసింగ�‌నంద� వొక దోషమ� యెద�రైంది: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:725
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "క�యాలెండర� న� తెర�వలేద�. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:606
-#| msgid ""
-#| "Selected source is read only, thus cannot create task there. Select other "
-#| "source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:732
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18224,7 +18842,7 @@ msgstr ""
 "ఎంపికచేసిన మూలం చద�వ�టక� మాత�రమే, అంటే అక�కడ ఘటనన� సృష�టించలేమ�. వేరే మూలాన�ని ఎంపికచేయ�మ�, "
 "దయచేసి."
 
-#: ../plugins/mail-to-task/mail-to-task.c:609
+#: ../plugins/mail-to-task/mail-to-task.c:735
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18232,10 +18850,7 @@ msgstr ""
 "ఎంపికచేసిన మూలం చద�వ�టక� మాత�రమే, అంటే అక�కడ కర�తవ�యాన�ని సృష�టించలేమ�. వేరే మూలాన�ని ఎంపికచేయ�మ�, "
 "దయచేసి."
 
-#: ../plugins/mail-to-task/mail-to-task.c:612
-#| msgid ""
-#| "Selected source is read only, thus cannot create task there. Select other "
-#| "source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:738
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18243,105 +18858,107 @@ msgstr ""
 "ఎంపికచేసిన మూలం చద�వ�టక� మాత�రమే, అంటే అక�కడ మెమోన� సృష�టించలేమ�. వేరే మూలాన�ని ఎంపికచేయ�మ�, "
 "దయచేసి."
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:941
 #, c-format
-#| msgid "Cannot open source \"{2}\"."
 msgid "Cannot get source list. %s"
 msgstr "మూలమ� జాబితాన� పొందలేమ�. %s"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-#| msgid "Convert the selected message to a new task"
-msgid "Convert a mail message to a task."
-msgstr "మెయిల� సందేశాన�ని కర�తవ�యానికి మార�చ�మ�."
+#: ../plugins/mail-to-task/mail-to-task.c:1060
+msgid "Create an _Event"
+msgstr "ఘటనన� సృష�టించ�మ� (_E)"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1062
+msgid "Create a new event from the selected 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 "Create a new memo"
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a Mem_o"
 msgstr "మెమోన� సృష�టించ�మ� (_o)"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-#| msgid "New _Meeting"
-msgid "Create a _Meeting"
-msgstr "సమావేశాన�ని సృష�టించ�మ� (_M)"
+#: ../plugins/mail-to-task/mail-to-task.c:1069
+msgid "Create a new memo from the selected message"
+msgstr "ఎంపికచేసిన సందేశమ�న�ండి కొత�త మెమోన� సృష�టించ�మ�"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
-#| msgid "Create a new task"
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create a _Task"
 msgstr "కర�తవ�యాన�ని సృష�టించ�మ� (_T)"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
-#| msgid "_Create new view"
-msgid "Create an _Event"
-msgstr "ఘటనన� సృష�టించ�మ� (_E)"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
-#| msgid "Mail to task"
-msgid "Mail-to-Task"
-msgstr "కర�తవ�యమ�-క�-మెయిల�"
+#: ../plugins/mail-to-task/mail-to-task.c:1076
+msgid "Create a new task from the selected message"
+msgstr "ఎంపికచేసన సందేశం న�ండి కొత�త కర�తవ�యాన�ని సృష�టించండి"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
-#| msgid "Compose a reply to the sender of the selected message"
-msgid "Create a new event from the selected message"
-msgstr "ఎంపికచేసిన సందేశమ�న�ండి కొత�త ఘటనన� సృష�టించ�మ�"
+#: ../plugins/mail-to-task/mail-to-task.c:1084
+msgid "Create a _Meeting"
+msgstr "సమావేశాన�ని సృష�టించ�మ� (_M)"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
-#| msgid "Create a new meeting request"
+#: ../plugins/mail-to-task/mail-to-task.c:1086
 msgid "Create a new meeting from the selected message"
 msgstr "ఎంపికచేసిన సందేశమ�న�ండి కొత�త సమావేశమ�న� సృష�టించ�మ�"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
-#| msgid "Compose a reply to the sender of the selected message"
-msgid "Create a new memo from the selected message"
-msgstr "ఎంపికచేసిన సందేశమ�న�ండి కొత�త మెమోన� సృష�టించ�మ�"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
-#| msgid "Compose a reply to the sender of the selected message"
-msgid "Create a new task from the selected message"
-msgstr "ఎంపికచేసన సందేశం న�ండి కొత�త కర�తవ�యాన�ని సృష�టించండి"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "మెయిల� సందేశాన�ని కర�తవ�యానికి మార�చ�మ�."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Contact list _owner"
-msgstr "పరిచయ జాబితా స�వంతదార�(_o)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+msgid "Get List _Archive"
+msgstr "జాబితా ఆర�చివ� న� పొంద�మ�(_A)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Get list _archive"
-msgstr "జాబితా ఆర�చివ�‌న� తెమ�మ�(_a)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+msgid "Get an archive of the list this message belongs to"
+msgstr "ఈ సందేశంక� చెందిన జాబితా యొక�క ఆర�చివ� న� పొంద�మ�"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-msgid "Get list _usage information"
-msgstr "జాబితా ఉపయోగం సమాచారాన�ని పొంద�మ�(_u)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+msgid "Get List _Usage Information"
+msgstr "జాబితా ఉపయోగప� సమాచారాన�ని పొంద�మ�(_U)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-msgid "Mailing List Actions"
-msgstr "మెయిలింగ� జాబితా చర�యల�"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+msgid "Get information about the usage of the list this message belongs to"
+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 "మెయిలింగ� జాబితా(_L)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+msgid "Contact List _Owner"
+msgstr "పరిచయ జాబితా స�వతందార�(_O)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-#| msgid ""
-#| "Provide actions for common mailing list commands (subscribe, "
-#| "unsubscribe...)."
-msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr "ఉమ�మడి మెయిలింగ� జాబితా ఆదేశాలన� జర�ప�మ� (చందాదార�కమ�మ�,చందావిరమించ�, మొ.)."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "ఈ సందేశం క� చెందిన మెయిలింగ� జాబితా యజమానిని సంప�రదించ�మ�"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-msgid "_Post message to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+msgid "_Post Message to List"
 msgstr "సందేశాన�ని జాబితాక� పోస�ట�చేయ�మ�(_P)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-msgid "_Subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "ఈ సందేశం క� చెందిన మెయిలింగ� జాబితాక� సందేశంన� పోస�ట� చేయ�మ�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+msgid "_Subscribe to List"
 msgstr "జాబితాక� చందాదార� కమ�మ�(_S)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-msgid "_Un-subscribe to list"
-msgstr "జాబితాక� చందావిరమించ�కొన�మ�(_U)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "ఈ సందేశంక� చెందిన మెయిలింగ� జాబితాక� చందాదార� కమ�మ�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+msgid "_Unsubscribe from List"
+msgstr "జాబితాన�ండి చందావిరమించ�కొన�మ�(_U)"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#, fuzzy
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "ఈ సందేశం క� చెందిన మెయిలింగ� జాబితాక� చందావిరమించ�కొన�మ�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+msgid "Mailing _List"
+msgstr "మెయిలింగ� జాబితా(_L)"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "మెయిలింగ� జాబితా చర�యల�"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "ఉమ�మడి మెయిలింగ� జాబితా ఆదేశాలన� జర�ప�మ� (చందాదార�కమ�మ�,చందావిరమించ�, మొ.)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -18419,59 +19036,11 @@ 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
-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/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/mark-all-read.c:39
+#: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr "ఉపసంచయాలనందలి సందేశాలన�కూడా గ�ర�త�ంచాలా?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
+#: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18479,84 +19048,66 @@ msgstr ""
 "మీర� సందేశాల� చదివినట�ల�గా ప�రస�త�త సంచయంనంద� మాత�రమే గ�ర�త�ంచాలన�క�ంట�న�నారా, లేక ప�రస�త�త "
 "సంచయంనంద� అదేవిదంగా దాని వ�పసంచయాలనంద� కూడానా?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:166
-#| msgid "Current Folder and _Subfolders"
+#: ../plugins/mark-all-read/mark-all-read.c:168
 msgid "In Current Folder and _Subfolders"
 msgstr "ప�రస�త�త సంచయం మరియ� వ�పసంచయాలనంద� (_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:180
-#| msgid "Current _Folder Only"
+#: ../plugins/mark-all-read/mark-all-read.c:182
 msgid "In Current _Folder Only"
 msgstr "ప�రస�త�త సంచయంనంద� మాత�రమే (_F)"
 
+#: ../plugins/mark-all-read/mark-all-read.c:402
+msgid "Mark Me_ssages as Read"
+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 "Mark all messages in the folder as read"
 msgid "Mark all messages in a folder as read."
 msgstr "ఒక ఫోల�డర�నంద� అన�ని సందేశాలన� చదివినట�ల� గ�ర�త�ంచ�మ�."
 
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "Mono Loader"
-msgstr "మోనో లోడర�"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-msgid "Support plugins written in Mono."
-msgstr "మోనో నంద� వ�రాసిన ప�లగిన�లన� మద�దతించ�మ�."
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-#| msgid "Change Evolution's settings"
 msgid "Manage your Evolution plugins."
 msgstr "మీ ఎవాల�యూషన� ప�లగిన�లన� నిర�వహించ�మ�."
 
-#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:252
+#: ../plugins/plugin-manager/plugin-manager.c:244
 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 "ప�లగ�ఇన�స�(_P)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
 msgstr "ఆథర�(ల�)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:146
-msgid "Configuration"
-msgstr "ఆకృతీకరణ"
-
-#: ../plugins/plugin-manager/plugin-manager.c:265
+#: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr "గమనిక: ప�నఃప�రారంభించ� నంతవరక� కొన�ని మార�ప�ల� ప�రభావితం కావ�"
 
-#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:285
 msgid "Overview"
 msgstr "అవలోకనం"
 
-#: ../plugins/plugin-manager/plugin-manager.c:362
-#: ../plugins/plugin-manager/plugin-manager.c:424
+#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:418
 msgid "Plugin"
 msgstr "ప�లగ�ఇన�"
 
+#: ../plugins/plugin-manager/plugin-manager.c:430
+msgid "_Plugins"
+msgstr "ప�లగ�ఇన�స�(_P)"
+
+#: ../plugins/plugin-manager/plugin-manager.c:432
+msgid "Enable and disable plugins"
+msgstr "ప�లగ�ఇన�స� న� చేతనం మరియ� అచేతనం చేయ�మ�"
+
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "సాదా పాఠ�యమ� రీతి"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-#| msgid "Prefer plain-text"
 msgid "Prefer Plain Text"
 msgstr "సాదా పాఠ�యమ�న� అభీష�టపరచ�మ�"
 
@@ -18564,19 +19115,41 @@ msgstr "సాదా పాఠà±�యమà±�à°¨à±� అభీషà±�టపరచà±�à
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "మెయిల� సందేశమ�లన� సాదా పాఠ�యమ� వలె దర�శించ�మ�, అవి HTML సారమ�న� కలిగివ�న�నా కూడా."
 
-#: ../plugins/prefer-plain/prefer-plain.c:189
+#: ../plugins/prefer-plain/prefer-plain.c:201
 msgid "Show HTML if present"
 msgstr "ఉన�నట�లైతే HTML న� చూప�మ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:190
-msgid "Prefer PLAIN"
-msgstr "సాదా న� ఇష�టపడతాన�"
+#: ../plugins/prefer-plain/prefer-plain.c:201
+msgid "Let Evolution choose the best part to show."
+msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
-msgid "Only ever show PLAIN"
+#: ../plugins/prefer-plain/prefer-plain.c:202
+#, fuzzy
+msgid "Show plain text if present"
+msgstr "ఉన�నట�లైతే HTML న� చూప�మ�"
+
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:203
+#, fuzzy
+msgid "Only ever show plain text"
 msgstr "ఎప�ప�డ� సాదాన� మాత�రమే చూప�మ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:234
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:250
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
 msgstr "HTML రీతి (_M)"
 
@@ -18600,26 +19173,37 @@ msgstr "Outlook PST దిగ�మతి"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook వ�యక�తిగత సంచయమ�ల� (.pst)"
 
+#: ../plugins/pst-import/pst-importer.c:299
+msgid "_Mail"
+msgstr "మెయిల�(_M)"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:315
+#: ../plugins/pst-import/pst-importer.c:317
 msgid "_Address Book"
 msgstr "చిర�నామా ప�స�తకం (_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:322
+#: ../plugins/pst-import/pst-importer.c:324
 msgid "A_ppointments"
 msgstr "నియామకాల� (_p)"
 
+#. Tasks
+#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "కర�తవ�యాల�(_T)"
+
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:334
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "_Journal entries"
 msgstr "పత�రిక ప�రవేశమ�ల� (_J)"
 
-#: ../plugins/pst-import/pst-importer.c:349
+#: ../plugins/pst-import/pst-importer.c:351
 msgid "Importing Outlook data"
 msgstr "Outlook డాటాన� దిగ�మతిచేస�తోంది"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../plugins/publish-calendar/publish-calendar.c:146
+#: ../plugins/publish-calendar/publish-calendar.c:153
 msgid "Calendar Publishing"
 msgstr "క�యాలెండర� ప�రచ�రణ"
 
@@ -18628,149 +19212,154 @@ msgid "Locations"
 msgstr "స�థానమ�ల�"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
-#| msgid "Allows calendars to be published to the web"
 msgid "Publish calendars to the web."
 msgstr "కాలెండర�లన� వెబ�‌నక� ప�రచ�రించ�మ�."
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
-msgid "_Publish Calendar Information"
-msgstr "క�యాలెండర� సమాచారంన� మ�ద�రించ�మ�(_P)"
-
-#: ../plugins/publish-calendar/publish-calendar.c:95
-#: ../plugins/publish-calendar/publish-calendar.c:337
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
 #, c-format
-#| msgid "Could not open source"
 msgid "Could not open %s:"
 msgstr "%sన� తెర�వలేక పోయింది:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:97
+#: ../plugins/publish-calendar/publish-calendar.c:210
 #, c-format
-#| msgid "Could not parse PGP message: Unknown error"
 msgid "Could not open %s: Unknown error"
 msgstr "%sన� తెర�వలేక పోయింది: తెలియని దోషమ�"
 
-#: ../plugins/publish-calendar/publish-calendar.c:117
+#: ../plugins/publish-calendar/publish-calendar.c:230
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "%sనక� ప�రచ�రించ�నప�ప�డ� అక�కడ వొక దోషమ�వ�ంది:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:119
+#: ../plugins/publish-calendar/publish-calendar.c:232
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "%sనక� ప�రచ�రించ�ట సమర�ధవంతంగా పూర�తైనది"
 
-#: ../plugins/publish-calendar/publish-calendar.c:164
+#: ../plugins/publish-calendar/publish-calendar.c:276
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "%sయొక�క మరల�ప� విఫలమైంది:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:624
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "చేతనం(_n)"
+
+#: ../plugins/publish-calendar/publish-calendar.c:739
 msgid "Are you sure you want to remove this location?"
 msgstr "మీర� ఖచ�చితంగా ఈ స�థానమ�న� తీసవేద�దామని అన�కొన�చ�న�నారా?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:788
-#| msgid "Could not create message."
+#. To Translators: This is shown to a user when creation of a new thread,
+#. where the publishing should be done, fails. Basically, this shouldn't
+#. ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1051
 msgid "Could not create publish thread."
 msgstr "ప�రచ�రణ తంతి సృష�టించబడలేక పోయింది."
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:2
-msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">స�థానమ�</span>"
+#: ../plugins/publish-calendar/publish-calendar.c:1059
+msgid "_Publish Calendar Information"
+msgstr "క�యాలెండర� సమాచారంన� మ�ద�రించ�మ�(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">మూలాల�</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+#, fuzzy
+msgid "Custom Location"
+msgstr "మల�చ�కొనిన నోటీస�"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+#, fuzzy
+msgid "Daily"
+msgstr "రోజ�"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#, fuzzy
+msgid "Manual (via Actions menu)"
 msgstr ""
 "రోజూ\n"
 "వారానికి\n"
 "మానవీయంగా (చర�యల మెనూ ద�వరా)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "చేతనం(_n)"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
 msgstr "పోర�ట�(_o):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#, fuzzy
+msgid "Public FTP"
+msgstr "ప�రజా"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
 msgstr "స�థానాన�ని ప�రచ�రిస�తోంది"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
 msgstr "ప�రకంపనన� ప�రచ�రిస�తోంది(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"Secure FTP (SSH)\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-msgstr ""
-"రక�షిత FTP (SSH)\n"
-"పబ�లిక� FTP\n"
-"FTP (లాగిన� తో)\n"
-"విండోస� భాగస�వామ�యం\n"
-"WebDAV (HTTP)\n"
-"రక�షిత WebDAV (HTTPS)\n"
-"మల�చ�క�న�న స�థానమ�"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
 msgstr "సేవ రకం(_t):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#| msgid "Time _zone:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+#, fuzzy
+msgid "Sources"
+msgstr "వనర�"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "సమయప� నిడివి (_d):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+#, fuzzy
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+#, fuzzy
+msgid "Weekly"
+msgstr "వారం"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+#, fuzzy
+msgid "Windows share"
+msgstr "గవాక�షమ�(_W)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "దస�త�రం(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
 msgstr "సంకేతపదం(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "ఇలా ప�రచ�రించ�(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
 msgstr "రహస�యపదాన�ని గ�ర�తించ�మ�(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "వినియోగదార�డి నామమ�(_U):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
-msgid ""
-"days\n"
-"weeks\n"
-"months"
-msgstr ""
-"రోజ�ల�\n"
-"వారమ�ల�\n"
-"నెలల�"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:32
-msgid ""
-"iCal\n"
-"Free/Busy"
-msgstr ""
-"iCal\n"
-"ఖళి/తీరికలేని"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+#, fuzzy
+msgid "iCal"
+msgstr "à°•à°¾"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
@@ -18778,38 +19367,14 @@ msgstr ""
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "కాలెండర�‌న� ప�రచ�రించలేక పోయింది: కాలెండర� బ�యాకెండ� యింకా లేద�"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "New Location"
 msgstr "కొత�త స�థానమ�"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:480
 msgid "Edit Location"
 msgstr "స�థానమ� సరికూర�చ�మ�"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "హెల�లో పైథాన�"
-
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr "పైథాన� ప�లగ�ఇన� లోడర� పరిశీలనల�"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "పైథాన� పరిశీలనా ప�లగ�ఇన�"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "పైథాన� ఈప�లగ�ఇన� లోడర� కొరక� పరిశీలనా ప�లగ�ఇన�."
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using Python."
-msgstr "పైథాన� వ�పయోగించి వ�రాసిన ఇతర ప�లగ�ఇన�స��‌న� లోడ�‌చేయ�టక� ప�లగ�ఇన�."
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-msgid "Python Loader"
-msgstr "పైథాన� లోడర�"
-
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
@@ -18841,26 +19406,24 @@ msgstr "à°¸à±�పామà±�‌యెసà±�సాసినà±� చైలà±�à°¡à±�â€
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "స�పామ�‌యెస�సాసిన� వైఫల�యానికి పైప�, దోషమ� కోడ�: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
-#, c-format
-msgid "SpamAssassin is not available."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#, fuzzy, c-format
+msgid "SpamAssassin is not available. Please install it first."
 msgstr "స�పామ�‌యెస�సాసిన� అంద�బాట�లో లేద�."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "ఇది స�పామ�‌యెస�సాసిన�‌న� నమ�మదగినదిగా చేస�త�ంది, అయితే నిదానమైనది"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 msgid "I_nclude remote tests"
 msgstr "ద�రస�థ పరిశీలనలన� చేర�చ�త�ంది(_n)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-#| msgid "Filters junk messages using Bogofilter."
 msgid "Filter junk messages using SpamAssassin."
 msgstr "SpamAssassin వ�పయోగించి నిరర�దక సందేశమ�లన� వడపోయ�న�."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-#| msgid "SpamAssassin junk plugin"
 msgid "SpamAssassin Junk Filter"
 msgstr "SpamAssassin నిరర�ధక వడపోత"
 
@@ -18872,139 +19435,125 @@ msgstr "SpamAssassin �చ�చికాల�"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:160
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:356
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Description List"
 msgstr "వివరణ జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Categories List"
 msgstr "వర�గమ�ల జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Comment List"
 msgstr "వ�యాఖ�యానం జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Contact List"
 msgstr "పరిచయమ�ల జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Start"
 msgstr "ప�రారంభమౌత�ంది"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "End"
 msgstr "మ�గ�స�త�ంది"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "శాతం పూర�తైంది"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Attendees List"
 msgstr "హాజరైనవారి జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Modified"
 msgstr "సవరించబడింది"
 
-#: ../plugins/save-calendar/csv-format.c:523
-#| msgid "Advanced options for the CSV format"
+#: ../plugins/save-calendar/csv-format.c:530
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV ఫార�మాట� కొరక� అధ�నాతన �చ�చికల� (_d)"
 
-#: ../plugins/save-calendar/csv-format.c:530
-#| msgid "Prepend a header"
+#: ../plugins/save-calendar/csv-format.c:537
 msgid "Prepend a _header"
 msgstr "పీఠికన� మ�ంద� చేర�చ� (_h)"
 
-#: ../plugins/save-calendar/csv-format.c:539
-#| msgid "Value delimiter:"
+#: ../plugins/save-calendar/csv-format.c:546
 msgid "_Value delimiter:"
 msgstr "విల�వ నిర�ధారకి (_V):"
 
-#: ../plugins/save-calendar/csv-format.c:546
-#| msgid "Record delimiter:"
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "_Record delimiter:"
 msgstr "రికార�డ�  నిర�దారకి (_R):"
 
-#: ../plugins/save-calendar/csv-format.c:553
-#| msgid "Encapsulate values with:"
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "_Encapsulate values with:"
 msgstr "విల�వలన� దీనితో చ�ట�టిఉంచ� (_E):"
 
-#: ../plugins/save-calendar/csv-format.c:575
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "కామా తో విభజించిన విల�వ రూపం (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:162
+msgid "iCalendar format (.ics)"
+msgstr "�క�యాలెండర� రూపం(.ics)"
+
 #: ../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."
 msgid "Save a calendar or task list to disk."
 msgstr "డిస�క�నక� కాలెండర�‌న� లేదా కర�తవ�య జాబితాన� దాయ�మ�."
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-msgid "_Save to Disk"
-msgstr "డిస�క�క� దాస�త�ంది(_S)"
-
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:150
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:372
+#: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
 msgstr "RDF రూపం (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:104
-#| msgid "Format"
+#: ../plugins/save-calendar/save-calendar.c:111
 msgid "_Format:"
 msgstr "ఫార�మాట� (_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:172
 msgid "Select destination file"
 msgstr "గమ�య దస�త�రాన�ని ఎంపికచేయ�మ�"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-#| msgid "Selects a single calendar or task source for viewing."
-msgid "Quickly select a single calendar or task list for viewing."
-msgstr "దర�శించ�టక� ఒక క�యాలెండర�‌న� కాని లేక కర�తవ�య జాబితాన� కాని త�వరగా ఎంపికచేస�కొనండి."
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-#| msgid "Select one source"
-msgid "Select One Source"
-msgstr "ఒక మూలాన�ని ఎంపికచేయ�మ�"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "Show _only this Calendar"
-msgstr "ఈ క�యాలెండర� మాత�రమే చూప�మ�(_o)"
+#: ../plugins/save-calendar/save-calendar.c:325
+#, fuzzy
+msgid "Save the selected calendar to disk"
+msgstr "ఎంచ�క�న�న సందేశాలన� పాఠ�య దస�త�రమ�గా దాయ�మ�"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "Show _only this Memo List"
-msgstr "ఈ మెమో జాబితా మాత�రమే చూప�మ�(_o)"
+#: ../plugins/save-calendar/save-calendar.c:356
+#, fuzzy
+msgid "Save the selected memo list to disk"
+msgstr "ఎంచ�క�న�న సందేశాలన� పాఠ�య దస�త�రమ�గా దాయ�మ�"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
-msgid "Show _only this Task List"
-msgstr "ఈ కర�తవ�య జాబితా మాత�రమే చూప�మ�(_o)"
+#: ../plugins/save-calendar/save-calendar.c:387
+#, fuzzy
+msgid "Save the selected task list to disk"
+msgstr "డిస�క�నక� కాలెండర�‌న� లేదా కర�తవ�య జాబితాన� దాయ�మ�."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -19014,15 +19563,15 @@ msgstr "మీ à°ªà±�రాధమిక ఖాతా అమరà±�à°ªà±�à°•à±� à°
 msgid "Setup Assistant"
 msgstr "అమర�ప� సహాయక�డ�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:110
 msgid "Evolution Setup Assistant"
 msgstr "ఎవాల�యూషన� అమర�ప� సహాయకి"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Welcome"
 msgstr "స�వాగతం"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:118
 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"
@@ -19034,34 +19583,30 @@ msgstr ""
 "\n"
 "దయచేసి \"మ�ంద�క�పంప�\" బటన� న� కొనసాగించ�టక� నొక�క�మ�. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Importing files"
-msgstr "దస�త�రాలన� దిగ�మతిచేస�తోంది"
-
-#: ../plugins/startup-wizard/startup-wizard.c:117
-#: ../shell/e-shell-importer.c:138
+#: ../plugins/startup-wizard/startup-wizard.c:153
+#: ../widgets/misc/e-import-assistant.c:385
 msgid "Please select the information that you would like to import:"
 msgstr "మీర� దిగ�మతి చేయ�టక� ఇష�టపడే సమాచారాన�ని దయచేసి ఎంచ�కొన�మ�:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:132
-#: ../shell/e-shell-importer.c:419
+#: ../plugins/startup-wizard/startup-wizard.c:168
+#: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "%s న�ండి:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:203
-#: ../shell/e-shell-importer.c:548
-#, c-format
+#: ../plugins/startup-wizard/startup-wizard.c:185
+msgid "Importing files"
+msgstr "దస�త�రాలన� దిగ�మతిచేస�తోంది"
+
+#: ../plugins/startup-wizard/startup-wizard.c:248
 msgid "Importing data."
 msgstr "డాటాన� దిగ�మతిచేస�తోంది."
 
-#: ../plugins/startup-wizard/startup-wizard.c:205
-#: ../shell/e-shell-importer.c:562
+#: ../plugins/startup-wizard/startup-wizard.c:250
 msgid "Please wait"
 msgstr "దయచేసి వేచిఉండండి"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-#| msgid "Thread messages by subject"
 msgid "Sort mail message threads by subject."
 msgstr "సంగతి ద�వారా మెయిల� సందేశ తంత�లన� క�రమపరచ�మ�."
 
@@ -19084,33 +19629,32 @@ msgid ""
 "message body."
 msgstr "సందేశం బాడీనంద� ప�రతిక�షేపించ�టక� టెంప�లేట�స�� ప�లగ�ఇన� కొరక� కీబోర�డ��/విల�వ జో�డీల జాబితా."
 
-#: ../plugins/templates/templates.c:601
-msgid "No title"
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "డ�రాఫ�ట�స�� ఆధారిత మాదిరి ప�లగ�ఇన�"
+
+#: ../plugins/templates/templates.c:617
+#, fuzzy
+msgid "No Title"
 msgstr "శీర�షిక లేద�"
 
-#: ../plugins/templates/templates.c:709
+#: ../plugins/templates/templates.c:688
 msgid "Save as _Template"
 msgstr "మాదిరిలా దాయ�మ� (_T)"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:690
 msgid "Save as Template"
 msgstr "మాదిరిలా దాయ�మ�"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "డ�రాఫ�ట�స�� ఆధారిత మాదిరి ప�లగ�ఇన�"
-
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
 msgstr "Microsoft అవ�ట�‌ల�క�‌ న�ండి TNEF(winmail.dat) అన�భందాలన� డీకోడ� చేయ�మ�."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-#| msgid "TNEF Attachment decoder"
 msgid "TNEF Decoder"
 msgstr "TNEF డీకోడర�"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
-#| msgid "Multiple vCards"
 msgid "Inline vCards"
 msgstr "ఇన�‌లైన� vకార�డ�ల�"
 
@@ -19118,37 +19662,31 @@ msgstr "ఇన�‌లైన� vకార�డ�ల�"
 msgid "Show vCards directly in mail messages."
 msgstr "మెయిల� సందేశమ�లనంద� vకార�డ�లన� నేర�గా చూప�మ�."
 
-#: ../plugins/vcard-inline/vcard-inline.c:159
-#: ../plugins/vcard-inline/vcard-inline.c:243
+#: ../plugins/vcard-inline/vcard-inline.c:160
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "Show Full vCard"
 msgstr "పూర�తి Vకార�డ� చూపించ�మ�"
 
-#: ../plugins/vcard-inline/vcard-inline.c:162
+#: ../plugins/vcard-inline/vcard-inline.c:163
 msgid "Show Compact vCard"
 msgstr "సూక�ష�మ Vకార�డ� చూపించ�మ�"
 
-#: ../plugins/vcard-inline/vcard-inline.c:222
-#| msgid "There is one other contact."
-#| msgid_plural "There are %d other contacts."
+#: ../plugins/vcard-inline/vcard-inline.c:224
 msgid "There is one other contact."
 msgstr "అక�కడ యింకో పరిచయ చిర�నామావ�ంది."
 
-#: ../plugins/vcard-inline/vcard-inline.c:231
+#: ../plugins/vcard-inline/vcard-inline.c:233
 #, c-format
-#| msgid "There is one other contact."
-#| msgid_plural "There are %d other contacts."
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "అక�కడ %d పరిచయ చిర�నామాఉంది."
 msgstr[1] "అక�కడ %d పరిచయ చిర�నామాల� ఉన�నాయి."
 
-#: ../plugins/vcard-inline/vcard-inline.c:252
-#| msgid "Save in address book"
+#: ../plugins/vcard-inline/vcard-inline.c:254
 msgid "Save in Address Book"
 msgstr "చిర�నామా ప�స�తకం లో దాచ�మ�"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-#| msgid "WebDAV contacts"
 msgid "Add WebDAV contacts to Evolution."
 msgstr "WebDAV పరిచయాలన� ఎవాల�యూషన�‌క� జతచేయ�మ�."
 
@@ -19160,30 +19698,14 @@ msgstr "WebDAV పరిచయాల�"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "IfMatch తప�పించ�మ� ( apache < 2.2.8 నంద� అవసరం) (_A)"
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "ఎవాల�యూషన� షెల�"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "ఎవాల�యూషన� షెల� ఆకృతీకరణ ఫాక�టరీ"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "ఎవాల�యూషన� పరిశీలన"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "ఎవాల�యాషన� పరిశీలన మూలకం"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
 msgstr "ప�రోక�సీ సేవిక అన�సంధానమ�లన� దృవీకరించ�మ�"
@@ -19201,42 +19723,63 @@ msgid "Default sidebar width"
 msgstr "ప�రక�కపట�టీ యొక�క అప�రమేయ వెడల�ప�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
+#, fuzzy
+msgid "Default window X coordinate"
+msgstr "అప�రమేయ విండో స�థితి"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+#, fuzzy
+msgid "Default window Y coordinate"
+msgstr "అప�రమేయ విండో స�థితి"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "అప�రమేయ విండో ఎత�త�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
 msgstr "అప�రమేయ విండో స�థితి"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
 msgstr "అప�రమేయ విండో వెడల�ప�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr "ఇంటర�నెట�‌నంద� HTTP/Secure HTTPన� వాడ�కొన�చ�న�నప�ప�డ� ప�రోక�సీ అమరికలన� చేతనం చేస�త�ంది."
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+#, fuzzy
+msgid "Enable express mode"
+msgstr "శోధన సంచయాలన� చేతనం చేయ�మ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"ఇంటర�నెట�‌నంద� HTTP/Secure HTTPన� వాడ�కొన�చ�న�నప�ప�డ� ప�రోక�సీ అమరికలన� చేతనం చేస�త�ంది."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
 msgstr "HTTP ప�రోక�సీ హోస�ట�� నామమ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
 msgstr "HTTP ప�రోక�సీ సంకేతపదమ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "HTTP proxy port"
 msgstr "HTTP ప�రోక�సీ పోర�ట��"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "HTTP proxy username"
 msgstr "HTTP ప�రోక�సీ వినియోగదారినామమ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "కాంపోనెంట� యొక�క ID లేదా మరియొకనామమ� ప�రారంభంనంద� అప�రమేయంగా చూపించబడాలి."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -19248,64 +19791,63 @@ msgstr ""
 "సంకేతపదమ� gnome-keyring న�ండిగాని లేదా ~/.gnome2_private/Evolution సంకేతపదమ� "
 "దస�త�రమ�న�ండిగాని తీస�కోబడ�త�ంది."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
-#| msgid "Insert Attachment"
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
 msgstr "ప�రాధమిక అన�భంద దర�శనం"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
-#| msgid "Install the shared folder"
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Initial file chooser folder"
 msgstr "ప�రాధమిక దస�త�ర యెంపికదారి ఫోల�డర�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser డైలాగ�ల కొరక� ప�రాధమిక ఫోల�డర�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
 msgstr "అన�భంద పట�టీ విడ�జట�ల కొరక� ప�రాధమిక దర�శనం. \"0\" ప�రతిమ దర�శనం, \"1\" జాబితా దర�శనం."
 
 #
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "చివరిగా నవీకరించబడిన ఆకృతీకరణ వర�షన�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ఆఫ�‌లైన� ఉపయోగం కొరక� డిస�క� క� �కకాలం చేయబడ� సంచయాల కొరక� పాత� ల జాబితా"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
 msgstr "ప�రోక�సీ-కాని హోస�ట�స��"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "HTTP ప�రోక�సీంగ� చేస�త�న�నప�ప�డ� ధృవీకరణ ‌వ�త�తీర�ణతక� సంకేతపదమ�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Proxy configuration mode"
 msgstr "ప�రోక�సీ ఆకృతీకరణ రీతి"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
 msgstr "SOCKS ప�రోక�సీ హోస�ట�� నామమ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
 msgstr "SOCKS ప�రోక�సీ పోర�ట��"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
 msgstr "స�రక�షిత HTTP ప�రోక�సీ హోస�ట�� నామమ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
 msgstr "స�రక�షిత HTTP ప�రోక�సీ పోర�ట��"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19316,59 +19858,70 @@ msgstr ""
 "\"సిస�టమ� అమరికలన� వ�పయోగించ�మ�\", \"ప�రోక�సీ లేద�\", \"మానవీయ ప�రోక�సీ ఆకృతీకరణన� వ�పయోగించ�మ�"
 "\" మరియ� \"autoconfig urlనంద� యివ�వబడిన ప�రోక�సీ ఆకృతీకరణన� వ�పయోగించ�మ�\" ప�రస�ప�టంచేస�తాయి."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
 msgstr "ప�రక�కపట�టి దర�శితం అవ�త�ంది"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Skip development warning dialog"
 msgstr "అభివృద�ది హెచ�చరిక డైలాగ� న� వదిలివేస�త�ంది"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
 msgid "Start in offline mode"
 msgstr "ఆఫ�‌లైన� రీతినంద� ప�రారంభించ�మ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
 msgstr "స�థితిపట�టీ దర�శితమౌతోంది"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "ఎవాల�యూషన� యొక�క ఆకృతీకరణ వర�షన�, పెద�ద/చిన�న/ఆకృతీకరణ స�థాయి తో (ఉదాహరణ క� \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+#, fuzzy
+msgid "The default X coordinate for the main window."
+msgstr "మ�ఖ�య విండో కొరక� అప�రమేయ వెడల�ప�, పిగ�జెల�స� నంద�."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+#, fuzzy
+msgid "The default Y coordinate for the main window."
+msgstr "మ�ఖ�య విండో కొరక� అప�రమేయ వెడల�ప�, పిగ�జెల�స� నంద�."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
 msgstr "మ�ఖ�య విండో కొరక� అప�రమేయ ఎత�త�, పిగ�జెల�స�నంద�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The default width for the main window, in pixels."
 msgstr "మ�ఖ�య విండో కొరక� అప�రమేయ వెడల�ప�, పిగ�జెల�స� నంద�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The default width for the sidebar, in pixels."
 msgstr "ప�రక�కపట�టీ కొరక� అప�రమేయ వెడల�ప�, పిగ�జెల�స� నంద�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
-msgstr "చివిరగా నవీకరించిన ఎవాల�యూషన� యొక�క ఆకృతీకరణ, పెద�ద/చిన�న/ఆకృతీకరణ స�థాయి తో (ఉదాహరణక� \"2.6.0\")."
+msgstr ""
+"చివిరగా నవీకరించిన ఎవాల�యూషన� యొక�క ఆకృతీకరణ, పెద�ద/చిన�న/ఆకృతీకరణ స�థాయి తో (ఉదాహరణక� \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
 msgstr "HTTP ప�రోక�సీ చేయ�టక� మిషన� నామమ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The machine name to proxy secure HTTP through."
 msgstr "స�రక�షిక HTTP ప�రోక�సీ చేయ�టక� మిషన� నామమ�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "The machine name to proxy socks through."
 msgstr "socks ప�రోక�సీ చేయ�టక� మిషన� నామమ�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -19376,7 +19929,7 @@ msgstr ""
 "మీర� ప�రోక�సీ చేయ� \"/apps/evolution/shell/network_config/http_host\" చేత నిర�వచించబడిన "
 "మిషన�‌నందలి పోర�ట��."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -19384,7 +19937,7 @@ msgstr ""
 "మీర� ప�రోక�సీ చేయ�  \"/apps/evolution/shell/network_config/secure_host\" చేత "
 "నిర�వచించబడిన మిషన�‌నందలి పోర�ట��."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -19392,7 +19945,7 @@ msgstr ""
 "మీర� ప�రోక�సీ చేయ� \"/apps/evolution/shell/network_config/socks_host\" చేత "
 "నిర�వచించబడిన మిషన�‌నందలి పోర�ట��."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19401,7 +19954,7 @@ msgstr ""
 "విండో బటన�స� యొక�క శైలి. అవి \"text\", \"icons\", \"both\", \"toolbar\" కావచ�చ�. ఒకవేళ "
 "\"toolbar\" అమర�చితే, బటన�స� యొక�క శైలి GNOME సాధనమ�లపట�టీ అమరికల ద�వారా నిర�ణయించబడ�త�ంది."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19413,284 +19966,675 @@ msgstr ""
 "చిర�నామాల� (IPv4 మరియ� IPv6) కావచ�చ� మరియ� నెట�‌మాస�క�� (192.168.0.0/24 లాంటి) వాటితో నెట�‌వర�క�� "
 "చిర�నామాల� కావచ�చ�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
 msgstr "సాధనమ�లపట�టీ దర�శితం అవ�తోంది"
 
 #
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "URL that provides proxy configuration values."
 msgstr "ప�రోక�సీ ఆకృతీకరణ విల�వలన� అందించ� URL."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Use HTTP proxy"
 msgstr "HTTP ప�రోక�సీ వ�పయోగించ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "HTTP ప�రోక�సీంగ� చేస�త�న�నప�ప�డ� ధృవీకరణ వ�త�తీర�ణమ�కొరక� వినియోగదారినామమ�."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "ఆన�‌లైన� రీతి కి బద�ల�గా ఎవాల�యూషన� ఆఫ�‌లైన� రీతినంద� ప�రారంభించబడాలా."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
 msgstr "విండో పెద�దదిగా ఉండ�ట జరగాలా వద�దా."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the sidebar should be visible."
 msgstr "ప�రక�కపట�టీ దర�శితం కావాలా వద�దా."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Whether the status bar should be visible."
 msgstr "స�థితిపట�టీ తప�పక ప�రదర�శిత మవ�వాలా వద�దా."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the toolbar should be visible."
 msgstr "సాధనమ�ల పట�టీ ప�రదర�శితమవ�వాలా వద�దా."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.h:61
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ఎవాల�యూషన� యొక�క అభివృద�దీకరణ వర�షన� లంద� హెచ�చరిక డైలాగ� వదిలేయాలా వద�దా."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
 msgstr "విండోబటన�స� దర�శితమవ�వాలా వద�దా."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:63
 msgid "Window button style"
 msgstr "గవాక�ష బొత�తమ� శైలి"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:64
 msgid "Window buttons are visible"
 msgstr "గవాక�ష బొత�తమ�ల� కనబడ�త�న�నాయి"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>క�రియాశీలమైన బంధాల�</b>"
+#: ../shell/e-shell-content.c:561 ../shell/e-shell-content.c:562
+msgid "Searches"
+msgstr "శోధనల�"
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "క�రియాశీలమైన బంధాల�"
+#: ../shell/e-shell-content.c:603
+msgid "Save Search"
+msgstr "వెతికిన దానిని దాచ�మ�"
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "ఈ బంధాలన� మూసి లైన�బయటక� వెళ�ళడానికి సరే బొత�తాన�ని నొక�క�మ�"
+#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
 
-#: ../shell/e-shell-importer.c:128
-msgid "Choose the type of importer to run:"
-msgstr "నడ�చ�టక� దిగ�మతిచేయ� రకాన�ని ఎంచ�కొన�మ�:"
+#. Translators: The "Show:" label precedes a combo box that
+#. * allows the user to filter the current view.  Examples of
+#. * items that appear in the combo box are "Unread Messages",
+#. * "Important Messages", or "Active Appointments".
+#: ../shell/e-shell-searchbar.c:893
+#, fuzzy
+msgid "Sho_w:"
+msgstr "చూప�మ�:"
 
-#: ../shell/e-shell-importer.c:131
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:920
+#, fuzzy
+msgid "Sear_ch:"
+msgstr "శోధించ�(_c): "
+
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:980
+#, fuzzy
+msgid "i_n"
+msgstr "లోపల(_n)"
+
+#: ../shell/e-shell-switcher.c:463
+#, fuzzy
+msgid "Toolbar Style"
+msgstr "పనిమ�ట�ల పట�టీ శైలి (_b)"
+
+#: ../shell/e-shell-switcher.c:464
+msgid "The switcher's toolbar style"
 msgstr ""
-"ఎవాల�యూషన� క� దిగ�మతి చేయాలన�క�ంట�న�న దస�త�రాన�ని ఎంచ�కొన�మ�, మరియ� జాబితాన�ండి � రకమైన దస�త�రమో "
-"ఎంచ�కొన�మ�."
 
-#: ../shell/e-shell-importer.c:135
-msgid "Choose the destination for this import"
-msgstr "ఈ దిగ�మతికి గమ�యాన�ని ఎంచ�కొన�మ�"
+#: ../shell/e-shell-switcher.c:480 ../shell/e-shell-window.c:751
+#, fuzzy
+msgid "Toolbar Visible"
+msgstr "సాధనమ�లపట�టీ దర�శితం అవ�తోంది"
 
-#: ../shell/e-shell-importer.c:141
-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"
+#: ../shell/e-shell-switcher.c:481
+#, fuzzy
+msgid "Whether the switcher is visible"
+msgstr "ప�రక�కపట�టీ దర�శితం కావాలా వద�దా."
+
+#: ../shell/e-shell-utils.c:253
+#, fuzzy
+msgid "vCard (.vcf)"
+msgstr "vకార�డ�� (.vcf, .gcrd)"
+
+#: ../shell/e-shell-utils.c:255
+#, fuzzy
+msgid "iCalendar (.ics)"
+msgstr "�క�యాలెండర� దస�త�రంల� (.ics)"
+
+#: ../shell/e-shell-utils.c:276
+#, fuzzy
+msgid "All Files (*)"
+msgstr "అన�ని దస�త�రాల�"
+
+#: ../shell/e-shell-view.c:684
+#, fuzzy
+msgid "Switcher Action"
+msgstr "%s క� మార�మ�"
+
+#: ../shell/e-shell-view.c:685
+msgid "The switcher action for this shell view"
 msgstr ""
-"ఈ క�రింది అన�వర�తనంల న�ండి దిగ�మతి చేయ�టక� ఎవాల�యూషన� అమరికల కొరక�\n"
-"పరిశీలిస�తోంది: పైన�,నెట�‌స�కేప�,ఈఎల�ఎమ�,�క�యాలెండర�. � దిగ�మతికారక\n"
-"అమరికల� కనబడలేద�. మీర� మరలా ప�రయత�నించ�టక�\n"
-"ఇష�టపడితే, దయచేసి \"వెన�కక�\" బటన� న� నొక�కండి.\n"
 
-#: ../shell/e-shell-importer.c:295
-msgid "F_ilename:"
-msgstr "దస�త�రనామమ�(_i):"
+#: ../shell/e-shell-view.c:700
+#, fuzzy
+msgid "Page Number"
+msgstr "వర�సలో ఉన�న సంఖ�య"
 
-#: ../shell/e-shell-importer.c:300
-msgid "Select a file"
-msgstr "ఒక దస�త�రాన�ని ఎంచ�కొన�మ�"
+#: ../shell/e-shell-view.c:701
+msgid "The notebook page number of the shell view"
+msgstr ""
 
-#: ../shell/e-shell-importer.c:309
-msgid "File _type:"
-msgstr "దస�త�రం రకం(_t):"
+#: ../shell/e-shell-view.c:717
+#, fuzzy
+msgid "Search Rule"
+msgstr "శోధన వడపోత"
 
-#: ../shell/e-shell-importer.c:357
-msgid "Import data and settings from _older programs"
-msgstr "పాత కార�యక�రమాలన�ండి దత�తాంశాన�ని మరియ� అమరికలన� దిగ�మతి చేయ�మ�"
+#: ../shell/e-shell-view.c:718
+msgid "Criteria for the current search results"
+msgstr ""
 
-#: ../shell/e-shell-importer.c:360
-msgid "Import a _single file"
-msgstr "ఒకేఒక దస�త�రాన�ని దిగ�మతిచేయ�(_s)"
+#: ../shell/e-shell-view.c:733
+msgid "The EShellBackend for this shell view"
+msgstr ""
 
-#: ../shell/e-shell-importer.c:743
-msgid "_Import"
-msgstr "మ�ఖ�యమైన(_I)"
+#: ../shell/e-shell-view.c:748
+msgid "Shell Content Widget"
+msgstr ""
 
-#: ../shell/e-shell-settings-dialog.c:312
-msgid "Evolution Preferences"
-msgstr "ఎవల�యూషన� అభీష�టాల�"
+#: ../shell/e-shell-view.c:749
+msgid "The content widget appears in a shell window's right pane"
+msgstr ""
 
-#. To translators: This is the window title and %s is the
-#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
-#, c-format
-msgid "%s - Evolution"
-msgstr "%s - ఎవాల�యూషన�"
+#: ../shell/e-shell-view.c:765
+#, fuzzy
+msgid "Shell Sidebar Widget"
+msgstr "ప�రక�కపట�టీ యొక�క అప�రమేయ వెడల�ప�"
 
-#: ../shell/e-shell-window-commands.c:69
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "గ�నోమ� చ�క�కానిల పనిమ�ట�ల� ఈ వ�యవస�థలో ప�రతిష�టించినట�ల� కన�బడ�టలేద�."
+#: ../shell/e-shell-view.c:766
+msgid "The sidebar widget appears in a shell window's left pane"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:78
-#, c-format
-#| msgid "Error executing %s."
-msgid "Error executing %s. (%s)"
-msgstr "%s నిర�వర�తించ�టలో దోషమ�. (%s)"
+#: ../shell/e-shell-view.c:781
+msgid "Shell Taskbar Widget"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:135
-msgid "Bug buddy is not installed."
-msgstr "బగ� బడ�డీ ప�రతిష�టించిలేద�"
+#: ../shell/e-shell-view.c:782
+msgid "The taskbar widget appears at the bottom of a shell window"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:138
-msgid "Bug buddy could not be run."
-msgstr "బగ� బడ�డీ నడవడం క�దరద�"
+#: ../shell/e-shell-view.c:797
+#, fuzzy
+msgid "Shell Window"
+msgstr "కొత�త గవాక�షం(_W)"
+
+#: ../shell/e-shell-view.c:798
+msgid "The window to which the shell view belongs"
+msgstr ""
+
+#: ../shell/e-shell-view.c:814
+msgid "The key file holding widget state data"
+msgstr ""
+
+#: ../shell/e-shell-view.c:829
+msgid "The title of the shell view"
+msgstr ""
+
+#: ../shell/e-shell-view.c:843
+#, fuzzy
+msgid "Current View ID"
+msgstr "ప�రస�త�త దర�శనం(_C)"
+
+#: ../shell/e-shell-view.c:844
+#, fuzzy
+msgid "The current GAL view ID"
+msgstr "ప�రస�త�త మలచిన దర�శనమ�న� దాయ�మ�"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:938
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr "అన�వాదకర�త పరపత�ల�"
 
-#: ../shell/e-shell-window-commands.c:949
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "ఎవల�యూషన� వెబ�‌సైట�"
 
-#: ../shell/e-shell-window-commands.c:1163
-msgid "_Work Online"
-msgstr "లైన�లో పనిచేయ�మ�(_W)"
+#: ../shell/e-shell-window-actions.c:1224
+#, fuzzy
+msgid "Bug Buddy is not installed."
+msgstr "బగ� బడ�డీ ప�రతిష�టించిలేద�"
 
-#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-actions.c:1226
+#, fuzzy
+msgid "Bug Buddy could not be run."
+msgstr "బగ� బడ�డీ నడవడం క�దరద�"
+
+#: ../shell/e-shell-window-actions.c:1343
+#, fuzzy
+msgid "GNOME Pilot is not installed."
+msgstr "బగ� బడ�డీ ప�రతిష�టించిలేద�"
+
+#: ../shell/e-shell-window-actions.c:1345
+#, fuzzy
+msgid "GNOME Pilot could not be run."
+msgstr "బగ� బడ�డీ నడవడం క�దరద�"
+
+#: ../shell/e-shell-window-actions.c:1439
+msgid "Show information about Evolution"
+msgstr "ఎవల�యూషన� గ�రించి సమాచారం చూప�మ�"
+
+#: ../shell/e-shell-window-actions.c:1444
+msgid "_Close Window"
+msgstr "గవాక�షమ�న� మూయ�మ�(_C)"
+
+#: ../shell/e-shell-window-actions.c:1451
+#, fuzzy
+msgid "_Contents"
+msgstr "నియామకాల� (_p)"
+
+#: ../shell/e-shell-window-actions.c:1453
+#, fuzzy
+msgid "Open the Evolution User Guide"
+msgstr "వేరే వినియోగదార�ల సంచయాలన� తెర�వ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1479
+msgid "Evolution _FAQ"
+msgstr "ఎవల�యూషన� _FAQ"
+
+#: ../shell/e-shell-window-actions.c:1481
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "తర�చూ అడ�గ� ప�రశ�నల� వెబ�‌ప�టన� తెర�వ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1486
+msgid "_Forget Passwords"
+msgstr "రహస�య పదమ�లన� మర�చిపోండి(_F)"
+
+#: ../shell/e-shell-window-actions.c:1488
+#, fuzzy
+msgid "Forget all remembered passwords"
+msgstr "మీర� గ�ర�త�ంచ�క�న�న అన�ని సంకేతపదాలన� ఖచ�చితంగా మర�చిపోవాలన�క�ంట�న�నారా?"
+
+#: ../shell/e-shell-window-actions.c:1493
+msgid "I_mport..."
+msgstr "దిగ�మతి(_m)..."
+
+#: ../shell/e-shell-window-actions.c:1495
+msgid "Import data from other programs"
+msgstr "ఇతర కార�యక�రమాలన�ండి దత�తాంశాన�ని దిగ�మతిచేయ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1500
+msgid "New _Window"
+msgstr "కొత�త గవాక�షం(_W)"
+
+#: ../shell/e-shell-window-actions.c:1502
+#, fuzzy
+msgid "Create a new window displaying this view"
+msgstr "ఈ సంచయాన�ని ప�రదర�శిస�త� కొత�త గవాక�షాన�ని సృష�టించ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1516
+#, fuzzy
+msgid "Configure Evolution"
+msgstr "ఆకృతీకరణ"
+
+#: ../shell/e-shell-window-actions.c:1521
+msgid "_Quick Reference"
+msgstr "చ�ర�కైన నివేదన(_Q)"
+
+#: ../shell/e-shell-window-actions.c:1523
+#, fuzzy
+msgid "Show Evolution's shortcut keys"
+msgstr "ఎవల�యూషన� యొక�క అమరికలన� మార�చ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1530
+msgid "Exit the program"
+msgstr "కార�యక�రమం న�ండి బయటక� రమ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1535
+msgid "_Advanced Search..."
+msgstr "అద�నాతన శోధన(_A)..."
+
+#: ../shell/e-shell-window-actions.c:1537
+msgid "Construct a more advanced search"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1544
+#, fuzzy
+msgid "Clear the current search parameters"
+msgstr "శోధనన� శ�భ�రపరచ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1549
+msgid "_Edit Saved Searches..."
+msgstr "దాచిన వెత�క�ఫలితాలన� సరిచేయ�(_E)..."
+
+#: ../shell/e-shell-window-actions.c:1551
+#, fuzzy
+msgid "Manage your saved searches"
+msgstr "మీ ఈమెయిల� న� నిర�వహించ�మ�, పరిచయాల� మరియ� ప�రణాళిక"
+
+#: ../shell/e-shell-window-actions.c:1558
+msgid "Click here to change the search type"
+msgstr "శోధన రకాన�ని మార�చ�టక� ఇక�కడ నొక�కండి"
+
+#: ../shell/e-shell-window-actions.c:1563
+msgid "_Find Now"
+msgstr "ఇప�ప�డ� కన�గొన�మ�(_F)"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1565
+#, fuzzy
+msgid "Execute the current search parameters"
+msgstr "ప�రస�త�త మెయిల�  కార�యమ�న� రద�ద�చేయ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1570
+msgid "_Save Search..."
+msgstr "వెత�క�న� దాయ�మ�(_S)..."
+
+#: ../shell/e-shell-window-actions.c:1572
+#, fuzzy
+msgid "Save the current search parameters"
+msgstr "ప�రస�త�త దస�త�రాన�ని దాయ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1584
+msgid "Send / _Receive"
+msgstr "పంప�మ�/తీస�కొన�మ�(_R)"
+
+#: ../shell/e-shell-window-actions.c:1586
+msgid "Send queued items and retrieve new items"
+msgstr "వర�సపర�చిన అంశాలన� పంప� మరియ� కొత�త అంశాలన� వెలికితీయ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1591
+#, fuzzy
+msgid "Submit _Bug Report..."
+msgstr "బగ� నివేదిక న� పంప�మ�(_B)"
+
+#: ../shell/e-shell-window-actions.c:1593
+msgid "Submit a bug report using Bug Buddy"
+msgstr "బగ� బడ�డీతో బగ� నివేదికన� పంప�మ�"
+
+#: ../shell/e-shell-window-actions.c:1598
+#, fuzzy
+msgid "GNOME Pilot _Synchronization..."
+msgstr "iPod కాలనియమత"
+
+#: ../shell/e-shell-window-actions.c:1600
+#, fuzzy
+msgid "Set up GNOME Pilot configuration"
+msgstr "చ�క�కాని రూపకరణన� అమర�చ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1605
 msgid "_Work Offline"
 msgstr "లైన�వెల�పల పనిచేయ�మ�(_W)"
 
-#: ../shell/e-shell-window-commands.c:1189
-msgid "Work Offline"
-msgstr "లైన�వెల�పల పనిచేయ�మ�"
+#: ../shell/e-shell-window-actions.c:1607
+#, fuzzy
+msgid "Put Evolution into offline mode"
+msgstr "ఆఫ�‌లైన� రీతినంద� ప�రారంభించ�మ�"
 
-#: ../shell/e-shell-window.c:372
-msgid ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
-msgstr ""
-"ఎవల�యూషన� ప�రస�త�తం ఆన�‌లైన�లో వ�ంది.\n"
-"ఆఫ�‌లైన�‌గా పనిచేయ�టక� ఈబటన�‌పై నొక�క�మ�."
+#: ../shell/e-shell-window-actions.c:1612
+msgid "_Work Online"
+msgstr "లైన�లో పనిచేయ�మ�(_W)"
 
-#: ../shell/e-shell-window.c:379
-msgid "Evolution is in the process of going offline."
-msgstr "లైన� బయటక� వెళ�ళే క�రమంలో ఎవల�యూషన� ఉన�నది"
+#: ../shell/e-shell-window-actions.c:1614
+#, fuzzy
+msgid "Put Evolution into online mode"
+msgstr "లైన�లోపలి సంవిధానంలో ప�రారంభించ�"
 
-#: ../shell/e-shell-window.c:386
-msgid ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
-msgstr ""
-"ఎవల�యూషన� ప�రస�త�తం ఆఫ�‌లైన�లో వ�ంది.\n"
-"ఆన�‌లైన�లో పనిచేయడానికి ఈ బొత�తమ�న� నొక�కండి."
+#: ../shell/e-shell-window-actions.c:1642
+msgid "Lay_out"
+msgstr "కూర�ప�(_o)"
+
+#: ../shell/e-shell-window-actions.c:1649
+msgid "_New"
+msgstr "కొత�త(_N)"
+
+#: ../shell/e-shell-window-actions.c:1656
+msgid "_Search"
+msgstr "వెత�క�(_S)"
+
+#: ../shell/e-shell-window-actions.c:1663
+msgid "_Switcher Appearance"
+msgstr "స�విచ�చర� కనిపించ�విదం(_S)"
+
+#: ../shell/e-shell-window-actions.c:1677
+msgid "_Window"
+msgstr "గవాక�షమ�(_W)"
+
+#: ../shell/e-shell-window-actions.c:1706
+msgid "Show Side _Bar"
+msgstr "ప�రక�కపట�టీని చూప�మ�(_B)"
+
+#: ../shell/e-shell-window-actions.c:1708
+#, fuzzy
+msgid "Show the side bar"
+msgstr "ప�రక�కపట�టీని చూప�మ�(_B)"
+
+#: ../shell/e-shell-window-actions.c:1714
+#, fuzzy
+msgid "Show _Buttons"
+msgstr "యానిమేషన�లన� చూప�మ�"
+
+#: ../shell/e-shell-window-actions.c:1716
+#, fuzzy
+msgid "Show the switcher buttons"
+msgstr "రెండవ సమయ క�షేత�రాన�ని చూప�మ�"
+
+#: ../shell/e-shell-window-actions.c:1722
+msgid "Show _Status Bar"
+msgstr "స�స�థిత పట�టీ ని చూప�మ�(_S)"
+
+#: ../shell/e-shell-window-actions.c:1724
+#, fuzzy
+msgid "Show the status bar"
+msgstr "స�స�థిత పట�టీ ని చూప�మ�(_S)"
+
+#: ../shell/e-shell-window-actions.c:1730
+#, fuzzy
+msgid "Show _Tool Bar"
+msgstr "పనిమ�ట�లపట�టా ని చూప�మ�(_T)"
+
+#: ../shell/e-shell-window-actions.c:1732
+#, fuzzy
+msgid "Show the tool bar"
+msgstr "పనిమ�ట�లపట�టా ని చూప�మ�(_T)"
+
+#: ../shell/e-shell-window-actions.c:1754
+msgid "_Icons Only"
+msgstr "ప�రతిమల� మాత�రమే (_I)"
+
+#: ../shell/e-shell-window-actions.c:1756
+msgid "Display window buttons with icons only"
+msgstr "చిత�రాలతో ఉన�న గవాక�ష బొత�తమ�లన� ప�రదర�శించ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1761
+msgid "_Text Only"
+msgstr "పాఠ�యమ� మాత�రమే (_T)"
+
+#: ../shell/e-shell-window-actions.c:1763
+msgid "Display window buttons with text only"
+msgstr "పాఠ�యమ� తో ఉన�న గవాక�ష బొత�తమ�లన� ప�రదర�శించ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1768
+msgid "Icons _and Text"
+msgstr "ప�రతిమల� మరియ� పాఠ�యమ� (_a)"
+
+#: ../shell/e-shell-window-actions.c:1770
+msgid "Display window buttons with icons and text"
+msgstr "చిత�రాల� మరియ� పాఠ�యమ� తో ఉన�న గవాక�ష బొత�తమ�లన� ప�రదర�శించ�మ�"
 
-#: ../shell/e-shell-window.c:778
+#: ../shell/e-shell-window-actions.c:1775
+msgid "Tool_bar Style"
+msgstr "పనిమ�ట�ల పట�టీ శైలి (_b)"
+
+#: ../shell/e-shell-window-actions.c:1777
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "రంగస�థల పనిమ�ట�లపట�టా అమరికన� ఉపయోగించి  గవాక�ష బొత�తమ�లన� ప�రదర�శించ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1785
+msgid "Define Views..."
+msgstr "దర�శనమ�లన� నిర�వచించ�..."
+
+#: ../shell/e-shell-window-actions.c:1787
+msgid "Create or edit views"
+msgstr "దర�శనాలన� సృష�టించ� లేదా సరిచేయ�"
+
+#: ../shell/e-shell-window-actions.c:1792
+msgid "Save Custom View..."
+msgstr "మలచిన దర�శనమ�న� దాయ�మ�..."
+
+#: ../shell/e-shell-window-actions.c:1794
+msgid "Save current custom view"
+msgstr "ప�రస�త�త మలచిన దర�శనమ�న� దాయ�మ�"
+
+#: ../shell/e-shell-window-actions.c:1801
+msgid "C_urrent View"
+msgstr "ప�రస�త�త దర�శనం(_u)"
+
+#: ../shell/e-shell-window-actions.c:1811
+msgid "Custom View"
+msgstr "మలచిన దర�శనమ�"
+
+#: ../shell/e-shell-window-actions.c:1813
+msgid "Current view is a customized view"
+msgstr "ప�రస�త�త దర�శనం మలచ�కొనబడ�డ దర�శనమ�న�"
+
+#: ../shell/e-shell-window-actions.c:1823
+#, fuzzy
+msgid "Change the page settings for your current printer"
+msgstr "మీ ప�రస�త�త మ�ద�రణ యంత�రమ�క� ప�ట అమరికలన� అమర�చ�మ�"
+
+#: ../shell/e-shell-window-actions.c:2200
 #, c-format
 msgid "Switch to %s"
 msgstr "%s క� మార�మ�"
 
-#: ../shell/e-shell.c:634
-msgid "Unknown system error."
-msgstr "తెలియని సిస�టమ� దోషం."
+#: ../shell/e-shell-window-actions.c:2413
+msgid "Execute these search parameters"
+msgstr ""
 
-#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:569
 #, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+msgid "%s - Evolution"
+msgstr "%s - ఎవాల�యూషన�"
 
-#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
-msgid "OK"
-msgstr "సరే"
+#: ../shell/e-shell-window.c:378
+msgid "New"
+msgstr "కొత�త"
 
-#: ../shell/e-shell.c:1253
-msgid "Invalid arguments"
-msgstr "సరికాని ఆర�గ�మెంట�స�"
+#: ../shell/e-shell-window.c:627
+msgid "Active Shell View"
+msgstr ""
 
-#: ../shell/e-shell.c:1255
-msgid "Cannot register on OAF"
-msgstr "OAF ళో నమోద� క�దరద�"
+#: ../shell/e-shell-window.c:628
+#, fuzzy
+msgid "Name of the active shell view"
+msgstr "కొత�త దర�శనం యొక�క పేర�:"
 
-#: ../shell/e-shell.c:1257
-msgid "Configuration Database not found"
-msgstr "రూపకరణ దత�తాంశస�థానమ� కన�బడలేద�"
+#: ../shell/e-shell-window.c:643
+msgid "The shell window's EFocusTracker"
+msgstr ""
 
-#: ../shell/e-user-creatable-items-handler.c:674
-#: ../shell/e-user-creatable-items-handler.c:684
-#: ../shell/e-user-creatable-items-handler.c:689
-msgid "New"
-msgstr "కొత�త"
+#: ../shell/e-shell-window.c:657 ../shell/e-shell.c:802
+msgid "Geometry"
+msgstr ""
 
-#: ../shell/test/evolution-test-component.c:103
-msgid "New Test"
-msgstr "కొత�త పరీక�ష"
+#: ../shell/e-shell-window.c:658 ../shell/e-shell.c:803
+msgid "Initial window geometry string"
+msgstr ""
 
-#: ../shell/test/evolution-test-component.c:104
-msgctxt "New"
-msgid "_Test"
-msgstr "పరీక�ష (_T)"
+#: ../shell/e-shell-window.c:673
+#, fuzzy
+msgid "Safe Mode"
+msgstr "అక�షరరీతి(_C)"
 
-#: ../shell/test/evolution-test-component.c:105
-msgid "Create a new test item"
-msgstr "కొత�త పరీక�షా అంశాన�ని సృష�టించ�మ�"
+#: ../shell/e-shell-window.c:674
+#, fuzzy
+msgid "Whether the shell window is in safe mode"
+msgstr "ప�లగ�‌ఇన� చేతనం చేయాలా"
 
-#: ../shell/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "దస�త�రాన�ని ఎవాల�యూషన� క� దిగ�మతిచేయ�ట ప�రారభించ�టక� \"దిగ�మతి\" నొక�కండి. "
+#: ../shell/e-shell-window.c:705
+#, fuzzy
+msgid "Sidebar Visible"
+msgstr "ప�రక�కపట�టి దర�శితం అవ�త�ంది"
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "ఎవల�యూషన� దిగ�మతి సహాయక�డ�"
+#: ../shell/e-shell-window.c:706
+#, fuzzy
+msgid "Whether the shell window's side bar is visible"
+msgstr "విండోబటన�స� దర�శితమవ�వాలా వద�దా."
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "దస�త�రాన�ని దిగ�మతి చేయ�మ�"
+#: ../shell/e-shell-window.c:720
+#, fuzzy
+msgid "Switcher Visible"
+msgstr "ప�రక�కపట�టి దర�శితం అవ�త�ంది"
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "స�థానాన�ని దిగ�మతి చేయ�మ�"
+#: ../shell/e-shell-window.c:721
+#, fuzzy
+msgid "Whether the shell window's switcher buttons are visible"
+msgstr "విండోబటన�స� దర�శితమవ�వాలా వద�దా."
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "దిగ�మతిదార�ని  రకం"
+#: ../shell/e-shell-window.c:736
+#, fuzzy
+msgid "Taskbar Visible"
+msgstr "స�థితిపట�టీ దర�శితమౌతోంది"
 
-#: ../shell/import.glade.h:6
-msgid "Select Information to Import"
-msgstr "దిగ�మతిచేయ�టక� సమాచారమ�న� ఎంపికచేయ�మ�"
+#: ../shell/e-shell-window.c:737
+#, fuzzy
+msgid "Whether the shell window's task bar is visible"
+msgstr "స�థితిపట�టీ తప�పక ప�రదర�శిత మవ�వాలా వద�దా."
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "దస�త�రం న�  ఎంచ�కొన�మ�"
+#: ../shell/e-shell-window.c:752
+#, fuzzy
+msgid "Whether the shell window's tool bar is visible"
+msgstr "విండోబటన�స� దర�శితమవ�వాలా వద�దా."
 
-#: ../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."
+#: ../shell/e-shell-window.c:766
+#, fuzzy
+msgid "UI Manager"
+msgstr "అభికర�త"
+
+#: ../shell/e-shell-window.c:767
+msgid "The shell window's GtkUIManager"
 msgstr ""
-"ఎవాల�యూషన� దిగ�మతి సహాయకికి స�వాగతం.\n"
-"ఈ సహాయకి ద�వారా మీర� బహిర�గత దస�త�రాలన� ఎవాల�యూషన� క� దిగ�మతి చేయ�\n"
-"కార�యక�రమం నంద� మార�గదర�శనం చేయబడతార�."
+
+#: ../shell/e-shell.c:218
+#, fuzzy
+msgid "Preparing to go offline..."
+msgstr "లైన�వెల�పలకి '%s' ఖాతాన�ని తయార�చేస�త�ంది"
+
+#: ../shell/e-shell.c:268
+#, fuzzy
+msgid "Preparing to go online..."
+msgstr "లైన�వెల�పలకి '%s' ఖాతాన�ని తయార�చేస�త�ంది"
+
+#: ../shell/e-shell.c:336
+msgid "Preparing to quit..."
+msgstr ""
+
+#: ../shell/e-shell.c:818
+#, fuzzy
+msgid "Module Directory"
+msgstr "సంచయంన� దాయ�మ�"
+
+#: ../shell/e-shell.c:819
+msgid "The directory from which to load EModules"
+msgstr ""
+
+#: ../shell/e-shell.c:834
+#, fuzzy
+msgid "Network Available"
+msgstr "TLS లభ�యంకావడంలేద�"
+
+#: ../shell/e-shell.c:835
+#, fuzzy
+msgid "Whether the network is available"
+msgstr "ప�లగ�‌ఇన� చేతనం చేయాలా"
+
+#: ../shell/e-shell.c:850 ../widgets/misc/e-online-button.c:134
+msgid "Online"
+msgstr "ఆన�‌లైన�"
+
+#: ../shell/e-shell.c:851
+#, fuzzy
+msgid "Whether the shell is online"
+msgstr "ప�లగ�‌ఇన� చేతనం చేయాలా"
+
+#: ../shell/e-shell.c:866
+#, fuzzy
+msgid "Shell Settings"
+msgstr "ఇచ�చిప�చ�చ�కొన� అమరికల�"
+
+#: ../shell/e-shell.c:867
+#, fuzzy
+msgid "Application-wide settings"
+msgstr "స�వయంపూర�తి అమరికల�"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:226
+#: ../shell/main.c:168
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19725,7 +20669,7 @@ msgstr ""
 "మీర� మా శ�రమ యొక�క ఫలితాలన� ఆనందిస�తారని నమ�మ�త�న�నామ�, మరియ� మేమ�\n"
 "మీ సహకారం కొరక� ఎద�చూస�త�న�నామ�!\n"
 
-#: ../shell/main.c:250
+#: ../shell/main.c:192
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19733,43 +20677,62 @@ msgstr ""
 "ధన�యవాదమ�ల�\n"
 "ఎవల�యూషన� టీం\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:199
 msgid "Do not tell me again"
 msgstr "నాక� మళ�ళీ చెప�పవద�ద�"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:322
 msgid "Start Evolution activating the specified component"
 msgstr "ఎవల�యూషన� నిర�దేశిత భాగాన�ని క�రియాశీలీకరించడాన�ని ప�రారంభించ�"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:324
+msgid "Apply the given geometry to the main window"
+msgstr ""
+
+#: ../shell/main.c:328
 msgid "Start in online mode"
 msgstr "లైన�లోపలి సంవిధానంలో ప�రారంభించ�"
 
-#: ../shell/main.c:494
-msgid "Forcibly shut down all Evolution components"
+#: ../shell/main.c:330
+#, fuzzy
+msgid "Start in \"express\" mode"
+msgstr "లైన�లోపలి సంవిధానంలో ప�రారంభించ�"
+
+#: ../shell/main.c:333
+#, fuzzy
+msgid "Forcibly shut down Evolution"
 msgstr "ఎవల�యూషన� భాగాలన� బలవంతంగా మూసివేయ�మ�"
 
-#: ../shell/main.c:498
+#: ../shell/main.c:337
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ఎవాల�యూషన� 1.4 న�ండి బలవంతంగా తిరిగి-వలసపంప�"
 
-#: ../shell/main.c:501
+#: ../shell/main.c:340
 msgid "Send the debugging output of all components to a file."
 msgstr "అన�ని మూలకాల డీబగ�గింగ� అవ�ట�‌ప�ట� న� దస�త�రం క� పంప�మ�."
 
-#: ../shell/main.c:503
+#: ../shell/main.c:342
 msgid "Disable loading of any plugins."
 msgstr "ప�లగ�గిన� ల� నింపబడడాన�ని క�రియాహీనం చేయ�మ�."
 
-#: ../shell/main.c:505
+#: ../shell/main.c:344
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "మెయిల� యొక�క ఉపదర�శనం పలకాన�ని, పరిచయాలన� మరియ� కర�తవ�యాలన� అచేతనం చేయ�మ�."
 
-#: ../shell/main.c:614
+#: ../shell/main.c:348
+msgid "Import URIs or file names given as rest of arguments."
+msgstr ""
+
+#: ../shell/main.c:350
+#, fuzzy
+msgid "Request a running Evolution process to quit"
+msgstr "ఎవాల�యూషన� న� ప�నఃప�రారంభిస�త�న�నది"
+
+#: ../shell/main.c:465
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ఎవల�యూషన� PIM మరియ� ఈ మెయిల� క�లైంట�"
 
-#: ../shell/main.c:642
+#: ../shell/main.c:491
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19783,22 +20746,14 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "మీర� గ�ర�త�ంచ�క�న�న అన�ని సంకేతపదాలన� ఖచ�చితంగా మర�చిపోవాలన�క�ంట�న�నారా?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot start Evolution"
-msgstr "ఎవల�యూషన�‌న� ప�రారంభించలేద�"
-
-#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "కొనసాగించ�"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr "వివరణం న�ండి పాత దత�తాంశాన�ని తొలగించ�మ� {0}"
 
-#: ../shell/shell.error.xml.h:5
-msgid "Evolution can not start."
-msgstr "ఎవల�యూషన� ప�రారంభమవ�వద�"
-
-#: ../shell/shell.error.xml.h:6
+#: ../shell/shell.error.xml.h:4
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -19806,15 +20761,15 @@ msgstr ""
 "మీ సంకేతపదాలన� మర�చపోవ�ట అన�ని గ�ర�త�ంచ�కొన�న సంకేతపదాలన� త�డిచివేస�త�ంది. తర�వాతి సారి అవి "
 "అవసరమైనప�ప�డ� మీర� మళ�ళీ అడగబడ�తార�."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:6
 msgid "Insufficient disk space for upgrade."
 msgstr "తాజాపర�చడానికి ఖని ఖాళీ ప�రదేశం సరిపోద�."
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:7
 msgid "Really delete old data?"
 msgstr "పాత దత�తాంశాన�ని నిజంగా తొలగించాలా?"
 
-#: ../shell/shell.error.xml.h:10
+#: ../shell/shell.error.xml.h:8
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -19833,7 +20788,7 @@ msgstr ""
 "\n"
 "ఒకసారి తొలగించితే, మీర� మరలా పాత వర�షన� ఎవాల�యూషన� క� మానవీయ మద�యవర�తిత�వం లేక�ండా మారలేర�.\n"
 
-#: ../shell/shell.error.xml.h:16
+#: ../shell/shell.error.xml.h:14
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -19848,11 +20803,12 @@ msgstr ""
 "తీసివేయబడతాయి. మీర� ఈ డాటాన� ఉంచ�కోవటానికి ఎంచ�క�ంటే, మీర� మీ వీల�న�బట�టి &quot;ఎవాల�యూషన�&quot; "
 "సారాలన� మానవీయంగా తీసివేయవచ�చ�.\n"
 
-#: ../shell/shell.error.xml.h:20
-msgid "Upgrade from previous version failed: {0}"
+#: ../shell/shell.error.xml.h:18
+#, fuzzy
+msgid "Upgrade from previous version failed:"
 msgstr "పూర�వప� వివరణం న�ండి తాజాపర�చడం విఫలమైనది: {0}"
 
-#: ../shell/shell.error.xml.h:21
+#: ../shell/shell.error.xml.h:19
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -19864,46 +20820,23 @@ msgstr ""
 "\n"
 "మీర� కొనసాగించేమ�ంద� మీ నివాస సంచయం నంద� ఎక�క�వ ఖాళీ అంద�బాట�లోకి తెవలెన�."
 
-#: ../shell/shell.error.xml.h:24
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-msgstr ""
-"మీ సిస�టమ� ఆకృతీకరణ ఎవాల�యూషన� ఆకృతీకరణక� సరిపోలడంలేద�.\n"
-"\n"
-"వివరమ�ల కొరక� సహాయం న� నొక�కండి"
-
-#: ../shell/shell.error.xml.h:27
-msgid ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-msgstr ""
-"మీ సిస�టమ� ఆకృతీకరణ మీ ఎవాల�యూషన� ఆకృతీకరణ క� సరిపోలడంలేద�:\n"
-"\n"
-"{0}\n"
-"\n"
-"వివరమ�ల కొరక� సహాయం న� నొక�కండి."
-
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:22
 msgid "_Forget"
 msgstr "మర�చిపోవ�(_F)"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:23
 msgid "_Keep Data"
 msgstr "దత�తాంశన� ఉంచ�మ�(_K)"
 
 #
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:24
 msgid "_Remind Me Later"
 msgstr "నాక� తర�వాత గ�ర�త�చేయ�మ�(_R)"
 
-#: ../shell/shell.error.xml.h:35
+#: ../shell/shell.error.xml.h:25
+#, fuzzy
 msgid ""
-"{1}\n"
+"{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
@@ -19912,7 +20845,95 @@ msgstr ""
 "\n"
 "మీర� కొనసాగించ�ట ఎంచ�కొన�నట�లైతే, మీర� కొంత మీ పాత డాటా న� వాడ�కొనలేక పోవచ�చ�.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:102
+#: ../shell/test/e-test-shell-backend.c:60
+#, fuzzy
+msgctxt "New"
+msgid "_Test Item"
+msgstr "పరీక�ష (_T)"
+
+#: ../shell/test/e-test-shell-backend.c:62
+msgid "Create a new test item"
+msgstr "కొత�త పరీక�షా అంశాన�ని సృష�టించ�మ�"
+
+#: ../shell/test/e-test-shell-backend.c:70
+#, fuzzy
+msgctxt "New"
+msgid "Test _Source"
+msgstr "వనర�"
+
+#: ../shell/test/e-test-shell-backend.c:72
+#, fuzzy
+msgid "Create a new test source"
+msgstr "కొత�త పరీక�షా అంశాన�ని సృష�టించ�మ�"
+
+#: ../smclient/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:958
+#, fuzzy, c-format
+msgid "Starting %s"
+msgstr "%s న� స�కానింగ� చేస�తోంది"
+
+#: ../smclient/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1394
+#, fuzzy, c-format
+msgid "Not a launchable item"
+msgstr "సరికూర�పరి దించదగ�నది కాద�"
+
+#: ../smclient/eggsmclient.c:227
+#, fuzzy
+msgid "Disable connection to session manager"
+msgstr "ఇంటర�నెట�‌క� నేర�గా అన�సంధానం (_D)"
+
+#: ../smclient/eggsmclient.c:230
+#, fuzzy
+msgid "Specify file containing saved configuration"
+msgstr "చ�క�కాని రూపకరణన� అమర�చ�మ�"
+
+#: ../smclient/eggsmclient.c:230
+msgid "FILE"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:233
+msgid "Specify session management ID"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:233
+#, fuzzy
+msgid "ID"
+msgstr "UID"
+
+#: ../smclient/eggsmclient.c:254
+msgid "Session management options:"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:255
+#, fuzzy
+msgid "Show session management options"
+msgstr "ప�రతిబింబప� యానిమేషన�లన� చూప�మ�"
+
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19923,7 +20944,7 @@ msgstr ""
 "\n"
 "నమ�మిక అమర�ప�లన� సరిచేయ�మ�:"
 
-#: ../smime/gui/cert-trust-dialog.c:150
+#: ../smime/gui/cert-trust-dialog.c:144
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19932,7 +20953,7 @@ msgstr ""
 "ఎంచేతంటే ఈ దృవీకరణపత�రం న� జారి చేసిన దృవీకరణ అధికారికం న� మీర� నమ�మార�, అప�ప�డ� మీర� ఈ "
 "దృవీకరణపత�రం యొక�క ప�రామాణికతన� నమ�మాలి ఇక�కడ సూచించి ఉంటే తప�ప"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:148
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19941,55 +20962,59 @@ msgstr ""
 "ఎంచేతంటే ఈ దృవీకరణపత�రం న� జారి చేసిన దృవీకరణ అధికారికం న� మీర� నమ�మలేద�, అప�ప�డ� మీర� ఈ "
 "దృవీకరణపత�రం యొక�క ప�రామాణికతన� నమ�మవద�ద� ఇక�కడ సూచించి ఉంటే తప�ప"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:611
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "దిగ�మతికి ఒక యోగ�యతాపత�రికన� ఎంచ�కొన�మ�..."
 
-#: ../smime/gui/certificate-manager.c:145
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "అన�నిPKCS12 దస�త�రాల�"
 
-#: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:398
-#: ../smime/gui/certificate-manager.c:625
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
 msgid "All files"
 msgstr "అన�ని దస�త�రాల�"
 
-#: ../smime/gui/certificate-manager.c:275
-#: ../smime/gui/certificate-manager.c:488
-#: ../smime/gui/certificate-manager.c:713
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "యోగ�యతాపత�రిక నామంస�"
 
-#: ../smime/gui/certificate-manager.c:284
-#: ../smime/gui/certificate-manager.c:506
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "అభిప�రాయాల�"
 
-#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:552
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "వర�సలో ఉన�న సంఖ�య"
 
-#: ../smime/gui/certificate-manager.c:301
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "కాలంచెల�లేది"
 
-#: ../smime/gui/certificate-manager.c:392
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "అన�ని ఈ మెయిల� యోగ�యతాపత�రిక దస�త�రాల�"
 
-#: ../smime/gui/certificate-manager.c:497
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "ఈ మెయిల� చిర�నామా"
 
-#: ../smime/gui/certificate-manager.c:620
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణ కలిగిన అన�ని దస�త�రాల�"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-manager.c:1050
+msgid "Certificates"
+msgstr "యోగ�యతా పత�రికల�"
+
+#: ../smime/gui/certificate-viewer.c:332
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "యోగ�యతాపత�రిక దర�శిని:%s"
@@ -20009,7 +21034,7 @@ msgid "Enter new password"
 msgstr "కొత�త రహస�యపదాన�ని ప�రవేశపెట�ట�మ�"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20018,7 +21043,7 @@ msgstr ""
 "క� జారీఅయింది:\n"
 "  సంగతి: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20027,59 +21052,27 @@ msgstr ""
 "ద�వారా జారీఅయింది:\n"
 "  సంగతి: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
+#: ../smime/gui/e-cert-selector.c:165
 msgid "Select certificate"
 msgstr "యోగ�యతాపత�రమ�న� ఎంచ�కొన�మ�"
 
-#: ../smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<యోగ�యతాపత�రమ�లో భాగమ�కాద�>"
 
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b>యోగ�యతాపత�రం క�షేత�రాల�</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>యోగ�యతాపత�రం పారంపర�యం</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b>క�షేత�రం విల�వ</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>వేలిమ�ద�రల�</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>ద�వారా జారిచేయబడింది</b>"
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-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>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>కాలపరిమితి</b>"
-
-#: ../smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "అధికారాల�"
 
-#: ../smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "Backup"
 msgstr "భద�రపర�చ�"
 
-#: ../smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Backup All"
 msgstr "అన�నిటిని భద�రపర�చ�"
 
-#: ../smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20087,1613 +21080,347 @@ msgstr ""
 "� ప�రయోజనం కొరకైనా ఈ CA న� నమ�మేమ�ందల, మీర� తప�పక దాని దృవీకరణ పత�రంన� నిర�దారించాలి మరియ� దాని "
 "విధానం మరియ� పద�దత�ల� కూడా (అంద�బాట�లోఉంటే)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "యోగ�యతాపత�రిక"
 
-#: ../smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Authority Trust"
 msgstr "యోగ�యతాపత�రిక అధికారాన�ని విశ�వసించ�మ�"
 
-#: ../smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.ui.h:8
+#, fuzzy
+msgid "Certificate Fields"
+msgstr "<b>యోగ�యతాపత�రం క�షేత�రాల�</b>"
+
+#: ../smime/gui/smime-ui.ui.h:9
+#, fuzzy
+msgid "Certificate Hierarchy"
+msgstr "<b>యోగ�యతాపత�రం పారంపర�యం</b>"
+
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificate details"
 msgstr "యోగ�యతాపత�రిక వివరాల�"
 
-#: ../smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Certificates Table"
 msgstr "యోగ�యతాపత�రికల పట�టిక"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Common Name (CN)"
 msgstr "ఉమ�మడి పేర�(CN)"
 
-#: ../smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Contact Certificates"
 msgstr "చిర�నామా యోగ�యతాపత�రికల�"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.ui.h:15
 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
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Edit"
 msgstr "సరిచేయ�"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Certificate Trust Settings"
 msgstr "ఈమెయిల� యోగ�యతాపత�రిక విశ�వాసప� అమరికల�"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Recipient Certificate"
 msgstr "ఈమెయిల� స�వీకరణదారి దృవీకరణపత�రం"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Signer Certificate"
 msgstr "ఈమెయిల� సంతకందారి దృవీకరణపత�రం"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Expires On"
 msgstr "కాలంచెల�ల�త�ంది"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.ui.h:21
+#, fuzzy
+msgid "Field Value"
+msgstr "క�షేత�ర నామం"
+
+#: ../smime/gui/smime-ui.ui.h:22
+#, fuzzy
+msgid "Fingerprints"
+msgstr "MD5 వేలిమ�ద�ర"
+
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Import"
 msgstr "దిగ�మతి"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:25
+#, fuzzy
+msgid "Issued By"
+msgstr "పై జారీఅయింది"
+
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Issued On"
 msgstr "పై జారీఅయింది"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:27
+#, fuzzy
+msgid "Issued To"
+msgstr "పై జారీఅయింది"
+
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "MD5 Fingerprint"
 msgstr "MD5 వేలిమ�ద�ర"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Organization (O)"
 msgstr "నిర�మాణ సంస�థ(O)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organizational Unit (OU)"
 msgstr "నిర�మాణ సంస�థ భాగమ�(OU)"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 వేలిమ�ద�ర"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
+#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "SSL క�లైంట� యోగ�యతాపత�రిక"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "SSL సేవిక యోగ�యతాపత�రిక"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:35
+#, fuzzy
+msgid "This certificate has been verified for the following uses:"
+msgstr "<b>ఈ దృవీకరణపత�రం ఈ క�రింది ఉపయోగాల కొరక� నిర�ధారించబడింది:</b>"
+
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust the authenticity of this certificate"
 msgstr "యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణన� విశ�వసించ�మ�"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:37
 msgid "Trust this CA to identify email users."
 msgstr "ఈ మెయిల� వినియోగదార�లని గ�ర�తించ�టక� ఈ యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణన� విశ�వసించ�మ�"
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify software developers."
 msgstr "సాఫ�ట�వేర� అభివృద�దికార�లన� గ�ర�తించ�టక� ఈ యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణన� విశ�వసించ�మ�"
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify web sites."
 msgstr "మహాతల ప�రదేశాలన� గ�ర�తించ�టక� యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణన� విశ�వసించ�మ�"
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.ui.h:40
+#, fuzzy
+msgid "Validity"
+msgstr "<b>కాలపరిమితి</b>"
+
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "View"
 msgstr "దర�శనం"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:42
 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:"
+#: ../smime/gui/smime-ui.ui.h:43
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "యోగ�యతాపత�రికల అధికార�లన� గ�ర�తించ�టక�  మీక� యోగ�యతాపత�రికల� దస�త�రం పై ఉన�నాయి:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "ఈ జనాలని గ�ర�తించ�టక�  మీక� యోగ�యతాపత�రికల� దస�త�రం పై ఉన�నాయి:"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "Your Certificates"
 msgstr "మీ యోగ�యతాపత�రికల�"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_Edit CA Trust"
 msgstr "CA నమ�మికన� సరిచేయ�మ�(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:652
+#: ../smime/lib/e-cert-db.c:711
 msgid "Certificate already exists"
 msgstr "యోగ�యతాపత�రిక మ�ందే ఉన�న"
 
-#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:407
+#: ../smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "సంతకం"
 
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "ఎన�క�రిప�ట�"
 
-#: ../smime/lib/e-cert.c:513
+#: ../smime/lib/e-cert.c:527
 msgid "Version"
 msgstr "వివరణం"
 
-#: ../smime/lib/e-cert.c:528
+#: ../smime/lib/e-cert.c:542
 msgid "Version 1"
 msgstr "వివరణం 1"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:545
 msgid "Version 2"
 msgstr "వివరణం 2"
 
-#: ../smime/lib/e-cert.c:534
+#: ../smime/lib/e-cert.c:548
 msgid "Version 3"
 msgstr "వివరణం 3"
 
-#: ../smime/lib/e-cert.c:616
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "RSA ఎన�క�రిప�షన� తొ PKCS #1 MD2"
 
-#: ../smime/lib/e-cert.c:619
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "RSA ఎన�క�రిప�షన� తొ PKCS #1 MD5"
 
-#: ../smime/lib/e-cert.c:622
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "RSA ఎన�క�రిప�షన� తొ PKCS #1 SHA-1"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:663
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ఎన�క�రిప�షన�"
 
-#: ../smime/lib/e-cert.c:652
+#: ../smime/lib/e-cert.c:666
 msgid "Certificate Key Usage"
 msgstr "దృవీకరణపత�రం కీ ఉపయోగం"
 
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-cert.c:669
 msgid "Netscape Certificate Type"
 msgstr "నెట� స�కేప� యోగ�యతాపత�రిక రకం"
 
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-cert.c:672
 msgid "Certificate Authority Key Identifier"
 msgstr "దృవీకరణపత�రం అధికారికం కీ గ�ర�తింప�దారి"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:684
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ఆబ�జక�ట� గ�ర�తింప�దారి (%s)"
 
-#: ../smime/lib/e-cert.c:720
+#: ../smime/lib/e-cert.c:735
 msgid "Algorithm Identifier"
 msgstr "వర�సక�రమ విధానం గ�ర�తింప�చిహ�నం"
 
-#: ../smime/lib/e-cert.c:728
+#: ../smime/lib/e-cert.c:743
 msgid "Algorithm Parameters"
 msgstr "వర�సక�రమ విధానం పరామిత�ల�"
 
-#: ../smime/lib/e-cert.c:750
+#: ../smime/lib/e-cert.c:765
 msgid "Subject Public Key Info"
 msgstr "సంగతి పబ�లిక� కీ సమాచారం"
 
-#: ../smime/lib/e-cert.c:755
+#: ../smime/lib/e-cert.c:770
 msgid "Subject Public Key Algorithm"
 msgstr "సంగతి పబ�లిక� కీ అల�గార�ధెమ�"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:785
 msgid "Subject's Public Key"
 msgstr "సంగతి యొక�క పబ�లిక� కీ"
 
-#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
 msgid "Error: Unable to process extension"
 msgstr "దోషం: విస�తరింప�న� నిర�వర�తించలేద�"
 
-#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
 msgid "Object Signer"
 msgstr "ఆబ�జక�ట� సంతకంచేయ�నది"
 
-#: ../smime/lib/e-cert.c:816
+#: ../smime/lib/e-cert.c:831
 msgid "SSL Certificate Authority"
 msgstr "SSL యోగ�యతాపత�రిక అధికారమ�"
 
-#: ../smime/lib/e-cert.c:820
+#: ../smime/lib/e-cert.c:835
 msgid "Email Certificate Authority"
 msgstr "ఈ మెయిల� యోగ�యతాపత�రిక అధికారమ�"
 
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:863
 msgid "Signing"
 msgstr "సంతకంచేయ�ట"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:867
 msgid "Non-repudiation"
 msgstr "Non-repudiation"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:871
 msgid "Key Encipherment"
 msgstr "కీ ఎన�‌సిఫర�‌మెంట�"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:875
 msgid "Data Encipherment"
 msgstr "డాటా ఎన�‌సిఫర�‌మెంట�"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:879
 msgid "Key Agreement"
 msgstr "మీట ఒప�పందం"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:883
 msgid "Certificate Signer"
 msgstr "యోగ�యతాపత�రిక సంతకంచేసేది"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:887
 msgid "CRL Signer"
 msgstr "CRL సంతకంచేసేది"
 
-#: ../smime/lib/e-cert.c:920
+#: ../smime/lib/e-cert.c:935
 msgid "Critical"
 msgstr "విషమం"
 
-#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
 msgid "Not Critical"
 msgstr "విషమం కాద�"
 
-#: ../smime/lib/e-cert.c:946
+#: ../smime/lib/e-cert.c:961
 msgid "Extensions"
 msgstr "పొడగింప�ల�"
 
-#: ../smime/lib/e-cert.c:1017
+#: ../smime/lib/e-cert.c:1030
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "యోగ�యతా సంతకం వర�సక�రమ విధానం"
 
-#: ../smime/lib/e-cert.c:1081
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "జారీచేయ�వాడ�"
 
-#: ../smime/lib/e-cert.c:1135
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "జారీచేయ�వాన�ని �కైక ID"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "విషయం �కైక ID"
 
-#: ../smime/lib/e-cert.c:1197
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "యోగ�యతాపత�రిక సంతకం విల�వ"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
 msgstr "PKCS12 దస�త�ర రహస�యపదం"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:251
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 దస�త�రానికి రహస�యపదమ�న� ప�రవేశపెట�టండి:"
 
-#: ../smime/lib/e-pkcs12.c:348
+#: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
 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 "'%s' న� నిర�వర�తించలేద�: %s\n"
-
-#: ../tools/killev.c:76
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "మూసివేయ�చ�న�నది %s (%s)\n"
-
-#: ../ui/evolution-addressbook.xml.h:1
-msgid "Address _Book Properties"
-msgstr "చిర�నామా ప�స�తకం లక�షణాల�(_B)"
-
-#: ../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 "అన�ని పరిచయాలన� నకల�తీయ�మ�(p)..."
-
-#: ../ui/evolution-addressbook.xml.h:5
-msgid "Contact _Preview"
-msgstr "పరిచయం ఉపదర�శనం(_P)"
-
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "నకల�"
-
-#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy selected contacts to another folder"
-msgstr "ఎంచ�క�న�న పరిచయాలన� వేరే సంచయంలోకి నకల� తీయ�మ�"
-
-#: ../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 address book folder"
-msgstr "కొత�త చిర�నామా ప�స�తక సంచయాన�ని సృష�టించ�"
-
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "కత�తిరించ�మ�"
-
-#: ../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)"
-
-#: ../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 "అన�ని పరిచయాలన� కద�ప�మ�(_v)..."
-
-#: ../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-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 "చిరనామాప�స�తకాన�ని Vకార�డ� లా దాయ�మ�(_a)"
-
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "Vపలకంగా దాయ�మ�..."
-
-#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard"
-msgstr "ఎంపికచేసిన పరిచయాలన� Vకార�డ�లాగా దాయ�మ�."
-
-#: ../ui/evolution-addressbook.xml.h:33
-msgid "Save the contacts of the selected folder as VCard"
-msgstr "ఎంపికచేసిన సంచయం పరిచయాలన� Vకార�డ� లాగా దాయ�మ�"
-
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
-msgid "Select All"
-msgstr "అన�నిటిని ఎంచ�కొన�మ�"
-
-#: ../ui/evolution-addressbook.xml.h:35
-msgid "Select _All"
-msgstr "అన�నిటిని ఎంచ�కొన�మ�(_A)"
-
-#: ../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 "ఆప�(_o)"
-
-#: ../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:39
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Actions"
-msgstr "క�రియల�(_A)"
-
-#: ../ui/evolution-addressbook.xml.h:47
-msgid "_Copy Contact to..."
-msgstr "పరిచయాన�ని క� నకల�తీయ�మ�(_C)..."
-
-#: ../ui/evolution-addressbook.xml.h:48
-msgid "_Copy Folder Contacts To"
-msgstr "సంచయం పరిచయాలన� నకల�తీయ�మ�(_C)"
-
-#: ../ui/evolution-addressbook.xml.h:50
-msgid "_Delete Contact"
-msgstr "పరిచయాన�ని తొలగించ�(_D)"
-
-#: ../ui/evolution-addressbook.xml.h:52
-msgid "_Forward Contact..."
-msgstr "పరిచయాన�ని మ�ంద�క� పంప�మ�(_F)..."
-
-#: ../ui/evolution-addressbook.xml.h:53
-msgid "_Move Contact to..."
-msgstr "పరిచయాలన� దీనికి కద�ప�మ�(_M)..."
-
-#: ../ui/evolution-addressbook.xml.h:54
-msgid "_Move Folder Contacts To"
-msgstr "సంచయం పరిచయాలన� క� కద�ప�మ�(_M)"
-
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
-msgid "_New"
-msgstr "కొత�త(_N)"
-
-#: ../ui/evolution-addressbook.xml.h:60
-msgid "_Rename"
-msgstr "ప�న:నామకరణ(_R)"
-
-#: ../ui/evolution-addressbook.xml.h:61
-msgid "_Save Contact as VCard..."
-msgstr "పరిచయాలన� Vకార�డ� లాగా దాయ�మ�(_S)..."
-
-#: ../ui/evolution-addressbook.xml.h:62
-msgid "_Save Folder Contacts As VCard"
-msgstr "సంచయం పరిచయాలన� Vకార�డ� లాగా దాయ�మ�(_S)"
-
-#: ../ui/evolution-addressbook.xml.h:63
-msgid "_Send Message to Contact..."
-msgstr "పరిచయానికి సందేశం పంప�మ�(_S)..."
-
-#: ../ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "రోజ�"
-
-#: ../ui/evolution-calendar.xml.h:6
-msgid "Delete _all Occurrences"
-msgstr "సంభవాలన�నింటి తొలగించ�మ�(_a)"
-
-#: ../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
-#: ../widgets/misc/e-calendar.c:193
-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:70
-#: ../widgets/misc/e-calendar.c:169
-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 "కొట�టివేయ�మ�(_e)"
-
-#: ../ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr "పాత నియామకాలన� మరియ� సమావేశాలన� కొట�టివేయ�మ�"
-
-#: ../ui/evolution-calendar.xml.h:25
-msgid "Select _Date"
-msgstr "తేదీనిఎంచ�కొన�మ�(_D) "
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "ఈ రోజ�న� ఎంచ�కొన�మ�(_T)"
-
-#: ../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 ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "డీబగ� కన�సోల� న� లాగ� సందేశాల కొరక� దర�శించ�మ�"
-
-#: ../ui/evolution-calendar.xml.h:37
-msgid "Week"
-msgstr "వారం"
-
-#: ../ui/evolution-calendar.xml.h:38
-msgid "Work Week"
-msgstr "పని వారం"
-
-#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "డీబగ� లాగ�స�(_D)"
-
-#: ../ui/evolution-calendar.xml.h:45
-msgid "_Open Appointment"
-msgstr "నియామకాన�ని తెర�వ�మ�(_O)"
-
-#: ../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 "Download messages of accounts/folders marked for offline"
-msgstr "ఆఫ�‌లైన� కొరక� గ�ర�త�ంచిన ఖాతాల/సంచయాల యొక�క సందేశాలన� దిగ�మతి చేయ�మ�"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Empty _Trash"
-msgstr "చెత�తన� ఖాళీ చేయ�(_T)"
-
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-msgid "F_older"
-msgstr "సంచయం(_o)"
-
-#: ../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 "సంచయాలన� వెత�క�మ�(_o)"
-
-#: ../ui/evolution-mail-global.xml.h:14
-msgid "Show Message _Preview"
-msgstr "సందేశ ఉపదర�శనాన�ని చూప�మ�(_P)"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview below the message list"
-msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
-
-#: ../ui/evolution-mail-global.xml.h:16
-msgid "Show message preview side-by-side with the message list"
-msgstr "సందేశం ఉపదర�శనంన� ప�రక�క-ప�రక�కన ఉంచి సందేశ జాబితాతో చూప�మ�"
-
-#: ../ui/evolution-mail-global.xml.h:17
-msgid "Show message preview window"
-msgstr "సందేశ ఉపదర�శన గవాక�షాన�ని చూప�మ�"
-
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "దూరస�థ సేవికల సంచయాల తో చందాదార�కండి లేదా చందావిరమించ�కోండి"
-
-#: ../ui/evolution-mail-global.xml.h:20
-msgid "_Classic View"
-msgstr "సాంప�రదాయకమైన దర�శనం(_C)"
-
-#: ../ui/evolution-mail-global.xml.h:21
-msgid "_Copy Folder To..."
-msgstr "సంచయాన�ని ఇక�కడికి నకల� తీయ�మ�(_C)"
-
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Download Messages for Offline Usage"
-msgstr "ఆఫ�‌లైన� వ�పయోగమ�ల కొరక� సందేశాల న� దిగ�మతిచేయ�మ� (_D)"
-
-#: ../ui/evolution-mail-global.xml.h:25
-msgid "_Message Filters"
-msgstr "సందేశం వడపోతల�(_M)"
-
-#: ../ui/evolution-mail-global.xml.h:26
-msgid "_Move Folder To..."
-msgstr "సంచయం న� ఇక�కడికి జర�ప�మ�(_M)..."
-
-#: ../ui/evolution-mail-global.xml.h:27
-msgid "_New..."
-msgstr "కొత�త(_N)..."
-
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Preview"
-msgstr "ఉపదర�శనం(_P)"
-
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions..."
-msgstr "చందాల�... (_S)"
-
-#: ../ui/evolution-mail-global.xml.h:33
-msgid "_Vertical View"
-msgstr "నిల�వ� దర�శనం(_V)"
-
-#: ../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 "అన�ని తంత�లన� కూల�చ�త�ంది(_T)"
-
-#: ../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 "అన�ని తంత�లన� విస�తరించ�మ�(_x)"
-
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "E_xpunge"
-msgstr "కొట�టివేయ�మ�(_x)"
-
-#: ../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 "ఎంచ�క�న�న సందేశాలన� అదృశ�యపర�చ�మ�(_e)"
-
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Hide _Deleted Messages"
-msgstr "తొలగించిన సందేశాలన� అదృశ�యపర�చ�మ�(_D)"
-
-#: ../ui/evolution-mail-list.xml.h:14
-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"
-msgstr "సందేశాలగ�ండా ఒక లైన� కొట�టివేసినట�ల� చూపించటం కన�నా వాటిని మర�గ�పర�చ�మ� తీసివేయ�మ�"
-
-#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k All Messages as Read"
-msgstr "అన�ని సందేశాలని చదివినవిగా గ�ర�త� పెట�ట�మ�(_k)"
-
-#: ../ui/evolution-mail-list.xml.h:17
-msgid "Mark all messages in the folder as read"
-msgstr "సంచయంలోనిఅన�ని సందేశాలని చదివినవిగా గ�ర�త� పెట�ట�మ�"
-
-#: ../ui/evolution-mail-list.xml.h:18
-msgid "Paste message(s) from the clipboard"
-msgstr "క�లిప� పలక న�ండి సందేశాలన� అతికించ�మ�"
-
-#: ../ui/evolution-mail-list.xml.h:19
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "తొలగించిన సందేశాలన� ఈ సంచయమ� న�ండి శాశ�వతంగా తీసివేయ�"
-
-#: ../ui/evolution-mail-list.xml.h:20
-msgid "Permanently remove this folder"
-msgstr "శాశ�వతంగా ఈ సంచయాన�ని తొలగించ�"
-
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Refresh the folder"
-msgstr "సంచయాన�ని ప�నర�వికాసపర�చ�"
-
-#: ../ui/evolution-mail-list.xml.h:23
-msgid "Select Message S_ubthread"
-msgstr "సందేశం ఉపతంతిని ఎంపికచేయ�మ�(_u)"
-
-#: ../ui/evolution-mail-list.xml.h:24
-msgid "Select Message _Thread"
-msgstr "సందేశం తంతిని ఎంపికచేయ�మ�(_T)"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Select _All Messages"
-msgstr "అన�ని సందేశాలన� ఎంచ�కొన�మ�(_A)"
-
-#: ../ui/evolution-mail-list.xml.h:26
-msgid "Select all and only the messages that are not currently selected"
-msgstr "ప�రస�త�తం ఎంచ�కోబడని సందేశాలన� మాత�రమే ఎంచ�కొన�మ�"
-
-#: ../ui/evolution-mail-list.xml.h:27
-msgid "Select all messages in the same thread as the selected message"
-msgstr "ఎంపికచేసిన సందేశం లాగా అదే తంతిలోని అన�ని సందేశాలన� ఎంపికచేయ�మ�"
-
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "Select all replies to the currently selected message"
-msgstr "ప�రస�త�తం ఎంచ�కోబడని సందేశంక� అన�ని ప�రత�య�త�తరమ�లన� ఎంచ�కొన�మ�"
-
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "Select all visible messages"
-msgstr "కనపడే సందేశాలన�నిటిని ఎంచ�కొన�మ�"
-
-#: ../ui/evolution-mail-list.xml.h:30
-msgid "Show Hidde_n Messages"
-msgstr "అదృశ�యపర�చిన సందేశాలన� చూప�మ�(_n)"
-
-#: ../ui/evolution-mail-list.xml.h:31
-msgid "Show messages that have been temporarily hidden"
-msgstr " తాత�కాలికంగా అదృశ�యపర�చిన సందేశాలన� చూప�మ�"
-
-#: ../ui/evolution-mail-list.xml.h:32
-msgid "Temporarily hide all messages that have already been read"
-msgstr "ఇదివరకే చదవబడిన సందేశాలన� తాత�కాలికంగా అదృశ�యపర�చ�మ�"
-
-#: ../ui/evolution-mail-list.xml.h:33
-msgid "Temporarily hide the selected messages"
-msgstr "ఎంచ�క�న�న సందేశాలన� తాత�కాలికంగా అదృశ�యపర�చ�మ�"
-
-#: ../ui/evolution-mail-list.xml.h:34
-msgid "Threaded Message list"
-msgstr "తంతీకరణ సందేశ జాబితా"
-
-#: ../ui/evolution-mail-list.xml.h:36
-msgid "_Group By Threads"
-msgstr "సమూహం ద�వారా తంత�ల�(_G)"
-
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
-msgid "_Message"
-msgstr "సందేశం(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Address Book"
-msgstr "చిర�నామా ప�స�తకానికి మెయిల� పంపించ�వాన�ని జతపర�చ�(_d)"
-
-#: ../ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "వడపోతలన� ఆపాదించ�మ�(_p)"
-
-#. 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 "అన�ని సందేశ పీఠికల�(_H)"
-
-#: ../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 "నిరర�ధకం కొరక� పరిశీలించ�మ�(_J)"
-
-#: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message"
-msgstr "కొత�త సందేశం న� కూర�చ�మ�(_N)"
-
-#: ../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 "సూత�రమ�న� సృష�టించ�మ�(_u)"
-
-#: ../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 "ఇలా పంప�మ�(_o)..."
-
-#: ../ui/evolution-mail-message.xml.h:34
-msgid "Filter on Mailing _List..."
-msgstr "మెయిలింగ� జాబితా పై వడపోత(_L)..."
-
-#: ../ui/evolution-mail-message.xml.h:35
-msgid "Filter on Se_nder..."
-msgstr "పంపైవాని పై వడపోత(_n)..."
-
-#: ../ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Recipients..."
-msgstr "స�వీకరించ�వారి పై వడపోత(_R)..."
-
-#: ../ui/evolution-mail-message.xml.h:37
-msgid "Filter on _Subject..."
-msgstr "సంగతి పై వడపోత(_S)..."
-
-#: ../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 "అన�సరించ�(_U)..."
-
-#: ../ui/evolution-mail-message.xml.h:41
-msgid "Force images in HTML mail to be loaded"
-msgstr "HTML మెయిల� నంద� నింప�టక� చిత�రమ�లన� బలవంతపెట�ట�మ�"
-
-#: ../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 "ఇలా గ�ర�త�పెట�ట�(_k)"
-
-#: ../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 "తర�వాతి మ�ఖ�య సందేశం(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:60
-msgid "Next _Thread"
-msgstr "తర�వాతి తంతి(_T)"
-
-#: ../ui/evolution-mail-message.xml.h:61
-msgid "Next _Unread Message"
-msgstr "తర�వాతి చదవబడని సందేశం(_U)"
-
-#: ../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 "పూర�వప� చదవబడిన సందేశం(_r)"
-
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Paste messages from the clipboard"
-msgstr "క�లిప� పలకం న�ండి సందేశాలన� అతికించ�మ�"
-
-#: ../ui/evolution-mail-message.xml.h:68
-msgid "Pr_evious Important Message"
-msgstr "పూర�వప� మ�ఖ�య సందేశం(_e)"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Preview the message to be printed"
-msgstr "మ�ద�రించాల�సిన సందేశాన�ని ప�న:దర�శనం చేయ�మ�"
-
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Print this message"
-msgstr "ఈ సందేశాన�ని మ�ద�రించ�మ�"
-
-#: ../ui/evolution-mail-message.xml.h:74
-msgid "Re_direct"
-msgstr "తిరిగినిర�దేశించ�మ�(_d)"
-
-#: ../ui/evolution-mail-message.xml.h:75
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "ఎంపికచేసిన సందేశంన� ఎవరోఒకిరికి తిరిగినిర�దేశించ�మ�(bounce)"
-
-#: ../ui/evolution-mail-message.xml.h:80
-msgid "Reset the text to its original size"
-msgstr "పాఠ�యమ�న� అసలైన పరిమాణానికి ప�న:అమర�చ�మ�"
-
-#: ../ui/evolution-mail-message.xml.h:81
-msgid "Save the selected messages as a text file"
-msgstr "ఎంచ�క�న�న సందేశాలన� పాఠ�య దస�త�రమ�గా దాయ�మ�"
-
-#: ../ui/evolution-mail-message.xml.h:82
-msgid "Search Folder from Mailing _List..."
-msgstr "మెయిలింగ� జాబితా న�ండి సంచయాన�ని వెత�క�మ�..."
-
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Search Folder from Recipien_ts..."
-msgstr "తీస�క�న�నవాటి న�ండి సంచయాన�ని వెత�క�మ�(_t).."
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Search Folder from S_ubject..."
-msgstr "సంగతి న�ండి సంచయాన�ని వెత�క�మ�(_u)..."
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Search Folder from Sen_der..."
-msgstr "పంపినదాన�ని న�ండి సంచయాన�ని వెత�క�మ�..."
-
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Search for text in the body of the displayed message"
-msgstr "ప�రదర�శించబడిన సందేశం మ�ఖ�యభాగమ�లో పాఠ�యమ�న� వెత�క�మ�"
-
-#: ../ui/evolution-mail-message.xml.h:87
-msgid "Select _All Text"
-msgstr "పాఠ�యమ�నంతా ఎంచ�కొన�మ�(_A)"
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Select all the text in a message"
-msgstr "ఒక సందేశమ�లో  పాఠ�యమ�నంతా ఎంచ�కొన�మ�"
-
-#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
-msgid "Set up the page settings for your current printer"
-msgstr "మీ ప�రస�త�త మ�ద�రణ యంత�రమ�క� ప�ట అమరికలన� అమర�చ�మ�"
-
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "ప�రదర�శించబడిన సందేశాల మ�ఖ�యభాగమ�లో మిణ�గ�ర� మ�ల�క�న� చూపించ�మ�"
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "Show messages with all email headers"
-msgstr "ఈ మెయిల� పీఠికలతో సందేశాలన� చూప�మ�"
-
-#: ../ui/evolution-mail-message.xml.h:92
-msgid "Show the raw email source of the message"
-msgstr "సందేశం మ�డివనర�ని ఈ మెయిల� ద�వారా చూప�మ�"
-
-#: ../ui/evolution-mail-message.xml.h:93
-msgid "Undelete the selected messages"
-msgstr "ఎంపిక చేస�క�న�న సందేశాలని తొలగించవద�ద�"
-
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Uni_mportant"
-msgstr "సాధారణమైన(_m)"
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Zoom _Out"
-msgstr "జూమ� వెల�పలకి(_O)"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "_Attached"
-msgstr "జతపర�చిన(_A)"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "_Caret Mode"
-msgstr "అక�షరరీతి(_C)"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "_Clear Flag"
-msgstr "ప�లాగ� శ�బ�రంచేయ�మ�(_C)"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Delete Message"
-msgstr "సందేశాన�ని తొలగించ�మ�(_D)"
-
-#: ../ui/evolution-mail-message.xml.h:103
-msgid "_Find in Message..."
-msgstr "సందేశంలో కన�గొన�మ�(_F)..."
-
-#: ../ui/evolution-mail-message.xml.h:104
-msgid "_Flag Completed"
-msgstr "ఫ�లాగ� పూర�తయినది(_F)"
-
-#: ../ui/evolution-mail-message.xml.h:106
-msgid "_Go To"
-msgstr "వెళ�ళ�(_G)"
-
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Important"
-msgstr "మ�ఖ�యమైన(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Inline"
-msgstr "ఇన�‌లైన�(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Junk"
-msgstr "నిరర�ధకం(_J)"
-
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Load Images"
-msgstr "చిత�రమ�లన� నింప�మ�(_L)"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Message Source"
-msgstr "సందేశం మూలం(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Next Message"
-msgstr "తర�వాతి సందేశం(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:115
-msgid "_Normal Size"
-msgstr "సాధారణ పరిమాణం(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:116
-msgid "_Not Junk"
-msgstr "నిరర�ధకంకాద�(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:117
-msgid "_Open in New Window"
-msgstr " కొత�త గవాక�షమ� లో తెర�వ�మ�(_O)"
-
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Previous Message"
-msgstr "పూర�వప� సందేశం(_P)"
-
-#: ../ui/evolution-mail-message.xml.h:120
-msgid "_Quoted"
-msgstr "కోటెడ�(_Q)"
-
-#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Read"
-msgstr "చద�వ�మ�(_R)"
-
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Save Message..."
-msgstr "సందేశాన�ని దాయ�మ�(_S)..."
-
-#: ../ui/evolution-mail-message.xml.h:125
-msgid "_Undelete Message"
-msgstr "సందేశాన�ని తొలగించవద�ద�(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Unread"
-msgstr "చదవక�ండా ఉన�నవి(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:127
-msgid "_Zoom"
-msgstr "జూమ�(_Z)"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Zoom In"
-msgstr "జూమ� లోపలికి(_Z)"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "మూయ�మ�"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
-msgid "Main toolbar"
-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 "మెమోన� తెర�వ�మ�(_O)"
-
-#: ../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 "కర�తవ�య ఉపదర�శనం(_P)"
-
-#: ../ui/evolution-tasks.xml.h:20
-msgid "View the selected task"
-msgstr "ఎంచ�క�న�న కర�తవ�యాన�ని చూడ�మ�"
-
-#: ../ui/evolution-tasks.xml.h:27
-msgid "_Open Task"
-msgstr "కర�తవ�యాన�ని తెర�వ�మ�(_O)"
-
-#: ../ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "ఎవల�యూషన� గ�రించి..."
-
-#: ../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 "Evolution _FAQ"
-msgstr "ఎవల�యూషన� _FAQ"
-
-#: ../ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "కార�యక�రమం న�ండి బయటక� రమ�మ�"
-
-#: ../ui/evolution.xml.h:12
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "గ�ర�త�ంచ�కొనిని సంకేతపదాలన� మర�చిపోవ�ట వలన మీర� మరలా వాటికొరక� అడగబడతార�"
-
-#: ../ui/evolution.xml.h:13
-msgid "Hide window buttons"
-msgstr "గవాక�ష బొత�తమ�లన� కనపడక�ండా దాయ�మ�"
-
-#: ../ui/evolution.xml.h:14
-msgid "I_mport..."
-msgstr "దిగ�మతి(_m)..."
-
-#: ../ui/evolution.xml.h:15
-msgid "Icons _and Text"
-msgstr "ప�రతిమల� మరియ� పాఠ�యమ� (_a)"
-
-#: ../ui/evolution.xml.h:16
-msgid "Import data from other programs"
-msgstr "ఇతర కార�యక�రమాలన�ండి దత�తాంశాన�ని దిగ�మతిచేయ�మ�"
-
-#: ../ui/evolution.xml.h:17
-msgid "Lay_out"
-msgstr "కూర�ప�(_o)"
-
-#: ../ui/evolution.xml.h:19
-msgid "New _Window"
-msgstr "కొత�త గవాక�షం(_W)"
-
-#: ../ui/evolution.xml.h:20
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "తర�చూ అడ�గ� ప�రశ�నల� వెబ�‌ప�టన� తెర�వ�మ�"
-
-#: ../ui/evolution.xml.h:21
-msgid "Page Set_up..."
-msgstr "ప�ట అమరిక(_u)..."
-
-#: ../ui/evolution.xml.h:22
-msgid "Prefere_nces"
-msgstr "అభీష�టాల�"
-
-#: ../ui/evolution.xml.h:23
-msgid "Send / Receive"
-msgstr "పంప�మ�/తీస�కొన�మ�"
-
-#: ../ui/evolution.xml.h:24
-msgid "Send / _Receive"
-msgstr "పంప�మ�/తీస�కొన�మ�(_R)"
-
-#: ../ui/evolution.xml.h:25
-msgid "Send queued items and retrieve new items"
-msgstr "వర�సపర�చిన అంశాలన� పంప� మరియ� కొత�త అంశాలన� వెలికితీయ�మ�"
-
-#: ../ui/evolution.xml.h:26
-msgid "Set up Pilot configuration"
-msgstr "చ�క�కాని రూపకరణన� అమర�చ�మ�"
-
-#: ../ui/evolution.xml.h:28
-msgid "Show Side _Bar"
-msgstr "ప�రక�కపట�టీని చూప�మ�(_B)"
-
-#: ../ui/evolution.xml.h:29
-msgid "Show _Status Bar"
-msgstr "స�స�థిత పట�టీ ని చూప�మ�(_S)"
-
-#: ../ui/evolution.xml.h:30
-msgid "Show _Toolbar"
-msgstr "పనిమ�ట�లపట�టా ని చూప�మ�(_T)"
-
-#: ../ui/evolution.xml.h:31
-msgid "Show information about Evolution"
-msgstr "ఎవల�యూషన� గ�రించి సమాచారం చూప�మ�"
-
-#: ../ui/evolution.xml.h:32
-msgid "Submit Bug Report"
-msgstr "బగ� నివేదిక న� పంప�మ�"
-
-#: ../ui/evolution.xml.h:33
-msgid "Submit _Bug Report"
-msgstr "బగ� నివేదిక న� పంప�మ�(_B)"
-
-#: ../ui/evolution.xml.h:34
-msgid "Submit a bug report using Bug Buddy"
-msgstr "బగ� బడ�డీతో బగ� నివేదికన� పంప�మ�"
-
-#: ../ui/evolution.xml.h:35
-msgid "Toggle whether we are working offline."
-msgstr "మనమ� ఆఫ�‌లైన� లో పనిచేస�త�ంటే మార�మ�."
-
-#: ../ui/evolution.xml.h:36
-msgid "Tool_bar Style"
-msgstr "పనిమ�ట�ల పట�టీ శైలి (_b)"
-
-#: ../ui/evolution.xml.h:37
-msgid "View/Hide the Side Bar"
-msgstr "ప�రక�కపట�టీని దర�శించ�/మర�గ�పరచ�"
-
-#: ../ui/evolution.xml.h:38
-msgid "View/Hide the Status Bar"
-msgstr "స�స�థితి  పట�టీ ని దర�శించ�/దాయ�మ�"
-
-#: ../ui/evolution.xml.h:39
-msgid "Work _Offline"
-msgstr "ఆఫ�‌లైన�‌గా పనిచేయ�మ� (_O)"
-
-#: ../ui/evolution.xml.h:40
-msgid "_About"
-msgstr "గ�రించి(_A)"
-
-#: ../ui/evolution.xml.h:41
-msgid "_Close Window"
-msgstr "గవాక�షమ�న� మూయ�మ�(_C)"
-
-#: ../ui/evolution.xml.h:44
-msgid "_Forget Passwords"
-msgstr "రహస�య పదమ�లన� మర�చిపోండి(_F)"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Frequently Asked Questions"
-msgstr "తర�చూ అడ�గ� ప�రశ�నల�(_F)"
-
-#: ../ui/evolution.xml.h:47
-msgid "_Hide Buttons"
-msgstr "బొత�తమ�లన� మర�గ�పరచ�మ� (_H)"
-
-#: ../ui/evolution.xml.h:48
-msgid "_Icons Only"
-msgstr "ప�రతిమల� మాత�రమే (_I)"
-
-#: ../ui/evolution.xml.h:50
-msgid "_Quick Reference"
-msgstr "చ�ర�కైన నివేదన(_Q)"
-
-#: ../ui/evolution.xml.h:51
-msgid "_Quit"
-msgstr "త�యజించ�(_Q)"
-
-#: ../ui/evolution.xml.h:52
-msgid "_Switcher Appearance"
-msgstr "స�విచ�చర� కనిపించ�విదం(_S)"
-
-#: ../ui/evolution.xml.h:53
-msgid "_Synchronization Options..."
-msgstr "కాలనియమత ఇచ�చాపూర�వకాల�(_S)..."
-
-#: ../ui/evolution.xml.h:54
-msgid "_Text Only"
-msgstr "పాఠ�యమ� మాత�రమే (_T)"
-
-#: ../ui/evolution.xml.h:56
-msgid "_Window"
-msgstr "గవాక�షమ�(_W)"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "కంపెని ద�వారా(_C)"
@@ -21767,31 +21494,28 @@ 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:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>కాలక�షేత�రాల�</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-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.ui.h:2
 msgid "Select a Time Zone"
 msgstr "ఒక కాలక�షేత�రమ�న� ఎంపిక చేయ�మ�"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr "కాలక�షేత�రమ�(_Z)"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid "Timezone drop-down combination box"
 msgstr "సమయక�షేత�రం డ�రాప�-డౌన� య�గళ పెట�టె"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -21801,30 +21525,33 @@ msgstr ""
 "ఎంచ�కొన�మ�.\n"
 "జూమ� తగ�గించ�టక� మౌస� క�డి బటన� న� ఉపయోగించ�మ�."
 
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+#, fuzzy
+msgid "_Selection"
+msgstr "ఎంపిక సంవిధానం"
+
 #: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "సంప�టమ�"
 
-#: ../widgets/menus/gal-define-views-dialog.c:356
-#: ../widgets/menus/gal-define-views.glade.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%s క� దర�శనాలన� నిర�వచించ�"
 
-#: ../widgets/menus/gal-define-views-dialog.c:364
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:337
 msgid "Define Views"
 msgstr "దర�శనాలన� నిర�వచించ�"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
+#: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "\"%s\" క� దర�శనాలన� నిర�వచించ�"
 
-#: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/menus/gal-view-factory-etable.c:113
 msgid "Table"
 msgstr "పట�టిక"
 
@@ -21832,237 +21559,227 @@ msgstr "పట�టిక"
 msgid "Instance"
 msgstr "ఇన�‌స�టాన�స�"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "ప�రస�త�త దర�శనాన�ని దాయ�మ�"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 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.ui.h:3
 msgid "_Replace existing view"
 msgstr "ఉన�న దర�శనమ�న� ప�న:స�థాపించ�మ�(_R)"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:580
-#: ../widgets/menus/gal-view-menus.c:365
-msgid "Custom View"
-msgstr "మలచిన దర�శనమ�"
-
-#: ../widgets/menus/gal-view-instance.c:581
-msgid "Save Custom View"
-msgstr "మలచిన దర�శనమ�న� దాయ�మ�"
-
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:388
-msgid "Define Views..."
-msgstr "దర�శనమ�లన� నిర�వచించ�..."
-
-#: ../widgets/menus/gal-view-menus.c:304
-msgid "C_urrent View"
-msgstr "ప�రస�త�త దర�శనం(_u)"
-
-#: ../widgets/menus/gal-view-menus.c:327
-#, c-format
-msgid "Select View: %s"
-msgstr "దర�శనంన� ఎంపికచేయ�మ�: %s"
-
-#: ../widgets/menus/gal-view-menus.c:370
-msgid "Current view is a customized view"
-msgstr "ప�రస�త�త దర�శనం మలచ�కొనబడ�డ దర�శనమ�న�"
-
-#: ../widgets/menus/gal-view-menus.c:374
-msgid "Save Custom View..."
-msgstr "మలచిన దర�శనమ�న� దాయ�మ�..."
-
-#: ../widgets/menus/gal-view-menus.c:379
-msgid "Save current custom view"
-msgstr "ప�రస�త�త మలచిన దర�శనమ�న� దాయ�మ�"
-
-#: ../widgets/menus/gal-view-menus.c:393
-msgid "Create or edit views"
-msgstr "దర�శనాలన� సృష�టించ� లేదా సరిచేయ�"
-
-#: ../widgets/menus/gal-view-new-dialog.c:68
+#: ../widgets/menus/gal-view-new-dialog.c:67
 msgid "Factory"
 msgstr "కార�మాగారం"
 
-#: ../widgets/menus/gal-view-new-dialog.c:103
+#: ../widgets/menus/gal-view-new-dialog.c:98
 msgid "Define New View"
 msgstr "కొత�త దర�శనమ�న� నిర�వచించ�"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "కొత�త దర�శనం యొక�క పేర�:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
 msgstr "దర�శనం రకం"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "దర�శన రకం:"
 
-#: ../widgets/misc/e-attachment.c:990
-#| msgid "Attached message"
-#| msgid_plural "%d attached messages"
-msgid "Attached message"
-msgstr "అన�భందించిన సందేశమ�"
-
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
-#: ../widgets/misc/e-attachment-store.c:636
-#| msgid "attachment"
-msgid "attachment.dat"
-msgstr "attachment.dat"
-
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
-msgid "A load operation is already in progress"
-msgstr "లోడ� ఆపరేషన� యిప�పటికే ప�రోగతిలో వ�ంది"
-
-#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
-msgid "A save operation is already in progress"
-msgstr "దాయ� ఆపరేషన� యిప�పటికే ప�రోగతిలోవ�ంది"
-
-#: ../widgets/misc/e-attachment.c:1923
-#, c-format
-#| msgid "Could not load address book"
-msgid "Could not load '%s'"
-msgstr "'%s' లోడ� చేయలేక పోయింది"
-
-#: ../widgets/misc/e-attachment.c:1926
-#, c-format
-#| msgid "Could not open the link."
-msgid "Could not load the attachment"
-msgstr "అన�భందమ�న� లోడ� చేయలేక పోయింది"
-
-#: ../widgets/misc/e-attachment.c:2190
-#, c-format
-#| msgid "Could not open source"
-msgid "Could not open '%s'"
-msgstr "'%s'న� తెర�వలేక పోయింది"
+#: ../widgets/misc/e-account-manager.c:348
+msgid "De_fault"
+msgstr "అప�రమేయ(_f)"
 
-#: ../widgets/misc/e-attachment.c:2193
-#, c-format
-#| msgid "Could not open the link."
-msgid "Could not open the attachment"
-msgstr "అన�భందమ�న� తెర�వలేక పోయింది"
+#: ../widgets/misc/e-account-tree-view.c:224
+#, fuzzy
+msgid "Account Name"
+msgstr "ఖాతా నామమ�"
 
-#: ../widgets/misc/e-attachment.c:2635
-#| msgid "Attachment Reminder"
-msgid "Attachment contents not loaded"
-msgstr "అన�భందమ� సారమ�ల� లోడ� కాలేద�"
+#: ../widgets/misc/e-account-tree-view.c:255
+msgid "Protocol"
+msgstr "నియమం"
 
-#: ../widgets/misc/e-attachment.c:2712
-#, c-format
-#| msgid "Could not execute '%s': %s\n"
-msgid "Could not save '%s'"
-msgstr "'%s'న� దాయలేక పోయింది"
+#: ../widgets/misc/e-action-combo-box.c:388
+#, fuzzy
+msgid "Action"
+msgstr "క�రియల�(_A)"
 
-#: ../widgets/misc/e-attachment.c:2715
-#, c-format
-#| msgid "Select folder to save all attachments"
-msgid "Could not save the attachment"
-msgstr "అన�భందమ�న� దాయలేక పోయింది"
+#: ../widgets/misc/e-action-combo-box.c:389
+msgid "A GtkRadioAction"
+msgstr ""
 
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "అన�బంధం లక�షణాల�"
 
 #: ../widgets/misc/e-attachment-dialog.c:328
-#| msgid "F_ilename:"
 msgid "_Filename:"
 msgstr "దస�త�రనామమ� (_F):"
 
 #: ../widgets/misc/e-attachment-dialog.c:363
-#| msgid "MIME Type"
 msgid "MIME Type:"
 msgstr "MIME à°°à°•à°‚:"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
-#| msgid "Set as _Background"
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "_Suggest automatic display of attachment"
+msgstr "స�వయంచాలక అన�బంధ ప�రదర�శనాన�ని సూచించ�మ�(_S)"
+
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "బ�యాక�‌గ�రౌండ� వలె అమర�చలేక పోయింది"
 
+#: ../widgets/misc/e-attachment-handler-image.c:149
+msgid "Set as _Background"
+msgstr "బ�యాక�‌గ�రౌండ� లా అమర�చ�మ�(_B)"
+
 #: ../widgets/misc/e-attachment-handler-sendto.c:87
-#| msgid "Could not open the link."
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "అన�భందమ�న� పంపలేక పోయింది"
 msgstr[1] "అన�భందమ�లన� పంపలేక పోయింది"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:129
-#| msgid "Send To:"
 msgid "_Send To..."
 msgstr "దీనికి పంపించ�... (_S)"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:131
-#| msgid "Select folder to save selected attachments..."
 msgid "Send the selected attachments somewhere"
 msgstr "ఎంపికచేసిన అన�భందాలన� యేదోవొక చోటకి పంప�మ�"
 
 #: ../widgets/misc/e-attachment-icon-view.c:480
 #: ../widgets/misc/e-attachment-tree-view.c:517
-#| msgid "Loading..."
 msgid "Loading"
 msgstr "లోడవ�చ�న�నది"
 
 #: ../widgets/misc/e-attachment-icon-view.c:492
 #: ../widgets/misc/e-attachment-tree-view.c:529
-#| msgid "Shading"
 msgid "Saving"
 msgstr "దాయ�చ�న�నది"
 
 #: ../widgets/misc/e-attachment-paned.c:87
-msgid "Hide _Attachment Bar"
+#, fuzzy
+msgid "Hide Attachment _Bar"
 msgstr "అన�భంద పట�టీని మర�గ�పర�చ�మ�(_A)"
 
 #: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:626
+#, fuzzy
+msgid "Show Attachment _Bar"
+msgstr "అన�భంద పట�టీని చూప�మ�(_A)"
+
+#: ../widgets/misc/e-attachment-paned.c:631
 msgid "Show _Attachment Bar"
 msgstr "అన�భంద పట�టీని చూప�మ�(_A)"
 
-#: ../widgets/misc/e-attachment-store.c:541
-#| msgid "Attachment"
-#| msgid_plural "Attachments"
+#: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "అన�భందమ�న� జతచేయి"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:541
 msgid "A_ttach"
 msgstr "అన�భందమ�(_t)"
 
-#: ../widgets/misc/e-attachment-store.c:607
-#| msgid "Save attachments"
+#: ../widgets/misc/e-attachment-store.c:604
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "అన�భందమ�న� దాయి"
 msgstr[1] "అన�భందమ�లన� దాయి"
 
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:633
+#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
 #: ../widgets/misc/e-attachment-view.c:300
 msgid "S_ave All"
 msgstr "అన�నిటినీ దాయ�మ�(_a)"
 
 #: ../widgets/misc/e-attachment-view.c:326
-#| msgid "_Add attachment..."
 msgid "A_dd Attachment..."
 msgstr "అన�భందంన� జతపర�చ�మ�... (_d)"
 
-#: ../widgets/misc/e-attachment-view.c:643
+#: ../widgets/misc/e-attachment-view.c:350
+msgid "_Hide"
+msgstr "మర�గ�పర�చ�(_H)"
+
+#: ../widgets/misc/e-attachment-view.c:357
+msgid "_View Inline"
+msgstr "ఇన�‌లైన� న� దర�శించ�(_V)"
+
+#: ../widgets/misc/e-attachment-view.c:639
 #, c-format
-#| msgid "Open in %s..."
 msgid "Open with \"%s\""
 msgstr "\"%s\"తో తెర�వ�మ�"
 
-#: ../widgets/misc/e-attachment-view.c:646
+#: ../widgets/misc/e-attachment-view.c:642
 #, c-format
-#| msgid "Save attachment as"
 msgid "Open this attachment in %s"
 msgstr "%s నంద� ఈ అన�భందమ�న� తెర�వ�మ�"
 
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../widgets/misc/e-attachment.c:1002
+msgid "Attached message"
+msgstr "అన�భందించిన సందేశమ�"
+
+#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+msgid "A load operation is already in progress"
+msgstr "లోడ� ఆపరేషన� యిప�పటికే ప�రోగతిలో వ�ంది"
+
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+msgid "A save operation is already in progress"
+msgstr "దాయ� ఆపరేషన� యిప�పటికే ప�రోగతిలోవ�ంది"
+
+#: ../widgets/misc/e-attachment.c:1920
+#, c-format
+msgid "Could not load '%s'"
+msgstr "'%s' లోడ� చేయలేక పోయింది"
+
+#: ../widgets/misc/e-attachment.c:1923
+#, c-format
+msgid "Could not load the attachment"
+msgstr "అన�భందమ�న� లోడ� చేయలేక పోయింది"
+
+#: ../widgets/misc/e-attachment.c:2199
+#, c-format
+msgid "Could not open '%s'"
+msgstr "'%s'న� తెర�వలేక పోయింది"
+
+#: ../widgets/misc/e-attachment.c:2202
+#, c-format
+msgid "Could not open the attachment"
+msgstr "అన�భందమ�న� తెర�వలేక పోయింది"
+
+#: ../widgets/misc/e-attachment.c:2637
+msgid "Attachment contents not loaded"
+msgstr "అన�భందమ� సారమ�ల� లోడ� కాలేద�"
+
+#: ../widgets/misc/e-attachment.c:2713
+#, c-format
+msgid "Could not save '%s'"
+msgstr "'%s'న� దాయలేక పోయింది"
+
+#: ../widgets/misc/e-attachment.c:2716
+#, c-format
+msgid "Could not save the attachment"
+msgstr "అన�భందమ�న� దాయలేక పోయింది"
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
+#: ../widgets/misc/e-buffer-tagger.c:363
+#, fuzzy
+msgid "Ctrl-click to open a link"
+msgstr "%s తెర�వ�టక� నొకండి"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1253
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -22070,58 +21787,58 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "నెల క�యాలెండర�"
 
-#: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
-#: ../widgets/text/e-text.c:3633
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
+#: ../widgets/text/e-text.c:3400
 msgid "Fill color"
 msgstr "రంగ� నింప�మ�"
 
-#: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:462
-#: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
-#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
-#: ../widgets/text/e-text.c:3647
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479
+#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
+#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
+#: ../widgets/text/e-text.c:3414
 msgid "GDK fill color"
 msgstr "GDK నింప� వర�ణమ�"
 
-#: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
-#: ../widgets/text/e-text.c:3654
+#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
+#: ../widgets/text/e-text.c:3421
 msgid "Fill stipple"
 msgstr "చ�క�కలతో నింప�మ�"
 
-#: ../widgets/misc/e-canvas-background.c:482
-#: ../widgets/misc/e-canvas-background.c:483
+#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:489
-#: ../widgets/misc/e-canvas-background.c:490
+#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:496
-#: ../widgets/misc/e-canvas-background.c:497
+#: ../widgets/misc/e-canvas-background.c:513
+#: ../widgets/misc/e-canvas-background.c:514
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:503
-#: ../widgets/misc/e-canvas-background.c:504
+#: ../widgets/misc/e-canvas-background.c:520
+#: ../widgets/misc/e-canvas-background.c:521
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/misc/e-canvas-vbox.c:89
+#: ../widgets/table/e-table-group-container.c:1009
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3062
+#: ../widgets/table/e-table-item.c:2884
 msgid "Minimum width"
 msgstr "కనిష�ఠ వెడెల�ప�"
 
-#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
-#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/misc/e-canvas-vbox.c:90
+#: ../widgets/table/e-table-group-container.c:1010
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3063
+#: ../widgets/table/e-table-item.c:2885
 msgid "Minimum Width"
 msgstr "కనిష�ఠ వెడల�ప�"
 
@@ -22129,198 +21846,166 @@ msgstr "కనిష�ఠ వెడల�ప�"
 msgid "Spacing"
 msgstr "స�పేసింగ�"
 
-#: ../widgets/misc/e-cell-date-edit.c:296
-msgid "Now"
-msgstr "ఇప�ప�డ�"
-
-#: ../widgets/misc/e-cell-date-edit.c:846
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "సమయం %s రూపలావణ�యంలో ఉండాలి:"
-
-#: ../widgets/misc/e-cell-percent.c:76
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "శాతం విల�వ తప�పక 0 మరియ� 100 మద�య ఉండాలి, కల�ప�కొని"
-
-#: ../widgets/misc/e-charset-picker.c:57
-msgid "Arabic"
-msgstr "అరబిక�"
-
-#: ../widgets/misc/e-charset-picker.c:58
-msgid "Baltic"
-msgstr "బాల�టిక�"
-
-#: ../widgets/misc/e-charset-picker.c:59
-msgid "Central European"
-msgstr "సెంట�రల� యూరోపియన�"
-
-#: ../widgets/misc/e-charset-picker.c:60
-msgid "Chinese"
-msgstr "చైనీస�"
-
-#: ../widgets/misc/e-charset-picker.c:61
-msgid "Cyrillic"
-msgstr "సిరిల�లిక�"
-
-#: ../widgets/misc/e-charset-picker.c:62
-msgid "Greek"
-msgstr "గ�రీక�"
-
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Hebrew"
-msgstr "హెబ�రివ�"
-
-#: ../widgets/misc/e-charset-picker.c:64
-msgid "Japanese"
-msgstr "జపనీస�"
-
-#: ../widgets/misc/e-charset-picker.c:65
-msgid "Korean"
-msgstr "కొరియన�"
-
-#: ../widgets/misc/e-charset-picker.c:66
-msgid "Thai"
-msgstr "థాయ�"
-
-#: ../widgets/misc/e-charset-picker.c:67
-msgid "Turkish"
-msgstr "టర�కిష�"
-
-#: ../widgets/misc/e-charset-picker.c:68
-msgid "Unicode"
-msgstr "యూనికోడ�"
-
-#: ../widgets/misc/e-charset-picker.c:69
-msgid "Western European"
-msgstr "వెస�త�రన� యూరోపియన�"
-
-#: ../widgets/misc/e-charset-picker.c:70
-msgid "Western European, New"
-msgstr "వెస�త�రన� యూరోపియన�, కొత�త"
-
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
-#: ../widgets/misc/e-charset-picker.c:91
-msgid "Traditional"
-msgstr "సంప�రదాయమైన"
-
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-msgid "Simplified"
-msgstr "సరళీకరించిన"
-
-#: ../widgets/misc/e-charset-picker.c:98
-msgid "Ukrainian"
-msgstr "ఉక�రేనియన�"
-
-#: ../widgets/misc/e-charset-picker.c:101
-msgid "Visual"
-msgstr "దార�శనీక"
-
-#: ../widgets/misc/e-charset-picker.c:170
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "అపరిచిత %s అక�షర సంకేతరచన:"
-
-#: ../widgets/misc/e-charset-picker.c:215
+#: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "అక�షర సంకేతరచన"
 
-#: ../widgets/misc/e-charset-picker.c:230
+#: ../widgets/misc/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "ఉపయోగించడానికి అక�షరమాలన� ఎక�కించ�మ�"
 
-#: ../widgets/misc/e-charset-picker.c:337
+#: ../widgets/misc/e-charset-combo-box.c:336
 msgid "Other..."
 msgstr "ఇతర..."
 
-#: ../widgets/misc/e-charset-picker.c:599
-msgid "Ch_aracter Encoding"
-msgstr "అక�షర సంకేతరచన(_a)"
-
-#: ../widgets/misc/e-dateedit.c:295
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "తేది మరియ� సమయం"
 
-#: ../widgets/misc/e-dateedit.c:315
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "ఎగ�బడి తేదీని పాఠ�యమ� గా ఎక�కించ�మ�"
 
-#: ../widgets/misc/e-dateedit.c:337
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "క�యాలెండర� ని చూపించ�టక� బొత�తం న� నొక�కండి"
 
-#: ../widgets/misc/e-dateedit.c:379
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "సమయంన� ఎంచ�కొన�టక� డ�రాప�-డౌన� య�గళ పెట�టె"
 
-#: ../widgets/misc/e-dateedit.c:455
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "ఇప�ప�డ�(_w)"
 
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "ఈ రోజ�(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1583
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:677
+msgid "_None"
+msgstr "�దికాద�(_N)"
+
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1918
+#, fuzzy
+msgctxt "date"
+msgid "None"
+msgstr "�దికాద�"
+
+#: ../widgets/misc/e-dateedit.c:1813
 msgid "Invalid Date Value"
 msgstr "నిస�సార తారీఖ� విల�వ"
 
-#: ../widgets/misc/e-dateedit.c:1613
+#: ../widgets/misc/e-dateedit.c:1857
 msgid "Invalid Time Value"
 msgstr "చెల�లని కాలం విల�వ"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
-#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
-msgid "Advanced Search"
-msgstr "ఉన�నతమైన వెత�క�"
+#: ../widgets/misc/e-import-assistant.c:238
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"ఎవాల�యూషన� క� దిగ�మతి చేయాలన�క�ంట�న�న దస�త�రాన�ని ఎంచ�కొన�మ�, మరియ� జాబితాన�ండి � రకమైన దస�త�రమో "
+"ఎంచ�కొన�మ�."
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:229
-msgid "Save Search"
-msgstr "వెతికిన దానిని దాచ�మ�"
+#: ../widgets/misc/e-import-assistant.c:255
+msgid "F_ilename:"
+msgstr "దస�త�రనామమ�(_i):"
 
-#: ../widgets/misc/e-filter-bar.c:266
-msgid "_Searches"
-msgstr "వెత�క�ట(_S)"
+#: ../widgets/misc/e-import-assistant.c:265
+msgid "Select a file"
+msgstr "ఒక దస�త�రాన�ని ఎంచ�కొన�మ�"
 
-#: ../widgets/misc/e-filter-bar.c:268
-msgid "Searches"
-msgstr "శోధనల�"
+#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:455
+msgid "File _type:"
+msgstr "దస�త�రం రకం(_t):"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
-msgid "_Save Search..."
-msgstr "వెత�క�న� దాయ�మ�(_S)..."
+#: ../widgets/misc/e-import-assistant.c:322
+msgid "Choose the destination for this import"
+msgstr "ఈ దిగ�మతికి గమ�యాన�ని ఎంచ�కొన�మ�"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
-msgid "_Edit Saved Searches..."
-msgstr "దాచిన వెత�క�ఫలితాలన� సరిచేయ�(_E)..."
+#: ../widgets/misc/e-import-assistant.c:347
+msgid "Choose the type of importer to run:"
+msgstr "నడ�చ�టక� దిగ�మతిచేయ� రకాన�ని ఎంచ�కొన�మ�:"
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
-msgid "_Advanced Search..."
-msgstr "అద�నాతన శోధన(_A)..."
+#: ../widgets/misc/e-import-assistant.c:355
+msgid "Import data and settings from _older programs"
+msgstr "పాత కార�యక�రమాలన�ండి దత�తాంశాన�ని మరియ� అమరికలన� దిగ�మతి చేయ�మ�"
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "అన�ని ఖాతాల�"
+#: ../widgets/misc/e-import-assistant.c:363
+msgid "Import a _single file"
+msgstr "ఒకేఒక దస�త�రాన�ని దిగ�మతిచేయ�(_s)"
 
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "ప�రస�త�త ఖాతా"
+#: ../widgets/misc/e-import-assistant.c:439
+msgid "Select what type of file you want to import from the list."
+msgstr ""
 
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "ప�రస�త�త సంచయం"
+#: ../widgets/misc/e-import-assistant.c:516
+#, fuzzy
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"ఈ క�రింది అన�వర�తనంల న�ండి దిగ�మతి చేయ�టక� ఎవాల�యూషన� అమరికల కొరక�\n"
+"పరిశీలిస�తోంది: పైన�,నెట�‌స�కేప�,ఈఎల�ఎమ�,�క�యాలెండర�. � దిగ�మతికారక\n"
+"అమరికల� కనబడలేద�. మీర� మరలా ప�రయత�నించ�టక�\n"
+"ఇష�టపడితే, దయచేసి \"వెన�కక�\" బటన� న� నొక�కండి.\n"
+
+#: ../widgets/misc/e-import-assistant.c:1187
+#: ../widgets/misc/e-import-assistant.c:1214
+msgid "Evolution Import Assistant"
+msgstr "ఎవల�యూషన� దిగ�మతి సహాయక�డ�"
 
-#: ../widgets/misc/e-image-chooser.c:168
-msgid "Choose Image"
-msgstr " ప�రతిరూపాన�ని ఎంపికచేయ�"
+#: ../widgets/misc/e-import-assistant.c:1196
+#: ../widgets/misc/e-import-assistant.c:1248
+msgid "Import Location"
+msgstr "స�థానాన�ని దిగ�మతి చేయ�మ�"
+
+#: ../widgets/misc/e-import-assistant.c:1207
+#, fuzzy
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"ఎవాల�యూషన� దిగ�మతి సహాయకికి స�వాగతం.\n"
+"ఈ సహాయకి ద�వారా మీర� బహిర�గత దస�త�రాలన� ఎవాల�యూషన� క� దిగ�మతి చేయ�\n"
+"కార�యక�రమం నంద� మార�గదర�శనం చేయబడతార�."
 
-#: ../widgets/misc/e-map.c:605
+#: ../widgets/misc/e-import-assistant.c:1223
+msgid "Importer Type"
+msgstr "దిగ�మతిదార�ని  రకం"
+
+#: ../widgets/misc/e-import-assistant.c:1232
+msgid "Select Information to Import"
+msgstr "దిగ�మతిచేయ�టక� సమాచారమ�న� ఎంపికచేయ�మ�"
+
+#: ../widgets/misc/e-import-assistant.c:1240
+msgid "Select a File"
+msgstr "దస�త�రం న�  ఎంచ�కొన�మ�"
+
+#: ../widgets/misc/e-import-assistant.c:1255
+#, fuzzy
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "దస�త�రాన�ని ఎవాల�యూషన� క� దిగ�మతిచేయ�ట ప�రారభించ�టక� \"దిగ�మతి\" నొక�కండి. "
+
+#: ../widgets/misc/e-import-assistant.c:1261
+#: ../widgets/misc/e-import-assistant.c:1271
+#, fuzzy
+msgid "Import Data"
+msgstr "మ�ఖ�యమైన"
+
+#: ../widgets/misc/e-map.c:629
 msgid "World Map"
 msgstr "ప�రపంచ పట�టా"
 
-#: ../widgets/misc/e-map.c:607
+#: ../widgets/misc/e-map.c:631
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22328,86 +22013,128 @@ msgstr ""
 "సమయక�షేత�రాన�ని ఎంచ�కొన�టక� మౌస�-ఆదారిత పరిస�పందిత పఠం విడ�జట�. కీబోర�డ� వినియోగదార�ల� సమయక�షేత�రాన�ని "
 "క�రింది డ�రాప�-డౌన� య�గళ పెట�టె న�ండి ఎంచ�కొవలెన�."
 
-#: ../widgets/misc/e-online-button.c:106
-msgid "Online"
-msgstr "ఆన�‌లైన�"
+#: ../widgets/misc/e-online-button.c:27
+#, fuzzy
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"ఎవల�యూషన� ప�రస�త�తం ఆన�‌లైన�లో వ�ంది.\n"
+"ఆఫ�‌లైన�‌గా పనిచేయ�టక� ఈబటన�‌పై నొక�క�మ�."
 
-#: ../widgets/misc/e-online-button.c:107
+#: ../widgets/misc/e-online-button.c:30
+#, fuzzy
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"ఎవల�యూషన� ప�రస�త�తం ఆఫ�‌లైన�లో వ�ంది.\n"
+"ఆన�‌లైన�లో పనిచేయడానికి ఈ బొత�తమ�న� నొక�కండి."
+
+#: ../widgets/misc/e-online-button.c:33
+#, fuzzy
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr ""
+"ఎవల�యూషన� ప�రస�త�తం ఆఫ�‌లైన�లో వ�ంది.\n"
+"ఆన�‌లైన�లో పనిచేయడానికి ఈ బొత�తమ�న� నొక�కండి."
+
+#: ../widgets/misc/e-online-button.c:135
 msgid "The button state is online"
 msgstr "బోత�తమ� స�థితి ఆన�‌లైన�"
 
+#: ../widgets/misc/e-paned.c:306
+#, fuzzy
+msgid "Horizontal Position"
+msgstr "సమతలంగా ఉన�న పలక స�థానమ�"
+
+#: ../widgets/misc/e-paned.c:307
+msgid "Pane position when oriented horizontally"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:318
+#, fuzzy
+msgid "Vertical Position"
+msgstr "నిల�వ�గావ�న�న పలక స�థానం"
+
+#: ../widgets/misc/e-paned.c:319
+msgid "Pane position when oriented vertically"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:330
+#, fuzzy
+msgid "Proportion"
+msgstr "లక�షణాల�(_P)"
+
+#: ../widgets/misc/e-paned.c:331
+msgid "Proportion of the 2nd pane size"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:342
+#, fuzzy
+msgid "Fixed Resize"
+msgstr "ప�న: పరిమాణమ�(_R)"
+
+#: ../widgets/misc/e-paned.c:343
+msgid "Keep the 2nd pane fixed during resize"
+msgstr ""
+
 #
-#: ../widgets/misc/e-pilot-settings.c:99
+#: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "కాలనియమంతో:"
 
-#: ../widgets/misc/e-pilot-settings.c:107
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync Private Records:"
 msgstr "కాలనియమిత స�వంత రికార�డ�ల�:"
 
-#: ../widgets/misc/e-pilot-settings.c:116
+#: ../widgets/misc/e-pilot-settings.c:112
 msgid "Sync Categories:"
 msgstr "కాలనియమిత విభాగాల�:"
 
-#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
-msgid "Empty message"
-msgstr "ఖాళీ సందేశం"
-
-#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
-msgid "Reflow model"
-msgstr "తిరిగివేళ�ళ� రీతి"
+#: ../widgets/misc/e-preferences-window.c:218
+msgid "Evolution Preferences"
+msgstr "ఎవల�యూషన� అభీష�టాల�"
 
-#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
-msgid "Column width"
-msgstr "నిల�వ� పట�టీ వెడల�ప�"
+#: ../widgets/misc/e-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "జోడీల�: %d"
 
-#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
-#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
-#: ../widgets/misc/e-search-bar.c:1021
-msgid "Search"
-msgstr "శోధించ�"
+#: ../widgets/misc/e-search-bar.c:558
+msgid "Close the find bar"
+msgstr "కన�గొన� పట�టీన� మూయ�మ�"
 
-#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
-#: ../widgets/misc/e-search-bar.c:505
-msgid "Click here to change the search type"
-msgstr "శోధన రకాన�ని మార�చ�టక� ఇక�కడ నొక�కండి"
+#: ../widgets/misc/e-search-bar.c:566
+msgid "Fin_d:"
+msgstr "కన�గొన�మ� (_d):"
 
-#: ../widgets/misc/e-search-bar.c:637
-msgid "_Search"
-msgstr "వెత�క�(_S)"
+#: ../widgets/misc/e-search-bar.c:578
+msgid "Clear the search"
+msgstr "శోధనన� శ�భ�రపరచ�మ�"
 
-#: ../widgets/misc/e-search-bar.c:643
-msgid "_Find Now"
-msgstr "ఇప�ప�డ� కన�గొన�మ�(_F)"
+#: ../widgets/misc/e-search-bar.c:601
+msgid "_Previous"
+msgstr "మ�ందలి(_P)"
 
-#: ../widgets/misc/e-search-bar.c:644
-msgid "_Clear"
-msgstr "శ�బ�రం చేయ�(_C)"
+#: ../widgets/misc/e-search-bar.c:607
+msgid "Find the previous occurrence of the phrase"
+msgstr "పదమ�యొక�క మ�న�పటి సంభవాన�ని కన�గొన�మ�"
 
-#: ../widgets/misc/e-search-bar.c:899
-msgid "Item ID"
-msgstr "అంశం  యొక�కID"
+#: ../widgets/misc/e-search-bar.c:617
+msgid "_Next"
+msgstr "తర�వాతి(_N)"
 
-#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
-msgid "Text"
-msgstr "పాఠం"
+#: ../widgets/misc/e-search-bar.c:623
+msgid "Find the next occurrence of the phrase"
+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:1053
-msgid "Sho_w: "
-msgstr "చూప�మ�:"
+#: ../widgets/misc/e-search-bar.c:633
+msgid "Mat_ch case"
+msgstr "సరిపోల� సందర�భమ� (_c)"
 
-#: ../widgets/misc/e-search-bar.c:1072
-msgid "Sear_ch: "
-msgstr "శోధించ�(_c): "
+#: ../widgets/misc/e-search-bar.c:661
+msgid "Reached bottom of page, continued from top"
+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:1088
-msgid " i_n "
-msgstr "లోపల(_n)"
+#: ../widgets/misc/e-search-bar.c:683
+msgid "Reached top of page, continued from bottom"
+msgstr "పేజీ పైనక� చేర�కొన�నది, క�రింది న�ండి కొనసాగిస�త�ంది"
 
 #: ../widgets/misc/e-selection-model-array.c:593
 #: ../widgets/table/e-tree-selection-model.c:803
@@ -22419,321 +22146,433 @@ msgstr "కర�సర� అడ�డ�వర�స"
 msgid "Cursor Column"
 msgstr "మ�ల�క� లిల�వ�పట�టీ"
 
-#: ../widgets/misc/e-selection-model.c:208
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Sorter"
 msgstr "క�రమమ�చేయ�నది"
 
-#: ../widgets/misc/e-selection-model.c:215
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Selection Mode"
 msgstr "ఎంపిక సంవిధానం"
 
-#: ../widgets/misc/e-selection-model.c:223
+#: ../widgets/misc/e-selection-model.c:231
 msgid "Cursor Mode"
 msgstr "మ�ల�క� సంవిధానం"
 
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "తొలగించబడినప�ప�డ�(_l)"
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>పంపించ�టక� ఇచ�చాపూర�వకాల�</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>సమాధానాల�</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>తాఖీద�న� వెనక�కి పంప�మ�</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>స�స�థితిని గమనించ�ట</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
 msgstr "పంపించిన అంశాన�ని స�వయంచాలకంగా తొలగించ�మ�(_u)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
+#: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
 msgstr "సమాచార గమనికక� పంపించిన అంశాన�ని సృష�టించ�మ�(_e)"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
 msgstr "చేరినది మరియ� తెరవబడినది(_v)"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.ui.h:5
+#, fuzzy
+msgid "Delivery Options"
+msgstr "<b>పంపించ�టక� ఇచ�చాపూర�వకాల�</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgid "For Your Eyes Only"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
 msgstr "సాధారణ ఇచ�చాపూర�వకాల�(_r)"
 
-#: ../widgets/misc/e-send-options.glade.h:9
-msgid ""
-"None\n"
-"Mail Receipt"
+#: ../widgets/misc/e-send-options.ui.h:10
+#, fuzzy
+msgid "Mail Receipt"
 msgstr ""
 "�దీకాద�\n"
 "మెయిల� రశీద�"
 
-#: ../widgets/misc/e-send-options.glade.h:11
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
-msgstr ""
-"సాదారణ\n"
-"వ�యాపార\n"
-"వ�యక�తిగతమైన\n"
-"రహస�యం\n"
-"అతిరహస�యం\n"
-"మీ కళ�ళక� మాత�రమే"
+#: ../widgets/misc/e-send-options.ui.h:14
+#, fuzzy
+msgid "Proprietary"
+msgstr "ప�రాధాన�యత"
 
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "జవాబ� కోరినది(_e)"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.ui.h:17
+#, fuzzy
+msgid "Return Notification"
+msgstr "<b>తాఖీద�న� వెనక�కి పంప�మ�</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Sta_tus Tracking"
 msgstr "స�స�థితిని  గమనించ�ట(_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"నిర�వచించని\n"
-"ఎక�క�వ\n"
-"ప�రామాణిక\n"
-"తక�క�వ"
+#: ../widgets/misc/e-send-options.ui.h:21
+#, fuzzy
+msgid "Standard"
+msgstr "ప�రామాణిక ఫాంట�(_t):"
 
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.ui.h:22
+#, fuzzy
+msgid "Status Tracking"
+msgstr "స�స�థితిని  గమనించ�ట(_t)"
+
+#: ../widgets/misc/e-send-options.ui.h:23
+#, fuzzy
+msgid "Top Secret"
+msgstr "అత�యంతరహస�యం"
+
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When acce_pted:"
 msgstr "ఆమోదించినప�ప�డ�(_p):"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "When co_mpleted:"
 msgstr "పూర�తయినప�ప�డ�(_m):"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "When decli_ned:"
 msgstr "క�షీణించబడినప�ప�డ�(_n):"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "Wi_thin"
 msgstr "లోపల(_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "_After:"
 msgstr "తర�వాత(_A):"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "_All information"
 msgstr "సమాచారం అంతా(_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:30
-#| msgid "_Classification"
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_Classification:"
 msgstr "వర�గీకరణ (_C):"
 
-#. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Delay message delivery"
 msgstr "ఆలస�య సందేశం చేరినది(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delivered"
 msgstr "చేరినది(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Set expiration date"
 msgstr "కాలంచెల�లే తేదీని ఆమర�చ�(_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Until:"
 msgstr "అప�పటివరక�(_U):"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "అన�కూలమైనప�ప�డ�(_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "తెరచినప�ప�డ�(_W):"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:251
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#: ../widgets/misc/e-signature-editor.c:133
+#: ../widgets/misc/e-signature-editor.c:549
+#: ../widgets/misc/e-signature-manager.c:349
+#: ../widgets/misc/e-signature-script-dialog.c:218
+msgid "Unnamed"
+msgstr "నామమ�లేని"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
-#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:257
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% పూర�తి అయినది)"
+#: ../widgets/misc/e-signature-editor.c:210
+msgid "_Save and Close"
+msgstr "దాయి మరియ� మూయ�మ� (_S)"
+
+#: ../widgets/misc/e-signature-editor.c:389
+msgid "Edit Signature"
+msgstr "సంతకాన�ని సరిచేయి"
+
+#: ../widgets/misc/e-signature-editor.c:404
+msgid "_Signature Name:"
+msgstr "సంతకమ� నామమ� (_S):"
 
-#: ../widgets/misc/e-url-entry.c:103
+#: ../widgets/misc/e-signature-manager.c:294
+#, fuzzy
+msgid "Add Signature Script"
+msgstr "సతకం లిపిని జతపర�చ�మ�"
+
+#: ../widgets/misc/e-signature-manager.c:359
+#, fuzzy
+msgid "Edit Signature Script"
+msgstr "సంతకాన�ని సరిచేయి"
+
+#: ../widgets/misc/e-signature-manager.c:576
+msgid "Add _Script"
+msgstr "లిపిని కల�ప�మ�(_S)"
+
+#: ../widgets/misc/e-signature-script-dialog.c:266
+#, 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 ""
+"ఈ లిపి యొక�క అవ�ట�‌ప�ట� మీ సంతకంలాగా\n"
+"ఉపయోగించబడ�త�ంది. మీర� తెలిపిన నామమ� ప�రదర�శన వినియోగార�దం మాత�రమే ఉపయోగించబడ�త�ంది."
+
+#: ../widgets/misc/e-signature-script-dialog.c:311
+#, fuzzy
+msgid "S_cript:"
+msgstr "లిపి(_S):"
+
+#: ../widgets/misc/e-signature-script-dialog.c:342
+#, fuzzy
+msgid "Script file must be executable."
+msgstr "లిపి దస�త�రమ� తప�పక ఉండాలి మరియ� నిర�వర�తించబడ�నట�ల� ఉండాలి."
+
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "URL క� వెళ�ళ�టక� ఇక�కడ నొక�కండి"
 
+#: ../widgets/misc/e-web-view.c:360
+msgid "_Copy Link Location"
+msgstr "జోడిక స�థానాన�ని నకల� తీయ�మ�(_C)"
+
+#: ../widgets/misc/e-web-view.c:362
+#, fuzzy
+msgid "Copy the link to the clipboard"
+msgstr "క�లిప�‌బోర�డ�నక� విషయమ�లన� నకల�తీయి."
+
+#: ../widgets/misc/e-web-view.c:370
+msgid "_Open Link in Browser"
+msgstr "అన�వేషి లో జోడికన� తెర�వ�మ�(_O)"
+
+#: ../widgets/misc/e-web-view.c:372
+#, fuzzy
+msgid "Open the link in a web browser"
+msgstr "అన�వేషి లో జోడికన� తెర�వ�మ�(_O)"
+
+#: ../widgets/misc/e-web-view.c:380
+#, fuzzy
+msgid "_Copy Email Address"
+msgstr "ఈమెయిల� చిర�నామాన�ని నకల� తీయ�మ�(_E)"
+
+#: ../widgets/misc/e-web-view.c:409 ../widgets/misc/e-web-view.c:1025
+#, fuzzy
+msgid "Select all text and images"
+msgstr "ఒక సందేశమ�లో  పాఠ�యమ�నంతా ఎంచ�కొన�మ�"
+
+#: ../widgets/misc/e-web-view.c:800 ../widgets/misc/e-web-view.c:802
+#: ../widgets/misc/e-web-view.c:804
+#, c-format
+msgid "Click to call %s"
+msgstr "%s క� కాల�‌చేయ�టక� నొక�క�మ�"
+
+#: ../widgets/misc/e-web-view.c:806
+msgid "Click to hide/unhide addresses"
+msgstr "చిర�నామాలన� మర�గ�పరచ�టక�/బయల�పరచ�టక� నొక�కమ�"
+
+#: ../widgets/misc/e-web-view.c:808
+#, c-format
+msgid "Click to open %s"
+msgstr "%s తెర�వ�టక� నొకండి"
+
+#: ../widgets/misc/ea-calendar-item.c:299
+#: ../widgets/misc/ea-calendar-item.c:308
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+# ద�, c-format
+#: ../widgets/misc/ea-calendar-item.c:311
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "క�యాలెండర�: %s న�ండి %s వరక�"
+
+#: ../widgets/misc/ea-calendar-item.c:347
+msgid "evolution calendar item"
+msgstr "ఎవల�యూషన� క�యాలెండర� అంశమ�"
+
 #: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "ప�రత�యక�ష జాబితా"
 
-#: ../widgets/table/e-cell-pixbuf.c:360
+#: ../widgets/table/e-cell-date-edit.c:303
+msgid "Now"
+msgstr "ఇప�ప�డ�"
+
+#. Translators: "None" as a label of a button to unset date in a date table cell
+#: ../widgets/table/e-cell-date-edit.c:320
+#, fuzzy
+msgctxt "table-date"
+msgid "None"
+msgstr "�దికాద�"
+
+#: ../widgets/table/e-cell-date-edit.c:328
+msgid "OK"
+msgstr "సరే"
+
+#: ../widgets/table/e-cell-date-edit.c:878
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "సమయం %s రూపలావణ�యంలో ఉండాలి:"
+
+#: ../widgets/table/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "శాతం విల�వ తప�పక 0 మరియ� 100 మద�య ఉండాలి, కల�ప�కొని"
+
+#: ../widgets/table/e-cell-pixbuf.c:357
 msgid "Selected Column"
 msgstr "ఎంపికచేయబడ�డ నిల�వ�పట�టీ"
 
-#: ../widgets/table/e-cell-pixbuf.c:367
+#: ../widgets/table/e-cell-pixbuf.c:364
 msgid "Focused Column"
 msgstr "కేంద�రీకరించబడిన నిల�వ�పట�టీ"
 
-#: ../widgets/table/e-cell-pixbuf.c:374
+#: ../widgets/table/e-cell-pixbuf.c:371
 msgid "Unselected Column"
 msgstr "ఎంపికకాని నిల�వ�పట�టీ"
 
-#: ../widgets/table/e-cell-text.c:1788
+#: ../widgets/table/e-cell-text.c:1631
 msgid "Strikeout Column"
 msgstr "నిల�వ�పట�టీ ని కొట�టిపారవేయ�మ�"
 
-#: ../widgets/table/e-cell-text.c:1795
+#: ../widgets/table/e-cell-text.c:1638
 msgid "Underline Column"
 msgstr "నిల�వ�పట�టీకి క�రిందగీత"
 
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1645
 msgid "Bold Column"
 msgstr "మందమ� పట�టీ"
 
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1652
 msgid "Color Column"
 msgstr "వర�ణ పట�టీ"
 
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1666
 msgid "BG Color Column"
 msgstr "BG వర�ణ నిల�వ�పట�టీ"
 
-#: ../widgets/table/e-table-config.c:152
+#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+msgid "click to add"
+msgstr "జతచేయ�టక� నొక�కండి"
+
+#: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "స�థితి"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(ఆరోహణాక�రమం)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(అవరోహణాక�రమం)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:388
 msgid "Not sorted"
 msgstr "క�రమపద�దతిలో లేద�"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:429
 msgid "No grouping"
 msgstr "� సమూహం లేద�"
 
-#: ../widgets/table/e-table-config.c:642
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "క�షేత�రాలన� చూపించ�మ�"
 
-#: ../widgets/table/e-table-config.c:663
+#: ../widgets/table/e-table-config.c:658
 msgid "Available Fields"
 msgstr "అంద�బాట�లోవ�న�న క�షేత�రాల�"
 
-#: ../widgets/table/e-table-config.glade.h:1
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "A_vailable Fields:"
 msgstr "అంద�బాట�లోవ�న�న క�షేత�రాల�(_v):"
 
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "Ascending"
 msgstr "ఆరోహణాక�రమం"
 
-#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
 msgstr "అన�నిటిని శ�బ�రం చేయ�"
 
-#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-config.ui.h:4
 msgid "Clear _All"
 msgstr "అన�నిటిని శ�బ�రం చేయ�(_A)"
 
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "Descending"
 msgstr "అవరోహణాక�రమం"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "అంశాలన� దీని ద�వారా సమూహంచేయ�మ�"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.ui.h:9
 msgid "Move _Down"
 msgstr "క�రిందకి జర�ప�(_D)"
 
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.ui.h:10
 msgid "Move _Up"
 msgstr "పైకి జర�ప�(_U)"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.ui.h:12
 msgid "Show _field in View"
 msgstr "దర�శనంలో క�షేత�రాన�ని చూపించ�మ� (_f)"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "దర�శనం లో క�షేత�రాన�ని చూపించ�మ�(_n)"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "దర�శనం లో క�షేత�రాన�ని చూపించ�మ�(_V)"
 
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "క�రమపద�దతి"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "అంశాలన� ఇలా క�రమపద�దతిలో పెట�ట�మ�"
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.ui.h:17
 msgid "Then By"
 msgstr "అప�ప�డ� దీని ద�వారా"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
 msgstr "చూపించబడిన క�షేత�రాల�(_F)..."
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
 msgstr "సమూహం దీని ద�వారా(_G)..."
 
-#: ../widgets/table/e-table-config.glade.h:22
+#: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "దర�శనం లో క�షేత�రాన�ని చూపించ�మ�(_S)"
 
-#: ../widgets/table/e-table-config.glade.h:23
+#: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
 msgstr "ఈ క�షేత�రాలన� క�రమపద�దతిలో చూప�మ�(_S):"
 
-#: ../widgets/table/e-table-config.glade.h:24
+#: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
 msgstr "క�రమపద�దతి(_S)..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:114
-msgid "Add a column..."
-msgstr "నిల�వ� పట�టీని జతచేయ�..."
-
-#: ../widgets/table/e-table-field-chooser.glade.h:1
-msgid "Field Chooser"
-msgstr "క�షేత�రాన�ని ఎంచ�క�నేది"
+#, fuzzy
+msgid "Add a Column"
+msgstr "నిల�వ� పట�టీని జతచేయ�మ�..."
 
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22741,307 +22580,2562 @@ msgstr ""
 "మీర� � స�థానమ�లో అయితే చూపాలన�క�ంట�న�నారో,\n"
 "అక�కడికి మీర� పట�టికక� జతపర�చిన నిల�వ� పట�టీని జర�ప�మ�."
 
-#: ../widgets/table/e-table-group-container.c:341
+#: ../widgets/table/e-table-group-container.c:342
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d అంశమ�)"
 msgstr[1] "%s : %s (%d అంశమ�ల�)"
 
-#: ../widgets/table/e-table-group-container.c:347
+#: ../widgets/table/e-table-group-container.c:348
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d అంశం)"
 msgstr[1] "%s (%d అంశాల�)"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
+#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
 msgid "Alternating Row Colors"
 msgstr "అడ�డపట�టీ  వర�ణాలన� ప�రత�యామ�నయపర�స�త�ంది"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
+#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
 msgid "Horizontal Draw Grid"
 msgstr "సమతలంగా గీసిన గ�రిడ�"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
-#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
+#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
+#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
 msgid "Vertical Draw Grid"
 msgstr "నిల�వ�గా గీసిన గ�రిడ�"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
+#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
+#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
 msgid "Draw focus"
 msgstr "కేంద�రీకరించెన�"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
+#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
 msgid "Cursor mode"
 msgstr "మ�ల�క� సంవిధానం"
 
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
 msgid "Selection model"
 msgstr "ఎంపిక నమూనా"
 
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
+#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
+#: ../widgets/table/e-tree.c:3368
 msgid "Length Threshold"
 msgstr "పొడవ� ఉపక�రమణ"
 
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:982
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
-#: ../widgets/table/e-tree.c:3366
+#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
+#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
+#: ../widgets/table/e-tree.c:3400
 msgid "Uniform row height"
 msgstr "పొందికగల అడ�డపట�టీ ఎత�త�"
 
-#: ../widgets/table/e-table-group-container.c:980
-#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-container.c:989
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "ఫ�రోజన�"
 
-#: ../widgets/table/e-table-header-item.c:1449
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Customize Current View"
 msgstr "ప�రస�త�త దర�శనాన�ని మల�చ�కొన�మ�"
 
-#: ../widgets/table/e-table-header-item.c:1469
+#: ../widgets/table/e-table-header-item.c:1508
 msgid "Sort _Ascending"
 msgstr "ఆరోహణాక�రమం లో  చేయ�మ�(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1470
+#: ../widgets/table/e-table-header-item.c:1511
 msgid "Sort _Descending"
 msgstr "అవరోహణాక�రమం లో చేయ�మ�(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1514
 msgid "_Unsort"
 msgstr "అక�రమపద�దతి(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1517
 msgid "Group By This _Field"
 msgstr "ఈ క�షేత�రమ� ద�వారా సమూహం(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1520
 msgid "Group By _Box"
 msgstr "పెట�టె ద�వారా సమూహం(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1524
 msgid "Remove This _Column"
 msgstr "ఈ నిల�వ� పట�టీని తొలగించ�మ�"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1527
 msgid "Add a C_olumn..."
 msgstr "నిల�వ� పట�టీని జతచేయ�మ�..."
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1531
 msgid "A_lignment"
 msgstr "కేటాయింప�"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1534
 msgid "B_est Fit"
 msgstr "సరి తగిన"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1537
 msgid "Format Column_s..."
 msgstr "నిల�వ� పట�టిలన� రూపలావణ�యం చేయ�మ�"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Custo_mize Current View..."
 msgstr "ప�రస�త�త దర�శనమ�న� మల�చ�కొన�మ�(_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1539
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "_Sort By"
 msgstr "దీనితో క�రమపర�చ� (_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1557
+#: ../widgets/table/e-table-header-item.c:1618
 msgid "_Custom"
 msgstr "మలచ�కొన�(_C)"
 
-#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
 msgid "Table header"
 msgstr "పట�టీ పీఠిక"
 
-#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
 msgid "Table model"
 msgstr "పాఠ�య నమూనా"
 
-#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
 msgid "Cursor row"
 msgstr "మ�ల�క� ఉన�న అడ�డపట�టీ"
 
-#: ../widgets/table/e-table-sorter.c:172
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "సమాచారాన�ని క�రమపద�దతిచేయ�"
 
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
-#: ../widgets/table/e-tree.c:3373
+#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
+#: ../widgets/table/e-tree.c:3407
 msgid "Always search"
 msgstr "ఎల�లప�ప�డ� వెత�క�మ�"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3360
 msgid "Use click to add"
 msgstr "జతచేయ�టక� మీటన� నొక�కండి"
 
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "వృక�షం"
+#: ../widgets/table/e-table.c:3374
+#, fuzzy
+msgid "Vertical Row Spacing"
+msgstr "నిల�వ�గా గీసిన గ�రిడ�"
+
+#: ../widgets/table/e-table.c:3375
+msgid "Vertical space between rows. It is added to top and to bottom of a row"
+msgstr ""
 
-#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
+#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
 msgid "ETree table adapter"
 msgstr "ETree పట�టీని ఇమ�డ�చ�నది"
 
-#: ../widgets/table/e-tree.c:3379
+#: ../widgets/table/e-tree.c:3413
 msgid "Retro Look"
 msgstr "రిట�రో చూప�"
 
-#: ../widgets/table/e-tree.c:3380
+#: ../widgets/table/e-tree.c:3414
 msgid "Draw lines and +/- expanders."
 msgstr "గీతలన� గీయ�మ� +/- విస�తరణిల�."
 
-#: ../widgets/table/e-tree.c:3386
+#: ../widgets/table/e-tree.c:3420
 msgid "Expander Size"
 msgstr "విస�తరిణి పరిమాణం"
 
-#: ../widgets/table/e-tree.c:3387
+#: ../widgets/table/e-tree.c:3421
 msgid "Size of the expander arrow"
 msgstr "విస�తరిణి బాణం యొక�క పరిమాణం"
 
-#: ../widgets/text/e-text.c:2731
+#: ../widgets/table/gal-a11y-e-cell-popup.c:121
+msgid "popup"
+msgstr " ప�రత�యక�షమ�"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+msgid "popup a child"
+msgstr "చైల�డ� న� పాప�‌చేయి"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:616
+msgid "edit"
+msgstr " సరిచేయ�"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr "ఈ అరన�  సరిచేయడం ప�రారంభించండి"
+
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
+msgid "toggle"
+msgstr "మార�ప�"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+msgid "toggle the cell"
+msgstr "అరన� మార�చ�మ�"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:210
+msgid "expand"
+msgstr " విస�తరించ�"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+msgid "expands the row in the ETree containing this cell"
+msgstr "ETree కలిగివ�న�న అర లోని అడ�డపట�టీని విస�తరిస�త�ంది"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:216
+msgid "collapse"
+msgstr "క�ప�పకూల�చ�మ�"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+msgid "collapses the row in the ETree containing this cell"
+msgstr "అరన� కలిగిఉన�న ETree లోని అడ�డ�వర�సన� క�ప�పకూల�చ�మ�"
+
+#: ../widgets/table/gal-a11y-e-cell.c:119
+msgid "Table Cell"
+msgstr "పట�టికలో  అర"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "మీటన� నొక�క�మ�"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+msgid "sort"
+msgstr " చక�కదిద�ద�"
+
+#: ../widgets/text/e-text.c:2486
+msgid "Select All"
+msgstr "అన�నిటిని ఎంచ�కొన�మ�"
+
+#: ../widgets/text/e-text.c:2498
 msgid "Input Methods"
 msgstr "ఎగ�బడి పద�దత�ల�"
 
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
+#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
 msgid "Event Processor"
 msgstr "ఘటన క�రమణిక"
 
-#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
+msgid "Text"
+msgstr "పాఠం"
+
+#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
 msgid "Bold"
 msgstr "మందం"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
 msgid "Strikeout"
 msgstr "కొట�టిపారేయ�మ�"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
 msgid "Anchor"
 msgstr "లంగర�"
 
-#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
 msgid "Justification"
 msgstr "న�యాయం"
 
-#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
+#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
 msgid "Clip Width"
 msgstr "క�లిప� వెడెల�ప�"
 
-#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
 msgid "Clip Height"
 msgstr "క�లిప� ఎత�త�"
 
-#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
 msgid "Clip"
 msgstr "క�లిప�"
 
-#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
 msgid "Fill clip rectangle"
 msgstr "క�లిప� దీర�ఘచత�రస�రాన�ని నింప�మ�"
 
-#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
+#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
 msgid "X Offset"
 msgstr "X ఆఫ�‌సెట�"
 
-#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
+#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
 msgid "Y Offset"
 msgstr "Y ఆఫ�‌సెట�"
 
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
 msgid "Text width"
 msgstr "పాఠ�య వెడెల�ప�"
 
-#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
 msgid "Text height"
 msgstr "పాఠ�య ఎత�త�"
 
-#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
 msgid "Use ellipsis"
 msgstr "ఎలిప�సిస� న� ఉపయోగించ�మ�"
 
-#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
+#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
 msgid "Ellipsis"
 msgstr "ఎలిప�సిస�"
 
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
 msgid "Line wrap"
 msgstr "గీత వ�రాప�"
 
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
 msgid "Break characters"
 msgstr "అక�షరమ�లన� విడదీయ�మ�"
 
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
 msgid "Max lines"
 msgstr "పెద�ద గీతల�"
 
-#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
+#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
 msgid "Draw borders"
 msgstr "సరిహద�ద�లన� గీయ�మ�"
 
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
 msgid "Allow newlines"
 msgstr "కొత�త గీతలన� అన�మతించ�"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
 msgid "Draw background"
 msgstr "పూర�వరంగాన�ని గీయ�మ�"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
 msgid "Draw button"
 msgstr "బొత�తమ�న� గీయ�మ�"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
 msgid "Cursor position"
 msgstr "మ�ల�క� స�థానం"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
 msgid "IM Context"
 msgstr " IM సందర�భం"
 
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
 msgid "Handle Popup"
 msgstr "ప�రత�యక�షజాబితాని చేప"
 
+#~ msgid "search bar"
+#~ msgstr "వెత�క� పట�టా"
+
+#~ msgid "evolution calendar search bar"
+#~ msgstr "ఎవల�యూషన� క�యాలెండర� వెత�క� పట�టా"
+
+#~ msgid "Combo Button"
+#~ msgstr "కాంబో బొత�తం"
+
+#~ msgid "Activate Default"
+#~ msgstr "అప�రమేయాన�ని క�రియాశీలీకరించ�"
+
+#~ msgid "Popup Menu"
+#~ msgstr "ప�రత�యక�షమయ�యే జాబితా"
+
+#~ msgid "Error loading address book."
+#~ msgstr "చిర�నామా ప�స�తకాన�ని నింపడంలో దోషమ�."
+
+#~ msgid "Server Version"
+#~ msgstr "సేవిక వివరణమ�"
+
+#~ msgid "C_ontacts"
+#~ msgstr "పరిచయాల�(_o)"
+
+#~| msgid "Configure autocomplete here"
+#~ msgid "Configure contacts and autocompletion here"
+#~ msgstr "పరిచయాలన� మరియ� స�వయంచాలకపూర�తివేతన� యిక�కడ ఆకృతీకరించ�మ�"
+
+#~ msgid "Evolution Address Book"
+#~ msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం"
+
+#~ msgid "Evolution Address Book address popup"
+#~ msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం చిర�నామా పాప�అప�"
+
+#~ msgid "Evolution Address Book address viewer"
+#~ msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం చిర�నామ దర�శిని"
+
+#~ msgid "Evolution Address Book card viewer"
+#~ msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం పలక దర�శిని"
+
+#~ msgid "Evolution Address Book component"
+#~ msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం మూలకం"
+
+#~ msgid "Evolution S/MIME Certificate Management Control"
+#~ msgstr "ఎవాల�యూషన� S/Mime దృవీకరణపత�రం నిర�వాహకి నియంత�రిక"
+
+#~ msgid "Evolution folder settings configuration control"
+#~ msgstr "ఎవాల�యూషన� సంచయం అమరికల ఆకృతీకరణ నియంత�రిక"
+
+#~ msgid "Manage your S/MIME certificates here"
+#~ msgstr "మీ S/MIME దృవీకరణపత�రాలన� ఇక�కడ నిర�వహించండి"
+
+#~ msgid "Failed upgrading Address Book settings or folders."
+#~ msgstr "చిర�నామా ప�స�తక అమరికల� లేక సంచయాలన� తాజాపర�చ�టలో విఫలం"
+
+#~ msgid "Base"
+#~ msgstr "మూలం"
+
+#~ msgid "Rename the \"%s\" folder to:"
+#~ msgstr "\"%s\" సంచయాన�ని దీనికి ప�నఃనామకరణ చేయ�మ�:"
+
+#~ msgid "Rename Folder"
+#~ msgstr "సంచయాన�నిప�నర�నామకరణ చేయ�మ�"
+
+#~ msgid "Save As vCard..."
+#~ msgstr "Vకార�డ�� లాగా దాయ�మ�..."
+
+#~ msgid "Contact Source Selector"
+#~ msgstr "వనర�ల ఎంపికదార�న�ని సంప�రదించ�మ�"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the card and list views and the "
+#~ "preview pane, in pixels."
+#~ msgstr ""
+#~ "కార�డ� మరియ� జాబితా దర�శని మరియ� ఉపదర�శనం తలం క� మద�య, నిల�వ�తలం యొక�క స�థానమ�, పిగ�జెల�స� లో."
+
+#~ msgid "Look up in address books"
+#~ msgstr "చిర�నామా ప�స�తకమ�లనంద� ల�కప�స�"
+
+#~ msgid ""
+#~ "389\n"
+#~ "636\n"
+#~ "3268"
+#~ msgstr ""
+#~ "389\n"
+#~ "636\n"
+#~ "3268"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>ప�రామాణీకరణ</b>"
+
+#~ msgid "<b>Downloading</b>"
+#~ msgstr "<b>దిగ�మతి అవ�త�న�నది</b>"
+
+#~ msgid "<b>Searching</b>"
+#~ msgstr "<b>వెత�క�త�న�నది</b>"
+
+#~ msgid ""
+#~ "Evolution will use this email address to authenticate you with the server."
+#~ msgstr "సేవికతో మిమ�మ�లని ప�రామాణీకరించ�టక� ఎవల�యూషన� ఈ ఈ మెయిల� చిర�నామాన� ఉపయోగిస�త�ంది "
+
+#~| msgid "One"
+#~ msgid ""
+#~ "One\n"
+#~ "Sub"
+#~ msgstr ""
+#~ "à°’à°¤\n"
+#~ "ఉప"
+
+#~ msgid ""
+#~ "SSL encryption\n"
+#~ "TLS encryption\n"
+#~ "No encryption"
+#~ msgstr ""
+#~ "SSL ఎన�క�రిప�షన�\n"
+#~ "TLS ఎన�క�రిప�షన�\n"
+#~ "ఎట�వంటి ఎన�క�రిప�షన� లేద�"
+
+#~ msgid ""
+#~ "The search base is the distinguished name (DN) of the entry where your "
+#~ "searches will begin. If you leave this blank, the search will begin at "
+#~ "the root of the directory tree."
+#~ msgstr ""
+#~ "శోధన ఆధరం ప�రవేశం యొక�క విభజించబడిన నామమ�(DN) ఎక�కడైతే మీ శోధనల� ప�రారంభం అవ�తాయో. మీర� దీనిని "
+#~ "ఖాళీగా వదిలితే, శోధన సంచయవృక�షం యొక�క రూట� నంద� ప�రారంభం అవ�త�ంది."
+
+#~ msgid ""
+#~ "This is the full name of your LDAP server. For example, \"ldap.mycompany."
+#~ "com\"."
+#~ msgstr "ఇది మీ LDAP సేవిక యొక�క సంపూర�ణనామమ�, ఉదాహరణక�, \"ldap.mycompany.com\"."
+
+#~ 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 name for this server that will appear in your Evolution "
+#~ "folder list. It is for display purposes only. "
+#~ msgstr "మీ ఎవాల�యూషన� సంచయం జాబితాలో కనిపించ�క� సేవిక నామమ� ఇదే. ఇది ప�రదర�శన వినియోగార�ధం మాత�రమే."
+
+#~ msgid "<b>Email</b>"
+#~ msgstr "<b>ఈ మెయిల�</b>"
+
+#~ msgid "<b>Home</b>"
+#~ msgstr "<b>నివాసం</b>"
+
+#~ msgid "<b>Job</b>"
+#~ msgstr "<b>నిర�ధిష�టకార�యం</b>"
+
+#~ msgid "<b>Miscellaneous</b>"
+#~ msgstr "<b>వివిధమైన</b>"
+
+#~| msgid "<b>Home</b>"
+#~ msgid "<b>Notes</b>"
+#~ msgstr "<b>గమనికల�</b>"
+
+#~ msgid "<b>Other</b>"
+#~ msgstr "<b>ఇతర</b>"
+
+#~ msgid "<b>Telephone</b>"
+#~ msgstr "<b>దూర సంవాదక పరికరం</b>"
+
+#~ msgid "<b>Work</b>"
+#~ msgstr "<b>పని</b>"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr."
+#~ msgstr ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr."
+
+#~ msgid ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq."
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq."
+
+#~ msgid "<b>Members</b>"
+#~ msgstr "<b>సభ�య�ల�</b>"
+
+#~ msgid "Name begins with"
+#~ msgstr "దీనితో నామం మొదలౌత�ంది"
+
+#~ msgid "_Open"
+#~ msgstr "తెర�వ�మ�(_O)"
+
+#~ msgid "_Print"
+#~ msgstr "మ�ద�రణ(_P)"
+
+#~ msgid "Cop_y to Address Book..."
+#~ msgstr "చిర�నామా ప�స�తకం క� నకల�తీయ�(_y)..."
+
+#~ msgid "Mo_ve to Address Book..."
+#~ msgstr "చిర�నామా ప�స�తకంక� కదిపించ�(_v)..."
+
+#~ msgid "Cu_t"
+#~ msgstr "కట�(_t)"
+
+#~ msgid "_Copy"
+#~ msgstr "నకల�(_C)"
+
+#~ msgid "P_aste"
+#~ msgstr "అతికించ�(_a)"
+
+#~ msgid ""
+#~ "%s already exists\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s ఇదివరకే వ�న�నది\n"
+#~ "మీర� చెరిపి రాయాలన�క�ంట�న�నారా?"
+
+#~ msgid "Overwrite"
+#~ msgstr "చెరిపిరాయ�"
+
+#~ msgid "contact"
+#~ msgid_plural "contacts"
+#~ msgstr[0] "చిర�నామా"
+#~ msgstr[1] "చిర�నామాల�"
+
+#~ msgid "Querying Address Book..."
+#~ msgstr " చిర�నామా ప�స�తకాన�ని ప�రశ�నిస�త�న�నది......."
+
+#~ msgid "Save Appointment"
+#~ msgstr "నియామకం దాయ�మ�"
+
+#~ msgid "Save Memo"
+#~ msgstr "మెమో దాయ�మ�"
+
+#~ msgid "Save Task"
+#~ msgstr "కర�తవ�యం దాయ�మ�"
+
+#~ msgid "Configure your timezone, Calendar and Task List here "
+#~ msgstr "మీ కాలకార�యక�షేత�రం, క�యాలెండర� మరియ� కర�తవ�య జాబితాన� ఇక�కడ అమర�చ�మ�"
+
+#~ msgid "Evolution Calendar and Tasks"
+#~ msgstr "ఎవల�యూషన� క�యాలెండర� మరియ� కర�తవ�యాల�"
+
+#~ msgid "Evolution Calendar configuration control"
+#~ msgstr "ఎవల�యూషన� క�యాలెండర� రూపకరణ నియంత�రణ"
+
+#~ msgid "Evolution Calendar scheduling message viewer"
+#~ msgstr "ఎవల�యూషన� క�యాలెండర� కాలకార�యపర�స�త�న�న సందేశ దర�శని"
+
+#~ msgid "Evolution Calendar/Task editor"
+#~ msgstr "ఎవల�యూషన� క�యాలెండర�/ కర�తవ�య సరికర�త"
+
+#~ msgid "Evolution's Calendar component"
+#~ msgstr "ఎవల�యూషన� క�యాలెండర� యొక�క భాగమ�"
+
+#~ msgid "Evolution's Memos component"
+#~ msgstr "ఎవాల�యూషన� యొక�క మెమోస� మూలకం"
+
+#~ msgid "Evolution's Tasks component"
+#~ msgstr "ఎవల�యూషన� కర�తవ�యాల యొక�క భాగమ�"
+
+#~ msgid "Memo_s"
+#~ msgstr "మెమోస�(_s)"
+
+#~ msgid "_Calendars"
+#~ msgstr "క�యాలెండర�ల�(_C)"
+
+#~ msgid "Evolution Calendar alarm notification service"
+#~ msgstr "ఎవల�యూషన� క�యాలెండర� లో హెచ�చరిక జారీచేయ� సేవ"
+
+#~ msgid "Could not initialize Bonobo"
+#~ msgstr "బొనొబొ న� సంసిద�ధపర�చలేక పోయింది"
+
+#~ msgid ""
+#~ "Could not create the alarm notify service factory, maybe it's already "
+#~ "running..."
+#~ msgstr "అలారం తాఖీద� సేవ గ�ణకాన�ని సృష�టించలేద�, బహశా అది ఇప�పటికే నడ�స�త�ండవచ�చ�..."
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the task list and the task preview "
+#~ "pane, in pixels."
+#~ msgstr ""
+#~ "నిల�వ� తలం యొక�క స�థానమ�, కర�తవ�యప� జాబితా మరియ� కర�తవ�యం ఉపదర�శనం తలం మధ�య, పిక�సెల�స� లో."
+
+#~ msgid "Show the \"Preview\" pane."
+#~ msgstr "\"ఉపదర�శన\" పలకాన�ని చూప�మ�"
+
+#~ msgid "Category is"
+#~ msgstr "విభాగం...."
+
+#~ msgid "Comment contains"
+#~ msgstr "వ�యాఖ�య కలిగివ�ంది"
+
+#~ msgid "Location contains"
+#~ msgstr "స�థానం కలిగివ�ంది"
+
+#~ msgid "_Make available for offline use"
+#~ msgstr "ఆఫ�‌లైన� ఉపయోగార�దం అంద�బాట�చేయ�మ� (_M)"
+
+#~ msgid "_Do not make available for offline use"
+#~ msgstr "ఆఫ�‌లైన� వ�పయోగం కొరక� అంద�బాట� చేయవద�ద� (_D)"
+
+#~ msgid "Failed upgrading calendars."
+#~ msgstr "క�యాలెండర� న� తాజాపర�చ�ట లో విఫలం ."
+
+#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
+#~ msgstr "ఘటనల� మరియ� సమావేశాల� సృష�టించ�ట కొరక� క�యాలెండర�'%s' న� తెరవలేకపోయింది"
+
+#~ msgid "There is no calendar available for creating events and meetings"
+#~ msgstr "ఘటనల� మరియ� సమావేశాల� సృష�టించ�ట కొరక� క�యాలెండర� అంద�బాట� లొ లేద�"
+
+#~ msgid "New meeting"
+#~ msgstr "కొత�త సమావేశం"
+
+#~ msgid "New all day appointment"
+#~ msgstr "కొత�త పూర�తిరోజ� నియామకం"
+
+#~ msgid "Error while opening the calendar"
+#~ msgstr "క�యాలెండర� తెర�స�త�ండగా దోషం"
+
+#~ msgid "Method not supported when opening the calendar"
+#~ msgstr "క�యాలెండర� తెర�స�త�ండగా, పద�దతికి సహకారం లేద�"
+
+#~ msgid "Permission denied to open the calendar"
+#~ msgstr "క�యాలెండర� తెర�వటక� అన�మతి నిరాకరించబడినది"
+
+#~ msgid "<b>Alarm</b>"
+#~ msgstr "<b>హెచ�చరిక</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>ఇచ�ఛాపూర�వకాల�</b>"
+
+#~| msgid "before"
+#~ msgid ""
+#~ "before\n"
+#~ "after"
+#~ msgstr ""
+#~ "మ�ంద�\n"
+#~ "తర�వాత"
+
+#~| msgid ""
+#~| "Minutes\n"
+#~| "Hours\n"
+#~| "Days"
+#~ msgid ""
+#~ "minute(s)\n"
+#~ "hour(s)\n"
+#~ "day(s)"
+#~ msgstr ""
+#~ "నిమ�షమ�(ల�)\n"
+#~ "గంట(ల�)\n"
+#~ "రోజ�(ల�)"
+
+#~| msgid ""
+#~| "Minutes\n"
+#~| "Hours\n"
+#~| "Days"
+#~ msgid ""
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days"
+#~ msgstr ""
+#~ "నిమిషాల�\n"
+#~ "గంటల�\n"
+#~ "రోజ�ల�"
+
+#~| msgid "start of appointment"
+#~ msgid ""
+#~ "start of appointment\n"
+#~ "end of appointment"
+#~ msgstr ""
+#~ "నియామకం యొక�క ప�రారంభం\n"
+#~ "నియామకం యొక�క మ�గింప�"
+
+#~ msgid "Attach file(s)"
+#~ msgstr "దస�త�రం(ల) న� అన�భందించ�"
+
+#~ msgid ""
+#~ "60 minutes\n"
+#~ "30 minutes\n"
+#~ "15 minutes\n"
+#~ "10 minutes\n"
+#~ "05 minutes"
+#~ msgstr ""
+#~ "60 నిమిషాల�\n"
+#~ "30 నిమిషాల�\n"
+#~ "15 నిమిషాల�\n"
+#~ "10 నిమిషాల�\n"
+#~ "05 నిమిషాల�"
+
+#~| msgid "<span weight=\"bold\">Alerts</span>"
+#~ msgid "<span weight=\"bold\">Alarms</span>"
+#~ msgstr "<span weight=\"bold\">ఆలారమ�ల�</span>"
+
+#~ msgid "<span weight=\"bold\">Alerts</span>"
+#~ msgstr "<span weight=\"bold\">హెచ�చరికల�</span>"
+
+#~| msgid "<span weight=\"bold\">Time</span>"
+#~ msgid "<span weight=\"bold\">Date/Time Format</span>"
+#~ msgstr "<span weight=\"bold\">తేదీ/సమయం ఫార�మాట�</span>"
+
+#~ msgid "<span weight=\"bold\">Task List</span>"
+#~ msgstr "<span weight=\"bold\">కర�తవ�యమ� జాబితా</span>"
+
+#~ msgid "<span weight=\"bold\">Time</span>"
+#~ msgstr "<span weight=\"bold\">సమయం</span>"
+
+#~ msgid "<span weight=\"bold\">Work Week</span>"
+#~ msgstr "<span weight=\"bold\">పని వారమ�</span>"
+
+#~ msgid ""
+#~ "Minutes\n"
+#~ "Hours\n"
+#~ "Days"
+#~ msgstr ""
+#~ "నిమిషాల�\n"
+#~ "గంటల�\n"
+#~ "రోజ�ల�"
+
+#~ msgid ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday"
+#~ msgstr ""
+#~ "సోమవారం\n"
+#~ "మంగళవారం\n"
+#~ "బ�దవారం\n"
+#~ "గ�ర�వారం\n"
+#~ "శ�క�రవారం\n"
+#~ "శనివారం\n"
+#~ "ఆదివారం"
+
+#~ msgid "_Add "
+#~ msgstr "కల�ప�మ�(_A)"
+
+#~ msgid ""
+#~ "15 minutes before appointment\n"
+#~ "1 hour before appointment\n"
+#~ "1 day before appointment"
+#~ msgstr ""
+#~ "నియామకానికి 15 నిమిషాల మ�ంద�\n"
+#~ "నియామకానికి 1 గంట మ�ంద�\n"
+#~ "నియామకానికి 1 రోజ� మ�ంద�"
+
+#~ msgid ""
+#~ "a\n"
+#~ "b"
+#~ msgstr ""
+#~ "a\n"
+#~ "b"
+
+#~ msgid "<b>Preview</b>"
+#~ msgstr "<b>ఉపదర�శనం</b>"
+
+#~ msgid "<b>Recurrence</b>"
+#~ msgstr "<b>ప�నరావృతం</b>"
+
+#~ msgid ""
+#~ "day(s)\n"
+#~ "week(s)\n"
+#~ "month(s)\n"
+#~ "year(s)"
+#~ msgstr ""
+#~ "రోజ�(ల�)\n"
+#~ "వారమ�(ల�)\n"
+#~ "నెల(ల�)\n"
+#~ "సంవత�సరమ�(ల�)"
+
+#~ msgid ""
+#~ "for\n"
+#~ "until\n"
+#~ "forever"
+#~ msgstr ""
+#~ "కొరక�\n"
+#~ "వరక�\n"
+#~ "ఎప�పటికి"
+
+#~ msgid "<span weight=\"bold\">Miscellaneous</span>"
+#~ msgstr "<span weight=\"bold\">చెల�లని</span>"
+
+#~ msgid "<span weight=\"bold\">Status</span>"
+#~ msgstr "<span weight=\"bold\">స�థతి</span>"
+
+#~ msgid ""
+#~ "High\n"
+#~ "Normal\n"
+#~ "Low\n"
+#~ "Undefined"
+#~ msgstr ""
+#~ "ఎక�క�వ\n"
+#~ "సాధారణ\n"
+#~ "తక�క�వ\n"
+#~ "నిర�వచించని"
+
+#~ msgid ""
+#~ "Not Started\n"
+#~ "In Progress\n"
+#~ "Completed\n"
+#~ "Canceled"
+#~ msgstr ""
+#~ "ప�రారంభించని\n"
+#~ "ప�రోగతిలోవ�న�న\n"
+#~ "పూర�తైన\n"
+#~ "రద�దైన"
+
+#~ msgid "_Save As..."
+#~ msgstr "ఇలా దాయ�మ�(_S)..."
+
+#~ msgid "P_rint..."
+#~ msgstr "మ�ద�రించ�(_r)..."
+
+#~ msgid "C_ut"
+#~ msgstr "కోయ�మ�(_u)"
+
+#~ msgid "_Paste"
+#~ msgstr "అతికించ�(_P)"
+
+#~ msgid "_Mark Selected Tasks as Complete"
+#~ msgstr "ఎంపిక చేసిన కార�యాల� పూర�తయిన�నట� గా గ�ర�త�పెట�ట�(_M)"
+
+#~ msgid "_Mark Selected Tasks as Incomplete"
+#~ msgstr "ఎంపిక చేసిన కార�యాల� అసంపూర�తిగా గ�ర�త�పెట�ట�(_M)"
+
+#~ msgid "_Delete Selected Tasks"
+#~ msgstr "ఎంపిక చేసిన కార�యాలన� తీసివేయ�(_D)"
+
+#~ msgid "Select T_oday"
+#~ msgstr "ఈ రోజ�న� గ�ర�తించ�(_o)"
+
+#~ msgid "_Select Date..."
+#~ msgstr "తారీఖ� ఎంపికచేయ�(_S)..."
+
+#~ msgid "Pri_nt..."
+#~ msgstr "మ�ద�రణ(_n)..."
+
+#~ msgid "_Delete Selected Memos"
+#~ msgstr "ఎంపిక చేసిన మెమోలన� తొలగించ�మ�(_D)"
+
+#~ msgid "Deleting selected objects..."
+#~ msgstr "ఎంపిక చేసిన అంశాలన� రద�ద� చేస�తోంది..."
+
+#~ msgid "Completing tasks..."
+#~ msgstr "కర�తవ�యాలన� పూర�తిచేస�తోంది..."
+
+#~ msgid "_Custom View"
+#~ msgstr "మల�చ�కొనిన దర�శనం(_C)"
+
+#~ msgid "_Save Custom View"
+#~ msgstr "మల�చ�కొనిన దర�శనంన� దాయ�మ�(_S)"
+
+#~ msgid "_Define Views..."
+#~ msgstr "దర�శనాలన� నిర�వచించ�(_D)..."
+
+#~ msgid "Loading appointments at %s"
+#~ msgstr "నియామాకాలన� నింప�త�ంది%s"
+
+#~ msgid "Loading tasks at %s"
+#~ msgstr "%sకార�యాలన� నింప�త�ంది"
+
+#~ msgid "Loading memos at %s"
+#~ msgstr "%s వద�ద మెమోలన� నింప�త�ంది"
+
+#~ msgid ""
+#~ "January\n"
+#~ "February\n"
+#~ "March\n"
+#~ "April\n"
+#~ "May\n"
+#~ "June\n"
+#~ "July\n"
+#~ "August\n"
+#~ "September\n"
+#~ "October\n"
+#~ "November\n"
+#~ "December"
+#~ msgstr ""
+#~ "జనవరి\n"
+#~ "ఫిబ�రవరి\n"
+#~ "మార�చ�\n"
+#~ "�ప�రిల�\n"
+#~ "మే\n"
+#~ "జూన�\n"
+#~ "జ�లై\n"
+#~ "ఆగస�ట�\n"
+#~ "సెప�టెంబర�\n"
+#~ "అక�టోబర�\n"
+#~ "నవంబర�\n"
+#~ "డిసెంబర�"
+
+#~ msgid "Failed upgrading memos."
+#~ msgstr "మెమోలన� మెర�గ�పర�చ�ట విఫలమయ�యెన�."
+
+#~ msgid "Unable to open the memo list '%s' for creating events and meetings"
+#~ msgstr "ఘటనల� మరియ� సమావేశాల� సృష�టించ�టక� '%s' కొరక� మెమో జాబితా తెరవలేక పొయింది"
+
+#~ msgid "There is no calendar available for creating memos"
+#~ msgstr "మెమోలన� సృష�టించ�టక� � క�యాలెండర� అంద�బాట� లో లేద�"
+
+#~ msgid "New shared memo"
+#~ msgstr "కొత�త భాగస�వామ�య మెమో"
+
+#~ msgid "New memo list"
+#~ msgstr "కొత�త మెమో జాబితా"
+
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "మెమో జాబితా (_s)"
+
+#~ msgid "Failed upgrading tasks."
+#~ msgstr " కర�తవ�యాల� మెర�గ�పర�చ�ట విఫలమయ�యెన�."
+
+#~ msgid "Unable to open the task list '%s' for creating events and meetings"
+#~ msgstr "ఘటనల� మరియ� సమావేశాల� సృష�టించ�టక� '%s' కొరక� కార�య జాబితా తెరవలేక పొయింది"
+
+#~ msgid "There is no calendar available for creating tasks"
+#~ msgstr "కార�యాల� సృష�టించ�టక� క�యాలెండర� లేద�"
+
+#~ msgid "New task"
+#~ msgstr "కొత�త కార�యం"
+
+#~ msgid "New assigned task"
+#~ msgstr "కొత�తగా స�థానం ఇవ�వబడ�డ కార�యం"
+
+#~ msgid "New task list"
+#~ msgstr "కొత�త కార�యజాబితా"
+
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "కార�తవ�యం జాబితా (_k)"
+
+#~ msgid "_Security"
+#~ msgstr "రక�షణ(_S)"
+
+#~ msgid "Directories can not be attached to Messages."
+#~ msgstr "నిఘంట�వ�ల� సందేశాలక� అన�భందించబడలేవ�."
+
+#~ msgid ""
+#~ "Send options available only for Novell GroupWise and Microsoft Exchange "
+#~ "accounts."
+#~ msgstr ""
+#~ "పంపే �చ�చికాల� Novell సమూహతరహా మరియ� Microsoft మార�పిడి ఖాతాలక� మాత�రమే అంద�బాట�లో ఉంటాయి."
+
+#~ msgid "Send options not available."
+#~ 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 ""
+#~ "ఈ సంచయం యొక�క సారాలన� అన�భందించ�టక�, సంచయంనందలి దస�త�రాలన� ఒక�కొక�కటే అన�భందించ�మ�, లేదా "
+#~ "సంచయంక� ఆర�చవ�‌న� తయార�చేసి మరియ� అన�భందించ�మ�."
+
+#~ msgid "Unfinished messages found"
+#~ msgstr "పూర�తిచేయనట�వంటి సందేశాల� కన�గొనబడినవి."
+
+#~ msgid "Warning: Modified Message"
+#~ msgstr "హెచ�చరిక: సవరించబడిన సందేశం"
+
+#~ msgid "Evolution Information"
+#~ msgstr "ఎవాల�యూషన� సమాచారం"
+
+#~ msgid "Evolution Query"
+#~ msgstr "ఎవాల�యూషన� క�వరి"
+
+#~ msgid "Component"
+#~ msgstr "మూలకం"
+
+#~ msgid "Overwrite file?"
+#~ msgstr "దస�త�రాన�ని మరలావ�రాయాలా?"
+
+#~ msgid "Label name cannot be empty."
+#~ msgstr "లేబ�ల� నామమ� ఖాళీగా ఉండకూడద�."
+
+#~ msgid ""
+#~ "A label having the same tag already exists on the server. Please rename "
+#~ "your label."
+#~ msgstr "సమాన టాగ�‌తో లేబ�ల� యిప�పటికే వ�ంది. దయచేసి మీ లేబ�ల�‌న� ప�నఃనామకరణ చేయ�మ�."
+
+#~ msgid "Test"
+#~ msgstr "పరీక�ష"
+
+#~ msgid "<b>_Filter Rules</b>"
+#~ msgstr "<b>వడపోత నియమాల�(_F)</b>"
+
+#~ msgid ""
+#~ "seconds\n"
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days\n"
+#~ "weeks\n"
+#~ "months\n"
+#~ "years"
+#~ msgstr ""
+#~ "సెకన�ల�\n"
+#~ "నిమ�షాల�\n"
+#~ "గంటల�\n"
+#~ "రోజ�ల�\n"
+#~ "వారమ�ల�\n"
+#~ "నెలల�\n"
+#~ "సంవత�సరమ�ల�"
+
+#~ msgid "Rule name"
+#~ msgstr "నియమం నామమ�"
+
+#~ msgid ""
+#~ "Configure mail preferences, including security and message display, here"
+#~ msgstr "మెయిల� అభీష�టాలన� ఆకృతీకరించ�మ�, రక�షణ మరియ� సందశ ప�రదర�శన తో కలిపి, ఇక�కడ"
+
+#~ msgid "Configure spell-checking, signatures, and the message composer here"
+#~ msgstr "స�పెల�-పరిశీలనన� ఆకృతీకరించ�మ�, సంతకాల�, మరియ� సందేశ కూర�పరిని"
+
+#~ msgid "Configure your network connection settings here"
+#~ msgstr "మీనెట�వర�క�� అన�సంధానం అమరికలన� ఆకృతీకరించ�మ�"
+
+#~ msgid "Evolution Mail"
+#~ msgstr "ఎవాల�యూషన� మెయిల�"
+
+#~ msgid "Evolution Mail accounts configuration control"
+#~ msgstr "ఎవాల�యూషన� మెయిల� ఖాతా ఆకృతీకరణ సాధనమ�ల�"
+
+#~ msgid "Evolution Mail component"
+#~ msgstr "ఎవాల�యూషన� మెయిల� మూలకం"
+
+#~ msgid "Evolution Mail composer"
+#~ msgstr "ఎవాల�యూషన� మెయిల� కూర�పరి"
+
+#~ msgid "Evolution Mail composer configuration control"
+#~ msgstr "ఎవాల�యూషన� మెయిల� కూర�పరి ఆకృతీకరణ నియంత�రిక"
+
+#~ msgid "Evolution Mail preferences control"
+#~ msgstr "ఎవాల�యూషన� మెయిల� అభిష�టాల నియంత�రిక"
+
+#~ msgid "Evolution Network configuration control"
+#~ msgstr "ఎవల�యూషన� నెట�వర�క�� ఆకృతీకరణ నియంత�రణ"
+
+#~ msgid "[Default]"
+#~ msgstr "[అప�రమేయ]"
+
+#~ msgid "Signature(s)"
+#~ msgstr "సంతకమ�(ల�)"
+
+#~ msgid "_Copy to Folder"
+#~ msgstr "సంచయంక� నకల�తీయ�మ�(_C)"
+
+#~ msgid "_Move to Folder"
+#~ msgstr "సంచయంక� నకల�తీయ�మ�(_M)"
+
+#~ msgid "Cancel _Drag"
+#~ msgstr "లాగినదానిని రద�ద�చేయ�మ�(_D)"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "కొత�త విండో నంద� తెర�వ�మ�(_N)"
+
+#~ msgid "_Move..."
+#~ msgstr "కద�ప�మ�(_M)..."
+
+#~ msgid "_Unread Search Folder"
+#~ msgstr "చదవని శోధన సంచయం (_U)"
+
+#~ msgid "U_ndelete"
+#~ msgstr "తొలగించని(_n)"
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "ప�లాగ� పూర�తైనది(_g)"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "ప�లాగ� న� చెరిపివేయ�మ�(_e)"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "సందేశంన�ండి నియమాన�ని సృష�టించ�మ�(_t)"
+
+#~ msgid "Search Folder based on _Subject"
+#~ msgstr "అట�వంటి సంచయం సంగతి మీద ఆధారపడిఉంట�ంది(_S)"
+
+#~ msgid "Search Folder based on Se_nder"
+#~ msgstr "పంపినదాన�ని న�ండి సంచయాన�ని వెత�క�మ�(_n)..."
+
+#~ msgid "Search Folder based on _Recipients"
+#~ msgstr "తీస�క�న�నవాటి న�ండి సంచయాన�ని వెత�క�మ�(_R)"
+
+#~ msgid "Filter based on Sub_ject"
+#~ msgstr "సంగతి మీద ఆధారపడి వడపోయ�మ�(_j)"
+
+#~ msgid "Filter based on Sen_der"
+#~ msgstr "పంపినవాని పై ఆధారపడి వడపోయ�మ�(_d)"
+
+#~ msgid "Filter based on Re_cipients"
+#~ msgstr "స�వీకరణదార�ల పై ఆధారపడి వడపోయ�మ�(_c)"
+
+#~ msgid "Filter based on _Mailing List"
+#~ msgstr "మెయిలింగ� జాబితా పై ఆధారపడి వడపోయ�మ�(_M)"
+
+#~ msgid "_Fit to Width"
+#~ msgstr "వెడల�ప�క� అమర�చ�మ�(_F)"
+
+#~ msgid "Save As..."
+#~ msgstr "ఇలా దాచ�..."
+
+#~ msgid "untitled_image.%s"
+#~ msgstr "శీర�షికలేని చిత�రమ�(_i).%s"
+
+#~ msgid "_Reply to sender"
+#~ msgstr "పంపకందార� కి ప�రత�య�త�తరం(_R)"
+
+#~ msgid "Open in %s..."
+#~ msgstr "%s లో తెర�వ�మ�...."
+
+#~ msgid "message"
+#~ msgstr "సందేశం"
+
+#~ msgid "Add address"
+#~ msgstr "చిర�నామాన� జతచేయ�మ�"
+
+#~ msgid "Default height of the message window."
+#~ msgstr "సందేశ విండో యొక�క అప�రమేయ ఎత�త�."
+
+#~ msgid "Default width of the message window."
+#~ msgstr "సందేశం విండో యొక�క అప�రమేయ వెడల�ప�."
+
+#~ msgid ""
+#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
+#~ "vertically."
+#~ msgstr ""
+#~ "ఒకవేళ \"ఉపదర�శనం\" తలం చేతనంగాఉంటే, అప�పడ� దానిని ప�రక�క-ప�రక�కనే చూప�మ� నిల�వ�గా "
+#~ "చూప�టకంటే."
+
+#~ msgid ""
+#~ "It disables/enables the repeated prompts to ask if offline sync is "
+#~ "required before going into offline mode."
+#~ msgstr ""
+#~ "ఆఫ�‌లైన� రీతికి వెళ�ళ�టక� మ�న�ప� ఆఫ�‌లైన� సింక� అవసరమేమో అడ�గ�టక� ప�నరావృత ప�రాంప�ట�లన� చేతనం/"
+#~ "అచేతనం చేస�త�ంది."
+
+#~ msgid "Message Window default height"
+#~ msgstr "సందేశ విండో అప�రమేయ ఎత�త�"
+
+#~ msgid "Message Window default width"
+#~ msgstr "సందేశ విండో అప�రమేయ వెడల�ప�"
+
+#~ msgid "Prompt to check if the user wants to go offline immediately"
+#~ msgstr "వినియోగదారి తక�షణమే ఆఫ�‌లైన� క� వెళ�ళాలని అన�క�ంట�న�నాడెమో పరిశీలించ�టక� అడ�గ�మ�"
+
+#~ msgid "Thread the message list."
+#~ msgstr "సందేశ జాబితాన� తంతిచేయ�మ�."
+
+#~ msgid "Thread the message-list"
+#~ msgstr "సందేశ-జాబితాన� తంతిచేయ�మ"
+
+#~ msgid "Use side-by-side or wide layout"
+#~ msgstr "ప�రక�క-ప�రక�కగా-ఉండ� లేదా వెడల�పాటి వాస�త�న� ఉపయోగించ�"
+
+#~ msgid "New Mail Message"
+#~ msgstr "సరికొత�త తపాలా సందేశం"
+
+#~ msgid "New Mail Folder"
+#~ msgstr "కొత�త మెయిల� సంచయం"
+
+#~ msgid "Failed upgrading Mail settings or folders."
+#~ msgstr "మెయిల� అమరికలన� లేదా సంచయాలన� నవీకరించ�టలో విఫలమైంది."
+
+#~ msgid "<b>Sig_natures</b>"
+#~ msgstr "<b>సంతకాల�(_n)</b>"
+
+#~ msgid "<b>_Languages</b>"
+#~ msgstr "<b>భాషల�(_L)</b>"
+
+#~ msgid "<span weight=\"bold\">Authentication</span>"
+#~ msgstr "<span weight=\"bold\">దృవీకరణ</span>"
+
+#~ msgid "<span weight=\"bold\">Composing Messages</span>"
+#~ msgstr "<span weight=\"bold\">సందేశాలన� కూర�చ�తోంది</span>"
+
+#~ msgid "<span weight=\"bold\">Configuration</span>"
+#~ msgstr "<span weight=\"bold\">ఆకృతీకరణ</span>"
+
+#~ msgid "<span weight=\"bold\">Default Behavior</span>"
+#~ msgstr "<span weight=\"bold\">అప�రమేయ ప�రవర�తన</span>"
+
+#~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+#~ msgstr "<span weight=\"bold\">ప�రదర�శించిన సదేశం పీఠికల� (_H)</span>"
+
+#~ msgid "<span weight=\"bold\">Labels</span>"
+#~ msgstr "<span weight=\"bold\">లేబ�ళ�ళ�</span>"
+
+#~ msgid "<span weight=\"bold\">Loading Images</span>"
+#~ msgstr "<span weight=\"bold\">చిత�రాలన� నింప�తోంది</span>"
+
+#~ msgid "<span weight=\"bold\">Message Display</span>"
+#~ msgstr "<span weight=\"bold\">సందేశం ప�రదర�శన</span>"
+
+#~ msgid "<span weight=\"bold\">Message Fonts</span>"
+#~ msgstr "<span weight=\"bold\">సందేశం ఫాంట�ల�</span>"
+
+#~ msgid "<span weight=\"bold\">Message Receipts</span>"
+#~ msgstr "<span weight=\"bold\">సందేశం స�వీకరణదార�ల�</span>"
+
+#~ msgid "<span weight=\"bold\">Optional Information</span>"
+#~ msgstr "<span weight=\"bold\">�చ�చిక సమాచారం</span>"
+
+#~ msgid "<span weight=\"bold\">Options</span>"
+#~ msgstr "<span weight=\"bold\">�చ�చికాల�</span>"
+
+#~ msgid "<span weight=\"bold\">Printed Fonts</span>"
+#~ msgstr "<span weight=\"bold\">మ�ద�రించిన ఫాంట�స�</span>"
+
+#~ msgid "<span weight=\"bold\">Proxy Settings</span>"
+#~ msgstr "<span weight=\"bold\">ప�రోక�సీ అమరికల�</span>"
+
+#~ msgid "<span weight=\"bold\">Required Information</span>"
+#~ msgstr "<span weight=\"bold\">అవసరమగ� సమాచారం</span>"
+
+#~ msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+#~ msgstr "<span weight=\"bold\">రక�షితమైన MIME (S/MIME)</span>"
+
+#~ msgid "<span weight=\"bold\">Security</span>"
+#~ msgstr "<span weight=\"bold\">రక�షణ</span>"
+
+#~ msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+#~ msgstr "<span weight=\"bold\">పంపిన మరియ� డ�రాఫ�ట�  సందేశాల�</span>"
+
+#~ msgid "<span weight=\"bold\">Server Configuration</span>"
+#~ msgstr "<span weight=\"bold\">సేవిక ఆకృతీకరణ</span>"
+
+#~ msgid "<span weight=\"bold\">_Authentication Type</span>"
+#~ msgstr "<span weight=\"bold\">దృవీకరణం రకమ� (_A)</span>"
+
+#~| msgid "Attachment Reminder"
+#~ msgid ""
+#~ "Attachment\n"
+#~ "Inline\n"
+#~ "Quoted"
+#~ msgstr ""
+#~ "అన�బంధమ�\n"
+#~ "లైన�లోపల\n"
+#~ "కోట�‌చేసిన"
+
+#~ msgid ""
+#~ "Attachment\n"
+#~ "Inline (Outlook style)\n"
+#~ "Quoted\n"
+#~ "Do not quote"
+#~ msgstr ""
+#~ "అన�భందమ�\n"
+#~ "లైన�లోపల (అవ�ట�‌ల�క� శైలి)\n"
+#~ "కోట�‌చేసిన\n"
+#~ "కోట� చేయవద�ద�"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "బాల�టిక� (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "బాల�టిక� (ISO-8859-4)"
+
+#~ msgid "Email Accounts"
+#~ msgstr "ఈమెయిల� ఖాతాల�"
+
+#~ msgid ""
+#~ "If the server uses a non-standard port then specify the server address as "
+#~ "\"server-name:port-number\""
+#~ msgstr ""
+#~ "సేవిక ప�రామాణికం-కాని పోర�ట�న� వ�పయోగిస�త�ంటే అప�ప�డ� సేవిక చిర�నామాన� \"server-name:port-"
+#~ "number\" వలె తెల�ప�మ�"
+
+#~ msgid "Message Composer"
+#~ msgstr "సందేశం కూర�పరి"
+
+#~ msgid "Signatures Table"
+#~ msgstr "సంతకాల పట�టిక"
+
+#~ msgid "<b>Search Folder Sources</b>"
+#~ msgstr "<b>సంచయం మూలాలన� శోధించ�మ�</b>"
+
+#~ msgid "<span weight=\"bold\">Digital Signature</span>"
+#~ msgstr "<span weight=\"bold\">డిజిటల� సంతకం</span>"
+
+#~ msgid "<span weight=\"bold\">Encryption</span>"
+#~ msgstr "<span weight=\"bold\">ఎన�క�రిప�షన�</span>"
+
+#~ msgid "Delete \"{0}\"?"
+#~ msgstr "తొలగించ�మ� \"{0}\"?"
+
+#~ msgid "Delete messages in Search Folder?"
+#~ msgstr "శోధన సంచయంలో ఉన�న సందేశాలన� తొలగించాలా?"
+
+#~ msgid "Discard changes?"
+#~ msgstr "మార�ప�లన� తీసివేయాలా?"
+
+#~ msgid "Mark all messages as read"
+#~ msgstr "అన�ని సందేశాలన� చదివినవాటిలా గ�ర�తించ�మ�"
+
+#~ msgid "Querying server"
+#~ msgstr "సేవిక న� ప�రశ�నిస�త�న�నది"
+
+#~ msgid "Subject or Recipients contains"
+#~ msgstr "సంగతి లేదా పంపినవార� కలిగిఉంటే"
+
+#~ msgid "Subject or Sender contains"
+#~ msgstr "ఇది కలిగివ�న�న సంగతి లేదా పంపినవార�"
+
+#~| msgid "Audio inline plugin"
+#~ msgid "Audio Inline"
+#~ msgstr "ఆడియో ఇన�‌లైన�"
+
+#~| msgid "Copy tool"
+#~ msgid "Copy Tool"
+#~ msgstr "నకల� సాధనమ�"
+
+#~ msgid "_Account:"
+#~ msgstr "ఖాతా(_A):"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "సంచయం నామం(_F):"
+
+#~ msgid "_User:"
+#~ msgstr "వినియోగదారి(_U):"
+
+#~ msgid "Secure Password"
+#~ msgstr "రక�షిత సంకేతపదం"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using secure password "
+#~ "(NTLM) authentication."
+#~ msgstr ""
+#~ "ఈ �చ�చికం ఇచ�చిప�చ�చ�కొన� సేవిక క� రక�షిత సంకేతపదం (NTLM) దృవీకరణన� ఉపయోగించి "
+#~ "అన�సంధానించబడ�త�ంది."
+
+#~ msgid "Plaintext Password"
+#~ msgstr "సాదాపాఠ�యమ� సంకేతపదం"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using standard plaintext "
+#~ "password authentication."
+#~ msgstr ""
+#~ "ఈ �చ�చికం ఇచ�చిప�చ�చ�కొన� సేవికక� సాదాపాఠ�యమ� సంకేతపదం దృవీకరణన� ఉపయోగించి అన�సంధానించ "
+#~ "బడ�త�ంది."
+
+#~ msgid "Out Of Office"
+#~ 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 ""
+#~ "మీర� ఆఫీస�‌బయట ఉన�నప�ప�డ మీక� ఎవరైతే సందేశం పంపారో వారందరికి\n"
+#~ "క�రిందన తెల�పబడిన సందేశం స�వయంచాలకంగా పంపబడ�త�ంది."
+
+#~ msgid "I am out of the office"
+#~ msgstr "నేన� ఆఫీస� బయట ఉన�నాన�"
+
+#~ msgid "I am in the office"
+#~ msgstr "నేన� కార�యాలయంలో ఉన�నాన�"
+
+#~ msgid "Change the password for Exchange account"
+#~ msgstr "ఖాతాన� ఇచ�చిప�చ�చ�కొన�టక� సంకేతపదాన�ని మార�చ�మ�"
+
+#~ msgid "Change Password"
+#~ msgstr "సంకేతపదాన�ని మార�చండి"
+
+#~ msgid "Manage the delegate settings for Exchange account"
+#~ msgstr "ఇచ�చిప�చ�చ�కొన� ఖాతా కొరక� ప�రాతినిధ�య అమరికలన� నిర�వహించ�మ�"
+
+#~ msgid "Delegation Assistant"
+#~ msgstr "ప�రాతినిధ�యప� సహాయక�డ�"
+
+#~ msgid "View the size of all Exchange folders"
+#~ msgstr "అన�ని ఇచ�చిప�చ�చ�కొన� సంచయాల పరిమాణంన� దర�శించ�మ�"
+
+#~ msgid "Folders Size"
+#~ msgstr "సంచయాల పరిణామం"
+
+#~ msgid "_OWA URL:"
+#~ msgstr "_OWA URL:"
+
+#~ msgid "A_uthenticate"
+#~ msgstr "దృవీకరించ�(_u)"
+
+#~ msgid "Mailbox name is _different than user name"
+#~ msgstr "మెయిల�‌బాక�స� నామమ� వినియోగదారి నామమ�క� వేర�గా వ�ంట�ంది (_d)"
+
+#~ msgid "_Mailbox:"
+#~ msgstr "మెయిల�‌బాక�స�� (_M):"
+
+#~ msgid "%s KB"
+#~ msgstr "%s KB"
+
+#~ msgid "0 KB"
+#~ msgstr "0 KB"
+
+#~ msgid "Size:"
+#~ msgstr "పరిమాణమ�:"
+
+#~ msgid ""
+#~ "Evolution is in offline mode. You cannot create or modify folders now.\n"
+#~ "Please switch to online mode for such operations."
+#~ msgstr ""
+#~ "ఎవాల�యూషన� ఆఫ�‌లైన� రీతినంద� ఉన�నది. మీర� సంచయాలన� సృష�టించలేర� మరియ�\n"
+#~ "సవరించలేర�. అట�వంటి ఆపరేషన�‌లక� దయచేసి ఆన�‌లైన� రీతికి మార�మ�."
+
+#~ msgid ""
+#~ "The current password does not match the existing password for your "
+#~ "account. Please enter the correct password"
+#~ msgstr ""
+#~ "ప�రస�త�త సంకేతపదం మీ ఖాతాక� ఇప�పటికే ఉన�న సంకేతపదం తో సరిపోలడం లేద�. దయచేసి సరైన సంకేతపదాన�ని "
+#~ "ప�రవేశపెట�టండి"
+
+#~ msgid "The two passwords do not match. Please re-enter the passwords."
+#~ msgstr "ఆ రెండ� సంకేతపదాల� సరిపోలడం లేద�. దయచేసి సంకేతపదాన�ని మరలా ప�రవేశపెట�టండి."
+
+#~ msgid "Confirm Password:"
+#~ msgstr "సంకేతపదాన�ని నిర�ధారించ�మ�:"
+
+#~ msgid "Current Password:"
+#~ msgstr "ప�రస�త�త సంకేతపదం:"
+
+#~ msgid "New Password:"
+#~ msgstr "కొత�త సంకేతపదం:"
+
+#~ msgid "Your current password has expired. Please change your password now."
+#~ msgstr "మీ ప�రస�త�త సంకేతపదం కాలమ�తీరినది. దయచేసి మీ సంకేతపదం న� ఇప�ప�డే మార�చ�మ�."
+
+#~ msgid "Your password will expire in the next %d days"
+#~ msgstr "మీ సంకేతపదం తర�వాతి %d రోజ�లలో కాలమ�తీరబోతోంది"
+
+#~ msgid "Custom"
+#~ msgstr "మలచ�కొన�"
+
+#~ msgid "Editor (read, create, edit)"
+#~ msgstr "సరికూర�పరి(చద�వ�, సృష�టించ�, సరిచేయ�)"
+
+#~ msgid "Author (read, create)"
+#~ msgstr "ఆథర�(చద�వ�, సృష�టించ�)"
+
+#~ msgid "Reviewer (read-only)"
+#~ msgstr "పరిదర�శక�డ�(చద�వ�ట-మాత�రమే)"
+
+#~ msgid "Delegate Permissions"
+#~ msgstr "ప�రతినిధి అన�మత�ల�"
+
+#~ msgid "Permissions for %s"
+#~ msgstr "%s కొరక� అన�మత�ల�"
+
+#~ msgid ""
+#~ "This message was sent automatically by Evolution to inform you that you "
+#~ "have been designated as a delegate. You can now send messages on my "
+#~ "behalf."
+#~ msgstr ""
+#~ "ఈ సందేశం మీర� ప�రతినిధిగా అయ�యారని తెల�ప�టక� ఎవాల�యూషన� ద�వారా స�వయంచాలకంగా పంపబడింది. మీర� "
+#~ "సందేశాలన� ఇక నాక� బద�ల�గా పంపవచ�చ�."
+
+#~ msgid "You have been given the following permissions on my folders:"
+#~ msgstr "మీక� నా సంచయమ�ల పై ఈ క�రింది అన�మత�ల� ఇవ�వబడినవి:"
+
+#~ msgid "You are also permitted to see my private items."
+#~ msgstr "మీర� నా వ�యక�తిగత అంశమ�లన� చూడ�టక� కూడా అన�మతించబడినార�."
+
+#~ msgid "However you are not permitted to see my private items."
+#~ msgstr "�మైనప�పటికి మీర� నా వ�యక�తిగత అంశమ�లన� చూడ�టక� అన�మతింపబడర�."
+
+#~ msgid "You have been designated as a delegate for %s"
+#~ msgstr "మీర� %s కొరక� ప�రతినిధిగా గ�ర�తించబడ�డార�"
+
+#~ msgid "Remove the delegate %s?"
+#~ msgstr "ప�రతినిధి %s న� తొలగించాలా?"
+
+#~ msgid "Could not access Active Directory"
+#~ msgstr "క�రియాశీల సంచయాన�ని వాడ�కొనలేక పోయింది"
+
+#~ msgid "Could not find self in Active Directory"
+#~ msgstr "క�రియాశీల సంచయంనంద� స�వకీయంన� కన�గొనలేకపోయింది"
+
+#~ msgid "Could not find delegate %s in Active Directory"
+#~ msgstr "క�రియాశీల సంచయం నంద� ప�రతినిధి %s న� క�న�గొనలేకపోయింది"
+
+#~ msgid "Could not remove delegate %s"
+#~ msgstr "ప�రతినిది %s న� తొలగించలేక పోయింది"
+
+#~ msgid "Could not update list of delegates."
+#~ msgstr "ప�రతినిధ�ల జాబితాన� నవీకరించలేక పోయింది."
+
+#~ msgid "Could not add delegate %s"
+#~ msgstr "ప�రతినిది %s న� చేర�చలేకపోయింది"
+
+#~ msgid "Error reading delegates list."
+#~ msgstr "ప�రతినిధ�ల జాబితాన� చద�వ�టలో దోషం."
+
+#~ msgid "C_alendar:"
+#~ msgstr "క�యాలెండర�(_a):"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "పరిచయాల�(_n):"
+
+#~ msgid "Delegates"
+#~ msgstr "ప�రాతినిధ�యంవహించేవార�"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Reviewer (read-only)\n"
+#~ "Author (read, create)\n"
+#~ "Editor (read, create, edit)"
+#~ msgstr ""
+#~ "�దీకాద�\n"
+#~ "పరిశీలక�డ� (చద�వ�ట-మాత�రమే)\n"
+#~ "మూలకర�త (చద�వ�ట, సృష�టించ�ట)\n"
+#~ "సంపాదక�డ� (చద�వ�ట, సృష�టించ�ట, సరికూర�చ�ట)"
+
+#~ msgid "Permissions for"
+#~ msgstr "కొరక� అన�మత�ల�"
+
+#~ 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"
+#~ "మరియ� మీర� వారికి ఇచ�చిన అన�మత�లతో మీ సంచయాలన� వాడ�కోగలర�."
+
+#~ msgid "_Delegate can see private items"
+#~ msgstr "ప�రతినిధి వ�యక�తిగత అంశమ�లన� చూడగలర�(_D)"
+
+#~ msgid "_Inbox:"
+#~ msgstr "ఇన�‌బాక�స�(_I):"
+
+#~ msgid "_Summarize permissions"
+#~ msgstr "అన�మత�లన� సక�షింప�తంచేయ�మ�(_S)"
+
+#~ msgid "Permissions..."
+#~ msgstr "అన�మత�ల�..."
+
+#~ msgid "Folder Name"
+#~ msgstr "సంచయం నామమ�"
+
+#~ msgid "Folder Size"
+#~ msgstr "సంచయం పరిమాణం"
+
+#~ msgid "User"
+#~ msgstr "వినియోగదారి"
+
+#~ msgid "Subscribe to Other User's Folder"
+#~ msgstr "ఇతర వినియోగదార�ల సంచయానికి చందాదార� కమ�మ�"
+
+#~ msgid "Exchange Folder Tree"
+#~ msgstr "ఇచ�చిప�చ�చ�కొన� సంచయం వృక�షం"
+
+#~ msgid "Unsubscribe Folder..."
+#~ msgstr "సంచయానకి చందాదార�కావద�ద�..."
+
+#~ msgid "Really unsubscribe from folder \"%s\"?"
+#~ msgstr "నిజంగా సంచయం \"%s\" క� చందాదార�కావ�టలేదా?"
+
+#~ msgid "Unsubscribe from \"%s\""
+#~ msgstr "\"%s\" న�ండి చందాదార�గా తొలగ�మ�"
+
+#~ msgid ""
+#~ "<b>Currently, your status is \"Out of the Office\". </b>\n"
+#~ "\n"
+#~ "Would you like to change your status to \"In the Office\"? "
+#~ msgstr ""
+#~ "<b>ప�రస�త�తం, మీ స�థితి \"ఆఫీస� బయట\".</b>\n"
+#~ "\n"
+#~ "మీర� మీ స�థితిని \"ఆఫీస� లో\" ఉన�నట�ల� మార�చాలన�క�ంట�న�నారా? "
+
+#~ msgid "<b>Out of Office Message:</b>"
+#~ msgstr "<b>ఆఫీస� క� బయట సందేశ:</b>"
+
+#~ msgid "<b>Status:</b>"
+#~ msgstr "<b>స�థితి:</b>"
+
+#~ msgid ""
+#~ "<small>The message specified below will be automatically sent to each "
+#~ "person who sends\n"
+#~ "mail to you while you are out of the office.</small>"
+#~ msgstr ""
+#~ "<small>మీర� ఆఫీస� క� బయట ఉన�నప�పడ� మీక� ఎవరైతే సందేశాన�ని పంపారో వారందరికి క�రింద తెలిపిన\n"
+#~ "సందేశం స�వయంచాలకంగా పంపబడ�త�ంది.</small>"
+
+#~ msgid "I am currently in the office"
+#~ msgstr "నేన� ప�రస�త�తం ఆఫీస�‌నంద� ఉన�నాన�"
+
+#~ msgid "I am currently out of the office"
+#~ msgstr "నేన� ప�రస�త�తం కార�యాలయం బయట ఉన�నాన�"
+
+#~ msgid "No, Don't Change Status"
+#~ msgstr "వద�ద�, స�స�థితిని మార�చవద�ద�"
+
+#~ msgid "Out of Office Assistant"
+#~ msgstr "ఆఫీస� క� బయట సహాయక�డ�"
+
+#~ msgid "Yes, Change Status"
+#~ msgstr "అవ�న�, స�స�థితిని మార�చ�మ�"
+
+#~ msgid "Password Expiry Warning..."
+#~ msgstr "రహస�యపదం కాలంచెల�లిన హెచ�చరిక..."
+
+#~ msgid "Your password will expire in 7 days..."
+#~ msgstr "ఇంకా 7 రోజ�ల�లో మీ రహస�యపదం కాలంఒచెల�లిపోత�ంది..."
+
+#~ msgid "_Change Password"
+#~ msgstr "సంకేతపదాన�ని మార�చండి(_C)"
+
+#~ msgid "(Permission denied.)"
+#~ msgstr "(అన�మతి తిరస�కరించబడినది.)"
+
+#~ msgid "Add User:"
+#~ msgstr "వినియోగదార�డిని జతచేయ�మ�:"
+
+#~ msgid "<b>Permissions</b>"
+#~ msgstr "<b>అన�మత�ల�</b>"
+
+#~ msgid "Cannot Delete"
+#~ msgstr "తొలగించ లేద�"
+
+#~ msgid "Cannot Edit"
+#~ msgstr "సరిచేయ లేద�"
+
+#~ msgid "Create items"
+#~ msgstr "అంశమ�లన� సృష�టించ�"
+
+#~ msgid "Create subfolders"
+#~ msgstr "ఉపసంచయాలన� సృష�టించ�మ�"
+
+#~ msgid "Delete Any Items"
+#~ msgstr "� అంశాలనైన తొలగించ�మ�"
+
+#~ msgid "Delete Own Items"
+#~ msgstr "స�వంత అంశాలన� తొలగించ�మ�"
+
+#~ msgid "Edit Any Items"
+#~ msgstr "� అంశాలనైనా సరిచేయ�మ�"
+
+#~ msgid "Edit Own Items"
+#~ msgstr "స�వంత అంశాలన� సరిచేయ�మ�"
+
+#~ msgid "Folder contact"
+#~ msgstr "సంచయం పరిచయం"
+
+#~ msgid "Folder owner"
+#~ msgstr "సంచయం యజమాని"
+
+#~ msgid "Folder visible"
+#~ msgstr "సంచయం దర�శితం"
+
+#~ msgid "Read items"
+#~ msgstr "చద�వ� అంశాల�"
+
+#~ msgid "Role: "
+#~ msgstr "పాత�ర: "
+
+#~ msgid "<b>Message Settings</b>"
+#~ msgstr "<b>సందేశం అమరికల�</b>"
+
+#~ msgid "<b>Tracking Options</b>"
+#~ msgstr "<b>గమనించ�టక� �చ�చికాల�</b>"
+
+#~ msgid "Exchange - Send Options"
+#~ msgstr "ఇచ�చిప�చ�చ�కొన� - పంప�టక� �చ�చికాల�"
+
+#~ msgid "I_mportance: "
+#~ msgstr "ప�రామ�ఖ�యత(_m)..."
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "High\n"
+#~ "Low"
+#~ msgstr ""
+#~ "సాదారణ\n"
+#~ "ఎక�క�వ\n"
+#~ "తక�క�వ"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Personal\n"
+#~ "Private\n"
+#~ "Confidential"
+#~ msgstr ""
+#~ "సాదారణ\n"
+#~ "స�వకీయ\n"
+#~ "వ�యక�తిగత\n"
+#~ "రహస�యమైన"
+
+#~ msgid "Request a _delivery receipt for this message"
+#~ msgstr "ఈ సందేశం కొరక� చేరినట�ల� రశీద�న� అభ�యర�దించండి(_d)"
+
+#~ msgid "Request a _read receipt for this message"
+#~ msgstr "ఈ సందేశం కొరక� చదివినదాని రశీద�న� అభ�యర�దించ�మ�(_r)"
+
+#~ msgid "Send as Delegate"
+#~ msgstr "ప�రతినిధిగా పంప�మ�"
+
+#~ msgid "_Sensitivity: "
+#~ msgstr "స�న�నితత�వం(_S): "
+
+#~ msgid "_User"
+#~ msgstr "వినియోగదారి(_U)"
+
+#~ msgid "Select User"
+#~ msgstr "వినియోగదారిని ఎంపికచేయ�మ�"
+
+#~ msgid "Address Book..."
+#~ msgstr "చిర�నామా ప�స�తకం..."
+
+#~ msgid "Subscribe to Other User's Contacts"
+#~ msgstr "ఇతర వినియోగదార�ల పరిచయాలక� చందాదార� కండి"
+
+#~ msgid "Subscribe to Other User's Calendar"
+#~ msgstr "ఇతరవినియోగదార�ల క�యాలెండర� క� చందాదార� కండి"
+
+#~ msgid "Activates the Evolution-Exchange extension package."
+#~ msgstr "ఎవాల�యూషన�-ఎక�సేంజ� పొడిగింప� ప�యాకేజిన� క�రియాశీలపరస�త�ంది."
+
+#~ msgid "Exchange Operations"
+#~ msgstr "ఇచ�చిప�చ�చ�కొన� ఆపరేషన�‌ల�"
+
+#~ msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+#~ msgstr "\"Exchange settings\" టాబ�‌న� ఆఫ�‌లైన� రీతినంద� యాక�సిస� చేయలేద�."
+
+#~ msgid "Cannot change password due to configuration problems."
+#~ msgstr "ఆకృతీకరణ సమస�యవలన సంకేతపదాలన� మార�చలేమ�."
+
+#~ msgid "Cannot display folders."
+#~ msgstr "సంచయాలన� ప�రదర�శించలేక పోయింది."
+
+#~ msgid ""
+#~ "Changes to options for Exchange account \"{0}\" will only take effect "
+#~ "after restarting Evolution."
+#~ msgstr ""
+#~ "ఇచ�చిప�చ�చ�కొన� ఖాతా \"{0}\" కొరక� �చ�చికాలక� మార�ప�ల� ఎవాల�యూషన� ప�నఃప�రారంభిచిన తర�వాత "
+#~ "ప�రభావితం అవ�తాయి."
+
+#~ msgid "Could not authenticate to server."
+#~ msgstr "సేవికక� దృవీకరించలేక పోయింది."
+
+#~ msgid "Could not change password."
+#~ msgstr "సంకేతపదాన�ని మార�చలేక పోయింది."
+
+#~ msgid ""
+#~ "Could not configure Exchange account because \n"
+#~ "an unknown error occurred. Check the URL, \n"
+#~ "username, and password, and try again."
+#~ msgstr ""
+#~ "ఇచ�చిప�చ�చ�కొన� ఖాతాన� ఆకృతీకరించలేక పోయింది \n"
+#~ "ఒక తెలియని దోషం ఎద�రైంది. URL న�, వినియోగదారినామమ� న�,\n"
+#~ "మరియ� సంకేతపదం న� పరిశీలించ�మ� మరియ� తిరిగిప�రయత�నించ�మ�."
+
+#~ msgid "Could not connect to Exchange server."
+#~ msgstr "ఇచ�చిప�చ�చ�కొన� సేవికక� అన�సంధానించ బడలకేపోయింది."
+
+#~ msgid "Could not connect to server {0}."
+#~ msgstr "సేవిక {0} క� అన�సంధానించ లేకపోయింది."
+
+#~ msgid "Could not determine folder permissions for delegates."
+#~ msgstr "ప�రతినిధ�ల కొరక� సంచయం అన�మత�లన� నిర�ధారించలేకపోయింది."
+
+#~ msgid "Could not find Exchange Web Storage System."
+#~ msgstr "ఇచ�చిప�చ�చ�కొన� వెబ� నిల�వ సిస�టమ� న� కన�గొనలేకపోయింది."
+
+#~ msgid "Could not locate server {0}."
+#~ msgstr "సేవిక {0} న� గ�ర�తించ లేకపోయింది."
+
+#~ msgid "Could not make {0} a delegate"
+#~ msgstr "{0} ఒక ప�రతినిధిని చేయలేకపోయింద"
+
+#~ msgid "Could not read folder permissions"
+#~ msgstr "సంచయం అన�మత�లన� చదవలేకపోయింది"
+
+#~ msgid "Could not read folder permissions."
+#~ msgstr "సంచయం అన�మత�లన� చదవలేకపోయింది."
+
+#~ msgid "Could not read out-of-office state"
+#~ msgstr "ఆఫీస�-క�-బయట స�థితిని చద�వలేక పోయింది"
+
+#~ msgid "Could not update folder permissions."
+#~ msgstr "సంచయం అన�మత�లన� నవీకరించలేక పోయింది."
+
+#~ msgid "Could not update out-of-office state"
+#~ msgstr "ఆఫీస�-క�-బయట స�థితిని నవికరించలేక పోయింది"
+
+#~ msgid "Evolution requires a restart to load the subscribed user's mailbox"
+#~ msgstr "సబ�‌స�క�రైబ� అయిన వినియోగదారి మెయిల�‌బాక�స�� లోడ�‌చేయ�టక� ఎవాల�యూషన�‌క� ప�నఃప�రారంభం అవసరమ�"
+
+#~ msgid "Exchange Account is offline."
+#~ msgstr "ఇచ�చిప�చ�చ�కొన� ఖాతా అఫ�‌లైన� గా ఉంది."
+
+#~ 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 ""
+#~ "ఎక�సేంజ� అన�సందాని ఎక�సేంజ� సేవికనంద�\n"
+#~ "అచేతనంగా లేదా బ�లాక�‌డ� గా కనిపిస�త�న�న కార�యక�రమం వాడ�కొన�\n"
+#~ "అవసరంఉంది. (ఇది సారాణంగా అన�కోక�ండా.)\n"
+#~ "మీ ఎక�సేంజ� నిర�వాహక�డ� ఈ ఫంక�షనాలిటిని చేతనం చేయాలి\n"
+#~ "ఎవాల�యూషన� ఎక�సేంజ� అన�సంధాని ఉపయోగించ�టక�.\n"
+#~ "\n"
+#~ "మీ ఎక�సేంజ� నిర�వాహక�నికి ఇవ�వవలిసిన సమాచారం కొరక�\n"
+#~ "దయచేసి, ఈ క�రింది లింక�న� అన�సరించ�మ�:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "  "
+
+#~ msgid "Folder already exists"
+#~ msgstr "సంచయం ఇప�పటికే ఉంది"
+
+#~ msgid "Folder does not exist"
+#~ msgstr "సంచయం లేద�"
+
+#~ msgid "Folder offline"
+#~ msgstr "సంచయం ఆఫ�‌లైన�"
+
+#~ msgid "Generic error"
+#~ msgstr "సాదారణ దోషం"
+
+#~ msgid "Global Catalog Server is not reachable"
+#~ msgstr "గ�లోబల� వర�గీకరణ సేవిక అంద�బాట�లో లేద�"
+
+#~ msgid ""
+#~ "If OWA is running on a different path, you must specify that in the "
+#~ "account configuration dialog."
+#~ msgstr ""
+#~ "ఒకవేళ OWA భిన�నమైన పాత� నంద� నడ�స�త�ంటే, మీర� తప�పక దానిని ఖాతా ఆకృతీకరణ డైలాగ� నంద� "
+#~ "తెల�పవలెన�."
+
+#~ msgid "Mailbox for {0} is not on this server."
+#~ msgstr "మెయిల�‌పెట�టె {0} కొరక� ఈ సేవికనంద� లేద�."
+
+#~ msgid "Make sure the URL is correct and try again."
+#~ msgstr "ఆ URL సరైనదేమో పరిశీలించ�కొని మరలా ప�రయత�నించండి."
+
+#~ msgid "Make sure the server name is spelled correctly and try again."
+#~ msgstr "సేవికనామమ� సరిగా స�పెల� చేసారో లేదో సరిచూస�కోని మరలా ప�రయత�నించండి."
+
+#~ msgid "Make sure the username and password are correct and try again."
+#~ msgstr "వినియోగదార�ని నామమ� మరియ� సంకేతపదమ� సరిచూస�కొని మరలా ప�రయత�నించండి."
+
+#~ msgid "No Global Catalog server configured for this account."
+#~ msgstr "ఈ ఖాతా కొరక� � గ�లోబల� వర�గీకరణ సేవిక ఆకృతీకరించబడలేద�."
+
+#~ msgid "No mailbox for user {0} on {1}."
+#~ msgstr "{1} పైన వినియోగాదారి {0} కొరక� � మెయిల�‌పెట�టె లేద�."
+
+#~ msgid "No such user {0}"
+#~ msgstr "ఇట�వంటి వినియోగదారి లేద� {0}"
+
+#~ msgid "Password successfully changed."
+#~ msgstr "సంకేతపదం సమర�ధవంతంగా మార�చబడింది."
+
+#~ msgid ""
+#~ "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+#~ msgstr "దయచేసి ప�రతినిధి యొక�క ID ని ప�రవేశపెట�టండి లేదా పంపటం న� ప�రతినిధి �చ�చికంగా ఎంపికచేయవద�ద�."
+
+#~ msgid "Please make sure the Global Catalog Server name is correct."
+#~ msgstr "గ�లోబల� వర�గీకరణ సేవిక నామమ� సరైనదేమో దయచేసి పరిశీలించ�మ�."
+
+#~ msgid "Please restart Evolution for changes to take effect"
+#~ msgstr "మార�ప�ల� ప�రభావితం కావ�టక� దయచేసి ఎవాల�యూషన� ప�నఃప�రారంభించ�మ�"
+
+#~ msgid "Please select a user."
+#~ msgstr "దయచేసి వినియోగదారిని ఎంపికచేస�కొన�మ�."
+
+#~ msgid "Server rejected password because it is too weak."
+#~ msgstr "సేవిక సంకేతపదాన�ని తిరస�కరించింది ఎంచేతంటే అది బలహీనంగా ఉంది."
+
+#~ msgid "The Exchange account will be disabled when you quit Evolution"
+#~ msgstr "మీర� ఎవాల�యూషన� న�ండి బహష�కరించగానే ఇచ�చిప�చ�చకొన� ఖాతా అచేతనం అవ�త�ంది"
+
+#~ msgid "The Exchange account will be removed when you quit Evolution"
+#~ msgstr "మీర� ఎవాల�యూషన� న�ండి బహష�కరించగానే ఇచ�చిప�చ�చకొన� ఖాతా తీసివేయబడ�త�ంది"
+
+#~ msgid "The Exchange server is not compatible with Exchange Connector."
+#~ msgstr "ఇచ�చిప�చ�చ�కొన� సేవిక ఇచ�చిప�చ�చ�కొన� అన�సంధానితో సారూప�యంగా లేద�."
+
+#~ msgid ""
+#~ "The server is running Exchange 5.5. Exchange Connector \n"
+#~ "supports Microsoft Exchange 2000 and 2003 only."
+#~ msgstr ""
+#~ "ఈ సేవిక ఎక�సేంజ� 5.5 న� నడ�ప�తోంది. ఎక�సేంజ� అన�సంధాని\n"
+#~ "Microsoft ఎక�సేంజ� 2000 మరియ� 2003 మాత�రమే మద�దతిస�తోంది."
+
+#~ msgid ""
+#~ "This probably means that your server requires \n"
+#~ "you to specify the Windows domain name \n"
+#~ "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+#~ "\n"
+#~ "Or you might have just typed your password wrong."
+#~ msgstr ""
+#~ "దీనిర�ధం మీ సేవికక� మీర� కూడా విండోస� డోమైన� నామమ�న�\n"
+#~ "తెల�పవలిసిన అవసరంఉంది మీ వినియోగదార�ని నామమ�లో\n"
+#~ "భాగమ�గా (ఉదా, &quot;DOMAIN\\user&quot;).\n"
+#~ "\n"
+#~ "లేదా మీర� మీ సంకేతపదాన�ని తప�ప�గా టైప�చేసిఉంటార�."
+
+#~ msgid "Try again with a different password."
+#~ msgstr "వేరే సంకేతపదం తో మరలా ప�రయత�నించండి."
+
+#~ msgid "Unable to add user to access control list:"
+#~ msgstr "నియంత�రణ జాబితాన� వాడ�కొన�టక� వినియోగదారిని కల�పలేమ�:"
+
+#~ msgid "Unable to edit delegates."
+#~ msgstr "ప�రతినిధ�లన� సరిచేయ లేక పోయింది."
+
+#~ msgid "Unknown error looking up {0}"
+#~ msgstr "అపరిచిత దోషం చూడ�టలో {0}"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "మద�దతివ�వని ఆపరేషన�"
+
+#~ msgid ""
+#~ "You are nearing your quota available for storing mail on this server."
+#~ msgstr "మీర� ఈ సేవికనంద� మెయిల� నిల�వచేస�కొన�టక� కలిగిఉన�న కొటాన� సమీపిస�త�న�నార�."
+
+#~ msgid ""
+#~ "You are permitted to send a message on behalf of only one delegator at a "
+#~ "time."
+#~ msgstr "మీర� ఒక సారి ఒక ప�రతినిధి తర�ప�న మాత�రమే సందేశం పంప�టక� అన�మతి కలిగఉన�నార�."
+
+#~ msgid "You cannot make yourself your own delegate"
+#~ msgstr "మీర� మీఅంతటమీరే మీ స�వతం ప�రతినిధ�లన� తయార�చేయలేర�"
+
+#~ msgid "You have exceeded your quota for storing mail on this server."
+#~ msgstr "ఈ సేవికలో మెయిల� నిల�వచేయ�టక� మీర� మీ కొటాన� మించిపోయార�."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. Try to clear up some space by deleting "
+#~ "some mail."
+#~ msgstr "మీ ప�రస�త�త ఉపయోగం : {0} KB. �దో మెయిల� తొలగించ�ట ద�వారా కొంతఖాళీ చేయ�టక� ప�రయత�నించండి."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to either send or "
+#~ "receive mail now."
+#~ msgstr "మీ ప�రస�త�త ఉపయోగం: {0} KB. మీర� ఇప�ప�డ� మెయిల� న� పంపలేర� లేదా తిరిగిపొందలేర�."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to send mail until "
+#~ "you clear up some space by deleting some mail."
+#~ msgstr ""
+#~ "మీ ప�రస�త�త ఉపయోగం: {0} KB. మీర� �దో మెయిల� న� తొలగించి కొంత ఖాళీ చేసేదాక మీర� మెయిల� న� పంపలేర�."
+
+#~ msgid "Your password has expired."
+#~ msgstr "మీ సంకేతపదం కాలమ�తీరినది."
+
+#~ msgid "{0} cannot be added to an access control list"
+#~ msgstr "{0} వాడిక నియంత�రణ జాబితా క� జతచేయలేమ�"
+
+#~ msgid "{0} is already a delegate"
+#~ msgstr "{0} ఇప�పటికే ఒక ప�రతినిధి"
+
+#~ msgid "{0} is already in the list"
+#~ msgstr "{0} ఇప�పటికే జాబితా నంద�ఉంది"
+
+#~ msgid "Subscribe to Other User's Tasks"
+#~ msgstr "ఇతర వినియోగదార�ల కర�తవ�యాలక� చందాదార�కండి"
+
+#~ msgid "Check folder permissions"
+#~ msgstr "సంచయం అన�మత�లన� పరిశీలించ�మ�"
+
+#~ msgid "PNG files"
+#~ msgstr "PNG దస�త�రాల�"
+
+#~ msgid "_Face"
+#~ msgstr "మ�ఖమ�(_F)"
+
+#~| msgid ""
+#~| "Attach Face header to outgoing messages. First time the user needs to "
+#~| "configure a 48*48 png image. It is base64 encoded and stored in ~/."
+#~| "evolution/faces This will be used in messages that are sent further."
+#~ msgid ""
+#~ "Attach a small picture of your face to outgoing messages.\n"
+#~ "\n"
+#~ "First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+#~ "encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+#~ "sent messages."
+#~ msgstr ""
+#~ "బయటక� వెళ�ళ� సందేశాలక� మీ ఛాయాచిత�రమ�న� అన�భందించ�మ�.\n"
+#~ "\n"
+#~ "మొదటి సారి వినియోగదారి 48x48 PNG చిత�రాన�ని ఆకృతీకరించవలిసిన అవసరంఉంది. ఇది 64ఆధారిత ఎన�కోడెడ� మరియ� "
+#~ "~/.evolution/faces నంద� నిల�వఉంచబడ�త�ంది. ఇది తర�వాత పంప� సందేశాలనంద� "
+#~ "ఉపయోగపడ�త�ంది."
+
+#~ msgid "Unsubscribe Folders"
+#~ msgstr "సంచయాలక� చందావిరమించ�మ�"
+
+#~ msgid ""
+#~ "Unsubscribe from an IMAP folder by right-clicking on it in the folder "
+#~ "tree."
+#~ msgstr "ఫోల�డర� ట�రీనంద� IMAP ఫోల�డర�‌పై క�డి-నొక�క� నొక�క�టద�వారా దానిన�ండి అన�‌సబ�‌స�క�రైబ� కావచ�చ�న�."
+
+#~ msgid "Add Novell GroupWise support to Evolution."
+#~ msgstr "ఎవాల�యూషన�‌క� నావెల� సమూహతరహా మద�దత�న� జతచేయ�మ�."
+
+#~ msgid "GroupWise Account Setup"
+#~ msgstr "సమూహతరహా ఖాతా అమర�ప�"
+
+#~ msgid "<b>Junk List:</b>"
+#~ msgstr "<b>నిరర�ధకం జాబితా:</b>"
+
+#~ msgid "<b>Name</b>"
+#~ msgstr "<b>నామమ�</b>"
+
+#~ msgid "<b>Custom Headers</b>"
+#~ msgstr "<b>మల�చ�క�న�న పీఠికల�</b>"
+
+#~ msgid "<b>IMAP Headers</b>"
+#~ msgstr "<b>IMAP పీఠికల�</b>"
+
+#~ msgid "Hardware Abstraction Layer not loaded"
+#~ msgstr "హార�డ�వేర� సరళీకరణి పోర నింపబడలేద�"
+
+#~ msgid ""
+#~ "The \"hald\" service is required but not currently running. Please enable "
+#~ "the service and rerun this program, or contact your system administrator."
+#~ msgstr ""
+#~ "\"హాల�డ�\" సేవ అవసరమైంది అయితే ప�రస�త�తం నడ�వ�టలేద�. దయచేసి ఈ సేవన� చేతనంచేసి మరియ� ఈ ప�రోగ�రామ� "
+#~ "న� తిప�పిపంప�మ�, లేదా మీ సిస�టమ� నిర�వహణాధికారిని సంప�రదించ�మ�."
+
+#~ msgid ""
+#~ "Evolution could not find an iPod to synchronize with. Either the iPod is "
+#~ "not connected to the system or it is not powered on."
+#~ msgstr ""
+#~ "ఎవాల�యూషన� iPod న� కన�గొనలేక పోయింది దానితో కాలనియమత అగ�టక�.బహ�శా iPod సిస�టమ� క� "
+#~ "అన�సంధానించబడి ఉండకపోవచ�చ� లేదా దాని పవర� ఆన� చేసి ఉండకపోవచ�చ�."
+
+#~ msgid "Synchronize to iPod"
+#~ msgstr "iPod క� �కకాలంచేయ�మ�"
+
+#~| msgid "Synchronize to iPod"
+#~ msgid "Synchronize your data with your Apple iPod."
+#~ msgstr "మీ డాటాన� మీ ఆపిల� iPodతో �కకాలం చేయ�మ�."
+
+#~ msgid "Disable an account by right-clicking on it in the folder tree."
+#~ msgstr "ఫోల�డర� ట�రీనంద� ఖాతాపై క�డి-నొక�క నొక�క�టద�వారా దానిని అచేతనమ� చేయి."
+
+#~ msgid "Specify _filename:"
+#~ msgstr "దస�త�రనామమ� న� తెలియజేయ�మ�(_f):"
+
+#~ msgid "Pl_ay"
+#~ msgstr "ప�లే(_a)"
+
+#~| msgid "Mail to task"
+#~ msgid "Mail-to-Task"
+#~ msgstr "కర�తవ�యమ�-క�-మెయిల�"
+
+#~ msgid "Contact list _owner"
+#~ msgstr "పరిచయ జాబితా స�వంతదార�(_o)"
+
+#~ msgid "Get list _archive"
+#~ msgstr "జాబితా ఆర�చివ�‌న� తెమ�మ�(_a)"
+
+#~ msgid "Get list _usage information"
+#~ msgstr "జాబితా ఉపయోగం సమాచారాన�ని పొంద�మ�(_u)"
+
+#~ msgid "_Post message to list"
+#~ msgstr "సందేశాన�ని జాబితాక� పోస�ట�చేయ�మ�(_P)"
+
+#~ msgid "_Subscribe to list"
+#~ msgstr "జాబితాక� చందాదార� కమ�మ�(_S)"
+
+#~ msgid "_Un-subscribe to list"
+#~ msgstr "జాబితాక� చందావిరమించ�కొన�మ�(_U)"
+
+#~ msgid "Mono Loader"
+#~ msgstr "మోనో లోడర�"
+
+#~ msgid "Support plugins written in Mono."
+#~ msgstr "మోనో నంద� వ�రాసిన ప�లగిన�లన� మద�దతించ�మ�."
+
+#~ msgid "Prefer PLAIN"
+#~ msgstr "సాదా న� ఇష�టపడతాన�"
+
+#~ msgid "<span weight=\"bold\">Location</span>"
+#~ msgstr "<span weight=\"bold\">స�థానమ�</span>"
+
+#~ msgid "<span weight=\"bold\">Sources</span>"
+#~ msgstr "<span weight=\"bold\">మూలాల�</span>"
+
+#~ msgid ""
+#~ "Secure FTP (SSH)\n"
+#~ "Public FTP\n"
+#~ "FTP (with login)\n"
+#~ "Windows share\n"
+#~ "WebDAV (HTTP)\n"
+#~ "Secure WebDAV (HTTPS)\n"
+#~ "Custom Location"
+#~ msgstr ""
+#~ "రక�షిత FTP (SSH)\n"
+#~ "పబ�లిక� FTP\n"
+#~ "FTP (లాగిన� తో)\n"
+#~ "విండోస� భాగస�వామ�యం\n"
+#~ "WebDAV (HTTP)\n"
+#~ "రక�షిత WebDAV (HTTPS)\n"
+#~ "మల�చ�క�న�న స�థానమ�"
+
+#~ msgid ""
+#~ "days\n"
+#~ "weeks\n"
+#~ "months"
+#~ msgstr ""
+#~ "రోజ�ల�\n"
+#~ "వారమ�ల�\n"
+#~ "నెలల�"
+
+#~ msgid ""
+#~ "iCal\n"
+#~ "Free/Busy"
+#~ msgstr ""
+#~ "iCal\n"
+#~ "ఖళి/తీరికలేని"
+
+#~ msgid "A plugin which loads other plugins written using Python."
+#~ msgstr "పైథాన� వ�పయోగించి వ�రాసిన ఇతర ప�లగ�ఇన�స��‌న� లోడ�‌చేయ�టక� ప�లగ�ఇన�."
+
+#~ msgid "Python Loader"
+#~ msgstr "పైథాన� లోడర�"
+
+#~ msgid "_Save to Disk"
+#~ msgstr "డిస�క�క� దాస�త�ంది(_S)"
+
+#~| msgid "Selects a single calendar or task source for viewing."
+#~ msgid "Quickly select a single calendar or task list for viewing."
+#~ msgstr "దర�శించ�టక� ఒక క�యాలెండర�‌న� కాని లేక కర�తవ�య జాబితాన� కాని త�వరగా ఎంపికచేస�కొనండి."
+
+#~| msgid "Select one source"
+#~ msgid "Select One Source"
+#~ msgstr "ఒక మూలాన�ని ఎంపికచేయ�మ�"
+
+#~ msgid "Evolution Shell"
+#~ msgstr "ఎవాల�యూషన� షెల�"
+
+#~ msgid "Evolution Shell Config factory"
+#~ msgstr "ఎవాల�యూషన� షెల� ఆకృతీకరణ ఫాక�టరీ"
+
+#~ msgid "Evolution Test"
+#~ msgstr "ఎవాల�యూషన� పరిశీలన"
+
+#~ msgid "Evolution Test component"
+#~ msgstr "ఎవాల�యాషన� పరిశీలన మూలకం"
+
+#~ msgid "<b>Active Connections</b>"
+#~ msgstr "<b>క�రియాశీలమైన బంధాల�</b>"
+
+#~ msgid "Active Connections"
+#~ msgstr "క�రియాశీలమైన బంధాల�"
+
+#~ msgid "Click OK to close these connections and go offline"
+#~ msgstr "ఈ బంధాలన� మూసి లైన�బయటక� వెళ�ళడానికి సరే బొత�తాన�ని నొక�క�మ�"
+
+#~ msgid "_Import"
+#~ msgstr "మ�ఖ�యమైన(_I)"
+
+#~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
+#~ msgstr "గ�నోమ� చ�క�కానిల పనిమ�ట�ల� ఈ వ�యవస�థలో ప�రతిష�టించినట�ల� కన�బడ�టలేద�."
+
+#~| msgid "Error executing %s."
+#~ msgid "Error executing %s. (%s)"
+#~ msgstr "%s నిర�వర�తించ�టలో దోషమ�. (%s)"
+
+#~ msgid "Work Offline"
+#~ msgstr "లైన�వెల�పల పనిచేయ�మ�"
+
+#~ msgid "Evolution is in the process of going offline."
+#~ msgstr "లైన� బయటక� వెళ�ళే క�రమంలో ఎవల�యూషన� ఉన�నది"
+
+#~ msgid "Unknown system error."
+#~ msgstr "తెలియని సిస�టమ� దోషం."
+
+#~ msgid "Invalid arguments"
+#~ msgstr "సరికాని ఆర�గ�మెంట�స�"
+
+#~ msgid "Cannot register on OAF"
+#~ msgstr "OAF ళో నమోద� క�దరద�"
+
+#~ msgid "Configuration Database not found"
+#~ msgstr "రూపకరణ దత�తాంశస�థానమ� కన�బడలేద�"
+
+#~ msgid "New Test"
+#~ msgstr "కొత�త పరీక�ష"
+
+#~ msgid "Import File"
+#~ msgstr "దస�త�రాన�ని దిగ�మతి చేయ�మ�"
+
+#~ msgid "Cannot start Evolution"
+#~ msgstr "ఎవల�యూషన�‌న� ప�రారంభించలేద�"
+
+#~ msgid "Evolution can not start."
+#~ msgstr "ఎవల�యూషన� ప�రారంభమవ�వద�"
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration.\n"
+#~ "\n"
+#~ "Click help for details"
+#~ msgstr ""
+#~ "మీ సిస�టమ� ఆకృతీకరణ ఎవాల�యూషన� ఆకృతీకరణక� సరిపోలడంలేద�.\n"
+#~ "\n"
+#~ "వివరమ�ల కొరక� సహాయం న� నొక�కండి"
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "Click help for details."
+#~ msgstr ""
+#~ "మీ సిస�టమ� ఆకృతీకరణ మీ ఎవాల�యూషన� ఆకృతీకరణ క� సరిపోలడంలేద�:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "వివరమ�ల కొరక� సహాయం న� నొక�కండి."
+
+#~ msgid "<b>Field Value</b>"
+#~ msgstr "<b>క�షేత�రం విల�వ</b>"
+
+#~ msgid "<b>Fingerprints</b>"
+#~ msgstr "<b>వేలిమ�ద�రల�</b>"
+
+#~ msgid "<b>Issued By</b>"
+#~ msgstr "<b>ద�వారా జారిచేయబడింది</b>"
+
+#~ msgid "<b>Issued To</b>"
+#~ msgstr "<b>క� జారిఅయింది</b>"
+
+#~ msgid "Dummy window only"
+#~ msgstr "నకిలీ గవాక�షమే"
+
+#~ msgid "Could not execute '%s': %s\n"
+#~ msgstr "'%s' న� నిర�వర�తించలేద�: %s\n"
+
+#~ msgid "Shutting down %s (%s)\n"
+#~ msgstr "మూసివేయ�చ�న�నది %s (%s)\n"
+
+#~ msgid "Copy"
+#~ msgstr "నకల�"
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "సంచయమ�క� నకల� తీయ�మ�..."
+
+#~ msgid "Create a new address book folder"
+#~ msgstr "కొత�త చిర�నామా ప�స�తక సంచయాన�ని సృష�టించ�"
+
+#~ msgid "Cut"
+#~ msgstr "కత�తిరించ�మ�"
+
+#~ msgid "Forward Contact"
+#~ msgstr "పరిచయాన�ని మ�ంద�క� పంప�మ�"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "సంచయమ�నక� జర�గ�మ�..."
+
+#~ msgid "Paste"
+#~ msgstr "అతికించ�"
+
+#~ msgid "Save as VCard..."
+#~ msgstr "Vపలకంగా దాయ�మ�..."
+
+#~ msgid "Select _All"
+#~ msgstr "అన�నిటిని ఎంచ�కొన�మ�(_A)"
+
+#~ msgid "Send message to contact"
+#~ msgstr "పరిచయానికి సందేశం పంప�మ�"
+
+#~ msgid "St_op"
+#~ msgstr "ఆప�(_o)"
+
+#~ msgid "Stop"
+#~ msgstr "ఆప�"
+
+#~ msgid "_Copy Folder Contacts To"
+#~ msgstr "సంచయం పరిచయాలన� నకల�తీయ�మ�(_C)"
+
+#~ msgid "_Move Folder Contacts To"
+#~ msgstr "సంచయం పరిచయాలన� క� కద�ప�మ�(_M)"
+
+#~ msgid "_Rename"
+#~ msgstr "ప�న:నామకరణ(_R)"
+
+#~ msgid "_Save Contact as VCard..."
+#~ msgstr "పరిచయాలన� Vకార�డ� లాగా దాయ�మ�(_S)..."
+
+#~ msgid "_Save Folder Contacts As VCard"
+#~ msgstr "సంచయం పరిచయాలన� Vకార�డ� లాగా దాయ�మ�(_S)"
+
+#~ msgid "Delete _all Occurrences"
+#~ msgstr "సంభవాలన�నింటి తొలగించ�మ�(_a)"
+
+#~ msgid "Show the working week"
+#~ msgstr "పనిచేస�త�న�న వారాన�ని చూప�మ�"
+
+#~ msgid "View the debug console for log messages"
+#~ msgstr "డీబగ� కన�సోల� న� లాగ� సందేశాల కొరక� దర�శించ�మ�"
+
+#~ msgid "_Debug Logs"
+#~ msgstr "డీబగ� లాగ�స�(_D)"
+
+#~ msgid "Show message preview side-by-side with the message list"
+#~ msgstr "సందేశం ఉపదర�శనంన� ప�రక�క-ప�రక�కన ఉంచి సందేశ జాబితాతో చూప�మ�"
+
+#~ msgid "Copy selected message(s) to the clipboard"
+#~ msgstr "ఎంచ�క�న�న సందేశాలన� క�లిప� పలకానికి నకల� తీయ�మ�"
+
+#~ msgid "Cut selected message(s) to the clipboard"
+#~ msgstr "ఎంపికచేసిన సందేశాలన� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
+
+#~ msgid "Paste message(s) from the clipboard"
+#~ msgstr "క�లిప� పలక న�ండి సందేశాలన� అతికించ�మ�"
+
+#~ msgid "Select _All Messages"
+#~ msgstr "అన�ని సందేశాలన� ఎంచ�కొన�మ�(_A)"
+
+#~ msgid "Select all and only the messages that are not currently selected"
+#~ msgstr "ప�రస�త�తం ఎంచ�కోబడని సందేశాలన� మాత�రమే ఎంచ�కొన�మ�"
+
+#~ msgid "Not Junk"
+#~ msgstr "నిరర�ధకం కాద�"
+
+#~ msgid "Paste messages from the clipboard"
+#~ msgstr "క�లిప� పలకం న�ండి సందేశాలన� అతికించ�మ�"
+
+#~ msgid "Select _All Text"
+#~ msgstr "పాఠ�యమ�నంతా ఎంచ�కొన�మ�(_A)"
+
+#~ msgid "_Save Message..."
+#~ msgstr "సందేశాన�ని దాయ�మ�(_S)..."
+
+#~ msgid "Main toolbar"
+#~ msgstr "మ�ఖ�య పనిమ�ట�లపట�టా"
+
+#~ msgid "Copy selected memo"
+#~ msgstr "ఎంపికచేసిన మెమోన� నకల�తీయ�మ�"
+
+#~ msgid "Cut selected memo"
+#~ msgstr "ఎంపికచేసిన మెమోన� కత�తిరించ�మ�"
+
+#~ msgid "Copy selected tasks"
+#~ msgstr "ఎంపిక చేసిన కర�తవ�యాలన� నకల�తీయ�మ�"
+
+#~ msgid "Cut selected tasks"
+#~ msgstr "ఎంపిక చేసిన కర�తవ�యాలన� కత�తిరించ�మ�"
+
+#~ msgid "Mar_k as Complete"
+#~ msgstr "పూర�తయినట�ట� గ�ర�త� పెట�ట�మ�"
+
+#~ msgid "Show task preview window"
+#~ msgstr "కర�తవ�య ఉపదర�శన గవాక�షాన�ని చూప�మ�"
+
+#~ msgid "About Evolution..."
+#~ msgstr "ఎవల�యూషన� గ�రించి..."
+
+#~ msgid "Change the visibility of the toolbar"
+#~ msgstr "పనిమ�ట�లపట�టా దృశ�యతన� మార�చ�మ�"
+
+#~ msgid "Forget remembered passwords so you will be prompted for them again"
+#~ msgstr "గ�ర�త�ంచ�కొనిని సంకేతపదాలన� మర�చిపోవ�ట వలన మీర� మరలా వాటికొరక� అడగబడతార�"
+
+#~ msgid "Hide window buttons"
+#~ msgstr "గవాక�ష బొత�తమ�లన� కనపడక�ండా దాయ�మ�"
+
+#~ msgid "Page Set_up..."
+#~ msgstr "ప�ట అమరిక(_u)..."
+
+#~ msgid "Prefere_nces"
+#~ msgstr "అభీష�టాల�"
+
+#~ msgid "Send / Receive"
+#~ msgstr "పంప�మ�/తీస�కొన�మ�"
+
+#~ msgid "Submit Bug Report"
+#~ msgstr "బగ� నివేదిక న� పంప�మ�"
+
+#~ msgid "Toggle whether we are working offline."
+#~ msgstr "మనమ� ఆఫ�‌లైన� లో పనిచేస�త�ంటే మార�మ�."
+
+#~ msgid "View/Hide the Side Bar"
+#~ msgstr "ప�రక�కపట�టీని దర�శించ�/మర�గ�పరచ�"
+
+#~ msgid "View/Hide the Status Bar"
+#~ msgstr "స�స�థితి  పట�టీ ని దర�శించ�/దాయ�మ�"
+
+#~ msgid "Work _Offline"
+#~ msgstr "ఆఫ�‌లైన�‌గా పనిచేయ�మ� (_O)"
+
+#~ msgid "_About"
+#~ msgstr "గ�రించి(_A)"
+
+#~ msgid "_Frequently Asked Questions"
+#~ msgstr "తర�చూ అడ�గ� ప�రశ�నల�(_F)"
+
+#~ msgid "_Hide Buttons"
+#~ msgstr "బొత�తమ�లన� మర�గ�పరచ�మ� (_H)"
+
+#~ msgid "_Synchronization Options..."
+#~ msgstr "కాలనియమత ఇచ�చాపూర�వకాల�(_S)..."
+
+#~ msgid "<b>Time Zones</b>"
+#~ msgstr "<b>కాలక�షేత�రాల�</b>"
+
+#~ msgid "<b>_Selection</b>"
+#~ msgstr "<b>ఎంపిక(_S)</b>"
+
+#~ msgid "Save Custom View"
+#~ msgstr "మలచిన దర�శనమ�న� దాయ�మ�"
+
+#~ msgid "Unknown character set: %s"
+#~ msgstr "అపరిచిత %s అక�షర సంకేతరచన:"
+
+#~ msgid "_Searches"
+#~ msgstr "వెత�క�ట(_S)"
+
+#~ msgid "Choose Image"
+#~ msgstr " ప�రతిరూపాన�ని ఎంపికచేయ�"
+
+#~ msgid "Empty message"
+#~ msgstr "ఖాళీ సందేశం"
+
+#~ msgid "Reflow model"
+#~ msgstr "తిరిగివేళ�ళ� రీతి"
+
+#~ msgid "Column width"
+#~ msgstr "నిల�వ� పట�టీ వెడల�ప�"
+
+#~ msgid "_Clear"
+#~ msgstr "శ�బ�రం చేయ�(_C)"
+
+#~ msgid "Item ID"
+#~ msgstr "అంశం  యొక�కID"
+
+#~ msgid "<b>Replies</b>"
+#~ msgstr "<b>సమాధానాల�</b>"
+
+#~ msgid "<b>Status Tracking</b>"
+#~ msgstr "<b>స�స�థితిని గమనించ�ట</b>"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Proprietary\n"
+#~ "Confidential\n"
+#~ "Secret\n"
+#~ "Top Secret\n"
+#~ "For Your Eyes Only"
+#~ msgstr ""
+#~ "సాదారణ\n"
+#~ "వ�యాపార\n"
+#~ "వ�యక�తిగతమైన\n"
+#~ "రహస�యం\n"
+#~ "అతిరహస�యం\n"
+#~ "మీ కళ�ళక� మాత�రమే"
+
+#~ msgid ""
+#~ "Undefined\n"
+#~ "High\n"
+#~ "Standard\n"
+#~ "Low"
+#~ msgstr ""
+#~ "నిర�వచించని\n"
+#~ "ఎక�క�వ\n"
+#~ "ప�రామాణిక\n"
+#~ "తక�క�వ"
+
+#~ msgid "Field Chooser"
+#~ msgstr "క�షేత�రాన�ని ఎంచ�క�నేది"
+
+#~ msgid "Tree"
+#~ msgstr "వృక�షం"
diff --git a/po/uk.po b/po/uk.po
index 4344694cfe..0411c3824e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,12 +5,12 @@
 # Andrew V. Samoilov <sav@bcs.zp.ua>, 2002
 # Maxim Dubovoy <max@mylinux.com.ua>, 2003
 # wanderlust <wanderlust@ukr.net>, 2009.
-#: ../shell/main.c:479
+#: ../shell/main.c:455
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 12:47+0300\n"
+"POT-Creation-Date: 2010-04-07 13:10+0300\n"
 "PO-Revision-Date: 2010-03-27 20:20+0300\n"
 "Last-Translator: Maxim Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -205,7 +205,7 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Ваші контакти дл� {0} не будуть до�тупні до перезапу�ку Evolution."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -228,16 +228,6 @@ msgstr "З_мінити розмір"
 msgid "_Use as it is"
 msgstr "_Викори�товувати �к є"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Типова адре�а �инхронізації:"
@@ -254,7 +244,7 @@ msgstr "Ð�е вдаєтьÑ�Ñ� зчитати блок адреÑ�а програÐ
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2000
 msgid "Anniversary"
 msgstr "Річниц�"
 
@@ -265,36 +255,39 @@ msgstr "Річниц�"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:1999 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:107
 msgid "Birthday"
 msgstr "День народженн�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#, fuzzy
+msgid "Blog:"
+msgstr "Блог"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ка_тегорії..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "Календар:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2567
 msgid "Contact Editor"
 msgstr "Редактор контактів"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 #: ../addressbook/gui/merging/eab-contact-merging.c:285
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
@@ -304,221 +297,190 @@ msgstr "Редактор контактів"
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "Вільний/зайн�тий:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "Повне _ім'�..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "Дім"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "Домашн� �торінка:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Зображенн�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "Миттєві повідомленн�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Робота"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Поштова адре�а"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "Різне"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "Пр_ізви�ько:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Примітки"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1708
 msgid "Other"
 msgstr "Інша"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "О�оби�та інформаці�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "Телефон"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "Відеочат:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Web-адре�а"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "Веб-журнал:"
-
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Робота"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "_�дре�а:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "_Річниц�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "_Помічник:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "_День народженн�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#, fuzzy
+msgid "_Blog:"
+msgstr "Блог"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 #: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1909
 msgid "_Calendar:"
 msgstr "_Календар:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "_Мі�то:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "_Компані�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "К_раїна:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "В_ідділ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "_Підшити �к:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "За_йн�тий/вільний:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "_Домашн� �торінка:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "_Менеджер:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "_Офі�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "�_бон.�криньк:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "_Фах:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "_Дружина/чол:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "_Обла�ть/край (Штат/провінці�):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Титул:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "Відео_чат:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "_Згоден отримувати пошту в форматі HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "Веб-_журнал:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Мі�це:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "_Індек�:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:320
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Ім'�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "Редаговане"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -572,45 +534,21 @@ msgstr "Помилка при модифікації контакту"
 msgid "Error removing contact"
 msgstr "Помилка при видаленні контакту"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Книга-джерело"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "Книга призначенн�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "Є новим контактом"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Пол� дл� запи�у"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Обов'�зкові пол�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Змінено"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2562
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Редактор контактів - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2970
 msgid "Please select an image for this contact"
 msgstr "Виберіть зображенн� дл� цього контакту"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2971
 msgid "_No image"
 msgstr "_�емає зображенн�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3244
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -618,23 +556,23 @@ msgstr ""
 "�еправильні дані контакту:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3248
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' має неправильний формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3255
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' має неправильний формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3281
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' порожнє"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3295
 msgid "Invalid contact."
 msgstr "�еправильний контакт."
 
@@ -658,16 +596,6 @@ msgstr "Ел._пошта"
 msgid "_Select Address Book"
 msgstr "_Виберіть адре�ну книгу"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Оболонка"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "Сінглетон EShell"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Доктор"
@@ -751,7 +679,7 @@ msgid "_List name:"
 msgstr "_�азва �пи�ку:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:155
 msgid "_Select..."
 msgstr "В_ибрати..."
 
@@ -780,18 +708,6 @@ msgstr "Помилка при зміні �пи�ку"
 msgid "Error removing list"
 msgstr "Помилка при видаленні �пи�ку"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Книга"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "Є новим �пи�ком"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Змінений контакт:"
@@ -841,20 +757,20 @@ msgstr "Об'єднати контакт"
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
 #: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Any field contains"
 msgstr "Будь-�ке поле мі�тить"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "Поштова адре�а починаєть�� з"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "Ім'� мі�тить"
 
@@ -874,30 +790,10 @@ msgstr[2] "%d контактів"
 msgid "Error getting book view"
 msgstr "Помилка при отриманні вигл�ду книги"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "Запит"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
 msgstr "Пошук перервано"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Модель"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Помилка при модифікації картки"
@@ -915,7 +811,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "В�тавити контакти з буферу обміну"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "Видалити виділені контакти"
 
@@ -923,15 +819,6 @@ msgstr "Видалити виділені контакти"
 msgid "Select all visible contacts"
 msgstr "Вибрати в�і видимі контакти"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Вигл�д оболонки"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Джерело"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1283
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Справді видалити ці �пи�ки контактів?"
@@ -1131,7 +1018,6 @@ msgid "Telex"
 msgstr "Телек�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:825
 msgid "Title"
 msgstr "Титул"
 
@@ -1143,58 +1029,6 @@ msgstr "Підрозділ"
 msgid "Web Site"
 msgstr "Сайт"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Ширина"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Ви�ота"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-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:140
-msgid "Column Width"
-msgstr "Ширина �товпчика"
-
 #: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
@@ -1253,10 +1087,6 @@ msgstr ""
 "\n"
 "�емає елементів дл� відображенн� у цьому вікні."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "�даптер"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Робоча ел.пошта"
@@ -1270,14 +1100,6 @@ msgstr "Домашн� ел.пошта"
 msgid "Other Email"
 msgstr "Інша ел.пошта"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Вибраний"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "Має кур�ор"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1321,17 +1143,17 @@ msgid "Copy _Email Address"
 msgstr "Копіювати _адре�у ел.пошти"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:381
 msgid "Copy the email address to the clipboard"
 msgstr "Копіює елементи у буфер обміну"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:386
 msgid "_Send New Message To..."
 msgstr "_�аді�лати нове повідомленн� до..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:388
 msgid "Send a mail message to this address"
 msgstr "Перетворити виділене повідомленн� на завданн�"
 
@@ -1370,13 +1192,12 @@ msgstr "Відеочат"
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:495
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "Календар"
 
@@ -1410,21 +1231,19 @@ msgid "Web Log"
 msgstr "Веб-журнал"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:346 ../mail/e-mail-migrate.c:962
+#: ../capplet/settings/mail-capplet-shell.c:346
 #: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/addressbook/e-book-shell-migrate.c:134
 #: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "О�оби�те"
@@ -1441,8 +1260,8 @@ msgstr "Домашн� �торінка"
 msgid "Blog"
 msgstr "Блог"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
 #, c-format
 msgid "Click to mail %s"
 msgstr "Клацніть, щоб наді�лати ли�т %s"
@@ -1499,11 +1318,11 @@ msgstr "Протокол не підтримуєть��"
 #. To Translators: This is task status
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2659
 msgid "Canceled"
 msgstr "Ска�овано"
 
@@ -1668,7 +1487,7 @@ msgstr "Вигл�д карток"
 #: ../addressbook/importers/evolution-ldif-importer.c:516
 #: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Імпортуванн�..."
 
@@ -1790,12 +1609,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "�нонімний до�туп до �ервера LDAP"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "Помилка перевірки автентифікації.\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Введіть пароль дл� %s (кори�тувач %s)"
@@ -1942,46 +1761,42 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "Ви дій�но бажаєте наді�лати завданн� без зведенн�?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "Репозиторій календарю у автономному режимі."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "�е вдаєть�� �творити нову подію"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "�е вдаєть�� зберегти подію"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Видалити календар '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Видалити �пи�ок приміток '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Видалити цей �пи�ок завдань '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "_�е над�илати"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Триває завантаженн�. Бажаєте зберегти цю зу�тріч?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Триває завантаженн�. Бажаєте зберегти це завданн�?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "�е вдаєть�� завантажити редактор."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -1989,31 +1804,26 @@ msgstr ""
 "Запрошенн� будуть розі�лані у�ім уча�никам, щоб вони змогли прийн�ти це "
 "завданн�."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "У�ім уча�никам буде наді�лано запрошенн� ел.поштою, щоб надати їм можливі�ть "
 "відпові�ти."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Помилка завантаженн� календар�"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Помилка завантаженні �пи�ку приміток"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Помилка завантаженні �пи�ку завдань"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "Помилка при {0}."
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2021,7 +1831,7 @@ msgstr ""
 "Якщо повідомленн� про �ка�уванн� не буде наді�лано, інші уча�ники можуть не "
 "знати, що за�іданн� �ка�оване."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2029,7 +1839,7 @@ msgstr ""
 "Якщо ви не надішлете �повіщенн� про �ка�уванн�, інші уча�ники можуть не "
 "знати, що примітку було видалено."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2037,11 +1847,7 @@ msgstr ""
 "Якщо ви не надішлете �повіщенн� про �ка�уванн�, інші уча�ники можуть не "
 "знати, що завданн� було видалено."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "�емає відповіді від �ервера."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2049,7 +1855,7 @@ msgstr ""
 "�ад�иланн� оновленої інформації дозволить іншим уча�никам підтримувати "
 "вла�ні календарі у поточному �тані."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2057,7 +1863,7 @@ msgstr ""
 "�ад�иланн� оновленої інформації дозволить іншим уча�никам підтримувати "
 "вла�ні �пи�ки завдань у поточному �тані."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2065,7 +1871,7 @@ msgstr ""
 "Де�кі вкладенн� ще завантажують��. Збереженн� зу�трічі призведе до того, що "
 "її буде збережено без цих вкладень."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2073,95 +1879,91 @@ msgstr ""
 "Де�кі вкладенн� ще завантажують��. Збереженн� завданн� призведе до того, що "
 "її буде збережено без цих вкладень."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr "Де�кі функції можуть працювати некоректно з поточним �ервером."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Компонент календар� Evolution не�подівано завершив��."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Календар Evolution не�подівано завершив��."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Компонент примітки Evolution не�подівано завершив��."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Компонент завдань Evolution не�подівано завершив��."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:55
 msgid "The calendar is not marked for offline usage."
 msgstr "Цей календар не відмічений дл� автономного викори�танн�."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:56
 msgid "The memo list is not marked for offline usage."
 msgstr "Цей �пи�ок приміток не позначений дл� автономного викори�танн�."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "Цей �пи�ок завдань не позначений дл� автономного викори�танн�."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Цей календар буде о�таточно видалено."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "Примітку буде о�таточно видалено."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Завданн� буде о�таточно видалено."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "�е вдаєть�� завантажити календар '%s'"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Зберегти зміни цієї зу�трічі?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Зберегти зміни цієї зу�трічі?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "Зберегти зміни примітки?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "Зберегти зміни завданн�?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "�аді�лати �повіщенн� про �ка�уванн� цієї примітки?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "�аді�лати у�ім уча�никам повідомленн� про �ка�уванн�?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "�аді�лати уча�никам запрошенн� на за�іданн�?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "Розі�лати це завданн� уча�никам?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Розі�лати уча�никам оновлену інформацію про за�іданн�?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
 msgstr "Розі�лати уча�никам оновлену інформацію про завданн�?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2171,61 +1973,57 @@ msgstr ""
 "при викори�танні Evolution. Рекомендуєть�� оновити �ервер до вер�ії, �ка "
 "підтримуєть��."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:72
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Ви вне�ли зміни у цю зу�тріч, але не зберегли їх."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Зу�тріч змінено, але не зміни збережено."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Ви вне�ли зміни у це завданн�, але не зберегли їх."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Ви вне�ли зміни у цю примітку, але не зберегли їх."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Ваші календарі будуть недо�тупні до перезапу�ку Evolution."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Ваші примітки будуть недо�тупні до перезапу�ку Evolution."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Ваші завданн� будуть недо�тупні до перезапу�ку Evolution."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Відкинути зміни"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:307
 msgid "_Save"
 msgstr "З_берегти"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "З_берегти зміни"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_�аді�лати"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_�аді�лати �повіщенн�"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Розділити багатоденні події:"
@@ -2300,7 +2098,7 @@ msgstr "_Ска�увати в�е"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1573
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 #: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../plugins/itip-formatter/itip-view.c:1031
 msgid "Location:"
 msgstr "�дре�а:"
 
@@ -2313,9 +2111,9 @@ msgid "_Dismiss"
 msgstr "_Ска�увати"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1025
+#: ../calendar/gui/dialogs/comp-editor.c:1015
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../shell/e-shell-window-actions.c:1621
 #: ../widgets/menus/gal-define-views.ui.h:5
@@ -2327,7 +2125,7 @@ msgid "_Snooze"
 msgstr "�агадати _пізніше"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 #: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:332
@@ -2338,8 +2136,9 @@ msgstr "годин"
 msgid "location of appointment"
 msgstr "мі�це зу�трічі"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
 #: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:331
@@ -2445,7 +2244,7 @@ msgid "Alarm programs"
 msgstr "Програми �игналів"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Інтервал ча�у, прот�гом �кого у панелі �тану відображаєть�� помилка."
 
@@ -3083,7 +2882,7 @@ msgid "Classification"
 msgstr "Кла�ифікаці�"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3127,14 +2926,14 @@ msgid "Organizer"
 msgstr "Організатор"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Приватне"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Загальне"
 
@@ -3222,7 +3021,7 @@ msgstr "Вла�ний звук �игналу"
 msgid "Mes_sage:"
 msgstr "_Повідомленн�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:77
 msgid "Options"
 msgstr "Параметри"
 
@@ -3269,11 +3068,12 @@ msgstr "діб"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
 #: ../plugins/google-account-setup/google-contacts-source.c:333
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "діб"
 
@@ -3281,19 +3081,20 @@ msgstr "діб"
 msgid "end of appointment"
 msgstr "кінець зу�трічі"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "раз додатково кожні"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "годин"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "хвилин"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "початок зу�трічі"
 
@@ -3330,11 +3131,13 @@ msgid "Selected Calendars for Alarms"
 msgstr "Календарі - джерело �игналів"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
+#, fuzzy
+msgid "Ti_me and date:"
 msgstr "Дата та ча�:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
+#, fuzzy
+msgid "_Date only:"
 msgstr "Лише дата:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
@@ -3367,12 +3170,12 @@ msgstr "30 хвилини"
 msgid "60 minutes"
 msgstr "60 хвилини"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "Сигнали"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "Формат дати та ча�у"
@@ -3407,9 +3210,9 @@ msgstr "П'�тниц�"
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/dialogs/calendar-setup.c:378
 #: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
+#: ../mail/em-folder-properties.c:278 ../mail/mail-config.ui.h:54
 #: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../plugins/itip-formatter/itip-formatter.c:2655
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "General"
@@ -3438,182 +3241,194 @@ msgid "None"
 msgstr "�емає"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "Pick a color"
 msgstr "Вибір кольору"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "_�дл"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 #: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Субота"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "_Прокручувати огл�д мі��цю по тижн�х"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Додатковий _ча�овий по��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Виберіть календарі дл� �игналів"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "Показати _нагадуванн� за"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "Показати _нагадуванн�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "Показувати _номери тижнів у навігаторі по датам"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Показувати н_омери тижнів режимі День та Робочий тиждень"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1120
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "�еділ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "Завданн� на _�ьогодні:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "_Чтв"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Спи�ок завдань"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "Шаблон:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Четвер"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Ча�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "_Ча�овий по��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "Формат ча�у:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Викори�товувати _�и�темний ча�овий по��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 #: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Середа"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "_Тиждень починаєть��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Work Week"
 msgstr "Робочий тиждень"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "Робочі дні:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 годин (дп/пп)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 години"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "П_итати підтвердженн� при видаленні елементів"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "С_ти�кати вихідні дні при перегл�ді мі��цю"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "_День починаєть��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "_Птн"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "При_ховувати виконані завданн� через"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "_Пнд"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "П_ро�трочені завданн�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "С_бт"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "_Показувати ча� завершенн� зу�трічей при перегл�ді тижню та мі��цю"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "Поділки _ча�у:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "_Ð’Ñ‚Ñ€"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "_Срд"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "до кожної річниці/дн� народженн�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "до початку кожної зу�трічі"
 
@@ -3626,8 +3441,8 @@ msgstr "Тип:"
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:147
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3727,253 +3542,233 @@ msgstr "%s  Ви не зробили змін, поновити вікно реÐ
 msgid "Validation error: %s"
 msgstr "Помилка під ча� перевірки: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " до "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (Виконано "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "Виконано "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (до дати "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "До дати "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:237
 msgid "Could not save attachments"
 msgstr "�е можу зберегти долученн�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:515
+#: ../calendar/gui/dialogs/comp-editor.c:505
 msgid "Could not update object"
 msgstr "�е вдаєть�� оновити об'єкт!"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "Змінити зу�тріч"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "За�іданн� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "Зу�тріч - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:629
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Призначене завданн� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:631
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "Завданн� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:636
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "Примітка - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "�емає зведенн�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:761
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "Зберегти початковий елемент?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:948
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "�ати�ніть, щоб закрити поточне вікно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955 ../mail/e-mail-browser.c:117
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
 #: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "Копіювати виділене"
 
-#: ../calendar/gui/dialogs/comp-editor.c:962 ../mail/e-mail-browser.c:124
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
 #: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "Вирізати виділене"
 
-#: ../calendar/gui/dialogs/comp-editor.c:969
+#: ../calendar/gui/dialogs/comp-editor.c:959
 #: ../shell/e-shell-window-actions.c:1474
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Видалити виділене"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "�ати�ніть, щоб перегл�нути довідку"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983 ../mail/e-mail-browser.c:131
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
 #: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "В�тавити з буферу обміну"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "�ати�ніть, щоб зберегти поточне вікно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011 ../mail/e-mail-browser.c:138
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
 #: ../shell/e-shell-window-actions.c:1579
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Виділити ве�ь тек�т"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "Кла�и_фікаці�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1032 ../mail/e-mail-browser.c:145
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
 #: ../shell/e-shell-window-actions.c:1628
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Файл"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
+#: ../calendar/gui/dialogs/comp-editor.c:1029
 #: ../shell/e-shell-window-actions.c:1635
 msgid "_Help"
 msgstr "_Довідка"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "В�т_авити"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
+#: ../calendar/gui/dialogs/comp-editor.c:1043
 #: ../composer/e-composer-actions.c:351
 msgid "_Options"
 msgstr "П_араметри"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060 ../mail/e-mail-browser.c:159
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
 #: ../shell/e-shell-window-actions.c:1670
 msgid "_View"
 msgstr "_Вигл�д"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1070
+#: ../calendar/gui/dialogs/comp-editor.c:1060
 #: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "_Вкладенн�..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
 msgstr "�ати�ніть, щоб вкла�ти файл"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "_Категорії"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "Перемикнути відображенн� пол� \"Категорії\""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "_Ча�овий по��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "Перемикнути відображенн� пол� ча�ового по��у"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "П_ублічне"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "Кла�ифікувати �к публічне"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "_Приватне"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "Кла�ифікувати �к приватне"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "К_онфіденційне"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "Кла�ифікувати �к конфіденційне"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "Поле \"_По�ада\""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "Перемикнути відображенн� пол� \"По�ада\""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "Про_ханн� відпові�ти"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1133
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Перемикнути відображенн� пол� \"Проханн� відпові�ти\""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "поле _�тану"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "Перемикнути відображенн� пол� \"Стан\""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "Поле _типу"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1149
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Перемикнути відображенн� пол� типу уча�ників"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "�едавні _документи"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1693
+#: ../calendar/gui/dialogs/comp-editor.c:1683
 #: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "Вкла�ти"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1748
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "Зберегти"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2025
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2965
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2955
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Вне�ені в цей елемент зміни може бути �ка�овано, �кщо буде отримане оновленн�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2933
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2923
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "вкладенн�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2995
+#: ../calendar/gui/dialogs/comp-editor.c:2985
 msgid "Unable to use current version!"
 msgstr "�е вдаєть�� викори�тати поточну вер�ію!"
 
@@ -3993,6 +3788,11 @@ msgstr "Призначенн� до�тупне лише дл� читанн�"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "В_идалити цей елемент з поштових �криньок у�іх отримувачів?"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+#, fuzzy
+msgid "_Retract comment"
+msgstr "В_иконано (%):"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Ц� поді� не може бути видалена через помилку corba"
@@ -4071,7 +3871,7 @@ msgstr "Зробити цю подію періодичною"
 
 #: ../calendar/gui/dialogs/event-editor.c:215
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "Параметри над�иланн�"
@@ -4119,7 +3919,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Подію неможливо повні�тю змінити, о�кільки ви не є організатором"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2720
 msgid "This event has alarms"
 msgstr "Ц� поді� має �игнали."
 
@@ -4180,7 +3980,7 @@ msgstr "Потрібно вказати організатора."
 msgid "At least one attendee is required."
 msgstr "Потрібен хоча б один відвідувач."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2593
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "�е вдаєть�� відкрити календар '%s'."
@@ -4191,14 +3991,14 @@ msgstr "�е вдаєть�� відкрити календар '%s'."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2637
+#: ../calendar/gui/dialogs/memo-page.c:913
+#: ../calendar/gui/dialogs/task-page.c:1741
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Ви дієте від о�оби %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2939
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -4206,7 +4006,7 @@ msgstr[0] "%d день до початку зу�трічі"
 msgstr[1] "%d дні до початку зу�трічі"
 msgstr[2] "%d днів до початку зу�трічі"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2945
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -4214,7 +4014,7 @@ msgstr[0] "%d година до початку зу�трічі"
 msgstr[1] "%d години до початку зу�трічі"
 msgstr[2] "%d годин до початку зу�трічі"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2951
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -4222,12 +4022,12 @@ msgstr[0] "%d хвилина до початку зу�трічі"
 msgstr[1] "%d хвилини до початку зу�трічі"
 msgstr[2] "%d хвилин до початку зу�трічі"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:2964
 msgid "Customize"
 msgstr "�алаштувати..."
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2966
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "�емає"
@@ -4245,8 +4045,10 @@ msgid "15 minutes before appointment"
 msgstr "15 хвилин до початку зу�трічі"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "_Відвідувачі..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:565
+msgid "Atte_ndees..."
+msgstr "_Відвідувачі.."
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
 #: ../calendar/gui/e-meeting-list-view.c:148
@@ -4261,28 +4063,27 @@ msgstr "Інший �игнал:"
 msgid "Event Description"
 msgstr "Опи� події"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "_Зведенн�:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "_Сигнал"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Опи�:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:356
 msgid "_Location:"
 msgstr "_Розташуванн�:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#, fuzzy
+msgid "_Summary:"
+msgstr "Зведенн�:"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "_Ча�:"
@@ -4297,7 +4098,7 @@ msgstr "дл�"
 msgid "until"
 msgstr "до"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2576
 msgid "Memo"
 msgstr "Примітка"
 
@@ -4311,15 +4112,15 @@ msgstr ""
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Позначку неможливо повні�тю змінити, о�кільки ви не є організатором"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:874
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "�е вдаєть�� відкрити примітки у '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1041 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2237
+#: ../mail/em-format-html.c:2297 ../mail/em-format-html.c:2339
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:78
 msgid "To"
 msgstr "Кому"
 
@@ -4328,6 +4129,11 @@ msgstr "Кому"
 msgid "Sta_rt date:"
 msgstr "По_чаток:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "_Зведенн�:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "Ко_му:"
@@ -4486,27 +4292,27 @@ msgstr "день"
 msgid "on the"
 msgstr "у"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1411
 msgid "occurrences"
 msgstr "випадки"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2122
+#: ../calendar/gui/dialogs/recurrence-page.c:2112
 msgid "Add exception"
 msgstr "Додати вин�ток"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2163
+#: ../calendar/gui/dialogs/recurrence-page.c:2153
 msgid "Could not get a selection to modify."
 msgstr "�е вдаєть�� отримати виділенн� дл� зміни."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2159
 msgid "Modify exception"
 msgstr "Змінити вин�ток"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2213
+#: ../calendar/gui/dialogs/recurrence-page.c:2203
 msgid "Could not get a selection to delete."
 msgstr "�е вдаєть�� отримати зміну дл� видаленн�."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2352
+#: ../calendar/gui/dialogs/recurrence-page.c:2330
 msgid "Date/Time"
 msgstr "Дата й ча�:"
 
@@ -4518,7 +4324,7 @@ msgstr "Кожен"
 msgid "Exceptions"
 msgstr "Вин�тки<"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:85
 msgid "Preview"
 msgstr "Попередній перегл�д"
 
@@ -4555,66 +4361,66 @@ msgstr "Сповідати _лише нових уча�ників"
 msgid "Completed date is wrong"
 msgstr "�еправильна дата виконанн�"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:484
 msgid "Web Page"
 msgstr "Веб-�торінка"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2656 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Завершено"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1132 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1120 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Ви�окий"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2653
 msgid "In Progress"
 msgstr "Виконуєть��"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1130 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1118 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "�изький"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1131
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1119
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "Звичайний"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2650 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "�е розпочато"
 
@@ -4630,7 +4436,7 @@ msgstr "С_тан:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1756
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4640,7 +4446,7 @@ msgstr "Стан"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "�евизначено"
@@ -4650,7 +4456,7 @@ msgid "_Date completed:"
 msgstr "_Дата завершенн�:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "_Пріоритет:"
 
@@ -4671,11 +4477,11 @@ msgstr "�ати�ніть, щоб змінити або перегл�нути
 msgid "_Send Options"
 msgstr "Параметри _над�иланн�"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "_Task"
 msgstr "_Завданн�"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "Подробиці про завданн�"
 
@@ -4698,15 +4504,11 @@ msgstr "Орган_ізатор:"
 msgid "Due date is wrong"
 msgstr "�еправильна дата виконанн�"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1698
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "�е вдаєть�� відкрити завданн� у '%s'."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "_Відвідувачі.."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Ка_тегорії..."
@@ -4797,46 +4599,46 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s дл� невідомого типу перемикача"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:191 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "Без заголовку"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:197
 msgid "Categories:"
 msgstr "Категорії:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Зведенн�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:258
 msgid "Start Date:"
 msgstr "Дата початку:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "Дата завершенн�:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-cal-component-preview.c:284
 #: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Status:"
 msgstr "Стан:"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "Пріоритет:"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-cal-component-preview.c:336
 #: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Description:"
 msgstr "Опи�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:367
 msgid "Web Page:"
 msgstr "Веб-�торінка:"
 
@@ -4863,16 +4665,16 @@ msgid "Start Date"
 msgstr "Дата початку"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "Вільний"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:548 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "Зайн�тий"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4883,63 +4685,49 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "�емає"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Так"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "�і"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "Типовий клієнт"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:551
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Параметри оболонки"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:552
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Глобальні параметри програми"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:929
+#: ../plugins/itip-formatter/itip-formatter.c:450
+#: ../plugins/itip-formatter/itip-formatter.c:2327
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "�евідоме"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Періодично"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Прив'�зано"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "Відкриваєть�� %s"
@@ -4983,90 +4771,90 @@ msgstr "Дата початку"
 msgid "Type"
 msgstr "Тип"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:404
 msgid "Cut selected events to the clipboard"
 msgstr "Вирізати виділені події у буфер обміну"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:410
 msgid "Copy selected events to the clipboard"
 msgstr "Копіювати виділені події у буфер обміну"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:416
 msgid "Paste events from the clipboard"
 msgstr "В�тавити події з буфера обміну"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Delete selected events"
 msgstr "Видалити вибрані події"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Видаленн� виділених об'єктів"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
 msgid "Updating objects"
 msgstr "Оновити об'єкти"
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1703
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2315
 msgid "Accepted"
 msgstr "Прийн�то"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1704
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2321
 msgid "Declined"
 msgstr "Відхилено"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1705
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Tentative"
 msgstr "Ек�периментальний"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1706
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2324
 msgid "Delegated"
 msgstr "Доручено"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1707
 msgid "Needs action"
 msgstr "�еобхідна ді�"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1848 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Організатор:  %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "Організатор: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1868 ../calendar/gui/print.c:2608
 #, c-format
 msgid "Location: %s"
 msgstr "�дре�а: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1899
 #, c-format
 msgid "Time: %s %s"
 msgstr "Ча�: %s %s"
@@ -5109,7 +4897,7 @@ msgstr "Показувати додатковий ча�овий по��"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1843
 #: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A, %d %B"
@@ -5120,10 +4908,10 @@ msgstr "%A, %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1860
 #: ../calendar/gui/e-week-view-main-item.c:231
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:907
+#: ../modules/calendar/e-cal-shell-view-private.c:913
 msgid "%a %d %b"
 msgstr "%a, %d %b"
 
@@ -5132,27 +4920,27 @@ msgstr "%a, %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
+#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1876
 #: ../calendar/gui/e-week-view-main-item.c:245
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:943
+#: ../modules/calendar/e-cal-shell-view-private.c:949
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1074 ../calendar/gui/e-week-view.c:742
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:745
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2573
 #, c-format
 msgid "Week %d"
 msgstr "%d тиждень"
@@ -5255,11 +5043,11 @@ msgstr "Помилка iCalendar"
 
 #: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
 #: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "�евідома о�оба"
 
@@ -5272,13 +5060,13 @@ msgstr ""
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../plugins/itip-formatter/itip-formatter.c:2302
 msgctxt "cal-itip"
 msgid "None"
 msgstr "�емає"
 
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgid "Tentatively Accepted"
 msgstr "Ек�периментально прийн�то"
 
@@ -5496,7 +5284,7 @@ msgid "Attendee status updated\n"
 msgstr "Стан відвідувача оновлено!\n"
 
 #: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "�е вдаєть�� оновити �тан відвідувача, тому що елемент вже не і�нує"
 
@@ -5550,7 +5338,7 @@ msgid "Send Latest Information"
 msgstr "�аді�лати о�танню інформацію"
 
 #: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
+#: ../modules/mail/e-mail-shell-view-actions.c:970
 #: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "Ска�увати"
@@ -5600,56 +5388,56 @@ msgid "Resources"
 msgstr "Ре�ур�и"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Індивідуально"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Група"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Ре�ур�"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Кімната"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Голова"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Обов'�зковий уча�ник"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Додатковий уча�ник"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "�е приймає уча�ть"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "�еобхідна ді�"
 
@@ -5658,14 +5446,14 @@ msgstr "�еобхідна ді�"
 msgid "Attendee                          "
 msgstr "При�утній                         "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2305
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
@@ -5674,7 +5462,7 @@ msgstr "%A, %d %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2336
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
@@ -5684,67 +5472,63 @@ msgstr "%a, %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Out of Office"
 msgstr "За межами офі�у"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "No Information"
 msgstr "�емає інформації"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "_Відвідувачі..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:586
 msgid "O_ptions"
 msgstr "_Параметри"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "Показувати _лише робочі години"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _zoomed out"
 msgstr "Показати _зменшене"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "_Update free/busy"
 msgstr "_Оновити інформацію про зайн�ті�ть"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:661
 msgid "_Autopick"
 msgstr "_�втовибір"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:676
 msgid ">_>"
 msgstr "_>>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:693
 msgid "_All people and resources"
 msgstr "_В�і люди і ре�ур�и"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "All _people and one resource"
 msgstr "В�і _люди і один ре�ур�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "_Required people"
 msgstr "_Потрібні люди"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:719
 msgid "Required people and _one resource"
 msgstr "Потрібні люди і _один ре�ур�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "По_чаток:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "Кіне_ць:"
 
@@ -5773,7 +5557,7 @@ msgid "Member"
 msgstr "Член"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:456
+#: ../modules/calendar/e-cal-shell-content.c:461
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5781,36 +5565,38 @@ msgstr "Член"
 msgid "Memos"
 msgstr "Примітки"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
 msgid "* No Summary *"
 msgstr "* �емає короткого опи�у *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
 msgid "Start: "
 msgstr "Починаєть��:"
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
 msgid "Due: "
 msgstr "Завершенн�: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:709
 msgid "Cut selected memos to the clipboard"
 msgstr "Вирізати виділені примітки в буфер обміну"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:715
 msgid "Copy selected memos to the clipboard"
 msgstr "Копіювати виділені примітки в буфер обміну"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:721
 msgid "Paste memos from the clipboard"
 msgstr "В�тавити примітку з буфера обміну"
 
-#: ../calendar/gui/e-memo-table.c:725
+#: ../calendar/gui/e-memo-table.c:727
 #: ../modules/calendar/e-memo-shell-view-actions.c:556
 msgid "Delete selected memos"
 msgstr "Видалити вибрані примітки"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Select all visible memos"
 msgstr "Виділити в�і видимі примітки"
 
@@ -5818,82 +5604,47 @@ msgstr "Виділити в�і видимі примітки"
 msgid "Click to add a memo"
 msgstr "Клацніть, щоб додати примітку"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, fuzzy, c-format
+msgid "%d%%"
+msgstr "%d %b"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:418
+#: ../modules/calendar/e-cal-shell-content.c:423
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
 #: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Завданн�"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:932
 msgid "Cut selected tasks to the clipboard"
 msgstr "Вирізати виділені завданн� у буфер обміну"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:938
 msgid "Copy selected tasks to the clipboard"
 msgstr "Копіювати виділені завданн� у буфер обміну"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:944
 msgid "Paste tasks from the clipboard"
 msgstr "В�тавити завданн� з буферу обміну"
 
-#: ../calendar/gui/e-task-table.c:946
+#: ../calendar/gui/e-task-table.c:950
 #: ../modules/calendar/e-task-shell-view-actions.c:680
 msgid "Delete selected tasks"
 msgstr "Видалити вибрані завданн�"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:956
 msgid "Select all visible tasks"
 msgstr "Виділити в�і видимі завданн�"
 
@@ -6007,16 +5758,16 @@ msgid "Gnome Calendar"
 msgstr "Календар GNOME"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../modules/calendar/e-cal-shell-view-private.c:909
 msgid "%A %d %b %Y"
 msgstr "%A, %d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:910
 #: ../modules/calendar/e-cal-shell-view-private.c:916
-#: ../modules/calendar/e-cal-shell-view-private.c:919
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
 msgid "%a %d %b %Y"
 msgstr "%a, %d %b %Y"
 
@@ -6024,10 +5775,10 @@ msgstr "%a, %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:936
-#: ../modules/calendar/e-cal-shell-view-private.c:947
-#: ../modules/calendar/e-cal-shell-view-private.c:954
-#: ../modules/calendar/e-cal-shell-view-private.c:957
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -6057,7 +5808,7 @@ msgstr "вікно календар� дл� огл�ду мі��ц�"
 msgid "calendar view for one or more weeks"
 msgstr "вікно календар� одного чи більше тижнів"
 
-#: ../calendar/gui/gnome-cal.c:2299
+#: ../calendar/gui/gnome-cal.c:2243
 msgid "Purging"
 msgstr "Очищенн�"
 
@@ -6110,39 +5861,40 @@ msgid "Select Date"
 msgstr "Вибір дати"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "Вере�ень"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "Select _Today"
+msgstr "Вибрати _�ьогодні"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_Вибрати �ьогоднішній день"
+msgid "September"
+msgstr "Вере�ень"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "Потрібно вказати організатора."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "�еобхідно вказати хоча б одного відвідувача"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Інформаці� про подію"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Інформаці� про завданн�"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Інформаці� про примітку"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Інформаці� про зайн�ті�ть"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "Інформаці� календар�"
 
@@ -6150,7 +5902,7 @@ msgstr "Інформаці� календар�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Прийн�то"
@@ -6159,7 +5911,7 @@ msgstr "Прийн�то"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Попередньо прийн�то"
@@ -6171,7 +5923,7 @@ msgstr "Попередньо прийн�то"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Відхилено"
@@ -6180,7 +5932,7 @@ msgstr "Відхилено"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Доручено"
@@ -6188,7 +5940,7 @@ msgstr "Доручено"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Оновлено"
@@ -6196,7 +5948,7 @@ msgstr "Оновлено"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Ска�овано"
@@ -6204,7 +5956,7 @@ msgstr "Ска�овано"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Оновлено"
@@ -6212,30 +5964,30 @@ msgstr "Оновлено"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Контрпропозиці�"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Інформаці� про зайн�ті�ть (%s до %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "Інформаці� iCalendar"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "�е вдаєть�� зарезервувати ре�ур�, нова поді� конфліктує з �кою�ь іншою."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "�еможливо зарезервувати ре�ур�, помилка: "
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "Ви маєте бути відвідувачем події."
 
@@ -6391,49 +6143,74 @@ msgstr "Птн"
 msgid "Sa"
 msgstr "Сбт"
 
-#: ../calendar/gui/print.c:2564
+#. Translators: This is part of "START to END" text, where START and END are date/times
+#: ../calendar/gui/print.c:2419
+msgid " to "
+msgstr " до "
+
+#. Translators: This is part of "START to END (Completed COMPLETED)", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2425
+msgid " (Completed "
+msgstr " (Виконано "
+
+#. Translators: This is part of "Completed COMPLETED", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2428
+msgid "Completed "
+msgstr "Виконано "
+
+#. Translators: This is part of "START (Due DUE)", where START and DUE are dates/times
+#: ../calendar/gui/print.c:2435
+msgid " (Due "
+msgstr " (до дати "
+
+#. Translators: This is part of "Due DUE", where DUE is a date/time due the event should be finished
+#: ../calendar/gui/print.c:2438
+msgid "Due "
+msgstr "До дати "
+
+#: ../calendar/gui/print.c:2572
 msgid "Appointment"
 msgstr "Зу�тріч"
 
-#: ../calendar/gui/print.c:2566
+#: ../calendar/gui/print.c:2574 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "Завданн�"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2599
 #, c-format
 msgid "Summary: %s"
 msgstr "Зведенн�: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2623
 msgid "Attendees: "
 msgstr "Уча�ники:"
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2666
 #, c-format
 msgid "Status: %s"
 msgstr "Стан: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2681
 #, c-format
 msgid "Priority: %s"
 msgstr "Пріоритет: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2699
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Від�оток виконанн�: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2710
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2723
 #, c-format
 msgid "Categories: %s"
 msgstr "Категорії: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2734
 msgid "Contacts: "
 msgstr "Контакти:"
 
@@ -6464,7 +6241,7 @@ msgstr "Зу�трічі та за�іданн�"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Opening calendar"
 msgstr "Відкриванн� календар�"
 
@@ -8054,7 +7831,7 @@ msgid "Save as..."
 msgstr "Зберегти �к..."
 
 #: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "Вкла�ти файл"
 
@@ -8207,15 +7984,15 @@ msgstr "_Показати:"
 msgid "Hide"
 msgstr "С_ховати"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Введіть адре�атів повідомленн�"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введіть адре�атів, що отримають копію повідомленн�"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8223,50 +8000,50 @@ msgstr ""
 "Введіть адре�атів, що отримають копію повідомленн� не попавши до �пи�ку "
 "отримувачів."
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "В_ід:"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
+#: ../modules/mail/em-mailer-prefs.c:76
 msgid "From"
 msgstr "Від"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "Зв_оротна адре�а:"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "_Кому:"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "Ко_пі�:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "CC"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "При_х.копі�:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "�аді_�лати до:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "_Тема:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "П_ідпи�:"
 
@@ -8299,19 +8076,19 @@ msgid "Save draft"
 msgstr "Зберегти чернетку"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:151
+#: ../plugins/attachment-reminder/attachment-reminder.c:120
 msgid "_Do not show this message again."
 msgstr "_�е показувати це повідомленн� знову."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:986
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "�е вдаєть�� підпи�ати повідомленн�: дл� цього облікового рахунку не "
 "в�тановлений �ертифікат підпи�у"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:993
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8319,15 +8096,15 @@ msgstr ""
 "�е вдаєть�� зашифрувати повідомленн�: дл� облікового рахунку не в�тановлений "
 "�ертифікат шифруванн�"
 
-#: ../composer/e-msg-composer.c:1381
+#: ../composer/e-msg-composer.c:1384
 msgid "Unable to reconstruct message from autosave file"
 msgstr "�е вдаєть�� відновити повідомленн� з файлу автозбереженн�"
 
-#: ../composer/e-msg-composer.c:1447 ../composer/e-msg-composer.c:1643
+#: ../composer/e-msg-composer.c:1450 ../composer/e-msg-composer.c:1646
 msgid "Compose Message"
 msgstr "�ове повідомленн�"
 
-#: ../composer/e-msg-composer.c:3312
+#: ../composer/e-msg-composer.c:3311
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8413,7 +8190,8 @@ msgstr ""
 "о�таннього редагуванн�."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 "Файл `{0}' не є звичайним файлом та не може бути наді�ланий у повідомленні."
 
@@ -8433,7 +8211,8 @@ msgid "Unable to activate the address selector control."
 msgstr "�е вдаєть�� активувати керуючий елемент обранн� адре�и."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "�е можна вкла�ти файл `{0}' у це повідомленн�."
 
 #: ../composer/mail-composer.error.xml.h:22
@@ -8582,8 +8361,8 @@ msgstr ""
 "приєднанн� до �ервера та отриманн� пошти."
 
 #: ../capplet/settings/mail-account-view.c:332
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2191
+#: ../mail/mail-config.ui.h:59
 msgid "Identity"
 msgstr "О�оби�ті дані"
 
@@ -8635,7 +8414,7 @@ msgid "Back - Receiving options"
 msgstr "�азад - Параметри отриманн�"
 
 #: ../capplet/settings/mail-account-view.c:337
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../mail/em-account-editor.c:2769 ../mail/mail-config.ui.h:32
 msgid "Defaults"
 msgstr "Умовчанн�"
 
@@ -8669,20 +8448,20 @@ msgid "Evolution account assistant"
 msgstr "Помічник з облікових запи�ів Evolution"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:2948
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1614
+#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:675
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:212
+#: ../mail/message-list.c:1602
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/addressbook/e-book-shell-migrate.c:126
 #: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-cal-shell-migrate.c:141
 #: ../modules/calendar/e-memo-shell-backend.c:108
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-migrate.c:109
 msgid "On This Computer"
 msgstr "�а цьому комп'ютері"
 
@@ -8712,7 +8491,7 @@ msgstr "Сповіщенн� про календарні події"
 msgid "Evolution Alarm Notify"
 msgstr "Сповіщенн� �игналами у Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:819
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:818
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8838,56 +8617,68 @@ msgstr "Західноєвропей�ький"
 msgid "Western European, New"
 msgstr "Західноєвропей�ький, новий"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "Традиційний"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "Спрощений"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "Україн�ький"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "Візуальний"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Сьогодні"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Завтра"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Вчора"
 
-#: ../e-util/e-datetime-format.c:207
-#, c-format
-msgid "%d days from now"
-msgstr "%d днів від поточного"
-
-#: ../e-util/e-datetime-format.c:209
-#, c-format
-msgid "%d days ago"
-msgstr "%d днів тому"
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
+#, fuzzy, c-format
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "%d днів від поточного"
+msgstr[1] "%d днів від поточного"
+msgstr[2] "%d днів від поточного"
+
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
+#, fuzzy, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d днів тому"
+msgstr[1] "%d днів тому"
+msgstr[2] "%d днів тому"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "Викори�товувати типову локаль"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "Формат:"
 
@@ -8908,18 +8699,6 @@ msgstr "Запи� «%s»"
 msgid "Writing \"%s\" to %s"
 msgstr "Запи� «%s» на «%s»"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "�азва компоненту дл� журналів"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "�азва файлу:"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "�азва файлу модул�"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "_Журнали налагодженн�"
@@ -8942,12 +8721,12 @@ msgstr "Повідомленн� з журналу:"
 msgid "Log Level"
 msgstr "Рівень запи�у до журналу"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2693
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2665
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Повідомленн�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
 #: ../shell/e-shell-window-actions.c:1446
 msgid "Close this window"
 msgstr "Закрити це вікно"
@@ -8972,17 +8751,6 @@ msgstr "�алагодженн�"
 msgid "Error, Warnings and Debug messages"
 msgstr "Повідомленн� про помилки, попередженн� та налагодженн�"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "�ктивно"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Чи увімкнено модуль"
-
 #: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:334
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
@@ -9006,7 +8774,7 @@ msgstr "СиÑ�тема друку не надала подробиць череÐ
 msgid "Autogenerated"
 msgstr "Генеруєть�� автоматично"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "О�кільки «{1}»."
 
@@ -9026,15 +8794,15 @@ msgstr "Бажаєте перепи�ати?"
 msgid "File exists \"{0}\"."
 msgstr "Файл і�нує «{0}»."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "_Перепи�ати"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:169
 msgid "Could not open the link."
 msgstr "�е вдаєть�� відкрити по�иланн�"
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:219
 msgid "Could not display help for Evolution."
 msgstr "�е вдаєть�� показати довідку Evolution."
 
@@ -9047,102 +8815,102 @@ msgstr "Помилка GConf: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Подальші помилки будуть виведені на термінал."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "Зворотна адре�а"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2238 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2346 ../modules/mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Копі�:"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2239 ../mail/em-format-html.c:2320
+#: ../mail/em-format-html.c:2353 ../modules/mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Прихована:"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:81
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Тема"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2451
+#: ../modules/mail/em-mailer-prefs.c:1129
 msgid "Mailer"
 msgstr "Поштова програма"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1221
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Пере�лане повідомленн� --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:82 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Дата"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "Група новин"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:84
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Фото"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1302
 #, c-format
 msgid "%s attachment"
 msgstr "вкладенн� %s"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1361
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "�е вдаєть�� розібрати S/MIME повідомленн�: невідома помилка"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "�е вдаєть�� розібрати MIME повідомленн�. Показуєть�� �к є."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "�епідтримуваний тип шифруванн� дл� multipart/encrypted"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message"
 msgstr "�е удало�ь розібрати повідомленн� PGP/MIME"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "�е вдаєть�� розібрати повідомленн� PGP/MIME: невідома помилка"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "�епідтримуваний формат підпи�у"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 msgid "Error verifying signature"
 msgstr "Помилка перевірки підпи�у"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "�евідома помилка при перевірці підпи�у"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message"
 msgstr "�е вдаєть�� розібрати повідомленн� PGP."
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message: Unknown error"
 msgstr "�е вдаєть�� розібрати повідомленн� PGP: невідома помилка"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -9150,7 +8918,7 @@ msgstr[0] "%d �екунду тому"
 msgstr[1] "%d �екунди тому"
 msgstr[2] "%d �екунд тому"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -9158,7 +8926,7 @@ msgstr[0] "%d �екунда у майбутньому"
 msgstr[1] "%d �екунди у майбутньому"
 msgstr[2] "%d �екунд у майбутньому"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -9166,7 +8934,7 @@ msgstr[0] "%d хв тому"
 msgstr[1] "%d хв тому"
 msgstr[2] "%d хв тому"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -9174,7 +8942,7 @@ msgstr[0] "%d хвилина у майбутньому"
 msgstr[1] "%d хвилини у майбутньому"
 msgstr[2] "%d хвилин у майбутньому"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -9182,7 +8950,7 @@ msgstr[0] "%d годину тому"
 msgstr[1] "%d години тому"
 msgstr[2] "%d годин тому"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -9190,7 +8958,7 @@ msgstr[0] "%d година у майбутньому"
 msgstr[1] "%d години у майбутньому"
 msgstr[2] "%d годин у майбутньому"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -9198,7 +8966,7 @@ msgstr[0] "%d день тому"
 msgstr[1] "%d дні тому"
 msgstr[2] "%d днів тому"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -9206,7 +8974,7 @@ msgstr[0] "%d день у майбутньому"
 msgstr[1] "%d дні у майбутньому"
 msgstr[2] "%d днів у майбутньому"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -9214,7 +8982,7 @@ msgstr[0] "%d тиждень тому"
 msgstr[1] "%d тижні тому"
 msgstr[2] "%d тижнів тому"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -9222,7 +8990,7 @@ msgstr[0] "%d тиждень у майбутньому"
 msgstr[1] "%d тижні у майбутньому"
 msgstr[2] "%d тижнів у майбутньому"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -9230,7 +8998,7 @@ msgstr[0] "%d мі��ць тому"
 msgstr[1] "%d мі��ці тому"
 msgstr[2] "%d мі��ців тому"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -9238,7 +9006,7 @@ msgstr[0] "%d мі��ць у майбутньому"
 msgstr[1] "%d мі��ці у майбутньому"
 msgstr[2] "%d мі��ців у майбутньому"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -9246,7 +9014,7 @@ msgstr[0] "%d рік тому"
 msgstr[1] "%d роки тому"
 msgstr[2] "%d років тому"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -9254,21 +9022,21 @@ msgstr[0] "%d рік у майбутньому"
 msgstr[1] "%d роки у майбутньому"
 msgstr[2] "%d років у майбутньому"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<клацніть тут, щоб вибрати дату>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "зараз"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d.%m.%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Вибір ча�у дл� порівн�нн�"
 
@@ -9321,11 +9089,11 @@ msgid "I_nclude threads"
 msgstr "Вкл_ючно з гілками"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:302
 msgid "Incoming"
 msgstr "Вхідні"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:303
 msgid "Outgoing"
 msgstr "Вихідні"
 
@@ -9357,7 +9125,7 @@ msgstr "Від�утн� дата."
 msgid "Missing file name."
 msgstr "Від�утн� назва файлу."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "Від�утн� назва."
 
@@ -9434,7 +9202,7 @@ msgstr "у майбутньому"
 msgid "months"
 msgstr "мі��ці"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:171
 msgid "seconds"
 msgstr "�екунди"
 
@@ -9451,7 +9219,7 @@ msgid "years"
 msgstr "років"
 
 #: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
+#: ../mail/em-format-html-display.c:1016 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
 #: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
@@ -9470,26 +9238,6 @@ msgstr "У вигл�ді значків"
 msgid "List View"
 msgstr "У вигл�ді _�пи�ку"
 
-#: ../mail/e-mail-browser.c:763 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Слідкуванн� за фоку�ом"
-
-#: ../mail/e-mail-browser.c:773
-msgid "Shell Module"
-msgstr "Модуль оболонки"
-
-#: ../mail/e-mail-browser.c:774 ../mail/message-list.c:2586
-msgid "The mail shell backend"
-msgstr "Б�к-енд поштової оболонки"
-
-#: ../mail/e-mail-browser.c:784
-msgid "Show Deleted"
-msgstr "Показати видалені"
-
-#: ../mail/e-mail-browser.c:785
-msgid "Show deleted messages"
-msgstr "Показати видалені повідомленн�"
-
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
 msgstr "_Додати до адре�ної книги..."
@@ -9535,7 +9283,7 @@ msgid "_Later"
 msgstr "_Пізніше"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:519
+#: ../modules/mail/e-mail-shell-view-actions.c:472
 msgid "Add Label"
 msgstr "Додати позначку"
 
@@ -9555,115 +9303,57 @@ msgstr ""
 msgid "Color"
 msgstr "Колір"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1159
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:320
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Ім'�"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:362
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2573
+#: ../modules/mail/e-mail-shell-view-private.c:952
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
 msgid "Drafts"
 msgstr "Чернетки"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
 msgid "Outbox"
 msgstr "Вихідні"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
 msgid "Sent"
 msgstr "�аді�лані"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:570
 msgid "Templates"
 msgstr "Шаблони"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Важливо"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "Потрібно зробити"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Пізніше"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:147
 msgid "Migrating..."
 msgstr "Перене�енн�..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:180
 msgid "Migration"
 msgstr "Перене�енн�..."
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:220
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Перетворенн� «%s»:"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "�е вдаєть�� �творити нову теку \"%s\": %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "�е вдаєть�� �копіювати теку \"%s\" у \"%s\": %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "�е вдаєть�� �канувати на�вні поштові �криньки на `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2932
+#: ../mail/e-mail-migrate.c:659
 msgid "Migrating Folders"
 msgstr "Створенн� тек"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Розташуванн� та ієрархі� поштових �криньок Evolution змінила�ь з вер�ії "
-"Evolution 1.x.\n"
-"\n"
-"Будь ла�ка зачекайте, доки Evolution перене�е ваші теки..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "�е вдаєть�� відкрити дані �тарого POP зберіганн� на �ервері `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "�е вдаєть�� відкрити дані POP3 зберіганн� на �ервері `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "�е вдаєть�� копіювати дані POP3 зберіганн� на �ервері `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "�е вдаєть�� �творити локальне �ховище пошти '%s': %s"
-
-#: ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:660
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9675,24 +9365,15 @@ msgstr ""
 "\n"
 "Будь ла�ка зачекайте, доки Evolution перене�е ваші теки..."
 
-#: ../mail/e-mail-migrate.c:3030
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
+#: ../mail/e-mail-migrate.c:756
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at '%s': %s"
 msgstr "�е вдаєть�� �творити локальні теки на `%s': %s"
 
-#: ../mail/e-mail-migrate.c:3048
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"�е вдаєть�� прочитати параметри з попереднього в�тановленн� Evolution, "
-"`evolution/config.xmldb' пошкоджених, або не і�нує."
-
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
+#: ../mail/e-mail-reader-utils.c:103
 #: ../modules/calendar/e-task-shell-view-actions.c:559
 msgid "Do not ask me again"
 msgstr "�е питати знову"
@@ -9701,7 +9382,7 @@ msgstr "�е питати знову"
 msgid "Copy to Folder"
 msgstr "Скопіювати у теку"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "_Копіювати"
 
@@ -9709,7 +9390,7 @@ msgstr "_Копіювати"
 msgid "Move to Folder"
 msgstr "Перемі�тити в теку"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "П_еремі�тити"
 
@@ -9727,7 +9408,6 @@ msgstr[2] "Зберегти повідомленн�"
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
 #: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Повідомленн�"
@@ -10035,8 +9715,8 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "Перенаправити видалене повідомленн� до кого�ь"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Відпові�ти _у�ім"
 
@@ -10053,7 +9733,7 @@ msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Відпові�ти у �пи�ок роз�илки цього повідомленн�"
 
 #: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "В_ідпові�ти відправнику"
 
@@ -10213,19 +9893,19 @@ msgstr "У�і заг_оловки повідомлень"
 msgid "Show messages with all email headers"
 msgstr "Показати повідомленн� з у�іма заголовками"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1878
 msgid "Unable to retrieve message"
 msgstr "�е вдаєть�� отримати повідомленн�"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1943
+#: ../mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Отриманн� повідомленн� «%s»"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2457
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:534
 #: ../plugins/google-account-setup/google-source.c:656
@@ -10233,33 +9913,33 @@ msgstr "Отриманн� повідомленн� «%s»"
 msgid "Default"
 msgstr "Типовий"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2578
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "_Пере�лати"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2579
 msgid "Forward the selected message to someone"
 msgstr "Пере�лати вибране повідомленн� до кого�ь"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2623 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Видалити"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Далі"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Попереднє"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2635 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Відпові�ти"
 
@@ -10269,24 +9949,24 @@ msgstr "Позначити до виконанн�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:73
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Без шифруванн�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:121
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "Шифруванн� TLS"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "Шифруванн� SSL"
 
@@ -10309,34 +9989,34 @@ msgstr ""
 "потім відмітьте поле, щоб її прийн�ти\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "�емає"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "�іколи"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "Завжди"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "Питати дл� кожного повідомленн�"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "�емає"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "�алаштовуванн� пошти"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10346,7 +10026,7 @@ msgstr ""
 "\n"
 "�ати�ніть \"Вперед\" дл� продовженн�"
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2060
 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 "
@@ -10356,20 +10036,20 @@ msgstr ""
 "можна не заповнювати, �кщо ви не бажаєте щоб ц� інформаці� від�илала�ь разом "
 "з вашими повідомленн�ми."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2228
+#: ../mail/mail-config.ui.h:91
 msgid "Receiving Email"
 msgstr "Отриманн� пошти"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "�алаштуйте на�тупні параметри облікового запи�у."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2705
 msgid "Sending Email"
 msgstr "Від�иланн� пошти"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10378,11 +10058,11 @@ msgstr ""
 "впевнені, �питайте вашого �и�темного адміні�тратора або по�тачальника "
 "Інтернет."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "Керуванн� обліковими запи�ами"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2069
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10390,11 +10070,11 @@ msgstr ""
 "Введіть назву, що опи�ує цей обліковий запи�.\n"
 "Ц� назва буде викори�товувати�ь лише на екрані."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "Виконано"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10409,56 +10089,56 @@ msgstr ""
 "\n"
 "Щоб зберегти параметри нати�ніть \"За�то�увати\"."
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2515
 msgid "Check for _new messages every"
 msgstr "Перевір�ти _нову пошту кожні"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2523
 msgid "minu_tes"
 msgstr "_хвилини"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2831 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "Безпека"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2876 ../mail/em-account-editor.c:2944
 msgid "Receiving Options"
 msgstr "Параметри отриманн�"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
 msgid "Checking for New Messages"
 msgstr "Перевірка нової пошти"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3413
 msgid "Account Editor"
 msgstr "Редактор облікових запи�ів"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3413
 msgid "Evolution Account Assistant"
 msgstr "Помічник з облікових запи�ів Evolution"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1571
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Повідомленн� дл� %s о «%s» було прочитано %s."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1619
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "До�тавка �повіщенн� дл�: «%s»"
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1943
 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:1997
+#: ../mail/em-composer-utils.c:1990
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10466,15 +10146,15 @@ msgstr ""
 "У ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} у ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} пише:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2134
 msgid "-----Original Message-----"
 msgstr "-------- Оригінальне повідомленн� --------"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2315
 msgid "Posting destination"
 msgstr "�дре�а призначенн�"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2316
 msgid "Choose folders to post the message to."
 msgstr "Виберіть теку у �ку наді�лати повідомленн�."
 
@@ -10559,6 +10239,10 @@ msgstr "До виконанн�"
 msgid "Forward to"
 msgstr "Пере�лати"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Важливо"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "пі�л�"
@@ -10583,7 +10267,7 @@ msgstr "не в�тановлено"
 msgid "is set"
 msgstr "в�тановлено"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:62
 msgid "Junk"
 msgstr "Спам"
 
@@ -10632,7 +10316,7 @@ msgid "Play Sound"
 msgstr "Відтворити звук"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Прочитане"
 
@@ -10722,7 +10406,7 @@ msgid "Add Ac_tion"
 msgstr "Додати д_ію"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:169
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "�епрочитане повідомленн�:"
@@ -10731,24 +10415,24 @@ msgstr[2] "�епрочитаних повідомлень:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:173
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Загалом повідомленн�:"
 msgstr[1] "Загалом повідомленн�:"
 msgstr[2] "Загалом повідомлень:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:191
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Квота (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:193
 #, c-format
 msgid "Quota usage"
 msgstr "Квота"
 
-#: ../mail/em-folder-properties.c:399
+#: ../mail/em-folder-properties.c:394
 #: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "Вла�тиво�ті теки"
@@ -10757,37 +10441,37 @@ msgstr "Вла�тиво�ті теки"
 msgid "<click here to select a folder>"
 msgstr "<клацніть, щоб вибрати теку>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:262
 msgid "C_reate"
 msgstr "С_творити"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "_�азва теки:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1073 ../mail/mail-vfolder.c:1138
 msgid "Search Folders"
 msgstr "Теки пошуку"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "БЕЗВІДПОВІД�ОСТІ"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1080
 msgid "Loading..."
 msgstr "Завантаженн�..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:179
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Скануванн� тек в \"%s\""
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:592
 msgid "Folder names cannot contain '/'"
 msgstr "�азва теки не може мі�тити '/'"
 
@@ -10809,74 +10493,74 @@ msgstr "�азва теки не може мі�тити '/'"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1074
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1280
 msgid "Mail Folder Tree"
 msgstr "Дерево поштових тек"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1480 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Переміщенн� теки %s"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1482 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Відкриванн� теки %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2100
+#: ../mail/em-folder-tree.c:1489 ../mail/message-list.c:2087
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Переміщенн� повідомлень у теку %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2102
+#: ../mail/em-folder-tree.c:1491 ../mail/message-list.c:2089
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копіюванн� повідомлень у теку %s"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1506
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "�е вдаєть�� �кинути повідомленн� у �ховище верхнього рівн�"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Move Folder To"
 msgstr "Перемі�тити теку у"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Copy Folder To"
 msgstr "Копіювати теку у"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
-#, c-format
-msgid "Creating folder `%s'"
+#: ../mail/em-folder-utils.c:500
+#: ../plugins/groupwise-features/share-folder-common.c:136
+#, fuzzy, c-format
+msgid "Creating folder '%s'"
 msgstr "Створенн� теки \"%s\""
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:663
 msgid "Create Folder"
 msgstr "Створити теку"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:664
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:345
 msgid "Specify where to create the folder:"
 msgstr "Вкажіть, де �творити теку:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:680
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Ска�уванн� підпи�ки на теку \"%s\""
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1528
 msgid "Unsigned"
 msgstr "�е підпи�ано"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10884,11 +10568,11 @@ msgstr ""
 "Це повідомленн� не підпи�ано цифровим підпи�ом. Тому немає гарантій його "
 "автентично�ті."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1529
 msgid "Valid signature"
 msgstr "Підпи� дій�ний"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10896,11 +10580,11 @@ msgstr ""
 "Це повідомленн� підпи�ано дій�ним підпи�ом, що підтверджує автентичні�ть "
 "відправника."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1530
 msgid "Invalid signature"
 msgstr "Підпи� недій�ний"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10908,11 +10592,11 @@ msgstr ""
 "Підпи� цього повідомленн� не може бути перевірений. Можливо повідомленн� "
 "було змінене при до�тавці."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1531
 msgid "Valid signature, but cannot verify sender"
 msgstr "Підпи� дій�ний, але не вдаєть�� перевірити відправника"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10920,11 +10604,11 @@ msgstr ""
 "Це повідомленн� підпи�ане правильним підпи�ом, але відправник повідомленн� "
 "не може бути перевірений."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1532
 msgid "Signature exists, but need public key"
 msgstr "Підпи� і�нує, але вимагаєть�� публічний ключ"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -10932,11 +10616,11 @@ msgstr ""
 "Це повідомленн� підпи�ане правильним підпи�ом, але не вдаєть�� знайти "
 "відповідний публічний ключ."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1538
 msgid "Unencrypted"
 msgstr "�е зашифровано"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10944,11 +10628,11 @@ msgstr ""
 "Це повідомленн� не зашифровано. Його вмі�т може бути перегл�нутий при "
 "до�тавці через Інтернет."
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1539
 msgid "Encrypted, weak"
 msgstr "Шифроване, �лабке шифруванн�"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -10957,11 +10641,11 @@ msgstr ""
 "Це повідомленн� зашифроване, але алгоритм шифруванн� �лабкий. Сторонні о�оби "
 "можуть перегл�нути вмі�т цього повідомленн� за розумний інтервал ча�у."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1540
 msgid "Encrypted"
 msgstr "Шифроване"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10969,11 +10653,11 @@ msgstr ""
 "Це повідомленн� зашифроване. Перегл�д вмі�ту цього повідомленн� дл� "
 "�торонніх о�іб буде у�кладнений."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1541
 msgid "Encrypted, strong"
 msgstr "Шифроване, �ильне шифруванн�"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -10983,15 +10667,15 @@ msgstr ""
 "цього повідомленн� дл� �торонніх о�іб буде дуже у�кладнений за розумний "
 "інтервал ча�у."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Перегл�нути �ертифікат"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Цей �ертифікат неможливо перегл�нути"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:496
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -11000,28 +10684,28 @@ msgstr ""
 "надто великий. Ви можете перегл�нути його у неформатованому вигл�ді або "
 "викори�товувати зовнішній тек�товий редактор."
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:725
 msgid "Completed on"
 msgstr "Завершено о"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:733
 msgid "Overdue:"
 msgstr "Про�трочені:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:737
 msgid "by"
 msgstr "о"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:988
 msgid "View _Unformatted"
 msgstr "Показати _неформатовані"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:951
 msgid "Hide _Unformatted"
 msgstr "Сховати _неформатовані"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1008
 msgid "O_pen With"
 msgstr "В_ідкрити у програмі"
 
@@ -11030,48 +10714,48 @@ msgstr "В_ідкрити у програмі"
 msgid "Page %d of %d"
 msgstr "Сторінка %d з %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:147
 msgid "Formatting message"
 msgstr "Форматуванн� повідомленн�"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:338
 msgid "Formatting Message..."
 msgstr "Форматуванн� повідомленн�..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
-#, c-format
-msgid "Retrieving `%s'"
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
+#, fuzzy, c-format
+msgid "Retrieving '%s'"
 msgstr "Отриманн� %s"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1849
 msgid "Unknown external-body part."
 msgstr "�евідома ча�тина external-body."
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1857
 msgid "Malformed external-body part."
 msgstr "Ча�тину external-body �формовано неправильно."
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1887
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Вказівник на �айт FTP (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1898
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Вказівник на локальний файл (%s) на �айті \"%s\""
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1900
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Вказівник на локальний файл (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1921
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Вказівник на віддалені дані (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1932
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Вказівник на невідомі зовнішні дані (типу \"%s\")"
@@ -11079,38 +10763,49 @@ msgstr "Вказівник на невідомі зовнішні дані (ти
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2624
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Це повідомленн� було наді�лане <b>%s</b> від імені <b>%s</b>"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Це �ховище не підтримує підпи�уванн�, або воно не ввімкнено."
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Підпи�ано"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Тека"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:832
 msgid "Please select a server."
 msgstr "Будь ла�ка, виберіть �ервер."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:868
 msgid "No server has been selected"
 msgstr "Сервер не був вибраний"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, fuzzy, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "Ви дій�но бажаєте відкрити {0} повідомлень одноча�но?"
+msgstr[1] "Ви дій�но бажаєте відкрити {0} повідомлень одноча�но?"
+msgstr[2] "Ви дій�но бажаєте відкрити {0} повідомлень одноча�но?"
+
+#: ../mail/em-utils.c:312
 msgid "Message Filters"
 msgstr "Фільтри повідомлень"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:813
 #, c-format
 msgid "Messages from %s"
 msgstr "Повідомленн� від %s"
@@ -11119,7 +10814,7 @@ msgstr "Повідомленн� від %s"
 msgid "Search _Folders"
 msgstr "_Віртуальні теки"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:521
 msgid "Add Folder"
 msgstr "Додати теку"
 
@@ -11160,50 +10855,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Ширина вікна «Отриманн� та над�иланн� пошти»"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Дозвол�є програмі показувати тек�т обмеженого розміру"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Запитати звіт про прочитанн�"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "�втоматичне розпізнаванн� емоцій"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "�втоматичне розпізнаванн� гіперпо�илань"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Перевір�ти чи є вхідні повідомленн� �памом"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Колір під�вічуванн� цитуванн�"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Колір під�вічуванн� цитуванн�."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Типова ви�ота вікна редактора повідомлень"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Типова ширина вікна редактора повідомлень"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "Каталог дл� завантаженн�/вкладенн� компоненту напи�анн� ли�тів"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Сти�нути відображенн� адре� у Кому/Копі�/Прихована"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11211,7 +10902,7 @@ msgstr ""
 "Сти�нути відображенн� Кому/Копі�/Прихована до чи�ла вказаного у "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11219,11 +10910,11 @@ msgstr ""
 "Визначає, �к ча�то локальні зміни �инхронізують�� з віддаленим поштовим "
 "�ервером. Інтервал має бути принаймні 30 �екунд."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "Вказані кори�тувачем заголовки дл� ви�вленн� �паму."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11231,63 +10922,63 @@ msgstr ""
 "Вказані кори�тувачем заголовки дл� перевірки �паму. Формат у вигл�ді "
 "заголовок=значенн� у gconf."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Типове кодуванн� дл� �творенн� повідомлень"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Типове кодуванн� дл� �творенн� повідомлень."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Типове кодуванн� відображенн� повідомлень"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Типове кодуванн� відображенн� повідомлень"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Типовий �тиль пере�иланн�"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Типова ви�ота вікна редактора повідомленн�."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Типова ви�ота вікна огл�дача пошти."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Типова ви�ота діалогового вікна підпи�ки."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "Типовий розгорнутий �тан вікна огл�дача пошти."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Типовий �тиль відповіді"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Типовий �тан гілки"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Типова ви�ота вікна редагуванн� повідомленн�."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Типова ширина вікна огл�дача пошти."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Типова ви�ота діалогу підпи�ки."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11295,11 +10986,11 @@ msgstr ""
 "Визначає чи шукати адре�у дл� фільтрації �паму лише у локальній адре�ній "
 "книзі"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Визначає чи шукати відправника у адре�ній книзі"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11311,11 +11002,11 @@ msgstr ""
 "адре�них книгах, позначених дл� автодоповненн�. Пошук можу бути повільний, "
 "�кщо дл� автодоповненн� позначено віддалену адре�ну книгу (наприклад, ldap)."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Визначає, чи викори�товувати інші заголовки дл� пошуку �паму"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11325,7 +11016,7 @@ msgstr ""
 "та відповідні заголовки вказані, це призведе до пришвидшенн� перевірки на "
 "�пам."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11333,18 +11024,22 @@ msgstr ""
 "Визначає чи викори�товувати однакові шрифти дл� р�дків \"Від\" та \"Тема\" у "
 "�товпчику \"Повідомленн�\" у вертикальному режимі перегл�ду."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "Каталог дл� збереженн� файлів компонентів пошти."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "Каталог дл� збереженн� файлів компонентів пошти."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Вимкнути чи увімкнути �короченн� назв тек у боковій панелі"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "�е додавати розділювач дл� підпи�у"
@@ -11419,15 +11114,16 @@ msgstr ""
 "перегл�ду повідомленн�, �пи�ків повідомлень та тек."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
 msgstr ""
-"Дозволити відображенн� тек�тової ча�тини повідомленн� обмеженого розміру."
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "Увімкнути/вимкнути режим в�тавки"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:46
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Кодувати імена файлів аналогічно до Outlook/GMail"
 
@@ -11572,11 +11268,13 @@ msgstr ""
 "видаленн� його з результатів пошуку."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+#, fuzzy
+msgid "Last time Empty Junk was run"
 msgstr "Ча� о�таннього очищенн� �паму"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+#, fuzzy
+msgid "Last time Empty Trash was run"
 msgstr "Ча� о�таннього очищенн� �мітника"
 
 #: ../mail/evolution-mail.schemas.in.h:85
@@ -11688,67 +11386,72 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "Відзначати цитати у повідомленні в панелі попереднього перегл�ду."
 
 #: ../mail/evolution-mail.schemas.in.h:109
+#, fuzzy
+msgid "Message text limit for display"
+msgstr "Показ повідомлень"
+
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Стиль відображенн� повідомленн� (\"normal\" - звичайний, \"full headers\" -  "
 "з повними заголовками, \"source\" - джерело)"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Мінімальна кількі�ть днів між очищенн�м �паму при виході"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Мінімальна кількі�ть днів між очищенн�м �мітника при виході"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Мінімальний проміжок ча�у між очищенн�м �паму при завершенні програми, у "
 "дн�х."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Мінімальний проміжок ча�у між очищенн�м �мітника при завершенні програми, у "
 "дн�х."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Кількі�ть адре�, що відображають�� у Кому/Копі�/Прихована"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "Попереджати при порожній темі"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Запитувати підтвердженн� у кори�тувача при очищенні теки."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Запитувати підтвердженн� у кори�тувача коли він намагаєть�� наді�лати "
 "повідомленн� без теми."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "Попереджати при над�иланні повідомлень з порожньою темою"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "Попереджати при очищенні �мітника"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "Попереджати, �кщо кори�тувач вказав лише отримувачів прихованої копії"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Попереджати при �пробі відкрити 10 чи більше повідомлень одноча�но"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11756,65 +11459,65 @@ msgstr ""
 "Попереджати, �кщо кори�тувач намагаєть�� наді�лати HTML повідомленн� "
 "отримувачам, �кі цього не бажають"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Попереджати, коли кори�тувач намагаєть�� наді�лати повідомленн� без "
 "вказуванн� отримувача у пол�х \"Кому:\" та \"Копі�:\""
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Попереджувати, коли кори�тувач намагаєть�� наді�лати небажаний HTML "
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "Попереджати при позначенні кількох повідомлень"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr "Розміщати о�оби�тий підпи� у верхній ча�тині відповідей"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "Розміщати кур�ор на початок при відповіді"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Розпізнавати емоції у тек�ті та замінювати їх на зображенн�."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "Розпізнавати по�иланн� у тек�ті та замінювати їх."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "Перевір�ти на �пам вхідну пошту."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "Зберегти каталог"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "Шукати фотографії відправника у локальних адре�них книгах"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "Типово над�илати пошту у форматі HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "Типово над�илати пошту у форматі HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "Показувати електронну адре�у автора у �пи�ку повідомлень"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "Інтервал �инхронізації з �ервером"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11822,68 +11525,68 @@ msgstr ""
 "В�тановіть у ІСТИ��, �кщо не хочете додавати розділювач підпи�у при "
 "�творенні поштового повідомленн�"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Показувати поле \"Прихована копі�\" при над�иланні повідомленн�"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Показувати поле \"Копі�\" при над�иланні повідомленн�"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Показувати поле \"Від\" у допи�ах до групи новин"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"From\" field when sending a mail message"
 msgstr "Показувати поле \"Від\" при над�иланні повідомленн�"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Показувати поле \"Відпові�ти\" у допи�ах до групи новин"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "_Також шифрувати дл� �ебе при над�иланні повідомленн�"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "Показувати анімацію"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show all message headers"
 msgstr "Показувати в�і заголовки повідомлень"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show all the headers when viewing a messages."
 msgstr "Показувати в�і заголовки при перегл�ді повідомлень."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "Показувати анімаційні зображенн� �к анімацію."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Показувати видалені повідомленн� (�к перекре�лені) у �пи�ку повідомлень."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr "Показувати видалені повідомленн� у �пи�ку повідомлень"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show image animations"
 msgstr "Показувати анімацію зображень"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show original \"Date\" header value."
 msgstr "Показати початкове значенн� заголовку «Дата»"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "Показати фотографію відправника"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11891,7 +11594,7 @@ msgstr ""
 "Показувати поле \"Прихована копі�\" при над�иланні повідомленн�. Цей "
 "параметр контролюєть�� з меню Вигл�д, коли обрано поштовий рахунок."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11899,7 +11602,7 @@ msgstr ""
 "Показувати поле \"Копі�\" при над�иланні повідомленн�. Цей параметр "
 "контролюєть�� з меню Вигл�д, коли обрано поштовий рахунок."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11907,7 +11610,7 @@ msgstr ""
 "Показувати поле \"Від\" при над�иланні допи�ів до групи новин. Цей параметр "
 "контролюєть�� з меню Вигл�д, коли обрано рахунок новин."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11915,7 +11618,7 @@ msgstr ""
 "Показувати поле \"Від\" при над�иланні повідомленн�. Цей параметр "
 "контролюєть�� з меню Вигл�д, коли обрано поштовий рахунок."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11923,7 +11626,7 @@ msgstr ""
 "Показувати поле \"Відпові�ти\" при над�иланні повідомленн�. Цей параметр "
 "контролюєть�� з меню Вигл�д, коли обрано рахунок новин."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11931,7 +11634,7 @@ msgstr ""
 "Показувати поле \"Відпові�ти\" при над�иланні повідомленн�. Цей параметр "
 "контролюєть�� з меню Вигл�д, коли обрано поштовий рахунок."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -11939,7 +11642,7 @@ msgstr ""
 "Показувати електронну адре�у автора у зведеному �товпчику повідомлень у "
 "�пи�ку повідомлень."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -11949,48 +11652,48 @@ msgstr ""
 "відрізн�єть�� ча�овий по��). У іншому разі, завжди показувати значенн� "
 "заголовку «Дата» у форматі і з ча�овим по��ом, обраним кори�тувачем."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Показувати фотографію відправника у панелі читанн� повідомлень."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "Перевірка орфографії при вводі"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "Колір перевірки орфографії"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "Мови перевірки орфографії"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "Типова ви�ота вікна діалогового вікна підпи�у"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "Типова ширина вікна діалогового вікна підпи�у"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "Термінальний шрифт"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "Обмеженн� розміру тек�тового вкладенн�"
-
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "Типовий модуль обробки �паму"
 
 #: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
+#, fuzzy
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Ча� о�танньої чи�тки �паму, у дн�х з початку епохи."
 
 #: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
+#, fuzzy
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "О�танній раз, коли виконувало�ь очищенн� �мітника, у дн�х з початку епохи."
 
@@ -12022,9 +11725,11 @@ msgstr ""
 "налагоджувальні повідомленн� messages."
 
 #: ../mail/evolution-mail.schemas.in.h:176
+#, fuzzy
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
 "Визначає мак�имальний розмір тек�тового вкладенн�, �ке може бути "
 "відформатовано у програмі Evolution. Типовий розмір 4MB / 4096 KB та "
@@ -12197,358 +11902,380 @@ msgstr "Ширина панелі �пи�ку повідомлень"
 msgid "Width of the message-list pane."
 msgstr "Ширина панелі �пи�ку повідомлень."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Імпортуванн� даних Elm"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "Пошта"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:365
 msgid "Evolution Elm importer"
 msgstr "Компонент Evolution імпорту з Elm"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:366
 msgid "Import mail from Elm."
 msgstr "Імпорт пошти з програми Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
+#: ../mail/importers/evolution-mbox-importer.c:113
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Destination folder:"
 msgstr "Тека призначенн�:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../plugins/pst-import/pst-importer.c:294
 msgid "Select folder"
 msgstr "Вибрати теку"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../plugins/pst-import/pst-importer.c:294
 msgid "Select folder to import into"
 msgstr "Виберіть теку у �ку імпортувати"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#: ../mail/importers/evolution-mbox-importer.c:258
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Скринька Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:259
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Імпорт папок у форматі Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Імпортуєть�� поштова �кринька"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
-#, c-format
-msgid "Importing `%s'"
+#: ../mail/importers/mail-importer.c:148
+#: ../plugins/pst-import/pst-importer.c:446
+#: ../plugins/pst-import/pst-importer.c:552
+#, fuzzy, c-format
+msgid "Importing '%s'"
 msgstr "Імпортуєть�� `%s'"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:291
 #, c-format
 msgid "Scanning %s"
 msgstr "Скануванн� %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "Імпорт даних з Pine"
 
-#: ../mail/importers/pine-importer.c:379
+#: ../mail/importers/pine-importer.c:377
 #: ../modules/addressbook/addressbook-config.c:986
 msgid "Address Book"
 msgstr "�дре�на книга"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:418
 msgid "Evolution Pine importer"
 msgstr "Компонент Evolution імпорту з Pine"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:419
 msgid "Import mail from Pine."
 msgstr "Імпорт пошти з Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Пошта до %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "Пошта від %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "Тема - %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "Спи�ок роз�илки %s"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Додати правило фільтруванн�"
 
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(Примітка: потрібен перезапу�к програми)"
 
-#: ../mail/mail-config.ui.h:2
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:3
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Відповідь на початку ли�та</b> (�е рекомендуєть��)"
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "Інформаці� про обліковий запи�"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "Додати _новий підпи�..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr ""
 "Зав_жди підпи�увати повідомленн� при викори�танні цього облікового запи�у"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "_Також шифрувати дл� �ебе при над�иланні шифрованої пошти"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Зав_жди над�илати копію (С�) до:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Завжди _над�илати приховану копію (Bcc) до:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Завжди _довір�ти ключам в моєму �ховищі ключів при шифруванні"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Завжди ши_фрувати дл� �ебе при над�иланні шифрованої пошти"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "_Запитувати підтвердженн� про прочитанн�"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:15 ../modules/addressbook/addressbook-config.c:993
 msgid "Authentication"
 msgstr "�втентифікаці�"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "�втоматично _в�тавл�ти значки емоцій"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "�абір _�имволів:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "Перевірити п_ідтримувані типи"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "Перевір�ти _інші заголовки на �пам"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
 msgstr "Перевір�ти вхідні _повідомленн� на �пам"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "Перевір�ти правопи� під ча� набору _тек�ту"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Перевір�є, чи є вхідні повідомленн� �памом"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "О_чи�тити"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "О_чи�тити"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "Колір _некоректних �лів:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "Створенн� повідомленн�"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "�алаштовуванн�"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "_Питати підтвердженн� при очищенні видалених повідомлень"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Default Behavior"
 msgstr "Типова поведінка"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "Типовий _набір �имволів:"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Delete Mail"
 msgstr "Видаленн� повідомлень"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Delete junk messages on e_xit"
 msgstr "Видал�ти �_пам при виході"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Підпи�увати повідомленн�, що над�илають�� (типово)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
+#: ../mail/mail-config.ui.h:37
+#, fuzzy
+msgid "Displayed Message Headers"
 msgstr "_Відображені заголовки повідомлень"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
+#: ../mail/mail-config.ui.h:38
+#, fuzzy
+msgid "Do not display messages when text si_ze exceeds"
 msgstr ""
 "�е форматувати тек�товий змі�т у повідомленн�х, �кщо _розмір тек�ту перевищує"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "_�е позначати повідомленн� �к �пам, �кщо відправник у моїй адре�ній книзі"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not quote"
 msgstr "�е цитувати"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "Тека _чернеток:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "_Електронна адре�а:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "О_чищати теку �мітника при виході"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Magic S_pacebar"
 msgstr "Увімкнути магічний п_робіл"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Sea_rch Folders"
 msgstr "Увімкнути теки по_шуку"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "Сертифікат _шифруванн�:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Шифрувати повідомленн�, що над�илають�� (типово)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fi_xed-width:"
 msgstr "_Фік�ованої ширини:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Fix_ed width Font:"
 msgstr "_Моноширинний шрифт:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Font Properties"
 msgstr "Вла�тиво�ті шрифту"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Format messages in _HTML"
 msgstr "Фор_матувати повідомленн� у HTML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "_Повне ім'�:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "HTML Messages"
 msgstr "Повідомленн� HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
 msgid "H_TTP Proxy:"
 msgstr "Прок�і H_TTP:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Headers"
 msgstr "Заголовки"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "Highlight _quotations with"
 msgstr "Ви�вітлювати _цитуванн�"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:60
 msgid "Inline"
 msgstr "У вмі�ті"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 msgid "Inline (Outlook style)"
 msgstr "Вбудовувати (у �тилі Outlook)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:63
 msgid "KB"
 msgstr "КБ"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Позначки"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "Таблиц� мов"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "Завантаженн� зображень"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "Таблиц� поштових заголовків"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "Розміщенн� локальної �криньки"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "Показ повідомлень"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 msgid "Message Fonts"
 msgstr "Шрифти повідомленн�"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "Message Receipts"
 msgstr "Звіти"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "No _Proxy for:"
 msgstr "�е викори�товувати _прок�і дл�:"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:74
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12556,182 +12283,182 @@ msgstr ""
 "Зауважте: вам не буде запропоновано вве�ти пароль до першого підключенн� до "
 "�ервера"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:75
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Цей параметр ігноруєть��, �кщо буде ви�влено відповідні�ть дл� інших "
 "заголовків дл� �паму."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:76
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Додаткова інформаці�"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 msgid "Or_ganization:"
 msgstr "_Організаці�:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:79
 msgid "PGP/GPG _Key ID:"
 msgstr "Ідентифікатор _ключа PGP/GPG:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Pass_word:"
 msgstr "_Пароль:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Port:"
 msgstr "_Порт:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Попе_реджати при над�иланні повідомлень, у �ких визначені лише отримувачі "
 "прихованої копії"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Printed Fonts"
 msgstr "Друковані шрифти"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Proxy Settings"
 msgstr "Параметри прок�і"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Quoted"
 msgstr "Цитувати"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "Re_member password"
 msgstr "Запа_м'�тати пароль"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "Re_ply-To:"
 msgstr "З_воротна адре�а:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "Remember _password"
 msgstr "Запам'�тати _пароль"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "Required Information"
 msgstr "Обов'�зкова інформаці�"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "У цій збірці Evolution немає підтримки SSL"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "З_найти фотографію відправника у локальних адре�них книгах"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "В_ибрати..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "_�аді�лати �повіщенн� про отриманн�:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "_Стандартний шрифт:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "Безпечний MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "Select Drafts Folder"
 msgstr "Виберіть теку чернеток"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "Виберіть шрифт HTML фік�ованої ширини"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "Виберіть шрифт HTML фік�ованої ширини дл� друку"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font"
 msgstr "Виберіть шрифт HTML змінної ширини"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "Виберіть шрифт HTML змінної ширини дл� друку"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "Select Sent Folder"
 msgstr "Виберіть теку наді�ланих"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 msgid "Sender Photograph"
 msgstr "Фотографі� відправника"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Sending Mail"
 msgstr "Від�иланн� пошти"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "Тека _наді�ланих повідомлень:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Sent and Draft Messages"
 msgstr "�аді�лані повідомленн� та чернетки"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Потрібна ав_тентифікаці�"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 msgid "Server Configuration"
 msgstr "Інформаці� про �ервер"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:114
 msgid "Server _Type:"
 msgstr "_Тип �ервера: "
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_natures"
 msgstr "П_ідпи�и"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "Сертифікат _підпи�у:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "П_ідпи�:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "Підпи�и"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "Перевірка орфографії"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "При відповіді починати _ввід пі�л� цитати"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "Т_ип:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "Спи�ок мов відображує лише ті мови, дл� �ких в�тановлено �ловники."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12741,7 +12468,7 @@ msgstr ""
 "вашого цифрового підпи�у. Вказане вами ім'� буде\n"
 "викори�товувати�ь лише дл� відображенн�."
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12749,245 +12476,243 @@ msgstr ""
 "Введіть назву, �ка викори�товуєть�� дл� по�иланн� на цей обліковий запи�.\n"
 "�априклад: \"Робота\" або \"О�оби�те\""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:129
 msgid "Us_ername:"
 msgstr "_�азва запи�у:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:130
 msgid "Use Authe_ntication"
 msgstr "Викори�товувати _автентифікацію"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../mail/mail-config.ui.h:131 ../plugins/caldav/caldav-source.c:221
 #: ../plugins/google-account-setup/google-contacts-source.c:283
 #: ../plugins/google-account-setup/google-source.c:620
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "_�азва запи�у:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:132
 msgid "V_ariable-width:"
 msgstr "_Змінної ширини:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "_Додати підпи�"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "Зав_жди завантажувати зображенн� з Інтернет"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:135
 msgid "_Authentication Type"
 msgstr "Тип _автентифікації"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:136
 msgid "_Default junk plugin:"
 msgstr "Типовий модуль �_паму:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:137
 msgid "_Direct connection to the Internet"
 msgstr "_Пр�ме підключенн� до Інтернету"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:138
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "�_е підпи�увати запрошенн� на за�іданн� (дл� �умі�но�ті з Outlook)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "Стиль _пере�иланн�:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:140
 msgid "_Keep Signature above the original message on replying"
 msgstr "При відповіді розміщувати підпи� _над повідомленн�м"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:141
 msgid "_Languages"
 msgstr "_Мова"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:142
 msgid "_Load images in messages from contacts"
 msgstr ""
 "_Завантажувати зображенн� у повідомленні, �кщо відправник є у контактах"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:143
 msgid "_Lookup in local address book only"
 msgstr "Перегл�дати теки _локальну адре�ну книгу"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:144
 msgid "_Make this my default account"
 msgstr "Зробити _типовим обліковим запи�ом"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:145
 msgid "_Manual proxy configuration:"
 msgstr "�алаштовуванн� прок�і _вручну:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:146
 msgid "_Mark messages as read after"
 msgstr "_Позначати повідомленн� �к \"Прочитані\" через"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "_�іколи не завантажувати зображенн� з Інтернет"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "_Шл�х:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "Попе_реджати при над�иланні HTML повідомлень тим, хто цього не бажає"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:151
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Поперед_жати при над�иланні повідомлень з порожньою темою"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:152
 msgid "_Reply style:"
 msgstr "Стиль _відповіді:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:153
 msgid "_Script:"
 msgstr "_Сценарій:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:154
 msgid "_Secure HTTP Proxy:"
 msgstr "Прок�і HTTP_S:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:156 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Сервер:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:158
 msgid "_Show image animations"
 msgstr "_Показувати анімацію"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:159
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Показувати фотографію _відправника у панелі перегл�ду пошти"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:161
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_У�ікати заголовки Кому / Копі� / Прихована "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:162
 msgid "_Use Secure Connection:"
 msgstr "_Викори�товувати захищене з'єднанн�:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:163
 msgid "_Use system defaults"
 msgstr "_Типово"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:164
 msgid "_Use the same fonts as other applications"
 msgstr "_Викори�товувати такі ж шрифти, �к і інші програми"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:167
 msgid "addresses"
 msgstr "адре�а"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:169
 msgid "color"
 msgstr "колір"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:170
 msgid "description"
 msgstr "опи�"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "У�і активні віддалені теки"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "У�і локальні теки та активні віддалені теки"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "У�і локальні теки"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Виклик"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "_Завершено"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Digital Signature"
 msgstr "Цифровий підпи�"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "�е пере�лати"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "Шифруванн�"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Folder Subscriptions"
 msgstr "Керуванн� підпи�кою"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "До виконанн�"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "До відома"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Пере�лати"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Ліцензійна угода"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "Можна не відповідати"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "Відпові�ти в�ім"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "Перевірити"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:20
 msgid "S_erver:"
 msgstr "_Сервер:"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Search Folder Sources"
 msgstr "Джерело тек пошуку"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Security Information"
 msgstr "Інформаці� про безпеку"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Specific folders"
 msgstr "Певні теки"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:24
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12995,156 +12720,156 @@ msgstr ""
 "�ижче перелічені повідомленн�, відмічені до виконанн�.\n"
 "Виберіть дію з меню \"Ознака\""
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Accept License"
 msgstr "_Прийн�ти ліцензію"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Due By:"
 msgstr "_Термін до:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Flag:"
 msgstr "_Ознака:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Tick this to accept the license agreement"
 msgstr "Від_значте це, щоб прийн�ти ліцензійну угоду"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:891
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping на %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Фільтраці� виділених повідомлень"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "Отриманн� пошти"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:574
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "�е вдаєть�� за�то�увати фільтри на виході: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
-#, c-format
+#: ../mail/mail-ops.c:586 ../mail/mail-ops.c:613
+#, fuzzy, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "�е вдаєть�� додати до %s: %s\n"
 "�атомі�ть додано до локальної теки \"Віді�лані\""
 
-#: ../mail/mail-ops.c:641
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+#: ../mail/mail-ops.c:630
+#, fuzzy, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "�е вдаєть�� додати до локальної теки \"Віді�лані\": %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:741 ../mail/mail-ops.c:822
 msgid "Sending message"
 msgstr "�ад�илаєть�� повідомленн�"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:751
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Від�иланн� повідомленн� %d з %d"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:778
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "�е вдаєть�� наді�лати %d з %d повідомлень."
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:780 ../mail/mail-send-recv.c:755
 msgid "Canceled."
 msgstr "Ска�овано."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:782 ../mail/mail-send-recv.c:757
 msgid "Complete."
 msgstr "Виконано."
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:894
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Збереженн� повідомленн� у теці '%s'"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Переміщенн� повідомлень у %s"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Копіюванн� повідомлень у %s"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1080
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Скануванн� тек в \"%s\""
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1188
 msgid "Forwarded messages"
 msgstr "Пере�лані повідомленн�"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1229
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Відкриванн� теки \"%s\""
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1295
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Отриманн� інформації про квоту дл� теки «%s»"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1367
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Відкритт� �ховища %s"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1438
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Видаленн� теки %s"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1556
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Збереженн� теки \"%s\""
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1619
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Очищенн� та збереженн� облікового рахунку '%s'"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1620
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Збереженн� теки \"%s\""
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1674
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Оновленн� теки «%s»"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1714
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Очищенн� теки «%s»"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1759
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Очищенн� �мітника у \"%s\""
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1760
 msgid "Local Folders"
 msgstr "Локальні теки"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1956
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -13152,7 +12877,7 @@ msgstr[0] "Отриманн� %d повідомленн�"
 msgstr[1] "Отриманн� %d повідомлень"
 msgstr[2] "Отриманн� %d повідомлень"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2045
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -13160,7 +12885,7 @@ msgstr[0] "Збереженн� %d повідомленн�"
 msgstr[1] "Збереженн� %d повідомлень"
 msgstr[2] "Збереженн� %d повідомлень"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2126
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13169,11 +12894,11 @@ msgstr ""
 "Помилка при збереженні у: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2198
 msgid "Saving attachment"
 msgstr "Збереженн� вкладенн�"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2216 ../mail/mail-ops.c:2224
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13182,144 +12907,177 @@ msgstr ""
 "�е вдаєть�� �творити файл виводу: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2239
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�е вдаєть�� запи�ати дані: %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Відключенн� від «%s»"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Повторне підключенн� до «%s»"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2480
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Підготовка облікового рахунку '%s' до автономної роботи"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2566
 msgid "Checking Service"
 msgstr "Перевірка �лужби"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "Ска�уванн�..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:426
 msgid "Send & Receive Mail"
 msgstr "Від�иланн� та отриманн� пошти"
 
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:439
 msgid "Cancel _All"
 msgstr "Ска�увати _в�е"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:548
 msgid "Updating..."
 msgstr "Оновленн�..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:548 ../mail/mail-send-recv.c:625
 msgid "Waiting..."
 msgstr "Очікуванн�..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:868
 #, c-format
 msgid "Checking for new mail"
 msgstr "Перевірка нової пошти"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:217
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Ввід парол� дл� %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:219
 msgid "Enter Passphrase"
 msgstr "Ввід парол�"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:222
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ввід парол� дл� %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:224
 msgid "Enter Password"
 msgstr "Ввід парол�"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:266
 msgid "User canceled operation."
 msgstr "Кори�тувач �ка�ував операцію."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:660
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "Пере�иланн� повідомленн� �ка�овано тому, що кінцева адре�а не вказана."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:666
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "Пере�иланн� повідомленн� �ка�овано тому, що не знайдено рахунок, �кий "
 "викори�товуєть��."
 
-#: ../mail/mail-tools.c:123
-#, c-format
-msgid "Could not create spool directory `%s': %s"
+#: ../mail/mail-tools.c:119
+#, fuzzy, c-format
+msgid "Could not create spool directory '%s': %s"
 msgstr "�е вдаєть�� �творити буферний каталог \"%s\": %s"
 
-#: ../mail/mail-tools.c:153
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+#: ../mail/mail-tools.c:149
+#, fuzzy, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Спроба перемі�тити пошту з не-mbox джерела \"%s\""
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Пере�лане повідомленн� %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "Пере�лане повідомленн�"
 
-#: ../mail/mail-tools.c:301
-#, c-format
-msgid "Invalid folder: `%s'"
+#: ../mail/mail-tools.c:297
+#, fuzzy, c-format
+msgid "Invalid folder: '%s'"
 msgstr "�еправильна тека: \"%s\""
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "�алаштовуванн� віртуальної теки: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:229
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Оновленн� віртуальних тек дл� '%s:%s'"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:236
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Оновленн� віртуальних тек дл� '%s'"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:679
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../mail/mail-vfolder.c:1189
 msgid "Edit Search Folder"
 msgstr "Правка віртуальної теки"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1291
 msgid "New Search Folder"
 msgstr "�ова віртуальна тека"
 
 #: ../mail/mail.error.xml.h:1
+#, fuzzy
+msgid "\"Check Junk\" Failed"
+msgstr "Помилка при перевірці на �пам"
+
+#: ../mail/mail.error.xml.h:2
+#, fuzzy
+msgid "\"Report Junk\" Failed"
+msgstr "Помилка звіту про помилки"
+
+#: ../mail/mail.error.xml.h:3
+#, fuzzy
+msgid "\"Report Not Junk\" Failed"
+msgstr "Помилка звіту про не �пам"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Тека з назвою «{0}» вже і�нує. Вкажіть іншу назву."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Тека з назвою «{0}» вже і�нує. Вкажіть іншу назву."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13330,20 +13088,20 @@ msgstr ""
 "\n"
 "Можете ігнорувати цю теку, перезапи�ати чи додати її вмі�т, або вийти."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
 msgstr ""
 "Було запитано �повіщенн� про до�тавку «{1}».  �аді�лати �повіщенн� до {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr "Підпи� з назвою «{0}» вже і�нує. Вкажіть іншу назву."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13351,24 +13109,20 @@ msgstr ""
 "Додаванн� змі�товного р�дка теми дл� ваших повідомлень нада�ть адре�атам "
 "у�ву про змі�т вашого повідомленн�."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 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:13
 msgid "Are you sure you want to delete this account?"
 msgstr "Ви дій�но бажаєте видалити цей рахунок?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Ви дій�но бажаєте видалити цей рахунок та у�і його прок�і?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Ви дій�но бажаєте відкрити {0} повідомлень одноча�но?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13376,7 +13130,7 @@ msgstr ""
 "Ви дій�но бажаєте о�таточно знищити в�і позначені видаленими повідомленн� з "
 "у�іх тек?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13384,89 +13138,82 @@ msgstr ""
 "Ви дій�но бажаєте о�таточно знищити в�і позначені видаленими повідомленн� з "
 "теки «{0}»?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 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:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Дій�но наді�лати повідомленн� з некоректною адре�ою?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Дій�но наді�лати повідомленн� з некоректними адре�ами?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Ви дій�но бажаєте наді�лати повідомленн� лише до отримувачів прихованої "
 "копії?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Ви дій�но бажаєте наді�лати повідомленн� без теми?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "Тому що «{0}»."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "Тому що «{2}»"
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Породній підпи�"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "�е вдаєть�� додати теку пошуку «{0}»."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "�е вдаєть�� �копіювати теку «{0}» у «{1}»."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "�е вдаєть�� �творити теку «{0}»."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "�е вдаєть�� �творити тимча�овий каталог збереженн�."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "�е вдаєть�� �творити каталог збереженн�, тому що «{1}»;"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "�е вдаєть�� видалити теку «{0}»."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "�е можна видал�ти �и�темну теку «{0}»."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "�е вдаєть�� редагуванн� віртуальної теки «{0}», тому що вона не і�нує."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "�е вдаєть�� перемі�тити теку «{0}» у «{1}»."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
+#: ../mail/mail.error.xml.h:32
+#, fuzzy
+msgid "Cannot open source \"{1}\"."
 msgstr "�е вдаєть�� відкрити джерело «{1}»"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "�е вдаєть�� відкрити джерело «{2}»."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "�е вдаєть�� відкрити ціль «{2}»"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13475,35 +13222,31 @@ msgstr ""
 "в�тановленн�м. Ви не зможете викори�товувати цього по�тачальника доки не "
 "погодите�ь з ліцензією."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "�е вдаєть�� перейменувати «{0}» на «{1}»."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "�е вдаєть�� перейменувати або перемі�тити �и�темну теку «{0}»."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "�е вдаєть�� зберегти зміни у обліковому рахунку."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "�е вдаєть�� зберегти у каталог «{1}»."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "�е вдаєть�� запи�ати у файл «{0}»."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "�е вдаєть�� в�тановити �ценарій підпи�у «{0}»."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Помилка при перевірці на �пам"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13511,27 +13254,27 @@ msgstr ""
 "Перевірте чи ваш пароль введений правильно. Пам'�тайте, що більші�ть паролів "
 "чутлива до регі�тру �имволів; можливо у ва� нати�нута клавіша CapsLock."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "�е вдаєть�� зберегти файл підпи�у."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Delete messages in Search Folder \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Do not d_elete"
 msgstr "�е в_идал�ти"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "�е видал�ти"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "�е вимикати"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13539,64 +13282,68 @@ msgstr ""
 "Синхронізувати каталоги, що призначені дл� автономної роботи, з локальним "
 "комп'ютером?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "Позначити в�і повідомленн� �к прочитані?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Бажаєте зберегти зміни?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Введіть пароль."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Помилка при завантаженні визначенн� фільтру."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Помилка при виконанні операції."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "Помилка при {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "Файл і�нує, але не може бути перезапи�аний."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "Файл і�нує або не є звичайним файлом."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Якщо ви продовжите, ви не зможете відновити ці повідомленн�."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
+#, fuzzy
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
 "Якщо ви видалите теку, ве�ь її вмі�т та вмі�т в�іх її підтек буде о�таточно "
 "видалений."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "Якщо ви видалите теку, ве�ь її вмі�т та вмі�т в�іх її підтек буде о�таточно "
 "видалений."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 "Якщо ви продовжите, відомо�ті про обліковий рахунок будуть о�таточно "
 "видалені."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13604,11 +13351,11 @@ msgstr ""
 "Якщо ви продовжите, відомо�ті про обліковий рахунок\n"
 "та в�� прикладена інформацію будуть о�таточно видалені."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Якщо ви продовжите, обліковий рахунок буде о�таточно видалений."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13616,23 +13363,23 @@ msgstr ""
 "Якщо ви вийдете, ці повідомленн� не будуть наді�лані доки Evolution не буде "
 "запущений знову."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Ігнорувати"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "�епідтримувана автентифікаці�"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Помилка видаленн� пошти"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Поштові фільтри автоматично оновлені."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13644,30 +13391,30 @@ msgstr ""
 "додаєть��, перераховують�� у�і отримувачі вашого повідомленн�. Щоб цього "
 "уникнути, необхідно додати принаймні одну адре�у у поле Кому: або Копі�:."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "�еі�нуюча тека."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "�е вибрано джерело."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 "Дл� відкриванн� надто великої кілько�ті повідомлень одноча�но може "
 "знадобити�ь багато ча�у."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Please check your account settings and try again."
 msgstr "Перевірте параметри вашого облікового запи�у та �пробуйте ще раз."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Please enable the account or send using another account."
 msgstr ""
 "Включіть обліковий запи� або викори�товуйте дл� над�иланн� інший запи�."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 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."
@@ -13675,7 +13422,7 @@ msgstr ""
 "Введіть правильну електронну адре�у у поле Кому:. Можна виконати пошук "
 "адре�, нати�канн�м на кнопці \"Кому:\" розташованій за полем вводу."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13684,63 +13431,55 @@ msgstr ""
 "Перевірте, що на�тупні адре�ати бажають приймати пошту у форматі HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "Введіть унікальну назву дл� ідентифікації цього підпи�у."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "Будь ла�ка, зачекайте."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Проблема при перетворенні �тарої поштової теки «{0}»."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Дл� запитаного механізму автентифікації вимагаєть�� шифруванн�."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "Запитано �повіщенн� про прочитанн�."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Справді видалити теку «{0}» та в�і її підтеки?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\"?"
 msgstr "Дій�но видалити теку «{0}»?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "Помилка звіту про помилки"
-
 #: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "Помилка звіту про не �пам"
-
-#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "Віртуальні теки автоматично оновлені."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "�аді�лати звіт"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "Підпи� вже і�нує"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "Синхронізувати"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Синхронізувати каталоги дл� автономної роботи?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13748,7 +13487,7 @@ msgstr ""
 "Си�темні теки потрібні Evolution дл� коректної роботи та не можуть бути "
 "перейменовані, переміщені або видалені."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13765,35 +13504,7 @@ msgstr ""
 "додаєть��, перераховують�� у�і отримувачі вашого повідомленн�. Щоб цього "
 "уникнути, необхідно додати принаймні одну адре�у у поле Кому: або Копі�:."
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"�а�тупні теки пошуку:\n"
-"{0}\n"
-"викори�товували віддалену теку:\n"
-"    «{1}»\n"
-"та були оновлені."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"�а�тупні поштові фільтри:\n"
-"{0}\n"
-"Викори�товували віддалену зараз теку:\n"
-"    «{1}»\n"
-"Та були оновлені."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13801,7 +13512,7 @@ msgstr ""
 "�дре�у електронної пошти на�тупного отримувача нерозпізнано �к коректну:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13809,11 +13520,11 @@ msgstr ""
 "�дре�и електронної пошти на�тупних отримувача нерозпізнано �к коректні:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "Файл �ценарію повинен і�нувати та мати атрибут виконуваного файлу."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13821,20 +13532,20 @@ msgstr ""
 "Ц� тека має бути додана �вно, перейдіть у\n"
 "редактор віртуальних тек, щоб �вно її додати, �кщо потрібно."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 "Це повідомленн� не може бути наді�лане, вибраний обліковий рахунок вимкнений"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Це повідомленн� не може бути наді�лане, тому що не вказаний жоден отримувач"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13842,11 +13553,11 @@ msgstr ""
 "Цей �ервер не підтримує автентифікацію цей тип автентифікації, та, можливо, "
 "не підтримує автентифікацію взагалі."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "Цей підпи� змінив��, але не був збережений."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13854,11 +13565,11 @@ msgstr ""
 "У�і повідомленн� у вибраній теці та її підтеках будуть позначені �к "
 "прочитані."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "�е вдаєть�� з'єднати�ь з �ервером GroupWise."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13866,19 +13577,19 @@ msgstr ""
 "�е вдаєть�� відкрити теку чернеток цього облікового рахунку. Бажаєте "
 "викори�тати �и�темну теку чернеток?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "�е вдаєть�� прочитати файл ліцензії."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "_Типову"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "Викори�товувати типову теку чернеток?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13888,31 +13599,31 @@ msgstr ""
 "видаленн� повідомленн� з відповідної локальної чи віддаленої теки.\n"
 "Ви �правді цього хочете?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:117
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "�едо�татньо прав дл� видаленн� цього повідомленн�."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:118
 msgid "You have not filled in all of the required information."
 msgstr "Ви ще не ввели потрібну інформацію."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:119
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Є невіді�лані повідомленн�! Бажаєте вийти попри в�е?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:120
 msgid "You may not create two accounts with the same name."
 msgstr "�е можна �творювати два облікових рахунки з однаковою назвою."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "Цій віртуальній теці необхідно дати назву."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "�еобхідно вказати теку."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13922,115 +13633,111 @@ msgstr ""
 "�бо шл�хом вибору окремих тек, та/чи шл�хом вибору у�іх\n"
 "локальних тек, у�іх віддалених тек, або обома �по�обами."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:125
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Помилка реє�трації на �ервері «{0}» під іменем «{0}»."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "_Додати"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "_Відкинути зміни"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:128
 msgid "_Do not Synchronize"
 msgstr "_�е �инхронізувати"
 
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:866
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:821
 msgid "_Empty Trash"
 msgstr "О_чи�тити �мітник"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "Вик_ре�лити"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "_Відкрити повідомленн�"
 
-#: ../mail/message-list.c:1119
+#: ../mail/message-list.c:1107
 msgid "Unseen"
 msgstr "�е прочитано"
 
-#: ../mail/message-list.c:1120
+#: ../mail/message-list.c:1108
 msgid "Seen"
 msgstr "Прочитано"
 
-#: ../mail/message-list.c:1121
+#: ../mail/message-list.c:1109
 msgid "Answered"
 msgstr "Дана відповідь"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1110
 msgid "Forwarded"
 msgstr "Пере�лано"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1111
 msgid "Multiple Unseen Messages"
 msgstr "Декілька непрочитаних повідомлень"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1112
 msgid "Multiple Messages"
 msgstr "Декілька повідомлень"
 
-#: ../mail/message-list.c:1128
+#: ../mail/message-list.c:1116
 msgid "Lowest"
 msgstr "�айнижчий"
 
-#: ../mail/message-list.c:1129
+#: ../mail/message-list.c:1117
 msgid "Lower"
 msgstr "�изький"
 
-#: ../mail/message-list.c:1133
+#: ../mail/message-list.c:1121
 msgid "Higher"
 msgstr "Ви�окий"
 
-#: ../mail/message-list.c:1134
+#: ../mail/message-list.c:1122
 msgid "Highest"
 msgstr "�айвищий"
 
-#: ../mail/message-list.c:1744 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1732 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1751 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1739 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Сьогодні %I:%M %p"
 
-#: ../mail/message-list.c:1760
+#: ../mail/message-list.c:1748
 msgid "Yesterday %l:%M %p"
 msgstr "Вчора %l:%M %p"
 
-#: ../mail/message-list.c:1772
+#: ../mail/message-list.c:1760
 msgid "%a %l:%M %p"
 msgstr "%a, %I:%M %p"
 
-#: ../mail/message-list.c:1780
+#: ../mail/message-list.c:1768
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1782
+#: ../mail/message-list.c:1770
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2534
+#: ../mail/message-list.c:2506
 msgid "Select all visible messages"
 msgstr "Видалити в�і видимі повідомленн�"
 
-#: ../mail/message-list.c:2585 ../shell/e-shell-view.c:729
-msgid "Shell Backend"
-msgstr "Бек-енд оболонки"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4440 ../mail/message-list.c:4938
+#: ../mail/message-list.c:4187 ../mail/message-list.c:4591
 msgid "Generating message list"
 msgstr "Створенн� �пи�ку повідомлень"
 
-#: ../mail/message-list.c:4769
+#: ../mail/message-list.c:4424
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14038,15 +13745,7 @@ msgstr ""
 "�емає ли�тів, що збігають�� з критерієм пошуку. Очи�тите поле пошуку за "
 "допомогою меню Пошук → Очи�тити або змініть критерії."
 
-#: ../mail/message-list.c:4771
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"У цій теці є лише приховані повідомленн�. Щоб їх побачити виберіть меню "
-"Вигл�д -> Показати приховані повідомленн�."
-
-#: ../mail/message-list.c:4773
+#: ../mail/message-list.c:4426
 msgid "There are no messages in this folder."
 msgstr "У теці немає повідомлень."
 
@@ -14084,27 +13783,27 @@ msgid "Subject - Trimmed"
 msgstr "Тема - Скорочена"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Body contains"
 msgstr "Вмі�т мі�тить"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Message contains"
 msgstr "Повідомленн� мі�тить"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Recipients contain"
 msgstr "Отримувач мі�т�ть"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Sender contains"
 msgstr "Відправник мі�тить"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Subject contains"
 msgstr "Тема мі�тить"
 
@@ -14139,7 +13838,8 @@ msgstr ""
 "атак."
 
 #: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
+#, fuzzy
+msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "_Викори�товувати у календарі днів народжень та річниць"
 
 #: ../modules/addressbook/addressbook-config.c:628
@@ -14287,9 +13987,11 @@ msgstr "Чи показувати поштову адре�у разом з ім
 msgid "Whether to show the preview pane."
 msgstr "Показувати панель попереднього перегл�ду."
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Стовпчик таблиці:"
+#: ../modules/mail/em-mailer-prefs.c:1150
+msgid "_Table column:"
+msgstr "Стовпчик _таблиці:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -14301,7 +14003,7 @@ msgstr "Завжди _показувати адреÑ�у контакту автÐ
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "�а �ерверах LDAP"
 
@@ -14311,7 +14013,7 @@ msgid "_Contact"
 msgstr "_Контакт"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "Створити новий контакт"
 
@@ -14321,7 +14023,7 @@ msgid "Contact _List"
 msgstr "_Спи�ок контактів"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "Створити новий �пи�ок контактів"
 
@@ -14331,7 +14033,7 @@ msgid "Address _Book"
 msgstr "�дре�а _книга"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "Створити нову адре�ну книгу"
 
@@ -14339,335 +14041,232 @@ msgstr "Створити нову адре�ну книгу"
 #: ../modules/addressbook/e-book-shell-backend.c:376
 #: ../modules/addressbook/e-book-shell-view.c:394
 #: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Контакти"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Спи�ок джерело"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "Реє�тр адре�них книг"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "Поточний вигл�д"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "Поточний обраний вигл�д адре�ної книги"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Попередній перегл�д контакту"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "Контакт, що показуєть�� у панелі попереднього перегл�ду"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "Попередній перегл�д увімкнено"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "Чи показувати панель попереднього перегл�ду"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "Сервери LDAP"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "Параметри автодоповненн�"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-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 ""
-"Розташуванн� та ієрархі� тек контактів Evolution змінили�ь пі�л� вер�ії 1."
-"x.\n"
-"\n"
-"Відбуваєть�� перетворенн� тек дл� нової вер�ії..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Формат �пи�ків контактів змінив��.\n"
-"\n"
-"Зачекайте, доки відбуваєть�� перетворенн� тек..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Спо�іб зберіганн� де�ких телефонних номерів у Evolution змінив��.\n"
-"\n"
-"Зачекайте, доки відбуваєть�� перетворенн� тек..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Спо�іб зберіганн� даних компонента Palm Sync змінив��.\n"
-"\n"
-"Зачекайте, доки відбуваєть�� перетворенн� даних �инхронізації з Palm Sync..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "Віджет вибору джерела"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "Цей віджет показує групи з адре�них книг"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "Зберегти �к VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "К_опіювати контакти у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Копіювати контакти з виділеної адре�ної книги у іншу книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "В_идалити адре�ну книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "Видалити обрану адре�ну книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "Пере_мі�тити контакти у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "Перемі�тити контакти з виділеної адре�ної книги у іншу адре�ну книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "_�ова адре�на книга"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "Вла�тиво�ті адре�ної _книги"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "Показати вла�тиво�ті вибраної адре�ної книги"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
 #: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/mail/e-mail-shell-view-actions.c:905
 msgid "_Rename..."
 msgstr "Перей_менувати..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "Перейменувати виділену адре�ну книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "З_берегти адре�ну книгу у форматі VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Зберегти контакти з обраної адре�ної книги у форматі vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "Зупинити завантаженн�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "_Копіювати контакт у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "Копіювати вибрані контакти у іншу адре�ну книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "В_идалити контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "З_найти у контактах..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "Пошук тек�ті у показаному повідомленні"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "_Пере�лати контакт..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "Віді�лати виділені контакти іншій о�обі"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "Пере_мі�тити контакт у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "Перемі�тити вибрані контакти у іншу адре�ну книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "_Створити контакт..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "Створити �_пи�ок контактів..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "_Відкрити контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "Перегл�нути поточний контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "_Віді�лати повідомленн� за контактом..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "�аді�лати повідомленн� до обраних контактів"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
 #: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "_Actions"
 msgstr "Ді_ї"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 #: ../modules/calendar/e-memo-shell-view-actions.c:647
 #: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1094
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "_Preview"
 msgstr "_Попередній перегл�д"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
 #: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Delete"
 msgstr "В_идалити"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "В_ла�тиво�ті"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "З_берегти �к VCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "_Попередній перегл�д контакту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "Показати вікно перегл�ду контакту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 #: ../modules/calendar/e-memo-shell-view-actions.c:717
 #: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Classic View"
 msgstr "_Кла�ичний вигл�д"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "Показувати попередній перегл�д контактів нижче �пи�ку контактів"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 #: ../modules/calendar/e-memo-shell-view-actions.c:724
 #: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Vertical View"
 msgstr "_Вертикальний вигл�д"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "Показувати попередній перегл�д контактів поруч зі �пи�ком контактів"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
 #: ../modules/calendar/e-task-shell-view-actions.c:905
 msgid "Any Category"
 msgstr "Будь-�ка категорі�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
 #: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Unmatched"
 msgstr "Інше"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
 #: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
-#: ../shell/e-shell-content.c:516
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../shell/e-shell-content.c:438
 msgid "Advanced Search"
 msgstr "Розширений пошук"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "Друкувати в�іх виділених контактів"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "Попередній перегл�д контактів дл� друку"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "�адрукувати виділені контакти"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Зберегти �к VCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "Зберегти виділені контакти �к vCard"
 
@@ -14711,57 +14310,47 @@ msgstr "Інформаці� про контакт"
 msgid "Contact information for %s"
 msgstr "Інформаці� про контакт дл� %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "�нонімно"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "Пере_гл�дати книгу до до��гненн� ліміту ча�у"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "_Ім'�:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "Один"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Фільтр пошуку"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "_База пошуку:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "_Фільтр пошуку:"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14770,51 +14359,51 @@ msgstr ""
 "буде виконувати�ь пошук об'єкту типу \"person\"."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "В�і нижчі рівні"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "Підтримувані бази пошуку"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "Викори�товуючи відокремлене ім'� (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "За електронною адре�ою"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "_Обмеженн� завантаженн�:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "З_найти можливі бази пошуку"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "_Метод авторизації:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "Діапазон по_шуку:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_Затримка:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Викори�товувати захищене з'єднанн�:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "картки"
 
@@ -14840,11 +14429,11 @@ msgstr "_Імпорт у завданн�"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-migrate.c:176
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "У мережі"
 
@@ -14854,7 +14443,7 @@ msgid "Weather"
 msgstr "Погода"
 
 #: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Дні народженн� та річниці"
 
@@ -14864,7 +14453,7 @@ msgid "_Appointment"
 msgstr "З_у�тріч"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "Створити нову зу�тріч"
 
@@ -14892,43 +14481,15 @@ msgid "Cale_ndar"
 msgstr "Кале_ндар"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "Створити новий календар"
 
 #: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../plugins/itip-formatter/itip-formatter.c:2646
 msgid "Calendar and Tasks"
 msgstr "Календар та завданн�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "Реє�тр календарів"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-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 ""
-"Розташуванн� та ієрархі� тек календарів Evolution змінили�ь з вер�ії 1.x.\n"
-"\n"
-"Відбуваєть�� перетворенн� тек дл� нової вер�ії..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "�е вдаєть�� перетворити �тарі параметри з evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "�е вдаєть�� перетворити календар '%s'"
-
 #: ../modules/calendar/e-cal-shell-sidebar.c:167
 #: ../modules/calendar/e-memo-shell-sidebar.c:162
 #: ../modules/calendar/e-task-shell-sidebar.c:162
@@ -14948,26 +14509,6 @@ msgstr "Завантаженн� календарів"
 msgid "Calendar Selector"
 msgstr "Вибір календар�"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "Віджет навігатора дати"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "Цей віджет показує мініатюрний календар"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "Типовий клієнт календар�"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "Типовий клієнт дл� операцій з календарем"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "Цей віджет показує групи календар�"
-
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-cal-shell-sidebar.c:950
 #, c-format
@@ -15016,115 +14557,111 @@ msgstr "поді�"
 msgid "Save as iCalendar"
 msgstr "Зберегти �к iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "_Копіювати..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "D_elete Calendar"
 msgstr "В_идалити календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Delete the selected calendar"
 msgstr "Видалити виділений календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Go Back"
 msgstr "Перейти назад"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Go Forward"
 msgstr "Перейти вперед"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "Вибрати _�ьогодні"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "Виділити �ьогоднішній день"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "Виділити _дати"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "Виділити вказану дату"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "_Створити календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 #: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Purg_e"
 msgstr "О_чи�тити"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Purge old appointments and meetings"
 msgstr "Очи�тити �тарі зу�трічі та за�іданн�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
 #: ../modules/calendar/e-task-shell-view-actions.c:727
 msgid "Re_fresh"
 msgstr "О_новити"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Refresh the selected calendar"
 msgstr "Оновити виділений календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Rename the selected calendar"
 msgstr "Перейменувати виділений календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Show _Only This Calendar"
 msgstr "Показувати _лише цей календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Cop_y to Calendar..."
 msgstr "_Копіювати у календар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "_Запланувати за�іданн�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delete Appointment"
 msgstr "В_идалити зу�тріч"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete selected appointments"
 msgstr "Видалити виділену зу�тріч"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete This _Occurrence"
 msgstr "Видалити цей _екземпл�р"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "Видалити цей екземпл�р"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete All Occ_urrences"
 msgstr "Видалити _в�і екземпл�ри"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "Видалити в�і екземпл�ри"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "New All Day _Event..."
 msgstr "Створити _щоденну подію..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Create a new all day event"
 msgstr "Створити нову щоденну подію"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
@@ -15132,124 +14669,128 @@ msgstr "Створити нову щоденну подію"
 msgid "_Forward as iCalendar..."
 msgstr "Пере�_лати �к iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "New _Meeting..."
 msgstr "Створити за_�іданн�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Create a new meeting"
 msgstr "Створити новий запит на за�іданн�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "Пере_мі�тити у календар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "Створити з_у�тріч..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "Зробити цей екземпл�р пере_міщуваним"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "_Відкрити зу�тріч"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "Перегл�нути поточну зу�тріч"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "_Відпові�ти"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Зберегти �к iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "_Запланувати за�іданн�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Перетворює зу�тріч на за�іданн�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "_Перетворити на зу�тріч..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Перетворює за�іданн� на зу�тріч"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+msgid "Quit"
+msgstr "Вийти"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "День"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "Показати один день"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "Спи�ок"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "Показувати �к �пи�ок"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "Мі��ць"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "Показати один мі��ць"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "Тиждень"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "Показати один тиждень"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Show one work week"
 msgstr "Показати один робочий тиждень"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "�ктивні зу�трічі"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "Зу�трічі на на�тупний тиждень"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
 #: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Description contains"
 msgstr "Опи� мі�тить"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
 #: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Summary contains"
 msgstr "Зведенн� мі�тить"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "�адрукувати цей календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 msgid "Preview the calendar to be printed"
 msgstr "Перегл�нути перегл�д календар� при друку"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "Перейти"
 
@@ -15382,14 +14923,6 @@ msgstr "Сп_и�ок приміток"
 msgid "Create a new memo list"
 msgstr "Створити новий �пи�ок приміток"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "Реє�тр �пи�ків приміток"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "Модель таблиці приміток"
-
 #: ../modules/calendar/e-memo-shell-sidebar.c:221
 msgid "Loading memos"
 msgstr "Завантаженн� приміток"
@@ -15398,18 +14931,6 @@ msgstr "Завантаженн� приміток"
 msgid "Memo List Selector"
 msgstr "Вибір �пи�ку приміток"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "Типовий клієнт дл� приміток"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "Типовий клієнт дл� роботи з примітками"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "Цей віджет показує групи зі �пи�ків приміток"
-
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-memo-shell-sidebar.c:868
 #, c-format
@@ -15527,31 +15048,6 @@ msgstr "Спи�ок _завдань"
 msgid "Create a new task list"
 msgstr "Створити новий �пи�ок завдань"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "Реє�тр �пи�ків завдань"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "Модель таблиці задач"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Розташуванн� та ієрархі� тек контактів Evolution змінили�ь з вер�ії 1.x.\n"
-"\n"
-"Відбуваєть�� перетворенн� тек дл� нової вер�ії..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "�е вдаєть�� відкрити завданн� '%s'"
-
 #: ../modules/calendar/e-task-shell-sidebar.c:221
 msgid "Loading tasks"
 msgstr "Завантаженн� завдань"
@@ -15560,18 +15056,6 @@ msgstr "Завантаженн� завдань"
 msgid "Task List Selector"
 msgstr "Вибір �пи�ку задач"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "Типовий клієнт дл� задач"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "Типовий клієнт дл� операцій із задачами"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "Цей віджет показує групи із �пи�ків задач"
-
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-task-shell-sidebar.c:868
 #, c-format
@@ -15708,354 +15192,323 @@ msgid "Delete Task"
 msgstr "Видалити завданн�"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, c-format
 msgid "%d attached messages"
 msgstr "%d вкладених повідомлень"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "�емає"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:164
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Поштове повідомленн�"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:166
 msgid "Compose a new mail message"
 msgstr "Створити нове поштове повідомленн�"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:174
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Поштова _тека"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:176
 msgid "Create a new mail folder"
 msgstr "Створити нову поштову теку"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Mail Accounts"
 msgstr "Облікові запи�и"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:203
 msgid "Mail Preferences"
 msgstr "Параметри пошти"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgid "Composer Preferences"
 msgstr "Параметри редактора"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:219
 msgid "Network Preferences"
 msgstr "Параметри мережі"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "Групувати за гілками"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "Чи групувати повідомленн� за гілками обговоренн�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:859
+#: ../modules/mail/e-mail-shell-view-actions.c:814
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "В_имкнути обліковий запи�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:861
+#: ../modules/mail/e-mail-shell-view-actions.c:816
 msgid "Disable this account"
 msgstr "Вимкнути цей обліковий запи�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:868
+#: ../modules/mail/e-mail-shell-view-actions.c:823
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "О�таточно знищити з у�іх тек в�і повідомленн�, що позначені видаленими"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:873
+#: ../modules/mail/e-mail-shell-view-actions.c:828
 msgid "C_reate Search Folder From Search..."
 msgstr "Створити _віртуальну теку за результатами пошуку..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view-actions.c:835
 msgid "_Download Messages for Offline Usage"
 msgstr "_Завантажити повідомленн� дл� автономної роботи"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:837
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Завантажити повідомленн� облікових запи�ів/каталогів дл� автономної роботи"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../modules/mail/e-mail-shell-view-actions.c:842
 msgid "Fl_ush Outbox"
 msgstr "�аді�лати ви_хідні"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:849
 msgid "_Copy Folder To..."
 msgstr "_Копіювати теку у..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:896
+#: ../modules/mail/e-mail-shell-view-actions.c:851
 msgid "Copy the selected folder into another folder"
 msgstr "Скопіювати вибрану теку у іншу теку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:858
 msgid "Permanently remove this folder"
 msgstr "О�таточно видалити цю теку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:908
+#: ../modules/mail/e-mail-shell-view-actions.c:863
 msgid "E_xpunge"
 msgstr "Вик_ре�лити"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:910
+#: ../modules/mail/e-mail-shell-view-actions.c:865
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Знищити в�і повідомленн�, позначені �к видалені з цієї теки"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:870
 msgid "Mar_k All Messages as Read"
 msgstr "Позначити повідомленн� �к про_читані"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:872
 msgid "Mark all messages in the folder as read"
 msgstr "Позначити в�і повідомленн� у піці та вкладених теках �к прочитані"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:922
+#: ../modules/mail/e-mail-shell-view-actions.c:877
 msgid "_Move Folder To..."
 msgstr "Пере_мі�тити теку у..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:879
 msgid "Move the selected folder into another folder"
 msgstr "Перемі�тити вибрану теку у іншу теку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:884
 msgid "_New..."
 msgstr "_Створити..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:886
 msgid "Create a new folder for storing mail"
 msgstr "Створити нову теку дл� зберіганн� пошти"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:893
 msgid "Change the properties of this folder"
 msgstr "Змінити вла�тиво�ті цієї теки"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:900
 msgid "Refresh the folder"
 msgstr "Оновити теку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:907
 msgid "Change the name of this folder"
 msgstr "Змінити назву цієї теки"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:912
 msgid "Select Message _Thread"
 msgstr "Виділити _гілку повідомленн�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:914
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Виділити в�і повідомленн� у гілці вибраного повідомленн�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:964
+#: ../modules/mail/e-mail-shell-view-actions.c:919
 msgid "Select Message S_ubthread"
 msgstr "Виділити _збірку повідомлень"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:921
 msgid "Select all replies to the currently selected message"
 msgstr "Виділити в�і відповіді на поточні виділені повідомленн�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:926
 msgid "_Unsubscribe"
 msgstr "_Відмовити�ь від підпи�ки"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:928
 msgid "Unsubscribe from the selected folder"
 msgstr "Відпи�ати�� від виділеної теки"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:933
 msgid "Empty _Trash"
 msgstr "О_чи�тити теку \"Видалені\""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:935
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Стерти в у�іх облікових запи�ах повідомленн�, що позначені видаленими"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:940
 msgid "_New Label"
 msgstr "_�ова позначка"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:994
+#: ../modules/mail/e-mail-shell-view-actions.c:949
 msgid "N_one"
 msgstr "_�емає"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
-msgid "Hide _Read Messages"
-msgstr "Сховати про_читані повідомленн�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1003
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Тимча�ово прибрати в�і прочитані повідомленн�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1008
-msgid "Hide S_elected Messages"
-msgstr "Сховати виді_лені повідомленн�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1010
-msgid "Temporarily hide the selected messages"
-msgstr "Тимча�ово прибрати вибрані повідомленн�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
-msgid "Show Hidde_n Messages"
-msgstr "Показати �_ховані повідомленн�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1017
-msgid "Show messages that have been temporarily hidden"
-msgstr "Знову показати тимча�ово прибрані повідомленн�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:972
 msgid "Cancel the current mail operation"
 msgstr "Ска�увати поточну поштову операцію"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:977
 msgid "Collapse All _Threads"
 msgstr "Згорнути у�і _гілки"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:979
 msgid "Collapse all message threads"
 msgstr "Згорнути у�і гілки повідомлень"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:984
 msgid "E_xpand All Threads"
 msgstr "_Розгорнути гілки"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:986
 msgid "Expand all message threads"
 msgstr "розгорнути у�і гілки повідомлень"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:991
 msgid "_Message Filters"
 msgstr "_Фільтри повідомлень"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:993
 msgid "Create or edit rules for filtering new mail"
 msgstr "Створити або редагувати правила фільтрації пошти"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:998
 msgid "Search F_olders"
 msgstr "Пошук _тек"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
 msgid "Create or edit search folder definitions"
 msgstr "Створити або редагувати визначенн� теки пошуку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
 msgid "_Subscriptions..."
 msgstr "_Підпи�ка..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Підпи�ати�� або відпи�ати�� від тек на віддалених �ерверах"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
 msgid "F_older"
 msgstr "_Тека"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "_Label"
 msgstr "_Позначка"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "_New Folder..."
 msgstr "_Створити теку..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
-msgid "Hide _Deleted Messages"
-msgstr "Сховати в_идалені повідомленн�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Приховувати видалені повідомленн� замі�ть відображенн� їх перекре�леними"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Show Message _Preview"
 msgstr "_Попередній перегл�д повідомленн�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "Show message preview pane"
 msgstr "Показати вікно попереднього перегл�ду повідомлень"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#, fuzzy
+msgid "Show _Deleted Messages"
+msgstr "Показати видалені повідомленн�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#, fuzzy
+msgid "Show deleted messages with a line through them"
+msgstr ""
+"Показувати видалені повідомленн� (�к перекре�лені) у �пи�ку повідомлень."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "_Group By Threads"
 msgstr "Групувати за _гілками"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Threaded message list"
 msgstr "Спи�ок підшитих повідомлень"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Show message preview below the message list"
 msgstr "Показувати попередній перегл�д повідомленн� нижче �пи�ку повідомлень"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Show message preview alongside the message list"
 msgstr ""
 "Показувати попередній перегл�д повідомленн� поруч зі �пи�ком повідомлень"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
 msgid "All Messages"
 msgstr "У�і повідомленн�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
 msgid "Important Messages"
 msgstr "�а�тупне повідомленн�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Last 5 Days' Messages"
 msgstr "О�танні повідомленн� за 5 діб"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Messages Not Junk"
 msgstr "Повідомленн� не є �памом"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "Messages with Attachments"
 msgstr "Повідомленн� з вкладенн�ми"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
 msgid "No Label"
 msgstr "�емає позначки"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1248
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Read Messages"
 msgstr "Прочитати повідомленн�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1255
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "Recent Messages"
 msgstr "�едавні повідомленн�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "Unread Messages"
 msgstr "�епрочитане повідомленн�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Subject or Addresses contain"
 msgstr "Тема або адре�и мі�т�ть"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "All Accounts"
 msgstr "У�і облікові запи�и"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Current Account"
 msgstr "Поточний обліковий запи�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Current Folder"
 msgstr "Поточна тека"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:880
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -16063,7 +15516,7 @@ msgstr[0] "%d виділено"
 msgstr[1] "%d виділено"
 msgstr[2] "%d виділено"
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:891
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -16071,8 +15524,8 @@ msgstr[0] "%d видалено"
 msgstr[1] "%d видалено"
 msgstr[2] "%d видалено"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:897
+#: ../modules/mail/e-mail-shell-view-private.c:904
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -16080,7 +15533,7 @@ msgstr[0] "%d �пам"
 msgstr[1] "%d �пам"
 msgstr[2] "%d �пам"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:910
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -16088,7 +15541,7 @@ msgstr[0] "%d чернетка"
 msgstr[1] "%d чернетки"
 msgstr[2] "%d чернеток"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:916
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -16096,7 +15549,7 @@ msgstr[0] "%d не віді�лано"
 msgstr[1] "%d не віді�лано"
 msgstr[2] "%d не віді�лано"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:922
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -16104,7 +15557,7 @@ msgstr[0] "%d віді�лано"
 msgstr[1] "%d віді�лано"
 msgstr[2] "%d віді�лано"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:934
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16112,7 +15565,7 @@ msgstr[0] "%d не прочитане"
 msgstr[1] "%d не прочитаних"
 msgstr[2] "%d не прочитаних"
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:937
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16132,76 +15585,76 @@ msgstr "Поточний обліковий запи�"
 msgid "Proxy _Logout"
 msgstr "Ви_хід з прок�і"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "�ктивно"
+
+#: ../modules/mail/em-composer-prefs.c:476
 msgid "Language(s)"
 msgstr "Мова"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "Кожен раз"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "Раз на день"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "Раз на тиждень"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "Раз на мі��ць"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:220
 msgid "Add Custom Junk Header"
 msgstr "Додати інший заголовок дл� �паму"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:224
 msgid "Header Name:"
 msgstr "�азва заголовку:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:225
 msgid "Header Value Contains:"
 msgstr "Значенн� заголовку мі�тить:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:324
 msgid "Header"
 msgstr "Верхній колонтитул"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:328
 msgid "Contains Value"
 msgstr "Мі�тить значенн�"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:721 ../modules/mail/em-mailer-prefs.c:792
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Модуль %s до�тупний та відповідний виконуваний код в�тановлено."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:729 ../modules/mail/em-mailer-prefs.c:801
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "Модуль %s недо�тупний. Перевірте, що відповідний пакет в�тановлено."
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:765
 msgid "No junk plugin available"
 msgstr "Модуль роботи зі �памом недо�тупний"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "Стовпчик _таблиці:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1152
 msgid "_Date header:"
 msgstr "З_аголовок дати:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1153
 msgid "Show _original header value"
 msgstr "Показувати _первинне значенн� заголовку"
 
@@ -16237,16 +15690,8 @@ msgstr ""
 "Спи�ок ключів дл� модул� �повіщенн� про забуті вкладенн� дл� пошуку у тілі "
 "ли�та"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Спи�ок ключів дл� модул� �повіщенн� про забуті вкладенн� дл� пошуку у тілі "
-"ли�та."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:506
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "Ключові �лова"
 
@@ -16329,7 +15774,8 @@ msgid "Restore from backup"
 msgstr "Відновити з архіву"
 
 #: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
+#, fuzzy
+msgid "_Backup Evolution Settings..."
 msgstr "З_берегти параметри..."
 
 #: ../plugins/backup-restore/backup-restore.c:355
@@ -16337,7 +15783,8 @@ msgid "Backup Evolution data and settings to an archive file"
 msgstr "Зберегти дані та параметри Evolution у архівний файл"
 
 #: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
+#, fuzzy
+msgid "R_estore Evolution Settings..."
 msgstr "Відновити _параметри..."
 
 #: ../plugins/backup-restore/backup-restore.c:362
@@ -16508,37 +15955,38 @@ msgstr ""
 "Якщо потрібно, щоб Evolution перезапу�тила�ь пі�л� відновленн�, увімкніть "
 "відповідний параметр."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "�втоматичні контакти"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "_�втоматично �творювати запи�и у адре�ній книзі при над�иланні повідомлень"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "Вибрати адре�ну книгу дл� автоматичних контактів"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Контакти миттєвих повідомлень"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+#, fuzzy
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Періодично �инхронізує інформацію та зображенн� зі �пи�ку контактів Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Виберіть адре�ну книгу дл� �пи�ку контактів Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Синхронізувати зі �пи�ком _контактів зараз"
 
@@ -16560,33 +16008,33 @@ msgstr ""
 "відповідаєте на повідомленн�. Також заповнює контактні дані зі �пи�ку "
 "контактів �лужби миттєвих повідомлень."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter недо�тупний. В�тановіть його."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Виникла помилка, при виконанні %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Дочірній проце� Bogofilter не відповідає, завершенн�..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Очікуванн� дочірнього проце�у Bogofilter перервано, завершенн�..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Помилка каналу дл� Bogofilter, код помилки: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:392
 msgid "Convert message text to _Unicode"
 msgstr "Перетворити тек�т ли�та на _Unicode"
 
@@ -16994,7 +16442,7 @@ msgid "Key"
 msgstr "Ключ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "Значенн�"
 
@@ -17018,7 +16466,7 @@ msgstr ""
 "клавіша"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:118
 msgid "Automatically launch when a new mail is edited"
 msgstr "�втоматично запу�кати при редагуванні нової пошти"
 
@@ -17030,11 +16478,11 @@ msgstr "Типовий зовнішній редактор"
 msgid "The default command that must be used as the editor."
 msgstr "Команда дл� запу�ку типового редактора."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:107
 msgid "Command to be executed to launch the editor: "
 msgstr "Команда дл� запу�ку редактора: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:108
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17042,8 +16490,8 @@ msgstr ""
 "Дл� Emacs викори�товуйте \"xemacs\"\n"
 "Дл� VI викори�товувати \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:374
+#: ../plugins/external-editor/external-editor.c:376
 msgid "Compose in External Editor"
 msgstr "Створювати повідомленн� _у зовнішньому редакторі"
 
@@ -17179,8 +16627,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:717
+#: ../plugins/mail-to-task/mail-to-task.c:933
 msgid "Unknown error."
 msgstr "�евідома помилка."
 
@@ -17200,7 +16648,7 @@ msgstr "Додати календар Google до Evolution."
 msgid "Google Calendars"
 msgstr "Календарі Google"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Перелік"
 
@@ -17232,12 +16680,12 @@ msgstr "Прийн�ти ек�периментально"
 msgid "Rese_nd Meeting..."
 msgstr "Повторно _наді�лати за�іданн�..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:345
 msgid "Create folder"
 msgstr "Створенн� теки"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:217
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17262,11 +16710,11 @@ msgstr ""
 "�ати�ніть \"Далі\", щоб в�тановити �пільну теку\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:229
 msgid "Install the shared folder"
 msgstr "В�тановити �пільну теку"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:233
 msgid "Shared Folder Installation"
 msgstr "В�тановленн� �пільної теки"
 
@@ -17306,11 +16754,11 @@ msgstr "Спи�ок _�паму"
 msgid "_Remove"
 msgstr "В_идалити"
 
-#: ../plugins/groupwise-features/mail-retract.c:81
+#: ../plugins/groupwise-features/mail-retract.c:79
 msgid "Message Retract"
 msgstr "Відкликанн� повідомленн�"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:84
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -17318,7 +16766,7 @@ msgstr ""
 "Відкликанн� повідомленн� може �причинити його видаленн� з поштової �криньки "
 "отримувача. Ви �правді хочете відкликати повідомленн�?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:105
 msgid "Message retracted successfully"
 msgstr "Повідомленн� у�пішно вт�гнуто"
 
@@ -17524,43 +16972,50 @@ msgstr "<b>�азва облікового запи�у</b>"
 msgid "Proxy Login"
 msgstr "Обліковий запи� прок�і"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sВведіть пароль дл� %s (кори�тувач %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:690
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Вкладка прок�і буде до�тупна лише пі�л� увімкненн� облікового запи�у."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Вкладка прок�і буде до�тупна лише пі�л� увімкненн� облікового запи�у."
 
-#: ../plugins/groupwise-features/proxy.c:931
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+#, fuzzy
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Прок�і"
+
+#: ../plugins/groupwise-features/proxy.c:929
 #: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "Додати кори�тувача"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "Додаткові параметри над�иланн�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:312
 #: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "Кори�тувачі"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:313
 msgid "Enter the users and set permissions"
 msgstr "Введіть кори�тувачів та в�тановити"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:410
 msgid "Sharing"
 msgstr "Спільний до�туп"
 
@@ -17572,63 +17027,55 @@ msgstr "Додаткове �повіщенн�"
 msgid "Add   "
 msgstr "Додати  "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:121
 msgid "Message Status"
 msgstr "Стан повідомленн�"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:135
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:149
 msgid "From:"
 msgstr "Від:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:164
 msgid "Creation date:"
 msgstr "Дата �творенн�:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Recipient: "
 msgstr "Отримувач: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:211
 msgid "Delivered: "
 msgstr "До�тавлено: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Opened: "
 msgstr "Відкрито: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Accepted: "
 msgstr "Прийн�то: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Deleted: "
 msgstr "Видалено: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:232
 msgid "Declined: "
 msgstr "Відхилено: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:237
 msgid "Completed: "
 msgstr "Виконано: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Undelivered: "
 msgstr "�е привілейований: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Додати до Evolution підтримку Hula."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Підтримка Hula"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Вбудований показ"
@@ -17637,12 +17084,12 @@ msgstr "Вбудований показ"
 msgid "View image attachments directly in mail messages."
 msgstr "Показувати вкладені зображенн� безпо�ередньо у поштовому повідомленні"
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:325
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "О�обливі заголовки"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:338
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "Заголовки IMAP"
@@ -17690,141 +17137,141 @@ msgstr "�алаштувати облікові запи�и IMAP."
 msgid "IMAP Features"
 msgstr "Можливо�ті IMAP"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/itip-formatter/itip-formatter.c:475
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "�е вдаєть�� завантажити календар '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:641
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Зу�тріч у календарі '%s' конфліктує з цим зібранн�м"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:677
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Зу�тріч знайдено у календарі '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Unable to find any calendars"
 msgstr "�е вдаєть�� знайти жоден календар"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find this meeting in any calendar"
 msgstr "�е вдаєть�� знайти цю зу�тріч у жодному календарі"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find this task in any task list"
 msgstr "�е вдаєть�� знайти це завданн� у жодному �пи�ку завдань"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this memo in any memo list"
 msgstr "�е вдаєть�� знайти цю примітку у жодному �пи�ку приміток"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:862
 msgid "Opening the calendar. Please wait.."
 msgstr "Відкриваю календар. Зачекайте, будь-ла�ка..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:865
 msgid "Searching for an existing version of this appointment"
 msgstr "Пошук на�вної вер�ії цієї зу�трічі"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1046
 msgid "Unable to parse item"
 msgstr "�е вдаєть�� розібрати елемент"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "�е вдаєть�� наді�лати календар '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1145
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "�аді�лано у календар '%s' �к прийн�тий"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1149
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "�аді�лано у календар '%s' �к пробний"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1154
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "�аді�лано у календар '%s' �к відхилений"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "�аді�лано у календар '%s' �к �ка�ований"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Організатор видалив уповноваженого %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Sent a cancelation notice to the delegate"
 msgstr "�аді�лано уповноваженому �повіщенн� про �ка�уванн�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1262
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "�е вдаєть�� наді�лати �повіщенн� про �ка�уванн�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1373
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "�е вдаєть�� оновити �тан відвідувача, тому що поточний �тан не правильний"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1402
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "�е вдаєть�� оновити уча�ника. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Attendee status updated"
 msgstr "Стан уча�ника оновлено!"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 msgid "Meeting information sent"
 msgstr "Інформацію про за�іданн� наді�лано"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1435
 msgid "Task information sent"
 msgstr "Інформацію про завданн� наді�лано"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1438
 msgid "Memo information sent"
 msgstr "Інформацію про примітку наді�лано"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "�е вдаєть�� наді�лати інформацію про зу�тріч, зу�тріч не і�нує"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1450
 msgid "Unable to send task information, the task does not exist"
 msgstr "�е вдаєть�� наді�лати інформацію про завданн�, завданн� не і�нує"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "�е вдаєть�� наді�лати інформацію про примітку, примітка не і�нує"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "calendar.ics"
 msgstr "календар.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1523
 msgid "Save Calendar"
 msgstr "Зберегти календар"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 #: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "Вкладений календар недій�ний"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 #: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17832,15 +17279,15 @@ msgstr ""
 "Це повідомленн� за�вл�є, що мі�тить календар, але календар не є дій�ним "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1628
+#: ../plugins/itip-formatter/itip-formatter.c:1656
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "The item in the calendar is not valid"
 msgstr "Елемент календар� - недій�ний"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1629
+#: ../plugins/itip-formatter/itip-formatter.c:1657
+#: ../plugins/itip-formatter/itip-formatter.c:1763
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17848,226 +17295,226 @@ msgstr ""
 "Це повідомленн� мі�тить календар, але календар не мі�тить подій, задач або "
 "відомо�тей про зайн�ті�ть."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1670
 msgid "The calendar attached contains multiple items"
 msgstr "Вкладений календар мі�тить декілька елементів"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1671
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "Щоб обробити у�і елементи, файл треба зберегти та імпортувати календар"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2436
 msgid "This meeting recurs"
 msgstr "Ц� зу�тріч повторюєть��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2439
 msgid "This task recurs"
 msgstr "Це завданн� повторюєть��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2442
 msgid "This memo recurs"
 msgstr "Ц� примітка повторюєть��"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2671
 msgid "_Delete message after acting"
 msgstr "В_идалити повідомленн� пі�л� дії"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2681
+#: ../plugins/itip-formatter/itip-formatter.c:2714
 msgid "Conflict Search"
 msgstr "Пошук конфліктів"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2696
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Виберіть календарі дл� пошуку конфліктуючих за�ідань"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Сьогодні о %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Сьогодні о %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Сьогодні о %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Завтра о %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Завтра о %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Завтра о %I:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Сьогодні о %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 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:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %I:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e %b"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %b %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %b %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %b %I:%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:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %b %I:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %b %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %b %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %b %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %b %Y %I:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %b %Y %I:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Дайте відповідь від імені <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Отримано від імені <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:358
 #, 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:364
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> опублікував на�тупні відомо�ті про за�іданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> запитує про на�тупне за�іданн� дл� ва�:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:368
 #, 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:374
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> запитує вашу при�утні�ть на на�тупному за�іданні:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, 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:382
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> бажає додати до і�нуючого за�іданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18075,88 +17522,88 @@ msgid ""
 msgstr ""
 "<b>%s</b> через %s бажає отримати о�танню інформацію про на�тупне завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:384
 #, 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:392
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> через %s наді�лав на�тупну відповідь про за�іданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> наді�лав на�тупну відповідь про за�іданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> через %s �ка�ував на�тупне за�іданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> �ка�ував на�тупне за�іданн�."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> через %s запропонував на�тупні зміни за�іданн�."
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> запропонував на�тупні зміни за�іданн�."
 
-#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:406
 #, 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:412
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> відхилив на�тупні зміни у за�іданні."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> через %s опублікував на�тупне завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> опублікував на�тупне завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:453
 #, 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:460
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> через %s призначив вам завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> призначив вам завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, 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:470
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> бажає додати до і�нуючого завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18165,7 +17612,7 @@ msgstr ""
 "<b>%s</b> через %s бажає отримати о�танню інформацію про на�тупне призначене "
 "завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18173,193 +17620,193 @@ msgid ""
 msgstr ""
 "<b>%s</b> бажає отримати о�танню інформацію про на�тупне призначене завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> через %s наді�лав на�тупну відповідь на призначене завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> наді�лав на�тупну відповідь на призначене завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:482
 #, 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:488
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> �ка�ував на�тупне призначене завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> через %s запропонував на�тупні зміни назначеного завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> запропонував на�тупні зміни назначеного завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:494
 #, 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:500
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> �ка�ував на�тупні призначені завданн�:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> через %s опублікував на�тупну примітку:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> опублікував на�тупну примітку:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:540
 #, 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:546
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> бажає додати до і�нуючої примітки:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:546
 #, 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:552
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> �ка�ував на�тупну �пільну примітку:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:672
 msgid "All day:"
 msgstr "Ве�ь день:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:682
 msgid "Start day:"
 msgstr "День початку:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:682
+#: ../plugins/itip-formatter/itip-view.c:1041
 msgid "Start time:"
 msgstr "Ча� початку:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:694
 msgid "End day:"
 msgstr "День завершенн�:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:694
+#: ../plugins/itip-formatter/itip-view.c:1052
 msgid "End time:"
 msgstr "Ча� завершенн�:"
 
 #
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:827
 msgid "_Open Calendar"
 msgstr "_Відкрити календар"
 
+#: ../plugins/itip-formatter/itip-view.c:833
 #: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:865
 msgid "_Decline"
 msgstr "Від_хилити"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
-#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:867
 msgid "_Accept"
 msgstr "_Прийн�ти"
 
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:837
 msgid "_Decline all"
 msgstr "Від_хилити в�е"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:838
 msgid "_Tentative all"
 msgstr "_�евизначені у�і"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Tentative"
 msgstr "_�евизначені"
 
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:839
 msgid "_Accept all"
 msgstr "_Прийн�ти в�е"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Send Information"
 msgstr "_�аді�лати інформацію"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Update Attendee Status"
 msgstr "_Оновити �тан уча�ника"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Update"
 msgstr "_Оновити"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1072
+#: ../plugins/itip-formatter/itip-view.c:1126
 msgid "Comment:"
 msgstr "Коментар:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1111
 msgid "Send _reply to sender"
 msgstr "В_ідпові�ти відправнику"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1141
 msgid "Send _updates to attendees"
 msgstr "�аді�лати _оновленн� уча�никам"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1150
 msgid "_Apply to all instances"
 msgstr "За�то�увати до у�іх _запи�ів"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1159
 msgid "Show time as _free"
 msgstr "Показувати ча� �к _зайн�тий"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Preserve my reminder"
 msgstr "З_берегти нагадуванн�"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1168
 msgid "_Inherit reminder"
 msgstr "_У�падковувати нагадуванн�"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1911
 msgid "_Tasks:"
 msgstr "_Завданн�"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Memos:"
 msgstr "_Примітки:"
 
@@ -18470,16 +17917,16 @@ msgstr "Чи має значок блимати."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Чи �повіщати про по�ву нових повідомлень лише у теці Inbox."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:342
 msgid "Evolution's Mail Notification"
 msgstr "Сповіщенн� про нову пошту Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:364
 msgid "Mail Notification Properties"
 msgstr "Вла�тиво�ті �повіщенн� про нову пошту"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:493
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18492,18 +17939,18 @@ msgstr[1] "Отримано %d повідомленн� у %s."
 msgstr[2] "Отримано %d повідомлень у %s."
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:504
 #, c-format
 msgid "From: %s"
 msgstr "Від: %s"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#: ../plugins/mail-notification/mail-notification.c:516
 #, c-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:525
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18511,48 +17958,48 @@ msgstr[0] "Отримано %d нове повідомленн�."
 msgstr[1] "Отримано %d нових повідомленн�."
 msgstr[2] "Отримано %d нових повідомлень."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:543
+#: ../plugins/mail-notification/mail-notification.c:548
 msgid "New email"
 msgstr "�овий ли�т"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:602
 msgid "Show icon in _notification area"
 msgstr "Показувати значок у _обла�ті �повіщенн�"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:630
 msgid "B_link icon in notification area"
 msgstr "Значок у обла�ті �повіщенн� _блимає"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:640
 msgid "Popup _message together with the icon"
 msgstr "Виводити контек�тне _вікно біл� значка"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:825
 msgid "_Play sound when new messages arrive"
 msgstr "П_рогравати звуковий файл при отриманні нової пошти"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:854
 msgid "_Beep"
 msgstr "_Звуковий �игнал"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:867
 msgid "Use sound _theme"
 msgstr "Викори�товувати звукову _тему"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:886
 msgid "Play _file:"
 msgstr "Відтворювати _файл:"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:897
 msgid "Select sound file"
 msgstr "Вибрати звуковий файл"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:955
 msgid "Notify new messages for _Inbox only"
 msgstr "Сповідати про нові повідомленн� лише у теці _Inbox"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:964
 msgid "Generate a _D-Bus message"
 msgstr "Створювати повідомленн� _D-Bus"
 
@@ -18565,26 +18012,26 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Сповіщати про отриманн� нової пошти."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Створено з повідомленн� від %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:488
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr "Виділений календар вже мі�тить подію '%s'. Змінити �тару подію?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:491
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr "Виділений �пи�ок задач вже мі�тить задачу '%s'. Змінити �тару задачу?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:494
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18592,7 +18039,7 @@ msgid ""
 msgstr ""
 "Виділений �пи�ок приміток вже мі�тить примітку '%s'. Змінити �тару примітку?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#: ../plugins/mail-to-task/mail-to-task.c:511
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18600,7 +18047,7 @@ msgstr ""
 "Видалений календар вже мі�тить де�кі елементи дл� даних повідомлень. Дій�но "
 "�творити нові події?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:514
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18608,7 +18055,7 @@ msgstr ""
 "Виділений �пи�ок задач вже мі�тить де�кі задачі дл� даних повідомлень. "
 "Дій�но �творити новий �пи�ок задач?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#: ../plugins/mail-to-task/mail-to-task.c:517
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18616,7 +18063,7 @@ msgstr ""
 "Виділений �пи�ок приміток вже мі�тить де�кі примітки дл� даних повідомлень. "
 "Дій�но �творити новий �пи�ок приміток?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#: ../plugins/mail-to-task/mail-to-task.c:535
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18633,7 +18080,7 @@ msgstr[2] ""
 "Виділений календар вже мі�тить події дл� цього повідомленн�. Створити нові "
 "події попри в�е?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:541
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18650,7 +18097,7 @@ msgstr[2] ""
 "Виділений �пи�ок задач вже мі�тить задачі дл� цього повідомленн�. Створити "
 "нові задачі попри в�е?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/mail-to-task/mail-to-task.c:547
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18667,25 +18114,25 @@ msgstr[2] ""
 "Виділений �пи�ок приміток вже мі�тить примітки дл� цього повідомленн�. "
 "Створити нові примітки попри в�е?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:606
 msgid "[No Summary]"
 msgstr "[�емає зведенн�]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:617
 msgid "Invalid object returned from a server"
 msgstr "Сервер повернув неправильний об'єкт"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:688
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "При обробці виникла помилка: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:717
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "�е вдаєть�� відкрити календар. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:724
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18693,7 +18140,7 @@ msgstr ""
 "Обране джерело до�тупне лише дл� читанн�, тому ви не можете �творювати події "
 "у ньому. Виберіть інше джерело."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:727
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18701,7 +18148,7 @@ msgstr ""
 "Обране джерело до�тупне лише дл� читанн�, тому ви не можете �творювати "
 "задачі у ньому. Виберіть інше джерело."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:730
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18709,40 +18156,40 @@ msgstr ""
 "Обране джерело до�тупне лише дл� читанн�, тому ви не можете �творювати "
 "нотатки у ньому. Виберіть інше джерело."
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:933
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "�е вдаєть�� отримати �пи�ок джерела. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1052
 msgid "Create an _Event"
 msgstr "Створити _подію"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1054
 msgid "Create a new event from the selected message"
 msgstr "Створити нову подію з виділеного повідомленн�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1059
 msgid "Create a Mem_o"
 msgstr "Створити при_мітку"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1061
 msgid "Create a new memo from the selected message"
 msgstr "Створити нову примітку з виділеного повідомленн�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1066
 msgid "Create a _Task"
 msgstr "Створити _завданн�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1068
 msgid "Create a new task from the selected message"
 msgstr "Створити нове завданн� з виділеного повідомленн�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 msgid "Create a _Meeting"
 msgstr "Створити з_у�тріч"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1078
 msgid "Create a new meeting from the selected message"
 msgstr "Створити нову зу�тріч з виділеного повідомленн�"
 
@@ -18750,57 +18197,57 @@ msgstr "Створити нову зуÑ�тріч з виділеного повÑ
 msgid "Convert a mail message to a task."
 msgstr "Перетворити  виділене повідомленн� у нове завданн�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:279
 msgid "Get List _Archive"
 msgstr "Отримати _архів �пи�ку"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:281
 msgid "Get an archive of the list this message belongs to"
 msgstr "Отримати архів �пи�ку роз�илки, до �кого належить це повідомленн�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Usage Information"
 msgstr "Отримати інформацію про _викори�танн� �пи�ку"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 "Отримати інформацію про викори�танн� �пи�ку роз�илки, до �кого належить це "
 "повідомленн�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Contact List _Owner"
 msgstr "_Вла�ник �пи�ку контактів"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "�апи�ати вла�нику �пи�ку роз�илки, до �кого належить повідомленн�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "_Post Message to List"
 msgstr "Віді�лати _повідомленн� у �пи�ок"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Відпові�ти у �пи�ок роз�илки, �кому належить це повідомленн�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Subscribe to List"
 msgstr "П_ідпи�ати�ь на �пи�ок"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Підпи�ати�ь на �пи�ок роз�илки, �кому належить це повідомленн�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Unsubscribe from List"
 msgstr "_Відпи�ати�ь від �пи�ку"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Відпи�ати�ь від �пи�ку роз�илки, �кому належить це повідомленн�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Mailing _List"
 msgstr "Спи�ок _роз�илки"
 
@@ -18892,11 +18339,11 @@ msgstr "_Правка повідомленн�"
 msgid "_Send message"
 msgstr "_�аді�лати повідомленн�"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mark-all-read/mark-all-read.c:41
 msgid "Also mark messages in subfolders?"
 msgstr "Позначити повідомленн� у підтеках?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:44
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18904,15 +18351,15 @@ msgstr ""
 "Позначити повідомленн� прочитаними лише у поточних теках або у теці та у�іх "
 "підтеках?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:167
 msgid "In Current Folder and _Subfolders"
 msgstr "У поточній теці та в_кладених теках"
 
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:181
 msgid "In Current _Folder Only"
 msgstr "Лише у пото_чній теці"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:401
 msgid "Mark Me_ssages as Read"
 msgstr "Позначити п_овідомленн� �к прочитані"
 
@@ -18973,19 +18420,19 @@ msgstr ""
 "Перегл�дати повідомленн� �к звичайний тек�т, навіть �кщо вони мі�т�ть "
 "гіпертек�тову розмітку"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "Показувати HTML, �кщо є"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "Evolution обирає кращу ча�тину дл� показу."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "Показувати про�тий тек�т, �кщо є"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18993,11 +18440,11 @@ msgstr ""
 "Показувати ча�тину з про�тим тек�том, �кщо вона є, інакше Evolution обере "
 "кращу ча�тину дл� оказу."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "Завжди показувати про�тий тек�т"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19005,11 +18452,11 @@ msgstr ""
 "Завжди показувати ча�ину з про�тим тек�том та робити вкладенн� з інших "
 "ча�тин, за потреби."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "_Показувати заборонені ча�тини HTML у вигл�ді вкладень"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "Ре_жим HTML"
 
@@ -19033,31 +18480,31 @@ msgstr "Імпорту Outlook PST"
 msgid "Outlook personal folders (.pst)"
 msgstr "О�оби�ті теки Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:289
 msgid "_Mail"
 msgstr "_Пошта"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:307
 msgid "_Address Book"
 msgstr "_�дре�на книга"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "A_ppointments"
 msgstr "_Зу�трічі"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:320 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Завданн�"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:326
 msgid "_Journal entries"
 msgstr "Запи�и у _журналі"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:341
 msgid "Importing Outlook data"
 msgstr "Імпортуванн� даних Outlook"
 
@@ -19223,47 +18670,47 @@ msgstr "�ова адре�а"
 msgid "Edit Location"
 msgstr "Редагувати адре�у"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin не знайдено, код: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Помилка при �творенні каналу: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Помилка пі�л� гілки: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "Дочірній проце� SpamAssassin не відповідає, завершенн�..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Очікуванн� завершенн� дочірнього проце�у SpamAssassin, завершенн�..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Помилка каналу дл� SpamAssassin, код помилки: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin недо�тупний. В�тановіть його �початку."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Це зробить SpamAssassin надійнішим, проте повільнішим"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
 msgid "I_nclude remote tests"
 msgstr "_Включити віддалені те�ти"
 
@@ -19481,15 +18928,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Модуль шаблонів на о�нові чернеток"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:613
 msgid "No Title"
 msgstr "�емає заголовку"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:684
 msgid "Save as _Template"
 msgstr "Зберегти _шаблон"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:686
 msgid "Save as Template"
 msgstr "Зберегти �к шаблон"
 
@@ -19509,20 +18956,20 @@ msgstr "Вбудовані візитки (vCards)"
 msgid "Show vCards directly in mail messages."
 msgstr "Показувати візитки одразу у поштовому повідомленні"
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:157
+#: ../plugins/vcard-inline/vcard-inline.c:242
 msgid "Show Full vCard"
 msgstr "Показувати в�ю картку"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:160
 msgid "Show Compact vCard"
 msgstr "Показувати компактну картку"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:221
 msgid "There is one other contact."
 msgstr "Є інший контакт."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:230
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
@@ -19530,7 +18977,7 @@ msgstr[0] "Є %d інший контакт."
 msgstr[1] "Є %d інших контактів."
 msgstr[2] "Є %d інших контактів."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:251
 msgid "Save in Address Book"
 msgstr "Зберегти у адре�ній книзі"
 
@@ -19717,7 +19164,7 @@ msgstr "Бічна панель є видимою"
 msgid "Skip development warning dialog"
 msgstr "Чи пропу�кати діалогове вікно попередженн� про те�тову вер�ію"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:306
 msgid "Start in offline mode"
 msgstr "Запу�к у автономному режимі"
 
@@ -19876,143 +19323,46 @@ msgstr "Стиль кнопок вікон"
 msgid "Window buttons are visible"
 msgstr "Кнопки вікон видимі"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:499 ../shell/e-shell-content.c:500
 msgid "Searches"
 msgstr "Пошуки"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:541
 msgid "Save Search"
 msgstr "Зберегти результати пошуку"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld кБ"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "_Показати:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "З_найти:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr " _у "
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "Стиль панелі ін�трументів"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "Стиль панелі ін�трументів перемикачів"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "Панель ін�трументів є видимою"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "Чи є перемикач видимим."
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "У�і файли (*)"
 
-#: ../shell/e-shell-view.c:681
-msgid "Switcher Action"
-msgstr "Ді� перемикача"
-
-#: ../shell/e-shell-view.c:682
-msgid "The switcher action for this shell view"
-msgstr "Ді� перемикача дл� цього типу оболонки"
-
-#: ../shell/e-shell-view.c:697
-msgid "Page Number"
-msgstr "�омер �торінки"
-
-#: ../shell/e-shell-view.c:698
-msgid "The notebook page number of the shell view"
-msgstr "�омер �торінки запи�ника вигл�ду оболонки"
-
-#: ../shell/e-shell-view.c:714
-msgid "Search Rule"
-msgstr "Правило пошуку"
-
-#: ../shell/e-shell-view.c:715
-msgid "Criteria for the current search results"
-msgstr "Критерій дл� поточних результатів пошуку"
-
-#: ../shell/e-shell-view.c:730
-msgid "The EShellBackend for this shell view"
-msgstr "EShellBackend дл� цього типу оболонки"
-
-#: ../shell/e-shell-view.c:745
-msgid "Shell Content Widget"
-msgstr "Віджет змі�ту оболонки"
-
-#: ../shell/e-shell-view.c:746
-msgid "The content widget appears in a shell window's right pane"
-msgstr "Змі�т віджета виводить�� у правій панелі вікна оболонки"
-
-#: ../shell/e-shell-view.c:762
-msgid "Shell Sidebar Widget"
-msgstr "Віджет бокової панелі оболонки"
-
-#: ../shell/e-shell-view.c:763
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "Змі�т віджету виводить�� у лівій панелі вікна оболонки"
-
-#: ../shell/e-shell-view.c:778
-msgid "Shell Taskbar Widget"
-msgstr "Віджет панелі задач оболонки"
-
-#: ../shell/e-shell-view.c:779
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "Віджет панелі задач з'�вл�єть�� у нижній ча�тині вікна оболонки"
-
-#: ../shell/e-shell-view.c:794
-msgid "Shell Window"
-msgstr "Вікно оболонки"
-
-#: ../shell/e-shell-view.c:795
-msgid "The window to which the shell view belongs"
-msgstr "Вікно, �кому належить вигл�д оболонки"
-
-#: ../shell/e-shell-view.c:811
-msgid "The key file holding widget state data"
-msgstr "Ключовий файл, що мі�тить �тан даних віджета"
-
-#: ../shell/e-shell-view.c:826
-msgid "The title of the shell view"
-msgstr "Заголовок вигл�ду оболонки"
-
-#: ../shell/e-shell-view.c:840
-msgid "Current View ID"
-msgstr "ID поточного вигл�ду"
-
-#: ../shell/e-shell-view.c:841
-msgid "The current GAL view ID"
-msgstr "ID поточного огл�ду GAL"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -20315,117 +19665,29 @@ msgid "Execute these search parameters"
 msgstr "Виконати ці параметри пошуку"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:571
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "Створити"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "Поточний вигл�д оболонки"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "�азва поточного вигл�ду оболонки"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "EFocusTracker вікна оболонки"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "Геометрі�"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "Р�док початкової геометрії вікна"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Безпечний режим"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Чи знаходить�� вікно оболонки у безпечному режимі"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "Бічна панель видима"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "Чи показувати бічну панель вікна оболонки"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "Перемикач видимий"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Чи показувати кнопки перемикача вікна оболонки"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "Панель задач видима"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "Чи показувати панель задач вікна оболонки"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Чи показувати панель задач вікна оболонки"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "Менеджер інтерфей�у"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "GtkUIManager вікна оболонки"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "Підготовка до виходу з мережі..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "Підготовка до входу у мережу..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "Підготовка до виходу..."
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "Каталог модулів"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "Каталог, з �кого завантажувати EModule"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "Мережа до�тупна"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "Чи до�тупна мережа"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "У мережі"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "Чи знаходить�� оболонка у мережі"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:163
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20460,7 +19722,7 @@ msgstr ""
 "Сподіваємо�ь вам �подобаєть�� результат нашої праці, та\n"
 "ми з нетерпінн�м чекаємо на ваші вне�ки!\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:187
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20468,59 +19730,55 @@ msgstr ""
 "Д�куємо\n"
 "Команда розробників Evolution\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:194
 msgid "Do not tell me again"
 msgstr "Більше не нагадувати"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:302
 msgid "Start Evolution activating the specified component"
 msgstr "Запу�к Evolution з активуванн�м вказаного компоненту"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:304
 msgid "Apply the given geometry to the main window"
 msgstr "За�то�увати цю геометрію до головного вікна"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:308
 msgid "Start in online mode"
 msgstr "Запу�к у режимі підключенн� до мережі"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:310
 msgid "Start in \"express\" mode"
 msgstr "Запу�к у режимі \"ек�пре�\""
 
-#: ../shell/main.c:333
+#: ../shell/main.c:313
 msgid "Forcibly shut down Evolution"
 msgstr "Приму�ове завершенн� роботи Evolution"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Приму�ова повторна міграці� з Evolution 1.4"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:316
 msgid "Send the debugging output of all components to a file."
 msgstr "Запи�увати інформацію налагодженн� в�іх компонентів у файл."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "Заборонити завантаженн� будь-�ких модулів"
 
-#: ../shell/main.c:344
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Вимкнути обла�ть перегл�ду пошити, контактів та задач."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:324
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Імпортувати URI чи імена файлів вказані у решті аргументів."
 
-#: ../shell/main.c:350
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "Запит на завершенн� запущеного проце�у Evolution"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:441
 msgid "- The Evolution PIM and Email Client"
 msgstr "- клієнт миттєвих повідомлень та пошти Evolutuion"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:467
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20534,96 +19792,44 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Ви дій�но бажаєте видалити у�і збережені паролі?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Продовжити"
+#, fuzzy
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Видалити �тарі дані з вер�ії {0}?"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Видалити �тарі дані з вер�ії {0}?"
+#, fuzzy
+msgid "Continue Anyway"
+msgstr "Продовжити"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "Виконанн� цієї команди призведе до забуванн� у�іх паролів. При потребі, "
 "паролі будуть запитані знову."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "�едо�татньо ди�кового про�тору дл� оновленн�."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "Дій�но видалити �тарі дані?"
+#, fuzzy
+msgid "Quit Now"
+msgstr "Вийти"
 
 #: ../shell/shell.error.xml.h:8
-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 ""
-"Ве�ь вмі�т теки &quot;evolution&quot;  буде о�таточно видалений\n"
-"\n"
-"Вважаєть��, що ви вручну перевірили, що в�� ваша пошта, контакти, та "
-"календар у�пішно перене�ені, та нова вер�і� Evolution працює коректно.\n"
-"\n"
-"Пі�л� видаленн�, ви не зможете повернути�ь до попередньої вер�ії Evolution "
-"без ручного втручанн�.\n"
-
-#: ../shell/shell.error.xml.h:14
-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 ""
-"У попередній вер�ії evolution дані зберігали�ь у іншому мі�ці.\n"
-"\n"
-"Якщо ви виберете видалити цих даних, ве�ь вмі�т каталогу &quot;"
-"evolution&quot; буде о�таточно знищений.  Якщо ви виберете зберегти ці дані, "
-"ви можете видалити вмі�т &quot;evolution&quot;  вручну у зручний дл� ва� "
-"ча�.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "Помилка при оновленні з попередньої вер�ії:"
 
-#: ../shell/shell.error.xml.h:19
-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 ""
-"Дл� оновленн� ваших даних та параметрів може знадобити�ь до {0} ди�кового "
-"про�тору, але є лише {1}.\n"
-"\n"
-"�еобхідно звільнити додатковий про�тір у вашому домашньому каталозі перед "
-"продовженн�м."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "Заб_ути"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_Зберегти дані"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_�агадати пізніше"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20803,8 +20009,8 @@ msgid "Certificate Viewer: %s"
 msgstr "Перегл�д �ертифіката: %s"
 
 #: ../smime/gui/component.c:46
-#, c-format
-msgid "Enter the password for `%s'"
+#, fuzzy, c-format
+msgid "Enter the password for '%s'"
 msgstr "Введіть пароль дл� \"%s\""
 
 #. we're setting the password initially
@@ -20863,7 +20069,7 @@ msgstr ""
 "Перш ніж довір�ти цій CA дл� будь-�кої мети, ви повинні перевірити її "
 "�ертифікат, її політику та процедури (�кщо вони до�тупні)."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "Сертифікат"
 
@@ -21160,28 +20366,34 @@ msgstr "�е критично"
 msgid "Extensions"
 msgstr "Розширенн�"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Algorithm"
 msgstr "�лгоритм підпи�у �ертифіката"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "По�тачальник"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "По�тачальник унікального ID"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "Унікальний ID теми"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1220
 msgid "Certificate Signature Value"
 msgstr "Значенн� підпи�у �ертифіката"
 
@@ -21303,11 +20515,6 @@ msgstr ""
 msgid "_Selection"
 msgstr "_Виділенн�"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "Колекці�"
-
 #: ../widgets/menus/gal-define-views-dialog.c:332
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
@@ -21328,10 +20535,6 @@ msgstr "Визначенн� режим дл� \"%s\""
 msgid "Table"
 msgstr "Таблиц�"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Екземпл�р"
-
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "Зберегти поточний режим"
@@ -21344,10 +20547,6 @@ msgstr "_Створити новий режим"
 msgid "_Replace existing view"
 msgstr "_Замінити і�нуючий режим"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "Фабрика"
-
 #: ../widgets/menus/gal-view-new-dialog.c:98
 msgid "Define New View"
 msgstr "Визначенн� нового режиму"
@@ -21376,14 +20575,6 @@ msgstr "�азва облікового запи�у"
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "Ді�"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Вла�тиво�ті вкладенн�"
@@ -21401,11 +20592,11 @@ msgstr "Тип MIME:"
 msgid "_Suggest automatic display of attachment"
 msgstr "_Пропонувати автоматичне відображенн� вкладенн�"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "�е можу в�тановити �к тло"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "В�тановити �к _тло"
 
@@ -21439,13 +20630,10 @@ msgid "Hide Attachment _Bar"
 msgstr "Сховати _панель вкладень"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:636
 msgid "Show Attachment _Bar"
 msgstr "Показати _панель вкладень"
 
-#: ../widgets/misc/e-attachment-paned.c:636
-msgid "Show _Attachment Bar"
-msgstr "показати панель в_кладень"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "Додати долученн�"
@@ -21463,32 +20651,32 @@ msgstr[2] "Зберегти долученн�"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "Зберегти _�к"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "_Додати долученн�..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "С_ховати"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:356
 msgid "_View Inline"
 msgstr "_Вбудований перегл�д"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Відкрити за допомогою \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Відкрити вкладенн� у %s"
@@ -21497,48 +20685,48 @@ msgstr "Відкрити вкладенн� у %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "Долучене повідомленн�"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 msgid "A load operation is already in progress"
 msgstr "Виконуєть�� операці� завантаженн�"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 msgid "A save operation is already in progress"
 msgstr "Виконуєть�� операці� зберіганн�"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "�е вдаєть�� завантажити '%s'"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "�е вдаєть�� завантажити долученн�"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2193
 #, c-format
 msgid "Could not open '%s'"
 msgstr "�е вдаєть�� відкрити '%s'"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2196
 #, c-format
 msgid "Could not open the attachment"
 msgstr "�е вдаєть�� відкрити долученн�"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "Вмі�т долученн� не завантажено"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2707
 #, c-format
 msgid "Could not save '%s'"
 msgstr "�е можу зберегти '%s'"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2710
 #, c-format
 msgid "Could not save the attachment"
 msgstr "�е можу зберегти долученн�"
@@ -21549,7 +20737,7 @@ msgid "Ctrl-click to open a link"
 msgstr "Ctrl-клацанн�, щоб відкрити по�иланн�"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21557,65 +20745,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Календар мі��ц�"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Колір заповненн�"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK колір заповненн�"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Пунктир заповненн�"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "x1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Мак�имальна ширина"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Мінімальна ширина"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Про�тір"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "�абір �имволів"
@@ -21628,48 +20757,48 @@ msgstr "Введіть бажаний набір �имволів"
 msgid "Other..."
 msgstr "Інший..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Дата та ча�"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Поле дл� тек�тового вводу дати"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "�ати�ніть цю кнопку дл� показу календар�"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Розкривний �пи�ок дл� вибору ча�у"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "_Зараз"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_Сьогодні"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_�емає"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1918
 msgctxt "date"
 msgid "None"
 msgstr "�емає"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1813
 msgid "Invalid Date Value"
 msgstr "�еправильне значенн� дати"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1857
 msgid "Invalid Time Value"
 msgstr "�еправильне значенн� ча�у"
 
@@ -21794,42 +20923,6 @@ msgstr ""
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution у автономному режимі, о�кільки мережа недо�тупна."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "Стан кнопки - «у мережі»"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "Горизонтальне положенн�"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "Позиці� панелі при горизонтальній орієнтації"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "Вертикальне положенн�"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "Позиці� панелі при вертикальній орієнтації"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "Пропорції"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "Пропорції розмірів 2-ої панелі"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "Фік�ована зміна розміру"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Зберігати розміри= 2-й панелі при зміні розміру вікна"
-
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Синхронізувати з:"
@@ -21891,28 +20984,6 @@ msgstr "ДоÑ�Ñ�гнуто кінцÑ� Ñ�торінки, починаю згорÐ
 msgid "Reached top of page, continued from bottom"
 msgstr "До��гнуто верху �торінки, починаю знизу"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "Р�док з кур�ором"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Стовпчик з кур�ором"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Сортувальник"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Режим виділ�нн�"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Режим кур�ору"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Коли в_идалено"
@@ -21985,43 +21056,48 @@ msgstr "при з_авершенні:"
 msgid "When decli_ned:"
 msgstr "При в_ідмові:    "
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "П_рот�гом"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+#, fuzzy
+msgid "_After"
 msgstr "_пі�л�:"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_У�і відомо�ті"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "Кла�и_фікаці�:"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "_Відкла�ти до�тавку повідомленн�"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "_До�тавлено"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "_В�тановити дату закінченн�"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+#, fuzzy
+msgid "_Until"
 msgstr "_До:"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "_Коли зручно"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "_При відкриванні:    "
 
@@ -22078,41 +21154,41 @@ msgstr "Файл �ценарію повинен бути виконуваним
 msgid "Click here to go to URL"
 msgstr "�ати�ніть, щоб перейти за URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:359
 msgid "_Copy Link Location"
 msgstr "_Копіювати по�иланн�"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:361
 msgid "Copy the link to the clipboard"
 msgstr "Копіювати по�иланн� у буфер обміну"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Open Link in Browser"
 msgstr "_Відкрити по�иланн� у Інтернет-навігаторі"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:371
 msgid "Open the link in a web browser"
 msgstr "Відкрити по�иланн� у Інтернет-навігаторі"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Copy Email Address"
 msgstr "_Копіювати адре�у ел.пошти"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
 msgid "Select all text and images"
 msgstr "Виділити ве�ь тек�т та зображенн�"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 #, c-format
 msgid "Click to call %s"
 msgstr "Клацніть, щоб подзвонити %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:846
 msgid "Click to hide/unhide addresses"
 msgstr "Клацніть, щоб показати/�ховати адре�и "
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to open %s"
 msgstr "Клацніть щоб відкрити %s"
@@ -22158,48 +21234,12 @@ msgstr "Ча� має бути у такому форматі: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Значенн� від�отка має бути між 0 та 100, включно"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Виділений �товпчик"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Стовпчик, що має фоку�"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "�евиділений �товпчик"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Закре�лений �товпчик"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "Підкре�лений �товпчик"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Стовпчик з напівжирним тек�том"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Кольоровий �товпчик"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Колір тла �товпчика"
-
 #: ../widgets/table/e-table-click-to-add.c:586
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
 msgid "click to add"
 msgstr "нати�ніть, щоб додати"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Стан"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Зро�танн�)"
@@ -22315,15 +21355,28 @@ msgstr ""
 "Щоб додати �товпчик у вашу таблицю,\n"
 "перет�гніть його на мі�це, де він має розташувати�ь."
 
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:349
+#, fuzzy, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s : %s (%d елемент)"
 msgstr[1] "%s : %s (%d елемент)"
 msgstr[2] "%s : %s (%d елемент)"
 
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:361
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -22331,84 +21384,6 @@ msgstr[0] "%s (%d елемент)"
 msgstr[1] "%s (%d елемент)"
 msgstr[2] "%s (%d елемент)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "�льтернативні кольори р�дка"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Горизонтальна таблиц� дл� малюванн�"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Вертикальна таблиц� дл� малюванн�"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Фоку� малюванн�"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Режим кур�ора"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Модель виділ�нн�"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "Поріг довжини"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Загальна ви�ота р�дка"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "Заморожена"
-
 #: ../widgets/table/e-table-header-item.c:1487
 msgid "Customize Current View"
 msgstr "Змінити поточний вигл�д"
@@ -22466,98 +21441,28 @@ msgstr "С_ортувати за"
 msgid "_Custom"
 msgstr "_Інший"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "Заголовок таблиці"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Модель таблиці"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Р�док з кур�ором"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Інформаці� про �ортуванн�"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Завжди шукати"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Викори�товувати клацанн� дл� додаванн�"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "Інтервал між р�дками"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "Про�тір між р�дками. Додаєть�� згори та знизу кожного р�дка"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree адаптер таблиці"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Кла�ичний вигл�д"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Малює лінії та +/- елементи розкриванн�."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "Розмір розширювача"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "Розмір �трілки розширювача"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "контек�тне вікно"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "�творити контек�тне вікно"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "правка"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "почати редагуванн� комірки"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "перемикнути"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:171
 msgid "toggle the cell"
 msgstr "перемикнути комірку"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "розширити"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "розширити р�док у ETree, що мі�тить цю комірку "
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "згорнути"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "згорнути р�док у ETree, що мі�тить цю комірку"
 
@@ -22581,113 +21486,977 @@ msgstr "Виділити в�е"
 msgid "Input Methods"
 msgstr "Методи вводу"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Проце�ор подій"
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
+#~ msgid "Web Log:"
+#~ msgstr "Веб-журнал:"
+
+#~ msgid "_Web Log:"
+#~ msgstr "Веб-_журнал:"
+
+#~ msgid "Editable"
+#~ msgstr "Редаговане"
+
+#~ msgid "Source Book"
+#~ msgstr "Книга-джерело"
+
+#~ msgid "Target Book"
+#~ msgstr "Книга призначенн�"
+
+#~ msgid "Is New Contact"
+#~ msgstr "Є новим контактом"
+
+#~ msgid "Writable Fields"
+#~ msgstr "Пол� дл� запи�у"
+
+#~ msgid "Required Fields"
+#~ msgstr "Обов'�зкові пол�"
+
+#~ msgid "Changed"
+#~ msgstr "Змінено"
+
+#~ msgid "Shell"
+#~ msgstr "Оболонка"
+
+#~ msgid "The EShell singleton"
+#~ msgstr "Сінглетон EShell"
+
+#~ msgid "Book"
+#~ msgstr "Книга"
+
+#~ msgid "Is New List"
+#~ msgstr "Є новим �пи�ком"
+
+#~ msgid "Query"
+#~ msgstr "Запит"
+
+#~ msgid "Model"
+#~ msgstr "Модель"
+
+#~ msgid "Shell View"
+#~ msgstr "Вигл�д оболонки"
+
+#~ msgid "Source"
+#~ msgstr "Джерело"
+
+#~ msgid "Width"
+#~ msgstr "Ширина"
+
+#~ msgid "Height"
+#~ msgstr "Ви�ота"
+
+#~ msgid "Has Focus"
+#~ msgstr "Має фоку�"
+
+#~ msgid "Field"
+#~ msgstr "Поле"
+
+#~ msgid "Field Name"
+#~ msgstr "�азва пол�"
+
+#~ msgid "Text Model"
+#~ msgstr "Тек�това модель"
+
+#~ msgid "Max field name length"
+#~ msgstr "Мак�имальна довжина імені пол�"
+
+#~ msgid "Column Width"
+#~ msgstr "Ширина �товпчика"
+
+#~ msgid "Adapter"
+#~ msgstr "�даптер"
+
+#~ msgid "Selected"
+#~ msgstr "Вибраний"
+
+#~ msgid "Has Cursor"
+#~ msgstr "Має кур�ор"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "Репозиторій календарю у автономному режимі."
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "Помилка при {0}."
+
+#~ msgid "No response from the server."
+#~ msgstr "�емає відповіді від �ервера."
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "�е вдаєть�� завантажити календар '%s'"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Attendee_s..."
+#~ msgstr "_Відвідувачі..."
+
+#~ msgid "Default Client"
+#~ msgstr "Типовий клієнт"
+
+#~ msgid "Shell Settings"
+#~ msgstr "Параметри оболонки"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "Глобальні параметри програми"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "_Відвідувачі..."
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "_Вибрати �ьогоднішній день"
+
+#~ msgid "Name of the logger"
+#~ msgstr "�азва компоненту дл� журналів"
+
+#~ msgid "Filename"
+#~ msgstr "�азва файлу:"
+
+#~ msgid "The filename of the module"
+#~ msgstr "�азва файлу модул�"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "Чи увімкнено модуль"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "Слідкуванн� за фоку�ом"
+
+#~ msgid "Shell Module"
+#~ msgstr "Модуль оболонки"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "Б�к-енд поштової оболонки"
+
+#~ msgid "Show Deleted"
+#~ msgstr "Показати видалені"
+
+#~ msgid "To Do"
+#~ msgstr "Потрібно зробити"
+
+#~ msgid "Later"
+#~ msgstr "Пізніше"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "�е вдаєть�� �творити нову теку \"%s\": %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "�е вдаєть�� �копіювати теку \"%s\" у \"%s\": %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "�е вдаєть�� �канувати на�вні поштові �криньки на `%s': %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Розташуванн� та ієрархі� поштових �криньок Evolution змінила�ь з вер�ії "
+#~ "Evolution 1.x.\n"
+#~ "\n"
+#~ "Будь ла�ка зачекайте, доки Evolution перене�е ваші теки..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr ""
+#~ "�е вдаєть�� відкрити дані �тарого POP зберіганн� на �ервері `%s': %s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "�е вдаєть�� відкрити дані POP3 зберіганн� на �ервері `%s': %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "�е вдаєть�� копіювати дані POP3 зберіганн� на �ервері `%s': %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "�е вдаєть�� �творити локальне �ховище пошти '%s': %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "�е вдаєть�� прочитати параметри з попереднього в�тановленн� Evolution, "
+#~ "`evolution/config.xmldb' пошкоджених, або не і�нує."
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "Дозвол�є програмі показувати тек�т обмеженого розміру"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr ""
+#~ "Дозволити відображенн� тек�тової ча�тини повідомленн� обмеженого розміру."
+
+#~ msgid "Text message part limit"
+#~ msgstr "Обмеженн� розміру тек�тового вкладенн�"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "Тому що «{0}»."
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "Тому що «{2}»"
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "�а�тупні теки пошуку:\n"
+#~ "{0}\n"
+#~ "викори�товували віддалену теку:\n"
+#~ "    «{1}»\n"
+#~ "та були оновлені."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "�а�тупні поштові фільтри:\n"
+#~ "{0}\n"
+#~ "Викори�товували віддалену зараз теку:\n"
+#~ "    «{1}»\n"
+#~ "Та були оновлені."
+
+#~ msgid "Shell Backend"
+#~ msgstr "Бек-енд оболонки"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "У цій теці є лише приховані повідомленн�. Щоб їх побачити виберіть меню "
+#~ "Вигл�д -> Показати приховані повідомленн�."
+
+#~ msgid "Table column:"
+#~ msgstr "Стовпчик таблиці:"
+
+#~ msgid "Source List"
+#~ msgstr "Спи�ок джерело"
+
+#~ msgid "The registry of address books"
+#~ msgstr "Реє�тр адре�них книг"
+
+#~ msgid "Current View"
+#~ msgstr "Поточний вигл�д"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "Поточний обраний вигл�д адре�ної книги"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "Попередній перегл�д контакту"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "Контакт, що показуєть�� у панелі попереднього перегл�ду"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "Попередній перегл�д увімкнено"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "Чи показувати панель попереднього перегл�ду"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "Сервери LDAP"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "Параметри автодоповненн�"
+
+#~ 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 ""
+#~ "Розташуванн� та ієрархі� тек контактів Evolution змінили�ь пі�л� вер�ії 1."
+#~ "x.\n"
+#~ "\n"
+#~ "Відбуваєть�� перетворенн� тек дл� нової вер�ії..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Формат �пи�ків контактів змінив��.\n"
+#~ "\n"
+#~ "Зачекайте, доки відбуваєть�� перетворенн� тек..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Спо�іб зберіганн� де�ких телефонних номерів у Evolution змінив��.\n"
+#~ "\n"
+#~ "Зачекайте, доки відбуваєть�� перетворенн� тек..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Спо�іб зберіганн� даних компонента Palm Sync змінив��.\n"
+#~ "\n"
+#~ "Зачекайте, доки відбуваєть�� перетворенн� даних �инхронізації з Palm "
+#~ "Sync..."
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "Віджет вибору джерела"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "Цей віджет показує групи з адре�них книг"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "Зберегти �к VCard..."
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "Реє�тр календарів"
+
+#~ 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 ""
+#~ "Розташуванн� та ієрархі� тек календарів Evolution змінили�ь з вер�ії 1."
+#~ "x.\n"
+#~ "\n"
+#~ "Відбуваєть�� перетворенн� тек дл� нової вер�ії..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr "�е вдаєть�� перетворити �тарі параметри з evolution/config.xmldb"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "�е вдаєть�� перетворити календар '%s'"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "Віджет навігатора дати"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "Цей віджет показує мініатюрний календар"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "Типовий клієнт календар�"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "Типовий клієнт дл� операцій з календарем"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "Цей віджет показує групи календар�"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "Реє�тр �пи�ків приміток"
+
+#~ msgid "The memo table model"
+#~ msgstr "Модель таблиці приміток"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "Типовий клієнт дл� приміток"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "Типовий клієнт дл� роботи з примітками"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "Цей віджет показує групи зі �пи�ків приміток"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "Реє�тр �пи�ків завдань"
+
+#~ msgid "The task table model"
+#~ msgstr "Модель таблиці задач"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Розташуванн� та ієрархі� тек контактів Evolution змінили�ь з вер�ії 1.x.\n"
+#~ "\n"
+#~ "Відбуваєть�� перетворенн� тек дл� нової вер�ії..."
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "�е вдаєть�� відкрити завданн� '%s'"
+
+#~ msgid "Default Task Client"
+#~ msgstr "Типовий клієнт дл� задач"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "Типовий клієнт дл� операцій із задачами"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "Цей віджет показує групи із �пи�ків задач"
+
+#~ msgid "Group by Threads"
+#~ msgstr "Групувати за гілками"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "Чи групувати повідомленн� за гілками обговоренн�"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Сховати про_читані повідомленн�"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "Тимча�ово прибрати в�і прочитані повідомленн�"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Сховати виді_лені повідомленн�"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "Тимча�ово прибрати вибрані повідомленн�"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "Показати �_ховані повідомленн�"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "Знову показати тимча�ово прибрані повідомленн�"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Сховати в_идалені повідомленн�"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr ""
+#~ "Приховувати видалені повідомленн� замі�ть відображенн� їх перекре�леними"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr ""
+#~ "Спи�ок ключів дл� модул� �повіщенн� про забуті вкладенн� дл� пошуку у "
+#~ "тілі ли�та."
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "Додати до Evolution підтримку Hula."
+
+#~ msgid "Hula Support"
+#~ msgstr "Підтримка Hula"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld кБ"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Те�т"
+#~ msgid "Toolbar Style"
+#~ msgstr "Стиль панелі ін�трументів"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "�апівжирний"
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "Стиль панелі ін�трументів перемикачів"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Закре�лений"
+#~ msgid "Toolbar Visible"
+#~ msgstr "Панель ін�трументів є видимою"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Якір"
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "Чи є перемикач видимим."
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "Вирівнюванн�"
+#~ msgid "Switcher Action"
+#~ msgstr "Ді� перемикача"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Ширина від�іченн�"
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "Ді� перемикача дл� цього типу оболонки"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Ви�ота від�іченн�"
+#~ msgid "Page Number"
+#~ msgstr "�омер �торінки"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Від�іченн�"
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "�омер �торінки запи�ника вигл�ду оболонки"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Заповнювати обла�ті від�іченн�"
+#~ msgid "Search Rule"
+#~ msgstr "Правило пошуку"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "З�ув по X"
+#~ msgid "Criteria for the current search results"
+#~ msgstr "Критерій дл� поточних результатів пошуку"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "З�ув по Y"
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "EShellBackend дл� цього типу оболонки"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Ширина тек�ту"
+#~ msgid "Shell Content Widget"
+#~ msgstr "Віджет змі�ту оболонки"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Ви�ота тек�ту"
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr "Змі�т віджета виводить�� у правій панелі вікна оболонки"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Викори�товувати еліп�і�"
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Віджет бокової панелі оболонки"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Еліп�і�"
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr "Змі�т віджету виводить�� у лівій панелі вікна оболонки"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Перено� р�дків"
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "Віджет панелі задач оболонки"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Символи розриву"
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr "Віджет панелі задач з'�вл�єть�� у нижній ча�тині вікна оболонки"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "Мак�имальна кількі�ть р�дків"
+#~ msgid "Shell Window"
+#~ msgstr "Вікно оболонки"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Малювати межі"
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "Вікно, �кому належить вигл�д оболонки"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Допу�кати �имволи нового р�дка"
+#~ msgid "The key file holding widget state data"
+#~ msgstr "Ключовий файл, що мі�тить �тан даних віджета"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Малювати тло"
+#~ msgid "The title of the shell view"
+#~ msgstr "Заголовок вигл�ду оболонки"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Малювати кнопки"
+#~ msgid "Current View ID"
+#~ msgstr "ID поточного вигл�ду"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "Позиці� кур�ора"
+#~ msgid "The current GAL view ID"
+#~ msgstr "ID поточного огл�ду GAL"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "Контек�т методу вводу (IM)"
+#~ msgid "Active Shell View"
+#~ msgstr "Поточний вигл�д оболонки"
 
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "Обробл�ти контек�ті вікна"
+#~ msgid "Name of the active shell view"
+#~ msgstr "�азва поточного вигл�ду оболонки"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "EFocusTracker вікна оболонки"
+
+#~ msgid "Geometry"
+#~ msgstr "Геометрі�"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "Р�док початкової геометрії вікна"
+
+#~ msgid "Safe Mode"
+#~ msgstr "Безпечний режим"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "Чи знаходить�� вікно оболонки у безпечному режимі"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "Бічна панель видима"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "Чи показувати бічну панель вікна оболонки"
+
+#~ msgid "Switcher Visible"
+#~ msgstr "Перемикач видимий"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "Чи показувати кнопки перемикача вікна оболонки"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "Панель задач видима"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "Чи показувати панель задач вікна оболонки"
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "Чи показувати панель задач вікна оболонки"
+
+#~ msgid "UI Manager"
+#~ msgstr "Менеджер інтерфей�у"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "GtkUIManager вікна оболонки"
+
+#~ msgid "Module Directory"
+#~ msgstr "Каталог модулів"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "Каталог, з �кого завантажувати EModule"
+
+#~ msgid "Network Available"
+#~ msgstr "Мережа до�тупна"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "Чи до�тупна мережа"
+
+#~ msgid "Online"
+#~ msgstr "У мережі"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "Чи знаходить�� оболонка у мережі"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "Приму�ова повторна міграці� з Evolution 1.4"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "�едо�татньо ди�кового про�тору дл� оновленн�."
+
+#~ msgid "Really delete old data?"
+#~ msgstr "Дій�но видалити �тарі дані?"
+
+#~ 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 ""
+#~ "Ве�ь вмі�т теки &quot;evolution&quot;  буде о�таточно видалений\n"
+#~ "\n"
+#~ "Вважаєть��, що ви вручну перевірили, що в�� ваша пошта, контакти, та "
+#~ "календар у�пішно перене�ені, та нова вер�і� Evolution працює коректно.\n"
+#~ "\n"
+#~ "Пі�л� видаленн�, ви не зможете повернути�ь до попередньої вер�ії "
+#~ "Evolution без ручного втручанн�.\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "У попередній вер�ії evolution дані зберігали�ь у іншому мі�ці.\n"
+#~ "\n"
+#~ "Якщо ви виберете видалити цих даних, ве�ь вмі�т каталогу &quot;"
+#~ "evolution&quot; буде о�таточно знищений.  Якщо ви виберете зберегти ці "
+#~ "дані, ви можете видалити вмі�т &quot;evolution&quot;  вручну у зручний "
+#~ "дл� ва� ча�.\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "Дл� оновленн� ваших даних та параметрів може знадобити�ь до {0} ди�кового "
+#~ "про�тору, але є лише {1}.\n"
+#~ "\n"
+#~ "�еобхідно звільнити додатковий про�тір у вашому домашньому каталозі перед "
+#~ "продовженн�м."
+
+#~ msgid "_Keep Data"
+#~ msgstr "_Зберегти дані"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "_�агадати пізніше"
+
+#~ msgid "Collection"
+#~ msgstr "Колекці�"
+
+#~ msgid "Instance"
+#~ msgstr "Екземпл�р"
+
+#~ msgid "Factory"
+#~ msgstr "Фабрика"
+
+#~ msgid "Action"
+#~ msgstr "Ді�"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "показати панель в_кладень"
+
+#~ msgid "Fill color"
+#~ msgstr "Колір заповненн�"
+
+#~ msgid "GDK fill color"
+#~ msgstr "GDK колір заповненн�"
+
+#~ msgid "Fill stipple"
+#~ msgstr "Пунктир заповненн�"
+
+#~ msgid "X1"
+#~ msgstr "x1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "Мак�имальна ширина"
+
+#~ msgid "Minimum Width"
+#~ msgstr "Мінімальна ширина"
+
+#~ msgid "Spacing"
+#~ msgstr "Про�тір"
+
+#~ msgid "The button state is online"
+#~ msgstr "Стан кнопки - «у мережі»"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "Горизонтальне положенн�"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "Позиці� панелі при горизонтальній орієнтації"
+
+#~ msgid "Vertical Position"
+#~ msgstr "Вертикальне положенн�"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "Позиці� панелі при вертикальній орієнтації"
+
+#~ msgid "Proportion"
+#~ msgstr "Пропорції"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "Пропорції розмірів 2-ої панелі"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "Фік�ована зміна розміру"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "Зберігати розміри= 2-й панелі при зміні розміру вікна"
+
+#~ msgid "Cursor Row"
+#~ msgstr "Р�док з кур�ором"
+
+#~ msgid "Cursor Column"
+#~ msgstr "Стовпчик з кур�ором"
+
+#~ msgid "Sorter"
+#~ msgstr "Сортувальник"
+
+#~ msgid "Selection Mode"
+#~ msgstr "Режим виділ�нн�"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "Режим кур�ору"
+
+#~ msgid "Selected Column"
+#~ msgstr "Виділений �товпчик"
+
+#~ msgid "Focused Column"
+#~ msgstr "Стовпчик, що має фоку�"
+
+#~ msgid "Unselected Column"
+#~ msgstr "�евиділений �товпчик"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "Закре�лений �товпчик"
+
+#~ msgid "Underline Column"
+#~ msgstr "Підкре�лений �товпчик"
+
+#~ msgid "Bold Column"
+#~ msgstr "Стовпчик з напівжирним тек�том"
+
+#~ msgid "Color Column"
+#~ msgstr "Кольоровий �товпчик"
+
+#~ msgid "BG Color Column"
+#~ msgstr "Колір тла �товпчика"
+
+#~ msgid "State"
+#~ msgstr "Стан"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "�льтернативні кольори р�дка"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "Горизонтальна таблиц� дл� малюванн�"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "Вертикальна таблиц� дл� малюванн�"
+
+#~ msgid "Draw focus"
+#~ msgstr "Фоку� малюванн�"
+
+#~ msgid "Cursor mode"
+#~ msgstr "Режим кур�ора"
+
+#~ msgid "Selection model"
+#~ msgstr "Модель виділ�нн�"
+
+#~ msgid "Length Threshold"
+#~ msgstr "Поріг довжини"
+
+#~ msgid "Uniform row height"
+#~ msgstr "Загальна ви�ота р�дка"
+
+#~ msgid "Frozen"
+#~ msgstr "Заморожена"
+
+#~ msgid "Table header"
+#~ msgstr "Заголовок таблиці"
+
+#~ msgid "Table model"
+#~ msgstr "Модель таблиці"
+
+#~ msgid "Cursor row"
+#~ msgstr "Р�док з кур�ором"
+
+#~ msgid "Sort Info"
+#~ msgstr "Інформаці� про �ортуванн�"
+
+#~ msgid "Always search"
+#~ msgstr "Завжди шукати"
+
+#~ msgid "Use click to add"
+#~ msgstr "Викори�товувати клацанн� дл� додаванн�"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "Інтервал між р�дками"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr "Про�тір між р�дками. Додаєть�� згори та знизу кожного р�дка"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "ETree адаптер таблиці"
+
+#~ msgid "Retro Look"
+#~ msgstr "Кла�ичний вигл�д"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "Малює лінії та +/- елементи розкриванн�."
+
+#~ msgid "Expander Size"
+#~ msgstr "Розмір розширювача"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Розмір �трілки розширювача"
+
+#~ msgid "popup"
+#~ msgstr "контек�тне вікно"
+
+#~ msgid "edit"
+#~ msgstr "правка"
+
+#~ msgid "toggle"
+#~ msgstr "перемикнути"
+
+#~ msgid "expand"
+#~ msgstr "розширити"
+
+#~ msgid "collapse"
+#~ msgstr "згорнути"
+
+#~ msgid "Event Processor"
+#~ msgstr "Проце�ор подій"
+
+#~ msgid "Text"
+#~ msgstr "Те�т"
+
+#~ msgid "Bold"
+#~ msgstr "�апівжирний"
+
+#~ msgid "Strikeout"
+#~ msgstr "Закре�лений"
+
+#~ msgid "Anchor"
+#~ msgstr "Якір"
+
+#~ msgid "Justification"
+#~ msgstr "Вирівнюванн�"
+
+#~ msgid "Clip Width"
+#~ msgstr "Ширина від�іченн�"
+
+#~ msgid "Clip Height"
+#~ msgstr "Ви�ота від�іченн�"
+
+#~ msgid "Clip"
+#~ msgstr "Від�іченн�"
+
+#~ msgid "Fill clip rectangle"
+#~ msgstr "Заповнювати обла�ті від�іченн�"
+
+#~ msgid "X Offset"
+#~ msgstr "З�ув по X"
+
+#~ msgid "Y Offset"
+#~ msgstr "З�ув по Y"
+
+#~ msgid "Text width"
+#~ msgstr "Ширина тек�ту"
+
+#~ msgid "Text height"
+#~ msgstr "Ви�ота тек�ту"
+
+#~ msgid "Use ellipsis"
+#~ msgstr "Викори�товувати еліп�і�"
+
+#~ msgid "Ellipsis"
+#~ msgstr "Еліп�і�"
+
+#~ msgid "Line wrap"
+#~ msgstr "Перено� р�дків"
+
+#~ msgid "Break characters"
+#~ msgstr "Символи розриву"
+
+#~ msgid "Max lines"
+#~ msgstr "Мак�имальна кількі�ть р�дків"
+
+#~ msgid "Draw borders"
+#~ msgstr "Малювати межі"
+
+#~ msgid "Allow newlines"
+#~ msgstr "Допу�кати �имволи нового р�дка"
+
+#~ msgid "Draw background"
+#~ msgstr "Малювати тло"
+
+#~ msgid "Draw button"
+#~ msgstr "Малювати кнопки"
+
+#~ msgid "Cursor position"
+#~ msgstr "Позиці� кур�ора"
+
+#~ msgid "IM Context"
+#~ msgstr "Контек�т методу вводу (IM)"
+
+#~ msgid "Handle Popup"
+#~ msgstr "Обробл�ти контек�ті вікна"
 
 #~ msgid "New Tab"
 #~ msgstr "�ова вкладка"
-
-#~ msgid "Quit"
-#~ msgstr "Вийти"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index dee1758508..a4f5e65647 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.30.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-20 19:34+0800\n"
-"PO-Revision-Date: 2010-03-20 19:35+0800\n"
+"POT-Creation-Date: 2010-03-20 19:29+0800\n"
+"PO-Revision-Date: 2010-03-20 19:30+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -268,7 +268,7 @@ msgstr "�絡人"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2520
 msgid "Contact Editor"
 msgstr "�絡人編輯器"
 
@@ -576,20 +576,20 @@ msgid "Changed"
 msgstr "已更改"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2515
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "�絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2912
 msgid "Please select an image for this contact"
 msgstr "請��代表此�絡人的圖片"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2913
 msgid "_No image"
 msgstr "沒有圖片(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3186
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -597,23 +597,23 @@ msgstr ""
 "�絡人資料無效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "「%s��有無效的格�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3197
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s「%s��有無效的格�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3212
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3223
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s「%s�是空的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3237
 msgid "Invalid contact."
 msgstr "無效的�絡人。"
 
@@ -819,7 +819,7 @@ msgstr "�併�絡人"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1648
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
 #: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Any field contains"
@@ -1345,7 +1345,7 @@ msgstr "視�交談"
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
+#: ../modules/calendar/e-cal-shell-view.c:495
 #: ../plugins/groupwise-features/camel-gw-listener.c:420
 #: ../plugins/groupwise-features/camel-gw-listener.c:445
 #: ../plugins/groupwise-features/camel-gw-listener.c:560
@@ -3419,7 +3419,7 @@ msgid "Wee_k starts on:"
 msgstr "一週開始於(_K):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Work Week"
 msgstr "工作週"
 
@@ -4985,7 +4985,7 @@ msgstr "%A %d %B"
 #: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
 #: ../calendar/gui/e-week-view-main-item.c:231
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:907
 msgid "%a %d %b"
 msgstr "%-m 月 %-d 日 (%a)"
 
@@ -4997,7 +4997,7 @@ msgstr "%-m 月 %-d 日 (%a)"
 #: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
 #: ../calendar/gui/e-week-view-main-item.c:245
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:943
 msgid "%d %b"
 msgstr "%-m 月 %-d 日"
 
@@ -5627,7 +5627,7 @@ msgid "Member"
 msgstr "�員"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../modules/calendar/e-cal-shell-content.c:404
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5719,7 +5719,7 @@ msgstr "100%"
 #: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../modules/calendar/e-cal-shell-content.c:364
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
@@ -5860,16 +5860,16 @@ msgid "Gnome Calendar"
 msgstr "Gnome 行事曆"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:903
 msgid "%A %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
 #: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:919
 msgid "%a %d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 
@@ -5877,10 +5877,10 @@ msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:936
+#: ../modules/calendar/e-cal-shell-view-private.c:947
+#: ../modules/calendar/e-cal-shell-view-private.c:954
+#: ../modules/calendar/e-cal-shell-view-private.c:957
 msgid "%d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
@@ -8500,6 +8500,7 @@ msgid "Email Settings"
 msgstr "電�郵件設定值"
 
 #: ../capplet/settings/mail-capplet-shell.c:334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Quit"
 msgstr "��"
 
@@ -8687,7 +8688,7 @@ msgstr "視覺"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+#: ../modules/calendar/e-cal-shell-view-actions.c:1751
 #: ../plugins/itip-formatter/itip-view.c:195
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
@@ -9846,7 +9847,7 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "將�定的郵件�新導�給�人"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
@@ -10059,13 +10060,13 @@ msgid "Delete"
 msgstr "刪除"
 
 #: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "下一個"
 
 #: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "上一個"
@@ -14030,7 +14031,7 @@ msgid "Show properties of the selected address book"
 msgstr "顯示��通訊錄的屬性"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
 #: ../modules/calendar/e-task-shell-view-actions.c:734
 #: ../modules/mail/e-mail-shell-view-actions.c:946
@@ -14114,7 +14115,7 @@ msgid "Send a message to the selected contacts"
 msgstr "傳�郵件至��的�絡人"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
 #: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "_Actions"
 msgstr "動作(_A)"
@@ -14127,7 +14128,7 @@ msgid "_Preview"
 msgstr "�覽(_P)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1474
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
 #: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Delete"
@@ -14172,21 +14173,21 @@ msgid "Show contact preview alongside the contact list"
 msgstr "在�絡人清單�邊顯示�絡人�覽"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1617
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
 #: ../modules/calendar/e-task-shell-view-actions.c:905
 msgid "Any Category"
 msgstr "任何分類"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/calendar/e-cal-shell-view-actions.c:1631
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
 #: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
 #: ../modules/calendar/e-task-shell-view-actions.c:950
 #: ../modules/mail/e-mail-shell-view-actions.c:1268
@@ -14408,7 +14409,7 @@ msgid "_Appointment"
 msgstr "約會(_A)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
@@ -14436,7 +14437,7 @@ msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
@@ -14559,115 +14560,115 @@ msgstr "事件"
 msgid "Save as iCalendar"
 msgstr "儲存為 iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "複製(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "D_elete Calendar"
 msgstr "刪除行事曆(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1254
 msgid "Delete the selected calendar"
 msgstr "刪除��的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1261
 msgid "Go Back"
 msgstr "�後"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
 msgid "Go Forward"
 msgstr "��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Select _Today"
 msgstr "�擇今天(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
 msgid "Select today"
 msgstr "��今日"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select _Date"
 msgstr "�擇日期(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
 msgid "Select a specific date"
 msgstr "��特定日期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
 #: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Purg_e"
 msgstr "清除(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 msgid "Purge old appointments and meetings"
 msgstr "刪除舊約會和會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
 #: ../modules/calendar/e-task-shell-view-actions.c:727
 msgid "Re_fresh"
 msgstr "�新整�(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 msgid "Refresh the selected calendar"
 msgstr "�新整���的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Rename the selected calendar"
 msgstr "�新命���的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Show _Only This Calendar"
 msgstr "�顯示這個行事曆(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1329
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1336
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1343
 msgid "_Delete Appointment"
 msgstr "刪除約會(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "Delete selected appointments"
 msgstr "刪除��的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete This _Occurrence"
 msgstr "刪除這次發生的事件(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "Delete this occurrence"
 msgstr "刪除此週期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete All Occ_urrences"
 msgstr "刪除所有發生的事件(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "Delete all occurrences"
 msgstr "刪除全部週期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "New All Day _Event..."
 msgstr "新增全天事件(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Create a new all day event"
 msgstr "建立新的全天事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
@@ -14675,126 +14676,126 @@ msgstr "建立新的全天事件"
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar 轉寄..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "New _Meeting..."
 msgstr "新增會議(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "Create a new meeting"
 msgstr "建立新的會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示��移動(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "_Open Appointment"
 msgstr "開啟約會(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "View the current appointment"
 msgstr "檢視目�的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1427
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "儲存為 iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Converts an appointment to a meeting"
 msgstr "將約會轉�為會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Conv_ert to Appointment..."
 msgstr "轉�為約會(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Converts a meeting to an appointment"
 msgstr "將會議轉�為約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1572
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1574
 msgid "Show one day"
 msgstr "顯示一天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "List"
 msgstr "清單"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "Show as list"
 msgstr "顯示�清單"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Month"
 msgstr "月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "Show one month"
 msgstr "顯示一個月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Week"
 msgstr "週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Show one week"
 msgstr "顯示一週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Show one work week"
 msgstr "顯示一個工作週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1610
 msgid "Active Appointments"
 msgstr "進行中的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1624
 msgid "Next 7 Days' Appointments"
 msgstr "未來 7 天的約會(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1655
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
 #: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Description contains"
 msgstr "�述包�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1662
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
 #: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Summary contains"
 msgstr "主旨包�"
 
 # zh_HK: msgstr "列�這個行事曆"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
 msgid "Print this calendar"
 msgstr "列�這個行事曆"
 
 # zh_HK: msgstr "�覽將�列�的行事曆內容"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
 msgid "Preview the calendar to be printed"
 msgstr "�覽將�列�的行事曆內容"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1754
 msgid "Go To"
 msgstr "移至"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7aca5f802c..7e2a7896a1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.30.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-20 19:34+0800\n"
+"POT-Creation-Date: 2010-03-20 19:29+0800\n"
 "PO-Revision-Date: 2010-03-20 08:28+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional)\n"
@@ -279,7 +279,7 @@ msgstr "連絡人"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2520
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -587,20 +587,20 @@ msgid "Changed"
 msgstr "已變更"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2515
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "連絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2912
 msgid "Please select an image for this contact"
 msgstr "請��代表此連絡人的圖片"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2913
 msgid "_No image"
 msgstr "沒有圖片(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3186
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -608,23 +608,23 @@ msgstr ""
 "連絡人資料無效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "「%s��有無效的格�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3197
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s「%s��有無效的格�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3212
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3223
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s「%s�是空的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3237
 msgid "Invalid contact."
 msgstr "無效的連絡人。"
 
@@ -830,7 +830,7 @@ msgstr "�併連絡人"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1648
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
 #: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Any field contains"
@@ -1356,7 +1356,7 @@ msgstr "視訊交談"
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
+#: ../modules/calendar/e-cal-shell-view.c:495
 #: ../plugins/groupwise-features/camel-gw-listener.c:420
 #: ../plugins/groupwise-features/camel-gw-listener.c:445
 #: ../plugins/groupwise-features/camel-gw-listener.c:560
@@ -3454,7 +3454,7 @@ msgid "Wee_k starts on:"
 msgstr "一週開始於(_K):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Work Week"
 msgstr "工作週"
 
@@ -5020,7 +5020,7 @@ msgstr "%A %d %B"
 #: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
 #: ../calendar/gui/e-week-view-main-item.c:231
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:907
 msgid "%a %d %b"
 msgstr "%-m 月 %-d 日 (%a)"
 
@@ -5032,7 +5032,7 @@ msgstr "%-m 月 %-d 日 (%a)"
 #: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
 #: ../calendar/gui/e-week-view-main-item.c:245
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:943
 msgid "%d %b"
 msgstr "%-m 月 %-d 日"
 
@@ -5662,7 +5662,7 @@ msgid "Member"
 msgstr "�員"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../modules/calendar/e-cal-shell-content.c:404
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5754,7 +5754,7 @@ msgstr "100%"
 #: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../modules/calendar/e-cal-shell-content.c:364
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
@@ -5895,16 +5895,16 @@ msgid "Gnome Calendar"
 msgstr "Gnome 行事曆"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:903
 msgid "%A %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
 #: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:919
 msgid "%a %d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 
@@ -5912,10 +5912,10 @@ msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:936
+#: ../modules/calendar/e-cal-shell-view-private.c:947
+#: ../modules/calendar/e-cal-shell-view-private.c:954
+#: ../modules/calendar/e-cal-shell-view-private.c:957
 msgid "%d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
@@ -8546,6 +8546,7 @@ msgid "Email Settings"
 msgstr "電�郵件設定值"
 
 #: ../capplet/settings/mail-capplet-shell.c:334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Quit"
 msgstr "��"
 
@@ -8733,7 +8734,7 @@ msgstr "視覺"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+#: ../modules/calendar/e-cal-shell-view-actions.c:1751
 #: ../plugins/itip-formatter/itip-view.c:195
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
@@ -9893,7 +9894,7 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "將�定的郵件�新導�給�人"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
@@ -10106,13 +10107,13 @@ msgid "Delete"
 msgstr "刪除"
 
 #: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "下一個"
 
 #: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "上一個"
@@ -14175,7 +14176,7 @@ msgid "Show properties of the selected address book"
 msgstr "顯示��通訊錄的屬性"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
 #: ../modules/calendar/e-task-shell-view-actions.c:734
 #: ../modules/mail/e-mail-shell-view-actions.c:946
@@ -14259,7 +14260,7 @@ msgid "Send a message to the selected contacts"
 msgstr "傳�郵件至��的連絡人"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
 #: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "_Actions"
 msgstr "動作(_A)"
@@ -14272,7 +14273,7 @@ msgid "_Preview"
 msgstr "�覽(_P)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1474
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
 #: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Delete"
@@ -14317,21 +14318,21 @@ msgid "Show contact preview alongside the contact list"
 msgstr "在連絡人清單�邊顯示連絡人�覽"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1617
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
 #: ../modules/calendar/e-task-shell-view-actions.c:905
 msgid "Any Category"
 msgstr "任何分類"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/calendar/e-cal-shell-view-actions.c:1631
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
 #: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
 #: ../modules/calendar/e-task-shell-view-actions.c:950
 #: ../modules/mail/e-mail-shell-view-actions.c:1268
@@ -14555,7 +14556,7 @@ msgid "_Appointment"
 msgstr "約會(_A)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
@@ -14583,7 +14584,7 @@ msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
@@ -14707,115 +14708,115 @@ msgstr "事件"
 msgid "Save as iCalendar"
 msgstr "儲存為 iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "複製(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "D_elete Calendar"
 msgstr "刪除行事曆(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1254
 msgid "Delete the selected calendar"
 msgstr "刪除��的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1261
 msgid "Go Back"
 msgstr "�後"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
 msgid "Go Forward"
 msgstr "��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Select _Today"
 msgstr "�擇今天(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
 msgid "Select today"
 msgstr "��今日"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select _Date"
 msgstr "�擇日期(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
 msgid "Select a specific date"
 msgstr "��特定日期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
 #: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Purg_e"
 msgstr "清除(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 msgid "Purge old appointments and meetings"
 msgstr "刪除舊約會和會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
 #: ../modules/calendar/e-task-shell-view-actions.c:727
 msgid "Re_fresh"
 msgstr "�新整�(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 msgid "Refresh the selected calendar"
 msgstr "�新整���的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Rename the selected calendar"
 msgstr "�新命���的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Show _Only This Calendar"
 msgstr "�顯示這個行事曆(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1329
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1336
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1343
 msgid "_Delete Appointment"
 msgstr "刪除約會(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "Delete selected appointments"
 msgstr "刪除��的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete This _Occurrence"
 msgstr "刪除這次發生的事件(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "Delete this occurrence"
 msgstr "刪除此週期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete All Occ_urrences"
 msgstr "刪除所有發生的事件(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "Delete all occurrences"
 msgstr "刪除全部週期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "New All Day _Event..."
 msgstr "新增全天事件(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Create a new all day event"
 msgstr "建立新的全天事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
@@ -14823,126 +14824,126 @@ msgstr "建立新的全天事件"
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar 轉寄..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "New _Meeting..."
 msgstr "新增會議(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "Create a new meeting"
 msgstr "建立新的會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示��移動(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "_Open Appointment"
 msgstr "開啟約會(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "View the current appointment"
 msgstr "檢視目�的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1427
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "儲存為 iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Converts an appointment to a meeting"
 msgstr "將約會轉�為會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Conv_ert to Appointment..."
 msgstr "轉�為約會(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Converts a meeting to an appointment"
 msgstr "將會議轉�為約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1572
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1574
 msgid "Show one day"
 msgstr "顯示一天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "List"
 msgstr "清單"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "Show as list"
 msgstr "顯示�清單"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Month"
 msgstr "月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "Show one month"
 msgstr "顯示一個月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Week"
 msgstr "週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Show one week"
 msgstr "顯示一週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Show one work week"
 msgstr "顯示一個工作週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1610
 msgid "Active Appointments"
 msgstr "進行中的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1624
 msgid "Next 7 Days' Appointments"
 msgstr "未來 7 天的約會(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1655
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
 #: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Description contains"
 msgstr "�述包�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1662
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
 #: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Summary contains"
 msgstr "主旨包�"
 
 # zh_HK: msgstr "列�這個行事曆"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
 msgid "Print this calendar"
 msgstr "列�這個行事曆"
 
 # zh_HK: msgstr "�覽將�列�的行事曆內容"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
 msgid "Preview the calendar to be printed"
 msgstr "�覽將�列�的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1754
 msgid "Go To"
 msgstr "移至"
 
diff --git a/shell/ChangeLog b/shell/ChangeLog
deleted file mode 100644
index 2de87c8578..0000000000
--- a/shell/ChangeLog
+++ /dev/null
@@ -1,3978 +0,0 @@
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* e-shell-importer.c:
-	Remove deprecated Gtk+ symbols.
-
-2009-02-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #572962
-
-	* e-shell-window.c (setup_nm_support):
-	Pass e_shell_dbus_initialise() the right type of object,
-	and fix the incorrect function declaration.
-
-	* e-shell-nm.c (e_shell_network_monitor):
-	Go offline when we see NM_STATE_ASLEEP from NetworkManager.
-
-2009-02-03  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am (evolution_LDFLAGS): Use -mwindows on Windows to
-	build a "GUI" executable.
-
-2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell-window-commands.c (command_open_faq):
-	Call e_show_uri() instead of gnome_url_show().
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell.c:
-	* evolution-shell-component-utils.c:
-	* importer/intelligent.c:
-	* main.c:
-	Remove unneeded #include <libgnome/gnome-util.h>.
-
-2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>
-
-	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
-
-	* Fix for bug #566011
-
-	* e-user-creatable-items-handler.c
-	(e_user_creatable_items_handler_class_ini):
-	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h> and
-	add bindtextdomain().
-
-2009-01-01  Andre Klapper  <a9016009@gmx.de>
-
-	* e-shell-window-commands.c:
-	update Copyright to 2009.
-
-2008-12-28  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Related to bug #562155
-
-	* main.c (idle_cb):
-	Only call e_shell_set_crash_recovery() if the EShell Bonobo object
-	was constructed successfully, otherwise it will be NULL.  This fixes
-	a warning shown in the terminal output of bug #562155, but the bug
-	is not reproducible so it's not clear whether this fixes the bug.
-
-2008-12-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #564416
-
-	* e-shell-nm.c:
-	We've been listening for obsolete D-Bus signals.
-	Update to NetworkManager's current D-Bus API.
-
-2008-12-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #563250
-
-	* main.c (main):
-	Load on startup and save on shutdown, custom keyboard accelerators.
-
-2008-12-08  Jeff Cai  <jeff.cai@sun.com>
-
-	** Fix for bug #563077
-
-	* e-shell-window.c (setup_widgets): Don't pass NULL to 
-	gtk_icon_info_get_filename(). 
-
-	Fixes a crash if the gnome-settings-daemon is not running.
-	Observed on SUN Solaris. 
-
-2008-11-07  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #557581
-
-	* main.c:
-	Replace DEVELOPMENT with STABLE_VERSION, which actually defines
-	the latest stable version (e.g. 2.24).  STABLE_VERSION is only
-	defined if the current version is _unstable_ (e.g. 2.25).
-
-	* main.c (show_development_warning):
-	Use STABLE_VERSION instead of hard-coding the version number.
-
-2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	* importer/evolution-importer-client.h:
-	* importer/intelligent.c:
-	* test/evolution-test-component.c:
-	Only include the toplevel GTK+ header.
-
-2008-10-17  Kandepu Prasad  <kaprasad@novell.com>
-
-	** Fix for bug #311479
-
-	* import.glade:
-	* importer/import.glade: rephrasing the heading in Evolution Import 
-	Assistant
-
-2008-10-17  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fix for bug #548469
-
-	* Makefile.am:
-	* e-shell-nm-glib.c:
-	* e-shell-nm.c (reinit_dbus), (e_shell_network_monitor),
-	(e_shell_dbus_initialise):
-	* e-shell-window-commands.c (command_work_offline),
-	(command_work_online):
-	* e-shell-window.c (offline_toggle_clicked_cb), (impl_dispose):
-	* e-shell.c (impl_Shell_setLineStatus), (e_shell_construct),
-	(e_shell_set_line_status):
-	* e-shell.h:
-	Drop support for deprecated libnm-glib. 
-
-2008-10-03  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-shell-window.c:
-
-2008-09-30  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-shell.c:
-	* main.c:
-
-2008-09-29  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* shell.error.xml: Unbreak build, sorry for the inconvenience.
-
-2008-09-29  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* shell.error.xml: Mark some forgotten strings for translation. Fixes bug #553106
-
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-shell-window-commands.c:
-	* e-user-creatable-items-handler.c:
-
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-shell-view.c:
-
-2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fixes bug #553479
-
-	* shell.error.xml: String capitalisation improvements.
-
-2008-09-19  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-sidebar.c:
-
-2008-09-16  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* test/evolution-test-component.c:
-
-2008-09-15  Bharath Acharya  <abharath@novell.com>
-
-	Updated the list of Contributors.
-		
-	* e-shell-window-commands.c:
-
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-config-upgrade.c:
-	* e-shell-importer.c:
-	* e-shell-nm-glib.c:
-	* e-shell-nm.c:
-
-2008-09-04  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-component-registry.c:
-	* e-shell-settings-dialog.c:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-component-registry.h:
-	* e-component-view.c:
-	* e-corba-config-page.c:
-	* e-corba-config-page.h:
-	* e-shell-constants.h:
-	* e-shell-importer.h:
-	* e-shell.h:
-	* e-user-creatable-items-handler.h:
-	* es-event.c:
-	* es-menu.c:
-	* evolution-component.c:
-	* evolution-config-control.c:
-	* evolution-config-control.h:
-	* evolution-shell-component-utils.c:
-	* evolution-shell-component-utils.h:
-	* importer/evolution-importer-client.c:
-	* importer/evolution-importer-client.h:
-	* importer/evolution-importer-listener.c:
-	* importer/evolution-importer-listener.h:
-	* importer/evolution-importer.c:
-	* importer/evolution-importer.h:
-	* importer/evolution-intelligent-importer.c:
-	* importer/evolution-intelligent-importer.h:
-	* importer/intelligent.c:
-	* importer/intelligent.h:
-	* test/evolution-test-component.h:
-
-2008-08-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #549554 (patch from Paul Bolle)
-
-	* e-shell-importer.c: (struct info):
-	Drop sentence about an "Automatic" option.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-component-view.h:
-	* e-config-upgrade.h:
-	* e-shell-settings-dialog.h:
-	* e-shell-view.h:
-	* e-shell-window-commands.h:
-	* e-shell-window.h:
-	* e-sidebar.h:
-	* es-event.h:
-	* es-menu.h:
-	* evolution-component.h:
-	* evolution-listener.c:
-	* evolution-listener.h:
-
-2008-08-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	* test/evolution-test-component.c (impl_upgradeFromVersion):
-	Fix the function signature to conform to the component interface.
-
-2008-08-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #508732
-
-	* e-shell.c:
-	Add a "crash_recovery" flag, with accessor functions for it.
-
-	* e-shell-window (init_view):
-	Check and reset the "crash_recovery" flag before creating a
-	new shell view.  The components can use this flag to take
-	steps to recover from the previous crash.
-
-	* apps_evolution_shell.schemas.in:
-	Remove the "skip_recovery_dialog" and "recovery" keys.
-
-	* Evolution-Component.idl (createView):
-	Add a "select_item" boolean parameter.
-
-	* main.c:
-	Kill the crash recovery dialog.  Instead just set the crash
-	recovery flag in e-shell appropriately.
-
-2008-08-18  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #416258
-
-	* e-user-creatable-items-handler.c (ensure_menu_items),
-	(free_menu_items), (new_button_change), (setup_toolbar_button):
-	Added icon_toolbar for default items which is used instead of menu icon.
-
-2008-08-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell-importer.c:
-	Remove unused EShell pointer from ImportData.
-
-2008-08-07  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #467115
-
-	* e-component-registry.h:
-	Replace button and menu icon pixbufs with an icon name string.
-
-	* e-component-registry.c (query_components):
-	No need to create pixbufs, just save the icon name.
-
-	* e-sidebar.c:
-	Remember a default icon name rather than a default pixbuf.
-
-	* e-sidebar.c (e_sidebar_add_button), (e_sidebar_change_button_icon):
-	* e-shell-window.c (e_shell_window_change_component_button_icon):
-	Take an icon name instead of a pixbuf.
-
-	* e-shell-window.c (switch_view):
-	Call gtk_window_set_icon_name() instead of gtk_window_set_icon().
-
-	* e-shell-window.c (setup_widgets):
-	Change XML from pixtype="pixbuf" to pixbuf="filename" and derive
-	an appropriate filename from the icon name.
-
-2008-08-06  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #249844
-
-	* test/evolution-test-component.c: (impl__get_userCreatableItems):
-	Do not let compiler claim.
-
-2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #249844
-
-	* test/evolution-test-component.c (impl__get_userCreatableItems):
-	Use C_() macro instead of Q_() macro. 
-	Use fully qualified names for "New" submenu entries. 
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #544862
-
-	* apps_evolution_shell.scheams.in:
-	Clarify description of "use_authentication" key.
-
-2008-07-22  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #544022
-
-	* e-shell-window-commands.c: (char *authors[]):
-	Break the escape sequence properly (compiler warning cleanup).
-
-2008-07-20  Andre Klapper  <a9016009@gmx.de>
-
-	** Fixes bug #542828
-
-	* e-shell-window-commands.c:
-	update and fix list of contributors. Patch by Maxim Ermilov.
-
-2008-07-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #542587
-
-	* e-shell-window.c: Use new EOnlineButton widget.
-
-2008-07-19  Tor Lillqvist  <tml@novell.com>
-
-	Bug 543758 - Never mark empty strings for translations
-
-	* main.c (main): Change _("") to explicit gettext ("") to avoid
-	potentially confusing translation tools or translators.
-
-2008-17-14  Paolo Borelli  <pborelli@katamail.com>
-
-	** Fix for bug #542889
-
-	* e-shell-window.c:
-	* e-user-creatable-items-handler.c:
-	* e-sidebar.c:
-	Port to the new gtk tooltip api.
-
-2008-07-13  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell-folder-title-bar.[ch]:
-	Remove still more unused files.
-
-2008-07-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell-utils.[ch]:
-	Remove more unused files.
-
-	* e-user-creatable-items-handler.c:
-	Remove inclusion of "e-shell-utils.h".
-
-2008-07-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-history.[ch]:
-	Remove these files.  They were written in 2002 and, AFACIT,
-	never used for anything.
-
-2008-07-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #540282
-
-	* apps_evolution_shell.schemas.in:
-	Remove the "printing" GConf key.  We use a key file now.
-
-2008-06-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* test/evolution-test-component.c:
-	Use <glib/gi18n.h> instead of <bonobo/bonobo-i18n.h>.
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534360
-
-	* e-component-view.h:
-	* e-corba-config-page.h:
-	* e-history.h:
-	* e-shell-folder-title-bar.h:
-	* e-shell-settings-dialog.h:
-	* e-shell-view.h:
-	* e-shell.h:
-	* e-user-creatable-items-handler.h:
-	* evolution-config-control.h:
-	Migrate from deprecated GtkObject symbols to GObject equivalents.
-
-2008-05-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #525241 (EPluginUI)
-
-	* main.c (main): Register the EPluginUIHook type.
-
-2008-05-08  Tor Lillqvist  <tml@novell.com>
-
-	* main.c (main) [Win32]: If no message catalog is installed for
-	the current locale language, don't bother with the localisations
-	provided by other things then either. Reset thread locale to
-	"en-US" and C library locale to "C" to ensure that. This fixes the
-	problem where those items in the UI that don't originate from
-	message catalogs still appear translated even though message
-	catalogs were not installed.
-
-2008-04-29  Akhil Laddha  <lakhil@novell.com>
-
-	** Fix for bug #529660
-
-	* main.c (show_development_warning): Change stable version to 2.22.1
-
-2008-04-26  James Westby  <jw+debian@jameswestby.net>
-
-	** Fix for bug #518103
-
-	* e-shell-nm-glib.c: (e_shell_glib_network_monitor):
-	* e-shell-nm.c: (e_shell_network_monitor):
-	* e-shell.c: (e_shell_construct):
-	Check online status from NetworkManager at startup instead of using the
-	last-used-state.
-
-2008-04-17  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #526739
-
-	* e-shell-window-commands.c: (command_quick_reference):
-	Use gio instead of gnome-vfs.
-
-2008-04-07  Ondrej Jirman  <megous@megous.com>
-
-	** Fix for bug #525238
-
-	* e-shell-window.c: (switch_view):
-	* es-event.c:
-	* es-event.h:
-	Add new "component.activated" event. Event is emitted whenever
-	component is activated. ESEventTargetComponent contains an id
-	of the component being activated.
-
-2008-03-25  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	** Added configurable Proxy settings for Evolution.
-
-	* apps_evolution_shell.schemas.in:
-
-2008-03-03  Tor Lillqvist  <tml@novell.com>
-
-	* main.c (main) [Win32]: Drop the call to gtk_rc_parse_string() to
-	set gtk-fallback-icon-theme = "gnome". Instead just bundle a
-	suitable gtkrc with Evolution. And actually what we want to get
-	Tango icons seems to be gtk-fallback-icon-theme = "Tango", and no
-	mention of the gnome icon theme at all in gtkrc. (It is still
-	used, though.)
-
-2008-03-03  Tor Lillqvist  <tml@novell.com>
-
-	* main.c: On Windows, set PATH to include Evolution's "bin" folder
-	and the "lib/evolution/$(BASE_VERSION)/components" folder. Set
-	BONOBO_ACTIVATION_PATH to the "lib/bonobo/servers" folder
-
-2008-03-03  Johnny Jacob  <jjohnny@novell.com>
-
-	* e-shell-window-commands.c (authors): Missed '"' :-) .
-	
-2008-03-03  Johnny Jacob  <jjohnny@novell.com>
-
-	* e-shell-window-commands.c (authors): Updated contributors list.
-
-2008-03-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* main.c: (main): Committing the build fix that comes up if
-	DEVELOPMENT is enabled.
-
-2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bnc #173186
-
-	* e-shell-nm.c: (e_shell_network_monitor): Upstreamed Fejj's OpenSUSE
-	patch. Crash while quitting.
-
-2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	reviewed by: <delete if not using a buddy>
-
-	* e-shell-nm.c: (e_shell_network_monitor):
-
-2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bnc #159736. Patch from OpenSUSE.
-
-	* e-shell-nm.c: (e_shell_network_monitor):
-
-2008-02-13  Matthew Barnes  <mbarnes@redhat.com>
-
-	* main.c (kill_dataserver):
-	Add commands to kill recent versions of evolution-data-server.
-
-2008-01-30  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* apps_evolution_shell.schemas.in: Change Crash Recovery to Crash
-	detection.
-	* main.c: (show_recovery_warning):
-
-2008-01-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-component-registry.c:
-	Replace G_GNUC_FUNCTION (deprecated) with G_STRFUNC.
-
-2008-01-22  Jan Tichavsky  <Jan.Tichavsky@gmail.com>
-
-	** Fix for bug #511232
-	
-	* e-shell.c: Fixed typo Uknown -> Unknown
-	(patch committed by Andre Klapper)
-
-2008-01-21  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell-window.c (setup_status_bar):
-	Make the status bar height as large as the task bar to eliminate
-	"bouncing" when navigating the main menu.  Patch by Jean-Christophe
-	Begue (#509509).
-
-2008-01-19  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-shell.c: (set_line_status): Fix a regression due to my previous
-	commit.
-
-2008-01-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #329712
-
-	* e-shell-window-commands.c: (update_offline_menu_item):
-	* e-shell-window.c: (update_offline_toggle_status),
-	(update_send_receive_sensitivity),
-	(offline_toggle_clicked_callback):
-	* e-shell.c: (e_shell_construct), (e_shell_save_settings),
-	(set_line_status):
-	* e-shell.h: Add a new state to maintian forced offline.
-
-2008-01-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* apps_evolution_shell.schemas.in: Add missing punctuation.
-
-2008-01-11  Bharath Acharya <abharath@novell.com>
-
-	** Fix for bug #508678
-
-	* e-shell-view.c: Included missing header glib/gi18n.h
-
-2008-01-11  Changwoo Ryu  <cwryu@debian.org>
-
-	** Fix for bug #508282
-
-	* e-shell-window.c (switch_view): 
-	* e-shell-view.c (impl_ShellView_setTitle): Mark the window title
-	for translation.
-
-2008-01-07  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell-window-commands.c:
-	Update copyright notice in About dialog.
-
-2008-01-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #219197
-
-	* e-shell.h:
-	* e-shell.c: (e_shell_can_quit), (e_shell_do_quit), (e_shell_quit):
-	Call of e_shell_quit divided into two functions, one to check if quit
-	is acceptable by all components and second to do quit.
-	* main.c: (gnome_master_client_save_yourself_cb),
-	(gnome_master_client_die_cb), (main):
-	Quit application when session dies.
-
-2007-12-10  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #502501
-
-	* main.c: (show_recovery_warning): Re use the existing string.
-
-2007-12-05  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Add basic support for crash recovery
-
-	* apps_evolution_shell.schemas.in: Keys to recover and recovery dialog.
-	* e-shell.c: (e_shell_quit): Delete the lock while quitting.
-	* main.c: (show_recovery_warning), (idle_cb): Create lock and also show 
-	the warning dialog.
-
-2007-11-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #499920
-
-	* es-event.h:
-	Avoid including private header "e-shell.h".
-	Use a forward declaration of EShell instead.
-
-	* es-event.c:
-	Safe to include "e-shell.h" here.
-
-2007-11-30  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #400213
-
-	* e-shell-window.c: (load_icons): Function removed.
-	* e-shell-window.c: (update_offline_toggle_status):
-	Do not use pixmaps and masks, load images from file, instead.
-
-2007-11-26  Andre Klapper  <a9016009@gmx.de>
-
-	** Fixes bug #497810
-
-	* e-shell-window-commands.c:
-	add "Evolution FAQ" help menu item
-
-2007-11-02  Damien Carbery  <damien.carbery@sun.com>
-
-	** Fixes bug #492058
-
-	* e-shell-window.c:
-	* e-shell.c: Name the anonymous unions to build with the Sun
-	Studio compiler.
-
-2007-11-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell-window-commands.c:
-	Update the copyright notice in the About dialog.
-
-2007-11-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-user-creatable-items-handler.c (ensure_menu_items):
-	Don't compare a character pointer to a string literal.
-
-2007-10-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* GNOME_Evolution_Shell.server.in.in: Remove the version.
-	* main.c: (show_development_warning): Update the stable version.
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-component-registry.c: (query_components):
-	* e-component-view.c: (e_component_view_new),
-	(e_component_view_new_controls), (e_component_view_set_title),
-	(e_component_view_set_button_icon):
-	* e-config-upgrade.c:
-	* e-shell-settings-dialog.c: (e_shell_settings_dialog_new):
-	* e-shell-window.c: (component_view_free):
-	* es-event.c: (es_event_peek):
-	* es-menu.c: (es_menu_new):
-	* importer/evolution-importer-client.c:
-	(evolution_importer_client_create_control):
-	Warning fixes:
-	- NULL vs 0 vs FALSE
-	- ANSIfication of declarations
-	- guint for 1-bit bitfields
-
-2007-10-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell-window-commands.c:
-	Add an icon for FilePageSetup.
-
-2007-10-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #329823
-
-	* Evolution-Shell.idl: (setButtonIcon):
-	* e-sidebar.h: (e_sidebar_change_button_icon):
-	* e-sidebar.c: (struct Button), (button_new), (button_free),
-	(e_sidebar_change_button_icon):
-	* e-shell.h: (EMainShellFunc), (e_shell_foreach_shell_window):
-	* e-shell.c: (EMainShellFunc), (e_shell_foreach_shell_window):
-	* e-component-view.h: (e_component_view_set_button_icon):
-	* e-component-view.c: (e_component_view_set_button_icon):
-	* e-shell-window.h: (e_shell_window_change_component_button_icon):
-	* e-shell-window.c: (e_shell_window_change_component_button_icon):
-	* e-shell-view.c: (struct change_icon_struct),
-	(change_button_icon_func), (impl_ShellView_setButtonIcon),
-	(e_shell_view_class_init):
-	Added support to change component's button icon.
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* e-shell.c:
-	* e-shell-window.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-10-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell-window-commands.c (command_about):
-	Fix capitalization of program name in About dialog (#481325).
-
-2007-10-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #469657
-
-	* e-shell-settings-dialog.c:
-	Use destroy functions in GHashTables to simplify memory management.
-
-2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #461195
-
-	* e-shell-marshal.list: Remove needless marshalers.
-	* e-shell-folder-title-bar.c:
-	* e-shell.c:
-	* e-shell-window.c:
-	* e-shell-marshal.list:
-	* e-sidebar.c: Use GObject's marshalers.
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #477045
-
-	* e-shell-window-commands.c:
-	Use standard icon names where applicable.
-
-2007-09-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Move the test component to a 'test' subdirectory (#469992).
-
-2007-09-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-shell-window-commands.c: Add contributors to the credits section.
-	Thanks a lot to EvaSDK.
-
-2007-09-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #471791 (Move away from asserts to g_ret*)
-
-	* e-shell-importer.c: (create_help):
-	* e-shell-window-commands.c: (update_offline_menu_item):
-	* e-shell-window.c: (init_view), (update_offline_toggle_status),
-	(offline_toggle_clicked_callback), (setup_offline_toggle):
-	* e-shell.c: (window_delete_event_cb), (e_shell_construct),
-	(remove_dir), (e_shell_attempt_upgrade):
-	* e-user-creatable-items-handler.c: (execute_verb):
-	* main.c: (open_uris), (idle_cb):
-
-2007-08-08  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Add a new command line option to disable crash-on-select mails,
-	tasks, contacts.
-
-	* main.c: (main): Added a new command line option.
-
-2007-07-26  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* e-shell-window-command.c: (view_statusbar_item_toggled_handler),
-	(view_sidebar_item_toggled_handler):
-	* e-shell-window.c: (setup_status_bar):
-	* e-user-creatable-items-handler.c: (setup_toolbar_button): Plugged
-	memory leaks.
-
-2007-07-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	* es-event.h: Declare es_event_target_new_shell().
-
-2007-07-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #446894
-
-	* e-shell-window-commands.c (command_page_setup):
-	Callback for new FilePageSetup verb.
-
-2007-07-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added a hook event after the shell is started.
-
-	* e-shell.c: (e_shell_create_window):
-	* es-event.c: (es_event_target_new_shell):
-	* es-event.h:
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #448201 from Gabor Kelemen
-
-	* main.c: (main): Add translation domain
-
-2007-06-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #325882
-
-	* import.glade:
-	* e-active-connection-dialog.glade:
-	* importer/import.glade:
-	Changed GTK_WIN_POS_NONE to GTK_WIN_POS_CENTER_ON_PARENT.
-
-2007-06-17  Tobias Mueller <tobiasmue@svn.gnome.org>
-
-	* evolution-test-component.c:
-	removed createControls stuff. Fixes #444289
-
-2007-06-15  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell-folder-title-bar.c:
-	Use ellipsized GtkLabels instead of EClippedLabels (#447727).
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #386503 from Matthew Barnes
-	
-	* e-shell-window.c: (e_shell_window_new):
-	* main.c: (main):
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
-	
-	* Makefile.am:
-
-2007-06-02  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* Fix bug #441055
-
-	* e-component-registry.c: (query_components):
-	* e-shell-nm-glib.c: (e_shell_nm_glib_initialise),
-	(e_shell_nm_glib_dispose):
-	* e-shell-settings-dialog.c: (load_pages):
-	various compilation warning cleanup
-
-2007-05-28  Jules Colding  <colding@omesc.com>
-
-	* main.c (main): Prevent dup2() and close() on -1
-
-2007-05-13  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell.c (impl_Shell_handleURI):
-	Revert the change from 2007-05-11.  (#407104)
-
-2007-05-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #337616
-
-	* Makefile.am: Add $(schema_DATA) to DISTCLEANFILES.
-
-2007-05-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell.c (impl_Shell_handleURI):
-	Create a shell window if the schema or an alias was found.
-	Previously this only opened a window if an alias was found
-	but not the schema.  Makes the GNOME Clock applet able to
-	correctly start Evolution once again.  (#407104)
-
-2007-05-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* main.c (show_development_warning):
-	Bump stable version recommendation from 2.8.1 to 2.10.1.
-
-2007-04-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	* main.c: #include <gtk/gtkcheckbutton.h>  (#433005)
-	Patch from Daniel Gryniewicz.
-
-2007-04-23  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* main.c: (main): Fix 2 build breaks if built with development version
-
-2007-04-22  Stephen Cook  <siti@orcon.net.nz>
-	
-	* main.c: fix startup notification problem (closes: #271851)
-	
-
-2007-04-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #259606 from Michael Meeks
-
-	* e-shell-marshal.list:
-	* e-shell-window.c: (get_component_view),
-	(sidebar_button_selected_callback),
-	(sidebar_button_pressed_callback), (setup_widgets): Added support for
-	middle click to open the component in new window.
-	* e-shell.c:
-	* e-sidebar.c: (button_pressed_callback),
-	(boolean_handled_accumulator), (e_sidebar_class_init),
-	(e_sidebar_add_button):
-	* e-sidebar.h:
-
-2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #429422
-
-	* e-shell.c (impl_finalize):
-	e_free_string_list() is dead; just do it manually.
-
-	* e-user-creatable-items-handler.c (setup_toolbar_button):
-	Use g_object_ref_sink() instead of gtk_object_sink().
-
-	* e-shell-importer.c:
-	Drop support for GnomeFileEntry.
-
-	* importer/intelligent.c (create_gui):
-	Use g_object_ref() instead of gtk_widget_ref().
-
-	* e-history.c (e_history_init):
-	Clear the floating flag without using GTK_OBJECT_UNSET_FLAGS().
-
-	* e-shell-settings-dialog.c:
-	Include missing header file(s).
-
-2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-shell-window.c:
-	Fix "incompatible pointer type" warnings (#360619).
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-	* e-component-registry.c (query_components):
-	* e-shell-settings-dialog.c (load_pages):
-	* e-shell-window-commands.c (command_quick_reference):
-	Use g_get_language_names() instead of gnome_i18n_get_language_list().
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #419469 - Miscellaneous main.c cleanups
-
-	* main.c (kill_dataserver): Kill evolution-data-server-1.8.
-
-	* main.c (show_development_warning): Call gtk_dialog_run() instead
-	of listening for a "response" signal.  Pass the checkbox state back
-	to main() and let main() set the "show_dialog_warning" GConf key.
-
-	* main.c (open_uris), (idle_cb), (main): Use the remaining_args
-	string vector directly instead of needlessly building a GSList
-	out of it.
-
-	* main.c (main): Manage a reference to the default GConf client and
-	pass it to the functions that need it.
-
-2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #360240
-
-	* e-shell-importer.c (importer_file_page_new):
-	Remove unused variable.
-
-2007-03-12 Harish Krishnaswamy <kharish@novell.com>
-	
-	* e-shell-window-commands.c : Update contributors' list for
-	credits.
-
-2007-02-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #360946
-
-	e-shell-window-commands.c (command_about): Migrate to GtkAboutDialog,
-	use "evolution" for the icon name, add a website link.
-
-	main.c (main): Set default window icon name to "evolution".
-
-2007-02-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Rewrite of print settings schema from Matthew Barnes
-
-	* apps_evolution_shell.schemas.in.in:
-
-2007-02-09  William Jon McCann  <mccann@jhu.edu>
-
-	* e-shell-nm-glib.c: Fix the build.  Fixes #403744
-
-2007-01-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added schemas from GtkPrint API by Ebby Wiselyn.
-
-	* apps_evolution_shell.schemas.in.in:
-
-2006-12-03  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-shell.c: (impl_dispose): Fix memory leak of iid.
-
-2006-11-29  Chris Halls <halls@debian.org>
-
-	* main.c: Register import eplugin type. 
-	Fixes bug #372528.
-
-2006-10-17  Harish Krishnaswamy  <kharish@novell.com>
-
-	* main.c: (show_development_warning):  Update last
-	stable version.
-
-2006-10-16  Chris Heath  <chris@heathens.co.nz>
-
-	* e-shell-window.c (component_view_free): Fix memory leak.
-	Fixes bug #360815.
-
-2006-10-13  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Fix for bug #334966
-
-	* e-shell-window.c: (impl_dispose), (e_shell_window_init),
-	(e_shell_window_set_title): Fixes a crash while closing window.
-
-2006-09-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #343331
-	
-	* e-shell-window.c: (impl_dispose): Remove the timer which seem to get
-	activated after we destroy.
-
-2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes #351332
-
-	* e-shell-window.c: Fix implicit function declarations.
-
-2006-09-14  Andre Klapper  <a9016009@gmx.de>
-
-	* main.c: update last stable version number from 2.6.3 to 2.8.0
-
-2006-09-04  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-shell-window-commands.c: Add documentation
-	credits.
-
-2006-08-23  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #334821 by Tollef Fog Heen
-	
-	* main.c: it should not spawn the default shell for uris.
-
-2006-08-23  Daniel Gryniewicz  <dang@gentoo.org>
-  	 
-	* e-shell-window.c:
-	Make sure default window sizes are positive numbers.
-	Fixes bug 349967. Committed by Andre Klapper.
-
-2006-08-22  Andre Klapper  <a9016009@gmx.de>
-
-	* e-shell-window-commands.c: Update some credits for
-	the previous development series.
-
-2006-08-22  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fixes bug #346317
-	* e-user-creatable-items-handler.c: (set_combo_button_style): Truncate
-	spaces from the label of new mail button.
-
-2006-08-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #346797 Patch by Matthew Barnes
-
-	* e-shell-window-commands.c: (command_submit_bug): Fix to use new bug
-	buddy.
-
-2006-08-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-user-creatable-items-handler.c: (new_button_change),
-	(setup_toolbar_button): Plug some leaks.
-
-2006-08-02  Andre Klapper  <a9016009@gmx.de>
-
-	* main.c: update last stable version number from 2.6.2 to 2.6.3
-
-2006-07-27  Bastien Nocera  <hadess@hadess.net>
-
-	* e-shell-nm-glib.c: (e_shell_glib_network_monitor),
-	(e_shell_nm_glib_initialise), (e_shell_nm_glib_dispose):
-	* e-shell-nm.c: (e_shell_dbus_dispose):
-	* 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>
-
-	** Fix for bug #345331
-	
-	* 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.
-
-2006-06-17  Tor Lillqvist  <tml@novell.com>
-
-	* e-shell.c (impl_finalize): Don't call
-	bonobo_activation_active_server_unregister() here, it's too late,
-	the EShell Bonobo object has already been deactivated and its
-	associated CORBA object is NULL.
-	(notify_no_windows_left_idle_cb): Instead, call
-	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>
-
-	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-02-21  Tor Lillqvist  <tml@novell.com>
-
-	* main.c (main): On Win32, finally call link_shutdown() (from
-	ORBit2/linc2), otherwise if we have used any other component than
-	mail, we will hang with the link_io_thread still running (blocked
-	in g_poll()). Sigh, the linc2 code is a mystery. Why this is
-	necessary I have no idea.
-
-	* main.c (main): On Win32, set the gtk-fallback-icon-theme to
-	"gnome".
-
-2006-02-07  Andre Klapper  <a9016009@gmx.de>
-
-	* e-shell-window-commands.c: changing year from 2005 to 2006.
-
-2006-02-05  Andre Klapper  <a9016009@gmx.de>
-
-	* shell.error.xml: fixing one typo. fixes #304996 partially.
-
-2006-02-05  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* e-shell-nm-glib.c: init the nm-dbus connection once. 
-	
-2006-01-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-corba-config-page.c: (e_corba_config_page_class_init):
-	* e-shell-folder-title-bar.c: (e_shell_folder_title_bar_construct):
-	* e-shell-window.c: (init_view):
-	* e-shell.c: (detect_version), (e_shell_construct), (e_shell_new),
-	(e_shell_attempt_upgrade), (e_shell_create_window),
-	(e_shell_save_settings):
-	* main.c: (idle_cb):
-	Remove unused code and fix format specifiers in some cases.
-
-2006-01-26  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	** Fixes Bug #257654
-	
-	* e-shell-window.c:
-	* e-shell-window-commands.c: Added code to show/hide sidebar.
-
-2006-01-29  Harish Krishnaswamy  <kharish@novell.com>
-
-	* main.c: (show_development_warning):
-	 s/don't/do not/ string change. Fixes #325276.
-
-2006-01-27  Andre Klapper <a9016009@gmx.de>
-	* apps_evolution_shell.schemas.in.in: changed tow strings to add
-	missing punctuation and clarification for translators.
-	Fixes bug 306117.
-
-2006-01-26  Andre Klapper <a9016009@gmx.de>
-	* e-shell-window-commands.c: adding missing comma in the
-	contributors list.
-
-2006-01-23  Joe Marcus Clarke <marcus@freebsd.org>
-
-	* e-user-creatable-items-handler.c: adding a check to make sure 
-	the shortcut key is not the NUL byte. Fixes bug 327468.
-
-2006-01-21  Andre Klapper <a9016009@gmx.de>
-
-	* e-shell-settings-dialog.c: changed string "Settings" to 
-	"Preferneces" to keep consistency. Fixes bug 327933.
-
-2006-01-19  Kyle Ambroff  <kambroff@csus.edu>
-
-	* shell.error.xml: Default to [Cancel] instead of [Forget] in the
-	when selecting "Forget Passwords" from the menu. (#325871)
-
-2006-01-06  Andre Klapper <a9016009@gmx.de>
-	* shell/e-shell-window.c: fixing two missing whitespaces.
-	Fixes bug 325568.
-
-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).
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* shell.error.xml: removed a typo. yeah.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* shell.error.xml: removed a duplicated word. Fixes bug 325119.
-
-2005-12-22  Tor Lillqvist  <tml@novell.com>
-
-	* Evolution-Shell.idl: Guard against generating code when running
-	this through the IDL compiler elsewhere than here in evo/shell,
-	the same way as in Evolution-Component.idl. Otherwise we get
-	duplicated IDL-generated functions in the libeshell and
-	libevolution-mail DLLs (shared libraries), which causes much pain
-	on Win32 at least, and is useless and potentially risky on all
-	platforms.
-
-2005-09-24  Andre Klapper  <a9016009@gmx.de>:
-	
-	Reviewed and committed by Harish <kharish@novell.com>
-
-	* 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
-	* Evolution-Shell.idl
-	* Evolution.idl:
-	Remove duplicate definitions and circular dependencies.
-	
-	* e-shell.c: comment out the implementation for findComponent. 
-	If implemented, this creates a circular dependency between the
-	Shell.idl and Component.idl. 
-	** This is just a work-around **
-
-2005-12-22  Shreyas Srinivasan <sshreyas@novell.com>
-
-	* Network Manager Support for shell
-	
-	* Evolution-Component.idl (setLineStatus): Add enum ShellState
-	which can represent network down rather than just a boolean.
-	
-	* e-shell-nm.c: Add new file handles offline/ online signals
-	generated by the Network Manager using the native dbus interface.
-
-	* e-shell-nm-glib.c: Add new file handles offline/ online signals
-	generated by the Network Manager using the glib interface.
-	
-	* Makefile.am: Add e-shell-nm.c or e-shell-nm-glib.c to the list
-	of files built into evolution_sources depending on how evolution
-	is configured.
-	
-	* e-shell-window_commands.c: Use new changed signature of
-	e_shell_go_offline.
-	
-	* e-shell-window.c (setup_status_bar): Initialise the dbus
-	connection.
-	
-	* e-shell.c (set_line_status): Handle network down triggered
-	Force_offline. New signatures for e_shell_go_offline and 
-	e_shell_go_online.
-	
-	* e-shell.h: New function signatures for e_shell_go_offline and
-	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.
-
-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.
-
-	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()
-	instead of xmlParseFile() directly.
-
-	* e-shell.c
-	* e-shell-importer.c: Use GLib API when applicable.
-
-	* e-shell-importer.c
-	* e-shell-window.c: Construct pathname of glade file at run-time.
-
-	* e-shell-window-commands.c: Include e-util-private.h for Win32
-	redefinition of EVOLUTION_DATADIR.
-
-	* main.c: No SIGSEGV handling on Win32.
-	(main): Drop unused evolution_directory variable.
-
-2005-12-12  David Malcolm  <dmalcolm@redhat.com>
-
-	* e-shell-window.c (setup_widgets): escape the string when generating 
-	XML UI description of component switcher menu item, to avoid it being 
-	non-well-formed when a translation contains a quote character. Fixes 
-	#322001
-
-2005-11-14  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-shell-settings-dialog.c: (set_dialog_size),
-	(e_shell_settings_dialog_init): Revert the previous
-	patch as it distorts the size of the dialog on some
-	displays.
-
-2005-11-10  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-shell-settings-dialog.c (set_dialog_size) 
-	(e_shell_settings_dialog_init): Set the size of the preference
-	window so that it doesnt flicker. Hide it till all the pages are
-	loaded.
-
-2005-10-25  Harish Krishnaswamy  <kharish@novell.com>
-
-	* main.c: (show_development_warning): Update
-	version and bugzilla information.
-
-2005-09-23  S.Antony Vincent Pandian <santony@gmail.com>
-
-	solves bug # 307780
-
-	* 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
-	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()
-	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
-	on it.
-	setting the component listener to the component.
-		
-2005-08-28  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-shell-window-commands.c: Update credits.
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-window-commands.c: include missing e-error.h
-
-	* e-component-registry.c (query_components): cast away a seemingly
-	spurious warning.
-
-2005-08-17  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell.c (impl_Shell_handleURI): fix warning.
-	(impl_Shell_findComponent): fix signature for warning.
-
-2005-08-16  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #312668.
-
-	* e-shell.c (set_line_status, set_line_status_complete)
-	(set_line_status_finished): new code to set componetns on/offline.
-	(e_shell_go_online, e_shell_go_offline): use new interface.
-	(offline_procedure_started_cb, offline_procedure_finished_cb): removed.
-	(impl_dispose): cleanup line status listener.
-	(e_shell_init): setup line status listener.
-
-	* evolution-listener.[ch]: skeleton listener object for new
-	setlinestatus call.
-
-	* Evolution-Offline.idl, e-shell-offline-handler.[ch]: killed.  We
-	just add a single interface on EvolutionComponent now, much
-	simpler.
-
-2005-08-15  Christian Kellner  <gicmo@gnome.org>
-
-	* Makefile.am: Install missing e-plugin header es-event.h
-	and es-menu.h.
-	Fixes bug #313585.
-
-2005-08-10  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use privsolib instead of privlib. Link with
-	SHELL_LIBS. Use NO_UNDEFINED. Use EXEEXT. Use hack to workaround
-	MSYS feature on Win32 when installing the schemas.
-	(INCLUDES): Define EVOLUTION_IMAGESDIR like in
-	../e-util/e-util-private.h, not EVOLUTION_IMAGES.
-	(idl_defines): Pass marker macro to IDL compiler, see below.
-
-	* Evolution-Component.idl: Don't generate duplicate code in skels
-	and stubs when including this file from other idl files (in
-	particular, ../mail/Evolution-Mail.idl). Use the include_defs and
-	inhibit pragmas unless IDL-compiling in this directory. See
-	lists.ximian.com/pipermail/evolution-patches/2005-June/010899.html
-
-	* e-shell-utils.c
-	* e-shell-windows.c: Ue EVOLUTION_IMAGESDIR in such a way that it
-	works even when it is a function call.
-
-2005-08-10  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #271984.
-
-	* es-menu.c (esm_class_init): remove debug.
-
-2005-07-26  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am, evolution-component.h: fix make distcheck
-	issues.
-
-2005-07-21  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* e-component-registry.c (query_components): Dont enter default values 
-	for button label and menu label
-	* e-shell-window.c (setup_widgets): Dont add the sidebar button when 
-	there is no label.
-
-2005-07-22  Sankar P  <psankar@novell.com>
-
-	* shell.error.xml : Changed the strings to be more interactive 
-	and consistent with the exisiting dialog prompts.
-
-2005-07-21  Sankar P  <psankar@novell.com>
-
-	* shell.error.xml : Added string for forget password prompt.
-
-	* e-shell-window-commands.c: (command_forget_passwords)
-	Added call to a confirmation dialog before forgetting passwords.
-	Fixes bug #216021
-
-2005-07-21  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-window-commands.c: fix the pixmap location for the
-	settings menu.
-
-	* e-shell-window.c (setup_widgets): reverted dobey's patch to put
-	the components in the useless tools window.
-
-2005-07-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-shell-window.c: (setup_widgets): Free the style here.
-
-2005-07-06  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-importer.c (import_druid_finish): now setup a window to
-	display importer progress, so it doesn't have to be copied for all
-	importers & they can all share it.
-	(import_druid_finish): fix the error id/prompt
-
-2005-07-01  Not Zed  <NotZed@Ximian.com>
-
-	* import.glade: moved from importer/ to here.
-
-	* importer/*: Killed all of this off.
-
-	* Makefile.am: remove importer/ and related stuff.
-
-2005-06-24  Harish Krishnaswamy <kharish@novell.com> 
-
-	(patch submitted by Andre Klapper <a9016009@gmx.de>)
-	* e-shell-window-commands.c: changed copyright year from 2004 to 2005
-
-2005-06-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-window-commands.c: added jonathan dieter.  Fixed up the
-	busted utf8 and duplicates.
-
-2005-06-21  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-window-commands.c: add brian mury to contributors.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* GNOME_Evolution_Shell.server.in.in: Use EXEEXT.
-
-	* GNOME_Evolution_Test.server.in.in: Use SOEXT.
-
-2005-06-02  Not Zed  <NotZed@Ximian.com>
-
-	* Evolution.*.idl: Fix so these are only ever included once.
-
-	* evolution-component.c: BonoboObject wrapper for
-	Evolution::Component interface.  Abstract, doesn't implement
-	methods.
-
-	* Evolution-Shell.idl: add a method to find a component by
-	component alias.
-
-	* e-shell.c (impl_Shell_findComponent): & implement it
-
-2005-06-01  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-window-commands.c: fixed the utf8 in the last patch.
-
-2005-06-01 S.Çaglar Onur <caglar@uludag.org.tr>
-
-	* e-shell-window-commands.c (authors[]): Fixed my name.
-
-2005-05-31  Rodrigo Moya <rodrigo@novell.com>
-
-	* GNOME_Evolution_Shell.server.in.in: added missing name to
-	Shell_Config_Factory object description.
-
-2005-05-25  Not Zed  <NotZed@Ximian.com>
-
-	* main.c (main): remove mono registrtion, this is implemented
-	using a plugin now.  register the plugin type loader hook.
-
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: fix error file build/path changes
-
-2005-05-16  Srinivasa Ragavan <sragavan@novell.com>
-	* e-component-registry.c(component_info_new) (component_info_free)(query_components):
-	  e-component-registry.h:
-	  e-shell-window.c (setup_widgets):
-	  e-sidebar.c (button_new) (button_free) (e_sidebar_add_button) (set_mode_internal):
-	  e-sidebar.h:
-	  
-	  Added support to read .server files for tooltips and show them in ICON only mode.
-	  
-2005-05-13  Rodney Dawes  <dobey@novell.com>
-
-	* e-shell-window.c (setup_widgets): Update for the new menu layout by
-	putting the "component" switching items under the "Tools" menu
-
-2005-05-13  Shreyas Srinivasan	<sshreyas@novell.com>
-
-	* e-shell-offline-handler.c: Remove the go->offline dialog.
-	
-2005-05-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* main.c: (kill_dataserver): add evolution-data-server-1.2
-	to the list of old dataserver instances.
-
-2005-05-06  Chenthill Palanisamy  <pchenthill@novell.com>
-	
-	Fixes #301459
-	* e-shell-importer.c: Correct the typo error and made
-	the sentence more clear.
-
-2005-05-02  JP Rosevear  <jpr@novell.com>
-
-	* Evolution.idl: remove Evolution-common.idl
-
-	* Makefile.am: don't build Evolution-common.idl
-
-	* Evolution-common.idl: remove dead code
-	
-2005-04-29  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: don't build/install corba icon utils
-
-	* Remove e-shell-corba-icon-utils.c	
-
-2005-04-29  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: don't build wizard related code
-
-	* Evolution.idl: remove wizard idl include
-
-	* e-shell.c: remove wizard include
-
-	* Remove wizard related code which is now in a plugin (and is much
-	simpler due to eplugin)
-
-2005-04-28  Not Zed  <NotZed@Ximian.com>
-
-	* main.c (main): setup the profiling plugin hook if profiling is
-	compiled in.
-
-2005-04-06  Yong Sun <Yong.Sun@Sun.COM>
-
-	* e-shell-importer.c: (get_name_from_component_info):
-	Return the localized name of the supported file type.
-
-2005-03-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #73066
-	
-	* apps_evolution_shell.schemas.in.in: fix typo
-
-2005-03-21  JP Rosevear  <jpr@novell.com>
-	
-	* main.c: switch #ifdef DEVELOPMENT to #if DEVELOPMENT so the
-	configure.in foo actually controls this
-
-2005-03-17  Not Zed  <NotZed@Ximian.com>
-
-	* es-event.h: fix the qualifier bit assignments for the STATE target.
-
-	* e-shell.c (offline_procedure_finished_cb): fix offline state event.
-
-2005-02-28  JP Rosevear  <jpr@novell.com>
-
-	* e-shell-window-commands.c (command_submit_bug): update authors
-	list for about dialog
-
-2005-02-21  JP Rosevear  <jpr@novell.com>
-  
-  	* es-event.c (es_event_target_new_upgrade): create upgrade target
-  
-  	* es-event.h: add upgrade target 
-  
-  	* e-shell.c (e_shell_attempt_upgrade): emit upgrade.done
-  
-2005-02-23  JP Rosevear  <jpr@novell.com>
- 
- 	Fixes #33287
- 	
- 	* e-shell-window.c (e_shell_window_new): set the send/receive
- 	sensitivity when we first start up
-	
-2005-02-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* e-shell-window-commands.c:
-	* e-shell.c:
-	* main.c: Include <libedataserverui/e-passwords.h>.
-
-2005-02-22  Marco Pesenti Gritti  <marco@gnome.org>
-
-	* shell/e-shell-window-commands.c: (command_quick_reference):
-	Use gnome-vfs API to open quick reference in the pdf viewer
-
-2005-02-22  William Jon McCann  <mccann@jhu.edu>
-
-	* e-shell-window.c (setup_offline_toggle): Make offline button scale
-	with font size.  Fixes #48868.
-
-2005-02-10  JP Rosevear  <jpr@novell.com>
-
-	* e-component-registry.c (query_components): unref the menu icon
-	if it exists to fix a leak
-
-2005-02-07  JP Rosevear  <jpr@novell.com>
-
-	* apps_evolution_shell.schemas.in.in: clean up descriptions
-	
-2005-02-01  JP Rosevear  <jpr@novell.com>
-
-	* e-shell-window-commands.c: add to about box
-
-2005-01-28  JP Rosevear  <jpr@novell.com>
-
-	* e-component-registry.c: Remove e-shell-utils.c include
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-
-	* apps_evolution_shell.schemas.in.in: close long tag
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-
-	* apps_evolution_shell.schemas.in.in: add print_config schema item
-
-2005-01-21  JP Rosevear  <jpr@novell.com>
-	
-	* e-shell-offline-handler.c
-	(impl_OfflineProgressListener_updateProgress): mark priv->finished
-	as true first so we don't access freed memory if we get finalized
-	during the signal emmission
-	(cancel_offline): ditto
-	(finalize_offline): ditto
-	(e_shell_offline_handler_put_components_offline): ditto
-
-2005-01-20  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* e-shell-importer.c: (import_druid_esc),
-	(e_shell_importer_start_import):
-	Close import wizard on 'ESC'
-
-2005-01-09  JP Rosevear  <jpr@novell.com>
-
-	* e-shell.c (impl_Shell_handleURI): open a new window if we get a
-	component id type url
-
-	* Evolution-Shell.idl: add ComponentNotFound exception
-
-2005-01-06  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: install schemas properly and add some uninstall
-	rules for local install rules
-
-2005-01-04  JP Rosevear  <jpr@novell.com>
-
-	* e-sidebar.h: new protos, modes
-
-	* e-sidebar.c: handle 2 more modes, text only and toolbar style;
-	allow visibility to be set for the buttons
-
-	* e-shell-window.h: new proto
-
-	* e-shell-window.c (setup_widgets): set the sidebar setting and
-	visibility based on stored gconf settings
-	(e_shell_window_save_defaults): save the current sidebar setting
-	visibility
-	(e_shell_window_peek_sidebar): return the sidebar
-
-	* e-shell-window-commands.c (e_shell_window_commands_setup): add
-	listeners for each of the component button radio items and for the
-	hide toggle
-	(view_buttons_icontext_item_toggled_handler): listener callback,
-	set mode
-	(view_buttons_icon_item_toggled_handler): ditto
-	(view_buttons_text_item_toggled_handler): ditto
-	(view_buttons_toolbar_item_toggled_handler): ditto
-	(view_buttons_hide_item_toggled_handler): listener callback, set
-	visibility
-
-	* apps_evolution_shell.schemas.in.in: add component button style
-	and visibility defaults
-
-2004-12-29  Rodrigo Moya <rodrigo@novell.com>
-
-	* main.c (show_development_warning): 2.0 is the current stable
-	version.
-
-2004-12-23  Sivaiah Nallaagatla <snallagatla@novell.com>
-                                                                                                                             
-        * e-shell.c (e_shell_go_offline)
-        (e_shell_go_online) : set start_offline gconf key
-        when ever offline state is changed. 
-
-2004-12-21  JP Rosevear  <jpr@novell.com>
-
-	* e-corba-config-page.c: Convert to G_DEFINE_TYPE
-
-	* e-history.c: ditto
-
-	* e-shell-folder-title-bar.c: ditto
-
-	* e-shell-offline-handler.c: ditto
-
-	* e-shell-settings-dialog.c: ditto
-
-	* e-shell-window.c: ditto
-
-	* e-sidebar.c: ditto
-
-	* e-user-creatable-items-handler.c: ditto
-	
-	* e-component-registry.c: ditto
-
-	* importer/evolution-importer-client.c: ditto
-
-2004-12-09  Rodney Dawes  <dobey@novell.com>
-
-	* e-shell-window-commands.c: Use stock_new-window for the New Window
-	menu item in the File menu
-
-2004-12-08  David Mosberger <davidm@napali.hpl.hp.com>
-
-	* main.c: include es-event.h to fix 64 bit platform problems.
-
-2004-11-22  Joan Sanfeliu  <joan@fibranet.com>
-
-	* main.c: Evolution product name spelled with an uppercase E
-
-	Fixes #61605
-
-2004-11-02  mengjie yu  <meng-jie.yu@sun.com>
-
-	* evolution-startup-wizard.glade:remove the hard line breaks.
-
-2004-10-25  Not Zed  <NotZed@Ximian.com>
-
-	* main.c (main): register event hook.
-
-	* e-shell.c (offline_procedure_finished_cb, e_shell_go_online):
-	emit new state changed event.
-
-	* main.c (main): register the menu hook.
-	(): only define DEVELOPMENT if not already.
-
-	* e-shell-window.c (init): setup menu manager.
-	(e_shell_window_new): activate menu manager.
-	(update_offline_toggle_status): update the menu manager when the
-	offline state changes (currently only state which requires it)
-
-	* es-menu.[ch]: Shell plugin menu manager.
-
-2004-10-07  Not Zed  <NotZed@Ximian.com>
-
-	* main.c (main): initialise plugin system.
-	(main): add --disable-eplugin and --disable-mono arguments.
-
-2004-09-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-shell-importer.c: (import_cb): use g_timeout_add().
-	* importer/intelligent.c: (select_row_cb), (unselect_row_cb),
-	(create_gui): use gtk_notebook_set_current_page() instead of
-	deprecated gtk_notebook_set_page()
-
-2004-09-24  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-window-commands.c: Added ed catmur to the credits.
-
-2004-09-27  Andre Klapper  <a9016009@gmx.de>
-
-	* e-shell-window-commands.c (about_box_new): fixed two
-	typos in the list of contributors
-
-2004-09-21  JP Rosevear  <jpr@novell.com>
-
-	From Malcolm Tredinnick <malcolm@commsecure.com.au>, Fixes #66261
-	
-	* e-shell-window-commands.c (about_box_new): don't show
-	"translator-credits" if not translated
-
-2004-09-07  JP Rosevear  <jpr@novell.com>
-
-	Fixes #17338
-	
-	* e-shell-window-commands.c (about_box_new): use per language
-	translator credits, update authors lists (not strictly authors,
-	but we have a lot of helpful people)
-
-2004-09-13  Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* e-shell.c (offline_procedure_finished_cb)
-	(e_shell_go_online) : set online status 
-	for e_passwords 
-	see #62856 (work around)
-		
-2004-09-03  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #61285.
-
-	* e-shell-settings-dialog.c (load_pages): use a better query to
-	get the configuration pages, the old one didn't include version
-	information properly.
-
-2004-08-27  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #62856 (workaround only)
-
-	* e-shell.c (impl_Shell_setLineStatus, e_shell_construct): set the
-	online state on e_passwords.
-
-2004-08-26  Rodney Dawes  <dobey@novell.com>
-
-	* apps_evolution_shell.schemas.in.in: Don't translate the default
-	value for the window height
-
-2004-08-25  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* e-shell-startup-wizard.c: (prepare_importer_page):
-	don't call gtk_dialog_set_has_separator
-	on Message Dialog on GTK+ >= 2.4.0 (output warning)
-
-	* e-shell-importer.c: (e_shell_importer_start_import):
-	Initialize data->finish before using it
-	(prepare_intelligent_page): don't call gtk_dialog_set_has_separator
-	on Message Dialog on GTK+ >= 2.4.0 (output warning)
-	(start_import) (next_file_page): convert filename from UTF-8 to
-	local encoding.
-
-2004-08-12  Carlos Garnacho Parro  <carlosg@gnome.org>
-
-	* e-shell-importer.c: added the "use_filechooser" property to the
-	GnomeFileEntry
-
-2004-08-10  Not Zed  <NotZed@Ximian.com>
-
-	* main.c (main): init epasswords.
-
-2004-08-01  Not Zed  <NotZed@Ximian.com>
- 
- 	* apps_evolution_shell.schemas.in.in: added last_version item.
- 
- 	* shell-errors.xml: added upgrade-remove-1-4 and
- 	upgrade-remove-1-4-confirm dialogues.
- 
- 	* e-shell.c (remove_dir): utility to recursively delete a tree of
-	files and folders.
- 	(e_shell_attempt_upgrade): keep track of the last upgraded
- 	version, if != current version, and < 1.5, and it exists, offer to
- 	remove ~/evolution.  Confirm the offer before actually doing it.
- 
- 	* e-shell-window-commands.c: include gnome-about.
- 	(command_help_faq): fix comment structure
- 
- 	* e-shell.c (attempt_upgrade): moved most of this into
- 	e_shell_attempt_upgrade.
- 	(e_shell_attempt_upgrade): moved most of this into
-	attempt_upgrade, removed rev args.  It makes sense, really!
- 	(e_shell_construct): call e_shell_attempt_upgrade instead.
-
-2004-07-22  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell.c (create_window): merged this into
-	e_shell_create_window, all it was doing was adding a stack frame.
-	(e_shell_create_window): setup the e error default window.
-
-2004-07-22  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-shell-importer.c (e_shell_importer_start_import): Use
-	stock_mail-import instead of stock_import? *shrug* Fixes bug
-	#61778.
-
-2004-07-08  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* Makefile.am:
-	tarball should ship .schemas.in.in files, not generated files.
-
-	* apps_evolution_shell.schemas.in.in:
-	Don't translate default component id (bug #60859)
-
-2004-07-06  Rodney Dawes  <dobey@novell.com>
-
-	* e-shell-errors.xml.h: Add this back to CVS for translators
-	* .cvsignore: Don't ignore e-shell-errors.xml.h
-
-2004-09-07  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell.c (e_shell_construct): disable the startup wizard.
-
-2004-06-24  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #57367.
-
-	* e-shell-window.c (e_shell_window_new): fix gconf client leak and
-	clean up some logic.
-	
-	* e-shell.c (e_shell_construct): dont activate the components
-	individually, component registry does that implictly.
-
-	* e-component-registry.c (init): dont call query_components here.
-	(query_components): setup a run-once guard.  before adding a
-	component info to the list, make sure we can activate it.
-	(component_info_new): take the interface as a construct argument
-	now.
-	(e_component_registry_peek_list): perform the component list query
-	if we haven't already.
-	(e_component_registry_peek_info): same.
-	(e_component_registry_activate): just always return
-	the reffed component, it isn't added unless it was already activated.
-
-2004-06-21  Chris Toshok  <toshok@ximian.com>
-
-	* e-user-creatable-items-handler.c (impl_finalize): free
-	priv->menu_xml.  plugs (big) leak.
-
-2004-06-18  Jeffrey Stedfast  <fejj@novell.com>
-
-	* main.c (main): Remove AUTOHELP option since GNOME adds this
-	itself. Fixes bug #60374.
-	(main): Before exiting from main(), call shutdown() routines.
-
-2004-06-18  Radek Doulik  <rodo@ximian.com>
-
-	* main.c (main): test for skip_warning_dialog value in gconf here
-	and not in show_development_warning, otherwise we don't add or
-	call idle_cb and evo will not run
-	(show_development_warning): do not read skip_warning_dialog here
-
-2004-06-18  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #54498.
-
-	* main.c (idle_cb): don't do dev warning stuff here anymore.
-
-	* main.c (main): show the dev warning before doing anything else
-	if we are going to.
-	(warning_dialog_response_callback): kick off the actual
-	application once we're finished.
-	(window_map_callback, new_window_created_callback): removed, not
-	needed anymore.
-
-2004-06-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* main.c (main): Call gnome_sound_init() before bonobo_main().
-
-2004-06-09  Dan Winship  <danw@novell.com>
-
-	* check-empty.xpm, check-filled.xpm, check-missing.xpm:
-	* e-shell-config-autocompletion.[ch]:
-	* e-shell-config-default-folders.[ch]:
-	* e-shell-config-folder-settings.[ch]:
-	* e-shell-config-offline.[ch]:
-	* e-shell-config.[ch]:
-	* e-shell-folder-creation-dialog.[ch]:
-	* e-shell-shared-folder-picker-dialog.[ch]:
-	* e-storage-set-store.[ch]:
-	* e-storage-set-view-checkboxes.etstate:
-	* e-storage-set-view-no-checkboxes.etstate:
-	* e-storage-set-view.etspec:
-	* e-uri-schema-registry.[ch]:
-	* evolution-activity-client.c:
-	* evolution-storage-set-view-factory.[ch]:
-	* evolution-storage-set-view.[ch]:
-	* glade/e-folder-list.glade:
-	* glade/e-shell-config-default-folders.glade:
-	* glade/e-shell-folder-creation-dialog.glade:
-	* glade/e-shell-shared-folder-picker-dialog.glade: Remove
-	no-longer-used stuff
-
-	* README: Remove this, since it's more confusing than true now.
-
-	* Evolution-Offline.idl, Evolution-common.idl: Remove
-	GNOME_Evolution_Folder, and references to it.
-
-	* e-active-connection-dialog.glade:
-	* evolution-startup-wizard.glade: Move the last two remaining
-	files from ./glade/ up to here.
-	
-	* glade/*: Gone.
-
-	* Makefile.am, .cvsignore: update for the above
-
-2004-06-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-shell-window-commands.c: Added Martyn Russel to the credits.
-
-2004-06-04  JP Rosevear  <jpr@novell.com>
-
-	Fixes #59361
-	
-	* e-sidebar.c (layout_buttons): handle 0 and 1 buttons properly
-
-2004-06-01  William Jon McCann  <mccann@jhu.edu>
-
-	* e-shell-window-commands.c (e_shell_window_commands_setup):
-	Add listener for the ViewToolbar command.
-	(view_toolbar_item_toggled_handler):
-	New function to handle toggling toolbar visibility and saving state.
-	
-	* e-shell-window.c (e_shell_window_save_defaults): 
-	Save the status of the toolbar visibility.
-	(setup_widgets): Set initial state of toolbar visibility.
-
-	* apps_evolution_shell.schemas.in.in: Added schema for toolbar_visible.
-
-2004-06-01  Christophe Fergeau  <teuf@gnome.org>
- 	
- 	* e-shell-importer.c: sort the various available importer plugins by
-  	name in the importer druid combo box so that the list doesn't change
-  	from one evolution run to another. 
-	
-2004-05-27  Not Zed  <NotZed@Ximian.com>
-
-	** See #58827.
-
-	* e-shell-window.c (switch_view): api change
-	
-	* e-shell.c (impl_Shell_handleURI): Fixed for api change.
-	(impl_Shell_handleURI): check the component alias for an alternate
-	uri schema path.  'quick hack' for activating components from
-	command line.  This may, or may not, continue to function.
-
-	* e-component-registry.c (e_component_registry_peek_info): added
-	an id for search type.
-	(e_component_registry_peek_info_for_uri_schema): ^ makes this
-	redundant, removed.
-	(e_component_registry_activate): fixed for api change.
-
-2004-05-28  Rodney Dawes  <dobey@novell.com>
-
-	* e-shell-importer.c (e_shell_importer_start_import):
-	Set the default window size for the druid to 480x320
-
-2004-05-28  JP Rosevear  <jpr@novell.com>
-
-	* e-shell-window-commands.c: remove bogus include
-
-2004-05-28  William Jon McCann  <mccann@jhu.edu>
-
-       * Makefile.am (evolution_SOURCES): Remove e-shell-about-box.
-
-       * e-shell-window-commands.c (command_about_box, about_box_new):
-       Use GNOME about box.
-
-2004-05-27  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am (EXTRA_DIST): Add $(error_i18n) for "make dist"
-
-2004-05-27  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am (EXTRA_DIST): Don't dist $(error_i18n) as it requires
-	e-error-tool to be built
-
-	* shell-errors.xml.(h|in): Remove these from CVS, the .in is not used
-	any more, and the .h is generated from the .xml
-
-2004-05-26  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* e-shell.c (set_interactive): Implemented. Sends the "interactive"
-	message when the first window is created to all the components.
-
-2004-05-26  Not Zed  <NotZed@Ximian.com>
-
-	* importer/evolution-importer.c
-	(impl_GNOME_Evolution_Importer_createControl): set exception if not
-	implemented.
-
-	* e-shell-importer.c (importer_file_page_new): set the entry to
-	activate default, and fixed the _Filename and _Forward shortcut
-	clash.  #58081.
-	(prepare_dest_page): pack the widget without expand/fill.
-
-2004-05-21  Jeffrey Stedfast  <fejj@novell.com>
-
-	* evolution-shell-component-utils.c (e_activation_failure_dialog):
-	Removed. Nothing uses this interface (which didn't use the EError
-	routines anyway).
-
-2004-05-21  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell.c (e_shell_attempt_upgrade): remove unused.
-
-2004-05-19  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-window.c (setup_widgets): use the menu icon not the
-	button icon for the menus.
-	(setup_widgets): fixed some i18n stuff with the menu xml.  no use
-	putting _x stuff here, it also needs a source.  And a memleak.
-	Yucko.
-
-	* e-component-registry.c (component_info_new): take menu icon.
-	(query_components): setup the menu icon, not a large toolbar sized
-	icon.
-
-	* e-shell-window.c (menu_component_selected): just use '-' as
-	ascii, its always going to be hte same in utf8.  simplifies the
-	code somewhat.
-
-2004-05-05  William Jon McCann  <mccann@jhu.edu>
-
-	* e-shell-window.c (menu_component_selected, setup_widgets):
-	Add components to View menu.
-
-	* e-component-registry.[ch] (component_info_new) 
-	(component_info_free, query_components): Add menu_label and
-	menu_accelerator fields.
-
-2004-05-18  Not Zed  <NotZed@Ximian.com>
-
-	* shell-errors.xml: added noshell and noshell-reason error
-	strings.  the latter seems a waste, but ...
-
-	* main.c (idle_cb): use e_error for the new no shell errors.
-
-2004-05-17  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-shell-window-commands.c: Change E_PIXMAP() sizes over to
-	E_ICON_SIZE enum values.
-
-	* main.c: #include <gtk/gtkvbox.h>
-
-	* e-shell-startup-wizard.c (make_importer_page): Use
-	E_ICON_SIZE_DIALOG
-
-2004-05-12  Jeffrey Stedfast  <fejj@novell.com>
-
-	* main.c (main): Call e_icon_factory_shutdown() after
-	bonobo_main() exits.
-
-2004-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* shell-errors.xml: fix the label tag for the upgrade failed box.
-
-	* shell-errors.xml.h: add for translators.
-
-2004-05-11  Not Zed  <NotZed@Ximian.com>
-
-	* shell-errors.xml: Shell errors.
-
-	* e-shell.c (e_shell_attempt_upgrade): handle exceptions better.
-	allow the user to keep going or abort.  stop as soon as something
-	fails.  Related to #53083.
-	(attempt_upgrade): abort and quit if the subcall failed.  it will
-	display an appropriate error box.
-	(attempt_upgrade): abort if we don't have enough space.  #57290.
-
-	* Evolution-Component.idl (upgradeFromVersion): remove the return
-	code, use exceptions to indicate failure.
-
-2004-05-10  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell.c (e_shell_attempt_upgrade): handle the various
-	exceptions appropritately.
-	(detect_version): this never fails, remove return code.
-	(attempt_upgrade): add a check for disk space.  this is only
-	rough.  not sure how portable.  If we can't find out we go forward
-	anyway.
-
-	* Evolution-Component.idl: Throw some proper exceptions for
-	upgradeFromVersion.  UpgradeFailed with detailed error reason, and
-	UnsupportedVersion for non-fatal reason.
-
-2004-05-10  David Malcolm  <dmalcolm@redhat.com>
-
-	* e-shell-offline-handler.c (cancel_offline): Fix warning
-
-2004-05-10  JP Rosevear  <jpr@ximian.com>
-
-	* main.c (show_development_warning): set title to just Evolution
-	(show_development_warning): ditto for warning
-	(idle_cb): ditto for title
-
-	* e-shell-window.c (update_offline_toggle_status): set tooltip to
-	just Evolution
-	(e_shell_window_new): ditto for window title
-
-	* e-shell-window-commands.c (command_about_box): set title to
-	just Evolution
-
-2004-05-05  Dan Winship  <danw@ximian.com>
-
-	* e-sidebar.c (layout_buttons): Change the algorithm so that if
-	the buttons can't be laid out perfectly rectangularly, then the
-	extra space is given to the first button (ie, Mail), rather than
-	the last button (eg, Connector). Also, merge the icons-only and
-	icons-plus-text layout code together since they were nearly
-	identical.
-	(e_sidebar_add_button, e_sidebar_set_mode): Tweak things a bit so
-	that in icons-only mode, the icons are centered in the buttons.
-
-2004-05-03  Dan Winship  <danw@ximian.com>
-
-	* e-shell-importer.c (e_shell_importer_start_import): Fix warnings
-
-2004-04-30  Dan Winship  <danw@ximian.com>
-
-	* apps_evolution_shell.schemas.in.in: Remove default folders,
-	shortcut stuff, and "show folder bar".
-
-	* e-config-upgrade.c: Don't migrate those options either
-
-2004-04-30  Dan Winship  <danw@ximian.com>
-
-	* e-shell-window-commands.c (command_quit): Don't save window
-	state here.
-
-	* e-shell.c (e_shell_quit): Do it here, so it gets called if you
-	quit by closing the last window via its close button too. #57529
-
-2004-04-30  Not Zed  <NotZed@Ximian.com>
-
-	* e-component-registry.c:
-	* e-shell-settings-dialog.c: 
-	* e-shell-window.c:  Remove e-lang-utils.h include.
-
-	* e-component-registry.c (query_components): do the same as below.
-
-	* e-shell-settings-dialog.c (load_pages): use
-	gnome_i18n_get_language_list instead of e_get_language_list(), and
-	use the right locale option.  Fixes #53398.
-
-2004-04-28  Rodney Dawes  <dobey@ximian.com>
-
-	* main.c (main): Call gnome_program_init with PACKAGE "-" BASE_VERSION
-	so that we start up the right version of evolution when we get killed
-	by logout or whatever
-
-	Fixes #54087
-
-2004-04-27  JP Rosevear  <jpr@ximian.com>
-
-	* e-shell-window.c (sidebar_button_selected_callback): init the
-	view to NULL
-
-2004-04-27  William Jon McCann  <mccann@jhu.edu>
-
-	* e-shell-window.c (switch_view): set window title and icon when changing
-	component view.
-
-2004-04-23  JP Rosevear <jpr@ximian.com>
-
-	* e-shell-window.c (e_shell_window_show_settings): if there is a
-	current view, use the component alias to select a sensible default
-	config control
-
-2004-04-22  Trent Lloyd  <lathiat@bur.st>
-
-	* e-sidebar.c (do_layout_text_buttons): take into account the position
-	of the sidebar which isnt on the very left in right to left languages,
-	otherwise the buttons are drawn in the wrong place.
-
-2004-04-21  Not Zed  <NotZed@Ximian.com>
-
-	* e-user-creatable-items-handler.c (execute_verb): if we're
-	running a local create, invoke that directly via the callback.
-	(e_user_creatable_items_handler_new): add a callback for creating
-	local items.
-
-2004-04-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-user-creatable-items-handler.c (ensure_menu_items): Same.
-
-	* e-shell-startup-wizard.c (make_timezone_page): Same.
-
-	* e-shell-settings-dialog.c (load_pages): Same.
-
-	* e-shell-importer.c (e_shell_importer_start_import): Same.
-
-	* e-component-registry.c (query_components): Don't use absolute
-	pixel sizes, use the E_ICON_SIZE enums instead.
-
-2004-04-19  Michael Terry  <mike@mterry.name>
-
-	* GNOME_Evolution_Test.server.in.in: Change component icons to use the
-	icon theme names for icons
-	* Makefile.am: Remove e-icon-factory.[ch]
-	* e-component-registry.c: Use the icon theme for component icons
-	* e-icon-factory.[ch]: Removed these files
-	* e-shell-importer.c:
-	* e-shell-settings-dialog.c:
-	* e-shell-startup-wizard.c:
-	* e-shell-window-commands.c:
-	* e-user-creatable-items-handler.c:
-	* evolution-shell-component-utils.[ch]:
-	* main.c:
-	* glade/evolution-startup-wizard.glade:
-	* importer/import.glade: Use the icon theme via EIconFactory for all
-	of the icons in the shell, and the window icons
-
-2004-04-14  JP Rosevear <jpr@ximian.com>
-
-	* e-shell-importer.c (get_iid_for_filetype): differentiate between
-	user cancellation and no importer
-	(next_file_page): don't throw up a dialog if the user cancelled
-	the selection process
-
-2004-04-14  JP Rosevear <jpr@ximian.com>
-
-	* e-shell-importer.c (start_import): don't unref the dialog,
-	destroy it properly
-
-2004-04-13  Not Zed  <NotZed@Ximian.com>
-
-	* e-user-creatable-items-handler.c (create_verb): add a component
-	name argument, so we don't use 'this_component', and everything
-	comes from tasks!  Fix callers to pass the component alias.
-	(struct _EUserCreatableItemsHandlerPrivate): change
-	default_menu_item to be fallback_menu_item for the mail message
-	new fallback.  Make default_menu_item be the default for the view
-	(which some code seems to think it should be).  Fixes #56866.
-	(ensure_menu_items): setup the fallback_menu_item here.
-	(get_default_action_for_view): use the fallback as the fallback,
-	not default.
-	(setup_toolbar_button): set the default menu item here for the
-	current view.
-
-2004-04-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-shell.c (e_shell_attempt_upgrade): Don't activate the
-	components here.
-	(e_shell_construct): Activate them all here instead (before we
-	attempt to upgrade). Fixes a bug where the shell would start up in
-	online mode but never notify the components to go online.
-
-	* main.c (idle_cb): s/Cannot access/Cannot register/
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-shell.c (e_shell_attempt_upgrade): make sure the component is
-	activated before calling upgradeFromVersion.
-
-2004-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-shell.c (e_shell_attempt_upgrade): use BASE_VERSION to supply
-	the major/minor version, and use UPGRADE_REVISION for the
-	revision.
-	(attempt_upgrade): store the key based on BASE_VERSION and
-	UPGRADE_REVISION.
-
-2004-04-09  Dan Winship  <danw@ximian.com>
-
-	* e-user-creatable-items-handler.c: Change this a lot. Now each
-	component will maintain its own EUserCreatableItemsHandler and
-	merge the button and menus in and out of the UI as its controls
-	are activated and deactivated. (This lets the connector component
-	display the correct default for the New button). Also, update to
-	the Product Design Team's new organization (separating object
-	types from folder types)
-
-	* e-shell.c: Remove all creatable_items_handler references
-	(impl_dispose): unref the component registry (unrelated bug)
-	
-	* e-shell-window.c (e_shell_window_new): Remove
-	creatable_items_handler reference
-
-	* Makefile.am: Move e-user-creatable-items-handler from evolution
-	to libeshell, and make libeshell depend on libemiscwidgets (for
-	the combo button)
-
-	* Evolution-Component.idl: add another field to CreatableItemType
-	so we can distinguish object types from folder types.
-
-2004-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Evolution-ConfigControl.idl: Removed the "apply" method.
-
-	* e-corba-config-page.c: We can probably remove this entire file,
-	it seems pretty useless. But until I know for sure, I guess I
-	won't bother.
-	(impl_apply): Removed, no longer a valid interface.
-	(listener_event_callback): Huh? calls a non-existant function if
-	the event name was "changed". Uhm, yea...ok. Removed.
-	(setup_listener): Removed. Did nothing but to setup the above
-	listener.
-
-	* evolution-config-control.c: No longer needs to keep 'changed'
-	state.
-	(evolution_config_control_changed): Removed.
-	(impl_apply): Removed. No lonegr a valid interface.
-
-2004-03-31  Rodney Dawes  <dobey@ximian.com>
-
-	* e-shell-importer.c (choose_importer_from_list):
-	(start_import):
-	(prepare_intelligent_page): Remove dialog separators
-	* e-shell-offline-handler.c (pop_up_confirmation_dialog): Change the
-	border with of the dialog's vbox and action area to be HIG-compliant
-	* e-shell-settings-dialog.c (init): Remove the dialog separator
-	* e-shell-startup-wizard.c (prepare_importer_page): Remove the dialog
-	separator to be more HIG-compliant
-	(key_press_event_callback): Fix compile warnings and cast to the
-	correct widget types for calling various gtk api
-	Remove the dialog separator to be more HIG-compliant
-	* main.c (show_development_warning): Make the devel warning dialog
-	that pops up for unstable versions be HIG-compliant
-	* glade/e-active-connection-dialog.glade: Make the active connection
-	dialog for going off-line be HIG-compliant
-	* importer/intelligent.c (create_gui): Remove the dialog separator
-	and set the dialog's vbox and action area border widths to be more
-	compliant with the HIG
-
-2004-03-26  Rodney Dawes  <dobey@ximian.com>
-
-	* e-shell-settings-dialog.c (impl_realize): We don't need this really
-	(class_init): We don't need to have our own realize impl for setting
-	the default window size of the dialog, especially since we are setting
-	the size before we actually get realized, anyway
-	(init): Set the dialog size here, and don't set the border width of the
-	dialog
-
-2004-03-18  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-about-box.c: added (c) symbol and 2004 and changed to
-	Novell to the copyright notice in the about box.
-
-2004-03-12  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell.c (detect_version): when we check the evolution dir
-	exists, check the evolution dir exists, not the config.xmldb file.
-	Move filename building/usage into the else condition so it can't
-	happen again.  Fixes #53277.
-
-2004-03-10  Bill Zhu  <bill.zhu@sun.com>
-	
-	* e-shell-startup-wizzard.c (key_press_event_callback): Used the stock
-	icon in confirm dialog.
-
-	Fixes #55063
-	
-2004-03-06  Pratik V. Parikh <pratikvp@despammed.com>
-
-	* e-shell-window-commands.c (command_quick_reference): Check that 
-	app is not NULL before trying to open the quickref document.
-
-	Fixes #55106
-
-2004-02-15  Rodney Dawes  <dobey@ximian.com>
-
-	* evolution-nognome.in: Use @BASE_VERSION@ for the binary
-
-	Fixes #54796
-
-2004-02-18  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-offline-handler.c (prepare_for_offline): remove id, and
-	use info->id for create_progress_listener.  Fixes #53649.
-
-2004-02-10  JP Rosevear <jpr@ximian.com>
-
-	* Remove dead files
-
-2004-02-06  JP Rosevear <jpr@ximian.com>
-
-	* importer/intelligent.c (get_intelligent_importers): use base
-	version for intelligent importers
-
-	* e-shell-importer.c (get_intelligent_importers): ditto
-	
-	Fixes #54004	
-	
-2004-02-06  Rodney Dawes  <dobey@ximian.com>
-
-	* e-shell-window-commands.c (command_quick_reference): Really make
-	this work with gnome-vfs 2.2, instead of using gnome-vfs 2.4 api,
-	fixes #53566 more completely so snapshots can build again (doh)
-
-2004-02-06  JP Rosevear <jpr@ximian.com>
-
-	* importer/import.glade: remove step numbers
-
-2004-02-05  Rodney Dawes  <dobey@ximian.com>
-
-	* e-shell-window-commands.c (command_quick_reference): Use gnome-vfs
-	directly, instead of relying on gnome_url_show (), to launch the
-	application for the quick reference, since we can run on gnome 2.2
-	mostly, and gnome_url_show () only handles the uri method there
-
-	Fixes #53566
-
-2004-02-04  JP Rosevear <jpr@ximian.com>
-
-	* e-shell-importer.c (start_import): pass in a parent for the
-	dialogs, use e_notice
-	(import_druid_finish): we carry the filename around with us now
-	(next_file_page): check the file here and store the name; put up
-	gui dialogs
-	(e_shell_importer_start_import): set the druid as a transient for
-	the shell
-
-2004-02-04  JP Rosevear <jpr@ximian.com>
-
-	* importer/import.glade: add extra page
-
-	* importer/evolution-importer.h: update protos
-
-	* importer/evolution-importer.c: hold the createControl function
-	(impl_GNOME_Evolution_Importer_createControl): implement
-	(impl_GNOME_Evolution_Importer_loadFile): remove dead args
-
-	* importer/evolution-importer-client.h: update/add protos
-
-	* importer/evolution-importer-client.c
-	(evolution_importer_client_create_control): wrapper
-	(evolution_importer_client_load_file): we don't take physical_uri
-	and folder_type as args any more
-
-	* importer/GNOME_Evolution_Importer.idl: add createControl method
-	and remove extraneous loadFile args
-
-	* e-shell-window-commands.c (command_import): uncomment
-
-	* e-shell-importer.h: update proto
-
-	* e-shell-importer.c: remove DEPRECATED hack and tidy includes
-	(get_iid_for_filetype): use query define
-	(start_import): we don't take a file name and client directly now
-	(create_plugin_menu): user query define
-	(importer_dest_page_new): create vbox
-	(import_druid_finish): we no longer do folder selection here
-	(next_file_page): create the client here
-	(prepare_dest_page): show the importer control
-	(next_dest_page): skip to the finish
-	(back_finish_page): back to the destination page
-	(e_shell_importer_start_import): set up the destination page
-
-	* Makefile.am: build import files again
-
-2004-02-04  JP Rosevear <jpr@ximian.com>
-
-	* e-shell-view-menu[hc]: remove dead files
-
-2004-02-04  JP Rosevear <jpr@ximian.com>
-
-	* e-shell.c (e_shell_quit): make this C89 compliant
-
-2004-02-04  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #53683.
-
-	* Evolution-Component.idl: added EvolutionComponent::quit() call.
-
-	* main.c (quit_box_new): removed, dont show quit box anymore at
-	the end, we've already shutdown by now with the new shutdown
-	sequence.
-	
-	* e-shell-window-commands.c (command_quit): call e_shell_quit to
-	quit.
-
-	* e-shell.c (e_shell_prepare_for_quit): renamed es_run_quit, now
-	internal, and a gtktimeout function, so return code inverted.
-	(e_shell_quit): new public entry, find out if we can shutdown, if
-	so, then trigger a shutdown.
-	(e_shell_request_close_window): just call e_shell_quit to exit
-	when we've run out of windows.
-	(e_shell_quit): desensitise all of the app windows before running
-	shutdown.  looks a bit weird, but not doing so looks worse.
-
-2004-02-03  Dan Winship  <danw@ximian.com>
-
-	* e-activity-handler.c: 
-	* e-activity-handler.h: 
-	* e-task-bar.c: 
-	* e-task-bar.h: 
-	* e-task-widget.c: 
-	* e-task-widget.h: Moved to misc/widgets since they depend on
-	libemiscwidgets now, and aren't actually used by the shell itself.
-
-	* Makefile.am (eshell_HEADERS, libeshell_la_SOURCES): Update
-
-2004-02-02  Chris Toshok  <toshok@ximian.com>
-
-	* e-component-registry.c (component_info_new): don't generate a
-	g_warning if button_icon == NULL.
-	(component_info_free): unref the button_icon if it's != NULL.
-
-2004-01-29  JP Rosevear <jpr@ximian.com>
-
-	* main.c: turn development stuff back on
-
-2004-01-28  JP Rosevear <jpr@ximian.com>
-
-	* main.c (kill_dataserver): g_message this
-	(destroy_config): remove the various pieces to create a cleanish
-	state for re-migrating from 1.4.x
-	(main): add --force-migrate option when in development mode
-
-2004-01-28  Rodney Dawes  <dobey@ximian.com>
-
-	* e-task-bar.c (init): First argument to gtk_hbox_new () is a boolean,
-	not an int, don't show the hbox for activities by default
-	(e_task_bar_prepend_task): Show the hbox for activities when we add
-	tasks to the taskbar
-	(e_task_bar_remove_task): If we have no tasks left to display, don't
-	show the empty hbox
-
-2004-01-27  Rodney Dawes  <dobey@ximian.com>
-
-	* e-task-bar.c (init): Expand the label, this fixes the problem
-	that people were having in the shell window with the preview pane
-	and the weird warning from ECLippedLabel for urls
-
-	Fixes #52937 for good
-
-2004-01-26  David Trowbridge <trowbrds@cs.colorado.edu>
- 
- 	* Makefile.am: add definition for EVOLUTION_HELPDIR
- 
- 	* e-shell-window-commands.c: add handling for new "Quick
-	Reference" menu
-	
-2004-01-26  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell.c (attempt_upgrade, detect_version, e_shell_construct):
-	attempt the upgrade before trying to startup the wizard.
-
-	* main.c (detect_version, attempt_upgrade): move to e-shell.c
-	(idle_cb): remove call to attempt_upgrade.
-
-2004-01-26  Rodney Dawes  <dobey@ximian.com>
-
-	* e-shell-window.c (setup_widgets): Add panded widget to
-	EShellWindowPrivate and handle state saving of position (#52049)
-	* e-task-bar.c (init): Switch to EClippedLabel instead of GtkLabel
-	for the status bar text (#52937)
-
-	Fixes #52049 and #52937
-
-2004-01-26  JP Rosevear <jpr@ximian.com>
-
-	* e-shell.c (e_shell_construct): there is no splash screen any
-	more
-
-2004-01-26  JP Rosevear <jpr@ximian.com>
-
-	* main.c: drop now useless gtkhtml/gconf check
-
-2004-01-23  Rodney Dawes  <dobey@ximian.com>
-
-	* main.c (idle_cb): Move uri_list loop into a separate function
-	so we don't duplicate code in both instances where we are creating
-	a new shell or using a current one, and don't open a new shell window
-	if we are passing in a uri and a shell is already up
-
-	Fixes #53216
-
-2004-01-15  JP Rosevear <jpr@ximian.com>
-
-	* e-config-upgrade.c: remove calendar and task keys for upgrade,
-	its done in the calendar now
-
-2004-01-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-shell-view-menu.c: added ForgetPasswords menu item.
-	(command_forget_passwords): callback for the new menu item.
-
-	* e-shell-window-commands.c: (command_forget_passwords): ditto.
-
-2004-01-15  JP Rosevear <jpr@ximian.com>
-
-	* main.c (kill_dataserver): kill the correct binary, tidy includes
-
-2004-01-15  JP Rosevear <jpr@ximian.com>
-
-	* main.c (detect_version): move version detection here
-
-	* e-config-upgrade.c: remove it from here; clean out all the
-	mailer and bonobo conf conversion stuff, its been moved to the
-	mailer and e-util
-
-	* e-config-upgrade.h: remove proto
-
-2004-01-15  Not Zed  <NotZed@Ximian.com>
-
-	* e-config-upgrade.c (e_upgrade_detect_version): fix the check for
-	~/evolution being a directory.
-
-2004-01-13  JP Rosevear <jpr@ximian.com>
-
-	* main.c (attempt_upgrade): detect the version more completely
-	with the new util routine
-	(main): don't upgrade the config db here
-
-	* e-shell.h: update proto
-
-	* e-shell.c (e_shell_attempt_upgrade): take the current version as
-	numerical params
-
-	* e-config-upgrade.h: update prototypes
-
-	* e-config-upgrade.c (e_config_upgrade): remove version detection
-	and saving code
-	(e_upgrade_detect_version): routine to do the version detection
-
-	* e-config-upgrade.c: drop my-evolution upgrade code
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: use our libs
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* evolution-test-component.[hc]: Complete rewrite to match current
-	component api
-
-	* Makefile.am: conditionally build the test component
-	
-2004-01-11  JP Rosevear <jpr@ximian.com>
-
-	* e-sidebar.c (button_new): track hbox and label widget
-	(button_free): unref them
-	(do_layout_text_buttons): layout buttons with text
-	(do_layout_icon_buttons): layout icon only buttons
-	(do_layout): layout based on mode
-	(impl_size_request): distinguish between horizontal and vertical
-	padding
-	(init): set a default mode
-	(e_sidebar_add_button): align the button text to the left, only
-	add the text if we are in the text mode
-	(e_sidebar_get_mode): accessor
-	(e_sidebar_set_mode): accessor
-
-	* e-sidebar.h: add prototype and mode enum
-
-2004-01-11  JP Rosevear <jpr@ximian.com>
-
-	* GNOME_Evolution_Test.server.in.in: proper server file for test
-	components
-
-	* Makefile.am: allow the test component to be built and installed
-
-	* evolution-test-component.[hc]: new test component to match
-	current api
-
-2004-01-08  JP Rosevear <jpr@ximian.com>
-
-	* e-shell.c (e_shell_attempt_upgrade): make sure we actually
-	upgrade between revisions
-
-2004-01-08  JP Rosevear <jpr@ximian.com>
-
-	* e-shell-startup-wizard.c (get_intelligent_importers): add a ')'
-	to create a valid query
-
-2004-01-08  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-startup-wizard.c (get_intelligent_importers): check that
-	we found any importers before deferencing the pointer.
-
-2004-01-05  ERDI Gergo  <cactus@cactus.rulez.org>
-
-	* e-task-bar.c (init): Create a separate label to the left of the
-	progress messages...
-	(e_task_bar_message): ...and allow components to set it...
-
-	* e-activity-handler.c (e_activity_handler_message): ...through
-	this new ActivityHandler method
-
-2003-12-30  JP Rosevear <jpr@ximian.com>
-
-	* e-setup.[hc]: these just handle creating the ~/evolution dir and
-	so are no longer needed
-
-	* main.c (main): don't setup the old ~/evolution dir
-	
-	* Makefile.am: don't build dead files
-
-	* e-shell.c (e_shell_go_online): get the id from the component
-	info
-
-2003-12-22  Ross Burton  <ross@burtonini.com>
-
-	* e-shell.c: mark the settings dialog as transient for the main window.
-
-2003-12-14  JP Rosevear <jpr@ximian.com>
-
-	* e-user-creatable-items-handler.c (get_components_from_registry):
-	only add the component to the list if we actually create it
-
-	Fixes #51707
-	
-2003-12-11  Not Zed  <NotZed@Ximian.com>
-
-	* e-sidebar.c (do_layout): remove padding around the folder list.
-	(impl_size_request): don't add padding around folder list.
-
-2003-12-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#51710]
-
-	* GNOME_Evolution_Shell.server.in.in: Remove
-	GNOME_Evolution_Shell_Config_FolderSettings_Control.
-
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* e-shell-importer.c: remove useless gal include
-
-	* Makefile.am: Remove hard coded disable deprecated flags
-
-2003-12-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_prepare_for_quit): Implement.
-
-	* Evolution-Component.idl (Component::requestQuit): Make sync
-	[i.e. just return a boolean instead of using a BonoboListener].
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix for #51619.]
-
-	* e-shell.c (impl_Shell_createNewWindow): If component_id is the
-	empty string, pass NULL for it to e_shell_create_window() so we
-	get the default.
-
-	* main.c (idle_cb): Pass an empty string for component_id to
-	createNewWindow() if the default_component_id is NULL.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Move e-task-bar and e-task-widget into libeshell.
-	[Fix pointed out by Bernard Leach <leachbj@bouncycastle.org>.]
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Evolution-Session.idl: Remove.
-	* Evolution-Activity.idl: Remove.
-	* Evolution-ShellComponent.idl: Remove.
-	* Evolution-ShellComponentDnd.idl: Remove.
-	* Evolution-ShellView.idl: Remove.
-	* Evolution-Shortcuts.idl: Remove.
-	* Evolution-Storage.idl: Remove.
-	* Evolution-StorageSetView.idl: Remove.
-
-	* evolution-shell-view.c: Remove.
-	* evolution-shell-view.h: Remove.
-
-	* evolution-session.c: Remove.
-	* evolution-session.h: Remove.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-activity-handler.c: Do not #include
-	"e-shell-corba-icon-utils.h".
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-folder-list.c: Remove.
-	* e-folder-list.h: Remove.
-
-	* e-folder-tree.c: Remove.
-	* e-folder-tree.h: Remove.
-
-	* e-folder.c: Remove.
-	* e-folder.h: Remove.
-
-	* evolution-shell-component.c: Remove.
-	* evolution-shell-component.h: Remove.
-
-	* evolution-shell-client.c: Remove.
-	* evolution-shell-client.h: Remove.
-
-	* evolution-folder-selector-button.c: Remove.
-	* evolution-folder-selector-button.h: Remove.
-
-	* evolution-activity-client.c: Remove.
-	* evolution-activity-client.h: Remove.
-
-	* evolution-storage.c: Remove.
-	* evolution-storage.h: Remove.
-
-2003-12-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-window.c (e_shell_window_save_defaults): Implement.
-	(e_shell_window_new): Set the width/height from the GConf keys.
-
-2003-12-02  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am: Version the schemas
-	* apps_evolution_shell.schemas: Removed
-	* apps_evolution_shell.schemas.in.in: Added
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-activity-handler.c (e_activity_handler_operation_finished):
-	Argh, renamed from e_activity_client_operation_finished().
-	(e_activity_handler_operation_started): Don't unref the pixbuf.
-
-	* e-shell-window.c (setup_widgets): Hide the menu hint label.
-
-	* e-activity-handler.c (init): Init to next_activity_id to 1 so
-	callers can rely on it being nonzero.
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (struct _EShellPrivate): Remove member
-	activity_handler.
-	(setup_activity_interface): Remove.
-	(e_shell_init): Don't call.
-	(create_window): Don't attach the task bar to the activity
-	handler.
-
-	* e-shell-window.c (struct _ComponentView): New member
-	statusbar_widget.
-	(struct _EShellWindowPrivate): Remove member task_bar.
-	(init_view): Get the status bar control from createControls and
-	put it in the ComponentView struct.
-	(setup_task_bar): New.
-	(setup_statusbar_notebook): New.
-	(switch_view): Switch the statusbar notebook too.
-	(impl_dispose): Add missing GTK_OBJECT() cast.
-	(e_shell_window_peek_task_bar): Remove.
-
-	* Evolution-Component.idl (Component::createControls): New out arg
-	"statusbar_control"; this way components can provide their own
-	status bar.
-
-	* e-activity-handler.c, e-activity-handler.h: Turn into a plain
-	GObject; translate all the CORBA methods into plain C methods.
-
-	* Makefile.am: Move e-activity-handler to libeshell instead of it
-	being in the shell.
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* GNOME_Evolution_Shell.server.in.in:
-	* e-component-registry.c:
-	* e-shell-config.c:
-	* e-shell-shared-folder-picker-dialog.c:
-	* e-shell-startup-wizard.c:
-	* e-shell.h:
-	* e-user-creatable-items-handler.c:
-	* evolution-activity-client.c:
-	* evolution-storage.c: Use BASE_VERSION for repo_ids and OAFIIDs
-
-2003-11-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (struct _EShellPrivate): New member offline_handler.
-	(offline_procedure_started_cb): New.
-	(offline_procedure_finished_cb): New.
-	(e_shell_go_offline): Implement (putting back the code that we had
-	#if 0'ed out).
-	(e_shell_go_online): Likewise.
-
-	* e-shell-offline-handler.c, e-shell-offline-handler.h: Put back
-	in, massage for the changes in the Offline interface.
-
-	* e-shell-offline-sync.c, e-shell-offline-sync.h: Remove from CVS.
-
-	* Evolution-Offline.idl (SyncFolderProgressListener): Remove.
-	(Offline::SyncFolder): Remove.
-
-2003-11-23  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: remove gtk deprecated flag
-
-2003-11-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (impl_Shell_handleURI): Reimplemented using
-	EComponentRegistry.
-
-	* main.c (idle_cb): Create a new window even if we have a URI
-	list.
-
-	* e-component-registry.c
-	(e_component_registry_peek_info_for_uri_schema): New.
-
-2003-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-component-registry.c (component_info_free): Free
-	->uri_schemas.
-	(set_schemas): New function to get the list of URI schemas given a
-	component's ServerInfo.
-	(query_components): Call it.
-
-	* e-component-registry.h (struct _EComponentInfo): Add
-	"uri_schemas" member.
-
-	* Evolution-Component.idl (Component.handleURI): New method.
-
-2003-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-activity-client.c
-	(evolution_activity_client_construct): Get a raw
-	GNOME_Evolution_Shell as an arg instead of an
-	EvolutionShellClient.
-	(get_shell_activity_iface): New helper function.
-	(evolution_activity_client_construct): Use it.
-
-2003-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-window.c (impl_dispose): Destroy the tooltips instead of
-	unreffing them.
-
-	* e-shell.c (struct _EShellPrivate): New member activity_handler.
-	(setup_activity_interface): New.
-	(impl_dispose): Add a comment about why we must not unref
-	activity_handler here.
-	(create_window): Attach the task bar to the new window.
-
-	* e-shell-window.c (e_shell_window_peek_task_bar): New.
-
-	* e-activity-handler.c: Add back.
-	* e-activity-handler.h: Add back.
-
-2003-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-window.c (struct _EShellWindowPrivate): New members
-	status_bar, offline_toggle, offline_toggle_image, menu_hint_label,
-	task_bar, tooltips.
-	(init): Initialize ->tooltips.
-	(impl_dispose): Unref ->tooltips.
-	(offline_toggle_clicked_callback): New.
-	(e_shell_window_new): Connect shell_line_status_changed_callback()
-	to the shell's "line_status_changed" signal.
-	(shell_line_status_changed_cb): New.
-	(setup_offline_toggle): New.
-	(setup_menu_hint_label): New.
-	(setup_task_bar): New.
-	(setup_status_bar): New.
-	(setup_widgets): Call setup_status_bar() and add add the status
-	bar to the window.
-	(update_offline_toggle_status): New.
-	(update_send_receive_sensitivity): New.
-	(load_icons): New.
-	(class_init): Call load_icons().
-	(ui_engine_remove_hint_callback): New.
-
-2003-11-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-window-commands.c: Add a pixmap for the toolbar
-	SendReceive button.
-
-2003-11-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (attempt_upgrade): New helper function.
-	(idle_cb): Call it if we have a local shell.  Also, remove unused
-	variables.
-
-	* e-shell.c (e_shell_attempt_upgrade): New.
-
-	* Evolution-Component.idl (Component.upgradeFromeVersion): New.
-
-2003-11-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-window-commands.c (command_open_new_window): New,
-	implement "OpenNewWindow" verb.
-
-2003-11-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-setup.c: Do not #include "e-local-folder.h".
-
-	* Makefile.am: Don't build evolution-test-component for now since
-	it's all out of date.
-
-	* main.c (evolution_debug_log): Make static instead of extern.
-
-	* e-user-creatable-items-handler.c: #include
-	<bonobo/bonobo-control.h>.
-
-	* e-shell.h: Do not include "e-uri-schema-registry.h" or
-	"evolution-shell-component-client.h".
-	* e-shell.c: Likewise.
-
-	* e-shell.c (struct _EShellPrivate): Removed member
-	uri_schema_registry.
-	(impl_Shell_handleURI): #if 0 it out for now.
-	(e_shell_peek_uri_schema_registry): Disabled for now.
-
-	* e-uri-schema-registry.c: Don't compile for now.
-
-	* e-corba-storage-registry.c: Remove.
-	* e-corba-storage-registry.h: Remove.
-	* e-corba-storage.c: Remove.
-	* e-corba-storage.h: Remove.
-	* e-folder-dnd-bridge.c: Remove.
-	* e-folder-dnd-bridge.h: Remove.
-	* e-folder-selection-dialog.c: Remove.
-	* e-folder-selection-dialog.h: Remove.
-	* e-folder-type-registry.c: Remove.
-	* e-folder-type-registry.h: Remove.
-	* e-local-folder.c: Remove.
-	* e-local-folder.h: Remove.
-	* e-local-storage.c: Remove.
-	* e-local-storage.h: Remove.
-	* e-shell-folder-selection-dialog.c: Remove.
-	* e-shell-folder-selection-dialog.h: Remove.
-	* e-shell-view.c: Remove.
-	* e-shell-view.h: Remove.
-	* e-storage-browser.c: Remove.
-	* e-storage-browser.h: Remove.
-	* e-storage-set-view.c: Remove.
-	* e-storage-set-view.h: Remove.
-	* e-storage-set.c: Remove.
-	* e-storage-set.h: Remove.
-	* e-storage.c: Remove.
-	* e-storage.h: Remove.
-	* evolution-shell-component-client.c: Remove.
-	* evolution-shell-component-client.h: Remove.
-	* evolution-shell-component-dnd.c: Remove.
-	* evolution-shell-component-dnd.h: Remove.
-	* evolution-storage-listener.c: Remove.
-	* evolution-storage-listener.h: Remove.
-	* evolution-storage-set-view-listener.c: Remove.
-	* evolution-storage-set-view-listener.h: Remove.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (DEVELOPMENT_WARNING): Define.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_send_receive): New.
-
-	* Evolution-Component.idl (Component.sendAndReceive): New.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-user-creatable-items-handler.c (ensure_menu_items): Reverse
-	the list so we get the items in the same order they were given to
-	us [since we are using g_slist_prepend() to build the list].
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Evolution-Component.idl (GNOME.Evolution.Component.UnknownType):
-	New exception.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-window.c: New signal "component_changed".
-	(class_init): Install.
-	(switch_view): Emit.
-	(e_shell_window_new): Call
-	e_user_creatable_items_handler_attach_menus() to attach the
-	"New..."  menus.
-	(e_shell_window_peek_current_component_id): New.
-	(e_shell_window_peek_shell): Add precondition.
-	(e_shell_window_peek_current_component_id): Likewise.
-	(e_shell_window_peek_bonobo_ui_component): Likewise.
-
-	* e-user-creatable-items-handler.c: New.
-	* e-user-creatable-items-handler.h: New.
-
-	* e-shell-window.h: #include <bonobo/bonobo-ui-component.h>.
-
-	* e-shell.c (struct _EShellPrivate): Add member
-	user_creatable_items_handler.
-	(e_shell_get_user_creatable_items_handler): Remove.
-	(e_shell_peek_user_creatable_items_handler): New.
-
-	* Evolution.idl: Don't #include Evolution-ShellComponent.idl.
-
-	* Evolution-Component.idl (GNOME.Evolution.RequestCreateItem): New
-	method.
-	(GNOME.Evolution.creatableItems): New attribute.
-
-	* e-shell-user-creatable-items-handler.c: Remove.
-	* e-shell-user-creatable-items-handler.h: Remove.
-
-2003-11-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-window.c (e_shell_window_switch_to_component): Call
-	e_sidebar_select_button() instead of switch_view().
-
-	* e-sidebar.c (update_buttons): New helper function.
-	(e_sidebar_select_button): New.
-
-2003-11-11  JP Rosevear <jpr@ximian.com>
-
-	* main.c (kill_dataserver): kill the right thing
-	(kill_old_dataserver): rename and check the version correctly
-
-2003-11-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c: Added a new "-c" command-line arg.
-	(idle_cb): If the arg is specified, open the component with that
-	id/alias.
-
-	* e-shell.c (impl_Shell_createNewView): New, implementation for
-	the Shell::createNewView() CORBA method.
-	(e_shell_class_init): Install.
-	(e_shell_create_window): Get a component_id arg.
-
-	* e-shell-window.c (e_shell_window_new): Get a component_id arg
-	and create the window with that component activated if not NULL.
-
-	* Evolution-Shell.idl (createNewView): Remove.
-	(createNewWindow): New.
-
-2003-11-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-window.c (struct _ComponentView): New member
-	"component_alias".
-	(component_view_new): Get a new "alias" arg, set the member in the
-	struct accordingly.
-	(component_view_free): Free ->component_alias.
-	(setup_widgets): Pass the alias from the ComponentInfo to
-	e_component_view().
-	(switch_view): New utility function.
-	(sidebar_button_selected_callback): Use it.
-	(e_shell_window_switch_to_component): New public function.
-	(e_shell_window_new): Switch to the component whose id is in the
-	/apps/evolution/shell/view_defaults/component_id GConf key.
-
-	* apps_evolution_shell.schemas: Removed view_defaults/folder_path.
-	New key view_defaults/component_id.
-
-	* e-component-registry.c (component_info_free): Free ->alias.
-	(component_info_new): Get an "alias" arg and set the member
-	accordingly.
-	(query_components): Remove debugging messages.  Get an
-	"evolution:component_alias" property from the component and set
-	the alias from that.
-
-	* e-component-registry.h (struct _EComponentInfo): New member
-	"alias".
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: don't include top level libical
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: make sure the marshal header is in the sources too
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* main.c: use e-d-s idl to check interface version
-
-	* Makefile.am: build e-d-s idl
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-shared-folder-picker-dialog.c (setup_name_selector):
-	Append "_2" to the SelectNames OAFIID.
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Shell.server.in.in: Use "evolution2:config_item"
-	attributes instead of "evolution:config_item" ones.
-
-	* e-shell-settings-dialog.c (load_pages): Expect
-	"evolution2:config_item" properties instead of
-	"evolution:config_item" so they do not conflict with 1.4's.
-
-2003-10-29  Dan Winship  <danw@ximian.com>
-
-	* Evolution-Component.idl: declare an exception for createControls
-	to return, so we don't have to just crash if it fails.
-
-2003-10-28  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am: Add e-shell-view.h to evolution_SOURCES
-
-2003-10-28  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am: Fix automake warning, and add
-	e-shell-user-creatable-items-handler.h to evolution_SOURCES
-
-2003-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* e-component-registry.c (query_components): handle the case where
-	label == NULL, and set it to _("Unknown").
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-sidebar.c (e_sidebar_add_button): Add a little border to the
-	buttons so it looks nicer.
-
-	* e-component-registry.c (query_components): Set an icon from the
-	"evolution:button_icon" attribute.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (struct _EShellPrivate): New member
-	"component_registry".
-	(e_shell_construct): Don't call e_shell_unregister_all().
-	(e_shell_unregister_all): Removed.
-	(e_shell_init): Use g_new0(), removed a bunch of NULL/FALSE
-	assignments.
-	(e_shell_init): Initialize the component_registry.
-	(e_shell_peek_uri_schema_registry): Rename from
-	e_shell_get_uri_schema_registry.
-	(e_shell_peek_component_registry): New.
-	(setup_components): Remove.
-	(e_shell_construct): Don't call.
-
-	* main.c (no_windows_left_cb): Don't call e_shell_unregister_all().
-
-	* e-shell.c (parse_default_uri): Removed.
-	(parse_evolution_uri): Removed.
-	(e_shell_parse_uri): Removed.
-
-	* e-component-info.c: Remove.
-	* e-component-info.h: Remove.
-
-2003-10-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-storage-set-view.c (impl_tree_drag_data_received): Emit the
-	right signal.
-	(impl_tree_drag_data_get): Same.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importer/intelligent.c (create_gui): Make the scrolled window
-	have a GTK_SHADOW_IN shadow.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-window.c (setup_widgets): Make the notebooks not have
-	borders.
-	(setup_widgets): Fix typo: e_get_language_list() returns a GSList,
-	not a GList.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-browser.c (struct _EStorageBrowserPrivate): New member
-	"storage_set_view_scrolled".
-	(e_storage_browser_new): Put the storage_set_view in a scrolled
-	window.  Set priv->storage_set_view_scrolled to this scrolled
-	window.
-	(e_storage_browser_peek_tree_widget_scrolled): New.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-sidebar.c (PADDING): Increase to 6 pixels.
-	(button_toggled_callback): Add a cast.
-	(e_sidebar_set_selection_widget): Handle the NULL widget case
-	properly.
-	(impl_remove): New, implementation for GtkContainer::remove.
-	(do_layout): Add padding between the selection_widget and the
-	button box.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-window.c (struct _ComponentView): New member button_id.
-	(struct _EShellWindowPrivate): New member sidebar.
-	(component_new_new): Get a button_id arg.
-	(component_button_clicked_callback): Removed.
-	(sidebar_button_selected_callback): New.
-	(create_component_button): Removed.
-	(setup_widget): Set up the sidebar using ESidebar and hook up its
-	"button_selected" signal.  Also get the component name from a
-	property on the server info.
-	(e_shell_window_new): Use BASE_VERSION for the version in the app
-	name instead of hardcoding "1.5".
-
-	* e-sidebar.c: New.
-	* e-sidebar.h: New.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Shell.server.in.in: Append a _2 to all the IIDs.
-
-	* e-shell.h (E_SHELL_OAFIID): Change to "GNOME_Evolution_Shell_2"
-	so it does not conflict with the old IID.
-
-2003-10-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-shell-window.c (e_shell_window_new): Change to "evolution-1.5"
-	- although, ideally, this should be a config.h macro or something.
-
-2003-10-22  Dan Winship  <danw@ximian.com>
-
-	* main.c: Remove e_proxy_init call. (e-proxy is gone now)
-
-2003-10-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-storage-set-view.c: Rewrote the drag & drop code.
-
-2003-10-21  Not Zed  <NotZed@Ximian.com>
-
-	* e-storage-browser.c (e_storage_browser_show_path): ref the view
-	since removing it from the hashtable will unref it.
-
-2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: INCLUDE path fixes for changes made to libical
-	build.
-
-2003-09-30  Ismael Olea <ismael@olea.org>
-
-	* e-shell-about-box.c: fixed encoding for Spanish translators.
-
-2003-09-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-folder-selection-dialog.c, e-folder-selection-dialog.h: New
-	files, based on e-shell-folder-selection-dialog.[ch].  These don't
-	require the shell, they just need an EStorageSet to work.
-
-2003-09-23  Charles Zhang  <charles.zhang@sun.com>
-
-	* e-shell-startup-wizard.c (e_shell_startup_wizard_create): connect
-	to "key_press_event" signal with key_press_event_callback.
-	(key_press_event): Handle `ESC` key press event. [#48145]
-
-2003-09-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* Makefile.am (evolution_LDADD): libical.la -> libical-evolution.la
-
-2003-09-12  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* e-config-upgrade.c: (utf8_reencode), (upgrade_xml_1_2_rec),
-	(e_config_upgrade):
-	Fix migration of shortcuts.xml which was incorrectly encoded by
-	libxml1. (Mdk bug #4927)
-
-2003-09-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (impl_right_click): If the
-	right_click_row_path is not NULL (i.e. a menu is being popped up
-	already), don't pop up the menu again.  [#48388]
-
-2003-09-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#47875, thanks to Calvin Liu for figuring this out.]
-
-	* e-shortcuts.c (e_shortcuts_add_default_shortcuts): Use the
-	group_num arg, so it gets added to the proper group.
-	(e_shortcuts_add_default_group): Pass the actual group number to
-	e_shortcuts_add_default_shortcuts().
-
-2003-09-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	* Makefile.am (evolution_LDADD): libical-evolution.la -> libical.la
-
-2003-09-05  Yuedong Du  <yuedong.du@sun.com>
-
-	* e-shell-importer.c: (importer_file_page_new),
-	(importer_type_page_new), (show_import_wizard): Use 
-	gtk_label_new_with_mnemonic() to replace gtk_label_new(). Use
-	gtk_label_set_mnemonic_widget() to set up label<-> entry
-	relationship. Change gtk_button_set_label() to 
-	gtk_button_set_use_underline() and gtk_button_set_label(). Change 
-	gtk_radio_button_new_with_label_from_widget() to 
-	gtk_radio_button_new_with_mnemonic_from_widget(). fix bug #47867
-
-2003-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-window.c: New member current_view in struct
-	EShellWindowPrivate.
-	(init_view): Set it to the newly added view.  Also, switch the
-	notebooks to the new page.
-	(component_button_clicked_callback): Set current_view here as
-	well, for existing views.
-	(component_view_activate): New.
-	(component_view_deactivate): New.
-	(init_view): Deactivate existing view, activate new selected view.
-	(component_button_clicked_callback): Likewise.
-	(init_view): Set the component_iface to CORBA_OBJECT_NIL in the
-	view if you cannot create the controls.
-
-2003-08-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-window.c (setup_widgets): Pass TRUE for @resize to
-	gtk_paned_pack2() for the view notebook.
-
-2003-07-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-splash.c, e-splash.h: Removed from the build.
-
-2003-07-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_close_all_windows): Oops.  Traverse the
-	window list with a local "next" variable like we did in the
-	original code.  Otherwise, we crash because the list is being
-	modified at each gtk_widget_destroy().
-
-2003-07-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-browser.c (class_init): Set up "page_switched" signal.
-	(e_storage_browser_show_path): Emit "page_switched".
-
-	* e-storage-browser.h: New signal "page_switched".
-
-2003-07-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-window.c: Removed member ui_container from
-	EShellWindowPrivate.
-	(e_shell_window_peek_shell): New.
-	(e_shell_window_peek_bonobo_ui_component): New.
-	(e_shell_window_new): Don't set the ui_container anymore, just get
-	it ourselves.  Also call e_shell_window_commands_setup().
-
-	* e-shell-window-commands.c, e-shell-window-commands.h: New files
-	implementing the commands for the shell windows.
-
-	* e-shell.c (e_shell_close_all_windows): Renamed from
-	e_shell_destroy_all_windows().
-
-	* main.c (idle_cb): Create a new window using
-	e_shell_create_window().
-
-	* e-shell-importer.h: Define _E_SHELL_IMPORTER_H_ to prevent
-	multiple inclusion, instead of __IMPORTER_H__.  Also, do not
-	#include <bonobo/bonobo-ui-component.h>.
-
-	* e-shell-importer.c (e_shell_importer_start_import): Renamed from
-	show_import_wizard().  Don't get any args.
-
-2003-07-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c: Remove the global evolution_directory variable.
-	(main): Just declare, assign and free the evolution_directory
-	variable here.  Also, use g_idle_add() instead of gtk_idle_add().
-	(idle_cb): Don't pass the evolution directory path to
-	e_shell_new() anymore, since that arg is gone.
-
-	* e-shell.c: Remove member local_directory from EShellPrivate.
-	(impl_finalize): Don't free.
-	(e_shell_init): Don't NULL.
-	(e_shell_construct): Removed arg local_directory.
-	(e_shell_new): Likewise.
-	(e_shell_construct): Don't call e_setup_check_config() here.
-	(e_shell_get_local_directory): Removed.
-
-2003-07-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c: Removed global variable "no_splash".
-	(idle_cb): Updated to not pass the splash argument to
-	e_shell_new().
-	(main): Removed "--no-splash" option.
-
-	* e-shell.c: Removed members storage_set, local_storage,
-	summary_storage, folder_type_registry, component_registry,
-	corba_storage_registry from struct EShellPrivate.
-	(setup_corba_storages): Removed.
-	(e_shell_construct): Don't invoke.
-	(setup_local_storage): Removed.
-	(e_shell_construct): Don't invoke.  Also, removed initialization
-	for all the removed members.
-	(e_shell_new): No priv->storage_set anymore.
-	(e_shell_get_storage_set): Removed.
-	(e_shell_get_local_storage): Removed.
-	(e_shell_get_folder_type_registry): Removed.
-	(set_owner_on_components): Removed.
-	(set_interactive): Removed contents; do nothing for now.
-	(pop_up_activation_error_dialog): Removed.
-	(e_shell_construct): Removed arg show_splash.  Do not create a
-	splash dialog at all.
-	(e_shell_new): Removed arg show_splash here as well.
-	(e_shell_construct): No folder type registry handling here
-	anymore.
-	(setup_components): Removed splash arg.
-	(save_settings_for_components): Removed.
-	(save_settings_for_component): Removed.
-	(save_misc_settings): Removed.
-	(e_shell_save_settings): Moved the code in here.
-	(e_shell_component_maybe_crashed): Removed.
-	(e_shell_send_receive): Removed.
-	(e_shell_get_component_registry): Removed.
-	(prepare_for_quit_callback): Removed.
-
-	* evolution-storage-set-view.c: Removed from build.
-	* evolution-storage-set-view.h: Removed from build.
-	* evolution-storage-set-view-factory.c: Removed from build.
-	* evolution-storage-set-view-factory.h: Removed from build.
-
-	* e-component-registry.c, e-component-registry.h: Removed from
-	build.
-
-	* e-shell-folder-creation-dialog.c: Removed from build.
-	* e-shell-folder-creation-dialog.h: Removed from build.
-
-	* e-shell-folder-selection-dialog.c: Removed from build.
-	* e-shell-folder-selection-dialog.h: Removed from build.
-
-2003-07-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-setup.c: Do not #include "e-shell-config.h".
-
-	* main.c (idle_cb): Do not register the config factory.
-
-	* e-shell.c: Removed members offline_handler, shortcuts and
-	corba_shortcuts from EShellPrivate.
-	(setup_shortcuts_interface): Removed.
-	(storage_set_moved_folder_callback): Removed.
-	(e_shell_construct): Don't connect.  Also, no need to set up the
-	shortcuts either.
-	(e_shell_get_shortcuts): Removed.
-	(offline_procedure_started_cb): Removed.
-	(offline_procedure_finished_cb): Removed.
-	(e_shell_go_offline): Just assert for now.
-	(e_shell_go_online): Same.
-
-	* e-shell-config-autocompletion.c: Removed.
-	* e-shell-config-autocompletion.h: Removed.
-
-	* e-shell-config-default-folders.c: Removed.
-	* e-shell-config-default-folders.h: Removed.
-
-	* e-shell-config-folder-settings.c: Removed.
-	* e-shell-config-folder-settings.h: Removed.
-
-	* e-shell-config.c, e-shell-config.h: Removed.
-
-	* e-corba-shortcuts.c, e-corba-shortcuts.h: Removed.
-
-	* e-shortcuts-view-model.c, e-shortcuts-view-model.h: Removed.
-
-	* e-shortcuts-view.c, e-shortcuts-view.h: Removed.
-
-	* e-shortcuts.c, e-shortcuts.h: Removed.
-
-	* e-shell-offline-handler.c, e-shell-offline-handler.h: Removed.
-	
-	* e-shell-offline-sync.c, e-shell-offline-sync.h: Removed.
-
-	* e-shell-config-offline.c, e-shell-config-offline.h: Removed.
-
-2003-07-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c: Renamed signal "new_view_created" to
-	"new_window_created".  Renamed "no_views_left" to
-	"no_windows_left". Renamed EShellPrivate member "views" to
-	"windows".  Removed member user_creatable_items_handler.
-	(notify_no_windows_left_idle_cb): Renamed from
-	notify_no_views_left_idle_cb.  Emit "no_windows_left".
-	(impl_Shell_createNewView): Raise an InternalError exception.
-	(window_delete_event_cb): Renamed from view_delete_event_cb.
-	(window_weak_notify): Renamed from view_weak_notify.
-	(create_view): Removed.
-	(create_window): New.  Creates a new EShellWindow.
-	(e_shell_create_view): Removed.
-	(e_shell_create_window): New.
-	(e_shell_request_close_view): Removed.
-	(e_shell_request_close_window): New.
-	(e_shell_destroy_all_windows): Renamed from
-	e_shell_destroy_all_views.
-	(e_shell_component_maybe_crashed): Get an EShellWindow parameter,
-	instead of an EShellView.
-	(e_shell_go_offline): Likewise.
-	(e_shell_go_online): Likewise.
-	(e_shell_show_settings): Likewise.
-	(get_icon_path_for_component_info): Removed.
-	(setup_components): Do not do the user_creatable_items_handler
-	stuff here.
-	(e_shell_construct): Don't create the EUserCreatableItemsHandler
-	here.
-	(e_shell_get_user_creatable_items_handler): Crash when you get
-	here.
-
-	* e-shell-user-creatable-items-handler.c: Removed.
-	* e-shell-user-creatable-items-handler.h: Removed.
-	* e-shell-shared-folder-picker-dialog.c: Removed.
-	* e-shell-shared-folder-picker-dialog.h: Removed.
-	* e-shell-view.c, e-shell-view.h: Removed.
-	* e-shell-view-menu.c, e-shell-view-menu.h: Removed.
-	* e-shell-folder-commands.c, e-shell-folder-commands.h: Removed.
-	* e-shell-importer.c, e-shell-importer.h: Removed.
-
-	* main.c (new_window_created_callback): Renamed from
-	new_view_created_callback.
-	(window_map_callback): Renamed from view_map_callback.
-	(idle_cb): Connect to "new_window_created" instead of
-	"new_view_created".
-	(no_windows_left_cb): Renamed from no_views_left_cb.
-	(idle_cb): Connect to "no_windows_left" instead of
-	"no_views_left".
-
-	* e-shell-offline-handler.c: Changed the type of the
-	parent_shell_view member of EShellOfflineHandlerPrivate to
-	GtkWindow and renamed it to parent_window.
-	(e_shell_offline_handler_put_components_offline): Just get a
-	GtkWindow arg instead of an EShellView arg.
-
-2003-07-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-client.c
-	(evolution_shell_client_create_storage_set_view): Just crash when
-	you get here.
-	(evolution_shell_client_get_pixbuf_for_type): Likewise.
-	(evolution_shell_client_set_line_status): Likewise.
-	(evolution_shell_client_get_local_storage): Likewise.
-	(evolution_shell_client_get_shortcuts_interface): Likewise.
-	(evolution_shell_client_get_storage_registry_interface): Likewise.
-	(evolution_shell_client_get_activity_interface): Likewise.
-	(evolution_shell_client_user_select_folder): Likewise.
-	(evolution_shell_client_new): Likewise.
-	(evolution_shell_client_construct): Likewise.
-	(query_shell_interface): Removed.
-	(init): Do nothing.
-	(class_init): Do nothing.
-	(unref_pixbuf): Removed.
-	(impl_dispose): Removed.
-	(impl_finalize): Removed.
-	(user_select_folder): Removed.
-	(count_string_items): Removed.
-	(create_folder_selection_listener_interface): Removed.
-	(init_FolderSelectionListener_vtables): Removed.
-	(impl_FolderSelectionListener_cancel): Removed.
-	(impl_FolderSelectionListener_selected): Removed.
-	(query_shell_interface): Removed.
-
-	* e-shell.c (impl_Shell_getLocalStorage): Removed.
-	(impl_Shell_createStorageSetView): Removed.
-	(impl_Shell_getIconByType): Removed.
-	(impl_Shell_getComponentByType): Removed.
-	(impl_Shell_selectUserFolder): Removed.
-	(e_shell_class_init): Do not install removed method impls.
-	(folder_selection_dialog_cancelled_cb): Removed.
-	(folder_selection_dialog_folder_selected_cb): Removed.
-
-	* Evolution-Shell.idl (getLocalStorage): Removed
-	(createStorageSetView): Removed.
-	(selectUserFolder): Removed.
-	(getIconByType): Removed.
-	(getComponentByType): Removed.
-	(FolderSelectionListener): Removed.
-
-	* Evolution-Component.idl (requestQuit, interactive): New methods.
-
-2003-07-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c: Removed activity_handler member from EShellPrivate.
-	(setup_activity_interface): Removed.
-	(e_shell_construct): Don't call.
-	(create_view): Do not call e_activity_handler_attach_task_bar
-	here.
-
-	* e-activity-handler.c, e-activity-handler.h: Removed.
-
-2003-07-24  Yuedong Du  <yuedong.du@sun.com>
-
-	* e-shell-offline-handler.c: (dialog_response_cb): fix crash when
-	user escape the dialog. see bug #46700.
-
-2003-07-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-folder.c (e_folder_new): Accept a NULL description.
-
-	* main.c (idle_cb): Create a new EShellWindow and show it.
-
-	* e-storage.c: New signal "async_open_folder".
-	(impl_async_open_folder): Removed.
-	(class_init): Declare new signal.
-
-	* e-shell.c (setup_components): Don't actually activate any
-	components.
-
-	* e-storage-browser.c, e-storage-browser.h: New.
-
-	* e-shell-window.c, e-shell-window.h: New.
-
-	* e-shell-marshal.list: Add an entry for
-	NONE:STRING,POINTER,POINTER.
-
-	* Evolution.idl: Include Evolution-Component.idl.
-
-	* Evolution-Component.idl: New interface for Evolution components.
-
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: Use EVO_MARSHAL_RULE
-
-	* e-shell-importer.c (prepare_intelligent_page): Fix a warning
-
-2003-07-22  Antonio Xu  <antonio.xu@sun.com>
-
-	* e-shell-startup-wizard.c (e_shell_startup_wizard_create): connect
-	to "delete_event" signal with startup_wizard_delete. [#46284]
-
-2003-07-22  Antonio Xu <antonio.xu@sun.com>
-
-	* e-shell-importer.c: (show_import_wizard): use
-	g_signal_connect_after to connect "prepare" signal.
-	(prepare_intelligent_page): Display some error log and disable
-	forward button rather than jump to finish page.  [#46017]
-
-2003-07-15  Antonio Xu  <antonio.xu@sun.com>
-	
-        * e-shell-startup-wizard.c (e_shell_startup_wizard_create): connect
-        "back" signal to back_finish_func in finish page.
-        (back_finish_func): handle "back" signal.
-        (prepare_importer_page): Jump to finish page when running equal zero.
-        [#46026]
-
-2003-07-17  Dan Winship  <danw@ximian.com>
-
-	* e-shell-user-creatable-items-handler.c (free_menu_items): free
-	the folder_type
-
-	* e-splash.c (e_splash_new): Unref the pixbuf.
-
-	* evolution-shell-component.c (impl_finalize): Add some missing
-	frees.
-	(user_creatable_item_type_free): free the tooltip
-
-2003-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c (e_shell_command_rename_folder): Do
-	not overwrite an existing folder.  Also, cleaned up the code a
-	bit.  [#45982]
-
-2003-06-25  Chris Toshok  <toshok@ximian.com>
-
-	* e-config-upgrade.c: add general_map and a reference to it in
-	gconf_remap_list.  Should fix 44477.
-
-2003-06-19  Dan Winship  <danw@ximian.com>
-
-	* e-folder-tree.c (e_folder_tree_add): Don't leak parent_path,
-	even on error
-
-2003-06-16  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* Makefile.am:
-	Add missing skel/stubs to BUILD_SOURCES (bug #44717).
-
-2003-06-05  Not Zed  <NotZed@Ximian.com>
-
-	** For #42691.
-
-	* Makefile.am (%.server.in): use implicit rule.
-	(BUILT_SOURCES): added server_DATA.
-
-2003-05-22  Not Zed  <NotZed@Ximian.com>
-
-	* e-config-upgrade.c (CONF_MAJOR, CONF_MINOR, CONF_REVISION): Set
-	to 1.4.0 for release.
-
-2003-06-10  Larry Ewing  <lewing@ximian.com>
-
-	* e-corba-storage-registry.c (listener_notify): don't leak nr.name.
-
diff --git a/shell/ChangeLog.pre-1-4 b/shell/ChangeLog.pre-1-4
deleted file mode 100644
index c7cfb0f830..0000000000
--- a/shell/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,15363 +0,0 @@
-2003-05-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-about-box.c: Add Mark Gordon.
-
-2003-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#43322]
-
-	* e-shell-shared-folder-picker-dialog.c (storage_weak_notify): Set
-	the storage member to NULL.
-	(shell_weak_notify): Set the shell member to NULL.
-	(cleanup_discovery): g_object_weak_unref() shell, parent and
-	storage.
-
-2003-05-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c: Removed "forced_upgrade" unused variable.
-	(show_development_warning): Put in a DEVELOPMENT_WARNING cpp
-	conditional.
-	(warning_dialog_response_callback): Likewise.
-	(view_map_callback): Likewise.
-	(new_view_created_callback): Likewise.
-	(idle_cb) [DEVELOPMENT_WARNING]: Do not connect
-	new_view_created_callback() to the "new_view" shell signal
-	anymore.
-
-	* Makefile.am (install-evolution) [DEFAULT_BINARY]: Make a
-	symbolic link from evolution to evolution-$(BASE_VERSION).
-
-	[#43216]
-
-	* e-shell-folder-creation-dialog.c (dialog_data_destroy):
-	g_object_weak_unref shell and dialog if they are not NULL.
-	(dialog_destroy_notify): Set ->dialog to NULL in all cases.
-
-2003-05-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* e-corba-config-page.c: Remove some padding which I incorrectly
-	added to the wrong vbox. This shoulda been fixed in 
-	widgets/misc/e-multi-config-dialog.c . (And it is, now.) 
-	
-2003-05-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (e_storage_set_view_set_show_checkboxes):
-	Reallocate the "expansions" member of ETreeState as well, to avoid
-	a memory error.  [#43119]
-
-2003-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (parse_default_uri): Protect against the component
-	name having slashes in it.
-
-	* e-shell-view.c (display_uri): Protect against invalid "default:"
-	URIs.  [#43079]
-
-2003-05-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* main.c: #ifdef'ed wombat killing code, depending on whether
-	KILL_PROCESS_CMD is defined or not.
-	(kill_wombat): kill also the alarm daemon process.
-
-2003-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch from Antonio Xu <antonio.xu@sun.com>, #42491]
-
-	* e-config-upgrade.c (upgrade_xml_1_2_rec): Make it compile on
-	Forte.
-
-2003-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* e-shell.c (save_settings_for_component): release the interface
-	if we got it
-
-	* e-shell-view.c: include bonobo-exception.h
-	(impl_dispose): release and unref the shell view corba interface
-	(init): init to CORBA_OBJECT_NIL
-	(e_shell_view_get_corba_interface): return the corba interface
-	(setup_corba_interface): release the existing shell view, add as
-	an interface and then query to get it back
-	(get_view_for_uri): release and unref the control once we create
-	the widget with it
-
-	* e-corba-storage.c (storage_listener_servant_new): don't ref ourselves
-	(storage_listener_servant_free): don't unref ourselves
-	(impl_dispose): free the servant info
-
-	* e-corba-storage-registry.c
-	(impl_StorageRegistry_getStorageByName): we need to ref as well as
-	duplicate since we didn't create the storage here
-
-2003-05-09  Jeremy Katz  <katzj@redhat.com>
-
-	* main.c: Add a #include to fix a warning.
-
-	* e-shell-offline-handler.c (update_dialog_clist): Use a list
-	store instead of a tree model for the store.
-
-2003-05-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#42342]
-	* e-shell-view.c (update_send_receive_sensitivity): New function
-	to update the Send/Receive menu and toolbar items according to the
-	current line status.
-	(e_shell_view_construct): Call it here to set up the initial
-	state.
-	(shell_line_status_changed_cb): Use it here as well.
-
-2003-05-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#36956]
-	* e-shell-view.c (update_for_current_uri): Remove the version
-	number from the window title.
-
-	[#42518]
-	* e-shell-view.c (handle_current_folder_removed): Casefold the
-	Inbox name only once, instead of once per iteration.  Removed the
-	spurious slash that was being passed in the path in the Inbox case
-	and prevented it from working.  Added missing slash in the path
-	for the storage case.  Casefold the path including the slash,
-	since we compare against a string that does include the slash.
-	(storage_set_removed_folder_callback): Remove the notebook page
-	before calling handle_current_folder_removed(), instead of after;
-	otherwise, the notebook page number we have might not be valid
-	anymore.
-
-	* e-shell-folder-creation-dialog.c (setup_dialog): Set the default
-	response for the dialog to GTK_RESPONSE_OK.
-
-2003-05-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar):
-	Do use the supplied folder_path to determine the unread count, if
-	not NULL.  [#42465]
-
-2003-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* e-shell-folder-commands.c (delete_dialog): don't pass
-	NO_SEPARATOR flag as per gtkmessagedialog warning
-
-2003-05-02  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-about-box.c (text[]): grepped changelogs and added all
-	names found.  #40391.
-
-2003-05-01  Dan Winship  <danw@ximian.com>
-
-	* glade/e-shell-shared-folder-picker-dialog.glade: Don't expand
-	the select-names entry, because we don't want it as tall as the
-	button.
-
-2003-04-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_construct): Set the default
-	response to GTK_RESPONSE_OK.
-
-2003-04-29  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am: Fix install of evolution
-	
-2003-04-28  Not Zed  <NotZed@Ximian.com>
-
-	[#41013]
-
-	* e-shell-importer.c (html_size_req): removed.
-	(create_help): renamed from create_html.  Only creates a plain
-	label widget now, with line wrap turned on.  Also make the
-	g_return an assert, it failing is entirely based on internal code.
-	(show_import_wizard): s/create_html/create_help/g
-
-	[#41648]
-	
-	* e-config-upgrade.c (upgrade_xml_file): upgrade_xml_file_1_0 made
-	a bit more generic, this handles io, a callback handles xml
-	changes.
-	(is_xml1encoded): new function to tell if a string is in gal's
-	xml1 'encoded' format, or raw locale text.
-	(decode_xml1): decode xml1 encoded format to valid utf8.
-	(upgrade_xml_1_2_rec): upgrades xml1 encoded or badly encoded xml
-	content for specific parent->child nodes.
-	(CONF_REVISION): bump the config revision to 1.3.1.
-	(e_config_upgrade): if config revision < 1.3.1, then check xml
-	files for xml1 content.
-
-2003-04-28  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am: Fix up some stuff for the nognome script
-	* evolution-nognome.in: Fix up nognome script for Sun GNOME2
-	
-2003-04-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41916
-
-	* evolution-storage.c (get_folder_list_foreach): removed comment which
-	does not apply any more.
-	(impl_Storage__get_folderList): set sequence's maximum number of items
-	to e_folder_tree_get_count as is.
-
-2003-04-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	Patch from Sanshao Jiang <alex.jiang@sun.com>.
-
-	[#41484]
-
-	* main.c (main): Add e_proxy_init()
-	
-2003-04-24  Dan Winship  <danw@ximian.com>
-
-	* evolution-shell-component.c (impl_setOwner): Comment out the
-	pinging code again since it's only being used by Connector, where
-	it's triggering an unrelated bug.
-
-2003-04-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#41059]
-
-	* e-corba-storage.c (async_open_cb): Added a missing unref of the
-	storage in the closure.
-	(async_open_folder_idle): Add the pending open to the pending open
-	list before calling asyncOpenFolder, instead of after.
-
-2003-04-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-local-storage.c (load_folder): cast to remove warning.
-	(construct): set a physiucal uri on the root folder, so we dont
-	get warnings when we add it later.
-
-2003-04-22  Anna Marie Dirks  <anna@ximian.com>
-
-	* e-shell-settings-dialog.c (init): Add appropriate padding 
-	to the Evolution Settings window. This is another bit of the 
-	fix for #41392.
-
-	* e-corba-config-page.c (e_corba_config_page_construct): Add 
-	appropriate padding to the corba_config_page widget. Partial 
-	fix for #41392.
-
-2003-04-23  Anna Marie Dirks  <anna@ximian.com>
-
-	* glade/e-folder-list.glade: replaced buttons with stock buttons
-	and added HIG-blessed spacing. Fixes 41145.
-
-2003-04-22  Anna Marie Dirks  <anna@ximian.com>
-	
-	* e-shortcuts-view.c
-	(destroy_group_cb): Set the border width of the message dialog 
-	to 6. Also corrected the capitalization for "Remove Shortcut 
-	Dialog". Fixes 41569
-	(show_new_group_dialog): Fixed the title of "Create New Shortcut
-	Group" . Partially fixes 41038.
-	(rename_shortcut_cb): Corrected the label capitalization for 
-	Rename dialog. Fixes 41567.
-
-2003-04-21  Chris Toshok  <toshok@ximian.com>
-
-	* e-folder-list.c (e_folder_list_parse_xml): this should never
-	happen unless you're really trying, but don't crash if the xml
-	setting is malformed.
-
-2003-04-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (create_folder_directory): Don't signal an
-	error if mkdir() returns EEXIST.  This should at least help with
-	situations like the one described in #40989.
-
-2003-04-21  Anna Marie Dirks  <anna@ximian.com>
-
-	* e-shell-folder-commands.c (delete_dialog): Corrected border 
-	with for Delete Folder dialog. Fixes 41036. 
-	(e_shell_command_copy_folder): Corrected capitalization of the "Copy
-	Folder" window title. Partial fix for 41025. 
-	(e_shell_command_move_folder): Corrected the capitalization of the
-	"Move Folder" dialog. Fixes 41024.
-
-
-2003-04-21  Anna Marie Dirks  <anna@ximian.com>
-	
-	* e-shell-folder-selection-dialog.c 
-	(e_shell_folder_selection_dialog_construct): Added appropriate border 
-	width to the folder selection dialog. Fixes 41022, 41146, 41147, 
-	41010, partially fixes 41025. 
-
-
-2003-04-21  Anna Marie Dirks  <anna@ximian.com>
-
-	* glade/evolution-startup-wizard.glade: Added spacing/padding to 
-	first-run dialog. Fixes 41242. 	
-
-2003-04-21  Anna Marie Dirks  <anna@ximian.com>
-
-	* glade/e-shell-folder-creation-dialog.glade: Misc HIG-related tweaks,
-	mostly spacing and padding related. Fixes 41008. 
-
-	* e-shell-folder-creation-dialog.c (add_storage_set_view): Added
-	appropriate spacing to the main vbox of the folder creation dialog.
-	Partially fixes 41008.
-
-2003-04-21  Anna Marie Dirks  <anna@ximian.com>
-	
-	* glade/e-shell-config-default-folders.glade: Added appropriate
-	spacing/padding to the default folder pages of the settings dialog. 
-	Partial fix for 41128.
-
-
-2003-04-21  Anna Marie Dirks  <anna@ximian.com>
-
-	* glade/e-active-connection-dialog.glade: Fixed padding/spacing/caps
-	of the "Go Offline" dialog. Fixes 41225 and 41227. 
-
-2003-04-18  Rodney Dawes  <dobey@ximian.com>
-
-	* e-shell-view.c: Use PREFIX instead of EVOLUTION_DATADIR for
-	bonobo_ui_util_set_ui () [#21499]
-	
-2003-04-17  Dan Winship  <danw@ximian.com>
-
-	* e-shell-folder-creation-dialog.c (add_folder_types): If the
-	default_type is "foo/bar" and "foo" appears in the list but
-	"foo/bar" doesn't, use "foo" as the default type. [#41468] Also,
-	remove a workaround for a gtk 1.2 bug.
-
-2003-04-16  Dan Winship  <danw@ximian.com>
-
-	* e-corba-storage.c (async_create_folder): If the new folder's
-	parent has unresolved children, async_open the parent first, then
-	create the new folder. [#41413]
-	(async_create_folder, async_remove_folder, async_xfer_folder,
-	async_open_folder, async_discover_shared_folder,
-	async_remove_shared_folder): Ref the storage.
-	(async_folder_cb, async_folder_discovery_cb): Unref it
-
-2003-04-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-config-upgrade.c: Turn off debugging. Fixes bug #41469.
-
-2003-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* apps_evolution_shell.schemas: Increase the default value for
-	/schemas/apps/evolution/shell/view_defaults/folder_bar/width to
-	200. 	[#41002]
-
-	* evolution-shell-component.c (owner_ping_callback): Enable this
-	again.
-	(setup_owner_pinging): Same.
-	(impl_setOwner): Check if the shell is in-process and, if so, call
-	setup_owner_pinging().
-
-2003-04-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-setup.c (e_setup_check_config): Free the temporary string.
-
-	* e-shell-user-creatable-items-handler.c (append_xml_for_menu_item):
-	Free the icon xml string.
-
-	* e-shell.c (parse_default_uri): Free the component name, the
-	configuration path and the temporary path.
-
-2003-04-15  Dan Winship  <danw@ximian.com>
-
-	* e-folder.c (e_folder_get_has_subfolders,
-	e_folder_set_has_subfolders): new boolean flag.
-
-	* e-storage.c (EStoragePrivate, impl_finalize, init): Remove the
-	pseudofolders hash
-	(e_storage_async_open_folder): Replace the pseudofolders test with
-	a test of whether the folder has the "has_subfolders" flag set.
-	(e_storage_new_folder): Likewise (for the folder's parent).
-	(e_storage_declare_has_subfolders): Set "has_subfolders" on the
-	folder.
-	(e_storage_get_has_subfolders): Check "has_subfolders" on the
-	folder.
-	Should fix #33919.
-
-2003-04-14  Not Zed  <NotZed@Ximian.com>
-
-	* glade/e-active-connection-dialog.glade: fix the title of the
-	dialogue box.  #41304.
-
-2003-04-09  Dan Winship  <danw@ximian.com>
-
-	* e-folder-list.c: Update for e_option_menu prototype
-	constification
-
-2003-04-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-setup.c (setup_bonobo_conf_private_directory): Removed.
-	(e_setup): Do not call here.  Also, removed hacks for
-	~/evolution/config and ~/evolution/local/Trash.
-
-2003-04-08  Dan Winship  <danw@ximian.com>
-
-	* main.c (main): Add a "--setup-only" flag, to just run e_setup()
-	and exit. (For #40889)
-
-	* glade/evolution-startup-wizard.glade: Remove the color specs so
-	the druid will use theme colors
-
-	* importer/import.glade: Likewise
-
-2003-04-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#40912]
-
-	* e-shell-folder-selection-dialog.c (impl_dispose):
-	g_object_weak_unref() the shell here.
-
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* evolution-storage.c (evolution_storage_class_init): Fix arg
-	types on REMOVED_SHARED_FOLDER signal. #40888
-
-	* evolution-folder-selector-button.c (clicked): Desensitize the
-	window's top-level container rather than desensitizing the window
-	itself, which causes strange problems [#40854]. Also fix up the
-	code that tries to watch for the parent window being destroyed.
-
-	* e-shell.c (impl_Shell_selectUserFolder): Use
-	e_dialog_set_transient_for_xid.
-
-	* e-shell-folder-selection-dialog.c (impl_response): Treat
-	GTK_RESPONSE_DELETE_EVENT the same as GTK_RESPONSE_CANCEL.
-	(e_shell_folder_selection_dialog_construct): No need to catch
-	"delete_event" signal.
-
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am ($(server_in_files)): Substitute version number into
-	the evolution binary name in the server file
-	(INCLUDES): define EVOLUTION_TOOLSDIR
-
-	* GNOME_Evolution_Shell.server.in.in: Clean up server names. Add
-	"-@VERSION@" to the end of the shell binary name
-
-	* main.c (main): if KILL_PROCESS_CMD is defined, add a
-	--force-shutdown argument that runs killev and exits.
-
-2003-04-07  Not Zed  <NotZed@Ximian.com>
-
-	[#40536]
-
-	* evolution-shell-component.c (impl_interactive): If going
-	interactive, track the view id in a private area.
-	(evolution_shell_component_get_parent_view_xid): Accessor method
-	to retrieve the current view xid.
-
-2003-04-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (update_window_icon): Get the large version of
-	the icon instead of the small one, so it works more nicely with
-	modern WMs.
-
-2003-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#40413]
-
-	* e-shell-folder-selection-dialog.c: Define RESPONSE_NEW for the
-	"New" button in the dialog.
-	(impl_response): Handle RESPONSE_NEW.
-	(e_shell_folder_selection_dialog_construct): Add the "new" button
-	with RESPONSE_NEW response_id.
-
-2003-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#40748]
-
-	* apps_evolution_shell.schemas: Remove the icon_modes schema.
-
-	* e-shell-view.c (setup_defaults): Don't set the icon modes from
-	GConf, they are already stored in the shortcuts.xml file.
-	(e_shell_view_save_defaults): Likewise, don't set it here.
-
-	* e-config-upgrade.c: Remove translation from
-	ShortcutBarGroup%iIconMode to
-	shell/view_defaults/shortcut_bar/icon_types.
-
-2003-04-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importer/GNOME_Evolution_Importer.idl:
-	* importer/evolution-importer.[ch]: added "foldertype" argument to
-	GNOME::Evolution::Importer.
-
-	* importer/evolution-importer-client.[ch]
-	(evolution_importer_client_load_file): added "folder_type" argument
-	and use it in the call to GNOME_Evolution_Importer_loadFile.
-
-	* e-shell-importer.c (start_import): added "folder_type" argument and
-	use it in the call to evolution_importer_client_load_file.
-	(folder_selected): pass in the "folder_type" argument to start_import,
-
-2003-04-02  Not Zed  <NotZed@Ximian.com>
-
-	[#40652]
-
-	* e-shell-view.c (setup_widgets): Pack the folder and shortcut
-	bars into the paned as sizeable.
-
-	[#39467]
-	
-	* e-shell.c (e_shell_construct): Change the splash logic slightly,
-	so that if we can't create the splash, we dont try and cast/use
-	it.
-	* e-splash.c (e_splash_new): dont use a g_return* for what could
-	be a valid (tho incorrect) runtime condition.
-
-	[#40590]
-
-	* e-config-upgrade.c (identity_map[]): Move the signature stuff to
-	a child node.
-	(identity_sig_map[]): Define the signature node.  Fix
-	*autogenerated_signature_%i to map to "auto". 
-
-2003-04-01  Not Zed  <NotZed@Ximian.com>
-
-	[#40474]
-
-	* e-config-upgrade.c (gconf_remap_list[]): The summary settings
-	start at "My-Evolution", not "/My-Evolution".
-	(import_bonobo_config): Same for mail summary settings, and hex
-	decode the string for the strlist.  Add a few extra debug
-	printf's.
-
-2003-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#40377]
-
-	* main.c (kill_old_wombat): New.
-	(kill_wombat): New.
-	(idle_cb): Call kill_old_wombat().
-
-2003-03-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-offline-handler.c (update_dialog_tree_view): Renamed
-	from update_dialog_clist, Ported to GtkTreeView.
-	(update_dialog_tree_view_hash_foreach): Likewise.
-
-	* glade/e-active-connection-dialog.glade: Rename
-	"active_connection_clist" to "active_connection_treeview".
-
-2003-03-27  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-about-box.c: Make Radek's surname correct, Doulík,
-	inserted utf8 into the name string.  For bug #17034.
-
-2003-03-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_construct): Pass "evolution-1.4" as
-	the app name to bonobo_ui_util_set_ui() instead of "evolution".
-
-2003-03-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Shell part of #7153.]
-
-	* e-local-storage.c (load_folder): Call e_storage_new_folder()
-	instead of new_folder() here so the folder doesn't get added to
-	the EvolutionStorage.  Since the EvolutionStorage has its own
-	CORBAfied copy of the folder info [sigh] and it can't be updated,
-	we have to set up the EvolutionStorage after setup_stock_folders()
-	has been called.
-	(setup_corba_storage): New function to set up the CORBA storage.
-	(load_all_folders): Call setup_corba_storage() after
-	setup_stock_folders().
-
-2003-03-25  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-settings-dialog.c (set_dialog_size): Use
-	set_default_size instead of size_request so we allow the user to
-	resize the window.  Also try using 60x30 rather than 72x35 as the
-	approximate font cell size.  For bug #39706.
-
-2003-03-25  Dan Winship  <danw@ximian.com>
-
-	* e-folder-dnd-bridge.c: Update for e_notice move.
-	* e-setup.c: Likewise
-	* e-shell-folder-commands.c: Likewise
-	* e-shell-folder-creation-dialog.c: Likewise
-	* e-shell-offline-sync.c: Likewise
-	* e-shell-shared-folder-picker-dialog.c: Likewise
-	* e-shell-view-menu.c: Likewise
-	* e-shell.c: Likewise
-	* evolution-shell-component-utils.c: Likewise
-
-	* Makefile.am (libeshell_la_LIBADD): libeshell depends on
-	libeutil.
-
-	* e-corba-storage.c: Fix warnings
-
-	* glade/evolution-startup-wizard.glade: Fix colors again
-
-2003-03-25  Dan Winship  <danw@ximian.com>
-
-	* Evolution-ShellComponent.idl (interactive): add a "new_view_xid"
-	arg, so the component has a window id to make use of as a parent
-	if it needs to pop up a dialog.
-
-	* e-shell.c (set_interactive): Pass the new_view_xid when going
-	interactive.
-	(e_shell_set_interactive): Remove this since it wasn't being used,
-	and couldn't be used for anything except lying to the components.
-
-	* evolution-shell-component.c
-	(evolution_shell_component_class_init): Update "interactive"
-	signal definition
-	(impl_interactive): Update prototype and signal emission
-	
-	* e-shell-marshal.list (NONE:BOOL,INT): add
-
-2003-03-21  Dan Winship  <danw@ximian.com>
-
-	* e-corba-storage.c (async_open_folder_idle): If we get a second
-	request to open a folder we're already waiting for, don't send a
-	second CORBA request, just remember the additional request.
-	(async_open_cb): Call the callbacks for all pending requests for
-	this folder.
-	(init): grumble-grumble-non-g_new0-using-people-grumbe
-
-2003-03-20  JP Rosevear  <jpr@ximian.com>
-
-	* e-shell-view-menu.c: remove unused command
-
-2003-03-19  Not Zed  <NotZed@Ximian.com>
-
-	* e-config-upgrade.c (e_config_upgrade): Added some more doco just
-	to make it clear how it was intended to be used/expanded.
-
-2003-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importer/evolution-importer.c
-	(impl_GNOME_Evolution_Importer_loadFile): Get a physical_uri arg
-	instead of a folderpath arg.
-
-	* importer/evolution-importer-client.c
-	(evolution_importer_client_load_file): Get a physical_uri arg.
-
-	* e-shell-importer.c (start_import): Get a physical_uri arg
-	instead of a folderpath.
-	(folder_selected): Updated accordingly.
-
-2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-importer.c (get_name_from_component_info): Look for the
-	"evolution:menu_name" property instead of "evolution:menu-name".
-	[#39692]
-
-2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-folder-selector-button.c (set_folder): If you can't
-	get a pixbuf icon for the folder's type, do not crash.  [#39599]
-
-	* e-shell.c (impl_Shell__get_displayName): Removed.  [#38974]
-	(e_shell_class_init): Do not install anymore.
-
-	* Evolution-Shell.idl: Remove displayName attribute.
-
-2003-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importer/evolution-importer.c
-	(impl_GNOME_Evolution_Importer_loadFile): Get a physical_uri arg
-	instead of a folderpath arg.
-
-	* importer/evolution-importer-client.c
-	(evolution_importer_client_load_file): Get a physical_uri arg.
-
-	* e-shell-importer.c (start_import): Get a physical_uri arg
-	instead of a folderpath.
-	(folder_selected): Updated accordingly.
-
-2003-03-14  Dan Winship  <danw@ximian.com>
-
-	* e-storage.c (e_storage_get_has_subfolders): Add
-	(e_storage_declare_has_subfolders): Rename from
-	e_storage_has_subfolders to make it clearer that this is a setter,
-	not a getter. (Can't call it e_storage_set_has_subfolders because
-	that sounds like it belongs in e-storage-set.)
-
-	* e-corba-storage.c (impl_StorageListener_notifyHasSubfolders):
-	update for e_storage_declare_has_subfolders name change
-	(get_folder): Override the default EStorage implementation: if
-	asked for a folder under a not-yet-expanded folder, attempt to
-	force the parent(s) to expand so that the child is available.
-	Fixes part of #30415
-
-2003-03-14  Dan Winship  <danw@ximian.com>
-
-	* Evolution-Storage.idl (asyncOpenFolder): add a Bonobo::Listener
-	to this like the other async interfaces, rather than having a
-	hacky way to signal failure.
-
-	* evolution-storage.c (impl_Storage_asyncOpenFolder): Update to
-	take a listener and emit it as part of the signal
-	(evolution_storage_class_init): update OPEN_FOLDER signal
-	prototype.
-
-	* e-shell-marshal.list (NONE:POINTER,STRING): add, for changed
-	EvolutionStorage open_folder signal
-
-	* e-storage.c (e_storage_async_open_folder): add a callback arg
-	(impl_async_open_folder): call the callback with NOTIMPLEMENTED.
-	(class_init): remove the CLOSE_FOLDER signal
-	(e_storage_has_subfolders): Don't emit CLOSE_FOLDER since it
-	doesn't exist any more, and this function is used for that side
-	effect any more anyway.
-
-	* e-corba-storage.c (async_open_folder): add the callback arg and
-	create a proper closure.
-	(async_open_folder_idle): Call the callback in case of error.
-	Create a listener and pass that to the CORBA call.
-	(async_open_cb): Listener callback.
-
-	* e-storage-set.c (storage_set_view_folder_opened): Pass a
-	callback to e_storage_async_open_folder.
-	(async_open_cb): emit CLOSE_FOLDER if the open failed
-	(storage_close_folder_cb): Remove this since the signal no longer
-	exists.
-	
-2003-03-11  Dan Winship  <danw@ximian.com>
-
-	* e-shell-startup-wizard.c (start_wizard): If the wizard factory
-	returns NULL, we'll get a NIL wizard but no exception. Deal with
-	that case. (ie, try the next wizard).
-	(finish_func): Simplify for e-timezone-dialog changes.
-	(prepare_timezone_page): If there is already a timezone set in
-	gconf, set the map to point to it. (For connector autoconfig.)
-
-2003-03-07  Not Zed  <NotZed@Ximian.com>
-
-	** reverted the following patch from ettore, this is a gnome 2.2
-	api change, and shouldn't be used yet.
-	
-	* e-shell.c (impl_finalize): Use
-	bonobo_activation_unregister_active_server() instead of
-	bonobo_activation_active_server_unregister().
-	(e_shell_construct): Use
-	bonobo_activation_register_active_server() instead of
-	bonobo_activation_active_server_register().
-
-2003-03-04  Not Zed  <NotZed@Ximian.com>
-
-	* main.c (show_development_warning): Separated the current stable
-	version number from the warning prompt, and fixed a minor
-	grammatical error.  For bug #38775.
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (impl_Shell_selectUserFolder): At least for now,
-	disable the nasty XWMHints trick to fool WMs; it is not needed now
-	that everything is in-proc.
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-utils.c (e_shell_folder_name_is_valid): Do not allow
-	names with a "#" in them either.
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (update_other_users_folder_items_sensitivity):
-	New function to toggle the "open other user's folder" menu item
-	sensitivity on or off depending on whether there are any storages
-	that actually support that.
-	(storage_set_removed_storage_callback): New callback for the
-	EStorageSet's "removed_storage" signal; it updates the sensitivity
-	if necessary.
-	(storage_set_new_storage_callback): Likewise, new callback for the
-	EStorageSet's "new_storage" signal.
-	(e_shell_view_construct): Connect these two signal callbacks here.
-	Also, call update_other_users_folder_items_sensitivity() to set up
-	the initial sensitivity of the menu item.
-	(update_for_current_uri): Add a missing EStorageSetView cast here.
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#34371]
-
-	* e-shell-shared-folder-picker-dialog.c
-	(folder_name_entry_changed_callback): New callback to set the
-	sensitivity of the OK button according to whether the folder name
-	entry is empty or not.
-	(show_dialog): Connect here.  Pop up an error message if no user
-	is selected.
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (impl_finalize): Use
-	bonobo_activation_unregister_active_server() instead of
-	bonobo_activatino_active_server_unregister().
-	(e_shell_construct): Use
-	bonobo_activation_register_active_server() instead of
-	bonobo_activation_active_server_register().
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-importer.c (IN): Use G_GNUC_FUNCTION instead of
-	__FUNCTION__.
-	(OUT): Likewise.
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	Patch from Not Zed <NotZed@Ximian.com>:
-
-	* main.c (show_development_warning): Separated the current stable
-	version number from the warning prompt, and fixed a minor
-	grammatical error.  For bug #38775.
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-config-upgrade.c (import_bonobo_config): Protect from val
-	being NULL when printf()ing -- should fix #39096 (Solaris-specific
-	crash).
-
-2003-03-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c: Added icon for "/popups/NewPopup/Folder".
-
-2003-03-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importer/Makefile.am (BUILT_SOURCES): $(IDL_GENERATED), not
-	$(IDL_GENERATED_H).
-	(CLEANFILES): Make the same as $(BUILT_SOURCES).
-	(GNOME_Evolution_Importer-impl.o): Removed useless rule.
-
-2003-03-04  Mike Kestner  <mkestner@ximian.com>
-
-	* e-shell-view.c (update_for_current_uri): only set current
-	folder when the folder_path is different from the current folder.
-
-2003-03-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-folder-dnd-bridge.c (find_matching_target_for_drag_context):
-	Handle p->data as a GdkAtom instead of a GdkAtom *.
-	(handle_data_received_non_path): Set the target member of the
-	corba_data struct to be the name of the atom.
-
-	* e-storage-set-view.c (impl_tree_drag_data_get): Pass the name of
-	the atom instead of the atom itself.
-
-	* Evolution-ShellComponentDnd.idl: Changed the type of Data.target
-	to string.
-
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* glade/e-shell-shared-folder-picker-dialog.glade: Swap Cancel/OK
-	buttons as per the HIG.  Also added proper response_ids.
-
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-folder-selector-button.c (impl_finalize): Protect
-	against priv->possible_types being NULL.
-
-2003-02-27  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am (evolution_SOURCES): Add e-config-upgrade.h
-	
-2003-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* e-folder-list.c (e_folder_list_parse_xml): make this more robust
-	- only assume it's a folderlistitem node if the name of the node
-	is "folder".
-
-2003-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-config-upgrade.c: Change the type of load_http_images to INT
-	rather than BOOL. Fixes bug #38767.
-
-2003-02-26  Dan Winship  <danw@ximian.com>
-
-	* e-shell-startup-wizard.c (start_wizard): New routine to attempt
-	to start each available startup wizard in priority order, and
-	return once it has successfully started one. (Allows Connector,
-	etc, to override the mailer startup wizard.)
-	(make_corba_dialog_pages): Use it.
-
-2003-02-26  Not Zed  <NotZed@Ximian.com>
-
-	* apps_evolution_shell.schemas: Added a key for
-	/apps/evolution/version - seems the best place to put it.  This
-	should not return any value if unset, so i'm not sure if this is
-	the right mechanism ...
-
-	* e-config-upgrade.c: Upgrade settings from earlier versions of
-	evolution.
-
-	* main.c (upgrade_from_1_0_if_needed): Removed.
-	(main): Call e_config_upgrade before going into gmainloop.
-	(main): Turn off the --force-upgrade option, since it doesn't work
-	yet ...
-
-2003-02-25  Dan Winship  <danw@ximian.com>
-
-	* Evolution-Wizard.idl: Change this to let the Wizard provide an
-	array of title/icon/control triplets, instead of just controls, so
-	the shell doesn't need to know the name of each page a priori.
-
-	* glade/evolution-startup-wizard.glade: Remove the mailer-specific
-	pages, which are now inserted at run time based on info from the
-	mailer.
-
-	* evolution-wizard.c: Update for new idl.
-	(evolution_wizard_new): Now takes no arguments.
-	(evolution_wizard_add_page): New function to add page info to the
-	wizard.
-
-	* e-shell-startup-wizard.c: Various renamings to make this
-	slightly less mailer-centric, though it still explicitly launches
-	the mailer startup wizard.
-	(make_corba_page): Replaces make_identity_page, make_receive_page,
-	etc. Uses the new Wizard idl to generically create a page and
-	insert it into the druid.
-	(e_shell_startup_wizard_create): Update
-
-2003-02-25  Dan Winship  <danw@ximian.com>
-
-	* e-shell-startup-wizard.c (connect_page, make_importer_page): Use
-	g_signal_connect_after to connect to the "prepare" signal to work
-	around a GnomeDruidPageStandard bug (b.g.o 81869)
-	(e_shell_startup_wizard_create): Remove the "return TRUE" that was
-	added here a while back to disable the startup wizard.
-
-	* glade/evolution-startup-wizard.glade: Change "Next" and "Finish"
-	in the text to "Forward" and "Apply" to match the gnome 2 druid
-	buttons.
-
-2003-02-24  Rodney Dawes  <dobey@ximian.com>
-
-	* e-shell-view.c: Doh, forgot to remove the e-gray-bar.h include
-	
-2003-02-24  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am: We don't need e-gray-bar.[ch] anymore
-	* e-gray-bar.[ch]: Remove these unused files now
-	* e-shell-folder-title-bar.c: We are themeable now!!!!
-	Use GtkArrows now instead of pixmaps
-	Get rid of the hardcoded colors
-	Add an expose_event to paint a flat box for the background
-	* e-shell-view.c: Don't need e-gray-bar anymore
-	
-2003-02-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c (impl_populateFolderContextMenu):
-	Don't release_unref the corba_uih since
-	bonobo_ui_component_set_container() takes ownership of the object
-	without reffing it.
-
-2003-02-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* glade/e-active-connection-dialog.glade: Update dialog to use
-	stock response IDs.
-
-2003-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* main.c (upgrade_from_1_0_if_needed): fix the conf keys, currently unused.
-
-	* e-shell.c (save_settings_for_component): lower-case the config prefix.
-
-2003-02-20  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (evolution_LDADD):
-	s/libemiscwidgets.a/libemiscwidgets.la/ and likewise for
-	libetimezonedialog
-
-2003-02-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts.c (shortcut_item_new): Get the name from the name,
-	not the type.  Fixes #37952, pointed out by Lonnie Borntreger.
-
-2003-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* e-shortcuts.c (load_shortcuts): plug memory leak - free path.
-
-2003-02-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Ported SIGSEGV signal redirection hack from mail/.]
-
-	* main.c (segv_redirect): New, SIGSEGV signal handler.
-	(setup_segv_redirect): New function to set it up.
-	(main): Call setup_segv_redirect().
-
-2003-02-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-setup.c (DEFAULT_USER_PATH): Look into evolution/$BASE_VERSION
-	instead of evolution-$BASE_VERSION.
-
-2003-02-11  Joe Shaw  <joe@ximian.com>
-
-	* main.c (show_development_warning): Suggest people use 1.2.x instead
-	of 1.0.x.
-
-2003-02-09  Larry Ewing  <lewing@ximian.com>
-
-	* e-local-storage.c (remove_folder_directory): fix length calculation.
-	(create_folder_directory): remove alloca usage, clears up crash.
-
-2003-02-07  Larry Ewing  <lewing@ximian.com>
-
-	* e-shell-folder-creation-dialog.c
-	(folder_name_entry_activate_cb): add an activate handler that
-	returns a response OK if the OK response would be active.
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* evolution-test-component.c (main): s/PACKAGE/GETTEXT_PACKAGE/ in
-	gettext init.
-
-2003-02-06  Not Zed  <NotZed@Ximian.com>
-
-	* e-shortcuts-view.c (class_init): use POINTER_STRING_BOOL for
-	activate_shortcut.
-
-	* e-shell-marshal.list: Added NONE,STRING,BOOL, and
-	POINTER,STRING,BOOL, removed POINTER,STRING,INT
-
-	* evolution-shell-view.c (evolution_shell_view_class_init): Use
-	STRING_BOOL for the set_message signal to match rest of command.
-
-	* e-shell-marshal.list: Added NONE,STRING,STRING,STRING
-
-	* evolution-shell-component.c
-	(evolution_shell_component_class_init): Change the
-	user_create_new_item marshaller to STRING_STRING_STRING to match
-	the rest of the call.  The 'new' button should work now.
-
-	* e-setup.c (copy_default_stuff): We want to copy whats in the
-	default user dir, not the default user dir.
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): Define EVOLUTION_IMAGES using
-	$(imagesdir). Define EVOLUTION_GLADEDIR using $(gladedir)
-	(eshellincludedir): Define in terms of $(privincludedir)
-	(evolution_LDFLAGS): Remove this. gmodule-2's LDFLAGS include the
-	equivalent of -export-dynamic for us.
-	(serverdir, etspecdir): Remove. Defined in configure.in now.
-
-	* e-folder.c: #include <string.h>
-	* e-corba-config-page.c: Likewise
-	* e-shell-config.c: Likewise
-	* e-shell-folder-creation-dialog.c: Likewise
-	* e-shell-folder-title-bar.c: Likewise
-	* e-shell-startup-wizard.c: Likewise
-	* evolution-activity-client.c: Likewise.
-	* evolution-shell-component-client.c: Likewise
-	* evolution-shell-component-utils.c: Likewise
-	* evolution-storage.c: Likewise
-	* evolution-test-component.c: Likewise
-
-	* e-shortcuts-view.c (destroy_group_cb): Remove unused variable
-
-	* importer/Makefile.am (INCLUDES): Remove -I$(includedir). Define
-	EVOLUTION_GLADEDIR using $(gladedir).
-	(libevolution_importerincludedir): Define in terms of
-	$(privincludedir)
-	(gladedir): Removed. Defined in configure.in now.
-
-	* glade/Makefile.am (gladedir): Likewise
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* importer/evolution-intelligent-importer.c:
-	s/BonoboXObject/BonoboObject/
-
-	* e-folder-list.c (e_folder_list_class_init):
-	s/glade_gnome_init/glade_init/
-
-	* main.c (main): Likewise
-
-2003-02-05  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-startup-wizard.c (start_importers): re-enable.
-	(prepare_importer_page): re-enable importer code.
-
-	* e-shell-importer.c (druid_finish_button_change): removed, since
-	its not such a hack to change anymore.  Dunno how to get an icon
-	on it tho, without a stock button.
-	(show_import_wizard): Change the apply button to "Import" here.
-
-2003-01-28  Not Zed  <NotZed@Ximian.com>
-
-	* e-local-storage.c (create_folder_directory): We can't use
-	pointer arithmetic with g_path_get_*, so adjust code accordingly.
-
-2003-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-startup-wizard.c (e_shell_startup_wizard_create): Hook
-	onto finish instead of next on the last page.
-
-2003-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am ($(SELECT_NAMES_IDL_GENERATED_C)): No need for the
-	@true command.
-	($(IDL_GENERATED_C)): Likewise.
-	(e-shell-marshal.h, e-shell-marshal.c): Use different names for
-	the .tmp files so these can be generated in parallel.
-
-	* importer/Makefile.am (GNOME_Evolution_Importer-impl.o): Remove
-	unused rule.
-	($(IDL_GENERATED_C)): Remove useless @true command.
-	(BUILT_SOURCES): Put the .h generated files in here as well.
-
-2003-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (Evolution-impl.o): Removed unused rule.
-
-2003-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importer/Makefile.am: Make this work with parallel make as well.
-
-2003-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Use a little trick for the IDL compilation so that
-	it works with parallel makes.
-
-2003-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_construct): Use
-	bonobo_activation_server_register() instead of
-	bonobo_activation_register_active_server() again, since we want to
-	be able to build against bonobo-activation 2.0 and the latter is
-	2.2-specific.
-	(impl_finalize): Likewise, use
-	bonobo_activation_active_server_unregister() instead of
-	bonobo_activation_unregister_active_server().
-
-2003-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-importer.c (choose_importer_from_list): Set
-	GTK_RESPONSE_OK as the default response.
-
-	* Makefile.am (INCLUDES): Add -DGNOME_DISABLE_DEPRECATED,
-	-DBONOBO_DISABLE_DEPRECATED.
-
-	* e-shortcuts.c (update_shortcut_and_emit_signal): Use
-	g_signal_emit() instead of gtk_signal_emit().
-
-	* e-shortcuts-view.c (destroy_group_cb): Port from GnomeMessageBox
-	to GtkMessageDialog.
-
-	* e-shell.c (get_icon_path_for_component_info): Use
-	gnome_program_locate_file() instead of gnome_pixmap_file().
-	(impl_finalize): Use bonobo_activation_unregister_active_server()
-	instead of bonobo_activation_active_server_register().
-	(e_shell_construct): Use
-	bonobo_activation_register_active_server() instead of
-	bonobo_activation_active_server_register().
-
-	* e-shell-view-menu.c (command_submit_bug): Use e_notice().
-	(launch_pilot_settings): Use g_find_program_in_path() instead of
-	gnome_is_program_in_path().
-	(command_submit_bug): Likewise.
-
-	* e-shell-utils.c (get_icon_path): Use g_file_test() instead of
-	g_file_exists().
-
-	* e-shell-startup-wizard.c (prepare_importer_page): Port from
-	GnomeMessageBox to GtkMessageDialog.
-
-	* e-shell-shared-folder-picker-dialog.c (show_dialog): Update for
-	GtkDialog.
-	(progress_dialog_close_callback): Removed.
-	(progress_dialog_clicked_callback): Removed.
-	(progress_dialog_response_callback): New.
-	(create_progress_dialog): Ported to GnomeDialog.
-
-	* e-shell-offline-sync.c: Add member parent_window to struct
-	SyncData.
-	(e_shell_offline_sync_all_folders): Set it from the parent_window
-	arg.
-	(progress_dialog_close_callback): Removed.
-	(progress_dialog_clicked_callback): Removed.
-	(progress_dialog_response_callback): New.
-	(setup_dialog): Create a GtkDialog instead of a GnomeDialog.
-	(sync_folder): Updated for GtkDialog.
-
-	* e-shell-offline-handler.c (dialog_handle_ok): Make it get a
-	GtkDialog instead of a GnomeDialog.
-	(dialog_handle_cancel): Likewise.
-	(dialog_clicked_cb): Removed.
-	(dialog_response_cb): New.
-	(pop_up_confirmation_dialog): Connect the new dialog_response_cb()
-	instead of the old dialog_clicked_cb().  Removed
-	gnome_dialog_set_default() call.
-
-	* e-shell-folder-creation-dialog.c (dialog_response_cb): Make
-	first arg a GtkDialog, not a GnomeDialog.
-
-	* e-shell-folder-commands.c (e_shell_command_delete_folder):
-	Expect delete_dialog() to return a GtkResponseType.
-	(delete_dialog): Ported to GtkMessageDialog; Return a
-	GtkResponseType.
-
-	* e-shell-config-default-folders.c
-	(e_shell_config_default_folders_create_widget): Removed unused
-	variable.
-
-	* e-setup.c (check_evolution_directory): Remove Evolution
-	directory installation message.
-	(e_setup): Remove check for the Executive-Summary directory.
-
-	* e-local-storage.c (create_folder_directory): Use g_file_test()
-	instead of g_file_exists().
-
-	* evolution-shell-component-utils.c (e_pixmaps_update): Use
-	g_build_filename() of g_concat_dir_and_file().
-	* e-folder-dnd-bridge.c (handle_data_received_path): Likewise.
-	* e-local-folder.c (construct_loading_metadata): Likewise.
-	(save_metadata): Likewise.
-	* e-local-storage.c (remove_folder_directory): Likewise.
-	(append_xfer_item_list): Likewise.
-	* e-setup.c (check_dir_recur): Likewise.
-	(e_shell_rm_dir): Likewise.
-	(setup_bonobo_conf_private_directory): Likewise.
-	* e-shell-folder-commands.c
-	(folder_selection_dialog_folder_selected_callback): Likewise.
-	(e_shell_command_rename_folder): Likewise.
-	* e-shell-folder-creation-dialog.c (dialog_response_cb): Likewise.
-	* e-shell-settings-dialog.c (load_pages): Likewise.
-	* e-shell-utils.c (get_icon_path): Likewise.
-	* e-shell.c (setup_local_storage): Likewise.
-	(get_icon_path_for_component_info): Likewise.
-	(e_shell_construct): Likewise.
-	* main.c (main): Likewise.
-
-2003-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-about-box.c (timeout_callback): Pass a the context's
-	language to pango_context_get_metrics() instead of NULL, so the
-	heights are computed correctly.
-
-2003-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c (owner_ping_callback): #if 0'ed out
-	for now, since it seems to cause trouble for local components.
-	(setup_owner_pinging): Likewise.
-
-	* e-shell-user-creatable-items-handler.c
-	(get_default_action_for_view): Return default_menu_item [instead
-	of NULL] if there is no view displayed.  [#32736]
-
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-title-bar.c (get_max_clipped_label_width): Use
-	clipped_label->layout instead of creating a new PangoLayout; this
-	way we respect the actual font being used.
-
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (create_label_for_empty_page): Update for new
-	args to e_clipped_label_new().
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
-	Make the title label bold and larger using the new args to
-	e_clipped_label_new().
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Port fix for #34129 from evolution-1-2-branch, unread count in
-	shortcut bar doesn't update properly.]
-
-	* e-shortcuts.c (update_shortcuts_by_path): Use
-	e_shell_parse_uri() so we handle default shortcuts properly as
-	well.
-	(update_shortcut_and_emit_signal): Use shortcut_item_update()
-	once, and use the return value from it.  [Thanks to Leon Zhang
-	<leon.zhang@sun.com> for pointing out the brokenness of this
-	code.]
-
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-about-box.c: Update copyright year.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Install the shell executable as
-	evolution-$(BASE_VERSION) using an install-exec-local hack.  Also
-	put libeshell in $(privlibdir) instead of $(libdir).
-	(eshellincludedir): Version using $(BASE_VERSION).
-	(INCLUDES): Update for the new locations of things.
-	(etspecdir): Likewise.
-
-	* e-shell-view.c (e_shell_view_construct): Get evolution.xml from
-	EVOLUTION_UIDIR.
-
-	* importer/Makefile.am: Install libevolution-importer in
-	$(privlibdir) instead of $(libdir).
-	(INCLUDES): Updated for the new versioned paths.  Define
-	EVOLUTION_UIDIR.
-	(libevolution_importerincludedir): Version using $(BASE_VERSION).
-	(gladedir): Likewise.
-
-	* glade/Makefile.am (gladedir): Version using $(BASE_VERSION).
-
-	* e-setup.c (DEFAULT_USER_PATH): New #define.
-	(check_evolution_directory): Use it.
-	(copy_default_stuff): Likewise.  Also, remove old shortcuts.xml
-	removal cruft.
-
-2003-01-17  Chris Toshok  <toshok@ximian.com>
-
-	* e-shell-settings-dialog.c (set_dialog_size): pass
-	pango_context_get_language (context) to
-	pango_context_get_metrics.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_construct): Make dialog
-	New/Cancel/OK to match HIG.
-
-	* glade/e-shell-folder-creation-dialog.glade: Swap Cancel/OK
-	buttons to match HIG.
-
-	* e-shell-importer.c (choose_importer_from_list): Make dialog
-	Cancel/OK to match HIG.
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_construct): Make dialog Cancel/OK
-	to match HIG.
-
-	* e-shell-view.c: Do not #include "e-bonobo-widget.h".
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): Add $(schema_DATA) here.
-
-2003-01-14  Rodney Dawes  <dobey@ximian.com>
-
-	* e-shell-view.c: Use GtkPaned instead of EPaned
-	
-2003-01-13  Dan Winship  <danw@ximian.com>
-
-	* s/BonoboXObject/BonoboObject/ (for BONOBO_DISABLE_DEPRECATED)
-
-2003-01-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c (impl_setOwner): Don't duplicate the
-	shell object here before passing to evolution_shell_client_new().
-
-	* evolution-shell-client.c (evolution_shell_client_construct):
-	Dupliate the @corba_shell before storing into the
-	EvolutionShellClientPrivate struct.
-
-	* e-shell-config-default-folders.c
-	(e_shell_config_default_folders_create_widget): Do not duplicate
-	the shell's CORBA objref.
-
-	* e-shell-config-autocompletion.c
-	(e_shell_config_autocompletion_create_widget): Do not duplicate
-	the shell's CORBA objref.
-
-2003-01-10  Dan Winship  <danw@ximian.com>
-
-	* e-storage-set-view.c (popup_folder_menu): Make this work again.
-
-2003-01-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_save_defaults): Save the expansion
-	state of the EStorageSetView.
-	(setup_defaults): Load the expansion state.
-
-2003-01-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_request_close_view): Make the view save its
-	settings as the default ones if it's the last one.
-
-	* e-shell-view-menu.c (command_quit): Make this view save its
-	settings as the defaults before quitting.
-
-2003-01-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (main): Generate the URI list from the popt context
-	fetched from the GnomeProgram object.
-
-	* e-shell-view.c (setup_defaults): Removed @setup_default_uri arg.
-	Don't load any URI here.
-	(e_shell_view_construct): Open the URI here instead.
-
-2003-01-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (parse_default_uri): Remove bogus is_default check.
-
-2003-01-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-setup.c (set_default_folder_physical_uri_from_path): New
-	function.
-	(e_setup_check_config): Call it for each of the *_path keys.  Do
-	not set the default for *_path keys as those come from the GConf
-	schema anyways.
-
-2003-01-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* apps_evolution_shell.schemas: Set defaults for
-	/apps/evolution/shell/default_folders/... .
-
-	* e-shortcuts-view.c (pop_up_right_click_menu_for_group): Destroy
-	the popup_menu with gtk_widget_destroy() instead of
-	gtk_widget_unref().
-
-2003-01-10  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-config-control.c (impl_apply): remove cast to
-	GTK_OBJECT, it isn't, nor needed.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-shell-settings-dialog.c (set_dialog_size): use
-	pango_layout_get_pixel_size here instead of
-	pango_layout_get_width, which returns 0 (unless it's been set by
-	the user before, I believe).
-
-2003-01-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-client.c (impl_dispose): Properly reset
-	activity_interface to NULL.
-	(evolution_shell_client_construct): Ref the shell object here.
-
-	* e-shell.c (view_weak_notify): Ref the shell since it's being
-	passed to notify_no_views_left_idle_cb as the data.
-	(notify_no_views_left_idle_cb): Only unref the shell here.
-
-2003-01-08  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-settings-dialog.c (set_dialog_size): dont unref the
-	pango context, get_context() doesn't create a ref.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Images are now in $(datadir)/evolution/images
-	instead of $(datadir)/images/evolution.
-
-	* e-folder-list.c (e_folder_list_class_init): Remove
-	"EFolderList::" prefix from the properties.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (evolution_LDFLAGS): -export-dynamic so custom
-	widgets in libglade work.
-
-2003-01-07  Dan Winship  <danw@ximian.com>
-
-	* main.c (main): setup gettext
-
-2003-01-06  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-folder-selector-button.c (set_folder): dont
-	double-free storage_lname.
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: Remove idldir definition. (It's defined in
-	configure.in now).
-
-	* importer/Makefile.am: Likewise
-
-2002-12-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	[With this commit, the shell compiles without deprecated GLib/GTK+
-	functions, except for a couple of places were we use GtkCList.]
-
-	* Makefile.am (INCLUDES): Add `-DG_DISABLE_DEPRECATED
-	-DGTK_DISABLE_DEPRECATED'.
-
-	* evolution-test-component.c (create_new_folder_selector): No
-	gtk_window_set_policy().
-
-	* main.c (quit_box_new): gtk_window_set_resizable() instead of
-	gtk_window_set_policy().
-	(view_map_callback): g_signal_handlers_disconnect_by_func()
-	instead of gtk_signal_disconnect_by_func().
-	(main): No need to push the GdkRGB visual/cmap anymore.
-	(new_view_created_callback): Likewise.
-
-	* e-task-widget.c: Renamed member pixmap of ETaskWidgetPrivate to
-	`image'.
-	(init): Updated accordingly.
-	(e_task_widget_construct): Use GtkImage, not GtkPixmap.
-
-	* e-storage.c (class_init): Converted from gtk_signal_new() to
-	g_signal_new().
-
-	* e-storage-set.c (class_init): Converted from gtk_signal_new() to
-	g_signal_new().
-
-	* e-storage-set-view.c
-	(setup_folder_properties_items_if_corba_storage_clicked):
-	g_string_append_printf() instead of g_string_sprintfa().
-	(class_init): Converted from gtk_signal_new() to g_signal_new().
-	(setup_folder_changed_callbacks): Use
-	e_signal_connect_while_alive() and
-	e_signal_connect_full_while_alive().
-
-	* e-splash.c (e_splash_construct): gtk_window_set_resizable()
-	instead of gtk_window_set_policy().
-
-	* e-shortcuts.c: Do not #include e-unicode.h.
-	(shortcut_item_update): Use g_path_get_basename() instead of
-	g_basename().
-	(e_shortcuts_add_default_shortcuts): No need to de-utfize strings.
-	(e_shortcuts_add_default_group): Same here.
-
-	* e-shortcuts-view.c: Do not #include <e-unicode.h>.
-	(class_init): Converted from gtk_signal_new() to g_signal_new().
-	(destroy_group_cb): No need to convert the text from UTF8.
-
-	* e-shell.c (impl_dispose): g_signal_handlers_disconnect_by_func()
-	instead of gtk_signal_disconnect_by_func().
-	(class_init): Use g_signal_new() instead of gtk_signal_new().
-
-	* e-shell-view.c: Do not #include e-unicode.h.  Renamed member
-	offline_toggle_pixmap to offline_toggle_image in
-	EShellViewPrivate.
-	(update_folder_title_bar): No need to de-UTF8-ize the title.
-	(cleanup_delayed_selection):
-	g_signal_handlers_disconnect_by_func() instead of
-	gtk_signal_disconnect_by_func().
-	(ui_engine_add_hint_callback): gtk_label_set_text(), not
-	gtk_label_set().
-	(class_init): Use g_signal_new() instead of gtk_signal_new().
-	(update_for_current_uri): No need to convert the title from UTF8.
-	(setup_offline_toggle): Changed to set up a GtkImage, not a
-	GtkPixmap.
-	(update_offline_toggle_status): Accordingly (gtk_image* instead of
-	gtk_pixmap*).
-	(set_current_notebook_page): gtk_notebook_set_current_page(), not
-	gtk_notebook_set_page().
-	(get_storage_set_path_from_uri): g_ascii_strncasecmp() instead of
-	g_strncasecmp().
-	(folder_bar_popup_map_callback): Use
-	e_signal_connect_while_alive() instead of
-	gtk_signal_connect_while_alive().
-	(e_shell_view_construct): Likewise.
-	(display_uri): g_signal_connect_after() instead of
-	gtk_signal_connect_full().
-	(update_for_current_uri):
-	g_signal_handlers_{block,unblock}_by_func() instead of
-	gtk_signal_handler_{block,unblock}_by_func().
-
-	* e-shell-view-menu.c (command_about_box):
-	gtk_window_set_resizable() instead of gtk_window_set_policy().
-
-	* e-shell-utils.c (get_mini_name): g_path_get_basename() instead
-	of g_basename().
-
-	* e-shell-user-creatable-items-handler.c
-	(append_xml_for_menu_item): g_string_append_printf() instead of
-	g_string_sprintfa().
-	(create_menu_xml): Likewise.
-
-	* e-shell-shared-folder-picker-dialog.c: Do not #include
-	e-unicode.h.
-	(progress_bar_timeout_callback): Expect a GtkProgressBar data and
-	just use gtk_progress_bar_pulse().
-	(create_progress_dialog): gtk_window_set_resizable() instead of
-	gtk_window_set_policy().  No gtk_progress_set_activity_mode().
-	(setup_server_option_menu): Just use
-	gtk_menu_item_new_with_label() instead of
-	e_utf8_gtk_menu_item_new_with_label().
-
-	* e-shell-settings-dialog.c (set_dialog_size): Ported to Pango.
-
-	* e-shell-offline-sync.c
-	(impl_SyncFolderProgressListener_updateProgress):
-	gtk_progress_set_fraction() instead of
-	gtk_progress_bar_set_percentage().
-	(sync_folder): Likewise.
-	(setup_dialog): gtk_window_set_resizable() instead of
-	gtk_window_set_policy().
-	(sync_folder): No gtk_progress_set_activity_mode().
-
-	* e-shell-offline-handler.c: #undef {G,GTK}_DISABLE_DEPRECATED
-	here for now (need to port from GtkCList).
-	(class_init): Use g_signal_new()
-
-	* e-shell-importer.c: #undef {G,GTK}_DISABLE_DEPRECATED here for
-	now (need to port from GtkCList).
-
-	* e-shell-folder-title-bar.c (create_image_widget_from_xpm):
-	Renamed from create_pixmap_widget_from_xpm(); handle GtkImage
-	instead of GtkPixmap.
-	(new_empty_image_widget): Renamed from new_empty_pixmap_widget();
-	return a GtkImage instead of a GtkPixmap.
-	(add_navigation_buttons): Updated accordingly; so use GtkImages
-	instead of GtkPixmaps.
-	(e_shell_folder_title_bar_construct): Likewise.
-	(e_shell_folder_title_bar_set_icon): Use gtk_image_* instead of
-	gtk_pixmap_* on the image widgets.
-	(class_init): Converted to use g_signal_new() instead of
-	gtk_signal_new().
-	(e_shell_folder_title_bar_new): No need for pushing the GdkRGB
-	visual/cmap anymore.
-
-	* e-shell-folder-selection-dialog.c (check_folder_type_valid):
-	Just use strcmp instead of strcasecmp().
-	(class_init): g_signal_new() instead of gtk_signal_new().
-	(e_shell_folder_selection_dialog_construct): Removed call to
-	gtk_window_set_policy().
-
-	* e-shell-folder-creation-dialog.c
-	(type_with_display_name_compare_func): Changed to use
-	g_utf8_casefold().
-
-	* e-shell-folder-commands.c: Do not #include e-unicode.h.
-	(e_shell_command_rename_folder): g_path_get_dirname() instead of
-	g_dirname().
-	(folder_selection_dialog_folder_selected_callback):
-	g_path_get_basename() instead of g_basename().
-	(rename_cb): Likewise.
-	(delete_dialog): Do not convert from UTF8 for display purposes.
-	(e_shell_command_rename_folder): Likewise.
-
-	* e-shell-about-box.c (timeout_callback): Ported to Pango and use
-	gdk_window_invalidate_rect() instead of gtk_widget_draw().
-
-	* e-setup.c (check_evolution_directory): Use
-	gtk_window_set_resizable() instead of gtk_window_set_policy().
-
-	* e-local-storage.c: Do not include e-unicode.h.
-	(create_folder): Use g_path_get_basename() instead of
-	g_basename().
-	(create_folder_directory): Likewise.
-	(remove_folder_directory): Likewise.
-	(append_xfer_item_list): Likewise.
-
-	* e-local-folder.c (construct_loading_metadata): Use
-	g_path_get_basename() instead of g_basename().
-
-	* e-folder-dnd-bridge.c (handle_evolution_path_drag_motion): Use
-	g_path_get_basename() instead of g_basename().
-
-	* e-corba-storage-registry.c: G_STRUCT_OFFSET instead of
-	GTK_STRUCT_OFFSET.
-
-	* e-corba-shortcuts.c: G_STRUCT_OFFSET instead of
-	GTK_STRUCT_OFFSET.
-
-	* e-component-registry.c
-	(sleep_with_g_main_loop_timeout_callback): g_main_loop_* instead
-	of g_main_*.
-	(sleep_with_g_main_loop): Likewise.
-
-	* e-activity-handler.c: G_STRUCT_OFFSET instead of
-	GTK_STRUCT_OFFSET.
-
-	* evolution-wizard.c (evolution_wizard_class_init): g_signal_new()
-	instead of gtk_signal_new().
-
-	* evolution-storage-listener.c (class_init): g_signal_new()
-	instead of gtk_signal_new().
-
-	* evolution-shell-view.c (class_init): g_signal_new() instead of
-	gtk_signal_new().
-
-	* evolution-shell-component-dnd.c: G_STRUCT_OFFSET instead of
-	GTK_STRUCT_OFFSET.
-
-	* evolution-shell-component.c: G_STRUCT_OFFSET instead of
-	GTK_STRUCT_OFFSET.
-
-	* evolution-session.c: G_STRUCT_OFFSET instead of
-	GTK_STRUCT_OFFSET.
-
-	* evolution-folder-selector-button.c: Do not include e-unicode.h.
-	(set_folder): No need to convert from UTF8 to locale encoding
-	anymore.  Removed unused variable.
-
-	* evolution-config-control.c (class_init): Use g_signal_new()
-	instead of gtk_signal_new().
-
-	* evolution-activity-client.c (class_init): Use g_signal_new()
-	instead of gtk_signal_new().
-
-	* e-folder-list.c: Do not include e-unicode.h.  Use E_MAKE_TYPE().
-	(e_folder_list_get_type): Removed explicit implementation of this.
-	(e_folder_list_set_arg): Removed.
-	(e_folder_list_get_arg): Removed.
-	(e_folder_list_set_property): New.
-	(e_folder_list_get_property): New.
-	(e_folder_list_destroy): Removed.
-	(e_folder_list_dispose): New.
-	(e_folder_list_class_init): Updated accordingly.
-
-	* e-folder.c (impl_save_info): Use G_OBJECT_TYPE_NAME() instead of
-	gtk_type_name().
-	(impl_load_info): Likewise.
-	(impl_remove): Likewise.
-	(class_init): Use g_signal_new() instead of gtk_signal_new().
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-shell-importer.c: Don't #include "e-util/e-html-utils.h" as
-	we don't use it.
-
-2002-12-13  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #35394 ]
-	
-	* e-shell-shared-folder-picker-dialog.c (setup_name_selector):
-	return the SelectNames corba interface too.
-	(show_dialog): unref the corba interface when closing the dialog.
-
-2002-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* e-shell-config-default-folders.c: use "contacts",
-	"contacts/ldap" as the accepted contacts types, so it'll allow
-	both normal and ldap contact folders.
-
-2002-12-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-component-registry.c (component_free): Only invoke
-	wait_for_corba_object_to_die on components that are out-of-proc.
-
-2002-11-27  Not Zed  <NotZed@Ximian.com>
-
-	* main.c (show_development_warning): changed to use a gtkdialog
-	instead of a gnome one.
-	(warning_dialog_response_callback): clicked->response.
-
-	* e-shell-folder-selection-dialog.c: Include gtk/gtkstock.h
-
-	* e-shell-folder-creation-dialog.c: include gnome-dialog.h
-	(dialog_response_cb): gtk_entry_get_text now returns const.  Dont
-	free result.
-
-	* e-setup.c: include gnome-messagebox.h
-
-	* *.c: (re)run fix.sh over all, for e_notice changes & pick up
-	some deprecated functions.
-
-	* e-shell-shared-folder-picker-dialog.c
-	(shared_folder_discovery_callback): reformat e_notice call for
-	script.
-
-	* e-shell-offline-sync.c
-	(impl_SyncFolderProgressListener_reportFailure): Fix e_notice
-	call, we weren't passing type in.
-
-	* e-shell-folder-commands.c (xfer_result_callback): changed around
-	slightly to save some processing & allow a script to run.
-	(e_shell_command_rename_folder): reformat e_notice call to help script.
-	Include gnome-messagebox.h
-
-2002-11-25  Dan Winship  <danw@ximian.com>
-
-	* e-shell-settings-dialog.c (page_new): e_get_language_list now
-	returns language codes that actually work with oaf, making the
-	_()s here redundant.
-
-	* e-component-info.c (get_i18n_value): Remove code to turn "fr_FR"
-	into "fr", since e_get_language_list will return both now.
-
-2002-11-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* apps_evolution_shell.schemas: Fix <key> -> <applyto> typo.
-
-2002-11-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-offline-sync.c (e_shell_offline_sync_all_folders):
-	Filled in, use GConf.
-	(cleanup): Re-enabled again.
-	(sync_folder): Likewise.
-	(progress_dialog_close_callback): Likewise.
-	(progress_dialog_clicked_callback): Likewise.
-	(setup_dialog): Likewise.
-	(setup_progress_listener): Likewise.
-	(impl_SyncFolderProgressListener_reportFailure): Likewise.
-	(impl_SyncFolderProgressListener_reportSuccess): Likewise.
-	(impl_SyncFolderProgressListener_updateProgress): Likewise.
-	(progress_listener_servant_free): Likewise.
-	(progress_listener_servant_new): Likewise.
-
-2002-11-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-storage-set-view.c
-	(impl_StorageSetView__set_checkedFolders): Updated to pass a
-	GSList to e_storage_set_view_set_checkboxes_list() [instead of a
-	GList].
-	(impl_StorageSetView__get_checkedFolders): Likewise with the
-	return value from e_storage_set_view_get_checkboxes_list().
-
-	* e-shell-config-offline.c (config_control_apply_callback): Filled
-	in, using GConf.
-	(init_storage_set_view_status_from_config): Likewise.
-
-	* e-storage-set-view.c (e_storage_set_view_get_checkboxes_list):
-	Return a GSList instead of a GList.
-	(essv_add_to_list): Update for the GSList.
-	(e_storage_set_view_set_checkboxes_list): Get a GSList instead of
-	a GList.
-
-	* apps_evolution_shell.schemas: Added
-	/schemas/apps/evolution/shell/offline/folder_paths.
-
-2002-11-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (idle_cb): Set displayed_any in the case when we are
-	calling e_shell_create_view().  Also initialize displayed_any to
-	FALSE earlier so we dont' end up opening two views at startup by
-	default.
-
-2002-11-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-selection-dialog.c (impl_dispose): Save the
-	expansion state for the EStorageSetView here.
-	(impl_finalize): Instead of here.
-
-2002-11-20  Chris Toshok  <toshok@ximian.com>
-
-	* e-folder-list.c (e_folder_list_class_init): use e_shell_
-	marshallers, and make sure STRING parameters map to *_STRING*
-	marshallers.
-
-	* evolution-wizard.c (evolution_wizard_class_init): same.
-
-	* evolution-storage.c (class_init): same.
-
-	* evolution-storage-set-view-listener.c (class_init): same.
-
-	* evolution-storage-listener.c (class_init): same.
-
-	* evolution-shell-view.c (class_init): same.
-
-	* evolution-session.c (class_init): same.
-
-	* evolution-folder-selector-button.c (class_init): same.
-
-	* evolution-config-control.c (class_init): same.
-
-	* evolution-activity-client.c (class_init): same.
-
-	* e-storage-set.c (class_init): same.
-
-	* e-shortcuts.c (class_init): same.
-
-	* e-shortcuts-view.c (class_init): same.
-
-	* e-shell.c (class_init): same.
-
-	* e-shell-view.c (class_init): same.
-
-	* e-shell-offline-handler.c (class_init): same.
-
-	* e-shell-folder-title-bar.c (class_init): same.
-
-	* e-shell-folder-selection-dialog.c (class_init): same.
-
-	* e-folder.c (class_init): same.
-
-	* e-shell-marshal.list: add all the STRING marshallers.
-	
-2002-11-20  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-importer.c (prepare_intelligent_page): gnome message box
-	-> gtk message dialog.
-	(prepare_intelligent_page): Fix the signature on this.  This could
-	NEVER have worked.
-
-2002-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (upgrade_from_1_0_if_needed): Disabled for now.
-
-	* e-shell-startup-wizard.c: Removed member config_listener from
-	struct SWData.
-	(e_shell_startup_wizard_create): Updated accordingly, just use
-	GConf, checking the /apps/evolution/mail/account-list key.
-	(finish_func): Use GConf.
-
-	* e-shell-config-default-folders.c: Removed member config_listener
-	in struct EvolutionDefaultFolderConfig.
-	(e_shell_config_default_folders_create_widget): Do not initialize
-	here.  GConfified the paths.
-	(config_control_destroy_notify): No unref of the config_listener
-	anymore.
-	(config_control_apply_cb): Use GConf.
-	(setup_folder_selector): Likewise.
-
-	* e-shell-config-autocompletion.c: Removed member config_listener
-	from EvolutionAutocompletionConfig.
-	(config_control_destroy_notify): Do not unref.
-	(config_control_apply_callback): Use a GConfClient.
-
-	* e-folder-list.c (e_folder_list_init): Add missing cast.
-
-	* main.c (show_development_warning): Use GConf.
-
-	* e-setup.c (e_setup_check_config): Removed arg @listener.
-	GConfified.
-
-	* e-shell-view.c (e_shell_view_save_defaults): New.
-	(e_shell_view_save_settings): Removed.
-	(e_shell_view_load_settings): Removed.
-	(setup_defaults): New helper function.
-	(e_shell_view_construct): New arg @uri.
-	(e_shell_view_new): New arg @uri.
-
-	* e-shell.c: Removed member config_listener in struct
-	EShellPrivate.
-	(impl_dispose): Do not unref.
-	(init): Do not initialize.
-	(get_config_start_offline): New helper function.
-	(e_shell_construct): Use this to get the startup mode in case
-	E_SHELL_STARTUP_LINE_MODE_CONFIG.
-	(save_misc_settings): Changed to use GConfClient instead of
-	EConfigListener.
-	(e_shell_create_view_from_settings): Removed.
-	(e_shell_restore_from_settings): Removed.
-	(e_shell_get_config_listener): Removed.
-	(e_shell_disconnect_db): Removed.
-	(parse_default_uri): Use GConf.
-
-	* main.c (idle_cb): Simplified the logic here.  Always assume that
-	the view will be created with the default folder open by just
-	using e_shell_create_view().
-
-2002-11-19  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-shared-folder-picker-dialog.c (show_dialog): Pass type
-	to bonobo_widget::set_property.
-
-2002-11-18  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-view-menu.c (file_verbs[]): re-enable importer wizard.
-
-	* importer/importer.c (dialog_response_cb): from clicked_cb.
-	(start_import): gtkdialogise.
-
-	* e-shell-importer.c: removed redundant header.
-	(create_html): Removed utf8 from locale stuff.
-	(get_name_from_component_info): oaf->bonobo activation.
-	(get_iid_for_filetype): "
-	(create_plugin_menu): Likewise, and change oafiid to bonoboiid
-	(get_intelligent_importers): "
-	(prepare_intelligent_page): "
-	(show_import_wizard): add null domain to glade_xml_new.
-	(choose_importer_from_list): gtkdialogise.
-	(dialog_response_cb): changed from dialog_clicked_cb.
-	(start_import): gtkdialogise.
-	(show_error): use gtk message box.
-	(error_response_cb): callback to close error box.
-	(show_import_wizard): gnome_druid_page_start/finish ->
-	gnome_druid_page_edge.
-	(prepare_file_page):
-	(filename_changed): set HELP button insensitive.
-	(create_plugin_menu): casts for warnings and fix a typo,
-	set_data->set_data_full.
-	(import_druid_finish): folder_selection_dialog api change(?),
-	allow create.
-	(dialog_weak_notify): renamed from close_dialog().
-	(show_import_wizard): remove gnome_dialog_close_hides -> its a
-	gtkwindow anyway(!).
-
-	* Makefile.am (evolution_LDADD): Added back importer.
-	(evolution_SOURCES): Added back importer.
-
-	* importer/intelligent.c (get_intelligent_importers):
-	bonobo-activationised.
-	(create_gui): gtkdialogise.
-	(intelligent_importer_init): gtkdialogise.
-	(create_gui): remove gnome_util_user_home().
-	(intelligent_importer_init): "
-
-	* importer/evolution-importer.c (finalise): from destroy.
-	(evolution_importer_new): type_new->object_new.
-
-	* importer/evolution-importer-listener.c (finalise): from destroy.
-	(evolution_importer_listener_new): type_new->object_new.
-
-	* importer/evolution-importer-client.c (destroy): removed, as it
-	wasn't used anyway.
-	(evolution_importer_client_new): g_object_new.
-	(finalise): added, tho doesn't do anythign yet, should it unref
-	the client->objref?  This whole class doesn't seem much use.
-
-	* importer/evolution-importer-client.h: removed
-	bonobo-object-client, change to g_object.
-
-	* importer/*.[ch]: ran fix script over everything.
-	
-	* importer/evolution-intelligent-importer.c: gobjectise.
-	(finalise): renamed from destroy.
-	(evolution_intelligent_importer_new): gtk_type_new -> g_object_new
-
-2002-11-18  Chris Toshok  <toshok@ximian.com>
-
-	* importer/import.glade: run libglade-convert.
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* e-folder-list.c (e_folder_list_init): force the scrolled table
-	to be shown, apparently a bug in libglade2.
-
-	* e-shell-config-default-folders.c (setup_folder_selector): same,
-	but with the evolution-folder-selector-button's.
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* e-shell-settings-dialog.c (load_pages): init the corba exception
-	before loading each config page, so previous errors don't make
-	subsequence pages to fail to load.
-
-2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Added rule to generate
-	GNOME_Evolution_Shell.server.in from
-	GNOME_Evolution_Shell.server.in.in, substituting @BINDIR@.
-
-	* GNOME_Evolution_Shell.server.in.in: Renamed from
-	GNOME_Evolution_Shell.server.in.  Prepend @BINDIR@ to the location
-	of the executable.
-
-2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-storage.c (impl_finalize): Fix typo; p -> sp.
-
-2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-activity-handler.c (impl_operationStarted): No need to check
-	for priv being NULL here anymore.
-	(impl_operationProgressing): Likewise.
-	(impl_operationFinished): Likewise.
-	(impl_requestDialog): Likewise.
-
-	* evolution-folder-selector-button.c (clicked): Use
-	g_object_add_weak_pointer() on the parent_window instead of using
-	GTK_OBJECT_DESTROYED().
-
-2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-startup-wizard.c (e_shell_startup_wizard_create): For
-	now, always return TRUE.
-
-2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-client.c (class_init): Pass the right parent
-	type to gtk_type_class().
-
-2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-user-creatable-items-handler.c,
-	* e-shell-user-creatable-items-handler.c: Changed into a GObject
-	subclass instead of a GtkObject subclass.
-
-	* e-component-registry.c,
-	* e-component-registri.h: Changed into a GObject subclass instead
-	of a GtkObject subclass.
-
-	* evolution-shell-view.c (impl_ShellView_set_message): Remove
-	bogus GTK_OBJECT() cast in call to g_signal_emit().
-	(impl_ShellView_unset_message): Likewise.
-	(impl_ShellView_change_current_view): Likewise.
-	(impl_ShellView_set_title): Likewise.
-
-	* e-shell-view.c (init): Ref/sink the GtkTooltips.
-
-	* e-uri-schema-registry.c (schema_handler_free): g_object_unref()
-	on the component instead of bonobo_object_unref().
-
-2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (no_views_left_cb): Use bonobo_main_quit() instead of
-	gtk_main_quit().
-	(shell_weak_notify): Likewise.
-	(idle_cb): Likewise.
-
-	* e-shell.c (notify_no_views_left_idle_cb): New idle function to
-	emit the "no_views_left" signal.
-	(view_weak_notify): Put it on the idle loop instead of firing the
-	signal here.
-
-	* e-task-widget.c (e_task_widget_construct): Ref/sink the
-	GtkTooltips object.
-
-2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (save_settings_for_views): Removed.
-	(e_shell_save_settings): Do not call it here.
-
-2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (impl_dispose): NULL priv->ui_component
-	after unreffing it.
-
-2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component-client.c (destroy_listener_interface):
-	Avoid freeing the servant for now, it looks like something is
-	messed up and this causes a crash on exit.
-
-	* evolution-storage-set-view-listener.c (impl_finalize): Do not
-	invoke POA_GNOME_Evolution_StorageSetViewListener__fini().
-
-	* evolution-storage-listener.c (impl_finalize): Do not invoke
-	POA_GNOME_Evolution_StorageListener__fini().
-
-	* e-shell-offline-sync.c (progress_listener_servant_free): Do not
-	invoke POA_GNOME_Evolution_SyncFolderProgressListener__fini().
-
-	* e-shell-offline-handler.c (progress_listener_servant_free): Do
-	not invoke POA_GNOME_Evolution_OfflineProgressListener__fini().
-
-	* e-corba-storage.c (impl_dispose): Do not invoke
-	POA_GNOME_Evolution_StorageListener__fini().
-
-	* evolution-shell-component-client.c (destroy_listener_interface):
-	Do not invoke POA_GNOME_Evolution_ShellComponentListener__fini().
-
-2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (quit_box_destroyed_callback): Removed.
-	(no_views_left_cb): Use g_object_add_weak_pointer() instad of
-	connecting to the "destroy" signal.
-	(destroy_cb): Removed.
-	(shell_weak_notify): New.
-	(idle_cb): Use g_object_weak_ref() on the shell object instead of
-	connecting to the "destroy" signal.
-
-	* evolution-test-component.c (dialog_destroy_callback): Removed.
-	(dialog_weak_notify): New.
-	(create_new_folder_selector): Use g_object_weak_ref() on the
-	dialog instead of connecting the "destroy" signal.
-
-	* e-shortcuts.c (view_destroyed_cb): Removed.
-	(view_weak_notify): New.
-	(e_shortcuts_new_view): g_object_weak_ref() the new view instead
-	of connecting the "destroy" signal.
-	(impl_dispose): Free the ->views and g_object_weak_unref() all the
-	items.
-
-	* e-shell.c (view_destroy_cb): Removed.
-	(view_weak_notify): New.
-	(create_view): Use g_object_weak_ref() on the newly created view
-	instead of connecting to the "destroy" signal.
-	(impl_dispose): g_object_weak_unref() the views.
-	(e_shell_show_settings): Use g_object_add_weak_pointer() on the
-	settings_dialog instead of connecting to the "destroy" signal.
-	(settings_dialog_destroy_cb): Removed.
-
-	* e-shell-shared-folder-picker-dialog.c
-	(progress_bar_weak_notify): New.
-	(progress_bar_destroy_callback): Removed.
-	(create_progress_dialog): Use g_object_weak_ref() on the progress
-	bar object instead of connecting to its "destroy" signal.
-	(shell_destroy_callback): Removed.
-	(shell_view_destroy_callback): Removed.
-	(storage_destroy_callback): Removed.
-	(shell_weak_notify): New.
-	(shell_view_weak_notify): New.
-	(storage_weak_notify): New.
-	(discover_folder): Use g_object_weak_ref() on the shell, parent,
-	storage objects instead of connecting to their "destroy" signals.
-
-	* e-shell-importer.c: Removed member destroyed from
-	ImporterComponentData.
-	(import_cb): Instead of checking if ->destroyed is TRUE, check if
-	->dialog is NULL to decide whether the dialog has been destroyed
-	or not.
-	(dialog_destroy_cb): Removed.
-	(start_import): Use g_object_weak_ref() on the dialog object
-	instead of connecting to its "destroy" signal.
-	(dialog_close): Removed.
-	(dialog_weak_notify): New.
-	(show_import_wizard): Use g_object_weak_ref() on the dialog object
-	instead of connecting to its "destroy" signal.
-	(import_druid_destroy): New.
-	(import_druid_weak_notify): New.
-	(show_import_wizard): Use g_object_weak_ref() on the druid object
-	instead of connecting to its "destroy" signal.
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_construct): g_object_weak_ref()
-	the shell object instead of connecting to its "destroy" signal.
-
-	* e-shell-folder-creation-dialog.c (dialog_destroy_cb): Removed.
-	(dialog_destroy_notify): New.
-	(e_shell_show_folder_creation_dialog): g_object_weak_ref() the
-	dialog instead of connecting to its "destroy" signal.
-	(shell_destroy_cb): Removed.
-	(shell_destroy_notify): New.
-	(e_shell_show_folder_creation_dialog): g_object_weak_ref() the
-	shell object instead of connecting to its "destroy" signal.
-
-	* e-shell-config-offline.c (config_control_destroy_callback):
-	Removed.
-	(config_control_destroy_notify): New.
-	(e_shell_config_offline_create_widget): g_object_weak_ref() the
-	config_control instead of connecting to its "destroy" signal.
-
-	* e-shell-config-default-folders.c
-	(config_control_destroy_callback): Removed.
-	(config_control_destroy_notify): New.
-	(e_shell_config_default_folders_create_widget):
-	g_object_weak_ref() instead of connecting to the "destroy" signal.
-
-	* e-shell-config-autocompletion.c (config_control_destroy_notify):
-	New.
-	(config_control_destroy_callback): Removed.
-	(e_shell_config_autocompletion_create_widget):
-	g_object_weak_ref() instead of connecting to the "destroy" signal.
-
-	* e-activity-handler.c (task_bar_destroy_cb): Removed.
-	(task_bar_destroy_notify): New.
-	(e_activity_handler_attach_task_bar): Weak_ref the task_bar using
-	task_bar_destroy_notify.
-	(impl_dispose): Weak_unref the task bars in priv->task_bars.
-
-2002-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-startup-wizard.c: Change type of member etd in
-	TimezoneDialogPage to GObject from GtkObject.
-	(make_timezone_page): Cast to G_OBJECT() not GTK_OBJECT().
-
-2002-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-startup-wizard.c (e_shell_startup_wizard_create):
-	Connect finish_func to the "next" signal for now, since GnomeDruid
-	seems to be borked.
-
-	* e-uri-schema-registry.c (schema_handler_new): g_object_ref()
-	@component instead of bonobo_object_ref().
-
-	* e-local-storage.c (create_folder): g_object_ref() for the
-	component_client, instead of bonobo_object_ref().
-	(remove_folder_step): Likewise.
-
-2002-11-13  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-storage.c: remove GTK_OBJECT cast and other GTK stuff.
-
-	* evolution-storage.h: this is a gobject not a gtkobject, fix cast
-	macros, and get_type call.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* e-task-widget.c (impl_finalize): need to assign priv here, fixes
-	a crash.
-
-2002-11-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (impl_dispose): Do unref the config_listener here [I
-	fixed the finalize crash we were getting].
-
-2002-11-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (impl_finalize): Protect against
-	priv->checkboxes being NULL.
-
-2002-11-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-component-registry.c: Make separate dispose/finalize overrides
-	of just overriding destroy.
-	* e-corba-config-page.c: Likewise.
-	* e-corba-storage.c: Likewise.
-	* e-folder-type-registry.c: Likewise.
-	* e-folder.c: Likewise.
-	* e-history.c: Likewise.
-	* e-local-folder.c: Likewise.
-	* e-local-storage.c: Likewise.
-	* e-shell-folder-selection-dialog.c: Likewise.
-	* e-shell-folder-title-bar.c: Likewise.
-	* e-shell-offline-handler.c: Likewise.
-	* e-shell-settings-dialog.c: Likewise.
-	* e-shell-user-creatable-items-handler.c: Likewise.
-	* e-shell-view.c: Likewise.
-	* e-shortcuts-view-model.c: Likewise.
-	* e-shortcuts-view.c: Likewise.
-	* e-shortcuts.c: Likewise.
-	* e-storage-set-view.c: Likewise.
-	* e-storage-set.c: Likewise.
-	* e-storage.c: Likewise.
-	* e-task-bar.c: Likewise.
-	* e-task-widget.c: Likewise.
-	* e-uri-schema-registry.c: Likewise.
-	* evolution-activity-client.c: Likewise.
-	* evolution-folder-selector-button.c: Likewise.
-	* evolution-storage-listener.c: Likewise.
-	* evolution-storage-set-view-listener.c: Likewise.
-	* evolution-test-component.c: Likewise.
-
-2002-11-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importer/Makefile.am: use correctly IDL flags.
-
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* e-task-widget.c (impl_destroy): guard against multiple calls.
-	fixes a crash whenever a task finishes (the addressbook finishing
-	loading, etc.).
-
-	* e-shell-marshal.list: add NONE:BOOL for
-	evolution-shell-component.
-
-	* evolution-shell-component.c (class_init): register the signals
-	with g_signal_new.
-
-2002-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_show_settings): Allow type being NULL.
-
-2002-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (load_folder): Do add folders with an unknown
-	type.
-
-2002-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* glade/e-shell-folder-creation-dialog.glade (ok_button): Set
-	response_id to GTK_RESPONSE_OK.
-	(cancel_button): Likewise, with GTK_RESPONSE_CANCEL.
-
-	* e-shell-folder-creation-dialog.h,
-	e-shell-folder-creation-dialog.c: Ported to GtkDialog.
-
-2002-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-folder-list.c: Use g_object_get_data() instead of
-	gtk_object_get_data().
-	* e-shell-config-default-folders.c: Likewise.
-	* e-shell-folder-creation-dialog.c: Likewise.
-	* e-shell-importer.c: Likewise.
-	* e-shell-shared-folder-picker-dialog.c: Likewise.
-	* e-shell-user-creatable-items-handler.c: Likewise.
-	* e-shell-view.c: Likewise.
-	* e-shell.c: Likewise.
-	* e-storage.c: Likewise.
-
-2002-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-activity-handler.c: Split finalize/dispose.
-	* e-corba-shortcuts.c: Likewise.
-	* e-corba-storage-registry.c: Likewise.
-	* e-shell-about-box.c: Likewise.
-	* e-shell.c: Likewise.
-	* e-splash.c: Likewise.
-	* evolution-config-control.c: Likewise.
-	* evolution-session.c: Likewise.
-	* evolution-shell-component.c: Likewise.
-	* evolution-shell-view.c: Likewise.
-	* evolution-storage-set-view.c: Likewise.
-	* evolution-storage.c: Likewise.
-	* evolution-wizard.c: Likewise.
-
-2002-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* All: g_object_unref instead of bonobo_object_unref for the
-	EvolutionShellComponentClient and EvolutionShellClient interfaces.
-
-2002-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-client.c (impl_dispose): New.
-	(impl_finalize): New.
-	(destroy): Removed.
-	(class_init): Install dispose, finalize handlers.
-
-	* All: Use evolution_shell_client_corba_objref() or
-	evolution_shell_component_client_corba_objref() instead of
-	BONOBO_OBJREF() or bonobo_object_corba_objref() where needed.
-
-	* e-folder-type-registry.c (set_handler): Use g_object_ref() for
-	the handler, not bonobo_object_ref().
-	(folder_type_free): Likewise for unref.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_corba_objref): New.
-	(impl_dispose): Moved from impl_destroy; only unref things.
-	(impl_finalize) New.
-	(class_init): Install dispose/finalize.
-	(evolution_shell_component_client_get_dnd_source_interface): Use
-	priv->corba_objref instead of bonobo_object_corba_objref() since
-	we are not a BonoboObject anymore.
-	(evolution_shell_component_client_get_dnd_destination_interface):
-	Likewise.
-	(evolution_shell_component_client_get_offline_interface): Likewise.
-	(evolution_shell_component_client_set_owner): Likewise.
-	(evolution_shell_component_client_unset_owner): Likewise.
-	(evolution_shell_component_client_create_view): Likewise.
-	(evolution_shell_component_client_handle_external_uri): Likewise.
-	(evolution_shell_component_client_async_create_folder): Likewise.
-	(evolution_shell_component_client_async_xfer_folder): Likewise.
-	(evolution_shell_component_client_populate_folder_context_menu): Likewise.
-	(evolution_shell_component_client_unpopulate_folder_context_menu): Likewise.
-
-	* e-component-registry.c (register_component): Use
-	evolution_shell_component_client_corba_objref().
-	(e_component_registry_restart_component): Likewise.
-	(component_free): Likewise.
-
-	* evolution-shell-component-client.c: g_object_new() instead of gtk_type_new().
-	* e-component-registry.c: Likewise.
-	* e-corba-config-page.c
-	* e-folder-list.c: Likewise.
-	* e-folder-type-registry.c: Likewise.
-	* e-folder.c: Likewise.
-	* e-gray-bar.c: Likewise.
-	* e-history.c: Likewise.
-	* e-local-folder.c: Likewise.
-	* e-local-folder.c: Likewise.
-	* e-local-storage.c: Likewise.
-	* e-shell-about-box.c: Likewise.
-	* e-shell-config-default-folders.c: Likewise.
-	* e-shell-folder-selection-dialog.c: Likewise.
-	* e-shell-folder-title-bar.c: Likewise.
-	* e-shell-offline-handler.c: Likewise.
-	* e-shell-settings-dialog.c: Likewise.
-	* e-shell-user-creatable-items-handler.c: Likewise.
-	* e-shell-view.c: Likewise.
-	* e-shortcuts-view-model.c: Likewise.
-	* e-shortcuts-view.c: Likewise.
-	* e-shortcuts.c: Likewise.
-	* e-splash.c: Likewise.
-	* e-storage-set-view.c: Likewise.
-	* e-storage-set.c: Likewise.
-	* e-storage.c: Likewise.
-	* e-task-bar.c: Likewise.
-	* e-task-widget.c: Likewise.
-	* e-uri-schema-registry.c: Likewise.
-	* evolution-activity-client.c: Likewise.
-	* evolution-folder-selector-button.c: Likewise.
-	* evolution-shell-client.c: Likewise.
-	* evolution-shell-view.c: Likewise.
-	* evolution-storage-listener.c: Likewise.
-	* evolution-storage-set-view-listener.c: Likewise.
-	* evolution-storage-set-view.c: Likewise.
-	* evolution-wizard.c: Likewise.
-
-	* GNOME_Evolution_TestComponent.server: Renamed from
-	GNOME_Evolution_TestComponent.oaf.
-
-	* evolution-test-component.c (spit_out_shortcuts): Use
-	BONOBO_EX_REPOID().
-	(create_new_folder_selector): Ported to use GtkDialog instead of
-	GnomeDialog.
-	(storage_cancel_discover_shared_folder_callback): Add missing
-	G_OBJECT() cast.
-	(shared_folder_discovery_timeout_callback): Likewise.
-	(storage_discover_shared_folder_callback): Likewise.
-	(timeout_callback_2): Likewise.
-	(timeout_callback_1): Likewise.
-	(shared_folder_discovery_timeout_callback): Use
-	g_object_get_data() instead of gtk_object_get_data().
-	(storage_cancel_discover_shared_folder_callback): Likewise.
-	(timeout_callback_2): Likewise.
-	(timeout_callback_2): g_timeout_add() instead of
-	gtk_timeout_add().
-	(create_view_fn): Likewise.
-	(timeout_callback_1): Likewise.
-	(timeout_callback_1): Pass NULL as the error arg to
-	gdk_pixbuf_new_from_file().
-	(register_component): Use bonobo-activation instead of OAF.
-
-	* e-shell-about-box.c (impl_destroy): Removed.
-	(impl_finalize): New.
-	(class_init): Install finalize handler, not destroy.
-
-	* e-shell-view-menu.c (command_about_box): Use a GtkWindow again.
-	Set the GTK_WINDOW_TYPE_HINT_DIALOG hint.
-
-	* e-shell-about-box.c (e_shell_about_box_construct): Removed.
-
-2002-11-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c (e_shell_command_copy_folder): Pass
-	TRUE for arg allow_creation to
-	e_shell_folder_selection_dialog_new().
-	(e_shell_command_move_folder): Likewise.
-	* e-shell-view-menu.c (command_goto_folder): Likewise.
-	(command_new_shortcut): Likewise.
-	* e-shell.c (impl_Shell_selectUserFolder): Likewise.
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_set_allow_creation): Removed.
-	(e_shell_folder_selection_dialog_get_allow_creation): Removed.
-	(e_shell_folder_selection_dialog_new): New arg allow_creation.
-	(e_shell_folder_selection_dialog_construct): Likewise.  Also, do
-	set priv->shell.
-
-	* e-shell-folder-selection-dialog.h,
-	e-shell-folder-selection-dialog.c: Port to GtkDialog.
-
-2002-11-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-folder-type-registry.c
-	(e_folder_type_registry_get_handler_for_type): Remove warning for
-	when the type is unknown.
-	(e_folder_type_registry_type_is_user_creatable): Likewise.
-	(e_folder_type_registry_get_display_name_for_type): Likewise.
-	(e_folder_type_registry_get_description_for_type): Likewise.
-	(e_folder_type_registry_get_exported_dnd_types_for_type):
-	Likewise.
-	(e_folder_type_registry_get_accepted_dnd_types_for_type):
-	Likewise.
-	(e_folder_type_registry_unregister_type): Likewise.
-	(e_folder_type_registry_get_icon_name_for_type): Likewise.
-	(e_folder_type_registry_get_icon_for_type): Likewise.
-	(set_handler): Removed warning here too.
-
-2002-11-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-folder-list.c: Replace gtk_signal_emit() with g_signal_emit().
-	* e-folder.c: Likewise.
-	* e-shell-folder-selection-dialog.c: Likewise.
-	* e-shell-folder-title-bar.c: Likewise.
-	* e-shell-offline-handler.c: Likewise.
-	* e-shell-view.c: Likewise.
-	* e-shortcuts-view.c: Likewise.
-	* e-shortcuts.c: Likewise.
-	* e-storage-set-view.c: Likewise.
-	* e-storage-set.c: Likewise.
-	* e-storage.c: Likewise.
-	* evolution-activity-client.c: Likewise.
-	* evolution-folder-selector-button.c: Likewise.
-	* evolution-storage-listener.c: Likewise.
-	* evolution-storage-set-view-listener.c: Likewise.
-
-2002-11-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-folder-list.c: Use g_object_set_data() instead of
-	gtk_object_set_data().
-	* e-shell-config-default-folders.c: Likewise.
-	* e-shell-folder-creation-dialog.c: Likewise.
-	* e-shell-importer.c: Likewise.
-	* e-shell-shared-folder-picker-dialog.c: Likewise.
-	* e-shell-user-creatable-items-handler.c: Likewise.
-	* e-shell-view.c: Likewise.
-	* e-shell.c: Likewise.
-	* e-storage-set-view.c: Likewise.
-	* e-storage.c: Likewise.
-	* evolution-test-component.c: Likewise.
-	
-	* e-storage-set-view.c (e_storage_set_view_construct): Use
-	g_object_weakref() instead of gtk_object_weakref() for the
-	ui_container.
-	(ui_container_destroy_notify): Add param where_the_object_was to
-	match the GWeakNotify prototype.
-
-	* e-shell.c: Use g_signal_emit() instead of gtk_signal_emit().
-
-2002-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* glade/e-active-connection-dialog.glade: Converted to Glade2
-	format.
-	* glade/evolution-startup-wizard.glade: Likewise.
-	* glade/e-shell-shared-folder-picker-dialog.glade: Likewise.
-	* glade/e-shell-folder-creation-dialog.glade: Likewise.
-	* glade/e-shell-config-default-folders.glade: Likewise.
-	* glade/e-folder-list.glade: Likewise.
-
-2002-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* *.c, *.h: Changed all gtk_object_refs()/gtk_object_unrefs() into
-	g_object_refs()/g_object_unrefs() and all gtk_signal_connect_*()
-	into g_signal_connect_*().  [Except for some case where we have
-	gtk_signal_connect_full() or gtk_signal_connect_while_alive()
-	calls that cannot be trivially ported to use the g_signal_*
-	functions, we'll have to fix those later.]
-
-	* e-splash.c (impl_finalize): Finalize implementation, copied over
-	from impl_destroy.
-	(impl_destroy): Removed.
-	(class_init): Override finalize, not destroy.
-
-	* e-activity-handler.c: Ported from GtkObject to GObject.
-	* evolution-storage.c: Likewise.
-	* e-corba-shortcuts.c: Likewise.
-	* evolution-session.h: Likewise.
-	* evolution-config-control.c: Likewise.
-	* evolution-shell-component-dnd.c: Likewise.
-	* evolution-shell-component.c: Likewise.
-	* evolution-shell-view.c: Likewise.
-	* evolution-storage-set-view.c: Likewise.
-	* evolution-wizard.c: Likewise.
-
-2002-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-component-info.c: Updated for libxml2.
-	* e-shortcuts.c: Likewise.
-	* e-folder-list.c: Likewise.
-	* e-local-folder.c: Likewise.
-
-2002-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Shell.server.in: Renamed from
-	GNOME_Evolution_Shell.oaf.in.
-
-	* Makefile.am: Port from OAF to bonobo-activation.
-	(INCLUDES): Define SYSCONFDIR, DATADIR, LIBDIR.
-
-	* main.c (main): Use gnome_program_init().
-
-	* e-corba-storage-registry.c (e_corba_storage_registry_new):
-	g_object_new(), not gtk_type_new().
-	(impl_finalize): New, ported over from destroy.
-	(destroy): Removed.
-	(class_init): Install finalize handler, not destroy handler, since
-	we are not a GtkObject anymore.
-
-	* e-corba-storage.c (e_corba_storage_new): g_object_new(), not
-	gtk_type_new().
-
-	* e-shell.c (class_init): Override finalize, not destroy.
-	(impl_finalize): Finalize implementation, basically the old
-	destroy renamed.
-	(e_shell_new): g_object_new(), not gtk_type_new().
-	(class_init): Use e_shell_marshal_NONE__INT for
-	line_status_changed instead of using an ENUM.
-	(e_shell_construct): Use g_signal_connect_object() instead of
-	gtk_signal_connect_while_alive().
-
-	* e-setup.c (e_setup): Do not unref local_folder if NULL.
-
-	* e-folder.c (init): Make not floating.
-	(e_folder_construct): No need to make it floating here anymore.
-
-	* e-shell.c (impl_Shell_selectUserFolder): For now don't set
-	dialog parent from xid.
-
-	* main.c (no_views_left_cb): Add missing GTK_SIGNAL_FUNC() cast.
-	(new_view_created_callback): Likewise.
-	(warning_dialog_clicked_callback): Update to use the
-	EConfigListener from the shell instead of bonobo-conf.
-	(show_development_warning): Likewise.
-	(upgrade_from_1_0_if_needed): BONOBO_EX_ID -> BONOBO_EX_REPOID.
-	(idle_cb): Use bonobo-activation and BONOBO_EX_REPOID().
-	(main): Cleaned up the various things that are unneeded in GNOME
-	2.
-	(upgrade_from_1_0_if_needed): Use EConfigListener.
-
-	* evolution-storage-set-view.h, evolution-storage-set-view.c:
-	BonoboXObjectified.
-
-	* e-storage.c (class_init): GLIB2-ified and made to use
-	e-shell-marshal.h.
-	(ES_CLASS): Use GTK_OBJECT_GET_CLASS().
-	(e_storage_new_folder): Added missing GTK_SIGNAL_FUNC() prototype.
-
-	* e-storage-set.c (class_init): GLIB2-ified and made to use
-	e-shell-marshal.h.
-
-	* e-storage-set-view.c (popup_folder_menu): For now, do not add
-	the pop-up since we lack bonobo_ui_container_get_win() and I am
-	not sure how to work around it.
-	(popup_folder_menu): Pass self as the for_widget arg to
-	gnome_popup_menu_do_popup_modal().
-	(class_init): GLIB2-ified, and got to use e-shell-marshal.h.
-	(marshal_NONE__GDKDRAGCONTEXT_STRING_STRING_STRING): Removed.
-	(impl_tree_drag_data_get): Don't set the selection for now -- we
-	have to fix the CORBA target stuff to match GTK 2.
-	(e_storage_set_view_construct): Pass NULL as the opt_ev arg to
-	bonobo_ui_component_set_container().
-
-	* e-splash.c: #include <libgnomecanvas/gnome-canvas-pixbuf.h>
-	instead of <gdk-pixbuf/gnome-canvas-pixbuf.h>.
-	(e_splash_new): Pass NULL as the error arg to
-	gdk_pixbuf_new_from_file().
-
-	* e-shortcuts.c (class_init): GLIB2-ified.  Also use the
-	e-shell-marshal marshallers.
-	(e_shortcuts_new_view): Add missing GTK_SIGNAL_FUNC() cast.
-
-	* e-shortcuts-view.c: Use GTK_STOCK_* stuff instead of
-	GNOME_STOCK_* stuff.
-	(pop_up_right_click_menu_for_group): Pass self as the for_widget
-	arg to gnome_popup_menu_do_popup_modal().
-	(pop_up_right_click_menu_for_shortcut): Likewise.
-	(class_init): GLIB2-ified.
-
-	* e-shell.c: Do not #include <gal/util/e-unicode-i18n.h> or
-	#include <libgnome/gnome-defs.h>.
-	(set_interactive): Use BONOBO_EX_REPOID().
-	(setup_local_storage): Use _() not U_().
-	(destroy): Use gtk_widget_destroy() instead of
-	gtk_object_destroy() on priv->settings_dialog.
-	(class_init): GLIB2-ized.
-	(init): Initialize config_listener member.
-	(get_icon_path_for_component_info): Port to bonobo-activation from
-	OAF.
-	(setup_components): Likewise.
-	(destroy): Likewise.
-	(e_shell_construct): Use e_setup_check_config(), not
-	e_setup_check_db ().  Use the e_config_listener instead of
-	bonobo-conf.
-	(save_settings_for_views): Likewise.
-	(save_misc_settings): Likewise.
-	(e_shell_restore_from_settings): Likewise.
-	(parse_default_uri): Likewise.
-	(e_shell_component_maybe_crashed): Pass NULL for opt_ev arg to
-	bonobo_unkown_ping()
-	(e_shell_component_maybe_crashed): Use
-	bonobo_engine_deregister_dead_components() instead of
-	bonobo_window_deregister_component_by_ref() which is no more.
-	(e_shell_send_receive): BONOBO_EX_REPOID() instead of
-	BONOBO_EX_ID().
-	(e_shell_get_config_listener): Return the config_listener.
-
-	* e-shell-view.c (find_inbox_in_storage): Use _() instead of U_().
-	(load_images): Pass NULL as the error arg to
-	gdk_pixbuf_new_from_file().
-	(load_images): Likewise.
-	(find_inbox_in_storage): Work around the lack of
-	g_utf8_strcasecmp() in glib-2.0.
-	(class_init): GLIB2-ified.  Also, use the marshallers in
-	e-shell-marshal.h.
-	(pop_up_folder_bar): Use gtk_window_move()/gtk_widget_show()
-	instead gtk_widget_popup().
-	(unmerge_on_error): Work around the death of
-	bonobo_ui_component_get_win() and
-	bonobo_window_deregister_component_by_ref().
-	(e_shell_view_construct): Pass NULL as the uic arg to
-	bonobo_window_construct().  Add missing GTK_SIGNAL_FUNC() cast.
-	Match the new BonoboWindow behavior wrt the UIContainer and the
-	new opt_ev args.
-	(display_uri): Use bonobo_ui_engine_freeze() and
-	bonobo_ui_engine_thaw() since bonobo_window_freeze() and
-	bonobo_window_thaw() got axed [sigh].
-	(e_shell_view_save_settings): Use EConfigListener.
-	(e_shell_view_load_settings): Likewise.
-	(get_view_for_uri): Use bonobo_widget_new_control_from_objref()
-	instead of e_bonobo_widget_new_control_from_objref().
-
-	* e-shell-view-menu.c (command_help_faq): Pass NULL for the error
-	arg to gnome_url_show().
-	(command_about_box): Use GtkDialog instead of a GtkWindow of a
-	type GTK_WINDOW_DIALOG [which does not exist anymore].
-	(command_xml_dump): Removed.
-	(menu_do_misc): Do not add the corresponding verb.
-
-	* e-shell-user-creatable-items-handler.c (execute_verb): Use
-	BONOBO_EX_REPOID().
-
-	* e-shell-startup-wizard.c: Remove id member from SWData.  Replace
-	member db with config_listener.
-	(e_shell_startup_wizard_create): Initialize config_listener.
-	(make_mail_dialog_pages): Do not set the listener id here.
-	(druid_event_notify_cb): Pass FALSE as the help_sensitive arg to
-	gnome_druid_set_buttons_sensitive().
-	(e_shell_startup_wizard_create): Likewise.
-	(make_mail_dialog_pages): Use bonobo-activation instead of OAF.
-	(get_intelligent_importers): Likewise.
-	(prepare_importer_page): Likewise.
-	(start_importers): Do nothing here for now.
-	(finish_func): Constify local variable displayname.
-	(finish_func): Updated to use the config_listener instead of the
-	bono-conf db.
-	(prepare_importer_page): Do not actually run the importer yet.
-	(e_shell_startup_wizard_create): Pass NULL as the domain arg to
-	glade_xml_new().  Use the config_listener.
-
-	* e-shell-shared-folder-picker-dialog.c (user_clicked):
-	BONOBO_EX_REPOID() instead of BONOBO_EX_ID().
-	(setup_name_selector): Likewise.
-	(setup_name_selector): Use bonobo-activation.
-	(show_dialog): Pass NULL as the domain arg to glade_xml_new().
-	(setup_name_selector): Add a missing GTK_SIGNAL_FUNC() cast.
-
-	* e-shell-settings-dialog.c: #include
-	<bonobo-activation/bonobo-activation.h>.  Use
-	Bonobo_ActivationProperty instead of OAF_Property.
-	(set_dialog_size): Use gtk_style_get_font() to get the font from
-	the widget->style.
-	(load_pages): Converted to use bonobo-activation instead of OAF.
-	Pass NULL as the error arg to gdk_pixbuf_new_from_file().
-
-	* e-shell-offline-sync.c (sync_folder): BONOBO_EX_REPOID(), not
-	BONOBO_EX_ID().
-	(e_shell_offline_sync_all_folders): For now, avoid doing anything
-	[see changes to e-shell-config-offline.c below].
-	(setup_progress_listener): #if 0 for now.
-	(setup_dialog): Likewise.
-	(sync_folder): Likewise.
-	(cleanup): Likewise.
-	(progress_listener_servant_free): Likewise.
-	(progress_listener_servant_new): Likewise.
-	(impl_SyncFolderProgressListener_updateProgress): Likewise.
-	(impl_SyncFolderProgressListener_reportSuccess): Likewise.
-	(impl_SyncFolderProgressListener_reportFailure): Likewise.
-	(progress_dialog_close_callback): Likewise.
-	(progress_dialog_clicked_callback): Likewise.
-
-	* e-shell-offline-handler.c (prepare_for_offline): Use
-	BONOBO_EX_REPOID().
-	(pop_up_confirmation_dialog): Pass NULL as the domain arg to
-	glade_xml_new().
-	(class_init): GLIB2-ified.
-
-	* Makefile.am: Do not compile e-shell-importer.c,
-	e-shell-importer.h for now.
-
-	* e-shell-folder-title-bar.c (get_max_clipped_label_width): Use
-	gtk_style_get_font() to retrieve the font.
-	(class_init): GLIB2-ified.
-	(e_shell_folder_title_bar_construct): Get {x,y}thickness from
-	widget->style, not from widget->style->klass.
-
-	* e-shell-folder-selection-dialog.c: #include <string.h>,
-	<gtk/gtklabel.h> and <gtk/gtksignal.h>.
-	(class_init): GLIB2-ified.
-
-	* e-shell-folder-creation-dialog.c: No <libgnome/gnome-defs.h>,
-	add some GTK includes.
-	(e_shell_show_folder_creation_dialog): Pass NULL as the domain arg
-	to glade_xml_new().  Added missing GTK_SIGNAL_FUNC() cast.
-
-	* e-shell-folder-commands.c: Do not #include
-	<libgnomeui/gnome-stock.h> and #include
-	<bonobo-conf/Bonobo_Config.h>.
-
-	* e-shell-config-default-folders.c: Replace member db in
-	EvolutionDefaultFolderConfig with config_listener.
-	(e_shell_config_default_folders_create_widget): Init here.
-	(config_control_destroy_cb): Unref here.
-	(config_control_apply_cb): Use EConfigListener instead of
-	BonoboConf.
-	(setup_folder_selector): Likewise.
-	(e_shell_config_default_folders_create_widget): Pass NULL as the
-	domain arg to glade_xml_new().
-
-	* e-shell-config-offline.c (config_control_apply_callback): For
-	now, do not change the configuration.  [Needs to be ported to
-	EConfigListener or something, but we were storing a sequence using
-	typecodes here and there is no trivial way to do that right now.]
-	(init_storage_set_view_status_from_config): Likewise, do not
-	retrieve the configuration here.
-
-	* e-shell-marshal.list: Removed duplicates, added a bunch new
-	marshallers.
-
-2002-11-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-config-autocompletion.c: No bonobo-conf; removed member
-	db in struct EvolutionAutocompletionConfig and replaced with a
-	config_listener arg.
-	(e_shell_config_autocompletion_create_widget): Init it here.
-	(config_control_destroy_callback): Unref it here.
-	(config_control_apply_callback): Updated to use the
-	config_listener.
-
-	* e-shell-config.c (e_shell_config_factory_register): Use
-	bonobo_generic_factory_new() instead of
-	bonobo_generic_factory_new_multi().
-
-	* e-shell-about-box.c (impl_realize): Pass NULL as the error arg
-	to gdk_pixbuf_new_from_file().
-	(timeout_callback): Use gtk_style_get_font() to retrieve the
-	style's font instead of style->font.
-	(impl_draw): Removed.
-	(impl_expose_event): Do the drawing of the pixmap here.
-
-	* e-setup.c (e_setup_check_db): Removed.
-	(e_setup_check_config): New, version using EConfigListener instead
-	of bonobo-conf.
-
-	* e-setup.h: #include "e-util/e-config-listener.h" instead of
-	<bonobo-conf/bonobo-config-database.h>.
-
-	* e-local-storage.c (construct): Use _() instead of U_().
-	(setup_stock_folders): Likewise.
-
-	* e-icon-factory.c (load_icon): Pass NULL as the error arg to
-	gdk_pixbuf_new_from_file().
-
-	* e-folder-type-registry.c (folder_type_new): Pass NULL as the
-	error arg to gdk_pixbuf_new_from_file().
-
-	* e-folder-dnd-bridge.c (find_matching_target_for_drag_context):
-	GdkAtom is not an integer anymore; update accordingly.
-
-	* e-corba-storage.c (async_folder_cb): Constified args
-	appropriately to match BonoboListenerCallbackFn.
-	(async_folder_discovery_cb): Likewise.
-	(cancel_discover_shared_folder): BONOBO_EX_ID() ->
-	BONOBO_EX_REPOID().
-	(e_corba_storage_show_folder_properties): Likewise.
-
-	* e-corba-storage-registry.h, e-corba-storage-registry.c:
-	BonoboXObjectified.
-
-	* e-corba-config-page.c: Removed member listener_id in struct
-	ECorbaConfigPagePrivate.
-	(init): Don't init.
-	(setup_listener): Bonobo_EventSource_addListener doesn't return an
-	ID anymore.
-	(impl_destroy): Just pass the listener to
-	Bonobo_EventSource_removeListener.
-	(setup_listener): BONOBO_EX_REPOID() instead of BONOBO_EX_ID().
-	(impl_apply): Likewise.
-	(listener_event_callback): Constified args appropriately to match
-	BonoboListenerCallbackFn.
-	(e_corba_config_page_construct): Likewise.
-
-	* e-component-registry.c (wait_for_corba_object_to_die): Pass NULL
-	for the exception arg to bonobo_unknown_ping().
-
-	* e-shell-view.h: <bonobo/bonobo-window.h>, not
-	<bonobo/bonobo-win.h>.
-
-	* e-shell.c: Replace member db in EShellPrivate with an
-	EConfigListener config_listener.
-	(destroy): Do not call e_shell_disconnect_db().  Unref
-	EConfigListener.  Destroy settings_dialog if not NULL.  Pass
-	config_listener to e_setup_check_db().
-	(e_shell_get_config_db): Removed.
-	(e_shell_get_config_listener): New.
-	(e_shell_construct): Set up the config_listener, instead of the
-	Bonobo_ConfigDatabase.
-
-	* e-shell.h: #include <bonobo-activation/bonobo-activation.h>
-	instead of <liboaf/oaf.h>.  No
-	<bonobo-conf/bonobo-config-database.h>.
-
-	* e-component-registry.c: #include
-	<bonobo-activation/bonobo-activation.h> instead of <liboaf/oaf.h>.
-
-	* e-activity-handler.c (task_widget_button_press_event_callback):
-	Use BONOBO_EX() and BONOBO_EX_REPOID().
-	(impl_operationStarted): Don't use GTK_OBJECT_DESTROYED() [needs
-	to be fixed later].
-	(impl_operationProgressing): Likewise.
-	(impl_operationFinished): Likewise.
-	(impl_requestDialog): Likewise.
-
-	* evolution-wizard.c (evolution_wizard_class_init): GLIB2-ified.
-
-	* evolution-wizard.h: Remove BEGIN_GNOME_DECLS/END_GNOME_DECLS.
-
-	* evolution-storage.c: Chagned to use generated marshallers
-	instead of custom ones or GAL's.
-
-	* eshell-marshal.list: New.
-	* Makefile.am: Added rule to build eshell-marshal.[ch] and link
-	them in.
-
-	* evolution-storage.h, evolution-storage.c: BonoboXObjectified.
-
-	* evolution-storage-set-view-listener.c (class_init): GLIB2-ified.
-
-	* evolution-storage-listener.c (class_init): GLIB2-ified.
-
-	* evolution-shell-view.h, evolution-shell-view.c:
-	BonoboXObjectified.
-
-	* evolution-shell-component-utils.c: #include
-	<bonobo-activation/bonobo-activation.h>.
-	(e_pixmaps_update): Pass NULL as the error arg to
-	gdk_pixbuf_new_from_file().
-	(e_activation_failure_dialog): Bonobo_GeneralError instead of
-	OAF_GeneralError.
-	(e_get_activation_failure_msg): Likewise.
-
-	* evolution-shell-component-dnd.h, evolution-shell-component-dnd.c:
-	BonoboXObjectified.
-
-	* evolution-shell-component.c: #include <unistd.h>.
-	(owner_ping_callback): Pass NULL for the opt_ev arg to
-	bonobo_unknown_ping().
-	(impl_populateFolderContextMenu): Pass NULL for the opt_ev arg to
-	bonobo_ui_component_set_container().
-	(class_init): GLIB2-ified.
-
-	* e-component-registry.c (component_free): Use g_object_unref() on
-	the EvolutionShellComponentClient instead of
-	bonobo_object_unref().
-	(register_component): Likewise.
-	(component_new): Likewise, use g_object_ref() instead of
-	bonobo_object_ref().
-
-	* evolution-shell-component-client.c: New member corba_objref in
-	EvolutionShellComponentClientPrivate.
-	(init): Init to CORBA_OBJECT_NIL.
-	(impl_destroy): Unref.  Also CORBA_OBJECT_NILify all the pointers
-	to unreffed objects.
-	(corba_exception_to_result): Use BONOBO_EX_REPOID(ev) instead of
-	ev->_repo_id.
-	(evolution_shell_component_client_construct): Set the corba_objref
-	pointer, do not call bonobo_object_client_construct().
-	(evolution_shell_component_client_new): Use
-	bonobo_activation_activate_from_id() here instead of
-	oaf_activate_from_id().
-
-	* evolution-shell-component-client.h,
-	evolution-shell-component-client.c: Derive from GObject instead of
-	BonoboObjectClient.
-
-	* evolution-shell-client.c
-	(evolution_shell_client_create_storage_set_view): Use
-	BONOBO_EX_REPOID() instead of BONOBO_EX_ID().
-
-	* evolution-folder-selector-button.c (destroy): g_object_unref the
-	EvolutionShellClient instead of bonobo_object_unref().
-	(evolution_folder_selector_button_construct): Likewise.
-
-	* e-folder-list.c (e_folder_list_destroy): g_object_unref the
-	EvolutionShellClient instead of bonobo_object_unref().
-	(e_folder_list_construct): g_object_ref the EvolutionShellClient
-	instead of bonobo_object_ref().
-
-	* evolution-shell-client.c: New member corba_objref in
-	EvolutionShellClientPrivate.
-	(init): Init to CORBA_OBJECT_NIL.
-	(destroy): Unref/release.
-	(query_shell_interface): Use BONOBO_EX() and BONOBO_EX_REPOID()
-	instead of ._major and ._repo_id.
-	(destroy): Likewise.
-	(evolution_shell_client_get_local_storage): Likewise.
-
-	* evolution-shell-client.h: Derive from GObject instead of
-	BonoboObjectClient.
-
-	* evolution-session.c (corba_class_init): Get klass arg.
-	(class_init): Pass klass arg.  GLIB2-ified.
-	(evolution_session_construct): Removed.
-	(evolution_session_new): Just return what gtk_type_new() returns.
-
-	* evolution-session.h, evolution-session.c: Derive from
-	BonoboXObject.
-
-	* evolution-folder-selector-button.c (init): Make icon a GtkImage
-	instead of a BonoboUIToolbarIcon.
-	(set_folder, class_init): GLIB2-ified.
-
-	* evolution-config-control.c (class_init): GLIB2-ified.
-
-	* evolution-activity-client.c (corba_update_progress): Use
-	BONOBO_EX_REPOID() instead of ._major and ._repo_id.
-	(evolution_activity_client_request_dialog): Likewise.
-	(impl_destroy): Likewise.
-	(class_init): GLIB2-ified.
-
-	* e-folder-list.c: #include <gtk/gtframe.h> and #include
-	<string.h>.
-	(e_folder_list_destroy): bonobo_object_unref(), not
-	bonobo_object_client_unref().
-	(e_folder_list_init): Pass NULL as the domain to glade_xml_new().
-
-	* e-folder-list.h: #include <gtk/gtkvbox.h>.
-
-	* e-folder.c (impl_remove): Renamed from remove().
-	(impl_get_physical_uri): Renamed from get_physical_uri().
-	(impl_load_info): Renamed from load_info().
-	(impl_save_info): Renamed from save_info().
-	(class_init): GLIB2-ified.
-
-	* Evolution-Session.idl: #include <Bonobo.idl>, not <Bonobo.h>.
-	* Evolution-Offline.idl: Likewise.
-	* Evolution-ShellComponent.idl: Likewise.
-	* Evolution-ShellComponentDnd.idl: Likewise.
-	* Evolution-Storage.idl: Likewise.
-
-	* Makefile.am: Do not compile the importer directory for now.
-
-	* evolution-wizard.c (evolution_wizard_set_buttons_sensitive):
-	ORBit2-ize type names.
-	(evolution_wizard_set_show_finish): Likewise.
-	(evolution_wizard_set_page): Likewise.
-
-2002-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-settings-dialog.c (set_dialog_size): Increase the width
-	slightly.
-
-	* e-shell-view-menu.c: Set "settings.png" as the icon for
-	/menu/Tools/Settings.
-
-2002-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#31303]
-
-	* e-shell-view (storage_set_view_box_button_release_event_cb): Pop
-	down the popup folder bar if it's a toplevel node.
-	(folder_bar_popup_map_callback): Connect to the "folder_opened"
-	signal on the storage_set_view.
-
-2002-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-folder-list.c (create_display_string): Don't turn the string
-	from UTF-8 to GTK.  [#32032]
-
-2002-10-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (setup_local_storage): Set the is_stock flag to TRUE
-	for the summary folder.
-
-	* e-shell-view.c (setup_verb_sensitivity_for_folder): Don't allow
-	folder operations on pseudo-folders that have a NULL physical_uri.
-
-	* e-corba-storage.c (async_remove_folder): Make sure the folder
-	has a physical URI.  [#30950]
-
-2002-10-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-shared-folder-picker-dialog.c
-	(setup_server_option_menu): Use
-	e_utf8_gtk_menu_item_new_with_label() to create the option menu
-	items from the storage's UTF-8 name.  [#31564]
-
-2002-10-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component-utils.c
-	(e_get_activation_failure_msg): If the exception_id is NULL,
-	return NULL instead of crashing.  [#25891]
-
-2002-10-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Implement the Cancel button in the "Open other user's folder"
-	dialog, as per #27735.]
-
-	* e-corba-storage.c (cancel_discover_shared_folder): New,
-	implementation for the cancel_discover_shared_folder virtual
-	method.
-	(class_init): Install.
-
-	* evolution-test-component.c
-	(storage_discover_shared_folder_callback): Instead of passing the
-	listener to the timeout function, just pass the storage.  Put the
-	listener and the timeout ID on the storage object by using
-	gtk_object_set_data().
-	(shared_folder_discovery_timeout_callback): Updated accordingly.
-	(storage_cancel_discover_shared_folder_callback): New, callback
-	for the cancel_discover_shared_folder signal.
-	(setup_custom_storage): Connect.
-
-	* e-shell-shared-folder-picker-dialog.c: New member storage in
-	struct DiscoveryData.  While I am at it, rename member user to
-	user_email_address.
-	(discover_folder): Set the storage member.
-	(cleanup_discovery): Unref storage member.
-	(progress_dialog_clicked_callback): New, callback for the
-	"clicked" signal on the dialog.
-	(discover_folder): Connect.
-
-	* evolution-storage.c (class_init): Install signal
-	"cancel_discover_shared_folder".
-	(impl_Storage_cancelDiscoverSharedFolder): New, implementation for
-	the cancelDiscoverSharedFolder CORBA method; emit
-	"cancel_discover_shared_folder".
-	(evolution_storage_get_epv): Install CORBA method implementation.
-
-	* evolution-storage.h: Add signal cancel_discover_shared_folder.
-
-	* e-storage.c (e_storage_cancel_discover_shared_folder): New.
-
-	* e-storage.h: New virtual method cancel_discover_shared_folder.
-
-	* Evolution-Storage.idl (cancelDiscoverSharedFolder): New.
-
-2002-10-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-importer.c (choose_importer_from_list): Change the
-	selection mode to GTK_SELECTION_BROWSE so there is always a
-	selection.  The code here doesn't handle a NULL selection.
-	[#31690]
-
-	* e-shell-importer.c (import_cb): Only delay half a second
-	(instead of 5 seconds) when getting EVOLUTION_IMPORTER_NOT_READY
-	or EVOLUTION_IMPORTER_BUSY.
-
-	* importer/evolution-importer-listener.c
-	(impl_GNOME_Evolution_ImporterListener_notifyResult): Removed
-	debugging message.
-
-2002-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* e-shell-folder-selection-dialog.c (delete_event_cb): new
-	function, emit cancelled so the folder selector button will
-	sensitize the parent window again.
-	(e_shell_folder_selection_dialog_construct): connect the
-	delete_event signal.
-
-2002-09-30  Aaron Weber  <aaron@ximian.com>
-
-	* importer/import.glade: Import Assistant vs. Importer assistant.
-
-	* glade/evolution-startup-wizard.glade: setup/set up confusion in 15.
-
-2002-09-30  Dan Winship  <danw@ximian.com>
-
-	* e-shell-view-menu.c (command_remove_other_users_folder): Calls
-	e_shell_command_remove_shared_folder.
-	(file_verbs): Set up command_remove_other_users_folder.
-
-	* e-shell-folder-commands.c
-	(e_shell_command_remove_shared_folder): New. Calls
-	e_storage_set_async_remove_shared_folder with a callback to pop up
-	an error dialog if it fails.
-
-	* e-storage-set.c (e_storage_set_async_remove_shared_folder):
-	Implement. Mostly like async_remove_folder.
-
-	* e-storage.c (e_storage_supports_shared_folders,
-	e_storage_async_discover_shared_folder,
-	e_storage_async_remove_shared_folder): New methods. Default
-	implementations return FALSE, NOTIMPLEMENTED, and NOTIMPLEMENTED.
-
-	* e-corba-storage.c (supports_shared_folders,
-	async_discover_shared_folder, async_remove_shared_folder):
-	Implement using CORBA.
-
-	* Evolution-Storage.idl: add Storage_asyncRemoveSharedFolder
-
-	* e-shell-shared-folder-picker-dialog.c: Remove all the CORBA
-	stuff from here and use the new EStorage methods.
-	(setup_server_option_menu): Use e_storage_supports_shared_folders.
-	(discover_folder): Use e_storage_async_discover_shared_folder.
-
-	* evolution-storage.c (impl_Storage_asyncRemoveSharedFolder):
-	Implement this by emitting a REMOVE_SHARED_FOLDER signal.
-	(impl_Storage_asyncDiscoverSharedFolder): Make the
-	DISCOVER_SHARED_FOLDER signal put the Bonobo_Listener first like
-	all the other signals do.
-	(class_init): Set up REMOVE_SHARED_FOLDER signal.
-
-2002-09-30  Dan Winship  <danw@ximian.com>
-
-	* evolution-folder-selector-button.c (clicked): If we return from
-	evolution_shell_client_user_select_folder to find that our parent
-	window has been destroyed, unref it and bail out, since that means
-	we've been destroyed (and probably finalized) too. #31360
-
-2002-09-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (load_folder): Always return TRUE, even in the
-	unknown-type case.
-
-2002-09-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-shell-importer.c (importer_file_page_new): set history_id on
-	GnomeFileEntry, to actually get the history.
-
-2002-09-25  Dan Winship  <danw@ximian.com>
-
-	* e-shell-folder-selection-dialog.c (check_folder_type_valid):
-	If one of the allowed types is "type/*", allow anything starting
-	with "type/". 
-	(impl_clicked): If the first allowed type is "type/*", pass "type"
-	to e_shell_show_folder_creation_dialog.
-
-	* evolution-folder-selector-button.c
-	(evolution_folder_selector_button_set_uri): Handle "type/*" as an
-	allowed type.
-
-	* e-shell-settings-dialog.c (e_shell_settings_dialog_show_type):
-	If there are no pages for the current folder type, try the parent
-	type (eg, "mail" for "mail/public").
-
-	* e-shell-config-autocompletion.c
-	(e_shell_config_autocompletion_create_widget): Use "contacts/*" as
-	the allowed folder type.
-
-2002-09-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Finish fixing #11645.]
-
-	* e-shell-folder-commands.c (xfer_result_callback): Don't update
-	the shortcuts here anymore since now the shell takes care of it.
-
-	* e-shell.c (storage_set_moved_folder_callback): New callback for
-	EStorageSetView::folder_moved; update the shortcuts.
-	(e_shell_construct): Connect.
-
-	* e-storage-set.c: Renamed StorageConverterCallbackData to
-	StorageCallbackData.  New members destination_folder,
-	source_folder, operation in it.
-	(class_init): Install "moved_folder" signal.
-	(storage_callback_data_new): Renamed from
-	storage_converter_callback_data_new.
-	(storage_callback_data_free): New.
-	(storage_callback): Renamed from storage_callback_converter.  Use
-	storage_callback_data_free().
-	(e_storage_set_async_create_folder): Updated to use the
-	storage_callback and storage_callback_data_new().
-	(e_storage_set_async_remove_folder): Likewise.
-	(e_storage_set_async_xfer_folder): Likewise.
-
-	* e-storage-set.h: New signal "moved_folder".
-
-2002-09-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #11645 for menu-based folder move operations.  Still requires
-	fixage for the DnD case.]
-
-	* e-shell-view-menu.c (launch_pilot_settings): Placate compiler.
-
-	* e-shell-folder-commands.c (xfer_result_callback): When
-	FOLDER_COMMAND_MOVE, update the shortcuts by using
-	e_shortcuts_update_shortcuts_for_changed_uri().
-
-	* e-shortcuts.c (e_shortcuts_update_shortcuts_for_changed_uri):
-	New.
-
-2002-09-24  Dan Winship  <danw@ximian.com>
-
-	* e-shell.c (folder_selection_dialog_folder_selected_cb): Don't
-	destroy the dialog. It does that itself whenever it emits
-	folder_selected.
-
-	* e-shell-folder-selection-dialog.c (double_click_cb): Don't close
-	the dialog if the user double-clicks a bad folder. Just ignore it
-	(like we do when they click OK on a bad folder).
-
-2002-09-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#14019]
-
-	* e-shell-view-menu.c: Add PilotConduitSettings verb.
-	(command_pilot_conduit_settings): Implementation for the verb.
-	(launch_pilot_settings): Helper function.
-
-2002-09-24  Mike Kestner  <mkestner@ximian.com>
-
-	* e-storage-set-view.c (e_storage_set_enable_search): Use the new
-	e_tree_set_search_column function instead of my lameass sort hack.
-
-2002-09-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_construct): Oops, no @shell argument to
-	e_shell_startup_wizard_create().
-
-2002-09-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#28317]
-
-	* e-shell-view-menu.c (command_close): Use
-	e_shell_request_close_view().
-
-	* e-shell.c (e_shell_request_close_view): New, code moved out of
-	view_delete_event_cb().
-	(view_delete_event_cb): Use it.
-
-2002-09-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #16556.]
-
-	* e-shell.c (e_shell_construct): Pass self to
-	e_shell_startup_wizard_create.
-
-	* e-shell-startup-wizard.c (e_shell_startup_wizard_create): Get a
-	shell argument.  Set the shell interactive when doing the start-up
-	wizard thing.
-
-	* e-shell.c (e_shell_set_interactive): New.
-
-2002-09-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-creation-dialog.c (get_type_from_parent_path):
-	Return "mail" instead of NULL when we don't have a parent folder.
-	[#28232]
-
-2002-09-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-about-box.c: Added some missing names.
-
-	* main.c (main): Declare --force-upgrade correctly so it works.
-
-2002-09-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (class_init): Use PARENT_TYPE instead of
-	e_tree_get_type().
-
-2002-09-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c: Removed member sort_idle_id in
-	EStorageSetViewPrivate.
-	(resort): Removed.
-	(sort_traverse_callback): Removed.
-	(sort_idle_callback): Removed.
-	(queue_resort): Removed.
-	(impl_destroy): Removed.
-	(folder_name_changed_cb): Sort now instead of queueing a resort.
-
-2002-09-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #28495 with a lame hack that works around Bonobo sizing
-	brokenness]
-
-	* e-shell-settings-dialog.c (set_dialog_size): New.
-	(impl_realize): Override for GtkWidget::realize; invoke
-	set_dialog_size() to set a minimum size.
-	(class_init): Install.
-
-2002-09-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-creation-dialog.c (async_create_cb): Don't set
-	the current folder for E_STORAGE_EXISTS.  [#30533]
-
-2002-09-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-storage.c (evolution_storage_update_folder): Do not
-	stop propagating the notification to the listeners if
-	::notifyFolderUpdate() fails.  [#27662 (?)]
-
-2002-09-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (resort): New.
-	(sort_idle_callback): Use it.
-	(insert_storages): Use resort() instead of queue_resort() so we
-	sort immediately.
-
-2002-09-18  Mike Kestner  <mkestner@ximian.com>
-
-	* e-storage-set-view.c (etree_value_at): bandaid for 30248.
-
-2002-09-18  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-wizard.c (impl_GNOME_Evolution_Wizard_notifyAction):
-	Allow 'back' to run if we're on the finish page.  For #29293.
-
-2002-09-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage.c (e_storage_result_to_string): Add description for
-	E_STORAGE_NOTONLINE.
-
-	* e-corba-storage.c
-	(e_corba_storage_corba_result_to_storage_result): Support
-	GNOME_Evolution_Storage_NOT_ONLINE (E_STORAGE_NOTONLINE).
-
-	* Evolution-Storage.idl: Add NOT_ONLINE to enum Result.
-
-	* e-storage.h: Add E_STORAGE_NOTONLINE to EStorageResult enum.
-
-2002-09-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (sort_idle_callback): Remove unused
-	variable.
-
-	* e-shell-view.c (shell_line_status_changed_cb): Make Send/Receive
-	insensitive when in offline mode.  [#27855]
-
-2002-09-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #28451.]
-
-	* e-storage-set-view.c: New member sort_idle_id in
-	EStorageSetViewPrivate.
-	(init): Init to zero.
-	(impl_destroy): Remove the idle source if not zero.
-	(queue_resort): New.
-	(sort_idle_callback): Idle function to sort.
-	(setup_folder_changed_callback): New.
-	(new_folder_cb): Call it on the new folder so we get the callback
-	for new folders too.
-	(popup_folder_menu): Ref the folder before popping up the menu,
-	unref it after popping it down [the folder might be unreffed in
-	gnome_popup_menu_do_popup_modal() because of a folder action].
-	(new_storage_cb): Just queue_resort() instead of sorting.
-	(new_folder_cb): Likewise.
-	(insert_folders): Likewise.
-	(insert_storages): Likewise.
-	(folder_changed_cb): Queue a resort here too.
-
-	* e-folder.c (class_init): Set up "name_changed" signal.
-	(e_folder_set_name): Emit "name_changed".
-
-	* e-folder.h: New signal "name_changed".
-
-2002-09-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-shell-settings-dialog.c (page_new): Invoke gettext on 
-	strings coming from the .oaf files.
-	
-2002-09-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c: Remove some leftover junk.
-
-2002-09-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-folder-list.c (create_display_string): Mark a string for
-	translation.
-
-	* evolution-folder-selection-button.c (set_folder): Same here.
-	
-2002-09-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage.c (e_storage_removed_folder): When a highlighted
-	folder gets removed, update the parent to not have a highlight.
-	[#24062]
-
-2002-09-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-nognome.in: New script to run Evolution under a
-	non-GNOME session when using a non-default GNOME prefix and a
-	non-default Evolution prefix.
-
-2002-09-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-setup.c (setup_bonobo_conf_private_directory): g_free() not
-	free(), since we allocate with glib functions.  [#19899]
-
-2002-09-05  Mike Kestner  <mkestner@ximian.com>
-
-	* Makefile.am : no longer distribute the etstate files.
-	* e-shell-folder-selection-dialog.c : enable_search on the view.
-	* e-storage-set-view.c : add search_enabled flag handling.
-	(e_storage_set_view_set_show_checkboxes): manipulate the existing state
-	instead of loading a state file from disk.
-	(e_storage_set_view_enable_search): new. set a column in the sort_info
-	on the etree to allow keystroke jumping in the etree.
-	
-2002-09-05  Anna Marie Dirks  <anna@ximian.com>
-
-	* GNOME_Evolution_Shell.oaf.in : Changed the description
-	of the folders page in the settings dialog to be more specific.
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (INCLUDES): Add a -DPREFIX.
-
-	* main.c (main): New command-line option "force-upgrade".
-	(show_development_warning): Suggest 1.0.8, not 1.0.5.
-	(upgrade_from_1_0_if_needed): New.
-	(idle_cb): Call it.
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (new_folder_cb): Pass FALSE as @queue to
-	e_shell_view_display_uri() here.
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_get_current_component_id): If the
-	current_folder_type is NULL, just return NULL instead of passing
-	it to e_folder_type_registry_get_handler_for_type() [and generate
-	a warning].  [#21122]
-
-2002-09-04  Dan Winship  <danw@ximian.com>
-
-	* glade/e-shell-shared-folder-picker-dialog.glade: Remove the
-	"blah blah" text for now and change "Server" to "Account".
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (create_view): Pass TRUE as @queue to
-	e_shell_view_display_uri().
-
-	* e-shell-view-menu.c (command_activate_view): Pass TRUE as @queue
-	to e_shell_view_display_uri().
-	(goto_folder_dialog_folder_selected_cb): Likewise.
-
-	* e-shell-shared-folder-picker-dialog.c
-	(shared_folder_discovery_listener_callback): Pass TRUE as @queue
-	to e_shell_view_display_uri().
-
-	* e-shell-view.c
-	(display_uri): New arg @queue.  If true, it allows the
-	delayed_selection mechanism to happen transparently (returning
-	TRUE, while before it used to return FALSE).  Otherwise, refuse to
-	queue the URI and return FALSE.
-	(e_shell_view_display_uri): New arg @queue; pass it to
-	display_uri().
-	(handle_current_folder_removed): Pass TRUE as @queue to
-	e_shell_view_display_uri().
-	(set_folder_timeout): Likewise.
-	(switch_on_folder_tree_click): Likewise.
-	(activate_shortcut_cb): Likewise.
-	(corba_interface_change_current_view_cb): Likewise.
-	(socket_destroy_cb): Likewise.
-	(socket_destroy_cb): Likewise.
-	(e_shell_view_load_settings): Here, try displaying the old URI
-	with @queue set to FALSE; if this fails, display the default URI
-	and then invoke display again using @queue = TRUE so it gets
-	queued up.  This should fix #27721.
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (idle_cb): Pass FALSE as @restore_all_views to
-	e_shell_restore_from_settings() so we only restore the first view.
-
-	* e-shell.c (e_shell_restore_from_settings): New arg
-	@restore_all_views.
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (popup_folder_menu): Remove the context
-	menu items using
-	evolution_shell_component_client_unpopulate_folder_context_menu()
-	instead of doing it ourself, since BonoboUI sucks.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_unpopulate_folder_context_menu):
-	New.
-
-	* evolution-test-component.c (register_component): Pass NULL as
-	@unpopulate_folder_context_menu_fn to
-	evolution_shell_component_new().
-
-	* evolution-shell-component.c: New member
-	unpopulate_folder_context_menu_fn in
-	EvolutionShellComponentPrivate.  New member uic in
-	EvolutionShellComponentPrivate.
-	(init): Init new members to NULL.
-	(destroy): bonobo_object_unref() priv->uic if not NULL.
-	(evolution_shell_component_new): New arg
-	@unpopulate_folder_context_menu_fn.
-	(evolution_shell_component_construct): Likewise.
-	(impl_populateFolderContextMenu): Set priv->uic to the newly
-	created UIComponent.
-	(impl_unpopulateFolderContextMenu): New, implementation for the
-	::unpopulateFolderContextMenu CORBA method.
-	(class_init): Install.
-
-	* Evolution-ShellComponent.idl (unpopulateFolderContextMenu): New
-	method.
-	(AlreadyPopulated): New exception.
-	(populateFolderContextMenu): Can raise it.
-	(NotPopulated): New exception.
-
-2002-09-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (popup_folder_menu): Create an Items
-	placeholder under ComponentPlaceholder, and then
-	bonobo_ui_component_rm() it after we are done with the menu.  This
-	-should- fix #29782, but it doesn't.  I am not sure why.
-
-	* evolution-shell-component.h
-	(EVOLUTION_SHELL_COMPONENT_POPUP_PLACEHOLDER): Append a "/Items"
-	part.
-
-2002-09-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-importer.c (show_import_wizard): Make the WM close
-	button in the dialog hide instead of destroying, using
-	gnome_dialog_close_hides().  [#15572]
-
-2002-08-28  Dan Winship  <danw@ximian.com>
-
-	* e-shell.c (setup_components): Pass a selection_order to
-	oaf_query so we get the components back in a consistent order.
-	Hack fix for #28490 for 1.2 by ensuring that Connector gets
-	started before evolution-mail.
-	(get_icon_path_for_component_info): Rename the oaf icon name
-	property to use underscores to match the launch order property
-	(which needs to use underscores because dashes are interpreted as
-	subtraction in the selection_order context).
-
-2002-08-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view.c (get_shortcut_info): Make sure
-	*custom_icon_name_return is at least set to NULL on return [it
-	used to leave it uninitialized if the URI was not prefixed with
-	E_SHELL_URI_PREFIX].  Also use e_shell_parse_uri() to parse the
-	URI so we handle the default shortcuts properly, too.
-
-2002-08-19  Dan Winship  <danw@ximian.com>
-
-	* e-shell-shared-folder-picker-dialog.c (show_dialog): Get the
-	"addresses" property of the select names control rather than
-	"text", so we get the email address too. #28953
-
-	* e-folder-type-registry.c
-	(e_folder_type_registry_type_registered,
-	e_folder_type_registry_unregister_type): Fix the names of these
-	functions. (They previously used "register" instead of
-	"registry".)
-
-	* e-component-registry.c (register_type): Update for renaming
-
-	* e-local-storage.c (load_folder): Likewise
-
-2002-08-16  Dan Winship  <danw@ximian.com>
-
-	* evolution-folder-selector-button.c
-	(evolution_folder_selector_button_set_uri): If the selected URI is
-	of an invalid type, don't accept it.
-	(evolution_folder_selector_button_get_folder): Returns the
-	selected folder.
-	(various): updates to support get_folder, and to simplify.
-
-2002-08-09  Dan Winship  <danw@ximian.com>
-
-	* e-shell-shared-folder-picker-dialog.c (create_progress_dialog):
-	Remove both timeouts when the dialog is destroyed, not just one of
-	them.
-	(shared_folder_discovery_listener_callback): Don't try to access
-	fields of discovery_data after destroying it. Interpret the result
-	argument correctly, and put up an error dialog (using
-	e_corba_storage_corba_result_to_storage_result and
-	e_storage_result_to_string) if something went wrong.
-
-	* e-corba-storage.c
-	(e_corba_storage_corba_result_to_storage_result): convert a
-	GNOME_Evolution_Storage_Result to an EStorageResult.
-	(async_folder_cb): Use that.
-
-2002-08-06  Dan Winship  <danw@ximian.com>
-
-	* e-storage-set-view.c (folder_property_item_verb_callback): Don't
-	include the storage name in the path passed to
-	e_corba_storage_show_folder_properties, for consistency with the
-	other EStorage methods.
-
-2002-08-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c
-	(storage_show_folder_properties_callback): New callback for the
-	show_folder_properties signal.
-	(setup_custom_storage): Add two property items, and connect the
-	callback to the signal.
-
-	* e-storage-set-view.c: Renamed private member container into
-	ui_container; new member ui_component.
-	(init): Initialize ui_component to NULL.
-	(impl_destroy): Unref if not NULL.
-	(e_storage_set_view_construct): If @ui_container is not NULL,
-	weakref it and create a new ui_component that uses it as its
-	container.
-	(ui_container_destroy_notify): New, weakref destroy callback for
-	priv->ui_container.
-	(remove_property_items): New helper function.
-	(setup_folder_properties_items_if_corba_storage_clicked): New
-	helper function.
-	(folder_property_item_verb_callback): New callback for the verbs
-	associated to the folder property items.
-	(popup_folder_menu): Set up the per-storage folder property items
-	using setup_folder_properties_items_if_corba_storage_clicked() and
-	remove them with remove_property_items() after the menu has been
-	popped down.  Don't invoke populate_folder_context_menu if there
-	is no handler for this node [this avoids a spurious warning].
-
-	* e-corba-storage.c (e_corba_storage_show_folder_properties): New.
-	(e_corba_storage_get_folder_property_items): New.
-	(e_corba_storage_free_property_items_list): New.
-
-	* evolution-storage.c: New private member folder_property_items.
-	(init): Init to NULL.
-	(destroy): Free.
-	(impl_showFolderProperties): New, implementation for the
-	Storage::showFolderProperties CORBA method.
-	(class_init): Set up the "show_folder_properties" signal here.
-	(impl_Storage__get_propertyItems): New, getter for the
-	Storage::propertyItems property.
-	(corba_class_init): Install the new methods.
-	(evolution_storage_add_property_item): New function to add
-	property items to the storage.
-
-	* evolution-storage.h: New signal show_folder_properties.
-
-	* e-storage-set.c (e_storage_set_create_new_view): Renamed from
-	e_storage_set_new_view().
-
-	* Evolution-Storage.idl: Added attribute folderPropertyItems and
-	method ::showFolderProperties.
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-gray-bar.c (endarken_style): Set the color for
-	GTK_STATE_INSENSITIVE too so it doesn't look ugly when we quit.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view.c (create_default_shortcuts_cb): New, implement
-	a right-click -> "Add Default Shortcuts" menu item.
-	(rename_group_cb): Remove double casts.  *lol*
-
-	* e-shortcuts.c (e_shortcuts_add_default_shortcuts): New.
-	(e_shortcuts_add_default_group): Use
-	e_shortcuts_add_default_shortcuts().
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-user-creatable-items-handler.c (ensure_menu_items):
-	Don't sort the menu_items here.
-	(create_menu_xml): Instead, sort here, and only sort the
-	non-default section of the menu.
-	(get_default_action_for_view): Just get the first item that is
-	default; since we don't sort anymore, this works.
-	(find_menu_item_for_verb): Removed since it is not used anymore.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c (register_component): Pass NULL for
-	@folder_type to
-	evolution_shell_component_add_user_creatable_item().
-
-	* e-shell-user-creatable-items-handler.c: New member folder_type
-	in struct MenuItem.
-	(ensure_menu_items): Initialize ->folder_type.
-	(item_is_default): New helper function.
-	(create_menu_xml): New arg @folder_type.  Put the items on the top
-	using item_is_default().
-	(shell_view_view_changed_callback): Pass the folder type to
-	create_menu_xml().
-
-	* evolution-shell-component.c: New member folder_type in
-	UserCreatableItemType.
-	(user_creatable_item_type_new): New arg @folder_type.
-	(user_creatable_item_type_free): Free ->folder_type.
-	(evolution_shell_component_add_user_creatable_item): New arg
-	@folder_type.
-	(impl__get_userCreatableItemTypes): Set ->folderType in the
-	returned CORBA structs.
-
-	* Evolution-ShellComponent.idl: New member folderType in struct
-	UserCreatableItemType.
-
-	* e-shell-user-creatable-items-handler.c: New member component_id
-	in struct MenuItem.  Removed member menu_xml from
-	EShellUserCreatableItemsHandlerPrivate.
-	(init): No need to initialize menu_xml here anymore.
-	(impl_destroy): ...And no need to free here, either.
-	(setup_menu_xml): New, derived from ensure_menu_xml().  This
-	orders the menu so that the items for the current component go at
-	the top.
-	(create_menu_xml): Removed.
-	(e_shell_user_creatable_items_handler_attach_menus): Set up
-	properly for the current component ID, using setup_menu_xml().
-
-2002-07-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-folder-selector-button.c
-	(evolution_folder_selector_button_set_uri): New function to set
-	the uri programatically on a EvolutionFolderSelectorButton dingus.
-
-2002-07-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (command_new_shortcut): Capitalize the title
-	of the dialog for consistency.
-
-	* e-shell-folder-creation-dialog.c (setup_dialog): Don't prepend
-	the window's title with "Evolution -" since we don't do that
-	anywhere else.  Also capitalize properly.
-
-2002-07-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-user-creatable-items-handler.c (ensure_menu_xml): Put in
-	the ComponentItems placeholder, instead of NewItems.
-
-2002-07-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (load_all_folders): Don't return FALSE if any
-	of the folders fails to load; otherwise, if the user has played
-	with ~/evolution, he might end up not seeing any folders at all.
-
-2002-07-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (command_work_online): Remove debugging
-	message.
-	(command_work_offline): Likewise.
-
-2002-07-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-selection-dialog.c (double_click_cb): Renamed
-	from `dbl_click_cb'.
-	(check_folder_type): Don't pop up an error dialog anymore.
-	(check_folder_type_valid): Renamed from check_folder_type().
-	(folder_selected_cb): Make the OK button sensitive only if the
-	type of the selected folder is in the list of valid types;
-	otherwise, make it insensitive.  [#848]
-
-2002-07-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-shell-importer.c (start_import): removed check for local folders,
-	so that we can import into non-local ones.
-
-2002-07-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-storage-set-view.c
-	(impl_StorageSetView__set_checkedFolders): Removed unused
-	variable.
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
-	Removed unused variable.
-
-	Mass-replaced G_DIR_SEPARATOR and G_DIR_SEPARATOR_S with
-	E_PATH_SEPARATOR and E_PATH_SEPARATOR_S:
-
-		* e-storage.c
-			(e_storage_path_is_absolute)
-			(e_storage_path_is_relative)
-			(e_storage_async_xfer_folder)
-		* e-storage-set.c
-			(make_full_path)
-			(get_storage_for_path) 
-			(signal_new_folder_for_all_folders_under_paths) 
-			(signal_new_folder_for_all_folders_in_storage) 
-			(e_storage_set_get_path_for_physical_uri)
-		* e-storage-set-view.c
-			(storage_sort_callback)
-			(new_storage_cb) 
-			(removed_storage_cb)
-			(new_folder_cb)
-		* e-shortcuts-view.c
-			(get_shortcut_info)
-		* e-shell-view.c
-			(handle_current_folder_removed) 
-		* e-shell-utils.c
-			(e_shell_folder_name_is_valid)
-		* e-local-storage.c
-			(construct)
-		* e-folder-tree.c
-			(get_parent_path)
-			(get_parent_path)
-			(e_folder_tree_destroy)
-			(e_folder_tree_add)
-			(e_folder_tree_foreach)
-		* e-folder-dnd-bridge.c
-			(handle_data_received_path)
-		* evolution-storage.c
-			(make_full_uri)
-
-	* e-shell-constants.h: New #defines E_PATH_SEPARATOR and
-	E_PATH_SEPARATOR_S.
-
-	* e-local-storage.c (load_folder): Don't add the folder if its
-	type isn't registered.
-
-2002-07-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view-model.c (get_icon_for_item): Get the
-	EStorageSet from the shortcut's shell since there is no
-	e_shortcuts_get_storage_set() anymore.
-	* e-shortcuts-view.c (get_shortcut_info): Likewise.
-	(impl_shortcut_drag_motion): Likewise.
-	(impl_shortcut_drag_data_received): Likewise.
-
-	* e-shell.c (e_shell_construct): e_shortcuts_new_from_file(), not
-	e_shortcuts_new() here.
-
-	* e-shortcuts.c: Removed members storage_set and
-	folder_type_registy in EShortcutsPrivate.  New member shell.
-	(init): Init to NULL.
-	(e_shortcuts_construct): Removed arg @storage_set and
-	@folder_type_registry, new arg @shell.
-	(e_shortcuts_new): Removed.
-	(e_shortcuts_new_from_file): New.
-	(impl_destroy): Renamed from destroy().
-	(e_shortcuts_get_storage_set): Removed.
-	(e_shortcuts_get_shell): New.
-	(load_shortcuts): Accept any URI that can be parsed (by
-	e_shell_parse_uri).
-
-	* e-shell.c (e_shell_parse_uri): New.
-
-	* e-shell-view.c (evolution_uri_for_default_uri): New.
-	(display_uri): Use it to determine the evolution: uri given a
-	default: uri.
-
-	* e-shell.c (impl_Shell_handleURI): Pass it over to
-	e_shell_create_view_from_uri_and_settings() even if it's an
-	E_SHELL_DEFAULTURI_PREFIX.
-	(handle_default_uri): Removed.
-
-2002-07-12  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am (INCLUDES): Add -I$(builddir)/libical/src/libical
-	for the generated ical.h (some headers rely on this because
-	they too get installed.)
- 
-2002-07-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-storage.c (impl_Storage_getFolderAtPath): no need to
-	convert the value returned by e_folder_tree_get_folder to a
-	GNOME_Evolution_Folder, since it already is, and duplicate it before
-	returning.
-
-2002-07-14  Chris Toshok  <toshok@ximian.com>
-
-	* e-shell.c (folder_selection_dialog_folder_selected_cb): set
-	corba_folder.customIconName so we don't crash.
-	(impl_Shell_selectUserFolder): remove the default_type parameter
-	to fix a compiler warning.
-
-2002-07-12  Dan Winship  <danw@ximian.com>
-
-	* evolution-storage.c (impl_Storage_asyncDiscoverSharedFolder):
-	dup the listener, for consistency with the other signals
-
-2002-07-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-folder-selector-button.c (clicked): Ref the
-	parent_window and then unref after you are done using it.
-	[#27673]
-
-2002-07-12  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am (eshellinclude_HEADERS): Install some headers
-	that weren't getting installed.
-
-2002-07-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_set_icon):
-	Allow a NULL icon [remove the precondition].
-
-	* e-shell-view.c (update_folder_title_bar): Only unref the
-	folder_icon if not NULL.
-
-2002-07-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-storage-set-view.c
-	(impl_StorageSetView__set_checkedFolders): Handle
-	Folder.evolutionUri as a URI, not as a path.  Also use
-	e_free_string_list().
-
-2002-07-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (update_folder_title_bar): Ref the folder_icon
-	that we get from e_folder_type_registry_get_icon_for_type().
-
-2002-07-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-storage.c (get_folder_list_foreach): Copy
-	customIconName and sortingPriority in the new_corba_folder.
-	[#27670]
-
-2002-07-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-title-bar.c: Remove some `#if 0'ed broken code.
-	New members title_icon and title_button_icon in struct
-	EShellFolderTitleBarPrivate.  Remove member icon_widget.  New
-	static global variable empty_pixbuf.
-	(init): Initialize these new members to NULL.  Don't initialize
-	icon_widget anymore since it's gone.
-	(e_shell_folder_title_bar_construct): Create the title_button_icon
-	and pack it into the title_button_hbox.  Also, create the
-	title_icon and pack that one as well.  Retouched some of the
-	hardcoded padding values.
-	(size_allocate_icon): Rewritten to use the title_icon and return
-	the allocated space like size_allocate_navigation_buttons.
-	(e_shell_folder_title_bar_set_icon): Remove bogus const from the
-	@icon arg.  Ref the pixbuf, and update the two pixmap widgets from
-	it.  If @icon is NULL, use the empty_pixbuf.
-	(impl_destroy): Renamed from destroy().
-	(realize): Removed.
-	(unrealize): Removed.
-	(impl_size_allocate): Renamed from size_allocate().
-	(class_init): Call it.
-	(add_icon_widget): Removed.
-	(new_empty_pixbuf): New.
-	(new_empty_pixmap_widget): New.
-	(size_allocate_navigation_buttons_and_title_icon): Renamed from
-	size_allocate_navigation_buttons; set up the title_icon too.
-
-	* e-shell-view.c (update_folder_title_bar): Unref the folder_icon
-	after using it.
-
-	* e-icon-factory.c (e_icon_factory_get_icon): Ref the returned pixbuf.
-
-2002-07-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (update_folder_title_bar): Get a @folder arg
-	instead of a @type arg.  Use the custom icon if the folder has
-	one.
-	(update_for_current_uri): Updated accordingly.
-
-2002-07-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c (setup_custom_storage): Pass
-	@sorting_priority to evolution_storage_new_folder() so we test it.
-	Also make /FirstFolder have an "inbox" custom icon.
-
-	* e-local-storage.c (new_folder): Pass zero as @sorting_priority
-	to evolution_storage_new_folder().
-
-	* evolution-storage.c (evolution_storage_new_folder): New arg
-	@sorting_priority; put it in the CORBA folder struct.
-
-	* evolution-shell-client.c
-	(impl_FolderSelectionListener_selected): Copy the sortingPriority
-	as well.
-
-	* e-folder.c (e_folder_to_corba): Set sortingPriority.
-
-	* e-corba-storage-registry.c
-	(impl_StorageRegistry_getFolderByUri): Set sortingPriority in the
-	new CORBA Folder struct.
-
-	* e-corba-storage.c (impl_StorageListener_notifyFolderCreated):
-	Set the custom_icon if folder->customIconName is not an empty
-	string.  Likewise, set the sorting_priority
-
-	* Evolution-common.idl: New member sortingPriority in struct
-	Folder.
-
-	* e-storage-set-view.c (folder_sort_callback): Sort according to
-	the sorting_priorities.
-
-	* e-folder.c: New member sorting_priority in EFolderPrivate.
-	(init): Init to zero.
-	(e_folder_set_custom_icon): Emit "changed" if required.
-	(e_folder_set_sorting_priority): New.
-
-2002-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-icon-factory.c (load_icon): Ooops.  Swapped the large/small
-	pixbufs here.  Also, plug a leak.
-
-2002-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c (setup_custom_storage): Pass NULL for
-	@custom_icon_name to evolution_storage_new_folder().
-
-	* e-local-storage.c (new_folder): Pass the custom_icon_name here
-	to evolution_storage_new_folder().
-
-	* evolution-shell-client.c
-	(impl_FolderSelectionListener_selected): Set customIconName here
-	too.
-
-	* e-folder.c (e_folder_to_corba): Set customIconName too.
-
-	* e-corba-storage-registry.c
-	(impl_StorageRegistry_getFolderByUri): Set customIconName.  Also,
-	use e_safe_corba_string() to clean up the code a bit.
-
-	* evolution-storage.c (evolution_storage_new_folder): New arg
-	@custom_icon_name.
-
-	* Evolution-common.idl: New member customIconName in struct
-	Folder.
-
-2002-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view-model.c (get_icon_for_item): If the
-	custom_icon_name is not NULL, return the pixbuf for it.
-
-	* e-storage-set-view.c: #include "e-icon-factory.h".
-
-	* e-shortcuts-view.c (impl_shortcut_dropped): Pass the
-	custom_icon_name.
-	(get_shortcut_info): New arg @custom_icon_name_return.
-	(rename_shortcut_cb): Pass the custom_icon_name here.
-
-	* e-shell-view-menu.c (new_shortcut_dialog_folder_selected_cb):
-	Pass the custom_icon_name for the folder's shortcut.
-
-	* e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar):
-	Pass the custom_icon_name for the folder's shortcut.
-
-	* e-corba-shortcuts.c (impl_add): Use the customIconName member in
-	struct ::Shortcuts::Shortcut.
-	(shorcut_list_to_corba): Set the customIconName member on the
-	returned shortcuts.
-	(impl_get): Likewise.
-
-	* Evolution-Shortcuts.idl: New member customIconName in struct
-	Shortcut.
-
-	* e-shortcuts.c (shortcut_item_new): New arg @custom_icon_name;
-	initialize the member in EShortcutItem from it.
-	(shortcut_item_update): New arg @custom_icon_name; set the
-	custom_icon_name from it.  Also remove some braindeadness from
-	this code.
-	(update_shortcut_and_emit_signal): New arg @custom_icon_name.
-	(load_shortcuts): Load the custom icon name from the XML
-	[eg. <item name="foo" type="mail" icon="inbox">].
-	(save_shortcuts): Save the custom icon name in the XML.
-	(e_shortcuts_add_shortcut): New arg @custom_icon_name.
-	(update_shortcuts_by_path): Pass the custom_icon_name to
-	update_shortcut_and_emit_signal().
-	(e_shortcuts_update_shortcut): New arg @custom_icon_name; pass it
-	to update_shortcut_and_emit_signal().
-	(e_shortcuts_add_default_group): Pass "inbox" as the
-	custom_icon_name for the inbox shortcut, and NULL for the other
-	shortcuts.
-
-	* e-shortcuts.h: New member custom_icon_name in EShortcutItem.
-
-2002-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view.c (impl_shortcut_drag_motion): Remove debugging
-	message.
-	(impl_shortcut_drag_motion): Likewise.
-
-	* e-local-storage.c (remove_folder_step): Remove debugging message.
-
-	* e-folder-dnd-bridge.c (e_folder_dnd_bridge_data_received):
-	Remove debugging message.
-
-2002-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (main): Call e_icon_factory_init().
-
-	* e-local-storage.c (setup_folder_as_stock): New arg @icon_name;
-	if not NULL, set up a custom icon for the folder.
-	(setup_stock_folders): Set up custom icons for inbox and outbox.
-
-	* e-storage-set-view.c (get_pixbuf_for_folder): If the folder has
-	a custom icon, return the custom icon.
-
-	* e-folder.c: New member custom_icon_name.
-	(init): Initialize to NULL.
-	(destroy): Free.
-	(e_folder_get_custom_icon): New.
-	(e_folder_set_custom_icon): New.
-
-	* e-icon-cache.c: New.
-	* e-icon-cache.h: New.
-
-2002-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (remove_folder): Remove unused variable.
-
-2002-07-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view.c (toggle_large_icons_cb): Change the group
-	icon size using e_shortcuts_set_group_uses_small_icons() instead
-	of changing it on the widget directly.
-	(toggle_small_icons_cb): Likewise.
-	(group_change_icon_size_callback): New, callback for the
-	"group_change_icon_size" signal on the EShortcuts object.
-	(e_shortcuts_view_construct): Connect.  Also, initialize the icon
-	sizes in the icon bars from the EShortcuts object.
-
-	* e-shell-view.c (e_shell_view_load_settings): Don't set the
-	shortcut group icon modes here anymore.
-
-	* e-shortcuts.c: New member use_small_icons in struct
-	ShortcutGroup.
-	(shortcut_group_new): Init to FALSE.
-	(e_shortcuts_set_group_uses_small_icons): New.
-	(e_shortcuts_get_group_uses_small_icons): New.
-	(class_init): Install "group_change_icon_size" signal.
-	(save_shortcuts): Save the icon size per-group
-	here, i.e. <group title="foo" icon_size="small">.
-	(load_shortcuts): Set the icon size from the group's definition
-	here.
-
-	* e-shortcuts.h: New signal "group_change_icon_size" in
-	EShortcutsClass.
-
-2002-07-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-folder.c (safe_corba_string_dup): New helper function.
-	(e_folder_to_corba): Use it here.
-
-	* Makefile.am (libeshell_la_SOURCES): Move e-folder.c here, from
-	evolution_SOURCES.
-	(eshellinclude_HEADERS): Likewise, move e-folder.h here.
-
-	* evolution-storage.c (impl_Storage_getFolderAtPath): New,
-	implementation for Evoluiton::Storage::getFolderAtPath.
-	(evolution_storage_get_epv): Install CORBA method here.
-
-	* Evolution-Storage.idl (getFolderAtPath): New method in
-	Evolution::Storage.
-
-2002-07-05  Ettore Perazzoli  <ettore@ximian.com>
-
- 	[Fix #22047, Crash after running the start-up wizard.  The patch
-	was applied a while ago to the evolution-1-0-branch but not on
-	the trunk.]
- 
-	* e-shell-startup-wizard.c (startup_wizard_cancel): Unref the
-	ETimezoneDialog.
-	(finish_func): Likewise.
-
-2002-07-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes #27354.]
-
-	* e-storage-set-view.c (impl_tree_drag_drop): Invoke
-	e_folder_dnd_bridge_drop().
-
-	* e-folder-dnd-bridge.c (find_matching_target_for_drag_context):
-	New arg @atom_return.  Return the GdkAtom associated with the type
-	through it.
-	(e_folder_dnd_bridge_drop): New.
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_show_settings): Don't set up the settings
-	dialog as a transient.  [#25776]
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (bonobo_interface_remove_folder_cb): Add
-	parameter @listener to match the signal's signature.  [#24413]
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-user-creatable-items-handler.c: New member tooltip in
-	struct MenuItem.
-	(ensure_menu_items): Initialize the tooltip member.
-	(shell_view_view_changed_callback): Set the tooltip for the "New"
-	button.
-	(ensure_menu_xml): Set up the tooltip here as well.
-
-	* evolution-shell-component.c: Add tooltip member to struct
-	UserCreatableItemType.
-	(user_creatable_item_type_new): New arg @tooltip.
-	(evolution_shell_component_add_user_creatable_item): New arg
-	@tooltip.
-	(impl__get_userCreatableItemTypes): Put the tooltip in the struct
-	as well.
-
-	* e-shell-user-creatable-items-handler.c (setup_toolbar_button):
-	Create a GtkTooltips object and attach it to the combo_button
-	using gtk_object_set_data().
-	(shell_view_view_changed_callback): Set up a tooltip for the
-	button, according to the default.
-
-	* Evolution-ShellComponent.idl: Add a tooltip member to struct
-	UserCreatableItemType.
-
-2002-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_prepare_for_quit): Remove debugging message.
-
-	* e-shell-view.c (setup_verb_sensitivity_for_folder): Set
-	sensitivity of /commands/AddFolderToShortcutBar,
-	/commands/OpenFolder and /commands/OpenFolderInNewWindow too,
-	depending on whether the node that was right-clicked can be opened
-	as a folder.
-
-	* e-storage-set-view.c (popup_folder_menu): Pop up the right-click
-	menu even if we are not clicking on a folder with a proper
-	handler.
-
-2002-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c: New member preparing_to_quit in EShellPrivate.
-	(init): Initialize to FALSE.
-	(e_shell_prepare_for_quit): Set preparing_to_quit to TRUE on
-	entering, and set it to FALSE on return.
-	(view_delete_event_cb): Don't call e_shell_prepare_for_quit() if
-	preparing_for_quit is TRUE.
-
-2002-06-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-storage.c (impl_Storage_updateFolder): Don't stop
-	notifying the listeners if ::notifyFolderUpdated() fails.  Should
-	fix #25598.
-
-2002-06-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #10681, Incorrect behavior when deleting a hierarchy of local
-	folders.]
-
-	* e-local-storage.c: Change the ASyncRemoveFolderCallbackData
-	struct to have only storage and next_paths_to_delete members.
-	(remove_folder_step): New.
-	(component_async_remove_folder_callback): Start deletion for the
-	next path in next_paths_to_delete, so we handle recursion
-	properly.
-	(create_subfolder_list): New.
-	(remove_folder): Create the list with create_subfolder_list,
-	initialize the ASyncRemoveFolderCallbackData with the
-	next_paths_to_delete list and do the first deletion.  This way we
-	handle recursion properly.
-
-2002-06-26  Iain <iain@ximian.com>
-
-	* e-shell-importer.c (show_import_wizard): Only let the dialog be
-	opened once.
-
-2002-06-26  Iain <iain@ximian.com>
-
-	* Evolution-StorageSetView.idl: Add a notifyFolderToggled method,
-	allow checkedFolders to be writable.
-
-	* e-shell-importer.c (free_iid_list): Free the list of iid infos.
-	(get_name_from_component_info): Move this function from futher down
-	the file to here because it's useful.
-	(choose_importer_from_list): Present the user with a list of importer
-	names to select the one they want to use.
-	(get_iid_for_filetype): Store the name of the importer as well as the
-	iid in the list. If there are multiple matches, show the user a list.
-
-	* evolution-storage-set-view-listener.[ch]: Add a folder toggled signal.
-	(impl_GNOME_Evolution_StorageSetViewListener_notifyFolderToggled):
-	Notify listeners that a folder has been toggled.
-	(corba_class_init): Hook up the new method.
-	(class_init): Create the new signal.
-
-	* evolution-storage-set-view.c
-	(storage_set_view_widget_folder_toggled_cb): Call the CORBA method for 
-	each listener.
-	(impl_StorageSetView__set_checkedFolders): Set the checked folders
-	from the list.
-	(impl_StorageSetView__get_checkedFolders): Don't include blanks in the
-	list.
-	
-2002-06-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (remove_folder): Removed arg @physical_uri.
-
-	* e-shell-folder-selection-dialog.c (impl_clicked): Pass
-	default_type to e_shell_show_folder_creation_dialog() properly.
-	[Patch by Christian Kreibich <christian@whoop.org>.]
-
-2002-06-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-corba-config-page.h: Remove #include <config.h>
-	* e-shell-about-box.h: Same
-	* e-history.h: Same
-	* e-shell-importer.c: gtk_widget_show() all items in the optionmenu
-	before showing it.
-	* e-shell-offline-handler.h: Remove #include <config.h>
-	* e-shell-settings-dialog.h: Same.
-	
-2002-05-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-storage-set-view.c
-	(impl_StorageSetView__get_checkedFolders): Set release for the
-	CORBA path sequence to TRUE.
-
-	* evolution-shell-component.c
-	(fill_corba_sequence_from_null_terminated_string_array): Set
-	release for the CORBA sequence to TRUE so it gets freed properly.
-	(impl__get_externalUriSchemas): Likewise for the returned
-	uri_chema_list.
-
-	* e-shell-offline-handler.c (duplicate_connection_list): Set
-	release for the connection sequence to TRUE.
-
-	* e-shell-config-offline.c (config_control_apply_callback): Set
-	release for the path sequence to TRUE.
-
-	* e-corba-storage-registry.c
-	(impl_StorageRegistry_getStorageList): Set release for the storage
-	sequence to TRUE.
-
-	* evolution-storage.c (impl_Storage__get_folderList): Set release
-	for the folder sequence to TRUE.
-
-2002-05-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	[This fixes #25361.]
-
-	* e-folder-list.c (e_folder_list_construct): Use
-	bonobo_object_ref() instead of bonobo_object_client_ref() as the
-	former only refs the CORBA object [Sigh].
-
-	* e-shell-config-autocompletion.c
-	(e_shell_config_autocompletion_create_widget): Don't unref the
-	shell_client here, as we need it.  :-)
-
-2002-05-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (command_about_box): Connect
-	about_box_event_callback() to the "key_press_event" signal as
-	well.  This way the about box is closed when you press a key too.
-	[#25349]
-
-2002-05-28  Chris Toshok  <toshok@ximian.com>
-
-	* e-folder-list.c (e_folder_list_set_items): skip folders that
-	aren't valid uri's.
-	(e_folder_list_get_items): didn't update this to track the change
-	in model columns.  bad toshok.
-
-2002-05-24  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes 90% of #25047 ]
-	* e-folder-list.c (get_folder_for_uri): shamelessly lifted from
-	evolution-folder-selector-button.c.
-	(create_display_string): modeled again after
-	evolution-folder-selector-button.c, so we can give a little more
-	context (and make the table look like the folder selector
-	buttons.)
-	(SPEC): add a pixbuf column, also remove the sorting behavior.
-	(columns): add a pixbuf column and another string column (for the
-	display string).
-	(add_clicked): create the display string and get the proper
-	pixbuf, and insert both.
-	(edit_clicked): removed.
-	(update_buttons): remove edit button handling from here.
-	(e_folder_list_init): remove the hooking up of button-edit's
-	"clicked" signal.
-	(e_folder_list_construct): get a reference to the storage registry
-	so we can look up folders.
-	(e_folder_list_set_items): analogous change to add_clicked - get
-	the display string and pixbuf and insert them.
-
-	* glade/e-folder-list.glade: remove the edit button.
-
-	* glade/e-shell-config-default-folders.glade: remove the
-	frame/vbox,  since we embed it in a notebook and the tab has the
-	title already.
-
-	* e-shell-config.c (config_control_factory_cb): the only config
-	control we deal with here now is the folder settings control.
-
-	* e-shell-config-default-folders.c
-	(e_shell_config_default_folders_create_widget): rename
-	e_shell_config_default_folders_create_control to this, return the
-	widget, and take the config control to use as an arg.
-
-	* e-shell-config-offline.c (e_shell_config_offline_create_widget):
-	make an analogous change here as with
-	default_folders_create_widget.
-
-	* e-shell-config-default-folders.h
-	(e_shell_config_default_folders_create_widget): track change to
-	prototype.
-
-	* e-shell-config-offline.h (e_shell_config_offline_create_widget): same.
-
-	* GNOME_Evolution_Shell.oaf.in: remove the DefaultFolders and
-	OfflineFolders controls and add a FolderSettings_Control.
-
-	* Makefile.am (evolution_SOURCES): add
-	e-shell-config-folder-settings.[ch] and
-	e-shell-config-autocompletion.[ch].
-
-	* e-shell-config-folder-settings.[ch]: new files, embed (after a
-	fashion) the default folder, offline, and autocompletion UI's in a
-	notebook.
-
-	* e-shell-config-autocompletion.[ch]: Basically copy over and
-	shell-ize the addressbook autocompletion config control so it can
-	be embedded more easily with the other folder settings.
-
-2002-05-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (quit_box_new): Set @allow_shrink and @allow_grow to
-	FALSE for the window.  Fixes #17534.
-
-2002-05-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_construct): Pass FALSE for
-	@allow_shrink.  Fixes #15688.
-
-2002-05-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c (delete_dialog): Make a little bit
-	prettier.  Default to "Delete", not "Cancel".
-
-2002-05-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view.c (rename_group_cb): Set the view type from the
-	original group, thus preserving the small-icon/large-icon state.
-	Fixes #6732.
-
-2002-05-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (show_development_warning): Add a toggle to avoid
-	displaying the dialog again.  Don't display the dialog at all if
-	the /Shell/skip_warning_dialog_1_1 bonobo-conf key is set to
-	FALSE.
-	(warning_dialog_clicked_callback): Set
-	/Shell/skip_warning_dialog_1_1 according to the state of the check
-	button.
-
-2002-05-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (impl_Shell_selectUserFolder): No more @default_type
-	arg to e_shell_folder_selection_dialog_new().
-
-	* e-shell-view-menu.c (command_goto_folder): No more @default_type
-	arg to e_shell_folder_selection_dialog_new().
-	(command_new_shortcut): Likewise.
-
-	* e-shell-importer.c (import_druid_finish): No more @default_type
-	arg to e_shell_folder_selection_dialog_new().
-
-	* e-shell-folder-commands.c (e_shell_command_move_folder): No more
-	@default_type arg to e_shell_folder_selection_dialog_new().
-	(e_shell_command_copy_folder): Likewise.
-
-	* e-shell-folder-selection-dialog.c: Removed default_type member
-	in EShellFolderSelectionDialogPrivate.
-	(e_shell_folder_selection_dialog_new): Removed @default_type arg.
-	(e_shell_folder_selection_dialog_construct): Likewise.
-	(impl_clicked): Just pass the first of the allowed types to
-	e_shell_show_folder_creation_dialog() for the default type.
-
-	* evolution-shell-client.c (user_select_folder): No more
-	@default_type arg to the ::userSelectFolder CORBA method.
-
-	* Evolution-Shell.idl (selectUserFolder): Remove arg
-	@default_type.
-
-2002-05-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (view_map_callback): New callback for when the first
-	created view in the shell gets mapped.
-	(new_view_created_callback): New callback for when the first view
-	of the shell gets created.
-	(show_development_warning): New function to display a warning
-	about the fact that Evolution is unstable.
-	(idle_cb): Call show_development_warning() here unless the
-	EVOLVE_ME_HARDER environment variable is set.
-
-	* e-shell.c (class_init): Add the "new_view_created" signal here.
-	(create_view): Emit the signal here.
-
-	* e-shell.h: New signal "new_view_created".
-
-2002-05-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-user-creatable-items-handler.c: New member
-	default_menu_item in EShellUserCreatableItemsHandlerPrivate.
-	(ensure_menu_items): Set ->default_menu_item.
-	(get_default_action_for_view): When no default item is specified,
-	just return ->default_menu_item.
-
-2002-05-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_prepare_for_quit): Only refuse quitting if
-	the result is CANCEL.  This way we allow quitting if one of the
-	components has crashed or something else otherwise goes wrong.
-	Fixes #25093.
-
-	* evolution-shell-component-client.c
-	(result_from_async_corba_result): Handle
-	GNOME_Evolution_ShellComponentListener_CANCEL.
-
-2002-05-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-corba-storage.c (async_open_folder_idle): Do async_open_folder
-	in an idle callback.
-
-	* e-shell-shared-folder-picker-dialog.c (user_clicked),
-	glade/e-shell-shared-folder-picker-dialog.glade: Added a select
-	names button here.
-
-2002-05-20  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-folder-selector-button.c (clicked): set the parent
-	window insensitive before popping up the dialog and sensitive
-	after it's popped down, to give us semi-modal behavior.  Also,
-	emit a "popped_up" signal when popping up the dialog, and emit
-	"canceled" when the return folder is NULL (when the user canceled
-	the dialog).
-	(class_init): fix typo (?) - parent type isn't
-	bonobo_object_get_type(), it's PARENT_TYPE.  Also, initialize the
-	POPPED_UP and CANCELED signals.
-
-	* evolution-folder-selector-button.h (struct
-	_EvolutionFolderSelectorButtonClass): add popped_up and canceled
-	signals.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-offline-sync.c (sync_folder): Skip the folder if it
-	doesn't have the can_sync_offline property set.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-corba-storage.c (impl_StorageListener_notifyFolderCreated):
-	Set the can_sync_offline property on the EFolder based on the
-	canSyncOffline value on the CORBA folder.
-
-	* evolution-test-component.c (setup_custom_storage): Pass FALSE
-	for @sync_offline to evolution_storage_new_folder().
-
-	* e-local-storage.c (new_folder): Pass FALSE for @sync_offline to
-	evolution_storage_new_folder().
-
-	* evolution-storage.h (evolution_storage_new_folder): New arg
-	@can_sync_offline.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Evolution-Offline.idl (syncFolder): Remove exception.
-	(cancelSyncFolder): Remove exception.
-
-	* e-shell-config-offline.c (storage_set_view_has_checkbox_func):
-	New.
-	(e_shell_config_offline_create_control): Pass it as the
-	@has_checkbox_func.
-
-	* e-folder.c: New member can_sync_offline in EFolderPrivate.
-	(init): Init to FALSE.
-	(e_folder_get_can_sync_offline): New.
-	(e_folder_to_corba): Set canSyncOffline in the returned CORBA
-	folder.
-	(e_folder_set_physical_uri): Protect from when @physical_uri and
-	->physical_uri are the same thing.
-	(e_folder_set_description): Same here with description.
-	(e_folder_set_type_string): And type.
-
-	* Evolution-common.idl: New member canSyncOffline in struct
-	Folder.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-config-offline.c
-	(e_shell_config_offline_create_control): Pass NULL for
-	@has_checkbox_func and @has_checkbox_func_data.
-
-	* evolution-storage-set-view.c
-	(impl_StorageSetView__set_showCheckboxes): Pass NULL for
-	@has_checkbox_func and @has_checkbox_func_data.
-
-	* e-storage-set-view.c: New member has_checkbox_func and
-	has_checkbox_func_data in EStorageSetViewPrivate.
-	(init): Init to NULL.
-	(e_storage_set_view_set_show_checkboxes): New args
-	@has_checkbox_func and @func_data.
-	(has_checkbox): Always return FALSE for the toplevels.  For the
-	other ones return TRUE unless ->has_checkbox_func is not-NULL; in
-	which case, we use that function to determine whether the folder
-	is actually checkable.
-
-	* Evolution-ShellComponent.idl (requestQuit): Remove exception.
-
-2002-05-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (view_delete_event_cb): Ask e_shell_prepare_for_quit()
-	before destroying the view if it's the last one.
-
-	* e-shell-view-menu.c (command_close): Synthesize a delete_event
-	on the view instead of directly destroying it.
-
-2002-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (command_quit): Check with
-	e_shell_prepare_for_quit() before quitting.
-
-	* e-shell.c (e_shell_prepare_for_quit): New.
-
-	* evolution-test-component.c (request_quit_fn): New function
-	asking for confirmation to quit.
-
-	* evolution-shell-component.c (evolution_shell_component_new): New
-	arg @request_quit_fn.
-	(impl_requestQuit): New, implementation for
-	EvolutionShellComponent::requestQuit.
-	(evolution_shell_component_result_to_string): Handle
-	EVOLUTION_SHELL_COMPONENT_CANCEL.
-	(evolution_shell_component_client_request_quit): New.
-
-	* Evolution-ShellComponent.idl (requestQuit): New.
-
-2002-05-15  Iain <iain@ximian.com>
-
-	* e-corba-storage-registry.c (impl_StorageRegistry_addStorage): Remove
-	debuggin spew
-
-2002-05-15  Iain <iain@ximian.com>
-
-	* e-corba-storage-registry.c (impl_StorageRegistry_addStorage): Apply
-	patch from Peter Williams to notify listeners when a new storage is
-	created.
-
-2002-05-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-offline-handler.c
-	(e_shell_offline_handler_put_components_offline): Call
-	e_shell_offline_sync_all_folders() if no connection is reported
-	here.
-	(dialog_handle_ok): Sync all the folders here through
-	e_shell_offline_sync_all_folders().
-
-	* e-shell-offline-sync.c: New.
-	* e-shell-offline-sync.h: New.
-
-	* Evolution-Offline.idl (syncFolder): Make oneway.
-	(cancelSyncFolder): Likewise.
-	(SyncFolderProgressListener::reportSuccess): New method.
-
-2002-05-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am: Added check-empty.xpm, check-filled.xpm, and
-	check-missing.xpm.
-
-	* check-empty.xpm, check-filled.xpm, check-missing.xpm: New xpms.
-	Copied from gal.  check-missing.xpm is simply a transparent xpm of
-	the correct size.
-
-	* e-storage-set-view.c (etree_value_at): When getting, check if
-	the path doesn't have a check box and return 2 in that case.
-	(etree_set_value_at): Check if the path doesn't have a check box
-	and don't change it in that case.  Also, just invert the value
-	here instead of paying attention to the set value passed in.
-	(class_init): Initialize the checks GdkPixbufs.
-	(e_storage_set_view_construct): Create the "optional_checkbox"
-	cell.
-
-	* e-storage-set-view.etspec: Changed the cell for the checkbox
-	column to "optional_checkbox".
-
-2002-05-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-storage.c (evolution_storage_new_folder): Compute the
-	evolutionUri here and pass it in.
-
-2002-05-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-config-offline.c
-	(init_storage_set_view_status_from_config): Add a missing
-	CORBA_free in the case in which the typecode of the
-	/OfflineFolders/Paths key in the ConfigDatabase doesn't match the
-	expected type.
-
-2002-05-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_go_offline): Pass self to
-	e_shell_offline_handler_new() instead of the component registry.
-
-	* e-shell-offline-handler.c: Replace member `component_registry'
-	in EShellOfflineHandlerPrivate with a `shell' member.  Updated all
-	the code to retrieve the component registry from the shell instead
-	of directly.
-	(e_shell_offline_handler_construct): Get a @shell instead of a
-	@component_registry.
-
-2002-05-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (e_storage_set_view_get_checkboxes_list):
-	Changed this to just walk the hash table to get the list of
-	checked checkboxes instead of walking the tree.  (Makes it so that
-	checked paths will remain checked, even if they're not shown in
-	the tree when the list is gotten.)
-
-2002-05-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-config.c: Handle the e-shell-config-offline and
-	e-shell-config-default-folders pages.
-
-	* e-shell-config-offline.h: New.
-	* e-shell-config-offline.c: New.
-
-	* e-shell-config-default-folders.h: New.
-	* e-shell-config-default-folders.c: New.  Moved default folder
-	page configuration in from e-shell-config.c.
-
-	* GNOME_Evolution_Shell.oaf.in: Add
-	GNOME_Evolution_Shell_Config_OfflineFolders_Control.
-
-2002-05-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (etree_set_value_at): Added a signal when
-	the value of the checkboxes changes.
-
-2002-05-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-shared-folder-picker-dialog.c: Add members `parent' and
-	`shell' in DiscoveryData.
-	(shell_view_destroy_callback): Callback for destruction of
-	->parent; set ->parent to NULL.
-	(shell_destroy_callback): Callback for the desctruction of the
-	shell; clean up everything.
-	(discover_folder): Initialize ->parent and shell, and add the
-	corresponding destruction handlers.
-	(shared_folder_discovery_listener_callback): Open the discovered
-	folder.
-	(setup_progress_dialog): Renamed from `show_progress_dialog'.  Set
-	up a timeout for displaying the dialog instead of displaying it
-	right away.
-	(progress_dialog_show_timeout_callback): Callback for showing the
-	dialog after the callback.
-
-2002-05-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-shared-folder-picker-dialog.c
-	(shared_folder_discovery_listener_callback): Updated for
-	FolderResult instead of DiscoverSharedFolderResult.
-
-	* Evolution-Storage.idl: Remove struct DiscoverSharedFolderResult;
-	we want to just use FolderResult for asyncDiscoverSharedFolder.
-
-2002-05-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c: Added some tests for the custom
-	storage.
-
-	* evolution-storage.c: New signal DISCOVER_SHARED_FOLDER.
-	(impl_Storage_asyncXferFolder): Renamed from
-	impl_Storage_async_xfer_folder.
-	(impl_Storage_asyncRemoveFolder): Renamed from
-	impl_Storage_async_remove_folder.
-	(impl_Storage_asyncCreateFolder): Renamed from
-	impl_Storage_async_create_folder.
-	(impl_Storage_asyncOpenFolder): Renamed from
-	impl_storage_async_open_folder.
-	(impl_Storage_addListener): Renamed from
-	impl_Storage_add_listener.
-	(impl_Storage_removeListener): Renamed from
-	impl_Storage_remove_listener.
-	(impl_Storage_asyncDiscoverSharedFolder): New, implementation for
-	::asyncDiscoverSharedFolder.
-	(evolution_storage_get_epv): Install the CORBA method here.
-	(class_init): Set up the "discover_shared_folder" signal here.
-	(e_marshal_NONE__POINTER_POINTER): Yet Another Marshaller.  Die
-	die die.
-
-	* Evolution-Storage.idl (Storage::asyncDiscoverSharedFolder): New
-	method.
-	(StorageListener::notifySharedFolderDiscovered): New method.
-
-	* e-shell-shared-folder-picker-dialog.c: New.
-	* e-shell-shared-folder-picker-dialog.h: New.
-
-	* e-shell-view-menu.c (command_open_other_users_folder): New,
-	implementation for the FileOpenOtherUsersFolder verb.
-
-	* Makefile.am: Generate stubs and skels for
-	Evolution::Addressbook::SelectNames as well.
-
-	* glade/e-shell-shared-folder-picker-dialog.glade: New.
-
-2002-05-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (construct): Pass %FALSE as
-	@has_shared_folders to evolution_storage_new().
-
-	* evolution-storage.c: New member has_shared_folders in
-	EvolutionStoragePrivate.
-	(init): Initialize to FALSE.
-	(evolution_storage_new): New arg @has_shared_folders.
-	(evolution_storage_construct): Likewise.
-	(impl_Storage__get_folderList): Renamed from
-	impl_Storage__get_folder_list.
-	(impl_Storage__get_hasSharedFolders): New, implementation for
-	::hasSharedFolders.
-	(evolution_storage_get_epv): Install the CORBA method
-	implementation.
-
-	* Evolution-Storage.idl: Make Storage::name a readonly attribute.  New attribute Storage::
-
-2002-05-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Evolution-Offline.idl: Rename NotPrepared to notPrepared and
-	NotSyncing to notSyncing.
-
-	* evolution-storage.c (impl_Storage__get_folder_list): Renamed
-	from impl_Storage_get_folder_list().
-
-	* Evolution-Storage.idl: Don't typedef FolderList here.  Replace
-	`getFolderList' method with a readonly attribute.
-
-2002-05-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Evolution-Offline.idl: New interface SyncFolderProgressListener.
-	(Offline::cancelSyncFolder): New.
-	(Offline::syncFolder): New.
-
-2002-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-storage.c (get_folder_list_foreach): add every folder
-	to the sequence except the root folder
-	(impl_Storage_get_folder_list): implement corba method
-	(evolution_storage_get_epv): set new method implementation
-
-	* evolution-folder-selector-button.h: fix signal prototype
-
-	* e-folder-tree.h: new proto
-
-	* e-folder-tree.c (e_folder_tree_get_count): count nodes
-	(count_nodes): bump count foreach path
-
-	* e-corba-storage-registry.c
-	(impl_StorageRegistry_getStorageList): implement idl method
-	(corba_class_init): set epv method
-
-	* Evolution-Storage.idl: add getStorageList and getFolderList
-	methods
-
-2002-05-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c (create_new_folder_selector): Use the
-	new evolution_shell_client_create_storage_set_view() call.
-
-	* evolution-shell-client.c
-	(evolution_shell_client_create_storage_set_view): New.
-
-2002-05-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-storage-set-view-factory.c
-	(evolution_storage_set_view_factory_new_view): Put the
-	EStorageSetView in an EScrollFrame.
-
-	* e-shell.c (impl_Shell_createStorageSetView):
-	CORBA_Object_duplicate the object before returning.
-
-	* evolution-test-component.c
-	(create_new_folder_selector): New function to create a simple test
-	environment for the new checkbox-enabled StorageSetView.
-	(register_component): Add user-creatable type FolderSelector.
-	(user_create_new_item_callback): Handle FolderSelector.
-	(dialog_clicked_callback): Print out the checked items in the
-	folder selector.
-	(main): Print out a message before going into bonobo_main().
-
-	* evolution-storage-set-view.c
-	(impl_StorageSetView__get_showFolders): Renamed from
-	impl_StorageSetView__get_show_folders.
-	(impl_StorageSetView__set_showFolders): Renamed from
-	impl_StorageSetView__set_show_folders.
-	(impl_StorageSetView__set_showCheckboxes): New, write the
-	showCheckboxes CORBA attribute.
-	(impl_StorageSetView__get_showCheckboxes): New, read the
-	showCheckboxes CORBA attribute.
-	(impl_StorageSetView__get_checkedFolders): New, read the
-	checkedFolders CORBA attribute.
-	(corba_class_init): Install the new CORBA methods methods.
-
-	* e-storage-set-view.c (essv_add_to_list): strdup() the path.
-	(e_storage_set_view_get_storage_set): New.
-
-	* e-folder.c (e_folder_to_corba): New.
-
-	* Evolution-StorageSetView.idl: Add showCheckboxes and
-	checkedFolders attributes.
-
-	* Evolution-common.idl: Add typedef for FolderList.
-
-2002-05-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-folder-list.c: Use bonobo_object_client_(un)?ref instead of
-	gtk_object_(un)?ref.
-	(add_clicked): Don't pass NULL to
-	evolution_shell_client_user_select_folder.
-
-	* glade/Makefile.am: Added e-folder-list.glade
-
-	* glade/e-folder-list.glade: The glade file for e-folder-list.
-
-2002-05-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (eshellinclude_HEADERS): Added e-folder-list.h.
-	(libeshell_la_SOURCES): Added e-folder-list.c.
-
-	* e-folder-list.c, e-folder-list.h: New widget for editing a list
-	of folder uris.
-
-2002-04-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (e_storage_set_view_set_checkboxes_list,
-	e_storage_set_view_get_checkboxes_list): Added these functions.
-	Implemented checkboxes in the ETreeModel here.
-
-2002-04-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* glade/e-shell-config-default-folders.glade: Minor label tweaks;
-	changed "Default folders" to "Default Folders", and added
-	accelerators.
-
-2002-04-18  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-shell-view.c (impl_ShellView_show_settings): emit
-	show_settings signal
-	(corba_class_init): assign epv method
-	(class_init): add signal
-
-	* evolution-shell-view.h: new signal
-
-	* e-shell.c (init): init settings_dialog private member
-	(settings_dialog_destroy_cb): reset dialog pointer
-	(e_shell_show_settings): show the settings dialog, bring it to the
-	front if one already exists for this shell
-
-	* e-shell.h: new proto
-
-	* e-shell-view.c (corba_interface_show_settings): implement
-	showSettings method
-	(setup_corba_interface): listen for show_settings signal
-	(e_shell_view_show_settings): show the settings dialog
-
-	* e-shell-view.h: new proto
-
-	* e-shell-view-menu.c (command_settings): call
-	e_shell_view_show_settings instead
-
-	* Evolution-ShellView.idl: add showSettings method
-
-2002-04-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view.c (impl_shortcut_drag_motion): New, override
-	for EShortcutBar::shortcut_drag_motion.
-	(impl_shortcut_drag_data_received): New, override for
-	EShortcutBar::shortcut_drag_data_received.
-	(class_init): Install the method overrides.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-activity-handler.c: Updated this to match the new EPopupMenu.
-
-2002-04-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (handle_evolution_path_drag_motion):
-	Removed.
-	(impl_tree_drag_motion): Rewritten to use
-	`e_folder_dnd_bridge_motion()'.
-	(impl_tree_drag_data_received): Rewritten to use
-	`e_folder_dnd_bridge_data_received()'.
-	(convert_gdk_drag_action_to_corba): Removed.
-	(convert_corba_drag_action_to_gdk): Removed.
-	(find_matching_target_for_drag_context): Removed.
-
-	* e-folder-dnd-bridge.c: New.
-	* e-folder-dnd-bridge.h: New.
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* e-shell-config.c: Shell config page routines. Right now
-	handles the default folders page.
-
-	* glade/e-shell-config-default-folders.glade: New.
-
-	* GNOME_Evolution_Shell.oaf.in: Add info for the default folders
-	config page.
-
-	* main.c (idle_cb): If we successfully registered the shell,
-	register the config factory.
-
-	* evolution-shell-client.c (evolution_shell_client_new): Note the
-	fact that it frees the corba_shell when it is destroyed.
-
-	* evolution-folder-selector-button.c
-	(evolution_folder_selector_button_construct, destroy): Use
-	bonobo_object_ref/unref on the shell client, not gtk.
-
-	* e-shell.c (e_shell_construct): Pass local_directory to
-	e_setup_check_db.
-	(handle_default_uri): Fix the config db paths here to match the
-	other routines.
-
-	* e-setup.c (e_setup_check_db): Make this take the evolution
-	directory path as well so we can properly set up file: URIs for
-	the default folders.
-
-2002-04-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (idle_cb): Change the logic for displaying a default
-	window, so we don't end up with two windows all the time.
-
-2002-04-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch from Max Horn <max@quendi.de>.]
-
-	* e-local-storage.c: Move <dirent.h> down the #include list so it
-	compiles on Darwin.
-
-2002-04-09  Dan Winship  <danw@ximian.com>
-
-	* e-setup.c (e_setup_check_db): New. Check that things that need
-	to be in the config db are. Right now it sets up the default
-	folders.
-
-	* e-shell.c (e_shell_construct): Call e_setup_check_db after
-	getting the config db.
-	(impl_Shell_handleURI): Handle "default:" URIs by looking up the
-	default folders in the config db.
-	
-	* main.c (idle_cb): Check for "default:" URIs and treat them the
-	same way as "evolution:" URIs. If the shell fails to display all
-	of the requested URIs, fall back to the default URI (Summary).
-
-	* e-shell-constants.h: Add E_SUMMARY_URI, E_LOCAL_INBOX_URI, etc.
-
-	* e-shortcuts.c (e_shortcuts_add_default_group): Use
-	E_LOCAL_INBOX_URI, etc.
-
-	* e-shell-view.c: #define FALLBACK_URI to E_SUMMARY_URI
-
-2002-04-09  Dan Winship  <danw@ximian.com>
-
-	* Evolution-ShellComponent.idl (createView): Add a "view_info"
-	argument.
-
-	* e-shell-view.c (get_view_for_uri): if the URI contains a '#',
-	split it into a URI and a "view_info" at that point. (Otherwise,
-	pass "" for the view_info to ShellComponent_createView.) This can
-	be used for things like specifying day/month/week view to the
-	calendar.
-
-	* e-shell.c (create_view): Ignore e_shell_view_display_uri's
-	return code: it's possible/likely that the requested URL is remote
-	and hasn't been filled in yet.
-	(impl_Shell_handleURI): Don't use Shell_createNewView directly,
-	call e_shell_create_view_from_uri_and_settings. (For the above fix
-	and some others.)
-
-	* evolution-shell-component.c (impl_createView): Add view_info.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_create_view): Add view_info.
-
-	* evolution-test-component.c (create_view_fn): add view_data.
-
-	* e-corba-storage-registry.c
-	(impl_StorageRegistry_getFolderByUri): kill a warning
-
-2002-04-08  Dan Winship  <danw@ximian.com>
-
-	Fix "evolution evolution:/path/to/folder" to use default view
-	prefs.
-	
-	* e-shell.c (impl_Shell_createNewView): Use
-	e_shell_create_view_from_uri_and_settings to create the new view
-	based on saved view 0 instead of always using the initial
-	evolution defaults.
-	(e_shell_create_view_from_uri_and_settings): Renamed and
-	simplified; the template_view argument was useless and
-	settings_found would always be set to TRUE in the context it was
-	being used it.
-	(e_shell_restore_from_settings): Simplify for
-	e_shell_create_view_from_uri_and_settings changes.
-
-	* e-shell-view.c (e_shell_view_load_settings): Only load the
-	DisplayedURI if the view isn't already displaying a URI. Also,
-	pass an &ev to the first bonobo_config_get_long so we can tell if
-	it failed and bail out.
-
-	* e-shell-view.h: Remove a prototype for a non-existent function
-	(e_shell_view_remove_control_for_uri).
-
-	* main.c (idle_cb): Add some comments here and remove some dead
-	code.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* e-shell-settings-dialog.c (page_new): set type
-	(load_pages): get the oaf property for type and track the page
-	number of the highest priority for each type
-	(destroy_type_entry): destroy hash func
-	(impl_destroy): destroy the hash table
-	(init): create private struct and hash table
-	(e_shell_settings_dialog_show_type): show the page of the given
-	type
-
-	* e-shell-view-menu.c (command_settings): show the page for the
-	current folder type by default
-
-	* e-shell-settings-dialog.h: new proto
-
-2002-04-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-settings-dialog.c (init): Set the title of the dialog.
-
-2002-04-04  Dan Winship  <danw@ximian.com>
-
-	* evolution-shell-client.c
-	(evolution_shell_client_get_pixbuf_for_type): Fix a memory mixup.
-
-2002-04-04  Dan Winship  <danw@ximian.com>
-
-	* evolution-folder-selector-button.c: New widget for a button that
-	displays a folder selection in a standard form, and when clicked
-	lets the user select a new folder.
-
-	* Evolution-Shell.idl (FolderSelectionListener:notifySelected):
-	Make this take an Evolution:Folder instead of a pair of uris.
-	(Shell:getIconByType): New method to get the icon for a type from
-	the folder type registry.
-	
-	* Evolution-common.idl (Folder): add "evolutionUri" to the folder
-	structure.
-
-	* Evolution-Storage.idl (StorageRegistry:getFolderByUri): get an
-	Evolution:Folder for a given uri.
-
-	* evolution-shell-client.c
-	(evolution_shell_client_user_select_folder): Update this to
-	reflect the IDL change: return a GNOME_Evolution_Folder instead of
-	a pair of URIs. Make sure it always sets *@folder_return to %NULL
-	if it fails (even if it's a g_return_if_fail).
-	(evolution_shell_client_get_storage_registry_interface): New.
-	(evolution_shell_client_get_pixbuf_for_type): New. Uses
-	Shell_getIconByType, but caches results.
-
-	* e-shell.c (folder_selection_dialog_folder_selected_cb): Update
-	for API change. (Return a GNOME_Evolution_Folder.)
-	(impl_Shell_getIconByType): Implement.
-
-	* e-corba-storage-registry.c
-	(impl_StorageRegistry_getFolderByUri): Implement.
-
-	* evolution-storage.c (evolution_storage_new_folder): Add a
-	(dummy) evolutionUri to the folder.
-
-	* Makefile.am (libeshell_la_SOURCES): add
-	evolution-folder-selector-button.c
-	(eshellinclude_HEADERS): and .h
-
-2002-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c: Change type of parent_class to
-	BonoboXObjectClass.
-
-	* e-shell.c (pop_up_activation_error_dialog): New helper function
-	to pop up a dialog if one of the components couldn't be activated,
-	getting the description for the error from
-	e_get_activation_failure_msg().
-	(setup_components): Use this function in case of activation error.
-	(set_owner_on_components): Likewise, when the component gets
-	restarted.  Also get a @splash arg so we can set the parent for
-	this dialog correctly.
-
-	* e-component-registry.c (register_component): New arg @ev.
-	(e_component_registry_register_component): Likewise.
-	(e_component_registry_restart_component): Likewise.  Also, remove
-	some bogus code that was #if'ed out.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_new): New arg @ev.
-
-	* evolution-shell-component-utils.c
-	(e_get_activation_failure_msg): New.
-
-2002-04-03  Dan Winship  <danw@ximian.com>
-
-	* e-storage.c (get_path_for_physical_uri_foreach): Deal with
-	folders with no physical_uri.
-
-2002-04-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (e_storage_set_view_set_show_checkboxes):
-	Set the show_checkboxes field here instead of the show_folders
-	field.
-
-2002-04-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (etree_value_at): If folder is NULL, return
-	the correct type of data.
-
-2002-04-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (etspec_DATA): Added
-	e-storage-set-view-checkboxes.etstate and
-	e-storage-set-view-no-checkboxes.etstate here.
-
-	* e-storage-set-view-checkboxes.etstate,
-	e-storage-set-view-no-checkboxes.etstate: The two possible states
-	of the EStorageSetView.
-
-	* e-storage-set-view.c, e-storage-set-view.h
-	(e_storage_set_view_set_show_checkboxes,
-	e_storage_set_view_get_show_checkboxes): Added this functionality.
-	Added a model column to the underlying table for the checkbox
-	data.
-
-	* e-storage-set-view.etspec: Added a view column for the
-	checkboxes.
-
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-settings-dialog.c: Add type "Page".
-	(page_new): New helper function.
-	(page_free): New helper function.
-	(compare_page_func): Callback for sorting a GList of pages.
-	(sort_page_list): New helper function.
-	(load_pages): Create the pages, sort them, add them sorted.  Now
-	we have a priority field that overrides alphabetical sorting.
-
-2002-03-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-component-info.c: New.
-	* e-component-info.h: New.
-
-2002-03-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-settings-dialog.c (load_pages): g_warning if the control
-	cannot be activated.
-
-2002-03-25  Dan Winship  <danw@ximian.com>
-
-	* e-shell.c (e_shell_construct): Register a "working" folder type
-	with the hourglass icon. (Would eventually like an animated gif,
-	when ETable supports that.)
-
-	* e-storage.c (e_storage_has_subfolders): Use "working" rather
-	than "noselect" as the folder type.
-
-	* e-shell-view.c (get_view_for_uri): Simplify a bit.
-
-2002-03-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-settings-dialog.c (get_language_list): Removed.
-	(load_pages): Use e_get_language_list() here instead.  Also, free
-	using e_free_language_list().
-
-2002-03-22  Dan Winship  <danw@ximian.com>
-
-	* evolution-storage.c (evolution_storage_update_folder): Fix a
-	"how can this ever have worked" bug to make unread message counts
-	start working again. (#22293 etc)
-	(evolution_storage_removed_folder): Oops. Fix here too.
-	(evolution_storage_has_subfolders): And here. When cut and paste
-	goes bad...
-
-	* e-shell-folder-commands.c (e_shell_command_rename_folder): Use
-	e_folder_get_name. Don't assume it's the same as the last path
-	element.
-
-2002-03-21  Dan Winship  <danw@ximian.com>
-
-	* e-splash.c (e_splash_construct): Set the wmclass to
-	"evolution-splash" so sawfish knows it's not the same kind of
-	window as the main window.
-
-2002-03-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c: Make all the verb/menu arrays appropriately
-	static.
-
-2002-03-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (command_send_receive): New, implementation
-	for the "SendReceive" verb.
-
-	* e-shell.c (e_shell_send_receive): New.
-
-	* evolution-shell-component.c (impl_sendReceive): Implementation
-	of ShellComponent::sendReceive.
-	(class_init): Add the "send_receive" signal.
-
-	* evolution-shell-component.h: Added `send_receive' signal.
-
-	* Evolution-ShellComponent.idl: Added ShellComponent::sendReceive.
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.etspec: Add `search="string"' for the
-	keyboard navigability search thingy.
-
-2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-activity-handler.c (show_cancellation_popup): Updated to use
-	new EPopupMenu API.
-
-2002-03-14  Dan Winship  <danw@ximian.com>
-
-	Support for delayed filling-in of storages/folders.
-
-	* Evolution-Storage.idl (StorageListener): add
-	notifyHasSubfolders, to announce that a folder has currently-
-	unknown subfolders.
-	(Storage): add asyncOpenFolder, to request that previously-
-	announced subfolders be filled in.
-
-	* evolution-storage.c (impl_Storage_async_open_folder): emit
-	OPEN_FOLDER.
-	(evolution_storage_has_subfolders): Implement by calling
-	notifyHasSubfolders on all of its listeners.
-
-	* evolution-storage-listener.c
-	(impl_GNOME_Evolution_StorageListener_notifyHasSubfolders): emit
-	HAS_SUBFOLDERS.
-
-	* e-corba-storage.c (impl_StorageListener_notifyHasSubfolders):
-	Implement by calling e_storage_has_subfolders.
-	(async_open_folder): Implement by calling asyncOpenFolder on the
-	CORBA storage.
-
-	* e-storage.c (EStoragePrivate, init, destroy): Keep a list of
-	pseudofolders representing un-filled-in subtrees.
-	(impl_async_open_folder): No-op default implementation
-	(e_storage_async_open_folder): New function to request that
-	un-filled-in subtrees be filled in.
-	(e_storage_new_folder): If the new folder's parent has an
-	"un-filled-in children" pseudofolder, remove it.
-	(e_storage_has_subfolders): New function to note that a folder has
-	unknown children. If the folder previously was marked as having
-	real children, remove them, and emit CLOSE_FOLDER to reset it back
-	to an a "unknown subfolders" state.
-
-	* e-storage-set.c (make_full_path): Make this deal with path being
-	"/", since that case gets used from storage_close_folder_cb
-	sometimes.
-	(storage_close_folder_cb): Proxy EStorage's CLOSE_FOLDER signal.
-	(storage_set_view_folder_opened): Handle EStorageSetView's
-	FOLDER_OPENED signal by calling e_storage_async_open_folder.
-
-	* e-storage-set-view.c (etree_fill_in_children): If the given node
-	is its parent's first child, emit FOLDER_OPENED for the parent.
-	(close_folder_cb): Handler for EStorageSet's CLOSE_FOLDER signal.
-	Ask the model to close that node.
-	(e_storage_set_view_construct): Set the default expanded state for
-	the tree to FALSE rather than TRUE, to prevent unwanted expansion
-	of delayed nodes. (This only affects the very first time the tree
-	is displayed anyway: after that its state is loaded off disk.)
-
-	* e-shell.c (e_shell_construct): Register the "noselect" type with
-	the folder type registry, so icon lookups on placeholder folders
-	will work.
-
-2002-03-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-settings-dialog.c (load_pages): Use
-	`evolution:config_item:icon_name' instead of
-	`evolution:config_item:icon_path'.  If it's not an absolute path,
-	load from the IMAGESDIR.  Also, no need to specify the language
-	list for this one, as the icon name shouldn't be translated.
-
-2002-03-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c (create_configuration_page): Update
-	to create an EvolutionConfigControl instead of just a
-	BonoboControl.
-
-	* e-corba-config-page.c (e_corba_config_page_construct): Get a
-	GNOME_Evolution_ConfigControl instead of a CORBA_Object.  Retrieve
-	the control from it using ::_get_control instead of just assuming
-	it's a control.  Also return a boolen indicating success or
-	failure.
-	(e_corba_config_page_new): Likewise, get a
-	GNOME_Evolution_ConfigControl.
-	(setup_listener): Renamed from `setup_config_control_interface'.
-	Get a ::ConfigControl instead of a CORBA::Object.  Thus, no need
-	to queryInterface here anymore.
-
-	* evolution-config-control.c, evolution-config-control.h: New,
-	implementation for the Evolution::ConfigControl interface.
-
-	* Evolution-ConfigControl.idl: New attribute `control'.
-
-2002-03-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c (e_shell_command_rename_folder): Make
-	old_name_locale non-const to placate a compiler warning.
-	(get_corba_null_value): Likewise.
-
-	* e-activity-handler.c (report_task_event): `#if 0' out.
-
-2002-03-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-settings-dialog.c (load_pages): Use ECorbaConfigPages.
-
-	* e-corba-config-page.c: New.
-	* e-corba-config-page.h: New.
-
-	* Evolution.idl: #include <Evolution-ConfigControl.idl>.
-
-	* Evolution-ConfigControl.idl: New IDL for configuration Controls
-	that will be displayed in the global config dialog.
-
-2002-03-08  Dan Winship  <danw@ximian.com>
-
-	* e-storage-set-view.[ch]: Note that e_storage_set_view_new
-	shouldn't be used directly.
-
-	* e-shell-view.c (setup_storage_set_subwindow): Use
-	e_storage_set_new_view instead of e_storage_set_view_new.
-
-	* evolution-storage-set-view-factory.c
-	(evolution_storage_set_view_factory_new_view): Likewise.
-
-2002-03-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c (create_configuration_page): New
-	function to create a test configuration page for the test
-	component.
-	(configuration_control_factory_fn): Factory function for the
-	configuration controls.
-	(register_configuration_control_factory): New function to register
-	the factory.
-	(main): Call it.
-
-	* e-shell-view-menu.c: Add verb "Settings".
-	(command_settings): Implementation for the "Settings" verb.
-
-	* GNOME_Evolution_TestComponent.oaf: Add a configuration control.
-
-	* e-shell-settings-dialog.c: New.
-	* e-shell-settings-dialog.h: New.	
-
-2002-03-07  Dan Winship  <danw@ximian.com>
-
-	Addendum to previous commit: Remove "storage_selected" vs
-	"folder_selected" distinction.
-
-	* evolution-storage-set-view.c
-	(storage_set_view_widget_storage_selected_cb): Removed.
-
-	* evolution-storage-set-view-listener.c
-	(impl_GNOME_Evolution_StorageSetViewListener_notifyStorageSelected):
-	Removed.
-	(class_init): Remove STORAGE_SELECTED signal.
-
-	* e-storage-set-view.c (impl_cursor_activated): Always emit
-	FOLDER_SELECTED, never STORAGE_SELECTED.
-	(class_init): Remove STORAGE_SELECTED signal.
-
-	* e-shell-view.c (storage_selected_cb): Removed.
-
-	* e-shell-folder-creation-dialog.c
-	(storage_set_view_storage_selected_cb): Removed.
-
-	* Evolution-StorageSetView.idl (StorageSetViewListener): Remove
-	notifyStorageSelected.
-
-2002-03-07  Dan Winship  <danw@ximian.com>
-
-	Make storages-with-toplevel-views less of a hack.
-
-	* e-folder-tree.c (e_folder_tree_add): Allow the caller to "add" a
-	root folder, if the existing root folder has no children.
-	(e_folder_tree_new): Use e_folder_tree_add to create the root
-	folder, since it can do that now.
-
-	* e-storage.c: (e_storage_construct): Replace toplevel_node_uri
-	and toplevel_node_type args with root_folder.
-	(e_storage_new): Likewise.
-	(*): Remove toplevel uri/type stuff everywhere. Also remove
-	display_name since now we will use the name of the root folder for
-	that.
-
-	* evolution-storage.c: Remove toplevel uri/type stuff everywhere.
-
-	* e-local-storage.c (construct): Pass root_folder to
-	e_storage_construct instead of toplevel uri/type.
-	Also, evolution_storage_new no longer takes toplevel uri/type.
-
-	* e-corba-storage.c (e_corba_storage_construct): Out with toplevel
-	uri/type, in with root_folder.
-	(e_corba_storage_new): Remove toplevel uri/type.
-
-	* e-shell.c (setup_local_storage): Create a top-level folder of
-	type "summary" for the Summary storage.
-
-	* e-storage-set-view.c (set_e_shortcut_selection): Remove
-	special-case for storages.
-	(etree_icon_at): Remove special case for figuring out storage
-	icons (but leave the code for storages without icons).
-	(etree_value_at): Remove special case for storage names. (But
-	still make storages always bold.) Remove unused special-case code
-	for Summary.
-
-	* e-shortcuts.c (load_shortcuts): Remove special case for
-	storages, reorganize a bit.
-
-	* e-shortcuts-view.c (get_shortcut_info): Remove special case for
-	storages.
-
-	* e-shell-view.c (update_for_current_uri): Remove special case for
-	storages.
-	(socket_destroy_cb): Likewise.
-	(get_type_for_storage): No longer needed.
-	(get_view_for_uri): No longer needs to special-case storages (but
-	add a special case for folders of type "noselect", to make them
-	unselectable like storages-without-toplevel-views used to be).
-
-	* e-storage-set.c (get_storage_for_path): If passed "/foo", return
-	"/" as subpath_return so e_storage_set_get_folder will DTRT in the
-	NWO.
-
-	* Evolution-Storage.idl (addStorage): Remove the toplevel_node_uri
-	and toplevel_node_type arguments.
-
-	* e-corba-storage-registry.c (impl_StorageRegistry_addStorage):
-	Likewise.
-
-2002-03-06  Dan Winship  <danw@ximian.com>
-
-	* e-storage.c: Keep the storage name and display_name in
-	EStoragePriv.
-	(impl_get_name, impl_get_display_name): Return them.
-	(e_storage_construct): Set them here.
-	(e_storage_new): And here.
-
-	* e-local-storage.c: (impl_get_name, impl_get_display_name):
-	Removed.
-	(construct): Pass E_LOCAL_STORAGE_NAME and U_("Local Folders") to
-	e_storage_construct.
-
-	* e-corba-storage.c: Remove priv->name.
-	(get_name, get_display_name): Removed.
-	(e_corba_storage_construct): Pass name to e_storage_construct().
-
-	* e-summary-storage.[ch]: Gone. This didn't override anything in
-	EStorage but get_name/get_display_name, and the defaults for those
-	DTRT now.
-	
-	* e-shell-constants.h: Move E_SUMMARY_STORAGE_NAME here from
-	e-summary-storage.h, and move E_LOCAL_STORAGE_NAME too for
-	consistency.
-
-	* e-storage-set-view.c: Fix up #includes.
-
-	* e-shell-importer.c: Likewise
-
-	* e-shell.c: Likewise. Create summary_storage as a plain EStorage
-	since ESummaryStorage is gone now.
-
-	* Makefile.am (evolution_SOURCES): Remove e-summary-storage.[ch]
-
-2002-03-06  Dan Winship  <danw@ximian.com>
-
-	* e-corba-storage-registry.c
-	(impl_StorageRegistry_removeListener): Fix up GList/GSList
-	confusion.
-
-	* e-shell-user-creatable-items-handler.c
-	(get_default_action_for_view): Don't look into the types list if
-	it's empty.
-
-2002-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-about-box.c: Reduce width of the copyright message so it
-	looks prettier with the new Rupert artwork.
-
-2002-03-04  Iain Holmes  <iain@ximian.com>
-
-	* Evolution-Storage.idl: Add some methods to the StorageRegistry 
-	interface to get a storage, and add or remove listeners. Also add a
-	new exception and some structs and enums for messages.
-
-	* e-corba_storage-registry.c: Add a GSList to the private stuct for
-	recording the listeners.
-	(listener_notify): Send a message to the listeners.
-	(impl_StorageRegistry_getStorageByName): Implementation of the
-	getStorageByName method. Returns the associated storage interface
-	(storage_set_foreach): Loop through all the storages in the storageset
-	and notify the listeners about them.
-	(find_listener): Find a listener in the list of them.
-	(impl_StorageRegistry_addListener): Add a new listener to the
-	registry.
-	(impl_StorageRegistry_removeListener): Remove a listener.
-	(corba_class_init): Add the new methods to the EPV.
-	(init): NULL the listeners list.
-
-	* e-corba-storage.[ch] (e_corba_storage_get_corba_objref): Get the CORBA
-	interface from the GtkObject.
-	
-2002-03-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #20234, Deleting Folder gratuitiously causes /local to open.]
-
-	* e-shell-view.c (find_inbox_in_storage): New helper function to
-	heuristically find an Inbox folder.
-	(handle_current_folder_removed): New function to handle the
-	removal of the currently displayed folder in a slightly smarter
-	way than before.  It tries to display the parent folder of the
-	folder that got deleted and, if not possible, the Inbox in the
-	same storage.  If neither of this is possible, it displays the
-	default local Inbox.  [It still doesn't handle the case where you
-	have no Inbox gracefully, but that can come later.]
-	(storage_set_removed_folder_callback): Call
-	`handle_current_folder_removed'.
-
-2002-03-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #20237, Shell silently drops xfer_folder errors.]
-
-	* e-shell-folder-commands.c (xfer_result_callback): Display an
-	error message if the operation failed.
-
-2002-02-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	[This gets rid of some spurious "could not find handler" messages
-	on exit.  What happened is that the signal would be disconnected
-	twice, once by cleanup_delayed_selection() and once by the
-	while_alive handler.]
-
-	* e-shell-view.c (destroy): Call cleanup_delayed_selection() here.
-	(e_shell_view_display_uri): Use gtk_signal_connect_full(), not
-	e_gtk_signal_connect_full_while_alive().
-
-2002-02-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-about-box.c: Add year 2002 to the copyright.
-
-2002-02-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (impl_destroy): Renamed from `destroy'.
-	(impl_right_click): Renamed from `right_click'.
-	(impl_cursor_activated): Renamed from `cursor_activated'.
-	(impl_tree_start_drag): Renamed from `tree_start_drag'.
-	(impl_tree_drag_begin): Renamed from `tree_drag_begin'.
-	(impl_tree_drag_end): Renamed from `tree_drag_end'.
-	(impl_tree_drag_data_get): Renamed from `tree_drag_data_get'.
-	(impl_tree_drag_data_delete): Renamed from
-	`tree_drag_data_delete'.
-	(impl_tree_drag_motion): Renamed from `tree_drag_motion'.
-	(impl_tree_drag_leave): Renamed from `tree_drag_leave'.
-	(impl_tree_drag_drop): Renamed from `tree_drag_drop'.
-	(impl_tree_drag_data_received): Renamed from
-	`tree_drag_data_received'.
-
-2002-02-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #3029, Offline mode should be preserved across sessions.]
-
-	* main.c (idle_cb): Use the e_shell_new() API below so that we use
-	the saved offline settings at the next start-up if neither
-	--offline nor --online has been specified.
-
-	* e-shell.c (save_misc_settings): New function.  For now, just
-	save `/Shell/StartOffline' indicating whether the shell should
-	start in offline mode or not.
-	(e_shell_construct): Replace @start_online with
-	@startup_line_mode.
-	(e_shell_new): Likewise.
-
-	* e-shell.h: New enum EShellStartupLineMode.
-
-2002-02-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (remove_uri_from_history): New helper function to
-	remove all the matching URIs from the history.
-	(history_uri_matching_func): Compare function for using
-	e_history_remove_matching.
-	(storage_set_removed_folder_callback): Call
-	`remove_uri_from_history()'.
-
-	* e-history.c (e_history_remove_matching): New.
-
-2002-02-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (update_navigation_buttons): New.
-	(display_uri): Call it before returning so the navigation buttons
-	always have the right sensitivity.
-
-	* e-shell-folder-title-bar.c
-	(e_shell_folder_title_bar_update_navigation_buttons): New.
-	(add_navigation_buttons): Remove the "Back" label.
-
-2002-02-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c: New member `history' in `EShellViewPrivate'.
-	(init): Initialize.
-	(destroy): Unref.
-	(e_shell_view_display_uri): Make it a no-op if the URI is the same
-	as the current one.  Also, moved code into `display_uri' and use
-	it.
-	(back_clicked_callback): New, callback for the back button on the
-	folder title bar.
-	(forward_clicked_callback): Likewise for the forward button.
-
-	* e-history.c: New.
-	* e-history.h: New.
-
-2002-02-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_show_folder_bar):
-	`e_shell_folder_title_bar_set_title_clickable()', not
-	`e_shell_folder_title_bar_set_clickable()'.
-
-	* e-shell-folder-title-bar.c: Rename `button', `button_label' and
-	`button_arrow' to `title_button', `title_button_label' and
-	`title_button_arrow'.  Renamed `label' to `title_label'.  Renamed
-	`arrow_xpm' to `down_arrow_xpm'.  Added `left_arrow.xpm' and
-	`right_arrow.xpm'.
-	(class_init): Add the "back_clicked" and "forward_clicked"
-	signals.
-	(add_navigation_buttons): New function to add the navigation
-	buttons to the title bar.
-	(back_button_clicked_callback): Callback for the back button,
-	emits "back_clicked".
-	(forward_button_clicked_callback): Callback for the forward
-	button, emits "forward_clicked".
-	(e_shell_folder_title_bar_construct): Call
-	`add_navigation_buttons()'.
-	(forward_button_clicked_callback):
-	(create_arrow_pixmap): Removed.
-	(create_pixmap_widget_from_xpm): New.
-	(title_button_box_realize_cb): Removed.
-	(e_shell_folder_title_bar_construct): Don't connect.  Just add the
-	icon normally using the new `create_pixmap_widget_from_xpm()'.
-	(e_shell_folder_title_bar_set_title_clickable): Renamed from
-	`e_shell_folder_title_bar_set_clickable'.
-	(size_allocate_navigation_buttons): New.
-	(size_allocate_title_button): Get an @offset.
-	(size_allocate_label): Get an @offset.
-	(size_allocate): Allocate the navigation buttons and offset
-	everything else accordingly.
-
-	* e-shell-folder-title-bar.h: New signals "back_clicked",
-	"forward_clicked".
-
-2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-user-creatable-items-handler.c
-	(get_default_action_for_view): Return NULL if there is no
-	component ID for the current view.
-	
-2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-user-creatable-items-handler.c (ensure_menu_items): Set
-	the icons for all the "New..." menu items from the specified one
-	in the type definitions.
-
-	* e-activity-handler.c (create_gdk_pixbuf_from_corba_icon):
-	Removed.
-	(impl_operationStarted): Just use
-	`e_new_gdk_pixbuf_from_corba_icon()'.
-
-	* e-shell-corba-icon-utils.c (e_new_gdk_pixbuf_from_corba_icon):
-	New.
-
-2002-02-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #20311, new window from Shortcuts should not show the folder
-	bar and the shortcut bar.  Also do the same for right-click on the
-	folder bar.]
-
-	* e-shell-view-menu.c (command_open_folder_in_new_window): Don't
-	show the folder bar and the shortcut bar in the new window.
-
-	* e-shell-view.c (activate_shortcut_cb): Don't show the folder bar
-	and the shortcut bar in the new window.
-
-	* e-shell-view.c (e_shell_create_view): Don't flush the GTK events
-	here.
-
-2002-02-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_construct): New arg @start_online.  If true,
-	invoke `e_shell_go_online()' before returning.
-	(e_shell_new): New arg @start_online.  Pass it to
-	e_shell_construct().
-	(init): Default ->line_status to E_SHELL_LINE_STATUS_OFFLINE.
-
-	* main.c (main): Add "--offline" and "--online" options.
-
-2002-01-30  Not Zed  <NotZed@Ximian.com>
-
-	* e-storage-set-view.c (popup_folder_menu): Use
-	right_click_row_path rather than selected_row_path, so clients get
-	the uri that was actually clicked on.
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Use SHELL_CFLAGS and SHELL_LIBS.
-	* importer/Makefile.am: Likewise.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Just use BONOBO_HTML_GNOME_CFLAGS and
-	BONOBO_HTML_GNOME_LIBS for compiling/linking; we don't need the
-	other ones.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-user-creatable-items-handler.c: New member `id' in
-	struct `Component'.  New member `icon' in struct `MenuItem'.
-	(component_free): Free ->id.
-	(component_new): Renamed from `component_new_from_client'.  Get an
-	@id arg and set ->id accordingly.
-	(e_shell_user_creatable_items_handler_add_component): New arg @id.
-	Pass it to `component_new'.
-	(e_shell_user_creatable_items_handler_setup_menus): New arg
-	@current_component_id.
-	(e_shell_user_creatable_items_handler_update_menus): New.
-	(set_current_component): New helper function.
-	(get_component_by_id): New helper function.
-	(add_verbs): Renamed from `add_verbs_to_ui_component()'.  Get a
-	@shell_view instead of a @ui_component.  Set the SHELL_VIEW_KEY on
-	the ui_component of the shell_view to point to the shell_view
-	itself.
-	(ensure_menu_items): Set item->icon to NULL.
-	(free_menu_items): Unref item->icon.
-	(ensure_menu_xml): Set the icon as well.
-	(get_default_action_for_view): New helper function.
-	(find_menu_item_for_verb): New helper function.
-	(shell_view_view_changed_callback): New callback, set up the label
-	on the "New" button depending on the current component.
-	(e_shell_user_creatable_items_handler_attach_menus): New.  For
-	now, do not display the toolbar button yet.
-	(execute_verb): New helper function, splitting out code from
-	`verb_fn'.
-	(verb_fn): Use `execute_verb'.
-	(combo_button_activate_default_callback): Callback for the
-	"activate_default" signal on the EComboButton.
-	(setup_toolbar_button): Connect.
-
-	* evolution-shell-component.c: New member `icon' in
-	`UserCreatableItemType'.
-	(impl__get_userCreatableItemTypes): Put the ->icon in the
-	corba_type as well.
-	(user_creatable_item_type_new): Get a new @icon argument.
-	(evolution_shell_component_add_user_creatable_item): New arg
-	@icon.
-
-	* Evolution-ShellComponent.idl: New member `icon' in struct
-	`UserCreatableItemType'.
-
-	* evolution-test-component.c (register_component): Pass a NULL
-	@icon to `evolution_shell_component_add_user_creatable_item()'.
-
-	* e-shell-view.c (class_init): Add the signal to the class.
-	(e_shell_view_display_uri): Emit "view_changed".
-	(e_shell_view_get_current_component_id): New.
-
-	* evolution-shell-component-client.c: New member `id' in
-	EvolutionShellComponentClientPrivate.
-	(init): Init to NULL.
-	(impl_destroy): Free.
-	(evolution_shell_component_client_new_for_objref): Removed.
-	(evolution_shell_component_client_construct): New arg @id.
-	Initialize ->id from it.
-	(evolution_shell_component_client_get_id): New.
-
-	* e-shell-view.h: New signal "view_changed".
-
-	* evolution-activity-client.c (create_icon_from_pixbuf): Removed.
-	(create_corba_animated_icon_from_pixbuf_array): Removed.
-	(evolution_activity_client_construct): Use
-	`e_new_corba_animated_icon_from_pixbuf_array()' instead.
-
-	* e-shell-icon-utils.h: New.
-	* e-shell-icon-utils.c: New.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch by Michael Meeks <michael@ximian.com>.]
-
-	* e-splash.c (e_splash_set_icon_highlight): g_return if there is
-	no num-th icon.
-
-2002-01-15  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-importer.c (show_import_wizard): Set the importer druid
-	as a transient window of the parent shell.
-
-2002-01-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #17441, Crash trying to import Multiple VCard file into LDAP
-	folder.]
-
-	* e-shell-importer.c (show_error): Add a NULL in the call to
-	`gnome_message_box_new()'.
-
-2001-12-14  Michael Meeks  <michael@ximian.com>
-
-	* e-shell-view.c (set_current_notebook_page): re-order
-	activate / de-activate to minimise flicker switching between
-	identical components.
-
-2002-01-11  Damon Chaplin  <damon@ximian.com>
-
-	* e-shell-startup-wizard.c (finish_func): handle translated timezone
-	names.
-
-	* Makefile.am (INCLUDES): added -I$(top_srcdir)/libical/src/libical.
-
-2001-12-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-about-box.c: Add Michael MacDonald.
-
-2001-12-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #17377, Evolution doesn't work on multi-depth displays.]
-
-	* main.c (main): Push GdkRGB visual and colormap.
-
-2001-12-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #16693.  What happens there is that the user closed the
-	dialog before the async operation was completed, so when the
-	notification was received the shell crashed.]
-
-	* e-shell-folder-creation-dialog.c: New member
-	`creation_in_progress' in `DialogData'.
-	(e_shell_show_folder_creation_dialog): Init to %FALSE.
-	(async_create_cb): Set to %FALSE.  Also, if the
-	dialog_data->dialog is %NULL, free the dialog_data before
-	returning.
-	(dialog_clicked_cb): Set to %TRUE.
-	(dialog_destroy_cb): If a creation is in progress, just set the
-	widget pointers in the DialogData struct to %NULL instead of
-	freeing the whole struct.
-	(async_create_cb): Make the OK and Cancel buttons sensitive.
-	(dialog_clicked_cb): Make them insensitive here.
-
-2001-12-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #17258, shell displays splash even if Evolution is already
-	running.]
-
-	* e-shell.c (e_shell_construct): Display the splash screen only if
-	the registration succeeds.
-
-2001-12-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #14838, saving passwords doesn't work.  It is actually a
-	workaround for some obscure Bonobo-conf bug.]
-
-	* e-setup.c (setup_bonobo_conf_private_directory): New helper
-	function to create the `~/evolution/private' directory.
-	(e_setup): Call it.
-
-2001-12-07  Iain Holmes  <iain@ximian.com>
-
-	[Trying to fix #14701, importing locks up Evolution.]
-
-	* e-shell-importer.c (show_error): Show an error message, but not
-	modally.
-	(start_import): Use above function so none of the errors are modal.
-	(folder_selected): Hide the folder dialog.
-	
-2001-12-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #7827, Switching desktops leaves the folder bar popped up.]
-
-	* e-shell-view.c (folder_bar_popup_map_callback): And grab the
-	keyboard as well.
-	(popdown_transient_folder_bar): Ungrab the keyboard as well.
-	(switch_on_folder_tree_click): Likewise.
-
-	[Fix #16507, Right Click -> View does nothing.]
-
-	* e-shell-view-menu.c: New verb "ActivateView".
-	(command_activate_view): New, callback for the "ActivateView"
-	verb.
-
-2001-11-15  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* e-shell-folder-commands.c (e_shell_command_rename_folder): Convert
-	folder name to locale's encoding before using it as part of the prompt.
-
-2001-11-28  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #3290.
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_construct): Use our own filename
-	for the collapsation state of the tree, instead of sharing the one
-	of shell view number 0.
-	(save_expanded_state): New function, saves the collapsation state
-	of the tree.
-	(impl_destroy): Call save_expanded_state().
-
-2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-about-box.c: Add more contributors to the box.
-
-2001-11-14  Damon Chaplin  <damon@ximian.com>
-
-	* e-shell-startup-wizard.c (finish_func): make timezone default to
-	"UTC" rather than "".
-
-2001-11-12  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-startup-wizard.c (make_identity_page): Check for exception.
-	(make_receive_page): Check for exception.
-	(make_extra_page): Check for exception.
-	(make_transport_page): Check for exception.
-	(make_management_page): Check for exception.
-
-2001-11-06  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-startup-wizard.c (make_timezone_page): Move the call to
-	e_timezone_dialog_new out of the the GTK_OBJECT macro to stop it
-	being called 4 times, and leaking 3.
-
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (set_e_shortcut_selection): Get the storage
-	name if we are dragging a storage instead of a folder.
-
-2001-11-01  Anna Marie Dirks  <anna@ximian.com>
-
-	* e-shell-importer.c (prepare_intelligent_page): Fixed spacing and
-	alignment probelms. (See bug #14281)
-
-	* e-shell-startup-wizard.c (prepare_importer_page): Fixed
-	spacing and alignment problems. (See bug #14281) 
-
-2001-11-05  Dan Winship  <danw@ximian.com>
-
-	* e-storage-set-view.c (set_e_shortcut_selection): Set the
-	shortcut name to be the folder name, not just the last component
-	of its path, which may be different.
-
-2001-11-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* glade/evolution-startup-wizard.glade: `timezone-48.png', not
-	`timezone.png'.
-
-2001-11-01  Anna Marie Dirks  <anna@ximian.com>
-
-	* glade/evolution-startup-wizard.glade: Changed the welcome
-	message and the finishing message to be more descriptive. Also
-	changed the window title to be "Evolution Setup Assistant". Finally,
-	fixed a misnamed icon (replaced timezone.png with timezone-48.png).
-	Partially fixes bug #14281 and totally fixes #14286. 
-
-2001-10-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (cursor_activated): Don't do operations on
-	a NULL path.
-	(updated_folder_cb, folder_changed_cb): Send pre_change signal
-	here.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (handle_evolution_path_drag_motion): If the
-	source folder is stock and the operation is GDK_ACTION_MOVE,
-	always return %FALSE as we don't want that to be allowed ever.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (bonobo_widget_is_dead): Removed.
-	(show_existing_view): Don't call it.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-component-registry.c (sleep_with_g_main_loop): New utility
-	function.
-	(sleep_with_g_main_loop_timeout_callback): Callback function for
-	`sleep_with_g_main_loop()'.
-	(wait_for_corba_object_to_die): Use `sleep_with_g_main_loop()'
-	instead of `sleep()'.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (development_warning): Removed.
-	(idle_cb): Don't call it.
-	(warning_dialog_clicked_callback): Removed.
-
-2001-10-30  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-view.c (e_shell_view_load_settings): If the display uri is
-	NULL, set the view to the default.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c (owner_ping_callback): Duplicate the
-	owner before pinging it.  Fixes #13802.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c (impl_owner_unset): New.
-	(class_init): Install it.
-	(impl_unsetOwner): Just emit the "owner_unset" signal as the
-	default implementation for that signal does all the work now.
-	(impl_owner_died): Set the owner_client to %NULL before unreffing
-	it.
-	(destroy): Likewise.
-	(impl_owner_unset): Likewise.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_construct): Connect to the
-	"removed_folder" signal with gtk_signal_connect_while_alive() so
-	we don't crash if the view gets destroyed.  Fixes #13285.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-startup-wizard.c (next_func): If we're not at the end of
-	the druid list, tell the druid we're going to change the page.
-	(back_func): Same for going back a page.  This way we can properly
-	synchronise with the druid object and not race with the wizard
-	object to set the right page.  Part of fix for #12127.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c (owner_ping_callback): Slightly
-	change the debugigng message for when the shell has disappeared.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c (owner_ping_callback): Remove
-	ping debugging messages.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (set_interactive): Remove debugging message.
-
-2001-10-29  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (evolution_LDADD): use libical-evolution.la
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_construct): Ref the shell.
-	(destroy): Unref the shell.
-	(destroy): Free the delayed_selection.  No need to call
-	`cleanup_delayed_selection()' as the signal handler will have
-	already be disconnected at this point [as we are using
-	connect_while_alive()'].
-
-2001-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (destroy): Call `cleanup_delayed_selection()' as
-	there is a slight chance that the callback gets invoked during the
-	cleanup phase.
-	(e_shell_view_display_uri): For extra safety, make sure we don't
-	get invoked on a dead object by connecting the "new_folder" signal
-	with `e_gtk_signal_connect_full_while_alive()' instead of using
-	plain `gtk_signal_connect_after()'.
-
-2001-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (new_folder_cb): Don't do the
-	`gtk_signal_disconnect_by_func()' as it's already done in
-	`cleanup_delayed_selection()'.
-	(e_shell_view_construct): Set the ->shell member as the first
-	thing.
-	(set_current_notebook_page): Add a cast to make the compiler
-	happy.
-	(new_folder_cb): Don't set priv->uri before calling
-	`e_shell_view_display_uri()', because the latter does it anyways,
-	and also if you set it before calling it, the selection in the
-	folder tree doesn't get updated properly.
-
-2001-10-29    <NotZed@Ximian.com>
-
-	* evolution-storage.c (class_init): Set the return type of the
-	signal handlers to GTK_TYPE_NONE.
-
-2001-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	[The following should fix #13802, crash on exit.]
-
-	* evolution-shell-component.c (impl_unsetOwner): Set the ping
-	timeout ID to -1 when removing the source.
-	(impl_destroy): Likewise.
-	(impl_unsetOwner): Remove the timeout before unreffing, not after
-	unreffing.
-
-2001-10-28  Jon Trowbridge  <trow@ximian.com>
-
-	* e-shell-about-box.c: Distribute credit equally.
-
-2001-10-27    <NotZed@Ximian.com>
-
-	* evolution-storage.c (impl_Storage_async_xfer_folder): We want
-	XFER_FOLDER not REMOVE_FOLDER!
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-offline-handler.c (prepare_for_offline): Remove
-	debugging messages.
-	(finalize_offline_hash_foreach): Likewise.
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-offline-handler.c: New member `finished' in
-	`EShellOfflineHandlerPrivate'.
-	(finalize_offline): Ref the handler as we might get destroyed
-	while putting every component offline.
-	(impl_OfflineProgressListener_updateProgress): Don't emit
-	::offline_procedure_finished if ->finished is %TRUE.  Also, set it
-	to %TRUE after emitting the signal.
-	(cancel_offline): Likewise.
-	(finalize_offline): Likewise.
-	(update_dialog_clist): Guard against NULL ->dialog_gui.
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-storage.c (impl_Storage_async_xfer_folder): Implement.
-	(class_init): Add the signal "xfer_folder" signal.
-
-	* evolution-storage.h: New signal "xfer_folder".
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-corba-storage.c
-	(async_xfer_folder): New, implementation for the
-	::async_xfer_folder method.
-	(class_init): Install it.
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (destroy): Set ->is_initialized to %FALSE.
-	(e_shell_unregister_all): Same here.
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-importer.c (prepare_intelligent_page):
-	gtk_widget_show_now() the dialog.
-	* e-shell-startup-wizard.c (prepare_importer_page): Likewise.
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (quit_box_new): Use gtk_widget_show_now() so the stupid
-	dialog hopefully displays all the time.
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (set_current_notebook_page): Clear the folder bar
-	label to be empty.  [#12553]
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-about-box.c (timeout_callback): Draw one more line.
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (command_about_box): Set the GtkWindow
-	policy so that @allow_shrink, @allow_grow and @auto_shrink are all
-	%FALSE.
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c (e_shell_command_rename_folder): Don't
-	allow invalid folder names.  [#12027]
-
-	* e-shell-folder-creation-dialog.c (entry_name_is_valid): Removed.
-	(dialog_clicked_cb): Use `e_shell_folder_name_is_valid()' instead.
-
-	* e-shell-utils.c (e_shell_folder_name_is_valid): New.  Sorry I18N
-	people, it breaks the string freeze slighty.
-
-	* e-component-registry.c (component_free): Add a cast.
-	(e_component_registry_restart_component): Argh, use the
-	corba_objref properly in calling `wait_for_corba_object_to_die()'.
-
-2001-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (update_offline_menu_item): Add accelerators
-	for "Work Offline" and "Work Online".
-
-2001-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (update_for_current_uri): Don't allow translators
-	to translate "Ximian Evolution".
-
-2001-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-component-registry.c (wait_for_corba_object_to_die): New
-	helper function.
-	(e_component_registry_restart_component): Use it.
-	(component_free): Call it to wait for the unowned object to die.
-
-2001-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (impl_Shell_selectUserFolder): Handle failure from
-	XGetClassHint properly.  Also, free res_name and res_class in case
-	of success.  Fixes #13554.
-
-2001-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (etree_icon_at): Don't display an icon for
-	storages that have subfolders.
-
-2001-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-importer.c: #include "e-util/e-gtk-utils.h".
-
-	* e-shell-folder-creation-dialog.c
-	(e_shell_show_folder_creation_dialog): Constify a local variable
-	to placate a warning.
-
-	* e-activity-handler.c (task_widget_cancel_callback): #if 0'ed
-	out.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_new): Remove unused variable
-	`ior'.
-
-2001-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-activity-handler.c (impl_destroy): Set ->priv to NULL.
-	(impl_operationStarted): Check for priv not being NULL.
-	(impl_operationProgressing): Likewise.
-	(impl_operationFinished): Likewise.
-	(impl_requestDialog): Likewise.
-
-2001-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-startup-wizard.c (make_mail_dialog_pages): Set the
-	->mailer to be CORBA_OBJECT_NIL in case of an exception, otherwise
-	the caller will not realize about the problem.
-
-2001-10-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-wizard.c (evolution_wizard_set_buttons_sensitive):
-	Don't use __FUNCTION__.
-	(evolution_wizard_set_show_finish): Likewise.
-	(evolution_wizard_set_page): Likewise.
-
-	* e-shell-startup-wizard.c (make_mail_dialog_pages): Do not use
-	__FUNCTION__ and __LINE__.  This breaks the string freeze, but the
-	old way made Evolution non-compilable with non-GNU compilers.
-
-2001-10-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-about-box.c: Add a few names to the box.
-
-2001-10-24  Dan Winship  <danw@ximian.com>
-
-	* evolution-storage.c (evolution_storage_new_folder):
-	g_return_if_fail if the display_name is NULL. "Fixes" 11182
-	although there may be a few more cases lying around that pass
-	NULLs in.
-
-2001-10-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (quit_box_new): Set the WMClass of the quit dialog to be
-	different from the default one in an attempt to fix #13441.
-
-2001-10-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (storage_result_from_component_result): New.
-	(async_xfer_folder_callback): Use it so we get the right error
-	message.
-	(async_xfer_folder_complete): New arg @success.  Don't remove the
-	directory and the metadata if @success is %FALSE.
-
-2001-10-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c (rename_callback_data_new): Get the
-	path and the shell view instead.
-	(rename_callback_data_free): Updated accordingly.
-	(rename_cb): Set the name on the folder based on the path, not the
-	actual object [as the old object gets unreffed -- of course].
-
-2001-10-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c (rename_callback_data_new): New.
-	(rename_callback_data_free): New.
-	(rename_cb): Rename the folder here.
-	(e_shell_command_rename_folder): Don't rename the EFolder here.
-
-2001-10-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (async_xfer_folder_callback): Handle the
-	return codes properly, and invoke the result callback too.
-
-2001-10-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-activity-handler.c (show_cancellation_popup): #if 0'ed for
-	now, per #7427.
-
-2001-10-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (storage_set_removed_folder_callback): Explicitly
-	deactivate the control frame, and display the default URI before
-	destroying the dead one.
-
-	* e-shell.c (e_shell_component_maybe_crashed): If the URI is of a
-	folder that doesn't exist anymore, don't assume that the
-	corresponding component has crashed.  Also, try pinging the
-	component first; if the component responds, don't pop up the
-	dialog.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (command_open_folder_in_new_window): No need
-	to gtk_widget_show() the view anymore.
-
-	* e-shell-view.c (activate_shortcut_cb): No need to
-	gtk_widget_show() the view anymore.
-
-	* e-shell.c (impl_Shell_createNewView): Don't explicitly show the
-	new view.
-	(e_shell_create_view): gtk_widget_show() the new view and flush
-	the GTK+ event loop before sending the ::interactive notification.
-	(create_view): New helper function.
-	(e_shell_create_view): Use it.
-	(e_shell_create_view_from_settings): New.
-	(e_shell_restore_from_settings): Use
-	`e_shell_create_view_from_settings()'.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (command_open_folder_in_new_window): Don't
-	explicitly show the new view.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c (impl_unsetOwner): Remove the ping
-	timeout.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (impl_Shell_selectUserFolder): Don't die if the parent
-	window has no WMHints.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (show_existing_view): If the view is dead, just
-	return FALSE.  Prevents crash #12483.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c: New member `is_interactive' in `EShellPrivate'.
-	(init): Init to %FALSE.
- 	(set_interactive): New.
-	(e_shell_create_view): Make interactive.
-	(view_destroy_cb): If no views are left, make non-interactive.
-
-	* evolution-shell-component.c (class_init): Set up the
-	"interactive" signal.
-	(impl_interactive): New implementation for the ::interactive
-	method.
-	(class_init): Install.
-
-	* evolution-shell-component.h: New signal `interactive'.
-
-	* Evolution-ShellComponent.idl: New method ::interactive.
-
-2001-10-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (tree_drag_data_received): Pass the
-	@folder_type to ::handleDrop.
-
-	* evolution-shell-component-dnd.c
-	(impl_GNOME_Evolution_ShellComponentDnd_DestinationFolder_handleMotion):
-	New arg @folder_type.
-	(impl_GNOME_Evolution_ShellComponentDnd_DestinationFolder_handleDrop):
-	Likewise.
-
-	* evolution-shell-component-dnd.h: Add @folder_type to
-	`DndDestinationFolderHandleDropFn' and
-	`DndDestinationFolderHandleMotionFn'.
-
-	* e-storage-set-view.c (tree_drag_motion): Pass the folder type to
-	`::handleMotion'.
-
-	* Evolution-ShellComponentDnd.idl: Pass @folder_type in
-	::handleDrop and ::handleMotion.
-
-2001-10-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (command_about_box): Use EShellAboutBox.
-	(zero_pointer): Removed.
-
-	* e-shell-about-box.h: New.
-	* e-shell-about-box.c: New.
-
-2001-10-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (evolution_SOURCES): Ooops.  Remove stale files
-	`e-shell-about-box.[ch]'.
-
-2001-10-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (impl_Shell_selectUserFolder): Set the parent
-	according to the XID we get.
-
-	* Evolution-Shell.idl: New arg @parent_xid in `::selectUserFolder'.
-
-	* evolution-shell-client.c
-	(evolution_shell_client_user_select_folder): New arg @parent.
-	(user_select_folder): Likewise.  Pass it to the CORBA method.
-
-2001-10-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (idle_cb): Urgh.  Remove stale line that caused
-	`display_default' to be set to TRUE for all the non-NULL shell
-	cases.
-
-2001-10-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (set_owner_on_components): Re-set the owner on the
-	component that raised OldOwnerHasDied.
-
-2001-10-15  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-startup-wizard.c (prepare_importer_page): Stop the prepare
-	running twice.
-
-2001-10-14  Dan Winship  <danw@ximian.com>
-
-	* e-corba-storage.c (async_folder_cb): 
-	* e-storage.c (e_storage_result_to_string): Add two missing codes.
-
-2001-10-13  Dan Winship  <danw@ximian.com>
-
-	* evolution-shell-component-utils.c (e_activation_failure_dialog):
-	New function to try to activate a component when you know it's
-	going to fail, and then pop up a dialog explaining why it failed.
-
-2001-10-12  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-importer.c (prepare_intelligent_page): Flush the gdk 
-	functions so that the window will be shown.
-
-	* e-shell-startup-wizard.c (make_mail_dialog_pages): Fix some
-	strings.
-	(prepare_importer_page): Flush GDK functions so that the window 
-	is shown.
-
-2001-10-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #7643, Starting new view doesn't honor "view" settings.]
-
-	* e-shell-view-menu.c (command_open_folder_in_new_window): Pass
-	the parent @shell_view as the @template_view arg to
-	`e_shell_create_view()'
-
-	* e-shell-view.c (activate_shortcut_cb): Pass the _view as the
-	@template_view arg to `e_shell_create_view()'.
-
-	* e-shell-folder-commands.c
-	(e_shell_command_open_folder_in_other_window): Pass the parent
-	@shell_view as the @template_view arg to `e_shell_create_view()'.
-
-	* e-shell.c (e_shell_create_view): New arg @template_view.
-	(impl_Shell_createNewView): Pass %NULL as @template_view when
-	calling it.
-	(e_shell_restore_from_settings): Likewise.
-
-2001-10-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (quit_box_new): Also flush GDK after flushing GTK.
-	Otherwise GTK might queue draw requests to X that don't get
-	executed.
-
-2001-10-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Hopefully really fix #8615 and friends.]
-
-	* main.c (no_views_left_cb): Invoke `e_shell_disconnect_db()'
-	before unreffing the shell.
-
-	* e-shell.c (e_shell_disconnect_db): New.
-	(destroy): Call it instead of unreffing the db manually here.
-
-2001-10-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c
-	(folder_selection_dialog_folder_selected_callback): Don't free the
-	folder_command_data here.  It is supposed to be freed in the async
-	callback.  The leak that Dan supposedly fixed was probably only
-	due to the fact that the component that was supposed to perform
-	the xfer didn't report a result.  Now that xfer actually works, it
-	was triggering the crash instead.  [Fixes #9769.]
-
-2001-10-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-offline-handler.c (prepare_for_offline): Only invoke
-	`progress_listener_servant_free()', no need to also do `__fini()'
-	on it as `__fini()' is also called by the former.  [Fixes #12329.]
-	Also, print out the CORBA exception that gets raised so we have
-	some more clues about what is wrong.
-
-2001-10-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c
-	(reparent_storage_set_view_box_and_destroy_popup): Don't die if
-	the folder_bar_popup is %NULL.  Fixes #10922.
-
-2001-10-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (idle_cb): Display the default view only if we are
-	starting our own shell, or if the command-line has no arguments
-	and we are talking to an already existing shell.
-
-	* e-uri-schema-registry.c
-	(e_uri_schema_registry_set_handler_for_schema): Do not return a
-	value.
-
-2001-10-11  Dan Winship  <danw@ximian.com>
-
-	* Evolution-Storage.idl: Remove "display_name" arg from update
-	methods. It was only there to do the "Inbox (5)" hack, which is
-	supported directly now.
-
-	* evolution-storage.c (impl_Storage_updateFolder): no longer takes
-	display_name.
-	(evolution_storage_update_folder,
-	evolution_storage_update_folder_by_uri): Likewise.
-	(class_init): Update signal signature.
-
-	* evolution-storage-listener.c
-	(impl_GNOME_Evolution_StorageListener_notifyFolderUpdated): No
-	longer takes display_name, but make it pass the unread_count along
-	in the signal it emits.
-	(class_init): Update signal signature.
-
-	* e-local-storage.c (bonobo_interface_update_folder_cb): 
-	* e-corba-storage.c (impl_StorageListener_notifyFolderUpdated): No
-	longer take display_name.
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (handle_evolution_path_drag_motion): Ooops,
-	remove debugging message.
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage.c (e_storage_async_xfer_folder): Make this a no-op if
-	the source and the destination path are the same.
-
-	* e-local-storage.c (impl_async_xfer_folder): return after
-	returning `E_STORAGE_CANTCHANGESTOCKFOLDER' to the callback.
-
-	* e-storage-set-view.c (handle_evolution_path_drag_motion): Make
-	the check for dragging a folder over itself a little bit more
-	accurate.
-
-2001-10-05  Jon Trowbridge  <trow@ximian.com>
-
-	* e-shell-view-menu.c (command_work_offline): This is a message,
-	not a warning!
-	(command_work_online): This is also a message, not a warning!
-	(I'm feeling very anal today.)
-
-2001-10-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (idle_cb): Do not invoke
-	`e_shell_restore_from_settings()' if `shell' is NULL.
-
-2001-10-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_save_settings): Get the right
-	hpaned positions for when the shortcut bar and/or the folder bar
-	are visible.
-
-2001-10-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (impl_Shell_handleURI): Handle the return value from
-	`evolution_shell_component_client_handle_external_uri()' as an
-	EvolutionShellComponentClientResult instead of treating it as a
-	boolean.  This prevents the incorrect NotFound exceptions we were
-	getting for `mailto:' invocations.
-
-2001-10-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (quit_box_new): Also `gdk_flush()'.
-	(idle_cb): If the user doesn't specify at least one `evolution:'
-	URI, restore from the settings.  [Fixes #6093.]
-
-2001-10-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c: New member `ping_timeout_id' in
-	`EvolutionShellComponentPrivate'.
-	(setup_owner_pinging): New helper function.
-	(impl_owner_died): Unref the owner and set ->owner_client to
-	%NULL.
-	(impl_setOwner): Don't unref here.
-	(destroy): Remove the source for ->ping_timeout_id if not -1.
-
-2001-10-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c: #include "e-util/e-gtk-utils.h".
-	(quit_box_new): Queue a draw on the window; otherwise it seems to
-	fail to redraw in some cases for some reason [see #11412].
-
-2001-10-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c (impl_setOwner): If the owner is
-	dead, emit "owner_died" instead of "owner_unset".
-	(impl_owner_died): New, default implementation for "owner_died".
-	(class_init): Install it.
-
-	* evolution-shell-component.h: New signal "owner_died".
-
-2001-10-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (set_owner_on_components): If setting the owner fails,
-	print the a warning message out.  Then restart the component.
-
-	* e-component-registry.c (component_free): Return a boolean value.
-	%FALSE if ::unsetOwner raises an exception.
-	(register_type): New arg @override_duplicate, to avoid complaining
-	if a component gets re-registered.
-	(register_component): Likewise.
-	(e_component_registry_restart_component): New.
-
-	* e-uri-schema-registry.c
-	(e_uri_schema_registry_set_handler_for_schema): Changed return
-	type to `void'.  Just remove the old handler and set up the new
-	one.
-
-	* evolution-shell-component-client.c (corba_exception_to_result):
-	Translate ::OldOwnerHasDied into
-	EVOLUTION_SHELL_COMPONENT_OLDOWNERHASDIED.
-
-	* evolution-shell-component.h: New enum value
-	`EVOLUTION_SHELL_COMPONENT_OLDOWNERHASDIED'.
-
-	* evolution-shell-component.c (impl_setOwner): If the old owner is
-	not alive anymore [use CORBA_Object_non_existent() to figure this
-	out], emit OWNER_UNSET and raise `OldOwnerHasDied'.
-	(evolution_shell_component_result_to_string): New.
-
-	* Evolution-ShellComponent.idl: New exception `OldOwnerHasDied'.
-	(ShellComponent::setOwner): Can raise it.
-
-	* e-folder-type-registry.c
-	(e_folder_type_register_type_registered): New.
-	(e_folder_type_register_unregister_type): New.
-
-2001-10-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importer/Makefile.am: added BONOBO_GNOME_CFLAGS to make it compile
-	with latest Bonobo
-
-2001-10-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #11326, The folder list can become detached from its parent
-	window.]
-
-	* e-shell-view.c (folder_context_menu_popped_down_cb): Pop down
-	the folder bar if it's popped up.
-
-2001-10-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_component_maybe_crashed): Make the crash
-	message less dorky.  [#10264]
-
-2001-10-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Don't allow dragging from a folder to one of its descendants or
-	onto itself, when the operation is GDK_DRAG_MOVE.  This fixes bugs
-	like #8737.]
-
-	* e-storage-set-view.c (handle_evolution_path_drag_motion): Don't
-	highlight if the user is attempting to move a folder to one of its
-	descendants.
-
-2001-10-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_construct): Use
-	`bonobo_ui_component_new_default()', not
-	`bonobo_ui_component_new()'.
-
-2001-10-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (storage_set_removed_folder_callback): New,
-	callback for the ::removed_folder signal on the shell's
-	EStorageSet.
-	(e_shell_view_construct): Connect.
-	(e_shell_view_remove_control_for_uri): Removed.
-
-	* e-shell-folder-commands.c
-	(folder_selection_dialog_folder_selected_callback): Don't call
-	`e_shell_view_remove_control_for_uri()'.
-	(e_shell_command_delete_folder): Not here either.  And don't
-	display the default URI either.
-
-2001-09-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #8053, `GNOME_Evolution_Shortcuts' doesn't seem to work.]
-
-	* e-shell.c (e_shell_construct): Don't create the EShortcuts
-	object a second time.
-
-2001-09-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #8434, Shortcut bar not shown properly.]
-
-	* e-shell-view.c (e_shell_view_show_shortcut_bar): Set the
-	hpaned_position from the EPaned *before* hiding it -- otherwise,
-	the position will of course always be zero.
-	(e_shell_view_save_settings): Save from ->hpaned_position and
-	->view_hpaned_position.
-
-2001-09-28  Iain Holmes  <iain@ximian.com>
-
-	* importer/import.glade: Add new pages.
-
-	* e-shell-importer.c (show_import_wizard): Set up new pages.
-	(import_druid_finish): Check which type of importer to run.
-
-2001-09-26  Iain Holmes  <iain@ximian.com>
-
-	* Evolution-Shell.idl: Added a default_type parameter for setting the
-	default folder creation type.
-
-	* e-shell-folder-commands.c (e_shell_command_create_new_folder): Add NULL
-	for default type.
-	(e_shell_command_move_folder): Add NULL for default type.
-
-	* e-shell-folder-creation-dialog.c (add_folder_types): Check for the
-	default_type instead of for mail.
-	(get_type_from_parent_path): Get the folder type from the parent folder
-	(e_shell_show_folder_creation_dialog): Get the default folder type
-	before creating the menu.
-
-	* e-shell-folder-creation-dialog.h: Update headers.
-
-	* e-shell-folder-selection-dialog.c (impl_clicked): Add default type.
-	(e_shell_folder_selection_dialog_construct): Add default type.
-	(e_shell_folder_selection_dialog_new): Add default type.
-
-	* e-shell-folder-selection-dialog.h: Update headers.
-
-	* e-shell-importer.c (import_druid_finish): Add NULL for default type.
-
-	* e-shell-view-menu.c (command_new_folder): Set NULL for default type.
-	(command_goto_folder): Set NULL for default type.
-
-	* e-shell.c (impl_Shell_selectUserFolder): Update for the new default
-	type.
-
-	* evolution-shell-client.c (user_select_folder): Add "" for default type
-
-2001-09-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (DEFINE_UNIMPLEMENTED): Remove.
-	(command_new_mail_message): Removed.
-	(command_pilot_settings): New.
-	(e_shell_view_menu_setup): Add tools verbs.
-
-2001-09-26  Ettore Perazzoli  <ettore@ximian.com>
-	* e-shell-view.c (setup_verb_sensitivity_for_folder): New helper
-	function.
-	(folder_selected_cb): Call it.
-	(folder_context_menu_popping_up_cb): New callback for the
-	"folder_context_menu_popping_up" signal on the folder bar's
-	EStorageSetView; set the sensitivities of the verbs according to
-	the right-clicked folder.
-	(folder_context_menu_popped_down_cb): New, callback for the
-	"folder_context_menu_popped_down" signal on the folder bar's
-	EStorageSetView; set the sensitivities of the verbs according to
-	the currently displayed folder.
-	(e_shell_view_get_folder_bar_right_click_path): Add a cast to
-	placate a warning.
-
-	* e-storage-set-view.c (class_init): Set up the
-	"folder_context_menu_popping_up" and
-	"folder_context_menu_popped_down" signals.
-	(right_click): Emit "folder_context_menu_popping_up" before
-	popping up the menu, "folder_context_menu_popped_down" after the
-	menu is gone.
-
-	* e-storage-set-view.h: New signals
-	"folder_context_menu_popping_up" and
-	"folder_context_menu_popped_down".
-
-2001-09-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c (e_shell_command_rename_folder):
-	Change the name on the EFolder object too.
-
-2001-09-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage.c (e_storage_async_xfer_folder): Ooops.  Make the
-	check for CANTMOVETODESCENDANT really work.
-
-	* e-storage-set-view.c (tree_drag_data_received): Pass the
-	EStorageSetView as the data for the async_xfer function.
-	(folder_xfer_callback): Display an error dialog if something goes
-	wrong.
-
-	* e-shell-view-menu.c (command_rename_folder): Enable again.
-
-	* e-shell-folder-commands.c (e_shell_command_rename_folder):
-	Re-implemented.
-	(delete_dialog): Use double quotes instead of single quotes around
-	the folder name, for consistency with the other dialogs.
-
-2001-09-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (get_path_for_folder_op): New helper
-	function.
-	(command_move_folder): Pass the @folder_path argument to
-	`e_shell_command_move_folder' by using it.
-	(command_copy_folder): Pass the @folder_path argument to
-	`e_shell_command_copy_folder' by using it.
-	(command_delete_folder): Pass the @folder_path argument to
-	`e_shell_command_delete_folder()' by using it.
-	(command_add_folder_to_shortcut_bar): Pass the @folder_path
-	argument to `e_shell_command_add_to_shortcut_bar()' by using it.
-	(command_create_folder): Pass the @parent_folder_path argument to
-	`e_shell_command_create_new_folder()' by using it.
-	(command_new_folder): Use `get_path_for_folder_op()'.
-
-	* e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar):
-	New arg @folder_path.
-	(e_shell_command_copy_folder): New arg @folder_path.
-	(e_shell_command_move_folder): New arg @folder_path.
-	(e_shell_command_open_folder_in_other_window): New arg @folder_path.
-	(e_shell_command_create_new_folder): New arg @parent_folder_path.
-	(e_shell_command_delete_folder): New arg @folder_path.
-
-	* e-shell-view.c (e_shell_view_get_folder_bar_right_click_path): New.
-
-	* e-storage-set-view.c: New member `right_click_row_path'.
-	(init): Init to NULL.
-	(destroy): Free.
-	(right_click): Set.
-	(popup_folder_menu): Use `gnome_popup_menu_do_popup_modal()' so we
-	are stuck in here until the menu disappears.  After that, destroy
-	the menu and  call `e_tree_right_click_up()'.
-	(e_storage_set_view_get_right_click_path): New.
-
-2001-09-21  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-importer.c (folder_selected): Use GNOME functions to get
-	full expanded path from file entry.
-
-2001-09-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (tree_drag_motion): Check for a component
-	for the given row *after* trying to handle
-	EVOLUTION_PATH_TARGET_TYPE.  Otherwise, we always fail in the case
-	of dnd between a folder and the toplevel node of its storage.
-	(find_matching_target_for_drag_context): If not on a folder,
-	always return EVOLUTION_PATH_TARGET_TYPE.
-
-2001-09-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (storage_set_view_box_event_cb): Removed.
-	(folder_bar_popup_map_callback): Don't connect.
-	(reparent_storage_set_view_box_and_destroy_popup): Don't ungrab
-	here.
-	(popdown_transient_folder_bar): Ungrab here.
-	(popdown_transient_folder_bar_idle): New.
-	(switch_on_folder_tree_click): Invoke it in the idle loop.  Also,
-	ungrab.
-
-2001-09-20  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-startup-wizard.c (e_shell_startup_wizard_create): Check
-	the number of mail accounts that exist and display the dialog it this
-	is 0.
-
-2001-09-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-task-widget.c: New member `tooltips' in `ETaskWidgetPrivate'.
-	(init): Init to NULL.
-	(e_task_widget_construct): Create a GtkTooltips and make
-	`tooltips' point to it.
-	(e_task_widget_update): Set the tooltip for the label too.
-
-2001-09-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c: Removed globals `activity_client',
-	`progress'.
-	(timeout_callback_3): Get the activity client from @data.
-	(timeout_callback_2): Likewise here.  Pass the activity client as
-	the user data pointer for `gtk_timeout_add()'.  Put the progress
-	count in a "my_progress" GtkObject data key.
-	(timeout_callback_1): Pass the newly created EActivityClient as
-	the user data pointer for `gtk_timeout_add()'.  Also, dispatch
-	itself again with a random timeout delay, for a maximum of
-	NUM_ACTIVITES times.  Initialize the "my_progress" GtkObject data
-	to be -1.
-
-	[Lame hack to reduce the number of parallel operations reported by
-	the same component displayed in the task bar.]
-
-	* e-activity-handler.c: New member `component_id' in
-	`ActivityInfo'.
-	(activity_info_new): New arg @component_id.  Init the
-	`component_id' member accordingly.
-	(activity_info_free): Free the `component_id' member.
-	(impl_operationStarted): Pass the component_id to
-	`activity_info_new()'.
-	(task_widget_new_from_activity_info): Pass the component_id to the
-	activity_info.
-
-	* e-task-widget.c: New member `component_id' in
-	`ETaskWidgetPrivate'.
-	(impl_destroy): Free it.
-	(init): Init to NULL.  Also init all the other members to NULL as
-	well.
-	(e_task_widget_construct): New arg @component_id.  Assign
-	->component_id to match it.
-	(e_task_widget_new): New arg @component_id here as well.  Pass it
-	over to `e_task_widget_construct()'.
-	(e_task_widget_get_component_id): New.
-
-2001-09-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (handle_evolution_path_drag_motion): New
-	arg @row.  Highlight that row.
-	(tree_drag_motion): Pass @row to
-	`handle_evolution_path_drag_motion()'.
-
-2001-09-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-splash.c: #include "e-gtk-utils.h".
-
-2001-09-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-splash.c (e_splash_construct): Make the canvas backing stored.
-
-2001-09-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (quit_box_new): Call `e_make_widget_backing_stored()' on
-	the widget so it refreshes properly even when we are busy waiting
-	on CORBA calls.
-
-2001-09-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (quit_box_new): New.
-	(quit_box_destroyed_callback): New.
-	(no_views_left_cb): Use these two functions to display a warning
-	message when Evolution is quitting.
-
-2001-09-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (impl_Shell_getLocalStorage): Only raise NotReady if
-	the local storage pointer is actually NULL.  This way it is
-	possible for the components to access the local storage during
-	initialization even if the shell is not quite finished
-	initializing yet.
-
-2001-09-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #9060, Shell crash after mailer crash.]
-
-	* e-shell-view.c (hash_foreach_destroy_view): Renamed from
-	`hash_forall_destroy_view'.  Don't free `name'.
-	(socket_destroy_cb): Use `g_hash_table_lookup()' instead of
-	`g_hash_table_lookup_extended()'.  Don't free the URI.
-	(e_shell_view_remove_control_for_uri): Likewise.
-	(show_existing_view): Use view->uri as the key when inserting the
-	view.  Remove the old view from the hash when destroying it.
-	(create_new_view_for_uri): Same here.
-
-2001-09-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_show_folder_bar): Hide the
-	storage_set_view_box *before* getting the child1_size [otherwise,
-	the latter will, um, always be zero].
-
-2001-09-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (etree_get_node_by_id): Made save_id const
-	here.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Automake 1.5 fixes pointed out by Richard Boulton
-	<richard@tartarus.org>, as per #9258.]
-
-	* importer/Makefile.am (CLEANFILES): Assign directly using `=',
-	instead of `+='.
-	* Makefile.am (CLEANFILES): Likewise.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (impl_Shell_getLocalStorage): Return a proper value.
-	(impl_Shell_createStorageSetView): Likewise.
-	(impl_Shell_setLineStatus): Likewise.
-	(impl_Shell__get_displayName): Likewise.
-	(impl_Shell_getComponentByType): Likewise.
-	(impl_Shell_createNewView): Likewise.
-	(impl_Shell_handleURI): Likewise.
-
-2001-09-14  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-importer.c (start_import): Only check for local path if the
-	folderpath != NULL.
-
-	* e-shell-startup-wizard.c (prepare_importer_page): Remove GTK_CLIST 
-	cast.
-
-2001-09-12  Iain Holmes  <iain@ximian.com>
-
-	* evolution-wizard.c: Remove spewage.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-importer.c (start_import): Removed unused variable.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #8204 and the other bugs caused by allowing invocations on
-	the ::Shell interface to happen before the shell is actually fully
-	initialized.  This is a lame hack and not a nice, complete
-	solution for the problem, but it should do for now.]
-
-	* e-shell.c: New member `is_initialized' in `EShellPrivate'.
-	(init): Initialize to %FALSE.
-	(e_shell_construct): Set `is_initialized' to %TRUE after the
-	initialization sequence is finished.
-	(raise_exception_if_not_ready): New utility function to raise the
-	notReady exception if the shell is not ready.
-	(impl_Shell__get_displayName): Call it.
-	(impl_Shell_getComponentByType): Likewise.
-	(impl_Shell_createNewView): Likewise.
-	(impl_Shell_handleURI): Likewise.
-	(impl_Shell_selectUserFolder): Likewise.
-	(impl_Shell_getLocalStorage): Likewise.
-	(impl_Shell_createStorageSetView): Likewise.
-	(impl_Shell_setLineStatus): Likewise.
-	(e_shell_construct): Print out the repo_id of the exception from
-	`bonobo_get_object()' if it fails.  Also, register on OAF just
-	before displaying the splash.
-
-	* Evolution-Shell.idl: New exception `NotReady'.  All the CORBA
-	methods on ::Shell can now raise this exception.
-
-2001-09-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #5990, Remembering Evolution window geometry.]
-
-	* e-shell.c (impl_Shell_createNewView): gtk_widget_show() the new
-	view returned by `e_shell_create_view()'.
-	(e_shell_restore_from_settings): Same here, after loading the
-	settings.
-
-	* e-shell-view.c (activate_shortcut_cb): gtk_widget_show() the new
-	view returned by `e_shell_create_view()'.
-
-	* e-shell-view-menu.c (command_open_folder_in_new_window):
-	gtk_widget_show() the view returned by `e_shell_create_view()'.
-
-	* e-shell-folder-commands.c
-	(e_shell_command_open_folder_in_other_window): gtk_widget_show()
-	the view returned by `e_shell_create_view()'.
-
-	* e-shell.c (e_shell_create_view): Don't show the view
-	automatically anymore.
-
-	* e-shell-view.c (e_shell_view_save_settings): Save the width and
-	height of the window.
-	(e_shell_view_load_settings): Restore the width and the height and
-	gtk_window_set_default_size() based on them.
-
-2001-09-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Remove a bunch of debugging messages, as per #7741.]
-
-	* evolution-wizard.c (impl_GNOME_Evolution_Wizard_notifyAction):
-	Removed debugging messages.
-
-	* e-storage-set.c (storage_removed_folder_cb): Removed debugging
-	message.
-
-	* e-storage-set-view.c (tree_drag_begin): Removed debugging
-	message.
-	(tree_drag_data_received): Removed debugging messages.
-
-	* e-shortcuts.c (idle_cb): Removed debugging message.
-
-	* e-shortcuts-view-model.c (get_icon_for_item): Removed debugging
-	message.
-
-	* e-shell.c (setup_components): Removed debugging message.
-
-	* e-shell-startup-wizard.c (druid_event_notify_cb): Removed
-	debugging message.
-	(e_shell_startup_wizard_create): Removed debugging message.
-
-	* e-shell-offline-handler.c (finalize_offline_hash_foreach):
-	Removed debugging message.
-
-	* e-shell-importer.c (start_import): Removed debugging message.
-	(item_selected): Same here.
-
-	* e-local-storage.c (async_xfer_folder_step): Removed debugging
-	message.
-
-	* e-corba-storage.c (impl_StorageListener_notifyFolderCreated):
-	Changed the error from a g_print() into a g_warning().  Removed
-	debugging message.
-
-	* e-corba-storage-registry.c (impl_StorageRegistry_addStorage):
-	Removed debugging message.
-	(impl_StorageRegistry_removeStorageByName): Likewise.
-
-	* e-component-registry.c (component_free): Removed debugging
-	message.
-	(register_component): Don't printf() about the registered folder
-	type.
-	(register_component): Don't printf() about the registered schema
-	type.
-
-2001-09-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (pop_up_folder_bar): Disable DnD on the
-	EStorageSetView to avoid strange behaviors.
-	(reparent_storage_set_view_box_and_destroy_popup): Re-enable DnD
-	here.
-	(popdown_transient_folder_bar): And here as well.
-
-	* evolution-storage-set-view-factory.c
-	(evolution_storage_set_view_factory_new_view): Disable DnD on the
-	EStorageSetView.
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_construct): Disable DnD on the
-	EStorageSetView.
-
-	* e-shell-folder-creation-dialog.c (add_storage_set_view): Disable
-	DnD on the EStorageSetView.
-
-	* e-storage-set-view.c: New member `allow_dnd' in
-	`EStorageSetViewPrivate'.
-	(init): Init to `allow_dnd' %TRUE.
-	(tree_start_drag): If `allow_dnd' is false, don't start the drag
-	and return %FALSE.
-	(tree_drag_motion): If `allow_dnd' is false, return %FALSE.
-	(e_storage_set_view_get_allow_dnd): New.
-	(e_storage_set_view_set_allow_dnd): New.
-
-2001-09-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (main): Add SUB_VERSION to the version string passed to
-	`gnome_init_with_popt_table()'.
-
-2001-09-12  Chris Toshok  <toshok@ximian.com>
-
-	* e-shell-importer.c (start_import): only allow importing to
-	/local folders.
-
-2001-09-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #4962, "Highlighting is left after a drag".]
-
-	* e-storage-set-view.c (tree_drag_motion): Only highlight when
-	moving over allowed targets.
-
-2001-09-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-title-bar.c (unrealize): Only
-	gtk_widget_destroy() the icon_widget if it's not NULL.
-
-2001-09-12  Iain Holmes  <iain@ximian.com>
-
-	* importers/evolution-importer-client.c 
-	(evolution_importer_client_process_item): Remove spew.
-
-2001-09-10  Dan Winship  <danw@ximian.com>
-
-	* e-shell-view.c (socket_destroy_cb): Oops. Remove duplicate free.
-
-2001-09-09  Dan Winship  <danw@ximian.com>
-
-	Purify run. All small leaks.
-	
-	* e-shell-folder-commands.c
-	(folder_selection_dialog_folder_selected_callback): Free the
-	folder_command_data when destroying the dialog.
-
-	* e-local-storage.c (remove_folder): Free physical_uri if we
-	allocated it.
-
-	* e-shortcuts-view.c (pop_up_right_click_menu_for_group): Unref
-	the popup menu, don't destroy it.
-	(destroy_group_cb): Free the question string.
-	(rename_group_cb): Free the new_name.
-
-	* e-shell-importer.c (create_plugin_menu): Free the list of
-	importers.
-	(get_iid_for_filetype): Likewise.
-	(import_druid_finish): #ifdef out some g_strdups that are only
-	used by other #ifdef'ed-out code.
-
-	* e-shell-view.c: Make sure the keys in the uri_to_view hash get
-	freed.
-
-	* e-shell-folder-title-bar.c (set_title_bar_label_style): Unref
-	the style after setting it on the widget.
-
-	* e-shell-offline-handler.c (impl_destroy): free priv.
-
-	* e-storage-set-view.c (tree_drag_data_received): Make sure
-	target_type always gets freed.
-
-	* e-shell-folder-creation-dialog.c (add_folder_types): Don't leak
-	the type names.
-
-2001-09-07  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-startup-wizard.c (prepare_importer_page): New design.
-	(make_importer_page): Remove the extra widgets for the new design.
-
-2001-09-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (tree_start_drag): Changed this to use the
-	new ETable/ETree drag stuff.
-
-2001-09-07  Dan Winship  <danw@ximian.com>
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_new): Remove the "see previous
-	error messages?" comment from the error message when starting a
-	component, since oafd eats the output of the components it
-	launches now, so it's just misleading.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-storage.c (impl_Storage_async_remove_folder): change
-	to match create_folder.
-	(e_marshal_NONE__POINTER_POINTER_POINTER): new marshaller for
-	remove_folder.
-	(class_init): make sure to use the right marshaller for
-	create/remove_folder.
-
-	* evolution-storage.h: change the signature of both the
-	create_folder and remove_folder signals to be more in line with
-	what's in evolution-storage.c.  They both take a Bonobo_Listener
-	which the signal func notifies, instead of synchronously returning
-	the result.
-
-2001-09-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-activity-client.c (evolution_activity_client_update):
-	Allow a value of -1.0 for @progress [which means "unknown
-	progress"].
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #958, ShellComponents should not be created by factories, for
-	the test component.]
-
-	* GNOME_Evolution_TestComponent.oaf: Remove the factory.
-
-	* evolution-test-component.c (COMPONENT_FACTORY_ID): Removed.
-	(component_factory_init): Removed.
-	(register_component): Rename from `component_fn'.  No args, no
-	return value.  Register the thing on OAF by yourself instead of
-	using a factory.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view.c (get_shortcut_info): New.
-	(get_efolder_from_shortcut): Removed.
-	(impl_shortcut_dropped): Use `get_shortcut_info()' instead.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (development_warning): s/Evolution/Ximian Evolution/.
-	(idle_cb): Likewise.
-
-	* e-splash.c (e_splash_construct): s/Evolution/Ximian Evolution/.
-
-	* e-shell-view.c (e_shell_view_construct): s/Evolution/Ximian
-	Evolution/.
-	(update_for_current_uri): Likewise.
-	(update_offline_toggle_status): Likewise.
-
-	* e-shell-view-menu.c (command_about_box): s/Evolution/Ximian
-	Evolution/.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #6474 and friends, crash when selecting things from the
-	context activity context menu.]
-
-	* e-activity-handler.c: New member `menu' in struct
-	`ActivityInfo'.
-	(activity_info_new): Init to NULL.
-	(show_cancellation_popup): Set the `menu' member to point to this
-	newly created pop-up, use `gnome_popup_menu_do_popup_modal()'
-	instead of `gnome_popup_menu_do_popup()', and set the `menu'
-	member to NULL when the menu is gone.
-	(activity_info_free): Destroy `menu' member.
-	(impl_requestDialog): Return
-	`GNOME_Evolution_Activity_DIALOG_ACTION_ERROR' instead of nothing.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #6971, Default folder should be the Summary.]
-
-	* main.c (idle_cb): s/DEFAULT_URI/E_SHELL_VIEW_DEFAULT_URI/.
-
-	* e-shell.c (e_shell_create_view):
-	s/DEFAULT_URI/E_SHELL_VIEW_DEFAULT_URI/.
-
-	* e-shell-view.c (socket_destroy_cb):
-	s/DEFAULT_URI/E_SHELL_VIEW_DEFAULT_URI/.
-	(e_shell_view_save_settings): Likewise.
-
-	* e-shell-folder-commands.c (e_shell_command_delete_folder):
-	s/DEFAULT_URI/E_SHELL_VIEW_DEFAULT_URI/.
-
-	* e-shell-view.h (DEFAULT_URI): Rename to
-	`E_SHELL_VIEW_DEFAULT_URI'.  Change from "evolution:/local/Inbox"
-	to be "evolution:/summary".
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix ^#7675, Crashes trying to empty trash folder.]
-
-	* e-shortcuts.c (e_shortcuts_construct): Use
-	`gtk_signal_connect_while_alive()' so we don't invoke the
-	callbacks on dead EShortcuts objects.
-
-2001-09-04  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-importer.c (start_importer): Report errors in a dialog.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-activity-handler.c (impl_operationProgressing): Just ignore
-	the request if the activity handler has the GTK_OBJECT_DESTROYED()
-	flag set.  This should prevent crashes like #7542 and friends when
-	the components are not well-behaved enough to respect the Bonobo
-	refcounting.
-	(impl_operationStarted): Likewise.
-	(impl_operationFinished): Likewise.
-	(impl_requestDialog): Likewise.
-
-2001-09-04  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-importer.c (start_import): Check the file exists before trying
-	to do anything.
-
-2001-09-04  Iain Holmes  <iain@ximian.com>
-
-	* e-shell.c (e_shell_construct): Make the other components shut down
-	correctly when the first time dialog is cancelled.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (tree_drag_motion): Remove debugging
-	message.
-	(tree_drag_motion): Likewise.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch from Richard Boulton <richard@tartarus.org> to fix #8497,
-	"Warning when shutting view: RootNode not found".]
-
-	* e-storage-set-view.c (e_storage_set_view_construct): Add the
-	root node to the hash.
-	(e_storage_set_view_set_show_folders): Likewise.
-
-2001-08-30  Peter Williams  <peterw@ximian.com>
-
-	* e-local-storage.c (async_xfer_folder_complete): Remove the folder from
-	the EvolutionStorage as well as the EStorage.
-
-2001-08-29  Peter Williams  <peterw@ximian.com>
-
-	* e-storage-set-view.c (etree_node_destroy_func): Only call
-	remove_node_from_hash if it's not the root node.
-	(removed_storage_cb): Don't remove the node from the hash here,
-	because it will be removed in the node_destroyed callback.
-	(removed_folder_cb): Same.
-
-	* e-shell-view.c (e_shell_view_remove_control_for_uri): Disconnect
-	from the destroy signal so as not to confuse ourselves. Also, the
-	page remove in the notebook destroys the control and the socket, so don't
-	do that explicitly.
-
-	* e-shell-folder-commands.c
-	(folder_selection_dialog_folder_selected_callback): Remove the control
-	for the source view if we're moving.
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* e-local-storage.c
-	(setup_folder_as_stock): Don't convert folder name to UTF-8 manually...
-	(setup_stock_folders): ... just use U_() here.
-	(impl_get_display_name): Marked string for translation (with U_).
-
-	* e-storage-set-view.c
-	(storage_sort_callback): s/strcasecmp/g_utf8_collate/
-	(folder_sort_callback): ditto
-
-	* e-summary-storage.c (impl_get_display_name):
-	Marked string for translation (with U_).
-
-2001-08-29  Iain Holmes  <iain@ximian.com>
-
-	* e-local-storage.c (notify_listener): Function to create CORBAany
-	and notify listeners.
-	(component_async_create_folder_callback): Notify the listener again.
-	(create_folder): Handle the Bonobo_Listener again and make it async.
-	(impl_async_create_folder): Pass CORBA_OBJECT_NIL as the listener.
-	(bonobo_interface_create_folder_cb): Make async.
-
-	* evolution-storage.c (notify_bonobo_listener): Removed this broken
-	broken function.
-	(impl_Storage_async_create_folder): Make async, duplicate the listener
-	instead of notifying it.
-	(impl_Storage_async_remove_folder): Notify listener by hand.
-	(e_marshal_NONE__POINTER_POINTER_POINTER_POINTER_POINTER): Return of the
-	worst signal marshaller in Scotland.
-	(class_init): Use the above marshaller for the create_folder signal.
-
-2001-08-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-shell-folder-creation-dialog.c (entry_name_is_valid): Check
-	for \r in the folder name, this is an invalid char. Also take a
-	"reason" argument so we can inform the user why his folder name is
-	invalid.
-	(dialog_clicked_cb): Tell the user why the folder name is invalid.
-
-2001-08-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #8125, Evolution crashes while starting.]
-
-	* e-shortcuts.c (load_shortcuts): Handle the case when there is no
-	URI without crashing.  Only add shortcuts when they are evolution:
-	URIs.
-
-2001-08-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Evolution-ShellComponent.idl: Studlycapsize all the IDs that are
-	not.
-	* Evolution-common.idl: Likewise.
-	* evolution-activity-client.c: Updated accordingly.
-	* evolution-shell-component.c: Likewise.
-	* evolution-storage.c: Likewise.
-	* e-activity-handler.c: Likewise.
-	* e-component-registry.c: Likewise.
-	* e-corba-storage.c: Likewise.
-	* e-shell-user-creatable-items-handlers.c: Likewise.
-
-	* e-local-storage.c (remove_folder): Remove unused variable.
-
-	* e-shell-view.c (update_for_current_uri): Assign zero to
-	`unread_count', not NULL.
-
-	* e-shell-importer.c (import_druid_finish): Remove unused
-	variable.
-
-	* e-shell-user-creatable-items-handler.c: #include
-	"e-corba-utils.h".
-
-	* e-shell-startup-wizard.c: #include "e-shell-startup-wizard.h".
-
-	* e-shell-startup-wizard.h: #include <glib.h>
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (update_for_current_uri): Also display the unread
-	count in the title bar.
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-setup.c (copy_default_stuff): Remove the stupid "do you want
-	me to initialize stuff?" dialog.
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c: Change the `selected_row_path' to be
-	non-const.
-	(destroy): Free it.
-	(e_storage_set_view_set_current_folder): Set the selected_row_path
-	to be this path.
-	(tree_drag_begin): Free the selected_row_path and strdup() the
-	value we assign.
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_remove_control_for_uri): Ooops.
-	Save the pointer to the control for use after the view struct is
-	freed.
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c: New struct `View'.  Replace `uri_to_control' in
-	`EShellViewPrivate' with `uri_to_view'.
-	(view_new): New.
-	(hash_forall_destroy_view): New, replacing
-	`hash_forall_destroy_control'.
-	(destroy): Updated to match the uri_to_control -> uri_to_view
-	changes.
-	(socket_destroy_cb): Likewise.
-	(get_view_for_uri): Renamed from `get_control_for_uri'.  Return a
-	View instead of a GtkWidget.
-	(show_existing_view): Updated to use `get_view_from_uri', get a
-	@view instead of a @control.
-	(e_shell_view_display_uri): Updated to use `uri_to_view' instead
-	of `uri_to_control'.
-	(e_shell_view_remove_control_for_uri): Likewise.
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (update_folder_title_bar): Changed to get a
-	@title and a @type.
-	(update_for_current_uri): Updated accordingly.
-	(update_window_icon): Get a @type instead of a @folder.
-	(update_for_current_uri): Updated accordingly.
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #5978, "If a component dies, it's toolbar buttons remain".]
-
-	* e-shell-view.c (socket_destroy_cb): If the view belongs to a
-	toplevel storage node, get the right type information with
-	`e_storage_get_toplevel_node_uri()' instead of trying to get the
-	[non-existing] folder for it.
-
-2001-08-24  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-startup-wizard.c (druid_event_notify_cb): Implement the other
-	missing events.
-	(make_identity_page):
-	(make_receive_page):
-	(make_extra_page):
-	(make_transport_page):
-	(make_management_page): Add the GnomeDruidPages to the page_list.
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view.c: Added accelerators for the right-click
-	shortcut menu.
-
-2001-08-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* e-shortcuts.c (e_shortcuts_add_default_group): Convert names of the
-	default group and shortcuts to UTF-8 (still no U_ :().
-
-2001-08-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* e-shortcuts-view.c (destroy_group_cb): Convert the name of the group
-	to GTK+ locale before displaying it in a dialog.
-
-2001-08-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (tree_drag_data_received): If we get no
-	data, don't notify the receiving component at all.
-
-2001-08-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #5736, crashing when copying a message with drag and drop.]
-
-	* e-storage-set-view.c (tree_drag_data_received): Handle NULL data
-	gracefully.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage.c (e_storage_async_xfer_folder): If the remove_source
-	is %TRUE and destination is a descendant of the parent, pass an
-	`E_STORAGE_CANTMOVETODESCENDANT' error code to the callback.
-
-	* e-storage.h: New value `E_STORAGE_CANTMOVETODESCENDANT' in
-	`EStorageResult'.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c
-	(folder_selection_dialog_folder_selected_callback): Actually
-	return if the folder is being moved into one of its descendants.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-title-bar.c (label_realize_callback): `#if 0'ed
-	out.
-	(make_bold): Likewise.
-	(e_shell_folder_title_bar_construct): Don't call it.
-
-	* e-local-storage.c (component_async_remove_folder_callback): Only
-	remove the directory if the component succeeds.
-
-2001-08-22  Peter Williams  <peterw@ximian.com>
-
-	* e-local-storage.c (async_xfer_folder_callback): Fix the improper
-	construction of the new folder's physical URI.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (remove_folder): Don't remove the folder
-	directory here.
-	(component_async_remove_folder_callback): Remove it here instead.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #7775, crash trying to do New Task]
-
-	* e-shell-user-creatable-items-handler.c (verb_fn): Make sure we
-	don't pass NULL strings to
-	`GNOME_Evolution_ShellComponent_userCreateNewItem()'.
-
-2001-08-21  Damon Chaplin  <damon@ximian.com>
-
-	* e-gray-bar.c (endarken_style): unref the rc_style.
-
-2001-08-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c: #include "e-shell-startup-wizard.h".
-
-	* e-shell-startup-wizard.h: New.
-
-2001-08-21  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-startup-wizard.c (make_mail_dialog_pages): Show an error
-	window if mailer doesn't respond.
-
-2001-08-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-title-bar.c (label_realize_callback): Fix a leak:
-	unref the EFont after we have used it.  Also, don't crash if
-	`e_font_to_gdk_font()' returns NULL.  [This should fix #7666,
-	Folder View crashes Evo.]
-
-2001-08-21  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-importer.c (start_import): Don't print a NULL.
-
-2001-08-20  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-importer.c (import_druid_finish): Do the correct thing when
-	the new folder button is clicked.
-	(folder_selected): Import the file.
-	(folder_cancelled): Kill the dialog.
-
-2001-08-18  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-startup-wizard.c (make_identity_page):
-	(make_receive_page):
-	(make_extra_page):
-	(make_transport_page):
-	(make_management_page): Check that the mailer has been inited correctly.
-	(e_shell_startup_wizard_create): If some of the pages could not be 
-	created, just stop trying to show the startup wizard.
-
-2001-08-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_load_settings): Don't set the
-	paneds' positions if the respective left-hand elements [i.e. the
-	shortcut bar and the folder bar] are hidden.
-	(e_shell_view_show_folder_bar): Set the paned position to zero
-	when hiding.
-	(e_shell_view_show_shortcut_bar): Likewise.
-
-2001-08-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-startup-wizard.c (finish_func): Don't free the returned
-	displayname.
-
-2001-08-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (pop_up_folder_bar): Make sure we display a pin
-	when we are popped up.
-
-2001-08-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (setup_widgets): Don't set the paned tree
-	position.
-
-2001-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-shell-component.c (impl__get_supported_types): fill
-	the corba sequence for the accepted_dnd_types.
-
-2001-08-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (setup_storage_set_subwindow): Don't show the
-	vbox here.
-	(setup_widgets): Don't show the storage_set_view_box here.
-
-2001-08-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c: Added display_name and description
-	to the type.
-
-	* evolution-shell-component.c (impl__get_supported_types): Pass
-	`display_name' and `description' here.
-	(evolution_shell_component_construct): Likewise.
-
-	* evolution-shell-component.h: New members `display_name',
-	`description' in `EvolutionShellComponentFolderType'.
-
-	* e-component-registry.c (register_type): New args @description
-	and @display_name.  Pass to
-	`e_folder_type_registry_register_type()'.
-	(register_component): Pass the values returned in the sequence
-	from __get_supported_types.
-
-	* e-folder-type-registry.c: New members `display_name' and
-	`description' in `struct _FolderType'.
-	(folder_type_new): New args @description and @display_name.
-	Initialize the respective fields in the `FolderType' accordingly.
-	(folder_type_free): Free `display_name' and `description'.
-	(register_folder_type): New args @display_name, @description.
-	(e_folder_type_registry_register_type): New args @display_name,
-	@description.
-	(e_folder_type_registry_get_description_for_type): New.
-	(e_folder_type_registry_get_display_name_for_type): New.
-
-	* Evolution-ShellComponent.idl: Added `display_name' and
-	`description' fields to the `FolderType' struct.
-
-2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (destroy): Put the bonobo_object_release_unref() for
-	the db at the top in an attempt to fix #7542.
-
-2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-summary-storage.c (e_summary_storage_new): Change type of
-	toplevel node from "Summary" to "summary".  [All the other folder
-	types use lowercase names.]
-
-	* e-shortcuts.c (load_shortcuts): Also use the display name for
-	the storage.
-
-2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts.c (load_shortcuts): Use xmlMemStrdup() to override
-	the type as it's expected to be allocated by libxml later on.
-	Also, get the icon for the storage if the shortcut points to a
-	storage.
-
-	* e-storage-set-view.c (etree_icon_at): Don't special case the
-	Summary storage.  Rather, use `e_storage_get_toplevel_node_type()'
-	for getting the type of the node.
-
-	* e-shortcuts-view-model.c (get_icon_for_item): New helper
-	function.
-	(shortcuts_update_shortcut_cb): Use it.
-	(shortcuts_new_shortcut_cb): Use it.
-	(load_group_into_model): Use it.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c: New constant `MIN_POPUP_TREE_WIDTH'.
-	(pop_up_folder_bar): Make sure the pop-up is always this size or
-	more.
-	(setup_widgets): Pass %FALSE for @shrink to `e_paned_pack1()'.
-	(reparent_storage_set_view_box_and_destroy_popup): Likewise.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (shortcut_bar_visibility_changed_cb): New,
-	replacing `shortcut_bar_mode_changed_cb'.
-	(folder_bar_visibility_changed_cb): New, replacing
-	`folder_bar_mode_changed_cb'.
-	(command_toggle_folder_bar): Use `e_shell_view_show_folder_bar()'
-	instead of `e_shell_view_set_folder_bar_mode()'.
-	(command_toggle_shortcut_bar): Use
-	`e_shell_view_show_shortcut_bar()' instead of
-	`e_shell_view_set_shortcut_bar_mode()'.
-	(e_shell_view_menu_setup): Updated for the
-	"shortcut_bar_visibility_changed" and
-	"folder_bar_visibility_changed" signals and the above changes.
-
-	* e-shell-view.c: New member `folder_bar_popup' in
-	`EShellViewPrivate'.  Replaced `folder_bar_mode' and
-	`shortcut_bar_mode' with `folder_bar_shown' and
-	`shortcut_bar_shown', respectively.
-	(init): Updated to initialize these correctly.
-	(reparent): New helper function.
-	(reparent_storage_set_view_box_and_destroy_popup): New helper
-	function.
-	(popdown_transient_folder_bar): Updated to use the
-	`folder_bar_popup'.
-	(folder_bar_popup_map_callback): Renamed from
-	`storage_set_view_box_map_cb'.
-	(e_shell_view_set_shortcut_bar_mode): Removed.
-	(e_shell_view_set_folder_bar_mode): Removed.
-	(e_shell_view_show_shortcut_bar): New.  All the calls to
-	`e_shell_view_set_shortcut_bar_mode()' replaced with calls to this
-	one.
-	(e_shell_view_show_folder_bar): New.  All the calls to
-	`e_shell_view_set_folder_bar_mode()' replaced with calls to this
-	one.
-	(e_shell_view_folder_bar_shown): New.  All the calls to
-	`e_shell_view_get_folder_bar_mode()' replaced with calls to this
-	one.
-	(e_shell_view_shortcut_bar_shown): New.  All the calls to
-	`e_shell_view_get_shortcut_bar_mode()' replaced with calls to this
-	one.
-	(class_init): Replace signal `folder_bar_mode_changed' with
-	`folder_bar_visibility_changed' and `shortcut_bar_mode_changed'
-	with `shortcut_visibility_changed'.
-	(e_shell_view_save_settings): Use keys "ShortcutBarShown" and
-	"FolderBarShown" instead of "ShortcutBarMode" and "FolderBarMode",
-	respectively.
-	(e_shell_view_load_settings): Likewise.
-
-	* e-shell-view.h: Removed enum `EShellViewSubwindowMode'.  Renamed
-	signal `shortcut_bar_mode_changed' to
-	`shortcut_bar_visibility_changed' and `folder_bar_mode_changed' to
-	`folder_bar_visibility_changed'.
-
-2001-08-17  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Add the Evolution-Wizard.idl file
-
-2001-08-17  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-folder-selection-dialog.c (folder_creation_dialog_result_cb):
-	Check the priv isn't NULL before dereferencing it.
-
-2001-08-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-client.c
-	(evolution_shell_client_set_line_status): g_return_if_fail(), not
-	g_return_val_if_fail().
-
-2001-08-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-client.c
-	(evolution_shell_client_get_local_storage): Added some g_warnings
-	for when we return CORBA_OBJECT_NIL; this might help to figure out
-	what is wrong with bug #6625.  Also, added a missing
-	CORBA_exception_free().
-
-2001-08-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-shell.c (e_shell_construct): Don't destroy the splash twice.
-
-	* e-local-storage.c (setup_folder_as_stock): utf_name should not
-	be const as e_utf8_from_locale_string() returns an allocated
-	buffer.
-
-3001-08-17  Iain Holmes  <iain@ximian.com>
-
-	* Evolution.idl: Add Evolution-Wizard.idl
-
-	* Evolution-Wizard.idl: New file implementing a wizard interface.
-
-	* Makefile.am: Add the wizard stuff and the startup dialog stuff
-
-	* e-shell.c (e_shell_construct): Hide the splash screen and try to
-	start the startup assistant.
-
-	* glade/Makefile.am: Add the evolution-startup-wizard.glade
-
-2001-08-16  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-view-menu.c (authors): Add myself.
-
-	* e-shell-view.c (folder_selected_cb): Desensitize the
-	move/copy/delete/rename in the menus (including right click) for
-	stock folders.
-
-	* Evolution-Icon.idl: Actually remove this file from CVS (its
-	contents are now in Evolution-common.idl).
-
-2001-08-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c: Remove the Help menu verbs and add a
-	"HelpFAQ" verb.
-	(command_help): Removed.
-	(command_help_faq): New, implementation for the "HelpFAQ" verb.
-
-2001-08-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-title-bar.c (label_realize_callback): New
-	callback for the realize signal.
-	(make_bold): New.  Hooks up the label_realize_callback.
-	(e_shell_folder_title_bar_construct): Make the name of the folder
-	bold using it.
-
-2001-08-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-gray-bar.c (endarken_style): Just hardcode the colors.
-
-	* e-shell-folder-title-bar.c (set_title_bar_label_style): New.
-	(e_shell_folder_title_bar_construct): Call it on the labels here,
-	so we get nice white labels.
-
-2001-08-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_component_maybe_crashed): s/the view for `%s'
-	have/the views for `%s' have/.
-
-2001-08-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (etree_icon_at): Remove debugging message.
-
-2001-08-15  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-view-menu.c (command_help): Don't hardcode/build a help
-	URI here, use gnome_help_display() instead, which will figure out
-	what language the user needs, etc.
-	(help_verbs): Adapt these menu items to above changes, they don't
-	need to pass "evolution/foo.html" to command_help, just
-	"foo.html".
-
-	* e-folder.c (e_folder_set_child_highlight): Emit a "changed"
-	signal at the end of this function.  Bug #7232.
-
-2001-08-15  Aaron Weber  <aaron@ximian.com>
-
-	* e-shell-view-menu.c (command_about_box): Changed help menus to
-	point to evolution/ and not evolution-guide/.
-
-2001-08-15  Iain Holmes  <iain@ximian.com>
-
-	* e-summary-storage.c: s/My Evolution/Summary
-
-	* e-storage-set-view.c: s/My Evolution/Summary
-
-2001-08-15  Jason Leach  <jleach@ximian.com>
-
-	* Evolution-Shell.idl: Add a new IDL function,
-	Evolution::Shell::setLineStatus (in boolean).  Bug #3030.
-
-	* e-shell.c (impl_Shell_setLineStatus): Implementation of the
-	above.
-
-	* evolution-shell-client.c
-	(evolution_shell_client_set_line_status): A wrapper function for
-	the above, this is what a component can call to set the shell
-	on/offline.
-
-2001-08-14  Dan Winship  <danw@ximian.com>
-
-	* evolution-storage.c (evolution_storage_new_folder): Use the
-	passed-in unread_count.
-
-	* e-corba-storage.c (impl_StorageListener_notifyFolderCreated):
-	Pass the passed-in unread_count to e_storage_new_folder.
-
-2001-08-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-gray-bar.c (impl_style_set): Chain to the parent class.
-	(endarken_style): Hardcode the colors here.
-
-2001-08-13  Anna Marie Dirks  <anna@ximian.com> 
-
-	* importer/intelligent.c : Changed the "Evolution has found the 
-	following data sources" text in the import dialog to "Evolution
-	can import data from the following files" in an attempt to 
-	increase user-friendliness.
-
-2001-08-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (setup_widgets): Add some little padding to the
-	title bar so it looks nicer.
-
-2001-08-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #7109, Evolution crashes when the splash screen dialog is
-	killed by clicking the "X" button.]
-
-	* e-shell.c (e_shell_construct): Connect
-	`gtk_widget_hide_on_delete()' correctly.
-	
-2001-08-13  Anna Marie Dirks  <anna@ximian.com>
-
-	* importer/import.glade : Changed all instances of "druid"
-	and "wizard" to "assistant". 
-
-2001-08-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (idle_cb): Replaced the chained `if' statements with a
-	`switch' statement for clarity.  Also, don't ref the created
-	shell, and release the object reference properly.
-
-2001-08-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-corba-shortcuts.c (shortcut_list_to_corba): set_release on the
-	sequence, not the buffer.
-
-2001-08-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (view_destroy_cb): Restore the shell reffing/unreffing
-	here.
-
-2001-08-13  Peter Williams  <peterw@ximian.com>
-
-	* e-corba-shortcuts.c (shortcut_list_to_corba): Don't cause an abort
-	if the shortcut group is empty.
-
-2001-08-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (IDLS): Add `Evolution-common.idl'.
-
-2001-08-13  Dan Winship  <danw@ximian.com>
-
-	* evolution-shell-component.c (init): Initialize
-	priv->user_creatable_item_types. [Score: g_new: 0, g_new0: 2]
-
-2001-08-13  Jason Leach  <jleach@ximian.com>
-
-	* e-local-storage.c (remove_folder_directory): Remove unused
-	variable @folder.
-
-	* e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar):
-	Give icons to shortcuts added via Right-click->Add to Shortcut
-	Bar.
-
-2001-08-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_construct): Grab focus on the
-	storage set view.
-
-2001-08-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (setup_folder_as_stock): Use utf 8 to set the
-	name.
-
-2001-08-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (etree_value_at): Remove debugging message.
-
-2001-08-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (setup_widgets): Put the folder title bar into an
-	EGrayBar.
-
-	* e-gray-bar.c: New.
-	* e-gray-bar.h: New.
-
-2001-08-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Finally!  Fix #413, "Support for stock folders", and #786, "i18n:
-	default folder names are not translated".]
-
-	* e-local-storage.c (setup_folder_as_stock): New helper function.
-	(setup_stock_folders): Use it to set the default folders as
-	"stock" folders.  This will give them a translated name and also
-	make them unmodifiable.
-	(load_all_folders): Call `setup_stock_folders()' here.
-
-	* e-shell-folder-commands.c (delete_cb): Display an error dialog
-	if the deletion fails.
-	(e_shell_command_delete_folder): Pass the shell view to the delete
-	callback.
-
-	* e-storage.c (e_storage_result_to_string): Add a string for
-	`E_STORAGE_CANTCHANGESTOCKFOLDER' as well.
-
-	* e-local-storage.c (remove_folder): Don't allow a stock folder to
-	be removed.
-	(impl_async_xfer_folder): Don't allow a stock folder to be moved.
-
-	* e-corba-storage.c (async_remove_folder): Don't allow a stock
-	folder to be removed.
-
-	* e-storage.h: New enum value `E_STORAGE_CANTCHANGESTOCKFOLDER' in
-	`EStorageResult'.
-
-	* e-folder.c: Make member `self_highlight' a :1 int.  New :1 int
-	member `is_stock'.
-	(init): Init `is_stock' to %FALSE.
-	(e_folder_set_is_stock): New.
-	(e_folder_get_is_stock): New.
-
-	* e-local-storage.c (bonobo_interface_update_folder_cb): For now,
-	don't set the display name.
-
-2001-08-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Evolution-common.idl: Add Folder struct here.
-
-	* Evolution-Storage.idl: Removed Folder struct.
-
-	* Evolution.idl: #include <Evolution-common.idl>, not
-	<Evolution-Icon.idl>.
-
-	* Evolution-common.idl: New.
-
-	* Evolution-Icon.idl: Removed.
-
-2001-08-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c (rename_clicked): `#if 0'ed out.
-	(rename_cb): Likewise.
-
-	* evolution-shell-component.c (destroy): Fixed a confusion between
-	GList and GSList.
-
-2001-08-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-user-creatable-items-handler.c (component_free): Only
-	free the `type_list' if not NULL.
-	(setup_menu_xml): Deal with the case of `type_list' being NULL
-	gracefully.
-	(verb_fn): Same here.
-	(add_verbs_to_ui_component): Likewise.
-
-2001-08-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #6787, Removing a storage with children and then re-adding it
-	causes a crash.]
-
-	* e-storage-set-view.c (convert_corba_drag_action_set_to_gdk):
-	Removed `#if 0'ed function.
-	(etree_node_destroy_func): New destroy function.
-	(e_storage_set_view_construct): Set this as the new destroy
-	function on the ETreeMemory.
-
-2001-08-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c (user_create_new_item_callback):
-	Updated to display the parent folder's URI and its type as well.
-
-	* evolution-shell-component.c (impl_userCreateNewItem): Updated to
-	get the @parent_folder_physical_uri and the @parent_folder_type.
-	(class_init): Update the "user_create_new_item" signal to have
-	@parent_folder_physical_uri and @parent_folder_type args.
-
-	* e-shell-view.c (get_type_for_folder): Don't bork on a NULL
-	@physical_uri_return.
-	(e_shell_view_get_current_physical_uri): New.
-	(e_shell_view_get_current_folder_type): New.
-
-	* e-shell-user-creatable-items-handler.c
-	(e_shell_user_creatable_items_handler_setup_menus): Replace
-	@ui_component arg with a @shell_view arg.  Set it on the
-	UIComponent using gtk_object_set_data().
-	(verb_fn): Pass the type and physical URI of the current folder;
-	retrieve that from the shell_view got with gtk_object_get_data().
-
-	* Evolution-ShellComponent.idl
-	(userCreateNewItem): New args @parent_folder_uri,
-	@parent_folder_type.
-
-2001-08-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view.c (show_new_group_dialog): Cast the toplevel to
-	be passed to `e_request_string()' to GtkWindow, not GtkWidget.
-	Also, remove unused variables.
-	(get_efolder_from_shortcut): Constify @item_url.
-	(get_storage_set_path_from_uri): Removed.
-
-	* evolution-shell-component.c (destroy): `p' shall be a GList, not
-	a GSList.
-
-2001-08-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_construct): Add the menu items
-	using the EShellUserCreatableItemsHandler.
-
-	* e-shell-user-creatable-items-handler.c: New.
-	* e-shell-user-creatable-items-handler.h: New.
-
-	* e-shell.c: New member `user_creatable_items_handler' in
-	`EShellPrivate'.
-	(init): Initialize to NULL.
-	(destroy): Unref.
-	(e_shell_construct): Create here.
-	(e_shell_get_user_creatable_items_handler): New accessor.
-	(setup_components): Add the registered components to the
-	user_creatable_items_handler.
-
-	* evolution-test-component.c (factory_fn): Add a couple sample
-	user-creatable items.
-	(user_create_new_item_callback): New callback for the
-	"user_create_new_item" signal on the EvolutionShellComponent.
-	(factory_fn): Connect.
-
-	* e-shell.c (e_shell_get_component_registry): New.
-
-	* evolution-shell-component.c: New enum value
-	`USER_CREATE_NEW_ITEM'.  New member `user_create_item_types' in
-	`_EvolutionShellComponentPrivate'.
-	(init): Init to NULL.
-	(impl_destroy): Free it.
-	(user_creatable_item_type_free): New helper function.
-	(user_creatable_item_type_new): New helper function.
-	(impl_userCreateNewItem): New, implementation for
-	::userCreateNewItem.
-	(class_init): Install the "user_create_new_item" signal and the
-	userCreateNewItem impl.
-	(impl__get_external_uri_schemas): Renamed from
-	`impl_ShellComponent__get_external_uri_schemas'.
-	(impl___get_supported_types): Renamed from
-	`impl_ShellComponent__get_supported_types'.
-	(impl__get_user_creatable_item_types): New, implementation for the
-	`user_creatable_item_types' attribute.
-	(class_init): Install it.
-	(evolution_shell_component_add_user_creatable_item): New.
-
-	* evolution-shell-component.h: Added signal
-	`user_create_new_item'.
-
-	* Evolution-ShellComponent.idl: Added typedefs
-	`UserCreatableItemType', `UserCreatableItemTypeList'.  New
-	attribute `user_creatable_item_types'.
-	(userCreateNewItem): New.
-
-2001-08-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-component-registry.c (destroy): Chain to the destroy handler
-	in the parent class!
-
-	* e-shortcuts-view-model.c (impl_destroy): Likewise.  Sigh.
-
-2001-08-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes, among other things, #5705, "Ampersands not handled
-	correctly in drag + drop".  Thanks to Nat for actually discovering
-	the problem.]
-
-	* e-shortcuts.c (save_shortcuts): Use `xmlNewTextChild()' instead
-	of `xmlNewChild()'.
-
-	* e-local-folder.c (save_metadata): Use `xmlNewTextChild' instead
-	of `xmlNewChild()'.
-
-2001-08-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c
-	(fill_corba_sequence_from_null_terminated_string_array): Set the
-	release flag on the sequence, and CORBA_string_dup() the strings
-	anyway.
-
-2001-08-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c
-	(impl_ShellComponent__get_supported_types): Set the release flag
-	on the returned folder type list too.
-
-	* evolution-activity-client.c (create_icon_from_pixbuf): Set the
-	release flag on the sequence, not the struct that contains it.
-
-2001-08-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-corba-shortcuts.c (shortcut_list_to_corba): Set the release
-	flag for the newly allocated sequence.
-
-	* e-activity-handler.c (impl_operationStarted): Unref the
-	icon_pixbuf.
-
-	* e-task-widget.c (impl_destroy): g_free the private struct.
-
-2001-08-08  Jason Leach  <jleach@ximian.com>
-
-	* e-storage-set-view.c (etree_icon_at): Set the My Evolution icon
-	for the folder tree correctly.
-
-2001-08-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c
-	(impl_ShellComponent__get_supported_types): Fill the CORBA
-	sequence once.
-
-	* e-activity-handler.c (activity_info_free): Unref the icon.
-
-2001-08-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-task-bar.c (e_task_bar_prepend_task): Sigh.  If the function
-	says "prepend", of course the function to call is
-	`g_list_prepend()', not `g_list_append()'.  You dumbass.
-
-2001-08-08  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-folder-creation-dialog.c
-	(storage_set_view_storage_selected_cb): Set the sensitivity for
-	the OK button when a storage is selected too.  Bug #6473.
-
-2001-08-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-activity-client.c (create_icon_from_pixbuf): Set the
-	release flag on the returned icon to %TRUE.
-
-2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts.c (load_shortcuts): If the shortcut points to some
-	folder in the storage set, get the type from it.
-
-	* e-storage-set.c (signal_new_folder_for_all_folders_under_paths):
-	New helper function.
-	(signal_new_folder_for_all_folders_in_storage): New helper
-	function.
-	(e_storage_set_add_storage): Call the latter to emit a
-	"new_folder" signal for all the folders contained in the newly
-	added storage.
-
-2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	[This should fix #5407, application crash on re-opening.]
-
-	* e-shell.c (e_shell_construct): Call
-	`gtk_widget_hide_on_delete()' on the splash.
-
-	* e-splash.c (e_splash_add_icon): Don't check for destruction
-	here.
-	(e_splash_set_icon_highlight): Not even here.
-	(button_press_event): Use a GTK+ cast.
-
-2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view-model.c (load_group_into_model): Get the icon
-	from the folder type registry.
-	(shortcuts_new_shortcut_cb): Likewise.
-	(shortcuts_update_shortcut_cb): Likewise.
-
-	* e-shortcuts-view.c (icon_callback): Removed.
-	(e_shortcuts_view_construct): Don't set the icon callback anymore.
-
-2001-08-07  Jason Leach  <jleach@ximian.com>
-
-	* e-storage-set-view.c (etree_value_at): Don't use a leaky hash to
-	get folder names with unread count, use gtk_object_set_data_full
-	and gtk_object_get_data on the EFolder.
-	(etree_icon_at): Give the "My Evolution" storage an icon through a
-	non-generic way.  Will be replaced by a generic method when other
-	storages get icons too.
-
-2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-activity-client.c
-	(evolution_activity_client_construct): Free the CORBA version of
-	the animated icon.
-
-2001-08-07  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-activity-client.c (impl_destroy): Unref the listener
-	when done.
-
-2001-08-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-title-bar.c: Remove member `hbox' from `struct
-	_EShellFolderTitleBarPrivate'.
-	(make_icon_pixmap): Removed.
-	(rgb_from_gdk_color): Removed.
-	(endarken_style): Removed.
-	(set_style_cb): Removed.
-	(create_arrow_pixmap): Renamed from `create_icon_pixmap'.
-	(get_max_clipped_label_width): New helper function.
-	(size_allocate_icon): New helper function.
-	(size_allocate_button): New helper function.
-	(size_allocate_label): New helper function.
-	(add_icon_widget): New helper function.
-	(realize): Changed to use `add_icon_widget()'.
-	(size_allocate): New function, handler for the ::size_allocate
-	method.
-	(class_init): Install it.
-	(e_shell_folder_title_bar_construct): Changed so that the widget
-	get added to this widget instead of adding an hbox to it and
-	adding the widgets to the hbox.
-	(e_shell_folder_title_bar_set_icon): Changed to use
-	`add_icon_widget()'.
-
-	* e-shell-folder-title-bar.h, e-shell-folder-title-bar.c: Changed
-	to derive from GtkHBox, not GtkEventBox.
-
-2001-08-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (tree_drag_motion): Turn on highlighting on
-	a row by row basis.
-
-2001-08-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
-	Add some padding to the label so that the title doesn't move
-	around when you switch between pop-up and non-pop-up folder bar.
-	Also, change all the GtkLabels to be GtkClippedLabels instead.
-	(e_shell_folder_title_bar_set_title): Updated to use
-	EClippedLabels instead of GtkLabels.
-	(e_shell_folder_title_bar_set_folder_bar_label): Likewise.
-
-	* e-shell.c (impl_Shell__get_displayName): New, implementation for
-	the `displayName' attribute.
-
-	* Evolution-Shell.idl: Added readonly attribute `displayName' to
-	get the canonicalized X11 display name for the shell.
-
-	* e-shell.c (e_shell_construct): Ooops.  Return
-	`E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER' if the OAF registration
-	fails, not `E_SHELL_CONSTRUCT_RESULT_GENERICERROR'.
-
-	* e-shortcuts-view.c (rename_group_cb): Get the toplevel from the
-	shortcuts view, not the widget.
-	(rename_shortcut_cb): Likewise.
-	(show_new_group_dialog): Changed to use `e_request_string()'.
-
-	* evolution-test-component.c: Add the %FALSE value for the
-	`user_creatable' field in the `folder_types' entry.
-
-	* evolution-shell-client.c: New member `shortcuts_interface' in
-	`EvolutionShellClientPrivate'.
-	(destroy): Unref it if not CORBA_OBJECT_NIL.
-	(init): Init to CORBA_OBJECT_NIL.
-	(query_shell_interface): New helper function to query an interface
-	on the shell and spit out warnings if it fails.
-	(evolution_shell_client_construct): Use it to query the ::Activity
-	interface.  Also query the ::Shortcuts interface and set the
-	`shortcuts_interface' member to point to it.
-
-	* e-shell.c: New member `corba_shortcuts' in `EShellPrivate'.
-	(init): Init to NULL.
-	(setup_shortcuts_interface): Helper function to add the
-	::Shortcuts CORBA interface to the shell.
-	(e_shell_construct): Call it.
-
-	* e-corba-shortcuts.c, e-corba-shortcuts.h: New objects
-	implementing the `Evolution::Shortcuts' CORBA interface.
-
-	* Evolution-Shortcuts.idl: New interface for accessing the
-	shortcuts in the shell.
-
-	* e-shell.c (e_shell_get_config_db): Moved down.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (tree_drag_data_received): Some paths here
-	don't set handled properly so lets initialize it to FALSE.
-	(update_folder_with_unread_hash, etree_value_at): constified
-	folder_name here.
-	(init): Initialize priv->drag_path here to NULL.
-
-2001-08-03  Jason Leach  <jleach@ximian.com>
-
-	[Removing Evolution::LocalStorage interface, abstracting the
-	unread counts from a folder's name, also abstract unread counts
-	from a shortcut's name.  Fixes #4489 and #5497]
-
-	* e-shortcuts.c (shortcut_item_new): Take an unread_count argument
-	now.
-	(shortcut_item_update): Ditto.
-	
-	* e-shortcuts-view-model.c (get_name_with_unread): Get a string
-	containing a shortcut name and it's unread, because these are
-	abstracted now.
-	(load_group_into_model): Use the above function to make shortcuts
-	that have unread counts.
-
-	* e-storage-set-view.c (update_folder_with_unread_hash): Keep a
-	hash of folder names with unread counts, because the folder name
-	and it's unread count are to be separated, only the ETree is
-	supposed to present it as one string.
-
-	* e-shell-view.c: Renamed EShellView::view_title_bar to
-	folder_title_bar, to closer match the 
-
-	* e-shell-view-menu.c (new_shortcut_dialog_folder_selected_cb):
-	Make a shortcut with the unread count.
-
-	* e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar):
-	Make a shortcut with the unread count.
-
-	* e-local-storage.c: Updated for API changes.
-
-	* e-folder.c (e_folder_get_unread_count): New function, does what
-	it says.
-	(e_folder_set_unread_count): Ditto.
-
-	* e-corba-storage.c (impl_StorageListener_new_folder): Renamed to
-	match the IDL function name.
-	(impl_StorageListener_update_folder): Ditto.
-	(impl_StorageListener_removed_folder): Ditto.
-
-	* Evolution-Storage.idl (struct Folder): Replace the boolean
-	highlighted with a long unread_count.
-	(updateFolder): Brought in from the now dead
-	Evolution::LocalStorage.
-
-	* Evolution-Shell.idl (getLocalStorage): Return a Storage instead
-	of a LocalStorage.
-
-	* Evolution-LocalStorage.idl: Removed, no longer needed, only used
-	function, updateFolder, has been moved into Evolution::Storage
-	interface.
-	
-	* evolution-local-storage.[ch]: Ditto.
-
-	* evolution-storage.c (impl_Storage_updateFolder): Implementation
-	of the updateFolder taken from ::LocalStorage.
-	(class_init): New "update_folder" signal, taken from
-	evolution-local-storage.c too.
-	(evolution_storage_update_folder): Take an @unread_count int
-	instead of a @highlighted boolean.
-	(evolution_storage_new_folder): Same for here.
-	(evolution_storage_update_folder_by_uri): And here.
-
-	* evolution-storage-listener.h: "update_folder" signal no longer
-	sends a @highlighted boolean.
-
-2001-08-03  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-view-menu.c (update_offline_menu_item): Use Jakub's new
-	"Work Online" icon and fix a typo.
-
-2001-08-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #6232, the thirty-four-splash-screens-at-startup bug.]
-
-	* e-shell.c (setup_local_storage): Add an E_STORAGE() cast to
-	prevent a warning.
-
-	* main.c (idle_cb): Only try to activate from the shell ID if the
-	result is `E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER'; if there is a
-	different error, spit out a dialog box with a description of it
-	and exit instead.
-
-	* e-shell.c (e_shell_construct): Return an `EShellConstructResult'
-	describing what kind of result we had.  Show the splash after the
-	DB has been reached, not before.
-	(e_shell_construct_result_to_string): New function to get a
-	descriptive string out of an `EShellConstructResult'.
-	(e_shell_new): New arg @construct_result_return to return a
-	description of the result of the operation.
-
-	* e-shell.h: New enum `EShellConstructResult'.
-
-	* e-shell.c (impl_Shell_createNewView): Raise `InternalError'
-	instead of crashing if the shell_view returns a CORBA_OBJECT_NIL.
-
-	* Evolution-Shell.idl: New exception `InternalError'.
-	`createNewView' and `handleURI' can raise it.
-
-2001-08-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (storage_sort_callback): Put the storage
-	named E_SUMMARY_STORAGE_NAME on top.
-
-	* e-shell.c: New member `summary_storage' in `EShellPrivate'.
-	(init): Init to NULL.
-	(destroy): Unref if not NULL.
-
-	* e-summary-storage.c: New.
-	* e-summary-storage.h: New.
-
-	* e-storage-set-view.c: New #define `ROOT_NODE_NAME', defined to
-	be "/RootNode".
-	(e_storage_set_view_set_show_folders): Use that instead of "My
-	Evolution".
-	(e_storage_set_view_construct): Hide the root node.  Use
-	`ROOT_NODE_NAME' instead of "My Evolution".
-
-	* e-shortcuts-view.c (icon_callback): No bad special hack for "My
-	Evolution" here.
-
-	* e-shell-view.c (update_window_icon): Remove kludgey
-	@is_my_evolution arg and stop doing special "My Evolution" things.
-	(update_folder_title_bar): Likewise.
-	(update_for_current_uri): Don't do special "My Evolution" things
-	here either.
-	(get_control_for_uri): Don't do the "My Evolution" hack here.
-
-2001-08-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (tree_drag_data_received): Call
-	`gtk_drag_finish()' here.
-
-2001-08-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-offline-handler.c (progress_listener_servant_free):
-	Actually __fini the servant and deactivate the object too.
-	(component_info_free): Updated accordingly [i.e. don't do the
-	deactivation stuff here].
-
-2001-08-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes #4663, startup crash.]
-
-	* e-shell.c (e_shell_construct): Make sure the pointer to the db
-	object is CORBA_OBJECT_NIL if `bonobo_get_object()' raises an
-	exception.
-
-2001-08-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes #3818, crash when going off-line.]
-
-	* e-shell-offline-handler.c (component_info_free): Also call
-	`PortableServer_POA_deactivate_object()' on the progress listener
-	object so it gets deactivated.
-
-2001-08-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_construct): Spit out a warning if we cannot
-	resolve "Bonobo/ConfigDatabase" on "wombat:".  Also, register on
-	OAF only after we are sure we are not going to return FALSE.
-
-2001-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (switch_on_folder_tree_click): Set the
-	`set_folder_uri' to NULL when freeing it.
-
-	* e-task-bar.c (e_task_bar_remove_task): Just destroy the widget.
-	No need to `gtk_container_remove()' it.
-
-2001-08-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-shell-view-menu.c (command_new_folder): Do a NULL-check on
-	current_uri - socket is being closed? (as per the comments for the
-	NULL-check in e-shell-view.c:socket_destroy_cb).
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-activity-client.c: Removed debugging messages.
-
-2001-07-31  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-activity-client.c (evolution_activity_client_update):
-	Also update have_pending_update before calling corba, as below.
-
-2001-07-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	[This should fix #5110, shell crash when switching folders.]
-
-	* evolution-activity-client.c (update_timeout_callback): Set the
-	`have_pending_update' flag before doing the CORBA call.
-	(evolution_activity_client_update): Set the timeout before doing
-	the CORBA call.
-
-2001-07-30  Jason Leach  <jleach@ximian.com>
-
-	* e-shortcuts-view.c (rename_group_cb): Remember the current group
-	so after renaming a group it doesn't flip to the next group.  Bug
-	#3857.
-
-	* e-shortcuts.c (e_shortcuts_rename_group): Comparing two
-	separately allocated strings, use strcmp() instead of !=.
-
-2001-07-30  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-folder-creation-dialog.c (async_create_cb): If we can't
-	create a folder because it already exists, select that folder that
-	exists.  Bug #1716.
-
-2001-07-30  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* main.c (main): call gconf_init if gtkhtml is compiled with gconf
-	support.
-
-	* Makefile.am (INCLUDES): add $(GTKHTML_CFLAGS) since we might
-	need to link with GConf (if gtkhtml is compiled with GConf
-	support)
-
-2001-07-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-activity-client.c (impl_destroy): Remove the source
-	for the timeout *before* invoking the CORBA method, as we might
-	get the timeout callback while invoking the CORBA method, thus
-	screwing things up.
-
-	* evolution-shell-component-client.c (destroy_listener_interface):
-	New helper function.
-	(dispatch_callback): Use it.
-	(impl_destroy): Call it when destroying the listener interface
-	instead of just freeing the servant.
-
-2001-07-26  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-view-menu.c (update_offline_menu_item): Little UI thing:
-	capitalize the words Offline/Online for the File menu.
-
-2001-07-25  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-folder-selection-dialog.c (folder_selected_cb): New
-	function.  When a folder is selected set the OK button to be
-	sensitive (but before that have it desensitized).  Bug #5483.
-	
-2001-07-25  Jason Leach  <jleach@ximian.com>
-
-	* e-shortcuts-view.c (icon_callback): A warning fix from Jacob.
-	Bug #5057.
-
-	* Makefile.am (INCLUDES): $(BONOBO_CONF_CFLAGS) was here twice,
-	took out one of them.
-
-	* e-shell-view.c (socket_destroy_cb): Mem leak fix.  Thanks to the
-	amazing Jacob B.  Bug #5054.
-
-2001-07-25  Jason Leach  <jleach@ximian.com>
-
-	* e-task-widget.c: #include <libgnome/gnome-defs.h> and
-	<libgnome/gnome-i18n.h> instead of the full <libgnome/libgnome.h>,
-	as noted by a comment here.
-
-2001-07-24  Jason Leach  <jleach@ximian.com>
-
-	* e-storage-set-view.c (e_storage_set_view_construct): Add the
-	"/My Evolution" path to the path_to_etree_node hash so that
-	storage_set_view_set_current_folder() can select the My Evolution
-	node when it's the current one.  Fixes #5114 and #3956.
-
-2001-07-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (development_warning): Only show the warning dialog
-	instead of using `gnome_dialog_run()' so it is not modal.  Modal
-	would be nice, but unfortunately it works bad with Bonobo.  Plus
-	Sawfish doesn't like to keep the modal dialog on top, so it gets
-	very confusing for users.
-
-2001-07-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-task-widget.c (e_task_widget_construct): Uhm, set the usize to
-	`1, -1' instead.
-
-2001-07-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-task-widget.c (e_task_widget_construct): Set the usize for the
-	contained hbox to 0x0.
-
-2001-07-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c: Get the manuals from the `evolution-guide'
-	dir as that's where they get installed.
-
-2001-07-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (storage_set_view_box_button_release_event_cb):
-	Don't handle button events whose button number is not 1.
-
-2001-07-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (remove_folder): Pass the folder type to
-	`evolution_shell_component_client_async_remove_folder()'.
-	(async_xfer_folder_step): Likewise with
-	`evolution_shell_component_client_async_xfer_folder()'.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_async_remove_folder): New arg
-	@type.  Pass it to the `ShellComponent::removeFolder' CORBA
-	method.
-	(evolution_shell_component_client_async_xfer_folder): Likewise
-	with `::xferFolder'.
-
-	* evolution-shell-component.c (impl_removeFolderAsync): Add @type
-	arg according to the IDL.
-	(impl_xferFolderAsync): Likewise.
-
-	* evolution-shell-component.h: Add arg @type to
-	`EvolutionShellComponentRemoveFolderFn' and
-	EvolutionShellComponentXferFolderFn'.
-
-	* Evolution-ShellComponent.idl: Add @type arg to
-	`::removeFolderAsync' and `::xferFolderAsync'.
-
-2001-07-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-creation-dialog.c (add_folder_types): Only put
-	the types that are user-creatable in the folder type option menu.
-
-	* evolution-shell-component.c
-	(impl_ShellComponent__get_supported_types): Set the
-	`user_creatable' member too.
-	(evolution_shell_component_construct): Copy the `user_creatable'
-	member too.
-
-	* evolution-shell-component.h: New member `user_creatable' in
-	`EvolutionShellComponentFolderType'.
-
-	* e-component-registry.c (register_type): Pass the user_creatable
-	member of the CORBA FolderType struct.
-
-	* e-folder-type-registry.c: New member `user_creatable' in struct
-	FolderType.
-	(e_folder_type_registry_register_type): New arg @user_creatable.
-	(register_folder_type): Likewise.
-	(folder_type_new): Likewise.
-	(e_folder_type_registry_type_is_user_creatable): New.
-
-	* Evolution-ShellComponent.idl: New member `user_creatable' in
-	`struct FolderType'.
-
-2001-07-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-activity-client.c (impl_destroy): Use
-	`g_source_remove()' instead of `gtk_timeout_remove()' here, as we
-	are using `g_timeout_add()' and not `gtk_timeout_add()' to set up
-	the timeout callback.
-	(update_timeout_callback): Reset `have_pending_update' when
-	returning %TRUE.  Set the timeout id to zero when returning
-	%FALSE.
-
-2001-07-20  Jason Leach  <jleach@ximian.com>
-
-	[Fix a crash if you start evolution with a bad URI.]
-	
-	* e-shell.c (e_shell_create_view): If we can't display the URI,
-	display the default uri.  This is because it's necessary for
-	e_shell_view_display_uri() to run all the way through so corba
-	interfaces get setup.
-	
-	* e-shell-view.c (e_shell_view_display_uri): If we fail to create
-	a new view for a URI (happens if you pass in an invalid URI), be
-	sure to return FALSE.
-
-2001-07-20  Jason Leach  <jleach@ximian.com>
-
-	[This is a better way to have "Local Folders" be shown as the
-	local storage name without breaking current user's shortcuts.]
-
-	* e-corba-storage.c (get_display_name): Implement this, but it's
-	only returning the real name now.  Need to change the IDL soon to
-	let corba storages have separated display names.
-	
-	* e-shortcuts.c (e_shortcuts_add_default_group): Set these default
-	shortcut URI's back to evolution:/local/
-
-	* e-shell-view.h (DEFAULT_URI): Set this back to
-	"evolution:/local/Inbox"
-	
-	* e-storage-set-view.c (etree_value_at): Get the display name for
-	a storage rather than it's true name.
-
-	* e-local-storage.c (impl_get_display_name): Implemented for the
-	local folder (to return a translated "Local Folders").
-
-	* e-storage.c (e_storage_get_display_name): New virtual function
-	for retrieving the display name.
-
-2001-07-19  Jason Leach  <jleach@ximian.com>
-
-	* e-local-storage.h: Make the local storage name "Local Folders"
-	instead of "local", looks better with "My Evolution", "VFolders",
-	and "Other Contacts".
-
-	* e-shell-view.h: Put the #define DEFAULT_URI here instead of in
-	e-shell-view.c.
-
-	* main.c: Remove the duplicated #define STARTUP_URI, actually make
-	use of the nice defines.
-
-	* e-shell-folder-commands.c (e_shell_command_delete_folder): Use
-	the DEFAULT_URI here instead of a hard coded string.
-
-	* e-shortcuts.c (e_shortcuts_add_default_group): Fix the URI's
-	here to use "Local Folder".
-
-2001-07-19  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
-	Line up the padding for the folder title bar labels when you have
-	the folder bar enabled or disabled (previously when disabled it
-	was padding ~8 pixels to the right while the other had 0).
-
-	* e-shell-view.c (setup_widgets): Take out a 2 pixel padding
-	around the vbox containing the title bar, folder bar, message list
-	and mail display.  Also remove 2 more extra pixels of padding on
-	the bottom.
-
-2001-07-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts.c
-	(override_shortcut_name_and_type_from_storage_set): Removed.
-	(load_shortcuts): Don't call it.
-
-2001-07-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #4387, Shortcut bar items don't keep the name after rename.]
-
-	* e-shortcuts.c (update_shortcuts_by_path): Do not change the name
-	of the shortcut if the folder's name changes.
-
-2001-07-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (etree_icon_at): Return an icon for depths
-	greater than 2 as well.
-
-2001-07-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): Connect the
-	"line_status_changed" signal with
-	`gtk_signal_connect_while_alive()' for the shell views, so we
-	don't crash if a view gets destroyed.
-	* e-shell-view.c (e_shell_view_construct): Likewise.
-
-2001-07-12  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-view-menu.c (command_submit_bug): Because
-	bugzilla.ximian does have a mail gateway now, we can have
-	Help->Submit Bug Report open up bug-buddy.
-
-2001-07-12  Iain Holmes  <iain@ximian.com>
-
-	* importers/intelligent.c (create_gui): Remove the g_warnings as
-	they are an annoying red herring
-
-2001-07-12  Dan Winship  <danw@ximian.com>
-
-	* e-shell.c (init): Initialize priv->db and priv->iid so that
-	destroy() won't crash if e_shell_construct bails out before
-	setting them. Reduces bug #4173 to #4169.
-
-2001-07-11  Iain Holmes  <iain@ximian.com>
-
-	* importers/intelligent.c (intelligent_importer_init): Sync the config
-	so that the Don't Ask Again gets saved.
-
-2001-07-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* importers/intelligent.c: Mark a string for translation.
-	
-2001-07-11  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-view.c (e_shell_view_save_settings): Make sure to create
-	~/evolution/config/ if it doesn't exist.  (ShellView settings get
-	saved before component settings, so when the mailer comes around
-	to saving ETree stuff, this dir will be there). Fixes bug #4279.
-
-2001-07-10  Jason Leach  <jleach@ximian.com>
-
-	* e-setup.c (copy_default_stuff): Add a temporary block of code to
-	not use the $GNOME/share/evolution/default_user/shortcuts.xml for
-	users who might be upgrading, so they'll get the shell-generated
-	default set of shortcuts.  See notes on #4394.
-
-2001-07-09  Larry Ewing  <lewing@ximian.com>
-
-	* e-shell-folder-commands.c (delete_dialog): convert the folder
-	name from utf8 before displaying them in the dialog and set the
-	dialog parent.
-
-2001-07-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-shortcuts-view.c: Make the "Rename" item be a
-	GNOMEUIINFO_ITEM_NONE() since we don't have a stock icon; likewise
-	for the "Open in New Window".  This gets rid of warnings from
-	gnome-libs.  Use a better stock icon for the "Remove" command, and
-	add a stock icon to the "Open" command.
-
-2001-07-09  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-view.c (updated_folder_cb): It's very possible that
-	get_storage_set_path_from_uri() returns NULL (5 of the 6 return
-	cases), so check that it's not NULL before trying to strcmp() it.
-	Fixes a startup crash.
-
-2001-07-06  Dan Winship  <danw@ximian.com>
-
-	* e-shortcuts.c (shortcut_item_update): Return a gboolean saying
-	whether or not the shortcut changed. Use strcmp rather than
-	pointer comparisons to determine this.
-	(update_shortcut_and_emit_signal): propagate the gboolean from
-	shortcut_item_update (and only emit the signal if it's TRUE).
-	(update_shortcuts_by_path): Only call make_dirty if something
-	changed.
-	(storage_set_new_folder_callback,
-	storage_set_updated_folder_callback): Don't call make_dirty:
-	update_shortcuts_by_path will have called it if necessary.
-
-	* e-shell-view.c (updated_folder_cb): Don't call
-	update_for_current_uri if the folder that was updated isn't the
-	one being displayed.
-
-2001-07-06  Jason Leach  <jleach@ximian.com>
-
-	* e-shortcuts-view.c: Little UI tweak for right click menu,
-	pronouns shouldn't be capitalized ("This" in this case).
-
-	[Misc fixes and part of #2228, There should be no dialog boxes
-	during startup.]
-	
-	* e-setup.c (e_setup): Check for searches.xml instead of
-	shortcuts.xml, since shortcuts.xml doesn't really need to exist
-	(and thus wouldn't be a necessary test whether ~/evolution was
-	invalid) because shell can generate shortcuts.
-	(copy_default_stuff): For first time users, only present a dialog
-	if a problem occurred.  We've already clicked "Ok" on a dialog
-	about copying files.
-	(check_evolution_directory): Take out the "successfully installed"
-	dialog on updates too.
-
-2001-07-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	[This should fix #3873, Bizzarre crash after deleting a few
-	folders.]
-
-	* e-local-storage.c (remove_folder): Don't free the
-	`physical_path' on error, as it gets freed when freeing the
-	callback data.
-
-2001-07-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #3959, copying a folder over itself crashes Evolution.]
-
-	* e-shell-folder-commands.c
-	(folder_selection_dialog_folder_selected_callback): Sanity checks:
-	don't allow copying a folder over itself, or moving it under one
-	of its descendants.  In such cases, pop up an error dialog.
-
-2001-07-05  Iain Holmes  <iain@ximian.com>
-
-	* e-shortcuts-view.c (icon_callback): Special case the evolution:/My
-	Evolution uri.
-
-2001-07-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c: Removed handler for verb
-	"ChangeFolderProperties".
-	(command_folder_properties): Removed.
-
-	* e-shell-folder-commands.c (e_shell_command_folder_properties):
-	Removed.
-
-2001-07-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (development_warning): Use both `VERSION' and
-	`SUB_VERSION' here.
-	(main): Likewise.
-
-2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* evolution-shell-component-utils.c (e_pixmaps_update): set
-	"pixname" value only if pixbuf was loaded successfully. Otherwise
-	component crashes if image is not found. Should be checked for
-	sanity in bonobo_ui_component_set_prop IMHO.
-
-2001-07-03  Aaron Weber  <aaron@ximian.com>
-
-	* main.c (development_warning): Revised to make it less scary.
-
-2001-07-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix a problem with not being able to save a newly created
-	`shortcuts.xml' file, and another bug that caused the default
-	group to be added at every start-up, even there were groups
-	already.]
-
-	* e-shortcuts.c (e_shortcuts_new): If loading the shortcuts fails,
-	set the file_name.
-	(load_shortcuts): Update `num_groups'.
-
-2001-07-03  Iain Holmes  <iain@ximian.com>
-
-	* importer/Makefile.am: Add bonobo-conf stuff
-
-2001-07-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	[The following makes the shell able to create the `shortcuts.xml'
-	file by itself when the file is not present or corrupted.  Fixes
-	#3668, failure to handle malformed shortcuts.xml file.]
-
-	* e-shell.c (e_shell_construct): If the `e_shortcuts_new()'
-	returns an object with no shortcuts in it, fill it in with
-	`e_shortcuts_add_default_group()'.
-
-	* e-shortcuts.c: New member `num_groups' in EShortcutsPrivate.
-	(init): Init to zero.
-	(e_shortcuts_add_group): Increment.
-	(e_shortcuts_remove_group): Decrement.
-	(e_shortcuts_get_num_groups): New.
-	(e_shortcuts_add_default_group): New function to set up the
-	default shortcuts.
-	(e_shortcuts_new): Return an empty EShortcuts object if loading
-	the file files, instead of returning NULL.
-
-2001-07-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-offline-handler.c
-	(e_shell_offline_handler_put_components_offline): Ref/unref the
-	handler so the signal handlers can unref it safely.  Also, if
-	`prepare_for_offline()' fails, don't say that there was an
-	internal error, as that's confusing.  Just say we couldn't put the
-	components off-line.
-
-	[Fix #3758, clicking on the online/offline button crashed
-	Evolution.]
-
-	* Evolution-Offline.idl: Don't derive OfflineProgressListener from
-	Bonobo::Unknown.
-
-2001-07-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixed #3643, Shell crash when component crashed]
-
-	* e-shell-view.c (socket_destroy_cb): Fix Jason's broken fix for
-	#3205 that was causing #3643.  It is not safe to strcmp() the
-	return value from `e_shell_view_get_current_uri()' as it might be
-	NULL already.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS).
-	(evolution_LDADD): Added $(BONOBO_CONF_LIBS).
-
-2001-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (popup_folder_menu): Don't assert that
-	there is a handler, so we don't crash if user clicks on a folder
-	whose type we cannot handle for some reason [such as an
-	uninstalled component].
-
-	* evolution-test-component.c (activity_client_cancel_callback):
-	New callback for the "cancel" signal on the
-	EvolutionActivityClient object.
-	(activity_client_show_details_callback): New callback for the
-	"show_details" signal.
-	(timeout_callback_1): Connect these two signal handlers.
-
-	* e-activity-handler.c (task_widget_button_press_event_callback):
-	Ahem, right-click is button 3, not button 2.
-	(show_cancellation_popup): Actually pop up the menu.
-	(get_corba_null_value): New helper function to create a CORBA_any
-	null value.
-	(report_task_event): New helper function to report events to the
-	listener.
-	(task_widget_cancel_callback): Use it.  Report "Cancel" instead of
-	"Cancelled".
-	(task_widget_show_details_callback): New, callback for the "Show
-	Details" right-click menu item.
-
-	* evolution-activity-client.c: Updated to dispatch the "Cancel"
-	and "ShowDetails" events as "cancel" and "show_details" signals.
-	(class_init): Install the signals.
-	(listener_callback): Updated to update the signals corresponding
-	to the "ShowDetails" and "Cancel" events.
-
-	* Evolution-Activity.idl: Changed the docs about the events sent
-	to the Bonobo::Listener.  We now only have "ShowDetails" and
-	"Cancelled".
-
-	* evolution-test-component.c (timeout_callback_1): Make the
-	activity cancellable so we can test the right-click cancel menu
-	too.
-
-	* main.c (idle_cb): Actually exit if we cannot reach to the shell.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-uri-schema-registry.c (init): Unset the FLOATING flag on the
-	object.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c: Fixing a bug that could cause Evolution to crash
-	if a new ShellView was created and then destroyed, and then a new
-	folder would appear in the folder tree.  Sigh, this code with the
-	delayed_selection is pretty messed up, but at least this will add
-	some consistency to it and make it safe.
-	(cleanup_delayed_selection): New function to disconnect the
-	"new_folder_cb" callback if the `delayed_selection' is not NULL,
-	and also free the `delayed_selection' itself.
-	(new_folder_cb): Use it.
-	(destroy): Call it here, otherwise we might [a] leak [b] cause a
-	crash as soon as a new folder appears in the folder tree, as
-	"new_folder" gets emitted and our connected signal handler has no
-	EShellView to handle the signal on.
-	(e_shell_view_display_uri): Call it here before re-setting the
-	`delayed_selection'.
-
-	* e-shortcuts-view.c (open_shortcut_in_new_window_cb): Add
-	invocation for `open_shortcut_helper()' back in [it was gone, for
-	unknown reasons].
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (tree_drag_begin): If the node doesn't have
-	a component, just don't start the whole CORBA drag thing instead
-	of crashing with an assertion.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (command_new_shortcut): New, implementation
-	for the "New Shortcut" command create a new shortcut.
-	(goto_folder_dialog_cancelled_cb): Renamed from
-	`folder_selection_dialog_cancelled_callback'.
-	(goto_folder_dialog_folder_selected_cb): Renamed from
-	`folder_selection_dialog_cancelled_callback'.
-
-	* e-shell-folder-selection-dialog.c: New member `allow_creation'
-	in `EShellFolderSelectionDialogPrivate'.
-	(e_shell_folder_selection_dialog_get_allow_creation): New; return
-	the value of `allow_creation'.
-	(e_shell_folder_selection_dialog_set_allow_creation): New; hide or
-	show the "New" button according to the @allow_creation arg.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view.c: Added "Rename Group" command to the
-	right-click group menu item.
-	(rename_group_cb): New callback for the "Rename Group" command.
-
-	* e-shortcuts-view-model.c (shortcuts_rename_group_cb): New,
-	callback for the EShortcuts::rename_group signal.  It renames the
-	group by removing it and creating a new one which is the same;
-	this sucks, but there is no other way with the current shortcut
-	bar widget.
-	(e_shortcuts_view_model_construct): Connect it.
-
-	* e-shortcuts.c
-	(class_init): Install signal "rename_group".
-	(e_shortcuts_rename_group): New.
-
-	* e-shortcuts.h: New signal "rename_group".
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts.c: Removed `title_to_group' hash from
-	`EShortcutsPrivate'.
-	(init): Don't initialize it anymore.
-	(unload_shortcuts): Don't remove the groups from the hash, and
-	don't destroy/realloc the hash.
-	(load_shortcuts): Don't check for duplicate group names.  Don't
-	add the groups to the hash.
-	(destroy): Don't free the hash.
-	(e_shortcuts_get_shortcuts_in_group): Changed to get a @group_num
-	instead of a @group_title.
-
-	* e-shortcuts-view-model.c (load_group_into_model): Updated to
-	pass the group number to `e_shortcuts_get_shortcuts_in_group()'.
-	Removed arg @group_title.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view.c: Added a "Rename" right-click command.
-	(rename_shortcut_cb): New function, implementation for the "Rename
-	command".
-	(rename_shortcut_dialog_cb): Callback for the gnome_request_dialog
-	function to ask the new name.
-
-	* e-shortcuts.c (e_shortcuts_update_shortcut): Call `make_dirty()'
-	so we get saved too.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (activate_shortcut_cb): Receive an @in_new_window
-	arg as well.
-
-	* e-shortcuts-view.c: Added a new "Open in New Window" right-click
-	menu item.  Renamed "Activate" to "Open".
-	(class_init): Update the installation of the "activate_shortcut"
-	signal for the additional @in_new_window_arg.
-	(open_shortcut_helper): New helper function.
-	(open_shortcut_cb): Renamed from `open_shortcut_cb'.  Changed to
-	use `open_shortcut_helper'
-	(open_shortcut_in_new_window_cb): New.
-	(item_selected): Pass %FALSE as the @in_new_window arg for
-	"activate_shortcut".
-
-	* e-shortcuts.c (save_shortcuts): Set the "name" and "type"
-	properties for the <item> nodes too.
-	(load_shortcuts): Change `shortcut_group_title' to be an `xmlChar
-	(shortcut_set): New helper function.
-	(shortcut_update): New helper function.
-	(update_shortcut_and_emit_signal): New helper function.
-	(e_shortcuts_update_shortcut): Use it.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	This is a first shoot at making shortcuts renameable [#3719];
-	unfinished.  Also, it causes the shortcut bar to stop displaying
-	message unread count, but this is unfixable until we get rid of
-	the ::LocalStorage interface, which should hopefully happen soon.
-
-	* e-shortcuts-view.c (icon_callback): Get the icon from the type
-	member of the shortcut item instead of going to the actual folder.
-
-	* e-shell-view.c (updated_folder_cb): Don't update the shortcuts
-	here for now.
-
-	* e-shortcuts-view.c (item_selected): Use
-	`e_shortcuts_get_shortcut()' instead of `e_shortcuts_get_uri()'.
-	(impl_shortcut_dropped): Pass a NULL @name and @type.
-
-	* e-shortcuts-view-model.c (load_group_into_model): Updated to
-	match the new `e_shortcuts_get_shortcuts_in_group()' function that
-	doesn't allocate the list anymore and returns a list of
-	EShortcutItems instead of a list of strings.
-	(load_group_into_model): Likewise.
-	(load_all_shortcuts_into_model): Likewise.
-	(shortcuts_new_shortcut_cb): Get the URI and the name from the
-	EShortcutItem instead of retrieving them from the storage.
-	(shortcuts_update_shortcut_cb): Likewise.
-	(get_storage_set_path_from_uri): Removed [now unused].
-
-	* e-shortcuts.c: Define the shortcuts to be EShortcutItems instead
-	of just strings.
-	(shortcut_new): New helper function to allocate a Shortcut.
-	(shortcut_free): New helper function to free a Shortcut.
-	(shortcut_group_new): New helper function to allocate a
-	ShortcutGroup.
-	(shortcut_group_free): New helper function to free a
-	ShortcutGroup.
-	(load_shortcuts): Use `shortcut_group_new()' here.
-	(e_shortcuts_add_group): Same here.
-	(unload_shortcuts): Use `shortcut_group_free()' here.
-	(e_shortcuts_remove_group): Here too.
-	(load_shortcuts): Update to handle `Shortcut's instead of simple
-	`char *'s representing the URIs.
-	(save_shortcuts): Likewise.
-	(e_shortcuts_get_shortcuts_in_group): Likewise.  The returned list
-	now doesn't belong to the caller anymore; the return type is now
-	const.
-	(removed_folder_cb): Removed.
-	(e_shortcuts_construct): Don't connect.
-	(e_shortcuts_get_group_titles): Dont' re-allocate the string.
-	(e_shortcuts_get_uri): Removed.
-	(e_shortcuts_get_shortcut): New.
-	(e_shortcuts_add_shortcut): new args @name, @type.
-	(e_shortcuts_update_shortcut_by_uri): Remove.
-	(e_shortcuts_remove_shortcut_by_uri): Remove.
-	(get_item): New helper function.
-	(e_shortcuts_get_shortcut): Use it.
-	(find_positions_by_uri): Removed.
-
-	* e-shortcuts.h: New typedef EShortcutItem.
-
-2001-06-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-storage-set-view.c (popup_folder_menu): Pass the event time to
-	gtk_menu_popup() so that we can release the button and have the
-	menu stay up.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-shortcuts-view-model.c (load_all_shortcuts_into_model):
-	Replaced GList with GSList here to fix a type mismatch.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (INCLUDES): Changed $(datadir)/evolution/etspec to
-	"$(etspecdir)" here.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-shortcuts-view-model.c (load_group_into_model): Replaced GList
-	with GSList here to fix a type mismatch.
-
-2001-06-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shortcuts-view-model.c (load_group_into_model): Updated to
-	match the fact that `e_shortcuts_in_group()' now returns a GSList
-	instead of a GList.
-	(load_all_shortcuts_into_model): Likewise for
-	`e_shortcuts_get_group_titles()'.
-
-	* e-shortcuts.c: Change all `groups' and `views' from GLists to
-	GSLists in EShortcutsPrivate.
-	(e_shortcuts_get_group_titles): Return a GSList instead of a
-	GList.
-	(e_shortcuts_get_shortcuts_in_group): Likewise.
-
-2001-06-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #3756, `--debug' option not working anymore.]
-
-	* main.c (main): Get the URI list from popt with `poptGetArgs'
-	instead of just using argv.  Sigh, I am rusty.
-
-2001-06-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #3382, shortcut bar crashes when checking mail, and all the
-	different incarnations involving updates to an shortcut bar having
-	shortcuts to non-existent folders.  Also, this fixes #1643,
-	shortcuts not visible until you enable an IMAP account, and #2436,
-	misbehavior of shortcut groups when IMAP or invalid shortcuts are
-	involved.]
-
-	* e-shortcuts-view-model.c (load_group_into_model): Add the
-	shortcuts that point to folders that don't exist yet, too.
-
-2001-06-28  Dan Winship  <danw@ximian.com>
-
-	* e-storage.c (e_storage_new_folder): Call folder_changed_cb after
-	adding the new folder so that if it was added highlighted, its
-	parent will get its child_highlight set.
-	(e_storage_new_folder): Move the folder_changed_cb() call to avoid
-	a g_warning.
-
-2001-06-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_create_view): Renamed from
-	`e_shell_new_view'.
-
-2001-06-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (idle_cb): Re-implemented to get a GSList of URIs and
-	open them on a running shell [if any] or on a newly created shell.
-	If no args are provided [i.e. the list is NULL], it either
-	restores from settings [if any], or it just opens the Inbox.
-	(main): Set up the GSList of arguments and have it passed to the
-	idle callback.
-
-	* e-shell.c (init): Ooops.  Init `uri_schema_registry' to NULL as
-	well.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_handle_external_uri): New.
-	(corba_exception_to_result): Handle the `UnsupportedSchema'
-	exception too.
-
-	* evolution-shell-component.h: New
-	EvolutionShellComponentResult value
-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDSCHEMA'.
-
-	* Evolution-ShellComponent.idl: New exception `UnsupportedSchema'.
-	(handleExternalURI): This can now raise `NotFound',
-	`UnsupportedSchema' and `InternalError'.
-	(createView): This can now raise `UnsupportedSchema' too.
-
-	* e-shell.c (impl_Shell_handleURI): Finish implementation.
-	(class_init): Install it.
-
-	* e-uri-schema-registry.c
-	(e_uri_schema_registry_get_handler_for_schema): Ooops.  Rename
-	from `e_uri_schema_get_handler_for_schema'.  Also, return NULL if
-	no handler is found.
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-component-registry.c (register_component): Get the supported
-	schemas and register them into the schema registry.
-
-	* e-shell.c: New member `uri_schema_registry' in `EShellPrivate'.
-	(e_shell_construct): Init.
-	(destroy): Unref.
-	(impl_Shell_createNewView): Raise exception `UnsupportedSchema' if
-	it's not an `evolution:' URI.  Raise exception `NotFound' if
-	`e_shell_new_view()' returns NULL.
-	(impl_Shell_handleURI): New, implementation for the `::handleURI'
-	method.
-	(e_shell_get_uri_schema_registry): New.
-
-	* Evolution-Shell.idl: New exceptions `UnsupportedSchema' and
-	`InvalidURI'.
-	(createNewView): Make this able to raise `NotFound',
-	`UnsupportedSchema' and `InvalidURI'.
-	(handleURI): New method.
-
-	* e-uri-schema-registry.h: New.
-	* e-uri-schema-registry.c: New.
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component-client.c: Remove redundant declaration
-	for `free_ShellComponentListener_servant()'.
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c (impl_handleExternalURI):
-	Implementation for the `::handleExternalURI' CORBA method; just
-	emit the `HANDLE_EXTERNAL_URI' signal.
-	(class_init): Install.
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c (impl_setOwner): Renamed from
-	`impl_ShellComponent_set_owner'.
-	(impl_unsetOwner): Renamed from `impl_ShellComponent_unset_owner'.
-	(impl_debug): Renamed from `impl_ShellComponent_debug'.
-	(impl_createView): Renamed from `impl_ShellComponent_create_view'.
-	(impl_createFolderAsync): Renamed from
-	`impl_ShellComponent_async_create_folder'.
-	(impl_removeFolderAsync): Renamed from
-	`impl_ShellComponent_async_remove_folder'.
-	(impl_xferFolderAsync): Renamed from
-	`impl_ShellComponent_async_xfer_folder'.
-	(impl_populateFolderContextMenu): Renamed from
-	`impl_ShellComponent_populate_folder_context_menu'.
-	(class_init): Updated accordingly.
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c (factory_fn): Pass NULL as the
-	@external_uri_schemas arg to `evolution_shell_component_new'.
-
-	* evolution-shell-component.c: New enum value
-	`HANDLE_EXTERNAL_URI'.  New member `external_uri_schemas' in
-	`EvolutionShellComponentPrivate'.
-	(init): Initialize `external_uri_schemas' to NULL.
-	(destroy): Free it.
-	(destroy):
-	(class_init): Add the "handler_external_uri" signal.
-	(evolution_shell_component_new): Added precondition on
-	@folder_types.  New arg @external_uri_schemas.
-	(evolution_shell_component_construct): Added preconditions.  New
-	arg @external_uri_schemas.  Initialize the `external_uri_schemas'
-	member in the EvolutionShellComponentPrivate part.
-	(impl_ShellComponent__get_external_uri_schemas): New,
-	implementation for reading the `external_uri_schemas' attribute.
-	(class_init): Install it in the EPV.
-
-	* evolution-shell-component.h: New signal `handle_external_uri'.
-
-	* Evolution-ShellComponent.idl: New attribute `extra_uri_schemas'.
-	(handleExternalURI): New method.
-
-2001-06-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (etree_value_at): Don't strdup "My
-	Evolution"!  It was getting leaked every time the e-table wanted
-	to read the value this way.
-
-2001-06-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c: Removed member `BonoboListener' from
-	`AsyncCreateFolderCallbackData' and
-	`AsyncRemoveFolderCallbackData'.
-	(bonobo_interface_remove_folder_cb) : Return the value from
-	`create_folder()'.
-	(bonobo_interface_remove_folder_cb): Return the value from
-	`remove_folder()'.
-	(notify_bonobo_listener): Removed.
-	(component_async_create_folder_callback): Don't notify the
-	listener here.
-	(component_async_remove_folder_callback): Ditto.
-	(create_folder): Removed @listener arg.  Not here either.  Return
-	a valid E_STORAGE error code instead.  Also, don't set the
-	`listener' field in `callback_data'.
-	(remove_folder): Likewise.
-	(bonobo_interface_create_folder_cb): Remove @listener arg.
-	(bonobo_interface_remove_folder_cb): Likewise.
-
-2001-06-25  jacob berkman  <jacob@ximian.com>
-
-	* e-shell-view.c: (set_folder_timeout): display a selected uri in
-	a timeout rather than right away, so the UI feels a bit more
-	responsive, and the tree is more navigable via keyboard
-	(switch_on_folder_tree_click): use the timeout rather than setting
-	the URI right away
-	(destroy): remove the timeout if it still exists
-	(update_for_current_uri): if there is a timeout set, don't update
-	(e_shell_view_display_uri): remove the timeout if it exists
-
-2001-06-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (no_views_left_cb): Call `e_shell_unregister_all()'.
-
-	* e-shell.c (e_shell_unregister_all): New.
-
-2001-06-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (convert_gdk_drag_action_to_corba): Remove
-	trailing "\n" from g_warning.
-	(convert_corba_drag_action_to_gdk): Likewise.
-	(tree_drag_data_received): Likewise.
-	(new_folder_cb): Likewise.
-
-	* e-shortcuts-view-model.c (load_group_into_model): Remove
-	trailing "\n" from g_warning.
-
-2001-06-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (no_views_left_cb): Unref the shell here.
-
-	* e-storage-set.c (destroy): Use
-	`name_to_named_storage_foreach_destroy()' as the function argument
-	to `g_hash_table_foreach()', not `named_storage_destroy()', which
-	is just plainly wrong.
-
-	* e-shell.c (setup_corba_storages): Don't ref the
-	corba_storage_registry here.
-	(destroy): Don't unref here.
-	(setup_activity_interface): Don't ref the activity_handler either.
-	(destroy): Don't unref it here.
-
-	* e-component-registry.c (e_component_registry_construct): Don't
-	ref the shell here.
-	(destroy): Don't unref it here.
-
-2001-06-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* main.c (no_views_left_cb): Don't call `e_shell_quit()' anymore.
-
-	* e-shell-view-menu.c (command_quit): Call
-	`e_shell_destroy_all_views()' instead of `e_shell_quit()', which
-	does not exist anymore.
-
-	* e-shell.c (e_shell_quit): Removed.
-	(e_shell_destroy_all_views): New.
-
-2001-06-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: s/\.oafinfo/.oaf/g.
-
-	* GNOME_Evolution_TestComponent.oafinfo: Renamed to
-	`GNOME_Evolution_TestComponent.oaf'.
-
-2001-06-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c: New member `iid' in EShellPrivate.
-	(init): Init to NULL.
-	(e_shell_construct): Set it to the value of the @iid argument.
-	(destroy): Unregister that IID.
-	(register_shell): Removed.
-	(e_shell_construct): Just do all the work here.  The function was
-	too simple to really be useful as separate.
-
-	* e-shell.c, e-shell.h: Changed to derive from BonoboXObject
-	instead of deriving from BonoboObject and doing all the nasty
-	CORBA work by hand.
-
-2001-06-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c (activity_client_clicked_callback):
-	New callback for the "clicked" signal on the EActivityClient.
-	Just spit out a warning now, for testing purposes.
-	(timeout_callback_1): Connect it.
-
-	* evolution-activity-client.c (listener_callback): Emit the
-	"clicked" signal if we get the "Clicked" event from the Bonobo
-	listener.
-
-2001-06-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c: #include <gtk/gtklabel.h>.
-	(delete_dialog): Constify @folder_name properly.
-	(delete_cb): Change the first arg to be an EStorageSet as expected
-	for EStorageSetResultCallbacks.
-	(rename_dialog): #if 0.
-
-2001-06-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-task-widget.h, e-task-widget.c: Changed to derive from
-	GtkEventBox.
-
-	* e-activity-handler.c (task_widget_button_press_event_callback):
-	New callback for the "button_press_event" signal on the
-	ETaskWidgets.  Dispatch the "Clicked" event through the Bonobo
-	listener.
-	(task_widget_new_from_activity_info): Connect here.
-
-2001-06-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c: Changed to use the
-	`EvolutionActivityClient' object.  New global static variable
-	`activity_client'.
-	(create_animated_icon): Removed.
-	(create_icon_from_pixbuf): Removed.
-	(task_bar_event_listener_callback): Removed.
-	(timeout_callback_1): Create an EvolutionActivityClient object and
-	put a pointer to it into `activity_client'.  Lower the timeout
-	delay from 1000 msecs to 100 msecs, so we can stress-test the
-	speed control code in EvolutionActivityClient.
-	(timeout_callback_2): Use the EvolutionActivityClient.  Increment
-	progress by 1, instead of 10.
-	(timeout_callback_3): Destroy the EvolutionActivityClient.
-
-	* Makefile.am (libeshell_la_SOURCES): Add
-	`evolution-activity-client.c'.
-	(eshellinclude_HEADERS): Add `evolution-activity-client.h'.
-
-	* evolution-activity-client.c: New.
-	* evolution-activity-client.h: New.
-
-	* e-activity-handler.c: Updated all instances of `ActivityID' with
-	`ActivityId'.
-
-	* Evolution-Activity.idl: Renamed `ActivityID' to `ActivityID'.
-	Added value `DIALOG_ACTION_ERROR' to `DialogAction'.
-
-2001-06-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-test-component.c: Remove the `activity_interface'
-	global.
-	(timeout_callback_3): Get the ::Activity interface using
-	`evolution_shell_client_get_activity_interface()' on
-	`parent_shell' instead.
-	(timeout_callback_2): Likewise.
-	(timeout_callback_2): Likewise.
-	(timeout_callback_1): Likewise.
-	(owner_set_callback): Don't query interface here.  Check if the
-	shell has an ::Activity interface by using
-	`evolution_shell_client_get_activity_interface()' here as well.
-
-	* evolution-shell-client.c: New member `activity_interface' in
-	`EvolutionShellClientPrivate'.
-	(destroy): unref/release it.
-	(evolution_shell_client_construct): Initialize it by querying the
-	shell CORBA Object for the ::Activity interface.
-	(evolution_shell_client_get_activity_interface): New.
-
-2001-06-23  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_construct): Make the folder tree
-	have a similar expanded state as the shell's folder tree.
-
-	* e-local-storage.c (remove_folder): New function that does the
-	meat of actual deletion stuff.
-	(remove_folder_directory): A helper function that remove_folder()
-	uses.
-	(component_async_remove_folder_callback): A new callback to do the
-	removing stuff from shell (if there weren't errors from the
-	component).
-	(impl_async_remove_folder): Implemented this.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_async_remove_folder):
-	Implemented this.
-
-	* e-shell-view.c (e_shell_view_remove_control_for_uri): New
-	function.
-
-2001-06-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_set_current_shortcuts_group_num):
-	Moved at the bottom, as it's public API.  Also add preconditions.
-	(e_shell_view_get_current_shortcuts_group_num): Likewise.
-
-2001-06-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c: Get rid of some `#if 0'ed code.
-
-2001-06-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (corba_interface_set_message_cb): Replaced with
-	an empty stub, as the "set_message" method is going to be
-	deprecated.
-	(corba_interface_unset_message_cb): Likewise for the
-	"unset_message" method.
-
-2001-06-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c (e_shell_construct): Set `splash' to NULL when
-	@show_splash is false, so the compiler doesn't complain.
-
-	* e-shell-view-menu.c: #include <gtk/gtkmain.h>.
-
-	* e-setup.c: #include <unistd.h>.
-
-	* importer/intelligent.c: #include <gtk/gtkhbox.h> and
-	<gtk/gtkdrawingarea.h>.
-
-2001-06-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c: New member `menu_hint_label' in
-	`EShellViewPrivate'.
-	(init): Init to NULL.
-	(ui_engine_add_hint_callback): Set the label in the menu hint
-	label, show the menu hint label, hide the task bar.
-	(ui_engine_remove_hint_callback): New callback for the
-	"remove_hint" signal on the BonoboUIEngine; hide the hint label,
-	show the task bar.
-	(setup_statusbar_hints): Connect it.
-	(setup_menu_hint_label): New helper function to create the menu
-	hint label.
-	(create_status_bar): Call it.
-
-2001-06-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (command_quit): Add a `gtk_main_quit()' at
-	the end here.
-
-2001-06-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Add rules to build the test component and an
-	`install-test-component' target to install it.
-
-	* GNOME_Evolution_TestComponent.oafinfo: New OAF file for the test
-	component.
-
-	* evolution-test-component.c: New component, currently to test the
-	activity interfaces.  We will be able use it for testing more
-	things in the future.
-
-	* e-shell.c: New member `activity_handler' in `EShellViewPrivate'.
-	(init): Init here.
-	(class_init): Unref.
-	(setup_activity_interface): New helper function to create an
-	`EActivityHandler' object and aggregate it to the `EShell'.
-	(e_shell_construct): Call here.
-	(e_shell_new_view): Attach the task bar of the newly created view
-	to the activity handler by using
-	`e_activity_handler_attach_task_bar()'.
-
-	* e-shell-view.c: Removed old progress bar code.  New members
-	`status_bar' and `task_bar' in EShellViewPrivagte; removed member
-	`progress_bar'.
-	(init): Initialize the new fields; remove initialization for
-	`progress_bar'.
-	(impl_destroy): Handle the new fields here too.
-	(setup_task_bar): New helper function to set up an ETaskBar.
-	(create_status_bar): New helper function to create the status bar
-	with an ETaskBar in it.
-	(ui_engine_add_hint_callback): New callback for the "add_int"
-	BonoboUIEngine signal.
-	(setup_statusbar_hints): New helper function to set up the menu
-	hints for the status bar; connect `ui_engine_add_hint_callback()'
-	here.
-	(setup_widgets): Call `create_status_bar()' and
-	`setup_statusbar_hints()'; pack the status bar in a vbox instead
-	of using the Bonobo status bar stuff, which is kinda broken.
-	(e_shell_view_get_task_bar): New.
-	(get_type_for_folder): No use to get the EFolderTypeRegistry here.
-
-	* Evolution.idl: #include <Evolution-Activity.idl> and
-	<Evolution-Icon.idl>.
-
-	* Evolution-Activity.idl: New.
-
-	* Evolution-Icon.idl: New.
-
-	* e-activity-handler.c: New.
-	* e-activity-handler.h: New.
-
-	* e-task-bar.c: New.
-	* e-task-bar.h: New.
-
-	* e-task-widget.c: New.
-	* e-task-widget.h: New.
-
-2001-06-21  Jason Leach  <jleach@ximian.com>
-
-	* evolution-storage.c (evolution_storage_deregister_on_shell): New
-	function, uses the StorageRegistry::removeStoragebyName corba call
-	to properly make the storage vanish from the shell.
-	
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (evolution_LDADD): Remove DB3_LDADD
-
-	* e-shell-view-menu.c: Fix the help URLs
-
-2001-06-13  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-view.c (switch_on_folder_tree_click): Check priv->uri
-	isn't null before strcmp'ing it here too.
-
-2001-06-11  Dan Winship  <danw@ximian.com>
-
-	* e-shell-view.c (destroy): Don't destroy the
-	offline_toggle_pixmap: the offline_toggle 0wnz it.
-	(update_for_current_uri): Check priv->uri isn't NULL before
-	strcmp()ing it.
-
-2001-06-11  Jason Leach  <jleach@ximian.com>
-
-	* evolution-storage.c (impl_Storage_async_create_folder): Fixed
-	folder creation on IMAP storages (by notifying bonobo listener
-	with the result).
-
-	* evolution-storage-listener.c: Some cleaning.
-
-2001-06-08  Iain Holmes  <iain@ximian.com>
-
-	* e-setup.c (check_dir_recur): Don't copy the old Executive-Summary dir.
-	(e_setup): If there is an Executive-Summary dir in ~/evolution/local
-	ask it the user wants to remove it.
-	(e_shell_rm_dir): Function to completely delete a directory.
-
-2001-06-07  Iain Holmes  <iain@ximian.com>
-
-	* evolution-storage.c (impl_Storage_async_create_folder): Removed
-	debug spew.
-
-	* e-shell-importer.c (start_import): Removed spew.
-
-	* e-shell-view.c (update_window_icon): Take a gboolean to say if
-	the folder is my evolution. Do special cased things for My Evolution.
-	(update_folder_title_bar): Same.
-	(update_for_current_uri): Find out if the uri is the my evolution one
-	and act accordingly.
-	(get_control_for_uri): Handle the toplevel My Evolution.
-	
-	* e-storage-set-view.c (etree_icon_at): Get an icon for the toplevel
-	My Evolution.
-	(etree_value_at): Default is to return "My Evolution"
-	(e_storage_set_view_construct): Set the toplevel to be called "My 
-	Evolution" and show it.
-	(e_storage_set_view_set_show_folders): Same.
-
-2001-06-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar):
-	Allow a NULL @shell_view arg.
-
-2001-06-08  Jason Leach  <jleach@ximian.com>
-
-	* e-shell.c (e_shell_construct): Fix splash setup to keep it from
-	giving two Gtk-CRITICAL assertions when you do --no-splash.
-
-2001-06-06  Jon Trowbridge  <trow@ximian.com>
-
-	* evolution-storage.c (impl_Storage_async_create_folder): Changed
-	purely informational debug spew from a g_warning to a g_message.
-
-	* e-shell-importer.c (show_import_wizard): The import wizard
-	defined in import.glade only has three pages... yet we were trying
-	to manipulate "page4" as the finish page, with the expected bad
-	results.  My guess is that the .glade file got changed, but the
-	code didn't get updated.
-	(start_import): We were trying to bonobo_object_unref
-	(BONOBO_OBJECT (icd->client)), which is fine except for the
-	fact that icd->client is just a GtkObject, not a BonoboObject.
-	Changed to a gtk_object_unref.
-	(start_import): Changed a purely informational bit of debug
-	spew from a g_warning to a g_message.
-
-2001-06-06  Iain Holmes  <iain@ximian.com>
-
-	* importers/intelligent.c (create_gui): Make a few boxes, and make
-	the whole dialog horizontal. Add better buttons, and a "Don't ask 
-	again button" (And the world rejoices).
-	Fixed the notebook so it displayed the blank page on startup.
-	(intelligent_importer_init): Handle the "Don't ask me again" button.
-
-2001-06-06  Jason Leach  <jleach@ximian.com>
-
-	(Fix bug #3205: Component crash causes folder switch even when not
-	 needed)
-	
-	* e-shell-view.c (socket_destroy_cb): Only flip around the
-	ShellView to different folders when we're currently viewing the
-	URI that's being closed/crashed.
-
-2001-06-06  Jason Leach  <jleach@ximian.com>
-
-	(Fix bug #418: Save state of folder tree view)
-	
-	* e-shell-view.c (e_shell_view_save_settings): Changed the char *
-	@prefix argument to an int @view_num.
-	(e_shell_view_load_settings): Ditto.
-	(get_local_prefix_for_view): New function that gets us a prefix
-	from a view_num.
-
-	* e-shell-view.c (e_shell_view_save_settings): Save the
-	expanded/collapsed information for each storage-set-view here.
-	(e_shell_view_load_settings): Load it here.
-
-	* e-storage-set-view.c (e_storage_set_view_construct): Make it so
-	new storage set views have their storages expanded by default, but
-	will respsect the expanded state information that we load into it.
-	(insert_storages): Minor change here too.
-	(new_folder_cb): Ditto.
-	
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-view-menu.c: Plug in all the folder tree right click
-	menu verbs so bonobo-warnings aren't emitted (even though the
-	respective implementation functions are currently unimplemented).
-	(command_delete_folder): New function, see above.
-	(command_rename_folder): Ditto.
-	(command_folder_properties): Ditto.
-
-	* e-shell-folder-commands.c (e_shell_command_delete_folder): New
-	function, currently unimplemented.
-
-2001-06-04  Jason Leach  <jleach@ximian.com>
-
-	(Fixing bug #1299: Shell saves shortcuts when display name
-	 changes)
-	
-	* e-shortcuts.c (class_init): New signal: "update_shortcut".
-
-	* e-shortcuts-view-model.c (e_shortcuts_view_model_construct):
-	Connect thew new signal here.
-
-	* e-shortcuts-view-model.c (shortcuts_update_shortcut_cb): New
-	function, uses the new e_shortcut_model_update_item().
-
-	* e-shell-view.c (corba_interface_set_folder_bar_label): Fix a
-	warning here.
-
-2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (evolution_LDADD): Move `$(DB3_LDADD)' before
-	libeutil.
-
-2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (evolution_LDADD): Add `$(DB3_LDADD)'.
-
-2001-05-30  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-view.c (e_shell_view_set_current_shortcuts_group_num):
-	New function (probably should just be static).
-	(e_shell_view_load_settings): Load the current shortcut group here
-	using the above new function.
-	(e_shell_view_save_settings): Save current shortcut group in here.
-
-2001-05-30  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-folder-title-bar.c: New 'folder_bar_label' member for
-	EShellFolderTitleBar, it's for information that's shown to the
-	left of the icon like the dates in the calendar (or, potentially
-	total and unread numbers for mailer).
-	(e_shell_folder_title_bar_set_folder_bar_label): New function,
-	lets others set the title bar extra label.
-
-	* Evolution-ShellView.idl: New method 'setFolderBarLabel' for our
-	exposed ShellView interface.
-	
-	* evolution-shell-view.h: New signal "set_folder_bar_label" for
-	EvolutionShellView.
-
-	* evolution-shell-view.c (impl_ShellView_set_message): Emit the
-	new signal here.
-
-	* e-shell-view.c (setup_corba_interface): Connect the signal here.
-
-	* e-shell-view.c (corba_interface_set_folder_bar_label): New
-	function, callback for the above signals, does the actual extra
-	label setting for the folder title bar.
-
-	* e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar):
-	Fix a warning here.
-
-2001-05-30  Jason Leach  <jleach@ximian.com>
-
-	* e-shell.c (e_shell_construct): Removed an unecessary sleep(2)
-	call, so evolution will start up 2 seconds faster now.
-
-2001-05-30  Jason Leach  <jleach@ximian.com>
-
-	* e-shell-view-menu.c: Connect the AddFolderToShortcutBar verb to
-	their implementation functions.
-
-	* e-shell-view.c (e_shell_view_get_current_shortcuts_group_num):
-	New function, use it to find out which shourtcut group is
-	currently open on the shortcut bar.
-
-	* e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar):
-	Implement this using new function described above.
-
-2001-05-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-shell-view.c (setup_progress_bar): Added missing castt.
-	(setup_offline_toggle): Likewise.
-
-2001-05-29  JP Rosevear  <jpr@ximian.com>
-
-	* e-shell-view.c (setup_progress_bar): unref the control when
-	finished with it
-	(setup_offline_toggle): ditto
-	(destroy): destroy offline and progress widgets
-
-2001-05-28  Dan Winship  <danw@ximian.com>
-
-	* e-storage-set-view.c (new_storage_cb): Call
-	e_tree_node_set_expanded on the storage_set_view, not the
-	storage_set (which is not an ETree).
-
-2001-05-27  Dan Winship  <danw@ximian.com>
-
-	* evolution-shell-component-utils.c: New file.
-	(e_pixmaps_update): Moved here from e-util to break e-util bonobo
-	dependency.
-
-	* e-shell-view-menu.c: #include
-	"evolution-shell-component-utils.h" instead of "e-gui-utils.h"
-
-	* Makefile.am (libeshell_la_SOURCES, eshellinclude_HEADERS): Add
-	evolution-shell-component-utils.[ch]
-
-2001-05-26  Dan Winship  <danw@ximian.com>
-
-	* e-storage-set-view.c (destroy): Don't free the hash keys in
-	priv->path_to_etree_node, because they're owned by the ETree now.
-	(e_storage_set_view_set_show_folders): Likewise.
-
-2001-05-25  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am: Change libeshell from a noinst_LIBRARIES to
-	a lib_LTLIBRARIES. Install its headers in 
-	$includedir/evolution/shell.
-
-	* evolution-storage.c (safe_corba_string): New, copy of e_safe_corba_string
-	in libeutil. This way libeshell doesn't have a missing symbol when programs
-	that don't have libeutil link to it.
-	(evolution_storage_register): s,e_safe_corba_string,safe_corba_string,g.
-
-2001-05-25  jacob berkman  <jacob@ximian.com>
-
-	* e-shell-view.c (setup_widgets): place the shortcut bar in a
-	frame
-
-2001-05-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (INCLUDES): Added ETSPECDIR.  Added
-	e-storage-set-view.etspec to get installed.
-
-	* e-local-storage.c (remove_folder_directory): Commented out this
-	function since it is unused.
-
-	* e-shell-folder-commands.c
-	(folder_selection_dialog_folder_selected_callback), e-shell-view.c
-	(update_offline_toggle_status): Fixed warnings here by adding a
-	return; after the g_assert_not_reached();.
-
-	* e-shell-importer.c (start_import): Got rid of real_folderpath
-	here and just reused folderpath (It was causing uninitialized
-	variable warnings.)
-
-	* e-shell.c (impl_Shell_getLocalStorage): Use
-	bonobo_object_dup_ref here.  It makes things simpler.
-
-	* e-storage-set-view.c: Removed ETREE_SPEC since it's no longer
-	needed.
-	(convert_corba_drag_action_set_to_gdk,
-	folder_context_menu_activate_cb, remove_cb,
-	folder_context_menu_remove_cb): Commented out these functions
-	since they're unused.
-	(new_storage_cb, new_folder_cb, insert_folders, insert_storages):
-	Don't bother using insert_id here since it no longer does
-	anything.
-	(new_storage_cb, removed_storage_cb, removed_folder_cb): Don't
-	free the data returned from e_tree_memory_node_remove.
-	(e_storage_set_view_construct): Set the destroy func here so that
-	memory will automatically get freed when nodes are destroyed.
-	g_strdup the root node string here.  Use
-	e_tree_construct_from_spec_file here to use an external file.
-	(e_storage_set_view_set_show_folders): g_strdup the root node
-	string here.
-
-	* e-storage-set-view.etspec: New etspec file.
-
-	* evolution-shell-component-client.c
-	(free_ShellComponentListener_servant): Added a prototype here.
-
-2001-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-shell-component.h
-	(EVOLUTION_SHELL_COMPONENT_POPUP_PLACEHOLDER): track change to the
-	path to the ComponentPlaceholder.
-
-2001-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c: New static members `offline_pixmap',
-	`offline_mask', `online_pixmap', `online_mask'.  Add members
-	`tooltips', `offline_toggle' and `offline_toggle_pixmap' to
-	`EShellViewPrivate'.
-	(init): Init to NULL.  Also init the `progress_bar' member to NULL
-	as well, as we were not initializing it.
-	(destroy): Unref the tooltips.
-	(load_images): New static function to load the offline and online
-	icons into the pixmaps/masks.
-	(class_init): Call it.
-	(update_offline_toggle_status): New.
-	(shell_line_status_changed_cb): Call it.
-	(offline_toggle_clicked_cb): New, callback for the "clicked"
-	signal on the offline/online button.
-	(setup_offline_button): New function to set up the
-	`offline_button'.
-	(setup_widgets): Call it.
-	(setup_progress_bar): Changed to get an `EShellView' pointer,
-	instead of an `EShellViewPriv' pointer.
-	(setup_widgets): Updated accordingly.
-
-2001-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c: Define the verb for "CopyFolder" as well.
-	(command_copy_folder): Implementation for the "CopyFolder" verb.
-
-	* e-shell-folder-commands.c: New struct `FolderCommandData'.
-	(folder_command_data_new): New function to allocate and initialize
-	it.
-	(folder_command_data_free): New function to free it.
-	(e_shell_command_move_folder): Pass a pointer to a filled-in
-	`FolderCommandData' struct to the callbacks instead of just
-	passing a pointer to the shell object.
-	(move_folder_selected_callback): Removed.
-	(move_folder_cancelled_callback): Removed.
-	(folder_selection_dialog_folder_selected_callback): New generic
-	callback for the folder selection dialog.
-	(folder_selection_dialog_cancelled_callback): New generic callback
-	for the folder selection dialog.
-	(connect_folder_selection_dialog_signals): New function to connect
-	these two handlers to a folder selection dialog.
-	(xfer_result_callback): New callback for the async xfer function.
-	(get_folder_name): New utility function.
-	(e_shell_command_copy_folder): Implement.
-
-2001-05-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-commands.c
-	(e_shell_command_create_new_folder): Changed to use
-	`e_shell_view_get_current_path()' to get the default path, instead
-	of computing it itself.
-	(move_folder_cancelled_callback) (move_folder_selected_callback):
-	New, callbacks for the "cancelled" and "folder_selected" signals
-	on the folder selection dialog for the "Move folder" operation.
-	(e_shell_command_move_folder): Implemented.
-
-	* e-shell-view-menu.c (command_move_folder): New, implementation
-	for the "MoveFolder" verb.
-
-	* e-shell-view.c (e_shell_view_get_current_path): New.
-
-2001-05-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-selection-dialog.h: Rename @default_path to
-	@default_uri.
-
-	* e-shell.c (impl_Shell_selectUserFolder): Pass a NULL @caption to
-	`e_shell_folder_selection_dialog_new()'.
-
-	* e-shell-importer.c (import_druid_finish): Add a caption to the
-	folder selection dialog.  Constify local variable `foldername',
-	and avoid g_strdupping/g_freeing it, as it's useless.
-
-	* e-shell-view-menu.c (command_goto_folder): Add a caption to
-	the folder selection dialog.
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_new): New arg @caption.
-	(e_shell_folder_selection_dialog_construct): Likewise.  Also
-	cleaned up a bit.
-
-2001-05-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c: Removed "NewView" verb.  Added
-	`folder_verbs', with "OpenFolderInNewWindow" in it.
-	(e_shell_view_menu_setup): Set up the `folder_verbs' too.
-	(command_new_view): Renamed to
-	`command_open_folder_in_new_window'.
-
-	* e-shell-folder-commands.c
-	(e_shell_command_open_folder_in_other_window): Implement.
-
-2001-05-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (command_create_folder): Call
-	`e_shell_command_create_new_folder()' implemented in
-	`e-shell-folder-commands.c'.
-
-	* e-shell-folder-commands.c: New.
-	* e-shell-folder-commands.h: New.
-
-2001-05-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c
-	(populate_folder_context_menu_with_common_items): Removed.
-	(popup_folder_menu): Instead of creating the component and the
-	folder popup definition here, just do `bonobo_window_add_popup()'
-	and assume that "/popups/FolderPopup" is defined in the toplevel
-	window's UI xml file.
-
-2001-05-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component-client.c: Moved some functions around
-	to avoid the warning about the static
-	`free_ShellComponentListener_servant()' function being used prior
-	to declaration.
-
-2001-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c (command_run_bugbuddy): `#if 0'ed out.
-	(command_submit_bug): New.  Just fire up the web browser with
-	`http://bugzilla.ximian.com' in it.
-	(menu_do_misc): Associate the latter instead of the former to the
-	"HelpSubmitBug" verb.
-
-2001-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c: Add an `HelpFAQ' verb.
-
-2001-05-14  jacob berkman  <jacob@ximian.com>
-
-	* e-folder-tree.c (remove_folder): set the subfolder's parent to
-	NULL so the subfolder list doesn't change whilst we are using it
-	(folder_remove_subfolder): this function didn't used to work at
-	all
-
-2001-05-12  Chris Toshok  <toshok@ximian.com>
-
-	* e-storage-set-view.c (tree_drag_data_received): implement the
-	CORBA side of dragging.
-	(convert_gdk_drag_action_set_to_corba): rename
-	convert_gdk_drag_action_to_corba to this.
-	(convert_corba_drag_action_set_to_gdk): rename
-	convert_corba_drag_action_to_gdk to this.
-	(convert_gdk_drag_action_to_corba): new function that doesn't
-	build a bitmask, useful for the Action types, instead of
-	ActionSet.
-	(convert_corba_drag_action_to_gdk): same.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* e-storage-set-view.c
-	(populate_folder_context_menu_with_common_items): add RemoveFolder
-	menu item and verb.
-	(folder_context_menu_remove_cb): new function, call
-	e_storage_set_async_remove_folder.
-	(remove_cb): callack for e_storage_set_async_remove_folder.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_populate_folder_context_menu):
-	fix prototype to reflect Component -> Container.
-
-	* evolution-shell-component-client.h: same.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-shell-component.h
-	(EVOLUTION_SHELL_COMPONENT_POPUP_PLACEHOLDER): add this define for
-	the xml path to use when adding menu items to the folder popup.
-
-	* e-storage-set-view.c
-	(populate_folder_context_menu_with_common_items): add (#ifdef
-	DEBUG_XML) a menu item to dump the bonobo xml.
-	(popup_folder_menu): pass the BonoboUIContainer to the
-	populate_folder_context_menu CORBA call, instead of the component.
-	Also, reorder things a bit so the component doesn't get an error
-	when setting xml the first time.
-
-2001-05-11  Iain Holmes  <iain@ximian.com>
-
-	* e-shell-folder-selection-dialog.c (dbl_click_cb): Use gnome_dialog_close
-	instead of gtk_widget_destroy.
-	(impl_clicked): Use gnome_dialog_close instead of gtk_widget_destroy.
-
-	* e-shell-view-menu.c: #include e-shell-importer.h instead of importer/importer.h
-
-	* importer/Makefile.am: Remove importer.c and importer.h.
-
-	* importer/importer.[ch]: Moved these to e-shell-importer.[ch]
-
-	* e-shell-importer.c (start_import): Take a folderpath to import into.
-	(importer_druid_finish): Show the EShellFolderSelectionDialog to get a folder to
-	import into.
-
-2001-05-11  JP Rosevear  <jpr@ximian.com>
-
-	* e-component-registry.c (register_component): component_new refs
-	the object itself, so unref ours when we finish with it
-
-	* e-shell.c (e_shell_construct): There is no need to explicitly
-	ref the folder type registry, storage set and shortcuts because we
-	are the creator and hold the initial ref count of 1.
-
-2001-05-11  Dan Winship  <danw@ximian.com>
-
-	* e-local-storage.c (load_folder): Lots of people seem to have
-	"broken" local storage hierarchies. So ignore errors (like the old
-	code did) and just print a warning.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-storage-set-view-factory.c
-	(evolution_storage_set_view_factory_new_view): the only
-	problematic area - pass NULL for now in as the BonoboUIContainer.
-	how do we pass this container to the control?
-
-	* e-storage-set-view.c (folder_context_menu_activate): un-#if 0
-	this function.
-	(populate_folder_context_menu_with_common_items): build our popup
-	using the new xml bonobo stuffs.
-	(popup_folder_menu): convert to using the new xml bonobo stuffs.
-	(right_click): only do the popup menu if we have a
-	BonoboUIContainer.
-	(e_storage_set_view_new): add BonoboUIContainer* arg.
-	(e_storage_set_view_construct): same.
-
-	* e-storage-set-view.h: add BonoboUIContainer* args to
-	e_storage_set_view_new and e_storage_set_view_construct.
-
-	* e-shell-folder-creation-dialog.c (add_storage_set_view): pass
-	NULL for the BonoboUIContainer, since we shouldn't (?) have a
-	popup in this dialog.
-	
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_construct): pass NULL for the
-	BonoboUIContainer, since we shouldn't (?) have a popup in this
-	dialog.
-
-	* e-storage-set.h: add BonoboUIContainer* arg to
-	e_storage_set_new_view.
-
-	* e-storage-set.c (e_storage_set_new_view): add arg, and track
-	change to e_storage_set_view_new.
-
-	* e-shell-view.h: add prototype for
-	e_shell_view_get_bonobo_ui_container.
-
-	* e-shell-view.c (setup_storage_set_subwindow): track change to
-	e_storage_set_view_new.
-	(e_shell_view_construct): the BonoboUIContainer is now part of our
-	private structure.
-	(e_shell_view_get_bonobo_ui_container): new function.
-
-2001-05-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* importer/intelligent.c (create_gui): Made this function static.
-	Removed the unused variable placeholder.
-	(intelligent_importer_init): Cast from gpointer to int here
-	properly using GPOINTER_TO_INT.
-
-2001-05-09  Dan Winship  <danw@ximian.com>
-
-	* e-local-storage.c: Remove get_physical_path and load_folders,
-	and replace the calls to them with calls to the e_path_* functions
-	they inspired.
-
-2001-05-08  Dan Winship  <danw@ximian.com>
-
-	* glade/e-active-connection-dialog.glade: Rename "port" to "type"
-	here too.
-
-2001-05-08  Iain Holmes  <iain@ximian.com>
-
-	* importer/evolution-importer-client.c (evolution_importer_client_load_file):
-	Actually use the duplicated value.
-
-	* e-local-storage.c (create_folder_directory): Assign 
-	physical_path_return before trying to create the directory.
-	(create_folder): Return the physical_path even if the directory
-	creation failed. Free the physical path.
-
-	* importer/evolution-importer-client.[ch]: Make EvolutionImporterClient
-	from a GtkObject instead of a BonoboObject.
-
-	* importer/importer.c: Use gtk_object_unref instead of 
-	bonobo_object_unref on the clients.
-
-	* importer/intelligent.c: New prettier dialog, and multiple importers
-	done in the same window. 
-
-2001-05-07  Dan Winship  <danw@ximian.com>
-
-	* e-shell-offline-handler.c (update_dialog_clist_hash_foreach):
-	Fix a free of non-malloc'ed memory introduced by my last change.
-
-2001-05-07  Jon Trowbridge  <trow@ximian.com>
-
-	* e-shell-view-menu.c (update_offline_menu_item): Changed some
-	references to /commands/WorkOffline to /commands/ToggleOffline.
-
-2001-05-04  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-shell-component-dnd.c
-	(impl_GNOME_Evolution_ShellComponentDnd_DestinationFolder_handleMotion):
-	take a physical_uri and pass it to the callback.
-	(impl_GNOME_Evolution_ShellComponentDnd_DestinationFolder_handleDrop):
-	same.
-
-	* evolution-shell-component-dnd.h: add physical_uri args to the
-	destination folder HandleMotion and HandleDrop types.
-
-	* Evolution-ShellComponentDnd.idl: add "in string physical_uri" to
-	DestinationFolder::handleMotion and DestinationFolder::handleDrop.
-
-	* e-storage-set-view.c (tree_drag_motion): pass the physical uri
-	of the folder to handleMotion.
-
-2001-05-04  Dan Winship  <danw@ximian.com>
-
-	* e-shell-offline-handler.c (update_dialog_clist_hash_foreach,
-	(duplicate_connection_list): Use type instead of portNumber.
-	(e_shell_offline_handler_put_components_offline): Fix the logic of
-	when to show the connection dialog here. (Show it when there *are*
-	connections, not when there aren't.)
-
-	* Evolution-Offline.idl: Have a "string type" instead of "short
-	portNumber" in Connection.
-
-2001-05-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-offline-handler.c
-	(e_shell_offline_handler_put_components_offline): Only display the
-	dialog if there are active connections.  [It was displaying it all
-	the time before just for testing purposes.]
-
-2001-05-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-storage.c (evolution_storage_new_folder): Ooops.  The
-	`corba_folder' is needed after returning; don't free it.
-
-2001-05-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-storage.c (evolution_storage_new_folder): Free the
-	`corba_folder' when not needed anymore.
-
-	* e-local-storage.c (create_folder_directory): Free the parent
-	path, and don't allocate it when we don't need it.
-
-	* evolution-shell-component-client.c (dispatch_callback): Free the
-	listener servant too.
-	(impl_destroy): Release the listener object and free the servant
-	if it exists.
-
-2001-05-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-creation-dialog.c (dialog_clicked_cb): Don't
-	strdup `path' before copying it into the `dialog_data'.
-
-2001-05-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importer/intelligent.c (get_intelligent_importers): Free the
-	`info_list' returned by `oaf_query()', thus plugging a leak.
-
-2001-05-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-utils.c (get_icon_path): Don't use
-	`gnome_pixmap_file()', which is broken as it looks in the current
-	working directory first.  Instead, if the path is not absolute,
-	just look up the file in the `EVOLUTION_IMAGES' directory.
-
-2001-05-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* glade/e-active-connection-dialog.c: Change the GtkCList mode to
-	GTK_BROWSE_SINGLE.
-
-2001-05-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-offline-handler.c
-	(impl_OfflineProgressListener_updateProgress): Update the GtkCList
-	before emitting the "offline_procedure_finished" signal.  In fact,
-	we might be destroyed from within the signal handlers and then
-	things would get messy.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_get_offline_interface):
-	"IDL:GNOME/Evolution/Offline:1.0", not
-	"IDL:GNOME/Evolution/ShellComponent/Offline:1.0".  Sigh.
-
-	* e-shell-view-menu.c: Update to match the rename of the
-	`WorkOffline' menu item in the `File' menu into `ToggleOffline'.
-	Now the `WorkOffline' verb actually puts the shell offline, while
-	`WorkOnline' puts in online, so we don't use one single verb to
-	toggle the online/offline status.
-	(command_work_offline): Only go offline.
-	(command_work_online): New.  Make the shell go online.
-	(update_offline_menu_item): New.
-	(shell_line_status_changed_cb): New, callback for the
-	"line_status_changed" signal on the associated EShell.
-
-2001-05-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-offline-handler.c: New member `dialog_gui' in
-	`EShellOfflineHandlerPrivate'.
-	(impl_destroy): Unref here if not NULL.
-	(init): Init to NULL.
-	(update_dialog_clist_hash_foreach): New.
-	(update_dialog_clist): New.
-	(dialog_clicked_cb): New, callback for the "clicked" signal on the
-	active connection dialog.
-	(pop_up_confirmation_dialog): Implemented.
-	(init): Init `procedure_in_progress' to `FALSE' instead of `TRUE'.
-	(cancel_offline): Emit `offline_procedure_finished'.
-	(impl_OfflineProgressListener_updateProgress): Call
-	`update_dialog_clist()'.
-
-	* glade/e-active-connection-dialog.glade: New.
-
-	* e-shell-view-menu.c: Update to use the `WorkOffline' verb
-	instead of the `WorkOffLine' one.
-	(command_work_offline): New, temporary implementation for the
-	"WorkOffline" verb.
-
-	* e-shell-view.c (shell_line_status_changed_cb): New, callback for
-	the shell's `line_status_changed' signal.
-	(e_shell_view_construct): Connect it.
-
-	* e-shell.c: New member `line_status' in `EShellPrivate'.
-	(init): Init to `E_SHELL_LINE_STATUS_ONLINE'.
-	(class_init): Set up the `line_status_changed' signal.
-	(e_shell_is_offline): Removed.
-	(e_shell_get_line_status): New.
-	(e_shell_go_online): Set the `line_status' member to
-	`E_SHELL_LINE_STATUS_ONLINE' and emit `line_status_changed'.
-	(offline_procedure_started_cb): New, signal for the
-	`offline_procedure_started' signal in EShellOfflineHandler.
-	(offline_procedure_finished_cb): New, signal for the
-	`offline_procedure_finished' signal in EShellOfflineHandler.
-	(e_shell_go_offline): Implemented.
-
-	* e-shell.h: New enum `EShellLineStatus'.  New signal
-	`line_status_changed'.
-
-2001-05-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-offline-handler.c (e_shell_offline_handler_construct):
-	Unset the `GTK_FLOATING' flag.
-
-2001-05-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell.c: New members `is_offline' and `offline_handler' in
-	`EShellPrivate'.
-	(init): Init `is_offline' to %FALSE, `offline_handler' to %NULL.
-	(e_shell_is_offline): New.
-	(e_shell_go_online): New.
-	(e_shell_go_offline): New.
-
-	* e-shell-offline-handler.c: New.
-	* e-shell-offline-handler.h: New.
-
-	* evolution-shell-component-client.c: New member
-	`offline_interface' in `EvolutionShellComponentClientPrivate'.
-	(init): Init to `CORBA_OBJECT_NIL'.
-	(impl_destroy): Unref/release if not NIL.
-	(evolution_shell_component_client_get_offline_interface): New.
-
-	* Evolution-Offline.idl: New.
-
-2001-05-02  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-shell-component-dnd.c: new file.
-
-	* evolution-shell-component-dnd.h: new file.
-
-	* Makefile.am (libeshell_a_SOURCES): add
-	evolution-shell-component-dnd.[ch].
-
-2001-04-25  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (evolution_LDADD): Remove $(UNICODE_LIBS).
-
-	* main.c (main): Remove call to unicode_init.
-
-2001-04-25  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-shell-client.c (destroy): free the private member
-
-2001-04-25  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-component-register.c, e-corba-storage.c, e-folder-tree.c,
-	e-folder-tree.h, e-folder.c, e-local-folder.c, e-shell.c,
-	e-shortcuts-view-model.c, e-shortcuts.c, e-splash.c, 
-	e-storage-set-view.c, e-storage-set.c, evolution-local-storage.c,
-	evolution-shell-component-client.c, evolution-shell-component.c,
-	evolution-storage.[ch], importer/evolution-importer-client.[ch],
-	importer/evolution-importer-listener.[ch],
-	importer/evolution-importer.[ch],
-	importer/evolution-intelligent-importer.[ch], importer/intelligent.c:
-	#include <glib.h> and move corresponding local includes to the top.
-	
-2001-04-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-splash.c: #include gnome-window-icon.h
-
-2001-04-21  Duncan Mak  <duncan@ximian.com>
-
-	* e-splash.c (e_splash_construct): Set window_icon to
-	"evolution.png" in the splash screen.
-
-2001-04-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-folder.c: #include <unistd.h>.
-
-2001-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-shell-view.c (storage_set_view_box_event_cb): Proxy events to
-	the tooltip object properly.
-
-2001-04-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-selection-dialog.c
-	(folder_creation_dialog_result_cb): Set the current folder only if
-	@result is `E_SHELL_FOLDER_CREATION_DIALOG_RESULT_SUCCESS'.
-
-	* e-shell-folder-creation-dialog.c (folder_name_entry_changed_cb):
-	Changed to get a pointer to the DialogData instead of just a
-	pointer to the dialog itself.  Don't set the OK button sensitive
-	if there is no folder selected in the storage set view.
-	(setup_folder_name_entry): Don't connect
-	`folder_name_entry_changed_cb' anymore.
-	(e_shell_show_folder_creation_dialog): Connect here instead.
-	(storage_set_view_folder_selected_cb): New callback for the
-	"folder_selected" signal in the EStorageSetView.  Make the OK
-	button sensitive if the entry is non-empty.
-	(e_shell_show_folder_creation_dialog): Connect it.
-
-2001-04-14  Michael Meeks  <michael@ximian.com>
-
-	* Makefile.am (dist-hook): remove built sources from dist.
-
-2001-04-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-splash.c (impl_destroy): Call the parent class' ::destroy
-	method.
-
-2001-04-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (etree_has_get_node_by_id,
-	etree_get_node_by_id): Implemented these.
-
-2001-04-11  Dan Winship  <danw@ximian.com>
-
-	* e-shell-view.c (switch_on_folder_tree_click): Don't get into an
-	infinite loop when clicking on an IMAP storage. Might not be the
-	best fix?
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* e-storage-set-view.c (tree_drag_motion): fix type.  we want the
-	destination interface, not source.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-local-folder.c: Fix headers.
-	* e-shell-view.c: Same here.
-	* e-shortcuts-view.c: Same here.
-	* e-shortcuts.c: Same here.
-	* e-storage-set-view.c: Same here.
-	
-2001-04-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* importer/importer.c (create_html): copied newer and fixed function
-	from mail/mail-config-druid.c.
-	(html_new, put_html): removed.
-	(show_import_wizard): use create_html instead of html_new/put_html pair.
-	* importer/importer.glade: a try to set logo. removed source generation
-	options.
-
-2001-04-03  Dan Winship  <danw@ximian.com>
-
-	* main.c:
-	* evolution-shell-component-client.c: Don't declare debug_log as
-	extern in evolution-shell-component-client.c, because that's part
-	of libeshell and so gets linked into the other components.
-	Instead, declare it there and extern it from main.c.
-	(Noticed by Peter Williams)
-
-2001-04-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (get_control_for_uri): Change `! folder_type'
-	with `folder_type == NULL'.
-
-	* e-corba-storage-registry.c (impl_StorageRegistry_addStorage): If
-	the toplevel node URI or the toplevel node type are an empty
-	string, use NULL Instead.
-
-2001-04-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c: Fix bug #1878 "folder sometimes fails to
-	display?".  Thanks to Dan for finding out an explanation for the
-	problem.
-	(e_shell_view_display_uri): Don't set `priv->uri' here.
-	(show_existing_view): Set it here instead, and before showing the
-	control.
-	(create_new_view_for_uri): And here, likewise.
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-shell-folder-selection-dialog.c (dbl_click_cb): Made double
-	clicking not crash here.
-
-2001-04-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-setup.c (e_setup): If we have a local folder named "Trash" of
-	type "mail", rename it to "Trash.old" so that the new
-	vfolder-based trash type gets installed.
-
-2001-04-03  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* importer/evolution-importer-client.c (evolution_importer_client_load_file):
-	fix Iain's fix which did nothing. closes #1914.
-
-2001-03-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-storage-set-view.c: Include <gal/util/e-util.h> here.
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* e-shell-view-menu.c: set up menu icons for new folder, import and work
-	offline.
-
-2001-03-30  Iain Holmes  <iain@ximian.com>
-
-	* importer/importer.c (start_import): If the importer can't be started, then
-	don't continue.
-
-2001-03-29  Iain Holmes  <iain@ximian.com>
-
-	* importer/evolution-importer-client.c (evolution_importer_client_load_file):
-	Duplicate the folderpath, or set it to \0
-
-2001-03-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-shell-folder-selection-dialog.c (dbl_click_cb): Since this is
-	an ETree now, the signature of the double click callback has
-	changed.
-
-2001-03-30  Dan Winship  <danw@ximian.com>
-
-	* Evolution-ShellComponent.idl: add a "debug" method to tell a
-	component to output debugging messages to a given file.
-
-	* main.c (main): Add a "--debug filename" argument, to direct
-	debugging output for all components to a file. Redirect the
-	shell's stdout/stderr to that file if this argument is used.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_set_owner): If debug_log is set,
-	call the component's debug method as well.
-
-	* evolution-shell-component.c (impl_ShellComponent_debug):
-	redirect stdout/stderr to the named file and emit a "debug"
-	signal.
-
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-component-registry.c: Remove/replace  unneeded includes and
-	move around stuff so that system headers are included first.
-	* e-corba-storage.c: Replace #include <bonobo.h>
-	* e-folder-tree.c: Shuffle.
-	* e-folder.c: Remove #include <gtk/gtkobject.h>
-	* e-local-storage.c: Replace #include <gnome.h> and <bonobo.h>
-	* e-setup.c: Replace #include <glib.h> and <gnome.h>
-	* e-shell-folder-creation-dialog.c: Replace #include <gnome.h>
-	* e-shell-folder-title-bar.c: Replace <gnome.h>
-	* e-shell-utils.c: Same here.
-	* e-shell-view-menu.c: Same here (and <bonobo.h>)
-	* e-shell-view.c: Replace <gnome.h> and <bonobo.h>
-	* e-shell.c: Replace <gnome.h>
-	* e-shell.h: Shuffle.
-	* e-shortcuts-view-model.c: Replace <gnome.h>
-	* e-shortcuts-view.c: Remove #include <gnome.h>
-	* e-shortcuts.c: Move <string.h> up.
-	* e-splash.c: Replace <gnome.h>
-	* e-storage-set-view.c: Replace <gnome.h>
-	* e-storage-set.c: Shuffle
-	* e-storage.c: Replace <gnome.h>
-	* evolution-local-storage.c: Same here
-	* evolution-local-storage.h: And here.
-	* evolution-session.c: Same here too.
-	* evolution-session.h: Replace <bonobo.h>
-	* evolution-shell-client.c: Here too.
-	* evolution-shell-component-client.c: Shuffle.
-	* evolution-shell-component.c: Replace <bonobo.h>
-	* evolution-shell-view.c: Remove #include <bonobo.h>
-	* evolution-shell-view.h: Replace <gnome.h>
-	* evolution-storage-listener.c: Replace <gnome.h> and <bonobo.h>
-	* evolution-storage-listener.h: Replace <gnome.h>
-	* evolution-storage-set-view-listener.c: Replace <gnome.h> and <bonobo.h>
-	* evolution-storage-set-view.c: Remove <gnome.h>
-	* evolution-storage.c: Replace <bonobo.h>
-	* main.c: Replace <gnome.h> and <bonobo.h>
-	* importer/importer.c: Replace <gnome.h>
-	* importer/intelligent.c: Replace <gnome.h>. Add prototype for
-	intelligent_importer_init().
-	* importer/intelligent.h: Added this file.
-	
-2001-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (folder_sort_callback): Use
-	`g_strcasecmp()' instead of `strcasecmp()'.
-
-2001-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (storage_sort_callback,
-	folder_sort_callback): Use strcasecmp instead of strcmp.
-
-2001-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (async_xfer_folder_callback):
-	s/new_folder/destination_folder/ where appropriate, idiot.
-
-2001-03-28  Jon Trowbridge  <trow@gnu.org>
-
-	* e-shell-view-menu.c: In a fit of egomania, added myself to the
-	authors array.
-
-2001-03-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component-client.c
-	(shell_component_result_from_corba_exception): Implement.
-
-2001-03-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_async_xfer_folder): Handle CORBA
-	exception.
-	(evolution_shell_component_client_async_create_folder): Likewise.
-
-	* e-local-storage.c (create_folder_directory): Create the
-	`subfolders' directory if it doesn't exist.
-
-	* e-storage-set-view.c (tree_drag_data_received): Build the
-	correct target path by appending the basename from the source
-	path.
-
-	* evolution-shell-component.c
-	(impl_ShellComponent_async_xfer_folder): Enabled again.
-	(class_init): Install it.
-
-	* e-local-folder.c (METADATA_FILE_NAME_LEN): Removed #define.
-	(METADATA_FILE_NAME): Removed #define.
-	(save_metadata): Use the public
-	`E_LOCAL_FOLDER_METADATA_FILE_NAME' value instead.
-	(construct_loading_metadata): Likewise.
-
-	* e-local-folder.h (E_LOCAL_FOLDER_METADATA_FILE_NAME_LEN): New
-	#define.
-	(E_LOCAL_FOLDER_METADATA_FILE_NAME): New #define.
-
-	* e-local-storage.c (remove_folder_directory): New helper
-	function.
-	(async_xfer_folder_step): New.
-	(async_xfer_complete): New.
-	(async_xfer_folder_callback): New.
-	(impl_async_xfer_folder): Implement.
-
-	* e-storage.h: Added value `E_STORAGE_NOTEMPTY' to
-	`EStorageResult'.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_clinet_async_xfer_folder): New.
-
-2001-03-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-local-storage.c (impl_async_xfer_folder): New, implementation
-	for `EStorage::async_xfer_folder'.
-	(class_init): Install it.
-	(check_valid_name): Removed.  Conflicts shouldn't be handled this
-	way, and hardcoding the names is *bad*.
-	(create_folder_directory): New helper function.
-	(real_do_folder_create): Removed.
-	(create_folder): New.  Do things here using
-	`create_folder_directory'.
-	(impl_async_create_folder): Use `create_folder'.
-	(notify_bonobo_listener): Renamed from `notify_listener'.  Moved
-	on top for clarity.
-
-2001-03-22  Iain Holmes  <iain@ximian.com>
-
-	* importer/evolution-importer-listener.c (evolution_importer_listener_new):
-	Remove the usage of the corba_object thing.
-	(evolution_importer_listener_construct): Ditto.
-
-	* e-local-storage.c (real_do_folder_create): Revert the e_mkdir_hier call
-	to two seperate calls to mkdir. If the directory exists, just call the 
-	callback and notify the listener.
-
-	* importer/GNOME_Evolution_Importer.idl: Add a folderpath paramater to the
-	loadFile method.
-
-	* importer/evolution-importer.[ch]: Update for the new folderpath param.
-	
-	* importer/evolution-importer-client.[ch]: Ditto.
-
-	* importer/importer.c: Ditto.
-
-2001-03-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (motion_notify_event): Unref the target
-	list we create on the fly.
-
-2001-03-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-creation-dialog.c (async_create_cb): Changed
-	signature to match `EStorageSetResultCallback' instead of
-	`EStorageResultCallback', to match the changes in the async_create
-	API call.
-
-2001-03-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c: Removed some unused static variables.
-	(set_evolution_path_selection): Removed unused variable
-	`evolution_path'.
-
-	* e-storage-set.c (e_storage_set_async_xfer_folder): Get an
-	`EStorageSetResultCallback', instead of an
-	`EStorageResultCallback'.
-	(e_storage_set_async_remove_folder): Likewise.
-	(e_storage_set_async_create_folder): Likewise.
-	(storage_callback_converter): New callback to convert from the
-	EStorageResultCallback to the EStorageSetResultCallback.
-
-	* e-storage-set.h: New typedef `EStorageSetResultCallback'.
-
-	* Evolution-ShellComponent.idl: Renamed `copyFolderAsync' into
-	`xferFolderAsync' for consistency.
-
-	* e-storage-set-view.c (tree_drag_data_received): Updated to use
-	`e_storage_set_async_xfer_folder()' instead of
-	`e_storage_set_async_move_folder()' or
-	`e_storage_set_async_copy_folder()'.
-	(folder_xfer_callback): New, callback for the xfer function.
-
-	* e-storage-set.c (e_storage_set_async_move_folder): Removed.
-	(e_storage_set_async_copy_folder): Removed.
-	(e_storage_set_async_xfer_folder): New.
-
-2001-03-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage.c (e_storage_async_xfer_folder): New.
-	(impl_async_xfer_folder): New, default implementation for the
-	`async_xfer_folder' method.
-	(class_init): Install it.
-
-	* e-storage.h: New virtual method `async_xfer_folder'.
-
-	* evolution-storage.c (impl_Storage_async_xfer_folder): New.  Just
-	a stub for now.
-	(evolution_storage_get_epv): Install it as the implementation for
-	the `asyncXferFolder' method.
-
-	* Evolution-Storage.idl: New method `asyncXferFolder'.
-
-2001-03-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c: Removed `source_drag_types',
-	`num_source_drag_types', `destination_drag_types',
-	`num_destination_drag_types', `target_list'.
-	(E_SHORTCUT_TARGET_TYPE): Renamed from "E_SHORTCUT_TYPE".
-	(EVOLUTION_PATH_TARGET_TYPE): Define to "_EVOLUTION_PRIVATE_PATH".
-	(find_matching_target_for_drag_context): If any of the targets
-	matches it, return it.
-	(handle_evolution_path_drag_motion): New.
-	(tree_drag_motion): Use it if we are matching an
-	`EVOLUTION_PATH_TARGET_TYPE' target.
-	(e_storage_set_view_construct): Call `e_tree_drag_dest_set()' on
-	the view so that we become a possible DnD target.
-	(get_folder_at_node): Don't die if you don't find a folder there.
-	(create_target_entries_from_dnd_type_list): Make the first entry
-	an `EVOLUTION_PATH_TARGET_TYPE', the second one an
-	`E_SHORTCUT_TYPE', and the following ones the ones defined by the
-	folder.
-	(set_evolution_path_selection): New function to set the private
-	Evolution path selection.
-	(set_e_shortcut_selection): Assert @selection_data to be not NULL.
-	(class_init): Don't set up the `target_list' anymore.
-	(storage_sort_callback): Actually compare the two nodes, not the
-	first node with itself.
-
-	* e-storage-set.c (e_storage_set_async_copy_folder): New.
-	(e_storage_set_async_move_folder): New.
-
-2001-03-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (etree_get_save_id): Changed get_save_id to
-	just return a strdup of the path.
-	(new_storage_cb, new_folder_cb, insert_folders, insert_storages):
-	Call e_tree_memory_sort_node.
-
-2001-03-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (etree_get_save_id): If we have no
-	associated StorageSet yet, just return "root".  [This can happen
-	when this function is called at construction time.]
-
-2001-03-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Evolution-ShellComponentDnd.idl: StudlyCapsify struct members to
-	match the new IDL naming standards.
-	* e-storage-set-view.c: Updated accordingly.
-
-2001-03-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (tree_drag_data_get): Get the target type
-	from the atom, and pass it through the `SourceFolder::getData'
-	invocation.  Also, signal an error by passing `-1' as the length
-	value to `gtk_selection_data_set()'.
-	(find_matching_target_for_drag_context): New helper function.
-	(tree_drag_motion): Use it to figure out a suitable type for the
-	drop action, and pass it to the `DestinationFolder::handleMotion'
-	method.
-
-	* e-storage-set-view.c (get_component_at_node): New helper
-	function.
-	(table_drag_begin): Use it.
-	(convert_corba_drag_action_to_gdk): New helper function.
-	(table_drag_motion): Use the `DestinationFolder::handleMotion'
-	method to handle the "drag_motion" signal.
-
-	* Evolution-ShellComponentDnd.idl: Change the signature for the
-	`handleMotion' method so that it only has @suggested_action
-	parameter.
-
-2001-03-20  JP Rosevear  <jpr@ximian.com>
-
-	* importer/Makefile.am: make sure intelligent.h gets disted
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* Merged e-tree-rework-branch:
-
-	2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (etree_get_save_id): Made "root" detection
-	deal properly with removed nodes.
-
-	2001-03-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-shell-view.c (e_shell_view_save_settings): Added some unused
-	code to implement saving of the expanded state.
-
-	* e-storage-set-view.c: Added has_save_id and get_save_id methods.
-
-	2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c (ETREE_SPEC): Set draw-grid here to false.
-
-	2001-03-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c, e-storage-set-view.h: Chaned this to use
-	ETree instead of ETable.
-
-2001-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component-client.c: New members
-	`dnd_source_folder_interface' and
-	`dnd_destination_folder_interface' in
-	`EvolutionShellCompoentClientPrivate'.
-	(init): Initialize.
-	(impl_destroy): Clean up.
-	(evolution_shell_component_client_get_dnd_source_interface): New.
-	(evolution_shell_component_client_get_dnd_destination_interface):
-	New.
-
-2001-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (init): Ooops.  Initialize the
-	`drag_corba_source_context' member.  correctly.
-	(table_drag_begin): Don't crash if queryInterface returns
-	`CORBA_OBJECT_NIL'.
-	(table_drag_end): Don't do anything if the
-	`drag_corba_source_interface' is `CORBA_OBJECT_NIL'.
-
-2001-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c New members `drag_data',
-	`drag_corba_source_interface' and `drag_corba_source_context in
-	`EStorageSetViewPrivate'.
-	(init): Init the new members.
-	(destroy): Clean up the new members.
-	(table_drag_begin): Query for the
-	`EvolutionShellComponentDnd::SourceFolder' interface on the
-	handler for the folder we are dragging from, and initialize all
-	the CORBA context information for the drag, after invoking
-	`::beginDrag()' on it.
-	(convert_gdk_drag_action_to_corba): New helper function.
-	(table_drag_data_get): Get the data using
-	`::SourceFolder::getData'.
-	(table_drag_end): New, override for the "ETable::table_drag_end"
-	signal.  Invoke `::endDrag' on the SourceFolder interface,
-	unref/release the interface, and clean up the source context.
-	(table_drag_data_delete): New, override for the
-	"ETable::table_drag_data_delete" signal.
-	(class_init): Install `table_drag_end' and
-	`table_drag_data_delete'.
-
-	* Evolution-ShellComponentDnd.idl: Derive `::DestinationFolder'
-	and `SourceFolder' from `Bonobo::Unknown'.
-
-2001-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (table_drag_data_get): Don't get the
-	selection through
-	`evolution_shell_component_client_get_dnd_selection()'.
-
-	* evolution-shell-component.c
-	(impl_ShellComponent_getDndSelection): Removed.
-	(class_init): Don't install.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_get_dnd_selection): Removed.
-
-	* Evolution-ShellComponentDnd.idl: New file with the DnD stuff.
-
-	* Evolution-ShellComponent.idl: Removed the dnd stuff.
-
-2001-03-15  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* main.c: fixed a no-c-format tag
-
-2001-03-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importer/Makefile.am (INCLUDES): Remove `-g Wall' and friends.
-	Use `$(EXTRA_GNOME_CFLAGS)' instead of `$(GNOME_INCLUDEDIR)'.  Add
-	`-I$(top_builddir)/shell'.
-
-2001-03-13  Iain Holmes  <iain@ximian.com>
-
-	* importer/intelligent.c (start_importer): Add a "Don't ask me again"
-	checkbox and don't ask about an importer if the box was ticked.
-
-2001-03-12  Iain Holmes  <iain@ximian.com>
-
-	* Evolution-Storage.idl: Add a FolderResult structure.
-
-	* e-local-storage.c (struct _AsyncCreateFolderCallbackData): Add a
-	Bonobo_Listener.
-	(notify_listener): Function to...notify the listener.
-	(component_async_create_folder_callback): Use the notify_listener
-	function.
-	(real_do_folder_create): New prototype. Replace all returns with
-	a call to notify_listener. Make the directory with a call to
-	e_mkdir_hier instead of multiple calls to mkdir. Only emit a fail
-	on a bad error, not on EEXIST.
-	(bonobo_interface_create_folder_cb): Namespace create_folder_cb to match
-	the others.	
-
-	e-shell.c: Run the intelligent importer.
-
-	evolution-storage.c (impl_Storage_async_create_folder): Just emit the signal,
-	not the callback.
-	(e_marshal_NONE__POINTER_POINTER_POINTER_POINTER_POINTER): Lovely signal
-	marshaller.
-	(class_init): Change the signal definition for the create_folder signal.
-
-	importer/GNOME_Evolution_Importer.idl: Add an IntelligentImporter inteface.
-
-	importer/Makefile.am: Add the evolution-intelligent-importer.c, intelligent.c
-	and evolution-intelligent-importer.h to the files.
-
-	importer/evolution-importer-listener.[ch]: Convert to BonoboXObject.
-
-	importer/evolution-importer.[ch]: BonoboXObjectification.
-
-	importer/evolution-intelligent-importer.[ch]: BonoboXObject for the
-	GNOME:Evolution:IntelligentImporter interface.
-
-	importer/intelligent.c: Code for running the intelligent importers.
-
-2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (get_folder_at_row): New helper function.
-	(create_target_list_for_row): Use it.
-	(table_drag_data_get): Get the selection from the shell component
-	using `evolution_shell_component_client_get_dnd_selection()'.
-	(set_e_shortcut_selection): Turn a `g_return_if_fail()' into a
-	`g_assert()'.
-
-	* evolution-shell-component.c: New member `get_dnd_selection_fn'
-	in `EvolutionShellComponentPrivate'.
-	(evolution_shell_component_construct): New arg
-	@get_dnd_selection_fn.
-	(evolution_shell_component_new): Likewise.
-	(impl_ShellComponent_getDndSelection): New, implementation for
-	`ShellComponent::getDndSelection'.
-	(class_init): Install it.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_get_dnd_selection): New, wrapper
-	for `ShellComponent::getDndSelection'.
-
-	* evolution-shell-component.h: Renamed
-	`EvolutionShellComponentPopulateFolderContextMenu' into
-	`EvolutionShellComponentPopulateFolderContextMenuFn'.  New
-	function pointer typedef `EvolutionShellComponentGetDndSelectionFn'.
-
-	* Evolution-ShellComponent.idl: New method
-	`ShellComponent::getDndSelection'.
-
-	* e-storage-set-view.c (create_target_entries_from_dnd_type_list):
-	Always add an `E_SHORTCUT_TYPE' type at least.
-	(create_target_list_for_row): Don't return NULL if the list of
-	exported DND types is NULL.  Don't create an unused target list.
-	Actually return the created target list.
-	(table_drag_data_get): If the @info is zero, set the e-shortcut
-	selection.
-	(set_uri_list_selection): Temporarily disabled.
-
-2001-03-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-component-registry.c (register_type): New args
-	@num_exported_dnd_types, @exported_dnd_types,
-	@num_accepted_dnd_types, @accepted_dnd_types.  Pass them to
-	`e_folder_type_registry_register_type()'.
-	(register_component): Updated accordingly, getting the values from
-	the CORBA `GNOME::Evolution::FolderType' struct.
-
-	* e-folder-type-registry.c: New members `accepted_dnd_types' and
-	`exported_dnd_types' in `struct _FolderType'.
-	(e_folder_type_registry_register_type): New args
-	@num_accepted_dnd_types, @accepted_dnd_types,
-	@num_exported_dnd_types, @exported_dnd_types.
-	(register_folder_type): Likewise.
-	(folder_type_new): Likewise.  Use them to initialize
-	`accepted_dnd_types' and `exported_dnd_types' in the newly created
-	`FolderType' struct.
-	(e_folder_type_registry_get_accepted_dnd_types_for_type): New.
-	(e_folder_type_registry_get_exported_dnd_types_for_type): New.
-
-	* e-storage-set-view.c: New #defined constant `DRAG_RESISTANCE'.
-	New members `drag_x', `drag_y', `drag_column', `drag_row' in
-	`EStorageSetViewPrivate'.
-	(init): Initialize them.
-	(button_press_event): New function, overriding for the
-	`::button_press_event' method.
-	(motion_notify_event): New function, overriding for the
-	`::motion_notify_event' method.
-	(class_init): Install them.
-
-	* evolution-shell-component.c
-	(duplicate_null_terminated_string_array): New helper function.
-	(evolution_shell_component_construct): Copy the values for
-	`accepted_dnd_types' and `exported_dnd_types' from the original
-	folder type list using it.
-	(destroy): Free the `exported_dnd_types' and `accepted_dnd_types'
-	members too.
-	(fill_corba_sequence_from_null_terminated_string_array): New
-	helper function.
-	(impl_ShellComponent__get_supported_types): Also set the
-	`exported_dnd_types' and `accepted_dnd_types' values in the folder
-	type elements we return.
-
-	* evolution-shell-component.h: Added `accepted_dnd_types' and
-	`exported_dnd_types' members to `EvolutionShellComponentFolderType'.
-
-	* Evolution-ShellComponent.idl: Renamed `accepted_dnd_mime_types'
-	to `accepted_dnd_types' and `exported_dnd_mime_types' to
-	`exported_dnd_types'.  These are not necessarily MIME types.
-
-2001-03-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-storage-set-view.c: Override cursor_activated signal instead
-	of cursor_changed signal.
-
-2001-02-27  Dan Winship  <danw@ximian.com>
-
-	* main.c (development_warning): Update this again.
-
-2001-02-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Evolution-Shell.idl: Rename `FolderTypeList' to
-	`FolderTypeNameList' as it was confusing.
-
-	* Evolution-ShellComponent.idl: New members
-	`accepted_dnd_mime_types' and `exported_dnd_mime_types' in `struct
-	FolderType'.
-
-2001-02-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-storage.c (folder_changed_cb): Don't free a const pointer.
-
-2001-02-23  Iain Holmes  <iain@ximian.com>
-
-	* e-local-storage.c (construct): Connect to the create-folder signal.
-	(impl_async_create_folder): Move this into the real_do_folder_create
-	function.
-	(real_do_folder_create): Function that creates the folder.
-	(create_folder_cb): Creates the folder form a callback.
-
-2001-02-21  Michael Meeks  <michael@ximian.com>
-
-	* importer/importer.c: add include.
-	(show_import_wizard): update signature to that of a verb.
-
-	* evolution-shell-component.c (corba_class_init): move into
-	(class_init): here & upd.
-	(evolution_shell_component_construct): upd.
-	(create_servant): kill.
-	(E_MAKE_TYPE) -> E_MAKE_X_TYPE.
-
-2001-02-20  Dan Winship  <danw@ximian.com>
-
-	* e-folder.c (_EFolderPrivate): split "highlighted" into
-	self_highlight and child_highligh.
-	(e_folder_get_highlighted): Return TRUE if either self_highlight
-	is true or any child is highlighted.
-	(e_folder_set_child_highlight): New function to tell the folder
-	about a child highlight change.
-
-	* e-storage.c (folder_changed_cb): Update child highlights
-	correctly on folders so that folders will be highlighted whenever
-	their children are.
-
-2001-02-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-shell-view-menu.c (file_verbs): Cast this fucntion pointer.
-
-	* e-storage-set-view.c (ETABLE_SPEC): Turn on horizontal scrolling
-	here.
-
-	* evolution-shell-component.c
-	(impl_ShellComponent_async_copy_folder): Commented out this unused
-	function.
-
-	* evolution-storage.c (storage_gtk_to_corba_result): Removed an
-	unused variable here.
-
-	* importer/importer.c: Include gal/widets/e-gui-utils.h.
-
-2001-02-14  Dan Winship  <danw@ximian.com>
-
-	* Evolution-Storage.idl: add asyncCreateFolder and
-	asyncRemoveFolder interfaces. (Use Bonobo::Listener rather than
-	creating a new listener interface.)
-
-	* Evolution-LocalStorage.idl: Remove the
-	Evolution::LocalStorageOpsListener interface, which wasn't being
-	used.
-
-	* evolution-storage.c (impl_Storage_async_create_folder,
-	impl_Storage_async_remove_folder): implement by emitting signals
-	on the EvolutionStorage object. Convert from
-	EvolutionStorageResult to GNOME_Evolution_Storage_Result (blah!)
-	(class_init): Set up the new "create_folder" and "remove_folder"
-	signals.
-
-	* e-corba-storage.c (async_create_folder, async_remove_folder):
-	Implement, using the new Evolution::Storage IDL. Convert from
-	GNOME_Evolution_Storage_Result to EStorageResult (blah!)
-
-	* e-storage-set.c (e_storage_set_async_create_folder): Don't allow
-	a NULL description (since it doesn't allow a NULL anythign else).
-
-	* e-shell-folder-creation-dialog.c (dialog_clicked_cb): Pass ""
-	rather than NULL for the description.
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* Makefile.am: xml-i18n-tools setup.
-	* GNOME_Evolution_Shell.oaf.in: Mark strings for translation.
-	
-2001-02-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c: Moved the author list to the top of the
-	file.
-	(command_about_box): Display the `SUB_VERSION' as well.
-
-2001-02-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-creation-dialog.c (dialog_clicked_cb): Destroy
-	the dialog instead of using `gnome_dialog_close()'.
-	(dialog_clicked_cb): Likewise.
-	(dialog_close_cb): Removed.
-	(e_shell_show_folder_creation_dialog): Don't connect to the
-	"close" signal anymore.
-
-	* e-shell-folder-selection-dialog.c
-	(folder_creation_dialog_result_cb): New callback.  Set the default
-	folder to be the newly created one.
-	(impl_clicked): Use it.
-
-	* e-shell-folder-creation-dialog.c: Add members `folder_path',
-	`result_callback' and `result_callback_data' to `struct
-	_DialogData'.
-	(e_shell_show_folder_creation_dialog): New args @result_callback
-	and @result_callback_data.
-	(async_create_cb): Notify the result through the specified
-	callback.
-	(dialog_clicked_cb): Likewise.  Set the `folder_path' in the
-	DialogData so that we can pass it over when we get the async
-	notification of the result of the operation.
-
-	* e-shell-folder-creation-dialog.h: New type
-	`EShellFolderCreationDialogCallback'.
-
-	* e-storage-set-view.c (e_storage_set_view_set_current_folder):
-	Show the node too, using `e_tree_model_show_node()'.
-
-2001-02-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-setup.c (copy_default_stuff): s/first time you run/first time
-	you are running/.
-
-2001-02-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-component-registry.h: Don't #include <config.h>.
-	* e-corba-storage-registry.h: Likewise.
-	* e-corba-storage.h: Likewise.
-	* e-folder-type-registry.h: Likewise.
-	* e-folder.h: Likewise.
-	* e-local-folder.h: Likewise.
-	* e-local-storage.h: Likewise.
-	* e-shell-folder-title-bar.h: Likewise.
-	* e-shell-view.h: Likewise.
-	* e-shell.h: Likewise.
-	* e-shortcuts-view.h: Likewise.
-	* e-shortcuts.h: Likewise.
-	* e-splash.h: Likewise.
-	* e-storage-set-view.h: Likewise.
-	* e-storage-set.h: Likewise.
-	* e-storage.h: Likewise.
-	* evolution-local-storage.h: Likewise.
-	* evolution-session.h: Likewise.
-	* evolution-shell-client.h: Likewise.
-	* evolution-shell-component.h: Likewise.
-	* evolution-shell-view.h: Likewise.
-	* evolution-storage-listener.h: Likewise.
-	* evolution-storage.h: Likewise.
-
-2001-02-02  Iain Holmes  <iain@ximian.com>
-
-	* importer/evolution-importer-client.c:
-	(evolution_importer_client_new_from_id): Free the CORBA_Environment.
-
-2001-01-30  Iain Holmes  <iain@ximian.com>
-
-	* importer/importer.c: (start_import): Added a notice if there is no
-	importer that can handle the file.
-	(get_iid_for_filetype): Free the list of multiple items before returning.
-	(importer_timeout_fn): Removed notice.
-	(import_cb): Removed notice.	
-
-2001-01-30  Iain Holmes  <iain@ximian.com>
-
-	* importer/importer.c: Added a nasty hack to change the druids Finish
-	button to be Import.
-
-	* importer/import.glade: Remove the FIXME warning.
-
-2001-01-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* importer/importer.c: Fixed some typos.
-	
-2001-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-creation-dialog.c (add_storage_set_view): Set the
-	shadow type to be `GTK_SHADOW_IN' in the EScrollFrame.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (storage_set_view_box_button_release_event_cb):
-	Don't pop down the folder bar if the button release happens in the
-	e-paned's handle.
-	(storage_set_view_box_button_release_event_cb): Changed the return
-	value to be int.  Stupid me.
-
-2001-01-27  Jason Leach  <jasonleach@usa.net>
-
-	* e-shortcuts-view.h: Fix #include to point to gal instead of
-	widgets/shortcut-bar/
-	
-	* e-shortcuts.c: Here too.
-	* e-shortcuts-view-model.h: And lastly here.
-	
-	* Makefile.am (evolution_LDADD): Don't link with the old
-	widgets/shortcut-bar/libshortcut-bar.la anymore, gal has the new
-	shortcut-bar.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (get_pixbuf_for_folder): Don't scale if the
-	size is the same.  `gdk_pixbuf_scale()' seems to be blurring the
-	image even if the scaling factor is 1.0.
-
-2001-01-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-corba-storage.c: Remove all instances of `__FUNCTION__'.
-	* e-folder-tree.c: Likewise.
-	* e-folder-type-registry.c: Likewise.
-	* e-shell-view.c: Likewise.
-	* e-shell-view-menu.c: Likewise.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_construct): Connect the
-	"updated_folder" with `gtk_signal_connect_while_alive()' so that
-	it gets disconnected when the shell view dies.
-
-2001-01-24  Jason Leach  <jasonleach@usa.net>
-
-	(Fix #1252: Need a File->Close way to close a view)
-	
-	* e-shell-view-menu.c (command_close): New function, destroys the
-	current view.
-
-	* e-shell.c (view_destroy_cb): Make sure shell settings get saved
-	when the last view is destroyed.
-	
-2001-01-24  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* importer/GNOME_Evolution_Importer.idl: Fix missing ';'.
-	
-2001-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-corba-storage.c (impl_StorageListener_update_folder): Don't
-	call `e_storage_updated_folder()' as it's supposed to happen
-	automatically now.
-
-	* e-storage.c (e_storage_updated_folder): Removed.
-	(folder_changed_cb): New callback for the "changed" signal on the
-	EFolders.
-	(e_storage_new_folder): Connect it.
-
-	* e-folder-tree.c: New member `data_to_path' in `EFolderTree'.
-	(e_folder_tree_new): Init here.
-	(e_folder_tree_destroy): Destroy it here.
-	(e_folder_tree_add): Add to the `data_to_path' hash.  Make sure
-	we are not adding the same folder twice.
-	(remove_folder): Remove from the `data_to_path' hash.
-	(e_folder_tree_get_path_for_folder): New.
-
-	* e-shell-view.c (e_shell_view_construct): Don't connect to the
-	"folder_updated" signal of the local storage anymore.
-	(folder_updated_cb): Removed.
-	(updated_folder_cb): New.
-	(e_shell_view_construct): Connect it to the "updated_folder"
-	signal.
-
-	* e-local-storage.c: Remove `FOLDER_UPDATED' enum value and the
-	`signals' variable, as we don't want to define any custom signals
-	here anymore.
-	(bonobo_interface_update_folder_cb): No need to emit the
-	"folder_updated" signal here.  The base class will take care of
-	this already.
-	(class_init): Don't install the "folder_updated" signal here.
-
-	* e-local-storage.h: Removed signal "folder_updated".  It is not
-	necessary, as we already have an `updated_folder' in `EStorage',
-	which is the parent class of `ELocalStorage'.
-
-2001-01-24  Iain Holmes  <iain@ximian.com>
-
-	* importer/GNOME_Evolution_Importer.idl: Removed the busy exception.
-
-2001-01-19  Iain Holmes  <iain@ximian.com>
-
-	* importer/GNOME_Evolution_Importer.idl: Make the processItem oneway.
-	Make the Listener interface inherit from Bonobo::Unknown.
-
-	* importer/evolution-importer-client.[ch]: Remove all the crap to deal
-	with creating the Listener object.
-
-	* importer/evolution-importer-listener.[ch]: A new bonobo object to 
-	implement the ImporterListener interface.
-
-	* importer/importer.c: Fix it up to use the new Listener object.
-
-2001-01-18  Iain Holmes  <iain@ximian.com>
-
-	* e-shortcuts-view.c (show_new_group_dialog): Don't make the dialog
-	modal. 
-
-2001-01-16  Iain Holmes  <iain@ximian.com>
-
-	* importer/GNOME_Evolution_Importer.idl: Removed the ImporterFactory
-	interface and put the methods from it into the Importer interface.
-
-	* importer/evolution-importer-factory.[ch]: Removed.
-
-	* importer/evolution-importer.[ch]: Added the new methods.
-	Added inline documentation for all public functions.
-
-	* importer/evolution-importer-client.[ch]: Added new client support for
-	the new methods.
-	Added inline documentation for all public functions.
-
-	* importer/importer.c (create_plugin_menu): Changed the query to look for
-	IDL:GNOME/Evolution/Importer:1.0.
-	(start_import): Do all CORBA methods through the EvolutionImporterClient.
-	(get_iid_for_filetype): Change query to search for 
-	IDL:GNOME/Evolution/Importer:1.0.
-
-2001-01-19  Dan Winship  <danw@ximian.com>
-
-	* evolution-storage.c (evolution_storage_folder_exists): New
-	function. Obvious.
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	(Bug #883: Shortcut bar does not update when a folders display
-	 name changes)
-
-	* e-local-storage.c (class_init): Define a new "folder_updated"
-	signal here.
-	(bonobo_interface_update_folder_cb): Emit the new folder_updated
-	signal here.
-
-	* e-shell-view.c (e_shell_view_construct): Connect the
-	EShell::ELocalStorage folder_updated signal here.  Also connect
-	the updated_folder signal coming from EShell::EStorageSet to the
-	new callback.
-
-	* e-shell-view.c (folder_updated_cb): Callback that actually
-	initiates the shell updating.
-	
-	* e-shortcuts.c (e_shortcuts_update_shortcut_by_uri): New
-	function.  Given a URI for a shortcut bar item, we'll update it.
-
-	* e-shortcuts.c (e_shortcuts_remove_shortcut_by_uri): New
-	function.  Given a URI for a shortcut bar item, we'll remove it.
-
-	* e-shortcuts.c (removed_folder_cb): Connect this callback that
-	will remove a renamed vfolder from the shortcut bar.  Temporary
-	fix to the problem of renaming vfolders and having the shortcut
-	bar think the old vfolder still exists.
-	
-	(Bug #1168: Shortcut bar and icon size persistence)
-	
-	* e-shell-view.c (save_shortcut_bar_icon_modes): New static
-	function, save the icon modes (for all shortcut bar groups, even
-	though we only have one group now).
-	(load_shortcut_bar_icon_modes): New static function, load the
-	saved shortcut bar group icon modes and apply them to our shortcut
-	bar.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* importer/evolution-importer.h: Use "typedef enum { ... } Blah;"
-	instead of "typedef enum _Blah Blah; enum _Blah { ... };" so that
-	gtk-doc can parse it.  Sigh.
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_construct): Set the shadow type
-	for the EScrollFrame.  Also, make the EStorageSetView widget grab
-	the focus.  For some reason it doesnt' seem to work, but I'll
-	blame ETree for now.
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (update_for_current_uri): Display the folder name
-	before "Evolution" instead of after it.  Also, display the
-	sub-version string if it was defined when configuring.
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (table_drag_drop): Don't emit the
-	"dnd_action" signal here.  Instead, do a `gtk_drag_get_data()' to
-	retrieve information about the drop.
-	(table_drag_data_received): New, implementation for
-	`ETable::table_drag_data_received'.
-	(class_init): Install it.
-	(table_drag_data_get): Use `unsigned int' instead of `guint' for
-	consistency.
-	(table_drag_motion): Same here.  Also use `int' instead of `gint'.
-	(table_drag_drop): Likewise.
-	(treepath_compare): Likewise.
-	(marshal_NONE__ENUM_STRING_STRING_STRING): Removed.
-	(marshal_NONE__GDKDRAGACTION_STRING_STRING_STRING): New.
-	(class_init): Use it; update signal "dnd_action" so that it passes
-	a `GdkDragAction *' instead of .
-
-	* e-storage-set-view.h: Change signal "::dnd_action" so that it
-	provides a `GdkDragContext' instead of just a `GdkDragAction'.
-
-2001-01-16  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_construct): set config
-	path on window.
-
-2001-01-16  JP Rosevear  <jpr@ximian.com>
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_new): pop the
-	visual/cm after the construct
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_new): push/pop
-	the color map
-	(e_shell_folder_title_bar_new): and the visual...
-
-2001-01-15  Iain Holmes  <iain@ximian.com>
-
-	* importer/importer.c (import_druid_cancel): Just destroy the wizard.
-	All other freeing code is moved into import_druid_destroy.
-	(show_import_wizard): Connect the destroy signal to import_druid_destroy.
-	(start_import): Connect to the destroy signal of the dialog and the
-	clicked as well.
-	(dialog_destroy_cb): Stop the import after the current item has finished.
-	(dialog_clicked_cb): Stop the import.
-	(import_cb): Only process the next item if the dialog hasn't been stopped.
-	Destroy the dialog if it hasn't been destroyed already.
-
-	* e-splash.c (e_splash_construct): Set the window title to Evolution.
-
-2001-01-13  Jason Leach  <jasonleach@usa.net>
-
-	(Fix bug #934: Add Right-click item to hide the shortcut bar)
-
-	* e-shortcuts-view.c (class_init): Create a new hide_requested
-	signal.
-	(hide_shortcut_bar_cb): New function that gets called from the
-	right click menu items, it emits the hide_requested signal.
-
-	* e-shell-view.c (setup_widgets): Connect the hide_requested from
-	the shortcut bar.
-	(hide_requested_cb): New function.
-
-2001-01-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.h: New signal `dnd_action'.
-
-	* e-storage-set-view.c: Renamed `drag_types' to
-	`source_drag_types' and `num_drag_types' to
-	`num_source_drag_types'.  New variables `destination_drag_types'
-	and `num_destination_drag_types'.
-	(e_storage_set_view_construct): Set the ETree as a drag
-	destination.  Allow both GDK_ACTION_MOVE and GDK_ACTION_COPY.
-
-	* e-storage-set-view.c (table_drag_begin): Renamed from
-	`etable_drag_begin'.
-	(table_drag_data_get): Renamed from `etable_drag_data_get'.
-	Changed to be a method override instead of a signal handler.
-	(table_drag_motion): New; implementation for the
-	`ETable::table_drag_motion' method. Changed to be a method
-	override instead of a signal handler.
-	(table_drag_drop): New, implementation for `::table_drag_drop'.
-	(cursor_change): Renamed from `on_cursor_change'.
-	(e_storage_set_view_construct): Don't connect the signals here.
-	(class_init): Instead, override the methods here.  Also, install
-	our override for `::table_drag_motion' and for
-	`::table_drag_drop'.
-	(right_click): Changed to be a method instead of a signal handler.
-	(cursor_change): Likewise.
-
-2001-01-13  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-shell.c (e_shell_construct): Unref our copy, and then destroy.
-
-	* e-splash.c (e_splash_set_icon_highlight): Do not execute code if
-	we have been destroyed.
-	(e_splash_add_icon): ditto.
-
-2001-01-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-splash.c (e_splash_construct): Ok, talked to Ettore.  Going
-	back to TOPLEVEL non-POPUP.
-	(e_splash_construct): Remove nice toplevel window.
-
-2001-01-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c: Add member `copy_folder_fn' to
-	`EvolutionShellComponentPrivate'.
-	(init): Init to NULL.
-	(impl_ShellComponent_async_copy_folder): New function,
-	implementation for `::asyncCopyFolder'.
-	(evolution_shell_component_construct): New arg @copy_folder_fn.
-	Set the corresponding member in `EvolutionShellComponentPrivate'.
-	(evolution_shell_component_new): New arg @copy_folder_fn.  Pass it
-	to `evolution_shell_component_construct'.
-
-	* evolution-shell-component.h: New type
-	`EvolutionShellComponentCopyFolderFn'.
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Evolution-ShellComponent.idl: Add method `::removeFolderAsync'.
-
-2001-01-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c (corba_class_init):
-	s/addFolderAsync/createFolderAsync/.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_async_create_folder):
-	s/addFolderAsync/createFolderAsync/.
-
-	* Evolution-ShellComponent.idl: Rename `addFolder' into
-	`createFolder'.
-
-2001-01-12  Dan Winship  <danw@ximian.com>
-
-	* importer/.cvsignore: Create
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* e-storage-set-view.c: Added translation strings.
-
-	* e-shell-view-menu.c (command_about_box): Update our name
-	(command_new_mail_message): Remove "window"
-	from the moniker path.
-
-	* e-splash.c (e_splash_construct): Make the spalsh screen a
-	toplevel instead of a popup.
-
-2001-01-11  Dan Winship  <danw@ximian.com>
-
-	* e-shell-view.c (show_existing_view): Remove the "Already have
-	view for..." message. People keep assuming it's an error.
-
-2001-01-11  Iain Holmes  <iain@ximian.com>
-
-	* importer/*: New directory containing the importer framework.
-
-	* e-shell-view-menu.c (file_verbs): Add the FileImporter verb.
-
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-shell-view-menu.c (command_goto_folder): Fix prototype
-	(command_new_view): ditto.
-	(command_new_mail_message): Implement command_new_mail_message.
-
-	verbs: Use BONOBO_UI_VERB instead of BONOBO_UI_UNSAFE_VERB
-
-2001-01-04  Dan Winship  <danw@helixcode.com>
-
-	* evolution-storage.c (evolution_storage_update_folder_by_uri):
-	New function to update a folder given its URI. Plus associated
-	changes to other functions to keep track of the path<->URI
-	mappings.
-
-2000-12-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-client.c (user_select_folder): Make sure the
-	`*uri_return' and `*physical_uri_return' are always initialized on
-	return, as that's what the caller expects.
-
-2000-12-23  Jason Leach  <jasonleach@usa.net>
-
-	* e-shell-view-menu.c (command_run_bugbuddy): Fix a crash when the
-	user tries to "Submit bug report" but doesn't have bug-buddy
-	installed.  Bug #633.
-
-2000-12-23  Jason Leach  <jasonleach@usa.net>
-
-	* e-setup.c (copy_default_stuff): Make the "Evolution
-	installation" dialog resizable. Bug #742.
-	(check_evolution_directory): Here too.
-
-2000-12-14  Iain Holmes  <iain@helixcode.com>
-
-	* e-shell-folder-selection-dialog.c (dbl_click_cb): Modify to suit the
-	new double click callback signature. Destroy the dialog after the double
-	click as well.
-
-2000-12-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (development_warning): Slightly updated the text for the
-	release.
-
-2000-12-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-splash.c (ICON_Y): Update for the size of the new splash.
-
-2000-12-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-splash.c (button_press_event): Return TRUE as we have handled
-	the event.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* e-shell-view.c (get_control_for_uri): Pass path+1 rather than
-	path to get_type_for_storage, to match the convention used by its
-	other callers.
-
-2000-12-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-splash.c (e_splash_construct): Connect a button-press-event
-	signal on the splash screen so users can click it to hide it.
-	(button_press_event): New callback to hide the splash screen.
-
-2000-12-11  Dan Winship  <danw@helixcode.com>
-
-	* e-shell-view.c (get_type_for_{folder,storage}): return NULL if
-	no {folder,storage} is found.
-	(get_control_for_uri): return NULL if no folder_type is found.
-
-2000-12-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts-view.c (e_shortcuts_view_construct): Ooops.  We were
-	reffing a bogus pointer that was not assigned yet.
-
-	* e-corba-storage-registry.c (impl_StorageRegistry_addStorage):
-	Updated according to the new IDL.
-
-	* e-local-storage.c (construct): Pass `NULL' to
-	`e_storage_construct' as the @toplevel_node_type arg.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_new_for_objref): New.
-	(evolution_shell_component_client_new): Refactored to use it.
-
-	* e-corba-storage.c (e_corba_storage_construct): New arg
-	@toplevel_node_type.  Pass it to `e_storage_construct'.
-	(e_corba_storage_new): New arg @toplevel_node_type.  Pass it to
-	`e_corba_storage_construct'.
-
-	* e-storage.c: New member `toplevel_node_uri_type' in
-	`EStoragePrivate'.
-	(init): Init to NULL.
-	(destroy): Unref.
-	(e_storage_construct): New arg @toplevel_node_type.  Set the
-	private member value accordingly.
-	(e_storage_new): New arg @toplevel_node_type.  Pass to
-	`e_storage_construct'.
-	(e_storage_get_toplevel_node_type): New.
-
-	* e-shell-view.c (get_physical_uri_for_evolution_uri): New arg
-	@shell_view.
-	(get_physical_uri_for_storage): Filled in.  New arg @shell_view.
-	(get_physical_uri_for_folder): Filled in.  New arg @shell_view.
-
-	* evolution-local-storage.c (evolution_local_storage_construct):
-	Pass `NULL' as the @toplevel_node_type arg to
-	`evolution_storage_construct'.
-
-	* evolution-storage.c: New member `toplevel_node_type' in
-	`EvolutionStoragePrivate'.
-	(destroy): Free.
-	(init): Init to NULL.
-	(evolution_storage_construct): New arg @toplevel_node_handler
-	to initialize the corresponding field in `->priv'.
-	(evolution_storage_new): New arg @toplevel_node_type.  Pass
-	it to `evolution_storage_construct'.
-	(evolution_storage_register): Pass the @toplevel_node_type
-	arg to `::addStorage'.
-
-	* Evolution-Storage.idl: Add arg @toplevel_node_type to
-	`StorageRegistry::addStorage'.
-
-	* main.c (new_view_on_running_shell): Deal with an exception in
-	`::createNewView' gracefully.
-
-	* e-shell-view.c (switch_on_folder_tree_click): New.
-	(folder_selected_cb): Refactored to use it.
-	(storage_selected_cb): Use it.
-
-2000-12-07  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am (oaf_DATA): update to GNOME_Evolution_Shell.oafinfo
-
-	* e-shell.h: upd.
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Evolution-StorageSetView.idl: Arg @uri renamed to @name in
-	`StorageSetViewListener::notifyStorageSelected'.
-
-	* evolution-storage-set-view.c
-	(storage_set_view_widget_storage_selected_cb): Renamed arg @uri to
-	@name.
-
-	* e-storage-set-view.c (on_cursor_change): Only emit the name of
-	the storage for the "storage_selected" signal [i.e. remove the
-	leading slash].
-
-	* e-shell-view.c (storage_selected_cb): New callback for the
-	"storage_selected" signal on the EStorageSetView used for the
-	folder tree.
-	(setup_storage_set_subwindow): Connect it.
-
-	* evolution-local-storage.c (evolution_local_storage_construct):
-	Pass NULL as the @toplevel_node_uri arg to
-	`evolution_storage_construct()'.
-
-	* evolution-storage.c: New member `toplevel_node_uri' in
-	`EvolutionStoragePrivate'.
-	(init): Init to NULL.
-	(destroy): Free.
-	(evolution_storage_construct): New arg @toplevel_node_uri.  Set
-	the @toplevel_node_uri member in the private part to its value.
-	(evolution_storage_new): New arg @toplevel_node_uri.  Pass it to
-	`evolution_storage_construct()'.
-	(evolution_storage_register): Pass the @toplevel_node_uri value to
-	the `::addStorage' CORBA method.
-
-	* e-corba-storage-registry.c (impl_StorageRegistry_addStorage):
-	New arg @toplevel_node_uri, to go with the IDL change.
-
-	* Evolution-Storage.idl (StorageRegistry::addStorage): New arg
-	@toplevel_node_uri.
-
-	* e-local-storage.c (construct): Pass NULL as the
-	@toplevel_node_uri arg to `e_storage_construct()'.
-
-	* e-corba-storage.c (e_corba_storage_construct): New arg
-	@toplevel_node_uri.  Pass it to `e_storage_construct()'.
-	(e_corba_storage_new): New arg @toplevel_node_uri.  Pass it to
-	`e_corba_storage_construct()'.
-
-	* e-storage.c: New member `toplevel_node_uri' in
-	`EStoragePrivate'.
-	(init): Init to NULL.
-	(destroy): Free.
-	(e_storage_construct): New arg @toplevel_node_uri.  Set the
-	`toplevel_node_uri' member in the private part to its value.
-	(e_storage_new): New arg @toplevel_node_uri.  Pass it to
-	`e_storage_construct()'.
-	(e_storage_get_toplevel_node_uri): New.
-
-	* e-corba-storage-registry.c (impl_StorageRegistry_addStorage):
-	Renamed from `impl_StorageRegistry_register_storage'.
-	(impl_StorageRegistry_removeStorageByName): Renamed from
-	`impl_StorageRegistry_unregister_storage'.
-	(corba_class_init): Updated accordingly.
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (new_view_on_running_shell): Don't crash if the object
-	returned from `oaf_activate_from_id' is NIL and the exception
-	isn't set.  Just handle this as a normal error condition.
-
-2000-12-04  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (get_control_for_uri): return NULL if we can't
-	create a view.
-	(setup_evolution_shell_view_interface): add precondition.
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts-view.c (e_shortcuts_view_construct): Ref the
-	shortcuts.
-
-	* main.c (new_view_on_running_shell): New.
-	(idle_cb): If the shell cannot be created, then call
-	`new_view_on_running_shell'.
-
-	* e-shell-view.c: New member `shell_view_interface' in
-	`EShellViewPrivate'.
-	(init): Init to NULL.
-	(setup_evolution_shell_view_interface): Set up.
-	(destroy): Unref.
-
-	* e-shell.c (impl_Shell_getComponentByType): Renamed from
-	`impl_Shell_get_component_for_type'.
-	(impl_Shell_selectUserFolder): Renamed from
-	`impl_Shell_user_select_folder'.
-	(impl_Shell_getLocalStorage): Renamed from
-	`impl_Shell_get_local_storage'.
-	(impl_Shell_createStorageSetView): Renamed from
-	`impl_Shell_create_storage_set_view'.
-	(corba_class_init): Updated accordingly.
-	(impl_Shell_createNewView): New, implementation for the
-	`createNewView' CORBA method.
-	(corba_class_init): Install it.
-
-	* Evolution-Shell.idl: New method `::createNewView'.
-
-	* e-shell.c (register_shell): New.
-	(e_shell_construct): Return value changed to `gboolean'.  New arg
-	@iid.  Construct the Bonobo object before displaying the splash,
-	then try to register it with the specified @iid.  If registration
-	fails, return %FALSE.  Otherwise, just do everything normally and
-	return %TRUE.
-	(e_shell_new): Pass the OAFIID to `e_shell_construct()'.  If it
-	fails, unref the object and return NULL.
-
-	* evolution.oafinfo: New.
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* e-shell-view-menu.c (command_about_box): Add myself, anna, jesse
-
-2000-11-15  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell.c (e_shell_component_maybe_crashed): de-register
-	a component's UI if it dies.
-
-2000-11-25  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (idldir): Install our IDL's into $(datadir)/idl.
-
-2000-11-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-setup.c (check_dir_recur): Plug leaks of the fullname and
-	fulldefaultname.
-	(check_evolution_directory): Plug leaks of defaultdir and newfiles
-	and the list's data; made the code have a single return point.
-
-	* e-shell.c (e_shell_restore_from_settings): Plug leak of prefix.
-	(corba_class_init): Plug leak; we were not assigning the
-	vepv->_base_epv.
-
-	* evolution-storage.c (corba_class_init): Likewise.
-
-	* evolution-local-storage.c (corba_class_init): Likewise.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-shell-component.c
-	(impl_ShellComponent__get_supported_types): Plug leak; mark the
-	CORBA sequence so that it will be released.
-
-2000-11-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (unmerge_on_error): add
-	(e_shell_view_construct): hook up to system_exception on
-	ui_container.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* e-shell.c: (setup_components), (save_settings_for_component):
-	* evolution-storage.c: (evolution_storage_register_on_shell):
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-11-06  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (unrealize): remove.
-	(e_shell_view_construct): ditto.
-
-2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Make the panes of the EPaned not shrinkable
-	beyond their minimum size.
-
-2000-11-08  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* e-shell-folder-selection-dialog.c: Fix typo in a comment.
-
-2000-11-06  Dan Winship  <danw@helixcode.com>
-
-	* e-storage-set-view.c (insert_folders): Pass full_name, not
-	folder_name to callback.
-
-2000-11-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-view.c (impl_ShellView_change_current_view):
-	Constified @uri.
-	(impl_ShellView_set_title): Constified @title.
-
-2000-11-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c: New member `crash_type_names' in `EShellPrivate'.
-	(init): Init to NULL.
-	(destroy): Free.
-	(e_shell_component_maybe_crashed): New.
-
-2000-11-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component.c (impl_ShellComponent_create_view):
-	`CORBA_Object_duplicate()' the return value.
-
-2000-11-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-setup.c: Added #include <config.h>
-	
-2000-11-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c: New local static variables `evolution_directory',
-	`no_splash'.
-	(main): Removed local variable `evolution_directory'.  Add a
-	`--no-splash' command-line option for setting the value of
-	`no_splash'.
-	(idle_cb): Use the static `evolution_directory'.  Make the newly
-	created shell show the splash or not according to the value of
-	`no_splash'.
-
-	* e-shell.c (setup_components): Deal with a NULL @splash
-	parameter.
-	(e_shell_construct): New arg `show_splash'.  Don't create a splash
-	screen if FALSE; instead, pass NULL to `setup_components()' as the
-	@splash arg.
-	(e_shell_new): New arg `show_splash'.  Pass it to
-	`e_shell_construct()'.
-
-2000-11-03  Dan Winship  <danw@helixcode.com>
-
-	* evolution-storage-listener.c (class_init): Fix the name of the
-	signal passed to gtk_signal_new so that this actually works.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	* evolution-storage.c (evolution_storage_new_folder): Make this
-	take "highlighted" as well.
-
-	* e-local-storage.c (new_folder): 
-	* e-corba-storage.c (impl_StorageListener_new_folder): set
-	highlighted on the new folder.
-
-	* e-storage-set-view.c (updated_folder_cb): Remove an unused
-	variable.
-
-2000-10-26  Iain Holmes  <iain@helixcode.com>
-
-	* Evolution-ShellView.idl: Added a change_current_view method and 
-	a set_title.
-
-	* evolution-shell-view.c (class_init): Added signals for the above methods.
-	(impl_ShellView_change_current_view), (impl_ShellView_set_title): Implementations
-	for above methods.
-	(corba_class_init): Connect the implemenations.
-
-	* e-shell-view.c (shell_view_interface_change_current_view): Change
-	the display to the new uri.
-	(shell_view_interface_set_title): Set the window title.
-	(setup_evolution_shell_view_interface): Connect the signals to the above
-	functions.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	* Evolution-Storage.idl: Add "highligted" field to Folder. Add
-	update_folder method to StorageListener to change display_name and
-	highlight status.
-
-	* e-folder.c: Add "highlighted" to EFolder to match the
-	Evolution::Folder type.
-	(e_folder_get_highlighted, e_folder_set_highlighted): Added
-
-	* evolution-storage-listener.c
-	(impl_Evolution_StorageListener_update_folder, etc):
-	* e-storage.c (e_storage_updated_folder, etc):
-	* e-corba-storage.c (impl_StorageListener_update_folder, etc):
-	Implement update_folder.
-
-	* e-storage-set.c (storage_updated_folder_cb, etc): Re-emit
-	updated_folder signals received from EStorage.
-
-	* e-storage-set-view.c (various): Add another model column to the
-	ETable and set it up as a bold_column based on
-	e_folder_get_highligted.
-	(updated_folder_cb, etc): Listen to EStorageSet update_folder
-	signal and emit ETree node_changed signals.
-
-	* evolution-storage.c (evolution_storage_update_folder): Client
-	function to update a folder's display_name and highlighted status.
-
-	* Evolution-LocalStorage.idl:
-	* evolution-local-storage.c: 
-	* e-local-storage.c: Change set_display_name to update_folder to
-	match Evolution::StorageListener
-
-2000-10-25    <jpr@helixcode.com>
-
-	* e-shortcuts-view-model.c (load_group_into_model): Set folder to NULL to
-	kill warning
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_populate_folder_context_menu),
-	(evolution_shell_component_client_create_view): update to new UI handler
-
-	* e-shell-view-menu.c (command_create_folder): ditto.
-
-	* e-storage-set-view.c (popup_folder_menu): ditto.
-
-	* evolution-shell-component-client.h: kill ui-compat include.
-
-2000-10-19  Iain Holmes  <iain@helixcode.com>
-
-	*e-shell-view.c (e_shell_view_save_settings): If there is no view
-        save the default uri instead.
-        (socket_destroy_cb): When a view crashes, change the view to the
-        default one.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-shell-component.c (impl_ShellComponent_populate_folder_context_menu):
-	update for new UI handler.
-
-2000-10-18  Iain Holmes  <iain@helixcode.com>
-
-	* e-shell-view.c (start_progress_bar): If the widget is not realized
-	don't do anything, to prevent BadGC's at shut down.
-	(stop_progress_bar): Don't draw anything if the widget is not realized.
-	Same reason.
-
-	* e-shell-folder-selection-dialog.c (dbl_click_cb): Emit the
-	folder-selected signal.
-	(e_shell_folder_selection_dialog_construct): Connect to the e-table's
-	double-click signal.
-
-2000-10-17  Iain Holmes  <iain@helixcode.com>
-	
-	* e-shell.c (view_deleted_cb): Save the settings before the
-	view is destroyed.
-	(e_shell_quit): Don't save the settings when there are no views.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* e-setup.c (check_evolution_directory): Better dialog.
-
-	* e-splash.c (icon_free): Don't unref the canvas item.
-	(e_splash_construct): Add a frame round the splash screen.
-
-2000-10-16  Dan Winship  <danw@helixcode.com>
-
-	* evolution-storage-set-view-factory.c
-	(evolution_storage_set_view_factory_new_view): Add a typecast.
-
-	* e-storage-set-view.c (popup_folder_menu): Move variable
-	declarations into the #if 0 to kill warnings.
-	(populate_folder_context_menu_with_common_items,
-	folder_context_menu_activate_cb): Move these into #if 0 too.
-
-	* e-shell.c: Add prototype.
-
-	* e-shell-view.c (storage_set_view_box_map_cb): 
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
-	Remove unused variables.
-
-	* e-setup.c: Fix warning caused by e-util -> gal migration.
-
-2000-10-11  Iain Holmes  <iain@helixcode.com>
-
-	* e-setup.c (check_evolution_directory): Check if there are any
-	files in default_user that are not in ~/evolution and if so
-	copy them over.
-	(check_dir_recur): Recursive function to check the directory.
-
-	* e-shell-view-menu.c: Look Maw! I'm an Evolution hacker too.
-
-	* e-shell-view.c: Don't quit on when a view is destroyed.
-
-	* e-shell.c: Save the settings for the remaining views whenever
-	a view is destroyed.
-
-2000-10-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (setup_storage_set_subwindow): Use an
-	EScrollFrame instead of a GtkScrolledWindow.
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (e_shell_construct): Display a splash screen.
-	(setup_components): New arg @splash, pointer to an ESplash.
-	Display the icons of the components in the splash and highlight
-	them as the components are activated.
-
-	* e-splash.c: New.
-	* e-splash.h: New.
-
-2000-10-13  Anna Marie Dirks  <anna@helixcode.com>
-	
-	* e-shell-folder-creation-dialog.glade: Added focus to the
-	folder-name text entry.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-storage-set-view.c: Fixed the spec on this.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-storage-set-view.c: Changed this to use the built in cells.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-storage-set-view.c: Adapted this for the new ETable system.
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c: Change paths in such a way as to require
-	HEAD bonobo.
-	(command_toggle_folder_bar, command_toggle_shortcut_bar): only
-	respond to state changes.
-
-2000-10-07  Matt Wilson  <msw@redhat.com>
-
-	* e-shell-view.c (init): initialize priv->sockets to NULL, fixes
-	startup crash on non-ia32 platforms
-
-2000-10-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c: New member `sockets.
-	(init): Init to NULL.
-	(destroy): Free.  Also, disconnect the "destroy" signal from them
-	before the controls get destroyed.
-	(find_socket): New function.  [Thanks Dan.]
-	(socket_destroy_cb): New callback for the destruction of a socket.
-	(get_control_for_uri): Get the socket through `find_socket()' and
-	connect the "destroy" signal to `socket_destroy_cb'.
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c (insert_storages): call
-	_set_compare_function after inserting the storage.
-
-2000-10-06  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_display_uri): add a freeze / thaw
-	pair to reduce flicker on switching controls.
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (command_xml_dump): fix.
-
-2000-10-05  Chris Toshok  <toshok@helixcode.com>
-
-	* e-shell-folder-creation-dialog.c: #include <gal/widgets/e-gui-utils.h>
-	
-	* e-shell-folder-selection-dialog.c: same.
-
-2000-10-05  Chris Toshok  <toshok@helixcode.com>
-
-	* e-shell-folder-selection-dialog.c: add #include for
-	libgnomeui/gnome-messagebox.h
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (shortcut_bar_mode_changed_cb): upd.
-	(folder_bar_mode_changed_cb): upd.
-	(command_xml_dump): clobber.
-	(e_shell_view_menu_setup): upd.
-
-	* e-shell-view.c (shell_view_interface_set_message_cb): upd.
-	(shell_view_interface_unset_message_cb): upd.
-	(e_shell_view_construct): upd.
-	(get_control_for_uri): upd.
-	(e_shell_view_get_bonobo_ui_component): upd.
-
-2000-10-04  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (setup_progress_bar): remove evil usize set.
-
-2000-10-03  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): Use
-	`bonobo_ui_component_add_verb_list' instead of
-	`bonobo_ui_component_add_verb_list_with_data' for help_verbs,
-	so that `command_help' gets an html filename as user_data,
-	instead of a ptr to EShellView.
-	(menu_do_misc): Move DumpXML from help_verbs to here, because
-	`command_xml_dump' needs to get EShellView as user_data.
-
-2000-10-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts-view.c (show_new_group_dialog): Destroy the dialog
-	if the user has clicked on "OK" or "Cancel".
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c (e_storage_set_view_get_current_folder): if
-	we're not displaying folders, the current folder is NULL.
-	(class_init): fix typo.
-
-	* Makefile.am (libeshell_a_SOURCES):
-	evolution-storage-set-view-listener.[ch] should be here, not
-	evolution_SOURCES.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-storage-set-view.c: add storage_selected behavior -
-	loop over the listeners calling _storage_selected.
-
-	* Evolution-StorageSetView.idl: add storage_selected to the
-	Listener interface.
-
-	* e-storage-set-view.c add storage_selected signal.
-	(on_cursor_change): if the depth is less than 2, emit
-	"storage_selected", otherwise emit "folder_selected".
-
-	* e-storage-set-view.h: add storage_selected signal.
-
-	* evolution-storage-set-view-listener.h: add storage_selected
-	signal.
-
-	* evolution-storage-set-view-listener.c: add storage_selected
-	signal.
-
-2000-10-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage-set-view-listener.c: New.
-	* evolution-storage-set-view-listener.h: New.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-storage-set-view.c (impl_StorageSetView_add_listener): fix typo.
-	(impl_StorageSetView_remove_listener): same.
-	(impl_StorageSetView__get_show_folders): implementation of getter for show_folders.
-	(impl_StorageSetView__set_show_folders): implementation of setter for show_folders.
-	(corba_class_init): install _set_show_folders and _get_show_folders.
-
-	* Evolution-StorageSetView.idl: add show_folders attribute to
-	StorageSetView.
-
-	* e-storage-set-view.h: add prototypes for
-	e_storage_set_view_{get,set}_show_folders.
-
-	* e-storage-set-view.c (insert_storages): split this code out from
-	e_storage_set_view_construct so we can call it when "show_folders"
-	has been changed.
-	(e_storage_set_view_construct): remove the code to insert
-	storages.
-	(e_storage_set_view_set_show_folders): new function.  tears down
-	existing tree and node/path hashtable and calls insert_storages.
-	(e_storage_set_view_get_show_folders): new function, retrieves
-	current show_folders state.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-storage-set-view-factory.c
-	(evolution_storage_set_view_factory_new_view): pass
-	storage_set_view_interface as second argument to
-	bonobo_object_add_interface, and call gtk_widget_show on the
-	storage_set_view widget.
-
-2000-10-03  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (setup_bonobo_ui_handler): kill.
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): strip
-	out the XML UI merge; move it to
-
-	* e-shell-view.c (e_shell_view_construct): here, +
-	freeze / thaw pair.
-
-	* e-shell-view.c (setup_progress_bar): impl.
-	(setup_widgets): hook in.
-	(progress_bar_timeout_cb): fix.
-	(start_progress_bar): fix.
-	(stop_progress_bar): fix.
-	(e_shell_view_construct): setup ui handler first.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): upd.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c (new_folder_cb): set the new node's compare function.
-	(insert_folders): same.
-
-	(new_storage_cb): remove uunecessary cast.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c (new_storage_cb): track e-tree sort api change.
-	(treepath_compare): same.
-	(new_folder_cb): same.
-	
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c (e_storage_set_view_construct): pass NULL
-	for the open/closed pixbuf of the tree renderer.  we'll let it
-	supply the default.
-	(destroy): remove the expanded/unexpanded pixbuf references.
-	(new_storage_cb): use e_tree_model_node_insert_id so we can (soon)
-	save expanded/collapsed state.
-	(new_folder_cb): same.
-	(insert_folders): same.
-	(e_storage_set_view_construct): same.
-
-2000-10-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (impl_Shell_create_storage_set_view): New,
-	implementation for `::create_storage_set_view'.
-	(corba_class_init): Install.
-
-	* evolution-storage-set-view-factory.c: New.
-	* evolution-storage-set-view-factory.h: New.
-
-	* evolution-storage-set-view.c: New.
-	* evolution-storage-set-view.h: New.
-
-	* Evolution-Shell.idl: New method
-	`Shell::create_storage_set_view'.
-
-	* Evolution.idl: #include <Evolution-StorageSetView.idl>.
-
-	* Evolution-StorageSetView.idl: New.
-
-2000-10-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c (find_listener_in_list): New helper
-	function.
-	(impl_Storage_remove_listener): New, implementation for
-	`Storage::remove_listener'.
-	(remove_listener): Helper function for
-	`impl_Storage_remove_listener'.
-	(evolution_storage_get_epv): Install the implementation for
-	`::remove_listener'.
-	(add_listener): Return a boolean indicating success or failure.
-	Reject multiple additions of the same listener.
-	(impl_Storage_add_listener): Updated accordingly: raise an
-	exception if `add_listener' fails.
-
-	* Evolution-Storage.idl: Added `Storage::remove_listener'.  Added
-	exception `AlreadyListening' for `::add_listener'.
-
-2000-09-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (popup_storage_set_view_button_clicked): Renamed
-	from `popup_storage_set_view_close_button_clicked'.
-	(storage_set_view_box_map_cb): Updated accordingly.  Connect to
-	"button_clicked" instead of "close_button_clicked".
-	(disconnect_popup_signals): Updated accordingly.
-	(e_shell_view_set_folder_bar_mode): Update the button mode of the
-	title bar according to the folder bar mode.
-
-2000-09-28  Dan Winship  <danw@helixcode.com>
-
-	* e-corba-storage.c (impl_StorageListener_new_folder): Don't print
-	"Folder registered successfully" if it didn't. (Duh. :)
-
-2000-09-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c: New constant `DEFAULT_URI'.
-	(e_shell_view_load_settings): If the `DisplayedURI' from
-	`gnome_config' cannot be displayed, display the `DEFAULT_URI'.
-
-2000-09-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts.c (e_shortcuts_get_group_title): Cast the data
-	pointer, not the node pointer.
-	(e_shortcuts_add_group): If @group_num is -1, emit the effective
-	group number with the "new_group" signal instead of -1, which is
-	going to confuse the signal handler.
-	(e_shortcuts_add_shortcut): Likewise with the shortcut.
-
-	* e-shortcuts-view-model.c (shortcuts_new_group_cb): We are @data,
-	not @shortcuts.
-	(class_init): Install the `::destroy' handler.
-
-	* e-shortcuts-view.c (e_shortcuts_view_construct): Set
-	`priv->shortcuts'.
-	(remove_shortcut_cb): Don't remove the item both on the data and
-	the model.
-	(toggle_small_icons_cb): Removed some crufty checks.
-	(toggle_large_icons_cb): Likewise.
-	(show_new_group_dialog): New, implementation for the "Create new
-	shortcut group" dialog.
-	(destroy_group_cb): Callback for the "Destroy this group" item.
-	(create_new_group): Callback for the "Create new group" item.
-
-2000-09-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts-view.c (item_selected): Renamed from
-	`selected_item'.
-	(class_init): Updated accordingly.
-	(impl_shortcut_dropped): New function, implementation for
-	`EShortcutBar::shortcut_dropped'.
-	(impl_shortcut_dragged): New function, implementation for
-	`EShortcutBar::shortcut_dragged'.
-	(e_shortcuts_view_construct): Update to use EShortcutsViewModel.
-	(class_init): Install them.
-
-	* e-shortcuts.c (e_shortcuts_get_group_title): New.
-
-	* e-shortcuts-view-model.c: New.
-	* e-shortcuts-view-model.h: New.
-
-2000-09-24  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (setup_local_storage): Don't unref the local storage.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): upd.
-
-2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-shell-view-menu.c: Fix mis-spelling of "calendar".
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (show_existing_view): upd.
-
-	* Evolution-ShellComponent.idl: upd.
-
-	* evolution-shell-component.c (impl_ShellComponent_populate_folder_context_menu):
-	upd.
-
-2000-09-18  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (command_xml_dump): add xml dump option.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* e-component-registry.c, e-corba-storage-registry.c,
-	e-corba-storage.c, e-folder-type-registry.c, e-folder.c,
-	e-local-folder.c, e-local-storage.c,
-	e-shell-folder-creation-dialog.c,
-	e-shell-folder-selection-dialog.c, e-shell-folder-title-bar.c,
-	e-shell-view.c, e-shell.c, e-shortcuts-view.c, e-shortcuts.c,
-	e-storage-set-view.c, e-storage-set-view.h, e-storage-set.c,
-	e-storage.c, evolution-local-storage.c, evolution-session.c,
-	evolution-shell-client.c, evolution-shell-component-client.c,
-	evolution-shell-component.c, evolution-shell-view.c,
-	evolution-storage-listener.c, evolution-storage.c, main.c: Fixed
-	the #include lines to deal properly with gal.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): use datadir.
-
-2000-09-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.h: #include "bonobo-win.h", not "bonobo-app.h".
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	* e-storage.c (get_path_for_physical_uri_foreach): foreach_data
-	should be set to the caller-supplied data, not the tree item data.
-
-2000-09-14  Iain Holmes  <iain@helixcode.com>
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
-	Remove the *kludge* so that the button width is set properly.
-	Fixes bug #XXXX
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c: Remove sillies in toggle paths.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c: move fn to bonobo.
-
-2000-09-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(GNOME_PRINT_LIBS) to evolution_LDADD.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_construct): prune cruft.
-	(shell_view_interface_unset_message_cb),
-	(shell_view_interface_set_message_cb): impl.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): re-order to suit and
-	add freeze / thaw, update paths to toggles, remove warnings
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c: Re-hash pretty much the whole file
-
-	* ui.xml: Add.
-
-	* e-shell-view.c (e_shell_view_construct): connect unrealize & delete_event
-	to theit signals on the window (class_init): remove widget_class bits.
-
-2000-09-06  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell.c (view_destroy_cb, destroy, e_shell_new_view, e_shell_quit): 
-	update to track object type change.
-
-	* e-shell.c (e_shell_restore_from_settings): ditto.
-
-	* main.c (idle_cb): ditto.
-
-	* e-shell-view.c (e_shell_view_new, e_shell_view_construct, setup_widgets): 
-	updated for BonoboApp.
-	(progress_bar_timeout_cb, start_progress_bar, stop_progress_bar),
-	(shell_view_interface_set_message_cb, shell_view_interface_unset_message_cb): 
-	emasculated for now.
-
-	* e-storage-set-view.c (popup_folder_menu): disable popup menu for now.
-
-2000-09-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (popdown_transient_folder_bar): New.
-	(storage_set_view_box_button_release_event_cb): Rewritten to use
-	it.
-	(folder_selected_cb): Pop down the transient folder bar if the
-	folder bar mode is `TRANSIENT'.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* ($(IDL_GENERATED)): Stupid `orbit-idl' wants a space after the
-	`-I'.
-
-2000-09-12  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-shell-view.c (update_folder_title_bar): Translate UTF-8
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: Remove the `ui.xml' stuff.
-
-2000-09-11  Dan Winship  <danw@helixcode.com>
-
-	* main.c (main): Initialize libunicode
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-local-storage.c: Fixed some warnings.
-
-2000-09-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-folder-selection-dialog.c (set_default_folder): Work on
-	the assumption that @default_uri is not NULL.
-	(e_shell_folder_selection_dialog_construct): Only call if the
-	@default_uri is not NULL.
-
-2000-09-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-local-storage.c (new_folder): Removed debugging message.
-
-2000-09-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c (evolution_storage_new_folder): If
-	description is NULL, use the empty string instead.
-
-	* e-local-storage.c (new_folder): New utility function to add a
-	new folder by keeping both the Bonobo interface and the EStorage
-	up-to-date.
-	(load_folders): Use it here instead of just
-	`e_storage_new_folder()'.
-	(component_async_create_folder_callback): Likewise.
-
-	* e-shell-view.c (update_for_current_uri): Prevent an
-	EStorageSetView warning if the path is NULL.
-
-	* evolution-storage.c (impl_Storage_add_listener): New,
-	implementation for `Evolution::Storage::add_listener'.
-	(evolution_storage_get_epv): Install it.
-
-	* evolution-storage-listener.c
-	(evolution_storage_listener_corba_objref): New.
-	(create_servant): Create the servant with `g_new0()' instead of
-	`g_new()'.
-
-2000-09-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage-listener.c
-	(evolution_storage_listener_construct): Unset the `GTK_FLOATING'
-	flag as `EvolutionStorageListener' is self-owned.
-
-2000-09-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage.c (impl_list_folders): Removed.
-	(impl_get_subfolder_paths): New static function, implementation
-	for `::get_subfolder_paths'.
-	(class_init): Install it.
-	(e_storage_get_subfolder_paths): New.
-
-	* e-storage.h: `list_folders' virtual method removed.  New virtual
-	method `list_subfolder_paths'.
-
-	* e-storage-set-view.c (etree_icon_at): If the folder is not
-	found, return NULL.
-
-	* e-local-storage.c (bonobo_interface_set_display_name_cb): New
-	function, callback for the `set_display_name' signal on the
-	EvolutionLocalStorage.
-	(construct): Connect it.
-
-	* e-storage-set-view.c (folder_changed_cb): New callback for the
-	"changed" signal emitted by the EFolders.  It makes the model emit
-	the "changed" signal for the appropriate row.
-	(insert_folders): Connect it.
-
-2000-09-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c (etree_value_at): Return the name of the
-	folder or the storage instead of just returning the last segment
-	of the path.
-
-	* e-storage-set.c (e_storage_set_get_folder): If the storage is
-	not found, just return NULL to avoid a g_warning.
-
-2000-09-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Fixed some warnings.
-
-2000-09-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (update_for_current_uri): Make sure `folder_name'
-	is always dynamically allocated, as we `g_free()' it.
-
-2000-09-08  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-shell-view.c (update_for_current_uri): Translate UTF-8 string
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c (list_through_listener_foreach): Don't crash
-	on nodes with no data.  [The root node has none indeed.]
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-folder-tree.c (e_folder_tree_get_folder): Return NULL if there
-	is no folder with that @path, instead of segfaulting.
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c: New member `folder_tree' in
-	`EvolutionStoragePrivate'.
-	(init): Initialize it.
-	(destroy): Destroy it.
-	(list_through_listener): New.
-	(add_listener): Use it to list all the current folders through the
-	listener.
-	(evolution_storage_new_folder): Add the thingie to the
-	`folder_tree'.
-	(evolution_storage_removed_folder): Remove the thingie from the
-	`folder_tree'.
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage.c: Replaced the `path_to_folder' GHashTable with an
-	EFolderTree named `folder_tree'.
-	(init): Updated accordingly.
-	(destroy): Updated accordingly.
-	(free_private): Removed.
-	(remove_folder): Removed.
-	(folder_new): Removed.
-	(folder_remove_subfolder): Removed.
-	(folder_add_subfolder): Removed.
-	(folder_destroy): Removed.
-	(get_parent_path): Removed.
-	(impl_list_folders): Reimplemented by using the `EFolderTree'
-	methods.
-	(e_storage_construct): Don't create the root folder here.
-	(get_path_for_physical_uri_foreach): Updated to be an
-	`EFolderTreeForeachFunc'.
-	(e_storage_get_path_for_physical_uri): Likewise, updated to use
-	`e_folder_tree_foreach()'.
-	(e_storage_new_folder): Updated to use the EFolderTree.
-	(e_storage_removed_folder): Likewise.
-	(folder_destroy_notify): New function, for the destroy
-	notification of `EFolder'.
-
-	* evolution-storage-listener.c: Change the `servant' member in
-	`EvolutionStorageListenerPrivate' into an
-	`EvolutionStorageListenerServant'.
-
-	* e-folder-tree.c: New.
-	* e-folder-tree.h: New.
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage-listener.c (create_servant): Return an
-	`EvolutionStorageListenerServant' instead of a
-	`POA_Evolution_StorageListener'.
-	(evolution_storage_listener_new): Add a cast accordingly.
-
-	* evolution-storage.c (corba_class_init): Remove `NO_WARNINGS'
-	madness.
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-storage-set-view.c: Added base ETableModel functions.
-
-	* evolution-storage-listener.c, evolution-storage.c: Fixed some
-	warnings.
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (set_owner_on_components): New.
-	(e_shell_construct): Call it after setting up the local storage.
-
-	* e-component-registry.c (register_component): Don't set the owner
-	here.
-
-	* evolution-shell-client.c
-	(evolution_shell_client_get_local_storage): New.
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-view.c (destroy): Chain to the parent's
-	destroy method.
-
-	* evolution-shell-component.c (destroy): Chain to the parent's
-	destroy method.
-
-	* evolution-storage.c: `corba_storage_listener' in
-	`EvolutionStoragePrivate' replaced with a list of listeners,
-	`corba_storage_listeners'.
-	(init): Init to NULL.
-	(add_listener): New utility function.
-	(destroy): Destroy all the listeners.
-	(evolution_storage_new_folder): Notify all the listeners.
-	(evolution_storage_removed_folder): Likewise.
-
-	* e-local-storage.c: New member `bonobo_interface' in
-	`ELocalStoragePrivate'.
-	(init): Init to NULL.
-	(e_local_storage_get_corba_interface): New.
-
-	* e-shell.c: New member `local_storage' in `EShellPrivate'.
-	(init): Init to NULL.
-	(setup_local_storage): Make it point to the newly created local
-	storage.
-	(destroy): Unref if not NULL.
-	(impl_Shell_get_local_storage): New, implementation for
-	`Evolution::Shell::get_local_storage'.
-	(corba_class_init): Set it up.
-
-	* evolution-local-storage-client.c: New.
-	* evolution-local-storage-client.h: New.
-	* evolution-local-storage.c: New.
-	* evolution-local-storage.h: New.
-	* evolution-storage-listener.c: New.
-	* evolution-storage-listener.h: New.
-
-	* Evolution-Storage.idl: New method `Storage::add_listener'.
-
-	* Evolution-Shell.idl: New method `Shell::get_local_storage'.
-
-	* Evolution-LocalStorage.idl: New.
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-shell-folder-creation-dialog.c: Use e_utf8 wrappers
-
-2000-09-01  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c (removed_folder_cb): free node_data.
-	(removed_storage_cb): same.
-	(new_storage_cb): don't free the path we put in the node's
-	node_data.
-	(e_storage_set_view_set_current_folder): remove calls to
-	set_cursor_row (-1), and clean up a little bit.
-
-2000-09-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-local-storage.c: Strdup path when setting the callback data.
-
-	* evolution-storage.c: Removed an unused variable.
-
-2000-08-31  Chris Toshok  <toshok@helixcode.com>
-
-	* e-shell-view.c (init): initialize delayed_selection = NULL;
-
-2000-09-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c (evolution_storage_new_folder): Handle @path
-	as the full path.
-
-	* e-storage.c (e_storage_new_folder): Consider @path to be the
-	full path, not the parent path.
-	* e-local-storage.c (load_folders): Updated accordingly.
-
-	* Evolution-Storage.idl: Member `name' of `struct Folder' renamed
-	to `display_name'.
-
-2000-08-31  Chris Toshok  <toshok@helixcode.com>
-
-	* e-shell-view.c: add delayed_selection to _EShellViewPrivate.
-	(new_folder_cb): new function.  check if the path is our
-	delayed_selection and if so, select it.
-	(folder_selected_cb): if the user selects something using a UI
-	gesture, clear out a pending delayed selection.
-	(e_shell_view_display_uri): if the uri isn't available, save it in
-	the delayed_selection field, and set up the new_folder signal.
-
-2000-08-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (shell_view_interface_set_message_cb): If the
-	message contains a newline, only display the part until the
-	newline, excluding the newline.  Otherwise the status bar resizes
-	nastily.
-
-2000-08-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (setup_components): Removed the hardcoding of the
-	shell component IDs.  Rather, do an OAF query looking for the
-	`Evolution::ShellComponent' interface and activate all the
-	components in the result.
-	(MAIL_COMPONENT_ID): Removed.
-	(CALENDAR_COMPONENT_ID): Removed.
-	(ADDRESSBOOK_COMPONENT_ID): Removed.
-
-	* e-storage-set-view.c: Make `sort_model' static.
-
-2000-08-25  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c: convert to use ETree instead of GtkCTree.
-
-	* e-storage-set-view.h: change superclass from GtkCTree to ETable.
-
-	* main.c (main): call e_cursors_init.
-
-	* Makefile.am (evolution_LDADD): add libetable.a
-
-2000-08-25  Peter Williams  <peterw@helixcode.com>
-
-	Silence some obvious assertions.
-	
-	* e-shell.c (e_shell_construct): Ref our shortcut bar to
-	sink it. Same with the folder_type_registry.
-
-	* e-shell-folder-title-bar.c (destroy): Only attempt to unref
-	priv->icon if nonnull.
-
-	* e-shell-view.c (update_folder_title_bar): Don't attempt to set
-	the folder_icon/_name if they're NULL.
-
-2000-08-24  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_new): Don't abort if the
-	component cannot be activated.  Rather, just return NULL.
-
-2000-08-20  arik devens  <arik@helixcode.com>
-
-	* Makefile.am (evolution_LDADD): Added UNICODE_LIBS to link in the
-	new e-text stuff.
-
-2000-08-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-folder-title-bar.c: Fixed a warning.
-
-2000-08-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Fixed a warning.
-
-2000-08-18  Larry Ewing  <lewing@helixcode.com>
-
-	* e-shell-folder-title-bar.c (style_set_cb): update the pixmap
-	define E_USE_STYLES to disable the current darkening behavior
-	(destroy): free the icon.
-	(e_shell_folder_title_bar_construct): style_set_cb does everything
-	important now.
-	(e_shell_folder_title_bar_set_icon): actually store the pixbuf
-	when we set it so that we still have it if the style changes and
-	take care of refcounting them properly.
-
-2000-08-17  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c (menu_create_file): Make capitalization of
-	menu items consistent.
-	(menu_create_view): Likewise.
-	(menu_create_help): Likewise.
-	(e_shell_view_menu_setup): Create a component menu placeholder so
-	that components can add their own component-specific menus there.
-	(menu_create_actions): Removed.
-	(e_shell_view_menu_setup): Don't call it.
-	(menu_create_tools): Removed.
-	(e_shell_view_menu_setup): Don't call it.
-	(menu_create_settings): New.
-	(e_shell_view_menu_setup): Call it.
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (delete_event): New.  Make the parent shell quit.
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (shell_view_interface_set_message_cb): Removed
-	debugging message.
-	(shell_view_interface_unset_message_cb): Likewise.
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c: New members `progress_bar_timeout_id',
-	`progress_bar_value' in `EShellViewPrivate'.
-	(init): Init them.
-	(destroy): If the timeout id is not zero, remove the associated
-	timeout.
-	(progress_bar_timeout_cb): New.
-	(start_progress_bar): New.
-	(stop_progress_bar): New.
-	(shell_view_interface_set_message_cb): If busy, start the progress
-	bar.  Otherwise, stop it.
-	(shell_view_interface_unset_message_cb): Stop the progress bar.
-
-	* e-shell-view.c (setup_widgets): Enable the progress bar in the
-	appbar.
-
-	* e-shell-view.c (shell_view_interface_unset_message_cb): New
-	function, callback for the `EvolutionShellView::unset_message'
-	signal.
-	(shell_view_interface_set_message_cb): New function, callback for
-	the `EvolutionShellView::set_message' signal.
-	(setup_evolution_shell_view_interface): Connect these signals to a
-	newly created EvolutionShellView object, add ::add_interface this
-	object to the control's frame.
-
-	* evolution-shell-view.c: New.
-	* evolution-shell-view.h: New.
-
-	* Evolution-ShellView.idl: New interface.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* Evolution-ShellComponent.idl: add "in string evolution_homedir"
-	to ShellComponent::set_owner's arguments.
-
-	* e-shell.c (e_shell_get_local_directory): Expose local_directory.
-
-	* e-component-registry.c (register_component): Pass the shell's
-	"local_directory" to the component as its evolution_homedir.
-
-	* evolution-shell-component.c (impl_ShellComponent_set_owner):
-	Update to include evolution_homedir.
-	(class_init): Update signal prototype.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_set_owner): Update to include
-	evolution_homedir.
-
-	* e-init.c: Remove. This wasn't being used.
-
-2000-08-10  Peter Williams  <peterw@helixcode.com>
-
-	* e-shell-view-menu.c (command_about_box): Add lil' ol'
-	me to the about box.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-setup.c, e-shell.c: Fixed some warnings.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Fixed a warning.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c (menu_create_file_new): Create a placeholder
-	for the print items.
-
-2000-08-08  Dan Winship  <danw@helixcode.com>
-
-	* e-setup.c (e_setup): Check for ~/evolution/shortcuts.xml in
-	addition to ~/evolution, to make sure it's really the directory
-	we're expecting it to be. Also, convert from old-style config file
-	to new-style config directory.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-shell-component.c (impl_ShellComponent_populate_folder_context_menu):
-	unref.
-
-	* e-shell.c (e_shell_construct): Remove erroneous refs on
-	folder_type_registry, storage_set.
-
-	* e-shortcuts-view.c (destroy): unref the shortcuts, causing a
-	massive ripple chain ref-count reaction.
-
-2000-08-03  JP Rosevear  <jpr@helixcode.com>
-
-	* e-shell.h: Remove gconf references
-
-	* e-shell-view.h: Remove gconf references
-
-	* main.c (idle_cb): Remove gconf references
-
-	* Makefile.am: Remove gconf cflags and libs 
-
-	* e-shell-view.c (e_shell_view_load_settings): Change to use
-	gnome-config
-	(e_shell_view_save_settings): ditto
-
-	* e-shell.c (e_shell_restore_from_settings): Change to
-	use gnome_config
-	(save_settings_for_views): ditto
-
-2000-08-03  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (destroy): unref the UI handler.
-
-2000-08-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-shell-folder-selection-dialog.c (set_default_folder): Make
-	sure default_uri isn't NULL!!
-
-2000-08-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c (command_goto_folder): Just use the current
-	URI as the @default_uri parameter for
-	`e_shell_folder_selection_dialog_new()'.
-
-	* evolution-session.c (class_init): Call `corba_class_init()'.
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_new): @default_path renamed to
-	@default_uri.
-	(e_shell_folder_selection_dialog_construct): Likewise.  If the
-	@default_uri is an `evolution:' one, use it as a path; if it is
-	different, assume it is a physical URI and consequently look for
-	the folder that has that physical URI and make it the default.
-	(set_default_folder): New helper function.
-	(e_shell_folder_selection_dialog_construct): Use it.
-
-	* e-storage-set.c (e_storage_set_get_path_for_physical_uri): New.
-
-	* e-storage.c (e_storage_get_path_for_physical_uri): New.
-
-2000-07-27  Dan Winship  <danw@helixcode.com>
-
-	* main.c (idle_cb): work with either gconf 0.5 or newer
-
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-
-	* e-storage.c (e_storage_new_folder): Fix tiny mem leak.
-
-2000-07-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (disconnect_popup_signals): Disconnect the "map"
-	signal handler too.
-
-2000-07-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-folder-creation-dialog.c (add_folder_types): Work around
-	GtkOptionMenu utter brokenness by destroying the associated
-	Glade-built GtkMenu and creating a new one from scratch.
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* e-shell.c, main.c: Remove GOAD support.
-
-	* evolution-shell-component-client.c: Remove GOAD support.
-	(evolution_shell_component_client_new): Give the "maybe
-	OAF_INFO_PATH" message if no oafinfo file was found, and give a
-	"consult previous error messages" message if the component was
-	found but not activated. Abort in either case.
-
-2000-07-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c: Converted to use `bonobo_ui_handler_*()'
-	stuff directly, instead of converting from GnomeUIInfo.
-	(command_quit): Update arg types for BonoboUIHandler.
-	(command_run_bugbuddy): Likewise.
-	(command_about_box): Likewise.
-	(command_new_task): Removed.
-	(command_new_journal_entry): Removed.
-	(menu_create_file_new): New.
-	(menu_create_file): New.
-	(menu_create_edit): New.
-	(menu_create_view): New.
-	(menu_create_tools): New.
-	(menu_create_actions): New.
-	(e_shell_view_menu_setup): Create menus using them instead of
-	converting from GnomeUIInfo.
-
-2000-07-22  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (e_shell_construct): Don't unref NULL shortcuts, you
-	idiot.
-
-2000-07-22  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_set_folder_bar_mode): Make the
-	title bar non-clickable when the folder tree is visible.
-
-	* e-shell-folder-title-bar.c: New members `button_arrow' and
-	`clickable' in `EShellFolderTitleBarPrivate'.  Renamed `label'
-	into `button_label'.  Added `label'.
-	(init): Init them.
-	(e_shell_folder_title_bar_construct): Pass a pointer to the title
-	bar as the user data for the "realize" signal.  Create `label'.
-	(title_button_box_realize_cb): Use the `button_arrow' member
-	instead of using `gtk_object_{set,get}_data()'.
-	(setup_style): Set the style for `label' too.
-	(e_shell_folder_title_bar_set_clickable): New.
-	(e_shell_folder_title_bar_set_title): Set both `label' and
-	`button_label'.
-
-2000-07-21  Peter Williams  <peterw@helixcode.com>
-
-	* evolution-shell-client.c (user_select_folder): Don't use
-	g_main_loop to block the caller; this will break when 
-	threads are enabled and GDK_THREADS_ENTER deadlocks. Use
-	gtk_main / gtk_main_exit to enter and exit the main loop,
-	which handles the recursive case correctly.
-	(impl_FolderSelectionListener_selected): Same.
-	(impl_FolderSelectionListener_cancel): Same.
-	(struct _FolderSelectionListenerServant): No more main_loop member.
-
-2000-07-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (storage_set_view_box_button_release_event_cb):
-	Set the toggle state to FALSE on the title bar.
-
-	* e-shell-folder-title-bar.c: Signal "title_clicked" replaced by
-	"title_toggled".
-	(setup_style): Change the style for the button too.
-	(e_shell_folder_title_bar_construct): Use a GtkToggleButton, not a
-	GtkButton.
-	(e_shell_folder_title_bar_set_toggle_state): New.
-
-2000-07-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-folder-title-bar.c (create_icon_pixmap): New.  Create a
-	small arrow-shaped GtkPixmap.
-	(title_button_box_realize_cb): New.  Callback for the "realize"
-	signal of the button's inner box.
-
-	* e-shell-view.c (title_bar_clicked_cb): New function, callback
-	for the "title_clicked" signal of the title bar.
-	(setup_widgets): Connect it.
-
-	* e-shell-view.c: New member `storage_set_title_bar' in
-	`EShellViewPrivate'.
-	(setup_storage_set_subwindow): Set it.
-
-	* e-shell-folder-title-bar.c: Use a GtkLabel instead of an
-	EClippedLabel for the title.
-	(title_button_clicked_cb): New.
-	(e_shell_folder_title_bar_construct): Put the label into a button.
-	Connect the button's "clicked" signal to
-	`title_button_clicked_cb'.
-
-2000-07-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component.c
-	(impl_ShellComponent_populate_folder_context_menu): If the pointer
-	to the function to populate the folder context menu is NULL, don't
-	do anything.
-
-2000-07-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c (popup_folder_menu): New.  Create a
-	BonoboUIHandler-managed pop-up menu, let the component fill it in
-	with `::populate_folder_context_menu', and display it.  Then
-	destroy it with the associated BonoboUIHandler.
-	(handle_right_button_selection): New.
-	(handle_left_button_selection): New.  This pops up the right-click
-	menu.
-	(button_release_event): Use them.
-	(init): Set the `GTK_BUTTON_SELECTS' flag for button #3's actions.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_populate_folder_context_menu):
-	New.
-	(evolution_shell_component_client_async_create_folder): Added
-	preconditions.
-
-	* e-shell-view.c (e_shell_view_save_settings): Add missing cast.
-
-	* evolution-shell-component.c: New member
-	`populate_folder_context_menu' in
-	`EvolutionShellComponentPrivate'.
-	(impl_ShellComponent_populate_folder_context_menu): New,
-	implementation for
-	`Evolution::ShellComponent::populate_folder_context_menu'.
-	(corba_class_init): Install it.
-	(evolution_shell_component_new): New arg
-	@populate_folder_context_menu.
-	(evolution_shell_component_construct): Likewise.
-
-	* Evolution-ShellComponent.idl: New method
-	`::populate_folder_context_menu'.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_save_settings): Save the paned
-	positions.
-	(e_shell_view_load_settings): Restore them.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (save_settings_for_views): New.  Code moved out of
-	`e_shell_save_settings'.
-	(e_shell_save_settings): Use it.
-	(save_settings_for_component): New.
-	(save_settings_for_components): New.
-	(e_shell_save_settings): Use it, so that we make all the
-	components save settings too.
-
-	* e-component-registry.c
-	(e_component_registry_get_id_list): New.
-	(e_component_registry_get_component_by_id): New.
-
-	* Makefile.am (libeshell_a_SOURCES): Add
-	`evolution-shell-component-client' and `evolution-session'.
-
-	* evolution-session.c: New.
-	* evolution-session.h: New.
-
-	* Makefile.am (evolution_SOURCES): Removed files that were already
-	in `libeshell.a'.
-
-	* Evolution.idl: #include <Evolution-Session.idl>.
-
-	* Evolution-Session.idl: New.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (no_views_left_cb): Call `e_shell_quit()' on the shell
-	before getting out of the GTK+ main loop.
-	(view_delete_event_cb): Removed.
-	(idle_cb): Don't call it.
-
-	* e-shell-view-menu.c (command_new_view): New, implementation of
-	the "New view" command.
-
-2000-07-16  Damon Chaplin  <damon@helixcode.com>
-
-	* e-shortcuts-view.c (e_shortcuts_view_construct): created a model
-	for the EShortcutBar. This will probably have to be moved to support
-	multiple views.
-	(class_init): #if'd out overriding the class functions. They don't
-	exist any more (they are in the model instead).
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* main.c: Fixed to match gconf API change.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* main.c (development_warning): Update the message.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-folder-title-bar.c (title_button_clicked_cb):
-	Temporarily `#if 0'ed out.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* e-shell.c (impl_Shell_user_select_folder): Translate a
-	default_folder of "" into NULL (which can't be passed over CORBA).
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage.c (e_storage_new_folder): Removed debugging message.
-
-	* e-storage-set.c (storage_new_folder_cb): Removed debugging
-	message.
-
-2000-07-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-shell-view.c (unrealize): As a quasi-hack, do a gdk_flush()
-	when the shell view is unrealized so that the DeleteEvent gets
-	sent to the remote plugs as soon as possible before we start
-	making other CORBA calls.  The problem is that our CORBA pipe is
-	synchronous while our X pipe is asynch.  We have to ensure
-	ordering for certain operations.  This is NOT the correct and
-	complete fix, which should go in Bonobo.
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_display_uri): Don't update the
-	current URI if there are problems creating a view for it.
-	(show_error): Remove.  Not used anymore.
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c: Cleanup some unused menu items and added
-	"FIXMEs" for the ones we plan to add in the short term but are not
-	implemented yet.
-	(command_create_folder): Get rid of an unused variable.
-
-2000-07-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-client.c (user_select_folder): Fix small warning
-	by adding proper cast when filling in the CORBA sequence struct.
-
-2000-07-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (setup_corba_storages): Ref the CORBA storage
-	registry.
-
-2000-07-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c: Removed `corba_storage_registry' member
-	from `EvolutionStoragePrivate'.
-	(destroy): Don't unref/release it.  Call
-	`StorageListener::destroy' to notify that we are dead.
-	(evolution_storage_register): Don't ref and store the registry.
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* e-shell.c (e_shell_save_settings): Use the correct gconf path
-	(/apps, not /app), and call gconf_client_suggest_sync at the end.
-	(e_shell_restore_from_settings): Use the correct gconf path.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c (command_goto_folder): Set the folder
-	selection dialog as transient for the shell view.
-	(command_create_folder): New, bound to the "Create folder"
-	command in the "File" menu.
-
-2000-07-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (impl_Shell_user_select_folder): New arg
-	@allowed_types.  Pass it to the EShellFolderSelectionDialog.
-	Connect to the "cancelled" and "folder_selected" signals instead
-	of "clicked".
-	(corba_listener_destroy_notify): New callback.
-	(impl_Shell_user_select_folder): Associate it to the DestroyNotify
-	for the "corba_listener" GtkObject data, so we don't leak it.
-	(folder_selection_dialog_clicked_cb): Don't release the listener
-	interface here.
-	(folder_selection_dialog_cancelled_cb): New callback for the
-	"cancelled" signal.
-	(folder_selection_dialog_folder_selected_cb): New callback for the
-	"folder_selected" signal.
-
-	* e-shell-view-menu.c (command_goto_folder): Don't connect to
-	"clicked".  Connect to "cancelled" and "folder_selected" instead.
-	(folder_selection_dialog_cancelled_cb): New, callback for the
-	"cancelled" signal.
-	(folder_selection_dialog_folder_selected_cb): New, callback for
-	the "folder_selected" signal.
-
-	* e-shell-folder-selection-dialog.c New members `allowed_types',
-	`storage_set' in `EShellFolderSelectionDialogPrivate'.
-	(class_init): Install signals "folder_selected", "cancelled".
-	(init): Init to NULL.
-	(impl_destroy): Free/unref them.
-	(e_shell_folder_selection_dialog_new): New arg @allowed_types.
-	(e_shell_folder_selection_dialog_construct): New arg
-	@allowed_types.  Initialize `priv->allowed_types' from it.
-	(check_folder_type): New function.  Check if the selected folder
-	is of the appropriate type and, if not, return FALSE and pop up an
-	error dialog.  Otherwise, return TRUE.
-	(impl_clicked): Use `check_folder_type()' to check if the folder
-	type is OK.  If it is not, stop emission of the "clicked" signal.
-
-	* e-shell-folder-selection-dialog.h: New signals
-	"folder_selected", "cancelled".
-
-	* evolution-shell-client.c
-	(evolution_shell_client_user_select_folder): New arg
-	@allowed_types.
-	(user_select_folder): New arg @allowed_types.  Pass this to the
-	::user_select_folder method.
-
-	* Evolution-Shell.idl: New arg @required_types in
-	::user_select_folder.
-
-2000-07-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (setup_components): Don't ref the component registry.
-
-2000-06-30  Dan Winship  <danw@helixcode.com>
-
-	* Evolution-Shell.idl: add "cancel" to FolderSelectionListener.
-
-	* evolution-shell-client.c (impl_FolderSelectionListener_cancel):
-	Implement cancel (set *uri and *physical_uri to NULL).
-	(evolution_shell_client_user_select_folder): document %NULL uri
-	and physical_uri return values.
-	
-	* e-shell.c (folder_selection_dialog_clicked_cb): If the user
-	clicked "Cancel" or used the wm to close the dialog, call _cancel
-	instead of _selected.
-
-2000-06-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component.c (impl_ShellComponent_set_owner):
-	Duplicate the object before storing it, you doofus.
-
-2000-06-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component.c (impl_ShellComponent_unset_owner):
-	NULL the owner_client.
-
-2000-06-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-client.h
-	(evolution_shell_client_user_select_folder): Add prototype.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component.c: New member `owner_client'.  Removed
-	member `corba_owner'.  All the code updated to use it.
-	(evolution_shell_component_get_owner): Changed so that it returns
-	an EvolutionShellClient instead of the raw CORBA object.
-
-	* evolution-shell-component.h: Change signal "owner_set" to get an
-	EvolutionShellClient wrapper instead of a CORBA interface.
-
-	* evolution-shell-client.c: New.
-	* evolution-shell-client.h: New.
-
-2000-06-29  Dan Winship  <danw@helixcode.com>
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_new): Update warning message to
-	not say "CRASHING", since it won't if you have current bonobo.
-
-2000-06-29  Peter Williams  <peter@beta.newton.cx>
-
-	* e-shell.c (e_shell_restore_from_settings): Check for the 
-	insanely invalid NumberOfViews = 0 case.
-
-2000-06-29  Peter Williams  <peter@helixcode.com>
-
-	* e-shell.c (e_shell_construct): Ref the various E-things that
-	we create to go with our unrefs in the destructor.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_construct): Don't ref the shell.
-	(destroy): Don't unref the shell.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts.c (e_shortcuts_construct): Fix typo: @shortcuts
-	should unset `GTK_FLOATING', not @storage_set.
-
-	* e-shell-view.c (get_storage_set_path_from_uri): If @uri is NULL,
-	return NULL.
-
-	* main.c (idle_cb): Restore the shell from the settings.  If this
-	fails, just create a new view.
-
-	* e-shell.c (e_shell_save_settings): New.
-	(e_shell_quit): Save settings before exiting.
-	(e_shell_restore_from_settings): New.
-
-	* e-shell-view.c (e_shell_view_save_settings): New.
-	(e_shell_view_load_settings): New.
-
-	* main.c (idle_cb): Initialize Gconf, create the GConfClient and
-	pass it to `e_shell_new()'.
-
-	* e-shell.c: New member `gconf_client' in `EShellPrivate'.
-	(destroy): Unref it if not NULL.
-	(init): Init to NULL.
-	(e_shell_new): New param @gconf_client.
-	(e_shell_construct): Likewise.
-
-	* Makefile.am (INCLUDES): Add `GCONF_CFLAGS'.
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
-	Enable the title bar button.
-
-2000-06-27  Michael Zucchi  <zucchi@zedzone.mmc.com.au>
-
-	* e-shell.c (folder_selection_dialog_clicked_cb): Close the dialog
-	when done.  Dont do anything if 'new' was pressed, and always
-	return empty strings if 'cancel' was pressed.
-
-2000-06-27  Michael Zucchi  <zucchi@zedzone.mmc.com.au>
-
-	* e-shell.c (impl_Shell_user_select_folder): Set the listener as
-	the corba_listener data, not the shell.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* glade/Makefile.am: Added EXTRA_DIST for make distcheck.
-
-2000-06-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-local-storage.c: Don't #define POSIX_SOURCE at all; this is
-	not needed anymore as we no longer use `readdir_r'.
-
-2000-06-19  Chris Toshok  <toshok@helixcode.com>
-
-	* e-local-storage.c: #undef _POSIX_SOURCE after including
-	dirent.h.  this breaks the build on freebsd if we leave it
-	#defined.  go figure.
-
-2000-06-19  Dan Winship  <danw@helixcode.com>
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_new): Add a warning before
-	crashing due to a known bug when it can't activate a component, so
-	people don't have to waste any time trying to figure out what's
-	up.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: Compile the CORBA-built files,
-	evolution-shell-component.c and evolution-storage.c into a
-	separate `libeshell.a' library.  Link the `evolution' executable
-	to it.  Also cleaned up a bit and got rid of the `CPP_FLAGS'
-	assignment.
-
-2000-06-12  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-folder-selection-dialog.c: include gnome-dialog.h
-	(PARENT_TYPE): GNOME_TYPE_DIALOG replaced with gnome_dialog_get_type.
-
-2000-06-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (impl_Shell_user_select_folder): New, implementation
-	for `Shell:user_select_folder'.
-	(corba_class_init): Install it.
-	(folder_selection_dialog_clicked_cb): Callback for the folder
-	selection dialog.
-
-	* Evolution-Shell.idl: New method `Shell::user_select_folder'.
-	New interface `FolderSelectionListener'.
-
-	* glade/e-shell-folder-creation-dialog.glade: Make it larger.
-
-	* e-shell-folder-creation-dialog.h: Fix typo: #include
-	<gtk/gtkwindow.h>, not <gtk/gtkwidget.h>.
-
-	* e-shell-view-menu.c: Added "Go to folder..." command.
-	(commmand_goto_folder): Implementation for it.
-
-	* e-shell-folder-selection-dialog.c: New.
-	* e-shell-folder-selection-dialog.h: New.
-
-2000-06-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-local-folder.c (save_metadata): Don't set the description in
-	the XML file if null.  Compute the physical path correctly.
-
-	* e-folder.c (e_folder_construct): Allow NULL description.
-
-	* evolution-shell-component-client.c (init): Initalize
-	`listener_interface' to `CORBA_OBJECT_NIL' and `listener_servant'
-	to NULL.
-	(create_listener_interface): Return void and set the `servant' and
-	`listener_servant' fields directly.
-	(evolution_shell_component_client_async_create_folder): Updated
-	accordingly.
-
-	* e-shell-folder-creation-dialog.c: New struct `DialogData' to be
-	passed to the dialog's callbacks.
-	(dialog_data_destroy): New.
-	(e_shell_show_folder_creation_dialog): Set up a `DialogData'
-	object and pass it as the data for the signals.
-	(shell_destroy_cb): New handler for the "destroy" signal on the
-	shell.
-	(e_shell_show_folder_creation_dialog): Connect it.
-	(dialog_destroy_cb): New handler for the "destroy" signal on the
-	dialog; it frees the associated `DialogData'.
-	(e_shell_show_folder_creation_dialog): Connect it.
-	(async_create_cb): New function, callback for the async folder
-	creation function.
-	(entry_name_is_valid): New function to check if the entered folder
-	name is valid.
-	(dialog_clicked_cb): Check if the specified folder name is valid
-	and, if so, asynchronously create the new folder.
-	(add_folder_types): Set "type_name" data on each menu item.
-
-	* e-storage-set-view.c (e_storage_set_view_get_current_folder):
-	New function.
-
-	* e-storage-set.c (get_storage_for_path): New helper function.
-	(e_storage_set_get_folder): Use it.
-
-	* e-storage.c (e_storage_async_create_folder): Renamed from
-	`e_storage_create_folder'.
-	(e_storage_remove_folder): Renamed from `e_storage_remove_folder'.
-	(impl_create_create_folder): Renamed from `impl_create_folder'.
-	(impl_create_remove_folder): Renamed from `impl_remove_folder'.
-	(class_init): Updated accordingly.
-	(e_storage_result_to_string): New function.
-
-	* e-storage.h: `::create_folder' renamed to
-	`::async_create_folder'.  `::remove_folder' renamed to
-	`::async_remove_folder'.
-
-	* evolution-shell-component.h: Return type of
-	`EvolutionShellComponentCreateFolderFn' and
-	`EvolutionShellComponentRemoveFolderFn' changed to `void'.
-
-	* e-local-storage.c: `EComponentRegistry component_registry'
-	replaced with `EFolderTypeRegistry folder_type_registry' in
-	`ELocalStoragePrivate'
-	(component_async_create_folder_callback): New function, to handle
-	the callback from EvolutionShellComponent.
-	(construct): Likewise.
-	(e_local_storage_open): Replaced @component_registry with
-	@folder_type_registry.
-	(impl_create_folder): Implemented.
-
-	* e-local-folder.c (e_local_folder_new): New.
-	(e_local_folder_construct): New.
-	(e_local_folder_save): Precondition: physical URI is not NULL.
-	(save_metadata): Unlink the metadata file if `xmlSaveFile()'
-	fails.
-
-	* e-storage.c (e_storage_create_folder): Precondition: @path is
-	absolute.
-	(e_storage_remove_folder): Likewise.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c: Removed folder menu and "save as..." command.
-
-	* main.c (main): Call `glade_gnome_init()'.
-
-	* e-shell-view-menu.c (command_new_folder): Implemented.
-
-	* e-shell-folder-creation-dialog.c: New.
-	* e-shell-folder-creation-dialog.h: New.
-
-	* glade/Makefile.am: New.
-	* glade/e-shell-folder-creation-dialog.glade: New.
-
-	* e-shell-view.c (e_shell_view_get_current_uri): New.
-
-	* e-folder-type-registry.c
-	(e_folder_type_registry_get_type_names): New.
-
-	* e-shell-view.c (get_control_for_uri): Updated to use
-	`EvolutionShellComponentClient'.
-
-	* e-folder-type-registry.c: Use `EvolutionShellComponentClient's
-	instead of `BonoboObjectClient's.
-
-	* e-component-registry.c: Use `EvolutionShellComponentClient'
-	instead of `BonoboObjectClient' in `Component'.
-	(component_new): Updated accordingly.
-	(register_component): Likewise.
-
-	* evolution-shell-component-client.h: New.
-	* evolution-shell-component-client.c: New.
-
-	* evolution-shell-component.c
-	(impl_ShellComponent_async_create_folder): New, implementation of
-	`::async_create_folder'.
-	(impl_ShellComponent_async_remove_folder): New, implementation of
-	`::async_remove_folder'.
-	(corba_class_init): Install them.
-	(evolution_shell_component_new): New args `create_folder_fn' and
-	`remove_folder_fn' for setting the handlers for these new methods.
-	(evolution_shell_component_construct): Likewise.
-
-	* Evolution-ShellComponent.idl
-	(ShellComponent::async_create_folder): New.
-	(ShellComponent::async_remove_folder): New.
-	(ShellComponentListener): New.
-
-	* evolution-shell-component.c (impl_ShellComponent_create_view):
-	New param @type.  Use the new `EvolutionShellComponentCreateViewFn'.
-
-	* evolution-shell-component.h: New enum `EvolutionShellComponentResult'.
-	Changed `EvolutionShellComponentCreateViewFn' to return an
-	`EvolutionShellComponentResult'.
-
-	* e-shell-view.c (get_control_for_uri): Pass the folder type to
-	`ShellComponent::create_view'.
-
-	* Evolution-ShellComponent.idl: New param @type for
-	`ShellComponent::create_view'.
-
-2000-06-08  Miguel de Icaza  <miguel@helixcode.com>
-
-	* main.c (development_warning): Use version here.  Add padding to
-	the message.
-	Only destroy object if its window was not closed.
-
-2000-06-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (setup_bonobo_ui_handler): Oops.  Don't create
-	the toolbar.  This was not supposed to be committed.
-
-2000-06-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage.c (folder_destroy): Don't destroy the subfolders.
-	(remove_folder): New helper function.
-	(free_private): Use it.
-	(e_storage_removed_folder): Use it here too.
-	(folder_destroy): Don't unref the EFolder if NULL.
-
-	* e-storage-set-view.c (e_storage_set_view_construct): Use
-	`gtk_signal_connect_while_alive()' instead of just
-	`gtk_signal_connect()' so that the signal handler is automatically
-	removed when we are destroyed.
-
-	* e-storage-set.c (e_storage_set_remove_all_storages): New
-	function.
-
-	* e-shell-view.c (e_shell_view_construct): Use `bonobo_object_ref'
-	on the shell instead of `gtk_object_ref'.
-	(destroy): Unref the shell.
-
-	* e-local-storage.h: #include "e-component-registry.h".
-
-	* e-shell.c (setup_local_storage): Renamed from `setup_storages'.
-	Only set up the local storage, not the CORBA one, and don't create
-	the storage set.
-	(e_shell_construct): Create the storage set here instead.  Call
-	`setup_local_storage' after setting up the components.
-
-	* e-local-storage.c: New member `component_registry' in
-	`ELocalStoragePrivate'.
-	(init): Init to NULL.
-	(destroy): If not null, unref it.
-	(e_local_storage_open): New arg @component_registry.
-	(construct): New arg @component_registry.  Init
-	`priv->component_registry' from it.
-
-	* e-local-storage.c (impl_get_name): Renamed from `get_name'.
-	(impl_create_folder): New function, implementing
-	`EStorage::create_folder'.  Just a stub for now.
-	(impl_remove_folder): New function, implementing
-	`EStorage::remove_folder'.  Just a stub for now.
-	(class_init): Install these stub implementations.
-
-	* e-storage.c (e_storage_remove_folder): New function.
-	(e_storage_create_folder): New function.
-	(impl_create_folder): New function, default implementation for
-	`::create_folder'.
-	(impl_remove_folder): New function, default implementation for
-	`::remove_folder'.
-	(class_init): Install the implementations.
-
-	* e-storage.c (impl_get_name): Renamed from `get_name'.
-	(impl_get_folder): Renamed from `get_folder'.
-	(impl_list_folders): Renamed from `list_folders'.
-
-	* e-storage.h: New virtual methods `remove_folder',
-	`create_folder'.
-
-	* e-storage.c (e_storage_removed_folder): Renamed from
-	`e_storage_remove_folder'.
-	* e-corba-storage.c (impl_StorageListener_removed_folder): Updated
-	accordingly.
-
-2000-06-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (setup_bonobo_ui_handler): Create the default toolbar.
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-shell-view-menu.c: Changed "Using the Shell" to "Getting Started"
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Free the uri variable.
-
-	* e-shell.c: Free the local_directory variable.
-
-2000-06-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (view_delete_event_cb): New callback for the
-	"delete_event" on the view.
-	(idle_cb): Connect it.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-storage-set-view.c (set_e_shortcut_selection): Added a
-	g_return_if_fail check.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* e-shell-view-menu.c (command_help): New menu callback to launch
-	the help browser.
-	(menu_help): add pointers to the users' guide.
-	(e_shell_view_menu_setup): Add the help menu stuff to the uih.
-
-	* main.c (main): Set up gettext. (Problem noted by Héctor García
-	Alvarez)
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (DEFAULT_WIDTH): Add more 5 pixels.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (DEFAULT_WIDTH): Made the default window a bit
-	narrower.
-	(DEFAULT_HEIGHT): And shorter.
-	(setup_widgets): Set the border width of the vbox that holds the
-	title bar to 2 pixels, so that the view looks a bit nicer.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (DEFAULT_TREE_WIDTH): Made the tree 150 pixel
-	wide [instead of 100].
-	(setup_widgets): Use `DEFAULT_TREE_WIDTH' instead of
-	`DEFAULT_SHORTCUT_BAR_WIDTH' where appropriate.
-	(e_shell_view_construct): Hide the folder bar by default.
-
-	* e-storage-set-view.c (e_storage_set_view_construct): Set
-	auto-resize mode for column one.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): Set the
-	statusbar.
-
-	* e-shell-view.c: New member `appbar' for `EShellViewPrivate'.
-	(init): Initialize to NULL.
-	(setup_widgets): Install a status bar and set `appbar' to point to
-	it.
-	(setup_bonobo_ui_handler): Make the BonoboUIHandler use `appbar'
-	as its statusbar.
-	(e_shell_view_get_appbar): New function.
-	(e_shell_view_construct): Set up the BonoboUIHandler after setting
-	up the widgets.
-
-	* e-shortcuts.c (class_init): Add new signals "new_shortcut",
-	"removed_shortcut", "new_group", "removed_group".
-	(e_shortcuts_remove_shortcut): Emit "remove_shortcut".
-	(e_shortcuts_add_shortcut): Emit "new_shortcut".
-	(e_shortcuts_remove_group): Emit "remove_group".
-	(e_shortcuts_add_group): Emit "new_group".
-	(unload_shortcuts): Emit "remove_group" for all the groups.
-
-	* e-shortcuts.h: New signals "new_shortcut", "removed_shortcut",
-	"new_group", "removed_group".
-
-	* e-shortcuts-view.c (pop_up_right_click_menu): New function to
-	pop up the right-click menu for the shortcut bar.
-	(pop_up_right_click_menu_for_shortcut): New function.
-	(selected_item): Pop up right click menu when appropriate.  Don't
-	activate the shortcut when right-clicking.
-
-2000-05-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.h: #include 'Evolution.h".
-
-2000-05-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (show_error): Use `set_current_notebook_page()'
-	instead of `gtk_notebook_set_page()'; this will also deactivate
-	the current control properly.
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): Initialize the
-	state of the shortcut/folder toggle menu items using
-	`e_shell_view_get_shortcut_bar_mode()' and
-	`e_shell_view_get_folder_bar_mode()'.
-	(command_toggle_shortcut_bar): Removed debugging message.
-	(command_toggle_folder_bar): Likewise.
-
-	* e-shell-view.c (e_shell_view_get_shortcut_bar_mode): New
-	function.
-	(e_shell_view_get_folder_bar_mode): New function.
-
-2000-05-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c: New constant `DRAG_RESISTANCE'.  New
-	members `button_x', `button_y' in `EStorageSetViewPrivate'.
-	(init): Initialize to zero.
-	(button_press_event): Set.
-	(motion_notify_event): Don't start drag unless the current x/y
-	position is farther than `DRAG_RESISTANCE', in any of the two
-	directions, from the original position of the button click.
-	(button_release_event): Always ungrab the pointer, even if
-	`selected_row_path' is NULL.
-
-2000-05-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component.c (class_init): Eeek!
-	s/owner_set/owner_unset/.
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
-	Increase the size of the border of the hbox slightly to make the
-	title bar a bit nicer.
-
-2000-05-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-component-registry.c (component_free): Invoke `::unset_owner'
-	on the component before releasing it.
-
-	* evolution-shell-component.c (class_init): Install the
-	"owner_set" signal.
-	(impl_ShellComponent_unset_owner): New function, implementation of
-	`ShellComponent::unset_owner'.
-	(corba_class_init): Install it.
-
-	* evolution-shell-component.h: New signal "owner_unset".
-
-	* Evolution-ShellComponent.idl: New method `ShellComponent::
-	unset_owner'.
-
-	* e-shell.c (e_shell_quit): Destroy all the views explicitly.
-
-	* e-shell-view-menu.c: Changed `Show shortcut bar' and `Show
-	folder tree' items into toggle items.
-	(shortcut_bar_mode_changed_cb): New callback to update the status
-	of the "show shortcut bar" toggle item when the shortcut bar is
-	hidden/shown in the view.
-	(folder_bar_mode_changed_cb): Likewise for the folder bar.
-	(e_shell_view_menu_setup): Connect these to the corresponding
-	signals on the shell.
-
-	* e-shell-view.c: New members `shortcut_bar_mode' and
-	`folder_bar_mode' in `EShellViewPrivate'.
-	(init): Initialize `shortcut_bar_mode' and `folder_bar_mode' to
-	`E_SHELL_VIEW_SUBWINDOW_HIDDEN'.
-	(class_init): Add the new signals.
-	(e_shell_view_set_shortcut_bar_mode): Renamed from
-	`e_shell_view_show_shortcuts'.  Emit "shortcut_bar_mode_changed"
-	and update the `shortcut_bar_mode' member.
-	(e_shell_view_set_folder_bar_mode): Renamed from
-	`e_shell_view_show_folders'.  Emit "folder_bar_mode_changed" and
-	update the `folder_bar_mode' member.
-
-	* e-shell-view.h: New signals "shortcut_bar_mode_changed",
-	"folder_bar_mode_changed".
-
-	* e-shell-view.c (setup_menus): Removed.
-	(e_shell_view_construct): Use `e_shell_view_menu_setup' instead.
-	(e_shell_view_get_bonobo_ui_handler): New function.
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): New.
-
-	* e-shell.c (impl_Shell_get_component_for_type): New function,
-	implementation of `Evolution::Shell::get_component_for_type'.
-	(corba_class_init): Install it into the EPV.
-
-	* Evolution-Shell.idl: Added method `get_component_for_type'.
-
-2000-05-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts.c: New members `dirty', `save_idle_id' in
-	`EShortcutsPrivate'.
-	(init): Initialize.
-	(destroy): If the idle ID is nonzero, remove the idle.  If `dirty'
-	is true, save.
-	(idle_cb): New.
-	(schedule_idle): New.
-	(make_dirty): New.
-	(e_shortcuts_remove_shortcut): Call it.
-	(e_shortcuts_add_shortcut): Likewise.
-	(e_shortcuts_remove_group): Likewise.
-	(e_shortcuts_add_group): Likewise.
-
-	* e-shell.c (e_shell_construct): Updated to match the `EShortcuts'
-	API changes.
-
-	* e-shortcuts.c: New member `file_name' in `EShortcutsPrivate'.
-	(init): Init to NULL.
-	(destroy): Free it.
-	(e_shortcuts_load): Removed.
-	(e_shortcuts_save): Removed.
-	(e_shortcuts_new): New arg @file_name.  Load from the specified
-	file name.
-
-	* e-shortcuts-view.c (added_item): New method implementation.
-	(removed_item): New method implementation.
-	(added_group): New method implementation.
-	(removed_group): New method implementation.
-	(class_init): Install these.
-
-	* e-shortcuts.c (e_shortcuts_remove_shortcut): New function.
-	(e_shortcuts_add_shortcut): New function.
-	(e_shortcuts_remove_group): New function.
-	(e_shortcuts_add_group): New function.
-
-	* e-shell-view.c: New member `view_title_bar' in
-	`EShellViewPrivate'.
-	(setup_widgets): Put an EShellFolderTitleBar on top of the tree
-	view and the content view.
-	(update_window_icon): Renamed from `set_icon'.
-	(update_folder_title_bar): New.
-	(popup_tree): New function to pop up the tree view when the title
-	button in the title bar is clicked.
-	(folder_title_clicked_cb): New callback for the "clicked" signal
-	of EShellFolderTitleBar.
-	(setup_widgets): Don't add a title bar to the shortcut bar.
-	(create_storage_set_subwindow): New helper function.
-	(setup_widgets): Use it.
-	(show_error): Use an EClippedLabel instead of a GtkLabel.
-
-	* e-shell-view.c: Replaced all the occurences of `gpointer' with
-	`void *' for consistency.
-
-	* e-shell-folder-title-bar.c: New file.
-	* e-shell-folder-title-bar.h: New file.
-
-	* e-storage-set-view.c (e_storage_set_view_construct): Ooops.  Fix
-	inverted key/value pair in the call to `g_hash_table_insert()'.
-
-2000-05-28  Dan Winship  <danw@helixcode.com>
-
-	* main.c (main): Remove extra free of evolution_directory.
-
-2000-05-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c (evolution_storage_register): Use the
-	storage's name when registering.
-
-2000-05-26  Matt Loper  <matt@helixcode.com>
-
-	* e-shell-view-menu.c (command_about_box): Make authorlist more
-	alphabetical.
-	(command_show_treeview): New function; shows the treeview, when it
-	has been hidden.
-	(command_show_shortcut_bar): New function; shows the shortcut bar,
-	when it's been hidden.
-
-2000-05-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-corba-storage.c (impl_StorageListener_new_folder): Set the
-	physical URI on the folder using `e_folder_set_physical_uri()'.
-
-	* e-local-folder.c (get_physical_uri): Removed.
-	(construct_loading_metadata): Use EFolder's `physical_uri' field
-	instead of ours, which is gone.
-	(save_metadata): Likewise.
-	(destroy): Don't free.
-
-	* e-local-folder.h: Removed `physical_uri' from `ELocalFolder'.
-
-	* e-folder.c: New member `physical_uri' in `EFolderPrivate'.
-	(init): Initialize to NULL.
-	(destroy): Free it.
-	(get_physical_uri): Removed.
-	(e_folder_set_physical_uri): New function.
-
-	* e-storage-set.c (e_storage_set_get_folder): Fix off-by-one error
-	in extracting the base name.
-
-	* e-storage.c: New member `path' in `Folder'.
-	(folder_destroy): Free it.
-	(folder_new): New arg.  Initialize `path' from it.
-	(e_storage_construct): Updated accordingly.
-	(e_storage_new_folder): Likewise.
-	(e_storage_remove_folder): Remove the folder from the hash.
-
-	* e-storage-set-view.c (remove_node): New function.
-	(removed_storage_cb): Use it.
-	(new_folder_cb): New function, callback for the "new_folder"
-	signal on the EStorageSet.
-	(removed_folder_cb): New function, callback for the
-	"removed_folder" signal on the EStorageSet.
-	(e_storage_set_view_construct): Connect these signal handlers to
-	the respective signals on our model storage.
-
-	* e-storage-set.c (storage_new_folder_cb): New function, callback
-	for the "new_folder" signal on the storages.
-	(storage_removed_folder_cb): New function, callback for the
-	"removed_folder" signal on the storages.
-	(e_storage_set_add_storage): Connect them to the signals of the
-	storage being added.
-
-	* e-corba-storage-registry.c
-	(impl_StorageRegistry_register_storage): Throw an exception if
-	`e_storage_set_add_storage()' returns false.
-
-	* e-shell.c (setup_storages): Unref the local storage after adding
-	to the storage set.
-
-	* e-corba-storage-registry.c
-	(impl_StorageRegistry_register_storage): Unref the storage after
-	adding to the storage set.
-
-	* e-storage-set.c: New hash table `name_to_named_storage' in
-	`EStorageSetPrivate'.
-	(named_storage_new): New helper function.
-	(named_storage_destroy): New helper function.
-	(e_storage_set_add_storage): Use the hash table.  Return value
-	changed to `gboolean'.  Return FALSE if there is a storage with
-	that name already.  Also, ref the storage.
-	(e_storage_set_remove_storage): Likewise [but of course don't ref
-	the storage].
-	(e_storage_set_get_storage): Use the `name_to_named_storage' hash
-	table.
-	(destroy): Destroy the `name_to_named_storage' hash.
-
-	* e-storage-set.h: New signals "new_folder", "removed_folder".
-
-	* e-storage.c (e_storage_get_watcher_for_path): Removed.
-	(get_watcher_for_path): Removed.
-	(class_init): Install signals "new_folder" and "removed_folder".
-	(e_storage_remove_folder): Emit "removed_folder".
-	(e_storage_new_folder): Emit "new_folder".
-
-	* e-storage.h: Removed method `get_watcher_for_path'.  New signals
-	"new_folder", "removed_folder".
-
-	* e-storage-watcher.c: Removed.
-	* e-storage-watcher.h: Removed.
-
-	* e-corba-storage-registry.c (corba_class_init): Set the
-	Bonobo_Unknown evp parts.
-
-	* evolution-storage.c: New.
-	* evolution-storage.h: New.
-
-	* evolution-shell-component.c
-	(evolution_shell_component_get_owner): New.
-
-	* e-storage-set-view.c (new_storage_cb): New function.
-	(e_storage_set_view_construct): Connect to the "new_storage"
-	signal on the EStorageSet.
-	(removed_storage_cb): New function.
-	(e_storage_set_view_construct): Connect to the "removed_storage"
-	signal on the EStorageSet.
-
-	* e-storage-set-view.c (e_storage_set_view_construct): Make this
-	always look pretty, with Helix GNOME or without.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-storage-set-view.c: Make this always look pretty, with Helix
-	GNOME or without.
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c (e_storage_set_view_construct): Set the
-	dotted line type again.  Dotted is less butt-ugly than continuous.
-
-	* e-shell-view.c (show_error): Display page zero in the notebook.
-
-	* main.c (idle_cb): Renamed from `new_view_idle_cb'.  Create the
-	EShell object here, because now the shell depends on the GLib loop
-	to be running for correct operation.
-	(main): Don't create the EShell here.
-
-	* e-storage-set-view.c (get_pixmap_and_mask_for_folder): If the
-	icon is not found, set the returned pixmap and mask to NULL.
-
-	* e-shell.c (e_shell_construct): Added precondition: @corba_object
-	must be non-nil.
-	(e_shell_new): Added precondition: @local_direcory must be
-	non-null.
-
-	* evolution-shell-component.c: New.
-	* evolution-shell-component.h: New.
-
-	* e-shell.c: New member `component_registry' in `EShellPrivate'.
-	(init): Initialize to NULL.
-	(destroy): Unref it.
-	(setup_components): New function to set up the compnent registry
-	and initialize the mail, calendar and addressbook components.
-	(e_shell_construct): Call it.
-
-	* e-storage-set.c: Updated to use EFolderTypeRegistry.
-	* e-storage-set.h: Likewise.
-	* e-shortcuts.c: Likewise.
-	* e-shortcuts.h: Likewise.
-	* e-shell.c: Likewise.
-
-	* e-shell.h: Likewise.
-	* e-shell-view.c: Likewise.
-	* e-shortcuts-view.c: Likewise.
-	* e-storage-set-view.c: Likewise.
-
-	* e-component-registry.c: New.
-	* e-component-registry.h: New.
-
-	* e-folder-type-registry.c: New.
-	* e-folder-type-registry.h: New.
-
-	* e-folder-type-repository.c: Removed.
-	* e-folder-type-repository.h: Removed.
-
-	* Evolution-ShellComponent.idl: New struct `FolderType'; new type
-	`FolderTypeList'. New attribute `supported_types'.
-	(ShellComponent::set_owner): Renamed from `set_shell'.
-	(ShellComponent::create_view): New.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Was using the wrong include here.
-
-	* e-storage-set-view.c: Got rid of the lines in the tree view.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added libepaned.a.
-
-	* e-shell-view.c: Switched from GtkPaned to EPaned.
-
-2000-05-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c: New member `corba_storage_registry' in
-	`EShellPrivate'.
-	(init): Initialize it to NULL.
-	(destroy): Unref it if not NULL.
-	(setup_corba_storages): New function to set up the CORBA storage
-	registry and `bonobo_object_add_interface()' it to the shell.
-	(setup_storages): Call it from here.
-
-	* e-shell.h, e-shell.c: Derive EShell from BonoboObject instead of
-	GtkObject.
-
-	* e-storage.c (e_storage_remove_folder): Return value changed into
-	`gboolean'; return false if an error occurs, true otherwise.
-	(e_storage_new_folder): Likewise.
-
-	* e-corba-storage-registry.c: New.
-	* e-corba-storage-registry.h: New.
-
-	* e-corba-storage.c: New.
-	* e-corba-storage.h: New.
-
-	* Evolution.idl: Include the new IDLs, but no
-	`evolution-service-repository.idl' anymore.
-
-	* Evolution-Shell.idl: New.
-	* Evolution-ShellComponent.idl: New.
-	* Evolution-Storage.idl: New.
-
-	* evolution-service-repository.idl: Removed.
-	* evolution-service-repository.c: Removed.
-	* evolution-service-repository.h: Removed.
-
-	* e-folder-type-repository.c (folder_type_new): Free `icon_path'.
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* main.c (new_view_idle_cb): add development_warning (moved from
-	mail component)
-
-2000-05-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c: Get rid of the `ICON_WIDTH' and
-	`ICON_HEIGHT' #defines.
-	(get_pixmap_and_mask_for_folder): Get the mini icon instead of the
-	big one.  Use `E_SHELL_MINI_ICON_SIZE' instead of `ICON_WIDTH' and
-	`ICON_HEIGHT'.
-
-	* e-folder-type-repository.c: New member `mini_icon_pixbuf' in
-	`FolderType'.
-	(folder_type_new): Initialize `mini_icon_pixbuf' by loading the
-	mini icon if possible.  If the mini icon is not found, resort to
-	the big one.
-	(folder_type_free): Unref the mini icon.
-	(e_folder_type_repository_get_icon_for_type): New arg @mini.  If
-	true, return the mini icon instead of the standard one.
-
-	* e-shell-view.c (set_icon): Get the mini icon instead of the big
-	one by using `e_shell_get_icon_path's @try_mini arg.
-
-	* e-shell-constants.h: New file.
-
-	* e-shell-utils.c
-	(e_shell_get_icon_path): New arg @try_mini.  If true, look for the
-	mini version [whose name ends in `-mini'].
-
-	* e-folder-type-repository.c
-	(folder_type_new): Free string returned by
-	`e_shell_get_icon_path()'.
-
-2000-05-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c: New members `storage_set_view_box',
-	`shortcut_bar_box', `hpaned1_position', `hpaned2_position' in
-	`EShellViewPrivate'.
-	(init): Initialize them.
-	(setup_widgets): Add title bars to the tree and shortcut views.
-	(shortcuts_view_close_button_clicked_cb): New callback function.
-	(setup_widgets): Connect to the "close_button_clicked" signal of
-	the shortcut view's title bar.
-	(storage_set_view_close_button_clicked_cb): New callback function.
-	(setup_widgets): Connect to the "close_button_clicked" signal of
-	the storage set view's title bar.
-	(e_shell_view_show_shortcuts): New function.
-	(e_shell_view_show_folders): New function.
-
-	* e-shell-view.c: New members `hpaned1', `hpaned2' in
-	`EShellViewPrivate'.
-	(init): Initialize both to NULL.
-	(setup_widgets): Invert the parenting order for the GtkHPaneds and
-	store them into the private `hpaned' and `hpaned2' members.
-
-	* Makefile.am (evolution_LDADD): Link with `libemiscwidgets.a'.
-
-2000-05-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts.c
-	(load_shortcuts_into_view): Removed.
-	(e_shortcuts_new_view): Don't set up the shortcut bar manually
-	here anymore, and don't set the icon callback either.  The
-	`EShortcutsView' object is now able to do this by itself.
-
-	* e-shortcuts-view.c
-	(icon_callback): Moved here from `e-shortcuts.c'.
-	(load_group): New function.
-	(load_all_shortcuts): New function.
-	(e_shortcuts_view_construct): Call it to load the shortcuts from
-	the `EShortcuts' object.  Also, set `icon_callback' as the icon
-	callback.
-
-	* e-storage-set-view.c
-	(button_press_event): Add/remove grab with `gtk_grab_add' and
-	`gtk_grab_remove'.
-	(button_release_event): Call `gtk_grab_remove' when removing the
-	grab.
-
-	* e-shortcuts.c: New member `title_to_group' in
-	`EShortcutsPrivate'.
-	(init): Initialize here.
-	(destroy): Destroy here.
-	(unload_shortcuts): Destroy and recreate here.
-	(load_shortcuts): Avoid inserting multiple groups with the same
-	title, and insert the groups into the `title_to_group' hash table.
-	Also, avoid leaking the return value from `xmlNodeListGetString'.
-	(e_shortcuts_get_group_titles): New function.
-	(e_shortcuts_get_shortcuts_in_group): New function.
-	(e_shortcuts_get_storage_set): New function.
-
-	* e-storage-set-view.c
-	(e_storage_set_view_set_current_folder): Emit the
-	"folder_selected" signal.
-
-	* e-local-folder.c
-	(get_string_value): Return a `char *' to be deallocated by the
-	caller instead of a `const char *' that does not need to be
-	deallocated.
-	(construct_loading_metadata): Free values returned from
-	`get_string_value'.
-
-2000-05-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c: New members `dragged_row_path',
-	`selected_row_path_before_click' in `EStorageSetViewPrivate'.
-	(init): Initialize them to NULL.
-	(motion_notify_event): Set `dragged_row_path' from
-	`selected_row_path'.
-	(button_press_event): Initialize `selected_row_path_before_click'
-	from `selected_row_path'.
-	(button_release_event): Set `selected_row_path_before_click' to
-	NULL.
-	(drag_end): Restore the current selection from
-	`selected_row_path_before_click'; then set both `dragged_row_path'
-	to NULL.
-
-2000-05-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c: New members `in_drag' and `drag_button' in
-	`EStorageSetViewPrivate'.  New static variables `drag_types',
-	`num_drag_types', `target_list'.
-	(class_init): Create the `target_list'.
-	(init): Initialize the private `in_drag' member to false.
-	Initialize the private `drag_button' member to zero.
-	(button_release_event): Set it to false.
-	(motion_notify_event): New function, implementation of
-	`GtkWidget::motion_notify_event'.  If `in_drag' is false, set it
-	to true and set ourselves up as a drag source.
-	(button_press_event): New function, implementation of
-	`GtkWidget::button_press_event'.  Set `drag_button' to the event's
-	button number and then chain to the implementation in the parent
-	class.
-	(drag_end): New function, implementation of `GtkWidget::drag_end'.
-	(drag_data_get): New function, implementation of
-	`GtkWidget::drag_data_get'.
-	(set_e_shortcut_selection): New function, helper for `drag_data_get'.
-	(set_uri_list_selection): New function, helper for `drag_data_get'.
-	(class_init): Install these method implementations.
-
-	* e-storage-set-view.c: New member `selected_row_path' in
-	`EStorageSetViewPrivate'.
-	(init): Initialize it to NULL.
-	(tree_select_row): Set it to the path of the selected row.  Don't
-	emit "folder_selected" yet.  Also, keep the grab.
-	(button_release_event): New function, implementation of
-	`GtkWidget::button_release_event'.  If `selected_row_path' is not
-	NULL, emit the "folder_selected" signal with `selected_row_path'
-	as the parameter and then set `selected_row_path' to NULL again.
-	(class_init): Install `button_release_event'.
-
-	* e-storage-set-view.c: Made `ICON_WIDTH' and `ICON_HEIGHT' global
-	#defines.
-	(e_storage_set_view_construct): Set the row height to
-	`ICON_HEIGHT'.  Alos, set the selection mode to
-	`GTK_SELECTION_BROWSE'.
-
-2000-05-15  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* e-local-folder.c (get_string_value): Use the correct function to
-	get the node's contents.
-	
-	* e-shortcuts.c (load_shortcuts): Same as above.
-
-2000-05-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-folder-type-repository.c
-	(e_folder_type_repository_get_control_id_for_type): Protect
-	against non-existing types.
-	(e_folder_type_repository_get_icon_for_type): Likewise.
-
-2000-05-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c
-	(folder_compare_cb): Callback comparison function for comparing
-	folders based on their names.
-	(insert_folders): Use it to sort the folder list before using it.
-
-2000-05-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c
-	(setup_storages): Pass the pointer to the folder type repository.
-	(e_shell_construct): Initialize the folder type repository before
-	everything else.
-
-	* e-storage-set.c: New member `folder_type_repository' in
-	`EStorageSetPrivate'.
-	(init): Initialize it to NULL.
-	(destroy): Unref it.
-	(e_storage_set_construct): New arg @folder_type_repository.
-	Initialize the corresponding member in the private struct through
-	it.
-	(e_storage_set_new): New arg @folder_type_repository.
-	(e_storage_set_get_folder_type_repository): New function.
-
-	* e-shortcuts.c (icon_callback): Just use [the new version of]
-	`e_folder_type_repository_get_icon_for_type()' instead of loading
-	the image manually.
-
-	* e-folder-type-repository.c: New member `icon_pixbuf' in
-	`FolderType'.
-	(folder_type_new): Load the pixbuf.
-	(folder_type_free): Unref the pixbuf.
-	(e_folder_type_repository_get_icon_name_for_type): Renamed from
-	`e_folder_type_repository_get_icon_for_type'.
-	(e_folder_type_repository_get_icon_for_type): New function, now
-	returning a `GdkPixbuf *'.
-
-	* e-shortcuts.c
-	(icon_callback): Use `e_shell_get_icon_name()'.
-
-	* e-shell-view.c: New member `storage_set_view' in
-	`EShellViewPrivate'.
-	(init): Initialize it to NULL.
-	(e_shell_view_construct): Create an EStorageSetView for the
-	shell's EStorageSet and put it into a scrolled window.  Also, put
-	the scrolled window into the EShellView with some
-	[temporary] GtkPaned action.  Store the pointer to the
-	EStorageSetView to `priv->storage_set_view'.
-	(set_icon): Get an EShellView and an EFolder instead of an
-	EShellView and a URI.  Also, don't leak.
-	(update_for_current_uir): New helper function.  Call `set_icon'.
-	(show_error): Call it.
-	(folder_selected_cb): New function.
-	(setup_widgets): Connect it to the "folder_selected" signal of the
-	storage set view.
-
-	* e-storage-set-view.c: New file.
-	* e-storage-set-view.h: New file.
-
-	* e-shell-utils.c: New file.
-	* e-shell-utils.h: New file.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view-menu.c: Added an about box.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Set the icons when changing between components.
-
-	* main.c: Set the default icon.  (The change in e-shell-view.c
-	doesn't work unless we do this.)
-
-2000-05-09  Matt Loper  <matt@helixcode.com>
-
-	* e-shell-view-menu.c (command_run_bugbuddy): New function; allows
-	users to submit a bug.
-	(command_run_bugbuddy): Implemented with jacob's patch.
-
-2000-05-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (e_shell_new_view): Display the specified @uri in the
-	view.
-
-	* e-shell-view.c (e_shell_view_construct): Removed arg @uri.
-	(e_shell_view_new): Likewise.
-
-	* main.c: New string constant `STARTUP_URI', specifying the URI to
-	show in the startup view.
-	(new_view_idle_cb): New callback function to create a new view for
-	`STARTUP_URI' in the idle loop.  We need to do this in the idle
-	loop because the CORBA stuff cannot work until the loop starts
-	running.
-	(main): Set `new_view_idle_cb' up as the idle callback instead of
-	creating the view right away.
-
-2000-05-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (setup_storages): Woops.  Don't free the path before
-	the warning message, as we need to print it.
-
-2000-05-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (destroy_cb): New function.
-	(main): Connect it to the `destroy' signal on the shell.
-
-2000-05-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts.c (load_shortcuts): Const fix.
-
-2000-05-08  Larry Ewing  <lewing@helixcode.com>
-
-	* e-shortcuts.c (load_shortcuts_into_view): xmlFree the return
-	value of xmlGetProp.
-
-2000-05-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts-view.c (e_shortcuts_view_construct): Use
-	correct cast.
-
-2000-05-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (main): Connect to "no_views_left", not "destroy".
-
-	* e-shell.c (view_destroy_cb): Grmpf.
-
-2000-05-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (e_shell_construct): Output a warning message if the
-	shortcut file is not found.
-	(setup_storages): Output a warning message if the local storage
-	cannot be initialized.
-	(destroy): Destroy all the views.
-
-	* e-shell-view.c
-	(e_shell_view_construct): Ref the shell.
-
-	* e-shortcuts-view.c
-	(e_shortcuts_view_construct): Ref the shortcuts.
-
-	* e-shell.c: Create the "no_views_left" signal.  New member
-	`views' in `EShellPrivate'.
-	(init): Initialize `views' to NULL.
-	(view_destroy_cb): Destroy handler for a view: remove the view
-	from `views', and emit the "no_views_left" signal if this was the
-	last view.
-	(e_shell_new_view): Add the new view to `views' and connect the
-	"destroy" signal to `view_destroy_cb'.
-	(destroy): Destroy the views.
-
-	* e-shell.h: New signal "no_views_left".
-
-	* e-shell-view-menu.c (command_quit): New function, implementation
-	of the "quit" command.
-
-	* e-shell-view.c (e_shell_view_get_shell): New function.
-
-	* e-shell.c (e_shell_quit): New function.
-
-	* main.c (main): If it is not possible to create the shell for
-	some reason, pop up an error message.
-	(shell_destroy_cb): New function, signal handler for "destroy" on
-	the shell object.
-	(main): Connect it.
-
-2000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts.c (destroy): Be safer about NULL objects.
-
-	* e-shell.c (destroy): Be safer about NULL objects.
-
-	* e-local-storage.c (load_folders): Use `readdir()', not
-	`readdir_r()'.
-
-2000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (init_corba) [! USING_OAF]: We have no options no
-	popt context.
-
-2000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* All files: Reorganized and redone a lot of the shell.  New
-	features: internal URI namespace, extensible storage/folder
-	mechanism, configurable shortcuts.
-
-2000-05-03  Damon Chaplin  <damon@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_new): turned the notebook border off.
-	The calendar looks better without it. If any of the views want a
-	border they should create it themselves, shouldn't they?
-
-2000-05-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcut.c (shell_icon_cb): Type of @url changed from `gchar
-	*' to `const gchar *'; new arg @data.
-	(e_shortcut_bar_view_new): Pass NULL as the closure value for
-	`e_shortcut_bar_set_icon_callback()'.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-folder-mail.c: Removed.
-
-	* e-folder-mail.h: Removed.
-
-	* eshell-types.h: Removed.
-
-	* e-folder.h: Don't #include "eshell-types.h".
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-folder.h: Removed member `eservice' from `EFolder'.
-
-	* e-service.c: Removed.
-
-	* e-service.h: Removed.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-05-01  Dan Winship  <danw@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_set_view): Turn off control frame
-	autoactivation, so the toolbars work correctly. This may actually
-	be a bug in Bonobo, but we'll kludge around it here for now.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c: OAFized.
-	(get_view): If `bonobo_widget_new_control()' fails for the
-	calendar, don't try to get the property bag and stuff and thus
-	prevent a segfault.
-
-	* main.c
-	(corba_init): Removed Bonobo initialization.  Implemented OAF
-	version for the case in which `USING_OAF' is #defined.
-	(init_bonob): New function.
-	(main): Call `init_bonobo()'.
-
-2000-04-26  Matt Loper  <matt@helixcode.com>
-
-	* e-shell-view.c (bonobo_widget_is_dead): Helper function to see
-	whether a bonobo widget is a zombie (ie the remote bonobo control
-	died).
-	(e_shell_view_set_view): Try to respawn dead widgets.
-
-2000-04-25  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: include -I$(datadir)/idl in orbit-idl arguments so
-	that you can have bonobo installed in the same prefix as
-	evolution, when that isn't the same prefix is gnome-libs, which a
-	lot of people seem to be doing.
-	(CLEANFILES): add EVOLUTION_CORBA_GENERATED
-	
-2000-04-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* idl/folder.idl: Made some functions syncronous that didn't need
-	to be asyncronous.
-
-2000-04-24  Matt Loper  <matt@helixcode.com>
-
-	* e-shell-view.h: Added hpaned and treeview widgets to
-	EShellView. Added e_shell_view_toggle_shortcut_bar() and
-	e_shell_view_toggle_treeview().
-
-	* e-shell-view.c (e_shell_view_setup_shortcut_display): Use EPaned
-	widget to house our shortcut bar.
-	(e_shell_view_toggle_shortcut_bar): New function; toggles whether
-	the shortcut bar is showing.
-	(e_shell_view_toggle_treeview): Same, for the treeview (NYI).
-	(e_shell_view_new): Put the notebook view in our EPaned widget.
-
-	* e-shell-view-menu.c (esv_cmd_toggle_shortcut_bar): New function;
-	toggles whether the shortcut bar is viewed.
-	(esv_cmd_toggle_treeview): Same, but with the treeview.  Added
-	menuitems in the "view" menu to allow access to the above.
-
-2000-04-19  Seth Alves  <alves@hungry.com>
-
-	* e-shell-view.c (get_view): set calendar's uri with a property bag
-
-2000-04-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* idl/folder.idl: New idl file.  Still unused.
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Made the left pane of the shell view not
-	autoresize.
-
-2000-04-09  Matt Loper  <matt@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_setup): Set the default height
-	bigger, to 600, so that everything in the shortcut-bar shows up.
-
-2000-04-07  Matt Loper  <matt@helixcode.com>
-
-	* e-shell-view.c (destroy_folder_view): New function;
-	Bonobo_Unknown_unref's the controls that have the views in them.
-	(esv_destroy): Calls the above for each folder_view in the
-	hashtable.
-	(get_view): unref the ServiceRepository interface of the control
-	when we're done with it.
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* shell/e-shortcut.c (shell_icon_cb): Append a slash here.
-	(shell_icons): Only list the filenames.
-
-	* shell/main.c (evolution_boot): Be less rude.
-
-2000-04-06  Matt Loper  <matt@helixcode.com>
-
-	* shell/main.c (evolution_boot): Make sure our data directory is
-	available with e_setup_base_dir ().
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* shell/e-shortcut.c (shell_icon_cb): Load the icons from the
-	installation path, not form the GNOME-libs installation prefix. 
-	(shell_icon_cb): Memory leak fix.
-
-	* shell/Makefile.am (imagesdir): Pass the EVOLUTION_IMAGES
-	installation directory here.
-
-2000-04-05  Seth Alves  <alves@hungry.com>
-
-	* shell/e-shell-view.c (get_view): hook up control:calendar
-
-2000-03-31  Dan Winship  <danw@helixcode.com>
-
-	* shell/e-shortcut.c (e_shortcut_bar_view_new, shell_icon_cb):
-	Update for shortcut bar changes.
-
-	* shell/e-folder.h: add E_FOLDER_SUMMARY
-	* shell/e-shell.c (e_shell_setup_default_folders): make the
-	"Today" icon be of type E_FOLDER_SUMMARY, not E_FOLDER_MAIL.
-
-2000-03-30  Dan Winship  <danw@helixcode.com>
-
-	* shell/e-shell-view.c (e_shell_view_set_view): Hold off on
-	deactivating the "outgoing" control until after setting up the
-	"incoming" control. That way if the new control takes a few
-	seconds to load, there won't be an ugly empty spot where the
-	toolbar used to be while the new control loads.
-
-2000-03-29  Dan Winship  <danw@helixcode.com>
-
-	* shell/e-shell-view.c (e_shell_view_set_view): Call
-	bonobo_control_frame_activate on the folder_view every time it
-	is displayed, and bonobo_control_frame_deactivate every time it is
-	hidden.
-
-2000-03-25  Matt Loper  <matt@helixcode.com>
-
-	* shell/e-shell-view.c (get_view): Move CORBA_Environment to
-	different scope.
-
-2000-03-22  Matt Loper  <matt@helixcode.com>
-
-	* shell/main.c (evolution_boot): gtk_signal_connect'ed "destroy"
-	to gtk_main_quit, so that the shell dies when you want it to.
-
-	* shell/e-shell-view.c (get_view): Reorganized, and added
-	assertions.
-	(e_shell_view_set_view): Added assertions.
-
-2000-03-20  Matt Loper  <matt@helixcode.com>
-	
-	* shell/e-shell-view.h: New private field in EShellView added,
-	which contains the notebook and a hashtable of folders to views.
-
-	* shell/e-shell-view.c (e_shell_view_set_view): Instead of
-	creating a new control every time we set the view, we now keep our
-	controls in a notebook. This function now switches to the correct
-	notebook page, or creates a new page/control as necessary.
-	(e_shell_view_new): Creates and inserts the notebook into the
-	shell.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* shell/e-shell-view.c: Added an E_FOLDER_CONTACTS section to the
-	get_view function.
-
-2000-03-13  bertrand  <bertrand@helixcode.com>
-
-	* shell/e-shell.c (EShell_register_service): 
-	test implementation. Show the uri and the type 
-	of service that	has just been registered.
-	
-	* shell/e-shell-view.c (get_view): 
-	once we have the bonobo control widget, 
-	disable the autoactivation and activate
-	the control frame.
-	(get_view): added a parameter to have
-	a reference to the EShellView.
-	(get_view): In the case of the mail component
-	use the Evolution_ServiceRepository to 
-	give the component a reference to the 
-	Shell server.
-
-2000-03-12  bertrand  <bertrand@helixcode.com>
-
-	* shell/e-shell-view.c (get_view): name change
-	
-
-	* shell/e-folder.c (e_folder_get_folder_type): added the
-	get_e_folder_type function.
-
-	* shell/evolution-service-repository.c:
-	(evolution_service_repository_new): creates an 
-	Evolution_ServiceRepository object.
-	(create_evolution_service_repository): 
-	create the corresponding servant.
-	(evolution_service_repository_construct): set 
-	the closure as well as the virtual functions. 
-
-2000-03-12  bertrand  <bertrand@helixcode.com>
-
-	* shell/evolution-service-repository.c: 
-	* shell/evolution-service-repository.h: 
-	Implementation of the service repository interface
-	as a bonobo object.
-
-	* shell/evolution-service-repository.idl: 
-	new file. Contains the definition for the service
-	repository interface.
-
-	* shell/Shell.idl: move the shell related stuff 
-	here
-	
-2000-03-12  bertrand  <bertrand@helixcode.com>
-
-	* shell/e-folder.h: add a field refering to a
-	service associated to the efolder. In the case of 
-	distant folders, it is generally a server.  
-
-	* shell/e-service.c: New class. Models a service.
-	A service is an object with an URI and a root folder. 
-	It genreally reporesents a distant folder. 
-	A service is generally a ressource shared amongst
-	several folders. 
-	* shell/e-service.h: 
-
-2000-03-07  bertrand  <bertrand@helixcode.com>
-
-	* shell/e-shell-shortcut.c (shortcut_bar_item_selected): 
-	removed a test that prevented the standard menu 
-	to be shown.
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* shell/Makefile.am (INCLUDES): use `top_srcdir' instead of
-	`srcdir'.  Also, add `$(top_srcdir)'.  And put the srcdir includes
-	before everything else.
-	(evolution_LDADD): `libeutil.la', not `libeutil.a'.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* shell/Makefile.am (evolution_LDADD): 
-	add libetext.a.
-
-2000-02-08  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* shell/Makefile.am: Changed the order of the compilation, so the CORBA
-	stuff was generated before it was needed.
-
-2000-01-15  Miguel de Icaza  <miguel@gnu.org>
-
-	* shell/e-shell.c: Construct the default folders 
-
-	* shell/e-shell-view.c (e_shell_view_new): Setup the main GnomeApp
-	application, load the shortcut, internal api. 
-
-	* shell/e-folder.c (e_folder_get_type_name): Return description
-	here;  Change of policy;  We now know about all of the possible
-	types that can be displayed on Evolution. 
-
-2000-01-15  Miguel de Icaza <miguel@gnu.org>
-
-	* shell/e-folder.c: Renamed signal.
-
-	* widgets/shortcut-bar/e-shortcut-bar.c (e_shortcut_bar_add_item):
-	Use e_bar_set_item_data.
-
-	Drop item_url;  Require image argument;  Require user data
-	argument. 
-
-2000-01-05  Miguel de Icaza  <miguel@gnu.org>
-
-	* shell/Makefile.am: New file.
-
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 1241dd41d3..567059e0f1 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -119,9 +119,7 @@ evolution_CPPFLAGS =						\
 	$(SHELL_CFLAGS)
 
 evolution_SOURCES =				\
-	e-config-upgrade.c			\
-	e-config-upgrade.h			\
-	main.c					
+	main.c
 
 evolution_LDADD =							\
 	libeshell.la							\
@@ -198,7 +196,6 @@ endif
 EXTRA_DIST = 					\
 	shell.error.xml				\
 	$(schema_in_files)			\
-	ChangeLog.pre-1-4			\
 	evolution-nognome.in			\
 	evolution-icon.rc			\
 	evolution.ico				\
diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c
deleted file mode 100644
index a933972b9b..0000000000
--- a/shell/e-config-upgrade.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * e-upgrade.c - upgrade previous config versions
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Michael Zucchi <notzed@ximian.com>
- *	    Jeffery Stedfast <fejj@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include <glib.h>
-
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-
-#include <libedataserver/e-xml-utils.h>
-
-#include "e-util/e-bconf-map.h"
-
-#include "e-config-upgrade.h"
-
-/* ********************************************************************** */
-/*  Tables for bonobo conf -> gconf conversion				  */
-/* ********************************************************************** */
-
-/* ********************************************************************** */
-
-static e_gconf_map_t importer_elm_map[] = {
-	/* /Importer/Elm */
-	{ "mail", "importer/elm/mail", E_GCONF_MAP_BOOL },
-	{ "mail-imported", "importer/elm/mail-imported", E_GCONF_MAP_BOOL },
-	{ NULL },
-};
-
-static e_gconf_map_t importer_pine_map[] = {
-	/* /Importer/Pine */
-	{ "mail", "importer/elm/mail", E_GCONF_MAP_BOOL },
-	{ "address", "importer/elm/address", E_GCONF_MAP_BOOL },
-	{ NULL },
-};
-
-static e_gconf_map_t importer_netscape_map[] = {
-	/* /Importer/Netscape */
-	{ "mail", "importer/netscape/mail", E_GCONF_MAP_BOOL },
-	{ "settings", "importer/netscape/settings", E_GCONF_MAP_BOOL },
-	{ "filters", "importer/netscape/filters", E_GCONF_MAP_BOOL },
-	{ NULL },
-};
-
-/* ********************************************************************** */
-
-/* This grabs the defaults from the first view ... (?) */
-static e_gconf_map_t shell_views_map[] = {
-	/* /Shell/Views/0 */
-	{ "Width", "shell/view_defaults/width", E_GCONF_MAP_INT },
-	{ "Height", "shell/view_defaults/height", E_GCONF_MAP_INT },
-	{ "ViewPanedPosition", "shell/view_defaults/folder_bar/width", E_GCONF_MAP_INT },
-	{ NULL },
-};
-
-static e_gconf_map_t offlinefolders_map[] = {
-	/* /OfflineFolders */
-	{ "paths", "shell/offline/folder_paths", E_GCONF_MAP_ANYLIST },
-	{ NULL },
-};
-
-static e_gconf_map_t shell_map[] = {
-	/* /Shell */
-	{ "StartOffline", "shell/start_offline", E_GCONF_MAP_BOOL },
-	{ NULL },
-};
-
-/* ********************************************************************** */
-
-static e_gconf_map_t addressbook_map[] = {
-	/* /Addressbook */
-	{ "select_names_uri", "addressbook/select_names/last_used_uri", E_GCONF_MAP_STRING },
-	{ NULL },
-};
-
-static e_gconf_map_t addressbook_completion_map[] = {
-	/* /Addressbook/Completion */
-	{ "uris", "addressbook/completion/uris", E_GCONF_MAP_STRING },
-	{ NULL },
-};
-
-/* ********************************************************************** */
-
-static e_gconf_map_t general_map[] = {
-	/* /General */
-	{ "CategoryMasterList", "general/category_master_list", E_GCONF_MAP_STRING }
-};
-
-/* ********************************************************************** */
-
-static e_gconf_map_list_t remap_list[] = {
-	{ "/Importer/Elm", importer_elm_map },
-	{ "/Importer/Pine", importer_pine_map },
-	{ "/Importer/Netscape", importer_netscape_map },
-
-	{ "/Shell", shell_map },
-	{ "/Shell/Views/0", shell_views_map },
-	{ "/OfflineFolders", offlinefolders_map },
-
-	{ "/Addressbook", addressbook_map },
-	{ "/Addressbook/Completion", addressbook_completion_map },
-
-	{ "/General", general_map },
-
-	{ NULL },
-};
-
-gint
-e_config_upgrade(gint major, gint minor, gint revision)
-{
-	xmlDocPtr config_doc;
-	gchar *conf_file;
-	gint res = 0;
-
-	conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL);
-	config_doc = e_xml_parse_file (conf_file);
-	g_free (conf_file);
-
-	if (config_doc && major <=1 && minor < 3) {
-		GConfClient *gconf;
-
-		/* move bonobo config to gconf */
-		gconf = gconf_client_get_default ();
-
-		res = e_bconf_import (gconf, config_doc, remap_list);
-		if (res != 0)
-			g_warning("Could not move config from bonobo-conf to gconf");
-
-		g_object_unref (gconf);
-
-		xmlFreeDoc(config_doc);
-	}
-
-	return res;
-}
diff --git a/shell/e-config-upgrade.h b/shell/e-config-upgrade.h
deleted file mode 100644
index 36901109d7..0000000000
--- a/shell/e-config-upgrade.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef _E_CONFIG_UPGRADE_H
-#define _E_CONFIG_UPGRADE_H
-
-gint e_config_upgrade (gint major, gint minor, gint revision);
-
-#endif /* _E_CONFIG_UPGRADE_H */
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index 5d5857cfc2..fba96d7477 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -201,7 +201,7 @@ shell_content_size_allocate (GtkWidget *widget,
 
 	priv = E_SHELL_CONTENT_GET_PRIVATE (widget);
 
-	widget->allocation = *allocation;
+	gtk_widget_set_allocation (widget, allocation);
 
 	child = priv->searchbar;
 
@@ -254,11 +254,13 @@ shell_content_forall (GtkContainer *container,
                       gpointer callback_data)
 {
 	EShellContentPrivate *priv;
+	GtkWidget *parent;
 
 	priv = E_SHELL_CONTENT_GET_PRIVATE (container);
+	parent = gtk_widget_get_parent (priv->searchbar);
 
 	if (include_internals && priv->searchbar != NULL &&
-		container == GTK_CONTAINER (priv->searchbar->parent))
+		container == GTK_CONTAINER (parent))
 		callback (priv->searchbar, callback_data);
 
 	/* Chain up to parent's forall() method. */
@@ -311,7 +313,7 @@ e_shell_content_init (EShellContent *shell_content)
 {
 	shell_content->priv = E_SHELL_CONTENT_GET_PRIVATE (shell_content);
 
-	GTK_WIDGET_SET_FLAGS (shell_content, GTK_NO_WINDOW);
+	gtk_widget_set_has_window (GTK_WIDGET (shell_content), FALSE);
 }
 
 /**
@@ -409,6 +411,7 @@ e_shell_content_run_advanced_search_dialog (EShellContent *shell_content)
 {
 	EShellView *shell_view;
 	EShellWindow *shell_window;
+	GtkWidget *content_area;
 	GtkWidget *dialog;
 	GtkWidget *widget;
 	EFilterRule *rule;
@@ -445,8 +448,8 @@ e_shell_content_run_advanced_search_dialog (EShellContent *shell_content)
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 3);
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 300);
 
-	gtk_box_pack_start (
-		GTK_BOX (GTK_DIALOG (dialog)->vbox), widget, TRUE, TRUE, 0);
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0);
 
 	g_signal_connect_swapped (
 		rule, "changed", G_CALLBACK (
@@ -510,6 +513,7 @@ e_shell_content_run_save_search_dialog (EShellContent *shell_content)
 {
 	EShellView *shell_view;
 	EShellWindow *shell_window;
+	GtkWidget *content_area;
 	GtkWidget *dialog;
 	GtkWidget *widget;
 	EFilterRule *rule;
@@ -547,8 +551,8 @@ e_shell_content_run_save_search_dialog (EShellContent *shell_content)
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 3);
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 300);
 
-	gtk_box_pack_start (
-		GTK_BOX (GTK_DIALOG (dialog)->vbox), widget, TRUE, TRUE, 0);
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0);
 
 	g_signal_connect_swapped (
 		rule, "changed", G_CALLBACK (
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index dd5ad07b24..d26c9a83d1 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -27,7 +27,6 @@
 #include <glib/gstdio.h>
 #include <libedataserver/e-xml-utils.h>
 
-#include "e-util/e-bconf-map.h"
 #include "e-util/e-alert-dialog.h"
 #include "e-util/e-file-utils.h"
 #include "e-util/e-util.h"
@@ -37,29 +36,36 @@
 #define GCONF_VERSION_KEY	"/apps/evolution/version"
 #define GCONF_LAST_VERSION_KEY	"/apps/evolution/last_version"
 
-static const gchar *
-shell_migrate_get_old_data_dir (void)
-{
-	static gchar *old_data_dir = NULL;
-
-	if (G_UNLIKELY (old_data_dir == NULL))
-		old_data_dir = g_build_filename (
-			g_get_home_dir (), "evolution", NULL);
-
-	return old_data_dir;
-}
-
 static gboolean
 shell_migrate_attempt (EShell *shell,
                        gint major,
                        gint minor,
                        gint micro)
 {
+	GtkWindow *parent;
 	GList *backends;
 	gboolean success = TRUE;
 
+	parent = e_shell_get_active_window (shell);
 	backends = e_shell_get_shell_backends (shell);
 
+	/* We only support migrating from version 2 now. */
+	if (major < 2) {
+		gchar *version;
+		gint response;
+
+		version = g_strdup_printf ("%d.%d", major, minor);
+		response = e_alert_run_dialog_for_args (
+			parent, "shell:upgrade-version-too-old",
+			version, NULL);
+		g_free (version);
+
+		return (response == GTK_RESPONSE_OK);
+	}
+
+	/* Ask each of the shell backends to migrate their own data.
+	 * XXX If something fails the user may end up with only partially
+	 *     migrated data.  Need transaction semantics here, but how? */
 	while (success && backends != NULL) {
 		EShellBackend *shell_backend = backends->data;
 		GError *error = NULL;
@@ -71,11 +77,10 @@ shell_migrate_attempt (EShell *shell,
 			gint response;
 
 			response = e_alert_run_dialog_for_args (
-				e_shell_get_active_window (shell), "shell:upgrade-failed",
+				parent, "shell:upgrade-failed",
 				error->message, NULL);
 
-			if (response == GTK_RESPONSE_CANCEL)
-				success = FALSE;
+			success = (response == GTK_RESPONSE_OK);
 
 			g_error_free (error);
 		}
@@ -94,11 +99,8 @@ shell_migrate_get_version (EShell *shell,
 {
 	GConfClient *client;
 	const gchar *key;
-	const gchar *old_data_dir;
 	gchar *string;
 
-	old_data_dir = shell_migrate_get_old_data_dir ();
-
 	key = GCONF_VERSION_KEY;
 	client = e_shell_get_gconf_client (shell);
 	string = gconf_client_get_string (client, key, NULL);
@@ -108,90 +110,12 @@ shell_migrate_get_version (EShell *shell,
 		sscanf (string, "%d.%d.%d", major, minor, micro);
 		g_free (string);
 
-	} else if (!g_file_test (old_data_dir, G_FILE_TEST_IS_DIR)) {
-		/* If the old data directory does not exist,
-		 * it must be a new installation. */
+	} else {
+		/* Otherwise, assume it's a new installation. */
 		*major = 0;
 		*minor = 0;
 		*micro = 0;
-
-	} else {
-		xmlDocPtr doc;
-		xmlNodePtr source;
-		gchar *filename;
-
-		filename = g_build_filename (
-			old_data_dir, "config.xmldb", NULL);
-		doc = e_xml_parse_file (filename);
-		g_free (filename);
-
-		if (doc == NULL)
-			return;
-
-		source = e_bconf_get_path (doc, "/Shell");
-		if (source != NULL) {
-			key = "upgrade_from_1_0_to_1_2_performed";
-			string = e_bconf_get_value (source, key);
-		}
-
-		if (string != NULL && *string == '1') {
-			*major = 1;
-			*minor = 2;
-			*micro = 0;
-		} else {
-			*major = 1;
-			*minor = 0;
-			*micro = 0;
-		}
-
-		g_free (string);
-
-		if (doc != NULL)
-			xmlFreeDoc (doc);
-	}
-}
-
-static gint
-shell_migrate_remove_dir (const gchar *root,
-                          const gchar *path)
-{
-	GDir *dir;
-	const gchar *basename;
-	gchar *filename = NULL;
-	gint result = -1;
-
-	/* Recursively removes a directory and its contents. */
-
-	dir = g_dir_open (path, 0, NULL);
-	if (dir == NULL)
-		return -1;
-
-	while ((basename = g_dir_read_name (dir)) != NULL) {
-		filename = g_build_filename (path, basename, NULL);
-
-		/* Make sure we haven't strayed from the evolution dir. */
-		g_return_val_if_fail (strlen (path) >= strlen (root), -1);
-		g_return_val_if_fail (g_str_has_prefix (path, root), -1);
-
-		if (g_file_test (filename, G_FILE_TEST_IS_DIR)) {
-			if (shell_migrate_remove_dir (root, filename) < 0)
-				goto fail;
-		} else {
-			if (g_unlink (filename) < 0)
-				goto fail;
-		}
-
-		g_free (filename);
-		filename = NULL;
 	}
-
-	result = g_rmdir (path);
-
-fail:
-	g_free (filename);
-	g_dir_close (dir);
-
-	return result;
 }
 
 static void
@@ -241,7 +165,6 @@ e_shell_migrate_attempt (EShell *shell)
 	ESEvent *ese;
 	GConfClient *client;
 	const gchar *key;
-	const gchar *old_data_dir;
 	gint major, minor, micro;
 	gint last_major, last_minor, last_micro;
 	gint curr_major, curr_minor, curr_micro;
@@ -251,7 +174,6 @@ e_shell_migrate_attempt (EShell *shell)
 	g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
 
 	client = e_shell_get_gconf_client (shell);
-	old_data_dir = shell_migrate_get_old_data_dir ();
 
 	if (sscanf (BASE_VERSION, "%d.%d", &curr_major, &curr_minor) != 2) {
 		g_warning ("Could not parse BASE_VERSION (%s)", BASE_VERSION);
@@ -271,38 +193,12 @@ e_shell_migrate_attempt (EShell *shell)
 		(curr_major == major && curr_minor == minor && curr_micro > micro)))
 		goto check_old;
 
-	/* If upgrading from < 1.5, we need to copy most data from
-	 * ~/evolution to ~/.evolution.  Make sure we have the disk
-	 * space for it before proceeding. */
-	if (major == 1 && minor < 5) {
-		glong avail;
-		glong usage;
-
-		usage = e_fsutils_usage (old_data_dir);
-		avail = e_fsutils_avail (g_get_home_dir ());
-		if (usage >= 0 && avail >= 0 && avail < usage) {
-			gchar *need;
-			gchar *have;
-
-			need = g_strdup_printf (_("%ld KB"), usage);
-			have = g_strdup_printf (_("%ld KB"), avail);
-
-			e_alert_run_dialog_for_args (
-				e_shell_get_active_window (shell), "shell:upgrade-nospace",
-				need, have, NULL);
-
-			g_free (need);
-			g_free (have);
-
-			_exit (EXIT_SUCCESS);
-		}
-	}
-
 	if (!shell_migrate_attempt (shell, major, minor, micro))
 		_exit (EXIT_SUCCESS);
 
 	/* Record a successful migration. */
-	string = g_strdup_printf ("%d.%d.%d", curr_major, curr_minor, curr_micro);
+	string = g_strdup_printf (
+		"%d.%d.%d", curr_major, curr_minor, curr_micro);
 	gconf_client_set_string (client, GCONF_VERSION_KEY, string, NULL);
 	g_free (string);
 
@@ -322,46 +218,6 @@ check_old:
 	}
 	g_free (string);
 
-	/* If the last migrated version was old, check for stuff to remove. */
-	if (last_major == 1 && last_minor < 5 &&
-		g_file_test (old_data_dir, G_FILE_TEST_IS_DIR)) {
-
-		gint response;
-
-		string = g_strdup_printf (
-			"%d.%d.%d", last_major, last_minor, last_micro);
-		response = e_alert_run_dialog_for_args (
-			e_shell_get_active_window (shell), "shell:upgrade-remove-1-4", string, NULL);
-		g_free (string);
-
-		switch (response) {
-			case GTK_RESPONSE_OK:  /* delete */
-				response = e_alert_run_dialog_for_args (
-					e_shell_get_active_window (shell),
-					"shell:upgrade-remove-1-4-confirm",
-					NULL);
-				if (response == GTK_RESPONSE_OK)
-					shell_migrate_remove_dir (
-						old_data_dir, old_data_dir);
-				else
-					break;
-				/* fall through */
-
-			case GTK_RESPONSE_ACCEPT:  /* keep */
-				last_major = curr_major;
-				last_minor = curr_minor;
-				last_micro = curr_micro;
-				break;
-
-			default:
-				break;
-		}
-	} else {
-		last_major = curr_major;
-		last_minor = curr_minor;
-		last_micro = curr_micro;
-	}
-
 	string = g_strdup_printf (
 		"%d.%d.%d", last_major, last_minor, last_micro);
 	gconf_client_set_string (client, key, string, NULL);
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index edb8ba5299..b5c3879c50 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -258,7 +258,7 @@ shell_sidebar_size_allocate (GtkWidget *widget,
 
 	priv = E_SHELL_SIDEBAR_GET_PRIVATE (widget);
 
-	widget->allocation = *allocation;
+	gtk_widget_set_allocation (widget, allocation);
 
 	child = priv->event_box;
 	gtk_widget_size_request (child, &child_requisition);
@@ -400,7 +400,7 @@ e_shell_sidebar_init (EShellSidebar *shell_sidebar)
 
 	shell_sidebar->priv = E_SHELL_SIDEBAR_GET_PRIVATE (shell_sidebar);
 
-	GTK_WIDGET_SET_FLAGS (shell_sidebar, GTK_NO_WINDOW);
+	gtk_widget_set_has_window (GTK_WIDGET (shell_sidebar), FALSE);
 
 	widget = gtk_event_box_new ();
 	style = gtk_widget_get_style (widget);
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index 474a22d22c..db788e20f3 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -71,7 +71,7 @@ G_DEFINE_TYPE_WITH_CODE (
 static gint
 shell_switcher_layout_actions (EShellSwitcher *switcher)
 {
-	GtkAllocation *allocation;
+	GtkAllocation allocation;
 	gint num_btns = g_list_length (switcher->priv->proxies), btns_per_row;
 	GList **rows, *p;
 	gboolean icons_only;
@@ -82,11 +82,12 @@ shell_switcher_layout_actions (EShellSwitcher *switcher)
 	gint x, y;
 	gint i;
 
-	allocation = &GTK_WIDGET (switcher)->allocation;
-	y = allocation->y + allocation->height;
+	gtk_widget_get_allocation (GTK_WIDGET (switcher), &allocation);
+
+	y = allocation.y + allocation.height;
 
 	if (num_btns == 0)
-		return allocation->height;
+		return allocation.height;
 
 	icons_only = (switcher->priv->style == GTK_TOOLBAR_ICONS);
 
@@ -101,7 +102,7 @@ shell_switcher_layout_actions (EShellSwitcher *switcher)
 	}
 
 	/* Figure out how many rows and columns we'll use. */
-	btns_per_row = MAX (1, allocation->width / (max_width + H_PADDING));
+	btns_per_row = MAX (1, allocation.width / (max_width + H_PADDING));
 	if (!icons_only) {
 		/* If using text buttons, we want to try to have a
 		 * completely filled-in grid, but if we can't, we want
@@ -138,12 +139,12 @@ shell_switcher_layout_actions (EShellSwitcher *switcher)
 	for (i = row_last; i >= 0; i--) {
 		gint len, extra_width;
 
-		x = H_PADDING + allocation->x;
+		x = H_PADDING + allocation.x;
 		y -= max_height;
 		len = g_list_length (rows[i]);
 		if (!icons_only)
 			extra_width =
-				(allocation->width - (len * max_width) -
+				(allocation.width - (len * max_width) -
 				(len * H_PADDING)) / len;
 		else
 			extra_width = 0;
@@ -167,7 +168,7 @@ shell_switcher_layout_actions (EShellSwitcher *switcher)
 		g_list_free (rows [i]);
 	g_free (rows);
 
-	return y - allocation->y;
+	return y - allocation.y;
 }
 
 static void
@@ -287,7 +288,7 @@ shell_switcher_size_allocate (GtkWidget *widget,
 
 	switcher = E_SHELL_SWITCHER (widget);
 
-	widget->allocation = *allocation;
+	gtk_widget_set_allocation (widget, allocation);
 
 	if (switcher->priv->toolbar_visible)
 		height = shell_switcher_layout_actions (switcher);
@@ -460,8 +461,8 @@ e_shell_switcher_class_init (EShellSwitcherClass *class)
 		PROP_TOOLBAR_STYLE,
 		g_param_spec_enum (
 			"toolbar-style",
-			_("Toolbar Style"),
-			_("The switcher's toolbar style"),
+			"Toolbar Style",
+			"The switcher's toolbar style",
 			GTK_TYPE_TOOLBAR_STYLE,
 			E_SHELL_SWITCHER_DEFAULT_TOOLBAR_STYLE,
 			G_PARAM_READWRITE |
@@ -477,8 +478,8 @@ e_shell_switcher_class_init (EShellSwitcherClass *class)
 		PROP_TOOLBAR_VISIBLE,
 		g_param_spec_boolean (
 			"toolbar-visible",
-			_("Toolbar Visible"),
-			_("Whether the switcher is visible"),
+			"Toolbar Visible",
+			"Whether the switcher is visible",
 			TRUE,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));
@@ -506,7 +507,7 @@ e_shell_switcher_init (EShellSwitcher *switcher)
 {
 	switcher->priv = E_SHELL_SWITCHER_GET_PRIVATE (switcher);
 
-	GTK_WIDGET_SET_FLAGS (switcher, GTK_NO_WINDOW);
+	gtk_widget_set_has_window (GTK_WIDGET (switcher), FALSE);
 
 	e_extensible_load_extensions (E_EXTENSIBLE (switcher));
 }
@@ -544,7 +545,7 @@ tool_item_get_button (GtkWidget *widget)
 
 	g_return_val_if_fail (GTK_IS_TOOL_ITEM (widget), NULL);
 
-	child = GTK_BIN (widget)->child;
+	child = gtk_bin_get_child (GTK_BIN (widget));
 	if (child != NULL && GTK_IS_BUTTON (child))
 		return GTK_BUTTON (child);
 	else
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index bf8dfa7e2a..43865470de 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -64,20 +64,26 @@ static void
 shell_taskbar_activity_remove (EShellTaskbar *shell_taskbar,
                                EActivity *activity)
 {
-	GtkBox *box;
 	GtkWidget *proxy;
+	GtkContainer *container;
 	GHashTable *proxy_table;
+	GList *children;
 
-	box = GTK_BOX (shell_taskbar->priv->hbox);
 	proxy_table = shell_taskbar->priv->proxy_table;
 	proxy = g_hash_table_lookup (proxy_table, activity);
 	g_return_if_fail (proxy != NULL);
 
 	g_hash_table_remove (proxy_table, activity);
-	gtk_container_remove (GTK_CONTAINER (box), proxy);
 
-	if (box->children == NULL)
-		gtk_widget_hide (GTK_WIDGET (box));
+	container = GTK_CONTAINER (shell_taskbar->priv->hbox);
+	gtk_container_remove (container, proxy);
+
+	children = gtk_container_get_children (container);
+
+	if (children == NULL)
+		gtk_widget_hide (GTK_WIDGET (container));
+
+	g_list_free (children);
 }
 
 static void
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 5c19380da3..5d1c44ecc8 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -804,8 +804,8 @@ shell_view_class_init (EShellViewClass *class)
 		PROP_ACTION,
 		g_param_spec_object (
 			"action",
-			_("Switcher Action"),
-			_("The switcher action for this shell view"),
+			"Switcher Action",
+			"The switcher action for this shell view",
 			GTK_TYPE_RADIO_ACTION,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY));
@@ -820,8 +820,8 @@ shell_view_class_init (EShellViewClass *class)
 		PROP_PAGE_NUM,
 		g_param_spec_int (
 			"page-num",
-			_("Page Number"),
-			_("The notebook page number of the shell view"),
+			"Page Number",
+			"The notebook page number of the shell view",
 			-1,
 			G_MAXINT,
 			-1,
@@ -837,8 +837,8 @@ shell_view_class_init (EShellViewClass *class)
 		PROP_SEARCH_RULE,
 		g_param_spec_object (
 			"search-rule",
-			_("Search Rule"),
-			_("Criteria for the current search results"),
+			"Search Rule",
+			"Criteria for the current search results",
 			E_TYPE_FILTER_RULE,
 			G_PARAM_READWRITE));
 
@@ -852,8 +852,8 @@ shell_view_class_init (EShellViewClass *class)
 		PROP_SHELL_BACKEND,
 		g_param_spec_object (
 			"shell-backend",
-			_("Shell Backend"),
-			_("The EShellBackend for this shell view"),
+			"Shell Backend",
+			"The EShellBackend for this shell view",
 			E_TYPE_SHELL_BACKEND,
 			G_PARAM_READABLE));
 
@@ -868,9 +868,9 @@ shell_view_class_init (EShellViewClass *class)
 		PROP_SHELL_CONTENT,
 		g_param_spec_object (
 			"shell-content",
-			_("Shell Content Widget"),
-			_("The content widget appears in "
-			  "a shell window's right pane"),
+			"Shell Content Widget",
+			"The content widget appears in "
+			  "a shell window's right pane",
 			E_TYPE_SHELL_CONTENT,
 			G_PARAM_READABLE));
 
@@ -885,9 +885,9 @@ shell_view_class_init (EShellViewClass *class)
 		PROP_SHELL_SIDEBAR,
 		g_param_spec_object (
 			"shell-sidebar",
-			_("Shell Sidebar Widget"),
-			_("The sidebar widget appears in "
-			  "a shell window's left pane"),
+			"Shell Sidebar Widget",
+			"The sidebar widget appears in "
+			  "a shell window's left pane",
 			E_TYPE_SHELL_SIDEBAR,
 			G_PARAM_READABLE));
 
@@ -901,9 +901,9 @@ shell_view_class_init (EShellViewClass *class)
 		PROP_SHELL_TASKBAR,
 		g_param_spec_object (
 			"shell-taskbar",
-			_("Shell Taskbar Widget"),
-			_("The taskbar widget appears at "
-			  "the bottom of a shell window"),
+			"Shell Taskbar Widget",
+			"The taskbar widget appears at "
+			  "the bottom of a shell window",
 			E_TYPE_SHELL_TASKBAR,
 			G_PARAM_READABLE));
 
@@ -917,8 +917,8 @@ shell_view_class_init (EShellViewClass *class)
 		PROP_SHELL_WINDOW,
 		g_param_spec_object (
 			"shell-window",
-			_("Shell Window"),
-			_("The window to which the shell view belongs"),
+			"Shell Window",
+			"The window to which the shell view belongs",
 			E_TYPE_SHELL_WINDOW,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY));
@@ -934,7 +934,7 @@ shell_view_class_init (EShellViewClass *class)
 		g_param_spec_pointer (
 			"state-key-file",
 			"State Key File",
-			_("The key file holding widget state data"),
+			"The key file holding widget state data",
 			G_PARAM_READABLE));
 
 	/**
@@ -948,8 +948,8 @@ shell_view_class_init (EShellViewClass *class)
 		PROP_TITLE,
 		g_param_spec_string (
 			"title",
-			_("Title"),
-			_("The title of the shell view"),
+			"Title",
+			"The title of the shell view",
 			NULL,
 			G_PARAM_READWRITE));
 
@@ -963,8 +963,8 @@ shell_view_class_init (EShellViewClass *class)
 		PROP_VIEW_ID,
 		g_param_spec_string (
 			"view-id",
-			_("Current View ID"),
-			_("The current GAL view ID"),
+			"Current View ID",
+			"The current GAL view ID",
 			NULL,
 			G_PARAM_READWRITE));
 
@@ -1746,8 +1746,10 @@ e_shell_view_unblock_update_actions (EShellView *shell_view)
 	g_return_if_fail (shell_view->priv->update_actions_blocked > 0);
 
 	shell_view->priv->update_actions_blocked--;
+
 	if (!shell_view->priv->update_actions_blocked &&
 		shell_view->priv->update_actions_called) {
+
 		shell_view->priv->update_actions_called = FALSE;
 		e_shell_view_update_actions (shell_view);
 	}
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 16b39928ff..606f125f33 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -674,12 +674,16 @@ static void
 action_close_cb (GtkAction *action,
                  EShellWindow *shell_window)
 {
-	GtkWidget *widget = GTK_WIDGET (shell_window);
+	GtkWidget *widget;
+	GdkWindow *window;
 	GdkEvent *event;
 
+	widget = GTK_WIDGET (shell_window);
+	window = gtk_widget_get_window (widget);
+
 	/* Synthesize a delete_event on this window. */
 	event = gdk_event_new (GDK_DELETE);
-	event->any.window = g_object_ref (widget->window);
+	event->any.window = g_object_ref (window);
 	event->any.send_event = TRUE;
 	gtk_main_do_event (event);
 	gdk_event_free (event);
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 413f799949..9838f9c730 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -693,8 +693,8 @@ e_shell_window_class_init (EShellWindowClass *class)
 		PROP_ACTIVE_VIEW,
 		g_param_spec_string (
 			"active-view",
-			_("Active Shell View"),
-			_("Name of the active shell view"),
+			"Active Shell View",
+			"Name of the active shell view",
 			NULL,
 			G_PARAM_READWRITE));
 
@@ -708,8 +708,8 @@ e_shell_window_class_init (EShellWindowClass *class)
 		PROP_FOCUS_TRACKER,
 		g_param_spec_object (
 			"focus-tracker",
-			_("Focus Tracker"),
-			_("The shell window's EFocusTracker"),
+			"Focus Tracker",
+			"The shell window's EFocusTracker",
 			E_TYPE_FOCUS_TRACKER,
 			G_PARAM_READABLE));
 
@@ -723,8 +723,8 @@ e_shell_window_class_init (EShellWindowClass *class)
 		PROP_GEOMETRY,
 		g_param_spec_string (
 			"geometry",
-			_("Geometry"),
-			_("Initial window geometry string"),
+			"Geometry",
+			"Initial window geometry string",
 			NULL,
 			G_PARAM_WRITABLE |
 			G_PARAM_CONSTRUCT_ONLY));
@@ -739,8 +739,8 @@ e_shell_window_class_init (EShellWindowClass *class)
 		PROP_SAFE_MODE,
 		g_param_spec_boolean (
 			"safe-mode",
-			_("Safe Mode"),
-			_("Whether the shell window is in safe mode"),
+			"Safe Mode",
+			"Whether the shell window is in safe mode",
 			FALSE,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));
@@ -755,8 +755,8 @@ e_shell_window_class_init (EShellWindowClass *class)
 		PROP_SHELL,
 		g_param_spec_object (
 			"shell",
-			_("Shell"),
-			_("The EShell singleton"),
+			"Shell",
+			"The EShell singleton",
 			E_TYPE_SHELL,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY));
@@ -771,8 +771,8 @@ e_shell_window_class_init (EShellWindowClass *class)
 		PROP_SIDEBAR_VISIBLE,
 		g_param_spec_boolean (
 			"sidebar-visible",
-			_("Sidebar Visible"),
-			_("Whether the shell window's side bar is visible"),
+			"Sidebar Visible",
+			"Whether the shell window's side bar is visible",
 			TRUE,
 			G_PARAM_READWRITE));
 
@@ -786,9 +786,9 @@ e_shell_window_class_init (EShellWindowClass *class)
 		PROP_SWITCHER_VISIBLE,
 		g_param_spec_boolean (
 			"switcher-visible",
-			_("Switcher Visible"),
-			_("Whether the shell window's "
-			  "switcher buttons are visible"),
+			"Switcher Visible",
+			"Whether the shell window's "
+			  "switcher buttons are visible",
 			TRUE,
 			G_PARAM_READWRITE));
 
@@ -802,8 +802,8 @@ e_shell_window_class_init (EShellWindowClass *class)
 		PROP_TASKBAR_VISIBLE,
 		g_param_spec_boolean (
 			"taskbar-visible",
-			_("Taskbar Visible"),
-			_("Whether the shell window's task bar is visible"),
+			"Taskbar Visible",
+			"Whether the shell window's task bar is visible",
 			TRUE,
 			G_PARAM_READWRITE));
 
@@ -817,8 +817,8 @@ e_shell_window_class_init (EShellWindowClass *class)
 		PROP_TOOLBAR_VISIBLE,
 		g_param_spec_boolean (
 			"toolbar-visible",
-			_("Toolbar Visible"),
-			_("Whether the shell window's tool bar is visible"),
+			"Toolbar Visible",
+			"Whether the shell window's tool bar is visible",
 			TRUE,
 			G_PARAM_READWRITE));
 
@@ -832,8 +832,8 @@ e_shell_window_class_init (EShellWindowClass *class)
 		PROP_UI_MANAGER,
 		g_param_spec_object (
 			"ui-manager",
-			_("UI Manager"),
-			_("The shell window's GtkUIManager"),
+			"UI Manager",
+			"The shell window's GtkUIManager",
 			GTK_TYPE_UI_MANAGER,
 			G_PARAM_READABLE));
 
diff --git a/shell/e-shell.c b/shell/e-shell.c
index e41d836730..60bbe30526 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -880,8 +880,8 @@ e_shell_class_init (EShellClass *class)
 		PROP_GEOMETRY,
 		g_param_spec_string (
 			"geometry",
-			_("Geometry"),
-			_("Initial window geometry string"),
+			"Geometry",
+			"Initial window geometry string",
 			NULL,
 			G_PARAM_WRITABLE |
 			G_PARAM_CONSTRUCT_ONLY));
@@ -896,8 +896,8 @@ e_shell_class_init (EShellClass *class)
 		PROP_MODULE_DIRECTORY,
 		g_param_spec_string (
 			"module-directory",
-			_("Module Directory"),
-			_("The directory from which to load EModules"),
+			"Module Directory",
+			"The directory from which to load EModules",
 			NULL,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY));
@@ -912,8 +912,8 @@ e_shell_class_init (EShellClass *class)
 		PROP_NETWORK_AVAILABLE,
 		g_param_spec_boolean (
 			"network-available",
-			_("Network Available"),
-			_("Whether the network is available"),
+			"Network Available",
+			"Whether the network is available",
 			TRUE,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));
@@ -928,8 +928,8 @@ e_shell_class_init (EShellClass *class)
 		PROP_ONLINE,
 		g_param_spec_boolean (
 			"online",
-			_("Online"),
-			_("Whether the shell is online"),
+			"Online",
+			"Whether the shell is online",
 			FALSE,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));
@@ -944,8 +944,8 @@ e_shell_class_init (EShellClass *class)
 		PROP_SHELL_SETTINGS,
 		g_param_spec_object (
 			"shell-settings",
-			_("Shell Settings"),
-			_("Application-wide settings"),
+			"Shell Settings",
+			"Application-wide settings",
 			E_TYPE_SHELL_SETTINGS,
 			G_PARAM_READABLE));
 
diff --git a/shell/main.c b/shell/main.c
index c41071a349..4824cfcf8c 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -50,10 +50,8 @@
 #include "e-shell.h"
 #include "e-shell-migrate.h"
 #include "e-shell-meego.h"
-#include "e-config-upgrade.h"
 #include "es-event.h"
 
-#include "e-util/e-bconf-map.h"
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-import.h"
 #include "e-util/e-plugin.h"
@@ -91,9 +89,6 @@ static gboolean start_online = FALSE;
 static gboolean start_offline = FALSE;
 static gboolean setup_only = FALSE;
 static gboolean force_shutdown = FALSE;
-#ifdef DEVELOPMENT
-static gboolean force_migrate = FALSE;
-#endif
 static gboolean disable_eplugin = FALSE;
 static gboolean disable_preview = FALSE;
 static gboolean import_uris = FALSE;
@@ -141,6 +136,8 @@ categories_icon_theme_hack (void)
 static gboolean
 show_development_warning(void)
 {
+	GtkWidget *action_area;
+	GtkWidget *content_area;
 	GtkWidget *vbox;
 	GtkWidget *label;
 	GtkWidget *warning_dialog;
@@ -160,16 +157,15 @@ show_development_warning(void)
 	gtk_dialog_set_has_separator (
 		GTK_DIALOG (warning_dialog), FALSE);
 
-	gtk_container_set_border_width (
-		GTK_CONTAINER (GTK_DIALOG (warning_dialog)->vbox), 0);
-	gtk_container_set_border_width (
-		GTK_CONTAINER (GTK_DIALOG (warning_dialog)->action_area), 12);
+	action_area = gtk_dialog_get_action_area (GTK_DIALOG (warning_dialog));
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (warning_dialog));
+
+	gtk_container_set_border_width (GTK_CONTAINER (action_area), 12);
+	gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
 
 	vbox = gtk_vbox_new (FALSE, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-	gtk_box_pack_start (
-		GTK_BOX (GTK_DIALOG (warning_dialog)->vbox),
-		vbox, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
 
 	text = g_strdup_printf(
 		/* xgettext:no-c-format */
@@ -223,21 +219,6 @@ show_development_warning(void)
 	return skip;
 }
 
-static void
-destroy_config (GConfClient *client)
-{
-	/* Unset the source stuff */
-	gconf_client_unset (client, "/apps/evolution/calendar/sources", NULL);
-	gconf_client_unset (client, "/apps/evolution/tasks/sources", NULL);
-	gconf_client_unset (client, "/apps/evolution/addressbook/sources", NULL);
-
-	/* Reset the version */
-	gconf_client_set_string (client, "/apps/evolution/version", "1.4.0", NULL);
-
-	/* Clear the dir */
-	system ("rm -Rf ~/.evolution");
-}
-
 #endif /* DEVELOPMENT */
 
 /* This is for doing stuff that requires the GTK+ loop to be running already.  */
@@ -279,18 +260,16 @@ idle_cb (gchar **uris)
 
 static void (*gnome_segv_handler) (gint);
 static GStaticMutex segv_mutex = G_STATIC_MUTEX_INIT;
-static pthread_t main_thread;
+static GThread *main_thread = NULL;
 
 static void
 segv_redirect (gint sig)
 {
-	if (pthread_self () == main_thread)
-		gnome_segv_handler (sig);
-	else {
-		pthread_kill (main_thread, sig);
+	gnome_segv_handler (sig);
 
+	if (g_thread_self () != main_thread) {
 		/* We can't return from the signal handler or the thread may
-		   SEGV again. But we can't pthread_exit, because then the
+		   SEGV again. But we can't g_thread_exit, because then the
 		   thread may get cleaned up before bug-buddy can get a stack
 		   trace. So we block by trying to lock a mutex we know is
 		   already locked.  */
@@ -307,7 +286,7 @@ setup_segv_redirect (void)
 	if (osa.sa_handler == SIG_DFL)
 		return;
 
-	main_thread = pthread_self ();
+	main_thread = g_thread_self ();
 
 	sa.sa_flags = 0;
 	sigemptyset (&sa.sa_mask);
@@ -349,10 +328,6 @@ static GOptionEntry entries[] = {
 	{ "force-shutdown", '\0', 0, G_OPTION_ARG_NONE, &force_shutdown,
 	  N_("Forcibly shut down Evolution"), NULL },
 #endif
-#ifdef 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."), "FILE" },
 	{ "disable-eplugin", '\0', 0, G_OPTION_ARG_NONE, &disable_eplugin,
@@ -507,9 +482,10 @@ main (gint argc, gchar **argv)
 		g_warning ("Could not set PATH for Evolution and its child processes");
 
 	g_free (path);
-
+	
 	_e_win32_register_mailer ();
-
+	_e_win32_register_addressbook ();
+	
 	if (reinstall) {
 		_e_win32_set_default_mailer ();
 		exit (0);
@@ -548,11 +524,6 @@ main (gint argc, gchar **argv)
 
 	client = gconf_client_get_default ();
 
-#ifdef DEVELOPMENT
-	if (force_migrate)
-		destroy_config (client);
-#endif
-
 	if (disable_preview) {
 		const gchar *key;
 
@@ -630,6 +601,9 @@ main (gint argc, gchar **argv)
 	 * as both shell backends and certain plugins hook into this. */
 	e_shell_migrate_attempt (shell);
 
+	/* This is an alternative to the "upgrade.done" EEvent. */
+	e_shell_event (shell, "ready-to-start", NULL);
+
 	g_idle_add ((GSourceFunc) idle_cb, remaining_args);
 
 	gtk_main ();
diff --git a/shell/shell.error.xml b/shell/shell.error.xml
index 3f3f0e2f86..6c75baa9df 100644
--- a/shell/shell.error.xml
+++ b/shell/shell.error.xml
@@ -7,45 +7,23 @@
     <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
  </error>
 
- <error id="upgrade-nospace" type="error">
-  <_primary>Insufficient disk space for upgrade.</_primary>
-  <_secondary xml:space="preserve">Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.
-
-You will need to make more space available in your home directory before you can continue.</_secondary>
-  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
- </error>
-
  <error id="upgrade-failed" type="error">
   <_primary>Upgrade from previous version failed:</_primary>
   <_secondary xml:space="preserve">{0}
 
 If you choose to continue, you may not have access to some of your old data.
 </_secondary>
-  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-ok" _label="Continue" response="GTK_RESPONSE_OK"/>
+  <button _label="Continue Anyway" response="GTK_RESPONSE_OK"/>
+  <button _label="Quit Now" response="GTK_RESPONSE_CANCEL"/>
  </error>
 
- <error id="upgrade-remove-1-4" type="question" default="GTK_RESPONSE_CANCEL">
-  <_primary>Delete old data from version {0}?</_primary>
-  <_secondary xml:space="preserve">The previous version of Evolution stored its data in a different location.
-
-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.
-</_secondary>
-  <button _label="_Remind Me Later" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Keep Data" response="GTK_RESPONSE_ACCEPT"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
- </error>
-
- <error id="upgrade-remove-1-4-confirm" type="warning" default="GTK_RESPONSE_CANCEL">
-  <_primary>Really delete old data?</_primary>
-  <_secondary xml:space="preserve">The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.
-
-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.
-
-Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.
-</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
+ <error id="upgrade-version-too-old" type="warning" default="GTK_RESPONSE_CANCEL">
+  <_primary>Cannot upgrade directly from version {0}</_primary>
+  <_secondary>Evolution no longer supports upgrading directly from
+  version {0}. However as a workaround you might try first upgrading
+  to Evolution 2, and then upgrading to Evolution 3.</_secondary>
+  <button _label="Continue Anyway" response="GTK_RESPONSE_OK"/>
+  <button _label="Quit Now" response="GTK_RESPONSE_CANCEL"/>
  </error>
 
  <error id="forget-passwords" type="question" default="GTK_RESPONSE_CANCEL">
diff --git a/smime/ChangeLog b/smime/ChangeLog
deleted file mode 100644
index 8310f3dbfb..0000000000
--- a/smime/ChangeLog
+++ /dev/null
@@ -1,896 +0,0 @@
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* gui/smime-ui.glade:
-	* gui/e-cert-selector.c:
-	Remove deprecated Gtk+ symbols.
-
-2009-04-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #539002
-
-	* gui/certificate-manager.c: (load_certs):
-	Show all other certificates in a contact tab.
-
-2009-04-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #529745
-
-	* gui/certificate-manager.c: (import_your), (import_contact):
-	Add more file types in a file filter.
-
-2009-02-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572975
-
-	* gui/smime-ui.glade: Center dialogs.
-	* gui/certificate-manager.c: (import_your), (import_contact),
-	(import_ca): Destroy file chooser dialog early enough to not have
-	hidden any other windows below it.
-
-2008-10-10  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* lib/e-asn1-object.c:
-	* lib/e-cert-db.c:
-	* lib/e-cert-trust.c:
-	* lib/e-cert.c:
-	* lib/e-pkcs12.c:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/cert-trust-dialog.c:
-	* gui/cert-trust-dialog.h:
-	* gui/certificate-manager.h:
-	* gui/certificate-viewer.c:
-	* gui/certificate-viewer.h:
-	* gui/component.c:
-	* gui/component.h:
-	* lib/e-cert-db.h:
-	* lib/e-pkcs12.c:
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* gui/ca-trust-dialog.c:
-	* gui/ca-trust-dialog.h:
-	* gui/certificate-manager.c:
-	* gui/e-cert-selector.c:
-	* gui/e-cert-selector.h:
-	* lib/e-asn1-object.h:
-	* lib/e-cert-trust.h:
-	* lib/e-cert.h:
-	* lib/e-pkcs12.h:
-	* tests/import-cert.c:
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534360
-
-	* gui/e-cert-selector.h:
-	Migrate from deprecated GtkObject symbols to GObject equivalents.
-
-2008-03-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #513951
-
-	* lib/e-cert-db.c (initialize_nss):
-	Use e_get_user_data_dir() instead of constructing the full path.
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* lib/e-cert-db.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #476231
-
-	* gui/certificate-manager.c:
-	Remove non-USE_GTKFILECHOOSER code.
-	GtkFileChooser has been around since 2004.
-
-2007-09-10  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #471791 
-
-	* gui/e-cert-selector.c: (ecs_find_current): Move away from g_assert
-	to critical warnings
-
-2007-08-31  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #378759
-
-	* gui/component.c: (smime_pk11_passwd), (smime_pk11_change_passwd):
-	* lib/e-pkcs12.c: (prompt_for_password):
-	Do not pass NULL as 'key' parameter.
-
-2007-07-30  Andre Klapper  <a9016009@gmx.de>
-
-	* gui/smime-ui.glade:
-	remove "window1" string from translation
-
-2007-07-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* tests/Makefile.am:
-	Rename GNOME_FULL_LIBS to GNOME_PLATFORM_LIBS.
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
-
-	* Makefile.am:
-
-2007-04-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #396645 from Gilles Dartiguelongue
-
-	* gui/certificate-manager.c: (import_your), (import_contact),
-	(import_ca): Show only cert files in filechooser.
-
-2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #429422
-
-	* gui/certificate-manager.c (certificate_manager_config_control_new):
-	Use g_object_ref() instead of gtk_widget_ref().
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2006-10-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* lib/e-asn1-object.c: (build_from_der): Initialize a pointer
-	to NULL and cast away a warning. bug #332101.
-	* lib/e-pkcs12.c: (prompt_for_password), (nickname_collision):
-	Fix some signed/unsigned warnings. bug #332101.
-
-2006-08-21  Andre Klapper  <a9016009@gmx.de>
-
-	* smime-ui.glade:
-	changed window focus. Fixes bug #266828.
-
-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-15  Tor Lillqvist  <tml@novell.com>
-
-	* lib/e-cert-db.c (initialize_nss): On Win32, NSS wants filenames
-	in system codepage, so convert UTF-8 filename to system codepage.
-
-2006-01-30  Tor Lillqvist  <tml@novell.com>
-
-	* lib/e-cert-db.c (install_loadable_roots): On Win32, don't bother
-	to attempt looking in Unix paths like /usr/lib or /opt/mozilla
-	for Mozilla's nssckbi module. If necessary, add code later to look
-	up the installation path of Mozilla or Firefox from the Registry.
-
-2006-01-29  Kjartan Maraas <kmaraas@gnome.org>
-
-	* gui/cert-trust-dialog.c: (ctd_response):
-	* gui/certificate-viewer.c: (fill_in_general):
-	* gui/component.c:
-	* lib/e-cert-db.c: (initialize_nss), (default_nickname):
-	* lib/e-cert-db.h:
-	* lib/e-cert.c: (create_tbs_certificate_asn1_struct):
-	* lib/e-pkcs12.c: (import_from_file_helper):
-	Remove unused code. Use #ifdef instead of #if some places.
-	Add missing header.
-
-2006-01-27  Andre Klapper <a9016009@gmx.de>
-	* smime-ui.glade:
-	removed string "dialog1" from translation. Fixes bug 306118.
-
-2006-01-11  Simon Zheng  <simon.zheng@sun.com>
-
-	Fix for 325748.
-	* lib/e-cert-db.c: (install_loadable_roots): Add an search path
-	which can be automatically retrieved when running configure.
-
-2006-01-10  Simon Zheng  <simon.zheng@sun.com>
-
-	* lib/e-cert.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>
-	* lib/e-cert-c: marked LDAP specifix strings as not translatable.
-	  Fixes bug 273076.
-
-2006-01-02  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/certificate-manager.c: (initialize_yourcerts_ui):
-	Do not set the sort column before the model is initialized.
-	This is done later by the function unload_certs.
-	Fixes #325472 (critical warning crasher).
-
-2005-12-18  Tor Lillqvist  <tml@novell.com>
-
-	* gui/Makefile.am: Link with libeutil.
-
-	* gui/ca-trust-dialog.c (ca_trust_dialog_show)
- 	* gui/cert-trust-dialog.c (cert_trust_dialog_show)
-	* gui/certificate-manager.c (certificate_manager_config_control_new)
-	* gui/certificate-viewer.c (certificate_viewer_show)
-	* gui/e-cert-selector.c (e_cert_selector_new):
-	Construct glade file pathname at run-time.
-
-	* lib/e-cert-db.c
-	* lib/e-pkcs12.c: Use gstdio wrappers. Open file in binary mode.
-
-2005-07-28  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* lib/e-cert-db.c:
-	Add reserved field for an empty structure.
-
-	Fixes #311837
-
-2005-07-20  Tor Lillqvist  <tml@novell.com>
-
-	* gui/Makefile.am: Use privsolib so the DLL gets installed in
-	bindir on Win32. (See ChangeLog entry in .. from 2005-06-18.) Link
-	with libeshell. Use NO_UNDEFINED.
-
-	* lib/Makefile.am: Use privsolib here, too. Link with libeutil and
-	CERT_UI_LIBS. Use NO_UNDEFINED.
-
-2005-06-06  JP Rosevear  <jpr@novell.com>
-
-	* lib/e-cert-db.c (install_loadable_roots): pull up missing merge
-	from branch
-
-2005-05-06  Sankar P <psankar@novell.com>
-
-	*gui/certificate-manager.c
-	Changed cert to certificates
-	Fixes #273075
-	
-2005-03-31  Jeffrey Stedfast  <fejj@novell.com>
-
-	* lib/e-cert-db.c (install_loadable_roots): Copied Mozilla code to
-	check if the nssckbi root certs module was too old and if it was,
-	delete/unload it.
-
-2005-03-30  Li Yuan  <li.yuan@sun.com>
-
-	* gui/smime-ui.glade:
-	add a11y name to Certificates Table
-	Fixes #73914
-
-2005-02-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #68592
-	
-	* gui/certificate-manager.c (yourcerts_selection_changed): dont
-	pass backup to handle_selection_changed.
-	(certificate_manager_config_control_new): disable the backup
-	buttons always.
-
-2005-02-23  Hans Petter Jansson  <hpj@novell.com>
-
-	* gui/component.c:
-	* lib/e-cert-db.c:
-	* lib/e-pkcs12.c: Include <libedataserverui/e-passwords.h>.
-
-2005-02-09  Hans Petter Jansson  <hpj@novell.com>
-
-	* lib/Makefile.am:
-	* gui/Makefile.am: Install shared libraries to privlibdir.
-
-2005-02-04  Rodney Dawes  <dobey@novell.com>
-
-	* gui/ca-trust-dialog.c (ca_trust_dialog_new): Set the border widths
-	for the dialog internal container widgets to be HIG compliant
-
-	* gui/smime-ui.glade: Set the vbox spacing to 12 for HIG compliance
-
-2004-11-23  Not Zed  <NotZed@Ximian.com>
-
-	* gui/certificate-manager.c (delete_ca): don't remove the tree
-	node if deleting the cert failed.
-	(delete_your): same.
-	(delete_contact): same.  Hoorah for code-reuse.
-
-2004-10-13  JP Rosevear  <jpr@novell.com>
-
-	* gui/e-cert-selector.c: update to use G_DEFINE_TYPE
-
-2004-10-11  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-cert-selector.c (e_cert_selector_new): dont try to
-	deference NULL nickname or emailAddr on the cert.
-
-2004-09-03  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #64420.
-
-	* lib/e-pkcs12.c (prompt_for_password): set the outptr after we've
-	actually got a pointer for it allocated.
-
-2004-08-16  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #62963.
-
-	* gui/cert-trust-dialog.c (ctd_response): fix c99 syntax. Spotted
-	by Vincent Noel <vnoel@cox.net>
-
-2004-08-12  Carlos Garnacho Parro  <carlosg@gnome.org>
-
-	* gui/certificate-manager.c: Optionally use GtkFileChooser if
-	compiled against Gtk+ >= 2.4.0
-
-2004-08-10  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component.c (smime_pk11_passwd, smime_pk11_change_passwd): 
-	* lib/e-pkcs12.c (prompt_for_password): api change in e_passwords.
-
-2004-08-02  Jeffrey Stedfast  <fejj@novell.com>
-
-	* lib/e-pkcs12.c (prompt_for_password): Fixed to work for both LE
-	and BE architectures.
-
-2004-07-16  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #61490 ]
-	
-	* lib/e-cert-db.c (e_cert_db_import_pkcs12_file): un-ifdef this,
-	as it's working..
-	(e_cert_db_export_pkcs12_file): and ifdef this one, since it's the
-	function i meant to ifdef in the first place.
-
-2004-06-17  JP Rosevear  <jpr@novell.com>
-
-	Fixes #56458
-	
-	* gui/smime-ui.glade: make the buttons vertical
-
-2004-06-17  Not Zed  <NotZed@Ximian.com>
-
-	** See #59885.
-
-	* lib/e-cert-db.c (e_cert_db_import_pkcs12_file): move the #if
-	notyet stuff inside the function so the symbol is defined, since
-	we call it eslewhere.  i dunno if it actually works yet.
-
-2004-06-15  Jeffrey Stedfast  <fejj@novell.com>
-
-	* lib/Makefile.am: Added smime-marshal.list to EXTRA_DIST
-
-2004-06-08  Chris Toshok  <toshok@ximian.com>
-
-	* lib/e-cert-db.[ch]: quiet the compiler, and dobey.
-
-2004-05-28  Not Zed  <NotZed@Ximian.com>
-
-	* gui/certificate-manager.c (initialize_yourcerts_ui): set some
-	columns resizable.
-	(initialize_contactcerts_ui): same.
-
-	** See bugs #52061 & #52669.
-
-	* gui/smime-ui.glade: added cert-trust-dialog and tweaked the
-	ca-trust-dialog.
-
-	* gui/ca-trust-dialog.c (ca_trust_dialog_show): Fix the %s in the
-	label.  Slack.
-	(ca_trust_dialog_show): slight rearrangement.
-
-	* gui/certificate-manager.c (add_contact_cert): fill out fields.
-
-	* lib/e-cert.c (e_cert_get_usage): helper to get the usage of a
-	cert.
-
-	* gui/certificate-manager.c (edit_ca): use the right certdb, not
-	the e-one.
-	(add_user_cert): fill out missing columns.
-
-	* lib/e-cert.c (e_cert_get_ca_cert): new method to find the ca
-	cert of a cert.
-
-	* gui/cert-trust-dialog.[ch]: peer cert trust editor.
-
-	* gui/certificate-manager.c (edit_contact): implement.
-
-2004-05-17  Jon Oberheide  <jon@focalhost.com>
-
-	* gui/e-cert-selector.c (e_cert_selector_new): add "Select
-	certificate" title to the previously untitled dialog.
-
-2004-05-19  James Willcox  <jwillcox@gnome.org>
-
-	* lib/e-cert-db.c: (pk11_password):
-
-	Don't crash when the user presses 'cancel'.  Fixes #58733.
-
-2004-05-13  Not Zed  <NotZed@Ximian.com>
-
-	* lib/e-cert-db.c (e_cert_db_login_to_slot): call SetPasswordFunc
-	before calling authenticate - some nss calls can overwrite the
-	setting.  #52820.
-
-2004-04-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #52724 ]
-	
-	* gui/ca-trust-dialog.c (ca_trust_dialog_set_trust): new function,
-	set the toggle buttons' states.
-
-	* gui/ca-trust-dialog.h (ca_trust_dialog_set_trust): add
-	prototype.
-
-	* gui/certificate-manager.c (edit_ca): flesh out the rest of the
-	editing here.  set the existing trust levels and get them back
-	from the dialog when OK is clicked (and store them to the cert
-	db.)
-
-2004-03-24  Chris Toshok  <toshok@ximian.com>
-
-	* lib/smime-marshal.list: add BOOL:POINTER,POINTER,POINTER,POINTER
-	for confirm_ca_cert_import.
-
-	* lib/e-cert-db.c (e_cert_db_class_init): initialize the
-	confirm_ca_cert_import signal.
-	(confirm_download_ca_cert): emit confirm_ca_cert_import and use
-	the returned values.
-	(handle_ca_cert_download): fix the ca trust foo.
-	(e_cert_db_import_certs): pass the cerdb to
-	handle_ca_cert_download since we need to emit something on that
-	object.
-
-	* lib/e-cert-db.h (struct _ECertDBClass): add
-	confirm_ca_cert_import signal.
-
-	* gui/smime-ui.glade: give names to the check buttons in the ca
-	trust dialog.
-
-	* gui/component.c (smime_confirm_ca_cert_import): new function,
-	show the trust dialog.
-	(smime_component_init): connect to "confirm_ca_cert_import"
-	signal.
-
-	* gui/certificate-viewer.c (fill_in_general): fix lots of
-	uninitialized variable accesses.
-	(certificate_viewer_show): don't show the dialog (or connect to
-	the response signal.)  that's the caller's job.
-
-	* gui/certificate-manager.c (view_your): do the showing of the
-	certificate_viewer here.
-	(view_contact): same.
-	(view_ca): same.
-	(edit_ca): new function, pop up the ca trust dialog.  we need more
-	here though, to fill in the toggle buttons when bringing up the
-	dialog, and also to save out the settings when the user clicks ok.
-	(initialize_authoritycerts_ui): hook up the edit_ca button.
-
-	* gui/Makefile.am (libevolution_smime_la_SOURCES): add
-	ca-trust-dialog.[ch].
-
-	* gui/ca-trust-dialog.[ch]: new file implementing the ca trust
-	dialog used for importing/editing ca trust levels.
-
-2004-03-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #52667 ]
-	
-	* gui/certificate-manager.c (import_ca): don't expand the CA tree
-	by default.
-	(populate_ui): same.
-
-2004-03-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #52829 ]
-	
-	* lib/smime-marshal.list: add BOOL:POINTER,POINTER for
-	pk11_change_passwd.
-
-	* lib/e-cert-db.c (e_cert_db_class_init): initialize the
-	pk11_change_passwd signal.
-	(e_cert_db_login_to_slot): emit "pk11_change_passwd" with
-	old_passwd == NULL to initialize the database.
-
-	* lib/e-cert-db.h: add pk11_change_passwd signal slot.
-
-	* gui/component.c (smime_pk11_change_passwd): implement the
-	portion of this that gets called with old_passwd == NULL (the only
-	part that needs implementing yet, since we don't have a UI for
-	changing the password.)
-	(smime_component_init): hook up to the pk11_change_passwd signal
-	on ECertDB.
-
-2004-03-10  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/certificate-viewer.c (certificate_viewer_show): Fix the border
-	width setting for the button area, to be HIG-compliant
-	* gui/smime-ui.glade: Update some border widths for the cert viweer
-	Remove dialog separators (This portion from William Jon McCann)
-
-2004-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component.c: include config.h
-
-2004-02-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/Makefile.am: fix includes for builddir != srcdir
-
-2004-02-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* lib/e-pkcs12.c: #include <config.h>
-	(e_pkcs12_export_to_file): Hmm. I gather this needs to be
-	implemented. return FALSE here until someone implements this so
-	gcc doesn't complain about control reaching the end of a non-void
-	function.
-	(handle_error): Same.
-
-	* lib/e-cert-trust.c: And here.
-
-	* lib/e-cert-db.c: Same.
-
-	* lib/e-asn1-object.c: And here.
-
-	* lib/e-cert.c: Here too.
-
-	* gui/e-cert-selector.c: Same.
-
-	* gui/certificate-viewer.c: Same.
-
-	* gui/certificate-manager.c: #include <config.h>
-
-2004-01-07  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-cert-selector.c (ecs_find_current): check certlist !=
-	NULL, CERT_LIST_EMPTY dereferences it.  Bug #52457.
-
-2004-01-05  Chris Toshok  <toshok@ximian.com>
-
-	* lib/e-cert-db.c (e_cert_db_login_to_slot): oops, remove
-	hardcoded test passwd :)
-
-	* gui/component.c (smime_pk11_passwd): new function, implement the
-	password dialog for PK11 slot authentication.
-	(smime_component_init): new function, initialize any gui related
-	signals that the backend exposes.
-
-	* gui/certificate-manager.c (import_your): use
-	e_cert_db_import_pkcs12_file.
-	(delete_your): new function, implement.
-	(view_your): same.
-	(backup_your): new function, stub out.
-	(backup_all_your): same.
-	(create_yourcerts_treemodel): new function.
-	(initialize_yourcerts_ui): do all the sorting foo, and hook up all
-	the signals.
-	(ainitialize_contactcerts_ui): same.
-	(initialize_authoritycerts_ui): same.
-	(view_contact): treemodel -> streemodel.
-	(view_ca): same.
-	(delete_contact): same, and convert from the sort iter to the
-	child iter before we remove.
-	(delete_ca): same.
-	(import_contact): call gtk_tree_view_expand_all.
-	(import_ca): same.
-	(add_user_cert): append to the child model, not the sort model.
-	(add_contact_cert): same.
-	(add_ca_cert): same.
-	(unload_certs): implement the E_CERT_USER case, and fix the
-	USER/CA stuff to use the sorted treemodels.
-	(load_certs): remove spew.
-	(populate_ui): expand all the tree views.
-
-	* lib/.cvsignore: ignore the generated marshalling files.
-	
-	* lib/Makefile.am: add the marshalling foo.
-
-	* lib/smime-marshal.list (BOOL): new file.
-
-	* lib/e-cert-db.c (pk11_password): new function, emit the
-	pk11_passwd signal.
-	(initialize_nss): new function, split out all the nss init code
-	here, and add all the PKCS12 cipers.
-	(install_loadable_roots): new function, split this code out from
-	the class_init.
-	(e_cert_db_class_init): call initialize_nss() and
-	install_loadable_roots().  also register our pk11_passwd signal.
-	(e_cert_db_import_pkcs12_file): implement.
-	(e_cert_db_login_to_slot): new function, implement.
-
-	* lib/e-cert-db.h (struct _ECertDBClass): add pk11_passwd signal,
-	and add prototype for e_cert_db_login_to_slot.
-
-	* lib/e-pkcs12.c (input_to_decoder): remove spew.
-	(prompt_for_password): fix this.
-	(import_from_file_helper): fix fix fix, and remove spew.
-	(write_export_file): nuke, we don't need this.
-	
-2004-01-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/certificate-viewer.c (fill_in_general): use <tt> markup
-	around the fingerprints, and italicize the Not part of certificate
-	text.
-	(fill_in_details): create a monospace text tag to be used in the
-	field value textbuffer.
-	(fields_selection_changed): use the text tag when inserting text.
-
-2003-12-10  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-cert-selector.c (e_cert_selector_new): if we get no
-	matching certs, show empty menu rather than crashing.  #51922.
-
-2003-12-05  JP Rosevear  <jpr@ximian.com>
-
-	* lib/e-cert.c: fix for C89
-
-2003-12-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/certificate-viewer.c (certificate_viewer_show): set the
-	window title based on e_cert_get_window_title.
-
-	* lib/e-cert.c (e_cert_get_window_title): new function, for use
-	with the certificate viewer.
-	(create_asn1_struct): call e_cert_get_window_title.
-
-2003-12-04  Chris Toshok  <toshok@ximian.com>
-
-	* lib/e-cert.h: add prototype for e_cert_get_asn1_struct.
-	
-	* lib/e-cert.c (e_cert_dispose): unref the asn1 object.
-	(get_int_value): copy and massage from mozilla source.
-	(process_version): same.
-	(process_serial_number_der): same.
-	(get_default_oid_format): same.
-	(get_oid_text): same.
-	(process_raw_bytes): same.
-	(process_sec_algorithm_id): same.
-	(process_subject_public_key_info): same.
-	(process_ns_cert_type_extensions): same.
-	(process_key_usage_extensions): same.
-	(process_extension_data): same.
-	(process_single_extension): same.
-	(process_extensions): same.
-	(process_name): same.
-	(create_tbs_certificate_asn1_struct): same.
-	(create_asn1_struct): same.
-	(e_cert_get_asn1_struct): new function.
-
-	* lib/e-asn1-object.c (e_asn1_object_dispose): free the display
-	name, value, and children.
-	(e_asn1_object_init): assume it's a valid container unless we hear
-	otherwise.
-	(e_asn1_object_new_from_cert): nuke.
-	(e_asn1_object_set_valid_container): implement.
-	(e_asn1_object_append_child): same.
-	(e_asn1_object_set_display_name): same.
-	(e_asn1_object_set_display_value): same.
-
-	* lib/e-asn1-object.h: add prototypes for
-	e_asn1_object_set_valid_container, e_asn1_object_set_display_name,
-	e_asn1_object_set_display_value, and e_asn1_object_append_child.
-
-	* gui/certificate-viewer.c (populate_fields_tree): populate the
-	tree from the asn structure.
-	(hierarchy_selection_changed): blow away the old fields_tree
-	content and populate it again.
-	(fields_selection_changed): implement, set the text view's
-	contents to the asn1 object's display_value.
-	(fill_in_details): expand all nodes in the hierarchy tree.
-
-2003-12-03  Chris Toshok  <toshok@ximian.com>
-
-	* lib/Makefile.am (libessmime_la_SOURCES): add e-asn1-object.[ch]
-
-	* gui/smime-ui.glade: rename the ca trust dialog, and give it a
-	proper id.
-
-	* gui/certificate-manager.c (yourcerts_selection_changed): just
-	use @selection.
-	(contactcerts_selection_changed): same.
-	(authoritycerts_selection_changed): same.
-
-	* gui/certificate-viewer.c (free_data): free the cert chain.
-	(fill_in_general): move all the general tab stuff here.
-	(hierarchy_selection_changed): new function.  not finished.
-	(fields_selection_changed): new function, unimplemented.
-	(fill_in_details): new function, fill in the heirarchy and hook up
-	signals and stuff.
-	(certificate_viewer_show): call fill_in_general/fill_in_details.
-
-	* lib/e-cert.c (e_cert_get_chain): new function.
-
-	* lib/e-cert.h: add prototype for e_cert_get_chain.
-
-2003-12-03  Chris Toshok  <toshok@ximian.com>
-
-	* lib/e-cert-db.c (e_cert_db_class_init): grovel around at startup
-	time for mozilla's pkcs11 module so we can get the same default
-	set of root certs.
-
-2003-11-30  Larry Ewing  <lewing@ximian.com>
-
-	* lib/e-pkcs12.c (nickname_collision): make sure declarations
-	precede logic for older compilers.
-
-	* gui/Makefile.am (INCLUDES): don't define GTK_DISABLE_DEPRECATED
-	it breakes on gtk-2.3 with gtk_option_menu_get_history.
-
-2003-11-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/certificate-viewer.[ch]: mostly implement a viewer for
-	certificates.
-	
-	* gui/smime-ui.glade: fingerprints-sh1 -> fingerprints-sha1.
-
-	* gui/certificate-manager.c (import_your): new function, use
-	e-pkcs12 to implement it.
-	(initialize_yourcerts_ui): hook up the import button.
-	(view_contact): new function, bring up the certificate viewer.
-	(initialize_contactcerts_ui): hook up the view button.
-	(view_ca): new function, bring up the certificate viewer.
-	(initialize_authoritycerts_ui): hook up the view button.
-
-	* gui/Makefile.am (libevolution_smime_la_SOURCES): add
-	certificate-viewer.[ch]
-
-	* lib/e-cert.c (e_cert_dispose): free all the new cached foo.
-	(e_cert_populate): populate all the new cached foo.
-	(e_cert_get_issuer_cn): new function.
-	(e_cert_get_issuer_org): same.
-	(e_cert_get_issuer_org_unit): same.
-	(e_cert_get_issued_on_time): same.
-	(e_cert_get_issued_on): same.
-	(e_cert_get_expires_on_time): same.
-	(e_cert_get_expires_on): same.
-	(e_cert_get_serial_number): same.
-	(e_cert_get_sha1_fingerprint): same.
-	(e_cert_get_md5_fingerprint): same.
-
-	* lib/e-cert.h: add prototypes for lots more accessors.
-	
-	* lib/e-cert-db.c (e_cert_db_find_cert_by_key): fix typo.
-	(e_cert_db_find_cert_by_email_address): call
-	CERT_DestroyCertificate to free the cert.
-	(default_nickname): new function.
-	(e_cert_db_import_user_cert): implement.
-	(e_cert_db_import_server_cert): add blurb.
-
-	* lib/e-pkcs12.[ch]: new files.
-
-	* lib/Makefile.am (libessmime_la_SOURCES): add e-pkcs12.[ch]
-
-2003-11-12  Not Zed  <NotZed@Ximian.com>
-
-	* gui/smime-ui.glade: added cert_selector widget to be placed
-	inside a dialog.
-
-	* gui/e-cert-selector.[ch]: new class to allow user to select a
-	certificate for signing or encrypting.
-
-2003-11-12  Chris Toshok  <toshok@ximian.com>
-
-	* lib/e-cert.c (e_cert_get_cert_type): implement using the
-	e-cert-trust foo.
-	(e_cert_get_email): implement.
-
-	* lib/e-cert.h: add UNKNOWN cert type.
-
-	* gui/smime-ui.glade: fix capitalization of "Import" on the
-	contact certificate page.
-
-	* gui/certificate-manager.c (import_contact): new function.
-	implement email cert importing.
-	(delete_contact): new function.
-	(unload_certs): implement for E_CERT_CONTACT.
-	(certificate_manager_config_control_new): get the contact cert
-	action buttons from libglade.
-
-	* lib/e-cert-db.c (handle_ca_cert_download): mostly implement the
-	trust settings correctly.  this still needs work pending the CA
-	trust dialog's completion.
-	(e_cert_db_delete_cert): fix the ifdef'ed code.
-	(e_cert_db_import_user_cert): remove the ifdef'ed body of this,
-	since it was copied from the CA code.
-
-	* lib/Makefile.am (libessmime_la_SOURCES): add e-cert-trust.[ch]
-
-	* lib/e-cert-trust.[ch]: new files, basically c&p nsNSSCertTrust
-	from mozilla's PSM.
-
-2003-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* tests/import-cert.c (main): don't init NSS here.  it's done in
-	e_cert_db_peek.
-
-	* lib/Makefile.am (libessmime_la_SOURCES): add e-cert-db.[ch]
-
-	* gui/smime-ui.glade: set the initial sensitivity of the buttons
-	here, and add the beginnings of the CA import dialog (where you
-	assign trust levels to it.)
-
-	* gui/certificate-manager.c (handle_selection_changed):
-	sensitize/desensitize all the various buttons correctly when the
-	GtkTreeView's selection changes.
-	(yourcerts_selection_changed): new, selection change handler for
-	the Your Certs tab.
-	(initialize_yourcerts_ui): hook up the tree selection, and add a
-	model column for the ECert.
-	(contactcerts_selection_changed): new, selection change handler
-	for the Contact Certs tab.
-	(initialize_contactcerts_ui): hook up the tree selection, and add
-	a model column for the ECert.
-	(import_ca): new function.
-	(delete_ca): new function.
-	(authoritycerts_selection_changed): new, selection change handler
-	for the Authority Certs tab.
-	(create_authoritycerts_treemodel): new function for creating the
-	authority cert tree model.  the other tabs will eventually use a
-	separate function for this too, as unload_certs gets fleshed out.
-	(initialize_authoritycerts_ui): hook up the tree selection, and
-	add import/delete buttons.
-	(destroy_key): dtor for the keys in our hashes.
-	(destroy_value): dtor for the values in our hashes.
-	(unload_certs): new function.  basically destroy/recreate the
-	model and hash for the particular cert type/tab.
-	(load_certs): use e_cert_get_cert_type.
-	(populate_ui): use unload_certs as well as load_certs.
-	(certificate_manager_config_control_new): call e_cert_db_peek
-	,which will initialize all of NSS.  hook up all the widgets from
-	libglade.
-
-	* lib/e-cert.h: add prototypes for all the new methods, and add
-	the ECertType enum.
-
-	* lib/e-cert.c (e_cert_dispose): handle deletion from the DB here.
-	(e_cert_new_from_der): new function.
-	(e_cert_get_internal_cert): new function.
-	(e_cert_get_raw_der): new function.
-	(e_cert_get_issuer_name): new
-	(e_cert_get_subject_name): new
-	(e_cert_mark_for_deletion): new
-	(e_cert_get_cert_type): new.
-	(e_cert_is_ca_cert): nuke.
-
-	* lib/e-cert-db.[ch]: new, partly implemented, derived from
-	mozilla's nsNSSCertificateDB code.
-
-2003-10-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/certificate-manager.h: add boilerplate.
-
-	* gui/certificate-manager.c
-	(certificate_manager_config_control_new): return NULL if the
-	NSS_InitReadWrite fails - we should probably give better status
-	though, or return a GtkLabel with an error message....
-
-	* gui/Makefile.am (INCLUDES): use CERT_UI_CFLAGS.
-	(TEST_LIBS): use CERT_UI_LIBS.
-
-2003-10-30  Chris Toshok  <toshok@ximian.com>
-
-	* tests/Makefile.am (INCLUDES): use CERT_UI_CFLAGS.
-	(TEST_LIBS): use CERT_UI_LIBS.
-
-2003-10-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/Makefile.am (libevolution_smime_la_SOURCES): add
-	certificate-manager.h
-
-2003-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* lib/e-cert.[ch], lib/Makefile.am, gui/certificate-manager.[ch],
-	gui/Makefile.am, gui/smime-ui.glade, Makefile.am: initial addition
-	of s/mime foo.
-
diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c
index f21288dac0..47f4d5db81 100644
--- a/smime/gui/ca-trust-dialog.c
+++ b/smime/gui/ca-trust-dialog.c
@@ -72,6 +72,9 @@ GtkWidget*
 ca_trust_dialog_show (ECert *cert, gboolean importing)
 {
 	CATrustDialogData *ctd_data;
+	GtkDialog *dialog;
+	GtkWidget *action_area;
+	GtkWidget *content_area;
 	GtkWidget *w;
 	gchar *txt;
 
@@ -83,8 +86,13 @@ ca_trust_dialog_show (ECert *cert, gboolean importing)
 	ctd_data->dialog = e_builder_get_widget (ctd_data->builder, "ca-trust-dialog");
 
 	gtk_widget_ensure_style (ctd_data->dialog);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (ctd_data->dialog)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (ctd_data->dialog)->action_area), 12);
+
+	dialog = GTK_DIALOG (ctd_data->dialog);
+	action_area = gtk_dialog_get_action_area (dialog);
+	content_area = gtk_dialog_get_content_area (dialog);
+
+	gtk_container_set_border_width (GTK_CONTAINER (action_area), 12);
+	gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
 
 	ctd_data->cert = g_object_ref (cert);
 
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 505ffaf30f..cc6d702d46 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -995,6 +995,7 @@ certificate_manager_config_init (EShell *shell)
 {
 	CertificateManagerData *cfm_data;
 	GtkWidget *preferences_window;
+	GtkWidget *parent;
 	GtkWidget *widget;
 
 	g_return_if_fail (E_IS_SHELL (shell));
@@ -1036,7 +1037,8 @@ certificate_manager_config_init (EShell *shell)
 	widget = e_builder_get_widget (cfm_data->builder, "cert-manager-notebook");
 	g_object_ref (widget);
 
-	gtk_container_remove (GTK_CONTAINER (widget->parent), widget);
+	parent = gtk_widget_get_parent (widget);
+	gtk_container_remove (GTK_CONTAINER (parent), widget);
 
 	/* FIXME: remove when implemented */
 	gtk_widget_set_sensitive(cfm_data->backup_your_button, FALSE);
diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index f71993dc05..c78bd77a75 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -317,6 +317,8 @@ GtkWidget*
 certificate_viewer_show (ECert *cert)
 {
 	CertificateViewerData *cvm_data;
+	GtkDialog *dialog;
+	GtkWidget *action_area;
 	gchar *title;
 
 	cvm_data = g_new0 (CertificateViewerData, 1);
@@ -327,13 +329,14 @@ certificate_viewer_show (ECert *cert)
 	cvm_data->dialog = e_builder_get_widget (cvm_data->builder, "certificate-viewer-dialog");
 
 	gtk_widget_realize (cvm_data->dialog);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (cvm_data->dialog)->action_area), 12);
 
-	title = g_strdup_printf (_("Certificate Viewer: %s"), e_cert_get_window_title (cert));
-
-	gtk_window_set_title (GTK_WINDOW (cvm_data->dialog),
-			      title);
+	dialog = GTK_DIALOG (cvm_data->dialog);
+	action_area = gtk_dialog_get_action_area (dialog);
+	gtk_container_set_border_width (GTK_CONTAINER (action_area), 12);
 
+	title = g_strdup_printf (
+		_("Certificate Viewer: %s"), e_cert_get_window_title (cert));
+	gtk_window_set_title (GTK_WINDOW (cvm_data->dialog), title);
 	g_free (title);
 
 	fill_in_general (cvm_data, cert);
diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c
index 5d500f5abf..71f2c00504 100644
--- a/smime/gui/e-cert-selector.c
+++ b/smime/gui/e-cert-selector.c
@@ -148,6 +148,7 @@ e_cert_selector_new(gint type, const gchar *currentid)
 	CERTCertList *certlist;
 	CERTCertListNode *node;
 	GtkBuilder *builder;
+	GtkWidget *content_area;
 	GtkWidget *w;
 	gint n=0, active=0;
 
@@ -161,7 +162,8 @@ e_cert_selector_new(gint type, const gchar *currentid)
 	p->description = e_builder_get_widget(builder, "cert_description");
 
 	w = e_builder_get_widget(builder, "cert_selector_vbox");
-	gtk_box_pack_start((GtkBox *)((GtkDialog *)ecs)->vbox, w, TRUE, TRUE, 3);
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (ecs));
+	gtk_box_pack_start (GTK_BOX (content_area), w, TRUE, TRUE, 3);
 	gtk_window_set_title(GTK_WINDOW(ecs), _("Select certificate"));
 
 	switch (type) {
diff --git a/smime/gui/smime-ui.ui b/smime/gui/smime-ui.ui
index 18d5df252b..12947578f8 100644
--- a/smime/gui/smime-ui.ui
+++ b/smime/gui/smime-ui.ui
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
-<!--*- mode: xml -*-->
 <interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="model1">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -16,169 +18,80 @@
   </object>
   <object class="GtkDialog" id="certificate-viewer-dialog">
     <property name="title">dialog1</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <property name="modal">False</property>
-    <property name="resizable">True</property>
-    <property name="destroy_with_parent">False</property>
-    <property name="decorated">True</property>
-    <property name="skip_taskbar_hint">False</property>
-    <property name="skip_pager_hint">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <property name="urgency_hint">False</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="homogeneous">False</property>
-        <property name="spacing">0</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <object class="GtkButton" id="closebutton1">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-close</property>
-                <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkNotebook" id="notebook1">
-            <property name="border_width">12</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="show_tabs">True</property>
-            <property name="show_border">True</property>
-            <property name="tab_pos">GTK_POS_TOP</property>
-            <property name="scrollable">False</property>
-            <property name="enable_popup">False</property>
+            <property name="border_width">12</property>
             <child>
               <object class="GtkVBox" id="vbox1">
-                <property name="border_width">6</property>
                 <property name="visible">True</property>
-                <property name="homogeneous">False</property>
+                <property name="border_width">6</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkFrame" id="frame1">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="label_yalign">0.5</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkVBox" id="vbox2">
-                        <property name="border_width">6</property>
                         <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">0</property>
+                        <property name="border_width">6</property>
+                        <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkLabel" id="ssl-client-cert-verified-label">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">SSL Client Certificate</property>
-                            <property name="use_underline">False</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
                             <property name="xalign">0</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
+                            <property name="label" translatable="yes">SSL Client Certificate</property>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="ssl-server-cert-verified-label">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">SSL Server Certificate</property>
-                            <property name="use_underline">False</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
                             <property name="xalign">0</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
+                            <property name="label" translatable="yes">SSL Server Certificate</property>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="email-signer-cert-verified-label">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">Email Signer Certificate</property>
-                            <property name="use_underline">False</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
                             <property name="xalign">0</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
+                            <property name="label" translatable="yes">Email Signer Certificate</property>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="email-recipient-cert-verified-label">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">Email Recipient Certificate</property>
-                            <property name="use_underline">False</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
                             <property name="xalign">0</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
+                            <property name="label" translatable="yes">Email Recipient Certificate</property>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">3</property>
                           </packing>
                         </child>
                       </object>
@@ -187,18 +100,6 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">This certificate has been verified for the following uses:</property>
-                        <property name="use_underline">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -206,9 +107,8 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -216,805 +116,471 @@
                     <property name="visible">True</property>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkTable" id="table3">
-                    <property name="border_width">3</property>
                     <property name="visible">True</property>
+                    <property name="border_width">3</property>
                     <property name="n_rows">15</property>
                     <property name="n_columns">2</property>
-                    <property name="homogeneous">False</property>
-                    <property name="row_spacing">0</property>
                     <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label25">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Issued To</property>
-                        <property name="use_underline">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">1</property>
-                        <property name="xpad">0</property>
                         <property name="ypad">3</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">Issued To</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">0</property>
-                        <property name="bottom_attach">1</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label26">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Common Name (CN)</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
                         <property name="xpad">6</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">Common Name (CN)</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="right_attach">1</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label27">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Organization (O)</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
                         <property name="xpad">6</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">Organization (O)</property>
                       </object>
                       <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="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label28">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
                         <property name="xpad">6</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="right_attach">1</property>
                         <property name="top_attach">3</property>
                         <property name="bottom_attach">4</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label29">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Serial Number</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
                         <property name="xpad">6</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">Serial Number</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="right_attach">1</property>
                         <property name="top_attach">4</property>
                         <property name="bottom_attach">5</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label31">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Common Name (CN)</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
                         <property name="xpad">6</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">Common Name (CN)</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="right_attach">1</property>
                         <property name="top_attach">6</property>
                         <property name="bottom_attach">7</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label32">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Organization (O)</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
                         <property name="xpad">6</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">Organization (O)</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="right_attach">1</property>
                         <property name="top_attach">7</property>
                         <property name="bottom_attach">8</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label33">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
                         <property name="xpad">6</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="right_attach">1</property>
                         <property name="top_attach">8</property>
                         <property name="bottom_attach">9</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label36">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Issued On</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
                         <property name="xpad">6</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">Issued On</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="right_attach">1</property>
                         <property name="top_attach">10</property>
                         <property name="bottom_attach">11</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label37">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Expires On</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
                         <property name="xpad">6</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">Expires On</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="right_attach">1</property>
                         <property name="top_attach">11</property>
                         <property name="bottom_attach">12</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label30">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Issued By</property>
-                        <property name="use_underline">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">1</property>
-                        <property name="xpad">0</property>
                         <property name="ypad">3</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">Issued By</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
                         <property name="right_attach">2</property>
                         <property name="top_attach">5</property>
                         <property name="bottom_attach">6</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label35">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Fingerprints</property>
-                        <property name="use_underline">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
                         <property name="ypad">3</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">Fingerprints</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
                         <property name="right_attach">2</property>
                         <property name="top_attach">12</property>
                         <property name="bottom_attach">13</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label38">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">SHA1 Fingerprint</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
                         <property name="xpad">6</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">SHA1 Fingerprint</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="right_attach">1</property>
                         <property name="top_attach">13</property>
                         <property name="bottom_attach">14</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label39">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">MD5 Fingerprint</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
                         <property name="xpad">6</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">MD5 Fingerprint</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="right_attach">1</property>
                         <property name="top_attach">14</property>
                         <property name="bottom_attach">15</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="issued-to-o">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;Not Part of Certificate&gt;</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
                         <property name="selectable">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
                         <property name="top_attach">2</property>
                         <property name="bottom_attach">3</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="issued-to-ou">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;Not Part of Certificate&gt;</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
                         <property name="selectable">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
                         <property name="top_attach">3</property>
                         <property name="bottom_attach">4</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="issued-to-serial">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;Not Part of Certificate&gt;</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
                         <property name="selectable">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
                         <property name="top_attach">4</property>
                         <property name="bottom_attach">5</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="issued-by-cn">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;Not Part of Certificate&gt;</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
                         <property name="selectable">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
                         <property name="top_attach">6</property>
                         <property name="bottom_attach">7</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="issued-by-o">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;Not Part of Certificate&gt;</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
                         <property name="selectable">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
                         <property name="top_attach">7</property>
                         <property name="bottom_attach">8</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="issued-by-ou">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;Not Part of Certificate&gt;</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
                         <property name="selectable">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
                         <property name="top_attach">8</property>
                         <property name="bottom_attach">9</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="validity-issued-on">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;Not Part of Certificate&gt;</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
                         <property name="selectable">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
                         <property name="top_attach">10</property>
                         <property name="bottom_attach">11</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="validity-expires-on">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;Not Part of Certificate&gt;</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
                         <property name="selectable">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
                         <property name="top_attach">11</property>
                         <property name="bottom_attach">12</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="fingerprints-sha1">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;Not Part of Certificate&gt;</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
                         <property name="selectable">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
                         <property name="top_attach">13</property>
                         <property name="bottom_attach">14</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="fingerprints-md5">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;Not Part of Certificate&gt;</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
                         <property name="selectable">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
                         <property name="top_attach">14</property>
                         <property name="bottom_attach">15</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="issued-to-cn">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;Not Part of Certificate&gt;</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
                         <property name="selectable">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                       <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 name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label34">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Validity</property>
-                        <property name="use_underline">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
                         <property name="ypad">3</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
+                        <property name="label" translatable="yes">Validity</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
                         <property name="right_attach">2</property>
                         <property name="top_attach">9</property>
                         <property name="bottom_attach">10</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
-              <packing>
-                <property name="tab_expand">False</property>
-                <property name="tab_fill">True</property>
-              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">General</property>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
               </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
             </child>
             <child>
               <object class="GtkVBox" id="vbox3">
-                <property name="border_width">6</property>
                 <property name="visible">True</property>
-                <property name="homogeneous">False</property>
+                <property name="border_width">6</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkFrame" id="frame4">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="label_yalign">0.5</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow1">
-                        <property name="border_width">6</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="shadow_type">GTK_SHADOW_IN</property>
-                        <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                        <property name="border_width">6</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkTreeView" id="cert-hierarchy-treeview">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="headers_visible">False</property>
-                            <property name="rules_hint">False</property>
-                            <property name="reorderable">False</property>
-                            <property name="enable_search">True</property>
-                            <property name="fixed_height_mode">False</property>
-                            <property name="hover_selection">False</property>
-                            <property name="hover_expand">False</property>
                           </object>
                         </child>
                       </object>
@@ -1023,18 +589,6 @@
                       <object class="GtkLabel" id="label51">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Certificate Hierarchy</property>
-                        <property name="use_underline">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1042,37 +596,27 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame5">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="label_yalign">0.5</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow2">
-                        <property name="border_width">6</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="shadow_type">GTK_SHADOW_IN</property>
-                        <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                        <property name="border_width">6</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkTreeView" id="cert-fields-treeview">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="headers_visible">False</property>
-                            <property name="rules_hint">False</property>
-                            <property name="reorderable">False</property>
-                            <property name="enable_search">True</property>
-                            <property name="fixed_height_mode">False</property>
-                            <property name="hover_selection">False</property>
-                            <property name="hover_expand">False</property>
                           </object>
                         </child>
                       </object>
@@ -1081,18 +625,6 @@
                       <object class="GtkLabel" id="label52">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Certificate Fields</property>
-                        <property name="use_underline">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1100,42 +632,28 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame6">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="label_yalign">0.5</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow3">
-                        <property name="border_width">6</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-                        <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                        <property name="border_width">6</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <property name="shadow_type">etched-in</property>
                         <child>
                           <object class="GtkTextView" id="cert-field-value-textview">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="editable">False</property>
-                            <property name="overwrite">False</property>
-                            <property name="accepts_tab">True</property>
-                            <property name="justification">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap_mode">GTK_WRAP_NONE</property>
                             <property name="cursor_visible">False</property>
-                            <property name="pixels_above_lines">0</property>
-                            <property name="pixels_below_lines">0</property>
-                            <property name="pixels_inside_wrap">0</property>
-                            <property name="left_margin">0</property>
-                            <property name="right_margin">0</property>
-                            <property name="indent">0</property>
                           </object>
                         </child>
                       </object>
@@ -1144,18 +662,6 @@
                       <object class="GtkLabel" id="label53">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Field Value</property>
-                        <property name="use_underline">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1163,41 +669,54 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="tab_expand">False</property>
-                <property name="tab_fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Details</property>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
               </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="closebutton1">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
@@ -1208,929 +727,581 @@
   </object>
   <object class="GtkWindow" id="cert-manager-config-control">
     <property name="title">window1</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_NONE</property>
-    <property name="modal">False</property>
-    <property name="resizable">True</property>
-    <property name="destroy_with_parent">False</property>
-    <property name="decorated">True</property>
-    <property name="skip_taskbar_hint">False</property>
-    <property name="skip_pager_hint">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <property name="urgency_hint">False</property>
     <child>
       <object class="GtkNotebook" id="cert-manager-notebook">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="show_tabs">True</property>
-        <property name="show_border">True</property>
-        <property name="tab_pos">GTK_POS_TOP</property>
-        <property name="scrollable">False</property>
-        <property name="enable_popup">False</property>
         <child>
           <object class="GtkVBox" id="vbox4">
-            <property name="border_width">6</property>
             <property name="visible">True</property>
-            <property name="homogeneous">False</property>
+            <property name="border_width">6</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkLabel" id="label57">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">You have certificates from these organizations that identify you:</property>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkHBox" id="hbox6">
                 <property name="visible">True</property>
-                <property name="homogeneous">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow4">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
-                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTreeView" id="yourcerts-treeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="headers_visible">True</property>
-                        <property name="rules_hint">False</property>
-                        <property name="reorderable">False</property>
-                        <property name="enable_search">True</property>
-                        <property name="fixed_height_mode">False</property>
-                        <property name="hover_selection">False</property>
-                        <property name="hover_expand">False</property>
-                        <accessibility>
-			
-		      </accessibility>
                         <child internal-child="accessible">
-                          <object class="AtkObject" id="a11y-yourcerts-treeview1">
-                            <property name="AtkObject::accessible_name" translatable="yes">Certificates Table</property>
+                          <object class="AtkObject" id="yourcerts-treeview-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Certificates Table</property>
                           </object>
                         </child>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkVButtonBox" id="vbuttonbox1">
                     <property name="visible">True</property>
-                    <property name="layout_style">GTK_BUTTONBOX_START</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
+                    <property name="layout_style">start</property>
                     <child>
                       <object class="GtkButton" id="your-view-button">
+                        <property name="label" translatable="yes">_View</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">View</property>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="your-backup-button">
+                        <property name="label" translatable="yes">_Backup</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment2">
-                            <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">0</property>
-                            <property name="right_padding">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox2">
-                                <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image2">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-save</property>
-                                    <property name="icon_size">4</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label59">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Backup</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="use_markup">False</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="image">backup-image</property>
+                        <property name="use_underline">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="your-backup-all-button">
+                        <property name="label" translatable="yes">Backup _All</property>
                         <property name="visible">True</property>
-                        <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment1">
-                            <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">0</property>
-                            <property name="right_padding">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox1">
-                                <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image1">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-save</property>
-                                    <property name="icon_size">4</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label58">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Backup All</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="use_markup">False</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="image">backup-all-image</property>
+                        <property name="use_underline">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="your-import-button">
+                        <property name="label" translatable="yes">I_mport</property>
                         <property name="visible">True</property>
-                        <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Import</property>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="your-delete-button">
+                        <property name="label">gtk-delete</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label">gtk-delete</property>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_stock">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">4</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="padding">0</property>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="tab_expand">False</property>
-            <property name="tab_fill">True</property>
-          </packing>
         </child>
         <child type="tab">
           <object class="GtkLabel" id="label54">
             <property name="visible">True</property>
             <property name="label" translatable="yes">Your Certificates</property>
-            <property name="use_underline">False</property>
-            <property name="use_markup">False</property>
-            <property name="justify">GTK_JUSTIFY_LEFT</property>
-            <property name="wrap">False</property>
-            <property name="selectable">False</property>
-            <property name="xalign">0.5</property>
-            <property name="yalign">0.5</property>
-            <property name="xpad">0</property>
-            <property name="ypad">0</property>
-            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-            <property name="width_chars">-1</property>
-            <property name="single_line_mode">False</property>
-            <property name="angle">0</property>
           </object>
+          <packing>
+            <property name="tab_fill">False</property>
+          </packing>
         </child>
         <child>
           <object class="GtkVBox" id="vbox5">
-            <property name="border_width">6</property>
             <property name="visible">True</property>
-            <property name="homogeneous">False</property>
+            <property name="border_width">6</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkLabel" id="label60">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">You have certificates on file that identify these people:</property>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkHBox" id="hbox7">
                 <property name="visible">True</property>
-                <property name="homogeneous">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow5">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
-                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTreeView" id="contactcerts-treeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="headers_visible">True</property>
-                        <property name="rules_hint">False</property>
-                        <property name="reorderable">False</property>
-                        <property name="enable_search">True</property>
-                        <property name="fixed_height_mode">False</property>
-                        <property name="hover_selection">False</property>
-                        <property name="hover_expand">False</property>
-                        <accessibility>
-			
-		      </accessibility>
                         <child internal-child="accessible">
-                          <object class="AtkObject" id="a11y-contactcerts-treeview1">
-                            <property name="AtkObject::accessible_name" translatable="yes">Certificates Table</property>
+                          <object class="AtkObject" id="contactcerts-treeview-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Certificates Table</property>
                           </object>
                         </child>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkVButtonBox" id="vbuttonbox2">
                     <property name="visible">True</property>
-                    <property name="layout_style">GTK_BUTTONBOX_START</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
+                    <property name="layout_style">start</property>
                     <child>
                       <object class="GtkButton" id="contact-view-button">
+                        <property name="label" translatable="yes">_View</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">View</property>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="contact-edit-button">
+                        <property name="label">gtk-edit</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment3">
-                            <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">0</property>
-                            <property name="right_padding">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox3">
-                                <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image3">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-properties</property>
-                                    <property name="icon_size">4</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label61">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Edit</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="use_markup">False</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_stock">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="contact-import-button">
+                        <property name="label" translatable="yes">I_mport</property>
                         <property name="visible">True</property>
-                        <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Import</property>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="contact-delete-button">
+                        <property name="label">gtk-delete</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label">gtk-delete</property>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_stock">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="padding">0</property>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="tab_expand">False</property>
-            <property name="tab_fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child type="tab">
           <object class="GtkLabel" id="label55">
             <property name="visible">True</property>
             <property name="label" translatable="yes">Contact Certificates</property>
-            <property name="use_underline">False</property>
-            <property name="use_markup">False</property>
-            <property name="justify">GTK_JUSTIFY_LEFT</property>
-            <property name="wrap">False</property>
-            <property name="selectable">False</property>
-            <property name="xalign">0.5</property>
-            <property name="yalign">0.5</property>
-            <property name="xpad">0</property>
-            <property name="ypad">0</property>
-            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-            <property name="width_chars">-1</property>
-            <property name="single_line_mode">False</property>
-            <property name="angle">0</property>
           </object>
+          <packing>
+            <property name="position">1</property>
+            <property name="tab_fill">False</property>
+          </packing>
         </child>
         <child>
           <object class="GtkVBox" id="vbox6">
-            <property name="border_width">6</property>
             <property name="visible">True</property>
-            <property name="homogeneous">False</property>
+            <property name="border_width">6</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkLabel" id="label62">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">You have certificates on file that identify these certificate authorities:</property>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkHBox" id="hbox8">
                 <property name="visible">True</property>
-                <property name="homogeneous">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow6">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
-                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTreeView" id="authoritycerts-treeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="headers_visible">True</property>
-                        <property name="rules_hint">False</property>
-                        <property name="reorderable">False</property>
-                        <property name="enable_search">True</property>
-                        <property name="fixed_height_mode">False</property>
-                        <property name="hover_selection">False</property>
-                        <property name="hover_expand">False</property>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkVButtonBox" id="vbuttonbox3">
                     <property name="visible">True</property>
-                    <property name="layout_style">GTK_BUTTONBOX_START</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
+                    <property name="layout_style">start</property>
                     <child>
                       <object class="GtkButton" id="authority-view-button">
+                        <property name="label" translatable="yes">_View</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">View</property>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="authority-edit-button">
+                        <property name="label">gtk-edit</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment4">
-                            <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">0</property>
-                            <property name="right_padding">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox4">
-                                <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image4">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-properties</property>
-                                    <property name="icon_size">4</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label63">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Edit</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="use_markup">False</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_stock">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="authority-import-button">
+                        <property name="label" translatable="yes">I_mport</property>
                         <property name="visible">True</property>
-                        <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Import</property>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="authority-delete-button">
+                        <property name="label">gtk-delete</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_default">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label">gtk-delete</property>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_stock">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="padding">0</property>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="tab_expand">False</property>
-            <property name="tab_fill">True</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child type="tab">
           <object class="GtkLabel" id="label56">
             <property name="visible">True</property>
             <property name="label" translatable="yes">Authorities</property>
-            <property name="use_underline">False</property>
-            <property name="use_markup">False</property>
-            <property name="justify">GTK_JUSTIFY_LEFT</property>
-            <property name="wrap">False</property>
-            <property name="selectable">False</property>
-            <property name="xalign">0.5</property>
-            <property name="yalign">0.5</property>
-            <property name="xpad">0</property>
-            <property name="ypad">0</property>
-            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-            <property name="width_chars">-1</property>
-            <property name="single_line_mode">False</property>
-            <property name="angle">0</property>
           </object>
+          <packing>
+            <property name="position">2</property>
+            <property name="tab_fill">False</property>
+          </packing>
         </child>
       </object>
     </child>
   </object>
   <object class="GtkDialog" id="ca-trust-dialog">
     <property name="title" translatable="yes">Certificate Authority Trust</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <property name="modal">False</property>
-    <property name="resizable">True</property>
-    <property name="destroy_with_parent">False</property>
-    <property name="decorated">True</property>
-    <property name="skip_taskbar_hint">False</property>
-    <property name="skip_pager_hint">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <property name="urgency_hint">False</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
-        <property name="homogeneous">False</property>
-        <property name="spacing">0</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <object class="GtkButton" id="view_certificate_button">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">_View Certificate</property>
-                <property name="use_underline">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="cancelbutton">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="okbutton">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-ok</property>
-                <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkVBox" id="vbox9">
-            <property name="border_width">12</property>
             <property name="visible">True</property>
-            <property name="homogeneous">False</property>
+            <property name="border_width">12</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkLabel" id="ca-trust-label">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes"/>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkCheckButton" id="ssl_trust_checkbutton">
+                <property name="label" translatable="yes">Trust this CA to identify websites.</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Trust this CA to identify web sites.</property>
+                <property name="receives_default">False</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>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkCheckButton" id="email_trust_checkbutton">
+                <property name="label" translatable="yes">Trust this CA to identify email users.</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Trust this CA to identify email users.</property>
+                <property name="receives_default">False</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>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkCheckButton" id="objsign_trust_checkbutton">
+                <property name="label" translatable="yes">Trust this CA to identify software developers.</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Trust this CA to identify software developers.</property>
+                <property name="receives_default">False</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>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label66">
                 <property name="visible">True</property>
+                <property name="xalign">0</property>
                 <property name="label" translatable="yes">Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available).</property>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
                 <property name="wrap">True</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="view_certificate_button">
+                <property name="label" translatable="yes">_View Certificate</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancelbutton">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="okbutton">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
@@ -2143,43 +1314,26 @@
   </object>
   <object class="GtkVBox" id="cert_selector_vbox">
     <property name="visible">True</property>
-    <property name="homogeneous">False</property>
-    <property name="spacing">0</property>
+    <property name="orientation">vertical</property>
     <child>
       <object class="GtkHBox" id="hbox5">
-        <property name="border_width">6</property>
         <property name="visible">True</property>
-        <property name="homogeneous">False</property>
+        <property name="border_width">6</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel" id="label67">
             <property name="visible">True</property>
             <property name="label" translatable="yes">Certificate</property>
-            <property name="use_underline">False</property>
-            <property name="use_markup">False</property>
-            <property name="justify">GTK_JUSTIFY_LEFT</property>
-            <property name="wrap">False</property>
-            <property name="selectable">False</property>
-            <property name="xalign">0.5</property>
-            <property name="yalign">0.5</property>
-            <property name="xpad">0</property>
-            <property name="ypad">0</property>
-            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-            <property name="width_chars">-1</property>
-            <property name="single_line_mode">False</property>
-            <property name="angle">0</property>
           </object>
           <packing>
-            <property name="padding">0</property>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkComboBox" id="cert_combobox">
             <property name="visible">True</property>
-            <property name="add_tearoffs">False</property>
-            <property name="focus_on_click">True</property>
             <property name="model">model1</property>
             <child>
               <object class="GtkCellRendererText" id="renderer1"/>
@@ -2189,49 +1343,33 @@
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
       <packing>
-        <property name="padding">0</property>
         <property name="expand">False</property>
-        <property name="fill">True</property>
+        <property name="position">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkFrame" id="frame7">
         <property name="visible">True</property>
         <property name="label_xalign">0</property>
-        <property name="label_yalign">0.5</property>
-        <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow7">
-            <property name="border_width">6</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="shadow_type">GTK_SHADOW_IN</property>
-            <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+            <property name="border_width">6</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <property name="shadow_type">in</property>
             <child>
               <object class="GtkTextView" id="cert_description">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="editable">True</property>
-                <property name="overwrite">False</property>
-                <property name="accepts_tab">True</property>
-                <property name="justification">GTK_JUSTIFY_LEFT</property>
-                <property name="wrap_mode">GTK_WRAP_NONE</property>
-                <property name="cursor_visible">True</property>
-                <property name="pixels_above_lines">0</property>
-                <property name="pixels_below_lines">0</property>
-                <property name="pixels_inside_wrap">0</property>
-                <property name="left_margin">0</property>
-                <property name="right_margin">0</property>
-                <property name="indent">0</property>
               </object>
             </child>
           </object>
@@ -2240,155 +1378,115 @@
           <object class="GtkLabel" id="label68">
             <property name="visible">True</property>
             <property name="label" translatable="yes">Certificate details</property>
-            <property name="use_underline">False</property>
-            <property name="use_markup">False</property>
-            <property name="justify">GTK_JUSTIFY_LEFT</property>
-            <property name="wrap">False</property>
-            <property name="selectable">False</property>
-            <property name="xalign">0.5</property>
-            <property name="yalign">0.5</property>
-            <property name="xpad">0</property>
-            <property name="ypad">0</property>
-            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-            <property name="width_chars">-1</property>
-            <property name="single_line_mode">False</property>
-            <property name="angle">0</property>
           </object>
         </child>
       </object>
       <packing>
-        <property name="padding">0</property>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
+        <property name="position">1</property>
       </packing>
     </child>
   </object>
   <object class="GtkDialog" id="cert-trust-dialog">
     <property name="title" translatable="yes">Email Certificate Trust Settings</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <property name="modal">False</property>
-    <property name="resizable">True</property>
-    <property name="destroy_with_parent">False</property>
-    <property name="decorated">True</property>
-    <property name="skip_taskbar_hint">False</property>
-    <property name="skip_pager_hint">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <property name="urgency_hint">False</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
-        <property name="homogeneous">False</property>
-        <property name="spacing">0</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area3">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <object class="GtkButton" id="editca">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">_Edit CA Trust</property>
-                <property name="use_underline">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="editok">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-ok</property>
-                <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkVBox" id="vbox8">
-            <property name="border_width">12</property>
             <property name="visible">True</property>
-            <property name="homogeneous">False</property>
-            <property name="spacing">0</property>
+            <property name="border_width">12</property>
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel" id="trust-label">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes"/>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
                 <property name="wrap">True</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="cert-trust">
+                <property name="label" translatable="yes">Trust the authenticity of this certificate</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Trust the authenticity of this certificate</property>
+                <property name="receives_default">False</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>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="cert-notrust">
+                <property name="label" translatable="yes">Do not trust the authenticity of this certificate</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Do not trust the authenticity of this certificate</property>
+                <property name="receives_default">False</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>
                 <property name="group">cert-trust</property>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area3">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="editca">
+                <property name="label" translatable="yes">_Edit CA Trust</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="editok">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
@@ -2398,4 +1496,12 @@
       <action-widget response="-5">editok</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkImage" id="backup-image">
+    <property name="visible">True</property>
+    <property name="stock">gtk-save</property>
+  </object>
+  <object class="GtkImage" id="backup-all-image">
+    <property name="visible">True</property>
+    <property name="stock">gtk-save</property>
+  </object>
 </interface>
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index adf790af7e..1dee4d4a65 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -635,6 +635,15 @@ get_oid_text (SECItem *oid, gchar **text)
 	case SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION:
 		*text = g_strdup (_("PKCS #1 SHA-1 With RSA Encryption"));
 		break;
+	case SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION:
+		*text = g_strdup (_("PKCS #1 SHA-256 With RSA Encryption"));
+		break;
+	case SEC_OID_PKCS1_SHA384_WITH_RSA_ENCRYPTION:
+		*text = g_strdup (_("PKCS #1 SHA-384 With RSA Encryption"));
+		break;
+	case SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION:
+		*text = g_strdup (_("PKCS #1 SHA-512 With RSA Encryption"));
+		break;
 	case SEC_OID_AVA_COUNTRY_NAME:
 		*text = g_strdup ("C");
 		break;
@@ -1027,6 +1036,12 @@ process_name (CERTName *name, gchar **value)
 
 			SECITEM_FreeItem(decodeItem, PR_TRUE);
 
+			/* Translators: This string is used in Certificate details for fields like Issuer
+			   or Subject, which shows the field name on the left and its respective value
+			   on the right, both as stored in the certificate itself. You probably do not
+			   need to change this string, unless changing the order of name and value.
+			   As a result example: "OU = VeriSign Trust Network"
+			*/
 			temp = g_strdup_printf (_("%s = %s"), type, avavalue->str);
 
 			g_string_append (final_string, temp);
diff --git a/ui/ChangeLog b/ui/ChangeLog
deleted file mode 100644
index c591ce10b6..0000000000
--- a/ui/ChangeLog
+++ /dev/null
@@ -1,1085 +0,0 @@
-2008-11-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #559040
-
-	* evolution-addressbook.xml:
-	* evolution-mail-global.xml:
-	* evolution-mail-list.xml:
-	No period at the end of tooltips, and use sentence case.
-
-2008-11-03  Ashish Shrivastava  <shashish@novell.com>
-
-	** Support for Non-intrusive error in calendar.
-
-	* evolution-calendar.xml: Add menu for HelpDebug.
-
-2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
-
-	** Fix for bug #534762
-
-	* evolution-addressbook.xml: Change "addressbook" to "address book"
-	in translatable strings.
-
-2008-08-07  Paul Bolle  <pebolle@tiscali.nl>
-
-	** Fix for bug #546788
-
-	* evolution-mail-message.xml: Drop unused "ViewNormal" cmd entry.
-
-2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #517825
-
-	* evolution.xml:
-	Fix duplicate mnemonic.  "_Work Offline" -> "Work _Offline"
-
-2008-07-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #542125
-
-	* evolution-editor.xml:
-	* evolution-event-editor.xml:
-	* evolution-memo-editor.xml:
-	* evolution-task-editor.xml:
-	Remove these files from source control.
-
-2008-06-21  Roshan Kumar Singh  <roshan.singh08@yahoo.com>
-
-	** Fix for bug #395636
-
-	* evolution-mail-list.xml: Added accel key Ctrl+Shift+B for collapsing
-	all threads and Ctrl+/ for marking all messages as read. 
-
-2008-06-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #531836
-
-	* evolution-mail-message.xml: Added bonobo accel key for Ctrl+D, Del to 
-	keep working on deleted mails, but not the toolbar/menu
-
-2008-05-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am:
-	* evolution-signature-editor.xml:
-	Neither is this.  Remove it from source control.
-
-2008-05-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am:
-	* evolution-subscribe.xml:
-	This file is no longer used.  Remove it from source control.
-
-2008-04-13  Matthew Barnes  <mbarnes@redhat.com>
-
-	* evolution-addressbook.xml:
-	Add an icon for Edit->Select All.
-
-	* evolution-mail-list.xml:
-	Add icons for Folder->Delete and Folder->Refresh.
-
-2008-04-11  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #517134
-
-	* evolution-editor.xml: Added a placeholder to dock the "Recent
-	Documents" menu. 
-
-2008-04-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* evolution-composer-entries.xml:
-	Remove this file; obsoleted by new composer.
-
-2008-01-28  Andre Klapper  <a9016009@gmx.de>
-
-	* evolution-mail-message.xml: Added translator comments.
-
-2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* evolution-mail-global.xml: Add Debug Log menu item for mailer.
-	* evolution.xml: Add place holder for Debug menu item.
-
-2007-12-15  Matthew Barnes  <mbarnes@redhat.com>
-
-	* evolution.xml:
-	Fix capitalization of "Download Messages..." (HIG 8.3.2).
-
-2007-12-15  Matthew Barnes  <mbarnes@redhat.com>
-
-	* evolution.xml:
-	Fix capitalization of "Switcher Appearance" menu (HIG 8.3.2).
-
-2007-12-09  Andre Klapper  <a9016009@gmx.de>
-
-	* evolution.xml:
-	change "Evolution FAQ" menu item name to "Frequently Asked questions".
-	if i think of it, our users should not need a geek dictionary.
-
-2007-12-07  Denis Washington <denisw@svn.gnome.org>
-
-	** Fix for bug #500561
-
-	* evolution-mail-list.xml: Added icon for mark all messages as read menu 
-	item.
-
-2007-12-04  Alex Kloss  <alexkloss@att.net>
-
-	** Fixes bug #444227
-
-	* evolution-mail-global.xml:
-	Make string for PrepareForOffline more descriptive
-	Add mnemonic to PrepareForOffline menu item
-
-2007-11-26  Andre Klapper  <a9016009@gmx.de>
-
-	** Fixes bug #497810
-
-	* evolution.xml:
-	add "Evolution FAQ" help menu item 
-
-2007-11-26 Nicholas Miell <nmiell@gmail.com>
-
-	** Part of fix for bug #216485
-
-	* evolution-mail-list.xml
-	Add Select Message Subthread
-
-2007-11-10  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #209425
-
-	* evolution-calendar.xml:
-	Don't use gtk-home for the go-today action.
-
-2007-11-01  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #492106
-
-	* evolution.xml:
-	Use the about icon from the freedesktop spec, not
-	the deprecated gnomeui icon.
-
-2007-10-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	* evolution.xml:
-	Add an icon for FilePageSetup.
-
-2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #477045
-
-	* evolution-composer-entries.xml:
-	* evolution-addressbook.xml:
-	* evolution.xml:
-	* evolution-mail-message.xml:
-	* evolution-event-editor.xml:
-	* evolution-message-composer.xml:
-	* evolution-calendar.xml:
-	* evolution-memos.xml:
-	* evolution-subscribe.xml:
-	* evolution-tasks.xml:
-	* evolution-editor.xml:
-	* evolution-task-editor.xml:
-	* evolution-mail-list.xml:
-	Use standard icon names where applicable.
-
-2007-07-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #446894
-
-	* evolution.xml:
-	Add a FilePageSetup command, and a corresponding menu item within
-	the Print place holder.  Net result is to add a "File -> Page Setup"
-	menu item to all components, just above the print menu items.
-
-2007-05-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* evolution-mail-global.xml: Menu for sync for offline
-	* evolution-mail-list.xml: F5 as shortcut for folder refresh.
-
-2007-05-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #325966 from Christian Neumair  
-
-	* evolution-addressbook.xml:
-	* evolution-mail-list.xml:
-
-2007-05-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #378438 from Ebby Wiselyn
-
-	* evolution-event-editor.xml:
-	* evolution-mail-list.xml:
-	* evolution-mail-message.xml:
-	* evolution-message-composer.xml:
-
-2007-02-26  Veerapuram Varadhan  <vvaradhan@novell.com>
-
-	** Fixes #401546
-
-	evolution-message-composer.xml: Remove accelarator key for Send
-	Options menu item.
-	
-2007-01-18  Raghavendran R <raghavguru7@gmail.com>
-	
-	* evolution-message-composer.xml: Added Send options button 
-	  under Insert menu item in composer .
-	  Added toolitem for Send Options .
-
-2006-08-07  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* evolution-mail-list.xml:
-	* evolution.xml: Fixed a mnemonic issue with La_yout, so that 'Y"
-	doesnt get the underline (HIG).
-
-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
-	for Empty Trash
-
-	* evolution-mail-message.xml: Set the MessageDelete icon as a pixbuf
-	from the code
-	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>
-
-	* evolution-calendar.xml: Add mnemonics. Fixes bug #330936.
-	Fix uppercase usage to be HIG compliant for tooltips.
-
-2006-02-10  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* evolution-event-editor.xml: Fix some mnemonics and HIG compliant
-	uppercase usage. Fixes bug #327932.
-
-2006-02-05  Andre Klapper <a9016009@gmx.de>
-
-	* evolution-mail-message.xml:
-	* evolution-tasks.xml:
-	harmonizing plural forms of tooltips and status messages;
-	fixing a few bugs (#311474)
-
-2006-02-05  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* evolution-mail-list.xml: Properly renamed "Mark Messages as
-	Read" to read Mark All Messages, fixing bug #325787.
-
-2006-01-30  Rajeev Ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	* evolution.xml: Added a menu item for show/hide side bar.
-	Also changed the mnemonics for toobar.
-
-2006-01-30  Rajeev Ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	** Fixes bug #327304
-	
-	* evolution-calendar.xml: Added pixbuf for calendar prev/next buttons
-	instead of stock icons.
-
-2006-01-18  Rajeev Ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	** Fixes bug #328150
-
-	* evolution-memo-editor.xml: Added a new xml file for memos.
-	* Makefile.am: Added new file to the build
-
-2006-01-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bugs #328513, #328514, #328551, #328553, #328558, #328559, #328560
-	* evolution-addressbook.xml:
-	* evolution-event-editor.xml:
-	* evolution-task-editor.xml:
-	* evolution.xml:
-	
-	Added mnemonics for missing menu items, solved few mnemonics clash and
-	C+A+S to C+S for save contact in address book.
-
-2005-12-12  Devashish Sharma <sdevashish@novell.com>
-
-	* evolution-addressbook.xml : Added menu items for address book 
-	operations.
-
-2006-01-22  Ranjan Somani  <sranjan@novell.com>
-
-	* ui/evolution-mail-message.xml: Removed the extra toolbar separator 
-	 Fixes #326387
-
-2006-01-19  Andre Klapper <a9016009@gmx.de>
-
-	* evolution-meesage-composer.xml: changing British English to
-	American English. Fixes bug 326637.
-
-2006-01-19  Andre Klapper <a9016009@gmx.de>
-
-	* evolution.xml: changing "_About Evolution..." to "_About" to be
-	HIG-compliant. Fixes bug 327309.
-
-2006-01-16  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* evolution-mail-list.xml: Adds two new menu items for collapse and
-	expand of all threads.
-
-2006-01-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #326458
-	
-	* evolution-editor.xml: Removes a useless separator.
-	* evolution-event-editor.xml: Changes string Show Time Zone to Time
-	Zone.
-
-2006-01-13  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #326265, #326266
-
-	* evolution-mail-global.xml: Changed mnemonics of Message Filters menu
-	item.
-	* evolution-mail-message.xml: Added menmonics of Message Source menu
-	item.
-	* evolution.xml: Chaned mnemonics of Import menu item.
-
-2006-01-13  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #326381
-	
-	* evolution-message-composer.xml:
-	* evolution-signature-editor.xml
-	Changed _Insert to I_nsert.
-
-2006-01-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* evolution-mail-global.xml:
-	* evolution-mail-message.xml:
-	* evolution-message-composer.xml:
-	* evolution.xml:
-
-	Changes accelerator assignment specified in 
-	http://go-evolution.org/Shortcut_Keys_Review
-
-2006-01-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* evolution-editor.xml:
-	* evolution-tasks.xml: More changes. Refer url below.
-
-2006-01-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* evolution-calendar.xml:
-	* evolution-task-editor.xml: Fix accelerators
-	(UI Hackfest - see http://go-evolution.org/Shortcut_Keys_Review)
-
-2006-01-12  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* evolution-composer-entries.xml: Fix #325110
-	Override cut, copy and paste commands defined in gtkhtml
-
-2006-12-02  Karsten Bräckelmann  <guenther@rudersport.de>
- 
- 	* evolution.xml: Remove the Mailer specific separator.
-	* evolution-mail-global.xml: Move it here.
- 
- 	This adds the separator always between the global SendReceive and
-	the component specific buttons. Fixes #323151.
-
-2006-01-01  Harish Krishnaswamy <kharish@novell.com>
-	
-	* evolution-executive-summary.xml : Remove 
-	ui/evolution-executive-summary.xml from CVS.
-	Fixes #325120.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* evolution-calendar.xml:  Fixing several typos and harmonizing
-	  capital/small letters. Partially fixes bug 306117.
-
-2005-12-19  Andre Klapper <a9016009@gmx.de>
-
-	* evolution.xml: fixed duplicated mnemonic.
-          Fixes bug 319946.
-
-2005-12-31  Harish Krishnaswamy <kharish@novell.com>
-	
-	* evolution-mail-message.xml : Revert the patch committed
-	for shortcut to mark spam (see 2005-12-16 below) 
-	as it uses an existing accel.
-	
-2005-12-23  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #324677
-
-	* evolution-mail-message.xml: Added Clear and
-	Completed flag options to menu.
-
-2005-12-22  M Victor Aloysius J  <victoraloy@gmail.com>
-
-	** Fixes bug #313293
-
-	* evolution.xml: Added Shortcut for preferences.
-
-2005-12-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* evolution-mail-message.xml: Reverting David's patch
-	for ellipsis, for discussing it again and to close for all
-	menu items.
-
-2005-12-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* evolution-editor.xml: Added tooltips for Attachment
-	* evolution-event-editor.xml: Added tooltips for Alarms
-
-2005-12-19  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	committing for David Trowbridge <trowbrds cs colorado edu>
-	
-	* evolution-calendar.xml: Removed the Publish FreeBusy menu item.
-
-2005-12-16  Shreyas Srinivasan  <sshreyas@novell.com>
-
-	* evolution-mail-message.xml: Fix #315901, Add shortcut to 
-	mark spam. Committed on behalf on Andre Klapper
-	
-2005-12-16  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bugs #322499 and #227853
-
-	* evolution-addressbook.xml: Modified shortcut for preview
-	* evolution-mail-global.xml: Modified shortcut for preview
-	* evolution-tasks.xml: Modified shortcut for preview
-	* evolution.xml: Removed Shortcut to hide status bar.
-
-2005-12-14  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	** Fixes the bug #316897
-
-	* evolution-mail-message.xml: Removed MoveToFolder and CopyToFolder
-	from the evolution tool bar to make it small.
-
-2005-12-13  David Malcolm  <dmalcolm@redhat.com>
-
-	* evolution-mail-message.xml: Add ellipsis characters to various menu
-	items that are commands/actions requiring further user interaction,
-	fixing bug #323951
-
-2005-12-03  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* evolution-mail-message.xml: Properly renamed Reply to All, adding
-	the menu shortkey back, fixing bug #323108.
-
-2005-12-07  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* evolution-message-composer.xml: Add menu item for prioritising
-	message
-
-2005-11-22  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* evolution-mail-message.xml: Re-established sane Reply* menu order,
-	fixes bug #321639.
-
-	Committing patch on behalf of guenther. - partha
-
-2005-11-22  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* evolution-mail-message.xml: Re-added the ForwardAs submenu,
-	fixes regression bug #321640.
-	
-	Committed on behalf of Karsten, since he does not have commit
-	rights.
-
-2005-11-18  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* evolution-event-editor.xml: Removed the timezone
-	entry from the toolbar.
-
-2005-11-16  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* evolution-event-editor.xml: Removed the view attendee
-	from menu bar and corrected the recurrence spelling.
-	* Makefile.am:
-	* evolution-task-editor.xml: Added the file for task
-	editor.
-
-2005-11-14  Srinivasa Ragavan <sragavan@novell.com>
-
-	* Makefile.am: Added two ui files evolution-editor.xml
-	and evolution-event-editor.xml.
-
-2005-11-10  Sankar P  <psankar@novell.com>
-
-	* evolution-mail-message.xml: added keyboard accelerators for 
-	NextMessage and PreviousMessage.
-	Fixes #302974
-
-2005-10-19 Harish Krishnaswamy <kharish@novell.com>
-
-	Committing for Nathan Owens <pianocomp81@yahoo.com>
-
-	* evolution-memos.xml: added menus for memos component
-	* Makefile.am: added evolution-memos.xml to build files
-
-2005-10-18  Srinivasa Ragavan <sragavan@novell.com>
-
-	* evolution-mail-global.xml: Added a keybinding to focus search bar
-	entry
-
-2005-10-06  Srinivasa Ragavan <sragavan@novell.com>
-
-	* evolution-addressbook.xml: Change preview pane to Contact Preview.
-	* evolution-mail-global.xml: 
-	* evolution-tasks.xml: Add task show/hide preview toggle button.
-
-	Make C+S+V as the short cut for show/hide preview uniformly, across 
-	evolution.
-	
-2005-09-24  Andre Klapper  <a9016009@gmx.de>
-	* evolution-message-composer.xml: changing the order of the
-	main menu items due to HIG (#308614)
-
-2005-09-23  S.Antony Vincent Pandian <santony@gmail.com>
-
-	* evolution.xml: Have added the "View Status Bar" under the "View" menu
-	This is a toggle button to hide/show the status bar
-
-2005-08-26  Andre Klapper  <a9016009@gmx.de>
-	* evolution-mail-list.xml: Fixing mnemonic conflict (#314351)
-
-2005-08-17  Rodney Dawes  <dobey@novell.com>
-
-	* evolution-mail-global.xml: Remove the MailPost command
-	* evolution-mail-message.xml: Move the MailPost command to here
-	Add a menu item for the MailPost command (#312225)
-	
-	* evolution-mail-list.xml: Add a menu item for the EditSelectThread
-	command	(#306878)
-	
-	Fixes #306878 and #312225
-
-2005-08-07  Rodney Dawes  <dobey@novell.com>
-
-	* evolution-mail-global.xml: Fix the tooltip for the
-	Edit->Search Folders menu item to say "Search Folders" as well
-
-	* evolution-mail-message.xml: Fix the tooltips and text for the menu
-	items to create vfolders from message parts to say "Search Folder"
-
-2005-08-05  Devashish Sharma <sdevashish@novell.com>
-
-	* evolution-message-composer.xml: Uisng the label "Save Draft" instead
-	of "SaveDraft". Fixes #219242
-
-2005-08-05  Devashish Sharma <sdevashish@novell.com>
-
-	* evolution-addressbook.xml: Removes translation issue. Fixes #261971
-
-2005-08-02  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail-message.xml: re-added the post-reply function.
-	There's no way to use news otherwise, duh.  See #302843.
-
-2005-07-28  Rodney Dawes  <dobey@novell.com>
-
-	* evolution-mail-list.xml: The command name for hiding selected
-	messages needs to be ViewHideSelected, not ViewShowSelected
-
-2005-07-28 Vivek Jain <jvivek@novell.com>
-	
-	* evolution-mail-list.xml: HideDeleted has to be a toggle
-	button.
-	**Relevant Comments on #309163
-
-2005-07-25  Viren.l <lviren@novell.com>
-
-	* evolution-tasks.xml: Added 2 submenus under action menu.
-	Fixes #248126
-
-2005-07-21 Devashish Sharma <sdevashish@novell.com>
-	* evolution-message-composer.xml: Added Shortcut for Save Draft
-	   -(Ctrl+Shift+S) and a toolbar button for the same.
-	    Fixes #219242
-	    
-2005-07-21  Not Zed  <NotZed@Ximian.com>
-
-	* evolution.xml: removed the useless tools menu.
-
-	* evolution-mail-list.xml: reverted dobey's broken hide menus.
-
-2005-06-03  ANdre Klapper <a9016009@gmx.de>
-	* evolution-mail-message.xml: Removing duplicate mnemonic,
-	this fixes bug 306153
-
-2005-05-31  Rodney Dawes  <dobey@novell.com>
-
-	* evolution-mail-list.xml: Rename ViewHideSelected to ViewShowSelected
-	Enable the "Show Messages" sub-menu under "View"
-
-	Fixes #305376
-
-2005-05-16  Srinivasa Ragavan <sragavan@novell.com>
-	
-	* evolution-message-composer.xml: Removed the Show Attachment
-	  menu item, since the attachment bar cannot be made hidden 
-	  any more and is visible always
-	  
-2005-05-13  Rodney Dawes  <dobey@novell.com>
-
-	* *.xml: Update to the new menu layout
-
-2005-05-06  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #301459
-	* evolution-message-composer.xml: Fixed the typo error.
-
-2005-04-08  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-message-composer.xml: change the label to "Request
-	read receipt".
-
-2004-03-31  ERDI Gergo  <cactus@cactus.rulez.org>
-
-	* evolution-message-composer.xml: Added new menu item for
-	requesting message receipts when composing a new message
-
-2005-02-14  Rodney Dawes  <dobey@novell.com>
-
-	* evolution-mail-list.xml:
-	* evolution-mail-message.xml: Move a separator from the message xml
-	to the list xml, so we don't have an extra separator in the external
-	mail message display window
-
-2005-02-01  Rodney Dawes  <dobey@novell.com>
-
-	* evolution-mail-global.xml:
-	* evolution-mail-message.xml:
-	Use the term vFolder instead of "VFolder" or "virtual folder"
-
-	Fixes #68137
-
-2005-01-24  Rodney Dawes  <dobey@novell.com>
-
-	* evolution-mail-global.xml: Add C-A-m as a keybinding for the
-	"Post New Message" menuitem
-	Add C-S-m to the "Compose New Message" menuitem as well
-
-	Fixes #68352
-
-2005-01-04  JP Rosevear  <jpr@novell.com>
-
-	* evolution.xml: add component button view items
-	
-	* evolution.xml: set the toolbar look to "system" everywhere
-	
-	* evolution-signature-editor.xml: ditto
-
-	* evolution-message-composer.xml: ditto
-
-2005-01-04  JP Rosevear  <jpr@novell.com>
-	
-	* Makefile.am: remove dead files
-
-2004-12-16  Rodney Dawes  <dobey@novell.com>
-
-	* evolution.xml: Move Tools->Settings... to Edit->Preferences
-	Remove the separator above "Quick Reference" in the Help menu
-
-	* evolution-addressbok.xml:
-	* evolution-calendar.xml:
-	* evolution-mail-*.xml:
-	* evolution-tasks.xml:
-	Update the EditPlaceholder items to work properly with the changes in
-	evolution.xml to move Tools->Settings... to Edit->Preferences
-
-	Fixes #43681
-
-2004-12-16  Rodney Dawes  <dobey@novell.com>
-
-	* evolution-mail-message.xml: Add stock zoom icons for the text size
-	menu items
-
-2004-12-09  Rodney Dawes  <dobey@novell.com>
-
-	* evolution.xml: Add pixtype of pixbuf to the OpenNewWindow menu item
-
-2004-11-23  Hao Sheng <hao.sheng@sun.com>
-
-	* evolution-addressbook.xml: Binding Sun Type 6 Keyboard's 
-	Copy, Paste and Cut keys.
-
-2004-10-18  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #67864.
-
-	* evolution.xml: change the shortcut for toolbar to b.
-
-2004-06-22  V Ravi Kumar Raju <vravikr@yahoo.co.uk>
-
-	* evolution-addressbook.xml: Remove the Menu Seperator in View
-	Menu when in the contacts view.
-
-2004-06-05  Christian Neumair  <chris@gnome-de.org>
-
-	* evolution-mail-list.xml: Remove trailing "..." from folder
-	properties menuitem.
-
-2004-06-01  William Jon McCann  <mccann@jhu.edu>
-
-	* evolution.xml: Add toolbar visibility toggle to View menu.
-
-2004-05-28  JP Rosevear  <jpr@novell.com>
-
-	* evolution.xml: changed to About Evolution; comment out FAQ
-
-2004-05-25  William Jon McCann  <mccann@jhu.edu>
-
-	* evolution-message-composer.xml: 
-	* evolution-composer-entries.xml: 
-	* evolution-contact-list-editor.xml: 
-	* evolution-contact-editor.xml: 
-	* evolution.xml: 
-	* evolution-mail-message.xml: 
-	* evolution-mail-list.xml: 
-	* evolution-mail-global.xml: 
-	* evolution-addressbook.xml: use stock icons where possible.
-	Calendar and tasks already use stock icons.
-
-	* evolution-tasks.xml: swap positions of delete and print icons
-	to be consistent with the other components.
-
-2004-05-19  Not Zed  <NotZed@Ximian.com>
-
-	* evolution.xml: Added View->Window menu.
-
-2004-05-18  Jerome Lacoste  <jerome@coffeebreaks.org>
-
-	Fixes bug #57940
-
-	* evolution-addressbook.xml: "Save as VCard" -> "Save as VCard..."
-
-2004-05-14  Jeffrey Stedfast  <fejj@novell.com>
-
-	* evolution-mail-message.xml: Rename MessageResend to MessageEdit
-	since that's actually what it does.
-
-2004-05-06  Rodney Dawes  <dobey@ximian.com>
-
-	* evolution-mail-message.xml: Make some more toolbar and menu items
-	use the stock versions of icons
-
-	Fixes #57963 partly
-
-2004-04-30  Dave Fallon <davef@tetsubo.com>
-
-       * ui/evolution-addressbook.xml: Fixed Bug #57611.
-
-2004-04-15  JP Rosevear <jpr@ximian.com>
-
-	* evolution-comp-editor.xml: remove "Save" only option
-
-2004-04-09  Dan Winship  <danw@ximian.com>
-
-	* evolution.xml: Update for "New" changes. Move "New Window" into
-	File menu.
-
-2004-04-06  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail-message.xml: moved goto stuff to the view menu.
-
-2004-03-31  William Jon McCann  <mccann@jhu.edu>
-
-	* evolution-tasks.xml: 
-	* evolution-calendar.xml: add missing labels to dock items.
-
-2004-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ part of fix for bug #53634 ]
-	
-	* evolution-addressbook.xml: remove the Tools submenu placeholder
-	foo.
-
-2004-03-22  Hari Prasad Nadig <hp@ndeepak.info>
-
-	* evolution-calendar.xml: Naming issue resolved ( Bug 48293 )
-
-2004-03-08  Radek Doulik  <rodo@ximian.com>
-
-	* evolution-mail-message.xml: added filter junk command and
-	menuitem, icon for MarkAsNotJunk
-
-2004-02-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-message.xml: Assign Delete and KP_Delete as
-	accels for the MessageDelete menu item.
-
-2004-02-23  Dan Winship  <danw@ximian.com>
-
-	* my-evolution.xml: Remove (this was the Summary's UI file)
-
-	* Makefile.am (XML_FILES): Remove my-evolution.xml
-
-2004-02-11  Rodney Dawes  <dobey@ximian.com>
-
-	* evolution-mail-message.xml: Add sender to Address Book, not
-	Addressbook
-
-2004-01-26  David Trowbridge <trowbrds@cs.colorado.edu>
- 
- 	* evolution.xml: added "Quick Reference" menu item
- 
-2004-01-27  Rodney Dawes  <dobey@ximian.com>
-
-	* evolution-mail-message.xml: Enable [, ], ., and , as mail accels
-	again, but not in the menus, so that GTK+ doesn't grab them from the
-	search bar
-
-2004-01-26  Rodney Dawes  <dobey@ximian.com>
-
-	* evolution-addressbook.xml:
-	* evolution-mail-global.xml:
-	* evolution-mail-message.xml: Get rid of all the *Shift*character
-	keybindings, so people can actually type things in the search bar,
-	Just use *Control*basekey instead
-
-	Fixes #41769
-
-2004-01-23  Rodney Dawes  <dobey@ximian.com>
-
-	* evolution-mail-list.xml: Fix Folder submenu location
-	* evolution.xml: Add ComponentPlaceholder back to File menu
-
-	Fixes #51960
-
-2004-01-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-mail-global.xml: moved 'Forget Passwords' item...
-
-	* evolution.xml: ...to the shell.
-
-2004-01-12  Meilof Veeningen  <meilof@wanadoo.nl>
-
-	* evolution-message-composer.xml: Add menu items to show To and
-	PostTo
-
-2004-01-06  Rodney Dawes  <dobey@ximian.com>
-
-	* evolution-mail-messagedisplay.xml: Fix missing ">" typo
-
-2004-01-06  Rodney Dawes  <dobey@ximian.com>
-
-	* evolution-comp-editor.xml:
-	* evolution-contact-editor.xml:
-	* evolution-contact-list-editor.xml:
-	* evolution-event-editor.xml:
-	* evolution-mail-messagedisplay.xml:
-	* evolution-message-composer.xml:
-	* evolution-signature-editor.xml:
-	* evolution.xml: Fixes bug #39488, use hlook="system" for toolbars
-
-2003-12-31  Kidd Wang  <kidd.wang@sun.com>
-
-	* evolution-tasks.xml: Add a menu item [Open Task] to [File] for
-	the tasks component.
-
-2003-12-23  Kidd Wang  <kidd.wang@sun.com>
-
-	* evolution-calendar.xml: Add a menu item [Open Appointment] to [File].
-
-2003-12-18  Rodney Dawes  <dobey@ximian.com>
-
-	* evolution-mail-message.xml:
-	* evolution-mail-messagedisplay.xml: Revert previous patch to
-	fix bug #49949 - exposes crash in libbonoboui when switching
-	away from mail component
-
-2003-12-18  Calvin Liu <calvin.liu@sun.com>
-
-	* evolution-mail-message.xml: On [Action] menu, change [Forward]
-	to [Forward As...], [Forward Message] to [Forward].
-
-2003-12-17  Rodney Dawes  <dobey@ximian.com>
-
-	* evolution-mail-message.xml:
-	* evolution-mail-messagedisplay.xml: Fix bug #49949
-
-2003-12-17  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-addressbook.xml: add ContactsViewPreview command, a
-	"Preview Pane" menu item, and a keybinding for it - same placement
-	as the mailer's item.
-
-2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-calendar.xml: removed the 'NewCalendar' verb.
-
-2003-12-09  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail-global.xml: add a _label to View option.  Bug
-	#51242.
-
-2003-12-04  Radek Doulik  <rodo@ximian.com>
-
-	* evolution-mail-message.xml: added junk toolbar buttons
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* evolution-mail-global.xml: we want to insert at the place holder
-	spot
-
-2003-11-30  Yuedong Du  <yuedong.du@sun.com>
-
-	* evolution-mail-list.xml: change shortcut of 'invert selection' from
-	ctrl+I to shift+ctrl+I.
-
-2003-11-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-calendar.xml: removed the 'New...' items, since they are
-	implemented in the shell as before.
-
-2003-11-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Rename verb "OpenFolderInNewWindow" to
-	"OpenNewWindow".  Add a separator before it in the File -> New
-	submenu.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Remove type="toggle" from the "ToggleOffline"
-	verb; I'm not sure why it was there in the first place and it was
-	causing BonoboUI to spew warnings.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Ooops, add missing closing </popups> tag.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add back send/receive command and toolbar button.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add "NewPopup" popup back.
-
-2003-10-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-calendar.xml: removed stock icon for "NewCalendar"
-	verb, and added items for creating calendar events.
-
-2003-10-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-calendar.xml: added 'New Calendar' menu item.
-
-2003-10-10  Hans Petter Jansson  <hpj@ximian.com>
-
-	* evolution-calendar.xml: Add calendar list view task button.
-
-2003-10-02  Rodney Dawes  <dobey@ximian.com>
-
-	* evolution-mail-message.xml: Patch to use Control-L for "Reply
-	to list" from Karsten Bräckelmann
-
-2003-08-27  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail-message.xml: Moved EditCopy EditPaste, and
-	EditCut here.
-
-	* evolution-mail-list.xml: Removed EditCopy, EditPaste, and
-	EditCut.
-
-2003-09-11  Tim Wo <tim.wo@sun.com>
-
-	* evolution-contact-editor.xml: add mnemonic "C" for "Save and _Close",
-	"D" for "_Delete", "l" for "Close". Fixes bug #48096
-	* evolution-contact-list-editor.xml: add mnemonic "C" for "Save and
-	_Close", "D" for "_Delete", "l" for "Close". Fixes bug #48096
-	* evolution-signature-editor.xml: add mnemonic "C" for "Save and
-	_Close", change mnemonic "C" to "l" for "Close".  Fixes bug #48205
-
-2003-09-05  Yuedong Du  <uuedong.du@sun.com>
-
-	* evolution-mail-global.xml: add access key 'w' for 'Post New Message'
-	* evolution-mail-list.xml: change the access key of Expunge to 'x',
-	thus 'Post a Reply' can use 'e'.
-	* evolution-mail-message.xml: add access key 'y' for 'Post a Reply'
-
-2003-08-27  Calvin Liu <calvin.liu@sun.com>
-
-	* evolution-mail-message.xml: Change "Search Message" to "Search
-	in Message", which is more intuitive. Fix bug #47329.
-
-2003-08-05  Jack Jia  <jack.jia@sun.com>
-
-	* evolution-comp-editor.xml: add the accelerator "P" for "Print",
-	"S" for "Save", "C" for "Save and _Close", "A" for "Save _As...",
-	"D" for "Delete". Fixes bug #47379.
- 
-2003-07-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Cleaned up a bunch of menu and toolbar items that
-	are not being used or do not belong to the shell anymore in the
-	new UI.  Also removed all pop-up menus.
-
-2003-07-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-tasks.xml: s/Expunge/Purge.
-
-	* evolution-calendar.xml: fixed menmonic for Purge.
-
-2003-07-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-calendar.xml: added 'Purge' menu item.
-
-	* evolution-tasks.xml: added separator after 'Send/Receive'.
-
-2003-07-10  Yuedong Du  <yuedong.du@sun.com>
-
-	* evolution-mail-message.xml: add a menu entry corresponding to new
-	introduced caret mode, see bug #44607
-
-2003-07-09  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-mail-list.xml: Change the accelerator for "Mark All Read"
-	to be "R". Fixes bug #45811. 
-
-2003-07-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #45524
-
-	* evolution-tasks.xml:
-	* evolution-calendar.xml: use stock icons where appropriate.
-
-2003-06-25  Bolian Yin <bolian.yin@sun.com>
-
-	Fixes #45423
-
-	* evolution-calendar.xml: added keyboard shortcuts for "Go to today"
-	and "Go to date" menu/toolbar items.
diff --git a/ui/ChangeLog.pre-1-4 b/ui/ChangeLog.pre-1-4
deleted file mode 100644
index ebb65415fd..0000000000
--- a/ui/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,1894 +0,0 @@
-2003-05-29  Rodney Dawes  <dobey@ximian.com>
-
-	* evolution-addressbook.xml: Fix binding conflict with Print/Preview
-	
-2003-05-01  JP Rosevear  <jpr@ximian.com>
-
-	* evolution.xml: file all new folder bindings to be ctrl-shift-f
-
-2003-04-28  Rodney Dawes  <dobey@ximian.com>
-
-	* evolution.xml: Changed the New Folder keybinding to C-S-f
-	
-2003-04-23  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution.xml: Changed the placement and label of "Create New Folder"
-	to be consistent with the terms/layout used for other (namely
-	the shortcut bar) pop-up menus. 
-
-
-2003-04-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #22444
-
-	* evolution-calendar.xml: added occurrence-related menu items.
-
-2003-04-17  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-signature-editor.xml: Remove the Help menu.
-	'Fix' for #38927.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #39763 ]
-	* evolution-composer-entries.xml: This is merged in by the text
-	fields/EEntry's in the composer when they're focused.
-	
-	* Makefile.am (XML_FILES): add evolution-composer-entries.xml.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40841 ]
-	* evolution-addressbook.xml: change the Save As VCard keybinding
-	to C-A-s, to match the mailer's Save As keybinding.
-
-2003-03-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #40212 ]
-	* evolution-contact-editor.xml: change accelerator for Save
-	As... to Control-Shift-s
-
-	* evolution-contact-list-editor.xml: same.
-
-2003-03-20  JP Rosevear  <jpr@ximian.com>
-
-	* evolution.xml: remove conduit settings as a separate entry
-
-2003-02-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-message.xml: Make "MessageReplyList" and
-	"MessagePostReply" have no pixbuf.
-	* evolution-mail-global.xml: Same with "MailPost".
-
-2003-02-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* evolution-event-editor.xml: Fix an attributes typo.
-
-2003-02-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* evolution-comp-editor.xml: Fix an attributes typo and add stock
-	icon identifiers to silence warning spew.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (uidir): Removed (this is now defined in
-	configure.in).
-
-2002-11-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-message-composer.xml: Change hlook value for "Toolbar"
-	to be "both_horiz".
-	* evolution-signature-editor.xml: Likewise.
-	* evolution-mail-messagedisplay.xml: Likewise.
-	* evolution-event-editor.xml: Likewise.
-	* evolution-contact-list-editor.xml: Likewise.
-	* evolution-contact-editor.xml: Likewise.
-	* evolution-comp-editor.xml: Likewise.
-
-2002-11-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Change hlook value for Toolbar to be
-	"both_horiz".
-
-2002-11-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (uidir): Install in $(datadir)/gnome-2.0/ui.
-
-2002-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Set the pixtype for command "Settings" to
-	"pixbuf".
-
-2002-10-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-list.xml: Made tooltips more clear.
-
-2002-10-04  Dan Winship  <danw@ximian.com>
-
-	* evolution.xml: Remove "..." from "Remove Other User's Folder"
-	since it doesn't pop up a dialog. #31576.
-
-2002-09-30  Aaron Weber  <aaron@ximian.com>
-
-	* evolution-mail-message.xml: setup/set up
-
-	* evolution-executive-summary.xml: Customize is spelled with a Z
-	in us english, and an S elsewhere. Nitpicky!
-
-2002-09-30  Dan Winship  <danw@ximian.com>
-
-	* evolution.xml: Add FileRemoveOtherUsersFolder
-
-2002-09-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-global.xml: Change the accelerator of
-	ToolsSubscriptions to be "u".
-
-	* evolution.xml: Add PilotConduitSettings in Tools.  Rename
-	"Preferences" to "Settings" as per Anna's request.
-
-2002-09-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-message.xml: Make the Zoom accels the same as
-	galeon so people will shut the fuck up about it.
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-message.xml: Add back "period" and "comma" as
-	accels for MailNextUnread and MailPreviousUnread.
-
-2002-09-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-message.xml: Use "bracketright" and "bracketleft"
-	for MailNextUnread and MailPreviousUnread.
-
-2002-08-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: New placeholder at
-	FolderPopup/StorageFolderPropertiesPlaceholder.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-global.xml: Remove "New Mail Message" and "Post
-	Message" items.
-
-2002-07-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Move File/New/NewItems placeholder on the top and
-	add some separators.  Also add items to the popups/NewPopup so the
-	pop-up and the "New" submenu look the same.
-
-	* evolution-addressbook.xml: Remove ContactNew and ContactNewList
-	verbs, as well as the corresponding menu items.
-
-2002-07-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Add a View/Post-To ui dingus.
-
-	* evolution-mail-global.xml: Add a Post ui dingus.
-
-	* evolution-mail-message.xml: Add a Post-Reply ui dingus.
-
-2002-07-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-message.xml: Use *Control*equal and *Control*minus
-	for TextZoomIn and TextZoomOut instead of *Control*+ and
-	*Control*-, since the former actually works.  :-)
-
-2002-07-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-message.xml: Bind MessageMove to Control-Shift-V.
-	[#24394]
-
-	* evolution-addressbook.xml: Bind ContactsMoveToFolder and
-	ContactsCopyToFolder to Control-Shift-V and Control-Shift-Y for
-	consistency with the mailer.  Also move "Select All" up in the
-	Edit menu and add a separator before "Delete".
-
-2002-07-23  Larry Ewing  <lewing@ximian.com>
-
-	* evolution-message-composer.xml: changed accel for HTML from T to
-	M to avoid conflict with other menu items.
-
-2002-07-22  Radek Doulik  <rodo@ximian.com>
-
-	* evolution-message-composer.xml: removed insert file as gtkhtml
-	editor has this now
-
-2002-07-18  Peter Williams  <peterw@ximian.com>
-
-	* evolution-signature-editor.xml: Add a tooltip to the Save item
-	as per bug 27901.
-	
-2002-07-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Change shortcut for "PilotSettings" to be `l'
-	instead of `p', so it doesn't conflict with "_Preferences".
-	[#27948]
-
-2002-07-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-signature-editor.xml: Add a Control-Return accel for
-	"FileSaveClose".
-
-	* evolution-contact-list-editor.xml: Add a Control-Return accel for
-	"ContactListEditorSaveClose".
-
-	* evolution-contact-editor.xml: Add a Control-Return accel for
-	"ContactEditorSaveClose".
-
-2002-07-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add an accelerator for "FileClose".
-
-2002-07-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#10068]
-
-	* evolution-mail-message.xml: Add accelerator for "Print Preview",
-	"Delete".
-
-	* evolution-addressbook.xml: Add accelerator for "Print Preview",
-	"Delete".
-
-2002-07-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-message.xml: s/Edit as New Message/Resend - this
-	was confusing people. Also moved it to the Actions menu. Fixes bug
-	#27454.
-
-2002-07-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Removed the Send Later verb.
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Added a bunch of tooltips.
-
-2002-06-06  jacob berkman  <jacob@ximian.com>
-
-	* evolution-addressbook.xml: 
-	* evolution-mail-global.xml: add a 'stop' menu item (fixes ximian
-	#17242)
-
-2002-05-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Put the search menu in a SearchPlaceholder.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-event-editor.xml: Add a toolbar item for
-	ActionScheduleMeeting.
-
-2002-05-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-mail-global.xml: Replaced q binding with ` for
-	hiding/showing the message view pane.
-
-	* evolution-mail-message.xml: Replace n/p with ,/. for doing
-	previous/next unread messages.  Removed a few other bindings that
-	interfere with alphanumeric characters.
-
-2002-05-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add FileOpenOtherUsersFolder.
-
-2002-04-08  Dan Winship  <danw@ximian.com>
-
-	* evolution-calendar.xml: Fix bad xml.
-
-2002-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml: Added missing </submenu> tag.  Remove
-	bogus "Dump" menu item.
-
-2002-03-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-global.xml: Removed the "Mail Settings" stuff.
-
-2002-03-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Move the ComponentActionsPlaceholder into the
-	Actions menu, instead of the Actions menu being in the
-	ComponentActionsPlaceholder.
-	* evolution-addressbook.xml: Updated accordingly.
-	* evolution-calendar.xml: Updated accordingly.
-	* evolution-mail-global.xml: Updated accordingly.
-	* evolution-mail-list.xml: Updated accordingly.
-	* evolution-mail-message.xml: Updated accordingly.
-	* evolution-mail-messagedisplay.xml: Updated accordingly.
-	* evolution-tasks.xml: Updated accordingly.
-
-	* evolution.xml: Add "SendReceive" verb, menu item and toolbar
-	button.
-
-	* evolution-mail-global.xml: Remove "MailGetSend" verb and menu
-	item.
-
-2002-03-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add a "Search" menu.
-
-	* my-evolution.xml: Remove "Settings" item.
-
-2002-03-14  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-tasks.xml: remove duplicate new items in the file
-	and action menus
-
-2002-03-14  JP Rosevear  <jpr@ximian.com>
-	
-	* evolution-calendar.xml: remove duplicate new items in the file
-	and action menus
-
-2002-03-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-tasks.xml: Remove the "Tasks Settings..." menu item.
-
-	* evolution-calendar.xml: Remove the "Calendar Settings..." menu
-	item.
-
-	* evolution-addressbook.xml: Remove the "LDAP Sources..." menu
-	item.
-
-2002-03-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add an entry to invoke the new unified config
-	dialog.
-
-2002-03-11  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-mail-message.xml: doh. In my previous commit, a whole
-	bunch of changes that were supposed to be kept in my personal evo
-	were added to HEAD. (Mainly, this was the addition of a "Search"
-	menu.) I am reverting the wrong parts of that patch, and am
-	committing only the accelerators which that patch was supposed to
-	add. Sorry.
-
-2002-03-08  Radek Doulik  <rodo@ximian.com>
-
-	* evolution-signature-editor.xml: added FormatHTML
-
-2002-03-07  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-mail-message.xml: Fixed tiny typo ("Addressbook", not
-	"Address book"), and cleaned up accelerators more, so that all of
-	them actually work. Also added accelerators to items in the Go To
-	menu and the Forward menu as part of fixing bug #10666.
-
-2002-03-07  Radek Doulik  <rodo@ximian.com>
-
-	* evolution-signature-editor.xml: added save & close on toolbar,
-	added C-s shortcut
-
-2002-03-04  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-tasks.xml: added Print & PrintPreview stuff.
-
-2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add NewComboButton and a separator.
-
-	* evolution-calendar.xml: remove CalendarNewAppointment and
-	CalendarNewTask from the toolbar.
-
-	* evolution-tasks.xml: Remove TasksNewTask button from the
-	toolbar.
-
-	* evolution-addressbook.xml: Remove ContactNew and ContactNewList
-	from the toolbar.
-
-	* evolution-mail-global.xml: Remove the MessageNew from the
-	toolbar.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-addressbook.xml: Added Copy to Folder and Move to
-	Folder in the Actions menu here.
-
-2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-message.xml: Added pixbufs to MarkAsImportant,
-	MarkAsRead and MarkAsUnread. Also added MessageFollowUpFlag verb.
-
-2002-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-calendar.xml: add new meeting item to Actions and
-	File->New
-
-2002-02-05  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-mail-message.xml: Changed "Forward As" to "Forward" to
-	improve grammar ("Forward As" implies an answer in the form of a
-	noun, while "Redirect" is a verb), and added accelerators to "Add
-	Sender to Addressbook" and "Redirect".
-
-2002-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-message.xml: Add MessageRedirect.
-
-2002-01-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-addressbook.xml: Added File->Open which calls the
-	ContactsView command.
-
-2002-01-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Remove "Dump" menu item.
-
-2002-01-15  Michael Meeks  <michael@ximian.com>
- 
-	* *.xml: for all separators, add a unique (per xml file) name
-	to each separator, so we don't get them conflicting across
-	merges and messing with the order; then give them a dummy attr
-	f="" to stop them being transparent, hmm.
- 
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-tasks.xml: add a mark as complete item
-	
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-tasks.xml: make spacing consistent with calendar xml
-	file, add expunge command and actions menu and add accelerator for
-	delete
-
-	* evolution-calendar.xml: add an accelerator for delete and put in
-	a separator to be consistent with the mailer
-
-2001-12-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-message.xml: Add an "Add Sender to Address Book"
-	menu item.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-contact-list-editor.xml: Consistency fixes with
-	standard contact editor.  Added Save As, Send As, and Send To.
-	Replaced Save toolbar with Save and Close and added Save and Close
-	menu item.  Added a trash icon.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* evolution-calendar.xml: Renamed the cut/copy/paste/delete
-	command/item/verb names to be consistent.
-
-2001-10-30  Larry Ewing  <lewing@ximian.com>
-
-	* evolution-signature-editor.xml: change Save into Save and close,
-	don't break the string freeze in the process.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-message-composer.xml: Added an EncodingPlaceholder,
-	shuffled around the items for the Edit menu a little bit.  Removed
-	"Delete All" which is too dangerous a command [especially without
-	confirmation as it is implemented now].
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-message-composer.xml: Remove separator from the end of
-	the "View" menu.
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* evolution-contact-list-editor.xml: Comment out the "Action"
-	submenu, which isn't hooked up to anything in the code and thus
-	does nothing.
-
-2001-10-25  Larry Ewing  <lewing@ximian.com>
-
-	* evolution-mail-message.xml: add separator before text size menu
-
-2001-10-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-addressbook.xml: Added Delete and BackSpace
-	keybindings here.  Fixes Ximian bug #2772.
-
-2001-10-22  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-message-composer.xml: Added an accelerator (H_TML) to
-	the Format->Html menu item.
-
-2001-10-20  Larry Ewing  <lewing@ximian.com>
-
-	* evolution-mail-message.xml: add text size menu.
-
-2001-10-01  Radek Doulik  <rodo@ximian.com>
-
-	* evolution-message-composer.xml: removed hidden Debug submenu,
-	it was causing empty little popup menu appear, which was somewhat
-	confusing, I hope Michael doesn't need it anymore
-
-	* evolution-signature-editor.xml: removed hidden Debug submenu
-
-2001-09-28  Iain Holmes  <iain@ximian.com>
-
-	* evolution.xml: Change the name of the Import label.
-
-2001-09-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Move the Tools menu outside the
-	ComponentToolsPlaceholder.
-	* evolution-addressbook.xml: Likewise.
-	* evolution-calendar.xml: Likewise.
-	* evolution-mail-global.xml: Likewise.
-	* evolution-mail-message.xml: Likewise.
-	* evolution-mail-messagedisplay.xml: Likewise.
-	* evolution-tasks.xml: Likewise.
-	* my-evolution.xml: Likewise.
-
-2001-09-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Don't allow the default toolbar to be
-	configurable.
-
-2001-09-06  Anna Marie Dirks  <anna@ximian.com> 
-
-	* evolution-contact-editor.xml: Changed "Save" to "Save and Close"
-	
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #5503, Edit menu is empty and should be removed.]
-
-	* evolution-addressbook.xml: Put the Edit menu in the
-	EditPlaceholder.
-	* evolution-calendar.xml: Likewise.
-	* evolution-mail-list.xml: Likewise.
-	* evolution-mail-global.xml: Likewise.
-	* evolution-mail-message.xml: Likewise.
-	* evolution-mail-messagedisplay.xml: Likewise.
-	* evolution-tasks.xml: Likewise.
-
-	* evolution.xml: Don't put an Edit menu here.  Instead, put a
-	EditPlaceholder instead.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: s/Evolution/Ximian Evolution/.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-message.xml: Change "Copy to Folder" to be
-	Ctrl-Shift-Y so we are more like O* and don't get in the way of
-	the Ctrl-Shift-C for "New Contact".
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-global.xml: Add an F9 accelerator for the
-	"Send/Receive" item.
-
-2001-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-message.xml: Add an accel for Search Message.
-
-2001-08-29  Peter Williams  <peterw@ximian.com>
-
-	* evolution-mail-message.xml: Add a pixtype to 
-	/Commands/MessageUndelete so that people can see the icon.
-
-2001-08-23  Larry Ewing  <lewing@ximian.com>
-
-	* evolution-mail-message.xml: added ... to Search Message to
-	indicate that it pops up a dialog.
-
-2001-08-21  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-calendar.xml: 'All-Day' -> 'All Day' to be consistent
-	everywhere.
-	Added tip for 'New Task'.
-	
-2001-08-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-list.xml: Move the ChangeFolderProperties into
-	the ComponentPlaceholder.  Add a separator on the top.
-
-	* evolution.xml: Remove the separator above the component
-	placeholder here.
-
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-comp-editor.xml: control-return for save and close
-	
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-comp-editor.xml: remove print preview from toolbar
-
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-comp-editor.xml: remove print setup option for
-	consistency
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-mail-message.xml: set MessageDelete pixtype to pixbuf.
-
-	* evolution-contact-editor.xml: use bigger Save icon for toolbar.
-	set Delete pixtype to pixbuf.
-
-	* evolution-comp-editor.xml: used Delete icon for menu.
-
-	* evolution-tasks.xml: changed 'Tasks Settings' to 'Tasks Settings...'.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-calendar.xml: changed Goto icon to pixbuf.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-addressbook.xml: use new Delete icon for menu.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-calendar.xml: added Delete command to menu and toolbar.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-tasks.xml: added Cut/Copy/Paste items to toolbar, though
-	I'm not sure they are very useful.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-tasks.xml: use new delete icons in menu & toolbar.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-mail-list.xml: use Cut/Copy/Paste icons.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-comp-editor.xml: don't use old stock icon for the menu,
-	to be consistent with other components. Use new delete icon for
-	toolbar.
-
-2001-08-19  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-addressbook.xml: use new Cut/Copy/Paste/Save/Search icons.
-
-2001-08-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-list.xml: Added Cut/Copy/Paste underline
-	thingies.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-tasks.xml: used the new Cut/Copy/Paste icons.
-	Removed the Save As/Print/Print Preview commands as they do nothing.
-
-	* evolution-comp-editor.xml: used the new Save/Save As icons.
-
-	* evolution-calendar.xml: used the new Cut/Copy/Paste icons.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml: Set the pixtype for
-	"ContactEditorDelete" to "pixbuf".
-	* evolution-contact-editor.xml: Likewise.
-	* evolution-contact-list-editor.xml: Likewise.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Remove "Control-W" accelerator for closing the
-	window.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-message.xml: Change pixtype of "MessageDelete" to
-	"pixbuf".
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-calendar.xml: changed goto icon from stock icon to pixbuf
-	for the toolbar. Note that the menu still uses the stock icon. Yuck!
-	Added 'New Task' command to toolbar and menus.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-addressbook.xml: changed print icon types to pixbuf.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-addressbook.xml: changed 'Search for Contacts'.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-contact-editor.xml: changed 'Send contact to other'
-	to 'Forward Contact' and capitalized 'Send message to Contact' to
-	be consistent with address book.
-
-	* evolution-addressbook.xml: added '...' to 'Forward Contact' and
-	'Send Message to Contact' to be consistent with contact editor.
-
-2001-08-17  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-mail-global.xml : Changed the order of the toolbar icons
-	(moved "New Message" (formerly "Compose") to be the left-most item).
-
-	* evolution-addressbook.xml: Changed Send Contact to Other to Forward
-	Contact.
-
-
-2001-08-16  Anna Marie Dirks  <anna@ximian.com> 
-
-	* evolution.xml : Changed "Import file..." to "Import File..."
-	* evolution-addressbook.xml : Fixed a few lack of capitalization 
-	issues.
-
-2001-08-16  Peter Williams  <peterw@ximian.com>
-
-	* evolution-mail-message.xml: Stop search message from conflicting
-	with expunge.
-
-2001-08-16  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-comp-editor.xml: add save menu item
-
-	* evolution-task-editor.xml: rename menu item to Assign Task and
-	tidy
-
-	
-2001-08-16  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-mail-message.xml : removed the Print Setup menu
-	item, and changed Print Message to Print for consistency's sake.
-
-2001-08-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add a "BuiltMenuItems" placeholder in the "Help"
-	menu so we can do the fancy Bonobo help stuff.
-
-2001-08-15  Anna Marie Dirks  <anna@ximian.com> 
-
-	*evolution-calendar.xml : Changed "print calendar" to "print".
- 
-
-2001-08-15  Iain Holmes  <iain@ximian.com>
-
-	* my-evolution.xml: s/My Evolution/Summary/
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* evolution-calendar.xml: Add Tigert's new icons for Prev and Next.
-
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-addressbook.xml: Rearranged this Edit menu to fit the
-	standards.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-contact-editor.xml, evolution-contact-list-editor.xml:
-	Added accelerators here.
-
-2001-08-13  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-calendar.xml: removed the redundant view-switching
-	menu items from the bottom of the view menu. 
-
-2001-08-13  Iain Holmes  <iain@ximian.com>
-
-	* my-evolution.xml: Add the reload button and fix the print button.
-
-2001-08-13 Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-calendar.xml : applied Neil Conway's 
-	<nconway@klamath.dyndns.org> menu-improvement patch.
-
-	* evolution-tasks.xml : same as above.
-
-2001-08-13  Iain Holmes  <iain@ximian.com>
-
-	* my-evolution.xml: Set the label for Print to be shown on priority.
-
-2001-08-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-global.xml: Remove a separator after the
-	"Subscribe to Folders" item.
-
-2001-08-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-calendar.xml: Add labels for the ShowDayView,
-	ShowWorkWeekView, ShowWeekView, ShowMonthView buttons.
-
-2001-08-13  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-calendar.xml: Changed the tooltips for several toolbar
-	icons to make all tooltips consistent (in terms of capitalization
-	and language). Also changed "Go to the present time" to "Go to
-	today".
-
-2001-08-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	[Fix #7069, New - Missing name for "Tools" menu.]
-	
-	* my-evolution.xml: Put the Tools menu in the
-	ComponentToolsPlaceholder.
-	
-2001-08-11  Jason Leach  <jleach@ximian.com>
-
-	* evolution-mail-message.xml: Make the label for the resending
-	menu item read "Edit as New Message...", bug #6838.
-
-2001-08-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #7608, New - Phantom menu entry in Tasks.]
-
-	* evolution-tasks.xml: Put the Tools menu in the
-	ComponentToolsPlaceholder.
-
-2001-08-10  Jason Leach  <jleach@ximian.com>
-
-	* evolution-addressbook.xml: End a placeholder block with
-	</placeholder> instead of <placeholder/>
-
-2001-08-09  Peter Williams  <peterw@ximian.com>
-
-	* evolution-mail-global.xml: Give the (pre)view pane toggle
-	an accelerator of 'q', like we were implementing the hard
-	manual way before.
-
-2001-08-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Remove all the "New ... FIXME" items.
-
-2001-08-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml: Put the "Tools" and "Actions" menus
-	in the "ComponentToolsPlaceholder" and
-	"ComponentActionsPlaceholder", respectively.
-	* evolution-calendar.xml: Likewise.
-	* evolution-contact-editor.xml: Likewise.
-	* evolution-mail-global.xml: Likewise.
-	* evolution-mail-message.xml: Likewise.
-
-	* evolution.xml: Remove "Tools" and "Actions" menus.  Create a
-	"ComponentActionsPlaceholder" and a "ComponentToolsPlaceholder"
-	instead.
-	* evolution-mail-messagedisplay.xml: Likewise, put "Tools" and
-	"Actions" in placeholders.
-
-2001-08-08  Anna Marie Dirks <anna@ximian.com>
-
-	* evolution-mail-list.xml: Changed the "Show All" menu item
-	to be "Show Hidden Messages". 
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-contact-list-editor.xml: improvements, make it look
-	more like the event editor.
-
-	* evolution-contact-editor.xml: same.
-
-	* evolution-addressbook.xml: Contact Group => Contact List.
-
-2001-08-08  Nat Friedman  <nat@ximian.com>
-
-	* evolution-contact-editor.xml: Removed Print Envelope since it's
-	disabled for Evolution 1.0.
-
-2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-messagedisplay.xml: Remove "Customize toolbar"
-	item.
-	* evolution.xml: Here too.
-	* evolution-message-composer.xml: Here too.
-
-2001-08-03  Peter Williams  <peterw@ximian.com>
-
-	* evolution-mail-global.xml: Rename "Manage Subscriptons" to
-	"Subscribe to Folders" as per Aaron's suggestion. Hopefully a little
-	more intuitive.
-
-2001-08-02  Jason Leach  <jleach@ximian.com>
-
-	* evolution-contact-editor.xml: Update the updated Save, Save As,
-	and Print icons for menus and the toolbar.  Also added a Close
-	button to the toolbar and some other fixes suggested in #5518.
-
-2001-08-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-addressbook.xml: Added ContactsSaveAsVCard,
-	ContactsSendContactToOther, and ContactsSendMessageToContact menu
-	items.  Fixes Ximian bug #5708.
-
-2001-08-01  Jason Leach  <jleach@ximian.com>
-
-	* evolution-mail-message.xml: Use Jakub's new Find icon for
-	Edit/Search Message menu item.
-
-	* evolution-message-composer.xml: And the new Save and Save As
-	icons for the composer.
-
-2001-07-31  Peter Williams  <peterw@ximian.com>
-
-	* evolution-message-composer.xml: Add "Customize Toolbars" menu item
-	and command.
-
-2001-07-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-message.xml: Added Next/Previous menu items under
-	Actions/GoTo.
-
-2001-07-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* evolution-tasks.xml: Add a pixmap to the Tasks Settings option
-	to make it consistent with the one in the calendar folder.
-
-2001-07-31  Jason Leach  <jleach@ximian.com>
-
-	* evolution-message-composer.xml: Use the new Send and Send Later
-	icons from Jakub and Tuomas.
-
-2001-07-29  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-tasks.xml: use the new print icons.
-
-2001-07-30  Jason Leach  <jleach@ximian.com>
-
-	* evolution-mail-message.xml: Correct the tooltip for the Print
-	button.  Bug #5801.
-
-2001-07-27  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-tasks.xml: renamed "Tasks Preferences" to "Tasks Settings"
-	to be consistent with the other components.
-
-2001-07-27  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-comp-editor.xml: removed Edit & Help menus. Fixes #5500.
-
-2001-07-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* evolution-calendar.xml: Consistency fixes, and reindented the
-	goddamn thing.
-
-2001-07-27  Jason Leach  <jleach@ximian.com>
-
-	* evolution-addressbook.xml: Removed the unused "Settings"
-	submenu, because it creates an extra blank menu after the Help
-	submenu.  Bug #4275.
-
-2001-07-25  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-calendar.xml: changed "Settings" to "Calendar Settings".
-	Fixes bug #5498.
-
-2001-07-24  Peter Williams  <peterw@ximian.com>
-
-	* evolution-message-composer.xml: Move Insert File from the File
-	menu into the Insert Menu. Change the accelerators to reflect
-	what's being inserted and add ellipses.
-
-	* evolution-mail-global.xml: Add "Compose New Message" to the
-	Actions menu as suggested in bug #866. Also fix it so that the
-	pixmaps for the Compose menu items are displayed.
-
-2001-07-23  Jason Leach  <jleach@ximian.com>
-
-	* evolution-mail-message.xml: Add the "Mark as Unimportant" cmd
-	and menu item to the Edit menu. Bug #5225.
-
-2001-07-21  Jason Leach  <jleach@ximian.com>
-
-	* evolution-mail-list.xml: Capitalize "messages" in "Hide Read
-	messages" menu item label.  Bug #5091.
-
-2001-07-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-message.xml: Removed the "Redirect" menu since
-	this is now a future feature.
-
-2001-07-19  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-calendar.xml: 
-	* evolution-comp-editor.xml: update to use new print icon.
-
-2001-07-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-message.xml: Add closing dots to the "Filter
-	on..." items for consistency with the "VFolder on..." ones.
-
-2001-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-contact-list-editor.xml: Remove Print commands and
-	toolbar/menu items.  Also, use "list" instead of "group".
-
-2001-07-09  Larry Ewing  <lewing@ximian.com>
-
-	* evolution-message-composer.xml: remove FileSaveInFolder menu
-	item. rename Insert->File to Insert->Attachment.
-
-2001-07-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Remove "ChangeFolderProperties" item.
-
-	* evolution-mail-list.xml: Add the folder properties item back in;
-	use the "ChangeFolderProperties" verb instead.
-
-	* evolution.xml: Removed "Folder Properties" item from the "File"
-	menu.
-
-2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* evolution-mail-message.xml: MessageApplyFilters now has an icon.
-
-2001-07-03  Jason Leach  <jleach@ximian.com>
-
-	[Bug #3612: Accelerator for attach file in composer]
-
-	* evolution-message-composer.xml: Ctrl-Alt-f for attaching files
-	(seemed consistent with the other insert menu items)
-
-	[Bug #809: Mark as important bindings]
-		
-	* evolution-mail-message.xml: Added "Mark as Important" menu
-	thingy.
-
-2001-07-03  Iain Holmes  <iain@ximian.com>
-
-	* Add the seperate pixbuf for the Print button
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-calendar.xml: Add publish free/busy item
-
-2001-07-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-tasks.xml: make the 'Task Preferences' menu item appear
-	as the first item in the 'Tools' menu
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Set it up to have an
-	e-charset-picker bonobo-ui menu attached to the Edit menu.
-
-2001-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Rename "New -> Evolution bar shortcut" into "New
-	-> Shortcut".
-
-2001-07-01  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-subscribe.xml: add a separate dockitem for the search
-	entry.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-message-composer.xml: Enable the label next to the
-	"Attach" toolbar button, and get rid of the "Help" menu.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Renamed "NewBarShortcut" verb into "NewShortcut".
-
-2001-06-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-message.xml: Change type of "MailPrevious" and
-	"MailNext" buttons from "stock" to "pixbuf".
-
-2001-06-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-tasks.xml: fixed typos
-
-2001-06-28  Radek Doulik  <rodo@ximian.com>
-
-	* evolution-signature-editor.xml: new file
-
-2001-06-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-tasks.xml: added cut/copy/paste entries to the main menu
-
-2001-06-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-calendar.xml: added cut/copy/paste entries to the main
-	menu
-
-2001-06-27  Larry Ewing  <lewing@ximian.com>
-
-	* evolution-message-composer.xml: remove FIXME from
-	FileInsertFile.
-
-2001-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Updated to use TigerT's
-	attachment icon.
-
-	* evolution-mail-message.xml: Copy and Move to Folder now require
-	the Shift key.
-
-	* evolution-mail-list.xml: Changed the Expunge accel to ^E instead
-	of ^X since ^X is Cut and reveresed the order of the
-	Cut/Copy/Paste and Select* menu item groups.
-
-2001-06-26  Peter Williams  <peterw@ximian.com>
-
-	* evolution-mail-global.xml:
-	* evolution-mail-list.xml:
-	* evolution-mail-message.xml: New files. These are the result
-	of splitting evolution-mail.xml into three pieces: one for the
-	global mailer operations, one for the operations on a messagelist,
-	and one for the operations on one or more messages.
-
-	* evolution-mail-messagedisplay: New file. UI for the standalone
-	message browser that you get when you double-click. Very skeleton.
-	
-	* evolution-mail.xml: Removed.
-
-	* Makefile.am: Updated to install new files.
-	
-2001-06-25  jacob berkman  <jacob@ximian.com>
-
-	* evolution-mail.xml: add a preview toggle item
-
-2001-06-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added Cut/Copy/Paste menu items.
-
-2001-06-24  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-addressbook.xml: add cmd for ContactNewList and
-	ContactsPrintPreview.  Also, correct the tip for Select All and
-	add the accelerator.  Add menu/tool items for ContactNewList, and
-	remove the tool item for ContactViewAll.
-
-	* Makefile.am (XML_FILES): add evolution-contact-list-editor.xml.
-
-2001-06-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Get rid of the status bar.
-
-2001-06-22  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-task-editor.xml: new commands
-
-2001-06-21  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-comp-editor.xml: add toolbar
-
-2001-06-20  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-comp-editor.xml: collapse print commands here
-
-2001-06-20  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* evolution-event-editor.xml: Fix typo. s/Cancel then meeting/
-	Cancel the meeting/.
-	
-2001-06-19  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-contact-editor.xml: split out commands from
-	toolitems/menuitems.
-
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-task-editor.xml: ui xml for task editor
-
-	* Makefile.am: install new file
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-event-editor.xml: change to event specific operations
-
-	* evolution-comp-editor.xml: split non-specific operations out
-	here
-
-	* Makefile.am: install new file
-
-2001-06-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added a Reply-to-list menu item.
-
-2001-06-08  Iain Holmes  <iain@ximian.com>
-
-	* evolution-executive-summary.xml: Change for the new stuff.
-
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	* evolution.xml: Fix a little thing where it was actually saying
-	"_Delete this folder" in the statusbar.
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-addressbook.xml: change Print Preview's name to
-	ContactsPrintPreview.
-
-2001-05-30  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-addressbook.xml: add commands/menu items for
-	Cut/Copy/Paste/Select All.
-
-2001-05-28  Dan Winship  <danw@ximian.com>
-
-	* evolution-mail.xml: Undo Jeff's View menu changes, as they
-	resulted in the normal/fullheaders/source radio group being split
-	across two levels of hiearchy, and grouped "Hide Deleted" with
-	the unrelated other Hide/Show commands.
-
-2001-05-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added MailNextUnread, MailNextFlagged,
-	MailPreviousUnread, and MailPreviousFlagged commands. Also
-	rearranged the View menu to be a bit more user-friendly.
-
-	Now where should we put the next/previous menu items?
-
-2001-05-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-addressbook.xml: Changed the tooltips here based on
-	Taylor's work.
-
-2001-05-24  Radek Doulik  <rodo@ximian.com>
-
-	* evolution-message-composer.xml: added delete all to edit menu
-	added placeholders for all edit menu parts
-
-2001-05-22  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-addressbook.xml: make the name of menuitem/toolitem's
-	the same as the verb to save us from having to specify both, and
-	move some more accels into the <commands>.
-
-2001-05-21  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-addressbook.xml: remove ViewAsTable menu item.
-
-2001-05-21  Federico Mena Quintero  <federico@ximian.com>
-
-	* evolution-tasks.xml: Added a Delete button on the toolbar.
-
-2001-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add a control placeholder named "OfflineToggle"
-	to the status bar.
-
-2001-05-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Removed verb "NewView"; use
-	"OpenFolderInNewWindow" instead.
-
-2001-05-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add commands for the Folder submenu in the File
-	menu.
-
-2001-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-addressbook.xml: add <commands> for the toolbar/menu
-	items we set the sensitivity on.
-
-2001-05-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Added a "FolderPopup" element and reformatted
-	lots of it.
-
-2001-05-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Added S/MIME menu items.
-
-2001-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add an "Evolution FAQ" entry to the "Help" menu.
-
-2001-05-15  Dan Winship  <danw@ximian.com>
-
-	* evolution-mail.xml: Create a "Message Display" submenu in View,
-	move source/full headers/normal there and make it a radio group.
-	Add "Load Images" there.
-
-2001-05-15  Dan Winship  <danw@ximian.com>
-
-	* evolution-mail.xml: Clean this up A LOT. In addition to cosmetic
-	changes, now every command appears in the <commands> section, and
-	has a tooltip. Also, move "Search" to the "Edit" menu for
-	consistency with other apps.
-
-2001-05-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Remove Help->About.
-
-2001-05-14  Dan Winship  <danw@ximian.com>
-
-	* evolution-mail.xml: Redo forwarding stuff so there's "Forward",
-	"ForwardAttached", "ForwardInline" (not "inlined"), and
-	"ForwardQuoted", where the first uses a default style. Make
-	Actions->Forward and the toolbar Forward button use the default
-	style.
-
-2001-05-12  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* evolution-mail.xml: add pixmaps for MessageCopy and
-	MessageForwardAttached. Thanks Wayne Davis <wfdavis@seas.upenn.edu>
-	for a patch.
-
-2001-05-07  Jon Trowbridge  <trow@ximian.com>
-
-	* evolution.xml: Added command entry for 'ToggleOffline'.
-
-2001-05-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Renamed `WorkOffline' to `ToggleOffline'.
-
-2001-05-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Renamed `WorkOffLine' to `WorkOffline'.
-
-2001-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added Next/Previous toolbar buttons.
-
-2001-04-26  Jon Trowbridge  <trow@ximian.com>
-
-	* evolution-mail.xml: Added "Search Message" to "View" menu.
-
-2001-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Rename "New View" to "New Window" as suggested in
-	#2124.  Also remove the stock pixmap [a piece of paper doesn't
-	mean much anyway].  Also rename "New Evolution Bar Shortcut" into
-	"New Evolution Shortcut" as we never really refer to it as the
-	"Evolution bar", but rather as the "shortcut bar".  Finally, bind
-	"New Folder" to `Control-Shift-F'.
-
-2001-04-16  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* evolution-calendar.xml: toolitems which have non-default pixmaps, must
-	have "pixtype=pixbuf" arg. Now *View buttons show up again.
-
-2001-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added Filter/VFolder on mailing list. Yay. I
-	also figured I'd expand this like MessageFilterSubj to
-	MessageFilterSubject, what's with the abreviation? It makes no
-	sense when the verb is that long anyway...
-
-2001-03-13  Michael Meeks  <michael@ximian.com>
-
-	* evolution-mail.xml: Add a load of commands, sigh, people do this
-	so brokenly.
-
-2001-04-02  Anders Carlsson  <andersca@codefactory.se>
-
-	* evolution-mail.xml: Added a space after an attribute to make
-	libxml happy.
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* evolution-addressbook.xml, evolution-calendar.xml,
-	evolution-mail.xml, evolution-tasks.xml, evolution.xml: as Jacub
-	suggested, added some icons, replaced stock Print with ours, etc.
-
-2001-03-29  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Move the 'hide deleted' to the option list
-	under the view menu.
-
-2001-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Bind "MessageMarkAsRead" to `Control-k'
-	instead of `Control-q'.
-
-2001-03-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Change "Send and Receive" to "Send /
-	Receive".
-
-2001-03-20  Miguel de Icaza  <miguel@ximian.com>
-
-	* evolution-addressbook.xml: Added artwork from Jakub.
-
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Add Resend Message under the File menu.
-
-2001-03-17  Miguel de Icaza  <miguel@ximian.com>
-
-	* evolution-calendar.xml: Added ShowWeekView, ShowMonthView,
-	ShowDay, ShowWorkWeek to the View menu.
-
-	* evolution.xml, evolution-mail.xml: Provide "Actions" in the
-	toplevel evolution.  Fill in Actions/Component in Evolution-mail
-	(no visual changes, just internal changes).
-
-	* evolution-calendar.xml: Added Actions menu.  Added New Verb
-	EditNewEvent. 
-
-2001-03-16  Miguel de Icaza  <miguel@ximian.com>
-
-	* evolution-mail.xml: Added accelerator to elements missing
-	accelerators (Reply, Inline, Quoted, Attachments, Empty Trash,
-	Full Headers).
-
-	* evolution.xml: Added a placeholder for the beginning of the
-	view. 
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Added Reply-To field.
-
-2001-03-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Add an ActionsEmptyTrash menu item.
-
-2001-03-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Took out the "IMPLEMENT ME"'s from the
-	forward menu items since I've coded them now.
-
-2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Renamed the "Get Mail" button to "Send and
-	Receive" for consistency with the command in the "Actions" menu.
-
-2001-03-06  Miguel de Icaza  <miguel@ximian.com>
-
-	* evolution-message-composer.xml: Reorder menus to be File, Edit,
-	View, Insert, Format (instead of File, Edit, Format, View, Insert).
-
-	Add View/From Field and View/From BCC
-
-	Add Insert/File.
-
-	Add File/Send menu item.
-
-	Change the look to follow the "mailer" look (thiner display).
-
-2001-03-06  Miguel de Icaza  <miguel@ximian.com>
-
-	* evolution-tasks.xml: Added "File/New/Task" as well.
-
-	* evolution-mail.xml: Added "File/New/Mail Message" at the top
-	with binding C-n.  
-
-	* evolution-calendar.xml: Set the binding for New Appointment to C-n
-
-	* evolution-contact-editor.xml: Set the toolbar to hlook=text
-	vlook=icon;  Set all icons priority-text to 1. 
-
-	* evolution-addressbook.xml: Added "Contact" to the New menu.
-
-	* evolution.xml: Provide an entry point to put "New" items on the
-	first level. 
-
-	We are going to need some Bonobo support to "hide" objects when
-	other objects appear (like, having Mail Message bound to C-S-X in
-	the global space, and when we switch to Mail, we only show the
-	entry that has C-n as the binding).
-
-2001-02-28  Miguel de Icaza  <miguel@ximian.com>
-
-	* evolution.xml: Moved Importer after the Folder operations per
-	Dan's proposal.
-
-	* evolution-addressbook.xml: Renamed Settings/AddressBook
-	Configuration to Tools/Settings.
-
-	Make all the items have "Print" items that use the same icon
-	instead of a collection of icons.
-
-	* evolution-calendar.xml: Moved "Calendar Preferences" from
-	"Settings" to "Tools/Settings".
-
-	* evolution-mail.xml: Settings menu is fully gone.  All things
-	that run a dialog now end up in "Tools" while actions end up in
-	"Actions".  Hence I am right.
-
-	Renamed "Mail Configuration..." to "Identieies and Servers"
-
-	Move MessageMarkAsRead, MessageMarkAsUnRead
-	to Edit menu.  Add MessageMarkAllAsRead.
-
-	Remove "Print Message" from Message menu.  Remove "Print Preview
-	Message" from Message menu.  Leave them on the "File" menu.
-
-	Renamed "Reply to Sender" to "Reply" (awaiting Ettore's
-	permission). 
-
-	Renamed "Messages" to "Actions".
-
-	Open Message renamed to "Open Selected Items" (as this is what it
-	actually does). 
-
-	Moved "Save Message As" to "File" menu.
-
-	Added "Properties" to the File/Folder submenu.
-
-	Edit menu now looks like this: Message Move, Message Copy, Select
-	All, Invert Selection, Delete, Undelete, Mark as Read, Mark as
-	Unread.  Some of them were moved from the "Messages" menu.
-
-	"Forward message" shortcut changed to C-f
-
-	Tools menu created.
-	
-	Create Rule From message moved to "Tools".
-
-	* evolution.xml: Added Tools menu.  Moved Edit/Customize to
-	Tools/Customize Toolbar.
-
-	Added File/Folder submenu.  Duplicate "New Folder" in here. 
-
-2001-03-04  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-tasks.xml: "New" -> "New Task".
-
-	* evolution-calendar.xml: "New appointment" -> "New Appointment",
-	"Go to" -> "Go To".
-
-2001-02-21  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Setup a command for MailStop.
-
-2001-02-05  Iain Holmes  <iain@ximian.com>
-
-	* evolution-executive-summary.xml: Add a priority.
-
-2001-02-02  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-calendar.xml: cmd / widgetify.
-
-2001-01-30  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: Use hlook and vlook so by default we get
-	no text in vertical mode, and priority only in horizontal
-	mode.
-
-2001-01-27  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-event-editor.xml: Menu cleanups
-
-	* evolution-task-editor-dialog.xml: ditto
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml, evolution-calendar.xml,
-	evolution-mail.xml, evolution-tasks.xml, evolution.xml: Change the
-	toolbars to only show some of the labels, a la Outlook.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Set the `pixtype' of the "PrintMessage" and
-	"PrintPreviewMessage" items to "pixbuf".  Likewise for
-	"MessageSaveAs", "MessageEdit", "MessagePrint", "MessageMove", "MessageReplySndr"
-	and "MessageReplyAll".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Set the `pixtype' of the "Configure Folder"
-	and "Mail Configuration" items to "pixbuf".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml: Change the type of the "Find a
-	contact" item to "pixbuf".  Also set the type to "pixbuf" for
-	"Addressbook Configuration", and "Print Contacts".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml: Change the type of the "View All"
-	button to "pixbuf".
-
-2001-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Change Security* to SecurityPGP*
-	as we may someday have S/MIME sign/encrypt.
-
-2001-01-24  Jason Leach  <jasonleach@usa.net>
-
-	(Fix #1252: Need a File->Close way to close a view)
-	
-	* evolution.xml: new File->Close menu item and associated command.
-
-2001-01-22  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Removed the temporary get mail button.
-
-2001-01-19  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Added a temporary button to test new receive
-	code.
-
-2001-01-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added Next/Previous toolbar buttons.
-
-2001-01-15  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: progressive cmd/widgetization and
-	add the 'Customize' entry.
-
-2001-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Add a stop button to the toolbar.
-
-2001-01-15  Jason Leach  <jasonleach@usa.net>
-
-	(Bug #1143: Add elipses to more menu items that lead to dialogs)
-	
-	* evolution-mail.xml: "Folder/Configure Folder..."
-	* evolution.xml: "File/Import file..."
-	
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* evolution.xml: Remove fixme from NewMailMessage.
-
-2001-01-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-message-composer.xml: Added SaveDraft bonobo menu verb
-	thingy.
-
-2001-01-08  Damon Chaplin  <damon@helixcode.com>
-
-	* evolution-tasks.xml: new file for the Tasks controls.
-
-	* Makefile.am (XML_FILES): added the above file.
-
-2001-01-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-event-editor.xml:
-	* evolution-task-editor-dialog.xml: Make the ordering of the
-	toolbar items consistent.
-
-2001-01-01  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am: remove evolution-addressbook-ldap.xml so we
-	build again.
-
-2000-12-29  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-addressbook.xml: add "Settings/Addressbook
-	Configuration..."  Analogous to "Settings/Mail Configuration..." in
-	evolution-mail.
-
-	* evolution-addressbook-ldap.xml: removed.
-	
-2000-12-23  Jason Leach  <jasonleach@usa.net>
-
-	* evolution-mail.xml: Added ellipsis to Settings menu entries that
-	  bring up dialogs.  Bug #1019.
-
-2000-12-23  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: s/<menuitem\/>/<separator\/>/
-
-	* evolution.xml: ditto.
-
-2000-12-21  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: remove wierd extraneous '>'
-
-2000-12-14  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-executive-summary.xml: stop executive summary
-	making the UI flicker when switching to / from it.
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* evolution-calendar.xml: Fix bug #635
-
-2000-12-18  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-addressbook.xml: give View->As Table its verb back so
-	it works.
-
-2000-12-14  Not Zed  <NotZed@HelixCode.com>
-
-	* evolution-mail.xml: Added message hiding items.
-
-2000-12-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-message-composer.xml: Added Security menu
-
-2000-12-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-mail.xml: Make the forward button in the toolbar
-	forward as an attachment.
-
-2000-12-13  Radek Doulik  <rodo@helixcode.com>
-
-	* evolution-message-composer.xml: redone shortcuts
-
-2000-12-12  Radek Doulik  <rodo@helixcode.com>
-
-	* evolution-message-composer.xml: removed Bold item from toolbar
-
-2000-12-04  Dan Winship  <danw@helixcode.com>
-
-	* evolution-mail.xml: Fix typo
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-mail.xml: Renamed "MessageForward" to
-	"MessageForwardInlined" and "MessageForwardAttach" to
-	"MessageForwardAttached".  Make the attached forward the default,
-	and the one advertised on the toolbar as well.
-
-2000-12-01  Anna Marie Dirks  <anna@helixcode.com>
-
-	* evolution.xml: Redid all the keyboard shortcuts to comply with GNOME
-	standards. Removed unnecessary shortcuts from less commonly used menu 
-	items, changed all references to "alt", etc. 
-	* evolution-addressbook.xml: see above
-	* evolution-mail.xml: see above
-	* evolution-calendar.xml: Same as above, but I also reorganized menus slightly by moving "new appointment" from the edit menu to the file menu.   
-
-2000-11-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added Save As...
-
-2000-11-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-message-composer.xml: Make "Toolbar"'s behavior
-	"exclusive".
-	* evolution-task-editor-dialog.xml: Likewise.
-
-2000-11-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Moved ViewSource to the View menu and made
-	it a toggle menu.
-
-2000-11-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added View Message Source.
-
-2000-11-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added Forward as Attachment.
-
-2000-11-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* evolution-contact-editor.xml: Added Send contact as attachment
-	and Send to contact to menus.
-
-2000-11-09  Anna Marie Dirks <anna@helixcode.com>
-	* evolution-calendar.xml: Added (and cleaned up) keyboard shortcuts.
-	* evolution-addressbook.xml: Added keyboard shortcuts.  
-
-2000-11-08  Anna Marie Dirks <anna@helixcode.com>
-	* evolution.xml: Added keyboard shortcuts to all shell menus.
-	* evolution-mail.xml: Added keyboard shortcuts to all shell menus.
-
-2000-11-08  Anna Marie Dirks <anna@helixcode.com>
-        * evolution-message-composer.xml: Added keyboard shortcuts
-	to all of the composer menus.
-
-2000-11-07  Jesse Pavel	  <jpavel@helixcode.com>
-
-	* evolution-event-editor.xml: removed ``FIXME'' from the
-	``Schedule Meeting'' menu.
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Updated Message menu.
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* evolution-contact-editor.xml: Added print envelope menus.  Added
-	...s.
-
-2000-11-05  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am (uidir): kill all the bonob-ui-extract crud.
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* evolution-addressbook.xml: Removed QuickSearch widget.
-
-2000-11-01  Radek Doulik  <rodo@helixcode.com>
-
-	* evolution-message-composer.xml: added accel="*Control*Return" to
-	FileSend
-	replace FileSendNow with FileSend as FileSendNow wasn't defined
-	
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added a MessageApplyFilters menu item.
-
-	* evolution-subscribe.xml: Don't have a Unselect All, use Invert
-	Selection instead.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (H_FILES): New.
-	(EXTRA_DIST): Add `$(H_FILES)'.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-message-composer.xml: add.
-
-	* checking all generated .h files ( sim. to glade ) to make
-	translator's lives easier.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-event-editor.xml: added.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-task-editor-dialog.xml: added.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am: Add rule to use bonobo-ui-extract to build
-	translatable files.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-addressbook-ldap.xml: drasticaly shrink to just the
-	new features available with ldap; don't duplicate stuff.
-
-	* evolution-addressbook.xml: fix tooltips.
-
-	* *.xml: remove redundant attributes causing toolber rebuilds.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml: add translation '_'s to some labels.
-
-2000-10-12  Damon Chaplin  <damon@helixcode.com>
-
-	* evolution-calendar.xml: Added toolbar buttons to switch views.
-	We'll use plain buttons for the view buttons for now, until Bonobo
-	toolbars support radio buttons.
-
-2000-10-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-addressbook-ldap.xml: Apply behavior "exclusive" to
-	"Toolbar".
-	* evolution.xml: Likewise.
-	* evolution-addressbook.xml: Likewise.
-	* evolution-mail.xml: Likewise.
-	* evolution-contact-editor.xml: Likewise.
-	* evolution-subscribe.xml: Likewise.
-
-2000-10-08  Damon Chaplin  <damon@helixcode.com>
-
-	* evolution-calendar.xml: moved the calendar settings menu item to the
-	Settings menu and renamed it to "Calendar Preferences".
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml: s/Menu_//
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml fix the mess with separators.
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-subscribe.xml: s/descr/tip/
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: remove redundant separator.
-
-	* *.xml: Remove replicated attributes from structural elements.
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: fix from Darin toolbar -> dockitem.
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Add Invert Selection
-
-2000-10-04  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: bind 'D' to MessageDelete; a proto binding.
-
-2000-10-04  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-calendar.xml: move Open, Save into FileOps
-
-	* evolution.xml: add FileOps placeholder.
-
-2000-09-15  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml: Update to new keybinding syntax.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: remove stock icons on toolbar.
-	add back 2 stocks I lost somewhere.
-
-	* ui/evolution.xml: Add status bar
diff --git a/ui/Makefile.am b/ui/Makefile.am
index a562be7180..69920157f8 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -7,8 +7,6 @@ ui_DATA =					\
 	evolution-shell.ui			\
 	evolution-tasks.ui
 
-EXTRA_DIST =					\
-	$(ui_DATA)				\
-	ChangeLog.pre-1-4
+EXTRA_DIST = $(ui_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index bae4b26fe2..cc1b9b5fd8 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -27,10 +27,7 @@
         <menuitem action='mail-threads-expand-all'/>
         <menuitem action='mail-threads-collapse-all'/>
         <separator/>
-        <menuitem action='mail-hide-deleted'/>
-        <menuitem action='mail-hide-selected'/>
-        <menuitem action='mail-hide-read'/>
-        <menuitem action='mail-show-hidden'/>
+        <menuitem action='mail-show-deleted'/>
       </placeholder>
     </menu>
     <placeholder name='custom-menus'>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index c16189932e..c051668290 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -95,5 +95,4 @@
   </toolbar>
   <toolbar name='search-toolbar'/>
   <toolbar name='close-toolbar'/>
-
 </ui>
diff --git a/views/ChangeLog b/views/ChangeLog
deleted file mode 100644
index ec86348042..0000000000
--- a/views/ChangeLog
+++ /dev/null
@@ -1,80 +0,0 @@
-2007-10-24  Anand V M  <avmuttagi@gmail.com>
-	
-	** Fix for bug #353656
-	* addressbook/galview.xml:Rename "Phone List" to "List View".
-
-2006-06-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail/Makefile.am: Added two new views Wide_View_Sent.galview
-	and Wide_View_Normal.galview to help views in wide mode.
-	* mail/galview.xml: Added them to views menu.
-	* mail/Wide_View_Normal.galview: Added a new default galview with
-	composite headers for normal folders.
-	* mail/Wide_View_Sent.galview: Added a new default galview with
-	composite headers for sent/draft folders.
-
-2005-10-19 Harish Krishnaswamy <kharish@novell.com>
-	
-	Committing for Nathan Owens <pianocomp81@yahoo.com>
-	
-	* Makefile.am: added memos directory
-	* views/memos/*: added galview.xml, Makefile.am, Memos.galview for
-	initial Memos component
-
-2005-09-28  Devashish Sharma <sdevashish@novell.com>
-
-	* addressbook/Phone_List.galview: Match new column values, change
-	default columns shown.
-
-	* addressbook/By_Company.galview: Corrected the value for default
-	sort column.
-
-2005-09-20  Devashish Sharma <sdevashish@novell.com>
-
-	* addressbook/By_Company.galview: In ETableState grouping column was
-	wrong, instead of grouping by company it was grouping by  Telex.
-	Fixed that.
-
-2004-08-06  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #52459 ]
-	* addressbook/Phone_List.galview: use the same defaults as the 1.4
-	phone list view.  
-
-2004-04-01  JP Rosevear <jpr@ximian.com>
-
-	* tasks/galview.xml: add/remove views
-
-	* tasks/With_Status.galview: add a status view
-
-	* tasks/With_DueDate.galview: add a due date view
-
-	* tasks/Makefile.am (tasksviewsdir): dist/install new views and
-	don't to an obsolete one
-
-	* calendar/galview.xml: list the new list view
-
-	* calendar/List_View.galview: default view for Lists
-
-	* calendar/Makefile.am (calendarviewsdir): dist and install the
-	list view
-
-2003-12-05  Hans Petter Jansson  <hpj@ximian.com>
-
-	* addressbook/By_Company.galview: Match new column values, change
-	default columns shown.
-
-	* addressbook/Phone_List.galview: Ditto.
-
-2003-11-18  JP Rosevear <jpr@ximian.com>
-
-	* tasks/With_Category.galview: match new column values
-
-	* tasks/Tasks.galview: ditto
-	
-2003-09-11  Tim Wo <tim.wo@sun.com>
-                                                                                                                             
-        * mail/galview.xml: add mnemonic "M" for "Message",
-	add "S" for "As Sent Folder", add "b" for "By Subject",
-	add "n" for "By Sender", add "t" for "By Status",
-	add "F" for "By Follow Up Flag". Fixes bug #48097
diff --git a/views/ChangeLog.pre-1-4 b/views/ChangeLog.pre-1-4
deleted file mode 100644
index 55d42e1fe4..0000000000
--- a/views/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,109 +0,0 @@
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* */Makefile.am: use viewsdir
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tasks/Makefile.am (defaulttasksdir): Likewise.
-
-	* calendar/Makefile.am (defaultcalendardir): Likewise.
-
-	* addressbook/Makefile.am (defaultaddressbookdir): Version using
-	$(BASE_VERSION).
-
-2002-07-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tasks/galview.xml: Add accelerators.  [#10069]
-
-2002-07-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* calendar/galview.xml: Add accelerators.  [#10067]
-
-2002-07-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* addressbook/galview.xml: Add accelerators.  [#10068]
-
-2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail/galview.xml: Offer the new By Follow Up Flag view.
-
-	* mail/By_Follow_Up_Flag.galview: New galview for Follow Up Flag.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* addressbook/Makefile.am (defaultaddressbook_DATA): Added
-	Address_Cards.galview.
-
-	* addressbook/Address_Cards.galview: New galview file for the
-	minicard view since they save data now.
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* addressbook/galview.xml, calendar/galview.xml, mail/galview.xml,
-	tasks/galview.xml: Added default-view parameters.
-
-	* mail/As_Sent_Folder.galview: New galview.
-
-	* mail/Makefile.am, mail/galview.xml: Added As_Sent_Folder
-	galview.
-
-2001-10-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* addressbook/By_Company.galview: Group by the correct column.
-
-	* addressbook/By_Company.galview, addressbook/Phone_List.galview:
-	Updated both sets of columns here to make more sense.
-
-2001-10-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* mail/By_Sender.galview, mail/By_Status.galview,
-	mail/By_Subject.galview: Fixed these.  Fixes Ximian bug #6803.
-
-2001-06-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* calendar/galview.xml: New list of the default calendar views.
-
-2001-05-21  Chris Toshok  <toshok@ximian.com>
-
-	* addressbook/galview.xml: correct typo.
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* addressbook/galview.xml, mail/galview.xml, tasks/galview.xml:
-	Translate the titles here.
-
-2001-03-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* addressbook/By_Company.galview: New view.
-
-	* addressbook/Makefile.am: Added By_Company.galview.
-
-	* addressbook/Phone_List.galview: Updated this a bit.
-
-	* addressbook/galview.xml: Added By Company and Address Cards (No
-	Address_Cards.galview is required for now.)
-
-2001-03-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* addressbook/.cvsignore, addressbook/Makefile.am,
-	addressbook/Phone_List.galview, addressbook/galview.xml: Added a
-	built in view menu for addressbook.
-
-2001-03-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* mail/By_Sender.galview, mail/By_Subject.galview: Corrected these
-	views a bit.
-
-	* mail/By_Status.galview, mail/Messages.galview: New views for "By
-	Status" and "Messages".
-
-	* mail/Makefile.am, mail/galview.xml: Added By_Status.galview and
-	Messages.galview.
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* .cvsignore, Makefile.am, mail/.cvsignore,
-	mail/By_Sender.galview, mail/By_Subject.galview, mail/Makefile.am,
-	mail/galview.xml, tasks/.cvsignore, tasks/Makefile.am,
-	tasks/Tasks.galview, tasks/With_Category.galview,
-	tasks/galview.xml: Builtin View menus for tasks and mail.
diff --git a/views/Makefile.am b/views/Makefile.am
index 9e6adefa6b..24c8b2f465 100644
--- a/views/Makefile.am
+++ b/views/Makefile.am
@@ -1,5 +1,3 @@
 SUBDIRS = addressbook mail tasks calendar memos
 
-EXTRA_DIST = ChangeLog.pre-1-4
-
 -include $(top_srcdir)/git.mk
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
deleted file mode 100644
index 13337e0d76..0000000000
--- a/widgets/ChangeLog
+++ /dev/null
@@ -1,1050 +0,0 @@
-2009-04-07  Takao Fujiwara  <takao.fujiwara@sun.com>
-
-	Reviewed by Milan Crha  <mcrha@redhat.com>
-	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
-
-	* Fixes bug #537530
-
-	* misc/e-attachment-bar.c (update):
-	Use g_filename_to_utf8 for attachment filenames.
-
-2009-03-25  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #576694
-
-	* text/e-text.c (reset_layout):
-	Handle absolute font sizes correctly.
-
-2009-02-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	* text/e-text.c:
-	Remove unneeded #include <libart_lgpl/...>.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* menus/gal-view-collection.c:
-	* menus/gal-view-instance.c:
-	Remove unneeded #include <libgnome/gnome-util.h>.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #567276
-
-	* menus/gal-view-menus.c:
-	Remove unneeded #include <libgnomeui/gnome-dialog.h>.
-
-2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>
-
-	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
-
-	* Fix for bug #566011
-
-	* misc/e-charset-picker.c:
-	* misc/e-signature-combo-box.c:
-	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h>.
-
-2008-11-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #559041
-
-	* text/e-text.c (e_text_class_init):
-	Add translator comment for "im_context" property.
-
-2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	* widgets/menus/gal-view-menus.c:
-	* widgets/misc/e-activity-handler.c:
-	* widgets/table/e-table-config-field.h:
-	Only include the toplevel GTK+ header.
-
-2008-10-17  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* text/e-text.c:
-	* text/e-text.h:
-
-2008-10-03  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* text/e-text-test.c:
-
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* menus/gal-view-instance-save-as-dialog.c:
-	* menus/gal-view-instance-save-as-dialog.h:
-	* text/e-text.h:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-timezone-dialog/e-timezone-dialog.c:
-	* e-timezone-dialog/e-timezone-dialog.h:
-	* menus/gal-define-views-dialog.h:
-	* menus/gal-define-views-model.c:
-	* menus/gal-view-collection.c:
-	* menus/gal-view-collection.h:
-	* menus/gal-view-etable.c:
-	* menus/gal-view-factory.c:
-	* menus/gal-view-menus.c:
-	* menus/gal-view-new-dialog.h:
-	* text/e-text-model-repos.h:
-	* text/e-text-model.c:
-	* text/e-text-model.h:
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* menus/gal-define-views-dialog.c:
-	* menus/gal-define-views-model.h:
-	* menus/gal-view-etable.h:
-	* menus/gal-view-factory-etable.c:
-	* menus/gal-view-factory-etable.h:
-	* menus/gal-view-factory.h:
-	* menus/gal-view-instance.c:
-	* menus/gal-view-instance.h:
-	* menus/gal-view-menus.h:
-	* menus/gal-view-new-dialog.c:
-	* menus/gal-view.c:
-	* menus/gal-view.h:
-	* text/e-text-model-repos.c:
-	* text/e-text-model-test.c:
-
-2008-06-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* text/e-text-model-test.c: (main):
-	* text/e-text-test.c: (main):
-	gdk_rgb_get_cmap -> gdk_rgb_get_colormap
-
-2008-06-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* menus/gal-define-views-dialog.c: (gal_define_views_dialog_init):
-	* menus/gal-view-new-dialog.c: (gal_view_new_dialog_init):
-	gtk_window_set_policy -> gtk_window_set_resizable.
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534360
-
-	* e-timezone-dialog/e-timezone-dialog.h:
-	* menus/gal-view-instance.c:
-	* menus/gal-view-menus.h:
-	* text/e-text.h:
-	Migrate from deprecated GtkObject symbols to GObject equivalents.
-
-2008-04-25  Danny Baumann  <dannybaumann@web.de>
-
-	** Fix for bug #529893
-
-	* text/e-text.c: (_do_tooltip):
-	Properly set type hint on tooltip window.
-
-2008-04-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #529641
-
-	* e-timezone-dialog/e-timezone-dialog.glade:
-	Prefer the term "drop-down combination box" to "combo box" per the
-	GNOME Documentation Style Guide.
-
-2008-02-23  Andre Klapper  <a9016009@gmx.de>
-
-	* e-timezone-dialog/e-timezone-dialog.glade:
-	Fix the string freeze break of the former commit.
-
-2008-02-23  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #471779
-
-	* e-timezone-dialog/e-timezone-dialog.c:
-	(e_timezone_dialog_add_timezones), (e_timezone_dialog_construct),
-	(on_map_leave), (on_map_button_pressed),
-	(e_timezone_dialog_set_timezone), (on_combo_changed),
-	(timezone_combo_get_active_text), (timezone_combo_set_active_text):
-	* e-timezone-dialog/e-timezone-dialog.glade:
-	Timezone entries in the combo-box are now sorted alphabetically. 
-	Migrated deprecated widget to GtkComboBox. 
-
-2008-02-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #383438
-
-	* text/e-text.c: (e_text_point):
-	Report "mouse over" even with no text entered.
-
-2008-02-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* text/e-text.c (update_im_cursor_position):
-	* text/e-text.c (e_text_get_cursor_locations):
-	Remove these unused functions to silence compiler warnings.
-
-2008-01-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* menus/gal-view-collection.c:
-	* menus/gal-view-menus.c:
-	* menus/gal-view-instance.c:
-	Replace G_GNUC_FUNCTION (deprecated) with G_STRFUNC.
-
-2008-01-14  Mayank Jain  <mayank.gnu@gmail.com>
-
-	** Fix for bug #348638
-
-	* text/e-text.c: (insert_preedit_text), (reset_layout_attrs),
-	(e_text_draw): Cleanly remove pre-edit buffer on pressing backspace in 
-	day-view, for non-ascii characters as well. 
-
-2007-11-26  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	** Fixes bug #495951
-
-	* menus/gal-view-instance-save-as-dialog.c:
-	(gal_view_instance_save_as_dialog_set_instance),
-	(gvisad_setup_validate_button), (gvisad_setup_radio_buttons),
-	(gvisad_entry_changed),
-	(gal_view_instance_save_as_dialog_set_property),
-	(gal_view_instance_save_as_dialog_dispose),
-	(gal_view_instance_save_as_dialog_init),
-	(gal_view_instance_save_as_dialog_new),
-	(gal_view_instance_save_as_dialog_save):
-	* menus/gal-view-instance-save-as-dialog.glade:
-	* menus/gal-view-instance-save-as-dialog.h:
-	Use GtkTreeView in place of ETable
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #341085
-
-	* text/e-text.c: (get_bounds), (e_text_draw): Use 'x_offset' and
-	'y_offset' only for text drawing, not for changing bounds of EText.
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-timezone-dialog/e-timezone-dialog.c: (get_local_offset),
-	(get_local_timezone), (on_map_visibility_changed),
-	(on_map_button_pressed), (get_zone_from_point),
-	(e_timezone_dialog_set_timezone), (on_combo_changed):
-	* menus/gal-view-factory.c: (gal_view_factory_get_title):
-	* text/Makefile.am:
-	* text/e-text.c: (e_text_event), (popup_targets_received),
-	(next_word), (find_offset_into_line), (_get_position),
-	(e_text_class_init):
-	* text/e.entry.[ch]
-	* text/e-completion.[ch]
-	* text/e-text-model-uri.[ch]
-	* text/e-completion-view.[ch]
-	* text/e-completion-callbacks.[ch]
-	* text/e-completion-match.[ch]
-	* text/e-table-text-model.[ch]: Remove all of these. They
-	are now unused.
-
-	Warning fixes:
-	- NULL vs 0 vs FALSE
-	- ANSIfication of function declarations
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* text/e-text.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #461195
-
-	* text/e-completion-view.c:
-	* text/e-text-model.c:
-	* text/e-text.c:
-	* text/e-entry.c:
-	* text/e-completion.c:
-	* misc/e-dateedit.c:
-	* misc/e-reflow-model.c:
-	* misc/e-reflow.c:
-	* misc/e-canvas.c:
-	* misc/e-image-chooser.c:
-	* misc/e-selection-model.c:
-	* misc/e-printable.c:
-	* misc/e-canvas-background.c:
-	* misc/e-search-bar.c: Use GObject's marshalers.
-
-2007-08-31  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Move away from g_assert to g_return* critical warnings to debug
-	them better.
-
-	* e-timezone-dialog/e-timezone-dialog.c: (get_zone_from_point):
-	* text/e-completion-view.c: (e_completion_view_set_cursor_row):
-	* text/e-table-text-model.c: (e_table_text_model_dispose):
-	* text/e-text-model-uri.c: (objectify_idle_cb):
-
-2007-08-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #411619
-
-	* Makefile.am: Fix subdirectory order.
-
-	* e-timezone-dialog/Makefile.am: Remove WIN32_BOOTSTRAP_LIBS.
-
-2007-08-23  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #309166
-
-	* text/e-text.c (_get_updated_position): Modified the way movement
-	of cursor is handled across grapheme clusters.
-	* text/e-text.c (_get_position): Uses the new function for forward
-	and backward movement of characters (simple or grapheme clusters).
-	Patch by Mayank Jain.
-
-2007-08-23  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #303878
-
-	* text/e-text.h: preedit_pos: new value.
-	* text/e-text.c: (e_text_get_cursor_locations):
-	New function. Get the cursor locations.
-	(update_im_cursor_position): New function.
-	Set the cursor location to IMContext.
-	(insert_preedit_text): Call update_im_cursor_position when draw
-	preedit text.
-	(e_text_preedit_changed_cb): Set the preedit cursor position to
-	preedit_pos.
-	Patch by Hiroyuki Ikezoe and Mayank Jain.
-
-2007-07-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* text/e-text-model-uri.c:
-	* text/e-completion-view.c:
-	* text/e-text-model.c:
-	* text/e-text.c:
-	* text/e-completion-callbacks.c:
-	* text/e-entry.c:
-	* text/e-table-text-model.c:
-	* text/e-completion.c:
-	* menus/gal-view-new-dialog.c:
-	* menus/gal-view-collection.c:
-	* menus/gal-view-etable.c:
-	* menus/gal-view-instance-save-as-dialog.c:
-	* menus/gal-view-factory-etable.c:
-	* menus/gal-view.c:
-	* menus/gal-view-instance.c:
-	* menus/gal-view-factory.c:
-	* menus/gal-define-views-dialog.c:
-	* menus/gal-define-views-model.c:
-	* misc/e-canvas-vbox.c:
-	* misc/e-reflow-model.c:
-	* misc/e-selection-model-array.c:
-	* misc/e-reflow.c:
-	* misc/e-canvas.c:
-	* misc/e-selection-model.c:
-	* misc/e-printable.c:
-	* misc/e-canvas-background.c:
-	* misc/e-selection-model-simple.c: Use G_DEFINE_TYPE instead of
-	  E_MAKE_TYPE.
-
-2007-07-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* text/Makefile.am:
-	Rename EXTRA_GNOME_CFLAGS to GNOME_PLATFORM_CFLAGS.
-	Similarly for EXTRA_GNOME_LIBS.
-
-2007-07-26  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* text/e-text.c: (e_text_dispose): Plugged memory leak.
-
-2007-07-19  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* text/e-text.c: (e_text_copy_clipboard): Remove needless g_strndup().
-
-2007-07-15  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* text/e-text.c: (primary_get_cb): Remove needless g_strndup().
-
-2007-07-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	* table/e-table-specification.c: (e_table_specification_duplicate)
-	Return NULL if ETable specification string fails to load.
-
-	* table/e-tree.c:
-	* table/e-tree-scrolled.c:
-	Improve error handling in the constructors.
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* menus/gal-define-views-dialog.c
-	(gdvd_button_new_dialog_callback): Remove a warning
-
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #446015 from Gilles Dartiguelongue  
-
-	* menus/gal-define-views-dialog.c:
-	(gdvd_button_new_dialog_callback), (gdvd_button_new_callback),
-	(gdvd_button_modify_callback), (gdvd_button_delete_callback),
-	(gdvd_cursor_changed_callback), (gdvd_connect_signal),
-	(gal_define_views_dialog_init),
-	(gal_define_views_dialog_set_collection),
-	(gal_define_views_dialog_new):
-	* menus/gal-define-views-dialog.h:
-	* menus/gal-define-views.glade:
-
-2007-06-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #325882
-
-	* menus/gal-define-views.glade:
-	* table/e-table-field-chooser.glade:
-	* misc/e-attachment.glade:
-	Changed GTK_WIN_POS_NONE to GTK_WIN_POS_CENTER_ON_PARENT.
-
-2007-06-02  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	** Fixes part of bug #441014
-
-	* e-timezone-dialog/e-timezone-dialog.c:
-	(e_timezone_dialog_set_timezone):
-	* menus/gal-view-collection.c: (load_single_file),
-	(load_single_dir), (gal_view_collection_save):
-	* menus/gal-view-instance.c: (save_current_view),
-	(load_current_view): various compilation warning cleanups
-
-2007-05-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	* text/e-text.c (e_text_copy_clipboard),
-	(e_text_update_primary_selection), (e_text_paste), (e_text_do_popup):
-	Remove check for obsolete GTK+ version (#424562).
-
-2007-05-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* menus/gal-view-menus.c: (build_menus): Add tooltips for user defined
-	views.
-
-2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #429422
-
-	* text/e-text-model-uri.c (e_text_model_uri_dispose),
-	(objectify_idle_flush):
-	Use g_source_remove() instead of gtk_idle_remove().
-
-	* text/e-text-model-uri.c (e_text_model_uri_objectify):
-	Use g_idle_add() instead of gtk_idle_add().
-
-	* text/e-text.c (e_text_dispose), (e_text_event):
-	* text/e-entry.c (e_entry_text_keypress), (proxy_changed),
-	(e_entry_cancel_delayed_completion), (e_entry_dispose):
-	Use g_source_remove() instead of gtk_timeout_remove().
-
-	* text/e-text.c (e_text_event):
-	* text/e-entry.c (proxy_changed), (e_entry_start_delayed_completion):
-	* e-timezone-dialog/e-timezone-dialog.c (on_map_visibility_changed):
-	Use g_timeout_add() instead of gtk_timeout_add().
-
-	* text/e-completion-view.c (e_completion_view_set_width):
-	* text/e-text.c (_do_tooltip):
-	Use gtk_widget_set_size_request() instead of gtk_widget_set_usize().
-
-	* text/e-completion-callbacks.c (e_completion_callbacks_new):
-	Use g_object_new() instead of gtk_type_new().
-
-	* text/e-entry.c (e_entry_enable_completion_full):
-	Use g_object_ref_sink() instead of gtk_object_sink().
-
-	* text/e-entry.c (e_entry_class_init):
-	Use g_cclosure_marshal_VOID__INT instead of gtk_marshal_NONE__INT.
-
-	* menus/gal-view-new-dialog.c (gal_view_new_dialog_init):
-	* menus/gal-view-instance-save-as-dialog.c
-	(gal_view_instance_save_as_dialog_init):
-	* menus/gal-define-views-dialog.c (gal_define_views_dialog_init):
-	Use g_object_ref() instead of gtk_widget_ref().
-	Use g_object_unref() instead of gtk_widget_unref().
-
-	* menus/gal-view-collection.c (gal_view_collection_dispose):
-	e_free_object_list() is dead; just do it manually.
-
-	* menus/gal-view-collection.c (load_single_file), (load_single_dir),
-	(gal_view_collection_save):
-	* menus/gal-view-instance.c (gal_view_instance_construct):
-	Use g_build_filename() instead of g_concat_dir_and_file().
-
-	* menus/gal-view-collection.c (gal_view_collection_load):
-	Use g_mkdir_with_parents() instead of e_create_directory().
-
-	* e-timezone-dialog/e-timezone-dialog.c (e_timezone_dialog_construct):
-	Use gtk_editable_set_editable() instead of gtk_entry_set_editable().
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2007-02-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #357216
-
-	* text/e-entry.c: Remove "font", "fontset", and "gdk_font"
-	properties, since they forward gets and sets to non-existant
-	properties in entry->item.
-
-2006-09-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes bug #357970
-
-	* text/e-text.c (e_text_unrealize): Don't call deprecated GLib / GDK
-	functions.
-
-2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #351332
-
-	* misc/e-attachment-bar.h: Fix implicit function declarations.
-
-2006-08-23  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #352450
-
-	* misc/e-canvas-background.c:
-	* misc/e-cursors.c:
-	* misc/e-map.c:
-	* misc/e-reflow.c:
-	* misc/e-task-widget.c:
-	* misc/gal-combo-box.c:
-	* table/e-cell-text.c:
-	* table/e-cell-toggle.c:
-	* table/e-table-field-chooser-item.c:
-	* table/e-table-field-chooser.c:
-	* table/e-table-header-item.c:
-	* table/e-table-header-utils.c:
-	* table/e-table-item.c:
-	* table/e-table.c:
-	* table/e-tree-memory.c:
-	* table/e-tree-sorted.c:
-	* table/e-tree.c:
-	* table/e-text.c:
-	Replace deprecated GLib and GDK function calls.
-
-2006-08-20  Jeff Cai  <jeff.cai@sun.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c:
-	(e_timezone_dialog_construct), (e_timezone_dialog_reparent),
-	(map_destroy_cb):
-	Fixes 350559. Disable timeout function when the map is destroyed.
-
-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):
-	* menus/gal-view-menus.c: 
-	* misc/e-attachment-bar.c: (calculate_height_width),
-	(update_remote_file), (e_attachment_bar_get_attachment),
-	(class_init):
-	* misc/e-attachment.c: (async_progress_update_cb),
-	(download_to_local_path):
-	* misc/e-calendar-item.c: (e_calendar_item_get_arg),
-	(e_calendar_item_realize), (e_calendar_item_ensure_days_visible):
-	* misc/e-calendar.c: (e_calendar_drag_motion),
-	(e_calendar_drag_leave), (e_calendar_focus):
-	* misc/e-canvas-background.c: (ecb_get_property):
-	* misc/e-canvas.c: (e_canvas_class_init), (pick_current_item):
-	* misc/e-cell-date-edit.c: (e_cell_date_edit_do_popup),
-	(e_cell_date_edit_show_popup):
-	* misc/e-cell-percent.c:
-	* misc/e-charset-picker.c: (e_charset_picker_bonobo_ui_populate):
-	* misc/e-config-page.c: (e_config_page_class_init):
-	* misc/e-dateedit.c: (e_date_edit_set_date),
-	(e_date_edit_set_date_and_time_of_day),
-	(on_date_popup_date_selected):
-	* misc/e-dropdown-button.c: (e_dropdown_button_class_init):
-	* misc/e-expander.c: (get_expander_bounds), (e_expander_expose),
-	(is_in_expander_panel):
-	* misc/e-filter-bar.c: (option_changed), (build_items):
-	* misc/e-image-chooser.c: (e_image_chooser_init),
-	(image_drag_data_received_cb):
-	* misc/e-map.c: (e_map_size_allocate), (e_map_button_press),
-	(e_map_button_release), (e_map_motion), (e_map_zoom_to_location),
-	(e_map_zoom_out), (update_render_point), (repaint_point),
-	(zoom_in_smooth):
-	* misc/e-multi-config-dialog.c: (impl_response):
-	* misc/e-reflow.c: (e_reflow_realize), (e_reflow_event):
-	* misc/e-search-bar.c: (clear_search), (search_now_verb_cb),
-	(entry_activated_cb), (activate_button_clicked_cb),
-	(clear_button_clicked_cb):
-	* misc/e-selection-model.c: (e_selection_model_key_press):
-	* misc/e-send-options.c: (delay_until_date_changed_cb),
-	(e_sendoptions_get_need_general_options):
-	* misc/e-unicode.c: (e_stripped_char):
-	* table/e-cell-progress.c: (eprog_draw_border), (eprog_draw),
-	(eprog_event):
-	* table/e-cell-spin-button.c: (ecsb_event), (ecsb_focus),
-	(ecsb_unfocus), (ecsb_dispose):
-	* table/e-cell-text.c: (ect_draw), (ect_show_tooltip):
-	* table/e-cell-toggle.c: (etog_draw), (etog_event):
-	* table/e-cell-tree.c: (ect_max_width):
-	* table/e-cell-vbox.c:
-	* table/e-table-click-to-add.c: (etcta_event):
-	* table/e-table-config.c: (create_global_store):
-	* table/e-table-field-chooser-dialog.c:
-	* table/e-table-field-chooser-item.c: (etfci_find_button),
-	(etfci_reflow), (etfci_get_property), (etfci_realize):
-	* table/e-table-field-chooser.c:
-	(e_table_field_chooser_class_init):
-	* table/e-table-group-container.c: (etgc_unrealize):
-	* table/e-table-group.c: (e_table_group_new):
-	* table/e-table-header-item.c: (e_table_header_item_get_height),
-	(ethi_realize), (ethi_event):
-	* table/e-table-header-utils.c: (e_table_draw_elided_string),
-	(e_table_header_draw_button):
-	* table/e-table-item.c: (eti_set_property), (eti_get_property),
-	(eti_draw), (eti_event), (eti_cursor_change):
-	* table/e-table-scrolled.c: (e_table_scrolled_class_init):
-	* table/e-table-search.c:
-	* table/e-table-sort-info.c: (e_table_sort_info_save_to_node):
-	* table/e-table.c: (table_canvas_reflow_idle),
-	(table_canvas_size_allocate), (canvas_vbox_event),
-	(click_to_add_event), (do_drag_motion), (e_table_class_init):
-	* table/e-tree-scrolled.c: (e_tree_scrolled_class_init):
-	* table/e-tree.c: (tree_canvas_reflow_idle),
-	(tree_canvas_size_allocate), (e_tree_drag_get_data),
-	(do_drag_motion), (e_tree_class_init):
-	* text/e-text.c: (e_text_set_property), (e_text_draw),
-	(_do_tooltip), (primary_clear_cb), (_get_position),
-	(e_text_command): Tons of cleanups of the following sort:
-	- remove unused vars
-	- remove extraneous semi-colons
-	- add some comments where assignments were done without using
-	  the results later
-	- remove break; statements after return foo;
-	- add casts in some places to be more type correct
-	- rename variables with name clashes
-	- s/if/ifdef in some cases
-	- mark some code static
-	- remove some unused functions
-	- use guint for 1-bit bitfields
-
-2006-01-30  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Reviewed by Harish Krishnaswamy  <kharish@novell.com>
-	
-	Fixes #250754
-	* misc/e-dateedit.c: Used %x for strftime so that the date is represented
-	according to the locale used.
-
-2006-01-16  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* table/e-tree-table-adapter.c (set_expanded_state_func),
-	(set_collapsed_state_func): 
-	(e_tree_table_adapter_load_all_expanded_state):
-	* table/e-tree.c: (e_tree_load_all_expanded_state):
-	Added functions to collapse/Expand all
-
-2006-01-15  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #220286
-
-	* text/e-text.c: (tooltip_ungrab), (_do_tooltip), (e_text_event):
-	Added a ungrab for keyboard, so that it hides the tooltip.
-
-2006-01-13  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Fixes bug #326264
-	
-	* menus/gal-view-menus.c: (build_menus): Changes mnemonics of Current
-	View menu item, since it collides with Caret Mode.
-
-2006-01-11  Johnny Jacob  <johnnyjacob#gmail.com>
-
-	* text/e-text.c (e_text_set_property): Add the width to
-	the pango layout.
-
-2006-01-10  Simon Zheng  <simon.zheng@sun.com>
-
-	* menus/gal-view-instance.c:
-	* misc/e-attachment-bar.c:
-	* misc/e-calendar-item.c:
-	* misc/e-dateedit.c:
-	Use e_util_mkdir_hier() instead of e_mkdir_hier().
-
-        Use e_util_strstrcase() instead of e_strstrcasea().
-    
-        use e_strfime() 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.
-
-2005-12-30  Andre Klapper <a9016009@gmx.de>
-
-	* evolution/widgets/misc/e-url-entry.c:
-	  harmonized "URL", "Url" and "url". Fixes bug 325125.
-
-2005-12-23  Andre Klapper <a9016009@gmx.de>
-
-	* e-table.c: fixed one typo.
-          Fixes bug 306118 partially.
-
-2005-12-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #240762
-
-	* menus/gal-define-views-dialog.c:
-	(etable_selection_change_forall_cb): Made only the user created
-	views to be editable.
-
-2005-12-18  Tor Lillqvist  <tml@novell.com>
-
-	* e-timezone-dialog/Makefile.am: Link with libeutil.
-
-	* e-timezone-dialog/e-timezone-dialog.c
-	(e_timezone_dialog_construct): Construct glade file pathname at
-	run-time.
-
-	* menus/gal-view-collection.c
-	* menus/gal-view-instance.c: Include libedataserver/e-xml-utils.h
-	for e_xml_save_file() prototype.
-
-2005-12-12  Irene Huang <Irene.Huang@sun.com>
-
-	reviewed by: Veerapuram Varadhan  <vvaradhan@novell.com>
-	
-	* menus/gal-view-menus.c: Change #include <e-util/e-list.h> to
-	#include <libedataserver/e-list.h>.
-	* misc/e-unicode.c: Change #include <e-util/e-iconv.h> to
-	#include <libedataserver/e-iconv.h>.
-
-2005-12-06  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	* menus/gal-view-new-dialog.c (gal_view_new_dialog_set_property):
-	Load the widget pointer before using it.  Fixes a compiler warning
-	as well as #313219
-	
-2005-11-29 Simon Zheng <simon.zheng@sun.coma
-
-	* menus/gal-view-collection.c: (gal_view_generate_string):
-	Fix #322311. Using g_utf8_next_char() to traverses UTF-8
-	string and replace characters that are neither a alpha nor
-	a numeral.
-
-2005-09-29  Tor Lillqvist  <tml@novell.com>
-
-	* menus/gal-view-collection.c (load_single_dir)
-	* menus/gal-view-instance.c (load_current_view): Use
-	g_win32_locale_filename_from_utf8() from GLib 2.8 instead of
-	gnome_win32_locale_filename_from_utf8() which was temporarily in
-	libgnome.
-
-2005-09-29  Li Yuan  <li.yuan@sun.com>
-
-	* menus/gal-define-views-dialog.c:
-	(etable_selection_change_forall_cb):
-	Fix #240762. If the galview implement the edit function,
-	enable the edit button. If not, disable it.
-
-2005-09-28  Tor Lillqvist  <tml@novell.com>
-
-	* e-timezone-dialog/Makefile.am
-	* menus/Makefile.am
-	* text/Makefile.am: Install in privsolib instead of privlib (no
-	difference on Unix). Use NO_UNDEFINED. Link with all needed
-	libraries to satisfy the -no-undefined used on Windows.
-
-	* e-timezone-dialog/Makefile.am
-	* text/Makefile.am: On Win32, use bootstrap import library for
-	libemiscwidgets, which hasn't been built yet when we come
-	here.
-
-	* menus/Makefile.am: Drop several overlapping CFLAGS, use
-	E_UTIL_CFLAGS instead.
-
-	* text/Makefile.am: Drop several overlapping
-	CFLAGS. EXTRA_GNOME_CFLAGS should be enough.
-	
-2005-08-03  Li Yuan  <li.yuan@sun.com>
-
-	* menus/gal-view-new-dialog.glade:
-	Add a11y name to the left table of config dialog.
-	* misc/e-multi-config-dialog.c: 
-	Add name to the left table of preference dialog.
-	* table/e-table-config.c: (e_table_proxy_etable_shown_new),
-	(e_table_proxy_etable_available_new):
-	Add a11y name to "Show Fields" table and "Available Fields" table.
-
-2005-07-28  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* misc/e-attachment-bar.c: (update_remote_file):
-	Void function should not return value.
-
-	Fixes #311837
-
-2005-07-21  Srinivasa Ragavan <sragavan@novell.com>
-
-	* menus/gal-define-views-dialog.c: (etable_selection_change_forall_cb) 
-	Fixes a bug where it allows just builtin views to be edited and not user
-	added one. It should have been the other way around.
-
-2005-06-23  Kaushal Kumar  <kakumar@novell.com>
-
-	* text/Makefile.am: Set libetextincludedir to text to match 
-	source directory name.
-
-2005-06-21  Kaushal Kumar  <kakumar@novell.com>
-
-	* table/ChangeLog: Added from gal/gal/e-table as Gal is 
-	retired from Head and e-table files are moved here.
-
-2005-05-12  Srinivasa Ragavan <sragavan@novell.com>
-	* misc/e-dateedit.c: (on_time_entry_key_release),
-	(create_children): Fix the bug 303856. Enables OK button
-	when arrow key used to change the time in a appointment.
-
-2005-05-06  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* misc/e-search-bar.c: (set_menu) Solaris gettext crashes on NULL 
-	input string. Fixes #260312. Patch submitted by 
-	Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
-
-2005-04-28  Li Yuan  <li.yuan@sun.com>
-
-	* misc/e-calendar-item.c: (e_calendar_item_realize),
-	(e_calendar_item_set_selection_if_emission),
-	(e_calendar_item_style_set):
-	use widget->style instead of hard code colors.
-	* misc/e-calendar-item.h:
-	* misc/e-calendar.c: (e_calendar_style_set):
-	call e_calendar_item_style_set when style changes.
-
-	Fixes #6767.
-
-2005-03-14  Not Zed  <NotZed@Ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): don't
-	bonobo_ui_free_string from bonobo_ui_node_to_string - it should be
-	g_free'd now (api chagne in bonobo).
-
-2005-03-11  Sushma Rai  <rsushma@novell.com>
-
-	* misc/e-send-options.c (setup_widgets): Not showing the send options
-	notebook tabs, in case general options page is disabled. Fixes #73501
-
-2005-02-09  Hans Petter Jansson  <hpj@novell.com>
-
-	* e-timezone-dialog/Makefile.am:
-	* menus/Makefile.am:
-	* misc/Makefile.am: Install shared libraries to privlibdir.
-
-2005-01-18  Hao Sheng  <hao.sheng@sun.com>
-
-	* misc/e-dateedit.[ch]:
-	(e_date_edit_get_entry): return the entry of the date edit.
-
-2004-11-12  JP Rosevear  <jpr@novell.com>
-
-	* menus/gal-view-menus.c: Convert to G_DEFINE_TYPE
-
-2004-11-12  JP Rosevear  <jpr@novell.com>
-	
-	* e-timezone-dialog/e-timezone-dialog.c: convert to G_DEFINE_TYPE
-
-2004-10-28  Li Yuan  <li.yuan@sun.com>
-
-	* e-timezone-dialog/e-timezone-dialog.glade: Add a name for
-	timezone combox.
-
-2004-09-13  Rodney Dawes  <dobey@novell.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c (get_widgets):
-	(on_map_motion, on_map_leave, e_timezone_dialog_set_timezone):
-	* e-timezone-dialog/e-timezone-dialog.glade:
-	Add the label back for previewing the timezone name, and set the
-	label appropriately
-
-	Fixes #64800
-
-2004-08-17  Rodney Dawes  <dobey@novell.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c (e_timezone_dialog_construct):
-	Connect to the "changed" signal instead of "activate"
-
-	Fixes #62970
-
-2004-05-20  Rodney Dawes  <dobey@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c (e_timezone_dialog_construct):
-	Use the activate signal, instead of changed, for the combo box
-	(on_map_motion): Set the text in the combo's entry when we mouse over
-	one of the points on the map, as a preview for the timezone
-	(on_map_leave): Reset the combo's entry to the timezone we started with
-	when we leave the map
-
-	Fixes #57122
-
-2004-04-09  Rodney Dawes  <dobey@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c
-	(e_timezone_dialog_construct): Set the border widths on the dialog's
-	vbox and action area to be HIG-complaint
-	Get rid of the timezone preview widget in here
-	Point the internal 'table' to the right widget
-	(on_map_motion): Get rid of the extra-hacky code to set the preview
-	widget's label to the timezone, now that that widget is gone
-	(on_map_leave): Update the comment to not reference the preview
-	widget that is now gone
-	Get rid of the code to set the preview widget's label to empty string
-	* e-timezone-dialog/e-timezone-dialog.glade: Update for HIG-compliance
-
-2004-02-26  JP Rosevear <jpr@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c
-	(e_timezone_dialog_dispose): don't reference uninitialized memory
-
-2003-12-10  Not Zed  <NotZed@Ximian.com>
-
-	* menus/gal-view-menus.c (remove_instance): NULL out
-	priv->instance when we unref it.  Bug #51713.
-
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* */Makefile.am: Remove hard coded disable deprecated flags
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* e-timezone-dialog/Makefile.am: don't include toplevel libical
-
-2003-11-07  JP Rosevear  <jpr@ximian.com>
-
-	* e-timezone-dialog/Makefile.am: use TZDIALOG_FLAGS
-
-2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-timezone-dialog/Makefile.am: INCLUDE path fixes for changes
-	made to libical build.
-
-	* e-timezone-dialog.h: #include <libical/ical.h>
diff --git a/widgets/ChangeLog.pre-1-4 b/widgets/ChangeLog.pre-1-4
deleted file mode 100644
index 42bb1157ac..0000000000
--- a/widgets/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,506 +0,0 @@
-2003-05-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.glade: HIG-ified the
-	spacing, padding, alignment of this dialog. Fixes bug #41148
-
-2003-05-16  Anna Marie Dirks  <anna@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.glade: HIG-ified the
-	spacing, padding, alignment of this dialog. Fixes bug #41148
-
-2003-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* menus/gal-view-menus.c (gvm_finalize): unref the component
-
-2003-05-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* menus/gal-view-menus.c (gal_view_menus_unmerge): Guard against
-	the BonoboUIComponent not having a container to prevent a warning.
-
-2003-04-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): Don't convert the label
-	charset from UTF-8 into the locale charset.
-
-2003-04-22  Anna Dirks  <anna@ximian.com> 
-
-	* misc/e-multi-config-dialog.c : add appropriate padding and
-	spacing to the settings dialog. Fixes #41392.
-
-2003-04-10  Mike Kestner  <mkestner@ximian.com>
-
-	* menus/gal-view-menus.c (build menus): add ... to "Define Views"
-	and "Save Custom View" menuitem labels.
-
-2003-03-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* menus/gal-view-menus.c (set_state): Removed debugging message.
-
-2003-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.glade: Swap OK/Cancel
-	buttons to comply with the HIG.
-
-2003-03-17  Dan Winship  <danw@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c (on_map_motion): Don't
-	crash if there's no timezone set initially. #39783
-
-2003-03-11  Dan Winship  <danw@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c: Various cleanups.
-	(e_timezone_dialog_get_timezone): Return an icaltimezone.
-	(e_timezone_dialog_set_timezone): Take an icaltimezone
-	(e_timezone_dialog_construct): Set a minimum size on the scrolled
-	window
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* menus/gal-view-menus.c (gal_view_menus_unmerge): Use
-	G_GNUC_FUNCTION instead of __FUNCTION__.
-
-2003-02-20  Dan Winship  <danw@ximian.com>
-
-	* e-timezone-dialog/Makefile.am: Make this a dynamic lib rather
-	than static so it can be portably linked into the shlib
-	components.
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.glade: Set response_ids on
-	the OK/Cancel buttons
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* e-timezone-dialog/Makefile.am (INCLUDES): Remove unneeded
-	MAP_DIR define.
-	(gladedir): Remove. Defined in configure.in now.
-
-	* menus/gal-view-menus.c: #include <string.h>
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-timezone-dialog/Makefile.am (gladedir): Version using
-	$(BASE_VERSION).
-	(INCLUDES): Update the MAP_DIR define with versioning.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-timezone-dialog/Makefile.am: Images are now in
-	$(datadir)/evolution/images instead of
-	$(datadir)/images/evolution.
-
-2002-11-14  Chris Toshok  <toshok@ximian.com>
-
-	* menus/gal-view-menus.c (define_views): use GtkDialog's
-	::response instead of GnomeDialog's ::clicked.
-	(dialog_response): use response id's.
-	(gvm_finalize): fix warning.
-
-2002-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* menus/gal-view-menus.h
-	* menus/gal-view-menus.c: GObjectified.
-
-	* e-timezone-dialog/e-timezone-dialog.h
-	* e-timezone-dialog/e-timezone-dialog.c: GObjectified.
-
-2002-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c
-	(e_timezone_dialog_destroy): g_object_unref() instead of
-	gtk_object_unref() on the GladeXML object.
-	(e_timezone_dialog_construct): Likewise on the ETimezoneDialog
-	object.
-
-2002-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.glade: Converted to Glade 2.
-
-2002-11-13  Not Zed  <NotZed@Ximian.com>
-
-	* menus/gal-view-menus.c: gnome-xml->libxml
-
-	* menus/gal-view-menus.h: gnome-xml->libxml
-
-2002-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c
-	(e_timezone_dialog_get_builtin_timezone): Constify arg
-	display_name.
-
-2002-11-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* menus/gal-view-menus.c (build_stuff): Add some casts.
-
-2002-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c
-	(e_timezone_dialog_construct): Pass NULL as the domain arg to
-	glade_xml_new().
-	(e_timezone_dialog_get_timezone): Make arg display_name const.
-	(find_selected_point): Constify local variable timezone.
-
-	* e-timezone-dialog/e-timezone-dialog.h: Do not #include
-	<libgnome/gnome-defs.h>.
-
-2002-08-15  Mike Kestner  <mkestner@ximian.com>
-
-	* menus/gal-view-menus.c (build_stuff): ref/unref the gvm
-
-2002-07-09  Peter Williams  <peterw@ximian.com>
-
-	* e-timezone-dialog/Makefile.am: Add -I$(top_builddir)/libical/src/libical;
-	some headers that we rely on get installed, so they point to the ical.h that
-	gets generated and installed; consequently we need to be able to find the
-	generated ical.h
-
-	* misc/Makefile.am: Install libemiscwidgets.a and its headers. However,
-	break EFilterBar into a separate libefilterbar.a because we don't want
-	the installed library to depend on libfilter.
-
-2002-07-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c (e_timezone_dialog_init):
-	Make not floating.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* menus/gal-view-menus.c, menus/gal-view-menus.h
-	(gal_view_menus_set_show_define_views): Added this function to let
-	you disable the define views dialog.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* menus/gal-view-menus.c (define_views): Don't show this dialog
-	more than once per collection.
-
-2002-05-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): Made it so that if the
-	current_id doesn't match any of the given ids, it treats it the
-	same as a NULL id.
-	(gal_view_menus_apply): Added a check for gvm->priv == NULL here.
-	(gal_view_menus_apply, collection_changed, instance_changed):
-	Removed calls to set_radio after build_stuff, since the last thing
-	build_stuff does is calls set_radio.
-
-2002-02-27  Larry Ewing  <lewing@ximian.com>
-
-	* misc/e-combo-button.c (impl_button_press_event): make a right
-	click bring up the popup menu.
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* menus/gal-view-menus.c, menus/gal-view-menus.h
-	(gal_view_menus_unmerge): New function to handle unmerging menus
-	at control deactivation time.
-	(d): Turned off debugging output here.
-	(build_menus): Gave the separators names and marked them with f=""
-	to make them work better with bonobo 1.
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* menus/gal-view-menus.c, menus/gal-view-menus.h
-	(gal_view_menus_new): Made this take a GalViewInstance instead of
-	a GalViewCollection.  Reworked most of this to utilize the
-	interfaces provided by GalViewInstance.
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* menus/Makefile.am: Use `GNOME_FULL_CFLAGS'.
-
-2002-01-11  Damon Chaplin  <damon@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.[hc]: translate timezone names,
-	and provide a function to get back to the English version.
-
-2001-10-24  Jon Trowbridge  <trow@ximian.com>
-
-	* menus/gal-view-menus.c (gal_view_menus_apply): Ref the
-	BonoboUIComponent that we are holding.
-	(gvm_destroy): Unref our BonoboUIComponent.
-
-2001-10-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* menus/gal-view-menus.c: Make this not be a radio button, but
-	instead just a normal menu.
-
-2001-10-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* menus/gal-view-menus.c: #include bonobo-ui-util.h
-
-2001-10-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* misc/Makefile.am:
-	* menus/Makefile.am: added BONOBO_GNOME_CFLAGS to make it compile
-	with latest Bonobo
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: the meeting-time-sel dir is dead, relevant pieces
-	moved to calendar/gui
-
-2001-08-26  Zbigniew Chyla  <cyba@gnome.pl>
-
-	Fixes #2465
-
-	* menus/gal-view-menus.c (build_menus):
-	Encode the label using bonobo_ui_util_encode_str and set "label"
-	attribute, not "_label".
-	I have no idea what the previous code was trying to do but it was
-	definitely wrong.
-
-2001-08-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-timezone-dialog/e-timezone-dialog.h
-	(e_timezone_dialog_reparent): New prototype here.
-
-2001-08-27  Iain Holmes  <iain@ximian.com>
-
-	* e-timezone-dialog/e-timezone.h: Add a prototype for 
-	e_timezone_dialog_reparent
-
-2001-08-18  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Add the e-timezone-dialog dir.
-
-	* e-timezone-dialog/*: Add new files.
-
-2001-08-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): Don't display the Define
-	Views dialog.
-
-2001-07-02 Anna Marie Dirks <anna@ximian.com>
-
-	* misc/e-filter-bar.c (option_changed): Specified a default size
-	for the Advanced Search dialog such that when it first appear, it
-	is large enough to view all parts of a search clause without the
-	user needing to resize it.
-
-2001-05-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* menus/gal-view-menus.c (gal_view_menus_construct): Store the
-	connection ID of the "changed" signal in the collection.
-	(gal_view_menus_new): Added preconditions.
-	(gal_view_menus_construct): Added preconditions.
-
-2001-05-21  Chris Toshok  <toshok@ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): make the view menuitems
-	radio items of the same group, and allocate the closure here.
-	(free_verbs): only need to free the one DefineViews verb here.
-	(closure_free): new function - EListFreeFunc for our
-	listenerClosure list.
-	(remove_listeners): new function, free our listener list.
-	(gvm_destroy): call remove_listeners.
-	(gvm_init): init listenerClosures list.
-	(toggled_cb): callback for radio items.
-	(build_verbs): strip out almost all the code since there's only 1
-	verb now.
-	(build_stuff): call remove_listeners.
-
-2001-05-08  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* misc/e-search-bar.c (add_dropdown), (set_option): first try to
-	translate, then if not suceeded -- convert from utf8. This handles
-	cases when menuitem needs to be translated (it is passed as N_()), or is
-	utf8 search title. However you cannot have a search like "Folders" -- it
-	is translated. Part of fix for #2253.
-	
-	* misc/e-filter-bar.c: d() debugging strings. Use E_FILTERBAR_ADVANCED
-	macro instead of own "Advanced ..." for consistency.
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-	
-	* menus/gal-view-menus.c (build_menus): convert label to locale
-	encoding. Still displays truncated strings.
-	
-	* menus/Makefile.am: removed -DEVOLUTION_VERSION.
-
-2001-04-21  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* menus/gal-view-menus.c: bonobo_ui_node_set_attr expects unstranslated
-	strings, so change _() to N_().
-
-2001-04-12  Dan Winship  <danw@ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): Fix a memory leak.
-	(Doesn't anyone ever change any other file in this directory? :)
-
-2001-04-10  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* menus/gal-view-menus.c: convert label to utf8.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* menus/gal-view-menus.c: Fix headers.
-	
-2001-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): Don't print the xml tree
-	here.
-
-2001-03-16  Miguel de Icaza  <miguel@ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): Hook this up under the
-	"ViewBegin" node.
-
-2001-02-28  Miguel de Icaza  <miguel@ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): Add translation string
-	here. 
-
-2001-03-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* menus/gal-view-menus.c (collection_changed): Rebuild when the
-	collection changes.
-
-2001-01-27  Jason Leach  <jasonleach@usa.net>
-
-	* cvs remove all files in shortcut-bar/, this widget is now in
-	gal, will be maintained there.
-	
-	* Makefile.am (SUBDIRS): Remove shortcut-bar from here.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* menus/gal-view-menus.c: Make this actually deploy the titles
-	from the GalViewCollection and emit the display_view signals and
-	such.
-
-2001-01-22  Jon Trowbridge  <trow@gnu.org>
-
-	* menus/gal-view-menus.c (define_views): Fixed
-	gal_define_views_dialog_new to be called with its proper argument.
-
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* menus/gal-view-menus.c, menus/gal-view-menus.h: Added a
-	GalViewCollection argument to the new function here.
-
-2000-12-04  Dan Winship  <danw@helixcode.com>
-
-	* menus/gal-view-menus.c: NULL-terminate gal_view_menus_apply's
-	BonoboUIVerb array to prevent a crash. (Why are there gal* things
-	in the evolution sources?)
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-paned/.cvsignore, e-table/.cvsignore, e-text/.cvsignore:
-	Removed unnecessary .cvsignore files.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed directories that have been moved to gal.
-
-	* e-paned/.cvsignore, e-paned/Makefile.am, e-paned/e-hpaned.c,
-	e-paned/e-hpaned.h, e-paned/e-paned.c, e-paned/e-paned.h,
-	e-paned/e-vpaned.c, e-paned/e-vpaned.h: Moved to gal.
-
-	* e-reflow/.cvsignore, e-reflow/Makefile.am,
-	e-reflow/e-reflow-sorted.c, e-reflow/e-reflow-sorted.h,
-	e-reflow/e-reflow.c, e-reflow/e-reflow.h: Moved to gal.
-
-	* e-table/.cvsignore, e-table/ChangeLog, e-table/LICENSE,
-	e-table/Makefile.am, e-table/ROADMAP.e-table, e-table/TODO,
-	e-table/add-col.xpm, e-table/arrow-down.xpm, e-table/arrow-up.xpm,
-	e-table/check-empty.xpm, e-table/check-filled.xpm,
-	e-table/clip.png, e-table/e-cell-checkbox.c,
-	e-table/e-cell-checkbox.h, e-table/e-cell-string.c,
-	e-table/e-cell-text.c, e-table/e-cell-text.h,
-	e-table/e-cell-toggle.c, e-table/e-cell-toggle.h,
-	e-table/e-cell-tree.c, e-table/e-cell-tree.h, e-table/e-cell.c,
-	e-table/e-cell.h, e-table/e-table-click-to-add.c,
-	e-table/e-table-click-to-add.h, e-table/e-table-col-dnd.h,
-	e-table/e-table-col.c, e-table/e-table-col.h,
-	e-table/e-table-column-model.h, e-table/e-table-column.c,
-	e-table/e-table-config.c, e-table/e-table-config.glade,
-	e-table/e-table-config.glade.h, e-table/e-table-config.h,
-	e-table/e-table-defines.h, e-table/e-table-example-1.c,
-	e-table/e-table-example-2.c,
-	e-table/e-table-field-chooser-dialog.c,
-	e-table/e-table-field-chooser-dialog.h,
-	e-table/e-table-field-chooser-item.c,
-	e-table/e-table-field-chooser-item.h,
-	e-table/e-table-field-chooser.c,
-	e-table/e-table-field-chooser.glade,
-	e-table/e-table-field-chooser.glade.h,
-	e-table/e-table-field-chooser.h,
-	e-table/e-table-group-container.c,
-	e-table/e-table-group-container.h, e-table/e-table-group-leaf.c,
-	e-table/e-table-group-leaf.h, e-table/e-table-group.c,
-	e-table/e-table-group.glade, e-table/e-table-group.glade.h,
-	e-table/e-table-group.h, e-table/e-table-header-item.c,
-	e-table/e-table-header-item.h, e-table/e-table-header.c,
-	e-table/e-table-header.h, e-table/e-table-item.c,
-	e-table/e-table-item.h, e-table/e-table-model.c,
-	e-table/e-table-model.h, e-table/e-table-one.c,
-	e-table/e-table-one.h, e-table/e-table-scrolled.c,
-	e-table/e-table-scrolled.h, e-table/e-table-selection-model.c,
-	e-table/e-table-selection-model.h, e-table/e-table-simple.c,
-	e-table/e-table-simple.h, e-table/e-table-size-test.c,
-	e-table/e-table-sort-info.c, e-table/e-table-sort-info.h,
-	e-table/e-table-sorted-variable.c,
-	e-table/e-table-sorted-variable.h, e-table/e-table-sorted.c,
-	e-table/e-table-sorted.h, e-table/e-table-sorter.c,
-	e-table/e-table-sorter.h, e-table/e-table-subset-variable.c,
-	e-table/e-table-subset-variable.h, e-table/e-table-subset.c,
-	e-table/e-table-subset.h, e-table/e-table-text-model.c,
-	e-table/e-table-text-model.h, e-table/e-table-tooltip.h,
-	e-table/e-table-tree.h, e-table/e-table.c, e-table/e-table.h,
-	e-table/e-tree-example-1.c, e-table/e-tree-example-2.c,
-	e-table/e-tree-model.c, e-table/e-tree-model.h,
-	e-table/e-tree-simple.c, e-table/e-tree-simple.h,
-	e-table/image1.png, e-table/image2.png, e-table/image3.png,
-	e-table/remove-col.xpm, e-table/sample.table,
-	e-table/table-test.c, e-table/table-test.h, e-table/test-check.c,
-	e-table/test-cols.c, e-table/test-table.c: Moved to gal.
-
-	* e-text/.cvsignore, e-text/Makefile.am, e-text/e-entry-test.c,
-	e-text/e-entry.c, e-text/e-entry.h,
-	e-text/e-text-event-processor-emacs-like.c,
-	e-text/e-text-event-processor-emacs-like.h,
-	e-text/e-text-event-processor-types.h,
-	e-text/e-text-event-processor.c, e-text/e-text-event-processor.h,
-	e-text/e-text-model.c, e-text/e-text-model.h,
-	e-text/e-text-test.c, e-text/e-text.c, e-text/e-text.h: Moved to
-	gal.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-reflow/e-reflow-sorted.h: fix include.
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Added e-reflow.
-
-	* e-reflow/e-reflow.c, e-reflow/e-reflow.h: Moved from
-	addressbook/gui/minicard/.
-
-	* e-reflow/Makefile.am, e-reflow/.cvsignore: New files for a new
-	directory.
-
-2000-09-08  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-text/e-text.c (calc_line_widths): Fix byte/char confusion
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-paned/e-hpaned.c (e_hpaned_motion): Do not flicker while
-	trying to resize a quantized pane.
-
-	* e-paned/e-vpaned.c (e_vpaned_motion): Likewise.
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* widgets/e-paned/e-vpaned.c (e_vpaned_size_allocate): Ensure that
-	the child's allocation height is >= 1.
-
-	* widgets/e-paned/e-hpaned.c (e_hpaned_size_allocate): Ensure that
-	the child's allocation width is >= 1.
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* ChangeLog: Started a ChangeLog here.
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index 99305b844e..137446c00e 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -6,7 +6,4 @@ SUBDIRS =			\
 	table			\
 	menus
 
-EXTRA_DIST =			\
-	ChangeLog.pre-1-4
-
 -include $(top_srcdir)/git.mk
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index 3dc5f35709..734301ebee 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -37,11 +37,12 @@
 #include "e-timezone-dialog.h"
 
 #ifdef G_OS_WIN32
-/* Undef the similar macros from pthread.h, they don't check if
- * gmtime() and localtime() return NULL.
- */
+#ifdef gmtime_r
 #undef gmtime_r
+#endif
+#ifdef localtime_r
 #undef localtime_r
+#endif
 
 /* The gmtime() and localtime() in Microsoft's C library are MT-safe */
 #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0)
@@ -261,6 +262,7 @@ ETimezoneDialog *
 e_timezone_dialog_construct (ETimezoneDialog *etd)
 {
 	ETimezoneDialogPrivate *priv;
+	GtkWidget *widget;
 	GtkWidget *map;
 
 	g_return_val_if_fail (etd != NULL, NULL);
@@ -280,10 +282,11 @@ e_timezone_dialog_construct (ETimezoneDialog *etd)
 		goto error;
 	}
 
-	gtk_container_set_border_width (
-		GTK_CONTAINER (GTK_DIALOG (priv->app)->vbox), 0);
-	gtk_container_set_border_width (
-		GTK_CONTAINER (GTK_DIALOG (priv->app)->action_area), 12);
+	widget = gtk_dialog_get_content_area (GTK_DIALOG (priv->app));
+	gtk_container_set_border_width (GTK_CONTAINER (widget), 0);
+
+	widget = gtk_dialog_get_action_area (GTK_DIALOG (priv->app));
+	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
 
 	priv->map = e_map_new ();
 	map = GTK_WIDGET (priv->map);
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index 3a32dc64f6..ed0902c9b4 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -71,8 +71,8 @@ gal_define_views_dialog_class_init (GalDefineViewsDialogClass *klass)
 
 	g_object_class_install_property (object_class, PROP_COLLECTION,
 					 g_param_spec_object ("collection",
-							      _("Collection"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Collection",
+							      NULL,
 							      GAL_VIEW_COLLECTION_TYPE,
 							      G_PARAM_READWRITE));
 }
@@ -108,7 +108,9 @@ gdvd_button_new_dialog_callback (GtkWidget *widget, gint id, GalDefineViewsDialo
 						    COL_GALVIEW_DATA, item,
 						    -1);
 
-				gal_view_edit (view, GTK_WINDOW (dialog));
+
+				if (view && GAL_VIEW_GET_CLASS (view)->edit)
+					gal_view_edit (view, GTK_WINDOW (dialog));
 				g_object_unref (view);
 			}
 		}
@@ -139,6 +141,9 @@ gdvd_button_modify_callback(GtkWidget *widget, GalDefineViewsDialog *dialog)
 					 &dialog->model,
 					 &iter)) {
 		gtk_tree_model_get (dialog->model, &iter, COL_GALVIEW_DATA, &item, -1);
+
+		g_return_if_fail (item && !item->built_in);
+
 		gal_view_edit (item->view, GTK_WINDOW (dialog));
 	}
 }
@@ -159,6 +164,8 @@ gdvd_button_delete_callback(GtkWidget *widget, GalDefineViewsDialog *dialog)
 					 &iter)) {
 		gtk_tree_model_get (dialog->model, &iter, COL_GALVIEW_DATA, &item, -1);
 
+		g_return_if_fail (item && !item->built_in);
+
 		for (row=0; row<dialog->collection->view_count; row++) {
 			if (item == dialog->collection->view_data[row]) {
 				gal_view_collection_delete_view (dialog->collection, row);
@@ -179,28 +186,25 @@ gdvd_button_delete_callback(GtkWidget *widget, GalDefineViewsDialog *dialog)
 }
 
 static void
-gdvd_cursor_changed_callback (GtkWidget *widget, GalDefineViewsDialog *dialog)
+gdvd_selection_changed_callback (GtkTreeSelection *selection, GalDefineViewsDialog *dialog)
 {
 	GtkWidget *button;
 	GtkTreeIter iter;
-	GalViewCollectionItem *item;
-
-	if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (dialog->treeview),
-					 &dialog->model,
-					 &iter)) {
-		GalViewClass *gvclass = NULL;
+	GalViewCollectionItem *item = NULL;
+	GalViewClass *gvclass = NULL;
 
+	if (gtk_tree_selection_get_selected (selection, &dialog->model, &iter)) {
 		gtk_tree_model_get (dialog->model, &iter, COL_GALVIEW_DATA, &item, -1);
 
-		button = e_builder_get_widget (dialog->builder, "button-delete");
-		gtk_widget_set_sensitive (GTK_WIDGET (button), !item->built_in);
-
-		if (item->view)
+		if (item && item->view)
 			gvclass = GAL_VIEW_GET_CLASS (item->view);
-
-		button = e_builder_get_widget (dialog->builder, "button-modify");
-		gtk_widget_set_sensitive (GTK_WIDGET (button), !item->built_in && gvclass && gvclass->edit != NULL);
 	}
+
+	button = e_builder_get_widget (dialog->builder, "button-delete");
+	gtk_widget_set_sensitive (GTK_WIDGET (button), item && !item->built_in);
+
+	button = e_builder_get_widget (dialog->builder, "button-modify");
+	gtk_widget_set_sensitive (GTK_WIDGET (button), item && !item->built_in && gvclass && gvclass->edit != NULL);
 }
 
 static void
@@ -223,7 +227,10 @@ dialog_response (GalDefineViewsDialog *dialog, gint response_id, gpointer data)
 static void
 gal_define_views_dialog_init (GalDefineViewsDialog *dialog)
 {
+	GtkWidget *content_area;
+	GtkWidget *parent;
 	GtkWidget *widget;
+	GtkTreeSelection *selection;
 
 	dialog->collection = NULL;
 
@@ -236,11 +243,16 @@ gal_define_views_dialog_init (GalDefineViewsDialog *dialog)
 	}
 
 	g_object_ref (widget);
-	gtk_container_remove (GTK_CONTAINER (widget->parent), widget);
+
+	parent = gtk_widget_get_parent (widget);
+	gtk_container_remove (GTK_CONTAINER (parent), widget);
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 360, 270);
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 6);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), widget, TRUE, TRUE, 0);
+
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0);
+
 	g_object_unref (widget);
 
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
@@ -256,9 +268,12 @@ gal_define_views_dialog_init (GalDefineViewsDialog *dialog)
 	gdvd_connect_signal (dialog, "button-new",    "clicked", G_CALLBACK (gdvd_button_new_callback));
 	gdvd_connect_signal (dialog, "button-modify", "clicked", G_CALLBACK (gdvd_button_modify_callback));
 	gdvd_connect_signal (dialog, "button-delete", "clicked", G_CALLBACK (gdvd_button_delete_callback));
-	gdvd_connect_signal (dialog, "treeview1", "cursor-changed", G_CALLBACK (gdvd_cursor_changed_callback));
 	g_signal_connect (dialog, "response", G_CALLBACK (dialog_response), NULL);
 
+	selection = gtk_tree_view_get_selection (dialog->treeview);
+	g_signal_connect (selection, "changed", G_CALLBACK (gdvd_selection_changed_callback), dialog);
+	gdvd_selection_changed_callback (selection, dialog);
+
 	gtk_widget_show (GTK_WIDGET (dialog));
 }
 
diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c
index e5425f7552..35a18a2484 100644
--- a/widgets/menus/gal-define-views-model.c
+++ b/widgets/menus/gal-define-views-model.c
@@ -175,15 +175,15 @@ gal_define_views_model_class_init (GalDefineViewsModelClass *klass)
 
 	g_object_class_install_property (object_class, PROP_EDITABLE,
 					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Editable",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_COLLECTION,
 					 g_param_spec_object ("collection",
-							      _("Collection"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Collection",
+							      NULL,
 							      GAL_VIEW_COLLECTION_TYPE,
 							      G_PARAM_READWRITE));
 
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index 56b6dc176b..b713f68000 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -220,8 +220,8 @@ gal_view_instance_save_as_dialog_class_init (GalViewInstanceSaveAsDialogClass *k
 
 	g_object_class_install_property (object_class, PROP_INSTANCE,
 					 g_param_spec_object ("instance",
-							      _("Instance"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Instance",
+							      NULL,
 							      GAL_VIEW_INSTANCE_TYPE,
 							      G_PARAM_READWRITE));
 }
@@ -229,6 +229,8 @@ gal_view_instance_save_as_dialog_class_init (GalViewInstanceSaveAsDialogClass *k
 static void
 gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog)
 {
+	GtkWidget *content_area;
+	GtkWidget *parent;
 	GtkWidget *widget;
 
 	dialog->instance = NULL;
@@ -245,11 +247,16 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog)
 	}
 
 	g_object_ref (widget);
-	gtk_container_remove (GTK_CONTAINER (widget->parent), widget);
+
+	parent = gtk_widget_get_parent (widget);
+	gtk_container_remove (GTK_CONTAINER (parent), widget);
 
 	/* TODO: add position/size saving/restoring */
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 360);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), widget, TRUE, TRUE, 0);
+
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0);
+
 	g_object_unref (widget);
 
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index ed5a539616..f364bf0779 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -57,15 +57,15 @@ gal_view_new_dialog_class_init (GalViewNewDialogClass *klass)
 
 	g_object_class_install_property (object_class, PROP_NAME,
 					 g_param_spec_string ("name",
-							      _("Name"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Name",
+							      NULL,
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_FACTORY,
 					 g_param_spec_object ("factory",
-							      _("Factory"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Factory",
+							      NULL,
 							      GAL_TYPE_VIEW_FACTORY,
 							      G_PARAM_READWRITE));
 }
@@ -73,6 +73,8 @@ gal_view_new_dialog_class_init (GalViewNewDialogClass *klass)
 static void
 gal_view_new_dialog_init (GalViewNewDialog *dialog)
 {
+	GtkWidget *content_area;
+	GtkWidget *parent;
 	GtkWidget *widget;
 
 	dialog->builder = gtk_builder_new ();
@@ -83,15 +85,21 @@ gal_view_new_dialog_init (GalViewNewDialog *dialog)
 	if (!widget) {
 		return;
 	}
+
 	g_object_ref (widget);
-	gtk_container_remove (GTK_CONTAINER (widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), widget, TRUE, TRUE, 0);
+
+	parent = gtk_widget_get_parent (widget);
+	gtk_container_remove (GTK_CONTAINER (parent), widget);
+
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0);
+
 	g_object_unref (widget);
 
-	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
+	gtk_dialog_add_buttons (
+		GTK_DIALOG (dialog),
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
 
 	gtk_window_set_resizable (GTK_WINDOW(dialog), TRUE);
 	gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
deleted file mode 100644
index 276f80062a..0000000000
--- a/widgets/misc/ChangeLog
+++ /dev/null
@@ -1,3010 +0,0 @@
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* e-dateedit.c:
-	* e-combo-button.c:
-	* e-dropdown-button.c:
-	* e-canvas.c:
-	* e-cell-date-edit.h:
-	* e-cell-date-edit.c:
-	Remove deprecated Gtk+ symbols.
-
-2009-04-13  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fixes #578685 – evolution crashed with SIGSEGV.
-
-	** Patch by Takao Fujiwara <Takao.Fujiwara@Sun.COM>
-
-	* e-attachment-bar.c (update): Copy string. Avoids SIGSEGV.
-
-2009-03-09  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* widgets/misc/e-calendar-item.c: Removed the string
-	marked for translation as it not required and also breaks
-	the string freeze.
-
-2009-03-08  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #342446
-	* widgets/misc/e-calendar-item.c: Check whether its
-	appropriate to use %Id format for digits. Incorporated
-	the fix from Wang Xin <jedy.wang@sun.com> to build in
-	solaris.
-
-2009-02-25  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #559027
-
-	* e-dateedit.c: (on_date_entry_focus_out):
-	Do not set date for 'None' value.
-
-2009-02-12  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #404232
-
-	* e-filter-bar.c: (rule_advanced_response): Emit signal after
-	search bar text is set, thus the text will not be empty, which
-	is considered as "no search" these days.
-
-2009-01-30  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #342446
-
-	** Committing on behalf of Behnam Esfahbod
-
-	* e-calendar-item.c (e_calendar_item_draw_day_numbers),
-	(e_calendar_item_recalc_sizes), (e_calendar_item_position_menu):
-	Use localized digits in the calendar widget.
-
-2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-attachment-bar.c (eab_icon_clicked_cb):
-	* e-url-entry.c (button_clicked_cb):
-	Call e_show_uri() instead of gnome_url_show().
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	* test-dropdown-button.c:
-	Remove unneeded #include <libgnomeui/gnome-stock-icons.h>.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #567281
-
-	* e-cell-date-edit.c:
-	* e-cell-percent.c:
-	Remove unneeded #include <libgnomeui/gnome-messagebox.h>.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #567276
-
-	* test-color.c:
-	We don't ship this.  Remove it.
-
-2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #567285
-
-	* e-activity-handler.c:
-	* e-dropdown-button.c:
-	Remove unneeded #include <libgnomeui/gnome-popup-menu.h>.
-
-2008-12-10  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #556303
-
-	* e-attachment-bar.c: (eab_icon_clicked_cb):
-	Check whether attachment has a body already before accessing it.
-
-2008-12-09  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #563669
-
-	* e-send-options.glade:
-	Use zero GtkSpinButton's PageSize, as Gtk+ requires.
-
-2008-10-29  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-url-entry.c:
-	* e-url-entry.h:
-
-2008-10-21  Sankar P  <psankar@novell.com>
-
-	* e-spinner.c (e_spinner_stop),
-	(e_spinner_new_spinning_small_shown):
-	* e-spinner.h:
-	* e-task-widget.c (e_task_widget_construct):
-	Re-factor spinner usage.
-
-2008-10-17  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-dateedit.c:
-	* e-dateedit.h:
-
-2008-10-10  Sankar P  <psankar@novell.com>
-
-License Changes + code cleanup
-
-	* e-reflow.c (e_reflow_event), (e_reflow_init):
-
-2008-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #554418
-
-	* e-attachment.c: (attachment_guess_mime_type):
-	Allow guessing mime_type based on the file content.
-
-2008-10-01  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-canvas-background.c:
-	* e-dateedit.c:
-
-2008-09-30  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-expander.c:
-
-2008-09-29  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #530716
-
-	* e-activity-handler.c: (error_cleanup): GtkDialog errors close
-	by the response message, not as other widgets, because creator
-	of the dialog waits for that signal and takes care of the widget.
-
-2008-09-29  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-colors.c:
-
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-canvas.c:
-	* e-combo-button.c:
-
-2008-09-19  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-attachment-bar.c:
-	* e-search-bar.c:
-	* e-search-bar.h:
-	* e-task-widget.c:
-
-2008-09-16  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-calendar.c:
-	* e-cell-percent.c:
-	* e-unicode.h:
-
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-online-button.c:
-	* e-online-button.h:
-
-2008-09-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #549968
-
-	* e-attachment-bar.c (e_attachment_bar_bonobo_ui_populate_with):
-	Use the same mnemonic for "Recent Documents" as composer.
-
-2008-09-06  Michael Meeks  <michael.meeks@novell.com>
-
-	* e-spinner.c: correct licensing cockup; apologies.
-	* e-icon-entry.h: ditto.
-
-2008-09-04  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-calendar-item.c:
-	* e-charset-picker.c:
-	* e-config-page.c:
-	* e-dropdown-button.c:
-	* e-multi-config-dialog.c:
-	* e-multi-config-dialog.h:
-	* test-multi-config-dialog.c:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-activity-handler.c:
-	* e-activity-handler.h:
-	* e-attachment-bar.h:
-	* e-attachment.h:
-	* e-calendar.h:
-	* e-canvas-background.h:
-	* e-canvas-utils.h:
-	* e-canvas-vbox.c:
-	* e-canvas-vbox.h:
-	* e-canvas.h:
-	* e-cell-date-edit.c:
-	* e-cell-renderer-combo.c:
-	* e-colors.h:
-	* e-combo-button.h:
-	* e-combo-cell-editable.c:
-	* e-config-page.h:
-	* e-cursors.c:
-	* e-dropdown-button.h:
-	* e-expander.h:
-	* e-filter-bar.c:
-	* e-filter-bar.h:
-	* e-gui-utils.c:
-	* e-gui-utils.h:
-	* e-image-chooser.c:
-	* e-info-label.c:
-	* e-map.c:
-	* e-pilot-settings.c:
-	* e-popup-menu.c:
-	* e-popup-menu.h:
-	* e-printable.c:
-	* e-reflow.h:
-	* e-selection-model.c:
-	* e-send-options.c:
-	* e-task-bar.c:
-	* e-task-bar.h:
-	* e-task-widget.h:
-	* e-unicode.c:
-	* test-calendar.c:
-	* test-dateedit.c:
-	* test-dropdown-button.c:
-
-2008-09-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #550334
-
-	* e-activity-handler.c:
-	Use standard icon names for warning and information.
-
-2008-08-30  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-info-label.c (e_info_label_set_info):
-	Fix vertical alignment of labels.
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-account-combo-box.c:
-	* e-account-combo-box.h:
-	* e-attachment.c:
-	* e-calendar-item.h:
-	* e-canvas-utils.c:
-	* e-cell-date-edit.h:
-	* e-cell-percent.h:
-	* e-cell-renderer-combo.h:
-	* e-charset-picker.h:
-	* e-combo-cell-editable.h:
-	* e-cursors.h:
-	* e-icon-entry.h:
-	* e-image-chooser.h:
-	* e-info-label.h:
-	* e-map.h:
-	* e-pilot-settings.h:
-	* e-printable.h:
-	* e-reflow-model.c:
-	* e-reflow-model.h:
-	* e-selection-model-array.c:
-	* e-selection-model-array.h:
-	* e-selection-model-simple.c:
-	* e-selection-model-simple.h:
-	* e-selection-model.h:
-	* e-send-options.h:
-	* e-signature-combo-box.c:
-	* e-signature-combo-box.h:
-	* e-spinner.c:
-	* e-spinner.h:
-	* test-charset-picker.c:
-	* test-color.c:
-	* test-error.c:
-	* test-info-label.c:
-
-2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #547411
-
-	* e-online-button.c (e_online_button_set_online):
-	The button icons are themed now but still oblong.
-	Load the icons by filename so GTK+ doesn't scale them.
-
-2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-multi-config-dialog.c:
-	* e-send-options.c:
-	Use e_display_help() for displaying help.
-
-2008-08-11  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #546892
-
-	* e-combo-button.c:
-	* e-info-label.c:
-	* e-url-entry.c:
-	* e-task-widget.c:
-	Prefer gtk_image_new_from_stock() over e_icon_factory_get_image().
-
-	* e-activity-handler.c:
-	* e-task-widget.c:
-	Purge the GdkPixbuf arguments from the API.  We've been ignoring
-	them since the spinner icon was added.
-
-2008-07-23  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #543943
-
-	* e-activity-handler.c: (e_activity_handler_operation_set_error):
-	* e-task-bar.c: (e_task_bar_class_init), (impl_finalize):
-	Leak fix.
-
-2008-07-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #542587
-
-	* e-online-button.c:
-	* e-online-button.h:
-	New widget implements the online/offline button used in the main
-	window.  The button just maintains an "online" flag and displays
-	the appropriate button image for the flag.
-
-2008-17-14  Paolo Borelli  <pborelli@katamail.com>
-
-	** Fix for bug #542889
-
-	* e-search-bar.h:
-	* widgets/misc/e-search-bar.c:
-	* widgets/misc/e-task-widget.c:
-	Port to the new gtk tooltip api.
-
-2008-07-12  Paolo Borelli  <pborelli@katamail.com>
-
-	** Fix for bug #542631
-
-	* e-attachment-bar.c: use g_format_size_for_display instead of cut and
-	pasted code.
-
-2008-07-07  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #370731 (bugzilla.novell.com)
-
-	* e-calendar-item.c (e_calendar_item_update),
-	(e_calendar_item_draw_month), (e_calendar_item_draw_day_numbers),
-	(e_calendar_item_recalc_sizes):
-	* e-calendar-item.h: 
-	Use MAX (<max width of day-names>, (2 * <max width of a digit>))
-	to determine the minimal size for each cell. This prevents the numbers
-	and day-names from getting fuzzy when using large font-sizes. 
-
-2008-06-30  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #519536
-
-	* e-activity-handler.c: (cancel_wrapper): Handle freeing of data
-	safely.
-
-2008-06-18  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #532597
-
-	* e-selection-model-array.c: (e_selection_model_array_delete_rows):
-	Do not leave selected more than one item if somebody else took care
-	or reposition of the cursor row before the delete.
-
-2008-06-10  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #340683
-
-	* e-attachment-bar.c: (get_system_thumbnail), (scale_pixbuf),
-	(e_attachment_bar_create_attachment_cache), (update):
-	Allow creating thumbnails of non-pictures with a gnome's thumbnailer.
-
-2008-06-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-cell-date-edit.c: (e_cell_date_edit_init):
-	* e-dateedit.c: (create_children):
-	* e-multi-config-dialog.c: (e_multi_config_dialog_init):
-	* e-unicode.h:
-	* test-calendar.c: (main):
-	* test-dateedit.c: (main):
-	* test-info-label.c: (main):
-	Migrate from gtk_window_set_policy() to gtk_window_set_resizable()
-	and clean up a bunch of coding style issues along the way.
-
-2008-05-28  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #532597
-
-	* e-selection-model-array.h: (struct ESelectionModelArray):
-	* e-selection-model-array.c: (es_row_model_to_sorted),
-	(es_row_sorted_to_model), (e_selection_model_array_delete_rows),
-	(e_selection_model_array_insert_rows), (esma_invert_selection),
-	(e_selection_model_array_move_row), (esma_clear), (esma_select_all),
-	(esma_change_cursor), (esma_set_selection_end),
-	(e_selection_model_array_init): Work with sorted cursor row to keep
-	right position after insert/delete/move row(s).
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534360
-
-	* e-activity-handler.h:
-	* e-attachment-bar.h:
-	* e-attachment.c:
-	* e-calendar-item.c:
-	* e-calendar-item.h:
-	* e-calendar.h:
-	* e-canvas-background.h:
-	* e-canvas-vbox.h:
-	* e-canvas.c:
-	* e-canvas.h:
-	* e-cell-date-edit.c:
-	* e-cell-date-edit.h:
-	* e-combo-button.c:
-	* e-combo-button.h:
-	* e-config-page.h:
-	* e-dateedit.c:
-	* e-dateedit.h:
-	* e-dropdown-button.c:
-	* e-dropdown-button.h:
-	* e-filter-bar.c:
-	* e-gui-utils.c:
-	* e-gui-utils.h:
-	* e-image-chooser.c:
-	* e-map.c:
-	* e-map.h:
-	* e-multi-config-dialog.h:
-	* e-popup-menu.h:
-	* e-printable.h:
-	* e-reflow.h:
-	* e-send-options.h:
-	* e-task-bar.h:
-	* e-task-widget.h:
-	* e-url-entry.c:
-	* e-url-entry.h:
-	Migrate from deprecated GtkObject symbols to GObject equivalents.
-
-2008-05-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #311042, Patch by Milan Crha
-
-	* e-info-label.c: (el_size_allocate), (el_class_init),
-	(e_info_label_set_info), (get_text_full_width): Allocate size for
-	location and info labels differently, than GtkHBox does, to be able
-	to minimize it as much as possible and do not waste empty space.
-
-2008-05-06  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #424744
-
-	* e-attachment-bar.c:
-	* e-unicode.c:
-	Use camel-iconv.c instead of e-iconv.h (now deprecated).
-
-2008-04-30  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #528288
-
-	* e-filter-bar.c: (get_property): Do not return any query
-	with empty text from search bar.
-
-2008-04-25  Danny Baumann  <dannybaumann@web.de>
-
-	** Fix for bug #529893
-
-	* e-dateedit.c (create_children):
-	* e-combo-cell-editable.c (build_popup):
-	* e-cell-date-edit.c (e_cell_date_edit_init):
-	Properly set type hint on popup windows.
-
-2008-04-22  Matthew Barnes  <mbarnes@Redhat.com>
-
-	** Fixes part of bug #529641
-
-	* e-dateedit.c (create_children):
-	* e-map.c (e_map_new):
-	Prefer the term "drop-down combination box" to "combo box" per the
-	GNOME Documentation Style Guide.
-
-2008-04-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #334444
-
-	* e-attachment-bar.c: (e_attachment_bar_add_attachment_silent),
-	(e_attachment_bar_refresh):
-	* e-attachment-bar.h:
-
-2008-04-17  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #526739
-
-	* e-attachment.h: (struct _EAttachment):
-	* e-attachment.c: (finalise), (init), (attachment_guess_mime_type),
-	(e_attachment_new), (struct DownloadInfo), (download_info_free),
-	(data_ready_cb), (download_to_local_path),
-	(e_attachment_new_remote_file):
-	Use gio instead of gnome-vfs to download remote files.
-	* e-image-chooser.c: (image_drag_data_received_cb):
-	Use new util function to read file.
-	* e-attachment-bar.c: (size_to_string): Stolen from gnome-vfs.
-
-2008-04-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-attachment-bar.c
-	(e_attachment_bar_bonobo_ui_populate_with_recent):
-	Fix a compiler warning.
-
-2008-04-11  Suman Manjunath  <msuman@novell.com>
-
-	** Fix for bug #517134
-
-	* e-attachment-bar.c: (destroy), (init): Related changes. 
-	(e_attachment_bar_bonobo_ui_populate_with_recent): New API to populate
-	a bonoboUI menu with "Recent Documents". 
-	(action_recent_cb), (e_attachment_bar_recent_action_new): New API to
-	obtain a new, pre-configured GtkRecentAction (which can be used as a
-	"Recent Documents" menu)
-	* e-attachment-bar.h: APIs' signatures
-
-2008-04-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am:
-	Add EVOLUTION_MAIL_LIBS.
-
-	* e-account-combo-box.c:
-	* e-account-combo-box.h:
-	New function e_account_combo_box_get_account_list().
-	Emit a "refreshed" signal when the EAccountList changes.
-	Add an internal reverse-lookup index.
-
-	* e-charset-picker.c (e_charser_add_radio_actions):
-	New function adds radio actions to an action group.
-	Will eventually replace e_charset_picker_bonobo_ui_populate().
-
-	* e-signature-combo-box.c:
-	* e-signature-combo-box.h:
-	New function e_signature_combo_box_get_signature_list().
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #507526
-
-	* e-send-options.glade: Add translators' comment.
-
-2008-03-14  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #482148
-
-	* e-search-bar.c: (entry_activated_cb), (entry_changed_cb),
-	(search_now_verb_cb), (clear_verb_cb), (clear_button_clicked_cb):
-	Allow clear search when some search is active and text is empty.
-
-2008-03-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #460204
-
-	* e-attachment.c: (attachment_guess_mime_type):
-	Check whether found mime type is valid before returning it.
-	My thanks come to Effenberg whom helped me to debug it.
-
-2008-03-13  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #512543
-
-	* e-calendar-item.c: Get rid of ENABLE_CAIRO define.
-
-2008-02-18  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #515744
-
-	* e-cursors.c: (e_cursors_init):
-	* e-calendar-item.c: (e_calendar_item_draw_month):
-	Memory leak fix.
-
-2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bnc #178778
-
-	* e-calendar-item.c: (e_calendar_item_destroy):
-
-2008-02-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #249501
-
-	* e-attachment.c: (attachment_guess_mime_type):
-	gnome_vfs_get_file_info expects URI,
-	thus if file_name contains '%' it failed.
-
-2007-01-25  Johnny Jacob  <jjohnny@novell.com>
-  
-  	* e-filter-bar.h : Added a cameloperation cancel field for vfolder
-  	based search.
-	
-2008-01-24  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am (libemiscwidgets_la_LIBADD): Fix typo:
-	s/EVOLUTON_MAIL_LIBS/EVOLUTION_MAIL_LIBS/. No need to use
-	CAMEL_LIBS as EVOLUTION_MAIL_LIBS already covers that.
-
-2008-01-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #402487
-
-	* e-search-bar.c: (search_now_verb_cb), (scopeoption_changed_cb):
-	Memory leak fix.
-
-2008-01-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-multi-config-dialog.c: (canvas_realize),
-	(e_multi_config_dialog_add_page): Enable for Cairofication of the
-	settings dialogs's etable.
-
-2008-01-11  Jeffrey Stedfast  <fejj@novell.com>
-
-	Patch by Jean-Christophe BEGUE to fix bug #329692.
-
-	* e-attachment.c (e_attachment_new_from_mime_part): Get the
-	content size of the MIME part by calling the new
-	camel_mime_part_get_content_size() function.
-
-2008-01-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #488213
-
-	* e-spinner.c: (scale_to_size):
-	* e-image-chooser.c: (set_image_from_data):
-	* e-attachment-bar.c: (e_attachment_bar_create_attachment_cache),
-	(update):
-	Use global function e_icon_factory_pixbuf_scale for scaling pixbufs.
-
-2008-01-10  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Add better support to show info/errors
-
-	* e-activity-handler.c: (setup_task_bar), (cancel_wrapper),
-	(handle_error), (error_cleanup), (e_activity_handler_make_error),
-	(e_activity_handler_operation_set_error):
-	* e-activity-handler.h:
-	* e-task-widget.c: (e_task_widget_update_image):
-
-2008-01-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #339813
-
-	* e-dateedit.h: (e_date_edit_get_twodigit_year_can_future),
-	(e_date_edit_set_twodigit_year_can_future):
-	Added new option for component.
-	* e-dateedit.c: (e_date_edit_get_twodigit_year_can_future),
-	(e_date_edit_set_twodigit_year_can_future),
-	(struct _EDateEditPrivate::twodigit_year_can_future),
-	(e_date_edit_init), (e_date_edit_parse_date):
-	Implementing new option for component.
-	* e-dateedit.c: (on_date_entry_focus_out):
-	Always repaint value on focus out.
-	* e-dateedit.c: (e_date_edit_update_date_entry):
-	Forced to always show 4-digit year.
-
-2008-01-04  Milan Crha  <mcrha@redhat.com>
-
-	* Part of bug #504480
-	* e-task-widget.c: (e_task_widget_construct):
-	Possible leak fix.
-	* e-task-widget.c: (e_task_widget_update_image):
-	Function prototype changed and using parameter stock now.
-
-2008-01-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fix for bug #504480
-
-	* e-task-bar.c: (e_task_bar_init): Increases the height
-	of the ETaskBar to eliminate the constant resizing.
-
-2007-12-14  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #211353
-
-	* e-search-bar.c: (e_search_bar_get_viewitem_id):
-	Return -1 if no viewmenu is setup yet.
-
-2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Revamped Activity handler and task bar/widget for non-intrusive 
-	error reporting
-
-	* e-activity-handler.c: (activity_info_new), (activity_info_free),
-	(task_widget_new_from_activity_info), (setup_task_bar),
-	(e_activity_handler_init),
-	(e_activity_handler_set_error_flush_time),
-	(e_activity_handler_set_logger), (cancel_wrapper),
-	(e_activity_handler_cancelable_operation_started),
-	(e_activity_handler_operation_started), (handle_error),
-	(error_cleanup), (e_activity_handler_make_error),
-	(e_activity_handler_operation_set_error),
-	(e_activity_handler_operation_progressing),
-	(e_activity_handler_operation_finished):
-	* e-activity-handler.h:
-	* e-task-bar.c: (e_task_bar_prepend_task),
-	(e_task_bar_remove_task_from_id), (e_task_bar_remove_task),
-	(e_task_bar_get_task_widget_from_id):
-	* e-task-bar.h:
-	* e-task-widget.c: (e_task_widget_init), (button_press_event_cb),
-	(prepare_popup), (e_task_widget_construct),
-	(e_task_widget_new_with_cancel), (e_task_widget_new),
-	(e_task_widget_update_image):
-	* e-task-widget.h:
-
-2007-12-05  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #392747 (extra cleanup work)
-
-	* e-calendar-item.c (e_calendar_item_show_popup_menu):
-	Call e_get_month_name() instead of e_utf8_strftime().
-
-2007-12-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #392747
-
-	* e-calendar-item.h (struct _ECalendarItem):
-	* e-calendar-item.c (e_calendar_item_init), (e_calendar_item_draw):
-	Lose the local weekday name cache and just call e_get_weekday_name().
-
-2007-12-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #495123
-
-	* Makefile.am:
-	Add e-signature-combo-box.[ch].
-
-	* e-account-combo-box.c (account_combo_box_refresh_cb):
-	Make sure the EAccount isn't lost while swapping models.
-
-	* e-signature-combo-box.c:
-	* e-signature-combo-box.h:
-	New widget renders an ESignatureList as a combo box.  Also listens
-	for changes to the ESignatureList and updates itself accordingly.
-
-2007-11-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #495123
-
-	* Makefile.am:
-	Add e-account-combo-box.[ch].
-
-	* e-account-combo-box.c:
-	* e-account-combo-box.h:
-	New widget renders an EAccountList as a combo box.  Also listens
-	for changes to the EAccountList and updates itself accordingly.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #231166
-
-	* e-dateedit.c: (create_children), (e_date_edit_check_time_changed),
-	(rebuild_time_popup), (on_date_edit_time_selected),
-	(on_time_entry_key_press), (e_date_edit_update_time_entry),
-	(e_date_edit_grab_focus), (e_date_edit_update_time_combo_state):
-	Migrate from gtk_combo to gtk_com_box_entry for time_combo.
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #351932
-
-	* e-dateedit.h: (e_date_edit_have_time):
-	* e-dateedit.c: (e_date_edit_have_time): Extend API to be able
-	to check if time is set independently of date part.
-
-2007-10-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-activity-handler.c: (e_activity_handler_new):
-	* e-canvas.c: (e_canvas_new), (emit_event), (pick_current_item),
-	(e_canvas_button):
-	* e-combo-button.c: (menu_detacher), (impl_destroy),
-	(impl_button_press_event):
-	* e-combo-cell-editable.c: (e_combo_cell_editable_new):
-	* e-expander.c: (e_expander_init), (e_expander_size_request),
-	(e_expander_size_allocate), (e_expander_button_press),
-	(e_expander_focus):
-	* e-gui-utils.c: (e_popup_menu),
-	(e_container_change_tab_order_callback):
-	* e-image-chooser.c: (image_drag_data_received_cb):
-	* e-info-label.c: (e_info_label_new):
-	* e-map.c: (e_map_key_press), (e_map_new), (update_render_pixbuf),
-	(blowup_window_area), (zoom_do), (set_scroll_area):
-	* e-pilot-settings.c: (e_pilot_settings_get_source):
-	* e-printable.c: (e_printable_will_fit):
-	* e-reflow.c: (items_inserted), (model_changed), (set_empty),
-	(e_reflow_event), (e_reflow_draw):
-	* e-search-bar.c: (set_option):
-	* e-search-bar.h:
-	* e-unicode.c: (e_xml_get_translated_utf8_string_prop_by_name):
-	
-	Warning fixes:
-	- NULL vs 0 vs FALSE
-	- ANSIfication of function declarations.
-	- Use non-deprecated GSignal functions
-	- Don't mix different enum types
-
-2007-10-31  Michael Monreal  <mmonreal@svn.gnome.org>
-
-	** Fix for bug #483785
-
-	* e-url-entry.c: (init):
-	Use go-jump icon instead of stock_connect-to-url
-	to get rid of deprecated icons from gnome-icon-theme.
-
-2007-10-26  Tobias Mueller  <tobiasmue@svn.gnome.org>
-
-	** Workaround for bug #395272
-
-	* e-search-bar.c:
-	Minor code cleanups and value checking
-
-2007-10-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #417999
-
-	* e-pilot-settings.c:
-	Use ESourceComboBox instead of ESourceOptionMenu (deprecated).
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* e-cursors.c:
-	* e-spinner.c:
-	* e-unicode.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #413420
-
-	* e-attachment.c: (file_ext_is): New helper function.
-	* e-attachment.c: (attachment_guess_mime_type): Change mimetype
-	if knows the extension and if the content of file is valid.
-
-2007-09-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #423401
-
-	* e-attachment.h: (e_attachment_new_remote_file):
-	* e-attachment.c: (struct DownloadInfo), (async_progress_update_cb),
-	(e_attachment_new_remote_file):
-	* e-attachment-bar.c: (e_attachment_bar_attach_remote_file):
-	Better error handling when attaching remote file.
-
-2007-09-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #351333
-
-	* e-search-bar.c: (paint_search_text), (option_activated_cb):
-	Added more descriptive hint over search bar's option button.
-
-2007-09-12  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #476040
-
-	* e-attachment-bar.c:
-	Use "mail-attachment" icon for unknown attachment types.
-
-2007-08-31  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Move away from g_assert to g_return* critical warnings to debug
-	them better.
-
-	* e-canvas.c: (e_canvas_button):
-	* e-cursors.c: (create_bitmap_and_mask_from_xpm), (e_cursors_init):
-	* e-expander.c: (e_expander_focus):
-	* e-search-bar.c: (clear_button_state_changed), (search_verb_cb):
-	* e-selection-model.c: (e_selection_model_do_something),
-	(e_selection_model_select_as_key_press):
-	* e-spinner.c: (e_spinner_images_load), (e_spinner_expose):
-	* e-task-bar.c: (reduce_displayed_activities_per_component):
-
-2007-08-16  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #350539
-
-	* e-attachment.c: (e_attachment_edit):
-	* e-attachment-bar.c: (e_attachment_bar_create_attachment_cache),
-	(update), (attach_to_multipart):
-	Ensures non-NULL part.
-
-2007-08-06  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #429234
-
-	* e-attachment-bar.c: (destroy): Remove the weak ref while the purpose
-	is achieved.
-
-2007-08-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #335566
-
-	* e-attachment-bar.c: (e_attachment_bar_create_attachment_cache),
-	(update): When scaling image, ensures nonzero width or height.
-
-2007-08-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #451599
-
-	* e-attachment.c: (async_progress_update_cb): Timing of setting the
-	attachment is downloaded has to be after creating the attachment.
-
-2007-08-03  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #331729
-
-	* e-selection-model.c: (move_selection): Don't call
-	e_sorter_model_to_sorted when there is no selected row.
-
-2007-07-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am:
-	Rename EXTRA_GNOME_CFLAGS to GNOME_PLATFORM_CFLAGS.
-	Similarly for EXTRA_GNOME_LIBS.
-
-2007-07-09  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #387844
-	* e-dateedit.c: Increase the buffer size.
-
-	Committing on behalf of Makuchaku <mayank.gnu@gmail.com>
-	
-2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
-	
-        ** Fix for bug #448223 from Gilles Dartiguelongue
-
-	* e-search-bar.c: (set_option), (e_search_bar_set_viewoption),
-	(e_search_bar_set_scopeoption):
-
-2007-06-15  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #257118
-
-	* e-search-bar.c: (set_clear_menuitem_sensitive),
-	(clear_button_state_changed): Added two helper functions.
-	* e-search-bar.c: (setup_standard_verbs), (setup_bonobo_menus):
-	Using these helper functions, clear menu item is synchronized
-	by changed state of clear_button of search bar.
-
-2007-06-15  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #263207
-
-	* e-filter-bar.c: (dialog_rule_changed): New callback
-	for disabling OK button in dialog when rule isn't valid.
-	* e-filter-bar.c: (do_advanced), (save_search_dialog):
-	Connecting dialog_rule_changed on "changed" signal of
-	actual rule.
-
-2007-06-15  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #447727
-
-	* e-info-label.c:
-	* e-multi-config-dialog.c:
-	* e-task-bar.c:
-	Use ellipsized GtkLabels instead of EClippedLabels.
-
-	* e-clipped-label.[ch]:
-	Remove these files.  GTK+ provides this functionality now.
-
-	* Makefile.am:
-	Remove e-clipped-label.[ch].
-
-2007-06-04  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* e-filter-bar.[c]: (e_filter_bar_new), (e_filter_bar_new_construct):
-	Added a construct function.
-
-	Committing on behalf of Keshav Upadhayaya <ukeshav@novell.com>
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #386503 from Matthew Barnes
-
-	* e-multi-config-dialog.c: (impl_response):
-	* e-send-options.c: (e_send_options_cb):
-
-2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #416031 from Martin Jürgens
-
-	* e-charset-picker.c:
-
-2007-06-02  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	** Fixes part of bug #441014
-
-	* e-dateedit.c: (rebuild_time_popup):
-	* e-filter-bar.c: (get_property), (xml_get_prop_int),
-	(set_property):
-	* e-image-chooser.c: (set_image_from_data),
-	(image_drag_data_received_cb):
-	* e-task-widget.c: (e_task_widget_construct):
-	* e-unicode.c: (e_utf8_strstrcasedecomp), (e_utf8_strstrcase),
-	(e_utf8_from_iconv_string_sized), (e_utf8_to_iconv_string_sized),
-	(e_utf8_xml1_decode), (e_utf8_xml1_encode),
-	(e_xml_get_translated_utf8_string_prop_by_name): various
-	compilation cleanups.
-
-+2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #441010
-
-	* gal-combo-box.c:
-	* gal-combo-box.h:
-	* gal-combo-text.c:
-	* gal-combo-text.h:
-	Bye bye old widgets, go back to Motif!
-
-	* Makefile.am:
-	Remove the aforementioned files.
-
-2007-05-21  Wang Xin  <jedy.wang@sun.com>
-
-	* e-dateedit.c: Fixes #439049.
-
-2006-02-28  Andre Klapper  <a9016009@gmx.de>
-
-	* e-clipped-label.c: add translator comments for a string.
-	Fixes bug #325118.
-
-2007-05-03  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-attachment-bar.c (e_attachment_bar_remove_selected):
-	Emit "changed" signal.  (#434981)
-
-2007-04-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-task-widget.c: #include "e-spinner.h"  (#433005)
-	Patch from Daniel Gryniewicz.
-
-2007-04-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-task-widget.c: (e_task_widget_construct): Show spinner instead of
-	the component icon. 
-
-2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #429422
-
-	* e-combo-cell-editable.c (ecce_init):
-	* e-dateedit.c (e_date_edit_set_editable):
-	Use gtk_editable_set_editable() instead of gtk_entry_set_editable().
-
-	* e-dateedit.c (create_children):
-	* e-cell-date-edit.c (e_cell_date_edit_init):
-	Use gtk_box_set_spacing() instead of gtk_button_box_set_spacing().
-	Remove gtk_button_box_set_child_ipadding() and
-	gtk_button_box_set_child_size().  Use style properties instead.
-
-	* e-clipped-label.c (e_clipped_label_new):
-	* e-combo-button.c (e_combo_button_new):
-	* e-config-page.c (e_config_page_init):
-	* e-multi-config-dialog.c (e_multi_config_dialog_init):
-	* e-dropdown-button.c (e_dropdown_button_new):
-	* e-cell-date-edit.c (e_cell_date_edit_new):
-	* e-filter-bar.c (e_filter_bar_new):
-	* e-url-entry.c (mnemonic_activate):
-	* e-map.c (e_map_new):
-	* e-search-bar.c (e_search_bar_new):
-	* e-calendar.c (e_calendar_new):
-	Use g_object_new() instead of gtk_type_new().
-
-	* test-calendar.c (main):
-	* test-info-label.c (main):
-	* test-multi-config-dialog.c (main):
-	* test-dropdown-button.c (main):
-	Use gnome_program_init() instead of gnome_init().
-
-	* e-combo-button.c (impl_released):
-	Replace gtk_widget_draw() with GTK's 2-line implementation.
-
-	* e-multi-config-dialog.c (set_page_timeout_callback),
-	(e_multi_config_dialog_show_page):
-	Use gtk_notebook_set_current_page() instead of
-	gtk_notebook_set_page().
-
-	* e-dropdown-button.c (impl_destroy):
-	Use g_object_unref() instead of gtk_accel_group_unref().
-
-	* e-cell-percent.c (show_percent_warning):
-	* e-cell-date-edit.c (e_cell_date_edit_show_time_invalid_warning):
-	Use GtkMessageDialog instead of GnomeMessageDialog.
-
-	* e-cell-date-edit.c (e_cell_date_edit_select_matching_time),
-	(e_cell_date_edit_on_time_selected):
-	Use gtk_label_get_text() instead of gtk_label_get().
-
-	* e-filter-bar.c (class_init):
-	* gal-combo-box.c (gal_combo_box_init), (gtk_combo_popup_tear_off),
-	(gtk_combo_popup_reparent):
-	* e-map.c (e_map_set_scroll_adjustments):
-	* e-task-widget.c (e_task_widget_construct):
-	Use g_object_ref_sink() instead of gtk_object_sink().
-
-	* gal-combo-box.c (gtk_combo_tearoff_bg_copy),
-	(gtk_combo_popup_reparent):
-	* gal-combo-text.c (gal_combo_text_construct):
-	Use gtk_widget_set_size_request() instead of gtk_widget_set_usize().
-
-	* test-dropdown-button.c:
-	Use GTK_STOCK_* constants instead of GNOME_STOCK_*.
-
-	* e-calendar.c (e_calendar_init):
-	Use g_signal_connect_swapped() instead of gtk_signal_connect_object().
-
-	* e-calendar.c (e_calendar_destroy), (e_calendar_stop_auto_move):
-	Use g_source_remove() instead of gtk_timeout_remove().
-
-2007-04-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added spinner widgets.
-
-	* Makefile.am: Add them to the build
-	* e-spinner.[ch]: Spinner widget for progress indiation.
-
-2007-04-09  Jeff Cai<jeff.cai@sun.com>
-
-	* e-dateedit.c: (rebuild_time_popup):
-	Use e_time_format_time to ensure evolution and evolution-
-	data-server use same translations.
-	Fix #380843.
-
-2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-icon-entry.c:
-	Fix "incompatible pointer type" warnings (#360619).
-
-2007-03-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-filter-bar.c (menubar_activated): Fix build breakage due to
-	poorly placed preprocessor condition.
-
-2007-03-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-filter-bar.c:
-	* e-multi-config-dialog.c:
-	Don't mix declarations and code (#405495).
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #360240
-
-	* e-calendar-item.c (e_calendar_item_unrealize):
-	* e-icon-entry.c (e_icon_entry_pack_widget):
-	Remove unused variables.
-
-2007-02-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #368983 from Ebby Wiselyn
-
-	* e-filter-bar.c: (menubar_activated):
-
-2007-02-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Print migration updates from Ebby Wiselyn
-
-	* e-printable.c: (e_printable_print_page), (e_printable_height),
-	(e_printable_will_fit):
-	* e-printable.h:
-
-2007-01-08  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-filter-bar.c: (build_items): Initialize ESearchBarItem
-	type to ESB_ITEMTYPE_RADIO. Fixes #382860.
-		
-2006-12-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes bug #357970
-
-	* e-calendar-item.c:
-	* e-canvas-background.c:
-	* e-filter-bar.c:
-	* e-search-bar.c:
-	* gal-combo-box.c:
-	Don't call deprecated GLib / GDK functions.
-
-	* e-colors.c (e_color_alloc): Remove unused function.
-
-2006-12-04  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-filter-bar.c: (build_items): Fix read of uninitialized
-	ESearchBarItems. Partially fixes #381642.
-
-2006-11-21  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-filter-bar.c: (e_filter_bar_new): type should be
-	initialized to 0, not NULL.
-
-2006-11-03  Parthasarathi Susarla <ajaysusarla@gmail.com>
-
-	** Fixes bug #357492
-	* e-attachment-bar.c: (e_attachment_bar_remove_selected):
-	put the attachment pointes into a temporary array. Free the
-	pointers and the array after going thru the entire list
-	This prevents a crash and also fixes the issue of only few 
-	attachments getting deleted.
-
-2006-10-11  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #360237 & bug #359236
-
-	* e-filter-bar.c: (rule_advanced_response), (set_property): Fix for a
-	crash while saving empty search.
-
-2006-10-03  Francisco Javier F. Serrador  <serrador@tecknolabs.com>
-
-	* e-dateedit.c: Make two strings translatable.
-
-2006-10-02 Harish Krishnaswamy <kharish@novell.com>
-	
-	* Revert the previous patch as per rel-team
-	disapproval on the commit.
-
-2006-08-23 Ushveen kaur <kushveen@novell.com>
-
-	** Fix for bug #329694
-
-	* e-charset-picker.c : Translator comment added for "logical".
-
-2006-09-28  Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #335814
-	
-	* e-charset-picker.c: Name and subclass changed for
-	E_CHARSET_HEBREW from "ISO-8859-8","Visual" to "ISO-8859-8-i","Logical".
-
-2006-09-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes a lot of search issues.
-
-	* e-filter-bar.c: (rule_advanced_response), (do_advanced),
-	(menubar_activated), (option_changed), (free_items),
-	(get_property), (set_property):
-	* e-search-bar.c: (clear_search), (clear_verb_cb),
-	(paint_search_text), (e_search_bar_paint), (viewitem_activated_cb),
-	(scopeitem_activated_cb), (option_activated_cb),
-	(clear_button_clicked_cb), (scopeoption_changed_cb), (set_option),
-	(init), (e_search_bar_construct), (e_search_bar_set_viewitem_id),
-	(e_search_bar_set_item_id), (e_search_bar_set_item_menu),
-	(e_search_bar_set_search_scope), (e_search_bar_set_ids):
-	* e-search-bar.h:
-
-2006-09-29  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #341474 patch from Ushveen
-	
-	* e-attachment-bar.c: (size_to_string): Use 
-	gnome_vfs_format_file_size_for_display instead of manual calculations.
-
-2006-09-12  Ushveen Kaur  <kushveen@novell.com>
-
-	** Fix for bug #325614
-
-	* e-task-widget.c (e_task_widget_update) : Translator comment
-	added.
-
-2006-09-07  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fixes bug #341099. 
-	* e-canvas-item.c: (e_canvas_unrealize):
-	Set second argument of gtk_im_context_set_client_window to NULL.
-
-2006-08-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #353059
-
-	* e-search-bar.c: (e_search_bar_set_scopeoption): Added translatable
-	options to search strings, which are already translated.
-
-2006-08-23  Behnam Esfahbod  <behnam@zwnj.org>
-  	 
-	* e-calendar.c:
-	* e-calendar-item.c:
-	flip month view in RTL locale - fixes bug 342443.
-	committed by Andre Klapper
-
-2006-08-23  Matthew Barnes  <mbarnes@redhat.com>
-  	 
-	* e-multi-config-dialog.c:
-	improve GError initialization code - fixes bug 352423.
-	committed by Andre Klapper
-
-2006-08-07 Ushveen Kaur <kushveen@novell.com>
-
-	** Fix for bug #347238
-
-	* e-attachment-bar.c: Changed the file permission changed to 644 
-	while saving the attachment.
-
-2006-08-21  Li Yuan <li.yuan@sun.com>
-
-	** Fixes bug #348753
-
-	* e-search-bar.c: (entry_key_press_cb), (e_search_bar_construct):
-	Add accelerate key to the search bar. <ALT ARROW_DOWN> open option window.
-
-2006-08-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-filter-bar.c: (rule_editor_destroyed),
-	(rule_advanced_response), (do_advanced), (save_search_dialog),
-	(menubar_activated), (option_changed), (set_property):
-	* e-search-bar.[ch]: (clear_search), (clear_verb_cb),
-	(paint_search_text), (entry_focus_out_cb), (entry_changed_cb),
-	(scopeoption_changed_cb), (set_option), (class_init), (init),
-	(e_search_bar_construct), (e_search_bar_set_scopeoption),
-	(e_search_bar_set_item_id), (e_search_bar_get_text),
-	(e_search_bar_scope_enable): Fixes a lot of search issue.
-
-2006-08-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug 347430
-	
-	* e-cell-date-edit.c: (e_cell_date_edit_update_cell): commit the text
-	on updation of cell.
-
-2006-08-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Patch from Pavel Roskin.
-
-	* e-icon-entry.c: Added missing headers.
-
-2006-08-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-filter-bar.c: (rule_editor_destroyed),
-	(rule_advanced_response), (do_advanced), (save_search_dialog),
-	(menubar_activated), (option_changed), (set_property):
-	* e-search-bar.c: (clear_search), (clear_verb_cb),
-	(paint_search_text), (entry_focus_out_cb), (entry_changed_cb),
-	(scopeoption_changed_cb), (set_option), (class_init), (init),
-	(e_search_bar_construct), (e_search_bar_set_scopeoption),
-	(e_search_bar_set_item_id), (e_search_bar_get_text),
-	(e_search_bar_scope_enable):
-	* e-search-bar.h:
-
-2006-08-10  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #341482
-	
-	* e-attachment-bar.c: (eab_drag_data_get), (eab_icon_clicked_cb):
-	* e-attachment.c: (e_attachment_new),
-	(e_attachment_build_remote_file): Use file:// as the uri.
-
-2006-08-04  Johnny Jacob  <jjohnny@novell.com>
-
-	* e-icon-entry.c: (set_cursor) : Added. Change cursor over icon.
-	(e_icon_entry_create_button) : Handle enter/leave-notify signals
-	for changing cursor.
-	* e-search-bar.c: (e_search_bar_construct) : Added mnemonic for
-	"Sho_w". Added tooltips for e-icon-entry.
-	(option_activated_cb) : Set the selected item's label in tooltip.
-	
-	
-2006-08-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #349565
-
-	* e-search-bar.c: (clear_search): Dont clear the criteria.
-
-2006-07-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-calendar-item.c: Removed the hardcoded ENABLE_CAIRO for tag
-	calendar.
-
-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
-
-	* 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
-	date in the editor. Fixes bug #335400. (Committed by Andre Klapper)
-
-2006-06-08  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-attachment-bar.c (attachment_destroy): Call update (bar); the
-	rest of the fix for bug #178631.
-
-2006-06-07  Federico Mena Quintero  <federico@novell.com>
-
-	* e-map.c (e_map_class_init): Don't use gtk_signal_new() for the
-	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.
-
-	* e-search-bar.c (add_button): No need to add label when we use
-	gtk_button_new_from_stock to create a button.
-
-2006-05-26  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fix for Novell bug #178631
-
-	* e-attachment-bar.c: Changed the EAttachmentBarPrivate struct, we
-	no longer use a linked list, instead we use a GPtrArray - faster,
-	simpler (plus all the code used indexes anyway, so it was really
-	bizarre).
-	(free_attachment_list): Removed.
-	(attachment_destroy): New GWeakNotify callback for when an
-	EAttachment object gets destroyed. Remove the attachment from the
-	attachments array.
-	(add_common): Updated to add to an array rather than a linked
-	list. Also weak_ref the attachment object.
-	(remove_attachment): Removed.
-	(update): Updated to use the array instead of linked list of
-	attachments.
-	(e_attachment_bar_remove_selected): Same.
-	(e_attachment_bar_set_width): Same.
-	(e_attachment_bar_edit_selected): Same.
-	(e_attachment_bar_get_selected): Same.
-	(e_attachment_bar_get_attachment): Same.
-	(e_attachment_bar_get_all_attachments): Same and also optimised
-	since we can cheat now without having to g_slist_reverse.
-	(e_attachment_bar_get_parts): Same.
-	(destroy): Same.
-	(eab_drag_data_get): Same.
-	(init): Init attachments to a g_ptr_array_new
-	(e_attachment_bar_to_multipart): Updated to use the attachments
-	array.
-	(e_attachment_bar_get_num_attachments): Updated to return the
-	attachments->len.
-	(e_attachment_bar_get_download_count): Updated to use the array.
-
-	* e-attachment.c (finalise): Close the editor dialog if it is
-	open.
-	(async_progress_update_cb): If the phase is COMPLETE but the
-	file_size is 0, then treat it as an error. In the error case,
-	unref the attachment object (this will magically remove it from
-	the EAttachmentBar).
-	(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
-	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.
-
-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.
-
-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.
-
-	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
-	pixbuf after closing the loaded.
-
-2006-02-13  Andre Klapper  <a9016009@gmx.de>
-
-	* e-charset-picker.c: adding thai support.
-	fixes the UI part of bug 251062.
-
-2006-02-11  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* e-search-bar.c (activate_by_subitems): 
-	* e-dateedit.c (e_date_edit_new, create_children) 
-	(create_children, create_children): 
-	* e-calendar.c (e_calendar_init): 
-	Change a11y names. Fixes part of bug #330723.
-
-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.
-
-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.
-
-2006-01-11  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* Makefile.am: Remove the e-util-marshal.list from extra dist.
-	Fixes a build break.
-
-2006-01-10  Simon Zheng  <simon.zheng@sun.com>
-
-	* Makefile.am:
-	* e-dateedit.c:
-	* e-image-chooser.c:
-	* e-printable.c:
-	* e-reflow-model.c:
-	* e-reflow.c:
-	* e-search-bar.c:
-	* e-selection-model.c:
-	* gal-combo-box.c:
-	Remove e-util-marshal.list in current directory, and
-	use the copy in evolution/e-util directory instead.
-
-	*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.
-
-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.
-
-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.
-
-2005-12-20  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	** See Bug #246233
-
-	* e-filter-bar.c (member_activated): Changed "Search Editor" to
-	"Searches"
-
-2005-12-18  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Link with bootstrap libs on Win32. Use
-	EVOLUTION_IMAGES instead of MAP_DIR for uniformity. Use
-	EVOLUTION_MAIL_CFLAGS instead of E_WIDGETS_CFLAGS. Use privsolib
-	instead of privlib (no difference on Unix). Use -no-undefined on
-	Win32. Link with all required libraries.
-
-	* e-attachment.c
-	* e-send-options.c: Use gstdio wrappers. Construct glade file name
-	at run-time.
-
-	* e-map.c: Construct map file name at run-time.
-
-	* gal-combo-text.c (strcase_equal): Use g_ascii_strcasecmp().
-	(strcase_hash): Use g_ascii_tolower().
-
-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.
-
-2005-11-24  Tor Lillqvist  <tml@novell.com>
-
-	* 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):
-	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".
-
-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.
-
-2005-11-15  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-attachment-bar.c (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.
-
-2005-11-14  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-dateedit.c (create_children): Set a size for the date
-	edit widgets, so that it doesnt expand too much.
-
-2005-09-28  Veerapuram Varadhan <vvaradhan@novell.com>
-
-	* e-attachment-bar.c (update): gtk_pixbuf_add_alpha returns a
-	newly allocated pixbuf, so, free the original one.
-	
-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()
-	instead of strcasecmp(). We are comparing to strings known to be
-	plain ASCII, so just casefolding ASCII is enough. Also better for
-	portability.
-
-2005-09-20  Devashish Sharma  <sdevashish@novell.com>
-
-	* e-search-bar.c (subitem_activated_cb): Emits the signal "search
-	activated" when after selecting option "Category is" in search bar
-	category is selected. So dont have to explicitly click "Find Now".
-	Fixes #263269.
-	
-2005-08-22  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-attachment.c (e_attachment_build_remote_file): 
-	Fix for bug #314136. Shows filename in the remote download in
-	composer.
-
-2005-08-22  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-attachment-bar.c (update): Better space management.
-	Kills one extra row that happens some times.
-	(e_attachment_bar_set_width): Just adjusts the size instead of
-	rebuild of the bar, which is the cause for the freeze. Fixes the 
-	bug #313799. Remove the function e_attachment_bar_refresh
-
-	* e-attachment-bar.h: Remove the function e_attachment_bar_refresh
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-send-options.c (get_widgets): cast warning away.
-
-	* e-calendar-item.c (e_calendar_item_realize): remove some unused
-	vars.
-
-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.c (finalise, init): Add a new member to preserve
-	the stored location
-	(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
-
-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.
-
-2005-08-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-filter-bar.c (build_items): revert dobey's last patch here, it
-	completely broke customisation of the menu.
-
-2005-08-11  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-attachment-bar.c (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.
-
-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.
-
-2005-07-15  Diego Gonzalez    <diego@pemas.net>
-
-	* 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
-
-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.
-	
-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)
-
-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.
-	
-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]
-
-	* e-attachment-bar.[ch]: Merge of em-attachment-bar.[ch] and
-	cal-attachment-bar.[ch].
-
-2005-06-23  Kaushal Kumar  <kakumar@novell.com>
-
-	* Makefile.am: Use 'misc' for widgetsincludedir, instead of 
-	'widgets', to match source directory name and fix 
-	evolution-exchange build.
-
-2005-05-31  Li Yuan  <li.yuan@sun.com>
-
-	* e-dateedit.c (e_date_edit_update_date_entry): add relation to
-	date_button.
-
-	Fixes #302267
-
-2005-05-16  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: move e-error.[ch] and e-system-errors.xml to
-	e-util/. remove test-error.
-
-2005-05-13  Rodney Dawes  <dobey@novell.com>
-
-	* e-filter-bar.[ch]: Update for the new menu layout
-
-2005-05-12  Shreyas Srinivasan	<sshreyas@novell.com>
-
-	* e-send-options.c: Fixed #272005
-
-2005-05-06  Sarfraaz Ahmed <asarfraaz@novell.com>
-
-	* e-send-options.glade: Fixed a typo. #273095
-
-2005-05-06  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-send-options.glade: Fix for bugs #273096, #273097
-
-2005-03-01  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-search-bar.c (subitem_activated_cb): Make the entry widget
-	grab focus. Fixes bug #60551.
-
-2005-02-21  Rodney Dawes  <dobey@novell.com>
-
-	* e-combo-button.c (paint): Fix the calculation of which shadow type
-	to use to be more appropriate for the widget state and relief
-	Always call gtk_box_paint and not only in special cases like GtkButton
-	(e_combo_button_init): Change the arrow packing to pack_end
-
-	Fixes #54503
-
-2005-02-02  Li Yuan  <li.yuan@sun.com>
-
-	* e-url-entry.c (init): add a11y name to url link button.
-
-2005-01-26  Rodney Dawes  <dobey@novell.com>
-
-	* e-error.c (e_error_newv): Fix up spacing to be HIG compliant for
-	the borders around the dialogs
-
-2005-01-25  Not Zed  <NotZed@Ximian.com>
-
-	* e-error.c: turn off debug output, people think its a significant
-	error.
-
-2005-01-24  Mengjie Yu  <meng-jie.yu@sun.com>
-
-	* e-search-bar.c (set_option): add a11y name for the option menu.
-
-2005-01-20  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #64964.
-
-	* e-error.c (e_error_newv): just use add_button, not
-	add_action_widget, for stock+label widgets, since they both show
-	the same, and for some reason set_default_response doesn't work
-	otherwise.
-
-2005-01-20  Harry Lu  <harry.lu@sun.com>
-
-	* 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
-	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.
-
-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.
-
-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.
-
-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.glade: Changed a label id.
-
-	* e-send-options.h: Added the set_global function.
-
-2005-01-06  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: dist the glade file
-
-2005-01-06 Chenthill Palanisamy <pchenthill@novell.com>
-	
-	Commiting the files mentioned below again to HEAD since it 
-	was not added in head. 
-
-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.
-	(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>
-
-	* e-error.c (ee_load, e_error_newv): translate strings based on
-	translation-domain, if supplied.
-
-2004-12-14  Rodney Dawes  <dobey@novell.com>
-
-	* e-calendar-item.c (e_calendar_item_draw): Use gtk_paint_foo instead
-	of the deprecated gtk_draw_foo functions
-	(e_calendar_item_get_day_style): Use colors from the theme for the
-	background and foreground of various items
-	
-	* test-calendar.c (main): Don't set a callback for getting the day
-	style, we want the test app to use the widget defaults
-	(get_day_style): Remove all this duplicated code as we want to use
-	the widget default colors for day fg/bg
-
-2004-11-26  JP Rosevear  <jpr@novell.com>
-
-	* test-info-label.c: test prog
-
-	* e-url-entry.c: get image directly from icon factory
-
-	* e-combo-button.c: ditto; convert to G_DEFINE_TYPE
-
-	* e-activity-handler.c: convert to G_DEFINE_TYPE
-	
-	* e-task-widget.c: ditto
-
-	* e-task-bar.c: ditto
-
-	* e-multi-config-dialog.c: ditto
-
-	* e-dropdown-button.c: ditto
-
-	* e-cell-renderer-combo.c: ditto
-
-	* e-cell-date-edit.c: ditto
-
-	* e-calendar.c: ditto
-
-	* e-calendar-item.c: ditto
-
-	* Makefile.am: don't build the title bar, build an info label test
-	program
-
-2004-10-28  Li Yuan  <li.yuan@sun.com>
-
-	* 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_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
-	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.
-	
-2004-10-27  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: use E_WIDGET instead of GNOME_FULL
-
-2004-10-14  JP Rosevear  <jpr@novell.com>
-
-	* e-pilot-settings.c: fix e-source-option-menu include
-
-2004-10-13  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: don't build source selector or source option menu
-	or test programs any more
-
-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.
-
-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
-	
-2004-10-01  Not Zed  <NotZed@Ximian.com>
-
-	* e-util-marshal.list: added boolean object boxed.
-
-	* e-source-selector.c (class_init): add new 'popup event' signal,
-	to replace fill_popup_menu.
-	(selector_button_press_event): emit a POPUP_EVENT rather than a
-	FILL_POPUP_MENU.
-
-2004-09-13  Rodney Dawes  <dobey@novell.com>
-
-	* e-multi-config-dialog.c (impl_response):
-	Point at "config-prefs" instead of "config" for the help section
-
-2004-08-03  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: Really dist the pilot sources this time
-
-2004-08-03  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: Dist the pilot sources
-
-2004-08-01  JP Rosevear  <jpr@novell.com>
-
-	* e-pilot-settings.c (e_pilot_settings_get_source): accessor
-	(e_pilot_settings_set_source): ditto
-	(build_ui): show the source option menu
-	(e_pilot_settings_new): use above
-
-	* e-pilot-settings.h: add prototypes
-
-2004-07-20  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: build pilot setting
-
-2004-07-26  JP Rosevear  <jpr@novell.com>
- 
-	* e-search-bar.c (setup_bonobo_menus): use ctrl-shift-q to clear
-	search bar
-	
-2004-07-20  Not Zed  <NotZed@Ximian.com>
-
-	* e-error.c: include config.h.  See #61395.
-
-2004-07-20  JP Rosevear  <jpr@novell.com>
-
-	* e-source-selector.h: remove proto
-
-	* e-source-selector.c (selection_func): don't force the item to be
-	checked
-	(cell_toggled_callback): allow the cell to be untoggled even if
-	its primary
-	(init): set the pixbuf renderable
-	(e_source_selector_set_toggle_selection): no longer necessary
-
-2004-07-16  Chris Toshok  <toshok@ximian.com>
-
-	* e-clipped-label.c (e_clipped_label_recalc_chars_displayed):
-	remove debug spew and fix the display when
-	pango_layout_line_x_to_index returns FALSE (before we were drawing
-	both the ellipses and the text).
-
-2004-07-12  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-charset-picker.c: s/GB-2312/GB2312/ - fixes bug #61385.
-
-2004-06-24  Rodney Dawes  <dobey@novell.com>
-
-	* e-error.c (e_error_newv): Fix alignment of the icon to be 0x0
-
-	Fixes #60493
-
-2004-06-24  Rodney Dawes  <dobey@novell.com>
-
-	* e-source-selector.[ch]: Add new "select_new" property to
-	private structure of the ESourceSelector
-	(rebuild_cb): Add code to select the new source, and cause the
-	selection_changed signal to get emitted, if we select new sources
-	(init): Don't select new sources by default
-	(e_source_selector_set_select_new): Add function to set whether or not
-	we want to select new sources when we add them
-
-2004-06-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-source-selector.c (e_source_selector_peek_primary_selection):
-	Add preconditions. Make sure garbage or NULL data doesn't get
-	used.
-	
-2004-06-16  Not Zed  <NotZed@Ximian.com>
-
-	* e-source-selector.c (cell_toggled_callback): fix a path leak and
-	maek the code more structured.
-	(e_source_selector_set_toggle_selection): set the mode on whether
-	you can toggle the currnet selection or not.
-	(cell_toggled_callback): implement set_toggle_selection behaviour.
-
-2004-06-11  Larry Ewing  <lewing@ximian.com>
-
-	* e-source-selector.c: make the source selector use a colock block
-	instead of setting the foreground to indicate the source color.
-	(pixbuf_cell_data_func): actually initialize the pixbuf (bad
-	larry).
-	(pixbuf_cell_data_func): clean up warnings.  (double bad larry).
-	(pixbuf_cell_data_func): fix the appearance a little.
-	
-2004-06-03  William Jon McCann  <mccann@jhu.edu>
-
-	* e-error.c (e_error_newv): Add HIG border width for dialog window.
-
-2004-06-01  Christian Neumair  <chris@gnome-de.org>
-
-	* Makefile.am (test_error_LDADD): Link test-error against libeutil.
-
-2004-06-01  Anders Carlsson  <andersca@gnome.org>
-
-	* e-expander.c (e_expander_expose): Don't propagate the expose
-	to the label widget, the parent expose handler does that.
-
-2004-05-28  Anders Carlsson  <andersca@gnome.org>
-
-	* e-error.c (e_error_newv): Use the constructed title string.
-
-2004-05-27  Rodney Dawes  <dobey@novell.com>
-
-	* Makefile.am (EXTRA_DIST): Add $(error_i18n)
-
-2004-05-21  Not Zed  <NotZed@Ximian.com>
-
-	* e-error.c (e_error_default_parent): set a default error parent
-	fallback.
-	(e_error_newv): if parent is null, see if we have a default still
-	alive, and use that.  warn if not.
-	(e_error_default_parent): uh, fix the sense of the
-	if-we-dont-have-it test.
-
-2004-05-20  JP Rosevear  <jpr@novell.com>
-
-	* e-task-widget.c (e_task_widget_construct): only unref the mask
-	if there is one
-
-2004-05-19  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: don't dist the error .h file
-
-2004-05-18  Not Zed  <NotZed@Ximian.com>
-
-	* e-error.c (ee_load): load the <help> tag if present.
-	(ee_response): handle the help response and swallow the signal.
-	(e_error_newv): setup help button if we have a help uri.
-
-2004-05-17  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-url-entry.c (init): Use E_ICON_SIZE_BUTTON for the icon size
-	in the e_icon_factory_get_icon() call.
-
-	* e-combo-button.c (create_empty_image_widget): Don't hard-code
-	the size of the icon in pixels, instead use the appropriate
-	E_ICON_SIZE_ enum.
-
-2004-05-17  JP Rosevear  <jpr@novell.com>
-
-	Fixes #58460
-	
-	* e-task-widget.c (e_task_widget_construct): bitmap_unref the
-	mask, don't object_unref it
-
-2004-05-12  Not Zed  <NotZed@Ximian.com>
-
-	* e-error.c (ee_load): duh, use the right node pointer for title
-	and secondary text.
-
-	* e-system-errors.xml: make the Because cases the same.
-
-	* e-system-errors.xml.h: add for translators.
-
-	* e-error.c (ee_load): just use _() to do i18n rather than the
-	nasty lang stuff.
-	(find_node): no longer needed.
-
-	* Makefile.am (%.xml.h): setup the build rules for the i18n file
-	for the errors.
-
-	* e-system-errors.xml.in: Removed, renamed to .xml and removed the
-	_ stuff.
-
-2004-05-04  Xan Lopez  <xan@gnome.org>
-
-	* Makefile.am:
-
-        Build fixes.
-
-2004-05-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-error.c (ee_build_label): blah, need to do entity decoding.
-	#57918.
-
-2004-04-29  JP Rosevear  <jpr@ximian.com>
-
-	* e-activity-handler.c (impl_dispose): pass the correct data when
-	weak unreffing
-
-2004-04-29  Not Zed  <NotZed@Ximian.com>
-
-	* e-error.c (e_error_newv): make the label selectable.
-	(e_error_newv): if we have stock and label set, then use a stock
-	button with an override label.
-
-2004-04-28  Not Zed  <NotZed@Ximian.com>
-
-	* e-system-errors.xml.in: holder for system errors.
-
-	* test-error.c: helper to show an error message/test it.
-
-	* e-error.[ch]: Api for disk-based, hig-compliant error messages
-	and query boxes.
-
-2004-04-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-info-label.c (e_info_label_new): Updated to sue E_ICON_SIZE enums.
-
-2004-04-19  Rodney Dawes  <dobey@ximian.com>
-
-	* e-info-label.c (e_info_label_new): Update to use EIconFactory to
-	get the filename for the component icons using the icon theme
-
-2004-04-19  Michael Terry  <mike@mterry.name>
-
-	* e-combo-buddon.c:
-	* e-url-entry.c: Update these to use EIconFactory and GtkImages
-	directly instead of GdkPixmaps
-
-2004-04-09  Rodney Dawes  <dobey@ximian.com>
-
-	* e-charset-picker.c: Include gtkhbox.h in here to avoid the warnings
-	(activate_other):
-	(e_charset_picker_dialog): Make these dialogs be more HIG-compliant
-	* e-filter-bar.c (do_advanced):
-	(menubar_activated): Make these dialogs be more HIG-compliant
-
-2004-04-08  Not Zed  <NotZed@Ximian.com>
-
-	* e-info-label.c (e_info_label_set_info): ugh, fix some last
-	minute changes which broke shit.
-
-	* e-info-label.[ch]: A widget to show component info for the
-	current component/view.
-
-2004-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-multi-config-dialog.c: Updated for changes to e-config-page.c
-	(init): Removed the OK and Apply buttons.
-
-	* e-config-page.c (e_config_page_apply): Removed.
-	(e_config_page_is_applied): Removed.
-	(e_config_page_changed): Removed.
-
-2004-04-01  Dan Winship  <danw@ximian.com>
-
-	* e-url-entry.c (init): Make the button initially insensitive.
-	Connect to the entry's "changed" signal.
-	(entry_changed_cb): sensitize the button iff the entry is
-	non-empty
-	(button_clicked_cb): simplify a bit by using gtk_entry_get_text
-	rather than gtk_editable_get_chars.
-
-2004-04-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-charset-picker.c (e_charset_picker_new): Create a new class
-	for "Western European, New" to fix a translation issue.
-
-2004-03-31  Not Zed  <NotZed@Ximian.com>
-
-	* e-filter-bar.c (menubar_activated): start the rule editor with
-	the right label.
-
-2004-03-26  Rodney Dawes  <dobey@ximian.com>
-
-	* e-multi-config-dialog.c (init): Remove the dialog separator
-	Set the border widths of the dialog's vbox and action area to be more
-	HIG-compliant
-	Set the border width of the dialog's child to 12 for HIG-compliance
-
-2004-03-15  JP Rosevear  <jpr@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_class_init): change arg name
-	(e_calendar_item_init): ditto
-	(e_calendar_item_get_arg): ditto
-	(e_calendar_item_set_arg): ditto
-	(e_calendar_item_preserve_day_selection): set the selection day to
-	the given selection
-	(e_calendar_item_set_first_month): use above to preserve selected
-	day of week
-
-	* e-calendar-item.h: change field name
-
-2004-03-13  Trent Lloyd  <lathiat@sixlabs.org>
-
-	* e-search-bar.c (remove_bonobo_menus): move function above
-	setup_bonobo_menus, fixes implicit declaration.
-
-2004-03-12  Kidd Wang  <kidd.wang@sun.com>
-
-	* e-dateedit.c (create_children): enlarge the text box to
-	accomodate the time info in different locales.
-
-2004-03-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Fix for bug #55267.
-
-	* e-filter-bar.c (set_property): Use efb->setquery properly (set
-	to TRUE before calling set_item_id and FALSE afterwards). Also
-	setquery to TRUE before emitting the "search-activated" signal so
-	that we don't run the callback for the signal we are emitting.
-
-2004-03-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c (set_property): Emit the "search-activated"
-	signal. Fixes bug #55054.
-
-2004-02-26  Rodney Dawes  <dobey@ximian.com>
-
-	* e-cell-renderer-combo.c (ecrc_get_size):
-	* e-dateedit.c (create_children):
-	* e-dropdown-button.c (e_dropdown_button_construct): Create the
-	arrows in these widgets as GTK_SHADOW_NONE, since the default arrow
-	type in GTK+ 2.x is flat triangle arrows, and shadow types are
-	generally ignored for arrows anyway, and so we don't look ugly with
-	themes that handle shadow types on arrows correctly
-
-2004-02-26  Bill Zhu <bill.zhu@sun.com>
-
-	* e-search-bar.c (setup_bonobo_menus): Before Update the bonobo ui
-	component, remove it first.
-
-	Fixes #54788
-
-2004-02-11  Rodney Dawes  <dobey@ximian.com>
-
-	* e-multi-config-dialog.c (impl_response): Change the filename and
-	section that we pass to gnome_help_display_desktop so that the help
-	browser displays the documentation correctly
-
-2004-02-10  Rodney Dawes  <dobey@ximian.com>
-
-	* e-multi-config-dialog.c (init): Add a Help button
-	(impl_response): Handle the Help button and open the documentation
-
-	Fixes #30681
-
-2004-02-05  Rodney Dawes  <dobey@ximian.com>
-
-	* e-task-bar.c: Don't show the task label by default
-
-2004-02-03  Dan Winship  <danw@ximian.com>
-
-	* e-activity-handler.c: 
-	* e-activity-handler.h: 
-	* e-task-bar.c: 
-	* e-task-bar.h: 
-	* e-task-widget.c: 
-	* e-task-widget.h: Moved here from shell/, since they are now used
-	only by the components, not the shell itself.
-
-	* Makefile.am (widgetsinclude_HEADERS,
-	libemiscwidgets_la_SOURCES): add new files
-
-2004-02-02  Chris Toshok  <toshok@ximian.com>
-
-	* e-image-chooser.c (set_image_from_data): set
-	image_buf/image_buf_size here instead of in all callers.  also
-	emit the "changed" signal here.
-	(image_drag_data_received_cb): remove the copying to image_buf and
-	emitting of "changed" from here.
-	(e_image_chooser_set_from_file): only g_free (data) here if
-	set_image_from_data failed.
-	(e_image_chooser_set_image_data): copy the image data we're passed
-	before calling set_image_data.  free it if rv == FALSE.
-
-2004-01-30  Chris Toshok  <toshok@ximian.com>
-
-	* e-image-chooser.c (e_image_chooser_init): add an alignment
-	around the image.  This might not be enough.  hrm.
-	(set_image_from_data): handle the case where there's no image
-	(image_height == image_width == 0).
-	(e_image_chooser_get_image_data): new function.
-	(e_image_chooser_set_image_data): new function.
-
-	* e-image-chooser.h: add prototypes for set/get_image_data.
-
-2004-01-30  Chris Toshok  <toshok@ximian.com>
-
-	* e-image-chooser.[ch]: abstract out the drag and droppable image
-	widget from the contact list editor and stick it here.  There's
-	some code for a "Browse..." button here but it's not enabled.
-
-	* Makefile.am (widgetsinclude_HEADERS): add e-image-chooser.h.
-	(libemiscwidgets_la_SOURCES): add e-image-chooser.c
-	
-2004-01-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c (get_property): Only save the search-bar state OR
-	the filter-bar state - decided based on what the search is. If the
-	search is an advanced search, then save the filter-bar state,
-	otherwise save the search-bar state.
-	(set_property): Only need to restore the first state we find
-	(filter-bar vs search-bar). If we are restoring filter-bar state,
-	set efb->setquery to TRUE and then set the item_id to
-	E_FILTERBAR_ADVANCED_ID.
-
-2004-01-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c (option_changed): Don't call efb->config() if the
-	current_query is NULL.
-
-2004-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-search-bar.c (impl_get_property): Same.
-
-	* e-filter-bar.c (get_property): Use
-	g_value_set_string_take_ownership() instead of
-	g_value_take_string() since we need snaps to work with glib-2.0
-	earlier than 2.3.x.
-
-2004-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c: Added a new property "state" which is READ-WRITE
-	so that we can save/restore state in the mailer code if we want
-	to. Sort of a work-in-progress toward fixing bug #53195.
-	(class_init): Ported to use the GObject property stuff instead of
-	the deprecated GtkArg stuff.
-	(get_property): Ported from impl_get_arg().
-	(set_property): New object::set_property implementation to set the
-	query state.
-
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* e-source-selector.c (cell_toggled_callback): if the source is
-	primary, don't allow it to be un-selected
-
-2004-01-20  Rodney Dawes  <dobey@ximian.com>
-
-	* e-combo-button.c (paint): Be even more exactly like the GtkButton
-	painting stuff
-
-	Fixes #52988
-
-2004-01-20  JP Rosevear <jpr@ximian.com>
-
-	* e-source-selector.c (rebuild_model): set a primary selection if
-	there is one before the rebuild
-	(e_source_selector_set_primary_selection): block the signals when
-	clearing the tree selection to make the op atomic; emit the
-	selection_changed signal if a hidden selection is not currently
-	selectecd
-
-2004-01-20  JP Rosevear <jpr@ximian.com>
-
-	* e-source-selector.c (find_source_iter): provide parent iter
-	in/out arg
-	(test_collapse_row_callback): use priv shortcut
-	(e_source_selector_select_source): pass parent iter
-	(e_source_selector_unselect_source): ditto
-	(e_source_selector_peek_primary_selection): return the right thing
-	if the primary selection is currently hidden
-	(e_source_selector_set_primary_selection): set the primary
-	selection properly if the source node is currently hidden
-
-2004-01-20  JP Rosevear <jpr@ximian.com>
-
-	* e-source-selector.c (clear_saved_primary_selection): util
-	routine to clear the row reference to the saved primary selection
-	(find_source_iter): unref the model data retrieved
-	(rebuild_existing_cb): ditto
-	(toggle_cell_data_func): ditto
-	(text_cell_data_func): ditto
-	(selection_func): ditto; clear the saved primary selection if
-	something else is selected
-	(cell_toggled_callback): ditto
-	(test_collapse_row_callback): clear the toggled_last flag
-	(row_expanded_callback): once we've restored the saved primary
-	selection, clear it
-	(selector_button_press_event): unref the model data
-	(impl_dispose): use clear_saved_primary_selection
-	(init): the store column holds object not pointer type
-	(e_source_selector_peek_primary_selection): unref the model data
-
-2004-01-20  JP Rosevear <jpr@ximian.com>
-
-	* e-source-selector.c (test_collapse_row_callback): check if the
-	collapsing node has its child selected, if so take a row reference
-	to remember the selection
-	(row_expanded_callback): check if the expanding node has the saved
-	primary selection under it and re-select if so
-	(init): listen for signals
-	(impl_dispose): free the primary selection
-
-2004-01-19  JP Rosevear <jpr@ximian.com>
-
-	* e-source-selector.c (create_rebuild_data): create the data
-	structure for rebuilding the model
-	(free_rebuild_data): free it
-	(rebuild_existing_cb): check for the sources that are still
-	existing or deleted
-	(rebuild_model): do incremental updates
-	(selection_func): if the last thing we did was toggle, we don't
-	actually want to highlight and if the source is not checked, check
-	it
-	(cell_toggled_callback): indicate that a toggle just occurred
-	(init): initial toggled last to false	
-	(e_source_selector_set_primary_selection): set some preconditions
-
-	Fixes #51787
-	
-2004-01-19  JP Rosevear <jpr@ximian.com>
-
-	* e-source-selector.c 	(cell_toggled_callback): indicate that a toggle just occurred
-
-2004-01-19  JP Rosevear <jpr@ximian.com>
-
-	* e-source-selector.c 
-
-	(selector_button_press_event): when right clicking, make sure the
-	calendar is highlighted and that groups can't be right clicked on
-
-2004-01-14  Rodney Dawes  <dobey@ximian.com>
-
-	* e-expander.[ch]: Fix remaining usages of GTK_*EXPANDER* defines
-
-2003-12-22  Rodney Dawes  <dobey@ximian.com>
-
-	Fix for bug #46349
-	
-	* e-combo-button.c: Use the appropriate style painting for a
-	button widget, since we are a button
-
-2003-12-18  Harry Lu  <harry.lu@sun.com>
-
-	* e-cell-date-edit.c: (e_cell_date_edit_do_popup): call
-	gdk_window_focus() so that keyboard works correctly.
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-source-option-menu.c (select_source_foreach_menu_item): Use
-	e_source_equal() instead of comparing pointers. This allows user
-	to pass in a source that was obtained from somewhere else. Set the
-	matching internal source as "selected" instead of the one passed
-	in.
-	(select_source): Emit signal only if we found a match. Don't
-	ref/unref anything, since the selected source will always be from
-	our internal list.
-	
-2003-12-04  Harry Lu <harry.lu@sun.com> 
-
-	Fix for bugzilla bug #51624 and #51627.
-
-	* e-calendar-item.c: (e_calendar_item_selection_add_days):
-	set the date to the first day of the month so that user can use
-	keyboard's arrow key to select a date.
-	(e_calendar_item_set_selection_if_emission): only set selection_changed
-	if emission is TRUE.
-	* e-calendar.c: (e_calendar_init): add back the "clicked" handler so
-	that user can use keyboard to click the button.
-	 (e_calendar_start_auto_move): no need to move since it is already 
-	handled by the clicked handler
-	(e_calendar_on_prev_clicked), (e_calendar_on_next_clicked): move the 
-	month here.
-	* e-dateedit.c: (e_date_edit_show_date_popup): use gdk_window_focus 
-	instead of gdk_keyboard_grab so that the focus won't lost if user click
-	the button with keyboard.
-	(hide_date_popup): no need to call gdk_keyboard_ungrab.
-
-2003-12-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-source-selector.c (init): Set the mode on the text cell
-	renderer to GTK_CELL_RENDERER_MODE_ACTIVATABLE so clicking on the
-	text doesn't change the status of the checkbox.  [Many thanks to
-	Jonathan Blandford for telling me how to do this!]
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* e-source-selector.c (class_init): list the signal args properly
-
-2003-11-30  ERDI Gergo  <cactus@cactus.rulez.org>
-
-	* e-calendar.c: canned the _clicked handlers as those make it
-	impossible to move just one month at a time
-
-2003-11-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-util-marshal.list: Add NONE:POINTER.
-
-	* test-source-option-menu.c (source_selected_callback): New
-	callback to test the "source_selected" signal.
-	(on_idle_create_widget): Connect.
-
-	* e-source-option-menu.c: Add "source_selected" signal.
-	(select_source): Assume source != NULL and emit "source_selected".
-
-2003-11-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* test-source-option-menu.c: New test.
-
-	* e-source-option-menu.h: New.
-	* e-source-option-menu.c: New.
-
-2003-11-23  ERDI Gergo  <cactus@cactus.rulez.org>
-
-	* e-expander.c: Added the late eggexpander
-	
-	* e-expander.c (e_expander_button_release): Emit 'activate' signal when
-	appropriate
-	
-
-2003-11-17  Charles Zhang  <charles.zhang@sun.com>
-
-	* e-search-bar.c(add_button): allow new lable with mnemonic
-	(e_search_bar_construct): alter lable name. [50810]
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* e-source-selector.c (e_source_selector_set_primary_selection):
-	use find_source_iter and get the selection from the right spot
-	(find_source_iter): util function to find the iter given the
-	source
-	(e_source_selector_select_source): signal that the model changed
-	(e_source_selector_unselect_source): ditto
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* e-source-selector.h: include e-source stuff from e-d-s
-
-	* Makefile.am: use new cflags/libs to build
-	
-2003-11-13  Bolian Yin <bolian.yin@sun.com>
-
-	* e-calendar-item.c: remove a declaration of a deleted func.
-
-2003-11-12  JP Rosevear <jpr@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_class_init): a canvas item
-	does not inherit from gtkwidget
-
-2003-11-11  Bolian Yin <bolian.yin@sun.com>
-                                                                                
-        Fixes #50538
-                                                                                
-        * e-calendar-item: make e_calendar_item_normalize_date public func.
-           add "selection_preview_changed" signal.
-           move some definition of constants to .h
-                                                                                
-2003-11-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-source-selector.c (e_source_selector_new): Expand all the
-	nodes.
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: make sure the marshal stuff is in the sources and
-	remove the built files when disting
-
-2003-10-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-source-selector.c (class_init): fill_popup_menu signal has
-	2 arguments.
-
-2003-10-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* e-source-selector.[ch]: added "fill_popup_menu" signal, to
-	allow the addition of new items to the popup menu.
-	(class_init): create new signal.
-	(init): connect to "button_press_event" for the tree view.
-	(selector_button_press_event): callback for "button_press_event".
-	(e_source_selector_selection_shown): use g_return_val_if_fail.
-
-2003-10-22  Dan Winship  <danw@ximian.com>
-
-	* e-bonobo-widget.[ch]: Remove these (unused since 1.2)
-
-2003-09-30  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-renderer-combo.* : new, treeview renderer for combo cells
-	* e-combo-cell-editable.* : new, GtkCellEditable for combo cells
-	* Makefile.am : build the new files
-	
-2003-09-19  Bolian Yin <bolian.yin@sun.com>
-
-	Fixes #1245. ECalendar should be usable with the keyboard
-
-	* e-calendar-item.c (e_calendar_item_focus): new func, focus
-	handler.
-	(e_calendar_item_key_press_event): new func, key press event
-	handler
-	(e_calendar_item_selection_add_days,
-	e_calendar_item_stop_selecting): helpers.
-	(e_calendar_item_ensure_days_visible,
-	 e_calendar_item_set_selection_if_emission): add the flag to
-	 control if we should emit e-calendar signals.
-	(e_calendar_item_class_init): register focus handler.
-	(e_calendar_item_event): add code for GDK_FOCUS_CHANGE and
-	GDK_KEY_PRESS.
-
-	* e-calendar.c (e_calendar_focus): new func, focus handler
-	(e_calendar_button_has_focus): new func, if prev/next button has
-	focus.
-	(e_calendar_on_next_clicked, e_calendar_on_prev_clicked): click
-	 signal handler for prev/next buttons.
-	(e_calendar_set_focusable): set if the e-calendar is focusable
-
-	* e-dateedit.c (e_date_edit_show_date_popup, hide_date_popup):
-	grab/ungrab gdk keyboard.
-
-2003-08-27  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #15638.
-
-	* e-dateedit.c (rebuild_time_popup): Make 12-hour time format not
-	be zero-padded. Right-align time labels so digits line up.
-
-2003-08-27  Bolian Yin <bolian.yin@sun.com>
-
-	* Makefile.am: add dependency on a11y/widgets.
-	
-	* e-calendar-item.c (e_calendar_item_class_init): a11y init.
-	  (e_calendar_item_bounds): new func, impl the bounds virtual
-	  func.
-
-2003-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-source-selector.c (e_source_selector_selection_shown)
-	(e_source_selector_show_selection): Add precondition.
-
-2003-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* test-source-selector.c (on_idle_create_widget): Add a
-	checkbutton to the test window for toggling the checkboxes on and
-	off.  Also, put the list in a scrolled window and set a default
-	size for the main window.
-	(check_toggled_callback): Callback for the checkbutton.
-
-	* e-source-selector.c: New member checkboxes_shown in struct
-	ESourceSelectorPrivate.
-	(init): Set to TRUE.
-	(e_source_selector_show_selection): New.
-	(e_source_selector_selection_shown): New.
-	(toggle_cell_data_func): Don't show the toggle if checkboxes_shown
-	is FALSE.
-
-2003-08-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-source-selector.c: New signal "primary_selection_changed",
-	removed members list_changed_callback_id and
-	selection_changed_callback_id in ESourceSelectorPrivate.
-	(rebuild_model): If the new set of selected sources is smaller
-	than the old one, emit "selection_changed".
-	(e_source_selector_peek_primary_selection): New.
-	(e_source_selector_set_primary_selection): New.
-	(selection_changed_callback): New callback for the "changed"
-	signal on our associated GtkTreeSelection.
-	(init): Connect.
-	(impl_dispose): Disconnect.
-	(setup_model): Use signal_connect_object() instead of saving the
-	ID.
-
-2003-08-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-source-selector.c (cell_toggled_callback): Call
-	gtk_tree_model_row_changed() to let the model know that we changed
-	the data.
-
-2003-08-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* test-source-selector.c: New test program.
-
-	* e-source-selector.c: New file.
-	* e-source-selector.h: New file.
-
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: use EVO_MARSHAL_RULE
-
-	* e-combo-button.c (create_empty_pixmap_widget): Create the pixbuf
-	from empty.xpm rather than just calling gdk_pixbuf_new(), which
-	doesn't actually initialize the pixel data.
-
-	* e-messagebox.c: Remove this, since it claims to be deprecated,
-	and nothing is actually using it any more.
-	
-	* Makefile.am: Remove e-messagebox.[ch]
-
-2003-07-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-dateedit.c (e_date_edit_mnemonic_activate): Added a handler
-	for GtkWidget::mnemonic_activate().
-
-	* e-url-entry.c (mnemonic_activate): Likewise.
-
-2003-07-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-url-entry.c (destroy): Chain to the parent handler.  Fixes #45236.
-
-2003-06-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (set_menu): Translate the text.  [#45112]
-
-2003-06-18  Suresh Chandrasekharan  <suresh.chandrasekharan@sun.com>
-
-	* e-charset-picker.c: Fix for #45082: GB18030 BIG5HKSCS and EUC-TW 
-	charsets not supported in evolution mail
-
-2003-06-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-charset-picker.c (e_charset_picker_bonobo_ui_populate): Don't
-	use the charset class in the menu label if it is 'Unknown'.
-	(e_charset_picker_bonobo_ui_populate): For user-defined charsets,
-	just use the name of the charset rather than "Unknown".
-	(add_charset): Don't escape _'s anymore, this seems to not be
-	needed int gtk2.
-	(add_other_charset): g_strdup() the charset name. Fixes bug
-	#43917.
-
-2003-06-11  Larry Ewing  <lewing@ximian.com>
-
-	* e-search-bar.c (impl_get_property): take ownership of the duped
-	string.
-
diff --git a/widgets/misc/ChangeLog.pre-1-4 b/widgets/misc/ChangeLog.pre-1-4
deleted file mode 100644
index 7a5cae8211..0000000000
--- a/widgets/misc/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,1903 +0,0 @@
-2003-05-29  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #43775
-	
-	* e-calendar-item.c (layout_set_day_text): calculate the day
-	character correctly
-	(e_calendar_item_draw_month): use it
-
-	* e-dateedit.c (rebuild_time_popup): use e_utf8_strftime
-	(e_date_edit_update_date_entry): ditto
-	(e_date_edit_update_time_entry): ditto
-
-	* e-calendar-item.c (layout_set_day_text): calculate the day
-	character correctly
-	(e_calendar_item_draw_month): use e_utf8_strftime and above
-	(e_calendar_item_show_popup_menu): use e_utf8_strftime
-	(e_calendar_item_recalc_sizes): use layout_set_day_text
-
-2003-05-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* e-multi-config-dialog.c (init): Added HIG-appropriate spacing/
-	padding to the main hbox into which the icons and page widgets 
-	are packed.
-
-2003-05-19  Larry Ewing  <lewing@ximian.com>
-
-	* e-charset-picker.c: port to GtkDialog.
-
-2003-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* e-combo-button.c (impl_destroy): guard against multiple destroys
-
-2003-05-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#42628]
-	* e-search-bar.c (search_now_verb_cb): Call
-	emit_search_activated() instead of emit_query_changed().
-
-2003-05-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #42177 ]
-	* e-dateedit.c (e_date_edit_init): remove the CAN_FOCUS flag.
-
-2003-05-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-combo-button.c (menu_deactivate_callback): Set in_button to
-	FALSE; this makes sure the button gets the right appearance after
-	the menu is popped down (the reason why this is necessary is that
-	the widget doesn't never gets to the leave_notify event).
-
-2003-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* e-search-bar.c (e_search_bar_set_text): trash e_utf8_gtk function
-	(e_search_bar_get_text): ditto
-
-2003-04-29  Dan Winship  <danw@ximian.com>
-
-	* e-dateedit.c (e_date_edit_forall): Remove this so that
-	GtkContainer's destroy method will destroy all of the internal
-	widgets. (This is how other compound-widgets-that-aren't-
-	meant-to-be-used-as-containers behave.) #41458
-
-2003-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (remove_bonobo_menus): Only do the actual remove
-	if the ui component actually has a container; this suppresses a
-	BonoboUI warning at each folder view switch.
-
-2003-04-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_update): Unref the metrics.
-	(e_calendar_item_draw): Re-use the widget's context instead of
-	creating a new one. Unref the metrics.
-	(e_calendar_item_draw_month): Unref the metrics. Don't create the
-	layout where it might be leaked by an early return. Unref the layout
-	before returning if we're outside the clip area.
-	(e_calendar_item_draw_day_numbers): Unref the metrics.
-	(e_calendar_item_recalc_sizes): Unref the metrics.
-	(e_calendar_item_convert_position_to_day): Unref the metrics.
-
-	* e-calendar.c (e_calendar_size_allocate): Unref the metrics.
-
-2003-04-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c (do_advanced): Change the border width and
-	padding to comply with the HIG. Fixes bug #41202.
-	(do_advanced): Changed the button ordering from Cancel/Save/OK to
-	Save/Cancel/OK to comply with the HIG. Fixes bug #41207.
-
-2003-04-08  Mike Kestner  <mkestner@ximian.com>
-
-	* e-search-bar.c (set_option): kill an old e_utf8_gtk usage
- 
-2003-04-06  Chris Toshok  <toshok@ximian.com>
-
-	* e-cell-percent.h: e_cell_percent_get_type returns GType, not
-	GtkType.
-	
-	* e-cell-percent.c (e_cell_percent_new): use g_object_new, not
-	gtk_object_new.
-
-2003-04-02  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_set_selection): For example;
-	a selection ending 2003-apr-02 does not fit into the remaining
-	shown days after 1969-dec. Stop assuming that it does.
-	
-2003-04-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_class_init)
-	(e_calendar_item_destroy)
-	(e_calendar_item_get_arg)
-	(e_calendar_item_set_arg)
-	(e_calendar_item_update)
-	(e_calendar_item_draw)
-	(e_calendar_item_draw_month)
-	(e_calendar_item_draw_day_numbers)
-	(e_calendar_item_recalc_sizes)
-	(e_calendar_item_convert_position_to_day): Nuke GdkFont and use
-	Pango's font measuring for everything.
-
-	* e-calendar-item.h: Ditto.
-
-	* e-calendar.c (e_calendar_init)
-	(e_calendar_size_allocate): Ditto.
-
-2003-03-30  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_destroy): Handle multiple
-	destroys.
-
-2003-03-28  JP Rosevear  <jpr@ximian.com>
-
-	* e-search-bar.c (clear_search): set the sub item to the default
-	as well
-
-2003-03-25  Dan Winship  <danw@ximian.com>
-
-	* e-calendar.c: #include gtkarrow.h
-	* e-combo-button.c: Likewise
-
-	* e-charset-picker.c: Update for e_notice move
-
-2003-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c: Updated to use GtkDialog instead of
-	GnomeDialog. Also fixed bug #39550 while I was at it.
-
-2003-03-10  Rodney Dawes  <dobey@ximian.com>
-
-	* e-calendar.c: Use GtkArrow instead of pixmaps
-	* e-combo-button.c: Use GtkArrow instead of pixmaps
-	* e-filter-bar.c: gtk_window_set_policy () is deprecated
-	* e-url-entry.c: Load the icon in a pixbuf instead of GdkPixmap
-	
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-url-entry.c (destroy): Removed unused variable.
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dropdown-button.c (menu_deactivate_cb): Removed debugging
-	spew.
-
-2003-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* e-url-entry.c (destroy): guard this so we don't try to free priv
-	multiple times.
-
-2003-02-25  Dan Winship  <danw@ximian.com>
-
-	* e-map.c (e_map_destroy): Use
-	g_signal_handlers_disconnect_by_func since
-	gtk_signal_disconnect_by_data doesn't seem to work right.
-	(e_map_set_scroll_adjustments): Likewise.
-
-2003-02-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-dateedit.c (on_date_popup_date_selected): Same as below.
-
-	* e-cell-date-edit.c (e_cell_date_edit_on_ok_clicked): Also
-	updated to use the new GDate API from glib 2.0
-
-	* test-calendar.c (on_selection_changed): Fixed to use glib 2.0's
-	GDate API.
-
-	* e-calendar-item.c (e_calendar_item_get_week_number): Port to
-	glib 2.0's GDate API.
-	(e_calendar_item_set_selection): Same.
-
-	* e-search-bar.c (append_xml_menu_item): Use
-	g_string_append_printf instead of g_string_sprintfa since the
-	latter is now deprecated.
-	(setup_bonobo_menus): Same.
-
-	* e-filter-bar.c (do_advanced): Use gtk_window_set_resizable()
-
-	* e-charset-picker.c: Fixes to make it build cleanly with
-	-DG_DISABLE_DEPRECATED
-	(add_charset): Escape _'s so we don't get underline weirdness due
-	to GtkLabel thinking the _ means to underline the next char.
-	(e_charset_picker_bonobo_ui_populate): Same here.
-
-2003-02-20  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: Make libemiscwidgets and libefilterbar dynamic
-	libraries instead of static so they can be portably linked into
-	the shlib components
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): Define MAP_DIR in terms of $(imagesdir).
-	(widgetsincludedir): Define in terms of $(privincludedir)
-
-2003-02-02  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-calendar-item.[ch]: Use Pango to draw.
-	(e_calendar_item_class_init): Add font_desc and week_number_font_desc
-	args.
-	(e_calendar_item_get_arg): Ditto.
-	(e_calendar_item_set_arg): Ditto.
-	(e_calendar_item_draw_month): Use Pango.
-	(e_calendar_item_draw_day_numbers): Ditto.
-
-	* e-calendar.c: Use Pango to draw. Specify just the size of the small
-	font to use, instead of all aspects of it.
-	(e_calendar_init): Produce the small font description and pass it to
-	the ECalendarItem.
-
-2003-02-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-dateedit.c (create_children): Don't request combo boxes that are
-	0 pixels tall.
-	(position_date_popup): Make this work when the button doesn't have
-	its own window.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* e-clipped-label.c (e_clipped_label_new): init the layout to
-	NULL.
-
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-title-bar.c (e_title_bar_construct): Make the label bold using
-	the new args to e_clipped_label_new().
-
-	* e-clipped-label.c (build_layout): Honor ->font_size and ->layout
-	in the newly created PangoLayout.
-	(e_clipped_label_new): New args font_weight, font_size.
-	(e_clipped_label_size_request): Removed unused variables.
-	(e_clipped_label_expose): Likewise.
-	(e_clipped_label_expose): Likewise.
-	(e_clipped_label_set_text): Likewise.
-	(e_clipped_label_recalc_chars_displayed): Likewise.
-
-	* e-clipped-label.h (struct _EClippedLabel): Add font_size, layout
-	members.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (widgetsincludedir): Version using $(BASE_VERSION).
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-multi-config-dialog.c (init): Change dialog from
-	OK/Apply/Cancel to Apply/Close/OK to be closer to the HIG.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (widgetsinclude_HEADERS): Ooops, remove
-	e-bonobo-widget.h.
-	(libemiscwidgets_a_SOURCES): Likewise, remove e-bonobo-widget.c.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): e-util-marshal.list, not
-	e-book-marshal.list.
-	(widgetsinclude_HEADERS): Add e-bonobo-widget.h.
-	(libemiscwidgets_a_SOURCES): Add e-bonobo-widget.c.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Images are now in $(datadir)/evolution/images
-	instead of $(datadir)/images/evolution.
-
-2002-12-10  Not Zed  <NotZed@Ximian.com>
-
-	* e-multi-config-dialog.c (impl_response): Removed the
-	g_assert_not_reached().  If you hit the close button on your
-	window it would abort, treat same as close.
-
-2002-12-09  Chris Toshok  <toshok@ximian.com>
-
-	* e-clipped-label.[ch]: rework this to be faster and deal more
-	correctly with the ellipsis.
-
-2002-12-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-search-bar.c (impl_dispose): dispose can be run multiple times
-	too ... bloody gobject crap.
-
-2002-11-27  Not Zed  <NotZed@Ximian.com>
-
-	* e-charset-picker.c: Add include of gnome-dialog.h
-
-	* *.[ch]: ran fix.sh script over everything.
-
-2002-11-26  Not Zed  <NotZed@Ximian.com>
-
-	* e-combo-button.c (impl_button_press_event): Dont grab_add
-	anymore on the button, gtk_button is changed in gtk2 not to do
-	this anymore.
-
-2002-11-15  Chris Toshok  <toshok@ximian.com>
-
-	* e-clipped-label.c (build_layout): new function, build pango
-	layout for string.
-	(e_clipped_label_size_request): pango-ize this, make the size
-	requested dependent on the label.
-	(e_clipped_label_expose): pango-ize this.
-	(e_clipped_label_recalc_chars_displayed): pango-ize this.
-
-2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-clipped-label.c (e_clipped_label_finalize): New.
-	(e_clipped_label_destroy): Removed.
-
-	* e-title-bar.c (destroy): Removed.
-	(impl_finalize): New.
-	(class_init): Install GObject::finalize handler instead of
-	GtkObject::destroy handler.
-
-2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-filter-bar.c: Changed to use g_object_*() and g_signal_*()
-	functions instead of gtk_object_*() and gtk_signal_*().
-	(destroy): Removed.
-	(dispose): New.
-	(class_init): Install GObject::dispose handler instead of
-	GtkObject::destroy handler.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* e-dateedit.[ch]: port to GObject.
-
-2002-11-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-multi-config-dialog.c (init): Use GObject functions instead of
-	GtkObject throughout.
-
-2002-11-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-multi-config-dialog.c (impl_destroy): Removed.
-	(impl_finalize): New.
-	(class_init): Override GObject::finalize, not GtkObject::destroy.
-
-	* e-config-page.c (impl_destroy): Removed.
-	(impl_finalize): New.
-	(class_init): Override GObject::finalize, not GtkObject::destroy.
-
-	* e-multi-config-dialog.c: Converted to a GtkDialog subclass
-	[instead of GnomeDialog].
-
-2002-11-07  JP Rosevear  <jpr@ximian.com>
-
-	* e-filter-bar.c: include gnome-dialog.h
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* .cvsignore: ignore the generated marshal source.
-	
-	* Makefile.am: add marshal stuff.
-
-	* e-util-marshal.list: marshaller list.
-
-	* e-search-bar.[ch]: gobjectify this.
-	
-2002-11-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-combo-button.c (impl_expose_event): Use
-	gtk_container_propagate_expose().
-
-2002-11-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* test-title-bar.c: #include <libgnomeui/gnome-ui-init.h> instead
-	of <libgnomeui/gnome-init.h>.
-	(main): Use a GtkLabel, not a GtkText.
-
-	* test-dropdown-button.c: #include <libgnomeui/gnome-ui-init.h>
-	instead of <libgnomeui/gnome-init.h>, and
-	<libgnomeui/gnome-stock-icons.h> instead of
-	<libgnomeui/gnome-stock.h>.
-
-	* test-dateedit.c: #include <libgnomeui/gnome-ui-init.h> instead
-	of <libgnomeui/gnome-init.h>.
-	(main): Use gnome_program_init().
-
-	* test-calendar.c: #include <libgnomeui/gnome-ui-init.h>.
-
-	* e-url-entry.c (button_clicked_cb): Pass NULL as the error arg to
-	gnome_url_show().
-
-	* e-title-bar.c (class_init): GTK2-ified.  Use GTK_TYPE_POINTER
-	instead of GTK_TYPE_GDK_EVENT.
-
-	* e-search-bar.c: Removed #include <libgnome/gnome-defs.h>.
-	#include <string.h>.
-	(class_init): GTK2-ified.
-	(e_search_bar_set_menu): Use GTK_OBJECT_GET_CLASS.
-	(e_search_bar_set_option): Likewise.
-
-	* e-messagebox.c (e_message_box_class_init): Updated to put
-	finalize in GObjectClass intead of GtkObjectClass.
-	(e_message_box_finalize): Likewise.
-	(e_message_box_construct): Just check if pixmap is NULL, instead
-	of pixmap->pixmap.
-
-	* e-messagebox.h: No {BEGIN,END}_GNOME_DECLS.
-	(e_message_box_get_type): Fix prototype, should return GtkType
-	instead of guint.
-
-	* e-map.c: Removed e_map_signals, which was unused.
-	(e_map_finalize): Update for the fact that finalize is now in
-	GObjectClass.
-	(e_map_class_init): Likewise.  Also GTK2-ify.
-	(e_map_draw): Removed.
-	(load_map_background): Pass NULL as the gdk_pixbuf_new_from_file()
-	error arg.
-
-	* e-dropdown-button.c (menu_position_cb): Added arg push_in.
-
-	* e-dateedit.c (e_date_edit_class_init): GTK2-ified.
-	(e_date_edit_show_date_popup): Constify local variable.
-	(e_date_edit_check_date_changed): Likewise.
-	(e_date_edit_check_time_changed): Likewise.
-	(e_date_edit_check_date_changed): Likewise.
-	(field_set_to_none): Constify arg text.
-	(e_date_edit_parse_date): Constify arg date_text.
-	(e_date_edit_parse_time): Constify arg time_text.
-
-	* e-dateedit.h: No {BEGIN,END}_GNOME_DECLS.
-
-	* e-combo-button.c (menu_position_func): New arg push_in.
-	(impl_draw): Removed.
-	(class_init): GTK2-ified.
-	(init): style->xthickness instead of style->klass->xthickness.
-
-	* e-config-page.c (class_init): GTK2-ified.
-
-	* e-clipped-label.c (e_clipped_label_size_request): Use
-	gtk_style_get_font().
-	(e_clipped_label_recalc_chars_displayed): Likewise.
-	(e_clipped_label_expose): Likewise.
-
-	* e-charset-picker.c: No #include <libgnome/gnome-defs.h> or
-	<libgnome/gnome-i18n.h> or <libgnome/gnome-stock.h>.  Also no
-	<gal/gunicode.h>.  On the other hand, #include <gtk/gtkvbox.h>.
-	(e_charset_picker_new): Make locale_charset const.
-	(e_charset_picker_bonobo_ui_populate): Make locale_charset const.
-
-	* e-cell-percent.c: #include <stdio.h> for sscanf().
-
-	* e-cell-percent.h: Removed BEGIN_GNOME_DECLS, END_GNOME_DECLS.
-
-	* e-cell-percent.c: Do not #include <libgnomeui/gnome-stock.h>.
-
-	* e-cell-date-edit.c: Do not #include <libgnomeui/gnome-stock.h>.
-	Added a bunch of #includes for GTK stuff.
-	(e_cell_date_edit_on_ok_clicked): Constified variable.
-
-	* e-calendar-item.c: Do not #include <libgnome/gnome-defs.h>.
-	(e_calendar_item_class_init): Use GTK_TYPE_POINTER instead of
-	GTK_TYPE_GDK_POINTER.
-	(e_calendar_item_class_init): GTK_CLASS_TYPE() instead of
-	object_class->type.
-	(e_calendar_item_class_init): No gtk_object_class_add_signals().
-	(e_calendar_item_update): style->[xy]thickness instead of
-	style->klass->[xy]thickness.
-	(e_calendar_item_draw): Likewise.
-	(e_calendar_item_draw_month): Likewise.
-	(e_calendar_item_draw_month): Likewise.
-	(e_calendar_item_recalc_sizes): Likewise.
-	(e_calendar_item_convert_position_to_day): Likewise.
-	(e_calendar_item_update): Use gtk_style_get_font().
-	(e_calendar_item_draw_month): Likewise.
-	(e_calendar_item_draw_day_numbers): Likewise.
-	(e_calendar_item_convert_position_to_day): Likewise.
-	(e_calendar_item_recalc_sizes): Likewise.
-	(e_calendar_item_signal_emission_idle_cb): Removed check for
-	GTK_OBJECT_DESTROY.
-	(e_calendar_item_position_menu): Add push_in arg.
-
-	* e-calendar.c (e_calendar_draw): Remove.
-	(e_calendar_size_request): style->[xy]thickness instead of
-	style->klass->[xy]thickness.
-	(e_calendar_size_allocate): Likewise.
-	(e_calendar_get_border_size): Likewise.
-	(e_calendar_size_allocate): Get font from style with
-	gtk_style_get_font().
-
-	* e-calendar-item.h: #include <libgnomecanvas/gnome-canvas.h>
-	instead of <libgnomeui/gnome-canvas.h>.
-	* e-calendar.c: Likewise for
-	<libgnomecanvas/gnome-canvas-widget.h>.
-
-	* Makefile.am: Don't compile e-bonobo-widget.c, e-bonobo-widget.h.
-	[Unused right now, so we can avoid porting until, and if, they are
-	needed.]
-
-	* e-filter-bar.c: Do not #include <libgnome/gnome-defs.h>.  Do not
-	#include <libgnomeui/gnome-stock.h>.  #include <gtk/gtksignal.h>.
-	Also remove gal #includes.
-	(do_advanced): Add some GTK_SIGNAL_FUNC() casts.
-	(menubar_activated): Likewise.
-	(menubar_activated): Likewise.
-
-2002-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-map.h: Do not #include <libgnome/gnome-defs.h>.
-
-2002-10-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-search-bar.c (clear_search): Emit a search_activated signal.
-	(e_search_bar_set_item_id): Revert to original implementation.
-
-2002-10-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c (option_changed): If the clear button was
-	pressed, we want the entry to be sensitive (not insensitive).
-
-	* e-search-bar.c (e_search_bar_set_item_id): If the item id is
-	CLEAR_ID, we want to select the first item (0) but still set the
-	esb->item_id to CLEAR_ID.
-	(set_find_now_sensitive): Don't bother getting the GtkEntry text,
-	we don't even use it?
-	(clear_search): Set the item id as E_SEARCHBAR_CLEAR_ID rather
-	than 0 so that it can be checked for.
-
-2002-10-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	[#26128, thanks to Federico Mena Quintero <federico@ximian.com>
-	for providing this fix.]
-
-	* e-search-bar.c (activate_by_subitems): gtk_widget_grab_focus()
-	on the entry when adding it in.
-
-2002-10-11  JP Rosevear  <jpr@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_ensure_days_visible): check
-	if the selection fits in the leftover days
-
-2002-09-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Add a small delay to the switching of pages in the multi-config
-	dialog.  This makes keyboard navigation slightly nicer, and also
-	happens to fix mysterious bug #28931.]
-
-	* e-multi-config-dialog.c: New constant SWITCH_PAGE_INTERVAL.  New
-	members set_page_timeout_id and set_page_timeout_page in
-	EMultiConfigDialogPrivate.
-	(init): Initialize new member variables.
-	(table_cursor_change_callback): Set up a timeout instead of
-	switching right away.
-	(set_page_timeout_callback): Timeout function to switch page after
-	a small delay.
-	(impl_destroy): Remove a pending timeout.
-
-2002-09-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-multi-config-dialog.c (create_page_container): Don't set up
-	the description label here.
-
-2002-09-24  Not Zed  <NotZed@Ximian.com>
-
-	* e-search-bar.c (clear_search): Clear search by setting text to
-	"" and search to first search.
-
-	* e-filter-bar.c (option_changed): Revert change of 2002-08-29
-	below, always do advanced search if we have the advanced id.
-	Handle clear elsewhere.
-	(menubar_activated): If we get the advanced menu, set the advanced
-	option menu, and let that handle it, rather than doing it
-	ourselves.  For #31060 & #29625.
-
-2002-09-22  Dan Winship  <danw@ximian.com>
-
-	* e-filter-bar.c: Fix some non-ANSI switch statements.
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	* e-search-bar.c (subitem_activated_cb): need to make the find now
-	button sensitive when you select something from a submenu.
-
-2002-08-29  Peter Williams  <peterw@ximian.com>
-
-	* e-filter-bar.c (option_changed): If the item is ADVANCED_ID, check
-	the query and efb->setquery to see whether we should pop up the advanced
-	dialog or clear an advanced search. Fixes #29625.
-
-2002-08-21  Peter Williams  <peterw@ximian.com>
-
-	* e-search-bar.c (clear_search): Don't set the item id; clear search
-	isn't in the menu anymore. Fixes #29211.
-
-2002-08-22  JP Rosevear  <jpr@ximian.com>
-
-	* e-dateedit.c (e_date_edit_parse_date): don't adjust for two
-	digit dates here, the e_time_parse routines do that now
-
-2002-08-06  Not Zed  <NotZed@Ximian.com>
-
-	* e-filter-bar.c (menubar_activated): Set the query text into the
-	filter name when saving it, for #10979.
-
-2002-07-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_signal_emission_idle_cb): Add
-	missing cast.
-	(e_calendar_item_signal_emission_idle_cb): Likewise.
-
-	* e-search-bar.c (init): Don't initialize dropdown_menu here
-	anymore since we got rid of it.
-
-	* e-search-bar.h (struct _ESearchBar): Removed member
-	dropdown_menu.
-
-2002-07-22  Peter Williams  <peterw@ximian.com>
-
-	* e-filter-bar.c (do_advanced): Break out the code for creating
-	the advanced rule editor into a separate function, so that...
-	(menubar_activated): ... can also create an Advanced dialog;
-	needed when the Search menu's advanced button is used.
-	(option_changed): Change this to call the function instead of
-	having all the code to itself.
-
-	* e-search-bar.h: Add id's for the FIND_NOW and CLEAR actions
-	so that other code (eg, EFilterBar) doesn't get confused by
-	an old id being used when the search-activated signal gets
-	emitted.
-
-	* e-search-bar.c (clear_search): Set the item_id to CLEAR
-	before emitting the signal.
-	(search_now_verb_cb): Just make this emit query_changed,
-	as the button in the toolbar does.
-
-2002-07-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #27854, spurious warnings from ESearchBar.]
-
-	* e-search-bar.c (setup_standard_verbs): Set the <commands> part
-	of the XML manually with bonobo_ui_component_set() otherwise the
-	verbs don't get added on the other side for us to be able to do
-	bonobo_ui_component_set_prop().
-	(setup_bonobo_menus): New, menu setup code taken from
-	update_bonobo_menus().
-	(remove_bonobo_menus): New; removes the Bonobo menus.
-	(update_bonobo_menus): Rewritten, just call remove_bonobo_menus()
-	first and setup_bonobo_menus() then.
-	(e_search_bar_set_ui_component): Call setup_bonobo_menus() and
-	remove_bonobo_menus() as appropriate instead of just
-	update_bonobo_menus().
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (update_sensitivity): Removed.
-	(set_find_now_sensitive): New.
-	(entry_changed_cb): Always make the "Find Now" button and menu
-	item sensitive here.
-	(emit_search_activated): ...And here, always insensitive.
-	(setup_standard_verbs): Always start up insensitive.
-	(activate_button_clicked_cb): Make the entry grab the focus.
-	(clear_button_clicked_cb): Likewise.
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (subitem_activated_cb): Don't emit
-	"search_activated" here.
-	(e_search_bar_set_subitem_id): And not here either.
-	(e_search_bar_set_text): Same.
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #7736.]
-
-	* e-search-bar.c (activate_by_subitems): Don't set the entry to be
-	an empty string here.
-
-2002-06-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-filter-bar.c (build_items): Put the numbers in front of the
-	rules only if type is zero [i.e. not in the option menu].
-
-2002-05-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-filter-bar.c (dup_item_no_subitems): New helper function.
-	(build_items): g_strdup() the text for all the items.  Prepend the
-	user-defined items with an order number.
-	(free_built_items): New function to free the array returned by
-	build_items, freeing the text strings too [since now they are
-	newly allocated instead of just pointing to the exiting ones].
-	(generate_menu): Call free_built_items() on the built items
-	instead of just g_array_free().
-	(set_option): Likewise.
-
-2002-05-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (update_bonobo_menus): Put the stuff in
-	/menu/Searchplaceholder/Search instead of /menu/Search.
-
-	* e-combo-button.c (impl_draw): New, overrides GtkWidget::draw.
-	(impl_expose_event): New, overrides GtkWidget::expose_event.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-filter-bar.c (build_items): Prepend the advanced menu with a
-	separator.
-
-	* e-filter-bar.h: Add E_FILTERBAR_SEPARATOR.  Rename the "Advanced
-	Search..." menu item into "Advanced...".
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (activate_by_subitems): Strip underscores from
-	the menu item labels.
-
-2002-04-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-multi-config-dialog.c (fill_in_pixbufs): Don't print out the
-	colors here unless debugging is turned on.
-
-2002-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-multi-config-dialog.c (e_multi_config_dialog_add_page):
-	Updated this to match the changed function name in gal.
-
-2002-04-09  Dan Winship  <danw@ximian.com>
-
-	* e-search-bar.c (e_search_bar_construct, add_button): Oops. The
-	previous change made the search bar widgets get packed in the
-	wrong order. So use gtk_box_pack_end instead in add_button and add
-	the two buttons in reverse order. It's all good now. Noticed by
-	Ettore, who I then promptly blamed for it. Sorry Ettore!
-
-2002-04-08  Dan Winship  <danw@ximian.com>
-
-	* e-search-bar.c (e_search_bar_construct): Construct the buttons
-	earlier so that the option-menu-setup code that tries to adjust
-	the button sensitivity won't fail and g_warn.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* e-multi-config-dialog.c (e_multi_config_dialog_show_page): show
-	a specific page number
-
-	* e-multi-config-dialog.h: new proto
-
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-multi-config-dialog.c: Change the ETable specs so it doesn't
-	sort.
-
-2002-03-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (update_bonobo_menus): Add accelerators for "Find
-	Now" and "Clear".
-
-	* e-filter-bar.h: Change search labels as suggested in Anna's
-	redesign [#16246].
-
-2002-03-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (update_bonobo_menus): Remove all the SearchBar
-	items before setting them up again.
-	(free_menu_items): New.
-	(impl_destroy): Call it.
-	(set_menu): Call it here too before adding the new items.
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (verb_name_from_id): New.
-	(e_search_bar_set_menu_sensitive): Rewritten using it.
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (update_bonobo_menus): No accelerator for
-	"FindNow".
-	(add_button): Add a one-pixel padding to the button.
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (update_bonobo_menus): Rename the "Search Now"
-	menu entry to "Find Now".  Rename the corresponding verb to
-	"ESearchBar:FindNow".
-	(update_sensitivity): Updated accordingly.
-	(setup_standard_verbs): Likewise.
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (update_sensitivity): New halper function to
-	update the sensitivity of the commands.
-	(entry_changed_cb): New callback to make the activate_button and
-	the "Find Now" verb sensitive only if the entry has some contents.
-	(activate_by_subitems): Connect the callback here.
-	(setup_standard_verbs): Call update_sensitivity() here.
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (init): Init clear_button to NULL.
-	(add_button): New helper function to add a button to the search
-	bar with the right spacing etc.
-	(clear_search): New helper function.
-	(add_activate_button): Removed.
-	(clear_button_clicked_cb): New.
-	(e_search_bar_construct): Just add the button here using
-	`add_button'.  Also add a clear_button.
-	(clear_verb_cb): Rewritten by means of `clear_search()'.
-
-	* e-search-bar.h (ESearchBar): Add clear_button.
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (search_now_verb_cb): New, implementation for a
-	new "SearchNow" verb.
-	(setup_standard_verbs): Create verb here.
-	(update_bonobo_menus): Add SearchNow menu item.
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (clear_verb_cb): New.
-	(setup_standard_verbs): New.
-	(e_search_bar_set_ui_component): Call it if a new
-	BonoboUIComponent is set.
-	(append_xml_menu_item): New helper function.
-	(update_bonobo_menus): Use it.  Also add a "Clear" menu item.
-	(e_search_bar_construct): @menu_items can be NULL now.
-	(e_search_bar_new): Same here.
-	(set_menu): Work with NULL items.
-
-	* e-filter-bar.c (menubar_activated): Don't handle
-	E_FILTERBAR_RESET_ID anymore.
-
-	* e-filter-bar.h: Remove `E_FILTERBAR_RESET_ID' and `E_FILTERBAR_RESET'.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (init): Init various members to NULL.
-	(set_dropdown): Removed.
-	(add_dropdown): Removed.
-	(set_menu): New.
-	(add_menu_items): New.
-	(set_option): No need to setup the dropdown size here anymore.
-	(verb_cb): Function implementing the search menu verbs.
-	(update_bonobo_menus): New.
-	(e_search_bar_set_ui_component): New.
-
-	* e-search-bar.h: Remove the dropdown button stuff from struct
-	ESearchBar.  Add `uic' and `items' members.
-
-	* e-filter-bar.c (e_filter_bar_new): Get a @uic arg.
-
-2002-03-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-multi-config-dialog.c (init): Set horizontal scroll policy to
-	GTK_POLICY_NEVER here.  Don't set usize here.  Changed RGBA_COLOR
-	to RGB_COLOR.  Turned on horizontal resize.
-
-2002-03-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-charset-picker.c (add_charset): If the charset item doesn't
-	have a class (aka "Unknown"), don't write a class name, instead
-	just give the charset name as the menu item label. Fixes bug
-	#14753.
-
-2002-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-multi-config-dialog.c: Added alpha blending here.
-
-2002-03-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-multi-config-dialog.c: Removed Page struct.
-	(e_multi_config_dialog_add_page): Select the initial row after
-	appending to the model.
-
-2002-03-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-multi-config-dialog.c (init): Use Use e_table_memory_store
-	instead of e_table_memory_callbacks.  Use e_cell_vbox to include a
-	pixbuf cell and a text cell.
-
-2002-03-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-multi-config-dialog.c (init): Use GNOME_STOCK_BUTTON_CLOSE,
-	not GNOME_STOCK_BUTTON_CANCEL.
-	(do_close): Renamed from `cancel'.
-	(do_apply): Renamed from `apply'.
-	(do_ok): Renamed from `ok'.
-
-2002-03-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-multi-config-dialog.c: Rename Page.widget -> Page.page_widget;
-	it is now an EConfigPage instead of just a GtkWidget.  Add
-	`num_unapplied' to EMultiConfigDialogPrivate.  Derive from
-	GnomeDialog, not GtkWindow.
-	(update_buttons): New function to update the sensitiveness of the
-	buttons according to whether all the settings have been applied or
-	not.
-	(page_new): Likewise.
-	(create_page_container): Renamed from `create_page_widget'.
-	(init): Add Apply/OK/Cancel buttons to the dialog.  Init
-	->num_unapplied to zero.
-	(page_changed_callback): New, callback for the page's "changed"
-	signal.
-	(e_multi_config_dialog_add_page): Connect the callback, update
-	->num_unapplied, update the buttons by calling `update_buttons'.
-	(ok): New function for handling the OK button.
-	(apply): New function for handling the Apply button.
-	(cancel): New function for handling the Cancel button.
-	(impl_clicked): Implementation for the GnomeDialog's ::clicked
-	signal.
-	(class_init): Install.
-
-	* test-multi-config-dialog.c (add_pages): Update to use
-	EConfigPages instead of plain GtkWidgets.
-
-	* e-multi-config-dialog.c, e-multi-config-dialog.h: Derive from
-	GnomeDialog, not GtkWindow.
-
-	* e-config-page.c: New.
-	* e-config-page.h: New.
-
-2002-03-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-multi-config-dialog.c: Don't display a header in the table on
-	the left.
-
-2002-03-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* test-multi-config-dialog.c: New.
-	* test-multi-config-dialog.h: New.
-
-	* e-multi-config-dialog.c: New.
-	* e-multi-config-dialog.h: New.
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* e-filter-bar.c (init): preserve behavior - hook search_activated
-	signal to the same function as query_changed.
-
-	* e-search-bar.c (emit_search_activated): new function.
-	(entry_activated_cb): use emit_search_activated instead of
-	emit_query_changed.
-	(subitem_activated_cb): same.
-	(activate_button_clicked_cb): same.
-	(class_init): add the search_activated signal.
-	(idle_activate_hack): rename idle_change_hack to this, and
-	emit_search_activated.
-	(e_search_bar_construct): idle_change_hack -> idle_activate_hack.
-	(e_search_bar_set_subitem_id): emit_search_activated instead of
-	emit_query_changed.
-	(e_search_bar_set_text): same.
-
-	* e-search-bar.h (struct _ESearchBarClass): add a search_activated
-	signal.
-
-2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-combo-button.c (set_icon): gtk_widget_show() the icon_pixmap
-	if the specified icon is not NULL.
-
-2002-02-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-combo-button.c (set_icon): Work with a NULL @pixbuf as well
-	[in that case, just hide the current icon widget].
-	(e_combo_button_set_icon): Remove the precondition about @pixbuf
-	being non-NULL.
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* e-url-button.[hc]: remove briefly used files
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-	
-	* e-url-entry.[hc]: button/entry combo that launchs the gnome url
-	handler on the entry text when the button is clicked
-
-	* Makefile.am: build new files
-	
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: build new files
-
-	* e-url-button.[hc]: button widget that when clicked slurps the
-	url of an entry and launchs the gnome url handler on the text
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Use GNOME_FULL_CFLAGS and GNOME_FULL_LIBS.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-combo-button.c: Remove member `separator' from
-	`EComboButtonPrivate'.  New members `icon', `label'.
-	(init): There shall be no separator no more.  Init `icon' and
-	`label' to %NULL.
-	(e_combo_button_construct): Set no relief.
-	(e_combo_button_new): Don't get a @menu arg anymore.
-	(e_combo_button_construct): Likewise.
-	(e_combo_button_set_icon): New.
-	(e_combo_button_set_label): New.
-	(e_combo_button_set_menu): New.
-	(impl_clicked): New, overriding the "clicked" method for
-	GtkButton.
-	(class_init): Install.
-	(impl_button_release_event): Removed.
-	(class_init): No need to override ::release_event with this
-	anymore.
-	(impl_released): New, override for the GtkButton::released method.
-	(class_init): Install.
-
-2002-01-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-charset-picker.c: Added iso-8859-8 (Hebrew; Visual) to the
-	list of charsets in the menu. Fixes bug #15655.
-
-2001-12-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-combo-button.c: New.
-	* e-combo-button.h: New.
-
-2001-11-21  Not Zed  <NotZed@Ximian.com>
-
-	* e-filter-bar.c (menubar_activated): Mark the dialogue as already
-	up so we dont allow multiple dialogues up.  Behaviour fix part of
-	#15745.
-
-2001-11-28  Damon Chaplin  <damon@ximian.com>
-
-	* e-map.c: updated to new version from Ximian Setup Tools.
-	Fixes bug #7641.
-
-2001-11-27  Damon Chaplin  <damon@ximian.com>
-
-	* e-dateedit.c (e_date_edit_get_date): if allow_no_date_set is FALSE,
-	return the last valid date entered, even if the field is currently
-	empty. Fixes bug #15749.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* e-dateedit.c (e_date_edit_set_date_and_time_of_day): set both
-	the date and the time of day in one call, creating only a single
-	changed signal
-
-	* e-dateedit.h: add proto
-
-2001-11-05  Christopher James Lahey  <clahey@ximian.com>
-
-Based on a patch by Damon Chaplin <damon@ximian.com>
-
-	* e-cell-date-edit.c: Connect to the button_press signal on the
-	popup and do the grab correctly so that this dialog behaves
-	properly when the user clicks it away.  Also, changed all
-	instances of setting of popup_shown field of ECellPopup to call
-	e_cell_popup_set_shown.  Fixes Ximian bug #14016.
-
-2001-10-31    <NotZed@Ximian.com>
-
-	* e-filter-bar.c (build_items): Snotty code so we only disconnect
-	to rules we no longer have, etc.
-
-2001-11-01  Not Zed  <NotZed@Ximian.com>
-
-	* e-filter-bar.c (build_items): Ref and connect to rule changed
-	here, also clear out previous ref's.
-	(generate_menu): No longer connect to rules, or reset rule array.
-	(set_option): Dont reset option rules array.
-	(context_rule_removed): Disconnect changed event on rule.
-	(clear_rules): Fujnction to clear rules from an array.
-	(destroy): Disconnect from context signals, and clear rules arrays.
-
-	* e-filter-bar.h: Remove hash table for change id's.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* e-dateedit.c (e_date_edit_set_time_of_day): emit signal when time
-	set to none/empty.
-
-2001-10-30    <NotZed@Ximian.com>
-
-	* e-filter-bar.c (generate_menu): Hook to rule changed events.
-	(destroy): Free change id table/unconnect to signals.
-	(init): Setup change id table.
-	(e_filter_bar_new): Hook onto rule removed signal.
-	(context_rule_removed): If rule removed, disconnect from signal handler.
-	(rule_changed): For changed rules, also rebuild menu.  Fixed #12233.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell-date-edit.c (e_cell_date_edit_set_popup_values): try to parse
-	just a date first, and if that works we assume it is a DATE value,
-	so we clear the time field in the popup.
-	(e_cell_date_edit_on_ok_clicked): if the time field is empty, use a
-	DATE value.
-	Also removed some debug messages.
-
-2001-10-30    <NotZed@Ximian.com>
-
-	* e-filter-bar.c (set_option): Set the item to the option_base on
-	it, so the current item is set.  Fix for #7081.
-
-2001-10-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-date-edit.c (e_cell_date_edit_get_popup_pos): Adapt to
-	the new ECellPopup signature.
-
-2001-10-29  Damon Chaplin  <damon@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_signal_emission_idle_cb): ref
-	the ECalendarItem and check if it gets destroyed, to try to avoid a
-	free memory write.
-
-	* e-dateedit.c (e_date_edit_set_time_of_day): allow setting the time
-	to empty by passing hour as -1.
-
-2001-10-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c (rule_editor_clicked): Don't add the menu item
-	here, do this in the context_changed signal callback instead.
-	(context_changed): rebuild the search menu.
-	(set_menu): Copy the items into a default_items list so we can
-	regenerate the menu when something changes. Then call
-	generate_menu().
-	(generate_menu): Do what set_menu() used to do.
-	(e_filter_bar_new): Don't do a rule_context_load() anymore since
-	we don't need to.
-	(destroy): free the default_items list.
-
-2001-10-23  Damon Chaplin  <damon@ximian.com>
-
-	* e-search-bar.c (copy_subitems): copy the translate field over as
-	well. Should fix an uninitialized memory read.
-
-2001-10-23  Damon Chaplin  <damon@ximian.com>
-
-	* e-dateedit.c (e_date_edit_check_date_changed):
-	(e_date_edit_check_time_changed): clear the struct tm fields to keep
-	purify happy.
-
-2001-10-22  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell-date-edit.c (e_cell_date_edit_set_popup_values): 
-	(e_cell_date_edit_update_cell): use the new ECellText methods to get
-	the text and set the value.
-
-	* e-cell-percent.c: new subclass of ECellText to display & edit a
-	percentage value.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* e-dateedit.c (e_date_edit_check_date_changed): Keep us from
-	reading tmp_tm uninitialized, so purify won't complain.
-
-2001-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-charset-picker.c (e_charset_picker_bonobo_ui_populate): Now
-	takes a menu path argument.
-
-2001-10-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: added BONOBO_GNOME_CFLAGS to make it compile with
-	latest Bonobo
-
-2001-10-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-date-edit.c (e_cell_date_edit_get_popup_pos): Call
-	gnome_canvas_world_to_window here.  Finishes fixing Ximian bug
-	#2613.
-
-2001-09-18  Damon Chaplin  <damon@ximian.com>
-
-	* e-dateedit.c (e_date_edit_grab_focus): grab focus to the date entry
-	or the time entry, depending on which is visible. Fixes bug #7237.
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* e-dateedit.h: add prototype for e_date_edit_set_editable.
-
-	* e-dateedit.c (e_date_edit_set_editable): new function, analogous
-	to gtk_entry_set_editable: let's the user select but not edit (or
-	in this case, bring up the calendar view.)
-
-2001-09-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-search-bar.c (set_dropdown): Don't unref the old dropdown, we
-	don't "own" it.
-
-2001-09-13  Larry Ewing  <lewing@ximian.com>
-
-	* e-search-bar.c (set_dropdown): unref the old dropdown_menu if
-	there is one.
-
-2001-09-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c (menubar_activated): No longer need the context
-	in order to clone a FilterRule.
-	(option_changed): Same.
-
-2001-09-06  Anna Marie Dirks  <anna@ximian.com>
-
-	* e-filter-bar.c: added a default size for the saved search
-	dialog of 600 x 300 such that it opens at a usable size. 
-	this fixes bug #7083.
-
-2001-09-05  Anna Marie Dirks  <anna@ximian.com>
-
-	* e-search-bar.c (add_activate_button): added a wee bit of 
-	padding around the find now label in response to bug #7049.
-
-2001-08-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-search-bar.c (e_search_bar_set_ids): New function to set the
-	item_id and the subitem_id simultaneously.
-
-2001-08-16  Damon Chaplin  <damon@ximian.com>
-
-	* e-dateedit.c: added e_date_edit_get/set_make_time_insensitive()
-	which makes the time field insensitive rather than hiding it.
-	I'm not sure we're going to actually use this now, though.
-
-2001-08-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (activate_by_subitems): Set the horizontal usize
-	of the entry to 4.
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* e-filter-bar.c (option_changed): Adjusted for renamed ESearchBar
-	functions.
-	(menubar_activated): Adjusted for renamed ESearchBar functions.
-
-	* e-search-bar.c: Renames some of the horrible function names:
-	s/option_choice/item_id/, s/suboption_choice/subitem_id/.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-cell-date-edit.c (e_cell_date_edit_destroy): Destroy, do not
-	unref, the popup_window.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-search-bar.c (activate_by_subitems): Correctness fixes for
-	when the entry and submenu must be interchanged.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	*Please* add accessor functions instead of just object arguments!
-
-	* e-search-bar.c (e_search_bar_set_option_choice): New function.
-	(e_search_bar_set_suboption_choice): New function.
-	(e_search_bar_set_text): New function.
-	(impl_set_arg): Use the functions above instead of setting things
-	directly.
-	(add_dropdown): If the item is a separator, set it as insensitive.
-	(activate_by_subitems): Handle the translate field in the subitem
-	structure.  Also, allow the creation of separators by having NULL
-	text strings in the subitems.
-	(set_option): If the item is a separator, set it as insensitive.
-	(set_option): Do not use the subitem_garbage hack.  Do proper
-	memory management instead.
-	(e_search_bar_set_suboption): New function to change the suboption
-	items in a search bar.
-
-	* e-search-bar.h (ESearchBarSubitem): Added a `translate' field.
-	This API sucks so much it is not funny.
-	(ESearchBar): Removed the subitem_garbage hack.  Please do proper
-	memory management.
-
-2001-08-14  Jon Trowbridge  <trow@ximian.com>
-
-	* e-search-bar.c (activate_by_subitems): Oops... initial
-	suboption_choice should be subitems[0].id, not 0.
-
-2001-08-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-search-bar.c (impl_destroy): Oops, we didn't need to unref all
-	of the widgets, just a few.
-
-2001-08-10  Jon Trowbridge  <trow@ximian.com>
-
-	* e-filter-bar.h: Set the subitems to NULL in the pre-defined
-	ESearchBarItems.
-
-	* e-filter-bar.c (rule_editor_clicked): Set the ESearchBarItem's
-	subitems to NULL.
-	(build_items): Set the ESearchBarItem's subitems to NULL.
-	(e_filter_bar_new): Set the ESearchBarItem's subitems to NULL.
-
-	* e-search-bar.c: Added support for subitems, so that a search
-	option can key off of another option menu rather than just an
-	entry.
-
-2001-08-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c (destroy): Free all the goodies that we allocate
-	at construct time and unref the rule context.
-	(class_init): Override the destroy method.
-
-2001-08-09  Anna Marie Dirks <anna@ximian.com>
-
-	Fixes bug #6918
-	
-	* e-filter-bar.h: Changed the "Save As.." menu item to 
-	"Add to Saved Searches".
-
-2001-08-09  Anna Marie Dirks <anna@ximian.com> 
-	* e-filter-bar.h : changed the E_FILTERBAR_RESET label from
-	"Show All" to "Clear" to alleviate confusion about whether
-	"Show All" means that hidden messages are also shown or not.
-	(See ximian bug #6743) 	
-
-2001-08-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_destroy): Chain to the
-	destroy handler in the parent class!
-
-	* e-clipped-label.c (e_clipped_label_destroy): Likewise.  Sigh.
-
-	* e-dropdown-button.c (impl_destroy): Likewise.  Double sigh.
-
-2001-08-08  Anna Marie Dirks <anna@ximian.com> 
-
-	* e-search-bar.c: Re-labeled the "Activate" button "Find Now".
-
-2001-08-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-bonobo-widget.c: New.
-	* e-bonobo-widget.h: New.
-
-2001-08-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Added an "Activate" button to the search bar.]
-
-	* e-search-bar.c (submit_button_clicked_cb): Callback for the
-	"clicked" signal on the activate button.
-	(add_submit): New function to add a "Activate" button on the right
-	of the entry.
-	(e_search_bar_construct): Call it.
-	(add_spacer): Removed.
-	(e_search_bar_construct): Don't call it.
-	(find_id): Remove debugging message.
-	(put_in_spacer_widget): New utility function to create a
-	GtkEventBox with a border width of one and put a widget into it.
-
-2001-08-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-title-bar.c: Make the close icon as large as the pin icon so
-	the bar doesn't change size when it switches between them.
-	(e_title_bar_construct): Add some horizontal padding to the label
-	to make it look nicer.
-
-2001-08-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_mark_day): Request an update.
-	(e_calendar_item_mark_days): Likewise.
-
-2001-07-24  Damon Chaplin  <damon@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_show_popup_menu): don't show the
-	year in the popup submenu for the months, and center the months.
-	Fixes
-
-2001-07-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c (rule_editor_destroyed): When the dialog gets
-	closed, always make sure the entry widget becomes sensitive again.
-	(menubar_activated): Don't use FILTER_SOURCE_INCOMING because
-	that's not what we want, we want (I think) NULL (at least with
-	NULL, bug #4490 goes away).
-
-2001-07-16  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #2901.
-
-	* e-dateedit.c (e_date_edit_parse_date): Use e_time_parse_date().
-	(e_date_edit_parse_time): Use e_time_parse_time().
-
-2001-07-17  jacob berkman  <jacob@ximian.com>
-
-	* e-search-bar.c (set_dropdown): don't unset _CAN_FOCUS
-
-	* e-dropdown-button.c (menu_deactivate_cb): un-toggle ourself
-	(impl_toggled): override the toggled rather than clicked signal.
-	if we are active, popup the menu; else, popdown
-
-	these fix ximian #2016
-
-2001-07-02  Damon Chaplin  <damon@ximian.com>
-
-	* e-calendar-item.c: 
-	* e-cell-date-edit.c: 
-	* e-dateedit.c: added functions to set a callback to get the current
-	time, which is used instead of localtime(). We need this as we have to
-	use our own timezones.
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-charset-picker.c (e_charset_picker_bonobo_ui_populate): Take a
-	callback function and user_data so that we can add listeners to
-	each of the menu items.
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Updated to build e-charset-picker.c
-
-	* e-charset-picker.[c,h]: Moved here from gal.
-	(e_charset_picker_bonobo_ui_populate): New function to populate a
-	bonobo-ui with a charset picker menu.
-
-2001-06-14  Damon Chaplin  <damon@ximian.com>
-
-	* e-map.[hc]: copied the EMap widget verbatim from Ximian Setup Tools.
-	Hmm. Maybe it should go in gal, but its not a very general widget.
-	
-	* Makefile.am (INCLUDES): defined MAP_DIR for e-map.c.
-	(libemiscwidgets_a_SOURCES): added e-map.[hc].
-
-2001-05-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-dropdown-button.c (impl_button_press_event): Removed unused
-	variable.
-
-	* e-cell-date-edit.c (e_cell_date_edit_rebuild_time_list): Removed
-	unused variable.
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* misc/e-filter-bar.h: xgettext does not find N_() in #defines. So
-	created fake enum. Also removed spaces before "..."
-
-2001-04-24  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-calendar-item.c, e-calendar.c, e-cell-date-edit.c,
-	e-clipped-label.c, e-dateedit.c, e-dropdown-button: 
-	Added #include <glib.h> and moved corresponding local headers 
-	to the top.
-	
-2001-04-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-search-bar.c (e_search_bar_get_option_choice): New function,
-	because it is ridiculous to have to hunt down object arguments to
-	fetch values.
-	(e_search_bar_get_text): Likewise.
-	(impl_get_arg): Use the functions above so that we have to
-	maintain only one version of the getters.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-calendar.c: More header fixes.
-	* e-cell-date-edit.c: Same.
-	* e-dateedit.[ch]: Same.
-	* e-title-bar.c: Same here.
-	* e-search-bar.c: More header fixes.
-	* test-calendar.c: Same here.
-	
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-dropdown-button.c: Replace #include <gtk/gtk.h>
-	* e-dropdown-button.h: Remove #include <gnome.h>
-	* e-filter-bar.c: Replace #include <gtk/gtk.h>
-	* e-filter-bar.h: Replace #include <gtk/gtk.h>
-	* e-messagebox.c: Add #includes to count for removed <gnome.h> in
-	e-messagebox.h:
-	* e-messagebox.h: Replace #include <gnome.h>
-	* e-search-bar.c: Replace #include <gnome.h>
-	* e-search-bar.h: Same here
-	* test-calendar.c: Remove #include <gnome.h>
-	* test-dateedit.c: Replace #include <gnome.h>
-	* test-dropdown-button.c: Same here.
-	* test-title-bar.c: Same here.
-
-2001-03-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c (rule_editor_clicked): Validate the filter rule.
-
-2001-03-18  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell-date-edit.c (e_cell_date_edit_show_time_invalid_warning): 
-	use gnome_dialog_run() to make the warning dialog modal. Also created
-	a better warning message showing the format expected.
-	Also used e_time_format_time() to format all times.
-
-2001-03-15  Not Zed  <NotZed@Ximian.com>
-
-	* e-filter-bar.c (menubar_activated): If we click on the edit
-	menu, then bring up a rule editor.  If the user adds/removes rules
-	though, they are neither saved, nor added to the menu's. sigh.
-
-2001-03-04  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell-date-edit.c: pretty much working now.
-
-2001-03-01  Not Zed  <NotZed@Ximian.com>
-
-	* e-filter-bar.c: New type of search bar that interacts with
-	filter contexts to save filters etc.  Still probably needs a
-	little cleanpu.
-
-2001-02-28  Not Zed  <NotZed@Ximian.com>
-
-	* e-search-bar.c (add_dropdown): Save the dropdown menu in the
-	struct too.  Sigh, this is only so we can scan its content later,
-	ick.
-	(e_search_bar_set_menu_sensitive): New function to se tthe
-	sentisitivty of menyu items based on id.
-	(find_id): New function to find the row and widget for a specific
-	id.
-	(add_option): Renamed to set_option.
-	(add_dropdown): Renamed to set_dropdown.
-	(add_dropdown): ?New function to add a single item.
-	(set_dropdown): Call add_dropdown to add each item.
-	(e_search_bar_add_menu): New public function to add a single item.
-
-2001-02-27  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (libemiscwidgets_a_SOURCES): Added filter-bar.[ch].
-
-	* e-search-bar.c (class_init): Init virtual functions.
-	(e_search_bar_set_option):
-	(e_search_bar_set_menu): virtualise calling.
-	(e_search_bar_construct): Call virtual functions to setup menus.
-
-	* e-search-bar.h (struct _ESearchBarClass): Virtualise
-	add_dropdown/add_option, so certain base options can be created.
-
-2001-02-25  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell-date-edit.[hc]: new files to implement an ECell for showing
-	and editing dates & times. (Unfinished)
-
-	* Makefile.am (libemiscwidgets_a_SOURCES): added e-cell-date-edit.[hc]
-
-2001-02-24  Not Zed  <NotZed@Ximian.com>
-
-	* e-search-bar.c (add_dropdown): Move the event box into the
-	esb->dropdown_holder.  Changed so it can be called again on the
-	same esb, to rebuild the menu.
-	(e_search_bar_set_menu): New function to (re)set the menu.
-	(add_option): Setup so it can be re-called to rebuild the option
-	list.
-	(e_search_bar_set_option): New function to build the menu's.
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* .cvsignore: Ignore test-dropdown-button
-
-2001-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (add_spacer): Make the spacer 4 pixels wider.
-	(add_dropdown): Put the dropdown button into an event box with a
-	1-pixel border, so that we match the [Hardcoded! Stupid GTK+!]
-	border around the option menu.
-
-2001-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dropdown-button.c (menu_deactivate_cb): New function to change
-	the state of the toggle button when the pop-up menu disappears.
-	(impl_clicked): Removed.
-	(impl_button_press_event): New, implementation for
-	`::button_press_event'.  Pop-up the menu, and toggle the button.
-	(class_init): Override `::button_press_event' with
-	`impl_button_press_event'; don't override `::clicked' anymore.
-
-	* e-dropdown-button.h, e-dropdown-button.c: Derive from
-	`GtkToggleButton', instead of plain `GtkButton'.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (add_dropdown): Make the dropdown button
-	non-focusable.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (e_search_bar_init): Don't create the widgets
-	here.
-	(e_search_bar_construct): New.  Do it here instead.
-	(e_search_bar_new): Call it.  Added preconditions.
-	(esb_pack_menubar): Removed.
-	(add_dropdown): New.
-	(add_option): New.
-	(add_entry): New.
-	(e_search_bar_construct): Use `add_dropdown()', `add_option()',
-	`add_entry()'.
-	(class_init): Renamed from `e_seearch_bar_class_init'.
-	(init): Renamed from `e_search_bar_init'.
-	(impl_destroy): Renamed from `e_search_bar_destroy'.
-	(emit_menu_activated): Renamed from `esb_menu_activated'.
-	(emit_query_changed): Renamed from `esb_query_changed'.
-	(menubar_activated_cb): Renamed from `esb_menubar_activated'.
-	(option_activated_cb): Renamed from `esb_option_activated'.
-	(esb_entry_activated): Renamed from `esb_entry_activated'.
-	(impl_set_arg): Renamed from `e_search_bar_set_arg'.
-	(impl_get_arg): Renamed from `e_search_bar_get_arg'.
-
-	* e-search-bar.h (struct _ESearchBar): Removed member `menubar';
-	replaced it with `dropdown'.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dropdown-button.c (e_dropdown_button_construct): Removed
-	@ui_info and @data args.  Obviously I am not very smart at this
-	time of the night.
-	(e_dropdown_button_new): Likewise.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dropdown-button.c, e-dropdown-button.h: New.
-
-2001-01-25  Damon Chaplin  <damon@ximian.com>
-
-	* e-calendar-item.[hc]: e_calendar_item_get_date_range() now returns
-	a boolean, which is FALSE if no dates are currently shown.
-	Plus a couple of minor sanity checks.
-
-2001-01-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-calendar.c (e_calendar_init): Unset the GTK_CAN_FOCUS flag on
-	the ECalendar.
-	(e_calendar_focus_in): Removed function since it did nothing.
-	(e_calendar_focus_out): Likewise.
-	(e_calendar_key_press): Likewise.
-	(e_calendar_init): Turn off the GTK_CAN_FOCUS flag for both arrow
-	buttons.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_set_max_days_sel): Make zero
-	the minimum number of days that can be specified.
-	(e_calendar_item_set_arg): We do need an update when the maximum
-	number of selected days is changed.
-	(e_calendar_item_set_max_days_sel): Request an update of the
-	canvas item.
-	(e_calendar_item_button_press): Do not start selecting days if the
-	max_days_selected is less than 1.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-messagebox.c (e_message_box_get_id): Oops. Delete this. I
-	never meant for this to get commit'd.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* e-messagebox.c (e_message_box_get_id): Dont remove the function, give
-	it the proper name
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-messagebox.c (e_message_box_get_checkbox): Remove the version
-	returning `const char *' as of course it doesn't compile.  Please
-	compile before committing.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Added e-messagebox to the build.
-
-	* e-messagebox.[c,h]: Added a new messagebox window that contains
-	a checkbox for "Don't show me this again."
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* e-search-bar.[ch]: Moved here from $(toplevel)/filter.
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* e-calendar-item.h: add prototypes
-
-	* e-calendar-item.c (e_calendar_item_init): Set max_days_selected to
-	1 and days_to_start_week_selection to -1 as documented in header
-	(e_calendar_item_set_arg): use new accessor methods
-	(e_calendar_item_get_arg): ditto
-	(e_calendar_item_get_max_days_sel): accessor
-	(e_calendar_item_set_max_days_sel): ditto
-	(e_calendar_item_get_days_start_week_sel): ditto
-	(e_calendar_item_set_days_start_week_sel): ditto
-	(e_calendar_item_class_init): add display_popup argument
-	(e_calendar_item_init): initialize display_popup member
-	(e_calendar_item_get_arg): get display_popup member
-	(e_calendar_item_set_arg): set display_popup member
-	(e_calendar_item_button_press): only show the popup menu if the
-	member is set
-	(e_calendar_item_get_display_popup): acessor
-	(e_calendar_item_set_display_popup): ditto
-
-2000-12-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dateedit.h: #include <time.h>
-
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* e-calendar.c (e_calendar_destroy): Call the parent class destroyer
-	as well
-
-2000-10-26  Damon Chaplin  <damon@helixcode.com>
-
-	* e-dateedit.[hc]: updated to emit "changed" when appropriate, which
-	turned out to be amazingly difficult :(
-	Also added e_date_edit_get/set_date() to get/set just the date.
-	Added e_date_edit_date_is_valid() & e_date_edit_time_is_valid() so
-	you can check if the user has tried to enter an invalid date.
-	(All the get_date/time functions return the last valid date entered.)
-
-	* test-dateedit.c: updated a bit.
-
-2000-11-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dateedit.h (EDateEditClass): Removed the "time_changed"
-	signal, since it was never being emitted in the first place.  Time
-	values *are* both date and time together anyways, so whenever one
-	changes we should notify about the whole date/time value being
-	changed.
-	Renamed the remaining "date_changed" signal to just "changed".
-
-	* e-dateedit.c (e_date_edit_class_init): Do not create the
-	"time_changed" signal; rename the other one to "changed".
-	(set_time): Moved the core functionality from
-	e_date_edit_set_time() to here.  This function just sets the
-	widgets' values without emitting any signals.
-	(e_date_edit_set_time): Emit the "changed" signal unconditionally.
-	This is to be consistent with the rest of the GTK+ widgets, and it
-	actually makes writing client code easier.
-	(e_date_edit_new): Use set_time().
-	(on_date_popup_now_button_clicked): Do not emit the signal here.
-	(on_date_popup_none_button_clicked): Likewise.
-	(e_date_edit_set_time_of_day): Emit the signal, since we do not
-	call e_date_edit_set_time().
-
-2000-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-calendar-item.c: #include <string.h> to get rid of warning.
-	* e-clipped-label.c: Same here.
-	
-2000-10-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dateedit.c (e_date_edit_destroy): Do not unref the cal_popup
-	since we already destroyed it.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.c (e_calendar_item_recalc_sizes): fixed to
-	recalculate min_cell_width/height in case the show_week_numbers option
-	is changed.
-
-	* e-dateedit.c: added support for hiding the date field, and added
-	get/set_time_of_day() functions to get/set just the time.
-
-2000-09-30  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.c: 
-	* e-dateedit.c: better i18n of strftime strings.
-
-2000-09-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-title-bar.c: New member `pin_gtk_pixmap' in
-	`ETitleBarPrivate'.  Signal "close_button_clicked" renamed to
-	"button_clicked".  Signal "title_button_press_event" renamed to
-	"label_button_press_event".
-	(init): Init new members.
-	(close_button_realize_cb): Create the pin pixmap.  Call
-	`show_and_hide_pixmaps_according_to_mode()'.
-	(e_title_bar_show_close_button): Renamed to
-	`e_title_bar_show_button'.
-	(e_title_bar_get_button_mode): New.
-	(e_title_bar_set_button_mode): New.
-
-2000-09-23  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar.c: use pixmaps instead of GtkArrows to look better.
-	Also set the canvas window's background when realized so that we can
-	set the button reliefs to none.
-
-2000-09-22  Damon Chaplin  <damon@helixcode.com>
-
-	* test-dateedit.c: updated a bit, adding a few EDateEdits with
-	different options.
-
-	* e-calendar-item.c (e_calendar_item_set_selection): aborted any
-	current selection operation and initialize all of the selection fields.
-	(e_calendar_item_unmap): new function to abort any current selection
-	operation. Otherwise GnomeCanvas gets in a muddle about grabs.
-
-	* e-dateedit.c: marked some strftime()/strptime() format strings for
-	translation and used "%m/%d/%Y" instead of "%x" so we get the complete
-	year number. Also changed e_date_edit_get_time() so it returns -2 if
-	it can't parse the date or time, and -1 if it is explicitly set to
-	None.
-	(e_date_edit_parse_date): new function to parse the date string and
-	add on the current century if a year of 0-99 is entered.
-
-2000-09-21  Damon Chaplin  <damon@helixcode.com>
-
-	* e-dateedit.c (on_date_button_clicked): only check return of strptime
-	for NULL. It should now select the correct day set in the popup.
-
-	* e-calendar.c: 
-	* e-calendar-item.c: 
-	* test-calendar.c: removed support for buttons within the ECalendar.
-	It is cleaner to add them outside it, as EDateEdit does.
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* e-dateedit.c (_XOPEN_SOURCE): set this to 4 to specify how much
-	X/Open we want with that.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* e-calendar-item.c, e-calendar.c, e-calendar.h, e-title-bar.c:
-	Fixed the #include lines to deal properly with gal.
-
-	* e-scroll-frame.c, e-scroll-frame.h: Moved to gal.
-
-2000-09-11  Damon Chaplin  <damon@helixcode.com>
-
-	* Makefile.am (libemiscwidgets_a_SOURCES): added e-dateedit.[hc]
-	and the test-dateedit app.
-
-	* e-dateedit.[hc]: new widget to use instead of GnomeDateEdit. It
-	uses the new ECalendar widget for the calendar and also supports
-	"None", "Today" and "Now" buttons, and goes away with a single click.
-
-	* test-dateedit.c: app to test the EDateEdit widget.
-
-	* e-calendar-item.c: updated to support the EDateEdit better,
-	mainly by adding the "move_selection_when_moving" arg so we can turn
-	it off to keep the same day selected when changing the months shown.
-
-2000-09-05  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.c (e_calendar_item_draw_month): make sure we get
-	the start_weekday since we need it for draw_days(). Fixes a drawing
-	bug.
-
-2000-08-31  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.c (e_calendar_item_button_press): 
-	(e_calendar_item_button_release): grab/ungrab the pointer so we
-	always get the button_release event.
-
-2000-08-30  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.[hc]: 
-	* e-calendar.[hc]: Updated.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-calendar-item.c, e-calendar.c: Fixed some warnings.
-
-2000-07-25  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.h: 
-	* e-calendar.[hc]: new widget and canvas item to replace GtkCalendar.
-	Not quite finished yet.
-
-2000-07-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-title-bar.c (e_title_bar_set_title): We have a `EClippedLabel',
-	not a `GtkLabel' here: use the right function to change the text.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-scroll-frame.c: Tried rearranging the casts to try for a more
-	correct computation.
-
-2000-07-08  Dan Winship  <danw@helixcode.com>
-
-	* e-scroll-frame.c (e_scroll_frame_add): comment out true but
-	confused warning about non-scrollable widgets until Chris and/or
-	Federico fix this correctly.
-	(e_scroll_frame_size_allocate): If the available space for the
-	child is less than the width/height of the frame, give the child
-	an allocation of 0 rather than some small negative number cast to
-	unsigned.
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (INCLUDES): Set G_LOG_DOMAIN=__FILE__ rather than
-	"e-title-bar" in all three widgets.
-
-2000-06-13  Anders Carlsson  <andersca@gnu.org>
-
-	* e-scroll-frame.c (e_scroll_frame_button_press): Control does 
-	horizontal scrolling, a la gimp.
-
-2000-06-11  Anders Carlsson  <andersca@gnu.org>
-
-	* e-scroll-frame.c (e_scroll_frame_button_press): Add support
-	for mouse wheel scrolling in EScrollFrame.
-
-2000-06-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-title-bar.c (close_button_realize_cb): Unref the pixmap and
-	the mask.
-
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index daaf9717f2..6373ceb58b 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -69,10 +69,9 @@ widgetsinclude_HEADERS =			\
 	e-signature-preview.h			\
 	e-signature-script-dialog.h		\
 	e-signature-tree-view.h			\
-	e-spinner.c				\
-	e-spinner.h				\
 	e-url-entry.h				\
 	e-web-view.h				\
+	e-web-view-preview.h			\
 	ea-calendar-cell.h			\
 	ea-calendar-item.h			\
 	ea-cell-table.h				\
@@ -149,6 +148,7 @@ libemiscwidgets_la_SOURCES =			\
 	e-signature-tree-view.c			\
 	e-url-entry.c				\
 	e-web-view.c				\
+	e-web-view-preview.c			\
 	ea-calendar-cell.c			\
 	ea-calendar-item.c			\
 	ea-cell-table.c				\
@@ -226,7 +226,6 @@ test_preferences_window_LDADD = 		\
 EXTRA_DIST =			\
 	$(ui_DATA)		\
 	e-pilot-settings.h	\
-	e-pilot-settings.c	\
-	ChangeLog.pre-1-4
+	e-pilot-settings.c
 
 -include $(top_srcdir)/git.mk
diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c
index 288ac408fb..7d34a29bfe 100644
--- a/widgets/misc/e-account-combo-box.c
+++ b/widgets/misc/e-account-combo-box.c
@@ -22,7 +22,6 @@
 #include "e-account-combo-box.h"
 
 #include <string.h>
-#include <camel/camel-store.h>
 
 #define E_ACCOUNT_COMBO_BOX_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -131,7 +130,7 @@ account_combo_box_test_account (EAccount *account)
 		camel_session, url, CAMEL_PROVIDER_STORE, &ex));
 	if (store != NULL) {
 		writable = (store->mode & CAMEL_STORE_WRITE);
-		camel_object_unref (store);
+		g_object_unref (store);
 	}
 	camel_exception_clear (&ex);
 
diff --git a/widgets/misc/e-account-combo-box.h b/widgets/misc/e-account-combo-box.h
index c3fe4aa0f8..b624c9b17e 100644
--- a/widgets/misc/e-account-combo-box.h
+++ b/widgets/misc/e-account-combo-box.h
@@ -23,7 +23,7 @@
 #define E_ACCOUNT_COMBO_BOX_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-session.h>
+#include <camel/camel.h>
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
 
diff --git a/widgets/misc/e-account-tree-view.c b/widgets/misc/e-account-tree-view.c
index 8c2e21092b..9b083a3f6e 100644
--- a/widgets/misc/e-account-tree-view.c
+++ b/widgets/misc/e-account-tree-view.c
@@ -22,7 +22,7 @@
 #include "e-account-tree-view.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
 
 #define E_ACCOUNT_TREE_VIEW_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/widgets/misc/e-action-combo-box.c b/widgets/misc/e-action-combo-box.c
index 2fa376d420..0260c6e19a 100644
--- a/widgets/misc/e-action-combo-box.c
+++ b/widgets/misc/e-action-combo-box.c
@@ -385,8 +385,8 @@ action_combo_box_class_init (EActionComboBoxClass *class)
 		PROP_ACTION,
 		g_param_spec_object (
 			"action",
-			_("Action"),
-			_("A GtkRadioAction"),
+			"Action",
+			"A GtkRadioAction",
 			GTK_TYPE_RADIO_ACTION,
 			G_PARAM_READWRITE));
 }
diff --git a/widgets/misc/e-activity-proxy.c b/widgets/misc/e-activity-proxy.c
index 10249b1911..c503e5e26d 100644
--- a/widgets/misc/e-activity-proxy.c
+++ b/widgets/misc/e-activity-proxy.c
@@ -22,7 +22,6 @@
 #include "e-activity-proxy.h"
 
 #include <glib/gi18n.h>
-#include <e-spinner.h>
 
 #define E_ACTIVITY_PROXY_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -277,9 +276,9 @@ activity_proxy_init (EActivityProxy *proxy)
 	proxy->priv->button = g_object_ref (widget);
 	gtk_widget_hide (widget);
 
-        /* XXX What's the rationale for killing the old spinner API? */
-	widget = e_spinner_new_spinning_small_shown ();
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	widget = gtk_spinner_new ();
+	gtk_spinner_start (GTK_SPINNER (widget));
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 3);
 	proxy->priv->spinner = g_object_ref (widget);
 	gtk_widget_show (widget);
 
diff --git a/widgets/misc/e-attachment-handler-image.c b/widgets/misc/e-attachment-handler-image.c
index 6429eb6b8e..770b1c552b 100644
--- a/widgets/misc/e-attachment-handler-image.c
+++ b/widgets/misc/e-attachment-handler-image.c
@@ -24,6 +24,8 @@
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 
+#include <e-util/e-util.h>
+
 #define E_ATTACHMENT_HANDLER_IMAGE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_ATTACHMENT_HANDLER_IMAGE, EAttachmentHandlerImagePrivate))
@@ -124,7 +126,7 @@ action_image_set_as_background_cb (GtkAction *action,
 
 	/* Save the image under ~/.gnome2/wallpapers/. */
 	path = g_build_filename (
-		g_get_home_dir (), ".gnome2", "wallpapers", NULL);
+		e_get_gnome2_user_dir (), "wallpapers", NULL);
 	destination = g_file_new_for_path (path);
 	g_mkdir_with_parents (path, 0755);
 	g_free (path);
diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c
index d47fe9c8c7..c9282c7718 100644
--- a/widgets/misc/e-attachment-paned.c
+++ b/widgets/misc/e-attachment-paned.c
@@ -516,7 +516,7 @@ attachment_paned_init (EAttachmentPaned *paned)
 	container = widget;
 
 	widget = e_attachment_icon_view_new ();
-	GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus (widget, TRUE);
 	gtk_icon_view_set_model (GTK_ICON_VIEW (widget), paned->priv->model);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	paned->priv->icon_view = g_object_ref (widget);
@@ -536,7 +536,7 @@ attachment_paned_init (EAttachmentPaned *paned)
 	container = widget;
 
 	widget = e_attachment_tree_view_new ();
-	GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus (widget, TRUE);
 	gtk_tree_view_set_model (GTK_TREE_VIEW (widget), paned->priv->model);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	paned->priv->tree_view = g_object_ref (widget);
@@ -602,7 +602,7 @@ attachment_paned_init (EAttachmentPaned *paned)
 
 	container = widget;
 
-	widget = gtk_label_new_with_mnemonic (_("Show _Attachment Bar"));
+	widget = gtk_label_new_with_mnemonic (_("Show Attachment _Bar"));
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	paned->priv->show_hide_label = g_object_ref (widget);
 	gtk_widget_show (widget);
diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c
index 2ff6fb4dab..832565c929 100644
--- a/widgets/misc/e-attachment-view.c
+++ b/widgets/misc/e-attachment-view.c
@@ -24,7 +24,6 @@
 #include <config.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <camel/camel-stream-mem.h>
 
 #include "e-util/e-binding.h"
 #include "e-util/e-selection.h"
@@ -461,7 +460,7 @@ attachment_view_text_calendar (EAttachmentView *view,
 		e_attachment_load_handle_error, parent);
 	g_object_unref (attachment);
 
-	camel_object_unref (mime_part);
+	g_object_unref (mime_part);
 
 	gtk_drag_finish (drag_context, TRUE, FALSE, time);
 }
@@ -515,7 +514,7 @@ attachment_view_text_x_vcard (EAttachmentView *view,
 		e_attachment_load_handle_error, parent);
 	g_object_unref (attachment);
 
-	camel_object_unref (mime_part);
+	g_object_unref (mime_part);
 
 	gtk_drag_finish (drag_context, TRUE, FALSE, time);
 }
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index 4752251905..ba4e4004b3 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -25,14 +25,6 @@
 #include <config.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <camel/camel-iconv.h>
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-null.h>
-#include <camel/camel-stream-vfs.h>
-#include <camel/camel-stream-fs.h>
 
 #include <libedataserver/e-data-server-util.h>
 
@@ -678,7 +670,7 @@ attachment_dispose (GObject *object)
 	}
 
 	if (priv->mime_part != NULL) {
-		camel_object_unref (priv->mime_part);
+		g_object_unref (priv->mime_part);
 		priv->mime_part = NULL;
 	}
 
@@ -792,11 +784,11 @@ attachment_class_init (EAttachmentClass *class)
 	g_object_class_install_property (
 		object_class,
 		PROP_MIME_PART,
-		g_param_spec_boxed (
+		g_param_spec_object (
 			"mime-part",
 			"MIME Part",
 			NULL,
-			E_TYPE_CAMEL_OBJECT,
+			CAMEL_TYPE_MIME_PART,
 			G_PARAM_READWRITE));
 
 	g_object_class_install_property (
@@ -1006,12 +998,12 @@ e_attachment_new_for_message (CamelMimeMessage *message)
 	g_string_free (description, TRUE);
 
 	wrapper = CAMEL_DATA_WRAPPER (message);
-	camel_medium_set_content_object (CAMEL_MEDIUM (mime_part), wrapper);
+	camel_medium_set_content (CAMEL_MEDIUM (mime_part), wrapper);
 	camel_mime_part_set_content_type (mime_part, "message/rfc822");
 
 	attachment = e_attachment_new ();
 	e_attachment_set_mime_part (attachment, mime_part);
-	camel_object_unref (mime_part);
+	g_object_unref (mime_part);
 
 	return attachment;
 }
@@ -1036,7 +1028,7 @@ e_attachment_add_to_multipart (EAttachment *attachment,
 		return;
 
 	content_type = camel_mime_part_get_content_type (mime_part);
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+	wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 
 	if (CAMEL_IS_MULTIPART (wrapper))
 		goto exit;
@@ -1044,8 +1036,8 @@ e_attachment_add_to_multipart (EAttachment *attachment,
 	/* For text content, determine the best encoding and character set. */
 	if (camel_content_type_is (content_type, "text", "*")) {
 		CamelTransferEncoding encoding;
-		CamelStreamFilter *filtered_stream;
-		CamelMimeFilterBestenc *filter;
+		CamelStream *filtered_stream;
+		CamelMimeFilter *filter;
 		CamelStream *stream;
 		const gchar *charset;
 
@@ -1054,21 +1046,23 @@ e_attachment_add_to_multipart (EAttachment *attachment,
 		/* Determine the best encoding by writing the MIME
 		 * part to a NULL stream with a "bestenc" filter. */
 		stream = camel_stream_null_new ();
-		filtered_stream = camel_stream_filter_new_with_stream (stream);
+		filtered_stream = camel_stream_filter_new (stream);
 		filter = camel_mime_filter_bestenc_new (
 			CAMEL_BESTENC_GET_ENCODING);
 		camel_stream_filter_add (
-			filtered_stream, CAMEL_MIME_FILTER (filter));
+			CAMEL_STREAM_FILTER (filtered_stream),
+			CAMEL_MIME_FILTER (filter));
 		camel_data_wrapper_decode_to_stream (
-			wrapper, CAMEL_STREAM (filtered_stream));
-		camel_object_unref (filtered_stream);
-		camel_object_unref (stream);
+			wrapper, filtered_stream);
+		g_object_unref (filtered_stream);
+		g_object_unref (stream);
 
 		/* Retrieve the best encoding from the filter. */
 		encoding = camel_mime_filter_bestenc_get_best_encoding (
-			filter, CAMEL_BESTENC_8BIT);
+			CAMEL_MIME_FILTER_BESTENC (filter),
+			CAMEL_BESTENC_8BIT);
 		camel_mime_part_set_encoding (mime_part, encoding);
-		camel_object_unref (filter);
+		g_object_unref (filter);
 
 		if (encoding == CAMEL_TRANSFER_ENCODING_7BIT) {
 			/* The text fits within us-ascii, so this is safe.
@@ -1208,11 +1202,11 @@ e_attachment_set_mime_part (EAttachment *attachment,
 
 	if (mime_part != NULL) {
 		g_return_if_fail (CAMEL_IS_MIME_PART (mime_part));
-		camel_object_ref (mime_part);
+		g_object_ref (mime_part);
 	}
 
 	if (attachment->priv->mime_part != NULL)
-		camel_object_unref (attachment->priv->mime_part);
+		g_object_unref (attachment->priv->mime_part);
 
 	attachment->priv->mime_part = mime_part;
 
@@ -1537,12 +1531,12 @@ attachment_load_finish (LoadContext *load_context)
 	camel_data_wrapper_construct_from_stream (wrapper, stream);
 	camel_data_wrapper_set_mime_type (wrapper, mime_type);
 	camel_stream_close (stream);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	mime_part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (mime_part), wrapper);
+	camel_medium_set_content (CAMEL_MEDIUM (mime_part), wrapper);
 
-	camel_object_unref (wrapper);
+	g_object_unref (wrapper);
 	g_free (mime_type);
 
 	display_name = g_file_info_get_display_name (file_info);
@@ -1565,7 +1559,7 @@ attachment_load_finish (LoadContext *load_context)
 	}
 
 	g_simple_async_result_set_op_res_gpointer (
-		simple, mime_part, (GDestroyNotify) camel_object_unref);
+		simple, mime_part, (GDestroyNotify) g_object_unref);
 
 	g_simple_async_result_complete (simple);
 
@@ -1790,12 +1784,12 @@ attachment_load_from_mime_part (LoadContext *load_context)
 
 	e_attachment_set_file_info (attachment, file_info);
 
-	camel_object_ref (mime_part);
+	g_object_ref (mime_part);
 
 	simple = load_context->simple;
 	g_simple_async_result_set_op_res_gpointer (
 		simple, mime_part,
-		(GDestroyNotify) camel_object_unref);
+		(GDestroyNotify) g_object_unref);
 	g_simple_async_result_complete (simple);
 
 	attachment_load_context_free (load_context);
@@ -2468,9 +2462,9 @@ attachment_save_got_output_stream (SaveContext *save_context)
 	buffer = g_byte_array_new ();
 	stream = camel_stream_mem_new ();
 	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), buffer);
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+	wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
 	camel_data_wrapper_decode_to_stream (wrapper, stream);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	/* Load the buffer into a GMemoryInputStream.
 	 * But watch out for zero length MIME parts. */
diff --git a/widgets/misc/e-attachment.h b/widgets/misc/e-attachment.h
index a6dff74661..7cd655c6ff 100644
--- a/widgets/misc/e-attachment.h
+++ b/widgets/misc/e-attachment.h
@@ -23,10 +23,7 @@
 #define E_ATTACHMENT_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-cipher-context.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
+#include <camel/camel.h>
 
 /* Standard GObject macros */
 #define E_TYPE_ATTACHMENT \
diff --git a/widgets/misc/e-buffer-tagger.c b/widgets/misc/e-buffer-tagger.c
index 9501f29d6a..b3d5a4e61e 100644
--- a/widgets/misc/e-buffer-tagger.c
+++ b/widgets/misc/e-buffer-tagger.c
@@ -308,11 +308,7 @@ update_mouse_cursor (GtkTextView *text_view, gint x, gint y)
 	if (hovering != hovering_over_link) {
 		update_state (buffer, E_BUFFER_TAGGER_STATE_IS_HOVERING, hovering);
 
-#if GTK_CHECK_VERSION(2,19,7)
 		if (hovering && gtk_widget_has_focus (GTK_WIDGET (text_view)))
-#else
-		if (hovering && GTK_WIDGET_HAS_FOCUS (text_view))
-#endif
 			gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), hand_cursor);
 		else
 			gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), regular_cursor);
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 4d7506e05d..e67c2b7eeb 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -29,6 +29,7 @@
 #include "ea-widgets.h"
 
 #include <time.h>
+#include <stdlib.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
@@ -1557,11 +1558,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 					day_style = calitem->styles[(month_offset + 1) * 32 + day_num];
 
 				/* Get the colors & style to use for the day.*/
-#if GTK_CHECK_VERSION(2,19,7)
 				if ((gtk_widget_has_focus (GTK_WIDGET (item->canvas))) &&
-#else
-				if ((GTK_WIDGET_HAS_FOCUS(item->canvas)) &&
-#endif
 				    item->canvas->focused_item == item)
 					has_focus = TRUE;
 				else
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index 27ac031b8d..fd8f882b25 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -266,11 +266,7 @@ e_calendar_style_set		(GtkWidget	*widget,
 
 	/* Set the background of the canvas window to the normal color,
 	   or the arrow buttons are not displayed properly. */
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_get_realized (widget)) {
-#else
-	if (GTK_WIDGET_REALIZED (widget)) {
-#endif
 		GtkStyle *style;
 		GdkWindow *window;
 
@@ -562,13 +558,8 @@ e_calendar_button_has_focus (ECalendar	*cal)
 
 	prev_widget = GNOME_CANVAS_WIDGET(cal->prev_item)->widget;
 	next_widget = GNOME_CANVAS_WIDGET(cal->next_item)->widget;
-#if GTK_CHECK_VERSION(2,19,7)
 	ret_val = gtk_widget_has_focus (prev_widget) ||
 		gtk_widget_has_focus (next_widget);
-#else
-	ret_val = GTK_WIDGET_HAS_FOCUS (prev_widget) ||
-		GTK_WIDGET_HAS_FOCUS (next_widget);
-#endif
 	return ret_val;
 }
 
@@ -595,11 +586,7 @@ e_calendar_focus (GtkWidget *widget, GtkDirectionType direction)
 	children[2] = cal->next_item;
 
 	/* get current focused item, if e-calendar has had focus */
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_has_focus (widget) || e_calendar_button_has_focus (cal))
-#else
-	if (GTK_WIDGET_HAS_FOCUS (widget) || e_calendar_button_has_focus (cal))
-#endif
 		for (index = 0; index < E_CALENDAR_FOCUS_CHILDREN_NUM; ++index) {
 			if (canvas->focused_item == NULL)
 				break;
@@ -636,30 +623,29 @@ e_calendar_focus (GtkWidget *widget, GtkDirectionType direction)
 void
 e_calendar_set_focusable (ECalendar *cal, gboolean focusable)
 {
+	GtkWidget *widget;
 	GtkWidget *prev_widget, *next_widget;
+	GtkWidget *toplevel;
 
 	g_return_if_fail (E_IS_CALENDAR (cal));
 
+	widget = GTK_WIDGET (cal);
 	prev_widget = GNOME_CANVAS_WIDGET(cal->prev_item)->widget;
 	next_widget = GNOME_CANVAS_WIDGET(cal->next_item)->widget;
 
 	if (focusable) {
-		GTK_WIDGET_SET_FLAGS (cal, GTK_CAN_FOCUS);
-		GTK_WIDGET_SET_FLAGS (prev_widget, GTK_CAN_FOCUS);
-		GTK_WIDGET_SET_FLAGS (next_widget, GTK_CAN_FOCUS);
+		gtk_widget_set_can_focus (widget, TRUE);
+		gtk_widget_set_can_focus (prev_widget, TRUE);
+		gtk_widget_set_can_focus (next_widget, TRUE);
 	}
 	else {
-#if GTK_CHECK_VERSION(2,19,7)
 		if (gtk_widget_has_focus (GTK_WIDGET (cal)) || e_calendar_button_has_focus (cal)) {
-#else
-		if (GTK_WIDGET_HAS_FOCUS (cal) || e_calendar_button_has_focus (cal)) {
-#endif
-			GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (cal));
+			toplevel = gtk_widget_get_toplevel (widget);
 			if (toplevel)
 				gtk_widget_grab_focus (toplevel);
 		}
-		GTK_WIDGET_UNSET_FLAGS (cal, GTK_CAN_FOCUS);
-		GTK_WIDGET_UNSET_FLAGS (prev_widget, GTK_CAN_FOCUS);
-		GTK_WIDGET_UNSET_FLAGS (next_widget, GTK_CAN_FOCUS);
+		gtk_widget_set_can_focus (widget, FALSE);
+		gtk_widget_set_can_focus (prev_widget, FALSE);
+		gtk_widget_set_can_focus (next_widget, FALSE);
 	}
 }
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 3b4cbadd20..28875725b3 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -437,11 +437,7 @@ ecb_style_set (ECanvasBackground *ecb,
 
 	style = gtk_widget_get_style (GTK_WIDGET (item->canvas));
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_get_realized (GTK_WIDGET (item->canvas))) {
-#else
-	if (GTK_WIDGET_REALIZED (item->canvas)) {
-#endif
 		gdk_gc_set_foreground (
 			ecb->priv->gc, &style->base[GTK_STATE_NORMAL]);
 		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (ecb));
@@ -468,57 +464,57 @@ ecb_class_init (ECanvasBackgroundClass *ecb_class)
 
 	g_object_class_install_property (object_class, PROP_FILL_COLOR,
 					 g_param_spec_string ("fill_color",
-							      _( "Fill color" ),
-							      _( "Fill color" ),
+							      "Fill color",
+							      "Fill color",
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_FILL_COLOR_GDK,
 					 g_param_spec_boxed ("fill_color_gdk",
-							     _( "GDK fill color" ),
-							     _( "GDK fill color" ),
+							     "GDK fill color",
+							     "GDK fill color",
 							     GDK_TYPE_COLOR,
 							     G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_FILL_COLOR_RGBA,
 					 g_param_spec_uint ("fill_color_rgba",
-							    _( "GDK fill color" ),
-							    _( "GDK fill color" ),
+							    "GDK fill color",
+							    "GDK fill color",
 							    0, G_MAXUINT, 0,
 							    G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_FILL_STIPPLE,
 					 g_param_spec_object ("fill_stipple",
-							      _( "Fill stipple" ),
-							      _( "Fill stipple" ),
+							      "Fill stipple",
+							      "Fill stipple",
 							      GDK_TYPE_WINDOW,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_X1,
 					 g_param_spec_double ("x1",
-							      _( "X1" ),
-							      _( "X1" ),
+							      "X1",
+							      "X1",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_X2,
 					 g_param_spec_double ("x2",
-							      _( "X2" ),
-							      _( "X2" ),
+							      "X2",
+							      "X2",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_Y1,
 					 g_param_spec_double ("y1",
-							      _( "Y1" ),
-							      _( "Y1" ),
+							      "Y1",
+							      "Y1",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_Y2,
 					 g_param_spec_double ("y2",
-							      _( "Y2" ),
-							      _( "Y2" ),
+							      "Y2",
+							      "Y2",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 	ecb_signals [STYLE_SET] =
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index e9d78f220c..63b23efdf6 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -80,26 +80,26 @@ e_canvas_vbox_class_init (ECanvasVboxClass *klass)
 
 	g_object_class_install_property (object_class, PROP_WIDTH,
 					 g_param_spec_double ("width",
-							      _( "Width" ),
-							      _( "Width" ),
+							      "Width",
+							      "Width",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 	g_object_class_install_property (object_class, PROP_MINIMUM_WIDTH,
 					 g_param_spec_double ("minimum_width",
-							      _( "Minimum width" ),
-							      _( "Minimum Width" ),
+							      "Minimum width",
+							      "Minimum Width",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 	g_object_class_install_property (object_class, PROP_HEIGHT,
 					 g_param_spec_double ("height",
-							      _( "Height" ),
-							      _( "Height" ),
+							      "Height",
+							      "Height",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READABLE));
 	g_object_class_install_property (object_class, PROP_SPACING,
 					 g_param_spec_double ("spacing",
-							      _( "Spacing" ),
-							      _( "Spacing" ),
+							      "Spacing",
+							      "Spacing",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 }
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index db187b6e13..593c9c4530 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -568,11 +568,7 @@ e_canvas_item_grab_focus (GnomeCanvasItem *item, gboolean widget_too)
 
 	item->canvas->focused_item = item;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (widget_too && !gtk_widget_has_focus (GTK_WIDGET(item->canvas))) {
-#else
-	if (widget_too && !GTK_WIDGET_HAS_FOCUS (GTK_WIDGET(item->canvas))) {
-#endif
 		gtk_widget_grab_focus (GTK_WIDGET (item->canvas));
 	}
 
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 03c8f2fd47..73b649defd 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -1699,11 +1699,7 @@ on_date_edit_time_selected	(GtkComboBox	*combo,
 	if (gtk_combo_box_get_active (combo) == -1)
 		return;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_mapped (child))
-#else
-	if (!GTK_WIDGET_MAPPED (child))
-#endif
 		return;
 
 	e_date_edit_check_time_changed (dedit);
diff --git a/widgets/misc/e-hinted-entry.c b/widgets/misc/e-hinted-entry.c
index 24bac0087c..51131cedcd 100644
--- a/widgets/misc/e-hinted-entry.c
+++ b/widgets/misc/e-hinted-entry.c
@@ -290,11 +290,7 @@ e_hinted_entry_set_text (EHintedEntry *entry,
 	if (text == NULL)
 		text = "";
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (*text == '\0' && !gtk_widget_has_focus (GTK_WIDGET (entry)))
-#else
-	if (*text == '\0' && !GTK_WIDGET_HAS_FOCUS (entry))
-#endif
 		hinted_entry_show_hint (entry);
 	else {
 		hinted_entry_hide_hint (entry);
diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c
index 30d41385f4..3ca06dcda8 100644
--- a/widgets/misc/e-import-assistant.c
+++ b/widgets/misc/e-import-assistant.c
@@ -71,8 +71,12 @@ struct _ImportProgressPage {
 };
 
 struct _ImportSimplePage {
+	GtkWidget *actionlabel;
+	GtkWidget *filetypetable;
 	GtkWidget *filetype;
-	GtkWidget *control; /* importer's destination widget in an alignment */
+	GtkWidget *control; /* importer's destination or preview widget in an alignment */
+	gboolean has_preview; /* TRUE when 'control' holds a preview widget,
+				   otherwise holds destination widget */
 
 	EImportTargetURI *target;
 	EImportImporter *importer;
@@ -427,7 +431,6 @@ import_assistant_simple_page_init (EImportAssistant *import_assistant)
 	GtkWidget *widget;
 	GtkCellRenderer *cell;
 	GtkListStore *store;
-	const gchar *text;
 	gint row = 0;
 
 	page = gtk_vbox_new (FALSE, 6);
@@ -436,12 +439,11 @@ import_assistant_simple_page_init (EImportAssistant *import_assistant)
 
 	container = page;
 
-	text = _("Select what type of file you want to import from the list.");
-
-	widget = gtk_label_new (text);
+	widget = gtk_label_new ("");
 	gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
 	gtk_widget_show (widget);
+	import_assistant->priv->simple_page.actionlabel = widget;
 
 	widget = gtk_table_new (2, 1, FALSE);
 	gtk_table_set_row_spacings (GTK_TABLE (widget), 2);
@@ -449,6 +451,7 @@ import_assistant_simple_page_init (EImportAssistant *import_assistant)
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 8);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
 	gtk_widget_show (widget);
+	import_assistant->priv->simple_page.filetypetable = widget;
 
 	container = widget;
 
@@ -743,7 +746,7 @@ prepare_progress_page (GtkAssistant *assistant,
 
 	g_object_get (G_OBJECT (assistant), "is-simple", &is_simple, NULL);
 
-	intelligent_import = gtk_toggle_button_get_active (
+	intelligent_import = is_simple ? FALSE : gtk_toggle_button_get_active (
 		GTK_TOGGLE_BUTTON (priv->type_page.intelligent));
 
 	if (is_simple) {
@@ -797,9 +800,15 @@ simple_filetype_changed_cb (GtkComboBox *combo_box, GtkAssistant *assistant)
 
 	if (page->control)
 		gtk_widget_destroy (page->control);
+	page->has_preview = FALSE;
+
+	control = e_import_get_preview_widget (priv->import, (EImportTarget *) page->target, page->importer);
+	if (control) {
+		page->has_preview = TRUE;
+		gtk_widget_set_size_request (control, 320, 240);
+	} else
+		control = create_importer_control (priv->import, (EImportTarget *)page->target, page->importer);
 
-	control = create_importer_control (
-		priv->import, (EImportTarget *)page->target, page->importer);
 	page->control = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
 	gtk_widget_show (page->control);
 	gtk_container_add (GTK_CONTAINER (page->control), control);
@@ -847,8 +856,6 @@ prepare_simple_page (GtkAssistant *assistant, GtkWidget *vbox)
 			-1);
 	}
 
-	g_slist_free (importers);
-
 	gtk_combo_box_set_active (GTK_COMBO_BOX (page->filetype), 0);
 	g_object_set_data (G_OBJECT (page->filetype), "page-vbox", vbox);
 
@@ -857,6 +864,56 @@ prepare_simple_page (GtkAssistant *assistant, GtkWidget *vbox)
 	g_signal_connect (
 		page->filetype, "changed",
 		G_CALLBACK (simple_filetype_changed_cb), assistant);
+
+	if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 1) {
+		gchar *title;
+
+		/* only one importer found, make it even simpler */
+		gtk_label_set_text (GTK_LABEL (page->actionlabel),
+			page->has_preview ?
+				_("Preview data to be imported") :
+				_("Choose the destination for this import"));
+
+		gtk_widget_hide (page->filetypetable);
+
+		title = g_strconcat (_("Import Data"), " - ", ((EImportImporter *)importers->data)->name, NULL);
+		gtk_assistant_set_page_title (assistant, vbox, title);
+		g_free (title);
+	} else {
+		/* multiple importers found, be able to choose from them */
+		gtk_label_set_text (GTK_LABEL (page->actionlabel), _("Select what type of file you want to import from the list."));
+
+		gtk_widget_show (page->filetypetable);
+
+		gtk_assistant_set_page_title (assistant, vbox, _("Import Data"));
+	}
+
+	g_slist_free (importers);
+}
+
+static gboolean
+prepare_simple_destination_page (GtkAssistant *assistant,
+                          GtkWidget *vbox)
+{
+	EImportAssistantPrivate *priv;
+	ImportDestinationPage *page;
+	ImportSimplePage *simple_page;
+
+	priv = E_IMPORT_ASSISTANT_GET_PRIVATE (assistant);
+	page = &priv->destination_page;
+	simple_page = &priv->simple_page;
+
+	if (page->control)
+		gtk_container_remove (GTK_CONTAINER (vbox), page->control);
+
+	page->control = create_importer_control (
+		priv->import, (EImportTarget *)
+		simple_page->target, simple_page->importer);
+
+	gtk_box_pack_start (GTK_BOX (vbox), page->control, TRUE, TRUE, 0);
+	gtk_assistant_set_page_complete (assistant, vbox, TRUE);
+
+	return FALSE;
 }
 
 static gint
@@ -864,6 +921,16 @@ forward_cb (gint current_page,
             EImportAssistant *import_assistant)
 {
 	GtkToggleButton *toggle_button;
+	gboolean is_simple = FALSE;
+
+	g_object_get (G_OBJECT (import_assistant), "is-simple", &is_simple, NULL);
+
+	if (is_simple) {
+		if (!import_assistant->priv->simple_page.has_preview)
+			current_page++;
+
+		return current_page + 1;
+	}
 
 	toggle_button = GTK_TOGGLE_BUTTON (
 		import_assistant->priv->type_page.intelligent);
@@ -1076,6 +1143,8 @@ import_assistant_prepare (GtkAssistant *assistant,
 		if (page_no == 0) {
 			prepare_simple_page (assistant, page);
 		} else if (page_no == 1) {
+			prepare_simple_destination_page (assistant, page);
+		} else if (page_no == 2) {
 			prepare_progress_page (assistant, page);
 		}
 
@@ -1193,6 +1262,14 @@ import_assistant_construct (EImportAssistant *import_assistant)
 
 		gtk_assistant_append_page (assistant, page);
 		gtk_assistant_set_page_header_image (assistant, page, pixbuf);
+		gtk_assistant_set_page_title (assistant, page, _("Import Data"));
+		gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONTENT);
+
+		/* File destination page - when with preview*/
+		page = import_assistant_destination_page_init (import_assistant);
+
+		gtk_assistant_append_page (assistant, page);
+		gtk_assistant_set_page_header_image (assistant, page, pixbuf);
 		gtk_assistant_set_page_title (assistant, page, _("Import Location"));
 		gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONTENT);
 	} else {
@@ -1272,11 +1349,9 @@ import_assistant_construct (EImportAssistant *import_assistant)
 	gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_PROGRESS);
 	gtk_assistant_set_page_complete (assistant, page, TRUE);
 
-	if (!import_assistant->priv->is_simple) {
-		gtk_assistant_set_forward_page_func (
-			assistant, (GtkAssistantPageFunc)
-			forward_cb, import_assistant, NULL);
-	}
+	gtk_assistant_set_forward_page_func (
+		assistant, (GtkAssistantPageFunc)
+		forward_cb, import_assistant, NULL);
 
 	g_object_unref (pixbuf);
 
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index ff13e41be8..22ea72fa6a 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -198,8 +198,11 @@ static void
 e_map_init (EMap *view)
 {
 	EMapPrivate *priv;
+	GtkWidget *widget;
 	gchar *map_file_name = g_build_filename (EVOLUTION_IMAGESDIR, "world_map-960.png", NULL);
 
+	widget = GTK_WIDGET (view);
+
 	priv = g_new0 (EMapPrivate, 1);
 	view->priv = priv;
 
@@ -210,8 +213,8 @@ e_map_init (EMap *view)
 	priv->zoom_state = E_MAP_ZOOMED_OUT;
         priv->points = g_ptr_array_new ();
 
-	GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS);
-	GTK_WIDGET_UNSET_FLAGS (view, GTK_NO_WINDOW);
+	gtk_widget_set_can_focus (widget, TRUE);
+	gtk_widget_set_has_window (widget, TRUE);
 }
 
 /* Destroy handler for the map view */
@@ -300,7 +303,7 @@ e_map_realize (GtkWidget *widget)
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (E_IS_MAP (widget));
 
-	GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+	gtk_widget_set_realized (widget, TRUE);
 
 	gtk_widget_get_allocation (widget, &allocation);
 
@@ -382,11 +385,7 @@ e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 
 	gtk_widget_set_allocation (widget, allocation);
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_get_realized (widget)) {
-#else
-	if (GTK_WIDGET_REALIZED (widget)) {
-#endif
 		GdkWindow *window;
 
 		window = gtk_widget_get_window (widget);
@@ -410,11 +409,7 @@ e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 static gint
 e_map_button_press (GtkWidget *widget, GdkEventButton *event)
 {
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_has_focus (widget)) gtk_widget_grab_focus (widget);
-#else
-	if (!GTK_WIDGET_HAS_FOCUS (widget)) gtk_widget_grab_focus (widget);
-#endif
 		return TRUE;
 }
 
@@ -649,11 +644,7 @@ e_map_window_to_world (EMap *map, gdouble win_x, gdouble win_y, gdouble *world_l
 	g_return_if_fail (map);
 
 	priv = map->priv;
-#if GTK_CHECK_VERSION(2,19,7)
 	g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (map)));
-#else
-	g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map)));
-#endif
 
 	width = gdk_pixbuf_get_width (priv->map_render_pixbuf);
 	height = gdk_pixbuf_get_height (priv->map_render_pixbuf);
@@ -706,11 +697,7 @@ e_map_zoom_to_location (EMap *map, gdouble longitude, gdouble latitude)
 	EMapPrivate *priv;
 
 	g_return_if_fail (map);
-#if GTK_CHECK_VERSION(2,19,7)
 	g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (map)));
-#else
-	g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map)));
-#endif
 
 	priv = map->priv;
 
@@ -730,11 +717,7 @@ e_map_zoom_out (EMap *map)
 	EMapPrivate *priv;
 
 	g_return_if_fail (map);
-#if GTK_CHECK_VERSION(2,19,7)
 	g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (map)));
-#else
-	g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map)));
-#endif
 
 	priv = map->priv;
 
@@ -970,11 +953,7 @@ update_render_pixbuf (EMap *map,
 	gdouble zoom;
 	gint i;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_realized (GTK_WIDGET (map)))
-#else
-	if (!GTK_WIDGET_REALIZED (map))
-#endif
 		return;
 
 	gtk_widget_get_allocation (GTK_WIDGET (map), &allocation);
@@ -1039,13 +1018,8 @@ request_paint_area (EMap *view, GdkRectangle *area)
 	EMapPrivate *priv;
 	gint width, height;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_is_drawable (GTK_WIDGET (view)) ||
 	    !gtk_widget_get_realized (GTK_WIDGET (view))) return;
-#else
-	if (!GTK_WIDGET_DRAWABLE (GTK_WIDGET (view)) ||
-	    !GTK_WIDGET_REALIZED (GTK_WIDGET (view))) return;
-#endif
 
 	priv = view->priv;
 	if (!priv->map_render_pixbuf) return;
@@ -1255,11 +1229,7 @@ scroll_to (EMap *view, gint x, gint y)
 	priv->xofs = x;
 	priv->yofs = y;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_is_drawable (GTK_WIDGET (view)))
-#else
-	if (!GTK_WIDGET_DRAWABLE (view))
-#endif
 		return;
 
 	gtk_widget_get_allocation (GTK_WIDGET (view), &allocation);
@@ -1573,11 +1543,7 @@ zoom_in_smooth (EMap *map)
 	gdouble x, y;
 
 	g_return_if_fail (map);
-#if GTK_CHECK_VERSION(2,19,7)
 	g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (map)));
-#else
-	g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map)));
-#endif
 
 	gtk_widget_get_allocation (GTK_WIDGET (map), &allocation);
 
@@ -1744,11 +1710,7 @@ set_scroll_area (EMap *view)
 
 	priv = view->priv;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_realized (GTK_WIDGET (view))) return;
-#else
-	if (!GTK_WIDGET_REALIZED (GTK_WIDGET (view))) return;
-#endif
 	if (!priv->hadj || !priv->vadj) return;
 
 	g_object_freeze_notify (G_OBJECT (priv->hadj));
diff --git a/widgets/misc/e-menu-tool-button.c b/widgets/misc/e-menu-tool-button.c
index 0d9599c2f4..5a87e7420a 100644
--- a/widgets/misc/e-menu-tool-button.c
+++ b/widgets/misc/e-menu-tool-button.c
@@ -50,8 +50,7 @@ menu_tool_button_get_first_menu_item (GtkMenuToolButton *menu_tool_button)
 	if (!GTK_IS_MENU (menu))
 		return NULL;
 
-	/* XXX GTK+ 2.18 provides no accessor function. */
-	children = GTK_MENU_SHELL (menu)->children;
+	children = gtk_container_get_children (GTK_CONTAINER (menu));
 	if (children == NULL)
 		return NULL;
 
diff --git a/widgets/misc/e-online-button.c b/widgets/misc/e-online-button.c
index 601aaa4117..1157ecdb86 100644
--- a/widgets/misc/e-online-button.c
+++ b/widgets/misc/e-online-button.c
@@ -51,11 +51,7 @@ online_button_update_tooltip (EOnlineButton *button)
 
 	if (e_online_button_get_online (button))
 		tooltip = ONLINE_TOOLTIP;
-#if GTK_CHECK_VERSION(2,19,7)
 	else if (gtk_widget_get_sensitive (GTK_WIDGET (button)))
-#else
-	else if (GTK_WIDGET_SENSITIVE (button))
-#endif
 		tooltip = OFFLINE_TOOLTIP;
 	else
 		tooltip = NETWORK_UNAVAILABLE_TOOLTIP;
@@ -131,8 +127,8 @@ online_button_class_init (EOnlineButtonClass *class)
 		PROP_ONLINE,
 		g_param_spec_boolean (
 			"online",
-			_("Online"),
-			_("The button state is online"),
+			"Online",
+			"The button state is online",
 			TRUE,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));
@@ -145,7 +141,7 @@ online_button_init (EOnlineButton *button)
 
 	button->priv = E_ONLINE_BUTTON_GET_PRIVATE (button);
 
-	GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus (GTK_WIDGET (button), FALSE);
 	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
 
 	widget = gtk_image_new ();
diff --git a/widgets/misc/e-paned.c b/widgets/misc/e-paned.c
index 2b4701b9ff..3f8b57011a 100644
--- a/widgets/misc/e-paned.c
+++ b/widgets/misc/e-paned.c
@@ -303,8 +303,8 @@ paned_class_init (EPanedClass *class)
 		PROP_HPOSITION,
 		g_param_spec_int (
 			"hposition",
-			_("Horizontal Position"),
-			_("Pane position when oriented horizontally"),
+			"Horizontal Position",
+			"Pane position when oriented horizontally",
 			G_MININT,
 			G_MAXINT,
 			0,
@@ -315,8 +315,8 @@ paned_class_init (EPanedClass *class)
 		PROP_VPOSITION,
 		g_param_spec_int (
 			"vposition",
-			_("Vertical Position"),
-			_("Pane position when oriented vertically"),
+			"Vertical Position",
+			"Pane position when oriented vertically",
 			G_MININT,
 			G_MAXINT,
 			0,
@@ -327,8 +327,8 @@ paned_class_init (EPanedClass *class)
 		PROP_PROPORTION,
 		g_param_spec_double (
 			"proportion",
-			_("Proportion"),
-			_("Proportion of the 2nd pane size"),
+			"Proportion",
+			"Proportion of the 2nd pane size",
 			0.0,
 			1.0,
 			0.0,
@@ -339,8 +339,8 @@ paned_class_init (EPanedClass *class)
 		PROP_FIXED_RESIZE,
 		g_param_spec_boolean (
 			"fixed-resize",
-			_("Fixed Resize"),
-			_("Keep the 2nd pane fixed during resize"),
+			"Fixed Resize",
+			"Keep the 2nd pane fixed during resize",
 			TRUE,
 			G_PARAM_READWRITE));
 }
diff --git a/widgets/misc/e-preferences-window.c b/widgets/misc/e-preferences-window.c
index 9390f047ca..6b38b682f2 100644
--- a/widgets/misc/e-preferences-window.c
+++ b/widgets/misc/e-preferences-window.c
@@ -336,7 +336,7 @@ preferences_window_init (EPreferencesWindow *window)
 	g_signal_connect_swapped (
 		widget, "clicked",
 		G_CALLBACK (gtk_widget_hide), window);
-	GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default (widget, TRUE);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	accel_group = gtk_accel_group_new ();
 	gtk_widget_add_accelerator (
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 06b9ef6e78..aaf18b3912 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -92,11 +92,7 @@ search_bar_update_tokenizer (ESearchBar *search_bar)
 	tokenizer = e_search_bar_get_tokenizer (search_bar);
 	case_sensitive = e_search_bar_get_case_sensitive (search_bar);
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_get_visible (GTK_WIDGET (search_bar)))
-#else
-	if (GTK_WIDGET_VISIBLE (search_bar))
-#endif
 		active_search = search_bar->priv->active_search;
 	else
 		active_search = NULL;
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index 9a2a6a8e68..3dc47e99c3 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -590,15 +590,15 @@ e_selection_model_array_class_init (ESelectionModelArrayClass *klass)
 
 	g_object_class_install_property (object_class, PROP_CURSOR_ROW,
 					 g_param_spec_int ("cursor_row",
-							   _("Cursor Row"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Cursor Row",
+							   NULL,
 							   0, G_MAXINT, 0,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_CURSOR_COL,
 					 g_param_spec_int ("cursor_col",
-							   _("Cursor Column"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Cursor Column",
+							   NULL,
 							   0, G_MAXINT, 0,
 							   G_PARAM_READWRITE));
 }
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index bc858a4c34..882306df9e 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -213,23 +213,23 @@ e_selection_model_class_init (ESelectionModelClass *klass)
 
 	g_object_class_install_property (object_class, PROP_SORTER,
 					 g_param_spec_object ("sorter",
-							      _("Sorter"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Sorter",
+							      NULL,
 							      E_SORTER_TYPE,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_SELECTION_MODE,
 					 g_param_spec_int ("selection_mode",
-							   _("Selection Mode"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Selection Mode",
+							   NULL,
 							   GTK_SELECTION_NONE, GTK_SELECTION_MULTIPLE,
 							   GTK_SELECTION_SINGLE,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_CURSOR_MODE,
 					 g_param_spec_int ("cursor_mode",
-							   _("Cursor Mode"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Cursor Mode",
+							   NULL,
 							   E_CURSOR_LINE, E_CURSOR_SPREADSHEET,
 							   E_CURSOR_LINE,
 							   G_PARAM_READWRITE));
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index 4f2ad8a9a4..c93dceff88 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -495,11 +495,11 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type)
 	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->until_label), priv->delay_until);
 
 	if (priv->global) {
-		GtkWidget *widget = gtk_label_new ("Calendar");
-		gtk_label_set_text (GTK_LABEL (priv->sopts_label), "Mail");
+		GtkWidget *widget = gtk_label_new (_("Calendar"));
+		gtk_label_set_text (GTK_LABEL (priv->sopts_label), _("Mail"));
 		gtk_notebook_append_page (priv->notebook, priv->status, widget);
 		gtk_widget_show (widget);
-		widget = gtk_label_new ("Task");
+		widget = gtk_label_new (_("Task"));
 		gtk_widget_show (widget);
 		gtk_notebook_append_page (priv->notebook, priv->status,widget);
 		gtk_notebook_set_show_tabs (priv->notebook, TRUE);
diff --git a/widgets/misc/e-send-options.ui b/widgets/misc/e-send-options.ui
index c5911d456a..5ca5e7045f 100644
--- a/widgets/misc/e-send-options.ui
+++ b/widgets/misc/e-send-options.ui
@@ -194,7 +194,7 @@
                                 <property name="row_spacing">12</property>
                                 <child>
                                   <object class="GtkRadioButton" id="reply-within">
-                                    <property name="label" translatable="yes">Wi_thin</property>
+                                    <property name="label" translatable="yes" comments="Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number" context="ESendOptionsWithin">Wi_thin</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -227,7 +227,7 @@
                                   <object class="GtkLabel" id="label93">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">days</property>
+                                    <property name="label" translatable="yes" comments="Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number" context="ESendOptionsWithin">days</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
@@ -334,7 +334,7 @@
                                   <object class="GtkLabel" id="label96">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_After:</property>
+                                    <property name="label" translatable="yes" comments="Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number" context="ESendOptionsAfter">_After</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">expire-after</property>
                                   </object>
@@ -361,7 +361,7 @@
                                   <object class="GtkLabel" id="label97">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">days</property>
+                                    <property name="label" translatable="yes" comments="Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number" context="ESendOptionsAfter">days</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -423,7 +423,7 @@
                                   <object class="GtkLabel" id="until-label">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Until:</property>
+                                    <property name="label" translatable="yes" comments="Translators: This is part of 'Until [ date ]', where [ date ] is a date picker" context="ESendOptions">_Until</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">until-date</property>
                                   </object>
diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c
deleted file mode 100644
index 5e7833b34f..0000000000
--- a/widgets/misc/e-spinner.c
+++ /dev/null
@@ -1,992 +0,0 @@
-/*
- * Copyright © 2000 Eazel, Inc.
- * Copyright © 2002-2004 Marco Pesenti Gritti
- * Copyright © 2004, 2006 Christian Persch
- *
- * Nautilus is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Nautilus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Author: Andy Hertzfeld <andy@eazel.com>
- *
- * Ephy port by Marco Pesenti Gritti <marco@it.gnome.org>
- *
- * $Id: e-spinner.c 12639 2006-12-12 17:06:55Z chpe $
- */
-
-/*
- * From Nautilus ephy-spinner.c
- */
-
-#include "config.h"
-
-#include "e-spinner.h"
-
-#define E_TYPE_SPINNER		(e_spinner_get_type ())
-#define E_SPINNER(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_SPINNER, ESpinner))
-#define E_SPINNER_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_SPINNER, ESpinnerClass))
-#define E_IS_SPINNER(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_SPINNER))
-#define E_IS_SPINNER_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_SPINNER))
-#define E_SPINNER_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), E_TYPE_SPINNER, ESpinnerClass))
-
-typedef struct _ESpinner		ESpinner;
-typedef struct _ESpinnerClass	ESpinnerClass;
-typedef struct _ESpinnerDetails	ESpinnerDetails;
-
-struct _ESpinner
-{
-	GtkWidget parent;
-
-	/*< private >*/
-	ESpinnerDetails *details;
-};
-
-struct _ESpinnerClass
-{
-	GtkWidgetClass parent_class;
-};
-
-#define LOG(msg, args...)
-#define START_PROFILER(name)
-#define STOP_PROFILER(name)
-
-#include "e-util/e-icon-factory.h"
-
-/* Spinner cache implementation */
-
-#define E_TYPE_SPINNER_CACHE			(e_spinner_cache_get_type())
-#define E_SPINNER_CACHE(object)		(G_TYPE_CHECK_INSTANCE_CAST((object), E_TYPE_SPINNER_CACHE, ESpinnerCache))
-#define E_SPINNER_CACHE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST((klass), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass))
-#define E_IS_SPINNER_CACHE(object)		(G_TYPE_CHECK_INSTANCE_TYPE((object), E_TYPE_SPINNER_CACHE))
-#define E_IS_SPINNER_CACHE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), E_TYPE_SPINNER_CACHE))
-#define E_SPINNER_CACHE_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass))
-
-typedef struct _ESpinnerCache	ESpinnerCache;
-typedef struct _ESpinnerCacheClass	ESpinnerCacheClass;
-typedef struct _ESpinnerCachePrivate	ESpinnerCachePrivate;
-
-struct _ESpinnerCacheClass
-{
-	GObjectClass parent_class;
-};
-
-struct _ESpinnerCache
-{
-	GObject parent_object;
-
-	/*< private >*/
-	ESpinnerCachePrivate *priv;
-};
-
-#define E_SPINNER_CACHE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), E_TYPE_SPINNER_CACHE, ESpinnerCachePrivate))
-
-struct _ESpinnerCachePrivate
-{
-	/* Hash table of GdkScreen -> ESpinnerCacheData */
-	GHashTable *hash;
-};
-
-typedef struct
-{
-	guint ref_count;
-	GtkIconSize size;
-	gint width;
-	gint height;
-	GdkPixbuf **animation_pixbufs;
-	guint n_animation_pixbufs;
-} ESpinnerImages;
-
-#define LAST_ICON_SIZE			GTK_ICON_SIZE_DIALOG + 1
-#define SPINNER_ICON_NAME		"process-working"
-#define SPINNER_FALLBACK_ICON_NAME	"gnome-spinner"
-#define E_SPINNER_IMAGES_INVALID	((ESpinnerImages *) 0x1)
-
-typedef struct
-{
-	GdkScreen *screen;
-	GtkIconTheme *icon_theme;
-	ESpinnerImages *images[LAST_ICON_SIZE];
-} ESpinnerCacheData;
-
-static void e_spinner_cache_class_init (ESpinnerCacheClass *klass);
-static void e_spinner_cache_init	  (ESpinnerCache *cache);
-
-static GObjectClass *e_spinner_cache_parent_class;
-static gpointer spinner_cache = NULL;
-
-static GType
-e_spinner_cache_get_type (void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY (type == 0))
-	{
-		const GTypeInfo our_info =
-		{
-			sizeof (ESpinnerCacheClass),
-			NULL,
-			NULL,
-			(GClassInitFunc) e_spinner_cache_class_init,
-			NULL,
-			NULL,
-			sizeof (ESpinnerCache),
-			0,
-			(GInstanceInitFunc) e_spinner_cache_init
-		};
-
-		type = g_type_register_static (G_TYPE_OBJECT,
-					       "ESpinnerCache",
-					       &our_info, 0);
-	}
-
-	return type;
-}
-
-static ESpinnerImages *
-e_spinner_images_ref (ESpinnerImages *images)
-{
-	g_return_val_if_fail (images != NULL, NULL);
-
-	images->ref_count++;
-
-	return images;
-}
-
-static void
-e_spinner_images_unref (ESpinnerImages *images)
-{
-	g_return_if_fail (images != NULL);
-
-	images->ref_count--;
-	if (images->ref_count == 0)
-	{
-		guint i;
-
-		LOG ("Freeing spinner images %p for size %d", images, images->size);
-
-		for (i = 0; i < images->n_animation_pixbufs; ++i)
-		{
-			g_object_unref (images->animation_pixbufs[i]);
-		}
-		g_free (images->animation_pixbufs);
-
-		g_free (images);
-	}
-}
-
-static void
-e_spinner_cache_data_unload (ESpinnerCacheData *data)
-{
-	GtkIconSize size;
-	ESpinnerImages *images;
-
-	g_return_if_fail (data != NULL);
-
-	LOG ("ESpinnerDataCache unload for screen %p", data->screen);
-
-	for (size = GTK_ICON_SIZE_INVALID; size < LAST_ICON_SIZE; ++size)
-	{
-		images = data->images[size];
-		data->images[size] = NULL;
-
-		if (images != NULL && images != E_SPINNER_IMAGES_INVALID)
-		{
-			e_spinner_images_unref (images);
-		}
-	}
-}
-
-static GdkPixbuf *
-extract_frame (GdkPixbuf *grid_pixbuf,
-	       gint x,
-	       gint y,
-	       gint size)
-{
-	GdkPixbuf *pixbuf;
-
-	if (x + size > gdk_pixbuf_get_width (grid_pixbuf) ||
-	    y + size > gdk_pixbuf_get_height (grid_pixbuf))
-	{
-		return NULL;
-	}
-
-	pixbuf = gdk_pixbuf_new_subpixbuf (grid_pixbuf,
-					   x, y,
-					   size, size);
-	g_return_val_if_fail (pixbuf != NULL, NULL);
-
-	return pixbuf;
-}
-
-static GdkPixbuf *
-scale_to_size (GdkPixbuf *pixbuf,
-	       gint dw,
-	       gint dh)
-{
-	GdkPixbuf *result;
-	gint pw, ph;
-
-	g_return_val_if_fail (pixbuf != NULL, NULL);
-
-	pw = gdk_pixbuf_get_width (pixbuf);
-	ph = gdk_pixbuf_get_height (pixbuf);
-
-	if (pw != dw || ph != dh)
-	{
-		result = e_icon_factory_pixbuf_scale (pixbuf, dw, dh);
-		g_object_unref (pixbuf);
-		return result;
-	}
-
-	return pixbuf;
-}
-
-static ESpinnerImages *
-e_spinner_images_load (GdkScreen *screen,
-			  GtkIconTheme *icon_theme,
-			  GtkIconSize icon_size)
-{
-	ESpinnerImages *images;
-	GdkPixbuf *icon_pixbuf, *pixbuf;
-	GtkIconInfo *icon_info = NULL;
-	gint grid_width, grid_height, x, y, requested_size, size, isw, ish, n;
-	const gchar *icon;
-	GSList *list = NULL, *l;
-
-	LOG ("ESpinnerCacheData loading for screen %p at size %d", screen, icon_size);
-
-	START_PROFILER ("loading spinner animation")
-
-	if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen),
-						icon_size, &isw, &ish)) goto loser;
-
-	requested_size = MAX (ish, isw);
-
-	/* Load the animation. The 'rest icon' is the 0th frame */
-	icon_info = gtk_icon_theme_lookup_icon (icon_theme,
-						SPINNER_ICON_NAME,
-						requested_size, 0);
-	if (icon_info == NULL)
-	{
-		g_warning ("Throbber animation not found");
-
-		/* If the icon naming spec compliant name wasn't found, try the old name */
-		icon_info = gtk_icon_theme_lookup_icon (icon_theme,
-							SPINNER_FALLBACK_ICON_NAME,
-							requested_size, 0);
-		if (icon_info == NULL)
-		{
-			g_warning ("Throbber fallback animation not found either");
-			goto loser;
-		}
-	}
-	if (icon_info == NULL) {
-		g_warning ("icon_info is NULL");
-		goto loser;
-	}
-
-	size = gtk_icon_info_get_base_size (icon_info);
-	icon = gtk_icon_info_get_filename (icon_info);
-	if (icon == NULL) goto loser;
-
-	icon_pixbuf = gdk_pixbuf_new_from_file (icon, NULL);
-	gtk_icon_info_free (icon_info);
-	icon_info = NULL;
-
-	if (icon_pixbuf == NULL)
-	{
-		g_warning ("Could not load the spinner file");
-		goto loser;
-	}
-
-	grid_width = gdk_pixbuf_get_width (icon_pixbuf);
-	grid_height = gdk_pixbuf_get_height (icon_pixbuf);
-
-	n = 0;
-	for (y = 0; y < grid_height; y += size)
-	{
-		for (x = 0; x < grid_width; x += size)
-		{
-			pixbuf = extract_frame (icon_pixbuf, x, y, size);
-
-			if (pixbuf)
-			{
-				list = g_slist_prepend (list, pixbuf);
-				++n;
-			}
-			else
-			{
-				g_warning ("Cannot extract frame (%d, %d) from the grid\n", x, y);
-			}
-		}
-	}
-
-	g_object_unref (icon_pixbuf);
-
-	if (list == NULL || n <= 0) goto loser;
-
-	if (size > requested_size)
-	{
-		for (l = list; l != NULL; l = l->next)
-		{
-			l->data = scale_to_size (l->data, isw, ish);
-		}
-	}
-
-	/* Now we've successfully got all the data */
-	images = g_new (ESpinnerImages, 1);
-	images->ref_count = 1;
-
-	images->size = icon_size;
-	images->width = images->height = requested_size;
-
-	images->n_animation_pixbufs = n;
-	images->animation_pixbufs = g_new (GdkPixbuf *, n);
-
-	for (l = list; l != NULL; l = l->next)
-	{
-		if (l->data)
-			images->animation_pixbufs[--n] = l->data;
-	}
-	if (n != 0) {
-		g_warning ("n != 0 \n");
-	}
-
-	g_slist_free (list);
-
-	STOP_PROFILER ("loading spinner animation")
-
-	return images;
-
-loser:
-	if (icon_info)
-	{
-		gtk_icon_info_free (icon_info);
-	}
-	g_slist_foreach (list, (GFunc) g_object_unref, NULL);
-
-	STOP_PROFILER ("loading spinner animation")
-
-	return NULL;
-}
-
-static ESpinnerCacheData *
-e_spinner_cache_data_new (GdkScreen *screen)
-{
-	ESpinnerCacheData *data;
-
-	data = g_new0 (ESpinnerCacheData, 1);
-
-	data->screen = screen;
-	data->icon_theme = gtk_icon_theme_get_for_screen (screen);
-	g_signal_connect_swapped (data->icon_theme, "changed",
-				  G_CALLBACK (e_spinner_cache_data_unload),
-				  data);
-
-	return data;
-}
-
-static void
-e_spinner_cache_data_free (ESpinnerCacheData *data)
-{
-	g_return_if_fail (data != NULL);
-	g_return_if_fail (data->icon_theme != NULL);
-
-	g_signal_handlers_disconnect_by_func
-		(data->icon_theme,
-		 G_CALLBACK (e_spinner_cache_data_unload), data);
-
-	e_spinner_cache_data_unload (data);
-
-	g_free (data);
-}
-
-static ESpinnerImages *
-e_spinner_cache_get_images (ESpinnerCache *cache,
-			       GdkScreen *screen,
-			       GtkIconSize icon_size)
-{
-	ESpinnerCachePrivate *priv = cache->priv;
-	ESpinnerCacheData *data;
-	ESpinnerImages *images;
-
-	LOG ("Getting animation images for screen %p at size %d", screen, icon_size);
-
-	g_return_val_if_fail (icon_size < LAST_ICON_SIZE, NULL);
-
-	/* Backward compat: "invalid" meant "native" size which doesn't exist anymore */
-	if (icon_size == GTK_ICON_SIZE_INVALID)
-	{
-		icon_size = GTK_ICON_SIZE_DIALOG;
-	}
-
-	data = g_hash_table_lookup (priv->hash, screen);
-	if (data == NULL)
-	{
-		data = e_spinner_cache_data_new (screen);
-		/* FIXME: think about what happens when the screen's display is closed later on */
-		g_hash_table_insert (priv->hash, screen, data);
-	}
-
-	images = data->images[icon_size];
-	if (images == E_SPINNER_IMAGES_INVALID)
-	{
-		/* Load failed, but don't try endlessly again! */
-		return NULL;
-	}
-
-	if (images != NULL)
-	{
-		/* Return cached data */
-		return e_spinner_images_ref (images);
-	}
-
-	images = e_spinner_images_load (screen, data->icon_theme, icon_size);
-
-	if (images == NULL)
-	{
-		/* Mark as failed-to-load */
-		data->images[icon_size] = E_SPINNER_IMAGES_INVALID;
-
-		return NULL;
-	}
-
-	data->images[icon_size] = images;
-
-	return e_spinner_images_ref (images);
-}
-
-static void
-e_spinner_cache_init (ESpinnerCache *cache)
-{
-	ESpinnerCachePrivate *priv;
-
-	priv = cache->priv = E_SPINNER_CACHE_GET_PRIVATE (cache);
-
-	LOG ("ESpinnerCache initialising");
-
-	priv->hash = g_hash_table_new_full (g_direct_hash, g_direct_equal,
-					    NULL,
-					    (GDestroyNotify) e_spinner_cache_data_free);
-}
-
-static void
-e_spinner_cache_finalize (GObject *object)
-{
-	ESpinnerCache *cache = E_SPINNER_CACHE (object);
-	ESpinnerCachePrivate *priv = cache->priv;
-
-	g_hash_table_destroy (priv->hash);
-
-	LOG ("ESpinnerCache finalised");
-
-	G_OBJECT_CLASS (e_spinner_cache_parent_class)->finalize (object);
-}
-
-static void
-e_spinner_cache_class_init (ESpinnerCacheClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	e_spinner_cache_parent_class = g_type_class_peek_parent (klass);
-
-	object_class->finalize = e_spinner_cache_finalize;
-
-	g_type_class_add_private (object_class, sizeof (ESpinnerCachePrivate));
-}
-
-static ESpinnerCache *
-e_spinner_cache_ref (void)
-{
-	if (G_UNLIKELY (spinner_cache == NULL))
-	{
-		spinner_cache = g_object_new (E_TYPE_SPINNER_CACHE, NULL);
-		g_object_add_weak_pointer (
-                        G_OBJECT (spinner_cache), &spinner_cache);
-	}
-
-	return g_object_ref_sink (spinner_cache);
-}
-
-/* Spinner implementation */
-
-#define SPINNER_TIMEOUT 125 /* ms */
-
-#define E_SPINNER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), E_TYPE_SPINNER, ESpinnerDetails))
-
-struct _ESpinnerDetails
-{
-	GtkIconTheme *icon_theme;
-	ESpinnerCache *cache;
-	GtkIconSize size;
-	ESpinnerImages *images;
-	guint current_image;
-	guint timeout;
-	guint timer_task;
-	guint spinning : 1;
-	guint need_load : 1;
-};
-
-static void e_spinner_class_init (ESpinnerClass *class);
-static void e_spinner_init	    (ESpinner *spinner);
-
-static GObjectClass *parent_class;
-
-static GType
-e_spinner_get_type (void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY (type == 0))
-	{
-		const GTypeInfo our_info =
-		{
-			sizeof (ESpinnerClass),
-			NULL, /* base_init */
-			NULL, /* base_finalize */
-			(GClassInitFunc) e_spinner_class_init,
-			NULL,
-			NULL, /* class_data */
-			sizeof (ESpinner),
-			0, /* n_preallocs */
-			(GInstanceInitFunc) e_spinner_init
-		};
-
-		type = g_type_register_static (GTK_TYPE_WIDGET,
-					       "ESpinner",
-					       &our_info, 0);
-	}
-
-	return type;
-}
-
-static gboolean
-e_spinner_load_images (ESpinner *spinner)
-{
-	ESpinnerDetails *details = spinner->details;
-
-	if (details->need_load)
-	{
-		START_PROFILER ("e_spinner_load_images")
-
-		details->images =
-			e_spinner_cache_get_images
-				(details->cache,
-				 gtk_widget_get_screen (GTK_WIDGET (spinner)),
-				 details->size);
-
-		STOP_PROFILER ("e_spinner_load_images")
-
-		details->current_image = 0; /* 'rest' icon */
-		details->need_load = FALSE;
-	}
-
-	return details->images != NULL;
-}
-
-static void
-e_spinner_unload_images (ESpinner *spinner)
-{
-	ESpinnerDetails *details = spinner->details;
-
-	if (details->images != NULL)
-	{
-		e_spinner_images_unref (details->images);
-		details->images = NULL;
-	}
-
-	details->current_image = 0;
-	details->need_load = TRUE;
-}
-
-static void
-icon_theme_changed_cb (GtkIconTheme *icon_theme,
-		       ESpinner *spinner)
-{
-	e_spinner_unload_images (spinner);
-	gtk_widget_queue_resize (GTK_WIDGET (spinner));
-}
-
-static void
-e_spinner_init (ESpinner *spinner)
-{
-	ESpinnerDetails *details;
-
-	details = spinner->details = E_SPINNER_GET_PRIVATE (spinner);
-
-	GTK_WIDGET_SET_FLAGS (GTK_WIDGET (spinner), GTK_NO_WINDOW);
-
-	details->cache = e_spinner_cache_ref ();
-	details->size = GTK_ICON_SIZE_DIALOG;
-	details->spinning = FALSE;
-	details->timeout = SPINNER_TIMEOUT;
-	details->need_load = TRUE;
-}
-
-static gint
-e_spinner_expose (GtkWidget *widget,
-		     GdkEventExpose *event)
-{
-	ESpinner *spinner = E_SPINNER (widget);
-	ESpinnerDetails *details = spinner->details;
-	ESpinnerImages *images;
-	GtkAllocation allocation;
-	GdkPixbuf *pixbuf;
-	GdkWindow *window;
-	GdkGC *gc;
-	gint x_offset, y_offset, width, height;
-	GdkRectangle pix_area, dest;
-
-#if GTK_CHECK_VERSION(2,19,7)
-	if (!gtk_widget_is_drawable (GTK_WIDGET (spinner)))
-#else
-	if (!GTK_WIDGET_DRAWABLE (spinner))
-#endif
-	{
-		return FALSE;
-	}
-
-	if (details->need_load &&
-	    !e_spinner_load_images (spinner))
-	{
-		return FALSE;
-	}
-
-	images = details->images;
-	if (images == NULL)
-	{
-		return FALSE;
-	}
-
-	/* Otherwise |images| will be NULL anyway */
-	g_return_val_if_fail (images->n_animation_pixbufs > 0, FALSE);
-
-	g_return_val_if_fail (
-		details->current_image < images->n_animation_pixbufs, FALSE);
-
-	pixbuf = images->animation_pixbufs[details->current_image];
-
-	g_return_val_if_fail (pixbuf != NULL, FALSE);
-
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
-
-	gtk_widget_get_allocation (widget, &allocation);
-
-	/* Compute the offsets for the image centered on our allocation */
-	x_offset = (allocation.width - width) / 2;
-	y_offset = (allocation.height - height) / 2;
-
-	pix_area.x = x_offset + allocation.x;
-	pix_area.y = y_offset + allocation.y;
-	pix_area.width = width;
-	pix_area.height = height;
-
-	if (!gdk_rectangle_intersect (&event->area, &pix_area, &dest))
-	{
-		return FALSE;
-	}
-
-	window = gtk_widget_get_window (widget);
-
-	gc = gdk_gc_new (window);
-	gdk_draw_pixbuf (window, gc, pixbuf,
-			 dest.x - x_offset - allocation.x,
-			 dest.y - y_offset - allocation.y,
-			 dest.x, dest.y,
-			 dest.width, dest.height,
-			 GDK_RGB_DITHER_MAX, 0, 0);
-	g_object_unref (gc);
-
-	return FALSE;
-}
-
-static gboolean
-bump_spinner_frame_cb (ESpinner *spinner)
-{
-	ESpinnerDetails *details = spinner->details;
-
-	/* This can happen when we've unloaded the images on a theme
-	 * change, but haven't been in the queued size request yet.
-	 * Just skip this update.
-	 */
-	if (details->images == NULL) return TRUE;
-
-	details->current_image++;
-	if (details->current_image >= details->images->n_animation_pixbufs)
-	{
-		/* the 0th frame is the 'rest' icon */
-		details->current_image = MIN (1, details->images->n_animation_pixbufs);
-	}
-
-	gtk_widget_queue_draw (GTK_WIDGET (spinner));
-
-	/* run again */
-	return TRUE;
-}
-
-static void
-e_spinner_start (ESpinner *spinner)
-{
-	ESpinnerDetails *details = spinner->details;
-
-	details->spinning = TRUE;
-
-#if GTK_CHECK_VERSION(2,19,7)
-	if (gtk_widget_get_mapped (GTK_WIDGET (spinner)) &&
-#else
-	if (GTK_WIDGET_MAPPED (GTK_WIDGET (spinner)) &&
-#endif
-	    details->timer_task == 0 &&
-	    e_spinner_load_images (spinner))
-	{
-		/* the 0th frame is the 'rest' icon */
-		details->current_image = MIN (1, details->images->n_animation_pixbufs);
-
-		details->timer_task =
-			g_timeout_add_full (G_PRIORITY_LOW,
-					    details->timeout,
-					    (GSourceFunc) bump_spinner_frame_cb,
-					    spinner,
-					    NULL);
-	}
-}
-
-static void
-e_spinner_remove_update_callback (ESpinner *spinner)
-{
-	ESpinnerDetails *details = spinner->details;
-
-	if (details->timer_task != 0)
-	{
-		g_source_remove (details->timer_task);
-		details->timer_task = 0;
-	}
-}
-
-static void
-e_spinner_set_size (ESpinner *spinner,
-		       GtkIconSize size)
-{
-	if (size == GTK_ICON_SIZE_INVALID)
-	{
-		size = GTK_ICON_SIZE_DIALOG;
-	}
-
-	if (size != spinner->details->size)
-	{
-		e_spinner_unload_images (spinner);
-
-		spinner->details->size = size;
-
-		gtk_widget_queue_resize (GTK_WIDGET (spinner));
-	}
-}
-
-#if 0
-
-static void
-e_spinner_stop (ESpinner *spinner)
-{
-	ESpinnerDetails *details = spinner->details;
-
-	details->spinning = FALSE;
-	details->current_image = 0;
-
-	if (details->timer_task != 0)
-	{
-		e_spinner_remove_update_callback (spinner);
-
-		if (GTK_WIDGET_MAPPED (GTK_WIDGET (spinner)))
-		{
-			gtk_widget_queue_draw (GTK_WIDGET (spinner));
-		}
-	}
-}
-
-/*
- * e_spinner_set_timeout:
- * @spinner: a #ESpinner
- * @timeout: time delay between updates to the spinner.
- *
- * Sets the timeout delay for spinner updates.
- **/
-void
-e_spinner_set_timeout (ESpinner *spinner,
-			  guint timeout)
-{
-	ESpinnerDetails *details = spinner->details;
-
-	if (timeout != details->timeout)
-	{
-		e_spinner_stop (spinner);
-
-		details->timeout = timeout;
-
-		if (details->spinning)
-		{
-			e_spinner_start (spinner);
-		}
-	}
-}
-#endif
-
-static void
-e_spinner_size_request (GtkWidget *widget,
-			   GtkRequisition *requisition)
-{
-	ESpinner *spinner = E_SPINNER (widget);
-	ESpinnerDetails *details = spinner->details;
-
-	if ((details->need_load &&
-	     !e_spinner_load_images (spinner)) ||
-            details->images == NULL)
-	{
-		requisition->width = requisition->height = 0;
-		gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget),
-						   details->size,
-						   &requisition->width,
-						   &requisition->height);
-		return;
-	}
-
-	requisition->width = details->images->width;
-	requisition->height = details->images->height;
-
-	/* FIXME fix this hack */
-	/* allocate some extra margin so we don't butt up against toolbar edges */
-	if (details->size != GTK_ICON_SIZE_MENU)
-	{
-		requisition->width += 2;
-		requisition->height += 2;
-	}
-}
-
-static void
-e_spinner_map (GtkWidget *widget)
-{
-	ESpinner *spinner = E_SPINNER (widget);
-	ESpinnerDetails *details = spinner->details;
-
-	GTK_WIDGET_CLASS (parent_class)->map (widget);
-
-	if (details->spinning)
-	{
-		e_spinner_start (spinner);
-	}
-}
-
-static void
-e_spinner_unmap (GtkWidget *widget)
-{
-	ESpinner *spinner = E_SPINNER (widget);
-
-	e_spinner_remove_update_callback (spinner);
-
-	GTK_WIDGET_CLASS (parent_class)->unmap (widget);
-}
-
-static void
-e_spinner_dispose (GObject *object)
-{
-	ESpinner *spinner = E_SPINNER (object);
-
-	if (spinner->details->icon_theme)
-		g_signal_handlers_disconnect_by_func
-				(spinner->details->icon_theme,
-			 G_CALLBACK (icon_theme_changed_cb), spinner);
-
-	G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-e_spinner_finalize (GObject *object)
-{
-	ESpinner *spinner = E_SPINNER (object);
-
-	e_spinner_remove_update_callback (spinner);
-	e_spinner_unload_images (spinner);
-
-	g_object_unref (spinner->details->cache);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-e_spinner_screen_changed (GtkWidget *widget,
-			     GdkScreen *old_screen)
-{
-	ESpinner *spinner = E_SPINNER (widget);
-	ESpinnerDetails *details = spinner->details;
-	GdkScreen *screen;
-
-	if (GTK_WIDGET_CLASS (parent_class)->screen_changed)
-	{
-		GTK_WIDGET_CLASS (parent_class)->screen_changed (widget, old_screen);
-	}
-
-	screen = gtk_widget_get_screen (widget);
-
-	/* FIXME: this seems to be happening when then spinner is destroyed!? */
-	if (old_screen == screen) return;
-
-	/* We'll get mapped again on the new screen, but not unmapped from
-	 * the old screen, so remove timeout here.
-	 */
-	e_spinner_remove_update_callback (spinner);
-
-	e_spinner_unload_images (spinner);
-
-	if (old_screen != NULL)
-	{
-		g_signal_handlers_disconnect_by_func
-			(gtk_icon_theme_get_for_screen (old_screen),
-			 G_CALLBACK (icon_theme_changed_cb), spinner);
-	}
-
-	details->icon_theme = gtk_icon_theme_get_for_screen (screen);
-	g_signal_connect (details->icon_theme, "changed",
-			  G_CALLBACK (icon_theme_changed_cb), spinner);
-}
-
-static void
-e_spinner_class_init (ESpinnerClass *class)
-{
-	GObjectClass *object_class =  G_OBJECT_CLASS (class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-	parent_class = g_type_class_peek_parent (class);
-
-	object_class->dispose = e_spinner_dispose;
-	object_class->finalize = e_spinner_finalize;
-
-	widget_class->expose_event = e_spinner_expose;
-	widget_class->size_request = e_spinner_size_request;
-	widget_class->map = e_spinner_map;
-	widget_class->unmap = e_spinner_unmap;
-	widget_class->screen_changed = e_spinner_screen_changed;
-
-	g_type_class_add_private (object_class, sizeof (ESpinnerDetails));
-}
-
-GtkWidget *e_spinner_new_spinning_small_shown (void)
-{
-  ESpinner *image;
-  image = E_SPINNER (g_object_new (E_TYPE_SPINNER, NULL));
-
-  e_spinner_set_size (image, GTK_ICON_SIZE_SMALL_TOOLBAR);
-  e_spinner_start (image);
-  gtk_widget_show (GTK_WIDGET(image));
-
-  return GTK_WIDGET (image);
-}
diff --git a/widgets/misc/e-spinner.h b/widgets/misc/e-spinner.h
deleted file mode 100644
index 0fb97d945e..0000000000
--- a/widgets/misc/e-spinner.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- * Copyright © 2000 Eazel, Inc.
- * Copyright © 2004, 2006 Christian Persch
- *
- * Nautilus is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Nautilus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Author: Andy Hertzfeld <andy@eazel.com>
- *
- * $Id: ephy-spinner.h 12639 2006-12-12 17:06:55Z chpe $
- */
-
-/*
- * From Nautilus ephy-spinner.h
- */
-#ifndef E_SPINNER_H
-#define E_SPINNER_H
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-GtkWidget *e_spinner_new_spinning_small_shown (void);
-
-G_END_DECLS
-
-#endif /* E_SPINNER_H */
diff --git a/widgets/misc/e-web-view-preview.c b/widgets/misc/e-web-view-preview.c
new file mode 100644
index 0000000000..e268779827
--- /dev/null
+++ b/widgets/misc/e-web-view-preview.c
@@ -0,0 +1,481 @@
+/*
+ * e-web-view-preview.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#include "e-web-view-preview.h"
+
+#include <config.h>
+#include <string.h>
+#include <glib/gi18n-lib.h>
+
+#define E_WEB_VIEW_PREVIEW_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_WEB_VIEW_PREVIEW, EWebViewPreviewPrivate))
+
+struct _EWebViewPreviewPrivate {
+	gboolean escape_values;
+	GString *updating_content; /* is NULL when not between begin_update/end_update */
+};
+
+enum {
+	PROP_0,
+	PROP_TREE_VIEW,
+	PROP_PREVIEW_WIDGET,
+	PROP_ESCAPE_VALUES
+};
+
+G_DEFINE_TYPE (EWebViewPreview, e_web_view_preview, GTK_TYPE_VPANED);
+
+static void
+web_view_preview_set_property (GObject *object,
+                       guint property_id,
+                       const GValue *value,
+                       GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_ESCAPE_VALUES:
+			e_web_view_preview_set_escape_values (
+				E_WEB_VIEW_PREVIEW (object),
+				g_value_get_boolean (value));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+web_view_preview_get_property (GObject *object,
+                       guint property_id,
+                       GValue *value,
+                       GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_TREE_VIEW:
+			g_value_set_object (
+				value, e_web_view_preview_get_tree_view (
+				E_WEB_VIEW_PREVIEW (object)));
+			return;
+
+		case PROP_PREVIEW_WIDGET:
+			g_value_set_object (
+				value, e_web_view_preview_get_preview (
+				E_WEB_VIEW_PREVIEW (object)));
+			return;
+
+		case PROP_ESCAPE_VALUES:
+			g_value_set_boolean (
+				value, e_web_view_preview_get_escape_values (
+				E_WEB_VIEW_PREVIEW (object)));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+web_view_preview_dispose (GObject *object)
+{
+	EWebViewPreviewPrivate *priv;
+
+	priv = E_WEB_VIEW_PREVIEW_GET_PRIVATE (object);
+
+	if (priv->updating_content != NULL) {
+		g_string_free (priv->updating_content, TRUE);
+		priv->updating_content = NULL;
+	}
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_web_view_preview_parent_class)->dispose (object);
+}
+
+static void
+e_web_view_preview_class_init (EWebViewPreviewClass *klass)
+{
+	GObjectClass *object_class;
+
+	g_type_class_add_private (klass, sizeof (EWebViewPreviewPrivate));
+
+	object_class = G_OBJECT_CLASS (klass);
+	object_class->set_property = web_view_preview_set_property;
+	object_class->get_property = web_view_preview_get_property;
+	object_class->dispose = web_view_preview_dispose;
+
+	g_object_class_install_property (
+		object_class,
+		PROP_TREE_VIEW,
+		g_param_spec_object (
+			"tree-view",
+			"Tree View",
+			NULL,
+			GTK_TYPE_TREE_VIEW,
+			G_PARAM_READABLE));
+
+	g_object_class_install_property (
+		object_class,
+		PROP_PREVIEW_WIDGET,
+		g_param_spec_object (
+			"preview-widget",
+			"Preview Widget",
+			NULL,
+			GTK_TYPE_WIDGET,
+			G_PARAM_READABLE));
+
+	g_object_class_install_property (
+		object_class,
+		PROP_ESCAPE_VALUES,
+		g_param_spec_boolean (
+			"escape-values",
+			"Whether escaping values automatically, when inserting",
+			NULL,
+			TRUE,
+			G_PARAM_READWRITE));
+}
+
+static GtkWidget *
+in_scrolled_window (GtkWidget *widget)
+{
+	GtkWidget *sw;
+
+	g_return_val_if_fail (widget != NULL, NULL);
+
+	sw = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_container_add (GTK_CONTAINER (sw), widget);
+
+	gtk_widget_show (widget);
+	gtk_widget_show (sw);
+
+	return sw;
+}
+
+static void
+e_web_view_preview_init (EWebViewPreview *preview)
+{
+	GtkWidget *tree_view_sw, *web_view_sw;
+	EWebViewPreviewPrivate *priv;
+
+	priv = E_WEB_VIEW_PREVIEW_GET_PRIVATE (preview);
+	preview->priv = priv;
+	priv->escape_values = TRUE;
+
+	tree_view_sw = in_scrolled_window (gtk_tree_view_new ());
+	web_view_sw = in_scrolled_window (e_web_view_new ());
+
+	gtk_widget_hide (tree_view_sw);
+	gtk_widget_show (web_view_sw);
+
+	gtk_paned_pack1 (GTK_PANED (preview), tree_view_sw, FALSE, TRUE);
+	gtk_paned_pack2 (GTK_PANED (preview), web_view_sw, TRUE, TRUE);
+
+	/* rawly 3 lines of a text plus a little bit more */
+	if (gtk_paned_get_position (GTK_PANED (preview)) < 85)
+		gtk_paned_set_position (GTK_PANED (preview), 85);
+}
+
+GtkWidget *
+e_web_view_preview_new (void)
+{
+	return g_object_new (E_TYPE_WEB_VIEW_PREVIEW, NULL);
+}
+
+GtkTreeView *
+e_web_view_preview_get_tree_view (EWebViewPreview *preview)
+{
+	g_return_val_if_fail (preview != NULL, NULL);
+	g_return_val_if_fail (E_IS_WEB_VIEW_PREVIEW (preview), NULL);
+
+	return GTK_TREE_VIEW (gtk_bin_get_child (GTK_BIN (gtk_paned_get_child1 (GTK_PANED (preview)))));
+}
+
+GtkWidget *
+e_web_view_preview_get_preview	(EWebViewPreview *preview)
+{
+	g_return_val_if_fail (preview != NULL, NULL);
+	g_return_val_if_fail (E_IS_WEB_VIEW_PREVIEW (preview), NULL);
+
+	return gtk_bin_get_child (GTK_BIN (gtk_paned_get_child2 (GTK_PANED (preview))));
+}
+
+void
+e_web_view_preview_set_preview	(EWebViewPreview *preview, GtkWidget *preview_widget)
+{
+	GtkWidget *old_child;
+
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
+	g_return_if_fail (preview_widget != NULL);
+	g_return_if_fail (GTK_IS_WIDGET (preview_widget));
+
+	old_child = gtk_bin_get_child (GTK_BIN (gtk_paned_get_child2 (GTK_PANED (preview))));
+	if (old_child) {
+		g_return_if_fail (old_child != preview_widget);
+		gtk_widget_destroy (old_child);
+	}
+
+	gtk_container_add (GTK_CONTAINER (gtk_paned_get_child2 (GTK_PANED (preview))), preview_widget);
+}
+
+void
+e_web_view_preview_show_tree_view (EWebViewPreview *preview)
+{
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
+
+	gtk_widget_show (gtk_paned_get_child1 (GTK_PANED (preview)));
+}
+
+void
+e_web_view_preview_hide_tree_view(EWebViewPreview *preview)
+{
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
+
+	gtk_widget_hide (gtk_paned_get_child1 (GTK_PANED (preview)));
+}
+
+void
+e_web_view_preview_set_escape_values (EWebViewPreview *preview, gboolean escape)
+{
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
+	g_return_if_fail (preview->priv != NULL);
+
+	preview->priv->escape_values = escape;
+}
+
+gboolean
+e_web_view_preview_get_escape_values (EWebViewPreview *preview)
+{
+	g_return_val_if_fail (preview != NULL, FALSE);
+	g_return_val_if_fail (E_IS_WEB_VIEW_PREVIEW (preview), FALSE);
+	g_return_val_if_fail (preview->priv != NULL, FALSE);
+
+	return preview->priv->escape_values;
+}
+
+void
+e_web_view_preview_begin_update (EWebViewPreview *preview)
+{
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
+	g_return_if_fail (preview->priv != NULL);
+
+	if (preview->priv->updating_content) {
+		g_warning ("%s: Previous content update isn't finished with e_web_view_preview_end_update()", G_STRFUNC);
+		g_string_free (preview->priv->updating_content, TRUE);
+	}
+
+	preview->priv->updating_content = g_string_new ("<TABLE width=\"100%\" border=\"0\" cols=\"2\">");
+}
+
+void
+e_web_view_preview_end_update (EWebViewPreview *preview)
+{
+	GtkWidget *web_view;
+
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
+	g_return_if_fail (preview->priv != NULL);
+	g_return_if_fail (preview->priv->updating_content != NULL);
+
+	g_string_append (preview->priv->updating_content, "</TABLE>");
+
+	web_view = e_web_view_preview_get_preview (preview);
+	if (E_IS_WEB_VIEW (web_view))
+		e_web_view_load_string (E_WEB_VIEW (web_view), preview->priv->updating_content->str);
+
+	g_string_free (preview->priv->updating_content, TRUE);
+	preview->priv->updating_content = NULL;
+}
+
+static gchar *
+replace_string (const gchar *text, const gchar *find, const gchar *replace)
+{
+	const gchar *p, *next;
+	GString *str;
+	gint find_len;
+
+	g_return_val_if_fail (text != NULL, NULL);
+	g_return_val_if_fail (find != NULL, NULL);
+	g_return_val_if_fail (*find, NULL);
+
+	find_len = strlen (find);
+	str = g_string_new ("");
+
+	p = text;
+	while (next = strstr (p, find), next) {
+		if (p + 1 < next)
+			g_string_append_len (str, p, next - p);
+
+		if (replace && *replace)
+			g_string_append (str, replace);
+
+		p = next + find_len;
+	}
+
+	g_string_append (str, p);
+
+	return g_string_free (str, FALSE);
+}
+
+static gchar *
+web_view_preview_escape_text (EWebViewPreview *preview, const gchar *text)
+{
+	gchar *utf8_valid, *res, *end;
+
+	if (!e_web_view_preview_get_escape_values (preview))
+		return NULL;
+
+	g_return_val_if_fail (text != NULL, NULL);
+
+	if (g_utf8_validate (text, -1, NULL)) {
+		res = g_markup_escape_text (text, -1);
+	} else {
+		utf8_valid = g_strdup (text);
+		while (end = NULL, !g_utf8_validate (utf8_valid, -1, (const gchar **) &end) && end && *end)
+			*end = '?';
+
+		res = g_markup_escape_text (utf8_valid, -1);
+
+		g_free (utf8_valid);
+	}
+
+	if (res && strchr (res, '\n')) {
+		/* replace line breaks with <BR> */
+		if (strchr (res, '\r')) {
+			end = replace_string (res, "\r", "");
+			g_free (res);
+			res = end;
+		}
+
+		end = replace_string (res, "\n", "<BR>");
+		g_free (res);
+		res = end;
+	}
+
+	return res;
+}
+
+void
+e_web_view_preview_add_header (EWebViewPreview *preview, gint index, const gchar *header)
+{
+	gchar *escaped;
+
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
+	g_return_if_fail (preview->priv != NULL);
+	g_return_if_fail (preview->priv->updating_content != NULL);
+	g_return_if_fail (header != NULL);
+
+	if (index < 1)
+		index = 1;
+	else if (index > 6)
+		index = 6;
+
+	escaped = web_view_preview_escape_text (preview, header);
+	if (escaped)
+		header = escaped;
+
+	g_string_append_printf (preview->priv->updating_content, "<TR><TD colspan=2><H%d>%s</H%d></TD></TR>", index, header, index);
+
+	g_free (escaped);
+}
+
+void
+e_web_view_preview_add_text (EWebViewPreview *preview, const gchar *text)
+{
+	gchar *escaped;
+
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
+	g_return_if_fail (preview->priv != NULL);
+	g_return_if_fail (preview->priv->updating_content != NULL);
+	g_return_if_fail (text != NULL);
+
+	escaped = web_view_preview_escape_text (preview, text);
+	if (escaped)
+		text = escaped;
+
+	g_string_append_printf (preview->priv->updating_content, "<TR><TD colspan=2><FONT size=\"3\">%s</FONT></TD></TR>", text);
+
+	g_free (escaped);
+}
+
+void
+e_web_view_preview_add_raw_html (EWebViewPreview *preview, const gchar *raw_html)
+{
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
+	g_return_if_fail (preview->priv != NULL);
+	g_return_if_fail (preview->priv->updating_content != NULL);
+	g_return_if_fail (raw_html != NULL);
+
+	g_string_append_printf (preview->priv->updating_content, "<TR><TD colspan=2>%s</TD></TR>", raw_html);
+}
+
+void
+e_web_view_preview_add_separator (EWebViewPreview *preview)
+{
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
+	g_return_if_fail (preview->priv != NULL);
+	g_return_if_fail (preview->priv->updating_content != NULL);
+
+	g_string_append (preview->priv->updating_content, "<TR><TD colspan=2><HR></TD></TR>");
+}
+
+void
+e_web_view_preview_add_empty_line (EWebViewPreview *preview)
+{
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
+	g_return_if_fail (preview->priv != NULL);
+	g_return_if_fail (preview->priv->updating_content != NULL);
+
+	g_string_append (preview->priv->updating_content, "<TR><TD colspan=2>&nbsp;</TD></TR>");
+}
+
+/* section can be NULL, but value cannot */
+void
+e_web_view_preview_add_section (EWebViewPreview *preview, const gchar *section, const gchar *value)
+{
+	gchar *escaped_section = NULL, *escaped_value;
+
+	g_return_if_fail (preview != NULL);
+	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
+	g_return_if_fail (preview->priv != NULL);
+	g_return_if_fail (preview->priv->updating_content != NULL);
+	g_return_if_fail (value != NULL);
+
+	if (section) {
+		escaped_section = web_view_preview_escape_text (preview, section);
+		if (escaped_section)
+			section = escaped_section;
+	}
+
+	escaped_value = web_view_preview_escape_text (preview, value);
+	if (escaped_value)
+		value = escaped_value;
+
+	g_string_append_printf (preview->priv->updating_content, "<TR><TD width=\"10%%\" valign=\"top\" nowrap><FONT size=\"3\"><B>%s</B></FONT></TD><TD width=\"90%%\"><FONT size=\"3\">%s</FONT></TD></TR>", section ? section : "", value);
+
+	g_free (escaped_section);
+	g_free (escaped_value);
+}
diff --git a/widgets/misc/e-web-view-preview.h b/widgets/misc/e-web-view-preview.h
new file mode 100644
index 0000000000..319f67ec82
--- /dev/null
+++ b/widgets/misc/e-web-view-preview.h
@@ -0,0 +1,101 @@
+/*
+ * e-web-view-preview.h
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+/* This is intended to serve as a common widget for previews before import.
+ * It contains a GtkTreeView at the top and an EWebView at the bottom.
+ * The tree view is not shown initially, it should be forced with
+ * e_web_view_preview_show_tree_view().
+ *
+ * The internal default EWebView can be accessed by e_web_view_preview_get_preview()
+ * and it should be updated for each change of the selected item in the tree
+ * view, when it's shown.
+ *
+ * Updating an EWebView content through helper functions of an EWebViewPreview
+ * begins with call of e_web_view_preview_begin_update(), which starts an empty
+ * page construction, which is finished by e_web_view_preview_end_update(),
+ * and the content of the EWebView is updated.
+ */
+
+#ifndef E_WEB_VIEW_PREVIEW_H
+#define E_WEB_VIEW_PREVIEW_H
+
+#include <misc/e-web-view.h>
+
+/* Standard GObject macros */
+#define E_TYPE_WEB_VIEW_PREVIEW \
+	(e_web_view_preview_get_type ())
+#define E_WEB_VIEW_PREVIEW(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_WEB_VIEW_PREVIEW, EWebViewPreview))
+#define E_WEB_VIEW_PREVIEW_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_WEB_VIEW_PREVIEW, EWebViewPreviewClass))
+#define E_IS_WEB_VIEW_PREVIEW(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_WEB_VIEW_PREVIEW))
+#define E_IS_WEB_VIEW_PREVIEW_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_WEB_VIEW_PREVIEW))
+#define E_WEB_VIEW_PREVIEW_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_WEB_VIEW_PREVIEW, EWebViewPreviewClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EWebViewPreview EWebViewPreview;
+typedef struct _EWebViewPreviewClass EWebViewPreviewClass;
+typedef struct _EWebViewPreviewPrivate EWebViewPreviewPrivate;
+
+struct _EWebViewPreview {
+	GtkVPaned parent;
+	EWebViewPreviewPrivate *priv;
+};
+
+struct _EWebViewPreviewClass {
+	GtkVPanedClass parent_class;
+};
+
+GType		e_web_view_preview_get_type	(void);
+GtkWidget *	e_web_view_preview_new		(void);
+
+GtkTreeView *	e_web_view_preview_get_tree_view(EWebViewPreview *preview);
+GtkWidget *	e_web_view_preview_get_preview	(EWebViewPreview *preview);
+void		e_web_view_preview_set_preview  (EWebViewPreview *preview, GtkWidget *preview_widget);
+
+void 		e_web_view_preview_show_tree_view(EWebViewPreview *preview);
+void 		e_web_view_preview_hide_tree_view(EWebViewPreview *preview);
+
+void		e_web_view_preview_set_escape_values(EWebViewPreview *preview, gboolean escape);
+gboolean	e_web_view_preview_get_escape_values(EWebViewPreview *preview);
+
+void		e_web_view_preview_begin_update	(EWebViewPreview *preview);
+void		e_web_view_preview_end_update	(EWebViewPreview *preview);
+
+void		e_web_view_preview_add_header	(EWebViewPreview *preview, gint index, const gchar *header);
+void		e_web_view_preview_add_text	(EWebViewPreview *preview, const gchar *text);
+void		e_web_view_preview_add_raw_html	(EWebViewPreview *preview, const gchar *raw_html);
+void		e_web_view_preview_add_separator(EWebViewPreview *preview);
+void		e_web_view_preview_add_empty_line(EWebViewPreview *preview);
+void		e_web_view_preview_add_section	(EWebViewPreview *preview, const gchar *section, const gchar *value);
+
+G_END_DECLS
+
+#endif /* E_WEB_VIEW_PREVIEW_H */
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index beb865b98b..8e1878869e 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -25,8 +25,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <camel/camel-internet-address.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-binding.h>
@@ -305,7 +304,7 @@ action_mailto_copy_cb (GtkAction *action,
 	if (text == NULL || *text == '\0')
 		text = g_strdup (uri + strlen ("mailto:"));
 
-	camel_object_unref (inet_addr);
+	g_object_unref (inet_addr);
 	camel_url_free (curl);
 
 	clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
@@ -767,30 +766,71 @@ web_view_url_requested (GtkHTML *html,
 }
 
 static void
-web_view_link_clicked (GtkHTML *html,
-                       const gchar *uri)
+web_view_gtkhtml_link_clicked (GtkHTML *html,
+                               const gchar *uri)
 {
-	gpointer parent;
+	EWebViewClass *class;
+	EWebView *web_view;
 
-	parent = gtk_widget_get_toplevel (GTK_WIDGET (html));
-	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
+	web_view = E_WEB_VIEW (html);
 
-	e_show_uri (parent, uri);
+	class = E_WEB_VIEW_GET_CLASS (web_view);
+	g_return_if_fail (class->link_clicked != NULL);
+
+	class->link_clicked (web_view, uri);
 }
 
 static void
 web_view_on_url (GtkHTML *html,
                  const gchar *uri)
 {
+	EWebViewClass *class;
 	EWebView *web_view;
+
+	web_view = E_WEB_VIEW (html);
+
+	class = E_WEB_VIEW_GET_CLASS (web_view);
+	g_return_if_fail (class->hovering_over_link != NULL);
+
+	/* XXX WebKit would supply a title here. */
+	class->hovering_over_link (web_view, NULL, uri);
+}
+
+static void
+web_view_iframe_created (GtkHTML *html,
+                         GtkHTML *iframe)
+{
+	g_signal_connect_swapped (
+		iframe, "button-press-event",
+		G_CALLBACK (web_view_button_press_event_cb), html);
+}
+
+static gchar *
+web_view_extract_uri (EWebView *web_view,
+                      GdkEventButton *event,
+                      GtkHTML *html)
+{
+	gchar *uri;
+
+	if (event != NULL)
+		uri = gtk_html_get_url_at (html, event->x, event->y);
+	else
+		uri = gtk_html_get_cursor_url (html);
+
+	return uri;
+}
+
+static void
+web_view_hovering_over_link (EWebView *web_view,
+                             const gchar *title,
+                             const gchar *uri)
+{
 	CamelInternetAddress *address;
 	CamelURL *curl;
 	const gchar *format = NULL;
 	gchar *message = NULL;
 	gchar *who;
 
-	web_view = E_WEB_VIEW (html);
-
 	if (uri == NULL || *uri == '\0')
 		goto exit;
 
@@ -816,7 +856,7 @@ web_view_on_url (GtkHTML *html,
 	address = camel_internet_address_new ();
 	camel_address_decode (CAMEL_ADDRESS (address), curl->path);
 	who = camel_address_format (CAMEL_ADDRESS (address));
-	camel_object_unref (address);
+	g_object_unref (address);
 	camel_url_free (curl);
 
 	if (who == NULL)
@@ -833,27 +873,25 @@ exit:
 }
 
 static void
-web_view_iframe_created (GtkHTML *html,
-                         GtkHTML *iframe)
+web_view_link_clicked (EWebView *web_view,
+                       const gchar *uri)
 {
-	g_signal_connect_swapped (
-		iframe, "button-press-event",
-		G_CALLBACK (web_view_button_press_event_cb), html);
+	gpointer parent;
+
+	parent = gtk_widget_get_toplevel (GTK_WIDGET (web_view));
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
+
+	e_show_uri (parent, uri);
 }
 
-static gchar *
-web_view_extract_uri (EWebView *web_view,
-                      GdkEventButton *event,
-                      GtkHTML *html)
+static void
+web_view_load_string (EWebView *web_view,
+                      const gchar *string)
 {
-	gchar *uri;
-
-	if (event != NULL)
-		uri = gtk_html_get_url_at (html, event->x, event->y);
+	if (string != NULL && *string != '\0')
+		gtk_html_load_from_string (GTK_HTML (web_view), string, -1);
 	else
-		uri = gtk_html_get_cursor_url (html);
-
-	return uri;
+		e_web_view_clear (web_view);
 }
 
 static void
@@ -1083,11 +1121,13 @@ e_web_view_class_init (EWebViewClass *class)
 
 	html_class = GTK_HTML_CLASS (class);
 	html_class->url_requested = web_view_url_requested;
-	html_class->link_clicked = web_view_link_clicked;
+	html_class->link_clicked = web_view_gtkhtml_link_clicked;
 	html_class->on_url = web_view_on_url;
 	html_class->iframe_created = web_view_iframe_created;
 
 	class->extract_uri = web_view_extract_uri;
+	class->hovering_over_link = web_view_hovering_over_link;
+	class->link_clicked = web_view_link_clicked;
 	class->load_string = web_view_load_string;
 	class->copy_clipboard = web_view_copy_clipboard;
 	class->cut_clipboard = web_view_cut_clipboard;
@@ -1122,7 +1162,6 @@ e_web_view_class_init (EWebViewClass *class)
 		PROP_COPY_TARGET_LIST,
 		"copy-target-list");
 
-#ifndef G_OS_WIN32
 	g_object_class_install_property (
 		object_class,
 		PROP_DISABLE_PRINTING,
@@ -1144,7 +1183,6 @@ e_web_view_class_init (EWebViewClass *class)
 			FALSE,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));
-#endif
 
 	g_object_class_install_property (
 		object_class,
diff --git a/widgets/misc/e-web-view.h b/widgets/misc/e-web-view.h
index 7d8eb4c8d0..56477ef257 100644
--- a/widgets/misc/e-web-view.h
+++ b/widgets/misc/e-web-view.h
@@ -69,6 +69,11 @@ struct _EWebViewClass {
 	gchar *		(*extract_uri)		(EWebView *web_view,
 						 GdkEventButton *event,
 						 GtkHTML *frame);
+	void		(*hovering_over_link)	(EWebView *web_view,
+						 const gchar *title,
+						 const gchar *uri);
+	void		(*link_clicked)		(EWebView *web_view,
+						 const gchar *uri);
 	void		(*load_string)		(EWebView *web_view,
 						 const gchar *load_string);
 
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
deleted file mode 100644
index 7d556367a8..0000000000
--- a/widgets/table/ChangeLog
+++ /dev/null
@@ -1,10156 +0,0 @@
-2009-04-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #572348
-
-	* e-table-header-item.c:
-	* e-cell-combo.h:
-	* e-cell-combo.c:
-	Remove deprecated Gtk+ symbols.
-
-2009-03-26  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #576694
-
-	* e-cell-text.c (build_layout):
-	Handle absolute font sizes correctly.
-
-2009-02-26  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	** Part of fix for bug #573198
-
-	* e-cell-date.c (ecd_get_text): Initialize the timezone settings
-	before making any timezone conversion calls.
-
-2009-02-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #572348
-
-	* e-table-example-1.c (main):
-	gtk_widget_push_visual() is a no-op.  Remove it.
-
-2009-02-19  Andre Klapper  <a9016009@gmx.de>
-
-	* e-table-field-chooser-dialog.c:
-	Migrate from deprecated gtk_window_set_policy to gtk_window_set_resizable
-
-2009-02-16  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #550114
-
-	* e-table-group.h:
-	* e-table-group.c:
-	* e-table-group-container.c:
-	* e-table-group-leaf.c:
-	Replaced 'compute_mouse_over' with 'get_mouse_over', now works
-	with cached values 'motion_row', 'motion_col'.
-	* e-table.c: (e_table_get_mouse_over_cell):
-	Mouse position not required anymore, remove it too then.
-
-2008-12-15  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #557176
-
-	* e-table-state.c: (e_table_state_load_from_node):
-	Ensure the 'sort_info' member is never NULL.
-
-2008-11-28  Felix Riemann  <friemann@svn.gnome.org>
-
-	** Part of fix for bug #554464
-
-	* e-cell-text.c: (build_layout): Let Pango handle the ellipsizing,
-	which should be faster.
-
-2008-10-17  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #560882
-
-	* e-table-defines.h:
-	* e-table-header-utils.c (e_table_header_draw_button):
-	Left-align header labels instead of centering them, and adjust
-	the header padding so they look purdy.
-
-2008-10-17  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-cell-tree.c:
-	* e-cell-tree.h:
-
-2008-10-08  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-table-header-item.c:
-
-2008-10-06  Sankar P  <psankar@novell.com>
-
-	* e-cell-float.c:
-	* e-cell-float.h:
-	Remove obsolete files
-
-2008-10-03  Sankar P  <psankar@novell.com>
-
-License Changes And:
-
-	* e-table-item.c (eti_event): remove obsolete check for
-	buttons 4/5 in 2BUTTON_PRESS; cf. gdk_event_translate /
-	_gdk_event_button_generate that turn this into a scroll
-	event these days.
-
-2008-10-03  Sankar P  <psankar@novell.com>
-
-	* widgets/table/e-cell-progress.c:
-	* widgets/table/e-cell-progress.h:
-	Removed obsolete files
-
-2008-10-03  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* table-test.c:
-	* test-table.c:
-
-2008-09-30  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-table.c:
-
-2008-09-29  Sankar P  <psankar@novell.com>
-
-	** Remove unused files
-
-	* widgets/table/Makefile.am:
-	* widgets/table/e-cell-spin-button.c:
-	* widgets/table/e-cell-spin-button.h:
-
-2008-09-29  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-cell-float.c:
-	* e-cell-float.h:
-	* e-cell-spin-button.c:
-	* e-cell-spin-button.h:
-	* e-table-col.c:
-
-2008-09-24  Sankar P  <psankar@novell.com>
-
-License Changes
-	* e-cell-text.c:
-
-2008-09-16  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-table-field-chooser-item.c:
-	* e-table-field-chooser.c:
-	* e-tree-selection-model.c:
-
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-table-scrolled.c:
-	* e-table-sorting-utils.c:
-	* e-tree-model.c:
-	* e-tree.c:
-
-2008-09-04  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-cell-pixbuf.c:
-	* e-cell-size.c:
-	* e-table-group-container.c:
-	* e-table-header-utils.c:
-	* e-table-sorted.c:
-
-2008-09-02  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-cell-combo.c:
-	* e-cell-date.c:
-	* e-cell-hbox.c:
-	* e-cell-number.c:
-	* e-cell-pixbuf.h:
-	* e-cell-popup.c:
-	* e-cell-size.h:
-	* e-cell-text.h:
-	* e-cell-toggle.c:
-	* e-cell-vbox.c:
-	* e-cell.h:
-	* e-table-click-to-add.c:
-	* e-table-click-to-add.h:
-	* e-table-column-specification.c:
-	* e-table-column-specification.h:
-	* e-table-column.c:
-	* e-table-config-field.c:
-	* e-table-config-field.h:
-	* e-table-config.c:
-	* e-table-config.h:
-	* e-table-example-1.c:
-	* e-table-example-2.c:
-	* e-table-extras.c:
-	* e-table-field-chooser-dialog.h:
-	* e-table-group.c:
-	* e-table-header-item.h:
-	* e-table-header.c:
-	* e-table-memory-callbacks.h:
-	* e-table-memory-store.c:
-	* e-table-memory.c:
-	* e-table-memory.h:
-	* e-table-one.h:
-	* e-table-search.c:
-	* e-table-selection-model.c:
-	* e-table-size-test.c:
-	* e-table-sort-info.c:
-	* e-table-sort-info.h:
-	* e-table-sorted-variable.c:
-	* e-table-sorter.c:
-	* e-table-sorter.h:
-	* e-table-sorting-utils.h:
-	* e-table-specification.c:
-	* e-table-state.c:
-	* e-table-state.h:
-	* e-table-subset-variable.c:
-	* e-table-subset-variable.h:
-	* e-table-tooltip.h:
-	* e-table.h:
-	* e-tree-memory-callbacks.h:
-	* e-tree-memory.c:
-	* e-tree-selection-model.h:
-	* e-tree-sorted-variable.c:
-	* e-tree-sorted.c:
-	* e-tree-table-adapter.c:
-	* e-tree-table-adapter.h:
-	* e-tree.h:
-
-2008-08-27  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* e-cell-checkbox.c:
-	* e-cell-checkbox.h:
-	* e-cell-combo.h:
-	* e-cell-date.h:
-	* e-cell-hbox.h:
-	* e-cell-number.h:
-	* e-cell-popup.h:
-	* e-cell-toggle.h:
-	* e-cell-vbox.h:
-	* e-cell.c:
-	* e-table-col-dnd.h:
-	* e-table-col.h:
-	* e-table-defines.h:
-	* e-table-extras.h:
-	* e-table-field-chooser-dialog.c:
-	* e-table-field-chooser-item.h:
-	* e-table-field-chooser.h:
-	* e-table-group-container.h:
-	* e-table-group-leaf.c:
-	* e-table-group-leaf.h:
-	* e-table-group.h:
-	* e-table-header-utils.h:
-	* e-table-header.h:
-	* e-table-item.h:
-	* e-table-memory-callbacks.c:
-	* e-table-memory-store.h:
-	* e-table-model.c:
-	* e-table-model.h:
-	* e-table-one.c:
-	* e-table-scrolled.h:
-	* e-table-search.h:
-	* e-table-selection-model.h:
-	* e-table-simple.c:
-	* e-table-simple.h:
-	* e-table-sorted-variable.h:
-	* e-table-sorted.h:
-	* e-table-specification.h:
-	* e-table-subset.c:
-	* e-table-subset.h:
-	* e-table-tree.h:
-	* e-table-utils.c:
-	* e-table-utils.h:
-	* e-table-without.c:
-	* e-table-without.h:
-	* e-tree-memory-callbacks.c:
-	* e-tree-memory.h:
-	* e-tree-model.h:
-	* e-tree-scrolled.c:
-	* e-tree-scrolled.h:
-	* e-tree-simple.c:
-	* e-tree-simple.h:
-	* e-tree-sorted-variable.h:
-	* e-tree-sorted.h:
-	* table-test.h:
-	* test-check.c:
-	* test-cols.c:
-
-2008-08-11  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #352695
-
-	* e-tree-table-adapter.c: (e_tree_table_adapter_load_expanded_state),
-	(e_tree_table_adapter_load_expanded_state_xml):
-	Call the e_table_model_changed in the proper function, to prevent
-	lock of the model caused by previous commit to this bug.
-
-2008-08-11  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #519292
-
-	* e-tree.h: (e_tree_load_all_expanded_state):
-	* e-tree.c: (e_tree_load_all_expanded_state):
-	* e-tree-table-adapter.h:
-	(e_tree_table_adapter_load_all_expanded_state):
-	* e-tree-table-adapter.c:
-	(e_tree_table_adapter_load_all_expanded_state),
-	(set_expanded_state_func), (set_collapsed_state_func):
-	Drop functions in favor of new functions.
-	* e-tree.h: (e_tree_force_expanded_state):
-	* e-tree.c: (e_tree_force_expanded_state):
-	* e-tree-table-adapter.h: (e_tree_table_adapter_force_expanded_state):
-	* e-tree-table-adapter.c: (e_tree_table_adapter_force_expanded_state),
-	(struct ETreeTableAdapterPriv), (create_gnode), (etta_init):
-	Use either default value of the model to expanded state of new node or
-	use the one which has been set (forced) by new functions.
-
-2008-08-11  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #352695
-
-	* e-tree-table-adapter.h:
-	(e_tree_table_adapter_save_expanded_state_xml),
-	(e_tree_table_adapter_load_expanded_state_xml):
-	* e-tree-table-adapter.c:
-	(e_tree_table_adapter_save_expanded_state_xml),
-	(e_tree_table_adapter_save_expanded_state),
-	(e_tree_table_adapter_load_expanded_state_xml),
-	(e_tree_table_adapter_load_expanded_state):
-	* e-tree.h: (e_tree_save_expanded_state_xml),
-	(e_tree_load_expanded_state_xml):
-	* e-tree.c: (e_tree_save_expanded_state_xml),
-	(e_tree_load_expanded_state_xml):
-	Be able to store expanded state also in memory, not only on the disk.
-
-2008-07-15  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #329821
-
-	* e-table-item.c: (find_cell): Do not consider last row's height
-	till the bottom.
-	* e-table-item.h: (e_table_item_compute_mouse_over):
-	* e-table-item.c: (e_table_item_compute_mouse_over):
-	* e-table-group-container.c: (etgc_compute_mouse_over),
-	(etgc_class_init):
-	* e-table-group-leaf.c: (etgl_compute_mouse_over), (etgl_class_init):
-	* e-table.h: (e_table_get_mouse_over_cell):
-	* e-table.c: (e_table_get_mouse_over_cell):
-	* e-table-group.h: (struct ETableGroupClass),
-	(e_table_group_compute_mouse_over):
-	* e-table-group.c: (e_table_group_compute_mouse_over),
-	(etg_class_init): Be able to calculate mouse-over position correctly,
-	relatively to the ETableItem.
-
-2008-06-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-table-example-1.c: (main):
-	* e-table-example-2.c: (main):
-	* e-table-size-test.c: (main):
-	* test-check.c: (check_test):
-	* test-cols.c: (multi_cols_test):
-	gdk_rgb_get_cmap -> gdk_rgb_get_colormap
-
-2008-06-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* test-check.c: (check_test):
-	* test-cols.c: (multi_cols_test):
-	gdk_pixbuf_unref() -> g_object_unref()
-
-2008-06-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-cell-combo.c: (e_cell_combo_init):
-	gtk_window_set_policy -> gtk_window_set_resizable
-
-2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #534360
-
-	* e-table-memory-callbacks.c:
-	* e-table-memory-store.c:
-	* e-table-model.c:
-	* e-table-simple.c:
-	* e-tree-memory-callbacks.c:
-	* e-tree-model.c:
-	* e-tree-simple.c:
-	Migrate from deprecated GtkObject symbols to GObject equivalents.
-
-2008-04-30  Milan Crha  <mcrha@redhat.com>
-
-	** Part of fix for bug #528288
-
-	* e-tree.h: (e_tree_set_info_message):
-	* e-tree.c: (struct ETreePriv), (et_dispose), (e_tree_init),
-	(tree_size_allocate), (e_tree_set_info_message):
-	Allow setting info message into the tree. It doesn't check
-	whether the tree is empty or not, so take care of that.
-
-2008-04-25  Danny Baumann  <dannybaumann@web.de>
-
-	** Fix for bug #529893
-
-	* e-table-header-item.c: (make_shaped_window_from_xpm):
-	* e-cell-combo.c: (e_cell_combo_init):
-	* e-cell-text.c: (ect_show_tooltip):
-	Properly set type hints for popup windows.
-
-2008-03-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #519292
-
-	* e-tree-table-adapter.c: (set_expanded_state_func),
-	(set_collapsed_state_func): Use rather recurse function.
-
-2008-02-19  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #209353
-
-	* e-table-item.c: (eti_event):
-	Pass Home/End keys to cell when editing.
-
-2008-02-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #512623
-
-	* e-tree.c: (item_key_press):
-	Check only if Ctrl/Alt/Shift is pressed when required Shift only.
-	* e-table.c: (group_key_press): Ignore/consider GDK_MODEx_MASK states.
-
-2008-01-28  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-table-item.c: (eti_draw): Fix some gradient issues.
-
-2008-01-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-cell-pixbuf.c: (pixbuf_draw), (pixbuf_height), (pixbuf_print),
-	(pixbuf_print_height), (pixbuf_max_width): Cairfy pixbuf renderer for
-	settings window.
-
-2008-01-22  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #511105
-
-	* e-tree-table-adapter.c: (e_tree_table_adapter_load_expanded_state):
-	* e-table-item.c: (eti_draw):
-	* e-table-column-specification.c: (free_strings): 
-	Free allocated memory properly.
-
-2008-01-22  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #511094
-
-	* e-cell-text.c: (ect_draw): Set proper foreground color based
-	on focused/non-focused canvas.
-
-2008-01-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-table-item.c: (eti_draw): Draw the cursor only for multiselection.
-
-2008-01-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-cell-toggle.c: (etog_new_view), (etog_kill_view), (etog_draw),
-	(etog_print), (e_cell_toggle_class_init),
-	(e_cell_toggle_construct): Removed the pixmap cache. It wasn't giving
-	alpha for the cairo rendered message list row.
-	* e-table-item.c: (eti_draw): Render the rows with Cairo. It looks
-	same as GtkTreeView and seems nice.
-
-2007-12-05  David Turner  <cillian64@googlemail.com>
-
-	** Fix for bug #408170
-
-	* e-table-header-item.c: (ethi_header_context_menu): Added
-	mnemonics to the "Custom" and "Sort By" menu options
-
-2007-12-04  David Turner <cillian64@googlemail.com>
-
-	** Fix for bug #458824
-
-	* e-table-config.glade: Added mnemonics to the "Group" dialog
-
-2007-11-05  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #255051
-
-	* e-cell-combo.c: (e_cell_combo_key_press):
-	* e-cell-text.c: (ect_event):
-	Pass Escape event to parent, if there is no action to do with it.
-	* e-table-click-to-add.c: (etcta_event): Drop changes when pressed
-	Escape and go back to default line with text "Click to add...".
-
-2007-11-02  Damien Carbery  <damien.carbery@sun.com>
-
-	** Fixes bug #492058
-
-	* e-table-header-item.h:
-	* e-table-header-item.c: Name the anonymous unions to build
-	with the Sun Studio compiler.
-
-2007-11-02  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #463946
-
-	* e-table-header-item.c: (ethi_popup_field_chooser):
-	Fix of critical warning and misused variable.
-
-2007-11-01  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-table-click-to-add.c (etcta_add_message):
-	Fix a const warning.
-
-2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-cell-text.c: (ect_event), (_blink_scroll_timeout):
-	* e-table-config.c: (do_sort_and_group_config_dialog),
-	(do_fields_config_dialog):
-	* e-table-group-container.c: (etgc_add_array),
-	(etgc_get_focus_column), (etgc_get_cell_geometry),
-	(etgc_set_property), (etgc_get_property), (etgc_class_init),
-	(etgc_reflow), (etgc_init), (e_table_group_container_print_page),
-	(e_table_group_container_height):
-	* e-table-group.c: (e_table_group_get_focus_column):
-	* e-table-header.c: (e_table_header_get_columns), (eth_set_size):
-	* e-table-item.c: (eti_tree_unfreeze), (eti_draw), (find_cell),
-	(_do_tooltip), (eti_event), (e_table_item_height):
-	* e-table-memory-store.c: (etms_initialize_value),
-	(etms_value_is_empty):
-	* e-tree-model.c: (e_tree_model_new), (e_tree_model_node_find):
-	Warning fixes:
-	- NULL vs. 0 vs. FALSE
-	- Mark som code static
-
-2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #437579
-
-	* e-table-field-chooser-item.c:
-	* e-table-header-item.c:
-	* e-table-header-item.h:
-	* e-table-header-utils.c:
-	* e-table.c:
-	Fix various compiler warnings.  Patch from Milan Crha.
-
-2007-10-02  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #469657
-
-	* e-table-extras.c:
-	* e-table-selection-model.c:
-	Use destroy functions in GHashTables to simplify memory management.
-
-2007-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #470837
-
-	* e-table-header-item.c: (sort_by_id), (popup_custom),
-	(ethi_header_context_menu), (ethi_change_sort_state):
-	Improved "Sort by" submenu behavior.
-
-2007-10-01  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #474557
-
-	* e-table-group-container.c: (etgc_reflow):
-	Choose right widget and use PANGO_PIXELS to calculate height.
-
-2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fix for bug #461195
-
-	* e-table-header-item.c:
-	* e-table-item.c:
-	* e-tree.c:
-	* e-table-click-to-add.c:
-	* e-table.c:
-	* e-table-group.c: Use GObject's marshalers.
-
-2007-09-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #478871
-
-	* e-table-config.c: (config_fields_info_update):
-	Shows proper 'Fields shown' description for all tables.
-
-2007-09-27  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #479716
-
-	* e-table-config.c: (setup_gui):
-	* Makefile.am: Get rid of e-table-config-no-group.glade and
-	keep consistent with behavior and appearence.
-
-2007-09-26  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #340748
-
-	* e-table.c: (e_table_set_state_object):
-	Notifies others about change.
-
-2007-09-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #473903
-
-	* e-tree.c: (et_real_construct):
-	Fixes serious compiler warning.
-
-2007-08-31  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Move away from g_assert to g_return* critical warnings to debug
-	them better.
-
-	* e-cell-text.c: (ect_edit_select_all), (_get_position):
-	* e-table-config.c: (configure_combo_box_add),
-	(configure_combo_box_set_active),
-	(update_sort_and_group_config_dialog):
-	* e-table-group.c: (e_table_group_add), (e_table_group_add_array),
-	(e_table_group_add_all), (e_table_group_remove),
-	(e_table_group_increment), (e_table_group_decrement),
-	(e_table_group_row_count), (e_table_group_set_focus),
-	(e_table_group_get_focus), (e_table_group_get_focus_column),
-	(e_table_group_get_printable), (e_table_group_compute_location),
-	(e_table_group_get_cell_geometry):
-	* e-table-header-utils.c: (e_table_header_compute_height),
-	(make_composite_pixmap), (e_table_header_draw_button):
-	* e-table-item.c: (eti_attach_cell_views), (eti_row_height_real),
-	(eti_add_table_model), (eti_add_selection_model),
-	(eti_header_structure_changed), (eti_add_header_model):
-	* e-tree-table-adapter.c: (generate_tree):
-
-2007-08-24  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #239441
-
-	* e-tree-table-adapter.c: (struct ETreeTableAdapterPriv),
-	(etta_finalize), (etta_init), (resort_model),
-	(etta_proxy_node_changed):
-	Remember resort_idle_id and remove it from g_source when
-	finalizing structure, so it will not be called when the
-	structure itself is already freed.
-
-2007-08-23  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #303877.
-
-	* e-cell-text.c: (update_im_cursor_locations): New function.
-	Set the cursor location to IMContext for candidate window.
-	(e_cell_text_get_cursor_locations): New function.
-	Get the current cursor locations in root canvas.
-	(e_cell_text_preedit_changed_cb): set the preedit cursor position to
-	preedit_pos.
-	(layout_with_preedit): call update_im_cursor_locations in the tail.
-	Patch by Hiroyuki Ikezone.
-
-2007-08-07  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #419690
-
-	* e-tree-table-adapter.c:
-	(e_tree_table_adapter_root_node_set_visible): Add protection around
-	etta.
-
-2007-08-07  Milan Crha  <mcrha@redhat.com>
-
-	** Fix for bug #463946
-
-	* e-table-header-item.c: (ethi_dispose), (ethi_popup_field_chooser):
-	Fixes compiler warnings and weak pointer references.
-
-2007-07-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* e-cell-tree.c:
-	* e-cell-hbox.c:
-	* e-cell-popup.c:
-	* e-tree-simple.c:
-	* e-cell-date.c:
-	* e-tree-table-adapter.c:
-	* e-tree-scrolled.c:
-	* e-table-field-chooser.c:
-	* e-table-header-item.c:
-	* e-cell-pixbuf.c:
-	* e-table-subset-variable.c:
-	* e-tree-selection-model.c:
-	* e-tree-sorted-variable.c:
-	* e-tree-memory-callbacks.c:
-	* e-table-sorted.c:
-	* e-table-subset.c:
-	* e-table-search.c:
-	* e-table-extras.c:
-	* e-table-one.c:
-	* e-table-config-field.c:
-	* e-cell-combo.c:
-	* e-table-item.c:
-	* e-cell-toggle.c:
-	* e-tree.c:
-	* e-table-col.c:
-	* e-table-field-chooser-item.c:
-	* e-table-sort-info.c:
-	* e-table-simple.c:
-	* e-table-column.c:
-	* e-table-scrolled.c:
-	* e-tree-model.c:
-	* e-table-column-specification.c:
-	* e-table-group-container.c:
-	* e-cell-text.c:
-	* e-table-specification.c:
-	* e-cell-number.c:
-	* e-table-sorted-variable.c:
-	* e-table-selection-model.c:
-	* e-table-memory-callbacks.c:
-	* e-cell.c:
-	* e-table-click-to-add.c:
-	* e-cell-float.c:
-	* e-table-field-chooser-dialog.c:
-	* e-tree-memory.c:
-	* e-cell-progress.c:
-	* e-table-group-leaf.c:
-	* e-table.c:
-	* e-table-sorter.c:
-	* e-table-header.c:
-	* e-table-group.c:
-	* e-table-model.c:
-	* e-cell-size.c:
-	* e-table-without.c:
-	* e-table-config.c:
-	* e-cell-vbox.c:
-	* e-tree-sorted.c:
-	* e-table-state.c:
-	* e-table-memory-store.c:
-	* e-table-memory.c:
-	* e-cell-spin-button.c:
-	* e-cell-checkbox.c: Use G_DEFINE_TYPE instead of E_MAKE_TYPE.
-
-2007-07-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* Makefile.am:
-	Rename EXTRA_GNOME_CFLAGS to GNOME_PLATFORM_CFLAGS.
-	Similarly for EXTRA_GNOME_LIBS.
-
-2007-07-27  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #323522
-
-	* e-table-item.c: (eti_unfreeze):
-
-2007-06-15  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-cell-vbox.c (ecv_finalize):
-	Free the model_cols array when the instance is destroyed (#447742).
-
-2007-06-02  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	** Fixes part of bug #441014
-
-	* e-cell-text.c: (build_layout), (ect_print):
-	* e-cell-tree.c: (ect_realize):
-	* e-table-column-specification.c:
-	(e_table_column_specification_load_from_node),
-	(e_table_column_specification_save_to_node):
-	* e-table-field-chooser-item.c: (etfci_drag_data_get):
-	* e-table-group-container.c:
-	* e-table-header-item.c: (ethi_drag_data_received),
-	(ethi_drag_data_get), (ethi_popup_field_chooser),
-	(ethi_header_context_menu):
-	* e-table-sort-info.c: (e_table_sort_info_load_from_node),
-	(e_table_sort_info_save_to_node):
-	* e-table-specification.c: (e_table_specification_load_from_node),
-	(e_table_specification_save_to_file),
-	(e_table_specification_save_to_string),
-	(e_table_specification_save_to_node):
-	* e-table-state.c: (e_table_state_load_from_node),
-	(e_table_state_save_to_file), (e_table_state_save_to_string),
-	(e_table_state_save_to_node):
-	* e-table-subset-variable.c: (e_table_subset_variable_clear):
-	* e-table-subset.c: (e_table_subset_construct):
-	* e-tree-table-adapter.c: (save_expanded_state_func),
-	(e_tree_table_adapter_save_expanded_state), (open_file),
-	(e_tree_table_adapter_load_expanded_state): various
-	compilation warning cleanups
-
-2007-05-31  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #333707 from David Moore
-
-	* e-tree.c: (et_disconnect_from_etta), (e_tree_init),
-	(et_table_rows_deleted), (et_connect_to_etta): Thread message
-	selection improvements, while deleting messages in thread.
-
-2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-table-config.c:
-	* e-table-config.h:
-	Replace GalComboText with a GtkComboBox/GtkListStore (#441010).
-
-2007-05-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Add more support for GMail like sorting.
-
-	* e-table-sorting-utils.c: (e_table_sorting_utils_tree_sort):
-	* e-tree-memory-callbacks.c: (etmc_sort_value_at),
-	(e_tree_memory_callbacks_class_init),
-	(e_tree_memory_callbacks_new):
-	* e-tree-memory-callbacks.h:
-	* e-tree-model.c: (e_tree_model_class_init),
-	(e_tree_model_sort_value_at):
-	* e-tree-model.h:
-
-2007-05-16  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-tree-table-adapter.c:
-	(e_tree_table_adapter_load_expanded_state): Add support for retaining
-	default tree expand state
-
-2007-05-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #378441 from Ebby Wiselyn
-
-	* e-table-header-item.c: Added mnemonics
-
-2007-05-12  simon.zheng  <simon.zheng@sun.com>
-
-	* Fix for bug #355919
-
-	* e-table-header-utils.c: (make_composite_pixmap): 
-	gdk_rgb_get_visual()->depth always returns preferred visual 
-	depth, which isn't always equal to the that of current
-	window. Whereas, using -1 will match the depth of the pixmap window 
-	to what we have in drawable window, which is the first
-	argument of gdk_pixmap_new(). So use -1 instead.
-
-2007-04-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-cell.h:
-	* e-cell-pixbuf.c:
-	* e-cell-text.c:
-	* e-printable.h:
-	* e-table-group-container.c:
-	Refactor the printing infrastructure. (#426816)
-
-2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #429422
-
-	* e-table-size-test.c (create_table):
-	* test-table.c (main):
-	* e-cell-combo.c (e_cell_combo_show_popup):
-	* e-table-example-1.c (create_table):
-	* e-tree.c (header_canvas_size_allocate), (e_tree_setup_header):
-	* e-cell-text.c (ect_show_tooltip):
-	* e-table-example-2.c (create_table):
-	* e-table.c (header_canvas_size_allocate):
-	Use gtk_widget_set_size_request() or g_object_set() instead of
-	gtk_widget_set_usize().
-
-	* e-cell-tree.c (e_cell_tree_construct):
-	* e-table-header-item.c (ethi_header_context_menu), (ethi_event):
-	* e-table-extras.c (e_table_extras_add_cell):
-	Use g_object_ref_sink() instead of gtk_object_sink().
-
-	* e-cell-date.c (ecd_get_text):
-	e_strdup_strip() is dead; just do it manually.
-
-	* e-table-header-item.c (ethi_header_context_menu):
-	Use gtk_radio_menu_item_get_group() instead of
-	gtk_radio_menu_item_group().
-
-	* e-table-search.c (e_table_search_class_init):
-	* e-table-sort-info.c (e_table_sort_info_class_init):
-	* e-tree-model.c (e_tree_model_class_init):
-	* e-tree-memory.c (e_tree_memory_class_init):
-	* e-table-header.c (e_table_header_class_init):
-	* e-table-model.c (e_table_model_class_init):
-	* e-table-config.c (config_class_init):
-	* e-tree-sorted.c (e_tree_sorted_class_init):
-	Use G_TYPE_FROM_CLASS() instead of E_OBJECT_CLASS_TYPE().
-
-	* e-table-item.c (eti_dispose), (eti_unrealize), (eti_event):
-	Use g_source_remove() instead of gtk_timeout_remove().
-
-	* e-table-item.c (eti_event):
-	Use g_timeout_add() instead of gtk_timeout_add().
-
-	* e-tree.c (et_dispose):
-	e_free_string_list() is dead; just do it manually.
-
-	* e-tree-memory.c (e_tree_memory_sort_node):
-	* e-table-sorting-utils.c (e_table_sorting_utils_sort):
-	Use g_qsort_with_data() instead of e_sort().
-
-2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-table-header-utils.c:
-	* e-table-item.c:
-	* e-tree-header-item.c:
-	* e-tree-table-adapter.c:
-	Fix "incompatible pointer type" warnings (#360619).
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	* e-cell-checkbox.c:
-	* e-table-header-item.c:
-	Don't mix declarations and code (#405495).
-
-2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #419524
-
-	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #360240
-
-	* e-cell-text.c (ect_free_color):
-	Remove unused variable.
-
-2007-03-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-cell-hbox.c: (ecv_new_view), (ecv_kill_view):
-	* e-cell-pixbuf.c: (pixbuf_new_view), (pixbuf_kill_view):
-	* e-cell-popup.c: (ecp_new_view), (ecp_kill_view):
-	* e-cell-progress.c: (eprog_new_view), (eprog_kill_view):
-	* e-cell-spin-button.c: (ecsb_new_view):
-	* e-cell-text.c: (ect_new_view), (ect_kill_view):
-	* e-cell-toggle.c: (etog_new_view), (etog_kill_view):
-	* e-cell-tree.c: (ect_new_view), (ect_kill_view):
-	* e-cell-vbox.c: (ecv_new_view), (ecv_kill_view):
-	* e-cell.h: Rest of the workaround patch for the crash
-	in bug #330728. Patch from Caolan McNamara.
-
-2007-02-12  Srinivasa Ragavan <sragavan@novell.com>
-
-	** Print migration updates from Ebby Wiselyn
-
-	* e-cell-toggle.c:
-	* e-cell-text.c:
-
-2007-02-08  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes bug #357216
-
-	* e-table-field-chooser-item.c:
-	* e-table-field-chooser-item.h:
-	* e-table-group-container.c:
-	* e-table-group-container.h:
-	Replace deprecated GdkFont with PangoFontDescription.
-
-	* e-table-header-item.c:
-	* e-table-header-item.h:
-	Replace deprecated GdkFont with PangoFontDescription.
-	Rename "fontset" property to "font-desc", and change the property
-	type to a boxed PangoFontDescription.
-
-2007-01-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** GtkPrint api migration from Ebby Wiselyn.
-
-	* e-cell-checkbox.c: (ecc_print), (e_cell_checkbox_class_init):
-	* e-cell-pixbuf.c: (gnome_print_pixbuf), (pixbuf_print),
-	(pixbuf_print_height):
-	* e-cell-popup.c: (ecp_print), (ecp_print_height):
-	* e-cell-text.c: (ect_print), (ect_print_height):
-	* e-cell-toggle.c: (etog_print), (etog_print_height):
-	* e-cell.c: (e_cell_print), (e_cell_print_height):
-	* e-cell.h:
-	* e-table-group-container.c: (gp_draw_rect),
-	(e_table_group_container_print_page),
-	(e_table_group_container_height),
-	(e_table_group_container_will_fit):
-	* e-table-item.c: (eti_realize_cell_views), (eti_draw),
-	(eti_event), (eti_printed_row_height), (gp_draw_rect),
-	(e_table_item_print_page), (e_table_item_height),
-	(e_table_item_will_fit):
-
-2006-12-04  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes bug #357970
-
-	* e-cell-pixbuf.c:
-	* e-cell-progress.c:
-	* e-cell-text.c:
-	* e-cell-toggle.c:
-	* e-cell-tree.c:
-	* e-table-col.c:
-	* e-table-extras.c:
-	* e-table-header-item.c:
-	* e-table-header-utils.c:
-	* e-table-item.c:
-	* e-table-memory-store.c:
-	Don't call deprecated GLib / GDK functions.
-
-2006-12-04  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-table.c: (canvas_vbox_event), (click_to_add_event):
-	Fixes bug #381642.
-
-2006-08-24  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fixes bug #337582
-	* e-cell-text.c: Use GtkClipboard instead of GtkInvisible.
-
-2006-08-21  Andre Klapper  <a9016009@gmx.de>
-
-	* e-table-config.glade:
-	changed window focus. Fixes bug #266802.
-
-2006-08-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-cell-text.c: (ect_event): Add a null check and remove code for a
-	possible crash which is really useless.
-
-2006-08-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Patch from Pavel Roskin.
-
-	* e-cell-text.c: Added missing headers.
-	* e-table-utils.c: Added missing headers.
-
-2006-08-19  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #350884
-
-	* e-tree-table-adapter.c: (resort_model),
-	(etta_proxy_node_changed): Sort the model after for gmail like
-	display.
-
-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
-
-2006-06-12  Ed Catmur  <ed@catmur.co.uk>
-
-	** Fixes bug #343764 now entirely
-	* 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
-	* e-table-header-utils.c: (e_table_header_draw_button): 
-	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
-	* e-table-header-item.c: (ethi_event):
-	Grab focus only from widgets which can have focus on.
-
-2006-03-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #328283
-
-	* e-table-item.c: (eti_tree_unfreeze): Use the right widget to
-	unfreeze the tree.
-
-2006-03-01  Simon Zheng  <simon.zheng@sun.com>
-
-	** Fixes bug #331400
-
-	* e-cell-text.c: (ect_print_height): Table item height is decided 
-	by the max cell height in item. And cell-text is just one of cells.
-	As done by ect_print(), to leave some margin for text, 2 for footer,
-	2 for header, actual print height should be 16 + 4. 
-
-2006-02-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #332408
-	
-	* e-table-config.c: (e_table_proxy_etable_shown_new),
-	(e_table_proxy_etable_available_new): Reverting the patch that fixes
-	some compiler warning. The function is referred from the glade file,
-	which was removed.
-
-2006-02-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #328283
-
-	* e-table-item.c: (eti_tree_unfreeze): Added the return value for 
-	scroll-event handler which causes a crash
-
-2006-01-27  Andre Klapper <a9016009@gmx.de>
-	* e-table-config-no-group.glade:
-	* e-table-config.glade:
-	removed string "dialog1" from translation. Fixes bug 306118.
-
-2006-01-13  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-table-item.c: (adjustment_changed), (eti_tree_unfreeze),
-	(eti_realize): Fixes the scroll issue with e-tree.
-
-2005-12-21  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	committing for Akira TAGOH <tagoh@gnome-db.org>
-	
-	Fixes #303876
-	* table/e-cell-text.c: (ect_event): Check if its a keep press
-	event when the Return key is pressed.
-
-2005-12-18  Tor Lillqvist  <tml@novell.com>
-
-	* e-table-config.c (find_model_column_by_name): Use
-	g_ascii_strcasecmp() instead of g_strcasecmp(). This function
-	handles the English column names.
-
-	* e-table-specification.c (e_table_specification_load_from_file)
-	* e-table-state.c (e_table_state_load_from_file):
-	Use e_xml_parse_file().
-
-2005-12-17  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Link with bootstrap libs on Win32. Use
-	E_WIDGETS_CFLAGS instead of GNOME_BONOBO_CFLAGS, GNOME_INCLUDEDIR,
-	ICONV_CFLAGS and GNOME_FULL_CFLAGS. Link with all required
-	libraries. Use -no-undefined on Win32.
-
-2005-12-09  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-table-example-2.c (create_table):
-	* e-table-extras.c (ete_init):
-	* e-table-size-test.c (create_table):
-	* test-check.c (check_test):
-	* test-cols.c (multi_cols_test):
-	* test-table.c (table_browser_test):
-	 s/g_*_compare/e_*_compare. 
-
-2005-12-07  Boby Wang  <boby.wang@sun.com>
-
-	Fixes #322740.
-	* e-tree.c: (item_key_press):  change the condition
-	expression for GDK_RIGHT and GDK_LEFT.
-
-2005-12-06  Li Yuan <li.yuan@sun.com>
-
-	* e-tree.c: (table_canvas_focus_event_cb):
-	Fixes bug #322776.
-	When focus come into e-tree, it is possible that the focused_item 
-	is not NULL and there is no focused item in e-tree. So test 
-	e_selection_model_cursor_row also.
-
-2005-10-14  Kaushal Kumar  <kakumar@novell.com>
-
-	* table/e-table-group-container.c
-	(e_table_group_container_print_page): Use gnome_font_find_closest
-	instead of gnome_font_find since Helvetica is not always present. 
-
-	Fixes bug #246803.
-	Patch by: Mubeen Jukaku.
-
-2005-10-04   Devashish Sharma  <sdevashish@novell.com>
-
-	*  e-table-extras.c (ete_init): Added compare type "stringcase" to 
-	ETableExtras to comapre hash table for case insensitive strings. The
-	corresponding function g_str_case_compare has been added to e-util.c.
-	See #207110.
-
-2005-09-29  Tor Lillqvist  <tml@novell.com>
-
-	* e-table.c (e_table_load_specification)
-	* e-table-specification.c (e_table_specification_load_from_file)
-	* e-tree-table-adapter.c (open_file): Use
-	g_win32_locale_filename_from_utf8() from GLib 2.8 instead of
-	gnome_win32_locale_filename_from_utf8() which was temporarily in
-	libgnome.
-
-2005-09-28  Tor Lillqvist  <tml@novell.com>
-
-	* e-table-specification.c (e_table_specification_load_from_node):
-	Use g_ascii_strcasecmp() instead of strcasecmp(). We are comparing
-	to literal ASCII strings, just casefolding ASCII is enough. Also
-	better for portability.
-
-2005-08-24  Li Yuan  <li.yuan@sun.com>
-
-	Fixes #314352.
-	* e-table-item.c: (eti_event):
-	 if accessibility is enabled, we enable horizontal cusor 
-	 movement for line selection.
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-table-config.c (setup_fields): fix some missing casts.
-
-2005-08-10  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #313063.
-
-	* e-tree.c (e_tree_class_init): fix the set_scroll_adjustments
-	signal to take object, not pointer arguments.  Since glib's
-	anality doesn't accept an object pointer as a pointer.  go figure.
-
-2005-07-25  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-table-config.glade: Added code to use stock icons instead of
-	-> and <-
-
-2005-06-23  Kaushal Kumar  <kakumar@novell.com>
-
-	* Makefile.am: Set libetableincludedir to table to match 
-	source directory name and fix evolution-exchange build 
-	without GAL.
-
-2005-06-01  Kaushal Kumar  <kakumar@novell.com>
-
-	* e-table-item.c (eti_dispose): Don't hide the tooltip if we don't
-	have a canvas anymore.
-	Patch by: Not Zed
-
-2005-05-20  Li Yuan  <li.yuan@sun.com>
-
-	* e-table-header-item.c:
-	* e-table-header-item.h:
-	export ethi_change_sort_state, so we can call it in a11y part.
-	* e-tree.c: (e_tree_get_header_item):
-	* e-tree.h:
-	return the header item of e-tree.
-
-	Fix for #302154.
-
-2005-03-14  Theppitak Karoonboonyanan <theppitak@gmail.com>
-
-	* e-cell-text.c (e_cell_text_retrieve_surrounding_cb)
-	(e_cell_text_delete_surrounding_cb): selecion fixes for im's.
-
-2005-02-25  Li Yuan  <li.yuan@sun.com>
-
-	Fix for #73009.
-	* e-table-config-no-group.glade:
-	* e-table-config.glade:
-
-2005-01-27  Harry Lu <harry.lu@sun.com>
-
-	Some code clean work.
-
-	* e-table-click-to-add.c: (etcta_class_init): move a11y registry
-	call to a11y code.
-	* e-table.c: (e_table_class_init): ditto.
-	* e-tree.c: (e_tree_class_init): ditto.
-
-2005-01-27  Li Yuan  <li.yuan@sun.com> 
-
-	* e-cell-combo.c: (e_cell_combo_init), (e_cell_combo_do_popup),
-	(e_cell_combo_list_button_press), (e_cell_combo_button_press),
-	(e_cell_combo_button_release), (e_cell_combo_key_press):
-	add an a11y name for the popup list.
-	make shortcut key ALT+Arrow work.
-	Fixes #70261
-	* e-cell-text.c: (e_cell_text_class_init), (_delete_selection),
-	(_insert): 
-	add "text_inserted" and "text_deleted" signals to notify the
-	text has been changed.
-	(e_cell_text_get_text_by_view):
-	new helper function to get the text being editted.
-	* e-cell-text.h:
-	add signal declaration.
-	* e-cell-toggle.c: (etog_draw):
-	add range check for negative values.
-	* e-cell-vbox.c: (e_cell_vbox_class_init):
-	* e-cell-vbox.h:
-	make ECellVboxView public since it will be used in a11y part.
-	* e-table-click-to-add.c: (etcta_style_set),
-	(create_rect_and_text), (etcta_realize), (etcta_class_init),
-	(e_table_click_to_add_commit):
-	add "style_set" signal to click_to_add and implement
-	the style_set function.
-	(etcta_init): 
-	add a11y name to click to add.
-	* e-table-click-to-add.h: 
-	add "style_set" signal to click_to_add and implement
-	the style_set function.
-	* e-table-config.c: (config_button_up), (config_button_down):
-	check whether the columns are empty.
-	* e-table-group-container.c:
-	* e-table-group-container.h:
-	make ETableGroupContainerChildNode public since it
-	will be used in a11y part.
-	* e-table-item.c: (eti_init):
-	init eti->cols.
-	(eti_event):
-	at GDK_KEY_PRESS event and GDK_Down key pressed, we check
-	view_col value before we pass it to eti_e_cell_event.
-	(eti_class_init):
-	call the new initialize function
-	* e-table.c: (table_canvas_focus_event_cb):
-	if canvas has a focused item but the etable does not
-	have a cursor row, just focus the first item after check
-	whether the click_to_add should get the focus.
-
-2005-01-26  JP Rosevear  <jpr@novell.com>
-
-	Fixes #38195
-	
-	* e-cell-combo.c (e_cell_combo_set_popdown_strings): don't convert
-	to the locale for gtk widgets now
-
-2004-12-21  JP Rosevear  <jpr@novell.com>
-
-	Fixes #29309
-	
-	* e-table-header-item.h: add field chooser dialog data member
-
-	* e-table-header-item.c: remove weak pointer ref
-	(ethi_popup_field_chooser): if we already have a dialog, just
-	present it, otherwise create a new one and listen for its
-	destruction
-
-2004-11-24  Li Yuan  <li.yuan@sun.com>
-
-	* e-table.c: (e_table_get_cell_geometry):
-	check whether header_canvas and table_canvas is NULL.
-
-2004-11-04  Li Yuan  <li.yuan@sun.com>
-
-        * gal/e-table/e-table.c: (table_canvas_focus_event_cb):
-        if canvas has a focused item but the etable does not have a cursor row,
-        just focus the first item.
-
-2004-10-19  JP Rosevear  <jpr@novell.com>
-
-	* e-table.c (table_canvas_focus_event_cb): return FALSE so we
-	don't kill the focus event chain
-
-2004-08-09  Not Zed  <NotZed@Ximian.com>
-
-	* e-cell-combo.c (e_cell_combo_get_popup_pos): include scrollbar
-	offset in vertical calculation.  don't ask me i just work here.
-	see #61932.
-
-2004-08-02  Radek Doulik  <rodo@ximian.com>
-
-	* e-table-config.c (e_table_config_construct): do not set
-	position, it's already done in .glade, call set_transient_for
-	always (passing NULL is valid as well)
-
-	* e-table-config.glade: * e-table-config-no-group.glade: center
-	window on parent, don't let it resize and most importan make it
-	dialog window so that set_transient_for works against define views
-	dialog
-
-	Fixes #61936
-
-2004-07-07  Radek Doulik  <rodo@ximian.com>
-
-	* e-table-sorted-variable.c (etsv_add): added
-	e_table_model_pre_change because we call
-	e_table_model_row_inserted later. It fixes freeze/unfreeze for
-	ETableItem assert warning which I run into when fixing #56271
-
-2004-06-22  Rodney Dawes  <dobey@novell.com>
-
-	* e-table-config.c (do_fields_config_dialog, e_table_config_new):
-	Fix some spacing and border width properties on the dialog's widgets
-	to make the dialog compliant with the HIG
-
-2004-06-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-model.[ch]: Added e_table_model_freeze and e_table_model_thaw
-
-	* e-table-config.c (setup_fields): Use e_table_model_freeze and
-	e_table_model_thaw
-
-	Fixes #54785
-
-2004-06-11  Radek Doulik  <rodo@ximian.com>
-
-	* e-table-config.c (e_table_config_construct): set dialog window
-	position, glade doesn't do that for us anymore as the window is
-	first hidden, extended and later shown
-
-	* e-table-config-no-group.glade: as below
-
-	* e-table-config.glade: set visibility to false, it will keep the
-	dialog hidden until we call gtk_widget_show and thus no resizing
-	is visible while we are extending the dialog content
-
-	Fixes #57825
-
-2004-06-10  Radek Doulik  <rodo@ximian.com>
-
-	* e-cell-text.c (layout_with_preedit): removed unused variable
-
-	* e-tree.c (e_tree_get_item): added cast
-	added #include <atk/atkregistry.h>
-
-	* e-table-one.c (one_finalize): removed unused variable
-
-	* e-table-item.c: added #include
-	"gal/a11y/e-table/gal-a11y-e-table-item.h" for
-	gal_a11y_e_table_item_factory_get_type prototype
-
-	* e-table-header-utils.c (e_table_header_draw_button): removed
-	unused variable
-
-	* e-table-config.c (get_source_model_col_index): removed unused
-	variable
-
-	* e-table-click-to-add.c (finish_editing): added cast
-	(etcta_event): ditto
-
-	* e-cell-toggle.c: added #include
-	"gal/a11y/e-table/gal-a11y-e-cell-registry.h" to have
-	gal_a11y_e_cell_registry_add_cell_type prototype
-
-	* e-cell-text.c (layout_with_preedit): removed unused variable
-	(build_layout): ditto
-	(ect_event): ditto
-	(e_cell_text_commit_cb): ditto
-
-	* e-cell-popup.c: added #include
-	"gal/a11y/e-table/gal-a11y-e-cell-registry.h" to have
-	gal_a11y_e_cell_registry_add_cell_type prototype
-
-2004-06-10  Not Zed  <NotZed@Ximian.com>
-
-	* e-tree-selection-model.c (e_tree_selection_model_select_paths):
-	add new api for setting the whole selection in one go.  See
-	#59546.
-
-2004-06-09  Radek Doulik  <rodo@ximian.com>
-
-	* e-table-field-chooser.c (ensure_nonzero_step_increments): new
-	helper function to set step_increments
-	(allocate_callback): call ensure_nonzero_step_increments
-	(resize): ditto
-	(ensure_nonzero_step_increments): set step increments always to 16
-
-	Fixes #48275
-
-2004-05-10  Bruce Tao  <bruce.tao@sun.com>
-
-       Fixes #51626
-
-	* e-table-click-to-add.c: (etcta_event):
-       Add an entry for focus_in event, do the same thing as button_press event.
-
-	* e-table-item.c: (eti_event):
-       Mask the Ctrl+Tab processing routine.
-
-	* e-table.c: (table_canvas_focus_event_cb), (canvas_vbox_event),
-	(click_to_add_event), (e_table_setup_table):
-       Enable you to navigate between click_to_add and the existing tasks by
-       pressing Ctrl+Tab. However, if there is no existing task, you can still jump
-       out of click_to_add by this way.
-	
-2004-05-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-tree.c (e_tree_find_next): Don't necessarily set row to 0 if
-	the root node has the cursor (otherwise message_list_select()
-	first unread will actually select the second unread if the first
-	unread is the first in the list). Fixes a bug that's been pissing
-	me off for years.
-
-2004-05-04  Not Zed  <NotZed@Ximian.com>
-
-	* e-table-item.c (eti_event): revert last patch.
-	(eti_attach_cell_views): add some code to reset drags and other
-	things as if the model changed, so we don't keep trying to run
-	things we shouldn't be on the view which might be changing.  This
-	may break other things but should fix 57222 and related.
-
-2004-05-04  Not Zed  <NotZed@Ximian.com>
-
-	* e-table-item.c (eti_event): if motion column is beyond our known
-	columns, just ignore it and don't generate a LEAVE_NOTIFY.  uh,
-	seems to work, and fixes #57222.
-
-2004-04-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-cell-text.c (e_cell_text_class_init): Changed the int param
-	specs to take a min value of -1 and also defautl to -1 (-1 means
-	off and they should all default to the same value that they
-	default to in the init() function). Needed to fix bug #57304.
-
-2004-03-10  Hao Sheng  <hao.sheng@sun.com>
-
-	Fixes #55198
-
-	* e-table-config.glade : Make the access key Alt+O work
-
-2004-02-26  Not Zed  <NotZed@Ximian.com>
-
-	* e-table-item.c (eti_table_model_pre_change): reset
-	motion_row/motion_col if the model changes.  See bug #54757.
-
-2004-02-12  Rodney Dawes  <dobey@ximian.com>
-
-	* e-cell-popup.c (ecp_draw):
-	* e-cell-spin-button.c (ecsb_draw):
-	* e-table-header-utils.c (e_table_header_draw_button): Change the
-	shadow type for the arrows here, so that themes that do handle the
-	use of shadow types with arrows, draw things correctly, instead of
-	following what the old default gtk+ did in 1.x
-
-2004-01-27  Radek Doulik  <rodo@ximian.com>
-
-	* e-cell-text.c (ect_print): print strikeout/underline
-
-	Fixes #32240
-
-2003-11-19  Bolian Yin  <bolian.yin@sun.com>
-
-	Fixes #51139
-
-	* e-table-item.c : change the place of emitting
-	"selection_model_removed" signal.
-
-2003-11-17  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-config.c : use new gal_combo_* namespace.
-
-2003-11-11  Bolian Yin  <bolian.yin@sun.com>
-
-	Fixes # 50480
-
-	* e-table-item: add two signals: "selection_model_removed" and
-	"selection_model_added"
-
-2003-10-13  Charles Zhang  <charles.zhang@sun.com>
-
-	* e-table-config.c (e_table_config_new): disable apply button
-	when initial dialog.
-	* e-table-header-item.c (apply_changes): disable apply button
-	after applying changes.
-
-2003-10-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-table-item.c (eti_get_cell_background_color): Allocate
-	colors using gdk_colormap_alloc_color().
-
-2003-09-28  Charles Zhang  <charles.zhang@sun.com>
-
-	* e-table-config.c (do_sort_and_group_config_dialog): process
-	GTK_RESPONSE_DELETE_EVENT signal correctly.
-	* e-table-config.c (do_fields_config_dialog): the same as above
-	[#48815]
-
-2003-09-11  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-config.c (get_source_model_col_index): new method to
-	get the source model column for a specified available_model idx.
-	(create_global_store): save the source model index in a new col.
-	(config_button_add): use the new index lookup function [48153].
-
-2003-09-11  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-sort-info.c (e_table_sort_info_load_from_node):
-	move scnt and gcnt initialization outside the for loop [43156].
-
-2003-08-25  Harry Lu  <harry.lu@sun.com>
-
-	** For bug #47874.
-
-	* e-table-specification.c (e_table_specification_load_from_file):
-	check whether file exists before call xmlParseFile().
-	* e-table-state.c (e_table_state_load_from_file): ditto.
-	* e-tree-table-adapter.c (open_file): ditto.
-
-2003-08-19  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-tree.c (draw_expander): add an expander_style param
-	(ect_draw): pass expander_style to draw_expander
-	(animate_expander): new timeout handler for expander animation
-	(ect_event): on !retro clicks, draw a "semi" expander and start
-	an animation handler to finish the animation.
-	
-2003-08-15  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-tree.c (draw_retro_expander): extracted from ect_draw
-	(draw_expander): new gtktreeview-like expander drawing
-	(ect_draw): draw lines and expanders based on retro_look style prop
-	(adjust_event_position): extracted method from ect_event
-	(event_in_expander): new checks for motion/clicks in expander
-	(ect_event): handle prelight for new expanders
-	* e-table-item.c (eti_init): init new motion col/row
-	(eti_event): synthesize leave_notify events for cells and propogate
-	existing motion events to the cells.
-	* e-tree.c (e_tree_class_init): add retro_look and expander_size
-	style props.
-
-2003-08-12  Larry Ewing  <lewing@ximian.com>
-
-	* e-cell-toggle.c (check_cache): actually chose the right color to
-	composite over when caching the pixmap.
-
-2003-08-08  Stanislav Brabec  <sbrabec@suse.cz>
-
-	* Makefile.am: Removed trailing backslash on last line.
-
-2003-07-28  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-config (setup_fields): map model_column to available
-	model row by ignoring disabled columns.
-
-2003-06-30  Dan Winship  <danw@ximian.com>
-
-	* e-tree.c (e_tree_init): Initialize some missing fields. Fixes
-	"no handler with id" warnings at evo shutdown
-	(ETreePriv): remove unused table_rows_{inserted,deleted}_id
-	(et_disconnect_from_etta): remove refs to them
-
-	* e-table.c (e_table_drag_source_unset): free site->target_list if
-	it's set.
-
-2003-06-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-cell-text.c (get_font_for_size): Implement.
-	(ect_print): Use same font heuristics as evo calendar, pick a font
-	that fits. Correct baseline calculation.
-
-2003-06-19  Larry Ewing  <lewing@ximian.com>
-
-	* e-table-specification.c (e_table_specification_load_from_node):
-	remove extra ref, the count starts at one.
-
-	* e-table-utils.c (e_table_spec_to_full_header): add_column adds a
-	reference, so drop the intial reference.
-
-	* e-table.c (et_real_construct):remove extra ref, count starts at
-	one.
-
-2003-06-13  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree.c (et_search_search): don't do the CURSOR_FIRST
-	checks if cursor is NULL [43523]
-
-2003-06-13  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-item.c (eti_get_cell_background_color): update to
-	an alt row color more consistent with gtktreeview. [44610]
-
-2003-06-12  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-text.c (generate_layout): guard against NULL strings
-	* e-table-config.c (create_global_store): don't add disabled
-	column titles to the store. [44258]
-	* e-tree-table-adapter.c (e_t_t_a_node_set_expanded): don't
-	warn if we're trying to collapse a node that's not visible.
-	* e-tree.c (et_connect_to_etta): don't connect to row_inserted
-	and row_deleted. [43893]
-
-2003-05-28  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-date.c (ecd_get_text): use e_utf8_strftime_fix_am_pm
-	and remove locale to utf8 conversion at end.  [43485]
-
-2003-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-tree.c (tree_canvas_size_allocate): to really fix 42952
-	use e_table_item_get_cell_geometry.  Also a couple valgrind
-	and g_warning fixes related to this change from Mike.
-
-2003-05-19  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-text.c (build_layout): don't call any line breaking
-	or justification code if the width <= 0 since it's pointless
-	and apparently pango likes to crash when you do. [43199]
-
-2003-05-16  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-text.c (invisible_finalize): kill
-	(ect_stop_editing): destroy the invisible, not weak_unref
-	(e_cell_text_view_get_invisible): don't weak_ref the invisible
-	since we own its ref.
-
-2003-05-16  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-item.c (eti_event): fix a couple timer checks
-	* e-tree-table-adapter.c (update_node): Traverse POST order
-	so that the parent nodes are at the head of the prepended list.
-	Don't restore expanded state to nodes that aren't in the tree
-	any longer.  Hopefully fixes #42856.
-
-2003-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-tree.c (tree_canvas_size_allocate): Call
-	tree_canvas_reflow_idle() before deciding whether to move the
-	adjustment, not afterwards.  [#42952]
-
-2003-05-14  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-c (context_connect): use weak refs not datasets.
-	(e_tree_dispose): weak_unref the context.
-	Hopefully fixes 42617.
-
-2003-05-13  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-item.c (eti_event): gross hack to work around a
-	post dispose event emission by gtk2.0/canvas2.0 [#42622]
-
-2003-05-09  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree.c (find_next_in_range): add null check for paths
-	(find_prev_in_range): add null check for paths
-
-2003-05-09  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-item.c (eti_cursor_change): don't return on col == -1. 
-	* e-tree.c (tree_canvas_size_allocate): update the adjustment 
-	to center the cursor.
-	(hover_timeout): remove unused variable to fix warning
-
-2003-05-06  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-table-adapter.c (insert_node): add missing model_changed
-	(etta_proxy_node_inserted): add missing model_changed
-	(etta_proxy_node_removed): add missing model_changed
-
-2003-05-05  Jeremy Katz  <katzj@redhat.com>
-
-	* e-table-config.c (setup_fields): Use correct macro for int->pointer
-
-2003-05-01  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-combo.c (e_cell_combo_selection_changed): new
-	(e_cell_combo_init): connect to selection_changed on popup_list
-	(e_cell_combo_do_popup): block selection_changed while popping up
-	[bug #40996]
-	
-2003-05-01  JP Rosevear  <jpr@ximian.com>
-
-	* e-table.c (et_real_construct): remove gratuitous ref
-
-2003-04-29  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-text.c (build_layout): don't use unicode ellipsis so
-	that we don't break on broken font setups.
-
-2003-04-29  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-text.c (generate_layout): don't set width on the layout
-	during edit 
-
-2003-04-28  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-text.c (build_layout): don't do wrapping during edit 
-
-2003-04-21  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-text.c (build_layout): use unicode ellipsis char for 
-	breaking lines. Use g_utf8_find_prev_char and check for failure
-	so that we don't tight loop for small cells that can't display
-	any chars.
-
-2003-04-21  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-tree.c (ect_draw): use e_tree_table_adapter_node_get_next 
-	to determine how to draw sibling lines.
-	(ect_print): ditto
-	* e-tree-table-adapter.c (e_t_t_a_node_get_next): new
-
-2003-04-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes evolution bug #40464 ]
-	* e-table.c (e_table_class_init): use G_SIGNAL_TYPE_STATIC_SCOPE
-	for the GtkSelectionData args of table_drag_data_get and
-	table_drag_data_received.
-
-2003-04-18  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-text.c (build_layout): if the layout splits into more
-	than one line, shorten it to a single line with elipses.
-	(generate_layout): don't ref NULL layouts
-	(ect_enter_edit): use g_new0 for the CellEdit
-	(get_position_from_xy): use generate_layout since edit->layout
-	isn't necessarily set here.
-
-2003-04-17  JP Rosevear  <jpr@ximian.com>
-
-	* e-table-subset.c : add guarding for row indexing (Bug# 41497)
-
-2003-04-16  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-text.c (build_layout): set width and alignment of layout.
-	(generate_layout): set width on existing layout and pass new width 
-	param to build_layout.
-	(ect_draw): pass width to generate_layout
-	(ect_height): pass width to generate_layout
-	(ect_enter_edit): pass width to generate_layout
-	(ect_max_width): pass width to generate_layout
-	(ect_max_width_by_row): pass width to generate_layout
-	(ect_show_tooltip): pass width to generate_layout
-	(e_cell_text_view_command): pass width to generate_layout (Bug #37894)
-	
-2003-04-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-table-header-utils.c (e_table_draw_elided_string): Don't unref
-	the layout that was passed in.
-	(e_table_header_draw_button): Always unref the layout when we're
-	done with it.
-
-	* e-tree-table-adapter.c (e_tree_table_adapter_load_expanded_state):
-	Free the id when we're done with it.
-
-2003-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* e-table-one.c (one_dispose): free data here since we don't have
-	source in finalize
-
-2003-04-08  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-config-no-group.glade : add response ids to buttons
-
-2003-04-08  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-text.c : break e-font dependency
-
-2003-04-08  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-config.glade : swap button order
-	* e-table-config-no-group.glade : swap button order
-
-2003-04-08  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-popup.c : remove debugging g_print calls 
-	* e-table-group-container.c : fix length_threshold prop range
-	* e-table-group-leaf.c : fix length_threshold prop range
-	* e-table-item.c : fix length_threshold prop range
-
-2003-04-04  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-table-adapter.c (etta_sort_info_changed): guard against
-	root == NULL.  Bug #39491.
-
-2003-04-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-tree.c (e_tree_class_init): Add a G_SIGNAL_TYPE_STATIC_SCOPE
-	for the GTK_TYPE_SELECTION_DATA arg.
-
-2003-04-02  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-table-adapter.c (update_node): restore expanded
-	state of node and all children. Fixes Ximian bug #40393.
-	(check_expanded): new traverser function
-
-2003-03-31  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-table-adapter.c (kill_gnode): if killing the root
-	node, set it to NULL in the priv data. Bug #39441.
-
-2003-03-24  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-sort-info.c (e_table_sort_info_load_from_node): 
-	properly parse nodes that include whitespace. bug #39896
-
-2003-03-24  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-table-adapter.c (update_node): don't call delete_node
-	on the root node since generate_tree already does that. Thanks
-	to Antonio Xu <antonio.xu@sun.com> for identifying the cause of
-	the bug and providing a candidate patch. Bug #38320.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	* e-table.c (do_drag_motion): fix UMR.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	* e-cell-text.h: add underline_column field.
-
-	* e-cell-date.c: add underline_column to the comment.
-
-	* e-cell-size.c: add underline_column to the comment.
-
-	* e-cell-text.c (build_layout): handle underline column.
-	(ect_show_tooltip): same.
-	(ect_set_property): same.
-	(ect_get_property): same.
-	(e_cell_text_class_init): same.
-	(e_cell_text_init): same.
-	(e_cell_text_new): add underline_column to the comment.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	* e-table-item.h (ETableItem): add cursor_idle_id.
-
-	* e-table-item.c (eti_idle_maybe_show_cursor): save off the
-	cursor_idle_id.
-	(eti_idle_show_cursor_cb): reset the cursor_idle_id to 0.
-	(eti_dispose): remove the cursor_idle_id.  Fixes a crash in the
-	evolution select-names dialog.
-
-2003-03-18  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-header-item.c (ethi_draw): mimic Gtk's sort arrows
-	(ethi_start_drag): mimic Gtk's sort arrows
-
-2003-03-18  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-selection-model.c (select_single_path): null start_path
-	(etsm_invert_selection): null start_path
-	(etsm_toggle_single_row): null start_path
-	(etsm_real_move_selection_end): start at start_path, not cursor
-	(etsm_set_selection_end): set start_path
-	(e_tree_selection_model_init): null start_path
-
-2003-03-14  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-table-adapter.c (update_node): save and restore expanded
-	state so parents don't collapse when children are added to them.
-	(e_tree_table_adapter_node_is_expanded): guard against null nodes.
-
-2003-03-05  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-model.c : fix a couple ==TRUE uses pointed out by 
-	Morten Welinder <terra@diku.dk>.
-
-2003-03-04  Dmitry Mastrukov  <dmitry@taurussoft.org>
-
-	* e-cell-date.c (ecd_get_text): i18n fix
-	* e-table.c (et_real_construct): i18n fix
-	* e-table-config.c (create_global_store): i18n fix
-	* e-table-utils.c (et_col_spec_to_col): i18n fix
-
-2003-03-04  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-selection-model.c : some cursor fixes
-
-2003-03-04  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-selection-model.c : rewrite to store selected paths in a
-	hashtable instead of a tree.
-	* e-tree-table-adapter.c : lose the hacky orig_position api since
-	etsm doesn't need it anymore.
-
-2003-02-26  Rodney Dawes  <dobey@ximian.com>
-
-	* e-tree.c (et_canvas_style_set): Add style_set to update list properly
-	(et_canvas_realize): Remove this as it's no longer needed with support
-	for the style_set implementation
-	
-2003-02-28  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table.c (et_drag_motion): remove alloc-based transform
-	(et_drag_data_received): ditto
-	(et_drag_drop): ditto
-	(do_drag_motion): ditto
-
-2003-02-28  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree.c (et_drag_motion): remove alloc-based transform
-	(et_drag_data_received): ditto
-	(et_drag_drop): ditto
-	(et_hover_timeout): ditto
-	(do_drag_motion): ditto
-
-2003-02-20  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-item.c (eti_table_model_rows_deleted): fix overzealous
-	g_asserts to avoid crashes when eti->rows is already updated.
-
-2003-02-20  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-selection-model.c (etsm_orig_position): kill
-	(etsm_find_node_unless_equals): use new etta_orig_position
-	(update_parents): use new etta_orig_position
-	(etsm_recurse_is_path_selected): use new etta_orig_position
-	* e-tree-table-adapter.c (e_tree_table_adapter_orig_position): new
-	(resort_node): populate orig_pos, fix sorting_map bound bug
-	(create_gnode): initialize orig_pos
-	(delete_node): call resort_node so orig_pos gets updated
-	(insert_node): always call resort_node let it decide whether to sort
-	
-2003-02-18  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-table-adapter.c (move_map_elements): set remap_needed
-
-2003-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* e-cell-text.c (build_layout): make sure the row >= 0 before
-	calling value_at to calc "strikeout".
-
-2003-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* e-tree-table-adapter.c (etta_proxy_node_data_changed): return
-	after the e_table_model_no_change call.
-	(etta_proxy_node_col_changed): same.
-
-2003-02-13  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-table-adapter.c (*_load_expanded_state): guard for
-	null paths if save_id lookup fails.
-
-2003-02-13  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-header-item.c (ethi_drag_motion): don't transform
-	based on allocation position. Position isn't absolute now.
-	
-2003-02-13  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-header-utils.c (e_table_header_draw_button): kill
-	a double unref on the pango_layout.
-
-2003-02-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-table-click-to-add.c (etcta_realize): Request a reflow on
-	realization, so size and placement will be correct initially.
-	
-2003-02-12  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree.c (e_tree_find_next): handle reverse searches
-	(find_prev_in_range): reverse search impl
-	(et_real_construct): kill warnings
-
-2003-02-12  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-table-adapter.c (insert_node): work around broken models
-	that insert children before parents.  bad models.
-	(e_tree_table_adapter_load_expanded_state): don't update_node
-	(e_tree_table_adapter_node_set_expanded): recursively expand
-	parent if the node is not visible yet.
-	(e_tree_table_adapter_set_sort_info): don't resort empty trees
-
-2003-02-10  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree.c (e_tree_find_next): rewrite to use etta
-	(find_next_in_range): helper func to search a range of rows
-	(find_next_callback): kill
-
-2003-02-06  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-table-adapter.c (resort_node): index bound bug
-	(insert_children): prepend/reverse for now
-	(generate_tree): resize old map to zero before filling it again
-	(insert_node): fix assumption that root parent node has an index
-
-2003-02-06  Not Zed  <NotZed@Ximian.com>
-
-	* e-tree-table-adapter.c (delete_node): use the parent path to
-	find the parent node rather than the row, which is not valid for
-	the root node, which still needs its visible child count updated.
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* e-table-config.c (config_class_init): Replace deprecated
-	glade_gnome_init() call with glade_init().
-
-	* e-table-field-chooser.c (e_table_field_chooser_class_init):
-	Likewise.
-
-2003-02-03  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-selection-model.c : remove e-tree-sorted usage
-	* e-tree-table-adapter.* : rewrite to perform sorting
-	* e-tree.c : remove e-tree-sorted usage
-
-2003-01-27  Jody Goldberg <jody@gnome.org>
-
-	* Release 1.99.1
-
-2003-01-23  Larry Ewing  <lewing@ximian.com>
-
-	* e-table-click-to-add.c (e_table_click_to_add_commit): destroy
-	canvas items to removing them, simply unrefing them is not
-	sufficient.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-tree-table-adapter.c
-	(e_tree_table_adapter_load_expanded_state): Call
-	e_table_model_pre_changed() only once so we dont' get the table in
-	a frozen state after returning from here.
-
-2003-01-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-tree-table-adapter.c
-	(e_tree_table_adapter_save_expanded_state): Same here.
-
-	* e-table-state.c (e_table_state_save_to_file): Same as below.
-
-	* e-table-specification.c (e_table_specification_save_to_file):
-	Back to using e_xml_save_file(). Not sure we can really trust
-	xmlSaveFile (sure as hell couldn't in the libxml-1.x days),
-	besides, e_xml_save_file protects against corruption due to not
-	enough disk space.
-
-2003-01-15  Not Zed  <NotZed@Ximian.com>
-
-	* e-cell-tree.c (ect_draw): If we set a clip rectangle, clear it
-	after we've finished.
-
-2002-01-10  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-item.c (eti_table_model_rows_deleted): revert broken fix
-
-2002-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* e-table-group-container.c (etgc_dispose): free the children
-	before we free and dispose of our ecol, since
-	e_table_group_container_child_node_free depends on it.  Fixes a
-	crash.
-
-2002-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* e-table-header-item.c (ethi_popup_customize_view): pass NULL for
-	parent_window for e_table_config_new.
-
-	* e-table-config.glade, e-table-config-no-group.glade: switch from
-	GnomePropertyBox to GtkDialog, remove the extra notebook widget
-	from the heirarchy, and set all the subdialogs modal.
-	
-	* e-table-config.h: add parent_window arg to
-	e_table_config_{new,construct}.
-
-	* e-table-config.c (config_dialog_changed): new function, not
-	really needed yet since the apply/ok buttons are never
-	insensitive.
-	(config_get_property): handle the "state" read-only property.
-	(config_class_init): put back in the "state" property that was
-	deleted during the merge from the gal-2 branch (it looks like).
-	(do_sort_and_group_config_dialog): set the sort/group dialog
-	transient for the e-table-config dialog, and
-	gnome_property_box_changed -> config_dialog_changed.
-	(do_fields_config_dialog): same, but with the fields dialog.
-	(dialog_response): response handler for the e-table-config dialog.
-	(setup_gui): remote the hide button/notebook code, since neither
-	of those widgets exist anymore in this dialog, and remove the
-	"apply" signal and connect to "response", since we're a GtkDialog
-	dialog instead of a GnomePropertyBox.
-	(e_table_config_construct): take a parent_window arg, and
-	set_transient_for if it's non-NULL.
-	(e_table_config_new): take parent_window arg and pass to
-	construct.
-
-2002-12-16  Chris Toshok  <toshok@ximian.com>
-
-	* e-cell-text.c (_get_tep): edit->tep isn't a GtkObject anymore.
-
-2002-12-16  Chris Toshok  <toshok@ximian.com>
-
-	* e-table-header-utils.c (e_table_draw_elided_string): pass in the
-	pango layout so we don't have to create another one here.  Also,
-	elide the string properly (same method that e-clipped-label uses)
-	and simplify the extent operations.
-	(e_table_header_compute_height): just use
-	pango_layout_get_pixel_size here.
-	(e_table_header_draw_button): make sure the clip rectangle is
-	NULL'ed on our gc, since random gtk calls seem to install one,
-	which sucks.  Also, simplify the pango layout stuff a little.
-
-2002-12-16  Chris Toshok  <toshok@ximian.com>
-
-	* e-table.c (et_real_construct): remove obvious double g_strdup.
-
-	* e-table-header-item.c (ethi_header_context_menu): ref/sink the
-	popup.
-
-	* e-table-field-chooser.c (e_table_field_chooser_init): use
-	gtk_widget_show_all so our custom widget gets displayed.
-
-2002-12-13  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-item.c (eti_table_model_rows_deleted): valgrindage
-
-2002-12-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-table-extras.c (ete_init): Add a "collate" sort callback that
-	uses the new g_collate_compare().
-
-2002-12-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* e-table.c (e_table_get_state_object): Don't leak old sort info.
-
-2002-12-03  Not Zed  <NotZed@Ximian.com>
-
-	* e-tree-memory.c (etmm_dispose): make this a dispose rather than
-	finalise.  Crashes on finalise otherwise.
-
-2002-11-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-table-memory-store.c (etms_finalize): Call
-	e_table_memory_store_clear().
-	(e_table_memory_store_clear): Free the values.
-	(e_table_memory_store_remove): Likewise.
-
-2002-11-18  Chris Toshok  <toshok@ximian.com>
-
-	* e-table-config.c (connect_button): take GCallback, not
-	GtkSignalFunc.
-	(configure_sort_dialog): show the custom widget.
-	(configure_group_dialog): same.
-	(configure_fields_dialog): same, also pass G_CALLBACK (func),
-	instead of GTK_SIGNAL_FUNC (func), to connect_button.
-	(setup_gui): pass G_CALLBACK (func), instead of GTK_SIGNAL_FUNC
-	(func), to connect_button.
-
-	* Makefile.am (glade_DATA): remove e-table-group.glade, since we
-	don't use it anyplace.
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* e-table.c (set_scroll_adjustments): check for
-	table->table_canvas == NULL.
-
-	* e-table-item.c (eti_dispose): guard eti->tooltip.
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* e-cell-checkbox.[ch]: GObject port work.
-
-	* e-cell-combo.[ch]: same.
-
-	* e-cell-date.[ch]: same.
-
-	* e-cell-float.[ch]: same.
-
-	* e-cell-number.[ch]: same.
-
-	* e-cell-pixbuf.[ch]: same.
-
-	* e-cell-popup.[ch]: same.
-
-	* e-cell-progress.[ch]: same.
-
-	* e-cell-size.[ch]: same.
-
-	* e-cell-spin-button.[ch]: same.
-
-	* e-cell-text.[ch]: same.
-
-	* e-cell-toggle.[ch]: same.
-
-	* e-cell-tree.[ch]: same.
-
-	* e-cell-vbox.[ch]: same.
-
-	* e-cell.[ch]: same.
-
-	* e-table-col.c: same.
-
-	* e-table-column.c: same.
-
-	* e-table-config-field.[ch]: same.
-
-	* e-table-config.c: same.
-
-	* e-table-config.glade: same.
-
-	* e-table-field-chooser-dialog.[ch]: same.
-
-	* e-table-field-chooser-item.[ch]: same.
-
-	* e-table-field-chooser.[ch]: same.
-
-	* e-table-group-container.[ch]: same.
-
-	* e-table-group-leaf.[ch]: same.
-
-	* e-table-group.[ch]: same.
-
-	* e-table-header-item.[ch]: same.
-
-	* e-table-header-utils.[ch]: same.
-
-	* e-table-header.c: same.
-
-	* e-table-item.[ch]: same.
-
-	* e-table-scrolled.[ch]: same.
-
-	* e-table-utils.c: same.
-
-	* e-table.[ch]: same.
-
-	* e-tree-memory-callbacks.h: same.
-
-	* e-tree-scrolled.[ch]: same.
-
-	* e-tree-sorted-variable.c: same.
-
-	* e-tree.[ch]: same.
-
-	* test-check.c: same.
-
-	* test-cols.c: same.
-
-	* test-table.c: same.
-
-2002-11-14  Chris Toshok  <toshok@ximian.com>
-
-	* e-table-header-item.c (ethi_popup_customize_view): fix typo.
-
-2002-11-14  Chris Toshok  <toshok@ximian.com>
-
-	* e-table-header-item.c (ethi_popup_customize_view): ETableConfig
-	derives from GObject (fix warnings).
-
-	* e-table.c: deal with ESorter deriving from GObject.
-
-	* e-table-sorter.[ch]: this derives from GObject now.
-
-2002-11-14  Chris Toshok  <toshok@ximian.com>
-
-	* e-table-item.c: deal with ESelectionModel no longer deriving
-	from GtkObject.
-
-	* e-table.c: same.
-	
-	* e-tree.c: same.
-	
-	* e-table-config.c (do_fields_config_dialog): use GtkDialog's
-	reponse instead of GnomeDialog's button.
-
-	* e-table-click-to-add.[ch]: GObjectify this.
-
-	* e-table-selection-model.[ch]: this derives from GObject now.
-
-	* e-tree-selection-model.[ch]: same.
-
-2002-11-14  Chris Toshok  <toshok@ximian.com>
-
-	* e-table-without.[ch]: this subclasses from GObject now, not
-	GtkObject.  don't use GtkObject (especially casts to it) inside
-	the code.
-
-	* e-table-config-no-group.glade: libglade-convert.
-
-	* e-table-config.glade: same.
-
-	* e-table-field-chooser.glade: same.
-
-	* e-table-group.glade: same.
-	
-2002-11-13  Chris Toshok  <toshok@ximian.com>
-
-	* e-table.c (e_table_class_init): register the signals with
-	g_signal_new.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* e-table-memory-store.h: correct the GET_CLASS macro.
-
-	* e-table-one.h: same.
-
-	* e-table-sorted.h: same.
-
-	* e-table-subset.h: same.
-
-	* e-tree-sorted-variable.h: same.
-
-	* e-tree-table-adapter.h: same.
-
-2002-11-05  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-sorted-variable.[ch] : GObjectify
-	* e-tree-sorted-variable.[ch] : GObjectify
-
-2002-11-05  Mike Kestner  <mkestner@ximian.com>
-
-	* e-cell-text.c : remove ref/unref G_OBJECT masks
-	* e-table-extras.c : ditto
-	* e-table-header-item.c : ditto
-	* e-table-item.c : ditto
-	* e-table-memory-store.c : ditto
-	* e-table-one.c : ditto
-	* e-tree-sorted.c : ditto
-	* e-tree-table-adapter.c : ditto
-	* e-tree.c : ditto
-
-2002-11-05  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-col.[ch] : GObjectify
-	* e-table-column-specification.[ch] : GObjectify
-	* e-table-config.[ch] : GObjectify
-	* e-table-group-leaf.c : use GObject api for models
-	* e-table-group.c : use GObject api for models
-	* e-table-header-item.c : use GObject api for models
-	* e-table-header.c : use GObject api for models
-	* e-table-selection-model.c : use GObject api for models
-	* e-table-sort-info.[ch] : GObjectify
-	* e-table-sorted.[ch] : GObjectify
-	* e-table-sorter.c : use GObject api for models
-	* e-table-specification.c : use GObject api for models
-	* e-table-state.[ch] : GObjectify
-	* e-table-subset-variable.[ch] : GObjectify
-	* e-table-subset.[ch] : GObjectify
-	* e-table.c : use GObject api for models
-
-2002-11-05  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-item.c : use GObject api for models
-	* e-table-memory-callbacks.[ch] : GObjectify
-	* e-table-memory-store.[ch] : GObjectify
-	* e-table-memory.[ch] : GObjectify
-	* e-table-model.[ch] : GObjectify
-	* e-table-one.[ch] : GObjectify
-	* e-table-simple.[ch] : GObjectify
-	* e-tree-memory.[ch] : GObjectify
-	* e-tree-model.[ch] : GObjectify
-	* e-tree-selection-model.c : use GObject api for models
-	* e-tree-simple.[ch] : GObjectify
-	* e-tree-sorted.[ch] : GObjectify
-	* e-tree-table-adapter.[ch] : GObjectify
-	* e-tree.c : use GObject api for models
-
-2002-11-04  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-group.c : use GObject api for ETableHeader
-	* e-table-header-item.c : use GObject api on ETableHeader
-	* e-table-header.[ch] : GObjectify
-	* e-table-item.c : use GObject api on ETableHeader
-	* e-table-search.[ch] : GObjectify
-	* e-table-sorted.c : use GObject api for ETableHeader
-	* e-table-sorter.c : use GObject api for ETableHeader
-	* e-table-specification.[ch] : GObjectify
-	* e-table-utils.c : use GObject api for ETableHeader
-	* e-tree-sorted.c : use GObject api for ETableHeader
-	* e-tree.c : use GObject api on Header, Spec, and Search 
-	
-2002-11-01  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-extras : gobjectify
-	* e-tree.c (et_real_construct): ETableExtra is now a GObject
-	(e_tree_class_init): remove duplicated signals
-
-2002-10-26  Jody Goldberg <jody@gnome.org>
-
-	* Release 2.0.0.7
-
-2002-10-24  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree.c (e_tree_set_state_object): call e_tree_state_change
-
-2002-10-24  Chris Toshok  <toshok@ximian.com>
-
-	* e-table-memory-store.h: add prototypes for the _change*
-	functions.
-
-	* e-table-memory-store.c (e_table_memory_store_change_array): new
-	function, mostly c&p from _insert_array.
-	(e_table_memory_store_change): new function, mostly c&p from
-	_insert.
-	(e_table_memory_store_change_adopt_array): new function, mostly
-	c&p from _insert_adopt_array.
-	(e_table_memory_store_change_adopt): new function, mostly c&p from
-	_insert_adopt.
-
-2002-10-18  JP Rosevear  <jpr@ximian.com>
-
-	* e-table-item.c (eti_cursor_activated): don't emit a signal if we
-	couldn't find the view row
-
-2002-10-02  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-search.c (e_table_search_destroy): call drop_timeout
-
-2002-09-27  Mike Kestner  <mkestner@ximian.com>
-
-	* e-table-item.c (eti_get_cell_foreground_color): use the fg color
-	array in style, not text color. Change requested by Chris Lahey.
-
-2002-09-24  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree.c (e_tree_set_search_column): New api to set the search
-	column on a tree without having to set a sort column.
-
-2002-09-18  Mike Kestner  <mkestner@ximian.com>
-
-	* e-tree-model.c (e_tree_model_is_expandable): guard against NULL
-	nodes.
-
-2002-09-18  Dan Winship  <danw@ximian.com>
-
-	* e-table.c (et_real_construct): Set the selection model's
-	selection_mode after setting the table model, or things will break
-	in the GTK_SELECTION_SINGLE case if the table doesn't start out
-	empty.
-
-2002-09-17  Mike Kestner  <mkestner@ximian.com>
-
-	* gal/e-table/e-table-item.c (eti_event): exit editing on dblclick.
-	ungrab based on grabbed_count. unset grabbed_col and grabbed_row
-	on ungrab.
-
-2002-09-13  Jody Goldberg <jody@gnome.org>
-
-	* Release 2.0.0.6
-
-2002-09-10  Mike Kestner  <mkestner@ximian.com>
-
-	* gal/e-table/e-table-item.c (eti_event): allow keypress handling
-	for cursor_col==-1 as long as cursor_row isn't -1 also so that e-tree
-	searching works without click focusing an item.
-
-2002-08-29  Morten Welinder  <terra@diku.dk>
-
-	* e-table.c (et_destroy): Protect against double destroy.
-
-	* e-cell-text.c (generate_layout): Handle row==-1 brutally.
-	(build_layout): Handle row==-1 and constify.
-
-	* e-table-search.c (e_table_search_class_init): Use INT, not ENUM
-	signal argument.
-
-2002-08-06  Jody Goldberg <jody@gnome.org>
-
-	* Release 2.0.0.5
-
-2002-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-tree-table-adapter.c
-	(e_tree_table_adapter_save_expanded_state): And finally here.
-
-	* e-table-state.c (e_table_state_save_to_file): Same here.
-
-	* e-table-specification.c (e_table_specification_save_to_file): No
-	need to save to a temp file first here either since
-	e_xml_save_file now does that for us.
-
-	* e-table.c (e_table_save_specification): No need to handle
-	writing to a temp file first anymore, since I've updated
-	e_xml_save_file() to handle that for us.
-
-2002-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-cell-progress.c: #include <string.h> for memset
-
-	* e-table.c (e_table_save_specification): Updated to use
-	e_xml_save_file() instead of xmlSaveFile(). Also fixed to save to
-	a tmp file first.
-
-	* e-table-specification.c (e_table_specification_save_to_file):
-	Same as above.
-
-	* e-table-state.c (e_table_state_save_to_file): Same here.
-
-	* e-tree-table-adapter.c
-	(e_tree_table_adapter_save_expanded_state): And here too.
-
-2002-07-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-tree.c (item_key_press): In the case of '-' and '=', check
-	that no non-Shift modifier is pressed.
-
-2002-07-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-table-adapter.c (find_next_node, find_first_child_node):
-	Made these able to find the potential row for a new node which
-	will be the last row.
-	(find_row_num): Made this handle find_next_node and
-	find_first_child_node returning n_map.
-
-2002-06-18  JP Rosevear  <jpr@ximian.com>
-
-	Patch by clahey.
-	
-	* e-table.c (et_get_arg): get the use_click_to_add value
-	(et_set_arg): set the use_click_to_add_value, and either display
-	the item or destroy it
-	(e_table_class_init): add the use_click_to_add arg
-
-2002-06-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c: Major change.  Ported this to pango.
-
-2002-06-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c, e-table.h: Removed the drag_get_data_row and
-	drag_get_data_col fields since they're not used any longer.
-	(e_table_construct): If specification loading fails, return a NULL
-	ETable instead of just ignoring it.
-	(e_table_drag_highlight): Only destroy table->drop_highlight if it
-	exists.
-
-	* e-cell-popup.c (ecp_draw, ecp_event): Don't draw or interact
-	with the popup button if a cell isn't editable (based on a patch
-	by JPR.)
-
-	* e-table-col.c, e-table-col.h: Added the compare_col field to
-	this structure.  Added a GtkArg to set it.
-
-	* e-table-column-specification.c, e-table-column-specification.h:
-	Added the compare_col field here.  Made it load properly from xml.
-
-	* e-table-sorting-utils.c: Sort based on the compare_col in the
-	ETableCol instead of the col_idx.
-
-	* e-table-utils.c (et_col_spec_to_col): Set the compare_col field
-	in the ETableCol properly.
-
-2002-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-field-chooser-item.c: Added debugging printfs.
-
-	* e-table-header-item.c: Added debugging printfs.
-	(ethi_drag_motion): Don't subtract widget->allocation.* here.  It
-	seems that this value is affected by whether the table is using a
-	click to add field.  Not sure why.
-
-	* e-table-item.c (eti_realize): Check for NULL selection here.
-
-2002-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-model.c (d): Added debugging printfs.
-
-	* e-tree-sorted.c (ets_proxy_node_changed,
-	ets_proxy_node_data_changed, ets_proxy_node_col_changed,
-	ets_proxy_node_inserted): Added a bunch of e_tree_model_no_change
-	signals where appropriate.
-
-	* e-tree-table-adapter.c (etta_proxy_node_changed): Added an
-	e_table_model_no_change signal where appropriate.
-
-2002-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_realize): Made it so that on realize we grab
-	focus if we have the cursor, since otherwise, we'll change our
-	selection on focus in.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header.c, e-table-header.h
-	(e_table_header_prioritized_column_selected): Added this function.
-
-	* e-table-utils.c, e-table-utils.h
-	(e_table_util_calculate_current_search_col): Added this function.
-
-	* e-table.c, e-table.h, e-tree.c: Added a "always_search"
-	argument.  If this is off, then searches only occur if there's
-	sort.  If it's on, sort takes precendence in doing searches,
-	followed by the highest priority column shown.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c: Use g_getenv instead of getenv.
-
-	* e-table-item.c (eti_event): Reenable tooltips if the
-	GAL_DO_TOOLTIPS environment variable is set.
-
-2002-06-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c (ect_style_set): Get the font from the style again
-	when the style changes.
-	(init): Checks for the environment variable GAL_ELLIPSIS and uses
-	that instead of ... if it is set.
-
-	* e-table-click-to-add.c (finish_editing): e_table_item_leave_edit
-	before committing.
-	(etcta_event): Added a missing break; here.
-
-	* e-table-item.c (eti_style_set): On style set, free the height
-	cache, request a reflow and a redraw, and call
-	eti_idle_maybe_show_cursor.
-	(e_table_item_compute_location): Don't call eti_get_height here,
-	just use the cached value.
-
-	* e-tree.c, e-tree.h (e_tree_get_table_adapter): Added this simple
-	accessor function.
-
-2002-05-29  Jody Goldberg <jody@gnome.org>
-
-	* Release 2.0.0.4
-
-2002-05-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-table-adapter.c
-	(e_tree_table_adapter_node_would_be_expanded,
-	e_tree_table_adapter_node_is_expanded): Added would_be_expanded
-	refactoring code out of is_expanded.
-	(find_first_child_node_maybe_deleted): Use the new function.
-
-2002-05-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (ets_proxy_node_request_collapse): Check for
-	path being NULL.
-
-	* e-tree-table-adapter.c
-	(e_tree_table_adapter_load_expanded_state): Rebuild the tree after
-	loading the state.
-
-2002-05-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-table-adapter.c: Changed a lot of direct uses in this
-	file of node->is_expanded to call the function
-	e_tree_table_adapter_node_is_expanded instead.
-	(e_tree_table_adapter_node_is_expanded): Improved this function to
-	know if the root node is visible and always return it as being
-	expanded if it's not.  It also doesn't bother creating nodes if
-	they don't exist yet, and instead figures out whether they would
-	be expanded if they were to be created and returns that value
-	instead.
-
-2002-05-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-search.c: Include string.h here.
-
-2002-05-09  Dan Winship  <danw@ximian.com>
-
-	* e-tree-table-adapter.c
-	(e_tree_table_adapter_save_expanded_state): Bump file version to 2.
-	(This will make older versions of gal ignore the file, fixing the
-	problem where going from evo HEAD to evo 1.0.x makes the folder
-	tree disappear.) Store the default expanded state in the file now
-	to prevent this from happening again in the future.
-	(e_tree_table_adapter_load_expanded_state): Deal with version 2.
-	If the model's default expansion state doesn't match the saved
-	state, ignore the save file.
-
-2002-05-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c, e-table-item.h: Switched from
-	gnome_canvas_item_grab to e_canvas_item_grab.
-
-2002-05-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c
-	(etsm_selected_count_recurse): Moved the check for
-	any_children_selected_down so that a selected node with no
-	selected children will still get counted.
-	(etsm_select_all): When setting all_children_selected and
-	any_children_selected to TRUE, don't bother creating arrays for
-	them since that's unnecessary.
-
-2002-05-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-click-to-add.c (finish_editing): Add horizontal dividers
-	here too.
-
-	* e-table-config.c (create_global_store): Translate column headers
-	here.
-
-	* e-table-header-item.c (ethi_header_context_menu): Use
-	e_popup_menu_create_with_domain here.
-
-	* e-table-header-utils.c (e_table_header_draw_button): Translate
-	from utf8 here before drawing.
-
-	* e-table-memory-store.c, e-table-memory-store.h
-	(e_table_memory_store_insert_adopt_array): Changed the name of
-	this function from e_table_memory_store_insert_adopt.
-	(e_table_memory_store_insert_adopt): Added this function which
-	takes a ... list.
-
-	* e-table-utils.c (et_col_spec_to_col): Translate column titles to
-	utf8 here.
-
-2002-05-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-click-to-add.c: Added horizontal dividers to this item
-	when in table mode.
-
-	* e-table.c, e-tree.c: Made the background be an
-	e-canvas-background instead of a 
-
-	* e-tree.c, e-tree.h: Added a white_space_event for feature parity
-	with ETable.
-
-2002-05-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-config.c, e-table-config.h, e-table-specification.c,
-	e-table-specification.h, e-table-utils.c, e-table-utils.h,
-	e-table.c, e-table.h: Made these pay attention to the
-	gettext-domain in the etspec.
-
-	* e-table-config.c: Set the gettext-domain in the etspec here.
-
-2002-04-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_cursor_change): Redraw a row that is no
-	longer the cursor even if this item isn't getting the new cursor.
-
-2002-04-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c, e-tree.h (e_tree_path_foreach): Added this function
-	which recurses over all nodes, regardless of selection.
-
-2002-04-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-field-chooser-item.c (etfci_maybe_start_drag): Take an
-	int instead of a double.  From a patch by jody@ximian.com.
-
-2002-04-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-state.c (etst_destroy): Only unref etst->sort_info once.
-
-2002-04-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-model.c (e_table_model_value_at), e-tree-model.c
-	(e_tree_model_value_at): Documented the life cycle requirements of
-	the return value of these functions.
-
-2002-04-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-memory-store.c (e_table_memory_store_adopt_value_at,
-	etms_set_value_at): Added calls to e_table_model_pre_change here
-	so that the ETableItem doesn't unfreeze more times than it
-	freezes.
-
-2002-04-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c (etsm_selected_count_recurse,
-	etsm_foreach_recurse): Made these handle the case where
-	all_children_selected_array has a bit set, but the children of
-	that node aren't filled in.
-
-2002-04-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-checkbox.c, e-cell-combo.c, e-cell-date.c,
-	e-cell-float.c, e-cell-number.c, e-cell-pixbuf.c, e-cell-popup.c,
-	e-cell-size.c, e-cell-spin-button.c, e-cell-text.c,
-	e-cell-toggle.c, e-cell-tree.c, e-cell.c, e-cell.h,
-	e-table-click-to-add.c, e-table-col.c,
-	e-table-column-specification.c, e-table-config-field.c,
-	e-table-config.c, e-table-extras.c,
-	e-table-field-chooser-dialog.c, e-table-field-chooser-item.c,
-	e-table-field-chooser.c, e-table-group-container.c,
-	e-table-group-leaf.c, e-table-group.c, e-table-header-item.c,
-	e-table-header.c, e-table-item.c, e-table-memory-callbacks.c,
-	e-table-model.c, e-table-scrolled.c, e-table-selection-model.c,
-	e-table-sort-info.c, e-table-sorted-variable.c, e-table-sorted.c,
-	e-table-sorter.c, e-table-specification.c, e-table-state.c,
-	e-table-subset-variable.c, e-table-subset.c, e-table-without.c,
-	e-table.c, e-table.h, e-tree-scrolled.c, e-tree-selection-model.c,
-	e-tree-sorted-variable.c, e-tree-sorted.c, e-tree-table-adapter.c,
-	e-tree.c: Ansification patch from danw.
-
-2002-04-24  JP Rosevear  <jpr@ximian.com>
-
-	* e-cell-pixbuf.c (pixbuf_print): implement printing
-	(pixbuf_print_height): implement print height
-	(e_cell_pixbuf_class_init): set printing virtual methods
-
-	* e-cell-toggle.c (etog_print): remove clipping, default clipping
-	is done by the table, scale based on toggle height
-
-	* e-table-item.c (e_table_item_calculate_print_widths): make the
-	scale 1:1
-
-2002-04-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-config.c (create_global_store): Changed this to match
-	the new e_table_memory_store_insert function prototype.
-
-2002-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-memory-store.c, e-table-memory-store.h: Renamed the
-	insert functions in this class to make a bit more sense.
-
-2002-04-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-table-state.c (etst_destroy): Unref the sort_info.
-
-	* e-cell-toggle.c (etog_kill_view): After unreffing all the
-	pixmaps, free the toggle_view->pixmap_cache.
-
-	* e-table-search.c (e_table_search_destroy): Free the
-	priv->search_string and priv itself. More memory leak fixage.
-
-	* e-tree.c (e_tree_drag_source_unset): Unref site->taget_list so
-	we don't leak memory.
-
-2002-04-19  JP Rosevear  <jpr@ximian.com>
-
-	* e-cell-toggle.c (etog_print): print the cell in the allotted
-	area
-	(etog_print_height): return the print height
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header-item.c: Updated this to match the new EPopupMenu.
-
-2002-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header-item.c (ethi_header_context_menu): Fixed a memory
-	leak here by using the "selection-done" signal.
-
-	* e-table.c, e-table.h (white_item_event): Added the
-	"white_space_event" signal.
-
-2002-03-26  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am: remove comment about adding .lo's to the parent
-	directory's Makefile.am.
-
-2002-03-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-memory-store.c (e_table_memory_store_insert,
-	e_table_memory_store_insert_adopt, e_table_memory_store_remove):
-	Call the parent function after doing all the internal work so that
-	when the changed signal goes out, our work is already done.
-
-2002-03-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header-item.c: Adjust this to handle the new EPopupMenu
-	API.
-
-2002-03-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-toggle.c: Clear the pixmap cache in e_cell_style_set.
-
-	* e-cell.c, e-cell.h (e_cell_style_set): Added this virtual
-	method.
-
-	* e-table-item.c, e-table-item.h: Call e_cell_style_set in out
-	style_set signal.
-
-2002-03-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-toggle.c: Add a GdkPixmap * cache of rendered toggle
-	images.  This should considerably speed up over the wire
-	performance of ECellToggle.
-
-2002-03-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header.c, e-table-header.h (e_table_header_min_width):
-	New function that returns the total minimum width of all the
-	columns.
-
-	* e-table.c, e-table.h (set_header_width): Call
-	e_table_header_min_width here instead of total_width.
-	(et_size_request): Override the size_request method instead of
-	doing set_usize.
-
-2002-03-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-tree.c (item_key_press): Don't search if any modifier but
-	SHIFT or LOCK is pressed.
-
-	* e-table.c (group_key_press): Don't search if any modifier but
-	SHIFT or LOCK is pressed.
-
-2002-03-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c: Implemented capitalization keybindings.
-
-	* e-tree.c (item_key_press): Added parentheses to the default case
-	here.
-
-2002-03-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-search.c, e-table-search.h (e_table_search_backspace):
-	Made this return a boolean that returns whether the ETableSearch
-	used the backspace at all.
-
-	* e-table.c (group_key_press), e-tree.c (item_key_press): Used the
-	new return value from e_table_search_backspace.
-
-2002-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-pixbuf.c, e-cell-pixbuf.h (pixbuf_draw): Added
-	selected_column, focused_column, and unselected_column.
-
-2002-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-search.c, e-table-search.h (e_table_search_backspace):
-	Added this function.
-
-	* e-table.c, e-tree.c: Call the new function on backspace.
-
-2002-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-extras.c (e_string_search): Check for a NULL haystack
-	here.
-
-	* e-table-search.c, e-table-search.h: Added a parameter to the
-	search signal here to pass in flags.  Specifically, added the
-	E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST flag.  Improved the search
-	behavior here.
-
-	* e-table.c, e-tree.c: Handle the new signature for the search
-	signal here.
-
-2002-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c: Added ETableSearch support.
-
-2002-03-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-memory-store.c, e-table-memory-store.h: Added support
-	for E_TABLE_MEMORY_STORE_OBJECT which represents a column storing
-	a GtkObject.
-
-2002-03-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-vbox.c (ecv_draw): Give the correct height to the
-	subcells instead of overlapping them.
-
-	* e-table-header.c, e-table-header.h (e_table_header_move,
-	eth_calc_widths): Emit the dimension_changed signal with the width
-	of the header.
-
-	* e-table-memory-store.c (duplicate_value, etms_free_value):
-	Handle NULL pixbufs here.
-
-	* e-table.c, e-table.h: Connect to the dimension_changed signal
-	and call set_header_width.  Did a bit of refactoring here.
-
-2002-03-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (libetable_la_SOURCES): Added e-table-search.c.
-	(libetableinclude_HEADERS): Added e-table-search.h.
-
-	* e-cell.h: Added ETableSearchFun here.
-
-	* e-table-column-specification.c, e-table-column-specification.h:
-	Added search here.
-
-	* e-table-col.h: Added search here.
-
-	* e-table-extras.c, e-table-extras.h (e_table_extras_add_search):
-	Added ETableSearchFuncs here.
-
-	* e-table-memory-store.c (e_table_memory_store_insert,
-	e_table_memory_store_insert_adopt): Handle row == -1 here.
-
-	* e-table-search.c, e-table-search.h: New class to reusably handle
-	the semantics of searching for a string.
-
-	* e-table-simple.c, e-table-simple.h: Added a bunch of simple
-	functions here for if your table is all strings.  Should be
-	reusable.
-
-	* e-table-utils.c (et_col_spec_to_col): Added support for searches
-	here.
-
-	* e-table.c, e-table.h: Added an ETableSearch here.
-
-2002-03-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (ets_proxy_node_request_collapse): Proxy
-	request_collapse signals.
-
-2002-03-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (libetable_la_SOURCES): Added e-cell-vbox.c.
-	(libetableinclude_HEADERS): Added e-cell-vbox.h.
-
-	* e-cell-vbox.c, e-cell-vbox.h: New ECell to take multiple other
-	ECells and use them all in a vertical series.
-
-2002-03-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-memory-store.c (e_table_memory_store_insert_list): Added
-	this function to take a ... list of column data.  The expected
-	number of parameters in the ... is the number of columns in the
-	table.
-
-2002-03-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-memory-store.c, e-table-memory-store.h
-	(E_TABLE_MEMORY_STORE_PIXBUF): Added a pixbuf column type.
-
-	* e-table-specification.c, e-table-specification.h: Added
-	horizontal-resize attribute.
-
-	* e-table.c, e-table.h: Handle horizontal_resize.
-
-2002-03-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-memory.c (etmm_node_request_collapse): Handle a collapse
-	request by marking all descendents of that node as needing their
-	children recomputed.
-
-	* e-tree-model.c, e-tree-model.h
-	(e_tree_model_node_request_collapse): Added this signal to request
-	that the view of your tree collapse this node.
-
-	* e-tree-selection-model.c (etsm_selected_count): Pass the root of
-	the sorted model here instead of the root of the base model.
-
-	* e-tree-table-adapter.c (etta_proxy_node_request_collapse):
-	Handle a collapse request by collapsing the node in the tree.
-
-2002-03-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-memory.c, e-tree-memory.h (check_children): Added a
-	fill_in_children signal.
-
-2002-03-05  Dan Winship  <danw@ximian.com>
-
-	* e-table-item.c: Re-disable tooltips since they're (still)
-	fantastically obnoxious with focus-follows-mouse. (OKed by Ettore).
-
-2002-03-04  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell.c (e_cell_print): only call the cell's print method if it has
-	one. Avoids crashing for unimplemented print methods.
-
-2002-02-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (libetable_la_SOURCES): Added
-	e-table-memory-store.c.
-	(libetableinclude_HEADERS): Added e-table-memory-store.h.
-
-	* e-table-config-no-group.glade, e-table-config.glade: Updated
-	these.
-
-	* e-table-config.c, e-table-config.h: Updated this to have a
-	working field list editor.
-
-	* e-table-memory-store.c, e-table-memory-store.h: New ETableModel
-	that is a complete store of all the data in your table.  No
-	callbacks at all.
-
-	* e-table-subset-variable.c, e-table-subset-variable.h
-	(e_table_subset_variable_clear): Added this simple function
-
-	* e-table-subset.c (etss_get_save_id): Made this return the row
-	number g_strdup_printfed if the source model doesn't support save
-	ids.
-
-2002-02-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-sorter.c, e-table-sorter.h: Connect to the
-	model_rows_inserted, model_rows_deleted, and group_info_changed
-	here.
-
-2002-02-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c (e_tree_selection_model_init):
-	Initialize frozen_count to 0.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_event): Make the defalut for tooltips be on.
-
-2002-02-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_unrealize): Cancel tooltip timeouts here.
-
-2002-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (et_unrealize), e-tree.c (et_unrealize): Call
-	scroll_off and in e-tree.c hover_off.
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c: Added empty case for E_TEP_CAPS.  Needs to be
-	filled in for M-l, M-c, and M-u to work in ETable.
-
-	* e-table-header.c, e-table-header.h (expansion_change): New
-	signal that gets emitted whenever the expansions change.  Used in
-	state_changed for ETable and ETree.
-
-	* e-table.c, e-table.h, e-tree.c, e-tree.h (state_change): New
-	signal that gets emitted whenever the ETableState that would be
-	generated here changes.
-
-2002-01-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-model.c (e_tree_model_node_find): Made this function much
-	more readable.  Got rid of all the gotos.  Fixed a case where
-	going backwards during a root search checked the root node first.
-	(e_tree_model_node_real_traverse): Made backwards traversals be
-	postorder, as they should be, instead of preorder.
-
-	* e-tree.c (find_next_callback): Use an extra callback function
-	here to go from sorted path to model path.
-
-2002-01-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c, e-tree.h (e_tree_find_next): Make this function take a
-	bitfield of parameters instead of two bools.
-
-2002-01-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c, e-tree-selection-model.h
-	(e_tree_selection_model_get_cursor): Added this simple accessor
-	function.
-
-	* e-tree.c, e-tree.h (e_tree_find_next): Searches from the cursor
-	given the search parameters and moves the cursor if it ever
-	matches.
-
-2002-01-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-model.c, e-tree-model.h (e_tree_model_node_find): New
-	function to do a search through a tree in one direction or the
-	other.
-
-2002-01-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c: Implement max_width_by_row.
-
-	* e-cell-tree.c: Use max_width_by_row in max_width function.
-
-	* e-cell.c, e-cell.h (e_cell_max_width_by_row): Added this new
-	method to ECell.
-
-2002-01-16  Krisztian Pifko  <monsta@users.sourceforge.net>
-
-	* e-cell-progress.c, e-cell-progress.h: new file, implements the
-	ECellProgress object.
-
-	* Makefile.am (libetable_la_SOURCES, libetableinclude_HEADERS):
-	added e-cell-progress.c and e-cell-progress.h.
-
-2002-01-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-checkbox.h, e-cell-date.h, e-cell-float.h,
-	e-cell-number.h, e-cell-size.h, e-cell-text.h, e-cell-toggle.h,
-	e-cell-tree.h, e-cell.h, e-table-click-to-add.h,
-	e-table-col-dnd.h, e-table-config-field.h, e-table-extras.h,
-	e-table-field-chooser-item.h, e-table-group-container.h,
-	e-table-group-leaf.h, e-table-group.h, e-table-header-item.h,
-	e-table-item.h, e-table-scrolled.h, e-table-sorter.h,
-	e-table-tooltip.h, e-table-tree.h, e-table-utils.h, e-table.h,
-	e-tree-scrolled.h, e-tree-sorted-variable.h, e-tree.h: Added
-	#include <libgnome/gnome-defs.h>.
-
-2002-01-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell.c, e-cell.h (e_cell_save_state, e_cell_load_state,
-	e_cell_free_state): New functions for saving selection state and
-	such.
-
-	* e-cell-text.c (ect_save_state): Implemented the new state
-	functions.
-
-	* e-table-item.c, e-table-item.h: Use the new cell state functions
-	when focusing in or out.  Fixes Ximian bug #14968.
-
-2002-01-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header-item.c, e-table-header-item.h (scroll_timeout):
-	Made the header item here handle horizontal scrolling when adding
-	a column.  Fixes Ximian bug #7078.
-
-2002-01-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c, e-table.h (scroll_timeout), e-tree.c
-	(scroll_timeout): Made these handle horizontal scrolling during
-	drags.
-
-2002-01-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (collapse_drag): Collapse nodes that were opened during
-	a drag, unless the drop site is a child node.  Fixes Ximian bug
-	#4965.
-
-2001-12-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-toggle.c (etog_set_value): Don't queue a redraw here.
-	the value changed signal will do that automatically.
-
-2001-12-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c (ect_stop_editing): Change to not editing before
-	committing values.  Then commit the values.
-
-2001-12-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c: Turn off idle handling in the unrealize function
-	instead of the destroy function.
-
-2001-12-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-config.c, e-table-config.h (setup_gui): Set the title of
-	the window here.
-
-	* e-table-header-item.c (ethi_popup_customize_view): Use a useful
-	string for the header here.
-
-2001-12-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-subset.c (etss_get_view_row): Removed incorrect calls to
-	e_table_model_row_changed here.
-
-2001-12-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header-item.c (ethi_find_col_by_x,
-	ethi_find_col_by_x_nearest): Made these return 0 to the left of
-	all columns and ethi_find_col_by_x return cols - 1 if to the right
-	of all columns.  Fixes Ximian bug #14414.
-
-2001-12-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c (e_tree_selection_model_change_cursor):
-	Unset selection->old_selection here.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (context_destroyed), e-tree.c (context_destroyed):
-	Check for et being destroyed here before doing anything.  Fixes
-	Ximian bug #15728.
-
-2001-11-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c, e-table-item.h: Handle selection_row_changed
-	signal.  Keep track of the old cursor row so that we only redraw
-	two rows when the cursor changes.
-
-	* e-table.c, e-tree.c: Handle selection_row_changed signal.
-
-	* e-tree-selection-model.c: Properly send selection_row_changed
-	signals if changing from a single row selected to a single other
-	row selected or if moving the selection_end by a single row.
-
-2001-12-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-group.c, e-table.c, e-tree.c: Changed some comments.
-	Added a bunch of documentation here.
-
-2001-11-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_event): Ungrab and set maybe_in_grab to
-	FALSE before sending the double click signal.
-
-2001-11-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (group_key_press), e-tree.c (item_key_press): Handle
-	the case where page up or page down goes off the end of the table
-	or tree.
-
-2001-11-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-sorter.c (ets_sort_info_changed): Make a printout here
-	be conditionally compiled (and compiled out by default.)
-
-
-2001-11-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c (etsm_select_all): Don't select all if
-	the source model doesn't have a root node (it used to crash.)
-	Fixes Ximian bug #14542.
-
-2001-11-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-popup.c, e-cell-popup.h (e_cell_popup_set_shown,
-	e_cell_popup_queue_cell_redraw): New functions here.
-
-	* e-cell-combo.c: Use e_cell_popup_set_shown to set the
-	popup_shown variable so that ECellPopup can properly request a
-	redraw.
-
-2001-11-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-memory.c (e_tree_memory_freeze): We should only
-	pre_change here if frozen = 0, otherwise we'll leak pre_changes.
-	Helps fix Ximian bug #14422.
-
-	* e-tree-sorted.c (ets_proxy_node_data_changed,
-	ets_proxy_node_col_changed): Send a no_change signal here if given
-	a NULL path.  Helps fix Ximian bug #14422.
-
-2001-11-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-popup.c, e-cell-popup.h (e_cell_popup_do_popup): Make
-	ECellPopup not display multiple arrows while the popup is up and
-	the table is in grouped mode.  Fixes Ximian bug #14207.
-
-2001-10-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c (etsm_node_deleted): Fixed the
-	signature of this function.
-
-2001-10-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_unfreeze): Check for unfreezing past 0 here
-	and give a warning.
-	(eti_add_table_model): Call eti_freeze here since
-	eti_table_model_changed will call unfreeze.
-
-	* e-tree-memory.c (e_tree_memory_node_remove): Send deleted signal
-	after freeing the child.
-
-	* e-tree-model.c, e-tree-model.h: Added node_deleted signal.
-	removed/deleted signals will always come in pairs in that order
-	with a single pre_change for both of them.
-
-	* e-tree-selection-model.c (etsm_node_deleted): Clear the tree on
-	deleted here instead of on removed.
-
-	* e-tree-sorted.c (ets_proxy_node_deleted): Chain deleted here.
-	Chains to NULL node which is fine for now.
-
-2001-10-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c, e-table-item.h: Added frozen_count variable to
-	know not to show the cursor while a change is going on.
-
-	* e-table-model.c, e-table-model.h, e-tree-model.c,
-	e-tree-model.h: Added a model_no_change signal to pair with a
-	pre_change if there's no change.
-
-	* e-table-selection-model.h: Removed an unused frozen field here.
-
-	* e-table-sorted.c, e-table-subset.c, e-table-subset.h,
-	e-table-without.c, e-tree-memory.c, e-tree-sorted.c,
-	e-tree-table-adapter.c: Made sure pre_changes were all matched by
-	some change.  Proxy no_change signal where appropriate.
-
-	* e-tree-selection-model.c: Keep track of the frozen_count
-	variable to know whether a change is going on.
-
-2001-10-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (e_table_commit_click_to_add): Leave edit if commit is
-	called.
-
-2001-10-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_show_cursor, eti_check_cursor_bounds):
-	Request the right regions here.  The range given is inclusive, not
-	inclusive/exclusive.
-
-2001-10-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-click-to-add.c (etcta_class_init): Remove point handler
-	and just let GnomeCanvasGroup handle it.
-
-	* e-table.c (e_table_commit_click_to_add): Don't commit the
-	click_to_add if there's no click_to_add to commit.
-
-2001-10-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (e_table_commit_click_to_add): Added this new function
-	to allow the user to specify a commit.
-
-2001-10-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (check_last_access): Fix this to check from
-	initial instead of initial + 1.
-
-2001-10-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-combo.c: Adapt to the changed popup signature.
-
-	* e-cell-popup.c, e-cell-popup.h: Changed the behavior here to
-	draw the button whenever we have the cursor.  Changed the popup
-	virtual method to pass in the row and column popping up.
-
-	* e-cell.h: Added an E_CELL_CURSOR flag.
-
-	* e-table-item.c: Pass in the E_CELL_CURSOR flag to event and draw
-	calls as appropriate.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (et_canvas_root_event), e-tree.c
-	(et_canvas_root_event): Ignore buttons 4 and 5 here.  Fixes Ximian
-	bug #13853.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-config.c (setup_gui): Hide the Help button here since
-	there's nothing connected to it.
-
-	* e-tree-sorted.c (ets_sort_idle): Don't nest ets_sort_idle calls.
-	Fixes Ximian bug #13929.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-subset.c (etss_get_view_row), e-tree-sorted.c
-	(check_last_access), e-tree-table-adapter.c (find_row_num): Don't
-	go outside the table looking for matches when doing the
-	last_access search.
-
-2001-10-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (table_canvas_focus_event_cb): Fix crash here.
-
-2001-10-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c: Removed erroneous comment about needing to handle
-	selection better.
-
-2001-10-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_cursor_activated): Chain the
-	cursor_activated signal even if the row is -1.
-
-	* e-tree.c (item_cursor_activated): Don't error out here if path
-	is NULL.
-
-2001-10-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-float.c, e-cell-float.h: Changed the license announcement
-	at the top of these files.
-
-2001-10-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-checkbox.c, e-cell-checkbox.h, e-cell-combo.c,
-	e-cell-combo.h, e-cell-date.c, e-cell-date.h, e-cell-number.c,
-	e-cell-number.h, e-cell-pixbuf.c, e-cell-pixbuf.h, e-cell-popup.c,
-	e-cell-popup.h, e-cell-size.c, e-cell-size.h,
-	e-cell-spin-button.c, e-cell-spin-button.h, e-cell-string.c,
-	e-cell-text.c, e-cell-text.h, e-cell-toggle.c, e-cell-toggle.h,
-	e-cell-tree.c, e-cell-tree.h, e-cell.c, e-cell.h,
-	e-table-click-to-add.c, e-table-click-to-add.h, e-table-col-dnd.h,
-	e-table-col.c, e-table-col.h, e-table-column-specification.c,
-	e-table-column-specification.h, e-table-column.c,
-	e-table-config-field.c, e-table-config-field.h, e-table-config.c,
-	e-table-config.h, e-table-defines.h, e-table-example-1.c,
-	e-table-example-2.c, e-table-extras.c, e-table-extras.h,
-	e-table-field-chooser-dialog.c, e-table-field-chooser-dialog.h,
-	e-table-field-chooser-item.c, e-table-field-chooser-item.h,
-	e-table-field-chooser.c, e-table-field-chooser.h,
-	e-table-group-container.c, e-table-group-container.h,
-	e-table-group-leaf.c, e-table-group-leaf.h, e-table-group.c,
-	e-table-group.h, e-table-header-item.c, e-table-header-item.h,
-	e-table-header-utils.c, e-table-header-utils.h, e-table-header.c,
-	e-table-header.h, e-table-item.c, e-table-item.h,
-	e-table-memory-callbacks.c, e-table-memory-callbacks.h,
-	e-table-memory.c, e-table-memory.h, e-table-model.c,
-	e-table-model.h, e-table-one.c, e-table-one.h, e-table-scrolled.c,
-	e-table-scrolled.h, e-table-selection-model.c,
-	e-table-selection-model.h, e-table-simple.c, e-table-simple.h,
-	e-table-size-test.c, e-table-sort-info.c, e-table-sort-info.h,
-	e-table-sorted-variable.c, e-table-sorted-variable.h,
-	e-table-sorted.c, e-table-sorted.h, e-table-sorter.c,
-	e-table-sorter.h, e-table-sorting-utils.c,
-	e-table-sorting-utils.h, e-table-specification.c,
-	e-table-specification.h, e-table-state.c, e-table-state.h,
-	e-table-subset-variable.c, e-table-subset-variable.h,
-	e-table-subset.c, e-table-subset.h, e-table-tooltip.h,
-	e-table-tree.h, e-table-utils.c, e-table-utils.h,
-	e-table-without.c, e-table-without.h, e-table.c, e-table.h,
-	e-tree-memory-callbacks.c, e-tree-memory-callbacks.h,
-	e-tree-memory.c, e-tree-memory.h, e-tree-model.c, e-tree-model.h,
-	e-tree-scrolled.c, e-tree-scrolled.h, e-tree-selection-model.c,
-	e-tree-selection-model.h, e-tree-simple.c, e-tree-simple.h,
-	e-tree-sorted-variable.c, e-tree-sorted-variable.h,
-	e-tree-sorted.c, e-tree-sorted.h, e-tree-table-adapter.c,
-	e-tree-table-adapter.h, e-tree.c, e-tree.h, table-test.c,
-	table-test.h, test-check.c, test-cols.c, test-table.c: Changed the
-	license announcement at the top of these files.
-
-	* e-cell-string.c: Removed unused file.
-
-2001-10-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-config.c (config_group_info_update,
-	config_fields_info_update): Added some checks for NULL labels
-	here.
-
-	* e-table-specification.c, e-table-specification.h: Added
-	allow_grouping field.  Fixes Ximian bug #13412.
-
-	* e-table.c, e-table.h: Added allow_grouping field.  Set this
-	field for the sort infos from state objects.
-
-2001-10-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c (etsm_selected_count): If the root node
-	is hidden and selected, don't count it in the selected path count.
-	Fixes Ximian bug #13419.
-
-	* e-tree.c (et_canvas_root_event): Attach to the event handler on
-	the root canvas item instead of the canvas itself when making the
-	ETree leave editing state.
-
-2001-10-25  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes Ximian bug #6832.
-
-	* e-table.c (e_table_setup_table): Use a callback instead of
-	gtk_widget_queue_draw() for focus events, as the latter does not
-	have the correct prototype for an event handler.
-	(group_start_drag): Emit START_DRAG, not KEY_PRESS!
-	(focus_first_etable_item): Focus the first row in the first
-	ETableItem if there is no focused item.
-
-	* e-tree.c (e_tree_setup_table): Same change as in
-	e_table_setup_table().
-	(table_canvas_focus_event_cb): Focus the first row in the tree
-	item if there is no focused item.
-
-2001-10-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-combo.c: Added #include "gal/widgets/e-unicode.h".
-
-	* e-cell-text.c: Added lots of deactivated debugging printfs here.
-	(ect_event): Fixed the flags check here.  Set edit->actions to 0
-	before calling e_text_event_processor_handle_event.
-
-	* e-table-item.c, e-table-item.h: Use eti_grab and eti_ungrab all
-	over the place.  Added lots and lots of deactivated debugging
-	printfs here.
-	(eti_grab, eti_ungrab): New functions to encapsulate grabbing and
-	ungrabbing the cursor and to allow for recursive grabs
-	(refcounting style.)
-
-	* e-table.c: Added deactivated debugging printfs here.
-	(et_canvas_root_event): Attach to the event handler on the root
-	canvas item instead of the canvas itself when making the ETable
-	leave editing state.  Fixes Ximian bug #9737.
- 
-2001-10-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (INCLUDES): Added $(ICONV_CFLAGS).
-
-2001-10-23  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell-combo.c (e_cell_combo_set_popdown_strings): save the UTF-8
-	strings inside the listitem widgets, but convert to the locale to use
-	in the label.
-	(e_cell_combo_select_matching_item): 
-	(e_cell_combo_update_cell): use the UTF-8 strings instead of the
-	listitem labels. Hopefully fixes bug #7037.
-
-2001-10-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-field-chooser-item.c: Got rid of the gc argument to
-	e_table_header_draw_button.
-	(etfci_font_load): Just use the style font here.
-
-	* e-table-group-container.c (e_table_group_container_construct):
-	Changed this to just use the font from the style.  Fixes Ximian
-	bug #11882.
-
-	* e-table-header-item.c: Got rid of the gc argument to
-	e_table_header_draw_button.
-	(ethi_font_load): Changed this to just fallback on the font from
-	the style if the fontname is NULL or doesn't load to a font.
-	Fixes Ximian bug #11882.
-
-	* e-table-header-utils.c, e-table-header-utils.h
-	(e_table_header_draw_button): Got rid of the gc parameter here and
-	changed to use the gc from the style of a button created for this
-	purpose, but not shown.  Fixes Ximian bug #13251.
-
-2001-10-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header-item.c, e-table-header-item.h: Got rid of the gc
-	field here and just use the fg_gc from the style for drawing the
-	buttons.
-
-2001-10-22  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell-text.[hc]: added set_value() class method, which sets the
-	model value based on the text. In ECellText itself it assumes the model
-	value is a char* and passes the text directly. Subclasses may parse
-	the text into some other datatype.
-	Also made the calls the e_cell_text_get_text(), e_cell_text_free_text()
-	and e_cell_text_set_value() public, since we need them in ECellCombo.
-
-	* e-cell-combo.c (e_cell_combo_select_matching_item): 
-	(e_cell_combo_update_cell): use e_cell_text_get_text()/free_text()/
-	set_value() so it can handle subclasses of ECellText as the child.
-
-2001-10-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-col.c, e-table-col.h, e-table-column-specification.c,
-	e-table-column-specification.h: Added a disabled field here.
-
-	* e-table-config.c, e-table-field-chooser-item.c: Pay attention to
-	the disabled field here.  Fixes Ximian bug #12416.
-
-	* e-table-utils.c: Copy the disabled field from the column
-	specification to the col.
-
-2001-10-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_idle_maybe_show_cursor): Make this check
-	immediately for whether to show the cursor, instead of in the idle
-	handler.  Fixes Ximian bug #11807.
-
-	* e-tree-table-adapter.c (e_tree_table_adapter_node_set_expanded):
-	Added a pre_change here since we send two changes.
-
-2001-10-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-memory.c (e_tree_memory_sort_node): Call
-	e_tree_model_pre_change here where appropriate.
-
-2001-10-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_cancel_drag_due_to_model_change): Cancel the
-	drag or maybe drag if you have the mouse button down when the
-	pre_change signal comes in.  Fixes Ximian bug #11309.
-
-	* e-table-without.c (add_row, remove_row,
-	e_table_without_show_all): Call e_table_model_pre_change where
-	appropriate here.
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-group-container.c (compute_text): Don't convert to
-	locale here since EText takes UTF8 strings.  Fixes Ximian bug
-	#8906.
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (e_tree_sorted_node_num_children): Check for
-	num_children == -1 here and generate the children if they haven't
-	been.  Fixes Ximian bug #12464.
-
-2001-10-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-table-adapter.c (find_next_node_maybe_deleted,
-	find_first_child_node_maybe_deleted, find_next_node,
-	find_first_child_node, find_row_num): Added bounds checking in a
-	number of places.  Fixes Ximian bug #7245.
-	(etta_init): Initialize all the fields here.
-
-2001-10-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-click-to-add.c (set_initial_selection): Use new
-	e_table_header_prioritized_column field.
-
-	* e-table-header.c, e-table-header.h
-	(e_table_header_prioritized_column): New function.  Refactors the
-	code from ETableClickToAdd to find the column with the highest
-	priority.
-
-	* e-table-selection-model.c, e-table-selection-model.h
-	(model_changed_idle): Changed this function to use the
-	e_table_header_prioritized_column function.  Added an argument to
-	set the "header" on this selection model.  Fixes Ximian bug #1301.
-
-	* e-table-utils.h: Indentation cleanup.
-
-	* e-table.c (et_real_construct): Set the "header" argument on the
-	selection model here.
-
-	* e-table.h: #include <gal/e-table/e-table-sorter.h>
-
-2001-10-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-state.c (e_table_state_duplicate): Copy the can group
-	state on the sort info here.  Fixes Ximian bug #8655.
-
-2001-10-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-popup.c (ecp_get_bg_color), e-cell-tree.c
-	(ect_get_bg_color): Implement these functions as pass through to
-	the child cell.
-
-	* e-cell-text.c, e-cell-text.h (ect_get_bg_color): Implemented
-	this using a bg_color_column which can be set through the argument
-	of the same string.
-
-	* e-cell.c, e-cell.h (e_cell_get_bg_color): Added this function to
-	allow background color to change by cell.
-
-	* e-table-item.c (eti_get_cell_background_color): Call
-	e_cell_get_bg_color to allow background color to change by cell.
-
-2001-10-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c, e-table.h (e_table_get_selection_model): Added this
-	function.
-
-2001-10-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_show_cursor, eti_check_cursor_bounds): Check
-	that cell views are realized before doing anything here.  Fixes
-	Ximian bug #11919.
-	(eti_check_cursor_on_screen): If the cursor values are all set to
-	-1, don't do anything.
-
-2001-10-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_table_model_row_changed,
-	eti_table_model_cell_changed): Handle row and cell changes
-	properly in the uniform_row_height case.  Fixes Ximian bug #11879.
-
-2001-10-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (context_destroyed), e-table.c (context_destroyed): Use
-	g_dataset_set_data_full to find out when the context is destroyed.
-	Fixes Ximian bug #8502 and Ximian bug #11691.
-
-2001-10-05  Jon Trowbridge  <trow@ximian.com>
-
-	* e-table-without.c (e_table_without_show_all): We need to take
-	the row count from the source model, not from the ETableWithout.
-	This typo is why contacts kept disappearing in the SelectNames
-	dialog. (Bugs 9326, 10916)
-
-2001-10-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_set_arg): Fixed the uniform_row_height +
-	confirm_row_hieght_cache crash.
-
-2001-10-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text, e-cell-pixbuf: Adapted height method to deal with a
-	row of -1.
-
-	* e-table-group-container.c, e-table-group-container.h,
-	e-table-group-leaf.c, e-table-group-leaf.h, e-table-item.c,
-	e-table-item.h, e-table.c, e-table.h, e-tree.c: Added
-	"uniform_row_height" argument.
-
-2001-10-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_event): Got rid of the misused button
-	variable here.
-
-2001-10-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_idle_maybe_show_cursor): Sometimes put off
-	maybe showing the cursor until an idle callback.
-
-	* e-tree-selection-model.c (add_model): Use connect_after to
-	connect to all the signals.  This means we can assume the sorted
-	tree and table adapters are both done.  This also means that those
-	objects cannot assume that the selection is already changed.
-	Fixes Ximian bug #10667.
-
-2001-10-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-selection-model.c (e_table_selection_model_init):
-	Initialize the hash field.
-	(model_changed_idle): Send cursor changed and selection changed signals.
-	(model_pre_change): If there's no cursor here, make sure to set
-	the cursor_id to NULL.
-
-2001-10-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-click-to-add.c (set_initial_selection): Pick which field
-	of the row to select based on priority.  Fixes Ximian bug #9345.
-
-	* e-table-col.c, e-table-col.h: Added the priority field to this
-	class.  Adapted the _new functions appropriately.
-
-	* e-table-column-specification.c, e-table-column-specification.h:
-	Added the priority field to this class.
-
-	* e-table-utils.c (et_col_spec_to_col): Handle the priority field here.
-
-2001-10-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c, e-table-item.h: Only show the cursor during
-	changes if it was already shown.  Fixes Ximian bug #9810 and
-	Ximian bug #4048.
-
-2001-09-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (ets_proxy_node_changed): Stop the sort idle if
-	the root node gets changed.
-
-2001-09-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c, e-tree.c: Set the step_increment on the horizontal
-	scrollbars here to 20.
-
-2001-09-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c (etsm_node_changed, etsm_destroy): Set
-	cursor_path = NULL here.
-
-2001-09-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-table-item.c (eti_unrealize): Remove the grab if ->grabbed.
-
-2001-09-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_event): Instead of
-	e_selection_model_maybe_do_something and
-	e_selection_model_do_something, call e_selection_right_click_down
-	and e_selection_right_click_up here for right clicks.
-
-	* e-table.c, e-table.h (e_table_right_click_up), e-tree.c,
-	e-tree.h (e_tree_right_click_up): Added these functions for
-	someone who handles the right click signal by popping up a menu
-	call right_click_up when they're down handling the menu.
-
-2001-09-24  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-table.c (et_canvas_button_press): Use the correct prototype
-	for the signal handler.
-
-	* e-tree.c (et_canvas_button_press): Likewise.
-
-2001-09-24  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-table-group.c (e_table_group_add): Assert that the virtual
-	method is implemented instead of being forgiving.
-	(e_table_group_add_array): Likewise.
-	(e_table_group_add_all): Likewise.
-	(e_table_group_remove): Likewise.
-	(e_table_group_increment): Likewise.
-	(e_table_group_decrement): Likewise.
-	(e_table_group_row_count): Likewise.
-	(e_table_group_set_focus): Likewise.
-	(e_table_group_get_focus): Likewise.
-	(e_table_group_get_focus_column): Likewise.
-	(e_table_group_get_printable): Likewise.
-	(e_table_group_compute_location): Likewise.
-	(e_table_group_get_cell_geometry): Likewise.
-	(etg_destroy): Clear the fields after we unref them.
-
-	* e-table-group-leaf.c (etgl_destroy): Clear the fields after we
-	unref them.
-	(e_table_group_leaf_construct): Subsets should not be sunk.  Do
-	not ref/sink the subset.
-
-	* e-table-header.c (e_table_header_add_column): Document the fact
-	that the header assumes ownership of the column.
-
-2001-09-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c (etsm_sorted_node_resorted): Attach to
-	the resorted signal instead of the changed signal on the sorted
-	model.  Fixes Ximian bug #6532.
-
-	* e-tree-sorted.c, e-tree-sorted.h (e_tree_sorted_node_resorted):
-	Added this signal.
-
-2001-09-22  Christopher James Lahey  <clahey@ximian.com>
-
-	From a patch by Damian Ivereigh <damian@cisco.com>:
-
-	* e-cell-date.c: Made this use e_strftime_fix_am_pm instead of
-	strftime.
-
-2001-09-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-selection-model.c (add_model): Confirm row count here.
-	(etsm_get_row_count): Make sure etsm->model isn't NULL here.
-	If it is, it's not an error.  Return 0 in this case.
-
-2001-09-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-model.c, e-table-model.h (e_table_model_class_init):
-	Rearranged order of has_save_id and get_save_id to be more
-	consistent with ETree.
-
-	* e-table-selection-model.c, e-table-selection-model.h: Turned on
-	the code to maintain selection and cursor across changes if the
-	model supports get_save_id.
-
-	* e-table-simple.c, e-table-simple.h: Changed this interface to
-	take all of the ETableModel functions in the _new function.
-
-	* e-table-subset.c (etss_has_save_id, etss_get_save_id): Added
-	these to properly proxy the save_id functionality.
-
-	* e-tree-memory-callbacks.c, e-tree-memory-callbacks.h,
-	e-tree-model.c, e-tree-model.h, e-tree-sorted.c: Made the save_id
-	parameter to get_node_by_id be const char * instead of char *.
-
-	* e-tree-table-adapter.c (etta_class_init): Rearranged some
-	assignments here to be more consistent.
-
-2001-09-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-toggle.c (etog_event): Changed this to change state on
-	button down, even if we aren't editing.
-
-2001-09-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (e_tree_setup_table): Changed which widget to connect
-	signals to to watch for drag & drop.  Fixes Ximian bugs #7450 &
-	#8732.
-
-2001-09-07  Jon Trowbridge  <trow@ximian.com>
-
-	* e-table-without.c (e_table_without_show_all): Fixed a silly
-	little obvious bug.
-
-2001-09-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_event): Added GDK_BUTTON_PRESS_MASK to our
-	button mask.  Fixes Ximian bug #8241.
-
-2001-09-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c, e-table-item.h (eti_event): Don't do_something
-	on button_release if we did something on button_press.  Fixes
-	Ximian bug #8260.
-
-2001-09-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am: Added e-table-config-no-group.glade.
-
-	* e-table-config-no-group.glade, e-table-config.c,
-	e-table-config.glade: Removed the fields bit of ETableConfig.
-
-2001-09-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-without.c, e-table-without.h (e_table_without_show_all):
-	Added this function.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-tree.c (e_tree_drag_unhighlight): Remove debugging message.
-
-2001-09-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-date.c (ecd_get_text): Strip spaces at the beginning or
-	end as well as changing "  " to " ".  Fixes Ximian bug #7683.
-
-2001-09-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-float.c (ecf_get_text, ecf_free_text): Rename these
-	functions from ecn_get_text and ecn_free_text.
-
-	* e-cell-tree.c (ect_height): Make sure the height is a multiple
-	of two here.
-
-	* e-table-header-item.c, e-table-header-item.h: Added a "tree"
-	argument so that the sorting can be set by right clicking on the
-	header item.
-
-	* e-table-item.c (eti_table_model_rows_deleted): Added some
-	assertions here.
-
-	* e-tree-selection-model.c (etsm_find_node_unless_equals): Fixed
-	indentation.
-
-	* e-tree-table-adapter.c (etta_proxy_node_changed): Rewrote this
-	to be more readable.
-	(e_tree_table_adapter_node_set_expanded): Added an assertion.
-
-	* e-tree.c, e-tree.h (e_tree_get_spec): Added this function.
-	(e_tree_setup_header): Set the tree argument on the
-	ETableHeaderItem here.
-
-2001-08-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_table_model_rows_deleted): Fix this memmove.
-	We've already subtracted the count from eti->rows.
-
-2001-08-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_table_model_rows_deleted): Fixed this
-	memmove to subtract the count as well as the row for the number of
-	rows to move.
-
-2001-08-25  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* e-table-group-container.c (compute_text):
-	Convert UTF-8 strings to locale's encoding before putting them in
-	canvas item.
-
-2001-08-25  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* e-table.c (e_table_init): Fixed typo.
-
-2001-08-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group-leaf.h, e-table-group.c, e-table-group.h: Added
-	start_drag signals.
-
-	* e-table-item.c, e-table-item.h (eti_event): Send the start_drag
-	signal.  Fixes Ximian bug #807.
-
-	* e-table.c, e-table.h, e-tree.c, e-tree.h: Added start_drag
-	signal.  Made default handler start drag & drop if we're set to
-	automatically handle dnd.  Ripped out the code to handle watching
-	events for dnd since start_drag does this now.
-
-2001-08-20  Jon Trowbridge  <trow@ximian.com>
-
-	* e-table-without.c (check_with_key): We need to
-	free_gotten_key_func key2, not key!
-	(e_table_without_show): Renamed, used to be
-	e_table_without_remove.  Double-negative function names
-	are confusing!
-	(e_table_without_hide_adopt): Renamed, used to be
-	e_table_without_add_adopt.
-	(e_table_without_hide): Renamed, used to be e_table_without_add.
-
-2001-08-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-subset.c, e-table-subset.h
-	(e_table_subset_model_to_view_row,
-	e_table_subset_view_to_model_row): Added these functions.
-
-2001-08-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-without.c: Made this object handle NULLs for all the
-	handler functions.
-
-2001-08-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-without.c (etw_proxy_model_rows_inserted,
-	etw_proxy_model_changed): Changed the used parity of the return
-	value of check here.
-
-2001-08-18  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-table-without.c (etw_destroy): Chain to the destroy handler in
-	the parent class.  Hey, I'm getting used to this :)
-
-2001-08-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-without.c (etw_destroy): Destroy the hash table and all
-	objects in it, as well as the priv structure.
-
-2001-08-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am: Added e-table-without.c and e-table-without.h.
-
-	* e-table-without.c, e-table-without.h: Got this to compile.
-	Finished the first version of it.
-
-2001-08-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-without.c, e-table-without.h: Adding the first versions
-	of these files.  Doesn't work yet.
-
-2001-08-14  Peter Williams  <peterw@ximian.com>
-
-	* e-tree-selection-model.c (etsm_selected_count_recurse): 
-	Workaround for Ximian bug #6795. Will prevent a crash and
-	doesn't seem to cause any problems, but the underlying problem
-	still exists.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-cell-combo.c (e_cell_combo_destroy): Destroy, do not unref,
-	the popup_window.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (group_key_press), e-tree.c (item_key_press): Handle
-	GDK_KP_Page_Up, GDK_KP_Page_Down, GDK_KP_Right, and GDK_KP_Left
-	here.  Fixes Ximian bug #4491.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-click-to-add.c (etcta_event): Got rid of event
-	forwarding for double clicks and releases and such and for single
-	clicks except when first creating the row object.  Fixes Ximian
-	bug #2661.
-
-2001-08-10  JP Rosevear  <jpr@ximian.com>
-
-	* e-table.c (et_build_groups): add the items to the start or end
-	based on where the click to add should be
-	(e_table_setup_table): ditto
-	(et_real_construct): read additional spec flag
-
-	* e-table.h: new flag
-
-	* e-table-specification.c (etsp_init): init new flag
-	(e_table_specification_load_from_node): set click to add end flag
-	(e_table_specification_save_to_node): write out flag
-
-	* e-table-specification.h: new flag
-
-2001-08-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-config.c (setup_gui): If the sort_info can't group, hide
-	the grouping button and label.
-
-	* e-table-header-item.c (ethi_header_context_menu): Removed the
-	Group By This Field menu item if the sort_info doesn't support
-	grouping.
-
-	* e-table-sort-info.c, e-table-sort-info.h
-	(e_table_sort_info_get_can_group,
-	e_table_sort_info_set_can_group): Added these functions.
-
-	* e-tree.c (e_tree_set_state_object, et_real_construct): Set
-	can_group to FALSE for all our sort infos.
-	(e_tree_get_state_object): Fixed a potential gtk_object_ref (NULL)
-	here.
-
-2001-08-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-tree.c (et_drag_drop): Initialize ret_val.
-	(do_drag_motion): Same.
-
-2001-08-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-field-chooser-dialog.c, e-table-field-chooser-dialog.h,
-	e-table-field-chooser.c, e-table-field-chooser.h: Added a "header"
-	argument to these structures which just gets passed downwards.
-
-	* e-table-field-chooser-item.c, e-table-field-chooser-item.h:
-	Added a "header" argument here.  Made it so that only rows that
-	aren't already in the header are shown.
-
-	* e-table-header-item.c: Set the "header" argument on our
-	e-table-field-chooser-dialog.  Fixes Ximian bug #2654.
-
-2001-08-08  Not Zed  <NotZed@Ximian.com>
-
-	* e-table-sort-info.c (etsi_destroy): Call the super-class destroy
-	function when done.
-
-2001-08-08  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-cell-pixbuf.c (pixbuf_destroy): Chain to the destroy handler
-	in the parent class!
-
-	* e-table-field-chooser.c (e_table_field_chooser_destroy):
-	Likewise.  Sigh.
-
-	* e-table-one.c (one_destroy): Likewise.  Double sigh.
-
-	* e-tree-selection-model.c (etsm_destroy): Likewise.  Triple sigh.
-
-2001-08-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-group-leaf.c, e-table-group-leaf.h (etgl_key_press):
-	Check for row >= 0 here.  Fixes Ximian bug #6376.
-	(etgl_destroy): Disconnect from all the signals we connect to on
-	our ETableItem here.
-
-2001-08-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c (etsm_selected_count): Implemented this
-	function.  Fixes Ximian bug #5353.
-
-2001-08-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c: Make tree nodes open if you hover over them while drag
-	& dropping.
-
-2001-08-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (scroll_timeout): Added scrolling to access nodes that
-	are scrolled off screen for drops.  Fixes Ximian bug #5645.
-
-	* e-table.c, e-table.h (scroll_timeout): Added scrolling to access
-	rows that are scrolled off screen for drops.  This doesn't work
-	for some reason, but I'm checking the code in.
-
-2001-08-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c, e-table.h (e_table_drag_highlight,
-	e_table_drag_unhighlight): Implemented these functions.
-
-	* e-tree.c (e_tree_drag_highlight, e_tree_drag_unhighlight):
-	Implemented these functions.
-
-2001-08-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-scrolled.c (e_tree_scrolled_new): Set the hadjustment and
-	vadjustment here.  From a patch by Kevin Vandersloot
-	<kfv101@psu.edu>.  Fixes Ximian bug #6400.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (et_drag_motion, et_drag_drop, et_drag_data_received):
-	Change these to actually subtract the allocation as they should.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-table-adapter.c (e_tree_table_adapter_node_at_row):
-	e_tree_table_adapter_node_at_row would have pulled data from one
-	past the end of its array if you asked it to and the root was
-	hidden.  Fixed it.  Fixes Ximian bug #4761.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (et_drag_motion, et_drag_drop, et_drag_data_received):
-	Subtracted 27.
-
-2001-08-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_event): Make the right and left key presses
-	be marked as handled here (i.e., return 1 always.)  Fixes Ximian
-	bug #2090.
-
-2001-08-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c: Changed all e_table_model_is_cell_editable calls
-	in this file to be on the model column instead of the view column.
-
-2001-08-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (et_destroy): Set et->priv to NULL here just to be
-	sure.
-
-2001-08-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header-item.c (ethi_drag_data_received): Don't do most
-	of the work in this function if data->data is NULL.  Fixes Ximian
-	bug #6041.
-
-2001-08-01  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-table.c (group_cursor_change): Set the et->cursor_loc *before*
-	committing the click-to-add to avoid reentrancy issues if the
-	table model changes while the click-to-add is being committed.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header-item.c (ethi_change_sort_state): Make this
-	function not crash if x somehow doesn't land on some column.
-	Fixes Ximian bug #5957.
-
-	* e-table-header-item.c: Removed a bunch of menu items whose
-	functionality won't be ready for 1.0.  Fixes Ximian bug #154.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-toggle.c (etog_max_width): Made this not query the 0th
-	row if there are 0 rows in the table.  Fixes Ximian bug #5640.
-
-2001-07-25  Jon Trowbridge  <trow@ximian.com>
-
-	* e-cell-text.c (ect_unrealize): Set text_view->font to NULL
-	after we unref it.
-
-2001-07-25  Jason Leach  <jleach@ximian.com>
-
-	* e-table-item.c (eti_event): If the CLICK signal gets a return
-	value, so we're going to be return from eti_event immediately
-	after, set the eti->click_count to zero.  Fixes bug #811.
-
-2001-07-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-table-item.c (eti_event): Handle GDK_KP_* cursor keys as well.
-
-2001-07-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (e_tree_get_cell_at): Made these functions return -1 if
-	the x and y aren't over any cell at all.
-
-2001-07-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-table-adapter.c (e_tree_table_adapter_node_set_expanded):
-	Ignore set_expanded if the node is the root and root_visible is
-	FALSE.
-
-	* e-tree.c (item_key_press): Don't call set_expanded on NULL
-	paths.
-
-2001-07-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (group_key_press), e-tree.c (item_key_press): Changed
-	these to use e_selection_model_select_as_key_press instead of
-	e_selection_model_do_something.
-
-2001-07-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (group_key_press), e-tree.c (item_key_press): Made the
-	amount to scroll by smaller here.
-
-2001-07-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (group_key_press), e-tree.c (item_key_press): Use
-	e_selection_model_do_something directly for page up and page down
-	instead of emulating a key press.
-
-2001-07-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-field-chooser-dialog.c
-	(e_table_field_chooser_dialog_init): Changed the title of this
-	dialog.  Fixes bug #2656.
-
-2001-07-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-table-adapter.c (e_tree_table_adapter_node_at_row): Added
-	checks for if row is outside of the appropriate range.
-
-2001-07-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-spin-button.c (e_cell_spin_button_step_float): Set
-	new_value = value here to fix a warning.
-
-2001-07-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-config.c (config_get_arg): Added a "state" argument to
-	allow you to get the state out of the config object.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (e_tree_get_cell_geometry): Added checks that row and
-	col are >= 0.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c (ect_cancel_edit): Call e_table_item_leave_edit
-	here.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header-item.c (ethi_drag_motion): Made it so that the
-	drop marker can show up when dragging a new column to the leftmost
-	position of the table header item.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-one.c (one_is_cell_editable): Ask for the editability of
-	row -1 instead of column 0 as we were before.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c, e-table-item.h (find_cell): Changed the variable
-	names here to make it clear that these are view model and row.
-	(eti_event): Added click_count to make it so that if we get two
-	clicks in different rows we don't send a double click event.
-	(eti_event, view_to_model_row): Set row_guess in a few extra
-	places.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_event): Make a whole bunch of control keys
-	not start the ETableItem editing.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (e_table_item_row_diff): Make sure start_row and
-	end_row are within the number of rows in the table.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (e_tree_new, e_tree_new_from_spec_file): Handle an
-	error in construction a little bit better here.
-	(e_tree_get_cursor): Check for row == -1 here.
-
-2001-07-02  Richard Hult  <rhult@codefactory.se>
-
-	* e-cell-combo.c (e_cell_combo_get_popup_pos): Calculate the popup
-	position using window coordinates instead of world coordinates.
-	This fixes bug #2613 in ximian's bugzilla, combo box pops up offset
-	if the table is scrolled.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (ets_destroy): Only free the root here if it's
-	non-NULL.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header-item.c (ethi_header_context_menu): Made the
-	remove this column menu item greyed out if it's the last column.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_event): Don't send the double click signal
-	if there's no row selected.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* e-table.c (et_drag_motion): send signals even if the row/col is
-	-1.
-	(et_drag_drop): same.
-
-	* e-tree.c (et_drag_motion): same.
-	(et_drag_drop): same.
-
-2001-06-27  Peter Williams  <peterw@ximian.com>
-
-	* e-tree-selection-model.c (e_tree_selection_model_add_to_selection): New function,
-	heavily based on select_single_row.
-
-	* e-tree-selection-model.h: Added prototype;
-
-	* e-tree.c (e_tree_get_model): New accessor function.
-	(e_tree_get_selection_model): Same.
-	(e_tree_selected_count, e_tree_select_all, e_tree_invert_select): Removed. With
-	the accessors these become pointless.
-
-	* e-tree.h: Prototype the functions above. Remove a few functions that
-	don't make sense anymore.
-
-2001-06-20  Mikael Hallendal  <micke@codefactory.se>
-
-	* e-cell-spin-button.c 
-	(e_cell_spin_button_step): send the value to
-	e_table_model_set_value_at as a string as in e_cell_number.
-	(e_cell_spin_button_step_float): send the value to
-	e_table_model_set_value_at as a string as in e_cell_number_float.
-
-2001-05-25  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-table-specification.c: #include <string.h>
-	* e-table-state.c: Same here. Kills warnings on newer gcc.
-	
-
-2001-05-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (et_table_rows_deleted): Remove row row + i instead of
-	row i.
-	(et_table_rows_inserted): Insert row row + i instead of row row.
-
-2001-05-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (et_table_rows_deleted): Remove row i instead of row
-	row.  Destroy et->group when you get the changed or
-	sort_info_changed signal instead of in the idle handler.
-
-2001-05-24  jacob berkman  <jacob@ximian.com>
-
-	* e-cell-size.c (ecd_get_text): format similar to nautilus
-
-2001-05-23  jacob berkman  <jacob@ximian.com>
-
-	* e-table-group-container.c: internationalize the grouping text
-	string
-
-2001-05-22  jacob berkman  <jacob@ximian.com>
-
-	* e-cell-pixbuf.c: allow NULL pixbufs, and draw with crappy alpha
-
-2001-05-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-sorted.c (ets_proxy_model_rows_deleted): Made this
-	faster in some cases.
-
-2001-05-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-group-leaf.c (etgl_double_click): The double_click
-	signal on the table item now emits the model row instead of the
-	view row so don't do the view to model conversion here.
-
-2001-05-22  jacob berkman  <jacob@ximian.com>
-
-	* e-table-sorted.c (ets_proxy_model_rows_deleted): a similar
-	change to below, which makes it actually work for the case where
-	count != 1
-
-2001-05-21  Chris Toshok  <toshok@ximian.com>
-
-	* e-table-sorted.c (ets_proxy_model_rows_inserted): increment row
-	each time through the loop so we don't get @count copies of @row.
-
-2001-05-14  Jon Trowbridge  <trow@ximian.com>
-
-	* e-cell-text.c (_get_position_from_xy): Try to deal with bad
-	utf8.
-	(_get_position): Try to deal with bad utf8.
-	(number_of_lines): Try to deal with bad utf8.
-	(split_into_lines): Try to deal with bad utf8.
-
-2001-05-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_event): Make a key press stop the tooltip
-	timeout.
-
-	* e-table-state.c (e_table_state_load_from_node): Make the default
-	expansion be one so that if the user doesn't specify any
-	expansions they get a uniform expansion.
-
-2001-05-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-date.c (ecd_get_text): Show the date for dates in the
-	future.
-
-	* e-tree-memory.c, e-tree-memory.h
-	(e_tree_memory_set_node_destroy_func): New function which gets
-	called on the data for every node removed from the tree.
-
-2001-04-29  Jason Leach  <jasonleach@usa.net>
-
-	(Fix bug #53111: Portability fixes for HP's ANSI compiler.)
-	
-	* e-table-header-item.c (ethi_popup_sort_ascending): Changes for
-	initializing a struct for picky compiler.
-	(ethi_popup_sort_descending): Ditto.
-	(ethi_change_sort_state): Ditto.
-
-	* e-cell.c (e_cell_realize): Fix trying to return a value for a
-	void function.
-	(e_cell_show_tooltip): Here too.
-
-	* e-table-subset.c (etss_set_value_at): Another fix for trying to
-	return something instead of void.
-	
-
-2001-04-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c: Added a read only argument "model" to ETable.
-
-2001-04-28  Jason Leach  <jasonleach@usa.net>
-
-	(Make the alternating row colors a option in ETableSpecification
-	instead of a compiled in #define)
-	
-	* e-table-specification.c (e_table_specification_load_from_node):
-	Read in the "alternating-row-colors=bool" option for
-	ETableSpecifications.  Default value is true so unless it is
-	specified to be false, row colors will alternate.
-	(e_table_specification_save_to_node): Save the alternating row
-	color options here.
-
-	* e-table.c (et_build_groups): Pass down the alternating row
-	colors through to the ETableGroup.
-	
-	* e-table-group-container.[ch]: Handle the new alternating row colors
-	option here, passing it to ETableItem.
-
-	* e-table-group-leaf.[ch]: Here too.
-
-	* e-table-item.c (eti_get_cell_background_color): Got rid of the
-	#define ALTERNATE_COLORS, replaced with truth check for
-	ETableItem::alternating_row_colors.
-
-	* e-tree.c: Make ETree recognize alternating row color options as
-	well.
-	
-
-2001-04-25  Jason Leach  <jasonleach@usa.net>
-
-	* e-table-group-leaf.c (etgl_set_arg): One-line fix (missing a
-	'break' at the end of the ARG_SELECTION_MODEL case).
-
-2001-04-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (e_table_get_cell_geometry): Add the header height to
-	the returned y location here so that things will be lined up
-	correctly.
-
-2001-04-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-table-adapter.c (e_tree_table_adapter_row_of_node): Made
-	this return -1 instead of -2 for not found if the root is not
-	visible.
-
-	* e-tree-selection-model.c (etsm_row_foreach_cb): Made this accept
-	any negative number as not found instead of just -1.
-
-2001-04-23  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (INCLUDES): remove UNICODE_CFLAGS
-
-	* e-cell-text.c: Remove <unicode.h> include, use gunicode functions
-
-2001-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (e_table_get_cell_geometry): Documented this function
-	properly.
-
-	* e-tree.c, e-tree.h (e_tree_get_cell_geometry): Added this
-	function.
-
-2001-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group-.h: Added get_cell_geometry method.
-
-	* e-table-item.c, e-table-item.h: Added
-	e_table_item_get_cell_geometry.
-
-	* e-table.c, e-table.h: Added e_table_get_cell_geometry.
-
-2001-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-date.c (ecd_get_text): Made it so that if a message is
-	from the last 8 hours, it only prints the time, not the date.
-
-2001-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header-utils.c (e_table_header_draw_button): Make pixbuf
-	columns show their title if there is space.
-
-2001-04-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header.c (eth_calc_widths): Submit a signal even if
-	there are no extras.
-
-	* e-table-item.c (eti_request_column_width): Don't compute widths
-	if our cells aren't realized yet.
-
-	* e-tree.c: Call e_table_header_update_horizontal whenever our
-	data changes.
-
-2001-04-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c: Turned off information expanders (tooltips) in
-	ETable by default.  Turn them back on with the environment
-	variable GAL_DO_TOOLTIPS.
-
-2001-04-18  Dan Winship  <danw@ximian.com>
-
-	* e-table.c (et_destroy): Free some things that weren't getting
-	freed.
-
-	* e-tree.c (et_destroy): Free some things that weren't getting
-	freed.
-	(e_tree_set_state_object): Don't ref the return value of
-	e_table_state_to_header.
-
-2001-04-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c: Turned on tooltips and alternating colors.
-
-2001-04-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c (tooltip_event): Propagate the event after sending
-	it to the table item.
-
-2001-04-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (ets_sort_idle): Fix a crash here.
-
-2001-04-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c (ect_show_tooltip): Set the background color to
-	the specified tooltip->background.  Set the foreground color to
-	the specified tooltip->foreground.
-
-	* e-table-item.c (eti_get_cell_background_color,
-	eti_get_cell_foreground_color): Added these functions.
-	(eti_draw, _do_tooltip): Use these new functions.
-
-	* e-table-tooltip.h: Added foreground and background colors to
-	this structure.
-
-	* e-tree.c, e-tree.h (e_tree_get_tooltip): Added this function.
-
-2001-04-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c: Added /* #defines */ at the top.  Fixed
-	ALTERNATE_COLORS to be an #ifdef instead of an #if.
-
-	* e-cell-text.c (ect_show_tooltip): Set "strikeout" argument on
-	created tooltip.
-
-2001-04-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c (tooltip_event): Use e_canvas_hide_tooltip and
-	e_canvas_popup_tooltip.
-
-	* e-table-item.c: Cleaned this up.  Removed some #if 0 and
-	replaced others with #ifdefs.
-
-	* e-table-tooltip.h: Removed some unnecessary fields.
-
-2001-04-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c (ect_show_tooltip): Set "bold" argument on created
-	tooltip.  Adjusted position of displayed tooltip.
-
-	* e-cell-tree.c (offset_of_node): Changed it so that this function
-	handles knowing whether on not to indent non expandable first
-	level nodes.  This makes things more consistent.
-
-	* e-table-item.c (eti_realize): Cleaned up the ETableItem code to
-	properly hide tooltips when going off the screen.
-
-	* e-table-tooltip.h: Added a visibility_count field to ETableTooltip.
-
-2001-04-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-hsv-utils.c, e-table-hsv-utils.h: Moved these to
-	gal/widgets/e-hsv-utils.c and gal/widgets/e-hsv-utils.h.
-
-	* e-table-item.c: #if 0ed out alternating colors until we come to
-	a consensus.
-
-2001-04-13  Mikael Hallendal  <micke@codefactory.se>
-
-	* e-cell-float.[ch]: New cell for floats.
-	
-	* e-cell-spin-button.[ch]: New cell for spin-button.
-	
-	* Makefile.am: 
-	- Added e-cell-spin-button.[ch]
-	- Added e-cell-float.[ch]
-
-2001-04-13  Dan Winship  <danw@ximian.com>
-
-	* e-table-header.c (eth_destroy): Fix memory leak
-
-2001-04-12  Seth Nickell  <snickell@stanford.edu>
-
-	* e-table-hsv-utils.c, e-table-hsv-utils.h: (tweak_hsv),
-	(hsv_to_rgb), (rgb_to_hsv): Some utility functions for dealing
-	with and modifying HSV values.
-	
-	* Makefile.am: Add e-table-hsv-utils.[c|h] to the build.
-	
-	* e-table-item.c: (eti_draw): Enable alternating colours in
-	e-table cells.
-
-2001-04-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_cursor_change): Only move the screen to show
-	the cursor if there are no changes pending.  Updated the commented
-	out code for alternating colors a bit.
-
-	* e-table-model.c, e-table-model.h: Added
-	e_table_model_has_change_pending.
-
-	* e-tree-memory-callbacks.c, e-tree-memory-callbacks.h: Added
-	has_get_node_by_id and get_node_by_id.
-	
-	* e-tree-model.c, e-tree-model.h: Added
-	e_tree_model_has_get_node_by_id and e_tree_model_get_node_by_id.
-	Added e_tree_model_has_change_pending.
-
-	* e-tree-selection-model.c: Handle the selection and cursor
-	properly across the tree changing.
-
-	* e-tree-sorted.c: Implemented has_get_node_by_id and
-	get_node_by_id, and has_changes_pending.
-
-	* e-tree-table-adapter.c: Implemented has_changes_pending.  Fixed
-	an array underflow.
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (item_key_press): Return TRUE for left and right
-	arrows.
-
-2001-04-10  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* e-table.c (et_real_construct): convert click_to_add_message locale->utf8.
-
-2001-04-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c: Put debugging stuff in d().
-
-2001-04-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c: #include "gal/widgets/e-unicode.h".
-
-2001-04-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-col.c, e-table-col.h, e-table-header-item.c,
-	e-table-header.c, e-table-item.c: Changed resizeable to resizable
-	in ETableCol for consistency.
-
-	* e-tree-selection-model.c (etsm_row_of_node): Return -1 here if
-	the path isn't found.
-	(etsm_sorted_node_changed): If cursor_row is -1, make cursor_col
-	-1 as well.
-
-2001-04-07  Dan Winship  <danw@ximian.com>
-
-	* e-cell-tree.c (ect_event): add "break;" to otherwise-empty
-	"default:" cases to make them ANSI.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-cell-date.c: Fix headers.
-	* e-cell-number.c: Ditto.
-	* e-cell-pixbuf.[ch]: Ditto.
-	* e-cell-size.c: Ditto.
-	* e-cell-text.c: Ditto.
-	* e-cell-tree.c: Ditto.
-	* e-table-click-to-add.[ch]: Ditto.
-	* e-table-column-specification.h: Ditto.
-	* e-table-config-field.c: Ditto.
-	* e-table-config.[ch]: Ditto.
-	* e-table-example-2.c: Ditto.
-	* e-table-field-chooser-dialog.[ch]: Ditto.
-	* e-table-field-chooser-item.c: Ditto.
-	* e-table-field-chooser.h: Ditto.
-	* e-table-group-container.c: Ditto.
-	* e-table-item.c: Ditto
-	* e-table-memory.c: Ditto.
-	* e-table-selection-model.c: Ditto.
-	* e-table-sorter.c: Ditto.
-	* e-table-subset-variable.c: Ditto.
-	* e-table.c: Ditto.
-	* e-tree-memory.c: Ditto.
-	* e-tree-model.c: Ditto.
-	* e-tree-selection-model.[ch]: Ditto.
-	* e-tree-sorted-variable.c: Ditto.
-	* e-tree-sorted.c: Ditto.
-	* e-tree-table-adapter.c: Ditto.
-	* e-tree.[ch]: Same here.
-
-2001-04-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c (e_tree_selection_model_change_cursor):
-	Call cursor_activated as well.
-
-2001-04-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-config.c, e-table-item.c, e-table-memory.c,
-	e-table-sort-info.c, e-table-specification.c, e-tree-sorted.c:
-	Fixed headers.
-
-	* e-table-config.c, e-table-specification.c: Replaced strcasecmp
-	with g_strcasecmp.
-
-2001-04-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c: Made this work properly for models
-	with 0 rows in the tree table adapter.
-
-2001-04-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c, e-tree-selection-model.h
-	(e_tree_selection_model_change_cursor): Added this function.
-
-	* e-tree.c (e_tree_set_cursor): Screwed up moving the cursor a
-	small bit when I changed this to be faster before.  Fixed it.
-
-2001-04-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c: Make it so you can switch checking around the
-	last access on and off for tuning purposes.
-
-	* e-tree-table-adapter.c: Apparently, ETreeTableAdapter is much
-	faster if the value_at function doesn't change the last_access
-	variable.
-
-2001-04-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c, e-tree-selection-model.h: Added
-	e_tree_selection_model_select_single_path and made selection_start
-	be the path as it should be instead of the row.
-
-	* e-tree-sorted.c: Added a last_access variable to speed up
-	access.
-
-	* e-tree-table-adapter.c: Made checking last_access look at the 10
-	values before and after the listed value to look for the value
-	requested.
-
-	* e-tree.c: Call e_tree_selection_model_select_single_path if
-	E_TREE_USE_TREE_SELECTION.
-
-2001-04-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c (etsm_row_foreach_cb): Fixed this to
-	not call the callback with a row of -1.
-
-2001-04-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.h (E_TREE_USE_TREE_SELECTION): Turn on
-	E_TREE_USE_TREE_SELECTION.
-
-2001-04-03  Richard Hult  <rhult@codefactory.se>
-
-	* e-tree-table-adapter.c (etta_proxy_node_inserted): Fixed an off
-	by one error.
-
-2001-04-03  Richard Hult  <rhult@codefactory.se>
-
-	* e-tree.c (et_get_arg): Add argument to get the table adapter.
-	(et_set_arg): Add arguments for setting drawing of the grid and
-	focus.
-
-	* e-tree-model.c, e-tree-model.h (e_tree_model_node_traverse):
-	Fill in missing implementation.
-	(e_tree_model_node_traverse_preorder): Likewise, but preorder
-	traversal.
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header-item.c (ethi_draw): Don't draw the button if it's
-	less than 1 pixel wide.
-
-	* e-tree-table-adapter.c (etta_proxy_node_inserted): Fixed a small
-	array overrun (wasn't causing problems, but it's best to be
-	correct.)
-
-2001-04-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-table-click-to-add.c (finish_editing): Ahem, the ETableItem
-	argument is now "selection_model", not "table_selection_model".
-
-2001-04-02  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* e-table-config.glade, e-table-field-chooser.glade, 
-	e-table-group.glade: Do not generate glade.h.
-	* e-table-field-chooser.glade.h, e-table-group.glade.h: removed.
-	* Makefile.am: updated.
-
-2001-04-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-cell-popup.c (ecp_unrealize): Typo fix; call
-	e_cell_unrealize(), not e_cell_realize().
-
-	* e-cell-text.c (ect_event): Removed fallback "else", from "if
-	(edit_display)"since our planned return value is already zero and
-	we do need to unbuild_current_cell() instead of returning
-	immediately.
-
-	* e-table-state.c (etst_destroy): Free the expansions field.
-
-	* e-table.c (e_table_set_state_object): Do not ref the header
-	since we just created it!
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* e-table-config.c, e-table-field-chooser.c: replaced
-	glade_xml_new with glade_xml_new_with_domain.
-
-2001-04-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c: Monitor the sorted model and send
-	selection and cursor changed signals.
-
-2001-04-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c (etsm_foreach_all_recurse,
-	etsm_foreach_recurse, e_tree_selection_model_foreach): Made this
-	traverse the source model instead of the sorted model since the
-	selection model is in the order of the source model.
-
-2001-04-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c: Fixed some bugs with the privitization
-	of ETreeSelectionModel.
-
-	* e-tree.c: One more required change to make it work with
-	E_TREE_USE_TREE_SELECTION on.
-
-2001-04-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (libetable_la_SOURCES): Added
-	e-tree-selection-model.c.
-	(libetableinclude_HEADERS): Added e-tree-selection-model.h.
-
-	* e-tree.c, e-tree.h: Added code to use ETreeSelectionModel if the
-	string E_TREE_USE_TREE_SELECTION is defined.
-
-2001-03-31  Tambet Ingo  <tambet@ximian.com>
-
-	* e-table-scrolled.c (e_table_scrolled_new_from_spec_file): Fixed
-	little bug, add adjustments.
-
-2001-03-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (e_tree_init): Initialize all necessary fields here.
-
-2001-03-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (et_real_construct): Roll back another part of the
-	change.
-
-2001-03-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c, e-tree.h: Accidently committed this with using the
-	tree selection model turned on.  Rolled back this change.
-
-2001-03-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-scrolled.c: Include <gal/util/e-util.h> here.
-
-	* e-tree-selection-model.c, e-tree-selection-model.h: Privatized
-	this class.  Cleaned this up a bit.  Added handlers for signals
-	from the model.
-
-	* e-tree.c, e-tree.h: Privatized this class.
-
-2001-03-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (ets_proxy_node_inserted): Set orig_position
-	properly on inserted nodes.
-
-2001-03-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c (etsm_foreach_all_recurse): Made
-	e_tree_selection_model_foreach work.
-	(etsm_select_all): Made etsm_select_all work.
-	(update_parents): Fixed a crash.
-
-2001-03-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am: Removed a bunch of unused comments.
-
-2001-03-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-example-1.c: Removed this since it's out of date.
-	Replaced by tests/test-table-1.c.
-
-2001-03-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c, e-tree-selection-model.h: New
-	implementation based on a tree instead of a hash table.
-
-	* e-tree-sorted.c, e-tree-sorted.h: Added
-	e_tree_sorted_num_children.
-
-2001-03-30  Radek Doulik  <rodo@ximian.com>
-
-	* e-tree.h: removed #include
-	<gal/e-table/e-tree-selection-model.h>
-
-2001-03-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-group.c, e-table-header-item.c, e-table-item.c,
-	e-table.c, e-tree.c: Made these use GTK_TYPE_GDK_EVENT whenever
-	sending an event through the signal system instead of
-	GTK_TYPE_POINTER.
-
-	* e-table.c, e-tree.c (set_header_canvas_width): Check that none
-	of the variables we're going to need are NULL before executing
-	this function.
-
-2001-03-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-group-container.c, e-table-group-container.h,
-	e-table-group-leaf.c, e-table-group-leaf.h, e-table-item.c,
-	e-table-item.h, e-table.c, e-tree.c: Changed the signal
-	"table_selection_model" to just be "selection_model" everywhere
-	and made it be ESelectionModels instead of ETableSelectionModels
-	for generality.
-
-	* e-table-item.c (eti_event): Make right arrow and left arrow
-	accessible as events that can be caught.
-
-	* e-tree-sorted.c, e-tree-sorted.h (e_tree_sorted_orig_position):
-	Added this function.
-
-2001-03-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-table-adapter.c (etta_proxy_node_removed): Fixed removing
-	the last child of a node.
-
-2001-03-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c, e-tree.c, e-tree.h: Updated to set the width of the
-	header canvas to be equal to the width of the table canvas to
-	avoid infinite loops.  Added left arrow and right arrow as tree
-	collapse and expand bindings.
-
-2001-03-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-selection-model.c, e-tree-selection-model.h: New class
-	implementing a tree model.  Not finished yet or in use, but I
-	wanted to get it checked in.
-
-2001-03-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-memory.c, e-tree-table-adapter.c: Updated these to match
-	the new e_tree_model_node_removed signal.
-
-	* e-tree-model.c, e-tree-model.h: Added an old_position parameter
-	to the node_removed signal so that it would be completely
-	deterministic.
-
-	* e-tree-sorted.c: Changed this so that paths keep track of their
-	original position.  This makes sorting much faster.
-
-Sun Mar 25 22:31:19 2001  George Lebl <jirka@5z.com>
-
-	* e-tree.c (e_tree_class_init):  Fix gtk_signal_new arguments, INT
-	  and POINTER were switched causing my alpha to go nuts.
-
-2001-03-25  Dan Winship  <danw@ximian.com>
-
-	* e-table.c (et_real_construct): ref the sort_info taken from the
-	state object.
-	* e-tree.c (et_real_construct): Ditto. Fixes the last ETree
-	crash-on-exit bug for me.
-
-2001-03-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-selection-model.c, e-table-selection-model.h: Made the
-	parent object of this be ESelectionModelArray instead of
-	ESelectionModel due to their refactoring.  Changed the commented
-	out code for saving the selection a bit.
-
-2001-03-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree.c (item_key_press): Added '=' and '-' as tree node expand
-	and collapse.
-
-2001-03-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-extras.c: Properly remove old items from the
-	ETableExtras if they are replaced by new objects.
-
-2001-03-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (reposition_path): Made this only up the
-	insert_count if it actually had to do any non constant work to
-	reposition the path.
-
-2001-03-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_cursor_change, eti_cursor_activated): Ignore
-	these signals if we aren't realized yet.
-
-2001-03-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-text.c: Made this not create the new font until realize
-	instead of at new_view time.
-
-	* e-table-item.c: Don't request heights or do other things that
-	you aren't allowed to do before realization unless you're
-	realized.
-
-2001-03-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-table-sort-info.c (e_table_sort_info_init): Make the object
-	not FLOATING.
-
-	* e-table-state.c (etst_destroy): Use _unref, not _destroy, to
-	release the `sort_info'.
-
-2001-03-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-memory.c: Fixed the parity on all the g_return_ifs and
-	g_return_val_ifs.
-
-2001-03-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-memory.c, e-table-memory.h (e_table_memory_insert): Made
-	this able to take -1 to denote appending to the table.  Also,
-	removed the node_ from the name of this function.
-	(e_table_memory_remove): Removed the node_ from the name of this
-	function.
-	(e_table_memory_clear): New function which sets the table to
-	empty.
-
-2001-03-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-memory.c (sort_callback): Changed this to derefence the
-	pointers passed in from qsort as we should instead of just casting
-	them.
-	(e_tree_memory_sort_node): Set the first_child and last_child of
-	the node changed.
-
-2001-03-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-memory.c, e-tree-memory.h (e_tree_memory_sort_node): New
-	function to allow you to do non live sorts with weird rules.
-
-2001-03-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-memory.c (e_table_memory_insert): Fixed the
-	g_return_if_fail here to allow for appending.
-
-2001-03-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-table-state.c (etst_init): Make the object a non-GTK_FLOATING
-	object.
-
-2001-03-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-memory-callbacks.c, e-table-memory-callbacks.h,
-	e-table-memory.c, e-table-memory.h: Added these classes.
-
-	* Makefile.am: Added e-table-memory-callbacks.c,
-	e-table-memory-callbacks.h, e-table-memory.c, and
-	e-table-memory.h.
-
-2001-03-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c: Fixed a typo in the word horiztonal.
-
-2001-03-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-click-to-add.c: Turn on the vertical grid.
-
-	* e-table-group-container.c, e-table-group-container.h,
-	e-table-group-leaf.c, e-table-group-leaf.h, e-table-item.c,
-	e-table-item.h: Replaced the "drawgrid" argument with
-	"horizontal_draw_grid" and "vertical_draw_grid" arguments.
-
-	* e-table-specification.c, e-table-specifcation: Replaced the
-	draw_grid setting with the horizontal_draw_grid and
-	vertical_draw_grid settings.  If the draw-grid property is set in
-	a ETableSpecification it is still obeyed and overrides the
-	vertical-draw-grid and horizontal-draw-grid properties.
-
-	* e-table.c, e-table.h, e-tree.c, e-tree.h: Deal with the
-	horizontal_draw_grid and vertical_draw_grid changes.
-
-	* e-tree-model.h: Added a missing include.
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (ets_proxy_node_changed): Deal with
-	proxy_node_changed being called on a different root node than the
-	one we have in our tree.
-
-	* e-tree-table-adapter.c: Did some general clean up here.
-
-	* Merged branch:
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (find_child_path): Added this function to allow
-	us to find paths that have been removed from the source.
-	(ets_proxy_node_removed): Fixed the memmove here a bit.  Call
-	find_child_path.
-
-	* e-tree-table-adapter.c (find_node): Check that the passed in
-	path isn't NULL.
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_reflow): Get width from header object
-	instead of calculating it ourselves.
-
-	* e-table-selection-model.c: Turn off selection saving since it's
-	so slow.
-
-	* e-table.c (e_table_set_state_object): Set the width of the newly
-	created header object.
-
-	* e-tree.c (e_tree_set_state_object): Set the width of the newly
-	created header object.
-	(tree_canvas_size_allocate): Don't bother setting the dimensions
-	of the white background twice.
-
-2001-03-18  Miguel de Icaza  <miguel@ximian.com>
-
-	* e-table-config.c (sort_entry_changed): Use
-	update_sort_and_group_config dialog instead of the non-implemented
-	update_group_config_dialog.
-	(update_sort_and_group_config_dialog): Update the text correctly.
-	(sort_entry_changed): Handle empty string as not-in-set.
-	(group_entry_changed): Handle empty string as not-in-set.
-	(config_class_init): Fix the signal declaration for "changed",
-	this was sending the wrong information.
-	(update_sort_and_group_config_dialog): Use group_info here, not sort_info
-
-	* e-table-header-item.c (ethi_popup_customize_view): Changed to
-	use the "changed" signal in the ETableConfig instead of
-	promiscously using the "apply" from the PropertyBox
-
-	* e-table-config.glade: Set Hide On Close to yes for the Group-By
-	dialog. 
-
-	The groups for Radio Buttons in the Glade file are global, which
-	caused all sorts of strange behaviour and really hard to debug
-	problems.  This should be now fixed
-
-2001-03-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-selection-model.c, e-table-selection-model.h: Made
-	ETableSelectionModel save the cursor properly across changed
-	signals if has_save_id is true.
-
-2001-03-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-selection-model.c, e-table-selection-model.h: Made
-	ETableSelectionModel save selection properly across changed
-	signals if has_save_id is true.
-
-	* e-tree-memory.c: A couple of typos.
-
-2001-03-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-memory.c, e-tree-sorted.c: Send pre_changes properly.
-
-2001-03-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-table-adapter.c: Send pre_changes when performing
-	set_expanded or root_node_set_visible.
-
-2001-03-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (ets_is_expandable): When the API requests
-	whether the object is expandable and it isn't, make sure to send a
-	signal when it becomes expandable.
-
-	* e-tree-table-adapter.c: Made it so that in a number of cases
-	where it doesn't need to create an empty hash table node if the
-	current tree node has no children, it doesn't.
-
-2001-03-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-memory-callbacks.c, e-tree-memory-callbacks.h
-	(etmc_has_save_id, etmc_get_save_id): Added has_save_id and
-	get_save_id to the list of methods supported by
-	e_tree_memory_callbacks.
-
-	* e-tree-table-adapter.c, e-tree-table-adapter.h: Added saving of
-	expanded nodes.
-
-2001-03-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-model.c, e-table-model.h (e_table_model_get_save_id):
-	Changed row_save_id to get_save_id to be consistent with ETree.
-
-	* e-tree-model.c, e-tree-model.h: Added "pre_change" signal.
-	Added has_save_id and get_save_id methods.
-
-	* e-tree-sorted.c: Proxy pre_change signal.  Implemented
-	has_save_id and get_save_id.  If the base model doesn't provide
-	has_save_id then we g_strdup_printf the pointer of the base model
-	ETreePath as the save_id.
-
-	* e-tree-table-adapter.c: Proxy pre_change signal.  If base model
-	has_save_id, then use the results of get_save_id as the key for
-	the hash table of node attributes.  Otherwise use the pointer as
-	before.
-	
-
-2001-03-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (ets_sort_idle): Fixed it so that all nodes get
-	sorted properly instead of just the top node.
-
-2001-03-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-sorting-utils.c (e_table_sorting_utils_tree_sort): Made
-	tree sorting faster by using a cache.
-
-	* e-tree-sorted.c: Added commented out debugging g_prints.
-
-2001-03-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c: Switched to using GMemChunks.
-
-2001-03-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-sorted.c (resort_node): Made it so that children of a
-	node that's being sorted don't send changed signals.
-
-2001-03-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-sorting-utils.c, e-table-sorting-utils.h: Switched to
-	using e_sort and e_search instead of qsort and a linear search.
-	Added the tree functions e_table_sorting_utils_tree_sort,
-	e_table_sorting_utils_tree_check_position, and
-	e_table_sorting_utils_tree_insert.
-
-	* e-tree-sorted.c: Made this actually do sorting.
-
-	* e-tree-table-adapter.c (etta_proxy_node_changed): The old_size
-	needs to be the number of visible children + 1 to include the top
-	node.
-
-	* e-tree.c (e_tree_set_state_object): Set the sort_info on the
-	ETreeSorted when you get a new sort_info.
-
-2001-03-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-cell-combo.c: Added #include <string.h> for strcmp().
-	* e-table-header-utils.c: Same for strlen().
-	
-
-2001-03-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am: Added e-tree-sorted.c and e-tree-sorted.h.
-
-	* e-table-item.c (eti_realize_cell_views): Only realize the cells
-	if they're not realized already and if the canvas is realized.
-
-	* e-table-sorted.c (ets_proxy_model_cell_changed): Matched the
-	change to the signature of e_table_sorting_utils_affects_sort.
-
-	* e-table-sorting-utils.c, e-table-sorting-utils.h
-	(e_table_sorting_utils_affects_sort): Changed the signature of
-	this function to not take the ETableModel source since it doesn't
-	use it and we need to use this function for ETreeSorted which
-	doesn't have an ETableModel.
-
-	* e-tree-memory.c (etmm_get_expanded_default): Actually implement
-	the get_expanded_default for this tree.
-
-	* e-tree-model.h: Cleaned up the indentation here.
-
-	* e-tree-sorted.c, e-tree-sorted.h: New class meant to be used for
-	sorting trees.  It doesn't actually sort yet.  It simply acts as
-	an ETreeProxy which is the hardest part of making ETreeSorted.
-
-	* e-tree.c, e-tree.h: Made this use an ETreeSorted.
-
-2001-03-15  Miguel de Icaza  <miguel@ximian.com>
-
-	* e-table-state.c (etst_destroy): Release ->sort_info.
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* e-table-item.c (eti_event): Update arguments to
-	e_canvas_item_grab_focus.
-	(eti_cursor_change): Ditto, but pass FALSE! Fixes the problem of
-	the Evolution message list stealing your focus when new mail
-	arrives. Ha!
-
-2001-03-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c, e-table-item.h, e-table-selection-model.c,
-	e-table-selection-model.h, e-table-sorted.c, e-table-sorted.h,
-	e-table-subset.c, e-table-subset.h, e-table.c, e-table.h: Switch
-	to handling e_table_model_rows_inserted instead of
-	e_table_model_row_inserted and e_table_model_rows_deleted instead
-	of e_table_model_row_deleted.
-
-	* e-table-model.c, e-table-model.h: Replaced the signals
-	"model_row_inserted" and "model_row_deleted" with
-	"model_rows_inserted" and "model_rows_deleted" so that when
-	multiple rows are inserted or deleted at the same time they can be
-	handled properly.
-
-	* e-tree-table-adapter.c: Call "model_rows_inserted" and
-	"model_rows_deleted" instead of "model_changed" when inserting or
-	deleting multiple rows.
-
-2001-03-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (e_table_item_row_diff): Made this not count the
-	pixel between rows if it isn't there.
-
-2001-03-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_header_structure_changed): Properly attach &
-	realize cell views here.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-table-adapter.c (etta_proxy_node_removed): Check that
-	parent_node and parent aren't NULL before making function calls on
-	them.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (confirm_height_cache): Fixed a height cache
-	miscalculation.
-
-	* e-tree-table-adapter.c (find_first_child_node): Made the
-	semantics of this mean that find_first_child_node(adapter, -1)
-	means return the first node in the tree.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-extras.c: Added a "string-integer" comparison function
-	to the default %ETableExtras so you can do comparisons based on
-	integer value even if you using strings for the data (this lets
-	you do editable numbers, for instance.)
-
-	* e-table-item.c: Rearranged it a bit so that if you have
-	draw_grid off it doesn't add space for the horizontal lines, nor
-	leave them the background color.
-
-	* e-table-model.c, e-table-model.h: Added the row_save_id and
-	has_save_id methods to %ETableModel.
-
-	* e-tree.c, e-tree.h: Replaced e_tree_compute_location with
-	e_tree_get_cell_at.
-
-2001-03-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am: Added e-table/e-table-utils.c,
-	e-table/e-tree-memory-callbacks.c, e-table/e-tree-memory.c,
-	e-table/e-tree-scrolled.c, e-table/e-tree-table-adapter.c, and
-	e-table/e-tree.c.  Removed e-table/e-tree-simple.c.  Added
-	e-table/e-table-utils.h, e-table/e-tree-memory-callbacks.h,
-	e-table/e-tree-memory.h, e-table/e-tree-scrolled.h,
-	e-table/e-tree-table-adapter.h, and e-table/e-tree.h.  Removed
-	e-table/e-tree-simple.h.
-
-	* e-cell-tree.c: Updated this for the new tree.
-
-	* e-table-item.c: Added some redraw requests where appropriate.
-
-	* e-table-item.h: Fixed an incorrect class method declaration.
-
-	* e-table-model.c, e-table-model.h: Removed
-	e_table_model_has_sort_group and e_table_model_row_sort_group.
-
-	* e-table-scrolled.h: Removed unused headers.
-
-	* e-table-simple.c, e-table-simple.h: Rearranged this a bit.
-
-	* e-table-sorter.c, e-table-sorting-utils.c,
-	e-table-sorting-utils.h: Removed sort group stuff.  Added the
-	function e_table_sorting_utils_check_position.
-
-	* e-table-utils.c, e-table-utils.h: Utility functions for ETable
-	and ETree.
-
-	* e-table.c: Moved some of the functionality from here to
-	e-table-utils.c so that it can be reused by ETree.
-
-	* e-tree-memory-callbacks.c, e-tree-memory-callbacks.h: Class to
-	implement an ETreeMemory as callbacks instead of overriding the
-	class.
-
-	* e-tree-memory.c, e-tree-memory.h: ETreeModel that stores a tree
-	of physical nodes.
-
-	* e-tree-model.c, e-tree-model.h: Removed most of the
-	functionality from here to the classes ETreeMemory and
-	ETreeTableAdapter.  This is now just a simple virtualized tree
-	class.
-
-	* e-tree-scrolled.c, e-tree-scrolled.h: New class.  An ETree in an
-	EScrollFrame.
-
-	* e-tree-simple.c: Small change.  This is no longer used.
-
-	* e-tree-table-adapter.c, e-tree-table-adapter.h: ETableModel that
-	represents an ETreeModel as a table.
-
-	* e-tree.c, e-tree.h: New super class kind of like ETable but for
-	trees.
-
-End of branch
-
-2001-03-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-table.c (e_table_compute_location): Removed.
-	(e_table_get_cell_at): New, public function exporting the same
-	functionality.
-	(et_drag_motion): Use `e_table_get_cell_at()' instead of
-	`e_table_compute_location()'.
-	(et_drag_drop): Likewise.
-	(et_drag_data_received): Likewise.
-	(e_table_drag_source_event_cb): Likewise.
-
-2001-03-04  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell-text.c: added "editable" Arg, to stop the user from editing
-	the text. The user can still select the text, though. The "editable"
-	Arg is useful for ECellCombo where we want the user to select an item
-	in the popup but not edit the field itself.
-
-	* e-cell-combo.c: updated to select the matcing item before it pops up
-	the list.
-
-2001-03-01  Vladimir Vukicevic  <vladimir@ximian.com>
-
-	* e-cell-pixbuf.c, e-cell-pixbuf.h, Makefile.am,
-	Makefile.am, e-table-extras.c:  Added new ECellPixbuf --
-	takes a GdkPixbuf from the model and renders it centered
-	in the table cell.
-
-
-2001-02-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-click-to-add.c, e-table-group-container.c,
-	e-table-group-container.h, e-table-group-leaf.c,
-	e-table-group-leaf.h, e-table-item.c, e-table-item.h,
-	e-table-specification.c, e-table-specification.h, e-table.c,
-	e-table.h: Changed a lot of the ETableSelectionModels to
-	ESelectionModels, a lot of the ETableSorters to ESorters, all the
-	ETableCursorModes to ECursorModes, and all of the
-	ETableForeachFuncs into EForeachFuncs.
-
-	* e-table-defines.h: Moved ETableForeachFunc and ETableCursorMode
-	to e-selection-model.h.
-
-	* e-table-selection-model.c, e-table-selection-model.h: Made this
-	a subclass of ESelectionModel which simple connects to an
-	ETableModel.
-
-	* e-table-sorter.c, e-table-sorter.h: Made this a subclass of
-	ESorter so that implements the same semantics it used to.
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-pixbuf.c: Fixed some warnings.
-
-	* e-table-subset.c, e-table-subset.h: Added
-	e_table_subset_print_debugging.
-
-2001-02-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-sorted-variable.c: Moved etsv_compare to etsu_compare in
-	e-table-sorting-utils.c.  Moved most of the contents of etsv_add
-	to e_table_sorting_utils_insert in e-table-sorting-utils.c and
-	call the function.
-
-	* e-table-sorted.c: Rewrote ets_proxy_row_changed,
-	ets_proxy_row_inserted, and ets_proxy_row_deleted.
-
-	* e-table-sorting-utils.c, e-table-sorting-utils.h (etsu_compare,
-	e_table_sorting_utils_insert): Added e_table_sorting_utils_insert.
-
-	* e-table-subset-variable.c: Changed this implementation to be
-	slightly more consistent with other code.
-
-2001-02-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-table.c (et_disconnect_model): Only disconnect if the model is
-	non-zero, and only if the IDs are actually non-zero.
-
-2001-02-25  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell-popup.c: new abstract ECell subclass to be used as base class
-	for popup ECells.
-
-	* e-cell-combo.c: subclass of ECellPopup which pops up a simple list
-	of strings.
-
-	* e-table-item.c: Renamed eti_row_diff() to e_table_item_row_diff() and
-	made public, since the ECellPopup subclasses need it.
-
-	* Makefile.am: added e-cell-popup.[hc] and e-cell-combo.[hc]
-
-2001-02-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (libetable_la_SOURCES): Added
-	e-table-sorting-utils.c.
-	(libetableinclude_HEADERS): Added e-table-sorting-utils.h.
-
-	* e-table-group-container.c: Implemented add_array method.  Use
-	add_array to implement add_all instead of using add.  Did some
-	general clean up.
-
-	* e-table-group-leaf.c, e-table-group-leaf.h: Implemented
-	add_array method.  Changed everything to use an ETableSubset
-	variable instead of an ETableSortedVariable.  Implemented it as
-	ETableSortedVariable if there's grouping involved and ETableSorted
-	if there isn't.
-
-	* e-table-group.c, e-table-group.h: Added add_array method.  Added
-	unused get_position code.
-
-	* e-table-sorted-variable.c, e-table-sorted-variable.h: Moved a
-	lot of the actual implementation of sorting to
-	e-table-sorting-utils.c.  Got rid of the signal handlers here
-	since we weren't using them and ETableSubset has the proxy virtual
-	methods.
-
-	* e-table-sorted.c, e-table-sorted.h: Completely replaced these
-	files with a variation on ETableSortedVariable that doesn't have
-	the add methods and such but instead just mimics the source
-	model's set of rows completely.
-
-	* e-table-sorter.c, e-table-sorter.h: Added functions to get at
-	the arrays here.
-
-	* e-table-sorting-utils.c, e-table-sorting-utils.h: Utility
-	functions for doing sorting.
-
-	* e-table-subset-variable.c, e-table-subset-variable.h: Added
-	add_array method.
-
-	* e-table-subset.c, e-table-subset.h: Made it so that the signal
-	hookups to the source model's signals are virtual methods.
-
-	* e-table.c, e-table.h: Don't call add_all and add and remove type
-	functions if not grouped.  Don't rebuild for sort changes unless
-	it was either grouped before or will be grouped now.
-
-2001-02-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-model.c: Added a bunch of g_return_if_fails.
-
-2001-02-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell.c (e_cell_draw): Added some g_return_if_fails here.
-
-2001-02-20  Chris Toshok  <toshok@ximian.com>
-
-	* e-tree-model.c: add some more (mostly empty) api docs.
-	(e_tree_model_node_changed): pass the node in the "node_changed"
-	signal.
-	(etree_destroy): e_tree_model_node_remove our root node here to
-	free up the tree's storage.
-
-2001-02-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am: Removed e-table-text-model.c and
-	e-table-text-model.h.
-
-	* e-table-text-model.c, e-table-text-model.h: Moved these to
-	gal/e-text/.
-
-	* e-cell-text.c: Changed the include line for
-	e-text-event-processor.h and e-text-event-processor-emacs-like.h.
-
-2001-02-17  Rusty Conover  <rconover@zootweb.com>
-
-	* e-cell-tree.c (ect_max_width): Change the calculation of the
-	maximum with of tree cell, from O(n^2) to O(n), we don't need to
-	continually recalculate the maximum width of the subcells when
-	calculating the width of every row.
-
-2001-02-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (et_real_construct): Removed setting of invalid
-	"horizontal_scrolling" argument.
-
-	* e-table-column-model.h: Removed this as it is not used.
-
-2001-02-17  Christopher James Lahey  <clahey@ximian.com>
-
-	From a patch submitted by Murray Cumming <Murray.Cumming@mybau.com>
-
-	* e-cell-checkbox.h, e-cell-date.h, e-cell-number.h,
-	e-cell-size.h, e-cell-text.h, e-cell-toggle.h, e-cell-tree.h,
-	e-cell.h, e-table-click-to-add.h, e-table-col-dnd.h,
-	e-table-col.h, e-table-column-specification.h,
-	e-table-config-field.h, e-table-config.h, e-table-defines.h,
-	e-table-extras.h, e-table-field-chooser-item.h,
-	e-table-group-container.h, e-table-group-leaf.h, e-table-group.h,
-	e-table-header-item.h, e-table-header-utils.h, e-table-header.h,
-	e-table-item.h, e-table-model.h, e-table-one.h,
-	e-table-selection-model.h, e-table-simple.h, e-table-sort-info.h,
-	e-table-sorted-variable.h, e-table-sorted.h, e-table-sorter.h,
-	e-table-specification.h, e-table-state.h,
-	e-table-subset-variable.h, e-table-subset.h, e-table-tooltip.h,
-	e-table-tree.h, e-tree-model.h, e-tree-simple.h,
-	e-tree-sorted-variable.h: Added GNOME_DECLS.
-
-2001-02-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-selection-model.c
-	(e_table_selection_model_do_something): Made it so that if you set
-	the row or col to something not equal to -1, it makes sure that
-	the other one is also not equal to -1.
-
-2001-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-header.c, e-table-header.h
-	(e_table_header_update_horizontal): This new function updates the
-	minimum width of all of the columns based on the data contained in
-	that column.
-
-	* e-table.c, e-table.h (changed_idle): Added a
-	horizontal_scrolling field.  Call e_table_header_update_horizontal
-	if the model changes at all and horizontal_scrolling is set to TRUE.
-
-2001-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-scrolled.c (e_table_scrolled_real_construct): Set policy
-	of scrolled window to be automatic/automatic.
-
-	* e-table-specification.c, e-table-specification.h (etsp_init):
-	Added a horizontal-scrolling attribute.
-
-2001-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_destroy): Fix the crash when ETableItems are
-	destroyed.
-
-2001-02-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-selection-model.c (change_one_row): Fix selection so
-	that changing a model row equal to 31 mod 32 works.
-
-2001-02-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (eti_cursor_change): Let
-	e_canvas_item_show_area_delayed deal with a delayed area show
-	instead of dealing with it ourselves.
-
-2001-02-08  Dan Winship  <danw@ximian.com>
-
-	* e-table-sorter.c (ets_set_arg): Add a missing gtk_object_ref.
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-number.c (ecn_get_text): Use e_format_number.
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table.c (e_table_setup_header): Set the dnd_code on the header
-	properly.
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-tree-model.c, e-tree-model.h (e_tree_model_show_node): Added
-	this function.  Made frozen an int so that recursive freezes and
-	thaws behaves properly.
-
-2001-02-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-cell-date.c (ecd_get_text): Change encoding from locale
-	encoding to utf8.
-
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c: Changed the text to pop up the Field
-	Chooser.
-
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-config.c, e-table-config.h (dialog_apply): Added a
-	"changed" signal.
-
-	* e-table-sort-info.c, e-table-sort-info.h
-	(e_table_sort_info_duplicate): Added this function.
-
-	* e-table.c (e_table_set_state_object): Duplicate the state's
-	sort_info object here.
-
-2001-02-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-table-item.c (view_to_model_col): Make this not error out if
-	ecol is not found, but simply return -1.
-	(eti_event): Don't call view_to_model_col here as we already have
-	a model column.
-
-2001-02-02  Not Zed  <NotZed@Ximian.com>
-
-	* e-table-selection-model.c (model_row_deleted): Dont overwrite
-	the end of our bitmap array.
-	
-
-2001-02-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-table-sorter.c: Make `vals_closure', `cols_closure',
-	`ascending_closure' and `compare_closure' static!
-
-2001-02-02  Not Zed  <NotZed@Ximian.com>
-
-	* e-cell-tree.c (ect_draw): If we are drawing a top-level tree
-	node, without any children then dont offset it for the expansion
-	image it doesn't need.
-
-2001-01-31  Larry Ewing  <lewing@ximian.com>
-
-	* e-table-item.c (view_to_model_col): make the segfault caused by
-	double clicking into a critical warning until it can be fixed.
-
-2001-01-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-click-to-add.c (etcta_event): Made the contained
-	%ETableItem have cursor_mode as %E_TABLE_CURSOR_SPREADSHEET.
-
-	* e-table-defines.h, e-table-item.c, e-table-specification.c:
-	Added a new cursor mode E_TABLE_CURSOR_SPREADSHEET.  This is
-	accessed using cursor_mode="spreadsheet" in your specification
-	xml, as well as by the click_to_add item.  It is identical to
-	E_TABLE_CURSOR_SIMPLE, except that tab goes to the next item in
-	the table instead of to the next widget.
-
-2001-01-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-click-to-add.c (etcta_event): Made carriage return
-	finish editing.
-
-	* e-table-item.c (eti_event): Made carriage return key press
-	signal go out before sending it to the selection model.
-
-2001-01-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am: Added e-cell-number.c and e-cell-number.h.
-
-	* e-cell-number.c, e-cell-number.h: A new cell for rendering
-	numbers.
-
-	* e-table-extras.c (ete_init): Added a default number cell.  Made
-	the default size cell right aligned.
-
-2001-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c, e-table-item.h: Made the scrolling to show the
-	current roll happen in a time out.
-
-2001-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c (eti_event): Make home and end keys move to the
-	beginning and end of the row if cursor mode is set to
-	E_TABLE_CURSOR_SIMPLE.  Otherwise have %ETableSelectionModel
-	handle them.
-
-	* e-table-selection-model.c, e-table-selection-model.h: Added a
-	"cursor_mode" argument.
-	(e_table_selection_model_key_press): Made home and end keys move
-	the beginning and end of the table if cursor_mode is
-	E_TABLE_CURSOR_MODE_LINE.
-
-	* e-table.c: Set the cursor-mode argument of our
-	%ETableSelectionModel.
-
-2001-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c (eti_event): Make ETable stop editing when it
-	looses focus.
-
-	* e-table.c (et_canvas_button_press): Make ETable stop editing if
-	you click on an unhandled area of the table canvas (The white area
-	at the bottom for instance.)
-
-2001-01-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-table.c (e_table_init): Set the GTK_CAN_FOCUS flag on the
-	widget, since an ETable ought to be focusable.
-	(e_table_class_init): Override ::grab_focus() and ::focus().
-	(et_grab_focus): Since people may do gtk_widget_grab_focus() on
-	the ETable, we have to proxy the request to the actual focusable
-	canvas.
-	(e_table_setup_header): Unset GTK_CAN_FOCUS for the header canvas.
-	(et_focus): Reject focus if our child canvas already had it.
-
-	* e-table-scrolled.c (e_table_scrolled_init): Set the
-	GTK_FOCUS_FLAG on the widget.  This is just so that people can
-	easily do gtk_widget_grab_focus (my_e_table_scrolled) on their own
-	applications.
-	(e_table_scrolled_class_init): Override ::grab_focus() and
-	::focus().
-	(ets_grab_focus): Proxy the grab_focus to our child ETable.
-	(ets_focus): Proxy the request to the child ETable.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c (move_selection): Made this correctly
-	check for going off the end of the table.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group.h, e-table-item.c, e-table-item.h:
-	Documented.  Added a "cursor_activated" signal.  Removed some
-	unused functions (e_table_group_get_count and
-	e_table_group_get_ecol).
-
-	* e-table-selection-model.c, e-table-selection-model.h: Added a
-	"cursor_activated" signal.  Call it when the user changes the
-	selection to match the cursor.
-
-	* e-table.c, e-table.h: Added a "cursor_activated" signal.  Fixed
-	the e_table_compute_location function to take into account the
-	scrolled position.
-
-2001-01-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c: Made the cursor move when rows are
-	inserted or deleted.  If in single mode and the selected row gets
-	removed, move it up.
-
-2001-01-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c (ethi_header_context_menu): Made this
-	conform to the new prototype for e_popup_menu_run.
-
-	* e-table-item.c, e-table-item.h: Documented.
-	(e_table_item_is_row_selected): Removed this function.
-	(eti_draw): Changed this so that if the ETableItem is in
-	cursor-mode="row", the cursor is draw all the way across the row.
-	(eti_cursor_move_up, eti_cursor_move_down): Commented these out
-	since they're no longer used.
-	(_do_tooltip, eti_event): Commented out tooltips.
-	(eti_event): Made it so that we call the key_press function in the
-	%ETableSelectionModel on each key press.
-
-	* e-table-selection-model.c, e-table-selection-model.h:
-	Documented.  Added a function e_table_selection_model_key_press
-	that does whatever behavior is correct for the user having pressed
-	the given key.  Changed the behavior of this to better match
-	windows (use selection-mode="browse").
-
-	* e-table-specification.c, e-table-specification.h: Added a
-	draw_focus variable.
-
-	* e-table.c: Decide whether to draw the focus based on the
-	ETableSpecification.  Removed the argument for setting whether to
-	draw the focus.
-
-2001-01-20  Iain Holmes  <iain@ximian.com>
-
-	* e-cell-text.c (ect_show_tooltip): Unref some stuff if we're not
-	showing the tip. Fix a bigish memory leak.
-
-2001-01-19  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-config.c (group_entry_changed, group_ascending_toggled):
-	New methods.
-	(configure_group_dialog): New function, sets up the group GUI.
-	(e_table_config_construct): Populate column names here and use in
-	configure_group_dialog and configure_sort_dialog
-
-	(sort_entry_changed, sort_ascending_toggled): renamed from
-	entry_changed, ascending_toggled.
-
-2001-01-18  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-config.c (configure_sort_dialog): Keep track of the
-	valid column names (not used right now).
-	(config_destroy): release column names
-	(entry_changed): Handle invalid input to mean "Next entry is
-	grayed out". 
-
-	* e-table-header-item.c (ethi_popup_customize_view): Hook up to
-	the "apply" signal on the dialog box to apply the changes.
-	(apply_changes): New function to apply the changes from the
-	ETableConfig object. 
-
-	* e-table-sort-info.c (e_table_sort_info_load_from_node): Notify
-	of sort info changes.
-
-	* e-table-header-item.c: Swapped the way arrows were done, so that
-	they actually match the sorting that its expected.
-
-	* e-table.c: Added inline documentation for a few methods. 
-
-	* e-table-config.h: Dropped ::spec, and temp_spec, we always use
-	::source_spec, as we never modify this variable. 
-
-2001-01-18  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-table-subset.c (etss_destroy): Disconnect from the
-	etss->source's signals *before* we unref it.
-
-	* e-table-group-container.c (e_table_group_apply_to_leafs): Ref()
-	and unref() around the callback to protect ourselves from being
-	unrefed in the middle of iterating through the nodes.
-
-2001-01-18  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-config.c (find_model_column_by_name): New function. 
-	(update_sort_config_dialog): Massive update to this function, it
-	is almost complete now, it just needs a few cosmetic touchups. 
-	(config_sort_config_show): Get the main interaction working as
-	well. 
-	(config_group_info_update): Beautify.
-	(entry_changed): Do all the magic for the GUI for entries.
-	(ascending_toggled): Implement callback.
-	(configure_sort_dialog): Do also descending. 
-	(configure_sort_dialog): Hook up changed/toggled.
-
-	* e-table-config.h: Put all the configuration stuff for sorting
-	into its own structure to pass around funny functions. 
-
-2001-01-17  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-specification.c (e_table_specification_duplicate):
-	Remove annoying printf.  A clean output is a good output.
-
-2001-01-17  Dave Camp  <dave@ximian.com>
-
-	* e-table-config.c: Removed #inclusion of e-table-config-field.h.
-
-2001-01-17  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-header-item.c: Use e-i18n.h here.
-
-	* e-table.c (et_col_spec_to_col): Use gettext here.
-	(et_real_construct): Use gettext too.
-	(et_col_spec_to_col): Use gettext here.
-
-	* e-cell-date.c: Use e-i18n.h here.
-
-	* e-table-config.c (config_sort_info_update): Simplify column
-	grabbing code and drop item layout code.
-	(config_group_info_update): ditto.
-
-	* e-table-config.c: Get correct translation setup working.
-
-2001-01-16  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-config.c (configure_sort_dialog): Load frames.
-
-	* Kill e-table-config-field.c
-
-	* e-table-specification.c (e_table_specification_save_to_file):
-	Specify version to xmlNewDoc.
-
-	* e-table-state.c (e_table_state_save_to_string): Specify version
-	to xmlNewDoc.
-
-	* e-table-config.c (config_destroy): Destroy the copies.  Unref
-	the originals. 
-	(e_table_config_construct): Duplicate values of configuration
-	here. 
-	(configure_sort_dialog): New function that populates the sort gtk
-	combo boxes. 
-	
-	* e-table.c (et_col_spec_to_col): Fixup use of title here.  Do the
-	actual translation here. 
-
-	* e-table-column-specification.c: Remove title_, it is now called
-	title.  Translation needs to take place elsewhere, not here
-
-	* e-table-specification.c (e_table_specification_duplicate): Add
-	preconditions here. 
-	(e_table_specification_save_to_node): ditto.
-	(e_table_specification_save_to_string): ditto.
-	(e_table_specification_save_to_file): ditto.
-
-	* e-table-state.c (e_table_state_duplicate): Implement.
-
-	* e-table-config.glade (dialog_sort): Change drop down menus to
-	use GtkComboText widgets.
-	
-	* e-table-config.c (configure_dialog): New function, used to set
-	up dialogs.
-
-2001-01-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-config.c: Added a bit of documentation.
-	(config_sort_config_show, config_group_config_show):
-	gnome_dialog_set_parent on the config->dialog_toplevel instead of
-	the config.
-
-	* e-table-specification: Pass "1.0" instead of NULL to xmlNewDoc
-	here.
-
-	* e-table-state.c, e-table-state.h: Pass "1.0" instead of NULL to
-	xmlNewDoc here.  Make sure that sort_info is never NULL if this
-	object exists.  Added ETableStateDuplicate.
-
-2001-01-15  Miguel de Icaza  <miguel@ximian.com>
-
-	* e-table-config.c (config_fields_info_update): Make output
-	pretier by using newlines when there is a lot of information to
-	display. 
-	(config_group_info_update): ditto.
-	(config_sort_info_update): ditto.
-
-	(config_group_info_update): Simplify
-	signature. 
-	(config_sort_info_update): Simplify signature.
-	(config_fields_info_update): Implement.
-	(e_table_config_construct): Hook up field change spec.
-
-	* e-table-header-item.c (config_destroyed): Add new utility
-	function. 
-
-	* e-table-config.c (config_group_info_update): Simpify routine by
-	using g_string.  Show a message if there is no grouping.
-
-	* e-table-config.c: Made e-table-config dialog be a
-	GnomePropertyBox.
-
-	* e-table-header-item.c (ethi_popup_customize_view): Use the new
-	api.
-
-	* e-table-config.c (config_sort_info_update): Simplify this
-	routine.  Fix bug that was not showing "unsorted" state. 
-	(setup_gui): Load XML user interface here.
-	(config_init): Use Glade instead of manually coded user interface.
-	(e_table_config_raise): New api call.
-
-2001-01-15  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-specification.c: Document all entry points. 
-	(e_table_specification_save_to_file): Change prototype to return
-	the number of bytes written.
-	(e_table_specification_duplicate):
-	Implement a function to duplicate nodes.
-	(e_table_specification_save_to_node): Implement missing function.
-	(e_table_specification_save_to_file): Enable.
-	(e_table_specification_save_to_string): Enable.
-	(e_table_specification_load_from_node): Just load the normal
-	version of the click-to-add-message version, let other code
-	translate it.
-	(e_table_specification_load_from_string): Alter prototype to
-	return success code.
-
-	* e-table-specification.h: Do not store the translated version,
-	store the plain version, so we can restore this later during the
-	saving routines. 
-
-	* e-table.c (et_real_construct): Translate click to add message here.
-
-
-	* e-table-header-item.c: Destroy config object if we are
-	destroyed.
-
-2001-01-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am: Added e-cell-date.c, e-cell-date.h, e-cell-size.c,
-	and e-cell-size.h.
-
-	* e-cell-date.c, e-cell-date.h: New cell to implement displaying a
-	date.
-
-	* e-cell-size.c, e-cell-size.h: New cell to implement displaying a
-	file size.
-
-	* e-cell-text.c, e-cell-text.h: Got rid of the filter arguments.
-	Replaced them with the ability to subclass ECellText and override
-	the get_text method.  Added free_text to override if your get_text
-	implementation returns allocated memory.
-
-	* e-table-extras.c (ete_init): Added "size" and "date" cells to
-	the default ETableExtras.
-
-2001-01-14  Miguel de Icaza  <miguel@ximian.com>
-
-	* e-table-config.h: Change parent to be a GtkObject from
-	GnomeDialog. 
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* e-cell-text.c (key_begins_editing): New function.  Tells whether
-	a key should begin editing.
-	(ect_event, GDK_KEY_PRESS/RELEASE): check whether we should start
-	editing.
-
-	(e_cell_text_set_filter): Implement new function
-	API.  Remove Gtk arguments for this. 
-	(ect_height): Pass all the extra information Dan requested. 
-	(ect_print): Pass all the extra information Dan requested.
-	(build_current_cell): ditto.
-
-	* e-table-header-item.c (ethi_change_sort_state): Moved the
-	sort-on-click logic to its own function.
-
-	* e-table-sort-info.c (e_table_sort_info_freeze): Increment frozen
-	rather than setting to 1.
-	(e_table_sort_info_thaw): Decrement frozen instead of setting to 0
-	to allow recursive freezing.
-	(e_table_sort_info_freeze): Add inline docs.
-	(e_table_sort_info_thaw): Add inline docs.
-
-2001-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.h, e-cell-text.h: Changed the filter function back
-	to being args to be more consistent with the rest of the object.
-
-2001-01-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c, e-table-selection-model.h: Added
-	selection_mode argument.
-
-	* e-table-specification.c, e-table-specification.h: Added a
-	selection_mode field that is set based on the selection-mode
-	attribute in the ETableSpecification element.
-
-	* e-table.c (et_real_construct): Set the selection model's
-	selection mode based on the ETableSpecification.
-
-2001-01-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-click-to-add.c: Made this the same size as an ETableItem
-	with all text items.  Made the background color white.  These need
-	to be made themeable.
-
-2001-01-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-state.c, e-table-state.h: Added expansions field and
-	loading and saving of that field.
-
-	* e-table.c: Load and save expansion data.
-
-2001-01-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-tree-sorted-variable.c, e-tree-sorted-variable.h: Unfinished
-	sorted variable model for ETree.
-
-2001-01-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-sorter.c, e-table-sorter.h (ets_sort): Fixed sorting.
-	needs_sorting was getting set to 0 when sorted happens, but
-	needs_sorting tells you whether or not the sorter is sorted or
-	not, not whether the sorting has happened.  Documented the
-	needs_sorting variable.
-
-2000-12-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c (ect_draw, ect_event): Removed a bunch of unused
-	code.
-
-2000-12-25  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-cell-text.c (ect_show_tooltip): Set draw_background to FALSE.
-
-	* e-table-group-container.c (etgc_add): ditto.
-
-	* e-table-click-to-add.c (etcta_realize): ditto.
-	(e_table_click_to_add_commit): ditto.
-
-2000-12-24  Chris Toshok  <toshok@helixcode.com>
-
-	* e-cell-tree.c: add api docs.
-
-	* e-tree-simple.c: add api docs.
-
-2000-12-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-col.c, e-table-col.h (etc_destroy): Destroy text and
-	pixbuf if they exist whether or not is_pixbuf is set.
-	(e_table_col_new_with_pixbuf): Make new_with_pixbuf take a title
-	argument which is for when you can't display pixmaps.
-
-	* e-table-column-specification.c
-	(e_table_column_specification_load_from_node): Don't translate the
-	pixbuf string attribute.
-
-	* e-table-sort-info.c, e-table-sort-info.h
-	(e_table_sort_info_load_from_node): Added a state_version
-	parameter to the load_from_node function.  This lets the loader
-	specify which version of ETableState is being processed.  If it's
-	less than .05, use the old nested version.  If it's greater, use
-	the new flat version.
-	(e_table_sort_info_save_to_node): Changed this to store a list of
-	group and leaf nodes instead of nesting the group nodes and leaf
-	nodes one inside the other.  This is much easier to understand and
-	requires less typing when creating a new ETableSpecification's
-	initial ETableState.
-
-	* e-table-state.c: Changed the state-version parameter to 0.1.
-	(e_table_state_load_from_node): Use
-	e_xml_get_double_prop_by_name_with_default so that we can specify
-	a state-version default of 0.1 for people writing ETableStates by
-	hand.  Pass the state-version to e_table_sort_info_load_from_node.
-
-	* e-table.c (et_col_spec_to_col): Pass the title from the
-	ETableColumnSpecification to the ETableCol even if it's a pixbuf
-	column.
-
-2000-12-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c (etgc_add): Set the minimum width of
-	newly created children.
-	(e_table_group_container_construct): Use function
-	e_table_header_get_column_by_col_idx instead of
-	e_table_header_get_column since we're passing in a col_idx.
-
-	* e-table-header.c, e-table-header.h: New function
-	e_table_header_get_column_by_col_idx which searches for a column
-	in the ETableHeader with a certain model column (col_idx).
-
-	* e-table-sorted-variable.c (etsv_compare),
-	(etsv_sort), e-table-sorter.c (ets_sort): Use function
-	e_table_header_get_column_by_col_idx instead of
-	e_table_header_get_column since we're passing in a col_idx.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group.h: Removed the set cursor and get
-	cursor methods from ETableGroup.
-
-	* e-table.c (e_table_get_cursor_row, e_table_set_cursor_row):
-	Changed this to use the ETableSelection directly instead of going
-	through the grouping structure.  This seems to fix a bug in
-	evolution's folder list for some people.
-
-2000-12-14  Chris Toshok  <toshok@helixcode.com>
-
-	* e-cell-text.c (ect_show_tooltip): call set_style and use the
-	appropriate style for the text to determine if the tooltip should
-	be shown.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c (eti_realize): Commented out an unused variable
-	to fix a warning.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c (eti_realize): Added eti_visibility_notify.
-	Didn't get it to work properly, so it's #if 0ed out.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c (ect_show_tooltip): Changed the background color
-	of the tooltips to light gray.
-
-	* e-table-item.c (eti_event): Changed the tooltip timeout to 100
-	milliseconds.
-
-2000-12-13  Chris Toshok  <toshok@helixcode.com>
-
-	* e-cell-tree.c (ect_show_tooltip): remove the silly logic - we
-	pop up a tooltip regardless of where the mouse cursor hovers.
-	just make sure it appears in the right place.
-	(ect_event): reverse the change we make to the event after passing
-	it to our subcell.  this fixes the problem of the tree reacting
-	twice to events (once with flags == 0, and once with flags ==
-	E_CELL_EDITING).
-
-	* e-table-item.c (eti_event): destroy the tooltip window on a
-	motion event.  this can (and does) happen when we get a tooltip on
-	a tree cell and the cursor isn't over the area where the tooltip
-	pops up.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-utils.c, e-table-header-utils.h
-	(e_table_header_width_extras): New function to calculate the extra
-	pixels per column header.
-
-	* e-table-header.c, e-table-header.h: Added a "width_extras"
-	argument which is used to calculate the correct minimum widths for
-	each column header after adding padding.
-
-	* e-table-item.c (_do_tooltip): Destroy the old tooltip window
-	when creating the new one.
-	(eti_event): Destroy the old tooltip window if the person presses
-	a key.  Don't handle the tab key.
-
-	* e-table.c (et_state_to_header): Set the ETableHeader's
-	width_extras argument.
-
-2000-12-13  Chris Toshok  <toshok@helixcode.com>
-
-	* e-cell-tree.c (ect_event): only return TRUE in the BUTTON_PRESS
-	case if the node was expandable.
-
-2000-12-13  Chris Toshok  <toshok@helixcode.com>
-
-	* e-table-sorter.c (qsort_callback_complex),
-	(ets_sort_build_subset), (ets_sort_subset),
-	(ets_sort_free_subset), (sort_groups_compare),
-	(ets_sort_by_group): cut&paste from e-table-sorted-variable.c and
-	massage names a bit to make sort group sorting work.
-	(ets_sort): if the ETableModel has sort groups, sort using the
-	sort group.
-
-2000-12-11  Dan Winship  <danw@helixcode.com>
-
-	* e-table-item.c (eti_event): Emit double_click signal with the
-	model column, not the view column.
-
-2000-12-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c (ect_draw): Made selected rows ignore their color
-	specification.
-
-2000-12-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-table-sorted.c (e_table_sorted_new): Unref the object instead
-	of destroying it.
-
-	* e-table-sorted-variable.c (e_table_sorted_variable_new): Likewise.
-
-	* e-table-subset.c (e_table_subset_new): Likewise.
-
-	* e-table-subset-variable.c (e_table_subset_variable_new): Likewise.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c (_blink_scroll_timeout): Split the lines in this
-	cell before testing whether we're to the right of the right edge
-	of the text data (since that test uses the split lines.)
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c (_blink_scroll_timeout): cell should be edit cast
-	to a CurrentCell, not data cast to a CurrentCell.  Fixed this.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Added the actions parameter to ect_event.  Added
-	an actions field to CellEdit.  Handle CellEdit properly in the
-	ect_event function to do grabbing and ungrabbing when
-	appropriate.  Set the actions field in CellEdit when appropriate
-	in e_cell_text_view_command.
-
-	* e-cell-toggle.c, e-cell-tree.c, e-cell.c, e-cell.h: Added a
-	ECellActions enum, a ECellActions actions parameter to
-	e_cell_event and added the actions parameter to all the handlers
-	of the event method including having ECellTree pass it on to its
-	child cell.
-
-	* e-table-header-item.c: Use the NULL cursor instead of the
-	E_CURSORS_ARROW cursor.
-
-	* e-table-item.c, e-table-item.h: Added grabbed_row and
-	grabbed_col fields to ETableItem (-1 on either means ungrabbed.)
-	Pay attention to them in the find_cell function.  Handle the
-	actions parameter of e_cell_event and grab or ungrab the pointer
-	to a given cell if requested.  This is done using the new function
-	eti_e_cell_event (which is internal to e-table-item.c,) instead of
-	the old e_cell_event function call.  Fake an ungrabbed table when
-	calling find_cell from within the compute_location method.
-
-2000-12-08  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-table-col.h: Arranged to get it to work with gtk-doc.
-
-	* e-cell.h: Arranged to get it to work with gtk-doc.
-
-	* doc: Added gtk-doc framework
-
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* e-table-state.c (etst_destroy): If there are columns allocated,
-	free them upon a destroy.
-
-2000-12-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-table-state.c (e_table_state_save_to_string): Free the xmlDoc
-	when we are done with it.
-	(e_table_state_save_to_file): Ditto.
-
-	* e-table.c (e_table_get_state): Unref the state object; why was
-	it being sunk instead?
-	(e_table_save_state): Ditto.
-	(e_table_load_state): Ditto.
-	(e_table_set_state): Ditto.
-
-	* e-table-header-item.c (ethi_destroy): Free the ethi->dnd_code.
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group.h, e-table-item.c, e-table.c,
-	e-table.h: Add column and GdkEvent * parameters to the double
-	click signal.
-
-	* e-table-header-item: Unref the ETableFullHeader when we're done
-	with it.
-
-	* e-table-scrolled.c, e-table-scrolled.h: Remove all of the
-	proxies and add a function e_table_scrolled_get_table and a gtk
-	argument "table".
-
-2000-12-07  Chris Toshok  <toshok@helixcode.com>
-
-	* e-table.c (e_table_set_state_object): set "sort_info" on our
-	sorter when we get a new sort_info to keep things in sync.
-
-	* e-table-sorter.c (ets_set_arg): new function, allowing the
-	setting of "sort_info".
-	(ets_get_arg): new function, allowing the getting of "sort_info".
-	(ets_class_init): fill in GtkObject::set_arg and get_arg.
-	(ets_sort): set ets->needs_sorting to 0 so we don't sort
-	unnecessarily.
-	(e_table_sorter_model_to_sorted): we may have ets->backsorted (and
-	should use it if we do) even if we didn't need to sort.
-	(e_table_sorter_sorted_to_model): same, except ets->sorted.
-
-2000-12-06  Dan Winship  <danw@helixcode.com>
-
-	* e-table.c (e_table_set_state_object): disconnect the
-	"group_info_changed" signal on the old sort_info and connect it to
-	the new one. (Noticed because of a gtk warning in et_destroy, but
-	probably fixes some actual bug(s) too.)
-
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c, e-cell-toggle.c, e-cell-tree.c: Adapted these to
-	accept the new flags parameter to e_cell_event.
-
-	* e-cell.c, e-cell.h: Added a flags parameter to e_cell_event.
-
-	* e-table-item.c: Send all e_cell_event calls a E_CELL_EDITABLE
-	flag.  Add a new e_cell_event to the button press event that
-	happens before selecting the appropriate row and which does not
-	have the E_CELL_EDITABLE flag set.
-
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-utils.c: Fixed warning in compute_elision_length.
-
-	* e-table-header.c, e-table-header.h: Removed
-	e_table_header_selection_ok method here.
-
-2000-12-06  Chris Toshok  <toshok@helixcode.com>
-
-	* e-table-item.c (_do_tooltip): pass along the column's width to
-	e_cell_show_tooltip.
-
-	* e-cell-text.c (ect_show_tooltip): add col_width argument, and
-	set cell.width = col_width - 8 (to mimic what happens in
-	build_current_cell, but with a possibly altered width).
-
-	* e-cell.c (e_cell_show_tooltip): add col_width argument, and pass
-	along to virtual function.
-	(ec_show_tooltip): add col_width argument.
-
-	* e-cell.h: change prototype of e_cell_show_tooltip to include a
-	width parameter.
-
-	* e-cell-tree.c (ect_show_tooltip): send the width - the subcell's
-	offset to e_cell_show_tooltip.
-
-2000-12-05  JP Rosevear  <jpr@helixcode.com>
-
-	* e-tree-model.c (e_tree_model_node_remove): Move the correct
-	offset when memmoving.  Patch provided by Richard Hult 
-	<rhult@hem.passagen.se>.
-
-2000-12-04  Chris Toshok  <toshok@helixcode.com>
-
-	* e-table-selection-model.c (e_table_selection_model_select_all):
-	need to zero out the bits corresponding to the rows not selected
-	in the last full 32 bit mask.  This fixes a crash in the subscribe
-	UI (or potentially anywhere that uses
-	selection_model_select_all/selection_model_foreach.)
-
-2000-12-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	Federico gets into pixel-perfect neurosis.  Xmag is my best friend.
-
-	* e-table-item.c (eti_draw): Set the focus_gc stipple origin to
-	match the upper-left corner of the focus rectangle.  This way
-	focusing will look consistent even among rows/columns with odd
-	pixel sizes.  Also, make the focus rectangle span the whole cell;
-	there was one blank pixel column to the left of the rectangle.
-
-	* e-table-header-utils.c: New file with utilities for drawing
-	header buttons.  This is so that ETableHeaderItem and
-	ETableFieldChooserItem can share the same code.
-	(e_table_header_compute_height): New function to compute the
-	height of a column button.
-	(make_composite_pixmap): New function to composite a pixbuf
-	against a solid background and make a pixmap out of the result.
-	This does some ultra-fancy fading-out of the original pixbuf if
-	the destination area is smaller than the source.
-	(compute_elision_length): New function to compute the elision
-	length in O(n log n) instead of O(n^2), for n = strlen (str).
-	(e_table_header_draw_button): New function to draw a header
-	button.
-	(e_table_draw_elided_string): New function to draw a string elided
-	to a maximum width.
-
-	* e-table-defines.h (HEADER_PADDING): Made the default padding be
-	1; now a header button's height is 
-	content_height + 2 * (HEADER_PADDING + style->ythickness).  This
-	is the correct way to measure button heights.
-
-	* e-table-field-chooser-item.c (etfci_find_button): Use
-	e_table_header_compute_height().
-	(etfci_reflow): Likewise.
-	(etfci_draw): Use e_table_header_draw_button().
-	(etfci_start_drag): Likewise.
-	(etfci_draw): Likewise.
-	(etfci_start_drag): Likewise.
-	(etfci_button_height): Removed function.
-	(draw_button): Removed function.
-
-	* e-table-header-item.c (draw_button): Removed function.
-	(e_table_header_item_get_height): Use e_table_header_compute_height().
-	(ethi_draw): e_table_header_draw_button().
-	(ethi_start_drag): Likewise.
-	(make_shaped_window_from_xpm): Fixed misspelling in function name.
-	(draw_button): Removed function.
-
-	* Makefile.am: Added e-table-header-utils.[ch].
-
-2000-11-25  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-cell.c: Documented.
-
-2000-11-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-col.c: Removed e_table_col_get_arrow and
-	e_table_col_set_arrow.
-
-2000-11-24  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-cell-toggle.c (etog_queue_redraw): Documented. 
-
-	* e-cell-text.c: Removed list of unused arguments.  Add docs. 
-
-	* e-cell-checkbox.c (e_cell_checkbox_new): Add docs.
-
-	* e-table-simple.c (e_table_simple_new): Add docs.
-
-	* e-table-header.c: inline documentation added.
-
-	* e-table-col.c Added inline documentation.
-
-	* e-table-model.c: Added some inline documentation.
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-cell.c (e_cell_event): Do not ignore the return value from
-	ECell::event(); return it instead.
-
-	* e-cell-tree.c (ect_event): Use the return value from e_cell_event().
-	* e-table-item.c (eti_event): Likewise.
-
-2000-11-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c: Changed this to match the new EPopupMenu
-	structre.
-
-2000-11-03  Not Zed  <NotZed@HelixCode.com>
-
-	* e-tree-model.c (e_tree_model_node_insert): Since we insert at
-	the parent->child position, we need to account for expanded nodes
-	above this node to properly calculate the absolute row position of
-	the node.
-	(e_tree_model_node_insert): If we're inserting at the end of this
-	node, then we just use the position directly.
-	(e_tree_model_node_remove): Completely rewritten.  Now we delete
-	all nodes at once, which should be >> faster, unfortunately still
-	have to signal each removal, which is >> SLOW :(  Its still about
-	2-3x faster than it was (for 25K nodes).
-	(child_free): Free all data/subnodes of a given path, no
-	unlinking.
-	(e_tree_model_node_remove): If we are removing a lot of nodes
-	[>1000 or >1/4 total nodes], then use model_changed, rather then
-	removing each node.  Yay.  Now its about 500x faster than it was,
-	for 25K nodes.
-	(etree_pre_change): Signal handler, so we can find out when we are
-	in a pre-change state.
-	(etree_changed): Likewise to find when we have finished.
-	(e_tree_model_construct): Link to the model*changed signals so we
-	know when we are in pre/changed state.
-	(e_tree_model_node_insert): Only perform a row_inserted if not in
-	pre_change state.  Another significant speed improvement (200-500%)
-	on big trees.
-	(e_tree_model_node_remove): Do not emit row_deleted (or
-	model_changed), if we are in the pre_change state.
-	(add_visible_descendents_to_array): Likewise for row_inserted.
-	(e_tree_model_node_sort): And here too, for consistency.
-
-2000-11-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c: Turned on proper handling of insert
-	and delete.
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-config.glade, e-table-config.glade.h: Updated these
-	unused glade files to better match the versions in the code.
-
-	* e-table.c, e-table.h: Added e_table_selected_count and
-	"selection_change" signal.
-
-	* e-tree-model.c: Fixed an out of order 
-
-2000-10-27  Not Zed  <NotZed@HelixCode.com>
-
-	* e-tree-model.c (e_tree_model_node_insert): If we are inserting
-	into the root level, we dont have to search the whole array for a
-	parent node we'll never find.
-
-2000-10-25  Dan Winship  <danw@helixcode.com>
-
-	* e-table-scrolled.c: Add "click" to the list of etable signals we
-	proxy.
-
-2000-10-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Made the column on the right click and click
-	signals be the model column instead of the view column.
-
-2000-10-25  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-model.c (e_tree_model_node_remove): remove the save_id
-	here, so we don't save state for nodes that no longer exist.
-	(etree_destroy): remove the foreach, since all the save_id's
-	should have been removed by now (don't destroy a tree without
-	destroying the root node.)  also, make sure to call
-	g_hash_table_destroy.
-
-2000-10-24  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-model.c: make ETreeModel opaque, and switch from using
-	g_new0 and g_free for ETreePath's to using g_mem_chunk routines.
-	(e_tree_model_node_remove): free the path's save_id.  *
-	(e_tree_model_set_expanded_default): add method to add default
-	expanded status for parent nodes.
-	(etree_set_expanded_recurse): make this more efficient.
-	e-tree-model.h: make ETreeModel opaque.  add prototype for
-	e_tree_model_set_expanded_default.
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Destroy the tooltip timeout on object
-	destruction.
-
-2000-10-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Made it so that it doesn't recalculate all the
-	rows if a row is changed, inserted or deleted.
-
-	* e-table-subset.c: Added debugging code (turned off).
-
-2000-10-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-sorted-variable.c: Made it so that rows inserted with
-	their children nodes already in the tree get placed before their
-	children nodes instead of after.
-
-2000-10-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c, e-table.h: Added e_table_set_state_object which loads
-	the state from the given ETableState object.
-
-2000-10-19  Dan Winship  <danw@helixcode.com>
-
-	* e-table-sorted-variable.c (etsv_destroy): Remove insert_idle
-	timeout.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-state.c: Switched to saving the version as a double
-	instead of a string.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-field-chooser-item.c, e-table-field-chooser-item.h:
-	Fixed ETableFieldChooser row heights a bit.
-
-	* e-table-header-item.c: Formatting clean up.
-
-	* e-table-state.c: Added saving of the version of the ETableState.
-	This way, if we change the format of an ETableState, we can detect
-	old version numbers.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Make text a different color if !(flags &
-	E_CELL_FOCUSED).
-
-	* e-cell.h: Added E_CELL_FOCUSED to flags.
-
-	* e-table-item.c: Changed the background color of selected cells
-	if the widget is focused.  Send E_CELL_FOCUSED to flags if the
-	widget is focused.
-
-	* e-table.c: Repaint the window if focus changes.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-subset.c, e-table-subset.h: Sped up signal propogation.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Fixed the color of the background rectangle.  Made
-	the rectangle start at the bottom of the table so that the row
-	lines are still there.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Make background color of ETable match the background
-	color of item rows.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-field-chooser-dialog.h: Removed an unnecessary glade
-	include file.
-
-	* e-table-field-chooser.c: Make sure that glade is initialized.
-
-	* e-table.c, e-table.h: Added a white background to the ETable.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Moved the glade file directories.
-
-	* e-table-header-item.c: Removed an unused variable.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* e-table-header-item.c (e_table_header_item_get_height): New function
-	that works out the height of the header from the max height of the 
-	buttons.
-	(ethi_add_table_header): Recalc the height of the header.
-	(ethi_font_set): Ditto.
-	(draw_button): Only draw the arrow if there's enough room.
-
-2000-10-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c: Reworked some of the height stuff?
-
-2000-10-15  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Made it so that ETable won't use a state with 0
-	columns.
-
-2000-10-15  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-model.c (e_tree_model_node_traverse): get the next child
-	before traversing/calling func.
-
-2000-10-15  Chris Toshok  <toshok@helixcode.com>
-	
-	* e-tree-model.c: get rid of ENode type, as everything in it is
-	now in ETreePath, and add parent/sibling/child pointers to
-	ETreePath.  everywhere where GNode/ENode were used, we just use
-	ETreePath now.
-	(e_tree_path_depth): new function.
-	(e_tree_path_insert): new function.
-	(e_tree_path_unlink): new function.
-	(e_tree_model_node_traverse): new function.
-	(etree_get_first_child): new virtual function impl.
-	(etree_get_last_child): same.
-	(e_tree_model_class_init): fill in function pointers for
-	get_first_child/get_last_child.
-	(e_tree_model_node_get_first_child): new function.
-	(e_tree_model_node_get_last_child): new function.
-	(e_tree_model_node_depth): g_node_depth -> e_tree_path_depth.
-	(e_tree_model_node_insert): modify to use ETreePath and new
-	e_tree_path functions.  Prepends and appends are now both constant
-	time.
-	(child_remove): modify for e_tree_model_node_traverse.
-	(e_tree_model_node_remove): same, and use e_tree_path functions.
-	(e_tree_model_node_insert_before): add a loop here to figure out
-	the position, since it's the only place we care about the child
-	position.
-	(e_tree_model_node_sort): rework to accomodate new e_tree_path
-	functions, and put the e_tree_model_node_set_expanded calls in a
-	separate loop after all the children have been added.
-
-	* e-tree-model.h: add prototypes and virtual functions for more
-	tree traversal operations (get_first_child, get_last_child), as
-	well as a new function to traverse depth first the descendents of
-	a node (e_tree_model_node_traverse), much like g_node_traverse
-	(G_IN_ORDER).  Also, ETreePath is an opaque type now, and is not a
-	GNode.
-	
-
-2000-10-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-table-state.c (e_table_state_save_to_file): NULL is not a
-	valid argument to `xmlNewDoc'.  Was this code ever tested?
-
-2000-10-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-example-1.c, e-table-example-2.c, e-table-size-test.c,
-	test-table.c: Fixed these to use the new ascending attribute as a
-	boolean instead of an int.
-
-	* e-table-sort-info.c: Changed the ascending attribute to a
-	boolean ("true"/"false") instead of an int (1/0).
-
-2000-10-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-table-config-field.c and
-	e-table-config-field.h.
-
-	* e-table-column-specification.c: Cleaned this up a bit.  Made it
-	leak less memory.
-
-	* e-table-config-field.c, e-table-config-field.h: New files.
-	This is the configuration widgets for sorting or grouping.
-
-	* e-table-config.c, e-table-config.h: Nuked these and replaced
-	them with a widget that handles all the ETable configuration.
-
-	* e-table-config.glade, e-table-config.glade.h: Updated this a bit
-	to match what's actually being used better.  This isn't used in
-	actual code.
-
-	* e-table-header-item.c, e-table-header-item.h: Added a pointer to
-	the table in the header item structure so that we can launch the
-	configuration from the header item right click menu.  Made the
-	header item launch the ETable configuration dialog.
-
-	* e-table.c, e-table.h: Keep the spec given to us around.  Added a
-	get_state_object function which returns an ETableState *.  Set the
-	"table" argument on the header item.
-
-2000-10-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-table-item.c: when there are 0 columns, don't assert.
-
-2000-10-12  Iain Holmes  <iain@helixcode.com>
-
-	* e-cell-text.c (ect_new_view): Ref the style font.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Make saving state work properly.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-specification.c: Fixed the parity on the cursor-mode
-	check.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c, e-cell-text.h, e-cell-tree.c, e-cell-tree.h: Got
-	rid of the model parameter to e_cell_text_new and e_cell_tree_new
-	as they aren't used.
-
-	* e-table-extras.c: Added default "integer" compare and default
-	"tree-string", "string", and "checkbox" cells.
-
-	* e-table.c: Made this use the draw-grid, cursor-mode, and
-	_click-to-add-message fields from the xml.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* spec.xml: Example spec file.  Not used.  Just an example of what
-	you can do.
-
-	* Makefile.am: Added e-table-column-specification.c,
-	e-table-column-specification.h, e-table-extras.c,
-	e-table-extras.h, e-table-specification.c,
-	e-table-specification.h, e-table-state.c, and e-table-state.h.
-	Removed some duplicated .h files.
-
-	* e-cell-tree.c: Ref, sink, and unref the subcell instead of destroying
-	it when done.
-
-	* e-table-column-specification.c, e-table-column-specification.h:
-	New class which describes a column without having a table get
-	instantiated.
-
-	* e-table-config.c: Changed get_specification to get_state to get
-	this to compile.
-
-	* e-table-defines.h, e-table-item.h: Moved the definition of
-	ETableCursorMode from e-table-item.h to e-table-defines.h.
-
-	* e-table-extras.c, e-table-extras.h: New class which acts as a
-	set of 3 hash tables.  All from char * and to alternately, ECells,
-	GCompareFuncs, and GdkPxibufs.
-
-	* e-table-scrolled.c, e-table-scrolled.h: Changed this to match
-	the new ETable function declarations.
-
-	* e-table-sort-info.c, e-table-sort-info.h: Added functions for
-	saving to and loading from xml.
-
-	* e-table-specification.c, e-table-specification.h: New class
-	which describes a table without having to instantiate it.
-
-	* e-table-state.c, e-table-state.h: New class which describes the
-	state of a table without having to instantiate the table.
-
-	* e-table.c, e-table.h: Changed this to accept both a state and a
-	specification instead of just a specification.  You then save only
-	the state.  The specification stays exactly the same.  Also, you
-	no longer need to pass in an ETableHeader.  Most of the
-	information contained in the ETableHeader are in the
-	specification.  However you may need to translate some of the
-	strings in the specification to objects.  If you need anything
-	other than the builtin choices, you need to create an ETableExtras
-	and pass it in.
-
-	* e-tree-model.c: Removed an unused variable.
-
-2000-10-10  Iain Holmes  <iain@helixcode.com>
-
-	* e-table-header-item.c (draw_button): Only draw the arrow if
-	there is room for it and the pixbuf.
-
-2000-10-06  Not Zed  <NotZed@HelixCode.com>
-
-	* e-table-item.c (eti_header_structure_changed): Removed the
-	assertion that there must be at least 1 column.  No way to remove
-	all columns otherwise (which the header allows).
-
-	* e-table.c (et_xml_config_header): Reconfigure header based on
-	xml nodes for header.
-	(et_real_set_specification): Just configure the header only, dont
-	try to recreate everything.
-
-2000-10-05  Zach Frey  <zfrey@lanich.com>
-
-	* Makefile.am: Fix make distcheck.
-
-2000-10-05  Not Zed  <NotZed@HelixCode.com>
-
-	* e-table-scrolled.c (e_table_scrolled_set_specification): Set the
-	spec on a scrolled etable.
-	(e_table_scrolled_load_specification): Likewise for load.
-
-	* e-table.c (et_real_set_specification): Allow you to set the
-	specification after the widget was created.
-	(et_real_construct): Changed to use et_real_set_specification to
-	set the spec.
-	(e_table_load_specification): New frunction, load the
-	speficication from a specific file.
-	(e_table_set_specification): NEw function to set the specification
-	from a string.
-
-2000-10-04  Not Zed  <NotZed@HelixCode.com>
-
-	* e-table-sorted-variable.c (etsv_add): Changed to take into
-	account the sort group, if the table has one.x
-	(etsv_insert_idle): Clear the insert count if we hit an idle loop.
-	(etsv_sort_idle): Reset the insert count if we perform a sort.
-	(etsv_add): If we are adding a lot (>ETSV_INSERT_MAX) items,
-	without hitting an idle loop, assume we're better off performing a
-	sort instead.  Use another idle handler to reset the count.
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-table-selection-model.c
-	(e_table_selection_model_invert_selection): Emit the
-	selection/cursor "changed" signals.
-	(e_table_selection_model_select_all): Same.
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-table-selection-model.c (e_table_selection_model_select_all):
-	Select all elements of the etable.
-	(e_table_selection_model_invert_selection): Invert the current
-	selection.
-
-	* e-table.c (e_table_select_all): New convenience function to
-	select all elements in an e-table.
-	(e_table_invert_selection): New convenience function to invert the
-	current selection in an e-table.
-
-2000-10-03  Not Zed  <NotZed@HelixCode.com>
-
-	* e-table-sorted-variable.c (etsv_sort_by_group): Sort based on
-	the sort_group stuff.
-
-	* e-tree-model.c (e_tree_init): Setup the group sort info string.
-	(etree_destroy): And free it.
-	(build_sort_group): Build a string for this node.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-model.h: change/add prototypes and a typedef for
-	ETreePathCompareFunc.
-
-	* e-tree-model.c (e_tree_model_node_set_compare_function): new
-	function, used to set the comparison function for sorted nodes.
-	Eventually sorting entail just calling this function, with the
-	tree maintaining the sort.
-	
-	(e_tree_model_node_sort): use a helper function
-	(e_tree_model_node_compare) to allow the e-tree user's comparison
-	function to take mode reasonable paramaters.  also, fix it so the
-	previous expanded state is kept with the node.  i can't believe i
-	wrote it the way it originally was.  also, don't take the
-	comparison function here.  it's set in
-	e_tree_model_node_set_compare_function.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-model.c (e_tree_model_node_sort): don't screw things up
-	if we sort a collapsed node.
-	
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* tree-unexpanded.xpm: flip black and gray, the way i intended them to be.
-	
-	* tree-expanded.xpm: same.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* tree-expanded.xpm: reinstate file.
-
-	* tree-unexpanded.xpm: same.
-	
-	* e-tree-example-1.c (main): remove calls to e_cursor_*, and don't
-	create pixbufs.  let's the tree give us the defaults.
-
-	* e-tree-model.c (e_tree_model_node_changed): call
-	e_table_model_row_changed on the node's row (if it's visible).
-	(e_tree_model_node_inserted): call e_table_model_row_inserted on
-	the new node's row, if it's visible.
-	(e_tree_model_node_removed): call e_table_model_row_removed on the
-	old node's row, if it was visible.
-
-	* e-cell-tree.c (e_cell_tree_construct): allow open_pixbuf and
-	closed_pixbuf to be NULL, and default them to the xpm data in
-	rtee-{un}expanded.xpm.
-	(ect_destroy): call gdk_pixbuf_unref on our open/closed pixbufs.
-
-	* tree-expanded.xpm, tree-unexpanded.xpm: make the + and - a
-	little lighter than straight black.
-
-Fri Sep 29 10:05:58 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.dia: Changed.
-
-Thu Sep 28 20:01:53 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.dia: New file.  Approximate UML description of ETable.
-
-2000-09-29  Not Zed  <NotZed@HelixCode.com>
-
-	* e-cell-tree.c (e_cell_tree_get_node): Changed to take the source
-	model, not the tree model.  The source model may be a subset, and
-	it needs to remap the rows for us.
-	(ect_draw): 
-	(ect_event): 
-	(ect_max_width): 
-	(ect_print): Changed callers.
-
-	* e-table-sorted-variable.c (etsv_sort_subset): 
-	(etsv_sort_build_subset): 
-	(etsv_sort_free_subset): Functions to perfom grouping of sorts for
-	sorts that have row_sort_group returning useful info.
-	(etsv_sort): Use the complex sort routines if we need to.
-
-	* e-table-model.c (e_table_model_row_sort_group): Return a sort-id
-	for a given row.
-	(e_table_model_has_sort_group): Return if the sort-id provides any
-	useful information.
-
-Tue Oct  3 18:28:09 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-config.glade, e-table-config.glade.h: Put in 3 more
-	dialog boxes in these files.
-
-2000-09-27  Iain Holmes  <iain@helixcode.com>
-
-	* e-cell-text.c: Fudge the location of a click in the tooltip, so
-	that it selects the current cell.
-	Pass keyboard events to the e-table.
-
-	* e-table-item.c: Don't show the tooltip if the cell is being editted.
-	Also don't destroy the tooltip until the button release event (other
-	wise the e-table-item starts a select)
-
-2000-09-26  Chris Toshok  <toshok@helixcode.com>
-
-	* gal/e-table/e-table.c (e_table_setup_table): drag/drop signals need to be
-	added to the same object that is passed to gtk_drag_begin in
-	e_table_drag_begin.  namely, the ETable.
-	(et_drag_data_received): fix typo - should emit
-	TABLE_DRAG_DATA_RECEIVED, not TABLE_DRAG_MOTION.
-
-2000-09-25  Iain Holmes  <iain@helixcode.com>
-
-	* e-table-header-item.c (draw_button): Calculate the vertical
-	offset correctly to centre text.
-
-2000-09-25  Iain Holmes  <iain@helixcode.com>
-
-	* e-table-header-item.c (ethi_popup_best_fit): Fill this out
-	to call the "request_width" signal and set the new size.
-
-2000-09-25  Chris Toshok  <toshok@helixcode.com>
-
-	* gal/e-table/e-tree-model.h: add save_state stuff to ETreeModel, and
-	prototypes for the public methods.
-
-	* gal/e-table/e-tree-model.c: add save_id to the ENode.
-	(expanded_remove_func): new function, iterator to delete the save
-	id's.
-	(etree_destroy): iterate over expanded_state.
-	(etree_set_expanded): if the node has a save id, make sure to
-	update both the collapsed and expanded counts.
-	(e_tree_model_node_insert_id): convenience function that inserts a
-	node and sets its id.
-	(e_tree_model_node_sort): remove extra spew.
-	(save_expanded_state_func): new function, iterator for saving
-	expanded state.
-	(e_tree_model_save_expanded_state): new function.
-	(get_string_value): helper function for loading.
-	(e_tree_model_load_expanded_state): new function.
-	(e_tree_model_node_set_save_id): sets the save id for a node,
-	adding it to the hashtable if it's not already there.  if the id
-	was there previously, set the expanded flag of the node
-	accordingly.
-
-2000-09-24  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Put `$(top_srcdir)' on top so that we
-	include our own headers before the installed ones.  Also add
-	`$(top_srcdir)/gal'.
-
-2000-09-24  Chris Toshok  <toshok@helixcode.com>
-
-	* gal/e-table/e-tree-model.c (e_tree_model_node_sort): fix sorting - need to
-	update the row_array as well as the actual structure of the
-	GNodes.
-
-2000-09-24  Ariel Rios <ariel@arcavia.com>
-
-	* e-tree-model.c: Fix include typo.
-
-2000-09-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Typo caused readability problems with ETable.
-
-2000-09-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* test-table.c:
-	* test-cols.c:
-	* test-check.c:
-	* table-test.c:
-	* e-tree-simple.c:
-	* e-tree-simple.h:
-	* e-tree-model.c:
-	* e-tree-model.h:
-	* e-tree-example-2.c:
-	* e-tree-example-1.c:
-	* e-table.c:
-	* e-table.h:
-	* e-table-text-model.h:
-	* e-table-subset.c:
-	* e-table-subset.h:
-	* e-table-subset-variable.c:
-	* e-table-subset-variable.h:
-	* e-table-sorter.h:
-	* e-table-sorted.c:
-	* e-table-sorted.h:
-	* e-table-sorted-variable.c:
-	* e-table-sorted-variable.h:
-	* e-table-sort-info.c:
-	* e-table-size-test.c:
-	* e-table-simple.h:
-	* e-table-selection-model.c:
-	* e-table-selection-model.h:
-	* e-table-scrolled.h:
-	* e-table-one.h:
-	* e-table-item.c:
-	* e-table-item.h:
-	* e-table-header.h:
-	* e-table-header-item.c:
-	* e-table-header-item.h:
-	* e-table-group.c:
-	* e-table-group.h:
-	* e-table-group-leaf.c:
-	* e-table-group-leaf.h:
-	* e-table-group-container.c:
-	* e-table-group-container.h:
-	* e-table-field-chooser.c:
-	* e-table-field-chooser.c:
-	* e-table-field-chooser-item.c:
-	* e-table-field-chooser-item.h:
-	* e-table-field-chooser-dialog.c:
-	* e-table-field-chooser-dialog.h:
-	* e-table-example-2.c:
-	* e-table-example-1.c:
-	* e-table-config.c:
-	* e-table-col.c:
-	* e-table-col.h:
-	* e-table-click-to-add.c:
-	* e-table-click-to-add.h:
-	* e-cell.c:
-	* e-cell.h:
-	* e-cell-tree.c:
-	* e-cell-tree.h:
-	* e-cell-toggle.c:
-	* e-cell-toggle.h:
-	* e-cell-text.c:
-	* e-cell-text.h:
-	* e-cell-checkbox.h: Fix includes.
-
-	* Makefile.am (INCLUDES): Fix header paths.
-
-2000-09-17  Iain Holmes  <iain@helixcode.com>
-
-	* e-table-item.c: Better calculations for tooltip
-	positionings.
-
-	* e-cell-text.c: Same.
-
-	* e-cell-tree.c: Same.
-
-2000-09-16  Iain Holmes  <iain@helixcode.com>
-
-	* e-cell-text.c (ect_show_tooltip): Removed g_print.
-
-2000-09-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Added some missing #includes.
-
-	* e-cell-tree.c: Removed an unused variable.
-
-	* e-table-item.c: Added some missing casts.
-
-2000-09-15  Iain Holmes  <iain@helixcode.com>
-
-	* e-cell-tree.c (ect_show_tooltip): If the cursor is inside
-	the subcell, call the show_tooltip on it.
-
-	* e-table-header-item.c (draw_button): Draw the arrow first,
-	then take it's size into account when calculating how to draw
-	the text. Use ellipsis if the text it too long.
-
-2000-09-15  Iain Holmes  <iain@helixcode.com>
-
-	* e-table-header-item.c (draw_button): Fix a crash by passing
-	the canvas widget to gtk_paint_box. Reported by Radek.
-
-2000-09-14  Peter Williams  <peter@beta.newton.cx>
-
-	* e-cell-text.c (ect_draw): Typo fix.
-
-2000-09-14  Iain Holmes  <iain@helixcode.com>
-
-	* e-table-header-item.c (set_cursor): The column isn't resizable
-	if it is the last, or if all other columns after it are not
-	resizable.
-
-	* e-cell-text.c (ect_max_width): Correctly calculate the width
-	of the line of text. Unbuild the current cell and unref the lines
-	as well.
-	(build_current_cell): Initialize cell->style to 0;
-
-2000-09-14  Iain Holmes  <iain@helixcode.com>
-
-	* e-table-item.c: Start timers for the tooltip to appear, on motion
-	events.
-
-	* e-cell.[ch]: Add a new show_tooltip method.
-
-	* e-cell-text.c (ect_show_tooltip): Show the tooltip.
-
-2000-09-11  Iain Holmes  <iain@helixcode.com>
-
-	* e-table-header-item.c (ethi_maybe_start_drag): Set maybe_drag
-	to FALSE. Seems to fix a crash for me.
-	(ethi_event): Handle the double click on the dividers.
-
-	* e-table-header.c (e_table_header_class_init): Add a
-	"request_width" signal.
-
-	* e-table-item.c (eti_add_header_model): Connect to the
-	"request_width" signal.
-	(eti_request_column_width): Call the e_cell_max_width on the
-	appropriate column.
-
-	* e-cell.c (e_cell_max_width): Call the max_width method.
-
-	* e-cell-text.c (ect_max_width): Calculate the max width.
-
-	* e-cell-toggle.c (etog_max_width): Calculate the max width.
-
-	* e-cell-tree.c (ect_max_width): Same.
-
-2000-09-11  Iain Holmes  <iain@helixcode.com>
-
-	* e-table-header-item.c (ethi_drag_motion): Check if the
-	type of the dragged item is a etable header item.
-
-2000-09-11  Iain Holmes  <iain@helixcode.com>
-
-	* e-table-header-item.c (set_cursor): Check if the column
-	is resizeable before setting the cursor to E_CURSOR_SIZE_X
-
-2000-09-11  Iain Holmes  <iain@helixcode.com>
-
-	* e-table-header-item.c: Use the font and button drawing
-	from the theme.
-
-	* e-table.c: Use the height of the font to set the size for
-	the header_canvas, instead of hard coding it to 16
-
-2000-09-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (tree_example_2_LDADD): Add `$(GNOME_VFS_LIBS)' and
-	`$(OAF_LIBS)'.
-	(INCLUDES): Add `$(GNOME_VFS_CFLAGS)' and
-	`$(GNOME_BONOBO_CFLAGS)'.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Made bold text calculate widths properly.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Made page up and page down active in the ETable.
-
-2000-09-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-tree-simple.c: Fixed the ETableModel callbacks.
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-tree-example-1.c: Added base ETableModel functions.
-
-	* e-tree-example-2.c: Added base ETableModel functions.  Made it
-	never return NULL as a string, instead return "".
-
-	* e-tree-simple.c, e-tree-simple.h: Require base ETableModel
-	functions.
-
-2000-09-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c, e-table.c: Fixed a leak and a double unref.
-
-2000-09-01  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-example-2.c: new test, a home grown 2 hour hack of a file
-	browser.  uses node_collapsed/emitted signals to populate the left
-	tree.
-
-	* Makefile.am: add tree-example-2.c stuff.
-
-	* .cvsignore: add tree-example-2
-
-2000-09-01  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-model.h: add signals/prototypes for
-	e_tree_model_node_collapsed and e_tree_model_node_expanded.
-
-	* e-tree-model.c (etree_set_expanded): emit
-	node_expanded/node_collapsed signals, with node_expanded happening
-	before the expansion so it can much with the children, and
-	collapsed being emitted after.
-	(e_tree_model_row_of_node): remove stupid check, and g_warning.
-	(e_tree_model_node_collapsed): new function.
-	(e_tree_model_node_expanded): new function.
-
-2000-08-31  Richard Hult  <rhult@codefactory.se>
-
-	* e-tree-example-1.c (create_tree):  Don't show the root node.
-	Also quit when the window is closed.
-	(my_icon_at): Don't use icons here since the cell tree renderer takes
-	care of the +/- signs itself. This stops the tree example from showing
-	two sets of expand/unexpand icons at every node.
-
-2000-08-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c: Made the selection work when shift
-	clicking on the first row of the table.
-
-2000-08-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-table.c (et_destroy): Don't try to destroy the `header_canvas'
-	if NULL.
-
-	* e-table-group-leaf.c (etgl_set_cursor_row): If the item is NULL,
-	don't try to set the cursor row for it.
-
-	* e-table.c (set_scroll_adjustments): Don't set the adjustment for
-	the `header_canvas' unless the `header_canvas' is not NULL.
-
-	* e-tree-model.c (e_tree_model_row_of_node): If the node is the
-	root, just return -1 without emitting a warning.
-
-2000-08-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c: Make printing of groups work better
-	and make them print headers.
-
-	* e-table-item.c: Turn off alternating row support.
-
-2000-08-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-col.c, e-table-config.c, e-table-header.c,
-	e-table-text-model.c: Added some g_return_if_fails and
-	g_return_val_if_fails.
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Fix an off by one error that was causing crashes.
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Set default values for all of the signal emissions.
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c: Check for selection->selection being
-	NULL in e_table_selection_model_selected_count.
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Pay attention to the return value from the click
-	signal.
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group.h, e-table-item.c, e-table-item.h,
-	e-table.c, e-table.h: Added a click signal which gets sent if the
-	user hits the left or middle mouse button on a cell.
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-scrolled.c, e-table-scrolled.h, e-table.c: Added
-	g_return_if_fails.
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c, e-cell-toggle.c, e-cell-tree.c, e-cell.c,
-	e-cell.h, e-table-col.c, e-table-col.h, e-table-item.c: Added
-	infrastructure for setting the justification of columns.  Still
-	need to change the cells to support it and need to add user
-	interface to change the justification.
-
-2000-08-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-subset-variable.c: Fixed a bug in
-	e_table_subset_variable_increment that causes problems with
-	ETree's.  Specifically, when you incremented at position x, the
-	row x didn't get incremented as it should (s/>/>=/.)
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c, e-cell-toggle.c, e-cell-tree.c, e-table-item.c:
-	Moved drawing of the cell backgrounds from ECell into ETableItem.
-
-	* e-tree-model.c: Include stdlib.c.
-
-2000-08-21  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-cell-text.c: Changed UTF-8 syntax from char based to byte based
-
-2000-08-22  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (icons): remove tree-expanded.xpm and
-	tree-unexpanded.xpm.
-
-	* e-tree-example-1.c: use art/tree-expanded.xpm and
-	art/tree-unexpanded.xpm.
-	(remove_node): commit the change listed below (08-21).
-
-	* tree-expanded.xpm: removed.
-
-	* tree-unexpanded.xpm: removed.
-
-2000-08-21  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-cell-text.c (ect_event): Use e_utf8_from_gtk_event_key to translate
-	GDK_KEY_PRESS event to insertable UTF-8 string
-
-2000-08-21  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-example-1.c (remove_node): we can remove nodes with
-	children now.
-
-	* e-tree-model.h: add prototype for e_tree_model_node_sort.
-
-	* e-tree-model.c (etree_set_expanded): if the node is invisible,
-	just set its expanded flag and return.
-	(e_tree_model_root_node_set_visible): call set_expanded before we
-	remove it from the row array or else the aforementioned change
-	will result in nothing happening.
-	(e_tree_model_node_insert): use a position of -1 as "append".
-	(e_tree_model_node_insert): if the model was marked with
-	root_visible == FALSE, make sure to set it's expanded flag to TRUE
-	when the root node is inserted.
-	(e_tree_model_node_sort): new function.
-
-2000-08-21  Chris Toshok  <toshok@helixcode.com>
-
-	* e-table.c (e_table_drag_source_set): pass table, not site as the
-	closure for these drag signals, since e_table_drag_source_event_cb
-	assumes it's the table.
-
-2000-08-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c, e-table-selection-model.h: Added
-	e_table_selection_model_selected_count.
-
-2000-08-19  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-cell-text.c: Use EFont wrapper
-	Use UTF-8 strings
-
-2000-08-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Made background colors alternate.
-
-	* e-table-click-to-add.c: Made tabbing off the right edge of the
-	click to add commit the new values.
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group.h, e-table-sorted-variable.c,
-	e-table-subset-variable.c, e-table-subset-variable.h: Added a
-	decrement method.  Made the add and remove methods not
-	automatically increment and decrement.
-
-	* e-table-item.c: Fixed some view vs model issues for both rows
-	and columns.
-
-	* e-table-model.c: Added debugging code.  Removed automatic
-	signalling of changes by the ETableModel set_value_at function
-	(the model should send these signals itself.)
-
-	* e-table.c: Added increment and decrement calls when a row is
-	removed or added from the source model.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c, e-table-selection-model.c,
-	e-table-selection-model.h: Make right click select if the current
-	row is not selected.
-
-2000-08-08  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-table-header-item.c: Tag some strings for translation.
-
-2000-08-05  Dan Winship  <danw@helixcode.com>
-
-	* e-table.c (e_table_get_{next,prev}_row_sorted): fix
-
-2000-08-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Added a function to get the next row with sorting
-	taken into account.
-
-2000-08-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-sorter.c: Made it so that selection ranges work even if
-	the table is using grouping.
-
-2000-08-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am, e-table-selection-model.c,
-	e-table-selection-model.h, e-table.c, e-table.h: Made selection
-	ranges work even if the table is sorted.
-
-	* e-table-sorter.c, e-table-sorter.h: New files to help with
-	making selection ranges work even if sorted.
-
-2000-08-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c, e-table.h: Added functions to convert from view row
-	to model row or from model row to view row.  Also changed
-	e_table_set_cursor_row and e_table_get_cursor_row to take a model
-	row as this works better with the rest of the model.  Changed the
-	name of e_table_get_next_row_sorted and
-	e_table_get_prev_row_sorted.  (Dropped the _sorted.)
-
-2000-08-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c, e-table.h: Built code to have autodrags only work
-	from within the table and to report the row dragged from
-	automatically.
-
-2000-08-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group.h, e-table-item.c, e-table-item.h:
-	Made drag events calculate a row and column and signal that
-	information.
-
-	* e-table-selection-model.c, e-table-selection-model.h: Changed
-	do_something to take a GdkModifierType.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c, e-table-item.h: Add a handler for
-	"model_pre_change" and properly stop editing.
-
-	* e-table-model.c, e-table-model.h: Added a "model_pre_change"
-	signal that gets sent before any row numbers are changed.
-
-	* e-table-sorted-variable.c, e-table-subset-variable.c: Emit
-	"model_pre_change" signals as appropriate.
-
-	* e-table-subset.c, e-table-subset.h: Proxy "model_pre_changed"
-	signals.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-model.c, e-table-model.h: Changed the API for the
-	append_row function.  Now accepts a model to copy data from
-	instead of returning a row number and leaving it up to ETableOne
-	to copy the data in.
-
-	* e-table-one.c, e-table-one.h: Adapted to use new append_row API.
-
-	* e-table-simple.c, e-table-simple.h, e-table-subset.c: Adapted to
-	supply new append_row API.
-
-2000-07-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-col.c, e-table-col.h: Added an argument to set a column
-	so that you can't sort by that column.
-
-	* e-table-header-item.c: Obey the sortable column of ETableCol.
-
-2000-07-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-click-to-add.c: Made enter key destroy and recreate the
-	ETableItem.
-
-	* e-table-item.c: Grab focus when person clicks even if cursor
-	isn't changing.
-
-2000-07-28  Dan Winship  <danw@helixcode.com>
-
-	* e-table-header.c (eth_destroy): Remove the idle handler before
-	destroying the data it operates on.
-
-2000-07-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Fixed up the table behavior so that it's not
-	always in an edit mode.
-
-2000-07-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c: Added a comment.
-
-2000-07-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c: Fixed shift click selections.
-
-2000-07-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c: Allocate correctly in the insert and
-	delete methods.
-
-	* e-table-click-to-add.c: Removed the line that was causing this
-	to do bad things.
-
-2000-07-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c (eti_cursor_change): Grab focus properly.
-
-	* e-table-item.c, e-table-click-to-add.c: Fixed ETableClickToAdd
-	to handle carriage return.  This still doesn't quite work right.
-
-2000-07-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-click-to-add.c: Clear the selection model when
-	activating.
-
-	* e-table-item.c: Fixed a bunch of model column vs. view column
-	issues.
-
-	* e-table-selection-model.c: Set the cursor to -1, -1 and emi a
-	"cursor_changed" signal.
-
-2000-07-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-click-to-add.c: Fixed a reference.
-
-	* e-table-selection-model.c, e-table-selection-model.h: Added a
-	clear function.
-
-	* e-table.c, e-table.h: Made going from click to add to the main
-	table and back work better.
-
-2000-07-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-click-to-add.c, e-table-click-to-add.h: Added an
-	ETableSelectionModel so this won't crash.
-
-2000-07-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Fixed the model/view row confusion.
-
-	* e-table-selection-model.c: Changed one expression to use a
-	#define properly.
-
-2000-07-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-container.h,
-	e-table-group-leaf.c, e-table-group-leaf.h: Added "table_selection_model"
-	argument.  Removed foreach function and selection notification.
-
-	* e-table-group.c, e-table-group.h: Removed foreach function and
-	selection notification.
-
-	* e-table-header.c: Fixed header width calculation to include the
-	last column.
-
-	* e-table-item.c, e-table-item.h: Fixed this to use the new
-	selection model.
-
-	* e-table-scrolled.c, e-table-scrolled.h: Removed selection
-	notification.
-
-	* e-table-selection-model.c, e-table-selection-model.h: Finished
-	notification signals and fixed a bunch of bit manipulations.
-	Implemented do_something method.
-
-	* e-table.c, e-table.h: Create an ETableSelectionModel and use it
-	properly.
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c: Made foreach call the callback in top
-	to bottom order.
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c, e-table-selection-model.h: Replaced
-	get_selection_list with foreach.
-
-	* e-table.h: Add a ETableSelectionModel.
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-table-selection-model.c and
-	e-table-selection-model.h.
-
-	* e-table-selection-model.c: Added the get_selection_list and
-	is_row_selected functions.  Removed some unused code.
-
-	* e-table-selection-model.h: Removed some unused code.
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c: Added comments to the bit field code.
-
-	* e-table-selection-model.h: Made the selection data guint32s.
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c: More fixes.
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c: Fixed up the bit manipulation a bit
-	here.
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-selection-model.c, e-table-selection-model.h: New files
-	for doing a selection model.  Not finished yet and thus not in
-	Makefile.am.
-
-	* e-table.c, e-table.h: Renamed the new dnd signals so that they
-	won't conflict with the widget signals.
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c, e-table.h: Implemented some of the drag & drop code.
-	Drops all report as being on row 0, col 0.  Also, automatic drags
-	don't set the row and column being dragged from.
-
-2000-07-23  Damon Chaplin  <damon@helixcode.com>
-
-	* e-cell-text.c: added a color_column where the color can be specified
-	as a string, e.g. "red" or "rgb:F/0/0".
-
-	* e-cell-text.c (ect_leave_edit): don't call unbuild_current_cell()
-	since the CellEdit struct has been freed in ect_stop_editing() and so
-	has the text.
-
-	* e-cell-text.c (unbuild_current_cell): set cell->text to NULL to make
-	sure we	don't try to free it again.
-
-2000-07-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.h: Added some unused declarations for drag and drop
-	work.
-
-2000-07-18  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-tree-model.c (etree_destroy): Call our parent's destroy
-	method.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c: Changed e_popup_menu_run call to match
-	the new arguments.
-
-2000-07-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-table-subset.c (etss_destroy): g_free things we g_malloc.
-
-2000-07-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c: Changed the background color of the
-	header.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c: Made scroll wheel work properly in
-	header.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-table.c (set_scroll_adjustments): Be safe if @vadjustment is
-	NULL.
-
-	* e-table-scrolled.c (e_table_scrolled_init): Set policy and
-	shadow type.
-	(e_table_scrolled_real_construct): Don't set the adjustments.
-	(e_table_scrolled_new): Create the widget with `gtk_widget_new()'
-	and pass hadjustment/vadjustment NULL values so that we get the
-	`GTK_OBJECT_CONSTRUCTED' approval.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-table-scrolled.h: s/GtkTable/EScrollFrameClass/.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Add e-table-scrolled.c and e-table-scrolled.h.
-
-	* e-table-item.c: Make sure that find_cell returns FALSE if the
-	item doesn't have any cells.
-
-	* e-table-scrolled.c, e-table-scrolled.h: Added a widget to
-	contain an ETable and provide scrollbars (for ease of use.)
-
-	* e-table.c, e-table.h: Make this support the scrollable interface
-	and not contain its own scrollbars.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c (eti_event): Put back e_cell_event sometimes when
-	we're not editing.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Set the dnd_code to something non-null for the
-	ETableHeaderItem.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Set header canvas scroll region correctly.
-
-2000-07-09  Anders Carlsson  <andersca@gnu.org>
-
-	* e-table-header-item.c (ethi_drag_motion): Don't draw drop
-	marker when the layout won't be changed by the drop.
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-table-item.c (eti_table_model_changed): Removed an unused
-	variable.
-
-2000-07-08  Dan Winship  <danw@helixcode.com>
-
-	* e-tree-model.c (e_tree_model_node_insert): When inserting a root
-	node, only call e_table_model_row_inserted if root_visible.
-	(e_tree_model_node_remove): Call e_table_model_row_deleted before
-	removing the row from the row_array, because the chain of signal
-	handlers will sometimes need that info.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c (eti_event): Don't call e_cell_event if we're not
-	editing.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c (eti_table_model_changed): Commented out some
-	unnecessary and buggy code.
-
-2000-07-06  Dan Winship  <danw@helixcode.com>
-
-	* e-tree-model.c (e_tree_model_node_remove): Make this work
-	recursively.
-
-2000-07-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Send GDK_BUTTON_RELEASE events to the ecell
-	associated with the cell (if it's the cursor.)
-
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* e-cell-tree.c (ect_draw): fix the conditions under which we draw
-	a horizontal line.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Added a reflow_compare callback and did removal
-	if you do shift-click on a selected row that's not the cursor.
-
-2000-06-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-click-to-add.c: Made this appear a bit better.
-
-	* e-table-defines.h: Cleaned this up a bit, added
-	ETableForeachFunc.
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group.h, e-table-item.c, e-table-item.h,
-	e-table.c, e-table.h: Changed e_table_select_row to
-	e_table_set_cursor_row.  Changed e_table_get_selected_view_row to
-	e_table_get_cursor_row.  Added e_table_selected_row_foreach.
-
-	* e-table-header-item.c: Fixed some warnings.
-
-	* e-table-sorted-variable.c: Removed some unneeded debugging print
-	statments.
-
-	* e-tree-example-1.c: Changed e_table_get_selected_view_row to
-	e_table_get_cursor_row.
-
-2000-06-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c: Added an unsort command.
-
-	* e-table-item.c: leave_edit when you loose the cursor.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-table-click-to-add.c,
-	e-table-click-to-add.h, e-table-one.c, and e-table-one.h.
-
-	* e-table-click-to-add.c, e-table-click-to-add.h: A new canvas
-	item that represents a single row that sometimes exists.  It's for
-	adding new rows to your table.
-
-	* e-table-example-1.c, e-table-example-2.c, e-table-size-test.c,
-	test-check.c, test-cols.c, test-table.c: Added value_to_string handlers.
-
-	* e-table-group-container.c: Use value_to_string to make grouping
-	not crash for non string columns.  Made some changes to work
-	properly in an ECanvasVbox.
-
-	* e-table-group-leaf.c, e-table-item.c: Made some changes to work
-	properly in an ECanvasVbox.
-
-	* e-table-model.c, e-table-model.h: Added append_row and
-	value_to_string methods.
-
-	* e-table-one.c, e-table-one.h: Given a source ETableModel, this
-	provides a single row model that uses the initialize_value,
-	duplicate_value, free_value, and value_is_empty methods of the
-	original source to implement set_value and value_at (and proxies
-	most of the other methods.)  This is used for ETableClickToAdd.
-
-	* e-table-simple.c, e-table-simple.h: Added append_row and
-	value_to_string handlers.  append_row uses a GtkArg instead of a
-	parameter to e_table_simple_new.
-
-	* e-table-subset.c: Added append_row and value_to_string handlers.
-
-	* e-table.c, e-table.h: Use a vbox containing an ETableClickToAdd
-	and an ETableItem instead of an ETableItem directly.  Only show
-	the ETableClickToAdd if the top level of the xml SPEC has the
-	attribute click-to-add set to some non-zero integer.
-	(click-to-add="1").  Add a "click_to_add_message" argument.
-
-	* e-tree-model.c: Add a commented out value_to_string handler.
-
-2000-06-23  Larry Ewing  <lewing@helixcode.com>
-
-	* e-cell-toggle.c (etog_draw): draw pixmaps with he right
-	background and selection colors.
-
-2000-06-23  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-model.h, e-tree-model.c: add icon_at virtual function -
-	it was stupid to make the insert call take 2 pixbufs.  the model
-	should give this information.
-
-	* e-cell-tree.c: get rid of the opened/closed pixbuf stuff.  call
-	e_tree_model_icon_of_node.
-
-	* e-tree-example-1.c: add my_icon_at.
-
-	* e-tree-simple.c (simple_icon_at): new function
-	(e_tree_simple_new): add icon_at parameter.
-
-	* e-tree-simple.h: add SimpleIconAtFn.
-
-2000-06-23  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-example-1.c (create_tree): use the expanded/unexpanded
-	pixbufs as node pixbufs for the first level of children, to test
-	the drawing.
-
-	* e-tree-model.c (e_tree_model_node_get_closed_pixbuf): new function.
-	(e_tree_model_node_get_opened_pixbuf): same.
-	(e_tree_model_node_insert): add opened/closed pixbuf argument.
-	(e_tree_model_node_insert_before): same.
-
-	* e-tree-model.h: add prototypes for opened/closed pixbuf
-	accessors, and add them to the e_tree_model_node_insert_* calls.
-
-	* e-cell-tree.c (ect_draw): add opened/closed pixbuf drawing per node.
-
-2000-06-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Make the table not move around as you resize.
-
-2000-06-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Killed a warning.
-
-2000-06-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c: Remove use of the "x" and "y"
-	arguments to EText.
-
-	* e-table-item.c: Properly ref the source_model field.
-
-	* test-check.c, test-cols.c, test-table.c: Remove use of the "x"
-	and "y" arguments to ETableHeaderItem.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-field-chooser-dialog.c: Made the Close button work.
-
-	* e-table-field-chooser.glade, e-table-field-chooser.glade.h:
-	Added a text description of this dialog.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c: Changed this to move the cell to the
-	nearest edge instead of to the left of the column it's over.
-
-	* e-table-header.c: Made target_index equal to eti->col_count be a
-	valid parameter to e_table_header_move.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header.c: Made moving columns to the right work
-	properly.
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-leaf.c: Fix a minor warning.
-
-	* e-table-item.c: Add to the selection if shift is held down.
-	Show cursor when changing sort (or if table changes majorly.)
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-defines.h: Fix HEADER_PADDING.
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Fix cursor column information.
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group.h: Removed the unfocus method since
-	that's handled by the canvas itself now.
-
-	* e-table-item.c, e-table-item.h: Finished adapting ETableItem to
-	use the canvas selection/cursor system.  Selection and cursor now
-	use row numbers associated with the source model instead of the
-	sorted model (if the model they are given is an ETableSubset.)
-	This has no effect on the interface, except that unfocus was
-	removed and e_table_item_focus was renamed to
-	e_table_item_set_cursor.
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c, e-table-item.h: Started adapting ETableItem to
-	use the canvas selection/cursor system.
-
-2000-06-17  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Made cells with strikeout on have a line from the
-	left margin to the right margin, instead of just over the text.
-
-2000-06-17  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-model.c (e_tree_model_node_insert): call
-	e_table_model_row_inserted instead of e_table_model_changed.
-
-2000-06-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c, e-table.h: Moved the reflow signal handling into an
-	idle handler to fix a bug when resizing twice in succession.
-
-2000-06-15  Chris Toshok  <toshok@helixcode.com>
-
-	* e-cell-tree.c (ect_print): print the icon for the tree control.
-
-2000-06-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Request the value of e_table_is_cell_editable of
-	the model_col instead of the view_col.
-
-	* e-table-item.h: Slight style fixup.
-
-2000-06-14  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-example-1.c (print_tree): new function, to generate
-	postscript so i can test tree printing.
-	(create_tree): add print button.
-
-	* e-cell-tree.c (ect_print_height): implement function (in a
-	broken way for the time being, heh).
-	(ect_print): implement function to draw tree controls and offset
-	the subcell's printing.  icons aren't printed yet, just lines.
-	(ect_draw): remove old unnecessary comments.  only draw the
-	horizontal line in specific instances (well, add a test so a lone
-	root node doesn't get the horizontal line.)
-	(e_cell_tree_class_init): add print/print_height methods.
-
-2000-06-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Clip the contained text.
-
-	* e-table-group-container.c: Did a first pass at grouped
-	printing.  This works, but there's no fancy boxes or headers
-	around the groups.
-
-	* e-table-item.c: Added will_fit function and added quantize
-	function to _height.
-
-2000-06-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-table-model.[ch]: Removed the freeze/thaw stuff for the model.
-	As Chris wisely pointed out, having freeze/thaw on the model makes
-	its state inconsistent from the perspective of the views.
-
-	* e-table-sorted-variable.c: Do not check for a frozen model.
-	* e-table-subset.c: Likewise.
-	* e-table-subset-variable.c: Likewise.
-
-	* e-table-example-1.c: Removed the ETableModel thaw handler.
-	* e-table-example-2.c: Likewise.
-	* e-table-simple.c: Likewise.
-	* e-table-size-test.c: Likewise.
-	* test-check.c: Likewise.
-	* test-cols.c: Likewise.
-	* test-table.c: Likewise.
-
-2000-06-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (table_test_LDADD): Link with libemiscwidgets.a.
-	(table_size_test_LDADD): Likewise.
-	(table_example_1_LDADD): Likewise.
-	(table_example_2_LDADD): Likewise.
-	(tree_example_1_LDADD): Likewise.
-
-2000-06-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-model.c: Small syntactic changes.
-
-	* e-table.c: Moved the table header into the scrolled view.
-
-2000-06-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-table.c (et_real_construct): EScrollFrame instead of
-	GtkScrolledWindow.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(GNOME_PRINT_LIBS) to all of the LDADDs.
-
-	* e-cell-text.c: Added printing of text cells.
-
-	* e-cell.c, e-cell.h: Added print and print_height methods.
-
-	* e-table-field-chooser.glade: Added a minimum size.
-
-	* e-table-group-container.c: Fixed a rectangle sizing bug.
-
-	* e-table-group-leaf.c: Implemented get_printable.
-
-	* e-table-group.c, e-table-group.h: Added a get_printable method
-	to return an EPrintable.
-
-	* e-table-item.c, e-table-item.h: Added a get_printable function
-	to return an EPrintable.
-
-	* e-table.c, e-table.h: Added a get_printable function to return
-	an EPrintable.
-
-2000-06-10  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-example-1.c (create_tree): supply the pixbufs here.
-
-	* e-cell-tree.h: change pixbuf names to open_pixbuf/closed_pixbuf.
-
-	* e-cell-tree.c (e_cell_tree_construct): take open/closed pixbuf
-	parameters, and don't #include the .xpm files directly here.
-	(e_cell_tree_new): same.
-	(ect_draw): use the pixbufs from the ECellTree.
-
-2000-06-10  Chris Toshok  <toshok@helixcode.com>
-
-	* e-cell-tree.c (ect_event): offset events before passing them to
-	our subcell view.
-
-2000-06-10  Chris Toshok  <toshok@helixcode.com>
-
-	* e-table-item.c (eti_event): change things so we focus the cell
-	and select the row, and also dispatch the event to that row/cell.
-	This fixes the problem with the tree where you had to click twice
-	to activate the tree controls.
-
-	* Makefile.am (libetable_a_SOURCES): remove e-tree-gnode.* and add
-	e-tree-simple.*
-	(icons): add tree-expanded.xpm and tree-unexpanded.xpm
-
-	* e-cell-tree.c (ect_enter_edit): defer to subcell's view.
-	(ect_leave_edit): defer to subcell's view.
-	(visible_depth_of_node): visual depth, taking into account that
-	the root node of the model might not be displayed.
-	(offset_of_node): return the offset used to shift the subcell
-	over.
-	(ect_draw): don't draw vertical lines if we're the leftmode node
-	(a visual root node).  also, don't shift x2 by the subcell offset,
-	so we get ellipses like we're supposed to.
-	(ect_event): remove GDK_BUTTON_RELEASE from the list of events
-	that we care about.
-
-	* e-tree-example-1.c: lots of changes, a more dynamic UI so we can
-	test tree model api stuff.
-
-	* e-tree-gnode.c, e-tree-gnode.c: removed files, since their guts
-	have been rolled into e-tree-model.c
-
-	* e-tree-model.c, e-tree-model.h: substantially changed.  too much
-	to really describe here.  this should really be considered the
-	first revision of these files :)
-
-	* e-tree-simple.c, e-tree-simple.h: analogous to e-table-simple, a
-	subclass that allows the use of function pointers.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-table-model.h (ETableModelClass): Added a freeze method.
-
-	* e-table-model.c (e_table_model_freeze): Call the freeze method
-	instead of the thaw method!
-
-	* e-table-simple.h (ETableSimple): Added the freeze function.
-
-	* e-table-simple.c (simple_thaw): Check whether the function
-	exists.
-	(simple_freeze): New handler.
-	(e_table_simple_new): Take in and set the freeze handler.
-	(e_table_simple_class_init): Set the freeze handler.
-
-	* test-check.c (check_test): Pass in the freeze handler to
-	e_table_simple_new().
-
-	* test-cols.c (multi_cols_test): Likewise.
-
-	* e-table-example-2.c (create_table): Likewise.
-
-	* e-table-example-1.c (create_table): Likewise.
-
-	* test-table.c (table_browser_test): Likewise.
-	(do_e_table_demo): Likewise.
-
-2000-06-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* The field chooser works now.
-
-	* e-table-field-chooser-dialog.c: Make the dialog resizable.
-
-	* e-table-field-chooser-item.c: Requested a reflow on
-	realization.  Made the correct column get dragged.
-
-	* e-table-field-chooser.c: Set the height correctly.
-
-	* e-table-field-chooser.glade: Replace the GnomeCanvas with an
-	ECanvas.
-
-	* e-table-header-item.c: Receive drags from the new dialog.
-
-2000-06-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-field-chooser-dialog.c, e-table-field-chooser-dialog.h,
-	e-table-field-chooser-item.c, e-table-field-chooser.c,
-	e-table-field-chooser.glade, e-table-field-chooser.h,
-	e-table-header-item.c, e-table.c: More work on the Field Chooser.
-	Not quite done yet.
-
-2000-06-08  Chris Toshok  <toshok@helixcode.com>
-
-	* e-tree-gnode.c, e-tree-gnode.h: New files.  A tree model using a
-	GNode structure to store it's info.
-
-	* e-tree-model.c, e-tree-model.h: New files.  A proxy model
-	sitting between a table model and the real tree model (of which
-	ETreeGNode is an example).
-
-	* e-cell-tree.c, e-cell-tree.h: New files.  A cell renderer
-	capable of wrapping up a subcell and drawing the tree controls for
-	expanding/collapsing trees.
-
-	* tree-expanded.xpm, tree-unexpanded.xpm: New files.  the standard
-	+ and - icons.
-
-	* e-tree-example-1.c: New file, giving a (pretty poor :) example
-	of using ETreeGNode.
-
-	* Makefile.am: at the tree stuff to the build, and build
-	tree-example-1.
-
-	* .cvsignore: ignore tree-example-1.
-
-2000-06-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-table-field-chooser*.
-
-	* e-table-defines.h: Moved some things to here.
-
-	* e-table-field-chooser-dialog.c, e-table-field-chooser-dialog.h,
-	e-table-field-chooser-item.c, e-table-field-chooser-item.h,
-	e-table-field-chooser.c, e-table-field-chooser.glade,
-	e-table-field-chooser.glade.h, e-table-field-chooser.h: New dialog
-	to drag extra fields from.  (Not yet finished.)
-
-	* e-table-header-item.c, e-table-header-item.h: Changed to
-	accommodate e-table-field-chooser.
-
-2000-06-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group.h, e-table-item.c, e-table-item.h,
-	e-table.c, e-table.h: Added a right click signal.
-
-	* e-table-sorted-variable.c: Fixed a buffer overrun.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-sorted-variable.c: Fixed the multiple copies of rows in
-	ETable bug.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* e-table-group.c (e_table_group_key_press):
-	* e-table.c (group_key_press): two more pastos
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Copy and paste error.
-
-	* e-table-item.c: Mixed up parity on eti->editing.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group.h, e-table-item.c, e-table-item.h,
-	e-table.c, e-table.h: Added a "key_press" signal.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* e-cell-text.h: Remove an offending *.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-sorted-variable.c: Made the sort when inserting a signal
-	row be syncronous.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c, e-cell-text.h: Added "text_filter" argument that
-	takes a const void * and returns an allocated char *.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Copy and paste error.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group.h, e-table-item.c, e-table.c,
-	e-table.h: Added e_table_get_selected_view_row.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c, e-cell-text.h: Added bold column's to ECellText.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Make sure that the cursor is always shown when
-	the selection changes.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-container.h,
-	e-table-group-leaf.c, e-table-group-leaf.h, e-table-group.c,
-	e-table-group.h, e-table-item.c, e-table-item.h, e-table.c,
-	e-table.h, test-check.c, test-cols.c, test-table.c: Fixed a bunch
-	of selection bugs.  Removed "spreadsheet" argument (for now.)
-	Added "cursor_mode" argument.  Added "cursor_change" signal.
-	Temporarily removed "selection_mode" argument.
-
-2000-05-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c: Fixed setting of arguments.
-
-2000-05-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group.h, e-table-item.c, e-table-item.h,
-	e-table.c, e-table.h: Added double click handling.
-
-2000-05-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c, e-cell-text.h: Added "strikeout_column" argument.
-
-2000-05-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-container.h,
-	e-table-group-leaf.c, e-table-group-leaf.h, e-table.c, e-table.h:
-	Made "drawgrid", "drawfocus", "spreadsheet", and
-	"length_threshold" arguments set from the ETable effect all the
-	end ETableItems.
-
-	* e-table-header.c: Made column resize a bit less bumpy.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header.c: Account for extra pixel at right end of
-	ETable.
-
-	* e-table-item.c: Make grid less intrusive.
-
-	* e-table.c: Make scrollbars disappear when appropriate.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c: Made dragging columns work.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c: Fixed the remove column callback.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c: Added right click menus to the table
-	header items.
-
-	* e-table-sort-info.c: Fixed a small bug.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Make scrollbar arrow buttons work.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-example-1.c, e-table-example-2.c, e-table-simple.c,
-	e-table-simple.h, e-table-size-test.c, test-check.c, test-cols.c,
-	test-table.c: Added initialize_value and value_is_empty callbacks.
-
-	* e-table-model.c, e-table-model.h: Added initialize_value and
-	value_is_callback virtual functions to the ETableModel class.
-
-	* e-table-subset.c: Perpetuate the initialize_value and
-	value_is_empty methods.
-
-From a patch by Iain Holmes <ih@csd.abdn.ac.uk>
-
-	* e-table-config.c, e-table.c: Fixed getting text content from a
-	node in the case of a non string based content field in the xml
-	library.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Fixed a memory leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-sorted-variable.c: Changed sorting to be at priority
-	level 30.
-
-	* e-table.c: Changed rebuild of the table to be at priority level
-	20.  This gives it an advantage over pretty much everything,
-	including e-table-sorted-variable sorting and canvas redraw.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c: Removed a memory leak here.
-
-	* e-table-group-leaf.c: Added a ref/sink pair.
-
-	* e-table-group.c, e-table-header-item.c: Removed some unused
-	code.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-sorted-variable.c: Fixed a FIXME comment.
-
-	* e-table-header.c, e-table-header.h: Added code to put off size
-	calculation to the idle loop.  Added code to not resize columns
-	with 0 expansion.  Removed the set_width function; it's been
-	replaced with a Gtk+ arg.
-
-	* Makefile.am: Added e-table-defines.h to the Makefile.am.
-
-	* e-table-defines.h: A new file containing some #defines for use
-	in ETable.
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Implemented the feature where the ETable columns automatically
-	fill the given space.
-
-	* e-cell-text.c, e-cell-text.h: Moved #include
-	e-text-event-processor.h from the .h to the .c.
-
-	* e-table-col.c, e-table-col.h: Added an expansion variable, and
-	made it so that width isn't set by the programmer but instead by
-	the e-table-header.
-
-	* e-table-example-1.c, e-table-example-2.c, e-table-size-test.c,
-	test-check.c, test-cols.c, test-table.c: Fixed to handle new
-	ETable column resizing.
-
-	* e-table-group-container.c, e-table-group-container.h,
-	e-table-group-leaf.c, e-table-group-leaf.h, e-table-group.c,
-	e-table-group.h, e-table-item.c, e-table-item.h: Fixed these to do
-	a proper canvas reflow/update loop.  Changed them to take a
-	minimum width and return a width and a height.
-
-	* e-table-header-item.c, e-table-header-item.h: Made this so that
-	it depends on e-table-header.c for deciding the actual size of
-	columns during resize (it was making incorrect decisions on its
-	own.)
-
-	* e-table-header.c, e-table-header.h: Changed this to make sure
-	that the sum of the widths of the columns was always as close as
-	possible to the width of the window.  This is done by taking a
-	full width and having each of the columns have an "expansion"
-	field.  This field is what makes each column have approximately
-	the same portion of its part of the screen that it used to.
-
-	* e-table.c: Changed this to set the width on the ETableHeader as
-	well as set the proper minimum width on the ETableGroup and get
-	the width and height it reports.
-
-2000-05-11  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table.c: Removed dead code.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-table-col-dnd.h and table-test.h.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-subset-variable.c: Fixed etssv_remove.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Make multi-line texts display properly.  Fixed
-	some mem leaks.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Add a horizontal scrollbar.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c, e-table-item.h, e-table.c, e-table.h: Handle
-	row_inserted and row_deleted signals properly.
-
-	* e-table-model.c, e-table-model.h: Created the row_inserted and
-	row_deleted signals.
-
-	* e-table-sorted-variable.c, e-table-subset-variable.c: Emit the
-	row_inserted and row_deleted signals as appropriate.
-
-2000-05-07    <toshok@the-dot-in.helixcode.com>
-
-	* e-cell-text.c (ect_draw): free cell.starting_text here to avoid
-	a memory leak.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table.c: Killed some warnings.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* e-cell-text.c (ect_accept_edits): only to set_value_at if the
-	value is indeed different.
-	(ect_stop_editing): free edit->cell.starting_text
-	(build_current_cell): initialize edit->cell.starting_text as a
-	copy of the initial text.
-
-2000-05-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-leaf.c,
-	e-table-group.c, e-table-group.h: Add an e_table_group_add_all
-	function and implement it in the different ETableGroup classes.
-
-	* e-table-sort-info.c: Make set_nth not call changed twice if it
-	needs to allocate more space.
-
-	* e-table-sorted-variable.c, e-table-subset-variable.c,
-	e-table-subset-variable.h: Add and implement an
-	e_table_subset_variable_add_all command.
-
-	* e-table.c: Use e_table_group_add_all as appropriate.  Fix ETable
-	grouping xml to work if there is a text element at the bottom of
-	the grouping tree.
-
-2000-05-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Sped up e_cell_text's get_height function.
-
-2000-05-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c, e-table-item.h: Added a height_cache idle loop
-	so that the height_cache will be validated in the idle loop.
-
-2000-05-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-sorted-variable.c: Load all the data to be sorted by
-	before actually doing the sort.
-
-2000-05-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c, e-cell-text.h: Fix author information.
-
-	* e-table-group-leaf.c: Set a length threshold of 200.
-
-	* e-table-item.c: Height cache is now actually a map.  Made
-	"length_threshold" argument work.  If over the length threshold,
-	use the height cache to get a better estimate so that once the
-	height cache is full, height estimate is perfect.
-
-2000-05-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-sorted-variable.c (qsort_callback): Add back in main
-	loop calls during sorting.
-
-2000-05-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-sorted-variable.c: Replace insert sort completely with a
-	qsort.
-
-2000-05-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-sorted-variable.c: Changed the insert sort to be binary
-	instead of linear.
-
-2000-05-04  Chris Toshok  <toshok@helixcode.com>
-
-	* e-table-sorted-variable.c (etsv_sort): use rows here instead of
-	E_TABLE_SUBSET(etsv)->n_map, since the table can be populated by
-	the gtk_main_iteration above.  otherwise the vals_closure may not
-	be fully populated.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c: Made this more reentrant.
-
-	* e-table-sorted-variable.c, e-table-sorted-variable.h: Does a
-	proper resort when the sorting info changes.
-
-	* e-table.c, e-table.h: Made it so that ETable doesn't destroy and
-	recreate the entire table when sorting info changes.
-
-2000-04-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* arrow-down.xpm, arrow-up.xpm, e-cell-text.c, e-cell-toggle.c,
-	e-table-col.c, e-table-config.c, e-table-header-item.c: Fixed some
-	warnings.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c: Added a missing include.
-
-2000-04-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-size-test.c: Fixed a warning.
-
-	* e-table-item.c: Removed the unnecessary gnome_canvas_update_bbox.
-
-2000-04-24  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-table.c (e_table_class_init): Add argument handling here.
-
-	* e-table-group-leaf.c (e_table_group_apply_to_leafs): New method.
-	Enables us to walk all the children of an ETableGroup.
-
-	* e-table.c (et_get_arg, et_set_arg): Implement ::get and ::set
-	methods.
-	(e_table_construct_from_spec_file): Now we return the etable.
-	(e_table_construct): ditto.
-	(et_real_construct): Now we return the ETable.  Returns NULL on
-	construct failure.
-	(e_table_new): ditto.
-	(e_table_new_from_spec_file): ditto.
-
-	* (et_build_grouping_spec): Removed vestige code that still
-	contained references to the etable->specification XML code.
-
-	Dumped all the ifdefed out code.
-
-	* e-table.h: Removed ETable->specification finally.
-
-2000-04-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Fixed some warnings.
-
-2000-04-23  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* e-table-item.c (eti_bounds): Calculate the width of the table from the
-	width of all the columns, and update the eti->width field as appropiate.
-	(eti_update): Update the bbox.
-
-2000-04-17  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (noinst_PROGRAMS): add table-size-test
-
-	* .cvsignore: add table-size-test.
-
-	* e-cell-text.c (ect_ecent): use e_table_model_is_cell_editable
-	instead of E_CELL_EDITABLE.
-
-	* e-cell-toggle.c (etog_event): same.
-
-	* e-cell.c (e_cell_init): don't call e_cell_set_editable.  that
-	info comes from the model.
-	(e_cell_set_editable): removed function.
-
-	* e-cell.h: remove the E_CELL_EDITABLE flag.  that should be
-	retrieved from the model.  also, remove the prototype for
-	e_cell_set_editable.
-
-	* e-table-size-test.c: new file, for a stress test of sorts, of a
-	large, uneditable e-table.
-
-2000-04-16  Anders Carlsson  <andersca@gnu.org>
-
-	* e-table-item.c (eti_event): Propagate mouse wheel events upwards.
-
-	* e-table.c (et_real_construct): Use a GtkScrolledWindow here
-	instead of a GtkScrollbar, since it makes mouse wheel scrolling
-	much easier.
-
-2000-04-15  Matt Loper  <matt@helixcode.com>
-
-	* e-table.c (et_xml_to_header): sanity-check our parameters.
-	(et_grouping_xml_to_sort_info): same.
-	(et_real_construct): Bail if we couldn't get the children we
-	wanted.
-
-2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-table.c (e_table_construct): Use `strlen (copy)' instead of
-	`strlen (copy) + 1' as the size argument for `xmlParseMemory()'.
-
-2000-04-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table.c, e-table.h: Switch the parent object to be a GtkTable.
-	(et_real_construct): apply massaging and some loving action to
-	make the thing behave as a GtkTable.
-	(e_table_init): More love.
-
-2000-04-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-header-item.c (ethi_class_init): New signal action.
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c, e-table-item.h: Added a row height cache.
-
-2000-04-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-header-item.c (ethi_drag_motion): Remove test for
-	source.  We will fix this later.
-
-	(ethi_end_resize): Reset resize_guide here.
-
-2000-04-11  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-table-header-item.c (ethi_add_destroy_marker): Add group
-	indent width here.
-	(is_pointer_on_division): Use the group indent here, so the
-	resize pointer is shown at the correct time.
-	(TOLERANCE): Bump it up to 3
-	(draw_button): Do not paint an arrow if there is an icon present,
-	and not enough space to paint.
-
-2000-04-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-table-header-item.c (make_shapped_window_from_xpm): New
-	routine, creates a shapped mask window from an xpm buffer.
-	(ethi_add_drop_marker): New version, uses shaped windows instead
-	of canvas items to signal the drop location.
-	(ethi_maybe_start_drag): Disable dragging if there is only one
-	column left.
-
-2000-04-10  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-header-item.c (ethi_drag_motion): Drop frozen count
-	support from here.
-	(ethi_start_drag): ditto.
-
-	* e-table-header.h: Kill frozen_count.
-
-2000-04-09  Matt Loper  <matt@helixcode.com>
-
-	* e-table-col.c (e_table_col_new_with_pixbuf): ref etc->ecell,
-	like in e_table_col_new, since that same ECell is unref'd in
-	etc_destroy().
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Separated some functions into an xml bit and a
-	generic bit.
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-cell-text.c: Killed ARG_EDITABLE.
-	(ect_event): Updated to new editable setup.
-	(e_cell_text_new): Kill editable argument.
-
-	* e-cell-toggle.c (etog_event): Handle editability here
-
-	* e-cell-text.h: Removed editable bit field from here, it is now
-	taken care at the e-cell level.
-
-	* e-cell.c (e_cell_set_editable): New function.
-	(e_cell_init): Set editable to TRUE by default.
-
-	* test-check.c (check_test): update to new api
-
-	* test-table.c (table_browser_test): ditto.
-	(do_e_table_demo): ditto.
-
-	* test-cols.c (multi_cols_test): ditto
-
-2000-04-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* test-cols.c, test-table.c: Got rid of some warnings.
-
-	* e-table-group-container.c, e-table-group-container.h,
-	e-table-group-leaf.c, e-table-group-leaf.h, e-table-group.c,
-	e-table-group.h, e-table-header-item.c, e-table-header-item.h,
-	e-table-sort-info.c, e-table-sort-info.h,
-	e-table-sorted-variable.c, e-table-sorted-variable.h, e-table.c,
-	e-table.h: Changed ETableSortInfo to not use xml internally.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-text-model.c: Make this assert a bit more readable.
-
-	* e-table-item.c: Fix update loop behavior.
-
-2000-04-02  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-sort-info.c (e_table_sort_info_class_init): Kill
-	argument.  Do not use XML internally
-	(e_table_sort_info_set_sorting): New function, use this to set the
-	sorting.
-	(e_table_sort_info_set_grouping): This one to do the grouping/.
-
-2000-04-01  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table.c (e_table_build_column_spec): Drop frozen support.
-	(e_table_make_header): Drop frozen support.
-
-	* e-table-header.c (e_table_header_new): Drop frozen support.
-
-	* e-table-header-item.c (ethi_drag_motion): Drop frozen support.
-	(ethi_drag_drop): Drop frozen support.
-	(ethi_start_drag): Drop frozen support.
-
-	* e-table.c (e_table_construct_from_spec_file): Robustify: support
-	the case in which the XML could not be parsed;  Propagate errors.
-	(e_table_new): Handle failure.
-	(e_table_new_from_spec_file): ditto.
-	Renamed multiple internal functions whose prefix was et_ to be e_table_
-
-2000-03-31  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-simple.h: Constify this.
-
-2000-03-30  Miguel de Icaza  <miguel@gnu.org>
-
-	* Makefile.am (EXTRA_DIST): Added Glade files to the
-	distribution.
-
-2000-03-28  Matt Loper  <matt@helixcode.com>
-
-	* e-table-text-model.c (e_table_text_model_destroy): made
-	assertion more accurate.
-
-2000-03-27  Michael Meeks  <michael@helixcode.com>
-
-	* e-table-item.c (eti_update): try and fix the convoluted logic.
-	(eti_bounds): Implement; should fix the re-draw bugs.
-
-	* e-table-group-container.c: kill many redundant prototypes,
-	stylistic cleans.
-
-2000-03-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-header-item.c (ethi_realize): Remove warning from here.
-
-	* test-table.c (table_browser_test): Use ECanvas, not GnomeCanvas,
-	to support reflow.
-	* test-cols.c (multi_cols_test): ditto
-	* e-table.c (e_table_setup_header): ditto
-
-	* e-table-header-item.c (ethi_font_load): Replace font.
-	(ethi_realize): ditto.
-
-2000-03-26  Matias Mutchinick <matias@seul.org>
-
-	* e-cell-toggle.c (etog_draw): Removed extra code that computed
-	bogus width.  This was the actual source of the problem with the
-	miss-rendering feature.
-
-2000-03-22  Matt Loper  <matt@helixcode.com>
-
-	* e-table-text-model.c (e_table_text_model_destroy): Added some
-	assertions.
-
-2000-03-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Make rectangles resize properly when receiving the
-	"model_changed" signal.
-
-2000-03-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c, e-table-group-container.h,
-	e-table-group-leaf.c, e-table-group.c, e-table-group.h: Updated
-	these to use the new ECanvas reflow infrastructure.
-
-	* e-table-item.c, e-table-item.h: Updated these to use the new
-	ECanvas reflow infrastructure.  Fixed the bounding box.
-
-	* e-table.c, e-table.h: Made the header have no extra space around it.
-
-2000-03-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header.c: Fixed a crashing bug when you close an
-	ETable.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Fixed a crashing bug when you cancel an edit.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Made this use an ECanvas.  Fixed a bug where
-	e_table_new_from_spec_file was calling e_table_construct instead
-	of e_table_construct_from_spec_file.
-
-	* e-table-item.c, e-table-header-item.c, e-table-column-item.c:
-	Switched these to use GTK_TYPE_OBJECT and GTK_VALUE_OBJECT instead
-	of GTK_TYPE_POINTER and GTK_TYPE_OBJECT.
-
-	* e-cell-text.c: Got rid of a crashing bug.
-
-	* e-table-text-model.c, e-table-text-model.h: A new object which
-	is an e-text-model which uses an e-table-model for its data.
-
-	* Makefile.am: Added e-table-text-model.c and
-	e-table-text-model.h.
-
-	* .cvsignore: Added table-example-1 and table-example-2.
-
-2000-03-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Changed the destroy function to disconnect from
-	signals before unrefing the objects the sinnals are on.  Changed
-	the destroy function to match the objects and signal ids properly
-	in its disconnect section.
-
-	* e-table-item.c, e-table-item.h: Changed this to do follow the
-	canvas rules better.
-
-	* e-table-header-item.c, e-table-header-item.h: Made
-	ETableHeaderItem connect to the "sort_info_changed" on its
-	ETableSortInfo instead of just manually redrawing itself.  Fixed
-	the update function a bit to follow the canvas rules a bit better.
-
-2000-03-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Made rows get unselected when switching from one
-	group to the next.
-
-2000-03-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-group-container.c: Use the style's font if lucidasans-10
-	is not found.
-
-2000-03-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c, e-table-header-item.h: Made it so that
-	columns would be properly indented.
-
-2000-03-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-sorted-variable.c: Have identical values get sorted by
-	their actual row.
-
-2000-03-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Draw selected row.
-
-2000-03-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c, e-table.h: Add a "row_selection" signal.
-
-	* test-table.c: Test the new "row_selection" signal.
-
-	* e-table-group-container.c, e-table-group-leaf.c: Implement the
-	"row_selection" property properly.
-
-	* e-table-group.c, e-table-group.h: Add a "row_selection" signal.
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c, e-table.h: Added support for the sorting info.  The
-	Etable creates a sort_info object, and then connects to the
-	signals to rearrange the rows when the sort_info changes.  It also
-	passes the info object to the ETableHeaderItem.
-
-	* e-table-model.c: Fixed a typo where ETableModel was written as
-	ETableModle.
-
-	* e-table-header.c, e-table-header.h: Added some code for sorting
-	here, but it's not used.  I don't think we want this code, but I
-	wanted to check it in at least once so that it's not lost.
-
-	* e-table-header-item.c, e-table-header-item.h: Added a
-	"sort_info" argument to ETableHeaderItem.  Added display of
-	current sort settings.  Added support for clicking to change the
-	sort settings.
-
-	* e-table-col.h: E_TABLE_COL_ARROW_NONE is marked as being = 0
-	since this is required in other places.  (I think C defines this
-	as being the case, but it's good to have the = 0 there so that
-	it's obvious that it has to be first.)
-
-	* TODO: Mark sorting as done.
-
-	* e-table-sort-info.c, e-table-sort-info.h: New files for
-	containing the xml grouping/sorting information and for sending
-	signals on that information.
-
-	* Makefile.am: Added e-table-sort-info.c and e-table-sort-info.h.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Added saving of frozen_columns count.  Added a
-	vertical scrollbar to ETable.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Push the proper visual and colormap for ETable to work.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* TODO: Touched this up a bit.
-
-	* e-table-group.c, e-table-group-leaf.c: Check for NULL before
-	calling gtk_object_unref or gtk_object_destroy.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Fixed a crash error.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Fixed a compile warning.
-
-	* e-table.c: Fixed a crash error.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* TODO: Added a bunch of stuff to the TODO list.  Put +s before a
-	few of the items that are finished.
-
-	* test-table.c: Add a button to save the spec file.
-
-	* e-table.c, e-table.h: Add loading configurations from files as
-	well as the ability to get the current configuration out of the
-	widget.
-
-2000-03-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table.c: Removed some unused code.
-
-	* e-table-header-item.c, e-table-header-item.h: Removed the unused
-	normal_cursor variable and object.
-
-	* e-table-col.c: Maintain a reference count in the contained ECell.
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: Use `libeutil.la', not `libeutil.a'.
-
-2000-02-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* test-table.c: Test frozen columns
-
-	* e-table.c: Make frozen columns available through the xml file.
-
-	* e-table-header.c, e-table-header.h, e-table-header-item.c: Added
-	frozen columns API to let you specify some number of leading
-	columns as undraggable.
-
-	* Makefile.am: Add e-table-example-1.c and e-table-example-2.c.
-
-	* e-table-example-1.c, e-table-example-2.c: New files.  A couple
-	of examples of ETable use.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am (table_test_LDADD): Fixed references to eutil.
-
-2000-02-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.c, e-table-header.c: Fixed a couple of crash
-	bugs.
-
-2000-02-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Made the E table item redraw properly.
-
-	* e-table-group-container.c: Added handling to distinguish between
-	n items and 1 item.  Got rid of a crash due to an abandoned timeout
-	callback.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Made carriage return stop editting instead of
-	inserting a carriage return.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* test-table.c: Added duplicate_value and add_value.  Use the new
-	compare functions.  Made it so we only create one model to better
-	test model view stuff.  Changed the test to not have as many
-	extra, useless, columns.
-
-	* test-cols.c, test-check.c: Added duplicate_value and add_value.
-	Use the new compare functions.
-
-	* e-table.c, e-table.h: Use all the new features of e-table-groups
-	(sorting and grouping).  Handle on the fly reorganization of
-	groups in an idle loop.  Compare functions now are to return -1 if
-	the first item is greater, 0 if they are equal, or 1 if the second
-	item is greater.
-
-	* e-table-subset.c, e-table-subset.h: Made e-table-subset
-	disconnect properly from its signals when it dies.
-
-	* e-table-subset-variable.c, e-table-subset-variable.h:
-	Virtualized the add and remove commands so that
-	e_table_sorted_variable could override the add command to do
-	sorting.
-
-	* e-table-sorted.c: Fixed this to inherit properly from
-	ETableSubset.
-
-	* e-table-simple.h, e-table-simple.c: Added handling of
-	duplicate_value and free_value;
-
-	* e-table-model.c, e-table-model.h: Added duplicate_value and
-	free_value for memory allocation of table elements outside the
-	table.
-
-	* e-table-item.c: Fixed a crashing bug.
-
-	* e-table-group.c: Added sorting.  Fixed destruction to delete the
-	right things.
-
-	* e-table-group-leaf.c, e-table-group-leaf.h: Pass column and sort
-	order information into the e_table_sorted_variable.  Properly
-	destroy things when deleted.
-
-	* e-table-group-container.c, e-table-group-container.h: Properly
-	handle the list of subgroups.  Handle proper sorting and grouping
-	of subgroups.
-
-	* e-table-sorted-variable.c, e-table-sorted-variable.h: Files to
-	do a sorted model that stays sorted as you add and remove rows.
-
-	* Makefile.am: Added e-table-sorted-variable.c and
-	e-table-sorted-variable.h.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Made keyboard focus navigation work across
-	groups.
-
-	* e-table-header.c: Made e_table_header_col_diff not crash if you
-	give it a column less than 0 (it truncates negative column values
-	to 0.)
-
-	* e-table-group.c, e-table-group.h: Added e_table_group_get_header
-	to get the ETableHeader for this ETableGroup.
-
-	* e-table-group-container.c: Made shift tab work.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c: Made changing focus work.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-subset-variable.c, e-table-subset-variable.h: A new
-	model which is a subset, but you can add and remove rows.
-
-	* test-table.c: Added a thaw method for use with the
-	e-table-subset (emits model_changed.)  Adapted to the changes to
-	e_table_item.  Properly parse headers.  Adapted to the changes to
-	e_table, including creating example xml spec data.
-
-	* test-cols.c, test-check.c: Added a thaw method for use with the
-	e-table-subset (emits model_changed.)  Adapted to the changes to
-	e_table_item.
-
-	* e-table.c, e-table.h: Reworked e-table to use the ETable
-	grouping system.  The only difference for the interface is that
-	instead of passing in a column_spec and a grouping_spec, you pass
-	in a single string that is an xml format that includes both pieces
-	of information.
-
-	* e-table-subset.h: Added rules for emacs to do correct
-	indentation.
-
-	* e-table-subset.c: Implemented freezing.  No signals are emitted
-	while frozen and "model_changed" is emitted when thawed.
-
-	* e-table-sorted.h: ETableSortedClass has ETableSubset as its
-	parent object instead of ETableSubsetClass.  Fixed this.
-
-	* e-table-simple.c, e-table-simple.h: Implemented the thaw method.
-	Use of simple now requires an extra argument (the thaw method.)
-
-	* e-table-model.h, e-table-model.c: Added e_table_model_freeze and
-	e_table_model_thaw.
-
-	* e-table-item.h, e-table-item.c: Reworked this a bit to make it
-	provide some things the new group system needed and to make
-	inter-item keyboard focus work.  Changed the external interface
-	only in the list of arguments it recognizes and signals it emits.
-	Instead of "x" and "y", you have to use
-	e_canvas_item_move_absolute and instead of emitting a
-	"height_changed" signal, it emits a "resize" signal.  There's new
-	"has_focus", "width", and "height" arguments and a function to get
-	the currently focused column.
-
-	* e-table-header-item.c: Got rid of some warnings here.  Changed
-	the
-
-	* e-table-group-leaf.h, e-table-group-leaf.c,
-	e-table-group-container.h, e-table-group-container.c: New types to
-	make e_table_group work properly.
-
-	* e-table-group.h, e-table-group.c: Completely reworked e-table
-	grouping.  e-table-group now uses a hierarchical structure.
-
-	* e-cell.h: Added e_cell_print.  This doesn't work yet.
-
-	* e-cell.c: Made e_cell_realize exist.  (It was improperly named
-	e_cell_view_realize in the .c.)
-
-	* e-cell-text.c: Made the blinking cursor disappear properly.
-
-	* check-filled.xpm, check-empty.xpm: Made these const char *[]
-	instead of char *[] to avoid compiler warnings.
-
-	* Makefile.am: Added e-table-group-container.c,
-	e-table-group-container.h, e-table-group-leaf.c,
-	e-table-group-leaf.h, e-table-subset-variable.c,
-	e-table-subset-variable.h.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* e-table-header.c: Include <string.h>
-
-	* Makefile.am (INCLUDES): Add EXTRA_GNOME_CFLAGS to INCLUDES>
-
-2000-02-12  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* e-table-header-item.c (ethi_drag_motion): Check the ethi is actually
-	the one being dragged. Prevents crashes when trying to drag headeritems
-	and there are multiple headeritems on the same canvas.
-	(ethi_drag_end): Same.
-	(ethi_drag_drop): Same.
-	(ethi_drag_leave): Same.
-
-2000-02-11  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-item.c (eti_header_structure_changed): Add nice
-	assertion.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* test-check.c: Added test of sort arrows.
-
-	* e-table-col.h, e-table-col.c: Added sort arrows for column
-	headers (It doesn't actually sort.  It just displays the arrows.)
-
-	* e-table-header-item.c: Added display of arrows.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* clip.png: Test column header image.
-
-	* test-check.c: Test pixbuf column headers.
-
-	* e-table-col.h, e-table-col.c: Added pixbufs for column headers.
-
-	* e-table-header-item.c (draw_button): Draw pixbuf column headers properly.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.h, e-cell-text.c: Add an editable argument to
-	e_cell_text_new.
-
-	* test-table.c, test-cols.c, test-check.c: Set the editable
-	argument to e_cell_text_new.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-header-item.h, e-table-header-item.c: Added reordering
-	of columns.
-
-	* e-table-header.c: Fixed a couple of bugs in the move column and
-	remove column functions.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Made space around text look right.  Added a
-	blinking cursor.
-
-2000-02-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Handle button releases properly.
-
-	* e-table-header-item.c (ethi_start_drag): Added a drag icon.
-
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-cell-text.c: Tweaked e-cell-text.  Added a white background
-	and tweaked the borders.
-
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Changes where e-text is included from.
-
-2000-02-07  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table.c (e_table_setup_table): Setup the scroll region of the
-	table canvas on size allocation.
-	(e_table_canvas_realize): Do not set the scrollregion here.
-	(e_table_canvas_init): Move root initialization here.
-
-2000-02-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-table-item.c (eti_event): Fixed some motion event
-	bugs. (incorrect x and y.)
-
-	* Makefile.am: Added includes for dependencies in
-	evolution/widgets/libevolutionwidgets.a
-
-	* e-cell-text.h, e-cell-text.c: Completely revamped using code
-	from e-text.c and e-text.h.
-
-2000-01-30  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-simple.c (e_table_simple_new): Add data field back in.
-
-1999-12-30  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-item.c (eti_attach_cell_views): New routine, creates the
-	cell views.
-	(eti_detach_cell_views): Detaches the cell_views from the
-	ETableItem.
-	(eti_realize_cell_views, eti_unrealize_cell_views): Simplified to
-	just do realize/unrealize notification.
-	(eti_add_table_model): Only attach the cells when we have both the
-	table model and the header model.
-
-	* e-cell.h (ECellClass): Added two new methods: new_view and
-	kill_view which drive the view process (instead of putting that on
-	realize/unrealize).
-
-	* e-cell.c: Adapt the code to use the new scheme for view
-	instantiation.
-
-	* e-cell-text.c, e-cell-toggle.c: Adapted to the new class
-	changes.
-
-1999-12-22  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-table-item.c (e_table_item_focus): grab focus here with the
-	canvas method.
-
-1999-12-20  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-table-group.c (etg_update): Change the dimensions only if the
-	child changes its own.
-
-	* e-table-item.c (eti_table_model_changed): Emit new signal on
-	table height change.
-	(eti_class_init): Register new "height_change" signal.
-
-1999-12-19  Damon Chaplin  <damon@karuna.freeserve.co.uk>
-
-	* Makefile.am (SUBDIRS): created SUBDIRS with meeting-time-sel.
-
-	* meeting-time-sel/Makefile.am:
-	* meeting-time-sel/.cvsignore:
-	* meeting-time-sel/e-meeting-time-sel.h:
-	* meeting-time-sel/e-meeting-time-sel.c:
-	* meeting-time-sel/e-meeting-time-sel-item.h:
-	* meeting-time-sel/e-meeting-time-sel-item.c:
-	* meeting-time-sel/e-meeting-time-sel-list-item.h:
-	* meeting-time-sel/e-meeting-time-sel-list-item.c:
-	* meeting-time-sel/e-meeting-time-sel-mail.xpm:
-	* meeting-time-sel/e-meeting-time-sel-no-mail.xpm:
-	* meeting-time-sel/test-meeting-time-sel.c: new files implementing
-	the meeting time selector.
-
-1999-12-12  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-table-item.c (eti_class_init): X and Y arguments are now
-	doubles (to make it consistent with the rest of the canvas x, y
-	arguments).
-
-	* e-table.c (e_table_create_leaf): Use new argument values here
-
-	* test-*.c: Update to new argument types for x and y
-
-	* e-table-group.c: New implementation as a canvas item used to
-	group childs.
-
-	* e-table-item.c (eti_update): Make this play nicely with groups.
-	(eti_draw): ditto.
-	(eti_request_region_redraw): ditto.
-	(eti_item_region_redraw): New function.
-
-	* e-table-subset.c (etss_proxy_model_row_changed): Added model
-	proxying.
-
-	* e-cell.h: Drop ETableModel from the ECell;
-	(realize): Now takes an ETableModel
-
-	* e-cell-checkbox.c: Adapted to new class
-	changes;
-	* e-cell-toggle.c: ditto
-
-	* e-table-subset.c (etss_row_count): Fix this guy.
-
-1999-12-11  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-table-item.c (eti_unrealize_cell_views): Null the cell views.
-	(eti_header_structure_changed): Only unrealize/realize if we were
-	realized before.
-
-	* e-table-header.c (e_table_header_add_column): Allow -1 as an
-	insert position
-
-1999-12-11   Miguel de Icaza <miguel@helixcode.com>
-
-	* e-table.c: Massive fixage.
-
-	* test-table.c: Updates to test the mega widget.
-
-1999-12-10   Miguel de Icaza <miguel@helixcode.com>
-
-	* e-table.c: New file, implements the mega widget.
-
-1999-12-09  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-header.c (e_table_header_col_diff): fix this routine.
-
-1999-12-04  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-header-item.c (ethi_event): Started drag and drop
-	support.
-
-	* e-table-item.c (eti_table_model_changed): The columns are
-	controled by the Header, not by the TableModel.
-
-	* e-table-header-item.c (ethi_draw): Fixed redraw logic to support
-	arbitrary header positioning.
-
-	* e-cell.h: Revamped e-cell interface.  We now provide the model
-	column and the view column to all methods (so that the methods can
-	talk to the view and to the model at the same time).
-
-	* e-table-item.c: Update to new API
-	* e-cell-test.c: Update to new API
-
-1999-12-03  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-cell.c (e_cell_class_init): Provide emtpy methods for
-	enter_edit, and leave_edit.
-
-	* e-table-item.c: Killed draw cell.
-	(eti_draw): Perform column mapping here.
-	(e_table_item_leave_edit): ditto.
-	(e_table_item_enter_edit): ditto.
-	(eti_event): ditto.
-
-1999-12-02  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-header.c (e_table_header_index): fixed api.
-
-1999-12-01  Miguel de Icaza  <miguel@gnu.org>
-
-	* test-cols.c (multi_cols_test): Update to simplified API.
-	* test-check.c (check_test): ditto
-	* test-table.c (table_browser_test): ditto
-
-	* e-table-simple.c (e_table_simple_class_init): Kill column_name method.
-
-	* e-table-model.h: Kill column_name method.
-
-	* e-table-col.c (e_table_col_new): Instead of using a column name,
-	use a column index.
-
-	* e-cell-text.c (ect_draw): Keep track of the originally allocated
-	piece of code.
-
-	* e-table-header-item.c (ethi_unrealize): Removed change cursor
-	from here.
-
-	* e-cell-text.c (ect_draw): Memory leak fix.
-
-	* table-test.c (main): Enhance the demo to load sample.table
-	automatically, to get memprof working.
-
-	* e-table-header.c (eth_do_remove): Take an argument: do -remove.
-
-	* e-table-header.c (e_table_header_add_column): Sink ETableCol to
-	own the object.
-
-	* e-table-col.h: Made ETableCol a GtkObject to make reference
-	counting the lifecycle method for these objects.
-
-	* e-table-col.c (e_table_col_destroy): New API call.
-
-	* e-table-subset.c (e_table_subset_get_toplevel): New API call.
-
-1999-11-30  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-cell-checkbox.c (e_cell_checkbox_new): This one derives from
-	e-cell-toggle.
-
-	* check-emtpy.xpm, check-filled.xpm: new files.
-
-	* e-cell-toggle.c (etog_draw): Paint in white.
-	If we have transparency enabled, do the nice alpha computation.
-
-	* test-table.c, test-cols.c: new files;  They implement the split
-	tests.
-
-1999-11-29  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-col.c (e_table_col_new): Set etc->resizeable.
-
-	* e-table-header-item.c (ethi_event): Handle non-resizeables
-	columns;  Add support for minimum width.
-
-	* e-cell-toggle.c, e-cell-toggle.h: New file.  Implement a
-	multi-state image toggle cell object.
-
-	* e-cell-text.c (ect_leave_edit): Handle the case of us calling
-	leave edit manually.
-	(ect_stop_editing): Leave manually editing here.
-	(ect_draw): Add one pixel to the border for left and right;
-	Handle off-screen cursor (must be improved).
-	(ect_edit_select_all): New function.
-	(ect_event): Select all text on editing start
-
-	* e-table-item.c (eti_event): Map mouse events and dispatch them.
-	(eti_event): Add spreadsheet mode for editing; Enter editing only
-	with visual characters;
-	Leave editing mode when a different row has been selected.
-	(eti_get_height): Fix the computation for this; Fix logic for the
-	length_threshold.
-
-	(eti_draw): Add borders on all sides of the box;
-	Only draw focus if the cell is not being edited.
-
-1999-11-28  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-item.c (eti_draw): Focus inside, not outside.
-	(eti_realize): Enhance our focus gc.
-
-	* e-cell-text.c (ect_enter_edit, ect_leave_edit): New methods;
-	They implement editing.
-
-	* e-cell.h: new methods: enter_edit, leave_edit
-
-	* e-table-model.h (set_value_at): make val argument const.
-
-	* e-table-simple.c (simple_set_value_at): Make value argument const;
-
-	* e-table-item.c (eti_set_arg): Add new mode: draw_focus;
-
-1999-11-27  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-item.c (eti_event): beginning of the keyboard navigation.
-
-	* e-table-model.c (e_table_model_row_changed): new function.
-	(e_table_model_cell_changed): new function.
-	(e_table_model_class_init): New signals.
-
-	* e-table-item.c (eti_request_region_redraw): x2, y2 offsets were
-	wrong.
-	(eti_select): Repaint selected region.
-	(eti_request_region_redraw): Fix range.
-	(eti_draw): Correct offset computation here.
-	(e_table_item_class_init): New method: row_selection, handles the
-	selection.
-
-	Now it implement GTK_SELECTION_SINGLE and GTK_SELECTION_MULTIPLE.
-
-	Focusing and selection should be correct now.
-
-1999-11-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-item.c (eti_realize): Compute height using the ecell
-	methods here.
-	(eti_get_height): new method to compute dimensions.
-
-	* e-cursors.c: use a different cursor.
-
-	* e-table-model.h: kill height and row_height methods.
-
-	* e-cell.c (ec_height): New method.
-
-	* e-cell-text.c (ect_realize): Load the font from the canvas.
-	(ect_draw): New color setup.
-	Center in the row.
-	(ect_height): Implement new method.
-
-1999-11-26  Michael Meeks  <mmeeks@gnu.org>
-
-	* ROADMAP.e-table: small spelling/typo fixes.
-
-1999-11-25  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-item.c (eti_event): Work on mouse-button event
-	propagation to cells.
-
-	* e-cell-text.c (ect_draw): Use CellViews now.
-
-	* e-table-item.c (eti_realize_cell_views): New routine: Realizes
-	the cell views
-	(eti_unrealize_cell_views): New routine: unrealizes the cell views.
-
-	* e-table-item.h: Move cell_views array here.
-
-	* table-test.c (value_at): Fix return value.
-	(main): use new invocation method.
-
-	* e-table-header-item.c (ethi_realize): Realize cells.
-
-	* e-table-item.c (eti_header_dim_changed): redraw before and after.
-
-	* e-table-header-item.c (ethi_event): Add continuous resizing.
-
-1999-11-24  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-subset.h, e-table-subset.c: New files, used to implement
-	subset tables.
-
-	* e-table-sorted.h, e-table-sorted.c: Now they derive from
-	e-table-subset.
-
-	* e-cell.c, e-cell.h: realize method now return per view instance
-	data.
-
-1999-11-20  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-item.c (eti_draw): WOOOOHOOOOOoO!  It took me quite a
-	while to figure this one out.  Fixed.
-
-	* e-table-header-item.c (ethi_set_arg): Compute width, keep track
-	of it.
-	(ethi_add_table_header): Monitor changes to the Header model;
-	Queue updates.
-	(ethi_draw): Fix the redraw logic here.
-
-	* table-test.c (main): Change the sample code, so we can better
-	debug this.
-
-	* e-table-item.c (eti_header_structure_changed): Keep track of
-	width;
-	(eti_header_dim_changed): ditto.
-	(eti_draw): Many redraw fixes.
-
-1999-11-19  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-item.c (eti_realize): Hook up;  Load gcs.
-	(eti_unrealize): Hook up.
-
-	* e-table-sorted.c: Finished implementing.
-
-1999-11-18  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-model.c (e_table_model_class_init): Add model_changed
-	signal here.
-
-	* e-table-item.c, e-table-item.h: New files.  They implement the
-	view of the ETableModel as Canvas Items.
-
-	* e-table-header-item.c (ethi_set_arg): Ref header here.
-	(ethi_destroy): Unref it here.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* e-msg-composer-address-dialog.c: Moved to `$(srcdir)/composer'.
-	* e-msg-composer-address-dialog.h: Likewise.
-	* e-msg-composer-address-entry.c: Likewise.
-	* e-msg-composer-address-entry.h: Likewise.
-	* e-msg-composer-attachment-bar.c: Likewise.
-	* e-msg-composer-attachment-bar.h: Likewise.
-	* e-msg-composer-attachment.c: Likewise.
-	* e-msg-composer-attachment.h: Likewise.
-	* e-msg-composer-hdrs.c: Likewise.
-	* e-msg-composer-hdrs.h: Likewise.
-	* e-msg-composer.c: Likewise.
-	* e-msg-composer.h: Likewise.
-	* e-msg-composer-address-dialog.glade: Likewise.
-	* e-msg-composer-attachment.glade: Likewise.
-	* e-msg-composer.glade: Likewise.
-	* Makefile.am: Updated accordingly.
-
-Nov 14 1999 Elliot Lee
-	* Makefile.am: It's libevolutionwidgets.la, not .a
-
-1999-11-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-header-item.c (is_pointer_on_division): Add resizing
-	capabilities.
-
-	* e-table-sorted.c: Finish implementation.
-
-1999-11-13  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-sorted.c: Implement e-table-sorted object.
-
-1999-11-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-header-item.c: Make the thing configurable.
-
-	* e-table-header-item.h: Add font field, location, height.
-
-1999-11-12  Ettore Perazzoli  <ettore@gnu.org>
-
-	* e-msg-composer-hdrs.c: New member `tooltips' in `struct
-	_EMsgComposerHdrsPrivate'.
-	(init): Initialize it.
-	(destroy): New function.
-	(class_init): Install it as the `destroy' GtkObject method.
-	(add_header): New parameters `tip', `tip_private'.  Setup a
-	tooltip for the entry with them.
-	(setup_headers): Updated accordingly.
-
-1999-11-11  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-table-header.c (e_table_header_add_column): Update offsets.
-	(eth_update_offsets): New routine.
-
-	* e-table-col.h, e-table-col.c: New files.
-
-	* e-table-header.h (e_table_header_get_selected_indexes):
-	Pretify.
-
-	* table-test.c (main): New file;  used for testing ETable package.
-
-	* e-table-simple.h: Fix type.
-
-1999-11-12  Ettore Perazzoli  <ettore@gnu.org>
-
-	* e-msg-composer-address-dialog.glade: Cosmetical changes.
-
-	* e-msg-composer-attachment-bar.c (size_to_string): New helper
-	function.
-	(update): Put the size in the icon's label using this function.
-	(ICON_SEPARATORS): Remove '.' to avoid wrapping of the size string
-	on the decimal dot.  But gnome-libs is broken and this has no real
-	effect!  :-(
-	(e_msg_composer_attachment_bar_new): No longer make text editable.
-	Use the `GTK_SELECTION_MULTIPLE' selection mode.
-	(remove_selected): No longer assume only one attachment is
-	selected.
-
-	* e-msg-composer-attachment.c: #include <sys/stat.h>
-	(init): Initialize all the members.
-	(e_msg_composer_attachment_new): Set size using `stat()'.
-
-	* e-msg-composer-attachment.h: New member `size' in `struct
-	_EMsgComposerAttachment'.
-
-	* e-msg-composer.c (setup_signals): Connect `address_dialog_cb' to
-	the "show_address_dialog" signal of the header widget.
-
-	* e-msg-composer-hdrs.c (add_address_header): Renamed to
-	`add_header'.  New parameter `addrbook_button': if true, use a
-	button instead of a label and make it trigger an
-	"show_address_dialog" signal.
-	(address_button_clicked_cb): Signal handler to handle this on a
-	"clicked" signal from the button.
-	(setup_headers): Updated accordingly.  Also, make "Subject" the
-	last item.  (This makes it look more like Outlook and friends.)
-
-	* e-msg-composer-hdrs.c: New signal "show_address_dialog".
-	* e-msg-composer-hdrs.h: Updated accordingly.
-
-	* e-msg-composer-hdrs.c (add_address_header): Reduce padding
-	considerably.
-
-	* e-msg-composer.c (e_msg_composer_construct): Do not use any
-	padding in the main vbox.
-
-	* Makefile.am: Moved the `e-table*' sources to `EXTRA_DIST'.
-	Compile as a shared library.
-
-1999-11-08  Ettore Perazzoli  <ettore@gnu.org>
-
-	* e-msg-composer-address-dialog.c: Implemented cut & paste for the
-	recipient lists.
-	(init): Initialize `cut_buffer'.
-	(destroy): Free it.
-	(recipient_clist_selection_get_cb): New function.
-	(recipient_clist_selection_received_cb): New function.
-	(recipient_clist_selection_clear_event_cb): New function.
-	(setup_recipient_list_signals): Install them as signal handlers
-	for "selection_get", "selection_received" and
-	"selection_clear_event" respectively.
-	(copy_recipient_cb): New function implementing the "copy"
-	operation.
-	(cut_recipient_cb): New function implementing the "cut" operation.
-	(paste_recipient_cb): New function implementing the "paste"
-	operation.
-
-	* e-msg-composer-address-dialog.h: New member `cut_buffer' in
-	`struct _EMsgComposerAddressDialog'.
-
-1999-11-07  Ettore Perazzoli  <ettore@gnu.org>
-
-	* e-msg-composer-address-dialog.c: New context menu
-	`recipient_list_popup_info' for the recipient CLists.
-	(recipient_clist_button_press_cb): New function.
-	(setup_signals): Install it as the "button_press_event" signal
-	handler for popping up the CList context menu.
-
-	* e-msg-composer.c (free_string_list): New helper function.
-	(setup_address_dialog): Setup the initial values in the address
-	dialog according to the ones in the header widget.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_to): New function.
-	(e_msg_composer_hdrs_get_cc): New function.
-	(e_msg_composer_hdrs_get_bcc): New function.
-
-	* e-msg-composer.c (setup_address_dialog): New helper function.
-	(address_dialog_cb): Use it.
-
-	* e-msg-composer-address-dialog.c (add_address): Do not set the
-	row data anymore.  Instead, put the full address description
-	(i.e. complete with the email address, not just the full name) in
-	the CList.
-	(add_address): Do nothing if no item is selected in the address
-	CList.
-	(get_list): Get the address list from the CList without passing
-	through the address CList.
-	(set_list): New helper function.
-	(e_msg_composer_address_dialog_set_to_list): New function.
-	(e_msg_composer_address_dialog_set_cc_list): New function.
-	(e_msg_composer_address_dialog_set_bcc_list): New function.
-
-	* e-msg-composer.c (address_dialog_apply_cb): Apply values from
-	the address dialog into the composer.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_to): New function.
-	(e_msg_composer_hdrs_set_cc): New function.
-	(e_msg_composer_hdrs_set_bcc): New function.
-
-	* e-msg-composer-address-entry.c
-	(e_msg_composer_address_entry_set_list): New function.
-
-	* e-msg-composer-address-dialog.c (apply): New helper function.
-	(clicked): New function, `clicked' method for the `GnomeDialog'
-	class.
-	(class_init): Install it.
-
-1999-11-06  Ettore Perazzoli  <ettore@gnu.org>
-
-	* e-msg-composer-attachment-bar.c (destroy): Call the destroy
-	method of the parent class.
-
-	* e-msg-composer.c: #include "e-msg-composer-address-dialog.h".
-	(address_dialog_cb): New callback to start the address dialog.
-	(setup_signals): Connect it to the appropriate button/menu item.
-	(init): Initialize the new `address_dialog' member to NULL.
-	(destroy): Destroy the `address_dialog' if not NULL.
-
-	* e-msg-composer.h: New member `address_dialog' in `struct
-	_EMsgComposer'.
-
-	* e-msg-composer.glade: Added button to activate the address
-	composition dialog.
-
-	* e-msg-composer-address-dialog.h, e-msg-composer-address-dialog.c:
-	New files implementing the address composition dialog for Evolution.
-
-	* e-msg-composer-address-dialog.glade: New file.
-
-	* e-msg-composer-attachment.c: `signals' made static.
-
-1999-11-05  Ettore Perazzoli  <ettore@gnu.org>
-
-	* Makefile.am: Compile the new files in a `libevolutionwidgets'
-	library.
-	(CPPFLAGS): #define `E_GUIDIR'.
-
-	* e-msg-composer.c, e-msg-composer.h: New files implementing an
-	initial version of the Evolution message composer widget.
-
-	* e-msg-composer-address-entry.c, e-msg-composer-address-entry.h:
-	New files implementing a GtkEntry customized for entering email
-	address lists.
-
-	* e-msg-composer-attachment-bar.c, e-msg-composer-attachment-bar.h:
-	New files implementing a widget for editing mail attachments.
-
-	* e-msg-composer-attachment.c, e-msg-composer-attachment.h: New
-	files implementing file attachment objects for the message
-	composer.
-
-	* e-msg-composer-hdrs.c, e-msg-composer-hdrs.h: New files
-	implementing a widget for editing of email message headers.
-
-	* e-msg-composer-attachment.glade: New file.
-	* e-msg-composer.glade: New file.
-
-1999-10-31  Miguel de Icaza  <miguel@gnu.org>
-
-	* widgets/e-table-column.c, e-table-column.h: New file, implements the
-	e-table-column object.
-
-	* widget/e-table-model.h, e-table-model.c, e-table-simple.c,
-	e-table-simple.h: New files.  Implements the column model and
-	a simple table wrapper.
-
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 31e6c29b99..186ae4dfed 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -126,6 +126,7 @@ e_cell_combo_init			(ECellCombo	*ecc)
 	AtkObject *a11y;
 	GtkListStore *store;
 	GtkTreeSelection *selection;
+	GtkScrolledWindow *scrolled_window;
 
 	/* We create one popup window for the ECell, since there will only
 	   ever be one popup in use at a time. */
@@ -140,11 +141,13 @@ e_cell_combo_init			(ECellCombo	*ecc)
 	gtk_widget_show (frame);
 
 	ecc->popup_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window),
+	scrolled_window = GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window);
+
+	gtk_scrolled_window_set_policy (scrolled_window,
 					GTK_POLICY_AUTOMATIC,
 					GTK_POLICY_AUTOMATIC);
-	GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)->hscrollbar, GTK_CAN_FOCUS);
-	GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)->vscrollbar, GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus (gtk_scrolled_window_get_hscrollbar (scrolled_window), FALSE);
+	gtk_widget_set_can_focus (gtk_scrolled_window_get_vscrollbar (scrolled_window), FALSE);
 	gtk_container_add (GTK_CONTAINER (frame), ecc->popup_scrolled_window);
 	gtk_widget_show (ecc->popup_scrolled_window);
 
@@ -330,24 +333,33 @@ e_cell_combo_select_matching_item	(ECellCombo	*ecc)
 static void
 e_cell_combo_show_popup			(ECellCombo	*ecc, gint row, gint view_col)
 {
+	GdkWindow *window;
+	GtkAllocation allocation;
 	gint x, y, width, height, old_width, old_height;
 
+	gtk_widget_get_allocation (ecc->popup_window, &allocation);
+
 	/* This code is practically copied from GtkCombo. */
-	old_width = ecc->popup_window->allocation.width;
-	old_height  = ecc->popup_window->allocation.height;
+	old_width = allocation.width;
+	old_height = allocation.height;
 
 	e_cell_combo_get_popup_pos (ecc, row, view_col, &x, &y, &height, &width);
 
 	/* workaround for gtk_scrolled_window_size_allocate bug */
 	if (old_width != width || old_height != height) {
-		gtk_widget_hide (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)->hscrollbar);
-		gtk_widget_hide (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)->vscrollbar);
+		gtk_widget_hide (
+			gtk_scrolled_window_get_hscrollbar (
+			GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)));
+		gtk_widget_hide (
+			gtk_scrolled_window_get_vscrollbar (
+			GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)));
 	}
 
 	gtk_window_move (GTK_WINDOW (ecc->popup_window), x, y);
 	gtk_widget_set_size_request (ecc->popup_window, width, height);
 	gtk_widget_realize (ecc->popup_window);
-	gdk_window_resize (ecc->popup_window->window, width, height);
+	window = gtk_widget_get_window (ecc->popup_window);
+	gdk_window_resize (window, width, height);
 	gtk_widget_show (ecc->popup_window);
 
 	e_cell_popup_set_shown (E_CELL_POPUP (ecc), TRUE);
@@ -367,8 +379,15 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 	ECellPopup *ecp = E_CELL_POPUP (ecc);
 	ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view);
 	GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas);
+	GtkWidget *widget;
+	GtkWidget *popwin_child;
+	GtkWidget *popup_child;
+	GtkStyle *popwin_style;
+	GtkStyle *popup_style;
+	GdkWindow *window;
 	GtkBin *popwin;
 	GtkScrolledWindow *popup;
+	GtkRequisition requisition;
 	GtkRequisition list_requisition;
 	gboolean show_vscroll = FALSE, show_hscroll = FALSE;
 	gint avail_height, avail_width, min_height, work_height, screen_width;
@@ -380,7 +399,8 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 	popup  = GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window);
 	popwin = GTK_BIN (ecc->popup_window);
 
-	gdk_window_get_origin (canvas->window, x, y);
+	window = gtk_widget_get_window (canvas);
+	gdk_window_get_origin (window, x, y);
 
 	x1 = e_table_header_col_diff (eti->header, 0, view_col + 1);
 	y1 = e_table_item_row_diff (eti, 0, row + 1);
@@ -402,10 +422,16 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 	*x += x1;
 	/* The ETable positions don't include the grid lines, I think, so we add 1. */
 	*y += y1 + 1
-		- (gint)((GnomeCanvas *)canvas)->layout.vadjustment->value
+		- (gint)gtk_adjustment_get_value (
+			gtk_layout_get_vadjustment (
+			&((GnomeCanvas *)canvas)->layout))
 		+ ((GnomeCanvas *)canvas)->zoom_yofs;
 
-	scrollbar_width = popup->vscrollbar->requisition.width
+	widget = gtk_scrolled_window_get_vscrollbar (popup);
+	gtk_widget_get_child_requisition (widget, &requisition);
+
+	scrollbar_width =
+		requisition.width
 		+ GTK_SCROLLED_WINDOW_CLASS (GTK_OBJECT_GET_CLASS (popup))->scrollbar_spacing;
 
 	avail_height = gdk_screen_height () - *y;
@@ -415,19 +441,27 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 	screen_width = gdk_screen_width ();
 	avail_width = screen_width - scrollbar_width;
 
+	widget = gtk_scrolled_window_get_vscrollbar (popup);
+	gtk_widget_get_child_requisition (widget, &requisition);
+
 	gtk_widget_size_request (ecc->popup_tree_view, &list_requisition);
-	min_height = MIN (list_requisition.height,
-			  popup->vscrollbar->requisition.height);
+	min_height = MIN (list_requisition.height, requisition.height);
 	if (!gtk_tree_model_iter_n_children (gtk_tree_view_get_model (GTK_TREE_VIEW (ecc->popup_tree_view)), NULL))
 		list_requisition.height += E_CELL_COMBO_LIST_EMPTY_HEIGHT;
 
+	popwin_child = gtk_bin_get_child (popwin);
+	popwin_style = gtk_widget_get_style (popwin_child);
+
+	popup_child = gtk_bin_get_child (GTK_BIN (popup));
+	popup_style = gtk_widget_get_style (popup_child);
+
 	/* Calculate the desired width. */
 	*width = list_requisition.width
-		+ 2 * popwin->child->style->xthickness
-		+ 2 * GTK_CONTAINER (popwin->child)->border_width
-		+ 2 * GTK_CONTAINER (popup)->border_width
-		+ 2 * GTK_CONTAINER (GTK_BIN (popup)->child)->border_width
-		+ 2 * GTK_BIN (popup)->child->style->xthickness;
+		+ 2 * popwin_style->xthickness
+		+ 2 * gtk_container_get_border_width (GTK_CONTAINER (popwin_child))
+		+ 2 * gtk_container_get_border_width (GTK_CONTAINER (popup))
+		+ 2 * gtk_container_get_border_width (GTK_CONTAINER (popup_child))
+		+ 2 * popup_style->xthickness;
 
 	/* Use at least the same width as the column. */
 	if (*width < column_width)
@@ -441,15 +475,19 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 	}
 
 	/* Calculate all the borders etc. that we need to add to the height. */
-	work_height = (2 * popwin->child->style->ythickness
-		       + 2 * GTK_CONTAINER (popwin->child)->border_width
-		       + 2 * GTK_CONTAINER (popup)->border_width
-		       + 2 * GTK_CONTAINER (GTK_BIN (popup)->child)->border_width
-		       + 2 * GTK_BIN (popup)->child->style->xthickness);
+	work_height = (2 * popwin_style->ythickness
+		       + 2 * gtk_container_get_border_width (GTK_CONTAINER (popwin_child))
+		       + 2 * gtk_container_get_border_width (GTK_CONTAINER (popup))
+		       + 2 * gtk_container_get_border_width (GTK_CONTAINER (popup_child))
+		       + 2 * popup_style->xthickness);
+
+	widget = gtk_scrolled_window_get_hscrollbar (popup);
+	gtk_widget_get_child_requisition (widget, &requisition);
 
 	/* Add on the height of the horizontal scrollbar if we need it. */
 	if (show_hscroll)
-		work_height += popup->hscrollbar->requisition.height +
+		work_height +=
+			requisition.height +
 			GTK_SCROLLED_WINDOW_CLASS (GTK_OBJECT_GET_CLASS (popup))->scrollbar_spacing;
 
 	/* Check if it fits in the available height. */
@@ -494,11 +532,7 @@ e_cell_combo_selection_changed (GtkTreeSelection *selection, ECellCombo *ecc)
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_realized (ecc->popup_window) || !gtk_tree_selection_get_selected (selection, &model, &iter))
-#else
-	if (!GTK_WIDGET_REALIZED (ecc->popup_window) || !gtk_tree_selection_get_selected (selection, &model, &iter))
-#endif
 		return;
 
 	e_cell_combo_update_cell (ecc);
@@ -526,7 +560,7 @@ e_cell_combo_button_press		(GtkWidget	*popup_window,
 	   presses outside the application will be reported to this window,
 	   which is why we hide the popup in this case. */
 	while (event_widget) {
-		event_widget = event_widget->parent;
+		event_widget = gtk_widget_get_parent (event_widget);
 		if (event_widget == ecc->popup_tree_view)
 			return FALSE;
 	}
@@ -564,7 +598,7 @@ e_cell_combo_button_release		(GtkWidget	*popup_window,
 
 	/* See if the button was released in the list (or its children). */
 	while (event_widget && event_widget != ecc->popup_tree_view)
-		event_widget = event_widget->parent;
+		event_widget = gtk_widget_get_parent (event_widget);
 
 	/* If it wasn't, then we just ignore the event. */
 	if (event_widget != ecc->popup_tree_view)
@@ -601,11 +635,7 @@ e_cell_combo_key_press			(GtkWidget	*popup_window,
 	    && event->keyval != GDK_3270_Enter)
 		return FALSE;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (event->keyval == GDK_Escape && (!ecc->popup_window||!gtk_widget_get_visible (ecc->popup_window)))
-#else
-	if (event->keyval == GDK_Escape && (!ecc->popup_window||!GTK_WIDGET_VISIBLE (ecc->popup_window)))
-#endif
 		return FALSE;
 
 	gtk_grab_remove (ecc->popup_window);
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index 692614ff14..cab6c816ee 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -383,32 +383,16 @@ e_cell_date_edit_get_property		(GObject	*object,
 
 	switch (property_id) {
 	case PROP_SHOW_TIME:
-#if GTK_CHECK_VERSION(2,19,7)
 		g_value_set_boolean (value, gtk_widget_get_visible (ecde->time_entry));
-#else
-		g_value_set_boolean (value, GTK_WIDGET_VISIBLE (ecde->time_entry));
-#endif
 		return;
 	case PROP_SHOW_NOW_BUTTON:
-#if GTK_CHECK_VERSION(2,19,7)
 		g_value_set_boolean (value, gtk_widget_get_visible (ecde->now_button));
-#else
-		g_value_set_boolean (value, GTK_WIDGET_VISIBLE (ecde->now_button));
-#endif
 		return;
 	case PROP_SHOW_TODAY_BUTTON:
-#if GTK_CHECK_VERSION(2,19,7)
 		g_value_set_boolean (value, gtk_widget_get_visible (ecde->today_button));
-#else
-		g_value_set_boolean (value, GTK_WIDGET_VISIBLE (ecde->today_button));
-#endif
 		return;
 	case PROP_ALLOW_NO_DATE_SET:
-#if GTK_CHECK_VERSION(2,19,7)
 		g_value_set_boolean (value, gtk_widget_get_visible (ecde->none_button));
-#else
-		g_value_set_boolean (value, GTK_WIDGET_VISIBLE (ecde->none_button));
-#endif
 		return;
 	case PROP_USE_24_HOUR_FORMAT:
 		g_value_set_boolean (value, ecde->use_24_hour_format);
@@ -503,6 +487,7 @@ e_cell_date_edit_do_popup		(ECellPopup	*ecp,
 					 gint             view_col)
 {
 	ECellDateEdit *ecde = E_CELL_DATE_EDIT (ecp);
+	GdkWindow *window;
 
 	e_cell_date_edit_show_popup (ecde, row, view_col);
 	e_cell_date_edit_set_popup_values (ecde);
@@ -511,7 +496,8 @@ e_cell_date_edit_do_popup		(ECellPopup	*ecp,
 
 	/* Set the focus to the first widget. */
 	gtk_widget_grab_focus (ecde->time_entry);
-	gdk_window_focus (ecde->popup_window->window, GDK_CURRENT_TIME);
+	window = gtk_widget_get_window (ecde->popup_window);
+	gdk_window_focus (window, GDK_CURRENT_TIME);
 
 	return TRUE;
 }
@@ -627,6 +613,7 @@ e_cell_date_edit_show_popup		(ECellDateEdit	*ecde,
 					 gint             row,
 					 gint             view_col)
 {
+	GdkWindow *window;
 	gint x, y, width, height;
 
 	if (ecde->need_time_list_rebuild)
@@ -636,10 +623,11 @@ e_cell_date_edit_show_popup		(ECellDateEdit	*ecde,
 
 	e_cell_date_edit_get_popup_pos (ecde, row, view_col, &x, &y, &height, &width);
 
+	window = gtk_widget_get_window (ecde->popup_window);
 	gtk_window_move (GTK_WINDOW (ecde->popup_window), x, y);
 	gtk_widget_set_size_request (ecde->popup_window, width, height);
 	gtk_widget_realize (ecde->popup_window);
-	gdk_window_resize (ecde->popup_window->window, width, height);
+	gdk_window_resize (window, width, height);
 	gtk_widget_show (ecde->popup_window);
 
 	e_cell_popup_set_shown (E_CELL_POPUP (ecde), TRUE);
@@ -659,10 +647,15 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 	ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view);
 	GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas);
 	GtkRequisition popup_requisition;
+	GtkAdjustment *adjustment;
+	GtkLayout *layout;
+	GdkWindow *window;
 	gint avail_height, screen_width, column_width, row_height;
 	gdouble x1, y1, wx, wy;
+	gint value;
 
-	gdk_window_get_origin (canvas->window, x, y);
+	window = gtk_widget_get_window (canvas);
+	gdk_window_get_origin (window, x, y);
 
 	x1 = e_table_header_col_diff (eti->header, 0, view_col + 1);
 	y1 = e_table_item_row_diff (eti, 0, row + 1);
@@ -684,9 +677,10 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 	*x += x1;
 	/* The ETable positions don't include the grid lines, I think, so we
 	   add 1. */
-	*y += y1 + 1
-		- (gint)((GnomeCanvas *)canvas)->layout.vadjustment->value
-		+ ((GnomeCanvas *)canvas)->zoom_yofs;
+	layout = &GNOME_CANVAS (canvas)->layout;
+	adjustment = gtk_layout_get_vadjustment (layout);
+	value = (gint) gtk_adjustment_get_value (adjustment);
+	*y += y1 + 1 - value + ((GnomeCanvas *)canvas)->zoom_yofs;
 
 	avail_height = gdk_screen_height () - *y;
 
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index eb7b1330c3..1d536026fc 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -354,22 +354,22 @@ e_cell_pixbuf_class_init (ECellPixbufClass *klass)
 
 	g_object_class_install_property (object_class, PROP_SELECTED_COLUMN,
 					 g_param_spec_int ("selected_column",
-							   _("Selected Column"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Selected Column",
+							   NULL,
 							   0, G_MAXINT, 0,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_FOCUSED_COLUMN,
 					 g_param_spec_int ("focused_column",
-							   _("Focused Column"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Focused Column",
+							   NULL,
 							   0, G_MAXINT, 0,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_UNSELECTED_COLUMN,
 					 g_param_spec_int ("unselected_column",
-							   _("Unselected Column"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Unselected Column",
+							   NULL,
 							   0, G_MAXINT, 0,
 							   G_PARAM_READWRITE));
 }
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 6deb4c46a9..32de41ecb4 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -277,6 +277,8 @@ ecp_draw (ECellView *ecv, GdkDrawable *drawable,
 		ecp->popup_arrow_shown = show_popup_arrow;
 
 	if (show_popup_arrow) {
+		GtkStyle *style;
+
 		e_cell_draw (ecp_view->child_view, drawable, model_col,
 			     view_col, row, flags,
 			     x1, y1, x2 - E_CELL_POPUP_ARROW_WIDTH, y2);
@@ -291,11 +293,13 @@ ecp_draw (ECellView *ecv, GdkDrawable *drawable,
 		else
 			shadow = GTK_SHADOW_OUT;
 
-		gtk_paint_box (canvas->style, drawable,
+		style = gtk_widget_get_style (canvas);
+
+		gtk_paint_box (style, drawable,
 			       GTK_STATE_NORMAL, shadow,
 			       &rect, canvas, "ecellpopup",
 			       rect.x, rect.y, rect.width, rect.height);
-		gtk_paint_arrow (canvas->style, drawable,
+		gtk_paint_arrow (style, drawable,
 				 GTK_STATE_NORMAL, GTK_SHADOW_NONE,
 				 &rect, canvas, NULL,
 				 GTK_ARROW_DOWN, TRUE,
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index f0509e4590..077357c5d6 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -274,6 +274,7 @@ ect_queue_redraw (ECellTextView *text_view, gint view_col, gint view_row)
 static void
 ect_stop_editing (ECellTextView *text_view, gboolean commit)
 {
+	GdkWindow *window;
 	CellEdit *edit = text_view->edit;
 	gint row, view_col, model_col;
 	gchar *old_text, *text;
@@ -281,6 +282,8 @@ ect_stop_editing (ECellTextView *text_view, gboolean commit)
 	if (!edit)
 		return;
 
+	window = gtk_widget_get_window (GTK_WIDGET (text_view->canvas));
+
 	row = edit->row;
 	view_col = edit->view_col;
 	model_col = edit->model_col;
@@ -290,7 +293,7 @@ ect_stop_editing (ECellTextView *text_view, gboolean commit)
 	if (edit->tep)
 		g_object_unref (edit->tep);
 	if (!edit->default_cursor_shown) {
-		gdk_window_set_cursor (GTK_WIDGET(text_view->canvas)->window, NULL);
+		gdk_window_set_cursor (window, NULL);
 		edit->default_cursor_shown = TRUE;
 	}
 	if (edit->timeout_id) {
@@ -389,8 +392,10 @@ static void
 ect_realize (ECellView *ecell_view)
 {
 	ECellTextView *text_view = (ECellTextView *) ecell_view;
+	GdkWindow *window;
 
-	text_view->gc = gdk_gc_new (GTK_WIDGET (text_view->canvas)->window);
+	window = gtk_widget_get_window (GTK_WIDGET (text_view->canvas));
+	text_view->gc = gdk_gc_new (window);
 
 	text_view->i_cursor = gdk_cursor_new (GDK_XTERM);
 
@@ -608,7 +613,7 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width)
 	}
 
 	pango_layout_set_width (layout, width * PANGO_SCALE);
-	pango_layout_set_wrap (layout, PANGO_WRAP_CHAR);
+	pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
 
 	pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
 	pango_layout_set_height (layout, 0);
@@ -730,21 +735,20 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 	GdkColor *foreground;
 	GtkWidget *canvas = GTK_WIDGET (text_view->canvas);
 	GdkRectangle clip_rect;
+	GtkStyle *style;
 	gint x_origin, y_origin, vspacing;
 
+	style = gtk_widget_get_style (canvas);
+
 	selected = flags & E_CELL_SELECTED;
 
 	if (selected) {
-#if GTK_CHECK_VERSION(2,19,7)
 		if (gtk_widget_has_focus (canvas))
-#else
-		if (GTK_WIDGET_HAS_FOCUS (canvas))
-#endif
-			foreground = &canvas->style->fg [GTK_STATE_SELECTED];
+			foreground = &style->fg[GTK_STATE_SELECTED];
 		else
-			foreground = &canvas->style->fg [GTK_STATE_ACTIVE];
+			foreground = &style->fg[GTK_STATE_ACTIVE];
 	} else {
-		foreground = &canvas->style->text [GTK_STATE_NORMAL];
+		foreground = &style->text[GTK_STATE_NORMAL];
 
 		if (ect->color_column != -1) {
 			gchar *color_spec;
@@ -805,11 +809,11 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 			end_index = edit->selection_start ^ edit->selection_end ^ start_index;
 
 			if (edit->has_selection) {
-				selection_gc = canvas->style->base_gc [GTK_STATE_SELECTED];
-				text_gc = canvas->style->text_gc[GTK_STATE_SELECTED];
+				selection_gc = style->base_gc[GTK_STATE_SELECTED];
+				text_gc = style->text_gc[GTK_STATE_SELECTED];
 			} else {
-				selection_gc = canvas->style->base_gc [GTK_STATE_ACTIVE];
-				text_gc = canvas->style->text_gc[GTK_STATE_ACTIVE];
+				selection_gc = style->base_gc [GTK_STATE_ACTIVE];
+				text_gc = style->text_gc[GTK_STATE_ACTIVE];
 			}
 
 			gdk_gc_set_clip_rectangle (selection_gc, &clip_rect);
@@ -1126,7 +1130,10 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 #endif
 		if (edit_display) {
 			if (edit->default_cursor_shown) {
-				gdk_window_set_cursor (canvas->window, text_view->i_cursor);
+				GdkWindow *window;
+
+				window = gtk_widget_get_window (canvas);
+				gdk_window_set_cursor (window, text_view->i_cursor);
 				edit->default_cursor_shown = FALSE;
 			}
 		}
@@ -1137,7 +1144,10 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 #endif
 		if (edit_display) {
 			if (!edit->default_cursor_shown) {
-				gdk_window_set_cursor (canvas->window, NULL);
+				GdkWindow *window;
+
+				window = gtk_widget_get_window (canvas);
+				gdk_window_set_cursor (window, NULL);
 				edit->default_cursor_shown = TRUE;
 			}
 		}
@@ -1334,6 +1344,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 	ECellText *ect = E_CELL_TEXT(ecell_view->ecell);
 	ECellTextView *ectView = (ECellTextView *)ecell_view;
 	GtkWidget *canvas = GTK_WIDGET(ectView->canvas);
+	GtkStyle *style;
 	PangoDirection dir;
 	gboolean strikeout, underline;
 	cairo_t *cr;
@@ -1345,7 +1356,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 
 	cairo_save (cr);
 	layout = gtk_print_context_create_pango_layout (context);
-	font_des = pango_font_description_from_string ("sans 12"); /* fix me font hardcoded */
+	font_des = pango_font_description_from_string ("sans 10"); /* fix me font hardcoded */
 	pango_layout_set_font_description (layout, font_des);
 
 	pango_layout_set_text (layout, string, -1);
@@ -1355,12 +1366,14 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 	cairo_rectangle (cr, 2, 2, width + 2, height + 2);
 	cairo_clip(cr);
 
+	style = gtk_widget_get_style (canvas);
 	pango_context = gtk_widget_get_pango_context (canvas);
-	font_metrics = pango_context_get_metrics (pango_context,
-		       canvas->style->font_desc, pango_context_get_language(pango_context));
-	ty =  (gdouble)(text_height
-		       - pango_font_metrics_get_ascent (font_metrics)
-		       - pango_font_metrics_get_descent (font_metrics)) / 2.0 /(gdouble)PANGO_SCALE;
+	font_metrics = pango_context_get_metrics (
+		pango_context, style->font_desc,
+		pango_context_get_language(pango_context));
+	ty =  (gdouble)(text_height -
+		pango_font_metrics_get_ascent (font_metrics) -
+		pango_font_metrics_get_descent (font_metrics)) / 2.0 /(gdouble)PANGO_SCALE;
 
 	strikeout = ect->strikeout_column >= 0 && row >= 0 &&
 		e_table_model_value_at (ecell_view->e_table_model, ect->strikeout_column, row);
@@ -1402,6 +1415,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 
 	cairo_move_to(cr, 2, text_height- 5);
 	pango_layout_set_width (layout, (width - 4)*PANGO_SCALE);
+	pango_layout_set_wrap (layout, PANGO_WRAP_CHAR);
 	pango_cairo_show_layout(cr, layout);
 	cairo_restore (cr);
 
@@ -1422,7 +1436,27 @@ ect_print_height (ECellView *ecell_view, GtkPrintContext *context,
 	 * Height of some special font is much higher than others,
 	 * such	as Arabic. So leave some more margin for cell.
 	 */
-	return 16 + 8;
+	PangoFontDescription *font_des;
+	PangoLayout *layout;
+	ECellText *ect = E_CELL_TEXT(ecell_view->ecell);
+	gchar *string;
+	gdouble text_width = 0.0, text_height = 0.0;
+	gint lines=1;
+
+	string = e_cell_text_get_text(ect, ecell_view->e_table_model, model_col, row);
+
+	layout = gtk_print_context_create_pango_layout (context);
+	font_des = pango_font_description_from_string ("sans 10"); /* fix me font hardcoded */
+	pango_layout_set_font_description (layout, font_des);
+
+	pango_layout_set_text (layout, string, -1);
+	get_font_size (layout, font_des, string, &text_width, &text_height);
+	/* Checking if the text width goes beyond the column width to increase the
+	 * number of lines.
+	 */
+	if ( text_width > width-4)
+		lines = (text_width / (width-4)) + 1;
+	return 16*lines + 8;
 }
 
 static gint
@@ -1628,43 +1662,43 @@ e_cell_text_class_init (ECellTextClass *klass)
 
 	g_object_class_install_property (object_class, PROP_STRIKEOUT_COLUMN,
 					 g_param_spec_int ("strikeout_column",
-							   _("Strikeout Column"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Strikeout Column",
+							   NULL,
 							   -1, G_MAXINT, -1,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_UNDERLINE_COLUMN,
 					 g_param_spec_int ("underline_column",
-							   _("Underline Column"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Underline Column",
+							   NULL,
 							   -1, G_MAXINT, -1,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_BOLD_COLUMN,
 					 g_param_spec_int ("bold_column",
-							   _("Bold Column"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Bold Column",
+							   NULL,
 							   -1, G_MAXINT, -1,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_COLOR_COLUMN,
 					 g_param_spec_int ("color_column",
-							   _("Color Column"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Color Column",
+							   NULL,
 							   -1, G_MAXINT, -1,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_EDITABLE,
 					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Editable",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_BG_COLOR_COLUMN,
 					 g_param_spec_int ("bg_color_column",
-							   _("BG Color Column"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "BG Color Column",
+							   NULL,
 							   -1, G_MAXINT, -1,
 							   G_PARAM_READWRITE));
 
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 5f7cc66321..08a9d8dcc3 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -173,8 +173,10 @@ static void
 cell_toggle_realize (ECellView *ecell_view)
 {
 	ECellToggleView *toggle_view = (ECellToggleView *) ecell_view;
+	GdkWindow *window;
 
-	toggle_view->gc = gdk_gc_new (GTK_WIDGET (toggle_view->canvas)->window);
+	window = gtk_widget_get_window (GTK_WIDGET (toggle_view->canvas));
+	toggle_view->gc = gdk_gc_new (window);
 }
 
 static void
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 8a8017e2e7..b5506af13b 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -169,11 +169,13 @@ static void
 ect_realize (ECellView *ecell_view)
 {
 	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
+	GdkWindow *window;
 
 	/* realize our subcell view */
 	e_cell_realize (tree_view->subcell_view);
 
-	tree_view->gc = gdk_gc_new (GTK_WIDGET (tree_view->canvas)->window);
+	window = gtk_widget_get_window (GTK_WIDGET (tree_view->canvas));
+	tree_view->gc = gdk_gc_new (window);
 
 	gdk_gc_set_line_attributes (tree_view->gc, 1,
 				    GDK_LINE_ON_OFF_DASH,
@@ -229,11 +231,19 @@ draw_retro_expander (ECellTreeView *ectv, GdkDrawable *drawable, gboolean expand
 static void
 draw_expander (ECellTreeView *ectv, GdkDrawable *drawable, GtkExpanderStyle expander_style, GtkStateType state, GdkRectangle *rect)
 {
-	GtkWidget *tree = GTK_WIDGET (ectv->canvas)->parent;
+	GtkStyle *style;
+	GtkWidget *tree;
 	gint exp_size;
+
+	tree = gtk_widget_get_parent (GTK_WIDGET (ectv->canvas));
+	style = gtk_widget_get_style (tree);
+
 	gtk_widget_style_get (tree, "expander_size", &exp_size, NULL);
 
-	gtk_paint_expander (tree->style, drawable, state, rect, tree, "treeview", rect->x + rect->width - exp_size / 2, rect->y + rect->height / 2, expander_style);
+	gtk_paint_expander (
+		style, drawable, state, rect, tree, "treeview",
+		rect->x + rect->width - exp_size / 2,
+		rect->y + rect->height / 2, expander_style);
 }
 
 /*
@@ -250,12 +260,16 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 	ETreePath node;
 	GdkRectangle rect, *clip_rect = NULL;
 	GtkWidget *canvas = GTK_WIDGET (tree_view->canvas);
-	GdkGC *fg_gc = canvas->style->fg_gc[GTK_STATE_ACTIVE];
+	GtkStyle *style;
+	GdkGC *fg_gc;
 	GdkColor *foreground;
 	gboolean selected;
 
 	gint offset, subcell_offset;
 
+	style = gtk_widget_get_style (canvas);
+	fg_gc = style->fg_gc[GTK_STATE_ACTIVE];
+
 	selected = flags & E_CELL_SELECTED;
 
 	/* only draw the tree effects if we're the active sort */
@@ -263,7 +277,9 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 		GdkPixbuf *node_image;
 		gint node_image_width = 0, node_image_height = 0;
 		ETreePath parent_node;
-		ETree *tree = E_TREE (canvas->parent);
+		ETree *tree;
+
+		tree = E_TREE (gtk_widget_get_parent (canvas));
 
 		gtk_widget_style_get (GTK_WIDGET (tree),
 				      "retro_look", &tree_view->retro_look,
@@ -295,9 +311,9 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 		clip_rect = &rect;
 
 		if (selected) {
-			foreground = &canvas->style->text [GTK_STATE_SELECTED];
+			foreground = &style->text [GTK_STATE_SELECTED];
 		} else {
-			foreground = &canvas->style->text [GTK_STATE_NORMAL];
+			foreground = &style->text [GTK_STATE_NORMAL];
 		}
 
 		gdk_gc_set_foreground (tree_view->gc, foreground);
@@ -445,6 +461,8 @@ typedef struct {
 static gboolean
 animate_expander (gpointer data)
 {
+	GtkLayout *layout;
+	GdkWindow *window;
 	animate_closure_t *closure = (animate_closure_t *) data;
 
 	if (closure->finish) {
@@ -454,9 +472,14 @@ animate_expander (gpointer data)
 		return FALSE;
 	}
 
-	draw_expander (closure->ectv, GTK_LAYOUT (closure->ectv->canvas)->bin_window,
-		       closure->expanded ? GTK_EXPANDER_SEMI_COLLAPSED : GTK_EXPANDER_SEMI_EXPANDED,
-		       GTK_STATE_NORMAL, &closure->area);
+	layout = GTK_LAYOUT (closure->ectv->canvas);
+	window = gtk_layout_get_bin_window (layout);
+
+	draw_expander (
+		closure->ectv, window, closure->expanded ?
+		GTK_EXPANDER_SEMI_COLLAPSED :
+		GTK_EXPANDER_SEMI_EXPANDED,
+		GTK_STATE_NORMAL, &closure->area);
 	closure->finish = TRUE;
 
 	return TRUE;
@@ -468,6 +491,8 @@ animate_expander (gpointer data)
 static gint
 ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions)
 {
+	GtkLayout *layout;
+	GdkWindow *window;
 	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
 	ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row);
 	ETreeTableAdapter *etta = e_cell_tree_get_tree_table_adapter(ecell_view->e_table_model, row);
@@ -475,6 +500,9 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 	gint offset = offset_of_node (ecell_view->e_table_model, row);
 	gint result;
 
+	layout = GTK_LAYOUT (tree_view->canvas);
+	window = gtk_layout_get_bin_window (layout);
+
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
 
@@ -497,9 +525,11 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 					if (hgt != area.height) /* Composite cells */
 						area.height += hgt;
 
-					draw_expander (tree_view, GTK_LAYOUT (tree_view->canvas)->bin_window,
-						       expanded ? GTK_EXPANDER_SEMI_EXPANDED : GTK_EXPANDER_SEMI_COLLAPSED,
-						       GTK_STATE_NORMAL, &area);
+					draw_expander (
+						tree_view, window, expanded ?
+						GTK_EXPANDER_SEMI_EXPANDED :
+						GTK_EXPANDER_SEMI_COLLAPSED,
+						GTK_STATE_NORMAL, &area);
 					closure->ectv = tree_view;
 					closure->etta = etta;
 					closure->node = node;
@@ -526,9 +556,11 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 				e_table_item_get_cell_geometry (tree_view->cell_view.e_table_item_view,
 								&tmp_row, &view_col, &area.x, &area.y, NULL, &area.height);
 				area.width = offset - 2;
-				draw_expander (tree_view, GTK_LAYOUT (tree_view->canvas)->bin_window,
-					       e_tree_table_adapter_node_is_expanded (etta, node) ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED,
-					       in_expander ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL, &area);
+				draw_expander (
+					tree_view, window,
+					e_tree_table_adapter_node_is_expanded (etta, node) ?
+					GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED,
+					in_expander ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL, &area);
 				tree_view->prelit = in_expander;
 				return TRUE;
 			}
@@ -544,9 +576,11 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 			e_table_item_get_cell_geometry (tree_view->cell_view.e_table_item_view,
 							&tmp_row, &view_col, &area.x, &area.y, NULL, &area.height);
 			area.width = offset - 2;
-			draw_expander (tree_view, GTK_LAYOUT (tree_view->canvas)->bin_window,
-				       e_tree_table_adapter_node_is_expanded (etta, node) ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED,
-				       GTK_STATE_NORMAL, &area);
+			draw_expander (
+				tree_view, window,
+				e_tree_table_adapter_node_is_expanded (etta, node) ?
+				GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED,
+				GTK_STATE_NORMAL, &area);
 			tree_view->prelit = FALSE;
 		}
 		return TRUE;
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 944e1dd268..e50d0f4274 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -73,21 +73,24 @@ etcta_cursor_change (GtkObject *object, gint row, gint col, ETableClickToAdd *et
 static void
 etcta_style_set (ETableClickToAdd *etcta, GtkStyle *previous_style)
 {
-	GtkWidget *widget = GTK_WIDGET(GNOME_CANVAS_ITEM(etcta)->canvas);
+	GtkWidget *widget;
+	GtkStyle *style;
 
-	if (etcta->rect) {
-		gnome_canvas_item_set (etcta->rect,
-					"outline_color_gdk", &widget->style->fg[GTK_STATE_NORMAL],
-					"fill_color_gdk", &widget->style->bg[GTK_STATE_NORMAL],
-					NULL );
+	widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etcta)->canvas);
+	style = gtk_widget_get_style (widget);
 
-	}
+	if (etcta->rect)
+		gnome_canvas_item_set (
+			etcta->rect,
+			"outline_color_gdk", &style->fg[GTK_STATE_NORMAL],
+			"fill_color_gdk", &style->bg[GTK_STATE_NORMAL],
+			NULL);
 
 	if (etcta->text)
-		gnome_canvas_item_set (etcta->text,
-					"fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
-					NULL);
-
+		gnome_canvas_item_set (
+			etcta->text,
+			"fill_color_gdk", &style->text[GTK_STATE_NORMAL],
+			NULL);
 }
 
 static void
@@ -237,28 +240,34 @@ etcta_set_property (GObject *object,
 static void
 create_rect_and_text (ETableClickToAdd *etcta)
 {
-	GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM(etcta)->canvas);
+	GtkWidget *widget;
+	GtkStyle *style;
+
+	widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etcta)->canvas);
+	style = gtk_widget_get_style (widget);
 
 	if (!etcta->rect)
-		etcta->rect = gnome_canvas_item_new(GNOME_CANVAS_GROUP(etcta),
-					    gnome_canvas_rect_get_type(),
-					    "x1", (gdouble) 0,
-					    "y1", (gdouble) 0,
-					    "x2", (gdouble) etcta->width - 1,
-					    "y2", (gdouble) etcta->height - 1,
-					    "outline_color_gdk", &widget->style->fg[GTK_STATE_NORMAL],
-					    "fill_color_gdk", &widget->style->bg[GTK_STATE_NORMAL],
-					    NULL);
+		etcta->rect = gnome_canvas_item_new (
+			GNOME_CANVAS_GROUP (etcta),
+			gnome_canvas_rect_get_type (),
+			"x1", (gdouble) 0,
+			"y1", (gdouble) 0,
+			"x2", (gdouble) etcta->width - 1,
+			"y2", (gdouble) etcta->height - 1,
+			"outline_color_gdk", &style->fg[GTK_STATE_NORMAL],
+			"fill_color_gdk", &style->bg[GTK_STATE_NORMAL],
+			NULL);
 
 	if (!etcta->text)
-		etcta->text = gnome_canvas_item_new(GNOME_CANVAS_GROUP(etcta),
-					    e_text_get_type(),
-					    "text", etcta->message ? etcta->message : "",
-					    "anchor", GTK_ANCHOR_NW,
-					    "width", etcta->width - 4,
-					    "draw_background", FALSE,
-					    "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
-					    NULL);
+		etcta->text = gnome_canvas_item_new (
+			GNOME_CANVAS_GROUP (etcta),
+			e_text_get_type (),
+			"text", etcta->message ? etcta->message : "",
+			"anchor", GTK_ANCHOR_NW,
+			"width", etcta->width - 4,
+			"draw_background", FALSE,
+			"fill_color_gdk", &style->text[GTK_STATE_NORMAL],
+			NULL);
 }
 
 static void
@@ -501,36 +510,36 @@ etcta_class_init (ETableClickToAddClass *klass)
 
 	g_object_class_install_property (object_class, PROP_HEADER,
 					 g_param_spec_object ("header",
-							      _("Header"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Header",
+							      NULL,
 							      E_TABLE_HEADER_TYPE,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_MODEL,
 					 g_param_spec_object ("model",
-							      _("Model"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Model",
+							      NULL,
 							      E_TABLE_MODEL_TYPE,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_MESSAGE,
 					 g_param_spec_string ("message",
-							      _("Message"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Message",
+							      NULL,
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_WIDTH,
 					 g_param_spec_double ("width",
-							      _("Width"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Width",
+							      NULL,
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE | G_PARAM_LAX_VALIDATION));
 
 	g_object_class_install_property (object_class, PROP_HEIGHT,
 					 g_param_spec_double ("height",
-							      _("Height"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Height",
+							      NULL,
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READABLE | G_PARAM_LAX_VALIDATION));
 
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index cd96441b63..974ead48c1 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -118,7 +118,7 @@ e_table_col_class_init (ETableColClass *klass)
 
 	g_object_class_install_property (object_class, PROP_COMPARE_COL,
 					 g_param_spec_int ("compare_col",
-							   _( "Width" ),
+							   "Width",
 							   "Width",
 							   0, G_MAXINT, 0,
 							   G_PARAM_READWRITE));
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index f87b316dd0..736473a81c 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -147,8 +147,8 @@ e_table_config_class_init (ETableConfigClass *klass)
 
 	g_object_class_install_property (object_class, PROP_STATE,
 					 g_param_spec_object ("state",
-							      _("State"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "State",
+							      NULL,
 							      E_TABLE_STATE_TYPE,
 							      G_PARAM_READABLE));
 }
@@ -549,18 +549,27 @@ do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
 static void
 do_fields_config_dialog (ETableConfig *config)
 {
+	GtkDialog *dialog;
+	GtkWidget *widget;
 	gint response, running = 1;
 
+	dialog = GTK_DIALOG (config->dialog_show_fields);
+
 	gtk_widget_ensure_style (config->dialog_show_fields);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (config->dialog_show_fields)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (config->dialog_show_fields)->action_area), 12);
+
+	widget = gtk_dialog_get_content_area (dialog);
+	gtk_container_set_border_width (GTK_CONTAINER (widget), 0);
+
+	widget = gtk_dialog_get_action_area (dialog);
+	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
 
 	config->temp_state = e_table_state_duplicate (config->state);
 
 	setup_fields (config);
 
-	gtk_window_set_transient_for (GTK_WINDOW (config->dialog_show_fields),
-				      GTK_WINDOW (config->dialog_toplevel));
+	gtk_window_set_transient_for (
+		GTK_WINDOW (config->dialog_show_fields),
+		GTK_WINDOW (config->dialog_toplevel));
 
 	do {
 		response = gtk_dialog_run (GTK_DIALOG(config->dialog_show_fields));
@@ -759,6 +768,7 @@ sort_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *sort)
 	ETableConfig *config = sort->e_table_config;
 	ETableSortInfo *sort_info = config->temp_state->sort_info;
 	ETableConfigSortWidgets *base = &config->sort[0];
+	GtkToggleButton *toggle_button;
 	gint idx = sort - base;
 	gchar *s;
 
@@ -775,8 +785,9 @@ sort_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *sort)
 			return;
 		}
 
-		c.ascending = GTK_TOGGLE_BUTTON (
-			config->sort [idx].radio_ascending)->active;
+		toggle_button = GTK_TOGGLE_BUTTON (
+			config->sort[idx].radio_ascending);
+		c.ascending = gtk_toggle_button_get_active (toggle_button);
 		c.column = col;
 		e_table_sort_info_sorting_set_nth (sort_info, idx, c);
 
@@ -799,7 +810,7 @@ sort_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *sort)
 	ETableSortColumn c;
 
 	c = e_table_sort_info_sorting_get_nth (si, idx);
-	c.ascending = t->active;
+	c.ascending = gtk_toggle_button_get_active (t);
 	e_table_sort_info_sorting_set_nth (si, idx, c);
 }
 
@@ -877,6 +888,7 @@ group_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *group)
 	s = configure_combo_box_get_active (combo_box);
 
 	if (s != NULL) {
+		GtkToggleButton *toggle_button;
 		ETableSortColumn c;
 		gint col;
 
@@ -887,8 +899,9 @@ group_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *group)
 			return;
 		}
 
-		c.ascending = GTK_TOGGLE_BUTTON (
-			config->group [idx].radio_ascending)->active;
+		toggle_button = GTK_TOGGLE_BUTTON (
+			config->group[idx].radio_ascending);
+		c.ascending = gtk_toggle_button_get_active (toggle_button);
 		c.column = col;
 		e_table_sort_info_grouping_set_nth (sort_info, idx, c);
 
@@ -911,7 +924,7 @@ group_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *group)
 	ETableSortColumn c;
 
 	c = e_table_sort_info_grouping_get_nth (si, idx);
-	c.ascending = t->active;
+	c.ascending = gtk_toggle_button_get_active (t);
 	e_table_sort_info_grouping_set_nth (si, idx, c);
 }
 
@@ -1324,15 +1337,23 @@ e_table_config_new (const gchar          *header,
 		    GtkWindow           *parent_window)
 {
 	ETableConfig *config = g_object_new (E_TABLE_CONFIG_TYPE, NULL);
+	GtkDialog *dialog;
+	GtkWidget *widget;
 
 	if (e_table_config_construct (config, header, spec, state, parent_window) == NULL) {
 		g_object_unref (config);
 		return NULL;
 	}
 
+	dialog = GTK_DIALOG (config->dialog_toplevel);
+
 	gtk_widget_ensure_style (config->dialog_toplevel);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (config->dialog_toplevel)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (config->dialog_toplevel)->action_area), 12);
+
+	widget = gtk_dialog_get_content_area (dialog);
+	gtk_container_set_border_width (GTK_CONTAINER (widget), 0);
+
+	widget = gtk_dialog_get_action_area (dialog);
+	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
 
 	gtk_dialog_set_response_sensitive (GTK_DIALOG (config->dialog_toplevel),
 					   GTK_RESPONSE_APPLY, FALSE);
@@ -1350,6 +1371,9 @@ e_table_config_new (const gchar          *header,
 void
 e_table_config_raise (ETableConfig *config)
 {
-	gdk_window_raise (GTK_WIDGET (config->dialog_toplevel)->window);
+	GdkWindow *window;
+
+	window = gtk_widget_get_window (GTK_WIDGET (config->dialog_toplevel));
+	gdk_window_raise (window);
 }
 
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index 74bbe827ac..c05506d953 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -63,21 +63,21 @@ e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *klass)
 	g_object_class_install_property (object_class, PROP_DND_CODE,
 					 g_param_spec_string ("dnd_code",
 							      "DnD code",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_FULL_HEADER,
 					 g_param_spec_object ("full_header",
 							      "Full Header",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      E_TABLE_HEADER_TYPE,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HEADER,
 					 g_param_spec_object ("header",
 							      "Header",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      E_TABLE_HEADER_TYPE,
 							      G_PARAM_READWRITE));
 }
@@ -85,17 +85,20 @@ e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *klass)
 static void
 e_table_field_chooser_dialog_init (ETableFieldChooserDialog *e_table_field_chooser_dialog)
 {
+	GtkDialog *dialog;
+	GtkWidget *content_area;
 	GtkWidget *widget;
 
+	dialog = GTK_DIALOG (e_table_field_chooser_dialog);
+
 	e_table_field_chooser_dialog->etfc = NULL;
 	e_table_field_chooser_dialog->dnd_code = g_strdup("");
 	e_table_field_chooser_dialog->full_header = NULL;
 	e_table_field_chooser_dialog->header = NULL;
 
-	gtk_dialog_add_button(GTK_DIALOG(e_table_field_chooser_dialog),
-			      GTK_STOCK_CLOSE, GTK_RESPONSE_OK);
+	gtk_dialog_add_button (dialog, GTK_STOCK_CLOSE, GTK_RESPONSE_OK);
 
-	gtk_window_set_resizable(GTK_WINDOW(e_table_field_chooser_dialog), TRUE);
+	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
 
 	widget = e_table_field_chooser_new();
 	e_table_field_chooser_dialog->etfc = E_TABLE_FIELD_CHOOSER(widget);
@@ -106,12 +109,12 @@ e_table_field_chooser_dialog_init (ETableFieldChooserDialog *e_table_field_choos
 		     "header", e_table_field_chooser_dialog->header,
 		     NULL);
 
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(e_table_field_chooser_dialog)->vbox),
-			   widget, TRUE, TRUE, 0);
+	content_area = gtk_dialog_get_content_area (dialog);
+	gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0);
 
-	gtk_widget_show(GTK_WIDGET(widget));
+	gtk_widget_show (GTK_WIDGET(widget));
 
-	gtk_window_set_title (GTK_WINDOW (e_table_field_chooser_dialog), _("Add a Column"));
+	gtk_window_set_title (GTK_WINDOW (dialog), _("Add a Column"));
 }
 
 GtkWidget*
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 69f1fe85dc..a04e4f3742 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -214,12 +214,14 @@ etfci_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint fl
 static void
 etfci_font_load (ETableFieldChooserItem *etfci)
 {
+	GtkWidget *widget;
 	GtkStyle *style;
 
 	if (etfci->font_desc)
 		pango_font_description_free (etfci->font_desc);
 
-	style = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas)->style;
+	widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas);
+	style = gtk_widget_get_style (widget);
 	etfci->font_desc = pango_font_description_copy (style->font_desc);
 }
 
@@ -462,7 +464,7 @@ etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint w
 
 	rows = e_table_header_count (etfci->combined_header);
 
-	style = GTK_WIDGET (canvas)->style;
+	style = gtk_widget_get_style (GTK_WIDGET (canvas));
 	state = gtk_widget_get_state (GTK_WIDGET (canvas));
 
 	y1 = y2 = 0;
@@ -519,6 +521,8 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdo
 	GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas);
 	GtkTargetList *list;
 	GdkDragContext *context;
+	GdkWindow *window;
+	GtkStyle *style;
 	GtkStateType state;
 	ETableCol *ecol;
 	GdkPixmap *pixmap;
@@ -551,24 +555,26 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdo
 	g_free(etfci_drag_types[0].target);
 
 	button_height = e_table_header_compute_height (ecol, widget);
-	pixmap = gdk_pixmap_new (widget->window, etfci->width, button_height, -1);
+	window = gtk_widget_get_window (widget);
+	pixmap = gdk_pixmap_new (window, etfci->width, button_height, -1);
 
+	style = gtk_widget_get_style (widget);
 	state = gtk_widget_get_state (widget);
 
-	e_table_header_draw_button (pixmap, ecol,
-				    widget->style, state,
-				    widget,
-				    0, 0,
-				    etfci->width, button_height,
-				    etfci->width, button_height,
-				    E_TABLE_COL_ARROW_NONE);
-
-	gtk_drag_set_icon_pixmap        (context,
-					 gdk_drawable_get_colormap (GDK_DRAWABLE (widget->window)),
-					 pixmap,
-					 NULL,
-					 etfci->width / 2,
-					 button_height / 2);
+	e_table_header_draw_button (
+		pixmap, ecol, style,
+		state, widget, 0, 0,
+		etfci->width, button_height,
+		etfci->width, button_height,
+		E_TABLE_COL_ARROW_NONE);
+
+	gtk_drag_set_icon_pixmap (
+		context,
+		gdk_drawable_get_colormap (GDK_DRAWABLE (window)),
+		pixmap, NULL,
+		etfci->width / 2,
+		button_height / 2);
+
 	g_object_unref (pixmap);
 	etfci->maybe_drag = FALSE;
 }
@@ -632,35 +638,35 @@ etfci_class_init (ETableFieldChooserItemClass *klass)
 	g_object_class_install_property (object_class, PROP_DND_CODE,
 					 g_param_spec_string ("dnd_code",
 							      "DnD code",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_FULL_HEADER,
 					 g_param_spec_object ("full_header",
 							      "Full Header",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      E_TABLE_HEADER_TYPE,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HEADER,
 					 g_param_spec_object ("header",
 							      "Header",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      E_TABLE_HEADER_TYPE,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_WIDTH,
 					 g_param_spec_double ("width",
 							      "Width",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      0, G_MAXDOUBLE, 0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HEIGHT,
 					 g_param_spec_double ("height",
 							      "Height",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      0, G_MAXDOUBLE, 0,
 							      G_PARAM_READABLE));
 }
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 3c1d722617..2cf0d5f114 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -62,21 +62,21 @@ e_table_field_chooser_class_init (ETableFieldChooserClass *klass)
 	g_object_class_install_property (object_class, PROP_DND_CODE,
 					 g_param_spec_string ("dnd_code",
 							      "DnD code",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_FULL_HEADER,
 					 g_param_spec_object ("full_header",
 							      "Full Header",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      E_TABLE_HEADER_TYPE,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HEADER,
 					 g_param_spec_object ("header",
 							      "Header",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      E_TABLE_HEADER_TYPE,
 							      G_PARAM_READWRITE));
 }
@@ -94,9 +94,9 @@ ensure_nonzero_step_increments (ETableFieldChooser *etfc)
 	  so use 16 pixels which should be OK
 	*/
 	if (va)
-		va->step_increment = 16.0;
+		gtk_adjustment_set_step_increment (va, 16.0);
 	if (ha)
-		ha->step_increment = 16.0;
+		gtk_adjustment_set_step_increment (ha, 16.0);
 }
 
 static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, ETableFieldChooser *etfc)
@@ -156,14 +156,14 @@ create_content (GnomeCanvas **canvas)
 	scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
 	gtk_widget_show (scrolledwindow1);
 	gtk_box_pack_start (GTK_BOX (vbox_top), scrolledwindow1, TRUE, TRUE, 0);
-	GTK_WIDGET_UNSET_FLAGS (scrolledwindow1, GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus (scrolledwindow1, FALSE);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
 	canvas_buttons = e_canvas_new ();
 	gtk_widget_show (canvas_buttons);
 	gtk_container_add (GTK_CONTAINER (scrolledwindow1), canvas_buttons);
-	GTK_WIDGET_UNSET_FLAGS (canvas_buttons, GTK_CAN_FOCUS);
-	GTK_WIDGET_UNSET_FLAGS (canvas_buttons, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_focus (canvas_buttons, FALSE);
+	gtk_widget_set_can_default (canvas_buttons, FALSE);
 
 	*canvas = GNOME_CANVAS (canvas_buttons);
 
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 810823db61..cf8aae1aff 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -146,6 +146,7 @@ e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContaine
 {
 	ETableCol *col;
 	ETableSortColumn column = e_table_sort_info_grouping_get_nth(sort_info, n);
+	GtkWidget *widget;
 	GtkStyle *style;
 
 	col = e_table_header_get_column_by_col_idx(full_header, column.column);
@@ -160,7 +161,8 @@ e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContaine
 	etgc->n = n;
 	etgc->ascending = column.ascending;
 
-	style = GTK_WIDGET (GNOME_CANVAS_ITEM (etgc)->canvas)->style;
+	widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etgc)->canvas);
+	style = gtk_widget_get_style (widget);
 	etgc->font_desc = pango_font_description_copy (style->font_desc);
 
 	etgc->open = TRUE;
@@ -339,12 +341,25 @@ compute_text (ETableGroupContainer *etgc, ETableGroupContainerChildNode *child_n
 	gchar *text;
 
 	if (etgc->ecol->text) {
-		text = g_strdup_printf (ngettext("%s : %s (%d item)",
-						 "%s : %s (%d items)",
+		/* Translators: This text is used as a special row when an ETable
+		   has turned on grouping on a column, which has set a title.
+		   The first %s is replaced with a column title.
+		   The second %s is replaced with an actual  group value.
+		   Finally the %d is replaced with count of items in this group.
+		   Example: "Family name: Smith (13 items)"
+		*/
+		text = g_strdup_printf (ngettext("%s: %s (%d item)",
+						 "%s: %s (%d items)",
 						 child_node->count),
 					etgc->ecol->text, child_node->string,
 					(gint) child_node->count);
 	} else {
+		/* Translators: This text is used as a special row when an ETable
+		   has turned on grouping on a column, which doesn't have set a title.
+		   The %s is replaced with an actual group value.
+		   The %d is replaced with count of items in this group.
+		   Example: "Smith (13 items)"
+		*/
 		text = g_strdup_printf (ngettext("%s (%d item)",
 						 "%s (%d items)",
 						 child_node->count),
@@ -929,85 +944,85 @@ etgc_class_init (ETableGroupContainerClass *klass)
 
 	g_object_class_install_property (object_class, PROP_TABLE_ALTERNATING_ROW_COLORS,
 					 g_param_spec_boolean ("alternating_row_colors",
-							       _( "Alternating Row Colors" ),
-							       _( "Alternating Row Colors" ),
+							       "Alternating Row Colors",
+							       "Alternating Row Colors",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_HORIZONTAL_DRAW_GRID,
 					 g_param_spec_boolean ("horizontal_draw_grid",
-							       _( "Horizontal Draw Grid" ),
-							       _( "Horizontal Draw Grid" ),
+							       "Horizontal Draw Grid",
+							       "Horizontal Draw Grid",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_VERTICAL_DRAW_GRID,
 					 g_param_spec_boolean ("vertical_draw_grid",
-							       _( "Vertical Draw Grid" ),
-							       _( "Vertical Draw Grid" ),
+							       "Vertical Draw Grid",
+							       "Vertical Draw Grid",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_DRAW_FOCUS,
 					 g_param_spec_boolean ("drawfocus",
-							       _( "Draw focus" ),
-							       _( "Draw focus" ),
+							       "Draw focus",
+							       "Draw focus",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_CURSOR_MODE,
 					 g_param_spec_int ("cursor_mode",
-							   _( "Cursor mode" ),
-							   _( "Cursor mode" ),
+							   "Cursor mode",
+							   "Cursor mode",
 							   E_CURSOR_LINE, E_CURSOR_SPREADSHEET, E_CURSOR_LINE,
 							   G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_SELECTION_MODEL,
 					 g_param_spec_object ("selection_model",
-							      _( "Selection model" ),
-							      _( "Selection model" ),
+							      "Selection model",
+							      "Selection model",
 							      E_SELECTION_MODEL_TYPE,
 							      G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_LENGTH_THRESHOLD,
 					 g_param_spec_int ("length_threshold",
-							   _( "Length Threshold" ),
-							   _( "Length Threshold" ),
+							   "Length Threshold",
+							   "Length Threshold",
 							   -1, G_MAXINT, 0,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_UNIFORM_ROW_HEIGHT,
 					 g_param_spec_boolean ("uniform_row_height",
-							       _( "Uniform row height" ),
-							       _( "Uniform row height" ),
+							       "Uniform row height",
+							       "Uniform row height",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_FROZEN,
 					 g_param_spec_boolean ("frozen",
-							       _( "Frozen" ),
-							       _( "Frozen" ),
+							       "Frozen",
+							       "Frozen",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HEIGHT,
 					 g_param_spec_double ("height",
-							      _( "Height" ),
-							      _( "Height" ),
+							      "Height",
+							      "Height",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_WIDTH,
 					 g_param_spec_double ("width",
-							      _( "Width" ),
-							      _( "Width" ),
+							      "Width",
+							      "Width",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_MINIMUM_WIDTH,
 					 g_param_spec_double ("minimum_width",
-							      _( "Minimum width" ),
-							      _( "Minimum Width" ),
+							      "Minimum width",
+							      "Minimum Width",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 }
@@ -1176,7 +1191,9 @@ e_table_group_container_print_page  (EPrintable *ep,
 				     ETGCPrintContext *groupcontext)
 {
 	cairo_t *cr;
+	GtkPageSetup *setup;
 	gdouble yd;
+	gdouble page_height, page_margin;
 	gdouble child_height;
 	ETableGroupContainerChildNode *child_node;
 	GList *child;
@@ -1187,7 +1204,10 @@ e_table_group_container_print_page  (EPrintable *ep,
 
 	child_printable = groupcontext->child_printable;
 	child = groupcontext->child;
-	yd = 6.5 * 72;
+	setup = gtk_print_context_get_page_setup (context);
+	page_height = gtk_page_setup_get_page_height (setup, GTK_UNIT_POINTS);
+	page_margin = gtk_page_setup_get_bottom_margin (setup, GTK_UNIT_POINTS) + gtk_page_setup_get_top_margin (setup, GTK_UNIT_POINTS);
+	yd = page_height - page_margin;
 
 	if (child_printable) {
 		if (child)
@@ -1251,7 +1271,7 @@ e_table_group_container_print_page  (EPrintable *ep,
 		cairo_rectangle (cr, 0, 0, width - 2 * TEXT_AREA_HEIGHT,child_height);
 		cairo_clip(cr);
 
-		e_printable_print_page (child_printable, context, width-2 * TEXT_AREA_HEIGHT, 0, quantize);
+		e_printable_print_page (child_printable, context, width-2 * TEXT_AREA_HEIGHT, height , quantize);
 		yd += child_height + TEXT_AREA_HEIGHT;
 
 		if (e_printable_data_left(child_printable))
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 1748d3e509..0b0c0f4a59 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -583,85 +583,85 @@ etgl_class_init (ETableGroupLeafClass *klass)
 
 	g_object_class_install_property (object_class, PROP_TABLE_ALTERNATING_ROW_COLORS,
 					 g_param_spec_boolean ("alternating_row_colors",
-							       _( "Alternating Row Colors" ),
-							       _( "Alternating Row Colors" ),
+							       "Alternating Row Colors",
+							       "Alternating Row Colors",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_HORIZONTAL_DRAW_GRID,
 					 g_param_spec_boolean ("horizontal_draw_grid",
-							       _( "Horizontal Draw Grid" ),
-							       _( "Horizontal Draw Grid" ),
+							       "Horizontal Draw Grid",
+							       "Horizontal Draw Grid",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_VERTICAL_DRAW_GRID,
 					 g_param_spec_boolean ("vertical_draw_grid",
-							       _( "Vertical Draw Grid" ),
-							       _( "Vertical Draw Grid" ),
+							       "Vertical Draw Grid",
+							       "Vertical Draw Grid",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_DRAW_FOCUS,
 					 g_param_spec_boolean ("drawfocus",
-							       _( "Draw focus" ),
-							       _( "Draw focus" ),
+							       "Draw focus",
+							       "Draw focus",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_CURSOR_MODE,
 					 g_param_spec_int ("cursor_mode",
-							   _( "Cursor mode" ),
-							   _( "Cursor mode" ),
+							   "Cursor mode",
+							   "Cursor mode",
 							   E_CURSOR_LINE, E_CURSOR_SPREADSHEET, E_CURSOR_LINE,
 							   G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_LENGTH_THRESHOLD,
 					 g_param_spec_int ("length_threshold",
-							   _( "Length Threshold" ),
-							   _( "Length Threshold" ),
+							   "Length Threshold",
+							   "Length Threshold",
 							   -1, G_MAXINT, 0,
 							   G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_SELECTION_MODEL,
 					 g_param_spec_object ("selection_model",
-							      _( "Selection model" ),
-							      _( "Selection model" ),
+							      "Selection model",
+							      "Selection model",
 							      E_SELECTION_MODEL_TYPE,
 							      G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_HEIGHT,
 					 g_param_spec_double ("height",
-							      _( "Height" ),
-							      _( "Height" ),
+							      "Height",
+							      "Height",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READABLE));
 
 	g_object_class_install_property (object_class, PROP_WIDTH,
 					 g_param_spec_double ("width",
-							      _( "Width" ),
-							      _( "Width" ),
+							      "Width",
+							      "Width",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_MINIMUM_WIDTH,
 					 g_param_spec_double ("minimum_width",
-							      _( "Minimum width" ),
-							      _( "Minimum Width" ),
+							      "Minimum width",
+							      "Minimum Width",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_FROZEN,
 					 g_param_spec_boolean ("frozen",
-							       _( "Frozen" ),
-							       _( "Frozen" ),
+							       "Frozen",
+							       "Frozen",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_UNIFORM_ROW_HEIGHT,
 					 g_param_spec_boolean ("uniform_row_height",
-							       _( "Uniform row height" ),
-							       _( "Uniform row height" ),
+							       "Uniform row height",
+							       "Uniform row height",
 							       FALSE,
 							       G_PARAM_READWRITE));
 }
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index b2bcb591f8..133a368754 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -498,6 +498,9 @@ make_shaped_window_from_xpm (const gchar **xpm)
 static void
 ethi_add_drop_marker (ETableHeaderItem *ethi, gint col, gboolean recreate)
 {
+	GnomeCanvas *canvas;
+	GtkAdjustment *adjustment;
+	GdkWindow *window;
 	gint rx, ry;
 	gint x;
 
@@ -515,14 +518,15 @@ ethi_add_drop_marker (ETableHeaderItem *ethi, gint col, gboolean recreate)
 		arrow_down = make_shaped_window_from_xpm (arrow_down_xpm);
 	}
 
-	gdk_window_get_origin (
-		GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas)->window,
-		&rx, &ry);
+	canvas = GNOME_CANVAS_ITEM (ethi)->canvas;
+	window = gtk_widget_get_window (GTK_WIDGET (canvas));
+	gdk_window_get_origin (window, &rx, &ry);
 
-	rx -= gtk_layout_get_hadjustment (
-		GTK_LAYOUT (GNOME_CANVAS_ITEM (ethi)->canvas))->value;
-	ry -= gtk_layout_get_vadjustment (
-		GTK_LAYOUT (GNOME_CANVAS_ITEM (ethi)->canvas))->value;
+	adjustment = gtk_layout_get_hadjustment (GTK_LAYOUT (canvas));
+	rx -= gtk_adjustment_get_value (adjustment);
+
+	adjustment = gtk_layout_get_vadjustment (GTK_LAYOUT (canvas));
+	ry -= gtk_adjustment_get_value (adjustment);
 
 	gtk_window_move (
 		GTK_WINDOW (arrow_down),
@@ -645,7 +649,13 @@ scroll_timeout (gpointer data)
 {
 	ETableHeaderItem *ethi = data;
 	gint dx = 0;
-	GtkAdjustment *h, *v;
+	GtkLayout *layout;
+	GtkAdjustment *adjustment;
+	gdouble hadjustment_value;
+	gdouble vadjustment_value;
+	gdouble page_size;
+	gdouble lower;
+	gdouble upper;
 	gdouble value;
 
 	if (ethi->scroll_direction & ET_SCROLL_RIGHT)
@@ -653,20 +663,35 @@ scroll_timeout (gpointer data)
 	if (ethi->scroll_direction & ET_SCROLL_LEFT)
 		dx -= 20;
 
-	h = GTK_LAYOUT(GNOME_CANVAS_ITEM (ethi)->canvas)->hadjustment;
-	v = GTK_LAYOUT(GNOME_CANVAS_ITEM (ethi)->canvas)->vadjustment;
+	layout = GTK_LAYOUT (GNOME_CANVAS_ITEM (ethi)->canvas);
+
+	adjustment = gtk_layout_get_hadjustment (layout);
+	hadjustment_value = gtk_adjustment_get_value (adjustment);
+
+	adjustment = gtk_layout_get_vadjustment (layout);
+	vadjustment_value = gtk_adjustment_get_value (adjustment);
+
+	value = hadjustment_value;
 
-	value = h->value;
+	adjustment = gtk_layout_get_hadjustment (layout);
+	page_size = gtk_adjustment_get_page_size (adjustment);
+	lower = gtk_adjustment_get_lower (adjustment);
+	upper = gtk_adjustment_get_upper (adjustment);
 
-	gtk_adjustment_set_value(h, CLAMP(h->value + dx, h->lower, h->upper - h->page_size));
+	gtk_adjustment_set_value (
+		adjustment, CLAMP (
+		hadjustment_value + dx, lower, upper - page_size));
 
-	if (h->value != value)
-		do_drag_motion(ethi,
-			       ethi->last_drop_context,
-			       ethi->last_drop_x + h->value,
-			       ethi->last_drop_y + v->value,
-			       ethi->last_drop_time,
-			       TRUE);
+	hadjustment_value = gtk_adjustment_get_value (adjustment);
+
+	if (hadjustment_value != value)
+		do_drag_motion(
+			ethi,
+			ethi->last_drop_context,
+			ethi->last_drop_x + hadjustment_value,
+			ethi->last_drop_y + vadjustment_value,
+			ethi->last_drop_time,
+			TRUE);
 
 	return TRUE;
 }
@@ -723,6 +748,10 @@ ethi_drag_motion (GtkWidget *widget,
                   guint time,
                   ETableHeaderItem *ethi)
 {
+	GtkAllocation allocation;
+	GtkAdjustment *adjustment;
+	gdouble hadjustment_value;
+	gdouble vadjustment_value;
 	gchar *droptype, *headertype;
 	guint direction = 0;
 
@@ -739,9 +768,11 @@ ethi_drag_motion (GtkWidget *widget,
 
 	g_free (headertype);
 
+	gtk_widget_get_allocation (widget, &allocation);
+
 	if (x < 20)
 		direction |= ET_SCROLL_LEFT;
-	if (x > widget->allocation.width - 20)
+	if (x > allocation.width - 20)
 		direction |= ET_SCROLL_RIGHT;
 
 	ethi->last_drop_x = x;
@@ -750,12 +781,17 @@ ethi_drag_motion (GtkWidget *widget,
 	ethi->last_drop_context = context;
 	context_connect (ethi, context);
 
-	do_drag_motion (ethi,
-			context,
-			x + GTK_LAYOUT(widget)->hadjustment->value,
-			y + GTK_LAYOUT(widget)->vadjustment->value,
-			time,
-			FALSE);
+	adjustment = gtk_layout_get_hadjustment (GTK_LAYOUT (widget));
+	hadjustment_value = gtk_adjustment_get_value (adjustment);
+
+	adjustment = gtk_layout_get_vadjustment (GTK_LAYOUT (widget));
+	vadjustment_value = gtk_adjustment_get_value (adjustment);
+
+	do_drag_motion (
+		ethi, context,
+		x + hadjustment_value,
+		y + vadjustment_value,
+		time, FALSE);
 
 	if (direction != 0)
 		scroll_on (ethi, direction);
@@ -781,20 +817,23 @@ ethi_drag_data_received (GtkWidget *canvas,
 			 GdkDragContext *drag_context,
 			 gint x,
 			 gint y,
-			 GtkSelectionData *data,
+			 GtkSelectionData *selection_data,
 			 guint info,
 			 guint time,
 			 ETableHeaderItem *ethi)
 {
+	const guchar *data;
 	gint found = FALSE;
 	gint count;
 	gint column;
 	gint drop_col;
 	gint i;
 
-	if (data->data) {
+	data = gtk_selection_data_get_data (selection_data);
+
+	if (data != NULL) {
 		count = e_table_header_count(ethi->eth);
-		column = atoi((gchar *)data->data);
+		column = atoi((gchar *)data);
 		drop_col = ethi->drop_col;
 		ethi->drop_col = -1;
 
@@ -891,6 +930,7 @@ static void
 ethi_realize (GnomeCanvasItem *item)
 {
 	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
+	GtkStyle *style;
 	GtkTargetEntry  ethi_drop_types [] = {
 		{ (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
 	};
@@ -898,8 +938,10 @@ ethi_realize (GnomeCanvasItem *item)
 	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)-> realize)
 		(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->realize)(item);
 
+	style = gtk_widget_get_style (GTK_WIDGET (item->canvas));
+
 	if (!ethi->font_desc)
-		ethi_font_set (ethi, GTK_WIDGET (item->canvas)->style->font_desc);
+		ethi_font_set (ethi, style->font_desc);
 
 	/*
 	 * Now, configure DnD
@@ -972,6 +1014,11 @@ ethi_draw (GnomeCanvasItem *item,
 	gint x1, x2;
 	gint col;
 	GHashTable *arrows = g_hash_table_new (NULL, NULL);
+	GtkStateType state;
+	GtkStyle *style;
+
+	state = gtk_widget_get_state (GTK_WIDGET (canvas));
+	style = gtk_widget_get_style (GTK_WIDGET (canvas));
 
 	if (ethi->sort_info) {
 		gint length = e_table_sort_info_grouping_get_count(ethi->sort_info);
@@ -1018,15 +1065,13 @@ ethi_draw (GnomeCanvasItem *item,
 
 		state = gtk_widget_get_state (GTK_WIDGET (canvas));
 
-		e_table_header_draw_button (drawable, ecol,
-					    GTK_WIDGET (canvas)->style,
-					    state,
-					    GTK_WIDGET (canvas),
-					    x1 - x, -y,
-					    width, height,
-					    x2 - x1, ethi->height,
-					    (ETableColArrow) g_hash_table_lookup (
-						    arrows, GINT_TO_POINTER (ecol->col_idx)));
+		e_table_header_draw_button (
+			drawable, ecol,
+			style, state, GTK_WIDGET (canvas),
+			x1 - x, -y, width, height,
+			x2 - x1, ethi->height,
+			(ETableColArrow) g_hash_table_lookup (
+			arrows, GINT_TO_POINTER (ecol->col_idx)));
 	}
 
 	g_hash_table_destroy (arrows);
@@ -1088,12 +1133,16 @@ is_pointer_on_division (ETableHeaderItem *ethi,
 static void
 set_cursor (ETableHeaderItem *ethi, gint pos)
 {
-	gint col;
-	GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
+	GnomeCanvas *canvas;
+	GdkWindow *window;
 	gboolean resizable = FALSE;
+	gint col;
+
+	canvas = GNOME_CANVAS_ITEM (ethi)->canvas;
+	window = gtk_widget_get_window (GTK_WIDGET (canvas));
 
 	/* We might be invoked before we are realized */
-	if (!canvas->window)
+	if (window == NULL)
 		return;
 
 	if (is_pointer_on_division (ethi, pos, NULL, &col)) {
@@ -1119,9 +1168,9 @@ set_cursor (ETableHeaderItem *ethi, gint pos)
 	}
 
 	if (resizable)
-		gdk_window_set_cursor (canvas->window, ethi->resize_cursor);
+		gdk_window_set_cursor (window, ethi->resize_cursor);
 	else
-		gdk_window_set_cursor (canvas->window, NULL);
+		gdk_window_set_cursor (window, NULL);
 }
 
 static void
@@ -1157,17 +1206,24 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
 	GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
 	GtkTargetList *list;
 	GdkDragContext *context;
-	GtkStateType state;
 	ETableCol *ecol;
 	gint col_width;
 	GdkPixmap *pixmap;
 	gint group_indent = 0;
 	GHashTable *arrows = g_hash_table_new (NULL, NULL);
+	GtkStateType state;
+	GtkStyle *style;
+	GdkWindow *window;
 
 	GtkTargetEntry  ethi_drag_types [] = {
 		{ (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
 	};
 
+	widget = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
+	window = gtk_widget_get_window (widget);
+	state = gtk_widget_get_state (widget);
+	style = gtk_widget_get_style (widget);
+
 	ethi->drag_col = ethi_find_col_by_x (ethi, event->motion.x);
 
 	if (ethi->drag_col == -1)
@@ -1212,23 +1268,21 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
 
 	ecol = e_table_header_get_column (ethi->eth, ethi->drag_col);
 	col_width = ecol->width;
-	pixmap = gdk_pixmap_new (widget->window, col_width, ethi->height, -1);
+	pixmap = gdk_pixmap_new (window, col_width, ethi->height, -1);
 
 	state = gtk_widget_get_state (widget);
 
 	e_table_header_draw_button (
 		pixmap, ecol,
-		widget->style,
-		state,
-		widget,
-		0, 0,
+		style, state,
+		widget, 0, 0,
 		col_width, ethi->height,
 		col_width, ethi->height,
 		(ETableColArrow) g_hash_table_lookup (
 			arrows, GINT_TO_POINTER (ecol->col_idx)));
 	gtk_drag_set_icon_pixmap (
 		context,
-		gdk_drawable_get_colormap (GDK_DRAWABLE (widget->window)),
+		gdk_drawable_get_colormap (GDK_DRAWABLE (window)),
 		pixmap,
 		NULL,
 		col_width / 2,
@@ -1754,6 +1808,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 {
 	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
 	GnomeCanvas *canvas = item->canvas;
+	GdkWindow *window;
 	const gboolean resizing = ETHI_RESIZING (ethi);
 	gint x, y, start, col;
 	gint was_maybe_drag = 0;
@@ -1765,7 +1820,8 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 		break;
 
 	case GDK_LEAVE_NOTIFY:
-		gdk_window_set_cursor (GTK_WIDGET (canvas)->window, NULL);
+		window = gtk_widget_get_window (GTK_WIDGET (canvas));
+		gdk_window_set_cursor (window, NULL);
 		break;
 
 	case GDK_MOTION_NOTIFY:
@@ -1953,49 +2009,49 @@ ethi_class_init (ETableHeaderItemClass *klass)
 	g_object_class_install_property (object_class, PROP_DND_CODE,
 					 g_param_spec_string ("dnd_code",
 							      "DnD code",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_FONT_DESC,
 					 g_param_spec_boxed ("font-desc",
 							     "Font Description",
-							     /*_( */"XXX blurb" /*)*/,
+							     NULL,
 							     PANGO_TYPE_FONT_DESCRIPTION,
 							     G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_FULL_HEADER,
 					 g_param_spec_object ("full_header",
 							      "Full Header",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      E_TABLE_HEADER_TYPE,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_HEADER,
 					 g_param_spec_object ("ETableHeader",
 							      "Header",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      E_TABLE_HEADER_TYPE,
 							      G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_SORT_INFO,
 					 g_param_spec_object ("sort_info",
 							      "Sort Info",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      E_TABLE_SORT_INFO_TYPE,
 							      G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE,
 					 g_param_spec_object ("table",
 							      "Table",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      E_TABLE_TYPE,
 							      G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TREE,
 					 g_param_spec_object ("tree",
 							      "Tree",
-							      /*_( */"XXX blurb" /*)*/,
+							      NULL,
 							      E_TREE_TYPE,
 							      G_PARAM_WRITABLE));
 
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 78ff576820..0547b22228 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -349,13 +349,13 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
 		gtk_container_add (GTK_CONTAINER (window), button);
 		gtk_widget_ensure_style (window);
 		gtk_widget_ensure_style (button);
-		g_label = GTK_BIN(button)->child;
+		g_label = gtk_bin_get_child (GTK_BIN (button));
 		g_object_add_weak_pointer (G_OBJECT (g_label), &g_label);
 		gtk_widget_ensure_style (g_label);
 		gtk_widget_realize (g_label);
 	}
 
-	gc = GTK_WIDGET (g_label)->style->fg_gc[state];
+	gc = gtk_widget_get_style (GTK_WIDGET (g_label))->fg_gc[state];
 
 	gdk_gc_set_clip_rectangle (gc, NULL);
 
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 1bc3a08dc5..381f0cd24c 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -245,22 +245,22 @@ inline static GdkColor *
 eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean selected, gboolean *allocatedp)
 {
 	ECellView *ecell_view = eti->cell_views [col];
-	GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(eti)->canvas);
+	GtkWidget *canvas;
 	GdkColor *background, bg;
+	GtkStyle *style;
 	gchar *color_spec = NULL;
 	gboolean allocated = FALSE;
 
+	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas);
+	style = gtk_widget_get_style (canvas);
+
 	if (selected) {
-#if GTK_CHECK_VERSION(2,19,7)
 		if (gtk_widget_has_focus (canvas))
-#else
-		if (GTK_WIDGET_HAS_FOCUS(canvas))
-#endif
-			background = &canvas->style->bg [GTK_STATE_SELECTED];
+			background = &style->bg [GTK_STATE_SELECTED];
 		else
-			background = &canvas->style->bg [GTK_STATE_ACTIVE];
+			background = &style->bg [GTK_STATE_ACTIVE];
 	} else {
-		background = &canvas->style->base [GTK_STATE_NORMAL];
+		background = &style->base [GTK_STATE_NORMAL];
 	}
 
 	color_spec = e_cell_get_bg_color (ecell_view, row);
@@ -268,7 +268,7 @@ eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean sel
 	if (color_spec != NULL) {
 		if (gdk_color_parse (color_spec, &bg)) {
 			background = gdk_color_copy (&bg);
-			gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (canvas)), background,
+			gdk_colormap_alloc_color (gtk_widget_get_colormap (canvas), background,
 						  FALSE, TRUE);
 			allocated = TRUE;
 		}
@@ -283,7 +283,7 @@ eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean sel
 				allocated = TRUE;
 			}
 			e_hsv_tweak (background, 0.0f, 0.0f, -0.07f);
-			gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (canvas)), background,
+			gdk_colormap_alloc_color (gtk_widget_get_colormap (canvas), background,
 						  FALSE, TRUE);
 		}
 	}
@@ -296,23 +296,23 @@ eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean sel
 inline static GdkColor *
 eti_get_cell_foreground_color (ETableItem *eti, gint row, gint col, gboolean selected, gboolean *allocated)
 {
-	GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(eti)->canvas);
+	GtkWidget *canvas;
 	GdkColor *foreground;
+	GtkStyle *style;
+
+	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas);
+	style = gtk_widget_get_style (canvas);
 
 	if (allocated)
 		*allocated = FALSE;
 
 	if (selected) {
-#if GTK_CHECK_VERSION(2,19,7)
 		if (gtk_widget_has_focus (canvas))
-#else
-		if (GTK_WIDGET_HAS_FOCUS (canvas))
-#endif
-			foreground = &canvas->style->fg [GTK_STATE_SELECTED];
+			foreground = &style->fg [GTK_STATE_SELECTED];
 		else
-			foreground = &canvas->style->fg [GTK_STATE_ACTIVE];
+			foreground = &style->fg [GTK_STATE_ACTIVE];
 	} else {
-		foreground = &canvas->style->text [GTK_STATE_NORMAL];
+		foreground = &style->text [GTK_STATE_NORMAL];
 	}
 
 	return foreground;
@@ -1631,8 +1631,9 @@ static void
 eti_realize (GnomeCanvasItem *item)
 {
 	ETableItem *eti = E_TABLE_ITEM (item);
-	GtkWidget *canvas_widget = GTK_WIDGET (item->canvas);
 	GdkWindow *window;
+	GtkWidget *widget;
+	GtkStyle *style;
 
 	if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)
                 (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item);
@@ -1642,15 +1643,17 @@ eti_realize (GnomeCanvasItem *item)
 	/*
 	 * Gdk Resource allocation
 	 */
-	window = canvas_widget->window;
+	widget = GTK_WIDGET (item->canvas);
+	style = gtk_widget_get_style (widget);
+	window = gtk_widget_get_window (widget);
 
 	eti->fill_gc = gdk_gc_new (window);
 
 	eti->grid_gc = gdk_gc_new (window);
-	gdk_gc_set_foreground (eti->grid_gc, &canvas_widget->style->dark [GTK_STATE_NORMAL]);
+	gdk_gc_set_foreground (eti->grid_gc, &style->dark [GTK_STATE_NORMAL]);
 	eti->focus_gc = gdk_gc_new (window);
-	gdk_gc_set_foreground (eti->focus_gc, &canvas_widget->style->bg [GTK_STATE_NORMAL]);
-	gdk_gc_set_background (eti->focus_gc, &canvas_widget->style->fg [GTK_STATE_NORMAL]);
+	gdk_gc_set_foreground (eti->focus_gc, &style->bg [GTK_STATE_NORMAL]);
+	gdk_gc_set_background (eti->focus_gc, &style->fg [GTK_STATE_NORMAL]);
 	eti->stipple = gdk_bitmap_create_from_data (NULL, gray50_bits, gray50_width, gray50_height);
 	gdk_gc_set_ts_origin (eti->focus_gc, 0, 0);
 	gdk_gc_set_stipple (eti->focus_gc, eti->stipple);
@@ -1933,11 +1936,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 				gdk_color_free (background);
 
 			flags = col_selected ? E_CELL_SELECTED : 0;
-#if GTK_CHECK_VERSION(2,19,7)
 			flags |= gtk_widget_has_focus (canvas) ? E_CELL_FOCUSED : 0;
-#else
-			flags |= GTK_WIDGET_HAS_FOCUS(canvas) ? E_CELL_FOCUSED : 0;
-#endif
 			flags |= cursor ? E_CELL_CURSOR : 0;
 
 			switch (ecol->justification) {
@@ -2818,98 +2817,98 @@ eti_class_init (ETableItemClass *klass)
 
 	g_object_class_install_property (object_class, PROP_TABLE_HEADER,
 					 g_param_spec_object ("ETableHeader",
-							      _( "Table header" ),
-							      _( "Table header" ),
+							      "Table header",
+							      "Table header",
 							      E_TABLE_HEADER_TYPE,
 							      G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_MODEL,
 					 g_param_spec_object ("ETableModel",
-							      _( "Table model" ),
-							      _( "Table model" ),
+							      "Table model",
+							      "Table model",
 							      E_TABLE_MODEL_TYPE,
 							      G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_SELECTION_MODEL,
 					 g_param_spec_object ("selection_model",
-							      _( "Selection model" ),
-							      _( "Selection model" ),
+							      "Selection model",
+							      "Selection model",
 							      E_SELECTION_MODEL_TYPE,
 							      G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_ALTERNATING_ROW_COLORS,
 					 g_param_spec_boolean ("alternating_row_colors",
-							       _( "Alternating Row Colors" ),
-							       _( "Alternating Row Colors" ),
+							       "Alternating Row Colors",
+							       "Alternating Row Colors",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_HORIZONTAL_DRAW_GRID,
 					 g_param_spec_boolean ("horizontal_draw_grid",
-							       _( "Horizontal Draw Grid" ),
-							       _( "Horizontal Draw Grid" ),
+							       "Horizontal Draw Grid",
+							       "Horizontal Draw Grid",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_VERTICAL_DRAW_GRID,
 					 g_param_spec_boolean ("vertical_draw_grid",
-							       _( "Vertical Draw Grid" ),
-							       _( "Vertical Draw Grid" ),
+							       "Vertical Draw Grid",
+							       "Vertical Draw Grid",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_DRAW_FOCUS,
 					 g_param_spec_boolean ("drawfocus",
-							       _( "Draw focus" ),
-							       _( "Draw focus" ),
+							       "Draw focus",
+							       "Draw focus",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_CURSOR_MODE,
 					 g_param_spec_int ("cursor_mode",
-							   _( "Cursor mode" ),
-							   _( "Cursor mode" ),
+							   "Cursor mode",
+							   "Cursor mode",
 							   E_CURSOR_LINE, E_CURSOR_SPREADSHEET, E_CURSOR_LINE,
 							   G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_LENGTH_THRESHOLD,
 					 g_param_spec_int ("length_threshold",
-							   _( "Length Threshold" ),
-							   _( "Length Threshold" ),
+							   "Length Threshold",
+							   "Length Threshold",
 							   -1, G_MAXINT, 0,
 							   G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_MINIMUM_WIDTH,
 					 g_param_spec_double ("minimum_width",
-							      _( "Minimum width" ),
-							      _( "Minimum Width" ),
+							      "Minimum width",
+							      "Minimum Width",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_WIDTH,
 					 g_param_spec_double ("width",
-							      _( "Width" ),
-							      _( "Width" ),
+							      "Width",
+							      "Width",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 	g_object_class_install_property (object_class, PROP_HEIGHT,
 					 g_param_spec_double ("height",
-							      _( "Height" ),
-							      _( "Height" ),
+							      "Height",
+							      "Height",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READABLE));
 
 	g_object_class_install_property (object_class, PROP_CURSOR_ROW,
 					 g_param_spec_int ("cursor_row",
-							   _( "Cursor row" ),
-							   _( "Cursor row" ),
+							   "Cursor row",
+							   "Cursor row",
 							   0, G_MAXINT, 0,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_UNIFORM_ROW_HEIGHT,
 					 g_param_spec_boolean ("uniform_row_height",
-							       _( "Uniform row height" ),
-							       _( "Uniform row height" ),
+							       "Uniform row height",
+							       "Uniform row height",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index 67a27cde01..3e98ddbfef 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -299,15 +299,15 @@ e_table_selection_model_class_init (ETableSelectionModelClass *klass)
 
 	g_object_class_install_property (object_class, PROP_MODEL,
 					 g_param_spec_object ("model",
-							      _("Model"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Model",
+							      NULL,
 							      E_TABLE_MODEL_TYPE,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HEADER,
 					 g_param_spec_object ("header",
-							      _("Header"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Header",
+							      NULL,
 							      E_TABLE_HEADER_TYPE,
 							      G_PARAM_READWRITE));
 }
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 82ed1d860a..805aed5ca1 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -170,8 +170,8 @@ ets_class_init (ETableSorterClass *klass)
 
 	g_object_class_install_property (object_class, PROP_SORT_INFO,
 					 g_param_spec_object ("sort_info",
-							      _("Sort Info"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Sort Info",
+							      NULL,
 							      E_TABLE_SORT_INFO_TYPE,
 							      G_PARAM_READWRITE));
 }
diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c
index 8ad797a9d1..c07293242c 100644
--- a/widgets/table/e-table-sorting-utils.c
+++ b/widgets/table/e-table-sorting-utils.c
@@ -23,8 +23,7 @@
 #include <config.h>
 
 #include <string.h>
-
-#include <camel/camel-string-utils.h>
+#include <camel/camel.h>
 
 #include "e-util/e-util.h"
 
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index 89affd357d..f3bce34487 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -36,6 +36,7 @@ ETableHeader *
 e_table_state_to_header (GtkWidget *widget, ETableHeader *full_header, ETableState *state)
 {
 	ETableHeader *nh;
+	GtkStyle *style;
 	const gint max_cols = e_table_header_count (full_header);
 	gint column;
 	GValue *val = g_new0 (GValue, 1);
@@ -44,9 +45,11 @@ e_table_state_to_header (GtkWidget *widget, ETableHeader *full_header, ETableSta
 	g_return_val_if_fail (full_header, NULL);
 	g_return_val_if_fail (state, NULL);
 
+	style = gtk_widget_get_style (widget);
+
 	nh = e_table_header_new ();
 	g_value_init (val, G_TYPE_DOUBLE);
-	g_value_set_double (val, e_table_header_width_extras (widget->style));
+	g_value_set_double (val, e_table_header_width_extras (style));
 	g_object_set_property (G_OBJECT(nh), "width_extras", val);
 	g_free (val);
 
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 8110732e2c..088e4e1693 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -58,7 +58,9 @@
 #define d(x)
 
 #if d(!)0
-#define e_table_item_leave_edit_(x) (e_table_item_leave_edit((x)), g_print ("%s: e_table_item_leave_edit\n", __FUNCTION__))
+#define e_table_item_leave_edit_(x) \
+	(e_table_item_leave_edit ((x)), \
+	 g_print ("%s: e_table_item_leave_edit\n", __FUNCTION__))
 #else
 #define e_table_item_leave_edit_(x) (e_table_item_leave_edit((x)))
 #endif
@@ -199,7 +201,9 @@ e_table_state_change (ETable *et)
 	g_signal_emit (G_OBJECT (et), et_signals [STATE_CHANGE], 0);
 }
 
-#define CHECK_HORIZONTAL(et) if ((et)->horizontal_scrolling || (et)->horizontal_resize) e_table_header_update_horizontal (et->header);
+#define CHECK_HORIZONTAL(et) \
+	if ((et)->horizontal_scrolling || (et)->horizontal_resize) \
+		e_table_header_update_horizontal (et->header);
 
 static void
 clear_current_search_col (ETable *et)
@@ -288,7 +292,8 @@ connect_header (ETable *e_table, ETableState *state)
 	if (e_table->header != NULL)
 		disconnect_header (e_table);
 
-	e_table->header = e_table_state_to_header (GTK_WIDGET(e_table), e_table->full_header, state);
+	e_table->header = e_table_state_to_header (
+		GTK_WIDGET (e_table), e_table->full_header, state);
 
 	e_table->structure_change_id =
 		g_signal_connect (G_OBJECT (e_table->header), "structure_change",
@@ -409,7 +414,11 @@ et_unrealize (GtkWidget *widget)
 }
 
 static gboolean
-check_row (ETable *et, gint model_row, gint col, ETableSearchFunc search, gchar *string)
+check_row (ETable *et,
+           gint model_row,
+           gint col,
+           ETableSearchFunc search,
+           gchar *string)
 {
 	gconstpointer value;
 
@@ -419,7 +428,10 @@ check_row (ETable *et, gint model_row, gint col, ETableSearchFunc search, gchar
 }
 
 static gboolean
-et_search_search (ETableSearch *search, gchar *string, ETableSearchFlags flags, ETable *et)
+et_search_search (ETableSearch *search,
+                  gchar *string,
+                  ETableSearchFlags flags,
+                  ETable *et)
 {
 	gint cursor;
 	gint rows;
@@ -435,7 +447,9 @@ et_search_search (ETableSearch *search, gchar *string, ETableSearchFlags flags,
 		     "cursor_row", &cursor,
 		     NULL);
 
-	if ((flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST) && cursor < rows && cursor >= 0 && check_row (et, cursor, col->col_idx, col->search, string))
+	if ((flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST) &&
+		cursor < rows && cursor >= 0 &&
+		check_row (et, cursor, col->col_idx, col->search, string))
 		return TRUE;
 
 	cursor = e_sorter_model_to_sorted (E_SORTER (et->sorter), cursor);
@@ -443,7 +457,9 @@ et_search_search (ETableSearch *search, gchar *string, ETableSearchFlags flags,
 	for (i = cursor + 1; i < rows; i++) {
 		gint model_row = e_sorter_sorted_to_model (E_SORTER (et->sorter), i);
 		if (check_row (et, model_row, col->col_idx, col->search, string)) {
-			e_selection_model_select_as_key_press(E_SELECTION_MODEL (et->selection), model_row, col->col_idx, GDK_CONTROL_MASK);
+			e_selection_model_select_as_key_press (
+				E_SELECTION_MODEL (et->selection),
+				model_row, col->col_idx, GDK_CONTROL_MASK);
 			return TRUE;
 		}
 	}
@@ -451,7 +467,9 @@ et_search_search (ETableSearch *search, gchar *string, ETableSearchFlags flags,
 	for (i = 0; i < cursor; i++) {
 		gint model_row = e_sorter_sorted_to_model (E_SORTER (et->sorter), i);
 		if (check_row (et, model_row, col->col_idx, col->search, string)) {
-			e_selection_model_select_as_key_press(E_SELECTION_MODEL (et->selection), model_row, col->col_idx, GDK_CONTROL_MASK);
+			e_selection_model_select_as_key_press (
+				E_SELECTION_MODEL (et->selection),
+				model_row, col->col_idx, GDK_CONTROL_MASK);
 			return TRUE;
 		}
 	}
@@ -459,7 +477,9 @@ et_search_search (ETableSearch *search, gchar *string, ETableSearchFlags flags,
 	cursor = e_sorter_sorted_to_model (E_SORTER (et->sorter), cursor);
 
 	/* Check if the cursor row is the only matching row. */
-	return (!(flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST) && cursor < rows && cursor >= 0 && check_row (et, cursor, col->col_idx, col->search, string));
+	return (!(flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST) &&
+		cursor < rows && cursor >= 0 &&
+		check_row (et, cursor, col->col_idx, col->search, string));
 }
 
 static void
@@ -471,10 +491,10 @@ et_search_accept (ETableSearch *search, ETable *et)
 	if (col == NULL)
 		return;
 
-	g_object_get(et->selection,
-		     "cursor_row", &cursor,
-		     NULL);
-	e_selection_model_select_as_key_press(E_SELECTION_MODEL (et->selection), cursor, col->col_idx, 0);
+	g_object_get (et->selection, "cursor_row", &cursor, NULL);
+
+	e_selection_model_select_as_key_press (
+		E_SELECTION_MODEL (et->selection), cursor, col->col_idx, 0);
 }
 
 static void
@@ -509,11 +529,9 @@ et_finalize (GObject *object)
 static void
 e_table_init (ETable *e_table)
 {
-	GtkTable *gtk_table = GTK_TABLE (e_table);
+	gtk_widget_set_can_focus (GTK_WIDGET (e_table), TRUE);
 
-	GTK_WIDGET_SET_FLAGS (GTK_WIDGET (e_table), GTK_CAN_FOCUS);
-
-	gtk_table->homogeneous          = FALSE;
+	gtk_table_set_homogeneous (GTK_TABLE (e_table), FALSE);
 
 	e_table->sort_info              = NULL;
 	e_table->group_info_change_id   = 0;
@@ -582,7 +600,7 @@ et_focus (GtkWidget *container, GtkDirectionType direction)
 
 	e_table = E_TABLE (container);
 
-	if (GTK_CONTAINER (container)->focus_child) {
+	if (gtk_container_get_focus_child (GTK_CONTAINER (container))) {
 		gtk_container_set_focus_child (GTK_CONTAINER (container), NULL);
 		return FALSE;
 	}
@@ -615,14 +633,18 @@ set_header_canvas_width (ETable *e_table)
 static void
 header_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETable *e_table)
 {
+	GtkAllocation allocation;
+
 	set_header_canvas_width (e_table);
 
+	gtk_widget_get_allocation (
+		GTK_WIDGET (e_table->header_canvas), &allocation);
+
 	/* When the header item is created ->height == 0,
 	   as the font is only created when everything is realized.
 	   So we set the usize here as well, so that the size of the
 	   header is correct */
-	if (GTK_WIDGET (e_table->header_canvas)->allocation.height !=
-	    E_TABLE_HEADER_ITEM (e_table->header_item)->height)
+	if (allocation.height != E_TABLE_HEADER_ITEM (e_table->header_item)->height)
 		g_object_set (
 			e_table->header_canvas, "height-request",
 			E_TABLE_HEADER_ITEM (e_table->header_item)->height,
@@ -688,14 +710,16 @@ table_canvas_reflow_idle (ETable *e_table)
 {
 	gdouble height, width;
 	gdouble oldheight, oldwidth;
-	GtkAllocation *alloc = &(GTK_WIDGET (e_table->table_canvas)->allocation);
+	GtkAllocation allocation;
 
-	g_object_get (e_table->canvas_vbox,
-		      "height", &height,
-		      "width", &width,
-		      NULL);
-	height = MAX ((gint)height, alloc->height);
-	width = MAX((gint)width, alloc->width);
+	gtk_widget_get_allocation (
+		GTK_WIDGET (e_table->table_canvas), &allocation);
+
+	g_object_get (
+		e_table->canvas_vbox,
+		"height", &height, "width", &width, NULL);
+	height = MAX ((gint)height, allocation.height);
+	width = MAX((gint)width, allocation.width);
 	/* I have no idea why this needs to be -1, but it works. */
 	gnome_canvas_get_scroll_region (GNOME_CANVAS (e_table->table_canvas),
 					NULL, NULL, &oldwidth, &oldheight);
@@ -745,7 +769,9 @@ static void
 table_canvas_reflow (GnomeCanvas *canvas, ETable *e_table)
 {
 	if (!e_table->reflow_idle_id)
-		e_table->reflow_idle_id = g_idle_add_full (400, (GSourceFunc) table_canvas_reflow_idle, e_table, NULL);
+		e_table->reflow_idle_id = g_idle_add_full (
+			400, (GSourceFunc) table_canvas_reflow_idle,
+			e_table, NULL);
 }
 
 static void
@@ -787,7 +813,11 @@ static gboolean
 group_right_click (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *et)
 {
 	gboolean return_val = FALSE;
-	g_signal_emit (G_OBJECT (et), et_signals [RIGHT_CLICK], 0, row, col, event, &return_val);
+
+	g_signal_emit (
+		et, et_signals[RIGHT_CLICK], 0,
+		row, col, event, &return_val);
+
 	return return_val;
 }
 
@@ -805,14 +835,24 @@ group_key_press (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *
 	gboolean return_val = FALSE;
 	GdkEventKey *key = (GdkEventKey *) event;
 	gint y, row_local, col_local;
-	GtkAdjustment *vadj;
+	GtkAdjustment *adjustment;
+	GtkLayout *layout;
+	gdouble page_size;
+	gdouble upper;
+	gdouble value;
+
+	layout = GTK_LAYOUT (et->table_canvas);
+	adjustment = gtk_layout_get_vadjustment (layout);
 
 	switch (key->keyval) {
 	case GDK_Page_Down:
 	case GDK_KP_Page_Down:
-		vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (et->table_canvas));
-		y = CLAMP(vadj->value + (2 * vadj->page_size - 50), 0, vadj->upper);
-		y -= vadj->value;
+		page_size = gtk_adjustment_get_page_size (adjustment);
+		upper = gtk_adjustment_get_value (adjustment);
+		value = gtk_adjustment_get_value (adjustment);
+
+		y = CLAMP (value + (2 * page_size - 50), 0, upper);
+		y -= value;
 		e_table_get_cell_at (et, 30, y, &row_local, &col_local);
 
 		if (row_local == -1)
@@ -820,14 +860,19 @@ group_key_press (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *
 
 		row_local = e_table_view_to_model_row (et, row_local);
 		col_local = e_selection_model_cursor_col (E_SELECTION_MODEL (et->selection));
-		e_selection_model_select_as_key_press (E_SELECTION_MODEL (et->selection), row_local, col_local, key->state);
+		e_selection_model_select_as_key_press (
+			E_SELECTION_MODEL (et->selection),
+			row_local, col_local, key->state);
 		return_val = 1;
 		break;
 	case GDK_Page_Up:
 	case GDK_KP_Page_Up:
-		vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (et->table_canvas));
-		y = CLAMP(vadj->value - (vadj->page_size - 50), 0, vadj->upper);
-		y -= vadj->value;
+		page_size = gtk_adjustment_get_page_size (adjustment);
+		upper = gtk_adjustment_get_upper (adjustment);
+		value = gtk_adjustment_get_value (adjustment);
+
+		y = CLAMP (value - (page_size - 50), 0, upper);
+		y -= value;
 		e_table_get_cell_at (et, 30, y, &row_local, &col_local);
 
 		if (row_local == -1)
@@ -835,7 +880,9 @@ group_key_press (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *
 
 		row_local = e_table_view_to_model_row (et, row_local);
 		col_local = e_selection_model_cursor_col (E_SELECTION_MODEL (et->selection));
-		e_selection_model_select_as_key_press (E_SELECTION_MODEL (et->selection), row_local, col_local, key->state);
+		e_selection_model_select_as_key_press (
+			E_SELECTION_MODEL (et->selection),
+			row_local, col_local, key->state);
 		return_val = 1;
 		break;
 	case GDK_BackSpace:
@@ -845,7 +892,9 @@ group_key_press (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *
 		/* Fall through */
 	default:
 		init_search (et);
-		if ((key->state & ~(GDK_SHIFT_MASK | GDK_LOCK_MASK | GDK_MOD1_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK | GDK_MOD4_MASK | GDK_MOD5_MASK)) == 0
+		if ((key->state & ~(GDK_SHIFT_MASK | GDK_LOCK_MASK |
+			GDK_MOD1_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK |
+			GDK_MOD4_MASK | GDK_MOD5_MASK)) == 0
 		    && ((key->keyval >= GDK_a && key->keyval <= GDK_z) ||
 			(key->keyval >= GDK_A && key->keyval <= GDK_Z) ||
 			(key->keyval >= GDK_0 && key->keyval <= GDK_9)))
@@ -937,20 +986,25 @@ et_build_groups (ETable *et)
 				       0);
 
 	if (et->use_click_to_add_end)
-		e_canvas_vbox_add_item_start(E_CANVAS_VBOX(et->canvas_vbox), GNOME_CANVAS_ITEM(et->group));
+		e_canvas_vbox_add_item_start (
+			E_CANVAS_VBOX (et->canvas_vbox),
+			GNOME_CANVAS_ITEM (et->group));
 	else
-		e_canvas_vbox_add_item(E_CANVAS_VBOX(et->canvas_vbox), GNOME_CANVAS_ITEM(et->group));
-
-	gnome_canvas_item_set(GNOME_CANVAS_ITEM(et->group),
-			      "alternating_row_colors", et->alternating_row_colors,
-			      "horizontal_draw_grid", et->horizontal_draw_grid,
-			      "vertical_draw_grid", et->vertical_draw_grid,
-			      "drawfocus", et->draw_focus,
-			      "cursor_mode", et->cursor_mode,
-			      "length_threshold", et->length_threshold,
-			      "uniform_row_height", et->uniform_row_height,
-			      "selection_model", et->selection,
-			      NULL);
+		e_canvas_vbox_add_item (
+			E_CANVAS_VBOX (et->canvas_vbox),
+			GNOME_CANVAS_ITEM (et->group));
+
+	gnome_canvas_item_set (
+		GNOME_CANVAS_ITEM(et->group),
+		"alternating_row_colors", et->alternating_row_colors,
+		"horizontal_draw_grid", et->horizontal_draw_grid,
+		"vertical_draw_grid", et->vertical_draw_grid,
+		"drawfocus", et->draw_focus,
+		"cursor_mode", et->cursor_mode,
+		"length_threshold", et->length_threshold,
+		"uniform_row_height", et->uniform_row_height,
+		"selection_model", et->selection,
+		NULL);
 
 	g_signal_connect (G_OBJECT (et->group), "cursor_change",
 			  G_CALLBACK (group_cursor_change), et);
@@ -971,20 +1025,25 @@ et_build_groups (ETable *et)
 		et_disconnect_model (et);
 
 	if (et->is_grouped && (!was_grouped)) {
-		et->table_model_change_id = g_signal_connect (G_OBJECT (et->model), "model_changed",
-							      G_CALLBACK (et_table_model_changed), et);
+		et->table_model_change_id = g_signal_connect (
+			et->model, "model_changed",
+			G_CALLBACK (et_table_model_changed), et);
 
-		et->table_row_change_id = g_signal_connect (G_OBJECT (et->model), "model_row_changed",
-							    G_CALLBACK (et_table_row_changed), et);
+		et->table_row_change_id = g_signal_connect (
+			et->model, "model_row_changed",
+			G_CALLBACK (et_table_row_changed), et);
 
-		et->table_cell_change_id = g_signal_connect (G_OBJECT (et->model), "model_cell_changed",
-							     G_CALLBACK (et_table_cell_changed), et);
+		et->table_cell_change_id = g_signal_connect (
+			et->model, "model_cell_changed",
+			G_CALLBACK (et_table_cell_changed), et);
 
-		et->table_rows_inserted_id = g_signal_connect (G_OBJECT (et->model), "model_rows_inserted",
-							       G_CALLBACK (et_table_rows_inserted), et);
+		et->table_rows_inserted_id = g_signal_connect (
+			et->model, "model_rows_inserted",
+			G_CALLBACK (et_table_rows_inserted), et);
 
-		et->table_rows_deleted_id = g_signal_connect (G_OBJECT (et->model), "model_rows_deleted",
-							      G_CALLBACK (et_table_rows_deleted), et);
+		et->table_rows_deleted_id = g_signal_connect (
+			et->model, "model_rows_deleted",
+			G_CALLBACK (et_table_rows_deleted), et);
 
 	}
 
@@ -1029,9 +1088,15 @@ changed_idle (gpointer data)
 static void
 et_canvas_realize (GtkWidget *canvas, ETable *e_table)
 {
+	GtkWidget *widget;
+	GtkStyle *style;
+
+	widget = GTK_WIDGET (e_table->table_canvas);
+	style = gtk_widget_get_style (widget);
+
 	gnome_canvas_item_set(
 		e_table->white_item,
-		"fill_color_gdk", &GTK_WIDGET(e_table->table_canvas)->style->base[GTK_STATE_NORMAL],
+		"fill_color_gdk", &style->base[GTK_STATE_NORMAL],
 		NULL);
 
 	CHECK_HORIZONTAL(e_table);
@@ -1052,11 +1117,7 @@ et_eti_leave_edit (ETable *et)
 {
 	GnomeCanvas *canvas = et->table_canvas;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (gtk_widget_has_focus (GTK_WIDGET (canvas))) {
-#else
-	if (GTK_WIDGET_HAS_FOCUS(canvas)) {
-#endif
 		GnomeCanvasItem *item = GNOME_CANVAS(canvas)->focused_item;
 
 		if (E_IS_TABLE_ITEM(item)) {
@@ -1208,6 +1269,9 @@ static void
 e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *header,
 		     ETableModel *model)
 {
+	GtkWidget *widget;
+	GtkStyle *style;
+
 	e_table->table_canvas = GNOME_CANVAS (e_canvas_new ());
 	g_signal_connect (
 		G_OBJECT (e_table->table_canvas), "size_allocate",
@@ -1247,12 +1311,15 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h
 	g_signal_connect (G_OBJECT(e_table->table_canvas), "reflow",
 			  G_CALLBACK (table_canvas_reflow), e_table);
 
-	gtk_widget_show (GTK_WIDGET (e_table->table_canvas));
+	widget = GTK_WIDGET (e_table->table_canvas);
+	style = gtk_widget_get_style (widget);
+
+	gtk_widget_show (widget);
 
 	e_table->white_item = gnome_canvas_item_new(
 		gnome_canvas_root(e_table->table_canvas),
 		e_canvas_background_get_type(),
-		"fill_color_gdk", &GTK_WIDGET(e_table->table_canvas)->style->base[GTK_STATE_NORMAL],
+		"fill_color_gdk", &style->base[GTK_STATE_NORMAL],
 		NULL);
 
 	g_signal_connect (G_OBJECT (e_table->white_item), "event",
@@ -1321,12 +1388,19 @@ e_table_fill_table (ETable *e_table, ETableModel *model)
 void
 e_table_set_state_object(ETable *e_table, ETableState *state)
 {
-	GValue *val = g_new0 (GValue, 1);
+	GValue *val;
+	GtkWidget *widget;
+	GtkAllocation allocation;
+
+	val = g_new0 (GValue, 1);
 	g_value_init (val, G_TYPE_DOUBLE);
 
 	connect_header (e_table, state);
 
-	g_value_set_double (val, (gdouble) (GTK_WIDGET(e_table->table_canvas)->allocation.width));
+	widget = GTK_WIDGET (e_table->table_canvas);
+	gtk_widget_get_allocation (widget, &allocation);
+
+	g_value_set_double (val, (gdouble) allocation.width);
 	g_object_set_property (G_OBJECT (e_table->header), "width", val);
 	g_free (val);
 
@@ -1528,7 +1602,11 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
 {
 	gint row = 0;
 	gint col_count, i;
-	GValue *val = g_new0 (GValue, 1);
+	GValue *val;
+	GtkLayout *layout;
+	GtkAdjustment *adjustment;
+
+	val = g_new0 (GValue, 1);
 	g_value_init (val, G_TYPE_OBJECT);
 
 	if (ete)
@@ -1541,7 +1619,9 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
 
 	e_table->use_click_to_add = specification->click_to_add;
 	e_table->use_click_to_add_end = specification->click_to_add_end;
-	e_table->click_to_add_message = specification->click_to_add_message ? g_strdup (dgettext (e_table->domain, specification->click_to_add_message)) : NULL;
+	e_table->click_to_add_message = specification->click_to_add_message ?
+		g_strdup (dgettext (e_table->domain,
+		specification->click_to_add_message)) : NULL;
 	e_table->alternating_row_colors = specification->alternating_row_colors;
 	e_table->horizontal_draw_grid = specification->horizontal_draw_grid;
 	e_table->vertical_draw_grid = specification->vertical_draw_grid;
@@ -1607,15 +1687,16 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
 	e_table_setup_table (e_table, e_table->full_header, e_table->header, etm);
 	e_table_fill_table (e_table, etm);
 
-	gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas))->step_increment = 20;
-	gtk_adjustment_changed(gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas)));
-	gtk_layout_get_hadjustment (GTK_LAYOUT (e_table->table_canvas))->step_increment = 20;
-	gtk_adjustment_changed(gtk_layout_get_hadjustment (GTK_LAYOUT (e_table->table_canvas)));
+	layout = GTK_LAYOUT (e_table->table_canvas);
+
+	adjustment = gtk_layout_get_vadjustment (layout);
+	gtk_adjustment_set_step_increment (adjustment, 20);
+
+	adjustment = gtk_layout_get_hadjustment (layout);
+	gtk_adjustment_set_step_increment (adjustment, 20);
 
 	if (!specification->no_headers) {
-		/*
-		 * The header
-		 */
+		/* The header */
 		gtk_table_attach (GTK_TABLE (e_table), GTK_WIDGET (e_table->header_canvas),
 				  0, 1, 0 + row, 1 + row,
 				  GTK_FILL | GTK_EXPAND,
@@ -1776,7 +1857,10 @@ e_table_construct_from_spec_file (ETable *e_table, ETableModel *etm, ETableExtra
  * The newly created #ETable or %NULL if there's an error.
  **/
 GtkWidget *
-e_table_new (ETableModel *etm, ETableExtras *ete, const gchar *spec, const gchar *state)
+e_table_new (ETableModel *etm,
+             ETableExtras *ete,
+             const gchar *spec,
+             const gchar *state)
 {
 	ETable *e_table;
 
@@ -1813,7 +1897,10 @@ e_table_new (ETableModel *etm, ETableExtras *ete, const gchar *spec, const gchar
  * The newly created #ETable or %NULL if there's an error.
  **/
 GtkWidget *
-e_table_new_from_spec_file (ETableModel *etm, ETableExtras *ete, const gchar *spec_fn, const gchar *state_fn)
+e_table_new_from_spec_file (ETableModel *etm,
+                            ETableExtras *ete,
+                            const gchar *spec_fn,
+                            const gchar *state_fn)
 {
 	ETable *e_table;
 
@@ -2237,25 +2324,22 @@ set_scroll_adjustments   (ETable *table,
 			  GtkAdjustment *hadjustment,
 			  GtkAdjustment *vadjustment)
 {
-	if (vadjustment != NULL) {
-		vadjustment->step_increment = 20;
-		gtk_adjustment_changed(vadjustment);
-	}
-	if (hadjustment != NULL) {
-		hadjustment->step_increment = 20;
-		gtk_adjustment_changed(hadjustment);
-	}
+	if (vadjustment != NULL)
+		gtk_adjustment_set_step_increment (vadjustment, 20);
+
+	if (hadjustment != NULL)
+		gtk_adjustment_set_step_increment (hadjustment, 20);
 
 	if (table->table_canvas != NULL) {
-		gtk_layout_set_hadjustment (GTK_LAYOUT(table->table_canvas),
-					    hadjustment);
-		gtk_layout_set_vadjustment (GTK_LAYOUT(table->table_canvas),
-					    vadjustment);
+		gtk_layout_set_hadjustment (
+			GTK_LAYOUT(table->table_canvas), hadjustment);
+		gtk_layout_set_vadjustment (
+			GTK_LAYOUT(table->table_canvas), vadjustment);
 	}
 
 	if (table->header_canvas != NULL)
-		gtk_layout_set_hadjustment (GTK_LAYOUT(table->header_canvas),
-					    hadjustment);
+		gtk_layout_set_hadjustment (
+			GTK_LAYOUT(table->header_canvas), hadjustment);
 }
 
 /**
@@ -2384,7 +2468,9 @@ e_table_get_cell_at (ETable *table,
 		     gint x, gint y,
 		     gint *row_return, gint *col_return)
 {
-	g_return_if_fail (table != NULL);
+	GtkAdjustment *adjustment;
+	GtkLayout *layout;
+
 	g_return_if_fail (E_IS_TABLE (table));
 	g_return_if_fail (row_return != NULL);
 	g_return_if_fail (col_return != NULL);
@@ -2392,9 +2478,16 @@ e_table_get_cell_at (ETable *table,
 	/* FIXME it would be nice if it could handle a NULL row_return or
 	 * col_return gracefully.  */
 
-	x += GTK_LAYOUT(table->table_canvas)->hadjustment->value;
-	y += GTK_LAYOUT(table->table_canvas)->vadjustment->value;
-	e_table_group_compute_location(table->group, &x, &y, row_return, col_return);
+	layout = GTK_LAYOUT (table->table_canvas);
+
+	adjustment = gtk_layout_get_hadjustment (layout);
+	x += gtk_adjustment_get_value (adjustment);
+
+	adjustment = gtk_layout_get_vadjustment (layout);
+	y += gtk_adjustment_get_value (adjustment);
+
+	e_table_group_compute_location (
+		table->group, &x, &y, row_return, col_return);
 }
 
 /**
@@ -2402,8 +2495,10 @@ e_table_get_cell_at (ETable *table,
  * @table: The #ETable.
  * @row: The row to get the geometry of.
  * @col: The col to get the geometry of.
- * @x_return: Returns the x coordinate of the upper left hand corner of the cell with respect to the widget.
- * @y_return: Returns the y coordinate of the upper left hand corner of the cell with respect to the widget.
+ * @x_return: Returns the x coordinate of the upper left hand corner
+ *            of the cell with respect to the widget.
+ * @y_return: Returns the y coordinate of the upper left hand corner
+ *            of the cell with respect to the widget.
  * @width_return: Returns the width of the cell.
  * @height_return: Returns the height of the cell.
  *
@@ -2416,24 +2511,43 @@ e_table_get_cell_geometry (ETable *table,
 			   gint *x_return, gint *y_return,
 			   gint *width_return, gint *height_return)
 {
-	g_return_if_fail (table != NULL);
+	GtkAdjustment *adjustment;
+	GtkAllocation allocation;
+	GtkLayout *layout;
+
 	g_return_if_fail (E_IS_TABLE (table));
 
-	e_table_group_get_cell_geometry(table->group, &row, &col, x_return, y_return, width_return, height_return);
+	layout = GTK_LAYOUT (table->table_canvas);
+
+	e_table_group_get_cell_geometry (
+		table->group, &row, &col, x_return, y_return,
+		width_return, height_return);
+
+	if (x_return && table->table_canvas) {
+		adjustment = gtk_layout_get_hadjustment (layout);
+		(*x_return) -= gtk_adjustment_get_value (adjustment);
+	}
 
-	if (x_return && table->table_canvas)
-		(*x_return) -= GTK_LAYOUT(table->table_canvas)->hadjustment->value;
 	if (y_return) {
-		if (table->table_canvas)
-			(*y_return) -= GTK_LAYOUT(table->table_canvas)->vadjustment->value;
-		if (table->header_canvas)
-			(*y_return) += GTK_WIDGET(table->header_canvas)->allocation.height;
+		if (table->table_canvas) {
+			adjustment = gtk_layout_get_vadjustment (layout);
+			(*y_return) -= gtk_adjustment_get_value (adjustment);
+		}
+
+		if (table->header_canvas) {
+			gtk_widget_get_allocation (
+				GTK_WIDGET (table->header_canvas),
+				&allocation);
+			(*y_return) += allocation.height;
+		}
 	}
 }
 
 /**
  * e_table_get_mouse_over_cell:
- * Similar to e_table_get_cell_at, only here we check based on the mouse motion information in the group.
+ *
+ * Similar to e_table_get_cell_at, only here we check
+ * based on the mouse motion information in the group.
  **/
 void
 e_table_get_mouse_over_cell (ETable *table, gint *row, gint *col)
@@ -2578,30 +2692,39 @@ e_table_drag_highlight (ETable *table,
 			gint     row,
 			gint     col)
 {
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(E_IS_TABLE(table));
+	GtkAdjustment *adjustment;
+	GtkAllocation allocation;
+	GtkLayout *layout;
+	GtkStyle *style;
+
+	g_return_if_fail (E_IS_TABLE (table));
+
+	layout = GTK_LAYOUT (table->table_canvas);
+	style = gtk_widget_get_style (GTK_WIDGET (table));
+	gtk_widget_get_allocation (GTK_WIDGET (layout), &allocation);
 
 	if (row != -1) {
 		gint x, y, width, height;
 		if (col == -1) {
 			e_table_get_cell_geometry (table, row, 0, &x, &y, &width, &height);
 			x = 0;
-			width = GTK_WIDGET (table->table_canvas)->allocation.width;
+			width = allocation.width;
 		} else {
 			e_table_get_cell_geometry (table, row, col, &x, &y, &width, &height);
-			x += GTK_LAYOUT(table->table_canvas)->hadjustment->value;
+			adjustment = gtk_layout_get_hadjustment (layout);
+			x += gtk_adjustment_get_value (adjustment);
 		}
-		y += GTK_LAYOUT(table->table_canvas)->vadjustment->value;
+
+		adjustment = gtk_layout_get_vadjustment (layout);
+		y += gtk_adjustment_get_value (adjustment);
 
 		if (table->drop_highlight == NULL) {
-			table->drop_highlight =
-				gnome_canvas_item_new (gnome_canvas_root (table->table_canvas),
-						       gnome_canvas_rect_get_type (),
-						       "fill_color", NULL,
-						       /*						       "outline_color", "black",
-						       "width_pixels", 1,*/
-						       "outline_color_gdk", &(GTK_WIDGET (table)->style->fg[GTK_STATE_NORMAL]),
-						       NULL);
+			table->drop_highlight = gnome_canvas_item_new (
+				gnome_canvas_root (table->table_canvas),
+				gnome_canvas_rect_get_type (),
+				"fill_color", NULL,
+				"outline_color_gdk", &style->fg[GTK_STATE_NORMAL],
+				NULL);
 		}
 		gnome_canvas_item_set (table->drop_highlight,
 				       "x1", (gdouble) x,
@@ -2901,8 +3024,15 @@ scroll_timeout (gpointer data)
 {
 	ETable *et = data;
 	gint dx = 0, dy = 0;
-	GtkAdjustment *h, *v;
-	gdouble hvalue, vvalue;
+	GtkAdjustment *adjustment;
+	GtkLayout *layout;
+	gdouble old_h_value;
+	gdouble new_h_value;
+	gdouble old_v_value;
+	gdouble new_v_value;
+	gdouble page_size;
+	gdouble lower;
+	gdouble upper;
 
 	if (et->scroll_direction & ET_SCROLL_DOWN)
 		dy += 20;
@@ -2914,22 +3044,37 @@ scroll_timeout (gpointer data)
 	if (et->scroll_direction & ET_SCROLL_LEFT)
 		dx -= 20;
 
-	h = GTK_LAYOUT(et->table_canvas)->hadjustment;
-	v = GTK_LAYOUT(et->table_canvas)->vadjustment;
+	layout = GTK_LAYOUT (et->table_canvas);
 
-	hvalue = h->value;
-	vvalue = v->value;
+	adjustment = gtk_layout_get_hadjustment (layout);
 
-	gtk_adjustment_set_value(h, CLAMP(h->value + dx, h->lower, h->upper - h->page_size));
-	gtk_adjustment_set_value(v, CLAMP(v->value + dy, v->lower, v->upper - v->page_size));
+	lower = gtk_adjustment_get_lower (adjustment);
+	upper = gtk_adjustment_get_upper (adjustment);
+	page_size = gtk_adjustment_get_page_size (adjustment);
 
-	if (h->value != hvalue ||
-	    v->value != vvalue)
-		do_drag_motion(et,
-			       et->last_drop_context,
-			       et->last_drop_x,
-			       et->last_drop_y,
-			       et->last_drop_time);
+	old_h_value = gtk_adjustment_get_value (adjustment);
+	new_h_value = CLAMP (old_h_value + dx, lower, upper - page_size);
+
+	gtk_adjustment_set_value (adjustment, new_h_value);
+
+	adjustment = gtk_layout_get_vadjustment (layout);
+
+	lower = gtk_adjustment_get_lower (adjustment);
+	upper = gtk_adjustment_get_upper (adjustment);
+	page_size = gtk_adjustment_get_page_size (adjustment);
+
+	old_v_value = gtk_adjustment_get_value (adjustment);
+	new_v_value = CLAMP (old_v_value + dy, lower, upper - page_size);
+
+	gtk_adjustment_set_value (adjustment, new_v_value);
+
+	if (new_h_value != old_h_value || new_v_value != old_v_value)
+		do_drag_motion (
+			et,
+			et->last_drop_context,
+			et->last_drop_x,
+			et->last_drop_y,
+			et->last_drop_time);
 
 	return TRUE;
 }
@@ -3001,28 +3146,27 @@ et_drag_motion(GtkWidget *widget,
 	       guint time,
 	       ETable *et)
 {
+	GtkAllocation allocation;
 	gboolean ret_val;
 	guint direction = 0;
 
+	gtk_widget_get_allocation (widget, &allocation);
+
 	et->last_drop_x = x;
 	et->last_drop_y = y;
 	et->last_drop_time = time;
 	et->last_drop_context = context;
 	context_connect (et, context);
 
-	ret_val = do_drag_motion (et,
-				  context,
-				  x,
-				  y,
-				  time);
+	ret_val = do_drag_motion (et, context, x, y, time);
 
 	if (y < 20)
 		direction |= ET_SCROLL_UP;
-	if (y > widget->allocation.height - 20)
+	if (y > allocation.height - 20)
 		direction |= ET_SCROLL_DOWN;
 	if (x < 20)
 		direction |= ET_SCROLL_LEFT;
-	if (x > widget->allocation.width - 20)
+	if (x > allocation.width - 20)
 		direction |= ET_SCROLL_RIGHT;
 
 	if (direction != 0)
@@ -3336,47 +3480,48 @@ e_table_class_init (ETableClass *class)
 
 	g_object_class_install_property (object_class, PROP_LENGTH_THRESHOLD,
 					 g_param_spec_int ("length_threshold",
-							   _("Length Threshold"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Length Threshold",
+							   NULL,
 							   0, G_MAXINT, 0,
 							   G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_UNIFORM_ROW_HEIGHT,
 					 g_param_spec_boolean ("uniform_row_height",
-							       _("Uniform row height"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Uniform row height",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_ALWAYS_SEARCH,
 					 g_param_spec_boolean ("always_search",
-							       _("Always search"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Always search",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_USE_CLICK_TO_ADD,
 					 g_param_spec_boolean ("use_click_to_add",
-							       _("Use click to add"),
-							       /*_( */"XXX blurb" /*)*/,
+							       "Use click to add",
+							       NULL,
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_MODEL,
 					 g_param_spec_object ("model",
-							      _("Model"),
-							      /*_( */"XXX blurb" /*)*/,
+							      "Model",
+							      NULL,
 							      E_TABLE_MODEL_TYPE,
 							      G_PARAM_READABLE));
 
 	gtk_widget_class_install_style_property (widget_class,
 					 g_param_spec_int ("vertical-spacing",
-							   _("Vertical Row Spacing"),
-							   _("Vertical space between rows. It is added to top and to bottom of a row"),
+							   "Vertical Row Spacing",
+							   "Vertical space between rows. It is added to top and to bottom of a row",
 							   0,
 							   G_MAXINT,
 							   3,
-							   G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
+							   G_PARAM_READABLE |
+							   G_PARAM_STATIC_STRINGS));
 
 	gal_a11y_e_table_init ();
 }
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 6f89816fbe..0c877e2279 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -800,29 +800,29 @@ e_tree_selection_model_class_init (ETreeSelectionModelClass *klass)
 
 	g_object_class_install_property (object_class, PROP_CURSOR_ROW,
 					 g_param_spec_int ("cursor_row",
-							   _("Cursor Row"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Cursor Row",
+							   NULL,
 							   0, G_MAXINT, 0,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_CURSOR_COL,
 					 g_param_spec_int ("cursor_col",
-							   _("Cursor Column"),
-							   /*_( */"XXX blurb" /*)*/,
+							   "Cursor Column",
+							   NULL,
 							   0, G_MAXINT, 0,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_MODEL,
 					 g_param_spec_object ("model",
-							      _("Model"),
-							      "XXX blurb",
+							      "Model",
+							      NULL,
 							      E_TREE_MODEL_TYPE,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_ETTA,
 					 g_param_spec_object ("etta",
 							      "ETTA",
-							      "XXX blurb",
+							      NULL,
 							      E_TREE_TABLE_ADAPTER_TYPE,
 							      G_PARAM_READWRITE));
 
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index ac1fcdd2d7..f813b64e8f 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -538,11 +538,9 @@ et_search_accept (ETableSearch *search, ETree *et)
 static void
 e_tree_init (ETree *e_tree)
 {
-	GtkTable *gtk_table = GTK_TABLE (e_tree);
+	gtk_widget_set_can_focus (GTK_WIDGET (e_tree), TRUE);
 
-	GTK_WIDGET_SET_FLAGS (GTK_WIDGET (e_tree), GTK_CAN_FOCUS);
-
-	gtk_table->homogeneous               = FALSE;
+	gtk_table_set_homogeneous (GTK_TABLE (e_tree), FALSE);
 
 	e_tree->priv                         = g_new(ETreePriv, 1);
 
@@ -656,7 +654,7 @@ et_focus (GtkWidget *container, GtkDirectionType direction)
 
 	e_tree = E_TREE (container);
 
-	if (GTK_CONTAINER (container)->focus_child) {
+	if (gtk_container_get_focus_child (GTK_CONTAINER (container))) {
 		gtk_container_set_focus_child (GTK_CONTAINER (container), NULL);
 		return FALSE;
 	}
@@ -689,26 +687,33 @@ set_header_canvas_width (ETree *e_tree)
 static void
 header_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *e_tree)
 {
+	GtkAllocation allocation;
+
 	set_header_canvas_width (e_tree);
 
+	widget = GTK_WIDGET (e_tree->priv->header_canvas);
+	gtk_widget_get_allocation (widget, &allocation);
+
 	/* When the header item is created ->height == 0,
 	   as the font is only created when everything is realized.
 	   So we set the usize here as well, so that the size of the
 	   header is correct */
-	if (GTK_WIDGET (e_tree->priv->header_canvas)->allocation.height !=
-	    E_TABLE_HEADER_ITEM (e_tree->priv->header_item)->height)
-		gtk_widget_set_size_request (GTK_WIDGET (e_tree->priv->header_canvas), -1,
-				      E_TABLE_HEADER_ITEM (e_tree->priv->header_item)->height);
+	if (allocation.height != E_TABLE_HEADER_ITEM (e_tree->priv->header_item)->height)
+		gtk_widget_set_size_request (
+			widget, -1,
+			E_TABLE_HEADER_ITEM (e_tree->priv->header_item)->height);
 }
 
 static void
 e_tree_setup_header (ETree *e_tree)
 {
+	GtkWidget *widget;
 	gchar *pointer;
-	e_tree->priv->header_canvas = GNOME_CANVAS (e_canvas_new ());
-	GTK_WIDGET_UNSET_FLAGS (e_tree->priv->header_canvas, GTK_CAN_FOCUS);
 
-	gtk_widget_show (GTK_WIDGET (e_tree->priv->header_canvas));
+	widget = e_canvas_new ();
+	gtk_widget_set_can_focus (widget, FALSE);
+	e_tree->priv->header_canvas = GNOME_CANVAS (widget);
+	gtk_widget_show (widget);
 
 	pointer = g_strdup_printf("%p", (gpointer) e_tree);
 
@@ -737,23 +742,39 @@ static void
 scroll_to_cursor (ETree *e_tree)
 {
 	ETreePath path;
-	GtkAdjustment *adj;
+	GtkAdjustment *adjustment;
+	GtkLayout *layout;
 	gint x, y, w, h;
+	gdouble page_size;
+	gdouble lower;
+	gdouble upper;
+	gdouble value;
 
 	path = e_tree_get_cursor (e_tree);
-	adj = GTK_LAYOUT (e_tree->priv->table_canvas)->vadjustment;
 	x = y = w = h = 0;
+
 	if (path) {
 		gint row = e_tree_row_of_node(e_tree, path);
 		gint col = 0;
 
 		if (row >= 0)
-			e_table_item_get_cell_geometry (E_TABLE_ITEM (e_tree->priv->item),
-							&row, &col, &x, &y, &w, &h);
+			e_table_item_get_cell_geometry (
+				E_TABLE_ITEM (e_tree->priv->item),
+				&row, &col, &x, &y, &w, &h);
 	}
 
-	if (y < adj->value || y + h > adj->value + adj->page_size)
-		gtk_adjustment_set_value(adj, CLAMP(y - adj->page_size / 2, adj->lower, adj->upper - adj->page_size));
+	layout = GTK_LAYOUT (e_tree->priv->table_canvas);
+	adjustment = gtk_layout_get_vadjustment (layout);
+
+	page_size = gtk_adjustment_get_page_size (adjustment);
+	lower = gtk_adjustment_get_lower (adjustment);
+	upper = gtk_adjustment_get_upper (adjustment);
+	value = gtk_adjustment_get_value (adjustment);
+
+	if (y < value || y + h > value + page_size) {
+		value = CLAMP (y - page_size / 2, lower, upper - page_size);
+		gtk_adjustment_set_value (adjustment, value);
+	}
 }
 
 static gboolean
@@ -761,24 +782,32 @@ tree_canvas_reflow_idle (ETree *e_tree)
 {
 	gdouble height, width;
 	gdouble oldheight, oldwidth;
-	GtkAllocation *alloc = &(GTK_WIDGET (e_tree->priv->table_canvas)->allocation);
+	GtkAllocation allocation;
+	GtkWidget *widget;
+
+	widget = GTK_WIDGET (e_tree->priv->table_canvas);
+	gtk_widget_get_allocation (widget, &allocation);
+
+	g_object_get (
+		e_tree->priv->item,
+		"height", &height, "width", &width, NULL);
+
+	height = MAX ((gint)height, allocation.height);
+	width = MAX((gint)width, allocation.width);
 
-	g_object_get (e_tree->priv->item,
-		      "height", &height,
-		      "width", &width,
-		      NULL);
-	height = MAX ((gint)height, alloc->height);
-	width = MAX((gint)width, alloc->width);
 	/* I have no idea why this needs to be -1, but it works. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (e_tree->priv->table_canvas),
-					NULL, NULL, &oldwidth, &oldheight);
+	gnome_canvas_get_scroll_region (
+		GNOME_CANVAS (e_tree->priv->table_canvas),
+		NULL, NULL, &oldwidth, &oldheight);
 
 	if (oldwidth != width - 1 ||
 	    oldheight != height - 1) {
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (e_tree->priv->table_canvas),
-						0, 0, width - 1, height - 1);
+		gnome_canvas_set_scroll_region (
+			GNOME_CANVAS (e_tree->priv->table_canvas),
+			0, 0, width - 1, height - 1);
 		set_header_canvas_width (e_tree);
 	}
+
 	e_tree->priv->reflow_idle_id = 0;
 
 	if (e_tree->priv->show_cursor_after_reflow) {
@@ -881,14 +910,24 @@ item_key_press (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et)
 	GdkEventKey *key = (GdkEventKey *) event;
 	ETreePath path;
 	gint y, row_local, col_local;
-	GtkAdjustment *vadj;
+	GtkAdjustment *adjustment;
+	GtkLayout *layout;
+	gdouble page_size;
+	gdouble upper;
+	gdouble value;
+
+	layout = GTK_LAYOUT (et->priv->table_canvas);
+	adjustment = gtk_layout_get_vadjustment (layout);
+
+	page_size = gtk_adjustment_get_page_size (adjustment);
+	upper = gtk_adjustment_get_upper (adjustment);
+	value = gtk_adjustment_get_value (adjustment);
 
 	switch (key->keyval) {
 	case GDK_Page_Down:
 	case GDK_KP_Page_Down:
-		vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (et->priv->table_canvas));
-		y = CLAMP(vadj->value + (2 * vadj->page_size - 50), 0, vadj->upper);
-		y -= vadj->value;
+		y = CLAMP (value + (2 * page_size - 50), 0, upper);
+		y -= value;
 		e_tree_get_cell_at (et, 30, y, &row_local, &col_local);
 
 		if (row_local == -1)
@@ -902,9 +941,8 @@ item_key_press (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et)
 		break;
 	case GDK_Page_Up:
 	case GDK_KP_Page_Up:
-		vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (et->priv->table_canvas));
-		y = CLAMP(vadj->value - (vadj->page_size - 50), 0, vadj->upper);
-		y -= vadj->value;
+		y = CLAMP (value - (page_size - 50), 0, upper);
+		y -= value;
 		e_tree_get_cell_at (et, 30, y, &row_local, &col_local);
 
 		if (row_local == -1)
@@ -1029,9 +1067,13 @@ et_build_item (ETree *et)
 static void
 et_canvas_style_set (GtkWidget *widget, GtkStyle *prev_style)
 {
+	GtkStyle *style;
+
+	style = gtk_widget_get_style (widget);
+
 	gnome_canvas_item_set(
 		E_TREE(widget)->priv->white_item,
-		"fill_color_gdk", &widget->style->base[GTK_STATE_NORMAL],
+		"fill_color_gdk", &style->base[GTK_STATE_NORMAL],
 		NULL);
 }
 
@@ -1053,11 +1095,7 @@ et_canvas_root_event (GnomeCanvasItem *root, GdkEvent *event, ETree *e_tree)
 	case GDK_2BUTTON_PRESS:
 	case GDK_BUTTON_RELEASE:
 		if (event->button.button != 4 && event->button.button != 5) {
-#if GTK_CHECK_VERSION(2,19,7)
 			if (gtk_widget_has_focus (GTK_WIDGET (root->canvas))) {
-#else
-			if (GTK_WIDGET_HAS_FOCUS(root->canvas)) {
-#endif
 				GnomeCanvasItem *item = GNOME_CANVAS(root->canvas)->focused_item;
 
 				if (E_IS_TABLE_ITEM(item)) {
@@ -1102,6 +1140,9 @@ table_canvas_focus_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer d
 static void
 e_tree_setup_table (ETree *e_tree)
 {
+	GtkWidget *widget;
+	GtkStyle *style;
+
 	e_tree->priv->table_canvas = GNOME_CANVAS (e_canvas_new ());
 	g_signal_connect (
 		e_tree->priv->table_canvas, "size_allocate",
@@ -1141,16 +1182,20 @@ e_tree_setup_table (ETree *e_tree)
 	g_signal_connect (e_tree->priv->table_canvas, "reflow",
 			  G_CALLBACK (tree_canvas_reflow), e_tree);
 
-	gtk_widget_show (GTK_WIDGET (e_tree->priv->table_canvas));
+	widget = GTK_WIDGET (e_tree->priv->table_canvas);
+	style = gtk_widget_get_style (widget);
+
+	gtk_widget_show (widget);
 
-	e_tree->priv->white_item = gnome_canvas_item_new(
-		gnome_canvas_root(e_tree->priv->table_canvas),
+	e_tree->priv->white_item = gnome_canvas_item_new (
+		gnome_canvas_root (e_tree->priv->table_canvas),
 		e_canvas_background_get_type(),
-		"fill_color_gdk", &GTK_WIDGET(e_tree->priv->table_canvas)->style->base[GTK_STATE_NORMAL],
+		"fill_color_gdk", &style->base[GTK_STATE_NORMAL],
 		NULL);
 
-	g_signal_connect (e_tree->priv->white_item, "event",
-			  G_CALLBACK (white_item_event), e_tree);
+	g_signal_connect (
+		e_tree->priv->white_item, "event",
+		G_CALLBACK (white_item_event), e_tree);
 	g_signal_connect (
 		gnome_canvas_root (e_tree->priv->table_canvas), "event",
 		G_CALLBACK(et_canvas_root_event), e_tree);
@@ -1182,12 +1227,19 @@ e_tree_set_search_column (ETree *e_tree, gint  col)
 void
 e_tree_set_state_object(ETree *e_tree, ETableState *state)
 {
-	GValue *val = g_new0 (GValue, 1);
+	GValue *val;
+	GtkAllocation allocation;
+	GtkWidget *widget;
+
+	val = g_new0 (GValue, 1);
 	g_value_init (val, G_TYPE_DOUBLE);
 
 	connect_header (e_tree, state);
 
-	g_value_set_double (val, (gdouble) (GTK_WIDGET(e_tree->priv->table_canvas)->allocation.width));
+	widget = GTK_WIDGET (e_tree->priv->table_canvas);
+	gtk_widget_get_allocation (widget, &allocation);
+
+	g_value_set_double (val, (gdouble) allocation.width);
 	g_object_set_property (G_OBJECT (e_tree->priv->header), "width", val);
 	g_free (val);
 
@@ -1424,6 +1476,8 @@ static gboolean
 et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
 		   ETableSpecification *specification, ETableState *state)
 {
+	GtkAdjustment *adjustment;
+	GtkLayout *layout;
 	gint row = 0;
 
 	if (ete)
@@ -1475,10 +1529,13 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
 	}
 	e_tree_setup_table (e_tree);
 
-	gtk_layout_get_vadjustment (GTK_LAYOUT (e_tree->priv->table_canvas))->step_increment = 20;
-	gtk_adjustment_changed(gtk_layout_get_vadjustment (GTK_LAYOUT (e_tree->priv->table_canvas)));
-	gtk_layout_get_hadjustment (GTK_LAYOUT (e_tree->priv->table_canvas))->step_increment = 20;
-	gtk_adjustment_changed(gtk_layout_get_hadjustment (GTK_LAYOUT (e_tree->priv->table_canvas)));
+	layout = GTK_LAYOUT (e_tree->priv->table_canvas);
+
+	adjustment = gtk_layout_get_vadjustment (layout);
+	gtk_adjustment_set_step_increment (adjustment, 20);
+
+	adjustment = gtk_layout_get_hadjustment (layout);
+	gtk_adjustment_set_step_increment (adjustment, 20);
 
 	if (!specification->no_headers) {
 		/*
@@ -1930,24 +1987,24 @@ set_scroll_adjustments   (ETree *tree,
 			  GtkAdjustment *hadjustment,
 			  GtkAdjustment *vadjustment)
 {
-	if (vadjustment != NULL) {
-		vadjustment->step_increment = 20;
-		gtk_adjustment_changed(vadjustment);
-	}
-	if (hadjustment != NULL) {
-		hadjustment->step_increment = 20;
-		gtk_adjustment_changed(hadjustment);
-	}
+	if (vadjustment != NULL)
+		gtk_adjustment_set_step_increment (vadjustment, 20);
+
+	if (hadjustment != NULL)
+		gtk_adjustment_set_step_increment (hadjustment, 20);
 
 	if (tree->priv) {
-		gtk_layout_set_hadjustment (GTK_LAYOUT(tree->priv->table_canvas),
-					    hadjustment);
-		gtk_layout_set_vadjustment (GTK_LAYOUT(tree->priv->table_canvas),
-					    vadjustment);
+		GtkLayout *layout;
+
+		layout = GTK_LAYOUT (tree->priv->table_canvas);
+
+		gtk_layout_set_hadjustment (layout, hadjustment);
+		gtk_layout_set_vadjustment (layout, vadjustment);
 
 		if (tree->priv->header_canvas != NULL)
-			gtk_layout_set_hadjustment (GTK_LAYOUT(tree->priv->header_canvas),
-						    hadjustment);
+			gtk_layout_set_hadjustment (
+				GTK_LAYOUT(tree->priv->header_canvas),
+				hadjustment);
 	}
 }
 
@@ -2383,37 +2440,48 @@ e_tree_drag_highlight (ETree *tree,
 		       gint     row,
 		       gint     col)
 {
-	g_return_if_fail(tree != NULL);
+	GtkAdjustment *adjustment;
+	GtkAllocation allocation;
+	GtkLayout *layout;
+	GtkStyle *style;
+
 	g_return_if_fail(E_IS_TREE(tree));
 
+	layout = GTK_LAYOUT (tree->priv->table_canvas);
+	style = gtk_widget_get_style (GTK_WIDGET (tree));
+	gtk_widget_get_allocation (GTK_WIDGET (layout), &allocation);
+
 	if (row != -1) {
 		gint x, y, width, height;
 		if (col == -1) {
 			e_tree_get_cell_geometry (tree, row, 0, &x, &y, &width, &height);
 			x = 0;
-			width = GTK_WIDGET (tree->priv->table_canvas)->allocation.width;
+			width = allocation.width;
 		} else {
 			e_tree_get_cell_geometry (tree, row, col, &x, &y, &width, &height);
-			x += GTK_LAYOUT(tree->priv->table_canvas)->hadjustment->value;
+			adjustment = gtk_layout_get_hadjustment (layout);
+			x += gtk_adjustment_get_value (adjustment);
 		}
-		y += GTK_LAYOUT(tree->priv->table_canvas)->vadjustment->value;
+
+		adjustment = gtk_layout_get_vadjustment (layout);
+		y += gtk_adjustment_get_value (adjustment);
 
 		if (tree->priv->drop_highlight == NULL) {
-			tree->priv->drop_highlight =
-				gnome_canvas_item_new (gnome_canvas_root (tree->priv->table_canvas),
-						       gnome_canvas_rect_get_type (),
-						       "fill_color", NULL,
-						       /*						       "outline_color", "black",
-						       "width_pixels", 1,*/
-						       "outline_color_gdk", &(GTK_WIDGET (tree)->style->fg[GTK_STATE_NORMAL]),
-						       NULL);
+			tree->priv->drop_highlight = gnome_canvas_item_new (
+				gnome_canvas_root (tree->priv->table_canvas),
+				gnome_canvas_rect_get_type (),
+				"fill_color", NULL,
+				"outline_color_gdk", &style->fg[GTK_STATE_NORMAL],
+				NULL);
 		}
-		gnome_canvas_item_set (tree->priv->drop_highlight,
-				       "x1", (gdouble) x,
-				       "x2", (gdouble) x + width - 1,
-				       "y1", (gdouble) y,
-				       "y2", (gdouble) y + height - 1,
-				       NULL);
+
+		gnome_canvas_item_set (
+			tree->priv->drop_highlight,
+			"x1", (gdouble) x,
+			"x2", (gdouble) x + width - 1,
+			"y1", (gdouble) y,
+			"y2", (gdouble) y + height - 1,
+			NULL);
 	} else {
 		gtk_object_destroy (GTK_OBJECT (tree->priv->drop_highlight));
 		tree->priv->drop_highlight = NULL;
@@ -2617,7 +2685,9 @@ e_tree_get_cell_at (ETree *tree,
 		     gint x, gint y,
 		     gint *row_return, gint *col_return)
 {
-	g_return_if_fail (tree != NULL);
+	GtkAdjustment *adjustment;
+	GtkLayout *layout;
+
 	g_return_if_fail (E_IS_TREE (tree));
 	g_return_if_fail (row_return != NULL);
 	g_return_if_fail (col_return != NULL);
@@ -2630,9 +2700,17 @@ e_tree_get_cell_at (ETree *tree,
 	if (col_return)
 		*col_return = -1;
 
-	x += GTK_LAYOUT(tree->priv->table_canvas)->hadjustment->value;
-	y += GTK_LAYOUT(tree->priv->table_canvas)->vadjustment->value;
-	e_table_item_compute_location(E_TABLE_ITEM(tree->priv->item), &x, &y, row_return, col_return);
+	layout = GTK_LAYOUT (tree->priv->table_canvas);
+
+	adjustment = gtk_layout_get_hadjustment (layout);
+	x += gtk_adjustment_get_value (adjustment);
+
+	adjustment = gtk_layout_get_vadjustment (layout);
+	y += gtk_adjustment_get_value (adjustment);
+
+	e_table_item_compute_location (
+		E_TABLE_ITEM (tree->priv->item),
+		&x, &y, row_return, col_return);
 }
 
 /**
@@ -2653,7 +2731,9 @@ e_tree_get_cell_geometry (ETree *tree,
 			  gint *x_return, gint *y_return,
 			  gint *width_return, gint *height_return)
 {
-	g_return_if_fail (tree != NULL);
+	GtkAdjustment *adjustment;
+	GtkLayout *layout;
+
 	g_return_if_fail (E_IS_TREE (tree));
 	g_return_if_fail (row >= 0);
 	g_return_if_fail (col >= 0);
@@ -2661,12 +2741,22 @@ e_tree_get_cell_geometry (ETree *tree,
 	/* FIXME it would be nice if it could handle a NULL row_return or
 	 * col_return gracefully.  */
 
-	e_table_item_get_cell_geometry(E_TABLE_ITEM(tree->priv->item), &row, &col, x_return, y_return, width_return, height_return);
+	e_table_item_get_cell_geometry (
+		E_TABLE_ITEM (tree->priv->item),
+		&row, &col, x_return, y_return,
+		width_return, height_return);
+
+	layout = GTK_LAYOUT (tree->priv->table_canvas);
+
+	if (x_return) {
+		adjustment = gtk_layout_get_hadjustment (layout);
+		(*x_return) -= gtk_adjustment_get_value (adjustment);
+	}
 
-	if (x_return)
-		(*x_return) -= GTK_LAYOUT(tree->priv->table_canvas)->hadjustment->value;
-	if (y_return)
-		(*y_return) -= GTK_LAYOUT(tree->priv->table_canvas)->vadjustment->value;
+	if (y_return) {
+		adjustment = gtk_layout_get_vadjustment (layout);
+		(*y_return) -= gtk_adjustment_get_value (adjustment);
+	}
 }
 
 static void
@@ -2777,8 +2867,15 @@ scroll_timeout (gpointer data)
 {
 	ETree *et = data;
 	gint dx = 0, dy = 0;
-	GtkAdjustment *v, *h;
-	gdouble vvalue, hvalue;
+	GtkAdjustment *adjustment;
+	GtkLayout *layout;
+	gdouble old_h_value;
+	gdouble new_h_value;
+	gdouble old_v_value;
+	gdouble new_v_value;
+	gdouble page_size;
+	gdouble lower;
+	gdouble upper;
 
 	if (et->priv->scroll_direction & ET_SCROLL_DOWN)
 		dy += 20;
@@ -2790,22 +2887,37 @@ scroll_timeout (gpointer data)
 	if (et->priv->scroll_direction & ET_SCROLL_LEFT)
 		dx -= 20;
 
-	h = GTK_LAYOUT(et->priv->table_canvas)->hadjustment;
-	v = GTK_LAYOUT(et->priv->table_canvas)->vadjustment;
+	layout = GTK_LAYOUT (et->priv->table_canvas);
+
+	adjustment = gtk_layout_get_hadjustment (layout);
+
+	page_size = gtk_adjustment_get_page_size (adjustment);
+	lower = gtk_adjustment_get_lower (adjustment);
+	upper = gtk_adjustment_get_upper (adjustment);
 
-	hvalue = h->value;
-	vvalue = v->value;
+	old_h_value = gtk_adjustment_get_value (adjustment);
+	new_h_value = CLAMP (old_h_value + dx, lower, upper - page_size);
 
-	gtk_adjustment_set_value(h, CLAMP(h->value + dx, h->lower, h->upper - h->page_size));
-	gtk_adjustment_set_value(v, CLAMP(v->value + dy, v->lower, v->upper - v->page_size));
+	gtk_adjustment_set_value (adjustment, new_h_value);
 
-	if (h->value != hvalue ||
-	    v->value != vvalue)
-		do_drag_motion(et,
-			       et->priv->last_drop_context,
-			       et->priv->last_drop_x,
-			       et->priv->last_drop_y,
-			       et->priv->last_drop_time);
+	adjustment = gtk_layout_get_vadjustment (layout);
+
+	page_size = gtk_adjustment_get_page_size (adjustment);
+	lower = gtk_adjustment_get_lower (adjustment);
+	upper = gtk_adjustment_get_upper (adjustment);
+
+	old_v_value = gtk_adjustment_get_value (adjustment);
+	new_v_value = CLAMP (old_v_value + dy, lower, upper - page_size);
+
+	gtk_adjustment_set_value (adjustment, new_v_value);
+
+	if (new_h_value != old_h_value || new_v_value != old_v_value)
+		do_drag_motion (
+			et,
+			et->priv->last_drop_context,
+			et->priv->last_drop_x,
+			et->priv->last_drop_y,
+			et->priv->last_drop_time);
 
 	return TRUE;
 }
@@ -2969,6 +3081,7 @@ et_drag_motion(GtkWidget *widget,
 	       guint time,
 	       ETree *et)
 {
+	GtkAllocation allocation;
 	gint ret_val;
 	guint direction = 0;
 
@@ -2987,19 +3100,17 @@ et_drag_motion(GtkWidget *widget,
 		hover_on (et, x, y);
 	}
 
-	ret_val = do_drag_motion (et,
-				  context,
-				  x,
-				  y,
-				  time);
+	ret_val = do_drag_motion (et, context, x, y, time);
+
+	gtk_widget_get_allocation (widget, &allocation);
 
 	if (y < 20)
 		direction |= ET_SCROLL_UP;
-	if (y > widget->allocation.height - 20)
+	if (y > allocation.height - 20)
 		direction |= ET_SCROLL_DOWN;
 	if (x < 20)
 		direction |= ET_SCROLL_LEFT;
-	if (x > widget->allocation.width - 20)
+	if (x > allocation.width - 20)
 		direction |= ET_SCROLL_RIGHT;
 
 	if (direction != 0)
@@ -3364,61 +3475,61 @@ e_tree_class_init (ETreeClass *class)
 
 	g_object_class_install_property (object_class, PROP_LENGTH_THRESHOLD,
 					 g_param_spec_int ("length_threshold",
-							   _( "Length Threshold" ),
-							   _( "Length Threshold" ),
+							   "Length Threshold",
+							   "Length Threshold",
 							   0, G_MAXINT, 0,
 							   G_PARAM_WRITABLE));
 	g_object_class_install_property (object_class, PROP_HORIZONTAL_DRAW_GRID,
 					 g_param_spec_boolean ("horizontal_draw_grid",
-							       _( "Horizontal Draw Grid" ),
-							       _( "Horizontal Draw Grid" ),
+							       "Horizontal Draw Grid",
+							       "Horizontal Draw Grid",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 	g_object_class_install_property (object_class, PROP_VERTICAL_DRAW_GRID,
 					 g_param_spec_boolean ("vertical_draw_grid",
-							       _( "Vertical Draw Grid" ),
-							       _( "Vertical Draw Grid" ),
+							       "Vertical Draw Grid",
+							       "Vertical Draw Grid",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 	g_object_class_install_property (object_class, PROP_DRAW_FOCUS,
 					 g_param_spec_boolean ("drawfocus",
-							       _( "Draw focus" ),
-							       _( "Draw focus" ),
+							       "Draw focus",
+							       "Draw focus",
 							       FALSE,
 							       G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_ETTA,
 					 g_param_spec_object ("ETreeTableAdapter",
-							      _( "ETree table adapter" ),
-							      _( "ETree table adapter" ),
+							      "ETree table adapter",
+							      "ETree table adapter",
 							      E_TREE_TABLE_ADAPTER_TYPE,
 							      G_PARAM_READABLE));
 
 	g_object_class_install_property (object_class, PROP_UNIFORM_ROW_HEIGHT,
 					 g_param_spec_boolean ("uniform_row_height",
-							       _( "Uniform row height" ),
-							       _( "Uniform row height" ),
+							       "Uniform row height",
+							       "Uniform row height",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_ALWAYS_SEARCH,
 					 g_param_spec_boolean ("always_search",
-							       _( "Always search" ),
-							       _( "Always search" ),
+							       "Always search",
+							       "Always search",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	gtk_widget_class_install_style_property (widget_class,
 			   g_param_spec_boolean ("retro_look",
-						 _("Retro Look"),
-						 _("Draw lines and +/- expanders."),
+						 "Retro Look",
+						 "Draw lines and +/- expanders.",
 						 FALSE,
 						 G_PARAM_READABLE));
 
 	gtk_widget_class_install_style_property (widget_class,
 			   g_param_spec_int ("expander_size",
-					     _("Expander Size"),
-					     _("Size of the expander arrow"),
+					     "Expander Size",
+					     "Size of the expander arrow",
 					     0,
 					     G_MAXINT,
 					     10,
@@ -3453,6 +3564,9 @@ tree_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *tree)
 void
 e_tree_set_info_message (ETree *tree, const gchar *info_message)
 {
+	GtkAllocation allocation;
+	GtkWidget *widget;
+
 	g_return_if_fail (tree != NULL);
 	g_return_if_fail (tree->priv != NULL);
 
@@ -3466,18 +3580,22 @@ e_tree_set_info_message (ETree *tree, const gchar *info_message)
 		return;
 	}
 
+	widget = GTK_WIDGET (tree->priv->table_canvas);
+	gtk_widget_get_allocation (widget, &allocation);
+
 	if (!tree->priv->info_text) {
-		tree->priv->info_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP (gnome_canvas_root (tree->priv->table_canvas)),
-						e_text_get_type (),
-						"anchor", GTK_ANCHOR_NW,
-						"line_wrap", TRUE,
-						"clip", TRUE,
-						"justification", GTK_JUSTIFY_LEFT,
-						"text", info_message,
-						"draw_background", FALSE,
-						"width", (gdouble) GTK_WIDGET (tree->priv->table_canvas)->allocation.width - 60.0,
-						"clip_width", (gdouble) GTK_WIDGET (tree->priv->table_canvas)->allocation.width - 60.0,
-						NULL);
+		tree->priv->info_text = gnome_canvas_item_new (
+			GNOME_CANVAS_GROUP (gnome_canvas_root (tree->priv->table_canvas)),
+			e_text_get_type (),
+			"anchor", GTK_ANCHOR_NW,
+			"line_wrap", TRUE,
+			"clip", TRUE,
+			"justification", GTK_JUSTIFY_LEFT,
+			"text", info_message,
+			"draw_background", FALSE,
+			"width", (gdouble) allocation.width - 60.0,
+			"clip_width", (gdouble) allocation.width - 60.0,
+			NULL);
 
 		e_canvas_item_move_absolute (tree->priv->info_text, 30, 30);
 
diff --git a/widgets/table/gal-a11y-e-cell-popup.c b/widgets/table/gal-a11y-e-cell-popup.c
index 141ce172a4..921ae8e4d5 100644
--- a/widgets/table/gal-a11y-e-cell-popup.c
+++ b/widgets/table/gal-a11y-e-cell-popup.c
@@ -118,8 +118,9 @@ gal_a11y_e_cell_popup_new (ETableItem *item,
 	g_return_val_if_fail (a11y != NULL, NULL);
 	cell = GAL_A11Y_E_CELL(a11y);
 	gal_a11y_e_cell_add_action (cell,
-				    _("popup"),	       /* action name*/
-				    _("popup a child"), /* action description */
+				    "popup",
+				    /* Translators: description of a "popup" action */
+				    _("popup a child"),
 				    "<Alt>Down",              /* action keybinding */
 				    popup_cell_action);
 
@@ -132,9 +133,12 @@ popup_cell_action (GalA11yECell *cell)
 {
 	gint finished;
 	GdkEvent event;
+	GtkLayout *layout;
+
+	layout = GTK_LAYOUT (GNOME_CANVAS_ITEM (cell->item)->canvas);
 
 	event.key.type = GDK_KEY_PRESS;
-	event.key.window = GTK_LAYOUT(GNOME_CANVAS_ITEM(cell->item)->canvas)->bin_window;;
+	event.key.window = gtk_layout_get_bin_window (layout);
 	event.key.send_event = TRUE;
 	event.key.time = GDK_CURRENT_TIME;
 	event.key.state = GDK_MOD1_MASK;
diff --git a/widgets/table/gal-a11y-e-cell-text.c b/widgets/table/gal-a11y-e-cell-text.c
index 26fffcb3e7..bc69ca3d26 100644
--- a/widgets/table/gal-a11y-e-cell-text.c
+++ b/widgets/table/gal-a11y-e-cell-text.c
@@ -613,7 +613,8 @@ ect_action_init (GalA11yECellText *a11y)
 	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
 	if (ect->editable && e_table_model_is_cell_editable (gaec->cell_view->e_table_model, gaec->model_col, gaec->row))
 		gal_a11y_e_cell_add_action (gaec,
-				    _("edit"),
+				    "edit",
+				    /* Translators: description of an "edit" action */
 				    _("begin editing this cell"),
 				    NULL,
 				    (ACTION_FUNC) ect_do_action_edit);
diff --git a/widgets/table/gal-a11y-e-cell-toggle.c b/widgets/table/gal-a11y-e-cell-toggle.c
index fa23f6c6fd..54b1b3586c 100644
--- a/widgets/table/gal-a11y-e-cell-toggle.c
+++ b/widgets/table/gal-a11y-e-cell-toggle.c
@@ -90,6 +90,7 @@ static void
 toggle_cell_action (GalA11yECell *cell)
 {
 	gint finished;
+	GtkLayout *layout;
 	GdkEventButton event;
 	gint x, y, width, height;
 	gint row, col;
@@ -97,14 +98,16 @@ toggle_cell_action (GalA11yECell *cell)
 	row = cell->row;
 	col = cell->view_col;
 
-	e_table_item_get_cell_geometry (cell->item, &row, &col,
-					&x, &y, &width, &height);
+	layout = GTK_LAYOUT (GNOME_CANVAS_ITEM (cell->item)->canvas);
+
+	e_table_item_get_cell_geometry (
+		cell->item, &row, &col, &x, &y, &width, &height);
 
 	event.x = x + width / 2 + (gint)(GNOME_CANVAS_ITEM (cell->item)->x1);
 	event.y = y + height / 2 + (gint)(GNOME_CANVAS_ITEM (cell->item)->y1);
 
 	event.type = GDK_BUTTON_PRESS;
-	event.window = GTK_LAYOUT(GNOME_CANVAS_ITEM(cell->item)->canvas)->bin_window;
+	event.window = gtk_layout_get_bin_window (layout);
         event.button = 1;
         event.send_event = TRUE;
         event.time = GDK_CURRENT_TIME;
@@ -166,8 +169,9 @@ gal_a11y_e_cell_toggle_new (ETableItem *item,
                                    row);
 
 	gal_a11y_e_cell_add_action (cell,
-				    _("toggle"),	       /* action name*/
-				    _("toggle the cell"), /* action description */
+				    "toggle",
+				    /* Translators: description of a "toggle" action */
+				    _("toggle the cell"),
 				    NULL,              /* action keybinding */
 				    toggle_cell_action);
 
diff --git a/widgets/table/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c
index aaf490c726..148d36392f 100644
--- a/widgets/table/gal-a11y-e-cell-tree.c
+++ b/widgets/table/gal-a11y-e-cell-tree.c
@@ -207,13 +207,15 @@ gal_a11y_e_cell_tree_new (ETableItem *item,
 								    view_col,
 								    row);
 		gal_a11y_e_cell_add_action (GAL_A11Y_E_CELL (subcell_a11y),
-					    _("expand"),
+					    "expand",
+					    /* Translators: description of an "expand" action */
 					    _("expands the row in the ETree containing this cell"),
 					    NULL,
 					    (ACTION_FUNC)ectr_do_action_expand);
 
 		gal_a11y_e_cell_add_action (GAL_A11Y_E_CELL (subcell_a11y),
-					    _("collapse"),
+					    "collapse",
+					    /* Translators: description of a "collapse" action */
 					    _("collapses the row in the ETree containing this cell"),
 					    NULL,
 					    (ACTION_FUNC)ectr_do_action_collapse);
diff --git a/widgets/table/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c
index 8d788a458b..ebec8681ae 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add.c
@@ -72,26 +72,30 @@ etcta_action_get_name (AtkAction *action, gint      i)
 static gboolean
 idle_do_action (gpointer data)
 {
-        GdkEventButton event;
+	GtkLayout *layout;
+	GdkEventButton event;
 	ETableClickToAdd * etcta;
-        gint finished;
+	gint finished;
 
 	g_return_val_if_fail ( data!= NULL, FALSE);
 
-	etcta = E_TABLE_CLICK_TO_ADD (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (data)));
+	etcta = E_TABLE_CLICK_TO_ADD (
+		atk_gobject_accessible_get_object (
+		ATK_GOBJECT_ACCESSIBLE (data)));
 	g_return_val_if_fail (etcta, FALSE);
 
+	layout = GTK_LAYOUT (GNOME_CANVAS_ITEM (etcta)->canvas);
+
 	event.x = 0;
 	event.y = 0;
-
-        event.type = GDK_BUTTON_PRESS;
-        event.window = GTK_LAYOUT(GNOME_CANVAS_ITEM(etcta)->canvas)->bin_window;
-        event.button = 1;
-        event.send_event = TRUE;
-        event.time = GDK_CURRENT_TIME;
-        event.axes = NULL;
-
-        g_signal_emit_by_name (etcta, "event", &event, &finished);
+	event.type = GDK_BUTTON_PRESS;
+	event.window = gtk_layout_get_bin_window (layout);
+	event.button = 1;
+	event.send_event = TRUE;
+	event.time = GDK_CURRENT_TIME;
+	event.axes = NULL;
+
+	g_signal_emit_by_name (etcta, "event", &event, &finished);
 
 	return FALSE;
 }
diff --git a/widgets/table/gal-a11y-e-table.c b/widgets/table/gal-a11y-e-table.c
index 37e5b892d2..6134b2d297 100644
--- a/widgets/table/gal-a11y-e-table.c
+++ b/widgets/table/gal-a11y-e-table.c
@@ -90,11 +90,7 @@ init_child_item (GalA11yETable *a11y)
 		return FALSE;
 
 	table = E_TABLE (GTK_ACCESSIBLE (a11y)->widget);
-#if GTK_CHECK_VERSION(2,19,7)
 	if (table && gtk_widget_get_mapped (GTK_WIDGET (table)) && table->group && E_IS_TABLE_GROUP_CONTAINER(table->group)) {
-#else
-	if (table && GTK_WIDGET_MAPPED (GTK_WIDGET (table)) && table->group && E_IS_TABLE_GROUP_CONTAINER(table->group)) {
-#endif
 		ETableGroupContainer *etgc =  (ETableGroupContainer *)table->group;
 		GList *list;
 
@@ -288,11 +284,7 @@ gal_a11y_e_table_new (GObject *widget)
 	GTK_ACCESSIBLE (a11y)->widget = GTK_WIDGET (widget);
 
 	/* we need to init all the children for multiple table items */
-#if GTK_CHECK_VERSION(2,19,7)
 	if (table && gtk_widget_get_mapped (GTK_WIDGET (table)) && table->group && E_IS_TABLE_GROUP_CONTAINER (table->group)) {
-#else
-	if (table && GTK_WIDGET_MAPPED (GTK_WIDGET (table)) && table->group && E_IS_TABLE_GROUP_CONTAINER (table->group)) {
-#endif
 		/* Ref it here so that it is still valid in the idle function */
 		/* It will be unrefed in the idle function */
 		g_object_ref (a11y);
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index 0ce3302da1..4e3f36fd19 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -162,20 +162,25 @@ static gboolean
 do_adjustment (gpointer user_data)
 {
 	gint row;
-	GtkAdjustment *adj;
-	gfloat value, min_value, max_value;
+	GtkLayout *layout;
+	GtkAdjustment *adjustment;
+	gdouble page_size;
+	gdouble value, min_value, max_value;
 	EReflow *reflow = user_data;
 
 	row = reflow->cursor_row;
 	if (row == -1)
 		return FALSE;
 
-	adj = gtk_layout_get_hadjustment (GTK_LAYOUT (GNOME_CANVAS_ITEM (reflow)->canvas));
-	value = adj->value;
+	layout = GTK_LAYOUT (GNOME_CANVAS_ITEM (reflow)->canvas);
+	adjustment = gtk_layout_get_hadjustment (layout);
+
+	value = gtk_adjustment_get_value (adjustment);
+	page_size = gtk_adjustment_get_page_size (adjustment);
 
 	if ((!reflow->items) || (!reflow->items[row]))
 		return TRUE;
-	min_value = reflow->items[row]->x2 - adj->page_size;
+	min_value = reflow->items[row]->x2 - page_size;
 	max_value = reflow->items[row]->x1;
 
 	if (value < min_value)
@@ -184,10 +189,8 @@ do_adjustment (gpointer user_data)
 	if (value > max_value)
 		value = max_value;
 
-	if (value != adj->value) {
-		adj->value = value;
-		gtk_adjustment_value_changed (adj);
-	}
+	if (value != gtk_adjustment_get_value (adjustment))
+		gtk_adjustment_set_value (adjustment, value);
 
 	reflow->do_adjustment_idle_id = 0;
 
@@ -238,14 +241,23 @@ incarnate (EReflow *reflow)
 	gint first_cell;
 	gint last_cell;
 	gint i;
-	GtkAdjustment *adjustment = gtk_layout_get_hadjustment (GTK_LAYOUT (GNOME_CANVAS_ITEM (reflow)->canvas));
+	GtkLayout *layout;
+	GtkAdjustment *adjustment;
+	gdouble value;
+	gdouble page_size;
+
+	layout = GTK_LAYOUT (GNOME_CANVAS_ITEM (reflow)->canvas);
+	adjustment = gtk_layout_get_hadjustment (layout);
+
+	value = gtk_adjustment_get_value (adjustment);
+	page_size = gtk_adjustment_get_page_size (adjustment);
 
 	column_width = reflow->column_width;
 
-	first_column = adjustment->value - 1 + E_REFLOW_BORDER_WIDTH;
+	first_column = value - 1 + E_REFLOW_BORDER_WIDTH;
 	first_column /= column_width + E_REFLOW_FULL_GUTTER;
 
-	last_column = adjustment->value + adjustment->page_size + 1 - E_REFLOW_BORDER_WIDTH - E_REFLOW_DIVIDER_WIDTH;
+	last_column = value + page_size + 1 - E_REFLOW_BORDER_WIDTH - E_REFLOW_DIVIDER_WIDTH;
 	last_column /= column_width + E_REFLOW_FULL_GUTTER;
 	last_column ++;
 
@@ -733,13 +745,23 @@ e_reflow_set_property (GObject *object, guint prop_id, const GValue *value, GPar
 		break;
 	case PROP_COLUMN_WIDTH:
 		if (reflow->column_width != g_value_get_double (value)) {
-			GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
+			GtkLayout *layout;
+			GtkAdjustment *adjustment;
 			gdouble old_width = reflow->column_width;
+			gdouble step_increment;
+			gdouble page_size;
+
+			layout = GTK_LAYOUT (item->canvas);
+			adjustment = gtk_layout_get_hadjustment (layout);
+			page_size = gtk_adjustment_get_page_size (adjustment);
 
 			reflow->column_width = g_value_get_double (value);
-			adjustment->step_increment = (reflow->column_width + E_REFLOW_FULL_GUTTER) / 2;
-			adjustment->page_increment = adjustment->page_size - adjustment->step_increment;
-			gtk_adjustment_changed(adjustment);
+			step_increment = (reflow->column_width +
+				E_REFLOW_FULL_GUTTER) / 2;
+			gtk_adjustment_set_step_increment (
+				adjustment, step_increment);
+			gtk_adjustment_set_page_increment (
+				adjustment, page_size - step_increment);
 			e_reflow_resize_children(item);
 			e_canvas_item_request_reflow(item);
 
@@ -827,6 +849,9 @@ e_reflow_realize (GnomeCanvasItem *item)
 {
 	EReflow *reflow;
 	GtkAdjustment *adjustment;
+	gdouble page_increment;
+	gdouble step_increment;
+	gdouble page_size;
 	gint count;
 	gint i;
 
@@ -851,19 +876,18 @@ e_reflow_realize (GnomeCanvasItem *item)
 	reflow->need_reflow_columns = TRUE;
 	e_canvas_item_request_reflow(item);
 
-	adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
+	adjustment = gtk_layout_get_hadjustment (GTK_LAYOUT (item->canvas));
 
 #if 0
 	connect_set_adjustment (reflow);
 #endif
 	connect_adjustment (reflow, adjustment);
 
-	adjustment->step_increment = (reflow->column_width + E_REFLOW_FULL_GUTTER) / 2;
-	adjustment->page_increment = adjustment->page_size - adjustment->step_increment;
-	gtk_adjustment_changed(adjustment);
-
-	if (!item->canvas->aa) {
-	}
+	page_size = gtk_adjustment_get_page_size (adjustment);
+	step_increment = (reflow->column_width + E_REFLOW_FULL_GUTTER) / 2;
+	page_increment = page_size - step_increment;
+	gtk_adjustment_set_step_increment (adjustment, step_increment);
+	gtk_adjustment_set_page_increment (adjustment, page_increment);
 }
 
 static void
@@ -873,9 +897,6 @@ e_reflow_unrealize (GnomeCanvasItem *item)
 
 	reflow = E_REFLOW (item);
 
-	if (!item->canvas->aa) {
-	}
-
 	gdk_cursor_unref (reflow->arrow_cursor);
 	gdk_cursor_unref (reflow->default_cursor);
 	reflow->arrow_cursor = NULL;
@@ -979,20 +1000,34 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 					break;
 				case 4:
 					{
-						GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
-						gdouble new_value = adjustment->value;
-						new_value -= adjustment->step_increment;
-						gtk_adjustment_set_value(adjustment, new_value);
+						GtkLayout *layout;
+						GtkAdjustment *adjustment;
+						gdouble new_value;
+
+						layout = GTK_LAYOUT (item->canvas);
+						adjustment = gtk_layout_get_hadjustment (layout);
+						new_value = gtk_adjustment_get_value (adjustment);
+						new_value -= gtk_adjustment_get_step_increment (adjustment);
+						gtk_adjustment_set_value (adjustment, new_value);
 					}
 					break;
 				case 5:
 					{
-						GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
-						gdouble new_value = adjustment->value;
-						new_value += adjustment->step_increment;
-						if (new_value > adjustment->upper - adjustment->page_size)
-							new_value = adjustment->upper - adjustment->page_size;
-						gtk_adjustment_set_value(adjustment, new_value);
+						GtkLayout *layout;
+						GtkAdjustment *adjustment;
+						gdouble new_value;
+						gdouble page_size;
+						gdouble upper;
+
+						layout = GTK_LAYOUT (item->canvas);
+						adjustment = gtk_layout_get_hadjustment (layout);
+						new_value = gtk_adjustment_get_value (adjustment);
+						new_value += gtk_adjustment_get_step_increment (adjustment);
+						upper = gtk_adjustment_get_upper (adjustment);
+						page_size = gtk_adjustment_get_page_size (adjustment);
+						if (new_value > upper - page_size)
+							new_value = upper - page_size;
+						gtk_adjustment_set_value (adjustment, new_value);
 					}
 					break;
 				}
@@ -1001,18 +1036,31 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 			if (reflow->column_drag) {
 				gdouble old_width = reflow->column_width;
 				GdkEventButton *button = (GdkEventButton *) event;
-				GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
+				GtkAdjustment *adjustment;
+				GtkLayout *layout;
+				gdouble value;
+
+				layout = GTK_LAYOUT (item->canvas);
+				adjustment = gtk_layout_get_hadjustment (layout);
+				value = gtk_adjustment_get_value (adjustment);
+
 				reflow->temp_column_width = reflow->column_width +
-					(button->x - reflow->start_x)/(reflow->which_column_dragged - e_reflow_pick_line(reflow, adjustment->value));
+					(button->x - reflow->start_x)/(reflow->which_column_dragged - e_reflow_pick_line(reflow, value));
 				if (reflow->temp_column_width < 50)
 					reflow->temp_column_width = 50;
 				reflow->column_drag = FALSE;
 				if (old_width != reflow->temp_column_width) {
-					gtk_adjustment_set_value(adjustment, adjustment->value + e_reflow_pick_line(reflow, adjustment->value) * (reflow->temp_column_width - reflow->column_width));
+					gdouble page_increment;
+					gdouble step_increment;
+					gdouble page_size;
+
+					page_size = gtk_adjustment_get_page_size (adjustment);
+					gtk_adjustment_set_value(adjustment, value + e_reflow_pick_line(reflow, value) * (reflow->temp_column_width - reflow->column_width));
 					reflow->column_width = reflow->temp_column_width;
-					adjustment->step_increment = (reflow->column_width + E_REFLOW_FULL_GUTTER) / 2;
-					adjustment->page_increment = adjustment->page_size - adjustment->step_increment;
-					gtk_adjustment_changed(adjustment);
+					step_increment = (reflow->column_width + E_REFLOW_FULL_GUTTER) / 2;
+					page_increment = page_size - step_increment;
+					gtk_adjustment_set_step_increment (adjustment, step_increment);
+					gtk_adjustment_set_page_increment (adjustment, page_increment);
 					e_reflow_resize_children(item);
 					e_canvas_item_request_reflow(item);
 					gnome_canvas_request_redraw(item->canvas, 0, 0, reflow->width, reflow->height);
@@ -1028,9 +1076,16 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 			if (reflow->column_drag) {
 				gdouble old_width = reflow->temp_column_width;
 				GdkEventMotion *motion = (GdkEventMotion *) event;
-				GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
+				GtkAdjustment *adjustment;
+				GtkLayout *layout;
+				gdouble value;
+
+				layout = GTK_LAYOUT (item->canvas);
+				adjustment = gtk_layout_get_hadjustment (layout);
+				value = gtk_adjustment_get_value (adjustment);
+
 				reflow->temp_column_width = reflow->column_width +
-					(motion->x - reflow->start_x)/(reflow->which_column_dragged - e_reflow_pick_line(reflow, adjustment->value));
+					(motion->x - reflow->start_x)/(reflow->which_column_dragged - e_reflow_pick_line(reflow, value));
 				if (reflow->temp_column_width < 50)
 					reflow->temp_column_width = 50;
 				if (old_width != reflow->temp_column_width) {
@@ -1040,20 +1095,23 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 				return TRUE;
 			} else {
 				GdkEventMotion *motion = (GdkEventMotion *) event;
+				GdkWindow *window;
 				gdouble n_x;
 
 				n_x = motion->x;
 				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
 				n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
 
+				window = gtk_widget_get_window (GTK_WIDGET (item->canvas));
+
 				if (motion->y >= E_REFLOW_BORDER_WIDTH && motion->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER) {
 					if (reflow->default_cursor_shown) {
-						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->arrow_cursor);
+						gdk_window_set_cursor(window, reflow->arrow_cursor);
 						reflow->default_cursor_shown = FALSE;
 					}
 				} else
 					if (!reflow->default_cursor_shown) {
-						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->default_cursor);
+						gdk_window_set_cursor(window, reflow->default_cursor);
 						reflow->default_cursor_shown = TRUE;
 					}
 
@@ -1062,14 +1120,18 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 		case GDK_ENTER_NOTIFY:
 			if (!reflow->column_drag) {
 				GdkEventCrossing *crossing = (GdkEventCrossing *) event;
+				GdkWindow *window;
 				gdouble n_x;
+
 				n_x = crossing->x;
 				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
 				n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
 
+				window = gtk_widget_get_window (GTK_WIDGET (item->canvas));
+
 				if (crossing->y >= E_REFLOW_BORDER_WIDTH && crossing->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER) {
 					if (reflow->default_cursor_shown) {
-						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->arrow_cursor);
+						gdk_window_set_cursor(window, reflow->arrow_cursor);
 						reflow->default_cursor_shown = FALSE;
 					}
 				}
@@ -1078,13 +1140,18 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 		case GDK_LEAVE_NOTIFY:
 			if (!reflow->column_drag) {
 				GdkEventCrossing *crossing = (GdkEventCrossing *) event;
+				GdkWindow *window;
 				gdouble n_x;
+
 				n_x = crossing->x;
 				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
 				n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
+
+				window = gtk_widget_get_window (GTK_WIDGET (item->canvas));
+
 				if (!( crossing->y >= E_REFLOW_BORDER_WIDTH && crossing->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER )) {
 					if (!reflow->default_cursor_shown) {
-						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->default_cursor);
+						gdk_window_set_cursor(window, reflow->default_cursor);
 						reflow->default_cursor_shown = TRUE;
 					}
 				}
@@ -1104,6 +1171,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 				    gint x, gint y, gint width, gint height)
 {
+	GtkStyle *style;
 	gint x_rect, y_rect, width_rect, height_rect;
 	gdouble running_width;
 	EReflow *reflow = E_REFLOW(item);
@@ -1123,11 +1191,13 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 	i /= column_width + E_REFLOW_FULL_GUTTER;
 	running_width += i * (column_width + E_REFLOW_FULL_GUTTER);
 
+	style = gtk_widget_get_style (GTK_WIDGET (item->canvas));
+
 	for (; i < reflow->column_count; i++) {
 		if (running_width > x + width)
 			break;
 		x_rect = running_width;
-		gtk_paint_flat_box(GTK_WIDGET(item->canvas)->style,
+		gtk_paint_flat_box(style,
 				   drawable,
 				   GTK_STATE_ACTIVE,
 				   GTK_SHADOW_NONE,
@@ -1141,8 +1211,16 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 		running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
 	}
 	if (reflow->column_drag) {
-		gint start_line = e_reflow_pick_line(reflow,
-						    gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value);
+		GtkAdjustment *adjustment;
+		GtkLayout *layout;
+		gdouble value;
+		gint start_line;
+
+		layout = GTK_LAYOUT (item->canvas);
+		adjustment = gtk_layout_get_hadjustment (layout);
+		value = gtk_adjustment_get_value (adjustment);
+
+		start_line = e_reflow_pick_line(reflow, value);
 		i = x - start_line * (column_width + E_REFLOW_FULL_GUTTER);
 		running_width = start_line * (column_width + E_REFLOW_FULL_GUTTER);
 		column_width = reflow->temp_column_width;
@@ -1162,7 +1240,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 				break;
 			x_rect = running_width;
 			gdk_draw_rectangle(drawable,
-					   GTK_WIDGET(item->canvas)->style->fg_gc[GTK_STATE_NORMAL],
+					   style->fg_gc[GTK_STATE_NORMAL],
 					   TRUE,
 					   x_rect - x,
 					   y_rect - y,
@@ -1212,12 +1290,19 @@ e_reflow_update (GnomeCanvasItem *item, gdouble affine[6], ArtSVP *clip_path, gi
 		gnome_canvas_request_redraw(item->canvas, x0, y0, x1, y1);
 		reflow->need_height_update = FALSE;
 	} else if (reflow->need_column_resize) {
+		GtkLayout *layout;
+		GtkAdjustment *adjustment;
 		gint x_rect, y_rect, width_rect, height_rect;
-		gint start_line = e_reflow_pick_line(reflow,
-						    gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value);
+		gint start_line;
 		gdouble running_width;
 		gint i;
 		gdouble column_width;
+		gdouble value;
+
+		layout = GTK_LAYOUT (item->canvas);
+		adjustment = gtk_layout_get_hadjustment (layout);
+		value = gtk_adjustment_get_value (adjustment);
+		start_line = e_reflow_pick_line (reflow, value);
 
 		if (reflow->previous_temp_column_width != -1) {
 			running_width = start_line * (reflow->column_width + E_REFLOW_FULL_GUTTER);
@@ -1409,43 +1494,43 @@ e_reflow_class_init (EReflowClass *klass)
 
 	g_object_class_install_property (object_class, PROP_MINIMUM_WIDTH,
 					 g_param_spec_double ("minimum_width",
-							      _( "Minimum width" ),
-							      _( "Minimum Width" ),
+							      "Minimum width",
+							      "Minimum Width",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_WIDTH,
 					 g_param_spec_double ("width",
-							      _( "Width" ),
-							      _( "Width" ),
+							      "Width",
+							      "Width",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READABLE));
 
 	g_object_class_install_property (object_class, PROP_HEIGHT,
 					 g_param_spec_double ("height",
-							      _( "Height" ),
-							      _( "Height" ),
+							      "Height",
+							      "Height",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_EMPTY_MESSAGE,
 					 g_param_spec_string ("empty_message",
-							      _( "Empty message" ),
-							      _( "Empty message" ),
+							      "Empty message",
+							      "Empty message",
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_MODEL,
 					 g_param_spec_object ("model",
-							      _( "Reflow model" ),
-							      _( "Reflow model" ),
+							      "Reflow model",
+							      "Reflow model",
 							      E_REFLOW_MODEL_TYPE,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_COLUMN_WIDTH,
 					 g_param_spec_double ("column_width",
-							      _( "Column width" ),
-							      _( "Column width" ),
+							      "Column width",
+							      "Column width",
 							      0.0, G_MAXDOUBLE, 150.0,
 							      G_PARAM_READWRITE));
 
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index f964ae9bb1..92fc67cbfa 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -1439,11 +1439,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 		widget = gtk_widget_get_parent (widget);
 
 		while (widget && !GTK_IS_BUTTON(widget)) {
-#if GTK_CHECK_VERSION(2,19,7)
 			if (gtk_widget_get_has_window (widget)) {
-#else
-			if (!GTK_WIDGET_NO_WINDOW (widget)) {
-#endif
 				widget = NULL;
 				break;
 			}
@@ -1498,11 +1494,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 				thisy += (1 + default_spacing) / 2;
 			}
 
-#if GTK_CHECK_VERSION(2,19,7)
 			if (gtk_widget_has_focus (widget)) {
-#else
-			if (GTK_WIDGET_HAS_FOCUS (widget)) {
-#endif
 				thisx += 1;
 				thisy += 1;
 				thiswidth -= 2;
@@ -1522,11 +1514,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 				       thisx + xoff, thisy + yoff,
 				       thiswidth, thisheight);
 
-#if GTK_CHECK_VERSION(2,19,7)
 			if (gtk_widget_has_focus (widget)) {
-#else
-			if (GTK_WIDGET_HAS_FOCUS (widget)) {
-#endif
 				thisx -= 1;
 				thisy -= 1;
 				thiswidth += 2;
@@ -3305,241 +3293,239 @@ e_text_class_init (ETextClass *klass)
 
 	g_object_class_install_property (gobject_class, PROP_MODEL,
 					 g_param_spec_object ("model",
-							      _( "Model" ),
-							      _( "Model" ),
+							      "Model",
+							      "Model",
 							      E_TYPE_TEXT_MODEL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_EVENT_PROCESSOR,
 					 g_param_spec_object ("event_processor",
-							      _( "Event Processor" ),
-							      _( "Event Processor" ),
+							      "Event Processor",
+							      "Event Processor",
 							      E_TEXT_EVENT_PROCESSOR_TYPE,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_TEXT,
 					 g_param_spec_string ("text",
-							      _( "Text" ),
-							      _( "Text" ),
+							      "Text",
+							      "Text",
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_BOLD,
 					 g_param_spec_boolean ("bold",
-							       _( "Bold" ),
-							       _( "Bold" ),
+							       "Bold",
+							       "Bold",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_STRIKEOUT,
 					 g_param_spec_boolean ("strikeout",
-							       _( "Strikeout" ),
-							       _( "Strikeout" ),
+							       "Strikeout",
+							       "Strikeout",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_ANCHOR,
 					 g_param_spec_enum ("anchor",
-							    _( "Anchor" ),
-							    _( "Anchor" ),
+							    "Anchor",
+							    "Anchor",
 							    GTK_TYPE_ANCHOR_TYPE, GTK_ANCHOR_CENTER,
 							    G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_JUSTIFICATION,
 					 g_param_spec_enum ("justification",
-							    _( "Justification" ),
-							    _( "Justification" ),
+							    "Justification",
+							    "Justification",
 							    GTK_TYPE_JUSTIFICATION, GTK_JUSTIFY_LEFT,
 							    G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_CLIP_WIDTH,
 					 g_param_spec_double ("clip_width",
-							      _( "Clip Width" ),
-							      _( "Clip Width" ),
+							      "Clip Width",
+							      "Clip Width",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_CLIP_HEIGHT,
 					 g_param_spec_double ("clip_height",
-							      _( "Clip Height" ),
-							      _( "Clip Height" ),
+							      "Clip Height",
+							      "Clip Height",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_CLIP,
 					 g_param_spec_boolean ("clip",
-							       _( "Clip" ),
-							       _( "Clip" ),
+							       "Clip",
+							       "Clip",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_FILL_CLIP_RECTANGLE,
 					 g_param_spec_boolean ("fill_clip_rectangle",
-							       _( "Fill clip rectangle" ),
-							       _( "Fill clip rectangle" ),
+							       "Fill clip rectangle",
+							       "Fill clip rectangle",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_X_OFFSET,
 					 g_param_spec_double ("x_offset",
-							      _( "X Offset" ),
-							      _( "X Offset" ),
+							      "X Offset",
+							      "X Offset",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_Y_OFFSET,
 					 g_param_spec_double ("y_offset",
-							      _( "Y Offset" ),
-							      _( "Y Offset" ),
+							      "Y Offset",
+							      "Y Offset",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_FILL_COLOR,
 					 g_param_spec_string ("fill_color",
-							      _( "Fill color" ),
-							      _( "Fill color" ),
+							      "Fill color",
+							      "Fill color",
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_FILL_COLOR_GDK,
 					 g_param_spec_boxed ("fill_color_gdk",
-							     _( "GDK fill color" ),
-							     _( "GDK fill color" ),
+							     "GDK fill color",
+							     "GDK fill color",
 							     GDK_TYPE_COLOR,
 							     G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_FILL_COLOR_RGBA,
 					 g_param_spec_uint ("fill_color_rgba",
-							    _( "GDK fill color" ),
-							    _( "GDK fill color" ),
+							    "GDK fill color",
+							    "GDK fill color",
 							    0, G_MAXUINT, 0,
 							    G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_FILL_STIPPLE,
 					 g_param_spec_object ("fill_stipple",
-							      _( "Fill stipple" ),
-							      _( "Fill stipple" ),
+							      "Fill stipple",
+							      "Fill stipple",
 							      GDK_TYPE_DRAWABLE,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_TEXT_WIDTH,
 					 g_param_spec_double ("text_width",
-							      _( "Text width" ),
-							      _( "Text width" ),
+							      "Text width",
+							      "Text width",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READABLE));
 
 	g_object_class_install_property (gobject_class, PROP_TEXT_HEIGHT,
 					 g_param_spec_double ("text_height",
-							      _( "Text height" ),
-							      _( "Text height" ),
+							      "Text height",
+							      "Text height",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READABLE));
 
 	g_object_class_install_property (gobject_class, PROP_EDITABLE,
 					 g_param_spec_boolean ("editable",
-							       _( "Editable" ),
-							       _( "Editable" ),
+							       "Editable",
+							       "Editable",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_USE_ELLIPSIS,
 					 g_param_spec_boolean ("use_ellipsis",
-							       _( "Use ellipsis" ),
-							       _( "Use ellipsis" ),
+							       "Use ellipsis",
+							       "Use ellipsis",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_ELLIPSIS,
 					 g_param_spec_string ("ellipsis",
-							      _( "Ellipsis" ),
-							      _( "Ellipsis" ),
+							      "Ellipsis",
+							      "Ellipsis",
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_LINE_WRAP,
 					 g_param_spec_boolean ("line_wrap",
-							       _( "Line wrap" ),
-							       _( "Line wrap" ),
+							       "Line wrap",
+							       "Line wrap",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_BREAK_CHARACTERS,
 					 g_param_spec_string ("break_characters",
-							      _( "Break characters" ),
-							      _( "Break characters" ),
+							      "Break characters",
+							      "Break characters",
 							      NULL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_MAX_LINES,
 					 g_param_spec_int ("max_lines",
-							   _( "Max lines" ),
-							   _( "Max lines" ),
+							   "Max lines",
+							   "Max lines",
 							   0, G_MAXINT, 0,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_WIDTH,
 					 g_param_spec_double ("width",
-							      _( "Width" ),
-							      _( "Width" ),
+							      "Width",
+							      "Width",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_HEIGHT,
 					 g_param_spec_double ("height",
-							      _( "Height" ),
-							      _( "Height" ),
+							      "Height",
+							      "Height",
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_DRAW_BORDERS,
 					 g_param_spec_boolean ("draw_borders",
-							       _( "Draw borders" ),
-							       _( "Draw borders" ),
+							       "Draw borders",
+							       "Draw borders",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_ALLOW_NEWLINES,
 					 g_param_spec_boolean ("allow_newlines",
-							       _( "Allow newlines" ),
-							       _( "Allow newlines" ),
+							       "Allow newlines",
+							       "Allow newlines",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_DRAW_BACKGROUND,
 					 g_param_spec_boolean ("draw_background",
-							       _( "Draw background" ),
-							       _( "Draw background" ),
+							       "Draw background",
+							       "Draw background",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_DRAW_BUTTON,
 					 g_param_spec_boolean ("draw_button",
-							       _( "Draw button" ),
-							       _( "Draw button" ),
+							       "Draw button",
+							       "Draw button",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_CURSOR_POS,
 					 g_param_spec_int ("cursor_pos",
-							   _( "Cursor position" ),
-							   _( "Cursor position" ),
+							   "Cursor position",
+							   "Cursor position",
 							   0, G_MAXINT, 0,
 							   G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_IM_CONTEXT,
 					 g_param_spec_object ("im_context",
-							      /* Translators: Input Method Context */
-							      _( "IM Context" ),
-							      /* Translators: Input Method Context */
-							      _( "IM Context" ),
+							      "IM Context",
+							      "IM Context",
 							      GTK_TYPE_IM_CONTEXT,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_HANDLE_POPUP,
 					 g_param_spec_boolean ("handle_popup",
-							       _( "Handle Popup" ),
-							       _( "Handle Popup" ),
+							       "Handle Popup",
+							       "Handle Popup",
 							       FALSE,
 							       G_PARAM_READWRITE));
 
diff --git a/widgets/text/gal-a11y-e-text.c b/widgets/text/gal-a11y-e-text.c
index 6c6724ea6d..e368e7d68b 100644
--- a/widgets/text/gal-a11y-e-text.c
+++ b/widgets/text/gal-a11y-e-text.c
@@ -533,7 +533,7 @@ et_get_character_extents (AtkText *text,
         etext = E_TEXT(obj);
         canvas = GNOME_CANVAS_ITEM(etext)->canvas;
         widget = GTK_WIDGET(canvas);
-        window = widget->window;
+        window = gtk_widget_get_window (widget);
         gdk_window_get_origin (window, &x_widget, &y_widget);
 
 	pango_layout_index_to_pos (etext->layout, offset, &pango_pos);
@@ -611,7 +611,7 @@ et_get_offset_at_point (AtkText *text,
         etext = E_TEXT(obj);
         canvas = GNOME_CANVAS_ITEM(etext)->canvas;
         widget = GTK_WIDGET(canvas);
-	window = widget->window;
+	window = gtk_widget_get_window (widget);
 	gdk_window_get_origin (window, &x_widget, &y_widget);
 
 	if (coords == ATK_XY_SCREEN) {